diff --git a/.gitattributes b/.gitattributes
index 7bee716a5d..7a5df63373 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,26 +1,6 @@
 # Auto-detect text files and perform LF normalization
 * text=auto
 
-# Fork-specific files - always keep ours during merge conflicts
-# These files contain customizations that should not be overwritten by upstream merges
-README.md merge=ours
-package_info merge=ours
-bazarr/app/check_update.py merge=ours
-custom_libs/subliminal_patch/providers/opensubtitles_scraper.py merge=ours
-Dockerfile merge=ours
-docker-compose.yml merge=ours
-docker/entrypoint.sh merge=ours
-.dockerignore merge=ours
-.gitattributes merge=ours
-docs/FORK_MAINTENANCE.md merge=ours
-
-# GitHub workflows - keep our fork's versions
-.github/workflows/* merge=ours
-
-# Git submodule - keep our reference
-.gitmodules merge=ours
-opensubtitles-scraper merge=ours
-
 # Binary files
 *.png binary
 *.jpg binary
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b663249502..b774a8b9e7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Software (please complete the following information):**
- - Bazarr: [e.g. v 0.6.1]
+ - Bazarr+: [e.g. v2.0.0]
  - Radarr version [e.g. v 0.2.0.0001]
  - Sonarr version [e.g. v 2.0.0.0001]
  - OS: [e.g. Windows 10]
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 6ceaed40d1..cb76eff4d6 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: ๐Ÿ“— Wiki
-    url: https://github.com/morpheus65535/bazarr/wiki
+    url: https://wiki.bazarr.media
     about: The Bazarr wiki should help guide you through installation and setup as well as help resolve common problems and answer frequently asked questions.
   - name: ๐Ÿš€ Feature suggestions
-    url: https://bazarr.featureupvote.com/
-    about: Share your suggestions or ideas to make Bazarr better!
-  - name: ๐ŸŒ Discord Support
-    url: https://discord.gg/MH2e2eb
-    about: Ask questions and talk about bazarr
+    url: https://github.com/LavX/bazarr/issues
+    about: Share your suggestions or ideas to make Bazarr+ better!
diff --git a/.github/scripts/build_test.sh b/.github/scripts/build_test.sh
index 56ccd6c1a7..d0714b5db0 100755
--- a/.github/scripts/build_test.sh
+++ b/.github/scripts/build_test.sh
@@ -7,7 +7,7 @@ sleep 30
 
 if kill -s 0 $PID
 then
-  echo "Bazarr is still running. We'll test if UI is working..."
+  echo "Bazarr+ is still running. We'll test if UI is working..."
 else
   exit 1
 fi
diff --git a/.github/workflows/build-docker-manual.yml b/.github/workflows/build-docker-manual.yml
index ea7409caa2..e310afe027 100644
--- a/.github/workflows/build-docker-manual.yml
+++ b/.github/workflows/build-docker-manual.yml
@@ -15,10 +15,6 @@ on:
         options:
           - master
           - development
-          - feature/audio-display-with-filter
-          - python_3_14
-          - ai_translate
-          - no_telemetry
         default: 'master'
       
       build_type:
@@ -33,7 +29,7 @@ on:
         default: 'dev'
       
       version_tag:
-        description: 'Version tag (e.g., v1.5.3) - used for release builds'
+        description: 'Version tag (e.g., v2.0.0) - used for release builds'
         required: false
         default: ''
         type: string
@@ -60,82 +56,11 @@ on:
           - linux/arm64
         default: 'linux/amd64,linux/arm64'
       
-      skip_scraper:
-        description: 'Skip building scraper image'
-        required: false
-        type: boolean
-        default: false
-
 env:
   REGISTRY: ghcr.io
-  # Note: IMAGE_NAME and SCRAPER_IMAGE_NAME are set dynamically in jobs to ensure lowercase
   UI_DIRECTORY: ./frontend
 
 jobs:
-  # ==========================================================================
-  # Build Scraper Image (optional)
-  # ==========================================================================
-  build-scraper:
-    if: ${{ !inputs.skip_scraper }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Set lowercase image names
-        run: |
-          echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
-          echo "SCRAPER_IMAGE_NAME=${GITHUB_REPOSITORY_OWNER,,}/opensubtitles-scraper" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: ${{ inputs.branch }}
-          submodules: recursive
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Determine Scraper Tags
-        id: scraper-tags
-        run: |
-          TAGS="${{ env.REGISTRY }}/${{ env.SCRAPER_IMAGE_NAME }}:sha-$(git rev-parse --short HEAD)"
-          
-          case "${{ inputs.build_type }}" in
-            release)
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.SCRAPER_IMAGE_NAME }}:latest"
-              ;;
-            nightly)
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.SCRAPER_IMAGE_NAME }}:nightly"
-              ;;
-            dev)
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.SCRAPER_IMAGE_NAME }}:dev"
-              ;;
-          esac
-          
-          echo "tags=$TAGS" >> $GITHUB_OUTPUT
-
-      - name: Build and Push Scraper Image
-        uses: docker/build-push-action@v6
-        with:
-          context: ./opensubtitles-scraper
-          file: ./opensubtitles-scraper/Dockerfile
-          platforms: ${{ inputs.platforms }}
-          push: true
-          tags: ${{ steps.scraper-tags.outputs.tags }}
-          cache-from: type=gha,scope=scraper
-          cache-to: type=gha,mode=max,scope=scraper
-
   # ==========================================================================
   # Build Frontend
   # ==========================================================================
@@ -148,7 +73,7 @@ jobs:
           ref: ${{ inputs.branch }}
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: "${{ env.UI_DIRECTORY }}/.nvmrc"
           cache: 'npm'
@@ -185,7 +110,6 @@ jobs:
       - name: Set lowercase image names
         run: |
           echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
-          echo "SCRAPER_IMAGE_NAME=${GITHUB_REPOSITORY_OWNER,,}/opensubtitles-scraper" >> $GITHUB_ENV
 
       - name: Checkout
         uses: actions/checkout@v5
@@ -233,7 +157,7 @@ jobs:
                 VERSION=$(git describe --tags --always 2>/dev/null || echo "0.0.0")
               fi
               VERSION="${VERSION#v}"  # Remove 'v' prefix
-              FORK_VERSION="${VERSION}-lavx"
+              FORK_VERSION="${VERSION}"
               
               TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${FORK_VERSION}"
               TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:v${VERSION}"
@@ -277,11 +201,16 @@ jobs:
               if [ -z "$CUSTOM_TAG" ]; then
                 CUSTOM_TAG="custom-${SHORT_SHA}"
               fi
-              FORK_VERSION="${CUSTOM_TAG}"
-              
+              # Use version_tag for display if provided, otherwise custom tag
+              if [ -n "${{ inputs.version_tag }}" ]; then
+                FORK_VERSION="${{ inputs.version_tag }}"
+              else
+                FORK_VERSION="${CUSTOM_TAG}"
+              fi
+
               TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${CUSTOM_TAG}"
               TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${SHORT_SHA}"
-              
+
               echo "display_version=${FORK_VERSION}" >> $GITHUB_OUTPUT
               ;;
           esac
@@ -322,8 +251,8 @@ jobs:
           push: true
           tags: ${{ steps.version.outputs.tags }}
           labels: |
-            org.opencontainers.image.title=Bazarr (LavX Fork)
-            org.opencontainers.image.description=Bazarr with OpenSubtitles.org scraper support
+            org.opencontainers.image.title=Bazarr+
+            org.opencontainers.image.description=Bazarr+ - enhanced subtitle management
             org.opencontainers.image.vendor=LavX
             org.opencontainers.image.version=${{ steps.version.outputs.fork_version }}
             org.opencontainers.image.revision=${{ github.sha }}
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 9f6047b681..4522e7f11a 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -3,7 +3,6 @@ name: Build Docker Image
 on:
   push:
     branches:
-      - main
       - master
     paths-ignore:
       - '*.md'
@@ -12,82 +11,16 @@ on:
   workflow_dispatch:
     inputs:
       version_tag:
-        description: 'Version tag for the image (e.g., v1.5.3)'
-        required: false
-        default: ''
-        type: string
-  workflow_call:
-    inputs:
-      version_tag:
-        description: 'Version tag for the image'
+        description: 'Version tag for the image (e.g., v2.0.0)'
         required: false
         default: ''
         type: string
 
 env:
   REGISTRY: ghcr.io
-  # Note: IMAGE_NAME and SCRAPER_IMAGE_NAME are set dynamically in jobs to ensure lowercase
   UI_DIRECTORY: ./frontend
 
 jobs:
-  # ==========================================================================
-  # Build Scraper Image (separate job with its own cache)
-  # ==========================================================================
-  build-scraper:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Set lowercase image names
-        run: |
-          echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
-          echo "SCRAPER_IMAGE_NAME=${GITHUB_REPOSITORY_OWNER,,}/opensubtitles-scraper" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract Scraper Metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.SCRAPER_IMAGE_NAME }}
-          tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=sha,prefix=sha-
-            type=ref,event=branch
-          labels: |
-            org.opencontainers.image.title=OpenSubtitles.org Scraper
-            org.opencontainers.image.description=Web scraper service for OpenSubtitles.org
-            org.opencontainers.image.vendor=LavX
-
-      - name: Build and Push Scraper Image
-        uses: docker/build-push-action@v6
-        with:
-          context: ./opensubtitles-scraper
-          file: ./opensubtitles-scraper/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=scraper
-          cache-to: type=gha,mode=max,scope=scraper
-
   # ==========================================================================
   # Build Frontend (cached via GitHub Actions cache)
   # ==========================================================================
@@ -98,7 +31,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: "${{ env.UI_DIRECTORY }}/.nvmrc"
           cache: 'npm'
@@ -123,7 +56,7 @@ jobs:
   # Build and Push Bazarr Image
   # ==========================================================================
   build-and-push:
-    needs: [build-frontend, build-scraper]
+    needs: [build-frontend]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -132,10 +65,9 @@ jobs:
       id-token: write
 
     steps:
-      - name: Set lowercase image names
+      - name: Set lowercase image name
         run: |
           echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> $GITHUB_ENV
-          echo "SCRAPER_IMAGE_NAME=${GITHUB_REPOSITORY_OWNER,,}/opensubtitles-scraper" >> $GITHUB_ENV
 
       - name: Checkout
         uses: actions/checkout@v5
@@ -176,19 +108,17 @@ jobs:
           # Remove 'v' prefix for semver
           SEMVER="${VERSION#v}"
           
-          # Create LavX fork version
+          # Bazarr+ version is the semver tag directly
           SHORT_SHA=$(git rev-parse --short HEAD)
-          BUILD_DATE=$(date -u +%Y%m%d)
-          FORK_VERSION="${SEMVER}-lavx.${BUILD_DATE}"
-          
+          FORK_VERSION="${SEMVER}"
+
           echo "version=$VERSION" >> $GITHUB_OUTPUT
           echo "semver=$SEMVER" >> $GITHUB_OUTPUT
           echo "fork_version=$FORK_VERSION" >> $GITHUB_OUTPUT
           echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT
-          
+
           echo "## Version Info" >> $GITHUB_STEP_SUMMARY
-          echo "- **Base Version:** $VERSION" >> $GITHUB_STEP_SUMMARY
-          echo "- **Fork Version:** $FORK_VERSION" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version:** $FORK_VERSION" >> $GITHUB_STEP_SUMMARY
           echo "- **Short SHA:** $SHORT_SHA" >> $GITHUB_STEP_SUMMARY
 
       - name: Extract Docker Metadata
@@ -199,15 +129,15 @@ jobs:
           tags: |
             # Latest tag on main/master branch
             type=raw,value=latest,enable={{is_default_branch}}
-            # Version tag (e.g., v1.5.3-lavx.20241214)
+            # Version tag (e.g., v2.0.0)
             type=raw,value=${{ steps.version.outputs.fork_version }}
             # Short SHA tag
             type=raw,value=sha-${{ steps.version.outputs.short_sha }}
             # Branch name
             type=ref,event=branch
           labels: |
-            org.opencontainers.image.title=Bazarr (LavX Fork)
-            org.opencontainers.image.description=Bazarr with OpenSubtitles.org scraper support
+            org.opencontainers.image.title=Bazarr+
+            org.opencontainers.image.description=Bazarr+ - enhanced subtitle management
             org.opencontainers.image.vendor=LavX
             org.opencontainers.image.version=${{ steps.version.outputs.fork_version }}
 
@@ -242,17 +172,12 @@ jobs:
         run: |
           echo "## ๐Ÿณ Docker Images Published" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Bazarr (LavX Fork)" >> $GITHUB_STEP_SUMMARY
+          echo "### Bazarr+" >> $GITHUB_STEP_SUMMARY
           echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
           echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" >> $GITHUB_STEP_SUMMARY
           echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.fork_version }}" >> $GITHUB_STEP_SUMMARY
           echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### OpenSubtitles Scraper" >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`bash" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.SCRAPER_IMAGE_NAME }}:latest" >> $GITHUB_STEP_SUMMARY
-          echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
           echo "### Image Details" >> $GITHUB_STEP_SUMMARY
           echo "- **Digest:** \`${{ steps.push.outputs.digest }}\`" >> $GITHUB_STEP_SUMMARY
           echo "- **Platforms:** linux/amd64, linux/arm64" >> $GITHUB_STEP_SUMMARY
@@ -279,17 +204,12 @@ jobs:
             ## ๐Ÿณ Docker Images
             
             ```bash
-            # Bazarr (LavX Fork)
             docker pull ghcr.io/${{ github.repository }}:${{ github.ref_name }}
-            
-            # OpenSubtitles Scraper
-            docker pull ghcr.io/${{ github.repository_owner }}/opensubtitles-scraper:latest
             ```
             
             ## ๐Ÿ“ Changes
             
             This release is based on upstream Bazarr with the following custom modifications:
             - OpenSubtitles.org web scraper provider (no VIP API needed)
-            - Auto-sync with upstream daily at 4 AM UTC
             
             See the auto-generated release notes below for detailed changes.
\ No newline at end of file
diff --git a/.github/workflows/build-scraper.yml b/.github/workflows/build-scraper.yml
deleted file mode 100644
index c0556a4b34..0000000000
--- a/.github/workflows/build-scraper.yml
+++ /dev/null
@@ -1,276 +0,0 @@
-name: Build OpenSubtitles Scraper
-
-# =============================================================================
-# Standalone workflow for building the OpenSubtitles Scraper Docker image
-# Can be triggered manually with version and platform options
-# =============================================================================
-
-on:
-  workflow_dispatch:
-    inputs:
-      build_type:
-        description: 'Build type'
-        required: true
-        type: choice
-        options:
-          - release      # latest + version tag
-          - dev          # dev + sha tag
-          - nightly      # nightly + date tag
-        default: 'dev'
-      
-      version_tag:
-        description: 'Version tag (e.g., v1.0.0) - used for release builds'
-        required: false
-        default: ''
-        type: string
-      
-      python_version:
-        description: 'Python version for the image'
-        required: true
-        type: choice
-        options:
-          - '3.14'
-          - '3.13'
-          - '3.12'
-        default: '3.14'
-      
-      enable_jit:
-        description: 'Enable Python JIT compiler'
-        required: false
-        type: boolean
-        default: true
-      
-      platforms:
-        description: 'Target platforms'
-        required: true
-        type: choice
-        options:
-          - linux/amd64,linux/arm64
-          - linux/amd64
-          - linux/arm64
-        default: 'linux/amd64,linux/arm64'
-      
-      push_latest:
-        description: 'Also tag as latest'
-        required: false
-        type: boolean
-        default: false
-
-env:
-  REGISTRY: ghcr.io
-  # Note: IMAGE_NAME is set dynamically in job to ensure lowercase
-
-jobs:
-  build-scraper:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-
-    steps:
-      - name: Set lowercase image name
-        run: |
-          echo "IMAGE_NAME=${GITHUB_REPOSITORY_OWNER,,}/opensubtitles-scraper" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Determine Version and Tags
-        id: version
-        working-directory: ./opensubtitles-scraper
-        run: |
-          SHORT_SHA=$(git rev-parse --short HEAD)
-          BUILD_DATE=$(date -u +%Y%m%d)
-          PYTHON_VER="${{ inputs.python_version }}"
-          JIT_SUFFIX="${{ inputs.enable_jit == true && '-jit' || '' }}"
-          
-          # Initialize tags
-          TAGS=""
-          VERSION=""
-          
-          case "${{ inputs.build_type }}" in
-            release)
-              if [ -n "${{ inputs.version_tag }}" ]; then
-                VERSION="${{ inputs.version_tag }}"
-              else
-                VERSION=$(git describe --tags --always 2>/dev/null || echo "1.0.0")
-              fi
-              VERSION="${VERSION#v}"
-              DISPLAY_VERSION="v${VERSION}-py${PYTHON_VER}${JIT_SUFFIX}"
-              
-              TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:v${VERSION}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:py${PYTHON_VER}${JIT_SUFFIX}"
-              ;;
-              
-            nightly)
-              VERSION="nightly-${BUILD_DATE}"
-              DISPLAY_VERSION="${VERSION}-py${PYTHON_VER}${JIT_SUFFIX}"
-              
-              TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-${BUILD_DATE}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-py${PYTHON_VER}${JIT_SUFFIX}"
-              ;;
-              
-            dev)
-              VERSION="dev-${SHORT_SHA}"
-              DISPLAY_VERSION="${VERSION}-py${PYTHON_VER}${JIT_SUFFIX}"
-              
-              TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-${SHORT_SHA}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-py${PYTHON_VER}${JIT_SUFFIX}"
-              ;;
-          esac
-          
-          # Always add sha tag for immutability
-          TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${SHORT_SHA}"
-          
-          # Add latest if requested
-          if [ "${{ inputs.push_latest }}" == "true" ]; then
-            TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
-          fi
-          
-          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "display_version=${DISPLAY_VERSION}" >> $GITHUB_OUTPUT
-          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
-          echo "python_version=${PYTHON_VER}" >> $GITHUB_OUTPUT
-          echo "jit_enabled=${{ inputs.enable_jit }}" >> $GITHUB_OUTPUT
-          
-          # Build summary
-          echo "## ๐Ÿท๏ธ Scraper Build Info" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "| Property | Value |" >> $GITHUB_STEP_SUMMARY
-          echo "|----------|-------|" >> $GITHUB_STEP_SUMMARY
-          echo "| **Build Type** | ${{ inputs.build_type }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Version** | ${DISPLAY_VERSION} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Python** | ${PYTHON_VER} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **JIT** | ${{ inputs.enable_jit }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Platforms** | ${{ inputs.platforms }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **SHA** | ${SHORT_SHA} |" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Tags" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "${TAGS}" | tr ',' '\n' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-
-      - name: Generate Dockerfile with Python version
-        run: |
-          cd opensubtitles-scraper
-          
-          # Create a modified Dockerfile with the selected Python version
-          cat > Dockerfile.build << EOF
-          # Generated Dockerfile with Python ${{ steps.version.outputs.python_version }}
-          FROM python:${{ steps.version.outputs.python_version }}-slim
-          
-          # Set working directory
-          WORKDIR /app
-          
-          # Install system dependencies
-          RUN apt-get update && apt-get install -y \\
-              gcc \\
-              && rm -rf /var/lib/apt/lists/*
-          
-          # Set environment variables
-          ENV PYTHONDONTWRITEBYTECODE=1 \\
-              PYTHONUNBUFFERED=1
-          EOF
-          
-          # Add JIT env var if enabled
-          if [ "${{ inputs.enable_jit }}" == "true" ]; then
-            echo 'ENV PYTHON_JIT=1' >> Dockerfile.build
-          fi
-          
-          cat >> Dockerfile.build << 'EOF'
-          
-          # Copy requirements file
-          COPY requirements.txt .
-          
-          # Install Python dependencies
-          RUN pip install --no-cache-dir --upgrade pip && \
-              pip install --no-cache-dir -r requirements.txt
-          
-          # Copy application code
-          COPY . .
-          
-          # Expose port 8000
-          EXPOSE 8000
-          
-          # Health check
-          HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-              CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8000/health')" || exit 1
-          
-          # Run the application
-          CMD ["python", "main.py"]
-          EOF
-          
-          cat Dockerfile.build
-
-      - name: Build and Push Scraper Image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./opensubtitles-scraper
-          file: ./opensubtitles-scraper/Dockerfile.build
-          platforms: ${{ inputs.platforms }}
-          push: true
-          tags: ${{ steps.version.outputs.tags }}
-          labels: |
-            org.opencontainers.image.title=OpenSubtitles.org Scraper
-            org.opencontainers.image.description=Web scraper service for OpenSubtitles.org (LavX Fork)
-            org.opencontainers.image.vendor=LavX
-            org.opencontainers.image.version=${{ steps.version.outputs.display_version }}
-            org.opencontainers.image.revision=${{ github.sha }}
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.python-version=${{ steps.version.outputs.python_version }}
-            org.opencontainers.image.jit-enabled=${{ inputs.enable_jit }}
-          cache-from: type=gha,scope=scraper-${{ inputs.python_version }}
-          cache-to: type=gha,mode=max,scope=scraper-${{ inputs.python_version }}
-
-      - name: Generate Artifact Attestation
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true
-
-      - name: Create Build Summary
-        run: |
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "## ๐Ÿณ Scraper Image Published" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Pull Commands" >> $GITHUB_STEP_SUMMARY
-          echo '```bash' >> $GITHUB_STEP_SUMMARY
-          echo "# By version" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "# By SHA (immutable)" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${{ steps.version.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "# With Python version tag" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.build_type }}-py${{ inputs.python_version }}${{ inputs.enable_jit == true && '-jit' || '' }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Image Details" >> $GITHUB_STEP_SUMMARY
-          echo "- **Digest:** \`${{ steps.push.outputs.digest }}\`" >> $GITHUB_STEP_SUMMARY
-          echo "- **Platforms:** ${{ inputs.platforms }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Python Version:** ${{ inputs.python_version }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **JIT Enabled:** ${{ inputs.enable_jit }}" >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
diff --git a/.github/workflows/build-translator.yml b/.github/workflows/build-translator.yml
deleted file mode 100644
index 1d1fa34fab..0000000000
--- a/.github/workflows/build-translator.yml
+++ /dev/null
@@ -1,306 +0,0 @@
-name: Build AI Subtitle Translator
-
-# =============================================================================
-# Standalone workflow for building the AI Subtitle Translator Docker image
-# Can be triggered manually with version and platform options
-# =============================================================================
-
-on:
-  workflow_dispatch:
-    inputs:
-      source_branch:
-        description: 'Branch containing the ai-subtitle-translator submodule'
-        required: true
-        type: choice
-        options:
-          - ai_translate
-          - development
-          - master
-        default: 'ai_translate'
-      
-      build_type:
-        description: 'Build type'
-        required: true
-        type: choice
-        options:
-          - release      # latest + version tag
-          - dev          # dev + sha tag
-          - nightly      # nightly + date tag
-        default: 'dev'
-      
-      version_tag:
-        description: 'Version tag (e.g., v1.0.0) - used for release builds'
-        required: false
-        default: ''
-        type: string
-      
-      python_version:
-        description: 'Python version for the image'
-        required: true
-        type: choice
-        options:
-          - '3.14'
-          - '3.13'
-          - '3.12'
-        default: '3.14'
-      
-      enable_jit:
-        description: 'Enable Python JIT compiler'
-        required: false
-        type: boolean
-        default: true
-      
-      platforms:
-        description: 'Target platforms'
-        required: true
-        type: choice
-        options:
-          - linux/amd64,linux/arm64
-          - linux/amd64
-          - linux/arm64
-        default: 'linux/amd64,linux/arm64'
-      
-      push_latest:
-        description: 'Also tag as latest'
-        required: false
-        type: boolean
-        default: false
-
-env:
-  REGISTRY: ghcr.io
-  # Force lowercase for Docker image names
-  IMAGE_NAME: lavx/ai-subtitle-translator
-
-jobs:
-  build-translator:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: ${{ inputs.source_branch }}
-          submodules: recursive
-          fetch-depth: 0
-      
-      - name: Verify submodule exists
-        run: |
-          if [ ! -d "ai-subtitle-translator" ]; then
-            echo "โŒ Error: ai-subtitle-translator submodule not found!"
-            echo "The selected branch '${{ inputs.source_branch }}' may not have the submodule configured."
-            echo ""
-            echo "Available branches with the submodule:"
-            echo "  - ai_translate (recommended)"
-            exit 1
-          fi
-          echo "โœ… Submodule found: ai-subtitle-translator"
-          ls -la ai-subtitle-translator/
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Determine Version and Tags
-        id: version
-        working-directory: ./ai-subtitle-translator
-        run: |
-          SHORT_SHA=$(git rev-parse --short HEAD)
-          BUILD_DATE=$(date -u +%Y%m%d)
-          PYTHON_VER="${{ inputs.python_version }}"
-          JIT_SUFFIX="${{ inputs.enable_jit == true && '-jit' || '' }}"
-          
-          # Initialize tags
-          TAGS=""
-          VERSION=""
-          
-          case "${{ inputs.build_type }}" in
-            release)
-              if [ -n "${{ inputs.version_tag }}" ]; then
-                VERSION="${{ inputs.version_tag }}"
-              else
-                VERSION=$(git describe --tags --always 2>/dev/null || echo "1.0.0")
-              fi
-              VERSION="${VERSION#v}"
-              DISPLAY_VERSION="v${VERSION}-py${PYTHON_VER}${JIT_SUFFIX}"
-              
-              TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${VERSION}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:v${VERSION}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:py${PYTHON_VER}${JIT_SUFFIX}"
-              ;;
-              
-            nightly)
-              VERSION="nightly-${BUILD_DATE}"
-              DISPLAY_VERSION="${VERSION}-py${PYTHON_VER}${JIT_SUFFIX}"
-              
-              TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-${BUILD_DATE}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-py${PYTHON_VER}${JIT_SUFFIX}"
-              ;;
-              
-            dev)
-              VERSION="dev-${SHORT_SHA}"
-              DISPLAY_VERSION="${VERSION}-py${PYTHON_VER}${JIT_SUFFIX}"
-              
-              TAGS="${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-${SHORT_SHA}"
-              TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:dev-py${PYTHON_VER}${JIT_SUFFIX}"
-              ;;
-          esac
-          
-          # Always add sha tag for immutability
-          TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${SHORT_SHA}"
-          
-          # Add latest if requested
-          if [ "${{ inputs.push_latest }}" == "true" ]; then
-            TAGS="${TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest"
-          fi
-          
-          echo "tags=${TAGS}" >> $GITHUB_OUTPUT
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "display_version=${DISPLAY_VERSION}" >> $GITHUB_OUTPUT
-          echo "short_sha=${SHORT_SHA}" >> $GITHUB_OUTPUT
-          echo "python_version=${PYTHON_VER}" >> $GITHUB_OUTPUT
-          echo "jit_enabled=${{ inputs.enable_jit }}" >> $GITHUB_OUTPUT
-          
-          # Build summary
-          echo "## ๐Ÿท๏ธ AI Subtitle Translator Build Info" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "| Property | Value |" >> $GITHUB_STEP_SUMMARY
-          echo "|----------|-------|" >> $GITHUB_STEP_SUMMARY
-          echo "| **Build Type** | ${{ inputs.build_type }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Version** | ${DISPLAY_VERSION} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Python** | ${PYTHON_VER} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **JIT** | ${{ inputs.enable_jit }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **Platforms** | ${{ inputs.platforms }} |" >> $GITHUB_STEP_SUMMARY
-          echo "| **SHA** | ${SHORT_SHA} |" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Tags" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "${TAGS}" | tr ',' '\n' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-
-      - name: Generate Dockerfile with Python version
-        run: |
-          cd ai-subtitle-translator
-          
-          # Create a modified Dockerfile with the selected Python version
-          cat > Dockerfile.build << EOF
-          # Generated Dockerfile with Python ${{ steps.version.outputs.python_version }}
-          FROM python:${{ steps.version.outputs.python_version }}-slim
-          
-          # Set working directory
-          WORKDIR /app
-          
-          # Install system dependencies
-          RUN apt-get update && apt-get install -y --no-install-recommends \\
-              gcc curl \\
-              && rm -rf /var/lib/apt/lists/*
-          
-          # Set environment variables
-          ENV PYTHONDONTWRITEBYTECODE=1 \\
-              PYTHONUNBUFFERED=1
-          EOF
-          
-          # Add JIT env var if enabled
-          if [ "${{ inputs.enable_jit }}" == "true" ]; then
-            echo 'ENV PYTHON_JIT=1' >> Dockerfile.build
-          fi
-          
-          cat >> Dockerfile.build << 'EOF'
-          
-          # Copy requirements first for better caching
-          COPY requirements.txt .
-          
-          # Install Python dependencies
-          RUN pip install --no-cache-dir --upgrade pip && \
-              pip install --no-cache-dir -r requirements.txt
-          
-          # Copy source code and project files
-          COPY pyproject.toml .
-          COPY src/ ./src/
-          
-          # Install the package itself (makes subtitle_translator importable)
-          RUN pip install --no-cache-dir -e .
-          
-          # Create non-root user for security
-          RUN useradd --create-home --shell /bin/bash appuser && \
-              chown -R appuser:appuser /app
-          USER appuser
-          
-          # Expose port 8765
-          EXPOSE 8765
-          
-          # Health check
-          HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
-              CMD curl -f http://localhost:8765/health || exit 1
-          
-          # Run the application
-          CMD ["uvicorn", "subtitle_translator.main:app", "--host", "0.0.0.0", "--port", "8765"]
-          EOF
-          
-          cat Dockerfile.build
-
-      - name: Build and Push Translator Image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: ./ai-subtitle-translator
-          file: ./ai-subtitle-translator/Dockerfile.build
-          platforms: ${{ inputs.platforms }}
-          push: true
-          tags: ${{ steps.version.outputs.tags }}
-          labels: |
-            org.opencontainers.image.title=AI Subtitle Translator
-            org.opencontainers.image.description=LLM-powered subtitle translation service using OpenRouter API
-            org.opencontainers.image.vendor=LavX
-            org.opencontainers.image.version=${{ steps.version.outputs.display_version }}
-            org.opencontainers.image.revision=${{ github.sha }}
-            org.opencontainers.image.source=https://github.com/${{ github.repository }}
-            org.opencontainers.image.python-version=${{ steps.version.outputs.python_version }}
-            org.opencontainers.image.jit-enabled=${{ inputs.enable_jit }}
-          cache-from: type=gha,scope=translator-${{ inputs.python_version }}
-          cache-to: type=gha,mode=max,scope=translator-${{ inputs.python_version }}
-
-      - name: Generate Artifact Attestation
-        uses: actions/attest-build-provenance@v2
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true
-
-      - name: Create Build Summary
-        run: |
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "## ๐Ÿณ AI Subtitle Translator Image Published" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Pull Commands" >> $GITHUB_STEP_SUMMARY
-          echo '```bash' >> $GITHUB_STEP_SUMMARY
-          echo "# By version" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.version }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "# By SHA (immutable)" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:sha-${{ steps.version.outputs.short_sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "# With Python version tag" >> $GITHUB_STEP_SUMMARY
-          echo "docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.build_type }}-py${{ inputs.python_version }}${{ inputs.enable_jit == true && '-jit' || '' }}" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### Image Details" >> $GITHUB_STEP_SUMMARY
-          echo "- **Digest:** \`${{ steps.push.outputs.digest }}\`" >> $GITHUB_STEP_SUMMARY
-          echo "- **Platforms:** ${{ inputs.platforms }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Python Version:** ${{ inputs.python_version }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **JIT Enabled:** ${{ inputs.enable_jit }}" >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0848a9e187..6699519db9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [master, development]
     paths:
       - frontend/**
       - bazarr/**
@@ -14,7 +14,7 @@ on:
       - dev-requirements.txt
       - .github/workflows/ci.yml
   pull_request:
-    branches: [main]
+    branches: [master, development]
 
 env:
   ROOT_DIRECTORY: .
@@ -77,7 +77,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14' ]
+        python-version: [ '3.12', '3.13', '3.14' ]
     name: Python ${{ matrix.python-version }} backend
 
     steps:
@@ -90,7 +90,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install UI
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.UI_ARTIFACT_NAME }}
           path: "${{ env.UI_DIRECTORY }}/build"
diff --git a/.github/workflows/test_bazarr_execution.yml b/.github/workflows/test_bazarr_execution.yml
index cca016553e..0272c6ebf5 100644
--- a/.github/workflows/test_bazarr_execution.yml
+++ b/.github/workflows/test_bazarr_execution.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14' ]
+        python-version: [ '3.12', '3.13', '3.14' ]
     name: Python ${{ matrix.python-version }} test
 
     steps:
diff --git a/.gitignore b/.gitignore
index d70e8a9450..16e1ffd382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@ VERSION
 # Allow
 !*.dll
 
+.claude/
+.superpowers/
+docs/superpowers/
+.coverage
diff --git a/.gitmodules b/.gitmodules
index 8bfc782734..08ab19ed6e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "ai-subtitle-translator"]
 	path = ai-subtitle-translator
 	url = https://github.com/LavX/ai-subtitle-translator.git
+[submodule "bazarr-binaries"]
+	path = bazarr-binaries
+	url = https://github.com/LavX/bazarr-binaries.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ccf3419a4d..c9d3609e26 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,45 +1,120 @@
-# How to Contribute
+# Contributing to Bazarr+
 
 ## Tools required
 
-- Python 3.8.x to 3.12.x (3.10.x is highly recommended and 3.13 or greater is proscribed).
-- Pycharm or Visual Studio code IDE are recommended but if you're happy with VIM, enjoy it!
-- Git.
-- UI testing must be done using Chrome latest version.
+- Python 3.12+ (3.14 recommended, matches Docker image)
+- Node.js (version in `frontend/.nvmrc`)
+- Git
+- Docker and Docker Compose (for integration testing)
+- UI testing should be done in Chrome latest version
 
-## Warning
+## Branching
 
-As we're using Git in the development process, you better disable automatic update of Bazarr in UI or you may get your changes overwritten. Alternatively, you can completely disable the update module by running Bazarr with `--no-update` command line argument.
+### Branch model
 
-## Branching
+- `master` contains stable releases, tagged with semver versions (e.g., `v2.0.0`, `v2.1.0`)
+- `development` is the integration branch where upstream merges and new features land
+- Feature branches are created from `development` and merged back via PR
+
+### Rules
+
+- `master` is not merged back to `development`
+- All feature branches are branched from `development`
+- Cherry-picked upstream fixes go into `development` first, never directly to `master`
+
+## Upstream relationship
+
+Bazarr+ is a hard fork of [upstream Bazarr](https://github.com/morpheus65535/bazarr). There is no automatic synchronization. Bug fixes from upstream may be cherry-picked selectively when relevant, but upstream releases are not merged wholesale.
+
+## Contribution workflow
+
+1. Fork the repository
+2. Create a feature branch from `development`
+3. Make your changes
+4. Write or update tests for your changes
+5. Run linting and tests, verify they pass
+6. Submit a PR targeting the `development` branch
+
+For major changes, open an issue first to discuss the approach.
+
+## Linting
+
+All frontend code must pass ESLint before submitting a PR.
+
+```bash
+cd frontend
+
+# Check for lint errors
+npm run check
+
+# Auto-fix import sorting and formatting
+npx eslint --fix --ext .ts,.tsx src/
+```
+
+Fix all errors before submitting. Warnings should be addressed when practical.
+
+## Testing
+
+PRs should include tests when the change is testable. We use:
+
+- **Backend:** pytest for Python tests
+- **Frontend:** Vitest for React component and page tests
+
+```bash
+# Run backend tests
+pytest tests/
+
+# Run frontend tests
+cd frontend
+npm test
+
+# Run a specific test file
+npm test -- Translator
+```
+
+When to include tests:
+- New features: add tests covering the core behavior
+- Bug fixes: add a test that reproduces the bug and verifies the fix
+- Refactors: ensure existing tests still pass, add tests if coverage gaps exist
+
+When tests are optional:
+- Pure styling/CSS changes
+- Documentation updates
+- Config file changes
+
+## Commit messages
 
-### Basic rules
+Use conventional commit style:
 
-- `master` contains only stable releases (which have been merged to `master`) and is intended for end-users.
-- `development` is the target for testing (around 10% of users) and is not intended for end-users looking for stability.
-- `feature` is a temporary feature branch based on `development`.
+```
+feat(translator): add batch retry for failed jobs
+fix(ui): search field not clearing on page change
+refactor(scraper): simplify response parsing
+```
 
-### Conditions
+## Submodules
 
-- `master` is not merged back to `development`.
-- `development` is not re-based on `master`.
-- all `feature` branches are branched from `development` only.
-- Bugfixes created specifically for a feature branch are done there (because they are specific, they're not cherry-picked to `development`).
-- We will not release a patch (1.0.x) if a newer minor (1.x.0) has already been released. We only go forward.
+Bazarr+ includes two submodules:
+- `opensubtitles-scraper` - OpenSubtitles.org web scraper service
+- `ai-subtitle-translator` - AI-powered subtitle translator
 
-## Typical contribution workflow
+Changes to these should be submitted to their respective repositories:
+- [LavX/opensubtitles-scraper](https://github.com/LavX/opensubtitles-scraper)
+- [LavX/ai-subtitle-translator](https://github.com/LavX/ai-subtitle-translator)
 
-### Community devs
+## Running locally
 
-- Fork the repository or pull the latest changes if you already have forked it.
-- Checkout `development` branch.
-- Make the desired changes.
-- Submit a PR to Bazarr `development` branch.
-- Once reviewed, your PR will be merged using Squash and Merge with a meaningful commit message matching our standards.
+```bash
+# Clone with submodules
+git clone --recursive https://github.com/LavX/bazarr.git
+cd bazarr
 
-### Official devs team
+# Backend
+pip install -r requirements.txt
+python bazarr.py --no-update --config ./config
 
-- All commits must have a meaningful commit message (ex.: Fixed issue with this, Improved process abc, Added input field to UI, etc.).
-- Fixes can be made directly to `development` branch but keep in mind that a pre-release with a beta versioning will be created every day a new push is made.
-- Features must be developed in dedicated feature branch and merged back to `development` branch using PR.
-- Once reviewed, your PR will be merged by morpheus65535 using Squash and Merge with a meaningful message.
+# Frontend (separate terminal)
+cd frontend
+npm ci
+npm start
+```
diff --git a/Dockerfile b/Dockerfile
index 86ddab04ca..7daf41e6ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # =============================================================================
-# Bazarr LavX Fork - Production Docker Image
+# Bazarr+ Production Docker Image
 # =============================================================================
 # Multi-stage build optimized for layer caching
 # Based on Debian Slim for better compatibility (unrar, etc.)
@@ -42,8 +42,8 @@ ARG BAZARR_VERSION
 ARG BUILD_DATE
 ARG VCS_REF
 
-LABEL org.opencontainers.image.title="Bazarr (LavX Fork)" \
-      org.opencontainers.image.description="Bazarr with OpenSubtitles.org scraper support" \
+LABEL org.opencontainers.image.title="Bazarr+" \
+      org.opencontainers.image.description="Bazarr+ - enhanced subtitle management" \
       org.opencontainers.image.version="${BAZARR_VERSION}" \
       org.opencontainers.image.created="${BUILD_DATE}" \
       org.opencontainers.image.revision="${VCS_REF}" \
@@ -94,7 +94,7 @@ COPY bazarr ./bazarr
 # Write version to VERSION file so bazarr/main.py can read it
 RUN echo "${BAZARR_VERSION}" > /app/bazarr/VERSION
 
-# Copy fork identification file (shows "LavX Fork" in System Status)
+# Copy package identification file (shows version in System Status)
 COPY package_info /app/bazarr/package_info
 
 # Copy pre-built frontend (built in GitHub Actions workflow for caching)
@@ -102,11 +102,9 @@ COPY package_info /app/bazarr/package_info
 COPY frontend/build ./frontend/build
 
 # Set environment variables
-# PYTHON_JIT=1 enables the experimental JIT compiler (Python 3.13+)
 ENV HOME="/config" \
     PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
-    PYTHON_JIT=1
+    PYTHONUNBUFFERED=1
 
 # Volume for persistent data
 VOLUME /config
@@ -116,7 +114,7 @@ EXPOSE 6767
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 \
-    CMD curl -f http://localhost:6767/api/system/health || exit 1
+    CMD curl -f http://localhost:6767/api/system/ping || exit 1
 
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["python", "bazarr.py", "--no-update", "--config", "/config"]
\ No newline at end of file
diff --git a/README.md b/README.md
index bec72fea81..73183295da 100644
--- a/README.md
+++ b/README.md
@@ -1,40 +1,66 @@
-# Bazarr (LavX Fork) - "Neon Pulse"
+<p align="center">
+  <img src="screenshot/hero_eclipse_compact.png" alt="Bazarr+ v2.0.0 - Codename: Eclipse">
+</p>
 
 <p align="center">
+  <img src="frontend/public/images/logo128.png" alt="Bazarr+ Logo" width="128">
+</p>
+
+# <p align="center">Bazarr+
+
+
   <a href="https://ghcr.io/lavx/bazarr"><img src="https://img.shields.io/badge/ghcr.io-lavx%2Fbazarr-blue?style=for-the-badge&logo=docker" alt="Docker"></a>
   <a href="https://github.com/LavX/bazarr/releases/latest"><img src="https://img.shields.io/github/v/release/LavX/bazarr?style=for-the-badge&label=RELEASE" alt="Latest Release"></a>
   <a href="https://github.com/LavX/bazarr/actions/workflows/build-docker.yml"><img src="https://img.shields.io/github/actions/workflow/status/LavX/bazarr/build-docker.yml?style=for-the-badge&label=DOCKER%20BUILD" alt="Docker Build"></a>
 </p>
 
 <p align="center">
-  <strong>Automated subtitle management with OpenSubtitles.org scraper & AI-powered translation</strong>
+  <strong>Enhanced subtitle management built on <a href="https://www.bazarr.media">Bazarr</a></strong>
 </p>
 
 <p align="center">
-  This fork of <a href="https://github.com/morpheus65535/bazarr">Bazarr</a> includes:<br/>
-  - OpenSubtitles.org provider that works <strong>without VIP API credentials</strong> (survives the API shutdown)<br/>
-  - <strong>AI Subtitle Translator</strong> using OpenRouter LLMs for high-quality subtitle translation<br/>
-  - <strong>Batch translation</strong> for entire series/movie libraries<br/>
-  - <strong>Advanced table filters</strong> with collapsible panels, active filter pills, and audio language filtering
+  No tracking ยท Provider priority ยท OpenSubtitles.org web scraper ยท AI translation via OpenRouter (300+ LLMs) ยท API key encryption ยท batch translation ยท mass subtitle sync ยท 11 bulk operations ยท subtitle viewer ยท advanced table filters ยท security hardening ยท Python 3.14 ยท navy + amber dark theme
 </p>
 
 ---
 
-## OpenSubtitles.org API Shutdown Notice
-
-On **January 29, 2026**, OpenSubtitles.org [announced the final shutdown](https://forum.opensubtitles.org/viewtopic.php?t=19471) of their legacy XML-RPC API for **all third-party applications** -- both VIP and non-VIP users. The shutdown is taking effect in the coming weeks.
+## Switching from upstream Bazarr?
 
-**This fork is not affected.** It includes a self-hosted web scraper that accesses OpenSubtitles.org directly through the website, bypassing the API entirely. As long as the OpenSubtitles.org website remains accessible ([confirmed by the site admin](https://forum.opensubtitles.org/viewtopic.php?t=19471) to stay available as read-only), subtitle search and download will continue to work.
+- Migration can be as simple as replacing the container image with `ghcr.io/lavx/bazarr:latest` and starting the container
+- Back up your `/config` directory first
+- Bazarr+ uses independent versioning starting at v2.0.0, unrelated to upstream version numbers
+- Config changes made by Bazarr+ are not backwards-compatible with upstream Bazarr, so switching back requires restoring your backup
+- Recommended: test with a copy of your config before committing to the switch
 
-## Why This Fork Exists
-
-This fork was created after the [pull request (#3012)](https://github.com/morpheus65535/bazarr/pull/3012) to add OpenSubtitles.org web scraper support was declined by the upstream maintainer. The upstream decision is understandable -- they have agreements with OpenSubtitles and want to respect their infrastructure.
+---
 
-However, with the official API now being shut down, this fork with its scraper companion container is one of the few ways to maintain access to OpenSubtitles.org subtitles. The web scraper is rate-limited and respectful to their servers.
+## At a Glance
+
+| Feature | Upstream Bazarr | Bazarr+ |
+|---------|-----------------|---------|
+| **Provider Priority** | [Rejected](https://bazarr.featureupvote.com/suggestions/112323/provider-prioritization) (62 votes) | Dual mode: priority order with early stop, or classic simultaneous |
+| **OpenSubtitles.org (Scraper)** | Not available | Self-hosted FastAPI microservice via CloudScraper |
+| **AI Subtitle Translator (OpenRouter)** | Not available | 300+ LLMs + any custom model ID |
+| **API Key Encryption** | Not available | AES-256-GCM encryption for keys in transit |
+| **Translate from Missing Menu** | Not available | Action menu on missing subs with source language picker |
+| **Batch Translation** | Not available | Translate entire series/libraries from Wanted pages |
+| **Mass Subtitle Sync** | [Rejected](https://bazarr.featureupvote.com/suggestions/172013/mass-sync-all-subtitles) (249 votes) | Bulk sync from Tasks page or Mass Edit, skips already-synced |
+| **Bulk Operations** | One-at-a-time only | 11 batch actions: sync, translate, OCR fixes, common fixes, remove HI, remove tags, fix uppercase, reverse RTL, scan disk, search missing, upgrade (up to 10k items) |
+| **Dedicated Translator Settings** | Not available | 4-zone page with pricing, cost estimates, status panel |
+| **No Tracking** | GA4 + legacy UA phone home to Google | All telemetry removed, nothing phones home |
+| **Security Hardening** | MD5, no CSRF/SSRF/rate limiting | PBKDF2 (600k iter), CSRF, SSRF, brute-force, 4 more |
+| **Subtitle Viewer** | Not available | Read-only subtitle preview with SRT/VTT/ASS parsing, cue table, and format detection |
+| **Audio Language Display** | Not shown in tables | Badges in all table views |
+| **Advanced Table Filters** | No filters | Include/exclude audio, missing subtitle, title search |
+| **Floating Save + Ctrl+S** | Not available | Sticky save button with 3-option unsaved changes modal |
+| **Navy + Amber Theme** | Purple | `#121125` navy to `#fff8e1` cream, amber accents |
+| OpenSubtitles.com (API) | Available | Available |
+| Docker images | linuxserver.io / hotio | ghcr.io/lavx (self-built, multi-arch) |
+| Python runtime | 3.8-3.13 | 3.14 |
 
 ---
 
-## ๐Ÿš€ Quick Start
+## Quick Start
 
 ### Option 1: Docker Compose (Recommended)
 
@@ -60,66 +86,104 @@ docker pull ghcr.io/lavx/ai-subtitle-translator:latest
 
 ---
 
-## ๐Ÿ”Œ What's Different in This Fork?
+### Screenshots
 
-| Feature | Upstream Bazarr | LavX Fork |
-|---------|-----------------|-----------|
-| **OpenSubtitles.org (Scraper)** | โŒ Not available | โœ… Included (API-independent) |
-| **AI Subtitle Translator** | โŒ Not available | โœ… Included (OpenRouter, Gemini, Lingarr) |
-| **Batch Translation** | โŒ Not available | โœ… Translate entire series/libraries |
-| **Audio Language Display** | โŒ Not shown in tables | โœ… Audio languages visible in all table views |
-| **Advanced Table Filters** | โŒ Basic search only | โœ… Collapsible filter panel with active filter pills |
-| OpenSubtitles.org (API) | Shutting down | N/A (uses scraper instead) |
-| OpenSubtitles.com (API) | โœ… Available | โœ… Available |
-| Docker images | linuxserver/hotio | ghcr.io/lavx |
-| Python runtime | 3.11/3.12 | 3.14 with JIT |
-| Fork identification in UI | N/A | โœ… "LavX Fork - Neon Pulse" |
+| Series with batch actions | Mass translate dialog |
+|:---:|:---:|
+| ![Series Batch Actions](screenshot/series-batch-actions.png "Series list with batch toolbar and subtitle tools") | ![Mass Translate](screenshot/mass-translate.png "Mass translate dialog with model and language selection") |
 
-### ๐ŸŽฏ OpenSubtitles.org Scraper Provider
+| Series detail with fanart | Subtitle viewer |
+|:---:|:---:|
+| ![Series Detail](screenshot/series-detail.png "Series detail page with fanart bleed and episode list") | ![Subtitle Viewer](screenshot/subtitle-viewer.png "Read-only subtitle viewer with cue table") |
 
-This fork adds a **new subtitle provider** called "OpenSubtitles.org" that:
+| AI Translator settings |
+|:---:|
+| ![Translator Settings](screenshot/translator-settings-v2.png "AI Translator settings with connection, model tuning, and job queue") |
 
-- โœ… Works **without** API credentials or VIP subscription
-- โœ… Searches by IMDB ID for accurate results
-- โœ… Supports both movies and TV shows
-- โœ… Provides subtitle rating and download count info
-- โœ… Runs as a separate microservice for reliability
+---
 
-### ๐Ÿค– AI Subtitle Translator
+<details>
+<summary><strong>Feature Details</strong></summary>
 
-This fork includes an **LLM-powered subtitle translator** that:
+### OpenSubtitles.org Web Scraper
+OpenSubtitles.org shut down their XML-RPC API for all third-party apps, VIP included. Bazarr+ ships a self-hosted FastAPI microservice that scrapes OpenSubtitles.org directly via CloudScraper with optional FlareSolverr fallback. It provides search, subtitle listing, and download endpoints (`/api/v1/search`, `/api/v1/subtitles`, `/api/v1/download/subtitle`) and integrates into Bazarr's provider system through a mixin class. No API key or VIP subscription needed.
 
-- โœ… Uses **OpenRouter API** for access to 100+ AI models (Gemini, GPT, Claude, LLaMA, Grok, etc.)
-- โœ… Translates subtitles when no good match is found in your target language
-- โœ… **Async job queue** for handling multiple translations
-- โœ… Real-time **progress tracking** in Bazarr UI
-- โœ… Configurable directly in Bazarr Settings (API key, model, temperature, concurrent jobs)
-- โœ… Runs as a separate microservice for reliability
+### Provider Priority
+Upstream Bazarr queries all subtitle providers simultaneously and picks the highest-scored result. There's no way to prefer one provider over another. This has been [requested for 6 years](https://bazarr.featureupvote.com/suggestions/112323/provider-prioritization) (62 votes), but upstream rejected it as "won't happen," calling it a "major rework" that "would take months of development."
 
-**Repository:** [github.com/LavX/ai-subtitle-translator](https://github.com/LavX/ai-subtitle-translator)
+Bazarr+ solves it with a **Provider Priority toggle** in Settings > Providers. When enabled, providers are queried sequentially in the order you've arranged them. If a provider returns subtitles meeting the minimum score, Bazarr+ stops searching and uses those results. Your preferred providers (curated community sites, specialized language sources) always get first shot. When disabled, the original behavior is preserved: all providers queried simultaneously, best score wins.
 
-### ๐Ÿ” Advanced Table Filters
+### AI Subtitle Translation via OpenRouter
+Upstream has Google Translate, Gemini, and Lingarr. Bazarr+ adds **OpenRouter** as a fourth translator engine, giving access to 300+ LLMs (Claude, Gemini, GPT, LLaMA, Grok, and more) plus any custom model ID from openrouter.ai. It runs as a separate microservice with an async job queue supporting 1-5 concurrent jobs and 1-8 parallel batches. Features include:
+- **Translate from the subtitle action menu**: click (...) on a missing subtitle row, pick an existing source subtitle to translate from
+- **Batch translation** for entire series/movie libraries from the Wanted pages
+- **Dedicated settings page** with 4 zones: engine picker, connection config, model tuning (temperature, reasoning mode, parallel batches), and a live status panel showing queue stats, job progress, token usage, cost, and speed
+- **Model details** fetched live from the OpenRouter API with per-million token pricing, per-episode/movie cost estimates, context length, and prompt caching indicators
+- **AES-256-GCM encryption** for API keys in transit between Bazarr and the translator service, with a Test Connection button that validates encryption and API key status before saving
+- **Auto disk scan** triggers Sonarr/Radarr to rescan after translation completes
 
-All table views (Movies, Series, Wanted Movies, Wanted Series) feature a **sophisticated filter system**:
+### Subtitle Viewer
+Read-only subtitle preview accessible from the subtitle action menu. Supports SRT, VTT, and ASS/SSA formats with automatic format detection. Shows a cue table with timestamps and text, file size, and format badge. Useful for quickly checking subtitle content and timing without downloading.
 
-- โœ… **Collapsible filter panel** toggled via a filter button with active filter count badge
-- โœ… **Include/Exclude audio language** filters with labeled, searchable multi-select dropdowns
-- โœ… **Missing subtitle language** filter (on Wanted pages)
-- โœ… **Active filter pills** showing each active filter as a color-coded removable badge
-- โœ… **Clear all** button to reset all filters at once
-- โœ… **Search by title** with inline clear button
+### Advanced UI
+- **Table filters** on Wanted and Library pages: include/exclude audio language (multi-select), missing subtitle language filter, title search, with active filter chips and a collapsible filter panel
+- **Floating save button** with Ctrl+S/Cmd+S keyboard shortcut, visible only when settings have unsaved changes
+- **Three-button unsaved changes modal**: Save & Leave, Discard, or Keep Editing (upstream only has Leave/Stay)
+- **Navy + amber dark theme**: custom color palette from `#121125` (navy black) to `#fff8e1` (cream), with amber brand accents (`#e68a00` to `#b36b00`)
+- **Audio language display** as blue badges in all table views
 
-| Wanted Movies with filters | Series with audio filter |
-|:---:|:---:|
-| ![Wanted Movies Filter](/screenshot/filter-wanted-movies.png?raw=true "Wanted Movies with active filters") | ![Series Filter](/screenshot/filter-series-include.png?raw=true "Series with Include Audio filter") |
+### Mass Subtitle Sync
+Upstream lets you sync subtitles one at a time, or per-series via Mass Edit. But there's no way to sync your entire library at once. This has been [requested for years](https://bazarr.featureupvote.com/suggestions/172013/mass-sync-all-subtitles) (249 votes), but upstream rejected it as "won't happen," saying "Bazarr isn't a batch tool."
 
-| Mass Translate with filtered selection |
-|:---:|
-| ![Mass Translate](/screenshot/filter-mass-translate.png?raw=true "Mass Translate dialog with filtered items") |
+Bazarr+ adds two entry points for bulk sync:
+- **System Tasks page**: a "Mass Sync All Subtitles" task with a Run button that syncs every subtitle in your library
+- **Mass Edit pages**: a "Sync Subtitles" button for both Movies and Series editors, so you can select specific items and sync their subtitles in bulk
 
----
+Both use the existing ffsubsync engine. Already-synced subtitles are skipped by default (with a force re-sync option). Configurable max offset, Golden-Section Search, and framerate correction settings.
 
-## ๐Ÿ“ฆ Installation
+### Bulk Operations
+Select multiple movies or series from the library pages and apply operations in batch. Available from the toolbar that appears when items are selected, or from the System Tasks page for library-wide runs. Confirmation is required for operations on 100+ items. Up to 10,000 items per batch.
+
+**Subtitle modifications** (applied to all existing subtitles of selected items):
+- **Sync** -- align subtitle timing to audio using ffsubsync, with configurable max offset (1-600s), Golden-Section Search, framerate correction, and force re-sync
+- **OCR Fixes** -- correct common optical character recognition errors
+- **Common Fixes** -- apply standard subtitle formatting and whitespace corrections
+- **Remove Hearing Impaired** -- strip `[music]`, `(doorbell rings)`, and similar HI annotations
+- **Remove Style Tags** -- remove `<i>`, `<b>`, `<font>` and other formatting tags
+- **Fix Uppercase** -- convert ALL CAPS subtitles to proper case
+- **Reverse RTL** -- fix right-to-left punctuation for Arabic, Hebrew, and similar languages
+- **Translate** -- batch translate subtitles using any configured translator engine (Google, Gemini, Lingarr, or OpenRouter with 300+ LLMs)
+
+**Media operations** (search and scan actions for selected items):
+- **Scan Disk** -- rescan selected items for on-disk subtitle files
+- **Search Missing** -- search all configured providers for missing subtitles
+- **Upgrade** -- replace low-scoring subtitles with better matches from providers
+
+**Profile management:**
+- **Bulk profile assignment** -- select multiple movies or series and assign a language profile to all of them at once
+
+### No Tracking / No Telemetry
+Upstream Bazarr ships two analytics systems that phone home to Google: a GA4 property (`G-3820T18GE3`) in `bazarr/utilities/analytics.py` that reports your Bazarr version, Python version, Sonarr/Radarr versions, OS, subtitle provider usage, every download action, and languages searched, plus a legacy Universal Analytics tracker (`UA-86466078-1`) in the SubZero library dependency. Bazarr+ has removed both entirely. No usage data leaves your server.
+
+### Security Hardening
+8 areas upstream doesn't address:
+- **Password hashing**: PBKDF2-SHA256 with 600,000 iterations and 16-byte random salt (upstream uses plain MD5)
+- **CSRF protection**: cryptographic state tokens (`secrets.token_urlsafe(32)`) on Plex OAuth with timing-safe validation
+- **SSRF blocking**: DNS pinning with IP validation, blocks loopback and link-local addresses, fails closed
+- **Brute-force protection**: 5 failed attempts trigger 300-second lockout per IP, tracks up to 10,000 IPs with thread-safe OrderedDict
+- **Shell injection**: replaced naive character escaping with `shlex.quote()` (POSIX) and `subprocess.list2cmdline()` (Windows)
+- **Filesystem sandboxing**: blocks `/proc`, `/sys`, `/dev`, `/etc`, `/root`, `/tmp` and 4 others from the filesystem browser, resolves symlinks
+- **eval() removal**: replaced `eval()` in throttled provider cache with `json.loads()` to prevent arbitrary code execution
+- **API key comparison**: `hmac.compare_digest()` for constant-time comparison (upstream uses Python `in` operator, which is timing-dependent)
+
+### Python 3.14
+Dockerfile uses `python:3.14-slim-bookworm`. Upstream supports Python 3.8-3.13 and relies on third-party Docker images (LinuxServer.io, hotio). Bazarr+ builds and publishes its own multi-arch image to GHCR.
+
+</details>
+
+
+<details>
+<summary><strong>Installation and Configuration</strong></summary>
 
 ### Docker Compose Setup
 
@@ -127,13 +191,26 @@ Create a `docker-compose.yml` file:
 
 ```yaml
 services:
-  # OpenSubtitles.org Scraper Service (required for the scraper provider)
+  # FlareSolverr - Handles browser challenges for web scraping
+  flaresolverr:
+    image: ghcr.io/flaresolverr/flaresolverr:latest
+    container_name: flaresolverr
+    restart: unless-stopped
+    ports:
+      - "8191:8191"
+    environment:
+      - LOG_LEVEL=info
+
   opensubtitles-scraper:
     image: ghcr.io/lavx/opensubtitles-scraper:latest
     container_name: opensubtitles-scraper
     restart: unless-stopped
+    depends_on:
+      - flaresolverr
     ports:
       - "8000:8000"
+    environment:
+      - FLARESOLVERR_URL=http://flaresolverr:8191/v1
     healthcheck:
       test: ["CMD", "curl", "-sf", "http://localhost:8000/health"]
       interval: 30s
@@ -150,14 +227,14 @@ services:
     environment:
       # OpenRouter API key (can also be configured in Bazarr UI)
       - OPENROUTER_API_KEY=${OPENROUTER_API_KEY:-}
-      - OPENROUTER_DEFAULT_MODEL=google/gemini-2.5-flash-preview-05-20
+      - OPENROUTER_DEFAULT_MODEL=google/gemini-2.5-flash-lite-preview-09-2025
     healthcheck:
       test: ["CMD", "curl", "-sf", "http://localhost:8765/health"]
       interval: 30s
       timeout: 10s
       retries: 3
 
-  # Bazarr with OpenSubtitles.org scraper support
+  # Bazarr+
   bazarr:
     image: ghcr.io/lavx/bazarr:latest
     container_name: bazarr
@@ -173,8 +250,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/Budapest
-      # Enable the web scraper mode (auto-enables "Use Web Scraper" in settings)
-      - OPENSUBTITLES_USE_WEB_SCRAPER=true
       # Point to the scraper service (port 8000)
       - OPENSUBTITLES_SCRAPER_URL=http://opensubtitles-scraper:8000
     volumes:
@@ -195,32 +270,40 @@ docker compose up -d
 
 ### Environment Variables
 
-| Variable | Description | Default |
-|----------|-------------|---------|
-| `PUID` | User ID for file permissions | `1000` |
-| `PGID` | Group ID for file permissions | `1000` |
-| `TZ` | Timezone | `UTC` |
-| `OPENSUBTITLES_USE_WEB_SCRAPER` | Enable web scraper mode | `false` |
-| `OPENSUBTITLES_SCRAPER_URL` | URL of the scraper service | `http://localhost:8000` |
+| Variable | Default | Description |
+|----------|---------|-------------|
+| `PUID` | `1000` | User ID for file permissions |
+| `PGID` | `1000` | Group ID for file permissions |
+| `TZ` | `UTC` | Timezone (e.g., `Europe/Budapest`) |
+| `OPENSUBTITLES_SCRAPER_URL` | `http://opensubtitles-scraper:8000` | OpenSubtitles.org scraper service URL (port 8000, not 8765) |
+
+### Volumes
+
+| Path | Description |
+|------|-------------|
+| `/config` | Bazarr configuration and database |
+| `/movies` | Movies library (match your Radarr path) |
+| `/tv` | TV shows library (match your Sonarr path) |
 
 ### Enabling the Provider
 
-1. Go to **Settings** โ†’ **Providers**
-2. Enable **"OpenSubtitles.org"** (not OpenSubtitles.com - that's the API version)
-3. If `OPENSUBTITLES_USE_WEB_SCRAPER=true` is set, "Use Web Scraper" will auto-enable
+1. Go to **Settings** > **Providers**
+2. Enable **"OpenSubtitles.org"** (not OpenSubtitles.com, that's the API version)
+3. Set the scraper service URL (or use the `OPENSUBTITLES_SCRAPER_URL` env var)
 4. Save and test with a manual search
 
 ### Enabling AI Translation
 
-1. Go to **Settings** โ†’ **Subtitles** โ†’ **Translating**
-2. Select **"AI Subtitle Translator"** from the Translator dropdown
+1. Go to **Settings** > **AI Translator**
+2. Select **"AI Subtitle Translator"** as the translator engine
 3. Enter your **OpenRouter API Key** (get one at [openrouter.ai/keys](https://openrouter.ai/keys))
-4. Choose your preferred **AI Model** (Gemini 2.5 Flash recommended)
+4. Choose your preferred **AI Model** (Google: Gemini 2.5 Flash Lite Preview 09-2025 recommended)
 5. Save and test with a manual translation
 
----
+</details>
 
-## ๐Ÿ—๏ธ Architecture
+<details>
+<summary><strong>Architecture</strong></summary>
 
 ```
 โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
@@ -228,7 +311,7 @@ docker compose up -d
 โ”‚                                                                                   โ”‚
 โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”      โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”      โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”  โ”‚
 โ”‚  โ”‚       Bazarr           โ”‚      โ”‚ OpenSubtitles Scraper โ”‚      โ”‚   AI Sub    โ”‚  โ”‚
-โ”‚  โ”‚   (LavX Fork)          โ”‚      โ”‚     (Port 8000)       โ”‚      โ”‚ Translator  โ”‚  โ”‚
+โ”‚  โ”‚    (Bazarr+)            โ”‚      โ”‚     (Port 8000)       โ”‚      โ”‚ Translator  โ”‚  โ”‚
 โ”‚  โ”‚                        โ”‚      โ”‚                       โ”‚      โ”‚ (Port 8765) โ”‚  โ”‚
 โ”‚  โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”  โ”‚ HTTP โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”  โ”‚      โ”‚             โ”‚  โ”‚
 โ”‚  โ”‚  โ”‚ OpenSubtitles.orgโ”‚โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”‚ Search API      โ”‚  โ”‚      โ”‚ โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” โ”‚  โ”‚
@@ -247,30 +330,12 @@ docker compose up -d
 โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
 ```
 
----
+> **Note:** The scraper service can optionally use [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) (port 8191) to handle browser challenges. See the Docker Compose example above for the full setup.
 
-## ๐Ÿ› ๏ธ Configuration Options
+</details>
 
-### Environment Variables
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `PUID` | `1000` | User ID for file permissions |
-| `PGID` | `1000` | Group ID for file permissions |
-| `TZ` | `UTC` | Timezone (e.g., `Europe/Budapest`) |
-| `OPENSUBTITLES_SCRAPER_URL` | `http://opensubtitles-scraper:8765` | Scraper service URL |
-
-### Volumes
-
-| Path | Description |
-|------|-------------|
-| `/config` | Bazarr configuration and database |
-| `/movies` | Movies library (match your Radarr path) |
-| `/tv` | TV shows library (match your Sonarr path) |
-
----
-
-## ๐Ÿ”ง Troubleshooting
+<details>
+<summary><strong>Troubleshooting</strong></summary>
 
 ### Scraper Connection Issues
 
@@ -293,116 +358,22 @@ curl -X POST http://localhost:8000/search \
 |-------|----------|
 | "Connection refused" | Ensure scraper is running and healthy |
 | "No subtitles found" | Check IMDB ID is correct, try different language |
-| Provider not showing | Enable it in Settings โ†’ Providers |
+| Provider not showing | Enable it in Settings > Providers |
 | Wrong file permissions | Check PUID/PGID match your user |
 
----
-
-## ๐Ÿ“š Documentation
-
-- [Fork Maintenance Guide](docs/FORK_MAINTENANCE.md) - How sync works
-- [OpenSubtitles Scraper](https://github.com/LavX/opensubtitles-scraper) - Scraper docs
-- [AI Subtitle Translator](https://github.com/LavX/ai-subtitle-translator) - AI translator docs
-- [Bazarr Wiki](https://wiki.bazarr.media) - General Bazarr documentation
-
----
-
-## ๐Ÿค Contributing
-
-Contributions are welcome! Please:
-
-1. Fork this repository
-2. Create a feature branch
-3. Submit a pull request
-
-For major changes, please open an issue first.
-
----
-
-## ๐ŸŒ About the Maintainer
-
-This fork is maintained by **LavX**. Explore more of my projects and services:
-
-### ๐Ÿš€ Services
-- **[LavX Managed Systems](https://lavx.hu)** โ€“ Enterprise AI solutions, RAG systems, and LLMOps.
-- **[LavX News](https://news.lavx.hu)** โ€“ Latest insights on AI, Open Source, and emerging tech.
-- **[LMS Tools](https://tools.lavx.hu)** โ€“ 140+ free, privacy-focused online tools for developers and researchers.
-
-### ๐Ÿ› ๏ธ Open Source Projects
-- **[AI Subtitle Translator](https://github.com/LavX/ai-subtitle-translator)** โ€“ LLM-powered subtitle translator using OpenRouter API.
-- **[OpenSubtitles Scraper](https://github.com/LavX/opensubtitles-scraper)** โ€“ Web scraper for OpenSubtitles.org (no VIP required).
-- **[JFrog to Nexus OSS](https://github.com/LavX/jfrogtonexusoss)** โ€“ Automated migration tool for repository managers.
-- **[WeatherFlow](https://github.com/LavX/weatherflow)** โ€“ Multi-platform weather data forwarding (WU to Windy/Idokep).
-- **[Like4Like Suite](https://github.com/LavX/Like4Like-Suite)** โ€“ Social media automation and engagement toolkit.
-
----
-
-## ๐Ÿ“„ License
-
-- [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
-- Original Bazarr Copyright 2010-2025 morpheus65535
-- Fork modifications Copyright 2025 LavX
-
----
+</details>
 
 <details>
-<summary><h2>๐Ÿ“œ Original Bazarr README</h2></summary>
-
-# bazarr
-
-Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.
-
-Be aware that Bazarr doesn't scan disk to detect series and movies: It only takes care of the series and movies that are indexed in Sonarr and Radarr.
-
-Thanks to the folks at OpenSubtitles for their logo that was an inspiration for ours.
+<summary><strong>Supported Subtitle Providers</strong></summary>
 
-## Support on Paypal
-
-At the request of some, here is a way to demonstrate your appreciation for the efforts made in the development of Bazarr:
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url)
-
-## Status (LavX Fork)
-
-[![GitHub issues](https://img.shields.io/github/issues/LavX/bazarr.svg?style=flat-square)](https://github.com/LavX/bazarr/issues)
-[![GitHub stars](https://img.shields.io/github/stars/LavX/bazarr.svg?style=flat-square)](https://github.com/LavX/bazarr/stargazers)
-[![GitHub forks](https://img.shields.io/github/forks/LavX/bazarr.svg?style=flat-square)](https://github.com/LavX/bazarr/network)
-[![Docker Build](https://img.shields.io/github/actions/workflow/status/LavX/bazarr/build-docker.yml?style=flat-square&label=docker)](https://github.com/LavX/bazarr/actions/workflows/build-docker.yml)
-## Support
-
-For installation and configuration instructions, see upstream [wiki](https://wiki.bazarr.media).
-
-For fork-specific issues (OpenSubtitles scraper), open an issue on [this fork](https://github.com/LavX/bazarr/issues).
-
-For general Bazarr issues, please use the [upstream repo](https://github.com/morpheus65535/bazarr/issues).
-
-Original Bazarr Discord: [![Discord](https://img.shields.io/badge/discord-chat-MH2e2eb.svg?style=flat-square)](https://discord.gg/MH2e2eb)
-
-## Feature Requests
-
-If you need something that is not already part of Bazarr, feel free to create a feature request on [Feature Upvote](http://features.bazarr.media).
-
-## Major Features Include:
-
-- Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc.
-- Automatically add new series and episodes from Sonarr
-- Automatically add new movies from Radarr
-- Series or movies based configuration for subtitles languages
-- Scan your existing library for internal and external subtitles and download any missing
-- Keep history of what was downloaded from where and when
-- Manual search so you can download subtitles on demand
-- Upgrade subtitles previously downloaded when a better one is found
-- Ability to delete external subtitles from disk
-- Currently support 184 subtitles languages with support for forced/foreign subtitles (depending of providers)
-- And a beautiful UI based on Sonarr
-
-## Supported subtitles providers:
+Includes all upstream providers plus fork additions:
 
 - Addic7ed
 - AnimeKalesi
-- Animetosho (requires AniDb HTTP API client described [here](https://wiki.anidb.net/HTTP_API_Definition))
+- Animetosho (requires [AniDb HTTP API client](https://wiki.anidb.net/HTTP_API_Definition))
 - AnimeSub.info
 - Assrt
-- AvistaZ, CinemaZ (Get session cookies using method described [here](https://github.com/morpheus65535/bazarr/pull/2375#issuecomment-2057010996))
+- AvistaZ, CinemaZ
 - BetaSeries
 - BSplayer
 - Embedded Subtitles
@@ -419,7 +390,7 @@ If you need something that is not already part of Bazarr, feel free to create a
 - Napisy24
 - Nekur
 - OpenSubtitles.com
-- OpenSubtitles.org (LavX Fork)
+- **OpenSubtitles.org (Bazarr+ web scraper, no API needed)**
 - Podnapisi
 - RegieLive
 - Sous-Titres.eu
@@ -443,15 +414,55 @@ If you need something that is not already part of Bazarr, feel free to create a
 - Turkcealtyazi.org
 - TuSubtitulo
 - TVSubtitles
-- Whisper (requires [ahmetoner/whisper-asr-webservice](https://github.com/ahmetoner/whisper-asr-webservice))
+- Whisper (requires [whisper-asr-webservice](https://github.com/ahmetoner/whisper-asr-webservice))
 - Wizdom
 - XSubs
 - Yavka.net
 - YIFY Subtitles
 - Zimuku
 
-## Screenshot
+</details>
+
+<details>
+<summary><strong>About the Maintainer</strong></summary>
+
+This fork is maintained by **LavX**. Explore more projects and services:
+
+### Services
+- **[LavX Managed Systems](https://lavx.hu)** -- Enterprise AI solutions, RAG systems, and LLMOps.
+- **[LavX News](https://news.lavx.hu)** -- Latest insights on AI, Open Source, and emerging tech.
+- **[LMS Tools](https://tools.lavx.hu)** -- 140+ free, privacy-focused online tools for developers and researchers.
 
-![Bazarr](/screenshot/bazarr-screenshot.png?raw=true "Bazarr")
+### Open Source Projects
+- **[AI Subtitle Translator](https://github.com/LavX/ai-subtitle-translator)** -- LLM-powered subtitle translator using OpenRouter API.
+- **[OpenSubtitles Scraper](https://github.com/LavX/opensubtitles-scraper)** -- Web scraper for OpenSubtitles.org (no VIP required).
+- **[JFrog to Nexus OSS](https://github.com/LavX/jfrogtonexusoss)** -- Automated migration tool for repository managers.
+- **[WeatherFlow](https://github.com/LavX/weatherflow)** -- Multi-platform weather data forwarding (WU to Windy/Idokep).
+- **[Like4Like Suite](https://github.com/LavX/Like4Like-Suite)** -- Social media automation and engagement toolkit.
 
-</details>
\ No newline at end of file
+</details>
+
+---
+
+## Documentation
+
+- [Fork Maintenance Guide](docs/FORK_MAINTENANCE.md) - How sync works
+- [OpenSubtitles Scraper](https://github.com/LavX/opensubtitles-scraper) - Scraper docs
+- [AI Subtitle Translator](https://github.com/LavX/ai-subtitle-translator) - AI translator docs
+- [Bazarr Wiki](https://wiki.bazarr.media) - General Bazarr documentation
+
+## Contributing
+
+Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for the full guide.
+
+1. Fork this repository
+2. Create a feature branch from `development`
+3. Submit a PR targeting `development`
+
+For major changes, please open an issue first to discuss.
+
+## License
+
+- [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
+- Based on [Bazarr](https://github.com/morpheus65535/bazarr) by morpheus65535
+- Fork modifications Copyright 2025-2026 LavX
diff --git a/ai-subtitle-translator b/ai-subtitle-translator
index 92b9522343..1ef643b7a9 160000
--- a/ai-subtitle-translator
+++ b/ai-subtitle-translator
@@ -1 +1 @@
-Subproject commit 92b9522343b494b428dc8e0df2b09b6ff87b4e0b
+Subproject commit 1ef643b7a93a977879230526655a2a61817e4b6a
diff --git a/bazarr-binaries b/bazarr-binaries
new file mode 160000
index 0000000000..0710cde74a
--- /dev/null
+++ b/bazarr-binaries
@@ -0,0 +1 @@
+Subproject commit 0710cde74a5d87975119fc7ad3d6d80a20b6fed5
diff --git a/bazarr.py b/bazarr.py
index e5023714de..df9cdbd2ea 100644
--- a/bazarr.py
+++ b/bazarr.py
@@ -8,7 +8,7 @@
 import time
 
 from bazarr.app.get_args import args
-from bazarr.literals import EXIT_PYTHON_UPGRADE_NEEDED, EXIT_NORMAL, FILE_RESTART, FILE_STOP, ENV_RESTARTFILE, ENV_STOPFILE, EXIT_INTERRUPT
+from bazarr.literals import EXIT_PYTHON_UPGRADE_NEEDED, EXIT_NORMAL, FILE_RESTART, FILE_STOP, ENV_RESTARTFILE, ENV_STOPFILE, EXIT_INTERRUPT, EXIT_UNEXPECTED_ERROR
 
 # always flush print statements
 sys.stdout.reconfigure(line_buffering=True)
@@ -27,8 +27,8 @@ def check_python_version():
         print("Python " + minimum_py3_str + " or greater required. "
               "Current version is " + platform.python_version() + ". Please upgrade Python.")
         exit_program(EXIT_PYTHON_UPGRADE_NEEDED)
-    elif int(python_version[0]) == 3 and int(python_version[1]) > 13:
-        print("Python version greater than 3.13.x is unsupported. Current version is " + platform.python_version() +
+    elif int(python_version[0]) == 3 and int(python_version[1]) > 14:
+        print("Python version greater than 3.14.x is unsupported. Current version is " + platform.python_version() +
               ". Keep in mind that even if it works, you're on your own.")
     elif (int(python_version[0]) == minimum_py3_tuple[0] and int(python_version[1]) < minimum_py3_tuple[1]) or \
             (int(python_version[0]) != minimum_py3_tuple[0]):
@@ -106,27 +106,21 @@ def check_status():
             os.remove(restart_file)
         except Exception:
             print('Unable to delete restart file.')
-        finally:
-            terminate_child()
-            print("Bazarr is restarting...")
-            child_process = start_bazarr()
-
+        terminate_child()
+        print("Bazarr is restarting...")
+        child_process = start_bazarr()
+        return
+        
+    if not is_process_running(child_process):
+        print("Bazarr child process has stopped unexpectedly. Shutting down...")
+        exit_program(EXIT_UNEXPECTED_ERROR)
 
-def is_process_running(pid):
-    commands = {
-        "win": ["tasklist", "/FI", f"PID eq {pid}"],
-        "linux": ["ps", "-eo", "pid"],
-        "darwin": ["ps", "-ax", "-o", "pid"]
-    }
 
-    # Determine OS and execute corresponding command
-    for key in commands:
-        if sys.platform.startswith(key):
-            result = subprocess.run(commands[key], capture_output=True, text=True)
-            return str(pid) in result.stdout.split()
+def is_process_running(child_process):
+    status = child_process.poll()
+    # status is exit code if process has stopped, or None if it's still running
+    return status is None
 
-    print("Unsupported OS")
-    return False
 
 def interrupt_handler(signum, frame):
     # catch and ignore keyboard interrupt Ctrl-C
@@ -137,7 +131,7 @@ def interrupt_handler(signum, frame):
         interrupted = True
         print('Handling keyboard interrupt...')
     else:
-        if not is_process_running(child_process.pid):
+        if not is_process_running(child_process):
             # this will be caught by the main loop below
             raise SystemExit(EXIT_INTERRUPT)
 
diff --git a/bazarr/api/episodes/history.py b/bazarr/api/episodes/history.py
index bc7ab6a31d..ecd535fb34 100644
--- a/bazarr/api/episodes/history.py
+++ b/bazarr/api/episodes/history.py
@@ -82,6 +82,7 @@ def get(self):
                       TableEpisodes.path,
                       TableHistory.language,
                       TableHistory.score,
+                      TableHistory.score_out_of,
                       TableShows.tags,
                       TableHistory.action,
                       TableHistory.video_path,
@@ -117,6 +118,7 @@ def get(self):
             'language': x.language,
             'profileId': x.profileId,
             'score': x.score,
+            'score_out_of': x.score_out_of,
             'tags': x.tags,
             'action': x.action,
             'video_path': x.video_path,
@@ -154,7 +156,7 @@ def get(self):
             del item['profileId']
 
             if item['score']:
-                item['score'] = f"{round((int(item['score']) * 100 / 360), 2)}%"
+                item['score'] = f"{round((int(item['score']) * 100 / item['score_out_of']), 2)}%"
 
             # Make timestamp pretty
             if item['timestamp']:
diff --git a/bazarr/api/movies/history.py b/bazarr/api/movies/history.py
index 2324fc73f3..8c7f59fcfc 100644
--- a/bazarr/api/movies/history.py
+++ b/bazarr/api/movies/history.py
@@ -80,6 +80,7 @@ def get(self):
                       TableHistoryMovie.language,
                       TableMovies.tags,
                       TableHistoryMovie.score,
+                      TableHistoryMovie.score_out_of,
                       TableHistoryMovie.subs_id,
                       TableHistoryMovie.provider,
                       TableHistoryMovie.subtitles_path,
@@ -110,6 +111,7 @@ def get(self):
             'profileId': x.profileId,
             'tags': x.tags,
             'score': x.score,
+            'score_out_of': x.score_out_of,
             'subs_id': x.subs_id,
             'provider': x.provider,
             'subtitles_path': x.subtitles_path,
@@ -145,7 +147,7 @@ def get(self):
             del item['profileId']
 
             if item['score']:
-                item['score'] = f"{round((int(item['score']) * 100 / 120), 2)}%"
+                item['score'] = f"{round((int(item['score']) * 100 / item['score_out_of']), 2)}%"
 
             # Make timestamp pretty
             if item['timestamp']:
diff --git a/bazarr/api/plex/oauth.py b/bazarr/api/plex/oauth.py
index b72ee7f6d1..1e198bb9bd 100644
--- a/bazarr/api/plex/oauth.py
+++ b/bazarr/api/plex/oauth.py
@@ -18,6 +18,7 @@
 from .exceptions import *
 from .security import (TokenManager, sanitize_log_data, pin_cache, get_or_create_encryption_key, sanitize_server_url,
                        encrypt_api_key)
+from app.config import get_ssl_verify
 from app.config import settings, write_config
 from app.logger import logger
 from utilities.plex_utils import _get_library_locations
@@ -223,7 +224,7 @@ def test_plex_connection(uri, token):
             f"{uri}/identity",
             headers=headers,
             timeout=3,
-            verify=False
+            verify=get_ssl_verify('plex')
         )
         latency_ms = int((time.time() - start_time) * 1000)
 
@@ -318,10 +319,11 @@ def get(self, pin_id):
             if not cached_pin:
                 raise PlexPinExpiredError("PIN not found or expired")
 
-            if state_param:
-                stored_state = cached_pin.get('state_token')
-                if not stored_state or not get_token_manager().validate_state_token(state_param, stored_state):
+            stored_state = cached_pin.get('state_token')
+            if stored_state:
+                if not state_param or not get_token_manager().validate_state_token(state_param, stored_state):
                     logger.warning(f"CSRF state validation failed for PIN {pin_id}")
+                    abort(403, "Request validation failed")
 
             headers = {
                 'Accept': 'application/json',
@@ -625,7 +627,7 @@ def get(self):
                         f"{server_url}/library/sections",
                         headers=headers,
                         timeout=10,
-                        verify=False
+                        verify=get_ssl_verify('plex')
                     )
 
                     if lib_response.status_code in (401, 403):
@@ -691,7 +693,7 @@ def get(self):
                             f"{successful_server_url}/library/sections/{section_key}/all",
                             headers={'X-Plex-Token': decrypted_token, 'Accept': 'application/json'},
                             timeout=5,
-                            verify=False
+                            verify=get_ssl_verify('plex')
                         )
                         
                         actual_count = 0
@@ -840,7 +842,7 @@ def post(self):
                 f"{uri}/identity",
                 headers=headers,
                 timeout=3,
-                verify=False
+                verify=get_ssl_verify('plex')
             )
 
             if response.status_code == 200:
diff --git a/bazarr/api/providers/providers_episodes.py b/bazarr/api/providers/providers_episodes.py
index 38a1650ba1..3b75593686 100644
--- a/bazarr/api/providers/providers_episodes.py
+++ b/bazarr/api/providers/providers_episodes.py
@@ -95,7 +95,7 @@ def get(self):
     post_request_parser.add_argument('original_format', type=str, required=True,
                                      help='Use original subtitles format from ["True", "False"]')
     post_request_parser.add_argument('provider', type=str, required=True, help='Provider name')
-    post_request_parser.add_argument('subtitle', type=str, required=True, help='Pickled subtitles as return by GET')
+    post_request_parser.add_argument('subtitle', type=str, required=True, help='Subtitle ID as returned by GET')
 
     @authenticate
     @api_ns_providers_episodes.doc(parser=post_request_parser)
diff --git a/bazarr/api/providers/providers_movies.py b/bazarr/api/providers/providers_movies.py
index 344411a7e0..d41124f4d7 100644
--- a/bazarr/api/providers/providers_movies.py
+++ b/bazarr/api/providers/providers_movies.py
@@ -93,7 +93,7 @@ def get(self):
     post_request_parser.add_argument('original_format', type=str, required=True,
                                      help='Use original subtitles format from ["True", "False"]')
     post_request_parser.add_argument('provider', type=str, required=True, help='Provider name')
-    post_request_parser.add_argument('subtitle', type=str, required=True, help='Pickled subtitles as return by GET')
+    post_request_parser.add_argument('subtitle', type=str, required=True, help='Subtitle ID as returned by GET')
 
     @authenticate
     @api_ns_providers_movies.doc(parser=post_request_parser)
diff --git a/bazarr/api/subtitles/__init__.py b/bazarr/api/subtitles/__init__.py
index b107acc414..b20653788d 100644
--- a/bazarr/api/subtitles/__init__.py
+++ b/bazarr/api/subtitles/__init__.py
@@ -2,11 +2,15 @@
 
 from .subtitles import api_ns_subtitles
 from .subtitles_info import api_ns_subtitles_info
-from .batch_translate import api_ns_batch_translate
+from .batch import api_ns_batch
+from .content import api_ns_subtitle_content
+from .subtitles_contents import api_ns_subtitle_contents
 
 
 api_ns_list_subtitles = [
     api_ns_subtitles,
     api_ns_subtitles_info,
-    api_ns_batch_translate,
+    api_ns_batch,
+    api_ns_subtitle_content,
+    api_ns_subtitle_contents,
 ]
diff --git a/bazarr/api/subtitles/batch.py b/bazarr/api/subtitles/batch.py
new file mode 100644
index 0000000000..f0f0615ff5
--- /dev/null
+++ b/bazarr/api/subtitles/batch.py
@@ -0,0 +1,205 @@
+# coding=utf-8
+
+import logging
+from flask_restx import Resource, Namespace, fields
+from sqlalchemy import and_, or_, func
+
+from app.config import settings
+from app.database import TableHistory, TableHistoryMovie, TableEpisodes, TableMovies, database, select
+from app.jobs_queue import jobs_queue
+from subtitles.mass_operations import mass_batch_operation, VALID_ACTIONS
+from ..utils import authenticate
+
+ACTION_LABELS = {
+    'sync': 'Syncing Subtitles',
+    'translate': 'Translating Subtitles',
+    'OCR_fixes': 'Applying OCR Fixes',
+    'common': 'Applying Common Fixes',
+    'remove_HI': 'Removing Hearing Impaired Tags',
+    'remove_tags': 'Removing Style Tags',
+    'fix_uppercase': 'Fixing Uppercase',
+    'reverse_rtl': 'Reversing RTL',
+    'emoji': 'Removing Emoji',
+    'scan-disk': 'Scanning Disk',
+    'search-missing': 'Searching Missing Subtitles',
+    'upgrade': 'Upgrading Subtitles',
+}
+
+logger = logging.getLogger(__name__)
+
+api_ns_batch = Namespace('Batch', description='Unified batch subtitle operations')
+
+
+@api_ns_batch.route('subtitles/batch')
+class BatchOperation(Resource):
+    post_item_model = api_ns_batch.model('BatchItem', {
+        'type': fields.String(required=True, description='Type: "episode", "movie", or "series"'),
+        'sonarrSeriesId': fields.Integer(description='Sonarr Series ID'),
+        'sonarrEpisodeId': fields.Integer(description='Sonarr Episode ID'),
+        'radarrId': fields.Integer(description='Radarr Movie ID'),
+    })
+
+    post_options_model = api_ns_batch.model('BatchOptions', {
+        'max_offset_seconds': fields.Integer(default=60),
+        'no_fix_framerate': fields.Boolean(default=True),
+        'gss': fields.Boolean(default=True),
+        'force_resync': fields.Boolean(default=False),
+        'from_lang': fields.String(description='Source language code for translate action'),
+        'to_lang': fields.String(description='Target language code for translate action'),
+    })
+
+    post_request_model = api_ns_batch.model('BatchRequest', {
+        'items': fields.List(fields.Nested(post_item_model), required=True),
+        'action': fields.String(required=True, description=f'Action: one of {", ".join(sorted(VALID_ACTIONS))}'),
+        'options': fields.Nested(post_options_model),
+    })
+
+    post_response_model = api_ns_batch.model('BatchResponse', {
+        'queued': fields.Integer(description='Number of items processed'),
+        'skipped': fields.Integer(description='Number of items skipped'),
+        'errors': fields.List(fields.String(), description='Error messages'),
+    })
+
+    @authenticate
+    @api_ns_batch.response(200, 'Success', post_response_model)
+    @api_ns_batch.response(400, 'Bad Request')
+    @api_ns_batch.response(401, 'Not Authenticated')
+    def post(self):
+        """Execute a batch operation on multiple items"""
+        from flask import request
+        data = request.get_json()
+
+        if not data:
+            return {'error': 'No data provided'}, 400
+
+        action = data.get('action')
+        if not action or action not in VALID_ACTIONS:
+            return {'error': f'Invalid action. Must be one of: {", ".join(sorted(VALID_ACTIONS))}'}, 400
+
+        items = data.get('items')
+        if items is None:
+            return {'error': 'No items provided'}, 400
+
+        if not isinstance(items, list):
+            return {'error': 'items must be a list'}, 400
+
+        if not items:
+            return {'error': 'Empty items list'}, 400
+
+        VALID_ITEM_KEYS = {'type', 'sonarrSeriesId', 'sonarrEpisodeId', 'radarrId'}
+        VALID_TYPES = {'episode', 'movie', 'series'}
+
+        sanitized_items = []
+        for item in items:
+            if not isinstance(item, dict) or item.get('type') not in VALID_TYPES:
+                continue
+            sanitized_items.append({k: v for k, v in item.items() if k in VALID_ITEM_KEYS})
+        items = sanitized_items
+
+        if not items:
+            return {'error': 'No valid items after sanitization'}, 400
+
+        MAX_BATCH_SIZE = 10000
+
+        if len(items) > MAX_BATCH_SIZE:
+            return {'error': f'Batch size exceeds maximum of {MAX_BATCH_SIZE}'}, 400
+
+        options = data.get('options', {})
+
+        label = ACTION_LABELS.get(action, f'Batch {action}')
+        job_name = f"{label} ({len(items)} items)"
+
+        job_id = jobs_queue.feed_jobs_pending_queue(
+            job_name=job_name,
+            module='subtitles.mass_operations',
+            func='mass_batch_operation',
+            kwargs={
+                'items': items,
+                'action': action,
+                'options': options,
+            },
+            is_progress=True,
+        )
+
+        return {'queued': len(items), 'skipped': 0, 'errors': [], 'job_id': job_id}, 200
+
+
+def get_upgradable_media_ids():
+    """Return sets of radarrIds and sonarrSeriesIds that have upgradable subtitles.
+
+    Uses the same latest-row-per-video/language logic as upgrade.py to avoid
+    false positives from old history entries that have already been superseded.
+    """
+    if not settings.general.upgrade_subs:
+        return {'movies': [], 'series': []}
+
+    from subtitles.upgrade import get_queries_condition_parameters
+    minimum_timestamp, query_actions = get_queries_condition_parameters()
+
+    # Movies: only consider the latest history row per (video_path, language)
+    max_movie_ts = select(
+        TableHistoryMovie.video_path,
+        TableHistoryMovie.language,
+        func.max(TableHistoryMovie.timestamp).label('timestamp')
+    ).group_by(
+        TableHistoryMovie.video_path, TableHistoryMovie.language
+    ).distinct().subquery()
+
+    movie_results = database.execute(
+        select(TableHistoryMovie.radarrId)
+        .distinct()
+        .join(TableMovies, TableHistoryMovie.radarrId == TableMovies.radarrId)
+        .join(max_movie_ts, onclause=and_(
+            TableHistoryMovie.video_path == max_movie_ts.c.video_path,
+            TableHistoryMovie.language == max_movie_ts.c.language,
+            TableHistoryMovie.timestamp == max_movie_ts.c.timestamp,
+        ))
+        .where(and_(
+            TableHistoryMovie.action.in_(query_actions),
+            TableHistoryMovie.timestamp > minimum_timestamp,
+            or_(
+                and_(TableHistoryMovie.score.is_(None), TableHistoryMovie.action == 6),
+                TableHistoryMovie.score < TableHistoryMovie.score_out_of - 3
+            )
+        ))
+    ).all()
+    movie_ids = [r.radarrId for r in movie_results]
+
+    # Series: only consider the latest history row per (video_path, language)
+    max_episode_ts = select(
+        TableHistory.video_path,
+        TableHistory.language,
+        func.max(TableHistory.timestamp).label('timestamp')
+    ).group_by(
+        TableHistory.video_path, TableHistory.language
+    ).distinct().subquery()
+
+    series_results = database.execute(
+        select(TableHistory.sonarrSeriesId)
+        .distinct()
+        .join(TableEpisodes, TableHistory.sonarrEpisodeId == TableEpisodes.sonarrEpisodeId)
+        .join(max_episode_ts, onclause=and_(
+            TableHistory.video_path == max_episode_ts.c.video_path,
+            TableHistory.language == max_episode_ts.c.language,
+            TableHistory.timestamp == max_episode_ts.c.timestamp,
+        ))
+        .where(and_(
+            TableHistory.action.in_(query_actions),
+            TableHistory.timestamp > minimum_timestamp,
+            or_(
+                and_(TableHistory.score.is_(None), TableHistory.action == 6),
+                TableHistory.score < TableHistory.score_out_of - 3
+            )
+        ))
+    ).all()
+    series_ids = [r.sonarrSeriesId for r in series_results]
+
+    return {'movies': movie_ids, 'series': series_ids}
+
+
+@api_ns_batch.route('subtitles/upgradable')
+class UpgradableMedia(Resource):
+    @authenticate
+    def get(self):
+        """Return movie and series IDs that have upgradable subtitles"""
+        return get_upgradable_media_ids(), 200
diff --git a/bazarr/api/subtitles/batch_translate.py b/bazarr/api/subtitles/batch_translate.py
deleted file mode 100644
index b6156b2c28..0000000000
--- a/bazarr/api/subtitles/batch_translate.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# coding=utf-8
-
-import logging
-from flask_restx import Resource, Namespace, reqparse, fields
-
-from app.jobs_queue import jobs_queue
-from ..utils import authenticate
-
-logger = logging.getLogger(__name__)
-
-api_ns_batch_translate = Namespace('BatchTranslate', description='Batch translate subtitles')
-
-
-@api_ns_batch_translate.route('subtitles/translate/batch')
-class BatchTranslate(Resource):
-    post_request_parser = reqparse.RequestParser()
-    post_request_parser.add_argument('items', type=list, location='json', required=True,
-                                     help='List of items to translate')
-
-    post_item_model = api_ns_batch_translate.model('BatchTranslateItem', {
-        'type': fields.String(required=True, description='Type: "episode" or "movie"'),
-        'sonarrSeriesId': fields.Integer(description='Sonarr Series ID (for episodes)'),
-        'sonarrEpisodeId': fields.Integer(description='Sonarr Episode ID (for episodes)'),
-        'radarrId': fields.Integer(description='Radarr Movie ID (for movies)'),
-        'sourceLanguage': fields.String(required=True, description='Source language code (e.g., "en")'),
-        'targetLanguage': fields.String(required=True, description='Target language code (e.g., "hu")'),
-        'subtitlePath': fields.String(description='Optional specific subtitle path to translate'),
-        'forced': fields.Boolean(default=False, description='Forced subtitle flag'),
-        'hi': fields.Boolean(default=False, description='Hearing impaired flag'),
-    })
-
-    post_request_model = api_ns_batch_translate.model('BatchTranslateRequest', {
-        'items': fields.List(fields.Nested(post_item_model), required=True),
-    })
-
-    post_response_model = api_ns_batch_translate.model('BatchTranslateResponse', {
-        'queued': fields.Integer(description='Number of items queued'),
-        'skipped': fields.Integer(description='Number of items skipped'),
-        'errors': fields.List(fields.String(), description='Error messages'),
-    })
-
-    @authenticate
-    @api_ns_batch_translate.doc(body=post_request_model)
-    @api_ns_batch_translate.response(200, 'Success', post_response_model)
-    @api_ns_batch_translate.response(400, 'Bad Request')
-    @api_ns_batch_translate.response(401, 'Not Authenticated')
-    def post(self):
-        """Queue batch translation jobs for multiple items"""
-        from flask import request
-        data = request.get_json()
-        
-        if not data or 'items' not in data:
-            return {'error': 'No items provided'}, 400
-
-        items = data.get('items', [])
-        if not items:
-            return {'error': 'Empty items list'}, 400
-
-        queued = 0
-        skipped = 0
-        errors = []
-
-        for item in items:
-            try:
-                item_type = item.get('type')
-                source_language = item.get('sourceLanguage')
-                target_language = item.get('targetLanguage')
-                forced = item.get('forced', False)
-                hi = item.get('hi', False)
-                subtitle_path = item.get('subtitlePath')
-
-                if not item_type or not source_language or not target_language:
-                    errors.append(f'Missing required fields in item: {item}')
-                    skipped += 1
-                    continue
-
-                if item_type == 'episode':
-                    job_name = f"Translate Episode {item.get('sonarrEpisodeId')}"
-                    func = 'process_episode_translation'
-                elif item_type == 'movie':
-                    job_name = f"Translate Movie {item.get('radarrId')}"
-                    func = 'process_movie_translation'
-                else:
-                    errors.append(f'Invalid type "{item_type}" in item')
-                    skipped += 1
-                    continue
-
-                # Queue the job individually
-                jobs_queue.feed_jobs_pending_queue(
-                    job_name=job_name,
-                    module='subtitles.tools.translate.batch',
-                    func=func,
-                    kwargs={
-                        'item': item,
-                        'source_language': source_language,
-                        'target_language': target_language,
-                        'forced': forced,
-                        'hi': hi,
-                        'subtitle_path': subtitle_path
-                    }
-                )
-                queued += 1
-
-            except Exception as e:
-                logger.error(f'Error queuing batch translate item: {e}', exc_info=True)
-                errors.append(str(e))
-                skipped += 1
-
-        return {
-            'queued': queued,
-            'skipped': skipped,
-            'errors': errors
-        }, 200
diff --git a/bazarr/api/subtitles/content.py b/bazarr/api/subtitles/content.py
new file mode 100644
index 0000000000..e3afdc8800
--- /dev/null
+++ b/bazarr/api/subtitles/content.py
@@ -0,0 +1,226 @@
+# coding=utf-8
+
+import ast
+import hashlib
+import os
+
+from flask import make_response, jsonify, request
+from flask_restx import Resource, Namespace
+
+from app.database import TableEpisodes, TableMovies, TableShows, database, select
+from utilities.path_mappings import path_mappings
+
+from ..utils import authenticate
+
+api_ns_subtitle_content = Namespace('SubtitleContent', description='Read subtitle file content')
+
+MAX_FILE_SIZE = 5 * 1024 * 1024  # 5 MB
+
+SUBTITLE_EXTENSIONS = {
+    '.srt', '.ass', '.ssa', '.sub', '.idx', '.sup',
+    '.vtt', '.dfxp', '.ttml', '.smi', '.mpl', '.txt',
+}
+
+FORMAT_MAP = {
+    '.srt': 'srt',
+    '.ass': 'ass',
+    '.ssa': 'ssa',
+    '.vtt': 'vtt',
+    '.sub': 'sub',
+    '.dfxp': 'dfxp',
+    '.ttml': 'ttml',
+    '.smi': 'smi',
+    '.mpl': 'mpl',
+    '.txt': 'txt',
+}
+
+
+def resolve_subtitle_path(media_type, media_id, language_code):
+    """Resolve a subtitle file path from a media ID and language code.
+
+    language_code can be like "en", "hu", "en:hi", "en:forced".
+    Matches against the language field in the subtitles array.
+
+    Returns (path, language, metadata) on success, or (message, status_code) on failure.
+    """
+    metadata = {}
+    if media_type == 'episode':
+        row = database.execute(
+            select(TableEpisodes.subtitles, TableEpisodes.path, TableEpisodes.sonarrSeriesId, TableEpisodes.title)
+            .where(TableEpisodes.sonarrEpisodeId == media_id)
+        ).first()
+        if row:
+            series_row = database.execute(
+                select(TableShows.title).where(TableShows.sonarrSeriesId == row.sonarrSeriesId)
+            ).first()
+            metadata = {
+                'mediaTitle': series_row.title if series_row else None,
+                'mediaId': row.sonarrSeriesId,
+                'episodeTitle': row.title,
+            }
+    elif media_type == 'movie':
+        row = database.execute(
+            select(TableMovies.subtitles, TableMovies.path, TableMovies.title, TableMovies.radarrId)
+            .where(TableMovies.radarrId == media_id)
+        ).first()
+        if row:
+            metadata = {
+                'mediaTitle': row.title,
+                'mediaId': row.radarrId,
+            }
+    else:
+        return 'Invalid media type', 400
+
+    if not row:
+        return 'Media not found', 404
+
+    raw_subtitles = row.subtitles
+    if not raw_subtitles:
+        return 'No subtitles found for this media', 404
+
+    try:
+        subtitles_list = ast.literal_eval(raw_subtitles)
+    except (ValueError, SyntaxError):
+        return 'Failed to parse subtitles data', 500
+
+    if not isinstance(subtitles_list, list):
+        return 'Invalid subtitles data', 500
+
+    # Find the subtitle entry matching the language code
+    entry = None
+    for item in subtitles_list:
+        if isinstance(item, list) and len(item) >= 2 and item[0] == language_code:
+            # Must have a file path (not an embedded track)
+            if item[1] and isinstance(item[1], str) and len(item[1]) > 0:
+                entry = item
+                break
+
+    if entry is None:
+        return f'No subtitle found for language "{language_code}"', 404
+
+    language = entry[0]
+    subtitle_path = entry[1]
+
+    if media_type == 'episode':
+        subtitle_path = path_mappings.path_replace(subtitle_path)
+    else:
+        subtitle_path = path_mappings.path_replace_movie(subtitle_path)
+
+    ext = os.path.splitext(subtitle_path)[1].lower()
+    if ext not in SUBTITLE_EXTENSIONS:
+        return f'File does not have a recognized subtitle extension: {ext}', 400
+
+    if not os.path.isfile(subtitle_path):
+        return 'Subtitle file not found on disk', 404
+
+    return subtitle_path, language, metadata
+
+
+def read_subtitle_file(path):
+    """Read a subtitle file and detect its encoding.
+
+    Returns (content_str, encoding) on success.
+    Raises ValueError if the file exceeds MAX_FILE_SIZE.
+    """
+    file_size = os.path.getsize(path)
+    if file_size > MAX_FILE_SIZE:
+        raise ValueError(f'Subtitle file too large ({file_size} bytes, max {MAX_FILE_SIZE})')
+
+    with open(path, 'rb') as f:
+        raw = f.read()
+
+    # BOM detection
+    if raw.startswith(b'\xef\xbb\xbf'):
+        return raw[3:].decode('utf-8'), 'utf-8-sig'
+    if raw.startswith(b'\xff\xfe'):
+        return raw[2:].decode('utf-16-le'), 'utf-16-le'
+    if raw.startswith(b'\xfe\xff'):
+        return raw[2:].decode('utf-16-be'), 'utf-16-be'
+
+    # Try UTF-8
+    try:
+        return raw.decode('utf-8'), 'utf-8'
+    except UnicodeDecodeError:
+        pass
+
+    # charset_normalizer
+    try:
+        import charset_normalizer
+        result = charset_normalizer.from_bytes(raw).best()
+        if result is not None:
+            return str(result), result.encoding
+    except Exception:
+        pass
+
+    # Fallback
+    return raw.decode('cp1252', errors='replace'), 'cp1252'
+
+
+def detect_subtitle_format(path):
+    """Map a subtitle file extension to a format string."""
+    ext = os.path.splitext(path)[1].lower()
+    return FORMAT_MAP.get(ext, 'unknown')
+
+
+def generate_etag(path):
+    """Generate an ETag from file mtime and size."""
+    stat = os.stat(path)
+    tag_input = f"{stat.st_mtime_ns}:{stat.st_size}"
+    return hashlib.md5(tag_input.encode()).hexdigest()
+
+
+def _get_subtitle_content(media_type, media_id, language_code):
+    """Shared handler for episode and movie subtitle content."""
+    result = resolve_subtitle_path(media_type, media_id, language_code)
+
+    # Error tuple
+    if isinstance(result[1], int):
+        return result[0], result[1]
+
+    subtitle_path, language, metadata = result
+
+    etag = generate_etag(subtitle_path)
+
+    # ETag-based caching
+    if_none_match = request.headers.get('If-None-Match')
+    if if_none_match and if_none_match.strip('"') == etag:
+        return '', 304
+
+    try:
+        content, encoding = read_subtitle_file(subtitle_path)
+    except ValueError as e:
+        return str(e), 413
+
+    stat = os.stat(subtitle_path)
+    fmt = detect_subtitle_format(subtitle_path)
+
+    response_data = {
+        'content': content,
+        'encoding': encoding,
+        'format': fmt,
+        'language': language,
+        'size': stat.st_size,
+        'lastModified': stat.st_mtime,
+    }
+    response_data.update(metadata)
+
+    response = make_response(jsonify(response_data))
+
+    response.headers['ETag'] = f'"{etag}"'
+    response.headers['X-Content-Type-Options'] = 'nosniff'
+
+    return response
+
+
+@api_ns_subtitle_content.route('episodes/<int:sonarrEpisodeId>/subtitles/<language>/content')
+class EpisodeSubtitleContent(Resource):
+    @authenticate
+    def get(self, sonarrEpisodeId, language):
+        return _get_subtitle_content('episode', sonarrEpisodeId, language)
+
+
+@api_ns_subtitle_content.route('movies/<int:radarrId>/subtitles/<language>/content')
+class MovieSubtitleContent(Resource):
+    @authenticate
+    def get(self, radarrId, language):
+        return _get_subtitle_content('movie', radarrId, language)
diff --git a/bazarr/api/subtitles/subtitles.py b/bazarr/api/subtitles/subtitles.py
index 36f5aa90c9..ea9042ed07 100644
--- a/bazarr/api/subtitles/subtitles.py
+++ b/bazarr/api/subtitles/subtitles.py
@@ -146,6 +146,7 @@ def patch(self):
 
         if action == 'sync':
             try:
+                postprocess_callback = lambda: postprocess_subtitles(subtitles_path, video_path, media_type, metadata, id)
                 sync_subtitles(video_path=video_path, srt_path=subtitles_path, srt_lang=language, hi=hi, forced=forced,
                                percent_score=0,  # make sure to always sync when requested manually
                                reference=args.get('reference') if args.get('reference') not in empty_values else
@@ -159,6 +160,7 @@ def patch(self):
                                sonarr_episode_id=id if media_type == "episode" else None,
                                radarr_id=id if media_type == "movie" else None,
                                force_sync=True,
+                               callback=postprocess_callback
                                )
             except OSError:
                 return 'Unable to edit subtitles file. Check logs.', 409
@@ -189,38 +191,42 @@ def patch(self):
                                              media_type="series" if media_type == "episode" else "movies",
                                              sonarr_series_id=metadata.sonarrSeriesId if media_type == "episode" else None,
                                              sonarr_episode_id=id,
-                                             radarr_id=id)
+                                             radarr_id=id,
+                                             metadata=metadata)
+
                 except OSError:
                     return 'Unable to edit subtitles file. Check logs.', 409
         else:
             try:
                 subtitles_apply_mods(language=language, subtitle_path=subtitles_path, mods=[action],
                                      video_path=video_path)
+                postprocess_subtitles(subtitles_path, video_path, media_type, metadata, id)
             except OSError:
                 return 'Unable to edit subtitles file. Check logs.', 409
 
-        # apply chmod if required
-        chmod = int(settings.general.chmod, 8) if not sys.platform.startswith(
-            'win') and settings.general.chmod_enabled else None
-        if chmod:
-            os.chmod(subtitles_path, chmod)
+        return '', 204
 
-        if media_type == 'episode':
-            store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
-            event_stream(type='series', payload=metadata.sonarrSeriesId)
-            event_stream(type='episode', payload=id)
 
-            if settings.general.use_plex and settings.plex.update_series_library:
-                plex_refresh_item(metadata.imdbId, is_movie=False, season=metadata.season,
-                                  episode=metadata.episode)
-        else:
-            store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
-            event_stream(type='movie', payload=id)
+def postprocess_subtitles(subtitles_path, video_path, media_type, metadata, id):
+    # apply chmod if required
+    chmod = int(settings.general.chmod, 8) if not sys.platform.startswith('win') and settings.general.chmod_enabled else None
+    if chmod:
+        os.chmod(subtitles_path, chmod)
 
-            if settings.general.use_plex and settings.plex.update_movie_library:
-                plex_refresh_item(metadata.imdbId, is_movie=True)
+    if media_type == 'episode':
+        store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
+        event_stream(type='series', payload=metadata.sonarrSeriesId)
+        event_stream(type='episode', payload=id)
 
-        return '', 204
+        if settings.general.use_plex and settings.plex.update_series_library:
+            plex_refresh_item(metadata.imdbId, is_movie=False, season=metadata.season,
+                              episode=metadata.episode)
+    else:
+        store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
+        event_stream(type='movie', payload=id)
+
+        if settings.general.use_plex and settings.plex.update_movie_library:
+            plex_refresh_item(metadata.imdbId, is_movie=True)
 
 
 def subtitles_lang_from_filename(path):
diff --git a/bazarr/api/subtitles/subtitles_contents.py b/bazarr/api/subtitles/subtitles_contents.py
new file mode 100644
index 0000000000..81eff96c84
--- /dev/null
+++ b/bazarr/api/subtitles/subtitles_contents.py
@@ -0,0 +1,82 @@
+# coding=utf-8
+import logging
+import srt
+
+from flask_restx import Resource, Namespace, reqparse, fields, marshal
+
+from ..utils import authenticate
+
+
+api_ns_subtitle_contents = Namespace('Subtitle Contents', description='Retrieve contents of subtitle file')
+
+
+@api_ns_subtitle_contents.route('subtitles/contents')
+class SubtitleNameContents(Resource):
+    get_request_parser = reqparse.RequestParser()
+    get_request_parser.add_argument('subtitlePath', type=str, required=True, help='Subtitle filepath')
+
+    time_modal = api_ns_subtitle_contents.model('time_modal', {
+        'hours': fields.Integer(),
+        'minutes': fields.Integer(),
+        'seconds': fields.Integer(),
+        'total_seconds': fields.Integer(),
+        'microseconds': fields.Integer(),
+    })
+
+    get_response_model = api_ns_subtitle_contents.model('SubtitlesContentsGetResponse', {
+        'index': fields.Integer(),
+        'content': fields.String(),
+        'proprietary': fields.String(),
+        'start': fields.Nested(time_modal),
+        'end': fields.Nested(time_modal),
+        # 'duration': fields.Nested(time_modal),
+    })
+
+    @authenticate
+    @api_ns_subtitle_contents.response(200, 'Success')
+    @api_ns_subtitle_contents.response(401, 'Not Authenticated')
+    @api_ns_subtitle_contents.doc(parser=get_request_parser)
+    def get(self):
+        """Retrieve subtitle file contents"""
+
+        args = self.get_request_parser.parse_args()
+        path = args.get('subtitlePath')
+
+        results = []
+
+        # Load the SRT content
+        with open(path, "r", encoding="utf-8") as f:
+            file_content = f.read()
+
+        # Map contents
+        for sub in srt.parse(file_content):
+
+            start_total_seconds = int(sub.start.total_seconds())
+            end_total_seconds = int(sub.end.total_seconds())
+            duration_timedelta = sub.end - sub.start
+
+            results.append(dict(
+                index=sub.index,
+                content=sub.content,
+                proprietary=sub.proprietary,
+                start=dict(
+                    hours = start_total_seconds // 3600,
+                    minutes = (start_total_seconds % 3600) // 60,
+                    seconds = start_total_seconds % 60,
+                    total_seconds=int(sub.start.total_seconds()),
+                    microseconds = sub.start.microseconds
+                ),
+                end=dict(
+                    hours = end_total_seconds // 3600,
+                    minutes = (end_total_seconds % 3600) // 60,
+                    seconds = end_total_seconds % 60,
+                    total_seconds=int(sub.end.total_seconds()),
+                    microseconds = sub.end.microseconds
+                ),
+                # duration=dict(
+                #     seconds=int(duration_timedelta.total_seconds()),
+                #     microseconds=duration_timedelta.microseconds
+                # ),
+            ))
+        
+        return marshal(results, self.get_response_model, envelope='data')
diff --git a/bazarr/api/system/account.py b/bazarr/api/system/account.py
index 1f002c8a25..f8b22b30b4 100644
--- a/bazarr/api/system/account.py
+++ b/bazarr/api/system/account.py
@@ -1,21 +1,77 @@
 # coding=utf-8
 
 import gc
+import time
+import secrets
+import logging
+import threading
+from collections import OrderedDict
 
 from flask import session, request
 from flask_restx import Resource, Namespace, reqparse
 
 from app.config import settings
-from utilities.helper import check_credentials
+from utilities.helper import check_credentials, needs_password_upgrade, upgrade_password_hash
 
 api_ns_system_account = Namespace('System Account', description='Login or logout from Bazarr UI')
 
+# In-memory login rate limiter: {ip: (fail_count, last_fail_time)}
+_login_attempts = OrderedDict()
+_login_lock = threading.Lock()
+_MAX_ATTEMPTS = 5
+_LOCKOUT_SECONDS = 300  # 5 minutes
+_MAX_TRACKED_IPS = 10000
+
+
+def _get_client_ip():
+    # Only use remote_addr by default to prevent IP spoofing via headers.
+    # Reverse proxies should be configured to set X-Real-IP reliably.
+    return request.remote_addr
+
+
+def _is_rate_limited(ip):
+    with _login_lock:
+        if ip not in _login_attempts:
+            return False
+        count, last_time = _login_attempts[ip]
+        if time.time() - last_time > _LOCKOUT_SECONDS:
+            del _login_attempts[ip]
+            return False
+        return count >= _MAX_ATTEMPTS
+
+
+def _record_failed_attempt(ip):
+    with _login_lock:
+        # Evict oldest entries if at capacity
+        while len(_login_attempts) >= _MAX_TRACKED_IPS:
+            _login_attempts.popitem(last=False)
+
+        now = time.time()
+        if ip in _login_attempts:
+            count, last_time = _login_attempts[ip]
+            if now - last_time > _LOCKOUT_SECONDS:
+                _login_attempts[ip] = (1, now)
+            else:
+                _login_attempts[ip] = (count + 1, now)
+        else:
+            _login_attempts[ip] = (1, now)
+
+        count = _login_attempts[ip][0]
+        if count >= _MAX_ATTEMPTS:
+            logging.warning(f'Login rate limit triggered for {ip} after {count} failed attempts')
+
+
+def _clear_failed_attempts(ip):
+    with _login_lock:
+        _login_attempts.pop(ip, None)
+
 
 @api_ns_system_account.hide
 @api_ns_system_account.route('system/account')
 class SystemAccount(Resource):
     post_request_parser = reqparse.RequestParser()
-    post_request_parser.add_argument('action', type=str, required=True, help='Action from ["login", "logout"]')
+    post_request_parser.add_argument('action', type=str, required=True,
+                                     help='Action from ["login", "logout", "upgrade_hash"]')
     post_request_parser.add_argument('username', type=str, required=False, help='Bazarr username')
     post_request_parser.add_argument('password', type=str, required=False, help='Bazarr password')
 
@@ -24,6 +80,7 @@ class SystemAccount(Resource):
     @api_ns_system_account.response(400, 'Unknown action')
     @api_ns_system_account.response(403, 'Authentication failed')
     @api_ns_system_account.response(406, 'Browser must be closed to invalidate basic authentication')
+    @api_ns_system_account.response(429, 'Too many failed login attempts')
     @api_ns_system_account.response(500, 'Unknown authentication type define in config')
     def post(self):
         """Login or logout from Bazarr UI when using form login"""
@@ -33,12 +90,23 @@ def post(self):
 
         action = args.get('action')
         if action == 'login':
+            ip = _get_client_ip()
+            if _is_rate_limited(ip):
+                return 'Too many failed login attempts. Try again in 5 minutes.', 429
+
             username = args.get('username')
             password = args.get('password')
             if check_credentials(username, password, request):
+                _clear_failed_attempts(ip)
                 session['logged_in'] = True
+                if needs_password_upgrade():
+                    # Store password in session for upgrade (server-side only, never sent to client)
+                    session['_pw_for_upgrade'] = password
+                    session['_upgrade_token'] = secrets.token_urlsafe(16)
+                    return {'upgrade_hash': True, 'upgrade_token': session['_upgrade_token']}, 200
                 return '', 204
             else:
+                _record_failed_attempt(ip)
                 session['logged_in'] = False
                 return 'Authentication failed', 403
         elif action == 'logout':
@@ -48,5 +116,16 @@ def post(self):
                 session.clear()
                 gc.collect()
                 return '', 204
+        elif action == 'upgrade_hash':
+            # Verify upgrade token from session (no password re-transmission)
+            token = args.get('password')  # reuse password field for token
+            stored_token = session.get('_upgrade_token')
+            stored_pw = session.get('_pw_for_upgrade')
+            if not stored_token or not stored_pw or token != stored_token:
+                return 'Invalid or expired upgrade token', 403
+            upgrade_password_hash(stored_pw)
+            session.pop('_pw_for_upgrade', None)
+            session.pop('_upgrade_token', None)
+            return '', 204
 
         return 'Unknown action', 400
diff --git a/bazarr/api/system/releases.py b/bazarr/api/system/releases.py
index 12922dace1..867d795c55 100644
--- a/bazarr/api/system/releases.py
+++ b/bazarr/api/system/releases.py
@@ -18,11 +18,12 @@
 @api_ns_system_releases.route('system/releases')
 class SystemReleases(Resource):
     get_response_model = api_ns_system_releases.model('SystemBackupsGetResponse', {
-        'body': fields.List(fields.String),
+        'body': fields.String(),
         'name': fields.String(),
         'date': fields.String(),
         'prerelease': fields.Boolean(),
         'current': fields.Boolean(),
+        'repo': fields.String(),
     })
 
     @authenticate
@@ -49,12 +50,12 @@ def get(self):
             current_version = os.environ["BAZARR_VERSION"]
 
             for i, release in enumerate(filtered_releases):
-                body = release['body'].replace('- ', '').split('\n')[1:]
-                filtered_releases[i] = {"body": body,
+                filtered_releases[i] = {"body": release['body'] or '',
                                         "name": release['name'],
                                         "date": release['date'][:10],
                                         "prerelease": release['prerelease'],
-                                        "current": release['name'].lstrip('v') == current_version}
+                                        "current": release['name'].lstrip('v') == current_version,
+                                        "repo": release.get('repo', 'Bazarr+')}
 
         except Exception:
             logging.exception(
diff --git a/bazarr/api/translator/translator.py b/bazarr/api/translator/translator.py
index f75ca0b177..114b99f722 100644
--- a/bazarr/api/translator/translator.py
+++ b/bazarr/api/translator/translator.py
@@ -2,9 +2,12 @@
 
 import logging
 import requests
+from flask import request as flask_request
 from flask_restx import Resource, Namespace
 
 from app.config import settings
+from app.jobs_queue import jobs_queue
+from subtitles.tools.translate.services.auth import get_translator_auth_headers
 from ..utils import authenticate
 
 api_ns_translator = Namespace('Translator', description='AI Subtitle Translator service operations')
@@ -33,11 +36,25 @@ def get(self):
             return {"error": "AI Subtitle Translator service URL not configured"}, 503
 
         try:
-            response = requests.get(f"{service_url}/api/v1/status", timeout=10)
+            response = requests.get(f"{service_url}/api/v1/status", headers=get_translator_auth_headers(), timeout=10)
             if response.status_code == 200:
-                return response.json(), 200
+                data = response.json()
+                # Count Bazarr-side pending translation jobs
+                pending_count = sum(
+                    1 for job in jobs_queue.jobs_pending_queue
+                    if 'translat' in (job.job_name or '').lower()
+                )
+                running_count = sum(
+                    1 for job in jobs_queue.jobs_running_queue
+                    if 'translat' in (job.job_name or '').lower()
+                )
+                data['bazarr_queue'] = {
+                    'pending': pending_count,
+                    'running': running_count,
+                }
+                return data, 200
             else:
-                return {"error": f"Service returned {response.status_code}"}, response.status_code
+                return {"error": f"Service returned {response.status_code}"}, 502
         except requests.exceptions.ConnectionError:
             return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
         except requests.exceptions.Timeout:
@@ -60,11 +77,11 @@ def get(self):
             return {"error": "AI Subtitle Translator service URL not configured"}, 503
 
         try:
-            response = requests.get(f"{service_url}/api/v1/jobs", timeout=10)
+            response = requests.get(f"{service_url}/api/v1/jobs", headers=get_translator_auth_headers(), timeout=10)
             if response.status_code == 200:
                 return response.json(), 200
             else:
-                return {"error": f"Service returned {response.status_code}"}, response.status_code
+                return {"error": f"Service returned {response.status_code}"}, 502
         except requests.exceptions.ConnectionError:
             return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
         except requests.exceptions.Timeout:
@@ -87,13 +104,13 @@ def get(self, job_id):
             return {"error": "AI Subtitle Translator service URL not configured"}, 503
 
         try:
-            response = requests.get(f"{service_url}/api/v1/jobs/{job_id}", timeout=10)
+            response = requests.get(f"{service_url}/api/v1/jobs/{job_id}", headers=get_translator_auth_headers(), timeout=10)
             if response.status_code == 200:
                 return response.json(), 200
             elif response.status_code == 404:
                 return {"error": "Job not found"}, 404
             else:
-                return {"error": f"Service returned {response.status_code}"}, response.status_code
+                return {"error": f"Service returned {response.status_code}"}, 502
         except requests.exceptions.ConnectionError:
             return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
         except Exception as e:
@@ -111,13 +128,13 @@ def delete(self, job_id):
             return {"error": "AI Subtitle Translator service URL not configured"}, 503
 
         try:
-            response = requests.delete(f"{service_url}/api/v1/jobs/{job_id}", timeout=10)
+            response = requests.delete(f"{service_url}/api/v1/jobs/{job_id}", headers=get_translator_auth_headers(), timeout=10)
             if response.status_code == 200:
                 return response.json(), 200
             elif response.status_code == 404:
                 return {"error": "Job not found"}, 404
             else:
-                return {"error": f"Service returned {response.status_code}"}, response.status_code
+                return {"error": f"Service returned {response.status_code}"}, 502
         except requests.exceptions.ConnectionError:
             return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
         except Exception as e:
@@ -138,11 +155,11 @@ def get(self):
             return {"error": "AI Subtitle Translator service URL not configured"}, 503
 
         try:
-            response = requests.get(f"{service_url}/api/v1/models", timeout=10)
+            response = requests.get(f"{service_url}/api/v1/models", headers=get_translator_auth_headers(), timeout=10)
             if response.status_code == 200:
                 return response.json(), 200
             else:
-                return {"error": f"Service returned {response.status_code}"}, response.status_code
+                return {"error": f"Service returned {response.status_code}"}, 502
         except requests.exceptions.ConnectionError:
             return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
         except requests.exceptions.Timeout:
@@ -165,13 +182,70 @@ def get(self):
             return {"error": "AI Subtitle Translator service URL not configured"}, 503
 
         try:
-            response = requests.get(f"{service_url}/api/v1/config", timeout=10)
+            response = requests.get(f"{service_url}/api/v1/config", headers=get_translator_auth_headers(), timeout=10)
             if response.status_code == 200:
                 return response.json(), 200
             else:
-                return {"error": f"Service returned {response.status_code}"}, response.status_code
+                return {"error": f"Service returned {response.status_code}"}, 502
         except requests.exceptions.ConnectionError:
             return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
         except Exception as e:
             logger.error(f"Error getting config: {e}")
+            return {"error": str(e)}, 500
+
+
+@api_ns_translator.route('translator/test')
+class TranslatorTest(Resource):
+    @authenticate
+    @api_ns_translator.doc(
+        responses={200: 'Success', 400: 'Bad Request', 503: 'Service Unavailable'}
+    )
+    def post(self):
+        """Test connection, encryption, and API key with the translator service.
+
+        Accepts optional JSON body with current (unsaved) form values:
+        - serviceUrl: override saved service URL
+        - apiKey: override saved OpenRouter API key
+        - encryptionKey: override saved encryption key
+        """
+        data = flask_request.get_json(silent=True) or {}
+
+        service_url = data.get("serviceUrl") or get_service_url()
+        if service_url:
+            service_url = service_url.rstrip("/")
+        if not service_url:
+            return {"error": "AI Subtitle Translator service URL not configured"}, 503
+
+        api_key = data.get("apiKey") or settings.translator.openrouter_api_key
+        if not api_key:
+            return {"error": "OpenRouter API key not configured"}, 400
+
+        encryption_key = data.get("encryptionKey") if "encryptionKey" in data else settings.translator.openrouter_encryption_key
+        if encryption_key:
+            try:
+                from subtitles.tools.translate.services.encryption import encrypt_api_key
+                api_key = encrypt_api_key(api_key, encryption_key)
+            except ValueError as e:
+                return {"error": f"Invalid encryption key: {e}"}, 400
+
+        try:
+            response = requests.post(
+                f"{service_url}/api/v1/test",
+                json={"apiKey": api_key},
+                headers={"Content-Type": "application/json", **get_translator_auth_headers(encryption_key)},
+                timeout=10
+            )
+            if response.status_code == 200:
+                return response.json(), 200
+            else:
+                try:
+                    return response.json(), 502
+                except (ValueError, requests.exceptions.JSONDecodeError):
+                    return {"error": f"Service returned {response.status_code}"}, 502
+        except requests.exceptions.ConnectionError:
+            return {"error": "Cannot connect to AI Subtitle Translator service"}, 503
+        except requests.exceptions.Timeout:
+            return {"error": "Service timeout"}, 503
+        except Exception as e:
+            logger.error(f"Error testing translator: {e}")
             return {"error": str(e)}, 500
\ No newline at end of file
diff --git a/bazarr/api/utils.py b/bazarr/api/utils.py
index c8dac68bb4..8341c9b7ed 100644
--- a/bazarr/api/utils.py
+++ b/bazarr/api/utils.py
@@ -1,6 +1,8 @@
 # coding=utf-8
 
 import ast
+import hmac
+import logging
 
 from functools import wraps
 from flask import request, abort
@@ -16,17 +18,32 @@
 False_Keys = ['False', 'false', '0']
 
 
+def _safe_apikey_compare(provided, expected):
+    if not provided:
+        return False
+    return hmac.compare_digest(str(provided), str(expected))
+
+
 def authenticate(actual_method):
     @wraps(actual_method)
     def wrapper(*args, **kwargs):
         apikey_settings = settings.auth.apikey
+        apikey_header = request.headers.get('X-API-KEY')
+
+        if _safe_apikey_compare(apikey_header, apikey_settings):
+            return actual_method(*args, **kwargs)
+
+        # Legacy: accept API key from query string or form data with deprecation warning
+        # Suppress warning for webhook endpoints (Plex webhooks use ?apikey= in callback URLs)
         apikey_get = request.args.get('apikey')
         apikey_post = request.form.get('apikey')
-        apikey_header = None
-        if 'X-API-KEY' in request.headers:
-            apikey_header = request.headers['X-API-KEY']
-
-        if apikey_settings in [apikey_get, apikey_post, apikey_header]:
+        if _safe_apikey_compare(apikey_get, apikey_settings) or _safe_apikey_compare(apikey_post, apikey_settings):
+            if '/webhooks/' not in request.path:
+                logging.warning(
+                    'API key passed via query string or form data is deprecated. '
+                    'Use the X-API-KEY header instead. '
+                    'Endpoint: %s %s', request.method, request.path
+                )
             return actual_method(*args, **kwargs)
 
         return abort(401)
diff --git a/bazarr/app/announcements.py b/bazarr/app/announcements.py
index 753399dfa7..831f7d6da8 100644
--- a/bazarr/app/announcements.py
+++ b/bazarr/app/announcements.py
@@ -1,7 +1,6 @@
 # coding=utf-8
 
 import os
-import sys
 import hashlib
 import requests
 import logging
@@ -11,21 +10,12 @@
 from datetime import datetime
 from operator import itemgetter
 
-from app.get_providers import get_enabled_providers
 from app.database import TableAnnouncements, database, insert, select
 
-from app.config import settings
 from app.get_args import args
-from sonarr.info import get_sonarr_info
-from radarr.info import get_radarr_info
 from app.jobs_queue import jobs_queue
 
 
-def upcoming_deprecated_python_version():
-    # return True if Python version is deprecated
-    return sys.version_info.major == 2 or (sys.version_info.major == 3 and sys.version_info.minor < 10)
-
-
 # Announcements as receive by browser must be in the form of a list of dicts converted to JSON
 # [
 #     {
@@ -49,32 +39,33 @@ def parse_announcement_dict(announcement_dict):
     return announcement_dict
 
 
-def get_announcements_to_file(job_id=None, startup=False):
+def get_announcements_to_file(job_id=None, startup=False, wait_for_completion=False):
     if not startup and not job_id:
-        jobs_queue.add_job_from_function("Updating Announcements File", is_progress=False)
+        jobs_queue.add_job_from_function("Updating Announcements File", is_progress=False,
+                                         wait_for_completion=wait_for_completion)
         return
 
     try:
         r = requests.get(
-            url="https://cdn.jsdelivr.net/gh/morpheus65535/bazarr-binaries@latest/announcements.json",
+            url="https://cdn.jsdelivr.net/gh/LavX/bazarr-binaries@master/announcements.json",
             timeout=30
         )
+        r.raise_for_status()
     except Exception:
         try:
             logging.exception("Error trying to get announcements from jsdelivr.net, falling back to Github.")
             r = requests.get(
-                url="https://raw.githubusercontent.com/morpheus65535/bazarr-binaries/refs/heads/master/announcements.json",
+                url="https://raw.githubusercontent.com/LavX/bazarr-binaries/refs/heads/master/announcements.json",
                 timeout=30
             )
+            r.raise_for_status()
         except Exception:
             logging.exception("Error trying to get announcements from Github.")
             return
-    else:
-        with open(os.path.join(args.config_dir, 'config', 'announcements.json'), 'wb') as f:
-            f.write(r.content)
-    finally:
-        if not startup:
-            jobs_queue.update_job_name(job_id=job_id, new_job_name="Updated Announcements File")
+    with open(os.path.join(args.config_dir, 'config', 'announcements.json'), 'wb') as f:
+        f.write(r.content)
+    if not startup:
+        jobs_queue.update_job_name(job_id=job_id, new_job_name="Updated Announcements File")
 
 
 def get_online_announcements():
@@ -94,65 +85,7 @@ def get_online_announcements():
 
 
 def get_local_announcements():
-    announcements = []
-
-    # opensubtitles.org end-of-life
-    enabled_providers = get_enabled_providers()
-    if enabled_providers and 'opensubtitles' in enabled_providers and not settings.opensubtitles.vip:
-        announcements.append({
-            'text': 'Opensubtitles.org is deprecated for non-VIP users, migrate to Opensubtitles.com ASAP and disable '
-                    'this provider to remove this announcement.',
-            'link': 'https://wiki.bazarr.media/Troubleshooting/OpenSubtitles-migration/',
-            'dismissible': True,
-            'timestamp': 1676236978,
-        })
-
-    # opensubtitles-scraper alternative announcement
-    if enabled_providers and 'opensubtitles' in enabled_providers:
-        announcements.append({
-            'text': 'An alternative OpenSubtitles scraper service is available that bypasses API limitations. '
-                    'Consider using opensubtitles-scraper for improved subtitle downloads.',
-            'link': 'https://github.com/morpheus65535/bazarr/tree/master/opensubtitles-scraper',
-            'dismissible': True,
-            'timestamp': 1765805148,
-        })
-
-
-    # deprecated Sonarr and Radarr versions
-    if get_sonarr_info.is_deprecated():
-        announcements.append({
-            'text': f'Sonarr {get_sonarr_info.version()} is deprecated and unsupported. You should consider upgrading '
-                    f'as Bazarr will eventually drop support for deprecated Sonarr version.',
-            'link': 'https://forums.sonarr.tv/t/v3-is-now-officially-stable-v2-is-eol/27858',
-            'dismissible': False,
-            'timestamp': 1679606061,
-        })
-    if get_radarr_info.is_deprecated():
-        announcements.append({
-            'text': f'Radarr {get_radarr_info.version()} is deprecated and unsupported. You should consider upgrading '
-                    f'as Bazarr will eventually drop support for deprecated Radarr version.',
-            'link': 'https://discord.com/channels/264387956343570434/264388019585286144/1051567458697363547',
-            'dismissible': False,
-            'timestamp': 1679606309,
-        })
-
-    # upcoming deprecated Python versions
-    if upcoming_deprecated_python_version():
-        announcements.append({
-            'text': 'Starting with Bazarr 1.6, support for Python 3.8 and 3.9 will get dropped. Upgrade your current '
-                    'version of Python ASAP to get further updates.',
-            'link': 'https://wiki.bazarr.media/Troubleshooting/Windows_installer_reinstall/',
-            'dismissible': False,
-            'timestamp': 1744469706,
-        })
-
-    for announcement in announcements:
-        if 'enabled' not in announcement:
-            announcement['enabled'] = True
-        if 'dismissible' not in announcement:
-            announcement['dismissible'] = True
-
-    return announcements
+    return []
 
 
 def get_all_announcements():
diff --git a/bazarr/app/check_update.py b/bazarr/app/check_update.py
index 3a6d4beadc..c02872bb71 100644
--- a/bazarr/app/check_update.py
+++ b/bazarr/app/check_update.py
@@ -17,63 +17,103 @@
 
 # Fork configuration - allows overriding via environment variable
 # Default: LavX/bazarr (this fork)
-# To use upstream releases, set BAZARR_UPSTREAM_REPO=morpheus65535/Bazarr
+# To use upstream releases, set BAZARR_RELEASES_REPO to the upstream repo
 RELEASES_REPO = os.environ.get('BAZARR_RELEASES_REPO', 'LavX/bazarr')
 
+# Microservice repositories to include in releases page
+MICROSERVICE_REPOS = [
+    ('LavX/opensubtitles-scraper', 'OpenSubtitles Scraper'),
+    ('LavX/ai-subtitle-translator', 'AI Subtitle Translator'),
+]
+
 
 def deprecated_python_version():
     # return True if Python version is deprecated
-    return sys.version_info.major == 2 or (sys.version_info.major == 3 and sys.version_info.minor < 8)
-
+    return sys.version_info.major == 2 or (sys.version_info.major == 3 and sys.version_info.minor < 10)
 
-def check_releases(job_id=None, startup=False):
-    # startup is used to prevent trying to create a job before the jobs queue is initialized
-    if not startup and not job_id:
-        jobs_queue.add_job_from_function("Updating Release Info", is_progress=False)
-        return
 
+def _fetch_repo_releases(repo, label=None):
+    """Fetch releases from a single GitHub repo. Returns list of release dicts."""
     releases = []
-    url_releases = f'https://api.github.com/repos/{RELEASES_REPO}/releases?per_page=100'
+    url = f'https://api.github.com/repos/{repo}/releases?per_page=100'
     try:
-        logging.debug(f'BAZARR getting releases from Github: {url_releases}')
-        r = requests.get(url_releases, allow_redirects=True, timeout=15)
+        logging.debug(f'BAZARR getting releases from Github: {url}')
+        r = requests.get(url, allow_redirects=True, timeout=15)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
-        logging.exception("Error trying to get releases from Github. Http error.")
+        logging.exception(f"Error trying to get releases from Github ({repo}). Http error.")
     except requests.exceptions.ConnectionError:
-        logging.exception("Error trying to get releases from Github. Connection Error.")
+        logging.exception(f"Error trying to get releases from Github ({repo}). Connection Error.")
     except requests.exceptions.Timeout:
-        logging.exception("Error trying to get releases from Github. Timeout Error.")
+        logging.exception(f"Error trying to get releases from Github ({repo}). Timeout Error.")
     except requests.exceptions.RequestException:
-        logging.exception("Error trying to get releases from Github.")
+        logging.exception(f"Error trying to get releases from Github ({repo}).")
     else:
-        for release in r.json():
+        try:
+            releases_data = r.json()
+        except ValueError:
+            logging.error(f"Error parsing JSON from Github releases response ({repo}). Skipping.")
+            return releases
+        for release in releases_data:
             download_link = None
-            for asset in release['assets']:
-                if asset['name'] == 'bazarr.zip':
-                    download_link = asset['browser_download_url']
-            if not download_link:
-                continue
-            releases.append({'name': release['name'],
-                             'body': release['body'],
-                             'date': release['published_at'],
-                             'prerelease': release['prerelease'],
-                             'download_link': download_link})
-        with open(os.path.join(args.config_dir, 'config', 'releases.txt'), 'w') as f:
-            json.dump(releases, f)
-        logging.debug(f'BAZARR saved {len(r.json())} releases to releases.txt')
-    finally:
-        if not startup:
-            jobs_queue.update_job_name(job_id=job_id, new_job_name="Updated Release Info")
-
-
-def check_if_new_update():
+            for asset in release.get('assets', []):
+                download_link = asset['browser_download_url']
+                break
+            entry = {'name': release['name'],
+                     'body': release['body'] or '',
+                     'date': release['published_at'],
+                     'prerelease': release['prerelease'],
+                     'download_link': download_link}
+            if label:
+                entry['repo'] = label
+            releases.append(entry)
+        logging.debug(f'BAZARR fetched {len(releases)} releases from {repo}')
+    return releases
+
+
+def check_releases(job_id=None, startup=False, wait_for_completion=False):
+    # startup is used to prevent trying to create a job before the jobs queue is initialized
+    if not startup and not job_id:
+        jobs_queue.add_job_from_function("Updating Release Info", is_progress=False,
+                                         wait_for_completion=wait_for_completion)
+        return
+
+    releases = _fetch_repo_releases(RELEASES_REPO, label='Bazarr+')
+
+    for repo, label in MICROSERVICE_REPOS:
+        releases.extend(_fetch_repo_releases(repo, label=label))
+
+    releases.sort(key=lambda r: r['date'], reverse=True)
+
+    with open(os.path.join(args.config_dir, 'config', 'releases.txt'), 'w') as f:
+        json.dump(releases, f)
+    logging.debug(f'BAZARR saved {len(releases)} releases to releases.txt')
+
+    if job_id:
+        jobs_queue.update_job_name(job_id=job_id, new_job_name="Updated Release Info")
+
+
+def check_if_new_update(startup=False, job_id=None, wait_for_completion=False):
+    if not startup and not job_id:
+        jobs_queue.add_job_from_function("Checking for Bazarr update", is_progress=False,
+                                         wait_for_completion=wait_for_completion)
+        return
+
+    # Skip auto-update when running from source (no BAZARR_VERSION set)
+    bazarr_version = os.environ.get("BAZARR_VERSION", "")
+    if not bazarr_version:
+        logging.debug('BAZARR running from source, skipping auto-update')
+        check_releases(startup=True)
+        return
+
     if settings.general.branch == 'master':
         use_prerelease = False
     elif settings.general.branch == 'development':
         use_prerelease = True
     else:
         logging.error(f'BAZARR unknown branch provided to updater: {settings.general.branch}')
+        if job_id:
+            jobs_queue.update_job_name(job_id=job_id, new_job_name="Failed to check for Bazarr update")
         return
     logging.debug(f'BAZARR updater is using {settings.general.branch} branch')
 
@@ -128,9 +168,14 @@ def check_if_new_update():
             logging.debug('BAZARR no release found')
     else:
         logging.debug('BAZARR --no_update have been used as an argument')
+    if job_id:
+        jobs_queue.update_job_name(job_id=job_id, new_job_name="Checked for Bazarr update")
 
 
 def download_release(url):
+    if not url:
+        logging.debug('BAZARR release has no download URL, skipping update')
+        return
     r = None
     update_dir = os.path.join(args.config_dir, 'update')
     try:
@@ -139,7 +184,7 @@ def download_release(url):
         logging.debug(f'BAZARR unable to create update directory {update_dir}')
     else:
         logging.debug(f'BAZARR downloading release from Github: {url}')
-        r = requests.get(url, allow_redirects=True)
+        r = requests.get(url, allow_redirects=True, timeout=300)
     if r:
         try:
             with open(os.path.join(update_dir, 'bazarr.zip'), 'wb') as f:
diff --git a/bazarr/app/config.py b/bazarr/app/config.py
index 74acc0cae9..941c4b35cd 100644
--- a/bazarr/app/config.py
+++ b/bazarr/app/config.py
@@ -89,7 +89,7 @@ def check_parser_binary(value):
     Validator('general.port', must_exist=True, default=6767, is_type_of=int, gte=1, lte=65535),
     Validator('general.hostname', must_exist=True, default=platform.node(), is_type_of=str),
     Validator('general.base_url', must_exist=True, default='', is_type_of=str),
-    Validator('general.instance_name', must_exist=True, default='Bazarr', is_type_of=str,
+    Validator('general.instance_name', must_exist=True, default='Bazarr+', is_type_of=str,
               apply_default_on_none=True),
     Validator('general.path_mappings', must_exist=True, default=[], is_type_of=list),
     Validator('general.debug', must_exist=True, default=False, is_type_of=bool),
@@ -97,7 +97,7 @@ def check_parser_binary(value):
               is_in=['master', 'development']),
     Validator('general.auto_update', must_exist=True, default=True, is_type_of=bool),
     Validator('general.single_language', must_exist=True, default=False, is_type_of=bool),
-    Validator('general.minimum_score', must_exist=True, default=90, is_type_of=int, gte=0, lte=100),
+    Validator('general.minimum_score', must_exist=True, default=80, is_type_of=int, gte=0, lte=100),
     Validator('general.use_scenename', must_exist=True, default=True, is_type_of=bool),
     Validator('general.use_postprocessing', must_exist=True, default=False, is_type_of=bool),
     Validator('general.postprocessing_cmd', must_exist=True, default='', is_type_of=str),
@@ -140,6 +140,7 @@ def check_parser_binary(value):
               is_in=['3d', '1w', '2w', '3w', '4w']),
     Validator('general.enabled_providers', must_exist=True, default=[], is_type_of=list),
     Validator('general.provider_priorities', must_exist=True, default={}, is_type_of=dict),
+    Validator('general.use_provider_priority', must_exist=True, default=True, is_type_of=bool),
     Validator('general.enabled_integrations', must_exist=True, default=[], is_type_of=list),
     Validator('general.multithreading', must_exist=True, default=True, is_type_of=bool),
     Validator('general.chmod_enabled', must_exist=True, default=False, is_type_of=bool),
@@ -198,8 +199,9 @@ def check_parser_binary(value):
 
     # translating section
     Validator('translator.default_score', must_exist=True, default=50, is_type_of=int, gte=0),
-    Validator('translator.gemini_key', must_exist=True, default='', is_type_of=str, cast=str),
+    Validator('translator.gemini_keys', must_exist=True, default=[], is_type_of=list),
     Validator('translator.gemini_model', must_exist=True, default='gemini-2.0-flash', is_type_of=str, cast=str),
+    Validator('translator.gemini_batch_size', must_exist=True, default=300, is_type_of=int, gte=1),
     Validator('translator.translator_info', must_exist=True, default=True, is_type_of=bool),
     Validator('translator.translator_type', must_exist=True, default='google_translate', is_type_of=str, cast=str),
     Validator('translator.lingarr_url', must_exist=True, default='http://lingarr:9876', is_type_of=str),
@@ -210,6 +212,8 @@ def check_parser_binary(value):
     Validator('translator.openrouter_max_concurrent', must_exist=True, default=2, is_type_of=int, gte=1, lte=10),
     Validator('translator.openrouter_reasoning', must_exist=True, default='disabled', is_type_of=str,
               is_in=['disabled', 'low', 'medium', 'high']),
+    Validator('translator.openrouter_parallel_batches', must_exist=True, default=4, is_type_of=int, gte=1, lte=8),
+    Validator('translator.openrouter_encryption_key', must_exist=True, default='', is_type_of=str, cast=str),
     Validator('translator.lingarr_token', must_exist=True, default='', is_type_of=str, cast=str),
 
     # sonarr section
@@ -235,6 +239,7 @@ def check_parser_binary(value):
     Validator('sonarr.defer_search_signalr', must_exist=True, default=False, is_type_of=bool),
     Validator('sonarr.sync_only_monitored_series', must_exist=True, default=False, is_type_of=bool),
     Validator('sonarr.sync_only_monitored_episodes', must_exist=True, default=False, is_type_of=bool),
+    Validator('sonarr.verify_ssl', must_exist=True, default=False, is_type_of=bool),
 
     # radarr section
     Validator('radarr.ip', must_exist=True, default='127.0.0.1', is_type_of=str),
@@ -256,6 +261,7 @@ def check_parser_binary(value):
     Validator('radarr.use_ffprobe_cache', must_exist=True, default=True, is_type_of=bool),
     Validator('radarr.defer_search_signalr', must_exist=True, default=False, is_type_of=bool),
     Validator('radarr.sync_only_monitored_movies', must_exist=True, default=False, is_type_of=bool),
+    Validator('radarr.verify_ssl', must_exist=True, default=False, is_type_of=bool),
 
     # plex section
     Validator('plex.ip', must_exist=True, default='127.0.0.1', is_type_of=str),
@@ -277,6 +283,7 @@ def check_parser_binary(value):
     Validator('plex.user_id', must_exist=True, default='', is_type_of=(int, str)),
     Validator('plex.auth_method', must_exist=True, default='apikey', is_type_of=str, is_in=['apikey', 'oauth']),
     Validator('plex.encryption_key', must_exist=True, default='', is_type_of=str),
+    Validator('plex.verify_ssl', must_exist=True, default=False, is_type_of=bool),
     Validator('plex.server_machine_id', must_exist=True, default='', is_type_of=str),
     Validator('plex.server_name', must_exist=True, default='', is_type_of=str),
     Validator('plex.server_url', must_exist=True, default='', is_type_of=str),
@@ -305,9 +312,9 @@ def check_parser_binary(value):
     Validator('opensubtitles.ssl', must_exist=True, default=False, is_type_of=bool),
     Validator('opensubtitles.timeout', must_exist=True, default=15, is_type_of=int, gte=1),
     Validator('opensubtitles.skip_wrong_fps', must_exist=True, default=False, is_type_of=bool),
-    # Web scraper mode - can be enabled via OPENSUBTITLES_USE_WEB_SCRAPER=true environment variable
+    # Web scraper mode - always enabled (OpenSubtitles.org login no longer available)
     Validator('opensubtitles.use_web_scraper', must_exist=True,
-              default=os.environ.get('OPENSUBTITLES_USE_WEB_SCRAPER', 'false').lower() in ('true', '1', 'yes'),
+              default=True,
               is_type_of=bool),
     # Scraper URL - can be set via OPENSUBTITLES_SCRAPER_URL environment variable
     Validator('opensubtitles.scraper_service_url', must_exist=True,
@@ -451,33 +458,6 @@ def check_parser_binary(value):
     Validator('subsync.max_offset_seconds', must_exist=True, default=60, is_type_of=int,
               is_in=[60, 120, 300, 600]),
 
-    # series_scores section
-    Validator('series_scores.hash', must_exist=True, default=359, is_type_of=int),
-    Validator('series_scores.series', must_exist=True, default=180, is_type_of=int),
-    Validator('series_scores.year', must_exist=True, default=90, is_type_of=int),
-    Validator('series_scores.season', must_exist=True, default=30, is_type_of=int),
-    Validator('series_scores.episode', must_exist=True, default=30, is_type_of=int),
-    Validator('series_scores.release_group', must_exist=True, default=14, is_type_of=int),
-    Validator('series_scores.source', must_exist=True, default=7, is_type_of=int),
-    Validator('series_scores.audio_codec', must_exist=True, default=3, is_type_of=int),
-    Validator('series_scores.resolution', must_exist=True, default=2, is_type_of=int),
-    Validator('series_scores.video_codec', must_exist=True, default=2, is_type_of=int),
-    Validator('series_scores.streaming_service', must_exist=True, default=1, is_type_of=int),
-    Validator('series_scores.hearing_impaired', must_exist=True, default=1, is_type_of=int),
-
-    # movie_scores section
-    Validator('movie_scores.hash', must_exist=True, default=119, is_type_of=int),
-    Validator('movie_scores.title', must_exist=True, default=60, is_type_of=int),
-    Validator('movie_scores.year', must_exist=True, default=30, is_type_of=int),
-    Validator('movie_scores.release_group', must_exist=True, default=13, is_type_of=int),
-    Validator('movie_scores.source', must_exist=True, default=7, is_type_of=int),
-    Validator('movie_scores.audio_codec', must_exist=True, default=3, is_type_of=int),
-    Validator('movie_scores.resolution', must_exist=True, default=2, is_type_of=int),
-    Validator('movie_scores.video_codec', must_exist=True, default=2, is_type_of=int),
-    Validator('movie_scores.streaming_service', must_exist=True, default=1, is_type_of=int),
-    Validator('movie_scores.edition', must_exist=True, default=1, is_type_of=int),
-    Validator('movie_scores.hearing_impaired', must_exist=True, default=1, is_type_of=int),
-
     # postgresql section
     Validator('postgresql.enabled', must_exist=True, default=False, is_type_of=bool),
     Validator('postgresql.host', must_exist=True, default='localhost', is_type_of=str),
@@ -589,6 +569,7 @@ def write_config():
               'excluded_series_types',
               'enabled_providers',
               'enabled_integrations',
+              'gemini_keys',
               'path_mappings',
               'path_mappings_movie',
               'remove_profile_tags',
@@ -627,6 +608,20 @@ def write_config():
         settings.embeddedsubtitles.unknown_as_fallback = True
         settings.embeddedsubtitles.fallback_lang = 'en'
     del settings.embeddedsubtitles.unknown_as_english
+
+# delete custom scores sections since we don't use this anymore
+if hasattr(settings, 'series_scores'):
+    settings.unset('SERIES_SCORES')
+if hasattr(settings, 'movie_scores'):
+    settings.unset('MOVIE_SCORES')
+
+# backward compatibility: migrate gemini_key to gemini_keys
+if hasattr(settings.translator, 'gemini_key'):
+    legacy_key = str(settings.translator.gemini_key).strip()
+    if legacy_key and not settings.translator.gemini_keys:
+        settings.translator.gemini_keys = [legacy_key]
+    del settings.translator.gemini_key
+
 # save updated settings to file
 write_config()
 
@@ -704,12 +699,15 @@ def save_settings(settings_items):
             if value in empty_values and value != '':
                 value = None
 
-        # try to cast string as integer
+        # try to cast string as integer or float
         if isinstance(value, str) and settings_keys[-1] not in str_keys:
             try:
                 value = int(value)
             except ValueError:
-                pass
+                try:
+                    value = float(value)
+                except ValueError:
+                    pass
 
         # Make sure empty language list are stored correctly
         if settings_keys[-1] in array_keys and value[0] in empty_values:
@@ -752,7 +750,8 @@ def save_settings(settings_items):
 
         if key == 'settings-auth-password':
             if value != settings.auth.password and value is not None:
-                value = hashlib.md5(f"{value}".encode('utf-8')).hexdigest()
+                from utilities.helper import hash_password
+                value = hash_password(value)
 
         if key == 'settings-general-debug':
             configure_debug = True
@@ -1017,9 +1016,15 @@ def configure_proxy_func():
         os.environ['NO_PROXY'] = exclude
 
 
-def get_scores():
-    settings = get_settings()
-    return {"movie": settings["movie_scores"], "episode": settings["series_scores"]}
+_SSL_VERIFY_SERVICES = frozenset({'sonarr', 'radarr', 'plex'})
+
+
+def get_ssl_verify(service):
+    """Return the verify parameter for requests calls to a service."""
+    if service not in _SSL_VERIFY_SERVICES:
+        raise ValueError(f"Unknown service for SSL verify: {service}")
+    return settings.get(f'{service}.verify_ssl', False)
+
 
 
 def sync_checker(subtitle):
diff --git a/bazarr/app/database.py b/bazarr/app/database.py
index 8504d3342c..79cad39fb0 100644
--- a/bazarr/app/database.py
+++ b/bazarr/app/database.py
@@ -87,6 +87,8 @@
     def set_sqlite_pragma(dbapi_connection, connection_record):
         cursor = dbapi_connection.cursor()
         cursor.execute("PRAGMA foreign_keys=ON")
+        cursor.execute("PRAGMA journal_mode=WAL")
+        cursor.execute("PRAGMA busy_timeout=5000")
         cursor.close()
 
 session_factory = sessionmaker(bind=engine)
@@ -188,6 +190,7 @@ class TableHistory(Base):
     language = mapped_column(Text)
     provider = mapped_column(Text)
     score = mapped_column(Integer)
+    score_out_of = mapped_column(Integer, nullable=True)
     sonarrEpisodeId = mapped_column(Integer, ForeignKey('table_episodes.sonarrEpisodeId', ondelete='CASCADE'))
     sonarrSeriesId = mapped_column(Integer, ForeignKey('table_shows.sonarrSeriesId', ondelete='CASCADE'))
     subs_id = mapped_column(Text)
@@ -209,6 +212,7 @@ class TableHistoryMovie(Base):
     provider = mapped_column(Text)
     radarrId = mapped_column(Integer, ForeignKey('table_movies.radarrId', ondelete='CASCADE'))
     score = mapped_column(Integer)
+    score_out_of = mapped_column(Integer, nullable=True)
     subs_id = mapped_column(Text)
     subtitles_path = mapped_column(Text)
     timestamp = mapped_column(DateTime, nullable=False, default=datetime.now)
diff --git a/bazarr/app/get_providers.py b/bazarr/app/get_providers.py
index 6d7739b1e0..7fed65069f 100644
--- a/bazarr/app/get_providers.py
+++ b/bazarr/app/get_providers.py
@@ -1,8 +1,8 @@
 # coding=utf-8
 
 import os
+import json
 import datetime
-import pytz
 import logging
 import subliminal_patch
 import pretty
@@ -12,6 +12,7 @@
 import traceback
 import re
 
+from zoneinfo import ZoneInfo
 from requests import ConnectionError
 from subzero.language import Language
 from subliminal_patch.exceptions import (TooManyRequests, APIThrottled, ParseResponseError, IPAddressBlocked,
@@ -31,8 +32,7 @@
 _TRACEBACK_RE = re.compile(r'File "(.*?providers[\\/].*?)", line (\d+)')
 
 
-def time_until_midnight(timezone):
-    # type: (datetime.datetime) -> datetime.timedelta
+def time_until_midnight(timezone) -> datetime.timedelta:
     """
     Get timedelta until midnight.
     """
@@ -45,13 +45,13 @@ def time_until_midnight(timezone):
 # Titulky resets its download limits at the start of a new day from its perspective - the Europe/Prague timezone
 # Needs to convert to offset-naive dt
 def titulky_limit_reset_timedelta():
-    return time_until_midnight(timezone=pytz.timezone('Europe/Prague'))
+    return time_until_midnight(timezone=ZoneInfo('Europe/Prague'))
 
 
 # LegendasDivx reset its searches limit at approximately midnight, Lisbon time, every day. We wait 1 more hours just
 # to be sure.
 def legendasdivx_limit_reset_timedelta():
-    return time_until_midnight(timezone=pytz.timezone('Europe/Lisbon')) + datetime.timedelta(minutes=60)
+    return time_until_midnight(timezone=ZoneInfo('Europe/Lisbon')) + datetime.timedelta(minutes=60)
 
 
 VALID_THROTTLE_EXCEPTIONS = (TooManyRequests, DownloadLimitExceeded, ServiceUnavailable, APIThrottled,
@@ -202,7 +202,7 @@ def get_providers():
             else:
                 logging.info("Using %s again after %s, (disabled because: %s)", provider, throttle_desc, reason)
                 del tp[provider]
-                set_throttled_providers(str(tp))
+                set_throttled_providers(tp)
         # if forced only is enabled: # fixme: Prepared for forced only implementation to remove providers with don't support forced only subtitles
         #     for provider in providers_list:
         #         if provider in PROVIDERS_FORCED_OFF:
@@ -397,7 +397,7 @@ def _handle_mgb(name, exception, ids, language):
 
     if ids:
         if exception.media_type == "series":
-            if 'sonarrSeriesId' in ids and 'sonarrEpsiodeId' in ids:
+            if 'sonarrSeriesId' in ids and 'sonarrEpisodeId' in ids:
                 blacklist_log(ids['sonarrSeriesId'], ids['sonarrEpisodeId'], name, exception.id, language_str)
         else:
             blacklist_log_movie(ids['radarrId'], name, exception.id, language_str)
@@ -411,7 +411,7 @@ def provider_throttle(name, exception, ids=None, language=None):
     cls_name = getattr(cls, "__name__")
     if cls not in VALID_THROTTLE_EXCEPTIONS:
         for valid_cls in VALID_THROTTLE_EXCEPTIONS:
-            if isinstance(cls, valid_cls):
+            if issubclass(cls, valid_cls):
                 cls = valid_cls
 
     throttle_data = provider_throttle_map().get(name, provider_throttle_map()["default"]).get(cls, None) or \
@@ -424,7 +424,7 @@ def provider_throttle(name, exception, ids=None, language=None):
 
     throttle_until = datetime.datetime.now() + throttle_delta
 
-    if cls_name not in VALID_COUNT_EXCEPTIONS or throttled_count(name):
+    if cls_name not in VALID_COUNT_EXCEPTIONS or throttled_count(name, exception):
         if cls_name == 'ValueError' and isinstance(exception.args, tuple) and len(exception.args) and exception.args[
             0].startswith('unsupported pickle protocol'):
             for fn in subliminal_cache_region.backend.all_filenames:
@@ -434,7 +434,7 @@ def provider_throttle(name, exception, ids=None, language=None):
                     logging.debug("Couldn't remove cache file: %s", os.path.basename(fn))
         else:
             tp[name] = (cls_name, throttle_until, throttle_description)
-            set_throttled_providers(str(tp))
+            set_throttled_providers(tp)
 
             trac_info = _get_traceback_info(exception)
 
@@ -465,7 +465,7 @@ def _get_traceback_info(exc: Exception):
     return message + extra
 
 
-def throttled_count(name):
+def throttled_count(name, exception=None):
     global throttle_count
     if name in list(throttle_count.keys()):
         if 'count' in list(throttle_count[name].keys()):
@@ -483,9 +483,15 @@ def throttled_count(name):
         return True
     if throttle_count[name]['time'] <= datetime.datetime.now():
         throttle_count[name] = {"count": 1, "time": (datetime.datetime.now() + datetime.timedelta(seconds=120))}
-    logging.info("Provider %s throttle count %s of 5, waiting 5sec and trying again", name,
-                 throttle_count[name]['count'])
-    time.sleep(5)
+
+    # Respect Retry-After from the exception if available, otherwise default to 5s
+    wait_seconds = 5
+    if exception and hasattr(exception, 'retry_after') and exception.retry_after:
+        wait_seconds = max(1, min(exception.retry_after, 30))  # floor at 1s, cap at 30s
+
+    logging.info("Provider %s throttle count %s of 5, waiting %ds and trying again", name,
+                 throttle_count[name]['count'], wait_seconds)
+    time.sleep(wait_seconds)
     return False
 
 
@@ -496,7 +502,7 @@ def update_throttled_provider():
     for provider in list(tp):
         if provider not in providers_list:
             del tp[provider]
-            set_throttled_providers(str(tp))
+            set_throttled_providers(tp)
 
         reason, until, throttle_desc = tp.get(provider, (None, None, None))
 
@@ -507,7 +513,7 @@ def update_throttled_provider():
             else:
                 logging.info("Using %s again after %s, (disabled because: %s)", provider, throttle_desc, reason)
                 del tp[provider]
-                set_throttled_providers(str(tp))
+                set_throttled_providers(tp)
 
             reason, until, throttle_desc = tp.get(provider, (None, None, None))
 
@@ -516,7 +522,7 @@ def update_throttled_provider():
                 if now >= until:
                     logging.info("Using %s again after %s, (disabled because: %s)", provider, throttle_desc, reason)
                     del tp[provider]
-                    set_throttled_providers(str(tp))
+                    set_throttled_providers(tp)
 
     event_stream(type='badges')
 
@@ -538,7 +544,7 @@ def reset_throttled_providers(only_auth_or_conf_error=False):
                                                                'PaymentRequired']:
             continue
         del tp[provider]
-    set_throttled_providers(str(tp))
+    set_throttled_providers(tp)
     update_throttled_provider()
     if only_auth_or_conf_error:
         logging.info('BAZARR throttled providers have been reset (only AuthenticationError, ConfigurationError and '
@@ -547,24 +553,50 @@ def reset_throttled_providers(only_auth_or_conf_error=False):
         logging.info('BAZARR throttled providers have been reset.')
 
 
+def _throttled_providers_path():
+    return os.path.normpath(os.path.join(args.config_dir, 'config', 'throttled_providers.dat'))
+
+
 def get_throttled_providers():
     providers = {}
+    dat_path = _throttled_providers_path()
     try:
-        if os.path.exists(os.path.join(args.config_dir, 'config', 'throttled_providers.dat')):
-            with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'throttled_providers.dat')), 'r') as \
-                    handle:
-                providers = eval(handle.read())
+        if os.path.exists(dat_path):
+            with open(dat_path, 'r') as handle:
+                content = handle.read()
+                if not content.strip():
+                    return providers
+                raw = json.loads(content)
+                for name, val in raw.items():
+                    cls_name, until_str, description = val
+                    until = datetime.datetime.fromisoformat(until_str) if until_str else None
+                    providers[name] = (cls_name, until, description)
+    except (json.JSONDecodeError, KeyError, ValueError):
+        logging.info("Migrating throttled_providers.dat from legacy format to JSON. Throttle state reset.")
+        set_throttled_providers(providers)
     except Exception:
-        # set empty content in throttled_providers.dat
-        logging.error("Invalid content in throttled_providers.dat. Resetting")
-        set_throttled_providers(str(providers))
-    finally:
-        return providers
+        logging.exception("Unexpected error reading throttled_providers.dat. Resetting.")
+        set_throttled_providers(providers)
+    return providers
 
 
 def set_throttled_providers(data):
-    with open(os.path.normpath(os.path.join(args.config_dir, 'config', 'throttled_providers.dat')), 'w+') as handle:
-        handle.write(data)
+    if not isinstance(data, dict):
+        raise TypeError(f"set_throttled_providers expects a dict, got {type(data).__name__}")
+    dat_path = _throttled_providers_path()
+    serializable = {}
+    for name, val in data.items():
+        cls_name, throttle_until, description = val
+        serializable[name] = (
+            cls_name,
+            throttle_until.isoformat() if throttle_until else None,
+            description
+        )
+    json_data = json.dumps(serializable)
+    tmp_path = dat_path + '.tmp'
+    with open(tmp_path, 'w') as handle:
+        handle.write(json_data)
+    os.replace(tmp_path, dat_path)
 
 
 tp = get_throttled_providers()
diff --git a/bazarr/app/jobs_queue.py b/bazarr/app/jobs_queue.py
index ae613b4cac..362c8edece 100644
--- a/bazarr/app/jobs_queue.py
+++ b/bazarr/app/jobs_queue.py
@@ -4,6 +4,7 @@
 import importlib
 import inspect
 import os
+import time
 
 from time import sleep
 from datetime import datetime
@@ -233,6 +234,14 @@ def update_job_name(self, job_id: int, new_job_name: str) -> bool:
                 return True
         return False
 
+    def get_job_name(self, job_id: int) -> str:
+        """Get the current name of a job by its ID."""
+        queues = self.jobs_pending_queue + self.jobs_running_queue + self.jobs_failed_queue + self.jobs_completed_queue
+        for job in queues:
+            if job.job_id == job_id:
+                return job.job_name
+        return ""
+
     def get_job_returned_value(self, job_id: int):
         """
         Fetches the returned value of a job from the queue provided its unique identifier.
@@ -335,7 +344,8 @@ def update_job_progress_status(self, job_id: int, is_progress: bool = False) ->
                 return True
         return False
 
-    def add_job_from_function(self, job_name: str, is_progress: bool, progress_max: int = 0) -> int:
+    def add_job_from_function(self, job_name: str, is_progress: bool, progress_max: int = 0,
+                              wait_for_completion: bool = False) -> int:
         """
         Adds a job to the pending queue using the details of the calling function. The job is then executed.
 
@@ -345,6 +355,8 @@ def add_job_from_function(self, job_name: str, is_progress: bool, progress_max:
         :type is_progress: bool
         :param progress_max: Maximum progress value for the job, default is 0.
         :type progress_max: int
+        :param wait_for_completion: Flag indicating whether to wait for the job to complete before returning.
+        :type wait_for_completion: bool
         :return: ID of the added job.
         :rtype: int
         """
@@ -380,6 +392,11 @@ def add_job_from_function(self, job_name: str, is_progress: bool, progress_max:
         job_id = self.feed_jobs_pending_queue(job_name=job_name, module=parent_function_path, func=parent_function_name,
                                               kwargs=arguments, is_progress=is_progress, progress_max=progress_max)
 
+        if wait_for_completion:
+            time.sleep(1)
+            while jobs_queue.get_job_status(job_id) in ['queued', 'running']:
+                time.sleep(1)
+
         return job_id
 
     def remove_job_from_pending_queue(self, job_id: int):
@@ -500,8 +517,21 @@ def consume_jobs_pending_queue(self):
             try:
                 if self.jobs_pending_queue:
                     with self._queue_lock:
-                        can_run_job = (len(self.jobs_running_queue) < settings.general.concurrent_jobs
-                                       and len(self.jobs_pending_queue) > 0)
+                        next_job = self.jobs_pending_queue[0] if self.jobs_pending_queue else None
+                        if next_job:
+                            is_translation = 'translat' in (next_job.job_name or '').lower()
+                            if is_translation:
+                                # Translation jobs respect their own concurrency limit
+                                running_translations = sum(
+                                    1 for j in self.jobs_running_queue
+                                    if 'translat' in (j.job_name or '').lower()
+                                )
+                                max_translations = settings.translator.openrouter_max_concurrent
+                                can_run_job = running_translations < max_translations
+                            else:
+                                can_run_job = len(self.jobs_running_queue) < settings.general.concurrent_jobs
+                        else:
+                            can_run_job = False
 
                     if can_run_job:
                         job_thread = Thread(target=self._run_job)
diff --git a/bazarr/app/logger.py b/bazarr/app/logger.py
index a5b998da1d..13422b18e0 100644
--- a/bazarr/app/logger.py
+++ b/bazarr/app/logger.py
@@ -9,7 +9,6 @@
 
 from logging.handlers import TimedRotatingFileHandler
 from utilities.central import get_log_file_path
-from pytz_deprecation_shim import PytzUsageWarning
 
 from .config import settings
 
@@ -129,8 +128,6 @@ def filter(self, record):
 
 def configure_logging(debug=False):
     warnings.simplefilter('ignore', category=ResourceWarning)
-    warnings.simplefilter('ignore', category=PytzUsageWarning)
-    # warnings.simplefilter('ignore', category=SAWarning)
 
     if debug:
         log_level = logging.DEBUG
diff --git a/bazarr/app/notifier.py b/bazarr/app/notifier.py
index f248dfcce0..6988c187a6 100644
--- a/bazarr/app/notifier.py
+++ b/bazarr/app/notifier.py
@@ -37,7 +37,8 @@ def update_notifier():
 
     database.execute(
         insert(TableSettingsNotifier)
-        .values(notifiers_added))
+        .values(notifiers_added)
+        .on_conflict_do_nothing())
 
 
 def get_notifier_providers():
diff --git a/bazarr/app/scheduler.py b/bazarr/app/scheduler.py
index 7326e02e26..763cc6d4f3 100644
--- a/bazarr/app/scheduler.py
+++ b/bazarr/app/scheduler.py
@@ -25,6 +25,7 @@
 from subtitles.indexer.series import series_full_scan_subtitles
 from subtitles.wanted import wanted_search_missing_subtitles_series, wanted_search_missing_subtitles_movies
 from subtitles.upgrade import upgrade_subtitles
+from subtitles.mass_operations import mass_batch_operation
 from utilities.cache import cache_maintenance
 from utilities.health import check_health
 from utilities.backup import backup_to_zip
@@ -108,6 +109,7 @@ def update_configurable_tasks(self):
         self.__update_bazarr_task()
         self.__search_wanted_subtitles_task()
         self.__upgrade_subtitles_task()
+        self.__mass_sync_task()
         self.__randomize_interval_task()
         self.__automatic_backup()
         if args.no_tasks:
@@ -202,22 +204,24 @@ def __sonarr_update_task(self):
             self.aps_scheduler.add_job(
                 update_series, 'interval', minutes=int(settings.sonarr.series_sync), max_instances=1,
                 coalesce=True, misfire_grace_time=15, id='update_series', name='Sync with Sonarr',
-                replace_existing=True)
+                replace_existing=True, kwargs=dict(wait_for_completion=True))
 
     def __radarr_update_task(self):
         if settings.general.use_radarr:
             self.aps_scheduler.add_job(
                 update_movies, 'interval', minutes=int(settings.radarr.movies_sync), max_instances=1,
                 coalesce=True, misfire_grace_time=15, id='update_movies', name='Sync with Radarr',
-                replace_existing=True)
+                replace_existing=True, kwargs=dict(wait_for_completion=True))
 
     def __cache_cleanup_task(self):
         self.aps_scheduler.add_job(cache_maintenance, 'interval', hours=24, max_instances=1, coalesce=True,
-                                   misfire_grace_time=15, id='cache_cleanup', name='Cache Maintenance')
+                                   misfire_grace_time=15, id='cache_cleanup', name='Cache Maintenance',
+                                   kwargs=dict(wait_for_completion=True))
 
     def __check_health_task(self):
         self.aps_scheduler.add_job(check_health, 'interval', hours=6, max_instances=1, coalesce=True,
-                                   misfire_grace_time=15, id='check_health', name='Check Health')
+                                   misfire_grace_time=15, id='check_health', name='Check Health',
+                                   kwargs=dict(wait_for_completion=True))
 
     def __automatic_backup(self):
         backup = settings.backup.frequency
@@ -229,7 +233,8 @@ def __automatic_backup(self):
             trigger = {'year': in_a_century()}
         self.aps_scheduler.add_job(backup_to_zip, 'cron', **trigger,
                                    max_instances=1, coalesce=True, misfire_grace_time=15, id='backup',
-                                   name='Backup Database and Configuration File', replace_existing=True)
+                                   name='Backup Database and Configuration File', replace_existing=True,
+                                   kwargs=dict(wait_for_completion=True))
 
     def __sonarr_full_update_task(self):
         if settings.general.use_sonarr:
@@ -238,17 +243,18 @@ def __sonarr_full_update_task(self):
                 self.aps_scheduler.add_job(
                     series_full_scan_subtitles, 'cron', hour=settings.sonarr.full_update_hour, max_instances=1,
                     coalesce=True, misfire_grace_time=15, id='series_full_scan_subtitles',
-                    name='Index All Existing Episodes Subtitles', replace_existing=True)
+                    name='Index All Existing Episodes Subtitles', replace_existing=True,
+                    kwargs=dict(wait_for_completion=True))
             elif full_update == "Weekly":
                 self.aps_scheduler.add_job(
                     series_full_scan_subtitles, 'cron', day_of_week=settings.sonarr.full_update_day,
                     hour=settings.sonarr.full_update_hour, max_instances=1, coalesce=True, misfire_grace_time=15,
                     id='series_full_scan_subtitles', name='Index All Existing Episodes Subtitles',
-                    replace_existing=True)
+                    replace_existing=True, kwargs=dict(wait_for_completion=True))
             elif full_update == "Manually":
                 self.aps_scheduler.add_job(
                     series_full_scan_subtitles, 'cron', year=in_a_century(), max_instances=1, coalesce=True,
-                    misfire_grace_time=15, id='series_full_scan_subtitles',
+                    misfire_grace_time=15, id='series_full_scan_subtitles', kwargs=dict(wait_for_completion=True),
                     name='Index All Existing Episodes Subtitles', replace_existing=True)
 
     def __radarr_full_update_task(self):
@@ -257,65 +263,78 @@ def __radarr_full_update_task(self):
             if full_update == "Daily":
                 self.aps_scheduler.add_job(
                     movies_full_scan_subtitles, 'cron', hour=settings.radarr.full_update_hour, max_instances=1,
-                    coalesce=True, misfire_grace_time=15,
+                    coalesce=True, misfire_grace_time=15, kwargs=dict(wait_for_completion=True),
                     id='movies_full_scan_subtitles', name='Index All Existing Movies Subtitles', replace_existing=True)
             elif full_update == "Weekly":
                 self.aps_scheduler.add_job(
                     movies_full_scan_subtitles,
                     'cron', day_of_week=settings.radarr.full_update_day, hour=settings.radarr.full_update_hour,
                     max_instances=1, coalesce=True, misfire_grace_time=15, id='movies_full_scan_subtitles',
-                    name='Index All Existing Movies Subtitles', replace_existing=True)
+                    name='Index All Existing Movies Subtitles', replace_existing=True,
+                    kwargs=dict(wait_for_completion=True))
             elif full_update == "Manually":
                 self.aps_scheduler.add_job(
                     movies_full_scan_subtitles, 'cron', year=in_a_century(), max_instances=1, coalesce=True,
                     misfire_grace_time=15, id='movies_full_scan_subtitles', name='Index All Existing Movies Subtitles',
-                    replace_existing=True)
+                    replace_existing=True, kwargs=dict(wait_for_completion=True))
 
     def __update_bazarr_task(self):
-        if not args.no_update and os.environ["BAZARR_VERSION"] != '':
+        if not args.no_update and os.environ["BAZARR_VERSION"] not in ['', 'unknown']:
             task_name = 'Update Bazarr'
 
             if settings.general.auto_update:
                 self.aps_scheduler.add_job(
                     check_if_new_update, 'interval', hours=6, max_instances=1, coalesce=True,
-                    misfire_grace_time=15, id='update_bazarr', name=task_name, replace_existing=True)
+                    misfire_grace_time=15, id='update_bazarr', name=task_name, replace_existing=True,
+                    kwargs=dict(wait_for_completion=True))
             else:
                 self.aps_scheduler.add_job(
                     check_if_new_update, 'cron', year=in_a_century(), hour=4, id='update_bazarr', name=task_name,
-                    replace_existing=True)
+                    replace_existing=True, kwargs=dict(wait_for_completion=True))
                 self.aps_scheduler.add_job(
                     check_releases, 'interval', hours=3, max_instances=1, coalesce=True, misfire_grace_time=15,
-                    id='update_release', name='Update Release Info', replace_existing=True)
+                    id='update_release', name='Update Release Info', replace_existing=True,
+                    kwargs=dict(wait_for_completion=True))
 
         else:
             self.aps_scheduler.add_job(
                 check_releases, 'interval', hours=3, max_instances=1, coalesce=True, misfire_grace_time=15,
-                id='update_release', name='Update Release Info', replace_existing=True)
+                id='update_release', name='Update Release Info', replace_existing=True,
+                kwargs=dict(wait_for_completion=True))
 
         self.aps_scheduler.add_job(
             get_announcements_to_file, 'interval', hours=6, max_instances=1, coalesce=True, misfire_grace_time=15,
-            id='update_announcements', name='Update Announcements File', replace_existing=True)
+            id='update_announcements', name='Update Announcements File', replace_existing=True,
+            kwargs=dict(wait_for_completion=True))
 
     def __search_wanted_subtitles_task(self):
         if settings.general.use_sonarr:
             self.aps_scheduler.add_job(
                 wanted_search_missing_subtitles_series, 'interval', hours=int(settings.general.wanted_search_frequency),
                 max_instances=1, coalesce=True, misfire_grace_time=15, id='wanted_search_missing_subtitles_series',
-                replace_existing=True, name='Search for Missing Series Subtitles')
+                replace_existing=True, name='Search for Missing Series Subtitles',
+                kwargs=dict(wait_for_completion=True))
         if settings.general.use_radarr:
             self.aps_scheduler.add_job(
                 wanted_search_missing_subtitles_movies, 'interval',
                 hours=int(settings.general.wanted_search_frequency_movie), max_instances=1, coalesce=True,
                 misfire_grace_time=15, id='wanted_search_missing_subtitles_movies',
-                name='Search for Missing Movies Subtitles', replace_existing=True)
+                name='Search for Missing Movies Subtitles', replace_existing=True,
+                kwargs=dict(wait_for_completion=True))
 
     def __upgrade_subtitles_task(self):
         if settings.general.use_sonarr or settings.general.use_radarr:
             self.aps_scheduler.add_job(
                 upgrade_subtitles, 'interval', hours=int(settings.general.upgrade_frequency), max_instances=1,
-                coalesce=True, misfire_grace_time=15, id='upgrade_subtitles',
+                coalesce=True, misfire_grace_time=15, id='upgrade_subtitles', kwargs=dict(wait_for_completion=True),
                 name='Upgrade Previously Downloaded Subtitles', replace_existing=True)
 
+    def __mass_sync_task(self):
+        self.aps_scheduler.add_job(
+            mass_batch_operation, 'cron', year=in_a_century(), max_instances=1,
+            coalesce=True, misfire_grace_time=15, id='mass_sync_subtitles',
+            name='Mass Sync All Subtitles', replace_existing=True)
+
     def __randomize_interval_task(self):
         for job in self.aps_scheduler.get_jobs():
             if isinstance(job.trigger, IntervalTrigger):
diff --git a/bazarr/app/ui.py b/bazarr/app/ui.py
index 09193837ab..77964c8f84 100644
--- a/bazarr/app/ui.py
+++ b/bazarr/app/ui.py
@@ -1,13 +1,15 @@
 # coding=utf-8
 
 import os
+import ipaddress
+import socket
 import requests
 import mimetypes
 
 from flask import (request, abort, render_template, Response, session, send_file, stream_with_context, Blueprint,
                    redirect)
 from functools import wraps
-from urllib.parse import unquote
+from urllib.parse import unquote, urlparse
 
 from constants import HEADERS
 from literals import FILE_LOG
@@ -16,7 +18,7 @@
 from utilities.helper import check_credentials
 from utilities.central import get_log_file_path
 
-from .config import settings, base_url
+from .config import settings, base_url, get_ssl_verify
 from .database import database, System
 from .get_args import args
 
@@ -132,7 +134,7 @@ def series_images(url):
     baseUrl = settings.sonarr.base_url
     url_image = f'{url_api_sonarr()}{url.lstrip(baseUrl)}?apikey={apikey}'.replace('poster-250', 'poster-500')
     try:
-        req = requests.get(url_image, stream=True, timeout=15, verify=False, headers=HEADERS)
+        req = requests.get(url_image, stream=True, timeout=15, verify=get_ssl_verify('sonarr'), headers=HEADERS)
     except Exception:
         return '', 404
     else:
@@ -146,7 +148,7 @@ def movies_images(url):
     baseUrl = settings.radarr.base_url
     url_image = f'{url_api_radarr()}{url.lstrip(baseUrl)}?apikey={apikey}'
     try:
-        req = requests.get(url_image, stream=True, timeout=15, verify=False, headers=HEADERS)
+        req = requests.get(url_image, stream=True, timeout=15, verify=get_ssl_verify('radarr'), headers=HEADERS)
     except Exception:
         return '', 404
     else:
@@ -175,6 +177,30 @@ def swaggerui_static(filename):
         return send_file(fullpath)
 
 
+def _resolve_and_validate(url_str):
+    """Resolve DNS once and validate resolved IPs. Pick a safe address to pin to.
+    Returns (resolved_ip, hostname, parsed) or raises ValueError."""
+    parsed = urlparse(url_str)
+    hostname = parsed.hostname
+    if not hostname:
+        raise ValueError("No hostname in URL")
+    port = parsed.port or (443 if parsed.scheme == 'https' else 80)
+    addrs = socket.getaddrinfo(hostname, port)
+    if not addrs:
+        raise ValueError("DNS resolution returned no results")
+    # Find a safe (non-link-local, non-loopback) address to pin to.
+    # Dual-stack hosts may resolve to both private LAN and link-local IPv6.
+    safe_ip = None
+    for _, _, _, _, sockaddr in addrs:
+        ip = ipaddress.ip_address(sockaddr[0])
+        if not ip.is_link_local and not ip.is_loopback:
+            if safe_ip is None:
+                safe_ip = sockaddr[0]
+    if safe_ip is None:
+        raise ValueError("All resolved addresses are link-local or loopback")
+    return safe_ip, hostname, parsed
+
+
 @check_login
 @ui_bp.route('/test', methods=['GET'])
 @ui_bp.route('/test/<protocol>/<path:url>', methods=['GET'])
@@ -182,9 +208,19 @@ def proxy(protocol, url):
     if protocol.lower() not in ['http', 'https']:
         return dict(status=False, error='Unsupported protocol', code=0)
     url = f'{protocol}://{unquote(url)}'
+    try:
+        resolved_ip, hostname, parsed = _resolve_and_validate(url)
+    except (ValueError, socket.gaierror) as e:
+        return dict(status=False, error=f'Request blocked: {e}', code=0)
+    # Pin request to resolved IP to prevent DNS rebinding
+    port = parsed.port or (443 if parsed.scheme == 'https' else 80)
+    pinned_netloc = f'{resolved_ip}:{port}'
+    pinned_url = parsed._replace(netloc=pinned_netloc).geturl()
+    pinned_headers = dict(HEADERS)
+    pinned_headers['Host'] = hostname
     params = request.args
     try:
-        result = requests.get(url, params, allow_redirects=False, verify=False, timeout=5, headers=HEADERS)
+        result = requests.get(pinned_url, params, allow_redirects=False, verify=False, timeout=5, headers=pinned_headers)
     except Exception as e:
         return dict(status=False, error=repr(e))
     else:
diff --git a/bazarr/literals.py b/bazarr/literals.py
index a76fa2ceec..09ba60d9b5 100644
--- a/bazarr/literals.py
+++ b/bazarr/literals.py
@@ -29,3 +29,4 @@
 EXIT_PYTHON_UPGRADE_NEEDED = -103
 EXIT_REQUIREMENTS_ERROR = -104
 EXIT_PORT_ALREADY_IN_USE_ERROR = -105
+EXIT_UNEXPECTED_ERROR = -106
diff --git a/bazarr/main.py b/bazarr/main.py
index aa2884aad7..61c8690568 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -38,7 +38,7 @@
 else:
     # we want to update to the latest version before loading too much stuff. This should prevent deadlock when
     # there's missing embedded packages after a commit
-    check_if_new_update()
+    check_if_new_update(startup=True)
 
 from app.database import (System, database, update, migrate_db, create_db_revision, upgrade_languages_profile_values,
                           fix_languages_profiles_with_duplicate_ids)  # noqa E402
diff --git a/bazarr/radarr/filesystem.py b/bazarr/radarr/filesystem.py
index 72a83cdb27..230665ea6e 100644
--- a/bazarr/radarr/filesystem.py
+++ b/bazarr/radarr/filesystem.py
@@ -3,7 +3,7 @@
 import requests
 import logging
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from radarr.info import url_api_radarr
 from constants import HEADERS
 
@@ -15,7 +15,7 @@ def browse_radarr_filesystem(path='#'):
     url_radarr_api_filesystem = (f"{url_api_radarr()}filesystem?path={path}&allowFoldersWithoutTrailingSlashes=true&"
                                  f"includeFiles=false&apikey={settings.radarr.apikey}")
     try:
-        r = requests.get(url_radarr_api_filesystem, timeout=int(settings.radarr.http_timeout), verify=False,
+        r = requests.get(url_radarr_api_filesystem, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'),
                          headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
diff --git a/bazarr/radarr/history.py b/bazarr/radarr/history.py
index d0cfe78c77..3898c35c5a 100644
--- a/bazarr/radarr/history.py
+++ b/bazarr/radarr/history.py
@@ -2,6 +2,8 @@
 
 from datetime import datetime
 
+from subliminal_patch.score import MAX_SCORES
+
 from app.database import TableHistoryMovie, database, insert
 from app.event_handler import event_stream
 
@@ -28,6 +30,7 @@ def history_log_movie(action, radarr_id, result, fake_provider=None, fake_score=
             language=language,
             provider=provider,
             score=score,
+            score_out_of=MAX_SCORES['movie'] if score else None,
             subs_id=subs_id,
             subtitles_path=subtitles_path,
             matched=str(matched) if matched else None,
diff --git a/bazarr/radarr/info.py b/bazarr/radarr/info.py
index ca6842d1ee..129be6803f 100644
--- a/bazarr/radarr/info.py
+++ b/bazarr/radarr/info.py
@@ -5,11 +5,11 @@
 import datetime
 import semver
 
-from requests.exceptions import JSONDecodeError
+from requests.exceptions import JSONDecodeError, RequestException
 
 from dogpile.cache import make_region
 
-from app.config import settings, empty_values
+from app.config import settings, empty_values, get_ssl_verify
 from constants import HEADERS
 
 region = make_region().configure('dogpile.cache.memory')
@@ -31,7 +31,7 @@ def version():
         if settings.general.use_radarr:
             try:
                 rv = f"{url_radarr()}/api/system/status?apikey={settings.radarr.apikey}"
-                radarr_json = requests.get(rv, timeout=int(settings.radarr.http_timeout), verify=False,
+                radarr_json = requests.get(rv, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'),
                                            headers=HEADERS).json()
                 if 'version' in radarr_json:
                     radarr_version = radarr_json['version']
@@ -40,9 +40,9 @@ def version():
             except JSONDecodeError:
                 try:
                     rv = f"{url_radarr()}/api/v3/system/status?apikey={settings.radarr.apikey}"
-                    radarr_version = requests.get(rv, timeout=int(settings.radarr.http_timeout), verify=False,
+                    radarr_version = requests.get(rv, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'),
                                                   headers=HEADERS).json()['version']
-                except JSONDecodeError:
+                except (RequestException, JSONDecodeError, KeyError):
                     logging.debug('BAZARR cannot get Radarr version')
                     radarr_version = 'unknown'
             except Exception:
diff --git a/bazarr/radarr/notify.py b/bazarr/radarr/notify.py
index 3c74e1d5b8..35a6194977 100644
--- a/bazarr/radarr/notify.py
+++ b/bazarr/radarr/notify.py
@@ -3,7 +3,7 @@
 import logging
 import requests
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from radarr.info import url_api_radarr
 from constants import HEADERS
 
@@ -15,6 +15,6 @@ def notify_radarr(radarr_id):
             'name': 'RescanMovie',
             'movieId': int(radarr_id)
         }
-        requests.post(url, json=data, timeout=int(settings.radarr.http_timeout), verify=False, headers=HEADERS)
+        requests.post(url, json=data, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'), headers=HEADERS)
     except Exception:
         logging.exception('BAZARR cannot notify Radarr')
diff --git a/bazarr/radarr/rootfolder.py b/bazarr/radarr/rootfolder.py
index 1320cff8e3..24de040f61 100644
--- a/bazarr/radarr/rootfolder.py
+++ b/bazarr/radarr/rootfolder.py
@@ -4,7 +4,7 @@
 import requests
 import logging
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from utilities.path_mappings import path_mappings
 from app.database import TableMoviesRootfolder, TableMovies, database, delete, update, insert, select
 from radarr.info import url_api_radarr
@@ -19,7 +19,7 @@ def get_radarr_rootfolder():
     url_radarr_api_rootfolder = f"{url_api_radarr()}rootfolder?apikey={apikey_radarr}"
 
     try:
-        rootfolder = requests.get(url_radarr_api_rootfolder, timeout=int(settings.radarr.http_timeout), verify=False, headers=HEADERS)
+        rootfolder = requests.get(url_radarr_api_rootfolder, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'), headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get rootfolder from Radarr. Connection Error.")
         return []
diff --git a/bazarr/radarr/sync/movies.py b/bazarr/radarr/sync/movies.py
index 3e9ae52373..f23c649c77 100644
--- a/bazarr/radarr/sync/movies.py
+++ b/bazarr/radarr/sync/movies.py
@@ -85,9 +85,10 @@ def add_movie(added_movie):
         event_stream(type='movie', action='update', payload=int(added_movie['radarrId']))
 
 
-def update_movies(job_id=None):
+def update_movies(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Syncing movies with Radarr", is_progress=True)
+        jobs_queue.add_job_from_function("Syncing movies with Radarr", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     check_radarr_rootfolder()
diff --git a/bazarr/radarr/sync/utils.py b/bazarr/radarr/sync/utils.py
index d0d13c2531..eb21b47151 100644
--- a/bazarr/radarr/sync/utils.py
+++ b/bazarr/radarr/sync/utils.py
@@ -3,7 +3,7 @@
 import requests
 import logging
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from radarr.info import get_radarr_info, url_api_radarr
 from constants import HEADERS
 
@@ -16,7 +16,7 @@ def get_profile_list():
                              f"apikey={apikey_radarr}")
 
     try:
-        profiles_json = requests.get(url_radarr_api_movies, timeout=int(settings.radarr.http_timeout), verify=False,
+        profiles_json = requests.get(url_radarr_api_movies, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'),
                                      headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get profiles from Radarr. Connection Error.")
@@ -46,7 +46,7 @@ def get_tags():
     url_radarr_api_series = f"{url_api_radarr()}tag?apikey={apikey_radarr}"
 
     try:
-        tagsDict = requests.get(url_radarr_api_series, timeout=int(settings.radarr.http_timeout), verify=False, headers=HEADERS)
+        tagsDict = requests.get(url_radarr_api_series, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'), headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get tags from Radarr. Connection Error.")
         return []
@@ -70,7 +70,7 @@ def get_movies_from_radarr_api(apikey_radarr, radarr_id=None):
     url_radarr_api_movies = f'{url_api_radarr()}movie{f"/{radarr_id}" if radarr_id else ""}?apikey={apikey_radarr}'
 
     try:
-        r = requests.get(url_radarr_api_movies, timeout=int(settings.radarr.http_timeout), verify=False, headers=HEADERS)
+        r = requests.get(url_radarr_api_movies, timeout=int(settings.radarr.http_timeout), verify=get_ssl_verify('radarr'), headers=HEADERS)
         if r.status_code == 404:
             return
         r.raise_for_status()
@@ -100,7 +100,7 @@ def get_history_from_radarr_api(apikey_radarr, movie_id):
     url_radarr_api_history = f"{url_api_radarr()}history?eventType=1&movieIds={movie_id}&apikey={apikey_radarr}"
 
     try:
-        r = requests.get(url_radarr_api_history, timeout=int(settings.sonarr.http_timeout), verify=False,
+        r = requests.get(url_radarr_api_history, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('radarr'),
                          headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
diff --git a/bazarr/sonarr/filesystem.py b/bazarr/sonarr/filesystem.py
index 58790c7009..4d9f4c4c53 100644
--- a/bazarr/sonarr/filesystem.py
+++ b/bazarr/sonarr/filesystem.py
@@ -3,7 +3,7 @@
 import requests
 import logging
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from sonarr.info import url_api_sonarr
 from constants import HEADERS
 
@@ -14,7 +14,7 @@ def browse_sonarr_filesystem(path='#'):
     url_sonarr_api_filesystem = (f"{url_api_sonarr()}filesystem?path={path}&allowFoldersWithoutTrailingSlashes=true&"
                                  f"includeFiles=false&apikey={settings.sonarr.apikey}")
     try:
-        r = requests.get(url_sonarr_api_filesystem, timeout=int(settings.sonarr.http_timeout), verify=False,
+        r = requests.get(url_sonarr_api_filesystem, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'),
                          headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
diff --git a/bazarr/sonarr/history.py b/bazarr/sonarr/history.py
index c3f285aabb..fc1e513a84 100644
--- a/bazarr/sonarr/history.py
+++ b/bazarr/sonarr/history.py
@@ -2,6 +2,8 @@
 
 from datetime import datetime
 
+from subliminal_patch.score import MAX_SCORES
+
 from app.database import TableHistory, database, insert
 from app.event_handler import event_stream
 
@@ -30,6 +32,7 @@ def history_log(action, sonarr_series_id, sonarr_episode_id, result, fake_provid
             language=language,
             provider=provider,
             score=score,
+            score_out_of=MAX_SCORES['episode'] if score else None,
             subs_id=subs_id,
             subtitles_path=subtitles_path,
             matched=str(matched) if matched else None,
diff --git a/bazarr/sonarr/info.py b/bazarr/sonarr/info.py
index 6680789855..31508195ec 100644
--- a/bazarr/sonarr/info.py
+++ b/bazarr/sonarr/info.py
@@ -5,11 +5,11 @@
 import datetime
 import semver
 
-from requests.exceptions import JSONDecodeError
+from requests.exceptions import JSONDecodeError, RequestException
 
 from dogpile.cache import make_region
 
-from app.config import settings, empty_values
+from app.config import settings, empty_values, get_ssl_verify
 from constants import HEADERS
 
 region = make_region().configure('dogpile.cache.memory')
@@ -31,7 +31,7 @@ def version():
         if settings.general.use_sonarr:
             try:
                 sv = f"{url_sonarr()}/api/system/status?apikey={settings.sonarr.apikey}"
-                sonarr_json = requests.get(sv, timeout=int(settings.sonarr.http_timeout), verify=False,
+                sonarr_json = requests.get(sv, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'),
                                            headers=HEADERS).json()
                 if 'version' in sonarr_json:
                     sonarr_version = sonarr_json['version']
@@ -40,9 +40,9 @@ def version():
             except JSONDecodeError:
                 try:
                     sv = f"{url_sonarr()}/api/v3/system/status?apikey={settings.sonarr.apikey}"
-                    sonarr_version = requests.get(sv, timeout=int(settings.sonarr.http_timeout), verify=False,
+                    sonarr_version = requests.get(sv, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'),
                                                   headers=HEADERS).json()['version']
-                except JSONDecodeError:
+                except (RequestException, JSONDecodeError, KeyError):
                     logging.debug('BAZARR cannot get Sonarr version')
                     sonarr_version = 'unknown'
             except Exception:
diff --git a/bazarr/sonarr/notify.py b/bazarr/sonarr/notify.py
index ee6207844e..ca0e8f56c9 100644
--- a/bazarr/sonarr/notify.py
+++ b/bazarr/sonarr/notify.py
@@ -3,7 +3,7 @@
 import logging
 import requests
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from sonarr.info import url_api_sonarr
 from constants import HEADERS
 
@@ -15,6 +15,6 @@ def notify_sonarr(sonarr_series_id):
             'name': 'RescanSeries',
             'seriesId': int(sonarr_series_id)
         }
-        requests.post(url, json=data, timeout=int(settings.sonarr.http_timeout), verify=False, headers=HEADERS)
+        requests.post(url, json=data, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'), headers=HEADERS)
     except Exception:
         logging.exception('BAZARR cannot notify Sonarr')
diff --git a/bazarr/sonarr/rootfolder.py b/bazarr/sonarr/rootfolder.py
index 46677a1e5b..f72c607e60 100644
--- a/bazarr/sonarr/rootfolder.py
+++ b/bazarr/sonarr/rootfolder.py
@@ -4,7 +4,7 @@
 import requests
 import logging
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from app.database import TableShowsRootfolder, TableShows, database, insert, update, delete, select
 from utilities.path_mappings import path_mappings
 from sonarr.info import url_api_sonarr
@@ -19,7 +19,7 @@ def get_sonarr_rootfolder():
     url_sonarr_api_rootfolder = f"{url_api_sonarr()}rootfolder?apikey={apikey_sonarr}"
 
     try:
-        rootfolder = requests.get(url_sonarr_api_rootfolder, timeout=int(settings.sonarr.http_timeout), verify=False, headers=HEADERS)
+        rootfolder = requests.get(url_sonarr_api_rootfolder, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'), headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get rootfolder from Sonarr. Connection Error.")
         return []
diff --git a/bazarr/sonarr/sync/series.py b/bazarr/sonarr/sync/series.py
index fc9b451bef..8ff2976e2a 100644
--- a/bazarr/sonarr/sync/series.py
+++ b/bazarr/sonarr/sync/series.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 
 import logging
+import gc
 
 from sqlalchemy.exc import IntegrityError
 from datetime import datetime
@@ -41,39 +42,20 @@ def get_series_monitored_table():
     return series_dict
 
 
-def update_series(job_id=None):
+def update_series(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Syncing series with Sonarr", is_progress=True)
+        jobs_queue.add_job_from_function("Syncing series with Sonarr", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
+    # Update root folders and update their health status
     check_sonarr_rootfolder()
-    apikey_sonarr = settings.sonarr.apikey
-    if apikey_sonarr is None:
-        return
-
-    serie_default_enabled = settings.general.serie_default_enabled
-
-    if serie_default_enabled is True:
-        serie_default_profile = settings.general.serie_default_profile
-        if serie_default_profile == '':
-            serie_default_profile = None
-    else:
-        serie_default_profile = None
-
-    # Prevent trying to insert a series with a non-existing languages profileId
-    if (serie_default_profile and not database.execute(
-            select(TableLanguagesProfiles)
-            .where(TableLanguagesProfiles.profileId == serie_default_profile))
-            .first()):
-        serie_default_profile = None
-
-    audio_profiles = get_profile_list()
-    tagsDict = get_tags()
-    language_profiles = get_language_profiles()
 
     # Get shows data from Sonarr
-    series = get_series_from_sonarr_api(apikey_sonarr=apikey_sonarr)
-    if not isinstance(series, list):
+    try:
+        series = get_series_from_sonarr_api(apikey_sonarr=settings.sonarr.apikey)
+    except Exception as e:
+        logging.exception(f"BAZARR Error trying to get series from Sonarr: {e}")
         return
     else:
         # Get current shows in DB
@@ -81,19 +63,24 @@ def update_series(job_id=None):
                             database.execute(
                                 select(TableShows.sonarrSeriesId))
                             .all()]
+
         current_shows_sonarr = []
 
         series_count = len(series)
-        sync_monitored = settings.sonarr.sync_only_monitored_series
-        if sync_monitored:
+        skipped_count = 0
+
+        series_monitored = None
+        if settings.sonarr.sync_only_monitored_series:
+            # Get current series monitored status in DB
             series_monitored = get_series_monitored_table()
-            skipped_count = 0
+
         trace(f"Starting sync for {series_count} shows")
 
         jobs_queue.update_job_progress(job_id=job_id, progress_max=series_count)
         for i, show in enumerate(series, start=1):
             jobs_queue.update_job_progress(job_id=job_id, progress_value=i, progress_message=show['title'])
-            if sync_monitored:
+
+            if settings.sonarr.sync_only_monitored_series:
                 try:
                     monitored_status_db = bool_map[series_monitored[show['id']]]
                 except KeyError:
@@ -113,71 +100,32 @@ def update_series(job_id=None):
                     continue
 
             trace(f"{i}: (Processing) {show['title']}")
+
             # Add shows in Sonarr to current shows list
             current_shows_sonarr.append(show['id'])
 
-            if show['id'] in current_shows_db:
-                updated_series = seriesParser(show, action='update', tags_dict=tagsDict,
-                                              language_profiles=language_profiles,
-                                              serie_default_profile=serie_default_profile,
-                                              audio_profiles=audio_profiles)
-
-                if not database.execute(
-                        select(TableShows)
-                        .filter_by(**updated_series))\
-                        .first():
-                    try:
-                        trace(f"Updating {show['title']}")
-                        updated_series['updated_at_timestamp'] = datetime.now()
-                        database.execute(
-                            update(TableShows)
-                            .values(updated_series)
-                            .where(TableShows.sonarrSeriesId == show['id']))
-                    except IntegrityError as e:
-                        logging.error(f"BAZARR cannot update series {updated_series['path']} because of {e}")
-                        continue
-
-                event_stream(type='series', payload=show['id'])
-            else:
-                added_series = seriesParser(show, action='insert', tags_dict=tagsDict,
-                                            language_profiles=language_profiles,
-                                            serie_default_profile=serie_default_profile,
-                                            audio_profiles=audio_profiles)
-
-                try:
-                    trace(f"Inserting {show['title']}")
-                    added_series['created_at_timestamp'] = datetime.now()
-                    database.execute(
-                        insert(TableShows)
-                        .values(added_series))
-                except IntegrityError as e:
-                    logging.error(f"BAZARR cannot insert series {added_series['path']} because of {e}")
-                    continue
-                else:
-                    list_missing_subtitles(no=show['id'])
-
-                    event_stream(type='series', action='update', payload=show['id'])
+            # Update series in DB
+            update_one_series(show['id'], action='updated')
 
+            # Update episodes in DB
             sync_episodes(series_id=show['id'])
 
-        # Remove old series from DB
+        # Calculate series to remove from DB
         removed_series = list(set(current_shows_db) - set(current_shows_sonarr))
 
         for series in removed_series:
-            # try to avoid unnecessary database calls
-            if settings.general.debug:
-                series_title = database.execute(select(TableShows.title).where(TableShows.sonarrSeriesId == series)).first()[0]
-                trace(f"Deleting {series_title}")
-            database.execute(
-                delete(TableShows)
-                .where(TableShows.sonarrSeriesId == series))
-            event_stream(type='series', action='delete', payload=series)
-
-        if sync_monitored:
-            trace(f"skipped {skipped_count} unmonitored series out of {i}")
+            # Remove series from DB
+            update_one_series(series, action='deleted')
+
+        if settings.sonarr.sync_only_monitored_series:
+            trace(f"skipped {skipped_count} unmonitored series out of {series_count}")
+
         logging.debug('BAZARR All series synced from Sonarr into database.')
+
     jobs_queue.update_job_name(job_id=job_id, new_job_name="Synced series with Sonarr")
 
+    gc.collect()
+
 
 def update_one_series(series_id, action, is_signalr=False):
     logging.debug(f'BAZARR syncing this specific series from Sonarr: {series_id}')
@@ -197,9 +145,7 @@ def update_one_series(series_id, action, is_signalr=False):
         event_stream(type='series', action='delete', payload=int(series_id))
         return
 
-    serie_default_enabled = settings.general.serie_default_enabled
-
-    if serie_default_enabled is True:
+    if settings.general.serie_default_enabled is True:
         serie_default_profile = settings.general.serie_default_profile
         if serie_default_profile == '':
             serie_default_profile = None
@@ -209,58 +155,56 @@ def update_one_series(series_id, action, is_signalr=False):
     audio_profiles = get_profile_list()
     tagsDict = get_tags()
     language_profiles = get_language_profiles()
+
     try:
         # Get series data from sonarr api
-        series = None
-
         series_data = get_series_from_sonarr_api(apikey_sonarr=settings.sonarr.apikey, sonarr_series_id=int(series_id))
-
+    except Exception:
+        logging.exception(f'BAZARR cannot get series with ID {series_id} from Sonarr API.')
+        return
+    else:
         if not series_data:
             return
         else:
             if action == 'updated' and existing_series:
+                # Update existing series in DB
                 series = seriesParser(series_data[0], action='update', tags_dict=tagsDict,
                                       language_profiles=language_profiles,
                                       serie_default_profile=serie_default_profile,
                                       audio_profiles=audio_profiles)
+                try:
+                    series['updated_at_timestamp'] = datetime.now()
+                    database.execute(
+                        update(TableShows)
+                        .values(series)
+                        .where(TableShows.sonarrSeriesId == series['sonarrSeriesId']))
+                except IntegrityError as e:
+                    logging.error(f"BAZARR cannot update series {series['path']} because of {e}")
+                else:
+                    if not is_signalr:
+                        # Sonarr emit two SignalR events when episodes must be refreshed.
+                        # The one that gets there doesn't include the episodeChanged flag.
+                        # The episodes are synced only when this function is called from the
+                        # frontend sync button in the episodes' page.
+                        sync_episodes(series_id=int(series_id))
+                    event_stream(type='series', action='update', payload=int(series_id))
+                    logging.debug(
+                        f'BAZARR updated this series into the database:{path_mappings.path_replace(series["path"])}')
             elif action == 'updated' and not existing_series:
+                # Insert new series in DB
                 series = seriesParser(series_data[0], action='insert', tags_dict=tagsDict,
                                       language_profiles=language_profiles,
                                       serie_default_profile=serie_default_profile,
                                       audio_profiles=audio_profiles)
-    except Exception:
-        logging.exception('BAZARR cannot get series returned by SignalR feed from Sonarr API.')
-        return
 
-    # Update existing series in DB
-    if action == 'updated' and existing_series:
-        try:
-            series['updated_at_timestamp'] = datetime.now()
-            database.execute(
-                update(TableShows)
-                .values(series)
-                .where(TableShows.sonarrSeriesId == series['sonarrSeriesId']))
-        except IntegrityError as e:
-            logging.error(f"BAZARR cannot update series {series['path']} because of {e}")
-        else:
-            if not is_signalr:
-                # Sonarr emit two SignalR events when episodes must be refreshed.
-                # The one that gets there doesn't include the episodeChanged flag.
-                # The episodes are synced only when this function is called from the
-                # frontend sync button in the episodes' page.
-                sync_episodes(series_id=int(series_id))
-            event_stream(type='series', action='update', payload=int(series_id))
-            logging.debug(f'BAZARR updated this series into the database:{path_mappings.path_replace(series["path"])}')
-
-    # Insert new series in DB
-    elif action == 'updated' and not existing_series:
-        try:
-            series['created_at_timestamp'] = datetime.now()
-            database.execute(
-                insert(TableShows)
-                .values(series))
-        except IntegrityError as e:
-            logging.error(f"BAZARR cannot insert series {series['path']} because of {e}")
-        else:
-            event_stream(type='series', action='update', payload=int(series_id))
-            logging.debug(f'BAZARR inserted this series into the database:{path_mappings.path_replace(series["path"])}')
+                try:
+                    series['created_at_timestamp'] = datetime.now()
+                    database.execute(
+                        insert(TableShows)
+                        .values(series))
+                except IntegrityError as e:
+                    logging.error(f"BAZARR cannot insert series {series['path']} because of {e}")
+                else:
+                    event_stream(type='series', action='update', payload=int(series_id))
+                    logging.debug(
+                        f'BAZARR inserted this series into the database:{path_mappings.path_replace(series["path"])}')
diff --git a/bazarr/sonarr/sync/utils.py b/bazarr/sonarr/sync/utils.py
index 911fca6902..18301c391a 100644
--- a/bazarr/sonarr/sync/utils.py
+++ b/bazarr/sonarr/sync/utils.py
@@ -3,7 +3,7 @@
 import requests
 import logging
 
-from app.config import settings
+from app.config import settings, get_ssl_verify
 from sonarr.info import get_sonarr_info, url_api_sonarr
 from constants import HEADERS
 
@@ -22,7 +22,7 @@ def get_profile_list():
         url_sonarr_api_series = f"{url_api_sonarr()}languageprofile?apikey={apikey_sonarr}"
 
     try:
-        profiles_json = requests.get(url_sonarr_api_series, timeout=int(settings.sonarr.http_timeout), verify=False,
+        profiles_json = requests.get(url_sonarr_api_series, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'),
                                      headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get profiles from Sonarr. Connection Error.")
@@ -55,7 +55,7 @@ def get_tags():
     url_sonarr_api_series = f"{url_api_sonarr()}tag?apikey={apikey_sonarr}"
 
     try:
-        tagsDict = requests.get(url_sonarr_api_series, timeout=int(settings.sonarr.http_timeout), verify=False, headers=HEADERS)
+        tagsDict = requests.get(url_sonarr_api_series, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'), headers=HEADERS)
     except requests.exceptions.ConnectionError:
         logging.exception("BAZARR Error trying to get tags from Sonarr. Connection Error.")
         return []
@@ -73,7 +73,7 @@ def get_series_from_sonarr_api(apikey_sonarr, sonarr_series_id=None):
     url_sonarr_api_series = (f"{url_api_sonarr()}series/{sonarr_series_id if sonarr_series_id else ''}?"
                              f"apikey={apikey_sonarr}")
     try:
-        r = requests.get(url_sonarr_api_series, timeout=int(settings.sonarr.http_timeout), verify=False, headers=HEADERS)
+        r = requests.get(url_sonarr_api_series, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'), headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError as e:
         if e.response.status_code:
@@ -113,7 +113,7 @@ def get_episodes_from_sonarr_api(apikey_sonarr, series_id=None, episode_id=None)
         return
 
     try:
-        r = requests.get(url_sonarr_api_episode, timeout=int(settings.sonarr.http_timeout), verify=False, headers=HEADERS)
+        r = requests.get(url_sonarr_api_episode, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'), headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
         logging.exception("BAZARR Error trying to get episodes from Sonarr. Http error.")
@@ -146,7 +146,7 @@ def get_episodesFiles_from_sonarr_api(apikey_sonarr, series_id=None, episode_fil
         return
 
     try:
-        r = requests.get(url_sonarr_api_episodeFiles, timeout=int(settings.sonarr.http_timeout), verify=False,
+        r = requests.get(url_sonarr_api_episodeFiles, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'),
                          headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
@@ -175,7 +175,7 @@ def get_history_from_sonarr_api(apikey_sonarr, episode_id):
     url_sonarr_api_history = f"{url_api_sonarr()}history?eventType=1&episodeId={episode_id}&apikey={apikey_sonarr}"
 
     try:
-        r = requests.get(url_sonarr_api_history, timeout=int(settings.sonarr.http_timeout), verify=False,
+        r = requests.get(url_sonarr_api_history, timeout=int(settings.sonarr.http_timeout), verify=get_ssl_verify('sonarr'),
                          headers=HEADERS)
         r.raise_for_status()
     except requests.exceptions.HTTPError:
diff --git a/bazarr/subtitles/cache.py b/bazarr/subtitles/cache.py
new file mode 100644
index 0000000000..5abe50b300
--- /dev/null
+++ b/bazarr/subtitles/cache.py
@@ -0,0 +1,44 @@
+# coding=utf-8
+
+import time
+import threading
+import uuid
+
+
+_TTL_SECONDS = 3600  # 1 hour
+
+
+class _SubtitleCache:
+    def __init__(self):
+        self._cache = {}
+        self._lock = threading.Lock()
+
+    def _purge_expired(self):
+        now = time.monotonic()
+        expired = [k for k, (_, expiry) in self._cache.items() if now >= expiry]
+        for k in expired:
+            del self._cache[k]
+
+    def store(self, subtitle):
+        """Store a subtitle object and return its cache key (UUID string)."""
+        key = str(uuid.uuid4())
+        expiry = time.monotonic() + _TTL_SECONDS
+        with self._lock:
+            self._purge_expired()
+            self._cache[key] = (subtitle, expiry)
+        return key
+
+    def get(self, key):
+        """Return the subtitle object for the given key, or None if not found/expired."""
+        with self._lock:
+            entry = self._cache.get(key)
+            if entry is None:
+                return None
+            subtitle, expiry = entry
+            if time.monotonic() >= expiry:
+                del self._cache[key]
+                return None
+            return subtitle
+
+
+subtitle_cache = _SubtitleCache()
diff --git a/bazarr/subtitles/download.py b/bazarr/subtitles/download.py
index 2d44e5ae58..a323240c9e 100644
--- a/bazarr/subtitles/download.py
+++ b/bazarr/subtitles/download.py
@@ -10,9 +10,8 @@
 from subzero.language import Language
 from subliminal_patch.core import save_subtitles
 from subliminal_patch.core_persistent import download_best_subtitles
-from subliminal_patch.score import ComputeScore
 
-from app.config import settings, get_scores, get_array_from
+from app.config import settings, get_array_from
 from app.database import TableEpisodes, TableMovies, database, select, get_profiles_list
 from utilities.path_mappings import path_mappings
 from utilities.helper import get_target_folder, force_unicode
@@ -63,6 +62,21 @@ def generate_subtitles(path, languages, audio_language, sceneName, title, media_
         saved_any = False
 
         if providers:
+            if job_id:
+                from app.jobs_queue import jobs_queue as _jq
+                active_providers = [p for p in providers if p not in pool.discarded_providers]
+                _provider_count = len(active_providers)
+
+                def _on_provider(provider_name):
+                    try:
+                        idx = active_providers.index(provider_name) + 1
+                    except ValueError:
+                        idx = 0
+                    _jq.update_job_progress(job_id=job_id,
+                                            progress_message=f"Searching {provider_name} ({idx}/{_provider_count})")
+
+                pool.provider_progress_callback = _on_provider
+
             if forced_minimum_score:
                 min_score = int(forced_minimum_score) + 1
             for language in language_set:
@@ -79,8 +93,8 @@ def generate_subtitles(path, languages, audio_language, sceneName, title, media_
                                                                        pool_instance=pool,
                                                                        min_score=int(min_score),
                                                                        hearing_impaired=hi_required,
-                                                                       compute_score=ComputeScore(get_scores()),
-                                                                       use_original_format=original_format in (1, "1", "True", True))
+                                                                       use_original_format=original_format in (1, "1", "True", True),
+                                                                       use_provider_priority=settings.general.use_provider_priority)
                     except Exception as e:
                         logging.exception(f'BAZARR Error downloading Subtitles for this file {path}: {repr(e)}')
                         return None
@@ -121,6 +135,10 @@ def generate_subtitles(path, languages, audio_language, sceneName, title, media_
                         else:
                             saved_any = True
                             for subtitle in saved_subtitles:
+                                if "hash" in subtitle.matches:
+                                    # make matches set cleaner for history purpose when hash matches
+                                    subtitle.matches = {match for match in subtitle.matches
+                                                        if match in ("hash", "hearing_impaired")}
                                 processed_subtitle = process_subtitle(subtitle=subtitle, media_type=media_type,
                                                                       audio_language=audio_language,
                                                                       is_upgrade=is_upgrade, is_manual=False,
diff --git a/bazarr/subtitles/indexer/movies.py b/bazarr/subtitles/indexer/movies.py
index 8e9498653d..cbf1017be6 100644
--- a/bazarr/subtitles/indexer/movies.py
+++ b/bazarr/subtitles/indexer/movies.py
@@ -277,9 +277,10 @@ def list_missing_subtitles_movies(no=None):
     event_stream(type='badges')
 
 
-def movies_full_scan_subtitles(job_id=None, use_cache=None):
+def movies_full_scan_subtitles(job_id=None, use_cache=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Indexing all existing movies subtitles", is_progress=True)
+        jobs_queue.add_job_from_function("Indexing all existing movies subtitles", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     if use_cache is None:
diff --git a/bazarr/subtitles/indexer/series.py b/bazarr/subtitles/indexer/series.py
index 9fe20ba6a2..24ed63f34c 100644
--- a/bazarr/subtitles/indexer/series.py
+++ b/bazarr/subtitles/indexer/series.py
@@ -282,9 +282,10 @@ def list_missing_subtitles(no=None, epno=None):
     event_stream(type='badges')
 
 
-def series_full_scan_subtitles(job_id=None, use_cache=None):
+def series_full_scan_subtitles(job_id=None, use_cache=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Indexing all existing episodes subtitles", is_progress=True)
+        jobs_queue.add_job_from_function("Indexing all existing episodes subtitles", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     if use_cache is None:
diff --git a/bazarr/subtitles/manual.py b/bazarr/subtitles/manual.py
index e943abe1b1..9818291532 100644
--- a/bazarr/subtitles/manual.py
+++ b/bazarr/subtitles/manual.py
@@ -4,17 +4,15 @@
 import os
 import sys
 import logging
-import pickle
-import codecs
 import subliminal
 
 from subzero.language import Language
 from subliminal_patch.core import save_subtitles
 from subliminal_patch.core_persistent import list_all_subtitles, download_subtitles
-from subliminal_patch.score import ComputeScore
+from subliminal_patch.score import compute_score, DEFAULT_SCORES
 
 from languages.get_languages import alpha3_from_alpha2
-from app.config import get_scores, settings, get_array_from
+from app.config import settings, get_array_from
 from utilities.helper import get_target_folder, force_unicode
 from utilities.path_mappings import path_mappings
 from app.database import (database, get_profiles_list, select, TableEpisodes, TableShows, get_audio_profile_languages,
@@ -27,6 +25,7 @@
 from subtitles.indexer.movies import store_subtitles_movie
 from subtitles.processing import ProcessSubtitlesResult
 
+from bazarr.subtitles.cache import subtitle_cache
 from .pool import update_pools, _get_pool
 from .utils import get_video, _get_lang_obj, _get_scores, _set_forced_providers
 from .processing import process_subtitle
@@ -44,7 +43,6 @@ def manual_search(path, profile_id, providers, sceneName, title, media_type):
     also_forced = any([x.forced for x in language_set])
     forced_required = all([x.forced for x in language_set])
     normal = not also_forced and not forced_required and all([not x.hi for x in language_set])
-    compute_score = ComputeScore(get_scores())
     _set_forced_providers(pool=pool, also_forced=also_forced, forced_required=forced_required)
 
     if providers:
@@ -68,6 +66,7 @@ def manual_search(path, profile_id, providers, sceneName, title, media_type):
             subtitles_list = []
             minimum_score = settings.general.minimum_score
             minimum_score_movie = settings.general.minimum_score_movie
+            score_handler = DEFAULT_SCORES['episode'] if media_type == "series" else DEFAULT_SCORES['movie']
 
             for s in subtitles[video]:
                 if not normal and s.language not in language_set:
@@ -75,7 +74,9 @@ def manual_search(path, profile_id, providers, sceneName, title, media_type):
                     continue
 
                 try:
-                    matches = s.get_matches(video)
+                    matches = s.matches if hasattr(s, 'matches') and isinstance(s.matches, set) and len(s.matches) \
+                        else s.get_matches(video)
+                    matches = {match for match in matches if match in score_handler.keys()}  # cleanup unwanted criterion
                 except AttributeError:
                     continue
 
@@ -100,8 +101,10 @@ def manual_search(path, profile_id, providers, sceneName, title, media_type):
 
                 if 'hash' not in matches:
                     not_matched = scores - matches
+                    not_matched = {match for match in not_matched if match in score_handler.keys()}
                     s.score = score_without_hash
                 else:
+                    matches = s.matches = {match for match in matches if match in ("hash", "hearing_impaired")}
                     s.score = score
                     not_matched = set()
 
@@ -128,7 +131,7 @@ def manual_search(path, profile_id, providers, sceneName, title, media_type):
                          language=str(s.language.basename),
                          hearing_impaired=str(s.hearing_impaired),
                          provider=s.provider_name,
-                         subtitle=codecs.encode(pickle.dumps(s.make_picklable()), "base64").decode(),
+                         subtitle=subtitle_cache.store(s),
                          url=s.page_link,
                          original_format=s.use_original_format,
                          matches=list(matches),
@@ -156,7 +159,10 @@ def manual_download_subtitle(path, audio_language, hi, forced, subtitle, provide
     else:
         os.environ["SZ_KEEP_ENCODING"] = "True"
 
-    subtitle = pickle.loads(codecs.decode(subtitle.encode(), "base64"))
+    subtitle = subtitle_cache.get(subtitle)
+    if subtitle is None:
+        logging.error("BAZARR Subtitle not found in cache (expired or invalid ID)")
+        return 'Subtitle not found in cache. Please search again.'
     if hi == 'True':
         subtitle.language.hi = True
     else:
diff --git a/bazarr/subtitles/mass_download/movies.py b/bazarr/subtitles/mass_download/movies.py
index 5040022f88..cb367b005f 100644
--- a/bazarr/subtitles/mass_download/movies.py
+++ b/bazarr/subtitles/mass_download/movies.py
@@ -84,6 +84,7 @@ def movies_download_subtitles(no, job_id=None, job_sub_function=False):
 
     providers_list = get_providers()
 
+    downloaded_count = 0
     if providers_list:
         for language in ast.literal_eval(movie.missing_subtitles):
             if language is not None:
@@ -107,16 +108,21 @@ def movies_download_subtitles(no, job_id=None, job_sub_function=False):
                     store_subtitles_movie(movie.path, moviePath)
                     history_log_movie(1, no, result)
                     send_notifications_movie(no, result.message)
+                    downloaded_count += 1
+        outcome_msg = (f"{downloaded_count} subtitle(s) downloaded"
+                       if downloaded_count else "No subtitles found")
     else:
         logging.info("BAZARR All providers are throttled")
+        outcome_msg = "All providers throttled"
 
-    jobs_queue.update_job_progress(job_id=job_id, progress_value="max")
+    jobs_queue.update_job_progress(job_id=job_id, progress_value="max",
+                                   progress_message=outcome_msg)
     jobs_queue.update_job_name(job_id=job_id, new_job_name=f"Downloaded missing subtitles for {movie.title} ({movie.year})")
 
 
 def movie_download_specific_subtitles(radarr_id, language, hi, forced, job_id=None):
     if not job_id:
-        return jobs_queue.add_job_from_function("Searching subtitles", progress_max=1, is_progress=False)
+        return jobs_queue.add_job_from_function("Searching subtitles", is_progress=True)
 
     movieInfo = database.execute(
         select(
@@ -147,6 +153,7 @@ def movie_download_specific_subtitles(radarr_id, language, hi, forced, job_id=No
         language_str = language
 
     jobs_queue.update_job_name(job_id=job_id, new_job_name=f"Searching {language_str.upper()} for {title}")
+    jobs_queue.update_job_progress(job_id=job_id, progress_message="Preparing search...")
 
     audio_language_list = get_audio_profile_languages(movieInfo.audio_language)
     if len(audio_language_list) > 0:
@@ -165,7 +172,11 @@ def movie_download_specific_subtitles(radarr_id, language, hi, forced, job_id=No
             history_log_movie(1, radarr_id, result)
             send_notifications_movie(radarr_id, result.message)
             store_subtitles_movie(result.path, moviePath)
+            jobs_queue.update_job_progress(job_id=job_id, progress_value='max',
+                                           progress_message="Subtitle downloaded")
         else:
+            jobs_queue.update_job_progress(job_id=job_id, progress_value='max',
+                                           progress_message="No subtitles found")
             event_stream(type='movie', payload=radarr_id)
             return '', 204
     except OSError:
diff --git a/bazarr/subtitles/mass_download/series.py b/bazarr/subtitles/mass_download/series.py
index 8e6679f9c1..892035810f 100644
--- a/bazarr/subtitles/mass_download/series.py
+++ b/bazarr/subtitles/mass_download/series.py
@@ -50,6 +50,7 @@ def series_download_subtitles(no, job_id=None, job_sub_function=False):
         .join(TableShows)
         .where(reduce(operator.and_, conditions))) \
         .all()
+    throttled = False
     if not episodes_details:
         logging.debug(f"BAZARR no episode for that sonarrSeriesId have been found in database or they have all been "
                       f"ignored because of monitored status, series type or series tags: {no}")
@@ -70,8 +71,12 @@ def series_download_subtitles(no, job_id=None, job_sub_function=False):
             else:
                 jobs_queue.update_job_progress(job_id=job_id, progress_value=count_episodes_details)
                 logging.info("BAZARR All providers are throttled")
+                throttled = True
                 break
 
+    outcome_msg = ("All providers throttled" if throttled
+                   else "Search completed")
+    jobs_queue.update_job_progress(job_id=job_id, progress_message=outcome_msg)
     jobs_queue.update_job_name(job_id=job_id, new_job_name=f"Downloaded missing subtitles for {series_row.title}")
 
 
@@ -126,6 +131,7 @@ def episode_download_subtitles(no, job_id=None, job_sub_function=False, provider
     if not providers_list:
         providers_list = get_providers()
 
+    downloaded_count = 0
     if providers_list:
         audio_language_list = get_audio_profile_languages(episode.audio_language)
         if len(audio_language_list) > 0:
@@ -162,17 +168,22 @@ def episode_download_subtitles(no, job_id=None, job_sub_function=False, provider
                     store_subtitles(episode.path, path_mappings.path_replace(episode.path))
                     history_log(1, episode.sonarrSeriesId, episode.sonarrEpisodeId, result)
                     send_notifications(episode.sonarrSeriesId, episode.sonarrEpisodeId, result.message)
+                    downloaded_count += 1
+        outcome_msg = (f"{downloaded_count} subtitle(s) downloaded"
+                       if downloaded_count else "No subtitles found")
     else:
         logging.info("BAZARR All providers are throttled")
+        outcome_msg = "All providers throttled"
 
     if not job_sub_function and job_id:
-        jobs_queue.update_job_progress(job_id=job_id, progress_value='max')
+        jobs_queue.update_job_progress(job_id=job_id, progress_value='max',
+                                       progress_message=outcome_msg)
         jobs_queue.update_job_name(job_id=job_id, new_job_name=f"Downloaded missing subtitles for {episode.title}")
 
 
 def episode_download_specific_subtitles(sonarr_series_id, sonarr_episode_id, language, hi, forced, job_id=None):
     if not job_id:
-        return jobs_queue.add_job_from_function("Searching subtitles", progress_max=1, is_progress=False)
+        return jobs_queue.add_job_from_function("Searching subtitles", is_progress=True)
 
     episodeInfo = database.execute(
         select(TableEpisodes.path,
@@ -210,6 +221,7 @@ def episode_download_specific_subtitles(sonarr_series_id, sonarr_episode_id, lan
 
     jobs_queue.update_job_name(job_id=job_id,
                                new_job_name=f"Searching {language_str.upper()} for {episode_long_title}")
+    jobs_queue.update_job_progress(job_id=job_id, progress_message="Preparing search...")
 
     audio_language_list = get_audio_profile_languages(episodeInfo.audio_language)
     if len(audio_language_list) > 0:
@@ -228,7 +240,11 @@ def episode_download_specific_subtitles(sonarr_series_id, sonarr_episode_id, lan
             history_log(1, sonarr_series_id, sonarr_episode_id, result)
             send_notifications(sonarr_series_id, sonarr_episode_id, result.message)
             store_subtitles(result.path, episodePath)
+            jobs_queue.update_job_progress(job_id=job_id, progress_value='max',
+                                           progress_message="Subtitle downloaded")
         else:
+            jobs_queue.update_job_progress(job_id=job_id, progress_value='max',
+                                           progress_message="No subtitles found")
             event_stream(type='episode', payload=sonarr_episode_id)
             return '', 204
     except OSError:
diff --git a/bazarr/subtitles/mass_operations.py b/bazarr/subtitles/mass_operations.py
new file mode 100644
index 0000000000..d5dda58d85
--- /dev/null
+++ b/bazarr/subtitles/mass_operations.py
@@ -0,0 +1,517 @@
+# coding=utf-8
+
+import ast
+import logging
+import os
+
+from app.config import settings
+from app.database import TableEpisodes, TableMovies, TableHistory, TableHistoryMovie, database, select
+from app.jobs_queue import jobs_queue
+from subtitles.sync import sync_subtitles
+from subtitles.tools.mods import subtitles_apply_mods
+from subtitles.indexer.series import series_scan_subtitles
+from subtitles.indexer.movies import movies_scan_subtitles
+from subtitles.mass_download.series import series_download_subtitles
+from subtitles.mass_download.movies import movies_download_subtitles
+from subtitles.upgrade import upgrade_episodes_subtitles, upgrade_movies_subtitles
+from utilities.path_mappings import path_mappings
+from utilities.video_analyzer import languages_from_colon_seperated_string
+from sqlalchemy import or_
+
+logger = logging.getLogger(__name__)
+
+VALID_ACTIONS = {
+    'sync', 'translate', 'OCR_fixes', 'common', 'remove_HI',
+    'remove_tags', 'fix_uppercase', 'reverse_rtl', 'emoji',
+    'scan-disk', 'search-missing', 'upgrade',
+}
+
+MEDIA_ACTIONS = {'scan-disk', 'search-missing', 'upgrade'}
+
+MOD_ACTIONS = {'OCR_fixes', 'common', 'remove_HI', 'remove_tags', 'fix_uppercase', 'reverse_rtl', 'emoji'}
+
+
+def _parse_subtitles_column(subtitles_raw):
+    """Parse the subtitles TEXT column into a list of (lang_string, path) tuples."""
+    if not subtitles_raw:
+        return []
+    try:
+        parsed = ast.literal_eval(subtitles_raw)
+        return [(entry[0], entry[1]) for entry in parsed if len(entry) >= 2 and entry[1]]
+    except (ValueError, SyntaxError):
+        return []
+
+
+def _get_synced_episode_paths():
+    """Get set of subtitle paths that have been synced (action=5) from episode history."""
+    results = database.execute(
+        select(TableHistory.subtitles_path)
+        .where(TableHistory.action == 5)
+    ).all()
+    return {r.subtitles_path for r in results if r.subtitles_path}
+
+
+def _get_synced_movie_paths():
+    """Get set of subtitle paths that have been synced (action=5) from movie history."""
+    results = database.execute(
+        select(TableHistoryMovie.subtitles_path)
+        .where(TableHistoryMovie.action == 5)
+    ).all()
+    return {r.subtitles_path for r in results if r.subtitles_path}
+
+
+def _collect_subtitle_items(items, action, options):
+    """Collect subtitle items from the database for processing.
+
+    Args:
+        items: List of dicts with 'type' and IDs, or None to collect entire library.
+        action: The action to perform (sync, translate, mod, etc.).
+        options: Dict with force_resync, max_offset_seconds, gss, no_fix_framerate.
+
+    Returns:
+        Tuple of (items_list, skipped_count).
+    """
+    options = options or {}
+    force_resync = options.get('force_resync', False)
+    max_offset = str(options.get('max_offset_seconds', settings.subsync.max_offset_seconds))
+    gss = options.get('gss', settings.subsync.gss)
+    no_fix_framerate = options.get('no_fix_framerate', settings.subsync.no_fix_framerate)
+
+    # Parse item types
+    series_ids = []
+    episode_ids = []
+    movie_ids = []
+
+    if items is None:
+        # Entire library mode
+        pass
+    else:
+        for item in items:
+            item_type = item.get('type')
+            if item_type == 'series':
+                sid = item.get('sonarrSeriesId')
+                if sid is not None:
+                    series_ids.append(sid)
+            elif item_type == 'episode':
+                eid = item.get('sonarrEpisodeId')
+                if eid is not None:
+                    episode_ids.append(eid)
+            elif item_type == 'movie':
+                rid = item.get('radarrId')
+                if rid is not None:
+                    movie_ids.append(rid)
+
+    all_items = []
+    total_skipped = 0
+    target_lang = options.get('to_lang') if action == 'translate' else None
+    source_lang = options.get('from_lang') if action == 'translate' else None
+
+    # Collect episode subtitles
+    should_collect_episodes = (items is None and settings.general.use_sonarr) or series_ids or episode_ids
+    if should_collect_episodes:
+        ep_items, ep_skipped = _collect_episodes(
+            series_ids=series_ids or None,
+            episode_ids=episode_ids or None,
+            action=action,
+            force_resync=force_resync,
+            max_offset=max_offset,
+            gss=gss,
+            no_fix_framerate=no_fix_framerate,
+            target_lang=target_lang,
+            source_lang=source_lang,
+        )
+        all_items.extend(ep_items)
+        total_skipped += ep_skipped
+
+    # Collect movie subtitles
+    should_collect_movies = (items is None and settings.general.use_radarr) or movie_ids
+    if should_collect_movies:
+        mov_items, mov_skipped = _collect_movies(
+            movie_ids=movie_ids or None,
+            action=action,
+            force_resync=force_resync,
+            max_offset=max_offset,
+            gss=gss,
+            no_fix_framerate=no_fix_framerate,
+            target_lang=target_lang,
+            source_lang=source_lang,
+        )
+        all_items.extend(mov_items)
+        total_skipped += mov_skipped
+
+    return all_items, total_skipped
+
+
+def _collect_episodes(series_ids=None, episode_ids=None, action='sync',
+                      force_resync=False, max_offset='60', gss=True, no_fix_framerate=True,
+                      target_lang=None, source_lang=None):
+    """Collect episode subtitles from the database."""
+    query = select(
+        TableEpisodes.sonarrEpisodeId,
+        TableEpisodes.sonarrSeriesId,
+        TableEpisodes.path,
+        TableEpisodes.subtitles,
+    )
+
+    filters = []
+    if episode_ids:
+        filters.append(TableEpisodes.sonarrEpisodeId.in_(episode_ids))
+    if series_ids:
+        filters.append(TableEpisodes.sonarrSeriesId.in_(series_ids))
+    if filters:
+        query = query.where(or_(*filters))
+
+    episodes = database.execute(query).all()
+
+    synced_paths = set()
+    if action == 'sync' and not force_resync:
+        synced_paths = _get_synced_episode_paths()
+
+    items = []
+    skipped = 0
+
+    for ep in episodes:
+        subtitles = _parse_subtitles_column(ep.subtitles)
+        video_path = path_mappings.path_replace(ep.path)
+
+        # For translate: check if target language already exists
+        if action == 'translate' and target_lang:
+            existing_langs = {lang_str.split(':')[0] for lang_str, _ in subtitles}
+            if target_lang in existing_langs:
+                skipped += 1
+                continue
+
+        for lang_string, sub_path in subtitles:
+            lang_info = languages_from_colon_seperated_string(lang_string)
+
+            # Forced subs can't be synced or translated, but mods are fine
+            if lang_info['forced'] and action in ('sync', 'translate'):
+                skipped += 1
+                continue
+
+            # For translate: only queue subtitles matching the requested source language
+            sub_lang = lang_string.split(':')[0]
+            if action == 'translate' and source_lang and sub_lang != source_lang:
+                skipped += 1
+                continue
+
+            mapped_sub_path = path_mappings.path_replace(sub_path)
+            if not os.path.isfile(mapped_sub_path):
+                skipped += 1
+                continue
+
+            if action == 'sync' and not force_resync:
+                reversed_path = path_mappings.path_replace_reverse(mapped_sub_path)
+                if reversed_path in synced_paths:
+                    skipped += 1
+                    continue
+
+            items.append({
+                'video_path': video_path,
+                'srt_path': mapped_sub_path,
+                'srt_lang': sub_lang,
+                'forced': lang_info['forced'],
+                'hi': lang_info['hi'],
+                'sonarr_series_id': ep.sonarrSeriesId,
+                'sonarr_episode_id': ep.sonarrEpisodeId,
+                'radarr_id': None,
+                'max_offset_seconds': max_offset,
+                'no_fix_framerate': no_fix_framerate,
+                'gss': gss,
+            })
+
+    return items, skipped
+
+
+def _collect_movies(movie_ids=None, action='sync', force_resync=False,
+                    max_offset='60', gss=True, no_fix_framerate=True,
+                    target_lang=None, source_lang=None):
+    """Collect movie subtitles from the database."""
+    query = select(
+        TableMovies.radarrId,
+        TableMovies.path,
+        TableMovies.subtitles,
+    )
+
+    if movie_ids:
+        query = query.where(TableMovies.radarrId.in_(movie_ids))
+
+    movies = database.execute(query).all()
+
+    synced_paths = set()
+    if action == 'sync' and not force_resync:
+        synced_paths = _get_synced_movie_paths()
+
+    items = []
+    skipped = 0
+
+    for movie in movies:
+        subtitles = _parse_subtitles_column(movie.subtitles)
+        video_path = path_mappings.path_replace_movie(movie.path)
+
+        # For translate: check if target language already exists
+        if action == 'translate' and target_lang:
+            existing_langs = {lang_str.split(':')[0] for lang_str, _ in subtitles}
+            if target_lang in existing_langs:
+                skipped += 1
+                continue
+
+        for lang_string, sub_path in subtitles:
+            lang_info = languages_from_colon_seperated_string(lang_string)
+
+            # Forced subs can't be synced or translated, but mods are fine
+            if lang_info['forced'] and action in ('sync', 'translate'):
+                skipped += 1
+                continue
+
+            # For translate: only queue subtitles matching the requested source language
+            sub_lang = lang_string.split(':')[0]
+            if action == 'translate' and source_lang and sub_lang != source_lang:
+                skipped += 1
+                continue
+
+            mapped_sub_path = path_mappings.path_replace_movie(sub_path)
+            if not os.path.isfile(mapped_sub_path):
+                skipped += 1
+                continue
+
+            if action == 'sync' and not force_resync:
+                reversed_path = path_mappings.path_replace_reverse_movie(mapped_sub_path)
+                if reversed_path in synced_paths:
+                    skipped += 1
+                    continue
+
+            items.append({
+                'video_path': video_path,
+                'srt_path': mapped_sub_path,
+                'srt_lang': sub_lang,
+                'forced': lang_info['forced'],
+                'hi': lang_info['hi'],
+                'sonarr_series_id': None,
+                'sonarr_episode_id': None,
+                'radarr_id': movie.radarrId,
+                'max_offset_seconds': max_offset,
+                'no_fix_framerate': no_fix_framerate,
+                'gss': gss,
+            })
+
+    return items, skipped
+
+
+def _process_subtitle_item(item, action, options, job_id):
+    """Process a single subtitle item based on the action.
+
+    Returns True on success, False on failure.
+    """
+    if action == 'sync':
+        return sync_subtitles(
+            video_path=item['video_path'],
+            srt_path=item['srt_path'],
+            srt_lang=item['srt_lang'],
+            forced=item['forced'],
+            hi=item['hi'],
+            percent_score=0,
+            sonarr_series_id=item['sonarr_series_id'],
+            sonarr_episode_id=item['sonarr_episode_id'],
+            radarr_id=item['radarr_id'],
+            max_offset_seconds=item['max_offset_seconds'],
+            no_fix_framerate=item['no_fix_framerate'],
+            gss=item['gss'],
+            force_sync=True,
+            job_id=job_id,
+        )
+    elif action == 'translate':
+        from subtitles.tools.translate.main import translate_subtitles_file
+        media_type = 'series' if item['sonarr_series_id'] else 'movies'
+        # Don't pass the batch job_id to translate. translate_subtitles_file
+        # has its own job/progress lifecycle that would hijack the batch job.
+        # Calling without job_id makes it queue as its own separate job.
+        translate_subtitles_file(
+            video_path=item['video_path'],
+            source_srt_file=item['srt_path'],
+            from_lang=options.get('from_lang', item['srt_lang']),
+            to_lang=options.get('to_lang', 'en'),
+            forced=item['forced'],
+            hi=item['hi'],
+            media_type=media_type,
+            sonarr_series_id=item['sonarr_series_id'],
+            sonarr_episode_id=item['sonarr_episode_id'],
+            radarr_id=item['radarr_id'],
+        )
+        return True
+    elif action in MOD_ACTIONS:
+        subtitles_apply_mods(
+            item['srt_lang'],
+            item['srt_path'],
+            [action],
+            item['video_path'],
+        )
+        return True
+    return False
+
+
+def _process_media_action(items, action, job_id):
+    """Handle scan-disk, search-missing, and upgrade actions for series/movies.
+
+    Args:
+        items: List of dicts with 'type' and IDs.
+        action: 'scan-disk', 'search-missing', or 'upgrade'.
+        job_id: Job ID for progress tracking.
+
+    Returns:
+        Dict with queued, skipped, errors.
+    """
+    queued = 0
+    skipped = 0
+    errors = []
+
+    if action == 'upgrade':
+        sonarr_series_ids = [i.get('sonarrSeriesId') for i in items
+                             if i.get('type') in ('series', 'episode') and i.get('sonarrSeriesId')]
+        radarr_ids = [i.get('radarrId') for i in items
+                      if i.get('type') == 'movie' and i.get('radarrId')]
+        try:
+            if sonarr_series_ids:
+                upgrade_episodes_subtitles(job_id=job_id, sonarr_series_ids=sonarr_series_ids)
+            if radarr_ids:
+                upgrade_movies_subtitles(job_id=job_id, radarr_ids=radarr_ids)
+            queued = len(sonarr_series_ids) + len(radarr_ids)
+        except Exception as e:
+            logger.error(f'Error during upgrade: {e}')
+            errors.append(str(e))
+        return {'queued': queued, 'skipped': 0, 'errors': errors}
+
+    jobs_queue.update_job_progress(job_id=job_id, progress_max=len(items))
+
+    for i, item in enumerate(items, start=1):
+        item_type = item.get('type')
+        jobs_queue.update_job_progress(
+            job_id=job_id,
+            progress_value=i,
+            progress_message=f"Processing {item_type} ({i}/{len(items)})"
+        )
+
+        try:
+            if action == 'scan-disk':
+                if item_type in ('series', 'episode'):
+                    series_id = item.get('sonarrSeriesId')
+                    if not series_id:
+                        skipped += 1
+                        continue
+                    series_scan_subtitles(series_id)
+                elif item_type == 'movie':
+                    radarr_id = item.get('radarrId')
+                    if not radarr_id:
+                        skipped += 1
+                        continue
+                    movies_scan_subtitles(radarr_id)
+                else:
+                    skipped += 1
+                    continue
+            elif action == 'search-missing':
+                if item_type in ('series', 'episode'):
+                    series_id = item.get('sonarrSeriesId')
+                    if not series_id:
+                        skipped += 1
+                        continue
+                    series_download_subtitles(series_id)
+                elif item_type == 'movie':
+                    radarr_id = item.get('radarrId')
+                    if not radarr_id:
+                        skipped += 1
+                        continue
+                    movies_download_subtitles(radarr_id)
+                else:
+                    skipped += 1
+                    continue
+            queued += 1
+        except Exception as e:
+            logger.error(f'Error processing {action} for {item}: {e}')
+            errors.append(str(e))
+
+    return {'queued': queued, 'skipped': skipped, 'errors': errors}
+
+
+def mass_batch_operation(items=None, action='sync', options=None, job_id=None):
+    """Main entry point for all batch operations on subtitles.
+
+    Handles sync, translate, subtitle mods, scan-disk, and search-missing
+    in a unified interface. Runs as a single job with progress tracking,
+    processing items sequentially.
+
+    Args:
+        items: List of dicts with 'type' and IDs. If None, processes entire library.
+        action: One of VALID_ACTIONS.
+        options: Dict with action-specific options (force_resync, from_lang, to_lang, etc.).
+        job_id: Job ID for scheduled task tracking.
+
+    Returns:
+        Dict with queued, skipped, errors. Or None if scheduling a job.
+    """
+    if action not in VALID_ACTIONS:
+        return {'queued': 0, 'skipped': 0, 'errors': [f'Invalid action: {action}']}
+
+    options = options or {}
+
+    # When called without a job_id (e.g. from the scheduler), create one so that
+    # downstream functions like sync_subtitles run inline instead of re-queuing
+    # themselves as individual jobs.
+    if not job_id:
+        jobs_queue.add_job_from_function(
+            f"Mass {action.replace('_', ' ').replace('-', ' ').title()} "
+            f"({'Library' if items is None else f'{len(items)} items'})",
+            is_progress=True,
+        )
+        return
+
+    # Media actions (scan-disk, search-missing) work on media items directly
+    if action in MEDIA_ACTIONS:
+        if not items:
+            return {'queued': 0, 'skipped': 0, 'errors': []}
+        return _process_media_action(items, action, job_id)
+
+    # Subtitle actions: collect subtitle files, then process them
+    if items is not None and len(items) == 0:
+        jobs_queue.update_job_progress(job_id=job_id, progress_max=0)
+        return {'queued': 0, 'skipped': 0, 'errors': []}
+
+    all_items, total_skipped = _collect_subtitle_items(items, action, options)
+
+    # Process items sequentially within this single job
+    total_count = len(all_items)
+    jobs_queue.update_job_progress(job_id=job_id, progress_max=total_count)
+
+    if total_count == 0:
+        jobs_queue.update_job_progress(job_id=job_id, progress_value='max')
+
+    processed = 0
+    failed = 0
+    all_errors = []
+
+    for i, item in enumerate(all_items, start=1):
+        jobs_queue.update_job_progress(
+            job_id=job_id,
+            progress_value=i,
+            progress_message=f"{action}: {os.path.basename(item['srt_path'])} ({i}/{total_count})"
+        )
+
+        try:
+            result = _process_subtitle_item(item, action, options, job_id)
+            if result:
+                processed += 1
+            else:
+                failed += 1
+        except Exception as e:
+            logger.error(f'Error during {action} on {item["srt_path"]}: {e}')
+            all_errors.append(str(e))
+            failed += 1
+
+    jobs_queue.update_job_name(
+        job_id=job_id,
+        new_job_name=f"Mass {action} complete: {processed} done, {total_skipped} skipped"
+    )
+    logger.info(
+        f'BAZARR mass {action} complete: {processed} processed, {failed} failed, '
+        f'{total_skipped} skipped, {len(all_errors)} errors'
+    )
+    return {'queued': processed, 'skipped': total_skipped + failed, 'errors': all_errors}
diff --git a/bazarr/subtitles/sync.py b/bazarr/subtitles/sync.py
index ca098d6dbf..ef14039430 100644
--- a/bazarr/subtitles/sync.py
+++ b/bazarr/subtitles/sync.py
@@ -23,7 +23,8 @@ def sync_subtitles(video_path,
                    gss=settings.subsync.gss,
                    no_fix_framerate=settings.subsync.no_fix_framerate,
                    reference=None,
-                   force_sync=False):
+                   force_sync=False,
+                   callback=None):
     if not settings.subsync.use_subsync and not force_sync:
         logging.debug('BAZARR automatic syncing is disabled in settings. Skipping sync routine.')
         return False
@@ -66,6 +67,8 @@ def sync_subtitles(video_path,
             }
             try:
                 subsync.sync(**sync_kwargs)
+                if callback:
+                    callback()
             except Exception:
                 logging.exception(f'BAZARR an unhandled exception occurs during the synchronization process for this '
                                   f'subtitle file: {srt_path}')
diff --git a/bazarr/subtitles/tools/mods.py b/bazarr/subtitles/tools/mods.py
index 8d0536d0fb..302b816a18 100644
--- a/bazarr/subtitles/tools/mods.py
+++ b/bazarr/subtitles/tools/mods.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 
 import os
+import sys
 import logging
 
 from subliminal_patch.subtitle import Subtitle
@@ -8,11 +9,93 @@
 from subzero.language import Language
 
 from app.config import settings
+from app.jobs_queue import jobs_queue
 from languages.custom_lang import CustomLanguage
 from languages.get_languages import alpha3_from_alpha2
 from subtitles.indexer.utils import get_external_subtitles_path
 
 
+MOD_LABELS = {
+    'remove_HI': 'Remove HI Tags',
+    'remove_tags': 'Remove Style Tags',
+    'OCR_fixes': 'OCR Fixes',
+    'common': 'Common Fixes',
+    'fix_uppercase': 'Fix Uppercase',
+    'reverse_rtl': 'Reverse RTL',
+    'add_color': 'Add Color',
+    'change_frame_rate': 'Change Frame Rate',
+    'adjust_time': 'Adjust Times',
+    'emoji': 'Remove Emoji',
+}
+
+
+def apply_subtitle_mods(language, subtitle_path, mods, video_path,
+                         media_type=None, media_id=None, job_id=None):
+    """Job-aware wrapper for subtitles_apply_mods.
+
+    When called without a job_id, queues the work as a backend job and returns
+    immediately. When called with a job_id (by the job queue consumer), does the
+    actual work and handles post-processing (store_subtitles, event_stream, chmod).
+    """
+    if not job_id:
+        # No local variables can be assigned before add_job_from_function because
+        # it introspects the frame and re-passes all locals as kwargs on re-invocation.
+        jobs_queue.add_job_from_function(
+            (lambda m, p: f'{MOD_LABELS.get(m, m)}: {os.path.basename(p)}')(
+                mods[0] if mods else 'mods', subtitle_path),
+            is_progress=False,
+        )
+        return
+
+    mod_label = MOD_LABELS.get(mods[0], mods[0]) if mods else 'Apply Mods'
+    filename = os.path.basename(subtitle_path)
+
+    try:
+        subtitles_apply_mods(language=language, subtitle_path=subtitle_path,
+                             mods=mods, video_path=video_path)
+    except Exception:
+        jobs_queue.update_job_name(
+            job_id=job_id,
+            new_job_name=f'Failed {mod_label}: {filename}',
+        )
+        raise
+
+    # apply chmod if required
+    chmod = int(settings.general.chmod, 8) if not sys.platform.startswith(
+        'win') and settings.general.chmod_enabled else None
+    if chmod and os.path.exists(subtitle_path):
+        os.chmod(subtitle_path, chmod)
+
+    # re-index subtitles so Bazarr's DB picks up the changes
+    from subtitles.indexer.series import store_subtitles
+    from subtitles.indexer.movies import store_subtitles_movie
+    from app.event_handler import event_stream
+    from utilities.path_mappings import path_mappings
+
+    if media_type == 'episode':
+        store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
+    elif media_type == 'movie':
+        store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
+
+    if media_id and media_type:
+        if media_type == 'episode':
+            from app.database import TableEpisodes, database, select
+            metadata = database.execute(
+                select(TableEpisodes.sonarrSeriesId)
+                .where(TableEpisodes.sonarrEpisodeId == media_id)
+            ).first()
+            if metadata:
+                event_stream(type='series', payload=metadata.sonarrSeriesId)
+            event_stream(type='episode', payload=media_id)
+        else:
+            event_stream(type='movie', payload=media_id)
+
+    jobs_queue.update_job_name(
+        job_id=job_id,
+        new_job_name=f'{mod_label}: {filename}',
+    )
+
+
 def subtitles_apply_mods(language, subtitle_path, mods, video_path):
     language = alpha3_from_alpha2(language)
     custom = CustomLanguage.from_value(language, "alpha3")
diff --git a/bazarr/subtitles/tools/score.py b/bazarr/subtitles/tools/score.py
deleted file mode 100644
index 11771354ef..0000000000
--- a/bazarr/subtitles/tools/score.py
+++ /dev/null
@@ -1,140 +0,0 @@
-# coding=utf-8
-
-from __future__ import annotations
-
-import logging
-
-from app.config import get_settings
-
-logger = logging.getLogger(__name__)
-
-
-class Score:
-    media = None
-    defaults = {}
-
-    def __init__(self, load_profiles=False, **kwargs):
-        self.data = self.defaults.copy()
-        self.data.update(**kwargs)
-        self.data["hash"] = self._hash_score()
-        self._profiles = []
-        self._profiles_loaded = False
-
-        if load_profiles:
-            self.load_profiles()
-
-    def check_custom_profiles(self, subtitle, matches):
-        if not self._profiles_loaded:
-            self.load_profiles()
-
-        for profile in self._profiles:
-            if profile.check(subtitle):
-                matches.add(profile.name)
-
-    def load_profiles(self):
-        self._profiles = []
-
-        if self._profiles:
-            logger.debug("Loaded profiles: %s", self._profiles)
-        else:
-            logger.debug("No score profiles found")
-            self._profiles = []
-
-        self._profiles_loaded = True
-
-    def reset(self):
-        self.data.update(self.defaults)
-
-    def update(self, **kwargs):
-        self.data.update(kwargs)
-
-    @classmethod
-    def from_config(cls, **kwargs):
-        return cls(True, **kwargs)
-
-    def get_scores(self, min_percent, special=None):
-        return (
-            self.max_score * (special or min_percent) / 100,
-            self.max_score,
-            set(list(self.scores.keys())),
-        )
-
-    @property
-    def custom_profile_scores(self):
-        return {item.name: item.score for item in self._profiles}
-
-    @property
-    def scores(self):
-        return {**self.custom_profile_scores, **self.data}
-
-    @property
-    def max_score(self):
-        return (
-            self.data["hash"]
-            + self.data["hearing_impaired"]
-            + sum(item.score for item in self._profiles if item.score)
-        )
-
-    def _hash_score(self):
-        return sum(
-            val
-            for key, val in self.data.items()
-            if key not in ("hash", "hearing_impaired")
-        )
-
-    def __str__(self):
-        return f"<{self.media} Score class>"
-
-
-class SeriesScore(Score):
-    media = "series"
-    defaults = {
-        "hash": 359,
-        "series": 180,
-        "year": 90,
-        "season": 30,
-        "episode": 30,
-        "release_group": 15,
-        "source": 7,
-        "audio_codec": 3,
-        "resolution": 2,
-        "video_codec": 2,
-        "hearing_impaired": 1,
-        "streaming_service": 0,
-        "edition": 0,
-    }
-
-    @classmethod
-    def from_config(cls, **kwargs):
-        return cls(True, **kwargs["series_scores"])
-
-    def update(self, **kwargs):
-        self.data.update(kwargs["series_scores"])
-
-
-class MovieScore(Score):
-    media = "movies"
-    defaults = {
-        "hash": 119,
-        "title": 60,
-        "year": 30,
-        "release_group": 15,
-        "source": 7,
-        "audio_codec": 3,
-        "resolution": 2,
-        "video_codec": 2,
-        "hearing_impaired": 1,
-        "streaming_service": 0,
-        "edition": 0,
-    }
-
-    @classmethod
-    def from_config(cls, **kwargs):
-        return cls(True, **kwargs["movie_scores"])
-
-    def update(self, **kwargs):
-        self.data.update(kwargs["movie_scores"])
-
-
-series_score = SeriesScore.from_config(**get_settings())
-movie_score = MovieScore.from_config(**get_settings())
diff --git a/bazarr/subtitles/tools/translate/batch.py b/bazarr/subtitles/tools/translate/batch.py
index 7290de716e..b80feaa818 100644
--- a/bazarr/subtitles/tools/translate/batch.py
+++ b/bazarr/subtitles/tools/translate/batch.py
@@ -4,9 +4,14 @@
 import os
 import ast
 import re
-from app.database import TableEpisodes, TableMovies, database, select
+import subprocess
+from app.database import TableEpisodes, TableMovies, TableShows, database, select
+from app.jobs_queue import jobs_queue
 from app.event_handler import event_stream
 from utilities.path_mappings import path_mappings
+from utilities.binaries import get_binary
+from utilities.video_analyzer import parse_video_metadata, _handle_alpha3
+from languages.get_languages import alpha3_from_alpha2
 from subtitles.indexer.series import store_subtitles
 from subtitles.indexer.movies import store_subtitles_movie
 from subtitles.tools.translate.main import translate_subtitles_file
@@ -24,7 +29,8 @@ def process_episode_translation(item, source_language, target_language, forced,
 
     # Get episode info from database
     episode = database.execute(
-        select(TableEpisodes.path, TableEpisodes.subtitles, TableEpisodes.sonarrSeriesId)
+        select(TableEpisodes.path, TableEpisodes.subtitles, TableEpisodes.sonarrSeriesId,
+               TableEpisodes.title, TableEpisodes.season, TableEpisodes.episode)
         .where(TableEpisodes.sonarrEpisodeId == sonarr_episode_id)
     ).first()
 
@@ -32,6 +38,20 @@ def process_episode_translation(item, source_language, target_language, forced,
         logger.error(f'Episode {sonarr_episode_id} not found')
         return False
 
+    # Get series title
+    show = database.execute(
+        select(TableShows.title).where(TableShows.sonarrSeriesId == sonarr_series_id)
+    ).first()
+    show_title = show.title if show else 'Unknown'
+
+    # Update job name with actual episode info
+    if job_id:
+        ep_label = f'{show_title} S{episode.season:02d}E{episode.episode:02d}'
+        jobs_queue.update_job_name(
+            job_id=job_id,
+            new_job_name=f'Translating {ep_label} ({source_language.upper()} โ†’ {target_language.upper()})'
+        )
+
     video_path = path_mappings.path_replace(episode.path)
 
     # Find source subtitle
@@ -52,7 +72,7 @@ def process_episode_translation(item, source_language, target_language, forced,
 
     # Queue translation
     try:
-        result = translate_subtitles_file(
+        translate_subtitles_file(
             video_path=video_path,
             source_srt_file=source_subtitle_path,
             from_lang=source_language,
@@ -65,14 +85,12 @@ def process_episode_translation(item, source_language, target_language, forced,
             radarr_id=None,
             job_id=job_id
         )
-        if result is not False:
-            # Re-index subtitles so Bazarr's DB knows about the new translated file
-            store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
-            # Notify frontend to refresh
-            event_stream(type='series', payload=sonarr_series_id)
-            event_stream(type='episode', payload=sonarr_episode_id)
-            return True
-        return False
+        # Re-index subtitles so Bazarr's DB knows about the new translated file
+        store_subtitles(path_mappings.path_replace_reverse(video_path), video_path)
+        # Notify frontend to refresh series and episode views
+        event_stream(type='series', payload=sonarr_series_id)
+        event_stream(type='episode', payload=sonarr_episode_id)
+        return True
     except Exception as e:
         logger.error(f'Translation failed for episode {sonarr_episode_id}: {e}')
         return False
@@ -87,7 +105,7 @@ def process_movie_translation(item, source_language, target_language, forced, hi
 
     # Get movie info from database
     movie = database.execute(
-        select(TableMovies.path, TableMovies.subtitles)
+        select(TableMovies.path, TableMovies.subtitles, TableMovies.title)
         .where(TableMovies.radarrId == radarr_id)
     ).first()
 
@@ -95,6 +113,13 @@ def process_movie_translation(item, source_language, target_language, forced, hi
         logger.error(f'Movie {radarr_id} not found')
         return False
 
+    # Update job name with actual movie title
+    if job_id:
+        jobs_queue.update_job_name(
+            job_id=job_id,
+            new_job_name=f'Translating {movie.title} ({source_language.upper()} โ†’ {target_language.upper()})'
+        )
+
     video_path = path_mappings.path_replace_movie(movie.path)
 
     # Find source subtitle
@@ -115,7 +140,7 @@ def process_movie_translation(item, source_language, target_language, forced, hi
 
     # Queue translation
     try:
-        result = translate_subtitles_file(
+        translate_subtitles_file(
             video_path=video_path,
             source_srt_file=source_subtitle_path,
             from_lang=source_language,
@@ -128,13 +153,11 @@ def process_movie_translation(item, source_language, target_language, forced, hi
             radarr_id=radarr_id,
             job_id=job_id
         )
-        if result is not False:
-            # Re-index subtitles so Bazarr's DB knows about the new translated file
-            store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
-            # Notify frontend to refresh
-            event_stream(type='movie', payload=radarr_id)
-            return True
-        return False
+        # Re-index subtitles so Bazarr's DB knows about the new translated file
+        store_subtitles_movie(path_mappings.path_replace_reverse_movie(video_path), video_path)
+        # Notify frontend to refresh movie view
+        event_stream(type='movie', payload=radarr_id)
+        return True
     except Exception as e:
         logger.error(f'Translation failed for movie {radarr_id}: {e}')
         return False
@@ -215,21 +238,173 @@ def sort_key(sub):
             if resolved_path:
                 return resolved_path, sub['code2']
 
-    # Third pass: Scan filesystem fallback
+    # Third pass: Extract embedded subtitles from video container
+    if subtitles and isinstance(subtitles, list):
+        embedded_subs = []
+        for sub in subtitles:
+            if isinstance(sub, (list, tuple)) and len(sub) >= 2:
+                lang_parts = sub[0].split(':')
+                sub_code = lang_parts[0]
+                sub_path = sub[1]
+                if sub_path is None:  # Embedded subtitle (no file on disk)
+                    embedded_subs.append({
+                        'code2': sub_code,
+                        'hi': len(lang_parts) > 1 and lang_parts[1].lower() == 'hi',
+                        'forced': len(lang_parts) > 1 and lang_parts[1].lower() == 'forced',
+                    })
+
+        if embedded_subs:
+            # Prefer exact language match, then fall back to any (preferring English)
+            candidates = [s for s in embedded_subs if s['code2'] == language_code]
+            if not candidates:
+                common_languages = ['en', 'eng']
+                candidates = sorted(embedded_subs,
+                                    key=lambda x: (x['forced'], x['hi'], x['code2'] not in common_languages))
+
+            for sub in candidates:
+                extracted_path = extract_embedded_subtitle(video_path, sub['code2'], media_type)
+                if extracted_path:
+                    return extracted_path, sub['code2']
+
+    # Fourth pass: Scan filesystem fallback
     filesystem_subs = scan_filesystem_for_subtitles(video_path)
-    
+
     if filesystem_subs:
         # Prefer English
         for sub in filesystem_subs:
             if sub['is_english']:
                 return sub['path'], 'en'
-        
+
         # Use first available
         sub = filesystem_subs[0]
         return sub['path'], sub['detected_language']
-    
+
     return None, None
 
+def extract_embedded_subtitle(video_path, language_code2, media_type):
+    """Extract an embedded subtitle track from a video file using ffmpeg.
+
+    Returns the path to the extracted .srt file, or None on failure.
+    """
+    target_alpha3 = alpha3_from_alpha2(language_code2)
+    if not target_alpha3:
+        logger.error(f'Cannot convert language code {language_code2} to alpha3')
+        return None
+
+    # Look up file metadata needed by parse_video_metadata
+    if media_type == 'series':
+        db_path = path_mappings.path_replace_reverse(video_path)
+        media = database.execute(
+            select(TableEpisodes.episode_file_id, TableEpisodes.file_size)
+            .where(TableEpisodes.path == db_path)
+        ).first()
+        if not media:
+            return None
+        data = parse_video_metadata(video_path, media.file_size,
+                                    episode_file_id=media.episode_file_id)
+    else:
+        db_path = path_mappings.path_replace_reverse_movie(video_path)
+        media = database.execute(
+            select(TableMovies.movie_file_id, TableMovies.file_size)
+            .where(TableMovies.path == db_path)
+        ).first()
+        if not media:
+            return None
+        data = parse_video_metadata(video_path, media.file_size,
+                                    movie_file_id=media.movie_file_id)
+
+    if not data:
+        return None
+
+    # Find the subtitle provider (ffprobe or mediainfo)
+    cache_provider = None
+    if data.get("ffprobe") and "subtitle" in data["ffprobe"]:
+        cache_provider = 'ffprobe'
+    elif data.get("mediainfo") and "subtitle" in data["mediainfo"]:
+        cache_provider = 'mediainfo'
+    if not cache_provider:
+        return None
+
+    # Bitmap-based subtitle codecs that cannot be converted to SRT
+    bitmap_codecs = ['pgs', 'vobsub', 'dvd_subtitle', 'dvbsub', 'hdmv_pgs_subtitle', 'dvd']
+
+    # Find the matching subtitle stream index
+    track_id = 0
+    found_track = None
+    for track in data[cache_provider]["subtitle"]:
+        codec = (track.get("format") or track.get("name") or "").lower()
+        if any(bc in codec for bc in bitmap_codecs):
+            track_id += 1
+            continue
+
+        if "language" not in track:
+            track_id += 1
+            continue
+
+        track_alpha3 = _handle_alpha3(track)
+        if track_alpha3 == target_alpha3:
+            found_track = track_id
+            break
+        track_id += 1
+
+    if found_track is None:
+        logger.debug(f'No extractable embedded subtitle found for language {language_code2} in {video_path}')
+        return None
+
+    # Build output path in Bazarr's config dir so Jellyfin won't pick it up
+    import hashlib
+    extract_dir = os.path.join('/config', 'extracted_subs')
+    os.makedirs(extract_dir, exist_ok=True)
+    video_hash = hashlib.md5(video_path.encode()).hexdigest()
+    output_path = os.path.join(extract_dir, f"{video_hash}.{language_code2}.srt")
+
+    # Skip extraction if already done
+    if os.path.exists(output_path) and os.path.getsize(output_path) > 0:
+        logger.debug(f'Using previously extracted subtitle: {output_path}')
+        return output_path
+
+    # Extract using ffmpeg
+    try:
+        ffmpeg_path = get_binary("ffmpeg")
+    except Exception:
+        logger.error("ffmpeg binary not found, cannot extract embedded subtitles")
+        return None
+
+    cmd = [ffmpeg_path, '-y', '-loglevel', 'error',
+           '-i', video_path,
+           '-map', f'0:s:{found_track}',
+           '-c:s', 'srt',
+           output_path]
+
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=120)
+        if result.returncode != 0:
+            logger.error(f'ffmpeg extraction failed for {video_path}: {result.stderr}')
+            if os.path.exists(output_path):
+                os.remove(output_path)
+            return None
+        if os.path.exists(output_path) and os.path.getsize(output_path) > 0:
+            # Strip Windows carriage returns (\r) that ffmpeg may produce
+            with open(output_path, 'r', encoding='utf-8-sig', errors='replace') as f:
+                content = f.read()
+            if '\r' in content:
+                with open(output_path, 'w', encoding='utf-8') as f:
+                    f.write(content.replace('\r', ''))
+            logger.info(f'Extracted embedded {language_code2} subtitle to: {output_path}')
+            return output_path
+        return None
+    except subprocess.TimeoutExpired:
+        logger.error(f'ffmpeg extraction timed out for {video_path}')
+        if os.path.exists(output_path):
+            os.remove(output_path)
+        return None
+    except Exception as e:
+        logger.error(f'Failed to extract embedded subtitle: {e}')
+        if os.path.exists(output_path):
+            os.remove(output_path)
+        return None
+
+
 def scan_filesystem_for_subtitles(video_path):
     """Scan filesystem for .srt files next to the video file."""
     ENGLISH_PATTERNS = [
diff --git a/bazarr/subtitles/tools/translate/core/translator_utils.py b/bazarr/subtitles/tools/translate/core/translator_utils.py
index 2ac5700b73..e74ef31647 100644
--- a/bazarr/subtitles/tools/translate/core/translator_utils.py
+++ b/bazarr/subtitles/tools/translate/core/translator_utils.py
@@ -9,6 +9,7 @@
 
 from app.config import settings
 from subzero.language import Language
+from subliminal_patch.score import MAX_SCORES
 from languages.custom_lang import CustomLanguage
 from languages.get_languages import alpha3_from_alpha2, language_from_alpha2, language_from_alpha3
 from subtitles.processing import ProcessSubtitlesResult
@@ -56,10 +57,10 @@ def create_process_result(message, video_path, orig_to_lang, forced, hi, dest_sr
     """Create a ProcessSubtitlesResult object with common parameters."""
     if media_type == 'series':
         prr = path_mappings.path_replace_reverse
-        score = int((settings.translator.default_score / 100) * 360)
+        score = int((settings.translator.default_score / 100) * MAX_SCORES['episode'])
     else:
         prr = path_mappings.path_replace_reverse_movie
-        score = int((settings.translator.default_score / 100) * 120)
+        score = int((settings.translator.default_score / 100) * MAX_SCORES['movie'])
 
     return ProcessSubtitlesResult(
         message=message,
diff --git a/bazarr/subtitles/tools/translate/main.py b/bazarr/subtitles/tools/translate/main.py
index 8201b47187..4c20c6fad5 100644
--- a/bazarr/subtitles/tools/translate/main.py
+++ b/bazarr/subtitles/tools/translate/main.py
@@ -3,10 +3,11 @@
 import logging
 import os
 
+
 from subliminal_patch.core import get_subtitle_path
 from subzero.language import Language
 
-from .core.translator_utils import validate_translation_params, convert_language_codes
+from .core.translator_utils import validate_translation_params, convert_language_codes, get_title
 from .services.translator_factory import TranslatorFactory
 from languages.get_languages import alpha3_from_alpha2
 from app.config import settings
@@ -15,13 +16,19 @@
 
 
 def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, forced, hi,
-                             media_type, sonarr_series_id, sonarr_episode_id, radarr_id, job_id=None):
+                             media_type, sonarr_series_id, sonarr_episode_id, radarr_id, metadata, job_id=None):
     if not job_id:
-        jobs_queue.add_job_from_function(f'Translating from {from_lang.upper()} to {to_lang.upper()} using '
-                                         f'{settings.translator.translator_type.replace("_", " ").title()}',
-                                         is_progress=True)
+        # Build job label with media title. Note: no local variables can be
+        # assigned here because add_job_from_function introspects the frame
+        # and re-passes all locals as kwargs on re-invocation.
+        jobs_queue.add_job_from_function(
+            (lambda t: f'Translating {t} ({from_lang.upper()} to {to_lang.upper()})' if t else
+             f'Translating {from_lang.upper()} to {to_lang.upper()}')(
+                get_title(media_type, radarr_id, sonarr_series_id, sonarr_episode_id)),
+            is_progress=True)
         return
 
+    translator_label = settings.translator.translator_type.replace("_", " ").title()
     try:
         logging.debug(f'Translation request: video={video_path}, source={source_srt_file}, from={from_lang}, to={to_lang}')
 
@@ -30,7 +37,6 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
 
         logging.debug(f'BAZARR is translating in {lang_obj} this subtitles {source_srt_file}')
 
-        # get the destination path if the subtitles are alongside the video
         dest_srt_file_if_alongside_video = get_subtitle_path(
             video_path,
             language=lang_obj if isinstance(lang_obj, Language) else lang_obj.subzero_language(),
@@ -39,8 +45,6 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
             hi_tag=hi
         )
 
-        # get the real destination path taking into account if the user set up Bazarr to store external subtitles in
-        #  a custom folder or relative folder
         dest_srt_file = get_external_subtitles_path(
             file=video_path,
             subtitle=os.path.basename(dest_srt_file_if_alongside_video)
@@ -68,14 +72,29 @@ def translate_subtitles_file(video_path, source_srt_file, from_lang, to_lang, fo
 
         logging.debug(f'Created translator instance: {translator.__class__.__name__}')
         result = translator.translate(job_id=job_id)
+        if result is False:
+            raise RuntimeError(f'{translator.__class__.__name__} returned a failed translation result')
         logging.debug(f'BAZARR saved translated subtitles to {dest_srt_file}')
+
+        from api.subtitles.subtitles import postprocess_subtitles
+        # Call postprocess_subtitles after translation (handles chmod, re-indexing, events)
+        postprocess_subtitles(dest_srt_file, video_path, media_type, metadata, sonarr_episode_id if media_type == 'series' else radarr_id)
+
+        # Get current job name (which batch.py already set with title) and mark as done
+        current_name = jobs_queue.get_job_name(job_id)
+        if current_name and 'Translating' in current_name:
+            done_name = current_name.replace('Translating', 'Translated')
+        else:
+            done_name = f'Translated {from_lang.upper()} \u2192 {to_lang.upper()} using {translator_label}'
+        jobs_queue.update_job_name(job_id=job_id, new_job_name=done_name)
         return result
 
     except Exception as e:
         logging.error(f'Translation failed: {str(e)}', exc_info=True)
-        return False
-
-    finally:
-        jobs_queue.update_job_name(job_id=job_id,
-                                   new_job_name=f'Translated from {from_lang.upper()} to {to_lang.upper()} using '
-                                                f'{settings.translator.translator_type.replace("_", " ").title()}')
+        current_name = jobs_queue.get_job_name(job_id)
+        if current_name and 'Translating' in current_name:
+            fail_name = current_name.replace('Translating', 'Failed')
+        else:
+            fail_name = f'Failed: {from_lang.upper()} โ†’ {to_lang.upper()} using {translator_label}'
+        jobs_queue.update_job_name(job_id=job_id, new_job_name=fail_name)
+        raise
diff --git a/bazarr/subtitles/tools/translate/services/auth.py b/bazarr/subtitles/tools/translate/services/auth.py
new file mode 100644
index 0000000000..31cfac4468
--- /dev/null
+++ b/bazarr/subtitles/tools/translate/services/auth.py
@@ -0,0 +1,24 @@
+import hashlib
+import hmac
+
+from app.config import settings
+
+AUTH_MESSAGE = b"subtitle-translator-auth-v1"
+
+
+def get_translator_auth_headers(encryption_key=None):
+    """Build auth headers for requests to the AI Subtitle Translator.
+
+    Computes HMAC-SHA256(encryption_key, "subtitle-translator-auth-v1")
+    and returns it as X-Auth-Token. Returns empty dict when no key is
+    configured (backwards-compatible).
+    """
+    key = encryption_key or settings.translator.openrouter_encryption_key
+    if not key:
+        return {}
+    token = hmac.new(
+        bytes.fromhex(key),
+        AUTH_MESSAGE,
+        hashlib.sha256,
+    ).hexdigest()
+    return {"X-Auth-Token": token}
diff --git a/bazarr/subtitles/tools/translate/services/encryption.py b/bazarr/subtitles/tools/translate/services/encryption.py
new file mode 100644
index 0000000000..2b56ba8b52
--- /dev/null
+++ b/bazarr/subtitles/tools/translate/services/encryption.py
@@ -0,0 +1,36 @@
+import base64
+import os
+import re
+
+from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+
+_HEX_64_RE = re.compile(r'^[0-9a-fA-F]{64}$')
+
+
+def validate_encryption_key(key_hex: str) -> bool:
+    """Check if key_hex is a valid 64-character hex string."""
+    return bool(_HEX_64_RE.match(key_hex))
+
+
+def encrypt_api_key(api_key: str, encryption_key_hex: str) -> str:
+    """Encrypt an API key using AES-256-GCM with the shared key.
+
+    Args:
+        api_key: The plaintext OpenRouter API key.
+        encryption_key_hex: 64-char hex string (the shared key).
+
+    Returns:
+        Encrypted string in format "enc:base64data".
+
+    Raises:
+        ValueError: If encryption_key_hex is not a valid 64-char hex string.
+    """
+    if not validate_encryption_key(encryption_key_hex):
+        raise ValueError("Encryption key must be exactly 64 hexadecimal characters")
+
+    key = bytes.fromhex(encryption_key_hex)
+    nonce = os.urandom(12)
+    aesgcm = AESGCM(key)
+    ciphertext = aesgcm.encrypt(nonce, api_key.encode("utf-8"), None)
+    encoded = base64.b64encode(nonce + ciphertext).decode("ascii")
+    return f"enc:{encoded}"
diff --git a/bazarr/subtitles/tools/translate/services/gemini_translator.py b/bazarr/subtitles/tools/translate/services/gemini_translator.py
index e1601f8f87..54449faed8 100644
--- a/bazarr/subtitles/tools/translate/services/gemini_translator.py
+++ b/bazarr/subtitles/tools/translate/services/gemini_translator.py
@@ -28,6 +28,10 @@
 from ..core.translator_utils import add_translator_info, get_description, create_process_result
 
 logger = logging.getLogger(__name__)
+DEFAULT_GEMINI_BATCH_SIZE = 300
+DEFAULT_GEMINI_KEY_COOLDOWN_SECONDS = 60
+_GEMINI_KEY_COOLDOWNS = {}
+_GEMINI_KEY_COOLDOWNS_LOCK = threading.Lock()
 
 
 class SubtitleObject(typing.TypedDict):
@@ -58,7 +62,9 @@ def __init__(self, source_srt_file, dest_srt_file, to_lang, media_type, sonarr_s
         self.orig_to_lang = orig_to_lang
 
         self.gemini_api_key = None
+        self.api_keys = []
         self.current_api_key = None
+        self.current_api_index = -1
         self.current_api_number = 1
         self.backup_api_number = 2
         self.target_language = None
@@ -67,11 +73,9 @@ def __init__(self, source_srt_file, dest_srt_file, to_lang, media_type, sonarr_s
         self.start_line = 1
         self.description = None
         self.model_name = "gemini-2.0-flash"
-        self.batch_size = 100
+        self.batch_size = DEFAULT_GEMINI_BATCH_SIZE
         self.free_quota = True
         self.error_log = False
-        self.token_limit = 0
-        self.token_count = 0
         self.interrupt_flag = False
         self.progress_file = None
         self.current_progress = 0
@@ -86,17 +90,16 @@ def translate(self, job_id):
             logger.debug(f'BAZARR is sending subtitle file to Gemini for translation')
             logger.info(f"BAZARR is sending subtitle file to Gemini for translation " + self.source_srt_file)
 
-            self.gemini_api_key = settings.translator.gemini_key
-            self.current_api_key = self.gemini_api_key
+            self.api_keys = self._get_configured_api_keys()
+            self.current_api_key = self._select_next_api_key()
+            self.gemini_api_key = self.current_api_key
             self.target_language = language_from_alpha3(self.to_lang)
             self.input_file = self.source_srt_file
             self.output_file = self.dest_srt_file
             self.model_name = settings.translator.gemini_model
+            self.batch_size = self._get_batch_size()
             self.description = get_description(self.media_type, self.radarr_id, self.sonarr_series_id)
 
-            if "2.5-flash" in self.model_name or "pro" in self.model_name:
-                self.batch_size = 300
-
             if self.input_file:
                 self.progress_file = os.path.join(os.path.dirname(self.input_file), f".{os.path.basename(self.input_file)}.progress")
 
@@ -107,10 +110,11 @@ def translate(self, job_id):
                 add_translator_info(self.dest_srt_file, f"# Subtitles translated with {settings.translator.gemini_model} # ")
             except Exception as e:
                 jobs_queue.update_job_progress(job_id=job_id, progress_message=f'Gemini translation error: {str(e)}')
+                raise
 
         except Exception as e:
             logger.error(f'BAZARR encountered an error translating with Gemini: {str(e)}')
-            return False
+            raise
 
         else:
             message = (f"{language_from_alpha2(self.from_lang)} subtitles translated to "
@@ -206,53 +210,113 @@ def setup_signal_handlers(self):
             return True
         return False
 
-    def _get_token_limit(self) -> int:
-        """
-        Get the token limit for the current model.
+    def _get_batch_size(self) -> int:
+        try:
+            batch_size = int(settings.translator.gemini_batch_size)
+        except (AttributeError, TypeError, ValueError):
+            batch_size = DEFAULT_GEMINI_BATCH_SIZE
+        return max(1, batch_size)
 
-        Returns:
-            int: Token limit for the current model according to https://cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/2-5-flash
-        """
-        if "2.0-flash" in self.model_name:
-            return 7000
-        elif "2.5-flash" in self.model_name or "pro" in self.model_name:
-            return 50000
-        else:
-            return 7000
+    def _get_configured_api_keys(self) -> List[str]:
+        keys = []
+        seen_keys = set()
+        configured_keys = getattr(settings.translator, "gemini_keys", [])
 
-    def _validate_token_size(self, contents: str) -> bool:
-        """
-        Validate the token size of the input contents.
+        if not isinstance(configured_keys, list):
+            configured_keys = [configured_keys]
 
-        Args:
-            contents (str): Input contents to validate
+        for raw_key in configured_keys:
+            key = str(raw_key).strip()
+            if key and key not in seen_keys:
+                keys.append(key)
+                seen_keys.add(key)
 
-        Returns:
-            bool: True if token size is valid, False otherwise
-        """
-        return True
+        return keys
 
-    current_progress = 0
+    @staticmethod
+    def _is_key_on_cooldown(api_key: str) -> bool:
+        now = time.time()
+        with _GEMINI_KEY_COOLDOWNS_LOCK:
+            expires_at = _GEMINI_KEY_COOLDOWNS.get(api_key)
+            if expires_at is None:
+                return False
+            if expires_at <= now:
+                _GEMINI_KEY_COOLDOWNS.pop(api_key, None)
+                return False
+            return True
 
-    def _process_batch(
-            self,
-            batch: List[SubtitleObject],  # Changed from list[SubtitleObject]
-            translated_subtitle: List[Subtitle],  # Changed from list[Subtitle]
-            total: int,
-            retry_num=3
-    ):
-        """
-        Process a batch of subtitles for translation with accurate progress tracking.
+    def _select_next_api_key(self):
+        if not self.api_keys:
+            self.current_api_key = None
+            return None
 
-        Args:
-            batch (List[SubtitleObject]): Batch of subtitles to translate
-            translated_subtitle (List[Subtitle]): List to store translated subtitles
-            total (int): Total number of subtitles to translate
-        """
+        total_keys = len(self.api_keys)
+        start_index = self.current_api_index if self.current_api_index >= 0 else -1
 
-        url = f"https://generativelanguage.googleapis.com/v1beta/models/{self.model_name}:generateContent?key={self.current_api_key}"
+        for offset in range(1, total_keys + 1):
+            candidate_index = (start_index + offset) % total_keys
+            candidate_key = self.api_keys[candidate_index]
+            if not self._is_key_on_cooldown(candidate_key):
+                self.current_api_index = candidate_index
+                self.current_api_key = candidate_key
+                return candidate_key
+
+        self.current_api_key = None
+        return None
+
+    @staticmethod
+    def _is_rate_limited_response(response) -> bool:
+        if response is None:
+            return False
+
+        if response.status_code == 429:
+            return True
+
+        try:
+            error_body = response.json().get("error", {})
+        except Exception:
+            return False
+
+        error_status = str(error_body.get("status", "")).upper()
+        error_message = str(error_body.get("message", "")).lower()
+        return error_status == "RESOURCE_EXHAUSTED" or "rate limit" in error_message or "quota" in error_message
+
+    @staticmethod
+    def _get_retry_after_seconds(response) -> int:
+        if response is not None:
+            retry_after = response.headers.get("Retry-After")
+            if retry_after:
+                try:
+                    return max(1, int(float(retry_after)))
+                except (TypeError, ValueError):
+                    pass
 
-        payload = json.dumps({
+        return DEFAULT_GEMINI_KEY_COOLDOWN_SECONDS
+
+    @staticmethod
+    def _set_key_cooldown(api_key: str, cooldown_seconds: int):
+        with _GEMINI_KEY_COOLDOWNS_LOCK:
+            _GEMINI_KEY_COOLDOWNS[api_key] = time.time() + max(1, cooldown_seconds)
+
+    def _handle_rate_limited_key(self, response):
+        if not self.current_api_key:
+            raise RuntimeError("All Gemini API keys are currently rate limited. Please wait before retrying.")
+
+        cooldown_seconds = self._get_retry_after_seconds(response)
+        self._set_key_cooldown(self.current_api_key, cooldown_seconds)
+
+        rotated_key = self._select_next_api_key()
+        if not rotated_key:
+            raise RuntimeError("All Gemini API keys are currently rate limited. Please wait before retrying.")
+
+        if self.job_id is not None:
+            jobs_queue.update_job_progress(
+                job_id=self.job_id,
+                progress_message="Gemini key rate limited. Rotating to another configured key.",
+            )
+
+    def _build_generate_payload(self, batch: List[SubtitleObject]) -> dict:
+        return {
             "system_instruction": {
                 "parts": [
                     {
@@ -270,7 +334,29 @@ def _process_batch(
                     ]
                 }
             ]
-        })
+        }
+
+    current_progress = 0
+
+    def _process_batch(
+            self,
+            batch: List[SubtitleObject],  # Changed from list[SubtitleObject]
+            translated_subtitle: List[Subtitle],  # Changed from list[Subtitle]
+            total: int,
+            retry_num=3
+    ):
+        """
+        Process a batch of subtitles for translation with accurate progress tracking.
+
+        Args:
+            batch (List[SubtitleObject]): Batch of subtitles to translate
+            translated_subtitle (List[Subtitle]): List to store translated subtitles
+            total (int): Total number of subtitles to translate
+        """
+
+        url = f"https://generativelanguage.googleapis.com/v1beta/models/{self.model_name}:generateContent?key={self.current_api_key}"
+
+        payload = json.dumps(self._build_generate_payload(batch), ensure_ascii=False)
         headers = {
             'Content-Type': 'application/json'
         }
@@ -313,6 +399,12 @@ def clean_json_string(json_string):
             return self.current_progress
 
         except Exception as e:
+            response = getattr(e, "response", None)
+            if self._is_rate_limited_response(response):
+                self._handle_rate_limited_key(response)
+                if retry_num > 0:
+                    return self._process_batch(batch, translated_subtitle, total, retry_num - 1)
+
             if retry_num > 0:
                 return self._process_batch(batch, translated_subtitle, total, retry_num - 1)
             else:
@@ -360,8 +452,18 @@ def _dominant_strong_direction(s: str) -> str:
                 translated_subtitle[int(line["index"])].content = line["content"]
 
     def _translate_with_gemini(self):
+        if not self.api_keys:
+            jobs_queue.update_job_progress(
+                job_id=self.job_id,
+                progress_message="Please provide at least one valid Gemini API key.",
+            )
+            return
+
         if not self.current_api_key:
-            jobs_queue.update_job_progress(job_id=self.job_id, progress_message="Please provide a valid Gemini API key.")
+            jobs_queue.update_job_progress(
+                job_id=self.job_id,
+                progress_message="All Gemini API keys are currently rate limited. Please wait before retrying.",
+            )
             return
 
         if not self.target_language:
@@ -372,8 +474,6 @@ def _translate_with_gemini(self):
             jobs_queue.update_job_progress(job_id=self.job_id, progress_message="Please provide a subtitle file.")
             return
 
-        self.token_limit = self._get_token_limit()
-
         try:
             with open(self.input_file, "r", encoding="utf-8") as original_file:
                 original_text = original_file.read()
@@ -395,7 +495,6 @@ def _translate_with_gemini(self):
                     i = self.start_line - 1
                     total = len(original_subtitle)
                     batch = [SubtitleObject(index=str(i), content=original_subtitle[i].content)]
-
                     i += 1
 
                     # Save initial progress
@@ -411,35 +510,6 @@ def _translate_with_gemini(self):
                             continue
 
                         try:
-                            if not self._validate_token_size(json.dumps(batch, ensure_ascii=False)):
-                                jobs_queue.update_job_progress(
-                                    job_id=self.job_id,
-                                    progress_message=f"Token size ({int(self.token_count / 0.9)}) exceeds limit ("
-                                                     f"{self.token_limit}) for {self.model_name}."
-                                )
-                                user_prompt = "0"
-                                while not user_prompt.isdigit() or int(user_prompt) <= 0:
-                                    user_prompt = jobs_queue.update_job_progress(
-                                        job_id=self.job_id,
-                                        progress_message=f"Please enter a new batch size (current: {self.batch_size}): "
-                                    )
-                                    if user_prompt.isdigit() and int(user_prompt) > 0:
-                                        new_batch_size = int(user_prompt)
-                                        decrement = self.batch_size - new_batch_size
-                                        if decrement > 0:
-                                            for _ in range(decrement):
-                                                i -= 1
-                                                batch.pop()
-                                        self.batch_size = new_batch_size
-                                        jobs_queue.update_job_progress(job_id=self.job_id,
-                                                                       progress_message=f"Batch size updated to "
-                                                                                        f"{self.batch_size}.")
-                                    else:
-                                        jobs_queue.update_job_progress(job_id=self.job_id,
-                                                                       progress_message="Invalid input. Batch size must"
-                                                                                        " be a positive integer.")
-                                continue
-
                             start_time = time.time()
                             self._process_batch(batch, translated_subtitle, total)
                             end_time = time.time()
@@ -456,7 +526,8 @@ def _translate_with_gemini(self):
                             raise e
 
                     # Check if we exited the loop due to an interrupt
-                    jobs_queue.update_job_progress(job_id=self.job_id, progress_value=total)
+                    jobs_queue.update_job_progress(job_id=self.job_id, progress_value=total,
+                                                   progress_message=self.source_srt_file)
                     if self.interrupt_flag:
                         # File will be automatically closed by the with statement
                         self._clear_progress()
@@ -472,4 +543,10 @@ def _translate_with_gemini(self):
             jobs_queue.update_job_progress(job_id=self.job_id, progress_value=total,
                                            progress_message=f'Gemini translation failed: {str(e)}')
             self._clear_progress()
+            if self.output_file and os.path.exists(self.output_file):
+                try:
+                    if os.path.getsize(self.output_file) == 0:
+                        os.remove(self.output_file)
+                except OSError:
+                    pass
             raise e
diff --git a/bazarr/subtitles/tools/translate/services/google_translator.py b/bazarr/subtitles/tools/translate/services/google_translator.py
index eea90dfa01..f121f88caf 100644
--- a/bazarr/subtitles/tools/translate/services/google_translator.py
+++ b/bazarr/subtitles/tools/translate/services/google_translator.py
@@ -95,7 +95,7 @@ def translate_line(line_id, subtitle_line):
                     jobs_queue.update_job_progress(job_id=job_id,
                                                    progress_message=f'Translation failed: Unable to translate '
                                                                     f'malformed subtitles for {self.source_srt_file}')
-                    return False
+                    raise
 
             try:
                 subs.save(self.dest_srt_file)
@@ -121,7 +121,7 @@ def translate_line(line_id, subtitle_line):
             logger.error(f'BAZARR encountered an error during translation: {str(e)}')
             jobs_queue.update_job_progress(job_id=job_id,
                                            progress_message=f'Google translation failed: {str(e)}')
-            return False
+            raise
 
     @retry(exceptions=(TooManyRequests, RequestError), tries=6, delay=1, backoff=2, jitter=(0, 1))
     def _translate_text(self, text, job_id):
diff --git a/bazarr/subtitles/tools/translate/services/lingarr_translator.py b/bazarr/subtitles/tools/translate/services/lingarr_translator.py
index 646b6e402c..276ee124f6 100644
--- a/bazarr/subtitles/tools/translate/services/lingarr_translator.py
+++ b/bazarr/subtitles/tools/translate/services/lingarr_translator.py
@@ -64,7 +64,7 @@ def translate(self, job_id=None):
                 logger.error(f'Translation failed for {self.source_srt_file}')
                 jobs_queue.update_job_progress(job_id=job_id,
                                                progress_message=f'Translation failed for {self.source_srt_file}')
-                return False
+                raise RuntimeError(f'Translation failed for {self.source_srt_file}')
 
             logger.debug(f'BAZARR saving Lingarr translated subtitles to {self.dest_srt_file}')
             translation_map = {}
@@ -108,7 +108,7 @@ def translate(self, job_id=None):
         except Exception as e:
             logger.error(f'BAZARR encountered an error during Lingarr translation: {str(e)}')
             jobs_queue.update_job_progress(job_id=job_id, progress_message=f'Lingarr translation failed: {str(e)}')
-            return False
+            raise
 
     @retry(exceptions=(TooManyRequests, RequestError, requests.exceptions.RequestException), tries=3, delay=1,
            backoff=2, jitter=(0, 1))
diff --git a/bazarr/subtitles/tools/translate/services/openrouter_translator.py b/bazarr/subtitles/tools/translate/services/openrouter_translator.py
index 7d897bfcf3..82b107ea31 100644
--- a/bazarr/subtitles/tools/translate/services/openrouter_translator.py
+++ b/bazarr/subtitles/tools/translate/services/openrouter_translator.py
@@ -14,8 +14,10 @@
 from radarr.history import history_log_movie
 from sonarr.history import history_log
 from app.event_handler import show_progress, hide_progress, show_message
+from app.jobs_queue import jobs_queue
 
 from ..core.translator_utils import add_translator_info, create_process_result, get_title
+from .auth import get_translator_auth_headers
 
 logger = logging.getLogger(__name__)
 
@@ -51,27 +53,30 @@ def __init__(self, source_srt_file, dest_srt_file, lang_obj, to_lang, from_lang,
     def _build_reasoning_config(self):
         """
         Build reasoning configuration based on Bazarr settings.
-        Maps effort levels to max_tokens for the AI Subtitle Translator service.
+        Sends effort level directly to the AI Subtitle Translator service.
         """
         reasoning_mode = getattr(settings.translator, 'openrouter_reasoning', 'disabled')
-        
+
         if reasoning_mode == 'disabled':
             return None
-        
-        # Map effort levels to max_tokens for reasoning
-        effort_to_tokens = {
-            'low': 1000,      # Minimal thinking
-            'medium': 2000,   # Default balanced
-            'high': 4000,     # Extended thinking
-        }
-        
-        max_tokens = effort_to_tokens.get(reasoning_mode, 2000)
-        
+
         return {
-            'enabled': True,
-            'maxTokens': max_tokens,
+            'effort': reasoning_mode,
         }
 
+    def _get_api_key_value(self):
+        """Get the API key, encrypted if an encryption key is configured."""
+        api_key = settings.translator.openrouter_api_key
+        encryption_key = settings.translator.openrouter_encryption_key
+        if encryption_key:
+            try:
+                from .encryption import encrypt_api_key
+                api_key = encrypt_api_key(api_key, encryption_key)
+            except ValueError as e:
+                logger.error(f'Invalid encryption key: {e}')
+                raise ValueError("Invalid encryption key format. Check your encryption key in Settings.")
+        return api_key
+
     def translate(self, job_id=None):
         try:
             subs = pysubs2.load(self.source_srt_file, encoding='utf-8')
@@ -85,7 +90,7 @@ def translate(self, job_id=None):
             logger.debug(f'Starting AI translation for {self.source_srt_file}')
 
             # Submit job and poll for completion
-            translated_lines = self._submit_and_poll(lines_list)
+            translated_lines = self._submit_and_poll(lines_list, bazarr_job_id=job_id)
 
             if translated_lines is None:
                 logger.error(f'Translation failed for {self.source_srt_file}')
@@ -132,7 +137,7 @@ def translate(self, job_id=None):
             hide_progress(id=f'translate_progress_{self.dest_srt_file}')
             return False
 
-    def _submit_and_poll(self, lines_list: List[str]) -> Optional[List[Dict[str, Any]]]:
+    def _submit_and_poll(self, lines_list: List[str], bazarr_job_id=None) -> Optional[List[Dict[str, Any]]]:
         """Submit translation job and poll for completion with progress updates"""
         try:
             # Prepare language codes
@@ -146,6 +151,10 @@ def _submit_and_poll(self, lines_list: List[str]) -> Optional[List[Dict[str, Any
             source_lang = self.language_code_convert_dict.get(source_lang, source_lang)
             target_lang = self.language_code_convert_dict.get(target_lang, target_lang)
 
+            # Resolve alpha2 codes to full language names for the AI translator prompt
+            source_lang = language_from_alpha2(source_lang) or source_lang
+            target_lang = language_from_alpha2(target_lang) or target_lang
+
             logger.debug(f'BAZARR translation language codes: from_lang={self.from_lang}, to_lang={self.to_lang}, '
                          f'orig_to_lang={self.orig_to_lang}, final source={source_lang}, final target={target_lang}')
 
@@ -174,10 +183,11 @@ def _submit_and_poll(self, lines_list: List[str]) -> Optional[List[Dict[str, Any
                 "lines": lines_payload,
                 # Add configuration from Bazarr settings
                 "config": {
-                    "apiKey": settings.translator.openrouter_api_key,
+                    "apiKey": self._get_api_key_value(),
                     "model": settings.translator.openrouter_model,
                     "temperature": settings.translator.openrouter_temperature,
                     "maxConcurrentJobs": settings.translator.openrouter_max_concurrent,
+                    "parallelBatches": settings.translator.openrouter_parallel_batches,
                     "reasoning": self._build_reasoning_config(),
                 }
             }
@@ -189,7 +199,7 @@ def _submit_and_poll(self, lines_list: List[str]) -> Optional[List[Dict[str, Any
             submit_response = requests.post(
                 f"{base_url}/api/v1/jobs/translate/content",
                 json=payload,
-                headers={"Content-Type": "application/json"},
+                headers={"Content-Type": "application/json", **get_translator_auth_headers()},
                 timeout=30
             )
 
@@ -207,7 +217,7 @@ def _submit_and_poll(self, lines_list: List[str]) -> Optional[List[Dict[str, Any
             logger.debug(f'BAZARR translation job submitted: {job_id}')
 
             # Poll for completion
-            return self._poll_job(base_url, job_id, len(lines_payload))
+            return self._poll_job(base_url, job_id, len(lines_payload), bazarr_job_id=bazarr_job_id)
 
         except requests.exceptions.Timeout:
             logger.error('AI Subtitle Translator request timed out')
@@ -219,7 +229,7 @@ def _submit_and_poll(self, lines_list: List[str]) -> Optional[List[Dict[str, Any
             logger.error(f'AI Subtitle Translator error: {str(e)}')
             return None
 
-    def _poll_job(self, base_url: str, job_id: str, total_lines: int) -> Optional[Any]:
+    def _poll_job(self, base_url: str, job_id: str, total_lines: int, bazarr_job_id=None) -> Optional[Any]:
         """Poll job status until completion"""
         poll_interval = 2  # seconds
         max_wait_time = 1800  # 30 minutes
@@ -229,6 +239,7 @@ def _poll_job(self, base_url: str, job_id: str, total_lines: int) -> Optional[An
             try:
                 status_response = requests.get(
                     f"{base_url}/api/v1/jobs/{job_id}",
+                    headers=get_translator_auth_headers(),
                     timeout=10
                 )
 
@@ -252,6 +263,16 @@ def _poll_job(self, base_url: str, job_id: str, total_lines: int) -> Optional[An
                     count=100
                 )
 
+                # Sync progress to bazarr jobs queue (for NotificationDrawer)
+                if bazarr_job_id:
+                    model_used = job_status.get("model_used", settings.translator.openrouter_model or "")
+                    jobs_queue.update_job_progress(
+                        job_id=bazarr_job_id,
+                        progress_value=progress,
+                        progress_max=100,
+                        progress_message=f'{message} [{model_used}]' if model_used else message
+                    )
+
                 if status == "completed":
                     hide_progress(id=f'translate_progress_{self.dest_srt_file}')
                     result = job_status.get("result")
@@ -273,6 +294,13 @@ def _poll_job(self, base_url: str, job_id: str, total_lines: int) -> Optional[An
                     show_message(f"Translation failed: {error}")
                     return None
 
+                elif status == "partial":
+                    hide_progress(id=f'translate_progress_{self.dest_srt_file}')
+                    error = job_status.get("error", message or "Partial translation")
+                    logger.error(f"Translation partially failed: {error}")
+                    show_message(f"Translation failed (partial): {error}")
+                    return None
+
                 elif status == "cancelled":
                     hide_progress(id=f'translate_progress_{self.dest_srt_file}')
                     logger.info("Translation job was cancelled")
@@ -301,7 +329,7 @@ def _translate_sync(self, lines_list: List[str], payload: Dict[str, Any]) -> Opt
         response = requests.post(
             f"{base_url}/api/v1/translate/content",
             json=payload,
-            headers={"Content-Type": "application/json"},
+            headers={"Content-Type": "application/json", **get_translator_auth_headers()},
             timeout=1800
         )
 
diff --git a/bazarr/subtitles/upgrade.py b/bazarr/subtitles/upgrade.py
index 88a095d748..7613fecfd8 100644
--- a/bazarr/subtitles/upgrade.py
+++ b/bazarr/subtitles/upgrade.py
@@ -24,25 +24,50 @@
 from app.event_handler import event_stream
 
 
-def upgrade_subtitles():
+def upgrade_subtitles(wait_for_completion=False):
     use_sonarr = settings.general.use_sonarr
     use_radarr = settings.general.use_radarr
 
     if use_sonarr:
-        upgrade_episodes_subtitles()
+        upgrade_episodes_subtitles(wait_for_completion=wait_for_completion)
 
     if use_radarr:
-        upgrade_movies_subtitles()
+        upgrade_movies_subtitles(wait_for_completion=wait_for_completion)
 
     logging.info('BAZARR Finished searching for Subtitles to upgrade. Check History for more information.')
 
 
-def upgrade_episodes_subtitles(job_id=None):
+def upgrade_episodes_subtitles(job_id=None, sonarr_series_ids=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Trying to upgrade episodes subtitles", is_progress=True)
+        jobs_queue.add_job_from_function("Trying to upgrade episodes subtitles", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     episodes_to_upgrade = get_upgradable_episode_subtitles()
+
+    query = select(TableHistory.id,
+               TableShows.title.label('seriesTitle'),
+               TableEpisodes.season,
+               TableEpisodes.episode,
+               TableEpisodes.title,
+               TableHistory.language,
+               TableEpisodes.audio_language,
+               TableHistory.video_path,
+               TableEpisodes.sceneName,
+               TableHistory.score,
+               TableHistory.sonarrEpisodeId,
+               TableHistory.sonarrSeriesId,
+               TableHistory.subtitles_path,
+               TableEpisodes.path,
+               TableShows.profileId,
+               TableEpisodes.subtitles.label('external_subtitles')) \
+        .select_from(TableHistory) \
+        .join(TableShows, onclause=TableHistory.sonarrSeriesId == TableShows.sonarrSeriesId) \
+        .join(TableEpisodes, onclause=TableHistory.sonarrEpisodeId == TableEpisodes.sonarrEpisodeId)
+
+    if sonarr_series_ids:
+        query = query.where(TableHistory.sonarrSeriesId.in_(sonarr_series_ids))
+
     episodes_data = [{
         'id': x.id,
         'seriesTitle': x.seriesTitle,
@@ -60,26 +85,7 @@ def upgrade_episodes_subtitles(job_id=None):
         'path': x.path,
         'profileId': x.profileId,
         'external_subtitles': [y[1] for y in ast.literal_eval(x.external_subtitles) if y[1]],
-    } for x in database.execute(
-        select(TableHistory.id,
-               TableShows.title.label('seriesTitle'),
-               TableEpisodes.season,
-               TableEpisodes.episode,
-               TableEpisodes.title,
-               TableHistory.language,
-               TableEpisodes.audio_language,
-               TableHistory.video_path,
-               TableEpisodes.sceneName,
-               TableHistory.score,
-               TableHistory.sonarrEpisodeId,
-               TableHistory.sonarrSeriesId,
-               TableHistory.subtitles_path,
-               TableEpisodes.path,
-               TableShows.profileId,
-               TableEpisodes.subtitles.label('external_subtitles'))
-        .select_from(TableHistory)
-        .join(TableShows, onclause=TableHistory.sonarrSeriesId == TableShows.sonarrSeriesId)
-        .join(TableEpisodes, onclause=TableHistory.sonarrEpisodeId == TableEpisodes.sonarrEpisodeId))
+    } for x in database.execute(query)
     .all() if _language_still_desired(x.language, x.profileId) and
               x.video_path == x.path
     ]
@@ -87,7 +93,14 @@ def upgrade_episodes_subtitles(job_id=None):
     for item in episodes_data:
         # do not consider subtitles that do not exist on disk anymore
         if item['subtitles_path'] not in item['external_subtitles']:
-            continue
+            current_sub = _find_current_subtitle_for_language(item['language'], item['external_subtitles'])
+            if current_sub:
+                logging.debug(f"Upgrade candidate {item['id']} ({item['seriesTitle']} S{item['season']:02d}E"
+                              f"{item['episode']:02d}): history path no longer on disk, using current subtitle "
+                              f"for same language ({current_sub})")
+                item['subtitles_path'] = current_sub
+            else:
+                continue
 
         # Mark upgradable and get original_id
         item.update({'original_id': episodes_to_upgrade.get(item['id'])})
@@ -134,7 +147,7 @@ def upgrade_episodes_subtitles(job_id=None):
                                          episode['seriesTitle'],
                                          'series',
                                          episode['profileId'],
-                                         forced_minimum_score=int(episode['score']) + 1,
+                                         forced_minimum_score=int(episode['score'] or 0) + 1,
                                          is_upgrade=True,
                                          previous_subtitles_to_delete=path_mappings.path_replace(
                                              episode['subtitles_path']),
@@ -153,27 +166,15 @@ def upgrade_episodes_subtitles(job_id=None):
     jobs_queue.update_job_name(job_id=job_id, new_job_name='Tried to upgrade episodes subtitles')
 
 
-def upgrade_movies_subtitles(job_id=None):
+def upgrade_movies_subtitles(job_id=None, radarr_ids=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Trying to upgrade movies subtitles", is_progress=True)
+        jobs_queue.add_job_from_function("Trying to upgrade movies subtitles", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     movies_to_upgrade = get_upgradable_movies_subtitles()
-    movies_data = [{
-        'id': x.id,
-        'title': x.title,
-        'language': x.language,
-        'audio_language': x.audio_language,
-        'video_path': x.video_path,
-        'sceneName': x.sceneName,
-        'score': x.score,
-        'radarrId': x.radarrId,
-        'path': x.path,
-        'profileId': x.profileId,
-        'subtitles_path': x.subtitles_path,
-        'external_subtitles': [y[1] for y in ast.literal_eval(x.external_subtitles) if y[1]],
-    } for x in database.execute(
-        select(TableHistoryMovie.id,
+
+    query = select(TableHistoryMovie.id,
                TableMovies.title,
                TableHistoryMovie.language,
                TableMovies.audio_language,
@@ -184,17 +185,55 @@ def upgrade_movies_subtitles(job_id=None):
                TableHistoryMovie.subtitles_path,
                TableMovies.path,
                TableMovies.profileId,
-               TableMovies.subtitles.label('external_subtitles'))
-        .select_from(TableHistoryMovie)
-        .join(TableMovies, onclause=TableHistoryMovie.radarrId == TableMovies.radarrId))
-    .all() if _language_still_desired(x.language, x.profileId) and
-              x.video_path == x.path
-    ]
+               TableMovies.subtitles.label('external_subtitles')) \
+        .select_from(TableHistoryMovie) \
+        .join(TableMovies, onclause=TableHistoryMovie.radarrId == TableMovies.radarrId)
+
+    if radarr_ids:
+        query = query.where(TableHistoryMovie.radarrId.in_(radarr_ids))
+
+    all_rows = database.execute(query).all()
+    movies_data = []
+    for x in all_rows:
+        if not _language_still_desired(x.language, x.profileId):
+            if x.id in movies_to_upgrade:
+                logging.debug(f"Upgrade candidate {x.id} ({x.title}) dropped: language {x.language} no longer desired "
+                              f"in profile {x.profileId}")
+            continue
+        if x.video_path != x.path:
+            if x.id in movies_to_upgrade:
+                logging.debug(f"Upgrade candidate {x.id} ({x.title}) dropped: video_path mismatch "
+                              f"(history={x.video_path} != current={x.path})")
+            continue
+        movies_data.append({
+            'id': x.id,
+            'title': x.title,
+            'language': x.language,
+            'audio_language': x.audio_language,
+            'video_path': x.video_path,
+            'sceneName': x.sceneName,
+            'score': x.score,
+            'radarrId': x.radarrId,
+            'path': x.path,
+            'profileId': x.profileId,
+            'subtitles_path': x.subtitles_path,
+            'external_subtitles': [y[1] for y in ast.literal_eval(x.external_subtitles) if y[1]],
+        })
 
     for item in movies_data:
         # do not consider subtitles that do not exist on disk anymore
         if item['subtitles_path'] not in item['external_subtitles']:
-            continue
+            # try to find a current subtitle for the same language (file may have been renamed/re-downloaded)
+            current_sub = _find_current_subtitle_for_language(item['language'], item['external_subtitles'])
+            if current_sub:
+                logging.debug(f"Upgrade candidate {item['id']} ({item['title']}): history path no longer on disk, "
+                              f"using current subtitle for same language ({current_sub})")
+                item['subtitles_path'] = current_sub
+            else:
+                if item['id'] in movies_to_upgrade:
+                    logging.debug(f"Upgrade candidate {item['id']} ({item['title']}) dropped: no subtitle for language "
+                                  f"{item['language']} found on disk")
+                continue
 
         # Mark upgradable and get original_id
         item.update({'original_id': movies_to_upgrade.get(item['id'])})
@@ -239,7 +278,7 @@ def upgrade_movies_subtitles(job_id=None):
                                          movie['title'],
                                          'movie',
                                          movie['profileId'],
-                                         forced_minimum_score=int(movie['score']) + 1,
+                                         forced_minimum_score=int(movie['score'] or 0) + 1,
                                          is_upgrade=True,
                                          previous_subtitles_to_delete=path_mappings.path_replace_movie(
                                              movie['subtitles_path']),
@@ -269,6 +308,33 @@ def get_queries_condition_parameters():
     return [minimum_timestamp, query_actions]
 
 
+def _find_current_subtitle_for_language(language_string, external_subtitles):
+    """Find a current subtitle file on disk that matches the language from history.
+
+    When a subtitle was re-downloaded or renamed (e.g. .hu.hi.srt -> .hu.srt),
+    the history still references the old path. This finds the current file for
+    the same language so upgrades can still proceed.
+    """
+    lang_code = language_string.split(':')[0]
+    is_hi = language_string.endswith(':hi')
+    is_forced = language_string.endswith(':forced')
+
+    for sub_path in external_subtitles:
+        sub_lower = sub_path.lower()
+        # Check if language code is in the filename
+        if f'.{lang_code.lower()}.' not in sub_lower and not sub_lower.endswith(f'.{lang_code.lower()}'):
+            continue
+        # Match HI/forced flags
+        has_hi = '.hi.' in sub_lower or sub_lower.endswith('.hi.srt')
+        has_forced = '.forced.' in sub_lower or sub_lower.endswith('.forced.srt')
+        if is_hi == has_hi and is_forced == has_forced:
+            return sub_path
+        # If we wanted HI but only non-HI exists (or vice versa), still a candidate
+        if not is_forced and not has_forced and lang_code.lower() in sub_lower:
+            return sub_path
+    return None
+
+
 def parse_language_string(language_string):
     if language_string.endswith('forced'):
         language = language_string.split(':')[0]
@@ -307,7 +373,7 @@ def get_upgradable_episode_subtitles(history_id_list=None):
     upgradable_episodes_conditions = [(TableHistory.action.in_(query_actions)),
                                       (TableHistory.timestamp > minimum_timestamp),
                                       or_(and_(TableHistory.score.is_(None), TableHistory.action == 6),
-                                      (TableHistory.score < 357))]
+                                      (TableHistory.score < TableHistory.score_out_of - 3))]
     upgradable_episodes_conditions += get_exclusion_clause('series')
     subtitles_to_upgrade = database.execute(
         select(TableHistory.id,
@@ -374,7 +440,7 @@ def get_upgradable_movies_subtitles(history_id_list=None):
     upgradable_movies_conditions = [(TableHistoryMovie.action.in_(query_actions)),
                                     (TableHistoryMovie.timestamp > minimum_timestamp),
                                     or_(and_(TableHistoryMovie.score.is_(None), TableHistoryMovie.action == 6),
-                                    (TableHistoryMovie.score < 117))]
+                                    (TableHistoryMovie.score < TableHistoryMovie.score_out_of - 3))]
     upgradable_movies_conditions += get_exclusion_clause('movie')
     subtitles_to_upgrade = database.execute(
         select(TableHistoryMovie.id,
diff --git a/bazarr/subtitles/upload.py b/bazarr/subtitles/upload.py
index 433bfe4e60..aa2f71ced5 100644
--- a/bazarr/subtitles/upload.py
+++ b/bazarr/subtitles/upload.py
@@ -8,6 +8,7 @@
 from subzero.language import Language
 from subliminal_patch.core import save_subtitles
 from subliminal_patch.subtitle import Subtitle
+from subliminal_patch.score import MAX_SCORES
 from pysubs2.formats import get_format_identifier
 
 from languages.get_languages import language_from_alpha3, alpha2_from_alpha3, alpha3_from_alpha2
@@ -197,14 +198,13 @@ def manual_upload_subtitle(path, language, forced, hi, media_type, subtitle, fil
             result = result[0]
         provider = "manual"
         if media_type == 'series':
-            score = 360
-            history_log(4, sonarrSeriesId, sonarrEpisodeId, result, fake_provider=provider, fake_score=score)
+            history_log(4, sonarrSeriesId, sonarrEpisodeId, result, fake_provider=provider,
+                        fake_score=MAX_SCORES['episode'])
             if not settings.general.dont_notify_manual_actions:
                 send_notifications(sonarrSeriesId, sonarrEpisodeId, result.message)
             store_subtitles(result.path, path)
         else:
-            score = 120
-            history_log_movie(4, radarrId, result, fake_provider=provider, fake_score=score)
+            history_log_movie(4, radarrId, result, fake_provider=provider, fake_score=MAX_SCORES['movie'])
             if not settings.general.dont_notify_manual_actions:
                 send_notifications_movie(radarrId, result.message)
             store_subtitles_movie(result.path, path)
diff --git a/bazarr/subtitles/utils.py b/bazarr/subtitles/utils.py
index 585c264db9..b2da03e09e 100644
--- a/bazarr/subtitles/utils.py
+++ b/bazarr/subtitles/utils.py
@@ -8,11 +8,11 @@
 from subzero.language import Language
 from subzero.video import parse_video
 from guessit.jsonutils import GuessitEncoder
+from subliminal_patch.score import MAX_SCORES, DEFAULT_SCORES
 
 from app.config import settings
 from languages.custom_lang import CustomLanguage
 from app.database import get_profiles_list
-from subtitles.tools.score import movie_score, series_score
 
 from .refiners import registered as registered_refiners
 
@@ -72,11 +72,19 @@ def _get_lang_obj(alpha3):
 
 def _get_scores(media_type, min_movie=None, min_ep=None):
     series = "series" == media_type
-    handler = series_score if series else movie_score
-    min_movie = min_movie or (60 * 100 / handler.max_score)
-    min_ep = min_ep or (240 * 100 / handler.max_score)
-    min_score_ = int(min_ep if series else min_movie)
-    return handler.get_scores(min_score_)
+    handler = DEFAULT_SCORES['episode'] if series else DEFAULT_SCORES['movie']
+
+    max_score = MAX_SCORES['episode' if series else 'movie']
+
+    min_movie = min_movie or (max_score / 2)
+    min_ep = min_ep or (2/3 * max_score)
+    min_score = int(min_ep if series else min_movie)
+
+    return (
+        max_score * min_score / 100,
+        max_score,
+        handler.keys(),
+    )
 
 
 def get_ban_list(profile_id):
diff --git a/bazarr/subtitles/wanted/movies.py b/bazarr/subtitles/wanted/movies.py
index b00e87aa55..b41e538be4 100644
--- a/bazarr/subtitles/wanted/movies.py
+++ b/bazarr/subtitles/wanted/movies.py
@@ -97,9 +97,10 @@ def wanted_download_subtitles_movie(radarr_id, job_id=None):
         logging.info("BAZARR All providers are throttled")
 
 
-def wanted_search_missing_subtitles_movies(job_id=None):
+def wanted_search_missing_subtitles_movies(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Searching for missing movies subtitles", is_progress=True)
+        jobs_queue.add_job_from_function("Searching for missing movies subtitles", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     conditions = [(TableMovies.missing_subtitles.is_not(None)),
@@ -119,6 +120,7 @@ def wanted_search_missing_subtitles_movies(job_id=None):
     if count_movies == 0:
         jobs_queue.update_job_progress(job_id=job_id, progress_value='max')
 
+    throttled = False
     for i, movie in enumerate(movies, start=1):
         jobs_queue.update_job_progress(job_id=job_id, progress_value=i, progress_message=movie.title)
 
@@ -130,7 +132,11 @@ def wanted_search_missing_subtitles_movies(job_id=None):
             jobs_queue.update_job_progress(job_id=job_id, progress_value=i, progress_max=count_movies)
         else:
             logging.info("BAZARR All providers are throttled")
+            throttled = True
             break
 
+    outcome_msg = ("All providers throttled" if throttled
+                   else "Search completed")
+    jobs_queue.update_job_progress(job_id=job_id, progress_message=outcome_msg)
     jobs_queue.update_job_name(job_id=job_id, new_job_name="Searched for missing movies subtitles")
     logging.info('BAZARR Finished searching for missing Movies Subtitles. Check History for more information.')
diff --git a/bazarr/subtitles/wanted/series.py b/bazarr/subtitles/wanted/series.py
index d6deafdad8..359678cf1e 100644
--- a/bazarr/subtitles/wanted/series.py
+++ b/bazarr/subtitles/wanted/series.py
@@ -4,6 +4,7 @@
 import ast
 import logging
 import operator
+import gc
 
 from functools import reduce
 
@@ -102,9 +103,10 @@ def wanted_download_subtitles(sonarr_episode_id, job_id=None):
         logging.info("BAZARR All providers are throttled")
 
 
-def wanted_search_missing_subtitles_series(job_id=None):
+def wanted_search_missing_subtitles_series(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Searching for missing series subtitles", is_progress=True)
+        jobs_queue.add_job_from_function("Searching for missing series subtitles", is_progress=True,
+                                         wait_for_completion=wait_for_completion)
         return
 
     conditions = [(TableEpisodes.missing_subtitles.is_not(None)),
@@ -131,6 +133,7 @@ def wanted_search_missing_subtitles_series(job_id=None):
     if count_episodes == 0:
         jobs_queue.update_job_progress(job_id=job_id, progress_value='max')
 
+    throttled = False
     for i, episode in enumerate(episodes, start=1):
         jobs_queue.update_job_progress(job_id=job_id, progress_value=i,
                                        progress_message=f'{episode.title} - S{episode.season:02d}E{episode.episode:02d}'
@@ -144,7 +147,13 @@ def wanted_search_missing_subtitles_series(job_id=None):
             jobs_queue.update_job_progress(job_id=job_id, progress_value=i, progress_max=count_episodes)
         else:
             logging.info("BAZARR All providers are throttled")
+            throttled = True
             break
 
+    outcome_msg = ("All providers throttled" if throttled
+                   else "Search completed")
+    jobs_queue.update_job_progress(job_id=job_id, progress_message=outcome_msg)
     jobs_queue.update_job_name(job_id=job_id, new_job_name="Searched for missing series subtitles")
     logging.info('BAZARR Finished searching for missing Series Subtitles. Check History for more information.')
+
+    gc.collect()
diff --git a/bazarr/utilities/backup.py b/bazarr/utilities/backup.py
index 75368ebfbd..0ce9977286 100644
--- a/bazarr/utilities/backup.py
+++ b/bazarr/utilities/backup.py
@@ -47,9 +47,10 @@ def get_backup_files(fullpath=True):
         } for x in file_list]
 
 
-def backup_to_zip(job_id=None):
+def backup_to_zip(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Backing up Database and Configuration File", is_progress=False)
+        jobs_queue.add_job_from_function("Backing up Database and Configuration File", is_progress=False,
+                                         wait_for_completion=wait_for_completion)
         return
 
     now = datetime.now()
diff --git a/bazarr/utilities/binaries.json b/bazarr/utilities/binaries.json
index 4255cd005b..6f072d410e 100644
--- a/bazarr/utilities/binaries.json
+++ b/bazarr/utilities/binaries.json
@@ -5,7 +5,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "be7a08a75ffb1dcc5f8c6b16a75e822c",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/aarch64/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/aarch64/unrar/unrar"
   },
   {
     "system": "Linux",
@@ -13,7 +13,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "07a6371cc7db8493352739ce26b19ea1",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/armv5tel/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/armv5tel/unrar/unrar"
   },
   {
     "system": "Linux",
@@ -21,7 +21,7 @@
     "directory": "ffmpeg",
     "name": "ffmpeg",
     "checksum": "43910b9df223a772402830461a80e9a1",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/i386/ffmpeg/ffmpeg"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/i386/ffmpeg/ffmpeg"
   },
   {
     "system": "Linux",
@@ -29,7 +29,7 @@
     "directory": "ffmpeg",
     "name": "ffprobe",
     "checksum": "24ccbd651630c562fbaf17e30a18ce38",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/i386/ffmpeg/ffprobe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/i386/ffmpeg/ffprobe"
   },
   {
     "system": "Linux",
@@ -37,7 +37,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "f03ae1d4abf871b95142a7248a6cfa3a",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/i386/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/i386/unrar/unrar"
   },
   {
     "system": "Linux",
@@ -45,7 +45,7 @@
     "directory": "ffmpeg",
     "name": "ffmpeg",
     "checksum": "9fd68f7b80cd1177b94a71455b288131",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/x86_64/ffmpeg/ffmpeg"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/x86_64/ffmpeg/ffmpeg"
   },
   {
     "system": "Linux",
@@ -53,7 +53,7 @@
     "directory": "ffmpeg",
     "name": "ffprobe",
     "checksum": "29fdc34d9c7ad07c8f75e83d8fb5965b",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/x86_64/ffmpeg/ffprobe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/x86_64/ffmpeg/ffprobe"
   },
   {
     "system": "Linux",
@@ -61,7 +61,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "2a63e80d50c039e1fba01de7dcfa6432",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Linux/x86_64/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Linux/x86_64/unrar/unrar"
   },
   {
     "system": "MacOSX",
@@ -69,7 +69,7 @@
     "directory": "ffmpeg",
     "name": "ffmpeg",
     "checksum": "af1723314ba5ca9c70ef35dc8b5c2260",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/i386/ffmpeg/ffmpeg"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/i386/ffmpeg/ffmpeg"
   },
   {
     "system": "MacOSX",
@@ -77,7 +77,7 @@
     "directory": "ffmpeg",
     "name": "ffprobe",
     "checksum": "d81468cebd6630450d2f5a17720b4504",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/i386/ffmpeg/ffprobe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/i386/ffmpeg/ffprobe"
   },
   {
     "system": "MacOSX",
@@ -85,7 +85,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "47de1fed0a5d4f7bac4d8f7557926398",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/i386/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/i386/unrar/unrar"
   },
   {
     "system": "MacOSX",
@@ -93,7 +93,7 @@
     "directory": "ffmpeg",
     "name": "ffmpeg",
     "checksum": "af1723314ba5ca9c70ef35dc8b5c2260",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffmpeg"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffmpeg"
   },
   {
     "system": "MacOSX",
@@ -101,7 +101,7 @@
     "directory": "ffmpeg",
     "name": "ffprobe",
     "checksum": "d81468cebd6630450d2f5a17720b4504",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffprobe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffprobe"
   },
   {
     "system": "MacOSX",
@@ -109,7 +109,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "8d5b3d5d6be2c14b74b02767430ade9c",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/x86_64/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/x86_64/unrar/unrar"
   },
   {
     "system": "MacOSX",
@@ -117,7 +117,7 @@
     "directory": "ffmpeg",
     "name": "ffmpeg",
     "checksum": "af1723314ba5ca9c70ef35dc8b5c2260",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffmpeg"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffmpeg"
   },
   {
     "system": "MacOSX",
@@ -125,7 +125,7 @@
     "directory": "ffmpeg",
     "name": "ffprobe",
     "checksum": "d81468cebd6630450d2f5a17720b4504",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffprobe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/x86_64/ffmpeg/ffprobe"
   },
   {
     "system": "MacOSX",
@@ -133,7 +133,7 @@
     "directory": "unrar",
     "name": "unrar",
     "checksum": "8d5b3d5d6be2c14b74b02767430ade9c",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/MacOSX/x86_64/unrar/unrar"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/MacOSX/x86_64/unrar/unrar"
   },
   {
     "system": "Windows",
@@ -141,7 +141,7 @@
     "directory": "ffmpeg",
     "name": "ffmpeg.exe",
     "checksum": "43f89a5172c377e05ebb4c26a498a366",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Windows/i386/ffmpeg/ffmpeg.exe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Windows/i386/ffmpeg/ffmpeg.exe"
   },
   {
     "system": "Windows",
@@ -149,7 +149,7 @@
     "directory": "ffmpeg",
     "name": "ffprobe.exe",
     "checksum": "a0d88aa85624070a8ab65ed99c214bea",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Windows/i386/ffmpeg/ffprobe.exe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Windows/i386/ffmpeg/ffprobe.exe"
   },
   {
     "system": "Windows",
@@ -157,6 +157,6 @@
     "directory": "unrar",
     "name": "unrar.exe",
     "checksum": "4611a5b3f70a8d6c40776e0bfa3b3f36",
-    "url": "https://github.com/morpheus65535/bazarr-binaries/raw/master/bin/Windows/i386/unrar/UnRAR.exe"
+    "url": "https://github.com/LavX/bazarr-binaries/raw/master/bin/Windows/i386/unrar/UnRAR.exe"
   }
 ]
diff --git a/bazarr/utilities/cache.py b/bazarr/utilities/cache.py
index a43d536277..02e86fe191 100644
--- a/bazarr/utilities/cache.py
+++ b/bazarr/utilities/cache.py
@@ -11,9 +11,10 @@
 from app.jobs_queue import jobs_queue
 
 
-def cache_maintenance(job_id=None):
+def cache_maintenance(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Performing Cache Maintenance", is_progress=False)
+        jobs_queue.add_job_from_function("Performing Cache Maintenance", is_progress=False,
+                                         wait_for_completion=wait_for_completion)
         return
 
     main_cache_validity = 14  # days
diff --git a/bazarr/utilities/filesystem.py b/bazarr/utilities/filesystem.py
index fea29917a3..0fa919fa43 100644
--- a/bazarr/utilities/filesystem.py
+++ b/bazarr/utilities/filesystem.py
@@ -1,8 +1,27 @@
 # coding=utf-8
 
 import os
+import logging
 import string
 
+# System directories that should not be browsable (Linux/macOS)
+# Note: /run is NOT blocked because /run/media is used for automounted
+# removable media on many Linux distributions (GNOME, KDE, etc.)
+_BLOCKED_PATHS = {
+    '/proc', '/sys', '/dev', '/snap',
+    '/boot', '/lost+found', '/swapfile',
+    '/etc', '/root', '/tmp',
+}
+
+
+def _is_path_blocked(path):
+    """Check if a path falls within a blocked system directory."""
+    real = os.path.realpath(path)
+    for blocked in _BLOCKED_PATHS:
+        if real == blocked or real.startswith(blocked + os.sep):
+            return True
+    return False
+
 
 def browse_bazarr_filesystem(path='#'):
     if path == '#' or path == '/' or path == '':
@@ -16,11 +35,16 @@ def browse_bazarr_filesystem(path='#'):
             path = "/"
             dir_list = [f for f in os.listdir(path) if os.path.isdir(os.path.join(path, f))]
     else:
+        if _is_path_blocked(path):
+            logging.warning(f'Filesystem browse blocked for restricted path: {path}')
+            return {'directories': [], 'parent': os.path.dirname(path)}
         dir_list = [f for f in os.listdir(path) if os.path.isdir(os.path.join(path, f))]
 
     data = []
     for item in dir_list:
         full_path = os.path.join(path, item, '')
+        if _is_path_blocked(full_path):
+            continue
         item = {
             "name": item,
             "path": full_path
diff --git a/bazarr/utilities/health.py b/bazarr/utilities/health.py
index 003414699f..019beda35a 100644
--- a/bazarr/utilities/health.py
+++ b/bazarr/utilities/health.py
@@ -14,9 +14,9 @@
 from radarr.rootfolder import check_radarr_rootfolder
 
 
-def check_health(job_id=None):
+def check_health(job_id=None, wait_for_completion=False):
     if not job_id:
-        jobs_queue.add_job_from_function("Checking Health", is_progress=False)
+        jobs_queue.add_job_from_function("Checking Health", is_progress=False, wait_for_completion=wait_for_completion)
         return
 
     if settings.general.use_sonarr:
diff --git a/bazarr/utilities/helper.py b/bazarr/utilities/helper.py
index e8378bd847..cda9d05eff 100644
--- a/bazarr/utilities/helper.py
+++ b/bazarr/utilities/helper.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 
 import os
+import hmac
 import logging
 import hashlib
 
@@ -10,13 +11,58 @@
 from app.config import settings
 
 
+PBKDF2_ITERATIONS = 600_000
+
+
+def hash_password(pw):
+    salt = os.urandom(16)
+    hashed = hashlib.pbkdf2_hmac('sha256', f"{pw}".encode('utf-8'), salt, PBKDF2_ITERATIONS)
+    return 'pbkdf2:' + salt.hex() + ':' + hashed.hex()
+
+
+def _is_legacy_md5(stored_hash):
+    return not stored_hash.startswith('pbkdf2:')
+
+
+def _verify_password(pw, stored_hash):
+    if stored_hash.startswith('pbkdf2:'):
+        try:
+            _, salt_hex, hash_hex = stored_hash.split(':', 2)
+            salt = bytes.fromhex(salt_hex)
+            expected = bytes.fromhex(hash_hex)
+        except (ValueError, TypeError):
+            logging.error('Corrupted PBKDF2 password hash in config. Re-set your password in settings.')
+            return False
+        actual = hashlib.pbkdf2_hmac('sha256', f"{pw}".encode('utf-8'), salt, PBKDF2_ITERATIONS)
+        return hmac.compare_digest(actual, expected)
+    else:
+        return hmac.compare_digest(
+            hashlib.md5(f"{pw}".encode('utf-8')).hexdigest(),
+            stored_hash
+        )
+
+
+def upgrade_password_hash(pw):
+    new_hash = hash_password(pw)
+    old_hash = settings.auth.password
+    settings.auth.password = new_hash
+    try:
+        from app.config import write_config
+        write_config()
+        logging.info('Upgraded password hash from MD5 to PBKDF2-SHA256')
+    except Exception:
+        settings.auth.password = old_hash
+        logging.exception('Failed to persist password hash upgrade, reverted to previous hash')
+        raise
+
+
 def check_credentials(user, pw, request, log_success=True):
     forwarded_for_ip_addr = request.environ.get('HTTP_X_FORWARDED_FOR')
     real_ip_addr = request.environ.get('HTTP_X_REAL_IP')
     ip_addr = forwarded_for_ip_addr or real_ip_addr or request.remote_addr
     username = settings.auth.username
     password = settings.auth.password
-    if hashlib.md5(f"{pw}".encode('utf-8')).hexdigest() == password and user == username:
+    if user == username and _verify_password(pw, password):
         if log_success:
             logging.info(f'Successful authentication from {ip_addr} for user {user}')
         return True
@@ -25,6 +71,11 @@ def check_credentials(user, pw, request, log_success=True):
         return False
 
 
+def needs_password_upgrade():
+    password = settings.auth.password
+    return bool(password) and _is_legacy_md5(password)
+
+
 def get_subtitle_destination_folder():
     fld_custom = str(settings.general.subfolder_custom).strip() if (settings.general.subfolder_custom and
                                                                     settings.general.subfolder != 'current') else None
diff --git a/bazarr/utilities/plex_utils.py b/bazarr/utilities/plex_utils.py
index 487ca28440..1ea147be89 100644
--- a/bazarr/utilities/plex_utils.py
+++ b/bazarr/utilities/plex_utils.py
@@ -2,7 +2,7 @@
 
 import logging
 import requests
-from app.config import settings
+from app.config import settings, get_ssl_verify
 
 
 def get_plex_libraries_with_paths():
@@ -30,7 +30,7 @@ def get_plex_libraries_with_paths():
             f"{server_url}/library/sections",
             headers={'X-Plex-Token': decrypted_token, 'Accept': 'application/json'},
             timeout=5,
-            verify=False
+            verify=get_ssl_verify('plex')
         )
         
         if response.status_code != 200:
@@ -73,7 +73,7 @@ def _get_library_locations(server_url, section_key, token):
             f"{server_url}/library/sections/{section_key}",
             headers={'X-Plex-Token': token, 'Accept': 'application/json'},
             timeout=5,
-            verify=False
+            verify=get_ssl_verify('plex')
         )
         
         if response.status_code == 200:
diff --git a/bazarr/utilities/post_processing.py b/bazarr/utilities/post_processing.py
index d68ac9de73..094d8cb034 100644
--- a/bazarr/utilities/post_processing.py
+++ b/bazarr/utilities/post_processing.py
@@ -3,43 +3,51 @@
 import os
 import re
 import sys
+import shlex
+import subprocess
 import logging
 
 from app.config import settings
 
 
-# Wraps the input string within quotes & escapes the string
 def _escape(in_str):
-    raw_map = {8: r'\\b', 7: r'\\a', 12: r'\\f', 10: r'\\n', 13: r'\\r', 9: r'\\t', 11: r'\\v', 34: r'\"', 92: r'\\'}
-    raw_str = r''.join(raw_map.get(ord(i), i) for i in in_str)
-    return f"\"{raw_str}\""
+    s = str(in_str) if in_str is not None else ''
+    if os.name == 'nt':
+        # cmd.exe: use subprocess.list2cmdline for proper Windows quoting
+        return subprocess.list2cmdline([s])
+    return shlex.quote(s)
+
+
+def _pp_sub(pattern, value, command):
+    """Substitute a placeholder, escaping backslashes for re.sub replacement."""
+    escaped = _escape(value)
+    return re.sub(pattern, lambda _: escaped, command)
 
 
 def pp_replace(pp_command, episode, subtitles, language, language_code2, language_code3, episode_language,
                episode_language_code2, episode_language_code3, score, subtitle_id, provider, uploader,
                release_info, series_id, episode_id):
-    pp_command = re.sub(r'[\'"]?{{directory}}[\'"]?', _escape(os.path.dirname(episode)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{episode}}[\'"]?', _escape(episode), pp_command)
-    pp_command = re.sub(r'[\'"]?{{episode_name}}[\'"]?', _escape(os.path.splitext(os.path.basename(episode))[0]),
-                        pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitles}}[\'"]?', _escape(str(subtitles)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitles_language}}[\'"]?',  _escape(str(language)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitles_language_code2}}[\'"]?', _escape(str(language_code2)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitles_language_code3}}[\'"]?', _escape(str(language_code3)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitles_language_code2_dot}}[\'"]?',
-                        _escape(str(language_code2).replace(':', '.')), pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitles_language_code3_dot}}[\'"]?',
-                        _escape(str(language_code3).replace(':', '.')), pp_command)
-    pp_command = re.sub(r'[\'"]?{{episode_language}}[\'"]?', _escape(str(episode_language)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{episode_language_code2}}[\'"]?', _escape(str(episode_language_code2)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{episode_language_code3}}[\'"]?', _escape(str(episode_language_code3)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{score}}[\'"]?', _escape(str(score)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{subtitle_id}}[\'"]?', _escape(str(subtitle_id)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{provider}}[\'"]?', _escape(str(provider)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{uploader}}[\'"]?', _escape(str(uploader)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{release_info}}[\'"]?', _escape(str(release_info)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{series_id}}[\'"]?', _escape(str(series_id)), pp_command)
-    pp_command = re.sub(r'[\'"]?{{episode_id}}[\'"]?', _escape(str(episode_id)), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{directory}}[\'"]?', os.path.dirname(episode), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{episode}}[\'"]?', episode, pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{episode_name}}[\'"]?', os.path.splitext(os.path.basename(episode))[0], pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitles}}[\'"]?', str(subtitles), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitles_language}}[\'"]?', str(language), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitles_language_code2}}[\'"]?', str(language_code2), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitles_language_code3}}[\'"]?', str(language_code3), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitles_language_code2_dot}}[\'"]?',
+                         str(language_code2).replace(':', '.'), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitles_language_code3_dot}}[\'"]?',
+                         str(language_code3).replace(':', '.'), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{episode_language}}[\'"]?', str(episode_language), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{episode_language_code2}}[\'"]?', str(episode_language_code2), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{episode_language_code3}}[\'"]?', str(episode_language_code3), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{score}}[\'"]?', str(score), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{subtitle_id}}[\'"]?', str(subtitle_id), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{provider}}[\'"]?', str(provider), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{uploader}}[\'"]?', str(uploader), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{release_info}}[\'"]?', str(release_info), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{series_id}}[\'"]?', str(series_id), pp_command)
+    pp_command = _pp_sub(r'[\'"]?{{episode_id}}[\'"]?', str(episode_id), pp_command)
     return pp_command
 
 
diff --git a/custom_libs/subliminal/extensions.py b/custom_libs/subliminal/extensions.py
index 61843ed410..f3b630b359 100644
--- a/custom_libs/subliminal/extensions.py
+++ b/custom_libs/subliminal/extensions.py
@@ -64,7 +64,7 @@ def register(self, entry_point):
         if ep.name in self.names():
             raise ValueError('An extension with the same name already exist')
 
-        ext = self._load_one_plugin(ep, False, (), {}, False)
+        ext = self._load_one_plugin(ep, False, (), {})
         self.extensions.append(ext)
         if self._extensions_by_name is not None:
             self._extensions_by_name[ext.name] = ext
diff --git a/custom_libs/subliminal_patch/core.py b/custom_libs/subliminal_patch/core.py
index 6ea2c1bbc7..3d57c2bf5a 100644
--- a/custom_libs/subliminal_patch/core.py
+++ b/custom_libs/subliminal_patch/core.py
@@ -23,8 +23,8 @@
 from concurrent.futures import as_completed
 
 from .extensions import provider_registry
-from .exceptions import MustGetBlacklisted
-from .score import compute_score as default_compute_score
+from .exceptions import APIThrottled, MustGetBlacklisted
+from .score import compute_score, MAX_SCORES
 from subliminal.utils import hash_napiprojekt, hash_opensubtitles, hash_shooter, hash_thesubdb
 from subliminal.video import VIDEO_EXTENSIONS, Video, Episode, Movie
 from subliminal.core import guessit, ProviderPool, io, is_windows_special_path, \
@@ -238,6 +238,8 @@ def __init__(self, providers=None, provider_configs=None, blacklist=None, ban_li
 
         self._born = time.time()
 
+        self.provider_progress_callback = None
+
         if not self.throttle_callback:
             self.throttle_callback = lambda x, y, ids=None, language=None: x
 
@@ -376,6 +378,9 @@ def list_subtitles_provider(self, provider, video, languages):
 
         logger.info('Listing subtitles with provider %r and languages %r', provider, to_request)
 
+        if self.provider_progress_callback:
+            self.provider_progress_callback(provider)
+
         try:
             results = self[provider].list_subtitles(video, to_request)
             seen = []
@@ -412,6 +417,15 @@ def list_subtitles_provider(self, provider, video, languages):
 
             return out
 
+        except APIThrottled as e:
+            ids = {
+                'radarrId': video.radarrId if hasattr(video, 'radarrId') else None,
+                'sonarrSeriesId': video.sonarrSeriesId if hasattr(video, 'sonarrSeriesId') else None,
+                'sonarrEpisodeId': video.sonarrEpisodeId if hasattr(video, 'sonarrEpisodeId') else None,
+            }
+            logger.warning('Provider %r throttled: %s', provider, e)
+            self.throttle_callback(provider, e, ids=ids, language=list(languages)[0] if len(languages) else None)
+
         except Exception as e:
             ids = {
                 'radarrId': video.radarrId if hasattr(video, 'radarrId') else None,
@@ -598,7 +612,7 @@ def download_subtitle(self, subtitle):
         return True
 
     def download_best_subtitles(self, subtitles, video, languages, min_score=0, hearing_impaired=False, only_one=False,
-                                compute_score=None, use_original_format=False):
+                                use_original_format=False):
         """Download the best matching subtitles.
 
         patch:
@@ -615,18 +629,15 @@ def download_best_subtitles(self, subtitles, video, languages, min_score=0, hear
         :param int min_score: minimum score for a subtitle to be downloaded.
         :param bool hearing_impaired: hearing impaired preference.
         :param bool only_one: download only one subtitle, not one per language.
-        :param compute_score: function that takes `subtitle` and `video` as positional arguments,
-            `hearing_impaired` as keyword argument and returns the score.
         :param bool use_original_format: preserve original subtitles format
         :return: downloaded subtitles.
         :rtype: list of :class:`~subliminal.subtitle.Subtitle`
 
         """
-        compute_score = compute_score or default_compute_score
         use_hearing_impaired = hearing_impaired in ("prefer", "force HI")
 
         is_episode = isinstance(video, Episode)
-        max_score = sum(val for key, val in compute_score._scores['episode' if is_episode else 'movie'].items() if key != "hash")
+        max_score = MAX_SCORES['episode' if is_episode else 'movie']
 
         # sort subtitles by score
         unsorted_subtitles = []
@@ -638,7 +649,9 @@ def download_best_subtitles(self, subtitles, video, languages, min_score=0, hear
                 continue
 
             try:
-                matches = s.get_matches(video)
+                matches = s.matches if hasattr(s, 'matches') and isinstance(s.matches, set) and len(s.matches) \
+                        else s.get_matches(video)
+
             except AttributeError:
                 logger.error("%r: Match computation failed: %s", s, traceback.format_exc())
                 continue
@@ -1159,7 +1172,7 @@ def download_subtitles(subtitles, pool_class=ProviderPool, **kwargs):
             pool.download_subtitle(subtitle)
 
 
-def download_best_subtitles(videos, languages, min_score=0, hearing_impaired=False, only_one=False, compute_score=None,
+def download_best_subtitles(videos, languages, min_score=0, hearing_impaired=False, only_one=False,
                             pool_class=ProviderPool, throttle_time=0, **kwargs):
     r"""List and download the best matching subtitles.
 
@@ -1172,8 +1185,6 @@ def download_best_subtitles(videos, languages, min_score=0, hearing_impaired=Fal
     :param int min_score: minimum score for a subtitle to be downloaded.
     :param bool hearing_impaired: hearing impaired preference.
     :param bool only_one: download only one subtitle, not one per language.
-    :param compute_score: function that takes `subtitle` and `video` as positional arguments,
-        `hearing_impaired` as keyword argument and returns the score.
     :param pool_class: class to use as provider pool.
     :type pool_class: :class:`ProviderPool`, :class:`AsyncProviderPool` or similar
     :param \*\*kwargs: additional parameters for the provided `pool_class` constructor.
diff --git a/custom_libs/subliminal_patch/core_persistent.py b/custom_libs/subliminal_patch/core_persistent.py
index 84568d58fa..888d65f420 100644
--- a/custom_libs/subliminal_patch/core_persistent.py
+++ b/custom_libs/subliminal_patch/core_persistent.py
@@ -49,8 +49,8 @@ def download_best_subtitles(
     min_score=0,
     hearing_impaired=False,
     only_one=False,
-    compute_score=None,
     use_original_format=False,
+    use_provider_priority=True,
     **kwargs
 ):
     downloaded_subtitles = defaultdict(list)
@@ -70,14 +70,17 @@ def download_best_subtitles(
     # download best subtitles
     for video in checked_videos:
         logger.info("Downloading best subtitles for %r", video)
+        if use_provider_priority:
+            listed = pool_instance.list_subtitles_prioritized(video, languages - video.subtitle_languages, min_score=min_score)
+        else:
+            listed = pool_instance.list_subtitles(video, languages - video.subtitle_languages)
         subtitles = pool_instance.download_best_subtitles(
-            pool_instance.list_subtitles_prioritized(video, languages - video.subtitle_languages, min_score=min_score),
+            listed,
             video,
             languages,
             min_score=min_score,
             hearing_impaired=hearing_impaired,
             only_one=only_one,
-            compute_score=compute_score,
             use_original_format=use_original_format,
         )
         logger.info("Downloaded %d subtitle(s)", len(subtitles))
diff --git a/custom_libs/subliminal_patch/exceptions.py b/custom_libs/subliminal_patch/exceptions.py
index e5857beef5..0714f23080 100644
--- a/custom_libs/subliminal_patch/exceptions.py
+++ b/custom_libs/subliminal_patch/exceptions.py
@@ -10,7 +10,9 @@ class TooManyRequests(ProviderError):
 
 
 class APIThrottled(ProviderError):
-    pass
+    def __init__(self, *args, retry_after=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.retry_after = retry_after
 
 
 class ForbiddenError(ProviderError):
diff --git a/custom_libs/subliminal_patch/providers/legendasnet.py b/custom_libs/subliminal_patch/providers/legendasnet.py
index 2bda948354..bc1a2ddf66 100644
--- a/custom_libs/subliminal_patch/providers/legendasnet.py
+++ b/custom_libs/subliminal_patch/providers/legendasnet.py
@@ -107,9 +107,19 @@ def login(self):
             "password": self.password
         })
 
-        response = self.session.request("POST", self.server_url() + 'login', data=payload, headers=headersList)
-        if response.status_code != 200:
-            raise ConfigurationError('Failed to login and retrieve access token')
+        response = self.retry(
+            lambda: self.session.request("POST", self.server_url() + 'login', data=payload, headers=headersList, timeout=30),
+            amount=retry_amount,
+            retry_timeout=retry_timeout
+        )
+
+        if response.status_code == 429:
+            raise APIThrottled('Too many requests')
+        elif response.status_code in (401, 403):
+            raise ConfigurationError('Invalid username or password')
+        elif response.status_code != 200:
+            response.raise_for_status()
+
         self.access_token = response.json().get('access_token')
         if not self.access_token:
             raise ConfigurationError('Access token not found in login response')
@@ -164,7 +174,7 @@ def query(self, languages, video):
             raise ProviderError("Endpoint not found")
         elif res.status_code == 429:
             raise APIThrottled("Too many requests")
-        elif res.status_code == 403:
+        elif res.status_code in (401, 403):
             raise ConfigurationError("Invalid access token")
         elif res.status_code != 200:
             res.raise_for_status()
@@ -241,7 +251,7 @@ def download_subtitle(self, subtitle):
 
         if r.status_code == 429:
             raise DownloadLimitExceeded("Daily download limit exceeded")
-        elif r.status_code == 403:
+        elif r.status_code in (401, 403):
             raise ConfigurationError("Invalid access token")
         elif r.status_code != 200:
             r.raise_for_status()
diff --git a/custom_libs/subliminal_patch/providers/opensubtitles.py b/custom_libs/subliminal_patch/providers/opensubtitles.py
index 7fa42577cf..01af0fcac8 100644
--- a/custom_libs/subliminal_patch/providers/opensubtitles.py
+++ b/custom_libs/subliminal_patch/providers/opensubtitles.py
@@ -114,11 +114,17 @@ def id(self):
 
     @property
     def series_name(self):
-        return self.series_re.match(self.movie_name).group('series_name')
+        match = self.series_re.match(self.movie_name)
+        if match:
+            return match.group('series_name')
+        return self.movie_name
 
     @property
     def series_title(self):
-        return self.series_re.match(self.movie_name).group('series_title')
+        match = self.series_re.match(self.movie_name)
+        if match:
+            return match.group('series_title')
+        return self.movie_name
 
     def get_matches(self, video):
         matches = set()
@@ -132,7 +138,7 @@ def get_matches(self, video):
             if video.series and sanitize(self.series_name) == sanitize(video.series):
                 matches.add('series')
             # year
-            if video.original_series and self.movie_year is None or video.year and video.year == self.movie_year:
+            if (video.original_series and self.movie_year is None) or (video.year and video.year == self.movie_year):
                 matches.add('year')
             # season
             if video.season and self.series_season == video.season:
@@ -224,7 +230,7 @@ def __init__(self, language, hearing_impaired, page_link, subtitle_id, matched_b
     def get_fps(self):
         try:
             return float(self.fps)
-        except:
+        except (ValueError, TypeError):
             return None
 
     def get_matches(self, video, hearing_impaired=False):
@@ -250,7 +256,7 @@ def get_matches(self, video, hearing_impaired=False):
         sub_fps = None
         try:
             sub_fps = float(self.fps)
-        except ValueError:
+        except (ValueError, TypeError):
             pass
 
         # video has fps info, sub also, and sub's fps is greater than 0
@@ -397,8 +403,18 @@ def use_token_or_login(self, func):
 
     def initialize(self):
         if self.use_web_scraper:
-            # Skip authentication for scraper mode
-            logger.debug("Web scraper mode - skipping authentication")
+            # Verify scraper service is reachable before searching
+            try:
+                base_url = self.scraper_service_url.rstrip('/')
+                if not base_url.startswith(('http://', 'https://')):
+                    base_url = f'http://{base_url}'
+                resp = requests.get(f'{base_url}/health', timeout=5)
+                resp.raise_for_status()
+                logger.info("Scraper service at %s is healthy", self.scraper_service_url)
+            except Exception as e:
+                raise ServiceUnavailable(
+                    f'OpenSubtitles scraper at {self.scraper_service_url} is not reachable: {e}'
+                )
             self.server = None
             self.token = None
             return
@@ -610,7 +626,7 @@ def checked(fn, raise_api_limit=False):
                 status_code = 506
         else:
             status_code = int(response['status'][:3])
-    except:
+    except Exception:
         status_code = None
 
     if status_code == 401:
diff --git a/custom_libs/subliminal_patch/providers/opensubtitles_scraper.py b/custom_libs/subliminal_patch/providers/opensubtitles_scraper.py
index 75677ed69a..dfe849e074 100644
--- a/custom_libs/subliminal_patch/providers/opensubtitles_scraper.py
+++ b/custom_libs/subliminal_patch/providers/opensubtitles_scraper.py
@@ -1,167 +1,224 @@
 # coding=utf-8
 """
-OpenSubtitles Web Scraper Implementation
+OpenSubtitles Web Scraper Integration (v1 API)
 
-This module provides HTTP-based communication with OpenSubtitles scraper services,
-bypassing the need for traditional API authentication.
+Uses the scraper service's REST API directly instead of the legacy
+compatibility endpoint, passing all available metadata for best results.
 """
 
 import base64
 import logging
 import requests
-import json
+from subliminal.video import Episode
 from subzero.language import Language
-from subliminal.exceptions import ServiceUnavailable, ConfigurationError
+from subliminal.exceptions import ServiceUnavailable
 from subliminal_patch.exceptions import APIThrottled
 
 logger = logging.getLogger(__name__)
 
+# Map opensubtitles 3-letter codes to 2-letter codes for the scraper
+_LANG_3_TO_2 = {
+    'eng': 'en', 'hun': 'hu', 'spa': 'es', 'fre': 'fr', 'ger': 'de',
+    'ita': 'it', 'por': 'pt', 'rus': 'ru', 'chi': 'zh', 'jpn': 'ja',
+    'kor': 'ko', 'ara': 'ar', 'dut': 'nl', 'pol': 'pl', 'tur': 'tr',
+    'swe': 'sv', 'nor': 'no', 'dan': 'da', 'fin': 'fi', 'cze': 'cs',
+    'rum': 'ro', 'hrv': 'hr', 'srp': 'sr', 'bul': 'bg', 'gre': 'el',
+    'heb': 'he', 'tha': 'th', 'vie': 'vi', 'ind': 'id', 'may': 'ms',
+    'per': 'fa', 'ukr': 'uk', 'est': 'et', 'lav': 'lv', 'lit': 'lt',
+    'slv': 'sl', 'slo': 'sk', 'ice': 'is', 'cat': 'ca', 'bos': 'bs',
+    'glg': 'gl', 'baq': 'eu', 'geo': 'ka', 'mac': 'mk', 'alb': 'sq',
+}
+
 
 class OpenSubtitlesScraperMixin:
     """
-    Mixin class that provides web scraper functionality for OpenSubtitles provider.
-    This allows communication with scraper services that provide OpenSubtitles-compatible APIs.
+    Mixin class providing web scraper functionality via the v1 REST API.
     """
-    
-    def _query_scraper(self, video, languages, hash=None, size=None, imdb_id=None, query=None, season=None, 
-                      episode=None, tag=None, use_tag_search=False, only_foreign=False, also_foreign=False):
-        """
-        Query the scraper service for subtitles.
-        
-        This method converts the traditional OpenSubtitles XML-RPC format to HTTP requests
-        that are compatible with scraper services.
-        """
-        logger.info('Querying scraper service at %s', self.scraper_service_url)
-        
-        # Build search criteria similar to the API version
-        criteria = []
-        if hash and size:
-            criteria.append({'moviehash': hash, 'moviebytesize': str(size)})
-        if use_tag_search and tag:
-            criteria.append({'tag': tag})
-        if imdb_id:
-            if season and episode:
-                criteria.append({'imdbid': imdb_id[2:], 'season': season, 'episode': episode})
-            else:
-                criteria.append({'imdbid': imdb_id[2:]})
-                
-        if not criteria:
-            raise ValueError('Not enough information')
 
-        # Add language information
-        for criterion in criteria:
-            criterion['sublanguageid'] = ','.join(sorted(l.opensubtitles for l in languages))
+    def _get_scraper_base_url(self):
+        base_url = self.scraper_service_url.rstrip('/')
+        if not base_url.startswith(('http://', 'https://')):
+            base_url = f'http://{base_url}'
+        return base_url
+
+    def _scraper_request(self, endpoint, data):
+        """Make a POST request to the scraper service."""
+        url = f"{self._get_scraper_base_url()}{endpoint}"
+        headers = {
+            'Content-Type': 'application/json',
+            'User-Agent': 'Bazarr-OpenSubtitles-Scraper/2.0'
+        }
+
+        logger.debug('Scraper request: %s %s', url, data)
+
+        response = requests.post(url, json=data, headers=headers, timeout=120)
+
+        if response.status_code in (429, 503):
+            retry_after_str = response.headers.get("Retry-After")
+            response.close()
+            retry_after = int(retry_after_str) if retry_after_str and retry_after_str.isdigit() else None
+            msg = "Scraper service busy"
+            if retry_after:
+                msg = f"{msg}, retry after {retry_after}s"
+            raise APIThrottled(msg, retry_after=retry_after)
+
+        response.raise_for_status()
+        result = response.json()
+        response.close()
+        return result
+
+    def _query_scraper(self, video, languages, hash=None, size=None, imdb_id=None, query=None,
+                       season=None, episode=None, tag=None, use_tag_search=False,
+                       only_foreign=False, also_foreign=False):
+        """Query the scraper v1 API with full metadata."""
+        logger.info('Querying scraper v1 API at %s', self.scraper_service_url)
+
+        is_episode = isinstance(video, Episode)
+
+        # Build the best possible query string from available info
+        search_query = ''
+        if query and isinstance(query, list) and query[0]:
+            search_query = query[0]
+        elif query and isinstance(query, str):
+            search_query = query
+        elif hasattr(video, 'series') and video.series:
+            search_query = video.series
+        elif hasattr(video, 'title') and video.title:
+            search_query = video.title
+
+        # Get year from video
+        year = getattr(video, 'year', None)
 
         try:
-            # Make HTTP request to scraper service
-            response = self._make_scraper_request('/search', {
-                'criteria': criteria,
-                'only_foreign': only_foreign,
-                'also_foreign': also_foreign
+            # Step 1: Search for the movie/show
+            search_endpoint = '/api/v1/search/tv' if is_episode else '/api/v1/search/movies'
+            search_data = {
+                'query': search_query,
+                'imdb_id': imdb_id if imdb_id else None,
+                'year': year,
+                'kind': 'episode' if is_episode else 'movie',
+            }
+
+            logger.info('Scraper search: %s query=%r imdb=%s year=%s',
+                         search_endpoint, search_query, imdb_id, year)
+
+            search_response = self._scraper_request(search_endpoint, search_data)
+
+            results = search_response.get('results', [])
+            if not results:
+                logger.info('Scraper: no results from %s for %r', search_endpoint, search_query)
+                return []
+
+            # Step 2: Select best matching result
+            best_result = self._select_best_result(results, imdb_id, search_query, year)
+            if not best_result:
+                logger.info('Scraper: no matching result for imdb=%s query=%r', imdb_id, search_query)
+                return []
+
+            movie_url = best_result.get('url')
+            if not movie_url:
+                logger.warning('Scraper: search result has no URL')
+                return []
+
+            logger.info('Scraper: selected result: %s (%s) - %s',
+                         best_result.get('title'), best_result.get('year'), movie_url)
+
+            # Step 3: Get subtitle listings
+            lang_codes = []
+            for lang in languages:
+                code_3 = lang.opensubtitles
+                code_2 = _LANG_3_TO_2.get(code_3, code_3)
+                lang_codes.append(code_2)
+
+            subs_response = self._scraper_request('/api/v1/subtitles', {
+                'movie_url': movie_url,
+                'languages': lang_codes,
             })
-            
-            if not response or not response.get('data'):
-                logger.info('No subtitles found from scraper service')
+
+            subtitle_list = subs_response.get('subtitles', [])
+            if not subtitle_list:
+                logger.info('Scraper: no subtitles found at %s', movie_url)
                 return []
-                
-            return self._parse_scraper_response(response['data'], languages, only_foreign, also_foreign, video)
-            
+
+            logger.info('Scraper: found %d subtitles, parsing...', len(subtitle_list))
+
+            # Step 4: Convert to bazarr subtitle objects
+            return self._parse_v1_subtitles(
+                subtitle_list, best_result, languages, season, episode,
+                only_foreign, also_foreign, video, imdb_id,
+                hash=hash, search_query=search_query
+            )
+
         except APIThrottled:
             raise
         except requests.RequestException as e:
             logger.error('Scraper service request failed: %s', e)
             raise ServiceUnavailable(f'Scraper service unavailable: {e}')
         except Exception as e:
-            logger.error('Unexpected error querying scraper service: %s', e)
+            logger.error('Unexpected error querying scraper: %s', e)
             raise ServiceUnavailable(f'Scraper service error: {e}')
 
-    def _make_scraper_request(self, endpoint, data):
-        """
-        Make an HTTP request to the scraper service.
-        
-        Args:
-            endpoint: API endpoint (e.g., '/search', '/download')
-            data: Request payload
-            
-        Returns:
-            dict: JSON response from scraper service
-        """
-        # Ensure URL has proper protocol scheme
-        base_url = self.scraper_service_url.rstrip('/')
-        if not base_url.startswith(('http://', 'https://')):
-            base_url = f'http://{base_url}'
-            
-        url = f"{base_url}{endpoint}"
-        
-        headers = {
-            'Content-Type': 'application/json',
-            'User-Agent': 'Bazarr-OpenSubtitles-Scraper/1.0'
-        }
-        
-        logger.debug('Making scraper request to %s with data: %s', url, data)
-        
-        response = requests.post(
-            url,
-            json=data,
-            headers=headers,
-            timeout=120  # Increased timeout for scraper service (IMDB lookups + page navigation)
-        )
+    def _select_best_result(self, results, imdb_id, query, year):
+        """Select the best search result by matching IMDB ID, title, and year."""
+        if not results:
+            return None
 
-        if response.status_code in (429, 503):
-            retry_after = response.headers.get("Retry-After")
-            response.close()
-            message = "Scraper service busy"
-            if retry_after:
-                message = f"{message}, retry after {retry_after}s"
-            raise APIThrottled(message)
+        # Exact IMDB match is best
+        if imdb_id:
+            for r in results:
+                if r.get('imdb_id') == imdb_id:
+                    return r
 
-        response.raise_for_status()
-        return response.json()
-
-    def _parse_scraper_response(self, data, languages, only_foreign, also_foreign, video):
-        """
-        Parse the scraper service response and create subtitle objects.
-        
-        Args:
-            data: Response data from scraper service
-            languages: Requested languages
-            only_foreign: Only foreign/forced subtitles
-            also_foreign: Include foreign/forced subtitles
-            video: Video object for matching
-            
-        Returns:
-            list: List of OpenSubtitlesSubtitle objects
-        """
+        # Score remaining results
+        scored = []
+        query_lower = (query or '').lower().strip()
+        for r in results:
+            score = 0
+            title_lower = (r.get('title') or '').lower().strip()
+
+            # Title matching
+            if query_lower and title_lower:
+                if title_lower == query_lower:
+                    score += 10
+                elif query_lower in title_lower or title_lower in query_lower:
+                    score += 5
+
+            # Year matching
+            if year and r.get('year') == year:
+                score += 3
+
+            # Prefer results with more subtitles
+            score += min(r.get('subtitle_count', 0) / 100, 2)
+
+            scored.append((score, r))
+
+        scored.sort(key=lambda x: x[0], reverse=True)
+        return scored[0][1] if scored else results[0]
+
+    def _parse_v1_subtitles(self, subtitle_list, search_result, languages, season, episode,
+                            only_foreign, also_foreign, video, imdb_id,
+                            hash=None, search_query=None):
+        """Convert v1 API subtitle objects to bazarr OpenSubtitlesSubtitle objects."""
         subtitles = []
-        
-        for subtitle_item in data:
+        series_title = search_result.get('title', '')
+        result_year = search_result.get('year')
+        result_imdb = search_result.get('imdb_id', '')
+
+        for sub in subtitle_list:
             try:
-                # Parse subtitle item (similar to API version)
-                language = Language.fromopensubtitles(subtitle_item['SubLanguageID'])
-                hearing_impaired = bool(int(subtitle_item.get('SubHearingImpaired', 0)))
-                page_link = subtitle_item.get('SubtitlesLink', '')
-                subtitle_id = int(subtitle_item['IDSubtitleFile'])
-                matched_by = subtitle_item.get('MatchedBy', 'hash')
-                movie_kind = subtitle_item.get('MovieKind', 'movie')
-                hash = subtitle_item.get('MovieHash', '')
-                movie_name = subtitle_item.get('MovieName', '')
-                movie_release_name = subtitle_item.get('MovieReleaseName', '')
-                movie_year = int(subtitle_item['MovieYear']) if subtitle_item.get('MovieYear') else None
-                
-                # Handle IMDB ID
-                if subtitle_item.get('SeriesIMDBParent'):
-                    movie_imdb_id = 'tt' + subtitle_item['SeriesIMDBParent']
-                elif subtitle_item.get('IDMovieImdb'):
-                    movie_imdb_id = 'tt' + subtitle_item['IDMovieImdb']
-                else:
-                    movie_imdb_id = None
-                    
-                movie_fps = subtitle_item.get('MovieFPS')
-                series_season = int(subtitle_item['SeriesSeason']) if subtitle_item.get('SeriesSeason') else None
-                series_episode = int(subtitle_item['SeriesEpisode']) if subtitle_item.get('SeriesEpisode') else None
-                filename = subtitle_item.get('SubFileName', '')
-                encoding = subtitle_item.get('SubEncoding')
-                foreign_parts_only = bool(int(subtitle_item.get('SubForeignPartsOnly', 0)))
+                # Map 2-letter language back to opensubtitles format
+                lang_2 = sub.get('language', '')
+                try:
+                    language = Language.fromietf(lang_2)
+                except Exception:
+                    try:
+                        language = Language(lang_2)
+                    except Exception:
+                        logger.debug('Skipping subtitle with unknown language: %s', lang_2)
+                        continue
+
+                hearing_impaired = sub.get('hearing_impaired', False)
+                foreign_parts_only = sub.get('forced', False)
 
                 # Apply foreign/forced filtering
                 if only_foreign and not foreign_parts_only:
@@ -171,76 +228,89 @@ def _parse_scraper_response(self, data, languages, only_foreign, also_foreign, v
                 elif (also_foreign or only_foreign) and foreign_parts_only:
                     language = Language.rebuild(language, forced=True)
 
-                # Set hearing impaired language
                 if hearing_impaired:
                     language = Language.rebuild(language, hi=True)
 
                 if language not in languages:
                     continue
 
+                subtitle_id = int(sub['subtitle_id'])
+                filename = sub.get('filename', '')
+                release_name = sub.get('release_name', '')
+                fps = sub.get('fps')
+                download_url = sub.get('download_url', '')
+
+                # Build movie_name in the format bazarr expects
+                is_episode = season is not None and episode is not None
+                if is_episode and series_title:
+                    movie_name = f'"{series_title}" {release_name}'
+                    movie_kind = 'episode'
+                else:
+                    movie_name = series_title or release_name
+                    movie_kind = 'movie'
+
+                movie_imdb_id = result_imdb if result_imdb else (imdb_id or None)
+                if movie_imdb_id and not movie_imdb_id.startswith('tt'):
+                    movie_imdb_id = f'tt{movie_imdb_id}'
+
                 # IMDB ID matching
-                if video.imdb_id and movie_imdb_id and (movie_imdb_id != video.imdb_id):
+                if video.imdb_id and movie_imdb_id and movie_imdb_id != video.imdb_id:
                     continue
 
-                query_parameters = subtitle_item.get("QueryParameters", {})
+                query_parameters = {
+                    'query': search_query,
+                    'imdb_id': imdb_id,
+                    'season': season,
+                    'episode': episode,
+                }
 
-                # Create subtitle object
                 subtitle = self.subtitle_class(
-                    language, hearing_impaired, page_link, subtitle_id, matched_by,
-                    movie_kind, hash, movie_name, movie_release_name, movie_year, movie_imdb_id,
-                    series_season, series_episode, query_parameters, filename, encoding,
-                    movie_fps, skip_wrong_fps=self.skip_wrong_fps
+                    language, hearing_impaired, download_url, subtitle_id,
+                    'imdbid' if imdb_id else 'query',
+                    movie_kind, hash or '', movie_name, release_name, result_year, movie_imdb_id,
+                    season if is_episode else None,
+                    episode if is_episode else None,
+                    query_parameters, filename, None,
+                    fps, skip_wrong_fps=self.skip_wrong_fps
                 )
-                
-                # Set additional attributes needed for matching
-                subtitle.uploader = subtitle_item.get('UserNickName', 'anonymous')
-                
-                # For TV series, set movie_name which is used as series_name in matching
-                # The series_name property uses movie_name internally
-                if movie_kind == 'episode':
-                    if not movie_name and movie_release_name:
-                        # Extract series name from release name if movie_name is empty
-                        # e.g., "The Exchange" Bank of Tomorrow -> "The Exchange"
-                        import re
-                        series_match = re.match(r'^"([^"]+)"', movie_release_name)
-                        if series_match:
-                            subtitle.movie_name = series_match.group(1)
-                        else:
-                            # Fallback: use first part of release name
-                            subtitle.movie_name = movie_release_name.split()[0] if movie_release_name else 'Unknown'
-                    # movie_name is already set correctly from the API response
-                
-                logger.debug('Found subtitle %r by %s via scraper', subtitle, matched_by)
+
+                subtitle.uploader = sub.get('uploader', 'anonymous')
+                # Store download_url for the download step
+                subtitle.scraper_download_url = download_url
+
+                logger.debug('Found scraper subtitle: %s [%s] by %s (%d downloads)',
+                             filename, lang_2, subtitle.uploader, sub.get('download_count', 0))
                 subtitles.append(subtitle)
-                
+
             except (KeyError, ValueError, TypeError) as e:
-                logger.warning('Failed to parse subtitle item from scraper: %s', e)
+                logger.warning('Failed to parse scraper subtitle: %s', e)
                 continue
 
+        logger.info('Scraper: returning %d subtitles after filtering', len(subtitles))
         return subtitles
 
     def _download_subtitle_scraper(self, subtitle):
-        """
-        Download subtitle content from scraper service.
-        
-        Args:
-            subtitle: OpenSubtitlesSubtitle object
-        """
-        logger.info('Downloading subtitle %r via scraper', subtitle)
-        
+        """Download subtitle content via the v1 API."""
+        logger.info('Downloading subtitle %d via scraper', subtitle.subtitle_id)
+
+        download_url = getattr(subtitle, 'scraper_download_url', None)
+        if not download_url:
+            download_url = f'https://www.opensubtitles.org/en/subtitles/{subtitle.subtitle_id}'
+
         try:
-            response = self._make_scraper_request('/download', {
-                'subtitle_id': str(subtitle.subtitle_id)
+            response = self._scraper_request('/api/v1/download/subtitle', {
+                'subtitle_id': str(subtitle.subtitle_id),
+                'download_url': download_url,
             })
-            
-            if response and response.get('data'):
-                # The scraper returns base64-encoded subtitle content
-                subtitle.content = base64.b64decode(response['data'])
+
+            content = response.get('content')
+            if content:
+                subtitle.content = base64.b64decode(content)
             else:
                 raise ServiceUnavailable('No subtitle content received from scraper')
-                
+
         except APIThrottled:
             raise
-        except requests.RequestException as e:
+        except Exception as e:
             logger.error('Failed to download subtitle from scraper: %s', e)
             raise ServiceUnavailable(f'Scraper download failed: {e}')
diff --git a/custom_libs/subliminal_patch/providers/opensubtitlescom.py b/custom_libs/subliminal_patch/providers/opensubtitlescom.py
index ccf5cbddbd..f07ecfb68b 100644
--- a/custom_libs/subliminal_patch/providers/opensubtitlescom.py
+++ b/custom_libs/subliminal_patch/providers/opensubtitlescom.py
@@ -348,9 +348,10 @@ def query(self, languages, video):
                 params.append(('episode_number', self.video.episode))
             if self.video.season:
                 params.append(('season_number', self.video.season))
+
             if self.video.series_imdb_id:
                 params.append(('parent_imdb_id', self.sanitize_external_ids(self.video.series_imdb_id)))
-            if title_id:
+            elif title_id:
                 params.append(('parent_feature_id', title_id))
         else:
             if not imdb_id and not title_id:
diff --git a/custom_libs/subliminal_patch/providers/subssabbz.py b/custom_libs/subliminal_patch/providers/subssabbz.py
index 63120fc116..5485d75396 100644
--- a/custom_libs/subliminal_patch/providers/subssabbz.py
+++ b/custom_libs/subliminal_patch/providers/subssabbz.py
@@ -6,12 +6,13 @@
 import os
 import codecs
 import unicodedata
+import time
 from hashlib import sha1
 from random import randint
 from bs4 import BeautifulSoup
 from zipfile import ZipFile, is_zipfile
 from rarfile import RarFile, is_rarfile
-from requests import Session
+from requests import Session, HTTPError
 from guessit import guessit
 from dogpile.cache.api import NO_VALUE
 from subliminal_patch.providers import Provider
@@ -51,6 +52,27 @@ def fix_movie_naming(title):
                                            }, True)
 
 
+def _retry_on_403(method):
+    def retry(self, *args, **kwargs):
+        retries = 0
+        while 3 > retries:
+            try:
+                return method(self, *args, **kwargs)
+            except HTTPError as error:
+                if error.response.status_code != 403:
+                    raise
+
+                retries += 1
+
+                logger.debug("403 returned. Retrying in 10 seconds")
+                time.sleep(10)
+
+        logger.debug("Retries limit exceeded. Ignoring query")
+        return []
+
+    return retry
+
+
 class SubsSabBzSubtitle(Subtitle):
     """SubsSabBz Subtitle."""
     provider_name = 'subssabbz'
@@ -140,6 +162,7 @@ def initialize(self):
     def terminate(self):
         self.session.close()
 
+    @_retry_on_403
     def query(self, language, video):
         subtitles = []
         isEpisode = isinstance(video, Episode)
diff --git a/custom_libs/subliminal_patch/providers/subx.py b/custom_libs/subliminal_patch/providers/subx.py
index 2ed3b2308a..a46a71e4be 100644
--- a/custom_libs/subliminal_patch/providers/subx.py
+++ b/custom_libs/subliminal_patch/providers/subx.py
@@ -256,9 +256,9 @@ def run_query(self, query, video, video_type, season=None, episode=None):
                     return []
                 
                 elif response.status_code == 429:
-                    # Rate limited - exponential backoff
+                    # Rate limited - use Retry-After header if available
                     if attempt < max_retries - 1:
-                        wait_time = 2 ** attempt
+                        wait_time = int(response.headers.get("Retry-After", 60 * (attempt + 1)))
                         logger.warning("Rate limit hit, waiting %ds before retry %d/%d", 
                                      wait_time, attempt + 1, max_retries)
                         time.sleep(wait_time)
@@ -282,6 +282,33 @@ def run_query(self, query, video, video_type, season=None, episode=None):
                 # Success
                 response.raise_for_status()
                 data = response.json()
+
+                # Proactively slow down if approaching rate limit
+                remaining = response.headers.get("X-RateLimit-Remaining")
+                limit = response.headers.get("X-RateLimit-Limit")
+                reset = response.headers.get("X-RateLimit-Reset")
+
+                if remaining is not None and limit is not None:
+                    try:
+                        remaining_int = int(remaining)
+                        limit_int = int(limit)
+                        
+                        # Slow down when below 20% of quota
+                        if remaining_int < limit_int * 0.2:
+                            if reset is not None:
+                                # Wait exactly until the window resets
+                                wait_time = max(0, int(reset) - int(time.time()))
+                            else:
+                                wait_time = 2  # Fallback
+                            
+                            logger.warning(
+                                "Approaching SubX rate limit (%d/%d remaining), waiting %ds",
+                                remaining_int, limit_int, wait_time
+                            )
+                            time.sleep(wait_time)
+                    except ValueError:
+                        pass
+
                 break  # Exit retry loop
                 
             except Exception as e:
@@ -343,8 +370,8 @@ def run_query(self, query, video, video_type, season=None, episode=None):
             if not page_url and item.get("id"):
                 page_url = f"{_SUBX_BASE_URL}/api/subtitles/{item['id']}"
 
-            # Detect language variant (Spain vs LATAM) from description
-            description = item.get("description", "")
+            # Detect language variant (Spain vs LatAm) from description
+            description = item.get("description") or ""
             spain = _SPANISH_RE.search(description.lower()) is not None
             language = Language.fromalpha2("es") if spain else Language("spa", "MX")
 
@@ -369,7 +396,7 @@ def run_query(self, query, video, video_type, season=None, episode=None):
                     page_url = f"{_SUBX_BASE_URL}/api/subtitles/{item['id']}"
 
                 # Detect language variant from description
-                description = item.get("description", "")
+                description = item.get("description") or ""
                 spain = _SPANISH_RE.search(description.lower()) is not None
                 language = Language.fromalpha2("es") if spain else Language("spa", "MX")
 
diff --git a/custom_libs/subliminal_patch/score.py b/custom_libs/subliminal_patch/score.py
index 2bcbd9776d..b0810b34fd 100644
--- a/custom_libs/subliminal_patch/score.py
+++ b/custom_libs/subliminal_patch/score.py
@@ -31,33 +31,38 @@ def framerate_equal(source, check):
 DEFAULT_SCORES = {
     "episode": {
         "hash": 359,
-        "series": 180,
+        "series": 160,
         "year": 90,
         "season": 30,
         "episode": 30,
-        "release_group": 14,
-        "source": 7,
-        "audio_codec": 3,
-        "resolution": 2,
-        "video_codec": 2,
-        "streaming_service": 1,
+        "source": 25,
+        "release_group": 20,
+        "audio_codec": 1,
+        "resolution": 1,
+        "video_codec": 1,
         "hearing_impaired": 1,
+        "streaming_service": 1,
     },
     "movie": {
-        "hash": 119,
+        "hash": 179,
         "title": 60,
-        "year": 30,
-        "release_group": 13,
-        "source": 7,
-        "audio_codec": 3,
-        "resolution": 2,
-        "video_codec": 2,
-        "streaming_service": 1,
-        "edition": 1,
+        "year": 40,
+        "source": 30,
+        "edition": 30,
+        "release_group": 15,
+        "audio_codec": 1,
+        "resolution": 1,
+        "video_codec": 1,
         "hearing_impaired": 1,
+        "streaming_service": 1,
     },
 }
 
+MAX_SCORES = {
+    "episode": sum(v for k, v in DEFAULT_SCORES["episode"].items() if k != "hash"),
+    "movie": sum(v for k, v in DEFAULT_SCORES["movie"].items() if k != "hash"),
+}
+
 
 def _check_hash_sum(scores: dict):
     hash_val = scores["hash"]
diff --git a/custom_libs/subzero/analytics.py b/custom_libs/subzero/analytics.py
deleted file mode 100644
index bda9d62521..0000000000
--- a/custom_libs/subzero/analytics.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# coding=utf-8
-
-from __future__ import absolute_import
-import struct
-import binascii
-
-from pyga.requests import Event, Page, Tracker, Session, Visitor, Config
-
-
-def track_event(category=None, action=None, label=None, value=None, identifier=None, first_use=None, add=None,
-                noninteraction=True):
-    anonymousConfig = Config()
-    anonymousConfig.anonimize_ip_address = True
-
-    tracker = Tracker('UA-86466078-1', 'none', conf=anonymousConfig)
-    visitor = Visitor()
-
-    # convert the last 8 bytes of the machine identifier to an integer to get a "unique" user
-    visitor.unique_id = struct.unpack("!I", binascii.unhexlify(identifier[32:]))[0]/2
-
-    if add:
-        # add visitor's ip address (will be anonymized)
-        visitor.ip_address = add
-
-    if first_use:
-        visitor.first_visit_time = first_use
-
-    session = Session()
-    event = Event(category=category, action=action, label=label, value=value, noninteraction=noninteraction)
-    path = u"/" + u"/".join([category, action, label])
-    page = Page(path.lower())
-
-    tracker.track_event(event, session, visitor)
-    tracker.track_pageview(page, session, visitor)
diff --git a/custom_libs/subzero/modification/__init__.py b/custom_libs/subzero/modification/__init__.py
index 73d75dea9a..4786d344ed 100644
--- a/custom_libs/subzero/modification/__init__.py
+++ b/custom_libs/subzero/modification/__init__.py
@@ -2,5 +2,5 @@
 
 from __future__ import absolute_import
 from .registry import registry
-from .mods import hearing_impaired, ocr_fixes, fps, offset, common, color, emoji
+from .mods import hearing_impaired, ocr_fixes, fps, offset, common, color, emoji, two_point_fit
 from .main import SubtitleModifications, SubMod
diff --git a/custom_libs/subzero/modification/mods/two_point_fit.py b/custom_libs/subzero/modification/mods/two_point_fit.py
new file mode 100644
index 0000000000..8c8e732f8a
--- /dev/null
+++ b/custom_libs/subzero/modification/mods/two_point_fit.py
@@ -0,0 +1,29 @@
+# coding=utf-8
+
+from __future__ import absolute_import
+import logging
+
+from subzero.modification.mods import SubtitleModification
+from subzero.modification import registry
+
+logger = logging.getLogger(__name__)
+
+
+class TwoPointFit(SubtitleModification):
+    identifier = "two_point_fit"
+    description = "Use first and last sentences to linearly align timing of the subtitles"
+    exclusive = False
+    advanced = True
+    modifies_whole_file = True
+
+    def modify(self, content, debug=False, parent=None, **kwargs):
+
+        """
+        Place first sentence at 00:00:00 and scale until duration matches, then offset back
+        """
+
+        parent.f.shift(h=-int(kwargs.get("rh", 0)), m=-int(kwargs.get("rm", 0)), s=-int(kwargs.get("rs", 0)), ms=-int(kwargs.get("rms", 0)))
+        parent.f.transform_framerate(float(kwargs.get("from")), float(kwargs.get("to")))
+        parent.f.shift(h=int(kwargs.get("oh", 0)), m=int(kwargs.get("om", 0)), s=int(kwargs.get("os", 0)), ms=int(kwargs.get("oms", 0)))
+
+registry.register(TwoPointFit)
diff --git a/docker-compose.yml b/docker-compose.yml
index 4aced79eff..e5fa84c580 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 # =============================================================================
-# Bazarr LavX Fork - Docker Compose
+# Bazarr+ Docker Compose
 # =============================================================================
-# Production deployment configuration with OpenSubtitles.org Scraper
+# Production deployment configuration
 #
 # Usage:
 #   docker compose up -d
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 29df93ea55..170fa7fa01 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -14,14 +14,19 @@ set -e
 PUID=${PUID:-1000}
 PGID=${PGID:-1000}
 
-echo "
-โ•”โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•—
-โ•‘            Bazarr (LavX Fork) Docker Container                โ•‘
-โ•‘                                                               โ•‘
-โ•‘  OpenSubtitles.org scraper support included                   โ•‘
-โ•‘  https://github.com/LavX/bazarr                               โ•‘
-โ•šโ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•โ•
-"
+echo '
+__/\\\\\\\\\\\\\_________________________________________________________________________________________
+ _\/\\\/////////\\\_______________________________________________________________________________________
+  _\/\\\_______\/\\\______________________________________________________________________________/\\\_____
+   _\/\\\\\\\\\\\\\\___/\\\\\\\\\_____/\\\\\\\\\\\__/\\\\\\\\\_____/\\/\\\\\\\___/\\/\\\\\\\______\/\\\_____
+    _\/\\\/////////\\\_\////////\\\___\///////\\\/__\////////\\\___\/\\\/////\\\_\/\\\/////\\\__/\\\\\\\\\\\_
+     _\/\\\_______\/\\\___/\\\\\\\\\\_______/\\\/______/\\\\\\\\\\__\/\\\___\///__\/\\\___\///__\/////\\\///__
+      _\/\\\_______\/\\\__/\\\/////\\\_____/\\\/_______/\\\/////\\\__\/\\\_________\/\\\_____________\/\\\_____
+       _\/\\\\\\\\\\\\\/__\//\\\\\\\\/\\__/\\\\\\\\\\\_\//\\\\\\\\/\\_\/\\\_________\/\\\_____________\///_____
+        _\/////////////_____\////////\//__\///////////___\////////\//__\///__________\///________________________
+
+Repository: https://github.com/LavX/bazarr
+'
 
 echo "Starting with UID: $PUID, GID: $PGID"
 
diff --git a/docs/AI_TRANSLATOR_INVESTIGATION.md b/docs/AI_TRANSLATOR_INVESTIGATION.md
deleted file mode 100644
index ab2ede82aa..0000000000
--- a/docs/AI_TRANSLATOR_INVESTIGATION.md
+++ /dev/null
@@ -1,248 +0,0 @@
-# AI Subtitle Translator Integration - Investigation Report
-
-## Executive Summary
-
-This document details the findings from investigating two issues with the AI Subtitle Translator integration in Bazarr:
-1. Configuration not being applied to the microservice
-2. Understanding how AI translation gets triggered
-
----
-
-## Issue 1: Configuration Not Being Applied to Microservice
-
-### Symptoms
-- User enters API key and Max Concurrent Jobs in Settings
-- Service Status panel shows "API Key: ร— Not Set" and "Max Concurrent: 2" (default)
-
-### Root Cause Analysis
-
-The architecture involves **two separate systems**:
-
-```
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”     โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚           BAZARR                     โ”‚     โ”‚    AI SUBTITLE TRANSLATOR        โ”‚
-โ”‚                                      โ”‚     โ”‚       (Microservice)             โ”‚
-โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”    โ”‚     โ”‚                                  โ”‚
-โ”‚  โ”‚  Frontend Settings Page      โ”‚    โ”‚     โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” โ”‚
-โ”‚  โ”‚  - API Key input             โ”‚    โ”‚     โ”‚  โ”‚  /api/v1/status           โ”‚ โ”‚
-โ”‚  โ”‚  - Max Concurrent selector   โ”‚โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”‚  โ”‚  Returns microservice's   โ”‚ โ”‚
-โ”‚  โ”‚  - Model selector            โ”‚    โ”‚     โ”‚  โ”‚  internal config (NOT     โ”‚ โ”‚
-โ”‚  โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜    โ”‚     โ”‚  โ”‚  Bazarr's config)         โ”‚ โ”‚
-โ”‚              โ”‚                       โ”‚     โ”‚  โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”‚
-โ”‚              โ–ผ                       โ”‚     โ”‚                                  โ”‚
-โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”    โ”‚     โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” โ”‚
-โ”‚  โ”‚  Bazarr Config (config.yaml)โ”‚    โ”‚     โ”‚  โ”‚  /api/v1/jobs/translate   โ”‚ โ”‚
-โ”‚  โ”‚  - openrouter_api_key       โ”‚    โ”‚     โ”‚  โ”‚  Receives config PER-     โ”‚ โ”‚
-โ”‚  โ”‚  - openrouter_max_concurrentโ”‚    โ”‚     โ”‚  โ”‚  REQUEST in payload       โ”‚ โ”‚
-โ”‚  โ”‚  - openrouter_model         โ”‚    โ”‚     โ”‚  โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ โ”‚
-โ”‚  โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜    โ”‚     โ”‚                                  โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜     โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-```
-
-#### Data Flow When Saving Settings:
-1. User enters values in frontend Settings page
-2. Frontend POSTs to `/api/system/settings` 
-3. Bazarr saves to its config file (`config.yaml`)
-4. **Config is NOT sent to microservice** - settings are saved locally only
-
-#### Data Flow When Translating:
-1. Translation request is submitted
-2. [`OpenRouterTranslatorService._submit_and_poll()`](bazarr/subtitles/tools/translate/services/openrouter_translator.py:110) creates payload WITH config:
-```python
-payload = {
-    ...
-    "config": {
-        "apiKey": settings.translator.openrouter_api_key,
-        "model": settings.translator.openrouter_model,
-        "temperature": settings.translator.openrouter_temperature,
-    }
-}
-```
-3. **Problem**: `maxConcurrent` is NOT included in the payload!
-
-#### Data Flow When Viewing Status Panel:
-1. [`TranslatorStatusPanel`](frontend/src/components/TranslatorStatus.tsx:146) calls `useTranslatorStatus()`
-2. Fetches from Bazarr API `/translator/status`
-3. [`TranslatorStatus.get()`](bazarr/api/translator/translator.py:29) proxies to microservice `/api/v1/status`
-4. **Returns microservice's internal config** (defaults), not Bazarr's saved config
-
-### The Design Issue
-
-The current design sends config **per-request** (at translation time), but:
-1. **`max_concurrent` is missing** from the translation payload
-2. **Status panel shows wrong data** - displays microservice defaults, not Bazarr's settings
-
-### Solution
-
-#### Fix 1: Add `maxConcurrent` to translation payload
-
-In [`bazarr/subtitles/tools/translate/services/openrouter_translator.py`](bazarr/subtitles/tools/translate/services/openrouter_translator.py:137), add `maxConcurrent`:
-
-```python
-# Line 136-142
-payload = {
-    ...
-    "config": {
-        "apiKey": settings.translator.openrouter_api_key,
-        "model": settings.translator.openrouter_model,
-        "temperature": settings.translator.openrouter_temperature,
-        "maxConcurrent": settings.translator.openrouter_max_concurrent,  # ADD THIS
-    }
-}
-```
-
-#### Fix 2: Update Status Panel to show Bazarr's config
-
-Option A: **Modify Status Panel to show Bazarr settings** (Recommended)
-- Update frontend to fetch Bazarr's settings from `/api/system/settings`
-- Display Bazarr's config alongside microservice status
-
-Option B: **Add endpoint to sync config to microservice**
-- Add a POST method to [`TranslatorConfig`](bazarr/api/translator/translator.py:128)
-- Call it when settings are saved
-- Microservice would need a `/api/v1/config` POST endpoint
-
----
-
-## Issue 2: How AI Translation Gets Triggered
-
-### Current Behavior: Manual Only
-
-AI translation is **NOT automatic**. It must be manually triggered by the user.
-
-### Translation Trigger Flow
-
-```
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚                           MANUAL TRANSLATION FLOW                           โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-
-User Action in Bazarr UI:
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚  Episode/Movie Detail Page      โ”‚
-โ”‚  Click on subtitle file         โ”‚
-โ”‚  Select "Translate" action      โ”‚
-โ”‚  Choose target language         โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-              โ”‚
-              โ–ผ
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚  Frontend API Call              โ”‚
-โ”‚  PATCH /api/subtitles/subtitles โ”‚
-โ”‚  action: "translate"            โ”‚
-โ”‚  language: "target_lang"        โ”‚
-โ”‚  path: "/path/to/subtitle.srt"  โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-              โ”‚
-              โ–ผ
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚  bazarr/api/subtitles/          โ”‚
-โ”‚  subtitles.py:170-181           โ”‚
-โ”‚  if action == 'translate':      โ”‚
-โ”‚    translate_subtitles_file()   โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-              โ”‚
-              โ–ผ
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚  bazarr/subtitles/tools/        โ”‚
-โ”‚  translate/main.py:12           โ”‚
-โ”‚  translate_subtitles_file()     โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-              โ”‚
-              โ–ผ
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚  TranslatorFactory              โ”‚
-โ”‚  .create_translator()           โ”‚
-โ”‚  Based on translator_type:      โ”‚
-โ”‚  - google_translate             โ”‚
-โ”‚  - gemini                       โ”‚
-โ”‚  - lingarr                      โ”‚
-โ”‚  - openrouter (AI Translator)   โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-              โ”‚
-              โ–ผ (if openrouter)
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚  OpenRouterTranslatorService    โ”‚
-โ”‚  1. Load subtitle file          โ”‚
-โ”‚  2. Submit job to microservice  โ”‚
-โ”‚  3. Poll for completion         โ”‚
-โ”‚  4. Save translated subtitle    โ”‚
-โ”‚  5. Log to history              โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-```
-
-### How to Trigger Translation
-
-#### Method 1: Via Bazarr UI (Recommended)
-1. Go to Series/Movies in Bazarr
-2. Click on an episode/movie
-3. Look at the subtitles section
-4. Click on an existing subtitle file (e.g., English)
-5. Select "Translate" from the actions menu
-6. Choose the target language
-7. Click confirm
-
-#### Method 2: Via API
-```bash
-curl -X PATCH "http://localhost:6767/api/subtitles/subtitles" \
-  -H "X-API-KEY: your-api-key" \
-  -F "action=translate" \
-  -F "language=hu" \
-  -F "path=/path/to/subtitle.en.srt" \
-  -F "type=episode" \
-  -F "id=12345"
-```
-
-### Automatic Translation (NOT Currently Implemented)
-
-There is currently **no automatic translation** in Bazarr. To implement this, you would need to:
-
-1. **Post-download hook**: Add translation to the subtitle download pipeline
-2. **Scheduled task**: Create a scheduler job to translate missing languages
-3. **Language profile enhancement**: Add "auto-translate" option to language profiles
-
----
-
-## Relevant Files Reference
-
-### Configuration
-- [`bazarr/app/config.py:186-197`](bazarr/app/config.py:186) - Translator settings validators
-
-### Backend API
-- [`bazarr/api/translator/translator.py`](bazarr/api/translator/translator.py) - Translator API endpoints (status, jobs, config)
-- [`bazarr/api/subtitles/subtitles.py:170-181`](bazarr/api/subtitles/subtitles.py:170) - Translate action handler
-- [`bazarr/api/system/settings.py`](bazarr/api/system/settings.py) - Settings save endpoint
-
-### Translation Services
-- [`bazarr/subtitles/tools/translate/main.py`](bazarr/subtitles/tools/translate/main.py) - Main translation entry point
-- [`bazarr/subtitles/tools/translate/services/translator_factory.py`](bazarr/subtitles/tools/translate/services/translator_factory.py) - Translator factory
-- [`bazarr/subtitles/tools/translate/services/openrouter_translator.py`](bazarr/subtitles/tools/translate/services/openrouter_translator.py) - AI Subtitle Translator service
-
-### Frontend
-- [`frontend/src/pages/Settings/Subtitles/index.tsx:534-655`](frontend/src/pages/Settings/Subtitles/index.tsx:534) - Translator settings UI
-- [`frontend/src/components/TranslatorStatus.tsx`](frontend/src/components/TranslatorStatus.tsx) - Status panel component
-- [`frontend/src/apis/hooks/translator.ts`](frontend/src/apis/hooks/translator.ts) - API hooks for translator
-
----
-
-## Recommended Fixes Summary
-
-### Immediate Fixes
-
-1. **Add `maxConcurrent` to translation payload** (1 line change)
-   - File: `bazarr/subtitles/tools/translate/services/openrouter_translator.py`
-   - Add: `"maxConcurrent": settings.translator.openrouter_max_concurrent`
-
-2. **Update Status Panel display**
-   - Show Bazarr's configured values, with clarification label
-   - Alternative: Sync config to microservice on save
-
-### Future Enhancements
-
-1. **Add automatic translation option**
-   - Post-download hook for newly downloaded subtitles
-   - Option in language profiles
-
-2. **Real-time config sync**
-   - Push config changes to microservice immediately
-   - Keep microservice in sync with Bazarr settings
\ No newline at end of file
diff --git a/docs/FORK_MAINTENANCE.md b/docs/FORK_MAINTENANCE.md
index f9aba4cdfc..3f22a05033 100644
--- a/docs/FORK_MAINTENANCE.md
+++ b/docs/FORK_MAINTENANCE.md
@@ -1,285 +1,88 @@
-# Bazarr LavX Fork - Maintenance Guide
+# Bazarr+ Maintenance Guide
 
-This document describes the automated workflow for maintaining this fork of [Bazarr](https://github.com/morpheus65535/bazarr).
+Bazarr+ is a hard fork of [Bazarr](https://github.com/morpheus65535/bazarr). It shares the original codebase as a starting point but is developed independently. There is no automatic upstream synchronization.
 
-## Overview
+## Relationship with Upstream
 
-This fork contains custom modifications (primarily the OpenSubtitles.org web scraper provider) that are automatically kept in sync with the upstream Bazarr repository. The workflow handles:
+Bazarr+ may selectively cherry-pick bug fixes from upstream when relevant, but does not merge upstream releases wholesale. The codebases have diverged significantly in security model, UI, features, and architecture.
 
-1. **Upstream Synchronization** - Daily automatic merging of upstream changes
-2. **Conflict Resolution** - Automatic PR creation when merge conflicts occur
-3. **Docker Builds** - Automated multi-architecture Docker image builds
-4. **Publishing** - Images published to GitHub Container Registry
+**When cherry-picking from upstream:**
+1. Evaluate whether the fix applies to Bazarr+ (upstream may fix things we've already addressed differently)
+2. Cherry-pick individual commits: `git cherry-pick <commit-sha>`
+3. Review for conflicts with fork-specific code (security hardening, telemetry removal, UI changes)
+4. Test thoroughly before merging
 
-## Architecture
-
-```
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚                           GitHub Actions Workflows                          โ”‚
-โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค
-โ”‚                                                                             โ”‚
-โ”‚  โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”         โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”   โ”‚
-โ”‚  โ”‚  sync-upstream.yml  โ”‚         โ”‚       build-docker.yml              โ”‚   โ”‚
-โ”‚  โ”‚                     โ”‚         โ”‚                                     โ”‚   โ”‚
-โ”‚  โ”‚  โ€ข Daily 4 AM UTC   โ”‚โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€>โ”‚  โ€ข Build frontend                   โ”‚   โ”‚
-โ”‚  โ”‚  โ€ข Fetch upstream   โ”‚ trigger โ”‚  โ€ข Build Docker image               โ”‚   โ”‚
-โ”‚  โ”‚  โ€ข Auto merge       โ”‚         โ”‚  โ€ข Push to ghcr.io                  โ”‚   โ”‚
-โ”‚  โ”‚  โ€ข Conflict PR      โ”‚         โ”‚  โ€ข multi-arch (amd64/arm64)         โ”‚   โ”‚
-โ”‚  โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜         โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜   โ”‚
-โ”‚                                                                             โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-```
-
-## Workflows
-
-### 1. Upstream Sync (`sync-upstream.yml`)
-
-**Schedule:** Daily at 4:00 AM UTC (5:00 AM Budapest time)
-
-**Triggers:**
-- Scheduled cron job
-- Manual dispatch from GitHub Actions UI
+## Versioning
 
-**Process:**
-1. Fetches latest commits from `morpheus65535/bazarr:master`
-2. Compares with current fork
-3. Attempts automatic merge
-4. If successful: pushes changes and triggers Docker build
-5. If conflicts: creates a PR with `sync-conflict` label
+Bazarr+ uses independent semantic versioning, starting at v2.0.0. Versions are not tied to upstream Bazarr release numbers.
 
-**Manual Trigger:**
-```bash
-# Via GitHub CLI
-gh workflow run sync-upstream.yml
+```
+v{major}.{minor}.{patch}
 
-# With force sync (even if no new commits)
-gh workflow run sync-upstream.yml -f force_sync=true
+Example: v2.0.0, v2.1.0, v2.0.1
 ```
 
-### 2. Docker Build (`build-docker.yml`)
+- Patch (v2.0.1): bug fixes
+- Minor (v2.1.0): new features, backwards-compatible
+- Major (v3.0.0): breaking changes
+
+## Docker Build (`build-docker.yml`)
 
 **Triggers:**
-- Push to `main` branch
-- Called by sync workflow after successful merge
+- Push to `master` branch
 - Manual dispatch
 - Tag creation (for releases)
 
 **Output:**
 - `ghcr.io/lavx/bazarr:latest` - Latest build
-- `ghcr.io/lavx/bazarr:vX.Y.Z-lavx.YYYYMMDD` - Versioned build
+- `ghcr.io/lavx/bazarr:X.Y.Z` - Versioned build
 - `ghcr.io/lavx/bazarr:sha-XXXXXXX` - Git SHA reference
 
-## Using the Docker Image
+## Branch Model
 
-### Quick Start
-
-```bash
-docker run -d \
-  --name bazarr \
-  -p 6767:6767 \
-  -v /path/to/config:/config \
-  -v /path/to/movies:/movies \
-  -v /path/to/tv:/tv \
-  -e PUID=1000 \
-  -e PGID=1000 \
-  -e TZ=Europe/Budapest \
-  ghcr.io/lavx/bazarr:latest
-```
-
-### Docker Compose
-
-Create a `docker-compose.yml`:
-
-```yaml
-services:
-  bazarr:
-    image: ghcr.io/lavx/bazarr:latest
-    container_name: bazarr
-    restart: unless-stopped
-    ports:
-      - "6767:6767"
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Budapest
-    volumes:
-      - ./config:/config
-      - /path/to/movies:/movies
-      - /path/to/tv:/tv
-```
-
-Then run:
-```bash
-docker compose up -d
-```
-
-### Environment Variables
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `PUID` | `1000` | User ID for file permissions |
-| `PGID` | `1000` | Group ID for file permissions |
-| `TZ` | `UTC` | Timezone (e.g., `Europe/Budapest`) |
-
-## Handling Merge Conflicts
-
-When upstream changes conflict with fork modifications:
-
-1. **Notification:** A PR is automatically created with the `sync-conflict` label
-2. **Review:** Check the PR for conflict markers
-3. **Fix locally:**
-   ```bash
-   git fetch origin sync/upstream-XXXXXXXX
-   git checkout sync/upstream-XXXXXXXX
-   # Resolve conflicts in your editor
-   git add .
-   git commit -m "Resolve merge conflicts"
-   git push origin sync/upstream-XXXXXXXX
-   ```
-4. **Merge:** Merge the PR via GitHub UI
-5. **Build:** Docker build will trigger automatically
+- `master` contains stable releases
+- `development` is the integration branch where new features land
+- Feature branches are created from `development` and merged back via PR
 
 ## Fork-Specific Files
 
-These files are unique to this fork and should be preserved during merges:
+Key files that define Bazarr+ and differentiate it from upstream:
 
 | File | Purpose |
 |------|---------|
 | `custom_libs/subliminal_patch/providers/opensubtitles_scraper.py` | OpenSubtitles.org scraper mixin |
 | `custom_libs/subliminal_patch/providers/opensubtitles.py` | Modified provider with scraper support |
-| `opensubtitles-scraper/` | Git submodule - web scraper service |
+| `opensubtitles-scraper/` | Git submodule: web scraper service |
+| `ai-subtitle-translator/` | Git submodule: AI translator service |
 | `package_info` | Fork identification (shown in System Status) |
-| `bazarr/app/check_update.py` | Modified to use fork's releases |
-| `.github/workflows/sync-upstream.yml` | Upstream sync workflow |
+| `bazarr/app/check_update.py` | Uses fork's releases, not upstream |
 | `.github/workflows/build-docker.yml` | Docker build workflow |
-| `Dockerfile` | Production Docker image |
+| `Dockerfile` | Production Docker image (Python 3.14) |
 | `docker-compose.yml` | User deployment template |
-| `.gitattributes` | Merge conflict protection rules |
-
-## OpenSubtitles Scraper Service
+| `bazarr/utilities/analytics.py` | Deleted (contained GA4 + UA telemetry) |
 
-This fork includes the [OpenSubtitles Scraper](https://github.com/LavX/opensubtitles-scraper) as a git submodule. The scraper is a standalone service that provides web scraping capabilities for OpenSubtitles.org.
-
-### Architecture
-
-```
-โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”     HTTP API     โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”
-โ”‚      Bazarr        โ”‚ โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€> โ”‚  OpenSubtitles Scraper  โ”‚
-โ”‚  (LavX Fork)       โ”‚                  โ”‚    (Port 8765)          โ”‚
-โ”‚                    โ”‚ <โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ โ”‚                         โ”‚
-โ”‚  Uses provider:    โ”‚   JSON Response  โ”‚  Scrapes:               โ”‚
-โ”‚  opensubtitles.org โ”‚                  โ”‚  - opensubtitles.org    โ”‚
-โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜                  โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜
-```
-
-### Docker Compose Deployment
-
-The `docker-compose.yml` includes both services:
-
-```yaml
-services:
-  opensubtitles-scraper:
-    image: ghcr.io/lavx/opensubtitles-scraper:latest
-    ports:
-      - "8765:8765"
-    
-  bazarr:
-    image: ghcr.io/lavx/bazarr:latest
-    depends_on:
-      - opensubtitles-scraper
-    environment:
-      - OPENSUBTITLES_SCRAPER_URL=http://opensubtitles-scraper:8765
-```
+## Auto-Update Behavior
 
-### Updating the Scraper Submodule
+### Docker: Auto-Update is Disabled
 
-To update the scraper to the latest version:
+The Docker image runs with `--no-update` flag. Update by pulling new images:
 
 ```bash
-cd opensubtitles-scraper
-git pull origin main
-cd ..
-git add opensubtitles-scraper
-git commit -m "Update opensubtitles-scraper submodule"
-git push
-```
-
-## Versioning
-
-This fork uses a versioning scheme that combines upstream version with fork identifier:
-
-```
-{upstream_version}-lavx.{date}
-
-Example: v1.5.3-lavx.20241214
+docker compose pull
+docker compose up -d
 ```
 
-This makes it clear:
-- Which upstream version the build is based on
-- When the fork build was created
-- That it contains fork-specific modifications
+### Release Repository
 
-## Auto-Update Behavior
-
-### Important: Auto-Update is Disabled in Docker
-
-The Docker image runs with `--no-update` flag to prevent Bazarr's built-in update mechanism from overwriting your fork modifications. **This is intentional.**
-
-### How Updates Work
-
-| Scenario | Behavior |
-|----------|----------|
-| **Docker Container** | Auto-update disabled; use new Docker image for updates |
-| **Manual Installation** | Auto-update can be enabled, but will pull from this fork |
-| **Release Info in UI** | Shows releases from this fork (LavX/bazarr) |
-
-### Release Repository Configuration
-
-The fork is configured to check releases from `LavX/bazarr` instead of upstream. This is controlled by:
+The fork checks releases from `LavX/bazarr`:
 
 ```python
 # In bazarr/app/check_update.py
 RELEASES_REPO = os.environ.get('BAZARR_RELEASES_REPO', 'LavX/bazarr')
 ```
 
-To change the release source (e.g., for debugging), set the environment variable:
-
-```yaml
-# docker-compose.yml
-environment:
-  - BAZARR_RELEASES_REPO=morpheus65535/Bazarr  # Use upstream releases
-```
-
-### Updating Docker Containers
-
-To update to a new version:
-
-```bash
-# Pull the latest image
-docker compose pull
-
-# Recreate the container
-docker compose up -d
-
-# Or in one command
-docker compose up -d --pull always
-```
-
-### Why Docker Doesn't Auto-Update
-
-1. **Preservation of modifications**: Auto-update would download vanilla Bazarr, losing the OpenSubtitles scraper
-2. **Immutable containers**: Docker best practices recommend replacing containers rather than modifying them
-3. **Reproducibility**: Pinned versions ensure consistent behavior
-4. **Rollback capability**: Easy to rollback by pulling a specific tag
-
 ## Troubleshooting
 
-### Sync Workflow Fails
-
-1. Check the workflow logs in GitHub Actions
-2. Verify upstream repository is accessible
-3. Check if there are unresolved conflicts from previous sync
-
 ### Docker Build Fails
 
 1. Check if frontend build succeeded
@@ -296,17 +99,8 @@ echo $GITHUB_TOKEN | docker login ghcr.io -u USERNAME --password-stdin
 docker pull ghcr.io/lavx/bazarr:latest
 ```
 
-## Contributing
-
-When making changes to fork-specific files:
-
-1. Test changes locally first
-2. Ensure changes don't conflict with upstream structure
-3. Document any new environment variables or features
-4. Update this documentation if workflow changes
-
 ## Related Links
 
-- [Upstream Bazarr Repository](https://github.com/morpheus65535/bazarr)
+- [Upstream Bazarr Repository](https://github.com/morpheus65535/bazarr) (original, not synced)
 - [GitHub Container Registry](https://ghcr.io/lavx/bazarr)
-- [Bazarr Wiki](https://wiki.bazarr.media)
\ No newline at end of file
+- [Contributing Guide](../CONTRIBUTING.md)
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
deleted file mode 100644
index f1418bfdf5..0000000000
--- a/frontend/.eslintrc.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  "rules": {
-    "no-console": "error",
-    "camelcase": "warn",
-    "no-restricted-imports": [
-      "error",
-      {
-        "patterns": ["..*"]
-      }
-    ],
-    "simple-import-sort/imports": "error",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-empty-function": "warn",
-    "@typescript-eslint/no-empty-interface": "off",
-    "@typescript-eslint/no-unused-vars": "warn"
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:react-hooks/recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "plugins": ["testing-library", "simple-import-sort", "react-refresh"],
-  "overrides": [
-    {
-      "files": [
-        "**/__tests__/**/*.[jt]s?(x)",
-        "**/?(*.)+(spec|test).[jt]s?(x)"
-      ],
-      "extends": ["plugin:testing-library/react"]
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {
-        "simple-import-sort/imports": [
-          "error",
-          {
-            "groups": [
-              [
-                // React Packages
-                "^react",
-                // Mantine Packages
-                "^@mantine/",
-                // Vendor Packages
-                "^(\\w|@\\w)",
-                // Side Effect Imports
-                "^\\u0000",
-                // Internal Packages
-                "^@/\\w",
-                // Parent Imports
-                "^\\.\\.(?!/?$)",
-                "^\\.\\./?$",
-                // Relative Imports
-                "^\\./(?=.*/)(?!/?$)",
-                "^\\.(?!/?$)",
-                "^\\./?$",
-                // Style Imports
-                "^.+\\.?(css)$"
-              ]
-            ]
-          }
-        ]
-      }
-    }
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaVersion": "latest"
-  }
-}
diff --git a/frontend/.husky/pre-commit b/frontend/.husky/pre-commit
index 71a781c99a..b47088403d 100755
--- a/frontend/.husky/pre-commit
+++ b/frontend/.husky/pre-commit
@@ -1,6 +1,3 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 [ -n "$CI" ] && exit 0
 
 cd frontend || exit
diff --git a/frontend/README.md b/frontend/README.md
index 5fcd3d4816..8539c40437 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -14,7 +14,7 @@
 1. Clone or download this repository
 
    ```
-   $ git clone https://github.com/morpheus65535/bazarr.git
+   $ git clone https://github.com/LavX/bazarr.git
    $ cd bazarr/frontend
    ```
 
diff --git a/frontend/eslint.config.mjs b/frontend/eslint.config.mjs
new file mode 100644
index 0000000000..136e64e304
--- /dev/null
+++ b/frontend/eslint.config.mjs
@@ -0,0 +1,89 @@
+import js from "@eslint/js";
+import tseslint from "typescript-eslint";
+import reactHooks from "eslint-plugin-react-hooks";
+import reactRefresh from "eslint-plugin-react-refresh";
+import simpleImportSort from "eslint-plugin-simple-import-sort";
+import testingLibrary from "eslint-plugin-testing-library";
+import globals from "globals";
+
+export default tseslint.config(
+  {
+    ignores: [
+      "dist",
+      "build",
+      "coverage",
+      "node_modules",
+      "dev-dist",
+      ".husky",
+      "eslint.config.mjs",
+      "vite.config.ts",
+    ],
+  },
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    plugins: {
+      "react-hooks": reactHooks,
+      "react-refresh": reactRefresh.default || reactRefresh,
+      "simple-import-sort": simpleImportSort,
+    },
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.node,
+      },
+    },
+    rules: {
+      ...reactHooks.configs.recommended.rules,
+      "no-console": "error",
+      camelcase: "warn",
+      "no-restricted-imports": [
+        "error",
+        {
+          patterns: ["..*"],
+        },
+      ],
+      "simple-import-sort/imports": "error",
+      "@typescript-eslint/explicit-module-boundary-types": "off",
+      "@typescript-eslint/no-empty-function": "warn",
+      "@typescript-eslint/no-empty-interface": "off",
+      "@typescript-eslint/no-unused-vars": "warn",
+      "@typescript-eslint/no-empty-object-type": "off",
+      "@typescript-eslint/no-unused-expressions": "off",
+      "no-useless-assignment": "off",
+      "react-hooks/set-state-in-effect": "off",
+      "react-hooks/refs": "off",
+      "react-hooks/static-components": "off",
+      "react-hooks/incompatible-library": "off",
+    },
+  },
+  {
+    files: ["**/*.ts", "**/*.tsx"],
+    rules: {
+      "simple-import-sort/imports": [
+        "error",
+        {
+          groups: [
+            [
+              "^react",
+              "^@mantine/",
+              "^(\\w|@\\w)",
+              "^\\u0000",
+              "^@/\\w",
+              "^\\.\\.(?!/?$)",
+              "^\\.\\./?$",
+              "^\\./(?=.*/)(?!/?$)",
+              "^\\.(?!/?$)",
+              "^\\./?$",
+              "^.+\\.?(css)$",
+            ],
+          ],
+        },
+      ],
+    },
+  },
+  {
+    files: ["**/__tests__/**/*.[jt]s?(x)", "**/?(*.)+(spec|test).[jt]s?(x)"],
+    ...testingLibrary.configs["flat/react"],
+  },
+);
diff --git a/frontend/index.html b/frontend/index.html
index 46f5375a87..0d79f37e5b 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -15,7 +15,7 @@
       href="./images/maskable-icon-512x512.png"
       color="#FFFFFF"
     />
-    <meta name="theme-color" content="#be4bdb" />
+    <meta name="theme-color" content="#b36b00" />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1"
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c9a51e4fc2..a925c3007b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -9,74 +9,87 @@
       "version": "1.0.0",
       "license": "GPL-3",
       "dependencies": {
-        "@mantine/core": "^8.3.9",
-        "@mantine/dropzone": "^8.3.9",
-        "@mantine/form": "^8.3.9",
-        "@mantine/hooks": "^8.3.9",
-        "@mantine/modals": "^8.3.9",
-        "@mantine/notifications": "^8.3.9",
-        "@tanstack/react-query": "^5.64.1",
-        "@tanstack/react-table": "^8.19.2",
-        "axios": "^1.8.2",
+        "@fontsource-variable/geist": "^5.2.8",
+        "@mantine/core": "^8.3.16",
+        "@mantine/dropzone": "^8.3.16",
+        "@mantine/form": "^8.3.16",
+        "@mantine/hooks": "^8.3.16",
+        "@mantine/modals": "^8.3.16",
+        "@mantine/notifications": "^8.3.16",
+        "@tanstack/react-query": "^5.90.21",
+        "@tanstack/react-table": "^8.21.3",
+        "@tanstack/react-virtual": "^3.13.23",
+        "axios": "^1.13.6",
         "braces": "^3.0.3",
-        "react": "^19.2.3",
-        "react-dom": "^19.2.3",
-        "react-router": "^7.1.1",
+        "react": "^19.2.4",
+        "react-dom": "^19.2.4",
+        "react-router": "^7.13.1",
         "react-timeago": "^8.3.0",
-        "socket.io-client": "^4.7.5"
+        "socket.io-client": "^4.8.3"
       },
       "devDependencies": {
-        "@fontsource/roboto": "^5.0.12",
-        "@fortawesome/fontawesome-svg-core": "^7.1.0",
-        "@fortawesome/free-brands-svg-icons": "^7.1.0",
-        "@fortawesome/free-regular-svg-icons": "^7.1.0",
-        "@fortawesome/free-solid-svg-icons": "^7.1.0",
-        "@fortawesome/react-fontawesome": "^3.1.0",
-        "@tanstack/react-query-devtools": "^5.40.1",
-        "@testing-library/jest-dom": "^6.4.2",
-        "@testing-library/react": "^16.1.0",
-        "@testing-library/user-event": "^14.5.2",
-        "@types/jest": "^29.5.12",
-        "@types/lodash": "^4.17.1",
-        "@types/node": "^22.14.1",
-        "@types/react": "^19.2.3",
+        "@eslint/js": "^10.0.1",
+        "@fortawesome/fontawesome-svg-core": "^7.2.0",
+        "@fortawesome/free-brands-svg-icons": "^7.2.0",
+        "@fortawesome/free-regular-svg-icons": "^7.2.0",
+        "@fortawesome/free-solid-svg-icons": "^7.2.0",
+        "@fortawesome/react-fontawesome": "^3.2.0",
+        "@tanstack/react-query-devtools": "^5.91.3",
+        "@testing-library/dom": "^10.4.1",
+        "@testing-library/jest-dom": "^6.9.1",
+        "@testing-library/react": "^16.3.2",
+        "@testing-library/user-event": "^14.6.1",
+        "@types/jest": "^30.0.0",
+        "@types/lodash": "^4.17.24",
+        "@types/node": "^25.4.0",
+        "@types/react": "^19.2.14",
         "@types/react-dom": "^19.2.3",
-        "@typescript-eslint/eslint-plugin": "^7.16.0",
-        "@typescript-eslint/parser": "^7.16.0",
-        "@vite-pwa/assets-generator": "^1.0.0",
-        "@vitejs/plugin-react": "^5.0.1",
-        "@vitest/coverage-v8": "^3.2.4",
-        "@vitest/ui": "^3.2.4",
-        "clsx": "^2.1.0",
-        "eslint": "^8.57.0",
-        "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-react-refresh": "^0.4.7",
-        "eslint-plugin-simple-import-sort": "^12.1.0",
-        "eslint-plugin-testing-library": "^6.2.0",
-        "husky": "^9.0.11",
-        "jsdom": "^26.0.0",
-        "lodash": "^4.17.21",
-        "msw": "^2.7.0",
+        "@typescript-eslint/eslint-plugin": "^8.57.0",
+        "@typescript-eslint/parser": "^8.57.0",
+        "@vite-pwa/assets-generator": "^1.0.2",
+        "@vitejs/plugin-react": "^5.1.4",
+        "@vitest/coverage-v8": "^4.0.18",
+        "@vitest/ui": "^4.0.18",
+        "clsx": "^2.1.1",
+        "eslint": "^10.0.3",
+        "eslint-plugin-react-hooks": "^7.0.1",
+        "eslint-plugin-react-refresh": "^0.5.2",
+        "eslint-plugin-simple-import-sort": "^12.1.1",
+        "eslint-plugin-testing-library": "^7.16.0",
+        "globals": "^17.4.0",
+        "husky": "^9.1.7",
+        "jsdom": "^28.1.0",
+        "lodash": "^4.17.23",
+        "msw": "^2.12.10",
         "postcss-preset-mantine": "^1.18.0",
         "postcss-simple-vars": "^7.0.1",
-        "prettier": "^3.2.5",
-        "prettier-plugin-organize-imports": "^3.2.4",
-        "pretty-quick": "^4.0.0",
-        "recharts": "^2.15.0",
-        "sass-embedded": "^1.86.1",
-        "typescript": "^5.4.4",
-        "vite": "^7.1.3",
-        "vite-plugin-checker": "^0.10.3",
-        "vite-plugin-pwa": "^1.0.3",
-        "vitest": "^3.2.4",
-        "yaml": "^2.4.1"
-      }
+        "prettier": "^3.8.1",
+        "prettier-plugin-organize-imports": "^4.3.0",
+        "pretty-quick": "^4.2.2",
+        "recharts": "^3.8.0",
+        "sass-embedded": "^1.98.0",
+        "typescript": "^5.9.3",
+        "typescript-eslint": "^8.57.0",
+        "vite": "^7.3.1",
+        "vite-plugin-checker": "^0.12.0",
+        "vite-plugin-pwa": "^1.2.0",
+        "vitest": "^4.0.18",
+        "yaml": "^2.8.2"
+      }
+    },
+    "node_modules/@acemir/cssom": {
+      "version": "0.9.31",
+      "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.31.tgz",
+      "integrity": "sha512-ZnR3GSaH+/vJ0YlHau21FjfLYjMpYVIzTD8M8vIEQvIGxeOXyXdzCI140rrCY862p/C/BbzWsjc1dgnM9mkoTA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@adobe/css-tools": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz",
-      "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==",
-      "dev": true
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.4.tgz",
+      "integrity": "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.3.0",
@@ -92,34 +105,71 @@
       }
     },
     "node_modules/@asamuzakjp/css-color": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-2.8.3.tgz",
-      "integrity": "sha512-GIc76d9UI1hCvOATjZPyHFmE5qhRccp3/zGfMPapK3jBi+yocEzp6BBB0UnfRYP9NP4FANqUZYb0hnfs3TM3hw==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.1.1.tgz",
+      "integrity": "sha512-iGWN8E45Ws0XWx3D44Q1t6vX2LqhCKcwfmwBYCDsFrYFS6m4q/Ks61L2veETaLv+ckDC6+dTETJoaAAb7VjLiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@csstools/css-calc": "^2.1.1",
-        "@csstools/css-color-parser": "^3.0.7",
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3",
-        "lru-cache": "^10.4.3"
+        "@csstools/css-calc": "^3.1.1",
+        "@csstools/css-color-parser": "^4.0.2",
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0",
+        "lru-cache": "^11.2.7"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/@asamuzakjp/css-color/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
       "dev": true,
-      "license": "ISC"
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@asamuzakjp/dom-selector": {
+      "version": "6.8.1",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.8.1.tgz",
+      "integrity": "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@asamuzakjp/nwsapi": "^2.3.9",
+        "bidi-js": "^1.0.3",
+        "css-tree": "^3.1.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "lru-cache": "^11.2.6"
+      }
+    },
+    "node_modules/@asamuzakjp/dom-selector/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/@asamuzakjp/nwsapi": {
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz",
+      "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
-      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz",
+      "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.1.1"
       },
@@ -128,9 +178,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
-      "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz",
+      "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -168,21 +218,15 @@
         "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true
-    },
     "node_modules/@babel/generator": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
-      "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
+      "version": "7.29.1",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz",
+      "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.28.3",
-        "@babel/types": "^7.28.2",
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
         "@jridgewell/gen-mapping": "^0.3.12",
         "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
@@ -192,26 +236,26 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
-      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.9"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
-      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz",
+      "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.2",
+        "@babel/compat-data": "^7.28.6",
         "@babel/helper-validator-option": "^7.27.1",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -222,18 +266,18 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.0.tgz",
-      "integrity": "sha512-vSGCvMecvFCd/BdpGlhpXYNhhC4ccxyvQWpbGL4CWbvfEoLFWUZuSuf7s9Aw70flgQF+6vptvgK2IfOnKlRmBg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz",
+      "integrity": "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-member-expression-to-functions": "^7.25.9",
-        "@babel/helper-optimise-call-expression": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.26.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
-        "@babel/traverse": "^7.27.0",
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.28.6",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -244,14 +288,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.0.tgz",
-      "integrity": "sha512-fO8l08T76v48BhpNRW/nQ0MxfnSdoSKUJBMjubOAYffsVuGG5qOfMq7N6Es7UJvi7Y8goXXo07EfcHZXDPuELQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz",
+      "integrity": "sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "regexpu-core": "^6.2.0",
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "regexpu-core": "^6.3.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -262,22 +306,47 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.4.tgz",
-      "integrity": "sha512-jljfR1rGnXXNWnmQg2K3+bvhkxB51Rl32QRaOTuwwjviGrHzIbSc8+x9CpraDtbT7mfyjXObULP4w/adunNwAw==",
+      "version": "0.6.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.7.tgz",
+      "integrity": "sha512-6Fqi8MtQ/PweQ9xvux65emkLQ83uB+qAVtfHkC9UodyHMIZdxNI01HjLCLUtybElp2KY2XNE0nOgyP1E1vXw9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "debug": "^4.4.3",
         "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "resolve": "^1.22.11"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@babel/helper-globals": {
       "version": "7.28.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
@@ -289,43 +358,43 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
-      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz",
+      "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
-      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz",
+      "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
-      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz",
+      "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1",
-        "@babel/traverse": "^7.28.3"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -335,22 +404,22 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
-      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.9"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
-      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -358,15 +427,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
-      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-wrap-function": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -376,15 +445,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
-      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz",
+      "integrity": "sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.9",
-        "@babel/helper-optimise-call-expression": "^7.25.9",
-        "@babel/traverse": "^7.26.5"
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -394,14 +463,14 @@
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
-      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -418,9 +487,9 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -438,42 +507,42 @@
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
-      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.6.tgz",
+      "integrity": "sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.25.9",
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.3.tgz",
-      "integrity": "sha512-PTNtvUQihsAsDHMOP5pfobP8C6CM4JWXmP8DrEIt46c3r2bf87Ua1zoqevsMo9g+tWDwgWrFP5EIxuBx5RudAw==",
+      "version": "7.29.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz",
+      "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.2"
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
-      "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz",
+      "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.28.2"
+        "@babel/types": "^7.29.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -483,14 +552,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
-      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz",
+      "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -500,13 +569,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
-      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -516,13 +585,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
-      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -532,15 +601,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
-      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
-        "@babel/plugin-transform-optional-chaining": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -550,14 +619,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
-      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.6.tgz",
+      "integrity": "sha512-a0aBScVTlNaiUe35UtfxAN7A/tehvvG4/ByO6+46VPKTRSlfnAFsgKy0FUh+qAkQrDTmhDkT+IBOKlOoMUxQ0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -580,13 +649,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
-      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.28.6.tgz",
+      "integrity": "sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -596,13 +665,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-      "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
+      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -629,13 +698,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
-      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -645,15 +714,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.26.8.tgz",
-      "integrity": "sha512-He9Ej2X7tNf2zdKMAGOsmg2MrFc+hfoAhd3po4cWfo/NWjzEAKa0oQruj1ROVUdl0e6fb6/kE/G3SSxE0lRJOg==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz",
+      "integrity": "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-remap-async-to-generator": "^7.25.9",
-        "@babel/traverse": "^7.26.8"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.29.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -663,15 +732,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
-      "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.28.6.tgz",
+      "integrity": "sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-remap-async-to-generator": "^7.25.9"
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -681,13 +750,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
-      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -697,13 +766,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.27.0.tgz",
-      "integrity": "sha512-u1jGphZ8uDI2Pj/HJj6YQ6XQLZCNjOlprjxB5SVz6rq2T6SwAR+CdrWK0CP7F+9rDVMXdB0+r6Am5G5aobOjAQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.6.tgz",
+      "integrity": "sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -713,14 +782,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
-      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.28.6.tgz",
+      "integrity": "sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -730,14 +799,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
-      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.6.tgz",
+      "integrity": "sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -747,18 +816,18 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
-      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.6.tgz",
+      "integrity": "sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.25.9",
-        "@babel/traverse": "^7.25.9",
-        "globals": "^11.1.0"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-replace-supers": "^7.28.6",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -768,14 +837,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
-      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.28.6.tgz",
+      "integrity": "sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/template": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/template": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -785,13 +854,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
-      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz",
+      "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -801,14 +871,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
-      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.28.6.tgz",
+      "integrity": "sha512-SljjowuNKB7q5Oayv4FoPzeB74g3QgLt8IVJw9ADvWy3QnUb/01aw8I4AVv8wYnPvQz2GDDZ/g3GhcNyDBI4Bg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -818,13 +888,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
-      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -834,14 +904,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
-      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -851,13 +921,30 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
-      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.6.tgz",
+      "integrity": "sha512-Iao5Konzx2b6g7EPqTy40UZbcdXE126tTxVFr/nAIj+WItNxjKSYTEw3RC+A2/ZetmdJsgueL1KhaMCQHkLPIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -867,13 +954,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
-      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.6.tgz",
+      "integrity": "sha512-WitabqiGjV/vJ0aPOLSFfNY1u9U3R7W36B03r5I2KoNix+a3sOhJ3pKFB3R5It9/UiK78NiO0KE9P21cMhlPkw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -883,13 +970,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
-      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -899,14 +986,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
-      "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -916,15 +1003,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
-      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -934,13 +1021,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
-      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.28.6.tgz",
+      "integrity": "sha512-Nr+hEN+0geQkzhbdgQVPoqr47lZbm+5fCUmO70722xJZd0Mvb59+33QLImGj6F+DkK3xgDi1YVysP8whD6FQAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -950,13 +1037,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
-      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -966,13 +1053,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
-      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.6.tgz",
+      "integrity": "sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -982,13 +1069,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
-      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -998,14 +1085,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
-      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1015,14 +1102,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
-      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.28.6.tgz",
+      "integrity": "sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1032,16 +1119,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
-      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz",
+      "integrity": "sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9",
-        "@babel/traverse": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.29.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1051,14 +1138,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
-      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1068,14 +1155,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
-      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1085,13 +1172,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
-      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1101,13 +1188,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.26.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
-      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.28.6.tgz",
+      "integrity": "sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1117,13 +1204,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
-      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.28.6.tgz",
+      "integrity": "sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1133,15 +1220,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
-      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.6.tgz",
+      "integrity": "sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/plugin-transform-parameters": "^7.25.9"
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1151,14 +1240,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
-      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-replace-supers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1168,13 +1257,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
-      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.28.6.tgz",
+      "integrity": "sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1184,14 +1273,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
-      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.6.tgz",
+      "integrity": "sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1201,13 +1290,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
-      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1217,14 +1306,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
-      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.28.6.tgz",
+      "integrity": "sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1234,15 +1323,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
-      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.28.6.tgz",
+      "integrity": "sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.9",
-        "@babel/helper-create-class-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1252,13 +1341,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
-      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1300,14 +1389,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.27.0.tgz",
-      "integrity": "sha512-LX/vCajUJQDqE7Aum/ELUMZAY19+cDpghxrnyt5I1tV6X5PyC86AOoWXWFYFeIvauyeSA6/ktn4tQVn/3ZifsA==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz",
+      "integrity": "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "regenerator-transform": "^0.15.2"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1317,14 +1405,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-regexp-modifiers": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
-      "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.28.6.tgz",
+      "integrity": "sha512-QGWAepm9qxpaIs7UM9FvUSnCGlb8Ua1RhyM4/veAxLwt3gMat/LSGrZixyuj4I6+Kn9iwvqCyPTtbdxanYoWYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1334,13 +1422,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
-      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1350,13 +1438,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
-      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1366,14 +1454,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
-      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.28.6.tgz",
+      "integrity": "sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1383,13 +1471,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
-      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1399,13 +1487,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
-      "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1415,13 +1503,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.27.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.0.tgz",
-      "integrity": "sha512-+LLkxA9rKJpNoGsbLnAgOCdESl73vwYn+V6b+5wHbrE7OGKVDPHIQvbFSzqE6rwqaCw2RE+zdJrlLkcf8YOA0w==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.26.5"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1431,13 +1519,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
-      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1447,14 +1535,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
-      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.28.6.tgz",
+      "integrity": "sha512-4Wlbdl/sIZjzi/8St0evF0gEZrgOswVO6aOzqxh1kDZOl9WmLrHq2HtGhnOJZmHZYKP8WZ1MDLCt5DAWwRo57A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1464,14 +1552,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
-      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1481,14 +1569,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
-      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.28.6.tgz",
+      "integrity": "sha512-/wHc/paTUmsDYN7SZkpWxogTOBNnlx7nBQYfy6JJlCT7G3mVhltk3e++N7zV0XfgGsrqBxd4rJQt9H16I21Y1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1498,80 +1586,81 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.9.tgz",
-      "integrity": "sha512-vX3qPGE8sEKEAZCWk05k3cpTAE3/nOYca++JA+Rd0z2NCNzabmYvEiSShKzm10zdquOIAVXsy2Ei/DTW34KlKQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.0.tgz",
+      "integrity": "sha512-fNEdfc0yi16lt6IZo2Qxk3knHVdfMYX33czNb4v8yWhemoBhibCpQK/uYHtSKIiO+p/zd3+8fYVXhQdOVV608w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.26.8",
-        "@babel/helper-compilation-targets": "^7.26.5",
-        "@babel/helper-plugin-utils": "^7.26.5",
-        "@babel/helper-validator-option": "^7.25.9",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
-        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
+        "@babel/compat-data": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-import-assertions": "^7.26.0",
-        "@babel/plugin-syntax-import-attributes": "^7.26.0",
+        "@babel/plugin-syntax-import-assertions": "^7.28.6",
+        "@babel/plugin-syntax-import-attributes": "^7.28.6",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.25.9",
-        "@babel/plugin-transform-async-generator-functions": "^7.26.8",
-        "@babel/plugin-transform-async-to-generator": "^7.25.9",
-        "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
-        "@babel/plugin-transform-block-scoping": "^7.25.9",
-        "@babel/plugin-transform-class-properties": "^7.25.9",
-        "@babel/plugin-transform-class-static-block": "^7.26.0",
-        "@babel/plugin-transform-classes": "^7.25.9",
-        "@babel/plugin-transform-computed-properties": "^7.25.9",
-        "@babel/plugin-transform-destructuring": "^7.25.9",
-        "@babel/plugin-transform-dotall-regex": "^7.25.9",
-        "@babel/plugin-transform-duplicate-keys": "^7.25.9",
-        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
-        "@babel/plugin-transform-dynamic-import": "^7.25.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.25.9",
-        "@babel/plugin-transform-for-of": "^7.26.9",
-        "@babel/plugin-transform-function-name": "^7.25.9",
-        "@babel/plugin-transform-json-strings": "^7.25.9",
-        "@babel/plugin-transform-literals": "^7.25.9",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.25.9",
-        "@babel/plugin-transform-modules-amd": "^7.25.9",
-        "@babel/plugin-transform-modules-commonjs": "^7.26.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.25.9",
-        "@babel/plugin-transform-modules-umd": "^7.25.9",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
-        "@babel/plugin-transform-new-target": "^7.25.9",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
-        "@babel/plugin-transform-numeric-separator": "^7.25.9",
-        "@babel/plugin-transform-object-rest-spread": "^7.25.9",
-        "@babel/plugin-transform-object-super": "^7.25.9",
-        "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
-        "@babel/plugin-transform-optional-chaining": "^7.25.9",
-        "@babel/plugin-transform-parameters": "^7.25.9",
-        "@babel/plugin-transform-private-methods": "^7.25.9",
-        "@babel/plugin-transform-private-property-in-object": "^7.25.9",
-        "@babel/plugin-transform-property-literals": "^7.25.9",
-        "@babel/plugin-transform-regenerator": "^7.25.9",
-        "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
-        "@babel/plugin-transform-reserved-words": "^7.25.9",
-        "@babel/plugin-transform-shorthand-properties": "^7.25.9",
-        "@babel/plugin-transform-spread": "^7.25.9",
-        "@babel/plugin-transform-sticky-regex": "^7.25.9",
-        "@babel/plugin-transform-template-literals": "^7.26.8",
-        "@babel/plugin-transform-typeof-symbol": "^7.26.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.25.9",
-        "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
-        "@babel/plugin-transform-unicode-regex": "^7.25.9",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.29.0",
+        "@babel/plugin-transform-async-to-generator": "^7.28.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.28.6",
+        "@babel/plugin-transform-class-properties": "^7.28.6",
+        "@babel/plugin-transform-class-static-block": "^7.28.6",
+        "@babel/plugin-transform-classes": "^7.28.6",
+        "@babel/plugin-transform-computed-properties": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-dotall-regex": "^7.28.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.0",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.6",
+        "@babel/plugin-transform-exponentiation-operator": "^7.28.6",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.28.6",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.28.6",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.28.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.29.0",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
+        "@babel/plugin-transform-numeric-separator": "^7.28.6",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.6",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.28.6",
+        "@babel/plugin-transform-optional-chaining": "^7.28.6",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/plugin-transform-private-methods": "^7.28.6",
+        "@babel/plugin-transform-private-property-in-object": "^7.28.6",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.29.0",
+        "@babel/plugin-transform-regexp-modifiers": "^7.28.6",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.28.6",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.28.6",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.28.6",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.10",
-        "babel-plugin-polyfill-corejs3": "^0.11.0",
-        "babel-plugin-polyfill-regenerator": "^0.6.1",
-        "core-js-compat": "^3.40.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.15",
+        "babel-plugin-polyfill-corejs3": "^0.14.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.6",
+        "core-js-compat": "^3.48.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -1609,33 +1698,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
-      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz",
+      "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/parser": "^7.27.2",
-        "@babel/types": "^7.27.1"
+        "@babel/code-frame": "^7.28.6",
+        "@babel/parser": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.3.tgz",
-      "integrity": "sha512-7w4kZYHneL3A6NP2nxzHvT3HCZ7puDZZjFMqDpBPECub79sTtSO5CGXDkKrTQq8ksAwfD/XI2MRFX23njdDaIQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz",
+      "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@babel/generator": "^7.28.3",
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
         "@babel/helper-globals": "^7.28.0",
-        "@babel/parser": "^7.28.3",
-        "@babel/template": "^7.27.2",
-        "@babel/types": "^7.28.2",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/types": "^7.29.0",
         "debug": "^4.3.1"
       },
       "engines": {
@@ -1643,14 +1732,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.28.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz",
+      "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
-        "@babel/helper-validator-identifier": "^7.27.1"
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1666,69 +1755,25 @@
         "node": ">=18"
       }
     },
-    "node_modules/@bufbuild/protobuf": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.5.tgz",
-      "integrity": "sha512-/g5EzJifw5GF8aren8wZ/G5oMuPoGeS6MQD3ca8ddcvdXR5UELUfdTZITCGNhNXynY/AYl3Z4plmxdj/tRl/hQ==",
-      "dev": true,
-      "license": "(Apache-2.0 AND BSD-3-Clause)"
-    },
-    "node_modules/@bundled-es-modules/cookie": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@bundled-es-modules/cookie/-/cookie-2.0.1.tgz",
-      "integrity": "sha512-8o+5fRPLNbjbdGRRmJj3h6Hh1AQJf2dk3qQ/5ZFb+PXkRNiSoMGGUKlsgLfrxneb72axVJyIYji64E2+nNfYyw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "cookie": "^0.7.2"
-      }
-    },
-    "node_modules/@bundled-es-modules/cookie/node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+    "node_modules/@bramus/specificity": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz",
+      "integrity": "sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/@bundled-es-modules/statuses": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@bundled-es-modules/statuses/-/statuses-1.0.1.tgz",
-      "integrity": "sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "statuses": "^2.0.1"
-      }
-    },
-    "node_modules/@bundled-es-modules/tough-cookie": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@bundled-es-modules/tough-cookie/-/tough-cookie-0.1.6.tgz",
-      "integrity": "sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==",
-      "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "@types/tough-cookie": "^4.0.5",
-        "tough-cookie": "^4.1.4"
+        "css-tree": "^3.0.0"
+      },
+      "bin": {
+        "specificity": "bin/cli.js"
       }
     },
-    "node_modules/@bundled-es-modules/tough-cookie/node_modules/tough-cookie": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+    "node_modules/@bufbuild/protobuf": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.11.0.tgz",
+      "integrity": "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
     },
     "node_modules/@canvas/image-data": {
       "version": "1.0.0",
@@ -1738,9 +1783,9 @@
       "license": "MIT"
     },
     "node_modules/@csstools/color-helpers": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.1.tgz",
-      "integrity": "sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.2.tgz",
+      "integrity": "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==",
       "dev": true,
       "funding": [
         {
@@ -1754,13 +1799,13 @@
       ],
       "license": "MIT-0",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       }
     },
     "node_modules/@csstools/css-calc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.1.tgz",
-      "integrity": "sha512-rL7kaUnTkL9K+Cvo2pnCieqNpTKgQzy5f+N+5Iuko9HAoasP+xgprVh7KN/MaJVvVL1l0EzQq2MoqBHKSrDrag==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.1.1.tgz",
+      "integrity": "sha512-HJ26Z/vmsZQqs/o3a6bgKslXGFAungXGbinULZO3eMsOyNJHeBBZfup5FiZInOghgoM4Hwnmw+OgbJCNg1wwUQ==",
       "dev": true,
       "funding": [
         {
@@ -1774,17 +1819,17 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0"
       }
     },
     "node_modules/@csstools/css-color-parser": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.7.tgz",
-      "integrity": "sha512-nkMp2mTICw32uE5NN+EsJ4f5N+IGFeCFu4bGpiKgb2Pq/7J/MpyLBeQ5ry4KKtRFZaYs6sTmcMYrSRIyj5DFKA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.0.2.tgz",
+      "integrity": "sha512-0GEfbBLmTFf0dJlpsNU7zwxRIH0/BGEMuXLTCvFYxuL1tNhqzTbtnFICyJLTNK4a+RechKP75e7w42ClXSnJQw==",
       "dev": true,
       "funding": [
         {
@@ -1798,21 +1843,21 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "@csstools/color-helpers": "^5.0.1",
-        "@csstools/css-calc": "^2.1.1"
+        "@csstools/color-helpers": "^6.0.2",
+        "@csstools/css-calc": "^3.1.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.4",
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-parser-algorithms": "^4.0.0",
+        "@csstools/css-tokenizer": "^4.0.0"
       }
     },
     "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz",
-      "integrity": "sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz",
+      "integrity": "sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==",
       "dev": true,
       "funding": [
         {
@@ -1826,16 +1871,41 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.3"
+        "@csstools/css-tokenizer": "^4.0.0"
+      }
+    },
+    "node_modules/@csstools/css-syntax-patches-for-csstree": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.2.tgz",
+      "integrity": "sha512-5GkLzz4prTIpoyeUiIu3iV6CSG3Plo7xRVOFPKI7FVEJ3mZ0A8SwK0XU3Gl7xAkiQ+mDyam+NNp875/C5y+jSA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
+      "peerDependencies": {
+        "css-tree": "^3.2.1"
+      },
+      "peerDependenciesMeta": {
+        "css-tree": {
+          "optional": true
+        }
       }
     },
     "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz",
-      "integrity": "sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz",
+      "integrity": "sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==",
       "dev": true,
       "funding": [
         {
@@ -1849,13 +1919,13 @@
       ],
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20.19.0"
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz",
-      "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz",
+      "integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -1864,9 +1934,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz",
-      "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.4.tgz",
+      "integrity": "sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==",
       "cpu": [
         "ppc64"
       ],
@@ -1881,9 +1951,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz",
-      "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.4.tgz",
+      "integrity": "sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==",
       "cpu": [
         "arm"
       ],
@@ -1898,9 +1968,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz",
-      "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.4.tgz",
+      "integrity": "sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==",
       "cpu": [
         "arm64"
       ],
@@ -1915,9 +1985,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz",
-      "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.4.tgz",
+      "integrity": "sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==",
       "cpu": [
         "x64"
       ],
@@ -1932,9 +2002,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz",
-      "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.4.tgz",
+      "integrity": "sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==",
       "cpu": [
         "arm64"
       ],
@@ -1949,9 +2019,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz",
-      "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.4.tgz",
+      "integrity": "sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==",
       "cpu": [
         "x64"
       ],
@@ -1966,9 +2036,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz",
-      "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.4.tgz",
+      "integrity": "sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==",
       "cpu": [
         "arm64"
       ],
@@ -1983,9 +2053,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz",
-      "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.4.tgz",
+      "integrity": "sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==",
       "cpu": [
         "x64"
       ],
@@ -2000,9 +2070,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz",
-      "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.4.tgz",
+      "integrity": "sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==",
       "cpu": [
         "arm"
       ],
@@ -2017,9 +2087,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz",
-      "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.4.tgz",
+      "integrity": "sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==",
       "cpu": [
         "arm64"
       ],
@@ -2034,9 +2104,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz",
-      "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.4.tgz",
+      "integrity": "sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==",
       "cpu": [
         "ia32"
       ],
@@ -2051,9 +2121,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz",
-      "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.4.tgz",
+      "integrity": "sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==",
       "cpu": [
         "loong64"
       ],
@@ -2068,9 +2138,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz",
-      "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.4.tgz",
+      "integrity": "sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==",
       "cpu": [
         "mips64el"
       ],
@@ -2085,9 +2155,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz",
-      "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.4.tgz",
+      "integrity": "sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==",
       "cpu": [
         "ppc64"
       ],
@@ -2102,9 +2172,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz",
-      "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.4.tgz",
+      "integrity": "sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==",
       "cpu": [
         "riscv64"
       ],
@@ -2119,9 +2189,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz",
-      "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.4.tgz",
+      "integrity": "sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==",
       "cpu": [
         "s390x"
       ],
@@ -2136,9 +2206,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz",
-      "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.4.tgz",
+      "integrity": "sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==",
       "cpu": [
         "x64"
       ],
@@ -2153,9 +2223,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz",
-      "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.4.tgz",
+      "integrity": "sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==",
       "cpu": [
         "arm64"
       ],
@@ -2170,9 +2240,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz",
-      "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.4.tgz",
+      "integrity": "sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==",
       "cpu": [
         "x64"
       ],
@@ -2187,9 +2257,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz",
-      "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.4.tgz",
+      "integrity": "sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==",
       "cpu": [
         "arm64"
       ],
@@ -2204,9 +2274,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz",
-      "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.4.tgz",
+      "integrity": "sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==",
       "cpu": [
         "x64"
       ],
@@ -2220,10 +2290,27 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.4.tgz",
+      "integrity": "sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz",
-      "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.4.tgz",
+      "integrity": "sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==",
       "cpu": [
         "x64"
       ],
@@ -2238,9 +2325,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz",
-      "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.4.tgz",
+      "integrity": "sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==",
       "cpu": [
         "arm64"
       ],
@@ -2255,9 +2342,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz",
-      "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.4.tgz",
+      "integrity": "sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==",
       "cpu": [
         "ia32"
       ],
@@ -2272,9 +2359,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz",
-      "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.4.tgz",
+      "integrity": "sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==",
       "cpu": [
         "x64"
       ],
@@ -2289,86 +2376,136 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
-      "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+    "node_modules/@eslint/config-array": {
+      "version": "0.23.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.3.tgz",
+      "integrity": "sha512-j+eEWmB6YYLwcNOdlwQ6L2OsptI/LO6lNBuLIqe5R7RetD658HLoF+Mn7LzYmAWWNNzdC6cqP+L6r8ujeYXWLw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
+        "@eslint/object-schema": "^3.0.3",
+        "debug": "^4.3.1",
+        "minimatch": "^10.2.4"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+    "node_modules/@eslint/config-helpers": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.5.3.tgz",
+      "integrity": "sha512-lzGN0onllOZCGroKJmRwY6QcEHxbjBw1gwB8SgRSqK8YbbtEXMvKynsXc3553ckIEBxsbMBU7oOZXKIPGZNeZw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "@eslint/core": "^1.1.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/@eslint/core": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.1.1.tgz",
+      "integrity": "sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==",
       "dev": true,
-      "engines": {
-        "node": ">=10"
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz",
+      "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "eslint": "^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.3.tgz",
+      "integrity": "sha512-iM869Pugn9Nsxbh/YHRqYiqd23AmIbxJOcpUMOuWCVNdoQJ5ZtwL6h3t0bcZzJUlC3Dq9jCFCESBZnX0GTv7iQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "node_modules/@eslint/plugin-kit": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.1.tgz",
+      "integrity": "sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^1.1.1",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "node_modules/@exodus/bytes": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.15.0.tgz",
+      "integrity": "sha512-UY0nlA+feH81UGSHv92sLEPLCeZFjXOuHhrIo0HQydScuQc8s0A7kL/UdgwgDq8g8ilksmuoF35YVTNphV2aBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
+      },
+      "peerDependencies": {
+        "@noble/hashes": "^1.8.0 || ^2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@noble/hashes": {
+          "optional": true
+        }
       }
     },
     "node_modules/@floating-ui/core": {
@@ -2424,16 +2561,19 @@
       "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
       "license": "MIT"
     },
-    "node_modules/@fontsource/roboto": {
-      "version": "5.0.12",
-      "resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-5.0.12.tgz",
-      "integrity": "sha512-x0o17jvgoSSbS9OZnUX2+xJmVRvVCfeaYJjkS7w62iN7CuJWtMf5vJj8LqgC7ibqIkitOHVW+XssRjgrcHn62g==",
-      "dev": true
+    "node_modules/@fontsource-variable/geist": {
+      "version": "5.2.8",
+      "resolved": "https://registry.npmjs.org/@fontsource-variable/geist/-/geist-5.2.8.tgz",
+      "integrity": "sha512-cJ6m9e+8MQ5dCYJsLylfZrgBh6KkG4bOLckB35Tr9J/EqdkEM6QllH5PxqP1dhTvFup+HtMRPuz9xOjxXJggxw==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
     },
     "node_modules/@fortawesome/fontawesome-common-types": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-7.1.0.tgz",
-      "integrity": "sha512-l/BQM7fYntsCI//du+6sEnHOP6a74UixFyOYUyz2DLMXKx+6DEhfR3F2NYGE45XH1JJuIamacb4IZs9S0ZOWLA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-7.2.0.tgz",
+      "integrity": "sha512-IpR0bER9FY25p+e7BmFH25MZKEwFHTfRAfhOyJubgiDnoJNsSvJ7nigLraHtp4VOG/cy8D7uiV0dLkHOne5Fhw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2441,61 +2581,61 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-svg-core": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-7.1.0.tgz",
-      "integrity": "sha512-fNxRUk1KhjSbnbuBxlWSnBLKLBNun52ZBTcs22H/xEEzM6Ap81ZFTQ4bZBxVQGQgVY0xugKGoRcCbaKjLQ3XZA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-7.2.0.tgz",
+      "integrity": "sha512-6639htZMjEkwskf3J+e6/iar+4cTNM9qhoWuRfj9F3eJD6r7iCzV1SWnQr2Mdv0QT0suuqU8BoJCZUyCtP9R4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "7.1.0"
+        "@fortawesome/fontawesome-common-types": "7.2.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-brands-svg-icons": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-7.1.0.tgz",
-      "integrity": "sha512-9byUd9bgNfthsZAjBl6GxOu1VPHgBuRUP9juI7ZoM98h8xNPTCTagfwUFyYscdZq4Hr7gD1azMfM9s5tIWKZZA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-7.2.0.tgz",
+      "integrity": "sha512-VNG8xqOip1JuJcC3zsVsKRQ60oXG9+oYNDCosjoU/H9pgYmLTEwWw8pE0jhPz/JWdHeUuK6+NQ3qsM4gIbdbYQ==",
       "dev": true,
       "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "7.1.0"
+        "@fortawesome/fontawesome-common-types": "7.2.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-regular-svg-icons": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-7.1.0.tgz",
-      "integrity": "sha512-0e2fdEyB4AR+e6kU4yxwA/MonnYcw/CsMEP9lH82ORFi9svA6/RhDyhxIv5mlJaldmaHLLYVTb+3iEr+PDSZuQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-7.2.0.tgz",
+      "integrity": "sha512-iycmlN51EULlQ4D/UU9WZnHiN0CvjJ2TuuCrAh+1MVdzD+4ViKYH2deNAll4XAAYlZa8WAefHR5taSK8hYmSMw==",
       "dev": true,
       "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "7.1.0"
+        "@fortawesome/fontawesome-common-types": "7.2.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/free-solid-svg-icons": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-7.1.0.tgz",
-      "integrity": "sha512-Udu3K7SzAo9N013qt7qmm22/wo2hADdheXtBfxFTecp+ogsc0caQNRKEb7pkvvagUGOpG9wJC1ViH6WXs8oXIA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-7.2.0.tgz",
+      "integrity": "sha512-YTVITFGN0/24PxzXrwqCgnyd7njDuzp5ZvaCx5nq/jg55kUYd94Nj8UTchBdBofi/L0nwRfjGOg0E41d2u9T1w==",
       "dev": true,
       "license": "(CC-BY-4.0 AND MIT)",
       "dependencies": {
-        "@fortawesome/fontawesome-common-types": "7.1.0"
+        "@fortawesome/fontawesome-common-types": "7.2.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@fortawesome/react-fontawesome": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-3.1.0.tgz",
-      "integrity": "sha512-5OUQH9aDH/xHJwnpD4J7oEdGvFGJgYnGe0UebaPIdMW9UxYC/f5jv2VjVEgnikdJN0HL8yQxp9Nq+7gqGZpIIA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-3.3.0.tgz",
+      "integrity": "sha512-EHmHeTf8WgO29sdY3iX/7ekE3gNUdlc2RW6mm/FzELlHFKfTrA9S4MlyquRR+RRCRCn8+jXfLFpLGB2l7wCWyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2506,18 +2646,28 @@
         "react": "^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+    "node_modules/@humanfs/core": {
+      "version": "0.19.1",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
+    "node_modules/@humanfs/node": {
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "@humanfs/core": "^0.19.1",
+        "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": ">=18.18.0"
       }
     },
     "node_modules/@humanwhocodes/module-importer": {
@@ -2533,11 +2683,19 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "dev": true
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@img/sharp-darwin-arm64": {
       "version": "0.33.5",
@@ -2993,158 +3151,83 @@
         "@types/node": ">=18"
       }
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+    "node_modules/@jest/diff-sequences": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/diff-sequences/-/diff-sequences-30.3.0.tgz",
+      "integrity": "sha512-cG51MVnLq1ecVUaQ3fr6YuuAOitHK1S4WUJHnsPFE/quQr33ADUx1FfrTCpMCRxvy0Yr9BThKpDjSlcTi91tMA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+    "node_modules/@jest/expect-utils": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-30.3.0.tgz",
+      "integrity": "sha512-j0+W5iQQ8hBh7tHZkTQv3q2Fh/M7Je72cIsYqC4OaktgtO7v1So9UTjp6uPBHIaB6beoF/RRsCgMJKvti0wADA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
+        "@jest/get-type": "30.1.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+    "node_modules/@jest/get-type": {
+      "version": "30.1.0",
+      "resolved": "https://registry.npmjs.org/@jest/get-type/-/get-type-30.1.0.tgz",
+      "integrity": "sha512-eMbZE2hUnx1WV0pmURZY9XoXPkUYjpc55mb0CrhtdWLtzMQPFvu/rZkTLZFTsdaVQa+Tr4eWAteqcUzoawq/uA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+    "node_modules/@jest/pattern": {
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/@jest/pattern/-/pattern-30.0.1.tgz",
+      "integrity": "sha512-gWp7NfQW27LaBQz3TITS8L7ZCQ0TLvtmI//4OwlQRx4rnWxcPNIYjxZpDcN4+UlGxgm3jS5QPz8IPTCkb59wZA==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/expect-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
-      "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
-      "dev": true,
       "dependencies": {
-        "jest-get-type": "^29.6.3"
+        "@types/node": "*",
+        "jest-regex-util": "30.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+      "version": "30.0.5",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-30.0.5.tgz",
+      "integrity": "sha512-DmdYgtezMkh3cpU8/1uyXakv3tJRcmcXxBOcO0tbaozPwpmh4YMsnWrQm9ZmZMfa5ocbxzbFk6O4bDPEc/iAnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
+        "@sinclair/typebox": "^0.34.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jest/types": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-30.3.0.tgz",
+      "integrity": "sha512-JHm87k7bA33hpBngtU8h6UBub/fqqA9uXfw+21j5Hmk7ooPHlboRNxHq0JcMtC+n8VJGP1mcfnD3Mk+XKe1oSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
+        "@jest/pattern": "30.0.1",
+        "@jest/schemas": "30.0.5",
+        "@types/istanbul-lib-coverage": "^2.0.6",
+        "@types/istanbul-reports": "^3.0.4",
         "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "@types/yargs": "^17.0.33",
+        "chalk": "^4.1.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -3158,6 +3241,17 @@
         "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -3179,16 +3273,16 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.30",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
-      "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3197,9 +3291,9 @@
       }
     },
     "node_modules/@mantine/core": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/core/-/core-8.3.9.tgz",
-      "integrity": "sha512-ivj0Crn5N521cI2eWZBsBGckg0ZYRqfOJz5vbbvYmfj65bp0EdsyqZuOxXzIcn2aUScQhskfvzyhV5XIUv81PQ==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/core/-/core-8.3.18.tgz",
+      "integrity": "sha512-9tph1lTVogKPjTx02eUxDUOdXacPzK62UuSqb4TdGliI54/Xgxftq0Dfqu6XuhCxn9J5MDJaNiLDvL/1KRkYqA==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/react": "^0.27.16",
@@ -3210,7 +3304,7 @@
         "type-fest": "^4.41.0"
       },
       "peerDependencies": {
-        "@mantine/hooks": "8.3.9",
+        "@mantine/hooks": "8.3.18",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
@@ -3228,24 +3322,24 @@
       }
     },
     "node_modules/@mantine/dropzone": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/dropzone/-/dropzone-8.3.9.tgz",
-      "integrity": "sha512-RXFpmHQnANMxa3qBssQyI/YS+Xzpr6N/vPWTXrAzjNrJApbwShlIKRDHNw4mmydYT3Wq9y86uzXFPsrPoaJWLA==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/dropzone/-/dropzone-8.3.18.tgz",
+      "integrity": "sha512-GaYUUl/382R7hl1g6heTCZ5a6T5x6qYPg0oID6ik/J0j7e5+XMZyTH5ITpaqpsBQ09GKKsF5y3iNehpSby8Kew==",
       "license": "MIT",
       "dependencies": {
-        "react-dropzone": "14.3.8"
+        "react-dropzone": "15.0.0"
       },
       "peerDependencies": {
-        "@mantine/core": "8.3.9",
-        "@mantine/hooks": "8.3.9",
+        "@mantine/core": "8.3.18",
+        "@mantine/hooks": "8.3.18",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/form": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/form/-/form-8.3.9.tgz",
-      "integrity": "sha512-G7eCo5TEWGcsWHrNGwp/o1yPcCYbaMdLq6SClN+wMhAA+qaEO1ZHf9mX8fSOX78nkaoyIrZHGOhbVXcZ7hmVrQ==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/form/-/form-8.3.18.tgz",
+      "integrity": "sha512-r5OGLJWTkmIruFjRZRZy9oA7maNYlyt50jB4Pmd2X5360WOmJLd4KH8MFhHZQC7vN+z8/rmBl3t3XGAR2I8xig==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -3256,55 +3350,55 @@
       }
     },
     "node_modules/@mantine/hooks": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-8.3.9.tgz",
-      "integrity": "sha512-Dfz7W0+K1cq4Gb1WFQCZn8tsMXkLH6MV409wZR/ToqsxdNDUMJ/xxbfnwEXWEZjXNJd1wDETHgc+cZG2lTe3Xw==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-8.3.18.tgz",
+      "integrity": "sha512-QoWr9+S8gg5050TQ06aTSxtlpGjYOpIllRbjYYXlRvZeTsUqiTbVfvQROLexu4rEaK+yy9Wwriwl9PMRgbLqPw==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/modals": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-8.3.9.tgz",
-      "integrity": "sha512-0WOikHgECJeWA/1TNf+sxOnpNwQjmpyph3XEhzFkgneimW6Ry7R6qd/i345CDLSu6kP6FGGRI73SUROiTcu2Ng==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/modals/-/modals-8.3.18.tgz",
+      "integrity": "sha512-JfPDS4549L314SxFPC1x6CbKwzh82OdnIzwgMxPCVNsWLKV2vEHHUH/fzUYj4Wli6IBrsW4cufjMj9BTj3hm3Q==",
       "license": "MIT",
       "peerDependencies": {
-        "@mantine/core": "8.3.9",
-        "@mantine/hooks": "8.3.9",
+        "@mantine/core": "8.3.18",
+        "@mantine/hooks": "8.3.18",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/notifications": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-8.3.9.tgz",
-      "integrity": "sha512-emUdoCyaccf/NuNmJ4fQgloJ7hEod0Pde7XIoD9xUUztVchL143oWRU2gYm6cwqzSyjpjTaqPXfz5UvEBRYjZw==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/notifications/-/notifications-8.3.18.tgz",
+      "integrity": "sha512-IpQ0lmwbigTBbZCR6iSYWqIOKEx1tlcd7PcEJ5M5X1qeVSY/N3mmDQt1eJmObvcyDeL5cTJMbSA9UPqhRqo9jw==",
       "license": "MIT",
       "dependencies": {
-        "@mantine/store": "8.3.9",
+        "@mantine/store": "8.3.18",
         "react-transition-group": "4.4.5"
       },
       "peerDependencies": {
-        "@mantine/core": "8.3.9",
-        "@mantine/hooks": "8.3.9",
+        "@mantine/core": "8.3.18",
+        "@mantine/hooks": "8.3.18",
         "react": "^18.x || ^19.x",
         "react-dom": "^18.x || ^19.x"
       }
     },
     "node_modules/@mantine/store": {
-      "version": "8.3.9",
-      "resolved": "https://registry.npmjs.org/@mantine/store/-/store-8.3.9.tgz",
-      "integrity": "sha512-Z4tYW597mD3NxHLlJ3OJ1aKucmwrD9nhqobz+142JNw01aHqzKjxVXlu3L5GGa7F3u3OjXJk/qb1QmUs4sU+Jw==",
+      "version": "8.3.18",
+      "resolved": "https://registry.npmjs.org/@mantine/store/-/store-8.3.18.tgz",
+      "integrity": "sha512-i+QRTLmZzLldea0egtUVnGALd6UMIu8jd44nrNWBSNIXJU/8B6rMlC6gyX+l4szopZSuOaaNJIXkqRdC1gQsVg==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^18.x || ^19.x"
       }
     },
     "node_modules/@mswjs/interceptors": {
-      "version": "0.37.5",
-      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.37.5.tgz",
-      "integrity": "sha512-AAwRb5vXFcY4L+FvZ7LZusDuZ0vEe0Zm8ohn1FM6/X7A3bj4mqmkAcGRWuvC2JwSygNwHAAmMnAI73vPHeqsHA==",
+      "version": "0.41.3",
+      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.41.3.tgz",
+      "integrity": "sha512-cXu86tF4VQVfwz8W1SPbhoRyHJkti6mjH/XJIxp40jhO4j2k1m4KYrEykxqWPkFF3vrK4rgQppBh//AwyGSXPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3319,41 +3413,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@open-draft/deferred-promise": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
@@ -3379,99 +3438,463 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+    "node_modules/@parcel/watcher": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
+      "dependencies": {
+        "detect-libc": "^2.0.3",
+        "is-glob": "^4.0.3",
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
+      },
       "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@polka/url": {
-      "version": "1.0.0-next.29",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
-      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@quansync/fs": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@quansync/fs/-/fs-0.1.2.tgz",
-      "integrity": "sha512-ezIadUb1aFhwJLd++WVqVpi9rnlX8vnd4ju7saPhwLHJN1mJgOv0puePTGV+FbtSnWtwoHDT8lAm4kagDZmpCg==",
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "quansync": "^0.2.10"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">= 10.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sxzz"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.32",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.32.tgz",
-      "integrity": "sha512-QReCdvxiUZAPkvp1xpAg62IeNzykOFA6syH2CnClif4YmALN1XKpB39XneL80008UbtMShthSVDKmrx05N1q/g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@rollup/plugin-node-resolve": {
-      "version": "15.3.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz",
-      "integrity": "sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==",
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@rollup/pluginutils": "^5.0.1",
-        "@types/resolve": "1.20.2",
-        "deepmerge": "^4.2.2",
-        "is-module": "^1.0.0",
-        "resolve": "^1.22.1"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+        "node": ">= 10.0.0"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@rollup/plugin-terser": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
-      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "serialize-javascript": "^6.0.1",
-        "smob": "^1.0.0",
-        "terser": "^5.17.4"
-      },
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+        "node": ">= 10.0.0"
       },
-      "peerDependenciesMeta": {
-        "rollup": {
-          "optional": true
-        }
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@rollup/pluginutils": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.4.tgz",
-      "integrity": "sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==",
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@pkgr/core": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.2.9.tgz",
+      "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/pkgr"
+      }
+    },
+    "node_modules/@polka/url": {
+      "version": "1.0.0-next.29",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
+      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@quansync/fs": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@quansync/fs/-/fs-0.1.2.tgz",
+      "integrity": "sha512-ezIadUb1aFhwJLd++WVqVpi9rnlX8vnd4ju7saPhwLHJN1mJgOv0puePTGV+FbtSnWtwoHDT8lAm4kagDZmpCg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "quansync": "^0.2.10"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
+    "node_modules/@reduxjs/toolkit": {
+      "version": "2.11.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.2.tgz",
+      "integrity": "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.0.0",
+        "@standard-schema/utils": "^0.3.0",
+        "immer": "^11.0.0",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@reduxjs/toolkit/node_modules/immer": {
+      "version": "11.1.4",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-11.1.4.tgz",
+      "integrity": "sha512-XREFCPo6ksxVzP4E0ekD5aMdf8WMwmdNaz6vuvxgI40UaEiu6q3p8X52aU6GdyvLY3XXX/8R7JOTXStz/nBbRw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-rc.3",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz",
+      "integrity": "sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/plugin-node-resolve": {
+      "version": "15.3.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.1.tgz",
+      "integrity": "sha512-tgg6b91pAybXHJQMAAwW9VuWBO6Thi+q7BCNARLwSqlmsHz0XYURtGvh/AuwSADXSI4h/2uHbs7s4FzlZDGSGA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.0.1",
+        "@types/resolve": "1.20.2",
+        "deepmerge": "^4.2.2",
+        "is-module": "^1.0.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.78.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/plugin-terser": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz",
+      "integrity": "sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "serialize-javascript": "^6.0.1",
+        "smob": "^1.0.0",
+        "terser": "^5.17.4"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3499,9 +3922,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/pluginutils/node_modules/picomatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3512,9 +3935,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.48.1.tgz",
-      "integrity": "sha512-rGmb8qoG/zdmKoYELCBwu7vt+9HxZ7Koos3pD0+sH5fR3u3Wb/jGcpnqxcnWsPEKDUyzeLSqksN8LJtgXjqBYw==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.59.0.tgz",
+      "integrity": "sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==",
       "cpu": [
         "arm"
       ],
@@ -3526,9 +3949,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.48.1.tgz",
-      "integrity": "sha512-4e9WtTxrk3gu1DFE+imNJr4WsL13nWbD/Y6wQcyku5qadlKHY3OQ3LJ/INrrjngv2BJIHnIzbqMk1GTAC2P8yQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.59.0.tgz",
+      "integrity": "sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==",
       "cpu": [
         "arm64"
       ],
@@ -3540,9 +3963,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.48.1.tgz",
-      "integrity": "sha512-+XjmyChHfc4TSs6WUQGmVf7Hkg8ferMAE2aNYYWjiLzAS/T62uOsdfnqv+GHRjq7rKRnYh4mwWb4Hz7h/alp8A==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.59.0.tgz",
+      "integrity": "sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==",
       "cpu": [
         "arm64"
       ],
@@ -3554,9 +3977,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.48.1.tgz",
-      "integrity": "sha512-upGEY7Ftw8M6BAJyGwnwMw91rSqXTcOKZnnveKrVWsMTF8/k5mleKSuh7D4v4IV1pLxKAk3Tbs0Lo9qYmii5mQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.59.0.tgz",
+      "integrity": "sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==",
       "cpu": [
         "x64"
       ],
@@ -3568,9 +3991,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.48.1.tgz",
-      "integrity": "sha512-P9ViWakdoynYFUOZhqq97vBrhuvRLAbN/p2tAVJvhLb8SvN7rbBnJQcBu8e/rQts42pXGLVhfsAP0k9KXWa3nQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.59.0.tgz",
+      "integrity": "sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==",
       "cpu": [
         "arm64"
       ],
@@ -3582,9 +4005,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.48.1.tgz",
-      "integrity": "sha512-VLKIwIpnBya5/saccM8JshpbxfyJt0Dsli0PjXozHwbSVaHTvWXJH1bbCwPXxnMzU4zVEfgD1HpW3VQHomi2AQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.59.0.tgz",
+      "integrity": "sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==",
       "cpu": [
         "x64"
       ],
@@ -3596,9 +4019,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.48.1.tgz",
-      "integrity": "sha512-3zEuZsXfKaw8n/yF7t8N6NNdhyFw3s8xJTqjbTDXlipwrEHo4GtIKcMJr5Ed29leLpB9AugtAQpAHW0jvtKKaQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.59.0.tgz",
+      "integrity": "sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==",
       "cpu": [
         "arm"
       ],
@@ -3610,9 +4033,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.48.1.tgz",
-      "integrity": "sha512-leo9tOIlKrcBmmEypzunV/2w946JeLbTdDlwEZ7OnnsUyelZ72NMnT4B2vsikSgwQifjnJUbdXzuW4ToN1wV+Q==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.59.0.tgz",
+      "integrity": "sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==",
       "cpu": [
         "arm"
       ],
@@ -3624,9 +4047,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.48.1.tgz",
-      "integrity": "sha512-Vy/WS4z4jEyvnJm+CnPfExIv5sSKqZrUr98h03hpAMbE2aI0aD2wvK6GiSe8Gx2wGp3eD81cYDpLLBqNb2ydwQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.59.0.tgz",
+      "integrity": "sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==",
       "cpu": [
         "arm64"
       ],
@@ -3638,9 +4061,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.48.1.tgz",
-      "integrity": "sha512-x5Kzn7XTwIssU9UYqWDB9VpLpfHYuXw5c6bJr4Mzv9kIv242vmJHbI5PJJEnmBYitUIfoMCODDhR7KoZLot2VQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.59.0.tgz",
+      "integrity": "sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==",
       "cpu": [
         "arm64"
       ],
@@ -3651,10 +4074,24 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.48.1.tgz",
-      "integrity": "sha512-yzCaBbwkkWt/EcgJOKDUdUpMHjhiZT/eDktOPWvSRpqrVE04p0Nd6EGV4/g7MARXXeOqstflqsKuXVM3H9wOIQ==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.59.0.tgz",
+      "integrity": "sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.59.0.tgz",
+      "integrity": "sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==",
       "cpu": [
         "loong64"
       ],
@@ -3666,9 +4103,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.48.1.tgz",
-      "integrity": "sha512-UK0WzWUjMAJccHIeOpPhPcKBqax7QFg47hwZTp6kiMhQHeOYJeaMwzeRZe1q5IiTKsaLnHu9s6toSYVUlZ2QtQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.59.0.tgz",
+      "integrity": "sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.59.0.tgz",
+      "integrity": "sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==",
       "cpu": [
         "ppc64"
       ],
@@ -3680,9 +4131,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.48.1.tgz",
-      "integrity": "sha512-3NADEIlt+aCdCbWVZ7D3tBjBX1lHpXxcvrLt/kdXTiBrOds8APTdtk2yRL2GgmnSVeX4YS1JIf0imFujg78vpw==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.59.0.tgz",
+      "integrity": "sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==",
       "cpu": [
         "riscv64"
       ],
@@ -3694,9 +4145,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.48.1.tgz",
-      "integrity": "sha512-euuwm/QTXAMOcyiFCcrx0/S2jGvFlKJ2Iro8rsmYL53dlblp3LkUQVFzEidHhvIPPvcIsxDhl2wkBE+I6YVGzA==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.59.0.tgz",
+      "integrity": "sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==",
       "cpu": [
         "riscv64"
       ],
@@ -3708,9 +4159,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.48.1.tgz",
-      "integrity": "sha512-w8mULUjmPdWLJgmTYJx/W6Qhln1a+yqvgwmGXcQl2vFBkWsKGUBRbtLRuKJUln8Uaimf07zgJNxOhHOvjSQmBQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.59.0.tgz",
+      "integrity": "sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==",
       "cpu": [
         "s390x"
       ],
@@ -3722,9 +4173,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.48.1.tgz",
-      "integrity": "sha512-90taWXCWxTbClWuMZD0DKYohY1EovA+W5iytpE89oUPmT5O1HFdf8cuuVIylE6vCbrGdIGv85lVRzTcpTRZ+kA==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
+      "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
       "cpu": [
         "x64"
       ],
@@ -3736,9 +4187,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.48.1.tgz",
-      "integrity": "sha512-2Gu29SkFh1FfTRuN1GR1afMuND2GKzlORQUP3mNMJbqdndOg7gNsa81JnORctazHRokiDzQ5+MLE5XYmZW5VWg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.59.0.tgz",
+      "integrity": "sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==",
       "cpu": [
         "x64"
       ],
@@ -3749,10 +4200,38 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.59.0.tgz",
+      "integrity": "sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.59.0.tgz",
+      "integrity": "sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.48.1.tgz",
-      "integrity": "sha512-6kQFR1WuAO50bxkIlAVeIYsz3RUx+xymwhTo9j94dJ+kmHe9ly7muH23sdfWduD0BA8pD9/yhonUvAjxGh34jQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.59.0.tgz",
+      "integrity": "sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==",
       "cpu": [
         "arm64"
       ],
@@ -3764,9 +4243,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.48.1.tgz",
-      "integrity": "sha512-RUyZZ/mga88lMI3RlXFs4WQ7n3VyU07sPXmMG7/C1NOi8qisUg57Y7LRarqoGoAiopmGmChUhSwfpvQ3H5iGSQ==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.59.0.tgz",
+      "integrity": "sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==",
       "cpu": [
         "ia32"
       ],
@@ -3777,10 +4256,24 @@
         "win32"
       ]
     },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.59.0.tgz",
+      "integrity": "sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.48.1.tgz",
-      "integrity": "sha512-8a/caCUN4vkTChxkaIJcMtwIVcBhi4X2PQRoT+yCK3qRYaZ7cURrmJFL5Ux9H9RaMIXj9RuihckdmkBX3zZsgg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.59.0.tgz",
+      "integrity": "sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==",
       "cpu": [
         "x64"
       ],
@@ -3792,16 +4285,31 @@
       ]
     },
     "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
+      "version": "0.34.49",
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.34.49.tgz",
+      "integrity": "sha512-brySQQs7Jtn0joV8Xh9ZV/hZb9Ozb0pmazDIASBkYKCjXrXU3mpcFahmK/z4YDhGkQvP9mWJbVyahdtU5wQA+A==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
       "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@standard-schema/utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -3826,9 +4334,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.64.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.64.1.tgz",
-      "integrity": "sha512-978Wx4Wl4UJZbmvU/rkaM9cQtXXrbhK0lsz/UZhYIbyKYA8E4LdomTwyh2GHZ4oU0BKKoDH4YlKk2VscCUgNmg==",
+      "version": "5.95.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.95.2.tgz",
+      "integrity": "sha512-o4T8vZHZET4Bib3jZ/tCW9/7080urD4c+0/AUaYVpIqOsr7y0reBc1oX3ttNaSW5mYyvZHctiQ/UOP2PfdmFEQ==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3836,9 +4344,9 @@
       }
     },
     "node_modules/@tanstack/query-devtools": {
-      "version": "5.37.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.37.1.tgz",
-      "integrity": "sha512-XcG4IIHIv0YQKrexTqo2zogQWR1Sz672tX2KsfE9kzB+9zhx44vRKH5si4WDILE1PIWQpStFs/NnrDQrBAUQpg==",
+      "version": "5.95.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.95.2.tgz",
+      "integrity": "sha512-QfaoqBn9uAZ+ICkA8brd1EHj+qBF6glCFgt94U8XP5BT6ppSsDBI8IJ00BU+cAGjQzp6wcKJL2EmRYvxy0TWIg==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -3847,12 +4355,12 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.64.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.64.1.tgz",
-      "integrity": "sha512-vW5ggHpIO2Yjj44b4sB+Fd3cdnlMJppXRBJkEHvld6FXh3j5dwWJoQo7mGtKI2RbSFyiyu/PhGAy0+Vv5ev9Eg==",
+      "version": "5.95.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.95.2.tgz",
+      "integrity": "sha512-/wGkvLj/st5Ud1Q76KF1uFxScV7WeqN1slQx5280ycwAyYkIPGaRZAEgHxe3bjirSd5Zpwkj6zNcR4cqYni/ZA==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.64.1"
+        "@tanstack/query-core": "5.95.2"
       },
       "funding": {
         "type": "github",
@@ -3863,30 +4371,30 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.40.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.40.1.tgz",
-      "integrity": "sha512-/AN2UsbuL+28/KSlBkVHq/4chHTEp4l2UWTKWixXbn4pprLQrZGmQTAKN4tYxZDuNwNZY5+Zp67pDfXj+F/UBA==",
+      "version": "5.95.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.95.2.tgz",
+      "integrity": "sha512-AFQFmbznVkbtfpx8VJ2DylW17wWagQel/qLstVLkYmNRo2CmJt3SNej5hvl6EnEeljJIdC3BTB+W7HZtpsH+3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-devtools": "5.37.1"
+        "@tanstack/query-devtools": "5.95.2"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.40.1",
+        "@tanstack/react-query": "^5.95.2",
         "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-table": {
-      "version": "8.19.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.19.2.tgz",
-      "integrity": "sha512-itoSIAkA/Vsg+bjY23FSemcTyPhc5/1YjYyaMsr9QSH/cdbZnQxHVWrpWn0Sp2BWN71qkzR7e5ye8WuMmwyOjg==",
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
+      "integrity": "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/table-core": "8.19.2"
+        "@tanstack/table-core": "8.21.3"
       },
       "engines": {
         "node": ">=12"
@@ -3900,10 +4408,27 @@
         "react-dom": ">=16.8"
       }
     },
+    "node_modules/@tanstack/react-virtual": {
+      "version": "3.13.23",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.13.23.tgz",
+      "integrity": "sha512-XnMRnHQ23piOVj2bzJqHrRrLg4r+F86fuBcwteKfbIjJrtGxb4z7tIvPVAe4B+4UVwo9G4Giuz5fmapcrnZ0OQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/virtual-core": "3.13.23"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/@tanstack/table-core": {
-      "version": "8.19.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.19.2.tgz",
-      "integrity": "sha512-KpRjhgehIhbfH78ARm/GJDXGnpdw4bCg3qas6yjWSi7czJhI/J6pWln7NHtmBkGE9ZbohiiNtLqwGzKmBfixig==",
+      "version": "8.21.3",
+      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.3.tgz",
+      "integrity": "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -3913,20 +4438,30 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
+    "node_modules/@tanstack/virtual-core": {
+      "version": "3.13.23",
+      "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.13.23.tgz",
+      "integrity": "sha512-zSz2Z2HNyLjCplANTDyl3BcdQJc2k1+yyFoKhNRmCr7V7dY8o8q5m8uFTI1/Pg1kL+Hgrz6u3Xo6eFUB7l66cg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
     "node_modules/@testing-library/dom": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.0.0.tgz",
-      "integrity": "sha512-PmJPnogldqoVFf+EwbHvbBJ98MmqASV8kLrBYgsDNxQcFMeIS7JFL48sfyXvuMtgmWO/wMhh25odr+8VhDmn4g==",
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
+      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
-      "peer": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
         "@types/aria-query": "^5.0.1",
         "aria-query": "5.3.0",
-        "chalk": "^4.1.0",
         "dom-accessibility-api": "^0.5.9",
         "lz-string": "^1.5.0",
+        "picocolors": "1.1.1",
         "pretty-format": "^27.0.2"
       },
       "engines": {
@@ -3934,61 +4469,23 @@
       }
     },
     "node_modules/@testing-library/jest-dom": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.4.2.tgz",
-      "integrity": "sha512-CzqH0AFymEMG48CpzXFriYYkOjk6ZGPCLMhW9e9jg3KMCn5OfJecF8GtGW7yGfR/IgCe3SX8BSwjdzI6BBbZLw==",
+      "version": "6.9.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-6.9.1.tgz",
+      "integrity": "sha512-zIcONa+hVtVSSep9UT3jZ5rizo2BsxgyDYU7WFD5eICBE7no3881HGeb/QkGfsJs6JTkY1aQhT7rIPC7e+0nnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@adobe/css-tools": "^4.3.2",
-        "@babel/runtime": "^7.9.2",
+        "@adobe/css-tools": "^4.4.0",
         "aria-query": "^5.0.0",
-        "chalk": "^3.0.0",
         "css.escape": "^1.5.1",
         "dom-accessibility-api": "^0.6.3",
-        "lodash": "^4.17.15",
+        "picocolors": "^1.1.1",
         "redent": "^3.0.0"
       },
       "engines": {
         "node": ">=14",
         "npm": ">=6",
         "yarn": ">=1"
-      },
-      "peerDependencies": {
-        "@jest/globals": ">= 28",
-        "@types/bun": "latest",
-        "@types/jest": ">= 28",
-        "jest": ">= 28",
-        "vitest": ">= 0.32"
-      },
-      "peerDependenciesMeta": {
-        "@jest/globals": {
-          "optional": true
-        },
-        "@types/bun": {
-          "optional": true
-        },
-        "@types/jest": {
-          "optional": true
-        },
-        "jest": {
-          "optional": true
-        },
-        "vitest": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@testing-library/jest-dom/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
       }
     },
     "node_modules/@testing-library/jest-dom/node_modules/dom-accessibility-api": {
@@ -3998,9 +4495,9 @@
       "dev": true
     },
     "node_modules/@testing-library/react": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.1.0.tgz",
-      "integrity": "sha512-Q2ToPvg0KsVL0ohND9A3zLJWcOXXcO8IDu3fj11KhNt0UlCWyFyvnCIBkd12tidB2lkiVRG8VFqdhcqhqnAQtg==",
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4026,10 +4523,11 @@
       }
     },
     "node_modules/@testing-library/user-event": {
-      "version": "14.5.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.5.2.tgz",
-      "integrity": "sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==",
+      "version": "14.6.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
+      "integrity": "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12",
         "npm": ">=6"
@@ -4042,8 +4540,7 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
@@ -4087,84 +4584,87 @@
       }
     },
     "node_modules/@types/chai": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.2.tgz",
-      "integrity": "sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
+      "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/deep-eql": "*"
+        "@types/deep-eql": "*",
+        "assertion-error": "^2.0.1"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+    "node_modules/@types/d3-array": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "dev": true
-    },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
       "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
       "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-interpolate": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
-      "dev": true
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
-      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
-      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
+      "version": "3.1.8",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
+      "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/d3-path": "*"
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
-      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw==",
-      "dev": true
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
       "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/deep-eql": {
       "version": "4.0.2",
@@ -4173,6 +4673,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/esrecurse": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz",
+      "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -4184,13 +4691,15 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
       "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/istanbul-lib-report": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
       "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "*"
       }
@@ -4200,18 +4709,20 @@
       "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
       "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.12",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
-      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
+      "version": "30.0.0",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-30.0.0.tgz",
+      "integrity": "sha512-XTYugzhuwqWjws0CVz8QpM36+T+Dz5mTEBKhNs/esGLnCIlGdRy+Dq78NRjd7ls7r8BC8ZRMOrKlkO1hU0JOwA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
+        "expect": "^30.0.0",
+        "pretty-format": "^30.0.0"
       }
     },
     "node_modules/@types/jest/node_modules/ansi-styles": {
@@ -4219,6 +4730,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -4227,52 +4739,56 @@
       }
     },
     "node_modules/@types/jest/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/@types/jest/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz",
-      "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==",
-      "dev": true
+      "version": "4.17.24",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz",
+      "integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.14.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz",
-      "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz",
+      "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~6.21.0"
+        "undici-types": "~7.18.0"
       }
     },
     "node_modules/@types/react": {
-      "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.7.tgz",
-      "integrity": "sha512-MWtvHrGZLFttgeEj28VXHxpmwYbor/ATPYbBfSFZEIRK0ecCFLl2Qo55z52Hss+UV9CRN7trSeq1zbgx7YDWWg==",
-      "devOptional": true,
+      "version": "19.2.14",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
+      "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.2.2"
@@ -4295,29 +4811,17 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/semver": {
-      "version": "7.5.8",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
-      "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
-      "dev": true
-    },
     "node_modules/@types/stack-utils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
       "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
-      "dev": true
-    },
-    "node_modules/@types/statuses": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.5.tgz",
-      "integrity": "sha512-jmIUGWrAiwu3dZpxntxieC+1n/5c3mjrImkmOSQ2NC5uP6cYO4aAZDdSmRcI5C1oiTmqlZGHC+/NmJrKogbP5A==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
+    "node_modules/@types/statuses": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.6.tgz",
+      "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4328,11 +4832,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/use-sync-external-store": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "version": "17.0.35",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.35.tgz",
+      "integrity": "sha512-qUHkeCyQFxMXg79wQfTtfndEC+N9ZZg76HJftDJp+qH2tV7Gj4OJi7l+PiWwJ+pWtW8GwSmqsDj/oymhrTWXjg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -4341,523 +4853,238 @@
       "version": "21.0.3",
       "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
       "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.16.0.tgz",
-      "integrity": "sha512-py1miT6iQpJcs1BiJjm54AMzeuMPBSPuKPlnT8HlfudbcS5rYeX5jajpLf3mrdRh9dA/Ec2FVUY0ifeVNDIhZw==",
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.57.2.tgz",
+      "integrity": "sha512-NZZgp0Fm2IkD+La5PR81sd+g+8oS6JwJje+aRWsDocxHkjyRw0J5L5ZTlN3LI1LlOcGL7ph3eaIUmTXMIjLk0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.16.0",
-        "@typescript-eslint/type-utils": "7.16.0",
-        "@typescript-eslint/utils": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@typescript-eslint/scope-manager": "8.57.2",
+        "@typescript-eslint/type-utils": "8.57.2",
+        "@typescript-eslint/utils": "8.57.2",
+        "@typescript-eslint/visitor-keys": "8.57.2",
+        "ignore": "^7.0.5",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz",
-      "integrity": "sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.0.tgz",
-      "integrity": "sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz",
-      "integrity": "sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.0.tgz",
-      "integrity": "sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.16.0",
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/typescript-estree": "7.16.0"
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz",
-      "integrity": "sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "@typescript-eslint/parser": "^8.57.2",
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 4"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.16.0.tgz",
-      "integrity": "sha512-ar9E+k7CU8rWi2e5ErzQiC93KKEFAXA2Kky0scAlPcxYblLt8+XZuHUZwlyfXILyQa95P6lQg+eZgh/dDs3+Vw==",
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.57.2.tgz",
+      "integrity": "sha512-30ScMRHIAD33JJQkgfGW1t8CURZtjc2JpTrq5n2HFhOefbAhb7ucc7xJwdWcrEtqUIYJ73Nybpsggii6GtAHjA==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.16.0",
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/typescript-estree": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0",
-        "debug": "^4.3.4"
+        "@typescript-eslint/scope-manager": "8.57.2",
+        "@typescript-eslint/types": "8.57.2",
+        "@typescript-eslint/typescript-estree": "8.57.2",
+        "@typescript-eslint/visitor-keys": "8.57.2",
+        "debug": "^4.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz",
-      "integrity": "sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.0.tgz",
-      "integrity": "sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw==",
+    "node_modules/@typescript-eslint/parser/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz",
-      "integrity": "sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==",
-      "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=6.0"
       },
       "peerDependenciesMeta": {
-        "typescript": {
+        "supports-color": {
           "optional": true
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz",
-      "integrity": "sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.16.0.tgz",
-      "integrity": "sha512-j0fuUswUjDHfqV/UdW6mLtOQQseORqfdmoBNDFOqs9rvNVR2e+cmu6zJu/Ku4SDuqiJko6YnhwcL8x45r8Oqxg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.16.0",
-        "@typescript-eslint/utils": "7.16.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
+    "node_modules/@typescript-eslint/parser/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.16.0.tgz",
-      "integrity": "sha512-8gVv3kW6n01Q6TrI1cmTZ9YMFi3ucDT7i7aI5lEikk2ebk1AEjrwX8MDTdaX5D7fPXMBLvnsaa0IFTAu+jcfOw==",
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.57.2.tgz",
+      "integrity": "sha512-FuH0wipFywXRTHf+bTTjNyuNQQsQC3qh/dYzaM4I4W0jrCqjCVuUh99+xd9KamUfmCGPvbO8NDngo/vsnNVqgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0"
+        "@typescript-eslint/tsconfig-utils": "^8.57.2",
+        "@typescript-eslint/types": "^8.57.2",
+        "debug": "^4.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.16.0.tgz",
-      "integrity": "sha512-fecuH15Y+TzlUutvUl9Cc2XJxqdLr7+93SQIbcZfd4XRGGKoxyljK27b+kxKamjRkU7FYC6RrbSCg0ALcZn/xw==",
+    "node_modules/@typescript-eslint/project-service/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": ">=6.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.16.0.tgz",
-      "integrity": "sha512-a5NTvk51ZndFuOLCh5OaJBELYc2O3Zqxfl3Js78VFE1zE46J2AaVuW+rEbVkQznjkmlzWsUI15BG5tQMixzZLw==",
+    "node_modules/@typescript-eslint/project-service/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT"
+    },
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.57.2.tgz",
+      "integrity": "sha512-snZKH+W4WbWkrBqj4gUNRIGb/jipDW3qMqVJ4C9rzdFc+wLwruxk+2a5D+uoFcKPAqyqEnSb4l2ULuZf95eSkw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/visitor-keys": "7.16.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
+        "@typescript-eslint/types": "8.57.2",
+        "@typescript-eslint/visitor-keys": "8.57.2"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.16.0.tgz",
-      "integrity": "sha512-PqP4kP3hb4r7Jav+NiRCntlVzhxBNWq6ZQ+zQwII1y/G/1gdIPeYDCKr2+dH6049yJQsWZiHU6RlwvIFBXXGNA==",
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.57.2.tgz",
+      "integrity": "sha512-3Lm5DSM+DCowsUOJC+YqHHnKEfFh5CoGkj5Z31NQSNF4l5wdOwqGn99wmwN/LImhfY3KJnmordBq/4+VDe2eKw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.16.0",
-        "@typescript-eslint/types": "7.16.0",
-        "@typescript-eslint/typescript-estree": "7.16.0"
-      },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.16.0.tgz",
-      "integrity": "sha512-rMo01uPy9C7XxG7AFsxa8zLnWXTF8N3PYclekWSrurvhwiw1eW88mrKiAYe6s53AUY57nTRz8dJsuuXdkAhzCg==",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.57.2.tgz",
+      "integrity": "sha512-Co6ZCShm6kIbAM/s+oYVpKFfW7LBc6FXoPXjTRQ449PPNBY8U0KZXuevz5IFuuUj2H9ss40atTaf9dlGLzbWZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.16.0",
-        "eslint-visitor-keys": "^3.4.3"
+        "@typescript-eslint/types": "8.57.2",
+        "@typescript-eslint/typescript-estree": "8.57.2",
+        "@typescript-eslint/utils": "8.57.2",
+        "debug": "^4.4.3",
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=6.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+    "node_modules/@typescript-eslint/type-utils/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+      "license": "MIT"
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.57.2.tgz",
+      "integrity": "sha512-/iZM6FnM4tnx9csuTxspMW4BOSegshwX5oBDznJ7S4WggL7Vczz5d2W11ecc4vRrQMQHXRSxzrCsyG5EsPPTbA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4865,52 +5092,64 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.57.2.tgz",
+      "integrity": "sha512-2MKM+I6g8tJxfSmFKOnHv2t8Sk3T6rF20A1Puk0svLK+uVapDZB/4pfAeB7nE83uAZrU6OxW+HmOd5wHVdXwXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "@typescript-eslint/project-service": "8.57.2",
+        "@typescript-eslint/tsconfig-utils": "8.57.2",
+        "@typescript-eslint/types": "8.57.2",
+        "@typescript-eslint/visitor-keys": "8.57.2",
+        "debug": "^4.4.3",
+        "minimatch": "^10.2.2",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.4.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4918,120 +5157,65 @@
         "node": ">=10"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.57.2.tgz",
+      "integrity": "sha512-krRIbvPK1ju1WBKIefiX+bngPs+odIQUtR7kymzPfo1POVw3jlF+nLkmexdSSd4UCbDcQn+wMBATOOmpBbqgKg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.57.2",
+        "@typescript-eslint/types": "8.57.2",
+        "@typescript-eslint/typescript-estree": "8.57.2"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.57.2.tgz",
+      "integrity": "sha512-zhahknjobV2FiD6Ee9iLbS7OV9zi10rG26odsQdfBO/hjSzUQbkIYgda+iNKK1zNiW2ey+Lf8MU5btN17V3dUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "@typescript-eslint/types": "8.57.2",
+        "eslint-visitor-keys": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/utils/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
     "node_modules/@vite-pwa/assets-generator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@vite-pwa/assets-generator/-/assets-generator-1.0.0.tgz",
-      "integrity": "sha512-tWRF/tsqGkND5+dDVnJz7DzQkIRjtTRRYvA3y6l4FwTwK47OK72p1X7ResSz6T7PimIZMuFd+arsB8NRIG+Sww==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@vite-pwa/assets-generator/-/assets-generator-1.0.2.tgz",
+      "integrity": "sha512-MCbrb508JZHqe7bUibmZj/lyojdhLRnfkmyXnkrCM2zVrjTgL89U8UEfInpKTvPeTnxsw2hmyZxnhsdNR6yhwg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5053,53 +5237,81 @@
       }
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.0.1.tgz",
-      "integrity": "sha512-DE4UNaBXwtVoDJ0ccBdLVjFTWL70NRuWNCxEieTI3lrq9ORB9aOCQEKstwDXBl87NvFdbqh/p7eINGyj0BthJA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.2.0.tgz",
+      "integrity": "sha512-YmKkfhOAi3wsB1PhJq5Scj3GXMn3WvtQ/JC0xoopuHoXSdmtdStOpFrYaT1kie2YgFBcIe64ROzMYRjCrYOdYw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.28.3",
+        "@babel/core": "^7.29.0",
         "@babel/plugin-transform-react-jsx-self": "^7.27.1",
         "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-beta.32",
+        "@rolldown/pluginutils": "1.0.0-rc.3",
         "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.17.0"
+        "react-refresh": "^0.18.0"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@vitejs/plugin-react/node_modules/@babel/core": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
+      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.0",
+        "@babel/generator": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helpers": "^7.28.6",
+        "@babel/parser": "^7.29.0",
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.29.0",
+        "@babel/types": "^7.29.0",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.2.4.tgz",
-      "integrity": "sha512-EyF9SXU6kS5Ku/U82E259WSnvg6c8KTjppUncuNdm5QHpe17mwREHnjDzozC8x9MZ0xfBUFSaLkRv4TMA75ALQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.2.tgz",
+      "integrity": "sha512-sPK//PHO+kAkScb8XITeB1bf7fsk85Km7+rt4eeuRR3VS1/crD47cmV5wicisJmjNdfeokTZwjMk4Mj2d58Mgg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^1.0.2",
-        "ast-v8-to-istanbul": "^0.3.3",
-        "debug": "^4.4.1",
+        "@vitest/utils": "4.1.2",
+        "ast-v8-to-istanbul": "^1.0.0",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
-        "istanbul-lib-source-maps": "^5.0.6",
-        "istanbul-reports": "^3.1.7",
-        "magic-string": "^0.30.17",
-        "magicast": "^0.3.5",
-        "std-env": "^3.9.0",
-        "test-exclude": "^7.0.1",
-        "tinyrainbow": "^2.0.0"
+        "istanbul-reports": "^3.2.0",
+        "magicast": "^0.5.2",
+        "obug": "^2.1.1",
+        "std-env": "^4.0.0-rc.1",
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "@vitest/browser": "3.2.4",
-        "vitest": "3.2.4"
+        "@vitest/browser": "4.1.2",
+        "vitest": "4.1.2"
       },
       "peerDependenciesMeta": {
         "@vitest/browser": {
@@ -5107,65 +5319,41 @@
         }
       }
     },
-    "node_modules/@vitest/coverage-v8/node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@vitest/coverage-v8/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/@vitest/expect": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
-      "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.2.tgz",
+      "integrity": "sha512-gbu+7B0YgUJ2nkdsRJrFFW6X7NTP44WlhiclHniUhxADQJH5Szt9mZ9hWnJPJ8YwOK5zUOSSlSvyzRf0u1DSBQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@standard-schema/spec": "^1.1.0",
         "@types/chai": "^5.2.2",
-        "@vitest/spy": "3.2.4",
-        "@vitest/utils": "3.2.4",
-        "chai": "^5.2.0",
-        "tinyrainbow": "^2.0.0"
+        "@vitest/spy": "4.1.2",
+        "@vitest/utils": "4.1.2",
+        "chai": "^6.2.2",
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/mocker": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz",
-      "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.2.tgz",
+      "integrity": "sha512-Ize4iQtEALHDttPRCmN+FKqOl2vxTiNUhzobQFFt/BM1lRUTG7zRCLOykG/6Vo4E4hnUdfVLo5/eqKPukcWW7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "3.2.4",
+        "@vitest/spy": "4.1.2",
         "estree-walker": "^3.0.3",
-        "magic-string": "^0.30.17"
+        "magic-string": "^0.30.21"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "msw": "^2.4.9",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "msw": {
@@ -5177,42 +5365,42 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz",
-      "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.2.tgz",
+      "integrity": "sha512-dwQga8aejqeuB+TvXCMzSQemvV9hNEtDDpgUKDzOmNQayl2OG241PSWeJwKRH3CiC+sESrmoFd49rfnq7T4RnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tinyrainbow": "^2.0.0"
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz",
-      "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.2.tgz",
+      "integrity": "sha512-Gr+FQan34CdiYAwpGJmQG8PgkyFVmARK8/xSijia3eTFgVfpcpztWLuP6FttGNfPLJhaZVP/euvujeNYar36OQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.2.4",
-        "pathe": "^2.0.3",
-        "strip-literal": "^3.0.0"
+        "@vitest/utils": "4.1.2",
+        "pathe": "^2.0.3"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz",
-      "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.2.tgz",
+      "integrity": "sha512-g7yfUmxYS4mNxk31qbOYsSt2F4m1E02LFqO53Xpzg3zKMhLAPZAjjfyl9e6z7HrW6LvUdTwAQR3HHfLjpko16A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.2.4",
-        "magic-string": "^0.30.17",
+        "@vitest/pretty-format": "4.1.2",
+        "@vitest/utils": "4.1.2",
+        "magic-string": "^0.30.21",
         "pathe": "^2.0.3"
       },
       "funding": {
@@ -5220,60 +5408,58 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz",
-      "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.2.tgz",
+      "integrity": "sha512-DU4fBnbVCJGNBwVA6xSToNXrkZNSiw59H8tcuUspVMsBDBST4nfvsPsEHDHGtWRRnqBERBQu7TrTKskmjqTXKA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "tinyspy": "^4.0.3"
-      },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/ui": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-3.2.4.tgz",
-      "integrity": "sha512-hGISOaP18plkzbWEcP/QvtRW1xDXF2+96HbEX6byqQhAUbiS5oH6/9JwW+QsQCIYON2bI6QZBF+2PvOmrRZ9wA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.1.2.tgz",
+      "integrity": "sha512-/irhyeAcKS2u6Zokagf9tqZJ0t8S6kMZq4ZG9BHZv7I+fkRrYfQX4w7geYeC2r6obThz39PDxvXQzZX+qXqGeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "3.2.4",
+        "@vitest/utils": "4.1.2",
         "fflate": "^0.8.2",
-        "flatted": "^3.3.3",
+        "flatted": "^3.4.2",
         "pathe": "^2.0.3",
-        "sirv": "^3.0.1",
-        "tinyglobby": "^0.2.14",
-        "tinyrainbow": "^2.0.0"
+        "sirv": "^3.0.2",
+        "tinyglobby": "^0.2.15",
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "3.2.4"
+        "vitest": "4.1.2"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz",
-      "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.2.tgz",
+      "integrity": "sha512-xw2/TiX82lQHA06cgbqRKFb5lCAy3axQ4H4SoUFhUsg+wztiet+co86IAMDtF6Vm1hc7J6j09oh/rgDn+JdKIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "3.2.4",
-        "loupe": "^3.1.4",
-        "tinyrainbow": "^2.0.0"
+        "@vitest/pretty-format": "4.1.2",
+        "convert-source-map": "^2.0.0",
+        "tinyrainbow": "^3.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5286,6 +5472,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -5301,10 +5488,11 @@
       }
     },
     "node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5355,12 +5543,6 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
     "node_modules/aria-query": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
@@ -5387,15 +5569,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
@@ -5429,21 +5602,21 @@
       }
     },
     "node_modules/ast-v8-to-istanbul": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-0.3.4.tgz",
-      "integrity": "sha512-cxrAnZNLBnQwBPByK4CeDaw5sWZtMilJE/Q3iDA0aamgaIVNDF9T6K2/8DfYDZEejZ2jNnDrG9m8MY72HFd0KA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.0.tgz",
+      "integrity": "sha512-1fSfIwuDICFA4LKkCzRPO7F0hzFf0B7+Xqrl27ynQaa+Rh0e1Es0v6kWHPott3lU10AyAr7oKHa65OppjLn3Rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.29",
+        "@jridgewell/trace-mapping": "^0.3.31",
         "estree-walker": "^3.0.3",
-        "js-tokens": "^9.0.1"
+        "js-tokens": "^10.0.0"
       }
     },
     "node_modules/ast-v8-to-istanbul/node_modules/js-tokens": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
-      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-10.0.0.tgz",
+      "integrity": "sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -5467,7 +5640,8 @@
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
@@ -5505,25 +5679,25 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
-      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.14.0.tgz",
+      "integrity": "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
-        "proxy-from-env": "^1.1.0"
+        "follow-redirects": "^1.15.11",
+        "form-data": "^4.0.5",
+        "proxy-from-env": "^2.1.0"
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.13.tgz",
-      "integrity": "sha512-3sX/eOms8kd3q2KZ6DAhKPc0dgm525Gqq5NtWKZ7QYYZEv57OQ54KtblzJzH1lQF/eQxO8KjWGIK9IPUJNus5g==",
+      "version": "0.4.16",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.16.tgz",
+      "integrity": "sha512-xaVwwSfebXf0ooE11BJovZYKhFjIvQo7TsyVpETuIeH2JHv0k/T6Y5j22pPTvqYqmpkxdlPAJlyJ0tfOJAoMxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.4",
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.7",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -5531,47 +5705,82 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.11.1.tgz",
-      "integrity": "sha512-yGCqvBT4rwMczo28xkH/noxJ6MZ4nJfkVYdoDaC/utLtWrXxv27HVrzAeSbqR8SxDsp46n0YF47EbHoixy6rXQ==",
+      "version": "0.14.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.1.tgz",
+      "integrity": "sha512-ENp89vM9Pw4kv/koBb5N2f9bDZsR0hpf3BdPMOg/pkS3pwO4dzNnQZVXtBbeyAadgm865DmQG2jMMLqmZXvuCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.6.7",
+        "core-js-compat": "^3.48.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.6.7",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.7.tgz",
+      "integrity": "sha512-OTYbUlSwXhNgr4g6efMZgsO8//jA61P7ZbRX3iTT53VON8l+WQS8IAUEVo4a4cWknrg2W8Cj4gQhRYNCJ8GkAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.3",
-        "core-js-compat": "^3.40.0"
+        "@babel/helper-define-polyfill-provider": "^0.6.7"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.4.tgz",
-      "integrity": "sha512-7gD3pRadPrbjhjLyxebmx/WrFYcuSjZ0XbdUujQMZ/fcE9oeewk2U/7PCvez84UeuK3oSjmPZ0Ch0dlupQvGzw==",
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
+      "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/bidi-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz",
+      "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "require-from-string": "^2.0.2"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.4"
+        "balanced-match": "^4.0.2"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+    "node_modules/brace-expansion/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+      "engines": {
+        "node": "18 || 20 || >=22"
       }
     },
     "node_modules/braces": {
@@ -5586,9 +5795,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
       "dev": true,
       "funding": [
         {
@@ -5606,10 +5815,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5618,13 +5828,6 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/buffer-builder": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-      "dev": true,
-      "license": "MIT/X11"
-    },
     "node_modules/buffer-from": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
@@ -5690,15 +5893,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/camelcase-css": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
@@ -5731,18 +5925,11 @@
       "license": "CC-BY-4.0"
     },
     "node_modules/chai": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
-      "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
+      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "assertion-error": "^2.0.1",
-        "check-error": "^2.1.1",
-        "deep-eql": "^5.0.1",
-        "loupe": "^3.1.0",
-        "pathval": "^2.0.0"
-      },
       "engines": {
         "node": ">=18"
       }
@@ -5752,6 +5939,7 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -5763,20 +5951,26 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/check-error": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
-      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+    "node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
       "engines": {
-        "node": ">= 16"
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/ci-info": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
-      "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
       "dev": true,
       "funding": [
         {
@@ -5784,6 +5978,7 @@
           "url": "https://github.com/sponsors/sibiraj-s"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -5901,6 +6096,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -5918,12 +6114,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
     "node_modules/consola": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz",
@@ -5934,6 +6124,13 @@
         "node": "^14.18.0 || >=16.10.0"
       }
     },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/cookie": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
@@ -5944,13 +6141,13 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.41.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
-      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
+      "version": "3.48.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.48.0.tgz",
+      "integrity": "sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.24.4"
+        "browserslist": "^4.28.1"
       },
       "funding": {
         "type": "opencollective",
@@ -5982,6 +6179,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/css-tree": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz",
+      "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mdn-data": "2.27.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
     "node_modules/css.escape": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
@@ -6002,17 +6213,29 @@
       }
     },
     "node_modules/cssstyle": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.2.1.tgz",
-      "integrity": "sha512-9+vem03dMXG7gDmZ62uqmRiMRNtinIZ9ZyuF6BdxzfOD+FdN5hretzynkn0ReS2DO2GSw76RWHs0UmJPI2zUjw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-6.2.0.tgz",
+      "integrity": "sha512-Fm5NvhYathRnXNVndkUsCCuR63DCLVVwGOOwQw782coXFi5HhkXdu289l59HlXZBawsyNccXfWRYvLzcDCdDig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@asamuzakjp/css-color": "^2.8.2",
-        "rrweb-cssom": "^0.8.0"
+        "@asamuzakjp/css-color": "^5.0.1",
+        "@csstools/css-syntax-patches-for-csstree": "^1.0.28",
+        "css-tree": "^3.1.0",
+        "lru-cache": "^11.2.6"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
+      }
+    },
+    "node_modules/cssstyle/node_modules/lru-cache": {
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.7.tgz",
+      "integrity": "sha512-aY/R+aEsRelme17KGQa/1ZSIpLpNYYrhcrepKTZgE+W3WM16YMCaPwOHLHsmopZHELU0Ojin1lPVxKR0MihncA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
       }
     },
     "node_modules/csstype": {
@@ -6026,6 +6249,7 @@
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -6038,6 +6262,7 @@
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -6047,15 +6272,17 @@
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
+      "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -6065,6 +6292,7 @@
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -6077,6 +6305,7 @@
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -6086,6 +6315,7 @@
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -6102,6 +6332,7 @@
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -6114,6 +6345,7 @@
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -6126,6 +6358,7 @@
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -6138,21 +6371,23 @@
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
     },
     "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==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz",
+      "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.0.0"
+        "whatwg-mimetype": "^5.0.0",
+        "whatwg-url": "^16.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/data-view-buffer": {
@@ -6226,16 +6461,18 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
-      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
-      "dev": true
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/decimal.js-light": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
       "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/decode-bmp": {
       "version": "0.2.1",
@@ -6266,16 +6503,6 @@
         "node": ">=8.6"
       }
     },
-    "node_modules/deep-eql": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
-      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -6339,6 +6566,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -6353,9 +6581,9 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -6368,45 +6596,11 @@
       "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
       "license": "MIT"
     },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/dom-accessibility-api": {
       "version": "0.5.16",
       "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
       "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
@@ -6432,13 +6626,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/ejs": {
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
@@ -6456,9 +6643,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.129",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.129.tgz",
-      "integrity": "sha512-JlXUemX4s0+9f8mLqib/bHH8gOHf5elKS6KeWG3sk3xozb/JTq/RLXIv8OKUWiK4Ah00Wm88EFj5PYkFr4RUPA==",
+      "version": "1.5.307",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.307.tgz",
+      "integrity": "sha512-5z3uFKBWjiNR44nFcYdkcXjKMbg5KXNdciu7mhTPo9tB7NbqSNP2sSnGR+fqknZSCwKkBN+oxiiajWs4dT6ORg==",
       "dev": true,
       "license": "ISC"
     },
@@ -6470,30 +6657,54 @@
       "license": "MIT"
     },
     "node_modules/engine.io-client": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz",
-      "integrity": "sha512-GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==",
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.4.tgz",
+      "integrity": "sha512-+kjUJnZGwzewFDw951CDWcwj35vMNf2fcj7xQWOctq1F2i1jkDdVvdFG9kM/BEChymCH36KgjnW0NsL58JYRxw==",
       "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
+        "debug": "~4.4.1",
         "engine.io-parser": "~5.2.1",
-        "ws": "~8.17.1",
-        "xmlhttprequest-ssl": "~2.0.0"
+        "ws": "~8.18.3",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
+    "node_modules/engine.io-client/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
     "node_modules/engine.io-parser": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
-      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
+      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -6504,9 +6715,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "version": "1.24.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
+      "integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6514,18 +6725,18 @@
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -6537,21 +6748,24 @@
         "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
         "is-data-view": "^1.0.2",
+        "is-negative-zero": "^2.0.3",
         "is-regex": "^1.2.1",
+        "is-set": "^2.0.3",
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
         "set-proto": "^1.0.0",
+        "stop-iteration-iterator": "^1.1.0",
         "string.prototype.trim": "^1.2.10",
         "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
@@ -6560,7 +6774,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6588,9 +6802,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz",
-      "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
       "dev": true,
       "license": "MIT"
     },
@@ -6639,10 +6853,21 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/es-toolkit": {
+      "version": "1.45.1",
+      "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.45.1.tgz",
+      "integrity": "sha512-/jhoOj/Fx+A+IIyDNOvO3TItGmlMKhtX8ISAHKE90c4b/k1tqaqEZ+uUqfpU8DMnW5cgNJv606zS55jGvza0Xw==",
+      "dev": true,
+      "license": "MIT",
+      "workspaces": [
+        "docs",
+        "benchmarks"
+      ]
+    },
     "node_modules/esbuild": {
-      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
-      "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==",
+      "version": "0.27.4",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.4.tgz",
+      "integrity": "sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -6653,31 +6878,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.2",
-        "@esbuild/android-arm": "0.25.2",
-        "@esbuild/android-arm64": "0.25.2",
-        "@esbuild/android-x64": "0.25.2",
-        "@esbuild/darwin-arm64": "0.25.2",
-        "@esbuild/darwin-x64": "0.25.2",
-        "@esbuild/freebsd-arm64": "0.25.2",
-        "@esbuild/freebsd-x64": "0.25.2",
-        "@esbuild/linux-arm": "0.25.2",
-        "@esbuild/linux-arm64": "0.25.2",
-        "@esbuild/linux-ia32": "0.25.2",
-        "@esbuild/linux-loong64": "0.25.2",
-        "@esbuild/linux-mips64el": "0.25.2",
-        "@esbuild/linux-ppc64": "0.25.2",
-        "@esbuild/linux-riscv64": "0.25.2",
-        "@esbuild/linux-s390x": "0.25.2",
-        "@esbuild/linux-x64": "0.25.2",
-        "@esbuild/netbsd-arm64": "0.25.2",
-        "@esbuild/netbsd-x64": "0.25.2",
-        "@esbuild/openbsd-arm64": "0.25.2",
-        "@esbuild/openbsd-x64": "0.25.2",
-        "@esbuild/sunos-x64": "0.25.2",
-        "@esbuild/win32-arm64": "0.25.2",
-        "@esbuild/win32-ia32": "0.25.2",
-        "@esbuild/win32-x64": "0.25.2"
+        "@esbuild/aix-ppc64": "0.27.4",
+        "@esbuild/android-arm": "0.27.4",
+        "@esbuild/android-arm64": "0.27.4",
+        "@esbuild/android-x64": "0.27.4",
+        "@esbuild/darwin-arm64": "0.27.4",
+        "@esbuild/darwin-x64": "0.27.4",
+        "@esbuild/freebsd-arm64": "0.27.4",
+        "@esbuild/freebsd-x64": "0.27.4",
+        "@esbuild/linux-arm": "0.27.4",
+        "@esbuild/linux-arm64": "0.27.4",
+        "@esbuild/linux-ia32": "0.27.4",
+        "@esbuild/linux-loong64": "0.27.4",
+        "@esbuild/linux-mips64el": "0.27.4",
+        "@esbuild/linux-ppc64": "0.27.4",
+        "@esbuild/linux-riscv64": "0.27.4",
+        "@esbuild/linux-s390x": "0.27.4",
+        "@esbuild/linux-x64": "0.27.4",
+        "@esbuild/netbsd-arm64": "0.27.4",
+        "@esbuild/netbsd-x64": "0.27.4",
+        "@esbuild/openbsd-arm64": "0.27.4",
+        "@esbuild/openbsd-x64": "0.27.4",
+        "@esbuild/openharmony-arm64": "0.27.4",
+        "@esbuild/sunos-x64": "0.27.4",
+        "@esbuild/win32-arm64": "0.27.4",
+        "@esbuild/win32-ia32": "0.27.4",
+        "@esbuild/win32-x64": "0.27.4"
       }
     },
     "node_modules/escalade": {
@@ -6703,86 +6929,95 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.1.0.tgz",
+      "integrity": "sha512-S9jlY/ELKEUwwQnqWDO+f+m6sercqOPSqXM5Go94l7DOmxHVDgmSFGWEzeE/gwgTAr0W103BWt0QLe/7mabIvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@eslint/config-array": "^0.23.3",
+        "@eslint/config-helpers": "^0.5.3",
+        "@eslint/core": "^1.1.1",
+        "@eslint/plugin-kit": "^0.6.1",
+        "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
-        "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "ajv": "^6.14.0",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^9.1.2",
+        "eslint-visitor-keys": "^5.0.1",
+        "espree": "^11.2.0",
+        "esquery": "^1.7.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
-        "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
+        "minimatch": "^10.2.4",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3",
-        "strip-ansi": "^6.0.1",
-        "text-table": "^0.2.0"
+        "optionator": "^0.9.3"
       },
       "bin": {
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz",
-      "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
+      "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "hermes-parser": "^0.25.1",
+        "zod": "^3.25.0 || ^4.0.0",
+        "zod-validation-error": "^3.5.0 || ^4.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.7.tgz",
-      "integrity": "sha512-yrj+KInFmwuQS2UQcg1SF83ha1tuHC1jMQbRNyuWtlEzzKRDgAl7L4Yp4NlDUZTZNlWvHEzOtJhMi40R7JxcSw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.5.2.tgz",
+      "integrity": "sha512-hmgTH57GfzoTFjVN0yBwTggnsVUF2tcqi7RJZHqi9lIezSs4eFyAMktA68YD4r5kNw1mxyY4dmkyoFDb3FIqrA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "eslint": ">=7"
+        "eslint": "^9 || ^10"
       }
     },
     "node_modules/eslint-plugin-simple-import-sort": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.0.tgz",
-      "integrity": "sha512-Y2fqAfC11TcG/WP3TrI1Gi3p3nc8XJyEOJYHyEPEGI/UAgNx6akxxlX74p7SbAQdLcgASKhj8M0GKvH3vq/+ig==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz",
+      "integrity": "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -6790,32 +7025,36 @@
       }
     },
     "node_modules/eslint-plugin-testing-library": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.2.0.tgz",
-      "integrity": "sha512-+LCYJU81WF2yQ+Xu4A135CgK8IszcFcyMF4sWkbiu6Oj+Nel0TrkZq/HvDw0/1WuO3dhDQsZA/OpEMGd0NfcUw==",
+      "version": "7.16.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-7.16.2.tgz",
+      "integrity": "sha512-8gleGnQXK2ZA3hHwjCwpYTZvM+9VsrJ+/9kDI8CjqAQGAdMQOdn/rJNu7ZySENuiWlGKQWyZJ4ZjEg2zamaRHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/utils": "^5.58.0"
+        "@typescript-eslint/scope-manager": "^8.56.0",
+        "@typescript-eslint/utils": "^8.56.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "peerDependencies": {
-        "eslint": "^7.5.0 || ^8.0.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+      "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
+        "@types/esrecurse": "^4.3.1",
+        "@types/estree": "^1.0.8",
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -6826,6 +7065,7 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -6833,55 +7073,56 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+    "node_modules/espree": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+      "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
       "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.16.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^5.0.1"
+      },
       "engines": {
-        "node": ">=10"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
       "dev": true,
-      "dependencies": {
-        "acorn": "^8.9.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^20.19.0 || ^22.13.0 || >=24"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+      "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -6894,6 +7135,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -6906,6 +7148,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -6930,54 +7173,34 @@
       }
     },
     "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "dev": true
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
       "dev": true,
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
+      "license": "MIT"
     },
     "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-30.3.0.tgz",
+      "integrity": "sha512-1zQrciTiQfRdo7qJM1uG4navm8DayFa2TgCSRlzUyNkhcJ6XUZF3hjnpkyr3VhAqPH7i/9GkG7Tv5abz6fqz0Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "@jest/expect-utils": "30.3.0",
+        "@jest/get-type": "30.1.0",
+        "jest-matcher-utils": "30.3.0",
+        "jest-message-util": "30.3.0",
+        "jest-mock": "30.3.0",
+        "jest-util": "30.3.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/expect-type": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz",
-      "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
+      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -6989,44 +7212,6 @@
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
-    "node_modules/fast-equals": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.2.2.tgz",
-      "integrity": "sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fast-glob/node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "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",
@@ -7040,9 +7225,9 @@
       "dev": true
     },
     "node_modules/fast-uri": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+      "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
       "dev": true,
       "funding": [
         {
@@ -7053,17 +7238,8 @@
           "type": "opencollective",
           "url": "https://opencollective.com/fastify"
         }
-      ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
+      ],
+      "license": "BSD-3-Clause"
     },
     "node_modules/fflate": {
       "version": "0.8.2",
@@ -7073,15 +7249,16 @@
       "license": "MIT"
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/file-selector": {
@@ -7097,9 +7274,9 @@
       }
     },
     "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.6.tgz",
+      "integrity": "sha512-5giy2PkLYY1cP39p17Ech+2xlpTRL9HLspOfEgm0L6CwBXBTgsK5ou0JtzYuepxkaQ/tvhCFIJ5uXo0OrM2DxA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -7117,9 +7294,9 @@
       }
     },
     "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "version": "5.1.9",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -7158,36 +7335,37 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
+      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.11",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
+      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
+      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -7244,9 +7422,9 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -7259,11 +7437,31 @@
         "node": ">= 6"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs-extra/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
@@ -7319,6 +7517,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/generator-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -7391,18 +7599,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/get-symbol-description": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
@@ -7421,26 +7617,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -7454,12 +7630,16 @@
       }
     },
     "node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "version": "17.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.4.0.tgz",
+      "integrity": "sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/globalthis": {
@@ -7479,26 +7659,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/gopd": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -7517,16 +7677,10 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
     "node_modules/graphql": {
-      "version": "16.10.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.10.0.tgz",
-      "integrity": "sha512-AjqGKbDGUFRKIRCP9tCKiIGHyriz2oHEbPIbEtcSLSs4YjReZOIPQQWek4+6hjw62H9QShXHyaGivGiYVLeYFQ==",
+      "version": "16.13.2",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.13.2.tgz",
+      "integrity": "sha512-5bJ+nf/UCpAjHM8i06fl7eLyVC9iuNAjm9qzkiu2ZGhM0VscSvS6WDPfAwkdkBuoXGM9FJSbKl6wylMwP9Ktig==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7630,23 +7784,42 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hermes-estree": "0.25.1"
+      }
+    },
     "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==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz",
+      "integrity": "sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "whatwg-encoding": "^3.1.1"
+        "@exodus/bytes": "^1.6.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
@@ -7675,22 +7848,14 @@
         "node": ">= 14"
       }
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "dev": true,
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
     "node_modules/husky": {
-      "version": "9.0.11",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.0.11.tgz",
-      "integrity": "sha512-AB6lFlbwwyIqMdHYhwPe+kjOC3Oc5P3nThEoW/AaO2BX3vJDjWPFxYLxokUZOo6RNX20He3AaT8sESs9NJcmEw==",
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
       "dev": true,
+      "license": "MIT",
       "bin": {
-        "husky": "bin.mjs"
+        "husky": "bin.js"
       },
       "engines": {
         "node": ">=18"
@@ -7706,18 +7871,6 @@
       "dev": true,
       "license": "MPL-2.0"
     },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/idb": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz",
@@ -7734,22 +7887,24 @@
         "node": ">= 4"
       }
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+    "node_modules/immer": {
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
+      "integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
       "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
+      "license": "MIT",
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
       }
     },
+    "node_modules/immutable": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz",
+      "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -7768,22 +7923,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "node_modules/internal-slot": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
@@ -7804,6 +7943,7 @@
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -7979,14 +8119,15 @@
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
+        "call-bound": "^1.0.4",
+        "generator-function": "^2.0.0",
+        "get-proto": "^1.0.1",
         "has-tostringtag": "^1.0.2",
         "safe-regex-test": "^1.1.0"
       },
@@ -8029,6 +8170,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
+      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-node-process": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
@@ -8072,15 +8226,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
@@ -8272,6 +8417,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
@@ -8281,6 +8427,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -8290,26 +8437,12 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
-      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.23",
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -8318,33 +8451,16 @@
         "node": ">=8"
       }
     },
-    "node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
     "node_modules/jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
+      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
+        "async": "^3.2.6",
         "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "jake": "bin/cli.js"
@@ -8354,18 +8470,19 @@
       }
     },
     "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-30.3.0.tgz",
+      "integrity": "sha512-n3q4PDQjS4LrKxfWB3Z5KNk1XjXtZTBwQp71OP0Jo03Z6V60x++K5L8k6ZrW8MY8pOFylZvHM0zsjS1RqlHJZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/diff-sequences": "30.3.0",
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "pretty-format": "30.3.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-diff/node_modules/ansi-styles": {
@@ -8373,6 +8490,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8381,47 +8499,41 @@
       }
     },
     "node_modules/jest-diff/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-diff/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
       "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
+      "license": "MIT"
     },
     "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-30.3.0.tgz",
+      "integrity": "sha512-HEtc9uFQgaUHkC7nLSlQL3Tph4Pjxt/yiPvkIrrDCt9jhoLIgxaubo1G+CFOnmHYMxHwwdaSN7mkIFs6ZK8OhA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/get-type": "30.1.0",
+        "chalk": "^4.1.2",
+        "jest-diff": "30.3.0",
+        "pretty-format": "30.3.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
@@ -8429,6 +8541,7 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -8437,92 +8550,150 @@
       }
     },
     "node_modules/jest-matcher-utils/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
     "node_modules/jest-matcher-utils/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-30.3.0.tgz",
+      "integrity": "sha512-Z/j4Bo+4ySJ+JPJN3b2Qbl9hDq3VrXmnjjGEWD/x0BCXeOXPTV1iZYYzl2X8c1MaCOL+ewMyNBcm88sboE6YWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@jest/types": "30.3.0",
+        "@types/stack-utils": "^2.0.3",
+        "chalk": "^4.1.2",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.3",
+        "pretty-format": "30.3.0",
         "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "stack-utils": "^2.0.6"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/pretty-format": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-30.3.0.tgz",
+      "integrity": "sha512-oG4T3wCbfeuvljnyAzhBvpN45E8iOTXCU/TD3zXW80HA3dQ4ahdqMkWGiPWZvjpQwlbyHrPTWUAqUzGzv4l1JQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "30.0.5",
+        "ansi-styles": "^5.2.0",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/react-is": {
+      "version": "18.3.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jest-mock": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-30.3.0.tgz",
+      "integrity": "sha512-OTzICK8CpE+t4ndhKrwlIdbM6Pn8j00lvmSmq5ejiO+KxukbLjgOflKWMn3KE34EZdQm5RqTuKj+5RIEniYhog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "30.3.0",
+        "@types/node": "*",
+        "jest-util": "30.3.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+    "node_modules/jest-regex-util": {
+      "version": "30.0.1",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-30.0.1.tgz",
+      "integrity": "sha512-jHEQgBXAgc+Gh4g0p3bCevgRCVRkB4VB70zhoAE48gxeSr1hfUOsM/C2WoJgVL7Eyg//hudYENbm3Ne+/dRVVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+    "node_modules/jest-util": {
+      "version": "30.3.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-30.3.0.tgz",
+      "integrity": "sha512-/jZDa00a3Sz7rdyu55NLrQCIrbyIkbBxareejQI315f/i8HjYN+ZWsDLLpoQSiUIEIyZF/R8fDg3BmB8AtHttg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@jest/types": "30.3.0",
+        "@types/node": "*",
+        "chalk": "^4.1.2",
+        "ci-info": "^4.2.0",
+        "graceful-fs": "^4.2.11",
+        "picomatch": "^4.0.3"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.14.0 || ^20.0.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/jiti": {
@@ -8540,50 +8711,37 @@
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/jsdom": {
-      "version": "26.0.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-26.0.0.tgz",
-      "integrity": "sha512-BZYDGVAIriBWTpIxYzrXjv3E/4u8+/pSG5bQdIYCbNCGOvsPkDQfTVLAIXAf9ETdCpduCVTkDe2NNZ8NIwUVzw==",
+      "version": "28.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-28.1.0.tgz",
+      "integrity": "sha512-0+MoQNYyr2rBHqO1xilltfDjV9G7ymYGlAUazgcDLQaUf8JDHbuGwsxN6U9qWaElZ4w1B2r7yEGIL3GdeW3Rug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cssstyle": "^4.2.1",
-        "data-urls": "^5.0.0",
-        "decimal.js": "^10.4.3",
-        "form-data": "^4.0.1",
-        "html-encoding-sniffer": "^4.0.0",
+        "@acemir/cssom": "^0.9.31",
+        "@asamuzakjp/dom-selector": "^6.8.1",
+        "@bramus/specificity": "^2.4.2",
+        "@exodus/bytes": "^1.11.0",
+        "cssstyle": "^6.0.1",
+        "data-urls": "^7.0.0",
+        "decimal.js": "^10.6.0",
+        "html-encoding-sniffer": "^6.0.0",
         "http-proxy-agent": "^7.0.2",
         "https-proxy-agent": "^7.0.6",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.16",
-        "parse5": "^7.2.1",
-        "rrweb-cssom": "^0.8.0",
+        "parse5": "^8.0.0",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
-        "tough-cookie": "^5.0.0",
+        "tough-cookie": "^6.0.0",
+        "undici": "^7.21.0",
         "w3c-xmlserializer": "^5.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^3.1.1",
-        "whatwg-mimetype": "^4.0.0",
-        "whatwg-url": "^14.1.0",
-        "ws": "^8.18.0",
+        "webidl-conversions": "^8.0.1",
+        "whatwg-mimetype": "^5.0.0",
+        "whatwg-url": "^16.0.0",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       },
       "peerDependencies": {
         "canvas": "^3.0.0"
@@ -8594,28 +8752,6 @@
         }
       }
     },
-    "node_modules/jsdom/node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/jsesc": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
@@ -8633,7 +8769,8 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
@@ -8646,7 +8783,8 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -8667,10 +8805,11 @@
       }
     },
     "node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -8703,6 +8842,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -8754,10 +8894,11 @@
       }
     },
     "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "version": "4.17.23",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
+      "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
@@ -8766,12 +8907,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -8790,13 +8925,6 @@
         "loose-envify": "cli.js"
       }
     },
-    "node_modules/loupe": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz",
-      "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -8811,31 +8939,30 @@
       "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
       "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
-      "peer": true,
       "bin": {
         "lz-string": "bin/bin.js"
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
     "node_modules/magicast": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
-      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.2.tgz",
+      "integrity": "sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.4",
-        "@babel/types": "^7.25.4",
-        "source-map-js": "^1.2.0"
+        "@babel/parser": "^7.29.0",
+        "@babel/types": "^7.29.0",
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/make-dir": {
@@ -8843,6 +8970,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -8853,26 +8981,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/make-dir/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -8880,12 +8994,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/make-dir/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -8895,39 +9003,18 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+    "node_modules/mdn-data": {
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
+      "license": "CC0-1.0"
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -8936,6 +9023,7 @@
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -8943,15 +9031,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
@@ -8962,15 +9041,19 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^5.0.2"
       },
       "engines": {
-        "node": "*"
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/minipass": {
@@ -9008,30 +9091,30 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "node_modules/msw": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/msw/-/msw-2.7.0.tgz",
-      "integrity": "sha512-BIodwZ19RWfCbYTxWTUfTXc+sg4OwjCAgxU1ZsgmggX/7S3LdUifsbUPJs61j0rWb19CZRGY5if77duhc0uXzw==",
+      "version": "2.12.14",
+      "resolved": "https://registry.npmjs.org/msw/-/msw-2.12.14.tgz",
+      "integrity": "sha512-4KXa4nVBIBjbDbd7vfQNuQ25eFxug0aropCQFoI0JdOBuJWamkT1yLVIWReFI8SiTRc+H1hKzaNk+cLk2N9rtQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@bundled-es-modules/cookie": "^2.0.1",
-        "@bundled-es-modules/statuses": "^1.0.1",
-        "@bundled-es-modules/tough-cookie": "^0.1.6",
         "@inquirer/confirm": "^5.0.0",
-        "@mswjs/interceptors": "^0.37.0",
+        "@mswjs/interceptors": "^0.41.2",
         "@open-draft/deferred-promise": "^2.2.0",
-        "@open-draft/until": "^2.1.0",
-        "@types/cookie": "^0.6.0",
-        "@types/statuses": "^2.0.4",
-        "graphql": "^16.8.1",
+        "@types/statuses": "^2.0.6",
+        "cookie": "^1.0.2",
+        "graphql": "^16.12.0",
         "headers-polyfill": "^4.0.2",
         "is-node-process": "^1.2.0",
         "outvariant": "^1.4.3",
         "path-to-regexp": "^6.3.0",
         "picocolors": "^1.1.1",
+        "rettime": "^0.10.1",
+        "statuses": "^2.0.2",
         "strict-event-emitter": "^0.5.1",
-        "type-fest": "^4.26.1",
+        "tough-cookie": "^6.0.0",
+        "type-fest": "^5.2.0",
+        "until-async": "^3.0.2",
         "yargs": "^17.7.2"
       },
       "bin": {
@@ -9053,13 +9136,16 @@
       }
     },
     "node_modules/msw/node_modules/type-fest": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.32.0.tgz",
-      "integrity": "sha512-rfgpoi08xagF3JSdtJlCwMq9DGNDE0IMh3Mkpc1wUypg9vPi786AiqeBBKcqvIkq42azsBM85N490fyZjeUftw==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.5.0.tgz",
+      "integrity": "sha512-PlBfpQwiUvGViBNX84Yxwjsdhd1TUlXr6zjX7eoirtCPIr08NAmxwa+fcYBTeRQxHo9YC9wwF3m9i700sHma8g==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
+      "dependencies": {
+        "tagged-tag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=16"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -9100,29 +9186,18 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
       "dev": true,
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT",
+      "optional": true
     },
-    "node_modules/nwsapi": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
-      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ==",
+    "node_modules/node-releases": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.36.tgz",
+      "integrity": "sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==",
       "dev": true,
       "license": "MIT"
     },
@@ -9178,29 +9253,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+    "node_modules/obug": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
+      "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
       "dev": true,
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "funding": [
+        "https://github.com/sponsors/sxzz",
+        "https://opencollective.com/debug"
+      ],
+      "license": "MIT"
     },
     "node_modules/optionator": {
       "version": "0.9.4",
@@ -9282,26 +9344,14 @@
       "dev": true,
       "license": "BlueOak-1.0.0"
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parse5": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
-      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz",
+      "integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^4.5.0"
+        "entities": "^6.0.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -9316,15 +9366,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -9338,31 +9379,8 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
       "dev": true,
-      "license": "ISC"
+      "license": "MIT"
     },
     "node_modules/path-to-regexp": {
       "version": "6.3.0",
@@ -9371,15 +9389,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -9387,16 +9396,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/pathval": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz",
-      "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.16"
-      }
-    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -9584,10 +9583,11 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz",
+      "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -9599,21 +9599,18 @@
       }
     },
     "node_modules/prettier-plugin-organize-imports": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.4.tgz",
-      "integrity": "sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.3.0.tgz",
+      "integrity": "sha512-FxFz0qFhyBsGdIsb697f/EkvHzi5SZOhWAjxcx2dLt+Q532bAlhswcXGYB1yzjZ69kW8UoadFBw7TyNwlq96Iw==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
-        "@volar/vue-language-plugin-pug": "^1.0.4",
-        "@volar/vue-typescript": "^1.0.4",
         "prettier": ">=2.0",
-        "typescript": ">=2.9"
+        "typescript": ">=2.9",
+        "vue-tsc": "^2.1.0 || 3"
       },
       "peerDependenciesMeta": {
-        "@volar/vue-language-plugin-pug": {
-          "optional": true
-        },
-        "@volar/vue-typescript": {
+        "vue-tsc": {
           "optional": true
         }
       }
@@ -9636,7 +9633,6 @@
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
       "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "ansi-regex": "^5.0.1",
         "ansi-styles": "^5.0.0",
@@ -9651,7 +9647,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -9663,22 +9658,22 @@
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "dev": true,
-      "peer": true
+      "dev": true
     },
     "node_modules/pretty-quick": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-4.0.0.tgz",
-      "integrity": "sha512-M+2MmeufXb/M7Xw3Afh1gxcYpj+sK0AxEfnfF958ktFeAyi5MsKY5brymVURQLgPLV1QaF5P4pb2oFJ54H3yzQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-4.2.2.tgz",
+      "integrity": "sha512-uAh96tBW1SsD34VhhDmWuEmqbpfYc/B3j++5MC/6b3Cb8Ow7NJsvKFhg0eoGu2xXX+o9RkahkTK6sUdd8E7g5w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "execa": "^5.1.1",
-        "find-up": "^5.0.0",
-        "ignore": "^5.3.0",
+        "@pkgr/core": "^0.2.7",
+        "ignore": "^7.0.5",
         "mri": "^1.2.0",
-        "picocolors": "^1.0.0",
-        "picomatch": "^3.0.1",
-        "tslib": "^2.6.2"
+        "picocolors": "^1.1.1",
+        "picomatch": "^4.0.2",
+        "tinyexec": "^0.3.2",
+        "tslib": "^2.8.1"
       },
       "bin": {
         "pretty-quick": "lib/cli.mjs"
@@ -9686,17 +9681,31 @@
       "engines": {
         "node": ">=14"
       },
+      "funding": {
+        "url": "https://opencollective.com/pretty-quick"
+      },
       "peerDependencies": {
         "prettier": "^3.0.0"
       }
     },
+    "node_modules/pretty-quick/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/pretty-quick/node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/jonschlinkert"
@@ -9713,21 +9722,12 @@
       }
     },
     "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
-    },
-    "node_modules/psl": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
-      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
-      "dev": true,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz",
+      "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==",
       "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/lupomontero"
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/punycode": {
@@ -9746,78 +9746,41 @@
       "dev": true,
       "funding": [
         {
-          "type": "individual",
-          "url": "https://github.com/sponsors/antfu"
-        },
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/sxzz"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
+          "type": "individual",
+          "url": "https://github.com/sponsors/antfu"
         },
         {
-          "type": "consulting",
-          "url": "https://feross.org/support"
+          "type": "individual",
+          "url": "https://github.com/sponsors/sxzz"
         }
-      ]
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
+      ],
+      "license": "MIT"
     },
     "node_modules/react": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
-      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
+      "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
+      "version": "19.2.4",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
+      "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
       "dependencies": {
         "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^19.2.3"
+        "react": "^19.2.4"
       }
     },
     "node_modules/react-dropzone": {
-      "version": "14.3.8",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.8.tgz",
-      "integrity": "sha512-sBgODnq+lcA4P296DY4wacOZz3JFpD99fp+hb//iBO2HHnyeZU3FwWyXJ6salNpqQdsZrgMrotuko/BdJMV8Ug==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-15.0.0.tgz",
+      "integrity": "sha512-lGjYV/EoqEjEWPnmiSvH4v5IoIAwQM2W4Z1C0Q/Pw2xD0eVzKPS359BQTUMum+1fa0kH2nrKjuavmTPOGhpLPg==",
       "license": "MIT",
       "dependencies": {
         "attr-accept": "^2.2.4",
@@ -9846,10 +9809,34 @@
         "react-dom": "^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/react-redux": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
+        "redux": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-refresh": {
-      "version": "0.17.0",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
-      "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
+      "integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9904,14 +9891,13 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.5.2.tgz",
-      "integrity": "sha512-9Rw8r199klMnlGZ8VAsV/I8WrIF6IyJ90JQUdboupx1cdkgYqwnrYjH+I/nY/7cA1X5zia4mDJqH36npP7sxGQ==",
+      "version": "7.13.2",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.2.tgz",
+      "integrity": "sha512-tX1Aee+ArlKQP+NIUd7SE6Li+CiGKwQtbS+FfRxPX6Pe4vHOo6nr9d++u5cwg+Z8K/x8tP+7qLmujDtfrAoUJA==",
       "license": "MIT",
       "dependencies": {
         "cookie": "^1.0.1",
-        "set-cookie-parser": "^2.6.0",
-        "turbo-stream": "2.4.0"
+        "set-cookie-parser": "^2.6.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -9926,22 +9912,6 @@
         }
       }
     },
-    "node_modules/react-smooth": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz",
-      "integrity": "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-equals": "^5.0.1",
-        "prop-types": "^15.8.1",
-        "react-transition-group": "^4.4.5"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
     "node_modules/react-style-singleton": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
@@ -10006,46 +9976,51 @@
         "react-dom": ">=16.6.0"
       }
     },
-    "node_modules/recharts": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.0.tgz",
-      "integrity": "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw==",
+    "node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "clsx": "^2.0.0",
-        "eventemitter3": "^4.0.1",
-        "lodash": "^4.17.21",
-        "react-is": "^18.3.1",
-        "react-smooth": "^4.0.0",
-        "recharts-scale": "^0.4.4",
-        "tiny-invariant": "^1.3.1",
-        "victory-vendor": "^36.6.8"
-      },
       "engines": {
-        "node": ">=14"
+        "node": ">= 14.18.0"
       },
-      "peerDependencies": {
-        "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/recharts-scale": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz",
-      "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==",
+    "node_modules/recharts": {
+      "version": "3.8.1",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-3.8.1.tgz",
+      "integrity": "sha512-mwzmO1s9sFL0TduUpwndxCUNoXsBw3u3E/0+A+cLcrSfQitSG62L32N69GhqUrrT5qKcAE3pCGVINC6pqkBBQg==",
       "dev": true,
+      "license": "MIT",
+      "workspaces": [
+        "www"
+      ],
       "dependencies": {
-        "decimal.js-light": "^2.4.1"
+        "@reduxjs/toolkit": "^1.9.0 || 2.x.x",
+        "clsx": "^2.1.1",
+        "decimal.js-light": "^2.5.1",
+        "es-toolkit": "^1.39.3",
+        "eventemitter3": "^5.0.1",
+        "immer": "^10.1.1",
+        "react-redux": "8.x.x || 9.x.x",
+        "reselect": "5.1.1",
+        "tiny-invariant": "^1.3.3",
+        "use-sync-external-store": "^1.2.2",
+        "victory-vendor": "^37.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/recharts/node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -10059,6 +10034,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/redux-thunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "redux": "^5.0.0"
+      }
+    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -10090,9 +10082,9 @@
       "license": "MIT"
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
-      "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.2.tgz",
+      "integrity": "sha512-m03P+zhBeQd1RGnYxrGyDAPpWX/epKirLrp8e3qevZdVkKtnCrjjWczIbYc8+xd6vcTStVlqfycTx1KR4LOr0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10107,16 +10099,6 @@
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
       "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
-    "node_modules/regenerator-transform": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.8.4"
-      }
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
@@ -10139,18 +10121,18 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
-      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.4.0.tgz",
+      "integrity": "sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "regenerate": "^1.4.2",
-        "regenerate-unicode-properties": "^10.2.0",
+        "regenerate-unicode-properties": "^10.2.2",
         "regjsgen": "^0.8.0",
-        "regjsparser": "^0.12.0",
+        "regjsparser": "^0.13.0",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.1.0"
+        "unicode-match-property-value-ecmascript": "^2.2.1"
       },
       "engines": {
         "node": ">=4"
@@ -10164,28 +10146,18 @@
       "license": "MIT"
     },
     "node_modules/regjsparser": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
-      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.0.tgz",
+      "integrity": "sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "jsesc": "~3.0.2"
+        "jsesc": "~3.1.0"
       },
       "bin": {
         "regjsparser": "bin/parser"
       }
     },
-    "node_modules/regjsparser/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -10206,21 +10178,21 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+    "node_modules/reselect": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -10234,44 +10206,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+    "node_modules/rettime": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.10.1.tgz",
+      "integrity": "sha512-uyDrIlUEH37cinabq0AX4QbgV4HbFZ/gqoiunWQ1UqBtRvTTytwhNYjE++pO/MjPTZL5KQCf2bEoJ/BJNVQ5Kw==",
       "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "license": "MIT"
     },
     "node_modules/rollup": {
-      "version": "4.48.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.48.1.tgz",
-      "integrity": "sha512-jVG20NvbhTYDkGAty2/Yh7HK6/q3DGSRH4o8ALKGArmMuaauM9kLfoMZ+WliPwA5+JHr2lTn3g557FxBV87ifg==",
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.59.0.tgz",
+      "integrity": "sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10285,59 +10230,34 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.48.1",
-        "@rollup/rollup-android-arm64": "4.48.1",
-        "@rollup/rollup-darwin-arm64": "4.48.1",
-        "@rollup/rollup-darwin-x64": "4.48.1",
-        "@rollup/rollup-freebsd-arm64": "4.48.1",
-        "@rollup/rollup-freebsd-x64": "4.48.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.48.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.48.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.48.1",
-        "@rollup/rollup-linux-arm64-musl": "4.48.1",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.48.1",
-        "@rollup/rollup-linux-ppc64-gnu": "4.48.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.48.1",
-        "@rollup/rollup-linux-riscv64-musl": "4.48.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.48.1",
-        "@rollup/rollup-linux-x64-gnu": "4.48.1",
-        "@rollup/rollup-linux-x64-musl": "4.48.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.48.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.48.1",
-        "@rollup/rollup-win32-x64-msvc": "4.48.1",
+        "@rollup/rollup-android-arm-eabi": "4.59.0",
+        "@rollup/rollup-android-arm64": "4.59.0",
+        "@rollup/rollup-darwin-arm64": "4.59.0",
+        "@rollup/rollup-darwin-x64": "4.59.0",
+        "@rollup/rollup-freebsd-arm64": "4.59.0",
+        "@rollup/rollup-freebsd-x64": "4.59.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.59.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.59.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.59.0",
+        "@rollup/rollup-linux-arm64-musl": "4.59.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.59.0",
+        "@rollup/rollup-linux-loong64-musl": "4.59.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.59.0",
+        "@rollup/rollup-linux-ppc64-musl": "4.59.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.59.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.59.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.59.0",
+        "@rollup/rollup-linux-x64-gnu": "4.59.0",
+        "@rollup/rollup-linux-x64-musl": "4.59.0",
+        "@rollup/rollup-openbsd-x64": "4.59.0",
+        "@rollup/rollup-openharmony-arm64": "4.59.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.59.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.59.0",
+        "@rollup/rollup-win32-x64-gnu": "4.59.0",
+        "@rollup/rollup-win32-x64-msvc": "4.59.0",
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/rrweb-cssom": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz",
-      "integrity": "sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
     "node_modules/rxjs": {
       "version": "7.8.2",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
@@ -10368,27 +10288,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
@@ -10424,23 +10323,38 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+    "node_modules/sass": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.98.0.tgz",
+      "integrity": "sha512-+4N/u9dZ4PrgzGgPlKnaaRQx64RO0JBKs9sDhQ2pLgN6JQZ25uPQZKQYaBJU48Kd5BxgXoJ4e09Dq7nMcOUW3A==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "chokidar": "^4.0.0",
+        "immutable": "^5.1.5",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher": "^2.4.1"
+      }
     },
     "node_modules/sass-embedded": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.86.1.tgz",
-      "integrity": "sha512-LMJvytHh7lIUtmjGCqpM4cRdIDvPllLJKznNIK4L7EZJ77BLeUFoOSRXEOHq4G4gqy5CVhHUKlHslzCANkDOhQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.98.0.tgz",
+      "integrity": "sha512-Do7u6iRb6K+lrllcTkB1BXcHwOxcKe3rEfOF/GcCLE2w3WpddakRAosJOHFUR37DpsvimQXEt5abs3NzUjEIqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@bufbuild/protobuf": "^2.0.0",
-        "buffer-builder": "^0.2.0",
+        "@bufbuild/protobuf": "^2.5.0",
         "colorjs.io": "^0.5.0",
-        "immutable": "^5.0.2",
+        "immutable": "^5.1.5",
         "rxjs": "^7.4.0",
         "supports-color": "^8.1.1",
         "sync-child-process": "^1.0.2",
@@ -10453,51 +10367,49 @@
         "node": ">=16.0.0"
       },
       "optionalDependencies": {
-        "sass-embedded-android-arm": "1.86.1",
-        "sass-embedded-android-arm64": "1.86.1",
-        "sass-embedded-android-ia32": "1.86.1",
-        "sass-embedded-android-riscv64": "1.86.1",
-        "sass-embedded-android-x64": "1.86.1",
-        "sass-embedded-darwin-arm64": "1.86.1",
-        "sass-embedded-darwin-x64": "1.86.1",
-        "sass-embedded-linux-arm": "1.86.1",
-        "sass-embedded-linux-arm64": "1.86.1",
-        "sass-embedded-linux-ia32": "1.86.1",
-        "sass-embedded-linux-musl-arm": "1.86.1",
-        "sass-embedded-linux-musl-arm64": "1.86.1",
-        "sass-embedded-linux-musl-ia32": "1.86.1",
-        "sass-embedded-linux-musl-riscv64": "1.86.1",
-        "sass-embedded-linux-musl-x64": "1.86.1",
-        "sass-embedded-linux-riscv64": "1.86.1",
-        "sass-embedded-linux-x64": "1.86.1",
-        "sass-embedded-win32-arm64": "1.86.1",
-        "sass-embedded-win32-ia32": "1.86.1",
-        "sass-embedded-win32-x64": "1.86.1"
-      }
-    },
-    "node_modules/sass-embedded-android-arm": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.86.1.tgz",
-      "integrity": "sha512-bcmKB67uCb9znune+QsE6cWIiKAHE9P+24/9vDPHwwN3BmmH1B/4mznNKKakdYMuxpgbeLrPcEScHEpQbdrIpA==",
+        "sass-embedded-all-unknown": "1.98.0",
+        "sass-embedded-android-arm": "1.98.0",
+        "sass-embedded-android-arm64": "1.98.0",
+        "sass-embedded-android-riscv64": "1.98.0",
+        "sass-embedded-android-x64": "1.98.0",
+        "sass-embedded-darwin-arm64": "1.98.0",
+        "sass-embedded-darwin-x64": "1.98.0",
+        "sass-embedded-linux-arm": "1.98.0",
+        "sass-embedded-linux-arm64": "1.98.0",
+        "sass-embedded-linux-musl-arm": "1.98.0",
+        "sass-embedded-linux-musl-arm64": "1.98.0",
+        "sass-embedded-linux-musl-riscv64": "1.98.0",
+        "sass-embedded-linux-musl-x64": "1.98.0",
+        "sass-embedded-linux-riscv64": "1.98.0",
+        "sass-embedded-linux-x64": "1.98.0",
+        "sass-embedded-unknown-all": "1.98.0",
+        "sass-embedded-win32-arm64": "1.98.0",
+        "sass-embedded-win32-x64": "1.98.0"
+      }
+    },
+    "node_modules/sass-embedded-all-unknown": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-all-unknown/-/sass-embedded-all-unknown-1.98.0.tgz",
+      "integrity": "sha512-6n4RyK7/1mhdfYvpP3CClS3fGoYqDvRmLClCESS6I7+SAzqjxvGG6u5Fo+cb1nrPNbbilgbM4QKdgcgWHO9NCA==",
       "cpu": [
-        "arm"
+        "!arm",
+        "!arm64",
+        "!riscv64",
+        "!x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
+      "dependencies": {
+        "sass": "1.98.0"
       }
     },
-    "node_modules/sass-embedded-android-arm64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.86.1.tgz",
-      "integrity": "sha512-SMY79YhNfq/gdz8MHqwEsnf/IjSnQFAmSEGDDv0vjL0yy9VZC/zhsxpsho8vbFEvTSEGFFlkGgPdzDuoozRrOg==",
+    "node_modules/sass-embedded-android-arm": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.98.0.tgz",
+      "integrity": "sha512-LjGiMhHgu7VL1n7EJxTCre1x14bUsWd9d3dnkS2rku003IWOI/fxc7OXgaKagoVzok1kv09rzO3vFXJR5ZeONQ==",
       "cpu": [
-        "arm64"
+        "arm"
       ],
       "dev": true,
       "license": "MIT",
@@ -10509,12 +10421,12 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-embedded-android-ia32": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.86.1.tgz",
-      "integrity": "sha512-AX6I5qS8GbgcbBJ1o3uKVI5/7tq6evg/BO/wa0XaNqnzP4i/PojBaGh7EcZrg/spl//SfpS55eA18a0/AOi71w==",
+    "node_modules/sass-embedded-android-arm64": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.98.0.tgz",
+      "integrity": "sha512-M9Ra98A6vYJHpwhoC/5EuH1eOshQ9ZyNwC8XifUDSbRl/cGeQceT1NReR9wFj3L7s1pIbmes1vMmaY2np0uAKQ==",
       "cpu": [
-        "ia32"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -10527,9 +10439,9 @@
       }
     },
     "node_modules/sass-embedded-android-riscv64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.86.1.tgz",
-      "integrity": "sha512-Af6ZzRTRfIfx6KICJZ19je6OjOXhxo+v6z/lf/SXm5/1EaHGpGC5xIw4ivtj4nNINNoqkykfIDCjpzm1qWEPPQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.98.0.tgz",
+      "integrity": "sha512-WPe+0NbaJIZE1fq/RfCZANMeIgmy83x4f+SvFOG7LhUthHpZWcOcrPTsCKKmN3xMT3iw+4DXvqTYOCYGRL3hcQ==",
       "cpu": [
         "riscv64"
       ],
@@ -10544,9 +10456,9 @@
       }
     },
     "node_modules/sass-embedded-android-x64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.86.1.tgz",
-      "integrity": "sha512-GW47z1AH8gXB7IG6EUbC5aDBDtiITeP5nUfEenE6vaaN0H17mBjIwSnEcKPPA1IdxzDpj+4bE/SGfiF0W/At4g==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.98.0.tgz",
+      "integrity": "sha512-zrD25dT7OHPEgLWuPEByybnIfx4rnCtfge4clBgjZdZ3lF6E7qNLRBtSBmoFflh6Vg0RlEjJo5VlpnTMBM5MQQ==",
       "cpu": [
         "x64"
       ],
@@ -10561,9 +10473,9 @@
       }
     },
     "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.86.1.tgz",
-      "integrity": "sha512-grBnDW5Rg+mEmZM7I9hJySS4MMXDwLMd+RyegQnr+SIJ3WA807Cw830+raALxgDY+UKKKhVEoq3FgbTo40Awgw==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.98.0.tgz",
+      "integrity": "sha512-cgr1z9rBnCdMf8K+JabIaYd9Rag2OJi5mjq08XJfbJGMZV/TA6hFJCLGkr5/+ZOn4/geTM5/3aSfQ8z5EIJAOg==",
       "cpu": [
         "arm64"
       ],
@@ -10578,9 +10490,9 @@
       }
     },
     "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.86.1.tgz",
-      "integrity": "sha512-XxSCMcmeADNouiJAr8G1oRnEhkivHKVLV5DRpfFnUK5FqtFCuSk3K18I+xIfpQDeZnjRL3t2VjsmEJuFiBYV8w==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.98.0.tgz",
+      "integrity": "sha512-OLBOCs/NPeiMqTdOrMFbVHBQFj19GS3bSVSxIhcCq16ZyhouUkYJEZjxQgzv9SWA2q6Ki8GCqp4k6jMeUY9dcA==",
       "cpu": [
         "x64"
       ],
@@ -10595,9 +10507,9 @@
       }
     },
     "node_modules/sass-embedded-linux-arm": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.86.1.tgz",
-      "integrity": "sha512-Z57ZUcWPuoOHpnl3TiUf/x9wWF2dFtkjdv7hZQpFXYwK5eudHFeBErK6KNCos6jkif1KyeFELXT/HWOznitU/w==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.98.0.tgz",
+      "integrity": "sha512-03baQZCxVyEp8v1NWBRlzGYrmVT/LK7ZrHlF1piscGiGxwfdxoLXVuxsylx3qn/dD/4i/rh7Bzk7reK1br9jvQ==",
       "cpu": [
         "arm"
       ],
@@ -10612,9 +10524,9 @@
       }
     },
     "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.86.1.tgz",
-      "integrity": "sha512-zchms0BtaOrkvfvjRnl1PDWK931DxAeYEY2yKQceO/0OFtcBz1r480Kh/RjIffTNreJqIr9Mx4wFdP+icKwLpg==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.98.0.tgz",
+      "integrity": "sha512-axOE3t2MTBwCtkUCbrdM++Gj0gC0fdHJPrgzQ+q1WUmY9NoNMGqflBtk5mBZaWUeha2qYO3FawxCB8lctFwCtw==",
       "cpu": [
         "arm64"
       ],
@@ -10628,27 +10540,10 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-embedded-linux-ia32": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.86.1.tgz",
-      "integrity": "sha512-WHntVnCgpiJPCmTeQrn5rtl1zJdd693TwpNGAFPzKD4FILPcVBKtWutl7COL6bKe/mKTf9OW0t6GBJ6mav2hAA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/sass-embedded-linux-musl-arm": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.86.1.tgz",
-      "integrity": "sha512-DlPpyp3bIL8YMtxR22hkWBtuZY6ch3KAmQvqIONippPv96WTHi1iq5jclbE1YXpDtI8Wcus0x6apoDSKq8o95g==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.98.0.tgz",
+      "integrity": "sha512-OBkjTDPYR4hSaueOGIM6FDpl9nt/VZwbSRpbNu9/eEJcxE8G/vynRugW8KRZmCFjPy8j/jkGBvvS+k9iOqKV3g==",
       "cpu": [
         "arm"
       ],
@@ -10663,9 +10558,9 @@
       }
     },
     "node_modules/sass-embedded-linux-musl-arm64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.86.1.tgz",
-      "integrity": "sha512-CwuHMRWSJFByHpgqcVtCSt29dMWhr0lpUTjaBCh9xOl0Oyz89dIqOxA0aMq+XU+thaDtOziJtMIfW6l35ZeykQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.98.0.tgz",
+      "integrity": "sha512-LeqNxQA8y4opjhe68CcFvMzCSrBuJqYVFbwElEj9bagHXQHTp9xVPJRn6VcrC+0VLEDq13HVXMv7RslIuU0zmA==",
       "cpu": [
         "arm64"
       ],
@@ -10679,27 +10574,10 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-embedded-linux-musl-ia32": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.86.1.tgz",
-      "integrity": "sha512-yjvVpAW1YS0VQNnIUtZTf0IrRDMa0wRjFWUtsLthVIxuXyjLy44+YULlfduxqcZe3rvI4+EqT7GorvviWo9NfQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/sass-embedded-linux-musl-riscv64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.86.1.tgz",
-      "integrity": "sha512-0zCUOMwX/hwPV1zimxM46dq/MdATSqbw6G646DwQ3/2V2Db1t9lfXBZqSavx8p/cqRp1JYTUPbJQV1gT4J7NYw==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.98.0.tgz",
+      "integrity": "sha512-7w6hSuOHKt8FZsmjRb3iGSxEzM87fO9+M8nt5JIQYMhHTj5C+JY/vcske0v715HCVj5e1xyTnbGXf8FcASeAIw==",
       "cpu": [
         "riscv64"
       ],
@@ -10714,9 +10592,9 @@
       }
     },
     "node_modules/sass-embedded-linux-musl-x64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.86.1.tgz",
-      "integrity": "sha512-8KJ6kEj1N16V9E0g5PDSd4aVe1LwcVKROJcVqnzTKPMa/4j2VuNWep7D81OYchdQMm9Egn1RqV0jCwm0b2aSHQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.98.0.tgz",
+      "integrity": "sha512-QikNyDEJOVqPmxyCFkci8ZdCwEssdItfjQFJB+D+Uy5HFqcS5Lv3d3GxWNX/h1dSb23RPyQdQc267ok5SbEyJw==",
       "cpu": [
         "x64"
       ],
@@ -10731,9 +10609,9 @@
       }
     },
     "node_modules/sass-embedded-linux-riscv64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.86.1.tgz",
-      "integrity": "sha512-rNJ1EfIkQpvBfMS1fBdyb+Gsji4yK0AwsV1T7NEcy21yDxDt7mdCgkAJiaN9qf7UEXuCuueQoed7WZoDaSpjww==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.98.0.tgz",
+      "integrity": "sha512-E7fNytc/v4xFBQKzgzBddV/jretA4ULAPO6XmtBiQu4zZBdBozuSxsQLe2+XXeb0X4S2GIl72V7IPABdqke/vA==",
       "cpu": [
         "riscv64"
       ],
@@ -10748,9 +10626,9 @@
       }
     },
     "node_modules/sass-embedded-linux-x64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.86.1.tgz",
-      "integrity": "sha512-DGCdUoYRRUKzRZz/q7plbB5Nean2+Uk4CqKF4RWAU0v1tHnDKKWmYfETryhWdB2WJM8QSn7O8qRebe6FCobB5g==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.98.0.tgz",
+      "integrity": "sha512-VsvP0t/uw00mMNPv3vwyYKUrFbqzxQHnRMO+bHdAMjvLw4NFf6mscpym9Bzf+NXwi1ZNKnB6DtXjmcpcvqFqYg==",
       "cpu": [
         "x64"
       ],
@@ -10764,29 +10642,29 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-embedded-win32-arm64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.86.1.tgz",
-      "integrity": "sha512-qRLZR3yLuk/3y64YhcltkwGclhPoK6EdiLP1e5SVw5+kughcs+mNUZ3rdvSAmCSA4vDv+XOiOjRpjxmpeon95Q==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/sass-embedded-unknown-all": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-unknown-all/-/sass-embedded-unknown-all-1.98.0.tgz",
+      "integrity": "sha512-C4MMzcAo3oEDQnW7L8SBgB9F2Fq5qHPnaYTZRMOH3Mp/7kM4OooBInXpCiiFjLnjY95hzP4KyctVx0uYR6MYlQ==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "win32"
+        "!android",
+        "!darwin",
+        "!linux",
+        "!win32"
       ],
-      "engines": {
-        "node": ">=14.0.0"
+      "dependencies": {
+        "sass": "1.98.0"
       }
     },
-    "node_modules/sass-embedded-win32-ia32": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.86.1.tgz",
-      "integrity": "sha512-o860a7/YGHZnGeY3l/e6yt3+ZMeDdDHmthTaKnw2wpJNEq0nmytYLTJQmjWPxEMz7O8AQ0LtcbDDrhivSog+KQ==",
+    "node_modules/sass-embedded-win32-arm64": {
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.98.0.tgz",
+      "integrity": "sha512-nP/10xbAiPbhQkMr3zQfXE4TuOxPzWRQe1Hgbi90jv2R4TbzbqQTuZVOaJf7KOAN4L2Bo6XCTRjK5XkVnwZuwQ==",
       "cpu": [
-        "ia32"
+        "arm64"
       ],
       "dev": true,
       "license": "MIT",
@@ -10799,9 +10677,9 @@
       }
     },
     "node_modules/sass-embedded-win32-x64": {
-      "version": "1.86.1",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.86.1.tgz",
-      "integrity": "sha512-7Z3wsVKfseJodmv689dDEV/JrXJH5TAclWNvHrEYW5BtoViOTU2pIDxRgLYzdKU9teIw5g6R0nJZb9M105oIKA==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.98.0.tgz",
+      "integrity": "sha512-/lbrVsfbcbdZQ5SJCWcV0NVPd6YRs+FtAnfedp4WbCkO/ZO7Zt/58MvI4X2BVpRY/Nt5ZBo1/7v2gYcQ+J4svQ==",
       "cpu": [
         "x64"
       ],
@@ -10815,13 +10693,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/sass-embedded/node_modules/immutable": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz",
-      "integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/sass-embedded/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -10866,13 +10737,13 @@
       }
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.4.tgz",
+      "integrity": "sha512-DuGdB+Po43Q5Jxwpzt1lhyFSYKryqoNjQSA9M92tyw0lyHIOur+XCalOUe0KTJpyqzT8+fQ5A0Jf7vCx/NKmIg==",
       "dev": true,
       "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "node_modules/set-cookie-parser": {
@@ -11099,12 +10970,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
@@ -11123,9 +10988,9 @@
       "license": "MIT"
     },
     "node_modules/sirv": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.1.tgz",
-      "integrity": "sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
+      "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11142,31 +11007,59 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/smob": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/smob/-/smob-1.5.0.tgz",
-      "integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/smob/-/smob-1.6.1.tgz",
+      "integrity": "sha512-KAkBqZl3c2GvNgNhcoyJae1aKldDW0LO279wF9bk1PnluRTETKBq0WyzRXxEhoQLk56yHaOY4JCBEKDuJIET5g==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0.0"
+      }
     },
     "node_modules/socket.io-client": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.7.5.tgz",
-      "integrity": "sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==",
+      "version": "4.8.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.3.tgz",
+      "integrity": "sha512-uP0bpjWrjQmUt5DTHq9RuoCBdFJF10cdX9X+a368j/Ft0wmaVgxlrjvK3kjvgCODOMMOz9lcaRzxmso0bTWZ/g==",
+      "license": "MIT",
       "dependencies": {
         "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.2",
-        "engine.io-client": "~6.5.2",
+        "debug": "~4.4.1",
+        "engine.io-client": "~6.6.1",
         "socket.io-parser": "~4.2.4"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-client/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
     "node_modules/socket.io-parser": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
@@ -11183,6 +11076,7 @@
       "version": "0.8.0-beta.0",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
       "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",
+      "deprecated": "The work that was done in this beta branch won't be included in future versions",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -11265,6 +11159,7 @@
       "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
       "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^2.0.0"
       },
@@ -11277,6 +11172,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
       "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11288,9 +11184,9 @@
       "dev": true
     },
     "node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11298,12 +11194,26 @@
       }
     },
     "node_modules/std-env": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz",
-      "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.0.0.tgz",
+      "integrity": "sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==",
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz",
+      "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "internal-slot": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/strict-event-emitter": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
@@ -11326,22 +11236,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.12",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz",
@@ -11456,20 +11350,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz",
@@ -11480,15 +11360,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/strip-indent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
@@ -11501,38 +11372,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/strip-literal": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
-      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^9.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/strip-literal/node_modules/js-tokens": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
-      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/sugarss": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-5.0.1.tgz",
@@ -11561,6 +11400,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11616,6 +11456,19 @@
       "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==",
       "license": "MIT"
     },
+    "node_modules/tagged-tag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz",
+      "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/temp-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
@@ -11684,74 +11537,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/test-exclude": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
-      "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^10.4.1",
-        "minimatch": "^9.0.4"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/test-exclude/node_modules/glob": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "dev": true
-    },
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
@@ -11820,30 +11605,10 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/tinypool": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz",
-      "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      }
-    },
     "node_modules/tinyrainbow": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
-      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/tinyspy": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.3.tgz",
-      "integrity": "sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
+      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11851,22 +11616,22 @@
       }
     },
     "node_modules/tldts": {
-      "version": "6.1.72",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.72.tgz",
-      "integrity": "sha512-QNtgIqSUb9o2CoUjX9T5TwaIvUUJFU1+12PJkgt42DFV2yf9J6549yTF2uGloQsJ/JOC8X+gIB81ind97hRiIQ==",
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.27.tgz",
+      "integrity": "sha512-I4FZcVFcqCRuT0ph6dCDpPuO4Xgzvh+spkcTr1gK7peIvxWauoloVO0vuy1FQnijT63ss6AsHB6+OIM4aXHbPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tldts-core": "^6.1.72"
+        "tldts-core": "^7.0.27"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.72",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.72.tgz",
-      "integrity": "sha512-FW3H9aCaGTJ8l8RVCR3EX8GxsxDbQXuwetwwgXA2chYdsX+NY1ytCBl61narjjehWmCw92tc1AxlcY3668CU8g==",
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.27.tgz",
+      "integrity": "sha512-YQ7uPjgWUibIK6DW5lrKujGwUKhLevU4hcGbP5O6TcIUb+oTjJYJVWPS4nZsIHrEEEG6myk/oqAJUEQmpZrHsg==",
       "dev": true,
       "license": "MIT"
     },
@@ -11900,41 +11665,42 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.0.tgz",
-      "integrity": "sha512-rvZUv+7MoBYTiDmFPBrhL7Ujx9Sk+q9wwm22x8c8T5IJaR+Wsyc7TNxbVxo84kZoRJZZMazowFLqpankBEQrGg==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz",
+      "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "tldts": "^6.1.32"
+        "tldts": "^7.0.5"
       },
       "engines": {
         "node": ">=16"
       }
     },
     "node_modules/tr46": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
-      "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz",
+      "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "punycode": "^2.3.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16"
+        "node": ">=18.12"
       },
       "peerDependencies": {
-        "typescript": ">=4.2.0"
+        "typescript": ">=4.8.4"
       }
     },
     "node_modules/tslib": {
@@ -11943,33 +11709,6 @@
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
       "license": "0BSD"
     },
-    "node_modules/tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.8.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      },
-      "peerDependencies": {
-        "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta"
-      }
-    },
-    "node_modules/tsutils/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "node_modules/turbo-stream": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
-      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
-      "license": "ISC"
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -12073,10 +11812,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz",
-      "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -12085,6 +11825,30 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/typescript-eslint": {
+      "version": "8.57.2",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.57.2.tgz",
+      "integrity": "sha512-VEPQ0iPgWO/sBaZOU1xo4nuNdODVOajPnTIbog2GKYr31nIlZ0fWPoCQgGfF3ETyBl1vn63F/p50Um9Z4J8O8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/eslint-plugin": "8.57.2",
+        "@typescript-eslint/parser": "8.57.2",
+        "@typescript-eslint/typescript-estree": "8.57.2",
+        "@typescript-eslint/utils": "8.57.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
     "node_modules/unbox-primitive": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
@@ -12120,10 +11884,20 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/undici": {
+      "version": "7.24.6",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.6.tgz",
+      "integrity": "sha512-Xi4agocCbRzt0yYMZGMA6ApD7gvtUFaxm4ZmeacWI4cZxaF6C+8I8QfofC20NAePiB/IcvZmzkJ7XPa471AEtA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.18.1"
+      }
+    },
     "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT"
     },
@@ -12152,9 +11926,9 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
-      "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz",
+      "integrity": "sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12162,9 +11936,9 @@
       }
     },
     "node_modules/unicode-property-aliases-ecmascript": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
-      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.2.0.tgz",
+      "integrity": "sha512-hpbDzxUY9BFwX+UeBnxv3Sh1q7HFxj48DTmXchNgRa46lO8uj3/1iEn3MiNUYTg1g9ctIqXCCERn8gYZhHC5lQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -12197,14 +11971,14 @@
         "node": ">=8"
       }
     },
-    "node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+    "node_modules/until-async": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/until-async/-/until-async-3.0.2.tgz",
+      "integrity": "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 4.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/kettanaito"
       }
     },
     "node_modules/upath": {
@@ -12219,9 +11993,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
       "dev": true,
       "funding": [
         {
@@ -12254,21 +12028,11 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "node_modules/use-callback-ref": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
@@ -12357,6 +12121,16 @@
         }
       }
     },
+    "node_modules/use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -12372,10 +12146,11 @@
       "license": "MIT"
     },
     "node_modules/victory-vendor": {
-      "version": "36.9.2",
-      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz",
-      "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==",
+      "version": "37.3.6",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.3.6.tgz",
+      "integrity": "sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==",
       "dev": true,
+      "license": "MIT AND ISC",
       "dependencies": {
         "@types/d3-array": "^3.0.3",
         "@types/d3-ease": "^3.0.0",
@@ -12394,13 +12169,13 @@
       }
     },
     "node_modules/vite": {
-      "version": "7.2.7",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.7.tgz",
-      "integrity": "sha512-ITcnkFeR3+fI8P1wMgItjGrR10170d8auB4EpMLPqmx6uxElH3a/hHGQabSHKdqd4FXWO1nFIp9rRn7JQ34ACQ==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
+      "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.25.0",
+        "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
         "picomatch": "^4.0.3",
         "postcss": "^8.5.6",
@@ -12438,88 +12213,40 @@
         },
         "jiti": {
           "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        },
-        "tsx": {
-          "optional": true
-        },
-        "yaml": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vite-node": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz",
-      "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cac": "^6.7.14",
-        "debug": "^4.4.1",
-        "es-module-lexer": "^1.7.0",
-        "pathe": "^2.0.3",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0"
-      },
-      "bin": {
-        "vite-node": "vite-node.mjs"
-      },
-      "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      }
-    },
-    "node_modules/vite-node/node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
         }
       }
     },
-    "node_modules/vite-node/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/vite-plugin-checker": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.10.3.tgz",
-      "integrity": "sha512-f4sekUcDPF+T+GdbbE8idb1i2YplBAoH+SfRS0e/WRBWb2rYb1Jf5Pimll0Rj+3JgIYWwG2K5LtBPCXxoibkLg==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.12.0.tgz",
+      "integrity": "sha512-CmdZdDOGss7kdQwv73UyVgLPv0FVYe5czAgnmRX2oKljgEvSrODGuClaV3PDR2+3ou7N/OKGauDDBjy2MB07Rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -12528,22 +12255,22 @@
         "npm-run-path": "^6.0.0",
         "picocolors": "^1.1.1",
         "picomatch": "^4.0.3",
-        "strip-ansi": "^7.1.0",
         "tiny-invariant": "^1.3.3",
-        "tinyglobby": "^0.2.14",
+        "tinyglobby": "^0.2.15",
         "vscode-uri": "^3.1.0"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">=16.11"
       },
       "peerDependencies": {
         "@biomejs/biome": ">=1.7",
-        "eslint": ">=7",
+        "eslint": ">=9.39.1",
         "meow": "^13.2.0",
         "optionator": "^0.9.4",
+        "oxlint": ">=1",
         "stylelint": ">=16",
         "typescript": "*",
-        "vite": ">=2.0.0",
+        "vite": ">=5.4.21",
         "vls": "*",
         "vti": "*",
         "vue-tsc": "~2.2.10 || ^3.0.0"
@@ -12561,6 +12288,9 @@
         "optionator": {
           "optional": true
         },
+        "oxlint": {
+          "optional": true
+        },
         "stylelint": {
           "optional": true
         },
@@ -12578,35 +12308,6 @@
         }
       }
     },
-    "node_modules/vite-plugin-checker/node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/vite-plugin-checker/node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "readdirp": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 14.16.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/vite-plugin-checker/node_modules/npm-run-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz",
@@ -12650,48 +12351,18 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/vite-plugin-checker/node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
-      },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/vite-plugin-checker/node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/vite-plugin-pwa": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-1.0.3.tgz",
-      "integrity": "sha512-/OpqIpUldALGxcsEnv/ekQiQ5xHkQ53wcoN5ewX4jiIDNGs3W+eNcI1WYZeyOLmzoEjg09D7aX0O89YGjen1aw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-1.2.0.tgz",
+      "integrity": "sha512-a2xld+SJshT9Lgcv8Ji4+srFJL4k/1bVbd1x06JIkvecpQkwkvCncD1+gSzcdm3s+owWLpMJerG3aN5jupJEVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.3.6",
         "pretty-bytes": "^6.1.1",
         "tinyglobby": "^0.2.10",
-        "workbox-build": "^7.3.0",
-        "workbox-window": "^7.3.0"
+        "workbox-build": "^7.4.0",
+        "workbox-window": "^7.4.0"
       },
       "engines": {
         "node": ">=16.0.0"
@@ -12702,8 +12373,8 @@
       "peerDependencies": {
         "@vite-pwa/assets-generator": "^1.0.0",
         "vite": "^3.1.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
-        "workbox-build": "^7.3.0",
-        "workbox-window": "^7.3.0"
+        "workbox-build": "^7.4.0",
+        "workbox-window": "^7.4.0"
       },
       "peerDependenciesMeta": {
         "@vite-pwa/assets-generator": {
@@ -12768,65 +12439,71 @@
       }
     },
     "node_modules/vitest": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz",
-      "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/chai": "^5.2.2",
-        "@vitest/expect": "3.2.4",
-        "@vitest/mocker": "3.2.4",
-        "@vitest/pretty-format": "^3.2.4",
-        "@vitest/runner": "3.2.4",
-        "@vitest/snapshot": "3.2.4",
-        "@vitest/spy": "3.2.4",
-        "@vitest/utils": "3.2.4",
-        "chai": "^5.2.0",
-        "debug": "^4.4.1",
-        "expect-type": "^1.2.1",
-        "magic-string": "^0.30.17",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.2.tgz",
+      "integrity": "sha512-xjR1dMTVHlFLh98JE3i/f/WePqJsah4A0FK9cc8Ehp9Udk0AZk6ccpIZhh1qJ/yxVWRZ+Q54ocnD8TXmkhspGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "4.1.2",
+        "@vitest/mocker": "4.1.2",
+        "@vitest/pretty-format": "4.1.2",
+        "@vitest/runner": "4.1.2",
+        "@vitest/snapshot": "4.1.2",
+        "@vitest/spy": "4.1.2",
+        "@vitest/utils": "4.1.2",
+        "es-module-lexer": "^2.0.0",
+        "expect-type": "^1.3.0",
+        "magic-string": "^0.30.21",
+        "obug": "^2.1.1",
         "pathe": "^2.0.3",
-        "picomatch": "^4.0.2",
-        "std-env": "^3.9.0",
+        "picomatch": "^4.0.3",
+        "std-env": "^4.0.0-rc.1",
         "tinybench": "^2.9.0",
-        "tinyexec": "^0.3.2",
-        "tinyglobby": "^0.2.14",
-        "tinypool": "^1.1.1",
-        "tinyrainbow": "^2.0.0",
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
-        "vite-node": "3.2.4",
+        "tinyexec": "^1.0.2",
+        "tinyglobby": "^0.2.15",
+        "tinyrainbow": "^3.1.0",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
         "@edge-runtime/vm": "*",
-        "@types/debug": "^4.1.12",
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.2.4",
-        "@vitest/ui": "3.2.4",
+        "@opentelemetry/api": "^1.9.0",
+        "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
+        "@vitest/browser-playwright": "4.1.2",
+        "@vitest/browser-preview": "4.1.2",
+        "@vitest/browser-webdriverio": "4.1.2",
+        "@vitest/ui": "4.1.2",
         "happy-dom": "*",
-        "jsdom": "*"
+        "jsdom": "*",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "@edge-runtime/vm": {
           "optional": true
         },
-        "@types/debug": {
+        "@opentelemetry/api": {
           "optional": true
         },
         "@types/node": {
           "optional": true
         },
-        "@vitest/browser": {
+        "@vitest/browser-playwright": {
+          "optional": true
+        },
+        "@vitest/browser-preview": {
+          "optional": true
+        },
+        "@vitest/browser-webdriverio": {
           "optional": true
         },
         "@vitest/ui": {
@@ -12837,34 +12514,12 @@
         },
         "jsdom": {
           "optional": true
+        },
+        "vite": {
+          "optional": false
         }
       }
     },
-    "node_modules/vitest/node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/vitest/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/vitest/node_modules/picomatch": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
@@ -12878,6 +12533,16 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/vitest/node_modules/tinyexec": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.4.tgz",
+      "integrity": "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
@@ -12898,47 +12563,38 @@
       }
     },
     "node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "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==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz",
+      "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==",
       "dev": true,
-      "dependencies": {
-        "iconv-lite": "0.6.3"
-      },
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "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==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz",
+      "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       }
     },
     "node_modules/whatwg-url": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.0.tgz",
-      "integrity": "sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==",
+      "version": "16.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.1.tgz",
+      "integrity": "sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "tr46": "^5.0.0",
-        "webidl-conversions": "^7.0.0"
+        "@exodus/bytes": "^1.11.0",
+        "tr46": "^6.0.0",
+        "webidl-conversions": "^8.0.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^20.19.0 || ^22.12.0 || >=24.0.0"
       }
     },
     "node_modules/which": {
@@ -13024,9 +12680,9 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "version": "1.1.20",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
+      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13073,30 +12729,30 @@
       }
     },
     "node_modules/workbox-background-sync": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-7.3.0.tgz",
-      "integrity": "sha512-PCSk3eK7Mxeuyatb22pcSx9dlgWNv3+M8PqPaYDokks8Y5/FX4soaOqj3yhAZr5k6Q5JWTOMYgaJBpbw11G9Eg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-7.4.0.tgz",
+      "integrity": "sha512-8CB9OxKAgKZKyNMwfGZ1XESx89GryWTfI+V5yEj8sHjFH8MFelUwYXEyldEK6M6oKMmn807GoJFUEA1sC4XS9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "idb": "^7.0.1",
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-broadcast-update": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-7.3.0.tgz",
-      "integrity": "sha512-T9/F5VEdJVhwmrIAE+E/kq5at2OY6+OXXgOWQevnubal6sO92Gjo24v6dCVwQiclAF5NS3hlmsifRrpQzZCdUA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-7.4.0.tgz",
+      "integrity": "sha512-+eZQwoktlvo62cI0b+QBr40v5XjighxPq3Fzo9AWMiAosmpG5gxRHgTbGGhaJv/q/MFVxwFNGh/UwHZ/8K88lA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-build": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-7.3.0.tgz",
-      "integrity": "sha512-JGL6vZTPlxnlqZRhR/K/msqg3wKP+m0wfEUVosK7gsYzSgeIxvZLi1ViJJzVL7CEeI8r7rGFV973RiEqkP3lWQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-7.4.0.tgz",
+      "integrity": "sha512-Ntk1pWb0caOFIvwz/hfgrov/OJ45wPEhI5PbTywQcYjyZiVhT3UrwwUPl6TRYbTm4moaFYithYnl1lvZ8UjxcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13113,33 +12769,33 @@
         "common-tags": "^1.8.0",
         "fast-json-stable-stringify": "^2.1.0",
         "fs-extra": "^9.0.1",
-        "glob": "^7.1.6",
+        "glob": "^11.0.1",
         "lodash": "^4.17.20",
         "pretty-bytes": "^5.3.0",
-        "rollup": "^2.43.1",
+        "rollup": "^2.79.2",
         "source-map": "^0.8.0-beta.0",
         "stringify-object": "^3.3.0",
         "strip-comments": "^2.0.1",
         "tempy": "^0.6.0",
         "upath": "^1.2.0",
-        "workbox-background-sync": "7.3.0",
-        "workbox-broadcast-update": "7.3.0",
-        "workbox-cacheable-response": "7.3.0",
-        "workbox-core": "7.3.0",
-        "workbox-expiration": "7.3.0",
-        "workbox-google-analytics": "7.3.0",
-        "workbox-navigation-preload": "7.3.0",
-        "workbox-precaching": "7.3.0",
-        "workbox-range-requests": "7.3.0",
-        "workbox-recipes": "7.3.0",
-        "workbox-routing": "7.3.0",
-        "workbox-strategies": "7.3.0",
-        "workbox-streams": "7.3.0",
-        "workbox-sw": "7.3.0",
-        "workbox-window": "7.3.0"
+        "workbox-background-sync": "7.4.0",
+        "workbox-broadcast-update": "7.4.0",
+        "workbox-cacheable-response": "7.4.0",
+        "workbox-core": "7.4.0",
+        "workbox-expiration": "7.4.0",
+        "workbox-google-analytics": "7.4.0",
+        "workbox-navigation-preload": "7.4.0",
+        "workbox-precaching": "7.4.0",
+        "workbox-range-requests": "7.4.0",
+        "workbox-recipes": "7.4.0",
+        "workbox-routing": "7.4.0",
+        "workbox-strategies": "7.4.0",
+        "workbox-streams": "7.4.0",
+        "workbox-sw": "7.4.0",
+        "workbox-window": "7.4.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
@@ -13160,6 +12816,16 @@
         "ajv": ">=8"
       }
     },
+    "node_modules/workbox-build/node_modules/@isaacs/cliui": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-9.0.0.tgz",
+      "integrity": "sha512-AokJm4tuBHillT+FpMtxQ60n8ObyXBatq7jD2/JA9dxbDDokKQm8KMht5ibGzLVU9IJDIKK4TPKgMHEYMn3lMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/workbox-build/node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -13224,9 +12890,9 @@
       "license": "MIT"
     },
     "node_modules/workbox-build/node_modules/ajv": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -13247,20 +12913,45 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/workbox-build/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+    "node_modules/workbox-build/node_modules/glob": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
+      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
+      "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
       "dev": true,
-      "license": "MIT",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "foreground-child": "^3.3.1",
+        "jackspeak": "^4.1.1",
+        "minimatch": "^10.1.1",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^2.0.0"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=10"
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/workbox-build/node_modules/jackspeak": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.2.3.tgz",
+      "integrity": "sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^9.0.0"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/workbox-build/node_modules/json-schema-traverse": {
@@ -13270,6 +12961,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/workbox-build/node_modules/lru-cache": {
+      "version": "11.2.6",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
+      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
     "node_modules/workbox-build/node_modules/magic-string": {
       "version": "0.25.9",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz",
@@ -13280,6 +12981,23 @@
         "sourcemap-codec": "^1.4.8"
       }
     },
+    "node_modules/workbox-build/node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/workbox-build/node_modules/pretty-bytes": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
@@ -13294,9 +13012,9 @@
       }
     },
     "node_modules/workbox-build/node_modules/rollup": {
-      "version": "2.79.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
-      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
+      "version": "2.80.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.80.0.tgz",
+      "integrity": "sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -13309,160 +13027,143 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/workbox-build/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/workbox-cacheable-response": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-7.3.0.tgz",
-      "integrity": "sha512-eAFERIg6J2LuyELhLlmeRcJFa5e16Mj8kL2yCDbhWE+HUun9skRQrGIFVUagqWj4DMaaPSMWfAolM7XZZxNmxA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-7.4.0.tgz",
+      "integrity": "sha512-0Fb8795zg/x23ISFkAc7lbWes6vbw34DGFIMw31cwuHPgDEC/5EYm6m/ZkylLX0EnEbbOyOCLjKgFS/Z5g0HeQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-core": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-7.3.0.tgz",
-      "integrity": "sha512-Z+mYrErfh4t3zi7NVTvOuACB0A/jA3bgxUN3PwtAVHvfEsZxV9Iju580VEETug3zYJRc0Dmii/aixI/Uxj8fmw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-7.4.0.tgz",
+      "integrity": "sha512-6BMfd8tYEnN4baG4emG9U0hdXM4gGuDU3ectXuVHnj71vwxTFI7WOpQJC4siTOlVtGqCUtj0ZQNsrvi6kZZTAQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/workbox-expiration": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-7.3.0.tgz",
-      "integrity": "sha512-lpnSSLp2BM+K6bgFCWc5bS1LR5pAwDWbcKt1iL87/eTSJRdLdAwGQznZE+1czLgn/X05YChsrEegTNxjM067vQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-7.4.0.tgz",
+      "integrity": "sha512-V50p4BxYhtA80eOvulu8xVfPBgZbkxJ1Jr8UUn0rvqjGhLDqKNtfrDfjJKnLz2U8fO2xGQJTx/SKXNTzHOjnHw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "idb": "^7.0.1",
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-google-analytics": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-7.3.0.tgz",
-      "integrity": "sha512-ii/tSfFdhjLHZ2BrYgFNTrb/yk04pw2hasgbM70jpZfLk0vdJAXgaiMAWsoE+wfJDNWoZmBYY0hMVI0v5wWDbg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-7.4.0.tgz",
+      "integrity": "sha512-MVPXQslRF6YHkzGoFw1A4GIB8GrKym/A5+jYDUSL+AeJw4ytQGrozYdiZqUW1TPQHW8isBCBtyFJergUXyNoWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-background-sync": "7.3.0",
-        "workbox-core": "7.3.0",
-        "workbox-routing": "7.3.0",
-        "workbox-strategies": "7.3.0"
+        "workbox-background-sync": "7.4.0",
+        "workbox-core": "7.4.0",
+        "workbox-routing": "7.4.0",
+        "workbox-strategies": "7.4.0"
       }
     },
     "node_modules/workbox-navigation-preload": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-7.3.0.tgz",
-      "integrity": "sha512-fTJzogmFaTv4bShZ6aA7Bfj4Cewaq5rp30qcxl2iYM45YD79rKIhvzNHiFj1P+u5ZZldroqhASXwwoyusnr2cg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-7.4.0.tgz",
+      "integrity": "sha512-etzftSgdQfjMcfPgbfaZCfM2QuR1P+4o8uCA2s4rf3chtKTq/Om7g/qvEOcZkG6v7JZOSOxVYQiOu6PbAZgU6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-precaching": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-7.3.0.tgz",
-      "integrity": "sha512-ckp/3t0msgXclVAYaNndAGeAoWQUv7Rwc4fdhWL69CCAb2UHo3Cef0KIUctqfQj1p8h6aGyz3w8Cy3Ihq9OmIw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-7.4.0.tgz",
+      "integrity": "sha512-VQs37T6jDqf1rTxUJZXRl3yjZMf5JX/vDPhmx2CPgDDKXATzEoqyRqhYnRoxl6Kr0rqaQlp32i9rtG5zTzIlNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0",
-        "workbox-routing": "7.3.0",
-        "workbox-strategies": "7.3.0"
+        "workbox-core": "7.4.0",
+        "workbox-routing": "7.4.0",
+        "workbox-strategies": "7.4.0"
       }
     },
     "node_modules/workbox-range-requests": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-7.3.0.tgz",
-      "integrity": "sha512-EyFmM1KpDzzAouNF3+EWa15yDEenwxoeXu9bgxOEYnFfCxns7eAxA9WSSaVd8kujFFt3eIbShNqa4hLQNFvmVQ==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-7.4.0.tgz",
+      "integrity": "sha512-3Vq854ZNuP6Y0KZOQWLaLC9FfM7ZaE+iuQl4VhADXybwzr4z/sMmnLgTeUZLq5PaDlcJBxYXQ3U91V7dwAIfvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-recipes": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-7.3.0.tgz",
-      "integrity": "sha512-BJro/MpuW35I/zjZQBcoxsctgeB+kyb2JAP5EB3EYzePg8wDGoQuUdyYQS+CheTb+GhqJeWmVs3QxLI8EBP1sg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-7.4.0.tgz",
+      "integrity": "sha512-kOkWvsAn4H8GvAkwfJTbwINdv4voFoiE9hbezgB1sb/0NLyTG4rE7l6LvS8lLk5QIRIto+DjXLuAuG3Vmt3cxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-cacheable-response": "7.3.0",
-        "workbox-core": "7.3.0",
-        "workbox-expiration": "7.3.0",
-        "workbox-precaching": "7.3.0",
-        "workbox-routing": "7.3.0",
-        "workbox-strategies": "7.3.0"
+        "workbox-cacheable-response": "7.4.0",
+        "workbox-core": "7.4.0",
+        "workbox-expiration": "7.4.0",
+        "workbox-precaching": "7.4.0",
+        "workbox-routing": "7.4.0",
+        "workbox-strategies": "7.4.0"
       }
     },
     "node_modules/workbox-routing": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-7.3.0.tgz",
-      "integrity": "sha512-ZUlysUVn5ZUzMOmQN3bqu+gK98vNfgX/gSTZ127izJg/pMMy4LryAthnYtjuqcjkN4HEAx1mdgxNiKJMZQM76A==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-7.4.0.tgz",
+      "integrity": "sha512-C/ooj5uBWYAhAqwmU8HYQJdOjjDKBp9MzTQ+otpMmd+q0eF59K+NuXUek34wbL0RFrIXe/KKT+tUWcZcBqxbHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-strategies": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-7.3.0.tgz",
-      "integrity": "sha512-tmZydug+qzDFATwX7QiEL5Hdf7FrkhjaF9db1CbB39sDmEZJg3l9ayDvPxy8Y18C3Y66Nrr9kkN1f/RlkDgllg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-7.4.0.tgz",
+      "integrity": "sha512-T4hVqIi5A4mHi92+5EppMX3cLaVywDp8nsyUgJhOZxcfSV/eQofcOA6/EMo5rnTNmNTpw0rUgjAI6LaVullPpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0"
+        "workbox-core": "7.4.0"
       }
     },
     "node_modules/workbox-streams": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-7.3.0.tgz",
-      "integrity": "sha512-SZnXucyg8x2Y61VGtDjKPO5EgPUG5NDn/v86WYHX+9ZqvAsGOytP0Jxp1bl663YUuMoXSAtsGLL+byHzEuMRpw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-7.4.0.tgz",
+      "integrity": "sha512-QHPBQrey7hQbnTs5GrEVoWz7RhHJXnPT+12qqWM378orDMo5VMJLCkCM1cnCk+8Eq92lccx/VgRZ7WAzZWbSLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "workbox-core": "7.3.0",
-        "workbox-routing": "7.3.0"
+        "workbox-core": "7.4.0",
+        "workbox-routing": "7.4.0"
       }
     },
     "node_modules/workbox-sw": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-7.3.0.tgz",
-      "integrity": "sha512-aCUyoAZU9IZtH05mn0ACUpyHzPs0lMeJimAYkQkBsOWiqaJLgusfDCR+yllkPkFRxWpZKF8vSvgHYeG7LwhlmA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-7.4.0.tgz",
+      "integrity": "sha512-ltU+Kr3qWR6BtbdlMnCjobZKzeV1hN+S6UvDywBrwM19TTyqA03X66dzw1tEIdJvQ4lYKkBFox6IAEhoSEZ8Xw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/workbox-window": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-7.3.0.tgz",
-      "integrity": "sha512-qW8PDy16OV1UBaUNGlTVcepzrlzyzNW/ZJvFQQs2j2TzGsg6IKjcpZC1RSquqQnTOafl5pCj5bGfAHlCjOOjdA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-7.4.0.tgz",
+      "integrity": "sha512-/bIYdBLAVsNR3v7gYGaV4pQW3M3kEPx5E8vDxGvxo6khTrGtSSCS7QiFKv9ogzBgZiy0OXLP9zO28U/1nF1mfw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/trusted-types": "^2.0.2",
-        "workbox-core": "7.1.0"
+        "workbox-core": "7.4.0"
       }
     },
-    "node_modules/workbox-window/node_modules/workbox-core": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-7.1.0.tgz",
-      "integrity": "sha512-5KB4KOY8rtL31nEF7BfvU7FMzKT4B5TkbYa2tzkS+Peqj0gayMT9SytSFtNzlrvMaWgv6y/yvP9C0IbpFjV30Q==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/wrap-ansi": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@@ -13478,35 +13179,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
     "node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
+      "integrity": "sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -13540,9 +13216,9 @@
       "dev": true
     },
     "node_modules/xmlhttprequest-ssl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz",
-      "integrity": "sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
       "engines": {
         "node": ">=0.4.0"
       }
@@ -13564,16 +13240,19 @@
       "dev": true
     },
     "node_modules/yaml": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz",
-      "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
+      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
       "dev": true,
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/eemeli"
       }
     },
     "node_modules/yargs": {
@@ -13629,6 +13308,29 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
+    },
+    "node_modules/zod": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
+      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/zod-validation-error": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-4.0.2.tgz",
+      "integrity": "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.0 || ^4.0.0"
+      }
     }
   }
 }
diff --git a/frontend/package.json b/frontend/package.json
index 0650a45ad8..7204befda2 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,82 +4,87 @@
   "description": "Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movie and Bazarr takes care of everything for you.",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/morpheus65535/bazarr.git"
+    "url": "git+https://github.com/LavX/bazarr.git"
   },
-  "author": "morpheus65535",
+  "author": "LavX",
   "license": "GPL-3",
   "bugs": {
-    "url": "https://github.com/morpheus65535/bazarr/issues"
+    "url": "https://github.com/LavX/bazarr/issues"
   },
   "private": true,
   "dependencies": {
-    "@mantine/core": "^8.3.9",
-    "@mantine/dropzone": "^8.3.9",
-    "@mantine/form": "^8.3.9",
-    "@mantine/hooks": "^8.3.9",
-    "@mantine/modals": "^8.3.9",
-    "@mantine/notifications": "^8.3.9",
-    "@tanstack/react-query": "^5.64.1",
-    "@tanstack/react-table": "^8.19.2",
-    "axios": "^1.8.2",
+    "@fontsource-variable/geist": "^5.2.8",
+    "@mantine/core": "^8.3.16",
+    "@mantine/dropzone": "^8.3.16",
+    "@mantine/form": "^8.3.16",
+    "@mantine/hooks": "^8.3.16",
+    "@mantine/modals": "^8.3.16",
+    "@mantine/notifications": "^8.3.16",
+    "@tanstack/react-query": "^5.90.21",
+    "@tanstack/react-table": "^8.21.3",
+    "@tanstack/react-virtual": "^3.13.23",
+    "axios": "^1.13.6",
     "braces": "^3.0.3",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
-    "react-router": "^7.1.1",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "react-router": "^7.13.1",
     "react-timeago": "^8.3.0",
-    "socket.io-client": "^4.7.5"
+    "socket.io-client": "^4.8.3"
   },
   "devDependencies": {
-    "@fontsource/roboto": "^5.0.12",
-    "@fortawesome/fontawesome-svg-core": "^7.1.0",
-    "@fortawesome/free-brands-svg-icons": "^7.1.0",
-    "@fortawesome/free-regular-svg-icons": "^7.1.0",
-    "@fortawesome/free-solid-svg-icons": "^7.1.0",
-    "@fortawesome/react-fontawesome": "^3.1.0",
-    "@tanstack/react-query-devtools": "^5.40.1",
-    "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^16.1.0",
-    "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^29.5.12",
-    "@types/lodash": "^4.17.1",
-    "@types/node": "^22.14.1",
-    "@types/react": "^19.2.3",
+    "@eslint/js": "^10.0.1",
+    "@fortawesome/fontawesome-svg-core": "^7.2.0",
+    "@fortawesome/free-brands-svg-icons": "^7.2.0",
+    "@fortawesome/free-regular-svg-icons": "^7.2.0",
+    "@fortawesome/free-solid-svg-icons": "^7.2.0",
+    "@fortawesome/react-fontawesome": "^3.2.0",
+    "@tanstack/react-query-devtools": "^5.91.3",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.2",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/jest": "^30.0.0",
+    "@types/lodash": "^4.17.24",
+    "@types/node": "^25.4.0",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.16.0",
-    "@vite-pwa/assets-generator": "^1.0.0",
-    "@vitejs/plugin-react": "^5.0.1",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/ui": "^3.2.4",
-    "clsx": "^2.1.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.7",
-    "eslint-plugin-simple-import-sort": "^12.1.0",
-    "eslint-plugin-testing-library": "^6.2.0",
-    "husky": "^9.0.11",
-    "jsdom": "^26.0.0",
-    "lodash": "^4.17.21",
-    "msw": "^2.7.0",
+    "@typescript-eslint/eslint-plugin": "^8.57.0",
+    "@typescript-eslint/parser": "^8.57.0",
+    "@vite-pwa/assets-generator": "^1.0.2",
+    "@vitejs/plugin-react": "^5.1.4",
+    "@vitest/coverage-v8": "^4.0.18",
+    "@vitest/ui": "^4.0.18",
+    "clsx": "^2.1.1",
+    "eslint": "^10.0.3",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
+    "eslint-plugin-testing-library": "^7.16.0",
+    "globals": "^17.4.0",
+    "husky": "^9.1.7",
+    "jsdom": "^28.1.0",
+    "lodash": "^4.17.23",
+    "msw": "^2.12.10",
     "postcss-preset-mantine": "^1.18.0",
     "postcss-simple-vars": "^7.0.1",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
-    "pretty-quick": "^4.0.0",
-    "recharts": "^2.15.0",
-    "sass-embedded": "^1.86.1",
-    "typescript": "^5.4.4",
-    "vite": "^7.1.3",
-    "vite-plugin-checker": "^0.10.3",
-    "vite-plugin-pwa": "^1.0.3",
-    "vitest": "^3.2.4",
-    "yaml": "^2.4.1"
+    "prettier": "^3.8.1",
+    "prettier-plugin-organize-imports": "^4.3.0",
+    "pretty-quick": "^4.2.2",
+    "recharts": "^3.8.0",
+    "sass-embedded": "^1.98.0",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.57.0",
+    "vite": "^7.3.1",
+    "vite-plugin-checker": "^0.12.0",
+    "vite-plugin-pwa": "^1.2.0",
+    "vitest": "^4.0.18",
+    "yaml": "^2.8.2"
   },
   "scripts": {
     "build": "vite build",
     "build:ci": "vite build -m development",
-    "check": "eslint --ext .ts,.tsx src",
-    "check:fix": "eslint --ext .ts,.tsx src --fix",
+    "check": "eslint src",
+    "check:fix": "eslint src --fix",
     "check:ts": "tsc --noEmit --incremental false",
     "check:fmt": "prettier -c .",
     "coverage": "vitest run --coverage",
@@ -102,5 +107,11 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "overrides": {
+    "serialize-javascript": "^7.0.4",
+    "eslint-plugin-react-hooks": {
+      "eslint": "$eslint"
+    }
   }
 }
diff --git a/frontend/public/images/android-chrome-96x96.png b/frontend/public/images/android-chrome-96x96.png
index a9227b96a8..53ca9176d2 100644
Binary files a/frontend/public/images/android-chrome-96x96.png and b/frontend/public/images/android-chrome-96x96.png differ
diff --git a/frontend/public/images/apple-touch-icon-180x180.png b/frontend/public/images/apple-touch-icon-180x180.png
index 01c19a6eeb..5054fb650e 100644
Binary files a/frontend/public/images/apple-touch-icon-180x180.png and b/frontend/public/images/apple-touch-icon-180x180.png differ
diff --git a/frontend/public/images/favicon-16x16.png b/frontend/public/images/favicon-16x16.png
index 03618a704f..f15db17621 100644
Binary files a/frontend/public/images/favicon-16x16.png and b/frontend/public/images/favicon-16x16.png differ
diff --git a/frontend/public/images/favicon-32x32.png b/frontend/public/images/favicon-32x32.png
index 85dbb8462e..d4f4f07a67 100644
Binary files a/frontend/public/images/favicon-32x32.png and b/frontend/public/images/favicon-32x32.png differ
diff --git a/frontend/public/images/favicon.ico b/frontend/public/images/favicon.ico
index 02c0a64122..149200567b 100644
Binary files a/frontend/public/images/favicon.ico and b/frontend/public/images/favicon.ico differ
diff --git a/frontend/public/images/logo.png b/frontend/public/images/logo.png
new file mode 100644
index 0000000000..d0d9c2d764
Binary files /dev/null and b/frontend/public/images/logo.png differ
diff --git a/frontend/public/images/logo.svg b/frontend/public/images/logo.svg
new file mode 100644
index 0000000000..49a19b755d
--- /dev/null
+++ b/frontend/public/images/logo.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512">
+  <defs>
+    <radialGradient id="orb-fill" cx="38%" cy="30%" r="75%">
+      <stop offset="0" stop-color="#3a3136"/>
+      <stop offset="0.35" stop-color="#241c22"/>
+      <stop offset="0.72" stop-color="#161118"/>
+      <stop offset="1" stop-color="#0d0a0f"/>
+    </radialGradient>
+    <linearGradient id="metal-orange" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0" stop-color="#ffb15a"/>
+      <stop offset="0.45" stop-color="#d96a1a"/>
+      <stop offset="1" stop-color="#7e3500"/>
+    </linearGradient>
+    <linearGradient id="rim-stroke" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0" stop-color="#ffcf8a"/>
+      <stop offset="0.3" stop-color="#c66a1e"/>
+      <stop offset="1" stop-color="#5a2400"/>
+    </linearGradient>
+    <filter id="soft-shadow" x="-20%" y="-20%" width="140%" height="140%">
+      <feGaussianBlur in="SourceAlpha" stdDeviation="4" result="blur"/>
+      <feOffset dx="0" dy="2" result="offset"/>
+      <feComponentTransfer>
+        <feFuncA type="linear" slope="0.35"/>
+      </feComponentTransfer>
+      <feMerge>
+        <feMergeNode in="offset"/>
+        <feMergeNode in="SourceGraphic"/>
+      </feMerge>
+    </filter>
+    <clipPath id="orb-clip">
+      <circle cx="256" cy="256" r="198"/>
+    </clipPath>
+  </defs>
+  <circle cx="256" cy="256" r="198" fill="url(#orb-fill)" stroke="url(#rim-stroke)" stroke-width="3" filter="url(#soft-shadow)"/>
+  <g clip-path="url(#orb-clip)">
+    <ellipse cx="220" cy="170" rx="140" ry="95" fill="#ffffff" opacity="0.05"/>
+    <ellipse cx="310" cy="330" rx="150" ry="110" fill="#000000" opacity="0.10"/>
+    <path d="M108 165 A170 170 0 0 1 403 165" fill="none" stroke="#ff9a3c" stroke-width="1.5" opacity="0.22"/>
+    <g fill="#ff9a3c" opacity="0.22">
+      <circle cx="148" cy="186" r="1"/>
+      <circle cx="182" cy="217" r="0.9"/>
+      <circle cx="232" cy="178" r="0.8"/>
+      <circle cx="318" cy="192" r="1"/>
+      <circle cx="355" cy="226" r="0.9"/>
+      <circle cx="146" cy="308" r="0.8"/>
+      <circle cx="214" cy="336" r="1"/>
+      <circle cx="284" cy="344" r="0.9"/>
+      <circle cx="344" cy="317" r="0.8"/>
+    </g>
+  </g>
+  <path d="M 182 148.322 C 182 130.386 190.968 125.364 208.904 133.256 L 364.946 207.511 C 383.599 216.837 383.599 226.164 364.946 235.491 L 208.904 309.745 C 190.968 317.637 182 312.615 182 294.679 L 182 148.322 Z" fill="url(#metal-orange)" style=""/>
+  <path d="M 46 309 L 66 319 C 184 370 328 370 446 319 L 466 309 L 456 326 C 329 380 183 380 56 326 Z" fill="url(#metal-orange)"/>
+  <path d="M 64 353 L 83 362 C 193 409 319 409 429 362 L 448 353 L 439 369 C 320 417 192 417 73 369 Z" fill="url(#metal-orange)"/>
+</svg>
\ No newline at end of file
diff --git a/frontend/public/images/logo128.png b/frontend/public/images/logo128.png
index 467bde320b..4f8fe42bdc 100644
Binary files a/frontend/public/images/logo128.png and b/frontend/public/images/logo128.png differ
diff --git a/frontend/public/images/logo64.png b/frontend/public/images/logo64.png
index 891190143f..03e7685768 100644
Binary files a/frontend/public/images/logo64.png and b/frontend/public/images/logo64.png differ
diff --git a/frontend/public/images/logo_minimal_b.png b/frontend/public/images/logo_minimal_b.png
new file mode 100644
index 0000000000..585df9c81c
Binary files /dev/null and b/frontend/public/images/logo_minimal_b.png differ
diff --git a/frontend/public/images/logo_minimal_b.svg b/frontend/public/images/logo_minimal_b.svg
new file mode 100644
index 0000000000..2651b2727d
--- /dev/null
+++ b/frontend/public/images/logo_minimal_b.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512">
+  <path d="M 182 148.322 C 182 130.386 190.968 125.364 208.904 133.256 L 364.946 207.511 C 383.599 216.837 383.599 226.164 364.946 235.491 L 208.904 309.745 C 190.968 317.637 182 312.615 182 294.679 L 182 148.322 Z" style=""/>
+  <path d="M 46 309 L 66 319 C 184 370 328 370 446 319 L 466 309 L 456 326 C 329 380 183 380 56 326 Z" style=""/>
+  <path d="M 64 353 L 83 362 C 193 409 319 409 429 362 L 448 353 L 439 369 C 320 417 192 417 73 369 Z" style=""/>
+</svg>
\ No newline at end of file
diff --git a/frontend/public/images/logo_minimal_b128.png b/frontend/public/images/logo_minimal_b128.png
new file mode 100644
index 0000000000..8718706cba
Binary files /dev/null and b/frontend/public/images/logo_minimal_b128.png differ
diff --git a/frontend/public/images/logo_minimal_b64.png b/frontend/public/images/logo_minimal_b64.png
new file mode 100644
index 0000000000..16c976043a
Binary files /dev/null and b/frontend/public/images/logo_minimal_b64.png differ
diff --git a/frontend/public/images/logo_minimal_w.png b/frontend/public/images/logo_minimal_w.png
new file mode 100644
index 0000000000..db081b03cc
Binary files /dev/null and b/frontend/public/images/logo_minimal_w.png differ
diff --git a/frontend/public/images/logo_minimal_w.svg b/frontend/public/images/logo_minimal_w.svg
new file mode 100644
index 0000000000..99436cb939
--- /dev/null
+++ b/frontend/public/images/logo_minimal_w.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512">
+  <path d="M 182 148.322 C 182 130.386 190.968 125.364 208.904 133.256 L 364.946 207.511 C 383.599 216.837 383.599 226.164 364.946 235.491 L 208.904 309.745 C 190.968 317.637 182 312.615 182 294.679 L 182 148.322 Z" style="fill: rgb(255, 255, 255);"/>
+  <path d="M 46 309 L 66 319 C 184 370 328 370 446 319 L 466 309 L 456 326 C 329 380 183 380 56 326 Z" style="fill: rgb(255, 255, 255);"/>
+  <path d="M 64 353 L 83 362 C 193 409 319 409 429 362 L 448 353 L 439 369 C 320 417 192 417 73 369 Z" style="fill: rgb(255, 255, 255);"/>
+</svg>
\ No newline at end of file
diff --git a/frontend/public/images/logo_minimal_w128.png b/frontend/public/images/logo_minimal_w128.png
new file mode 100644
index 0000000000..951f259f23
Binary files /dev/null and b/frontend/public/images/logo_minimal_w128.png differ
diff --git a/frontend/public/images/logo_minimal_w64.png b/frontend/public/images/logo_minimal_w64.png
new file mode 100644
index 0000000000..675b926be6
Binary files /dev/null and b/frontend/public/images/logo_minimal_w64.png differ
diff --git a/frontend/public/images/logo_no_orb.png b/frontend/public/images/logo_no_orb.png
new file mode 100644
index 0000000000..c89c016e68
Binary files /dev/null and b/frontend/public/images/logo_no_orb.png differ
diff --git a/frontend/public/images/logo_no_orb.svg b/frontend/public/images/logo_no_orb.svg
new file mode 100644
index 0000000000..01ae43816d
--- /dev/null
+++ b/frontend/public/images/logo_no_orb.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512">
+  <defs>
+    <linearGradient id="metal-orange" x1="0%" y1="0%" x2="100%" y2="100%">
+      <stop offset="0" stop-color="#ffb15a"/>
+      <stop offset="0.45" stop-color="#d96a1a"/>
+      <stop offset="1" stop-color="#7e3500"/>
+    </linearGradient>
+  </defs>
+  <path d="M 182 148.322 C 182 130.386 190.968 125.364 208.904 133.256 L 364.946 207.511 C 383.599 216.837 383.599 226.164 364.946 235.491 L 208.904 309.745 C 190.968 317.637 182 312.615 182 294.679 L 182 148.322 Z" style="" fill="url(#metal-orange)"/>
+  <path d="M 46 309 L 66 319 C 184 370 328 370 446 319 L 466 309 L 456 326 C 329 380 183 380 56 326 Z" fill="url(#metal-orange)"/>
+  <path d="M 64 353 L 83 362 C 193 409 319 409 429 362 L 448 353 L 439 369 C 320 417 192 417 73 369 Z" fill="url(#metal-orange)"/>
+</svg>
\ No newline at end of file
diff --git a/frontend/public/images/logo_no_orb128.png b/frontend/public/images/logo_no_orb128.png
new file mode 100644
index 0000000000..e0cfc893dd
Binary files /dev/null and b/frontend/public/images/logo_no_orb128.png differ
diff --git a/frontend/public/images/logo_no_orb64.png b/frontend/public/images/logo_no_orb64.png
new file mode 100644
index 0000000000..46804394d3
Binary files /dev/null and b/frontend/public/images/logo_no_orb64.png differ
diff --git a/frontend/public/images/maskable-icon-512x512.png b/frontend/public/images/maskable-icon-512x512.png
index e813d5ddf7..a6f20b650d 100644
Binary files a/frontend/public/images/maskable-icon-512x512.png and b/frontend/public/images/maskable-icon-512x512.png differ
diff --git a/frontend/public/images/mstile-150x150.png b/frontend/public/images/mstile-150x150.png
index 362cfe6c53..1cbdf406eb 100644
Binary files a/frontend/public/images/mstile-150x150.png and b/frontend/public/images/mstile-150x150.png differ
diff --git a/frontend/public/images/pwa-192x192.png b/frontend/public/images/pwa-192x192.png
index a93a96a653..dc45d26c54 100644
Binary files a/frontend/public/images/pwa-192x192.png and b/frontend/public/images/pwa-192x192.png differ
diff --git a/frontend/public/images/pwa-512x512.png b/frontend/public/images/pwa-512x512.png
index 298f27dbae..b05f07065d 100644
Binary files a/frontend/public/images/pwa-512x512.png and b/frontend/public/images/pwa-512x512.png differ
diff --git a/frontend/public/images/pwa-64x64.png b/frontend/public/images/pwa-64x64.png
index 41487e49c5..fa0f87cbd0 100644
Binary files a/frontend/public/images/pwa-64x64.png and b/frontend/public/images/pwa-64x64.png differ
diff --git a/frontend/src/App/Header.module.scss b/frontend/src/App/Header.module.scss
index 8f22398097..47e5096592 100644
--- a/frontend/src/App/Header.module.scss
+++ b/frontend/src/App/Header.module.scss
@@ -1,9 +1,52 @@
 .header {
-  @include mantine.light {
-    color: var(--mantine-color-gray-0);
+  box-shadow: none;
+}
+
+.headerInner {
+  background: var(--bz-surface-base);
+  border: 1px solid var(--bz-border-card);
+  border-radius: var(--bz-radius-xl);
+  padding: 10px 16px;
+  margin-right: 8px;
+  display: flex;
+  align-items: center;
+
+  color: var(--bz-text-primary);
+
+  // Ghost-style action buttons (theme toggle, notifications, system gear)
+  :global(.mantine-ActionIcon-root) {
+    width: 32px;
+    height: 32px;
+    min-width: 32px;
+    min-height: 32px;
+    background: var(--bz-hover-bg);
+    border: 1px solid var(--bz-border-interactive);
+    border-radius: var(--bz-radius-md);
+    color: var(--bz-text-tertiary);
+    font-size: 12px;
+    font-weight: 500;
+    &:hover {
+      background: var(--bz-hover-bg-emphasis);
+    }
   }
 
-  @include mantine.dark {
-    color: var(--mantine-color-dark-0);
+  // Search input
+  :global(.mantine-Select-input) {
+    background: var(--bz-hover-bg);
+    border: 1px solid var(--bz-border-interactive);
+    border-radius: var(--bz-radius-md);
+    transition: background var(--bz-duration-normal) var(--bz-ease-standard);
+
+    &::placeholder {
+      color: var(--bz-text-tertiary);
+    }
+
+    &:hover {
+      background: var(--bz-hover-bg-emphasis);
+    }
+
+    &:focus {
+      background: var(--bz-hover-bg-emphasis);
+    }
   }
 }
diff --git a/frontend/src/App/Header.tsx b/frontend/src/App/Header.tsx
index 11cb58e8a5..89f56d3858 100644
--- a/frontend/src/App/Header.tsx
+++ b/frontend/src/App/Header.tsx
@@ -3,18 +3,22 @@ import {
   Anchor,
   AppShell,
   Avatar,
-  Badge,
   Burger,
   Divider,
   Group,
   Menu,
+  Text,
+  useComputedColorScheme,
+  useMantineColorScheme,
 } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
-import { faBell } from "@fortawesome/free-regular-svg-icons/faBell";
+import { faListCheck } from "@fortawesome/free-solid-svg-icons";
 import {
   faArrowRotateLeft,
   faGear,
+  faMoon,
   faPowerOff,
+  faSun,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useSystem, useSystemJobs, useSystemSettings } from "@/apis/hooks";
@@ -38,6 +42,9 @@ const AppHeader: FunctionComponent = () => {
 
   const goHome = useGotoHomepage();
 
+  const { toggleColorScheme } = useMantineColorScheme();
+  const dark = useComputedColorScheme("light") === "dark";
+
   const [
     jobsManagerOpened,
     { open: openJobsManager, close: closeJobsManager },
@@ -46,70 +53,104 @@ const AppHeader: FunctionComponent = () => {
   const { data: jobs } = useSystemJobs();
 
   return (
-    <AppShell.Header p="md" className={styles.header}>
-      <Group justify="space-between" wrap="nowrap">
-        <Group wrap="nowrap">
-          <Burger
-            opened={showed}
-            onClick={() => show(!showed)}
-            size="sm"
-            hiddenFrom="sm"
-          ></Burger>
-          <Anchor onClick={goHome}>
-            <Avatar
-              alt="brand"
-              size={32}
-              src={`${Environment.baseUrl}/images/logo64.png`}
-            ></Avatar>
-          </Anchor>
-          <Badge size="lg" radius="sm" variant="brand" visibleFrom="sm">
-            Bazarr
-          </Badge>
-        </Group>
-        <Group gap="xs" justify="right" wrap="nowrap">
-          <Search></Search>
-          <Action
-            label="Jobs Manager"
-            tooltip={{ position: "left", openDelay: 2000 }}
-            icon={faBell}
-            size="sm"
-            isLoading={Boolean(
-              jobs?.filter((job) => job.status === "running").length,
-            )}
-            onClick={openJobsManager}
-          ></Action>
-          <Menu>
-            <Menu.Target>
-              <Action
-                label="System"
-                tooltip={{ position: "left", openDelay: 2000 }}
-                loading={offline}
-                c={offline ? "yellow" : undefined}
-                icon={faGear}
-                size="lg"
-              ></Action>
-            </Menu.Target>
-            <Menu.Dropdown>
-              <Menu.Item
-                leftSection={<FontAwesomeIcon icon={faArrowRotateLeft} />}
-                onClick={() => restart()}
-              >
-                Restart
-              </Menu.Item>
-              <Menu.Item
-                leftSection={<FontAwesomeIcon icon={faPowerOff} />}
-                onClick={() => shutdown()}
-              >
-                Shutdown
-              </Menu.Item>
-              <Divider hidden={!hasLogout}></Divider>
-              <Menu.Item hidden={!hasLogout} onClick={() => logout()}>
-                Logout
-              </Menu.Item>
-            </Menu.Dropdown>
-          </Menu>
+    <AppShell.Header p={0} className={styles.header}>
+      <div className={styles.headerInner}>
+        <Group justify="space-between" wrap="nowrap" style={{ flex: 1 }}>
+          <Group wrap="nowrap">
+            <Burger
+              opened={showed}
+              onClick={() => show(!showed)}
+              size="sm"
+              hiddenFrom="sm"
+            ></Burger>
+            <Anchor onClick={goHome} underline="never">
+              <Group gap={6} wrap="nowrap">
+                <Avatar
+                  alt="brand"
+                  size={40}
+                  src={`${Environment.baseUrl}/images/logo_no_orb128.png`}
+                ></Avatar>
+                <Text
+                  fw={800}
+                  fz="xl"
+                  c={dark ? "gray.5" : "gray.8"}
+                  visibleFrom="sm"
+                  style={{ cursor: "pointer", lineHeight: 1 }}
+                >
+                  Bazarr
+                  <Text
+                    component="span"
+                    fw={900}
+                    fz="xl"
+                    c="brand.5"
+                    style={{
+                      verticalAlign: "top",
+                      fontSize: "0.7em",
+                      lineHeight: 1,
+                      position: "relative",
+                      top: "-0.15em",
+                    }}
+                  >
+                    +
+                  </Text>
+                </Text>
+              </Group>
+            </Anchor>
+          </Group>
+          <div style={{ flex: 1, maxWidth: 500 }}>
+            <Search></Search>
+          </div>
+          <Group gap="xs" justify="right" wrap="nowrap">
+            <Action
+              label="Change Theme"
+              tooltip={{ position: "left", openDelay: 2000 }}
+              onClick={() => toggleColorScheme()}
+              icon={dark ? faSun : faMoon}
+              size="sm"
+            ></Action>
+            <Action
+              label="Jobs Manager"
+              tooltip={{ position: "left", openDelay: 2000 }}
+              icon={faListCheck}
+              size="sm"
+              isLoading={Boolean(
+                jobs?.filter((job) => job.status === "running").length,
+              )}
+              onClick={openJobsManager}
+            ></Action>
+            <Menu>
+              <Menu.Target>
+                <Action
+                  label="System"
+                  tooltip={{ position: "left", openDelay: 2000 }}
+                  loading={offline}
+                  c={offline ? "yellow" : undefined}
+                  icon={faGear}
+                  size="sm"
+                ></Action>
+              </Menu.Target>
+              <Menu.Dropdown>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faArrowRotateLeft} />}
+                  onClick={() => restart()}
+                >
+                  Restart
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faPowerOff} />}
+                  onClick={() => shutdown()}
+                >
+                  Shutdown
+                </Menu.Item>
+                <Divider hidden={!hasLogout}></Divider>
+                <Menu.Item hidden={!hasLogout} onClick={() => logout()}>
+                  Logout
+                </Menu.Item>
+              </Menu.Dropdown>
+            </Menu>
+          </Group>
         </Group>
-      </Group>
+      </div>
       <NotificationDrawer
         opened={jobsManagerOpened}
         onClose={closeJobsManager}
diff --git a/frontend/src/App/Navbar.module.scss b/frontend/src/App/Navbar.module.scss
index 2e15343e0e..c2f88602cc 100644
--- a/frontend/src/App/Navbar.module.scss
+++ b/frontend/src/App/Navbar.module.scss
@@ -1,46 +1,86 @@
-.anchor {
-  border-color: var(--mantine-color-gray-5);
-  text-decoration: none;
+.nav {
+  padding: 8px;
+  background: transparent;
+  border-right: none;
+}
 
-  @include mantine.dark {
-    border-color: var(--mantine-color-dark-5);
+.navInner {
+  background: var(--bz-surface-base);
+  border: 1px solid var(--bz-border-card);
+  border-radius: var(--bz-radius-xl);
+  padding: 12px;
+  height: 100%;
+  overflow-y: auto;
+  scrollbar-width: none;
+}
+
+.groupLabel {
+  font-size: 10px;
+  font-weight: 600;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: var(--bz-text-disabled);
+  padding: 0 12px;
+  margin-bottom: 6px;
+
+  &:not(:first-child) {
+    margin-top: 22px;
   }
+}
+
+.anchor {
+  display: block;
+  text-decoration: none;
+  border-radius: var(--bz-radius-md);
+  margin-bottom: 2px;
+  transition: background var(--bz-duration-normal) var(--bz-ease-standard);
 
   &.active {
-    border-left: 2px solid bazarr.$color-brand-4;
-    background-color: var(--mantine-color-gray-1);
+    position: relative;
 
     @include mantine.dark {
-      border-left: 2px solid bazarr.$color-brand-8;
-      background-color: var(--mantine-color-dark-8);
+      background-color: rgba(230, 138, 0, 0.12);
+    }
+
+    @include mantine.light {
+      background-color: rgba(230, 138, 0, 0.08);
     }
-  }
 
-  &.hover {
-    background-color: var(--mantine-color-gray-0);
+    &::before {
+      content: "";
+      position: absolute;
+      left: 4px;
+      top: 50%;
+      transform: translateY(-50%);
+      width: 3px;
+      height: 18px;
+      border-radius: 2px;
+      background: #e68a00;
 
-    @include mantine.dark {
-      background-color: var(--mantine-color-dark-7);
+      @include mantine.light {
+        background: #b36b00;
+      }
     }
-  }
-}
 
-.badge {
-  margin-left: auto;
-  text-decoration: none;
-  box-shadow: var(--mantine-shadow-xs);
-}
+    .text {
+      color: var(--bz-text-primary);
+    }
 
-.icon {
-  width: 1.4rem;
-  margin-right: var(--mantine-spacing-xs);
-}
+    .icon {
+      opacity: 1;
 
-.nav {
-  background-color: var(--mantine-color-gray-2);
+      @include mantine.dark {
+        color: #e68a00;
+      }
 
-  @include mantine.dark {
-    background-color: var(--mantine-color-dark-8);
+      @include mantine.light {
+        color: #b36b00;
+      }
+    }
+  }
+
+  &.hover:not(.active) {
+    background-color: var(--bz-hover-bg);
   }
 }
 
@@ -48,9 +88,39 @@
   display: inline-flex;
   align-items: center;
   width: 100%;
-  color: var(--mantine-color-gray-8);
+  padding: 8px 12px;
+  font-size: 13px;
+  font-weight: 450;
+  color: var(--bz-text-tertiary);
+}
+
+.icon {
+  width: 1rem;
+  margin-right: var(--mantine-spacing-xs);
+  opacity: 0.7;
+}
+
+.badge {
+  margin-left: auto;
+  text-decoration: none;
+  border-radius: var(--bz-radius-sm);
+  font-size: 10px;
+  font-weight: 600;
+  box-shadow: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 24px;
+  padding-left: 8px;
+  padding-right: 8px;
 
   @include mantine.dark {
-    color: var(--mantine-color-gray-5);
+    background-color: rgba(230, 138, 0, 0.15) !important;
+    color: #ffca28 !important;
+  }
+
+  @include mantine.light {
+    background-color: rgba(230, 138, 0, 0.12) !important;
+    color: #b36b00 !important;
   }
 }
diff --git a/frontend/src/App/Navbar.tsx b/frontend/src/App/Navbar.tsx
index 7352cb3288..ee47b1e2f9 100644
--- a/frontend/src/App/Navbar.tsx
+++ b/frontend/src/App/Navbar.tsx
@@ -7,28 +7,11 @@ import React, {
   useState,
 } from "react";
 import { matchPath, NavLink, RouteObject, useLocation } from "react-router";
-import {
-  Anchor,
-  AppShell,
-  Badge,
-  Collapse,
-  Divider,
-  Group,
-  Stack,
-  Text,
-  useComputedColorScheme,
-  useMantineColorScheme,
-} from "@mantine/core";
+import { AppShell, Badge, Collapse, Stack, Text } from "@mantine/core";
 import { useHover } from "@mantine/hooks";
-import {
-  faHeart,
-  faMoon,
-  faSun,
-  IconDefinition,
-} from "@fortawesome/free-solid-svg-icons";
+import { IconDefinition } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import clsx from "clsx";
-import { Action } from "@/components";
 import { useNavbar } from "@/contexts/Navbar";
 import { useRouteItems } from "@/Router";
 import { CustomRouteObject, Route } from "@/Router/type";
@@ -96,13 +79,44 @@ function useIsActive(parent: string, route: RouteObject) {
   );
 }
 
-const AppNavbar: FunctionComponent = () => {
-  const [selection, select] = useState<string | null>(null);
+// Section grouping configuration.
+// Routes are matched by their path property.
+const sectionGroups = [
+  { label: "Media", paths: ["series", "movies"] },
+  { label: "Management", paths: ["history", "wanted", "blacklist"] },
+  { label: "System", paths: ["settings", "system"] },
+];
+
+function groupRoutes(routes: CustomRouteObject[]) {
+  // Filter to visible nav items (have a path, not hidden, not index-only)
+  const navItems = routes.filter(
+    (r) => r.path !== undefined && !r.hidden && !r.path.includes(":") && r.name,
+  );
 
-  const { toggleColorScheme } = useMantineColorScheme();
-  const computedColorScheme = useComputedColorScheme("light");
+  const groups: { label: string; items: CustomRouteObject[] }[] = [];
 
-  const dark = computedColorScheme === "dark";
+  for (const section of sectionGroups) {
+    const items = section.paths
+      .map((p) => navItems.find((r) => r.path === p))
+      .filter((r): r is CustomRouteObject => r !== undefined);
+
+    if (items.length > 0) {
+      groups.push({ label: section.label, items });
+    }
+  }
+
+  // Catch any remaining items not in a defined group
+  const groupedPaths = new Set(sectionGroups.flatMap((s) => s.paths));
+  const ungrouped = navItems.filter((r) => !groupedPaths.has(r.path ?? ""));
+  if (ungrouped.length > 0) {
+    groups.push({ label: "Other", items: ungrouped });
+  }
+
+  return groups;
+}
+
+const AppNavbar: FunctionComponent = () => {
+  const [selection, select] = useState<string | null>(null);
 
   const routes = useRouteItems();
 
@@ -111,41 +125,36 @@ const AppNavbar: FunctionComponent = () => {
     select(null);
   }, [pathname]);
 
+  // The top-level route (path "/") contains the nav items as children.
+  // useRouteItems returns the full routes array, and the nameless "/" route
+  // renders its children directly. We need to find the app route's children.
+  const navRoutes = useMemo(() => {
+    const appRoute = routes.find((r) => r.path === "/");
+    return appRoute?.children ?? routes;
+  }, [routes]);
+
+  const groups = useMemo(() => groupRoutes(navRoutes), [navRoutes]);
+
   return (
-    <AppShell.Navbar p="xs" className={styles.nav}>
-      <Selection.Provider value={{ selection, select }}>
-        <AppShell.Section
-          grow
-          style={{ overflowY: "auto", scrollbarWidth: "none" }}
-        >
+    <AppShell.Navbar className={styles.nav}>
+      <div className={styles.navInner}>
+        <Selection.Provider value={{ selection, select }}>
           <Stack gap={0}>
-            {routes.map((route, idx) => (
-              <RouteItem
-                key={BuildKey("nav", idx)}
-                parent="/"
-                route={route}
-              ></RouteItem>
+            {groups.map((group) => (
+              <div key={group.label}>
+                <div className={styles.groupLabel}>{group.label}</div>
+                {group.items.map((route, idx) => (
+                  <RouteItem
+                    key={BuildKey("nav", group.label, idx)}
+                    parent="/"
+                    route={route}
+                  />
+                ))}
+              </div>
             ))}
           </Stack>
-        </AppShell.Section>
-        <Divider></Divider>
-        <AppShell.Section mt="xs">
-          <Group gap="xs">
-            <Action
-              label="Change Theme"
-              c={dark ? "yellow" : "indigo"}
-              onClick={() => toggleColorScheme()}
-              icon={dark ? faSun : faMoon}
-            ></Action>
-            <Anchor
-              href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url"
-              target="_blank"
-            >
-              <Action label="Donate" icon={faHeart} c="red"></Action>
-            </Anchor>
-          </Group>
-        </AppShell.Section>
-      </Selection.Provider>
+        </Selection.Provider>
+      </div>
     </AppShell.Navbar>
   );
 };
@@ -177,7 +186,7 @@ const RouteItem: FunctionComponent<{
             parent={link}
             key={BuildKey(link, "nav", idx)}
             route={child}
-          ></RouteItem>
+          />
         ))}
       </Stack>
     );
@@ -186,7 +195,6 @@ const RouteItem: FunctionComponent<{
       return (
         <Stack gap={0}>
           <NavbarItem
-            primary
             name={name}
             link={link}
             icon={icon}
@@ -208,7 +216,7 @@ const RouteItem: FunctionComponent<{
                 select(link);
               }
             }}
-          ></NavbarItem>
+          />
           <Collapse hidden={children.length === 0} in={isOpen}>
             {elements}
           </Collapse>
@@ -219,12 +227,7 @@ const RouteItem: FunctionComponent<{
     }
   } else {
     return (
-      <NavbarItem
-        name={name ?? link}
-        link={link}
-        icon={icon}
-        badge={badge}
-      ></NavbarItem>
+      <NavbarItem name={name ?? link} link={link} icon={icon} badge={badge} />
     );
   }
 };
@@ -234,7 +237,6 @@ interface NavbarItemProps {
   link: string;
   icon?: IconDefinition;
   badge?: number | string;
-  primary?: boolean;
   onClick?: (event: React.MouseEvent<HTMLAnchorElement>) => void;
 }
 
@@ -244,7 +246,6 @@ const NavbarItem: FunctionComponent<NavbarItemProps> = ({
   name,
   badge,
   onClick,
-  primary = false,
 }) => {
   const { show } = useNavbar();
 
@@ -278,24 +279,11 @@ const NavbarItem: FunctionComponent<NavbarItemProps> = ({
         )
       }
     >
-      <Text
-        ref={ref}
-        inline
-        p="xs"
-        size="sm"
-        fw={primary ? "bold" : "normal"}
-        className={styles.text}
-        span
-      >
-        {icon && (
-          <FontAwesomeIcon
-            className={styles.icon}
-            icon={icon}
-          ></FontAwesomeIcon>
-        )}
+      <Text ref={ref} inline className={styles.text} span>
+        {icon && <FontAwesomeIcon className={styles.icon} icon={icon} />}
         {name}
         {!shouldHideBadge && (
-          <Badge className={styles.badge} radius="xs">
+          <Badge className={styles.badge} variant="filled" radius="xs">
             {badge}
           </Badge>
         )}
diff --git a/frontend/src/App/NotificationDrawer.tsx b/frontend/src/App/NotificationDrawer.tsx
index 170114609f..b4917afb40 100644
--- a/frontend/src/App/NotificationDrawer.tsx
+++ b/frontend/src/App/NotificationDrawer.tsx
@@ -139,7 +139,7 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
       )}
 
       {!jobsLoading && jobsError && (
-        <Card withBorder padding="md" radius="sm">
+        <Card withBorder padding="md" radius="md">
           <Text c="red.6" size="sm">
             Failed to load jobs.
           </Text>
@@ -227,7 +227,7 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
                             </Menu>
                           )}
                         </Group>
-                        <Text size="xs" c="dimmed">
+                        <Text size="xs" c="var(--bz-text-tertiary)">
                           {grouped[status as string].length} job
                           {grouped[status as string].length > 1 ? "s" : ""}
                         </Text>
@@ -254,7 +254,7 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
                               <Card
                                 key={`job-${job?.job_id}-${job?.status}`}
                                 withBorder
-                                radius="md"
+                                radius="lg"
                                 padding="xs"
                               >
                                 <Group
@@ -268,7 +268,7 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
                                       position="right"
                                     >
                                       <RingProgress
-                                        size={status === "running" ? 60 : 42}
+                                        size={status === "running" ? 76 : 58}
                                         thickness={status === "running" ? 6 : 4}
                                         sections={[
                                           {
@@ -282,18 +282,28 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
                                                       job.progress_max) *
                                                     100
                                                   : 0,
-                                            color: "brand",
+                                            color:
+                                              status === "completed"
+                                                ? "green"
+                                                : status === "failed"
+                                                  ? "red"
+                                                  : "brand",
                                           },
                                         ]}
                                         label={
                                           <Text
                                             ta="center"
                                             size={
-                                              status === "running"
-                                                ? "xs"
-                                                : "9px"
+                                              status === "running" ? "sm" : "xs"
                                             }
                                             fw={700}
+                                            c={
+                                              status === "completed"
+                                                ? "green"
+                                                : status === "failed"
+                                                  ? "red"
+                                                  : undefined
+                                            }
                                           >
                                             {status === "completed" &&
                                             job.progress_max == 0 &&
@@ -467,7 +477,10 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
                                       </Group>
                                     </Group>
                                     {job?.progress_message && (
-                                      <Text size="xs" c="dimmed">
+                                      <Text
+                                        size="xs"
+                                        c="var(--bz-text-tertiary)"
+                                      >
                                         {job.progress_message}
                                       </Text>
                                     )}
@@ -481,14 +494,14 @@ const NotificationDrawer: FunctionComponent<NotificationDrawerProps> = ({
                   ));
               })()
             ) : (
-              <Text c="dimmed" ta="center" py="xl">
+              <Text c="var(--bz-text-tertiary)" ta="center" py="xl">
                 No jobs to display
               </Text>
             )}
           </>
         ) : (
-          <Card withBorder padding="md" radius="sm">
-            <Text size="sm" c="dimmed" mb="xs">
+          <Card withBorder padding="md" radius="md">
+            <Text size="sm" c="var(--bz-text-tertiary)" mb="xs">
               Jobs
             </Text>
             <Text
diff --git a/frontend/src/App/ThemeProvider.tsx b/frontend/src/App/ThemeProvider.tsx
index 662a1ce69f..cedba3f33f 100644
--- a/frontend/src/App/ThemeProvider.tsx
+++ b/frontend/src/App/ThemeProvider.tsx
@@ -4,8 +4,10 @@ import {
   Badge,
   Button,
   createTheme,
+  Input,
   MantineProvider,
   Pagination,
+  Progress,
 } from "@mantine/core";
 import ThemeLoader from "@/App/ThemeLoader";
 import "@mantine/core/styles.layer.css";
@@ -14,10 +16,13 @@ import styleVars from "@/assets/_variables.module.scss";
 import actionIconClasses from "@/assets/action_icon.module.scss";
 import badgeClasses from "@/assets/badge.module.scss";
 import buttonClasses from "@/assets/button.module.scss";
+import inputClasses from "@/assets/input.module.scss";
 import paginationClasses from "@/assets/pagination.module.scss";
+import progressClasses from "@/assets/progress.module.scss";
 
 const themeProvider = createTheme({
-  fontFamily: "Roboto, open sans, Helvetica Neue, Helvetica, Arial, sans-serif",
+  fontFamily:
+    "'Geist Variable', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif",
   colors: {
     brand: [
       styleVars.colorBrand0,
@@ -31,6 +36,175 @@ const themeProvider = createTheme({
       styleVars.colorBrand8,
       styleVars.colorBrand9,
     ],
+    dark: [
+      "#C1C2D3",
+      "#A9AABB",
+      "#8E8FA3",
+      "#6C6D85",
+      "#53546C",
+      "#3D3E55",
+      "#2A2A45",
+      "#22223A",
+      "#1A1A2E",
+      "#121125",
+    ],
+    // Atmospheric overrides for all Mantine default colors
+    gray: [
+      "#f4f4f6",
+      "#e8e8ec",
+      "#d0d0d8",
+      "#b0b0be",
+      "#9090a2",
+      "#6c6d85",
+      "#53546c",
+      "#3d3e55",
+      "#2a2a45",
+      "#1a1a2e",
+    ],
+    red: [
+      "#fff0f0",
+      "#ffd9d9",
+      "#ffb3b3",
+      "#ff8a8a",
+      "#ff6b6b",
+      "#f55050",
+      "#e03e3e",
+      "#c92a2a",
+      "#ad1f1f",
+      "#8b1515",
+    ],
+    pink: [
+      "#fff0f5",
+      "#ffd6e7",
+      "#faa2c1",
+      "#f06595",
+      "#e64980",
+      "#d6336c",
+      "#c2255c",
+      "#a61e4d",
+      "#8c1941",
+      "#6e1233",
+    ],
+    grape: [
+      "#f8f0fc",
+      "#ebd6f5",
+      "#d0a2e0",
+      "#b56cc8",
+      "#a050b5",
+      "#8b3da0",
+      "#7b2d8e",
+      "#6a1f7a",
+      "#581668",
+      "#460d55",
+    ],
+    violet: [
+      "#f3f0ff",
+      "#e0d9f7",
+      "#bfb3e6",
+      "#9b8ad4",
+      "#7c6abf",
+      "#6a52b0",
+      "#5c3fa0",
+      "#4c2f8a",
+      "#3d2070",
+      "#2e1158",
+    ],
+    indigo: [
+      "#edf2ff",
+      "#d5dff7",
+      "#a8bce6",
+      "#7b96d4",
+      "#5c7cbf",
+      "#4c6ab0",
+      "#3d5a9e",
+      "#2f4a8a",
+      "#233a70",
+      "#182a58",
+    ],
+    blue: [
+      "#e8f0ff",
+      "#ccddf7",
+      "#99bae6",
+      "#6694d4",
+      "#4078bf",
+      "#3568b0",
+      "#2a589e",
+      "#20488a",
+      "#183870",
+      "#102858",
+    ],
+    cyan: [
+      "#e3fafc",
+      "#c5f6fa",
+      "#99e9f2",
+      "#66d9e8",
+      "#3bc9db",
+      "#22b8cf",
+      "#15aabf",
+      "#1098ad",
+      "#0c8599",
+      "#0b7285",
+    ],
+    teal: [
+      "#f0f5f2",
+      "#d8e8dc",
+      "#b0ccb8",
+      "#88b098",
+      "#6a9a7a",
+      "#558868",
+      "#447758",
+      "#336648",
+      "#25553a",
+      "#18442c",
+    ],
+    green: [
+      "#edf7ed",
+      "#d3ebd3",
+      "#a8d8a8",
+      "#7cc47c",
+      "#5cb85c",
+      "#4caa4c",
+      "#3d993d",
+      "#2d882d",
+      "#1f751f",
+      "#146014",
+    ],
+    lime: [
+      "#f4fce3",
+      "#e2f5b5",
+      "#c0e078",
+      "#a0c850",
+      "#88b830",
+      "#74a822",
+      "#619818",
+      "#4e8510",
+      "#3d700a",
+      "#2d5c06",
+    ],
+    yellow: [
+      "#fff9db",
+      "#fff3bf",
+      "#ffec99",
+      "#ffe066",
+      "#ffd43b",
+      "#fcc419",
+      "#fab005",
+      "#f59f00",
+      "#f08c00",
+      "#e67700",
+    ],
+    orange: [
+      "#fff4e6",
+      "#ffe8cc",
+      "#ffd8a8",
+      "#ffc078",
+      "#ffa94d",
+      "#ff922b",
+      "#fd7e14",
+      "#e8590c",
+      "#d54a08",
+      "#bf3d04",
+    ],
   },
   primaryColor: "brand",
   components: {
@@ -43,9 +217,15 @@ const themeProvider = createTheme({
     Button: Button.extend({
       classNames: buttonClasses,
     }),
+    Input: Input.extend({
+      classNames: inputClasses,
+    }),
     Pagination: Pagination.extend({
       classNames: paginationClasses,
     }),
+    Progress: Progress.extend({
+      classNames: progressClasses,
+    }),
   },
 });
 
diff --git a/frontend/src/App/index.tsx b/frontend/src/App/index.tsx
index 00b6741fa5..712cc4e76f 100644
--- a/frontend/src/App/index.tsx
+++ b/frontend/src/App/index.tsx
@@ -1,8 +1,9 @@
-import { FunctionComponent, useEffect, useState } from "react";
+import { FunctionComponent, useCallback, useEffect, useState } from "react";
 import { Outlet, useNavigate } from "react-router";
-import { AppShell } from "@mantine/core";
+import { AppShell, Button, Group, Modal, Stack, Text } from "@mantine/core";
 import { useWindowEvent } from "@mantine/hooks";
 import { showNotification } from "@mantine/notifications";
+import api from "@/apis/raw";
 import AppNavbar from "@/App/Navbar";
 import ErrorBoundary from "@/components/ErrorBoundary";
 import NavbarProvider from "@/contexts/Navbar";
@@ -35,6 +36,9 @@ const App: FunctionComponent = () => {
     setOnline(detail.online);
   });
 
+  const [upgradeModalOpen, setUpgradeModalOpen] = useState(false);
+  const [upgrading, setUpgrading] = useState(false);
+
   useEffect(() => {
     if (Environment.hasUpdate) {
       showNotification(
@@ -46,6 +50,41 @@ const App: FunctionComponent = () => {
     }
   }, []);
 
+  useEffect(() => {
+    const token = sessionStorage.getItem("password_upgrade_token");
+    if (token) {
+      setUpgradeModalOpen(true);
+    }
+  }, []);
+
+  const handleUpgradeAccept = useCallback(async () => {
+    const token = sessionStorage.getItem("password_upgrade_token");
+    if (!token) return;
+    setUpgrading(true);
+    try {
+      await api.system.upgradePasswordHash(token);
+      showNotification(
+        notification.info(
+          "Password upgraded",
+          "Your password hash has been upgraded to PBKDF2-SHA256",
+        ),
+      );
+    } catch {
+      showNotification(
+        notification.warn("Upgrade failed", "Could not upgrade password hash"),
+      );
+    } finally {
+      sessionStorage.removeItem("password_upgrade_token");
+      setUpgradeModalOpen(false);
+      setUpgrading(false);
+    }
+  }, []);
+
+  const handleUpgradeDecline = useCallback(() => {
+    sessionStorage.removeItem("password_upgrade_token");
+    setUpgradeModalOpen(false);
+  }, []);
+
   if (criticalError !== null) {
     return <CriticalError message={criticalError}></CriticalError>;
   }
@@ -69,6 +108,31 @@ const App: FunctionComponent = () => {
               <Outlet></Outlet>
             </AppShell.Main>
           </AppShell>
+          <Modal
+            opened={upgradeModalOpen}
+            onClose={handleUpgradeDecline}
+            title="Upgrade Password Security"
+            centered
+          >
+            <Stack>
+              <Text size="sm">
+                Your password is currently stored using a weak MD5 hash. Would
+                you like to upgrade to PBKDF2-SHA256 for better security?
+              </Text>
+              <Text size="xs" c="var(--bz-text-tertiary)">
+                Note: After upgrading, reverting to upstream Bazarr will require
+                resetting your password via the config file.
+              </Text>
+              <Group justify="flex-end">
+                <Button variant="default" onClick={handleUpgradeDecline}>
+                  Not now
+                </Button>
+                <Button onClick={handleUpgradeAccept} loading={upgrading}>
+                  Upgrade
+                </Button>
+              </Group>
+            </Stack>
+          </Modal>
         </OnlineProvider>
       </NavbarProvider>
     </ErrorBoundary>
diff --git a/frontend/src/Router/index.tsx b/frontend/src/Router/index.tsx
index 7ccff2ceb9..0bdf5b37ff 100644
--- a/frontend/src/Router/index.tsx
+++ b/frontend/src/Router/index.tsx
@@ -28,9 +28,7 @@ import MoviesHistoryView from "@/pages/History/Movies";
 import SeriesHistoryView from "@/pages/History/Series";
 import MovieView from "@/pages/Movies";
 import MovieDetailView from "@/pages/Movies/Details";
-import MovieMassEditor from "@/pages/Movies/Editor";
 import SeriesView from "@/pages/Series";
-import SeriesMassEditor from "@/pages/Series/Editor";
 import SettingsGeneralView from "@/pages/Settings/General";
 import SettingsLanguagesView from "@/pages/Settings/Languages";
 import SettingsNotificationsView from "@/pages/Settings/Notifications";
@@ -40,6 +38,7 @@ import SettingsRadarrView from "@/pages/Settings/Radarr";
 import SettingsSchedulerView from "@/pages/Settings/Scheduler";
 import SettingsSonarrView from "@/pages/Settings/Sonarr";
 import SettingsSubtitlesView from "@/pages/Settings/Subtitles";
+import SettingsTranslatorView from "@/pages/Settings/Translator";
 import SettingsUIView from "@/pages/Settings/UI";
 import SystemAnnouncementsView from "@/pages/System/Announcements";
 import SystemBackupsView from "@/pages/System/Backups";
@@ -58,6 +57,7 @@ const HistoryStats = lazy(
   () => import("@/pages/History/Statistics/HistoryStats"),
 );
 const SystemStatusView = lazy(() => import("@/pages/System/Status"));
+const SubtitleEditor = lazy(() => import("@/pages/SubtitleEditor"));
 
 function useRoutes(): CustomRouteObject[] {
   const { data } = useBadges();
@@ -84,11 +84,6 @@ function useRoutes(): CustomRouteObject[] {
                 index: true,
                 element: <SeriesView></SeriesView>,
               },
-              {
-                path: "edit",
-                hidden: true,
-                element: <SeriesMassEditor></SeriesMassEditor>,
-              },
               {
                 path: ":id",
                 element: <Episodes></Episodes>,
@@ -106,11 +101,6 @@ function useRoutes(): CustomRouteObject[] {
                 index: true,
                 element: <MovieView></MovieView>,
               },
-              {
-                path: "edit",
-                hidden: true,
-                element: <MovieMassEditor></MovieMassEditor>,
-              },
               {
                 path: ":id",
                 element: <MovieDetailView></MovieDetailView>,
@@ -228,6 +218,11 @@ function useRoutes(): CustomRouteObject[] {
                 name: "Plex",
                 element: <SettingsPlexView></SettingsPlexView>,
               },
+              {
+                path: "translator",
+                name: "AI Translator",
+                element: <SettingsTranslatorView></SettingsTranslatorView>,
+              },
               {
                 path: "notifications",
                 name: "Notifications",
@@ -296,6 +291,15 @@ function useRoutes(): CustomRouteObject[] {
               },
             ],
           },
+          {
+            path: "subtitles/preview/:mediaType/:mediaId/:language",
+            hidden: true,
+            element: (
+              <Lazy>
+                <SubtitleEditor></SubtitleEditor>
+              </Lazy>
+            ),
+          },
           {
             path: "*",
             hidden: true,
diff --git a/frontend/src/apis/hooks/plex.ts b/frontend/src/apis/hooks/plex.ts
index 497d358ea1..873aab6a25 100644
--- a/frontend/src/apis/hooks/plex.ts
+++ b/frontend/src/apis/hooks/plex.ts
@@ -70,6 +70,7 @@ export const usePlexPinMutation = () => {
 
 export const usePlexPinCheckQuery = (
   pinId: string | null,
+  state: string | null,
   enabled: boolean,
   refetchInterval: number | false,
 ) => {
@@ -77,7 +78,7 @@ export const usePlexPinCheckQuery = (
     queryKey: [QueryKeys.Plex, "pinCheck", pinId],
     queryFn: () => {
       if (!pinId) throw new Error("Pin ID is required");
-      return api.plex.checkPin(pinId);
+      return api.plex.checkPin(pinId, state ?? undefined);
     },
     enabled: enabled && !!pinId,
     retry: false,
diff --git a/frontend/src/apis/hooks/subtitles.ts b/frontend/src/apis/hooks/subtitles.ts
index 50f22c9f7b..89910c7ee4 100644
--- a/frontend/src/apis/hooks/subtitles.ts
+++ b/frontend/src/apis/hooks/subtitles.ts
@@ -1,7 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { QueryKeys } from "@/apis/queries/keys";
 import api from "@/apis/raw";
-import { BatchTranslateItem } from "@/apis/raw/subtitles";
+import { BatchAction, BatchItem, BatchOptions } from "@/apis/raw/subtitles";
 
 export function useSubtitleAction() {
   const client = useQueryClient();
@@ -147,6 +147,14 @@ export function useSubtitleInfos(names: string[]) {
   });
 }
 
+export function useSubtitleContents(subtitlePath: string) {
+  return useQuery({
+    queryKey: [QueryKeys.Subtitles, subtitlePath],
+    queryFn: () => api.subtitles.contents(subtitlePath),
+    staleTime: Infinity,
+  });
+}
+
 export function useRefTracksByEpisodeId(
   subtitlesPath: string,
   sonarrEpisodeId: number,
@@ -183,24 +191,54 @@ export function useRefTracksByMovieId(
   });
 }
 
-export function useBatchTranslate() {
+export function useUpgradableItems() {
+  return useQuery({
+    queryKey: [QueryKeys.Subtitles, "upgradable"],
+    queryFn: () => api.subtitles.upgradable(),
+    refetchInterval: 60000,
+  });
+}
+
+export function useBatchAction() {
   const client = useQueryClient();
   return useMutation({
-    mutationKey: [QueryKeys.Subtitles, "batch-translate"],
-    mutationFn: (items: BatchTranslateItem[]) =>
-      api.subtitles.batchTranslate(items),
+    mutationKey: [QueryKeys.Subtitles, "batch"],
+    mutationFn: (params: {
+      items: BatchItem[];
+      action: BatchAction;
+      options?: BatchOptions;
+    }) => api.subtitles.batch(params.items, params.action, params.options),
     onSuccess: () => {
-      // Invalidate wanted queries to refresh the lists
       void client.invalidateQueries({
-        queryKey: [QueryKeys.Series, QueryKeys.Wanted],
+        queryKey: [QueryKeys.Series],
+      });
+      void client.invalidateQueries({
+        queryKey: [QueryKeys.Movies],
       });
       void client.invalidateQueries({
-        queryKey: [QueryKeys.Movies, QueryKeys.Wanted],
+        queryKey: [QueryKeys.History],
       });
-      // Also invalidate translator jobs to show new jobs
       void client.invalidateQueries({
         queryKey: [QueryKeys.Translator],
       });
     },
   });
 }
+
+export function useSubtitleContent(
+  mediaType: string | undefined,
+  mediaId: number | undefined,
+  language: string | undefined,
+) {
+  return useQuery({
+    queryKey: [QueryKeys.Subtitles, "content", mediaType, mediaId, language],
+    queryFn: () => {
+      if (!mediaType || mediaId === undefined || !language) {
+        throw new Error("Missing parameters");
+      }
+      return api.subtitles.getContent(mediaType, mediaId, language);
+    },
+    enabled: !!mediaType && mediaId !== undefined && !!language,
+    staleTime: 5 * 60 * 1000, // 5 min, not Infinity - subtitle files can change
+  });
+}
diff --git a/frontend/src/apis/hooks/system.ts b/frontend/src/apis/hooks/system.ts
index 3229c141ff..49fb92aad2 100644
--- a/frontend/src/apis/hooks/system.ts
+++ b/frontend/src/apis/hooks/system.ts
@@ -274,7 +274,16 @@ export function useSystem() {
     mutationFn: (param: { username: string; password: string }) =>
       api.system.login(param.username, param.password),
 
-    onSuccess: () => {
+    onSuccess: (data) => {
+      if (
+        data &&
+        typeof data === "object" &&
+        "upgrade_token" in data &&
+        data.upgrade_token
+      ) {
+        // Store opaque token (not password) for upgrade prompt
+        sessionStorage.setItem("password_upgrade_token", data.upgrade_token);
+      }
       // TODO: Hard-coded value
       window.location.replace(Environment.baseUrl);
     },
diff --git a/frontend/src/apis/hooks/translator.ts b/frontend/src/apis/hooks/translator.ts
index cf6879458c..e8415c2abf 100644
--- a/frontend/src/apis/hooks/translator.ts
+++ b/frontend/src/apis/hooks/translator.ts
@@ -4,7 +4,13 @@ import client from "@/apis/raw/client";
 
 export interface TranslatorJob {
   jobId: string;
-  status: "queued" | "processing" | "completed" | "failed" | "cancelled";
+  status:
+    | "queued"
+    | "processing"
+    | "completed"
+    | "partial"
+    | "failed"
+    | "cancelled";
   progress: number;
   message?: string;
   createdAt: string;
@@ -14,6 +20,21 @@ export interface TranslatorJob {
   sourceLanguage?: string;
   targetLanguage?: string;
   filename?: string;
+  title?: string;
+  mediaType?: string;
+  model?: string;
+  jobName?: string;
+  totalLines?: number;
+  completedLines?: number;
+  totalBatches?: number;
+  completedBatches?: number;
+  tokensUsed?: number;
+  totalCost?: number;
+  elapsedSeconds?: number;
+  result?: {
+    model_used?: string;
+    tokens_used?: number;
+  };
 }
 
 export interface TranslatorStatus {
@@ -32,6 +53,10 @@ export interface TranslatorStatus {
     failed: number;
     total: number;
   };
+  bazarr_queue?: {
+    pending: number;
+    running: number;
+  };
 }
 
 export interface TranslatorJobsResponse {
@@ -152,3 +177,36 @@ export function useTranslatorModels(enabled = true) {
     throwOnError: false,
   });
 }
+
+export interface TranslatorTestResponse {
+  encryption?: {
+    status: string;
+    message: string;
+  } | null;
+  apiKey?: {
+    status: string;
+    label: string;
+    limitRemaining: number;
+    usage: number;
+    isFreeTier: boolean;
+  } | null;
+  error?: string;
+}
+
+export interface TranslatorTestParams {
+  serviceUrl?: string;
+  apiKey?: string;
+  encryptionKey?: string;
+}
+
+export function useTestTranslator() {
+  return useMutation({
+    mutationFn: async (params?: TranslatorTestParams) => {
+      const response = await client.axios.post<TranslatorTestResponse>(
+        "/translator/test",
+        params,
+      );
+      return response.data;
+    },
+  });
+}
diff --git a/frontend/src/apis/raw/base.ts b/frontend/src/apis/raw/base.ts
index 16f7bd5f32..07e660675b 100644
--- a/frontend/src/apis/raw/base.ts
+++ b/frontend/src/apis/raw/base.ts
@@ -49,7 +49,7 @@ class BaseApi {
 
   protected postRaw<T = void>(
     path: string,
-    data?: any,
+    data?: unknown,
     params?: LooseObject,
   ): Promise<AxiosResponse<T>> {
     return client.axios.post(this.prefix + path, data, { params });
diff --git a/frontend/src/apis/raw/client.ts b/frontend/src/apis/raw/client.ts
index f3c2f53a37..ae1d48cca1 100644
--- a/frontend/src/apis/raw/client.ts
+++ b/frontend/src/apis/raw/client.ts
@@ -9,9 +9,12 @@ import { setAuthenticated } from "@/utilities/event";
 function GetErrorMessage(data: unknown, defaultMsg = "Unknown error"): string {
   if (typeof data === "string") {
     return data;
-  } else {
-    return defaultMsg;
+  } else if (typeof data === "object" && data !== null) {
+    const obj = data as Record<string, unknown>;
+    if (typeof obj.error === "string") return obj.error;
+    if (typeof obj.message === "string") return obj.message;
   }
+  return defaultMsg;
 }
 
 class BazarrClient {
diff --git a/frontend/src/apis/raw/plex.ts b/frontend/src/apis/raw/plex.ts
index 4318cf5972..41950cea25 100644
--- a/frontend/src/apis/raw/plex.ts
+++ b/frontend/src/apis/raw/plex.ts
@@ -11,10 +11,10 @@ class NewPlexApi extends BaseApi {
     return response.data;
   }
 
-  async checkPin(pinId: string) {
-    // TODO: Can this be replaced with params instead of passing a variable in the path?
+  async checkPin(pinId: string, state?: string) {
     const response = await this.get<DataWrapper<Plex.PinCheckResult>>(
       `/oauth/pin/${pinId}/check`,
+      state ? { state } : undefined,
     );
 
     return response.data;
diff --git a/frontend/src/apis/raw/subtitles.ts b/frontend/src/apis/raw/subtitles.ts
index a126ecc8a7..1594c43ef1 100644
--- a/frontend/src/apis/raw/subtitles.ts
+++ b/frontend/src/apis/raw/subtitles.ts
@@ -1,18 +1,70 @@
 import BaseApi from "./base";
+import client from "./client";
 
-export interface BatchTranslateItem {
-  type: "episode" | "movie";
+export interface SubtitleContentResponse {
+  content: string;
+  encoding: string;
+  format: string;
+  language: string;
+  size: number;
+  lastModified: number;
+  mediaTitle?: string;
+  mediaId?: number;
+  episodeTitle?: string;
+}
+
+export type BatchAction =
+  | "sync"
+  | "translate"
+  | "OCR_fixes"
+  | "common"
+  | "remove_HI"
+  | "remove_tags"
+  | "fix_uppercase"
+  | "reverse_rtl"
+  | "scan-disk"
+  | "search-missing"
+  | "upgrade";
+
+export interface BatchItem {
+  type: "episode" | "movie" | "series";
   sonarrSeriesId?: number;
   sonarrEpisodeId?: number;
   radarrId?: number;
-  sourceLanguage: string;
-  targetLanguage: string;
-  subtitlePath?: string;
-  forced?: boolean;
-  hi?: boolean;
 }
 
-export interface BatchTranslateResponse {
+export interface BatchOptions {
+  maxOffsetSeconds?: number;
+  noFixFramerate?: boolean;
+  gss?: boolean;
+  forceResync?: boolean;
+  fromLang?: string;
+  toLang?: string;
+}
+
+/* eslint-disable camelcase -- backend API contract */
+interface BatchPayload {
+  max_offset_seconds?: number;
+  no_fix_framerate?: boolean;
+  gss?: boolean;
+  force_resync?: boolean;
+  from_lang?: string;
+  to_lang?: string;
+}
+
+function toBatchPayload(options: BatchOptions): BatchPayload {
+  return {
+    max_offset_seconds: options.maxOffsetSeconds,
+    no_fix_framerate: options.noFixFramerate,
+    gss: options.gss,
+    force_resync: options.forceResync,
+    from_lang: options.fromLang,
+    to_lang: options.toLang,
+  };
+}
+/* eslint-enable camelcase */
+
+export interface BatchResponse {
   queued: number;
   skipped: number;
   errors: string[];
@@ -56,12 +108,39 @@ class SubtitlesApi extends BaseApi {
     await this.patch("", form, { action });
   }
 
-  async batchTranslate(
-    items: BatchTranslateItem[],
-  ): Promise<BatchTranslateResponse> {
-    const response = await this.postRaw<BatchTranslateResponse>(
-      "/translate/batch",
-      { items },
+  async batch(
+    items: BatchItem[],
+    action: BatchAction,
+    options?: BatchOptions,
+  ): Promise<BatchResponse> {
+    const response = await this.postRaw<BatchResponse>("/batch", {
+      items,
+      action,
+      options: options ? toBatchPayload(options) : undefined,
+    });
+    return response.data;
+  }
+
+  async upgradable(): Promise<{ movies: number[]; series: number[] }> {
+    const response = await this.get<{ movies: number[]; series: number[] }>(
+      "/upgradable",
+    );
+    return response;
+  }
+
+  async getContent(mediaType: string, mediaId: number, language: string) {
+    const base = mediaType === "episode" ? "episodes" : "movies";
+    const url = `/${base}/${mediaId}/subtitles/${encodeURIComponent(language)}/content`;
+    const response = await client.axios.get<SubtitleContentResponse>(url);
+    return response.data;
+  }
+
+  async contents(subtitlePath: string) {
+    const response = await this.get<DataWrapper<SubtitleContents.Line[]>>(
+      "/contents",
+      {
+        subtitlePath,
+      },
     );
     return response.data;
   }
diff --git a/frontend/src/apis/raw/system.ts b/frontend/src/apis/raw/system.ts
index a53eb2edeb..24ba7f49d3 100644
--- a/frontend/src/apis/raw/system.ts
+++ b/frontend/src/apis/raw/system.ts
@@ -10,7 +10,19 @@ class SystemApi extends BaseApi {
   }
 
   async login(username: string, password: string) {
-    await this.post("/account", { username, password }, { action: "login" });
+    const response = await this.post<{
+      upgrade_hash?: boolean;
+      upgrade_token?: string;
+    }>("/account", { username, password }, { action: "login" });
+    return response.data;
+  }
+
+  async upgradePasswordHash(upgradeToken: string) {
+    await this.post(
+      "/account",
+      { password: upgradeToken },
+      { action: "upgrade_hash" },
+    );
   }
 
   async logout() {
diff --git a/frontend/src/assets/_bazarr.scss b/frontend/src/assets/_bazarr.scss
index 55587c78d7..a6e8ca052c 100644
--- a/frontend/src/assets/_bazarr.scss
+++ b/frontend/src/assets/_bazarr.scss
@@ -1,53 +1,17 @@
 @use "mantine" as *;
 
-$color-brand-0: #f8f0fc;
-$color-brand-1: #f3d9fa;
-$color-brand-2: #eebefa;
-$color-brand-3: #e599f7;
-$color-brand-4: #da77f2;
-$color-brand-5: #cc5de8;
-$color-brand-6: #be4bdb;
-$color-brand-7: #ae3ec9;
-$color-brand-8: #9c36b5;
-$color-brand-9: #862e9c;
-
-// Based on Mantine Cyan
-$color-highlight-0: #e3fafc;
-$color-highlight-1: #c5f6fa;
-$color-highlight-2: #99e9f2;
-$color-highlight-3: #66d9e8;
-$color-highlight-4: #3bc9db;
-$color-highlight-5: #22b8cf;
-$color-highlight-6: #15aabf;
-$color-highlight-7: #1098ad;
-$color-highlight-8: #0c8599;
-$color-highlight-9: #0b7285;
-
-// Based on Mantine Yellow
-$color-warning-0: #fff9db;
-$color-warning-1: #fff3bf;
-$color-warning-2: #ffec99;
-$color-warning-3: #ffe066;
-$color-warning-4: #ffd43b;
-$color-warning-5: #fcc419;
-$color-warning-6: #fab005;
-$color-warning-7: #f59f00;
-$color-warning-8: #f08c00;
-$color-warning-9: #e67700;
-
-// Based on Mantine Gray
-$color-disabled-0: #f8f9fa;
-$color-disabled-1: #f1f3f5;
-$color-disabled-2: #e9ecef;
-$color-disabled-3: #dee2e6;
-$color-disabled-4: #ced4da;
-$color-disabled-5: #adb5bd;
-$color-disabled-6: #868e96;
-$color-disabled-7: #495057;
-$color-disabled-8: #343a40;
-$color-disabled-9: #212529;
-
-$header-height: 64px;
+$color-brand-0: #fff8e1;
+$color-brand-1: #ffecb3;
+$color-brand-2: #ffe082;
+$color-brand-3: #ffd54f;
+$color-brand-4: #ffca28;
+$color-brand-5: #e68a00;
+$color-brand-6: #b36b00;
+$color-brand-7: #995c00;
+$color-brand-8: #7a4900;
+$color-brand-9: #5c3700;
+
+$header-height: 76px;
 
 :global {
   .table-long-break {
@@ -82,6 +46,338 @@ $header-height: 64px;
 
 :root {
   @include dark {
-    --mantine-color-body: var(--mantine-color-dark-8);
+    --mantine-color-body: var(--mantine-color-dark-9);
+  }
+}
+
+// Grain texture overlay (z-index above content, pointer-events:none)
+body::before {
+  content: "";
+  position: fixed;
+  inset: 0;
+  z-index: 10000;
+  pointer-events: none;
+  opacity: 0.07;
+  background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.7' numOctaves='3' stitchTiles='stitch'/%3E%3CfeColorMatrix type='saturate' values='0'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E");
+  background-repeat: repeat;
+  background-size: 256px 256px;
+
+  @include light {
+    opacity: 0.035;
+    mix-blend-mode: multiply;
+  }
+}
+
+// Ambient atmospheric glow (z-index above content backgrounds, below grain)
+body::after {
+  content: "";
+  position: fixed;
+  inset: 0;
+  z-index: 9999;
+  pointer-events: none;
+  background:
+    radial-gradient(
+      ellipse at 15% 10%,
+      rgba(230, 138, 0, 0.12) 0%,
+      transparent 50%
+    ),
+    radial-gradient(
+      ellipse at 85% 90%,
+      rgba(26, 138, 138, 0.08) 0%,
+      transparent 50%
+    ),
+    radial-gradient(
+      ellipse at 50% 50%,
+      rgba(140, 80, 200, 0.05) 0%,
+      transparent 60%
+    );
+
+  @include light {
+    display: none;
+  }
+}
+
+#root {
+  position: relative;
+  z-index: 1;
+}
+
+/* Shared tokens (scheme-independent) */
+:root {
+  /* Border radius scale */
+  --bz-radius-xs: 6px;
+  --bz-radius-sm: 8px;
+  --bz-radius-md: 10px;
+  --bz-radius-lg: 14px;
+  --bz-radius-xl: 20px;
+
+  /* Animation tokens */
+  --bz-ease-standard: cubic-bezier(0.2, 0, 0, 1);
+  --bz-ease-enter: cubic-bezier(0, 0, 0.2, 1);
+  --bz-ease-exit: cubic-bezier(0.4, 0, 1, 1);
+  --bz-duration-fast: 120ms;
+  --bz-duration-normal: 150ms;
+  --bz-duration-slow: 250ms;
+  --bz-duration-card: 300ms;
+  --bz-duration-page: 200ms;
+
+  /* Stagger tokens */
+  --bz-stagger-delay: 40ms;
+}
+
+:root[data-mantine-color-scheme="dark"] {
+  --bz-surface-ground: #0c0b1a;
+  --bz-surface-base: #121125;
+  --bz-surface-raised: #1a1a2e;
+  --bz-surface-card: #22223a;
+  --bz-surface-card-hover: #2a2a45;
+  --bz-surface-overlay: #2a2a45;
+  --bz-stat-processing: #ffca28;
+  --bz-stat-queued: #4dabf7;
+  --bz-stat-completed: #69db7c;
+  --bz-stat-failed: #ff6b6b;
+  --bz-shadow-float: 0 4px 12px rgba(0, 0, 0, 0.5);
+
+  /* Text hierarchy */
+  --bz-text-primary: #e8e8f0;
+  --bz-text-secondary: #b8b8cc;
+  --bz-text-tertiary: #8e8fa3;
+  --bz-text-disabled: #6c6d85;
+
+  /* Border opacity scale */
+  --bz-border-divider: rgba(255, 255, 255, 0.04);
+  --bz-border-card: rgba(255, 255, 255, 0.05);
+  --bz-border-interactive: rgba(255, 255, 255, 0.06);
+  --bz-border-hover: rgba(255, 255, 255, 0.07);
+
+  /* Hover tokens */
+  --bz-hover-bg: rgba(255, 255, 255, 0.04);
+  --bz-hover-bg-emphasis: rgba(255, 255, 255, 0.07);
+}
+
+:root[data-mantine-color-scheme="light"] {
+  --bz-text-primary: #12121f;
+  --bz-text-secondary: #343a40;
+  --bz-text-tertiary: #656d76;
+  --bz-text-disabled: #909aa5;
+
+  --bz-border-divider: rgba(0, 0, 0, 0.06);
+  --bz-border-card: rgba(0, 0, 0, 0.08);
+  --bz-border-interactive: rgba(0, 0, 0, 0.1);
+  --bz-border-hover: rgba(0, 0, 0, 0.12);
+
+  --bz-surface-ground: #f8f9fa;
+  --bz-surface-base: #ffffff;
+  --bz-surface-raised: #f1f3f5;
+  --bz-surface-card: #ffffff;
+  --bz-surface-card-hover: #f8f9fa;
+  --bz-surface-overlay: #ffffff;
+  --bz-stat-processing: #e67700;
+  --bz-stat-queued: #1971c2;
+  --bz-stat-completed: #2b8a3e;
+  --bz-stat-failed: #e03131;
+  --bz-shadow-float: 0 4px 12px rgba(0, 0, 0, 0.1);
+
+  --bz-hover-bg: rgba(0, 0, 0, 0.04);
+  --bz-hover-bg-emphasis: rgba(0, 0, 0, 0.07);
+}
+
+// Floaty main content area
+:global {
+  .mantine-AppShell-main {
+    background: var(--bz-surface-base);
+    margin: 0 8px 8px 0;
+    border-radius: var(--bz-radius-xl);
+    border: 1px solid var(--bz-border-card);
+  }
+
+  .mantine-AppShell-navbar {
+    background: transparent;
+    border-right: none;
+  }
+
+  .mantine-AppShell-header {
+    background: transparent !important;
+    border: none !important;
+    padding: 8px !important;
+  }
+
+  .mantine-AppShell-root {
+    background: var(--bz-surface-ground);
+  }
+}
+
+// Global Paper/Card styling
+:global {
+  .mantine-Paper-root {
+    border-radius: var(--bz-radius-lg);
+
+    &[data-with-border] {
+      border-color: var(--bz-border-card);
+    }
+  }
+
+  .mantine-Alert-root {
+    border-radius: var(--bz-radius-lg);
+  }
+
+  .mantine-Card-root {
+    background: var(--bz-surface-card);
+    border-radius: var(--bz-radius-lg);
+    border: 1px solid var(--bz-border-card);
+    box-shadow: none;
+    transition:
+      background var(--bz-duration-normal) var(--bz-ease-standard),
+      border-color var(--bz-duration-normal) var(--bz-ease-standard);
+
+    &:hover {
+      border-color: var(--bz-border-hover);
+    }
+  }
+
+  // Tabs styling
+  .mantine-Tabs-tab {
+    transition:
+      background var(--bz-duration-normal) var(--bz-ease-standard),
+      color var(--bz-duration-normal) var(--bz-ease-standard),
+      border-color var(--bz-duration-normal) var(--bz-ease-standard);
+  }
+
+  // Switch styling
+  .mantine-Switch-track {
+    transition:
+      background-color var(--bz-duration-normal) var(--bz-ease-standard),
+      border-color var(--bz-duration-normal) var(--bz-ease-standard);
+  }
+
+  // Checkbox styling
+  .mantine-Checkbox-input {
+    border-radius: var(--bz-radius-xs);
+    transition:
+      background-color var(--bz-duration-normal) var(--bz-ease-standard),
+      border-color var(--bz-duration-normal) var(--bz-ease-standard);
+  }
+
+  // Anchor/link styling
+  .mantine-Anchor-root {
+    transition: color var(--bz-duration-normal) var(--bz-ease-standard);
+  }
+
+  // Tooltip styling
+  .mantine-Tooltip-tooltip {
+    background: var(--bz-surface-overlay);
+    border: 1px solid var(--bz-border-card);
+    border-radius: var(--bz-radius-sm);
+    color: var(--bz-text-primary);
+    box-shadow: var(--bz-shadow-float);
+  }
+
+  // Popover styling
+  .mantine-Popover-dropdown {
+    background: var(--bz-surface-overlay);
+    border: 1px solid var(--bz-border-card);
+    border-radius: var(--bz-radius-lg);
+    box-shadow: var(--bz-shadow-float);
+  }
+}
+
+// Global dropdown/menu/combobox styling
+:global {
+  .mantine-Menu-dropdown,
+  .mantine-Combobox-dropdown,
+  .mantine-Select-dropdown,
+  .mantine-MultiSelect-dropdown,
+  .mantine-Autocomplete-dropdown {
+    background: var(--bz-surface-overlay);
+    border: 1px solid var(--bz-border-card);
+    border-radius: var(--bz-radius-lg);
+    box-shadow: var(--bz-shadow-float);
+  }
+
+  .mantine-Menu-item {
+    border-radius: var(--bz-radius-sm);
+    color: var(--bz-text-primary);
+    transition: background var(--bz-duration-normal) var(--bz-ease-standard);
+
+    &:hover,
+    &[data-hovered] {
+      background: var(--bz-hover-bg);
+    }
+  }
+
+  .mantine-Combobox-option {
+    border-radius: var(--bz-radius-sm);
+    transition: background var(--bz-duration-normal) var(--bz-ease-standard);
+
+    &:hover,
+    &[data-combobox-selected],
+    &[data-hovered] {
+      background: var(--bz-hover-bg);
+    }
+  }
+
+  .mantine-Menu-label {
+    color: var(--bz-text-disabled);
+  }
+
+  .mantine-Menu-divider {
+    border-color: var(--bz-border-divider);
+  }
+}
+
+// Card reveal entry animation
+@keyframes bz-card-reveal {
+  from {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+// Apply card reveal to Mantine Cards and bordered Papers
+:global {
+  .mantine-Card-root {
+    animation: bz-card-reveal var(--bz-duration-card) var(--bz-ease-enter) both;
+  }
+
+  // Stagger cards inside Stack/SimpleGrid containers
+  .mantine-Stack-root,
+  .mantine-SimpleGrid-root {
+    > .mantine-Card-root,
+    > .mantine-Paper-root[data-with-border] {
+      animation: bz-card-reveal var(--bz-duration-card) var(--bz-ease-enter)
+        both;
+
+      @for $i from 1 through 6 {
+        &:nth-child(#{$i}) {
+          animation-delay: calc(#{$i - 1} * var(--bz-stagger-delay));
+        }
+      }
+
+      // Items beyond 6th appear without extra stagger
+      &:nth-child(n + 7) {
+        animation-delay: calc(5 * var(--bz-stagger-delay));
+      }
+    }
+  }
+}
+
+// Reduced motion support
+@media (prefers-reduced-motion: reduce) {
+  *,
+  *::before,
+  *::after {
+    animation-duration: 0.01ms !important;
+    animation-delay: 0ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+    scroll-behavior: auto !important;
+  }
+
+  body::after {
+    display: none !important;
   }
 }
diff --git a/frontend/src/assets/_variables.module.scss b/frontend/src/assets/_variables.module.scss
index c707980bfe..c3683f5ab6 100644
--- a/frontend/src/assets/_variables.module.scss
+++ b/frontend/src/assets/_variables.module.scss
@@ -1,5 +1,7 @@
 $navbar-width: 200;
 
+$surface-ground: #0c0b1a;
+
 :export {
   colorBrand0: bazarr.$color-brand-0;
   colorBrand1: bazarr.$color-brand-1;
@@ -15,4 +17,6 @@ $navbar-width: 200;
   headerHeight: bazarr.$header-height;
 
   navBarWidth: $navbar-width;
+
+  surfaceGround: $surface-ground;
 }
diff --git a/frontend/src/assets/action_icon.module.scss b/frontend/src/assets/action_icon.module.scss
index 3ff702f35b..79d71034d1 100644
--- a/frontend/src/assets/action_icon.module.scss
+++ b/frontend/src/assets/action_icon.module.scss
@@ -1,16 +1,18 @@
 @layer mantine {
   .root {
     --ai-bg: transparent;
+    border-radius: var(--bz-radius-sm);
+    transition:
+      background var(--bz-duration-normal) var(--bz-ease-standard),
+      color var(--bz-duration-normal) var(--bz-ease-standard);
 
-    @include mantine.light {
-      color: var(--mantine-color-dark-2);
-      --ai-hover: var(--mantine-color-gray-1);
-      --ai-hover-color: var(--mantine-color-gray-1);
-    }
+    color: var(--bz-text-secondary);
+    --ai-hover: var(--bz-hover-bg);
+    --ai-hover-color: var(--bz-text-primary);
 
-    @include mantine.dark {
-      color: var(--mantine-color-dark-0);
-      --ai-hover: var(--mantine-color-gray-8);
+    &[data-variant="gradient"],
+    &[data-variant="filled"] {
+      color: #fff;
     }
   }
 }
diff --git a/frontend/src/assets/badge.module.scss b/frontend/src/assets/badge.module.scss
index e0bd86a998..07c37e5a3e 100644
--- a/frontend/src/assets/badge.module.scss
+++ b/frontend/src/assets/badge.module.scss
@@ -1,51 +1,188 @@
-@use "sass:color";
-
 @layer mantine {
   .root {
-    background-color: color.adjust(bazarr.$color-brand-6, $alpha: -0.8);
+    border-radius: var(--bz-radius-sm);
+    font-size: 10px;
+    font-weight: 600;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    padding: 2px 8px;
+    transition:
+      background var(--bz-duration-fast) var(--bz-ease-standard),
+      border-color var(--bz-duration-fast) var(--bz-ease-standard);
 
-    &[data-variant="warning"] {
-      color: color.adjust(bazarr.$color-warning-2, $lightness: 80%);
-      background-color: color.adjust(bazarr.$color-warning-6, $alpha: -0.8);
+    // Default variant (ghost): neutral for audio tracks and general use
+    background-color: rgba(255, 255, 255, 0.05);
+    color: #a9aabb;
+    border: 1px solid rgba(255, 255, 255, 0.07);
+
+    &:hover {
+      background-color: rgba(255, 255, 255, 0.1);
+      border-color: rgba(255, 255, 255, 0.12);
     }
 
+    // Highlight variant (green): available subtitles
     &[data-variant="highlight"] {
-      color: color.adjust(bazarr.$color-highlight-2, $lightness: 100%);
-      background-color: color.adjust(bazarr.$color-highlight-5, $alpha: -0.8);
+      background: rgba(105, 219, 124, 0.12);
+      color: #69db7c;
+      border: 1px solid rgba(105, 219, 124, 0.18);
+
+      &:hover {
+        background: rgba(105, 219, 124, 0.17);
+        border-color: rgba(105, 219, 124, 0.23);
+      }
+    }
+
+    // Warning variant (amber): upgradeable subtitles
+    &[data-variant="warning"] {
+      background: rgba(230, 138, 0, 0.12);
+      color: #ffd54f;
+      border: 1px solid rgba(230, 138, 0, 0.18);
+
+      &:hover {
+        background: rgba(230, 138, 0, 0.17);
+        border-color: rgba(230, 138, 0, 0.23);
+      }
     }
 
+    // Disabled variant (ghost dim): embedded/disabled subtitles
     &[data-variant="disabled"] {
-      color: color.adjust(bazarr.$color-disabled-0, $lightness: 100%);
-      background-color: color.adjust(bazarr.$color-disabled-7, $alpha: -0.8);
+      background: rgba(255, 255, 255, 0.03);
+      color: #6c6d85;
+      border: 1px solid rgba(255, 255, 255, 0.04);
+
+      &:hover {
+        background: rgba(255, 255, 255, 0.06);
+        border-color: rgba(255, 255, 255, 0.08);
+      }
+    }
+
+    // HI subs variant (warm): hearing impaired subtitles
+    &[data-variant="hi"] {
+      background: rgba(179, 107, 0, 0.1);
+      color: #ffd54f;
+      border: 1px solid rgba(179, 107, 0, 0.18);
+
+      &:hover {
+        background: rgba(179, 107, 0, 0.15);
+        border-color: rgba(179, 107, 0, 0.23);
+      }
+    }
+
+    // Missing variant: missing subtitles
+    &[data-variant="missing"] {
+      background: rgba(255, 107, 107, 0.06);
+      color: #ff8787;
+      border: 1px dashed rgba(255, 107, 107, 0.4);
+
+      &:hover {
+        background: rgba(255, 107, 107, 0.11);
+        border-color: rgba(255, 107, 107, 0.5);
+      }
     }
 
-    &[data-variant="light"] {
-      color: var(--mantine-color-dark-0);
-      background-color: color.adjust(bazarr.$color-disabled-9, $alpha: -0.8);
+    // Preserve passthrough for Mantine built-in variants used elsewhere
+    &[data-variant="light"],
+    &[data-variant="outline"] {
+      color: unset;
+      background: unset;
+      background-color: unset;
+      border: unset;
     }
 
+    &[data-variant="gradient"] {
+      color: #fff;
+      border: unset;
+    }
+
+    &[data-variant="transparent"] {
+      color: unset;
+      background: unset;
+      border: unset;
+    }
+
+    // Light mode overrides
     @include mantine.light {
-      color: bazarr.$color-brand-6;
-      background-color: color.adjust(bazarr.$color-brand-3, $alpha: -0.8);
+      background-color: rgba(0, 0, 0, 0.05);
+      color: #495057;
+      border: 1px solid rgba(0, 0, 0, 0.08);
+
+      &:hover {
+        background-color: rgba(0, 0, 0, 0.08);
+        border-color: rgba(0, 0, 0, 0.12);
+      }
 
       &[data-variant="warning"] {
-        color: color.adjust(bazarr.$color-warning-7, $lightness: -100%);
-        background-color: color.adjust(bazarr.$color-warning-6, $alpha: -0.8);
+        background: rgba(230, 138, 0, 0.1);
+        color: #995c00;
+        border: 1px solid rgba(230, 138, 0, 0.2);
+
+        &:hover {
+          background: rgba(230, 138, 0, 0.15);
+          border-color: rgba(230, 138, 0, 0.28);
+        }
       }
 
       &[data-variant="disabled"] {
-        color: color.adjust(bazarr.$color-disabled-6, $lightness: -100%);
-        background-color: color.adjust(bazarr.$color-disabled-4, $alpha: -0.8);
+        background: rgba(0, 0, 0, 0.03);
+        color: #adb5bd;
+        border: 1px solid rgba(0, 0, 0, 0.06);
+
+        &:hover {
+          background: rgba(0, 0, 0, 0.05);
+          border-color: rgba(0, 0, 0, 0.1);
+        }
       }
 
       &[data-variant="highlight"] {
-        color: color.adjust(bazarr.$color-highlight-6, $lightness: -100%);
-        background-color: color.adjust(bazarr.$color-highlight-5, $alpha: -0.8);
+        background: rgba(105, 219, 124, 0.1);
+        color: #2b8a3e;
+        border: 1px solid rgba(105, 219, 124, 0.2);
+
+        &:hover {
+          background: rgba(105, 219, 124, 0.15);
+          border-color: rgba(105, 219, 124, 0.28);
+        }
+      }
+
+      &[data-variant="missing"] {
+        background: rgba(255, 107, 107, 0.06);
+        color: #e03131;
+        border: 1px dashed rgba(255, 107, 107, 0.4);
+
+        &:hover {
+          background: rgba(255, 107, 107, 0.1);
+          border-color: rgba(255, 107, 107, 0.5);
+        }
+      }
+
+      &[data-variant="hi"] {
+        background: rgba(179, 107, 0, 0.1);
+        color: #7a4900;
+        border: 1px solid rgba(179, 107, 0, 0.2);
+
+        &:hover {
+          background: rgba(179, 107, 0, 0.15);
+          border-color: rgba(179, 107, 0, 0.28);
+        }
+      }
+
+      &[data-variant="light"],
+      &[data-variant="outline"] {
+        color: unset;
+        background: unset;
+        border: unset;
+      }
+
+      &[data-variant="gradient"] {
+        color: #fff;
+        background-color: transparent;
+        border: none;
       }
 
-      &[data-variant="light"] {
-        color: var(--mantine-color-black);
-        background-color: var(--mantine-color-gray-5);
+      &[data-variant="transparent"] {
+        color: unset;
+        background: unset;
+        border: unset;
       }
     }
   }
diff --git a/frontend/src/assets/button.module.scss b/frontend/src/assets/button.module.scss
index 3ac8bca91f..14b9a3a879 100644
--- a/frontend/src/assets/button.module.scss
+++ b/frontend/src/assets/button.module.scss
@@ -1,7 +1,16 @@
 @layer mantine {
   .root {
-    @include mantine.dark {
-      color: var(--mantine-color-dark-0);
+    border-radius: var(--bz-radius-sm);
+    transition:
+      background var(--bz-duration-normal) var(--bz-ease-standard),
+      transform var(--bz-duration-normal) var(--bz-ease-standard),
+      box-shadow var(--bz-duration-normal) var(--bz-ease-standard);
+
+    color: var(--bz-text-primary);
+
+    &[data-variant="filled"],
+    &[data-variant="gradient"] {
+      color: #fff;
     }
 
     &[data-variant="danger"] {
@@ -11,8 +20,10 @@
   }
 
   .root:disabled {
-    @include mantine.dark {
-      color: var(--mantine-color-dark-9);
+    color: var(--bz-text-disabled);
+
+    @include mantine.light {
+      color: var(--bz-text-tertiary);
     }
   }
 }
diff --git a/frontend/src/assets/input.module.scss b/frontend/src/assets/input.module.scss
new file mode 100644
index 0000000000..7d29daebcf
--- /dev/null
+++ b/frontend/src/assets/input.module.scss
@@ -0,0 +1,24 @@
+@layer mantine {
+  .input {
+    border-radius: var(--bz-radius-md);
+    background: var(--bz-hover-bg);
+    border: 1px solid var(--bz-border-interactive);
+    transition:
+      background var(--bz-duration-normal) var(--bz-ease-standard),
+      border-color var(--bz-duration-normal) var(--bz-ease-standard);
+
+    &::placeholder {
+      color: var(--bz-text-tertiary);
+    }
+
+    &:hover {
+      background: var(--bz-hover-bg-emphasis);
+    }
+
+    &:focus,
+    &:focus-within {
+      background: var(--bz-hover-bg-emphasis);
+      border-color: var(--bz-border-hover);
+    }
+  }
+}
diff --git a/frontend/src/assets/pagination.module.scss b/frontend/src/assets/pagination.module.scss
index 2b66d75103..f5c9e924bb 100644
--- a/frontend/src/assets/pagination.module.scss
+++ b/frontend/src/assets/pagination.module.scss
@@ -1,3 +1,15 @@
-.control {
-  --pagination-active-bg: var(--mantine-color-brand-filled);
+@layer mantine {
+  .control {
+    --pagination-active-bg: var(--mantine-color-brand-filled);
+    border-radius: var(--bz-radius-xs);
+    transition:
+      background var(--bz-duration-normal) var(--bz-ease-standard),
+      border-color var(--bz-duration-normal) var(--bz-ease-standard);
+
+    color: var(--bz-text-secondary);
+
+    &:hover:not([data-active]) {
+      background: var(--bz-hover-bg);
+    }
+  }
 }
diff --git a/frontend/src/assets/progress.module.scss b/frontend/src/assets/progress.module.scss
new file mode 100644
index 0000000000..3b99a26dd0
--- /dev/null
+++ b/frontend/src/assets/progress.module.scss
@@ -0,0 +1,9 @@
+$noise-svg: url("data:image/svg+xml,%3Csvg viewBox='0 0 200 200' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.65' numOctaves='3' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)' opacity='0.15'/%3E%3C/svg%3E");
+
+@layer mantine {
+  .section {
+    background-image: $noise-svg !important;
+    background-size: 128px 128px !important;
+    background-repeat: repeat !important;
+  }
+}
diff --git a/frontend/src/components/StateIcon.tsx b/frontend/src/components/StateIcon.tsx
index 23bb2d507d..4e164729fd 100644
--- a/frontend/src/components/StateIcon.tsx
+++ b/frontend/src/components/StateIcon.tsx
@@ -73,7 +73,7 @@ const StateIcon: FunctionComponent<StateIconProps> = ({
         </Text>
       </Popover.Target>
       <Popover.Dropdown>
-        <Text size={titleSize} fw="bold" c="white" ta="center">
+        <Text size={titleSize} fw="bold" c="var(--bz-text-primary)" ta="center">
           Scoring Criteria
         </Text>
         <Group justify="left" gap="xl" wrap="nowrap" grow>
diff --git a/frontend/src/components/SubtitleToolsMenu.tsx b/frontend/src/components/SubtitleToolsMenu.tsx
index 5f0fbc3c30..c92e073dbf 100644
--- a/frontend/src/components/SubtitleToolsMenu.tsx
+++ b/frontend/src/components/SubtitleToolsMenu.tsx
@@ -1,10 +1,12 @@
 import { FunctionComponent, ReactElement, useCallback, useMemo } from "react";
 import { Divider, List, Menu, MenuProps, ScrollArea } from "@mantine/core";
 import {
+  faAlignJustify,
   faClock,
   faCode,
   faDeaf,
   faExchangeAlt,
+  faEye,
   faFaceGrinStars,
   faFilm,
   faImage,
@@ -26,7 +28,9 @@ import { TranslationModal } from "@/components/forms/TranslationForm";
 import { useModals } from "@/modules/modals";
 import { ModalComponent } from "@/modules/modals/WithModal";
 import { task } from "@/modules/task";
+import { toPython } from "@/utilities";
 import { SyncSubtitleModal } from "./forms/SyncSubtitleForm";
+import { TwoPointFitModal } from "./forms/TwoPointFit";
 
 export interface ToolOptions {
   key: string;
@@ -99,6 +103,12 @@ export function useTools() {
         name: "Adjust Times...",
         modal: TimeOffsetModal,
       },
+      {
+        key: "two_point_fit",
+        icon: faAlignJustify,
+        name: "Two-Point Fit...",
+        modal: TwoPointFitModal,
+      },
       {
         key: "translation",
         icon: faLanguage,
@@ -114,7 +124,12 @@ interface Props {
   selections: FormType.ModifySubtitle[];
   children?: ReactElement;
   menu?: Omit<MenuProps, "children">;
-  onAction?: (action: "delete" | "search") => void;
+  onAction?: (action: "delete" | "search" | "view") => void;
+  // For missing subtitle translation
+  missingLanguage?: Subtitle;
+  translationSources?: Subtitle[];
+  mediaId?: number;
+  mediaType?: "episode" | "movie";
 }
 
 const SubtitleToolsMenu: FunctionComponent<Props> = ({
@@ -122,6 +137,10 @@ const SubtitleToolsMenu: FunctionComponent<Props> = ({
   children,
   menu,
   onAction,
+  missingLanguage,
+  translationSources,
+  mediaId,
+  mediaType,
 }) => {
   const { mutateAsync } = useSubtitleAction();
 
@@ -146,30 +165,83 @@ const SubtitleToolsMenu: FunctionComponent<Props> = ({
   const modals = useModals();
 
   const disabledTools = selections.length === 0;
+  const isMissing = !!missingLanguage;
+  const hasSources = (translationSources ?? []).length > 0;
 
   return (
     <Menu withArrow withinPortal position="left-end" {...menu}>
       <Menu.Target>{children}</Menu.Target>
       <Menu.Dropdown>
         <Menu.Label>Tools</Menu.Label>
-        {tools.map((tool) => (
+        {tools.map((tool) => {
+          // "Translate" for missing subs: show as submenu with source options
+          if (tool.key === "translation" && isMissing) {
+            return null; // handled below in Actions
+          }
+
+          return (
+            <Menu.Item
+              key={tool.key}
+              disabled={disabledTools}
+              leftSection={<FontAwesomeIcon icon={tool.icon}></FontAwesomeIcon>}
+              onClick={() => {
+                if (tool.modal) {
+                  modals.openContextModal(tool.modal, { selections });
+                } else {
+                  process(tool.key, tool.name);
+                }
+              }}
+            >
+              {tool.name}
+            </Menu.Item>
+          );
+        })}
+        <Divider></Divider>
+        <Menu.Label>Actions</Menu.Label>
+        {/* Translate from source โ€” for missing subtitles */}
+        {isMissing && hasSources && (
+          <>
+            {translationSources!.map((source) => (
+              <Menu.Item
+                key={`translate-${source.path}`}
+                leftSection={<FontAwesomeIcon icon={faLanguage} />}
+                onClick={async () => {
+                  await mutateAsync({
+                    action: "translate",
+                    form: {
+                      id: mediaId!,
+                      type: mediaType!,
+                      language: missingLanguage.code2,
+                      path: source.path!,
+                      forced: toPython(missingLanguage.forced),
+                      hi: toPython(missingLanguage.hi),
+                    },
+                  });
+                }}
+              >
+                Translate from {source.name || source.code2}
+                {source.hi ? " (HI)" : ""}
+              </Menu.Item>
+            ))}
+          </>
+        )}
+        {isMissing && !hasSources && (
           <Menu.Item
-            key={tool.key}
-            disabled={disabledTools}
-            leftSection={<FontAwesomeIcon icon={tool.icon}></FontAwesomeIcon>}
-            onClick={() => {
-              if (tool.modal) {
-                modals.openContextModal(tool.modal, { selections });
-              } else {
-                process(tool.key, tool.name);
-              }
-            }}
+            disabled
+            leftSection={<FontAwesomeIcon icon={faLanguage} />}
           >
-            {tool.name}
+            No source subtitles to translate from
           </Menu.Item>
-        ))}
-        <Divider></Divider>
-        <Menu.Label>Actions</Menu.Label>
+        )}
+        <Menu.Item
+          disabled={selections.length === 0 || onAction === undefined}
+          leftSection={<FontAwesomeIcon icon={faEye}></FontAwesomeIcon>}
+          onClick={() => {
+            onAction?.("view");
+          }}
+        >
+          View
+        </Menu.Item>
         <Menu.Item
           disabled={selections.length !== 0 || onAction === undefined}
           leftSection={<FontAwesomeIcon icon={faSearch}></FontAwesomeIcon>}
diff --git a/frontend/src/components/TranslatorStatus.module.css b/frontend/src/components/TranslatorStatus.module.css
new file mode 100644
index 0000000000..70d62bcbd3
--- /dev/null
+++ b/frontend/src/components/TranslatorStatus.module.css
@@ -0,0 +1,63 @@
+@keyframes heartbeat {
+  0%,
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+  14% {
+    opacity: 1;
+    transform: scale(1.15);
+  }
+  28% {
+    opacity: 1;
+    transform: scale(1);
+  }
+  42% {
+    opacity: 1;
+    transform: scale(1.1);
+  }
+  56% {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.promptConnected {
+  animation: heartbeat 1.5s ease-in-out infinite;
+  display: inline-block;
+}
+
+.statCard {
+  transition: var(--bz-transition-lift);
+  cursor: default;
+  border-left-width: 3px;
+  border-left-style: solid;
+}
+
+.statCard:hover {
+  transform: translateY(-2px);
+  background-color: var(--bz-surface-card-hover);
+}
+
+.spin {
+  animation: spin 1s linear infinite;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .promptConnected,
+  .spin {
+    animation: none;
+  }
+  .statCard:hover {
+    transform: none;
+  }
+}
diff --git a/frontend/src/components/TranslatorStatus.tsx b/frontend/src/components/TranslatorStatus.tsx
index bff899b218..44552d3c71 100644
--- a/frontend/src/components/TranslatorStatus.tsx
+++ b/frontend/src/components/TranslatorStatus.tsx
@@ -1,9 +1,7 @@
-import { FunctionComponent, useState, useCallback } from "react";
+import { FunctionComponent, useCallback, useState } from "react";
 import {
-  ActionIcon,
   Alert,
   Badge,
-  Box,
   Button,
   Card,
   Group,
@@ -17,22 +15,19 @@ import {
 } from "@mantine/core";
 import {
   faCheck,
-  faCircle,
   faClock,
   faExclamationTriangle,
   faRefresh,
   faSpinner,
   faTimes,
-  faTrash,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import {
   TranslatorJob,
   useTranslatorJobs,
   useTranslatorStatus,
-  useCancelTranslatorJob,
 } from "@/apis/hooks/translator";
-import { useSettingValue } from "@/pages/Settings/utilities/hooks";
+import classes from "./TranslatorStatus.module.css";
 
 interface StatusBadgeProps {
   status: TranslatorJob["status"];
@@ -43,6 +38,7 @@ const StatusBadge: FunctionComponent<StatusBadgeProps> = ({ status }) => {
     queued: { color: "gray", icon: faClock, label: "Queued" },
     processing: { color: "blue", icon: faSpinner, label: "Processing" },
     completed: { color: "green", icon: faCheck, label: "Completed" },
+    partial: { color: "yellow", icon: faExclamationTriangle, label: "Partial" },
     failed: { color: "red", icon: faExclamationTriangle, label: "Failed" },
     cancelled: { color: "orange", icon: faTimes, label: "Cancelled" },
   }[status];
@@ -55,6 +51,7 @@ const StatusBadge: FunctionComponent<StatusBadgeProps> = ({ status }) => {
           icon={config.icon}
           spin={status === "processing"}
           size="xs"
+          aria-hidden="true"
         />
       }
     >
@@ -65,55 +62,150 @@ const StatusBadge: FunctionComponent<StatusBadgeProps> = ({ status }) => {
 
 interface JobRowProps {
   job: TranslatorJob;
-  onCancel: (id: string) => void;
-  isDeleting: boolean;
 }
 
-const JobRow: FunctionComponent<JobRowProps> = ({
-  job,
-  onCancel,
-  isDeleting,
-}) => {
-  const canCancel = job.status === "queued";
+function formatDuration(seconds: number): string {
+  if (seconds < 60) return `${seconds.toFixed(0)}s`;
+  const min = Math.floor(seconds / 60);
+  const sec = Math.round(seconds % 60);
+  return `${min}m ${sec}s`;
+}
+
+function formatCostValue(cost: number): string {
+  if (cost === 0) return "Free";
+  if (cost < 0.01) return `$${cost.toFixed(4)}`;
+  return `$${cost.toFixed(2)}`;
+}
+
+const JobRow: FunctionComponent<JobRowProps> = ({ job }) => {
+  const modelUsed = job.result?.model_used || job.model;
+  // Prefer top-level tokensUsed (live from API), fall back to result
+  const tokensUsed = job.tokensUsed || job.result?.tokens_used;
+
+  // Build media title
+  const langPair =
+    job.sourceLanguage && job.targetLanguage
+      ? ` (${job.sourceLanguage.toUpperCase()} โ†’ ${job.targetLanguage.toUpperCase()})`
+      : "";
+  const mediaTitle = job.title
+    ? `${job.title}${langPair}`
+    : job.filename
+      ? `${job.filename}${langPair}`
+      : langPair || "-";
+
+  // Duration โ€” prefer server-side elapsedSeconds
+  let durationStr = "-";
+  let durationSec = 0;
+  if (job.elapsedSeconds) {
+    durationSec = job.elapsedSeconds;
+    durationStr = formatDuration(durationSec);
+  } else if (job.startedAt && job.completedAt) {
+    durationSec =
+      (new Date(job.completedAt).getTime() -
+        new Date(job.startedAt).getTime()) /
+      1000;
+    durationStr = formatDuration(durationSec);
+  } else if (job.status === "processing" && job.startedAt) {
+    // eslint-disable-next-line react-hooks/purity
+    const elapsed = (Date.now() - new Date(job.startedAt).getTime()) / 1000;
+    durationStr = `${formatDuration(elapsed)}...`;
+  }
+
+  // TPS
+  const tpsStr =
+    tokensUsed && durationSec > 0
+      ? `${(tokensUsed / durationSec).toFixed(0)} t/s`
+      : "-";
+
+  // Progress โ€” show lines if available
+  const progressLabel =
+    job.completedLines && job.totalLines
+      ? `${job.completedLines}/${job.totalLines} lines`
+      : `${job.progress}%`;
+
+  // Batch info for tooltip
+  const batchInfo =
+    job.completedBatches && job.totalBatches
+      ? `Batch ${job.completedBatches}/${job.totalBatches}`
+      : undefined;
 
   return (
     <Table.Tr>
       <Table.Td>
-        <Tooltip label={job.jobId}>
-          <Text size="sm" truncate style={{ maxWidth: 120 }}>
-            {job.jobId.substring(0, 8)}...
+        <Tooltip label={job.jobName || job.jobId} openDelay={300}>
+          <Text size="sm" truncate style={{ maxWidth: 200 }}>
+            {mediaTitle}
           </Text>
         </Tooltip>
       </Table.Td>
       <Table.Td>
-        <StatusBadge status={job.status} />
+        {job.error ? (
+          <Tooltip label={job.error} multiline w={350} withArrow>
+            <span>
+              <StatusBadge status={job.status} />
+            </span>
+          </Tooltip>
+        ) : (
+          <StatusBadge status={job.status} />
+        )}
       </Table.Td>
       <Table.Td>
         {job.status === "processing" ? (
-          <Progress value={job.progress} size="sm" animated />
+          <Tooltip
+            label={[progressLabel, batchInfo].filter(Boolean).join(" ยท ")}
+            withArrow
+          >
+            <Progress value={job.progress} size="sm" animated />
+          </Tooltip>
         ) : (
-          <Text size="sm">{job.progress}%</Text>
+          <Text size="sm">{progressLabel}</Text>
         )}
       </Table.Td>
       <Table.Td>
-        <Text size="sm" c="dimmed" truncate style={{ maxWidth: 200 }}>
-          {job.message || job.filename || "-"}
+        <Text
+          size="xs"
+          ff="monospace"
+          c="var(--bz-text-tertiary)"
+          truncate
+          style={{ maxWidth: 180 }}
+        >
+          {modelUsed || "-"}
+        </Text>
+      </Table.Td>
+      <Table.Td>
+        <Text size="xs" ff="monospace">
+          {tokensUsed ? tokensUsed.toLocaleString() : "-"}
+        </Text>
+      </Table.Td>
+      <Table.Td>
+        <Text size="xs" ff="monospace">
+          {job.totalCost != null && job.totalCost > 0 ? (
+            <Tooltip
+              label={`${formatCostValue(job.totalCost)} total cost`}
+              withArrow
+            >
+              <Text component="span" size="xs" ff="monospace" c="green.4">
+                {formatCostValue(job.totalCost)}
+              </Text>
+            </Tooltip>
+          ) : (
+            "-"
+          )}
         </Text>
       </Table.Td>
       <Table.Td>
-        <Text size="sm">{new Date(job.createdAt).toLocaleTimeString()}</Text>
+        <Text size="xs" ff="monospace">
+          {durationStr}
+        </Text>
       </Table.Td>
       <Table.Td>
-        {canCancel && (
-          <ActionIcon
-            color="red"
-            variant="subtle"
-            onClick={() => onCancel(job.jobId)}
-            loading={isDeleting}
-          >
-            <FontAwesomeIcon icon={faTrash} />
-          </ActionIcon>
-        )}
+        <Text
+          size="xs"
+          ff="monospace"
+          c={tpsStr !== "-" ? "green.4" : "dimmed"}
+        >
+          {tpsStr}
+        </Text>
       </Table.Td>
     </Table.Tr>
   );
@@ -130,27 +222,35 @@ const StatCard: FunctionComponent<StatCardProps> = ({
   value,
   color,
 }) => (
-  <Card withBorder p="sm">
-    <Text size="xs" c="dimmed">
-      {label}
-    </Text>
-    <Text size="xl" fw={700} c={color}>
+  <Card
+    withBorder
+    p="xs"
+    className={classes.statCard}
+    style={{ borderLeftColor: `var(--bz-stat-${color})` }}
+  >
+    <Text size="2rem" fw={700} lh={1}>
       {value}
     </Text>
+    <Text
+      size="xs"
+      c="var(--bz-text-tertiary)"
+      tt="uppercase"
+      style={{ letterSpacing: 0.5 }}
+      fw={600}
+    >
+      {label}
+    </Text>
   </Card>
 );
 
 interface TranslatorStatusPanelProps {
   enabled?: boolean;
-  savedApiKey?: string;
-  savedModel?: string;
-  savedMaxConcurrent?: number;
 }
 
 export const TranslatorStatusPanel: FunctionComponent<
   TranslatorStatusPanelProps
-> = ({ enabled = true, savedApiKey, savedModel, savedMaxConcurrent }) => {
-  const [retryKey, setRetryKey] = useState(0);
+> = ({ enabled = true }) => {
+  const [, setRetryKey] = useState(0);
 
   const {
     data: status,
@@ -164,8 +264,6 @@ export const TranslatorStatusPanel: FunctionComponent<
     isError: jobsError,
     refetch: refetchJobs,
   } = useTranslatorJobs(enabled && !statusError);
-  const cancelJob = useCancelTranslatorJob();
-
   const handleRetry = useCallback(() => {
     setRetryKey((k) => k + 1);
     void refetchStatus();
@@ -177,8 +275,10 @@ export const TranslatorStatusPanel: FunctionComponent<
     return (
       <Card withBorder mt="md" p="md">
         <Group justify="center" py="md">
-          <FontAwesomeIcon icon={faSpinner} spin />
-          <Text c="dimmed">Connecting to AI Subtitle Translator...</Text>
+          <FontAwesomeIcon icon={faSpinner} spin aria-hidden="true" />
+          <Text c="var(--bz-text-tertiary)">
+            Connecting to AI Subtitle Translator...
+          </Text>
         </Group>
       </Card>
     );
@@ -195,7 +295,9 @@ export const TranslatorStatusPanel: FunctionComponent<
         color="yellow"
         title="AI Subtitle Translator Unavailable"
         mt="md"
-        icon={<FontAwesomeIcon icon={faExclamationTriangle} />}
+        icon={
+          <FontAwesomeIcon icon={faExclamationTriangle} aria-hidden="true" />
+        }
       >
         <Text size="sm" mb="sm">
           {errorMessage}
@@ -203,7 +305,7 @@ export const TranslatorStatusPanel: FunctionComponent<
         <Button
           size="xs"
           variant="light"
-          leftSection={<FontAwesomeIcon icon={faRefresh} />}
+          leftSection={<FontAwesomeIcon icon={faRefresh} aria-hidden="true" />}
           onClick={handleRetry}
         >
           Retry Connection
@@ -212,137 +314,96 @@ export const TranslatorStatusPanel: FunctionComponent<
     );
   }
 
-  const handleCancel = (jobId: string) => {
-    cancelJob.mutate(jobId);
-  };
-
   return (
     <Stack gap="md" mt="md">
       {/* Service Status */}
       <Card withBorder>
         <Group justify="space-between" mb="md">
           <Title order={5}>AI Subtitle Translator Service</Title>
-          {status?.healthy ? (
-            <Badge
-              color="green"
-              leftSection={<FontAwesomeIcon icon={faCircle} size="xs" />}
-            >
-              Connected
-            </Badge>
-          ) : (
-            <Badge color="red">Disconnected</Badge>
-          )}
-        </Group>
-
-        {/* Bazarr Configuration (Saved Settings) */}
-        <Text size="xs" c="dimmed" mt="md" mb="xs" fw={600}>
-          Bazarr Configuration
-        </Text>
-        <Group gap="xl">
-          <Box>
-            <Text size="xs" c="dimmed">
-              API Key
-            </Text>
-            <Text size="sm">{savedApiKey ? "โœ“ Set" : "โœ— Not Set"}</Text>
-          </Box>
-          <Box>
-            <Text size="xs" c="dimmed">
-              Model
-            </Text>
-            <Text size="sm">{savedModel || "Not configured"}</Text>
-          </Box>
-          <Box>
-            <Text size="xs" c="dimmed">
-              Max Concurrent
-            </Text>
-            <Text size="sm">{savedMaxConcurrent ?? "Not set"}</Text>
-          </Box>
-        </Group>
-
-        {/* Service Status (Runtime State) */}
-        {status && (
-          <>
-            <Text size="xs" c="dimmed" mt="md" mb="xs" fw={600}>
-              Service Runtime State
-            </Text>
-            <Group gap="xl">
-              <Box>
-                <Text size="xs" c="dimmed">
-                  Active Model
-                </Text>
-                <Text size="sm">{status.config.model}</Text>
-              </Box>
-              <Box>
-                <Text size="xs" c="dimmed">
-                  API Key Status
-                </Text>
-                <Text size="sm">
-                  {status.config.apiKeyConfigured
-                    ? "โœ“ Configured"
-                    : "โœ— Not Set"}
-                </Text>
-              </Box>
-              <Box>
-                <Text size="xs" c="dimmed">
-                  Max Concurrent
-                </Text>
-                <Text size="sm">{status.queue.maxConcurrent}</Text>
-              </Box>
+          <div role="status" aria-live="assertive">
+            <Group gap={6}>
+              <Text
+                c={status?.healthy ? "green.5" : "red.5"}
+                fw={700}
+                size="sm"
+                component="span"
+                className={
+                  status?.healthy ? classes.promptConnected : undefined
+                }
+              >
+                โฏ
+              </Text>
+              <Text
+                c={status?.healthy ? "green.5" : "red.5"}
+                fw={600}
+                size="sm"
+                tt="uppercase"
+                style={{ letterSpacing: 0.5 }}
+              >
+                {status?.healthy ? "Connected" : "Disconnected"}
+              </Text>
             </Group>
-          </>
-        )}
+          </div>
+        </Group>
       </Card>
 
       {/* Queue Stats */}
       {status && (
-        <SimpleGrid cols={4}>
+        <SimpleGrid cols={{ base: 2, sm: 3 }}>
+          {(status.bazarr_queue?.pending ?? 0) > 0 && (
+            <StatCard
+              label="Pending"
+              value={status.bazarr_queue!.pending}
+              color="queued"
+            />
+          )}
           <StatCard
             label="Processing"
             value={status.queue.processing}
-            color="blue"
+            color="processing"
           />
-          <StatCard label="Queued" value={status.queue.queued} color="gray" />
           <StatCard
             label="Completed"
             value={status.queue.completed}
-            color="green"
+            color="completed"
           />
-          <StatCard label="Failed" value={status.queue.failed} color="red" />
+          <StatCard label="Failed" value={status.queue.failed} color="failed" />
         </SimpleGrid>
       )}
 
       {/* Jobs Table */}
       <Card withBorder>
-        <Title order={5} mb="md">
+        <Title order={5} mb="md" id="translation-jobs-heading">
           Translation Jobs
         </Title>
         {jobsData && jobsData.jobs.length > 0 ? (
           <Table.ScrollContainer minWidth={600}>
-            <Table striped highlightOnHover>
+            <Table
+              striped
+              highlightOnHover
+              aria-labelledby="translation-jobs-heading"
+            >
               <Table.Thead>
                 <Table.Tr>
-                  <Table.Th>Job ID</Table.Th>
+                  <Table.Th>Media</Table.Th>
                   <Table.Th>Status</Table.Th>
                   <Table.Th>Progress</Table.Th>
-                  <Table.Th>Message</Table.Th>
-                  <Table.Th>Created</Table.Th>
-                  <Table.Th>Actions</Table.Th>
+                  <Table.Th>Model</Table.Th>
+                  <Table.Th>Tokens</Table.Th>
+                  <Table.Th>Cost</Table.Th>
+                  <Table.Th>Duration</Table.Th>
+                  <Table.Th>Speed</Table.Th>
                 </Table.Tr>
               </Table.Thead>
               <Table.Tbody>
                 {jobsData.jobs.map((job) => (
-                  <JobRow
-                    key={job.jobId}
-                    job={job}
-                    onCancel={handleCancel}
-                    isDeleting={cancelJob.isPending}
-                  />
+                  <JobRow key={job.jobId} job={job} />
                 ))}
               </Table.Tbody>
             </Table>
           </Table.ScrollContainer>
         ) : (
-          <Text c="dimmed" ta="center" py="xl">
+          <Text c="var(--bz-text-tertiary)" ta="center" py="xl">
             No translation jobs
           </Text>
         )}
@@ -356,24 +417,7 @@ export const TranslatorStatusPanel: FunctionComponent<
  * This must be rendered inside a FormContext (i.e., inside Layout component).
  */
 export const TranslatorStatusPanelWithFormContext: FunctionComponent = () => {
-  // Use useSettingValue which properly merges saved settings with staged overrides
-  const savedApiKey = useSettingValue<string>(
-    "settings-translator-openrouter_api_key",
-  );
-  const savedModel = useSettingValue<string>(
-    "settings-translator-openrouter_model",
-  );
-  const savedMaxConcurrent = useSettingValue<number>(
-    "settings-translator-openrouter_max_concurrent",
-  );
-
-  return (
-    <TranslatorStatusPanel
-      savedApiKey={savedApiKey ?? undefined}
-      savedModel={savedModel ?? undefined}
-      savedMaxConcurrent={savedMaxConcurrent ?? undefined}
-    />
-  );
+  return <TranslatorStatusPanel />;
 };
 
 export default TranslatorStatusPanel;
diff --git a/frontend/src/components/bazarr/AudioList.tsx b/frontend/src/components/bazarr/AudioList.tsx
index 7620579ff8..6ffb87ec18 100644
--- a/frontend/src/components/bazarr/AudioList.tsx
+++ b/frontend/src/components/bazarr/AudioList.tsx
@@ -19,7 +19,7 @@ const AudioList: FunctionComponent<AudioListProps> = ({
   return (
     <Group gap="xs" {...group}>
       {audios.map((audio, idx) => (
-        <Badge color="blue" key={BuildKey(idx, audio.code2)} {...badgeProps}>
+        <Badge key={BuildKey(idx, audio.code2)} {...badgeProps}>
           {normalizeAudioLanguage(audio.name)}
         </Badge>
       ))}
diff --git a/frontend/src/components/bazarr/LanguageSelector.tsx b/frontend/src/components/bazarr/LanguageSelector.tsx
index 8954403bd2..2395098514 100644
--- a/frontend/src/components/bazarr/LanguageSelector.tsx
+++ b/frontend/src/components/bazarr/LanguageSelector.tsx
@@ -3,8 +3,10 @@ import { useLanguages } from "@/apis/hooks";
 import { Selector, SelectorProps } from "@/components/inputs";
 import { useSelectorOptions } from "@/utilities";
 
-interface LanguageSelectorProps
-  extends Omit<SelectorProps<Language.Server>, "options" | "getkey"> {
+interface LanguageSelectorProps extends Omit<
+  SelectorProps<Language.Server>,
+  "options" | "getkey"
+> {
   enabled?: boolean;
 }
 
diff --git a/frontend/src/components/forms/BatchModConfirmForm.tsx b/frontend/src/components/forms/BatchModConfirmForm.tsx
new file mode 100644
index 0000000000..e955702b82
--- /dev/null
+++ b/frontend/src/components/forms/BatchModConfirmForm.tsx
@@ -0,0 +1,103 @@
+import { FunctionComponent } from "react";
+import { Button, Divider, Group, Stack, Text } from "@mantine/core";
+import { notifications } from "@mantine/notifications";
+import { useBatchAction } from "@/apis/hooks";
+import { BatchAction, BatchItem } from "@/apis/raw/subtitles";
+import { useModals, withModal } from "@/modules/modals";
+
+/* eslint-disable camelcase -- keys match backend action identifiers */
+const ACTION_LABELS: Record<string, string> = {
+  OCR_fixes: "OCR Fixes",
+  common: "Common Fixes",
+  remove_HI: "Remove Hearing Impaired",
+  remove_tags: "Remove Style Tags",
+  fix_uppercase: "Fix Uppercase",
+  reverse_rtl: "Reverse RTL",
+  "scan-disk": "Scan Disk",
+  "search-missing": "Search Missing Subtitles",
+  upgrade: "Upgrade Subtitles",
+};
+/* eslint-enable camelcase */
+
+interface BatchModConfirmFormProps {
+  items: BatchItem[];
+  action: BatchAction;
+}
+
+const BatchModConfirmForm: FunctionComponent<BatchModConfirmFormProps> = ({
+  items,
+  action,
+}) => {
+  const { mutateAsync, isPending } = useBatchAction();
+  const modals = useModals();
+  const label = ACTION_LABELS[action] ?? action;
+
+  const handleSubmit = async () => {
+    if (items.length >= 100) {
+      const confirmed = window.confirm(
+        `This will apply "${label}" to ${items.length} items. This may take a while. Continue?`,
+      );
+      if (!confirmed) return;
+    }
+
+    try {
+      const result = await mutateAsync({ items, action });
+
+      notifications.show({
+        title: `${label} Queued`,
+        message: `Queued: ${result.queued}, Skipped: ${result.skipped}${result.errors.length > 0 ? `, Errors: ${result.errors.length}` : ""}`,
+        color: result.errors.length > 0 ? "yellow" : "green",
+      });
+
+      modals.closeSelf();
+    } catch (error) {
+      notifications.show({
+        title: `${label} Failed`,
+        message: String(error),
+        color: "red",
+      });
+    }
+  };
+
+  return (
+    <form
+      onSubmit={(e) => {
+        e.preventDefault();
+        handleSubmit();
+      }}
+    >
+      <Stack>
+        <Text size="sm">
+          Apply <strong>{label}</strong> to <strong>{items.length}</strong>{" "}
+          selected item(s)?
+        </Text>
+
+        <Divider />
+
+        <Group justify="space-between">
+          <Button variant="default" onClick={() => modals.closeSelf()}>
+            Cancel
+          </Button>
+          <Button
+            type="submit"
+            loading={isPending}
+            disabled={items.length === 0}
+          >
+            Apply to {items.length} Item(s)
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+export const BatchModConfirmModal = withModal(
+  BatchModConfirmForm,
+  "batch-mod-confirm",
+  {
+    title: "Confirm Batch Operation",
+    size: "md",
+  },
+);
+
+export default BatchModConfirmForm;
diff --git a/frontend/src/components/forms/ChangeProfileForm.tsx b/frontend/src/components/forms/ChangeProfileForm.tsx
new file mode 100644
index 0000000000..e909e8c5e8
--- /dev/null
+++ b/frontend/src/components/forms/ChangeProfileForm.tsx
@@ -0,0 +1,61 @@
+import { FunctionComponent, useMemo } from "react";
+import { Button, Stack, Text } from "@mantine/core";
+import { useLanguageProfiles } from "@/apis/hooks";
+import { useModals, withModal } from "@/modules/modals";
+
+interface ChangeProfileFormProps {
+  onSelect: (profileId: number | null) => void;
+}
+
+const ChangeProfileForm: FunctionComponent<ChangeProfileFormProps> = ({
+  onSelect,
+}) => {
+  const { data: profiles } = useLanguageProfiles();
+  const modals = useModals();
+
+  const sortedProfiles = useMemo(
+    () => (profiles ?? []).slice().sort((a, b) => a.name.localeCompare(b.name)),
+    [profiles],
+  );
+
+  const handleSelect = (profileId: number | null) => {
+    onSelect(profileId);
+    modals.closeSelf();
+  };
+
+  return (
+    <Stack gap="xs">
+      <Button
+        variant="subtle"
+        color="red"
+        size="sm"
+        onClick={() => handleSelect(null)}
+        justify="flex-start"
+      >
+        Clear Profile
+      </Button>
+      {sortedProfiles.map((profile) => (
+        <Button
+          key={profile.profileId}
+          variant="subtle"
+          size="sm"
+          onClick={() => handleSelect(profile.profileId)}
+          justify="flex-start"
+        >
+          <Text size="sm">{profile.name}</Text>
+        </Button>
+      ))}
+    </Stack>
+  );
+};
+
+export const ChangeProfileModal = withModal(
+  ChangeProfileForm,
+  "change-profile",
+  {
+    title: "Change Profile",
+    size: "sm",
+  },
+);
+
+export default ChangeProfileForm;
diff --git a/frontend/src/components/forms/ItemEditForm.tsx b/frontend/src/components/forms/ItemEditForm.tsx
index 6154913c9e..74cedb9aca 100644
--- a/frontend/src/components/forms/ItemEditForm.tsx
+++ b/frontend/src/components/forms/ItemEditForm.tsx
@@ -1,10 +1,12 @@
 import { FunctionComponent, useMemo } from "react";
 import { Button, Divider, Group, LoadingOverlay, Stack } from "@mantine/core";
 import { useForm } from "@mantine/form";
+import { showNotification } from "@mantine/notifications";
 import { UseMutationResult } from "@tanstack/react-query";
 import { useLanguageProfiles } from "@/apis/hooks";
 import { MultiSelector, Selector } from "@/components/inputs";
 import { useModals, withModal } from "@/modules/modals";
+import { notification } from "@/modules/task";
 import { GetItemId, useSelectorOptions } from "@/utilities";
 
 interface Props {
@@ -56,9 +58,29 @@ const ItemEditForm: FunctionComponent<Props> = ({
         if (item) {
           const itemId = GetItemId(item);
           if (itemId) {
-            mutate({ id: [itemId], profileid: [profile?.profileId ?? null] });
-            onComplete?.();
-            modals.closeSelf();
+            mutate(
+              { id: [itemId], profileid: [profile?.profileId ?? null] },
+              {
+                onSuccess: () => {
+                  showNotification(
+                    notification.info(
+                      "Profile Saved",
+                      "Languages profile updated successfully",
+                    ),
+                  );
+                  onComplete?.();
+                  modals.closeSelf();
+                },
+                onError: () => {
+                  showNotification(
+                    notification.error(
+                      "Save Failed",
+                      "Could not update languages profile",
+                    ),
+                  );
+                },
+              },
+            );
             return;
           }
         }
diff --git a/frontend/src/components/forms/MassSyncForm.tsx b/frontend/src/components/forms/MassSyncForm.tsx
new file mode 100644
index 0000000000..465152032a
--- /dev/null
+++ b/frontend/src/components/forms/MassSyncForm.tsx
@@ -0,0 +1,122 @@
+import { FunctionComponent } from "react";
+import {
+  Button,
+  Checkbox,
+  Divider,
+  Group,
+  NumberInput,
+  Stack,
+  Text,
+} from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { notifications } from "@mantine/notifications";
+import { useBatchAction, useSystemSettings } from "@/apis/hooks";
+import { BatchItem, BatchOptions } from "@/apis/raw/subtitles";
+import { useModals, withModal } from "@/modules/modals";
+
+interface MassSyncFormProps {
+  items: BatchItem[];
+}
+
+const MassSyncForm: FunctionComponent<MassSyncFormProps> = ({ items }) => {
+  const { data: settings } = useSystemSettings();
+  const { mutateAsync, isPending } = useBatchAction();
+  const modals = useModals();
+
+  const form = useForm<BatchOptions>({
+    initialValues: {
+      maxOffsetSeconds: settings?.subsync.max_offset_seconds ?? 60,
+      noFixFramerate: settings?.subsync.no_fix_framerate ?? true,
+      gss: settings?.subsync.gss ?? true,
+      forceResync: false,
+    },
+  });
+
+  const handleSubmit = form.onSubmit(async (values) => {
+    if (items.length >= 100) {
+      const confirmed = window.confirm(
+        `This will sync subtitles for ${items.length} items. This may take a while. Continue?`,
+      );
+      if (!confirmed) return;
+    }
+
+    try {
+      const result = await mutateAsync({
+        items,
+        action: "sync",
+        options: values,
+      });
+
+      notifications.show({
+        title: "Mass Sync Queued",
+        message: `Queued: ${result.queued}, Skipped: ${result.skipped}${result.errors.length > 0 ? `, Errors: ${result.errors.length}` : ""}`,
+        color: result.errors.length > 0 ? "yellow" : "green",
+      });
+
+      modals.closeSelf();
+    } catch (error) {
+      notifications.show({
+        title: "Mass Sync Failed",
+        message: String(error),
+        color: "red",
+      });
+    }
+  });
+
+  return (
+    <form onSubmit={handleSubmit}>
+      <Stack>
+        <Text size="sm">
+          Sync subtitles for <strong>{items.length}</strong> selected item(s).
+          Subtitles will be synchronized using the video audio track as
+          reference.
+        </Text>
+
+        <NumberInput
+          label="Max Offset Seconds"
+          min={1}
+          max={600}
+          {...form.getInputProps("maxOffsetSeconds")}
+        />
+
+        <Checkbox
+          label="Golden-Section Search"
+          {...form.getInputProps("gss", { type: "checkbox" })}
+        />
+
+        <Checkbox
+          label="No Fix Framerate"
+          {...form.getInputProps("noFixFramerate", { type: "checkbox" })}
+        />
+
+        <Checkbox
+          label="Force Re-sync"
+          description="Re-sync subtitles that have already been synced"
+          {...form.getInputProps("forceResync", { type: "checkbox" })}
+        />
+
+        <Divider />
+
+        <Group justify="space-between">
+          <Button variant="default" onClick={() => modals.closeSelf()}>
+            Cancel
+          </Button>
+          <Button
+            type="submit"
+            loading={isPending}
+            disabled={items.length === 0}
+          >
+            Sync {items.length} Item(s)
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};
+
+export const MassSyncModal = withModal(MassSyncForm, "mass-sync", {
+  title: "Mass Sync Subtitles",
+  size: "md",
+});
+
+export default MassSyncForm;
diff --git a/frontend/src/components/forms/MassTranslateForm.tsx b/frontend/src/components/forms/MassTranslateForm.tsx
index 353d10b9dd..71c3afde17 100644
--- a/frontend/src/components/forms/MassTranslateForm.tsx
+++ b/frontend/src/components/forms/MassTranslateForm.tsx
@@ -1,23 +1,23 @@
 import { FunctionComponent, useMemo } from "react";
 import {
   Alert,
+  Badge,
   Button,
   Divider,
+  Group,
   Stack,
   Text,
-  Group,
-  Badge,
 } from "@mantine/core";
 import { useForm } from "@mantine/form";
+import { notifications } from "@mantine/notifications";
 import { isObject } from "lodash";
-import { useBatchTranslate, useSystemSettings } from "@/apis/hooks";
+import { useBatchAction, useSystemSettings } from "@/apis/hooks";
+import { BatchItem } from "@/apis/raw/subtitles";
 import { Selector } from "@/components/inputs";
 import { useModals, withModal } from "@/modules/modals";
 import { useSelectorOptions } from "@/utilities";
 import FormUtils from "@/utilities/form";
 import { useEnabledLanguages } from "@/utilities/languages";
-import { BatchTranslateItem } from "@/apis/raw/subtitles";
-import { notifications } from "@mantine/notifications";
 
 // Translations map for Google Translate compatibility
 const googleTranslations: Record<string, string> = {
@@ -143,7 +143,13 @@ export interface WantedMovieItem {
   title: string;
 }
 
-export type WantedItem = WantedEpisodeItem | WantedMovieItem;
+export interface WantedSeriesItem {
+  type: "series";
+  sonarrSeriesId: number;
+  title: string;
+}
+
+export type WantedItem = WantedEpisodeItem | WantedMovieItem | WantedSeriesItem;
 
 interface Props {
   items: WantedItem[];
@@ -157,7 +163,7 @@ interface TranslationConfig {
 
 const MassTranslateForm: FunctionComponent<Props> = ({ items, onComplete }) => {
   const settings = useSystemSettings();
-  const { mutateAsync, isPending } = useBatchTranslate();
+  const { mutateAsync, isPending } = useBatchAction();
   const modals = useModals();
 
   const { data: languages } = useEnabledLanguages();
@@ -172,10 +178,19 @@ const MassTranslateForm: FunctionComponent<Props> = ({ items, onComplete }) => {
         isObject,
         "Please select a source language",
       ),
-      targetLanguage: FormUtils.validation(
-        isObject,
-        "Please select a target language",
-      ),
+      targetLanguage: (
+        value: Language.Info | null,
+        values: { sourceLanguage: Language.Info | null },
+      ) => {
+        if (!isObject(value)) return "Please select a target language";
+        if (
+          value &&
+          values.sourceLanguage &&
+          value.code2 === values.sourceLanguage.code2
+        )
+          return "Target language must be different from source";
+        return null;
+      },
     },
   });
 
@@ -243,43 +258,48 @@ const MassTranslateForm: FunctionComponent<Props> = ({ items, onComplete }) => {
   }) => {
     if (!values.sourceLanguage || !values.targetLanguage) return;
 
-    const batchItems: BatchTranslateItem[] = items.map((item) => {
+    if (items.length >= 100) {
+      const confirmed = window.confirm(
+        `This will translate subtitles for ${items.length} items. This may take a while. Continue?`,
+      );
+      if (!confirmed) return;
+    }
+
+    const batchItems: BatchItem[] = items.map((item) => {
       if (item.type === "episode") {
         return {
           type: "episode" as const,
           sonarrSeriesId: item.sonarrSeriesId,
           sonarrEpisodeId: item.sonarrEpisodeId,
-          sourceLanguage: values.sourceLanguage!.code2,
-          targetLanguage: values.targetLanguage!.code2,
+        };
+      } else if (item.type === "series") {
+        return {
+          type: "series" as const,
+          sonarrSeriesId: item.sonarrSeriesId,
         };
       } else {
         return {
           type: "movie" as const,
           radarrId: item.radarrId,
-          sourceLanguage: values.sourceLanguage!.code2,
-          targetLanguage: values.targetLanguage!.code2,
         };
       }
     });
 
     try {
-      const result = await mutateAsync(batchItems);
-
-      if (result.queued > 0) {
-        notifications.show({
-          title: "Translation Queued",
-          message: `${result.queued} item(s) queued for translation${result.skipped > 0 ? `, ${result.skipped} skipped` : ""}`,
-          color: "green",
-        });
-      }
+      const result = await mutateAsync({
+        items: batchItems,
+        action: "translate",
+        options: {
+          fromLang: values.sourceLanguage!.code2,
+          toLang: values.targetLanguage!.code2,
+        },
+      });
 
-      if (result.errors.length > 0) {
-        notifications.show({
-          title: "Some translations failed",
-          message: result.errors.slice(0, 3).join("; "),
-          color: "yellow",
-        });
-      }
+      notifications.show({
+        title: "Translation Queued",
+        message: `Queued: ${result.queued}, Skipped: ${result.skipped}${result.errors.length > 0 ? `, Errors: ${result.errors.length}` : ""}`,
+        color: result.errors.length > 0 ? "yellow" : "green",
+      });
 
       onComplete?.();
       modals.closeSelf();
@@ -301,7 +321,7 @@ const MassTranslateForm: FunctionComponent<Props> = ({ items, onComplete }) => {
             {translatorModel} will be used to translate{" "}
             <strong>{items.length}</strong> item(s).
           </Text>
-          <Text size="xs" c="dimmed" mt="xs">
+          <Text size="xs" c="var(--bz-text-tertiary)" mt="xs">
             You can choose translation service in the subtitles settings.
           </Text>
         </Alert>
@@ -324,7 +344,7 @@ const MassTranslateForm: FunctionComponent<Props> = ({ items, onComplete }) => {
         )}
 
         {items.length > 5 && (
-          <Text size="sm" c="dimmed">
+          <Text size="sm" c="var(--bz-text-tertiary)">
             {items.length} items selected for translation
           </Text>
         )}
@@ -361,9 +381,18 @@ const MassTranslateForm: FunctionComponent<Props> = ({ items, onComplete }) => {
 
         <Divider />
 
-        <Button type="submit" loading={isPending} disabled={items.length === 0}>
-          Translate {items.length} Item(s)
-        </Button>
+        <Group justify="space-between">
+          <Button variant="default" onClick={() => modals.closeSelf()}>
+            Cancel
+          </Button>
+          <Button
+            type="submit"
+            loading={isPending}
+            disabled={items.length === 0}
+          >
+            Translate {items.length} Item(s)
+          </Button>
+        </Group>
       </Stack>
     </form>
   );
diff --git a/frontend/src/components/forms/TwoPointFit.tsx b/frontend/src/components/forms/TwoPointFit.tsx
new file mode 100644
index 0000000000..d4aa6aae54
--- /dev/null
+++ b/frontend/src/components/forms/TwoPointFit.tsx
@@ -0,0 +1,269 @@
+import { FunctionComponent, useEffect, useMemo } from "react";
+import {
+  Alert,
+  Button,
+  Card,
+  Divider,
+  Group,
+  LoadingOverlay,
+  NumberInput,
+  Stack,
+} from "@mantine/core";
+import { useForm } from "@mantine/form";
+import { useSubtitleAction, useSubtitleContents } from "@/apis/hooks";
+import { Selector } from "@/components/inputs";
+import { useModals, withModal } from "@/modules/modals";
+import { task } from "@/modules/task";
+import { useSelectorOptions } from "@/utilities";
+
+const TaskName = "Two-Point Fit";
+
+function convertToAction(
+  r: { hour: number; min: number; sec: number; ms: number }, // offset to zero
+  o: { hour: number; min: number; sec: number; ms: number }, // offset
+  s: { from: number; to: number }, // scale
+) {
+  return `two_point_fit(rh=${r.hour},rm=${r.min},rs=${r.sec},rms=${r.ms},oh=${o.hour},om=${o.min},os=${o.sec},oms=${o.ms},from=${s.from},to=${s.to})`;
+}
+
+const totalMs = (t: { hour: number; min: number; sec: number; ms: number }) =>
+  t.hour * 3600000 + t.min * 60000 + t.sec * 1000 + t.ms;
+
+const lineStartMs = (t: SubtitleContents.LineTime) =>
+  t.total_seconds * 1000 + Math.round(t.microseconds / 1000);
+
+const lineStartToTime = (t: SubtitleContents.LineTime) => ({
+  hour: t.hours,
+  min: t.minutes,
+  sec: t.seconds,
+  ms: Math.round(t.microseconds / 1000),
+});
+
+interface Props {
+  selections: FormType.ModifySubtitle[];
+  onSubmit?: VoidFunction;
+}
+
+const TwoPointFitForm: FunctionComponent<Props> = ({
+  selections,
+  onSubmit,
+}) => {
+  const { mutateAsync } = useSubtitleAction();
+  const modals = useModals();
+
+  const query = useSubtitleContents(selections[0].path);
+  const lines = useMemo(() => query.data ?? [], [query]);
+
+  const form = useForm({
+    initialValues: {
+      first: {
+        line: null as SubtitleContents.Line | null,
+        to: { hour: 0, min: 0, sec: 0, ms: 0 },
+      },
+      last: {
+        line: null as SubtitleContents.Line | null,
+        to: { hour: 0, min: 0, sec: 0, ms: 0 },
+      },
+    },
+    validate: {
+      first: {
+        line: (v) => (v == null ? "Please select a line" : null),
+      },
+      last: {
+        line: (v, values) => {
+          if (v == null) return "Please select a line";
+          if (values.first.line != null && v.index === values.first.line.index)
+            return "Must be a different line than the first";
+          return null;
+        },
+      },
+    },
+  });
+
+  // Preselect default lines when data loads
+  useEffect(() => {
+    if (lines.length === 0) return;
+
+    const firstLine = lines.length < 50 ? lines[0] : lines[9];
+    const lastLine =
+      lines.length < 50 ? lines[lines.length - 1] : lines[lines.length - 10];
+
+    form.setFieldValue("first.line", firstLine);
+    form.setFieldValue("first.to", lineStartToTime(firstLine.start));
+    form.setFieldValue("last.line", lastLine);
+    form.setFieldValue("last.to", lineStartToTime(lastLine.start));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lines]);
+
+  const wrongOrder = useMemo(() => {
+    const { first, last } = form.values;
+    if (first.line == null || last.line == null) return false;
+    return lineStartMs(first.line.start) >= lineStartMs(last.line.start);
+  }, [form.values]);
+
+  const decimals = lines.length.toString().length;
+  const options = useSelectorOptions(
+    lines,
+    (v) =>
+      `${String(v.index).padStart(decimals, "0")}: ${String(
+        v.content,
+      ).replaceAll("\n", " ")}`,
+    (v) => String(v.index),
+  );
+
+  return (
+    <form
+      onSubmit={form.onSubmit(({ first, last }) => {
+        if (first.line == null || last.line == null) return;
+
+        const r = {
+          hour: first.line.start.hours,
+          min: first.line.start.minutes,
+          sec: first.line.start.seconds,
+          ms: Math.round(first.line.start.microseconds / 1000),
+        };
+
+        const scale = {
+          from: totalMs(last.to) - totalMs(first.to),
+          to: lineStartMs(last.line.start) - lineStartMs(first.line.start),
+        };
+
+        const action = convertToAction(r, first.to, scale);
+
+        selections.forEach((s) =>
+          task.create(s.path, TaskName, mutateAsync, {
+            action,
+            form: s,
+          }),
+        );
+
+        onSubmit?.();
+        modals.closeSelf();
+      })}
+    >
+      <LoadingOverlay
+        visible={query.isLoading}
+        zIndex={1000}
+        overlayProps={{ radius: "sm", blur: 2 }}
+      />
+      <Stack>
+        <Alert>
+          Select two sentences and the time for when they should appear. This
+          will fit (offset and scale) every sentence.
+        </Alert>
+        {wrongOrder && (
+          <Alert color="yellow" variant="filled">
+            The first sentence appears after the last sentence in the subtitle
+            file. Are the selections correct?
+          </Alert>
+        )}
+        <Card>
+          <Stack gap="md">
+            <header>First sentence</header>
+            <Alert variant="outline">
+              The closer to the beginning, the better.
+            </Alert>
+            <Stack gap="0">
+              <Selector
+                {...options}
+                disabled={query.isLoading}
+                {...form.getInputProps("first.line")}
+                onChange={(line: SubtitleContents.Line | null) => {
+                  form.setFieldValue("first.line", line);
+                  if (line) {
+                    form.setFieldValue("first.to", lineStartToTime(line.start));
+                  }
+                }}
+              ></Selector>
+            </Stack>
+
+            <Stack gap="0">
+              <Group align="end" gap="xs" wrap="nowrap">
+                <NumberInput
+                  label="hour"
+                  min={0}
+                  {...form.getInputProps("first.to.hour")}
+                ></NumberInput>
+                <NumberInput
+                  min={0}
+                  label="min"
+                  {...form.getInputProps("first.to.min")}
+                ></NumberInput>
+                <NumberInput
+                  min={0}
+                  label="sec"
+                  {...form.getInputProps("first.to.sec")}
+                ></NumberInput>
+                <NumberInput
+                  min={0}
+                  label="ms"
+                  {...form.getInputProps("first.to.ms")}
+                ></NumberInput>
+              </Group>
+            </Stack>
+          </Stack>
+        </Card>
+
+        <Card>
+          <Stack gap="md">
+            <header>Last sentence</header>
+            <Alert variant="outline">The closer to the end, the better.</Alert>
+            <Stack gap="0">
+              <Selector
+                {...options}
+                disabled={query.isLoading}
+                {...form.getInputProps("last.line")}
+                onChange={(line: SubtitleContents.Line | null) => {
+                  form.setFieldValue("last.line", line);
+                  if (line) {
+                    form.setFieldValue("last.to", lineStartToTime(line.start));
+                  }
+                }}
+              ></Selector>
+            </Stack>
+
+            <Stack gap="0">
+              <Group align="end" gap="xs" wrap="nowrap">
+                <NumberInput
+                  min={0}
+                  label="hour"
+                  {...form.getInputProps("last.to.hour")}
+                ></NumberInput>
+                <NumberInput
+                  min={0}
+                  label="min"
+                  {...form.getInputProps("last.to.min")}
+                ></NumberInput>
+                <NumberInput
+                  min={0}
+                  label="sec"
+                  {...form.getInputProps("last.to.sec")}
+                ></NumberInput>
+                <NumberInput
+                  min={0}
+                  label="ms"
+                  {...form.getInputProps("last.to.ms")}
+                ></NumberInput>
+              </Group>
+            </Stack>
+          </Stack>
+        </Card>
+
+        <Divider></Divider>
+        <Button disabled={query.isLoading} type="submit">
+          Align
+        </Button>
+      </Stack>
+    </form>
+  );
+};
+
+export const TwoPointFitModal = withModal(
+  TwoPointFitForm,
+  "two-point-alignment",
+  {
+    title: "Two-Point Fit",
+  },
+);
+
+export default TwoPointFitForm;
diff --git a/frontend/src/components/inputs/ChipInput.test.tsx b/frontend/src/components/inputs/ChipInput.test.tsx
index b974274b8c..7bdb3d6535 100644
--- a/frontend/src/components/inputs/ChipInput.test.tsx
+++ b/frontend/src/components/inputs/ChipInput.test.tsx
@@ -43,6 +43,6 @@ describe("ChipInput", () => {
 
     await userEvent.click(createBtn);
 
-    expect(mockedFn).toBeCalledTimes(1);
+    expect(mockedFn).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/frontend/src/components/inputs/DropContent.tsx b/frontend/src/components/inputs/DropContent.tsx
index c4bcf28777..390ad60920 100644
--- a/frontend/src/components/inputs/DropContent.tsx
+++ b/frontend/src/components/inputs/DropContent.tsx
@@ -23,7 +23,7 @@ export const DropContent: FunctionComponent = () => {
       </Dropzone.Reject>
       <Stack gap={0}>
         <Text size="lg">Upload Subtitles</Text>
-        <Text c="dimmed" size="sm">
+        <Text c="var(--bz-text-tertiary)" size="sm">
           Attach as many files as you like, you will need to select file
           metadata before uploading
         </Text>
diff --git a/frontend/src/components/modals/ManualSearchModal.tsx b/frontend/src/components/modals/ManualSearchModal.tsx
index 61fcc3718c..154aa13456 100644
--- a/frontend/src/components/modals/ManualSearchModal.tsx
+++ b/frontend/src/components/modals/ManualSearchModal.tsx
@@ -62,7 +62,7 @@ function ManualSearchView<T extends SupportType>(props: Props<T>) {
       );
 
       if (releaseInfo.length === 0) {
-        return <Text c="dimmed">Cannot get release info</Text>;
+        return <Text c="var(--bz-text-tertiary)">Cannot get release info</Text>;
       }
 
       return (
diff --git a/frontend/src/components/tables/BaseTable.module.scss b/frontend/src/components/tables/BaseTable.module.scss
index e1e1eff0ba..62d9ddb936 100644
--- a/frontend/src/components/tables/BaseTable.module.scss
+++ b/frontend/src/components/tables/BaseTable.module.scss
@@ -5,5 +5,81 @@
 }
 
 .table {
-  border-collapse: collapse;
+  border-collapse: separate;
+  border-spacing: 0 2px;
+  min-width: 700px;
+
+  // Column headers
+  :global(.mantine-Table-th) {
+    font-size: 10px;
+    font-weight: 600;
+    letter-spacing: 0.05em;
+    text-transform: uppercase;
+    color: var(--bz-text-disabled);
+    border-bottom: none;
+    padding: 8px 12px;
+  }
+
+  // All table rows
+  :global(.mantine-Table-tr) {
+    border-radius: var(--bz-radius-md);
+    transition: background-color var(--bz-duration-normal)
+      var(--bz-ease-standard);
+  }
+
+  // Data rows (non-grouped)
+  :global(.mantine-Table-tr):not(.groupRow) {
+    cursor: pointer;
+
+    &:hover {
+      background-color: var(--bz-hover-bg);
+    }
+  }
+
+  // All table cells
+  :global(.mantine-Table-td) {
+    padding: 8px 12px;
+    border-bottom: none;
+    border-top: none;
+  }
+
+  // Group header row
+  .groupRow {
+    cursor: pointer;
+
+    &:hover {
+      background-color: var(--bz-hover-bg);
+    }
+  }
+}
+
+// Episode number styling
+.episodeNumber {
+  font-variant-numeric: tabular-nums;
+  color: var(--bz-text-disabled);
+}
+
+// Episode title styling
+.episodeTitle {
+  font-weight: 450;
+  color: var(--bz-text-secondary);
+}
+
+// Action icon styling
+.actionIcon {
+  width: 24px;
+  height: 24px;
+  min-width: 24px;
+  min-height: 24px;
+  border-radius: var(--bz-radius-sm);
+  background: transparent;
+  color: var(--bz-text-disabled);
+  transition:
+    background-color var(--bz-duration-normal) var(--bz-ease-standard),
+    color var(--bz-duration-normal) var(--bz-ease-standard);
+
+  &:hover {
+    background-color: var(--bz-hover-bg);
+    color: var(--bz-text-tertiary);
+  }
 }
diff --git a/frontend/src/components/tables/BaseTable.tsx b/frontend/src/components/tables/BaseTable.tsx
index fedd9a11bf..dfe6c880c7 100644
--- a/frontend/src/components/tables/BaseTable.tsx
+++ b/frontend/src/components/tables/BaseTable.tsx
@@ -98,11 +98,7 @@ export default function BaseTable<T extends object>(props: BaseTableProps<T>) {
 
   return (
     <Box className={styles.container}>
-      <Table
-        className={styles.table}
-        highlightOnHover
-        striped={tableStyles?.striped ?? true}
-      >
+      <Table className={styles.table}>
         <Table.Thead hidden={tableStyles?.hideHeader}>
           {instance.getHeaderGroups().map((headerGroup) => (
             <Table.Tr key={headerGroup.id}>
diff --git a/frontend/src/components/tables/GroupTable.tsx b/frontend/src/components/tables/GroupTable.tsx
index b14edf3e69..80fd76d4bf 100644
--- a/frontend/src/components/tables/GroupTable.tsx
+++ b/frontend/src/components/tables/GroupTable.tsx
@@ -11,6 +11,7 @@ import {
   Row,
 } from "@tanstack/react-table";
 import SimpleTable, { SimpleTableProps } from "@/components/tables/SimpleTable";
+import styles from "@/components/tables/BaseTable.module.scss";
 
 function renderCell<T extends object = object>(
   cell: Cell<T, unknown>,
@@ -35,7 +36,11 @@ function renderRow<T extends object>(row: Row<T>) {
       const rotation = row.getIsExpanded() ? 90 : undefined;
 
       return (
-        <Table.Tr key={row.id} style={{ cursor: "pointer" }}>
+        <Table.Tr
+          key={row.id}
+          className={styles.groupRow}
+          style={{ cursor: "pointer" }}
+        >
           <Table.Td key={cell.id} colSpan={row.getVisibleCells().length}>
             <Text p={2} onClick={() => row.toggleExpanded()}>
               {flexRender(cell.column.columnDef.cell, cell.getContext())}
diff --git a/frontend/src/components/tables/PageControl.tsx b/frontend/src/components/tables/PageControl.tsx
index e328de7cfe..d72ed7e88a 100644
--- a/frontend/src/components/tables/PageControl.tsx
+++ b/frontend/src/components/tables/PageControl.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent } from "react";
-import { Group, Pagination, Text } from "@mantine/core";
+import { Group, NativeSelect, Pagination, Text } from "@mantine/core";
 import { useIsLoading } from "@/contexts";
 
 interface Props {
@@ -8,6 +8,7 @@ interface Props {
   size: number;
   total: number;
   goto: (idx: number) => void;
+  onPageSizeChange?: (size: number) => void;
 }
 
 const PageControl: FunctionComponent<Props> = ({
@@ -16,6 +17,7 @@ const PageControl: FunctionComponent<Props> = ({
   size,
   total,
   goto,
+  onPageSizeChange,
 }) => {
   const empty = total === 0;
   const start = empty ? 0 : size * index + 1;
@@ -25,9 +27,34 @@ const PageControl: FunctionComponent<Props> = ({
 
   return (
     <Group p={16} justify="space-between">
-      <Text size="sm">
-        Show {start} to {end} of {total} entries
-      </Text>
+      <Group gap="md">
+        <Text size="sm">
+          Show {start} to {end} of {total} entries
+        </Text>
+        {onPageSizeChange && (
+          <NativeSelect
+            size="xs"
+            value={size >= total && total > 0 ? "all" : String(size)}
+            onChange={(e) => {
+              const val = e.currentTarget.value;
+              if (val === "all") {
+                onPageSizeChange(total);
+              } else {
+                onPageSizeChange(Number(val));
+              }
+              goto(0);
+            }}
+            data={[
+              { value: "25", label: "25 per page" },
+              { value: "50", label: "50 per page" },
+              { value: "100", label: "100 per page" },
+              { value: "250", label: "250 per page" },
+              { value: "all", label: "All" },
+            ]}
+            w={130}
+          />
+        )}
+      </Group>
       <Pagination
         size="sm"
         color={isLoading ? "gray" : "primary"}
diff --git a/frontend/src/components/tables/QueryPageTable.tsx b/frontend/src/components/tables/QueryPageTable.tsx
index 9b959e2b88..75ca5140dd 100644
--- a/frontend/src/components/tables/QueryPageTable.tsx
+++ b/frontend/src/components/tables/QueryPageTable.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useSearchParams } from "react-router";
 import { UsePaginationQueryResult } from "@/apis/queries/hooks";
 import SimpleTable, { SimpleTableProps } from "@/components/tables/SimpleTable";
@@ -30,6 +30,8 @@ export default function QueryPageTable<T extends object>(props: Props<T>) {
   } = query;
 
   const [searchParams, setSearchParams] = useSearchParams();
+  const [localPageSize, setLocalPageSize] = useState<number | null>(null);
+  const effectivePageSize = localPageSize ?? pageSize;
 
   useEffect(() => {
     ScrollToTop();
@@ -45,25 +47,33 @@ export default function QueryPageTable<T extends object>(props: Props<T>) {
   // When normal: show server-provided page data (optionally filtered within page)
   const displayData = useMemo(() => {
     if (fetchAll) {
-      const start = page * pageSize;
-      return filteredData.slice(start, start + pageSize);
+      const start = page * effectivePageSize;
+      return filteredData.slice(start, start + effectivePageSize);
+    }
+    // In server-paginated mode, slice to effectivePageSize if smaller than fetched
+    if (localPageSize !== null && localPageSize < filteredData.length) {
+      return filteredData.slice(0, localPageSize);
     }
     return filteredData;
-  }, [fetchAll, filteredData, page, pageSize]);
+  }, [fetchAll, filteredData, page, effectivePageSize, localPageSize]);
 
   // Calculate counts based on mode
   const effectiveTotalCount = fetchAll ? filteredData.length : serverTotalCount;
   const effectivePageCount = fetchAll
-    ? Math.ceil(filteredData.length / pageSize)
+    ? Math.ceil(filteredData.length / effectivePageSize)
     : serverPageCount;
 
   return (
     <LoadingProvider value={isPageLoading}>
-      <SimpleTable {...remain} data={displayData}></SimpleTable>
+      <SimpleTable
+        {...remain}
+        data={displayData}
+        key={`page-${page}-${effectivePageSize}`}
+      ></SimpleTable>
       <PageControl
         count={effectivePageCount}
         index={page}
-        size={pageSize}
+        size={effectivePageSize}
         total={effectiveTotalCount}
         goto={(page) => {
           searchParams.set("page", (page + 1).toString());
@@ -72,6 +82,7 @@ export default function QueryPageTable<T extends object>(props: Props<T>) {
 
           gotoPage(page);
         }}
+        onPageSizeChange={setLocalPageSize}
       ></PageControl>
     </LoadingProvider>
   );
diff --git a/frontend/src/components/toolbox/Toolbox.module.scss b/frontend/src/components/toolbox/Toolbox.module.scss
index 5bdd3823e2..105dc2bd97 100644
--- a/frontend/src/components/toolbox/Toolbox.module.scss
+++ b/frontend/src/components/toolbox/Toolbox.module.scss
@@ -1,9 +1,20 @@
 .group {
+  border-radius: var(--bz-radius-lg);
+  margin: 8px 12px;
+
   @include mantine.light {
-    background-color: var(--mantine-color-gray-3);
+    background-color: var(--mantine-color-gray-1);
+    border: 1px solid var(--bz-border-card);
   }
 
   @include mantine.dark {
-    background-color: var(--mantine-color-dark-5);
+    background-color: var(--bz-surface-card);
+    border: 1px solid var(--bz-border-card);
+  }
+
+  @include mantine.smaller-than(sm) {
+    overflow-x: auto;
+    flex-wrap: nowrap !important;
+    scrollbar-width: none;
   }
 }
diff --git a/frontend/src/constants/batch.ts b/frontend/src/constants/batch.ts
new file mode 100644
index 0000000000..612c97c376
--- /dev/null
+++ b/frontend/src/constants/batch.ts
@@ -0,0 +1,10 @@
+import { BatchAction } from "@/apis/raw/subtitles";
+
+export const SUBTITLE_TOOL_ACTIONS: [BatchAction, string][] = [
+  ["OCR_fixes", "OCR Fixes"],
+  ["common", "Common Fixes"],
+  ["remove_HI", "Remove Hearing Impaired"],
+  ["remove_tags", "Remove Style Tags"],
+  ["fix_uppercase", "Fix Uppercase"],
+  ["reverse_rtl", "Reverse RTL"],
+];
diff --git a/frontend/src/modules/modals/ModalsProvider.tsx b/frontend/src/modules/modals/ModalsProvider.tsx
index 65c9878480..f87389b037 100644
--- a/frontend/src/modules/modals/ModalsProvider.tsx
+++ b/frontend/src/modules/modals/ModalsProvider.tsx
@@ -8,9 +8,20 @@ import { ModalComponent, StaticModals } from "./WithModal";
 const DefaultModalProps: MantineModalsProviderProps["modalProps"] = {
   centered: true,
   styles: {
-    // modals: {
-    //   maxWidth: "100%",
-    // },
+    content: {
+      background: "var(--bz-surface-overlay)",
+      border: "1px solid var(--bz-border-card)",
+      borderRadius: "var(--bz-radius-lg)",
+    },
+    header: {
+      background: "transparent",
+    },
+    body: {
+      background: "transparent",
+    },
+    overlay: {
+      background: "rgba(0, 0, 0, 0.6)",
+    },
   },
 };
 
diff --git a/frontend/src/modules/modals/WithModal.tsx b/frontend/src/modules/modals/WithModal.tsx
index de7b79155a..252034f113 100644
--- a/frontend/src/modules/modals/WithModal.tsx
+++ b/frontend/src/modules/modals/WithModal.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
-
 import { createContext, FunctionComponent } from "react";
 import { ContextModalProps } from "@mantine/modals";
 import { ModalSettings } from "@mantine/modals/lib/context";
diff --git a/frontend/src/modules/modals/hooks.ts b/frontend/src/modules/modals/hooks.ts
index 667e429d32..0dd5c2ccb8 100644
--- a/frontend/src/modules/modals/hooks.ts
+++ b/frontend/src/modules/modals/hooks.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-types */
 import { useCallback, useContext, useMemo } from "react";
 import { useModals as useMantineModals } from "@mantine/modals";
 import { ModalSettings } from "@mantine/modals/lib/context";
diff --git a/frontend/src/modules/socketio/reducer.ts b/frontend/src/modules/socketio/reducer.ts
index 30e94d5f5d..78bc48b96a 100644
--- a/frontend/src/modules/socketio/reducer.ts
+++ b/frontend/src/modules/socketio/reducer.ts
@@ -41,6 +41,10 @@ export function createDefaultReducer(): SocketIO.Reducer[] {
             queryKey: [QueryKeys.Series, id],
           });
         });
+        // Invalidate series list so Missing Subtitles column refreshes
+        void queryClient.invalidateQueries({
+          queryKey: [QueryKeys.Series],
+        });
       },
       delete: (ids) => {
         LOG("info", "Invalidating series", ids);
@@ -60,6 +64,10 @@ export function createDefaultReducer(): SocketIO.Reducer[] {
             queryKey: [QueryKeys.Movies, id],
           });
         });
+        // Invalidate movies list so Missing Subtitles column refreshes
+        void queryClient.invalidateQueries({
+          queryKey: [QueryKeys.Movies],
+        });
       },
       delete: (ids) => {
         LOG("info", "Invalidating movies", ids);
diff --git a/frontend/src/pages/Authentication.tsx b/frontend/src/pages/Authentication.tsx
index 7a164c6c45..3c9717b01e 100644
--- a/frontend/src/pages/Authentication.tsx
+++ b/frontend/src/pages/Authentication.tsx
@@ -30,7 +30,7 @@ const Authentication: FunctionComponent = () => {
           <Avatar
             mx="auto"
             size={64}
-            src={`${Environment.baseUrl}/images/logo128.png`}
+            src={`${Environment.baseUrl}/images/logo_no_orb128.png`}
           ></Avatar>
           <Divider></Divider>
           <form
diff --git a/frontend/src/pages/Episodes/components.tsx b/frontend/src/pages/Episodes/components.tsx
index 1a30781226..f237fae709 100644
--- a/frontend/src/pages/Episodes/components.tsx
+++ b/frontend/src/pages/Episodes/components.tsx
@@ -1,15 +1,24 @@
 import { FunctionComponent, useMemo, useState } from "react";
+import { useNavigate } from "react-router";
 import { Badge, MantineColor, Tooltip } from "@mantine/core";
 import { useEpisodeSubtitleModification } from "@/apis/hooks";
 import Language from "@/components/bazarr/Language";
 import SubtitleToolsMenu from "@/components/SubtitleToolsMenu";
 import { toPython } from "@/utilities";
 
+function buildLanguageKey(sub: Subtitle): string {
+  let key = sub.code2;
+  if (sub.hi) key += ":hi";
+  if (sub.forced) key += ":forced";
+  return key;
+}
+
 interface Props {
   seriesId: number;
   episodeId: number;
   missing?: boolean;
   subtitle: Subtitle;
+  availableSubtitles?: Subtitle[];
 }
 
 export const Subtitle: FunctionComponent<Props> = ({
@@ -17,7 +26,9 @@ export const Subtitle: FunctionComponent<Props> = ({
   episodeId,
   missing = false,
   subtitle,
+  availableSubtitles,
 }) => {
+  const navigate = useNavigate();
   const { remove, download } = useEpisodeSubtitleModification();
 
   const [opened, setOpen] = useState(false);
@@ -25,10 +36,10 @@ export const Subtitle: FunctionComponent<Props> = ({
   const disabled = subtitle.path === null;
 
   const variant: MantineColor | undefined = useMemo(() => {
-    if (opened && !disabled) {
+    if (opened && (missing || !disabled)) {
       return "highlight";
     } else if (missing) {
-      return "warning";
+      return "missing";
     } else if (disabled) {
       return "disabled";
     }
@@ -51,26 +62,40 @@ export const Subtitle: FunctionComponent<Props> = ({
     return list;
   }, [episodeId, subtitle.code2, subtitle.path, subtitle.forced, subtitle.hi]);
 
+  // For missing subs: translation sources from available subtitles
+  const translationSources = useMemo(
+    () => (availableSubtitles ?? []).filter((s) => s.path),
+    [availableSubtitles],
+  );
+
   const ctx = (
     <Badge variant={variant}>
       <Language.Text value={subtitle} long={false}></Language.Text>
     </Badge>
   );
 
-  if (disabled) {
+  if (disabled && !missing) {
     return <Tooltip.Floating label="Embedded Subtitle">{ctx}</Tooltip.Floating>;
   }
 
   return (
     <SubtitleToolsMenu
       menu={{
-        trigger: "hover",
+        trigger: "click",
         onOpen: () => setOpen(true),
         onClose: () => setOpen(false),
       }}
       selections={selections}
+      missingLanguage={missing ? subtitle : undefined}
+      translationSources={missing ? translationSources : undefined}
+      mediaId={episodeId}
+      mediaType="episode"
       onAction={async (action) => {
-        if (action === "search") {
+        if (action === "view") {
+          navigate(
+            `/subtitles/preview/episode/${episodeId}/${encodeURIComponent(buildLanguageKey(subtitle))}`,
+          );
+        } else if (action === "search") {
           await download.mutateAsync({
             seriesId,
             episodeId,
diff --git a/frontend/src/pages/Episodes/table.tsx b/frontend/src/pages/Episodes/table.tsx
index 6330828a3b..00a90758a1 100644
--- a/frontend/src/pages/Episodes/table.tsx
+++ b/frontend/src/pages/Episodes/table.tsx
@@ -19,6 +19,7 @@ import { useModals } from "@/modules/modals";
 import { BuildKey, filterSubtitleBy } from "@/utilities";
 import { useProfileItemsToLanguages } from "@/utilities/languages";
 import { Subtitle } from "./components";
+import tableStyles from "@/components/tables/BaseTable.module.scss";
 
 interface Props {
   episodes: Item.Episode[] | null;
@@ -83,15 +84,19 @@ const Table = forwardRef<TableInstance<Item.Episode> | null, Props>(
               seriesId={seriesId}
               episodeId={episodeId}
               subtitle={val}
+              availableSubtitles={episode.subtitles}
             ></Subtitle>
           ));
 
-          let rawSubtitles = episode.subtitles;
+          let filteredSubtitles = episode.subtitles;
           if (onlyDesired) {
-            rawSubtitles = filterSubtitleBy(rawSubtitles, profileItems);
+            filteredSubtitles = filterSubtitleBy(
+              filteredSubtitles,
+              profileItems,
+            );
           }
 
-          const subtitles = rawSubtitles.map((val, idx) => (
+          const subtitles = filteredSubtitles.map((val, idx) => (
             <Subtitle
               key={BuildKey(idx, val.code2, "valid")}
               seriesId={seriesId}
@@ -145,6 +150,13 @@ const Table = forwardRef<TableInstance<Item.Episode> | null, Props>(
         {
           header: "Episode",
           accessorKey: "episode",
+          cell: ({
+            row: {
+              original: { episode },
+            },
+          }) => {
+            return <span className={tableStyles.episodeNumber}>{episode}</span>;
+          },
         },
         {
           header: "Title",
@@ -156,7 +168,9 @@ const Table = forwardRef<TableInstance<Item.Episode> | null, Props>(
           }) => {
             return (
               <TextPopover text={sceneName}>
-                <Text className="table-primary">{title}</Text>
+                <Text className={`table-primary ${tableStyles.episodeTitle}`}>
+                  {title}
+                </Text>
               </TextPopover>
             );
           },
@@ -185,6 +199,7 @@ const Table = forwardRef<TableInstance<Item.Episode> | null, Props>(
                 <Action
                   label="Manual Search"
                   disabled={disabled}
+                  className={tableStyles.actionIcon}
                   onClick={() => {
                     modals.openContextModal(EpisodeSearchModal, {
                       item: row.original,
@@ -197,6 +212,7 @@ const Table = forwardRef<TableInstance<Item.Episode> | null, Props>(
                 <Action
                   label="History"
                   disabled={disabled}
+                  className={tableStyles.actionIcon}
                   onClick={() => {
                     modals.openContextModal(
                       EpisodeHistoryModal,
diff --git a/frontend/src/pages/History/Series/index.tsx b/frontend/src/pages/History/Series/index.tsx
index dd3cc4743e..ed4b424a6c 100644
--- a/frontend/src/pages/History/Series/index.tsx
+++ b/frontend/src/pages/History/Series/index.tsx
@@ -73,7 +73,7 @@ const SeriesHistoryView: FunctionComponent = () => {
         }) => {
           if (language) {
             return (
-              <Badge color="secondary">
+              <Badge>
                 <Language.Text value={language} long></Language.Text>
               </Badge>
             );
diff --git a/frontend/src/pages/Movies/Details/table.tsx b/frontend/src/pages/Movies/Details/table.tsx
index 828c157af1..fa38e84f1e 100644
--- a/frontend/src/pages/Movies/Details/table.tsx
+++ b/frontend/src/pages/Movies/Details/table.tsx
@@ -1,6 +1,7 @@
 import React, { FunctionComponent, useMemo } from "react";
+import { useNavigate } from "react-router";
 import { Badge, Text, TextProps } from "@mantine/core";
-import { faEllipsis, faSearch } from "@fortawesome/free-solid-svg-icons";
+import { faEllipsis } from "@fortawesome/free-solid-svg-icons";
 import { ColumnDef } from "@tanstack/react-table";
 import { isString } from "lodash";
 import { useMovieSubtitleModification } from "@/apis/hooks";
@@ -28,13 +29,31 @@ function isSubtitleMissing(path: string | undefined | null) {
   return path === missingText;
 }
 
-const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
+function buildLanguageKey(sub: Subtitle): string {
+  let key = sub.code2;
+  if (sub.hi) key += ":hi";
+  if (sub.forced) key += ":forced";
+  return key;
+}
+
+const Table: FunctionComponent<Props> = ({ movie, profile }) => {
   const onlyDesired = useShowOnlyDesired();
 
   const profileItems = useProfileItemsToLanguages(profile);
 
   const { download, remove } = useMovieSubtitleModification();
 
+  // Available subtitles with actual files (for translate-from source)
+  const availableSources = useMemo(
+    () =>
+      (movie?.subtitles ?? []).filter(
+        (s) => s.path && !isSubtitleTrack(s.path),
+      ),
+    [movie?.subtitles],
+  );
+
+  const navigate = useNavigate();
+
   const CodeCell = React.memo(({ item }: { item: Subtitle }) => {
     const { code2, path, hi, forced } = item;
 
@@ -63,22 +82,27 @@ const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
 
     if (isSubtitleMissing(path)) {
       return (
-        <Action
-          label="Search Subtitle"
-          icon={faSearch}
-          disabled={disabled}
-          loading={download.isPending}
-          onClick={async () => {
-            await download.mutateAsync({
-              radarrId,
-              form: {
-                language: code2,
-                forced,
-                hi,
-              },
-            });
+        <SubtitleToolsMenu
+          selections={[]}
+          missingLanguage={item}
+          translationSources={availableSources}
+          mediaId={radarrId}
+          mediaType="movie"
+          onAction={async (action) => {
+            if (action === "search") {
+              await download.mutateAsync({
+                radarrId,
+                form: {
+                  language: code2,
+                  forced,
+                  hi,
+                },
+              });
+            }
           }}
-        ></Action>
+        >
+          <Action label="Subtitle Actions" icon={faEllipsis}></Action>
+        </SubtitleToolsMenu>
       );
     }
 
@@ -86,7 +110,11 @@ const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
       <SubtitleToolsMenu
         selections={selections}
         onAction={async (action) => {
-          if (action === "delete" && path) {
+          if (action === "view") {
+            navigate(
+              `/subtitles/preview/movie/${radarrId}/${encodeURIComponent(buildLanguageKey(item))}`,
+            );
+          } else if (action === "delete" && path) {
             await remove.mutateAsync({
               radarrId,
               form: {
@@ -96,8 +124,6 @@ const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
                 path,
               },
             });
-          } else if (action === "search") {
-            throw new Error("This shouldn't happen, please report the bug");
           }
         }}
       >
@@ -130,7 +156,7 @@ const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
             );
           } else if (isSubtitleMissing(path)) {
             return (
-              <Text {...props} c="dimmed">
+              <Text {...props} c="var(--bz-text-tertiary)">
                 {path}
               </Text>
             );
@@ -145,13 +171,13 @@ const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
         cell: ({ row }) => {
           if (row.original.path === missingText) {
             return (
-              <Badge color="primary">
+              <Badge variant="missing">
                 <Language.Text value={row.original} long></Language.Text>
               </Badge>
             );
           } else {
             return (
-              <Badge color="secondary">
+              <Badge>
                 <Language.Text value={row.original} long></Language.Text>
               </Badge>
             );
@@ -175,12 +201,12 @@ const Table: FunctionComponent<Props> = ({ movie, profile, disabled }) => {
         path: missingText,
       })) ?? [];
 
-    let rawSubtitles = movie?.subtitles ?? [];
+    let subtitles = movie?.subtitles ?? [];
     if (onlyDesired) {
-      rawSubtitles = filterSubtitleBy(rawSubtitles, profileItems);
+      subtitles = filterSubtitleBy(subtitles, profileItems);
     }
 
-    return [...rawSubtitles, ...missing];
+    return [...subtitles, ...missing];
   }, [movie, onlyDesired, profileItems]);
 
   return (
diff --git a/frontend/src/pages/Movies/Editor.tsx b/frontend/src/pages/Movies/Editor.tsx
deleted file mode 100644
index b4c2701010..0000000000
--- a/frontend/src/pages/Movies/Editor.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { FunctionComponent, useMemo } from "react";
-import { Checkbox } from "@mantine/core";
-import { useDocumentTitle } from "@mantine/hooks";
-import { ColumnDef } from "@tanstack/react-table";
-import { useMovieModification, useMovies } from "@/apis/hooks";
-import { useInstanceName } from "@/apis/hooks/site";
-import { QueryOverlay } from "@/components/async";
-import { AudioList } from "@/components/bazarr";
-import LanguageProfileName from "@/components/bazarr/LanguageProfile";
-import MassEditor from "@/pages/views/MassEditor";
-
-const MovieMassEditor: FunctionComponent = () => {
-  const query = useMovies();
-  const mutation = useMovieModification();
-
-  useDocumentTitle(`Movies - ${useInstanceName()} (Mass Editor)`);
-
-  const columns = useMemo<ColumnDef<Item.Movie>[]>(
-    () => [
-      {
-        id: "selection",
-        header: ({ table }) => {
-          return (
-            <Checkbox
-              id="table-header-selection"
-              indeterminate={table.getIsSomeRowsSelected()}
-              checked={table.getIsAllRowsSelected()}
-              onChange={table.getToggleAllRowsSelectedHandler()}
-            ></Checkbox>
-          );
-        },
-        cell: ({ row: { index, getIsSelected, getToggleSelectedHandler } }) => {
-          return (
-            <Checkbox
-              id={`table-cell-${index}`}
-              checked={getIsSelected()}
-              onChange={getToggleSelectedHandler()}
-              onClick={getToggleSelectedHandler()}
-            ></Checkbox>
-          );
-        },
-      },
-      {
-        header: "Name",
-        accessorKey: "title",
-      },
-      {
-        header: "Audio",
-        accessorKey: "audio_language",
-        cell: ({
-          row: {
-            original: { audio_language: audioLanguage },
-          },
-        }) => {
-          return <AudioList audios={audioLanguage}></AudioList>;
-        },
-      },
-      {
-        header: "Languages Profile",
-        accessorKey: "profileId",
-        cell: ({
-          row: {
-            original: { profileId },
-          },
-        }) => {
-          return <LanguageProfileName index={profileId}></LanguageProfileName>;
-        },
-      },
-    ],
-    [],
-  );
-
-  return (
-    <QueryOverlay result={query}>
-      <MassEditor
-        columns={columns}
-        data={query.data ?? []}
-        mutation={mutation}
-      ></MassEditor>
-    </QueryOverlay>
-  );
-};
-
-export default MovieMassEditor;
diff --git a/frontend/src/pages/Movies/index.tsx b/frontend/src/pages/Movies/index.tsx
index 2a01582ea3..82c6edd4ec 100644
--- a/frontend/src/pages/Movies/index.tsx
+++ b/frontend/src/pages/Movies/index.tsx
@@ -1,22 +1,54 @@
-import { FunctionComponent, useMemo, useState } from "react";
+import { FunctionComponent, useCallback, useMemo, useState } from "react";
 import { Link } from "react-router";
-import { Anchor, Badge, Container, Tooltip } from "@mantine/core";
+import {
+  ActionIcon,
+  Anchor,
+  Badge,
+  Checkbox,
+  Container,
+  Group,
+  Menu,
+  Tooltip,
+} from "@mantine/core";
 import { useDocumentTitle } from "@mantine/hooks";
 import { faBookmark as farBookmark } from "@fortawesome/free-regular-svg-icons";
-import { faBookmark, faWrench } from "@fortawesome/free-solid-svg-icons";
+import {
+  faArrowUp,
+  faBookmark,
+  faCheck,
+  faCircleDown,
+  faEllipsisVertical,
+  faHardDrive,
+  faLanguage,
+  faMagnifyingGlass,
+  faSync,
+  faToolbox,
+  faUndo,
+  faWrench,
+} from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ColumnDef } from "@tanstack/react-table";
-import { uniqueId } from "lodash";
+import { uniqBy, uniqueId } from "lodash";
 import { useMovieModification, useMoviesPagination } from "@/apis/hooks";
 import { useInstanceName } from "@/apis/hooks/site";
-import { Action } from "@/components";
+import { useUpgradableItems } from "@/apis/hooks/subtitles";
+import { BatchAction, BatchItem } from "@/apis/raw/subtitles";
+import { Toolbox } from "@/components";
 import { AudioList } from "@/components/bazarr";
 import Language from "@/components/bazarr/Language";
 import LanguageProfileName from "@/components/bazarr/LanguageProfile";
+import { BatchModConfirmModal } from "@/components/forms/BatchModConfirmForm";
+import { ChangeProfileModal } from "@/components/forms/ChangeProfileForm";
 import { ItemEditModal } from "@/components/forms/ItemEditForm";
+import { MassSyncModal } from "@/components/forms/MassSyncForm";
+import {
+  MassTranslateModal,
+  WantedItem,
+} from "@/components/forms/MassTranslateForm";
+import { SUBTITLE_TOOL_ACTIONS } from "@/constants/batch";
 import { useModals } from "@/modules/modals";
 import ItemView from "@/pages/views/ItemView";
-import { BuildKey } from "@/utilities";
+import { BuildKey, GetItemId } from "@/utilities";
 
 const MovieView: FunctionComponent = () => {
   const modifyMovie = useMovieModification();
@@ -26,15 +58,104 @@ const MovieView: FunctionComponent = () => {
   const [audioLanguages, setAudioLanguages] = useState<string[]>([]);
   const [excludeLanguages, setExcludeLanguages] = useState<string[]>([]);
 
-  const hasActiveFilter =
-    search.length > 0 ||
-    audioLanguages.length > 0 ||
-    excludeLanguages.length > 0;
+  const query = useMoviesPagination(true);
+  const { data: upgradableData } = useUpgradableItems();
+  const upgradableMovieIds = useMemo(
+    () => new Set(upgradableData?.movies ?? []),
+    [upgradableData?.movies],
+  );
+
+  const [selections, setSelections] = useState<Item.Movie[]>([]);
+  const [dirties, setDirties] = useState<Item.Movie[]>([]);
+  const setProfiles = useCallback(
+    (id: number | null) => {
+      const newItems = selections.map((v) => ({ ...v, profileId: id }));
+      setDirties((dirty) => uniqBy([...newItems, ...dirty], GetItemId));
+    },
+    [selections],
+  );
+
+  const { mutateAsync } = modifyMovie;
 
-  const query = useMoviesPagination(hasActiveFilter);
+  const save = useCallback(() => {
+    const chunkSize = 1000;
+    const form: FormType.ModifyItem = { id: [], profileid: [] };
+    dirties.forEach((v) => {
+      const id = GetItemId(v);
+      if (id) {
+        form.id.push(id);
+        form.profileid.push(v.profileId);
+      }
+    });
+    const mutateInChunks = async (
+      ids: number[],
+      profileIds: (number | null)[],
+    ) => {
+      if (ids.length === 0) return;
+      await mutateAsync({
+        id: ids.slice(0, chunkSize),
+        profileid: profileIds.slice(0, chunkSize),
+      });
+      await mutateInChunks(ids.slice(chunkSize), profileIds.slice(chunkSize));
+    };
+    return mutateInChunks(form.id, form.profileid);
+  }, [dirties, mutateAsync]);
+
+  const profileToolbar = useMemo(() => {
+    if (selections.length === 0 && dirties.length === 0) return undefined;
+    return (
+      <Group gap="xs">
+        <Toolbox.Button
+          icon={faLanguage}
+          disabled={selections.length === 0}
+          onClick={() => {
+            modals.openContextModal(ChangeProfileModal, {
+              onSelect: setProfiles,
+            });
+          }}
+        >
+          Change Profile
+        </Toolbox.Button>
+        {dirties.length > 0 && (
+          <>
+            <Toolbox.Button icon={faUndo} onClick={() => setDirties([])}>
+              Cancel
+            </Toolbox.Button>
+            <Toolbox.MutateButton
+              icon={faCheck}
+              promise={save}
+              onSuccess={() => setDirties([])}
+            >
+              Save
+            </Toolbox.MutateButton>
+          </>
+        )}
+      </Group>
+    );
+  }, [selections, dirties, modals, setProfiles, save]);
 
   const columns = useMemo<ColumnDef<Item.Movie>[]>(
     () => [
+      {
+        id: "selection",
+        header: ({ table }) => (
+          <Checkbox
+            aria-label="Select all"
+            id="movies-select-all"
+            indeterminate={table.getIsSomeRowsSelected()}
+            checked={table.getIsAllRowsSelected()}
+            onChange={table.getToggleAllRowsSelectedHandler()}
+          />
+        ),
+        cell: ({ row }) => (
+          <Checkbox
+            aria-label={`Select ${row.original.title}`}
+            id={`movies-select-${row.index}`}
+            checked={row.getIsSelected()}
+            onChange={row.getToggleSelectedHandler()}
+          />
+        ),
+      },
       {
         id: "monitored",
         cell: ({
@@ -49,6 +170,23 @@ const MovieView: FunctionComponent = () => {
           </Tooltip>
         ),
       },
+      {
+        id: "upgradable",
+        cell: ({
+          row: {
+            original: { radarrId },
+          },
+        }) =>
+          upgradableMovieIds.has(radarrId) ? (
+            <Tooltip label="Low match score, upgrading may find a better subtitle">
+              <FontAwesomeIcon
+                icon={faCircleDown}
+                color="var(--bz-text-tertiary)"
+                size="sm"
+              />
+            </Tooltip>
+          ) : null,
+      },
       {
         header: "Name",
         accessorKey: "title",
@@ -116,33 +254,221 @@ const MovieView: FunctionComponent = () => {
         },
       },
       {
-        id: "radarrId",
+        id: "actions",
         cell: ({ row }) => {
+          const item = row.original;
+          const batchItem: BatchItem = {
+            type: "movie",
+            radarrId: item.radarrId,
+          };
+          const wantedItem: WantedItem = {
+            type: "movie",
+            radarrId: item.radarrId,
+            title: item.title,
+          };
           return (
-            <Action
-              label="Edit Movie"
-              tooltip={{ position: "left" }}
-              onClick={() =>
-                modals.openContextModal(
-                  ItemEditModal,
-                  {
-                    mutation: modifyMovie,
-                    item: row.original,
-                  },
-                  {
-                    title: row.original.title,
-                  },
-                )
-              }
-              icon={faWrench}
-            ></Action>
+            <Menu shadow="md" width={220} position="bottom-end">
+              <Menu.Target>
+                <Tooltip label="Actions">
+                  <ActionIcon aria-label="Actions" variant="subtle" size="sm">
+                    <FontAwesomeIcon icon={faEllipsisVertical} />
+                  </ActionIcon>
+                </Tooltip>
+              </Menu.Target>
+              <Menu.Dropdown>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faWrench} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(
+                      ItemEditModal,
+                      { mutation: modifyMovie, item },
+                      { title: item.title },
+                    )
+                  }
+                >
+                  Edit
+                </Menu.Item>
+                <Menu.Divider />
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faSync} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(MassSyncModal, {
+                      items: [batchItem],
+                    })
+                  }
+                >
+                  Sync Subtitles
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faLanguage} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(MassTranslateModal, {
+                      items: [wantedItem],
+                    })
+                  }
+                >
+                  Translate
+                </Menu.Item>
+                <Menu.Divider />
+                <Menu.Label>Subtitle Tools</Menu.Label>
+                {SUBTITLE_TOOL_ACTIONS.map(([action, label]) => (
+                  <Menu.Item
+                    key={action}
+                    onClick={() =>
+                      modals.openContextModal(BatchModConfirmModal, {
+                        items: [batchItem],
+                        action,
+                      })
+                    }
+                  >
+                    {label}
+                  </Menu.Item>
+                ))}
+                <Menu.Divider />
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faHardDrive} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(BatchModConfirmModal, {
+                      items: [batchItem],
+                      action: "scan-disk" as BatchAction,
+                    })
+                  }
+                >
+                  Scan Disk
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={
+                    <FontAwesomeIcon icon={faMagnifyingGlass} size="sm" />
+                  }
+                  onClick={() =>
+                    modals.openContextModal(BatchModConfirmModal, {
+                      items: [batchItem],
+                      action: "search-missing" as BatchAction,
+                    })
+                  }
+                >
+                  Search Missing
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faArrowUp} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(BatchModConfirmModal, {
+                      items: [batchItem],
+                      action: "upgrade" as BatchAction,
+                    })
+                  }
+                >
+                  Upgrade
+                </Menu.Item>
+              </Menu.Dropdown>
+            </Menu>
           );
         },
       },
     ],
-    [modals, modifyMovie],
+    [modals, modifyMovie, upgradableMovieIds],
   );
 
+  const selectionToolbar = useMemo(() => {
+    if (selections.length === 0) return undefined;
+
+    const toBatchItems = (): BatchItem[] =>
+      selections.map((m) => ({
+        type: "movie" as const,
+        radarrId: m.radarrId,
+      }));
+
+    const toWantedItems = (): WantedItem[] =>
+      selections.map((m) => ({
+        type: "movie" as const,
+        radarrId: m.radarrId,
+        title: m.title,
+      }));
+
+    return (
+      <Group gap="xs">
+        <Toolbox.Button
+          icon={faSync}
+          onClick={() =>
+            modals.openContextModal(MassSyncModal, { items: toBatchItems() })
+          }
+        >
+          Sync Subtitles
+        </Toolbox.Button>
+
+        <Menu shadow="md" width={220}>
+          <Menu.Target>
+            <div>
+              <Toolbox.Button icon={faToolbox}>Subtitle Tools</Toolbox.Button>
+            </div>
+          </Menu.Target>
+          <Menu.Dropdown>
+            {SUBTITLE_TOOL_ACTIONS.map(([action, label]) => (
+              <Menu.Item
+                key={action}
+                onClick={() =>
+                  modals.openContextModal(BatchModConfirmModal, {
+                    items: toBatchItems(),
+                    action,
+                  })
+                }
+              >
+                {label}
+              </Menu.Item>
+            ))}
+          </Menu.Dropdown>
+        </Menu>
+
+        <Toolbox.Button
+          icon={faLanguage}
+          onClick={() =>
+            modals.openContextModal(MassTranslateModal, {
+              items: toWantedItems(),
+            })
+          }
+        >
+          Translate
+        </Toolbox.Button>
+
+        <Toolbox.Button
+          icon={faHardDrive}
+          onClick={() =>
+            modals.openContextModal(BatchModConfirmModal, {
+              items: toBatchItems(),
+              action: "scan-disk" as BatchAction,
+            })
+          }
+        >
+          Scan Disk
+        </Toolbox.Button>
+
+        <Toolbox.Button
+          icon={faMagnifyingGlass}
+          onClick={() =>
+            modals.openContextModal(BatchModConfirmModal, {
+              items: toBatchItems(),
+              action: "search-missing" as BatchAction,
+            })
+          }
+        >
+          Search Missing
+        </Toolbox.Button>
+
+        <Toolbox.Button
+          icon={faArrowUp}
+          onClick={() =>
+            modals.openContextModal(BatchModConfirmModal, {
+              items: toBatchItems(),
+              action: "upgrade" as BatchAction,
+            })
+          }
+        >
+          Upgrade
+        </Toolbox.Button>
+      </Group>
+    );
+  }, [selections, modals]);
+
   useDocumentTitle(`Movies - ${useInstanceName()}`);
 
   return (
@@ -156,6 +482,10 @@ const MovieView: FunctionComponent = () => {
         onAudioLanguagesChange={setAudioLanguages}
         excludeLanguages={excludeLanguages}
         onExcludeLanguagesChange={setExcludeLanguages}
+        enableRowSelection
+        onSelectionChanged={setSelections}
+        selectionToolbar={selectionToolbar}
+        profileToolbar={profileToolbar}
       ></ItemView>
     </Container>
   );
diff --git a/frontend/src/pages/Movies/movies.test.tsx b/frontend/src/pages/Movies/movies.test.tsx
index a611658aa1..761ad464ee 100644
--- a/frontend/src/pages/Movies/movies.test.tsx
+++ b/frontend/src/pages/Movies/movies.test.tsx
@@ -1,9 +1,8 @@
 import { http } from "msw";
 import { HttpResponse } from "msw";
-import { beforeEach, describe, it } from "vitest";
-import { customRender, screen } from "@/tests";
+import { beforeEach, describe, expect, it } from "vitest";
+import { customRender, screen, waitFor } from "@/tests";
 import server from "@/tests/mocks/node";
-import MovieMassEditor from "./Editor";
 import MovieView from ".";
 
 describe("Movies page", () => {
@@ -17,30 +16,13 @@ describe("Movies page", () => {
     );
   });
 
-  it("should render", () => {
+  it("should render", async () => {
     customRender(<MovieView />);
-  });
-});
-
-describe("Movies editor page", () => {
-  beforeEach(() => {
-    server.use(
-      http.get("/api/movies", () => {
-        return HttpResponse.json({
-          data: [],
-        });
-      }),
-    );
-    server.use(
-      http.get("/api/system/languages/profiles", () => {
-        return HttpResponse.json([]);
-      }),
-    );
-  });
-
-  it("should render", () => {
-    customRender(<MovieMassEditor />);
 
-    expect(screen.getByText("Actions")).toBeInTheDocument();
+    await waitFor(() => {
+      expect(
+        screen.getByPlaceholderText("Search by title..."),
+      ).toBeInTheDocument();
+    });
   });
 });
diff --git a/frontend/src/pages/Series/Editor.tsx b/frontend/src/pages/Series/Editor.tsx
deleted file mode 100644
index c12a5dabf4..0000000000
--- a/frontend/src/pages/Series/Editor.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { FunctionComponent, useMemo } from "react";
-import { Checkbox } from "@mantine/core";
-import { useDocumentTitle } from "@mantine/hooks";
-import { ColumnDef } from "@tanstack/react-table";
-import { useSeries, useSeriesModification } from "@/apis/hooks";
-import { useInstanceName } from "@/apis/hooks/site";
-import { QueryOverlay } from "@/components/async";
-import { AudioList } from "@/components/bazarr";
-import LanguageProfileName from "@/components/bazarr/LanguageProfile";
-import MassEditor from "@/pages/views/MassEditor";
-
-const SeriesMassEditor: FunctionComponent = () => {
-  const query = useSeries();
-  const mutation = useSeriesModification();
-
-  const columns = useMemo<ColumnDef<Item.Series>[]>(
-    () => [
-      {
-        id: "selection",
-        header: ({ table }) => {
-          return (
-            <Checkbox
-              id="table-header-selection"
-              indeterminate={table.getIsSomeRowsSelected()}
-              checked={table.getIsAllRowsSelected()}
-              onChange={table.getToggleAllRowsSelectedHandler()}
-            ></Checkbox>
-          );
-        },
-        cell: ({ row: { index, getIsSelected, getToggleSelectedHandler } }) => {
-          return (
-            <Checkbox
-              id={`table-cell-${index}`}
-              checked={getIsSelected()}
-              onChange={getToggleSelectedHandler()}
-              onClick={getToggleSelectedHandler()}
-            ></Checkbox>
-          );
-        },
-      },
-      {
-        header: "Name",
-        accessorKey: "title",
-      },
-      {
-        header: "Audio",
-        accessorKey: "audio_language",
-        cell: ({
-          row: {
-            original: { audio_language: audioLanguage },
-          },
-        }) => {
-          return <AudioList audios={audioLanguage}></AudioList>;
-        },
-      },
-      {
-        header: "Languages Profile",
-        accessorKey: "profileId",
-        cell: ({
-          row: {
-            original: { profileId },
-          },
-        }) => {
-          return <LanguageProfileName index={profileId}></LanguageProfileName>;
-        },
-      },
-    ],
-    [],
-  );
-
-  useDocumentTitle(`Series - ${useInstanceName()} (Mass Editor)`);
-
-  return (
-    <QueryOverlay result={query}>
-      <MassEditor
-        columns={columns}
-        data={query.data ?? []}
-        mutation={mutation}
-      ></MassEditor>
-    </QueryOverlay>
-  );
-};
-
-export default SeriesMassEditor;
diff --git a/frontend/src/pages/Series/index.tsx b/frontend/src/pages/Series/index.tsx
index 697ce32600..2f464dd7e9 100644
--- a/frontend/src/pages/Series/index.tsx
+++ b/frontend/src/pages/Series/index.tsx
@@ -1,24 +1,55 @@
-import { FunctionComponent, useMemo, useState } from "react";
+import { FunctionComponent, useCallback, useMemo, useState } from "react";
 import { Link } from "react-router";
-import { Anchor, Container, Group, Progress } from "@mantine/core";
+import {
+  ActionIcon,
+  Anchor,
+  Checkbox,
+  Container,
+  Group,
+  Menu,
+  Progress,
+  Tooltip,
+} from "@mantine/core";
 import { useDocumentTitle } from "@mantine/hooks";
 import { faBookmark as farBookmark } from "@fortawesome/free-regular-svg-icons";
 import {
+  faArrowUp,
   faBookmark,
+  faCheck,
+  faCircleDown,
+  faEllipsisVertical,
+  faHardDrive,
+  faLanguage,
+  faMagnifyingGlass,
   faPlay,
   faStop,
+  faSync,
+  faToolbox,
+  faUndo,
   faWrench,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { ColumnDef } from "@tanstack/react-table";
+import { uniqBy } from "lodash";
 import { useSeriesModification, useSeriesPagination } from "@/apis/hooks";
 import { useInstanceName } from "@/apis/hooks/site";
-import { Action } from "@/components";
+import { useUpgradableItems } from "@/apis/hooks/subtitles";
+import { BatchAction, BatchItem } from "@/apis/raw/subtitles";
+import { Toolbox } from "@/components";
 import { AudioList } from "@/components/bazarr";
 import LanguageProfileName from "@/components/bazarr/LanguageProfile";
+import { BatchModConfirmModal } from "@/components/forms/BatchModConfirmForm";
+import { ChangeProfileModal } from "@/components/forms/ChangeProfileForm";
 import { ItemEditModal } from "@/components/forms/ItemEditForm";
+import { MassSyncModal } from "@/components/forms/MassSyncForm";
+import {
+  MassTranslateModal,
+  WantedItem,
+} from "@/components/forms/MassTranslateForm";
+import { SUBTITLE_TOOL_ACTIONS } from "@/constants/batch";
 import { useModals } from "@/modules/modals";
 import ItemView from "@/pages/views/ItemView";
+import { GetItemId } from "@/utilities";
 
 const SeriesView: FunctionComponent = () => {
   const mutation = useSeriesModification();
@@ -28,31 +59,139 @@ const SeriesView: FunctionComponent = () => {
   const [audioLanguages, setAudioLanguages] = useState<string[]>([]);
   const [excludeLanguages, setExcludeLanguages] = useState<string[]>([]);
 
-  const hasActiveFilter =
-    search.length > 0 ||
-    audioLanguages.length > 0 ||
-    excludeLanguages.length > 0;
+  const query = useSeriesPagination(true);
+  const { data: upgradableData } = useUpgradableItems();
+  const upgradableSeriesIds = useMemo(
+    () => new Set(upgradableData?.series ?? []),
+    [upgradableData?.series],
+  );
+
+  const [selections, setSelections] = useState<Item.Series[]>([]);
+  const [dirties, setDirties] = useState<Item.Series[]>([]);
+  const setProfiles = useCallback(
+    (id: number | null) => {
+      const newItems = selections.map((v) => ({ ...v, profileId: id }));
+      setDirties((dirty) => uniqBy([...newItems, ...dirty], GetItemId));
+    },
+    [selections],
+  );
 
-  const query = useSeriesPagination(hasActiveFilter);
+  const { mutateAsync } = mutation;
+
+  const save = useCallback(() => {
+    const chunkSize = 1000;
+    const form: FormType.ModifyItem = { id: [], profileid: [] };
+    dirties.forEach((v) => {
+      const id = GetItemId(v);
+      if (id) {
+        form.id.push(id);
+        form.profileid.push(v.profileId);
+      }
+    });
+    const mutateInChunks = async (
+      ids: number[],
+      profileIds: (number | null)[],
+    ) => {
+      if (ids.length === 0) return;
+      await mutateAsync({
+        id: ids.slice(0, chunkSize),
+        profileid: profileIds.slice(0, chunkSize),
+      });
+      await mutateInChunks(ids.slice(chunkSize), profileIds.slice(chunkSize));
+    };
+    return mutateInChunks(form.id, form.profileid);
+  }, [dirties, mutateAsync]);
+
+  const profileToolbar = useMemo(() => {
+    if (selections.length === 0 && dirties.length === 0) return undefined;
+    return (
+      <Group gap="xs">
+        <Toolbox.Button
+          icon={faLanguage}
+          disabled={selections.length === 0}
+          onClick={() => {
+            modals.openContextModal(ChangeProfileModal, {
+              onSelect: setProfiles,
+            });
+          }}
+        >
+          Change Profile
+        </Toolbox.Button>
+        {dirties.length > 0 && (
+          <>
+            <Toolbox.Button icon={faUndo} onClick={() => setDirties([])}>
+              Cancel
+            </Toolbox.Button>
+            <Toolbox.MutateButton
+              icon={faCheck}
+              promise={save}
+              onSuccess={() => setDirties([])}
+            >
+              Save
+            </Toolbox.MutateButton>
+          </>
+        )}
+      </Group>
+    );
+  }, [selections, dirties, modals, setProfiles, save]);
 
   const columns = useMemo<ColumnDef<Item.Series>[]>(
     () => [
+      {
+        id: "selection",
+        header: ({ table }) => (
+          <Checkbox
+            aria-label="Select all"
+            id="series-select-all"
+            indeterminate={table.getIsSomeRowsSelected()}
+            checked={table.getIsAllRowsSelected()}
+            onChange={table.getToggleAllRowsSelectedHandler()}
+          />
+        ),
+        cell: ({ row }) => (
+          <Checkbox
+            aria-label={`Select ${row.original.title}`}
+            id={`series-select-${row.index}`}
+            checked={row.getIsSelected()}
+            onChange={row.getToggleSelectedHandler()}
+          />
+        ),
+      },
       {
         id: "status",
         cell: ({ row: { original } }) => (
           <Group gap="xs" wrap="nowrap">
-            <FontAwesomeIcon
-              title={original.monitored ? "monitored" : "unmonitored"}
-              icon={original.monitored ? faBookmark : farBookmark}
-            ></FontAwesomeIcon>
-
-            <FontAwesomeIcon
-              title={original.ended ? "Ended" : "Continuing"}
-              icon={original.ended ? faStop : faPlay}
-            ></FontAwesomeIcon>
+            <Tooltip
+              label={
+                original.monitored
+                  ? "Monitored in Sonarr"
+                  : "Unmonitored in Sonarr"
+              }
+            >
+              <FontAwesomeIcon
+                icon={original.monitored ? faBookmark : farBookmark}
+              />
+            </Tooltip>
+
+            <Tooltip label={original.ended ? "Ended" : "Continuing"}>
+              <FontAwesomeIcon icon={original.ended ? faStop : faPlay} />
+            </Tooltip>
           </Group>
         ),
       },
+      {
+        id: "upgradable",
+        cell: ({ row: { original } }) =>
+          upgradableSeriesIds.has(original.sonarrSeriesId) ? (
+            <Tooltip label="Low match score, upgrading may find a better subtitle">
+              <FontAwesomeIcon
+                icon={faCircleDown}
+                color="var(--bz-text-tertiary)"
+                size="sm"
+              />
+            </Tooltip>
+          ) : null,
+      },
       {
         header: "Name",
         accessorKey: "title",
@@ -97,25 +236,39 @@ const SeriesView: FunctionComponent = () => {
 
           const label = `${episodeFileCount - episodeMissingCount}/${episodeFileCount}`;
           return (
-            <Progress.Root key={title} size="xl">
-              <Progress.Section
-                value={
-                  episodeFileCount === 0 || !profileId
-                    ? 0
-                    : (1.0 - episodeMissingCount / episodeFileCount) * 100.0
-                }
-                color={episodeMissingCount === 0 ? "brand" : "yellow"}
-              >
-                <Progress.Label>{label}</Progress.Label>
-              </Progress.Section>
+            <Progress.Root
+              key={title}
+              size="xl"
+              radius="xl"
+              style={{ minWidth: 80, background: "var(--bz-hover-bg)" }}
+            >
+              <Tooltip label={label} withArrow>
+                <Progress.Section
+                  value={
+                    episodeFileCount === 0 || !profileId
+                      ? 0
+                      : (1.0 - episodeMissingCount / episodeFileCount) * 100.0
+                  }
+                  color={episodeMissingCount === 0 ? "brand" : "yellow"}
+                  style={{ borderRadius: "var(--bz-radius-xl)" }}
+                >
+                  <Progress.Label
+                    style={{ fontSize: "0.75rem", fontWeight: 600 }}
+                  >
+                    {label}
+                  </Progress.Label>
+                </Progress.Section>
+              </Tooltip>
               {episodeMissingCount === episodeFileCount && (
                 <Progress.Label
                   styles={{
                     label: {
                       position: "absolute",
-                      top: "3px",
+                      top: "50%",
                       left: "50%",
-                      transform: "translateX(-50%)",
+                      transform: "translate(-50%, -50%)",
+                      fontSize: "0.75rem",
+                      fontWeight: 600,
                     },
                   }}
                 >
@@ -127,33 +280,220 @@ const SeriesView: FunctionComponent = () => {
         },
       },
       {
-        id: "sonarrSeriesId",
+        id: "actions",
         cell: ({ row: { original } }) => {
+          const batchItem: BatchItem = {
+            type: "series",
+            sonarrSeriesId: original.sonarrSeriesId,
+          };
+          const wantedItem: WantedItem = {
+            type: "series",
+            sonarrSeriesId: original.sonarrSeriesId,
+            title: original.title,
+          };
           return (
-            <Action
-              label="Edit Series"
-              tooltip={{ position: "left" }}
-              onClick={() =>
-                modals.openContextModal(
-                  ItemEditModal,
-                  {
-                    mutation,
-                    item: original,
-                  },
-                  {
-                    title: original.title,
-                  },
-                )
-              }
-              icon={faWrench}
-            ></Action>
+            <Menu shadow="md" width={220} position="bottom-end">
+              <Menu.Target>
+                <Tooltip label="Actions">
+                  <ActionIcon aria-label="Actions" variant="subtle" size="sm">
+                    <FontAwesomeIcon icon={faEllipsisVertical} />
+                  </ActionIcon>
+                </Tooltip>
+              </Menu.Target>
+              <Menu.Dropdown>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faWrench} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(
+                      ItemEditModal,
+                      { mutation, item: original },
+                      { title: original.title },
+                    )
+                  }
+                >
+                  Edit
+                </Menu.Item>
+                <Menu.Divider />
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faSync} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(MassSyncModal, {
+                      items: [batchItem],
+                    })
+                  }
+                >
+                  Sync Subtitles
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faLanguage} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(MassTranslateModal, {
+                      items: [wantedItem],
+                    })
+                  }
+                >
+                  Translate
+                </Menu.Item>
+                <Menu.Divider />
+                <Menu.Label>Subtitle Tools</Menu.Label>
+                {SUBTITLE_TOOL_ACTIONS.map(([action, label]) => (
+                  <Menu.Item
+                    key={action}
+                    onClick={() =>
+                      modals.openContextModal(BatchModConfirmModal, {
+                        items: [batchItem],
+                        action,
+                      })
+                    }
+                  >
+                    {label}
+                  </Menu.Item>
+                ))}
+                <Menu.Divider />
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faHardDrive} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(BatchModConfirmModal, {
+                      items: [batchItem],
+                      action: "scan-disk" as BatchAction,
+                    })
+                  }
+                >
+                  Scan Disk
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={
+                    <FontAwesomeIcon icon={faMagnifyingGlass} size="sm" />
+                  }
+                  onClick={() =>
+                    modals.openContextModal(BatchModConfirmModal, {
+                      items: [batchItem],
+                      action: "search-missing" as BatchAction,
+                    })
+                  }
+                >
+                  Search Missing
+                </Menu.Item>
+                <Menu.Item
+                  leftSection={<FontAwesomeIcon icon={faArrowUp} size="sm" />}
+                  onClick={() =>
+                    modals.openContextModal(BatchModConfirmModal, {
+                      items: [batchItem],
+                      action: "upgrade" as BatchAction,
+                    })
+                  }
+                >
+                  Upgrade
+                </Menu.Item>
+              </Menu.Dropdown>
+            </Menu>
           );
         },
       },
     ],
-    [mutation, modals],
+    [mutation, modals, upgradableSeriesIds],
   );
 
+  const selectionToolbar = useMemo(() => {
+    if (selections.length === 0) return undefined;
+
+    const toBatchItems = (): BatchItem[] =>
+      selections.map((s) => ({
+        type: "series" as const,
+        sonarrSeriesId: s.sonarrSeriesId,
+      }));
+
+    const toWantedItems = (): WantedItem[] =>
+      selections.map((s) => ({
+        type: "series" as const,
+        sonarrSeriesId: s.sonarrSeriesId,
+        title: s.title,
+      }));
+
+    return (
+      <Group gap="xs">
+        <Toolbox.Button
+          icon={faSync}
+          onClick={() =>
+            modals.openContextModal(MassSyncModal, { items: toBatchItems() })
+          }
+        >
+          Sync Subtitles
+        </Toolbox.Button>
+
+        <Menu shadow="md" width={220}>
+          <Menu.Target>
+            <div>
+              <Toolbox.Button icon={faToolbox}>Subtitle Tools</Toolbox.Button>
+            </div>
+          </Menu.Target>
+          <Menu.Dropdown>
+            {SUBTITLE_TOOL_ACTIONS.map(([action, label]) => (
+              <Menu.Item
+                key={action}
+                onClick={() =>
+                  modals.openContextModal(BatchModConfirmModal, {
+                    items: toBatchItems(),
+                    action,
+                  })
+                }
+              >
+                {label}
+              </Menu.Item>
+            ))}
+          </Menu.Dropdown>
+        </Menu>
+
+        <Toolbox.Button
+          icon={faLanguage}
+          onClick={() =>
+            modals.openContextModal(MassTranslateModal, {
+              items: toWantedItems(),
+            })
+          }
+        >
+          Translate
+        </Toolbox.Button>
+
+        <Toolbox.Button
+          icon={faHardDrive}
+          onClick={() =>
+            modals.openContextModal(BatchModConfirmModal, {
+              items: toBatchItems(),
+              action: "scan-disk" as BatchAction,
+            })
+          }
+        >
+          Scan Disk
+        </Toolbox.Button>
+
+        <Toolbox.Button
+          icon={faMagnifyingGlass}
+          onClick={() =>
+            modals.openContextModal(BatchModConfirmModal, {
+              items: toBatchItems(),
+              action: "search-missing" as BatchAction,
+            })
+          }
+        >
+          Search Missing
+        </Toolbox.Button>
+
+        <Toolbox.Button
+          icon={faArrowUp}
+          onClick={() =>
+            modals.openContextModal(BatchModConfirmModal, {
+              items: toBatchItems(),
+              action: "upgrade" as BatchAction,
+            })
+          }
+        >
+          Upgrade
+        </Toolbox.Button>
+      </Group>
+    );
+  }, [selections, modals]);
+
   useDocumentTitle(`Series - ${useInstanceName()}`);
 
   return (
@@ -167,6 +507,10 @@ const SeriesView: FunctionComponent = () => {
         onAudioLanguagesChange={setAudioLanguages}
         excludeLanguages={excludeLanguages}
         onExcludeLanguagesChange={setExcludeLanguages}
+        enableRowSelection
+        onSelectionChanged={setSelections}
+        selectionToolbar={selectionToolbar}
+        profileToolbar={profileToolbar}
       ></ItemView>
     </Container>
   );
diff --git a/frontend/src/pages/Series/series.test.tsx b/frontend/src/pages/Series/series.test.tsx
index 268281eb87..6e59715ee3 100644
--- a/frontend/src/pages/Series/series.test.tsx
+++ b/frontend/src/pages/Series/series.test.tsx
@@ -1,9 +1,8 @@
 import { http } from "msw";
 import { HttpResponse } from "msw";
-import { beforeEach, describe, it } from "vitest";
-import { customRender } from "@/tests";
+import { beforeEach, describe, expect, it } from "vitest";
+import { customRender, screen, waitFor } from "@/tests";
 import server from "@/tests/mocks/node";
-import SeriesMassEditor from "./Editor";
 import SeriesView from ".";
 
 describe("Series page", () => {
@@ -17,28 +16,13 @@ describe("Series page", () => {
     );
   });
 
-  it("should render", () => {
+  it("should render", async () => {
     customRender(<SeriesView />);
-  });
-});
-
-describe("Series editor page", () => {
-  beforeEach(() => {
-    server.use(
-      http.get("/api/series", () => {
-        return HttpResponse.json({
-          data: [],
-        });
-      }),
-    );
-    server.use(
-      http.get("/api/system/languages/profiles", () => {
-        return HttpResponse.json([]);
-      }),
-    );
-  });
 
-  it("should render", () => {
-    customRender(<SeriesMassEditor />);
+    await waitFor(() => {
+      expect(
+        screen.getByPlaceholderText("Search by title..."),
+      ).toBeInTheDocument();
+    });
   });
 });
diff --git a/frontend/src/pages/Settings/General/ExternalWebhookSelector.tsx b/frontend/src/pages/Settings/General/ExternalWebhookSelector.tsx
index cf9a7ce94d..b4f2980e5f 100644
--- a/frontend/src/pages/Settings/General/ExternalWebhookSelector.tsx
+++ b/frontend/src/pages/Settings/General/ExternalWebhookSelector.tsx
@@ -33,7 +33,11 @@ const ExternalWebhookSelector: FunctionComponent = () => {
 
   return (
     <Stack gap="md" className={styles.externalWebhookSelector}>
-      <Text size="sm" c="dimmed" className={styles.descriptionText}>
+      <Text
+        size="sm"
+        c="var(--bz-text-tertiary)"
+        className={styles.descriptionText}
+      >
         Send webhook notifications to external services when subtitles are
         downloaded.
         <br />
@@ -59,7 +63,11 @@ const ExternalWebhookSelector: FunctionComponent = () => {
             settingKey="settings-general-external_webhook_url"
             placeholder="http://localhost:2875/triggers/bazarr"
           />
-          <Text size="xs" c="dimmed" className={styles.examplesText}>
+          <Text
+            size="xs"
+            c="var(--bz-text-tertiary)"
+            className={styles.examplesText}
+          >
             Examples:
             <br />โ€ข Autopulse (local):{" "}
             <Code>http://localhost:2875/triggers/bazarr</Code>
diff --git a/frontend/src/pages/Settings/General/index.tsx b/frontend/src/pages/Settings/General/index.tsx
index e8e43e4dc4..63483ab44d 100644
--- a/frontend/src/pages/Settings/General/index.tsx
+++ b/frontend/src/pages/Settings/General/index.tsx
@@ -252,7 +252,7 @@ const SettingsGeneralView: FunctionComponent = () => {
           settingKey="settings-backup-retention"
           rightSection={
             <Box w="4rem" style={{ justifyContent: "flex-end" }}>
-              <MantineText size="xs" px="sm" c="dimmed">
+              <MantineText size="xs" px="sm" c="var(--bz-text-tertiary)">
                 Days
               </MantineText>
             </Box>
diff --git a/frontend/src/pages/Settings/Plex/AuthSection.tsx b/frontend/src/pages/Settings/Plex/AuthSection.tsx
index 59bd91a1a2..02261434b3 100644
--- a/frontend/src/pages/Settings/Plex/AuthSection.tsx
+++ b/frontend/src/pages/Settings/Plex/AuthSection.tsx
@@ -1,4 +1,4 @@
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Alert, Button, Paper, Stack, Text, Title } from "@mantine/core";
 import { notifications } from "@mantine/notifications";
 import { useQueryClient } from "@tanstack/react-query";
@@ -29,26 +29,29 @@ const AuthSection = () => {
 
   const { data: pinData } = usePlexPinCheckQuery(
     pin?.pinId ?? null,
+    pin?.state ?? null,
     isPolling,
     pin?.pinId ? PLEX_AUTH_CONFIG.POLLING_INTERVAL_MS : false,
   );
 
   // Handle successful authentication - stop polling and close window
-  if (pinData?.authenticated && isPolling) {
-    setPin(null);
-    if (authWindowRef.current) {
-      authWindowRef.current.close();
-      authWindowRef.current = null;
+  useEffect(() => {
+    if (pinData?.authenticated && isPolling) {
+      setPin(null);
+      if (authWindowRef.current) {
+        authWindowRef.current.close();
+        authWindowRef.current = null;
+      }
+      // Trigger refetch and invalidate server queries
+      void refetchAuth();
+      void queryClient.invalidateQueries({
+        queryKey: [QueryKeys.Plex, "servers"],
+      });
+      void queryClient.invalidateQueries({
+        queryKey: [QueryKeys.Plex, "selectedServer"],
+      });
     }
-    // Trigger refetch and invalidate server queries
-    void refetchAuth();
-    void queryClient.invalidateQueries({
-      queryKey: [QueryKeys.Plex, "servers"],
-    });
-    void queryClient.invalidateQueries({
-      queryKey: [QueryKeys.Plex, "selectedServer"],
-    });
-  }
+  }, [pinData?.authenticated, isPolling, refetchAuth, queryClient]);
 
   const isAuthenticated = Boolean(
     // eslint-disable-next-line camelcase
@@ -99,7 +102,7 @@ const AuthSection = () => {
 
   if (isPolling && !pinData?.authenticated) {
     return (
-      <Paper withBorder radius="md" p="lg" className={styles.authSection}>
+      <Paper withBorder p="lg" className={styles.authSection}>
         <Stack gap="md">
           <Title order={4}>Plex OAuth</Title>
           <Stack gap="sm">
@@ -132,7 +135,7 @@ const AuthSection = () => {
 
   if (!isAuthenticated) {
     return (
-      <Paper withBorder radius="md" p="lg" className={styles.authSection}>
+      <Paper withBorder p="lg" className={styles.authSection}>
         <Stack gap="md">
           <Title order={4}>Plex OAuth</Title>
           <Stack gap="sm">
@@ -140,7 +143,7 @@ const AuthSection = () => {
               Connect your Plex account to enable secure, automated integration
               with Bazarr.
             </Text>
-            <Text size="xs" c="dimmed">
+            <Text size="xs" c="var(--bz-text-tertiary)">
               Advanced users: Manual configuration is available via config.yaml
               if OAuth is not suitable.
             </Text>
@@ -166,7 +169,7 @@ const AuthSection = () => {
 
   // Authenticated state
   return (
-    <Paper withBorder radius="md" p="lg" className={styles.authSection}>
+    <Paper withBorder p="lg" className={styles.authSection}>
       <Stack gap="md">
         <Title order={4}>Plex OAuth</Title>
         <Alert color="brand" variant="light" className={styles.authAlert}>
diff --git a/frontend/src/pages/Settings/Plex/AutopulseSelector.tsx b/frontend/src/pages/Settings/Plex/AutopulseSelector.tsx
index f45ca48f94..996843d4c5 100644
--- a/frontend/src/pages/Settings/Plex/AutopulseSelector.tsx
+++ b/frontend/src/pages/Settings/Plex/AutopulseSelector.tsx
@@ -94,7 +94,7 @@ const AutopulseSelector: FunctionComponent<AutopulseSelectorProps> = (
         <Text fw={500} size="sm" mb={2} className={styles.labelText}>
           {label}
         </Text>
-        <Text size="xs" c="dimmed">
+        <Text size="xs" c="var(--bz-text-tertiary)">
           {description}
         </Text>
       </div>
@@ -118,13 +118,7 @@ const AutopulseSelector: FunctionComponent<AutopulseSelectorProps> = (
       </Group>
 
       {configData && (
-        <Card
-          withBorder
-          p="md"
-          radius="md"
-          mt="md"
-          className={styles.configCard}
-        >
+        <Card withBorder p="md" mt="md" className={styles.configCard}>
           <Group justify="space-between" align="center" mb="xs">
             <Group gap="xs">
               <Text size="sm" fw={600}>
@@ -184,7 +178,7 @@ const AutopulseSelector: FunctionComponent<AutopulseSelectorProps> = (
           </Code>
 
           <Stack gap="xs" mt="sm">
-            <Text size="xs" c="dimmed">
+            <Text size="xs" c="var(--bz-text-tertiary)">
               <Text component="span" fw={600}>
                 Server:
               </Text>{" "}
@@ -207,7 +201,7 @@ const AutopulseSelector: FunctionComponent<AutopulseSelectorProps> = (
             )}
 
             {configData.template_info && (
-              <Text size="xs" c="dimmed">
+              <Text size="xs" c="var(--bz-text-tertiary)">
                 {configData.template_info}
               </Text>
             )}
diff --git a/frontend/src/pages/Settings/Plex/ConnectionsCard.module.scss b/frontend/src/pages/Settings/Plex/ConnectionsCard.module.scss
index 3bc9cf7d15..3dd2c04c31 100644
--- a/frontend/src/pages/Settings/Plex/ConnectionsCard.module.scss
+++ b/frontend/src/pages/Settings/Plex/ConnectionsCard.module.scss
@@ -1,17 +1,13 @@
 .connectionIndicator {
   &.success {
-    color: var(--mantine-color-green-6);
+    color: var(--bz-stat-completed);
   }
 
   &.error {
-    color: var(--mantine-color-red-6);
+    color: var(--bz-stat-failed);
   }
 }
 
 .serverConnectionCard {
-  background: var(--mantine-color-gray-0);
-
-  [data-mantine-color-scheme="dark"] & {
-    background: var(--mantine-color-dark-6);
-  }
+  background: var(--bz-surface-card);
 }
diff --git a/frontend/src/pages/Settings/Plex/ConnectionsCard.tsx b/frontend/src/pages/Settings/Plex/ConnectionsCard.tsx
index a3ba46848b..fccae1b5f5 100644
--- a/frontend/src/pages/Settings/Plex/ConnectionsCard.tsx
+++ b/frontend/src/pages/Settings/Plex/ConnectionsCard.tsx
@@ -18,7 +18,7 @@ const ConnectionsCard: FC<ConnectionsCardProps> = ({
   if (!server) return null;
 
   return (
-    <Card withBorder p="md" radius="md" className={styles.serverConnectionCard}>
+    <Card withBorder p="md" className={styles.serverConnectionCard}>
       <Text size="sm" fw={600} mb="xs">
         Verified Connections:
       </Text>
diff --git a/frontend/src/pages/Settings/Plex/ServerSection.tsx b/frontend/src/pages/Settings/Plex/ServerSection.tsx
index 108bad3b54..4aac02a50b 100644
--- a/frontend/src/pages/Settings/Plex/ServerSection.tsx
+++ b/frontend/src/pages/Settings/Plex/ServerSection.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import {
   ActionIcon,
   Alert,
@@ -52,14 +52,16 @@ const ServerSection = () => {
   );
 
   // Reset state when authentication changes from false to true (re-authentication)
-  if (isAuthenticated && !wasAuthenticated) {
-    setSelectedServer(null);
-    setIsSelecting(false);
-    setIsSaved(false);
-    setWasAuthenticated(true);
-  } else if (!isAuthenticated && wasAuthenticated) {
-    setWasAuthenticated(false);
-  }
+  useEffect(() => {
+    if (isAuthenticated && !wasAuthenticated) {
+      setSelectedServer(null);
+      setIsSelecting(false);
+      setIsSaved(false);
+      setWasAuthenticated(true);
+    } else if (!isAuthenticated && wasAuthenticated) {
+      setWasAuthenticated(false);
+    }
+  }, [isAuthenticated, wasAuthenticated]);
 
   // Consolidated server selection and saving logic
   const selectAndSaveServer = async (server: Plex.Server) => {
@@ -124,15 +126,24 @@ const ServerSection = () => {
   };
 
   // Run initialization when data is available
-  if (isAuthenticated && (savedSelectedServer || servers.length > 0)) {
-    handleInitialization();
-  }
+  useEffect(() => {
+    if (isAuthenticated && (savedSelectedServer || servers.length > 0)) {
+      handleInitialization();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [
+    isAuthenticated,
+    savedSelectedServer,
+    servers.length,
+    selectedServer,
+    isSaved,
+  ]);
   if (!isAuthenticated) {
     return null;
   }
 
   return (
-    <Paper withBorder radius="md" p="lg" className={styles.serverSection}>
+    <Paper withBorder p="lg" className={styles.serverSection}>
       <Stack gap="lg">
         <Title order={4}>Plex Servers</Title>
 
diff --git a/frontend/src/pages/Settings/Plex/WebhookSelector.tsx b/frontend/src/pages/Settings/Plex/WebhookSelector.tsx
index 7be6736d60..c9775d222d 100644
--- a/frontend/src/pages/Settings/Plex/WebhookSelector.tsx
+++ b/frontend/src/pages/Settings/Plex/WebhookSelector.tsx
@@ -158,7 +158,7 @@ const WebhookSelector: FunctionComponent<WebhookSelectorProps> = (props) => {
                 {label}
               </Text>
               {description && (
-                <Text size="sm" c="dimmed">
+                <Text size="sm" c="var(--bz-text-tertiary)">
                   {description}
                 </Text>
               )}
@@ -209,7 +209,7 @@ const WebhookSelector: FunctionComponent<WebhookSelectorProps> = (props) => {
           <Text fw={500} className={styles.labelText}>
             {label}
           </Text>
-          <Text size="sm" c="dimmed">
+          <Text size="sm" c="var(--bz-text-tertiary)">
             {description ||
               "Create or remove webhooks in Plex to trigger subtitle searches. In this list you can find your current webhooks."}
           </Text>
diff --git a/frontend/src/pages/Settings/Plex/index.tsx b/frontend/src/pages/Settings/Plex/index.tsx
index bbb0536982..8c38b285f6 100644
--- a/frontend/src/pages/Settings/Plex/index.tsx
+++ b/frontend/src/pages/Settings/Plex/index.tsx
@@ -20,7 +20,7 @@ const SettingsPlexView = () => {
       </Section>
 
       <CollapseBox settingKey={plexEnabledKey}>
-        <Paper p="xl" radius="md">
+        <Paper p="xl">
           <Box>
             <PlexSettings />
           </Box>
diff --git a/frontend/src/pages/Settings/Providers/components.tsx b/frontend/src/pages/Settings/Providers/components.tsx
index 67e478e961..cecdc0b283 100644
--- a/frontend/src/pages/Settings/Providers/components.tsx
+++ b/frontend/src/pages/Settings/Providers/components.tsx
@@ -171,7 +171,7 @@ export const ProviderView: FunctionComponent<ProviderViewProps> = ({
                   <MantineText fw={700}>
                     {v.name ?? capitalize(v.key)}
                   </MantineText>
-                  <MantineText size="xs" c="dimmed">
+                  <MantineText size="xs" c="var(--bz-text-tertiary)">
                     Priority: {priority}
                   </MantineText>
                 </Group>
@@ -276,7 +276,7 @@ const ProviderTool: FunctionComponent<ProviderToolProps> = ({
         resolveProviderPriorities(staged, settings)[info.key] ?? 100;
       form.setFieldValue(`settings.${priorityKey}`, priorityValue);
     }
-  }, [info?.key]);
+  }, [info?.key]); // eslint-disable-line react-hooks/exhaustive-deps
 
   const deletePayload = useCallback(() => {
     if (payload && enabledProviders) {
@@ -463,7 +463,7 @@ const ProviderTool: FunctionComponent<ProviderToolProps> = ({
     });
 
     return <Stack gap="xs">{elements}</Stack>;
-  }, [info, form, form.values.settings]);
+  }, [info, form, form.values.settings]); // eslint-disable-line react-hooks/exhaustive-deps
 
   return (
     <SettingsProvider value={settings}>
@@ -498,7 +498,10 @@ const ProviderTool: FunctionComponent<ProviderToolProps> = ({
           <Divider></Divider>
           <Group justify="right">
             <Button hidden={!payload} color="red" onClick={deletePayload}>
-              Disable
+              Delete
+            </Button>
+            <Button variant="default" onClick={() => modals.closeAll()}>
+              Cancel
             </Button>
             <Button
               disabled={!canSave}
@@ -506,7 +509,7 @@ const ProviderTool: FunctionComponent<ProviderToolProps> = ({
                 submit(form.values);
               }}
             >
-              Enable
+              Save
             </Button>
           </Group>
         </Stack>
diff --git a/frontend/src/pages/Settings/Providers/index.tsx b/frontend/src/pages/Settings/Providers/index.tsx
index a0f76ecaa1..49b0e666b0 100644
--- a/frontend/src/pages/Settings/Providers/index.tsx
+++ b/frontend/src/pages/Settings/Providers/index.tsx
@@ -1,6 +1,7 @@
 import { FunctionComponent } from "react";
 import { Anchor } from "@mantine/core";
 import {
+  Check,
   CollapseBox,
   Layout,
   Message,
@@ -17,6 +18,15 @@ const SettingsProvidersView: FunctionComponent = () => {
   return (
     <Layout name="Providers">
       <Section header="Enabled Providers">
+        <Check
+          label="Provider Priority"
+          settingKey="settings-general-use_provider_priority"
+        ></Check>
+        <Message>
+          Query providers in priority order and stop when a subtitle meeting the
+          minimum score is found. When disabled, all providers are queried
+          simultaneously and the best result is selected.
+        </Message>
         <ProviderView
           availableOptions={ProviderList}
           settingsKey="settings-general-enabled_providers"
diff --git a/frontend/src/pages/Settings/Providers/list.ts b/frontend/src/pages/Settings/Providers/list.ts
index 0ee3e1f571..8bf693448d 100644
--- a/frontend/src/pages/Settings/Providers/list.ts
+++ b/frontend/src/pages/Settings/Providers/list.ts
@@ -372,68 +372,15 @@ export const ProviderList: Readonly<ProviderInfo[]> = [
     key: "opensubtitles",
     name: "OpenSubtitles.org",
     description:
-      "Choose between Official API (requires VIP) or Web Scraper (no VIP needed)",
+      "Uses web scraper (OpenSubtitles.org login is no longer available). Get it at https://github.com/LavX/opensubtitles-scraper",
     inputs: [
-      {
-        type: "switch",
-        key: "use_web_scraper",
-        name: "Use Web Scraper (bypasses VIP requirement)",
-        defaultValue: false,
-      },
-      // Web Scraper specific fields - only show when web scraper is enabled
       {
         type: "text",
         key: "scraper_service_url",
         name: "Scraper Service URL",
         defaultValue: "http://localhost:8000",
         description: "URL of the OpenSubtitles scraper service",
-        condition: {
-          key: "use_web_scraper",
-          value: true,
-        },
-      },
-      // API specific fields - only show when web scraper is disabled
-      {
-        type: "text",
-        key: "username",
-        name: "Username",
-        description: "OpenSubtitles.org username",
-        condition: {
-          key: "use_web_scraper",
-          value: false,
-        },
-      },
-      {
-        type: "password",
-        key: "password",
-        name: "Password",
-        description: "OpenSubtitles.org password",
-        condition: {
-          key: "use_web_scraper",
-          value: false,
-        },
-      },
-      {
-        type: "switch",
-        key: "vip",
-        name: "VIP Status",
-        description: "Enable if you have VIP subscription",
-        condition: {
-          key: "use_web_scraper",
-          value: false,
-        },
-      },
-      {
-        type: "switch",
-        key: "ssl",
-        name: "Use SSL",
-        description: "Use secure connection",
-        condition: {
-          key: "use_web_scraper",
-          value: false,
-        },
       },
-      // Common fields - always show
       {
         type: "switch",
         key: "skip_wrong_fps",
diff --git a/frontend/src/pages/Settings/Subtitles/index.tsx b/frontend/src/pages/Settings/Subtitles/index.tsx
index 31856888d9..e00cf56af4 100644
--- a/frontend/src/pages/Settings/Subtitles/index.tsx
+++ b/frontend/src/pages/Settings/Subtitles/index.tsx
@@ -1,17 +1,14 @@
-import React, { FunctionComponent, useMemo } from "react";
-import {
-  Code,
-  Divider,
-  Space,
-  Table,
-  Text as MantineText,
-} from "@mantine/core";
+import React, { FunctionComponent } from "react";
+import { Link } from "react-router";
+import { Code, Space, Table, Text as MantineText } from "@mantine/core";
 import {
   Check,
+  Chips,
   CollapseBox,
   Layout,
   Message,
   MultiSelector,
+  Number,
   Section,
   Selector,
   Slider,
@@ -21,22 +18,15 @@ import {
   SubzeroColorModification,
   SubzeroModification,
 } from "@/pages/Settings/utilities/modifications";
-import { TranslatorStatusPanelWithFormContext } from "@/components/TranslatorStatus";
-import { useTranslatorModels } from "@/apis/hooks/translator";
-import { SelectorOption } from "@/components";
 import {
   adaptiveSearchingDelayOption,
   adaptiveSearchingDeltaOption,
-  aiTranslatorConcurrentOptions,
-  aiTranslatorModelOptions,
-  aiTranslatorReasoningOptions,
   colorOptions,
   embeddedSubtitlesParserOption,
   folderOptions,
   hiExtensionOptions,
   providerOptions,
   syncMaxOffsetSecondsOptions,
-  translatorOption,
 } from "./options";
 
 interface CommandOption {
@@ -130,45 +120,15 @@ const commandOptions: CommandOption[] = [
 
 const commandOptionElements: React.JSX.Element[] = commandOptions.map(
   (op, idx) => (
-    <tr key={idx}>
-      <td>
+    <Table.Tr key={idx}>
+      <Table.Td>
         <Code>{op.option}</Code>
-      </td>
-      <td>{op.description}</td>
-    </tr>
+      </Table.Td>
+      <Table.Td>{op.description}</Table.Td>
+    </Table.Tr>
   ),
 );
 
-/**
- * AI Model Selector that fetches available models from the translator service.
- * Falls back to static options if the service is unavailable.
- */
-const AIModelSelector: FunctionComponent = () => {
-  const { data: modelsResponse, isLoading, isError } = useTranslatorModels();
-
-  const modelOptions = useMemo((): SelectorOption<string>[] => {
-    // If we have data from the service, use it
-    if (modelsResponse?.models && modelsResponse.models.length > 0) {
-      return modelsResponse.models.map((model) => ({
-        label: model.name + (model.is_default ? " (Recommended)" : ""),
-        value: model.id,
-      }));
-    }
-    // Fall back to static options
-    return aiTranslatorModelOptions;
-  }, [modelsResponse]);
-
-  return (
-    <Selector
-      label="AI Model"
-      options={modelOptions}
-      settingKey="settings-translator-openrouter_model"
-      placeholder={isLoading ? "Loading models..." : "Select a model..."}
-      disabled={isLoading}
-    />
-  );
-};
-
 const SettingsSubtitlesView: FunctionComponent = () => {
   return (
     <Layout name="Subtitles">
@@ -566,146 +526,15 @@ const SettingsSubtitlesView: FunctionComponent = () => {
             settingKey="settings-general-postprocessing_cmd"
           ></Text>
           <Table highlightOnHover fs="sm">
-            <tbody>{commandOptionElements}</tbody>
+            <Table.Tbody>{commandOptionElements}</Table.Tbody>
           </Table>
         </CollapseBox>
       </Section>
       <Section header="Translating">
-        <Slider
-          label="Score for Translated Episode and Movie Subtitles"
-          settingKey="settings-translator-default_score"
-        ></Slider>
-        <Selector
-          label="Translator"
-          clearable
-          options={translatorOption}
-          placeholder="Default translator"
-          settingKey="settings-translator-translator_type"
-        ></Selector>
-        <CollapseBox
-          settingKey="settings-translator-translator_type"
-          on={(val) => val === "gemini"}
-        >
-          <Text
-            label="Gemini model"
-            settingKey="settings-translator-gemini_model"
-          />
-          <Text
-            label="Gemini API key"
-            settingKey="settings-translator-gemini_key"
-          ></Text>
-          <Message>
-            You can generate it here: https://aistudio.google.com/apikey
-          </Message>
-        </CollapseBox>
-        <CollapseBox
-          settingKey="settings-translator-translator_type"
-          on={(val) => val === "lingarr"}
-        >
-          <Text
-            label="Lingarr endpoint"
-            settingKey="settings-translator-lingarr_url"
-          />
-          <Message>Base URL of Lingarr (e.g., http://localhost:9876)</Message>
-          <Text
-            label="Lingarr API Key (optional)"
-            settingKey="settings-translator-lingarr_token"
-          />
-          <Message>
-            Optional API key for authentication. Leave empty if your Lingarr
-            instance doesn't require authentication.
-          </Message>
-        </CollapseBox>
-        <CollapseBox
-          settingKey="settings-translator-translator_type"
-          on={(val) => val === "openrouter"}
-        >
-          <Text
-            label="Service URL"
-            settingKey="settings-translator-openrouter_url"
-          />
-          <Message>
-            URL of the AI Subtitle Translator service.
-            <br />
-            <a
-              href="https://github.com/LavX/ai-subtitle-translator"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              https://github.com/LavX/ai-subtitle-translator
-            </a>
-          </Message>
-          <Text
-            label="OpenRouter API Key"
-            settingKey="settings-translator-openrouter_api_key"
-          />
-          <Message>
-            Get your API key at{" "}
-            <a
-              href="https://openrouter.ai/keys"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              https://openrouter.ai/keys
-            </a>
-          </Message>
-          <Text
-            label="AI Model"
-            settingKey="settings-translator-openrouter_model"
-            placeholder="Select or type a model..."
-          />
-          <Message>
-            Models are fetched from the AI Subtitle Translator service. You can
-            also type any model ID from{" "}
-            <a
-              href="https://openrouter.ai/models"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              https://openrouter.ai/models
-            </a>{" "}
-            in the field above.
-          </Message>
-          <Slider
-            label="Temperature"
-            settingKey="settings-translator-openrouter_temperature"
-            min={0}
-            max={1}
-            step={0.1}
-          />
-          <Message>
-            Lower = more deterministic, higher = more creative. Default: 0.3
-          </Message>
-          <Selector
-            label="Max Concurrent Jobs"
-            options={aiTranslatorConcurrentOptions}
-            settingKey="settings-translator-openrouter_max_concurrent"
-          />
-          <Message>
-            Maximum number of translations to process simultaneously. Higher
-            values use more API quota.
-          </Message>
-          <Selector
-            label="Reasoning Mode"
-            options={aiTranslatorReasoningOptions}
-            settingKey="settings-translator-openrouter_reasoning"
-          />
-          <Message>
-            Enable extended thinking for supported models (Gemini, Claude Haiku
-            4.5, Grok). Higher levels improve translation quality but increase
-            cost and time.
-          </Message>
-          <Divider
-            my="md"
-            label="Service Status & Jobs"
-            labelPosition="center"
-          />
-          <TranslatorStatusPanelWithFormContext />
-        </CollapseBox>
-        <Check
-          label="Add translation info at the beginning"
-          settingKey="settings-translator-translator_info"
-        ></Check>
+        <Message>
+          Translator configuration has moved to its own page.{" "}
+          <Link to="/settings/translator">Go to AI Translator โ†’</Link>
+        </Message>
       </Section>
     </Layout>
   );
diff --git a/frontend/src/pages/Settings/Subtitles/options.ts b/frontend/src/pages/Settings/Subtitles/options.ts
index d879e595ad..b14d88f44e 100644
--- a/frontend/src/pages/Settings/Subtitles/options.ts
+++ b/frontend/src/pages/Settings/Subtitles/options.ts
@@ -182,72 +182,3 @@ export const syncMaxOffsetSecondsOptions: SelectorOption<number>[] = [
     value: 600,
   },
 ];
-
-export const translatorOption: SelectorOption<string>[] = [
-  {
-    label: "Google Translate",
-    value: "google_translate",
-  },
-  {
-    label: "Gemini",
-    value: "gemini",
-  },
-  {
-    label: "Lingarr",
-    value: "lingarr",
-  },
-  {
-    label: "AI Subtitle Translator",
-    value: "openrouter",
-  },
-];
-
-export const aiTranslatorModelOptions: SelectorOption<string>[] = [
-  {
-    label: "Gemini 2.5 Flash (Recommended)",
-    value: "google/gemini-2.5-flash-preview-05-20",
-  },
-  {
-    label: "Gemini 2.5 Flash Lite (Fast & Cheap)",
-    value: "google/gemini-2.5-flash-lite-preview-06-17",
-  },
-  {
-    label: "GPT-4o Mini",
-    value: "openai/gpt-4o-mini",
-  },
-  {
-    label: "Claude 3 Haiku",
-    value: "anthropic/claude-3-haiku",
-  },
-  {
-    label: "Claude Haiku 4.5 (Extended Thinking)",
-    value: "anthropic/claude-haiku-4.5",
-  },
-  {
-    label: "LLaMA 4 Maverick",
-    value: "meta-llama/llama-4-maverick",
-  },
-  {
-    label: "Grok 4.1 Fast",
-    value: "x-ai/grok-4.1-fast",
-  },
-  {
-    label: "Kimi K2",
-    value: "moonshotai/kimi-k2-0905",
-  },
-];
-
-export const aiTranslatorReasoningOptions: SelectorOption<string>[] = [
-  { label: "Disabled", value: "disabled" },
-  { label: "Low (Minimal thinking)", value: "low" },
-  { label: "Medium (Default)", value: "medium" },
-  { label: "High (Extended thinking)", value: "high" },
-];
-
-export const aiTranslatorConcurrentOptions: SelectorOption<number>[] = [
-  { label: "1 (Low)", value: 1 },
-  { label: "2 (Default)", value: 2 },
-  { label: "3", value: 3 },
-  { label: "4", value: 4 },
-  { label: "5 (High)", value: 5 },
-];
diff --git a/frontend/src/pages/Settings/Translator/AIModelSelector.tsx b/frontend/src/pages/Settings/Translator/AIModelSelector.tsx
new file mode 100644
index 0000000000..5720e82a8e
--- /dev/null
+++ b/frontend/src/pages/Settings/Translator/AIModelSelector.tsx
@@ -0,0 +1,25 @@
+import { FunctionComponent } from "react";
+import { Autocomplete } from "@mantine/core";
+import { useBaseInput } from "@/pages/Settings/utilities/hooks";
+import { aiTranslatorModelOptions } from "./options";
+
+const modelData = aiTranslatorModelOptions.map((o) => o.value);
+
+const AIModelSelector: FunctionComponent = () => {
+  const { value, update } = useBaseInput<{ settingKey: string }, string>({
+    settingKey: "settings-translator-openrouter_model",
+  });
+
+  return (
+    <Autocomplete
+      label="AI Model"
+      data={modelData}
+      value={(value as string) ?? ""}
+      onChange={(val) => update(val)}
+      placeholder="Select or type any model ID..."
+      limit={30}
+    />
+  );
+};
+
+export default AIModelSelector;
diff --git a/frontend/src/pages/Settings/Translator/ModelDetails.tsx b/frontend/src/pages/Settings/Translator/ModelDetails.tsx
new file mode 100644
index 0000000000..fb5224addb
--- /dev/null
+++ b/frontend/src/pages/Settings/Translator/ModelDetails.tsx
@@ -0,0 +1,246 @@
+import { FunctionComponent } from "react";
+import { Badge, Box, Group, SimpleGrid, Text } from "@mantine/core";
+import { useQuery } from "@tanstack/react-query";
+
+// Average total token usage per translation (calibrated from real data)
+// Episode ~90K tokens, Movie ~180K tokens
+// With caching: ~70% of input tokens hit cache on subsequent episodes (same series = same system prompt)
+const AVG_EPISODE_TOKENS = 90_000;
+const AVG_MOVIE_TOKENS = 180_000;
+const INPUT_RATIO = 0.4;
+const OUTPUT_RATIO = 0.6;
+const CACHE_HIT_RATIO = 0.7; // 70% of input tokens from cache on repeat runs
+
+// Reasoning adds extra output tokens (thinking). Multiplier on output token count.
+const REASONING_OUTPUT_MULTIPLIER: Record<string, number> = {
+  disabled: 1,
+  low: 1.3,
+  medium: 1.8,
+  high: 2.5,
+};
+
+interface OpenRouterModel {
+  id: string;
+  name: string;
+  context_length: number;
+  pricing: {
+    prompt: string;
+    completion: string;
+    cache_read?: string;
+    cache_write?: string;
+  };
+  architecture?: {
+    modality: string;
+  };
+  top_provider?: {
+    max_completion_tokens?: number;
+  };
+  supported_parameters?: string[];
+}
+
+function useOpenRouterModelDetails(modelId: string) {
+  return useQuery({
+    queryKey: ["openrouter", "models", modelId],
+    queryFn: async () => {
+      const response = await fetch("https://openrouter.ai/api/v1/models");
+      const data = await response.json();
+      const found = data.data?.find((m: OpenRouterModel) => m.id === modelId);
+      return (found as OpenRouterModel) || null;
+    },
+    enabled: !!modelId,
+    staleTime: 5 * 60 * 1000,
+    retry: false,
+  });
+}
+
+function calcCost(
+  totalTokens: number,
+  promptCost: number,
+  completionCost: number,
+  cacheReadCost: number | null,
+  reasoningMultiplier: number,
+) {
+  const inputTokens = totalTokens * INPUT_RATIO;
+  const outputTokens = totalTokens * OUTPUT_RATIO * reasoningMultiplier;
+
+  // Standard cost (no caching)
+  const standard = inputTokens * promptCost + outputTokens * completionCost;
+
+  // Cached cost (subsequent episodes reuse system prompt)
+  if (cacheReadCost !== null) {
+    const cachedInput = inputTokens * CACHE_HIT_RATIO * cacheReadCost;
+    const uncachedInput = inputTokens * (1 - CACHE_HIT_RATIO) * promptCost;
+    const cached = cachedInput + uncachedInput + outputTokens * completionCost;
+    return { standard, cached };
+  }
+
+  return { standard, cached: null };
+}
+
+const formatCost = (cost: number) => {
+  if (cost === 0) return "Free";
+  if (cost < 0.001) return `$${(cost * 1000).toFixed(4)}/1K`;
+  return `$${cost.toFixed(4)}`;
+};
+
+const formatPerMillion = (perToken: number) => {
+  if (perToken === 0) return "Free";
+  return `$${(perToken * 1_000_000).toFixed(2)}/M`;
+};
+
+interface ModelDetailsProps {
+  modelId: string;
+  reasoningLevel?: string;
+}
+
+const ModelDetailsCard: FunctionComponent<ModelDetailsProps> = ({
+  modelId,
+  reasoningLevel = "disabled",
+}) => {
+  const { data: model, isLoading: loading } =
+    useOpenRouterModelDetails(modelId);
+
+  if (loading) {
+    return (
+      <Text size="xs" c="var(--bz-text-tertiary)" mt="xs">
+        Loading model details...
+      </Text>
+    );
+  }
+
+  if (!model) {
+    return (
+      <Text size="xs" c="var(--bz-text-tertiary)" mt="xs">
+        Model details unavailable for {modelId}
+      </Text>
+    );
+  }
+
+  const promptCost = parseFloat(model.pricing.prompt);
+  const completionCost = parseFloat(model.pricing.completion);
+  const cacheReadCost = model.pricing.cache_read
+    ? parseFloat(model.pricing.cache_read)
+    : null;
+  const cacheWriteCost = model.pricing.cache_write
+    ? parseFloat(model.pricing.cache_write)
+    : null;
+  const hasCache = cacheReadCost !== null || cacheWriteCost !== null;
+
+  const supportsReasoning =
+    model.supported_parameters?.includes("reasoning") ?? false;
+  const effectiveReasoning = supportsReasoning ? reasoningLevel : "disabled";
+  const reasoningMul = REASONING_OUTPUT_MULTIPLIER[effectiveReasoning] ?? 1;
+
+  const episode = calcCost(
+    AVG_EPISODE_TOKENS,
+    promptCost,
+    completionCost,
+    cacheReadCost,
+    reasoningMul,
+  );
+  const movie = calcCost(
+    AVG_MOVIE_TOKENS,
+    promptCost,
+    completionCost,
+    cacheReadCost,
+    reasoningMul,
+  );
+
+  return (
+    <Box mt="xs">
+      <Text
+        size="xs"
+        c="var(--bz-text-tertiary)"
+        tt="uppercase"
+        style={{ letterSpacing: 0.5 }}
+        fw={600}
+        mb="xs"
+      >
+        {model.name}
+      </Text>
+      {/* Per-million pricing โ€” always show all available prices */}
+      <SimpleGrid cols={{ base: 2, sm: hasCache ? 4 : 2 }} spacing="xs">
+        <Box>
+          <Text size="xs" c="var(--bz-text-tertiary)">
+            Input
+          </Text>
+          <Text size="sm" fw={600}>
+            {formatPerMillion(promptCost)}
+          </Text>
+        </Box>
+        <Box>
+          <Text size="xs" c="var(--bz-text-tertiary)">
+            Output
+          </Text>
+          <Text size="sm" fw={600}>
+            {formatPerMillion(completionCost)}
+          </Text>
+        </Box>
+        {cacheReadCost !== null && (
+          <Box>
+            <Text size="xs" c="var(--bz-text-tertiary)">
+              Cache Read
+            </Text>
+            <Text size="sm" fw={600} c="cyan.4">
+              {formatPerMillion(cacheReadCost)}
+            </Text>
+          </Box>
+        )}
+        {cacheWriteCost !== null && (
+          <Box>
+            <Text size="xs" c="var(--bz-text-tertiary)">
+              Cache Write
+            </Text>
+            <Text size="sm" fw={600} c="cyan.4">
+              {formatPerMillion(cacheWriteCost)}
+            </Text>
+          </Box>
+        )}
+      </SimpleGrid>
+      {/* Estimations โ€” single best estimate per type */}
+      <SimpleGrid cols={{ base: 2, sm: 2 }} spacing="xs" mt="xs">
+        <Box>
+          <Text size="xs" c="var(--bz-text-tertiary)">
+            Est. / Episode
+          </Text>
+          <Text size="sm" fw={600} c="green.4">
+            {formatCost(episode.cached ?? episode.standard)}
+          </Text>
+        </Box>
+        <Box>
+          <Text size="xs" c="var(--bz-text-tertiary)">
+            Est. / Movie
+          </Text>
+          <Text size="sm" fw={600} c="green.4">
+            {formatCost(movie.cached ?? movie.standard)}
+          </Text>
+        </Box>
+      </SimpleGrid>
+      <Group gap="xs" mt={6}>
+        <Badge size="xs" variant="light" color="gray">
+          Context: {(model.context_length / 1024).toFixed(0)}K tokens
+        </Badge>
+        {model.top_provider?.max_completion_tokens && (
+          <Badge size="xs" variant="light" color="gray">
+            Max output:{" "}
+            {(model.top_provider.max_completion_tokens / 1024).toFixed(0)}K
+            tokens
+          </Badge>
+        )}
+        {model.supported_parameters?.includes("reasoning") && (
+          <Badge size="xs" variant="light" color="blue">
+            Reasoning
+          </Badge>
+        )}
+        {hasCache && (
+          <Badge size="xs" variant="light" color="cyan">
+            Prompt caching
+          </Badge>
+        )}
+      </Group>
+    </Box>
+  );
+};
+
+export { useOpenRouterModelDetails };
+export default ModelDetailsCard;
diff --git a/frontend/src/pages/Settings/Translator/Translator.test.tsx b/frontend/src/pages/Settings/Translator/Translator.test.tsx
new file mode 100644
index 0000000000..776a098662
--- /dev/null
+++ b/frontend/src/pages/Settings/Translator/Translator.test.tsx
@@ -0,0 +1,48 @@
+import { describe, expect, it } from "vitest";
+import {
+  aiTranslatorConcurrentOptions,
+  aiTranslatorModelOptions,
+  aiTranslatorReasoningOptions,
+  translatorOption,
+} from "./options";
+
+describe("Translator options", () => {
+  it("exports all required option arrays", () => {
+    expect(translatorOption).toBeDefined();
+    expect(translatorOption.length).toBeGreaterThan(0);
+    expect(
+      translatorOption.find((o) => o.value === "openrouter"),
+    ).toBeDefined();
+
+    expect(aiTranslatorModelOptions).toBeDefined();
+    expect(aiTranslatorModelOptions.length).toBeGreaterThan(0);
+
+    expect(aiTranslatorReasoningOptions).toBeDefined();
+    expect(aiTranslatorReasoningOptions).toContainEqual({
+      label: "Disabled",
+      value: "disabled",
+    });
+
+    expect(aiTranslatorConcurrentOptions).toBeDefined();
+    expect(aiTranslatorConcurrentOptions.length).toBe(5);
+  });
+
+  it("includes all 4 translator engines", () => {
+    const values = translatorOption.map((o) => o.value);
+    expect(values).toContain("google_translate");
+    expect(values).toContain("gemini");
+    expect(values).toContain("lingarr");
+    expect(values).toContain("openrouter");
+  });
+
+  it("concurrent options range from 1 to 5", () => {
+    const values = aiTranslatorConcurrentOptions.map((o) => o.value);
+    expect(values).toEqual([1, 2, 3, 4, 5]);
+  });
+
+  it("reasoning options include disabled and high", () => {
+    const values = aiTranslatorReasoningOptions.map((o) => o.value);
+    expect(values).toContain("disabled");
+    expect(values).toContain("high");
+  });
+});
diff --git a/frontend/src/pages/Settings/Translator/index.tsx b/frontend/src/pages/Settings/Translator/index.tsx
new file mode 100644
index 0000000000..6a06af62b4
--- /dev/null
+++ b/frontend/src/pages/Settings/Translator/index.tsx
@@ -0,0 +1,518 @@
+import { FunctionComponent, useEffect } from "react";
+import {
+  Alert,
+  Anchor,
+  Badge,
+  Button,
+  Group,
+  Paper,
+  SimpleGrid,
+  Stack,
+  Text as MantineText,
+  Tooltip,
+  UnstyledButton,
+} from "@mantine/core";
+import { notifications } from "@mantine/notifications";
+import {
+  faCircleInfo,
+  faExclamationTriangle,
+} from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { useTestTranslator } from "@/apis/hooks/translator";
+import { TranslatorStatusPanelWithFormContext } from "@/components/TranslatorStatus";
+import {
+  Check,
+  Chips,
+  CollapseBox,
+  Layout,
+  Message,
+  Number,
+  Password,
+  Section,
+  Selector,
+  Slider,
+  Text,
+} from "@/pages/Settings/components";
+import { useFormActions } from "@/pages/Settings/utilities/FormValues";
+import { useSettingValue } from "@/pages/Settings/utilities/hooks";
+import AIModelSelector from "./AIModelSelector";
+import ModelDetailsCard, { useOpenRouterModelDetails } from "./ModelDetails";
+import {
+  aiTranslatorConcurrentOptions,
+  aiTranslatorParallelBatchesOptions,
+  aiTranslatorReasoningOptions,
+} from "./options";
+
+const engineOptions = [
+  { value: "openrouter", label: "OpenRouter" },
+  { value: "google_translate", label: "Google Translate" },
+  { value: "gemini", label: "Gemini" },
+  { value: "lingarr", label: "Lingarr" },
+];
+
+const TranslatorEnginePicker: FunctionComponent = () => {
+  const current = useSettingValue<string>(
+    "settings-translator-translator_type",
+  );
+  const { setValue } = useFormActions();
+
+  return (
+    <Group gap="xs" wrap="wrap">
+      {engineOptions.map((opt) => {
+        const active = current === opt.value;
+        return (
+          <UnstyledButton
+            key={opt.value}
+            onClick={() =>
+              setValue(
+                active ? null : opt.value,
+                "settings-translator-translator_type",
+              )
+            }
+          >
+            <Badge
+              size="lg"
+              variant={active ? "gradient" : "outline"}
+              gradient={
+                active
+                  ? { from: "brand.5", to: "brand.6", deg: 135 }
+                  : undefined
+              }
+              color={active ? undefined : "gray"}
+              style={{
+                cursor: "pointer",
+                opacity: active ? 1 : 0.55,
+                transition: "all 150ms ease",
+              }}
+            >
+              {opt.label}
+            </Badge>
+          </UnstyledButton>
+        );
+      })}
+    </Group>
+  );
+};
+
+const FreeModelWarning: FunctionComponent = () => {
+  const modelId = useSettingValue<string>(
+    "settings-translator-openrouter_model",
+  );
+  if (!modelId) return null;
+  const isFree =
+    modelId === "openrouter/free" ||
+    modelId.endsWith(":free") ||
+    modelId.includes("/free");
+  if (!isFree) return null;
+
+  return (
+    <Alert
+      color="yellow"
+      variant="light"
+      icon={<FontAwesomeIcon icon={faExclamationTriangle} />}
+      p="xs"
+    >
+      <MantineText size="xs">
+        Free models are heavily rate-limited by their upstream providers. Expect
+        slow translations, frequent retries, and possible job failures. Use a
+        paid model for reliable results.
+      </MantineText>
+    </Alert>
+  );
+};
+
+const ReasoningSelector: FunctionComponent = () => {
+  const modelId = useSettingValue<string>(
+    "settings-translator-openrouter_model",
+  );
+  const { data: model, isLoading } = useOpenRouterModelDetails(modelId ?? "");
+  const modelLoaded = !!model && !isLoading;
+  const supportsReasoning =
+    model?.supported_parameters?.includes("reasoning") ?? false;
+  const { setValue } = useFormActions();
+
+  // Only auto-disable after model data has loaded, not while loading
+  const currentReasoning = useSettingValue<string>(
+    "settings-translator-openrouter_reasoning",
+  );
+  useEffect(() => {
+    if (
+      modelLoaded &&
+      !supportsReasoning &&
+      currentReasoning &&
+      currentReasoning !== "disabled"
+    ) {
+      setValue("disabled", "settings-translator-openrouter_reasoning");
+    }
+  }, [modelLoaded, supportsReasoning, currentReasoning, setValue]);
+
+  return (
+    <Selector
+      label="Reasoning Mode"
+      options={aiTranslatorReasoningOptions}
+      settingKey="settings-translator-openrouter_reasoning"
+      disabled={modelLoaded && !supportsReasoning}
+    />
+  );
+};
+
+const ModelDetailsFromSetting: FunctionComponent = () => {
+  const modelId = useSettingValue<string>(
+    "settings-translator-openrouter_model",
+  );
+  const reasoningLevel = useSettingValue<string>(
+    "settings-translator-openrouter_reasoning",
+  );
+  if (!modelId) return null;
+  return (
+    <ModelDetailsCard
+      modelId={modelId}
+      reasoningLevel={reasoningLevel ?? "disabled"}
+    />
+  );
+};
+
+const TestConnectionButton: FunctionComponent = () => {
+  const testMutation = useTestTranslator();
+  const serviceUrl = useSettingValue<string>(
+    "settings-translator-openrouter_url",
+  );
+  const apiKey = useSettingValue<string>(
+    "settings-translator-openrouter_api_key",
+  );
+  const encryptionKey = useSettingValue<string>(
+    "settings-translator-openrouter_encryption_key",
+  );
+
+  const handleTest = () => {
+    testMutation.mutate(
+      {
+        serviceUrl: serviceUrl ?? undefined,
+        apiKey: apiKey ?? undefined,
+        encryptionKey: encryptionKey ?? undefined,
+      },
+      {
+        onSuccess: (data) => {
+          if (data.error) {
+            notifications.show({
+              title: "Connection Failed",
+              message: data.error,
+              color: "red",
+            });
+            return;
+          }
+          if (data.encryption) {
+            const encOk = data.encryption.status === "ok";
+            notifications.show({
+              title: encOk ? "Encryption" : "Encryption Failed",
+              message: data.encryption.message,
+              color: encOk ? "green" : "red",
+            });
+          }
+          if (data.apiKey) {
+            const keyOk = data.apiKey.status === "ok";
+            notifications.show({
+              title: keyOk ? "API Key" : "API Key Failed",
+              message: keyOk
+                ? `${data.apiKey.label}${data.apiKey.isFreeTier ? " (Free tier)" : ""}`
+                : "API key validation failed",
+              color: keyOk ? "green" : "red",
+            });
+          }
+          if (!data.encryption && !data.apiKey) {
+            notifications.show({
+              title: "Connected",
+              message: "Service reachable",
+              color: "green",
+            });
+          }
+        },
+        onError: () => {
+          notifications.show({
+            title: "Connection Failed",
+            message: "Could not reach the translator service",
+            color: "red",
+          });
+        },
+      },
+    );
+  };
+
+  return (
+    <Button
+      variant="default"
+      size="xs"
+      onClick={handleTest}
+      loading={testMutation.isPending}
+      disabled={!serviceUrl || !apiKey}
+    >
+      Test Connection
+    </Button>
+  );
+};
+
+const SettingsTranslatorView: FunctionComponent = () => {
+  return (
+    <Layout name="AI Translator">
+      {/* Zone 1: Translator Engine */}
+      <Group justify="space-between" align="flex-start" mt="lg" wrap="wrap">
+        <Stack gap="xs">
+          <MantineText size="sm" fw={600}>
+            Translator Engine
+          </MantineText>
+          <TranslatorEnginePicker />
+        </Stack>
+        <Group gap="lg" align="center">
+          <Group gap="xs" align="center">
+            <MantineText size="sm" c="var(--bz-text-tertiary)">
+              Score
+            </MantineText>
+            <Number
+              settingKey="settings-translator-default_score"
+              min={0}
+              max={100}
+              step={1}
+              w={70}
+              size="xs"
+            />
+            <Tooltip
+              label="Score assigned to translated subtitles (0-100). Higher scores are preferred over lower ones."
+              multiline
+              w={250}
+              withArrow
+            >
+              <MantineText
+                size="xs"
+                c="var(--bz-text-tertiary)"
+                style={{ cursor: "help" }}
+                component="span"
+              >
+                <FontAwesomeIcon icon={faCircleInfo} />
+              </MantineText>
+            </Tooltip>
+          </Group>
+          <Group gap="xs" align="center">
+            <Check
+              label="Translation credit"
+              settingKey="settings-translator-translator_info"
+            />
+            <Tooltip
+              label="Appends a brief credit subtitle at the end of translated files (e.g. '# Subtitles translated with AI Subtitle Translator #')"
+              multiline
+              w={280}
+              withArrow
+            >
+              <MantineText
+                size="xs"
+                c="var(--bz-text-tertiary)"
+                style={{ cursor: "help" }}
+                component="span"
+              >
+                <FontAwesomeIcon icon={faCircleInfo} />
+              </MantineText>
+            </Tooltip>
+          </Group>
+        </Group>
+      </Group>
+
+      {/* Gemini config โ€” unchanged */}
+      <CollapseBox
+        settingKey="settings-translator-translator_type"
+        on={(val) => val === "gemini"}
+      >
+        <Section header="Gemini Configuration">
+          <Text
+            label="Gemini model"
+            settingKey="settings-translator-gemini_model"
+          />
+          <Number
+            label="Gemini batch size"
+            settingKey="settings-translator-gemini_batch_size"
+            min={1}
+          />
+          <Message>
+            Number of subtitle lines sent in each Gemini request. Higher values
+            reduce the number of API calls and can speed up translation, but may
+            increase timeout or response-size errors. Start with 300 (default),
+            then lower it if requests fail or raise it gradually if your model
+            handles larger batches reliably.
+          </Message>
+          <Chips
+            label="Gemini API keys"
+            settingKey="settings-translator-gemini_keys"
+            sanitizeFn={(values) => {
+              const uniqueKeys = new Set(
+                (values ?? []).map((value) => value.trim()).filter(Boolean),
+              );
+              return Array.from(uniqueKeys);
+            }}
+          />
+          <Message>
+            You can generate keys here: https://aistudio.google.com/apikey. Add
+            as many keys as needed; Bazarr rotates across available keys.
+          </Message>
+        </Section>
+      </CollapseBox>
+
+      {/* Lingarr config โ€” unchanged */}
+      <CollapseBox
+        settingKey="settings-translator-translator_type"
+        on={(val) => val === "lingarr"}
+      >
+        <Section header="Lingarr Configuration">
+          <Text
+            label="Lingarr endpoint"
+            settingKey="settings-translator-lingarr_url"
+          />
+          <Message>Base URL of Lingarr (e.g., http://localhost:9876)</Message>
+          <Text
+            label="Lingarr API Key (optional)"
+            settingKey="settings-translator-lingarr_token"
+          />
+          <Message>
+            Optional API key for authentication. Leave empty if your Lingarr
+            instance doesn't require authentication.
+          </Message>
+        </Section>
+      </CollapseBox>
+
+      {/* AI Subtitle Translator โ€” Zones 2-4 */}
+      <CollapseBox
+        settingKey="settings-translator-translator_type"
+        on={(val) => val === "openrouter"}
+      >
+        <Stack gap="md" mt="md">
+          {/* Zone 2: Connection Card */}
+          <Paper withBorder p="md">
+            <SimpleGrid cols={{ base: 1, sm: 3 }}>
+              <div>
+                <Text
+                  label="Service URL"
+                  settingKey="settings-translator-openrouter_url"
+                />
+                <MantineText size="xs" c="var(--bz-text-tertiary)" mt={4}>
+                  <Anchor
+                    href="https://github.com/LavX/ai-subtitle-translator/blob/main/docs/BAZARR-SETUP.md"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    size="xs"
+                    c="yellow.6"
+                  >
+                    Setup guide
+                  </Anchor>
+                </MantineText>
+              </div>
+              <div>
+                <Password
+                  label="OpenRouter API Key"
+                  settingKey="settings-translator-openrouter_api_key"
+                />
+                <MantineText size="xs" c="var(--bz-text-tertiary)" mt={4}>
+                  <Anchor
+                    href="https://openrouter.ai/keys"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    size="xs"
+                    c="yellow.6"
+                  >
+                    Get your API key
+                  </Anchor>
+                </MantineText>
+              </div>
+              <div>
+                <Password
+                  label="Encryption Key (optional)"
+                  settingKey="settings-translator-openrouter_encryption_key"
+                />
+                <MantineText size="xs" c="var(--bz-text-tertiary)" mt={4}>
+                  <Anchor
+                    href="https://github.com/LavX/ai-subtitle-translator/blob/main/docs/BAZARR-SETUP.md#get-your-encryption-key"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    size="xs"
+                    c="yellow.6"
+                  >
+                    How to get your key
+                  </Anchor>
+                </MantineText>
+              </div>
+            </SimpleGrid>
+            <Group mt="xs" justify="flex-end">
+              <TestConnectionButton />
+            </Group>
+          </Paper>
+
+          {/* Zone 3: Model & Tuning Card */}
+          <Paper withBorder p="md">
+            <Stack gap="xs">
+              <AIModelSelector />
+              <FreeModelWarning />
+              <MantineText size="xs" c="var(--bz-text-tertiary)">
+                Models are fetched from the service. You can also type any model
+                ID from{" "}
+                <Anchor
+                  href="https://openrouter.ai/models"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  size="xs"
+                >
+                  openrouter.ai/models
+                </Anchor>
+              </MantineText>
+              <ModelDetailsFromSetting />
+              <SimpleGrid cols={{ base: 1, sm: 4 }} mt="xs">
+                <div>
+                  <Slider
+                    label="Temperature"
+                    settingKey="settings-translator-openrouter_temperature"
+                    min={0}
+                    max={1}
+                    step={0.1}
+                  />
+                  <MantineText
+                    size="xs"
+                    c="var(--bz-text-tertiary)"
+                    mt={4}
+                    ta="center"
+                  >
+                    deterministic โ† โ†’ creative
+                  </MantineText>
+                </div>
+                <ReasoningSelector />
+                <Tooltip
+                  label="Hard limit on simultaneous translation jobs. Bazarr will queue excess jobs until a slot opens."
+                  multiline
+                  w={250}
+                  withArrow
+                >
+                  <Selector
+                    label="Max Concurrent Jobs"
+                    options={aiTranslatorConcurrentOptions}
+                    settingKey="settings-translator-openrouter_max_concurrent"
+                  />
+                </Tooltip>
+                <Tooltip
+                  label="Batches sent in parallel per job. Higher = faster but more rate limits. Keep low (1-2) for free models."
+                  multiline
+                  w={250}
+                  withArrow
+                >
+                  <Selector
+                    label="Parallel Batches"
+                    options={aiTranslatorParallelBatchesOptions}
+                    settingKey="settings-translator-openrouter_parallel_batches"
+                  />
+                </Tooltip>
+              </SimpleGrid>
+            </Stack>
+          </Paper>
+
+          {/* Zone 4: Status & Jobs */}
+          <TranslatorStatusPanelWithFormContext />
+        </Stack>
+      </CollapseBox>
+    </Layout>
+  );
+};
+
+export default SettingsTranslatorView;
diff --git a/frontend/src/pages/Settings/Translator/options.ts b/frontend/src/pages/Settings/Translator/options.ts
new file mode 100644
index 0000000000..a0bba7edbe
--- /dev/null
+++ b/frontend/src/pages/Settings/Translator/options.ts
@@ -0,0 +1,92 @@
+import { SelectorOption } from "@/components";
+
+export const translatorOption: SelectorOption<string>[] = [
+  { label: "OpenRouter", value: "openrouter" },
+  { label: "Google Translate", value: "google_translate" },
+  { label: "Gemini", value: "gemini" },
+  { label: "Lingarr", value: "lingarr" },
+];
+
+export const aiTranslatorModelOptions: SelectorOption<string>[] = [
+  { label: "anthropic/claude-haiku-4.5", value: "anthropic/claude-haiku-4.5" },
+  {
+    label: "anthropic/claude-sonnet-4.6",
+    value: "anthropic/claude-sonnet-4.6",
+  },
+  {
+    label: "bytedance-seed/seed-2.0-mini",
+    value: "bytedance-seed/seed-2.0-mini",
+  },
+  { label: "google/gemini-2.5-flash", value: "google/gemini-2.5-flash" },
+  {
+    label: "google/gemini-2.5-flash-lite-preview-09-2025",
+    value: "google/gemini-2.5-flash-lite-preview-09-2025",
+  },
+  { label: "google/gemini-2.5-pro", value: "google/gemini-2.5-pro" },
+  {
+    label: "google/gemini-3-flash-preview",
+    value: "google/gemini-3-flash-preview",
+  },
+  {
+    label: "google/gemini-3-pro-preview",
+    value: "google/gemini-3-pro-preview",
+  },
+  {
+    label: "google/gemini-3.1-flash-lite-preview",
+    value: "google/gemini-3.1-flash-lite-preview",
+  },
+  {
+    label: "google/gemini-3.1-pro-preview",
+    value: "google/gemini-3.1-pro-preview",
+  },
+  { label: "inception/mercury-2", value: "inception/mercury-2" },
+  {
+    label: "meta-llama/llama-4-maverick",
+    value: "meta-llama/llama-4-maverick",
+  },
+  { label: "meta-llama/llama-4-scout", value: "meta-llama/llama-4-scout" },
+  { label: "minimax/minimax-m2.7", value: "minimax/minimax-m2.7" },
+  {
+    label: "mistralai/mistral-small-2603",
+    value: "mistralai/mistral-small-2603",
+  },
+  { label: "moonshotai/kimi-k2.5", value: "moonshotai/kimi-k2.5" },
+  { label: "openai/gpt-4o-mini", value: "openai/gpt-4o-mini" },
+  { label: "openai/gpt-5", value: "openai/gpt-5" },
+  { label: "openai/gpt-5-mini", value: "openai/gpt-5-mini" },
+  { label: "openai/gpt-5-nano", value: "openai/gpt-5-nano" },
+  { label: "openai/gpt-5.4", value: "openai/gpt-5.4" },
+  { label: "openai/gpt-5.4-mini", value: "openai/gpt-5.4-mini" },
+  { label: "openai/gpt-5.4-nano", value: "openai/gpt-5.4-nano" },
+  { label: "openai/o4-mini", value: "openai/o4-mini" },
+  { label: "openrouter/auto", value: "openrouter/auto" },
+  { label: "openrouter/free", value: "openrouter/free" },
+  { label: "qwen/qwen3.5-plus-02-15", value: "qwen/qwen3.5-plus-02-15" },
+  { label: "x-ai/grok-4-fast", value: "x-ai/grok-4-fast" },
+  { label: "x-ai/grok-4.20-beta", value: "x-ai/grok-4.20-beta" },
+  { label: "z-ai/glm-4.7-flash", value: "z-ai/glm-4.7-flash" },
+];
+
+export const aiTranslatorReasoningOptions: SelectorOption<string>[] = [
+  { label: "Disabled", value: "disabled" },
+  { label: "Low (Minimal thinking)", value: "low" },
+  { label: "Medium (Default)", value: "medium" },
+  { label: "High (Extended thinking)", value: "high" },
+];
+
+export const aiTranslatorConcurrentOptions: SelectorOption<number>[] = [
+  { label: "1 (Low)", value: 1 },
+  { label: "2 (Default)", value: 2 },
+  { label: "3", value: 3 },
+  { label: "4", value: 4 },
+  { label: "5 (High)", value: 5 },
+];
+
+export const aiTranslatorParallelBatchesOptions: SelectorOption<number>[] = [
+  { label: "1 (Sequential)", value: 1 },
+  { label: "2", value: 2 },
+  { label: "3", value: 3 },
+  { label: "4 (Default)", value: 4 },
+  { label: "6", value: 6 },
+  { label: "8 (Aggressive)", value: 8 },
+];
diff --git a/frontend/src/pages/Settings/components/Card.module.scss b/frontend/src/pages/Settings/components/Card.module.scss
index fbfa1c3d14..5202d72880 100644
--- a/frontend/src/pages/Settings/components/Card.module.scss
+++ b/frontend/src/pages/Settings/components/Card.module.scss
@@ -1,9 +1,15 @@
 .card {
-  border-radius: var(--mantine-radius-sm);
-  border: 1px solid var(--mantine-color-gray-7);
+  border-radius: var(--bz-radius-lg);
+  border: 1px solid var(--bz-border-card);
+  background: var(--bz-surface-card);
+  transition:
+    background var(--bz-duration-normal) var(--bz-ease-standard),
+    border-color var(--bz-duration-normal) var(--bz-ease-standard),
+    box-shadow var(--bz-duration-normal) var(--bz-ease-standard);
 
   &:hover {
-    box-shadow: var(--mantine-shadow-md);
-    border: 1px solid bazarr.$color-brand-5;
+    box-shadow: var(--bz-shadow-float);
+    border-color: var(--bz-border-hover);
+    background: var(--bz-surface-card-hover);
   }
 }
diff --git a/frontend/src/pages/Settings/components/Card.tsx b/frontend/src/pages/Settings/components/Card.tsx
index a8a33eec31..1040020931 100644
--- a/frontend/src/pages/Settings/components/Card.tsx
+++ b/frontend/src/pages/Settings/components/Card.tsx
@@ -1,4 +1,4 @@
-import { FunctionComponent } from "react";
+import React, { FunctionComponent } from "react";
 import {
   Center,
   MantineStyleProp,
@@ -13,7 +13,7 @@ import styles from "./Card.module.scss";
 
 interface CardProps {
   description?: string;
-  header?: string;
+  header?: React.ReactNode;
   lineClamp?: number | undefined;
   onClick?: () => void;
   plus?: boolean;
diff --git a/frontend/src/pages/Settings/components/Layout.test.tsx b/frontend/src/pages/Settings/components/Layout.test.tsx
index 373a750c5e..dbbea9ea2a 100644
--- a/frontend/src/pages/Settings/components/Layout.test.tsx
+++ b/frontend/src/pages/Settings/components/Layout.test.tsx
@@ -1,5 +1,5 @@
 import { Text } from "@mantine/core";
-import { describe, it } from "vitest";
+import { describe, expect, it } from "vitest";
 import { customRender, screen } from "@/tests";
 import Layout from "./Layout";
 
@@ -12,13 +12,29 @@ describe("Settings layout", () => {
     );
   });
 
-  it.concurrent("save button should be disabled by default", () => {
+  it.concurrent(
+    "save button should not be visible when no changes are staged",
+    () => {
+      customRender(
+        <Layout name="Test Settings">
+          <Text>Value</Text>
+        </Layout>,
+      );
+
+      // The floating save button is hidden when totalStagedCount === 0
+      expect(
+        screen.queryByRole("button", { name: /save/i }),
+      ).not.toBeInTheDocument();
+    },
+  );
+
+  it.concurrent("renders children content", () => {
     customRender(
       <Layout name="Test Settings">
-        <Text>Value</Text>
+        <Text>Test Content</Text>
       </Layout>,
     );
 
-    expect(screen.getAllByRole("button", { name: "Save" })[0]).toBeDisabled();
+    expect(screen.getByText("Test Content")).toBeInTheDocument();
   });
 });
diff --git a/frontend/src/pages/Settings/components/Layout.tsx b/frontend/src/pages/Settings/components/Layout.tsx
index ba74f25ece..7882333738 100644
--- a/frontend/src/pages/Settings/components/Layout.tsx
+++ b/frontend/src/pages/Settings/components/Layout.tsx
@@ -1,11 +1,25 @@
-import { FunctionComponent, ReactNode, useCallback, useMemo } from "react";
-import { Badge, Container, Group, LoadingOverlay } from "@mantine/core";
+import {
+  FunctionComponent,
+  ReactNode,
+  useCallback,
+  useEffect,
+  useMemo,
+} from "react";
+import {
+  Badge,
+  Box,
+  Button,
+  Container,
+  Group,
+  LoadingOverlay,
+  Transition,
+} from "@mantine/core";
 import { useForm } from "@mantine/form";
-import { useDocumentTitle } from "@mantine/hooks";
-import { faSave } from "@fortawesome/free-solid-svg-icons";
+import { useDocumentTitle, useReducedMotion } from "@mantine/hooks";
+import { faFloppyDisk } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useSettingsMutation, useSystemSettings } from "@/apis/hooks";
 import { useInstanceName } from "@/apis/hooks/site";
-import { Toolbox } from "@/components";
 import { LoadingProvider } from "@/contexts";
 import {
   FormContext,
@@ -26,7 +40,8 @@ const Layout: FunctionComponent<Props> = (props) => {
   const { children, name } = props;
 
   const { data: settings, isLoading, isRefetching } = useSystemSettings();
-  const { mutate, isPending: isMutating } = useSettingsMutation();
+  const { mutate, mutateAsync, isPending: isMutating } = useSettingsMutation();
+  const reducedMotion = useReducedMotion();
 
   const form = useForm<FormValues>({
     initialValues: {
@@ -44,7 +59,6 @@ const Layout: FunctionComponent<Props> = (props) => {
   const submit = useCallback(
     (values: FormValues) => {
       const { settings, hooks } = values;
-
       if (Object.keys(settings).length > 0) {
         const settingsToSubmit = { ...settings };
         runHooks(hooks, settingsToSubmit);
@@ -55,44 +69,117 @@ const Layout: FunctionComponent<Props> = (props) => {
     [mutate],
   );
 
+  const submitAndLeave = useCallback(async () => {
+    const { settings, hooks } = form.values;
+    if (Object.keys(settings).length > 0) {
+      const settingsToSubmit = { ...settings };
+      runHooks(hooks, settingsToSubmit);
+      LOG("info", "save & leave", settingsToSubmit);
+      await mutateAsync(settingsToSubmit);
+    }
+  }, [form.values, mutateAsync]);
+
   const totalStagedCount = useMemo(() => {
     return Object.keys(form.values.settings).length;
   }, [form.values.settings]);
 
   usePrompt(
     totalStagedCount > 0,
-    `You have ${totalStagedCount} unsaved changes, are you sure you want to leave?`,
+    `You have ${totalStagedCount} unsaved change${totalStagedCount !== 1 ? "s" : ""}. What would you like to do?`,
+    submitAndLeave,
   );
 
   useDocumentTitle(`${name} - ${useInstanceName()} (Settings)`);
 
+  // Ctrl+S / Cmd+S keyboard shortcut
+  useEffect(() => {
+    const handler = (e: KeyboardEvent) => {
+      if ((e.ctrlKey || e.metaKey) && e.key === "s") {
+        e.preventDefault();
+        if (totalStagedCount > 0) {
+          form.onSubmit(submit)();
+        }
+      }
+    };
+    document.addEventListener("keydown", handler);
+    return () => document.removeEventListener("keydown", handler);
+  }, [form, submit, totalStagedCount]);
+
   return (
     <SettingsProvider value={settings ?? null}>
       <LoadingProvider value={isLoading || isMutating}>
         <form onSubmit={form.onSubmit(submit)} style={{ position: "relative" }}>
-          <LoadingOverlay visible={settings === undefined}></LoadingOverlay>
-          <Toolbox>
-            <Group>
-              <Toolbox.Button
-                type="submit"
-                icon={faSave}
-                loading={isMutating}
-                disabled={totalStagedCount === 0}
-                rightSection={
-                  <Badge size="xs" radius="sm" hidden={totalStagedCount === 0}>
-                    {totalStagedCount}
-                  </Badge>
-                }
-              >
-                Save
-              </Toolbox.Button>
-            </Group>
-          </Toolbox>
+          <LoadingOverlay visible={settings === undefined} />
           <FormContext.Provider value={form}>
-            <Container size="xl" mx={0}>
+            <Container size="xl" mx={0} pb={80}>
               {children}
             </Container>
           </FormContext.Provider>
+          {/* Floating save โ€” sticky bottom, after form fields in DOM for correct tab order */}
+          <Transition
+            transition={reducedMotion ? "fade" : "slide-up"}
+            mounted={totalStagedCount > 0}
+          >
+            {(styles) => (
+              <Box
+                pos="sticky"
+                bottom={16}
+                style={{
+                  ...styles,
+                  zIndex: 100,
+                  display: "flex",
+                  justifyContent: "flex-end",
+                  paddingRight: 24,
+                  pointerEvents: "none",
+                }}
+              >
+                <Group justify="flex-end" style={{ pointerEvents: "auto" }}>
+                  <div
+                    aria-live="polite"
+                    role="status"
+                    style={{
+                      position: "absolute",
+                      width: 1,
+                      height: 1,
+                      overflow: "hidden",
+                      clip: "rect(0,0,0,0)",
+                    }}
+                  >
+                    {totalStagedCount > 0
+                      ? `You have ${totalStagedCount} unsaved change${totalStagedCount !== 1 ? "s" : ""}`
+                      : ""}
+                  </div>
+                  <Button
+                    type="submit"
+                    radius="xl"
+                    variant="gradient"
+                    gradient={{ from: "brand.5", to: "brand.6", deg: 135 }}
+                    size="md"
+                    leftSection={<FontAwesomeIcon icon={faFloppyDisk} />}
+                    loading={isMutating}
+                    aria-label={`Save ${totalStagedCount} pending change${totalStagedCount !== 1 ? "s" : ""}`}
+                    style={{ boxShadow: "var(--bz-shadow-float)" }}
+                  >
+                    Save
+                    <Badge
+                      size="sm"
+                      circle
+                      ml={8}
+                      aria-hidden="true"
+                      variant="outline"
+                      style={{
+                        color: "inherit",
+                        borderColor: "currentColor",
+                        opacity: 0.7,
+                      }}
+                    >
+                      {totalStagedCount}
+                    </Badge>
+                  </Button>
+                </Group>
+              </Box>
+            )}
+          </Transition>
         </form>
       </LoadingProvider>
     </SettingsProvider>
diff --git a/frontend/src/pages/SubtitleEditor/CueTable.tsx b/frontend/src/pages/SubtitleEditor/CueTable.tsx
new file mode 100644
index 0000000000..c9a28edd05
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/CueTable.tsx
@@ -0,0 +1,397 @@
+import { Fragment, ReactNode, useRef } from "react";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import type { Cue } from "./types";
+
+function formatTimestamp(ms: number): string {
+  const totalSeconds = Math.floor(ms / 1000);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+  const millis = ms % 1000;
+
+  return (
+    String(hours).padStart(2, "0") +
+    ":" +
+    String(minutes).padStart(2, "0") +
+    ":" +
+    String(seconds).padStart(2, "0") +
+    "." +
+    String(millis).padStart(3, "0")
+  );
+}
+
+function formatDuration(ms: number): string {
+  const seconds = ms / 1000;
+  if (Number.isInteger(seconds)) {
+    return seconds + ".0s";
+  }
+  return parseFloat(seconds.toFixed(1)) + "s";
+}
+
+// Tag colors by type
+// Badge color categories
+const TAG_COLORS: Record<string, { bg: string; text: string }> = {
+  // HTML style tags
+  i: { bg: "rgba(139, 92, 246, 0.2)", text: "#a78bfa" },
+  b: { bg: "rgba(251, 146, 60, 0.2)", text: "#fb923c" },
+  u: { bg: "rgba(52, 211, 153, 0.2)", text: "#34d399" },
+  font: { bg: "rgba(96, 165, 250, 0.2)", text: "#60a5fa" },
+  s: { bg: "rgba(248, 113, 113, 0.2)", text: "#f87171" },
+  // ASS categories
+  pos: { bg: "rgba(251, 191, 36, 0.2)", text: "#fbbf24" },
+  align: { bg: "rgba(251, 191, 36, 0.2)", text: "#fbbf24" },
+  effect: { bg: "rgba(168, 85, 247, 0.2)", text: "#a855f7" },
+  color: { bg: "rgba(96, 165, 250, 0.2)", text: "#60a5fa" },
+  fontAss: { bg: "rgba(96, 165, 250, 0.2)", text: "#60a5fa" },
+};
+
+const DEFAULT_TAG_COLOR = { bg: "rgba(148, 163, 184, 0.15)", text: "#94a3b8" };
+
+function tagBadgeStyle(colorKey: string): React.CSSProperties {
+  const colors = TAG_COLORS[colorKey] ?? DEFAULT_TAG_COLOR;
+  return {
+    display: "inline-block",
+    fontSize: "0.6rem",
+    fontFamily: "monospace",
+    fontWeight: 600,
+    lineHeight: 1,
+    padding: "2px 5px",
+    borderRadius: "3px",
+    backgroundColor: colors.bg,
+    color: colors.text,
+    verticalAlign: "middle",
+    marginInline: "1px",
+  };
+}
+
+/**
+ * Categorize an ASS override tag block like {\an8} or {\pos(320,50)\fad(1200,0)}
+ * into a readable badge label and color category.
+ */
+function parseAssTagBlock(block: string): { label: string; colorKey: string } {
+  // Remove the outer braces
+  const inner = block.slice(1, -1);
+
+  // Common ASS tags and their human-readable labels
+  const patterns: [RegExp, string, string][] = [
+    // Alignment: \an1-\an9, \a1-\a11
+    [/^\\an(\d)$/, "align-$1", "align"],
+    [/^\\a(\d+)$/, "align-$1", "align"],
+    // Position
+    [/\\pos\([^)]+\)/, "pos", "pos"],
+    // Move
+    [/\\move\([^)]+\)/, "move", "pos"],
+    // Origin
+    [/\\org\([^)]+\)/, "org", "pos"],
+    // Fade
+    [/\\fad\([^)]+\)/, "fade", "effect"],
+    [/\\fade\([^)]+\)/, "fade", "effect"],
+    // Blur
+    [/\\be\d/, "blur", "effect"],
+    [/\\blur[\d.]/, "blur", "effect"],
+    // Border/shadow
+    [/\\bord[\d.]/, "border", "effect"],
+    [/\\shad[\d.]/, "shadow", "effect"],
+    // Rotation
+    [/\\fr[xyz]?[\d.-]/, "rotate", "effect"],
+    // Scale
+    [/\\fsc[xy][\d.]/, "scale", "effect"],
+    // Color
+    [/\\1?c&H/, "color", "color"],
+    [/\\2c&H/, "color2", "color"],
+    [/\\3c&H/, "border-color", "color"],
+    [/\\4c&H/, "shadow-color", "color"],
+    // Alpha
+    [/\\alpha/, "alpha", "effect"],
+    [/\\[1234]a&H/, "alpha", "effect"],
+    // Font
+    [/\\fn/, "font", "fontAss"],
+    [/\\fs[\d.]/, "size", "fontAss"],
+    // Bold/italic in ASS
+    [/\\b[01]/, "bold", "b"],
+    [/\\i[01]/, "italic", "i"],
+    [/\\u[01]/, "underline", "u"],
+    [/\\s[01]/, "strike", "s"],
+    // Karaoke
+    [/\\k[fo]?\d/, "karaoke", "effect"],
+    // Clip
+    [/\\i?clip\(/, "clip", "effect"],
+    // Drawing
+    [/\\p[01]/, "drawing", "effect"],
+    // Letter spacing
+    [/\\fsp[\d.-]/, "spacing", "fontAss"],
+    // Encoding
+    [/\\fe\d/, "encoding", "fontAss"],
+    // Animated transform
+    [/\\t\(/, "animate", "effect"],
+    // Wrap
+    [/\\q\d/, "wrap", "align"],
+    // Reset
+    [/\\r/, "reset", "effect"],
+  ];
+
+  // Try to match known tags
+  const labels: string[] = [];
+  let colorKey = "effect";
+
+  for (const [pattern, label, category] of patterns) {
+    if (pattern.test(inner)) {
+      labels.push(label.replace("$1", inner.match(/\d+/)?.[0] ?? ""));
+      colorKey = category;
+    }
+  }
+
+  if (labels.length > 0) {
+    return { label: labels.join(" "), colorKey };
+  }
+
+  // Fallback: show the raw content, abbreviated
+  const abbreviated = inner.length > 12 ? inner.slice(0, 12) + ".." : inner;
+  return { label: abbreviated, colorKey: "effect" };
+}
+
+/**
+ * Renders cue text with formatting tags shown as small colored badges.
+ * Handles both HTML tags (<i>, <b>, <font>) and ASS override tags ({\an8}, {\pos}).
+ */
+function renderStyledText(text: string): ReactNode {
+  // Match HTML tags and ASS override tag blocks
+  // HTML: <i>, </i>, <b>, </b>, <font color=...>, etc.
+  // ASS: {\an8}, {\pos(320,50)}, {\fad(1200,0)\be1}, etc.
+  const tagPattern = /<\/?([a-zA-Z]+)(?:\s[^>]*)?>|\{\\[^}]+\}/g;
+  const parts: ReactNode[] = [];
+  let lastIndex = 0;
+  let match: RegExpExecArray | null;
+  let key = 0;
+
+  while ((match = tagPattern.exec(text)) !== null) {
+    // Text before the tag
+    if (match.index > lastIndex) {
+      parts.push(
+        <Fragment key={key++}>{text.slice(lastIndex, match.index)}</Fragment>,
+      );
+    }
+
+    const fullMatch = match[0];
+
+    if (fullMatch.startsWith("{\\")) {
+      // ASS override tag block
+      const { label, colorKey } = parseAssTagBlock(fullMatch);
+      parts.push(
+        <span key={key++} style={tagBadgeStyle(colorKey)}>
+          {label}
+        </span>,
+      );
+    } else {
+      // HTML tag
+      const tagName = match[1].toLowerCase();
+      const isClosing = fullMatch.startsWith("</");
+      parts.push(
+        <span key={key++} style={tagBadgeStyle(tagName)}>
+          {isClosing ? `/${tagName}` : tagName}
+        </span>,
+      );
+    }
+
+    lastIndex = match.index + fullMatch.length;
+  }
+
+  // Remaining text after last tag
+  if (lastIndex < text.length) {
+    parts.push(<Fragment key={key++}>{text.slice(lastIndex)}</Fragment>);
+  }
+
+  return parts.length > 0 ? parts : text;
+}
+
+const gridTemplate = "56px 140px 140px 72px 1fr";
+
+const headerStyle: React.CSSProperties = {
+  display: "grid",
+  gridTemplateColumns: gridTemplate,
+  minWidth: 700,
+  position: "sticky",
+  top: 0,
+  zIndex: 1,
+  backgroundColor: "var(--bz-surface-base)",
+  borderBottom: "2px solid var(--bz-border-divider)",
+  fontWeight: 700,
+  fontSize: "0.7rem",
+  textTransform: "uppercase",
+  letterSpacing: "0.8px",
+  color: "var(--bz-text-tertiary)",
+};
+
+const headerCellStyle: React.CSSProperties = {
+  padding: "10px 12px",
+};
+
+const rowBaseStyle: React.CSSProperties = {
+  display: "grid",
+  gridTemplateColumns: gridTemplate,
+  minWidth: 700,
+  alignItems: "start",
+  borderBottom: "1px solid var(--bz-border-divider)",
+  transition: "background-color 0.1s ease",
+};
+
+const cellStyle: React.CSSProperties = {
+  padding: "10px 12px",
+  fontSize: "0.85rem",
+  lineHeight: 1.5,
+};
+
+const monoStyle: React.CSSProperties = {
+  ...cellStyle,
+  fontFamily: "'JetBrains Mono', 'Fira Code', 'Cascadia Code', monospace",
+  fontSize: "0.8rem",
+  color: "var(--mantine-color-yellow-4)",
+  letterSpacing: "-0.2px",
+};
+
+const durationStyle: React.CSSProperties = {
+  ...cellStyle,
+  fontFamily: "'JetBrains Mono', 'Fira Code', 'Cascadia Code', monospace",
+  fontSize: "0.8rem",
+  color: "var(--bz-text-tertiary)",
+  textAlign: "center",
+};
+
+const textCellStyle: React.CSSProperties = {
+  ...cellStyle,
+  whiteSpace: "pre-wrap",
+  wordBreak: "break-word",
+  color: "var(--mantine-color-text)",
+};
+
+const indexCellStyle: React.CSSProperties = {
+  ...cellStyle,
+  color: "var(--bz-text-tertiary)",
+  fontSize: "0.75rem",
+  textAlign: "right",
+  fontFamily: "monospace",
+  paddingRight: "16px",
+};
+
+const COLUMNS = ["#", "START", "END", "DURATION", "TEXT"] as const;
+
+interface CueTableProps {
+  cues: Cue[];
+}
+
+export default function CueTable({ cues }: CueTableProps) {
+  const scrollRef = useRef<HTMLDivElement>(null);
+
+  const virtualizer = useVirtualizer({
+    count: cues.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 48,
+    overscan: 10,
+  });
+
+  return (
+    <div
+      role="grid"
+      aria-label="Subtitle cues"
+      style={{
+        display: "flex",
+        flexDirection: "column",
+        flex: 1,
+        minHeight: 0,
+        overflow: "auto",
+        border: "1px solid var(--bz-border-divider)",
+        borderRadius: "var(--mantine-radius-md)",
+        backgroundColor: "var(--bz-surface-base)",
+        minWidth: 0,
+      }}
+    >
+      <div role="row" style={headerStyle}>
+        {COLUMNS.map((col) => (
+          <div
+            key={col}
+            role="columnheader"
+            style={{
+              ...headerCellStyle,
+              textAlign:
+                col === "#"
+                  ? "right"
+                  : col === "DURATION"
+                    ? "center"
+                    : undefined,
+              paddingRight: col === "#" ? "16px" : undefined,
+            }}
+          >
+            {col}
+          </div>
+        ))}
+      </div>
+
+      <div
+        ref={scrollRef}
+        style={{
+          flex: 1,
+          overflow: "auto",
+          minHeight: 0,
+        }}
+      >
+        <div
+          style={{
+            height: virtualizer.getTotalSize(),
+            position: "relative",
+            width: "100%",
+          }}
+        >
+          {virtualizer.getVirtualItems().map((virtualRow) => {
+            const cue = cues[virtualRow.index];
+            const isOdd = virtualRow.index % 2 === 1;
+
+            return (
+              <div
+                key={cue.id}
+                role="row"
+                data-index={virtualRow.index}
+                ref={virtualizer.measureElement}
+                style={{
+                  ...rowBaseStyle,
+                  position: "absolute",
+                  top: 0,
+                  left: 0,
+                  width: "100%",
+                  transform: `translateY(${virtualRow.start}px)`,
+                  backgroundColor: isOdd ? "var(--bz-hover-bg)" : "transparent",
+                }}
+                onMouseEnter={(e) => {
+                  e.currentTarget.style.backgroundColor =
+                    "var(--bz-hover-bg-emphasis)";
+                }}
+                onMouseLeave={(e) => {
+                  e.currentTarget.style.backgroundColor = isOdd
+                    ? "var(--bz-hover-bg)"
+                    : "transparent";
+                }}
+              >
+                <div role="gridcell" style={indexCellStyle}>
+                  {virtualRow.index + 1}
+                </div>
+                <div role="gridcell" style={monoStyle}>
+                  {formatTimestamp(cue.startMs)}
+                </div>
+                <div role="gridcell" style={monoStyle}>
+                  {formatTimestamp(cue.endMs)}
+                </div>
+                <div role="gridcell" style={durationStyle}>
+                  {formatDuration(cue.endMs - cue.startMs)}
+                </div>
+                <div role="gridcell" style={textCellStyle}>
+                  {renderStyledText(cue.text)}
+                </div>
+              </div>
+            );
+          })}
+        </div>
+      </div>
+    </div>
+  );
+}
+
+export { formatTimestamp, formatDuration };
diff --git a/frontend/src/pages/SubtitleEditor/__tests__/parsers.test.ts b/frontend/src/pages/SubtitleEditor/__tests__/parsers.test.ts
new file mode 100644
index 0000000000..a6ec67becc
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/__tests__/parsers.test.ts
@@ -0,0 +1,280 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { getParser } from "@/pages/SubtitleEditor/parsers";
+
+// Mock crypto.randomUUID since it may not be available in test env
+beforeEach(() => {
+  let counter = 0;
+  vi.stubGlobal("crypto", {
+    randomUUID: () => `test-uuid-${++counter}`,
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 1: SRT
+// ---------------------------------------------------------------------------
+describe("SRT parser", () => {
+  const parser = getParser("srt");
+
+  it("parses a basic SRT file with 2 cues", () => {
+    const input = [
+      "1",
+      "00:00:01,000 --> 00:00:02,500",
+      "Hello world",
+      "",
+      "2",
+      "00:01:00,000 --> 00:01:03,400",
+      "Second cue",
+    ].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(2);
+
+    expect(result.cues[0].startMs).toBe(1000);
+    expect(result.cues[0].endMs).toBe(2500);
+    expect(result.cues[0].text).toBe("Hello world");
+
+    expect(result.cues[1].startMs).toBe(60000);
+    expect(result.cues[1].endMs).toBe(63400);
+    expect(result.cues[1].text).toBe("Second cue");
+
+    expect(result.metadata.format).toBe("srt");
+  });
+
+  it("returns 0 cues for empty input", () => {
+    const result = parser.parse("");
+    expect(result.cues).toHaveLength(0);
+  });
+
+  it("handles multiline cue text", () => {
+    const input = [
+      "1",
+      "00:00:01,000 --> 00:00:04,000",
+      "Line one",
+      "Line two",
+      "Line three",
+    ].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(1);
+    expect(result.cues[0].text).toBe("Line one\nLine two\nLine three");
+  });
+
+  it("handles Windows line endings (\\r\\n)", () => {
+    const input =
+      "1\r\n00:00:01,000 --> 00:00:02,000\r\nHello\r\n\r\n2\r\n00:00:03,000 --> 00:00:04,000\r\nWorld";
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(2);
+    expect(result.cues[0].text).toBe("Hello");
+    expect(result.cues[1].text).toBe("World");
+  });
+
+  it("handles BOM prefix", () => {
+    const input = "\uFEFF1\n00:00:01,000 --> 00:00:02,000\nWith BOM";
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(1);
+    expect(result.cues[0].text).toBe("With BOM");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 1: ASS/SSA
+// ---------------------------------------------------------------------------
+describe("ASS parser", () => {
+  const parser = getParser("ass");
+
+  const minimalASS = [
+    "[Script Info]",
+    "Title: Test Script",
+    "ScriptType: v4.00+",
+    "",
+    "[V4+ Styles]",
+    "Format: Name, Fontname, Fontsize",
+    "Style: Default,Arial,20",
+    "",
+    "[Events]",
+    "Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text",
+    "Dialogue: 0,0:00:01.00,0:00:04.00,Default,,0000,0000,0000,,Hello world",
+    "Dialogue: 0,0:01:00.50,0:01:03.00,Default,,0000,0000,0000,,{\\b1}Bold text{\\b0}\\NSecond line",
+  ].join("\n");
+
+  it("parses a minimal ASS file with Script Info, Styles, and Dialogue", () => {
+    const result = parser.parse(minimalASS);
+    expect(result.metadata.format).toBe("ass");
+    expect(result.metadata.title).toBe("Test Script");
+    expect(result.cues).toHaveLength(2);
+
+    expect(result.cues[0].startMs).toBe(1000);
+    expect(result.cues[0].endMs).toBe(4000);
+    expect(result.cues[0].text).toBe("Hello world");
+  });
+
+  it("preserves the full original Dialogue line in rawText", () => {
+    const result = parser.parse(minimalASS);
+    expect(result.cues[1].rawText).toBe(
+      "Dialogue: 0,0:01:00.50,0:01:03.00,Default,,0000,0000,0000,,{\\b1}Bold text{\\b0}\\NSecond line",
+    );
+  });
+
+  it("strips override tags and converts \\N to newlines in text", () => {
+    const result = parser.parse(minimalASS);
+    expect(result.cues[1].text).toBe("Bold text\nSecond line");
+  });
+
+  it("includes header sections in metadata.rawHeader", () => {
+    const result = parser.parse(minimalASS);
+    const rawHeader = result.metadata.rawHeader as string;
+    expect(rawHeader).toContain("[Script Info]");
+    expect(rawHeader).toContain("[V4+ Styles]");
+    expect(rawHeader).not.toContain("[Events]");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 1: VTT
+// ---------------------------------------------------------------------------
+describe("VTT parser", () => {
+  const parser = getParser("vtt");
+
+  it("parses with WEBVTT header", () => {
+    const input = [
+      "WEBVTT",
+      "",
+      "00:00:01.000 --> 00:00:04.000",
+      "Hello world",
+      "",
+      "00:01:00.000 --> 00:01:03.500",
+      "Second cue",
+    ].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.metadata.format).toBe("vtt");
+    expect(result.cues).toHaveLength(2);
+
+    expect(result.cues[0].startMs).toBe(1000);
+    expect(result.cues[0].endMs).toBe(4000);
+    expect(result.cues[0].text).toBe("Hello world");
+
+    expect(result.cues[1].startMs).toBe(60000);
+    expect(result.cues[1].endMs).toBe(63500);
+    expect(result.cues[1].text).toBe("Second cue");
+  });
+
+  it("handles optional cue identifiers", () => {
+    const input = [
+      "WEBVTT",
+      "",
+      "intro",
+      "00:00:01.000 --> 00:00:04.000",
+      "With identifier",
+    ].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(1);
+    expect(result.cues[0].text).toBe("With identifier");
+  });
+
+  it("handles position/alignment settings in timestamp line", () => {
+    const input = [
+      "WEBVTT",
+      "",
+      "00:00:01.000 --> 00:00:04.000 position:10% align:start",
+      "Positioned cue",
+    ].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(1);
+    expect(result.cues[0].startMs).toBe(1000);
+    expect(result.cues[0].endMs).toBe(4000);
+    expect(result.cues[0].text).toBe("Positioned cue");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 2: SUB (MicroDVD)
+// ---------------------------------------------------------------------------
+describe("SUB parser", () => {
+  it("parses frame-based lines and converts to ms at 23.976fps", () => {
+    const parser = getParser("sub");
+    const input = "{0}{100}Hello";
+
+    const result = parser.parse(input);
+    expect(result.cues).toHaveLength(1);
+    expect(result.metadata.format).toBe("sub");
+
+    // 0 frames = 0ms, 100 frames at 23.976fps = Math.round((100/23.976)*1000)
+    expect(result.cues[0].startMs).toBe(0);
+    expect(result.cues[0].endMs).toBe(Math.round((100 / 23.976) * 1000));
+    expect(result.cues[0].text).toBe("Hello");
+    expect(result.cues[0].rawText).toBe("{0}{100}Hello");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 2: SMI
+// ---------------------------------------------------------------------------
+describe("SMI parser", () => {
+  it("parses SYNC-based content", () => {
+    const parser = getParser("smi");
+    const input = [
+      "<SAMI>",
+      "<BODY>",
+      "<SYNC Start=1000>Hello",
+      "<SYNC Start=4000>&nbsp;",
+      "</BODY>",
+      "</SAMI>",
+    ].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.metadata.format).toBe("smi");
+    expect(result.cues).toHaveLength(1);
+    expect(result.cues[0].startMs).toBe(1000);
+    expect(result.cues[0].endMs).toBe(4000);
+    expect(result.cues[0].text).toBe("Hello");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 2: TXT (TMPlayer)
+// ---------------------------------------------------------------------------
+describe("TXT parser", () => {
+  it("parses TMPlayer format", () => {
+    const parser = getParser("txt");
+    const input = ["00:01:00:Hello", "00:02:00:World"].join("\n");
+
+    const result = parser.parse(input);
+    expect(result.metadata.format).toBe("txt");
+    expect(result.cues).toHaveLength(2);
+
+    expect(result.cues[0].startMs).toBe(60000);
+    // End time adjusted to next cue's start
+    expect(result.cues[0].endMs).toBe(120000);
+    expect(result.cues[0].text).toBe("Hello");
+
+    expect(result.cues[1].startMs).toBe(120000);
+    // Last cue gets startMs + 3000
+    expect(result.cues[1].endMs).toBe(123000);
+    expect(result.cues[1].text).toBe("World");
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Tier 2: MPL
+// ---------------------------------------------------------------------------
+describe("MPL parser", () => {
+  it("parses decisecond-based lines and converts to ms", () => {
+    const parser = getParser("mpl");
+    const input = "[100][200]Hello";
+
+    const result = parser.parse(input);
+    expect(result.metadata.format).toBe("mpl");
+    expect(result.cues).toHaveLength(1);
+
+    // 100 deciseconds = 10000ms, 200 deciseconds = 20000ms
+    expect(result.cues[0].startMs).toBe(10000);
+    expect(result.cues[0].endMs).toBe(20000);
+    expect(result.cues[0].text).toBe("Hello");
+    expect(result.cues[0].rawText).toBe("[100][200]Hello");
+  });
+});
diff --git a/frontend/src/pages/SubtitleEditor/index.tsx b/frontend/src/pages/SubtitleEditor/index.tsx
new file mode 100644
index 0000000000..861eefcc90
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/index.tsx
@@ -0,0 +1,126 @@
+import { useMemo } from "react";
+import { Link, useParams } from "react-router";
+import {
+  Alert,
+  Anchor,
+  Badge,
+  Breadcrumbs,
+  Center,
+  Group,
+  Loader,
+  Stack,
+  Text,
+} from "@mantine/core";
+import { useSubtitleContent } from "@/apis/hooks/subtitles";
+import CueTable from "./CueTable";
+import { getParser } from "./parsers";
+import type { ParseResult, SubtitleFormat } from "./types";
+
+function formatFileSize(bytes: number): string {
+  if (bytes < 1024) return bytes + " B";
+  if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + " KB";
+  return (bytes / (1024 * 1024)).toFixed(1) + " MB";
+}
+
+export default function SubtitleEditor() {
+  const { mediaType, mediaId, language } = useParams();
+
+  const { data, isLoading, error } = useSubtitleContent(
+    mediaType,
+    mediaId ? Number(mediaId) : undefined,
+    language,
+  );
+
+  const parseResult = useMemo<ParseResult | null>(() => {
+    if (!data) return null;
+    try {
+      return getParser(data.format as SubtitleFormat).parse(data.content);
+    } catch {
+      return null;
+    }
+  }, [data]);
+
+  if (isLoading) {
+    return (
+      <Center style={{ height: "100%" }}>
+        <Loader />
+      </Center>
+    );
+  }
+
+  if (error) {
+    return (
+      <Alert color="red" title="Error" m="md">
+        {error.message || "Failed to load subtitle content"}
+      </Alert>
+    );
+  }
+
+  if (data && !parseResult) {
+    return (
+      <Alert color="red" title="Parse Error" m="md">
+        Failed to parse subtitle file
+      </Alert>
+    );
+  }
+
+  if (!data || !parseResult) {
+    return null;
+  }
+
+  const isSeries = mediaType === "episode" || mediaType === "series";
+  const listPath = isSeries ? "/series" : "/movies";
+  const listLabel = isSeries ? "Series" : "Movies";
+  const detailPath = data.mediaId
+    ? isSeries
+      ? `/series/${data.mediaId}`
+      : `/movies/${data.mediaId}`
+    : undefined;
+
+  return (
+    <Stack gap="sm" style={{ height: "100%", padding: "0" }}>
+      <Group justify="space-between" px="md" pt="xs">
+        <Breadcrumbs>
+          <Anchor component={Link} to={listPath}>
+            {listLabel}
+          </Anchor>
+          {data.mediaTitle && detailPath && (
+            <Anchor component={Link} to={detailPath}>
+              {data.mediaTitle}
+            </Anchor>
+          )}
+          <Text>Subtitle Viewer</Text>
+        </Breadcrumbs>
+        <Group gap="xs">
+          <Badge variant="light" size="sm">
+            {data.format.toUpperCase()}
+          </Badge>
+          {data.language && (
+            <Badge variant="light" color="teal" size="sm">
+              {data.language}
+            </Badge>
+          )}
+          <Badge variant="outline" color="gray" size="sm">
+            {data.encoding}
+          </Badge>
+          <Text size="xs" c="var(--bz-text-tertiary)">
+            {parseResult.cues.length} cues
+          </Text>
+          <Text size="xs" c="var(--bz-text-tertiary)">
+            {formatFileSize(data.size)}
+          </Text>
+        </Group>
+      </Group>
+      <div
+        style={{
+          flex: 1,
+          minHeight: 0,
+          display: "flex",
+          padding: "0 var(--mantine-spacing-md) var(--mantine-spacing-md)",
+        }}
+      >
+        <CueTable cues={parseResult.cues} />
+      </div>
+    </Stack>
+  );
+}
diff --git a/frontend/src/pages/SubtitleEditor/parsers/ass.ts b/frontend/src/pages/SubtitleEditor/parsers/ass.ts
new file mode 100644
index 0000000000..c7abee06f0
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/ass.ts
@@ -0,0 +1,143 @@
+import type { Cue, ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+function parseTimestamp(raw: string): number {
+  // H:MM:SS.cc (centiseconds)
+  const match = raw.trim().match(/^(\d+):(\d+):(\d+)\.(\d+)$/);
+  if (!match) return 0;
+  const [, h, m, s, cs] = match;
+  return (
+    parseInt(h, 10) * 3600000 +
+    parseInt(m, 10) * 60000 +
+    parseInt(s, 10) * 1000 +
+    parseInt(cs.padEnd(2, "0").slice(0, 2), 10) * 10
+  );
+}
+
+function stripOverrideTags(text: string): string {
+  // Remove {...} override blocks
+  return text.replace(/\{[^}]*\}/g, "");
+}
+
+function assTextToDisplay(text: string): string {
+  let clean = stripOverrideTags(text);
+  // \N and \n both become newlines for display
+  clean = clean.replace(/\\N/g, "\n").replace(/\\n/g, "\n");
+  return clean;
+}
+
+export const assParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "ass" }, cues: [] };
+    }
+
+    // Determine format variant
+    const isSSA =
+      !text.includes("[V4+ Styles]") && text.includes("[V4 Styles]");
+    const format = isSSA ? "ssa" : "ass";
+
+    // Split into sections
+    const sections: Record<string, string> = {};
+    let currentSection = "";
+    const lines = text.split("\n");
+
+    for (const line of lines) {
+      const sectionMatch = line.match(/^\[([^\]]+)\]/);
+      if (sectionMatch) {
+        currentSection = sectionMatch[1];
+        sections[currentSection] = "";
+      } else if (currentSection) {
+        sections[currentSection] += line + "\n";
+      }
+    }
+
+    // Build rawHeader from everything before [Events]
+    const eventsIdx = text.indexOf("[Events]");
+    const rawHeader = eventsIdx >= 0 ? text.slice(0, eventsIdx) : text;
+
+    // Extract title from Script Info
+    let title: string | undefined;
+    const scriptInfo = sections["Script Info"] ?? "";
+    const titleMatch = scriptInfo.match(/^Title:\s*(.+)$/m);
+    if (titleMatch) {
+      title = titleMatch[1].trim();
+    }
+
+    // Extract styles
+    const stylesKey = isSSA ? "V4 Styles" : "V4+ Styles";
+    const styles = sections[stylesKey]?.trim() || undefined;
+
+    // Parse events
+    const eventsText = sections["Events"] ?? "";
+    const eventsLines = eventsText.split("\n").filter((l) => l.trim());
+
+    // Find Format line to determine column order
+    const formatLine = eventsLines.find((l) => l.trim().startsWith("Format:"));
+    let formatColumns: string[] = [];
+    if (formatLine) {
+      formatColumns = formatLine
+        .replace(/^Format:\s*/, "")
+        .split(",")
+        .map((c) => c.trim());
+    }
+
+    const textColIdx = formatColumns.findIndex(
+      (c) => c.toLowerCase() === "text",
+    );
+    const startColIdx = formatColumns.findIndex(
+      (c) => c.toLowerCase() === "start",
+    );
+    const endColIdx = formatColumns.findIndex((c) => c.toLowerCase() === "end");
+
+    const cues: Cue[] = [];
+
+    for (const line of eventsLines) {
+      if (!line.trim().startsWith("Dialogue:")) continue;
+
+      const afterPrefix = line.replace(/^Dialogue:\s*/, "");
+      // Split only up to (columns - 1) commas, because the Text field can contain commas
+      const maxSplits = formatColumns.length - 1;
+      const parts: string[] = [];
+      let remaining = afterPrefix;
+      for (let i = 0; i < maxSplits; i++) {
+        const commaIdx = remaining.indexOf(",");
+        if (commaIdx === -1) break;
+        parts.push(remaining.slice(0, commaIdx).trim());
+        remaining = remaining.slice(commaIdx + 1);
+      }
+      parts.push(remaining); // The rest is the Text column (or last column)
+
+      const rawCueText =
+        textColIdx >= 0 && textColIdx < parts.length
+          ? parts[textColIdx]
+          : parts[parts.length - 1];
+      const startStr =
+        startColIdx >= 0 && startColIdx < parts.length
+          ? parts[startColIdx]
+          : "";
+      const endStr =
+        endColIdx >= 0 && endColIdx < parts.length ? parts[endColIdx] : "";
+
+      cues.push({
+        id: crypto.randomUUID(),
+        startMs: parseTimestamp(startStr),
+        endMs: parseTimestamp(endStr),
+        text: assTextToDisplay(rawCueText),
+        rawText: line,
+      });
+    }
+
+    return {
+      metadata: {
+        format,
+        title,
+        styles,
+        rawHeader: rawHeader.trimEnd(),
+      },
+      cues,
+    };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/parsers/index.ts b/frontend/src/pages/SubtitleEditor/parsers/index.ts
new file mode 100644
index 0000000000..69211fb336
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/index.ts
@@ -0,0 +1,46 @@
+import type { ParseResult, SubtitleFormat } from "@/pages/SubtitleEditor/types";
+import { assParser } from "./ass";
+import { mplParser } from "./mpl";
+import { smiParser } from "./smi";
+import { srtParser } from "./srt";
+import { subParser } from "./sub";
+import { txtParser } from "./txt";
+import { vttParser } from "./vtt";
+
+export interface SubtitleParser {
+  parse(content: string): ParseResult;
+}
+
+const parsers: Record<SubtitleFormat, SubtitleParser> = {
+  srt: srtParser,
+  ass: assParser,
+  ssa: assParser,
+  vtt: vttParser,
+  sub: subParser,
+  smi: smiParser,
+  txt: txtParser,
+  mpl: mplParser,
+};
+
+export function getParser(format: SubtitleFormat): SubtitleParser {
+  return parsers[format];
+}
+
+const extensionMap: Record<string, SubtitleFormat> = {
+  ".srt": "srt",
+  ".ass": "ass",
+  ".ssa": "ssa",
+  ".vtt": "vtt",
+  ".sub": "sub",
+  ".smi": "smi",
+  ".sami": "smi",
+  ".txt": "txt",
+  ".mpl": "mpl",
+};
+
+export function detectFormat(filename: string): SubtitleFormat {
+  const dot = filename.lastIndexOf(".");
+  if (dot === -1) return "srt";
+  const ext = filename.slice(dot).toLowerCase();
+  return extensionMap[ext] ?? "srt";
+}
diff --git a/frontend/src/pages/SubtitleEditor/parsers/mpl.ts b/frontend/src/pages/SubtitleEditor/parsers/mpl.ts
new file mode 100644
index 0000000000..2770eb58fe
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/mpl.ts
@@ -0,0 +1,36 @@
+import type { ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+export const mplParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "mpl" }, cues: [] };
+    }
+
+    const lines = text.split("\n").filter((l) => l.trim());
+    const cues = [];
+    // MPL2 format: [start_ds][end_ds]text
+    // ds = deciseconds (1/10 second)
+    const pattern = /^\[(\d+)\]\[(\d+)\](.*)$/;
+
+    for (const line of lines) {
+      const match = line.match(pattern);
+      if (!match) continue;
+
+      const [, startDs, endDs, rawText] = match;
+      const displayText = rawText.replace(/\|/g, "\n");
+
+      cues.push({
+        id: crypto.randomUUID(),
+        startMs: parseInt(startDs, 10) * 100,
+        endMs: parseInt(endDs, 10) * 100,
+        text: displayText,
+        rawText: line,
+      });
+    }
+
+    return { metadata: { format: "mpl" }, cues };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/parsers/smi.ts b/frontend/src/pages/SubtitleEditor/parsers/smi.ts
new file mode 100644
index 0000000000..c6fe88a57a
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/smi.ts
@@ -0,0 +1,79 @@
+import type { ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+function stripHtml(html: string): string {
+  return html
+    .replace(/<br\s*\/?>/gi, "\n")
+    .replace(/<[^>]+>/g, "")
+    .replace(/&nbsp;/gi, " ")
+    .replace(/&lt;/gi, "<")
+    .replace(/&gt;/gi, ">")
+    .replace(/&amp;/gi, "&")
+    .trim();
+}
+
+export const smiParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "smi" }, cues: [] };
+    }
+
+    // Find all SYNC tags with their start times and collect text between them
+    const syncPattern = /<SYNC\s+Start\s*=\s*(\d+)\s*>/gi;
+    const syncs: { startMs: number; index: number }[] = [];
+    let match: RegExpExecArray | null;
+
+    while ((match = syncPattern.exec(text)) !== null) {
+      syncs.push({
+        startMs: parseInt(match[1], 10),
+        index: match.index + match[0].length,
+      });
+    }
+
+    // Extract title if present
+    let title: string | undefined;
+    const titleMatch = text.match(/<TITLE[^>]*>([\s\S]*?)<\/TITLE>/i);
+    if (titleMatch) {
+      title = stripHtml(titleMatch[1]);
+    }
+
+    const cues = [];
+
+    for (let i = 0; i < syncs.length; i++) {
+      const start = syncs[i];
+      // Get text from after this SYNC tag to the start of the next SYNC tag (or end of text)
+      const nextSyncPattern = /<SYNC\s/i;
+      const remainingText = text.slice(start.index);
+      const nextSyncMatch = remainingText.match(nextSyncPattern);
+      const segment = nextSyncMatch
+        ? remainingText.slice(0, nextSyncMatch.index)
+        : remainingText;
+      const displayText = stripHtml(segment);
+
+      // Skip empty/whitespace-only cues (often used as "clear" markers)
+      if (!displayText || displayText === "&nbsp;" || !displayText.trim()) {
+        continue;
+      }
+
+      const endMs =
+        i + 1 < syncs.length ? syncs[i + 1].startMs : start.startMs + 3000;
+
+      cues.push({
+        id: crypto.randomUUID(),
+        startMs: start.startMs,
+        endMs,
+        text: displayText,
+      });
+    }
+
+    return {
+      metadata: {
+        format: "smi",
+        title,
+      },
+      cues,
+    };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/parsers/srt.ts b/frontend/src/pages/SubtitleEditor/parsers/srt.ts
new file mode 100644
index 0000000000..87131a1b64
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/srt.ts
@@ -0,0 +1,61 @@
+import type { ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+function parseTimestamp(raw: string): number {
+  // HH:MM:SS,mmm or HH:MM:SS.mmm
+  const match = raw.trim().match(/^(\d+):(\d+):(\d+)[,.](\d+)$/);
+  if (!match) return 0;
+  const [, h, m, s, ms] = match;
+  return (
+    parseInt(h, 10) * 3600000 +
+    parseInt(m, 10) * 60000 +
+    parseInt(s, 10) * 1000 +
+    parseInt(ms.padEnd(3, "0").slice(0, 3), 10)
+  );
+}
+
+export const srtParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    // Normalize: strip BOM, normalize line endings
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "srt" }, cues: [] };
+    }
+
+    const blocks = text.split(/\n\n+/).filter((b) => b.trim());
+    const cues = [];
+
+    for (const block of blocks) {
+      const lines = block.trim().split("\n");
+      if (lines.length < 2) continue;
+
+      // Find the timestamp line. It could be line 0 (missing sequence number)
+      // or line 1 (normal case).
+      let tsLineIdx = -1;
+      for (let i = 0; i < Math.min(lines.length, 2); i++) {
+        if (lines[i].includes("-->")) {
+          tsLineIdx = i;
+          break;
+        }
+      }
+      if (tsLineIdx === -1) continue;
+
+      const tsParts = lines[tsLineIdx].split("-->");
+      if (tsParts.length < 2) continue;
+
+      const startMs = parseTimestamp(tsParts[0]);
+      const endMs = parseTimestamp(tsParts[1].trim().split(/\s/)[0]);
+      const cueText = lines.slice(tsLineIdx + 1).join("\n");
+
+      cues.push({
+        id: crypto.randomUUID(),
+        startMs,
+        endMs,
+        text: cueText,
+      });
+    }
+
+    return { metadata: { format: "srt" }, cues };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/parsers/sub.ts b/frontend/src/pages/SubtitleEditor/parsers/sub.ts
new file mode 100644
index 0000000000..3717a816f7
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/sub.ts
@@ -0,0 +1,39 @@
+import type { ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+const DEFAULT_FPS = 23.976;
+
+function framesToMs(frame: number, fps: number): number {
+  return Math.round((frame / fps) * 1000);
+}
+
+export const subParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "sub" }, cues: [] };
+    }
+
+    const lines = text.split("\n").filter((l) => l.trim());
+    const cues = [];
+
+    for (const line of lines) {
+      const match = line.match(/^\{(\d+)\}\{(\d+)\}(.*)$/);
+      if (!match) continue;
+
+      const [, startFrame, endFrame, rawText] = match;
+      const displayText = rawText.replace(/\|/g, "\n");
+
+      cues.push({
+        id: crypto.randomUUID(),
+        startMs: framesToMs(parseInt(startFrame, 10), DEFAULT_FPS),
+        endMs: framesToMs(parseInt(endFrame, 10), DEFAULT_FPS),
+        text: displayText,
+        rawText: line,
+      });
+    }
+
+    return { metadata: { format: "sub" }, cues };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/parsers/txt.ts b/frontend/src/pages/SubtitleEditor/parsers/txt.ts
new file mode 100644
index 0000000000..6ccb2b0a66
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/txt.ts
@@ -0,0 +1,78 @@
+import type { ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+function parseTimestampToMs(h: string, m: string, s: string): number {
+  return (
+    parseInt(h, 10) * 3600000 + parseInt(m, 10) * 60000 + parseInt(s, 10) * 1000
+  );
+}
+
+export const txtParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "txt" }, cues: [] };
+    }
+
+    const lines = text.split("\n").filter((l) => l.trim());
+    const cues = [];
+
+    // Try TMPlayer format: HH:MM:SS:text or HH:MM:SS=text
+    const tmPlayerPattern = /^(\d+):(\d+):(\d+)[:=](.+)$/;
+    let isTmPlayer = false;
+
+    // Check first non-empty line to detect format
+    if (lines.length > 0 && tmPlayerPattern.test(lines[0])) {
+      isTmPlayer = true;
+    }
+
+    if (isTmPlayer) {
+      for (const line of lines) {
+        const match = line.match(tmPlayerPattern);
+        if (!match) continue;
+
+        const [, h, m, s, cueText] = match;
+        const startMs = parseTimestampToMs(h, m, s);
+        const displayText = cueText.replace(/\|/g, "\n");
+
+        cues.push({
+          id: crypto.randomUUID(),
+          startMs,
+          endMs: startMs + 3000,
+          text: displayText,
+        });
+      }
+
+      // Adjust end times: each cue ends when the next one starts
+      for (let i = 0; i < cues.length - 1; i++) {
+        cues[i].endMs = cues[i + 1].startMs;
+      }
+    } else {
+      // Try simple numbered format: N HH:MM:SS text
+      const numberedPattern = /^(\d+)\s+(\d+):(\d+):(\d+)\s+(.+)$/;
+
+      for (const line of lines) {
+        const match = line.match(numberedPattern);
+        if (!match) continue;
+
+        const [, , h, m, s, cueText] = match;
+        const startMs = parseTimestampToMs(h, m, s);
+
+        cues.push({
+          id: crypto.randomUUID(),
+          startMs,
+          endMs: startMs + 3000,
+          text: cueText,
+        });
+      }
+
+      // Adjust end times
+      for (let i = 0; i < cues.length - 1; i++) {
+        cues[i].endMs = cues[i + 1].startMs;
+      }
+    }
+
+    return { metadata: { format: "txt" }, cues };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/parsers/vtt.ts b/frontend/src/pages/SubtitleEditor/parsers/vtt.ts
new file mode 100644
index 0000000000..59c7e4eef0
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/parsers/vtt.ts
@@ -0,0 +1,126 @@
+import type { ParseResult } from "@/pages/SubtitleEditor/types";
+import type { SubtitleParser } from "./index";
+
+function parseTimestamp(raw: string): number {
+  // HH:MM:SS.mmm or MM:SS.mmm
+  const match = raw.trim().match(/^(?:(\d+):)?(\d+):(\d+)\.(\d+)$/);
+  if (!match) return 0;
+  const [, h, m, s, ms] = match;
+  return (
+    parseInt(h ?? "0", 10) * 3600000 +
+    parseInt(m, 10) * 60000 +
+    parseInt(s, 10) * 1000 +
+    parseInt(ms.padEnd(3, "0").slice(0, 3), 10)
+  );
+}
+
+export const vttParser: SubtitleParser = {
+  parse(content: string): ParseResult {
+    const text = content.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n");
+
+    if (!text.trim()) {
+      return { metadata: { format: "vtt" }, cues: [] };
+    }
+
+    const lines = text.split("\n");
+
+    // Verify WEBVTT header
+    if (!lines[0].trim().startsWith("WEBVTT")) {
+      return { metadata: { format: "vtt" }, cues: [] };
+    }
+
+    // Collect header metadata (STYLE, REGION blocks, NOTE blocks before first cue)
+    let rawHeader = "";
+    let i = 0;
+
+    // Skip WEBVTT line and any following header text
+    rawHeader += lines[i] + "\n";
+    i++;
+
+    // Collect everything before the first cue as header
+    // A cue starts with a timestamp line containing -->
+    const headerLines: string[] = [lines[0]];
+    let foundFirstCue = false;
+    for (i = 1; i < lines.length; i++) {
+      if (lines[i].includes("-->")) {
+        // Check if previous non-empty line was a cue identifier
+        foundFirstCue = true;
+        // Remove the cue ID line if it was added to header
+        const lastNonEmpty = headerLines.length - 1;
+        if (
+          lastNonEmpty >= 0 &&
+          headerLines[lastNonEmpty].trim() &&
+          !headerLines[lastNonEmpty].includes("-->") &&
+          !headerLines[lastNonEmpty].startsWith("STYLE") &&
+          !headerLines[lastNonEmpty].startsWith("REGION") &&
+          !headerLines[lastNonEmpty].startsWith("NOTE")
+        ) {
+          headerLines.pop();
+        }
+        break;
+      }
+      headerLines.push(lines[i]);
+    }
+
+    rawHeader = headerLines.join("\n").trimEnd();
+
+    // Parse cue blocks
+    const cues = [];
+    const blocks = text.split(/\n\n+/);
+
+    for (const block of blocks) {
+      const blockLines = block.trim().split("\n");
+      if (blockLines.length < 2) continue;
+
+      // Find the timestamp line
+      let tsLineIdx = -1;
+      for (let j = 0; j < blockLines.length; j++) {
+        if (blockLines[j].includes("-->")) {
+          tsLineIdx = j;
+          break;
+        }
+      }
+      if (tsLineIdx === -1) continue;
+
+      const tsLine = blockLines[tsLineIdx];
+      // Split on --> but the right side may have positioning info
+      const arrowIdx = tsLine.indexOf("-->");
+      const leftTs = tsLine.slice(0, arrowIdx).trim();
+      const rightPart = tsLine.slice(arrowIdx + 3).trim();
+      // The end timestamp is the first token; the rest are settings
+      const rightTokens = rightPart.split(/\s+/);
+      const rightTs = rightTokens[0];
+
+      const startMs = parseTimestamp(leftTs);
+      const endMs = parseTimestamp(rightTs);
+      const cueText = blockLines.slice(tsLineIdx + 1).join("\n");
+
+      if (!cueText.trim() && startMs === 0 && endMs === 0) continue;
+
+      cues.push({
+        id: crypto.randomUUID(),
+        startMs,
+        endMs,
+        text: cueText,
+      });
+    }
+
+    // Extract styles from header
+    let styles: string | undefined;
+    if (foundFirstCue) {
+      const styleMatch = rawHeader.match(/STYLE\s*\n([\s\S]*?)(?:\n\n|$)/);
+      if (styleMatch) {
+        styles = styleMatch[1].trim();
+      }
+    }
+
+    return {
+      metadata: {
+        format: "vtt",
+        styles: styles || undefined,
+        rawHeader,
+      },
+      cues,
+    };
+  },
+};
diff --git a/frontend/src/pages/SubtitleEditor/types.ts b/frontend/src/pages/SubtitleEditor/types.ts
new file mode 100644
index 0000000000..e45f0f918e
--- /dev/null
+++ b/frontend/src/pages/SubtitleEditor/types.ts
@@ -0,0 +1,30 @@
+export type SubtitleFormat =
+  | "srt"
+  | "ass"
+  | "ssa"
+  | "vtt"
+  | "sub"
+  | "smi"
+  | "txt"
+  | "mpl";
+
+export interface Cue {
+  id: string;
+  startMs: number;
+  endMs: number;
+  text: string;
+  rawText?: string;
+  formatMetadata?: unknown;
+}
+
+export interface SubtitleMetadata {
+  format: SubtitleFormat;
+  title?: string;
+  styles?: unknown;
+  rawHeader?: string;
+}
+
+export interface ParseResult {
+  metadata: SubtitleMetadata;
+  cues: Cue[];
+}
diff --git a/frontend/src/pages/System/Releases/index.tsx b/frontend/src/pages/System/Releases/index.tsx
index 71cc7bd86d..ed4388e43e 100644
--- a/frontend/src/pages/System/Releases/index.tsx
+++ b/frontend/src/pages/System/Releases/index.tsx
@@ -1,13 +1,15 @@
-import { FunctionComponent, useMemo } from "react";
+import React, { FunctionComponent, useMemo } from "react";
 import {
   Badge,
   Card,
+  Code,
   Container,
   Divider,
   Group,
   List,
   Stack,
   Text,
+  Title,
 } from "@mantine/core";
 import { useDocumentTitle } from "@mantine/hooks";
 import { useSystemReleases } from "@/apis/hooks";
@@ -34,20 +36,111 @@ const SystemReleasesView: FunctionComponent = () => {
   );
 };
 
+function renderInlineMarkdown(text: string) {
+  const parts: (string | React.JSX.Element)[] = [];
+  const regex = /`([^`]+)`|\*\*([^*]+)\*\*|\[([^\]]+)\]\([^)]+\)/g;
+  let lastIndex = 0;
+  let match;
+
+  while ((match = regex.exec(text)) !== null) {
+    if (match.index > lastIndex) {
+      parts.push(text.slice(lastIndex, match.index));
+    }
+    if (match[1]) {
+      parts.push(<Code key={match.index}>{match[1]}</Code>);
+    } else if (match[2]) {
+      parts.push(
+        <Text key={match.index} span fw="bold">
+          {match[2]}
+        </Text>,
+      );
+    } else if (match[3]) {
+      parts.push(match[3]);
+    }
+    lastIndex = match.index + match[0].length;
+  }
+
+  if (lastIndex < text.length) {
+    parts.push(text.slice(lastIndex));
+  }
+
+  return parts;
+}
+
+function MarkdownBody({ text }: { text: string | string[] }) {
+  const elements = useMemo(() => {
+    const normalized = Array.isArray(text) ? text.join("\n") : text;
+    const lines = normalized.split("\n");
+    const result: React.JSX.Element[] = [];
+    let listItems: React.JSX.Element[] = [];
+    let listKey = 0;
+
+    const flushList = () => {
+      if (listItems.length > 0) {
+        result.push(
+          <List key={`list-${listKey++}`} size="sm" spacing={4}>
+            {listItems}
+          </List>,
+        );
+        listItems = [];
+      }
+    };
+
+    lines.forEach((line, idx) => {
+      const trimmed = line.trim();
+
+      if (!trimmed) {
+        return;
+      }
+
+      if (trimmed.startsWith("### ")) {
+        flushList();
+        result.push(
+          <Title key={idx} order={5} mt="sm">
+            {trimmed.slice(4)}
+          </Title>,
+        );
+      } else if (trimmed.startsWith("## ")) {
+        flushList();
+        result.push(
+          <Title key={idx} order={4} mt="sm">
+            {trimmed.slice(3)}
+          </Title>,
+        );
+      } else if (/^[-*] /.test(trimmed)) {
+        const content = trimmed.replace(/^[-*] /, "");
+        listItems.push(
+          <List.Item key={idx}>{renderInlineMarkdown(content)}</List.Item>,
+        );
+      } else {
+        flushList();
+        result.push(
+          <Text key={idx} size="sm">
+            {renderInlineMarkdown(trimmed)}
+          </Text>,
+        );
+      }
+    });
+
+    flushList();
+    return result;
+  }, [text]);
+
+  return <>{elements}</>;
+}
+
 const ReleaseCard: FunctionComponent<ReleaseInfo> = ({
   name,
   body,
   date,
   prerelease,
   current,
+  repo,
 }) => {
-  const infos = useMemo(
-    () => body.map((v) => v.replace(/(\s\[.*?\])\(.*?\)/, "")),
-    [body],
-  );
   return (
-    <Card shadow="md" p="lg">
+    <Card p="lg">
       <Group>
+        {repo && <Badge color="grape">{repo}</Badge>}
         <Text fw="bold">{name}</Text>
         <Badge color="blue">{date}</Badge>
         <Badge color={prerelease ? "yellow" : "green"}>
@@ -56,12 +149,7 @@ const ReleaseCard: FunctionComponent<ReleaseInfo> = ({
         {current && <Badge color="indigo">Installed</Badge>}
       </Group>
       <Divider my="sm"></Divider>
-      <Text>From newest to oldest:</Text>
-      <List>
-        {infos.map((v, idx) => (
-          <List.Item key={idx}>{v}</List.Item>
-        ))}
-      </List>
+      <MarkdownBody text={body} />
     </Card>
   );
 };
diff --git a/frontend/src/pages/System/Status/index.tsx b/frontend/src/pages/System/Status/index.tsx
index abbac7b36e..a24c88ce28 100644
--- a/frontend/src/pages/System/Status/index.tsx
+++ b/frontend/src/pages/System/Status/index.tsx
@@ -17,11 +17,7 @@ import {
 } from "@mantine/core";
 import { useDocumentTitle } from "@mantine/hooks";
 import { IconDefinition } from "@fortawesome/fontawesome-common-types";
-import {
-  faDiscord,
-  faGithub,
-  faWikipediaW,
-} from "@fortawesome/free-brands-svg-icons";
+import { faGithub, faWikipediaW } from "@fortawesome/free-brands-svg-icons";
 import { faCode, faPaperPlane } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useSystemHealth, useSystemStatus } from "@/apis/hooks";
@@ -176,11 +172,6 @@ const SystemStatusView: FunctionComponent = () => {
               Swagger UI
             </Label>
           </Row>
-          <Row title="Discord">
-            <Label icon={faDiscord} link="https://discord.gg/MH2e2eb">
-              Bazarr on Discord
-            </Label>
-          </Row>
         </InfoContainer>
       </Stack>
     </Container>
diff --git a/frontend/src/pages/Wanted/Movies/index.tsx b/frontend/src/pages/Wanted/Movies/index.tsx
index 88a4eb90ad..2579033c70 100644
--- a/frontend/src/pages/Wanted/Movies/index.tsx
+++ b/frontend/src/pages/Wanted/Movies/index.tsx
@@ -16,6 +16,7 @@ import Language from "@/components/bazarr/Language";
 import { WantedItem } from "@/components/forms/MassTranslateForm";
 import WantedView from "@/pages/views/WantedView";
 import { BuildKey } from "@/utilities";
+import tableStyles from "@/components/tables/BaseTable.module.scss";
 
 const WantedMoviesView: FunctionComponent = () => {
   const { download } = useMovieSubtitleModification();
@@ -115,7 +116,11 @@ const WantedMoviesView: FunctionComponent = () => {
         }) => {
           const target = `/movies/${radarrId}`;
           return (
-            <Anchor component={Link} to={target}>
+            <Anchor
+              className={`table-primary ${tableStyles.episodeTitle}`}
+              component={Link}
+              to={target}
+            >
               {title}
             </Anchor>
           );
diff --git a/frontend/src/pages/Wanted/Series/index.tsx b/frontend/src/pages/Wanted/Series/index.tsx
index 917105317c..4363ac753b 100644
--- a/frontend/src/pages/Wanted/Series/index.tsx
+++ b/frontend/src/pages/Wanted/Series/index.tsx
@@ -16,6 +16,7 @@ import Language from "@/components/bazarr/Language";
 import { WantedItem } from "@/components/forms/MassTranslateForm";
 import WantedView from "@/pages/views/WantedView";
 import { BuildKey } from "@/utilities";
+import tableStyles from "@/components/tables/BaseTable.module.scss";
 
 const WantedSeriesView: FunctionComponent = () => {
   const { download } = useEpisodeSubtitleModification();
@@ -115,7 +116,11 @@ const WantedSeriesView: FunctionComponent = () => {
         }) => {
           const target = `/series/${sonarrSeriesId}`;
           return (
-            <Anchor className="table-primary" component={Link} to={target}>
+            <Anchor
+              className={`table-primary ${tableStyles.episodeTitle}`}
+              component={Link}
+              to={target}
+            >
               {seriesTitle}
             </Anchor>
           );
@@ -135,9 +140,27 @@ const WantedSeriesView: FunctionComponent = () => {
       {
         header: "Episode",
         accessorKey: "episode_number",
+        cell: ({
+          row: {
+            original: { episode_number: episodeNumber },
+          },
+        }) => {
+          return (
+            <span className={tableStyles.episodeNumber}>{episodeNumber}</span>
+          );
+        },
       },
       {
         accessorKey: "episodeTitle",
+        cell: ({
+          row: {
+            original: { episodeTitle },
+          },
+        }) => {
+          return (
+            <span className={tableStyles.episodeTitle}>{episodeTitle}</span>
+          );
+        },
       },
       {
         header: "Missing",
diff --git a/frontend/src/pages/views/ItemOverview.module.scss b/frontend/src/pages/views/ItemOverview.module.scss
new file mode 100644
index 0000000000..67783c5fba
--- /dev/null
+++ b/frontend/src/pages/views/ItemOverview.module.scss
@@ -0,0 +1,21 @@
+.fanartWrapper {
+  position: relative;
+  margin: 0 12px;
+  border-radius: var(--bz-radius-lg);
+  overflow: hidden;
+}
+
+.fanartOverlay {
+  background: rgba(0, 0, 0, 0.65);
+
+  // Force dark-style colors inside overlay regardless of theme
+  @include mantine.light {
+    color: #e8e8f0;
+
+    :global(.mantine-Badge-root[data-variant="light"]) {
+      background: rgba(255, 255, 255, 0.1);
+      color: rgba(255, 255, 255, 0.85);
+      border-color: rgba(255, 255, 255, 0.15);
+    }
+  }
+}
diff --git a/frontend/src/pages/views/ItemOverview.tsx b/frontend/src/pages/views/ItemOverview.tsx
index 5259c53c8c..2b8c5626a0 100644
--- a/frontend/src/pages/views/ItemOverview.tsx
+++ b/frontend/src/pages/views/ItemOverview.tsx
@@ -35,6 +35,7 @@ import {
   useLanguageProfileBy,
   useProfileItemsToLanguages,
 } from "@/utilities/languages";
+import classes from "./ItemOverview.module.scss";
 
 interface Props {
   item: Item.Base | null;
@@ -137,68 +138,71 @@ const ItemOverview: FunctionComponent<Props> = (props) => {
   }, [profile, profileItems]);
 
   return (
-    <BackgroundImage src={item?.fanart ?? ""}>
-      <Grid
-        align="flex-start"
-        grow
-        gutter="xs"
-        p={24}
-        m={0}
-        style={{
-          backgroundColor: "rgba(0,0,0,0.7)",
-        }}
-        styles={{
-          inner: { flexWrap: "nowrap" },
-        }}
-      >
-        <Grid.Col span={1} visibleFrom="sm">
-          <Image src={item?.poster} mx="auto" maw="250px"></Image>
-        </Grid.Col>
-        <Grid.Col span={8} maw="100%" style={{ overflow: "hidden" }}>
-          <Stack align="flex-start" gap="xs" mx={6}>
-            <Group align="flex-start" wrap="nowrap" maw="100%">
-              <Title my={0}>
-                <Text inherit c="white">
-                  <Box component="span" mr={12}>
-                    <FontAwesomeIcon
-                      title={item?.monitored ? "monitored" : "unmonitored"}
-                      icon={item?.monitored ? faBookmark : farBookmark}
-                    ></FontAwesomeIcon>
-                  </Box>
-                  {item?.title}
-                </Text>
-              </Title>
-              <HoverCard position="bottom" withArrow>
-                <HoverCard.Target>
-                  <Text hidden={item?.alternativeTitles.length === 0} c="white">
-                    <FontAwesomeIcon icon={faClone} />
+    <div className={classes.fanartWrapper}>
+      <BackgroundImage src={item?.fanart ?? ""}>
+        <Grid
+          align="flex-start"
+          grow
+          gutter="xs"
+          p={24}
+          m={0}
+          className={classes.fanartOverlay}
+          styles={{
+            inner: { flexWrap: "nowrap" },
+          }}
+        >
+          <Grid.Col span={1} visibleFrom="sm">
+            <Image src={item?.poster} mx="auto" maw="250px"></Image>
+          </Grid.Col>
+          <Grid.Col span={8} maw="100%" style={{ overflow: "hidden" }}>
+            <Stack align="flex-start" gap="xs" mx={6}>
+              <Group align="flex-start" wrap="nowrap" maw="100%">
+                <Title my={0}>
+                  <Text inherit c="white">
+                    <Box component="span" mr={12}>
+                      <FontAwesomeIcon
+                        title={item?.monitored ? "monitored" : "unmonitored"}
+                        icon={item?.monitored ? faBookmark : farBookmark}
+                      ></FontAwesomeIcon>
+                    </Box>
+                    {item?.title}
                   </Text>
-                </HoverCard.Target>
-                <HoverCard.Dropdown>
-                  <List>
-                    {item?.alternativeTitles.map((v, idx) => (
-                      <List.Item key={BuildKey(idx, v)}>{v}</List.Item>
-                    ))}
-                  </List>
-                </HoverCard.Dropdown>
-              </HoverCard>
-            </Group>
-            <Group gap="xs" maw="100%">
-              {detailBadges}
-            </Group>
-            <Group gap="xs" maw="100%">
-              {audioBadges}
-            </Group>
-            <Group gap="xs" maw="100%">
-              {languageBadges}
-            </Group>
-            <Text size="sm" c="white">
-              {item?.overview}
-            </Text>
-          </Stack>
-        </Grid.Col>
-      </Grid>
-    </BackgroundImage>
+                </Title>
+                <HoverCard position="bottom" withArrow>
+                  <HoverCard.Target>
+                    <Text
+                      hidden={item?.alternativeTitles.length === 0}
+                      c="white"
+                    >
+                      <FontAwesomeIcon icon={faClone} />
+                    </Text>
+                  </HoverCard.Target>
+                  <HoverCard.Dropdown>
+                    <List>
+                      {item?.alternativeTitles.map((v, idx) => (
+                        <List.Item key={BuildKey(idx, v)}>{v}</List.Item>
+                      ))}
+                    </List>
+                  </HoverCard.Dropdown>
+                </HoverCard>
+              </Group>
+              <Group gap="xs" maw="100%">
+                {detailBadges}
+              </Group>
+              <Group gap="xs" maw="100%">
+                {audioBadges}
+              </Group>
+              <Group gap="xs" maw="100%">
+                {languageBadges}
+              </Group>
+              <Text size="sm" c="white">
+                {item?.overview}
+              </Text>
+            </Stack>
+          </Grid.Col>
+        </Grid>
+      </BackgroundImage>
+    </div>
   );
 };
 
diff --git a/frontend/src/pages/views/ItemView.tsx b/frontend/src/pages/views/ItemView.tsx
index 02a15ae65c..a424c11ead 100644
--- a/frontend/src/pages/views/ItemView.tsx
+++ b/frontend/src/pages/views/ItemView.tsx
@@ -1,5 +1,4 @@
-import { useCallback, useMemo, useState } from "react";
-import { useNavigate } from "react-router";
+import { ReactNode, useCallback, useMemo, useState } from "react";
 import {
   ActionIcon,
   Badge,
@@ -19,14 +18,13 @@ import {
 import {
   faEraser,
   faFilter,
-  faList,
   faSearch,
   faTimes,
   faVolumeUp,
   faVolumeXmark,
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { ColumnDef } from "@tanstack/react-table";
+import { ColumnDef, Row } from "@tanstack/react-table";
 import { useAudioLanguages } from "@/apis/hooks";
 import { UsePaginationQueryResult } from "@/apis/queries/hooks";
 import { QueryPageTable, Toolbox } from "@/components";
@@ -40,6 +38,10 @@ interface Props<T extends Item.Base = Item.Base> {
   onAudioLanguagesChange?: (values: string[]) => void;
   excludeLanguages?: string[];
   onExcludeLanguagesChange?: (values: string[]) => void;
+  enableRowSelection?: boolean;
+  onSelectionChanged?: (selections: T[]) => void;
+  selectionToolbar?: ReactNode;
+  profileToolbar?: ReactNode;
 }
 
 function ItemView<T extends Item.Base>({
@@ -51,8 +53,11 @@ function ItemView<T extends Item.Base>({
   onAudioLanguagesChange,
   excludeLanguages = [],
   onExcludeLanguagesChange,
+  enableRowSelection,
+  onSelectionChanged,
+  selectionToolbar,
+  profileToolbar,
 }: Props<T>) {
-  const navigate = useNavigate();
   const { data: audioLangs = [] } = useAudioLanguages();
   const [filtersOpen, setFiltersOpen] = useState(false);
 
@@ -171,13 +176,10 @@ function ItemView<T extends Item.Base>({
   return (
     <Stack gap={0}>
       <Toolbox>
-        <Toolbox.Button
-          disabled={query.paginationStatus.totalCount === 0 && !hasActiveFilter}
-          icon={faList}
-          onClick={() => navigate("edit")}
-        >
-          Mass Edit
-        </Toolbox.Button>
+        <Group gap="xs">
+          {selectionToolbar ? <Box>{selectionToolbar}</Box> : null}
+          {profileToolbar ? <Box>{profileToolbar}</Box> : null}
+        </Group>
         <Group gap="xs">
           {hasAnyFilterControl && (
             <Tooltip
@@ -189,15 +191,16 @@ function ItemView<T extends Item.Base>({
                 label={activeFilterCount > 0 ? activeFilterCount : undefined}
                 size={16}
                 offset={4}
-                color="blue"
+                color="brand"
                 disabled={activeFilterCount === 0}
               >
                 <ActionIcon
-                  variant={filtersOpen ? "filled" : "subtle"}
-                  color={activeFilterCount > 0 ? "blue" : "gray"}
+                  variant="gradient"
+                  gradient={{ from: "brand.5", to: "brand.6", deg: 135 }}
                   size="lg"
                   onClick={() => setFiltersOpen((v) => !v)}
                   aria-label="Toggle filters"
+                  style={{ opacity: filtersOpen ? 1 : 0.9 }}
                 >
                   <FontAwesomeIcon icon={faFilter} />
                 </ActionIcon>
@@ -241,11 +244,11 @@ function ItemView<T extends Item.Base>({
           px="md"
           py={8}
           style={{
-            borderBottom: "1px solid var(--mantine-color-default-border)",
+            borderBottom: "1px solid var(--bz-border-divider)",
           }}
         >
           <Group gap={8}>
-            <Text size="xs" c="dimmed" fw={500}>
+            <Text size="xs" c="var(--bz-text-tertiary)" fw={500}>
               Active filters:
             </Text>
             {activeFilterChips.map((chip) => (
@@ -281,7 +284,7 @@ function ItemView<T extends Item.Base>({
             <UnstyledButton onClick={clearAllFilters}>
               <Group gap={4}>
                 <FontAwesomeIcon icon={faEraser} size="xs" opacity={0.6} />
-                <Text size="xs" c="dimmed" td="underline">
+                <Text size="xs" c="var(--bz-text-tertiary)" td="underline">
                   Clear all
                 </Text>
               </Group>
@@ -297,8 +300,8 @@ function ItemView<T extends Item.Base>({
           py="sm"
           radius={0}
           style={{
-            borderBottom: "1px solid var(--mantine-color-default-border)",
-            backgroundColor: "var(--mantine-color-body)",
+            borderBottom: "1px solid var(--bz-border-divider)",
+            backgroundColor: "var(--bz-surface-base)",
           }}
         >
           <Group gap="lg" align="flex-end" wrap="wrap">
@@ -306,7 +309,7 @@ function ItemView<T extends Item.Base>({
               <Box style={{ flex: "1 1 200px", maxWidth: 280 }}>
                 <Group gap={6} mb={4}>
                   <FontAwesomeIcon icon={faVolumeUp} size="xs" opacity={0.6} />
-                  <Text size="xs" fw={500} c="dimmed">
+                  <Text size="xs" fw={500} c="var(--bz-text-tertiary)">
                     Include Audio Languages
                   </Text>
                 </Group>
@@ -336,7 +339,7 @@ function ItemView<T extends Item.Base>({
                       size="xs"
                       opacity={0.6}
                     />
-                    <Text size="xs" fw={500} c="dimmed">
+                    <Text size="xs" fw={500} c="var(--bz-text-tertiary)">
                       Exclude Audio Languages
                     </Text>
                   </Group>
@@ -366,6 +369,10 @@ function ItemView<T extends Item.Base>({
         query={query}
         dataFilter={hasActiveFilter ? dataFilter : undefined}
         tableStyles={{ emptyText: "No items found" }}
+        enableRowSelection={enableRowSelection}
+        onRowSelectionChanged={(rows: Row<T>[]) => {
+          onSelectionChanged?.(rows.map((r) => r.original));
+        }}
       ></QueryPageTable>
     </Stack>
   );
diff --git a/frontend/src/pages/views/MassEditor.tsx b/frontend/src/pages/views/MassEditor.tsx
deleted file mode 100644
index 57221888ab..0000000000
--- a/frontend/src/pages/views/MassEditor.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { useCallback, useMemo, useRef, useState } from "react";
-import { useNavigate } from "react-router";
-import { Box, Container, useCombobox } from "@mantine/core";
-import { faCheck, faUndo } from "@fortawesome/free-solid-svg-icons";
-import { UseMutationResult } from "@tanstack/react-query";
-import { ColumnDef, Table } from "@tanstack/react-table";
-import { uniqBy } from "lodash";
-import { useIsAnyMutationRunning, useLanguageProfiles } from "@/apis/hooks";
-import { GroupedSelector, GroupedSelectorOptions, Toolbox } from "@/components";
-import SimpleTable from "@/components/tables/SimpleTable";
-import { GetItemId, useSelectorOptions } from "@/utilities";
-
-interface MassEditorProps<T extends Item.Base = Item.Base> {
-  columns: ColumnDef<T>[];
-  data: T[];
-  mutation: UseMutationResult<void, unknown, FormType.ModifyItem>;
-}
-
-function MassEditor<T extends Item.Base>(props: MassEditorProps<T>) {
-  const { columns, data: raw, mutation } = props;
-
-  const [selections, setSelections] = useState<T[]>([]);
-  const [dirties, setDirties] = useState<T[]>([]);
-  const hasTask = useIsAnyMutationRunning();
-  const { data: profiles } = useLanguageProfiles();
-  const tableRef = useRef<Table<T>>(null);
-
-  const navigate = useNavigate();
-
-  const onEnded = useCallback(() => navigate(".."), [navigate]);
-
-  const data = useMemo(
-    () => uniqBy([...dirties, ...(raw ?? [])], GetItemId),
-    [dirties, raw],
-  );
-
-  const profileOptions = useSelectorOptions(profiles ?? [], (v) => v.name);
-
-  const profileOptionsWithAction = useMemo<
-    GroupedSelectorOptions<string>[]
-  >(() => {
-    return [
-      {
-        group: "Actions",
-        items: [{ label: "Clear", value: "", profileId: null }],
-      },
-      {
-        group: "Profiles",
-        items: profileOptions.options.map((a) => {
-          return {
-            value: a.value.profileId.toString(),
-            label: a.label,
-            profileId: a.value.profileId,
-          };
-        }),
-      },
-    ];
-  }, [profileOptions.options]);
-
-  const { mutateAsync } = mutation;
-
-  /**
-   * Submit the form that contains the series id and the respective profile id set in chunks to prevent payloads too
-   * large when we have a high amount of series or movies being applied the profile. The chunks are executed in order
-   * since there are no much benefit on executing in parallel, also parallelism could result in high load on the server
-   * side if not throttled properly.
-   */
-  const save = useCallback(() => {
-    const chunkSize = 1000;
-
-    const form: FormType.ModifyItem = {
-      id: [],
-      profileid: [],
-    };
-
-    dirties.forEach((v) => {
-      const id = GetItemId(v);
-      if (id) {
-        form.id.push(id);
-        form.profileid.push(v.profileId);
-      }
-    });
-
-    const mutateInChunks = async (
-      ids: number[],
-      profileIds: (number | null)[],
-    ) => {
-      if (ids.length === 0) return;
-
-      const chunkIds = ids.slice(0, chunkSize);
-      const chunkProfileIds = profileIds.slice(0, chunkSize);
-
-      await mutateAsync({
-        id: chunkIds,
-        profileid: chunkProfileIds,
-      });
-
-      await mutateInChunks(ids.slice(chunkSize), profileIds.slice(chunkSize));
-    };
-
-    return mutateInChunks(form.id, form.profileid);
-  }, [dirties, mutateAsync]);
-
-  const setProfiles = useCallback(
-    (id: number | null) => {
-      const newItems = selections.map((v) => ({ ...v, profileId: id }));
-
-      setDirties((dirty) => {
-        return uniqBy([...newItems, ...dirty], GetItemId);
-      });
-
-      tableRef.current?.toggleAllRowsSelected(false);
-    },
-    [selections],
-  );
-
-  const combobox = useCombobox();
-
-  return (
-    <Container fluid px={0}>
-      <Toolbox>
-        <Box>
-          <GroupedSelector
-            onClick={() => combobox.openDropdown()}
-            onDropdownClose={() => {
-              combobox.resetSelectedOption();
-            }}
-            placeholder="Change Profile"
-            withCheckIcon={false}
-            options={profileOptionsWithAction}
-            disabled={selections.length === 0}
-            comboboxProps={{
-              store: combobox,
-              onOptionSubmit: (value) => {
-                setProfiles(value ? +value : null);
-              },
-            }}
-          ></GroupedSelector>
-        </Box>
-        <Box>
-          <Toolbox.Button icon={faUndo} onClick={onEnded}>
-            Cancel
-          </Toolbox.Button>
-          <Toolbox.MutateButton
-            icon={faCheck}
-            disabled={dirties.length === 0 || hasTask}
-            promise={save}
-            onSuccess={onEnded}
-          >
-            Save
-          </Toolbox.MutateButton>
-        </Box>
-      </Toolbox>
-      <SimpleTable
-        instanceRef={tableRef}
-        columns={columns}
-        data={data}
-        enableRowSelection
-        onRowSelectionChanged={(row) => {
-          setSelections(row.map((r) => r.original));
-        }}
-      ></SimpleTable>
-    </Container>
-  );
-}
-
-export default MassEditor;
diff --git a/frontend/src/pages/views/WantedView.tsx b/frontend/src/pages/views/WantedView.tsx
index 0ac45edcc5..eed3170ba1 100644
--- a/frontend/src/pages/views/WantedView.tsx
+++ b/frontend/src/pages/views/WantedView.tsx
@@ -229,15 +229,16 @@ function WantedView<T extends Wanted.Base>({
                 label={activeFilterCount > 0 ? activeFilterCount : undefined}
                 size={16}
                 offset={4}
-                color="blue"
+                color="brand"
                 disabled={activeFilterCount === 0}
               >
                 <ActionIcon
-                  variant={filtersOpen ? "filled" : "subtle"}
-                  color={activeFilterCount > 0 ? "blue" : "gray"}
+                  variant="gradient"
+                  gradient={{ from: "brand.5", to: "brand.6", deg: 135 }}
                   size="lg"
                   onClick={() => setFiltersOpen((v) => !v)}
                   aria-label="Toggle filters"
+                  style={{ opacity: filtersOpen ? 1 : 0.9 }}
                 >
                   <FontAwesomeIcon icon={faFilter} />
                 </ActionIcon>
@@ -281,11 +282,11 @@ function WantedView<T extends Wanted.Base>({
           px="md"
           py={8}
           style={{
-            borderBottom: "1px solid var(--mantine-color-default-border)",
+            borderBottom: "1px solid var(--bz-border-divider)",
           }}
         >
           <Group gap={8}>
-            <Text size="xs" c="dimmed" fw={500}>
+            <Text size="xs" c="var(--bz-text-tertiary)" fw={500}>
               Active filters:
             </Text>
             {activeFilterChips.map((chip) => (
@@ -321,7 +322,7 @@ function WantedView<T extends Wanted.Base>({
             <UnstyledButton onClick={clearAllFilters}>
               <Group gap={4}>
                 <FontAwesomeIcon icon={faEraser} size="xs" opacity={0.6} />
-                <Text size="xs" c="dimmed" td="underline">
+                <Text size="xs" c="var(--bz-text-tertiary)" td="underline">
                   Clear all
                 </Text>
               </Group>
@@ -337,8 +338,8 @@ function WantedView<T extends Wanted.Base>({
           py="sm"
           radius={0}
           style={{
-            borderBottom: "1px solid var(--mantine-color-default-border)",
-            backgroundColor: "var(--mantine-color-body)",
+            borderBottom: "1px solid var(--bz-border-divider)",
+            backgroundColor: "var(--bz-surface-base)",
           }}
         >
           <Group gap="lg" align="flex-end" wrap="wrap">
@@ -346,7 +347,7 @@ function WantedView<T extends Wanted.Base>({
               <Box style={{ flex: "1 1 200px", maxWidth: 280 }}>
                 <Group gap={6} mb={4}>
                   <FontAwesomeIcon icon={faVolumeUp} size="xs" opacity={0.6} />
-                  <Text size="xs" fw={500} c="dimmed">
+                  <Text size="xs" fw={500} c="var(--bz-text-tertiary)">
                     Include Audio Languages
                   </Text>
                 </Group>
@@ -376,7 +377,7 @@ function WantedView<T extends Wanted.Base>({
                       size="xs"
                       opacity={0.6}
                     />
-                    <Text size="xs" fw={500} c="dimmed">
+                    <Text size="xs" fw={500} c="var(--bz-text-tertiary)">
                       Exclude Audio Languages
                     </Text>
                   </Group>
@@ -406,7 +407,7 @@ function WantedView<T extends Wanted.Base>({
                       size="xs"
                       opacity={0.6}
                     />
-                    <Text size="xs" fw={500} c="dimmed">
+                    <Text size="xs" fw={500} c="var(--bz-text-tertiary)">
                       Missing Subtitle Language
                     </Text>
                   </Group>
diff --git a/frontend/src/providers.tsx b/frontend/src/providers.tsx
index d1eb7b4342..0582463bd5 100644
--- a/frontend/src/providers.tsx
+++ b/frontend/src/providers.tsx
@@ -2,11 +2,11 @@ import { FunctionComponent, PropsWithChildren } from "react";
 import { Notifications } from "@mantine/notifications";
 import { QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import "@fontsource-variable/geist";
 import queryClient from "@/apis/queries";
 import ThemeProvider from "@/App/ThemeProvider";
 import { ModalsProvider } from "@/modules/modals";
 import { Environment } from "./utilities";
-import "@fontsource/roboto/300.css";
 
 export const AllProviders: FunctionComponent<PropsWithChildren> = ({
   children,
diff --git a/frontend/src/tests/setup.tsx b/frontend/src/tests/setup.tsx
index 52310b9066..45984c56c4 100644
--- a/frontend/src/tests/setup.tsx
+++ b/frontend/src/tests/setup.tsx
@@ -58,6 +58,15 @@ beforeEach(() => {
         },
       });
     }),
+    http.get("/api/system/languages/audio", () => {
+      return HttpResponse.json([]);
+    }),
+    http.get("/api/system/languages/profiles", () => {
+      return HttpResponse.json([]);
+    }),
+    http.get("/api/subtitles/upgradable", () => {
+      return HttpResponse.json({ movies: [], series: [] });
+    }),
   );
 });
 
diff --git a/frontend/src/types/api.d.ts b/frontend/src/types/api.d.ts
index c1272eefd0..4725f5284e 100644
--- a/frontend/src/types/api.d.ts
+++ b/frontend/src/types/api.d.ts
@@ -269,6 +269,7 @@ declare namespace Plex {
     pinId: string;
     code: string;
     clientId: string;
+    state: string;
     authUrl: string;
   }
 
@@ -388,7 +389,8 @@ interface ReleaseInfo {
   date: string;
   name: string;
   prerelease: boolean;
-  body: string[];
+  body: string | string[];
+  repo?: string;
 }
 
 interface SubtitleInfo {
@@ -397,6 +399,27 @@ interface SubtitleInfo {
   season: number;
 }
 
+declare namespace SubtitleContents {
+  interface LineTime {
+    hours: number;
+    minutes: number;
+    seconds: number;
+    total_seconds: number;
+    microseconds: number;
+  }
+
+  interface Line {
+    index: number;
+    content: string;
+    proprietary: string;
+    start: LineTime;
+    end: LineTime;
+    // duration: LineTime;
+  }
+
+  // interface Contents extends Array<Line> {}
+}
+
 type ItemSearchResult = Partial<SeriesIdType> &
   Partial<MovieIdType> & {
     title: string;
diff --git a/frontend/src/types/react-table.d.ts b/frontend/src/types/react-table.d.ts
index c05bcd9fd1..775d06537f 100644
--- a/frontend/src/types/react-table.d.ts
+++ b/frontend/src/types/react-table.d.ts
@@ -42,11 +42,13 @@ declare module "react-table" {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-empty-interface
-  interface CustomTableProps<D extends Record<string, unknown>>
-    extends useSelectionProps<D> {}
+  interface CustomTableProps<
+    D extends Record<string, unknown>,
+  > extends useSelectionProps<D> {}
 
   export interface TableOptions<D extends Record<string, unknown>>
-    extends UseExpandedOptions<D>,
+    extends
+      UseExpandedOptions<D>,
       // UseFiltersOptions<D>,
       // UseGlobalFiltersOptions<D>,
       UseGroupByOptions<D>,
@@ -61,14 +63,18 @@ declare module "react-table" {
 
   export interface Hooks<
     D extends Record<string, unknown> = Record<string, unknown>,
-  > extends UseExpandedHooks<D>,
+  >
+    extends
+      UseExpandedHooks<D>,
       UseGroupByHooks<D>,
       UseRowSelectHooks<D>,
       UseSortByHooks<D> {}
 
   export interface TableInstance<
     D extends Record<string, unknown> = Record<string, unknown>,
-  > extends UseColumnOrderInstanceProps<D>,
+  >
+    extends
+      UseColumnOrderInstanceProps<D>,
       UseExpandedInstanceProps<D>,
       // UseFiltersInstanceProps<D>,
       // UseGlobalFiltersInstanceProps<D>,
@@ -81,7 +87,9 @@ declare module "react-table" {
 
   export interface TableState<
     D extends Record<string, unknown> = Record<string, unknown>,
-  > extends UseColumnOrderState<D>,
+  >
+    extends
+      UseColumnOrderState<D>,
       UseExpandedState<D>,
       // UseFiltersState<D>,
       // UseGlobalFiltersState<D>,
@@ -94,7 +102,9 @@ declare module "react-table" {
 
   export interface ColumnInterface<
     D extends Record<string, unknown> = Record<string, unknown>,
-  > extends UseFiltersColumnOptions<D>,
+  >
+    extends
+      UseFiltersColumnOptions<D>,
       // UseGlobalFiltersColumnOptions<D>,
       UseGroupByColumnOptions<D>,
       // UseResizeColumnsColumnOptions<D>,
@@ -102,7 +112,9 @@ declare module "react-table" {
 
   export interface ColumnInstance<
     D extends Record<string, unknown> = Record<string, unknown>,
-  > extends UseFiltersColumnProps<D>,
+  >
+    extends
+      UseFiltersColumnProps<D>,
       UseGroupByColumnProps<D>,
       // UseResizeColumnsColumnProps<D>,
       UseSortByColumnProps<D> {}
@@ -114,7 +126,9 @@ declare module "react-table" {
 
   export interface Row<
     D extends Record<string, unknown> = Record<string, unknown>,
-  > extends UseExpandedRowProps<D>,
+  >
+    extends
+      UseExpandedRowProps<D>,
       UseGroupByRowProps<D>,
       UseRowSelectRowProps<D> {}
 }
diff --git a/frontend/src/types/settings.d.ts b/frontend/src/types/settings.d.ts
index e8ef0916bc..8a6c7c3c9c 100644
--- a/frontend/src/types/settings.d.ts
+++ b/frontend/src/types/settings.d.ts
@@ -80,6 +80,7 @@ declare namespace Settings {
     use_scenename: boolean;
     use_sonarr: boolean;
     utf8_encode: boolean;
+    provider_priorities?: string;
     wanted_search_frequency: number;
     wanted_search_frequency_movie: number;
     use_external_webhook?: boolean;
@@ -176,8 +177,9 @@ declare namespace Settings {
 
   interface Translator {
     default_score: number;
-    gemini_key: string;
+    gemini_keys: string[];
     gemini_model: string;
+    gemini_batch_size: number;
     lingarr_url: string;
     lingarr_token: string;
     translator_info: boolean;
diff --git a/frontend/src/utilities/routers.ts b/frontend/src/utilities/routers.ts
deleted file mode 100644
index 397e72c9cb..0000000000
--- a/frontend/src/utilities/routers.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Navigation blocker utility using React Router's useBlocker with Mantine confirmation modal
-
-import { useEffect, useRef } from "react";
-import { useBlocker } from "react-router";
-import { modals } from "@mantine/modals";
-
-export function usePrompt(when: boolean, message: string) {
-  const blocker = useBlocker(
-    ({ currentLocation, nextLocation }) =>
-      when && currentLocation.pathname !== nextLocation.pathname,
-  );
-
-  const prevWhen = useRef(when);
-
-  useEffect(() => {
-    if (blocker.state === "blocked" && prevWhen.current === when) {
-      modals.openConfirmModal({
-        title: "Unsaved Changes",
-        children: message,
-        labels: { confirm: "Leave", cancel: "Stay" },
-        confirmProps: { color: "red" },
-        onConfirm: () => blocker.proceed(),
-        onCancel: () => blocker.reset(),
-        closeOnCancel: true,
-        closeOnConfirm: true,
-      });
-    }
-    prevWhen.current = when;
-  }, [blocker, message, when]);
-}
diff --git a/frontend/src/utilities/routers.tsx b/frontend/src/utilities/routers.tsx
new file mode 100644
index 0000000000..834d88854e
--- /dev/null
+++ b/frontend/src/utilities/routers.tsx
@@ -0,0 +1,109 @@
+import { useCallback, useEffect, useRef } from "react";
+import { useBlocker } from "react-router";
+import { Button, Group, Stack, Text } from "@mantine/core";
+import { modals } from "@mantine/modals";
+
+export function usePrompt(
+  when: boolean,
+  message: string,
+  onSaveAndLeave?: () => Promise<void> | void,
+) {
+  const blocker = useBlocker(
+    ({ currentLocation, nextLocation }) =>
+      when && currentLocation.pathname !== nextLocation.pathname,
+  );
+
+  const prevWhen = useRef(when);
+  const previousFocus = useRef<HTMLElement | null>(null);
+
+  const handleStay = useCallback(() => {
+    modals.closeAll();
+    if (blocker.state === "blocked") {
+      blocker.reset?.();
+    }
+    requestAnimationFrame(() => previousFocus.current?.focus());
+  }, [blocker]);
+
+  const handleDiscard = useCallback(() => {
+    modals.closeAll();
+    if (blocker.state === "blocked") {
+      blocker.proceed?.();
+    }
+  }, [blocker]);
+
+  const handleSaveAndLeave = useCallback(async () => {
+    if (onSaveAndLeave) {
+      await onSaveAndLeave();
+    }
+    modals.closeAll();
+    if (blocker.state === "blocked") {
+      blocker.proceed?.();
+    }
+  }, [blocker, onSaveAndLeave]);
+
+  useEffect(() => {
+    if (blocker.state === "blocked" && prevWhen.current === when) {
+      previousFocus.current = document.activeElement as HTMLElement;
+
+      modals.open({
+        title: "Unsaved Changes",
+        centered: true,
+        size: "md",
+        closeOnEscape: true,
+        closeOnClickOutside: false,
+        onClose: () => {
+          if (blocker.state === "blocked") {
+            blocker.reset?.();
+          }
+          requestAnimationFrame(() => previousFocus.current?.focus());
+        },
+        children: (
+          <Stack>
+            <Text size="sm" c="var(--bz-text-tertiary)">
+              {message}
+            </Text>
+            <Group justify="flex-end" mt="lg" gap="xs">
+              <Button
+                variant="default"
+                size="sm"
+                data-autofocus
+                onClick={handleStay}
+                aria-label="Stay on this page and continue editing"
+              >
+                Keep Editing
+              </Button>
+              <Button
+                variant="light"
+                color="red"
+                size="sm"
+                onClick={handleDiscard}
+                aria-label="Discard unsaved changes and leave this page"
+              >
+                Discard
+              </Button>
+              {onSaveAndLeave && (
+                <Button
+                  color="brand"
+                  size="sm"
+                  onClick={handleSaveAndLeave}
+                  aria-label="Save all changes and leave this page"
+                >
+                  Save & Leave
+                </Button>
+              )}
+            </Group>
+          </Stack>
+        ),
+      });
+    }
+    prevWhen.current = when;
+  }, [
+    blocker,
+    message,
+    when,
+    handleStay,
+    handleDiscard,
+    handleSaveAndLeave,
+    onSaveAndLeave,
+  ]);
+}
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 4f54b9f33a..ee6f35b559 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -30,9 +30,6 @@ export default defineConfig(({ mode, command }) => {
       react(),
       checker({
         typescript: true,
-        eslint: {
-          lintCommand: "eslint --ext .ts,.tsx src",
-        },
         enableBuild: false,
       }),
       VitePWA({
@@ -50,7 +47,7 @@ export default defineConfig(({ mode, command }) => {
           short_name: "Bazarr",
           description:
             "Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements.",
-          theme_color: "#be4bdb",
+          theme_color: "#b36b00",
           icons: [
             {
               src: `${imagesFolder}/pwa-64x64.png`,
@@ -136,6 +133,8 @@ export default defineConfig(({ mode, command }) => {
       globals: true,
       environment: "jsdom",
       setupFiles: "./src/tests/setup.tsx",
+      testTimeout: 20000,
+      pool: "forks",
     },
     server: {
       proxy: {
diff --git a/libs/APScheduler-3.10.4.dist-info/METADATA b/libs/APScheduler-3.10.4.dist-info/METADATA
deleted file mode 100644
index 62df97e735..0000000000
--- a/libs/APScheduler-3.10.4.dist-info/METADATA
+++ /dev/null
@@ -1,138 +0,0 @@
-Metadata-Version: 2.1
-Name: APScheduler
-Version: 3.10.4
-Summary: In-process task scheduler with Cron-like capabilities
-Home-page: https://github.com/agronholm/apscheduler
-Author: Alex Grรถnholm
-Author-email: apscheduler@nextday.fi
-License: MIT
-Keywords: scheduling cron
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.6
-License-File: LICENSE.txt
-Requires-Dist: six >=1.4.0
-Requires-Dist: pytz
-Requires-Dist: tzlocal !=3.*,>=2.0
-Requires-Dist: importlib-metadata >=3.6.0 ; python_version < "3.8"
-Provides-Extra: doc
-Requires-Dist: sphinx ; extra == 'doc'
-Requires-Dist: sphinx-rtd-theme ; extra == 'doc'
-Provides-Extra: gevent
-Requires-Dist: gevent ; extra == 'gevent'
-Provides-Extra: mongodb
-Requires-Dist: pymongo >=3.0 ; extra == 'mongodb'
-Provides-Extra: redis
-Requires-Dist: redis >=3.0 ; extra == 'redis'
-Provides-Extra: rethinkdb
-Requires-Dist: rethinkdb >=2.4.0 ; extra == 'rethinkdb'
-Provides-Extra: sqlalchemy
-Requires-Dist: sqlalchemy >=1.4 ; extra == 'sqlalchemy'
-Provides-Extra: testing
-Requires-Dist: pytest ; extra == 'testing'
-Requires-Dist: pytest-asyncio ; extra == 'testing'
-Requires-Dist: pytest-cov ; extra == 'testing'
-Requires-Dist: pytest-tornado5 ; extra == 'testing'
-Provides-Extra: tornado
-Requires-Dist: tornado >=4.3 ; extra == 'tornado'
-Provides-Extra: twisted
-Requires-Dist: twisted ; extra == 'twisted'
-Provides-Extra: zookeeper
-Requires-Dist: kazoo ; extra == 'zookeeper'
-
-.. image:: https://github.com/agronholm/apscheduler/workflows/Python%20codeqa/test/badge.svg?branch=3.x
-  :target: https://github.com/agronholm/apscheduler/actions?query=workflow%3A%22Python+codeqa%2Ftest%22+branch%3A3.x
-  :alt: Build Status
-.. image:: https://coveralls.io/repos/github/agronholm/apscheduler/badge.svg?branch=3.x
-  :target: https://coveralls.io/github/agronholm/apscheduler?branch=3.x
-  :alt: Code Coverage
-.. image:: https://readthedocs.org/projects/apscheduler/badge/?version=3.x
-  :target: https://apscheduler.readthedocs.io/en/master/?badge=3.x
-  :alt: Documentation
-
-Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code
-to be executed later, either just once or periodically. You can add new jobs or remove old ones on
-the fly as you please. If you store your jobs in a database, they will also survive scheduler
-restarts and maintain their state. When the scheduler is restarted, it will then run all the jobs
-it should have run while it was offline [#f1]_.
-
-Among other things, APScheduler can be used as a cross-platform, application specific replacement
-to platform specific schedulers, such as the cron daemon or the Windows task scheduler. Please
-note, however, that APScheduler is **not** a daemon or service itself, nor does it come with any
-command line tools. It is primarily meant to be run inside existing applications. That said,
-APScheduler does provide some building blocks for you to build a scheduler service or to run a
-dedicated scheduler process.
-
-APScheduler has three built-in scheduling systems you can use:
-
-* Cron-style scheduling (with optional start/end times)
-* Interval-based execution (runs jobs on even intervals, with optional start/end times)
-* One-off delayed execution (runs jobs once, on a set date/time)
-
-You can mix and match scheduling systems and the backends where the jobs are stored any way you
-like. Supported backends for storing jobs include:
-
-* Memory
-* `SQLAlchemy <http://www.sqlalchemy.org/>`_ (any RDBMS supported by SQLAlchemy works)
-* `MongoDB <http://www.mongodb.org/>`_
-* `Redis <http://redis.io/>`_
-* `RethinkDB <https://www.rethinkdb.com/>`_
-* `ZooKeeper <https://zookeeper.apache.org/>`_
-
-APScheduler also integrates with several common Python frameworks, like:
-
-* `asyncio <http://docs.python.org/3.4/library/asyncio.html>`_ (:pep:`3156`)
-* `gevent <http://www.gevent.org/>`_
-* `Tornado <http://www.tornadoweb.org/>`_
-* `Twisted <http://twistedmatrix.com/>`_
-* `Qt <http://qt-project.org/>`_ (using either
-  `PyQt <http://www.riverbankcomputing.com/software/pyqt/intro>`_ ,
-  `PySide6 <https://wiki.qt.io/Qt_for_Python>`_ ,
-  `PySide2 <https://wiki.qt.io/Qt_for_Python>`_ or
-  `PySide <http://qt-project.org/wiki/PySide>`_)
-
-There are third party solutions for integrating APScheduler with other frameworks:
-
-* `Django <https://github.com/jarekwg/django-apscheduler>`_
-* `Flask <https://github.com/viniciuschiele/flask-apscheduler>`_
-
-
-.. [#f1] The cutoff period for this is also configurable.
-
-
-Documentation
--------------
-
-Documentation can be found `here <https://apscheduler.readthedocs.io/>`_.
-
-
-Source
-------
-
-The source can be browsed at `Github <https://github.com/agronholm/apscheduler/tree/3.x>`_.
-
-
-Reporting bugs
---------------
-
-A `bug tracker <https://github.com/agronholm/apscheduler/issues>`_ is provided by Github.
-
-
-Getting help
-------------
-
-If you have problems or other questions, you can either:
-
-* Ask in the `apscheduler <https://gitter.im/apscheduler/Lobby>`_ room on Gitter
-* Ask on the `APScheduler GitHub discussion forum <https://github.com/agronholm/apscheduler/discussions>`_, or
-* Ask on `StackOverflow <http://stackoverflow.com/questions/tagged/apscheduler>`_ and tag your
-  question with the ``apscheduler`` tag
diff --git a/libs/APScheduler-3.10.4.dist-info/RECORD b/libs/APScheduler-3.10.4.dist-info/RECORD
deleted file mode 100644
index 6a44be9239..0000000000
--- a/libs/APScheduler-3.10.4.dist-info/RECORD
+++ /dev/null
@@ -1,46 +0,0 @@
-APScheduler-3.10.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-APScheduler-3.10.4.dist-info/LICENSE.txt,sha256=YWP3mH37ONa8MgzitwsvArhivEESZRbVUu8c1DJH51g,1130
-APScheduler-3.10.4.dist-info/METADATA,sha256=ITYjDYv8SBO2ynuPiXmySCDJPjfvrFElLJoKQr58h8U,5695
-APScheduler-3.10.4.dist-info/RECORD,,
-APScheduler-3.10.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-APScheduler-3.10.4.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-APScheduler-3.10.4.dist-info/entry_points.txt,sha256=KMxTUp2QykDNL6w-WBU5xrk8ebroCPEBN0eZtyL3x2w,1147
-APScheduler-3.10.4.dist-info/top_level.txt,sha256=O3oMCWxG-AHkecUoO6Ze7-yYjWrttL95uHO8-RFdYvE,12
-apscheduler/__init__.py,sha256=c_KXMg1QziacYqUpDuzLY5g1mcEZvBLq1dJY7NjLoKc,452
-apscheduler/events.py,sha256=KRMTDQUS6d2uVnrQvPoz3ZPV5V9XKsCAZLsgx913FFo,3593
-apscheduler/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apscheduler/executors/asyncio.py,sha256=9m4wvRHSSYplllxAQyxWkPVcFdyFG5aZbHt5nfWKIAc,1859
-apscheduler/executors/base.py,sha256=hogiMc_t-huw6BMod0HEeY2FhRNmAAUyNNuBHvIX31M,5336
-apscheduler/executors/base_py3.py,sha256=8WOpTeX1NA-spdbEQ1oJMh5T2O_t2UdsaSnAh-iEWe0,1831
-apscheduler/executors/debug.py,sha256=15_ogSBzl8RRCfBYDnkIV2uMH8cLk1KImYmBa_NVGpc,573
-apscheduler/executors/gevent.py,sha256=aulrNmoefyBgrOkH9awRhFiXIDnSCnZ4U0o0_JXIXgc,777
-apscheduler/executors/pool.py,sha256=h4cYgKMRhjpNHmkhlogHLbmT4O_q6HePXVLmiJIHC3c,2484
-apscheduler/executors/tornado.py,sha256=DU75VaQ9R6nBuy8lbPUvDKUgsuJcZqwAvURC5vg3r6w,1780
-apscheduler/executors/twisted.py,sha256=bRoU0C4BoVcS6_BjKD5wfUs0IJpGkmLsRAcMH2rJJss,778
-apscheduler/job.py,sha256=JCRERBpfWLuomPiNNHX-jrluEwfHkdscEmz4i0Y8rao,11216
-apscheduler/jobstores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apscheduler/jobstores/base.py,sha256=DXzSW9XscueHZHMvy1qFiG-vYqUl_MMv0n0uBSZWXGo,4523
-apscheduler/jobstores/memory.py,sha256=ZxWiKsqfsCHFvac-6X9BztuhnuSxlOYi1dhT6g-pjQo,3655
-apscheduler/jobstores/mongodb.py,sha256=r9t2neNuzfPuf_omDm0KdkLGPZXLksiH-U3j13MIBlM,5347
-apscheduler/jobstores/redis.py,sha256=kjQDIzPXz-Yq976U9HK3aMkcCI_QRLKgTADQWKewtik,5483
-apscheduler/jobstores/rethinkdb.py,sha256=k1rSLYJqejuhQxJY3pXwHAQYcpZ1QFJsoQ8n0oEu5MM,5863
-apscheduler/jobstores/sqlalchemy.py,sha256=LIA9iSGMvuPTVqGHdztgQs4YFmYN1xqXvpJauYNK470,6529
-apscheduler/jobstores/zookeeper.py,sha256=avGLXaJGjHD0F7uG6rLJ2gg_TXNqXDEM4PqOu56f-Xg,6363
-apscheduler/schedulers/__init__.py,sha256=jM63xA_K7GSToBenhsz-SCcqfhk1pdEVb6ajwoO5Kqg,406
-apscheduler/schedulers/asyncio.py,sha256=iJO6QUo1oW16giOU_nW8WMu2b9NTWT4Tg2gY586G08w,1994
-apscheduler/schedulers/background.py,sha256=751p-f5Di6pY4x6UXlZggpxQ5k2ObJ_Q5wSeWmKHS8o,1566
-apscheduler/schedulers/base.py,sha256=hCchDyhEXCoVmCfGgD3QMrKumYYLAUwY4456tQrukAY,43780
-apscheduler/schedulers/blocking.py,sha256=8nubfJ4PoUnAkEY6WRQG4COzG4SxGyW9PjuVPhDAbsk,985
-apscheduler/schedulers/gevent.py,sha256=csPBvV75FGcboXXsdex6fCD7J54QgBddYNdWj62ZO9g,1031
-apscheduler/schedulers/qt.py,sha256=jy58cP5roWOv68ytg8fiwtxMVnZKw7a8tkCHbLWeUs8,1329
-apscheduler/schedulers/tornado.py,sha256=D9Vaq3Ee9EFiXa1jDy9tedI048gR_YT_LAFUWqO_uEw,1926
-apscheduler/schedulers/twisted.py,sha256=D5EBjjMRtMBxy0_aAURcULAI8Ky2IvCTr9tK9sO1rYk,1844
-apscheduler/triggers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apscheduler/triggers/base.py,sha256=BvBJdOnIeVClXPXeInzYK25cN64jAc4a9IiEQucSiVk,1355
-apscheduler/triggers/combining.py,sha256=klaSoBp1kyrPX5D3gBpNTlsGKjks5QeKPW5JN_MVs30,3449
-apscheduler/triggers/cron/__init__.py,sha256=D39BQ63qWyk6XZcSuWth46ELQ3VIFpYjUHh7Kj65Z9M,9251
-apscheduler/triggers/cron/expressions.py,sha256=hu1kq0mKvivIw7U0D0Nnrbuk3q01dCuhZ7SHRPw6qhI,9184
-apscheduler/triggers/cron/fields.py,sha256=NWPClh1NgSOpTlJ3sm1TXM_ViC2qJGKWkd_vg0xsw7o,3510
-apscheduler/triggers/date.py,sha256=RrfB1PNO9G9e91p1BOf-y_TseVHQQR-KJPhNdPpAHcU,1705
-apscheduler/triggers/interval.py,sha256=ABjcZFaGYAAgdAaUQIuLr9_dLszIifu88qaXrJmdxQ4,4377
-apscheduler/util.py,sha256=aCLu_v8-c7rpY6sD7EKgxH2zYjZARiBdqKFZktaxO68,13260
diff --git a/libs/APScheduler-3.10.4.dist-info/WHEEL b/libs/APScheduler-3.10.4.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/APScheduler-3.10.4.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/APScheduler-3.10.4.dist-info/entry_points.txt b/libs/APScheduler-3.10.4.dist-info/entry_points.txt
deleted file mode 100644
index 0adfe3ead0..0000000000
--- a/libs/APScheduler-3.10.4.dist-info/entry_points.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-[apscheduler.executors]
-asyncio = apscheduler.executors.asyncio:AsyncIOExecutor [asyncio]
-debug = apscheduler.executors.debug:DebugExecutor
-gevent = apscheduler.executors.gevent:GeventExecutor [gevent]
-processpool = apscheduler.executors.pool:ProcessPoolExecutor
-threadpool = apscheduler.executors.pool:ThreadPoolExecutor
-tornado = apscheduler.executors.tornado:TornadoExecutor [tornado]
-twisted = apscheduler.executors.twisted:TwistedExecutor [twisted]
-
-[apscheduler.jobstores]
-memory = apscheduler.jobstores.memory:MemoryJobStore
-mongodb = apscheduler.jobstores.mongodb:MongoDBJobStore [mongodb]
-redis = apscheduler.jobstores.redis:RedisJobStore [redis]
-rethinkdb = apscheduler.jobstores.rethinkdb:RethinkDBJobStore [rethinkdb]
-sqlalchemy = apscheduler.jobstores.sqlalchemy:SQLAlchemyJobStore [sqlalchemy]
-zookeeper = apscheduler.jobstores.zookeeper:ZooKeeperJobStore [zookeeper]
-
-[apscheduler.triggers]
-and = apscheduler.triggers.combining:AndTrigger
-cron = apscheduler.triggers.cron:CronTrigger
-date = apscheduler.triggers.date:DateTrigger
-interval = apscheduler.triggers.interval:IntervalTrigger
-or = apscheduler.triggers.combining:OrTrigger
diff --git a/libs/Flask_Cors-5.0.0.dist-info/LICENSE b/libs/Flask_Cors-5.0.0.dist-info/LICENSE
deleted file mode 100644
index 46d932f8d8..0000000000
--- a/libs/Flask_Cors-5.0.0.dist-info/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (C) 2016 Cory Dolphin, Olin College
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/libs/Flask_Cors-5.0.0.dist-info/METADATA b/libs/Flask_Cors-5.0.0.dist-info/METADATA
deleted file mode 100644
index 99902fe9d6..0000000000
--- a/libs/Flask_Cors-5.0.0.dist-info/METADATA
+++ /dev/null
@@ -1,148 +0,0 @@
-Metadata-Version: 2.1
-Name: Flask-Cors
-Version: 5.0.0
-Summary: A Flask extension adding a decorator for CORS support
-Home-page: https://github.com/corydolphin/flask-cors
-Author: Cory Dolphin
-Author-email: corydolphin@gmail.com
-License: MIT
-Platform: any
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-License-File: LICENSE
-Requires-Dist: Flask >=0.9
-
-Flask-CORS
-==========
-
-|Build Status| |Latest Version| |Supported Python versions|
-|License|
-
-A Flask extension for handling Cross Origin Resource Sharing (CORS), making cross-origin AJAX possible.
-
-This package has a simple philosophy: when you want to enable CORS, you wish to enable it for all use cases on a domain.
-This means no mucking around with different allowed headers, methods, etc.
-
-By default, submission of cookies across domains is disabled due to the security implications.
-Please see the documentation for how to enable credential'ed requests, and please make sure you add some sort of `CSRF <http://en.wikipedia.org/wiki/Cross-site_request_forgery>`__ protection before doing so!
-
-Installation
-------------
-
-Install the extension with using pip, or easy\_install.
-
-.. code:: bash
-
-    $ pip install -U flask-cors
-
-Usage
------
-
-This package exposes a Flask extension which by default enables CORS support on all routes, for all origins and methods.
-It allows parameterization of all CORS headers on a per-resource level.
-The package also contains a decorator, for those who prefer this approach.
-
-Simple Usage
-~~~~~~~~~~~~
-
-In the simplest case, initialize the Flask-Cors extension with default arguments in order to allow CORS for all domains on all routes.
-See the full list of options in the `documentation <https://flask-cors.corydolphin.com/en/latest/api.html#extension>`__.
-
-.. code:: python
-
-
-    from flask import Flask
-    from flask_cors import CORS
-
-    app = Flask(__name__)
-    CORS(app)
-
-    @app.route("/")
-    def helloWorld():
-      return "Hello, cross-origin-world!"
-
-Resource specific CORS
-^^^^^^^^^^^^^^^^^^^^^^
-
-Alternatively, you can specify CORS options on a resource and origin level of granularity by passing a dictionary as the `resources` option, mapping paths to a set of options.
-See the full list of options in the `documentation <https://flask-cors.corydolphin.com/en/latest/api.html#extension>`__.
-
-.. code:: python
-
-    app = Flask(__name__)
-    cors = CORS(app, resources={r"/api/*": {"origins": "*"}})
-
-    @app.route("/api/v1/users")
-    def list_users():
-      return "user example"
-
-Route specific CORS via decorator
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This extension also exposes a simple decorator to decorate flask routes with.
-Simply add ``@cross_origin()`` below a call to Flask's ``@app.route(..)`` to allow CORS on a given route.
-See the full list of options in the `decorator documentation <https://flask-cors.corydolphin.com/en/latest/api.html#decorator>`__.
-
-.. code:: python
-
-    @app.route("/")
-    @cross_origin()
-    def helloWorld():
-      return "Hello, cross-origin-world!"
-
-Documentation
--------------
-
-For a full list of options, please see the full `documentation <https://flask-cors.corydolphin.com/en/latest/api.html>`__
-
-Troubleshooting
----------------
-
-If things aren't working as you expect, enable logging to help understand what is going on under the hood, and why.
-
-.. code:: python
-
-    logging.getLogger('flask_cors').level = logging.DEBUG
-
-
-Tests
------
-
-A simple set of tests is included in ``test/``.
-To run, install nose, and simply invoke ``nosetests`` or ``python setup.py test`` to exercise the tests.
-
-If nosetests does not work for you, due to it no longer working with newer python versions.
-You can use pytest to run the tests instead.
-
-Contributing
-------------
-
-Questions, comments or improvements?
-Please create an issue on `Github <https://github.com/corydolphin/flask-cors>`__, tweet at `@corydolphin <https://twitter.com/corydolphin>`__ or send me an email.
-I do my best to include every contribution proposed in any way that I can.
-
-Credits
--------
-
-This Flask extension is based upon the `Decorator for the HTTP Access Control <https://web.archive.org/web/20190128010149/http://flask.pocoo.org/snippets/56/>`__ written by Armin Ronacher.
-
-.. |Build Status| image:: https://github.com/corydolphin/flask-cors/actions/workflows/unittests.yaml/badge.svg
-   :target: https://travis-ci.org/corydolphin/flask-cors
-.. |Latest Version| image:: https://img.shields.io/pypi/v/Flask-Cors.svg
-   :target: https://pypi.python.org/pypi/Flask-Cors/
-.. |Supported Python versions| image:: https://img.shields.io/pypi/pyversions/Flask-Cors.svg
-   :target: https://img.shields.io/pypi/pyversions/Flask-Cors.svg
-.. |License| image:: http://img.shields.io/:license-mit-blue.svg
-   :target: https://pypi.python.org/pypi/Flask-Cors/
diff --git a/libs/Flask_Cors-5.0.0.dist-info/RECORD b/libs/Flask_Cors-5.0.0.dist-info/RECORD
deleted file mode 100644
index 5e942ce533..0000000000
--- a/libs/Flask_Cors-5.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-Flask_Cors-5.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Flask_Cors-5.0.0.dist-info/LICENSE,sha256=bhob3FSDTB4HQMvOXV9vLK4chG_Sp_SCsRZJWU-vvV0,1069
-Flask_Cors-5.0.0.dist-info/METADATA,sha256=V2L_s849dFlZXsOhcgXVqv5Slj_JKSVuiiuRgDOft5s,5474
-Flask_Cors-5.0.0.dist-info/RECORD,,
-Flask_Cors-5.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Flask_Cors-5.0.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-Flask_Cors-5.0.0.dist-info/top_level.txt,sha256=aWye_0QNZPp_QtPF4ZluLHqnyVLT9CPJsfiGhwqkWuo,11
-flask_cors/__init__.py,sha256=wZDCvPTHspA2g1VV7KyKN7R-uCdBnirTlsCzgPDcQtI,792
-flask_cors/core.py,sha256=y76xxLasWTdV_3ka19IxpdJPOgROBZQZ5L8t20IjqRA,14252
-flask_cors/decorator.py,sha256=BeJsyX1wYhVKWN04FAhb6z8YqffiRr7wKqwzHPap4bw,5009
-flask_cors/extension.py,sha256=gzv6zWUwSDYlGHBWzMuTI_hoQ7gQmp9DlcAcrKTVHdw,8602
-flask_cors/version.py,sha256=JzYPYpvaglqIJRGCDrh5-hYmXI0ISrDDed0V1QQZAGU,22
diff --git a/libs/Flask_Cors-5.0.0.dist-info/WHEEL b/libs/Flask_Cors-5.0.0.dist-info/WHEEL
deleted file mode 100644
index f31e450fda..0000000000
--- a/libs/Flask_Cors-5.0.0.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/Flask_Migrate-4.1.0.dist-info/METADATA b/libs/Flask_Migrate-4.1.0.dist-info/METADATA
index ef8ede367d..0b89e51cd3 100644
--- a/libs/Flask_Migrate-4.1.0.dist-info/METADATA
+++ b/libs/Flask_Migrate-4.1.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Flask-Migrate
 Version: 4.1.0
 Summary: SQLAlchemy database migrations for Flask applications using Alembic.
@@ -14,15 +14,16 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Flask >=0.9
-Requires-Dist: Flask-SQLAlchemy >=1.0
-Requires-Dist: alembic >=1.9.0
+Requires-Dist: Flask>=0.9
+Requires-Dist: Flask-SQLAlchemy>=1.0
+Requires-Dist: alembic>=1.9.0
 Provides-Extra: dev
-Requires-Dist: tox ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
 Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
+Requires-Dist: sphinx; extra == "docs"
+Dynamic: license-file
 
 Flask-Migrate
 =============
diff --git a/libs/Flask_Migrate-4.1.0.dist-info/RECORD b/libs/Flask_Migrate-4.1.0.dist-info/RECORD
index d634fa09ab..3514c51736 100644
--- a/libs/Flask_Migrate-4.1.0.dist-info/RECORD
+++ b/libs/Flask_Migrate-4.1.0.dist-info/RECORD
@@ -1,10 +1,10 @@
-Flask_Migrate-4.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Flask_Migrate-4.1.0.dist-info/LICENSE,sha256=kfkXGlJQvKy3Y__6tAJ8ynIp1HQfeROXhL8jZU1d-DI,1082
-Flask_Migrate-4.1.0.dist-info/METADATA,sha256=Oc_YNcJGhss0camLTDR64sz2RuLXAppze2rvHDzS8_0,3296
-Flask_Migrate-4.1.0.dist-info/RECORD,,
-Flask_Migrate-4.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Flask_Migrate-4.1.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-Flask_Migrate-4.1.0.dist-info/top_level.txt,sha256=jLoPgiMG6oR4ugNteXn3IHskVVIyIXVStZOVq-AWLdU,14
+flask_migrate-4.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+flask_migrate-4.1.0.dist-info/METADATA,sha256=1bA492meS2k4iqK2vBX3qIbYKl4uAi7lsOztLMAStHw,3311
+flask_migrate-4.1.0.dist-info/RECORD,,
+flask_migrate-4.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask_migrate-4.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+flask_migrate-4.1.0.dist-info/licenses/LICENSE,sha256=kfkXGlJQvKy3Y__6tAJ8ynIp1HQfeROXhL8jZU1d-DI,1082
+flask_migrate-4.1.0.dist-info/top_level.txt,sha256=jLoPgiMG6oR4ugNteXn3IHskVVIyIXVStZOVq-AWLdU,14
 flask_migrate/__init__.py,sha256=JMySGA55Y8Gxy3HviWu7qq5rPUNQBWc2NID2OicpDyw,10082
 flask_migrate/cli.py,sha256=IxrxBSC82S5sPfWac8Qg83_FVsRvqTYtCG7HRyMW8RU,11097
 flask_migrate/templates/aioflask-multidb/README,sha256=Ek4cJqTaxneVjtkue--BXMlfpfp3MmJRjqoZvnSizww,43
diff --git a/libs/Flask_Migrate-4.1.0.dist-info/WHEEL b/libs/Flask_Migrate-4.1.0.dist-info/WHEEL
index 9b78c44519..0885d05555 100644
--- a/libs/Flask_Migrate-4.1.0.dist-info/WHEEL
+++ b/libs/Flask_Migrate-4.1.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/Flask_Migrate-4.1.0.dist-info/LICENSE b/libs/Flask_Migrate-4.1.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/Flask_Migrate-4.1.0.dist-info/LICENSE
rename to libs/Flask_Migrate-4.1.0.dist-info/licenses/LICENSE
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/METADATA b/libs/Flask_SocketIO-5.5.1.dist-info/METADATA
deleted file mode 100644
index 8676b6140c..0000000000
--- a/libs/Flask_SocketIO-5.5.1.dist-info/METADATA
+++ /dev/null
@@ -1,76 +0,0 @@
-Metadata-Version: 2.1
-Name: Flask-SocketIO
-Version: 5.5.1
-Summary: Socket.IO integration for Flask applications
-Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
-Project-URL: Homepage, https://github.com/miguelgrinberg/flask-socketio
-Project-URL: Bug Tracker, https://github.com/miguelgrinberg/flask-socketio/issues
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: Flask >=0.9
-Requires-Dist: python-socketio >=5.12.0
-Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-
-Flask-SocketIO
-==============
-
-[![Build status](https://github.com/miguelgrinberg/flask-socketio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/Flask-SocketIO/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/flask-socketio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/flask-socketio)
-
-Socket.IO integration for Flask applications.
-
-Sponsors
---------
-
-The following organizations are funding this project:
-
-![Socket.IO](https://images.opencollective.com/socketio/050e5eb/logo/64.png)<br>[Socket.IO](https://socket.io)  | [Add your company here!](https://github.com/sponsors/miguelgrinberg)|
--|-
-
-Many individual sponsors also support this project through small ongoing contributions. Why not [join them](https://github.com/sponsors/miguelgrinberg)?
-
-Installation
-------------
-
-You can install this package as usual with pip:
-
-    pip install flask-socketio
-
-Example
--------
-
-```py
-from flask import Flask, render_template
-from flask_socketio import SocketIO, emit
-    
-app = Flask(__name__)
-app.config['SECRET_KEY'] = 'secret!'
-socketio = SocketIO(app)
-
-@app.route('/')
-def index():
-    return render_template('index.html')
-
-@socketio.event
-def my_event(message):
-    emit('my response', {'data': 'got it!'})
-
-if __name__ == '__main__':
-    socketio.run(app)
-```
-
-Resources
----------
-
-- [Tutorial](http://blog.miguelgrinberg.com/post/easy-websockets-with-flask-and-gevent)
-- [Documentation](http://flask-socketio.readthedocs.io/en/latest/)
-- [PyPI](https://pypi.python.org/pypi/Flask-SocketIO)
-- [Change Log](https://github.com/miguelgrinberg/Flask-SocketIO/blob/main/CHANGES.md)
-- Questions? See the [questions](https://stackoverflow.com/questions/tagged/flask-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+flask-socketio+python-socketio) your own question.
-
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/RECORD b/libs/Flask_SocketIO-5.5.1.dist-info/RECORD
deleted file mode 100644
index 2b50d3dda3..0000000000
--- a/libs/Flask_SocketIO-5.5.1.dist-info/RECORD
+++ /dev/null
@@ -1,10 +0,0 @@
-Flask_SocketIO-5.5.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Flask_SocketIO-5.5.1.dist-info/LICENSE,sha256=aNCWbkgKjS_T1cJtACyZbvCM36KxWnfQ0LWTuavuYKQ,1082
-Flask_SocketIO-5.5.1.dist-info/METADATA,sha256=6NSCK70GFvnCHNKwcr6lmffkRAKLd9dOnGq6TbAJlfs,2638
-Flask_SocketIO-5.5.1.dist-info/RECORD,,
-Flask_SocketIO-5.5.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Flask_SocketIO-5.5.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-Flask_SocketIO-5.5.1.dist-info/top_level.txt,sha256=C1ugzQBJ3HHUJsWGzyt70XRVOX-y4CUAR8MWKjwJOQ8,15
-flask_socketio/__init__.py,sha256=5hN0LE0hfGMUDcX4FheZrtXERJ1IBEPagv0pgeqdtlU,54904
-flask_socketio/namespace.py,sha256=UkVryJvFYgnCMKWSF35GVfGdyh2cXRDyRbfmEPPchVA,2329
-flask_socketio/test_client.py,sha256=rClk02TSRqgidH8IyeohspKVKdpRx7gcZBjg1YUtZpA,11026
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/WHEEL b/libs/Flask_SocketIO-5.5.1.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/Flask_SocketIO-5.5.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/Js2Py-0.74.dist-info/METADATA b/libs/Js2Py-0.74.dist-info/METADATA
index 4063e4ba92..a35be0b740 100644
--- a/libs/Js2Py-0.74.dist-info/METADATA
+++ b/libs/Js2Py-0.74.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Js2Py
 Version: 0.74
 Summary: JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python.
@@ -7,9 +7,17 @@ Author: Piotr Dabkowski
 Author-email: piodrus@gmail.com
 License: MIT
 License-File: LICENSE.md
-Requires-Dist: tzlocal >=1.2
-Requires-Dist: six >=1.10
-Requires-Dist: pyjsparser >=2.5.1
+Requires-Dist: tzlocal>=1.2
+Requires-Dist: six>=1.10
+Requires-Dist: pyjsparser>=2.5.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 Translates JavaScript to Python code. Js2Py is able to translate and execute virtually any JavaScript code.
 
diff --git a/libs/Js2Py-0.74.dist-info/RECORD b/libs/Js2Py-0.74.dist-info/RECORD
index d14c3b06c8..cf583183c6 100644
--- a/libs/Js2Py-0.74.dist-info/RECORD
+++ b/libs/Js2Py-0.74.dist-info/RECORD
@@ -1,10 +1,10 @@
-Js2Py-0.74.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Js2Py-0.74.dist-info/LICENSE.md,sha256=5HcnGlDEDJrDrVbQLnDH19l_ZscybPUk0TsS-IQsxOk,1088
-Js2Py-0.74.dist-info/METADATA,sha256=shZhquhN4nVuaurudCERGEnLk38BjT7grtZLNg4MABc,862
-Js2Py-0.74.dist-info/RECORD,,
-Js2Py-0.74.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Js2Py-0.74.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-Js2Py-0.74.dist-info/top_level.txt,sha256=Me1vDvBnqRgA6Jf96euhHjsa-dYkaXpr3Sm0RGPoGn8,6
+js2py-0.74.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+js2py-0.74.dist-info/METADATA,sha256=EsxDQrBB3A2LSeMzBE55q-4t-GTdP7AD1iLqykYiv2Q,1016
+js2py-0.74.dist-info/RECORD,,
+js2py-0.74.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+js2py-0.74.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+js2py-0.74.dist-info/licenses/LICENSE.md,sha256=5HcnGlDEDJrDrVbQLnDH19l_ZscybPUk0TsS-IQsxOk,1088
+js2py-0.74.dist-info/top_level.txt,sha256=Me1vDvBnqRgA6Jf96euhHjsa-dYkaXpr3Sm0RGPoGn8,6
 js2py/__init__.py,sha256=VlWswk9Sf3qBwxaJ1E9STDxUdTYh3PLKp6Kn1ws0STE,2886
 js2py/base.py,sha256=_h7HbsB30cybzGAU7XIX5tawMA4C7IHFsRi_ESRqzZc,115810
 js2py/constructors/__init__.py,sha256=isKbPQhm2gf7O6f4aW0F9J0yBlds8jYDq5xA4u08xrE,30
diff --git a/libs/Js2Py-0.74.dist-info/WHEEL b/libs/Js2Py-0.74.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/Js2Py-0.74.dist-info/WHEEL
+++ b/libs/Js2Py-0.74.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/Js2Py-0.74.dist-info/LICENSE.md b/libs/Js2Py-0.74.dist-info/licenses/LICENSE.md
similarity index 100%
rename from libs/Js2Py-0.74.dist-info/LICENSE.md
rename to libs/Js2Py-0.74.dist-info/licenses/LICENSE.md
diff --git a/libs/Mako-1.3.8.dist-info/LICENSE b/libs/Mako-1.3.8.dist-info/LICENSE
deleted file mode 100644
index 7cf3d43378..0000000000
--- a/libs/Mako-1.3.8.dist-info/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/libs/Mako-1.3.8.dist-info/METADATA b/libs/Mako-1.3.8.dist-info/METADATA
deleted file mode 100644
index bf0b1f45b9..0000000000
--- a/libs/Mako-1.3.8.dist-info/METADATA
+++ /dev/null
@@ -1,87 +0,0 @@
-Metadata-Version: 2.1
-Name: Mako
-Version: 1.3.8
-Summary: A super-fast templating language that borrows the best ideas from the existing templating languages.
-Home-page: https://www.makotemplates.org/
-Author: Mike Bayer
-Author-email: mike@zzzcomputing.com
-License: MIT
-Project-URL: Documentation, https://docs.makotemplates.org
-Project-URL: Issue Tracker, https://github.com/sqlalchemy/mako
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: MarkupSafe>=0.9.2
-Provides-Extra: babel
-Requires-Dist: Babel; extra == "babel"
-Provides-Extra: lingua
-Requires-Dist: lingua; extra == "lingua"
-Provides-Extra: testing
-Requires-Dist: pytest; extra == "testing"
-
-=========================
-Mako Templates for Python
-=========================
-
-Mako is a template library written in Python. It provides a familiar, non-XML 
-syntax which compiles into Python modules for maximum performance. Mako's 
-syntax and API borrows from the best ideas of many others, including Django
-templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded 
-Python (i.e. Python Server Page) language, which refines the familiar ideas
-of componentized layout and inheritance to produce one of the most 
-straightforward and flexible models available, while also maintaining close 
-ties to Python calling and scoping semantics.
-
-Nutshell
-========
-
-::
-
-    <%inherit file="base.html"/>
-    <%
-        rows = [[v for v in range(0,10)] for row in range(0,10)]
-    %>
-    <table>
-        % for row in rows:
-            ${makerow(row)}
-        % endfor
-    </table>
-
-    <%def name="makerow(row)">
-        <tr>
-        % for name in row:
-            <td>${name}</td>\
-        % endfor
-        </tr>
-    </%def>
-
-Philosophy
-===========
-
-Python is a great scripting language. Don't reinvent the wheel...your templates can handle it !
-
-Documentation
-==============
-
-See documentation for Mako at https://docs.makotemplates.org/en/latest/
-
-License
-========
-
-Mako is licensed under an MIT-style license (see LICENSE).
-Other incorporated projects may be licensed under different licenses.
-All licenses allow for non-commercial and commercial use.
diff --git a/libs/Mako-1.3.8.dist-info/RECORD b/libs/Mako-1.3.8.dist-info/RECORD
deleted file mode 100644
index 7e79ae7aa2..0000000000
--- a/libs/Mako-1.3.8.dist-info/RECORD
+++ /dev/null
@@ -1,42 +0,0 @@
-../../bin/mako-render,sha256=NK39DgCmw8pz5T7ALDcW2MB6hFGNVOpWXAHq3-GKyss,236
-Mako-1.3.8.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Mako-1.3.8.dist-info/LICENSE,sha256=FWJ7NrONBynN1obfmr9gZQPZnWJLL17FyyVKddWvqJE,1098
-Mako-1.3.8.dist-info/METADATA,sha256=YtMX8Z6wVX7TvuBzOsUAOAq_jdceHFW4rR6hwvMNZgE,2896
-Mako-1.3.8.dist-info/RECORD,,
-Mako-1.3.8.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Mako-1.3.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-Mako-1.3.8.dist-info/entry_points.txt,sha256=LsKkUsOsJQYbJ2M72hZCm968wi5K8Ywb5uFxCuN8Obk,512
-Mako-1.3.8.dist-info/top_level.txt,sha256=LItdH8cDPetpUu8rUyBG3DObS6h9Gcpr9j_WLj2S-R0,5
-mako/__init__.py,sha256=sMLX8sANJQjjeIsZjbrwotWPXHEpRcKxELPgkx2Cyw8,242
-mako/_ast_util.py,sha256=CenxCrdES1irHDhOQU6Ldta4rdsytfYaMkN6s0TlveM,20247
-mako/ast.py,sha256=pY7MH-5cLnUuVz5YAwoGhWgWfgoVvLQkRDtc_s9qqw0,6642
-mako/cache.py,sha256=5DBBorj1NqiWDqNhN3ZJ8tMCm-h6Mew541276kdsxAU,7680
-mako/cmd.py,sha256=vP5M5g9yc5sjAT5owVTQu056YwyS-YkpulFSDb0IMGw,2813
-mako/codegen.py,sha256=XRhzcuGEleDUXTfmOjw4alb6TkczbmEfBCLqID8x4bA,47736
-mako/compat.py,sha256=wjVMf7uMg0TlC_aI5hdwWizza99nqJuGNdrnTNrZbt0,1820
-mako/exceptions.py,sha256=pfdd5-1lCZ--I2YqQ_oHODZLmo62bn_lO5Kz_1__72w,12530
-mako/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mako/ext/autohandler.py,sha256=Tyz1CLRlG_C0EnKgjuHzqS4BBnpeA49O05x8rriNtTY,1885
-mako/ext/babelplugin.py,sha256=v10o5XQdgXwbr1bo0aL8VV3THm_84C_eeq6BmAGd3uA,2091
-mako/ext/beaker_cache.py,sha256=aAs9ELzO2WaiO5OppV4KDT6f7yNyn1BF1XHDQZwf0-E,2578
-mako/ext/extract.py,sha256=c3YuIN3Z5ZgS-xzX_gjKrEVQaptK3liXkm5j-Vq8yEM,4659
-mako/ext/linguaplugin.py,sha256=pzHlHC3-KlFeVAR4r8S1--_dfE5DcYmjLXtr0genBYU,1935
-mako/ext/preprocessors.py,sha256=zKQy42Ce6dOmU0Yk_rUVDAAn38-RUUfQolVKTJjLotA,576
-mako/ext/pygmentplugin.py,sha256=qBdsAhKktlQX7d5Yv1sAXufUNOZqcnJmKuC7V4D_srM,4753
-mako/ext/turbogears.py,sha256=0emY1WiMnuY8Pf6ARv5JBArKtouUdmuTljI-w6rE3J4,2141
-mako/filters.py,sha256=F7aDIKTUxnT-Og4rgboQtnML7Q87DJTHQyhi_dY_Ih4,4658
-mako/lexer.py,sha256=Xi6Lk8CnASf3UYAaPoYrfjuPkrYauNjvYvULCUkKYaY,16321
-mako/lookup.py,sha256=rkMvT5T7EOS5KRvPtgYii-sjh1nWWyKok_mEk-cEzrM,12428
-mako/parsetree.py,sha256=BHdZI9vyxKB27Q4hzym5TdZ_982_3k31_HMsGLz3Tlg,19021
-mako/pygen.py,sha256=d4f_ugRACCXuV9hJgEk6Ncoj38EaRHA3RTxkr_tK7UQ,10416
-mako/pyparser.py,sha256=eY_a94QDXaK3vIA2jZYT9so7oXKKJLT0SO_Yrl3IOb8,7478
-mako/runtime.py,sha256=ZsUEN22nX3d3dECQujF69mBKDQS6yVv2nvz_0eTvFGg,27804
-mako/template.py,sha256=4xQzwruZd5XzPw7iONZMZJj4SdFsctYYg4PfBYs2PLk,23857
-mako/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mako/testing/_config.py,sha256=k-qpnsnbXUoN-ykMN5BRpg84i1x0p6UsAddKQnrIytU,3566
-mako/testing/assertions.py,sha256=pfbGl84QlW7QWGg3_lo3wP8XnBAVo9AjzNp2ajmn7FA,5161
-mako/testing/config.py,sha256=wmYVZfzGvOK3mJUZpzmgO8-iIgvaCH41Woi4yDpxq6E,323
-mako/testing/exclusions.py,sha256=_t6ADKdatk3f18tOfHV_ZY6u_ZwQsKphZ2MXJVSAOcI,1553
-mako/testing/fixtures.py,sha256=nEp7wTusf7E0n3Q-BHJW2s_t1vx0KB9poadQ1BmIJzE,3044
-mako/testing/helpers.py,sha256=z4HAactwlht4ut1cbvxKt1QLb3yLPk1U7cnh5BwVUlc,1623
-mako/util.py,sha256=dIFuchHfiNtRJJ99kEIRdHBkCZ3UmEvNO6l2ZQSCdVU,10638
diff --git a/libs/Mako-1.3.8.dist-info/WHEEL b/libs/Mako-1.3.8.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/Mako-1.3.8.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/Markdown-3.7.dist-info/METADATA b/libs/Markdown-3.7.dist-info/METADATA
deleted file mode 100644
index 233bc55baa..0000000000
--- a/libs/Markdown-3.7.dist-info/METADATA
+++ /dev/null
@@ -1,146 +0,0 @@
-Metadata-Version: 2.1
-Name: Markdown
-Version: 3.7
-Summary: Python implementation of John Gruber's Markdown.
-Author: Manfred Stienstra, Yuri Takhteyev
-Author-email: Waylan limberg <python.markdown@gmail.com>
-Maintainer: Isaac Muse
-Maintainer-email: Waylan Limberg <python.markdown@gmail.com>
-License: BSD 3-Clause License
-        
-        Copyright 2007, 2008 The Python Markdown Project (v. 1.7 and later)  
-        Copyright 2004, 2005, 2006 Yuri Takhteyev (v. 0.2-1.6b)  
-        Copyright 2004 Manfred Stienstra (the original version)
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
-Project-URL: Homepage, https://Python-Markdown.github.io/
-Project-URL: Documentation, https://Python-Markdown.github.io/
-Project-URL: Repository, https://github.com/Python-Markdown/markdown
-Project-URL: Issue Tracker, https://github.com/Python-Markdown/markdown/issues
-Project-URL: Changelog, https://python-markdown.github.io/changelog/
-Keywords: markdown,markdown-parser,python-markdown,markdown-to-html
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Communications :: Email :: Filters
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries
-Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
-Classifier: Topic :: Software Development :: Documentation
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Text Processing :: Filters
-Classifier: Topic :: Text Processing :: Markup :: HTML
-Classifier: Topic :: Text Processing :: Markup :: Markdown
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE.md
-Requires-Dist: importlib-metadata >=4.4 ; python_version < "3.10"
-Provides-Extra: docs
-Requires-Dist: mkdocs >=1.5 ; extra == 'docs'
-Requires-Dist: mkdocs-nature >=0.6 ; extra == 'docs'
-Requires-Dist: mdx-gh-links >=0.2 ; extra == 'docs'
-Requires-Dist: mkdocstrings[python] ; extra == 'docs'
-Requires-Dist: mkdocs-gen-files ; extra == 'docs'
-Requires-Dist: mkdocs-section-index ; extra == 'docs'
-Requires-Dist: mkdocs-literate-nav ; extra == 'docs'
-Provides-Extra: testing
-Requires-Dist: coverage ; extra == 'testing'
-Requires-Dist: pyyaml ; extra == 'testing'
-
-[Python-Markdown][]
-===================
-
-[![Build Status][build-button]][build]
-[![Coverage Status][codecov-button]][codecov]
-[![Latest Version][mdversion-button]][md-pypi]
-[![Python Versions][pyversion-button]][md-pypi]
-[![BSD License][bsdlicense-button]][bsdlicense]
-[![Code of Conduct][codeofconduct-button]][Code of Conduct]
-
-[build-button]: https://github.com/Python-Markdown/markdown/workflows/CI/badge.svg?event=push
-[build]: https://github.com/Python-Markdown/markdown/actions?query=workflow%3ACI+event%3Apush
-[codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg
-[codecov]: https://codecov.io/gh/Python-Markdown/markdown
-[mdversion-button]: https://img.shields.io/pypi/v/Markdown.svg
-[md-pypi]: https://pypi.org/project/Markdown/
-[pyversion-button]: https://img.shields.io/pypi/pyversions/Markdown.svg
-[bsdlicense-button]: https://img.shields.io/badge/license-BSD-yellow.svg
-[bsdlicense]: https://opensource.org/licenses/BSD-3-Clause
-[codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square
-[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md
-
-This is a Python implementation of John Gruber's [Markdown][].
-It is almost completely compliant with the reference implementation,
-though there are a few known issues. See [Features][] for information
-on what exactly is supported and what is not. Additional features are
-supported by the [Available Extensions][].
-
-[Python-Markdown]: https://Python-Markdown.github.io/
-[Markdown]: https://daringfireball.net/projects/markdown/
-[Features]: https://Python-Markdown.github.io#Features
-[Available Extensions]: https://Python-Markdown.github.io/extensions
-
-Documentation
--------------
-
-```bash
-pip install markdown
-```
-```python
-import markdown
-html = markdown.markdown(your_text_string)
-```
-
-For more advanced [installation] and [usage] documentation, see the `docs/` directory
-of the distribution or the project website at <https://Python-Markdown.github.io/>.
-
-[installation]: https://python-markdown.github.io/install/
-[usage]: https://python-markdown.github.io/reference/
-
-See the change log at <https://python-markdown.github.io/changelog/>.
-
-Support
--------
-
-You may report bugs, ask for help, and discuss various other issues on the [bug tracker][].
-
-[bug tracker]: https://github.com/Python-Markdown/markdown/issues
-
-Code of Conduct
----------------
-
-Everyone interacting in the Python-Markdown project's code bases, issue trackers,
-and mailing lists is expected to follow the [Code of Conduct].
diff --git a/libs/Markdown-3.7.dist-info/RECORD b/libs/Markdown-3.7.dist-info/RECORD
deleted file mode 100644
index 34d25a0c7e..0000000000
--- a/libs/Markdown-3.7.dist-info/RECORD
+++ /dev/null
@@ -1,42 +0,0 @@
-../../bin/markdown_py,sha256=a0a3HrUHepb4z4hcrRdCfAEQ8SiB-QoWxf9g1e-KLv8,237
-Markdown-3.7.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Markdown-3.7.dist-info/LICENSE.md,sha256=e6TrbRCzKy0R3OE4ITQDUc27swuozMZ4Qdsv_Ybnmso,1650
-Markdown-3.7.dist-info/METADATA,sha256=nY8sewcY6R1akyROqkyO-Jk_eUDY8am_C4MkRP79sWA,7040
-Markdown-3.7.dist-info/RECORD,,
-Markdown-3.7.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Markdown-3.7.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-Markdown-3.7.dist-info/entry_points.txt,sha256=lMEyiiA_ZZyfPCBlDviBl-SiU0cfoeuEKpwxw361sKQ,1102
-Markdown-3.7.dist-info/top_level.txt,sha256=IAxs8x618RXoH1uCqeLLxXsDefJvE_mIibr_M4sOlyk,9
-markdown/__init__.py,sha256=dfzwwdpG9L8QLEPBpLFPIHx_BN056aZXp9xZifTxYIU,1777
-markdown/__main__.py,sha256=innFBxRqwPBNxG1zhKktJji4bnRKtVyYYd30ID13Tcw,5859
-markdown/__meta__.py,sha256=RhwfJ30zyGvJaJXLHwQdNH5jw69-5fVKu2p-CVaJz0U,1712
-markdown/blockparser.py,sha256=j4CQImVpiq7g9pz8wCxvzT61X_T2iSAjXupHJk8P3eA,5728
-markdown/blockprocessors.py,sha256=koY5rq8DixzBCHcquvZJp6x2JYyBGjrwxMWNZhd6D2U,27013
-markdown/core.py,sha256=DyyzDsmd-KcuEp8ZWUKJAeUCt7B7G3J3NeqZqp3LphI,21335
-markdown/extensions/__init__.py,sha256=9z1khsdKCVrmrJ_2GfxtPAdjD3FyMe5vhC7wmM4O9m0,4822
-markdown/extensions/abbr.py,sha256=Gqt9TUtLWez2cbsy3SQk5152RZekops2fUJj01bfkfw,6903
-markdown/extensions/admonition.py,sha256=Hqcn3I8JG0i-OPWdoqI189TmlQRgH6bs5PmpCANyLlg,6547
-markdown/extensions/attr_list.py,sha256=t3PrgAr5Ebldnq3nJNbteBt79bN0ccXS5RemmQfUZ9g,7820
-markdown/extensions/codehilite.py,sha256=ChlmpM6S--j-UK7t82859UpYjm8EftdiLqmgDnknyes,13503
-markdown/extensions/def_list.py,sha256=J3NVa6CllfZPsboJCEycPyRhtjBHnOn8ET6omEvVlDo,4029
-markdown/extensions/extra.py,sha256=1vleT284kued4HQBtF83IjSumJVo0q3ng6MjTkVNfNQ,2163
-markdown/extensions/fenced_code.py,sha256=-fYSmRZ9DTYQ8HO9b_78i47kVyVu6mcVJlqVTMdzvo4,8300
-markdown/extensions/footnotes.py,sha256=bRFlmIBOKDI5efG1jZfDkMoV2osfqWip1rN1j2P-mMg,16710
-markdown/extensions/legacy_attrs.py,sha256=oWcyNrfP0F6zsBoBOaD5NiwrJyy4kCpgQLl12HA7JGU,2788
-markdown/extensions/legacy_em.py,sha256=-Z_w4PEGSS-Xg-2-BtGAnXwwy5g5GDgv2tngASnPgxg,1693
-markdown/extensions/md_in_html.py,sha256=y4HEWEnkvfih22fojcaJeAmjx1AtF8N-a_jb6IDFfts,16546
-markdown/extensions/meta.py,sha256=v_4Uq7nbcQ76V1YAvqVPiNLbRLIQHJsnfsk-tN70RmY,2600
-markdown/extensions/nl2br.py,sha256=9KKcrPs62c3ENNnmOJZs0rrXXqUtTCfd43j1_OPpmgU,1090
-markdown/extensions/sane_lists.py,sha256=ogAKcm7gEpcXV7fSTf8JZH5YdKAssPCEOUzdGM3C9Tw,2150
-markdown/extensions/smarty.py,sha256=yqT0OiE2AqYrqqZtcUFFmp2eJsQHomiKzgyG2JFb9rI,11048
-markdown/extensions/tables.py,sha256=oTDvGD1qp9xjVWPGYNgDBWe9NqsX5gS6UU5wUsQ1bC8,8741
-markdown/extensions/toc.py,sha256=PGg-EqbBubm3n0b633r8Xa9kc6JIdbo20HGAOZ6GEl8,18322
-markdown/extensions/wikilinks.py,sha256=j7D2sozica6sqXOUa_GuAXqIzxp-7Hi60bfXymiuma8,3285
-markdown/htmlparser.py,sha256=dEr6IE7i9b6Tc1gdCLZGeWw6g6-E-jK1Z4KPj8yGk8Q,14332
-markdown/inlinepatterns.py,sha256=7_HF5nTOyQag_CyBgU4wwmuI6aMjtadvGadyS9IP21w,38256
-markdown/postprocessors.py,sha256=eYi6eW0mGudmWpmsW45hduLwX66Zr8Bf44WyU9vKp-I,4807
-markdown/preprocessors.py,sha256=pq5NnHKkOSVQeIo-ajC-Yt44kvyMV97D04FBOQXctJM,3224
-markdown/serializers.py,sha256=YtAFYQoOdp_TAmYGow6nBo0eB6I-Sl4PTLdLDfQJHwQ,7174
-markdown/test_tools.py,sha256=MtN4cf3ZPDtb83wXLTol-3q3aIGRIkJ2zWr6fd-RgVE,8662
-markdown/treeprocessors.py,sha256=o4dnoZZsIeVV8qR45Njr8XgwKleWYDS5pv8dKQhJvv8,17651
-markdown/util.py,sha256=vJ1E0xjMzDAlTqLUSJWgdEvxdQfLXDEYUssOQMw9kPQ,13929
diff --git a/libs/Markdown-3.7.dist-info/WHEEL b/libs/Markdown-3.7.dist-info/WHEEL
deleted file mode 100644
index da25d7b423..0000000000
--- a/libs/Markdown-3.7.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/MarkupSafe-2.1.5.dist-info/METADATA b/libs/MarkupSafe-2.1.5.dist-info/METADATA
deleted file mode 100644
index dfe37d52df..0000000000
--- a/libs/MarkupSafe-2.1.5.dist-info/METADATA
+++ /dev/null
@@ -1,93 +0,0 @@
-Metadata-Version: 2.1
-Name: MarkupSafe
-Version: 2.1.5
-Summary: Safely add untrusted strings to HTML/XML markup.
-Home-page: https://palletsprojects.com/p/markupsafe/
-Maintainer: Pallets
-Maintainer-email: contact@palletsprojects.com
-License: BSD-3-Clause
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Documentation, https://markupsafe.palletsprojects.com/
-Project-URL: Changes, https://markupsafe.palletsprojects.com/changes/
-Project-URL: Source Code, https://github.com/pallets/markupsafe/
-Project-URL: Issue Tracker, https://github.com/pallets/markupsafe/issues/
-Project-URL: Chat, https://discord.gg/pallets
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Classifier: Topic :: Text Processing :: Markup :: HTML
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE.rst
-
-MarkupSafe
-==========
-
-MarkupSafe implements a text object that escapes characters so it is
-safe to use in HTML and XML. Characters that have special meanings are
-replaced so that they display as the actual characters. This mitigates
-injection attacks, meaning untrusted user input can safely be displayed
-on a page.
-
-
-Installing
-----------
-
-Install and update using `pip`_:
-
-.. code-block:: text
-
-    pip install -U MarkupSafe
-
-.. _pip: https://pip.pypa.io/en/stable/getting-started/
-
-
-Examples
---------
-
-.. code-block:: pycon
-
-    >>> from markupsafe import Markup, escape
-
-    >>> # escape replaces special characters and wraps in Markup
-    >>> escape("<script>alert(document.cookie);</script>")
-    Markup('&lt;script&gt;alert(document.cookie);&lt;/script&gt;')
-
-    >>> # wrap in Markup to mark text "safe" and prevent escaping
-    >>> Markup("<strong>Hello</strong>")
-    Markup('<strong>hello</strong>')
-
-    >>> escape(Markup("<strong>Hello</strong>"))
-    Markup('<strong>hello</strong>')
-
-    >>> # Markup is a str subclass
-    >>> # methods and operators escape their arguments
-    >>> template = Markup("Hello <em>{name}</em>")
-    >>> template.format(name='"World"')
-    Markup('Hello <em>&#34;World&#34;</em>')
-
-
-Donate
-------
-
-The Pallets organization develops and supports MarkupSafe and other
-popular packages. In order to grow the community of contributors and
-users, and allow the maintainers to devote more time to the projects,
-`please donate today`_.
-
-.. _please donate today: https://palletsprojects.com/donate
-
-
-Links
------
-
--   Documentation: https://markupsafe.palletsprojects.com/
--   Changes: https://markupsafe.palletsprojects.com/changes/
--   PyPI Releases: https://pypi.org/project/MarkupSafe/
--   Source Code: https://github.com/pallets/markupsafe/
--   Issue Tracker: https://github.com/pallets/markupsafe/issues/
--   Chat: https://discord.gg/pallets
diff --git a/libs/MarkupSafe-2.1.5.dist-info/RECORD b/libs/MarkupSafe-2.1.5.dist-info/RECORD
deleted file mode 100644
index 57cd62847c..0000000000
--- a/libs/MarkupSafe-2.1.5.dist-info/RECORD
+++ /dev/null
@@ -1,13 +0,0 @@
-MarkupSafe-2.1.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-MarkupSafe-2.1.5.dist-info/LICENSE.rst,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
-MarkupSafe-2.1.5.dist-info/METADATA,sha256=2dRDPam6OZLfpX0wg1JN5P3u9arqACxVSfdGmsJU7o8,3003
-MarkupSafe-2.1.5.dist-info/RECORD,,
-MarkupSafe-2.1.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-MarkupSafe-2.1.5.dist-info/WHEEL,sha256=EO1EUWjlSI9vqFKe-qOLBJFxSac53mP8l62vW3JFDec,109
-MarkupSafe-2.1.5.dist-info/top_level.txt,sha256=qy0Plje5IJuvsCBjejJyhDCjEAdcDLK_2agVcex8Z6U,11
-markupsafe/__init__.py,sha256=r7VOTjUq7EMQ4v3p4R1LoVOGJg6ysfYRncLr34laRBs,10958
-markupsafe/_native.py,sha256=GR86Qvo_GcgKmKreA1WmYN9ud17OFwkww8E-fiW-57s,1713
-markupsafe/_speedups.c,sha256=X2XvQVtIdcK4Usz70BvkzoOfjTCmQlDkkjYSn-swE0g,7083
-markupsafe/_speedups.cpython-38-darwin.so,sha256=1yfD14PZ-QrFSi3XHMHazowfHExBdp5WS7IC86gAuRc,18712
-markupsafe/_speedups.pyi,sha256=vfMCsOgbAXRNLUXkyuyonG8uEWKYU4PDqNuMaDELAYw,229
-markupsafe/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/MarkupSafe-2.1.5.dist-info/WHEEL b/libs/MarkupSafe-2.1.5.dist-info/WHEEL
deleted file mode 100644
index 9fd57fe24f..0000000000
--- a/libs/MarkupSafe-2.1.5.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: false
-Tag: cp38-cp38-macosx_12_0_x86_64
-
diff --git a/libs/PlexAPI-4.16.1.dist-info/METADATA b/libs/PlexAPI-4.16.1.dist-info/METADATA
deleted file mode 100644
index 97bc91f4b1..0000000000
--- a/libs/PlexAPI-4.16.1.dist-info/METADATA
+++ /dev/null
@@ -1,282 +0,0 @@
-Metadata-Version: 2.1
-Name: PlexAPI
-Version: 4.16.1
-Summary: Python bindings for the Plex API.
-Author-email: Michael Shepanski <michael.shepanski@gmail.com>
-License: BSD-3-Clause
-Project-URL: Homepage, https://github.com/pkkid/python-plexapi
-Project-URL: Documentation, https://python-plexapi.readthedocs.io
-Keywords: plex,api
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: BSD License
-Requires-Python: >=3.9
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-License-File: AUTHORS.txt
-Requires-Dist: requests
-Provides-Extra: alert
-Requires-Dist: websocket-client (>=1.3.3) ; extra == 'alert'
-
-Python-PlexAPI
-==============
-.. image:: https://github.com/pkkid/python-plexapi/workflows/CI/badge.svg
-    :target: https://github.com/pkkid/python-plexapi/actions?query=workflow%3ACI
-.. image:: https://readthedocs.org/projects/python-plexapi/badge/?version=latest
-    :target: http://python-plexapi.readthedocs.io/en/latest/?badge=latest
-.. image:: https://codecov.io/gh/pkkid/python-plexapi/branch/master/graph/badge.svg?token=fOECznuMtw
-    :target: https://codecov.io/gh/pkkid/python-plexapi
-.. image:: https://img.shields.io/github/tag/pkkid/python-plexapi.svg?label=github+release
-    :target: https://github.com/pkkid/python-plexapi/releases
-.. image:: https://badge.fury.io/py/PlexAPI.svg
-    :target: https://badge.fury.io/py/PlexAPI
-.. image:: https://img.shields.io/github/last-commit/pkkid/python-plexapi.svg
-    :target: https://img.shields.io/github/last-commit/pkkid/python-plexapi.svg
-
-
-Overview
---------
-Unofficial Python bindings for the Plex API. Our goal is to match all capabilities of the official
-Plex Web Client. A few of the many features we currently support are:
-
-* Navigate local or remote shared libraries.
-* Perform library actions such as scan, analyze, empty trash.
-* Remote control and play media on connected clients, including `Controlling Sonos speakers`_
-* Listen in on all Plex Server notifications.
- 
-
-Installation & Documentation
-----------------------------
-
-.. code-block:: python
-
-    pip install plexapi
-
-*Install extra features:*
-
-.. code-block:: python
-
-    pip install plexapi[alert]  # Install with dependencies required for plexapi.alert
-
-Documentation_ can be found at Read the Docs.
-
-.. _Documentation: http://python-plexapi.readthedocs.io/en/latest/
-
-Join our Discord_ for support and discussion.
-
-.. _Discord: https://discord.gg/GtAnnZAkuw
-
-
-Getting a PlexServer Instance
------------------------------
-
-There are two types of authentication. If you are running on a separate network
-or using Plex Users you can log into MyPlex to get a PlexServer instance. An
-example of this is below. NOTE: Servername below is the name of the server (not
-the hostname and port).  If logged into Plex Web you can see the server name in
-the top left above your available libraries.
-
-.. code-block:: python
-
-    from plexapi.myplex import MyPlexAccount
-    account = MyPlexAccount('<USERNAME>', '<PASSWORD>')
-    plex = account.resource('<SERVERNAME>').connect()  # returns a PlexServer instance
-
-If you want to avoid logging into MyPlex and you already know your auth token
-string, you can use the PlexServer object directly as above, by passing in
-the baseurl and auth token directly.
-
-.. code-block:: python
-
-    from plexapi.server import PlexServer
-    baseurl = 'http://plexserver:32400'
-    token = '2ffLuB84dqLswk9skLos'
-    plex = PlexServer(baseurl, token)
-
-
-Usage Examples
---------------
-
-.. code-block:: python
-
-    # Example 1: List all unwatched movies.
-    movies = plex.library.section('Movies')
-    for video in movies.search(unwatched=True):
-        print(video.title)
-
-
-.. code-block:: python
-
-    # Example 2: Mark all Game of Thrones episodes as played.
-    plex.library.section('TV Shows').get('Game of Thrones').markPlayed()
-
-
-.. code-block:: python
-
-    # Example 3: List all clients connected to the Server.
-    for client in plex.clients():
-        print(client.title)
-
-
-.. code-block:: python
-
-    # Example 4: Play the movie Cars on another client.
-    # Note: Client must be on same network as server.
-    cars = plex.library.section('Movies').get('Cars')
-    client = plex.client("Michael's iPhone")
-    client.playMedia(cars)
-
-
-.. code-block:: python
-
-    # Example 5: List all content with the word 'Game' in the title.
-    for video in plex.search('Game'):
-        print(f'{video.title} ({video.TYPE})')
-
-
-.. code-block:: python
-
-    # Example 6: List all movies directed by the same person as Elephants Dream.
-    movies = plex.library.section('Movies')
-    elephants_dream = movies.get('Elephants Dream')
-    director = elephants_dream.directors[0]
-    for movie in movies.search(None, director=director):
-        print(movie.title)
-
-
-.. code-block:: python
-
-    # Example 7: List files for the latest episode of The 100.
-    last_episode = plex.library.section('TV Shows').get('The 100').episodes()[-1]
-    for part in last_episode.iterParts():
-        print(part.file)
-
-
-.. code-block:: python
-
-    # Example 8: Get audio/video/all playlists
-    for playlist in plex.playlists():
-        print(playlist.title)
-
-
-.. code-block:: python
-
-    # Example 9: Rate the 100 four stars.
-    plex.library.section('TV Shows').get('The 100').rate(8.0)
-
-
-Controlling Sonos speakers
---------------------------
-
-To control Sonos speakers directly using Plex APIs, the following requirements must be met:
-
-1. Active Plex Pass subscription
-2. Sonos account linked to Plex account
-3. Plex remote access enabled
-
-Due to the design of Sonos music services, the API calls to control Sonos speakers route through https://sonos.plex.tv
-and back via the Plex server's remote access. Actual media playback is local unless networking restrictions prevent the
-Sonos speakers from connecting to the Plex server directly.
-
-.. code-block:: python
-
-    from plexapi.myplex import MyPlexAccount
-    from plexapi.server import PlexServer
-
-    baseurl = 'http://plexserver:32400'
-    token = '2ffLuB84dqLswk9skLos'
-
-    account = MyPlexAccount(token)
-    server = PlexServer(baseurl, token)
-
-    # List available speakers/groups
-    for speaker in account.sonos_speakers():
-        print(speaker.title)
-
-    # Obtain PlexSonosPlayer instance
-    speaker = account.sonos_speaker("Kitchen")
-
-    album = server.library.section('Music').get('Stevie Wonder').album('Innervisions')
-
-    # Speaker control examples
-    speaker.playMedia(album)
-    speaker.pause()
-    speaker.setVolume(10)
-    speaker.skipNext()
-
-
-Running tests over PlexAPI
---------------------------
-
-Use:
-
-.. code-block:: bash
-
-     tools/plex-boostraptest.py 
-    
-with appropriate
-arguments and add this new server to a shared user which username is defined in environment variable `SHARED_USERNAME`.
-It uses `official docker image`_ to create a proper instance.
-
-For skipping the docker and reuse a existing server use 
-
-.. code-block:: bash
-
-    python plex-bootstraptest.py --no-docker --username USERNAME --password PASSWORD --server-name NAME-OF-YOUR-SEVER
-
-Also in order to run most of the tests you have to provide some environment variables:
-
-* `PLEXAPI_AUTH_SERVER_BASEURL` containing an URL to your Plex instance, e.g. `http://127.0.0.1:32400` (without trailing
-  slash)
-* `PLEXAPI_AUTH_MYPLEX_USERNAME` and `PLEXAPI_AUTH_MYPLEX_PASSWORD` with your MyPlex username and password accordingly
-
-After this step you can run tests with following command:
-
-.. code-block:: bash
-
-    py.test tests -rxXs --ignore=tests/test_sync.py
-
-Some of the tests in main test-suite require a shared user in your account (e.g. `test_myplex_users`,
-`test_myplex_updateFriend`, etc.), you need to provide a valid shared user's username to get them running you need to
-provide the username of the shared user as an environment variable `SHARED_USERNAME`. You can enable a Guest account and
-simply pass `Guest` as `SHARED_USERNAME` (or just create a user like `plexapitest` and play with it).
-
-To be able to run tests over Mobile Sync api you have to some some more environment variables, to following values
-exactly:
-
-* PLEXAPI_HEADER_PROVIDES='controller,sync-target'
-* PLEXAPI_HEADER_PLATFORM=iOS
-* PLEXAPI_HEADER_PLATFORM_VERSION=11.4.1
-* PLEXAPI_HEADER_DEVICE=iPhone
-
-And finally run the sync-related tests:
-
-.. code-block:: bash
-
-    py.test tests/test_sync.py -rxXs
-
-.. _official docker image: https://hub.docker.com/r/plexinc/pms-docker/
-
-Common Questions
-----------------
-
-**Why are you using camelCase and not following PEP8 guidelines?**
-
-This API reads XML documents provided by MyPlex and the Plex Server.
-We decided to conform to their style so that the API variable names directly
-match with the provided XML documents.
-
-
-**Why don't you offer feature XYZ?**
-
-This library is meant to be a wrapper around the XML pages the Plex
-server provides. If we are not providing an API that is offered in the
-XML pages, please let us know! -- Adding additional features beyond that
-should be done outside the scope of this library.
-
-
-**What are some helpful links if trying to understand the raw Plex API?**
-
-* https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
-* https://forums.plex.tv/discussion/104353/pms-web-api-documentation
-* https://github.com/Arcanemagus/plex-api/wiki
diff --git a/libs/PlexAPI-4.16.1.dist-info/RECORD b/libs/PlexAPI-4.16.1.dist-info/RECORD
deleted file mode 100644
index 02ca75395e..0000000000
--- a/libs/PlexAPI-4.16.1.dist-info/RECORD
+++ /dev/null
@@ -1,31 +0,0 @@
-PlexAPI-4.16.1.dist-info/AUTHORS.txt,sha256=iEonabCDE0G6AnfT0tCcppsJ0AaTJZGhRjIM4lIIAck,228
-PlexAPI-4.16.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-PlexAPI-4.16.1.dist-info/LICENSE.txt,sha256=ZmoFInlwd6lOpMMQCWIbjLLtu4pwhwWArg_dnYS3X5A,1515
-PlexAPI-4.16.1.dist-info/METADATA,sha256=Wqd-vI8B0Geygwyrt4NqBcSsuUZxoDxqBHbLtKjz6Wc,9284
-PlexAPI-4.16.1.dist-info/RECORD,,
-PlexAPI-4.16.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PlexAPI-4.16.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-PlexAPI-4.16.1.dist-info/top_level.txt,sha256=PTwXHiZDiXtrZnSI7lpZkRz1oJs5DyYpiiu_FuhuSlk,8
-plexapi/__init__.py,sha256=rsy6uvdxBP64y4v5lC4yLTP3l5VY3S-Rsk8rE_gDPIM,2144
-plexapi/alert.py,sha256=pSAIwtzsOnY2b97137dG_8YZOpSBxmKJ_kRz0oZw5jA,4065
-plexapi/audio.py,sha256=A6hI88X3nP2fTiXMMu7Y_-iRGOtr6K_iRJtw2yzuX6g,29505
-plexapi/base.py,sha256=aeCngmI8GHicvzIurfGoPFtAfFJXbMJzZ8b8Fi0d3yo,49100
-plexapi/client.py,sha256=IMbtTVes6_XFO6KBOtMqX4DDvY-iC-94lzb4wdIzYS8,27906
-plexapi/collection.py,sha256=Cv4xQQMY0YzfrD4FJirUwepPbq28CkJOiCPauNueaQQ,26267
-plexapi/config.py,sha256=1kiGaq-DooB9zy5KvMLls6_FyIyPIXwddh0zjcmpD-U,2696
-plexapi/const.py,sha256=0tyh_Wsx9JgzwWD0mCyTM6cLnFtukiMEhUqn9ibDSIU,239
-plexapi/exceptions.py,sha256=yQYnQk07EQcwvFGJ44rXPt9Q3L415BYqyxxOCj2R8CI,683
-plexapi/gdm.py,sha256=SVi6uZu5pCuLNUAPIm8WeIJy1J55NTtN-bsBnTvB6Ec,5066
-plexapi/library.py,sha256=ceJryNLApNus7MCmQ8nm4HuO2_UKBgTdD1EGVI-u6yA,143847
-plexapi/media.py,sha256=Gsx8IqSUF71Qg4fCVQiEdPcepc3-i0jlgowEVgZiAj0,56451
-plexapi/mixins.py,sha256=hICrNwbVznjPDibsQHiHXMQ2T4fDooszlR7U47wJ3QM,49090
-plexapi/myplex.py,sha256=AQR2ZHM045-OAF8JN-f4yKMwFFO0B1r_eQPBsgVW0ps,99769
-plexapi/photo.py,sha256=eOyn_0wbXLQ7r0zADWbRTfbuRv70_NNN1DViwG2nW24,15702
-plexapi/playlist.py,sha256=SABCcXfDs3fLE_N0rUwqAkKTbduscQ6cDGpGoutGsrU,24436
-plexapi/playqueue.py,sha256=MU8fZMyTNTZOIJuPkNSGXijDAGeAuAVAiurtGzVFxG0,12937
-plexapi/server.py,sha256=tojLUl4sJdu2qnCwu0f_kac5_LKVfEI9SN5qJ553tms,64062
-plexapi/settings.py,sha256=3suRjHsJUBeRG61WXLpjmNxoTiRFLJMcuZZbzkaDK_Q,7149
-plexapi/sonos.py,sha256=tIr216CC-o2Vk8GLxsNPkXeyq4JYs9pgz244wbbFfgA,5099
-plexapi/sync.py,sha256=1NK-oeUKVvNnLFIVAq8d8vy2jG8Nu4gkQB295Qx2xYE,13728
-plexapi/utils.py,sha256=BvcUNCm_lPnDo5ny4aRlLtVT6KobVG4EqwPjN4w3kAc,24246
-plexapi/video.py,sha256=9DUhtyA1KCwVN8IoJUfa_kUlZEbplWFCli6-D0nr__k,62939
diff --git a/libs/PlexAPI-4.16.1.dist-info/WHEEL b/libs/PlexAPI-4.16.1.dist-info/WHEEL
deleted file mode 100644
index 57e3d840d5..0000000000
--- a/libs/PlexAPI-4.16.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/PySocks-1.7.1.dist-info/METADATA b/libs/PySocks-1.7.1.dist-info/METADATA
index ea990785ed..00e201fec4 100644
--- a/libs/PySocks-1.7.1.dist-info/METADATA
+++ b/libs/PySocks-1.7.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: PySocks
 Version: 1.7.1
 Summary: A Python SOCKS client module. See https://github.com/Anorov/PySocks for more information.
@@ -16,6 +16,17 @@ Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 PySocks
 =======
diff --git a/libs/PySocks-1.7.1.dist-info/RECORD b/libs/PySocks-1.7.1.dist-info/RECORD
index 3b5bbf3d16..6fc522a8b3 100644
--- a/libs/PySocks-1.7.1.dist-info/RECORD
+++ b/libs/PySocks-1.7.1.dist-info/RECORD
@@ -1,9 +1,9 @@
-PySocks-1.7.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-PySocks-1.7.1.dist-info/LICENSE,sha256=cCfiFOAU63i3rcwc7aWspxOnn8T2oMUsnaWz5wfm_-k,1401
-PySocks-1.7.1.dist-info/METADATA,sha256=RThVWnkrwm4fr1ITwGmvqqDXAYxHZG_WIoyRdQTBk4g,13237
-PySocks-1.7.1.dist-info/RECORD,,
-PySocks-1.7.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PySocks-1.7.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-PySocks-1.7.1.dist-info/top_level.txt,sha256=TKSOIfCFBoK9EY8FBYbYqC3PWd3--G15ph9n8-QHPDk,19
+pysocks-1.7.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pysocks-1.7.1.dist-info/METADATA,sha256=s0tCSaT0WJRL6NNS7WXhn9ua6ECBV8DbCiIuNMaA9gk,13468
+pysocks-1.7.1.dist-info/RECORD,,
+pysocks-1.7.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pysocks-1.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pysocks-1.7.1.dist-info/licenses/LICENSE,sha256=cCfiFOAU63i3rcwc7aWspxOnn8T2oMUsnaWz5wfm_-k,1401
+pysocks-1.7.1.dist-info/top_level.txt,sha256=TKSOIfCFBoK9EY8FBYbYqC3PWd3--G15ph9n8-QHPDk,19
 socks.py,sha256=xOYn27t9IGrbTBzWsUUuPa0YBuplgiUykzkOB5V5iFY,31086
 sockshandler.py,sha256=2SYGj-pwt1kjgLoZAmyeaEXCeZDWRmfVS_QG6kErGtY,3966
diff --git a/libs/PySocks-1.7.1.dist-info/WHEEL b/libs/PySocks-1.7.1.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/PySocks-1.7.1.dist-info/WHEEL
+++ b/libs/PySocks-1.7.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/PySocks-1.7.1.dist-info/LICENSE b/libs/PySocks-1.7.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/PySocks-1.7.1.dist-info/LICENSE
rename to libs/PySocks-1.7.1.dist-info/licenses/LICENSE
diff --git a/libs/PyYAML-6.0.2.dist-info/METADATA b/libs/PyYAML-6.0.2.dist-info/METADATA
deleted file mode 100644
index db029b770c..0000000000
--- a/libs/PyYAML-6.0.2.dist-info/METADATA
+++ /dev/null
@@ -1,46 +0,0 @@
-Metadata-Version: 2.1
-Name: PyYAML
-Version: 6.0.2
-Summary: YAML parser and emitter for Python
-Home-page: https://pyyaml.org/
-Download-URL: https://pypi.org/project/PyYAML/
-Author: Kirill Simonov
-Author-email: xi@resolvent.net
-License: MIT
-Project-URL: Bug Tracker, https://github.com/yaml/pyyaml/issues
-Project-URL: CI, https://github.com/yaml/pyyaml/actions
-Project-URL: Documentation, https://pyyaml.org/wiki/PyYAMLDocumentation
-Project-URL: Mailing lists, http://lists.sourceforge.net/lists/listinfo/yaml-core
-Project-URL: Source Code, https://github.com/yaml/pyyaml
-Platform: Any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Cython
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Text Processing :: Markup
-Requires-Python: >=3.8
-License-File: LICENSE
-
-YAML is a data serialization format designed for human readability
-and interaction with scripting languages.  PyYAML is a YAML parser
-and emitter for Python.
-
-PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
-support, capable extension API, and sensible error messages.  PyYAML
-supports standard YAML tags and provides Python-specific tags that
-allow to represent an arbitrary Python object.
-
-PyYAML is applicable for a broad range of tasks from complex
-configuration files to object serialization and persistence.
diff --git a/libs/PyYAML-6.0.2.dist-info/RECORD b/libs/PyYAML-6.0.2.dist-info/RECORD
deleted file mode 100644
index f01fe76227..0000000000
--- a/libs/PyYAML-6.0.2.dist-info/RECORD
+++ /dev/null
@@ -1,25 +0,0 @@
-PyYAML-6.0.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-PyYAML-6.0.2.dist-info/LICENSE,sha256=jTko-dxEkP1jVwfLiOsmvXZBAqcoKVQwfT5RZ6V36KQ,1101
-PyYAML-6.0.2.dist-info/METADATA,sha256=9-odFB5seu4pGPcEv7E8iyxNF51_uKnaNGjLAhz2lto,2060
-PyYAML-6.0.2.dist-info/RECORD,,
-PyYAML-6.0.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-PyYAML-6.0.2.dist-info/WHEEL,sha256=39uaw0gKzAUihvDPhgMAk_aKXc5F8smdVlzAUVAVruU,109
-PyYAML-6.0.2.dist-info/top_level.txt,sha256=rpj0IVMTisAjh_1vG3Ccf9v5jpCQwAz6cD1IVU5ZdhQ,11
-_yaml/__init__.py,sha256=04Ae_5osxahpJHa3XBZUAf4wi6XX32gR8D6X6p64GEA,1402
-yaml/__init__.py,sha256=N35S01HMesFTe0aRRMWkPj0Pa8IEbHpE9FK7cr5Bdtw,12311
-yaml/composer.py,sha256=_Ko30Wr6eDWUeUpauUGT3Lcg9QPBnOPVlTnIMRGJ9FM,4883
-yaml/constructor.py,sha256=kNgkfaeLUkwQYY_Q6Ff1Tz2XVw_pG1xVE9Ak7z-viLA,28639
-yaml/cyaml.py,sha256=6ZrAG9fAYvdVe2FK_w0hmXoG7ZYsoYUwapG8CiC72H0,3851
-yaml/dumper.py,sha256=PLctZlYwZLp7XmeUdwRuv4nYOZ2UBnDIUy8-lKfLF-o,2837
-yaml/emitter.py,sha256=jghtaU7eFwg31bG0B7RZea_29Adi9CKmXq_QjgQpCkQ,43006
-yaml/error.py,sha256=Ah9z-toHJUbE9j-M8YpxgSRM5CgLCcwVzJgLLRF2Fxo,2533
-yaml/events.py,sha256=50_TksgQiE4up-lKo_V-nBy-tAIxkIPQxY5qDhKCeHw,2445
-yaml/loader.py,sha256=UVa-zIqmkFSCIYq_PgSGm4NSJttHY2Rf_zQ4_b1fHN0,2061
-yaml/nodes.py,sha256=gPKNj8pKCdh2d4gr3gIYINnPOaOxGhJAUiYhGRnPE84,1440
-yaml/parser.py,sha256=ilWp5vvgoHFGzvOZDItFoGjD6D42nhlZrZyjAwa0oJo,25495
-yaml/reader.py,sha256=0dmzirOiDG4Xo41RnuQS7K9rkY3xjHiVasfDMNTqCNw,6794
-yaml/representer.py,sha256=IuWP-cAW9sHKEnS0gCqSa894k1Bg4cgTxaDwIcbRQ-Y,14190
-yaml/resolver.py,sha256=9L-VYfm4mWHxUD1Vg4X7rjDRK_7VZd6b92wzq7Y2IKY,9004
-yaml/scanner.py,sha256=YEM3iLZSaQwXcQRg2l2R4MdT0zGP2F9eHkKGKnHyWQY,51279
-yaml/serializer.py,sha256=ChuFgmhU01hj4xgI8GaKv6vfM2Bujwa9i7d2FAHj7cA,4165
-yaml/tokens.py,sha256=lTQIzSVw8Mg9wv459-TjiOQe6wVziqaRlqX2_89rp54,2573
diff --git a/libs/PyYAML-6.0.2.dist-info/WHEEL b/libs/PyYAML-6.0.2.dist-info/WHEEL
deleted file mode 100644
index b8b9cfd4ca..0000000000
--- a/libs/PyYAML-6.0.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
-Root-Is-Purelib: false
-Tag: cp38-cp38-macosx_12_0_x86_64
-
diff --git a/libs/APScheduler-3.10.4.dist-info/INSTALLER b/libs/PyYAML-6.0.3.dist-info/INSTALLER
similarity index 100%
rename from libs/APScheduler-3.10.4.dist-info/INSTALLER
rename to libs/PyYAML-6.0.3.dist-info/INSTALLER
diff --git a/libs/PyYAML-6.0.2.dist-info/LICENSE b/libs/PyYAML-6.0.3.dist-info/LICENSE
similarity index 100%
rename from libs/PyYAML-6.0.2.dist-info/LICENSE
rename to libs/PyYAML-6.0.3.dist-info/LICENSE
diff --git a/libs/PyYAML-6.0.3.dist-info/METADATA b/libs/PyYAML-6.0.3.dist-info/METADATA
new file mode 100644
index 0000000000..330ffe9df9
--- /dev/null
+++ b/libs/PyYAML-6.0.3.dist-info/METADATA
@@ -0,0 +1,59 @@
+Metadata-Version: 2.1
+Name: PyYAML
+Version: 6.0.3
+Summary: YAML parser and emitter for Python
+Home-page: https://pyyaml.org/
+Download-URL: https://pypi.org/project/PyYAML/
+Author: Kirill Simonov
+Author-email: xi@resolvent.net
+License: MIT
+Project-URL: Bug Tracker, https://github.com/yaml/pyyaml/issues
+Project-URL: CI, https://github.com/yaml/pyyaml/actions
+Project-URL: Documentation, https://pyyaml.org/wiki/PyYAMLDocumentation
+Project-URL: Mailing lists, http://lists.sourceforge.net/lists/listinfo/yaml-core
+Project-URL: Source Code, https://github.com/yaml/pyyaml
+Platform: Any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Cython
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Markup
+Requires-Python: >=3.8
+License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
+
+YAML is a data serialization format designed for human readability
+and interaction with scripting languages.  PyYAML is a YAML parser
+and emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
+support, capable extension API, and sensible error messages.  PyYAML
+supports standard YAML tags and provides Python-specific tags that
+allow to represent an arbitrary Python object.
+
+PyYAML is applicable for a broad range of tasks from complex
+configuration files to object serialization and persistence.
diff --git a/libs/PyYAML-6.0.3.dist-info/RECORD b/libs/PyYAML-6.0.3.dist-info/RECORD
new file mode 100644
index 0000000000..f5113593a2
--- /dev/null
+++ b/libs/PyYAML-6.0.3.dist-info/RECORD
@@ -0,0 +1,25 @@
+PyYAML-6.0.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+PyYAML-6.0.3.dist-info/LICENSE,sha256=jTko-dxEkP1jVwfLiOsmvXZBAqcoKVQwfT5RZ6V36KQ,1101
+PyYAML-6.0.3.dist-info/METADATA,sha256=flU4VTkFLVOleKPdLjqz_9sAdVG3dXdBfUSdeA5B4Tk,2351
+PyYAML-6.0.3.dist-info/RECORD,,
+PyYAML-6.0.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PyYAML-6.0.3.dist-info/WHEEL,sha256=hFYUutZ2FUL_WAhfJuJKZaElTlo_M4xZvGUwp8hfNTA,110
+PyYAML-6.0.3.dist-info/top_level.txt,sha256=rpj0IVMTisAjh_1vG3Ccf9v5jpCQwAz6cD1IVU5ZdhQ,11
+_yaml/__init__.py,sha256=04Ae_5osxahpJHa3XBZUAf4wi6XX32gR8D6X6p64GEA,1402
+yaml/__init__.py,sha256=sZ38wzPWp139cwc5ARZFByUvJxtB07X32FUQAzoFR6c,12311
+yaml/composer.py,sha256=_Ko30Wr6eDWUeUpauUGT3Lcg9QPBnOPVlTnIMRGJ9FM,4883
+yaml/constructor.py,sha256=kNgkfaeLUkwQYY_Q6Ff1Tz2XVw_pG1xVE9Ak7z-viLA,28639
+yaml/cyaml.py,sha256=6ZrAG9fAYvdVe2FK_w0hmXoG7ZYsoYUwapG8CiC72H0,3851
+yaml/dumper.py,sha256=PLctZlYwZLp7XmeUdwRuv4nYOZ2UBnDIUy8-lKfLF-o,2837
+yaml/emitter.py,sha256=jghtaU7eFwg31bG0B7RZea_29Adi9CKmXq_QjgQpCkQ,43006
+yaml/error.py,sha256=Ah9z-toHJUbE9j-M8YpxgSRM5CgLCcwVzJgLLRF2Fxo,2533
+yaml/events.py,sha256=50_TksgQiE4up-lKo_V-nBy-tAIxkIPQxY5qDhKCeHw,2445
+yaml/loader.py,sha256=UVa-zIqmkFSCIYq_PgSGm4NSJttHY2Rf_zQ4_b1fHN0,2061
+yaml/nodes.py,sha256=gPKNj8pKCdh2d4gr3gIYINnPOaOxGhJAUiYhGRnPE84,1440
+yaml/parser.py,sha256=ilWp5vvgoHFGzvOZDItFoGjD6D42nhlZrZyjAwa0oJo,25495
+yaml/reader.py,sha256=0dmzirOiDG4Xo41RnuQS7K9rkY3xjHiVasfDMNTqCNw,6794
+yaml/representer.py,sha256=IuWP-cAW9sHKEnS0gCqSa894k1Bg4cgTxaDwIcbRQ-Y,14190
+yaml/resolver.py,sha256=9L-VYfm4mWHxUD1Vg4X7rjDRK_7VZd6b92wzq7Y2IKY,9004
+yaml/scanner.py,sha256=YEM3iLZSaQwXcQRg2l2R4MdT0zGP2F9eHkKGKnHyWQY,51279
+yaml/serializer.py,sha256=ChuFgmhU01hj4xgI8GaKv6vfM2Bujwa9i7d2FAHj7cA,4165
+yaml/tokens.py,sha256=lTQIzSVw8Mg9wv459-TjiOQe6wVziqaRlqX2_89rp54,2573
diff --git a/libs/APScheduler-3.10.4.dist-info/REQUESTED b/libs/PyYAML-6.0.3.dist-info/REQUESTED
similarity index 100%
rename from libs/APScheduler-3.10.4.dist-info/REQUESTED
rename to libs/PyYAML-6.0.3.dist-info/REQUESTED
diff --git a/libs/PyYAML-6.0.3.dist-info/WHEEL b/libs/PyYAML-6.0.3.dist-info/WHEEL
new file mode 100644
index 0000000000..4cfaefcad6
--- /dev/null
+++ b/libs/PyYAML-6.0.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: bdist_wheel (0.44.0)
+Root-Is-Purelib: false
+Tag: cp310-cp310-macosx_14_0_arm64
+
diff --git a/libs/PyYAML-6.0.2.dist-info/top_level.txt b/libs/PyYAML-6.0.3.dist-info/top_level.txt
similarity index 100%
rename from libs/PyYAML-6.0.2.dist-info/top_level.txt
rename to libs/PyYAML-6.0.3.dist-info/top_level.txt
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/LICENSE b/libs/SQLAlchemy-2.0.37.dist-info/LICENSE
deleted file mode 100644
index dfe1a4d815..0000000000
--- a/libs/SQLAlchemy-2.0.37.dist-info/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2005-2025 SQLAlchemy authors and contributors <see AUTHORS file>.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/METADATA b/libs/SQLAlchemy-2.0.37.dist-info/METADATA
deleted file mode 100644
index e548f29da2..0000000000
--- a/libs/SQLAlchemy-2.0.37.dist-info/METADATA
+++ /dev/null
@@ -1,243 +0,0 @@
-Metadata-Version: 2.1
-Name: SQLAlchemy
-Version: 2.0.37
-Summary: Database Abstraction Library
-Home-page: https://www.sqlalchemy.org
-Author: Mike Bayer
-Author-email: mike_mp@zzzcomputing.com
-License: MIT
-Project-URL: Documentation, https://docs.sqlalchemy.org
-Project-URL: Issue Tracker, https://github.com/sqlalchemy/sqlalchemy/
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Database :: Front-Ends
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: typing-extensions >=4.6.0
-Requires-Dist: greenlet !=0.4.17 ; python_version < "3.14" and (platform_machine == "aarch64" or (platform_machine == "ppc64le" or (platform_machine == "x86_64" or (platform_machine == "amd64" or (platform_machine == "AMD64" or (platform_machine == "win32" or platform_machine == "WIN32"))))))
-Requires-Dist: importlib-metadata ; python_version < "3.8"
-Provides-Extra: aiomysql
-Requires-Dist: greenlet !=0.4.17 ; extra == 'aiomysql'
-Requires-Dist: aiomysql >=0.2.0 ; extra == 'aiomysql'
-Provides-Extra: aioodbc
-Requires-Dist: greenlet !=0.4.17 ; extra == 'aioodbc'
-Requires-Dist: aioodbc ; extra == 'aioodbc'
-Provides-Extra: aiosqlite
-Requires-Dist: greenlet !=0.4.17 ; extra == 'aiosqlite'
-Requires-Dist: aiosqlite ; extra == 'aiosqlite'
-Requires-Dist: typing-extensions !=3.10.0.1 ; extra == 'aiosqlite'
-Provides-Extra: asyncio
-Requires-Dist: greenlet !=0.4.17 ; extra == 'asyncio'
-Provides-Extra: asyncmy
-Requires-Dist: greenlet !=0.4.17 ; extra == 'asyncmy'
-Requires-Dist: asyncmy !=0.2.4,!=0.2.6,>=0.2.3 ; extra == 'asyncmy'
-Provides-Extra: mariadb_connector
-Requires-Dist: mariadb !=1.1.10,!=1.1.2,!=1.1.5,>=1.0.1 ; extra == 'mariadb_connector'
-Provides-Extra: mssql
-Requires-Dist: pyodbc ; extra == 'mssql'
-Provides-Extra: mssql_pymssql
-Requires-Dist: pymssql ; extra == 'mssql_pymssql'
-Provides-Extra: mssql_pyodbc
-Requires-Dist: pyodbc ; extra == 'mssql_pyodbc'
-Provides-Extra: mypy
-Requires-Dist: mypy >=0.910 ; extra == 'mypy'
-Provides-Extra: mysql
-Requires-Dist: mysqlclient >=1.4.0 ; extra == 'mysql'
-Provides-Extra: mysql_connector
-Requires-Dist: mysql-connector-python ; extra == 'mysql_connector'
-Provides-Extra: oracle
-Requires-Dist: cx-oracle >=8 ; extra == 'oracle'
-Provides-Extra: oracle_oracledb
-Requires-Dist: oracledb >=1.0.1 ; extra == 'oracle_oracledb'
-Provides-Extra: postgresql
-Requires-Dist: psycopg2 >=2.7 ; extra == 'postgresql'
-Provides-Extra: postgresql_asyncpg
-Requires-Dist: greenlet !=0.4.17 ; extra == 'postgresql_asyncpg'
-Requires-Dist: asyncpg ; extra == 'postgresql_asyncpg'
-Provides-Extra: postgresql_pg8000
-Requires-Dist: pg8000 >=1.29.1 ; extra == 'postgresql_pg8000'
-Provides-Extra: postgresql_psycopg
-Requires-Dist: psycopg >=3.0.7 ; extra == 'postgresql_psycopg'
-Provides-Extra: postgresql_psycopg2binary
-Requires-Dist: psycopg2-binary ; extra == 'postgresql_psycopg2binary'
-Provides-Extra: postgresql_psycopg2cffi
-Requires-Dist: psycopg2cffi ; extra == 'postgresql_psycopg2cffi'
-Provides-Extra: postgresql_psycopgbinary
-Requires-Dist: psycopg[binary] >=3.0.7 ; extra == 'postgresql_psycopgbinary'
-Provides-Extra: pymysql
-Requires-Dist: pymysql ; extra == 'pymysql'
-Provides-Extra: sqlcipher
-Requires-Dist: sqlcipher3-binary ; extra == 'sqlcipher'
-
-SQLAlchemy
-==========
-
-|PyPI| |Python| |Downloads|
-
-.. |PyPI| image:: https://img.shields.io/pypi/v/sqlalchemy
-    :target: https://pypi.org/project/sqlalchemy
-    :alt: PyPI
-
-.. |Python| image:: https://img.shields.io/pypi/pyversions/sqlalchemy
-    :target: https://pypi.org/project/sqlalchemy
-    :alt: PyPI - Python Version
-
-.. |Downloads| image:: https://static.pepy.tech/badge/sqlalchemy/month
-    :target: https://pepy.tech/project/sqlalchemy
-    :alt: PyPI - Downloads
-
-
-The Python SQL Toolkit and Object Relational Mapper
-
-Introduction
--------------
-
-SQLAlchemy is the Python SQL toolkit and Object Relational Mapper
-that gives application developers the full power and
-flexibility of SQL. SQLAlchemy provides a full suite
-of well known enterprise-level persistence patterns,
-designed for efficient and high-performing database
-access, adapted into a simple and Pythonic domain
-language.
-
-Major SQLAlchemy features include:
-
-* An industrial strength ORM, built
-  from the core on the identity map, unit of work,
-  and data mapper patterns.   These patterns
-  allow transparent persistence of objects
-  using a declarative configuration system.
-  Domain models
-  can be constructed and manipulated naturally,
-  and changes are synchronized with the
-  current transaction automatically.
-* A relationally-oriented query system, exposing
-  the full range of SQL's capabilities
-  explicitly, including joins, subqueries,
-  correlation, and most everything else,
-  in terms of the object model.
-  Writing queries with the ORM uses the same
-  techniques of relational composition you use
-  when writing SQL.  While you can drop into
-  literal SQL at any time, it's virtually never
-  needed.
-* A comprehensive and flexible system
-  of eager loading for related collections and objects.
-  Collections are cached within a session,
-  and can be loaded on individual access, all
-  at once using joins, or by query per collection
-  across the full result set.
-* A Core SQL construction system and DBAPI
-  interaction layer.  The SQLAlchemy Core is
-  separate from the ORM and is a full database
-  abstraction layer in its own right, and includes
-  an extensible Python-based SQL expression
-  language, schema metadata, connection pooling,
-  type coercion, and custom types.
-* All primary and foreign key constraints are
-  assumed to be composite and natural.  Surrogate
-  integer primary keys are of course still the
-  norm, but SQLAlchemy never assumes or hardcodes
-  to this model.
-* Database introspection and generation.  Database
-  schemas can be "reflected" in one step into
-  Python structures representing database metadata;
-  those same structures can then generate
-  CREATE statements right back out - all within
-  the Core, independent of the ORM.
-
-SQLAlchemy's philosophy:
-
-* SQL databases behave less and less like object
-  collections the more size and performance start to
-  matter; object collections behave less and less like
-  tables and rows the more abstraction starts to matter.
-  SQLAlchemy aims to accommodate both of these
-  principles.
-* An ORM doesn't need to hide the "R".   A relational
-  database provides rich, set-based functionality
-  that should be fully exposed.   SQLAlchemy's
-  ORM provides an open-ended set of patterns
-  that allow a developer to construct a custom
-  mediation layer between a domain model and
-  a relational schema, turning the so-called
-  "object relational impedance" issue into
-  a distant memory.
-* The developer, in all cases, makes all decisions
-  regarding the design, structure, and naming conventions
-  of both the object model as well as the relational
-  schema.   SQLAlchemy only provides the means
-  to automate the execution of these decisions.
-* With SQLAlchemy, there's no such thing as
-  "the ORM generated a bad query" - you
-  retain full control over the structure of
-  queries, including how joins are organized,
-  how subqueries and correlation is used, what
-  columns are requested.  Everything SQLAlchemy
-  does is ultimately the result of a developer-initiated 
-  decision.
-* Don't use an ORM if the problem doesn't need one.
-  SQLAlchemy consists of a Core and separate ORM
-  component.   The Core offers a full SQL expression
-  language that allows Pythonic construction
-  of SQL constructs that render directly to SQL
-  strings for a target database, returning
-  result sets that are essentially enhanced DBAPI
-  cursors.
-* Transactions should be the norm.  With SQLAlchemy's
-  ORM, nothing goes to permanent storage until
-  commit() is called.  SQLAlchemy encourages applications
-  to create a consistent means of delineating
-  the start and end of a series of operations.
-* Never render a literal value in a SQL statement.
-  Bound parameters are used to the greatest degree
-  possible, allowing query optimizers to cache
-  query plans effectively and making SQL injection
-  attacks a non-issue.
-
-Documentation
--------------
-
-Latest documentation is at:
-
-https://www.sqlalchemy.org/docs/
-
-Installation / Requirements
----------------------------
-
-Full documentation for installation is at
-`Installation <https://www.sqlalchemy.org/docs/intro.html#installation>`_.
-
-Getting Help / Development / Bug reporting
-------------------------------------------
-
-Please refer to the `SQLAlchemy Community Guide <https://www.sqlalchemy.org/support.html>`_.
-
-Code of Conduct
----------------
-
-Above all, SQLAlchemy places great emphasis on polite, thoughtful, and
-constructive communication between users and developers.
-Please see our current Code of Conduct at
-`Code of Conduct <https://www.sqlalchemy.org/codeofconduct.html>`_.
-
-License
--------
-
-SQLAlchemy is distributed under the `MIT license
-<https://www.opensource.org/licenses/mit-license.php>`_.
-
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/RECORD b/libs/SQLAlchemy-2.0.37.dist-info/RECORD
deleted file mode 100644
index d9bb0e04fe..0000000000
--- a/libs/SQLAlchemy-2.0.37.dist-info/RECORD
+++ /dev/null
@@ -1,275 +0,0 @@
-SQLAlchemy-2.0.37.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-SQLAlchemy-2.0.37.dist-info/LICENSE,sha256=mCFyC1jUpWW2EyEAeorUOraZGjlZ5mzV203Z6uacffw,1100
-SQLAlchemy-2.0.37.dist-info/METADATA,sha256=UywKCGKcABKNtpI-G6qnmmxpFaI6iJcHIDeLUQ2RvWQ,9692
-SQLAlchemy-2.0.37.dist-info/RECORD,,
-SQLAlchemy-2.0.37.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-SQLAlchemy-2.0.37.dist-info/WHEEL,sha256=j8_MCNBI7KgztMI2VCVmNiYcEly_P_7tu-qcbaOXbrw,108
-SQLAlchemy-2.0.37.dist-info/top_level.txt,sha256=rp-ZgB7D8G11ivXON5VGPjupT1voYmWqkciDt5Uaw_Q,11
-sqlalchemy/__init__.py,sha256=m8AoRzqL1l_3uFAeJ_vwtlAfXkboxLKJ3oL1RqFnXbM,13033
-sqlalchemy/connectors/__init__.py,sha256=YeSHsOB0YhdM6jZUvHFQFwKqNXO02MlklmGW0yCywjI,476
-sqlalchemy/connectors/aioodbc.py,sha256=KT9xi2xQ4AJgDiGPTV5h_5qi9dummmenKAvWelwza3w,5288
-sqlalchemy/connectors/asyncio.py,sha256=00claZADdFUh2iQmlpqoLhLTBxK0i79Mwd9WZqUtleM,6138
-sqlalchemy/connectors/pyodbc.py,sha256=GsW9bD0H30OMTbGDx9SdaTT_ujgpxP7TM4rfhIzD4mo,8501
-sqlalchemy/cyextension/__init__.py,sha256=4npVIjitKfUs0NQ6f3UdQBDq4ipJ0_ZNB2mpKqtc5ik,244
-sqlalchemy/cyextension/collections.cpython-38-darwin.so,sha256=sEF81qKQrUMYUNYDc5rR0o9KN5ntUi5sU3VFXT_Gbs4,233760
-sqlalchemy/cyextension/collections.pyx,sha256=L7DZ3DGKpgw2MT2ZZRRxCnrcyE5pU1NAFowWgAzQPEc,12571
-sqlalchemy/cyextension/immutabledict.cpython-38-darwin.so,sha256=zPUP2rtm01kkegS3n-rYzu7VgmZNo1hQS65vgIUme4U,94672
-sqlalchemy/cyextension/immutabledict.pxd,sha256=3x3-rXG5eRQ7bBnktZ-OJ9-6ft8zToPmTDOd92iXpB0,291
-sqlalchemy/cyextension/immutabledict.pyx,sha256=KfDTYbTfebstE8xuqAtuXsHNAK0_b5q_ymUiinUe_xs,3535
-sqlalchemy/cyextension/processors.cpython-38-darwin.so,sha256=ZXviRx-dUBLWF5Z2xb2ImYGZR2s1VEEX0rvOvBihfYk,75864
-sqlalchemy/cyextension/processors.pyx,sha256=R1rHsGLEaGeBq5VeCydjClzYlivERIJ9B-XLOJlf2MQ,1792
-sqlalchemy/cyextension/resultproxy.cpython-38-darwin.so,sha256=uA4vRLlgWg8sEjeTXmJ5v4DAxpCubWTNMJGDRgtlgzY,78016
-sqlalchemy/cyextension/resultproxy.pyx,sha256=eWLdyBXiBy_CLQrF5ScfWJm7X0NeelscSXedtj1zv9Q,2725
-sqlalchemy/cyextension/util.cpython-38-darwin.so,sha256=BA75sGnaj5sISpo7_70Id7LycML4iHxagdVolVa8Mf4,93008
-sqlalchemy/cyextension/util.pyx,sha256=B85orxa9LddLuQEaDoVSq1XmAXIbLKxrxpvuB8ogV_o,2530
-sqlalchemy/dialects/__init__.py,sha256=4jxiSgI_fVCNXcz42gQYKEp0k07RAHyQN4ZpjaNsFUI,1770
-sqlalchemy/dialects/_typing.py,sha256=8YwrkOa8IvmBojwwegbL5mL_0UAuzdqYiKHKANpvHMw,971
-sqlalchemy/dialects/mssql/__init__.py,sha256=6t_aNpgbMLdPE9gpHYTf9o6QfVavncztRLbr21l2NaY,1880
-sqlalchemy/dialects/mssql/aioodbc.py,sha256=4CmhwIkZrabpG-r7_ogRVajD-nhRZSFJ0Swz2d0jIHM,2021
-sqlalchemy/dialects/mssql/base.py,sha256=2UCotpN3WBPgMddhXVP6Epc-srvNrYHCnK4kcEbjW6w,132713
-sqlalchemy/dialects/mssql/information_schema.py,sha256=v5MZz1FN72THEwF_u3Eh_2vnWdFE13RYydOioMMcuvU,8084
-sqlalchemy/dialects/mssql/json.py,sha256=F53pibuOVRzgDtjoclOI7LnkKXNVsaVfJyBH1XAhyDo,4756
-sqlalchemy/dialects/mssql/provision.py,sha256=P1tqxZ4f6Oeqn2gNi7dXl82LRLCg1-OB4eWiZc6CHek,5593
-sqlalchemy/dialects/mssql/pymssql.py,sha256=C7yAs3Pw81W1KTVNc6_0sHQuYlJ5iH82vKByY4TkB1g,4097
-sqlalchemy/dialects/mssql/pyodbc.py,sha256=CnO7KDWxbxb7AoZhp_PMDBvVSMuzwq1h4Cav2IWFWDo,27173
-sqlalchemy/dialects/mysql/__init__.py,sha256=ropOMUWrAcL-Q7h-9jQ_tb3ISAFIsNRQ8YVXvn0URl0,2206
-sqlalchemy/dialects/mysql/aiomysql.py,sha256=yrujoFtAG0QvtVlgbGBUMg3kXeXlIH62tvyYTCMUfnE,10013
-sqlalchemy/dialects/mysql/asyncmy.py,sha256=rmVSf86VYxgAUROIKfVtvS-grG9aPBiLY_Gu0KJMjuo,10081
-sqlalchemy/dialects/mysql/base.py,sha256=LkGJ6G1U2xygOawOtQYBfTipGh8MuiE1kNxaD7S9UIY,123432
-sqlalchemy/dialects/mysql/cymysql.py,sha256=KwxSsF4a6uUd6yblhSns8uj4hgmhv4hFInTZNdmRixA,2300
-sqlalchemy/dialects/mysql/dml.py,sha256=VjnTobe_SBNF2RN6tvqa5LOn-9x4teVUyzUedZkOmdc,7768
-sqlalchemy/dialects/mysql/enumerated.py,sha256=qI5gnBYhxk9dhPeUfGiijp0qT2Puazdp27-ba_38uWQ,8447
-sqlalchemy/dialects/mysql/expression.py,sha256=3PEKPwYIZ8mVXkjUgHaj_efPBYuBNWZSnfUcJuoZddA,4121
-sqlalchemy/dialects/mysql/json.py,sha256=W31DojiRypifXKVh3PJSWP7IHqFoeKwzLl-0CJH6QRI,2269
-sqlalchemy/dialects/mysql/mariadb.py,sha256=g4v4WQuXHn556Nn6k-RgvPrmfCql1R46fIEk6UEx0U8,1450
-sqlalchemy/dialects/mysql/mariadbconnector.py,sha256=t4m6kfYBoURjNXRxlEsRajjvArNDc4lmaFGxHQh7VTo,8623
-sqlalchemy/dialects/mysql/mysqlconnector.py,sha256=gdNOGdRqvnCbLZpKjpubu_0tGRQ5Tn_2TZvbp3v9rX0,5729
-sqlalchemy/dialects/mysql/mysqldb.py,sha256=5ME7B0WI9G8tw5482YBejDg38uVMXR2oUasNDOCsAqQ,9526
-sqlalchemy/dialects/mysql/provision.py,sha256=5LCeInPvyEbGuzxSs9rnnLYkMsFpW3IJ8lC-sjTfKnk,3575
-sqlalchemy/dialects/mysql/pymysql.py,sha256=osp0em1s3Cip5Vpcj-PeaH7btHEInorO-qs351muw3Q,4082
-sqlalchemy/dialects/mysql/pyodbc.py,sha256=ZiFNJQq2qiOTzTZLmNJQ938EnS1ItVsNDa3fvNEDqnI,4298
-sqlalchemy/dialects/mysql/reflection.py,sha256=eGV9taua0nZS_HsHyAy6zjcHEHFPXmFdux-bUmtOeWs,22834
-sqlalchemy/dialects/mysql/reserved_words.py,sha256=C9npWSuhsxoVCqETxCQ1zE_UEgy4gfiHw9zI5dPkjWI,9258
-sqlalchemy/dialects/mysql/types.py,sha256=w68OASMw04xkyAc0_GtXkuEhhVqlR6LTwaOch4KaAFQ,24343
-sqlalchemy/dialects/oracle/__init__.py,sha256=rp9qPRNQAk1Yq_Zhe7SsUH8EvFgNOAh8XOF17Lkxpyo,1493
-sqlalchemy/dialects/oracle/base.py,sha256=_JF4OwXmXjAsXj8wXq2m8M2vtMjoxdlOwg1hfcgn3bc,123096
-sqlalchemy/dialects/oracle/cx_oracle.py,sha256=ohENTgLxGUfobRH3K8KdeZgBRPG1rX3vY-ph9blj-2g,56612
-sqlalchemy/dialects/oracle/dictionary.py,sha256=J7tGVE0KyUPZKpPLOary3HdDq1DWd29arF5udLgv8_o,19519
-sqlalchemy/dialects/oracle/oracledb.py,sha256=veqto1AUIbSxRmpUQin0ysMV8Y6sWAkzXt7W8IIl118,33771
-sqlalchemy/dialects/oracle/provision.py,sha256=ga1gNQZlXZKk7DYuYegllUejJxZXRKDGa7dbi_S_poc,8313
-sqlalchemy/dialects/oracle/types.py,sha256=axN6Yidx9tGRIUAbDpBrhMWXE-C8jSllFpTghpGOOzU,9058
-sqlalchemy/dialects/postgresql/__init__.py,sha256=kD8W-SV5e2CesvWg2MQAtncXuZFwGPfR_UODvmRXE08,3892
-sqlalchemy/dialects/postgresql/_psycopg_common.py,sha256=szME-lCjVwqnW9-USA6e8ke8N_bN3IbqnIm_oZruvqc,5696
-sqlalchemy/dialects/postgresql/array.py,sha256=28kndSQwgvNWlO4z6MUh5WYAtNSgkgBa6qSEQCIflks,13856
-sqlalchemy/dialects/postgresql/asyncpg.py,sha256=ysIDXcGT3OG2lu0YdiIn-_pzfL0uDe-tmHs70fOWVVE,41283
-sqlalchemy/dialects/postgresql/base.py,sha256=otAswEHqeRhbN9_AGMxnwDo6r872ECkiJ5FMetXfS0k,179452
-sqlalchemy/dialects/postgresql/dml.py,sha256=2SmyMeYveAgm7OnT_CJvwad2nh8BP37yT6gFs8dBYN8,12126
-sqlalchemy/dialects/postgresql/ext.py,sha256=MtN4IU5sRYvoY-E8PTltJ1CuIGb-aCwY2pHMPJcTboA,16318
-sqlalchemy/dialects/postgresql/hstore.py,sha256=wR4gmvfQWPssHwYTXEsPJTb4LkBS6x4e4XXE6smtDH4,11934
-sqlalchemy/dialects/postgresql/json.py,sha256=9sHFGTRFyNbLsANrVYookw9NOJwIPTsEBRNIOUOzOGw,11612
-sqlalchemy/dialects/postgresql/named_types.py,sha256=TEWaBCjuHM2WJoQNrQErQ6f_bUkWypGJfW71wzVJXWc,17572
-sqlalchemy/dialects/postgresql/operators.py,sha256=ay3ckNsWtqDjxDseTdKMGGqYVzST6lmfhbbYHG_bxCw,2808
-sqlalchemy/dialects/postgresql/pg8000.py,sha256=RAykzZuO3Anr6AsyK2JYr7CPb2pru6WtkrX2phCyCGU,18638
-sqlalchemy/dialects/postgresql/pg_catalog.py,sha256=lgJMn7aDuJI2XeHddLkge5NFy6oB2-aDSn8A47QpwAU,9254
-sqlalchemy/dialects/postgresql/provision.py,sha256=7pg9-nOnaK5XBzqByXNPuvi3rxtnRa3dJxdSPVq4eeA,5770
-sqlalchemy/dialects/postgresql/psycopg.py,sha256=k7zXsJj35aOXCrhsbMxwTQX5JWegrqirFJ1Hgbq-GjQ,23326
-sqlalchemy/dialects/postgresql/psycopg2.py,sha256=1KXw9RzsQEAXJazCBywdP5CwLu-HsCSDAD_Khc_rPTM,32032
-sqlalchemy/dialects/postgresql/psycopg2cffi.py,sha256=nKilJfvO9mJwk5NRw5iZDekKY5vi379tvdUJ2vn5eyQ,1756
-sqlalchemy/dialects/postgresql/ranges.py,sha256=fnaj4YgCQGO-G_S4k5ea8bYMH7SzggKJdUX5qfaNp4Y,32978
-sqlalchemy/dialects/postgresql/types.py,sha256=sjb-m-h49lbLBFh0P30G8BWgf_aKNiNyVwWEktugwRw,7286
-sqlalchemy/dialects/sqlite/__init__.py,sha256=6Xcz3nPsl8lqCcZ4-VzPRmkMrkKgAp2buKsClZelU7c,1182
-sqlalchemy/dialects/sqlite/aiosqlite.py,sha256=FWS-Nn2jnpITQKGd4xOZCYEW-l1C_erQ3IdDJC855t8,12348
-sqlalchemy/dialects/sqlite/base.py,sha256=PvwPzukomHAkufUzSqgfJcbKC2ZJAkJbVnW2BQB2T58,98271
-sqlalchemy/dialects/sqlite/dml.py,sha256=4N8qh06RuMphLoQgWw7wv5nXIrka57jIFvK2x9xTZqg,9138
-sqlalchemy/dialects/sqlite/json.py,sha256=A62xPyLRZxl2hvgTMM92jd_7jlw9UE_4Y6Udqt-8g04,2777
-sqlalchemy/dialects/sqlite/provision.py,sha256=iLJyeQSy8pfr9lwEu4_d4O_CI4OavAtkNeRi3qqys1U,5632
-sqlalchemy/dialects/sqlite/pysqlcipher.py,sha256=di8rYryfL0KAn3pRGepmunHyIRGy-4Hhr-2q_ehPzss,5371
-sqlalchemy/dialects/sqlite/pysqlite.py,sha256=rg7F1S2UOhUu6Y1xNVaqF8VbA-FsRY_Y_XpGTpkKpGs,28087
-sqlalchemy/dialects/type_migration_guidelines.txt,sha256=-uHNdmYFGB7bzUNT6i8M5nb4j6j9YUKAtW4lcBZqsMg,8239
-sqlalchemy/engine/__init__.py,sha256=EF4haWCPu95WtWx1GzcHRJ_bBmtJMznno3I2TQ-ZIHE,2818
-sqlalchemy/engine/_py_processors.py,sha256=7QxgkVOd5h1Qd22qFh-pPZdM7RBRzNjj8lWAMWrilcI,3744
-sqlalchemy/engine/_py_row.py,sha256=yNdrZe36yw6mO7x0OEbG0dGojH7CQkNReIwn9LMUPUs,3787
-sqlalchemy/engine/_py_util.py,sha256=LdpbNRQIrJo3EkmiwNkM5bxGUf4uWuL5uS_u-zHadWc,2484
-sqlalchemy/engine/base.py,sha256=9kCWrDp3ECOlQ7BHK_efYAILo3-emcPSk4F8AFRgN7E,122901
-sqlalchemy/engine/characteristics.py,sha256=PepmGApo1sL01dS1qtSbmHplu9ZCdtuSegiGI7L7NZY,4765
-sqlalchemy/engine/create.py,sha256=4gFkqV7fgJbI1906DC4zDgFFX1-xJQ96GIHIrQuc-w4,33217
-sqlalchemy/engine/cursor.py,sha256=6KIZqlwWMUMv02w_el4uNYFMYcfc7eWbkAxW27UyDLE,76305
-sqlalchemy/engine/default.py,sha256=SHM6boxcDNk7MW_Eyd0zCb557Eqf8KTdX1iTUbS0DLw,84705
-sqlalchemy/engine/events.py,sha256=4_e6Ip32ar2Eb27R4ipamiKC-7Tpg4lVz3txabhT5Rc,37400
-sqlalchemy/engine/interfaces.py,sha256=fGmcrBt8yT78ty0R3e3XUvsPh7XYDU_b1JW3QhK_MwY,113029
-sqlalchemy/engine/mock.py,sha256=_aXG1xzj_TO5UWdz8IthPj1ZJ8IlhsKw6D9mmFN_frQ,4181
-sqlalchemy/engine/processors.py,sha256=XK32bULBkuVVRa703u4-SrTCDi_a18Dxq1M09QFBEPw,2379
-sqlalchemy/engine/reflection.py,sha256=_v9zCy3h28hN4KKIUTc5_7KJv7argSgi8A011b_iCdc,75383
-sqlalchemy/engine/result.py,sha256=rgny4qFLmpj80GSdFK35Dpgc3Qk2tc3eJPpahGWVR-M,77622
-sqlalchemy/engine/row.py,sha256=BPtAwsceiRxB9ANpDNM24uQ1M_Zs0xFkSXoKR_I8xyY,12031
-sqlalchemy/engine/strategies.py,sha256=-0rieXY-iXgV83OrJZr-wozFFQn3amKKHchQ6kL-r7A,442
-sqlalchemy/engine/url.py,sha256=gaEeSEJCD0nVEb8J02rIMASrd5L2wYdq5ZXJaj7szVI,31069
-sqlalchemy/engine/util.py,sha256=4OmXwFlmnq6_vBlfUBHnz5LrI_8bT3TwgynX4wcJfnw,5682
-sqlalchemy/event/__init__.py,sha256=ZjVxFGbt9neH5AC4GFiUN5IG2O4j6Z9v2LdmyagJi9w,997
-sqlalchemy/event/api.py,sha256=NetgcQfbURaZzoxus7_801YDG_LJ7PYqaC3T1lws114,8111
-sqlalchemy/event/attr.py,sha256=YhPXVBPj63Cfyn0nS6h8Ljq0SEbD3mtAZn9HYlzGbtw,20751
-sqlalchemy/event/base.py,sha256=OevVb82IrUoVgFRrjH4b5GquS5pjFHOgzWAxPwwTKMY,15127
-sqlalchemy/event/legacy.py,sha256=lGafKAOF6PY8Bz0AqhN9Q6n-lpXqFLwdv-0T6-UBpow,8227
-sqlalchemy/event/registry.py,sha256=MNEMyR8HZhzQFgxk4Jk_Em6nXTihmGXiSIwPdUnalPM,11144
-sqlalchemy/events.py,sha256=VBRvtckn9JS3tfUfi6UstqUrvQ15J2xamcDByFysIrI,525
-sqlalchemy/exc.py,sha256=AjFBCrOl_V4vQdGegn72Y951RSRMPL6T5qjxnFTGFbM,23978
-sqlalchemy/ext/__init__.py,sha256=BkTNuOg454MpCY9QA3FLK8td7KQhD1W74fOEXxnWibE,322
-sqlalchemy/ext/associationproxy.py,sha256=VhOFB1vB8hmDYQP90_VdpPI9IFzP3NENkG_eDKziVoI,66062
-sqlalchemy/ext/asyncio/__init__.py,sha256=kTIfpwsHWhqZ-VMOBZFBq66kt1XeF0hNuwOToEDe4_Y,1317
-sqlalchemy/ext/asyncio/base.py,sha256=2YQ-nKaHbAm--7q6vbxbznzdwT8oPwetwAarKyu2O8E,8930
-sqlalchemy/ext/asyncio/engine.py,sha256=fe_RZrO-5DiiEgMZ3g-Lti-fdaR7z_Q8gDfPUf-30EY,48198
-sqlalchemy/ext/asyncio/exc.py,sha256=npijuILDXH2p4Q5RzhHzutKwZ5CjtqTcP-U0h9TZUmk,639
-sqlalchemy/ext/asyncio/result.py,sha256=zhhXe13vMT7OfdfGXapgtn4crtiqqctRLb3ka4mmGXY,30477
-sqlalchemy/ext/asyncio/scoping.py,sha256=4f7MX3zUd-4rA8A5wd7j0_GlqCSUxdOPfYd7BBIxkJI,52587
-sqlalchemy/ext/asyncio/session.py,sha256=2wxu06UtJGyf-be2edMFkcK4eLMh8xuGmsAlGRj0YPM,63166
-sqlalchemy/ext/automap.py,sha256=n88mktqvExwjqfsDu3yLIA4wbOIWUpQ1S35Uw3X6ffQ,61675
-sqlalchemy/ext/baked.py,sha256=w3SeRoqnPkIhPL2nRAxfVhyir2ypsiW4kmtmUGKs8qo,17753
-sqlalchemy/ext/compiler.py,sha256=f7o4qhUUldpsx4F1sQoUvdVaT2BhiemqNBCF4r_uQUo,20889
-sqlalchemy/ext/declarative/__init__.py,sha256=SuVflXOGDxx2sB2QSTqNEvqS0fyhOkh3-sy2lRsSOLA,1818
-sqlalchemy/ext/declarative/extensions.py,sha256=yHUPcztU-5E1JrNyELDFWKchAnaYK6Y9-dLcqyc1nUI,19531
-sqlalchemy/ext/horizontal_shard.py,sha256=vouIehpQAuwT0HXyWyynTL3m_gcBuLcB-X8lDB0uQ8U,16691
-sqlalchemy/ext/hybrid.py,sha256=DkvNGtiQYzlEBvs1rYEDXhM8vJEXXh_6DMigsHH9w4k,52531
-sqlalchemy/ext/indexable.py,sha256=_dTOgCS96jURcQd9L-hnUMIJDe9KUMyd9gfH57vs078,11065
-sqlalchemy/ext/instrumentation.py,sha256=iCp89rvfK7buW0jJyzKTBDKyMsd06oTRJDItOk4OVSw,15707
-sqlalchemy/ext/mutable.py,sha256=7Zyh2kQq2gm3J_JwsddinIXk7qUuKWbPzRZOmTultEk,37560
-sqlalchemy/ext/mypy/__init__.py,sha256=yVNtoBDNeTl1sqRoA_fSY3o1g6M8NxqUVvAHPRLmFTw,241
-sqlalchemy/ext/mypy/apply.py,sha256=v_Svc1WiBz9yBXqBVBKoCuPGN286TfVmuuCVZPlbyzo,10591
-sqlalchemy/ext/mypy/decl_class.py,sha256=Nuca4ofHkASAkdqEQlULYB7iLm_KID7Mp384seDhVGg,17384
-sqlalchemy/ext/mypy/infer.py,sha256=29vgn22Hi8E8oIZL6UJCBl6oipiPSAQjxccCEkVb410,19367
-sqlalchemy/ext/mypy/names.py,sha256=hn889DD1nlF0f3drsKi5KSGTG-JefJ2UJrrIQ4L8QWA,10479
-sqlalchemy/ext/mypy/plugin.py,sha256=9YHBp0Bwo92DbDZIUWwIr0hwXPcE4XvHs0-xshvSwUw,9750
-sqlalchemy/ext/mypy/util.py,sha256=CuW2fJ-g9YtkjcypzmrPRaFc-rAvQTzW5A2-w5VTANg,9960
-sqlalchemy/ext/orderinglist.py,sha256=MROa19cm4RZkWXuUuqc1029r7g4HrAJRc17fTHeThvI,14431
-sqlalchemy/ext/serializer.py,sha256=_z95wZMTn3G3sCGN52gwzD4CuKjrhGMr5Eu8g9MxQNg,6169
-sqlalchemy/future/__init__.py,sha256=R1h8VBwMiIUdP3QHv_tFNby557425FJOAGhUoXGvCmc,512
-sqlalchemy/future/engine.py,sha256=2nJFBQAXAE8pqe1cs-D3JjC6wUX2ya2h2e_tniuaBq0,495
-sqlalchemy/inspection.py,sha256=qKEKG37N1OjxpQeVzob1q9VwWjBbjI1x0movJG7fYJ4,5063
-sqlalchemy/log.py,sha256=e_ztNUfZM08FmTWeXN9-doD5YKW44nXxgKCUxxNs6Ow,8607
-sqlalchemy/orm/__init__.py,sha256=BICvTXpLaTNe2AiUaxnZHWzjL5miT9fd_IU-ip3OFNk,8463
-sqlalchemy/orm/_orm_constructors.py,sha256=NiAagQ1060QYS9n5y_gzPvHQQz44EN1dVtamGVtde6E,103626
-sqlalchemy/orm/_typing.py,sha256=vaYRl4_K3n-sjc9u0Rb4eWWpBOoOi92--OHqaGogRvA,4973
-sqlalchemy/orm/attributes.py,sha256=e_U0A4TGWAzL3yXVvk9YVhIRjKM4RTsIE2PNRLn8LbU,92534
-sqlalchemy/orm/base.py,sha256=oCgscNoRrqHwYvc1Iz8ZFhoVXhalu45g9z0m_7_ldaE,27502
-sqlalchemy/orm/bulk_persistence.py,sha256=Ciea9MhJ6ZbAi-uGy5-Kj6lodO9bfRqPq8GSf2qFshE,72663
-sqlalchemy/orm/clsregistry.py,sha256=syn6bB-Ylx-juh5GDCmNrPZ58C-z6sdwRkbZFeKysQU,17974
-sqlalchemy/orm/collections.py,sha256=XxZC8d9UX9E2R-WlNH198OPWRPmpLuYt0Y26LrdbuHc,52252
-sqlalchemy/orm/context.py,sha256=eyh7xTo3SyxIHl8_NBUqJ_GpJ0kZtmnTt32Z67cfqgs,112973
-sqlalchemy/orm/decl_api.py,sha256=SJ25fQjjKyWZDQbq5S69eiybpOzns0LkRziP10iW5-E,64969
-sqlalchemy/orm/decl_base.py,sha256=ZlZmyNVOsCPA_pThMeXuWmAhlJwlvTxdGXhnARsKxhk,83288
-sqlalchemy/orm/dependency.py,sha256=4NMhoogevOiX1Wm5B1_yY2u9MHYlIjJNNoEVRE0yLwA,47631
-sqlalchemy/orm/descriptor_props.py,sha256=LgfdiO_U5uznq5ImenfbWGV5T47bH4b_ztbzB4B7FsU,37231
-sqlalchemy/orm/dynamic.py,sha256=Z4GpcVL8rM8gi0bytQOZXw-_kKi-sExbRWGjU30dK3g,9816
-sqlalchemy/orm/evaluator.py,sha256=PKrUW1zEOvmv1XEgc_hBdYqNcyk4zjWr_rJhCEQBFIc,12353
-sqlalchemy/orm/events.py,sha256=OZtTCpI-DVaE6CY16e42GUVpci1U1GjdNO76xU-Tj5Y,127781
-sqlalchemy/orm/exc.py,sha256=zJgAIofYsWKjktqO5MFxze95GlJASziEOJJx-P5_wOU,7413
-sqlalchemy/orm/identity.py,sha256=5NFtF9ZPZWAOmtOqCPyVX2-_pQq9A5XeN2ns3Wirpv8,9249
-sqlalchemy/orm/instrumentation.py,sha256=WhElvvOWOn3Fuc-Asc5HmcKDX6EzFtBleLJKPZEc5A0,24321
-sqlalchemy/orm/interfaces.py,sha256=W6ADDLOixmm4tnSnUP_I9HFLj9MCO2bODk_WTNjkZGA,48797
-sqlalchemy/orm/loading.py,sha256=6Rd1hWtBPm7SfCUpjPQrcoUg_DSCcfhO8Qhz7SScjRE,58277
-sqlalchemy/orm/mapped_collection.py,sha256=FAqaTlOUCYqdws2KR_fW0T8mMWIrLuAxJGU5f4W1aGs,19682
-sqlalchemy/orm/mapper.py,sha256=-gkJKHeAJmIFT153WFIIySduyyLGbT5plCgSfnsa0I0,171668
-sqlalchemy/orm/path_registry.py,sha256=-aAEhGkDf_2ZUXmHQICQNOa4Z5xhTlhlYLag7eoVpxE,25920
-sqlalchemy/orm/persistence.py,sha256=Uz45Cwxi7FnNiSk2crbh3TzV7b9kb85vmcvOwy5NVmw,61701
-sqlalchemy/orm/properties.py,sha256=vbx_YiSjj3tI94-G-_ghbyWYcIIJQQeGG1P-0RC8Jv4,29065
-sqlalchemy/orm/query.py,sha256=GI_go9ErXYK1BteCmIh5E9iv-jfMJkRBVIlw0XmnYyk,118540
-sqlalchemy/orm/relationships.py,sha256=C40n_-oliMgJJ0FHfwsi1-dm963CrYeKJ5HEYjLdg_o,128899
-sqlalchemy/orm/scoping.py,sha256=-SNRAewfMJ4x4Um8X-yv0k1Thz8E1_kCBmbmG1l1auo,78617
-sqlalchemy/orm/session.py,sha256=1fzksIcb9DtKcwqkS1KkZngkrEYGUHmoNW_o6l8IXQ4,196114
-sqlalchemy/orm/state.py,sha256=1vtlz674sGFmwZ8Ih9TdrslA-0nhU2G52WgV-FoG2j0,37670
-sqlalchemy/orm/state_changes.py,sha256=XJLYYhTZu7nA6uD7xupbLZ9XSzqLYwrDJgW0ZAWvVGE,6815
-sqlalchemy/orm/strategies.py,sha256=qziXv4z2bJeF2qFSj6wogc9BLlxuOnT8nOcEvocVf88,119866
-sqlalchemy/orm/strategy_options.py,sha256=wMYd4E_nRb5ei8Fr3jWeSewNY2k1-AfqtYRGOLiHOFA,85043
-sqlalchemy/orm/sync.py,sha256=RdoxnhvgNjn3Lhtoq4QjvXpj8qfOz__wyibh0FMON0A,5779
-sqlalchemy/orm/unitofwork.py,sha256=hkSIcVonoSt0WWHk019bCDEw0g2o2fg4m4yqoTGyAoo,27033
-sqlalchemy/orm/util.py,sha256=rtClCjtg0eSSC8k-L30W0v6BauJaJuh9Nf-MSqofWuQ,80831
-sqlalchemy/orm/writeonly.py,sha256=R-MVxYDw0ZQ795H21yBtgGSZXWUzSovcb_SO1mv5hoI,22305
-sqlalchemy/pool/__init__.py,sha256=niqzCv2uOZT07DOiV2inlmjrW3lZyqDXGCjnOl1IqJ4,1804
-sqlalchemy/pool/base.py,sha256=mT-PHTlVUGcYRVsMB9LQwNgndjhOTOorWX5-hNRi2FM,52236
-sqlalchemy/pool/events.py,sha256=wdFfvat0fSrVF84Zzsz5E3HnVY0bhL7MPsGME-b2qa8,13149
-sqlalchemy/pool/impl.py,sha256=MLSh83SGNNtZZgZvA-5tvTIT8Dz7U95Bgt8HO_oR1Ps,18944
-sqlalchemy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sqlalchemy/schema.py,sha256=yt4dcuMAKMleUHVidsAVAsm-JPpASFZXP2xM3pmzYHY,3194
-sqlalchemy/sql/__init__.py,sha256=Y-bZ25Zf-bxqsF2zUkpRGTjFuozNNVQHxUJV3Qmaq2M,5820
-sqlalchemy/sql/_dml_constructors.py,sha256=JF_XucNTfAk6Vz9fYiPWOgpIGtUkDj6VPILysLcrVhk,3795
-sqlalchemy/sql/_elements_constructors.py,sha256=eoQhkoRH0qox171ZSODyxxhj_HZEhO64rSowaN-I-v4,62630
-sqlalchemy/sql/_orm_types.py,sha256=0zeMit-V4rYZe-bB9X3xugnjFnPXH0gmeqkJou9Fows,625
-sqlalchemy/sql/_py_util.py,sha256=4KFXNvBq3hhfrr-A1J1uBml3b3CGguIf1dat9gsEHqE,2173
-sqlalchemy/sql/_selectable_constructors.py,sha256=fwVBsDHHWhngodBG205nvhM-Tb3uR1srbCnN3mPgrjA,18785
-sqlalchemy/sql/_typing.py,sha256=zYKlxXnUW_KIkGuBmBnzj-vFG1QON8_F9JN1dl9KSiM,12771
-sqlalchemy/sql/annotation.py,sha256=qHUEwbdmMD3Ybr0ez-Dyiw9l9UB_RUMHWAUIeO_r3gE,18245
-sqlalchemy/sql/base.py,sha256=kfmVNRimU5z6X6OKqMLMs1bDCFQ47BeyF_MZc23nkjY,73848
-sqlalchemy/sql/cache_key.py,sha256=ET2OIQ6jZK2FSxsdnCvhLCrNJ2Fp3zipQ-gvINgAjhQ,33668
-sqlalchemy/sql/coercions.py,sha256=lRciS5agnpVvx_vHYxJV-aN6QOVb_O4yCnMZ0s07GUE,40750
-sqlalchemy/sql/compiler.py,sha256=eT_zrKvApimVfycvcTdubQK8-QAzGHm5xWKdhOgnWUY,274965
-sqlalchemy/sql/crud.py,sha256=vFegNw5557ayS4kv761zh0bx0yikEKh1ovMrhErHelg,56514
-sqlalchemy/sql/ddl.py,sha256=rfb7gDvLmn_ktgH2xiXLRTczqnMOED1eakXuGuRPklg,45641
-sqlalchemy/sql/default_comparator.py,sha256=uXLr8B-X6KbybwTjLjZ2hN-WZAvqoMhZ-DDHJX7rAUw,16707
-sqlalchemy/sql/dml.py,sha256=oTW8PB-55qf6crAkbxh2JD-TvkT3MO1zqkKDrt5-2c8,65611
-sqlalchemy/sql/elements.py,sha256=RYq5N-IEPnhcDKtokeaCDIGZiUex8oDgwRLCDqjkk_g,176482
-sqlalchemy/sql/events.py,sha256=iWjc_nm1vClDBLg4ZhDnY75CkBdnlDPSPe0MGBSmbiM,18312
-sqlalchemy/sql/expression.py,sha256=rw5tAm8vbd5Vm4MofTZ0ZcXsphz4z9xO_exy-gem6TM,7586
-sqlalchemy/sql/functions.py,sha256=tbBxIeAqLV3kc1YDxyt68mxw0fFy6e93ctRUZSuuf3I,63858
-sqlalchemy/sql/lambdas.py,sha256=h9sPCETBgAanLtVHQsRPHeY-hTEjM5nscq3m4bDstwM,49196
-sqlalchemy/sql/naming.py,sha256=BU0ZdSzXXKHTPhoaKMWJ3gPMoeZSJJe9-3YDYflmjJw,6858
-sqlalchemy/sql/operators.py,sha256=h5bgu31gukGdsYsN_0-1C7IGAdSCFpBxuRjOUnu1Two,76792
-sqlalchemy/sql/roles.py,sha256=drAeWbevjgFAKNcMrH_EuJ-9sSvcq4aeXwAqMXXZGYw,7662
-sqlalchemy/sql/schema.py,sha256=WKKwxkC9oNRHN-B4s35NkWcr5dvavccKf-_1t35Do8A,229896
-sqlalchemy/sql/selectable.py,sha256=5Za7eh4USrgVwJgQGVX1bb2w1qXcy-hGzGpWNPbhf68,237610
-sqlalchemy/sql/sqltypes.py,sha256=yXHvZXfZJmaRvMoX4_jXqazAev33pk0Ltwl5c-D5Ha4,128609
-sqlalchemy/sql/traversals.py,sha256=7GALHt5mFceUv2SMUikIdAb9SUcSbACqhwoei5rPkxc,33664
-sqlalchemy/sql/type_api.py,sha256=wdi3nmOBRdhG6L1z21V_PwQGB8CIRouMdNKoIzJA4Zo,84440
-sqlalchemy/sql/util.py,sha256=G-2ZI6rZ7XxVu5YXaVvLrApeAk5VwSG4C--lqtglgGE,48086
-sqlalchemy/sql/visitors.py,sha256=URpw-GxxUkwjEDbD2xXJGyFJavG5lN6ISoY34JlYRS8,36319
-sqlalchemy/testing/__init__.py,sha256=GgUEqxUNCxg-92_GgBDnljUHsdCxaGPMG1TWy5tjwgk,3160
-sqlalchemy/testing/assertions.py,sha256=RFTkxGq-kDvn3JSUuT_6bU1y0vtoI6pE6ryZgV2YEx4,31439
-sqlalchemy/testing/assertsql.py,sha256=cmhtZrgPBjrqIfzFz3VBWxVNvxWoRllvmoWcUCoqsio,16817
-sqlalchemy/testing/asyncio.py,sha256=QsMzDWARFRrpLoWhuYqzYQPTUZ80fymlKrqOoDkmCmQ,3830
-sqlalchemy/testing/config.py,sha256=HySdB5_FgCW1iHAJVxYo-4wq5gUAEi0N8E93IC6M86Q,12058
-sqlalchemy/testing/engines.py,sha256=c1gFXfpo5S1dvNjGIL03mbW2eVYtUD_9M_ZEfQO2ArM,13414
-sqlalchemy/testing/entities.py,sha256=KdgTVPSALhi9KkAXj2giOYl62ld-1yZziIDBSV8E3vw,3354
-sqlalchemy/testing/exclusions.py,sha256=jzVrBXqyQlyMgvfChMjJOd0ZtReKgkJ4Ik-0mkWe6KM,12460
-sqlalchemy/testing/fixtures/__init__.py,sha256=e5YtfSlkKDRuyIZhEKBCycMX5BOO4MZ-0d97l1JDhJE,1198
-sqlalchemy/testing/fixtures/base.py,sha256=y5iEEdUZIft06fvAOXwKU73ciIFTO5AVgDDGzYD9nOY,12256
-sqlalchemy/testing/fixtures/mypy.py,sha256=9fuJ90F9LBki26dVEVOEtRVXG2koaK803k4nukTnA8o,11973
-sqlalchemy/testing/fixtures/orm.py,sha256=3JJoYdI2tj5-LL7AN8bVa79NV3Guo4d9p6IgheHkWGc,6095
-sqlalchemy/testing/fixtures/sql.py,sha256=ht-OD6fMZ0inxucRzRZG4kEMNicqY8oJdlKbZzHhAJc,15900
-sqlalchemy/testing/pickleable.py,sha256=G3L0xL9OtbX7wThfreRjWd0GW7q0kUKcTUuCN5ETGno,2833
-sqlalchemy/testing/plugin/__init__.py,sha256=vRfF7M763cGm9tLQDWK6TyBNHc80J1nX2fmGGxN14wY,247
-sqlalchemy/testing/plugin/bootstrap.py,sha256=VYnVSMb-u30hGY6xGn6iG-LqiF0CubT90AJPFY_6UiY,1685
-sqlalchemy/testing/plugin/plugin_base.py,sha256=TBWdg2XgXB6QgUUFdKLv1O9-SXMitjHLm2rNNIzXZhQ,21578
-sqlalchemy/testing/plugin/pytestplugin.py,sha256=0rRCp7RlnhJBg3gJEq0t0kJ-BCTQ34bqBE_lEQk5U3U,27656
-sqlalchemy/testing/profiling.py,sha256=SWhWiZImJvDsNn0rQyNki70xdNxZL53ZI98ihxiykbQ,10148
-sqlalchemy/testing/provision.py,sha256=6r2FTnm-t7u8MMbWo7eMhAH3qkL0w0WlmE29MUSEIu4,14702
-sqlalchemy/testing/requirements.py,sha256=MVuTKtZjeTZaYlrAU8XFIB1bhJA_AedqL_q7NwVEGiw,52956
-sqlalchemy/testing/schema.py,sha256=IImFumAdpzOyoKAs0WnaGakq8D3sSU4snD9W4LVOV3s,6513
-sqlalchemy/testing/suite/__init__.py,sha256=S8TLwTiif8xX67qlZUo5I9fl9UjZAFGSzvlptp2WoWc,722
-sqlalchemy/testing/suite/test_cte.py,sha256=d3OWDBNhnAwlyAz_QhFk-vKSWaAI3mADVnqdtTWOuwI,6451
-sqlalchemy/testing/suite/test_ddl.py,sha256=MItp-votCzvahlRqHRagte2Omyq9XUOFdFsgzCb6_-g,12031
-sqlalchemy/testing/suite/test_deprecations.py,sha256=7C6IbxRmq7wg_DLq56f1V5RCS9iVrAv3epJZQTB-dOo,5337
-sqlalchemy/testing/suite/test_dialect.py,sha256=eGJFZCwKmLrIl66ZlkLLZf5Fq6bzWI174gQsJt2bY2c,22923
-sqlalchemy/testing/suite/test_insert.py,sha256=pR0VWMQ9JJPbnANE6634PzR0VFmWMF8im6OTahc4vsQ,18824
-sqlalchemy/testing/suite/test_reflection.py,sha256=EJvTjRDimw9k90zlI5VCkmCzf7Tv5VF9y4O3D8SZMFU,109648
-sqlalchemy/testing/suite/test_results.py,sha256=9FFBNLeXcNRIC9FHfEjFKwfV6w2Bb58ulml_M8Zdokg,16914
-sqlalchemy/testing/suite/test_rowcount.py,sha256=UVyHHQsU0TxkzV_dqCOKR1aROvIq7frKYMVjwUqLWfE,7900
-sqlalchemy/testing/suite/test_select.py,sha256=S81w-Dox6W29Tjmi6LIBJ4HuB5E8dDAzmePDm0PKTYo,61732
-sqlalchemy/testing/suite/test_sequence.py,sha256=DMqyJkL1o4GClrNjzoy7GDn_jPNPTZNvk9t5e-MVXeo,9923
-sqlalchemy/testing/suite/test_types.py,sha256=gPA6t-90Icnpj2ZzITwbqka1DB-rNOoh6_xS9dC-4HU,67805
-sqlalchemy/testing/suite/test_unicode_ddl.py,sha256=0zVc2e3zbCQag_xL4b0i7F062HblHwV46JHLMweYtcE,6141
-sqlalchemy/testing/suite/test_update_delete.py,sha256=_OxH0wggHUqPImalGEPI48RiRx6mO985Om1PtRYOCzA,3994
-sqlalchemy/testing/util.py,sha256=KsUInolFBXUPIXVZKAdb_8rQrW8yW8OCtiA3GXuYRvA,14571
-sqlalchemy/testing/warnings.py,sha256=sj4vfTtjodcfoX6FPH_Zykb4fomjmgqIYj81QPpSwH8,1546
-sqlalchemy/types.py,sha256=m3I9h6xoyT7cjeUx5XCzmaE-GHT2sJVwECiuSJl75Ss,3168
-sqlalchemy/util/__init__.py,sha256=tYWkZV6PYVfEW32zt48FCLH12VyV_kaNUa3KBAOYpSM,8312
-sqlalchemy/util/_collections.py,sha256=RbP4UixqNtRBUrl_QqYDiadVmELSVxxXm2drhvQaIKo,20078
-sqlalchemy/util/_concurrency_py3k.py,sha256=UtPDkb67OOVWYvBqYaQgENg0k_jOA2mQOE04XmrbYq0,9170
-sqlalchemy/util/_has_cy.py,sha256=3oh7s5iQtW9qcI8zYunCfGAKG6fzo2DIpzP5p1BnE8Q,1247
-sqlalchemy/util/_py_collections.py,sha256=irOg3nkzxmtdYfIS46un2cp0JqSiACI7WGQBg-BaEXU,16714
-sqlalchemy/util/compat.py,sha256=TdDfvL21VnBEdSUnjcx-F8XhmVFg9Mvyr67a4omWZAM,8760
-sqlalchemy/util/concurrency.py,sha256=eQVS3YDH3GwB3Uw5pbzmqEBSYTK90EbnE5mQ05fHERg,3304
-sqlalchemy/util/deprecations.py,sha256=L7D4GqeIozpjO8iVybf7jL9dDlgfTbAaQH4TQAX74qE,12012
-sqlalchemy/util/langhelpers.py,sha256=G67avnsStFbslILlbCHmsyAMnShS7RYftFr9a8uFDL8,65140
-sqlalchemy/util/preloaded.py,sha256=RMarsuhtMW8ZuvqLSuR0kwbp45VRlzKpJMLUe7p__qY,5904
-sqlalchemy/util/queue.py,sha256=w1ufhuiC7lzyiZDhciRtRz1uyxU72jRI7SWhhL-p600,10185
-sqlalchemy/util/tool_support.py,sha256=e7lWu6o1QlKq4e6c9PyDsuyFyiWe79vO72UQ_YX2pUA,6135
-sqlalchemy/util/topological.py,sha256=HcJgdCeU0XFIskgIBnTaHXfRXaulaEJRYRwKv4yPNek,3458
-sqlalchemy/util/typing.py,sha256=C4jF7QTNo0w0bjvcIqSSTOvoy8FttuZtyTzjiyoIzQQ,20920
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/WHEEL b/libs/SQLAlchemy-2.0.37.dist-info/WHEEL
deleted file mode 100644
index 42e750dfb3..0000000000
--- a/libs/SQLAlchemy-2.0.37.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: false
-Tag: cp38-cp38-macosx_12_0_x86_64
-
diff --git a/libs/Unidecode-1.3.8.dist-info/METADATA b/libs/Unidecode-1.3.8.dist-info/METADATA
deleted file mode 100644
index 5c7086b9e8..0000000000
--- a/libs/Unidecode-1.3.8.dist-info/METADATA
+++ /dev/null
@@ -1,310 +0,0 @@
-Metadata-Version: 2.1
-Name: Unidecode
-Version: 1.3.8
-Summary: ASCII transliterations of Unicode text
-Author: Tomaz Solc
-Author-email: tomaz.solc@tablix.org
-License: GPL
-Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Text Processing
-Classifier: Topic :: Text Processing :: Filters
-Requires-Python: >=3.5
-License-File: LICENSE
-
-Unidecode, lossy ASCII transliterations of Unicode text
-=======================================================
-
-It often happens that you have text data in Unicode, but you need to
-represent it in ASCII. For example when integrating with legacy code that
-doesn't support Unicode, or for ease of entry of non-Roman names on a US
-keyboard, or when constructing ASCII machine identifiers from human-readable
-Unicode strings that should still be somewhat intelligible. A popular example
-of this is when making an URL slug from an article title.
-
-**Unidecode is not a replacement for fully supporting Unicode for strings in
-your program. There are a number of caveats that come with its use,
-especially when its output is directly visible to users. Please read the rest
-of this README before using Unidecode in your project.**
-
-In most of examples listed above you could represent Unicode characters as
-``???`` or ``\\15BA\\15A0\\1610``, to mention two extreme cases. But that's
-nearly useless to someone who actually wants to read what the text says.
-
-What Unidecode provides is a middle road: the function ``unidecode()`` takes
-Unicode data and tries to represent it in ASCII characters (i.e., the
-universally displayable characters between 0x00 and 0x7F), where the
-compromises taken when mapping between two character sets are chosen to be
-near what a human with a US keyboard would choose.
-
-The quality of resulting ASCII representation varies. For languages of
-western origin it should be between perfect and good. On the other hand
-transliteration (i.e., conveying, in Roman letters, the pronunciation
-expressed by the text in some other writing system) of languages like
-Chinese, Japanese or Korean is a very complex issue and this library does
-not even attempt to address it. It draws the line at context-free
-character-by-character mapping. So a good rule of thumb is that the further
-the script you are transliterating is from Latin alphabet, the worse the
-transliteration will be.
-
-Generally Unidecode produces better results than simply stripping accents from
-characters (which can be done in Python with built-in functions). It is based
-on hand-tuned character mappings that for example also contain ASCII
-approximations for symbols and non-Latin alphabets.
-
-**Note that some people might find certain transliterations offending.** Most
-common examples include characters that are used in multiple languages. A user
-expects a character to be transliterated in their language but Unidecode uses a
-transliteration for a different language. It's best to not use Unidecode for
-strings that are directly visible to users of your application. See also the
-*Frequently Asked Questions* section for more info on common problems.
-
-This is a Python port of ``Text::Unidecode`` Perl module by Sean M. Burke
-<sburke@cpan.org>.
-
-
-Module content
---------------
-
-This library contains a function that takes a string object, possibly
-containing non-ASCII characters, and returns a string that can be safely
-encoded to ASCII::
-
-    >>> from unidecode import unidecode
-    >>> unidecode('koลพuลกฤek')
-    'kozuscek'
-    >>> unidecode('30 \U0001d5c4\U0001d5c6/\U0001d5c1')
-    '30 km/h'
-    >>> unidecode('\u5317\u4EB0')
-    'Bei Jing '
-
-You can also specify an *errors* argument to ``unidecode()`` that determines
-what Unidecode does with characters that are not present in its transliteration
-tables. The default is ``'ignore'`` meaning that Unidecode will ignore those
-characters (replace them with an empty string). ``'strict'`` will raise a
-``UnidecodeError``. The exception object will contain an *index* attribute that
-can be used to find the offending character. ``'replace'`` will replace them
-with ``'?'`` (or another string, specified in the *replace_str* argument).
-``'preserve'`` will keep the original, non-ASCII character in the string. Note
-that if ``'preserve'`` is used the string returned by ``unidecode()`` will not
-be ASCII-encodable!::
-
-    >>> unidecode('\ue000') # unidecode does not have replacements for Private Use Area characters
-    ''
-    >>> unidecode('\ue000', errors='strict')
-    Traceback (most recent call last):
-    ...
-    unidecode.UnidecodeError: no replacement found for character '\ue000' in position 0
-
-A utility is also included that allows you to transliterate text from the
-command line in several ways. Reading from standard input::
-
-    $ echo hello | unidecode
-    hello
-
-from a command line argument::
-
-    $ unidecode -c hello
-    hello
-
-or from a file::
-
-    $ unidecode hello.txt
-    hello
-
-The default encoding used by the utility depends on your system locale. You can
-specify another encoding with the ``-e`` argument. See ``unidecode --help`` for
-a full list of available options.
-
-Requirements
-------------
-
-Nothing except Python itself. Unidecode supports Python 3.5 or later.
-
-You need a Python build with "wide" Unicode characters (also called "UCS-4
-build") in order for Unidecode to work correctly with characters outside of
-Basic Multilingual Plane (BMP). Common characters outside BMP are bold, italic,
-script, etc. variants of the Latin alphabet intended for mathematical notation.
-Surrogate pair encoding of "narrow" builds is not supported in Unidecode.
-
-If your Python build supports "wide" Unicode the following expression will
-return True::
-
-    >>> import sys
-    >>> sys.maxunicode > 0xffff
-    True
-
-See `PEP 261 <https://www.python.org/dev/peps/pep-0261/>`_ for details
-regarding support for "wide" Unicode characters in Python.
-
-
-Installation
-------------
-
-To install the latest version of Unidecode from the Python package index, use
-these commands::
-
-    $ pip install unidecode
-
-To install Unidecode from the source distribution and run unit tests, use::
-
-    $ python setup.py install
-    $ python setup.py test
-
-Frequently asked questions
---------------------------
-
-German umlauts are transliterated incorrectly
-    Latin letters "a", "o" and "u" with diaeresis are transliterated by
-    Unidecode as "a", "o", "u", *not* according to German rules "ae", "oe",
-    "ue". This is intentional and will not be changed. Rationale is that these
-    letters are used in languages other than German (for example, Finnish and
-    Turkish). German text transliterated without the extra "e" is much more
-    readable than other languages transliterated using German rules. A
-    workaround is to do your own replacements of these characters before
-    passing the string to ``unidecode()``.
-
-Japanese Kanji is transliterated as Chinese
-    Same as with Latin letters with accents discussed in the answer above, the
-    Unicode standard encodes letters, not letters in a certain language or
-    their meaning. With Japanese and Chinese this is even more evident because
-    the same letter can have very different transliterations depending on the
-    language it is used in. Since Unidecode does not do language-specific
-    transliteration (see next question), it must decide on one. For certain
-    characters that are used in both Japanese and Chinese the decision was to
-    use Chinese transliterations. If you intend to transliterate Japanese,
-    Chinese or Korean text please consider using other libraries which do
-    language-specific transliteration, such as `Unihandecode
-    <https://github.com/miurahr/unihandecode>`_.
-
-Unidecode should support localization (e.g. a language or country parameter, inspecting system locale, etc.)
-    Language-specific transliteration is a complicated problem and beyond the
-    scope of this library. Changes related to this will not be accepted. Please
-    consider using other libraries which do provide this capability, such as
-    `Unihandecode <https://github.com/miurahr/unihandecode>`_.
-
-Unidecode should automatically detect the language of the text being transliterated
-    Language detection is a completely separate problem and beyond the scope of
-    this library.
-
-Unidecode should use a permissive license such as MIT or the BSD license.
-    The maintainer of Unidecode believes that providing access to source code
-    on redistribution is a fair and reasonable request when basing products on
-    voluntary work of many contributors. If the license is not suitable for
-    you, please consider using other libraries, such as `text-unidecode
-    <https://github.com/kmike/text-unidecode>`_.
-
-Unidecode produces completely wrong results (e.g. "u" with diaeresis transliterating as "A 1/4 ")
-    The strings you are passing to Unidecode have been wrongly decoded
-    somewhere in your program. For example, you might be decoding utf-8 encoded
-    strings as latin1. With a misconfigured terminal, locale and/or a text
-    editor this might not be immediately apparent. Inspect your strings with
-    ``repr()`` and consult the
-    `Unicode HOWTO <https://docs.python.org/3/howto/unicode.html>`_.
-
-Why does Unidecode not replace \\u and \\U backslash escapes in my strings?
-    Unidecode knows nothing about escape sequences. Interpreting these sequences
-    and replacing them with actual Unicode characters in string literals is the
-    task of the Python interpreter. If you are asking this question you are
-    very likely misunderstanding the purpose of this library. Consult the
-    `Unicode HOWTO <https://docs.python.org/3/howto/unicode.html>`_ and possibly
-    the ``unicode_escape`` encoding in the standard library.
-
-I've upgraded Unidecode and now some URLs on my website return 404 Not Found.
-    This is an issue with the software that is running your website, not
-    Unidecode. Occasionally, new versions of Unidecode library are released
-    which contain improvements to the transliteration tables. This means that
-    you cannot rely that ``unidecode()`` output will not change across
-    different versions of Unidecode library. If you use ``unidecode()`` to
-    generate URLs for your website, either generate the URL slug once and store
-    it in the database or lock your dependency of Unidecode to one specific
-    version.
-
-Some of the issues in this section are discussed in more detail in `this blog
-post <https://www.tablix.org/~avian/blog/archives/2013/09/python_unidecode_release_0_04_14/>`_.
-
-
-Performance notes
------------------
-
-By default, ``unidecode()`` optimizes for the use case where most of the strings
-passed to it are already ASCII-only and no transliteration is necessary (this
-default might change in future versions).
-
-For performance critical applications, two additional functions are exposed:
-
-``unidecode_expect_ascii()`` is optimized for ASCII-only inputs (approximately
-5 times faster than ``unidecode_expect_nonascii()`` on 10 character strings,
-more on longer strings), but slightly slower for non-ASCII inputs.
-
-``unidecode_expect_nonascii()`` takes approximately the same amount of time on
-ASCII and non-ASCII inputs, but is slightly faster for non-ASCII inputs than
-``unidecode_expect_ascii()``.
-
-Apart from differences in run time, both functions produce identical results.
-For most users of Unidecode, the difference in performance should be
-negligible.
-
-
-Source
-------
-
-You can get the latest development version of Unidecode with::
-
-    $ git clone https://www.tablix.org/~avian/git/unidecode.git
-
-There is also an official mirror of this repository on GitHub at
-https://github.com/avian2/unidecode
-
-
-Contact
--------
-
-Please make sure to read the `Frequently asked questions`_ section above before
-contacting the maintainer.
-
-Bug reports, patches and suggestions for Unidecode can be sent to
-tomaz.solc@tablix.org.
-
-Alternatively, you can also open a ticket or pull request at
-https://github.com/avian2/unidecode
-
-
-Copyright
----------
-
-Original character transliteration tables:
-
-Copyright 2001, Sean M. Burke <sburke@cpan.org>, all rights reserved.
-
-Python code and later additions:
-
-Copyright 2024, Tomaลพ ล olc <tomaz.solc@tablix.org>
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to the Free Software Foundation, Inc., 51
-Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  The programs and
-documentation in this dist are distributed in the hope that they will be
-useful, but without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose.
-
-..
-    vim: set filetype=rst:
diff --git a/libs/Unidecode-1.3.8.dist-info/RECORD b/libs/Unidecode-1.3.8.dist-info/RECORD
deleted file mode 100644
index 92b5732cab..0000000000
--- a/libs/Unidecode-1.3.8.dist-info/RECORD
+++ /dev/null
@@ -1,203 +0,0 @@
-../../bin/unidecode,sha256=NbqWJOWfXecMdJfbAD2hnDahz-mDBHIWjTSidYHnxSA,236
-Unidecode-1.3.8.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-Unidecode-1.3.8.dist-info/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-Unidecode-1.3.8.dist-info/METADATA,sha256=TjOEznFzIHnDfx8CRJjrHfMWiIOOa6drPp6zqa0Obc4,13615
-Unidecode-1.3.8.dist-info/RECORD,,
-Unidecode-1.3.8.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Unidecode-1.3.8.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-Unidecode-1.3.8.dist-info/entry_points.txt,sha256=zjje8BrCWj_5MDf7wASbnNdeWYxxdt5BuTQI9x8c_24,50
-Unidecode-1.3.8.dist-info/top_level.txt,sha256=4uYNG2l04s0dm0mEQmPLo2zrjLbhLPKUesLr2dOTdpo,10
-unidecode/__init__.py,sha256=uUP370Iden1EsQtgglNd57DMKOG5mXh9UxIMm8yhDfQ,4230
-unidecode/__main__.py,sha256=VWYWCclyJsdhtNMQtryMFbgsCZtNUsWcEuS7ZOlH1Jc,40
-unidecode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-unidecode/util.py,sha256=ZxssZFzbZlAf6oiDIu2HZjrAQckbOD2VPD9uy-wZgCI,1652
-unidecode/x000.py,sha256=DaoVzSCvFzhzHbFtzFOE8uS9CgWD7K3JuhmACpFbivY,3038
-unidecode/x001.py,sha256=ylHh3UVaPtibVuUEEWvdSeDFK0OXrWt4-LnxAgYD6qo,3891
-unidecode/x002.py,sha256=NWord8myi2jYV4YwlNZFbKu6HgbbolWLNCOlseR3WsY,3871
-unidecode/x003.py,sha256=5gZS5aXbQ4Z8aH08EehKx4SqAgUNBcTz_x-I3o5qvVg,3825
-unidecode/x004.py,sha256=KAeJjKgkdzMU1MK9J9JqmPeKBDgjhG5UcfyAa594Hk8,4054
-unidecode/x005.py,sha256=7ezPyF52iKiK5LPf6TA5zVUZ7RbIjz7EVLS42aXG9ug,3920
-unidecode/x006.py,sha256=Jye83eXYQqtpowxsQ01jQSDlhAjWbmGNFRdmbojvgyE,3912
-unidecode/x007.py,sha256=6lnnnArEmvi3XeZLFwrCZGStdDKDAHt7alIpdo8S7rk,3987
-unidecode/x009.py,sha256=xNz8qrO1PDseMjOwA0rjsiAhNZTO_uFgjpmbp7qcH_c,4013
-unidecode/x00a.py,sha256=2xksKrrMWF9xLbs8OPfTxT7g86ciwdK9QZ8AQeecmus,4019
-unidecode/x00b.py,sha256=Y7GlfYE2v-D3BkZd3ctfo6L21VG-aR2OFESRb8_WRH4,4019
-unidecode/x00c.py,sha256=jOGpNU7vxghp3jwUuUATiSrDwvgZuOe8nlkcjJYTHco,4007
-unidecode/x00d.py,sha256=lkFf8d_oXN8IZop6CFlYpKdWuJqWGnH0WQMwir4_WgI,4025
-unidecode/x00e.py,sha256=ARKK__sIXUXL4h2Egac2f9ng2Z_YCGD5kYP2oj-ptlI,3989
-unidecode/x00f.py,sha256=TdSmr755Jw1TRtxk5Z4UPZIp1CVhXii8S0zSAcQ2vWk,3998
-unidecode/x010.py,sha256=YhXX8s1dP7YJMzaaV9CMBCOraExb6QrQQWbkFT3d2Jo,4011
-unidecode/x011.py,sha256=bc5lAse0haio2pceaADqkjzTh8MdgNTwTh04W2FJO-Q,4120
-unidecode/x012.py,sha256=XoiRFvNtHV29Q76KcpPBSrC4sLd6faTz4tKZEMIQ45M,4293
-unidecode/x013.py,sha256=UkxSb2Q4xq7dydCZNg_f0Nu90slVSmAckq-btDZ7uAA,4190
-unidecode/x014.py,sha256=4R3w_Dgg9yCw-9KkpqHfWFzyQZZfdb444fMIh240l-Q,4298
-unidecode/x015.py,sha256=TB6O4l2qPxbmF2dejlxXLqX5tTfjl95cMYx1770GHs0,4329
-unidecode/x016.py,sha256=Tx3P-DjDqCLuKbmiG-0cMzw2xFVuojQg3o5yyt4506E,4114
-unidecode/x017.py,sha256=Ks_t-4BgOrTqmqYC6BpqXePI-YyStE7p3P27lzBefSA,4038
-unidecode/x018.py,sha256=C1jpnsK3YO27xpiWJ2DXSAkV9dsPUwKqWtkgePtzp3g,3998
-unidecode/x01d.py,sha256=EwAYkMVHAFvbKRzsQ-e4cRcvS_eia3kYCM2GcaqkBWY,3701
-unidecode/x01e.py,sha256=rG1jtL0dpL-RNsvG-AxX1izkyWkbgwe0BWhATDJtmgg,3845
-unidecode/x01f.py,sha256=NUC2rlFE9YpODdDn4e5uzV7uIqEBNvKw486nOD7UQpQ,3877
-unidecode/x020.py,sha256=lXj8wkWMbD2Iuw3OCrEqZofJjJccnvY3ro5SpyotCq8,4080
-unidecode/x021.py,sha256=QQGWXFmQhQ9ei6rVCx2y-pbx_-7n8bv9DGJpdK_Q8jc,3987
-unidecode/x022.py,sha256=wX6BUR7yKGgSICIzY_B15mqgnjvRbSlepM6aqb2tnGY,4085
-unidecode/x023.py,sha256=weebXXqY3E8OhqS0ziAKHo58lCl3dkkyD0w2aKHqv7Q,4089
-unidecode/x024.py,sha256=JmCTFnYtmMHQvfYP-4f5uDiCxlwhNk7LZLyxLWWGjK8,4003
-unidecode/x025.py,sha256=DAMdCakIv0m21AWcRUNK9QWReCYXPSwVDmbFdriM4qc,3854
-unidecode/x026.py,sha256=TKU0cwRXL8vLAmZ26R8E2dpkmXmRKx4wTU0VEbuTAnM,3874
-unidecode/x027.py,sha256=qZacxfhS5nWgBhbrIT6-wm9yGP_OlAVRJ-GcmUhPl14,3718
-unidecode/x028.py,sha256=FZPCZ9w3N3WOI42h2gHEQgVOAlLBNTZjMu_KQQkIMdk,5069
-unidecode/x029.py,sha256=b8afmG-DjZmHHy0XdjcZlSXtlnwjScIcPBGbMv_YSUQ,4090
-unidecode/x02a.py,sha256=QHAyHnegV0OVOTQ5OnfJKzkaHQIFbWmmMjiFcHGUZi0,4093
-unidecode/x02c.py,sha256=ZkmMztaYT7d81E9qtUU9ayG9hBi5XqWY_ta-X5Hsaqc,4076
-unidecode/x02e.py,sha256=VCGlK7123S2wDzfkggEARyGZKi-0ElepSYECGGluf7E,4072
-unidecode/x02f.py,sha256=hcUTlkw_6Hjnxsk0e28RTd-HWpSK0IGq5hkrwA1fJFk,4091
-unidecode/x030.py,sha256=wdodiC_N7bMsh8vSmVF0STHGZnOAsZnVN-_RPiqupRA,4028
-unidecode/x031.py,sha256=jed0xoqQmUnnOqATVe7z9F2zigAZVAJX6BrWtXFPWbs,4044
-unidecode/x032.py,sha256=lj4IwokKA0IdIJiJJTfmBUGVYmWvLowFtPLwLzhfokU,4466
-unidecode/x033.py,sha256=ImTd4BRRPgCqWmrvJPoikoL0dJMKH8eQgd48vksi60A,4513
-unidecode/x04d.py,sha256=hcUTlkw_6Hjnxsk0e28RTd-HWpSK0IGq5hkrwA1fJFk,4091
-unidecode/x04e.py,sha256=X-Pzl5_QGkYexzNTY04C_tq3RvbyAUYemf0C4mIl5-U,4630
-unidecode/x04f.py,sha256=BM29-2OTb6aR7CN7NMN3nnC9BGxgediLEHGMcIB5ENU,4597
-unidecode/x050.py,sha256=SPmkA-PD39V8eO4DByxVa8HyqanGcw54xW51kLnaieY,4676
-unidecode/x051.py,sha256=GGJT-fiYxTk_FAAW6eTobT3pOGI-Qq1M3eCxN7c7f5E,4681
-unidecode/x052.py,sha256=a09eo_5pL6jpU9TW-zG2w2iXTYp6awtQ4OxGnLdcwKg,4654
-unidecode/x053.py,sha256=4x8X4Hrf56DOAINYi8JxStXW4m7FGJNiH-51JzCxE64,4608
-unidecode/x054.py,sha256=N8hO8YrlNoepnrYLUZ_EcTVRqI1lekqq3h-i-UNlTJw,4577
-unidecode/x055.py,sha256=_PK65HLpk7puojAFGeOm5Cdk-PDevHHI6NR8sHuo0Ko,4595
-unidecode/x056.py,sha256=mlNNouWFIjpZdjuBWhxFGSB_UDh0OItlsShjHQRjhxc,4607
-unidecode/x057.py,sha256=uivN7P3d-kkonqBATLKOM0ni4jVvsSzA9SOEFhbOuP4,4627
-unidecode/x058.py,sha256=lPNpdrFLFfaBoQz8Cwm2Ess8m4m_45ylIHspOUpDrLk,4664
-unidecode/x059.py,sha256=BdA_NFQqr-aGpuyo9he6uxDwm9facV-ql5axiKqgByk,4640
-unidecode/x05a.py,sha256=9UFNWH8FpkHUArS2-Td3VYOo21VQkoqYW7A0Slk0YhQ,4632
-unidecode/x05b.py,sha256=yfWnRe6mtnqY3b3Ac2_IJBA5vBYb64PYF9XM4HSZygU,4666
-unidecode/x05c.py,sha256=6iZj6HHnJ4lF3k1i68-9Dgge2H3KAlyZtNxW0BIu66o,4602
-unidecode/x05d.py,sha256=Wudbb7xOtWry4Xu5xm9j80vFkigCedGq5uHcYAYl0o8,4660
-unidecode/x05e.py,sha256=wKqvr0lkEy1yfXbYj2OtXHBxw5FxVz_MzJULXWrGvA0,4662
-unidecode/x05f.py,sha256=NnSIJOl_9CC4IRwBIQ6CEhTfvvzZ2PXhZSLJuC6sgHY,4656
-unidecode/x060.py,sha256=-Ajr6Q7RP_fdetvZ2hWflxNiaOokB3q5oeRCt7CqcDc,4640
-unidecode/x061.py,sha256=aqOY7Jt--4JhdktU2RB1bf5J0fH27fRDLhV55aR3gO0,4656
-unidecode/x062.py,sha256=wxQkvAGrppx4Y5E-hAVCps0I9bz_fbG1YSqs1E8k9sU,4616
-unidecode/x063.py,sha256=wAcyLr9CJ35G4sNTfvYb7DtFjeRlyo585JC2_-aBuQM,4648
-unidecode/x064.py,sha256=8e775dKt12GedypWT9jPXeqWLkW5-AsVG106FlfiTvA,4651
-unidecode/x065.py,sha256=fPak6ADqEOBFPfP2u7pAIZ_ObbgtdGFa4enmjVBpsVE,4634
-unidecode/x066.py,sha256=K6g6XTVEFEAppiln64vxgA2V1FMWl0YdbhDJgihQsTA,4675
-unidecode/x067.py,sha256=5d8zLxoh2vS76uBWQckXGbeyjzEUJ5aJMAMvNA-YxLs,4627
-unidecode/x068.py,sha256=-UhVYRQGQtxQJbgwyHAox-JHizu_RvO7Lb5I1F9mpvY,4670
-unidecode/x069.py,sha256=cRQZP6ZGJQsx5l2qSfpe9XmiDfxlGh7rEh30_u9oTSo,4665
-unidecode/x06a.py,sha256=iXZkuxRRsgUuNlVlNliR7gio4M4WUN0JNCPdINrzYlY,4662
-unidecode/x06b.py,sha256=5GRxv36m9zR163UNrGb_c64-uueKrpqyeeRWG9ZDme0,4600
-unidecode/x06c.py,sha256=RNKzdImtimBIuLtvbsUAzYSV7iZmVvPWyV8dj91KJlw,4637
-unidecode/x06d.py,sha256=jFvmxRU4VHSeoahyFtHIHqpvfqvJbNzvsrDn4Kd7WAQ,4647
-unidecode/x06e.py,sha256=1esJUSaQ4QotdjhxG6vtvC3CDWjY2rTr4EVLD4if8CU,4630
-unidecode/x06f.py,sha256=s7JTw6eW_6pqjCc1DEMDQ178vtllhHiejtvb360vDVc,4638
-unidecode/x070.py,sha256=oLeIanQmBbyz8OU_l5VQ-POF8mY5XbLL3rfEjr3XkUw,4677
-unidecode/x071.py,sha256=v1S9E-H06WC0rr10gP27Dqev2nxRlymECJ681BSs9Y4,4644
-unidecode/x072.py,sha256=veZOktQoJQ2wmKKLjq17UM5hAa3xo3nRLdFgSHjv8rI,4645
-unidecode/x073.py,sha256=NWkyVIbNgSu_U9katu1LRaLkL7iHx4bSuRtfsqRG4yk,4642
-unidecode/x074.py,sha256=AocniPNZMcBTeiDWA6OLzQilcWMc_ZHh7pCGXTzqMSg,4686
-unidecode/x075.py,sha256=P3SrhI5BQ5sJ66hyu_LWDONpuzLZJBKsl7f-A37sJXc,4675
-unidecode/x076.py,sha256=9rwfe41pej250BneHHO663PU9vVWyrnHRnP11VUqxEc,4635
-unidecode/x077.py,sha256=ugbmqiry2-tBstXW0Q9o7XEZQimpagZK1EttvBCK1sE,4673
-unidecode/x078.py,sha256=NxeTS_dXa6jmc7iDVUve6_SqO4AhjULng_Gei7pqbRE,4630
-unidecode/x079.py,sha256=ucPPGrgm-AnnWdVFd__unqiSMtdEpZQF6E8ta6IzdiQ,4590
-unidecode/x07a.py,sha256=fjyeO--0F5Kd80F0yOvFIIuiDW7lFKWaVIUqQRIwR9k,4659
-unidecode/x07b.py,sha256=3g39Yw2ZMs7_tcC3OT2e4nGxaWMY6V8iJ2Z6PsnhPS4,4667
-unidecode/x07c.py,sha256=Cbs98r7vdJD_YxpXgAAYoPdA7RDYR82MXN44TQJxoN8,4647
-unidecode/x07d.py,sha256=EKFrTQTNFLGnsm3qI76ALxrxGCcDuyEbapi9j9jy1B4,4678
-unidecode/x07e.py,sha256=r96YBkHoCO8GAvO0j3BdY45RdlNkqpiFWl-Q6mieVcc,4680
-unidecode/x07f.py,sha256=MNRU4aNOE2dKl4p0_WPy-oga_cx7wZ6w4Mlk-RN3PeU,4658
-unidecode/x080.py,sha256=9feIVoCdOFolKgZfRCpdL80l9kRvjbl0z9sV4FAk2Qg,4643
-unidecode/x081.py,sha256=ffvplClKTCDre83MhO7-X3tgdUWfjvkUMxQCPEnRj_U,4671
-unidecode/x082.py,sha256=XTFSjZO8LO3SFcYh9h-Oqby6a67hFDx4B-AQRyptlJU,4641
-unidecode/x083.py,sha256=wXP1lZZAravJZm1f1bCT1cumocFGRG0ZQmgFMVCOSDQ,4635
-unidecode/x084.py,sha256=inA5ODar8zAherLeTyX9-KtCUOrTigxDwb3ei2Kl1CE,4630
-unidecode/x085.py,sha256=QDKK-wbb04nCFc91pSGhyHsxcS_MhdeQLsRqqXhV9h8,4628
-unidecode/x086.py,sha256=DcXhJemXKgrGwPBRFCbINxfxatqjpy7jFgM9jbN8eEk,4608
-unidecode/x087.py,sha256=nddqMqheth-n7kHCyjRNvVPO82UI_PdOic1kQer_iF0,4641
-unidecode/x088.py,sha256=0PVL160fpQ-Kkw29X-bLviyfs4TKIAwp_-SwEWsvemM,4639
-unidecode/x089.py,sha256=RrIGIX6dojryaYh6Da4ysaM_-yREbNZ-HasFX2O_SQc,4624
-unidecode/x08a.py,sha256=NjMp9ck824PXG2gcJXfi_9oQCFgXhhiallO3bYCtXCE,4647
-unidecode/x08b.py,sha256=vUwkG_IOBIhB8gQAaVbgD5EAIA1wY4BBPk5kXwAcPg0,4639
-unidecode/x08c.py,sha256=0sHcCXB9YzXE9oJcwzPtPUltCn6Oo-itdY5vk6MbtdA,4628
-unidecode/x08d.py,sha256=SWD7xSIR-1P30S5-yuNDHpVjWlpfxmUxuJr7f178WsA,4630
-unidecode/x08e.py,sha256=Ym0RQUdsgZJdVmOI56nzSmzfxuKjuS5MUbPSOeyv2Ws,4655
-unidecode/x08f.py,sha256=tNFpnEzNLIY4xHbcR0rZqaoNUKinj-XO2XfSnh6c4u4,4649
-unidecode/x090.py,sha256=XGomJNriNZsHQRUDy3vKwFc4W38uxeqWpn5SHM4G4j8,4627
-unidecode/x091.py,sha256=u8tRZhaVNa2mbsDSYIKqRZ3u4Npj-kiz55rC9izadnM,4653
-unidecode/x092.py,sha256=NvNce8y3YFlPI20pN1a4LY68sid5ApetXs9bo9cxb7w,4644
-unidecode/x093.py,sha256=O2e1p58RB1TS2Au-JSjft3FgPBx1YRAGxnviqSsfnYE,4646
-unidecode/x094.py,sha256=k8ZwNc9qCSzU2b8wMrWUeGSg39tPMiwiKHCiKw6zteM,4653
-unidecode/x095.py,sha256=H2O3xJDE3cAOecyYMUTl6fLs9shETPFwZshtIIK5V3E,4667
-unidecode/x096.py,sha256=sev3zRm46EBQgEtkR4T-Ah0cHYEM-9CM2pFCCc21BFI,4608
-unidecode/x097.py,sha256=S1nZBdt-MHySCAgV9MDdNSQTCSaD62iAhz8EjikfS5A,4633
-unidecode/x098.py,sha256=w0KMxUF7XyG9gdfTJylYsG_clvm3RD_LIM5XHR0xsdY,4643
-unidecode/x099.py,sha256=nlaWb2nRTSnFfDjseDRJ1a3Y0okOHbNA1-htKo9SkAM,4627
-unidecode/x09a.py,sha256=Z8pQsTc62CWgm0JPnj3kokKKf9_qfzRpo0u5iH61CaE,4623
-unidecode/x09b.py,sha256=njA75MlCgC-5UuS1Hvm-mdgsVwW9r801odfBTJg-BFE,4653
-unidecode/x09c.py,sha256=NveMhN85_Cm4H1cnfHDTcnSj675MOVBq9Lkjpw3YxA0,4659
-unidecode/x09d.py,sha256=_0fAaUhK3axhhWLA4QPNJf_J9YSs1MCKx2xR-vl5QYI,4630
-unidecode/x09e.py,sha256=wreETFCeKf9bVvLc3E7MUAvlu2CN5xKeebf3ESuV13s,4613
-unidecode/x09f.py,sha256=pNAdX7-9yMEPXtozjCuXxzc74eCVft9meOTxCtU7vJw,4420
-unidecode/x0a0.py,sha256=EpopPuuocybgCcpX19Ii-udqsPXJjSces3360lqJ8vs,4428
-unidecode/x0a1.py,sha256=0hvF77d5E640SujjdHVqy5gMUH85gEdOv80eRvCEAGM,4469
-unidecode/x0a2.py,sha256=9Icpfk_ElebYd_xN09OMziFrpAGPXEUNVmawpnhbBaQ,4503
-unidecode/x0a3.py,sha256=G1lPrnCqYz0s4wsSa1qM0WgrZBWO_beRk3AgK0iVZLA,4521
-unidecode/x0a4.py,sha256=nWPXzCragW0rsDQPa6ooo9KOc-SOjVCP8KIOuGc7WpU,4373
-unidecode/x0ac.py,sha256=wj7hl88VlCdc_eGpOL4m4CBJILyQqd9atObC5Xvd0aA,4709
-unidecode/x0ad.py,sha256=Rz5rn0fM-CqRjaN4TvSq_1StAQdyAF2WX3cUvcQHaWU,4766
-unidecode/x0ae.py,sha256=jNIBVB-Pw2ZNihAeyWbDIEq9Yt9zlhdfGylfvAaxUks,4875
-unidecode/x0af.py,sha256=Am5YC8Zfrun5NUKxU6LrU2-d5GgkGSBs7fZt2rqSi74,5012
-unidecode/x0b0.py,sha256=1bgHerCDAqIcJHYeGddJjJfRWiHCKtU2B0J-XGvcbbc,4853
-unidecode/x0b1.py,sha256=Six-lzGdvgJx4YsIa0lTusnBEV1zbCKQCquq17TDJoQ,4746
-unidecode/x0b2.py,sha256=HQDbmglNi4QfiRSGucUclgq_4FGpRjbJkWU1JTLAFGc,4680
-unidecode/x0b3.py,sha256=1lqxghVZiiStOAx1IG_vc1zZTXrAa7Z__QY6ZWvo2aA,4741
-unidecode/x0b4.py,sha256=V6BNSTxpyP8VuqF7x5z7bpF3MQAkwZfKtEu6NFr_vSg,4762
-unidecode/x0b5.py,sha256=9NVd2hNLyRlLceVlznba1dreqBGeKU_0gzmkgAw0gyg,4919
-unidecode/x0b6.py,sha256=V_vRsB0GICu9hqhO4pnbPWreDSevJ3bbmLRJkuQUxnE,4996
-unidecode/x0b7.py,sha256=CwBaCBICyVagnFjUpkwabuDvBJw7gAeqkSRpfBAVv8s,4833
-unidecode/x0b8.py,sha256=xYp-xy2LIwq95OWyS9vYMc_Z5od9dud0W1dxeg4P_Jk,4714
-unidecode/x0b9.py,sha256=z3hKNzBq_MeK9V3AyQzaY58cgi0-VGOsLk3-UFmszLQ,4704
-unidecode/x0ba.py,sha256=4gubifoBeJUUrwXEI4litJygekufEycmWDLrJ-Qvs14,4765
-unidecode/x0bb.py,sha256=bsCTABUdC6yTn8_0vhYe5jRP1z_BoAdificB8Y1c1hA,4730
-unidecode/x0bc.py,sha256=AhQvAz7yHlbQ_4c2KOIisq07eZJ5JQn6cV8I31oT9kg,4707
-unidecode/x0bd.py,sha256=IGtyVxIUr1mU3hokn6iUDJhXZezQozVvfWOyf4Pa5dI,4752
-unidecode/x0be.py,sha256=1D-hXu3p3wvOnGVMjEqVsrltYe7UuSwit2yqN5eFizc,4849
-unidecode/x0bf.py,sha256=NkEXqr2ER3BNFkTasDV9CHnkRBuX_Ao5OHGv_NgKAew,5010
-unidecode/x0c0.py,sha256=zDlHpyM0omza5TqGLb8Rhl7Wd-LlV1AjvH_xdnEnNFw,4856
-unidecode/x0c1.py,sha256=AC6xJyx9UblKAGNqGN7AH2Idb3_3vbc-I5U0Myig5fA,4765
-unidecode/x0c2.py,sha256=siRYLA8Cv9Z8XsRp3WQOBdRrPkjJOuEh8z1-3SMXOzQ,4710
-unidecode/x0c3.py,sha256=hlAFe6lsz0aLMixlpeFjV4I-WTIiA3B2BU58yGlTwRg,4975
-unidecode/x0c4.py,sha256=z3xZwSkf5ru1FCdBMHOr5fyglzVdyPhQVtWjq9xInsQ,5024
-unidecode/x0c5.py,sha256=F-DR0eVMRkemOnNXOtDjI5i6gW9136XLmWM_yMVvc84,4581
-unidecode/x0c6.py,sha256=7p_jMrHf3WUa_zANms-RGVN1bAeshgWLkC16_VcSawA,4490
-unidecode/x0c7.py,sha256=5eOAq4jFsPZ-zKO7lHzAGj_EvXdaMC4Kud7gvE-B7Tg,4564
-unidecode/x0c8.py,sha256=wltKvhBgn51jULzwUnEbmyDuK9JvQpQee0uTKK42-20,4733
-unidecode/x0c9.py,sha256=GoARON07wCoHN2wRHb5fvzqE9L3Yme2hKeciynUIAIk,4722
-unidecode/x0ca.py,sha256=BsBZTNj3npIkdo3L9pSEX7XvDT68KV7wFtOOwyEb2So,5007
-unidecode/x0cb.py,sha256=8T7vnJMRmYGyySYthMWz0bgN-MremktGImjejodFeMo,5012
-unidecode/x0cc.py,sha256=GKoHN-4vL4Y3EL42G0xbN74Tgspew1oMvxQtsIa3ess,4749
-unidecode/x0cd.py,sha256=7sZ05OjugbaombMRDYOVxgstZbXMcuX5kHFheKv4W2E,4738
-unidecode/x0ce.py,sha256=mOEHFrsAwIvcTnh7OKVK5qbuXUXHfJOR7D4FtXsQmao,4708
-unidecode/x0cf.py,sha256=H9PeYcbOG68F_yc7zsELUuN05ANfFNOUX-e3-gzx7Ow,4713
-unidecode/x0d0.py,sha256=eULqcGHPmaoEdl0EwRB5wWSu8M43bp4HoFo5gGljacg,4706
-unidecode/x0d1.py,sha256=BClLDAjPgsAX6MJCsuHfmfuhH9qfzUy_vb-d9zBs3Oc,4767
-unidecode/x0d2.py,sha256=e74nqGo4E4sF1sy8qBFu2ecWoRfJdoXI1xRFRPqYEz8,4724
-unidecode/x0d3.py,sha256=8-UmvJ3-ILXo9d3GA-ReOE4OfUenL3tVUJYldZ9gHu0,4705
-unidecode/x0d4.py,sha256=fwUmzksoddTKB8fH2rZMxRK3pJtLrxhcrYpHfBauAwE,4758
-unidecode/x0d5.py,sha256=rANSL5ndzLgSgYJQNEw57AfXpicRe7pvHRlKTPb4-QQ,4680
-unidecode/x0d6.py,sha256=fT8_cRzp7y60IIhn87kM9lLehKGAg5wYmfFOwgGp6e0,4765
-unidecode/x0d7.py,sha256=40-m7uKNvylWCcVBuTXrbiP6Lrj_4d4PWgLcX8670Kk,4468
-unidecode/x0f9.py,sha256=2PD0_fpDnaFO9ftICjYSOhnjAfBppjsj1TcLIuYjnCI,4567
-unidecode/x0fa.py,sha256=XHxCfXOhHDqzjG0Nw6n1sT5Q_MKLCovPFe-22IQxVXU,4172
-unidecode/x0fb.py,sha256=n_5urRXj6Ecf0MKMnuwNY0UK6TJtUW2hKcNLQqa2Gf8,3787
-unidecode/x0fc.py,sha256=KcyQnyv7gxNeVcAnRwQrm4NlabZE3CrnmtLqXj_7te8,3595
-unidecode/x0fd.py,sha256=mVHMrX8AhRzwCkMNA4sJkhwirK3BqmNv6YZfyCpE9Is,3703
-unidecode/x0fe.py,sha256=CrdwUOf0sl8yUfOFnXOXFZ8U662dQThpGMwGBkY8cJ4,3769
-unidecode/x0ff.py,sha256=Ijfv5VVDCTWRzRqwMYSp0fSycy176gn7P8ut8x3bv-w,3957
-unidecode/x1d4.py,sha256=xzL0OicR95IWq6LiApIPEgPoST8dyVgYuIUGxkz1b28,3863
-unidecode/x1d5.py,sha256=bmTSTgWnsLP7yUDZq2Irtz84Zm7bmLzYzurY0eI0uIU,3863
-unidecode/x1d6.py,sha256=8H0RmEfbY82X1iQwr0vcsgQGCvGKv19_773K_T2NI2A,4052
-unidecode/x1d7.py,sha256=yyHV2dCo1p_m_QVgz1H9S6XqeiN9GpGxB-ZqAW7l5ts,4057
-unidecode/x1f1.py,sha256=URX9F6UPgUo4-tpr7bhPm4G5ruFDoScW5bZLwzR88Yg,4308
-unidecode/x1f6.py,sha256=Ji4t-EFmJmo3CDeZ0yD7pX58hj5fQQc99TOrD-yad9k,4103
diff --git a/libs/Unidecode-1.3.8.dist-info/WHEEL b/libs/Unidecode-1.3.8.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/Unidecode-1.3.8.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/alembic-1.14.0.dist-info/LICENSE b/libs/alembic-1.14.0.dist-info/LICENSE
deleted file mode 100644
index be8de0089e..0000000000
--- a/libs/alembic-1.14.0.dist-info/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2009-2024 Michael Bayer.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/libs/alembic-1.14.0.dist-info/METADATA b/libs/alembic-1.14.0.dist-info/METADATA
deleted file mode 100644
index 2f6963fc66..0000000000
--- a/libs/alembic-1.14.0.dist-info/METADATA
+++ /dev/null
@@ -1,142 +0,0 @@
-Metadata-Version: 2.1
-Name: alembic
-Version: 1.14.0
-Summary: A database migration tool for SQLAlchemy.
-Home-page: https://alembic.sqlalchemy.org
-Author: Mike Bayer
-Author-email: mike_mp@zzzcomputing.com
-License: MIT
-Project-URL: Documentation, https://alembic.sqlalchemy.org/en/latest/
-Project-URL: Changelog, https://alembic.sqlalchemy.org/en/latest/changelog.html
-Project-URL: Source, https://github.com/sqlalchemy/alembic/
-Project-URL: Issue Tracker, https://github.com/sqlalchemy/alembic/issues/
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Database :: Front-Ends
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: SQLAlchemy >=1.3.0
-Requires-Dist: Mako
-Requires-Dist: typing-extensions >=4
-Requires-Dist: importlib-metadata ; python_version < "3.9"
-Requires-Dist: importlib-resources ; python_version < "3.9"
-Provides-Extra: tz
-Requires-Dist: backports.zoneinfo ; (python_version < "3.9") and extra == 'tz'
-
-Alembic is a database migrations tool written by the author
-of `SQLAlchemy <http://www.sqlalchemy.org>`_.  A migrations tool
-offers the following functionality:
-
-* Can emit ALTER statements to a database in order to change
-  the structure of tables and other constructs
-* Provides a system whereby "migration scripts" may be constructed;
-  each script indicates a particular series of steps that can "upgrade" a
-  target database to a new version, and optionally a series of steps that can
-  "downgrade" similarly, doing the same steps in reverse.
-* Allows the scripts to execute in some sequential manner.
-
-The goals of Alembic are:
-
-* Very open ended and transparent configuration and operation.   A new
-  Alembic environment is generated from a set of templates which is selected
-  among a set of options when setup first occurs. The templates then deposit a
-  series of scripts that define fully how database connectivity is established
-  and how migration scripts are invoked; the migration scripts themselves are
-  generated from a template within that series of scripts. The scripts can
-  then be further customized to define exactly how databases will be
-  interacted with and what structure new migration files should take.
-* Full support for transactional DDL.   The default scripts ensure that all
-  migrations occur within a transaction - for those databases which support
-  this (Postgresql, Microsoft SQL Server), migrations can be tested with no
-  need to manually undo changes upon failure.
-* Minimalist script construction.  Basic operations like renaming
-  tables/columns, adding/removing columns, changing column attributes can be
-  performed through one line commands like alter_column(), rename_table(),
-  add_constraint(). There is no need to recreate full SQLAlchemy Table
-  structures for simple operations like these - the functions themselves
-  generate minimalist schema structures behind the scenes to achieve the given
-  DDL sequence.
-* "auto generation" of migrations. While real world migrations are far more
-  complex than what can be automatically determined, Alembic can still
-  eliminate the initial grunt work in generating new migration directives
-  from an altered schema.  The ``--autogenerate`` feature will inspect the
-  current status of a database using SQLAlchemy's schema inspection
-  capabilities, compare it to the current state of the database model as
-  specified in Python, and generate a series of "candidate" migrations,
-  rendering them into a new migration script as Python directives. The
-  developer then edits the new file, adding additional directives and data
-  migrations as needed, to produce a finished migration. Table and column
-  level changes can be detected, with constraints and indexes to follow as
-  well.
-* Full support for migrations generated as SQL scripts.   Those of us who
-  work in corporate environments know that direct access to DDL commands on a
-  production database is a rare privilege, and DBAs want textual SQL scripts.
-  Alembic's usage model and commands are oriented towards being able to run a
-  series of migrations into a textual output file as easily as it runs them
-  directly to a database. Care must be taken in this mode to not invoke other
-  operations that rely upon in-memory SELECTs of rows - Alembic tries to
-  provide helper constructs like bulk_insert() to help with data-oriented
-  operations that are compatible with script-based DDL.
-* Non-linear, dependency-graph versioning.   Scripts are given UUID
-  identifiers similarly to a DVCS, and the linkage of one script to the next
-  is achieved via human-editable markers within the scripts themselves.
-  The structure of a set of migration files is considered as a
-  directed-acyclic graph, meaning any migration file can be dependent
-  on any other arbitrary set of migration files, or none at
-  all.  Through this open-ended system, migration files can be organized
-  into branches, multiple roots, and mergepoints, without restriction.
-  Commands are provided to produce new branches, roots, and merges of
-  branches automatically.
-* Provide a library of ALTER constructs that can be used by any SQLAlchemy
-  application. The DDL constructs build upon SQLAlchemy's own DDLElement base
-  and can be used standalone by any application or script.
-* At long last, bring SQLite and its inability to ALTER things into the fold,
-  but in such a way that SQLite's very special workflow needs are accommodated
-  in an explicit way that makes the most of a bad situation, through the
-  concept of a "batch" migration, where multiple changes to a table can
-  be batched together to form a series of instructions for a single, subsequent
-  "move-and-copy" workflow.   You can even use "move-and-copy" workflow for
-  other databases, if you want to recreate a table in the background
-  on a busy system.
-
-Documentation and status of Alembic is at https://alembic.sqlalchemy.org/
-
-The SQLAlchemy Project
-======================
-
-Alembic is part of the `SQLAlchemy Project <https://www.sqlalchemy.org>`_ and
-adheres to the same standards and conventions as the core project.
-
-Development / Bug reporting / Pull requests
-___________________________________________
-
-Please refer to the
-`SQLAlchemy Community Guide <https://www.sqlalchemy.org/develop.html>`_ for
-guidelines on coding and participating in this project.
-
-Code of Conduct
-_______________
-
-Above all, SQLAlchemy places great emphasis on polite, thoughtful, and
-constructive communication between users and developers.
-Please see our current Code of Conduct at
-`Code of Conduct <https://www.sqlalchemy.org/codeofconduct.html>`_.
-
-License
-=======
-
-Alembic is distributed under the `MIT license
-<https://opensource.org/licenses/MIT>`_.
diff --git a/libs/alembic-1.14.0.dist-info/RECORD b/libs/alembic-1.14.0.dist-info/RECORD
deleted file mode 100644
index f7cc605d01..0000000000
--- a/libs/alembic-1.14.0.dist-info/RECORD
+++ /dev/null
@@ -1,86 +0,0 @@
-../../bin/alembic,sha256=xqPGhIsDow0IG3BUa3a_VtCtKJgqxLpVJuFe1PQcGoA,236
-alembic-1.14.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-alembic-1.14.0.dist-info/LICENSE,sha256=zhnnuit3ylhLgqZ5KFbhOOswsxHIlrB2wJpAXuRfvuk,1059
-alembic-1.14.0.dist-info/METADATA,sha256=5hNrxl9umF2WKbNL-MxyMUEZem8-OxRa49Qz9w7jqzo,7390
-alembic-1.14.0.dist-info/RECORD,,
-alembic-1.14.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alembic-1.14.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-alembic-1.14.0.dist-info/entry_points.txt,sha256=aykM30soxwGN0pB7etLc1q0cHJbL9dy46RnK9VX4LLw,48
-alembic-1.14.0.dist-info/top_level.txt,sha256=FwKWd5VsPFC8iQjpu1u9Cn-JnK3-V1RhUCmWqz1cl-s,8
-alembic/__init__.py,sha256=qw_qYmTjOKiGcs--x0c6kjZo70tQTR5m8_lqF98Qr_0,63
-alembic/__main__.py,sha256=373m7-TBh72JqrSMYviGrxCHZo-cnweM8AGF8A22PmY,78
-alembic/autogenerate/__init__.py,sha256=ntmUTXhjLm4_zmqIwyVaECdpPDn6_u1yM9vYk6-553E,543
-alembic/autogenerate/api.py,sha256=Bh-37G0PSFeT9WSfEQ-3TZoainXGLL2nsl4okv_xYc0,22173
-alembic/autogenerate/compare.py,sha256=cdUBH6qsedaJsnToSOu4MfcJaI4bjUJ4VWqtBlqsSr8,44944
-alembic/autogenerate/render.py,sha256=YB3C90rq7XDhjTia9GAnK6yfnVVzCROziZrbArmG9SE,35481
-alembic/autogenerate/rewriter.py,sha256=uZWRkTYJoncoEJ5WY1QBRiozjyChqZDJPy4LtcRibjM,7846
-alembic/command.py,sha256=2tkKrIoEgPfXrGgvMRGrUXH4l-7z466DOxd7Q2XOfL8,22169
-alembic/config.py,sha256=BZ7mwFRk2gq8GFNxxy9qvMUFx43YbDbQTC99OnjqiKY,22216
-alembic/context.py,sha256=hK1AJOQXJ29Bhn276GYcosxeG7pC5aZRT5E8c4bMJ4Q,195
-alembic/context.pyi,sha256=hUHbSnbSeEEMVkk0gDSXOq4_9edSjYzsjmmf-mL9Iao,31737
-alembic/ddl/__init__.py,sha256=Df8fy4Vn_abP8B7q3x8gyFwEwnLw6hs2Ljt_bV3EZWE,152
-alembic/ddl/_autogen.py,sha256=Blv2RrHNyF4cE6znCQXNXG5T9aO-YmiwD4Fz-qfoaWA,9275
-alembic/ddl/base.py,sha256=gazpvtk_6XURcsa0libwcaIquL5HwJDP1ZWKJ6P7x0I,9788
-alembic/ddl/impl.py,sha256=7-oxMb7KeycaK96x-kXw4mR6NSE1tmN0UEZIZrPcuhY,30195
-alembic/ddl/mssql.py,sha256=ydvgBSaftKYjaBaMyqius66Ta4CICQSj79Og3Ed2atY,14219
-alembic/ddl/mysql.py,sha256=kXOGYmpnL_9WL3ijXNsG4aAwy3m1HWJOoLZSePzmJF0,17316
-alembic/ddl/oracle.py,sha256=669YlkcZihlXFbnXhH2krdrvDry8q5pcUGfoqkg_R6Y,6243
-alembic/ddl/postgresql.py,sha256=GNCnx-N8UsCIstfW49J8ivYcKgRB8KFNPRgNtORC_AM,29883
-alembic/ddl/sqlite.py,sha256=wLXhb8bJWRspKQTb-iVfepR4LXYgOuEbUWKX5qwDhIQ,7570
-alembic/environment.py,sha256=MM5lPayGT04H3aeng1H7GQ8HEAs3VGX5yy6mDLCPLT4,43
-alembic/migration.py,sha256=MV6Fju6rZtn2fTREKzXrCZM6aIBGII4OMZFix0X-GLs,41
-alembic/op.py,sha256=flHtcsVqOD-ZgZKK2pv-CJ5Cwh-KJ7puMUNXzishxLw,167
-alembic/op.pyi,sha256=QZ1ERetxIrpZNTyg48Btn5OJhhpMId-_MLMP36RauOw,50168
-alembic/operations/__init__.py,sha256=e0KQSZAgLpTWvyvreB7DWg7RJV_MWSOPVDgCqsd2FzY,318
-alembic/operations/base.py,sha256=JRaOtPqyqfaPjzGHxuP9VMcO1KsJNmbbLOvwG82qxGA,74474
-alembic/operations/batch.py,sha256=YqtD4hJ3_RkFxvI7zbmBwxcLEyLHYyWQpsz4l5L85yI,26943
-alembic/operations/ops.py,sha256=guIpLQzlqgkdP2LGDW8vWg_DXeAouEldiVZDgRas7YI,94953
-alembic/operations/schemaobj.py,sha256=Wp-bBe4a8lXPTvIHJttBY0ejtpVR5Jvtb2kI-U2PztQ,9468
-alembic/operations/toimpl.py,sha256=Fx-UKcq6S8pVtsEwPFjTKtEcAVKjfptn-BfpE1k3_ck,7517
-alembic/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alembic/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alembic/runtime/environment.py,sha256=SkYB_am1h3FSG8IsExAQxGP_7WwzOVigqjlO747Aokc,41497
-alembic/runtime/migration.py,sha256=9GZ_bYZ6yMF7DUD1hgZdmB0YqvcdcNBBfxFaXKHeQoM,49857
-alembic/script/__init__.py,sha256=lSj06O391Iy5avWAiq8SPs6N8RBgxkSPjP8wpXcNDGg,100
-alembic/script/base.py,sha256=XLNpdsLnBBSz4ZKMFUArFUdtL1HcjtuUDHNbA-5VlZA,37809
-alembic/script/revision.py,sha256=NTu-eu5Y78u4NoVXpT0alpD2oL40SGATA2sEMEf1el4,62306
-alembic/script/write_hooks.py,sha256=NGB6NGgfdf7HK6XNNpSKqUCfzxazj-NRUePgFx7MJSM,5036
-alembic/templates/async/README,sha256=ISVtAOvqvKk_5ThM5ioJE-lMkvf9IbknFUFVU_vPma4,58
-alembic/templates/async/alembic.ini.mako,sha256=lw_6ie1tMbYGpbvE7MnzJvx101RbSTh9uu4t9cvDpug,3638
-alembic/templates/async/env.py,sha256=zbOCf3Y7w2lg92hxSwmG1MM_7y56i_oRH4AKp0pQBYo,2389
-alembic/templates/async/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
-alembic/templates/generic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
-alembic/templates/generic/alembic.ini.mako,sha256=YcwTOEoiZr663Gkt6twCjmaqZao0n6xjRl0B5prK79s,3746
-alembic/templates/generic/env.py,sha256=TLRWOVW3Xpt_Tpf8JFzlnoPn_qoUu8UV77Y4o9XD6yI,2103
-alembic/templates/generic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
-alembic/templates/multidb/README,sha256=dWLDhnBgphA4Nzb7sNlMfCS3_06YqVbHhz-9O5JNqyI,606
-alembic/templates/multidb/alembic.ini.mako,sha256=AW1OGb-QezxBY5mynSWW7b1lGKnh9sVPImfGgfXf2EM,3840
-alembic/templates/multidb/env.py,sha256=6zNjnW8mXGUk7erTsAvrfhvqoczJ-gagjVq1Ypg2YIQ,4230
-alembic/templates/multidb/script.py.mako,sha256=N06nMtNSwHkgl0EBXDyMt8njp9tlOesR583gfq21nbY,1090
-alembic/testing/__init__.py,sha256=kOxOh5nwmui9d-_CCq9WA4Udwy7ITjm453w74CTLZDo,1159
-alembic/testing/assertions.py,sha256=ScUb1sVopIl70BirfHUJDvwswC70Q93CiIWwkiZbhHg,5207
-alembic/testing/env.py,sha256=giHWVLhHkfNWrPEfrAqhpMOLL6FgWoBCVAzBVrVbSSA,10766
-alembic/testing/fixtures.py,sha256=nBntOynOmVCFc7IYiN3DIQ3TBNTfiGCvL_1-FyCry8o,9462
-alembic/testing/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alembic/testing/plugin/bootstrap.py,sha256=9C6wtjGrIVztZ928w27hsQE0KcjDLIUtUN3dvZKsMVk,50
-alembic/testing/requirements.py,sha256=dKeAO1l5TwBqXarJN-IPORlCqCJv-41Dj6oXoEikxHQ,5133
-alembic/testing/schemacompare.py,sha256=N5UqSNCOJetIKC4vKhpYzQEpj08XkdgIoqBmEPQ3tlc,4838
-alembic/testing/suite/__init__.py,sha256=MvE7-hwbaVN1q3NM-ztGxORU9dnIelUCINKqNxewn7Y,288
-alembic/testing/suite/_autogen_fixtures.py,sha256=cDq1pmzHe15S6dZPGNC6sqFaCQ3hLT_oPV2IDigUGQ0,9880
-alembic/testing/suite/test_autogen_comments.py,sha256=aEGqKUDw4kHjnDk298aoGcQvXJWmZXcIX_2FxH4cJK8,6283
-alembic/testing/suite/test_autogen_computed.py,sha256=CXAeF-5Wr2cmW8PB7ztHG_4ZQsn1gSWrHWfxi72grNU,6147
-alembic/testing/suite/test_autogen_diffs.py,sha256=T4SR1n_kmcOKYhR4W1-dA0e5sddJ69DSVL2HW96kAkE,8394
-alembic/testing/suite/test_autogen_fks.py,sha256=AqFmb26Buex167HYa9dZWOk8x-JlB1OK3bwcvvjDFaU,32927
-alembic/testing/suite/test_autogen_identity.py,sha256=kcuqngG7qXAKPJDX4U8sRzPKHEJECHuZ0DtuaS6tVkk,5824
-alembic/testing/suite/test_environment.py,sha256=OwD-kpESdLoc4byBrGrXbZHvqtPbzhFCG4W9hJOJXPQ,11877
-alembic/testing/suite/test_op.py,sha256=2XQCdm_NmnPxHGuGj7hmxMzIhKxXNotUsKdACXzE1mM,1343
-alembic/testing/util.py,sha256=CQrcQDA8fs_7ME85z5ydb-Bt70soIIID-qNY1vbR2dg,3350
-alembic/testing/warnings.py,sha256=RxA7x_8GseANgw07Us8JN_1iGbANxaw6_VitX2ZGQH4,1078
-alembic/util/__init__.py,sha256=KSZ7UT2YzH6CietgUtljVoE3QnGjoFKOi7RL5sgUxrk,1688
-alembic/util/compat.py,sha256=RjHdQa1NomU3Zlvgfvza0OMiSRQSLRL3xVl3OdUy2UE,2594
-alembic/util/editor.py,sha256=JIz6_BdgV8_oKtnheR6DZoB7qnrHrlRgWjx09AsTsUw,2546
-alembic/util/exc.py,sha256=KQTru4zcgAmN4IxLMwLFS56XToUewaXB7oOLcPNjPwg,98
-alembic/util/langhelpers.py,sha256=LpOcovnhMnP45kTt8zNJ4BHpyQrlF40OL6yDXjqKtsE,10026
-alembic/util/messaging.py,sha256=BxAHiJsYHBPb2m8zv4yaueSRAlVuYXWkRCeN02JXhqw,3250
-alembic/util/pyfiles.py,sha256=zltVdcwEJJCPS2gHsQvkHkQakuF6wXiZ6zfwHbGNT0g,3489
-alembic/util/sqla_compat.py,sha256=XMfZaLdbVbJoniNUyI3RUUXu4gCWljjVBbJ7db6vCgc,19526
diff --git a/libs/alembic-1.14.0.dist-info/WHEEL b/libs/alembic-1.14.0.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/alembic-1.14.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/Flask_Cors-5.0.0.dist-info/INSTALLER b/libs/alembic-1.18.4.dist-info/INSTALLER
similarity index 100%
rename from libs/Flask_Cors-5.0.0.dist-info/INSTALLER
rename to libs/alembic-1.18.4.dist-info/INSTALLER
diff --git a/libs/alembic-1.18.4.dist-info/METADATA b/libs/alembic-1.18.4.dist-info/METADATA
new file mode 100644
index 0000000000..04d82dce2d
--- /dev/null
+++ b/libs/alembic-1.18.4.dist-info/METADATA
@@ -0,0 +1,139 @@
+Metadata-Version: 2.4
+Name: alembic
+Version: 1.18.4
+Summary: A database migration tool for SQLAlchemy.
+Author-email: Mike Bayer <mike_mp@zzzcomputing.com>
+License-Expression: MIT
+Project-URL: Homepage, https://alembic.sqlalchemy.org
+Project-URL: Documentation, https://alembic.sqlalchemy.org/en/latest/
+Project-URL: Changelog, https://alembic.sqlalchemy.org/en/latest/changelog.html
+Project-URL: Source, https://github.com/sqlalchemy/alembic/
+Project-URL: Issue Tracker, https://github.com/sqlalchemy/alembic/issues/
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Environment :: Console
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Database :: Front-Ends
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: SQLAlchemy>=1.4.23
+Requires-Dist: Mako
+Requires-Dist: typing-extensions>=4.12
+Requires-Dist: tomli; python_version < "3.11"
+Provides-Extra: tz
+Requires-Dist: tzdata; extra == "tz"
+Dynamic: license-file
+
+Alembic is a database migrations tool written by the author
+of `SQLAlchemy <http://www.sqlalchemy.org>`_.  A migrations tool
+offers the following functionality:
+
+* Can emit ALTER statements to a database in order to change
+  the structure of tables and other constructs
+* Provides a system whereby "migration scripts" may be constructed;
+  each script indicates a particular series of steps that can "upgrade" a
+  target database to a new version, and optionally a series of steps that can
+  "downgrade" similarly, doing the same steps in reverse.
+* Allows the scripts to execute in some sequential manner.
+
+The goals of Alembic are:
+
+* Very open ended and transparent configuration and operation.   A new
+  Alembic environment is generated from a set of templates which is selected
+  among a set of options when setup first occurs. The templates then deposit a
+  series of scripts that define fully how database connectivity is established
+  and how migration scripts are invoked; the migration scripts themselves are
+  generated from a template within that series of scripts. The scripts can
+  then be further customized to define exactly how databases will be
+  interacted with and what structure new migration files should take.
+* Full support for transactional DDL.   The default scripts ensure that all
+  migrations occur within a transaction - for those databases which support
+  this (Postgresql, Microsoft SQL Server), migrations can be tested with no
+  need to manually undo changes upon failure.
+* Minimalist script construction.  Basic operations like renaming
+  tables/columns, adding/removing columns, changing column attributes can be
+  performed through one line commands like alter_column(), rename_table(),
+  add_constraint(). There is no need to recreate full SQLAlchemy Table
+  structures for simple operations like these - the functions themselves
+  generate minimalist schema structures behind the scenes to achieve the given
+  DDL sequence.
+* "auto generation" of migrations. While real world migrations are far more
+  complex than what can be automatically determined, Alembic can still
+  eliminate the initial grunt work in generating new migration directives
+  from an altered schema.  The ``--autogenerate`` feature will inspect the
+  current status of a database using SQLAlchemy's schema inspection
+  capabilities, compare it to the current state of the database model as
+  specified in Python, and generate a series of "candidate" migrations,
+  rendering them into a new migration script as Python directives. The
+  developer then edits the new file, adding additional directives and data
+  migrations as needed, to produce a finished migration. Table and column
+  level changes can be detected, with constraints and indexes to follow as
+  well.
+* Full support for migrations generated as SQL scripts.   Those of us who
+  work in corporate environments know that direct access to DDL commands on a
+  production database is a rare privilege, and DBAs want textual SQL scripts.
+  Alembic's usage model and commands are oriented towards being able to run a
+  series of migrations into a textual output file as easily as it runs them
+  directly to a database. Care must be taken in this mode to not invoke other
+  operations that rely upon in-memory SELECTs of rows - Alembic tries to
+  provide helper constructs like bulk_insert() to help with data-oriented
+  operations that are compatible with script-based DDL.
+* Non-linear, dependency-graph versioning.   Scripts are given UUID
+  identifiers similarly to a DVCS, and the linkage of one script to the next
+  is achieved via human-editable markers within the scripts themselves.
+  The structure of a set of migration files is considered as a
+  directed-acyclic graph, meaning any migration file can be dependent
+  on any other arbitrary set of migration files, or none at
+  all.  Through this open-ended system, migration files can be organized
+  into branches, multiple roots, and mergepoints, without restriction.
+  Commands are provided to produce new branches, roots, and merges of
+  branches automatically.
+* Provide a library of ALTER constructs that can be used by any SQLAlchemy
+  application. The DDL constructs build upon SQLAlchemy's own DDLElement base
+  and can be used standalone by any application or script.
+* At long last, bring SQLite and its inability to ALTER things into the fold,
+  but in such a way that SQLite's very special workflow needs are accommodated
+  in an explicit way that makes the most of a bad situation, through the
+  concept of a "batch" migration, where multiple changes to a table can
+  be batched together to form a series of instructions for a single, subsequent
+  "move-and-copy" workflow.   You can even use "move-and-copy" workflow for
+  other databases, if you want to recreate a table in the background
+  on a busy system.
+
+Documentation and status of Alembic is at https://alembic.sqlalchemy.org/
+
+The SQLAlchemy Project
+======================
+
+Alembic is part of the `SQLAlchemy Project <https://www.sqlalchemy.org>`_ and
+adheres to the same standards and conventions as the core project.
+
+Development / Bug reporting / Pull requests
+___________________________________________
+
+Please refer to the
+`SQLAlchemy Community Guide <https://www.sqlalchemy.org/develop.html>`_ for
+guidelines on coding and participating in this project.
+
+Code of Conduct
+_______________
+
+Above all, SQLAlchemy places great emphasis on polite, thoughtful, and
+constructive communication between users and developers.
+Please see our current Code of Conduct at
+`Code of Conduct <https://www.sqlalchemy.org/codeofconduct.html>`_.
+
+License
+=======
+
+Alembic is distributed under the `MIT license
+<https://opensource.org/licenses/MIT>`_.
diff --git a/libs/alembic-1.18.4.dist-info/RECORD b/libs/alembic-1.18.4.dist-info/RECORD
new file mode 100644
index 0000000000..e515af6fb8
--- /dev/null
+++ b/libs/alembic-1.18.4.dist-info/RECORD
@@ -0,0 +1,104 @@
+../../bin/alembic,sha256=L1WsuXkAaKzUoMmUw815BjlcETDzheJhPsz_pk-A2uM,189
+alembic-1.18.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+alembic-1.18.4.dist-info/METADATA,sha256=sPH3Zq5eEaNtbnI1os9Rvk7eBbFJSMPq13poNNaxvfs,7217
+alembic-1.18.4.dist-info/RECORD,,
+alembic-1.18.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic-1.18.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+alembic-1.18.4.dist-info/entry_points.txt,sha256=aykM30soxwGN0pB7etLc1q0cHJbL9dy46RnK9VX4LLw,48
+alembic-1.18.4.dist-info/licenses/LICENSE,sha256=bmjZSgOg4-Mn3fPobR6-3BTuzjkiAiYY_CRqNilv0Mw,1059
+alembic-1.18.4.dist-info/top_level.txt,sha256=FwKWd5VsPFC8iQjpu1u9Cn-JnK3-V1RhUCmWqz1cl-s,8
+alembic/__init__.py,sha256=6ppwNUS6dfdFIm5uwZaaZ9lDZ7pIwkTNyQcbjY47V3I,93
+alembic/__main__.py,sha256=373m7-TBh72JqrSMYviGrxCHZo-cnweM8AGF8A22PmY,78
+alembic/autogenerate/__init__.py,sha256=ntmUTXhjLm4_zmqIwyVaECdpPDn6_u1yM9vYk6-553E,543
+alembic/autogenerate/api.py,sha256=8tVNDSHlqsBgj1IVLdqvZr_jlvz9kp3O5EKIL9biaZg,22781
+alembic/autogenerate/compare/__init__.py,sha256=kCvA0ZK0rTahNv9wlgyIB5DH2lFEhTRO4PFmoqcL9JE,1809
+alembic/autogenerate/compare/comments.py,sha256=agSrWsZhJ47i-E-EqiP3id2CXTTbP0muOKk1-9in9lg,3234
+alembic/autogenerate/compare/constraints.py,sha256=7sLSvUK9M2CbMRRQy5pveIXbjDLRDnfPx0Dvi_KXOf8,27906
+alembic/autogenerate/compare/schema.py,sha256=plQ7JJ1zJGlnajweSV8lAD9tDYPks5G40sliocTuXJA,1695
+alembic/autogenerate/compare/server_defaults.py,sha256=D--5EvEfyX0fSVkK6iLtRoer5sYK6xeNC2TIdu7klUk,10792
+alembic/autogenerate/compare/tables.py,sha256=47pAgVhbmXGLrm3dMK6hrNABxOAe_cGSQmPtCBwORVc,10611
+alembic/autogenerate/compare/types.py,sha256=75bOduz-dOiyLI065XD5sEP_JF9GPLkDAQ_y5B8lXF0,4005
+alembic/autogenerate/compare/util.py,sha256=K_GArJ2xQXZi6ftb8gkgZuIdVqvyep3E2ZXq8F3-jIU,9521
+alembic/autogenerate/render.py,sha256=ceQL8nk8m2kBtQq5gtxtDLR9iR0Sck8xG_61Oez-Sqs,37270
+alembic/autogenerate/rewriter.py,sha256=NIASSS-KaNKPmbm1k4pE45aawwjSh1Acf6eZrOwnUGM,7814
+alembic/command.py,sha256=7RzAwwXR31sOl0oVItyZl9B0j3TeR5dRyx9634lVsLM,25297
+alembic/config.py,sha256=VoCZV2cFZoF0Xa1OxHqsA-MKzuwBRaJSC7hxZ3-uWN4,34983
+alembic/context.py,sha256=hK1AJOQXJ29Bhn276GYcosxeG7pC5aZRT5E8c4bMJ4Q,195
+alembic/context.pyi,sha256=b_naI_W8dyiZRsL_n299a-LbqLZxKTAgDIXubRLVKlY,32531
+alembic/ddl/__init__.py,sha256=Df8fy4Vn_abP8B7q3x8gyFwEwnLw6hs2Ljt_bV3EZWE,152
+alembic/ddl/_autogen.py,sha256=Blv2RrHNyF4cE6znCQXNXG5T9aO-YmiwD4Fz-qfoaWA,9275
+alembic/ddl/base.py,sha256=dNhLIZnFMP7Cr8rE_e2Zb5skGgCMBOdca1PajXqZYhs,11977
+alembic/ddl/impl.py,sha256=IU3yHFVI3v0QHEwNL_LSN1PRpPF0n09NFFqRZkW86wE,31376
+alembic/ddl/mssql.py,sha256=dee0acwnxmTZXuYPqqlYaDiSbKS46zVH0WRULjX5Blg,17398
+alembic/ddl/mysql.py,sha256=2fvzGcdg4qqCJogGnzvQN636vUi9mF6IoQWLGevvF_A,18456
+alembic/ddl/oracle.py,sha256=669YlkcZihlXFbnXhH2krdrvDry8q5pcUGfoqkg_R6Y,6243
+alembic/ddl/postgresql.py,sha256=04M4OpZOCJJ3ipuHoVwlR1gI1sgRwOguRRVx_mFg8Uc,30417
+alembic/ddl/sqlite.py,sha256=TmzU3YaR3aw_0spSrA6kcUY8fyDfwsu4GkH5deYPEK8,8017
+alembic/environment.py,sha256=MM5lPayGT04H3aeng1H7GQ8HEAs3VGX5yy6mDLCPLT4,43
+alembic/migration.py,sha256=MV6Fju6rZtn2fTREKzXrCZM6aIBGII4OMZFix0X-GLs,41
+alembic/op.py,sha256=flHtcsVqOD-ZgZKK2pv-CJ5Cwh-KJ7puMUNXzishxLw,167
+alembic/op.pyi,sha256=ABBlNk4Eg7DR17knSKIjmvHQBNAmKh3aHQNHU8Oyw08,53347
+alembic/operations/__init__.py,sha256=e0KQSZAgLpTWvyvreB7DWg7RJV_MWSOPVDgCqsd2FzY,318
+alembic/operations/base.py,sha256=ubpv1HDol0g0nuLi0b8-uN7-HEVRZ6mq8arvK9EGo0g,78432
+alembic/operations/batch.py,sha256=hYOpzG2FK_8hk-rHNuLuFAA3-VXRSOnsTrpz2YlA61Q,26947
+alembic/operations/ops.py,sha256=ofbHkReZkZX2n9lXDaIPlrKe2U1mwgQpZNhEbuC4QrM,99325
+alembic/operations/schemaobj.py,sha256=Wp-bBe4a8lXPTvIHJttBY0ejtpVR5Jvtb2kI-U2PztQ,9468
+alembic/operations/toimpl.py,sha256=f8rH3jdob9XvEJr6CoWEkX6X1zgNB5qxdcEQugyhBvU,8466
+alembic/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic/runtime/environment.py,sha256=1cR1v18sIKvOPZMlc4fHGU4J8r6Dec9h4o3WXkMmFKQ,42400
+alembic/runtime/migration.py,sha256=mR2Ee1h9Yy6OMFeDL4LOYorLYby2l2f899WGK_boECw,48427
+alembic/runtime/plugins.py,sha256=pWCDhMX8MvR8scXhiGSRNYNW7-ckEbOW2qK58xRFy1Q,5707
+alembic/script/__init__.py,sha256=lSj06O391Iy5avWAiq8SPs6N8RBgxkSPjP8wpXcNDGg,100
+alembic/script/base.py,sha256=OInSjbfcnUSjVCc5vVYY33UJ1Uo5xE5Huicp8P9VM1I,36698
+alembic/script/revision.py,sha256=SEePZPTMIyfjF73QAD0VIax9jc1dALkiLQZwTzwiyPw,62312
+alembic/script/write_hooks.py,sha256=KWH12250h_JcdBkGsLVo9JKYKpNcJxBUjwZ9r_r88Bc,5369
+alembic/templates/async/README,sha256=ISVtAOvqvKk_5ThM5ioJE-lMkvf9IbknFUFVU_vPma4,58
+alembic/templates/async/alembic.ini.mako,sha256=esbuCnpkyjntJC7k9NnYcCAzhrRQ8NVC4pWineiRk_w,5010
+alembic/templates/async/env.py,sha256=zbOCf3Y7w2lg92hxSwmG1MM_7y56i_oRH4AKp0pQBYo,2389
+alembic/templates/async/script.py.mako,sha256=04kgeBtNMa4cCnG8CfQcKt6P6rnloIfj8wy0u_DBydM,704
+alembic/templates/generic/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
+alembic/templates/generic/alembic.ini.mako,sha256=2i2vPsGQSmE9XMiLz8tSBF_UIA8PJl0-fAvbRVmiK_w,5010
+alembic/templates/generic/env.py,sha256=TLRWOVW3Xpt_Tpf8JFzlnoPn_qoUu8UV77Y4o9XD6yI,2103
+alembic/templates/generic/script.py.mako,sha256=04kgeBtNMa4cCnG8CfQcKt6P6rnloIfj8wy0u_DBydM,704
+alembic/templates/multidb/README,sha256=dWLDhnBgphA4Nzb7sNlMfCS3_06YqVbHhz-9O5JNqyI,606
+alembic/templates/multidb/alembic.ini.mako,sha256=asVt3aJVwjuuw9bopfMofVvonO31coXBbV5DeMRN6cM,5336
+alembic/templates/multidb/env.py,sha256=6zNjnW8mXGUk7erTsAvrfhvqoczJ-gagjVq1Ypg2YIQ,4230
+alembic/templates/multidb/script.py.mako,sha256=ZbCXMkI5Wj2dwNKcxuVGkKZ7Iav93BNx_bM4zbGi3c8,1235
+alembic/templates/pyproject/README,sha256=dMhIiFoeM7EdeaOXBs3mVQ6zXACMyGXDb_UBB6sGRA0,60
+alembic/templates/pyproject/alembic.ini.mako,sha256=bQnEoydnLOUgg9vNbTOys4r5MaW8lmwYFXSrlfdEEkw,782
+alembic/templates/pyproject/env.py,sha256=TLRWOVW3Xpt_Tpf8JFzlnoPn_qoUu8UV77Y4o9XD6yI,2103
+alembic/templates/pyproject/pyproject.toml.mako,sha256=W6x_K-xLfEvyM8D4B3Fg0l20P1h6SPK33188pqRFroQ,3000
+alembic/templates/pyproject/script.py.mako,sha256=04kgeBtNMa4cCnG8CfQcKt6P6rnloIfj8wy0u_DBydM,704
+alembic/templates/pyproject_async/README,sha256=2Q5XcEouiqQ-TJssO9805LROkVUd0F6d74rTnuLrifA,45
+alembic/templates/pyproject_async/alembic.ini.mako,sha256=bQnEoydnLOUgg9vNbTOys4r5MaW8lmwYFXSrlfdEEkw,782
+alembic/templates/pyproject_async/env.py,sha256=zbOCf3Y7w2lg92hxSwmG1MM_7y56i_oRH4AKp0pQBYo,2389
+alembic/templates/pyproject_async/pyproject.toml.mako,sha256=W6x_K-xLfEvyM8D4B3Fg0l20P1h6SPK33188pqRFroQ,3000
+alembic/templates/pyproject_async/script.py.mako,sha256=04kgeBtNMa4cCnG8CfQcKt6P6rnloIfj8wy0u_DBydM,704
+alembic/testing/__init__.py,sha256=PTMhi_2PZ1T_3atQS2CIr0V4YRZzx_doKI-DxKdQS44,1297
+alembic/testing/assertions.py,sha256=VKXMEVWjuPAsYnNxP3WnUpXaFN3ytNFf9LI72OEJ074,5344
+alembic/testing/env.py,sha256=oQN56xXHtHfK8RD-8pH8yZ-uWcjpuNL1Mt5HNrzZyc0,12151
+alembic/testing/fixtures.py,sha256=meqm10rd1ynppW6tw1wcpDJJLyQezZ7FwKyqcrwIOok,11931
+alembic/testing/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+alembic/testing/plugin/bootstrap.py,sha256=9C6wtjGrIVztZ928w27hsQE0KcjDLIUtUN3dvZKsMVk,50
+alembic/testing/requirements.py,sha256=OZSHd8I3zOb7288cZxUTebqxx8j0T6I8MekH15TyPvY,4566
+alembic/testing/schemacompare.py,sha256=N5UqSNCOJetIKC4vKhpYzQEpj08XkdgIoqBmEPQ3tlc,4838
+alembic/testing/suite/__init__.py,sha256=MvE7-hwbaVN1q3NM-ztGxORU9dnIelUCINKqNxewn7Y,288
+alembic/testing/suite/_autogen_fixtures.py,sha256=3nNTd8iDeVeSgpPIj8KAraNbU-PkJtxDb4X_TVsZ528,14200
+alembic/testing/suite/test_autogen_comments.py,sha256=aEGqKUDw4kHjnDk298aoGcQvXJWmZXcIX_2FxH4cJK8,6283
+alembic/testing/suite/test_autogen_computed.py,sha256=puJ0hBtLzNz8LiPGqDPS8vse6dUS9VCBpUdw-cOksZo,4554
+alembic/testing/suite/test_autogen_diffs.py,sha256=T4SR1n_kmcOKYhR4W1-dA0e5sddJ69DSVL2HW96kAkE,8394
+alembic/testing/suite/test_autogen_fks.py,sha256=wHKjD4Egf7IZlH0HYw-c8uti0jhJpOm5K42QMXf5tIw,32930
+alembic/testing/suite/test_autogen_identity.py,sha256=kcuqngG7qXAKPJDX4U8sRzPKHEJECHuZ0DtuaS6tVkk,5824
+alembic/testing/suite/test_environment.py,sha256=OwD-kpESdLoc4byBrGrXbZHvqtPbzhFCG4W9hJOJXPQ,11877
+alembic/testing/suite/test_op.py,sha256=2XQCdm_NmnPxHGuGj7hmxMzIhKxXNotUsKdACXzE1mM,1343
+alembic/testing/util.py,sha256=CQrcQDA8fs_7ME85z5ydb-Bt70soIIID-qNY1vbR2dg,3350
+alembic/testing/warnings.py,sha256=cDDWzvxNZE6x9dME2ACTXSv01G81JcIbE1GIE_s1kvg,831
+alembic/util/__init__.py,sha256=xNpZtajyTF4eVEbLj0Pcm2FbNkIZD_pCvKGKSPucTEs,1777
+alembic/util/compat.py,sha256=NytmcsMtK8WEEVwWc-ZWYlSOi55BtRlmJXjxnF3nsh8,3810
+alembic/util/editor.py,sha256=JIz6_BdgV8_oKtnheR6DZoB7qnrHrlRgWjx09AsTsUw,2546
+alembic/util/exc.py,sha256=SublpLmAeAW8JeEml-1YyhIjkSORTkZbvHVVJeoPymg,993
+alembic/util/langhelpers.py,sha256=GBbR01xNi1kmz8W37h0NzXl3hBC1SY7k7Bj-h5jVgps,13164
+alembic/util/messaging.py,sha256=3bEBoDy4EAXETXAvArlYjeMITXDTgPTu6ZoE3ytnzSw,3294
+alembic/util/pyfiles.py,sha256=QUZYc5kE3Z7nV64PblcRffzA7VfVaiFB2x3vtcG0_AE,4707
+alembic/util/sqla_compat.py,sha256=llgJVtOsO1c3euS9_peORZkM9QeSvQWa-1LNHqrzEM4,15246
diff --git a/libs/Flask_Cors-5.0.0.dist-info/REQUESTED b/libs/alembic-1.18.4.dist-info/REQUESTED
similarity index 100%
rename from libs/Flask_Cors-5.0.0.dist-info/REQUESTED
rename to libs/alembic-1.18.4.dist-info/REQUESTED
diff --git a/libs/alembic-1.18.4.dist-info/WHEEL b/libs/alembic-1.18.4.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/alembic-1.18.4.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/alembic-1.14.0.dist-info/entry_points.txt b/libs/alembic-1.18.4.dist-info/entry_points.txt
similarity index 100%
rename from libs/alembic-1.14.0.dist-info/entry_points.txt
rename to libs/alembic-1.18.4.dist-info/entry_points.txt
diff --git a/libs/alembic-1.18.4.dist-info/licenses/LICENSE b/libs/alembic-1.18.4.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..b03e235f9a
--- /dev/null
+++ b/libs/alembic-1.18.4.dist-info/licenses/LICENSE
@@ -0,0 +1,19 @@
+Copyright 2009-2026 Michael Bayer.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/alembic-1.14.0.dist-info/top_level.txt b/libs/alembic-1.18.4.dist-info/top_level.txt
similarity index 100%
rename from libs/alembic-1.14.0.dist-info/top_level.txt
rename to libs/alembic-1.18.4.dist-info/top_level.txt
diff --git a/libs/alembic/__init__.py b/libs/alembic/__init__.py
index 637b2d4e14..059b6b1588 100644
--- a/libs/alembic/__init__.py
+++ b/libs/alembic/__init__.py
@@ -1,4 +1,6 @@
 from . import context
 from . import op
+from .runtime import plugins
 
-__version__ = "1.14.0"
+
+__version__ = "1.18.4"
diff --git a/libs/alembic/autogenerate/api.py b/libs/alembic/autogenerate/api.py
index 4c03916288..b2e3faef78 100644
--- a/libs/alembic/autogenerate/api.py
+++ b/libs/alembic/autogenerate/api.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import contextlib
+import logging
 from typing import Any
 from typing import Dict
 from typing import Iterator
@@ -17,11 +18,9 @@
 from . import render
 from .. import util
 from ..operations import ops
+from ..runtime.plugins import Plugin
 from ..util import sqla_compat
 
-"""Provide the 'autogenerate' feature which can produce migration operations
-automatically."""
-
 if TYPE_CHECKING:
     from sqlalchemy.engine import Connection
     from sqlalchemy.engine import Dialect
@@ -42,6 +41,10 @@
     from ..script.base import Script
     from ..script.base import ScriptDirectory
     from ..script.revision import _GetRevArg
+    from ..util import PriorityDispatcher
+
+
+log = logging.getLogger(__name__)
 
 
 def compare_metadata(context: MigrationContext, metadata: MetaData) -> Any:
@@ -277,7 +280,7 @@ class AutogenContext:
     """Maintains configuration and state that's specific to an
     autogenerate operation."""
 
-    metadata: Optional[MetaData] = None
+    metadata: Union[MetaData, Sequence[MetaData], None] = None
     """The :class:`~sqlalchemy.schema.MetaData` object
     representing the destination.
 
@@ -304,7 +307,7 @@ class AutogenContext:
 
     """
 
-    dialect: Optional[Dialect] = None
+    dialect: Dialect
     """The :class:`~sqlalchemy.engine.Dialect` object currently in use.
 
     This is normally obtained from the
@@ -326,13 +329,15 @@ class AutogenContext:
 
     """
 
-    migration_context: MigrationContext = None  # type: ignore[assignment]
+    migration_context: MigrationContext
     """The :class:`.MigrationContext` established by the ``env.py`` script."""
 
+    comparators: PriorityDispatcher
+
     def __init__(
         self,
         migration_context: MigrationContext,
-        metadata: Optional[MetaData] = None,
+        metadata: Union[MetaData, Sequence[MetaData], None] = None,
         opts: Optional[Dict[str, Any]] = None,
         autogenerate: bool = True,
     ) -> None:
@@ -346,6 +351,19 @@ def __init__(
                 "the database for schema information"
             )
 
+        # branch off from the "global" comparators.  This collection
+        # is empty in Alembic except that it is populated by third party
+        # extensions that don't use the plugin system.  so we will build
+        # off of whatever is in there.
+        if autogenerate:
+            self.comparators = compare.comparators.branch()
+            Plugin.populate_autogenerate_priority_dispatch(
+                self.comparators,
+                include_plugins=migration_context.opts.get(
+                    "autogenerate_plugins", ["alembic.autogenerate.*"]
+                ),
+            )
+
         if opts is None:
             opts = migration_context.opts
 
@@ -380,9 +398,8 @@ def __init__(
         self._name_filters = name_filters
 
         self.migration_context = migration_context
-        if self.migration_context is not None:
-            self.connection = self.migration_context.bind
-            self.dialect = self.migration_context.dialect
+        self.connection = self.migration_context.bind
+        self.dialect = self.migration_context.dialect
 
         self.imports = set()
         self.opts: Dict[str, Any] = opts
diff --git a/libs/alembic/autogenerate/compare.py b/libs/alembic/autogenerate/compare.py
deleted file mode 100644
index 0d98519643..0000000000
--- a/libs/alembic/autogenerate/compare.py
+++ /dev/null
@@ -1,1329 +0,0 @@
-# mypy: allow-untyped-defs, allow-incomplete-defs, allow-untyped-calls
-# mypy: no-warn-return-any, allow-any-generics
-
-from __future__ import annotations
-
-import contextlib
-import logging
-import re
-from typing import Any
-from typing import cast
-from typing import Dict
-from typing import Iterator
-from typing import Mapping
-from typing import Optional
-from typing import Set
-from typing import Tuple
-from typing import TYPE_CHECKING
-from typing import TypeVar
-from typing import Union
-
-from sqlalchemy import event
-from sqlalchemy import inspect
-from sqlalchemy import schema as sa_schema
-from sqlalchemy import text
-from sqlalchemy import types as sqltypes
-from sqlalchemy.sql import expression
-from sqlalchemy.sql.schema import ForeignKeyConstraint
-from sqlalchemy.sql.schema import Index
-from sqlalchemy.sql.schema import UniqueConstraint
-from sqlalchemy.util import OrderedSet
-
-from .. import util
-from ..ddl._autogen import is_index_sig
-from ..ddl._autogen import is_uq_sig
-from ..operations import ops
-from ..util import sqla_compat
-
-if TYPE_CHECKING:
-    from typing import Literal
-
-    from sqlalchemy.engine.reflection import Inspector
-    from sqlalchemy.sql.elements import quoted_name
-    from sqlalchemy.sql.elements import TextClause
-    from sqlalchemy.sql.schema import Column
-    from sqlalchemy.sql.schema import Table
-
-    from alembic.autogenerate.api import AutogenContext
-    from alembic.ddl.impl import DefaultImpl
-    from alembic.operations.ops import AlterColumnOp
-    from alembic.operations.ops import MigrationScript
-    from alembic.operations.ops import ModifyTableOps
-    from alembic.operations.ops import UpgradeOps
-    from ..ddl._autogen import _constraint_sig
-
-
-log = logging.getLogger(__name__)
-
-
-def _populate_migration_script(
-    autogen_context: AutogenContext, migration_script: MigrationScript
-) -> None:
-    upgrade_ops = migration_script.upgrade_ops_list[-1]
-    downgrade_ops = migration_script.downgrade_ops_list[-1]
-
-    _produce_net_changes(autogen_context, upgrade_ops)
-    upgrade_ops.reverse_into(downgrade_ops)
-
-
-comparators = util.Dispatcher(uselist=True)
-
-
-def _produce_net_changes(
-    autogen_context: AutogenContext, upgrade_ops: UpgradeOps
-) -> None:
-    connection = autogen_context.connection
-    assert connection is not None
-    include_schemas = autogen_context.opts.get("include_schemas", False)
-
-    inspector: Inspector = inspect(connection)
-
-    default_schema = connection.dialect.default_schema_name
-    schemas: Set[Optional[str]]
-    if include_schemas:
-        schemas = set(inspector.get_schema_names())
-        # replace default schema name with None
-        schemas.discard("information_schema")
-        # replace the "default" schema with None
-        schemas.discard(default_schema)
-        schemas.add(None)
-    else:
-        schemas = {None}
-
-    schemas = {
-        s for s in schemas if autogen_context.run_name_filters(s, "schema", {})
-    }
-
-    assert autogen_context.dialect is not None
-    comparators.dispatch("schema", autogen_context.dialect.name)(
-        autogen_context, upgrade_ops, schemas
-    )
-
-
-@comparators.dispatch_for("schema")
-def _autogen_for_tables(
-    autogen_context: AutogenContext,
-    upgrade_ops: UpgradeOps,
-    schemas: Union[Set[None], Set[Optional[str]]],
-) -> None:
-    inspector = autogen_context.inspector
-
-    conn_table_names: Set[Tuple[Optional[str], str]] = set()
-
-    version_table_schema = (
-        autogen_context.migration_context.version_table_schema
-    )
-    version_table = autogen_context.migration_context.version_table
-
-    for schema_name in schemas:
-        tables = set(inspector.get_table_names(schema=schema_name))
-        if schema_name == version_table_schema:
-            tables = tables.difference(
-                [autogen_context.migration_context.version_table]
-            )
-
-        conn_table_names.update(
-            (schema_name, tname)
-            for tname in tables
-            if autogen_context.run_name_filters(
-                tname, "table", {"schema_name": schema_name}
-            )
-        )
-
-    metadata_table_names = OrderedSet(
-        [(table.schema, table.name) for table in autogen_context.sorted_tables]
-    ).difference([(version_table_schema, version_table)])
-
-    _compare_tables(
-        conn_table_names,
-        metadata_table_names,
-        inspector,
-        upgrade_ops,
-        autogen_context,
-    )
-
-
-def _compare_tables(
-    conn_table_names: set,
-    metadata_table_names: set,
-    inspector: Inspector,
-    upgrade_ops: UpgradeOps,
-    autogen_context: AutogenContext,
-) -> None:
-    default_schema = inspector.bind.dialect.default_schema_name
-
-    # tables coming from the connection will not have "schema"
-    # set if it matches default_schema_name; so we need a list
-    # of table names from local metadata that also have "None" if schema
-    # == default_schema_name.  Most setups will be like this anyway but
-    # some are not (see #170)
-    metadata_table_names_no_dflt_schema = OrderedSet(
-        [
-            (schema if schema != default_schema else None, tname)
-            for schema, tname in metadata_table_names
-        ]
-    )
-
-    # to adjust for the MetaData collection storing the tables either
-    # as "schemaname.tablename" or just "tablename", create a new lookup
-    # which will match the "non-default-schema" keys to the Table object.
-    tname_to_table = {
-        no_dflt_schema: autogen_context.table_key_to_table[
-            sa_schema._get_table_key(tname, schema)
-        ]
-        for no_dflt_schema, (schema, tname) in zip(
-            metadata_table_names_no_dflt_schema, metadata_table_names
-        )
-    }
-    metadata_table_names = metadata_table_names_no_dflt_schema
-
-    for s, tname in metadata_table_names.difference(conn_table_names):
-        name = "%s.%s" % (s, tname) if s else tname
-        metadata_table = tname_to_table[(s, tname)]
-        if autogen_context.run_object_filters(
-            metadata_table, tname, "table", False, None
-        ):
-            upgrade_ops.ops.append(
-                ops.CreateTableOp.from_table(metadata_table)
-            )
-            log.info("Detected added table %r", name)
-            modify_table_ops = ops.ModifyTableOps(tname, [], schema=s)
-
-            comparators.dispatch("table")(
-                autogen_context,
-                modify_table_ops,
-                s,
-                tname,
-                None,
-                metadata_table,
-            )
-            if not modify_table_ops.is_empty():
-                upgrade_ops.ops.append(modify_table_ops)
-
-    removal_metadata = sa_schema.MetaData()
-    for s, tname in conn_table_names.difference(metadata_table_names):
-        name = sa_schema._get_table_key(tname, s)
-        exists = name in removal_metadata.tables
-        t = sa_schema.Table(tname, removal_metadata, schema=s)
-
-        if not exists:
-            event.listen(
-                t,
-                "column_reflect",
-                # fmt: off
-                autogen_context.migration_context.impl.
-                _compat_autogen_column_reflect
-                (inspector),
-                # fmt: on
-            )
-            sqla_compat._reflect_table(inspector, t)
-        if autogen_context.run_object_filters(t, tname, "table", True, None):
-            modify_table_ops = ops.ModifyTableOps(tname, [], schema=s)
-
-            comparators.dispatch("table")(
-                autogen_context, modify_table_ops, s, tname, t, None
-            )
-            if not modify_table_ops.is_empty():
-                upgrade_ops.ops.append(modify_table_ops)
-
-            upgrade_ops.ops.append(ops.DropTableOp.from_table(t))
-            log.info("Detected removed table %r", name)
-
-    existing_tables = conn_table_names.intersection(metadata_table_names)
-
-    existing_metadata = sa_schema.MetaData()
-    conn_column_info = {}
-    for s, tname in existing_tables:
-        name = sa_schema._get_table_key(tname, s)
-        exists = name in existing_metadata.tables
-        t = sa_schema.Table(tname, existing_metadata, schema=s)
-        if not exists:
-            event.listen(
-                t,
-                "column_reflect",
-                # fmt: off
-                autogen_context.migration_context.impl.
-                _compat_autogen_column_reflect(inspector),
-                # fmt: on
-            )
-            sqla_compat._reflect_table(inspector, t)
-        conn_column_info[(s, tname)] = t
-
-    for s, tname in sorted(existing_tables, key=lambda x: (x[0] or "", x[1])):
-        s = s or None
-        name = "%s.%s" % (s, tname) if s else tname
-        metadata_table = tname_to_table[(s, tname)]
-        conn_table = existing_metadata.tables[name]
-
-        if autogen_context.run_object_filters(
-            metadata_table, tname, "table", False, conn_table
-        ):
-            modify_table_ops = ops.ModifyTableOps(tname, [], schema=s)
-            with _compare_columns(
-                s,
-                tname,
-                conn_table,
-                metadata_table,
-                modify_table_ops,
-                autogen_context,
-                inspector,
-            ):
-                comparators.dispatch("table")(
-                    autogen_context,
-                    modify_table_ops,
-                    s,
-                    tname,
-                    conn_table,
-                    metadata_table,
-                )
-
-            if not modify_table_ops.is_empty():
-                upgrade_ops.ops.append(modify_table_ops)
-
-
-_IndexColumnSortingOps: Mapping[str, Any] = util.immutabledict(
-    {
-        "asc": expression.asc,
-        "desc": expression.desc,
-        "nulls_first": expression.nullsfirst,
-        "nulls_last": expression.nullslast,
-        "nullsfirst": expression.nullsfirst,  # 1_3 name
-        "nullslast": expression.nullslast,  # 1_3 name
-    }
-)
-
-
-def _make_index(
-    impl: DefaultImpl, params: Dict[str, Any], conn_table: Table
-) -> Optional[Index]:
-    exprs: list[Union[Column[Any], TextClause]] = []
-    sorting = params.get("column_sorting")
-
-    for num, col_name in enumerate(params["column_names"]):
-        item: Union[Column[Any], TextClause]
-        if col_name is None:
-            assert "expressions" in params
-            name = params["expressions"][num]
-            item = text(name)
-        else:
-            name = col_name
-            item = conn_table.c[col_name]
-        if sorting and name in sorting:
-            for operator in sorting[name]:
-                if operator in _IndexColumnSortingOps:
-                    item = _IndexColumnSortingOps[operator](item)
-        exprs.append(item)
-    ix = sa_schema.Index(
-        params["name"],
-        *exprs,
-        unique=params["unique"],
-        _table=conn_table,
-        **impl.adjust_reflected_dialect_options(params, "index"),
-    )
-    if "duplicates_constraint" in params:
-        ix.info["duplicates_constraint"] = params["duplicates_constraint"]
-    return ix
-
-
-def _make_unique_constraint(
-    impl: DefaultImpl, params: Dict[str, Any], conn_table: Table
-) -> UniqueConstraint:
-    uq = sa_schema.UniqueConstraint(
-        *[conn_table.c[cname] for cname in params["column_names"]],
-        name=params["name"],
-        **impl.adjust_reflected_dialect_options(params, "unique_constraint"),
-    )
-    if "duplicates_index" in params:
-        uq.info["duplicates_index"] = params["duplicates_index"]
-
-    return uq
-
-
-def _make_foreign_key(
-    params: Dict[str, Any], conn_table: Table
-) -> ForeignKeyConstraint:
-    tname = params["referred_table"]
-    if params["referred_schema"]:
-        tname = "%s.%s" % (params["referred_schema"], tname)
-
-    options = params.get("options", {})
-
-    const = sa_schema.ForeignKeyConstraint(
-        [conn_table.c[cname] for cname in params["constrained_columns"]],
-        ["%s.%s" % (tname, n) for n in params["referred_columns"]],
-        onupdate=options.get("onupdate"),
-        ondelete=options.get("ondelete"),
-        deferrable=options.get("deferrable"),
-        initially=options.get("initially"),
-        name=params["name"],
-    )
-    # needed by 0.7
-    conn_table.append_constraint(const)
-    return const
-
-
-@contextlib.contextmanager
-def _compare_columns(
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    conn_table: Table,
-    metadata_table: Table,
-    modify_table_ops: ModifyTableOps,
-    autogen_context: AutogenContext,
-    inspector: Inspector,
-) -> Iterator[None]:
-    name = "%s.%s" % (schema, tname) if schema else tname
-    metadata_col_names = OrderedSet(
-        c.name for c in metadata_table.c if not c.system
-    )
-    metadata_cols_by_name = {
-        c.name: c for c in metadata_table.c if not c.system
-    }
-
-    conn_col_names = {
-        c.name: c
-        for c in conn_table.c
-        if autogen_context.run_name_filters(
-            c.name, "column", {"table_name": tname, "schema_name": schema}
-        )
-    }
-
-    for cname in metadata_col_names.difference(conn_col_names):
-        if autogen_context.run_object_filters(
-            metadata_cols_by_name[cname], cname, "column", False, None
-        ):
-            modify_table_ops.ops.append(
-                ops.AddColumnOp.from_column_and_tablename(
-                    schema, tname, metadata_cols_by_name[cname]
-                )
-            )
-            log.info("Detected added column '%s.%s'", name, cname)
-
-    for colname in metadata_col_names.intersection(conn_col_names):
-        metadata_col = metadata_cols_by_name[colname]
-        conn_col = conn_table.c[colname]
-        if not autogen_context.run_object_filters(
-            metadata_col, colname, "column", False, conn_col
-        ):
-            continue
-        alter_column_op = ops.AlterColumnOp(tname, colname, schema=schema)
-
-        comparators.dispatch("column")(
-            autogen_context,
-            alter_column_op,
-            schema,
-            tname,
-            colname,
-            conn_col,
-            metadata_col,
-        )
-
-        if alter_column_op.has_changes():
-            modify_table_ops.ops.append(alter_column_op)
-
-    yield
-
-    for cname in set(conn_col_names).difference(metadata_col_names):
-        if autogen_context.run_object_filters(
-            conn_table.c[cname], cname, "column", True, None
-        ):
-            modify_table_ops.ops.append(
-                ops.DropColumnOp.from_column_and_tablename(
-                    schema, tname, conn_table.c[cname]
-                )
-            )
-            log.info("Detected removed column '%s.%s'", name, cname)
-
-
-_C = TypeVar("_C", bound=Union[UniqueConstraint, ForeignKeyConstraint, Index])
-
-
-@comparators.dispatch_for("table")
-def _compare_indexes_and_uniques(
-    autogen_context: AutogenContext,
-    modify_ops: ModifyTableOps,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    conn_table: Optional[Table],
-    metadata_table: Optional[Table],
-) -> None:
-    inspector = autogen_context.inspector
-    is_create_table = conn_table is None
-    is_drop_table = metadata_table is None
-    impl = autogen_context.migration_context.impl
-
-    # 1a. get raw indexes and unique constraints from metadata ...
-    if metadata_table is not None:
-        metadata_unique_constraints = {
-            uq
-            for uq in metadata_table.constraints
-            if isinstance(uq, sa_schema.UniqueConstraint)
-        }
-        metadata_indexes = set(metadata_table.indexes)
-    else:
-        metadata_unique_constraints = set()
-        metadata_indexes = set()
-
-    conn_uniques = conn_indexes = frozenset()  # type:ignore[var-annotated]
-
-    supports_unique_constraints = False
-
-    unique_constraints_duplicate_unique_indexes = False
-
-    if conn_table is not None:
-        # 1b. ... and from connection, if the table exists
-        try:
-            conn_uniques = inspector.get_unique_constraints(  # type:ignore[assignment] # noqa
-                tname, schema=schema
-            )
-            supports_unique_constraints = True
-        except NotImplementedError:
-            pass
-        except TypeError:
-            # number of arguments is off for the base
-            # method in SQLAlchemy due to the cache decorator
-            # not being present
-            pass
-        else:
-            conn_uniques = [  # type:ignore[assignment]
-                uq
-                for uq in conn_uniques
-                if autogen_context.run_name_filters(
-                    uq["name"],
-                    "unique_constraint",
-                    {"table_name": tname, "schema_name": schema},
-                )
-            ]
-            for uq in conn_uniques:
-                if uq.get("duplicates_index"):
-                    unique_constraints_duplicate_unique_indexes = True
-        try:
-            conn_indexes = inspector.get_indexes(  # type:ignore[assignment]
-                tname, schema=schema
-            )
-        except NotImplementedError:
-            pass
-        else:
-            conn_indexes = [  # type:ignore[assignment]
-                ix
-                for ix in conn_indexes
-                if autogen_context.run_name_filters(
-                    ix["name"],
-                    "index",
-                    {"table_name": tname, "schema_name": schema},
-                )
-            ]
-
-        # 2. convert conn-level objects from raw inspector records
-        # into schema objects
-        if is_drop_table:
-            # for DROP TABLE uniques are inline, don't need them
-            conn_uniques = set()  # type:ignore[assignment]
-        else:
-            conn_uniques = {  # type:ignore[assignment]
-                _make_unique_constraint(impl, uq_def, conn_table)
-                for uq_def in conn_uniques
-            }
-
-        conn_indexes = {  # type:ignore[assignment]
-            index
-            for index in (
-                _make_index(impl, ix, conn_table) for ix in conn_indexes
-            )
-            if index is not None
-        }
-
-    # 2a. if the dialect dupes unique indexes as unique constraints
-    # (mysql and oracle), correct for that
-
-    if unique_constraints_duplicate_unique_indexes:
-        _correct_for_uq_duplicates_uix(
-            conn_uniques,
-            conn_indexes,
-            metadata_unique_constraints,
-            metadata_indexes,
-            autogen_context.dialect,
-            impl,
-        )
-
-    # 3. give the dialect a chance to omit indexes and constraints that
-    # we know are either added implicitly by the DB or that the DB
-    # can't accurately report on
-    impl.correct_for_autogen_constraints(
-        conn_uniques,  # type: ignore[arg-type]
-        conn_indexes,  # type: ignore[arg-type]
-        metadata_unique_constraints,
-        metadata_indexes,
-    )
-
-    # 4. organize the constraints into "signature" collections, the
-    # _constraint_sig() objects provide a consistent facade over both
-    # Index and UniqueConstraint so we can easily work with them
-    # interchangeably
-    metadata_unique_constraints_sig = {
-        impl._create_metadata_constraint_sig(uq)
-        for uq in metadata_unique_constraints
-    }
-
-    metadata_indexes_sig = {
-        impl._create_metadata_constraint_sig(ix) for ix in metadata_indexes
-    }
-
-    conn_unique_constraints = {
-        impl._create_reflected_constraint_sig(uq) for uq in conn_uniques
-    }
-
-    conn_indexes_sig = {
-        impl._create_reflected_constraint_sig(ix) for ix in conn_indexes
-    }
-
-    # 5. index things by name, for those objects that have names
-    metadata_names = {
-        cast(str, c.md_name_to_sql_name(autogen_context)): c
-        for c in metadata_unique_constraints_sig.union(metadata_indexes_sig)
-        if c.is_named
-    }
-
-    conn_uniques_by_name: Dict[sqla_compat._ConstraintName, _constraint_sig]
-    conn_indexes_by_name: Dict[sqla_compat._ConstraintName, _constraint_sig]
-
-    conn_uniques_by_name = {c.name: c for c in conn_unique_constraints}
-    conn_indexes_by_name = {c.name: c for c in conn_indexes_sig}
-    conn_names = {
-        c.name: c
-        for c in conn_unique_constraints.union(conn_indexes_sig)
-        if sqla_compat.constraint_name_string(c.name)
-    }
-
-    doubled_constraints = {
-        name: (conn_uniques_by_name[name], conn_indexes_by_name[name])
-        for name in set(conn_uniques_by_name).intersection(
-            conn_indexes_by_name
-        )
-    }
-
-    # 6. index things by "column signature", to help with unnamed unique
-    # constraints.
-    conn_uniques_by_sig = {uq.unnamed: uq for uq in conn_unique_constraints}
-    metadata_uniques_by_sig = {
-        uq.unnamed: uq for uq in metadata_unique_constraints_sig
-    }
-    unnamed_metadata_uniques = {
-        uq.unnamed: uq
-        for uq in metadata_unique_constraints_sig
-        if not sqla_compat._constraint_is_named(
-            uq.const, autogen_context.dialect
-        )
-    }
-
-    # assumptions:
-    # 1. a unique constraint or an index from the connection *always*
-    #    has a name.
-    # 2. an index on the metadata side *always* has a name.
-    # 3. a unique constraint on the metadata side *might* have a name.
-    # 4. The backend may double up indexes as unique constraints and
-    #    vice versa (e.g. MySQL, Postgresql)
-
-    def obj_added(obj: _constraint_sig):
-        if is_index_sig(obj):
-            if autogen_context.run_object_filters(
-                obj.const, obj.name, "index", False, None
-            ):
-                modify_ops.ops.append(ops.CreateIndexOp.from_index(obj.const))
-                log.info(
-                    "Detected added index '%r' on '%s'",
-                    obj.name,
-                    obj.column_names,
-                )
-        elif is_uq_sig(obj):
-            if not supports_unique_constraints:
-                # can't report unique indexes as added if we don't
-                # detect them
-                return
-            if is_create_table or is_drop_table:
-                # unique constraints are created inline with table defs
-                return
-            if autogen_context.run_object_filters(
-                obj.const, obj.name, "unique_constraint", False, None
-            ):
-                modify_ops.ops.append(
-                    ops.AddConstraintOp.from_constraint(obj.const)
-                )
-                log.info(
-                    "Detected added unique constraint %r on '%s'",
-                    obj.name,
-                    obj.column_names,
-                )
-        else:
-            assert False
-
-    def obj_removed(obj: _constraint_sig):
-        if is_index_sig(obj):
-            if obj.is_unique and not supports_unique_constraints:
-                # many databases double up unique constraints
-                # as unique indexes.  without that list we can't
-                # be sure what we're doing here
-                return
-
-            if autogen_context.run_object_filters(
-                obj.const, obj.name, "index", True, None
-            ):
-                modify_ops.ops.append(ops.DropIndexOp.from_index(obj.const))
-                log.info("Detected removed index %r on %r", obj.name, tname)
-        elif is_uq_sig(obj):
-            if is_create_table or is_drop_table:
-                # if the whole table is being dropped, we don't need to
-                # consider unique constraint separately
-                return
-            if autogen_context.run_object_filters(
-                obj.const, obj.name, "unique_constraint", True, None
-            ):
-                modify_ops.ops.append(
-                    ops.DropConstraintOp.from_constraint(obj.const)
-                )
-                log.info(
-                    "Detected removed unique constraint %r on %r",
-                    obj.name,
-                    tname,
-                )
-        else:
-            assert False
-
-    def obj_changed(
-        old: _constraint_sig,
-        new: _constraint_sig,
-        msg: str,
-    ):
-        if is_index_sig(old):
-            assert is_index_sig(new)
-
-            if autogen_context.run_object_filters(
-                new.const, new.name, "index", False, old.const
-            ):
-                log.info(
-                    "Detected changed index %r on %r: %s", old.name, tname, msg
-                )
-                modify_ops.ops.append(ops.DropIndexOp.from_index(old.const))
-                modify_ops.ops.append(ops.CreateIndexOp.from_index(new.const))
-        elif is_uq_sig(old):
-            assert is_uq_sig(new)
-
-            if autogen_context.run_object_filters(
-                new.const, new.name, "unique_constraint", False, old.const
-            ):
-                log.info(
-                    "Detected changed unique constraint %r on %r: %s",
-                    old.name,
-                    tname,
-                    msg,
-                )
-                modify_ops.ops.append(
-                    ops.DropConstraintOp.from_constraint(old.const)
-                )
-                modify_ops.ops.append(
-                    ops.AddConstraintOp.from_constraint(new.const)
-                )
-        else:
-            assert False
-
-    for removed_name in sorted(set(conn_names).difference(metadata_names)):
-        conn_obj = conn_names[removed_name]
-        if (
-            is_uq_sig(conn_obj)
-            and conn_obj.unnamed in unnamed_metadata_uniques
-        ):
-            continue
-        elif removed_name in doubled_constraints:
-            conn_uq, conn_idx = doubled_constraints[removed_name]
-            if (
-                all(
-                    conn_idx.unnamed != meta_idx.unnamed
-                    for meta_idx in metadata_indexes_sig
-                )
-                and conn_uq.unnamed not in metadata_uniques_by_sig
-            ):
-                obj_removed(conn_uq)
-                obj_removed(conn_idx)
-        else:
-            obj_removed(conn_obj)
-
-    for existing_name in sorted(set(metadata_names).intersection(conn_names)):
-        metadata_obj = metadata_names[existing_name]
-
-        if existing_name in doubled_constraints:
-            conn_uq, conn_idx = doubled_constraints[existing_name]
-            if is_index_sig(metadata_obj):
-                conn_obj = conn_idx
-            else:
-                conn_obj = conn_uq
-        else:
-            conn_obj = conn_names[existing_name]
-
-        if type(conn_obj) != type(metadata_obj):
-            obj_removed(conn_obj)
-            obj_added(metadata_obj)
-        else:
-            comparison = metadata_obj.compare_to_reflected(conn_obj)
-
-            if comparison.is_different:
-                # constraint are different
-                obj_changed(conn_obj, metadata_obj, comparison.message)
-            elif comparison.is_skip:
-                # constraint cannot be compared, skip them
-                thing = (
-                    "index" if is_index_sig(conn_obj) else "unique constraint"
-                )
-                log.info(
-                    "Cannot compare %s %r, assuming equal and skipping. %s",
-                    thing,
-                    conn_obj.name,
-                    comparison.message,
-                )
-            else:
-                # constraint are equal
-                assert comparison.is_equal
-
-    for added_name in sorted(set(metadata_names).difference(conn_names)):
-        obj = metadata_names[added_name]
-        obj_added(obj)
-
-    for uq_sig in unnamed_metadata_uniques:
-        if uq_sig not in conn_uniques_by_sig:
-            obj_added(unnamed_metadata_uniques[uq_sig])
-
-
-def _correct_for_uq_duplicates_uix(
-    conn_unique_constraints,
-    conn_indexes,
-    metadata_unique_constraints,
-    metadata_indexes,
-    dialect,
-    impl,
-):
-    # dedupe unique indexes vs. constraints, since MySQL / Oracle
-    # doesn't really have unique constraints as a separate construct.
-    # but look in the metadata and try to maintain constructs
-    # that already seem to be defined one way or the other
-    # on that side.  This logic was formerly local to MySQL dialect,
-    # generalized to Oracle and others. See #276
-
-    # resolve final rendered name for unique constraints defined in the
-    # metadata.   this includes truncation of long names.  naming convention
-    # names currently should already be set as cons.name, however leave this
-    # to the sqla_compat to decide.
-    metadata_cons_names = [
-        (sqla_compat._get_constraint_final_name(cons, dialect), cons)
-        for cons in metadata_unique_constraints
-    ]
-
-    metadata_uq_names = {
-        name for name, cons in metadata_cons_names if name is not None
-    }
-
-    unnamed_metadata_uqs = {
-        impl._create_metadata_constraint_sig(cons).unnamed
-        for name, cons in metadata_cons_names
-        if name is None
-    }
-
-    metadata_ix_names = {
-        sqla_compat._get_constraint_final_name(cons, dialect)
-        for cons in metadata_indexes
-        if cons.unique
-    }
-
-    # for reflection side, names are in their final database form
-    # already since they're from the database
-    conn_ix_names = {cons.name: cons for cons in conn_indexes if cons.unique}
-
-    uqs_dupe_indexes = {
-        cons.name: cons
-        for cons in conn_unique_constraints
-        if cons.info["duplicates_index"]
-    }
-
-    for overlap in uqs_dupe_indexes:
-        if overlap not in metadata_uq_names:
-            if (
-                impl._create_reflected_constraint_sig(
-                    uqs_dupe_indexes[overlap]
-                ).unnamed
-                not in unnamed_metadata_uqs
-            ):
-                conn_unique_constraints.discard(uqs_dupe_indexes[overlap])
-        elif overlap not in metadata_ix_names:
-            conn_indexes.discard(conn_ix_names[overlap])
-
-
-@comparators.dispatch_for("column")
-def _compare_nullable(
-    autogen_context: AutogenContext,
-    alter_column_op: AlterColumnOp,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    cname: Union[quoted_name, str],
-    conn_col: Column[Any],
-    metadata_col: Column[Any],
-) -> None:
-    metadata_col_nullable = metadata_col.nullable
-    conn_col_nullable = conn_col.nullable
-    alter_column_op.existing_nullable = conn_col_nullable
-
-    if conn_col_nullable is not metadata_col_nullable:
-        if (
-            sqla_compat._server_default_is_computed(
-                metadata_col.server_default, conn_col.server_default
-            )
-            and sqla_compat._nullability_might_be_unset(metadata_col)
-            or (
-                sqla_compat._server_default_is_identity(
-                    metadata_col.server_default, conn_col.server_default
-                )
-            )
-        ):
-            log.info(
-                "Ignoring nullable change on identity column '%s.%s'",
-                tname,
-                cname,
-            )
-        else:
-            alter_column_op.modify_nullable = metadata_col_nullable
-            log.info(
-                "Detected %s on column '%s.%s'",
-                "NULL" if metadata_col_nullable else "NOT NULL",
-                tname,
-                cname,
-            )
-
-
-@comparators.dispatch_for("column")
-def _setup_autoincrement(
-    autogen_context: AutogenContext,
-    alter_column_op: AlterColumnOp,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    cname: quoted_name,
-    conn_col: Column[Any],
-    metadata_col: Column[Any],
-) -> None:
-    if metadata_col.table._autoincrement_column is metadata_col:
-        alter_column_op.kw["autoincrement"] = True
-    elif metadata_col.autoincrement is True:
-        alter_column_op.kw["autoincrement"] = True
-    elif metadata_col.autoincrement is False:
-        alter_column_op.kw["autoincrement"] = False
-
-
-@comparators.dispatch_for("column")
-def _compare_type(
-    autogen_context: AutogenContext,
-    alter_column_op: AlterColumnOp,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    cname: Union[quoted_name, str],
-    conn_col: Column[Any],
-    metadata_col: Column[Any],
-) -> None:
-    conn_type = conn_col.type
-    alter_column_op.existing_type = conn_type
-    metadata_type = metadata_col.type
-    if conn_type._type_affinity is sqltypes.NullType:
-        log.info(
-            "Couldn't determine database type " "for column '%s.%s'",
-            tname,
-            cname,
-        )
-        return
-    if metadata_type._type_affinity is sqltypes.NullType:
-        log.info(
-            "Column '%s.%s' has no type within " "the model; can't compare",
-            tname,
-            cname,
-        )
-        return
-
-    isdiff = autogen_context.migration_context._compare_type(
-        conn_col, metadata_col
-    )
-
-    if isdiff:
-        alter_column_op.modify_type = metadata_type
-        log.info(
-            "Detected type change from %r to %r on '%s.%s'",
-            conn_type,
-            metadata_type,
-            tname,
-            cname,
-        )
-
-
-def _render_server_default_for_compare(
-    metadata_default: Optional[Any], autogen_context: AutogenContext
-) -> Optional[str]:
-    if isinstance(metadata_default, sa_schema.DefaultClause):
-        if isinstance(metadata_default.arg, str):
-            metadata_default = metadata_default.arg
-        else:
-            metadata_default = str(
-                metadata_default.arg.compile(
-                    dialect=autogen_context.dialect,
-                    compile_kwargs={"literal_binds": True},
-                )
-            )
-    if isinstance(metadata_default, str):
-        return metadata_default
-    else:
-        return None
-
-
-def _normalize_computed_default(sqltext: str) -> str:
-    """we want to warn if a computed sql expression has changed.  however
-    we don't want false positives and the warning is not that critical.
-    so filter out most forms of variability from the SQL text.
-
-    """
-
-    return re.sub(r"[ \(\)'\"`\[\]\t\r\n]", "", sqltext).lower()
-
-
-def _compare_computed_default(
-    autogen_context: AutogenContext,
-    alter_column_op: AlterColumnOp,
-    schema: Optional[str],
-    tname: str,
-    cname: str,
-    conn_col: Column[Any],
-    metadata_col: Column[Any],
-) -> None:
-    rendered_metadata_default = str(
-        cast(sa_schema.Computed, metadata_col.server_default).sqltext.compile(
-            dialect=autogen_context.dialect,
-            compile_kwargs={"literal_binds": True},
-        )
-    )
-
-    # since we cannot change computed columns, we do only a crude comparison
-    # here where we try to eliminate syntactical differences in order to
-    # get a minimal comparison just to emit a warning.
-
-    rendered_metadata_default = _normalize_computed_default(
-        rendered_metadata_default
-    )
-
-    if isinstance(conn_col.server_default, sa_schema.Computed):
-        rendered_conn_default = str(
-            conn_col.server_default.sqltext.compile(
-                dialect=autogen_context.dialect,
-                compile_kwargs={"literal_binds": True},
-            )
-        )
-        if rendered_conn_default is None:
-            rendered_conn_default = ""
-        else:
-            rendered_conn_default = _normalize_computed_default(
-                rendered_conn_default
-            )
-    else:
-        rendered_conn_default = ""
-
-    if rendered_metadata_default != rendered_conn_default:
-        _warn_computed_not_supported(tname, cname)
-
-
-def _warn_computed_not_supported(tname: str, cname: str) -> None:
-    util.warn("Computed default on %s.%s cannot be modified" % (tname, cname))
-
-
-def _compare_identity_default(
-    autogen_context,
-    alter_column_op,
-    schema,
-    tname,
-    cname,
-    conn_col,
-    metadata_col,
-):
-    impl = autogen_context.migration_context.impl
-    diff, ignored_attr, is_alter = impl._compare_identity_default(
-        metadata_col.server_default, conn_col.server_default
-    )
-
-    return diff, is_alter
-
-
-@comparators.dispatch_for("column")
-def _compare_server_default(
-    autogen_context: AutogenContext,
-    alter_column_op: AlterColumnOp,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    cname: Union[quoted_name, str],
-    conn_col: Column[Any],
-    metadata_col: Column[Any],
-) -> Optional[bool]:
-    metadata_default = metadata_col.server_default
-    conn_col_default = conn_col.server_default
-    if conn_col_default is None and metadata_default is None:
-        return False
-
-    if sqla_compat._server_default_is_computed(metadata_default):
-        # return False in case of a computed column as the server
-        # default. Note that DDL for adding or removing "GENERATED AS" from
-        # an existing column is not currently known for any backend.
-        # Once SQLAlchemy can reflect "GENERATED" as the "computed" element,
-        # we would also want to ignore and/or warn for changes vs. the
-        # metadata (or support backend specific DDL if applicable).
-        if not sqla_compat.has_computed_reflection:
-            return False
-
-        else:
-            return (
-                _compare_computed_default(  # type:ignore[func-returns-value]
-                    autogen_context,
-                    alter_column_op,
-                    schema,
-                    tname,
-                    cname,
-                    conn_col,
-                    metadata_col,
-                )
-            )
-    if sqla_compat._server_default_is_computed(conn_col_default):
-        _warn_computed_not_supported(tname, cname)
-        return False
-
-    if sqla_compat._server_default_is_identity(
-        metadata_default, conn_col_default
-    ):
-        alter_column_op.existing_server_default = conn_col_default
-        diff, is_alter = _compare_identity_default(
-            autogen_context,
-            alter_column_op,
-            schema,
-            tname,
-            cname,
-            conn_col,
-            metadata_col,
-        )
-        if is_alter:
-            alter_column_op.modify_server_default = metadata_default
-            if diff:
-                log.info(
-                    "Detected server default on column '%s.%s': "
-                    "identity options attributes %s",
-                    tname,
-                    cname,
-                    sorted(diff),
-                )
-    else:
-        rendered_metadata_default = _render_server_default_for_compare(
-            metadata_default, autogen_context
-        )
-
-        rendered_conn_default = (
-            cast(Any, conn_col_default).arg.text if conn_col_default else None
-        )
-
-        alter_column_op.existing_server_default = conn_col_default
-
-        is_diff = autogen_context.migration_context._compare_server_default(
-            conn_col,
-            metadata_col,
-            rendered_metadata_default,
-            rendered_conn_default,
-        )
-        if is_diff:
-            alter_column_op.modify_server_default = metadata_default
-            log.info("Detected server default on column '%s.%s'", tname, cname)
-
-    return None
-
-
-@comparators.dispatch_for("column")
-def _compare_column_comment(
-    autogen_context: AutogenContext,
-    alter_column_op: AlterColumnOp,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    cname: quoted_name,
-    conn_col: Column[Any],
-    metadata_col: Column[Any],
-) -> Optional[Literal[False]]:
-    assert autogen_context.dialect is not None
-    if not autogen_context.dialect.supports_comments:
-        return None
-
-    metadata_comment = metadata_col.comment
-    conn_col_comment = conn_col.comment
-    if conn_col_comment is None and metadata_comment is None:
-        return False
-
-    alter_column_op.existing_comment = conn_col_comment
-
-    if conn_col_comment != metadata_comment:
-        alter_column_op.modify_comment = metadata_comment
-        log.info("Detected column comment '%s.%s'", tname, cname)
-
-    return None
-
-
-@comparators.dispatch_for("table")
-def _compare_foreign_keys(
-    autogen_context: AutogenContext,
-    modify_table_ops: ModifyTableOps,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    conn_table: Table,
-    metadata_table: Table,
-) -> None:
-    # if we're doing CREATE TABLE, all FKs are created
-    # inline within the table def
-    if conn_table is None or metadata_table is None:
-        return
-
-    inspector = autogen_context.inspector
-    metadata_fks = {
-        fk
-        for fk in metadata_table.constraints
-        if isinstance(fk, sa_schema.ForeignKeyConstraint)
-    }
-
-    conn_fks_list = [
-        fk
-        for fk in inspector.get_foreign_keys(tname, schema=schema)
-        if autogen_context.run_name_filters(
-            fk["name"],
-            "foreign_key_constraint",
-            {"table_name": tname, "schema_name": schema},
-        )
-    ]
-
-    conn_fks = {
-        _make_foreign_key(const, conn_table)  # type: ignore[arg-type]
-        for const in conn_fks_list
-    }
-
-    impl = autogen_context.migration_context.impl
-
-    # give the dialect a chance to correct the FKs to match more
-    # closely
-    autogen_context.migration_context.impl.correct_for_autogen_foreignkeys(
-        conn_fks, metadata_fks
-    )
-
-    metadata_fks_sig = {
-        impl._create_metadata_constraint_sig(fk) for fk in metadata_fks
-    }
-
-    conn_fks_sig = {
-        impl._create_reflected_constraint_sig(fk) for fk in conn_fks
-    }
-
-    # check if reflected FKs include options, indicating the backend
-    # can reflect FK options
-    if conn_fks_list and "options" in conn_fks_list[0]:
-        conn_fks_by_sig = {c.unnamed: c for c in conn_fks_sig}
-        metadata_fks_by_sig = {c.unnamed: c for c in metadata_fks_sig}
-    else:
-        # otherwise compare by sig without options added
-        conn_fks_by_sig = {c.unnamed_no_options: c for c in conn_fks_sig}
-        metadata_fks_by_sig = {
-            c.unnamed_no_options: c for c in metadata_fks_sig
-        }
-
-    metadata_fks_by_name = {
-        c.name: c for c in metadata_fks_sig if c.name is not None
-    }
-    conn_fks_by_name = {c.name: c for c in conn_fks_sig if c.name is not None}
-
-    def _add_fk(obj, compare_to):
-        if autogen_context.run_object_filters(
-            obj.const, obj.name, "foreign_key_constraint", False, compare_to
-        ):
-            modify_table_ops.ops.append(
-                ops.CreateForeignKeyOp.from_constraint(const.const)  # type: ignore[has-type]  # noqa: E501
-            )
-
-            log.info(
-                "Detected added foreign key (%s)(%s) on table %s%s",
-                ", ".join(obj.source_columns),
-                ", ".join(obj.target_columns),
-                "%s." % obj.source_schema if obj.source_schema else "",
-                obj.source_table,
-            )
-
-    def _remove_fk(obj, compare_to):
-        if autogen_context.run_object_filters(
-            obj.const, obj.name, "foreign_key_constraint", True, compare_to
-        ):
-            modify_table_ops.ops.append(
-                ops.DropConstraintOp.from_constraint(obj.const)
-            )
-            log.info(
-                "Detected removed foreign key (%s)(%s) on table %s%s",
-                ", ".join(obj.source_columns),
-                ", ".join(obj.target_columns),
-                "%s." % obj.source_schema if obj.source_schema else "",
-                obj.source_table,
-            )
-
-    # so far it appears we don't need to do this by name at all.
-    # SQLite doesn't preserve constraint names anyway
-
-    for removed_sig in set(conn_fks_by_sig).difference(metadata_fks_by_sig):
-        const = conn_fks_by_sig[removed_sig]
-        if removed_sig not in metadata_fks_by_sig:
-            compare_to = (
-                metadata_fks_by_name[const.name].const
-                if const.name in metadata_fks_by_name
-                else None
-            )
-            _remove_fk(const, compare_to)
-
-    for added_sig in set(metadata_fks_by_sig).difference(conn_fks_by_sig):
-        const = metadata_fks_by_sig[added_sig]
-        if added_sig not in conn_fks_by_sig:
-            compare_to = (
-                conn_fks_by_name[const.name].const
-                if const.name in conn_fks_by_name
-                else None
-            )
-            _add_fk(const, compare_to)
-
-
-@comparators.dispatch_for("table")
-def _compare_table_comment(
-    autogen_context: AutogenContext,
-    modify_table_ops: ModifyTableOps,
-    schema: Optional[str],
-    tname: Union[quoted_name, str],
-    conn_table: Optional[Table],
-    metadata_table: Optional[Table],
-) -> None:
-    assert autogen_context.dialect is not None
-    if not autogen_context.dialect.supports_comments:
-        return
-
-    # if we're doing CREATE TABLE, comments will be created inline
-    # with the create_table op.
-    if conn_table is None or metadata_table is None:
-        return
-
-    if conn_table.comment is None and metadata_table.comment is None:
-        return
-
-    if metadata_table.comment is None and conn_table.comment is not None:
-        modify_table_ops.ops.append(
-            ops.DropTableCommentOp(
-                tname, existing_comment=conn_table.comment, schema=schema
-            )
-        )
-    elif metadata_table.comment != conn_table.comment:
-        modify_table_ops.ops.append(
-            ops.CreateTableCommentOp(
-                tname,
-                metadata_table.comment,
-                existing_comment=conn_table.comment,
-                schema=schema,
-            )
-        )
diff --git a/libs/alembic/autogenerate/compare/__init__.py b/libs/alembic/autogenerate/compare/__init__.py
new file mode 100644
index 0000000000..a49640cf86
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/__init__.py
@@ -0,0 +1,62 @@
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING
+
+from . import comments
+from . import constraints
+from . import schema
+from . import server_defaults
+from . import tables
+from . import types
+from ... import util
+from ...runtime.plugins import Plugin
+
+if TYPE_CHECKING:
+    from ..api import AutogenContext
+    from ...operations.ops import MigrationScript
+    from ...operations.ops import UpgradeOps
+
+
+log = logging.getLogger(__name__)
+
+comparators = util.PriorityDispatcher()
+"""global registry which alembic keeps empty, but copies when creating
+a new AutogenContext.
+
+This is to support a variety of third party plugins that hook their autogen
+functionality onto this collection.
+
+"""
+
+
+def _populate_migration_script(
+    autogen_context: AutogenContext, migration_script: MigrationScript
+) -> None:
+    upgrade_ops = migration_script.upgrade_ops_list[-1]
+    downgrade_ops = migration_script.downgrade_ops_list[-1]
+
+    _produce_net_changes(autogen_context, upgrade_ops)
+    upgrade_ops.reverse_into(downgrade_ops)
+
+
+def _produce_net_changes(
+    autogen_context: AutogenContext, upgrade_ops: UpgradeOps
+) -> None:
+    assert autogen_context.dialect is not None
+
+    autogen_context.comparators.dispatch(
+        "autogenerate", qualifier=autogen_context.dialect.name
+    )(autogen_context, upgrade_ops)
+
+
+Plugin.setup_plugin_from_module(schema, "alembic.autogenerate.schemas")
+Plugin.setup_plugin_from_module(tables, "alembic.autogenerate.tables")
+Plugin.setup_plugin_from_module(types, "alembic.autogenerate.types")
+Plugin.setup_plugin_from_module(
+    constraints, "alembic.autogenerate.constraints"
+)
+Plugin.setup_plugin_from_module(
+    server_defaults, "alembic.autogenerate.defaults"
+)
+Plugin.setup_plugin_from_module(comments, "alembic.autogenerate.comments")
diff --git a/libs/alembic/autogenerate/compare/comments.py b/libs/alembic/autogenerate/compare/comments.py
new file mode 100644
index 0000000000..70de74e2d7
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/comments.py
@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+import logging
+from typing import Any
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
+
+from ...operations import ops
+from ...util import PriorityDispatchResult
+
+if TYPE_CHECKING:
+
+    from sqlalchemy.sql.elements import quoted_name
+    from sqlalchemy.sql.schema import Column
+    from sqlalchemy.sql.schema import Table
+
+    from ..api import AutogenContext
+    from ...operations.ops import AlterColumnOp
+    from ...operations.ops import ModifyTableOps
+    from ...runtime.plugins import Plugin
+
+log = logging.getLogger(__name__)
+
+
+def _compare_column_comment(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: quoted_name,
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+    assert autogen_context.dialect is not None
+    if not autogen_context.dialect.supports_comments:
+        return PriorityDispatchResult.CONTINUE
+
+    metadata_comment = metadata_col.comment
+    conn_col_comment = conn_col.comment
+    if conn_col_comment is None and metadata_comment is None:
+        return PriorityDispatchResult.CONTINUE
+
+    alter_column_op.existing_comment = conn_col_comment
+
+    if conn_col_comment != metadata_comment:
+        alter_column_op.modify_comment = metadata_comment
+        log.info("Detected column comment '%s.%s'", tname, cname)
+
+        return PriorityDispatchResult.STOP
+    else:
+        return PriorityDispatchResult.CONTINUE
+
+
+def _compare_table_comment(
+    autogen_context: AutogenContext,
+    modify_table_ops: ModifyTableOps,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    conn_table: Optional[Table],
+    metadata_table: Optional[Table],
+) -> PriorityDispatchResult:
+    assert autogen_context.dialect is not None
+    if not autogen_context.dialect.supports_comments:
+        return PriorityDispatchResult.CONTINUE
+
+    # if we're doing CREATE TABLE, comments will be created inline
+    # with the create_table op.
+    if conn_table is None or metadata_table is None:
+        return PriorityDispatchResult.CONTINUE
+
+    if conn_table.comment is None and metadata_table.comment is None:
+        return PriorityDispatchResult.CONTINUE
+
+    if metadata_table.comment is None and conn_table.comment is not None:
+        modify_table_ops.ops.append(
+            ops.DropTableCommentOp(
+                tname, existing_comment=conn_table.comment, schema=schema
+            )
+        )
+        return PriorityDispatchResult.STOP
+    elif metadata_table.comment != conn_table.comment:
+        modify_table_ops.ops.append(
+            ops.CreateTableCommentOp(
+                tname,
+                metadata_table.comment,
+                existing_comment=conn_table.comment,
+                schema=schema,
+            )
+        )
+        return PriorityDispatchResult.STOP
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def setup(plugin: Plugin) -> None:
+    plugin.add_autogenerate_comparator(
+        _compare_column_comment,
+        "column",
+        "comments",
+    )
+    plugin.add_autogenerate_comparator(
+        _compare_table_comment,
+        "table",
+        "comments",
+    )
diff --git a/libs/alembic/autogenerate/compare/constraints.py b/libs/alembic/autogenerate/compare/constraints.py
new file mode 100644
index 0000000000..ae1f20e4b1
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/constraints.py
@@ -0,0 +1,812 @@
+# mypy: allow-untyped-defs, allow-untyped-calls, allow-incomplete-defs
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+from typing import cast
+from typing import Collection
+from typing import Dict
+from typing import Mapping
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import TypeVar
+from typing import Union
+
+from sqlalchemy import schema as sa_schema
+from sqlalchemy import text
+from sqlalchemy.sql import expression
+from sqlalchemy.sql.schema import ForeignKeyConstraint
+from sqlalchemy.sql.schema import Index
+from sqlalchemy.sql.schema import UniqueConstraint
+
+from .util import _InspectorConv
+from ... import util
+from ...ddl._autogen import is_index_sig
+from ...ddl._autogen import is_uq_sig
+from ...operations import ops
+from ...util import PriorityDispatchResult
+from ...util import sqla_compat
+
+if TYPE_CHECKING:
+    from sqlalchemy.engine.interfaces import ReflectedForeignKeyConstraint
+    from sqlalchemy.engine.interfaces import ReflectedIndex
+    from sqlalchemy.engine.interfaces import ReflectedUniqueConstraint
+    from sqlalchemy.sql.elements import quoted_name
+    from sqlalchemy.sql.elements import TextClause
+    from sqlalchemy.sql.schema import Column
+    from sqlalchemy.sql.schema import Table
+
+    from ...autogenerate.api import AutogenContext
+    from ...ddl._autogen import _constraint_sig
+    from ...ddl.impl import DefaultImpl
+    from ...operations.ops import AlterColumnOp
+    from ...operations.ops import ModifyTableOps
+    from ...runtime.plugins import Plugin
+
+_C = TypeVar("_C", bound=Union[UniqueConstraint, ForeignKeyConstraint, Index])
+
+
+log = logging.getLogger(__name__)
+
+
+def _compare_indexes_and_uniques(
+    autogen_context: AutogenContext,
+    modify_ops: ModifyTableOps,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    conn_table: Optional[Table],
+    metadata_table: Optional[Table],
+) -> PriorityDispatchResult:
+    inspector = autogen_context.inspector
+    is_create_table = conn_table is None
+    is_drop_table = metadata_table is None
+    impl = autogen_context.migration_context.impl
+
+    # 1a. get raw indexes and unique constraints from metadata ...
+    if metadata_table is not None:
+        metadata_unique_constraints = {
+            uq
+            for uq in metadata_table.constraints
+            if isinstance(uq, sa_schema.UniqueConstraint)
+        }
+        metadata_indexes = set(metadata_table.indexes)
+    else:
+        metadata_unique_constraints = set()
+        metadata_indexes = set()
+
+    conn_uniques: Collection[UniqueConstraint] = frozenset()
+    conn_indexes: Collection[Index] = frozenset()
+
+    supports_unique_constraints = False
+
+    unique_constraints_duplicate_unique_indexes = False
+
+    if conn_table is not None:
+        conn_uniques_reflected: Collection[ReflectedUniqueConstraint] = (
+            frozenset()
+        )
+        conn_indexes_reflected: Collection[ReflectedIndex] = frozenset()
+
+        # 1b. ... and from connection, if the table exists
+        try:
+            conn_uniques_reflected = _InspectorConv(
+                inspector
+            ).get_unique_constraints(tname, schema=schema)
+
+            supports_unique_constraints = True
+        except NotImplementedError:
+            pass
+        except TypeError:
+            # number of arguments is off for the base
+            # method in SQLAlchemy due to the cache decorator
+            # not being present
+            pass
+        else:
+            conn_uniques_reflected = [
+                uq
+                for uq in conn_uniques_reflected
+                if autogen_context.run_name_filters(
+                    uq["name"],
+                    "unique_constraint",
+                    {"table_name": tname, "schema_name": schema},
+                )
+            ]
+            for uq in conn_uniques_reflected:
+                if uq.get("duplicates_index"):
+                    unique_constraints_duplicate_unique_indexes = True
+        try:
+            conn_indexes_reflected = _InspectorConv(inspector).get_indexes(
+                tname, schema=schema
+            )
+        except NotImplementedError:
+            pass
+        else:
+            conn_indexes_reflected = [
+                ix
+                for ix in conn_indexes_reflected
+                if autogen_context.run_name_filters(
+                    ix["name"],
+                    "index",
+                    {"table_name": tname, "schema_name": schema},
+                )
+            ]
+
+        # 2. convert conn-level objects from raw inspector records
+        # into schema objects
+        if is_drop_table:
+            # for DROP TABLE uniques are inline, don't need them
+            conn_uniques = set()
+        else:
+            conn_uniques = {
+                _make_unique_constraint(impl, uq_def, conn_table)
+                for uq_def in conn_uniques_reflected
+            }
+
+        conn_indexes = {
+            index
+            for index in (
+                _make_index(impl, ix, conn_table)
+                for ix in conn_indexes_reflected
+            )
+            if index is not None
+        }
+
+    # 2a. if the dialect dupes unique indexes as unique constraints
+    # (mysql and oracle), correct for that
+
+    if unique_constraints_duplicate_unique_indexes:
+        _correct_for_uq_duplicates_uix(
+            conn_uniques,
+            conn_indexes,
+            metadata_unique_constraints,
+            metadata_indexes,
+            autogen_context.dialect,
+            impl,
+        )
+
+    # 3. give the dialect a chance to omit indexes and constraints that
+    # we know are either added implicitly by the DB or that the DB
+    # can't accurately report on
+    impl.correct_for_autogen_constraints(
+        conn_uniques,  # type: ignore[arg-type]
+        conn_indexes,  # type: ignore[arg-type]
+        metadata_unique_constraints,
+        metadata_indexes,
+    )
+
+    # 4. organize the constraints into "signature" collections, the
+    # _constraint_sig() objects provide a consistent facade over both
+    # Index and UniqueConstraint so we can easily work with them
+    # interchangeably
+    metadata_unique_constraints_sig = {
+        impl._create_metadata_constraint_sig(uq)
+        for uq in metadata_unique_constraints
+    }
+
+    metadata_indexes_sig = {
+        impl._create_metadata_constraint_sig(ix) for ix in metadata_indexes
+    }
+
+    conn_unique_constraints = {
+        impl._create_reflected_constraint_sig(uq) for uq in conn_uniques
+    }
+
+    conn_indexes_sig = {
+        impl._create_reflected_constraint_sig(ix) for ix in conn_indexes
+    }
+
+    # 5. index things by name, for those objects that have names
+    metadata_names = {
+        cast(str, c.md_name_to_sql_name(autogen_context)): c
+        for c in metadata_unique_constraints_sig.union(metadata_indexes_sig)
+        if c.is_named
+    }
+
+    conn_uniques_by_name: Dict[
+        sqla_compat._ConstraintName,
+        _constraint_sig[sa_schema.UniqueConstraint],
+    ]
+    conn_indexes_by_name: Dict[
+        sqla_compat._ConstraintName, _constraint_sig[sa_schema.Index]
+    ]
+
+    conn_uniques_by_name = {c.name: c for c in conn_unique_constraints}
+    conn_indexes_by_name = {c.name: c for c in conn_indexes_sig}
+    conn_names = {
+        c.name: c
+        for c in conn_unique_constraints.union(conn_indexes_sig)
+        if sqla_compat.constraint_name_string(c.name)
+    }
+
+    doubled_constraints = {
+        name: (conn_uniques_by_name[name], conn_indexes_by_name[name])
+        for name in set(conn_uniques_by_name).intersection(
+            conn_indexes_by_name
+        )
+    }
+
+    # 6. index things by "column signature", to help with unnamed unique
+    # constraints.
+    conn_uniques_by_sig = {uq.unnamed: uq for uq in conn_unique_constraints}
+    metadata_uniques_by_sig = {
+        uq.unnamed: uq for uq in metadata_unique_constraints_sig
+    }
+    unnamed_metadata_uniques = {
+        uq.unnamed: uq
+        for uq in metadata_unique_constraints_sig
+        if not sqla_compat._constraint_is_named(
+            uq.const, autogen_context.dialect
+        )
+    }
+
+    # assumptions:
+    # 1. a unique constraint or an index from the connection *always*
+    #    has a name.
+    # 2. an index on the metadata side *always* has a name.
+    # 3. a unique constraint on the metadata side *might* have a name.
+    # 4. The backend may double up indexes as unique constraints and
+    #    vice versa (e.g. MySQL, Postgresql)
+
+    def obj_added(
+        obj: (
+            _constraint_sig[sa_schema.UniqueConstraint]
+            | _constraint_sig[sa_schema.Index]
+        ),
+    ):
+        if is_index_sig(obj):
+            if autogen_context.run_object_filters(
+                obj.const, obj.name, "index", False, None
+            ):
+                modify_ops.ops.append(ops.CreateIndexOp.from_index(obj.const))
+                log.info(
+                    "Detected added index %r on '%s'",
+                    obj.name,
+                    obj.column_names,
+                )
+        elif is_uq_sig(obj):
+            if not supports_unique_constraints:
+                # can't report unique indexes as added if we don't
+                # detect them
+                return
+            if is_create_table or is_drop_table:
+                # unique constraints are created inline with table defs
+                return
+            if autogen_context.run_object_filters(
+                obj.const, obj.name, "unique_constraint", False, None
+            ):
+                modify_ops.ops.append(
+                    ops.AddConstraintOp.from_constraint(obj.const)
+                )
+                log.info(
+                    "Detected added unique constraint %r on '%s'",
+                    obj.name,
+                    obj.column_names,
+                )
+        else:
+            assert False
+
+    def obj_removed(
+        obj: (
+            _constraint_sig[sa_schema.UniqueConstraint]
+            | _constraint_sig[sa_schema.Index]
+        ),
+    ):
+        if is_index_sig(obj):
+            if obj.is_unique and not supports_unique_constraints:
+                # many databases double up unique constraints
+                # as unique indexes.  without that list we can't
+                # be sure what we're doing here
+                return
+
+            if autogen_context.run_object_filters(
+                obj.const, obj.name, "index", True, None
+            ):
+                modify_ops.ops.append(ops.DropIndexOp.from_index(obj.const))
+                log.info("Detected removed index %r on %r", obj.name, tname)
+        elif is_uq_sig(obj):
+            if is_create_table or is_drop_table:
+                # if the whole table is being dropped, we don't need to
+                # consider unique constraint separately
+                return
+            if autogen_context.run_object_filters(
+                obj.const, obj.name, "unique_constraint", True, None
+            ):
+                modify_ops.ops.append(
+                    ops.DropConstraintOp.from_constraint(obj.const)
+                )
+                log.info(
+                    "Detected removed unique constraint %r on %r",
+                    obj.name,
+                    tname,
+                )
+        else:
+            assert False
+
+    def obj_changed(
+        old: (
+            _constraint_sig[sa_schema.UniqueConstraint]
+            | _constraint_sig[sa_schema.Index]
+        ),
+        new: (
+            _constraint_sig[sa_schema.UniqueConstraint]
+            | _constraint_sig[sa_schema.Index]
+        ),
+        msg: str,
+    ):
+        if is_index_sig(old):
+            assert is_index_sig(new)
+
+            if autogen_context.run_object_filters(
+                new.const, new.name, "index", False, old.const
+            ):
+                log.info(
+                    "Detected changed index %r on %r: %s", old.name, tname, msg
+                )
+                modify_ops.ops.append(ops.DropIndexOp.from_index(old.const))
+                modify_ops.ops.append(ops.CreateIndexOp.from_index(new.const))
+        elif is_uq_sig(old):
+            assert is_uq_sig(new)
+
+            if autogen_context.run_object_filters(
+                new.const, new.name, "unique_constraint", False, old.const
+            ):
+                log.info(
+                    "Detected changed unique constraint %r on %r: %s",
+                    old.name,
+                    tname,
+                    msg,
+                )
+                modify_ops.ops.append(
+                    ops.DropConstraintOp.from_constraint(old.const)
+                )
+                modify_ops.ops.append(
+                    ops.AddConstraintOp.from_constraint(new.const)
+                )
+        else:
+            assert False
+
+    for removed_name in sorted(set(conn_names).difference(metadata_names)):
+        conn_obj = conn_names[removed_name]
+        if (
+            is_uq_sig(conn_obj)
+            and conn_obj.unnamed in unnamed_metadata_uniques
+        ):
+            continue
+        elif removed_name in doubled_constraints:
+            conn_uq, conn_idx = doubled_constraints[removed_name]
+            if (
+                all(
+                    conn_idx.unnamed != meta_idx.unnamed
+                    for meta_idx in metadata_indexes_sig
+                )
+                and conn_uq.unnamed not in metadata_uniques_by_sig
+            ):
+                obj_removed(conn_uq)
+                obj_removed(conn_idx)
+        else:
+            obj_removed(conn_obj)
+
+    for existing_name in sorted(set(metadata_names).intersection(conn_names)):
+        metadata_obj = metadata_names[existing_name]
+
+        if existing_name in doubled_constraints:
+            conn_uq, conn_idx = doubled_constraints[existing_name]
+            if is_index_sig(metadata_obj):
+                conn_obj = conn_idx
+            else:
+                conn_obj = conn_uq
+        else:
+            conn_obj = conn_names[existing_name]
+
+        if type(conn_obj) != type(metadata_obj):
+            obj_removed(conn_obj)
+            obj_added(metadata_obj)
+        else:
+            # TODO: for plugins, let's do is_index_sig / is_uq_sig
+            # here so we know index or unique, then
+            # do a sub-dispatch,
+            # autogen_context.comparators.dispatch("index")
+            # or
+            # autogen_context.comparators.dispatch("unique_constraint")
+            #
+            comparison = metadata_obj.compare_to_reflected(conn_obj)
+
+            if comparison.is_different:
+                # constraint are different
+                obj_changed(conn_obj, metadata_obj, comparison.message)
+            elif comparison.is_skip:
+                # constraint cannot be compared, skip them
+                thing = (
+                    "index" if is_index_sig(conn_obj) else "unique constraint"
+                )
+                log.info(
+                    "Cannot compare %s %r, assuming equal and skipping. %s",
+                    thing,
+                    conn_obj.name,
+                    comparison.message,
+                )
+            else:
+                # constraint are equal
+                assert comparison.is_equal
+
+    for added_name in sorted(set(metadata_names).difference(conn_names)):
+        obj = metadata_names[added_name]
+        obj_added(obj)
+
+    for uq_sig in unnamed_metadata_uniques:
+        if uq_sig not in conn_uniques_by_sig:
+            obj_added(unnamed_metadata_uniques[uq_sig])
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def _correct_for_uq_duplicates_uix(
+    conn_unique_constraints,
+    conn_indexes,
+    metadata_unique_constraints,
+    metadata_indexes,
+    dialect,
+    impl,
+):
+    # dedupe unique indexes vs. constraints, since MySQL / Oracle
+    # doesn't really have unique constraints as a separate construct.
+    # but look in the metadata and try to maintain constructs
+    # that already seem to be defined one way or the other
+    # on that side.  This logic was formerly local to MySQL dialect,
+    # generalized to Oracle and others. See #276
+
+    # resolve final rendered name for unique constraints defined in the
+    # metadata.   this includes truncation of long names.  naming convention
+    # names currently should already be set as cons.name, however leave this
+    # to the sqla_compat to decide.
+    metadata_cons_names = [
+        (sqla_compat._get_constraint_final_name(cons, dialect), cons)
+        for cons in metadata_unique_constraints
+    ]
+
+    metadata_uq_names = {
+        name for name, cons in metadata_cons_names if name is not None
+    }
+
+    unnamed_metadata_uqs = {
+        impl._create_metadata_constraint_sig(cons).unnamed
+        for name, cons in metadata_cons_names
+        if name is None
+    }
+
+    metadata_ix_names = {
+        sqla_compat._get_constraint_final_name(cons, dialect)
+        for cons in metadata_indexes
+        if cons.unique
+    }
+
+    # for reflection side, names are in their final database form
+    # already since they're from the database
+    conn_ix_names = {cons.name: cons for cons in conn_indexes if cons.unique}
+
+    uqs_dupe_indexes = {
+        cons.name: cons
+        for cons in conn_unique_constraints
+        if cons.info["duplicates_index"]
+    }
+
+    for overlap in uqs_dupe_indexes:
+        if overlap not in metadata_uq_names:
+            if (
+                impl._create_reflected_constraint_sig(
+                    uqs_dupe_indexes[overlap]
+                ).unnamed
+                not in unnamed_metadata_uqs
+            ):
+                conn_unique_constraints.discard(uqs_dupe_indexes[overlap])
+        elif overlap not in metadata_ix_names:
+            conn_indexes.discard(conn_ix_names[overlap])
+
+
+_IndexColumnSortingOps: Mapping[str, Any] = util.immutabledict(
+    {
+        "asc": expression.asc,
+        "desc": expression.desc,
+        "nulls_first": expression.nullsfirst,
+        "nulls_last": expression.nullslast,
+        "nullsfirst": expression.nullsfirst,  # 1_3 name
+        "nullslast": expression.nullslast,  # 1_3 name
+    }
+)
+
+
+def _make_index(
+    impl: DefaultImpl, params: ReflectedIndex, conn_table: Table
+) -> Optional[Index]:
+    exprs: list[Union[Column[Any], TextClause]] = []
+    sorting = params.get("column_sorting")
+
+    for num, col_name in enumerate(params["column_names"]):
+        item: Union[Column[Any], TextClause]
+        if col_name is None:
+            assert "expressions" in params
+            name = params["expressions"][num]
+            item = text(name)
+        else:
+            name = col_name
+            item = conn_table.c[col_name]
+        if sorting and name in sorting:
+            for operator in sorting[name]:
+                if operator in _IndexColumnSortingOps:
+                    item = _IndexColumnSortingOps[operator](item)
+        exprs.append(item)
+    ix = sa_schema.Index(
+        params["name"],
+        *exprs,
+        unique=params["unique"],
+        _table=conn_table,
+        **impl.adjust_reflected_dialect_options(params, "index"),
+    )
+    if "duplicates_constraint" in params:
+        ix.info["duplicates_constraint"] = params["duplicates_constraint"]
+    return ix
+
+
+def _make_unique_constraint(
+    impl: DefaultImpl, params: ReflectedUniqueConstraint, conn_table: Table
+) -> UniqueConstraint:
+    uq = sa_schema.UniqueConstraint(
+        *[conn_table.c[cname] for cname in params["column_names"]],
+        name=params["name"],
+        **impl.adjust_reflected_dialect_options(params, "unique_constraint"),
+    )
+    if "duplicates_index" in params:
+        uq.info["duplicates_index"] = params["duplicates_index"]
+
+    return uq
+
+
+def _make_foreign_key(
+    params: ReflectedForeignKeyConstraint, conn_table: Table
+) -> ForeignKeyConstraint:
+    tname = params["referred_table"]
+    if params["referred_schema"]:
+        tname = "%s.%s" % (params["referred_schema"], tname)
+
+    options = params.get("options", {})
+
+    const = sa_schema.ForeignKeyConstraint(
+        [conn_table.c[cname] for cname in params["constrained_columns"]],
+        ["%s.%s" % (tname, n) for n in params["referred_columns"]],
+        onupdate=options.get("onupdate"),
+        ondelete=options.get("ondelete"),
+        deferrable=options.get("deferrable"),
+        initially=options.get("initially"),
+        name=params["name"],
+    )
+
+    referred_schema = params["referred_schema"]
+    referred_table = params["referred_table"]
+
+    remote_table_key = sqla_compat._get_table_key(
+        referred_table, referred_schema
+    )
+    if remote_table_key not in conn_table.metadata:
+        # create a placeholder table
+        sa_schema.Table(
+            referred_table,
+            conn_table.metadata,
+            schema=(
+                referred_schema
+                if referred_schema is not None
+                else sa_schema.BLANK_SCHEMA
+            ),
+            *[
+                sa_schema.Column(remote, conn_table.c[local].type)
+                for local, remote in zip(
+                    params["constrained_columns"], params["referred_columns"]
+                )
+            ],
+            info={"alembic_placeholder": True},
+        )
+    elif conn_table.metadata.tables[remote_table_key].info.get(
+        "alembic_placeholder"
+    ):
+        # table exists and is a placeholder; ensure needed columns are present
+        placeholder_table = conn_table.metadata.tables[remote_table_key]
+        for local, remote in zip(
+            params["constrained_columns"], params["referred_columns"]
+        ):
+            if remote not in placeholder_table.c:
+                placeholder_table.append_column(
+                    sa_schema.Column(remote, conn_table.c[local].type)
+                )
+
+    # needed by 0.7
+    conn_table.append_constraint(const)
+    return const
+
+
+def _compare_foreign_keys(
+    autogen_context: AutogenContext,
+    modify_table_ops: ModifyTableOps,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    conn_table: Table,
+    metadata_table: Table,
+) -> PriorityDispatchResult:
+    # if we're doing CREATE TABLE, all FKs are created
+    # inline within the table def
+
+    if conn_table is None or metadata_table is None:
+        return PriorityDispatchResult.CONTINUE
+
+    inspector = autogen_context.inspector
+    metadata_fks = {
+        fk
+        for fk in metadata_table.constraints
+        if isinstance(fk, sa_schema.ForeignKeyConstraint)
+    }
+
+    conn_fks_list = [
+        fk
+        for fk in _InspectorConv(inspector).get_foreign_keys(
+            tname, schema=schema
+        )
+        if autogen_context.run_name_filters(
+            fk["name"],
+            "foreign_key_constraint",
+            {"table_name": tname, "schema_name": schema},
+        )
+    ]
+
+    conn_fks = {
+        _make_foreign_key(const, conn_table) for const in conn_fks_list
+    }
+
+    impl = autogen_context.migration_context.impl
+
+    # give the dialect a chance to correct the FKs to match more
+    # closely
+    autogen_context.migration_context.impl.correct_for_autogen_foreignkeys(
+        conn_fks, metadata_fks
+    )
+
+    metadata_fks_sig = {
+        impl._create_metadata_constraint_sig(fk) for fk in metadata_fks
+    }
+
+    conn_fks_sig = {
+        impl._create_reflected_constraint_sig(fk) for fk in conn_fks
+    }
+
+    # check if reflected FKs include options, indicating the backend
+    # can reflect FK options
+    if conn_fks_list and "options" in conn_fks_list[0]:
+        conn_fks_by_sig = {c.unnamed: c for c in conn_fks_sig}
+        metadata_fks_by_sig = {c.unnamed: c for c in metadata_fks_sig}
+    else:
+        # otherwise compare by sig without options added
+        conn_fks_by_sig = {c.unnamed_no_options: c for c in conn_fks_sig}
+        metadata_fks_by_sig = {
+            c.unnamed_no_options: c for c in metadata_fks_sig
+        }
+
+    metadata_fks_by_name = {
+        c.name: c for c in metadata_fks_sig if c.name is not None
+    }
+    conn_fks_by_name = {c.name: c for c in conn_fks_sig if c.name is not None}
+
+    def _add_fk(obj, compare_to):
+        if autogen_context.run_object_filters(
+            obj.const, obj.name, "foreign_key_constraint", False, compare_to
+        ):
+            modify_table_ops.ops.append(
+                ops.CreateForeignKeyOp.from_constraint(const.const)
+            )
+
+            log.info(
+                "Detected added foreign key (%s)(%s) on table %s%s",
+                ", ".join(obj.source_columns),
+                ", ".join(obj.target_columns),
+                "%s." % obj.source_schema if obj.source_schema else "",
+                obj.source_table,
+            )
+
+    def _remove_fk(obj, compare_to):
+        if autogen_context.run_object_filters(
+            obj.const, obj.name, "foreign_key_constraint", True, compare_to
+        ):
+            modify_table_ops.ops.append(
+                ops.DropConstraintOp.from_constraint(obj.const)
+            )
+            log.info(
+                "Detected removed foreign key (%s)(%s) on table %s%s",
+                ", ".join(obj.source_columns),
+                ", ".join(obj.target_columns),
+                "%s." % obj.source_schema if obj.source_schema else "",
+                obj.source_table,
+            )
+
+    # so far it appears we don't need to do this by name at all.
+    # SQLite doesn't preserve constraint names anyway
+
+    for removed_sig in set(conn_fks_by_sig).difference(metadata_fks_by_sig):
+        const = conn_fks_by_sig[removed_sig]
+        if removed_sig not in metadata_fks_by_sig:
+            compare_to = (
+                metadata_fks_by_name[const.name].const
+                if const.name and const.name in metadata_fks_by_name
+                else None
+            )
+            _remove_fk(const, compare_to)
+
+    for added_sig in set(metadata_fks_by_sig).difference(conn_fks_by_sig):
+        const = metadata_fks_by_sig[added_sig]
+        if added_sig not in conn_fks_by_sig:
+            compare_to = (
+                conn_fks_by_name[const.name].const
+                if const.name and const.name in conn_fks_by_name
+                else None
+            )
+            _add_fk(const, compare_to)
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def _compare_nullable(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+    metadata_col_nullable = metadata_col.nullable
+    conn_col_nullable = conn_col.nullable
+    alter_column_op.existing_nullable = conn_col_nullable
+
+    if conn_col_nullable is not metadata_col_nullable:
+        if (
+            sqla_compat._server_default_is_computed(
+                metadata_col.server_default, conn_col.server_default
+            )
+            and sqla_compat._nullability_might_be_unset(metadata_col)
+            or (
+                sqla_compat._server_default_is_identity(
+                    metadata_col.server_default, conn_col.server_default
+                )
+            )
+        ):
+            log.info(
+                "Ignoring nullable change on identity column '%s.%s'",
+                tname,
+                cname,
+            )
+        else:
+            alter_column_op.modify_nullable = metadata_col_nullable
+            log.info(
+                "Detected %s on column '%s.%s'",
+                "NULL" if metadata_col_nullable else "NOT NULL",
+                tname,
+                cname,
+            )
+            # column nullablity changed, no further nullable checks needed
+            return PriorityDispatchResult.STOP
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def setup(plugin: Plugin) -> None:
+    plugin.add_autogenerate_comparator(
+        _compare_indexes_and_uniques,
+        "table",
+        "indexes",
+    )
+    plugin.add_autogenerate_comparator(
+        _compare_foreign_keys,
+        "table",
+        "foreignkeys",
+    )
+    plugin.add_autogenerate_comparator(
+        _compare_nullable,
+        "column",
+        "nullable",
+    )
diff --git a/libs/alembic/autogenerate/compare/schema.py b/libs/alembic/autogenerate/compare/schema.py
new file mode 100644
index 0000000000..1f46aff429
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/schema.py
@@ -0,0 +1,62 @@
+# mypy: allow-untyped-calls
+
+from __future__ import annotations
+
+import logging
+from typing import Optional
+from typing import Set
+from typing import TYPE_CHECKING
+
+from sqlalchemy import inspect
+
+from ...util import PriorityDispatchResult
+
+if TYPE_CHECKING:
+    from sqlalchemy.engine.reflection import Inspector
+
+    from ...autogenerate.api import AutogenContext
+    from ...operations.ops import UpgradeOps
+    from ...runtime.plugins import Plugin
+
+
+log = logging.getLogger(__name__)
+
+
+def _produce_net_changes(
+    autogen_context: AutogenContext, upgrade_ops: UpgradeOps
+) -> PriorityDispatchResult:
+    connection = autogen_context.connection
+    assert connection is not None
+    include_schemas = autogen_context.opts.get("include_schemas", False)
+
+    inspector: Inspector = inspect(connection)
+
+    default_schema = connection.dialect.default_schema_name
+    schemas: Set[Optional[str]]
+    if include_schemas:
+        schemas = set(inspector.get_schema_names())
+        # replace default schema name with None
+        schemas.discard("information_schema")
+        # replace the "default" schema with None
+        schemas.discard(default_schema)
+        schemas.add(None)
+    else:
+        schemas = {None}
+
+    schemas = {
+        s for s in schemas if autogen_context.run_name_filters(s, "schema", {})
+    }
+
+    assert autogen_context.dialect is not None
+    autogen_context.comparators.dispatch(
+        "schema", qualifier=autogen_context.dialect.name
+    )(autogen_context, upgrade_ops, schemas)
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def setup(plugin: Plugin) -> None:
+    plugin.add_autogenerate_comparator(
+        _produce_net_changes,
+        "autogenerate",
+    )
diff --git a/libs/alembic/autogenerate/compare/server_defaults.py b/libs/alembic/autogenerate/compare/server_defaults.py
new file mode 100644
index 0000000000..1e09e8e21a
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/server_defaults.py
@@ -0,0 +1,344 @@
+from __future__ import annotations
+
+import logging
+import re
+from types import NoneType
+from typing import Any
+from typing import cast
+from typing import Optional
+from typing import Sequence
+from typing import TYPE_CHECKING
+from typing import Union
+
+from sqlalchemy import schema as sa_schema
+from sqlalchemy.sql.schema import DefaultClause
+
+from ... import util
+from ...util import DispatchPriority
+from ...util import PriorityDispatchResult
+from ...util import sqla_compat
+
+if TYPE_CHECKING:
+    from sqlalchemy.sql.elements import quoted_name
+    from sqlalchemy.sql.schema import Column
+
+    from ...autogenerate.api import AutogenContext
+    from ...operations.ops import AlterColumnOp
+    from ...runtime.plugins import Plugin
+
+log = logging.getLogger(__name__)
+
+
+def _render_server_default_for_compare(
+    metadata_default: Optional[Any], autogen_context: AutogenContext
+) -> Optional[str]:
+    if isinstance(metadata_default, sa_schema.DefaultClause):
+        if isinstance(metadata_default.arg, str):
+            metadata_default = metadata_default.arg
+        else:
+            metadata_default = str(
+                metadata_default.arg.compile(
+                    dialect=autogen_context.dialect,
+                    compile_kwargs={"literal_binds": True},
+                )
+            )
+    if isinstance(metadata_default, str):
+        return metadata_default
+    else:
+        return None
+
+
+def _normalize_computed_default(sqltext: str) -> str:
+    """we want to warn if a computed sql expression has changed.  however
+    we don't want false positives and the warning is not that critical.
+    so filter out most forms of variability from the SQL text.
+
+    """
+
+    return re.sub(r"[ \(\)'\"`\[\]\t\r\n]", "", sqltext).lower()
+
+
+def _compare_computed_default(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: str,
+    cname: str,
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+
+    metadata_default = metadata_col.server_default
+    conn_col_default = conn_col.server_default
+    if conn_col_default is None and metadata_default is None:
+        return PriorityDispatchResult.CONTINUE
+
+    if sqla_compat._server_default_is_computed(
+        conn_col_default
+    ) and not sqla_compat._server_default_is_computed(metadata_default):
+        _warn_computed_not_supported(tname, cname)
+        return PriorityDispatchResult.STOP
+
+    if not sqla_compat._server_default_is_computed(metadata_default):
+        return PriorityDispatchResult.CONTINUE
+
+    rendered_metadata_default = str(
+        cast(sa_schema.Computed, metadata_col.server_default).sqltext.compile(
+            dialect=autogen_context.dialect,
+            compile_kwargs={"literal_binds": True},
+        )
+    )
+
+    # since we cannot change computed columns, we do only a crude comparison
+    # here where we try to eliminate syntactical differences in order to
+    # get a minimal comparison just to emit a warning.
+
+    rendered_metadata_default = _normalize_computed_default(
+        rendered_metadata_default
+    )
+
+    if isinstance(conn_col.server_default, sa_schema.Computed):
+        rendered_conn_default = str(
+            conn_col.server_default.sqltext.compile(
+                dialect=autogen_context.dialect,
+                compile_kwargs={"literal_binds": True},
+            )
+        )
+        rendered_conn_default = _normalize_computed_default(
+            rendered_conn_default
+        )
+    else:
+        rendered_conn_default = ""
+
+    if rendered_metadata_default != rendered_conn_default:
+        _warn_computed_not_supported(tname, cname)
+
+    return PriorityDispatchResult.STOP
+
+
+def _warn_computed_not_supported(tname: str, cname: str) -> None:
+    util.warn("Computed default on %s.%s cannot be modified" % (tname, cname))
+
+
+def _compare_identity_default(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+    skip: Sequence[str] = (
+        "order",
+        "on_null",
+        "oracle_order",
+        "oracle_on_null",
+    ),
+) -> PriorityDispatchResult:
+
+    metadata_default = metadata_col.server_default
+    conn_col_default = conn_col.server_default
+    if (
+        conn_col_default is None
+        and metadata_default is None
+        or not sqla_compat._server_default_is_identity(
+            metadata_default, conn_col_default
+        )
+    ):
+        return PriorityDispatchResult.CONTINUE
+
+    assert isinstance(
+        metadata_col.server_default,
+        (sa_schema.Identity, sa_schema.Sequence, NoneType),
+    )
+    assert isinstance(
+        conn_col.server_default,
+        (sa_schema.Identity, sa_schema.Sequence, NoneType),
+    )
+
+    impl = autogen_context.migration_context.impl
+    diff, _, is_alter = impl._compare_identity_default(  # type: ignore[no-untyped-call]  # noqa: E501
+        metadata_col.server_default, conn_col.server_default
+    )
+
+    if is_alter:
+        alter_column_op.modify_server_default = metadata_default
+        if diff:
+            log.info(
+                "Detected server default on column '%s.%s': "
+                "identity options attributes %s",
+                tname,
+                cname,
+                sorted(diff),
+            )
+
+            return PriorityDispatchResult.STOP
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def _user_compare_server_default(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+
+    metadata_default = metadata_col.server_default
+    conn_col_default = conn_col.server_default
+    if conn_col_default is None and metadata_default is None:
+        return PriorityDispatchResult.CONTINUE
+
+    alter_column_op.existing_server_default = conn_col_default
+
+    migration_context = autogen_context.migration_context
+
+    if migration_context._user_compare_server_default is False:
+        return PriorityDispatchResult.STOP
+
+    if not callable(migration_context._user_compare_server_default):
+        return PriorityDispatchResult.CONTINUE
+
+    rendered_metadata_default = _render_server_default_for_compare(
+        metadata_default, autogen_context
+    )
+    rendered_conn_default = (
+        cast(Any, conn_col_default).arg.text if conn_col_default else None
+    )
+
+    is_diff = migration_context._user_compare_server_default(
+        migration_context,
+        conn_col,
+        metadata_col,
+        rendered_conn_default,
+        metadata_col.server_default,
+        rendered_metadata_default,
+    )
+    if is_diff:
+        alter_column_op.modify_server_default = metadata_default
+        log.info(
+            "User defined function %s detected "
+            "server default on column '%s.%s'",
+            migration_context._user_compare_server_default,
+            tname,
+            cname,
+        )
+        return PriorityDispatchResult.STOP
+    elif is_diff is False:
+        # if user compare server_default returns False and not None,
+        # it means "dont do any more server_default comparison"
+        return PriorityDispatchResult.STOP
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def _dialect_impl_compare_server_default(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+    """use dialect.impl.compare_server_default.
+
+    This would in theory not be needed.  however we dont know if any
+    third party libraries haven't made their own alembic dialect and
+    implemented this method.
+
+    """
+    metadata_default = metadata_col.server_default
+    conn_col_default = conn_col.server_default
+    if conn_col_default is None and metadata_default is None:
+        return PriorityDispatchResult.CONTINUE
+
+    # this is already done by _user_compare_server_default,
+    # but doing it here also for unit tests that want to call
+    # _dialect_impl_compare_server_default directly
+    alter_column_op.existing_server_default = conn_col_default
+
+    if not isinstance(
+        metadata_default, (DefaultClause, NoneType)
+    ) or not isinstance(conn_col_default, (DefaultClause, NoneType)):
+        return PriorityDispatchResult.CONTINUE
+
+    migration_context = autogen_context.migration_context
+
+    rendered_metadata_default = _render_server_default_for_compare(
+        metadata_default, autogen_context
+    )
+    rendered_conn_default = (
+        cast(Any, conn_col_default).arg.text if conn_col_default else None
+    )
+
+    is_diff = migration_context.impl.compare_server_default(  # type: ignore[no-untyped-call]  # noqa: E501
+        conn_col,
+        metadata_col,
+        rendered_metadata_default,
+        rendered_conn_default,
+    )
+    if is_diff:
+        alter_column_op.modify_server_default = metadata_default
+        log.info(
+            "Dialect impl %s detected server default on column '%s.%s'",
+            migration_context.impl,
+            tname,
+            cname,
+        )
+        return PriorityDispatchResult.STOP
+    return PriorityDispatchResult.CONTINUE
+
+
+def _setup_autoincrement(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: quoted_name,
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+    if metadata_col.table._autoincrement_column is metadata_col:
+        alter_column_op.kw["autoincrement"] = True
+    elif metadata_col.autoincrement is True:
+        alter_column_op.kw["autoincrement"] = True
+    elif metadata_col.autoincrement is False:
+        alter_column_op.kw["autoincrement"] = False
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def setup(plugin: Plugin) -> None:
+    plugin.add_autogenerate_comparator(
+        _user_compare_server_default,
+        "column",
+        "server_default",
+        priority=DispatchPriority.FIRST,
+    )
+    plugin.add_autogenerate_comparator(
+        _compare_computed_default,
+        "column",
+        "server_default",
+    )
+
+    plugin.add_autogenerate_comparator(
+        _compare_identity_default,
+        "column",
+        "server_default",
+    )
+
+    plugin.add_autogenerate_comparator(
+        _setup_autoincrement,
+        "column",
+        "server_default",
+    )
+    plugin.add_autogenerate_comparator(
+        _dialect_impl_compare_server_default,
+        "column",
+        "server_default",
+        priority=DispatchPriority.LAST,
+    )
diff --git a/libs/alembic/autogenerate/compare/tables.py b/libs/alembic/autogenerate/compare/tables.py
new file mode 100644
index 0000000000..31eddc6b59
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/tables.py
@@ -0,0 +1,316 @@
+# mypy: allow-untyped-calls
+
+from __future__ import annotations
+
+import contextlib
+import logging
+from typing import Iterator
+from typing import Optional
+from typing import Set
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
+
+from sqlalchemy import event
+from sqlalchemy import schema as sa_schema
+from sqlalchemy.util import OrderedSet
+
+from .util import _InspectorConv
+from ...operations import ops
+from ...util import PriorityDispatchResult
+
+if TYPE_CHECKING:
+    from sqlalchemy.engine.reflection import Inspector
+    from sqlalchemy.sql.elements import quoted_name
+    from sqlalchemy.sql.schema import Table
+
+    from ...autogenerate.api import AutogenContext
+    from ...operations.ops import ModifyTableOps
+    from ...operations.ops import UpgradeOps
+    from ...runtime.plugins import Plugin
+
+
+log = logging.getLogger(__name__)
+
+
+def _autogen_for_tables(
+    autogen_context: AutogenContext,
+    upgrade_ops: UpgradeOps,
+    schemas: Set[Optional[str]],
+) -> PriorityDispatchResult:
+    inspector = autogen_context.inspector
+
+    conn_table_names: Set[Tuple[Optional[str], str]] = set()
+
+    version_table_schema = (
+        autogen_context.migration_context.version_table_schema
+    )
+    version_table = autogen_context.migration_context.version_table
+
+    for schema_name in schemas:
+        tables = available = set(inspector.get_table_names(schema=schema_name))
+        if schema_name == version_table_schema:
+            tables = tables.difference(
+                [autogen_context.migration_context.version_table]
+            )
+
+        tablenames = [
+            tname
+            for tname in tables
+            if autogen_context.run_name_filters(
+                tname, "table", {"schema_name": schema_name}
+            )
+        ]
+
+        conn_table_names.update((schema_name, tname) for tname in tablenames)
+
+        inspector = autogen_context.inspector
+        insp = _InspectorConv(inspector)
+        insp.pre_cache_tables(schema_name, tablenames, available)
+
+    metadata_table_names = OrderedSet(
+        [(table.schema, table.name) for table in autogen_context.sorted_tables]
+    ).difference([(version_table_schema, version_table)])
+
+    _compare_tables(
+        conn_table_names,
+        metadata_table_names,
+        inspector,
+        upgrade_ops,
+        autogen_context,
+    )
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def _compare_tables(
+    conn_table_names: set[tuple[str | None, str]],
+    metadata_table_names: set[tuple[str | None, str]],
+    inspector: Inspector,
+    upgrade_ops: UpgradeOps,
+    autogen_context: AutogenContext,
+) -> None:
+    default_schema = inspector.bind.dialect.default_schema_name
+
+    # tables coming from the connection will not have "schema"
+    # set if it matches default_schema_name; so we need a list
+    # of table names from local metadata that also have "None" if schema
+    # == default_schema_name.  Most setups will be like this anyway but
+    # some are not (see #170)
+    metadata_table_names_no_dflt_schema = OrderedSet(
+        [
+            (schema if schema != default_schema else None, tname)
+            for schema, tname in metadata_table_names
+        ]
+    )
+
+    # to adjust for the MetaData collection storing the tables either
+    # as "schemaname.tablename" or just "tablename", create a new lookup
+    # which will match the "non-default-schema" keys to the Table object.
+    tname_to_table = {
+        no_dflt_schema: autogen_context.table_key_to_table[
+            sa_schema._get_table_key(tname, schema)
+        ]
+        for no_dflt_schema, (schema, tname) in zip(
+            metadata_table_names_no_dflt_schema, metadata_table_names
+        )
+    }
+    metadata_table_names = metadata_table_names_no_dflt_schema
+
+    for s, tname in metadata_table_names.difference(conn_table_names):
+        name = "%s.%s" % (s, tname) if s else tname
+        metadata_table = tname_to_table[(s, tname)]
+        if autogen_context.run_object_filters(
+            metadata_table, tname, "table", False, None
+        ):
+            upgrade_ops.ops.append(
+                ops.CreateTableOp.from_table(metadata_table)
+            )
+            log.info("Detected added table %r", name)
+            modify_table_ops = ops.ModifyTableOps(tname, [], schema=s)
+
+            autogen_context.comparators.dispatch(
+                "table", qualifier=autogen_context.dialect.name
+            )(
+                autogen_context,
+                modify_table_ops,
+                s,
+                tname,
+                None,
+                metadata_table,
+            )
+            if not modify_table_ops.is_empty():
+                upgrade_ops.ops.append(modify_table_ops)
+
+    removal_metadata = sa_schema.MetaData()
+    for s, tname in conn_table_names.difference(metadata_table_names):
+        name = sa_schema._get_table_key(tname, s)
+
+        # a name might be present already if a previous reflection pulled
+        # this table in via foreign key constraint
+        exists = name in removal_metadata.tables
+        t = sa_schema.Table(tname, removal_metadata, schema=s)
+
+        if not exists:
+            event.listen(
+                t,
+                "column_reflect",
+                # fmt: off
+                autogen_context.migration_context.impl.
+                _compat_autogen_column_reflect
+                (inspector),
+                # fmt: on
+            )
+            _InspectorConv(inspector).reflect_table(t)
+        if autogen_context.run_object_filters(t, tname, "table", True, None):
+            modify_table_ops = ops.ModifyTableOps(tname, [], schema=s)
+
+            autogen_context.comparators.dispatch(
+                "table", qualifier=autogen_context.dialect.name
+            )(autogen_context, modify_table_ops, s, tname, t, None)
+            if not modify_table_ops.is_empty():
+                upgrade_ops.ops.append(modify_table_ops)
+
+            upgrade_ops.ops.append(ops.DropTableOp.from_table(t))
+            log.info("Detected removed table %r", name)
+
+    existing_tables = conn_table_names.intersection(metadata_table_names)
+
+    existing_metadata = sa_schema.MetaData()
+    conn_column_info = {}
+    for s, tname in existing_tables:
+        name = sa_schema._get_table_key(tname, s)
+        exists = name in existing_metadata.tables
+
+        # a name might be present already if a previous reflection pulled
+        # this table in via foreign key constraint
+        t = sa_schema.Table(tname, existing_metadata, schema=s)
+        if not exists:
+            event.listen(
+                t,
+                "column_reflect",
+                # fmt: off
+                autogen_context.migration_context.impl.
+                _compat_autogen_column_reflect(inspector),
+                # fmt: on
+            )
+            _InspectorConv(inspector).reflect_table(t)
+
+        conn_column_info[(s, tname)] = t
+
+    for s, tname in sorted(existing_tables, key=lambda x: (x[0] or "", x[1])):
+        s = s or None
+        name = "%s.%s" % (s, tname) if s else tname
+        metadata_table = tname_to_table[(s, tname)]
+        conn_table = existing_metadata.tables[name]
+
+        if autogen_context.run_object_filters(
+            metadata_table, tname, "table", False, conn_table
+        ):
+            modify_table_ops = ops.ModifyTableOps(tname, [], schema=s)
+            with _compare_columns(
+                s,
+                tname,
+                conn_table,
+                metadata_table,
+                modify_table_ops,
+                autogen_context,
+                inspector,
+            ):
+                autogen_context.comparators.dispatch(
+                    "table", qualifier=autogen_context.dialect.name
+                )(
+                    autogen_context,
+                    modify_table_ops,
+                    s,
+                    tname,
+                    conn_table,
+                    metadata_table,
+                )
+
+            if not modify_table_ops.is_empty():
+                upgrade_ops.ops.append(modify_table_ops)
+
+
+@contextlib.contextmanager
+def _compare_columns(
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    conn_table: Table,
+    metadata_table: Table,
+    modify_table_ops: ModifyTableOps,
+    autogen_context: AutogenContext,
+    inspector: Inspector,
+) -> Iterator[None]:
+    name = "%s.%s" % (schema, tname) if schema else tname
+    metadata_col_names = OrderedSet(
+        c.name for c in metadata_table.c if not c.system
+    )
+    metadata_cols_by_name = {
+        c.name: c for c in metadata_table.c if not c.system
+    }
+
+    conn_col_names = {
+        c.name: c
+        for c in conn_table.c
+        if autogen_context.run_name_filters(
+            c.name, "column", {"table_name": tname, "schema_name": schema}
+        )
+    }
+
+    for cname in metadata_col_names.difference(conn_col_names):
+        if autogen_context.run_object_filters(
+            metadata_cols_by_name[cname], cname, "column", False, None
+        ):
+            modify_table_ops.ops.append(
+                ops.AddColumnOp.from_column_and_tablename(
+                    schema, tname, metadata_cols_by_name[cname]
+                )
+            )
+            log.info("Detected added column '%s.%s'", name, cname)
+
+    for colname in metadata_col_names.intersection(conn_col_names):
+        metadata_col = metadata_cols_by_name[colname]
+        conn_col = conn_table.c[colname]
+        if not autogen_context.run_object_filters(
+            metadata_col, colname, "column", False, conn_col
+        ):
+            continue
+        alter_column_op = ops.AlterColumnOp(tname, colname, schema=schema)
+
+        autogen_context.comparators.dispatch(
+            "column", qualifier=autogen_context.dialect.name
+        )(
+            autogen_context,
+            alter_column_op,
+            schema,
+            tname,
+            colname,
+            conn_col,
+            metadata_col,
+        )
+
+        if alter_column_op.has_changes():
+            modify_table_ops.ops.append(alter_column_op)
+
+    yield
+
+    for cname in set(conn_col_names).difference(metadata_col_names):
+        if autogen_context.run_object_filters(
+            conn_table.c[cname], cname, "column", True, None
+        ):
+            modify_table_ops.ops.append(
+                ops.DropColumnOp.from_column_and_tablename(
+                    schema, tname, conn_table.c[cname]
+                )
+            )
+            log.info("Detected removed column '%s.%s'", name, cname)
+
+
+def setup(plugin: Plugin) -> None:
+
+    plugin.add_autogenerate_comparator(
+        _autogen_for_tables,
+        "schema",
+        "tables",
+    )
diff --git a/libs/alembic/autogenerate/compare/types.py b/libs/alembic/autogenerate/compare/types.py
new file mode 100644
index 0000000000..1d5d160a35
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/types.py
@@ -0,0 +1,147 @@
+from __future__ import annotations
+
+import logging
+from typing import Any
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
+
+from sqlalchemy import types as sqltypes
+
+from ...util import DispatchPriority
+from ...util import PriorityDispatchResult
+
+if TYPE_CHECKING:
+    from sqlalchemy.sql.elements import quoted_name
+    from sqlalchemy.sql.schema import Column
+
+    from ...autogenerate.api import AutogenContext
+    from ...operations.ops import AlterColumnOp
+    from ...runtime.plugins import Plugin
+
+
+log = logging.getLogger(__name__)
+
+
+def _compare_type_setup(
+    alter_column_op: AlterColumnOp,
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> bool:
+
+    conn_type = conn_col.type
+    alter_column_op.existing_type = conn_type
+    metadata_type = metadata_col.type
+    if conn_type._type_affinity is sqltypes.NullType:
+        log.info(
+            "Couldn't determine database type for column '%s.%s'",
+            tname,
+            cname,
+        )
+        return False
+    if metadata_type._type_affinity is sqltypes.NullType:
+        log.info(
+            "Column '%s.%s' has no type within the model; can't compare",
+            tname,
+            cname,
+        )
+        return False
+
+    return True
+
+
+def _user_compare_type(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+
+    migration_context = autogen_context.migration_context
+
+    if migration_context._user_compare_type is False:
+        return PriorityDispatchResult.STOP
+
+    if not _compare_type_setup(
+        alter_column_op, tname, cname, conn_col, metadata_col
+    ):
+        return PriorityDispatchResult.CONTINUE
+
+    if not callable(migration_context._user_compare_type):
+        return PriorityDispatchResult.CONTINUE
+
+    is_diff = migration_context._user_compare_type(
+        migration_context,
+        conn_col,
+        metadata_col,
+        conn_col.type,
+        metadata_col.type,
+    )
+    if is_diff:
+        alter_column_op.modify_type = metadata_col.type
+        log.info(
+            "Detected type change from %r to %r on '%s.%s'",
+            conn_col.type,
+            metadata_col.type,
+            tname,
+            cname,
+        )
+        return PriorityDispatchResult.STOP
+    elif is_diff is False:
+        # if user compare type returns False and not None,
+        # it means "dont do any more type comparison"
+        return PriorityDispatchResult.STOP
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def _dialect_impl_compare_type(
+    autogen_context: AutogenContext,
+    alter_column_op: AlterColumnOp,
+    schema: Optional[str],
+    tname: Union[quoted_name, str],
+    cname: Union[quoted_name, str],
+    conn_col: Column[Any],
+    metadata_col: Column[Any],
+) -> PriorityDispatchResult:
+
+    if not _compare_type_setup(
+        alter_column_op, tname, cname, conn_col, metadata_col
+    ):
+        return PriorityDispatchResult.CONTINUE
+
+    migration_context = autogen_context.migration_context
+    is_diff = migration_context.impl.compare_type(conn_col, metadata_col)
+
+    if is_diff:
+        alter_column_op.modify_type = metadata_col.type
+        log.info(
+            "Detected type change from %r to %r on '%s.%s'",
+            conn_col.type,
+            metadata_col.type,
+            tname,
+            cname,
+        )
+        return PriorityDispatchResult.STOP
+
+    return PriorityDispatchResult.CONTINUE
+
+
+def setup(plugin: Plugin) -> None:
+    plugin.add_autogenerate_comparator(
+        _user_compare_type,
+        "column",
+        "types",
+        priority=DispatchPriority.FIRST,
+    )
+    plugin.add_autogenerate_comparator(
+        _dialect_impl_compare_type,
+        "column",
+        "types",
+        priority=DispatchPriority.LAST,
+    )
diff --git a/libs/alembic/autogenerate/compare/util.py b/libs/alembic/autogenerate/compare/util.py
new file mode 100644
index 0000000000..41829c0e0b
--- /dev/null
+++ b/libs/alembic/autogenerate/compare/util.py
@@ -0,0 +1,314 @@
+# mypy: allow-untyped-defs, allow-incomplete-defs, allow-untyped-calls
+# mypy: no-warn-return-any, allow-any-generics
+from __future__ import annotations
+
+from typing import Any
+from typing import cast
+from typing import Collection
+from typing import TYPE_CHECKING
+
+from sqlalchemy.sql.elements import conv
+from typing_extensions import Self
+
+from ...util import sqla_compat
+
+if TYPE_CHECKING:
+    from sqlalchemy import Table
+    from sqlalchemy.engine import Inspector
+    from sqlalchemy.engine.interfaces import ReflectedForeignKeyConstraint
+    from sqlalchemy.engine.interfaces import ReflectedIndex
+    from sqlalchemy.engine.interfaces import ReflectedUniqueConstraint
+    from sqlalchemy.engine.reflection import _ReflectionInfo
+
+_INSP_KEYS = (
+    "columns",
+    "pk_constraint",
+    "foreign_keys",
+    "indexes",
+    "unique_constraints",
+    "table_comment",
+    "check_constraints",
+    "table_options",
+)
+_CONSTRAINT_INSP_KEYS = (
+    "pk_constraint",
+    "foreign_keys",
+    "indexes",
+    "unique_constraints",
+    "check_constraints",
+)
+
+
+class _InspectorConv:
+    __slots__ = ("inspector",)
+
+    def __new__(cls, inspector: Inspector) -> Self:
+        obj: Any
+        if sqla_compat.sqla_2:
+            obj = object.__new__(_SQLA2InspectorConv)
+            _SQLA2InspectorConv.__init__(obj, inspector)
+        else:
+            obj = object.__new__(_LegacyInspectorConv)
+            _LegacyInspectorConv.__init__(obj, inspector)
+        return cast(Self, obj)
+
+    def __init__(self, inspector: Inspector):
+        self.inspector = inspector
+
+    def pre_cache_tables(
+        self,
+        schema: str | None,
+        tablenames: list[str],
+        all_available_tablenames: Collection[str],
+    ) -> None:
+        pass
+
+    def get_unique_constraints(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedUniqueConstraint]:
+        raise NotImplementedError()
+
+    def get_indexes(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedIndex]:
+        raise NotImplementedError()
+
+    def get_foreign_keys(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedForeignKeyConstraint]:
+        raise NotImplementedError()
+
+    def reflect_table(self, table: Table) -> None:
+        raise NotImplementedError()
+
+
+class _LegacyInspectorConv(_InspectorConv):
+
+    def _apply_reflectinfo_conv(self, consts):
+        if not consts:
+            return consts
+        for const in consts:
+            if const["name"] is not None and not isinstance(
+                const["name"], conv
+            ):
+                const["name"] = conv(const["name"])
+        return consts
+
+    def _apply_constraint_conv(self, consts):
+        if not consts:
+            return consts
+        for const in consts:
+            if const.name is not None and not isinstance(const.name, conv):
+                const.name = conv(const.name)
+        return consts
+
+    def get_indexes(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedIndex]:
+        return self._apply_reflectinfo_conv(
+            self.inspector.get_indexes(tname, schema=schema)
+        )
+
+    def get_unique_constraints(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedUniqueConstraint]:
+        return self._apply_reflectinfo_conv(
+            self.inspector.get_unique_constraints(tname, schema=schema)
+        )
+
+    def get_foreign_keys(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedForeignKeyConstraint]:
+        return self._apply_reflectinfo_conv(
+            self.inspector.get_foreign_keys(tname, schema=schema)
+        )
+
+    def reflect_table(self, table: Table) -> None:
+        self.inspector.reflect_table(table, include_columns=None)
+
+        self._apply_constraint_conv(table.constraints)
+        self._apply_constraint_conv(table.indexes)
+
+
+class _SQLA2InspectorConv(_InspectorConv):
+
+    def _pre_cache(
+        self,
+        schema: str | None,
+        tablenames: list[str],
+        all_available_tablenames: Collection[str],
+        info_key: str,
+        inspector_method: Any,
+    ) -> None:
+
+        if info_key in self.inspector.info_cache:
+            return
+
+        # heuristic vendored from SQLAlchemy 2.0
+        # if more than 50% of the tables in the db are in filter_names load all
+        # the tables, since it's most likely faster to avoid a filter on that
+        # many tables. also if a dialect doesnt have a "multi" method then
+        # return the filter names
+        if tablenames and all_available_tablenames and len(tablenames) > 100:
+            fraction = len(tablenames) / len(all_available_tablenames)
+        else:
+            fraction = None
+
+        if (
+            fraction is None
+            or fraction <= 0.5
+            or not self.inspector.dialect._overrides_default(
+                inspector_method.__name__
+            )
+        ):
+            optimized_filter_names = tablenames
+        else:
+            optimized_filter_names = None
+
+        try:
+            elements = inspector_method(
+                schema=schema, filter_names=optimized_filter_names
+            )
+        except NotImplementedError:
+            self.inspector.info_cache[info_key] = NotImplementedError
+        else:
+            self.inspector.info_cache[info_key] = elements
+
+    def _return_from_cache(
+        self,
+        tname: str,
+        schema: str | None,
+        info_key: str,
+        inspector_method: Any,
+        apply_constraint_conv: bool = False,
+        optional=True,
+    ) -> Any:
+        not_in_cache = object()
+
+        if info_key in self.inspector.info_cache:
+            cache = self.inspector.info_cache[info_key]
+            if cache is NotImplementedError:
+                if optional:
+                    return {}
+                else:
+                    # maintain NotImplementedError as alembic compare
+                    # uses these to determine classes of construct that it
+                    # should not compare to DB elements
+                    raise NotImplementedError()
+
+            individual = cache.get((schema, tname), not_in_cache)
+
+            if individual is not not_in_cache:
+                if apply_constraint_conv and individual is not None:
+                    return self._apply_reflectinfo_conv(individual)
+                else:
+                    return individual
+
+        try:
+            data = inspector_method(tname, schema=schema)
+        except NotImplementedError:
+            if optional:
+                return {}
+            else:
+                raise
+
+        if apply_constraint_conv:
+            return self._apply_reflectinfo_conv(data)
+        else:
+            return data
+
+    def get_unique_constraints(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedUniqueConstraint]:
+        return self._return_from_cache(
+            tname,
+            schema,
+            "alembic_unique_constraints",
+            self.inspector.get_unique_constraints,
+            apply_constraint_conv=True,
+            optional=False,
+        )
+
+    def get_indexes(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedIndex]:
+        return self._return_from_cache(
+            tname,
+            schema,
+            "alembic_indexes",
+            self.inspector.get_indexes,
+            apply_constraint_conv=True,
+            optional=False,
+        )
+
+    def get_foreign_keys(
+        self, tname: str, schema: str | None
+    ) -> list[ReflectedForeignKeyConstraint]:
+        return self._return_from_cache(
+            tname,
+            schema,
+            "alembic_foreign_keys",
+            self.inspector.get_foreign_keys,
+            apply_constraint_conv=True,
+        )
+
+    def _apply_reflectinfo_conv(self, consts):
+        if not consts:
+            return consts
+        for const in consts if not isinstance(consts, dict) else [consts]:
+            if const["name"] is not None and not isinstance(
+                const["name"], conv
+            ):
+                const["name"] = conv(const["name"])
+        return consts
+
+    def pre_cache_tables(
+        self,
+        schema: str | None,
+        tablenames: list[str],
+        all_available_tablenames: Collection[str],
+    ) -> None:
+        for key in _INSP_KEYS:
+            keyname = f"alembic_{key}"
+            meth = getattr(self.inspector, f"get_multi_{key}")
+
+            self._pre_cache(
+                schema,
+                tablenames,
+                all_available_tablenames,
+                keyname,
+                meth,
+            )
+
+    def _make_reflection_info(
+        self, tname: str, schema: str | None
+    ) -> _ReflectionInfo:
+        from sqlalchemy.engine.reflection import _ReflectionInfo
+
+        table_key = (schema, tname)
+
+        return _ReflectionInfo(
+            unreflectable={},
+            **{
+                key: {
+                    table_key: self._return_from_cache(
+                        tname,
+                        schema,
+                        f"alembic_{key}",
+                        getattr(self.inspector, f"get_{key}"),
+                        apply_constraint_conv=(key in _CONSTRAINT_INSP_KEYS),
+                    )
+                }
+                for key in _INSP_KEYS
+            },
+        )
+
+    def reflect_table(self, table: Table) -> None:
+        ri = self._make_reflection_info(table.name, table.schema)
+
+        self.inspector.reflect_table(
+            table,
+            include_columns=None,
+            resolve_fks=False,
+            _reflect_info=ri,
+        )
diff --git a/libs/alembic/autogenerate/render.py b/libs/alembic/autogenerate/render.py
index 38bdbfca26..7f32838df7 100644
--- a/libs/alembic/autogenerate/render.py
+++ b/libs/alembic/autogenerate/render.py
@@ -18,7 +18,9 @@
 from sqlalchemy import schema as sa_schema
 from sqlalchemy import sql
 from sqlalchemy import types as sqltypes
+from sqlalchemy.sql.base import _DialectArgView
 from sqlalchemy.sql.elements import conv
+from sqlalchemy.sql.elements import Label
 from sqlalchemy.sql.elements import quoted_name
 
 from .. import util
@@ -28,7 +30,8 @@
 if TYPE_CHECKING:
     from typing import Literal
 
-    from sqlalchemy.sql.base import DialectKWArgs
+    from sqlalchemy import Computed
+    from sqlalchemy import Identity
     from sqlalchemy.sql.elements import ColumnElement
     from sqlalchemy.sql.elements import TextClause
     from sqlalchemy.sql.schema import CheckConstraint
@@ -48,8 +51,6 @@
     from alembic.config import Config
     from alembic.operations.ops import MigrationScript
     from alembic.operations.ops import ModifyTableOps
-    from alembic.util.sqla_compat import Computed
-    from alembic.util.sqla_compat import Identity
 
 
 MAX_PYTHON_ARGS = 255
@@ -303,11 +304,11 @@ def _drop_table(autogen_context: AutogenContext, op: ops.DropTableOp) -> str:
 
 
 def _render_dialect_kwargs_items(
-    autogen_context: AutogenContext, item: DialectKWArgs
+    autogen_context: AutogenContext, dialect_kwargs: _DialectArgView
 ) -> list[str]:
     return [
         f"{key}={_render_potential_expr(val, autogen_context)}"
-        for key, val in item.dialect_kwargs.items()
+        for key, val in dialect_kwargs.items()
     ]
 
 
@@ -330,7 +331,7 @@ def _add_index(autogen_context: AutogenContext, op: ops.CreateIndexOp) -> str:
 
     assert index.table is not None
 
-    opts = _render_dialect_kwargs_items(autogen_context, index)
+    opts = _render_dialect_kwargs_items(autogen_context, index.dialect_kwargs)
     if op.if_not_exists is not None:
         opts.append("if_not_exists=%r" % bool(op.if_not_exists))
     text = tmpl % {
@@ -364,7 +365,7 @@ def _drop_index(autogen_context: AutogenContext, op: ops.DropIndexOp) -> str:
             "%(prefix)sdrop_index(%(name)r, "
             "table_name=%(table_name)r%(schema)s%(kwargs)s)"
         )
-    opts = _render_dialect_kwargs_items(autogen_context, index)
+    opts = _render_dialect_kwargs_items(autogen_context, index.dialect_kwargs)
     if op.if_exists is not None:
         opts.append("if_exists=%r" % bool(op.if_exists))
     text = tmpl % {
@@ -388,6 +389,7 @@ def _add_unique_constraint(
 def _add_fk_constraint(
     autogen_context: AutogenContext, op: ops.CreateForeignKeyOp
 ) -> str:
+    constraint = op.to_constraint()
     args = [repr(_render_gen_name(autogen_context, op.constraint_name))]
     if not autogen_context._has_batch:
         args.append(repr(_ident(op.source_table)))
@@ -417,9 +419,16 @@ def _add_fk_constraint(
             if value is not None:
                 args.append("%s=%r" % (k, value))
 
-    return "%(prefix)screate_foreign_key(%(args)s)" % {
+    dialect_kwargs = _render_dialect_kwargs_items(
+        autogen_context, constraint.dialect_kwargs
+    )
+
+    return "%(prefix)screate_foreign_key(%(args)s%(dialect_kwargs)s)" % {
         "prefix": _alembic_autogenerate_prefix(autogen_context),
         "args": ", ".join(args),
+        "dialect_kwargs": (
+            ", " + ", ".join(dialect_kwargs) if dialect_kwargs else ""
+        ),
     }
 
 
@@ -441,7 +450,7 @@ def _drop_constraint(
     name = _render_gen_name(autogen_context, op.constraint_name)
     schema = _ident(op.schema) if op.schema else None
     type_ = _ident(op.constraint_type) if op.constraint_type else None
-
+    if_exists = op.if_exists
     params_strs = []
     params_strs.append(repr(name))
     if not autogen_context._has_batch:
@@ -450,32 +459,47 @@ def _drop_constraint(
             params_strs.append(f"schema={schema!r}")
     if type_ is not None:
         params_strs.append(f"type_={type_!r}")
+    if if_exists is not None:
+        params_strs.append(f"if_exists={if_exists}")
 
     return f"{prefix}drop_constraint({', '.join(params_strs)})"
 
 
 @renderers.dispatch_for(ops.AddColumnOp)
 def _add_column(autogen_context: AutogenContext, op: ops.AddColumnOp) -> str:
-    schema, tname, column = op.schema, op.table_name, op.column
+    schema, tname, column, if_not_exists = (
+        op.schema,
+        op.table_name,
+        op.column,
+        op.if_not_exists,
+    )
     if autogen_context._has_batch:
         template = "%(prefix)sadd_column(%(column)s)"
     else:
         template = "%(prefix)sadd_column(%(tname)r, %(column)s"
         if schema:
             template += ", schema=%(schema)r"
+        if if_not_exists is not None:
+            template += ", if_not_exists=%(if_not_exists)r"
         template += ")"
     text = template % {
         "prefix": _alembic_autogenerate_prefix(autogen_context),
         "tname": tname,
         "column": _render_column(column, autogen_context),
         "schema": schema,
+        "if_not_exists": if_not_exists,
     }
     return text
 
 
 @renderers.dispatch_for(ops.DropColumnOp)
 def _drop_column(autogen_context: AutogenContext, op: ops.DropColumnOp) -> str:
-    schema, tname, column_name = op.schema, op.table_name, op.column_name
+    schema, tname, column_name, if_exists = (
+        op.schema,
+        op.table_name,
+        op.column_name,
+        op.if_exists,
+    )
 
     if autogen_context._has_batch:
         template = "%(prefix)sdrop_column(%(cname)r)"
@@ -483,6 +507,8 @@ def _drop_column(autogen_context: AutogenContext, op: ops.DropColumnOp) -> str:
         template = "%(prefix)sdrop_column(%(tname)r, %(cname)r"
         if schema:
             template += ", schema=%(schema)r"
+        if if_exists is not None:
+            template += ", if_exists=%(if_exists)r"
         template += ")"
 
     text = template % {
@@ -490,6 +516,7 @@ def _drop_column(autogen_context: AutogenContext, op: ops.DropColumnOp) -> str:
         "tname": _ident(tname),
         "cname": _ident(column_name),
         "schema": _ident(schema),
+        "if_exists": if_exists,
     }
     return text
 
@@ -504,6 +531,7 @@ def _alter_column(
     type_ = op.modify_type
     nullable = op.modify_nullable
     comment = op.modify_comment
+    newname = op.modify_name
     autoincrement = op.kw.get("autoincrement", None)
     existing_type = op.existing_type
     existing_nullable = op.existing_nullable
@@ -532,6 +560,8 @@ def _alter_column(
         rendered = _render_server_default(server_default, autogen_context)
         text += ",\n%sserver_default=%s" % (indent, rendered)
 
+    if newname is not None:
+        text += ",\n%snew_column_name=%r" % (indent, newname)
     if type_ is not None:
         text += ",\n%stype_=%s" % (indent, _repr_type(type_, autogen_context))
     if nullable is not None:
@@ -584,23 +614,28 @@ def _render_potential_expr(
     value: Any,
     autogen_context: AutogenContext,
     *,
-    wrap_in_text: bool = True,
+    wrap_in_element: bool = True,
     is_server_default: bool = False,
     is_index: bool = False,
 ) -> str:
     if isinstance(value, sql.ClauseElement):
-        if wrap_in_text:
-            template = "%(prefix)stext(%(sql)r)"
+        sql_text = autogen_context.migration_context.impl.render_ddl_sql_expr(
+            value, is_server_default=is_server_default, is_index=is_index
+        )
+        if wrap_in_element:
+            prefix = _sqlalchemy_autogenerate_prefix(autogen_context)
+            element = "literal_column" if is_index else "text"
+            value_str = f"{prefix}{element}({sql_text!r})"
+            if (
+                is_index
+                and isinstance(value, Label)
+                and type(value.name) is str
+            ):
+                return value_str + f".label({value.name!r})"
+            else:
+                return value_str
         else:
-            template = "%(sql)r"
-
-        return template % {
-            "prefix": _sqlalchemy_autogenerate_prefix(autogen_context),
-            "sql": autogen_context.migration_context.impl.render_ddl_sql_expr(
-                value, is_server_default=is_server_default, is_index=is_index
-            ),
-        }
-
+            return repr(sql_text)
     else:
         return repr(value)
 
@@ -628,16 +663,18 @@ def _uq_constraint(
     has_batch = autogen_context._has_batch
 
     if constraint.deferrable:
-        opts.append(("deferrable", str(constraint.deferrable)))
+        opts.append(("deferrable", constraint.deferrable))
     if constraint.initially:
-        opts.append(("initially", str(constraint.initially)))
+        opts.append(("initially", constraint.initially))
     if not has_batch and alter and constraint.table.schema:
         opts.append(("schema", _ident(constraint.table.schema)))
     if not alter and constraint.name:
         opts.append(
             ("name", _render_gen_name(autogen_context, constraint.name))
         )
-    dialect_options = _render_dialect_kwargs_items(autogen_context, constraint)
+    dialect_options = _render_dialect_kwargs_items(
+        autogen_context, constraint.dialect_kwargs
+    )
 
     if alter:
         args = [repr(_render_gen_name(autogen_context, constraint.name))]
@@ -741,7 +778,7 @@ def _render_column(
                 + [
                     "%s=%s"
                     % (key, _render_potential_expr(val, autogen_context))
-                    for key, val in sqla_compat._column_kwargs(column).items()
+                    for key, val in column.kwargs.items()
                 ]
             )
         ),
@@ -776,6 +813,8 @@ def _render_server_default(
             return _render_potential_expr(
                 default.arg, autogen_context, is_server_default=True
             )
+    elif isinstance(default, sa_schema.FetchedValue):
+        return _render_fetched_value(autogen_context)
 
     if isinstance(default, str) and repr_:
         default = repr(re.sub(r"^'|'$", "", default))
@@ -787,7 +826,7 @@ def _render_computed(
     computed: Computed, autogen_context: AutogenContext
 ) -> str:
     text = _render_potential_expr(
-        computed.sqltext, autogen_context, wrap_in_text=False
+        computed.sqltext, autogen_context, wrap_in_element=False
     )
 
     kwargs = {}
@@ -813,6 +852,12 @@ def _render_identity(
     }
 
 
+def _render_fetched_value(autogen_context: AutogenContext) -> str:
+    return "%(prefix)sFetchedValue()" % {
+        "prefix": _sqlalchemy_autogenerate_prefix(autogen_context),
+    }
+
+
 def _repr_type(
     type_: TypeEngine,
     autogen_context: AutogenContext,
@@ -831,7 +876,10 @@ def _repr_type(
 
     mod = type(type_).__module__
     imports = autogen_context.imports
-    if mod.startswith("sqlalchemy.dialects"):
+
+    if not _skip_variants and sqla_compat._type_has_variants(type_):
+        return _render_Variant_type(type_, autogen_context)
+    elif mod.startswith("sqlalchemy.dialects"):
         match = re.match(r"sqlalchemy\.dialects\.(\w+)", mod)
         assert match is not None
         dname = match.group(1)
@@ -843,8 +891,6 @@ def _repr_type(
             return "%s.%r" % (dname, type_)
     elif impl_rt:
         return impl_rt
-    elif not _skip_variants and sqla_compat._type_has_variants(type_):
-        return _render_Variant_type(type_, autogen_context)
     elif mod.startswith("sqlalchemy."):
         if "_render_%s_type" % type_.__visit_name__ in globals():
             fn = globals()["_render_%s_type" % type_.__visit_name__]
@@ -962,7 +1008,7 @@ def _render_primary_key(
 def _fk_colspec(
     fk: ForeignKey,
     metadata_schema: Optional[str],
-    namespace_metadata: MetaData,
+    namespace_metadata: Optional[MetaData],
 ) -> str:
     """Implement a 'safe' version of ForeignKey._get_colspec() that
     won't fail if the remote table can't be resolved.
@@ -986,7 +1032,10 @@ def _fk_colspec(
         # the FK constraint needs to be rendered in terms of the column
         # name.
 
-        if table_fullname in namespace_metadata.tables:
+        if (
+            namespace_metadata is not None
+            and table_fullname in namespace_metadata.tables
+        ):
             col = namespace_metadata.tables[table_fullname].c.get(colname)
             if col is not None:
                 colname = _ident(col.name)  # type: ignore[assignment]
@@ -1017,7 +1066,7 @@ def _populate_render_fk_opts(
 def _render_foreign_key(
     constraint: ForeignKeyConstraint,
     autogen_context: AutogenContext,
-    namespace_metadata: MetaData,
+    namespace_metadata: Optional[MetaData],
 ) -> Optional[str]:
     rendered = _user_defined_render("foreign_key", constraint, autogen_context)
     if rendered is not False:
@@ -1031,7 +1080,9 @@ def _render_foreign_key(
 
     _populate_render_fk_opts(constraint, opts)
 
-    apply_metadata_schema = namespace_metadata.schema
+    apply_metadata_schema = (
+        namespace_metadata.schema if namespace_metadata is not None else None
+    )
     return (
         "%(prefix)sForeignKeyConstraint([%(cols)s], "
         "[%(refcols)s], %(args)s)"
@@ -1100,7 +1151,7 @@ def _render_check_constraint(
             else ""
         ),
         "sqltext": _render_potential_expr(
-            constraint.sqltext, autogen_context, wrap_in_text=False
+            constraint.sqltext, autogen_context, wrap_in_element=False
         ),
     }
 
@@ -1112,7 +1163,10 @@ def _execute_sql(autogen_context: AutogenContext, op: ops.ExecuteSQLOp) -> str:
             "Autogenerate rendering of SQL Expression language constructs "
             "not supported here; please use a plain SQL string"
         )
-    return "op.execute(%r)" % op.sqltext
+    return "{prefix}execute({sqltext!r})".format(
+        prefix=_alembic_autogenerate_prefix(autogen_context),
+        sqltext=op.sqltext,
+    )
 
 
 renderers = default_renderers.branch()
diff --git a/libs/alembic/autogenerate/rewriter.py b/libs/alembic/autogenerate/rewriter.py
index 8994dcf823..1d44b5c340 100644
--- a/libs/alembic/autogenerate/rewriter.py
+++ b/libs/alembic/autogenerate/rewriter.py
@@ -177,7 +177,7 @@ def _traverse_script(
                 )
             upgrade_ops_list.append(ret[0])
 
-        directive.upgrade_ops = upgrade_ops_list  # type: ignore
+        directive.upgrade_ops = upgrade_ops_list
 
         downgrade_ops_list: List[DowngradeOps] = []
         for downgrade_ops in directive.downgrade_ops_list:
@@ -187,7 +187,7 @@ def _traverse_script(
                     "Can only return single object for DowngradeOps traverse"
                 )
             downgrade_ops_list.append(ret[0])
-        directive.downgrade_ops = downgrade_ops_list  # type: ignore
+        directive.downgrade_ops = downgrade_ops_list
 
     @_traverse.dispatch_for(ops.OpContainer)
     def _traverse_op_container(
diff --git a/libs/alembic/command.py b/libs/alembic/command.py
index 89c12354a6..4897c0d9c2 100644
--- a/libs/alembic/command.py
+++ b/libs/alembic/command.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import os
+import pathlib
 from typing import List
 from typing import Optional
 from typing import TYPE_CHECKING
@@ -12,6 +13,7 @@
 from . import util
 from .runtime.environment import EnvironmentContext
 from .script import ScriptDirectory
+from .util import compat
 
 if TYPE_CHECKING:
     from alembic.config import Config
@@ -28,12 +30,10 @@ def list_templates(config: Config) -> None:
     """
 
     config.print_stdout("Available templates:\n")
-    for tempname in os.listdir(config.get_template_directory()):
-        with open(
-            os.path.join(config.get_template_directory(), tempname, "README")
-        ) as readme:
+    for tempname in config._get_template_path().iterdir():
+        with (tempname / "README").open() as readme:
             synopsis = next(readme).rstrip()
-        config.print_stdout("%s - %s", tempname, synopsis)
+        config.print_stdout("%s - %s", tempname.name, synopsis)
 
     config.print_stdout("\nTemplates are used via the 'init' command, e.g.:")
     config.print_stdout("\n  alembic init --template generic ./scripts")
@@ -59,65 +59,136 @@ def init(
 
     """
 
-    if os.access(directory, os.F_OK) and os.listdir(directory):
+    directory_path = pathlib.Path(directory)
+    if directory_path.exists() and list(directory_path.iterdir()):
         raise util.CommandError(
-            "Directory %s already exists and is not empty" % directory
+            "Directory %s already exists and is not empty" % directory_path
         )
 
-    template_dir = os.path.join(config.get_template_directory(), template)
-    if not os.access(template_dir, os.F_OK):
-        raise util.CommandError("No such template %r" % template)
+    template_path = config._get_template_path() / template
 
-    if not os.access(directory, os.F_OK):
+    if not template_path.exists():
+        raise util.CommandError(f"No such template {template_path}")
+
+    # left as os.access() to suit unit test mocking
+    if not os.access(directory_path, os.F_OK):
         with util.status(
-            f"Creating directory {os.path.abspath(directory)!r}",
+            f"Creating directory {directory_path.absolute()}",
             **config.messaging_opts,
         ):
-            os.makedirs(directory)
+            os.makedirs(directory_path)
 
-    versions = os.path.join(directory, "versions")
+    versions = directory_path / "versions"
     with util.status(
-        f"Creating directory {os.path.abspath(versions)!r}",
+        f"Creating directory {versions.absolute()}",
         **config.messaging_opts,
     ):
         os.makedirs(versions)
 
-    script = ScriptDirectory(directory)
+    if not directory_path.is_absolute():
+        # for non-absolute path, state config file in .ini / pyproject
+        # as relative to the %(here)s token, which is where the config
+        # file itself would be
+
+        if config._config_file_path is not None:
+            rel_dir = compat.path_relative_to(
+                directory_path.absolute(),
+                config._config_file_path.absolute().parent,
+                walk_up=True,
+            )
+            ini_script_location_directory = ("%(here)s" / rel_dir).as_posix()
+        if config._toml_file_path is not None:
+            rel_dir = compat.path_relative_to(
+                directory_path.absolute(),
+                config._toml_file_path.absolute().parent,
+                walk_up=True,
+            )
+            toml_script_location_directory = ("%(here)s" / rel_dir).as_posix()
+
+    else:
+        ini_script_location_directory = directory_path.as_posix()
+        toml_script_location_directory = directory_path.as_posix()
+
+    script = ScriptDirectory(directory_path)
+
+    has_toml = False
 
-    config_file: str | None = None
-    for file_ in os.listdir(template_dir):
-        file_path = os.path.join(template_dir, file_)
+    config_file: pathlib.Path | None = None
+
+    for file_path in template_path.iterdir():
+        file_ = file_path.name
         if file_ == "alembic.ini.mako":
             assert config.config_file_name is not None
-            config_file = os.path.abspath(config.config_file_name)
-            if os.access(config_file, os.F_OK):
+            config_file = pathlib.Path(config.config_file_name).absolute()
+            if config_file.exists():
                 util.msg(
-                    f"File {config_file!r} already exists, skipping",
+                    f"File {config_file} already exists, skipping",
                     **config.messaging_opts,
                 )
             else:
                 script._generate_template(
-                    file_path, config_file, script_location=directory
+                    file_path,
+                    config_file,
+                    script_location=ini_script_location_directory,
+                )
+        elif file_ == "pyproject.toml.mako":
+            has_toml = True
+            assert config._toml_file_path is not None
+            toml_path = config._toml_file_path.absolute()
+
+            if toml_path.exists():
+                # left as open() to suit unit test mocking
+                with open(toml_path, "rb") as f:
+                    toml_data = compat.tomllib.load(f)
+                    if "tool" in toml_data and "alembic" in toml_data["tool"]:
+
+                        util.msg(
+                            f"File {toml_path} already exists "
+                            "and already has a [tool.alembic] section, "
+                            "skipping",
+                        )
+                        continue
+                script._append_template(
+                    file_path,
+                    toml_path,
+                    script_location=toml_script_location_directory,
+                )
+            else:
+                script._generate_template(
+                    file_path,
+                    toml_path,
+                    script_location=toml_script_location_directory,
                 )
-        elif os.path.isfile(file_path):
-            output_file = os.path.join(directory, file_)
+
+        elif file_path.is_file():
+            output_file = directory_path / file_
             script._copy_file(file_path, output_file)
 
     if package:
         for path in [
-            os.path.join(os.path.abspath(directory), "__init__.py"),
-            os.path.join(os.path.abspath(versions), "__init__.py"),
+            directory_path.absolute() / "__init__.py",
+            versions.absolute() / "__init__.py",
         ]:
-            with util.status(f"Adding {path!r}", **config.messaging_opts):
+            with util.status(f"Adding {path!s}", **config.messaging_opts):
+                # left as open() to suit unit test mocking
                 with open(path, "w"):
                     pass
 
     assert config_file is not None
-    util.msg(
-        "Please edit configuration/connection/logging "
-        f"settings in {config_file!r} before proceeding.",
-        **config.messaging_opts,
-    )
+
+    if has_toml:
+        util.msg(
+            f"Please edit configuration settings in {toml_path} and "
+            "configuration/connection/logging "
+            f"settings in {config_file} before proceeding.",
+            **config.messaging_opts,
+        )
+    else:
+        util.msg(
+            "Please edit configuration/connection/logging "
+            f"settings in {config_file} before proceeding.",
+            **config.messaging_opts,
+        )
 
 
 def revision(
@@ -128,7 +199,7 @@ def revision(
     head: str = "head",
     splice: bool = False,
     branch_label: Optional[_RevIdType] = None,
-    version_path: Optional[str] = None,
+    version_path: Union[str, os.PathLike[str], None] = None,
     rev_id: Optional[str] = None,
     depends_on: Optional[str] = None,
     process_revision_directives: Optional[ProcessRevisionDirectiveFn] = None,
@@ -198,7 +269,9 @@ def revision(
         process_revision_directives=process_revision_directives,
     )
 
-    environment = util.asbool(config.get_main_option("revision_environment"))
+    environment = util.asbool(
+        config.get_alembic_option("revision_environment")
+    )
 
     if autogenerate:
         environment = True
@@ -298,7 +371,9 @@ def retrieve_migrations(rev, context):
 
     if diffs:
         raise util.AutogenerateDiffsDetected(
-            f"New upgrade operations detected: {diffs}"
+            f"New upgrade operations detected: {diffs}",
+            revision_context=revision_context,
+            diffs=diffs,
         )
     else:
         config.print_stdout("No new upgrade operations detected.")
@@ -336,7 +411,9 @@ def merge(
         # e.g. multiple databases
     }
 
-    environment = util.asbool(config.get_main_option("revision_environment"))
+    environment = util.asbool(
+        config.get_alembic_option("revision_environment")
+    )
 
     if environment:
 
@@ -509,7 +586,7 @@ def history(
         base = head = None
 
     environment = (
-        util.asbool(config.get_main_option("revision_environment"))
+        util.asbool(config.get_alembic_option("revision_environment"))
         or indicate_current
     )
 
@@ -604,11 +681,18 @@ def branches(config: Config, verbose: bool = False) -> None:
             )
 
 
-def current(config: Config, verbose: bool = False) -> None:
+def current(
+    config: Config, check_heads: bool = False, verbose: bool = False
+) -> None:
     """Display the current revision for a database.
 
     :param config: a :class:`.Config` instance.
 
+    :param check_heads: Check if all head revisions are applied to the
+        database.  Raises :class:`.DatabaseNotAtHead` if this is not the case.
+
+        .. versionadded:: 1.17.1
+
     :param verbose: output in verbose mode.
 
     """
@@ -621,6 +705,12 @@ def display_version(rev, context):
                 "Current revision(s) for %s:",
                 util.obfuscate_url_pw(context.connection.engine.url),
             )
+        if check_heads and (
+            set(context.get_current_heads()) != set(script.get_heads())
+        ):
+            raise util.DatabaseNotAtHead(
+                "Database is not on all head revisions"
+            )
         for rev in script.get_all_current(rev):
             config.print_stdout(rev.cmd_format(verbose))
 
diff --git a/libs/alembic/config.py b/libs/alembic/config.py
index 2c52e7cd13..121a4459cd 100644
--- a/libs/alembic/config.py
+++ b/libs/alembic/config.py
@@ -4,7 +4,10 @@
 from argparse import Namespace
 from configparser import ConfigParser
 import inspect
+import logging
 import os
+from pathlib import Path
+import re
 import sys
 from typing import Any
 from typing import cast
@@ -12,6 +15,7 @@
 from typing import Mapping
 from typing import Optional
 from typing import overload
+from typing import Protocol
 from typing import Sequence
 from typing import TextIO
 from typing import Union
@@ -22,6 +26,10 @@
 from . import command
 from . import util
 from .util import compat
+from .util.pyfiles import _preserving_path_as_str
+
+
+log = logging.getLogger(__name__)
 
 
 class Config:
@@ -71,7 +79,20 @@ class Config:
             alembic_cfg.attributes['connection'] = connection
             command.upgrade(alembic_cfg, "head")
 
-    :param file\_: name of the .ini file to open.
+    :param file\_: name of the .ini file to open if an ``alembic.ini`` is
+     to be used.    This should refer to the ``alembic.ini`` file, either as
+     a filename or a full path to the file.  This filename if passed must refer
+     to an **ini file in ConfigParser format** only.
+
+    :param toml\_file: name of the pyproject.toml file to open if a
+     ``pyproject.toml`` file is to be used.  This should refer to the
+     ``pyproject.toml`` file, either as a filename or a full path to the file.
+     This file must be in toml format. Both :paramref:`.Config.file\_` and
+     :paramref:`.Config.toml\_file` may be passed simultaneously, or
+     exclusively.
+
+     .. versionadded:: 1.16.0
+
     :param ini_section: name of the main Alembic section within the
      .ini file
     :param output_buffer: optional file-like input buffer which
@@ -81,12 +102,13 @@ class Config:
      Defaults to ``sys.stdout``.
 
     :param config_args: A dictionary of keys and values that will be used
-     for substitution in the alembic config file.  The dictionary as given
-     is **copied** to a new one, stored locally as the attribute
-     ``.config_args``. When the :attr:`.Config.file_config` attribute is
-     first invoked, the replacement variable ``here`` will be added to this
-     dictionary before the dictionary is passed to ``ConfigParser()``
-     to parse the .ini file.
+     for substitution in the alembic config file, as well as the pyproject.toml
+     file, depending on which / both are used.  The dictionary as given is
+     **copied** to two new, independent dictionaries, stored locally under the
+     attributes ``.config_args`` and ``.toml_args``.   Both of these
+     dictionaries will also be populated with the replacement variable
+     ``%(here)s``, which refers to the location of the .ini and/or .toml file
+     as appropriate.
 
     :param attributes: optional dictionary of arbitrary Python keys/values,
      which will be populated into the :attr:`.Config.attributes` dictionary.
@@ -100,6 +122,7 @@ class Config:
     def __init__(
         self,
         file_: Union[str, os.PathLike[str], None] = None,
+        toml_file: Union[str, os.PathLike[str], None] = None,
         ini_section: str = "alembic",
         output_buffer: Optional[TextIO] = None,
         stdout: TextIO = sys.stdout,
@@ -108,12 +131,18 @@ def __init__(
         attributes: Optional[Dict[str, Any]] = None,
     ) -> None:
         """Construct a new :class:`.Config`"""
-        self.config_file_name = file_
+        self.config_file_name = (
+            _preserving_path_as_str(file_) if file_ else None
+        )
+        self.toml_file_name = (
+            _preserving_path_as_str(toml_file) if toml_file else None
+        )
         self.config_ini_section = ini_section
         self.output_buffer = output_buffer
         self.stdout = stdout
         self.cmd_opts = cmd_opts
         self.config_args = dict(config_args)
+        self.toml_args = dict(config_args)
         if attributes:
             self.attributes.update(attributes)
 
@@ -129,9 +158,28 @@ def __init__(
 
     """
 
-    config_file_name: Union[str, os.PathLike[str], None] = None
+    config_file_name: Optional[str] = None
     """Filesystem path to the .ini file in use."""
 
+    toml_file_name: Optional[str] = None
+    """Filesystem path to the pyproject.toml file in use.
+
+    .. versionadded:: 1.16.0
+
+    """
+
+    @property
+    def _config_file_path(self) -> Optional[Path]:
+        if self.config_file_name is None:
+            return None
+        return Path(self.config_file_name)
+
+    @property
+    def _toml_file_path(self) -> Optional[Path]:
+        if self.toml_file_name is None:
+            return None
+        return Path(self.toml_file_name)
+
     config_ini_section: str = None  # type:ignore[assignment]
     """Name of the config file section to read basic configuration
     from.  Defaults to ``alembic``, that is the ``[alembic]`` section
@@ -187,25 +235,55 @@ def print_stdout(self, text: str, *arg: Any) -> None:
     def file_config(self) -> ConfigParser:
         """Return the underlying ``ConfigParser`` object.
 
-        Direct access to the .ini file is available here,
+        Dir*-ect access to the .ini file is available here,
         though the :meth:`.Config.get_section` and
         :meth:`.Config.get_main_option`
         methods provide a possibly simpler interface.
 
         """
 
-        if self.config_file_name:
-            here = os.path.abspath(os.path.dirname(self.config_file_name))
+        if self._config_file_path:
+            here = self._config_file_path.absolute().parent
         else:
-            here = ""
-        self.config_args["here"] = here
+            here = Path()
+        self.config_args["here"] = here.as_posix()
         file_config = ConfigParser(self.config_args)
-        if self.config_file_name:
-            compat.read_config_parser(file_config, [self.config_file_name])
+
+        verbose = getattr(self.cmd_opts, "verbose", False)
+        if self._config_file_path:
+            compat.read_config_parser(file_config, [self._config_file_path])
+            if verbose:
+                log.info(
+                    "Loading config from file: %s", self._config_file_path
+                )
         else:
             file_config.add_section(self.config_ini_section)
+            if verbose:
+                log.info(
+                    "No config file provided; using in-memory default config"
+                )
         return file_config
 
+    @util.memoized_property
+    def toml_alembic_config(self) -> Mapping[str, Any]:
+        """Return a dictionary of the [tool.alembic] section from
+        pyproject.toml"""
+
+        if self._toml_file_path and self._toml_file_path.exists():
+
+            here = self._toml_file_path.absolute().parent
+            self.toml_args["here"] = here.as_posix()
+
+            with open(self._toml_file_path, "rb") as f:
+                toml_data = compat.tomllib.load(f)
+                data = toml_data.get("tool", {}).get("alembic", {})
+                if not isinstance(data, dict):
+                    raise util.CommandError("Incorrect TOML format")
+                return data
+
+        else:
+            return {}
+
     def get_template_directory(self) -> str:
         """Return the directory where Alembic setup templates are found.
 
@@ -215,8 +293,19 @@ def get_template_directory(self) -> str:
         """
         import alembic
 
-        package_dir = os.path.abspath(os.path.dirname(alembic.__file__))
-        return os.path.join(package_dir, "templates")
+        package_dir = Path(alembic.__file__).absolute().parent
+        return str(package_dir / "templates")
+
+    def _get_template_path(self) -> Path:
+        """Return the directory where Alembic setup templates are found.
+
+        This method is used by the alembic ``init`` and ``list_templates``
+        commands.
+
+        .. versionadded:: 1.16.0
+
+        """
+        return Path(self.get_template_directory())
 
     @overload
     def get_section(
@@ -278,6 +367,12 @@ def set_section_option(self, section: str, name: str, value: str) -> None:
         The value here will override whatever was in the .ini
         file.
 
+        Does **NOT** consume from the pyproject.toml file.
+
+        .. seealso::
+
+            :meth:`.Config.get_alembic_option` - includes pyproject support
+
         :param section: name of the section
 
         :param name: name of the value
@@ -326,9 +421,106 @@ def get_main_option(
         section, unless the ``-n/--name`` flag were used to
         indicate a different section.
 
+        Does **NOT** consume from the pyproject.toml file.
+
+        .. seealso::
+
+            :meth:`.Config.get_alembic_option` - includes pyproject support
+
         """
         return self.get_section_option(self.config_ini_section, name, default)
 
+    @overload
+    def get_alembic_option(self, name: str, default: str) -> str: ...
+
+    @overload
+    def get_alembic_option(
+        self, name: str, default: Optional[str] = None
+    ) -> Optional[str]: ...
+
+    def get_alembic_option(
+        self, name: str, default: Optional[str] = None
+    ) -> Union[
+        None, str, list[str], dict[str, str], list[dict[str, str]], int
+    ]:
+        """Return an option from the "[alembic]" or "[tool.alembic]" section
+        of the configparser-parsed .ini file (e.g. ``alembic.ini``) or
+        toml-parsed ``pyproject.toml`` file.
+
+        The value returned is expected to be None, string, list of strings,
+        or dictionary of strings.   Within each type of string value, the
+        ``%(here)s`` token is substituted out with the absolute path of the
+        ``pyproject.toml`` file, as are other tokens which are extracted from
+        the :paramref:`.Config.config_args` dictionary.
+
+        Searches always prioritize the configparser namespace first, before
+        searching in the toml namespace.
+
+        If Alembic was run using the ``-n/--name`` flag to indicate an
+        alternate main section name, this is taken into account **only** for
+        the configparser-parsed .ini file.  The section name in toml is always
+        ``[tool.alembic]``.
+
+
+        .. versionadded:: 1.16.0
+
+        """
+
+        if self.file_config.has_option(self.config_ini_section, name):
+            return self.file_config.get(self.config_ini_section, name)
+        else:
+            return self._get_toml_config_value(name, default=default)
+
+    def get_alembic_boolean_option(self, name: str) -> bool:
+        if self.file_config.has_option(self.config_ini_section, name):
+            return (
+                self.file_config.get(self.config_ini_section, name) == "true"
+            )
+        else:
+            value = self.toml_alembic_config.get(name, False)
+            if not isinstance(value, bool):
+                raise util.CommandError(
+                    f"boolean value expected for TOML parameter {name!r}"
+                )
+            return value
+
+    def _get_toml_config_value(
+        self, name: str, default: Optional[Any] = None
+    ) -> Union[
+        None, str, list[str], dict[str, str], list[dict[str, str]], int
+    ]:
+        USE_DEFAULT = object()
+        value: Union[None, str, list[str], dict[str, str], int] = (
+            self.toml_alembic_config.get(name, USE_DEFAULT)
+        )
+        if value is USE_DEFAULT:
+            return default
+        if value is not None:
+            if isinstance(value, str):
+                value = value % (self.toml_args)
+            elif isinstance(value, list):
+                if value and isinstance(value[0], dict):
+                    value = [
+                        {k: v % (self.toml_args) for k, v in dv.items()}
+                        for dv in value
+                    ]
+                else:
+                    value = cast(
+                        "list[str]", [v % (self.toml_args) for v in value]
+                    )
+            elif isinstance(value, dict):
+                value = cast(
+                    "dict[str, str]",
+                    {k: v % (self.toml_args) for k, v in value.items()},
+                )
+            elif isinstance(value, int):
+                return value
+            else:
+                raise util.CommandError(
+                    f"unsupported TOML value type for key: {name!r}"
+                )
+        return value
+
     @util.memoized_property
     def messaging_opts(self) -> MessagingOptions:
         """The messaging options."""
@@ -339,181 +531,324 @@ def messaging_opts(self) -> MessagingOptions:
             ),
         )
 
+    def _get_file_separator_char(self, *names: str) -> Optional[str]:
+        for name in names:
+            separator = self.get_main_option(name)
+            if separator is not None:
+                break
+        else:
+            return None
+
+        split_on_path = {
+            "space": " ",
+            "newline": "\n",
+            "os": os.pathsep,
+            ":": ":",
+            ";": ";",
+        }
+
+        try:
+            sep = split_on_path[separator]
+        except KeyError as ke:
+            raise ValueError(
+                "'%s' is not a valid value for %s; "
+                "expected 'space', 'newline', 'os', ':', ';'"
+                % (separator, name)
+            ) from ke
+        else:
+            if name == "version_path_separator":
+                util.warn_deprecated(
+                    "The version_path_separator configuration parameter "
+                    "is deprecated; please use path_separator"
+                )
+            return sep
+
+    def get_version_locations_list(self) -> Optional[list[str]]:
+
+        version_locations_str = self.file_config.get(
+            self.config_ini_section, "version_locations", fallback=None
+        )
+
+        if version_locations_str:
+            split_char = self._get_file_separator_char(
+                "path_separator", "version_path_separator"
+            )
+
+            if split_char is None:
+
+                # legacy behaviour for backwards compatibility
+                util.warn_deprecated(
+                    "No path_separator found in configuration; "
+                    "falling back to legacy splitting on spaces/commas "
+                    "for version_locations.  Consider adding "
+                    "path_separator=os to Alembic config."
+                )
+
+                _split_on_space_comma = re.compile(r", *|(?: +)")
+                return _split_on_space_comma.split(version_locations_str)
+            else:
+                return [
+                    x.strip()
+                    for x in version_locations_str.split(split_char)
+                    if x
+                ]
+        else:
+            return cast(
+                "list[str]",
+                self._get_toml_config_value("version_locations", None),
+            )
+
+    def get_prepend_sys_paths_list(self) -> Optional[list[str]]:
+        prepend_sys_path_str = self.file_config.get(
+            self.config_ini_section, "prepend_sys_path", fallback=None
+        )
+
+        if prepend_sys_path_str:
+            split_char = self._get_file_separator_char("path_separator")
+
+            if split_char is None:
+
+                # legacy behaviour for backwards compatibility
+                util.warn_deprecated(
+                    "No path_separator found in configuration; "
+                    "falling back to legacy splitting on spaces, commas, "
+                    "and colons for prepend_sys_path.  Consider adding "
+                    "path_separator=os to Alembic config."
+                )
+
+                _split_on_space_comma_colon = re.compile(r", *|(?: +)|\:")
+                return _split_on_space_comma_colon.split(prepend_sys_path_str)
+            else:
+                return [
+                    x.strip()
+                    for x in prepend_sys_path_str.split(split_char)
+                    if x
+                ]
+        else:
+            return cast(
+                "list[str]",
+                self._get_toml_config_value("prepend_sys_path", None),
+            )
+
+    def get_hooks_list(self) -> list[PostWriteHookConfig]:
+
+        hooks: list[PostWriteHookConfig] = []
+
+        if not self.file_config.has_section("post_write_hooks"):
+            toml_hook_config = cast(
+                "list[dict[str, str]]",
+                self._get_toml_config_value("post_write_hooks", []),
+            )
+            for cfg in toml_hook_config:
+                opts = dict(cfg)
+                opts["_hook_name"] = opts.pop("name")
+                hooks.append(opts)
+
+        else:
+            _split_on_space_comma = re.compile(r", *|(?: +)")
+            ini_hook_config = self.get_section("post_write_hooks", {})
+            names = _split_on_space_comma.split(
+                ini_hook_config.get("hooks", "")
+            )
+
+            for name in names:
+                if not name:
+                    continue
+                opts = {
+                    key[len(name) + 1 :]: ini_hook_config[key]
+                    for key in ini_hook_config
+                    if key.startswith(name + ".")
+                }
+
+                opts["_hook_name"] = name
+                hooks.append(opts)
+
+        return hooks
+
+
+PostWriteHookConfig = Mapping[str, str]
+
 
 class MessagingOptions(TypedDict, total=False):
     quiet: bool
 
 
+class CommandFunction(Protocol):
+    """A function that may be registered in the CLI as an alembic command.
+    It must be a named function and it must accept a :class:`.Config` object
+    as the first argument.
+
+    .. versionadded:: 1.15.3
+
+    """
+
+    __name__: str
+
+    def __call__(self, config: Config, *args: Any, **kwargs: Any) -> Any: ...
+
+
 class CommandLine:
+    """Provides the command line interface to Alembic."""
+
     def __init__(self, prog: Optional[str] = None) -> None:
         self._generate_args(prog)
 
-    def _generate_args(self, prog: Optional[str]) -> None:
-        def add_options(
-            fn: Any, parser: Any, positional: Any, kwargs: Any
-        ) -> None:
-            kwargs_opts = {
-                "template": (
-                    "-t",
-                    "--template",
-                    dict(
-                        default="generic",
-                        type=str,
-                        help="Setup template for use with 'init'",
-                    ),
-                ),
-                "message": (
-                    "-m",
-                    "--message",
-                    dict(
-                        type=str, help="Message string to use with 'revision'"
-                    ),
-                ),
-                "sql": (
-                    "--sql",
-                    dict(
-                        action="store_true",
-                        help="Don't emit SQL to database - dump to "
-                        "standard output/file instead. See docs on "
-                        "offline mode.",
-                    ),
-                ),
-                "tag": (
-                    "--tag",
-                    dict(
-                        type=str,
-                        help="Arbitrary 'tag' name - can be used by "
-                        "custom env.py scripts.",
-                    ),
-                ),
-                "head": (
-                    "--head",
-                    dict(
-                        type=str,
-                        help="Specify head revision or <branchname>@head "
-                        "to base new revision on.",
-                    ),
-                ),
-                "splice": (
-                    "--splice",
-                    dict(
-                        action="store_true",
-                        help="Allow a non-head revision as the "
-                        "'head' to splice onto",
-                    ),
-                ),
-                "depends_on": (
-                    "--depends-on",
-                    dict(
-                        action="append",
-                        help="Specify one or more revision identifiers "
-                        "which this revision should depend on.",
-                    ),
-                ),
-                "rev_id": (
-                    "--rev-id",
-                    dict(
-                        type=str,
-                        help="Specify a hardcoded revision id instead of "
-                        "generating one",
-                    ),
-                ),
-                "version_path": (
-                    "--version-path",
-                    dict(
-                        type=str,
-                        help="Specify specific path from config for "
-                        "version file",
-                    ),
-                ),
-                "branch_label": (
-                    "--branch-label",
-                    dict(
-                        type=str,
-                        help="Specify a branch label to apply to the "
-                        "new revision",
-                    ),
-                ),
-                "verbose": (
-                    "-v",
-                    "--verbose",
-                    dict(action="store_true", help="Use more verbose output"),
-                ),
-                "resolve_dependencies": (
-                    "--resolve-dependencies",
-                    dict(
-                        action="store_true",
-                        help="Treat dependency versions as down revisions",
-                    ),
-                ),
-                "autogenerate": (
-                    "--autogenerate",
-                    dict(
-                        action="store_true",
-                        help="Populate revision script with candidate "
-                        "migration operations, based on comparison "
-                        "of database to model.",
-                    ),
-                ),
-                "rev_range": (
-                    "-r",
-                    "--rev-range",
-                    dict(
-                        action="store",
-                        help="Specify a revision range; "
-                        "format is [start]:[end]",
-                    ),
-                ),
-                "indicate_current": (
-                    "-i",
-                    "--indicate-current",
-                    dict(
-                        action="store_true",
-                        help="Indicate the current revision",
-                    ),
-                ),
-                "purge": (
-                    "--purge",
-                    dict(
-                        action="store_true",
-                        help="Unconditionally erase the version table "
-                        "before stamping",
-                    ),
-                ),
-                "package": (
-                    "--package",
-                    dict(
-                        action="store_true",
-                        help="Write empty __init__.py files to the "
-                        "environment and version locations",
-                    ),
+    _KWARGS_OPTS = {
+        "template": (
+            "-t",
+            "--template",
+            dict(
+                default="generic",
+                type=str,
+                help="Setup template for use with 'init'",
+            ),
+        ),
+        "message": (
+            "-m",
+            "--message",
+            dict(type=str, help="Message string to use with 'revision'"),
+        ),
+        "sql": (
+            "--sql",
+            dict(
+                action="store_true",
+                help="Don't emit SQL to database - dump to "
+                "standard output/file instead. See docs on "
+                "offline mode.",
+            ),
+        ),
+        "tag": (
+            "--tag",
+            dict(
+                type=str,
+                help="Arbitrary 'tag' name - can be used by "
+                "custom env.py scripts.",
+            ),
+        ),
+        "head": (
+            "--head",
+            dict(
+                type=str,
+                help="Specify head revision or <branchname>@head "
+                "to base new revision on.",
+            ),
+        ),
+        "splice": (
+            "--splice",
+            dict(
+                action="store_true",
+                help="Allow a non-head revision as the 'head' to splice onto",
+            ),
+        ),
+        "depends_on": (
+            "--depends-on",
+            dict(
+                action="append",
+                help="Specify one or more revision identifiers "
+                "which this revision should depend on.",
+            ),
+        ),
+        "rev_id": (
+            "--rev-id",
+            dict(
+                type=str,
+                help="Specify a hardcoded revision id instead of "
+                "generating one",
+            ),
+        ),
+        "version_path": (
+            "--version-path",
+            dict(
+                type=str,
+                help="Specify specific path from config for version file",
+            ),
+        ),
+        "branch_label": (
+            "--branch-label",
+            dict(
+                type=str,
+                help="Specify a branch label to apply to the new revision",
+            ),
+        ),
+        "verbose": (
+            "-v",
+            "--verbose",
+            dict(action="store_true", help="Use more verbose output"),
+        ),
+        "resolve_dependencies": (
+            "--resolve-dependencies",
+            dict(
+                action="store_true",
+                help="Treat dependency versions as down revisions",
+            ),
+        ),
+        "autogenerate": (
+            "--autogenerate",
+            dict(
+                action="store_true",
+                help="Populate revision script with candidate "
+                "migration operations, based on comparison "
+                "of database to model.",
+            ),
+        ),
+        "rev_range": (
+            "-r",
+            "--rev-range",
+            dict(
+                action="store",
+                help="Specify a revision range; format is [start]:[end]",
+            ),
+        ),
+        "indicate_current": (
+            "-i",
+            "--indicate-current",
+            dict(
+                action="store_true",
+                help="Indicate the current revision",
+            ),
+        ),
+        "purge": (
+            "--purge",
+            dict(
+                action="store_true",
+                help="Unconditionally erase the version table before stamping",
+            ),
+        ),
+        "package": (
+            "--package",
+            dict(
+                action="store_true",
+                help="Write empty __init__.py files to the "
+                "environment and version locations",
+            ),
+        ),
+        "check_heads": (
+            "-c",
+            "--check-heads",
+            dict(
+                action="store_true",
+                help=(
+                    "Check if all head revisions are applied to the database. "
+                    "Exit with an error code if this is not the case."
                 ),
-            }
-            positional_help = {
-                "directory": "location of scripts directory",
-                "revision": "revision identifier",
-                "revisions": "one or more revisions, or 'heads' for all heads",
-            }
-            for arg in kwargs:
-                if arg in kwargs_opts:
-                    args = kwargs_opts[arg]
-                    args, kw = args[0:-1], args[-1]
-                    parser.add_argument(*args, **kw)
-
-            for arg in positional:
-                if (
-                    arg == "revisions"
-                    or fn in positional_translations
-                    and positional_translations[fn][arg] == "revisions"
-                ):
-                    subparser.add_argument(
-                        "revisions",
-                        nargs="+",
-                        help=positional_help.get("revisions"),
-                    )
-                else:
-                    subparser.add_argument(arg, help=positional_help.get(arg))
+            ),
+        ),
+    }
+    _POSITIONAL_OPTS = {
+        "directory": dict(help="location of scripts directory"),
+        "revision": dict(
+            help="revision identifier",
+        ),
+        "revisions": dict(
+            nargs="+",
+            help="one or more revisions, or 'heads' for all heads",
+        ),
+    }
+    _POSITIONAL_TRANSLATIONS: dict[Any, dict[str, str]] = {
+        command.stamp: {"revision": "revisions"}
+    }
 
+    def _generate_args(self, prog: Optional[str]) -> None:
         parser = ArgumentParser(prog=prog)
 
         parser.add_argument(
@@ -522,17 +857,19 @@ def add_options(
         parser.add_argument(
             "-c",
             "--config",
-            type=str,
-            default=os.environ.get("ALEMBIC_CONFIG", "alembic.ini"),
+            action="append",
             help="Alternate config file; defaults to value of "
-            'ALEMBIC_CONFIG environment variable, or "alembic.ini"',
+            'ALEMBIC_CONFIG environment variable, or "alembic.ini". '
+            "May also refer to pyproject.toml file.  May be specified twice "
+            "to reference both files separately",
         )
         parser.add_argument(
             "-n",
             "--name",
             type=str,
             default="alembic",
-            help="Name of section in .ini file to " "use for Alembic config",
+            help="Name of section in .ini file to use for Alembic config "
+            "(only applies to configparser config, not toml)",
         )
         parser.add_argument(
             "-x",
@@ -552,50 +889,81 @@ def add_options(
             action="store_true",
             help="Do not log to std output.",
         )
-        subparsers = parser.add_subparsers()
-
-        positional_translations: Dict[Any, Any] = {
-            command.stamp: {"revision": "revisions"}
-        }
 
-        for fn in [getattr(command, n) for n in dir(command)]:
+        self.subparsers = parser.add_subparsers()
+        alembic_commands = (
+            cast(CommandFunction, fn)
+            for fn in (getattr(command, name) for name in dir(command))
             if (
                 inspect.isfunction(fn)
                 and fn.__name__[0] != "_"
                 and fn.__module__ == "alembic.command"
-            ):
-                spec = compat.inspect_getfullargspec(fn)
-                if spec[3] is not None:
-                    positional = spec[0][1 : -len(spec[3])]
-                    kwarg = spec[0][-len(spec[3]) :]
-                else:
-                    positional = spec[0][1:]
-                    kwarg = []
+            )
+        )
 
-                if fn in positional_translations:
-                    positional = [
-                        positional_translations[fn].get(name, name)
-                        for name in positional
-                    ]
+        for fn in alembic_commands:
+            self.register_command(fn)
 
-                # parse first line(s) of helptext without a line break
-                help_ = fn.__doc__
-                if help_:
-                    help_text = []
-                    for line in help_.split("\n"):
-                        if not line.strip():
-                            break
-                        else:
-                            help_text.append(line.strip())
-                else:
-                    help_text = []
-                subparser = subparsers.add_parser(
-                    fn.__name__, help=" ".join(help_text)
-                )
-                add_options(fn, subparser, positional, kwarg)
-                subparser.set_defaults(cmd=(fn, positional, kwarg))
         self.parser = parser
 
+    def register_command(self, fn: CommandFunction) -> None:
+        """Registers a function as a CLI subcommand. The subcommand name
+        matches the function name, the arguments are extracted from the
+        signature and the help text is read from the docstring.
+
+        .. versionadded:: 1.15.3
+
+        .. seealso::
+
+            :ref:`custom_commandline`
+        """
+
+        positional, kwarg, help_text = self._inspect_function(fn)
+
+        subparser = self.subparsers.add_parser(fn.__name__, help=help_text)
+        subparser.set_defaults(cmd=(fn, positional, kwarg))
+
+        for arg in kwarg:
+            if arg in self._KWARGS_OPTS:
+                kwarg_opt = self._KWARGS_OPTS[arg]
+                args, opts = kwarg_opt[0:-1], kwarg_opt[-1]
+                subparser.add_argument(*args, **opts)  # type:ignore
+
+        for arg in positional:
+            opts = self._POSITIONAL_OPTS.get(arg, {})
+            subparser.add_argument(arg, **opts)  # type:ignore
+
+    def _inspect_function(self, fn: CommandFunction) -> tuple[Any, Any, str]:
+        spec = compat.inspect_getfullargspec(fn)
+        if spec[3] is not None:
+            positional = spec[0][1 : -len(spec[3])]
+            kwarg = spec[0][-len(spec[3]) :]
+        else:
+            positional = spec[0][1:]
+            kwarg = []
+
+        if fn in self._POSITIONAL_TRANSLATIONS:
+            positional = [
+                self._POSITIONAL_TRANSLATIONS[fn].get(name, name)
+                for name in positional
+            ]
+
+        # parse first line(s) of helptext without a line break
+        help_ = fn.__doc__
+        if help_:
+            help_lines = []
+            for line in help_.split("\n"):
+                if not line.strip():
+                    break
+                else:
+                    help_lines.append(line.strip())
+        else:
+            help_lines = []
+
+        help_text = " ".join(help_lines)
+
+        return positional, kwarg, help_text
+
     def run_cmd(self, config: Config, options: Namespace) -> None:
         fn, positional, kwarg = options.cmd
 
@@ -611,15 +979,58 @@ def run_cmd(self, config: Config, options: Namespace) -> None:
             else:
                 util.err(str(e), **config.messaging_opts)
 
+    def _inis_from_config(self, options: Namespace) -> tuple[str, str]:
+        names = options.config
+
+        alembic_config_env = os.environ.get("ALEMBIC_CONFIG")
+        if (
+            alembic_config_env
+            and os.path.basename(alembic_config_env) == "pyproject.toml"
+        ):
+            default_pyproject_toml = alembic_config_env
+            default_alembic_config = "alembic.ini"
+        elif alembic_config_env:
+            default_pyproject_toml = "pyproject.toml"
+            default_alembic_config = alembic_config_env
+        else:
+            default_alembic_config = "alembic.ini"
+            default_pyproject_toml = "pyproject.toml"
+
+        if not names:
+            return default_pyproject_toml, default_alembic_config
+
+        toml = ini = None
+
+        for name in names:
+            if os.path.basename(name) == "pyproject.toml":
+                if toml is not None:
+                    raise util.CommandError(
+                        "pyproject.toml indicated more than once"
+                    )
+                toml = name
+            else:
+                if ini is not None:
+                    raise util.CommandError(
+                        "only one ini file may be indicated"
+                    )
+                ini = name
+
+        return toml if toml else default_pyproject_toml, (
+            ini if ini else default_alembic_config
+        )
+
     def main(self, argv: Optional[Sequence[str]] = None) -> None:
+        """Executes the command line with the provided arguments."""
         options = self.parser.parse_args(argv)
         if not hasattr(options, "cmd"):
             # see http://bugs.python.org/issue9253, argparse
             # behavior changed incompatibly in py3.3
             self.parser.error("too few arguments")
         else:
+            toml, ini = self._inis_from_config(options)
             cfg = Config(
-                file_=options.config,
+                file_=ini,
+                toml_file=toml,
                 ini_section=options.name,
                 cmd_opts=options,
             )
diff --git a/libs/alembic/context.pyi b/libs/alembic/context.pyi
index 80619fb24f..6045d8b3da 100644
--- a/libs/alembic/context.pyi
+++ b/libs/alembic/context.pyi
@@ -5,7 +5,6 @@ from __future__ import annotations
 from typing import Any
 from typing import Callable
 from typing import Collection
-from typing import ContextManager
 from typing import Dict
 from typing import Iterable
 from typing import List
@@ -20,6 +19,8 @@ from typing import Tuple
 from typing import TYPE_CHECKING
 from typing import Union
 
+from typing_extensions import ContextManager
+
 if TYPE_CHECKING:
     from sqlalchemy.engine.base import Connection
     from sqlalchemy.engine.url import URL
@@ -40,7 +41,9 @@ if TYPE_CHECKING:
 
 ### end imports ###
 
-def begin_transaction() -> Union[_ProxyTransaction, ContextManager[None]]:
+def begin_transaction() -> (
+    Union[_ProxyTransaction, ContextManager[None, Optional[bool]]]
+):
     """Return a context manager that will
     enclose an operation within a "transaction",
     as defined by the environment's offline
@@ -200,6 +203,7 @@ def configure(
             None,
         ]
     ] = None,
+    autogenerate_plugins: Optional[Sequence[str]] = None,
     **kw: Any,
 ) -> None:
     """Configure a :class:`.MigrationContext` within this
@@ -619,6 +623,25 @@ def configure(
 
          :paramref:`.command.revision.process_revision_directives`
 
+    :param autogenerate_plugins: A list of string names of "plugins" that
+     should participate in this autogenerate run.   Defaults to the list
+     ``["alembic.autogenerate.*"]``, which indicates that Alembic's default
+     autogeneration plugins will be used.
+
+     See the section :ref:`plugins_autogenerate` for complete background
+     on how to use this parameter.
+
+     .. versionadded:: 1.18.0 Added a new plugin system for autogenerate
+        compare directives.
+
+     .. seealso::
+
+        :ref:`plugins_autogenerate` - background on enabling/disabling
+        autogenerate plugins
+
+        :ref:`alembic.plugins.toplevel` - Introduction and documentation
+        to the plugin system
+
     Parameters specific to individual backends:
 
     :param mssql_batch_separator: The "batch separator" which will
diff --git a/libs/alembic/ddl/base.py b/libs/alembic/ddl/base.py
index 6fbe95245c..30a3a15a39 100644
--- a/libs/alembic/ddl/base.py
+++ b/libs/alembic/ddl/base.py
@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import functools
+from typing import Any
 from typing import Optional
 from typing import TYPE_CHECKING
 from typing import Union
@@ -14,7 +15,10 @@
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import DDLElement
+from sqlalchemy.sql.elements import ColumnElement
 from sqlalchemy.sql.elements import quoted_name
+from sqlalchemy.sql.elements import TextClause
+from sqlalchemy.sql.schema import FetchedValue
 
 from ..util.sqla_compat import _columns_for_constraint  # noqa
 from ..util.sqla_compat import _find_columns  # noqa
@@ -23,20 +27,16 @@
 from ..util.sqla_compat import _table_for_constraint  # noqa
 
 if TYPE_CHECKING:
-    from typing import Any
 
+    from sqlalchemy import Computed
+    from sqlalchemy import Identity
     from sqlalchemy.sql.compiler import Compiled
     from sqlalchemy.sql.compiler import DDLCompiler
-    from sqlalchemy.sql.elements import TextClause
-    from sqlalchemy.sql.functions import Function
-    from sqlalchemy.sql.schema import FetchedValue
     from sqlalchemy.sql.type_api import TypeEngine
 
     from .impl import DefaultImpl
-    from ..util.sqla_compat import Computed
-    from ..util.sqla_compat import Identity
 
-_ServerDefault = Union["TextClause", "FetchedValue", "Function[Any]", str]
+_ServerDefaultType = Union[FetchedValue, str, TextClause, ColumnElement[Any]]
 
 
 class AlterTable(DDLElement):
@@ -75,7 +75,7 @@ def __init__(
         schema: Optional[str] = None,
         existing_type: Optional[TypeEngine] = None,
         existing_nullable: Optional[bool] = None,
-        existing_server_default: Optional[_ServerDefault] = None,
+        existing_server_default: Optional[_ServerDefaultType] = None,
         existing_comment: Optional[str] = None,
     ) -> None:
         super().__init__(name, schema=schema)
@@ -119,7 +119,7 @@ def __init__(
         self,
         name: str,
         column_name: str,
-        default: Optional[_ServerDefault],
+        default: Optional[_ServerDefaultType],
         **kw,
     ) -> None:
         super().__init__(name, column_name, **kw)
@@ -154,17 +154,28 @@ def __init__(
         name: str,
         column: Column[Any],
         schema: Optional[Union[quoted_name, str]] = None,
+        if_not_exists: Optional[bool] = None,
+        inline_references: Optional[bool] = None,
+        inline_primary_key: Optional[bool] = None,
     ) -> None:
         super().__init__(name, schema=schema)
         self.column = column
+        self.if_not_exists = if_not_exists
+        self.inline_references = inline_references
+        self.inline_primary_key = inline_primary_key
 
 
 class DropColumn(AlterTable):
     def __init__(
-        self, name: str, column: Column[Any], schema: Optional[str] = None
+        self,
+        name: str,
+        column: Column[Any],
+        schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
     ) -> None:
         super().__init__(name, schema=schema)
         self.column = column
+        self.if_exists = if_exists
 
 
 class ColumnComment(AlterColumn):
@@ -189,7 +200,14 @@ def visit_rename_table(
 def visit_add_column(element: AddColumn, compiler: DDLCompiler, **kw) -> str:
     return "%s %s" % (
         alter_table(compiler, element.table_name, element.schema),
-        add_column(compiler, element.column, **kw),
+        add_column(
+            compiler,
+            element.column,
+            if_not_exists=element.if_not_exists,
+            inline_references=element.inline_references,
+            inline_primary_key=element.inline_primary_key,
+            **kw,
+        ),
     )
 
 
@@ -197,7 +215,9 @@ def visit_add_column(element: AddColumn, compiler: DDLCompiler, **kw) -> str:
 def visit_drop_column(element: DropColumn, compiler: DDLCompiler, **kw) -> str:
     return "%s %s" % (
         alter_table(compiler, element.table_name, element.schema),
-        drop_column(compiler, element.column.name, **kw),
+        drop_column(
+            compiler, element.column.name, if_exists=element.if_exists, **kw
+        ),
     )
 
 
@@ -297,11 +317,15 @@ def format_column_name(
 
 def format_server_default(
     compiler: DDLCompiler,
-    default: Optional[_ServerDefault],
+    default: Optional[_ServerDefaultType],
 ) -> str:
-    return compiler.get_column_default_string(
+    # this can be updated to use compiler.render_default_string
+    # for SQLAlchemy 2.0 and above; not in 1.4
+    default_str = compiler.get_column_default_string(
         Column("x", Integer, server_default=default)
     )
+    assert default_str is not None
+    return default_str
 
 
 def format_type(compiler: DDLCompiler, type_: TypeEngine) -> str:
@@ -316,16 +340,62 @@ def alter_table(
     return "ALTER TABLE %s" % format_table_name(compiler, name, schema)
 
 
-def drop_column(compiler: DDLCompiler, name: str, **kw) -> str:
-    return "DROP COLUMN %s" % format_column_name(compiler, name)
+def drop_column(
+    compiler: DDLCompiler, name: str, if_exists: Optional[bool] = None, **kw
+) -> str:
+    return "DROP COLUMN %s%s" % (
+        "IF EXISTS " if if_exists else "",
+        format_column_name(compiler, name),
+    )
 
 
 def alter_column(compiler: DDLCompiler, name: str) -> str:
     return "ALTER COLUMN %s" % format_column_name(compiler, name)
 
 
-def add_column(compiler: DDLCompiler, column: Column[Any], **kw) -> str:
-    text = "ADD COLUMN %s" % compiler.get_column_specification(column, **kw)
+def add_column(
+    compiler: DDLCompiler,
+    column: Column[Any],
+    if_not_exists: Optional[bool] = None,
+    inline_references: Optional[bool] = None,
+    inline_primary_key: Optional[bool] = None,
+    **kw,
+) -> str:
+    text = "ADD COLUMN %s%s" % (
+        "IF NOT EXISTS " if if_not_exists else "",
+        compiler.get_column_specification(column, **kw),
+    )
+
+    if inline_primary_key and column.primary_key:
+        text += " PRIMARY KEY"
+
+    # Handle inline REFERENCES if requested
+    # Only render inline if there's exactly one foreign key AND the
+    # ForeignKeyConstraint is single-column, to avoid non-deterministic
+    # behavior with sets and to ensure proper syntax
+    if (
+        inline_references
+        and len(column.foreign_keys) == 1
+        and (fk := list(column.foreign_keys)[0])
+        and fk.constraint is not None
+        and len(fk.constraint.columns) == 1
+    ):
+        ref_col = fk.column
+        ref_table = ref_col.table
+
+        # Format with proper quoting
+        if ref_table.schema:
+            table_name = "%s.%s" % (
+                compiler.preparer.quote_schema(ref_table.schema),
+                compiler.preparer.quote(ref_table.name),
+            )
+        else:
+            table_name = compiler.preparer.quote(ref_table.name)
+
+        text += " REFERENCES %s (%s)" % (
+            table_name,
+            compiler.preparer.quote(ref_col.name),
+        )
 
     const = " ".join(
         compiler.process(constraint) for constraint in column.constraints
diff --git a/libs/alembic/ddl/impl.py b/libs/alembic/ddl/impl.py
index 2609a62dec..964cd1f30b 100644
--- a/libs/alembic/ddl/impl.py
+++ b/libs/alembic/ddl/impl.py
@@ -43,10 +43,13 @@
     from sqlalchemy.engine import Connection
     from sqlalchemy.engine import Dialect
     from sqlalchemy.engine.cursor import CursorResult
+    from sqlalchemy.engine.interfaces import ReflectedForeignKeyConstraint
+    from sqlalchemy.engine.interfaces import ReflectedIndex
+    from sqlalchemy.engine.interfaces import ReflectedPrimaryKeyConstraint
+    from sqlalchemy.engine.interfaces import ReflectedUniqueConstraint
     from sqlalchemy.engine.reflection import Inspector
     from sqlalchemy.sql import ClauseElement
     from sqlalchemy.sql import Executable
-    from sqlalchemy.sql.elements import ColumnElement
     from sqlalchemy.sql.elements import quoted_name
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.schema import ForeignKeyConstraint
@@ -55,11 +58,17 @@
     from sqlalchemy.sql.selectable import TableClause
     from sqlalchemy.sql.type_api import TypeEngine
 
-    from .base import _ServerDefault
+    from .base import _ServerDefaultType
     from ..autogenerate.api import AutogenContext
     from ..operations.batch import ApplyBatchImpl
     from ..operations.batch import BatchOperationsImpl
 
+    _ReflectedConstraint = (
+        ReflectedForeignKeyConstraint
+        | ReflectedPrimaryKeyConstraint
+        | ReflectedIndex
+        | ReflectedUniqueConstraint
+    )
 log = logging.getLogger(__name__)
 
 
@@ -257,8 +266,11 @@ def alter_column(
         self,
         table_name: str,
         column_name: str,
+        *,
         nullable: Optional[bool] = None,
-        server_default: Union[_ServerDefault, Literal[False]] = False,
+        server_default: Optional[
+            Union[_ServerDefaultType, Literal[False]]
+        ] = False,
         name: Optional[str] = None,
         type_: Optional[TypeEngine] = None,
         schema: Optional[str] = None,
@@ -266,7 +278,9 @@ def alter_column(
         comment: Optional[Union[str, Literal[False]]] = False,
         existing_comment: Optional[str] = None,
         existing_type: Optional[TypeEngine] = None,
-        existing_server_default: Optional[_ServerDefault] = None,
+        existing_server_default: Optional[
+            Union[_ServerDefaultType, Literal[False]]
+        ] = None,
         existing_nullable: Optional[bool] = None,
         existing_autoincrement: Optional[bool] = None,
         **kw: Any,
@@ -369,25 +383,47 @@ def add_column(
         self,
         table_name: str,
         column: Column[Any],
+        *,
         schema: Optional[Union[str, quoted_name]] = None,
+        if_not_exists: Optional[bool] = None,
+        inline_references: Optional[bool] = None,
+        inline_primary_key: Optional[bool] = None,
     ) -> None:
-        self._exec(base.AddColumn(table_name, column, schema=schema))
+        self._exec(
+            base.AddColumn(
+                table_name,
+                column,
+                schema=schema,
+                if_not_exists=if_not_exists,
+                inline_references=inline_references,
+                inline_primary_key=inline_primary_key,
+            )
+        )
 
     def drop_column(
         self,
         table_name: str,
         column: Column[Any],
+        *,
         schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
         **kw,
     ) -> None:
-        self._exec(base.DropColumn(table_name, column, schema=schema))
+        self._exec(
+            base.DropColumn(
+                table_name, column, schema=schema, if_exists=if_exists
+            )
+        )
 
-    def add_constraint(self, const: Any) -> None:
+    def add_constraint(self, const: Any, **kw: Any) -> None:
         if const._create_rule is None or const._create_rule(self):
-            self._exec(schema.AddConstraint(const))
+            if sqla_compat.sqla_2_1:
+                # this should be the default already
+                kw.setdefault("isolate_from_table", True)
+            self._exec(schema.AddConstraint(const, **kw))
 
-    def drop_constraint(self, const: Constraint) -> None:
-        self._exec(schema.DropConstraint(const))
+    def drop_constraint(self, const: Constraint, **kw: Any) -> None:
+        self._exec(schema.DropConstraint(const, **kw))
 
     def rename_table(
         self,
@@ -440,7 +476,7 @@ def create_table_comment(self, table: Table) -> None:
     def drop_table_comment(self, table: Table) -> None:
         self._exec(schema.DropTableComment(table))
 
-    def create_column_comment(self, column: ColumnElement[Any]) -> None:
+    def create_column_comment(self, column: Column[Any]) -> None:
         self._exec(schema.SetColumnComment(column))
 
     def drop_index(self, index: Index, **kw: Any) -> None:
@@ -459,7 +495,9 @@ def bulk_insert(
         if self.as_sql:
             for row in rows:
                 self._exec(
-                    sqla_compat._insert_inline(table).values(
+                    table.insert()
+                    .inline()
+                    .values(
                         **{
                             k: (
                                 sqla_compat._literal_bindparam(
@@ -477,14 +515,10 @@ def bulk_insert(
         else:
             if rows:
                 if multiinsert:
-                    self._exec(
-                        sqla_compat._insert_inline(table), multiparams=rows
-                    )
+                    self._exec(table.insert().inline(), multiparams=rows)
                 else:
                     for row in rows:
-                        self._exec(
-                            sqla_compat._insert_inline(table).values(**row)
-                        )
+                        self._exec(table.insert().inline().values(**row))
 
     def _tokenize_column_type(self, column: Column) -> Params:
         definition: str
@@ -693,7 +727,7 @@ def _compare_identity_default(self, metadata_identity, inspector_identity):
         diff, ignored = _compare_identity_options(
             metadata_identity,
             inspector_identity,
-            sqla_compat.Identity(),
+            schema.Identity(),
             skip={"always"},
         )
 
@@ -824,9 +858,9 @@ def _skip_functional_indexes(self, metadata_indexes, conn_indexes):
                 metadata_indexes.discard(idx)
 
     def adjust_reflected_dialect_options(
-        self, reflected_object: Dict[str, Any], kind: str
+        self, reflected_object: _ReflectedConstraint, kind: str
     ) -> Dict[str, Any]:
-        return reflected_object.get("dialect_options", {})
+        return reflected_object.get("dialect_options", {})  # type: ignore[return-value]   # noqa: E501
 
 
 class Params(NamedTuple):
@@ -874,12 +908,13 @@ def check_dicts(
         set(meta_d).union(insp_d),
     )
     if sqla_compat.identity_has_dialect_kwargs:
+        assert hasattr(default_io, "dialect_kwargs")
         # use only the dialect kwargs in inspector_io since metadata_io
         # can have options for many backends
         check_dicts(
             getattr(metadata_io, "dialect_kwargs", {}),
             getattr(inspector_io, "dialect_kwargs", {}),
-            default_io.dialect_kwargs,  # type: ignore[union-attr]
+            default_io.dialect_kwargs,
             getattr(inspector_io, "dialect_kwargs", {}),
         )
 
diff --git a/libs/alembic/ddl/mssql.py b/libs/alembic/ddl/mssql.py
index baa43d5e73..91cd9e428d 100644
--- a/libs/alembic/ddl/mssql.py
+++ b/libs/alembic/ddl/mssql.py
@@ -20,6 +20,7 @@
 from .base import AddColumn
 from .base import alter_column
 from .base import alter_table
+from .base import ColumnComment
 from .base import ColumnDefault
 from .base import ColumnName
 from .base import ColumnNullable
@@ -45,7 +46,8 @@
     from sqlalchemy.sql.selectable import TableClause
     from sqlalchemy.sql.type_api import TypeEngine
 
-    from .base import _ServerDefault
+    from .base import _ServerDefaultType
+    from .impl import _ReflectedConstraint
 
 
 class MSSQLImpl(DefaultImpl):
@@ -83,19 +85,22 @@ def emit_commit(self) -> None:
         if self.as_sql and self.batch_separator:
             self.static_output(self.batch_separator)
 
-    def alter_column(  # type:ignore[override]
+    def alter_column(
         self,
         table_name: str,
         column_name: str,
+        *,
         nullable: Optional[bool] = None,
         server_default: Optional[
-            Union[_ServerDefault, Literal[False]]
+            Union[_ServerDefaultType, Literal[False]]
         ] = False,
         name: Optional[str] = None,
         type_: Optional[TypeEngine] = None,
         schema: Optional[str] = None,
         existing_type: Optional[TypeEngine] = None,
-        existing_server_default: Optional[_ServerDefault] = None,
+        existing_server_default: Union[
+            _ServerDefaultType, Literal[False], None
+        ] = None,
         existing_nullable: Optional[bool] = None,
         **kw: Any,
     ) -> None:
@@ -137,6 +142,27 @@ def alter_column(  # type:ignore[override]
             kw["server_default"] = server_default
             kw["existing_server_default"] = existing_server_default
 
+        # drop existing default constraints before changing type
+        # or default, see issue #1744
+        if (
+            server_default is not False
+            and used_default is False
+            and (
+                existing_server_default is not False or server_default is None
+            )
+        ):
+            self._exec(
+                _ExecDropConstraint(
+                    table_name,
+                    column_name,
+                    "sys.default_constraints",
+                    schema,
+                )
+            )
+
+        # TODO: see why these two alter_columns can't be called
+        # at once.   joining them works but some of the mssql tests
+        # seem to expect something different
         super().alter_column(
             table_name,
             column_name,
@@ -149,15 +175,6 @@ def alter_column(  # type:ignore[override]
         )
 
         if server_default is not False and used_default is False:
-            if existing_server_default is not False or server_default is None:
-                self._exec(
-                    _ExecDropConstraint(
-                        table_name,
-                        column_name,
-                        "sys.default_constraints",
-                        schema,
-                    )
-                )
             if server_default is not None:
                 super().alter_column(
                     table_name,
@@ -202,6 +219,7 @@ def drop_column(
         self,
         table_name: str,
         column: Column[Any],
+        *,
         schema: Optional[str] = None,
         **kw,
     ) -> None:
@@ -265,10 +283,10 @@ def _compare_identity_default(self, metadata_identity, inspector_identity):
         return diff, ignored, is_alter
 
     def adjust_reflected_dialect_options(
-        self, reflected_object: Dict[str, Any], kind: str
+        self, reflected_object: _ReflectedConstraint, kind: str
     ) -> Dict[str, Any]:
         options: Dict[str, Any]
-        options = reflected_object.get("dialect_options", {}).copy()
+        options = reflected_object.get("dialect_options", {}).copy()  # type: ignore[attr-defined]  # noqa: E501
         if not options.get("mssql_include"):
             options.pop("mssql_include", None)
         if not options.get("mssql_clustered"):
@@ -417,3 +435,89 @@ def visit_rename_table(
         format_table_name(compiler, element.table_name, element.schema),
         format_table_name(compiler, element.new_table_name, None),
     )
+
+
+def _add_column_comment(
+    compiler: MSDDLCompiler,
+    schema: Optional[str],
+    tname: str,
+    cname: str,
+    comment: str,
+) -> str:
+    schema_name = schema if schema else compiler.dialect.default_schema_name
+    assert schema_name
+    return (
+        "exec sp_addextendedproperty 'MS_Description', {}, "
+        "'schema', {}, 'table', {}, 'column', {}".format(
+            compiler.sql_compiler.render_literal_value(
+                comment, sqltypes.NVARCHAR()
+            ),
+            compiler.preparer.quote_schema(schema_name),
+            compiler.preparer.quote(tname),
+            compiler.preparer.quote(cname),
+        )
+    )
+
+
+def _update_column_comment(
+    compiler: MSDDLCompiler,
+    schema: Optional[str],
+    tname: str,
+    cname: str,
+    comment: str,
+) -> str:
+    schema_name = schema if schema else compiler.dialect.default_schema_name
+    assert schema_name
+    return (
+        "exec sp_updateextendedproperty 'MS_Description', {}, "
+        "'schema', {}, 'table', {}, 'column', {}".format(
+            compiler.sql_compiler.render_literal_value(
+                comment, sqltypes.NVARCHAR()
+            ),
+            compiler.preparer.quote_schema(schema_name),
+            compiler.preparer.quote(tname),
+            compiler.preparer.quote(cname),
+        )
+    )
+
+
+def _drop_column_comment(
+    compiler: MSDDLCompiler, schema: Optional[str], tname: str, cname: str
+) -> str:
+    schema_name = schema if schema else compiler.dialect.default_schema_name
+    assert schema_name
+    return (
+        "exec sp_dropextendedproperty 'MS_Description', "
+        "'schema', {}, 'table', {}, 'column', {}".format(
+            compiler.preparer.quote_schema(schema_name),
+            compiler.preparer.quote(tname),
+            compiler.preparer.quote(cname),
+        )
+    )
+
+
+@compiles(ColumnComment, "mssql")
+def visit_column_comment(
+    element: ColumnComment, compiler: MSDDLCompiler, **kw: Any
+) -> str:
+    if element.comment is not None:
+        if element.existing_comment is not None:
+            return _update_column_comment(
+                compiler,
+                element.schema,
+                element.table_name,
+                element.column_name,
+                element.comment,
+            )
+        else:
+            return _add_column_comment(
+                compiler,
+                element.schema,
+                element.table_name,
+                element.column_name,
+                element.comment,
+            )
+    else:
+        return _drop_column_comment(
+            compiler, element.schema, element.table_name, element.column_name
+        )
diff --git a/libs/alembic/ddl/mysql.py b/libs/alembic/ddl/mysql.py
index 3482f672da..27f808b050 100644
--- a/libs/alembic/ddl/mysql.py
+++ b/libs/alembic/ddl/mysql.py
@@ -11,6 +11,9 @@
 
 from sqlalchemy import schema
 from sqlalchemy import types as sqltypes
+from sqlalchemy.sql import elements
+from sqlalchemy.sql import functions
+from sqlalchemy.sql import operators
 
 from .base import alter_table
 from .base import AlterColumn
@@ -23,7 +26,6 @@
 from .impl import DefaultImpl
 from .. import util
 from ..util import sqla_compat
-from ..util.sqla_compat import _is_mariadb
 from ..util.sqla_compat import _is_type_bound
 from ..util.sqla_compat import compiles
 
@@ -32,10 +34,11 @@
 
     from sqlalchemy.dialects.mysql.base import MySQLDDLCompiler
     from sqlalchemy.sql.ddl import DropConstraint
+    from sqlalchemy.sql.elements import ClauseElement
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.type_api import TypeEngine
 
-    from .base import _ServerDefault
+    from .base import _ServerDefaultType
 
 
 class MySQLImpl(DefaultImpl):
@@ -48,17 +51,47 @@ class MySQLImpl(DefaultImpl):
     )
     type_arg_extract = [r"character set ([\w\-_]+)", r"collate ([\w\-_]+)"]
 
-    def alter_column(  # type:ignore[override]
+    def render_ddl_sql_expr(
+        self,
+        expr: ClauseElement,
+        is_server_default: bool = False,
+        is_index: bool = False,
+        **kw: Any,
+    ) -> str:
+        # apply Grouping to index expressions;
+        # see https://github.com/sqlalchemy/sqlalchemy/blob/
+        # 36da2eaf3e23269f2cf28420ae73674beafd0661/
+        # lib/sqlalchemy/dialects/mysql/base.py#L2191
+        if is_index and (
+            isinstance(expr, elements.BinaryExpression)
+            or (
+                isinstance(expr, elements.UnaryExpression)
+                and expr.modifier not in (operators.desc_op, operators.asc_op)
+            )
+            or isinstance(expr, functions.FunctionElement)
+        ):
+            expr = elements.Grouping(expr)
+
+        return super().render_ddl_sql_expr(
+            expr, is_server_default=is_server_default, is_index=is_index, **kw
+        )
+
+    def alter_column(
         self,
         table_name: str,
         column_name: str,
+        *,
         nullable: Optional[bool] = None,
-        server_default: Union[_ServerDefault, Literal[False]] = False,
+        server_default: Optional[
+            Union[_ServerDefaultType, Literal[False]]
+        ] = False,
         name: Optional[str] = None,
         type_: Optional[TypeEngine] = None,
         schema: Optional[str] = None,
         existing_type: Optional[TypeEngine] = None,
-        existing_server_default: Optional[_ServerDefault] = None,
+        existing_server_default: Optional[
+            Union[_ServerDefaultType, Literal[False]]
+        ] = None,
         existing_nullable: Optional[bool] = None,
         autoincrement: Optional[bool] = None,
         existing_autoincrement: Optional[bool] = None,
@@ -166,6 +199,7 @@ def alter_column(  # type:ignore[override]
     def drop_constraint(
         self,
         const: Constraint,
+        **kw: Any,
     ) -> None:
         if isinstance(const, schema.CheckConstraint) and _is_type_bound(const):
             return
@@ -175,7 +209,7 @@ def drop_constraint(
     def _is_mysql_allowed_functional_default(
         self,
         type_: Optional[TypeEngine],
-        server_default: Union[_ServerDefault, Literal[False]],
+        server_default: Optional[Union[_ServerDefaultType, Literal[False]]],
     ) -> bool:
         return (
             type_ is not None
@@ -326,7 +360,7 @@ def __init__(
         self,
         name: str,
         column_name: str,
-        default: _ServerDefault,
+        default: Optional[_ServerDefaultType],
         schema: Optional[str] = None,
     ) -> None:
         super(AlterColumn, self).__init__(name, schema=schema)
@@ -343,7 +377,7 @@ def __init__(
         newname: Optional[str] = None,
         type_: Optional[TypeEngine] = None,
         nullable: Optional[bool] = None,
-        default: Optional[Union[_ServerDefault, Literal[False]]] = False,
+        default: Optional[Union[_ServerDefaultType, Literal[False]]] = False,
         autoincrement: Optional[bool] = None,
         comment: Optional[Union[str, Literal[False]]] = False,
     ) -> None:
@@ -432,7 +466,7 @@ def _mysql_change_column(
 def _mysql_colspec(
     compiler: MySQLDDLCompiler,
     nullable: Optional[bool],
-    server_default: Optional[Union[_ServerDefault, Literal[False]]],
+    server_default: Optional[Union[_ServerDefaultType, Literal[False]]],
     type_: TypeEngine,
     autoincrement: Optional[bool],
     comment: Optional[Union[str, Literal[False]]],
@@ -475,7 +509,7 @@ def _mysql_drop_constraint(
         # note that SQLAlchemy as of 1.2 does not yet support
         # DROP CONSTRAINT for MySQL/MariaDB, so we implement fully
         # here.
-        if _is_mariadb(compiler.dialect):
+        if compiler.dialect.is_mariadb:
             return "ALTER TABLE %s DROP CONSTRAINT %s" % (
                 compiler.preparer.format_table(constraint.table),
                 compiler.preparer.format_constraint(constraint),
diff --git a/libs/alembic/ddl/postgresql.py b/libs/alembic/ddl/postgresql.py
index de64a4e05b..cc03f45346 100644
--- a/libs/alembic/ddl/postgresql.py
+++ b/libs/alembic/ddl/postgresql.py
@@ -16,8 +16,11 @@
 from typing import Union
 
 from sqlalchemy import Column
+from sqlalchemy import Float
+from sqlalchemy import Identity
 from sqlalchemy import literal_column
 from sqlalchemy import Numeric
+from sqlalchemy import select
 from sqlalchemy import text
 from sqlalchemy import types as sqltypes
 from sqlalchemy.dialects.postgresql import BIGINT
@@ -49,6 +52,7 @@
 from ..util import sqla_compat
 from ..util.sqla_compat import compiles
 
+
 if TYPE_CHECKING:
     from typing import Literal
 
@@ -66,12 +70,12 @@
     from sqlalchemy.sql.schema import Table
     from sqlalchemy.sql.type_api import TypeEngine
 
-    from .base import _ServerDefault
+    from .base import _ServerDefaultType
+    from .impl import _ReflectedConstraint
     from ..autogenerate.api import AutogenContext
     from ..autogenerate.render import _f_name
     from ..runtime.migration import MigrationContext
 
-
 log = logging.getLogger(__name__)
 
 
@@ -109,6 +113,7 @@ def compare_server_default(
         rendered_metadata_default,
         rendered_inspector_default,
     ):
+
         # don't do defaults for SERIAL columns
         if (
             metadata_column.primary_key
@@ -118,6 +123,11 @@ def compare_server_default(
 
         conn_col_default = rendered_inspector_default
 
+        if conn_col_default and re.match(
+            r"nextval\('(.+?)'::regclass\)", conn_col_default
+        ):
+            conn_col_default = conn_col_default.replace("::regclass", "")
+
         defaults_equal = conn_col_default == rendered_metadata_default
         if defaults_equal:
             return False
@@ -132,33 +142,38 @@ def compare_server_default(
         metadata_default = metadata_column.server_default.arg
 
         if isinstance(metadata_default, str):
-            if not isinstance(inspector_column.type, Numeric):
+            if not isinstance(inspector_column.type, (Numeric, Float)):
                 metadata_default = re.sub(r"^'|'$", "", metadata_default)
                 metadata_default = f"'{metadata_default}'"
 
             metadata_default = literal_column(metadata_default)
 
         # run a real compare against the server
+        # TODO: this seems quite a bad idea for a default that's a SQL
+        # function!   SQL functions are not deterministic!
         conn = self.connection
         assert conn is not None
         return not conn.scalar(
-            sqla_compat._select(
-                literal_column(conn_col_default) == metadata_default
-            )
+            select(literal_column(conn_col_default) == metadata_default)
         )
 
-    def alter_column(  # type:ignore[override]
+    def alter_column(
         self,
         table_name: str,
         column_name: str,
+        *,
         nullable: Optional[bool] = None,
-        server_default: Union[_ServerDefault, Literal[False]] = False,
+        server_default: Optional[
+            Union[_ServerDefaultType, Literal[False]]
+        ] = False,
         name: Optional[str] = None,
         type_: Optional[TypeEngine] = None,
         schema: Optional[str] = None,
         autoincrement: Optional[bool] = None,
         existing_type: Optional[TypeEngine] = None,
-        existing_server_default: Optional[_ServerDefault] = None,
+        existing_server_default: Optional[
+            Union[_ServerDefaultType, Literal[False]]
+        ] = None,
         existing_nullable: Optional[bool] = None,
         existing_autoincrement: Optional[bool] = None,
         **kw: Any,
@@ -314,7 +329,7 @@ def _dialect_options(
         self, item: Union[Index, UniqueConstraint]
     ) -> Tuple[Any, ...]:
         # only the positive case is returned by sqlalchemy reflection so
-        # None and False are threated the same
+        # None and False are treated the same
         if item.dialect_kwargs.get("postgresql_nulls_not_distinct"):
             return ("nulls_not_distinct",)
         return ()
@@ -408,10 +423,10 @@ def compare_unique_constraint(
         return ComparisonResult.Equal()
 
     def adjust_reflected_dialect_options(
-        self, reflected_options: Dict[str, Any], kind: str
+        self, reflected_object: _ReflectedConstraint, kind: str
     ) -> Dict[str, Any]:
         options: Dict[str, Any]
-        options = reflected_options.get("dialect_options", {}).copy()
+        options = reflected_object.get("dialect_options", {}).copy()  # type: ignore[attr-defined]  # noqa: E501
         if not options.get("postgresql_include"):
             options.pop("postgresql_include", None)
         return options
@@ -585,7 +600,7 @@ def visit_identity_column(
                 )
             else:
                 text += "SET %s " % compiler.get_identity_options(
-                    sqla_compat.Identity(**{attr: getattr(identity, attr)})
+                    Identity(**{attr: getattr(identity, attr)})
                 )
         return text
 
@@ -845,5 +860,5 @@ def _render_potential_column(
         return render._render_potential_expr(
             value,
             autogen_context,
-            wrap_in_text=isinstance(value, (TextClause, FunctionElement)),
+            wrap_in_element=isinstance(value, (TextClause, FunctionElement)),
         )
diff --git a/libs/alembic/ddl/sqlite.py b/libs/alembic/ddl/sqlite.py
index 762e8ca198..c260d53faa 100644
--- a/libs/alembic/ddl/sqlite.py
+++ b/libs/alembic/ddl/sqlite.py
@@ -11,11 +11,14 @@
 from typing import Union
 
 from sqlalchemy import cast
+from sqlalchemy import Computed
 from sqlalchemy import JSON
 from sqlalchemy import schema
 from sqlalchemy import sql
 
 from .base import alter_table
+from .base import ColumnName
+from .base import format_column_name
 from .base import format_table_name
 from .base import RenameTable
 from .impl import DefaultImpl
@@ -62,7 +65,7 @@ def requires_recreate_in_batch(
                 ) and isinstance(col.server_default.arg, sql.ClauseElement):
                     return True
                 elif (
-                    isinstance(col.server_default, util.sqla_compat.Computed)
+                    isinstance(col.server_default, Computed)
                     and col.server_default.persisted
                 ):
                     return True
@@ -71,7 +74,7 @@ def requires_recreate_in_batch(
         else:
             return False
 
-    def add_constraint(self, const: Constraint):
+    def add_constraint(self, const: Constraint, **kw: Any):
         # attempt to distinguish between an
         # auto-gen constraint and an explicit one
         if const._create_rule is None:
@@ -88,7 +91,7 @@ def add_constraint(self, const: Constraint):
                 "SQLite migrations using a copy-and-move strategy."
             )
 
-    def drop_constraint(self, const: Constraint):
+    def drop_constraint(self, const: Constraint, **kw: Any):
         if const._create_rule is None:
             raise NotImplementedError(
                 "No support for ALTER of constraints in SQLite dialect. "
@@ -207,6 +210,15 @@ def visit_rename_table(
     )
 
 
+@compiles(ColumnName, "sqlite")
+def visit_column_name(element: ColumnName, compiler: DDLCompiler, **kw) -> str:
+    return "%s RENAME COLUMN %s TO %s" % (
+        alter_table(compiler, element.table_name, element.schema),
+        format_column_name(compiler, element.column_name),
+        format_column_name(compiler, element.newname),
+    )
+
+
 # @compiles(AddColumn, 'sqlite')
 # def visit_add_column(element, compiler, **kw):
 #    return "%s %s" % (
diff --git a/libs/alembic/op.pyi b/libs/alembic/op.pyi
index 920444696e..7fadaf5fe6 100644
--- a/libs/alembic/op.pyi
+++ b/libs/alembic/op.pyi
@@ -27,15 +27,13 @@ if TYPE_CHECKING:
     from sqlalchemy.sql.elements import conv
     from sqlalchemy.sql.elements import TextClause
     from sqlalchemy.sql.expression import TableClause
-    from sqlalchemy.sql.functions import Function
     from sqlalchemy.sql.schema import Column
-    from sqlalchemy.sql.schema import Computed
-    from sqlalchemy.sql.schema import Identity
     from sqlalchemy.sql.schema import SchemaItem
     from sqlalchemy.sql.schema import Table
     from sqlalchemy.sql.type_api import TypeEngine
     from sqlalchemy.util import immutabledict
 
+    from .ddl.base import _ServerDefaultType
     from .operations.base import BatchOperations
     from .operations.ops import AddColumnOp
     from .operations.ops import AddConstraintOp
@@ -61,7 +59,13 @@ _C = TypeVar("_C", bound=Callable[..., Any])
 ### end imports ###
 
 def add_column(
-    table_name: str, column: Column[Any], *, schema: Optional[str] = None
+    table_name: str,
+    column: Column[Any],
+    *,
+    schema: Optional[str] = None,
+    if_not_exists: Optional[bool] = None,
+    inline_references: Optional[bool] = None,
+    inline_primary_key: Optional[bool] = None,
 ) -> None:
     """Issue an "add column" instruction using the current
     migration context.
@@ -76,36 +80,64 @@ def add_column(
     The :meth:`.Operations.add_column` method typically corresponds
     to the SQL command "ALTER TABLE... ADD COLUMN".    Within the scope
     of this command, the column's name, datatype, nullability,
-    and optional server-generated defaults may be indicated.
+    and optional server-generated defaults may be indicated.  Options
+    also exist for control of single-column primary key and foreign key
+    constraints to be generated.
 
     .. note::
 
-        With the exception of NOT NULL constraints or single-column FOREIGN
-        KEY constraints, other kinds of constraints such as PRIMARY KEY,
-        UNIQUE or CHECK constraints **cannot** be generated using this
-        method; for these constraints, refer to operations such as
-        :meth:`.Operations.create_primary_key` and
-        :meth:`.Operations.create_check_constraint`. In particular, the
-        following :class:`~sqlalchemy.schema.Column` parameters are
-        **ignored**:
-
-        * :paramref:`~sqlalchemy.schema.Column.primary_key` - SQL databases
-          typically do not support an ALTER operation that can add
-          individual columns one at a time to an existing primary key
-          constraint, therefore it's less ambiguous to use the
-          :meth:`.Operations.create_primary_key` method, which assumes no
-          existing primary key constraint is present.
+        Not all contraint types may be indicated with this directive.
+        NOT NULL, FOREIGN KEY, and CHECK are honored, PRIMARY KEY
+        is conditionally honored, UNIQUE
+        is currently not.
+
+        As of 1.18.2, the following :class:`~sqlalchemy.schema.Column`
+        parameters are **ignored**:
+
         * :paramref:`~sqlalchemy.schema.Column.unique` - use the
           :meth:`.Operations.create_unique_constraint` method
         * :paramref:`~sqlalchemy.schema.Column.index` - use the
           :meth:`.Operations.create_index` method
 
+    **PRIMARY KEY support**
+
+    The provided :class:`~sqlalchemy.schema.Column` object may include a
+    ``primary_key=True`` directive, indicating the column intends to be
+    part of a primary key constraint.  However by default, the inline
+    "PRIMARY KEY" directive is not emitted, and it's assumed that a
+    separate :meth:`.Operations.create_primary_key` directive will be used
+    to create this constraint, which may potentially include other columns
+    as well as have an explicit name.   To instead render an inline
+    "PRIMARY KEY" directive, the
+    :paramref:`.AddColumnOp.inline_primary_key` parameter may be indicated
+    at the same time as the ``primary_key`` parameter (both are needed)::
+
+        from alembic import op
+        from sqlalchemy import Column, INTEGER
+
+        op.add_column(
+            "organization",
+            Column("id", INTEGER, primary_key=True),
+            inline_primary_key=True
+        )
+
+    The ``primary_key=True`` parameter on
+    :class:`~sqlalchemy.schema.Column` also indicates behaviors such as
+    using the ``SERIAL`` datatype with the PostgreSQL database, which is
+    why two separate, independent parameters are provided to support all
+    combinations.
+
+    .. versionadded:: 1.18.4 Added
+       :paramref:`.AddColumnOp.inline_primary_key`
+       to control use of the ``PRIMARY KEY`` inline directive.
+
+    **FOREIGN KEY support**
 
     The provided :class:`~sqlalchemy.schema.Column` object may include a
     :class:`~sqlalchemy.schema.ForeignKey` constraint directive,
-    referencing a remote table name. For this specific type of constraint,
-    Alembic will automatically emit a second ALTER statement in order to
-    add the single-column FOREIGN KEY constraint separately::
+    referencing a remote table name. By default, Alembic will automatically
+    emit a second ALTER statement in order to add the single-column FOREIGN
+    KEY constraint separately::
 
         from alembic import op
         from sqlalchemy import Column, INTEGER, ForeignKey
@@ -115,6 +147,22 @@ def add_column(
             Column("account_id", INTEGER, ForeignKey("accounts.id")),
         )
 
+    To render the FOREIGN KEY constraint inline within the ADD COLUMN
+    directive, use the ``inline_references`` parameter. This can improve
+    performance on large tables since the constraint is marked as valid
+    immediately for nullable columns::
+
+        from alembic import op
+        from sqlalchemy import Column, INTEGER, ForeignKey
+
+        op.add_column(
+            "organization",
+            Column("account_id", INTEGER, ForeignKey("accounts.id")),
+            inline_references=True,
+        )
+
+    **Indicating server side defaults**
+
     The column argument passed to :meth:`.Operations.add_column` is a
     :class:`~sqlalchemy.schema.Column` construct, used in the same way it's
     used in SQLAlchemy. In particular, values or functions to be indicated
@@ -138,6 +186,27 @@ def add_column(
      quoting of the schema outside of the default behavior, use
      the SQLAlchemy construct
      :class:`~sqlalchemy.sql.elements.quoted_name`.
+    :param if_not_exists: If True, adds ``IF NOT EXISTS`` operator
+     when creating the new column for compatible dialects
+
+     .. versionadded:: 1.16.0
+
+    :param inline_references: If True, renders ``FOREIGN KEY`` constraints
+     inline within the ``ADD COLUMN`` directive using ``REFERENCES``
+     syntax, rather than as a separate ``ALTER TABLE ADD CONSTRAINT``
+     statement. This is supported by PostgreSQL, Oracle, MySQL 5.7+, and
+     MariaDB 10.5+.
+
+     .. versionadded:: 1.18.2
+
+    :param inline_primary_key: If True, renders the ``PRIMARY KEY`` phrase
+     inline within the ``ADD COLUMN`` directive.  When not present or
+     False, ``PRIMARY KEY`` is not emitted; it is assumed that the
+     migration script will include an additional
+     :meth:`.Operations.create_primary_key` directive to create a full
+     primary key constraint.
+
+     .. versionadded:: 1.18.4
 
     """
 
@@ -147,12 +216,12 @@ def alter_column(
     *,
     nullable: Optional[bool] = None,
     comment: Union[str, Literal[False], None] = False,
-    server_default: Any = False,
+    server_default: Union[_ServerDefaultType, None, Literal[False]] = False,
     new_column_name: Optional[str] = None,
     type_: Union[TypeEngine[Any], Type[TypeEngine[Any]], None] = None,
     existing_type: Union[TypeEngine[Any], Type[TypeEngine[Any]], None] = None,
     existing_server_default: Union[
-        str, bool, Identity, Computed, None
+        _ServerDefaultType, None, Literal[False]
     ] = False,
     existing_nullable: Optional[bool] = None,
     existing_comment: Optional[str] = None,
@@ -247,7 +316,7 @@ def batch_alter_table(
     table_name: str,
     schema: Optional[str] = None,
     recreate: Literal["auto", "always", "never"] = "auto",
-    partial_reordering: Optional[Tuple[Any, ...]] = None,
+    partial_reordering: list[tuple[str, ...]] | None = None,
     copy_from: Optional[Table] = None,
     table_args: Tuple[Any, ...] = (),
     table_kwargs: Mapping[str, Any] = immutabledict({}),
@@ -650,7 +719,7 @@ def create_foreign_key(
 def create_index(
     index_name: Optional[str],
     table_name: str,
-    columns: Sequence[Union[str, TextClause, Function[Any]]],
+    columns: Sequence[Union[str, TextClause, ColumnElement[Any]]],
     *,
     schema: Optional[str] = None,
     unique: bool = False,
@@ -926,6 +995,11 @@ def drop_column(
      quoting of the schema outside of the default behavior, use
      the SQLAlchemy construct
      :class:`~sqlalchemy.sql.elements.quoted_name`.
+    :param if_exists: If True, adds IF EXISTS operator when
+     dropping the new column for compatible dialects
+
+     .. versionadded:: 1.16.0
+
     :param mssql_drop_check: Optional boolean.  When ``True``, on
      Microsoft SQL Server only, first
      drop the CHECK constraint on the column using a
@@ -947,7 +1021,6 @@ def drop_column(
      then exec's a separate DROP CONSTRAINT for that default.  Only
      works if the column has exactly one FK constraint which refers to
      it, at the moment.
-
     """
 
 def drop_constraint(
@@ -956,6 +1029,7 @@ def drop_constraint(
     type_: Optional[str] = None,
     *,
     schema: Optional[str] = None,
+    if_exists: Optional[bool] = None,
 ) -> None:
     r"""Drop a constraint of the given name, typically via DROP CONSTRAINT.
 
@@ -967,6 +1041,10 @@ def drop_constraint(
      quoting of the schema outside of the default behavior, use
      the SQLAlchemy construct
      :class:`~sqlalchemy.sql.elements.quoted_name`.
+    :param if_exists: If True, adds IF EXISTS operator when
+     dropping the constraint
+
+     .. versionadded:: 1.16.0
 
     """
 
@@ -1166,7 +1244,7 @@ def f(name: str) -> conv:
     names will be converted along conventions.  If the ``target_metadata``
     contains the naming convention
     ``{"ck": "ck_bool_%(table_name)s_%(constraint_name)s"}``, then the
-    output of the following:
+    output of the following::
 
         op.add_column("t", "x", Boolean(name="x"))
 
@@ -1196,14 +1274,27 @@ def get_context() -> MigrationContext:
 
     """
 
-def implementation_for(op_cls: Any) -> Callable[[_C], _C]:
+def implementation_for(
+    op_cls: Any, replace: bool = False
+) -> Callable[[_C], _C]:
     """Register an implementation for a given :class:`.MigrateOperation`.
 
+    :param replace: when True, allows replacement of an already
+     registered implementation for the given operation class. This
+     enables customization of built-in operations such as
+     :class:`.CreateTableOp` by providing an alternate implementation
+     that can augment, modify, or conditionally invoke the default
+     behavior.
+
+     .. versionadded:: 1.17.2
+
     This is part of the operation extensibility API.
 
     .. seealso::
 
-        :ref:`operation_plugins` - example of use
+        :ref:`operation_plugins`
+
+        :ref:`operations_extending_builtin`
 
     """
 
@@ -1270,7 +1361,7 @@ def invoke(
         BulkInsertOp,
         DropTableOp,
         ExecuteSQLOp,
-    ]
+    ],
 ) -> None: ...
 @overload
 def invoke(operation: MigrateOperation) -> Any:
diff --git a/libs/alembic/operations/base.py b/libs/alembic/operations/base.py
index 9b52fa6f29..b9e6107fba 100644
--- a/libs/alembic/operations/base.py
+++ b/libs/alembic/operations/base.py
@@ -27,13 +27,13 @@
 from . import batch
 from . import schemaobj
 from .. import util
+from ..ddl.base import _ServerDefaultType
 from ..util import sqla_compat
 from ..util.compat import formatannotation_fwdref
 from ..util.compat import inspect_formatargspec
 from ..util.compat import inspect_getfullargspec
 from ..util.sqla_compat import _literal_bindparam
 
-
 if TYPE_CHECKING:
     from typing import Literal
 
@@ -43,10 +43,7 @@
     from sqlalchemy.sql.expression import ColumnElement
     from sqlalchemy.sql.expression import TableClause
     from sqlalchemy.sql.expression import TextClause
-    from sqlalchemy.sql.functions import Function
     from sqlalchemy.sql.schema import Column
-    from sqlalchemy.sql.schema import Computed
-    from sqlalchemy.sql.schema import Identity
     from sqlalchemy.sql.schema import SchemaItem
     from sqlalchemy.types import TypeEngine
 
@@ -203,19 +200,32 @@ def %(name)s%(args)s:
         return register
 
     @classmethod
-    def implementation_for(cls, op_cls: Any) -> Callable[[_C], _C]:
+    def implementation_for(
+        cls, op_cls: Any, replace: bool = False
+    ) -> Callable[[_C], _C]:
         """Register an implementation for a given :class:`.MigrateOperation`.
 
+        :param replace: when True, allows replacement of an already
+         registered implementation for the given operation class. This
+         enables customization of built-in operations such as
+         :class:`.CreateTableOp` by providing an alternate implementation
+         that can augment, modify, or conditionally invoke the default
+         behavior.
+
+         .. versionadded:: 1.17.2
+
         This is part of the operation extensibility API.
 
         .. seealso::
 
-            :ref:`operation_plugins` - example of use
+            :ref:`operation_plugins`
+
+            :ref:`operations_extending_builtin`
 
         """
 
         def decorate(fn: _C) -> _C:
-            cls._to_impl.dispatch_for(op_cls)(fn)
+            cls._to_impl.dispatch_for(op_cls, replace=replace)(fn)
             return fn
 
         return decorate
@@ -236,7 +246,7 @@ def batch_alter_table(
         table_name: str,
         schema: Optional[str] = None,
         recreate: Literal["auto", "always", "never"] = "auto",
-        partial_reordering: Optional[Tuple[Any, ...]] = None,
+        partial_reordering: list[tuple[str, ...]] | None = None,
         copy_from: Optional[Table] = None,
         table_args: Tuple[Any, ...] = (),
         table_kwargs: Mapping[str, Any] = util.immutabledict(),
@@ -465,7 +475,7 @@ def f(self, name: str) -> conv:
         names will be converted along conventions.  If the ``target_metadata``
         contains the naming convention
         ``{"ck": "ck_bool_%(table_name)s_%(constraint_name)s"}``, then the
-        output of the following:
+        output of the following::
 
             op.add_column("t", "x", Boolean(name="x"))
 
@@ -619,6 +629,9 @@ def add_column(
             column: Column[Any],
             *,
             schema: Optional[str] = None,
+            if_not_exists: Optional[bool] = None,
+            inline_references: Optional[bool] = None,
+            inline_primary_key: Optional[bool] = None,
         ) -> None:
             """Issue an "add column" instruction using the current
             migration context.
@@ -633,36 +646,77 @@ def add_column(
             The :meth:`.Operations.add_column` method typically corresponds
             to the SQL command "ALTER TABLE... ADD COLUMN".    Within the scope
             of this command, the column's name, datatype, nullability,
-            and optional server-generated defaults may be indicated.
+            and optional server-generated defaults may be indicated.  Options
+            also exist for control of single-column primary key and foreign key
+            constraints to be generated.
 
             .. note::
 
-                With the exception of NOT NULL constraints or single-column FOREIGN
-                KEY constraints, other kinds of constraints such as PRIMARY KEY,
-                UNIQUE or CHECK constraints **cannot** be generated using this
-                method; for these constraints, refer to operations such as
-                :meth:`.Operations.create_primary_key` and
-                :meth:`.Operations.create_check_constraint`. In particular, the
-                following :class:`~sqlalchemy.schema.Column` parameters are
-                **ignored**:
-
-                * :paramref:`~sqlalchemy.schema.Column.primary_key` - SQL databases
-                  typically do not support an ALTER operation that can add
-                  individual columns one at a time to an existing primary key
-                  constraint, therefore it's less ambiguous to use the
-                  :meth:`.Operations.create_primary_key` method, which assumes no
-                  existing primary key constraint is present.
+                Not all contraint types may be indicated with this directive.
+                NOT NULL, FOREIGN KEY, and CHECK are honored, PRIMARY KEY
+                is conditionally honored, UNIQUE
+                is currently not.
+
+                As of 1.18.2, the following :class:`~sqlalchemy.schema.Column`
+                parameters are **ignored**:
+
                 * :paramref:`~sqlalchemy.schema.Column.unique` - use the
                   :meth:`.Operations.create_unique_constraint` method
                 * :paramref:`~sqlalchemy.schema.Column.index` - use the
                   :meth:`.Operations.create_index` method
 
+            **PRIMARY KEY support**
+
+            The provided :class:`~sqlalchemy.schema.Column` object may include a
+            ``primary_key=True`` directive, indicating the column intends to be
+            part of a primary key constraint.  However by default, the inline
+            "PRIMARY KEY" directive is not emitted, and it's assumed that a
+            separate :meth:`.Operations.create_primary_key` directive will be used
+            to create this constraint, which may potentially include other columns
+            as well as have an explicit name.   To instead render an inline
+            "PRIMARY KEY" directive, the
+            :paramref:`.AddColumnOp.inline_primary_key` parameter may be indicated
+            at the same time as the ``primary_key`` parameter (both are needed)::
+
+                from alembic import op
+                from sqlalchemy import Column, INTEGER
+
+                op.add_column(
+                    "organization",
+                    Column("id", INTEGER, primary_key=True),
+                    inline_primary_key=True
+                )
+
+            The ``primary_key=True`` parameter on
+            :class:`~sqlalchemy.schema.Column` also indicates behaviors such as
+            using the ``SERIAL`` datatype with the PostgreSQL database, which is
+            why two separate, independent parameters are provided to support all
+            combinations.
+
+            .. versionadded:: 1.18.4 Added
+               :paramref:`.AddColumnOp.inline_primary_key`
+               to control use of the ``PRIMARY KEY`` inline directive.
+
+            **FOREIGN KEY support**
 
             The provided :class:`~sqlalchemy.schema.Column` object may include a
             :class:`~sqlalchemy.schema.ForeignKey` constraint directive,
-            referencing a remote table name. For this specific type of constraint,
-            Alembic will automatically emit a second ALTER statement in order to
-            add the single-column FOREIGN KEY constraint separately::
+            referencing a remote table name. By default, Alembic will automatically
+            emit a second ALTER statement in order to add the single-column FOREIGN
+            KEY constraint separately::
+
+                from alembic import op
+                from sqlalchemy import Column, INTEGER, ForeignKey
+
+                op.add_column(
+                    "organization",
+                    Column("account_id", INTEGER, ForeignKey("accounts.id")),
+                )
+
+            To render the FOREIGN KEY constraint inline within the ADD COLUMN
+            directive, use the ``inline_references`` parameter. This can improve
+            performance on large tables since the constraint is marked as valid
+            immediately for nullable columns::
 
                 from alembic import op
                 from sqlalchemy import Column, INTEGER, ForeignKey
@@ -670,8 +724,11 @@ def add_column(
                 op.add_column(
                     "organization",
                     Column("account_id", INTEGER, ForeignKey("accounts.id")),
+                    inline_references=True,
                 )
 
+            **Indicating server side defaults**
+
             The column argument passed to :meth:`.Operations.add_column` is a
             :class:`~sqlalchemy.schema.Column` construct, used in the same way it's
             used in SQLAlchemy. In particular, values or functions to be indicated
@@ -695,6 +752,27 @@ def add_column(
              quoting of the schema outside of the default behavior, use
              the SQLAlchemy construct
              :class:`~sqlalchemy.sql.elements.quoted_name`.
+            :param if_not_exists: If True, adds ``IF NOT EXISTS`` operator
+             when creating the new column for compatible dialects
+
+             .. versionadded:: 1.16.0
+
+            :param inline_references: If True, renders ``FOREIGN KEY`` constraints
+             inline within the ``ADD COLUMN`` directive using ``REFERENCES``
+             syntax, rather than as a separate ``ALTER TABLE ADD CONSTRAINT``
+             statement. This is supported by PostgreSQL, Oracle, MySQL 5.7+, and
+             MariaDB 10.5+.
+
+             .. versionadded:: 1.18.2
+
+            :param inline_primary_key: If True, renders the ``PRIMARY KEY`` phrase
+             inline within the ``ADD COLUMN`` directive.  When not present or
+             False, ``PRIMARY KEY`` is not emitted; it is assumed that the
+             migration script will include an additional
+             :meth:`.Operations.create_primary_key` directive to create a full
+             primary key constraint.
+
+             .. versionadded:: 1.18.4
 
             """  # noqa: E501
             ...
@@ -706,14 +784,16 @@ def alter_column(
             *,
             nullable: Optional[bool] = None,
             comment: Union[str, Literal[False], None] = False,
-            server_default: Any = False,
+            server_default: Union[
+                _ServerDefaultType, None, Literal[False]
+            ] = False,
             new_column_name: Optional[str] = None,
             type_: Union[TypeEngine[Any], Type[TypeEngine[Any]], None] = None,
             existing_type: Union[
                 TypeEngine[Any], Type[TypeEngine[Any]], None
             ] = None,
             existing_server_default: Union[
-                str, bool, Identity, Computed, None
+                _ServerDefaultType, None, Literal[False]
             ] = False,
             existing_nullable: Optional[bool] = None,
             existing_comment: Optional[str] = None,
@@ -1074,7 +1154,7 @@ def create_index(
             self,
             index_name: Optional[str],
             table_name: str,
-            columns: Sequence[Union[str, TextClause, Function[Any]]],
+            columns: Sequence[Union[str, TextClause, ColumnElement[Any]]],
             *,
             schema: Optional[str] = None,
             unique: bool = False,
@@ -1360,6 +1440,11 @@ def drop_column(
              quoting of the schema outside of the default behavior, use
              the SQLAlchemy construct
              :class:`~sqlalchemy.sql.elements.quoted_name`.
+            :param if_exists: If True, adds IF EXISTS operator when
+             dropping the new column for compatible dialects
+
+             .. versionadded:: 1.16.0
+
             :param mssql_drop_check: Optional boolean.  When ``True``, on
              Microsoft SQL Server only, first
              drop the CHECK constraint on the column using a
@@ -1381,7 +1466,6 @@ def drop_column(
              then exec's a separate DROP CONSTRAINT for that default.  Only
              works if the column has exactly one FK constraint which refers to
              it, at the moment.
-
             """  # noqa: E501
             ...
 
@@ -1392,6 +1476,7 @@ def drop_constraint(
             type_: Optional[str] = None,
             *,
             schema: Optional[str] = None,
+            if_exists: Optional[bool] = None,
         ) -> None:
             r"""Drop a constraint of the given name, typically via DROP CONSTRAINT.
 
@@ -1403,6 +1488,10 @@ def drop_constraint(
              quoting of the schema outside of the default behavior, use
              the SQLAlchemy construct
              :class:`~sqlalchemy.sql.elements.quoted_name`.
+            :param if_exists: If True, adds IF EXISTS operator when
+             dropping the constraint
+
+             .. versionadded:: 1.16.0
 
             """  # noqa: E501
             ...
@@ -1645,6 +1734,9 @@ def add_column(
             *,
             insert_before: Optional[str] = None,
             insert_after: Optional[str] = None,
+            if_not_exists: Optional[bool] = None,
+            inline_references: Optional[bool] = None,
+            inline_primary_key: Optional[bool] = None,
         ) -> None:
             """Issue an "add column" instruction using the current
             batch migration context.
@@ -1662,14 +1754,16 @@ def alter_column(
             *,
             nullable: Optional[bool] = None,
             comment: Union[str, Literal[False], None] = False,
-            server_default: Any = False,
+            server_default: Union[
+                _ServerDefaultType, None, Literal[False]
+            ] = False,
             new_column_name: Optional[str] = None,
             type_: Union[TypeEngine[Any], Type[TypeEngine[Any]], None] = None,
             existing_type: Union[
                 TypeEngine[Any], Type[TypeEngine[Any]], None
             ] = None,
             existing_server_default: Union[
-                str, bool, Identity, Computed, None
+                _ServerDefaultType, None, Literal[False]
             ] = False,
             existing_nullable: Optional[bool] = None,
             existing_comment: Optional[str] = None,
diff --git a/libs/alembic/operations/batch.py b/libs/alembic/operations/batch.py
index fd7ab99030..9b48be5986 100644
--- a/libs/alembic/operations/batch.py
+++ b/libs/alembic/operations/batch.py
@@ -18,6 +18,7 @@
 from sqlalchemy import MetaData
 from sqlalchemy import PrimaryKeyConstraint
 from sqlalchemy import schema as sql_schema
+from sqlalchemy import select
 from sqlalchemy import Table
 from sqlalchemy import types as sqltypes
 from sqlalchemy.sql.schema import SchemaEventTarget
@@ -31,11 +32,9 @@
 from ..util.sqla_compat import _ensure_scope_for_ddl
 from ..util.sqla_compat import _fk_is_self_referential
 from ..util.sqla_compat import _idx_table_bound_expressions
-from ..util.sqla_compat import _insert_inline
 from ..util.sqla_compat import _is_type_bound
 from ..util.sqla_compat import _remove_column_from_collection
 from ..util.sqla_compat import _resolve_for_variant
-from ..util.sqla_compat import _select
 from ..util.sqla_compat import constraint_name_defined
 from ..util.sqla_compat import constraint_name_string
 
@@ -45,10 +44,10 @@
     from sqlalchemy.engine import Dialect
     from sqlalchemy.sql.elements import ColumnClause
     from sqlalchemy.sql.elements import quoted_name
-    from sqlalchemy.sql.functions import Function
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.type_api import TypeEngine
 
+    from ..ddl.base import _ServerDefaultType
     from ..ddl.impl import DefaultImpl
 
 
@@ -449,13 +448,15 @@ def _create(self, op_impl: DefaultImpl) -> None:
 
         try:
             op_impl._exec(
-                _insert_inline(self.new_table).from_select(
+                self.new_table.insert()
+                .inline()
+                .from_select(
                     list(
                         k
                         for k, transfer in self.column_transfers.items()
                         if "expr" in transfer
                     ),
-                    _select(
+                    select(
                         *[
                             transfer["expr"]
                             for transfer in self.column_transfers.values()
@@ -484,7 +485,9 @@ def alter_column(
         table_name: str,
         column_name: str,
         nullable: Optional[bool] = None,
-        server_default: Optional[Union[Function[Any], str, bool]] = False,
+        server_default: Union[
+            _ServerDefaultType, None, Literal[False]
+        ] = False,
         name: Optional[str] = None,
         type_: Optional[TypeEngine] = None,
         autoincrement: Optional[Union[bool, Literal["auto"]]] = None,
diff --git a/libs/alembic/operations/ops.py b/libs/alembic/operations/ops.py
index 60b856a8f7..7eda50d672 100644
--- a/libs/alembic/operations/ops.py
+++ b/libs/alembic/operations/ops.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+import os
+import pathlib
 import re
 from typing import Any
 from typing import Callable
@@ -35,13 +37,10 @@
     from sqlalchemy.sql.elements import conv
     from sqlalchemy.sql.elements import quoted_name
     from sqlalchemy.sql.elements import TextClause
-    from sqlalchemy.sql.functions import Function
     from sqlalchemy.sql.schema import CheckConstraint
     from sqlalchemy.sql.schema import Column
-    from sqlalchemy.sql.schema import Computed
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.schema import ForeignKeyConstraint
-    from sqlalchemy.sql.schema import Identity
     from sqlalchemy.sql.schema import Index
     from sqlalchemy.sql.schema import MetaData
     from sqlalchemy.sql.schema import PrimaryKeyConstraint
@@ -52,6 +51,7 @@
     from sqlalchemy.sql.type_api import TypeEngine
 
     from ..autogenerate.rewriter import Rewriter
+    from ..ddl.base import _ServerDefaultType
     from ..runtime.migration import MigrationContext
     from ..script.revision import _RevIdType
 
@@ -141,12 +141,14 @@ def __init__(
         type_: Optional[str] = None,
         *,
         schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
         _reverse: Optional[AddConstraintOp] = None,
     ) -> None:
         self.constraint_name = constraint_name
         self.table_name = table_name
         self.constraint_type = type_
         self.schema = schema
+        self.if_exists = if_exists
         self._reverse = _reverse
 
     def reverse(self) -> AddConstraintOp:
@@ -204,6 +206,7 @@ def drop_constraint(
         type_: Optional[str] = None,
         *,
         schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
     ) -> None:
         r"""Drop a constraint of the given name, typically via DROP CONSTRAINT.
 
@@ -215,10 +218,20 @@ def drop_constraint(
          quoting of the schema outside of the default behavior, use
          the SQLAlchemy construct
          :class:`~sqlalchemy.sql.elements.quoted_name`.
+        :param if_exists: If True, adds IF EXISTS operator when
+         dropping the constraint
+
+         .. versionadded:: 1.16.0
 
         """
 
-        op = cls(constraint_name, table_name, type_=type_, schema=schema)
+        op = cls(
+            constraint_name,
+            table_name,
+            type_=type_,
+            schema=schema,
+            if_exists=if_exists,
+        )
         return operations.invoke(op)
 
     @classmethod
@@ -933,7 +946,7 @@ def create_index(
         operations: Operations,
         index_name: Optional[str],
         table_name: str,
-        columns: Sequence[Union[str, TextClause, Function[Any]]],
+        columns: Sequence[Union[str, TextClause, ColumnElement[Any]]],
         *,
         schema: Optional[str] = None,
         unique: bool = False,
@@ -1682,7 +1695,9 @@ def __init__(
         *,
         schema: Optional[str] = None,
         existing_type: Optional[Any] = None,
-        existing_server_default: Any = False,
+        existing_server_default: Union[
+            _ServerDefaultType, None, Literal[False]
+        ] = False,
         existing_nullable: Optional[bool] = None,
         existing_comment: Optional[str] = None,
         modify_nullable: Optional[bool] = None,
@@ -1841,14 +1856,16 @@ def alter_column(
         *,
         nullable: Optional[bool] = None,
         comment: Optional[Union[str, Literal[False]]] = False,
-        server_default: Any = False,
+        server_default: Union[
+            _ServerDefaultType, None, Literal[False]
+        ] = False,
         new_column_name: Optional[str] = None,
         type_: Optional[Union[TypeEngine[Any], Type[TypeEngine[Any]]]] = None,
         existing_type: Optional[
             Union[TypeEngine[Any], Type[TypeEngine[Any]]]
         ] = None,
-        existing_server_default: Optional[
-            Union[str, bool, Identity, Computed]
+        existing_server_default: Union[
+            _ServerDefaultType, None, Literal[False]
         ] = False,
         existing_nullable: Optional[bool] = None,
         existing_comment: Optional[str] = None,
@@ -1964,14 +1981,16 @@ def batch_alter_column(
         *,
         nullable: Optional[bool] = None,
         comment: Optional[Union[str, Literal[False]]] = False,
-        server_default: Any = False,
+        server_default: Union[
+            _ServerDefaultType, None, Literal[False]
+        ] = False,
         new_column_name: Optional[str] = None,
         type_: Optional[Union[TypeEngine[Any], Type[TypeEngine[Any]]]] = None,
         existing_type: Optional[
             Union[TypeEngine[Any], Type[TypeEngine[Any]]]
         ] = None,
-        existing_server_default: Optional[
-            Union[str, bool, Identity, Computed]
+        existing_server_default: Union[
+            _ServerDefaultType, None, Literal[False]
         ] = False,
         existing_nullable: Optional[bool] = None,
         existing_comment: Optional[str] = None,
@@ -2033,16 +2052,24 @@ def __init__(
         column: Column[Any],
         *,
         schema: Optional[str] = None,
+        if_not_exists: Optional[bool] = None,
+        inline_references: Optional[bool] = None,
+        inline_primary_key: Optional[bool] = None,
         **kw: Any,
     ) -> None:
         super().__init__(table_name, schema=schema)
         self.column = column
+        self.if_not_exists = if_not_exists
+        self.inline_references = inline_references
+        self.inline_primary_key = inline_primary_key
         self.kw = kw
 
     def reverse(self) -> DropColumnOp:
-        return DropColumnOp.from_column_and_tablename(
+        op = DropColumnOp.from_column_and_tablename(
             self.schema, self.table_name, self.column
         )
+        op.if_exists = self.if_not_exists
+        return op
 
     def to_diff_tuple(
         self,
@@ -2073,6 +2100,9 @@ def add_column(
         column: Column[Any],
         *,
         schema: Optional[str] = None,
+        if_not_exists: Optional[bool] = None,
+        inline_references: Optional[bool] = None,
+        inline_primary_key: Optional[bool] = None,
     ) -> None:
         """Issue an "add column" instruction using the current
         migration context.
@@ -2087,36 +2117,77 @@ def add_column(
         The :meth:`.Operations.add_column` method typically corresponds
         to the SQL command "ALTER TABLE... ADD COLUMN".    Within the scope
         of this command, the column's name, datatype, nullability,
-        and optional server-generated defaults may be indicated.
+        and optional server-generated defaults may be indicated.  Options
+        also exist for control of single-column primary key and foreign key
+        constraints to be generated.
 
         .. note::
 
-            With the exception of NOT NULL constraints or single-column FOREIGN
-            KEY constraints, other kinds of constraints such as PRIMARY KEY,
-            UNIQUE or CHECK constraints **cannot** be generated using this
-            method; for these constraints, refer to operations such as
-            :meth:`.Operations.create_primary_key` and
-            :meth:`.Operations.create_check_constraint`. In particular, the
-            following :class:`~sqlalchemy.schema.Column` parameters are
-            **ignored**:
-
-            * :paramref:`~sqlalchemy.schema.Column.primary_key` - SQL databases
-              typically do not support an ALTER operation that can add
-              individual columns one at a time to an existing primary key
-              constraint, therefore it's less ambiguous to use the
-              :meth:`.Operations.create_primary_key` method, which assumes no
-              existing primary key constraint is present.
+            Not all contraint types may be indicated with this directive.
+            NOT NULL, FOREIGN KEY, and CHECK are honored, PRIMARY KEY
+            is conditionally honored, UNIQUE
+            is currently not.
+
+            As of 1.18.2, the following :class:`~sqlalchemy.schema.Column`
+            parameters are **ignored**:
+
             * :paramref:`~sqlalchemy.schema.Column.unique` - use the
               :meth:`.Operations.create_unique_constraint` method
             * :paramref:`~sqlalchemy.schema.Column.index` - use the
               :meth:`.Operations.create_index` method
 
+        **PRIMARY KEY support**
+
+        The provided :class:`~sqlalchemy.schema.Column` object may include a
+        ``primary_key=True`` directive, indicating the column intends to be
+        part of a primary key constraint.  However by default, the inline
+        "PRIMARY KEY" directive is not emitted, and it's assumed that a
+        separate :meth:`.Operations.create_primary_key` directive will be used
+        to create this constraint, which may potentially include other columns
+        as well as have an explicit name.   To instead render an inline
+        "PRIMARY KEY" directive, the
+        :paramref:`.AddColumnOp.inline_primary_key` parameter may be indicated
+        at the same time as the ``primary_key`` parameter (both are needed)::
+
+            from alembic import op
+            from sqlalchemy import Column, INTEGER
+
+            op.add_column(
+                "organization",
+                Column("id", INTEGER, primary_key=True),
+                inline_primary_key=True
+            )
+
+        The ``primary_key=True`` parameter on
+        :class:`~sqlalchemy.schema.Column` also indicates behaviors such as
+        using the ``SERIAL`` datatype with the PostgreSQL database, which is
+        why two separate, independent parameters are provided to support all
+        combinations.
+
+        .. versionadded:: 1.18.4 Added
+           :paramref:`.AddColumnOp.inline_primary_key`
+           to control use of the ``PRIMARY KEY`` inline directive.
+
+        **FOREIGN KEY support**
 
         The provided :class:`~sqlalchemy.schema.Column` object may include a
         :class:`~sqlalchemy.schema.ForeignKey` constraint directive,
-        referencing a remote table name. For this specific type of constraint,
-        Alembic will automatically emit a second ALTER statement in order to
-        add the single-column FOREIGN KEY constraint separately::
+        referencing a remote table name. By default, Alembic will automatically
+        emit a second ALTER statement in order to add the single-column FOREIGN
+        KEY constraint separately::
+
+            from alembic import op
+            from sqlalchemy import Column, INTEGER, ForeignKey
+
+            op.add_column(
+                "organization",
+                Column("account_id", INTEGER, ForeignKey("accounts.id")),
+            )
+
+        To render the FOREIGN KEY constraint inline within the ADD COLUMN
+        directive, use the ``inline_references`` parameter. This can improve
+        performance on large tables since the constraint is marked as valid
+        immediately for nullable columns::
 
             from alembic import op
             from sqlalchemy import Column, INTEGER, ForeignKey
@@ -2124,8 +2195,11 @@ def add_column(
             op.add_column(
                 "organization",
                 Column("account_id", INTEGER, ForeignKey("accounts.id")),
+                inline_references=True,
             )
 
+        **Indicating server side defaults**
+
         The column argument passed to :meth:`.Operations.add_column` is a
         :class:`~sqlalchemy.schema.Column` construct, used in the same way it's
         used in SQLAlchemy. In particular, values or functions to be indicated
@@ -2149,10 +2223,38 @@ def add_column(
          quoting of the schema outside of the default behavior, use
          the SQLAlchemy construct
          :class:`~sqlalchemy.sql.elements.quoted_name`.
+        :param if_not_exists: If True, adds ``IF NOT EXISTS`` operator
+         when creating the new column for compatible dialects
+
+         .. versionadded:: 1.16.0
+
+        :param inline_references: If True, renders ``FOREIGN KEY`` constraints
+         inline within the ``ADD COLUMN`` directive using ``REFERENCES``
+         syntax, rather than as a separate ``ALTER TABLE ADD CONSTRAINT``
+         statement. This is supported by PostgreSQL, Oracle, MySQL 5.7+, and
+         MariaDB 10.5+.
+
+         .. versionadded:: 1.18.2
+
+        :param inline_primary_key: If True, renders the ``PRIMARY KEY`` phrase
+         inline within the ``ADD COLUMN`` directive.  When not present or
+         False, ``PRIMARY KEY`` is not emitted; it is assumed that the
+         migration script will include an additional
+         :meth:`.Operations.create_primary_key` directive to create a full
+         primary key constraint.
+
+         .. versionadded:: 1.18.4
 
         """
 
-        op = cls(table_name, column, schema=schema)
+        op = cls(
+            table_name,
+            column,
+            schema=schema,
+            if_not_exists=if_not_exists,
+            inline_references=inline_references,
+            inline_primary_key=inline_primary_key,
+        )
         return operations.invoke(op)
 
     @classmethod
@@ -2163,6 +2265,9 @@ def batch_add_column(
         *,
         insert_before: Optional[str] = None,
         insert_after: Optional[str] = None,
+        if_not_exists: Optional[bool] = None,
+        inline_references: Optional[bool] = None,
+        inline_primary_key: Optional[bool] = None,
     ) -> None:
         """Issue an "add column" instruction using the current
         batch migration context.
@@ -2183,6 +2288,9 @@ def batch_add_column(
             operations.impl.table_name,
             column,
             schema=operations.impl.schema,
+            if_not_exists=if_not_exists,
+            inline_references=inline_references,
+            inline_primary_key=inline_primary_key,
             **kw,
         )
         return operations.invoke(op)
@@ -2199,12 +2307,14 @@ def __init__(
         column_name: str,
         *,
         schema: Optional[str] = None,
+        if_exists: Optional[bool] = None,
         _reverse: Optional[AddColumnOp] = None,
         **kw: Any,
     ) -> None:
         super().__init__(table_name, schema=schema)
         self.column_name = column_name
         self.kw = kw
+        self.if_exists = if_exists
         self._reverse = _reverse
 
     def to_diff_tuple(
@@ -2224,9 +2334,11 @@ def reverse(self) -> AddColumnOp:
                 "original column is not present"
             )
 
-        return AddColumnOp.from_column_and_tablename(
+        op = AddColumnOp.from_column_and_tablename(
             self.schema, self.table_name, self._reverse.column
         )
+        op.if_not_exists = self.if_exists
+        return op
 
     @classmethod
     def from_column_and_tablename(
@@ -2273,6 +2385,11 @@ def drop_column(
          quoting of the schema outside of the default behavior, use
          the SQLAlchemy construct
          :class:`~sqlalchemy.sql.elements.quoted_name`.
+        :param if_exists: If True, adds IF EXISTS operator when
+         dropping the new column for compatible dialects
+
+         .. versionadded:: 1.16.0
+
         :param mssql_drop_check: Optional boolean.  When ``True``, on
          Microsoft SQL Server only, first
          drop the CHECK constraint on the column using a
@@ -2294,7 +2411,6 @@ def drop_column(
          then exec's a separate DROP CONSTRAINT for that default.  Only
          works if the column has exactly one FK constraint which refers to
          it, at the moment.
-
         """
 
         op = cls(table_name, column_name, schema=schema, **kw)
@@ -2709,7 +2825,7 @@ def __init__(
         head: Optional[str] = None,
         splice: Optional[bool] = None,
         branch_label: Optional[_RevIdType] = None,
-        version_path: Optional[str] = None,
+        version_path: Union[str, os.PathLike[str], None] = None,
         depends_on: Optional[_RevIdType] = None,
     ) -> None:
         self.rev_id = rev_id
@@ -2718,7 +2834,9 @@ def __init__(
         self.head = head
         self.splice = splice
         self.branch_label = branch_label
-        self.version_path = version_path
+        self.version_path = (
+            pathlib.Path(version_path).as_posix() if version_path else None
+        )
         self.depends_on = depends_on
         self.upgrade_ops = upgrade_ops
         self.downgrade_ops = downgrade_ops
diff --git a/libs/alembic/operations/toimpl.py b/libs/alembic/operations/toimpl.py
index 4b960049c7..85b9d8a324 100644
--- a/libs/alembic/operations/toimpl.py
+++ b/libs/alembic/operations/toimpl.py
@@ -8,7 +8,7 @@
 from . import ops
 from .base import Operations
 from ..util.sqla_compat import _copy
-from ..util.sqla_compat import sqla_14
+from ..util.sqla_compat import sqla_2
 
 if TYPE_CHECKING:
     from sqlalchemy.sql.schema import Table
@@ -50,6 +50,11 @@ def _count_constraint(constraint):
             if _count_constraint(constraint):
                 operations.impl.drop_constraint(constraint)
 
+    # some weird pyright quirk here, these have Literal[False]
+    # in their types, not sure why pyright thinks they could be True
+    assert existing_server_default is not True  # type: ignore[comparison-overlap]  # noqa: E501
+    assert comment is not True  # type: ignore[comparison-overlap]
+
     operations.impl.alter_column(
         table_name,
         column_name,
@@ -81,9 +86,6 @@ def _count_constraint(constraint):
 def drop_table(operations: "Operations", operation: "ops.DropTableOp") -> None:
     kw = {}
     if operation.if_exists is not None:
-        if not sqla_14:
-            raise NotImplementedError("SQLAlchemy 1.4+ required")
-
         kw["if_exists"] = operation.if_exists
     operations.impl.drop_table(
         operation.to_table(operations.migration_context), **kw
@@ -96,7 +98,11 @@ def drop_column(
 ) -> None:
     column = operation.to_column(operations.migration_context)
     operations.impl.drop_column(
-        operation.table_name, column, schema=operation.schema, **operation.kw
+        operation.table_name,
+        column,
+        schema=operation.schema,
+        if_exists=operation.if_exists,
+        **operation.kw,
     )
 
 
@@ -107,9 +113,6 @@ def create_index(
     idx = operation.to_index(operations.migration_context)
     kw = {}
     if operation.if_not_exists is not None:
-        if not sqla_14:
-            raise NotImplementedError("SQLAlchemy 1.4+ required")
-
         kw["if_not_exists"] = operation.if_not_exists
     operations.impl.create_index(idx, **kw)
 
@@ -118,9 +121,6 @@ def create_index(
 def drop_index(operations: "Operations", operation: "ops.DropIndexOp") -> None:
     kw = {}
     if operation.if_exists is not None:
-        if not sqla_14:
-            raise NotImplementedError("SQLAlchemy 1.4+ required")
-
         kw["if_exists"] = operation.if_exists
 
     operations.impl.drop_index(
@@ -135,9 +135,6 @@ def create_table(
 ) -> "Table":
     kw = {}
     if operation.if_not_exists is not None:
-        if not sqla_14:
-            raise NotImplementedError("SQLAlchemy 1.4+ required")
-
         kw["if_not_exists"] = operation.if_not_exists
     table = operation.to_table(operations.migration_context)
     operations.impl.create_table(table, **kw)
@@ -175,15 +172,35 @@ def add_column(operations: "Operations", operation: "ops.AddColumnOp") -> None:
     column = operation.column
     schema = operation.schema
     kw = operation.kw
+    inline_references = operation.inline_references
+    inline_primary_key = operation.inline_primary_key
 
     if column.table is not None:
         column = _copy(column)
 
     t = operations.schema_obj.table(table_name, column, schema=schema)
-    operations.impl.add_column(table_name, column, schema=schema, **kw)
+    operations.impl.add_column(
+        table_name,
+        column,
+        schema=schema,
+        if_not_exists=operation.if_not_exists,
+        inline_references=inline_references,
+        inline_primary_key=inline_primary_key,
+        **kw,
+    )
 
     for constraint in t.constraints:
         if not isinstance(constraint, sa_schema.PrimaryKeyConstraint):
+            # Skip ForeignKeyConstraint if it was rendered inline
+            # This only happens when inline_references=True AND there's exactly
+            # one FK AND the constraint is single-column
+            if (
+                inline_references
+                and isinstance(constraint, sa_schema.ForeignKeyConstraint)
+                and len(column.foreign_keys) == 1
+                and len(constraint.columns) == 1
+            ):
+                continue
             operations.impl.add_constraint(constraint)
     for index in t.indexes:
         operations.impl.create_index(index)
@@ -210,13 +227,19 @@ def create_constraint(
 def drop_constraint(
     operations: "Operations", operation: "ops.DropConstraintOp"
 ) -> None:
+    kw = {}
+    if operation.if_exists is not None:
+        if not sqla_2:
+            raise NotImplementedError("SQLAlchemy 2.0 required")
+        kw["if_exists"] = operation.if_exists
     operations.impl.drop_constraint(
         operations.schema_obj.generic_constraint(
             operation.constraint_name,
             operation.table_name,
             operation.constraint_type,
             schema=operation.schema,
-        )
+        ),
+        **kw,
     )
 
 
diff --git a/libs/alembic/runtime/environment.py b/libs/alembic/runtime/environment.py
index a30972ec91..5817e2d9fd 100644
--- a/libs/alembic/runtime/environment.py
+++ b/libs/alembic/runtime/environment.py
@@ -3,7 +3,6 @@
 from typing import Any
 from typing import Callable
 from typing import Collection
-from typing import ContextManager
 from typing import Dict
 from typing import List
 from typing import Mapping
@@ -18,6 +17,7 @@
 
 from sqlalchemy.sql.schema import Column
 from sqlalchemy.sql.schema import FetchedValue
+from typing_extensions import ContextManager
 from typing_extensions import Literal
 
 from .migration import _ProxyTransaction
@@ -338,7 +338,7 @@ def get_tag_argument(self) -> Optional[str]:
             line.
 
         """
-        return self.context_opts.get("tag", None)  # type: ignore[no-any-return]  # noqa: E501
+        return self.context_opts.get("tag", None)
 
     @overload
     def get_x_argument(self, as_dictionary: Literal[False]) -> List[str]: ...
@@ -441,6 +441,7 @@ def configure(
         sqlalchemy_module_prefix: str = "sa.",
         user_module_prefix: Optional[str] = None,
         on_version_apply: Optional[OnVersionApplyFn] = None,
+        autogenerate_plugins: Sequence[str] | None = None,
         **kw: Any,
     ) -> None:
         """Configure a :class:`.MigrationContext` within this
@@ -860,6 +861,25 @@ def process_revision_directives(context, revision, directives):
 
              :paramref:`.command.revision.process_revision_directives`
 
+        :param autogenerate_plugins: A list of string names of "plugins" that
+         should participate in this autogenerate run.   Defaults to the list
+         ``["alembic.autogenerate.*"]``, which indicates that Alembic's default
+         autogeneration plugins will be used.
+
+         See the section :ref:`plugins_autogenerate` for complete background
+         on how to use this parameter.
+
+         .. versionadded:: 1.18.0 Added a new plugin system for autogenerate
+            compare directives.
+
+         .. seealso::
+
+            :ref:`plugins_autogenerate` - background on enabling/disabling
+            autogenerate plugins
+
+            :ref:`alembic.plugins.toplevel` - Introduction and documentation
+            to the plugin system
+
         Parameters specific to individual backends:
 
         :param mssql_batch_separator: The "batch separator" which will
@@ -903,6 +923,9 @@ def process_revision_directives(context, revision, directives):
         opts["process_revision_directives"] = process_revision_directives
         opts["on_version_apply"] = util.to_tuple(on_version_apply, default=())
 
+        if autogenerate_plugins is not None:
+            opts["autogenerate_plugins"] = autogenerate_plugins
+
         if render_item is not None:
             opts["render_item"] = render_item
         opts["compare_type"] = compare_type
@@ -976,7 +999,7 @@ def static_output(self, text: str) -> None:
 
     def begin_transaction(
         self,
-    ) -> Union[_ProxyTransaction, ContextManager[None]]:
+    ) -> Union[_ProxyTransaction, ContextManager[None, Optional[bool]]]:
         """Return a context manager that will
         enclose an operation within a "transaction",
         as defined by the environment's offline
diff --git a/libs/alembic/runtime/migration.py b/libs/alembic/runtime/migration.py
index 28f01c3b30..3fccf22a67 100644
--- a/libs/alembic/runtime/migration.py
+++ b/libs/alembic/runtime/migration.py
@@ -11,7 +11,6 @@
 from typing import Callable
 from typing import cast
 from typing import Collection
-from typing import ContextManager
 from typing import Dict
 from typing import Iterable
 from typing import Iterator
@@ -22,17 +21,17 @@
 from typing import TYPE_CHECKING
 from typing import Union
 
-from sqlalchemy import Column
 from sqlalchemy import literal_column
+from sqlalchemy import select
 from sqlalchemy.engine import Engine
 from sqlalchemy.engine import url as sqla_url
 from sqlalchemy.engine.strategies import MockEngineStrategy
+from typing_extensions import ContextManager
 
 from .. import ddl
 from .. import util
 from ..util import sqla_compat
 from ..util.compat import EncodedIO
-from ..util.sqla_compat import _select
 
 if TYPE_CHECKING:
     from sqlalchemy.engine import Dialect
@@ -175,7 +174,11 @@ def __init__(
                 opts["output_encoding"],
             )
         else:
-            self.output_buffer = opts.get("output_buffer", sys.stdout)
+            self.output_buffer = opts.get(
+                "output_buffer", sys.stdout
+            )  # type:ignore[assignment]  # noqa: E501
+
+        self.transactional_ddl = transactional_ddl
 
         self._user_compare_type = opts.get("compare_type", True)
         self._user_compare_server_default = opts.get(
@@ -368,7 +371,7 @@ def upgrade():
 
     def begin_transaction(
         self, _per_migration: bool = False
-    ) -> Union[_ProxyTransaction, ContextManager[None]]:
+    ) -> Union[_ProxyTransaction, ContextManager[None, Optional[bool]]]:
         """Begin a logical transaction for migration operations.
 
         This method is used within an ``env.py`` script to demarcate where
@@ -534,7 +537,7 @@ def get_current_heads(self) -> Tuple[str, ...]:
         return tuple(
             row[0]
             for row in self.connection.execute(
-                _select(self._version.c.version_num)
+                select(self._version.c.version_num)
             )
         )
 
@@ -702,54 +705,6 @@ def config(self) -> Optional[Config]:
         else:
             return None
 
-    def _compare_type(
-        self, inspector_column: Column[Any], metadata_column: Column
-    ) -> bool:
-        if self._user_compare_type is False:
-            return False
-
-        if callable(self._user_compare_type):
-            user_value = self._user_compare_type(
-                self,
-                inspector_column,
-                metadata_column,
-                inspector_column.type,
-                metadata_column.type,
-            )
-            if user_value is not None:
-                return user_value
-
-        return self.impl.compare_type(inspector_column, metadata_column)
-
-    def _compare_server_default(
-        self,
-        inspector_column: Column[Any],
-        metadata_column: Column[Any],
-        rendered_metadata_default: Optional[str],
-        rendered_column_default: Optional[str],
-    ) -> bool:
-        if self._user_compare_server_default is False:
-            return False
-
-        if callable(self._user_compare_server_default):
-            user_value = self._user_compare_server_default(
-                self,
-                inspector_column,
-                metadata_column,
-                rendered_column_default,
-                metadata_column.server_default,
-                rendered_metadata_default,
-            )
-            if user_value is not None:
-                return user_value
-
-        return self.impl.compare_server_default(
-            inspector_column,
-            metadata_column,
-            rendered_metadata_default,
-            rendered_column_default,
-        )
-
 
 class HeadMaintainer:
     def __init__(self, context: MigrationContext, heads: Any) -> None:
diff --git a/libs/alembic/runtime/plugins.py b/libs/alembic/runtime/plugins.py
new file mode 100644
index 0000000000..be1d590f55
--- /dev/null
+++ b/libs/alembic/runtime/plugins.py
@@ -0,0 +1,179 @@
+from __future__ import annotations
+
+from importlib import metadata
+import logging
+import re
+from types import ModuleType
+from typing import Callable
+from typing import Pattern
+from typing import TYPE_CHECKING
+
+from .. import util
+from ..util import DispatchPriority
+from ..util import PriorityDispatcher
+
+if TYPE_CHECKING:
+    from ..util import PriorityDispatchResult
+
+_all_plugins = {}
+
+
+log = logging.getLogger(__name__)
+
+
+class Plugin:
+    """Describe a series of functions that are pulled in as a plugin.
+
+    This is initially to provide for portable lists of autogenerate
+    comparison functions, however the setup for a plugin can run any
+    other kinds of global registration as well.
+
+    .. versionadded:: 1.18.0
+
+    """
+
+    def __init__(self, name: str):
+        self.name = name
+        log.info("setup plugin %s", name)
+        if name in _all_plugins:
+            raise ValueError(f"A plugin named {name} is already registered")
+        _all_plugins[name] = self
+        self.autogenerate_comparators = PriorityDispatcher()
+
+    def remove(self) -> None:
+        """remove this plugin"""
+
+        del _all_plugins[self.name]
+
+    def add_autogenerate_comparator(
+        self,
+        fn: Callable[..., PriorityDispatchResult],
+        compare_target: str,
+        compare_element: str | None = None,
+        *,
+        qualifier: str = "default",
+        priority: DispatchPriority = DispatchPriority.MEDIUM,
+    ) -> None:
+        """Register an autogenerate comparison function.
+
+        See the section :ref:`plugins_registering_autogenerate` for detailed
+        examples on how to use this method.
+
+        :param fn: The comparison function to register. The function receives
+         arguments specific to the type of comparison being performed and
+         should return a :class:`.PriorityDispatchResult` value.
+
+        :param compare_target: The type of comparison being performed
+         (e.g., ``"table"``, ``"column"``, ``"type"``).
+
+        :param compare_element: Optional sub-element being compared within
+         the target type.
+
+        :param qualifier: Database dialect qualifier. Use ``"default"`` for
+         all dialects, or specify a dialect name like ``"postgresql"`` to
+         register a dialect-specific handler. Defaults to ``"default"``.
+
+        :param priority: Execution priority for this comparison function.
+         Functions are executed in priority order from
+         :attr:`.DispatchPriority.FIRST` to :attr:`.DispatchPriority.LAST`.
+         Defaults to :attr:`.DispatchPriority.MEDIUM`.
+
+        """
+        self.autogenerate_comparators.dispatch_for(
+            compare_target,
+            subgroup=compare_element,
+            priority=priority,
+            qualifier=qualifier,
+        )(fn)
+
+    @classmethod
+    def populate_autogenerate_priority_dispatch(
+        cls, comparators: PriorityDispatcher, include_plugins: list[str]
+    ) -> None:
+        """Populate all current autogenerate comparison functions into
+        a given PriorityDispatcher."""
+
+        exclude: set[Pattern[str]] = set()
+        include: dict[str, Pattern[str]] = {}
+
+        matched_expressions: set[str] = set()
+
+        for name in include_plugins:
+            if name.startswith("~"):
+                exclude.add(_make_re(name[1:]))
+            else:
+                include[name] = _make_re(name)
+
+        for plugin in _all_plugins.values():
+            if any(excl.match(plugin.name) for excl in exclude):
+                continue
+
+            include_matches = [
+                incl for incl in include if include[incl].match(plugin.name)
+            ]
+            if not include_matches:
+                continue
+            else:
+                matched_expressions.update(include_matches)
+
+            log.info("setting up autogenerate plugin %s", plugin.name)
+            comparators.populate_with(plugin.autogenerate_comparators)
+
+        never_matched = set(include).difference(matched_expressions)
+        if never_matched:
+            raise util.CommandError(
+                f"Did not locate plugins: {', '.join(never_matched)}"
+            )
+
+    @classmethod
+    def setup_plugin_from_module(cls, module: ModuleType, name: str) -> None:
+        """Call the ``setup()`` function of a plugin module, identified by
+        passing the module object itself.
+
+        E.g.::
+
+            from alembic.runtime.plugins import Plugin
+            import myproject.alembic_plugin
+
+            # Register the plugin manually
+            Plugin.setup_plugin_from_module(
+                myproject.alembic_plugin,
+                "myproject.custom_operations"
+            )
+
+        This will generate a new :class:`.Plugin` object with the given
+        name, which will register itself in the global list of plugins.
+        Then the module's ``setup()`` function is invoked, passing that
+        :class:`.Plugin` object.
+
+        This exact process is invoked automatically at import time for any
+        plugin module that is published via the ``alembic.plugins`` entrypoint.
+
+        """
+        module.setup(Plugin(name))
+
+
+def _make_re(name: str) -> Pattern[str]:
+    tokens = name.split(".")
+
+    reg = r""
+    for token in tokens:
+        if token == "*":
+            reg += r"\..+?"
+        elif token.isidentifier():
+            reg += r"\." + token
+        else:
+            raise ValueError(f"Invalid plugin expression {name!r}")
+
+    # omit leading r'\.'
+    return re.compile(f"^{reg[2:]}$")
+
+
+def _setup() -> None:
+    # setup third party plugins
+    for entrypoint in metadata.entry_points(group="alembic.plugins"):
+        for mod in entrypoint.load():
+            Plugin.setup_plugin_from_module(mod, entrypoint.name)
+
+
+_setup()
diff --git a/libs/alembic/script/base.py b/libs/alembic/script/base.py
index 30df6ddb2b..f841708598 100644
--- a/libs/alembic/script/base.py
+++ b/libs/alembic/script/base.py
@@ -3,6 +3,7 @@
 from contextlib import contextmanager
 import datetime
 import os
+from pathlib import Path
 import re
 import shutil
 import sys
@@ -11,7 +12,6 @@
 from typing import cast
 from typing import Iterator
 from typing import List
-from typing import Mapping
 from typing import Optional
 from typing import Sequence
 from typing import Set
@@ -25,6 +25,7 @@
 from ..runtime import migration
 from ..util import compat
 from ..util import not_none
+from ..util.pyfiles import _preserving_path_as_str
 
 if TYPE_CHECKING:
     from .revision import _GetRevArg
@@ -32,16 +33,13 @@
     from .revision import Revision
     from ..config import Config
     from ..config import MessagingOptions
+    from ..config import PostWriteHookConfig
     from ..runtime.migration import RevisionStep
     from ..runtime.migration import StampStep
 
 try:
-    if compat.py39:
-        from zoneinfo import ZoneInfo
-        from zoneinfo import ZoneInfoNotFoundError
-    else:
-        from backports.zoneinfo import ZoneInfo  # type: ignore[import-not-found,no-redef] # noqa: E501
-        from backports.zoneinfo import ZoneInfoNotFoundError  # type: ignore[no-redef] # noqa: E501
+    from zoneinfo import ZoneInfo
+    from zoneinfo import ZoneInfoNotFoundError
 except ImportError:
     ZoneInfo = None  # type: ignore[assignment, misc]
 
@@ -50,9 +48,6 @@
 _legacy_rev = re.compile(r"([a-f0-9]+)\.py$")
 _slug_re = re.compile(r"\w+")
 _default_file_template = "%(rev)s_%(slug)s"
-_split_on_space_comma = re.compile(r", *|(?: +)")
-
-_split_on_space_comma_colon = re.compile(r", *|(?: +)|\:")
 
 
 class ScriptDirectory:
@@ -77,40 +72,55 @@ class ScriptDirectory:
 
     def __init__(
         self,
-        dir: str,  # noqa
+        dir: Union[str, os.PathLike[str]],  # noqa: A002
         file_template: str = _default_file_template,
         truncate_slug_length: Optional[int] = 40,
-        version_locations: Optional[List[str]] = None,
+        version_locations: Optional[
+            Sequence[Union[str, os.PathLike[str]]]
+        ] = None,
         sourceless: bool = False,
         output_encoding: str = "utf-8",
         timezone: Optional[str] = None,
-        hook_config: Optional[Mapping[str, str]] = None,
+        hooks: list[PostWriteHookConfig] = [],
         recursive_version_locations: bool = False,
         messaging_opts: MessagingOptions = cast(
             "MessagingOptions", util.EMPTY_DICT
         ),
     ) -> None:
-        self.dir = dir
+        self.dir = _preserving_path_as_str(dir)
+        self.version_locations = [
+            _preserving_path_as_str(p) for p in version_locations or ()
+        ]
         self.file_template = file_template
-        self.version_locations = version_locations
         self.truncate_slug_length = truncate_slug_length or 40
         self.sourceless = sourceless
         self.output_encoding = output_encoding
         self.revision_map = revision.RevisionMap(self._load_revisions)
         self.timezone = timezone
-        self.hook_config = hook_config
+        self.hooks = hooks
         self.recursive_version_locations = recursive_version_locations
         self.messaging_opts = messaging_opts
 
         if not os.access(dir, os.F_OK):
             raise util.CommandError(
-                "Path doesn't exist: %r.  Please use "
+                f"Path doesn't exist: {dir}.  Please use "
                 "the 'init' command to create a new "
-                "scripts folder." % os.path.abspath(dir)
+                "scripts folder."
             )
 
     @property
     def versions(self) -> str:
+        """return a single version location based on the sole path passed
+        within version_locations.
+
+        If multiple version locations are configured, an error is raised.
+
+
+        """
+        return str(self._singular_version_location)
+
+    @util.memoized_property
+    def _singular_version_location(self) -> Path:
         loc = self._version_locations
         if len(loc) > 1:
             raise util.CommandError("Multiple version_locations present")
@@ -118,40 +128,31 @@ def versions(self) -> str:
             return loc[0]
 
     @util.memoized_property
-    def _version_locations(self) -> Sequence[str]:
+    def _version_locations(self) -> Sequence[Path]:
         if self.version_locations:
             return [
-                os.path.abspath(util.coerce_resource_to_filename(location))
+                util.coerce_resource_to_filename(location).absolute()
                 for location in self.version_locations
             ]
         else:
-            return (os.path.abspath(os.path.join(self.dir, "versions")),)
+            return [Path(self.dir, "versions").absolute()]
 
     def _load_revisions(self) -> Iterator[Script]:
-        if self.version_locations:
-            paths = [
-                vers
-                for vers in self._version_locations
-                if os.path.exists(vers)
-            ]
-        else:
-            paths = [self.versions]
+        paths = [vers for vers in self._version_locations if vers.exists()]
 
         dupes = set()
         for vers in paths:
             for file_path in Script._list_py_dir(self, vers):
-                real_path = os.path.realpath(file_path)
+                real_path = file_path.resolve()
                 if real_path in dupes:
                     util.warn(
-                        "File %s loaded twice! ignoring. Please ensure "
-                        "version_locations is unique." % real_path
+                        f"File {real_path} loaded twice! ignoring. "
+                        "Please ensure version_locations is unique."
                     )
                     continue
                 dupes.add(real_path)
 
-                filename = os.path.basename(real_path)
-                dir_name = os.path.dirname(real_path)
-                script = Script._from_filename(self, dir_name, filename)
+                script = Script._from_path(self, real_path)
                 if script is None:
                     continue
                 yield script
@@ -165,78 +166,36 @@ def from_config(cls, config: Config) -> ScriptDirectory:
         present.
 
         """
-        script_location = config.get_main_option("script_location")
+        script_location = config.get_alembic_option("script_location")
         if script_location is None:
             raise util.CommandError(
-                "No 'script_location' key " "found in configuration."
+                "No 'script_location' key found in configuration."
             )
         truncate_slug_length: Optional[int]
-        tsl = config.get_main_option("truncate_slug_length")
+        tsl = config.get_alembic_option("truncate_slug_length")
         if tsl is not None:
             truncate_slug_length = int(tsl)
         else:
             truncate_slug_length = None
 
-        version_locations_str = config.get_main_option("version_locations")
-        version_locations: Optional[List[str]]
-        if version_locations_str:
-            version_path_separator = config.get_main_option(
-                "version_path_separator"
-            )
-
-            split_on_path = {
-                None: None,
-                "space": " ",
-                "newline": "\n",
-                "os": os.pathsep,
-                ":": ":",
-                ";": ";",
-            }
-
-            try:
-                split_char: Optional[str] = split_on_path[
-                    version_path_separator
-                ]
-            except KeyError as ke:
-                raise ValueError(
-                    "'%s' is not a valid value for "
-                    "version_path_separator; "
-                    "expected 'space', 'newline', 'os', ':', ';'"
-                    % version_path_separator
-                ) from ke
-            else:
-                if split_char is None:
-                    # legacy behaviour for backwards compatibility
-                    version_locations = _split_on_space_comma.split(
-                        version_locations_str
-                    )
-                else:
-                    version_locations = [
-                        x.strip()
-                        for x in version_locations_str.split(split_char)
-                        if x
-                    ]
-        else:
-            version_locations = None
-
-        prepend_sys_path = config.get_main_option("prepend_sys_path")
+        prepend_sys_path = config.get_prepend_sys_paths_list()
         if prepend_sys_path:
-            sys.path[:0] = list(
-                _split_on_space_comma_colon.split(prepend_sys_path)
-            )
+            sys.path[:0] = prepend_sys_path
 
-        rvl = config.get_main_option("recursive_version_locations") == "true"
+        rvl = config.get_alembic_boolean_option("recursive_version_locations")
         return ScriptDirectory(
             util.coerce_resource_to_filename(script_location),
-            file_template=config.get_main_option(
+            file_template=config.get_alembic_option(
                 "file_template", _default_file_template
             ),
             truncate_slug_length=truncate_slug_length,
-            sourceless=config.get_main_option("sourceless") == "true",
-            output_encoding=config.get_main_option("output_encoding", "utf-8"),
-            version_locations=version_locations,
-            timezone=config.get_main_option("timezone"),
-            hook_config=config.get_section("post_write_hooks", {}),
+            sourceless=config.get_alembic_boolean_option("sourceless"),
+            output_encoding=config.get_alembic_option(
+                "output_encoding", "utf-8"
+            ),
+            version_locations=config.get_version_locations_list(),
+            timezone=config.get_alembic_option("timezone"),
+            hooks=config.get_hooks_list(),
             recursive_version_locations=rvl,
             messaging_opts=config.messaging_opts,
         )
@@ -587,23 +546,36 @@ def run_env(self) -> None:
 
     @property
     def env_py_location(self) -> str:
-        return os.path.abspath(os.path.join(self.dir, "env.py"))
+        return str(Path(self.dir, "env.py"))
+
+    def _append_template(self, src: Path, dest: Path, **kw: Any) -> None:
+        with util.status(
+            f"Appending to existing {dest.absolute()}",
+            **self.messaging_opts,
+        ):
+            util.template_to_file(
+                src,
+                dest,
+                self.output_encoding,
+                append_with_newlines=True,
+                **kw,
+            )
 
-    def _generate_template(self, src: str, dest: str, **kw: Any) -> None:
+    def _generate_template(self, src: Path, dest: Path, **kw: Any) -> None:
         with util.status(
-            f"Generating {os.path.abspath(dest)}", **self.messaging_opts
+            f"Generating {dest.absolute()}", **self.messaging_opts
         ):
             util.template_to_file(src, dest, self.output_encoding, **kw)
 
-    def _copy_file(self, src: str, dest: str) -> None:
+    def _copy_file(self, src: Path, dest: Path) -> None:
         with util.status(
-            f"Generating {os.path.abspath(dest)}", **self.messaging_opts
+            f"Generating {dest.absolute()}", **self.messaging_opts
         ):
             shutil.copy(src, dest)
 
-    def _ensure_directory(self, path: str) -> None:
-        path = os.path.abspath(path)
-        if not os.path.exists(path):
+    def _ensure_directory(self, path: Path) -> None:
+        path = path.absolute()
+        if not path.exists():
             with util.status(
                 f"Creating directory {path}", **self.messaging_opts
             ):
@@ -628,11 +600,10 @@ def _generate_create_date(self) -> datetime.datetime:
                     raise util.CommandError(
                         "Can't locate timezone: %s" % self.timezone
                     ) from None
-            create_date = (
-                datetime.datetime.utcnow()
-                .replace(tzinfo=datetime.timezone.utc)
-                .astimezone(tzinfo)
-            )
+
+            create_date = datetime.datetime.now(
+                tz=datetime.timezone.utc
+            ).astimezone(tzinfo)
         else:
             create_date = datetime.datetime.now()
         return create_date
@@ -644,7 +615,8 @@ def generate_revision(
         head: Optional[_RevIdType] = None,
         splice: Optional[bool] = False,
         branch_labels: Optional[_RevIdType] = None,
-        version_path: Optional[str] = None,
+        version_path: Union[str, os.PathLike[str], None] = None,
+        file_template: Optional[str] = None,
         depends_on: Optional[_RevIdType] = None,
         **kw: Any,
     ) -> Optional[Script]:
@@ -697,7 +669,7 @@ def generate_revision(
                 for head_ in heads:
                     if head_ is not None:
                         assert isinstance(head_, Script)
-                        version_path = os.path.dirname(head_.path)
+                        version_path = head_._script_path.parent
                         break
                 else:
                     raise util.CommandError(
@@ -705,22 +677,26 @@ def generate_revision(
                         "please specify --version-path"
                     )
             else:
-                version_path = self.versions
+                version_path = self._singular_version_location
+        else:
+            version_path = Path(version_path)
 
-        norm_path = os.path.normpath(os.path.abspath(version_path))
+        assert isinstance(version_path, Path)
+        norm_path = version_path.absolute()
         for vers_path in self._version_locations:
-            if os.path.normpath(vers_path) == norm_path:
+            if vers_path.absolute() == norm_path:
                 break
         else:
             raise util.CommandError(
-                "Path %s is not represented in current "
-                "version locations" % version_path
+                f"Path {version_path} is not represented in current "
+                "version locations"
             )
 
         if self.version_locations:
             self._ensure_directory(version_path)
 
         path = self._rev_path(version_path, revid, message, create_date)
+        self._ensure_directory(path.parent)
 
         if not splice:
             for head_ in heads:
@@ -749,7 +725,7 @@ def generate_revision(
             resolved_depends_on = None
 
         self._generate_template(
-            os.path.join(self.dir, "script.py.mako"),
+            Path(self.dir, "script.py.mako"),
             path,
             up_revision=str(revid),
             down_revision=revision.tuple_rev_as_scalar(
@@ -763,7 +739,7 @@ def generate_revision(
             **kw,
         )
 
-        post_write_hooks = self.hook_config
+        post_write_hooks = self.hooks
         if post_write_hooks:
             write_hooks._run_hooks(path, post_write_hooks)
 
@@ -786,11 +762,11 @@ def generate_revision(
 
     def _rev_path(
         self,
-        path: str,
+        path: Union[str, os.PathLike[str]],
         rev_id: str,
         message: Optional[str],
         create_date: datetime.datetime,
-    ) -> str:
+    ) -> Path:
         epoch = int(create_date.timestamp())
         slug = "_".join(_slug_re.findall(message or "")).lower()
         if len(slug) > self.truncate_slug_length:
@@ -809,7 +785,7 @@ def _rev_path(
                 "second": create_date.second,
             }
         )
-        return os.path.join(path, filename)
+        return Path(path) / filename
 
 
 class Script(revision.Revision):
@@ -820,9 +796,14 @@ class Script(revision.Revision):
 
     """
 
-    def __init__(self, module: ModuleType, rev_id: str, path: str):
+    def __init__(
+        self,
+        module: ModuleType,
+        rev_id: str,
+        path: Union[str, os.PathLike[str]],
+    ):
         self.module = module
-        self.path = path
+        self.path = _preserving_path_as_str(path)
         super().__init__(
             rev_id,
             module.down_revision,
@@ -840,6 +821,10 @@ def __init__(self, module: ModuleType, rev_id: str, path: str):
     path: str
     """Filesystem path of the script."""
 
+    @property
+    def _script_path(self) -> Path:
+        return Path(self.path)
+
     _db_current_indicator: Optional[bool] = None
     """Utility variable which when set will cause string output to indicate
     this is a "current" version in some database"""
@@ -860,7 +845,7 @@ def longdoc(self) -> str:
                 doc = doc.decode(  # type: ignore[attr-defined]
                     self.module._alembic_source_encoding
                 )
-            return doc.strip()  # type: ignore[union-attr]
+            return doc.strip()
         else:
             return ""
 
@@ -972,36 +957,33 @@ def _format_down_revision(self) -> str:
             return util.format_as_comma(self._versioned_down_revisions)
 
     @classmethod
-    def _from_path(
-        cls, scriptdir: ScriptDirectory, path: str
-    ) -> Optional[Script]:
-        dir_, filename = os.path.split(path)
-        return cls._from_filename(scriptdir, dir_, filename)
-
-    @classmethod
-    def _list_py_dir(cls, scriptdir: ScriptDirectory, path: str) -> List[str]:
+    def _list_py_dir(
+        cls, scriptdir: ScriptDirectory, path: Path
+    ) -> List[Path]:
         paths = []
-        for root, dirs, files in os.walk(path, topdown=True):
-            if root.endswith("__pycache__"):
+        for root, dirs, files in compat.path_walk(path, top_down=True):
+            if root.name.endswith("__pycache__"):
                 # a special case - we may include these files
                 # if a `sourceless` option is specified
                 continue
 
             for filename in sorted(files):
-                paths.append(os.path.join(root, filename))
+                paths.append(root / filename)
 
             if scriptdir.sourceless:
                 # look for __pycache__
-                py_cache_path = os.path.join(root, "__pycache__")
-                if os.path.exists(py_cache_path):
+                py_cache_path = root / "__pycache__"
+                if py_cache_path.exists():
                     # add all files from __pycache__ whose filename is not
                     # already in the names we got from the version directory.
                     # add as relative paths including __pycache__ token
-                    names = {filename.split(".")[0] for filename in files}
+                    names = {
+                        Path(filename).name.split(".")[0] for filename in files
+                    }
                     paths.extend(
-                        os.path.join(py_cache_path, pyc)
-                        for pyc in os.listdir(py_cache_path)
-                        if pyc.split(".")[0] not in names
+                        py_cache_path / pyc
+                        for pyc in py_cache_path.iterdir()
+                        if pyc.name.split(".")[0] not in names
                     )
 
             if not scriptdir.recursive_version_locations:
@@ -1016,9 +998,13 @@ def _list_py_dir(cls, scriptdir: ScriptDirectory, path: str) -> List[str]:
         return paths
 
     @classmethod
-    def _from_filename(
-        cls, scriptdir: ScriptDirectory, dir_: str, filename: str
+    def _from_path(
+        cls, scriptdir: ScriptDirectory, path: Union[str, os.PathLike[str]]
     ) -> Optional[Script]:
+
+        path = Path(path)
+        dir_, filename = path.parent, path.name
+
         if scriptdir.sourceless:
             py_match = _sourceless_rev_file.match(filename)
         else:
@@ -1036,8 +1022,8 @@ def _from_filename(
             is_c = is_o = False
 
         if is_o or is_c:
-            py_exists = os.path.exists(os.path.join(dir_, py_filename))
-            pyc_exists = os.path.exists(os.path.join(dir_, py_filename + "c"))
+            py_exists = (dir_ / py_filename).exists()
+            pyc_exists = (dir_ / (py_filename + "c")).exists()
 
             # prefer .py over .pyc because we'd like to get the
             # source encoding; prefer .pyc over .pyo because we'd like to
@@ -1053,14 +1039,14 @@ def _from_filename(
             m = _legacy_rev.match(filename)
             if not m:
                 raise util.CommandError(
-                    "Could not determine revision id from filename %s. "
+                    "Could not determine revision id from "
+                    f"filename {filename}. "
                     "Be sure the 'revision' variable is "
                     "declared inside the script (please see 'Upgrading "
                     "from Alembic 0.1 to 0.2' in the documentation)."
-                    % filename
                 )
             else:
                 revision = m.group(1)
         else:
             revision = module.revision
-        return Script(module, revision, os.path.join(dir_, filename))
+        return Script(module, revision, dir_ / filename)
diff --git a/libs/alembic/script/revision.py b/libs/alembic/script/revision.py
index c3108e985a..5825da34f4 100644
--- a/libs/alembic/script/revision.py
+++ b/libs/alembic/script/revision.py
@@ -45,7 +45,7 @@
 _TR = TypeVar("_TR", bound=Optional[_RevisionOrStr])
 
 _relative_destination = re.compile(r"(?:(.+?)@)?(\w+)?((?:\+|-)\d+)")
-_revision_illegal_chars = ["@", "-", "+"]
+_revision_illegal_chars = ["@", "-", "+", ":"]
 
 
 class _CollectRevisionsProtocol(Protocol):
@@ -1708,7 +1708,7 @@ def tuple_rev_as_scalar(rev: None) -> None: ...
 
 @overload
 def tuple_rev_as_scalar(
-    rev: Union[Tuple[_T, ...], List[_T]]
+    rev: Union[Tuple[_T, ...], List[_T]],
 ) -> Union[_T, Tuple[_T, ...], List[_T]]: ...
 
 
diff --git a/libs/alembic/script/write_hooks.py b/libs/alembic/script/write_hooks.py
index 9977147921..3dd49d9108 100644
--- a/libs/alembic/script/write_hooks.py
+++ b/libs/alembic/script/write_hooks.py
@@ -3,20 +3,21 @@
 
 from __future__ import annotations
 
+import importlib.util
+import os
 import shlex
 import subprocess
 import sys
 from typing import Any
 from typing import Callable
-from typing import Dict
-from typing import List
-from typing import Mapping
-from typing import Optional
-from typing import Union
+from typing import TYPE_CHECKING
 
 from .. import util
 from ..util import compat
+from ..util.pyfiles import _preserving_path_as_str
 
+if TYPE_CHECKING:
+    from ..config import PostWriteHookConfig
 
 REVISION_SCRIPT_TOKEN = "REVISION_SCRIPT_FILENAME"
 
@@ -43,16 +44,19 @@ def decorate(fn):
 
 
 def _invoke(
-    name: str, revision: str, options: Mapping[str, Union[str, int]]
+    name: str,
+    revision_path: str | os.PathLike[str],
+    options: PostWriteHookConfig,
 ) -> Any:
     """Invokes the formatter registered for the given name.
 
     :param name: The name of a formatter in the registry
-    :param revision: A :class:`.MigrationRevision` instance
+    :param revision: string path to the revision file
     :param options: A dict containing kwargs passed to the
         specified formatter.
     :raises: :class:`alembic.util.CommandError`
     """
+    revision_path = _preserving_path_as_str(revision_path)
     try:
         hook = _registry[name]
     except KeyError as ke:
@@ -60,39 +64,31 @@ def _invoke(
             f"No formatter with name '{name}' registered"
         ) from ke
     else:
-        return hook(revision, options)
+        return hook(revision_path, options)
 
 
-def _run_hooks(path: str, hook_config: Mapping[str, str]) -> None:
+def _run_hooks(
+    path: str | os.PathLike[str], hooks: list[PostWriteHookConfig]
+) -> None:
     """Invoke hooks for a generated revision."""
 
-    from .base import _split_on_space_comma
-
-    names = _split_on_space_comma.split(hook_config.get("hooks", ""))
-
-    for name in names:
-        if not name:
-            continue
-        opts = {
-            key[len(name) + 1 :]: hook_config[key]
-            for key in hook_config
-            if key.startswith(name + ".")
-        }
-        opts["_hook_name"] = name
+    for hook in hooks:
+        name = hook["_hook_name"]
         try:
-            type_ = opts["type"]
+            type_ = hook["type"]
         except KeyError as ke:
             raise util.CommandError(
-                f"Key {name}.type is required for post write hook {name!r}"
+                f"Key '{name}.type' (or 'type' in toml) is required "
+                f"for post write hook {name!r}"
             ) from ke
         else:
             with util.status(
                 f"Running post write hook {name!r}", newline=True
             ):
-                _invoke(type_, path, opts)
+                _invoke(type_, path, hook)
 
 
-def _parse_cmdline_options(cmdline_options_str: str, path: str) -> List[str]:
+def _parse_cmdline_options(cmdline_options_str: str, path: str) -> list[str]:
     """Parse options from a string into a list.
 
     Also substitutes the revision script token with the actual filename of
@@ -113,17 +109,38 @@ def _parse_cmdline_options(cmdline_options_str: str, path: str) -> List[str]:
     return cmdline_options_list
 
 
-@register("console_scripts")
-def console_scripts(
-    path: str, options: dict, ignore_output: bool = False
-) -> None:
+def _get_required_option(options: dict, name: str) -> str:
     try:
-        entrypoint_name = options["entrypoint"]
+        return options[name]
     except KeyError as ke:
         raise util.CommandError(
-            f"Key {options['_hook_name']}.entrypoint is required for post "
+            f"Key {options['_hook_name']}.{name} is required for post "
             f"write hook {options['_hook_name']!r}"
         ) from ke
+
+
+def _run_hook(
+    path: str, options: dict, ignore_output: bool, command: list[str]
+) -> None:
+    cwd: str | None = options.get("cwd", None)
+    cmdline_options_str = options.get("options", "")
+    cmdline_options_list = _parse_cmdline_options(cmdline_options_str, path)
+
+    kw: dict[str, Any] = {}
+    if ignore_output:
+        kw["stdout"] = kw["stderr"] = subprocess.DEVNULL
+
+    subprocess.run([*command, *cmdline_options_list], cwd=cwd, **kw)
+
+
+@register("console_scripts")
+def console_scripts(
+    path: str,
+    options: dict,
+    ignore_output: bool = False,
+    verify_version: tuple[int, ...] | None = None,
+) -> None:
+    entrypoint_name = _get_required_option(options, "entrypoint")
     for entry in compat.importlib_metadata_get("console_scripts"):
         if entry.name == entrypoint_name:
             impl: Any = entry
@@ -132,48 +149,33 @@ def console_scripts(
         raise util.CommandError(
             f"Could not find entrypoint console_scripts.{entrypoint_name}"
         )
-    cwd: Optional[str] = options.get("cwd", None)
-    cmdline_options_str = options.get("options", "")
-    cmdline_options_list = _parse_cmdline_options(cmdline_options_str, path)
 
-    kw: Dict[str, Any] = {}
-    if ignore_output:
-        kw["stdout"] = kw["stderr"] = subprocess.DEVNULL
+    if verify_version:
+        pyscript = (
+            f"import {impl.module}; "
+            f"assert tuple(int(x) for x in {impl.module}.__version__.split('.')) >= {verify_version}, "  # noqa: E501
+            f"'need exactly version {verify_version} of {impl.name}'; "
+            f"{impl.module}.{impl.attr}()"
+        )
+    else:
+        pyscript = f"import {impl.module}; {impl.module}.{impl.attr}()"
 
-    subprocess.run(
-        [
-            sys.executable,
-            "-c",
-            f"import {impl.module}; {impl.module}.{impl.attr}()",
-        ]
-        + cmdline_options_list,
-        cwd=cwd,
-        **kw,
-    )
+    command = [sys.executable, "-c", pyscript]
+    _run_hook(path, options, ignore_output, command)
 
 
 @register("exec")
 def exec_(path: str, options: dict, ignore_output: bool = False) -> None:
-    try:
-        executable = options["executable"]
-    except KeyError as ke:
-        raise util.CommandError(
-            f"Key {options['_hook_name']}.executable is required for post "
-            f"write hook {options['_hook_name']!r}"
-        ) from ke
-    cwd: Optional[str] = options.get("cwd", None)
-    cmdline_options_str = options.get("options", "")
-    cmdline_options_list = _parse_cmdline_options(cmdline_options_str, path)
+    executable = _get_required_option(options, "executable")
+    _run_hook(path, options, ignore_output, command=[executable])
 
-    kw: Dict[str, Any] = {}
-    if ignore_output:
-        kw["stdout"] = kw["stderr"] = subprocess.DEVNULL
 
-    subprocess.run(
-        [
-            executable,
-            *cmdline_options_list,
-        ],
-        cwd=cwd,
-        **kw,
-    )
+@register("module")
+def module(path: str, options: dict, ignore_output: bool = False) -> None:
+    module_name = _get_required_option(options, "module")
+
+    if importlib.util.find_spec(module_name) is None:
+        raise util.CommandError(f"Could not find module {module_name}")
+
+    command = [sys.executable, "-m", module_name]
+    _run_hook(path, options, ignore_output, command)
diff --git a/libs/alembic/templates/async/alembic.ini.mako b/libs/alembic/templates/async/alembic.ini.mako
index 7eee913205..02ccb0f6de 100644
--- a/libs/alembic/templates/async/alembic.ini.mako
+++ b/libs/alembic/templates/async/alembic.ini.mako
@@ -2,21 +2,28 @@
 
 [alembic]
 # path to migration scripts.
-# Use forward slashes (/) also on windows to provide an os agnostic path
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
 script_location = ${script_location}
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
 # Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
 # file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+# Or organize into date-based subdirectories (requires recursive_version_locations = true)
+# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s
 
 # sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
+# defaults to the current working directory.  for multiple paths, the path separator
+# is defined by "path_separator" below.
 prepend_sys_path = .
 
 # timezone to use when rendering the date within the migration file
 # as well as the filename.
-# If specified, requires the python>=3.9 or backports.zoneinfo library.
-# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# If specified, requires the tzdata library which can be installed by adding
+# `alembic[tz]` to the pip requirements.
 # string value is passed to ZoneInfo()
 # leave blank for localtime
 # timezone =
@@ -34,21 +41,38 @@ prepend_sys_path = .
 # sourceless = false
 
 # version location specification; This defaults
-# to ${script_location}/versions.  When using multiple version
+# to <script_location>/versions.  When using multiple version
 # directories, initial revisions must be specified with --version-path.
-# The path separator used here should be the separator specified by "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:${script_location}/versions
-
-# version path separator; As mentioned above, this is the character used to split
-# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
-# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
-# Valid values for version_path_separator are:
+# The path separator used here should be the separator specified by "path_separator"
+# below.
+# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
+
+# path_separator; This indicates what character is used to split lists of file
+# paths, including version_locations and prepend_sys_path within configparser
+# files such as alembic.ini.
+# The default rendered in new alembic.ini files is "os", which uses os.pathsep
+# to provide os-dependent path splitting.
+#
+# Note that in order to support legacy alembic.ini files, this default does NOT
+# take place if path_separator is not present in alembic.ini.  If this
+# option is omitted entirely, fallback logic is as follows:
+#
+# 1. Parsing of the version_locations option falls back to using the legacy
+#    "version_path_separator" key, which if absent then falls back to the legacy
+#    behavior of splitting on spaces and/or commas.
+# 2. Parsing of the prepend_sys_path option falls back to the legacy
+#    behavior of splitting on spaces, commas, or colons.
+#
+# Valid values for path_separator are:
 #
-# version_path_separator = :
-# version_path_separator = ;
-# version_path_separator = space
-# version_path_separator = newline
-version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+# path_separator = :
+# path_separator = ;
+# path_separator = space
+# path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+path_separator = os
+
 
 # set to 'true' to search source files recursively
 # in each "version_locations" directory
@@ -59,6 +83,9 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # are written from script.py.mako
 # output_encoding = utf-8
 
+# database URL.  This is consumed by the user-maintained env.py script only.
+# other means of configuring database URLs may be customized within the env.py
+# file.
 sqlalchemy.url = driver://user:pass@localhost/dbname
 
 
@@ -73,13 +100,20 @@ sqlalchemy.url = driver://user:pass@localhost/dbname
 # black.entrypoint = black
 # black.options = -l 79 REVISION_SCRIPT_FILENAME
 
-# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# hooks = ruff
+# ruff.type = module
+# ruff.module = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Alternatively, use the exec runner to execute a binary found on your PATH
 # hooks = ruff
 # ruff.type = exec
-# ruff.executable = %(here)s/.venv/bin/ruff
-# ruff.options = --fix REVISION_SCRIPT_FILENAME
+# ruff.executable = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
 
-# Logging configuration
+# Logging configuration.  This is also consumed by the user-maintained
+# env.py script only.
 [loggers]
 keys = root,sqlalchemy,alembic
 
diff --git a/libs/alembic/templates/async/script.py.mako b/libs/alembic/templates/async/script.py.mako
index fbc4b07dce..11016301e7 100644
--- a/libs/alembic/templates/async/script.py.mako
+++ b/libs/alembic/templates/async/script.py.mako
@@ -13,14 +13,16 @@ ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.
 revision: str = ${repr(up_revision)}
-down_revision: Union[str, None] = ${repr(down_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
 branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
 depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
 
 
 def upgrade() -> None:
+    """Upgrade schema."""
     ${upgrades if upgrades else "pass"}
 
 
 def downgrade() -> None:
+    """Downgrade schema."""
     ${downgrades if downgrades else "pass"}
diff --git a/libs/alembic/templates/generic/alembic.ini.mako b/libs/alembic/templates/generic/alembic.ini.mako
index f1f76cae80..0127b2af8d 100644
--- a/libs/alembic/templates/generic/alembic.ini.mako
+++ b/libs/alembic/templates/generic/alembic.ini.mako
@@ -1,8 +1,10 @@
 # A generic, single database configuration.
 
 [alembic]
-# path to migration scripts
-# Use forward slashes (/) also on windows to provide an os agnostic path
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
 script_location = ${script_location}
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
@@ -10,15 +12,19 @@ script_location = ${script_location}
 # see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
 # for all available tokens
 # file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+# Or organize into date-based subdirectories (requires recursive_version_locations = true)
+# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s
 
 # sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
+# defaults to the current working directory.  for multiple paths, the path separator
+# is defined by "path_separator" below.
 prepend_sys_path = .
 
+
 # timezone to use when rendering the date within the migration file
 # as well as the filename.
-# If specified, requires the python>=3.9 or backports.zoneinfo library.
-# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# If specified, requires the tzdata library which can be installed by adding
+# `alembic[tz]` to the pip requirements.
 # string value is passed to ZoneInfo()
 # leave blank for localtime
 # timezone =
@@ -36,21 +42,37 @@ prepend_sys_path = .
 # sourceless = false
 
 # version location specification; This defaults
-# to ${script_location}/versions.  When using multiple version
+# to <script_location>/versions.  When using multiple version
 # directories, initial revisions must be specified with --version-path.
-# The path separator used here should be the separator specified by "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:${script_location}/versions
-
-# version path separator; As mentioned above, this is the character used to split
-# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
-# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
-# Valid values for version_path_separator are:
+# The path separator used here should be the separator specified by "path_separator"
+# below.
+# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
+
+# path_separator; This indicates what character is used to split lists of file
+# paths, including version_locations and prepend_sys_path within configparser
+# files such as alembic.ini.
+# The default rendered in new alembic.ini files is "os", which uses os.pathsep
+# to provide os-dependent path splitting.
+#
+# Note that in order to support legacy alembic.ini files, this default does NOT
+# take place if path_separator is not present in alembic.ini.  If this
+# option is omitted entirely, fallback logic is as follows:
+#
+# 1. Parsing of the version_locations option falls back to using the legacy
+#    "version_path_separator" key, which if absent then falls back to the legacy
+#    behavior of splitting on spaces and/or commas.
+# 2. Parsing of the prepend_sys_path option falls back to the legacy
+#    behavior of splitting on spaces, commas, or colons.
 #
-# version_path_separator = :
-# version_path_separator = ;
-# version_path_separator = space
-# version_path_separator = newline
-version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+# Valid values for path_separator are:
+#
+# path_separator = :
+# path_separator = ;
+# path_separator = space
+# path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+path_separator = os
 
 # set to 'true' to search source files recursively
 # in each "version_locations" directory
@@ -61,6 +83,9 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # are written from script.py.mako
 # output_encoding = utf-8
 
+# database URL.  This is consumed by the user-maintained env.py script only.
+# other means of configuring database URLs may be customized within the env.py
+# file.
 sqlalchemy.url = driver://user:pass@localhost/dbname
 
 
@@ -75,13 +100,20 @@ sqlalchemy.url = driver://user:pass@localhost/dbname
 # black.entrypoint = black
 # black.options = -l 79 REVISION_SCRIPT_FILENAME
 
-# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# hooks = ruff
+# ruff.type = module
+# ruff.module = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Alternatively, use the exec runner to execute a binary found on your PATH
 # hooks = ruff
 # ruff.type = exec
-# ruff.executable = %(here)s/.venv/bin/ruff
-# ruff.options = --fix REVISION_SCRIPT_FILENAME
+# ruff.executable = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
 
-# Logging configuration
+# Logging configuration.  This is also consumed by the user-maintained
+# env.py script only.
 [loggers]
 keys = root,sqlalchemy,alembic
 
diff --git a/libs/alembic/templates/generic/script.py.mako b/libs/alembic/templates/generic/script.py.mako
index fbc4b07dce..11016301e7 100644
--- a/libs/alembic/templates/generic/script.py.mako
+++ b/libs/alembic/templates/generic/script.py.mako
@@ -13,14 +13,16 @@ ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.
 revision: str = ${repr(up_revision)}
-down_revision: Union[str, None] = ${repr(down_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
 branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
 depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
 
 
 def upgrade() -> None:
+    """Upgrade schema."""
     ${upgrades if upgrades else "pass"}
 
 
 def downgrade() -> None:
+    """Downgrade schema."""
     ${downgrades if downgrades else "pass"}
diff --git a/libs/alembic/templates/multidb/alembic.ini.mako b/libs/alembic/templates/multidb/alembic.ini.mako
index bf383ea1de..76846465be 100644
--- a/libs/alembic/templates/multidb/alembic.ini.mako
+++ b/libs/alembic/templates/multidb/alembic.ini.mako
@@ -1,8 +1,10 @@
 # a multi-database configuration.
 
 [alembic]
-# path to migration scripts
-# Use forward slashes (/) also on windows to provide an os agnostic path
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
 script_location = ${script_location}
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
@@ -10,15 +12,18 @@ script_location = ${script_location}
 # see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
 # for all available tokens
 # file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+# Or organize into date-based subdirectories (requires recursive_version_locations = true)
+# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s
 
 # sys.path path, will be prepended to sys.path if present.
-# defaults to the current working directory.
+# defaults to the current working directory.  for multiple paths, the path separator
+# is defined by "path_separator" below.
 prepend_sys_path = .
 
 # timezone to use when rendering the date within the migration file
 # as well as the filename.
-# If specified, requires the python>=3.9 or backports.zoneinfo library.
-# Any required deps can installed by adding `alembic[tz]` to the pip requirements
+# If specified, requires the tzdata library which can be installed by adding
+# `alembic[tz]` to the pip requirements.
 # string value is passed to ZoneInfo()
 # leave blank for localtime
 # timezone =
@@ -36,21 +41,37 @@ prepend_sys_path = .
 # sourceless = false
 
 # version location specification; This defaults
-# to ${script_location}/versions.  When using multiple version
+# to <script_location>/versions.  When using multiple version
 # directories, initial revisions must be specified with --version-path.
-# The path separator used here should be the separator specified by "version_path_separator" below.
-# version_locations = %(here)s/bar:%(here)s/bat:${script_location}/versions
-
-# version path separator; As mentioned above, this is the character used to split
-# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
-# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
-# Valid values for version_path_separator are:
+# The path separator used here should be the separator specified by "path_separator"
+# below.
+# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
+
+# path_separator; This indicates what character is used to split lists of file
+# paths, including version_locations and prepend_sys_path within configparser
+# files such as alembic.ini.
+# The default rendered in new alembic.ini files is "os", which uses os.pathsep
+# to provide os-dependent path splitting.
+#
+# Note that in order to support legacy alembic.ini files, this default does NOT
+# take place if path_separator is not present in alembic.ini.  If this
+# option is omitted entirely, fallback logic is as follows:
+#
+# 1. Parsing of the version_locations option falls back to using the legacy
+#    "version_path_separator" key, which if absent then falls back to the legacy
+#    behavior of splitting on spaces and/or commas.
+# 2. Parsing of the prepend_sys_path option falls back to the legacy
+#    behavior of splitting on spaces, commas, or colons.
+#
+# Valid values for path_separator are:
 #
-# version_path_separator = :
-# version_path_separator = ;
-# version_path_separator = space
-# version_path_separator = newline
-version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+# path_separator = :
+# path_separator = ;
+# path_separator = space
+# path_separator = newline
+#
+# Use os.pathsep. Default configuration used for new projects.
+path_separator = os
 
 # set to 'true' to search source files recursively
 # in each "version_locations" directory
@@ -61,6 +82,13 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # are written from script.py.mako
 # output_encoding = utf-8
 
+# for multiple database configuration, new named sections are added
+# which each include a distinct ``sqlalchemy.url`` entry.  A custom value
+# ``databases`` is added which indicates a listing of the per-database sections.
+# The ``databases`` entry as well as the URLs present in the ``[engine1]``
+# and ``[engine2]`` sections continue to be consumed by the user-maintained env.py
+# script only.
+
 databases = engine1, engine2
 
 [engine1]
@@ -80,13 +108,20 @@ sqlalchemy.url = driver://user:pass@localhost/dbname2
 # black.entrypoint = black
 # black.options = -l 79 REVISION_SCRIPT_FILENAME
 
-# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# hooks = ruff
+# ruff.type = module
+# ruff.module = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
+
+# Alternatively, use the exec runner to execute a binary found on your PATH
 # hooks = ruff
 # ruff.type = exec
-# ruff.executable = %(here)s/.venv/bin/ruff
-# ruff.options = --fix REVISION_SCRIPT_FILENAME
+# ruff.executable = ruff
+# ruff.options = check --fix REVISION_SCRIPT_FILENAME
 
-# Logging configuration
+# Logging configuration.  This is also consumed by the user-maintained
+# env.py script only.
 [loggers]
 keys = root,sqlalchemy,alembic
 
diff --git a/libs/alembic/templates/multidb/script.py.mako b/libs/alembic/templates/multidb/script.py.mako
index 6108b8a0dc..8e667d84c8 100644
--- a/libs/alembic/templates/multidb/script.py.mako
+++ b/libs/alembic/templates/multidb/script.py.mako
@@ -16,16 +16,18 @@ ${imports if imports else ""}
 
 # revision identifiers, used by Alembic.
 revision: str = ${repr(up_revision)}
-down_revision: Union[str, None] = ${repr(down_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
 branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
 depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
 
 
 def upgrade(engine_name: str) -> None:
+    """Upgrade schema."""
     globals()["upgrade_%s" % engine_name]()
 
 
 def downgrade(engine_name: str) -> None:
+    """Downgrade schema."""
     globals()["downgrade_%s" % engine_name]()
 
 <%
@@ -38,10 +40,12 @@ def downgrade(engine_name: str) -> None:
 % for db_name in re.split(r',\s*', db_names):
 
 def upgrade_${db_name}() -> None:
+    """Upgrade ${db_name} schema."""
     ${context.get("%s_upgrades" % db_name, "pass")}
 
 
 def downgrade_${db_name}() -> None:
+    """Downgrade ${db_name} schema."""
     ${context.get("%s_downgrades" % db_name, "pass")}
 
 % endfor
diff --git a/libs/alembic/templates/pyproject/README b/libs/alembic/templates/pyproject/README
new file mode 100644
index 0000000000..fdacc05f68
--- /dev/null
+++ b/libs/alembic/templates/pyproject/README
@@ -0,0 +1 @@
+pyproject configuration, based on the generic configuration.
\ No newline at end of file
diff --git a/libs/alembic/templates/pyproject/alembic.ini.mako b/libs/alembic/templates/pyproject/alembic.ini.mako
new file mode 100644
index 0000000000..3d10f0e46c
--- /dev/null
+++ b/libs/alembic/templates/pyproject/alembic.ini.mako
@@ -0,0 +1,44 @@
+# A generic, single database configuration.
+
+[alembic]
+
+# database URL.  This is consumed by the user-maintained env.py script only.
+# other means of configuring database URLs may be customized within the env.py
+# file.
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/libs/alembic/templates/pyproject/env.py b/libs/alembic/templates/pyproject/env.py
new file mode 100644
index 0000000000..36112a3c68
--- /dev/null
+++ b/libs/alembic/templates/pyproject/env.py
@@ -0,0 +1,78 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/libs/alembic/templates/pyproject/pyproject.toml.mako b/libs/alembic/templates/pyproject/pyproject.toml.mako
new file mode 100644
index 0000000000..7edd43b0c9
--- /dev/null
+++ b/libs/alembic/templates/pyproject/pyproject.toml.mako
@@ -0,0 +1,84 @@
+[tool.alembic]
+
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
+script_location = "${script_location}"
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = "%%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s"
+# Or organize into date-based subdirectories (requires recursive_version_locations = true)
+# file_template = "%%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s"
+
+# additional paths to be prepended to sys.path. defaults to the current working directory.
+prepend_sys_path = [
+    "."
+]
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the tzdata library which can be installed by adding
+# `alembic[tz]` to the pip requirements.
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to <script_location>/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# version_locations = [
+#    "%(here)s/alembic/versions",
+#    "%(here)s/foo/bar"
+# ]
+
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = "utf-8"
+
+# This section defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+# [[tool.alembic.post_write_hooks]]
+# format using "black" - use the console_scripts runner,
+# against the "black" entrypoint
+# name = "black"
+# type = "console_scripts"
+# entrypoint = "black"
+# options = "-l 79 REVISION_SCRIPT_FILENAME"
+#
+# [[tool.alembic.post_write_hooks]]
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# name = "ruff"
+# type = "module"
+# module = "ruff"
+# options = "check --fix REVISION_SCRIPT_FILENAME"
+#
+# [[tool.alembic.post_write_hooks]]
+# Alternatively, use the exec runner to execute a binary found on your PATH
+# name = "ruff"
+# type = "exec"
+# executable = "ruff"
+# options = "check --fix REVISION_SCRIPT_FILENAME"
+
diff --git a/libs/alembic/templates/pyproject/script.py.mako b/libs/alembic/templates/pyproject/script.py.mako
new file mode 100644
index 0000000000..11016301e7
--- /dev/null
+++ b/libs/alembic/templates/pyproject/script.py.mako
@@ -0,0 +1,28 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    ${downgrades if downgrades else "pass"}
diff --git a/libs/alembic/templates/pyproject_async/README b/libs/alembic/templates/pyproject_async/README
new file mode 100644
index 0000000000..dfd718d3b9
--- /dev/null
+++ b/libs/alembic/templates/pyproject_async/README
@@ -0,0 +1 @@
+pyproject configuration, with an async dbapi.
\ No newline at end of file
diff --git a/libs/alembic/templates/pyproject_async/alembic.ini.mako b/libs/alembic/templates/pyproject_async/alembic.ini.mako
new file mode 100644
index 0000000000..3d10f0e46c
--- /dev/null
+++ b/libs/alembic/templates/pyproject_async/alembic.ini.mako
@@ -0,0 +1,44 @@
+# A generic, single database configuration.
+
+[alembic]
+
+# database URL.  This is consumed by the user-maintained env.py script only.
+# other means of configuring database URLs may be customized within the env.py
+# file.
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S
diff --git a/libs/alembic/templates/pyproject_async/env.py b/libs/alembic/templates/pyproject_async/env.py
new file mode 100644
index 0000000000..9f2d519400
--- /dev/null
+++ b/libs/alembic/templates/pyproject_async/env.py
@@ -0,0 +1,89 @@
+import asyncio
+from logging.config import fileConfig
+
+from sqlalchemy import pool
+from sqlalchemy.engine import Connection
+from sqlalchemy.ext.asyncio import async_engine_from_config
+
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = None
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def do_run_migrations(connection: Connection) -> None:
+    context.configure(connection=connection, target_metadata=target_metadata)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+async def run_async_migrations() -> None:
+    """In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+
+    connectable = async_engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    async with connectable.connect() as connection:
+        await connection.run_sync(do_run_migrations)
+
+    await connectable.dispose()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode."""
+
+    asyncio.run(run_async_migrations())
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()
diff --git a/libs/alembic/templates/pyproject_async/pyproject.toml.mako b/libs/alembic/templates/pyproject_async/pyproject.toml.mako
new file mode 100644
index 0000000000..7edd43b0c9
--- /dev/null
+++ b/libs/alembic/templates/pyproject_async/pyproject.toml.mako
@@ -0,0 +1,84 @@
+[tool.alembic]
+
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
+script_location = "${script_location}"
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = "%%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s"
+# Or organize into date-based subdirectories (requires recursive_version_locations = true)
+# file_template = "%%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s"
+
+# additional paths to be prepended to sys.path. defaults to the current working directory.
+prepend_sys_path = [
+    "."
+]
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the tzdata library which can be installed by adding
+# `alembic[tz]` to the pip requirements.
+# string value is passed to ZoneInfo()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to <script_location>/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# version_locations = [
+#    "%(here)s/alembic/versions",
+#    "%(here)s/foo/bar"
+# ]
+
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = "utf-8"
+
+# This section defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+# [[tool.alembic.post_write_hooks]]
+# format using "black" - use the console_scripts runner,
+# against the "black" entrypoint
+# name = "black"
+# type = "console_scripts"
+# entrypoint = "black"
+# options = "-l 79 REVISION_SCRIPT_FILENAME"
+#
+# [[tool.alembic.post_write_hooks]]
+# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
+# name = "ruff"
+# type = "module"
+# module = "ruff"
+# options = "check --fix REVISION_SCRIPT_FILENAME"
+#
+# [[tool.alembic.post_write_hooks]]
+# Alternatively, use the exec runner to execute a binary found on your PATH
+# name = "ruff"
+# type = "exec"
+# executable = "ruff"
+# options = "check --fix REVISION_SCRIPT_FILENAME"
+
diff --git a/libs/alembic/templates/pyproject_async/script.py.mako b/libs/alembic/templates/pyproject_async/script.py.mako
new file mode 100644
index 0000000000..11016301e7
--- /dev/null
+++ b/libs/alembic/templates/pyproject_async/script.py.mako
@@ -0,0 +1,28 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    ${downgrades if downgrades else "pass"}
diff --git a/libs/alembic/testing/__init__.py b/libs/alembic/testing/__init__.py
index 0407adfe9c..32915081d9 100644
--- a/libs/alembic/testing/__init__.py
+++ b/libs/alembic/testing/__init__.py
@@ -9,12 +9,15 @@
 from sqlalchemy.testing.config import combinations
 from sqlalchemy.testing.config import fixture
 from sqlalchemy.testing.config import requirements as requires
+from sqlalchemy.testing.config import Variation
+from sqlalchemy.testing.config import variation
 
 from .assertions import assert_raises
 from .assertions import assert_raises_message
 from .assertions import emits_python_deprecation_warning
 from .assertions import eq_
 from .assertions import eq_ignore_whitespace
+from .assertions import expect_deprecated
 from .assertions import expect_raises
 from .assertions import expect_raises_message
 from .assertions import expect_sqlalchemy_deprecated
diff --git a/libs/alembic/testing/assertions.py b/libs/alembic/testing/assertions.py
index e071697cd7..e76103d5f3 100644
--- a/libs/alembic/testing/assertions.py
+++ b/libs/alembic/testing/assertions.py
@@ -8,6 +8,7 @@
 
 from sqlalchemy import exc as sa_exc
 from sqlalchemy.engine import default
+from sqlalchemy.engine import URL
 from sqlalchemy.testing.assertions import _expect_warnings
 from sqlalchemy.testing.assertions import eq_  # noqa
 from sqlalchemy.testing.assertions import is_  # noqa
@@ -17,8 +18,6 @@
 from sqlalchemy.testing.assertions import ne_  # noqa
 from sqlalchemy.util import decorator
 
-from ..util import sqla_compat
-
 
 def _assert_proper_exception_context(exception):
     """assert that any exception we're catching does not have a __context__
@@ -127,12 +126,13 @@ def _get_dialect(name):
     if name is None or name == "default":
         return default.DefaultDialect()
     else:
-        d = sqla_compat._create_url(name).get_dialect()()
+        d = URL.create(name).get_dialect()()
 
         if name == "postgresql":
             d.implicit_returning = True
         elif name == "mssql":
             d.legacy_schema_aliasing = False
+            d.default_schema_name = "dbo"
         return d
 
 
@@ -168,6 +168,10 @@ def decorate(fn, *args, **kw):
     return decorate
 
 
+def expect_deprecated(*messages, **kw):
+    return _expect_warnings(DeprecationWarning, messages, **kw)
+
+
 def expect_sqlalchemy_deprecated(*messages, **kw):
     return _expect_warnings(sa_exc.SADeprecationWarning, messages, **kw)
 
diff --git a/libs/alembic/testing/env.py b/libs/alembic/testing/env.py
index c37b4d3032..ad4de78353 100644
--- a/libs/alembic/testing/env.py
+++ b/libs/alembic/testing/env.py
@@ -1,5 +1,7 @@
 import importlib.machinery
+import logging
 import os
+from pathlib import Path
 import shutil
 import textwrap
 
@@ -16,15 +18,37 @@
 
 def _get_staging_directory():
     if provision.FOLLOWER_IDENT:
-        return "scratch_%s" % provision.FOLLOWER_IDENT
+        return f"scratch_{provision.FOLLOWER_IDENT}"
     else:
         return "scratch"
 
 
+_restore_log = None
+
+
+def _replace_logger():
+    global _restore_log
+    if _restore_log is None:
+        _restore_log = (logging.root, logging.Logger.manager)
+        logging.root = logging.RootLogger(logging.WARNING)
+        logging.Logger.root = logging.root
+        logging.Logger.manager = logging.Manager(logging.root)
+
+
+def _restore_logger():
+    global _restore_log
+
+    if _restore_log is not None:
+        logging.root, logging.Logger.manager = _restore_log
+        logging.Logger.root = logging.root
+        _restore_log = None
+
+
 def staging_env(create=True, template="generic", sourceless=False):
+    _replace_logger()
     cfg = _testing_config()
     if create:
-        path = os.path.join(_get_staging_directory(), "scripts")
+        path = _join_path(_get_staging_directory(), "scripts")
         assert not os.path.exists(path), (
             "staging directory %s already exists; poor cleanup?" % path
         )
@@ -47,7 +71,7 @@ def staging_env(create=True, template="generic", sourceless=False):
                 "pep3147_everything",
             ), sourceless
             make_sourceless(
-                os.path.join(path, "env.py"),
+                _join_path(path, "env.py"),
                 "pep3147" if "pep3147" in sourceless else "simple",
             )
 
@@ -60,17 +84,18 @@ def clear_staging_env():
 
     engines.testing_reaper.close_all()
     shutil.rmtree(_get_staging_directory(), True)
+    _restore_logger()
 
 
 def script_file_fixture(txt):
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
-    path = os.path.join(dir_, "script.py.mako")
+    dir_ = _join_path(_get_staging_directory(), "scripts")
+    path = _join_path(dir_, "script.py.mako")
     with open(path, "w") as f:
         f.write(txt)
 
 
 def env_file_fixture(txt):
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
+    dir_ = _join_path(_get_staging_directory(), "scripts")
     txt = (
         """
 from alembic import context
@@ -80,7 +105,7 @@ def env_file_fixture(txt):
         + txt
     )
 
-    path = os.path.join(dir_, "env.py")
+    path = _join_path(dir_, "env.py")
     pyc_path = util.pyc_file_from_path(path)
     if pyc_path:
         os.unlink(pyc_path)
@@ -90,26 +115,26 @@ def env_file_fixture(txt):
 
 
 def _sqlite_file_db(tempname="foo.db", future=False, scope=None, **options):
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
+    dir_ = _join_path(_get_staging_directory(), "scripts")
     url = "sqlite:///%s/%s" % (dir_, tempname)
-    if scope and util.sqla_14:
+    if scope:
         options["scope"] = scope
     return testing_util.testing_engine(url=url, future=future, options=options)
 
 
 def _sqlite_testing_config(sourceless=False, future=False):
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
-    url = "sqlite:///%s/foo.db" % dir_
+    dir_ = _join_path(_get_staging_directory(), "scripts")
+    url = f"sqlite:///{dir_}/foo.db"
 
     sqlalchemy_future = future or ("future" in config.db.__class__.__module__)
 
     return _write_config_file(
-        """
+        f"""
 [alembic]
-script_location = %s
-sqlalchemy.url = %s
-sourceless = %s
-%s
+script_location = {dir_}
+sqlalchemy.url = {url}
+sourceless = {"true" if sourceless else "false"}
+{"sqlalchemy.future = true" if sqlalchemy_future else ""}
 
 [loggers]
 keys = root,sqlalchemy
@@ -140,29 +165,25 @@ class = StreamHandler
 format = %%(levelname)-5.5s [%%(name)s] %%(message)s
 datefmt = %%H:%%M:%%S
     """
-        % (
-            dir_,
-            url,
-            "true" if sourceless else "false",
-            "sqlalchemy.future = true" if sqlalchemy_future else "",
-        )
     )
 
 
 def _multi_dir_testing_config(sourceless=False, extra_version_location=""):
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
+    dir_ = _join_path(_get_staging_directory(), "scripts")
     sqlalchemy_future = "future" in config.db.__class__.__module__
 
     url = "sqlite:///%s/foo.db" % dir_
 
     return _write_config_file(
-        """
+        f"""
 [alembic]
-script_location = %s
-sqlalchemy.url = %s
-sqlalchemy.future = %s
-sourceless = %s
-version_locations = %%(here)s/model1/ %%(here)s/model2/ %%(here)s/model3/ %s
+script_location = {dir_}
+sqlalchemy.url = {url}
+sqlalchemy.future = {"true" if sqlalchemy_future else "false"}
+sourceless = {"true" if sourceless else "false"}
+path_separator = space
+version_locations = %(here)s/model1/ %(here)s/model2/ %(here)s/model3/ \
+{extra_version_location}
 
 [loggers]
 keys = root
@@ -188,26 +209,63 @@ class = StreamHandler
 format = %%(levelname)-5.5s [%%(name)s] %%(message)s
 datefmt = %%H:%%M:%%S
     """
-        % (
-            dir_,
-            url,
-            "true" if sqlalchemy_future else "false",
-            "true" if sourceless else "false",
-            extra_version_location,
-        )
+    )
+
+
+def _no_sql_pyproject_config(dialect="postgresql", directives=""):
+    """use a postgresql url with no host so that
+    connections guaranteed to fail"""
+    dir_ = _join_path(_get_staging_directory(), "scripts")
+
+    return _write_toml_config(
+        f"""
+[tool.alembic]
+script_location ="{dir_}"
+{textwrap.dedent(directives)}
+
+        """,
+        f"""
+[alembic]
+sqlalchemy.url = {dialect}://
+
+[loggers]
+keys = root
+
+[handlers]
+keys = console
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatters]
+keys = generic
+
+[formatter_generic]
+format = %%(levelname)-5.5s [%%(name)s] %%(message)s
+datefmt = %%H:%%M:%%S
+
+""",
     )
 
 
 def _no_sql_testing_config(dialect="postgresql", directives=""):
     """use a postgresql url with no host so that
     connections guaranteed to fail"""
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
+    dir_ = _join_path(_get_staging_directory(), "scripts")
     return _write_config_file(
-        """
+        f"""
 [alembic]
-script_location = %s
-sqlalchemy.url = %s://
-%s
+script_location ={dir_}
+sqlalchemy.url = {dialect}://
+{directives}
 
 [loggers]
 keys = root
@@ -234,10 +292,16 @@ class = StreamHandler
 datefmt = %%H:%%M:%%S
 
 """
-        % (dir_, dialect, directives)
     )
 
 
+def _write_toml_config(tomltext, initext):
+    cfg = _write_config_file(initext)
+    with open(cfg.toml_file_name, "w") as f:
+        f.write(tomltext)
+    return cfg
+
+
 def _write_config_file(text):
     cfg = _testing_config()
     with open(cfg.config_file_name, "w") as f:
@@ -250,7 +314,10 @@ def _testing_config():
 
     if not os.access(_get_staging_directory(), os.F_OK):
         os.mkdir(_get_staging_directory())
-    return Config(os.path.join(_get_staging_directory(), "test_alembic.ini"))
+    return Config(
+        _join_path(_get_staging_directory(), "test_alembic.ini"),
+        _join_path(_get_staging_directory(), "pyproject.toml"),
+    )
 
 
 def write_script(
@@ -270,9 +337,7 @@ def write_script(
     script = Script._from_path(scriptdir, path)
     old = scriptdir.revision_map.get_revision(script.revision)
     if old.down_revision != script.down_revision:
-        raise Exception(
-            "Can't change down_revision " "on a refresh operation."
-        )
+        raise Exception("Can't change down_revision on a refresh operation.")
     scriptdir.revision_map.add_revision(script, _replace=True)
 
     if sourceless:
@@ -312,9 +377,9 @@ def three_rev_fixture(cfg):
     write_script(
         script,
         a,
-        """\
+        f"""\
 "Rev A"
-revision = '%s'
+revision = '{a}'
 down_revision = None
 
 from alembic import op
@@ -327,8 +392,7 @@ def upgrade():
 def downgrade():
     op.execute("DROP STEP 1")
 
-"""
-        % a,
+""",
     )
 
     script.generate_revision(b, "revision b", refresh=True, head=a)
@@ -358,10 +422,10 @@ def downgrade():
     write_script(
         script,
         c,
-        """\
+        f"""\
 "Rev C"
-revision = '%s'
-down_revision = '%s'
+revision = '{c}'
+down_revision = '{b}'
 
 from alembic import op
 
@@ -373,8 +437,7 @@ def upgrade():
 def downgrade():
     op.execute("DROP STEP 3")
 
-"""
-        % (c, b),
+""",
     )
     return a, b, c
 
@@ -396,10 +459,10 @@ def multi_heads_fixture(cfg, a, b, c):
     write_script(
         script,
         d,
-        """\
+        f"""\
 "Rev D"
-revision = '%s'
-down_revision = '%s'
+revision = '{d}'
+down_revision = '{b}'
 
 from alembic import op
 
@@ -411,8 +474,7 @@ def upgrade():
 def downgrade():
     op.execute("DROP STEP 4")
 
-"""
-        % (d, b),
+""",
     )
 
     script.generate_revision(
@@ -421,10 +483,10 @@ def downgrade():
     write_script(
         script,
         e,
-        """\
+        f"""\
 "Rev E"
-revision = '%s'
-down_revision = '%s'
+revision = '{e}'
+down_revision = '{d}'
 
 from alembic import op
 
@@ -436,8 +498,7 @@ def upgrade():
 def downgrade():
     op.execute("DROP STEP 5")
 
-"""
-        % (e, d),
+""",
     )
 
     script.generate_revision(
@@ -446,10 +507,10 @@ def downgrade():
     write_script(
         script,
         f,
-        """\
+        f"""\
 "Rev F"
-revision = '%s'
-down_revision = '%s'
+revision = '{f}'
+down_revision = '{b}'
 
 from alembic import op
 
@@ -461,8 +522,7 @@ def upgrade():
 def downgrade():
     op.execute("DROP STEP 6")
 
-"""
-        % (f, b),
+""",
     )
 
     return d, e, f
@@ -471,25 +531,25 @@ def downgrade():
 def _multidb_testing_config(engines):
     """alembic.ini fixture to work exactly with the 'multidb' template"""
 
-    dir_ = os.path.join(_get_staging_directory(), "scripts")
+    dir_ = _join_path(_get_staging_directory(), "scripts")
 
     sqlalchemy_future = "future" in config.db.__class__.__module__
 
     databases = ", ".join(engines.keys())
     engines = "\n\n".join(
-        "[%s]\n" "sqlalchemy.url = %s" % (key, value.url)
+        f"[{key}]\nsqlalchemy.url = {value.url}"
         for key, value in engines.items()
     )
 
     return _write_config_file(
-        """
+        f"""
 [alembic]
-script_location = %s
+script_location = {dir_}
 sourceless = false
-sqlalchemy.future = %s
-databases = %s
+sqlalchemy.future = {"true" if sqlalchemy_future else "false"}
+databases = {databases}
 
-%s
+{engines}
 [loggers]
 keys = root
 
@@ -514,5 +574,8 @@ class = StreamHandler
 format = %%(levelname)-5.5s [%%(name)s] %%(message)s
 datefmt = %%H:%%M:%%S
     """
-        % (dir_, "true" if sqlalchemy_future else "false", databases, engines)
     )
+
+
+def _join_path(base: str, *more: str):
+    return str(Path(base).joinpath(*more).as_posix())
diff --git a/libs/alembic/testing/fixtures.py b/libs/alembic/testing/fixtures.py
index 3b5ce596e6..73e421259d 100644
--- a/libs/alembic/testing/fixtures.py
+++ b/libs/alembic/testing/fixtures.py
@@ -3,11 +3,17 @@
 import configparser
 from contextlib import contextmanager
 import io
+import os
 import re
+import shutil
 from typing import Any
 from typing import Dict
+from typing import Generator
+from typing import Literal
+from typing import overload
 
 from sqlalchemy import Column
+from sqlalchemy import create_mock_engine
 from sqlalchemy import inspect
 from sqlalchemy import MetaData
 from sqlalchemy import String
@@ -17,20 +23,20 @@
 from sqlalchemy.testing import config
 from sqlalchemy.testing import mock
 from sqlalchemy.testing.assertions import eq_
+from sqlalchemy.testing.fixtures import FutureEngineMixin
 from sqlalchemy.testing.fixtures import TablesTest as SQLAlchemyTablesTest
 from sqlalchemy.testing.fixtures import TestBase as SQLAlchemyTestBase
+from sqlalchemy.testing.util import drop_all_tables_from_metadata
 
 import alembic
 from .assertions import _get_dialect
+from .env import _get_staging_directory
 from ..environment import EnvironmentContext
 from ..migration import MigrationContext
 from ..operations import Operations
 from ..util import sqla_compat
-from ..util.sqla_compat import create_mock_engine
-from ..util.sqla_compat import sqla_14
 from ..util.sqla_compat import sqla_2
 
-
 testing_config = configparser.ConfigParser()
 testing_config.read(["test.cfg"])
 
@@ -38,6 +44,31 @@
 class TestBase(SQLAlchemyTestBase):
     is_sqlalchemy_future = sqla_2
 
+    @testing.fixture()
+    def clear_staging_dir(self):
+        yield
+        location = _get_staging_directory()
+        for filename in os.listdir(location):
+            file_path = os.path.join(location, filename)
+            if os.path.isfile(file_path) or os.path.islink(file_path):
+                os.unlink(file_path)
+            elif os.path.isdir(file_path):
+                shutil.rmtree(file_path)
+
+    @contextmanager
+    def pushd(self, dirname) -> Generator[None, None, None]:
+        current_dir = os.getcwd()
+        try:
+            os.chdir(dirname)
+            yield
+        finally:
+            os.chdir(current_dir)
+
+    @testing.fixture()
+    def pop_alembic_config_env(self):
+        yield
+        os.environ.pop("ALEMBIC_CONFIG", None)
+
     @testing.fixture()
     def ops_context(self, migration_context):
         with migration_context.begin_transaction(_per_migration=True):
@@ -57,20 +88,61 @@ def as_sql_migration_context(self, connection):
 
     @testing.fixture
     def connection(self):
+        global _connection_fixture_connection
+
         with config.db.connect() as conn:
+            _connection_fixture_connection = conn
             yield conn
 
+            _connection_fixture_connection = None
 
-class TablesTest(TestBase, SQLAlchemyTablesTest):
-    pass
+    @testing.fixture
+    def restore_operations(self):
+        """Restore runners for modified operations"""
+
+        saved_impls = None
+        op_cls = None
+
+        def _save_attrs(_op_cls):
+            nonlocal saved_impls, op_cls
+            saved_impls = _op_cls._to_impl._registry.copy()
+            op_cls = _op_cls
+
+        yield _save_attrs
+
+        if op_cls is not None and saved_impls is not None:
+            op_cls._to_impl._registry = saved_impls
+
+    @config.fixture()
+    def metadata(self, request):
+        """Provide bound MetaData for a single test, dropping afterwards."""
+
+        from sqlalchemy.sql import schema
+
+        metadata = schema.MetaData()
+        request.instance.metadata = metadata
+        yield metadata
+        del request.instance.metadata
+
+        if (
+            _connection_fixture_connection
+            and _connection_fixture_connection.in_transaction()
+        ):
+            trans = _connection_fixture_connection.get_transaction()
+            trans.rollback()
+            with _connection_fixture_connection.begin():
+                drop_all_tables_from_metadata(
+                    metadata, _connection_fixture_connection
+                )
+        else:
+            drop_all_tables_from_metadata(metadata, config.db)
 
 
-if sqla_14:
-    from sqlalchemy.testing.fixtures import FutureEngineMixin
-else:
+_connection_fixture_connection = None
 
-    class FutureEngineMixin:  # type:ignore[no-redef]
-        __requires__ = ("sqlalchemy_14",)
+
+class TablesTest(TestBase, SQLAlchemyTablesTest):
+    pass
 
 
 FutureEngineMixin.is_sqlalchemy_future = True
@@ -89,8 +161,24 @@ def dump(sql, *multiparams, **params):
 _engs: Dict[Any, Any] = {}
 
 
+@overload
+@contextmanager
+def capture_context_buffer(
+    bytes_io: Literal[True], **kw: Any
+) -> Generator[io.BytesIO, None, None]: ...
+
+
+@overload
 @contextmanager
-def capture_context_buffer(**kw):
+def capture_context_buffer(
+    **kw: Any,
+) -> Generator[io.StringIO, None, None]: ...
+
+
+@contextmanager
+def capture_context_buffer(
+    **kw: Any,
+) -> Generator[io.StringIO | io.BytesIO, None, None]:
     if kw.pop("bytes_io", False):
         buf = io.BytesIO()
     else:
@@ -108,7 +196,9 @@ def configure(*arg, **opt):
 
 
 @contextmanager
-def capture_engine_context_buffer(**kw):
+def capture_engine_context_buffer(
+    **kw: Any,
+) -> Generator[io.StringIO, None, None]:
     from .env import _sqlite_file_db
     from sqlalchemy import event
 
@@ -190,12 +280,8 @@ def assert_contains(self, sql):
         opts["as_sql"] = as_sql
     if literal_binds:
         opts["literal_binds"] = literal_binds
-    if not sqla_14 and dialect == "mariadb":
-        ctx_dialect = _get_dialect("mysql")
-        ctx_dialect.server_version_info = (10, 4, 0, "MariaDB")
 
-    else:
-        ctx_dialect = _get_dialect(dialect)
+    ctx_dialect = _get_dialect(dialect)
     if native_boolean is not None:
         ctx_dialect.supports_native_boolean = native_boolean
         # this is new as of SQLAlchemy 1.2.7 and is used by SQL Server,
diff --git a/libs/alembic/testing/requirements.py b/libs/alembic/testing/requirements.py
index 6e07e28ea4..1b217c937a 100644
--- a/libs/alembic/testing/requirements.py
+++ b/libs/alembic/testing/requirements.py
@@ -1,7 +1,6 @@
 from sqlalchemy.testing.requirements import Requirements
 
 from alembic import util
-from alembic.util import sqla_compat
 from ..testing import exclusions
 
 
@@ -74,13 +73,6 @@ def reflects_pk_names(self):
     def reflects_fk_options(self):
         return exclusions.closed()
 
-    @property
-    def sqlalchemy_14(self):
-        return exclusions.skip_if(
-            lambda config: not util.sqla_14,
-            "SQLAlchemy 1.4 or greater required",
-        )
-
     @property
     def sqlalchemy_1x(self):
         return exclusions.skip_if(
@@ -105,7 +97,7 @@ def go(config):
             else:
                 return True
 
-        return self.sqlalchemy_14 + exclusions.only_if(go)
+        return exclusions.only_if(go)
 
     @property
     def comments(self):
@@ -122,24 +114,13 @@ def computed_columns(self):
         return exclusions.closed()
 
     @property
-    def computed_columns_api(self):
-        return exclusions.only_if(
-            exclusions.BooleanPredicate(sqla_compat.has_computed)
-        )
-
-    @property
-    def computed_reflects_normally(self):
-        return exclusions.only_if(
-            exclusions.BooleanPredicate(sqla_compat.has_computed_reflection)
-        )
-
-    @property
-    def computed_reflects_as_server_default(self):
-        return exclusions.closed()
+    def computed_columns_warn_no_persisted(self):
+        def go(config):
+            return hasattr(
+                config.db.dialect, "supports_virtual_generated_columns"
+            )
 
-    @property
-    def computed_doesnt_reflect_as_server_default(self):
-        return exclusions.closed()
+        return exclusions.only_if("postgresql<18") + exclusions.only_if(go)
 
     @property
     def autoincrement_on_composite_pk(self):
@@ -183,6 +164,10 @@ def fk_deferrable_is_reflected(self):
 
     @property
     def fk_names(self):
+        return self.foreign_key_name_reflection
+
+    @property
+    def foreign_key_name_reflection(self):
         return exclusions.open()
 
     @property
@@ -202,9 +187,3 @@ def identity_columns(self):
     @property
     def identity_columns_alter(self):
         return exclusions.closed()
-
-    @property
-    def identity_columns_api(self):
-        return exclusions.only_if(
-            exclusions.BooleanPredicate(sqla_compat.has_identity)
-        )
diff --git a/libs/alembic/testing/suite/_autogen_fixtures.py b/libs/alembic/testing/suite/_autogen_fixtures.py
index d838ebef10..8329a1ac89 100644
--- a/libs/alembic/testing/suite/_autogen_fixtures.py
+++ b/libs/alembic/testing/suite/_autogen_fixtures.py
@@ -2,6 +2,8 @@
 
 from typing import Any
 from typing import Dict
+from typing import Literal
+from typing import overload
 from typing import Set
 
 from sqlalchemy import CHAR
@@ -14,6 +16,7 @@
 from sqlalchemy import Integer
 from sqlalchemy import MetaData
 from sqlalchemy import Numeric
+from sqlalchemy import PrimaryKeyConstraint
 from sqlalchemy import String
 from sqlalchemy import Table
 from sqlalchemy import Text
@@ -149,6 +152,118 @@ def _get_model_schema(cls):
         return m
 
 
+class NamingConvModel:
+    __requires__ = ("unique_constraint_reflection",)
+    configure_opts = {"conv_all_constraint_names": True}
+    naming_convention = {
+        "ix": "ix_%(column_0_label)s",
+        "uq": "uq_%(table_name)s_%(constraint_name)s",
+        "ck": "ck_%(table_name)s_%(constraint_name)s",
+        "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
+        "pk": "pk_%(table_name)s",
+    }
+
+    @classmethod
+    def _get_db_schema(cls):
+        # database side - assume all constraints have a name that
+        # we would assume here is a "db generated" name.  need to make
+        # sure these all render with op.f().
+        m = MetaData()
+        Table(
+            "x1",
+            m,
+            Column("q", Integer),
+            Index("db_x1_index_q", "q"),
+            PrimaryKeyConstraint("q", name="db_x1_primary_q"),
+        )
+        Table(
+            "x2",
+            m,
+            Column("q", Integer),
+            Column("p", ForeignKey("x1.q", name="db_x2_foreign_q")),
+            CheckConstraint("q > 5", name="db_x2_check_q"),
+        )
+        Table(
+            "x3",
+            m,
+            Column("q", Integer),
+            Column("r", Integer),
+            Column("s", Integer),
+            UniqueConstraint("q", name="db_x3_unique_q"),
+        )
+        Table(
+            "x4",
+            m,
+            Column("q", Integer),
+            PrimaryKeyConstraint("q", name="db_x4_primary_q"),
+        )
+        Table(
+            "x5",
+            m,
+            Column("q", Integer),
+            Column("p", ForeignKey("x4.q", name="db_x5_foreign_q")),
+            Column("r", Integer),
+            Column("s", Integer),
+            PrimaryKeyConstraint("q", name="db_x5_primary_q"),
+            UniqueConstraint("r", name="db_x5_unique_r"),
+            CheckConstraint("s > 5", name="db_x5_check_s"),
+        )
+        # SQLite and it's "no names needed" thing.  bleh.
+        # we can't have a name for these so you'll see "None" for the name.
+        Table(
+            "unnamed_sqlite",
+            m,
+            Column("q", Integer),
+            Column("r", Integer),
+            PrimaryKeyConstraint("q"),
+            UniqueConstraint("r"),
+        )
+        return m
+
+    @classmethod
+    def _get_model_schema(cls):
+        from sqlalchemy.sql.naming import conv
+
+        m = MetaData(naming_convention=cls.naming_convention)
+        Table(
+            "x1", m, Column("q", Integer, primary_key=True), Index(None, "q")
+        )
+        Table(
+            "x2",
+            m,
+            Column("q", Integer),
+            Column("p", ForeignKey("x1.q")),
+            CheckConstraint("q > 5", name="token_x2check1"),
+        )
+        Table(
+            "x3",
+            m,
+            Column("q", Integer),
+            Column("r", Integer),
+            Column("s", Integer),
+            UniqueConstraint("r", name="token_x3r"),
+            UniqueConstraint("s", name=conv("userdef_x3_unique_s")),
+        )
+        Table(
+            "x4",
+            m,
+            Column("q", Integer, primary_key=True),
+            Index("userdef_x4_idx_q", "q"),
+        )
+        Table(
+            "x6",
+            m,
+            Column("q", Integer, primary_key=True),
+            Column("p", ForeignKey("x4.q")),
+            Column("r", Integer),
+            Column("s", Integer),
+            UniqueConstraint("r", name="token_x6r"),
+            CheckConstraint("s > 5", "token_x6check1"),
+            CheckConstraint("s < 20", conv("userdef_x6_check_s")),
+        )
+        return m
+
+
 class _ComparesFKs:
     def _assert_fk_diff(
         self,
@@ -268,17 +383,46 @@ def _update_context(
 
 
 class AutogenFixtureTest(_ComparesFKs):
+
+    @overload
     def _fixture(
         self,
-        m1,
-        m2,
+        m1: MetaData,
+        m2: MetaData,
+        include_schemas=...,
+        opts=...,
+        object_filters=...,
+        name_filters=...,
+        *,
+        return_ops: Literal[True],
+        max_identifier_length=...,
+    ) -> ops.UpgradeOps: ...
+
+    @overload
+    def _fixture(
+        self,
+        m1: MetaData,
+        m2: MetaData,
+        include_schemas=...,
+        opts=...,
+        object_filters=...,
+        name_filters=...,
+        *,
+        return_ops: Literal[False] = ...,
+        max_identifier_length=...,
+    ) -> list[Any]: ...
+
+    def _fixture(
+        self,
+        m1: MetaData,
+        m2: MetaData,
         include_schemas=False,
         opts=None,
         object_filters=_default_object_filters,
         name_filters=_default_name_filters,
-        return_ops=False,
+        return_ops: bool = False,
         max_identifier_length=None,
-    ):
+    ) -> ops.UpgradeOps | list[Any]:
         if max_identifier_length:
             dialect = self.bind.dialect
             existing_length = dialect.max_identifier_length
diff --git a/libs/alembic/testing/suite/test_autogen_computed.py b/libs/alembic/testing/suite/test_autogen_computed.py
index 04a3caf072..586691b265 100644
--- a/libs/alembic/testing/suite/test_autogen_computed.py
+++ b/libs/alembic/testing/suite/test_autogen_computed.py
@@ -1,3 +1,5 @@
+from contextlib import nullcontext
+
 import sqlalchemy as sa
 from sqlalchemy import Column
 from sqlalchemy import Integer
@@ -8,7 +10,7 @@
 from ... import testing
 from ...testing import config
 from ...testing import eq_
-from ...testing import exclusions
+from ...testing import expect_warnings
 from ...testing import is_
 from ...testing import is_true
 from ...testing import mock
@@ -19,6 +21,13 @@ class AutogenerateComputedTest(AutogenFixtureTest, TestBase):
     __requires__ = ("computed_columns",)
     __backend__ = True
 
+    def _fixture_ctx(self):
+        if config.requirements.computed_columns_warn_no_persisted.enabled:
+            ctx = expect_warnings()
+        else:
+            ctx = nullcontext()
+        return ctx
+
     def test_add_computed_column(self):
         m1 = MetaData()
         m2 = MetaData()
@@ -32,7 +41,8 @@ def test_add_computed_column(self):
             Column("foo", Integer, sa.Computed("5")),
         )
 
-        diffs = self._fixture(m1, m2)
+        with self._fixture_ctx():
+            diffs = self._fixture(m1, m2)
 
         eq_(diffs[0][0], "add_column")
         eq_(diffs[0][2], "user")
@@ -56,25 +66,16 @@ def test_remove_computed_column(self):
 
         Table("user", m2, Column("id", Integer, primary_key=True))
 
-        diffs = self._fixture(m1, m2)
+        with self._fixture_ctx():
+            diffs = self._fixture(m1, m2)
 
         eq_(diffs[0][0], "remove_column")
         eq_(diffs[0][2], "user")
         c = diffs[0][3]
         eq_(c.name, "foo")
 
-        if config.requirements.computed_reflects_normally.enabled:
-            is_true(isinstance(c.computed, sa.Computed))
-        else:
-            is_(c.computed, None)
-
-        if config.requirements.computed_reflects_as_server_default.enabled:
-            is_true(isinstance(c.server_default, sa.DefaultClause))
-            eq_(str(c.server_default.arg.text), "5")
-        elif config.requirements.computed_reflects_normally.enabled:
-            is_true(isinstance(c.computed, sa.Computed))
-        else:
-            is_(c.computed, None)
+        is_true(isinstance(c.computed, sa.Computed))
+        is_true(isinstance(c.server_default, sa.Computed))
 
     @testing.combinations(
         lambda: (None, sa.Computed("bar*5")),
@@ -85,7 +86,6 @@ def test_remove_computed_column(self):
         ),
         lambda: (sa.Computed("bar*5"), sa.Computed("bar * 42")),
     )
-    @config.requirements.computed_reflects_normally
     def test_cant_change_computed_warning(self, test_case):
         arg_before, arg_after = testing.resolve_lambda(test_case, **locals())
         m1 = MetaData()
@@ -110,7 +110,7 @@ def test_cant_change_computed_warning(self, test_case):
             Column("foo", Integer, *arg_after),
         )
 
-        with mock.patch("alembic.util.warn") as mock_warn:
+        with mock.patch("alembic.util.warn") as mock_warn, self._fixture_ctx():
             diffs = self._fixture(m1, m2)
 
         eq_(
@@ -125,10 +125,6 @@ def test_cant_change_computed_warning(self, test_case):
         lambda: (sa.Computed("5"), sa.Computed("5")),
         lambda: (sa.Computed("bar*5"), sa.Computed("bar*5")),
         lambda: (sa.Computed("bar*5"), sa.Computed("bar * \r\n\t5")),
-        (
-            lambda: (sa.Computed("bar*5"), None),
-            config.requirements.computed_doesnt_reflect_as_server_default,
-        ),
     )
     def test_computed_unchanged(self, test_case):
         arg_before, arg_after = testing.resolve_lambda(test_case, **locals())
@@ -154,51 +150,8 @@ def test_computed_unchanged(self, test_case):
             Column("foo", Integer, *arg_after),
         )
 
-        with mock.patch("alembic.util.warn") as mock_warn:
+        with mock.patch("alembic.util.warn") as mock_warn, self._fixture_ctx():
             diffs = self._fixture(m1, m2)
         eq_(mock_warn.mock_calls, [])
 
         eq_(list(diffs), [])
-
-    @config.requirements.computed_reflects_as_server_default
-    def test_remove_computed_default_on_computed(self):
-        """Asserts the current behavior which is that on PG and Oracle,
-        the GENERATED ALWAYS AS is reflected as a server default which we can't
-        tell is actually "computed", so these come out as a modification to
-        the server default.
-
-        """
-        m1 = MetaData()
-        m2 = MetaData()
-
-        Table(
-            "user",
-            m1,
-            Column("id", Integer, primary_key=True),
-            Column("bar", Integer),
-            Column("foo", Integer, sa.Computed("bar + 42")),
-        )
-
-        Table(
-            "user",
-            m2,
-            Column("id", Integer, primary_key=True),
-            Column("bar", Integer),
-            Column("foo", Integer),
-        )
-
-        diffs = self._fixture(m1, m2)
-
-        eq_(diffs[0][0][0], "modify_default")
-        eq_(diffs[0][0][2], "user")
-        eq_(diffs[0][0][3], "foo")
-        old = diffs[0][0][-2]
-        new = diffs[0][0][-1]
-
-        is_(new, None)
-        is_true(isinstance(old, sa.DefaultClause))
-
-        if exclusions.against(config, "postgresql"):
-            eq_(str(old.arg.text), "(bar + 42)")
-        elif exclusions.against(config, "oracle"):
-            eq_(str(old.arg.text), '"BAR"+42')
diff --git a/libs/alembic/testing/suite/test_autogen_fks.py b/libs/alembic/testing/suite/test_autogen_fks.py
index 0240b98d38..d69736e64d 100644
--- a/libs/alembic/testing/suite/test_autogen_fks.py
+++ b/libs/alembic/testing/suite/test_autogen_fks.py
@@ -199,6 +199,7 @@ def test_no_change_composite_fk(self):
 
         eq_(diffs, [])
 
+    @config.requirements.foreign_key_name_reflection
     def test_casing_convention_changed_so_put_drops_first(self):
         m1 = MetaData()
         m2 = MetaData()
@@ -247,7 +248,7 @@ def test_casing_convention_changed_so_put_drops_first(self):
             ["test2"],
             "some_table",
             ["test"],
-            name="MyFK" if config.requirements.fk_names.enabled else None,
+            name="MyFK",
         )
 
         self._assert_fk_diff(
diff --git a/libs/alembic/testing/warnings.py b/libs/alembic/testing/warnings.py
index e87136b85f..86d45a0dd5 100644
--- a/libs/alembic/testing/warnings.py
+++ b/libs/alembic/testing/warnings.py
@@ -10,8 +10,6 @@
 
 from sqlalchemy import exc as sa_exc
 
-from ..util import sqla_14
-
 
 def setup_filters():
     """Set global warning behavior for the test suite."""
@@ -23,13 +21,6 @@ def setup_filters():
 
     # some selected deprecations...
     warnings.filterwarnings("error", category=DeprecationWarning)
-    if not sqla_14:
-        # 1.3 uses pkg_resources in PluginLoader
-        warnings.filterwarnings(
-            "ignore",
-            "pkg_resources is deprecated as an API",
-            DeprecationWarning,
-        )
     try:
         import pytest
     except ImportError:
diff --git a/libs/alembic/util/__init__.py b/libs/alembic/util/__init__.py
index 4724e1f084..8f3f685b44 100644
--- a/libs/alembic/util/__init__.py
+++ b/libs/alembic/util/__init__.py
@@ -1,15 +1,19 @@
 from .editor import open_in_editor as open_in_editor
 from .exc import AutogenerateDiffsDetected as AutogenerateDiffsDetected
 from .exc import CommandError as CommandError
+from .exc import DatabaseNotAtHead as DatabaseNotAtHead
 from .langhelpers import _with_legacy_names as _with_legacy_names
 from .langhelpers import asbool as asbool
 from .langhelpers import dedupe_tuple as dedupe_tuple
 from .langhelpers import Dispatcher as Dispatcher
+from .langhelpers import DispatchPriority as DispatchPriority
 from .langhelpers import EMPTY_DICT as EMPTY_DICT
 from .langhelpers import immutabledict as immutabledict
 from .langhelpers import memoized_property as memoized_property
 from .langhelpers import ModuleClsProxy as ModuleClsProxy
 from .langhelpers import not_none as not_none
+from .langhelpers import PriorityDispatcher as PriorityDispatcher
+from .langhelpers import PriorityDispatchResult as PriorityDispatchResult
 from .langhelpers import rev_id as rev_id
 from .langhelpers import to_list as to_list
 from .langhelpers import to_tuple as to_tuple
@@ -20,16 +24,10 @@
 from .messaging import obfuscate_url_pw as obfuscate_url_pw
 from .messaging import status as status
 from .messaging import warn as warn
+from .messaging import warn_deprecated as warn_deprecated
 from .messaging import write_outstream as write_outstream
 from .pyfiles import coerce_resource_to_filename as coerce_resource_to_filename
 from .pyfiles import load_python_file as load_python_file
 from .pyfiles import pyc_file_from_path as pyc_file_from_path
 from .pyfiles import template_to_file as template_to_file
-from .sqla_compat import has_computed as has_computed
-from .sqla_compat import sqla_13 as sqla_13
-from .sqla_compat import sqla_14 as sqla_14
 from .sqla_compat import sqla_2 as sqla_2
-
-
-if not sqla_13:
-    raise CommandError("SQLAlchemy 1.3.0 or greater is required.")
diff --git a/libs/alembic/util/compat.py b/libs/alembic/util/compat.py
index e185cc4172..527ffdc97d 100644
--- a/libs/alembic/util/compat.py
+++ b/libs/alembic/util/compat.py
@@ -3,15 +3,16 @@
 from __future__ import annotations
 
 from configparser import ConfigParser
+from importlib import metadata
+from importlib.metadata import EntryPoint
 import io
 import os
+from pathlib import Path
 import sys
 import typing
 from typing import Any
-from typing import List
-from typing import Optional
+from typing import Iterator
 from typing import Sequence
-from typing import Union
 
 if True:
     # zimports hack for too-long names
@@ -24,9 +25,10 @@
 
 is_posix = os.name == "posix"
 
+py314 = sys.version_info >= (3, 14)
+py313 = sys.version_info >= (3, 13)
+py312 = sys.version_info >= (3, 12)
 py311 = sys.version_info >= (3, 11)
-py310 = sys.version_info >= (3, 10)
-py39 = sys.version_info >= (3, 9)
 
 
 # produce a wrapper that allows encoded text to stream
@@ -37,30 +39,72 @@ def close(self) -> None:
         pass
 
 
-if py39:
-    from importlib import resources as _resources
+if py311:
+    import tomllib as tomllib
+else:
+    import tomli as tomllib  # type: ignore  # noqa
+
+
+if py312:
+
+    def path_walk(
+        path: Path, *, top_down: bool = True
+    ) -> Iterator[tuple[Path, list[str], list[str]]]:
+        return Path.walk(path)
 
-    importlib_resources = _resources
-    from importlib import metadata as _metadata
+    def path_relative_to(
+        path: Path, other: Path, *, walk_up: bool = False
+    ) -> Path:
+        return path.relative_to(other, walk_up=walk_up)
 
-    importlib_metadata = _metadata
-    from importlib.metadata import EntryPoint as EntryPoint
 else:
-    import importlib_resources  # type:ignore # noqa
-    import importlib_metadata  # type:ignore # noqa
-    from importlib_metadata import EntryPoint  # type:ignore # noqa
+
+    def path_walk(
+        path: Path, *, top_down: bool = True
+    ) -> Iterator[tuple[Path, list[str], list[str]]]:
+        for root, dirs, files in os.walk(path, topdown=top_down):
+            yield Path(root), dirs, files
+
+    def path_relative_to(
+        path: Path, other: Path, *, walk_up: bool = False
+    ) -> Path:
+        """
+        Calculate the relative path of 'path' with respect to 'other',
+        optionally allowing 'path' to be outside the subtree of 'other'.
+
+        OK I used AI for this, sorry
+
+        """
+        try:
+            return path.relative_to(other)
+        except ValueError:
+            if walk_up:
+                other_ancestors = list(other.parents) + [other]
+                for ancestor in other_ancestors:
+                    try:
+                        return path.relative_to(ancestor)
+                    except ValueError:
+                        continue
+                raise ValueError(
+                    f"{path} is not in the same subtree as {other}"
+                )
+            else:
+                raise
 
 
 def importlib_metadata_get(group: str) -> Sequence[EntryPoint]:
-    ep = importlib_metadata.entry_points()
-    if hasattr(ep, "select"):
-        return ep.select(group=group)
-    else:
-        return ep.get(group, ())  # type: ignore
+    """provide a facade for metadata.entry_points().
+
+    This is no longer a "compat" function as of Python 3.10, however
+    the function is widely referenced in the test suite and elsewhere so is
+    still in this module for compatibility reasons.
+
+    """
+    return metadata.entry_points().select(group=group)
 
 
 def formatannotation_fwdref(
-    annotation: Any, base_module: Optional[Any] = None
+    annotation: Any, base_module: Any | None = None
 ) -> str:
     """vendored from python 3.7"""
     # copied over _formatannotation from sqlalchemy 2.0
@@ -81,9 +125,6 @@ def formatannotation_fwdref(
 
 def read_config_parser(
     file_config: ConfigParser,
-    file_argument: Sequence[Union[str, os.PathLike[str]]],
-) -> List[str]:
-    if py310:
-        return file_config.read(file_argument, encoding="locale")
-    else:
-        return file_config.read(file_argument)
+    file_argument: list[str | os.PathLike[str]],
+) -> list[str]:
+    return file_config.read(file_argument, encoding="locale")
diff --git a/libs/alembic/util/exc.py b/libs/alembic/util/exc.py
index 0d0496b1e2..4658f7823d 100644
--- a/libs/alembic/util/exc.py
+++ b/libs/alembic/util/exc.py
@@ -1,6 +1,43 @@
+from __future__ import annotations
+
+from typing import Any
+from typing import List
+from typing import Tuple
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from alembic.autogenerate import RevisionContext
+
+
 class CommandError(Exception):
-    pass
+    """Base command error for all exceptions"""
+
+
+class DatabaseNotAtHead(CommandError):
+    """Indicates the database is not at current head revisions.
+
+    Raised by the :func:`.command.current` command when the
+    :paramref:`.command.current.check_heads` parameter is used.
+
+    .. versionadded:: 1.17.1
+
+    """
 
 
 class AutogenerateDiffsDetected(CommandError):
-    pass
+    """Raised when diffs were detected by the :func:`.command.check`
+    command.
+
+    .. versionadded:: 1.9.0
+
+    """
+
+    def __init__(
+        self,
+        message: str,
+        revision_context: RevisionContext,
+        diffs: List[Tuple[Any, ...]],
+    ) -> None:
+        super().__init__(message)
+        self.revision_context = revision_context
+        self.diffs = diffs
diff --git a/libs/alembic/util/langhelpers.py b/libs/alembic/util/langhelpers.py
index 80d88cbcec..cf0df2396a 100644
--- a/libs/alembic/util/langhelpers.py
+++ b/libs/alembic/util/langhelpers.py
@@ -2,6 +2,7 @@
 
 import collections
 from collections.abc import Iterable
+import enum
 import textwrap
 from typing import Any
 from typing import Callable
@@ -17,9 +18,7 @@
 from typing import Set
 from typing import Tuple
 from typing import Type
-from typing import TYPE_CHECKING
 from typing import TypeVar
-from typing import Union
 import uuid
 import warnings
 
@@ -264,20 +263,63 @@ def dedupe_tuple(tup: Tuple[str, ...]) -> Tuple[str, ...]:
     return tuple(unique_list(tup))
 
 
+class PriorityDispatchResult(enum.Enum):
+    """indicate an action after running a function within a
+    :class:`.PriorityDispatcher`
+
+    .. versionadded:: 1.18.0
+
+    """
+
+    CONTINUE = enum.auto()
+    """Continue running more functions.
+
+    Any return value that is not PriorityDispatchResult.STOP is equivalent
+    to this.
+
+    """
+
+    STOP = enum.auto()
+    """Stop running any additional functions within the subgroup"""
+
+
+class DispatchPriority(enum.IntEnum):
+    """Indicate which of three sub-collections a function inside a
+    :class:`.PriorityDispatcher` should be placed.
+
+    .. versionadded:: 1.18.0
+
+    """
+
+    FIRST = 50
+    """Run the funciton in the first batch of functions (highest priority)"""
+
+    MEDIUM = 25
+    """Run the function at normal priority (this is the default)"""
+
+    LAST = 10
+    """Run the function in the last batch of functions"""
+
+
 class Dispatcher:
-    def __init__(self, uselist: bool = False) -> None:
+    def __init__(self) -> None:
         self._registry: Dict[Tuple[Any, ...], Any] = {}
-        self.uselist = uselist
 
     def dispatch_for(
-        self, target: Any, qualifier: str = "default"
+        self,
+        target: Any,
+        *,
+        qualifier: str = "default",
+        replace: bool = False,
     ) -> Callable[[_C], _C]:
         def decorate(fn: _C) -> _C:
-            if self.uselist:
-                self._registry.setdefault((target, qualifier), []).append(fn)
-            else:
-                assert (target, qualifier) not in self._registry
-                self._registry[(target, qualifier)] = fn
+            if (target, qualifier) in self._registry and not replace:
+                raise ValueError(
+                    "Can not set dispatch function for object "
+                    f"{target!r}: key already exists. To replace "
+                    "existing function, use replace=True."
+                )
+            self._registry[(target, qualifier)] = fn
             return fn
 
         return decorate
@@ -290,42 +332,113 @@ def dispatch(self, obj: Any, qualifier: str = "default") -> Any:
         else:
             targets = type(obj).__mro__
 
-        for spcls in targets:
-            if qualifier != "default" and (spcls, qualifier) in self._registry:
-                return self._fn_or_list(self._registry[(spcls, qualifier)])
-            elif (spcls, "default") in self._registry:
-                return self._fn_or_list(self._registry[(spcls, "default")])
+        if qualifier != "default":
+            qualifiers = [qualifier, "default"]
         else:
-            raise ValueError("no dispatch function for object: %s" % obj)
+            qualifiers = ["default"]
 
-    def _fn_or_list(
-        self, fn_or_list: Union[List[Callable[..., Any]], Callable[..., Any]]
-    ) -> Callable[..., Any]:
-        if self.uselist:
-
-            def go(*arg: Any, **kw: Any) -> None:
-                if TYPE_CHECKING:
-                    assert isinstance(fn_or_list, Sequence)
-                for fn in fn_or_list:
-                    fn(*arg, **kw)
-
-            return go
+        for spcls in targets:
+            for qualifier in qualifiers:
+                if (spcls, qualifier) in self._registry:
+                    return self._registry[(spcls, qualifier)]
         else:
-            return fn_or_list  # type: ignore
+            raise ValueError("no dispatch function for object: %s" % obj)
 
     def branch(self) -> Dispatcher:
         """Return a copy of this dispatcher that is independently
         writable."""
 
         d = Dispatcher()
-        if self.uselist:
-            d._registry.update(
-                (k, [fn for fn in self._registry[k]]) for k in self._registry
+        d._registry.update(self._registry)
+        return d
+
+
+class PriorityDispatcher:
+    """registers lists of functions at multiple levels of priorty and provides
+    a target to invoke them in priority order.
+
+    .. versionadded:: 1.18.0 - PriorityDispatcher replaces the job
+       of Dispatcher(uselist=True)
+
+    """
+
+    def __init__(self) -> None:
+        self._registry: dict[tuple[Any, ...], Any] = collections.defaultdict(
+            list
+        )
+
+    def dispatch_for(
+        self,
+        target: str,
+        *,
+        priority: DispatchPriority = DispatchPriority.MEDIUM,
+        qualifier: str = "default",
+        subgroup: str | None = None,
+    ) -> Callable[[_C], _C]:
+        """return a decorator callable that registers a function at a
+        given priority, with a given qualifier, to fire off for a given
+        subgroup.
+
+        It's important this remains as a decorator to support third party
+        plugins who are populating the dispatcher using that style.
+
+        """
+
+        def decorate(fn: _C) -> _C:
+            self._registry[(target, qualifier, priority)].append(
+                (fn, subgroup)
             )
+            return fn
+
+        return decorate
+
+    def dispatch(
+        self, target: str, *, qualifier: str = "default"
+    ) -> Callable[..., None]:
+        """Provide a callable for the given target and qualifier."""
+
+        if qualifier != "default":
+            qualifiers = [qualifier, "default"]
         else:
-            d._registry.update(self._registry)
+            qualifiers = ["default"]
+
+        def go(*arg: Any, **kw: Any) -> Any:
+            results_by_subgroup: dict[str, PriorityDispatchResult] = {}
+            for priority in DispatchPriority:
+                for qualifier in qualifiers:
+                    for fn, subgroup in self._registry.get(
+                        (target, qualifier, priority), ()
+                    ):
+                        if (
+                            results_by_subgroup.get(
+                                subgroup, PriorityDispatchResult.CONTINUE
+                            )
+                            is PriorityDispatchResult.STOP
+                        ):
+                            continue
+
+                        result = fn(*arg, **kw)
+                        results_by_subgroup[subgroup] = result
+
+        return go
+
+    def branch(self) -> PriorityDispatcher:
+        """Return a copy of this dispatcher that is independently
+        writable."""
+
+        d = PriorityDispatcher()
+        d.populate_with(self)
         return d
 
+    def populate_with(self, other: PriorityDispatcher) -> None:
+        """Populate this PriorityDispatcher with the contents of another one.
+
+        Additive, does not remove existing contents.
+        """
+        for k in other._registry:
+            new_list = other._registry[k]
+            self._registry[k].extend(new_list)
+
 
 def not_none(value: Optional[_T]) -> _T:
     assert value is not None
diff --git a/libs/alembic/util/messaging.py b/libs/alembic/util/messaging.py
index 6618fa7faa..4c08f16e7e 100644
--- a/libs/alembic/util/messaging.py
+++ b/libs/alembic/util/messaging.py
@@ -13,8 +13,6 @@
 
 from sqlalchemy.engine import url
 
-from . import sqla_compat
-
 log = logging.getLogger(__name__)
 
 # disable "no handler found" errors
@@ -76,14 +74,17 @@ def err(message: str, quiet: bool = False) -> None:
 
 
 def obfuscate_url_pw(input_url: str) -> str:
-    u = url.make_url(input_url)
-    return sqla_compat.url_render_as_string(u, hide_password=True)  # type: ignore  # noqa: E501
+    return url.make_url(input_url).render_as_string(hide_password=True)
 
 
 def warn(msg: str, stacklevel: int = 2) -> None:
     warnings.warn(msg, UserWarning, stacklevel=stacklevel)
 
 
+def warn_deprecated(msg: str, stacklevel: int = 2) -> None:
+    warnings.warn(msg, DeprecationWarning, stacklevel=stacklevel)
+
+
 def msg(
     msg: str, newline: bool = True, flush: bool = False, quiet: bool = False
 ) -> None:
diff --git a/libs/alembic/util/pyfiles.py b/libs/alembic/util/pyfiles.py
index 973bd458e5..135a42dce2 100644
--- a/libs/alembic/util/pyfiles.py
+++ b/libs/alembic/util/pyfiles.py
@@ -3,26 +3,33 @@
 import atexit
 from contextlib import ExitStack
 import importlib
+from importlib import resources
 import importlib.machinery
 import importlib.util
 import os
+import pathlib
 import re
 import tempfile
 from types import ModuleType
 from typing import Any
 from typing import Optional
+from typing import Union
 
 from mako import exceptions
 from mako.template import Template
 
-from . import compat
 from .exc import CommandError
 
 
 def template_to_file(
-    template_file: str, dest: str, output_encoding: str, **kw: Any
+    template_file: Union[str, os.PathLike[str]],
+    dest: Union[str, os.PathLike[str]],
+    output_encoding: str,
+    *,
+    append_with_newlines: bool = False,
+    **kw: Any,
 ) -> None:
-    template = Template(filename=template_file)
+    template = Template(filename=_preserving_path_as_str(template_file))
     try:
         output = template.render_unicode(**kw).encode(output_encoding)
     except:
@@ -38,11 +45,13 @@ def template_to_file(
             "template-oriented traceback." % fname
         )
     else:
-        with open(dest, "wb") as f:
+        with open(dest, "ab" if append_with_newlines else "wb") as f:
+            if append_with_newlines:
+                f.write("\n\n".encode(output_encoding))
             f.write(output)
 
 
-def coerce_resource_to_filename(fname: str) -> str:
+def coerce_resource_to_filename(fname_or_resource: str) -> pathlib.Path:
     """Interpret a filename as either a filesystem location or as a package
     resource.
 
@@ -50,48 +59,60 @@ def coerce_resource_to_filename(fname: str) -> str:
     are interpreted as resources and coerced to a file location.
 
     """
-    if not os.path.isabs(fname) and ":" in fname:
-        tokens = fname.split(":")
+    # TODO: there seem to be zero tests for the package resource codepath
+    if not os.path.isabs(fname_or_resource) and ":" in fname_or_resource:
+        tokens = fname_or_resource.split(":")
 
         # from https://importlib-resources.readthedocs.io/en/latest/migration.html#pkg-resources-resource-filename  # noqa E501
 
         file_manager = ExitStack()
         atexit.register(file_manager.close)
 
-        ref = compat.importlib_resources.files(tokens[0])
+        ref = resources.files(tokens[0])
         for tok in tokens[1:]:
             ref = ref / tok
-        fname = file_manager.enter_context(  # type: ignore[assignment]
-            compat.importlib_resources.as_file(ref)
+        fname_or_resource = file_manager.enter_context(  # type: ignore[assignment]  # noqa: E501
+            resources.as_file(ref)
         )
-    return fname
+    return pathlib.Path(fname_or_resource)
 
 
-def pyc_file_from_path(path: str) -> Optional[str]:
+def pyc_file_from_path(
+    path: Union[str, os.PathLike[str]],
+) -> Optional[pathlib.Path]:
     """Given a python source path, locate the .pyc."""
 
-    candidate = importlib.util.cache_from_source(path)
-    if os.path.exists(candidate):
+    pathpath = pathlib.Path(path)
+    candidate = pathlib.Path(
+        importlib.util.cache_from_source(pathpath.as_posix())
+    )
+    if candidate.exists():
         return candidate
 
     # even for pep3147, fall back to the old way of finding .pyc files,
     # to support sourceless operation
-    filepath, ext = os.path.splitext(path)
+    ext = pathpath.suffix
     for ext in importlib.machinery.BYTECODE_SUFFIXES:
-        if os.path.exists(filepath + ext):
-            return filepath + ext
+        if pathpath.with_suffix(ext).exists():
+            return pathpath.with_suffix(ext)
     else:
         return None
 
 
-def load_python_file(dir_: str, filename: str) -> ModuleType:
+def load_python_file(
+    dir_: Union[str, os.PathLike[str]], filename: Union[str, os.PathLike[str]]
+) -> ModuleType:
     """Load a file from the given path as a Python module."""
 
+    dir_ = pathlib.Path(dir_)
+    filename_as_path = pathlib.Path(filename)
+    filename = filename_as_path.name
+
     module_id = re.sub(r"\W", "_", filename)
-    path = os.path.join(dir_, filename)
-    _, ext = os.path.splitext(filename)
+    path = dir_ / filename
+    ext = path.suffix
     if ext == ".py":
-        if os.path.exists(path):
+        if path.exists():
             module = load_module_py(module_id, path)
         else:
             pyc_path = pyc_file_from_path(path)
@@ -106,9 +127,27 @@ def load_python_file(dir_: str, filename: str) -> ModuleType:
     return module
 
 
-def load_module_py(module_id: str, path: str) -> ModuleType:
+def load_module_py(
+    module_id: str, path: Union[str, os.PathLike[str]]
+) -> ModuleType:
     spec = importlib.util.spec_from_file_location(module_id, path)
     assert spec
     module = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(module)  # type: ignore
     return module
+
+
+def _preserving_path_as_str(path: Union[str, os.PathLike[str]]) -> str:
+    """receive str/pathlike and return a string.
+
+    Does not convert an incoming string path to a Path first, to help with
+    unit tests that are doing string path round trips without OS-specific
+    processing if not necessary.
+
+    """
+    if isinstance(path, str):
+        return path
+    elif isinstance(path, pathlib.PurePath):
+        return str(path)
+    else:
+        return str(pathlib.Path(path))
diff --git a/libs/alembic/util/sqla_compat.py b/libs/alembic/util/sqla_compat.py
index d4ed0fdd59..ff2f2c9390 100644
--- a/libs/alembic/util/sqla_compat.py
+++ b/libs/alembic/util/sqla_compat.py
@@ -10,7 +10,6 @@
 from typing import Dict
 from typing import Iterable
 from typing import Iterator
-from typing import Mapping
 from typing import Optional
 from typing import Protocol
 from typing import Set
@@ -20,11 +19,9 @@
 from typing import Union
 
 from sqlalchemy import __version__
-from sqlalchemy import inspect
 from sqlalchemy import schema
 from sqlalchemy import sql
 from sqlalchemy import types as sqltypes
-from sqlalchemy.engine import url
 from sqlalchemy.schema import CheckConstraint
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import ForeignKeyConstraint
@@ -32,28 +29,25 @@
 from sqlalchemy.sql.base import DialectKWArgs
 from sqlalchemy.sql.elements import BindParameter
 from sqlalchemy.sql.elements import ColumnClause
-from sqlalchemy.sql.elements import quoted_name
 from sqlalchemy.sql.elements import TextClause
 from sqlalchemy.sql.elements import UnaryExpression
+from sqlalchemy.sql.naming import _NONE_NAME as _NONE_NAME  # type: ignore[attr-defined] # noqa: E501
 from sqlalchemy.sql.visitors import traverse
 from typing_extensions import TypeGuard
 
 if TYPE_CHECKING:
     from sqlalchemy import ClauseElement
+    from sqlalchemy import Identity
     from sqlalchemy import Index
     from sqlalchemy import Table
     from sqlalchemy.engine import Connection
     from sqlalchemy.engine import Dialect
     from sqlalchemy.engine import Transaction
-    from sqlalchemy.engine.reflection import Inspector
     from sqlalchemy.sql.base import ColumnCollection
     from sqlalchemy.sql.compiler import SQLCompiler
-    from sqlalchemy.sql.dml import Insert
     from sqlalchemy.sql.elements import ColumnElement
     from sqlalchemy.sql.schema import Constraint
     from sqlalchemy.sql.schema import SchemaItem
-    from sqlalchemy.sql.selectable import Select
-    from sqlalchemy.sql.selectable import TableClause
 
 _CE = TypeVar("_CE", bound=Union["ColumnElement[Any]", "SchemaItem"])
 
@@ -72,24 +66,14 @@ def _safe_int(value: str) -> Union[int, str]:
 _vers = tuple(
     [_safe_int(x) for x in re.findall(r"(\d+|[abc]\d)", __version__)]
 )
-sqla_13 = _vers >= (1, 3)
-sqla_14 = _vers >= (1, 4)
 # https://docs.sqlalchemy.org/en/latest/changelog/changelog_14.html#change-0c6e0cc67dfe6fac5164720e57ef307d
 sqla_14_18 = _vers >= (1, 4, 18)
 sqla_14_26 = _vers >= (1, 4, 26)
 sqla_2 = _vers >= (2,)
+sqla_2_0_25 = _vers >= (2, 25)
+sqla_2_1 = _vers >= (2, 1)
 sqlalchemy_version = __version__
 
-try:
-    from sqlalchemy.sql.naming import _NONE_NAME as _NONE_NAME  # type: ignore[attr-defined]  # noqa: E501
-except ImportError:
-    from sqlalchemy.sql.elements import _NONE_NAME as _NONE_NAME  # type: ignore  # noqa: E501
-
-
-class _Unsupported:
-    "Placeholder for unsupported SQLAlchemy classes"
-
-
 if TYPE_CHECKING:
 
     def compiles(
@@ -97,74 +81,52 @@ def compiles(
     ) -> Callable[[_CompilerProtocol], _CompilerProtocol]: ...
 
 else:
-    from sqlalchemy.ext.compiler import compiles
-
-try:
-    from sqlalchemy import Computed as Computed
-except ImportError:
-    if not TYPE_CHECKING:
+    from sqlalchemy.ext.compiler import compiles  # noqa: I100,I202
 
-        class Computed(_Unsupported):
-            pass
 
-    has_computed = False
-    has_computed_reflection = False
-else:
-    has_computed = True
-    has_computed_reflection = _vers >= (1, 3, 16)
+identity_has_dialect_kwargs = issubclass(schema.Identity, DialectKWArgs)
 
-try:
-    from sqlalchemy import Identity as Identity
-except ImportError:
-    if not TYPE_CHECKING:
 
-        class Identity(_Unsupported):
-            pass
+def _get_identity_options_dict(
+    identity: Union[Identity, schema.Sequence, None],
+    dialect_kwargs: bool = False,
+) -> Dict[str, Any]:
+    if identity is None:
+        return {}
+    elif identity_has_dialect_kwargs:
+        assert hasattr(identity, "_as_dict")
+        as_dict = identity._as_dict()
+        if dialect_kwargs:
+            assert isinstance(identity, DialectKWArgs)
+            as_dict.update(identity.dialect_kwargs)
+    else:
+        as_dict = {}
+        if isinstance(identity, schema.Identity):
+            # always=None means something different than always=False
+            as_dict["always"] = identity.always
+            if identity.on_null is not None:
+                as_dict["on_null"] = identity.on_null
+        # attributes common to Identity and Sequence
+        attrs = (
+            "start",
+            "increment",
+            "minvalue",
+            "maxvalue",
+            "nominvalue",
+            "nomaxvalue",
+            "cycle",
+            "cache",
+            "order",
+        )
+        as_dict.update(
+            {
+                key: getattr(identity, key, None)
+                for key in attrs
+                if getattr(identity, key, None) is not None
+            }
+        )
+    return as_dict
 
-    has_identity = False
-else:
-    identity_has_dialect_kwargs = issubclass(Identity, DialectKWArgs)
-
-    def _get_identity_options_dict(
-        identity: Union[Identity, schema.Sequence, None],
-        dialect_kwargs: bool = False,
-    ) -> Dict[str, Any]:
-        if identity is None:
-            return {}
-        elif identity_has_dialect_kwargs:
-            as_dict = identity._as_dict()  # type: ignore
-            if dialect_kwargs:
-                assert isinstance(identity, DialectKWArgs)
-                as_dict.update(identity.dialect_kwargs)
-        else:
-            as_dict = {}
-            if isinstance(identity, Identity):
-                # always=None means something different than always=False
-                as_dict["always"] = identity.always
-                if identity.on_null is not None:
-                    as_dict["on_null"] = identity.on_null
-            # attributes common to Identity and Sequence
-            attrs = (
-                "start",
-                "increment",
-                "minvalue",
-                "maxvalue",
-                "nominvalue",
-                "nomaxvalue",
-                "cycle",
-                "cache",
-                "order",
-            )
-            as_dict.update(
-                {
-                    key: getattr(identity, key, None)
-                    for key in attrs
-                    if getattr(identity, key, None) is not None
-                }
-            )
-        return as_dict
-
-    has_identity = True
 
 if sqla_2:
     from sqlalchemy.sql.base import _NoneName
@@ -173,7 +135,6 @@ def _get_identity_options_dict(
 
 
 _ConstraintName = Union[None, str, _NoneName]
-
 _ConstraintNameDefined = Union[str, _NoneName]
 
 
@@ -183,15 +144,11 @@ def constraint_name_defined(
     return name is _NONE_NAME or isinstance(name, (str, _NoneName))
 
 
-def constraint_name_string(
-    name: _ConstraintName,
-) -> TypeGuard[str]:
+def constraint_name_string(name: _ConstraintName) -> TypeGuard[str]:
     return isinstance(name, str)
 
 
-def constraint_name_or_none(
-    name: _ConstraintName,
-) -> Optional[str]:
+def constraint_name_or_none(name: _ConstraintName) -> Optional[str]:
     return name if constraint_name_string(name) else None
 
 
@@ -221,17 +178,10 @@ def _ensure_scope_for_ddl(
             yield
 
 
-def url_render_as_string(url, hide_password=True):
-    if sqla_14:
-        return url.render_as_string(hide_password=hide_password)
-    else:
-        return url.__to_string__(hide_password=hide_password)
-
-
 def _safe_begin_connection_transaction(
     connection: Connection,
 ) -> Transaction:
-    transaction = _get_connection_transaction(connection)
+    transaction = connection.get_transaction()
     if transaction:
         return transaction
     else:
@@ -241,7 +191,7 @@ def _safe_begin_connection_transaction(
 def _safe_commit_connection_transaction(
     connection: Connection,
 ) -> None:
-    transaction = _get_connection_transaction(connection)
+    transaction = connection.get_transaction()
     if transaction:
         transaction.commit()
 
@@ -249,7 +199,7 @@ def _safe_commit_connection_transaction(
 def _safe_rollback_connection_transaction(
     connection: Connection,
 ) -> None:
-    transaction = _get_connection_transaction(connection)
+    transaction = connection.get_transaction()
     if transaction:
         transaction.rollback()
 
@@ -275,65 +225,29 @@ def _copy(schema_item: _CE, **kw) -> _CE:
         return schema_item.copy(**kw)  # type: ignore[union-attr]
 
 
-def _get_connection_transaction(
-    connection: Connection,
-) -> Optional[Transaction]:
-    if sqla_14:
-        return connection.get_transaction()
-    else:
-        r = connection._root  # type: ignore[attr-defined]
-        return r._Connection__transaction
-
-
-def _create_url(*arg, **kw) -> url.URL:
-    if hasattr(url.URL, "create"):
-        return url.URL.create(*arg, **kw)
-    else:
-        return url.URL(*arg, **kw)
-
-
 def _connectable_has_table(
     connectable: Connection, tablename: str, schemaname: Union[str, None]
 ) -> bool:
-    if sqla_14:
-        return inspect(connectable).has_table(tablename, schemaname)
-    else:
-        return connectable.dialect.has_table(
-            connectable, tablename, schemaname
-        )
+    return connectable.dialect.has_table(connectable, tablename, schemaname)
 
 
 def _exec_on_inspector(inspector, statement, **params):
-    if sqla_14:
-        with inspector._operation_context() as conn:
-            return conn.execute(statement, params)
-    else:
-        return inspector.bind.execute(statement, params)
+    with inspector._operation_context() as conn:
+        return conn.execute(statement, params)
 
 
 def _nullability_might_be_unset(metadata_column):
-    if not sqla_14:
-        return metadata_column.nullable
-    else:
-        from sqlalchemy.sql import schema
+    from sqlalchemy.sql import schema
 
-        return (
-            metadata_column._user_defined_nullable is schema.NULL_UNSPECIFIED
-        )
+    return metadata_column._user_defined_nullable is schema.NULL_UNSPECIFIED
 
 
 def _server_default_is_computed(*server_default) -> bool:
-    if not has_computed:
-        return False
-    else:
-        return any(isinstance(sd, Computed) for sd in server_default)
+    return any(isinstance(sd, schema.Computed) for sd in server_default)
 
 
 def _server_default_is_identity(*server_default) -> bool:
-    if not sqla_14:
-        return False
-    else:
-        return any(isinstance(sd, Identity) for sd in server_default)
+    return any(isinstance(sd, schema.Identity) for sd in server_default)
 
 
 def _table_for_constraint(constraint: Constraint) -> Table:
@@ -354,15 +268,6 @@ def _columns_for_constraint(constraint):
         return list(constraint.columns)
 
 
-def _reflect_table(inspector: Inspector, table: Table) -> None:
-    if sqla_14:
-        return inspector.reflect_table(table, None)
-    else:
-        return inspector.reflecttable(  # type: ignore[attr-defined]
-            table, None
-        )
-
-
 def _resolve_for_variant(type_, dialect):
     if _type_has_variants(type_):
         base_type, mapping = _get_variant_mapping(type_)
@@ -371,7 +276,7 @@ def _resolve_for_variant(type_, dialect):
         return type_
 
 
-if hasattr(sqltypes.TypeEngine, "_variant_mapping"):
+if hasattr(sqltypes.TypeEngine, "_variant_mapping"):  # 2.0
 
     def _type_has_variants(type_):
         return bool(type_._variant_mapping)
@@ -388,6 +293,13 @@ def _get_variant_mapping(type_):
         return type_.impl, type_.mapping
 
 
+def _get_table_key(name: str, schema: Optional[str]) -> str:
+    if schema is None:
+        return name
+    else:
+        return schema + "." + name
+
+
 def _fk_spec(constraint: ForeignKeyConstraint) -> Any:
     if TYPE_CHECKING:
         assert constraint.columns is not None
@@ -549,103 +461,32 @@ def _render_literal_bindparam(
     return compiler.render_literal_bindparam(element, **kw)
 
 
-def _column_kwargs(col: Column) -> Mapping:
-    if sqla_13:
-        return col.kwargs
-    else:
-        return {}
-
-
 def _get_constraint_final_name(
     constraint: Union[Index, Constraint], dialect: Optional[Dialect]
 ) -> Optional[str]:
     if constraint.name is None:
         return None
     assert dialect is not None
-    if sqla_14:
-        # for SQLAlchemy 1.4 we would like to have the option to expand
-        # the use of "deferred" names for constraints as well as to have
-        # some flexibility with "None" name and similar; make use of new
-        # SQLAlchemy API to return what would be the final compiled form of
-        # the name for this dialect.
-        return dialect.identifier_preparer.format_constraint(
-            constraint, _alembic_quote=False
-        )
-    else:
-        # prior to SQLAlchemy 1.4, work around quoting logic to get at the
-        # final compiled name without quotes.
-        if hasattr(constraint.name, "quote"):
-            # might be quoted_name, might be truncated_name, keep it the
-            # same
-            quoted_name_cls: type = type(constraint.name)
-        else:
-            quoted_name_cls = quoted_name
-
-        new_name = quoted_name_cls(str(constraint.name), quote=False)
-        constraint = constraint.__class__(name=new_name)
-
-        if isinstance(constraint, schema.Index):
-            # name should not be quoted.
-            d = dialect.ddl_compiler(dialect, None)  # type: ignore[arg-type]
-            return d._prepared_index_name(constraint)
-        else:
-            # name should not be quoted.
-            return dialect.identifier_preparer.format_constraint(constraint)
+    # for SQLAlchemy 1.4 we would like to have the option to expand
+    # the use of "deferred" names for constraints as well as to have
+    # some flexibility with "None" name and similar; make use of new
+    # SQLAlchemy API to return what would be the final compiled form of
+    # the name for this dialect.
+    return dialect.identifier_preparer.format_constraint(
+        constraint, _alembic_quote=False
+    )
 
 
 def _constraint_is_named(
     constraint: Union[Constraint, Index], dialect: Optional[Dialect]
 ) -> bool:
-    if sqla_14:
-        if constraint.name is None:
-            return False
-        assert dialect is not None
-        name = dialect.identifier_preparer.format_constraint(
-            constraint, _alembic_quote=False
-        )
-        return name is not None
-    else:
-        return constraint.name is not None
-
-
-def _is_mariadb(mysql_dialect: Dialect) -> bool:
-    if sqla_14:
-        return mysql_dialect.is_mariadb  # type: ignore[attr-defined]
-    else:
-        return bool(
-            mysql_dialect.server_version_info
-            and mysql_dialect._is_mariadb  # type: ignore[attr-defined]
-        )
-
-
-def _mariadb_normalized_version_info(mysql_dialect):
-    return mysql_dialect._mariadb_normalized_version_info
-
-
-def _insert_inline(table: Union[TableClause, Table]) -> Insert:
-    if sqla_14:
-        return table.insert().inline()
-    else:
-        return table.insert(inline=True)  # type: ignore[call-arg]
-
-
-if sqla_14:
-    from sqlalchemy import create_mock_engine
-
-    # weird mypy workaround
-    from sqlalchemy import select as _sa_select
-
-    _select = _sa_select
-else:
-    from sqlalchemy import create_engine
-
-    def create_mock_engine(url, executor, **kw):  # type: ignore[misc]
-        return create_engine(
-            "postgresql://", strategy="mock", executor=executor
-        )
-
-    def _select(*columns, **kw) -> Select:
-        return sql.select(list(columns), **kw)  # type: ignore[call-overload]
+    if constraint.name is None:
+        return False
+    assert dialect is not None
+    name = dialect.identifier_preparer.format_constraint(
+        constraint, _alembic_quote=False
+    )
+    return name is not None
 
 
 def is_expression_index(index: Index) -> bool:
@@ -661,3 +502,9 @@ def is_expression(expr: Any) -> bool:
     if not isinstance(expr, ColumnClause) or expr.is_literal:
         return True
     return False
+
+
+def _inherit_schema_deprecated() -> bool:
+    # at some point in 2.1 inherit_schema was replaced with a property
+    # so that's preset at the class level, while before it wasn't.
+    return sqla_2_1 and hasattr(sqltypes.Enum, "inherit_schema")
diff --git a/libs/aniso8601-10.0.0.dist-info/METADATA b/libs/aniso8601-10.0.0.dist-info/METADATA
deleted file mode 100644
index 01ae669726..0000000000
--- a/libs/aniso8601-10.0.0.dist-info/METADATA
+++ /dev/null
@@ -1,509 +0,0 @@
-Metadata-Version: 2.1
-Name: aniso8601
-Version: 10.0.0
-Summary: A library for parsing ISO 8601 strings.
-Home-page: https://bitbucket.org/nielsenb/aniso8601
-Author: Brandon Nielsen
-Author-email: nielsenb@jetfuse.net
-Project-URL: Documentation, https://aniso8601.readthedocs.io/
-Project-URL: Source, https://bitbucket.org/nielsenb/aniso8601
-Project-URL: Tracker, https://bitbucket.org/nielsenb/aniso8601/issues
-Keywords: iso8601 parser
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Provides-Extra: dev
-Requires-Dist: black ; extra == 'dev'
-Requires-Dist: coverage ; extra == 'dev'
-Requires-Dist: isort ; extra == 'dev'
-Requires-Dist: pre-commit ; extra == 'dev'
-Requires-Dist: pyenchant ; extra == 'dev'
-Requires-Dist: pylint ; extra == 'dev'
-
-aniso8601
-=========
-
-Another ISO 8601 parser for Python
-----------------------------------
-
-Features
-========
-* Pure Python implementation
-* Logical behavior
-
-  - Parse a time, get a `datetime.time <http://docs.python.org/3/library/datetime.html#datetime.time>`_
-  - Parse a date, get a `datetime.date <http://docs.python.org/3/library/datetime.html#datetime.date>`_
-  - Parse a datetime, get a `datetime.datetime <http://docs.python.org/3/library/datetime.html#datetime.datetime>`_
-  - Parse a duration, get a `datetime.timedelta <http://docs.python.org/3/library/datetime.html#datetime.timedelta>`_
-  - Parse an interval, get a tuple of dates or datetimes
-  - Parse a repeating interval, get a date or datetime `generator <https://wiki.python.org/moin/Generators>`_
-
-* UTC offset represented as fixed-offset tzinfo
-* Parser separate from representation, allowing parsing to different datetime representations (see `Builders`_)
-* No regular expressions
-
-Installation
-============
-
-The recommended installation method is to use pip::
-
-  $ pip install aniso8601
-
-Alternatively, you can download the source (git repository hosted at `Bitbucket <https://bitbucket.org/nielsenb/aniso8601>`_) and install directly::
-
-  $ python setup.py install
-
-Use
-===
-
-Parsing datetimes
------------------
-
-*Consider* `datetime.datetime.fromisoformat <https://docs.python.org/3/library/datetime.html#datetime.datetime.fromisoformat>`_ *for basic ISO 8601 datetime parsing*
-
-To parse a typical ISO 8601 datetime string::
-
-  >>> import aniso8601
-  >>> aniso8601.parse_datetime('1977-06-10T12:00:00Z')
-  datetime.datetime(1977, 6, 10, 12, 0, tzinfo=+0:00:00 UTC)
-
-Alternative delimiters can be specified, for example, a space::
-
-  >>> aniso8601.parse_datetime('1977-06-10 12:00:00Z', delimiter=' ')
-  datetime.datetime(1977, 6, 10, 12, 0, tzinfo=+0:00:00 UTC)
-
-UTC offsets are supported::
-
-  >>> aniso8601.parse_datetime('1979-06-05T08:00:00-08:00')
-  datetime.datetime(1979, 6, 5, 8, 0, tzinfo=-8:00:00 UTC)
-
-If a UTC offset is not specified, the returned datetime will be naive::
-
-  >>> aniso8601.parse_datetime('1983-01-22T08:00:00')
-  datetime.datetime(1983, 1, 22, 8, 0)
-
-Leap seconds are currently not supported and attempting to parse one raises a :code:`LeapSecondError`::
-
-  >>> aniso8601.parse_datetime('2018-03-06T23:59:60')
-  Traceback (most recent call last):
-    File "<stdin>", line 1, in <module>
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/time.py", line 196, in parse_datetime
-      return builder.build_datetime(datepart, timepart)
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 237, in build_datetime
-      cls._build_object(time))
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/__init__.py", line 336, in _build_object
-      return cls.build_time(hh=parsetuple.hh, mm=parsetuple.mm,
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 191, in build_time
-      hh, mm, ss, tz = cls.range_check_time(hh, mm, ss, tz)
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/__init__.py", line 266, in range_check_time
-      raise LeapSecondError('Leap seconds are not supported.')
-  aniso8601.exceptions.LeapSecondError: Leap seconds are not supported.
-
-To get the resolution of an ISO 8601 datetime string::
-
-  >>> aniso8601.get_datetime_resolution('1977-06-10T12:00:00Z') == aniso8601.resolution.TimeResolution.Seconds
-  True
-  >>> aniso8601.get_datetime_resolution('1977-06-10T12:00') == aniso8601.resolution.TimeResolution.Minutes
-  True
-  >>> aniso8601.get_datetime_resolution('1977-06-10T12') == aniso8601.resolution.TimeResolution.Hours
-  True
-
-Note that datetime resolutions map to :code:`TimeResolution` as a valid datetime must have at least one time member so the resolution mapping is equivalent.
-
-Parsing dates
--------------
-
-*Consider* `datetime.date.fromisoformat <https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat>`_ *for basic ISO 8601 date parsing*
-
-To parse a date represented in an ISO 8601 string::
-
-  >>> import aniso8601
-  >>> aniso8601.parse_date('1984-04-23')
-  datetime.date(1984, 4, 23)
-
-Basic format is supported as well::
-
-  >>> aniso8601.parse_date('19840423')
-  datetime.date(1984, 4, 23)
-
-To parse a date using the ISO 8601 week date format::
-
-  >>> aniso8601.parse_date('1986-W38-1')
-  datetime.date(1986, 9, 15)
-
-To parse an ISO 8601 ordinal date::
-
-  >>> aniso8601.parse_date('1988-132')
-  datetime.date(1988, 5, 11)
-
-To get the resolution of an ISO 8601 date string::
-
-  >>> aniso8601.get_date_resolution('1981-04-05') == aniso8601.resolution.DateResolution.Day
-  True
-  >>> aniso8601.get_date_resolution('1981-04') == aniso8601.resolution.DateResolution.Month
-  True
-  >>> aniso8601.get_date_resolution('1981') == aniso8601.resolution.DateResolution.Year
-  True
-
-Parsing times
--------------
-
-*Consider* `datetime.time.fromisoformat <https://docs.python.org/3/library/datetime.html#datetime.time.fromisoformat>`_ *for basic ISO 8601 time parsing*
-
-To parse a time formatted as an ISO 8601 string::
-
-  >>> import aniso8601
-  >>> aniso8601.parse_time('11:31:14')
-  datetime.time(11, 31, 14)
-
-As with all of the above, basic format is supported::
-
-  >>> aniso8601.parse_time('113114')
-  datetime.time(11, 31, 14)
-
-A UTC offset can be specified for times::
-
-  >>> aniso8601.parse_time('17:18:19-02:30')
-  datetime.time(17, 18, 19, tzinfo=-2:30:00 UTC)
-  >>> aniso8601.parse_time('171819Z')
-  datetime.time(17, 18, 19, tzinfo=+0:00:00 UTC)
-
-Reduced accuracy is supported::
-
-  >>> aniso8601.parse_time('21:42')
-  datetime.time(21, 42)
-  >>> aniso8601.parse_time('22')
-  datetime.time(22, 0)
-
-A decimal fraction is always allowed on the lowest order element of an ISO 8601 formatted time::
-
-  >>> aniso8601.parse_time('22:33.5')
-  datetime.time(22, 33, 30)
-  >>> aniso8601.parse_time('23.75')
-  datetime.time(23, 45)
-
-The decimal fraction can be specified with a comma instead of a full-stop::
-
-  >>> aniso8601.parse_time('22:33,5')
-  datetime.time(22, 33, 30)
-  >>> aniso8601.parse_time('23,75')
-  datetime.time(23, 45)
-
-Leap seconds are currently not supported and attempting to parse one raises a :code:`LeapSecondError`::
-
-  >>> aniso8601.parse_time('23:59:60')
-  Traceback (most recent call last):
-    File "<stdin>", line 1, in <module>
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/time.py", line 174, in parse_time
-      return builder.build_time(hh=hourstr, mm=minutestr, ss=secondstr, tz=tz)
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 191, in build_time
-      hh, mm, ss, tz = cls.range_check_time(hh, mm, ss, tz)
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/__init__.py", line 266, in range_check_time
-      raise LeapSecondError('Leap seconds are not supported.')
-  aniso8601.exceptions.LeapSecondError: Leap seconds are not supported.
-
-To get the resolution of an ISO 8601 time string::
-
-  >>> aniso8601.get_time_resolution('11:31:14') == aniso8601.resolution.TimeResolution.Seconds
-  True
-  >>> aniso8601.get_time_resolution('11:31') == aniso8601.resolution.TimeResolution.Minutes
-  True
-  >>> aniso8601.get_time_resolution('11') == aniso8601.resolution.TimeResolution.Hours
-  True
-
-Parsing durations
------------------
-
-To parse a duration formatted as an ISO 8601 string::
-
-  >>> import aniso8601
-  >>> aniso8601.parse_duration('P1Y2M3DT4H54M6S')
-  datetime.timedelta(428, 17646)
-
-Reduced accuracy is supported::
-
-  >>> aniso8601.parse_duration('P1Y')
-  datetime.timedelta(365)
-
-A decimal fraction is allowed on the lowest order element::
-
-  >>> aniso8601.parse_duration('P1YT3.5M')
-  datetime.timedelta(365, 210)
-
-The decimal fraction can be specified with a comma instead of a full-stop::
-
-  >>> aniso8601.parse_duration('P1YT3,5M')
-  datetime.timedelta(365, 210)
-
-Parsing a duration from a combined date and time is supported as well::
-
-  >>> aniso8601.parse_duration('P0001-01-02T01:30:05')
-  datetime.timedelta(397, 5405)
-
-To get the resolution of an ISO 8601 duration string::
-
-  >>> aniso8601.get_duration_resolution('P1Y2M3DT4H54M6S') == aniso8601.resolution.DurationResolution.Seconds
-  True
-  >>> aniso8601.get_duration_resolution('P1Y2M3DT4H54M') == aniso8601.resolution.DurationResolution.Minutes
-  True
-  >>> aniso8601.get_duration_resolution('P1Y2M3DT4H') == aniso8601.resolution.DurationResolution.Hours
-  True
-  >>> aniso8601.get_duration_resolution('P1Y2M3D') == aniso8601.resolution.DurationResolution.Days
-  True
-  >>> aniso8601.get_duration_resolution('P1Y2M') == aniso8601.resolution.DurationResolution.Months
-  True
-  >>> aniso8601.get_duration_resolution('P1Y') == aniso8601.resolution.DurationResolution.Years
-  True
-
-The default :code:`PythonTimeBuilder` assumes years are 365 days, and months are 30 days. Where calendar level accuracy is required, a `RelativeTimeBuilder <https://bitbucket.org/nielsenb/relativetimebuilder>`_ can be used, see also `Builders`_.
-
-Parsing intervals
------------------
-
-To parse an interval specified by a start and end::
-
-  >>> import aniso8601
-  >>> aniso8601.parse_interval('2007-03-01T13:00:00/2008-05-11T15:30:00')
-  (datetime.datetime(2007, 3, 1, 13, 0), datetime.datetime(2008, 5, 11, 15, 30))
-
-Intervals specified by a start time and a duration are supported::
-
-  >>> aniso8601.parse_interval('2007-03-01T13:00:00Z/P1Y2M10DT2H30M')
-  (datetime.datetime(2007, 3, 1, 13, 0, tzinfo=+0:00:00 UTC), datetime.datetime(2008, 5, 9, 15, 30, tzinfo=+0:00:00 UTC))
-
-A duration can also be specified by a duration and end time::
-
-  >>> aniso8601.parse_interval('P1M/1981-04-05')
-  (datetime.date(1981, 4, 5), datetime.date(1981, 3, 6))
-
-Notice that the result of the above parse is not in order from earliest to latest. If sorted intervals are required, simply use the :code:`sorted` keyword as shown below::
-
-  >>> sorted(aniso8601.parse_interval('P1M/1981-04-05'))
-  [datetime.date(1981, 3, 6), datetime.date(1981, 4, 5)]
-
-The end of an interval is returned as a datetime when required to maintain the resolution specified by a duration, even if the duration start is given as a date::
-
-  >>> aniso8601.parse_interval('2014-11-12/PT4H54M6.5S')
-  (datetime.date(2014, 11, 12), datetime.datetime(2014, 11, 12, 4, 54, 6, 500000))
-  >>> aniso8601.parse_interval('2007-03-01/P1.5D')
-  (datetime.date(2007, 3, 1), datetime.datetime(2007, 3, 2, 12, 0))
-
-Concise representations are supported::
-
-  >>> aniso8601.parse_interval('2020-01-01/02')
-  (datetime.date(2020, 1, 1), datetime.date(2020, 1, 2))
-  >>> aniso8601.parse_interval('2007-12-14T13:30/15:30')
-  (datetime.datetime(2007, 12, 14, 13, 30), datetime.datetime(2007, 12, 14, 15, 30))
-  >>> aniso8601.parse_interval('2008-02-15/03-14')
-  (datetime.date(2008, 2, 15), datetime.date(2008, 3, 14))
-  >>> aniso8601.parse_interval('2007-11-13T09:00/15T17:00')
-  (datetime.datetime(2007, 11, 13, 9, 0), datetime.datetime(2007, 11, 15, 17, 0))
-
-Repeating intervals are supported as well, and return a `generator <https://wiki.python.org/moin/Generators>`_::
-
-  >>> aniso8601.parse_repeating_interval('R3/1981-04-05/P1D')
-  <generator object _date_generator at 0x7fd800d3b320>
-  >>> list(aniso8601.parse_repeating_interval('R3/1981-04-05/P1D'))
-  [datetime.date(1981, 4, 5), datetime.date(1981, 4, 6), datetime.date(1981, 4, 7)]
-
-Repeating intervals are allowed to go in the reverse direction::
-
-  >>> list(aniso8601.parse_repeating_interval('R2/PT1H2M/1980-03-05T01:01:00'))
-  [datetime.datetime(1980, 3, 5, 1, 1), datetime.datetime(1980, 3, 4, 23, 59)]
-
-Unbounded intervals are also allowed (Python 2)::
-
-  >>> result = aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00')
-  >>> result.next()
-  datetime.datetime(1980, 3, 5, 1, 1)
-  >>> result.next()
-  datetime.datetime(1980, 3, 4, 23, 59)
-
-or for Python 3::
-
-  >>> result = aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00')
-  >>> next(result)
-  datetime.datetime(1980, 3, 5, 1, 1)
-  >>> next(result)
-  datetime.datetime(1980, 3, 4, 23, 59)
-
-Note that you should never try to convert a generator produced by an unbounded interval to a list::
-
-  >>> list(aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00'))
-  Traceback (most recent call last):
-    File "<stdin>", line 1, in <module>
-    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 560, in _date_generator_unbounded
-      currentdate += timedelta
-  OverflowError: date value out of range
-
-To get the resolution of an ISO 8601 interval string::
-
-  >>> aniso8601.get_interval_resolution('2007-03-01T13:00:00/2008-05-11T15:30:00') == aniso8601.resolution.IntervalResolution.Seconds
-  True
-  >>> aniso8601.get_interval_resolution('2007-03-01T13:00/2008-05-11T15:30') == aniso8601.resolution.IntervalResolution.Minutes
-  True
-  >>> aniso8601.get_interval_resolution('2007-03-01T13/2008-05-11T15') == aniso8601.resolution.IntervalResolution.Hours
-  True
-  >>> aniso8601.get_interval_resolution('2007-03-01/2008-05-11') == aniso8601.resolution.IntervalResolution.Day
-  True
-  >>> aniso8601.get_interval_resolution('2007-03/P1Y') == aniso8601.resolution.IntervalResolution.Month
-  True
-  >>> aniso8601.get_interval_resolution('2007/P1Y') == aniso8601.resolution.IntervalResolution.Year
-  True
-
-And for repeating ISO 8601 interval strings::
-
-  >>> aniso8601.get_repeating_interval_resolution('R3/1981-04-05/P1D') == aniso8601.resolution.IntervalResolution.Day
-  True
-  >>> aniso8601.get_repeating_interval_resolution('R/PT1H2M/1980-03-05T01:01:00') == aniso8601.resolution.IntervalResolution.Seconds
-  True
-
-Builders
-========
-
-Builders can be used to change the output format of a parse operation. All parse functions have a :code:`builder` keyword argument which accepts a builder class.
-
-Two builders are included. The :code:`PythonTimeBuilder` (the default) in the :code:`aniso8601.builders.python` module, and the :code:`TupleBuilder` which returns the parse result as a corresponding named tuple and is located in the :code:`aniso8601.builders` module.
-
-Information on writing a builder can be found in `BUILDERS </BUILDERS.rst>`_.
-
-The following builders are available as separate projects:
-
-* `RelativeTimeBuilder <https://bitbucket.org/nielsenb/relativetimebuilder>`_ supports parsing to `datetutil relativedelta types <https://dateutil.readthedocs.io/en/stable/relativedelta.html>`_ for calendar level accuracy
-* `AttoTimeBuilder <https://bitbucket.org/nielsenb/attotimebuilder>`_ supports parsing directly to `attotime attodatetime and attotimedelta types <https://bitbucket.org/nielsenb/attotime>`_ which support sub-nanosecond precision
-* `NumPyTimeBuilder <https://bitbucket.org/nielsenb/numpytimebuilder>`_ supports parsing directly to `NumPy datetime64 and timedelta64 types <https://docs.scipy.org/doc/numpy/reference/arrays.datetime.html>`_
-
-TupleBuilder
-------------
-
-The :code:`TupleBuilder` returns parse results as `named tuples <https://docs.python.org/3/library/collections.html#collections.namedtuple>`_. It is located in the :code:`aniso8601.builders` module.
-
-Datetimes
-^^^^^^^^^
-
-Parsing a datetime returns a :code:`DatetimeTuple` containing :code:`Date` and :code:`Time` tuples . The date tuple contains the following parse components: :code:`YYYY`, :code:`MM`, :code:`DD`, :code:`Www`, :code:`D`, :code:`DDD`. The time tuple contains the following parse components :code:`hh`, :code:`mm`, :code:`ss`, :code:`tz`, where :code:`tz` itself is a tuple with the following components :code:`negative`, :code:`Z`, :code:`hh`, :code:`mm`, :code:`name` with :code:`negative` and :code:`Z` being booleans::
-
-  >>> import aniso8601
-  >>> from aniso8601.builders import TupleBuilder
-  >>> aniso8601.parse_datetime('1977-06-10T12:00:00', builder=TupleBuilder)
-  Datetime(date=Date(YYYY='1977', MM='06', DD='10', Www=None, D=None, DDD=None), time=Time(hh='12', mm='00', ss='00', tz=None))
-  >>> aniso8601.parse_datetime('1979-06-05T08:00:00-08:00', builder=TupleBuilder)
-  Datetime(date=Date(YYYY='1979', MM='06', DD='05', Www=None, D=None, DDD=None), time=Time(hh='08', mm='00', ss='00', tz=Timezone(negative=True, Z=None, hh='08', mm='00', name='-08:00')))
-
-Dates
-^^^^^
-
-Parsing a date returns a :code:`DateTuple` containing the following parse components: :code:`YYYY`, :code:`MM`, :code:`DD`, :code:`Www`, :code:`D`, :code:`DDD`::
-
-  >>> import aniso8601
-  >>> from aniso8601.builders import TupleBuilder
-  >>> aniso8601.parse_date('1984-04-23', builder=TupleBuilder)
-  Date(YYYY='1984', MM='04', DD='23', Www=None, D=None, DDD=None)
-  >>> aniso8601.parse_date('1986-W38-1', builder=TupleBuilder)
-  Date(YYYY='1986', MM=None, DD=None, Www='38', D='1', DDD=None)
-  >>> aniso8601.parse_date('1988-132', builder=TupleBuilder)
-  Date(YYYY='1988', MM=None, DD=None, Www=None, D=None, DDD='132')
-
-Times
-^^^^^
-
-Parsing a time returns a :code:`TimeTuple` containing following parse components: :code:`hh`, :code:`mm`, :code:`ss`, :code:`tz`, where :code:`tz` is a :code:`TimezoneTuple` with the following components :code:`negative`, :code:`Z`, :code:`hh`, :code:`mm`, :code:`name`, with :code:`negative` and :code:`Z` being booleans::
-
-  >>> import aniso8601
-  >>> from aniso8601.builders import TupleBuilder
-  >>> aniso8601.parse_time('11:31:14', builder=TupleBuilder)
-  Time(hh='11', mm='31', ss='14', tz=None)
-  >>> aniso8601.parse_time('171819Z', builder=TupleBuilder)
-  Time(hh='17', mm='18', ss='19', tz=Timezone(negative=False, Z=True, hh=None, mm=None, name='Z'))
-  >>> aniso8601.parse_time('17:18:19-02:30', builder=TupleBuilder)
-  Time(hh='17', mm='18', ss='19', tz=Timezone(negative=True, Z=None, hh='02', mm='30', name='-02:30'))
-
-Durations
-^^^^^^^^^
-
-Parsing a duration returns a :code:`DurationTuple` containing the following parse components: :code:`PnY`, :code:`PnM`, :code:`PnW`, :code:`PnD`, :code:`TnH`, :code:`TnM`, :code:`TnS`::
-
-  >>> import aniso8601
-  >>> from aniso8601.builders import TupleBuilder
-  >>> aniso8601.parse_duration('P1Y2M3DT4H54M6S', builder=TupleBuilder)
-  Duration(PnY='1', PnM='2', PnW=None, PnD='3', TnH='4', TnM='54', TnS='6')
-  >>> aniso8601.parse_duration('P7W', builder=TupleBuilder)
-  Duration(PnY=None, PnM=None, PnW='7', PnD=None, TnH=None, TnM=None, TnS=None)
-
-Intervals
-^^^^^^^^^
-
-Parsing an interval returns an :code:`IntervalTuple` containing the following parse components: :code:`start`, :code:`end`, :code:`duration`, :code:`start` and :code:`end` may both be datetime or date tuples, :code:`duration` is a duration tuple::
-
-  >>> import aniso8601
-  >>> from aniso8601.builders import TupleBuilder
-  >>> aniso8601.parse_interval('2007-03-01T13:00:00/2008-05-11T15:30:00', builder=TupleBuilder)
-  Interval(start=Datetime(date=Date(YYYY='2007', MM='03', DD='01', Www=None, D=None, DDD=None), time=Time(hh='13', mm='00', ss='00', tz=None)), end=Datetime(date=Date(YYYY='2008', MM='05', DD='11', Www=None, D=None, DDD=None), time=Time(hh='15', mm='30', ss='00', tz=None)), duration=None)
-  >>> aniso8601.parse_interval('2007-03-01T13:00:00Z/P1Y2M10DT2H30M', builder=TupleBuilder)
-  Interval(start=Datetime(date=Date(YYYY='2007', MM='03', DD='01', Www=None, D=None, DDD=None), time=Time(hh='13', mm='00', ss='00', tz=Timezone(negative=False, Z=True, hh=None, mm=None, name='Z'))), end=None, duration=Duration(PnY='1', PnM='2', PnW=None, PnD='10', TnH='2', TnM='30', TnS=None))
-  >>> aniso8601.parse_interval('P1M/1981-04-05', builder=TupleBuilder)
-  Interval(start=None, end=Date(YYYY='1981', MM='04', DD='05', Www=None, D=None, DDD=None), duration=Duration(PnY=None, PnM='1', PnW=None, PnD=None, TnH=None, TnM=None, TnS=None))
-
-A repeating interval returns a :code:`RepeatingIntervalTuple` containing the following parse components: :code:`R`, :code:`Rnn`, :code:`interval`, where :code:`R` is a boolean, :code:`True` for an unbounded interval, :code:`False` otherwise.::
-
-  >>> aniso8601.parse_repeating_interval('R3/1981-04-05/P1D', builder=TupleBuilder)
-  RepeatingInterval(R=False, Rnn='3', interval=Interval(start=Date(YYYY='1981', MM='04', DD='05', Www=None, D=None, DDD=None), end=None, duration=Duration(PnY=None, PnM=None, PnW=None, PnD='1', TnH=None, TnM=None, TnS=None)))
-  >>> aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00', builder=TupleBuilder)
-  RepeatingInterval(R=True, Rnn=None, interval=Interval(start=None, end=Datetime(date=Date(YYYY='1980', MM='03', DD='05', Www=None, D=None, DDD=None), time=Time(hh='01', mm='01', ss='00', tz=None)), duration=Duration(PnY=None, PnM=None, PnW=None, PnD=None, TnH='1', TnM='2', TnS=None)))
-
-Development
-===========
-
-Setup
------
-
-It is recommended to develop using a `virtualenv <https://virtualenv.pypa.io/en/stable/>`_.
-
-Inside a virtualenv, development dependencies can be installed automatically::
-
-  $ pip install -e .[dev]
-
-`pre-commit <https://pre-commit.com/>`_ is used for managing pre-commit hooks::
-
-  $ pre-commit install
-
-To run the pre-commit hooks manually::
-
-  $ pre-commit run --all-files
-
-Tests
------
-
-Tests can be run using the `unittest testing framework <https://docs.python.org/3/library/unittest.html>`_::
-
-  $ python -m unittest discover aniso8601
-
-Contributing
-============
-
-aniso8601 is an open source project hosted on `Bitbucket <https://bitbucket.org/nielsenb/aniso8601>`_.
-
-Any and all bugs are welcome on our `issue tracker <https://bitbucket.org/nielsenb/aniso8601/issues>`_.
-Of particular interest are valid ISO 8601 strings that don't parse, or invalid ones that do. At a minimum,
-bug reports should include an example of the misbehaving string, as well as the expected result. Of course
-patches containing unit tests (or fixed bugs) are welcome!
-
-References
-==========
-
-* `ISO 8601:2004(E) <http://dotat.at/tmp/ISO_8601-2004_E.pdf>`_ (Caution, PDF link)
-* `Wikipedia article on ISO 8601 <http://en.wikipedia.org/wiki/Iso8601>`_
-* `Discussion on alternative ISO 8601 parsers for Python <https://groups.google.com/forum/#!topic/comp.lang.python/Q2w4R89Nq1w>`_
diff --git a/libs/aniso8601-10.0.0.dist-info/RECORD b/libs/aniso8601-10.0.0.dist-info/RECORD
deleted file mode 100644
index 0133ce0c27..0000000000
--- a/libs/aniso8601-10.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-aniso8601-10.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-aniso8601-10.0.0.dist-info/LICENSE,sha256=w8yguadP0pZovZm13PAnTVO-kE3md4kW3IUnCPQHsPA,1501
-aniso8601-10.0.0.dist-info/METADATA,sha256=X3OCmIqObDsY5xQ0FnwtcbDWZ6ryJ70ADDbImMVzdck,23371
-aniso8601-10.0.0.dist-info/RECORD,,
-aniso8601-10.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aniso8601-10.0.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-aniso8601-10.0.0.dist-info/top_level.txt,sha256=MVQomyeED8nGIH7PUQdMzxgLppIB48oYHtcmL17ETB0,10
-aniso8601/__init__.py,sha256=LwoL2Wj0kdYdHS3YqvGPH6SJ1HQWpsN9jKsAMHlAdwE,705
-aniso8601/builders/__init__.py,sha256=jXJ75D-QRhB8huW2GyShjh_I4Z83ua4Qgzn1DQiX-1M,17975
-aniso8601/builders/python.py,sha256=U0Tvqt4vPVcH9epfkbz_o4550yr_4_Q8SvoUdj9JAvs,22072
-aniso8601/builders/tests/__init__.py,sha256=qjC0jrTWf2UUlZtXE3AKcMFSLC2kQPOvAI36t5gc8q0,209
-aniso8601/builders/tests/test_init.py,sha256=pyES5pMJUWy16KK4MLsfzRmPRcQvj6_vxcM8yzeZxOc,29997
-aniso8601/builders/tests/test_python.py,sha256=dhkaGiE0ToMPBhUmhOAeM32aC2SDu6Rj6d4YniV2M7A,62032
-aniso8601/compat.py,sha256=CvNkC-tCr3hzv1i9VOzgiPaS2EUxCfxtfo8SkJ2Juyc,571
-aniso8601/date.py,sha256=D3Kffr6Ln_z0fNTP5KAQa0R0T00VdmZgIS_O-pVmxnI,4496
-aniso8601/decimalfraction.py,sha256=NBUies6Gp1NrVkSU_9MwJNu28OhUIeWXNpkTRcClGYA,333
-aniso8601/duration.py,sha256=XEMm8t3Vipw3YsCgXf17XA10dHmUCQuJo4-PX4z8U7I,9550
-aniso8601/exceptions.py,sha256=uCQIrrIpCJV-n3WDUuhB3wMdgmHuu1UqOXrE9ct3xPY,1313
-aniso8601/interval.py,sha256=ruz49D2BoyoyYggM2oLrz0HSB8CIPxdl4LZCvwq3kCg,10752
-aniso8601/resolution.py,sha256=RJGfir0k6IiR3L1ZCrPvjhsQliVT_ZOcaeKqJqH6JHM,684
-aniso8601/tests/__init__.py,sha256=qjC0jrTWf2UUlZtXE3AKcMFSLC2kQPOvAI36t5gc8q0,209
-aniso8601/tests/compat.py,sha256=J4Ocl6zpo7WmA_pItOc2KUH8xZU156L9fTbCBBFX9xY,346
-aniso8601/tests/test_compat.py,sha256=55qZ_Uu7XRQo8hXNDUjy-IB3WaTqATnVtMlAJP4TGr4,763
-aniso8601/tests/test_date.py,sha256=bJy2ve-iFmWlBCWDidfK2lB-7OBMjeATfK3SBFSet4U,9266
-aniso8601/tests/test_decimalfraction.py,sha256=bvPPSuWnS2XfD10wBUjg5nFFbI1kfBshR2Wkmfggu6I,578
-aniso8601/tests/test_duration.py,sha256=QRLpd_bdgEzHjcLkLMFMWnGF4bN_YxPDdtwACtBekc4,44952
-aniso8601/tests/test_init.py,sha256=1GF0Yms8adNM3Ax13w2ncSz6toHhK3pRkPYoNaRcPVk,1689
-aniso8601/tests/test_interval.py,sha256=GjeU8HrIT-klpselgsgMcF1KfuV7sDKLlyVU5S4XMCQ,60457
-aniso8601/tests/test_time.py,sha256=SS0jXkEl5bYFSe1qFPpjZ0GNXycgBMH16Uc885ujR7I,19147
-aniso8601/tests/test_timezone.py,sha256=EJk2cTsHddhe2Pqtzl250gKF8XoXynEAngNctk23b48,4649
-aniso8601/tests/test_utcoffset.py,sha256=wQ7ivBqax2KP340tlC0DBxM7DTK9SNy_Zq_13FqeaKM,1926
-aniso8601/time.py,sha256=CZRisJz6u7fBfMthZvNcUuVFSL_GCYi9WEjXsbrnDF8,5687
-aniso8601/timezone.py,sha256=xpukG_AuvyMNGs57y4bf40eHRcpe3b1fKC8x-H8Epo8,2124
-aniso8601/utcoffset.py,sha256=dm7-eFl6WQFPpDamcTVl46aEjmGObpWJdSZJ-QzblfU,2421
diff --git a/libs/aniso8601-10.0.0.dist-info/WHEEL b/libs/aniso8601-10.0.0.dist-info/WHEEL
deleted file mode 100644
index f31e450fda..0000000000
--- a/libs/aniso8601-10.0.0.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/INSTALLER b/libs/aniso8601-10.0.1.dist-info/INSTALLER
similarity index 100%
rename from libs/Flask_SocketIO-5.5.1.dist-info/INSTALLER
rename to libs/aniso8601-10.0.1.dist-info/INSTALLER
diff --git a/libs/aniso8601-10.0.1.dist-info/METADATA b/libs/aniso8601-10.0.1.dist-info/METADATA
new file mode 100644
index 0000000000..02d6daf939
--- /dev/null
+++ b/libs/aniso8601-10.0.1.dist-info/METADATA
@@ -0,0 +1,521 @@
+Metadata-Version: 2.4
+Name: aniso8601
+Version: 10.0.1
+Summary: A library for parsing ISO 8601 strings.
+Home-page: https://codeberg.org/nielsenb-jf/aniso8601
+Author: Brandon Nielsen
+Author-email: nielsenb@jetfuse.net
+Project-URL: Changelog, https://codeberg.org/nielsenb-jf/aniso8601/src/branch/main/CHANGELOG.rst
+Project-URL: Documentation, https://aniso8601.readthedocs.io/
+Project-URL: Source, https://codeberg.org/nielsenb-jf/aniso8601
+Project-URL: Tracker, https://codeberg.org/nielsenb-jf/aniso8601/issues
+Keywords: iso8601 parser
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Provides-Extra: dev
+Requires-Dist: black; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
+Requires-Dist: pyenchant; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: summary
+
+aniso8601
+=========
+
+Another ISO 8601 parser for Python
+----------------------------------
+
+Features
+========
+* Pure Python implementation
+* Logical behavior
+
+  - Parse a time, get a `datetime.time <http://docs.python.org/3/library/datetime.html#datetime.time>`_
+  - Parse a date, get a `datetime.date <http://docs.python.org/3/library/datetime.html#datetime.date>`_
+  - Parse a datetime, get a `datetime.datetime <http://docs.python.org/3/library/datetime.html#datetime.datetime>`_
+  - Parse a duration, get a `datetime.timedelta <http://docs.python.org/3/library/datetime.html#datetime.timedelta>`_
+  - Parse an interval, get a tuple of dates or datetimes
+  - Parse a repeating interval, get a date or datetime `generator <https://wiki.python.org/moin/Generators>`_
+
+* UTC offset represented as fixed-offset tzinfo
+* Parser separate from representation, allowing parsing to different datetime representations (see `Builders`_)
+* No regular expressions
+
+Installation
+============
+
+The recommended installation method is to use pip::
+
+  $ pip install aniso8601
+
+Alternatively, you can download the source (git repository hosted at `Codeberg <https://codeberg.org/nielsenb-jf/aniso8601>`_) and install directly::
+
+  $ python setup.py install
+
+Use
+===
+
+Parsing datetimes
+-----------------
+
+*Consider* `datetime.datetime.fromisoformat <https://docs.python.org/3/library/datetime.html#datetime.datetime.fromisoformat>`_ *for basic ISO 8601 datetime parsing*
+
+To parse a typical ISO 8601 datetime string::
+
+  >>> import aniso8601
+  >>> aniso8601.parse_datetime('1977-06-10T12:00:00Z')
+  datetime.datetime(1977, 6, 10, 12, 0, tzinfo=+0:00:00 UTC)
+
+Alternative delimiters can be specified, for example, a space::
+
+  >>> aniso8601.parse_datetime('1977-06-10 12:00:00Z', delimiter=' ')
+  datetime.datetime(1977, 6, 10, 12, 0, tzinfo=+0:00:00 UTC)
+
+UTC offsets are supported::
+
+  >>> aniso8601.parse_datetime('1979-06-05T08:00:00-08:00')
+  datetime.datetime(1979, 6, 5, 8, 0, tzinfo=-8:00:00 UTC)
+
+If a UTC offset is not specified, the returned datetime will be naive::
+
+  >>> aniso8601.parse_datetime('1983-01-22T08:00:00')
+  datetime.datetime(1983, 1, 22, 8, 0)
+
+Leap seconds are currently not supported and attempting to parse one raises a :code:`LeapSecondError`::
+
+  >>> aniso8601.parse_datetime('2018-03-06T23:59:60')
+  Traceback (most recent call last):
+    File "<stdin>", line 1, in <module>
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/time.py", line 196, in parse_datetime
+      return builder.build_datetime(datepart, timepart)
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 237, in build_datetime
+      cls._build_object(time))
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/__init__.py", line 336, in _build_object
+      return cls.build_time(hh=parsetuple.hh, mm=parsetuple.mm,
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 191, in build_time
+      hh, mm, ss, tz = cls.range_check_time(hh, mm, ss, tz)
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/__init__.py", line 266, in range_check_time
+      raise LeapSecondError('Leap seconds are not supported.')
+  aniso8601.exceptions.LeapSecondError: Leap seconds are not supported.
+
+To get the resolution of an ISO 8601 datetime string::
+
+  >>> aniso8601.get_datetime_resolution('1977-06-10T12:00:00Z') == aniso8601.resolution.TimeResolution.Seconds
+  True
+  >>> aniso8601.get_datetime_resolution('1977-06-10T12:00') == aniso8601.resolution.TimeResolution.Minutes
+  True
+  >>> aniso8601.get_datetime_resolution('1977-06-10T12') == aniso8601.resolution.TimeResolution.Hours
+  True
+
+Note that datetime resolutions map to :code:`TimeResolution` as a valid datetime must have at least one time member so the resolution mapping is equivalent.
+
+Parsing dates
+-------------
+
+*Consider* `datetime.date.fromisoformat <https://docs.python.org/3/library/datetime.html#datetime.date.fromisoformat>`_ *for basic ISO 8601 date parsing*
+
+To parse a date represented in an ISO 8601 string::
+
+  >>> import aniso8601
+  >>> aniso8601.parse_date('1984-04-23')
+  datetime.date(1984, 4, 23)
+
+Basic format is supported as well::
+
+  >>> aniso8601.parse_date('19840423')
+  datetime.date(1984, 4, 23)
+
+To parse a date using the ISO 8601 week date format::
+
+  >>> aniso8601.parse_date('1986-W38-1')
+  datetime.date(1986, 9, 15)
+
+To parse an ISO 8601 ordinal date::
+
+  >>> aniso8601.parse_date('1988-132')
+  datetime.date(1988, 5, 11)
+
+To get the resolution of an ISO 8601 date string::
+
+  >>> aniso8601.get_date_resolution('1981-04-05') == aniso8601.resolution.DateResolution.Day
+  True
+  >>> aniso8601.get_date_resolution('1981-04') == aniso8601.resolution.DateResolution.Month
+  True
+  >>> aniso8601.get_date_resolution('1981') == aniso8601.resolution.DateResolution.Year
+  True
+
+Parsing times
+-------------
+
+*Consider* `datetime.time.fromisoformat <https://docs.python.org/3/library/datetime.html#datetime.time.fromisoformat>`_ *for basic ISO 8601 time parsing*
+
+To parse a time formatted as an ISO 8601 string::
+
+  >>> import aniso8601
+  >>> aniso8601.parse_time('11:31:14')
+  datetime.time(11, 31, 14)
+
+As with all of the above, basic format is supported::
+
+  >>> aniso8601.parse_time('113114')
+  datetime.time(11, 31, 14)
+
+A UTC offset can be specified for times::
+
+  >>> aniso8601.parse_time('17:18:19-02:30')
+  datetime.time(17, 18, 19, tzinfo=-2:30:00 UTC)
+  >>> aniso8601.parse_time('171819Z')
+  datetime.time(17, 18, 19, tzinfo=+0:00:00 UTC)
+
+Reduced accuracy is supported::
+
+  >>> aniso8601.parse_time('21:42')
+  datetime.time(21, 42)
+  >>> aniso8601.parse_time('22')
+  datetime.time(22, 0)
+
+A decimal fraction is always allowed on the lowest order element of an ISO 8601 formatted time::
+
+  >>> aniso8601.parse_time('22:33.5')
+  datetime.time(22, 33, 30)
+  >>> aniso8601.parse_time('23.75')
+  datetime.time(23, 45)
+
+The decimal fraction can be specified with a comma instead of a full-stop::
+
+  >>> aniso8601.parse_time('22:33,5')
+  datetime.time(22, 33, 30)
+  >>> aniso8601.parse_time('23,75')
+  datetime.time(23, 45)
+
+Leap seconds are currently not supported and attempting to parse one raises a :code:`LeapSecondError`::
+
+  >>> aniso8601.parse_time('23:59:60')
+  Traceback (most recent call last):
+    File "<stdin>", line 1, in <module>
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/time.py", line 174, in parse_time
+      return builder.build_time(hh=hourstr, mm=minutestr, ss=secondstr, tz=tz)
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 191, in build_time
+      hh, mm, ss, tz = cls.range_check_time(hh, mm, ss, tz)
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/__init__.py", line 266, in range_check_time
+      raise LeapSecondError('Leap seconds are not supported.')
+  aniso8601.exceptions.LeapSecondError: Leap seconds are not supported.
+
+To get the resolution of an ISO 8601 time string::
+
+  >>> aniso8601.get_time_resolution('11:31:14') == aniso8601.resolution.TimeResolution.Seconds
+  True
+  >>> aniso8601.get_time_resolution('11:31') == aniso8601.resolution.TimeResolution.Minutes
+  True
+  >>> aniso8601.get_time_resolution('11') == aniso8601.resolution.TimeResolution.Hours
+  True
+
+Parsing durations
+-----------------
+
+To parse a duration formatted as an ISO 8601 string::
+
+  >>> import aniso8601
+  >>> aniso8601.parse_duration('P1Y2M3DT4H54M6S')
+  datetime.timedelta(428, 17646)
+
+Reduced accuracy is supported::
+
+  >>> aniso8601.parse_duration('P1Y')
+  datetime.timedelta(365)
+
+A decimal fraction is allowed on the lowest order element::
+
+  >>> aniso8601.parse_duration('P1YT3.5M')
+  datetime.timedelta(365, 210)
+
+The decimal fraction can be specified with a comma instead of a full-stop::
+
+  >>> aniso8601.parse_duration('P1YT3,5M')
+  datetime.timedelta(365, 210)
+
+Parsing a duration from a combined date and time is supported as well::
+
+  >>> aniso8601.parse_duration('P0001-01-02T01:30:05')
+  datetime.timedelta(397, 5405)
+
+To get the resolution of an ISO 8601 duration string::
+
+  >>> aniso8601.get_duration_resolution('P1Y2M3DT4H54M6S') == aniso8601.resolution.DurationResolution.Seconds
+  True
+  >>> aniso8601.get_duration_resolution('P1Y2M3DT4H54M') == aniso8601.resolution.DurationResolution.Minutes
+  True
+  >>> aniso8601.get_duration_resolution('P1Y2M3DT4H') == aniso8601.resolution.DurationResolution.Hours
+  True
+  >>> aniso8601.get_duration_resolution('P1Y2M3D') == aniso8601.resolution.DurationResolution.Days
+  True
+  >>> aniso8601.get_duration_resolution('P1Y2M') == aniso8601.resolution.DurationResolution.Months
+  True
+  >>> aniso8601.get_duration_resolution('P1Y') == aniso8601.resolution.DurationResolution.Years
+  True
+
+The default :code:`PythonTimeBuilder` assumes years are 365 days, and months are 30 days. Where calendar level accuracy is required, a `RelativeTimeBuilder <https://codeberg.org/nielsenb-jf/relativetimebuilder>`_ can be used, see also `Builders`_.
+
+Parsing intervals
+-----------------
+
+To parse an interval specified by a start and end::
+
+  >>> import aniso8601
+  >>> aniso8601.parse_interval('2007-03-01T13:00:00/2008-05-11T15:30:00')
+  (datetime.datetime(2007, 3, 1, 13, 0), datetime.datetime(2008, 5, 11, 15, 30))
+
+Intervals specified by a start time and a duration are supported::
+
+  >>> aniso8601.parse_interval('2007-03-01T13:00:00Z/P1Y2M10DT2H30M')
+  (datetime.datetime(2007, 3, 1, 13, 0, tzinfo=+0:00:00 UTC), datetime.datetime(2008, 5, 9, 15, 30, tzinfo=+0:00:00 UTC))
+
+A duration can also be specified by a duration and end time::
+
+  >>> aniso8601.parse_interval('P1M/1981-04-05')
+  (datetime.date(1981, 4, 5), datetime.date(1981, 3, 6))
+
+Notice that the result of the above parse is not in order from earliest to latest. If sorted intervals are required, simply use the :code:`sorted` keyword as shown below::
+
+  >>> sorted(aniso8601.parse_interval('P1M/1981-04-05'))
+  [datetime.date(1981, 3, 6), datetime.date(1981, 4, 5)]
+
+The end of an interval is returned as a datetime when required to maintain the resolution specified by a duration, even if the duration start is given as a date::
+
+  >>> aniso8601.parse_interval('2014-11-12/PT4H54M6.5S')
+  (datetime.date(2014, 11, 12), datetime.datetime(2014, 11, 12, 4, 54, 6, 500000))
+  >>> aniso8601.parse_interval('2007-03-01/P1.5D')
+  (datetime.date(2007, 3, 1), datetime.datetime(2007, 3, 2, 12, 0))
+
+Concise representations are supported::
+
+  >>> aniso8601.parse_interval('2020-01-01/02')
+  (datetime.date(2020, 1, 1), datetime.date(2020, 1, 2))
+  >>> aniso8601.parse_interval('2007-12-14T13:30/15:30')
+  (datetime.datetime(2007, 12, 14, 13, 30), datetime.datetime(2007, 12, 14, 15, 30))
+  >>> aniso8601.parse_interval('2008-02-15/03-14')
+  (datetime.date(2008, 2, 15), datetime.date(2008, 3, 14))
+  >>> aniso8601.parse_interval('2007-11-13T09:00/15T17:00')
+  (datetime.datetime(2007, 11, 13, 9, 0), datetime.datetime(2007, 11, 15, 17, 0))
+
+Repeating intervals are supported as well, and return a `generator <https://wiki.python.org/moin/Generators>`_::
+
+  >>> aniso8601.parse_repeating_interval('R3/1981-04-05/P1D')
+  <generator object _date_generator at 0x7fd800d3b320>
+  >>> list(aniso8601.parse_repeating_interval('R3/1981-04-05/P1D'))
+  [datetime.date(1981, 4, 5), datetime.date(1981, 4, 6), datetime.date(1981, 4, 7)]
+
+Repeating intervals are allowed to go in the reverse direction::
+
+  >>> list(aniso8601.parse_repeating_interval('R2/PT1H2M/1980-03-05T01:01:00'))
+  [datetime.datetime(1980, 3, 5, 1, 1), datetime.datetime(1980, 3, 4, 23, 59)]
+
+Unbounded intervals are also allowed (Python 2)::
+
+  >>> result = aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00')
+  >>> result.next()
+  datetime.datetime(1980, 3, 5, 1, 1)
+  >>> result.next()
+  datetime.datetime(1980, 3, 4, 23, 59)
+
+or for Python 3::
+
+  >>> result = aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00')
+  >>> next(result)
+  datetime.datetime(1980, 3, 5, 1, 1)
+  >>> next(result)
+  datetime.datetime(1980, 3, 4, 23, 59)
+
+Note that you should never try to convert a generator produced by an unbounded interval to a list::
+
+  >>> list(aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00'))
+  Traceback (most recent call last):
+    File "<stdin>", line 1, in <module>
+    File "/home/nielsenb/Jetfuse/aniso8601/aniso8601/aniso8601/builders/python.py", line 560, in _date_generator_unbounded
+      currentdate += timedelta
+  OverflowError: date value out of range
+
+To get the resolution of an ISO 8601 interval string::
+
+  >>> aniso8601.get_interval_resolution('2007-03-01T13:00:00/2008-05-11T15:30:00') == aniso8601.resolution.IntervalResolution.Seconds
+  True
+  >>> aniso8601.get_interval_resolution('2007-03-01T13:00/2008-05-11T15:30') == aniso8601.resolution.IntervalResolution.Minutes
+  True
+  >>> aniso8601.get_interval_resolution('2007-03-01T13/2008-05-11T15') == aniso8601.resolution.IntervalResolution.Hours
+  True
+  >>> aniso8601.get_interval_resolution('2007-03-01/2008-05-11') == aniso8601.resolution.IntervalResolution.Day
+  True
+  >>> aniso8601.get_interval_resolution('2007-03/P1Y') == aniso8601.resolution.IntervalResolution.Month
+  True
+  >>> aniso8601.get_interval_resolution('2007/P1Y') == aniso8601.resolution.IntervalResolution.Year
+  True
+
+And for repeating ISO 8601 interval strings::
+
+  >>> aniso8601.get_repeating_interval_resolution('R3/1981-04-05/P1D') == aniso8601.resolution.IntervalResolution.Day
+  True
+  >>> aniso8601.get_repeating_interval_resolution('R/PT1H2M/1980-03-05T01:01:00') == aniso8601.resolution.IntervalResolution.Seconds
+  True
+
+Builders
+========
+
+Builders can be used to change the output format of a parse operation. All parse functions have a :code:`builder` keyword argument which accepts a builder class.
+
+Two builders are included. The :code:`PythonTimeBuilder` (the default) in the :code:`aniso8601.builders.python` module, and the :code:`TupleBuilder` which returns the parse result as a corresponding named tuple and is located in the :code:`aniso8601.builders` module.
+
+Information on writing a builder can be found in `BUILDERS </BUILDERS.rst>`_.
+
+The following builders are available as separate projects:
+
+* `RelativeTimeBuilder <https://codeberg.org/nielsenb-jf/relativetimebuilder>`_ supports parsing to `datetutil relativedelta types <https://dateutil.readthedocs.io/en/stable/relativedelta.html>`_ for calendar level accuracy
+* `AttoTimeBuilder <https://codeberg.org/nielsenb-jf/attotimebuilder>`_ supports parsing directly to `attotime attodatetime and attotimedelta types <https://codeberg.org/nielsenb-jf/attotime>`_ which support sub-nanosecond precision
+* `NumPyTimeBuilder <https://codeberg.org/nielsenb-jf/numpytimebuilder>`_ supports parsing directly to `NumPy datetime64 and timedelta64 types <https://docs.scipy.org/doc/numpy/reference/arrays.datetime.html>`_
+
+TupleBuilder
+------------
+
+The :code:`TupleBuilder` returns parse results as `named tuples <https://docs.python.org/3/library/collections.html#collections.namedtuple>`_. It is located in the :code:`aniso8601.builders` module.
+
+Datetimes
+^^^^^^^^^
+
+Parsing a datetime returns a :code:`DatetimeTuple` containing :code:`Date` and :code:`Time` tuples . The date tuple contains the following parse components: :code:`YYYY`, :code:`MM`, :code:`DD`, :code:`Www`, :code:`D`, :code:`DDD`. The time tuple contains the following parse components :code:`hh`, :code:`mm`, :code:`ss`, :code:`tz`, where :code:`tz` itself is a tuple with the following components :code:`negative`, :code:`Z`, :code:`hh`, :code:`mm`, :code:`name` with :code:`negative` and :code:`Z` being booleans::
+
+  >>> import aniso8601
+  >>> from aniso8601.builders import TupleBuilder
+  >>> aniso8601.parse_datetime('1977-06-10T12:00:00', builder=TupleBuilder)
+  Datetime(date=Date(YYYY='1977', MM='06', DD='10', Www=None, D=None, DDD=None), time=Time(hh='12', mm='00', ss='00', tz=None))
+  >>> aniso8601.parse_datetime('1979-06-05T08:00:00-08:00', builder=TupleBuilder)
+  Datetime(date=Date(YYYY='1979', MM='06', DD='05', Www=None, D=None, DDD=None), time=Time(hh='08', mm='00', ss='00', tz=Timezone(negative=True, Z=None, hh='08', mm='00', name='-08:00')))
+
+Dates
+^^^^^
+
+Parsing a date returns a :code:`DateTuple` containing the following parse components: :code:`YYYY`, :code:`MM`, :code:`DD`, :code:`Www`, :code:`D`, :code:`DDD`::
+
+  >>> import aniso8601
+  >>> from aniso8601.builders import TupleBuilder
+  >>> aniso8601.parse_date('1984-04-23', builder=TupleBuilder)
+  Date(YYYY='1984', MM='04', DD='23', Www=None, D=None, DDD=None)
+  >>> aniso8601.parse_date('1986-W38-1', builder=TupleBuilder)
+  Date(YYYY='1986', MM=None, DD=None, Www='38', D='1', DDD=None)
+  >>> aniso8601.parse_date('1988-132', builder=TupleBuilder)
+  Date(YYYY='1988', MM=None, DD=None, Www=None, D=None, DDD='132')
+
+Times
+^^^^^
+
+Parsing a time returns a :code:`TimeTuple` containing following parse components: :code:`hh`, :code:`mm`, :code:`ss`, :code:`tz`, where :code:`tz` is a :code:`TimezoneTuple` with the following components :code:`negative`, :code:`Z`, :code:`hh`, :code:`mm`, :code:`name`, with :code:`negative` and :code:`Z` being booleans::
+
+  >>> import aniso8601
+  >>> from aniso8601.builders import TupleBuilder
+  >>> aniso8601.parse_time('11:31:14', builder=TupleBuilder)
+  Time(hh='11', mm='31', ss='14', tz=None)
+  >>> aniso8601.parse_time('171819Z', builder=TupleBuilder)
+  Time(hh='17', mm='18', ss='19', tz=Timezone(negative=False, Z=True, hh=None, mm=None, name='Z'))
+  >>> aniso8601.parse_time('17:18:19-02:30', builder=TupleBuilder)
+  Time(hh='17', mm='18', ss='19', tz=Timezone(negative=True, Z=None, hh='02', mm='30', name='-02:30'))
+
+Durations
+^^^^^^^^^
+
+Parsing a duration returns a :code:`DurationTuple` containing the following parse components: :code:`PnY`, :code:`PnM`, :code:`PnW`, :code:`PnD`, :code:`TnH`, :code:`TnM`, :code:`TnS`::
+
+  >>> import aniso8601
+  >>> from aniso8601.builders import TupleBuilder
+  >>> aniso8601.parse_duration('P1Y2M3DT4H54M6S', builder=TupleBuilder)
+  Duration(PnY='1', PnM='2', PnW=None, PnD='3', TnH='4', TnM='54', TnS='6')
+  >>> aniso8601.parse_duration('P7W', builder=TupleBuilder)
+  Duration(PnY=None, PnM=None, PnW='7', PnD=None, TnH=None, TnM=None, TnS=None)
+
+Intervals
+^^^^^^^^^
+
+Parsing an interval returns an :code:`IntervalTuple` containing the following parse components: :code:`start`, :code:`end`, :code:`duration`, :code:`start` and :code:`end` may both be datetime or date tuples, :code:`duration` is a duration tuple::
+
+  >>> import aniso8601
+  >>> from aniso8601.builders import TupleBuilder
+  >>> aniso8601.parse_interval('2007-03-01T13:00:00/2008-05-11T15:30:00', builder=TupleBuilder)
+  Interval(start=Datetime(date=Date(YYYY='2007', MM='03', DD='01', Www=None, D=None, DDD=None), time=Time(hh='13', mm='00', ss='00', tz=None)), end=Datetime(date=Date(YYYY='2008', MM='05', DD='11', Www=None, D=None, DDD=None), time=Time(hh='15', mm='30', ss='00', tz=None)), duration=None)
+  >>> aniso8601.parse_interval('2007-03-01T13:00:00Z/P1Y2M10DT2H30M', builder=TupleBuilder)
+  Interval(start=Datetime(date=Date(YYYY='2007', MM='03', DD='01', Www=None, D=None, DDD=None), time=Time(hh='13', mm='00', ss='00', tz=Timezone(negative=False, Z=True, hh=None, mm=None, name='Z'))), end=None, duration=Duration(PnY='1', PnM='2', PnW=None, PnD='10', TnH='2', TnM='30', TnS=None))
+  >>> aniso8601.parse_interval('P1M/1981-04-05', builder=TupleBuilder)
+  Interval(start=None, end=Date(YYYY='1981', MM='04', DD='05', Www=None, D=None, DDD=None), duration=Duration(PnY=None, PnM='1', PnW=None, PnD=None, TnH=None, TnM=None, TnS=None))
+
+A repeating interval returns a :code:`RepeatingIntervalTuple` containing the following parse components: :code:`R`, :code:`Rnn`, :code:`interval`, where :code:`R` is a boolean, :code:`True` for an unbounded interval, :code:`False` otherwise.::
+
+  >>> aniso8601.parse_repeating_interval('R3/1981-04-05/P1D', builder=TupleBuilder)
+  RepeatingInterval(R=False, Rnn='3', interval=Interval(start=Date(YYYY='1981', MM='04', DD='05', Www=None, D=None, DDD=None), end=None, duration=Duration(PnY=None, PnM=None, PnW=None, PnD='1', TnH=None, TnM=None, TnS=None)))
+  >>> aniso8601.parse_repeating_interval('R/PT1H2M/1980-03-05T01:01:00', builder=TupleBuilder)
+  RepeatingInterval(R=True, Rnn=None, interval=Interval(start=None, end=Datetime(date=Date(YYYY='1980', MM='03', DD='05', Www=None, D=None, DDD=None), time=Time(hh='01', mm='01', ss='00', tz=None)), duration=Duration(PnY=None, PnM=None, PnW=None, PnD=None, TnH='1', TnM='2', TnS=None)))
+
+Development
+===========
+
+Setup
+-----
+
+It is recommended to develop using a `virtualenv <https://virtualenv.pypa.io/en/stable/>`_.
+
+Inside a virtualenv, development dependencies can be installed automatically::
+
+  $ pip install -e .[dev]
+
+`pre-commit <https://pre-commit.com/>`_ is used for managing pre-commit hooks::
+
+  $ pre-commit install
+
+To run the pre-commit hooks manually::
+
+  $ pre-commit run --all-files
+
+Tests
+-----
+
+Tests can be run using the `unittest testing framework <https://docs.python.org/3/library/unittest.html>`_::
+
+  $ python -m unittest discover aniso8601
+
+Contributing
+============
+
+aniso8601 is an open source project hosted on `Codeberg <https://codeberg.org/nielsenb-jf/aniso8601>`_.
+
+Any and all bugs are welcome on our `issue tracker <https://codeberg.org/nielsenb-jf/aniso8601/issues>`_.
+Of particular interest are valid ISO 8601 strings that don't parse, or invalid ones that do. At a minimum,
+bug reports should include an example of the misbehaving string, as well as the expected result. Of course
+patches containing unit tests (or fixed bugs) are welcome!
+
+References
+==========
+
+* `ISO 8601:2004(E) <http://dotat.at/tmp/ISO_8601-2004_E.pdf>`_ (Caution, PDF link)
+* `Wikipedia article on ISO 8601 <http://en.wikipedia.org/wiki/Iso8601>`_
+* `Discussion on alternative ISO 8601 parsers for Python <https://groups.google.com/forum/#!topic/comp.lang.python/Q2w4R89Nq1w>`_
diff --git a/libs/aniso8601-10.0.1.dist-info/RECORD b/libs/aniso8601-10.0.1.dist-info/RECORD
new file mode 100644
index 0000000000..33f31ea27c
--- /dev/null
+++ b/libs/aniso8601-10.0.1.dist-info/RECORD
@@ -0,0 +1,34 @@
+aniso8601-10.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+aniso8601-10.0.1.dist-info/METADATA,sha256=bhCfpaJ_wz-09tdv4oh4b51DnxocRpDJukuyrI4ZYzE,23716
+aniso8601-10.0.1.dist-info/RECORD,,
+aniso8601-10.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aniso8601-10.0.1.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+aniso8601-10.0.1.dist-info/licenses/LICENSE,sha256=w8yguadP0pZovZm13PAnTVO-kE3md4kW3IUnCPQHsPA,1501
+aniso8601-10.0.1.dist-info/top_level.txt,sha256=MVQomyeED8nGIH7PUQdMzxgLppIB48oYHtcmL17ETB0,10
+aniso8601/__init__.py,sha256=_EfRSVz4e-QRXKqc9r9WkeEI-vfWL7NCUnvTyEJ6X3U,705
+aniso8601/builders/__init__.py,sha256=jXJ75D-QRhB8huW2GyShjh_I4Z83ua4Qgzn1DQiX-1M,17975
+aniso8601/builders/python.py,sha256=qhyXMeXMsRQsJHJNee-0LofIUj33mpHU4BLZ0fijLME,22110
+aniso8601/builders/tests/__init__.py,sha256=qjC0jrTWf2UUlZtXE3AKcMFSLC2kQPOvAI36t5gc8q0,209
+aniso8601/builders/tests/test_init.py,sha256=pyES5pMJUWy16KK4MLsfzRmPRcQvj6_vxcM8yzeZxOc,29997
+aniso8601/builders/tests/test_python.py,sha256=pd8Bz6dc4c_Fvm8YWMcKJfojoRImQHp2RLqMEN9FX0E,61424
+aniso8601/compat.py,sha256=CvNkC-tCr3hzv1i9VOzgiPaS2EUxCfxtfo8SkJ2Juyc,571
+aniso8601/date.py,sha256=D3Kffr6Ln_z0fNTP5KAQa0R0T00VdmZgIS_O-pVmxnI,4496
+aniso8601/decimalfraction.py,sha256=NBUies6Gp1NrVkSU_9MwJNu28OhUIeWXNpkTRcClGYA,333
+aniso8601/duration.py,sha256=XEMm8t3Vipw3YsCgXf17XA10dHmUCQuJo4-PX4z8U7I,9550
+aniso8601/exceptions.py,sha256=uCQIrrIpCJV-n3WDUuhB3wMdgmHuu1UqOXrE9ct3xPY,1313
+aniso8601/interval.py,sha256=ruz49D2BoyoyYggM2oLrz0HSB8CIPxdl4LZCvwq3kCg,10752
+aniso8601/resolution.py,sha256=RJGfir0k6IiR3L1ZCrPvjhsQliVT_ZOcaeKqJqH6JHM,684
+aniso8601/tests/__init__.py,sha256=qjC0jrTWf2UUlZtXE3AKcMFSLC2kQPOvAI36t5gc8q0,209
+aniso8601/tests/compat.py,sha256=J4Ocl6zpo7WmA_pItOc2KUH8xZU156L9fTbCBBFX9xY,346
+aniso8601/tests/test_compat.py,sha256=55qZ_Uu7XRQo8hXNDUjy-IB3WaTqATnVtMlAJP4TGr4,763
+aniso8601/tests/test_date.py,sha256=bJy2ve-iFmWlBCWDidfK2lB-7OBMjeATfK3SBFSet4U,9266
+aniso8601/tests/test_decimalfraction.py,sha256=bvPPSuWnS2XfD10wBUjg5nFFbI1kfBshR2Wkmfggu6I,578
+aniso8601/tests/test_duration.py,sha256=QRLpd_bdgEzHjcLkLMFMWnGF4bN_YxPDdtwACtBekc4,44952
+aniso8601/tests/test_init.py,sha256=1GF0Yms8adNM3Ax13w2ncSz6toHhK3pRkPYoNaRcPVk,1689
+aniso8601/tests/test_interval.py,sha256=GjeU8HrIT-klpselgsgMcF1KfuV7sDKLlyVU5S4XMCQ,60457
+aniso8601/tests/test_time.py,sha256=SS0jXkEl5bYFSe1qFPpjZ0GNXycgBMH16Uc885ujR7I,19147
+aniso8601/tests/test_timezone.py,sha256=EJk2cTsHddhe2Pqtzl250gKF8XoXynEAngNctk23b48,4649
+aniso8601/tests/test_utcoffset.py,sha256=wQ7ivBqax2KP340tlC0DBxM7DTK9SNy_Zq_13FqeaKM,1926
+aniso8601/time.py,sha256=CZRisJz6u7fBfMthZvNcUuVFSL_GCYi9WEjXsbrnDF8,5687
+aniso8601/timezone.py,sha256=xpukG_AuvyMNGs57y4bf40eHRcpe3b1fKC8x-H8Epo8,2124
+aniso8601/utcoffset.py,sha256=dm7-eFl6WQFPpDamcTVl46aEjmGObpWJdSZJ-QzblfU,2421
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/REQUESTED b/libs/aniso8601-10.0.1.dist-info/REQUESTED
similarity index 100%
rename from libs/Flask_SocketIO-5.5.1.dist-info/REQUESTED
rename to libs/aniso8601-10.0.1.dist-info/REQUESTED
diff --git a/libs/aniso8601-10.0.1.dist-info/WHEEL b/libs/aniso8601-10.0.1.dist-info/WHEEL
new file mode 100644
index 0000000000..798dd6195b
--- /dev/null
+++ b/libs/aniso8601-10.0.1.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/aniso8601-10.0.0.dist-info/LICENSE b/libs/aniso8601-10.0.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/aniso8601-10.0.0.dist-info/LICENSE
rename to libs/aniso8601-10.0.1.dist-info/licenses/LICENSE
diff --git a/libs/aniso8601-10.0.0.dist-info/top_level.txt b/libs/aniso8601-10.0.1.dist-info/top_level.txt
similarity index 100%
rename from libs/aniso8601-10.0.0.dist-info/top_level.txt
rename to libs/aniso8601-10.0.1.dist-info/top_level.txt
diff --git a/libs/aniso8601/__init__.py b/libs/aniso8601/__init__.py
index c85d218b31..a3754fd6da 100644
--- a/libs/aniso8601/__init__.py
+++ b/libs/aniso8601/__init__.py
@@ -23,4 +23,4 @@
     parse_time,
 )
 
-__version__ = "10.0.0"
+__version__ = "10.0.1"
diff --git a/libs/aniso8601/builders/python.py b/libs/aniso8601/builders/python.py
index b60382e1bb..a471d33f4a 100644
--- a/libs/aniso8601/builders/python.py
+++ b/libs/aniso8601/builders/python.py
@@ -61,8 +61,8 @@ def year_range_check(valuestr, limit):
     YYYYstr = valuestr
 
     # Truncated dates, like '19', refer to 1900-1999 inclusive,
-    # we simply parse to 1900
-    if len(valuestr) < 4:
+    # we simply parse to 1900, Y and YYY strings are not supported
+    if len(valuestr) == 2:
         # Shift 0s in from the left to form complete year
         YYYYstr = valuestr.ljust(4, "0")
 
diff --git a/libs/aniso8601/builders/tests/test_python.py b/libs/aniso8601/builders/tests/test_python.py
index ccbed27d17..4cbbcbb433 100644
--- a/libs/aniso8601/builders/tests/test_python.py
+++ b/libs/aniso8601/builders/tests/test_python.py
@@ -195,17 +195,6 @@ def test_build_date(self):
                 datetime.date(1980, 12, 31),
             ),
             # Make sure we shift in zeros
-            (
-                {
-                    "YYYY": "1",
-                    "MM": None,
-                    "DD": None,
-                    "Www": None,
-                    "D": None,
-                    "DDD": None,
-                },
-                datetime.date(1000, 1, 1),
-            ),
             (
                 {
                     "YYYY": "12",
@@ -217,17 +206,6 @@ def test_build_date(self):
                 },
                 datetime.date(1200, 1, 1),
             ),
-            (
-                {
-                    "YYYY": "123",
-                    "MM": None,
-                    "DD": None,
-                    "Www": None,
-                    "D": None,
-                    "DDD": None,
-                },
-                datetime.date(1230, 1, 1),
-            ),
         )
 
         for testtuple in testtuples:
diff --git a/libs/appdirs-1.4.4.dist-info/METADATA b/libs/appdirs-1.4.4.dist-info/METADATA
index 26a62703f5..201ab584d6 100644
--- a/libs/appdirs-1.4.4.dist-info/METADATA
+++ b/libs/appdirs-1.4.4.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: appdirs
 Version: 1.4.4
 Summary: A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".
@@ -25,6 +25,17 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: summary
 
 
 .. image:: https://secure.travis-ci.org/ActiveState/appdirs.png
diff --git a/libs/appdirs-1.4.4.dist-info/RECORD b/libs/appdirs-1.4.4.dist-info/RECORD
index 439f34a9a9..e6bb283afc 100644
--- a/libs/appdirs-1.4.4.dist-info/RECORD
+++ b/libs/appdirs-1.4.4.dist-info/RECORD
@@ -1,8 +1,8 @@
 appdirs-1.4.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-appdirs-1.4.4.dist-info/LICENSE.txt,sha256=Nt200KdFqTqyAyA9cZCBSxuJcn0lTK_0jHp6-71HAAs,1097
-appdirs-1.4.4.dist-info/METADATA,sha256=2kntSNh0a5RTW7_nUoezsk50bHfrXp7iQSNNEWM8HGk,8991
+appdirs-1.4.4.dist-info/METADATA,sha256=egp_cRL5I7SyfWvG8oQN4vpOUcZ4As8V-s5yKa2l7R0,9209
 appdirs-1.4.4.dist-info/RECORD,,
 appdirs-1.4.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-appdirs-1.4.4.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+appdirs-1.4.4.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+appdirs-1.4.4.dist-info/licenses/LICENSE.txt,sha256=Nt200KdFqTqyAyA9cZCBSxuJcn0lTK_0jHp6-71HAAs,1097
 appdirs-1.4.4.dist-info/top_level.txt,sha256=nKncE8CUqZERJ6VuQWL4_bkunSPDNfn7KZqb4Tr5YEM,8
 appdirs.py,sha256=g99s2sXhnvTEm79oj4bWI0Toapc-_SmKKNXvOXHkVic,24720
diff --git a/libs/appdirs-1.4.4.dist-info/WHEEL b/libs/appdirs-1.4.4.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/appdirs-1.4.4.dist-info/WHEEL
+++ b/libs/appdirs-1.4.4.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/appdirs-1.4.4.dist-info/LICENSE.txt b/libs/appdirs-1.4.4.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/appdirs-1.4.4.dist-info/LICENSE.txt
rename to libs/appdirs-1.4.4.dist-info/licenses/LICENSE.txt
diff --git a/libs/apprise-1.9.2.dist-info/LICENSE b/libs/apprise-1.9.2.dist-info/LICENSE
deleted file mode 100644
index 1bb88d1df4..0000000000
--- a/libs/apprise-1.9.2.dist-info/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/apprise-1.9.2.dist-info/METADATA b/libs/apprise-1.9.2.dist-info/METADATA
deleted file mode 100644
index d6ebb290d9..0000000000
--- a/libs/apprise-1.9.2.dist-info/METADATA
+++ /dev/null
@@ -1,723 +0,0 @@
-Metadata-Version: 2.1
-Name: apprise
-Version: 1.9.2
-Summary: Push Notifications that work with just about every platform!
-Home-page: https://github.com/caronc/apprise
-Author: Chris Caron
-Author-email: lead2gold@gmail.com
-License: BSD 2-Clause
-Keywords: Africas Talking Alerts Apprise API Automated Packet Reporting System AWS BulkSMS BulkVS Burst SMS Chanify Chat CLI ClickSend D7Networks Dapnet DBus DingTalk Discord Email Emby Enigma2 FCM Feishu Flock Form Free Mobile Gnome Google Chat Gotify Growl Guilded Home Assistant httpSMS IFTTT Join JSON Kavenegar KODI Kumulos LaMetric Line LunaSea MacOSX Mailgun Mastodon Matrix Mattermost MessageBird Microsoft Misskey MQTT MSG91 MSTeams Nextcloud NextcloudTalk Notica Notifiarr Notifico Ntfy Office365 OneSignal Opsgenie PagerDuty PagerTree ParsePlatform Plivo PopcornNotify Power Automate Prowl PushBullet Pushed Pushjet PushMe Push Notifications Pushover PushSafer Pushy PushDeer Reddit Revolt Rocket.Chat RSyslog Ryver SendGrid ServerChan Seven SES SFR Signal SimplePush Sinch Slack SMSEagle SMS Manager SMTP2Go SNS SparkPost Splunk Streamlabs Stride Synology Chat Syslog Techulus Telegram Threema Gateway Twilio Twist Twitter VictorOps Voipms Vonage Webex WeCom Bot WhatsApp Windows Workflows WxPusher XBMC XML Zulip
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: Operating System :: OS Independent
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: certifi
-Requires-Dist: requests
-Requires-Dist: requests-oauthlib
-Requires-Dist: click >=5.0
-Requires-Dist: markdown
-Requires-Dist: PyYAML
-
-![Apprise Logo](https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png)
-
-<hr/>
-
-**apยทprise** / *verb*<br/>
-To inform or tell (someone). To make one aware of something.
-<hr/>
-
-*Apprise* allows you to send a notification to *almost* all of the most popular *notification* services available to us today such as: Telegram, Discord, Slack, Amazon SNS, Gotify, etc.
-
-* One notification library to rule them all.
-* A common and intuitive notification syntax.
-* Supports the handling of images and attachments (_to the notification services that will accept them_).
-* It's incredibly lightweight.
-* Amazing response times because all messages sent asynchronously.
-
-Developers who wish to provide a notification service no longer need to research each and every one out there. They no longer need to try to adapt to the new ones that comeout thereafter. They just need to include this one library and then they can immediately gain access to almost all of the notifications services available to us today.
-
-System Administrators and DevOps who wish to send a notification now no longer need to find the right tool for the job. Everything is already wrapped and supported within the `apprise` command line tool (CLI) that ships with this product.
-
-[![Paypal](https://img.shields.io/badge/paypal-donate-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MHANV39UZNQ5E)
-[![Follow](https://img.shields.io/twitter/follow/l2gnux)](https://twitter.com/l2gnux/)<br/>
-[![Discord](https://img.shields.io/discord/558793703356104724.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/MMPeN2D)
-[![Python](https://img.shields.io/pypi/pyversions/apprise.svg?style=flat-square)](https://pypi.org/project/apprise/)
-[![Build Status](https://github.com/caronc/apprise/actions/workflows/tests.yml/badge.svg)](https://github.com/caronc/apprise/actions/workflows/tests.yml)
-[![CodeCov Status](https://codecov.io/github/caronc/apprise/branch/master/graph/badge.svg)](https://codecov.io/github/caronc/apprise)
-[![PyPi](https://img.shields.io/pypi/dm/apprise.svg?style=flat-square)](https://pypi.org/project/apprise/)
-
-# Table of Contents
-<!--ts-->
-* [Supported Notifications](#supported-notifications)
-  * [Productivity Based Notifications](#productivity-based-notifications)
-  * [SMS Notifications](#sms-notifications)
-  * [Desktop Notifications](#desktop-notifications)
-  * [Email Notifications](#email-notifications)
-  * [Custom Notifications](#custom-notifications)
-* [Installation](#installation)
-* [Command Line Usage](#command-line-usage)
-  * [Configuration Files](#cli-configuration-files)
-  * [File Attachments](#cli-file-attachments)
-  * [Loading Custom Notifications/Hooks](#cli-loading-custom-notificationshooks)
-  * [Environment Variables](#cli-environment-variables)
-* [Developer API Usage](#developer-api-usage)
-  * [Configuration Files](#api-configuration-files)
-  * [File Attachments](#api-file-attachments)
-  * [Loading Custom Notifications/Hooks](#api-loading-custom-notificationshooks)
-* [Persistent Storage](#persistent-storage)
-* [More Supported Links and Documentation](#want-to-learn-more)
-<!--te-->
-
-# Supported Notifications
-
-The section identifies all of the services supported by this library. [Check out the wiki for more information on the supported modules here](https://github.com/caronc/apprise/wiki).
-
-## Productivity Based Notifications
-
-The table below identifies the services this tool supports and some example service urls you need to use in order to take advantage of it. Click on any of the services listed below to get more details on how you can configure Apprise to access them.
-
-| Notification Service | Service ID | Default Port | Example Syntax |
-| -------------------- | ---------- | ------------ | -------------- |
-| [Apprise API](https://github.com/caronc/apprise/wiki/Notify_apprise_api)  | apprise:// or apprises:// | (TCP) 80 or 443 | apprise://hostname/Token
-| [AWS SES](https://github.com/caronc/apprise/wiki/Notify_ses)  | ses://   | (TCP) 443   | ses://user@domain/AccessKeyID/AccessSecretKey/RegionName<br/>ses://user@domain/AccessKeyID/AccessSecretKey/RegionName/email1/email2/emailN
-| [Bark](https://github.com/caronc/apprise/wiki/Notify_bark)  | bark://   | (TCP) 80 or 443   | bark://hostname<br />bark://hostname/device_key<br />bark://hostname/device_key1/device_key2/device_keyN<br/>barks://hostname<br />barks://hostname/device_key<br />barks://hostname/device_key1/device_key2/device_keyN
-| [Chanify](https://github.com/caronc/apprise/wiki/Notify_chanify) | chantify://    | (TCP) 443    | chantify://token
-| [Discord](https://github.com/caronc/apprise/wiki/Notify_discord)  | discord://   | (TCP) 443   | discord://webhook_id/webhook_token<br />discord://avatar@webhook_id/webhook_token
-| [Emby](https://github.com/caronc/apprise/wiki/Notify_emby)  | emby:// or embys:// | (TCP) 8096 | emby://user@hostname/<br />emby://user:password@hostname
-| [Enigma2](https://github.com/caronc/apprise/wiki/Notify_enigma2)  | enigma2:// or enigma2s:// | (TCP) 80 or 443 | enigma2://hostname
-| [FCM](https://github.com/caronc/apprise/wiki/Notify_fcm) | fcm://    | (TCP) 443    | fcm://project@apikey/DEVICE_ID<br />fcm://project@apikey/#TOPIC<br/>fcm://project@apikey/DEVICE_ID1/#topic1/#topic2/DEVICE_ID2/
-| [Feishu](https://github.com/caronc/apprise/wiki/Notify_feishu) | feishu://    | (TCP) 443    | feishu://token
-| [Flock](https://github.com/caronc/apprise/wiki/Notify_flock) | flock://    | (TCP) 443    | flock://token<br/>flock://botname@token<br/>flock://app_token/u:userid<br/>flock://app_token/g:channel_id<br/>flock://app_token/u:userid/g:channel_id
-| [Google Chat](https://github.com/caronc/apprise/wiki/Notify_googlechat) | gchat://    | (TCP) 443    | gchat://workspace/key/token
-| [Gotify](https://github.com/caronc/apprise/wiki/Notify_gotify) | gotify:// or gotifys://   | (TCP) 80 or 443    | gotify://hostname/token<br />gotifys://hostname/token?priority=high
-| [Growl](https://github.com/caronc/apprise/wiki/Notify_growl)  | growl://   | (UDP) 23053   | growl://hostname<br />growl://hostname:portno<br />growl://password@hostname<br />growl://password@hostname:port</br>**Note**: you can also use the get parameter _version_ which can allow the growl request to behave using the older v1.x protocol. An example would look like: growl://hostname?version=1
-| [Guilded](https://github.com/caronc/apprise/wiki/Notify_guilded)  | guilded://   | (TCP) 443   | guilded://webhook_id/webhook_token<br />guilded://avatar@webhook_id/webhook_token
-| [Home Assistant](https://github.com/caronc/apprise/wiki/Notify_homeassistant)       | hassio:// or hassios://   | (TCP) 8123 or 443 | hassio://hostname/accesstoken<br />hassio://user@hostname/accesstoken<br />hassio://user:password@hostname:port/accesstoken<br />hassio://hostname/optional/path/accesstoken
-| [IFTTT](https://github.com/caronc/apprise/wiki/Notify_ifttt) | ifttt://    | (TCP) 443    | ifttt://webhooksID/Event<br />ifttt://webhooksID/Event1/Event2/EventN<br/>ifttt://webhooksID/Event1/?+Key=Value<br/>ifttt://webhooksID/Event1/?-Key=value1
-| [Join](https://github.com/caronc/apprise/wiki/Notify_join) | join://   | (TCP) 443    | join://apikey/device<br />join://apikey/device1/device2/deviceN/<br />join://apikey/group<br />join://apikey/groupA/groupB/groupN<br />join://apikey/DeviceA/groupA/groupN/DeviceN/
-| [KODI](https://github.com/caronc/apprise/wiki/Notify_kodi) | kodi:// or kodis://    | (TCP) 8080 or 443   | kodi://hostname<br />kodi://user@hostname<br />kodi://user:password@hostname:port
-| [Kumulos](https://github.com/caronc/apprise/wiki/Notify_kumulos) | kumulos:// | (TCP) 443 | kumulos://apikey/serverkey
-| [LaMetric Time](https://github.com/caronc/apprise/wiki/Notify_lametric) | lametric:// | (TCP) 443 | lametric://apikey@device_ipaddr<br/>lametric://apikey@hostname:port<br/>lametric://client_id@client_secret
-| [Line](https://github.com/caronc/apprise/wiki/Notify_line) | line:// | (TCP) 443 | line://Token@User<br/>line://Token/User1/User2/UserN
-| [LunaSea](https://github.com/caronc/apprise/wiki/Notify_lunasea) | lunasea://  | (TCP) 80 or 443   | lunasea://user:pass@+FireBaseDevice/<br/>lunasea://user:pass@FireBaseUser/<br/>lunasea://user:pass@hostname/+FireBaseDevice/<br/>lunasea://user:pass@hostname/@FireBaseUser/
-| [Mailgun](https://github.com/caronc/apprise/wiki/Notify_mailgun) | mailgun:// | (TCP) 443 | mailgun://user@hostname/apikey<br />mailgun://user@hostname/apikey/email<br />mailgun://user@hostname/apikey/email1/email2/emailN<br />mailgun://user@hostname/apikey/?name="From%20User"
-| [Mastodon](https://github.com/caronc/apprise/wiki/Notify_mastodon) | mastodon:// or mastodons://| (TCP) 80 or 443  | mastodon://access_key@hostname<br />mastodon://access_key@hostname/@user<br />mastodon://access_key@hostname/@user1/@user2/@userN
-| [Matrix](https://github.com/caronc/apprise/wiki/Notify_matrix) | matrix:// or matrixs://  | (TCP) 80 or 443 | matrix://hostname<br />matrix://user@hostname<br />matrixs://user:pass@hostname:port/#room_alias<br />matrixs://user:pass@hostname:port/!room_id<br />matrixs://user:pass@hostname:port/#room_alias/!room_id/#room2<br />matrixs://token@hostname:port/?webhook=matrix<br />matrix://user:token@hostname/?webhook=slack&format=markdown
-| [Mattermost](https://github.com/caronc/apprise/wiki/Notify_mattermost) | mmost:// or mmosts:// | (TCP) 8065 | mmost://hostname/authkey<br />mmost://hostname:80/authkey<br />mmost://user@hostname:80/authkey<br />mmost://hostname/authkey?channel=channel<br />mmosts://hostname/authkey<br />mmosts://user@hostname/authkey<br />
-| [Microsoft Power Automate / Workflows (MSTeams)](https://github.com/caronc/apprise/wiki/Notify_workflows) | workflows://  | (TCP) 443   | workflows://WorkflowID/Signature/
-| [Microsoft Teams](https://github.com/caronc/apprise/wiki/Notify_msteams) | msteams://  | (TCP) 443   | msteams://TokenA/TokenB/TokenC/
-| [Misskey](https://github.com/caronc/apprise/wiki/Notify_misskey) | misskey:// or misskeys://| (TCP) 80 or 443  | misskey://access_token@hostname
-| [MQTT](https://github.com/caronc/apprise/wiki/Notify_mqtt) | mqtt://  or mqtts:// | (TCP) 1883 or 8883   | mqtt://hostname/topic<br />mqtt://user@hostname/topic<br />mqtts://user:pass@hostname:9883/topic
-| [Nextcloud](https://github.com/caronc/apprise/wiki/Notify_nextcloud) | ncloud:// or nclouds:// | (TCP) 80 or 443 | ncloud://adminuser:pass@host/User<br/>nclouds://adminuser:pass@host/User1/User2/UserN
-| [NextcloudTalk](https://github.com/caronc/apprise/wiki/Notify_nextcloudtalk) | nctalk:// or nctalks:// | (TCP) 80 or 443 | nctalk://user:pass@host/RoomId<br/>nctalks://user:pass@host/RoomId1/RoomId2/RoomIdN
-| [Notica](https://github.com/caronc/apprise/wiki/Notify_notica) | notica://  | (TCP) 443   | notica://Token/
-| [Notifiarr](https://github.com/caronc/apprise/wiki/Notify_notifiarr) | notifiarr:// | (TCP) 443 | notifiarr://apikey/#channel<br />notifiarr://apikey/#channel1/#channel2/#channeln
-| [Notifico](https://github.com/caronc/apprise/wiki/Notify_notifico) | notifico://  | (TCP) 443   | notifico://ProjectID/MessageHook/
-| [ntfy](https://github.com/caronc/apprise/wiki/Notify_ntfy) | ntfy://  | (TCP) 80 or 443   | ntfy://topic/<br/>ntfys://topic/
-| [Office 365](https://github.com/caronc/apprise/wiki/Notify_office365) | o365://  | (TCP) 443   | o365://TenantID:AccountEmail/ClientID/ClientSecret<br />o365://TenantID:AccountEmail/ClientID/ClientSecret/TargetEmail<br />o365://TenantID:AccountEmail/ClientID/ClientSecret/TargetEmail1/TargetEmail2/TargetEmailN
-| [OneSignal](https://github.com/caronc/apprise/wiki/Notify_onesignal) | onesignal:// | (TCP) 443 | onesignal://AppID@APIKey/PlayerID<br/>onesignal://TemplateID:AppID@APIKey/UserID<br/>onesignal://AppID@APIKey/#IncludeSegment<br/>onesignal://AppID@APIKey/Email
-| [Opsgenie](https://github.com/caronc/apprise/wiki/Notify_opsgenie) | opsgenie:// | (TCP) 443 | opsgenie://APIKey<br/>opsgenie://APIKey/UserID<br/>opsgenie://APIKey/#Team<br/>opsgenie://APIKey/\*Schedule<br/>opsgenie://APIKey/^Escalation
-| [PagerDuty](https://github.com/caronc/apprise/wiki/Notify_pagerduty) | pagerduty:// | (TCP) 443 | pagerduty://IntegrationKey@ApiKey<br/>pagerduty://IntegrationKey@ApiKey/Source/Component
-| [PagerTree](https://github.com/caronc/apprise/wiki/Notify_pagertree) | pagertree:// | (TCP) 443 | pagertree://integration_id
-| [ParsePlatform](https://github.com/caronc/apprise/wiki/Notify_parseplatform) | parsep:// or parseps:// | (TCP) 80 or 443 | parsep://AppID:MasterKey@Hostname<br/>parseps://AppID:MasterKey@Hostname
-| [PopcornNotify](https://github.com/caronc/apprise/wiki/Notify_popcornnotify) | popcorn://  | (TCP) 443   | popcorn://ApiKey/ToPhoneNo<br/>popcorn://ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>popcorn://ApiKey/ToEmail<br/>popcorn://ApiKey/ToEmail1/ToEmail2/ToEmailN/<br/>popcorn://ApiKey/ToPhoneNo1/ToEmail1/ToPhoneNoN/ToEmailN
-| [Prowl](https://github.com/caronc/apprise/wiki/Notify_prowl) | prowl://   | (TCP) 443    | prowl://apikey<br />prowl://apikey/providerkey
-| [PushBullet](https://github.com/caronc/apprise/wiki/Notify_pushbullet) | pbul://    | (TCP) 443    | pbul://accesstoken<br />pbul://accesstoken/#channel<br/>pbul://accesstoken/A_DEVICE_ID<br />pbul://accesstoken/email@address.com<br />pbul://accesstoken/#channel/#channel2/email@address.net/DEVICE
-| [Pushjet](https://github.com/caronc/apprise/wiki/Notify_pushjet) | pjet:// or pjets:// | (TCP) 80 or 443 | pjet://hostname/secret<br />pjet://hostname:port/secret<br />pjets://secret@hostname/secret<br />pjets://hostname:port/secret
-| [Push (Techulus)](https://github.com/caronc/apprise/wiki/Notify_techulus) | push://    | (TCP) 443    | push://apikey/
-| [Pushed](https://github.com/caronc/apprise/wiki/Notify_pushed) | pushed://    | (TCP) 443    | pushed://appkey/appsecret/<br/>pushed://appkey/appsecret/#ChannelAlias<br/>pushed://appkey/appsecret/#ChannelAlias1/#ChannelAlias2/#ChannelAliasN<br/>pushed://appkey/appsecret/@UserPushedID<br/>pushed://appkey/appsecret/@UserPushedID1/@UserPushedID2/@UserPushedIDN
-| [PushMe](https://github.com/caronc/apprise/wiki/Notify_pushme) | pushme://  | (TCP) 443   | pushme://Token/
-| [Pushover](https://github.com/caronc/apprise/wiki/Notify_pushover)  | pover://   | (TCP) 443   | pover://user@token<br />pover://user@token/DEVICE<br />pover://user@token/DEVICE1/DEVICE2/DEVICEN<br />**Note**: you must specify both your user_id and token
-| [PushSafer](https://github.com/caronc/apprise/wiki/Notify_pushsafer)  | psafer:// or psafers://  | (TCP) 80 or 443  | psafer://privatekey<br />psafers://privatekey/DEVICE<br />psafer://privatekey/DEVICE1/DEVICE2/DEVICEN
-| [Pushy](https://github.com/caronc/apprise/wiki/Notify_pushy)  | pushy://  | (TCP) 443  | pushy://apikey/DEVICE<br />pushy://apikey/DEVICE1/DEVICE2/DEVICEN<br />pushy://apikey/TOPIC<br />pushy://apikey/TOPIC1/TOPIC2/TOPICN
-| [PushDeer](https://github.com/caronc/apprise/wiki/Notify_pushdeer) | pushdeer:// or pushdeers:// | (TCP) 80 or 443 | pushdeer://pushKey<br />pushdeer://hostname/pushKey<br />pushdeer://hostname:port/pushKey
-| [Reddit](https://github.com/caronc/apprise/wiki/Notify_reddit) | reddit:// | (TCP) 443   | reddit://user:password@app_id/app_secret/subreddit<br />reddit://user:password@app_id/app_secret/sub1/sub2/subN
-| [Revolt](https://github.com/caronc/apprise/wiki/Notify_Revolt) | revolt:// | (TCP) 443   |  revolt://bottoken/ChannelID<br />revolt://bottoken/ChannelID1/ChannelID2/ChannelIDN |
-| [Rocket.Chat](https://github.com/caronc/apprise/wiki/Notify_rocketchat) | rocket:// or rockets://  | (TCP) 80 or 443   | rocket://user:password@hostname/RoomID/Channel<br />rockets://user:password@hostname:443/#Channel1/#Channel1/RoomID<br />rocket://user:password@hostname/#Channel<br />rocket://webhook@hostname<br />rockets://webhook@hostname/@User/#Channel
-| [RSyslog](https://github.com/caronc/apprise/wiki/Notify_rsyslog) | rsyslog://  | (UDP) 514 | rsyslog://hostname<br />rsyslog://hostname/Facility
-| [Ryver](https://github.com/caronc/apprise/wiki/Notify_ryver) | ryver://  | (TCP) 443   | ryver://Organization/Token<br />ryver://botname@Organization/Token
-| [SendGrid](https://github.com/caronc/apprise/wiki/Notify_sendgrid) | sendgrid://  | (TCP) 443   | sendgrid://APIToken:FromEmail/<br />sendgrid://APIToken:FromEmail/ToEmail<br />sendgrid://APIToken:FromEmail/ToEmail1/ToEmail2/ToEmailN/
-| [ServerChan](https://github.com/caronc/apprise/wiki/Notify_serverchan) | schan://   | (TCP) 443    | schan://sendkey/
-| [Signal API](https://github.com/caronc/apprise/wiki/Notify_signal) | signal://  or signals:// | (TCP) 80 or 443  | signal://hostname:port/FromPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [SimplePush](https://github.com/caronc/apprise/wiki/Notify_simplepush) | spush://   | (TCP) 443    | spush://apikey<br />spush://salt:password@apikey<br />spush://apikey?event=Apprise
-| [Slack](https://github.com/caronc/apprise/wiki/Notify_slack) | slack://  | (TCP) 443   | slack://TokenA/TokenB/TokenC/<br />slack://TokenA/TokenB/TokenC/Channel<br />slack://botname@TokenA/TokenB/TokenC/Channel<br />slack://user@TokenA/TokenB/TokenC/Channel1/Channel2/ChannelN
-| [SMTP2Go](https://github.com/caronc/apprise/wiki/Notify_smtp2go) | smtp2go:// | (TCP) 443 | smtp2go://user@hostname/apikey<br />smtp2go://user@hostname/apikey/email<br />smtp2go://user@hostname/apikey/email1/email2/emailN<br />smtp2go://user@hostname/apikey/?name="From%20User"
-| [SparkPost](https://github.com/caronc/apprise/wiki/Notify_sparkpost) | sparkpost:// | (TCP) 443 | sparkpost://user@hostname/apikey<br />sparkpost://user@hostname/apikey/email<br />sparkpost://user@hostname/apikey/email1/email2/emailN<br />sparkpost://user@hostname/apikey/?name="From%20User"
-| [Splunk](https://github.com/caronc/apprise/wiki/Notify_splunk) | splunk:// or victorops:/ | (TCP) 443 | splunk://route_key@apikey<br />splunk://route_key@apikey/entity_id
-| [Streamlabs](https://github.com/caronc/apprise/wiki/Notify_streamlabs) | strmlabs:// | (TCP) 443 | strmlabs://AccessToken/<br/>strmlabs://AccessToken/?name=name&identifier=identifier&amount=0&currency=USD
-| [Synology Chat](https://github.com/caronc/apprise/wiki/Notify_synology_chat) | synology:// or synologys:// |  (TCP) 80 or 443 | synology://hostname/token<br />synology://hostname:port/token
-| [Syslog](https://github.com/caronc/apprise/wiki/Notify_syslog) | syslog://  | n/a | syslog://<br />syslog://Facility
-| [Telegram](https://github.com/caronc/apprise/wiki/Notify_telegram) | tgram://  | (TCP) 443   | tgram://bottoken/ChatID<br />tgram://bottoken/ChatID1/ChatID2/ChatIDN
-| [Twitter](https://github.com/caronc/apprise/wiki/Notify_twitter) | twitter://  | (TCP) 443   | twitter://CKey/CSecret/AKey/ASecret<br/>twitter://user@CKey/CSecret/AKey/ASecret<br/>twitter://CKey/CSecret/AKey/ASecret/User1/User2/User2<br/>twitter://CKey/CSecret/AKey/ASecret?mode=tweet
-| [Twist](https://github.com/caronc/apprise/wiki/Notify_twist) | twist://  | (TCP) 443   | twist://pasword:login<br/>twist://password:login/#channel<br/>twist://password:login/#team:channel<br/>twist://password:login/#team:channel1/channel2/#team3:channel
-| [Webex Teams (Cisco)](https://github.com/caronc/apprise/wiki/Notify_wxteams) | wxteams://  | (TCP) 443   | wxteams://Token
-| [WeCom Bot](https://github.com/caronc/apprise/wiki/Notify_wecombot) | wecombot://  | (TCP) 443   | wecombot://BotKey
-| [WhatsApp](https://github.com/caronc/apprise/wiki/Notify_whatsapp) | whatsapp://  | (TCP) 443   | whatsapp://AccessToken@FromPhoneID/ToPhoneNo<br/>whatsapp://Template:AccessToken@FromPhoneID/ToPhoneNo
-| [WxPusher](https://github.com/caronc/apprise/wiki/Notify_wxpusher) | wxpusher://  | (TCP) 443   | wxpusher://AppToken@UserID1/UserID2/UserIDN<br/>wxpusher://AppToken@Topic1/Topic2/Topic3<br/>wxpusher://AppToken@UserID1/Topic1/
-| [XBMC](https://github.com/caronc/apprise/wiki/Notify_xbmc) | xbmc:// or xbmcs://    | (TCP) 8080 or 443   | xbmc://hostname<br />xbmc://user@hostname<br />xbmc://user:password@hostname:port
-| [Zulip Chat](https://github.com/caronc/apprise/wiki/Notify_zulip) | zulip://  | (TCP) 443   | zulip://botname@Organization/Token<br />zulip://botname@Organization/Token/Stream<br />zulip://botname@Organization/Token/Email
-
-## SMS Notifications
-
-| Notification Service | Service ID | Default Port | Example Syntax |
-| -------------------- | ---------- | ------------ | -------------- |
-| [Africas Talking](https://github.com/caronc/apprise/wiki/Notify_africas_talking) | atalk://  | (TCP) 443   | atalk://AppUser@ApiKey/ToPhoneNo<br/>atalk://AppUser@ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Automated Packet Reporting System (ARPS)](https://github.com/caronc/apprise/wiki/Notify_aprs)  | aprs:// | (TCP) 10152 | aprs://user:pass@callsign<br/>aprs://user:pass@callsign1/callsign2/callsignN
-| [AWS SNS](https://github.com/caronc/apprise/wiki/Notify_sns)  | sns://   | (TCP) 443   | sns://AccessKeyID/AccessSecretKey/RegionName/+PhoneNo<br/>sns://AccessKeyID/AccessSecretKey/RegionName/+PhoneNo1/+PhoneNo2/+PhoneNoN<br/>sns://AccessKeyID/AccessSecretKey/RegionName/Topic<br/>sns://AccessKeyID/AccessSecretKey/RegionName/Topic1/Topic2/TopicN
-| [BulkSMS](https://github.com/caronc/apprise/wiki/Notify_bulksms) | bulksms://  | (TCP) 443   | bulksms://user:password@ToPhoneNo<br/>bulksms://User:Password@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [BulkVS](https://github.com/caronc/apprise/wiki/Notify_bulkvs) | bulkvs://  | (TCP) 443   | bulkvs://user:password@FromPhoneNo<br/>bulkvs://user:password@FromPhoneNo/ToPhoneNo<br/>bulkvs://user:password@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Burst SMS](https://github.com/caronc/apprise/wiki/Notify_burst_sms) | burstsms://  | (TCP) 443   | burstsms://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo<br/>burstsms://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [ClickSend](https://github.com/caronc/apprise/wiki/Notify_clicksend) | clicksend://  | (TCP) 443   | clicksend://user:pass@PhoneNo<br/>clicksend://user:pass@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
-| [DAPNET](https://github.com/caronc/apprise/wiki/Notify_dapnet) | dapnet://  | (TCP) 80   | dapnet://user:pass@callsign<br/>dapnet://user:pass@callsign1/callsign2/callsignN
-| [D7 Networks](https://github.com/caronc/apprise/wiki/Notify_d7networks) | d7sms://  | (TCP) 443   | d7sms://token@PhoneNo<br/>d7sms://token@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
-| [DingTalk](https://github.com/caronc/apprise/wiki/Notify_dingtalk)  | dingtalk://   | (TCP) 443   | dingtalk://token/<br />dingtalk://token/ToPhoneNo<br />dingtalk://token/ToPhoneNo1/ToPhoneNo2/ToPhoneNo1/
-| [Free-Mobile](https://github.com/caronc/apprise/wiki/Notify_freemobile)  | freemobile://   | (TCP) 443   | freemobile://user@password/
-| [httpSMS](https://github.com/caronc/apprise/wiki/Notify_httpsms) | httpsms://  | (TCP) 443   | httpsms://ApiKey@FromPhoneNo<br/>httpsms://ApiKey@FromPhoneNo/ToPhoneNo<br/>httpsms://ApiKey@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Kavenegar](https://github.com/caronc/apprise/wiki/Notify_kavenegar) | kavenegar://  | (TCP) 443   | kavenegar://ApiKey/ToPhoneNo<br/>kavenegar://FromPhoneNo@ApiKey/ToPhoneNo<br/>kavenegar://ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
-| [MessageBird](https://github.com/caronc/apprise/wiki/Notify_messagebird) | msgbird://  | (TCP) 443   | msgbird://ApiKey/FromPhoneNo<br/>msgbird://ApiKey/FromPhoneNo/ToPhoneNo<br/>msgbird://ApiKey/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [MSG91](https://github.com/caronc/apprise/wiki/Notify_msg91) | msg91://  | (TCP) 443   | msg91://TemplateID@AuthKey/ToPhoneNo<br/>msg91://TemplateID@AuthKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Plivo](https://github.com/caronc/apprise/wiki/Notify_plivo) | plivo://  | (TCP) 443   | plivo://AuthID@Token@FromPhoneNo<br/>plivo://AuthID@Token/FromPhoneNo/ToPhoneNo<br/>plivo://AuthID@Token/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Seven](https://github.com/caronc/apprise/wiki/Notify_seven)                                   | seven://                    | (TCP) 443   | seven://ApiKey/FromPhoneNo<br/>seven://ApiKey/FromPhoneNo/ToPhoneNo<br/>seven://ApiKey/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Sociรฉtรฉ Franรงaise du Radiotรฉlรฉphone (SFR)](https://github.com/caronc/apprise/wiki/Notify_sfr) | sfr://   | (TCP) 443    | sfr://user:password>@spaceId/ToPhoneNo<br/>sfr://user:password>@spaceId/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Signal API](https://github.com/caronc/apprise/wiki/Notify_signal) | signal://  or signals:// | (TCP) 80 or 443  | signal://hostname:port/FromPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Sinch](https://github.com/caronc/apprise/wiki/Notify_sinch) | sinch://  | (TCP) 443   | sinch://ServicePlanId:ApiToken@FromPhoneNo<br/>sinch://ServicePlanId:ApiToken@FromPhoneNo/ToPhoneNo<br/>sinch://ServicePlanId:ApiToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>sinch://ServicePlanId:ApiToken@ShortCode/ToPhoneNo<br/>sinch://ServicePlanId:ApiToken@ShortCode/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [SMSEagle](https://github.com/caronc/apprise/wiki/Notify_smseagle) | smseagle:// or smseagles:// | (TCP) 80 or 443  | smseagles://hostname:port/ToPhoneNo<br/>smseagles://hostname:port/@ToContact<br/>smseagles://hostname:port/#ToGroup<br/>smseagles://hostname:port/ToPhoneNo1/#ToGroup/@ToContact/
-| [SMS Manager](https://github.com/caronc/apprise/wiki/Notify_sms_manager) | smsmgr://  | (TCP) 443   | smsmgr://ApiKey@ToPhoneNo<br/>smsmgr://ApiKey@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Threema Gateway](https://github.com/caronc/apprise/wiki/Notify_threema) | threema://  | (TCP) 443   | threema://GatewayID@secret/ToPhoneNo<br/>threema://GatewayID@secret/ToEmail<br/>threema://GatewayID@secret/ToThreemaID/<br/>threema://GatewayID@secret/ToEmail/ToThreemaID/ToPhoneNo/...
-| [Twilio](https://github.com/caronc/apprise/wiki/Notify_twilio) | twilio://  | (TCP) 443   | twilio://AccountSid:AuthToken@FromPhoneNo<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo?apikey=Key<br/>twilio://AccountSid:AuthToken@ShortCode/ToPhoneNo<br/>twilio://AccountSid:AuthToken@ShortCode/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Voipms](https://github.com/caronc/apprise/wiki/Notify_voipms) | voipms://  | (TCP) 443   | voipms://password:email/FromPhoneNo<br/>voipms://password:email/FromPhoneNo/ToPhoneNo<br/>voipms://password:email/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-| [Vonage](https://github.com/caronc/apprise/wiki/Notify_nexmo) (formerly Nexmo) | nexmo://  | (TCP) 443   | nexmo://ApiKey:ApiSecret@FromPhoneNo<br/>nexmo://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo<br/>nexmo://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
-
-## Desktop Notifications
-
-| Notification Service | Service ID | Default Port | Example Syntax |
-| -------------------- | ---------- | ------------ | -------------- |
-| [Linux DBus Notifications](https://github.com/caronc/apprise/wiki/Notify_dbus)  | dbus://<br />qt://<br />glib://<br />kde://  | n/a  | dbus://<br />qt://<br />glib://<br />kde://
-| [Linux Gnome Notifications](https://github.com/caronc/apprise/wiki/Notify_gnome) | gnome://    |        n/a          | gnome://
-| [MacOS X Notifications](https://github.com/caronc/apprise/wiki/Notify_macosx) | macosx://    |        n/a          | macosx://
-| [Windows Notifications](https://github.com/caronc/apprise/wiki/Notify_windows) | windows://    |        n/a          | windows://
-
-## Email Notifications
-
-| Service ID | Default Port | Example Syntax |
-| ---------- | ------------ | -------------- |
-| [mailto://](https://github.com/caronc/apprise/wiki/Notify_email)  |  (TCP) 25    | mailto://userid:pass@domain.com<br />mailto://domain.com?user=userid&pass=password<br/>mailto://domain.com:2525?user=userid&pass=password<br />mailto://user@gmail.com&pass=password<br />mailto://mySendingUsername:mySendingPassword@example.com?to=receivingAddress@example.com<br />mailto://userid:password@example.com?smtp=mail.example.com&from=noreply@example.com&name=no%20reply
-| [mailtos://](https://github.com/caronc/apprise/wiki/Notify_email) |  (TCP) 587   | mailtos://userid:pass@domain.com<br />mailtos://domain.com?user=userid&pass=password<br/>mailtos://domain.com:465?user=userid&pass=password<br />mailtos://user@hotmail.com&pass=password<br />mailtos://mySendingUsername:mySendingPassword@example.com?to=receivingAddress@example.com<br />mailtos://userid:password@example.com?smtp=mail.example.com&from=noreply@example.com&name=no%20reply
-
-Apprise have some email services built right into it (such as yahoo, fastmail, hotmail, gmail, etc) that greatly simplify the mailto:// service.  See more details [here](https://github.com/caronc/apprise/wiki/Notify_email).
-
-## Custom Notifications
-
-| Post Method          | Service ID | Default Port | Example Syntax |
-| -------------------- | ---------- | ------------ | -------------- |
-| [Form](https://github.com/caronc/apprise/wiki/Notify_Custom_Form)       | form:// or forms://   | (TCP) 80 or 443 | form://hostname<br />form://user@hostname<br />form://user:password@hostname:port<br />form://hostname/a/path/to/post/to
-| [JSON](https://github.com/caronc/apprise/wiki/Notify_Custom_JSON)       | json:// or jsons://   | (TCP) 80 or 443 | json://hostname<br />json://user@hostname<br />json://user:password@hostname:port<br />json://hostname/a/path/to/post/to
-| [XML](https://github.com/caronc/apprise/wiki/Notify_Custom_XML)         | xml:// or xmls://   | (TCP) 80 or 443 | xml://hostname<br />xml://user@hostname<br />xml://user:password@hostname:port<br />xml://hostname/a/path/to/post/to
-
-# Installation
-
-The easiest way is to install this package is from pypi:
-```bash
-pip install apprise
-```
-
-Apprise is also packaged as an RPM and available through [EPEL](https://docs.fedoraproject.org/en-US/epel/) supporting CentOS, Redhat, Rocky, Oracle Linux, etc.
-```bash
-# Follow instructions on https://docs.fedoraproject.org/en-US/epel
-# to get your system connected up to EPEL and then:
-# Redhat/CentOS 7.x users
-yum install apprise
-
-# Redhat/CentOS 8.x+ and/or Fedora Users
-dnf install apprise
-```
-
-You can also check out the [Graphical version of Apprise](https://github.com/caronc/apprise-api) to centralize your configuration and notifications through a managable webpage.
-
-# Command Line Usage
-
-A small command line interface (CLI) tool is also provided with this package called *apprise*. If you know the server urls you wish to notify, you can simply provide them all on the command line and send your notifications that way:
-```bash
-# Send a notification to as many servers as you want
-# as you can easily chain one after another (the -vv provides some
-# additional verbosity to help let you know what is going on):
-apprise -vv -t 'my title' -b 'my notification body' \
-   'mailto://myemail:mypass@gmail.com' \
-   'pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b'
-
-# If you don't specify a --body (-b) then stdin is used allowing
-# you to use the tool as part of your every day administration:
-cat /proc/cpuinfo | apprise -vv -t 'cpu info' \
-   'mailto://myemail:mypass@gmail.com'
-
-# The title field is totally optional
-uptime | apprise -vv \
-   'discord:///4174216298/JHMHI8qBe7bk2ZwO5U711o3dV_js'
-```
-
-## CLI Configuration Files
-
-No one wants to put their credentials out for everyone to see on the command line.  No problem *apprise* also supports configuration files.  It can handle both a specific [YAML format](https://github.com/caronc/apprise/wiki/config_yaml) or a very simple [TEXT format](https://github.com/caronc/apprise/wiki/config_text). You can also pull these configuration files via an HTTP query too! You can read more about the expected structure of the configuration files [here](https://github.com/caronc/apprise/wiki/config).
-```bash
-# By default if no url or configuration is specified apprise will attempt to load
-# configuration files (if present) from:
-#  ~/.apprise
-#  ~/.apprise.yaml
-#  ~/.config/apprise.conf
-#  ~/.config/apprise.yaml
-#  /etc/apprise.conf
-#  /etc/apprise.yaml
-
-# Also a subdirectory handling allows you to leverage plugins
-#  ~/.apprise/apprise
-#  ~/.apprise/apprise.yaml
-#  ~/.config/apprise/apprise.conf
-#  ~/.config/apprise/apprise.yaml
-#  /etc/apprise/apprise.yaml
-#  /etc/apprise/apprise.conf
-
-# Windows users can store their default configuration files here:
-#  %APPDATA%/Apprise/apprise.conf
-#  %APPDATA%/Apprise/apprise.yaml
-#  %LOCALAPPDATA%/Apprise/apprise.conf
-#  %LOCALAPPDATA%/Apprise/apprise.yaml
-#  %ALLUSERSPROFILE%\Apprise\apprise.conf
-#  %ALLUSERSPROFILE%\Apprise\apprise.yaml
-#  %PROGRAMFILES%\Apprise\apprise.conf
-#  %PROGRAMFILES%\Apprise\apprise.yaml
-#  %COMMONPROGRAMFILES%\Apprise\apprise.conf
-#  %COMMONPROGRAMFILES%\Apprise\apprise.yaml
-
-# The configuration files specified above can also be identified with a `.yml`
-# extension or even just entirely removing the `.conf` extension altogether.
-
-# If you loaded one of those files, your command line gets really easy:
-apprise -vv -t 'my title' -b 'my notification body'
-
-# If you want to deviate from the default paths or specify more than one,
-# just specify them using the --config switch:
-apprise -vv -t 'my title' -b 'my notification body' \
-   --config=/path/to/my/config.yml
-
-# Got lots of configuration locations? No problem, you can specify them all:
-# Apprise can even fetch the configuration from over a network!
-apprise -vv -t 'my title' -b 'my notification body' \
-   --config=/path/to/my/config.yml \
-   --config=https://localhost/my/apprise/config
-```
-
-## CLI File Attachments
-
-Apprise also supports file attachments too! Specify as many attachments to a notification as you want.
-```bash
-# Send a funny image you found on the internet to a colleague:
-apprise -vv --title 'Agile Joke' \
-        --body 'Did you see this one yet?' \
-        --attach https://i.redd.it/my2t4d2fx0u31.jpg \
-        'mailto://myemail:mypass@gmail.com'
-
-# Easily send an update from a critical server to your dev team
-apprise -vv --title 'system crash' \
-        --body 'I do not think Jim fixed the bug; see attached...' \
-        --attach /var/log/myprogram.log \
-        --attach /var/debug/core.2345 \
-        --tag devteam
-```
-
-## CLI Loading Custom Notifications/Hooks
-
-To create your own custom `schema://` hook so that you can trigger your own custom code,
-simply include the `@notify` decorator to wrap your function.
-```python
-from apprise.decorators import notify
-#
-# The below assumes you want to catch foobar:// calls:
-#
-@notify(on="foobar", name="My Custom Foobar Plugin")
-def my_custom_notification_wrapper(body, title, notify_type, *args, **kwargs):
-    """My custom notification function that triggers on all foobar:// calls
-    """
-    # Write all of your code here... as an example...
-    print("{}: {} - {}".format(notify_type.upper(), title, body))
-
-    # Returning True/False is a way to relay your status back to Apprise.
-    # Returning nothing (None by default) is always interpreted as a Success
-```
-
-Once you've defined your custom hook, you just need to tell Apprise where it is at runtime.
-```bash
-# By default if no plugin path is specified apprise will attempt to load
-# all plugin files (if present) from the following directory paths:
-#  ~/.apprise/plugins
-#  ~/.config/apprise/plugins
-#  /var/lib/apprise/plugins
-
-# Windows users can store their default plugin files in these directories:
-#  %APPDATA%/Apprise/plugins
-#  %LOCALAPPDATA%/Apprise/plugins
-#  %ALLUSERSPROFILE%\Apprise\plugins
-#  %PROGRAMFILES%\Apprise\plugins
-#  %COMMONPROGRAMFILES%\Apprise\plugins
-
-# If you placed your plugin file within one of the directories already defined
-# above, then your call simply needs to look like:
-apprise -vv --title 'custom override' \
-        --body 'the body of my message' \
-        foobar:\\
-
-# However you can over-ride the path like so
-apprise -vv --title 'custom override' \
-        --body 'the body of my message' \
-        --plugin-path /path/to/my/plugin.py \
-        foobar:\\
-```
-
-You can read more about creating your own custom notifications and/or hooks [here](https://github.com/caronc/apprise/wiki/decorator_notify).
-
-## CLI Environment Variables
-
-Those using the Command Line Interface (CLI) can also leverage environment variables to pre-set the default settings:
-
-| Variable                | Description       |
-|------------------------ | ----------------- |
-| `APPRISE_URLS`          |  Specify the default URLs to notify IF none are otherwise specified on the command line explicitly. If the `--config` (`-c`) is specified, then this will over-rides any reference to this variable. Use white space and/or a comma (`,`) to delimit multiple entries.
-|  `APPRISE_CONFIG_PATH`  | Explicitly specify the config search path to use (over-riding the default). The path(s) defined here must point to the absolute filename to open/reference. Use a semi-colon (`;`), line-feed (`\n`), and/or carriage return (`\r`) to delimit multiple entries.
-|  `APPRISE_PLUGIN_PATH`  | Explicitly specify the custom plugin search path to use (over-riding the default). Use a semi-colon (`;`), line-feed (`\n`), and/or carriage return (`\r`) to delimit multiple entries.
-|  `APPRISE_STORAGE_PATH` | Explicitly specify the persistent storage path to use (over-riding the default).
-
-# Developer API Usage
-
-To send a notification from within your python application, just do the following:
-```python
-import apprise
-
-# Create an Apprise instance
-apobj = apprise.Apprise()
-
-# Add all of the notification services by their server url.
-# A sample email notification:
-apobj.add('mailto://myuserid:mypass@gmail.com')
-
-# A sample pushbullet notification
-apobj.add('pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b')
-
-# Then notify these services any time you desire. The below would
-# notify all of the services loaded into our Apprise object.
-apobj.notify(
-    body='what a great notification service!',
-    title='my notification title',
-)
-```
-
-## API Configuration Files
-
-Developers need access to configuration files too. The good news is their use just involves declaring another object (called *AppriseConfig*) that the *Apprise* object can ingest.  You can also freely mix and match config and notification entries as often as you wish! You can read more about the expected structure of the configuration files [here](https://github.com/caronc/apprise/wiki/config).
-```python
-import apprise
-
-# Create an Apprise instance
-apobj = apprise.Apprise()
-
-# Create an Config instance
-config = apprise.AppriseConfig()
-
-# Add a configuration source:
-config.add('/path/to/my/config.yml')
-
-# Add another...
-config.add('https://myserver:8080/path/to/config')
-
-# Make sure to add our config into our apprise object
-apobj.add(config)
-
-# You can mix and match; add an entry directly if you want too
-# In this entry we associate the 'admin' tag with our notification
-apobj.add('mailto://myuser:mypass@hotmail.com', tag='admin')
-
-# Then notify these services any time you desire. The below would
-# notify all of the services that have not been bound to any specific
-# tag.
-apobj.notify(
-    body='what a great notification service!',
-    title='my notification title',
-)
-
-# Tagging allows you to specifically target only specific notification
-# services you've loaded:
-apobj.notify(
-    body='send a notification to our admin group',
-    title='Attention Admins',
-    # notify any services tagged with the 'admin' tag
-    tag='admin',
-)
-
-# If you want to notify absolutely everything (regardless of whether
-# it's been tagged or not), just use the reserved tag of 'all':
-apobj.notify(
-    body='send a notification to our admin group',
-    title='Attention Admins',
-    # notify absolutely everything loaded, regardless on wether
-    # it has a tag associated with it or not:
-    tag='all',
-)
-```
-
-## API File Attachments
-
-Attachments are very easy to send using the Apprise API:
-```python
-import apprise
-
-# Create an Apprise instance
-apobj = apprise.Apprise()
-
-# Add at least one service you want to notify
-apobj.add('mailto://myuser:mypass@hotmail.com')
-
-# Then send your attachment.
-apobj.notify(
-    title='A great photo of our family',
-    body='The flash caused Jane to close her eyes! hah! :)',
-    attach='/local/path/to/my/DSC_003.jpg',
-)
-
-# Send a web based attachment too! In the below example, we connect to a home
-# security camera and send a live image to an email. By default remote web
-# content is cached, but for a security camera we might want to call notify
-# again later in our code, so we want our last image retrieved to expire(in
-# this case after 3 seconds).
-apobj.notify(
-    title='Latest security image',
-    attach='http://admin:password@hikvision-cam01/ISAPI/Streaming/channels/101/picture?cache=3'
-)
-```
-
-To send more than one attachment, just use a list, set, or tuple instead:
-```python
-import apprise
-
-# Create an Apprise instance
-apobj = apprise.Apprise()
-
-# Add at least one service you want to notify
-apobj.add('mailto://myuser:mypass@hotmail.com')
-
-# Now add all of the entries we're interested in:
-attach = (
-    # ?name= allows us to rename the actual jpeg as found on the site
-    # to be another name when sent to our receipient(s)
-    'https://i.redd.it/my2t4d2fx0u31.jpg?name=FlyingToMars.jpg',
-
-    # Now add another:
-    '/path/to/funny/joke.gif',
-)
-
-# Send your multiple attachments with a single notify call:
-apobj.notify(
-    title='Some good jokes.',
-    body='Hey guys, check out these!',
-    attach=attach,
-)
-```
-
-## API Loading Custom Notifications/Hooks
-
-By default, no custom plugins are loaded at all for those building from within the Apprise API.
-It's at the developers discretion to load custom modules. But should you choose to do so, it's as easy
-as including the path reference in the `AppriseAsset()` object prior to the initialization of your `Apprise()`
-instance.
-
-For example:
-```python
-from apprise import Apprise
-from apprise import AppriseAsset
-
-# Prepare your Asset object so that you can enable the custom plugins to
-# be loaded for your instance of Apprise...
-asset = AppriseAsset(plugin_paths="/path/to/scan")
-
-# OR You can also generate scan more then one file too:
-asset = AppriseAsset(
-    plugin_paths=[
-        # Iterate over all python libraries found in the root of the
-        # specified path. This is NOT a recursive (directory) scan; only
-        # the first level is parsed. HOWEVER, if a directory containing
-        # an __init__.py is found, it will be included in the load.
-        "/dir/containing/many/python/libraries",
-
-        # An absolute path to a plugin.py to exclusively load
-        "/path/to/plugin.py",
-
-        # if you point to a directory that has an __init__.py file found in
-        # it, then only that file is loaded (it's similar to point to a
-        # absolute .py file. Hence, there is no (level 1) scanning at all
-        # within the directory specified.
-        "/path/to/dir/library"
-    ]
-)
-
-# Now that we've got our asset, we just work with our Apprise object as we
-# normally do
-aobj = Apprise(asset=asset)
-
-# If our new custom `foobar://` library was loaded (presuming we prepared
-# one like in the examples above).  then you would be able to safely add it
-# into Apprise at this point
-aobj.add('foobar://')
-
-# Send our notification out through our foobar://
-aobj.notify("test")
-```
-
-You can read more about creating your own custom notifications and/or hooks [here](https://github.com/caronc/apprise/wiki/decorator_notify).
-
-# Persistent Storage
-
-Persistent storage allows Apprise to cache re-occurring actions optionaly to disk. This can greatly reduce the overhead used to send a notification.
-
-There are 3 Persistent Storage operational states Apprise can operate using:
-1. `auto`:  Flush gathered cache information to the filesystem on demand.  This option is incredibly light weight.  This is the default behavior for all CLI usage.
-   * Developers who choose to use this operational mode can also force cached information manually if they choose.
-   * The CLI will use this operational mode by default.
-1. `flush`: Flushes any cache information to the filesystem during every transaction.
-1. `memory`: Effectively disable Persistent Storage.  Any caching of data required by each plugin used is done in memory.  Apprise effectively operates as it always did before peristent storage was available. This setting ensures no content is every written to disk.
-   * By default this is the mode Apprise will operate under for those developing with it unless they configure it to otherwise operate as `auto` or `flush`.  This is done through the `AppriseAsset()` object and is explained further on in this documentation.
-
-## CLI Persistent Storage Commands
-
-You can provide the keyword `storage` on your CLI call to see the persistent storage options available to you.
-```bash
-# List all of the occupied space used by Apprise's Persistent Storage:
-apprise storage list
-
-# list is the default option, so the following does the same thing:
-apprise storage
-
-# You can prune all of your storage older then 30 days
-# and not accessed for this period like so:
-apprise storage prune
-
-# You can do a hard reset (and wipe all persistent storage) with:
-apprise storage clean
-
-```
-
-You can also filter your results by adding tags and/or URL Identifiers.  When you get a listing (`apprise storage list`), you may see:
-```
-   # example output of 'apprise storage list':
-   1. f7077a65                                             0.00B    unused
-      - matrixs://abcdef:****@synapse.example12.com/%23general?image=no&mode=off&version=3&msgtype...
-      tags: team
-
-   2. 0e873a46                                            81.10B    active
-      - tgram://W...U//?image=False&detect=yes&silent=no&preview=no&content=before&mdv=v1&format=m...
-      tags: personal
-
-   3. abcd123                                             12.00B    stale
-
-```
-The (persistent storage) cache states are:
- - `unused`: This plugin has not commited anything to disk for reuse/cache purposes
- - `active`: This plugin has written content to disk.  Or at the very least, it has prepared a persistent storage location it can write into.
- - `stale`: The system detected a location where a URL may have possibly written to in the past, but there is nothing linking to it using the URLs provided.  It is likely wasting space or is no longer of any use.
-
-You can use this information to filter your results by specifying _URL ID_ (UID) values after your command.  For example:
-```bash
-# The below commands continue with the example already identified above
-# the following would match abcd123 (even though just ab was provided)
-# The output would only list the 'stale' entry above
-apprise storage list ab
-
-# knowing our filter is safe, we could remove it
-# the below command would not obstruct our other to URLs and would only
-# remove our stale one:
-apprise storage clean ab
-
-# Entries can be filtered by tag as well:
-apprise storage list --tag=team
-
-# You can match on multiple URL ID's as well:
-# The followin would actually match the URL ID's of 1. and .2 above
-apprise storage list f 0
-```
-When using the CLI, Persistent storage is set to the operational mode of `auto` by default, you can change this by providing `--storage-mode=` (`-SM`) during your calls.  If you want to ensure it's always set to a value of your choice.
-
-For more information on persistent storage, [visit here](https://github.com/caronc/apprise/wiki/persistent_storage).
-
-## API Persistent Storage Commands
-For developers, persistent storage is set in the operational mode of `memory` by default.
-
-It's at the developers discretion to enable it (by switching it to either `auto` or `flush`). Should you choose to do so: it's as easy as including the information in the `AppriseAsset()` object prior to the initialization of your `Apprise()` instance.
-
-For example:
-```python
-from apprise import Apprise
-from apprise import AppriseAsset
-from apprise import PersistentStoreMode
-
-# Prepare a location the persistent storage can write it's cached content to.
-# By setting this path, this immediately assumes you wish to operate the
-# persistent storage in the operational 'auto' mode
-asset = AppriseAsset(storage_path="/path/to/save/data")
-
-# If you want to be more explicit and set more options, then you may do the
-# following
-asset = AppriseAsset(
-    # Set our storage path directory (minimum requirement to enable it)
-    storage_path="/path/to/save/data",
-
-    # Set the mode... the options are:
-    # 1. PersistentStoreMode.MEMORY
-    #       - disable persistent storage from writing to disk
-    # 2. PersistentStoreMode.AUTO
-    #       - write to disk on demand
-    # 3. PersistentStoreMode.FLUSH
-    #       - write to disk always and often
-    storage_mode=PersistentStoreMode.FLUSH
-
-    # The URL IDs are by default 8 characters in length. You can increase and
-    # decrease it's value here.  The value must be > 2. The default value is 8
-    # if not otherwise specified
-    storage_idlen=8,
-)
-
-# Now that we've got our asset, we just work with our Apprise object as we
-# normally do
-aobj = Apprise(asset=asset)
-```
-
-For more information on persistent storage, [visit here](https://github.com/caronc/apprise/wiki/persistent_storage).
-
-# Want To Learn More?
-
-If you're interested in reading more about this and other methods on how to customize your own notifications, please check out the following links:
-* ๐Ÿ“ฃ [Using the CLI](https://github.com/caronc/apprise/wiki/CLI_Usage)
-* ๐Ÿ› ๏ธ [Development API](https://github.com/caronc/apprise/wiki/Development_API)
-* ๐Ÿ”ง [Troubleshooting](https://github.com/caronc/apprise/wiki/Troubleshooting)
-* โš™๏ธ [Configuration File Help](https://github.com/caronc/apprise/wiki/config)
-* โšก [Create Your Own Custom Notifications](https://github.com/caronc/apprise/wiki/decorator_notify)
-* ๐Ÿ’พ [Persistent Storage](https://github.com/caronc/apprise/wiki/persistent_storage)
-* ๐ŸŒŽ [Apprise API/Web Interface](https://github.com/caronc/apprise-api)
-* ๐ŸŽ‰ [Showcase](https://github.com/caronc/apprise/wiki/showcase)
-
-Want to help make Apprise better?
-* ๐Ÿ’ก [Contribute to the Apprise Code Base](https://github.com/caronc/apprise/wiki/Development_Contribution)
-* โค๏ธ [Sponsorship and Donations](https://github.com/caronc/apprise/wiki/Sponsors)
diff --git a/libs/apprise-1.9.2.dist-info/RECORD b/libs/apprise-1.9.2.dist-info/RECORD
deleted file mode 100644
index e4cc8e8ca0..0000000000
--- a/libs/apprise-1.9.2.dist-info/RECORD
+++ /dev/null
@@ -1,204 +0,0 @@
-../../bin/apprise,sha256=ZJ-e4qqxNLtdW_DAvpuPPX5iROIiQd8I6nvg7vtAv-g,233
-apprise-1.9.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-apprise-1.9.2.dist-info/LICENSE,sha256=14Xm5_sr7ckw9aeWP1S8s2BdDw0zmZ-84BYbRG_25qk,1343
-apprise-1.9.2.dist-info/METADATA,sha256=x_o_QTrKa9ZvriOzP0u2ATsgIbK7WAQU_TEwI2Q58g4,52956
-apprise-1.9.2.dist-info/RECORD,,
-apprise-1.9.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apprise-1.9.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-apprise-1.9.2.dist-info/entry_points.txt,sha256=71YypBuNdjAKiaLsiMG40HEfLHxkU4Mi7o_S0s0d8wI,45
-apprise-1.9.2.dist-info/top_level.txt,sha256=JrCRn-_rXw5LMKXkIgMSE4E0t1Ks9TYrBH54Pflwjkk,8
-apprise/__init__.py,sha256=fNkCsrDHTksln2E4fuFuLCiUgT1fQiikqXecAVAJgts,3896
-apprise/apprise.py,sha256=zAvoPxYgXU5anlFUxvcSyc24W1YXxfNMVx7_nJWGSFM,32838
-apprise/apprise.pyi,sha256=_4TBKvT-QVj3s6PuTh3YX-BbQMeJTdBGdVpubLMY4_k,2203
-apprise/apprise_attachment.py,sha256=8alD6gXQoF1QLyTdJlzMXJ7m5gDA50vLBGMfJXQjVOM,12363
-apprise/apprise_attachment.pyi,sha256=R9-0dVqWpeaFrVpcREwPhGy3qHWztG5jEjYIOsbE5dM,1145
-apprise/apprise_config.py,sha256=8bXKAeWMMJULeXd9APz9QeSc4sBvdfiw4xE18-3AtW0,16890
-apprise/apprise_config.pyi,sha256=_mUlCnncqAq8sL01WxQTgZjnb2ic9kZXvtqZmVl-fc8,1568
-apprise/asset.py,sha256=ZFJW4IbiBGxdqvasCT9GVXyo1GyI0DGOuRU7znXF8Ag,15103
-apprise/asset.pyi,sha256=NYLXXYbScgRkspP27XGpRRM_uliPu1OCdWdZBPPvLng,979
-apprise/assets/NotifyXML-1.0.xsd,sha256=292qQ_IUl5EWDhPyzm9UTT0C2rVvJkyGar8jiODkJs8,986
-apprise/assets/NotifyXML-1.1.xsd,sha256=bjR3CGG4AEXoJjYkGCbDttKHSkPP1FlIWO02E7G59g4,1758
-apprise/assets/themes/default/apprise-failure-128x128.ico,sha256=Mt0ptfHJaN3Wsv5UCNDn9_3lyEDHxVDv1JdaDEI_xCA,67646
-apprise/assets/themes/default/apprise-failure-128x128.png,sha256=66ps8TDPxVH3g9PlObJqF-0x952CjnqQyN3zvpRcOT8,16135
-apprise/assets/themes/default/apprise-failure-256x256.png,sha256=bQBsKKCsKfR9EqgYOZrcVcVa5y8qG58PN2mEqO5eNRI,41931
-apprise/assets/themes/default/apprise-failure-32x32.png,sha256=vH0pZffIDCvkejpr3fJHGXW__8Yc3R_p0bacX6t6l18,2437
-apprise/assets/themes/default/apprise-failure-72x72.png,sha256=EP5A8DHRDr9srgupFSwOoyQ308bNJ8aL192J_L4K-ec,7600
-apprise/assets/themes/default/apprise-info-128x128.ico,sha256=F5_CirmXueRCRI5Z_Crf6TS6jVIXTJlRD83zw1oJ66g,67646
-apprise/assets/themes/default/apprise-info-128x128.png,sha256=bBqRZAgQey-gkmJrnFhPbzjILSrljE59mRkgj3raMQo,16671
-apprise/assets/themes/default/apprise-info-256x256.png,sha256=B5r_O4d9MHCmSWZwfbqQgZSp-ZetTdiBSwKcMTF1aFA,43331
-apprise/assets/themes/default/apprise-info-32x32.png,sha256=lt3NZ95TzkiCNVNlurrB2fE2nriMa1wftl7nrNXmb6c,2485
-apprise/assets/themes/default/apprise-info-72x72.png,sha256=kDnsZpqNUZGqs9t1ECUup7FOfXUIL-rupnQCYJp9So4,7875
-apprise/assets/themes/default/apprise-logo.png,sha256=85ttALudKkLmiqilJT7mUQLUXRFmM1AK89rnwLm313s,160907
-apprise/assets/themes/default/apprise-success-128x128.ico,sha256=uCopPwdQjxgfohKazHaDzYs9y4oiaOpL048PYC6WRlg,67646
-apprise/assets/themes/default/apprise-success-128x128.png,sha256=nvDuU_QqhGlw6cMtdj7Mv-gPgqCEx-0DaaXn1KBLVYg,17446
-apprise/assets/themes/default/apprise-success-256x256.png,sha256=vXfKuxY3n0eeXHKdb9hTxICxOEn7HjAQ4IZpX0HSLzc,48729
-apprise/assets/themes/default/apprise-success-32x32.png,sha256=Jg9pFJh3YPI-LiPBebyJ7Z4Vt7BRecaE8AsRjQVIkME,2471
-apprise/assets/themes/default/apprise-success-72x72.png,sha256=FQbgvIhqKOhEK0yvrhaSpai0R7hrkTt_-GaC2KUgCCk,7858
-apprise/assets/themes/default/apprise-warning-128x128.ico,sha256=6XaQPOx0oWK_xbhr4Yhb7qNazCWwSs9lk2SYR2MHTrQ,67646
-apprise/assets/themes/default/apprise-warning-128x128.png,sha256=pf5c4Ph7jWH7gf39dJoieSj8TzAsY3TXI-sGISGVIW4,16784
-apprise/assets/themes/default/apprise-warning-256x256.png,sha256=SY-xlaiXaj420iEYKC2_fJxU-yj2SuaQg6xfPNi83bw,43708
-apprise/assets/themes/default/apprise-warning-32x32.png,sha256=97R2ywNvcwczhBoWEIgajVtWjgT8fLs4FCCz4wu0dwc,2472
-apprise/assets/themes/default/apprise-warning-72x72.png,sha256=L8moEInkO_OLxoOcuvN7rmrGZo64iJeH20o-24MQghE,7913
-apprise/attachment/__init__.py,sha256=5g3VxLUO59xulyvRaTwztWWzold525uH3tEbEnb18go,1678
-apprise/attachment/base.py,sha256=ZDOcpORGcMEBlWuto98tIjPqJU74frlKiWQXB1GHJTI,16509
-apprise/attachment/base.pyi,sha256=w0XG_QKauiMLJ7eQ4S57IiLIURZHm_Snw7l6-ih9GP8,961
-apprise/attachment/file.py,sha256=dxgCKdIqW3qf0Ioe2rNcDEZxx7MGduTt0qDLIpORZ4A,4976
-apprise/attachment/http.py,sha256=MHjzgfyH-LSxuGennIh3H2vj7te_yqJfSg4-7jmpnqQ,13758
-apprise/attachment/memory.py,sha256=6z8ZqLlpQOm7hyZjNHv_ydAAGIdPhvJ9fnC3JQYS8Gw,6999
-apprise/cli.py,sha256=Hd5pndYCfGC0UzFqLQp6yO9UZdd2l2ehe2LZxqMjZng,35327
-apprise/common.py,sha256=Xdd6qyGQhnpXN_JunCTMRzV1iOQbXOFE7XhIVuasfCc,6524
-apprise/common.pyi,sha256=luF3QRiClDCk8Z23rI6FCGYsVmodOt_JYfYyzGogdNM,447
-apprise/config/__init__.py,sha256=oFL3nzr4dD4z7L_3n7_WTrc5avmaKfCsWq2zqCR8f2g,1679
-apprise/config/base.py,sha256=inMITk2xSHRzduIY63G9qfgwFAUHUXkbW1DfKaLEp_g,53129
-apprise/config/base.pyi,sha256=cngfobwH6v2vxYbQrObDi5Z-t5wcquWF-wR0kBCr3Eg,54
-apprise/config/file.py,sha256=kanHNPbCuOgEVnXn-Hl4MOA4356o7oDlF35VUl5zUsc,6245
-apprise/config/http.py,sha256=pgJyVkWA3y19eGGWRuWdYszF5iFEc8ighw4HJ8I6ohA,9440
-apprise/config/memory.py,sha256=x9Orap8oe1lp2LWqvHPQnEzmdkC7teYEXI6XfO896lQ,2816
-apprise/conversion.py,sha256=jL08RvFkWXJ_9zMR_tpMSJYWaiGQbZA7ybMp5ElLwZw,6350
-apprise/decorators/__init__.py,sha256=1S2yIQDvI6WWG7VQiqEQbWKfu-olntsFAjPYhHkqAqk,1487
-apprise/decorators/base.py,sha256=qYw-QbvxwOKoOuutdn-b_jfy4uONuCFwUywbkhY2NEs,8084
-apprise/decorators/notify.py,sha256=UIZOPjcPpIP3A1PVylyj_HdPAY6AuNW-UgXjvpJ2Mg8,5097
-apprise/emojis.py,sha256=i3Tkj_FQKRgStZKBpt8xMkitTPwJBYjeGY9OXqH2an8,87738
-apprise/exception.py,sha256=A41ILE-cy6hhF5V1LoxKvSwu-fV2H3CuBO1T1JWe4so,2337
-apprise/i18n/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apprise/i18n/en/LC_MESSAGES/apprise.mo,sha256=aOLjg1I4K-9KQEqyFhs7wW13jUPjxY4X7EN2XvYR8Qw,3959
-apprise/locale.py,sha256=cDboaRDd011-7Wtd1D3y8wEWNCcz5IvFr1FSe-FHGAE,8994
-apprise/logger.py,sha256=aQM5_IABNvLieni87vzmpzbSU0MHcZUh9dbk0yURjY4,6921
-apprise/manager.py,sha256=HiKToGceJZWGwidUrgYjFSehhb-JpBkHLvpuTZfMxNA,27352
-apprise/manager_attachment.py,sha256=9VlNSuxT9dl773Sa8ESx-9owY4R7EI7hYRICfzvdkhA,2200
-apprise/manager_config.py,sha256=GOl781nYG3P6AgcEDAbge3mR4KFz06z-1OKyyglL5Og,2205
-apprise/manager_plugins.py,sha256=yh1CEm8KkdBjFMqzfJbEL9BkN3vSb14iNZHCvRf8LLw,2211
-apprise/persistent_store.py,sha256=nYRa1ajYVvwTpoPKHYhvxEog6iB4gOZgaBQVLjy3H_I,56446
-apprise/plugins/__init__.py,sha256=TMYQsbofZ5S4rRWYNfE86uMNiGIzpWw-jC7e6JqECMg,18695
-apprise/plugins/africas_talking.py,sha256=jTlKxm9YQhzvd0PigQv6Qs9_aAvZ3W-ECKPf_w7X2Vc,16028
-apprise/plugins/apprise_api.py,sha256=QFjg0_Gev3OMXfhoZJdPKyrlBzeyWjlEvezpL4ZdY44,16802
-apprise/plugins/aprs.py,sha256=G7_1gaUW9SKDID1Vv2Y4b5BUu1lhWh-18m8AhzNeKL4,25779
-apprise/plugins/bark.py,sha256=4V4qBjJRFczDJTuG2R1phGjnnUNfbO2cWx2YpZX5eiI,17079
-apprise/plugins/base.py,sha256=zdRrzKIfpe0zTDVv5rw6Q4KBnIhkidnjhacu86Ntgp8,32784
-apprise/plugins/base.pyi,sha256=aKlZXRYUgG8lz_ZgGkYYJ_GKhuf18youTmMU-FlG7z8,21
-apprise/plugins/bulksms.py,sha256=ydVHseuxMcsylatrM0zYJQDmEmaO4zK3mJyKm5gHOcM,16346
-apprise/plugins/bulkvs.py,sha256=kc6AWcc8MTeFmXZQtYkL4qlL8sfsoYQLev1SqHhRYys,13549
-apprise/plugins/burstsms.py,sha256=VjD0VFNpO6DXqs8yJQ7Ft3TC7ucXageHFEYCqTMszGY,15797
-apprise/plugins/chanify.py,sha256=MHhBTh5X0gwsdbEhQX-rp1A-jPrpeGjt5t-0d6cxm8I,6930
-apprise/plugins/clicksend.py,sha256=5oi1WMGfzhDm823heb9M-0kWr_4fZkp37s6YJVfWHdU,11671
-apprise/plugins/custom_form.py,sha256=V4sKjLZKGzCda9lC48GXO3eIFy1XQebKa5Xulq6txT0,18443
-apprise/plugins/custom_json.py,sha256=kQ5e2tDDGBUC_3sI2lW93pavK5c0alh89PEw6cg9KSU,14312
-apprise/plugins/custom_xml.py,sha256=1HXKLtTX4DrOvcV3AIKiQixYoWatysfo4KXZMKK6YjY,17569
-apprise/plugins/d7networks.py,sha256=ys7JZBdcqbNfkHJwGY_On3CyMHaMh3PsC6G15wd3ELo,15267
-apprise/plugins/dapnet.py,sha256=VLwR0XtR9Sj8kX0C9e4lBKpKrR7O4dSCTXtWJe4QnFw,13858
-apprise/plugins/dbus.py,sha256=6XIVCzfbVbakQNXwXFi--meDviTtNB9Vm5Ly7B03DV0,14491
-apprise/plugins/dingtalk.py,sha256=0OPh1aa5vdmQEIjON85BDpItavR2eLu6ugR0eeNzH38,12273
-apprise/plugins/discord.py,sha256=gi5COi8tE4ao4JZEwjodTnL-f1FlYQvR4fSLdJPKLic,26702
-apprise/plugins/email/__init__.py,sha256=Iajljg0rqGJMiWWHHVXJVm91glLeQEtBXQniE4xGcP0,2101
-apprise/plugins/email/base.py,sha256=44eo1Te7-Li4VgcNhEyzMLXGHITrYU2xBuZ3NEf23bw,38373
-apprise/plugins/email/common.py,sha256=UIg9ce2-CMj9SrI2HBBIbrWyWZNMUzmzsfOd1QclT-E,2569
-apprise/plugins/email/templates.py,sha256=DE_XonwemouEl-1qoUlXn4vCBTdZ2M5K9xnndMsw9JE,9376
-apprise/plugins/emby.py,sha256=iq2EGPoaxZv6OTHiRe8ATlrSmJTTzrIAFS_G5fM_nQc,24427
-apprise/plugins/enigma2.py,sha256=8lhjMJpP692nguMPxcxqwVE9bVJsOQOoE9IrWGd7JeE,11931
-apprise/plugins/fcm/__init__.py,sha256=yvJyuNa7p9q476cwR5GZwz0M5OO2pgmdSRoadUoUoOI,21936
-apprise/plugins/fcm/color.py,sha256=ALQCrxBo9LxvDboS6uOqmM6KyBHOqnHs8qGK__aEYK4,4591
-apprise/plugins/fcm/common.py,sha256=Dj0pMxMrmO0LUz8uHefDthJdYAIqO2hTRc6fefPwqiI,1718
-apprise/plugins/fcm/oauth.py,sha256=t21Dfbzi6bx1J-F4oqkXRrfVS-fW3iHrqwAN9sEPNN8,11197
-apprise/plugins/fcm/priority.py,sha256=eJa-3DSjfLuKJ7N0gJZ34QVRLB9hT_EqOE9yaplPcOA,8163
-apprise/plugins/feishu.py,sha256=c6u4jnJSkNckZzx0yngobpb36viLFAvjUZAW7RTXkcY,7540
-apprise/plugins/flock.py,sha256=fnXvAaEGo-bO3kdZJaEjeMJ0b-ROZH8IpYl4hXfbZBo,12984
-apprise/plugins/freemobile.py,sha256=wOwYVihSfK0OxuuEFsS2VaRM-CFytU7W42-7nM1LyRI,6974
-apprise/plugins/gnome.py,sha256=pey5eXFtFKzXtIE90jWT9SzYZtYNLAXYYXmJKZZnmbc,9227
-apprise/plugins/google_chat.py,sha256=-S1AyzjoOJNdqsu_KiLKOTnatT5nA8KOE530WLGEPg0,12973
-apprise/plugins/gotify.py,sha256=Rit01QDkyldDpGQEMlP-WmsK6xUbcLFxvW9uQi1rw04,11028
-apprise/plugins/growl.py,sha256=HzqSnp8z-n36uNiMnhKf4Ej91DLfJGyXNtOWYzfJH-Q,14446
-apprise/plugins/guilded.py,sha256=M_tUu56FniUx87SnaT4nU7UqbcwofTwy7p5n2r6FRnU,3707
-apprise/plugins/home_assistant.py,sha256=4v53BkIqh389bJEGh_3eMz_tK64HkzmBPiCwqgohnKA,11276
-apprise/plugins/httpsms.py,sha256=ILqURAj_nMIkvP359U25M1u5lhJ2iqnrDKjC_FvcB6U,11386
-apprise/plugins/ifttt.py,sha256=WPiiOGLPMwW8O88A9y2s7dnk06enC9_Z7HMIrOc0hZI,13685
-apprise/plugins/join.py,sha256=Tt7nNysedcEjNXZ7tX9XInoo0aVW0qY_e9JZtAtnWBs,13818
-apprise/plugins/kavenegar.py,sha256=mK9NXlrO1MzzKb3gNSWyPregtb1BXdx5RVapMgmlr2w,12870
-apprise/plugins/kumulos.py,sha256=PWLq75hYnoRHLIEZSDsVpgHv5PJmtVy3flJ599EYubI,8505
-apprise/plugins/lametric.py,sha256=exYazJnlzRbdy1SXceHKRUfF1PJno1EOBgkAC9vfhYY,38449
-apprise/plugins/line.py,sha256=js-B-tlXNacF_jfrZT3k8Sr6nWom-GldGjymFTB2oJ8,10908
-apprise/plugins/lunasea.py,sha256=vpD6x5Hc_0Ix5q8mIZtimZWKlONpgg1aAJYrQOoy-dk,15089
-apprise/plugins/macosx.py,sha256=vkpdYUehyqfBn2kWm0qnYzhfDEMgh19SyYof8A6Y8AU,8439
-apprise/plugins/mailgun.py,sha256=4FqH2_Y6VluXkwss3EHgtBBOmVjX0drGhN6g1reU6Os,25868
-apprise/plugins/mastodon.py,sha256=iXtZ3UdPFuMKy3O-sxWRfDqTetdacAhGnz4RAUgbJj4,35610
-apprise/plugins/matrix.py,sha256=OcS0r-PQNlWd8bR5uWeb-9COJAxf0rKqeoZfrTvFM50,63276
-apprise/plugins/mattermost.py,sha256=fHfSxf0qyFZY5M4TUcFL2n-NDs_FbW63jNrSSGK4uk0,14813
-apprise/plugins/messagebird.py,sha256=d6KseASKCkQesMtrSZDp9RnMpPwFjQTq3_woDpcsIUM,12498
-apprise/plugins/misskey.py,sha256=_loWj8kKIPsf9X52Zb7rYx7DDt-rZ1ii5DCQyPfPrLY,9909
-apprise/plugins/mqtt.py,sha256=AaV700N3rHHQ7uYbz_Veao7qxgXsuOMGEDu7AaiXZ6E,20630
-apprise/plugins/msg91.py,sha256=G6ne6G5Rlw-Q7rUQf80nQ0wbdgJ-hdU1-p5SL_XHijg,12937
-apprise/plugins/msteams.py,sha256=sTeLbj2q7OdHTJJTKZFQtu436NeuAlKLJ8zQwW43K5I,26653
-apprise/plugins/nextcloud.py,sha256=lrk1zhfcf-y7VllhNbBvSEmuyoKJ6wh3Q4bzfKRoF3w,13134
-apprise/plugins/nextcloudtalk.py,sha256=xlqvWvYtPgbRQsabkKhuM_xNhfbyvkYXySiD8El0JNk,11386
-apprise/plugins/notica.py,sha256=f4tN9KbErS1S1g5kGBQ2JocliP3qqmbyNYD3vG2keC8,13400
-apprise/plugins/notifiarr.py,sha256=6Y0lhM5sLLDCS7O3Wok6nTNbBDuCduRIDmhqVG8gCRI,15516
-apprise/plugins/notifico.py,sha256=4YKZJE5_JL0prsOHRdLkICUOQ62SSuq-jmYEpSy8WKk,12309
-apprise/plugins/ntfy.py,sha256=hbWADksgJG0GkU8zeIuTbELKX-KwhrdgwLBc97svfOY,30163
-apprise/plugins/office365.py,sha256=zlwaVBGetYvhwRCqtAUOe1qB1EoGxfTet3wFk6oYGQs,36877
-apprise/plugins/one_signal.py,sha256=CQ99QuB35UQ1yBFpGw2IcBljxh8mO0f-ZPmk-X3eMqE,22555
-apprise/plugins/opsgenie.py,sha256=zHRVWV2diEQRyH-2rDi6RSo1DjeyQns27xrRdU1fIVk,28428
-apprise/plugins/pagerduty.py,sha256=oAHVdBlZJ_dyCvwjjOIBuDLBWDFTkRM_8osnVslkA3c,18196
-apprise/plugins/pagertree.py,sha256=MJS6BeJaV3k-9w9BdZKFlcKXUHRRUQHfPvo4CubMySE,14110
-apprise/plugins/parseplatform.py,sha256=G_lL3M0dZpsjXpQ8DmIN2KktulSYYSm99Ijwk88rdFs,10709
-apprise/plugins/plivo.py,sha256=wYDlwG6XstiDO82N8uRLdAUGiq_hj0_q3Vle4g1NjyY,13840
-apprise/plugins/popcorn_notify.py,sha256=aI7ad-tPogvfxE8fvs9hU7aDEsLo7pPHzlg-GDu6vG4,10793
-apprise/plugins/prowl.py,sha256=5XH3Usgm-Uv-0yGmd4_J4h7LanhFZdRfHs-6c7pya_s,10075
-apprise/plugins/pushbullet.py,sha256=tEEQCBmuDYSw3fdqb6jcie-Du8hS5PnggehKO_Cb70U,15695
-apprise/plugins/pushdeer.py,sha256=xgmOIYcSbSfh1GKnFtZQW9f0XiurUg7X_gUwZLSV4zo,7290
-apprise/plugins/pushed.py,sha256=5snmqDvqoqUW5tSmbgEJMbrlcsafnaz1bYYGC8jscLU,12540
-apprise/plugins/pushjet.py,sha256=-p0i-f3zqoTVeluuu78DldzocCRl2F2DM-4ht5dHuCQ,9344
-apprise/plugins/pushme.py,sha256=1BF_RVPruaGAnQuEEEVYLke8sgMGljCwdWEspm7yE8M,7389
-apprise/plugins/pushover.py,sha256=9jzq2p0juF_GLg8vRS5bquoegqxhRbDLsotRh9fIwDM,21477
-apprise/plugins/pushsafer.py,sha256=IHu2JUpxTkpaOgvk3JhmODR-WB7nXOx7iL3t9doGRPw,27166
-apprise/plugins/pushy.py,sha256=HYTQRhvholpy6B0o9qY4F-AwDlCZ-UGN9A-z2HZMQco,12752
-apprise/plugins/reddit.py,sha256=agf0UZNPygPh5PsF6PvCwwYXu2KjFajRnomiGEa1Xuk,26102
-apprise/plugins/revolt.py,sha256=89tjfWBz27KVs63xbxmfSeJ7zc3fNUp-FROTC1PVX-4,14759
-apprise/plugins/rocketchat.py,sha256=jDgyRuaOb0QV9r8XLZK1i8jzjGIxLs--ygK7fXy4yDo,26293
-apprise/plugins/rsyslog.py,sha256=_dx033ZPJYsfbDfArDAiQwDpH78Wy7iUA2_y0JBXNeQ,12364
-apprise/plugins/ryver.py,sha256=z1-NpFE4EHKrBwdpe65dSOrI3WUSWgL4rwqu8sfAPDw,12097
-apprise/plugins/sendgrid.py,sha256=AVzVthR6OW9Qf-476Xtj59b2KESrxRdCsEamgaLOvKQ,18087
-apprise/plugins/serverchan.py,sha256=pWcw1ChbsLDHRjaDRGguSSMwFGj5-WnNWqRJVGcLUQU,6054
-apprise/plugins/ses.py,sha256=xDDN0vcgMlQ_XPVMcRMC_by6bzPY3TOj3Yz0ajHyK9I,34032
-apprise/plugins/seven.py,sha256=VxSHLS1LITYfblm2qDEyjPothgIzrgVvs18JDUSI5XE,10422
-apprise/plugins/sfr.py,sha256=pYi4UkIeXjAGPoW8Tevv5IspO7hSmRP0te9O_1y4nXE,15192
-apprise/plugins/signal_api.py,sha256=LgkwVA07_juOk-b6XPWxPOCwZjEovGFgcLbfZ-rdowM,17061
-apprise/plugins/simplepush.py,sha256=rsl9B-dfVIZ4sOLHJTbSoja6u1etRuiwRqrVvqFR4EE,12049
-apprise/plugins/sinch.py,sha256=ogAlYlig5NGsiLPVrwBwCg3ZOf_ATa3B0aDiNxayBS0,17153
-apprise/plugins/slack.py,sha256=_7x3Djr5T7P76HSEjhuDZR6FChfMo1FKgts95f9eMTY,44304
-apprise/plugins/smseagle.py,sha256=f7nPIIBZA6DA9eYWAVZXy6-KAQMMkPfG7XP0vY3jqoY,24483
-apprise/plugins/smsmanager.py,sha256=vDL1H7rGbWWTap-7klWjcDesAf7J2CkmI2H4CiErD6Q,14353
-apprise/plugins/smtp2go.py,sha256=G4V6DscnL2ePefgRNnDZvCYBAbnE_8TTeOPP8NDV7bc,19984
-apprise/plugins/sns.py,sha256=OL-NA_Edx_0_dq78jV_29P_iHvKb2sTZ4X7jTxw730Q,24488
-apprise/plugins/sparkpost.py,sha256=CQoMAslrPJVa6Bmx_boWKAbGpH1MfsKzcZA6duRhN_U,28113
-apprise/plugins/splunk.py,sha256=HbbW0TXp7Gne9JGkylZE7Sw15nAk0mR3rLEhnNJikMc,16607
-apprise/plugins/streamlabs.py,sha256=c9YoB9t_gzKW4UfP3aSZsCvsEvxF7j9ybSiwdvPCfCo,16306
-apprise/plugins/synology.py,sha256=xfRY9ecjgENX0oZxg79_EeeXLnmcjJyhjAY2NcCGmVU,11525
-apprise/plugins/syslog.py,sha256=WNCwRJKBpTrky130EwcTzoIuzMMG5lPYxb3qCSGmDCY,10785
-apprise/plugins/techuluspush.py,sha256=gpsFzuQcuexSGpV9FZAO2s9JRDo8OXxvZkbeX1EvZvE,7528
-apprise/plugins/telegram.py,sha256=wf0W45ohxpdbC2-jv7fDMr02R6OD4B7ygPMiD7VeTOs,38487
-apprise/plugins/threema.py,sha256=n-gOBIpUCVZnICL8CtWwLhKlWDsTMZt8-fL8VlRUzcg,12110
-apprise/plugins/twilio.py,sha256=tLb6prAJbStWafIOxCMNZc6ere2f6cypXcusVPn_5Pc,18468
-apprise/plugins/twist.py,sha256=M4pGZcbE_DpblZG_vhCZD48YkCWdV5O0nv2fZPKRiwg,29197
-apprise/plugins/twitter.py,sha256=QtP2PMZPyBSFzUupq5Egsh0VCopvVson8CAGMl6dALk,30612
-apprise/plugins/voipms.py,sha256=N6fdKjiAXox2R_y0eDEn2BZ72jxW1i3U4yzUFgZcQQQ,13114
-apprise/plugins/vonage.py,sha256=VmA78rJEPdeFpZ5xwalK7ynH9I1CGTqr3D7nhV4e9d4,13680
-apprise/plugins/webexteams.py,sha256=k5vlb4jvI3_D2xty03W1rQhgotzW_gy6XZPfIKfa2tw,9441
-apprise/plugins/wecombot.py,sha256=9oc2KXuhLHUknmckkQpXl2HKrEEwWVf0Gr23FSDpezM,9061
-apprise/plugins/whatsapp.py,sha256=JA7hZsnEcN7azUq_mTQwRdGp5F508RhxMH6BT49Vz6g,20180
-apprise/plugins/windows.py,sha256=stTRSJnowyJGW3ALg3NucOES2iZzeBoCB9a6344ev0M,8731
-apprise/plugins/workflows.py,sha256=tM11grGORuAfdjcp_Zw3_cfUTh_1kjdJcjry81UEc3c,19850
-apprise/plugins/wxpusher.py,sha256=4sJjz8AzhQfLh7wutctG1oiBpVSI3JwH9-g3oq3D2t0,12688
-apprise/plugins/xbmc.py,sha256=yoLCiSYk9MQ5q4rNliMRYb8zcNrwF5bsI4jCP_rvPso,12742
-apprise/plugins/zulip.py,sha256=SPD-DUA5cU1QGGnkrqesW732hisTjnAZQp1V_1vJhgE,14360
-apprise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-apprise/url.py,sha256=lOo1pjN33LKIWMiubw0wClWmstNj9fl5NOctCAp9HJk,35026
-apprise/url.pyi,sha256=WLaRREH7FzZ5x3-qkDkupojWGFC4uFwJ1EDt02lVs8c,520
-apprise/utils/__init__.py,sha256=VNCibX3QQp5esDkefhDCEDjA2Ajx0mWt-lWXf0yElqc,1430
-apprise/utils/base64.py,sha256=AVY45VxRMr-RnYQJXSbjWhzpiVSTv8qJ2VXZPHwaZPM,3167
-apprise/utils/cwe312.py,sha256=dcFsa86lvPfxOQIlcx1C_b0IYNjLEWQ_CGSh_wcuZZE,7375
-apprise/utils/disk.py,sha256=EdWn6awOYhl7dej8T5xw8ZrnRRn7IcyOu7AYqog53Kw,5801
-apprise/utils/logic.py,sha256=ZGYBpOQwSOY6veaEtx4ADcpmGG_wlZCtO7vjBgKN-jo,4573
-apprise/utils/module.py,sha256=bJuSGXdbydoBkSslFjE1SP9la6lVJ4tBSsNU5gLhXgo,2117
-apprise/utils/parse.py,sha256=dUcgRJrmhfcnnNGLN2bubqDgH_vQMFqlhoHWYgOgUts,39574
-apprise/utils/pgp.py,sha256=gJO4d7CDzL8URjwwHGXoNBY9MRFz5F38p_KokB8Zbrk,11489
-apprise/utils/singleton.py,sha256=lh3pt2NnnnGMPtX1Por3Cu7kSl1Gv6K1NzNpYGCrC5A,1844
-apprise/utils/templates.py,sha256=xh2le2hsAjs7u0DtpR60XHVqMETb09ElOKs2bzIAwlk,3252
diff --git a/libs/apprise-1.9.2.dist-info/WHEEL b/libs/apprise-1.9.2.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/apprise-1.9.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/Mako-1.3.8.dist-info/INSTALLER b/libs/apprise-1.9.8.dist-info/INSTALLER
similarity index 100%
rename from libs/Mako-1.3.8.dist-info/INSTALLER
rename to libs/apprise-1.9.8.dist-info/INSTALLER
diff --git a/libs/apprise-1.9.8.dist-info/METADATA b/libs/apprise-1.9.8.dist-info/METADATA
new file mode 100644
index 0000000000..f0197b00fc
--- /dev/null
+++ b/libs/apprise-1.9.8.dist-info/METADATA
@@ -0,0 +1,787 @@
+Metadata-Version: 2.4
+Name: apprise
+Version: 1.9.8
+Summary: Push Notifications that work with just about every platform!
+Author-email: Chris Caron <lead2gold@gmail.com>
+License: BSD-2-Clause
+Project-URL: Homepage, https://appriseit.com
+Project-URL: Source, https://github.com/caronc/apprise
+Project-URL: Tracker, https://github.com/caronc/apprise/issues
+Project-URL: Documentation, https://appriseit.com
+Keywords: 46elks,Africas Talking,Alerts,Apprise API,Automated Packet Reporting System,AWS,Bark,BlueSky,Brevo,BulkSMS,BulkVS,Burst SMS,Chanify,Chat,CLI,Clickatell,ClickSend,D7Networks,Dapnet,DBus,DingTalk,Discord,Dot,Email,Emby,Enigma2,FCM,Feishu,Flock,Fluxer,Form,Free Mobile,Gnome,Google Chat,Gotify,Growl,Guilded,Home Assistant,httpSMS,IFTTT,IRC,Jellyfin,Join,JSON,Kavenegar,KODI,Kumulos,LaMetric,Lark,Line,MacOSX,Mailgun,Mastodon,Matrix,Mattermost,MessageBird,Microsoft,Misskey,MQTT,MSG91,MSTeams,Nextcloud,NextcloudTalk,Notica,NotificationAPI,Notifiarr,Notifico,Ntfy,Office365,OneSignal,Opsgenie,PagerDuty,PagerTree,ParsePlatform,Plivo,PopcornNotify,Power Automate,Prowl,Push Notifications,PushBullet,PushDeer,Pushed,Pushjet,PushMe,Pushover,Pushplus,PushSafer,Pushy,QQ Push,Quote/0,Reddit,Resend,Revolt,Rocket.Chat,RSyslog,Ryver,SendGrid,SendPulse,ServerChan,SES,Seven,SFR,Signal,SIGNL4,SimplePush,Sinch,Slack,SMPP,SMS Manager,SMSEagle,SMTP2Go,SNS,SparkPost,Spike,Splunk,SpugPush,Streamlabs,Stride,Synology Chat,Syslog,Techulus,Telegram,Threema Gateway,Twilio,Twist,Twitter,Vapid,Viber,VictorOps,Voipms,Vonage,Webex,Webpush,WeCom Bot,WhatsApp,Windows,Workflows,WxPusher,XBMC,XML,XMPP,Zulip
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: OS Independent
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: requests-oauthlib
+Requires-Dist: click>=5.0
+Requires-Dist: markdown
+Requires-Dist: PyYAML
+Requires-Dist: certifi
+Requires-Dist: tzdata; platform_system == "Windows"
+Provides-Extra: dev
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: mock; extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: babel; extra == "dev"
+Requires-Dist: validate-pyproject; extra == "dev"
+Provides-Extra: all-plugins
+Requires-Dist: cryptography; extra == "all-plugins"
+Requires-Dist: gntp; extra == "all-plugins"
+Requires-Dist: paho-mqtt!=2.0.*; extra == "all-plugins"
+Requires-Dist: PGPy; extra == "all-plugins"
+Requires-Dist: smpplib; extra == "all-plugins"
+Requires-Dist: slixmpp>=1.10.0; extra == "all-plugins"
+Provides-Extra: windows
+Requires-Dist: pywin32; extra == "windows"
+Requires-Dist: tzdata; extra == "windows"
+Dynamic: license-file
+
+![Apprise Logo](https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png)
+
+<hr/>
+
+**apยทprise** / *verb*<br/>
+To inform or tell (someone). To make one aware of something.
+<hr/>
+
+*Apprise* allows you to send a notification to *almost* all of the most popular *notification* services available to us today such as: Telegram, Discord, Slack, Amazon SNS, Gotify, etc.
+
+* One notification library to rule them all.
+* A common and intuitive notification syntax.
+* Supports the handling of images and attachments (_to the notification services that will accept them_).
+* It's incredibly lightweight.
+* Amazing response times because all messages sent asynchronously.
+
+Developers who wish to provide a notification service no longer need to research each and every one out there. They no longer need to try to adapt to the new ones that comeout thereafter. They just need to include this one library and then they can immediately gain access to almost all of the notifications services available to us today.
+
+System Administrators and DevOps who wish to send a notification now no longer need to find the right tool for the job. Everything is already wrapped and supported within the `apprise` command line tool (CLI) that ships with this product.
+
+[![Paypal](https://img.shields.io/badge/paypal-donate-green.svg)](https://www.paypal.com/donate/?hosted_button_id=CR6YF7KLQWQ5E)
+[![Follow](https://img.shields.io/twitter/follow/l2gnux)](https://twitter.com/l2gnux/)<br/>
+[![Discord](https://img.shields.io/discord/558793703356104724.svg?colorB=7289DA&label=Discord&logo=Discord&logoColor=7289DA&style=flat-square)](https://discord.gg/MMPeN2D)
+[![Python](https://img.shields.io/pypi/pyversions/apprise.svg?style=flat-square)](https://pypi.org/project/apprise/)
+[![Build Status](https://github.com/caronc/apprise/actions/workflows/tests.yml/badge.svg)](https://github.com/caronc/apprise/actions/workflows/tests.yml)
+[![Lines of Code](https://raw.githubusercontent.com/caronc/apprise/master/.github/badges/loc.svg)](https://github.com/caronc/apprise/actions/workflows/loc-badge.yml)
+[![CodeCov Status](https://codecov.io/github/caronc/apprise/branch/master/graph/badge.svg)](https://codecov.io/github/caronc/apprise)
+[![PyPi Downloads](https://img.shields.io/pepy/dt/apprise.svg?style=flat-square)](https://pypi.org/project/apprise/)
+
+# Table of Contents
+<!--ts-->
+* [Supported Notifications](#supported-notifications)
+  * [Productivity Based Notifications](#productivity-based-notifications)
+  * [SMS Notifications](#sms-notifications)
+  * [Desktop Notifications](#desktop-notifications)
+  * [Email Notifications](#email-notifications)
+  * [Custom Notifications](#custom-notifications)
+* [Installation](#installation)
+* [Command Line Usage](#command-line-usage)
+  * [Configuration Files](#cli-configuration-files)
+  * [File Attachments](#cli-file-attachments)
+  * [Loading Custom Notifications/Hooks](#cli-loading-custom-notificationshooks)
+  * [Environment Variables](#cli-environment-variables)
+* [Developer API Usage](#developer-api-usage)
+  * [Configuration Files](#api-configuration-files)
+  * [File Attachments](#api-file-attachments)
+  * [Loading Custom Notifications/Hooks](#api-loading-custom-notificationshooks)
+* [Persistent Storage](#persistent-storage)
+* [More Supported Links and Documentation](#want-to-learn-more)
+<!--te-->
+
+Visit the [Official Documentation](https://appriseit.com/getting-started/) site for more information on Apprise.
+
+# Supported Notifications
+
+The section identifies all of the services supported by this library. [Check out the wiki for more information on the supported modules here](https://appriseit.com/).
+
+## Productivity Based Notifications
+
+The table below identifies the services this tool supports and some example service urls you need to use in order to take advantage of it. Click on any of the services listed below to get more details on how you can configure Apprise to access them.
+
+| Notification Service | Service ID | Default Port | Example Syntax |
+| -------------------- | ---------- | ------------ | -------------- |
+| [Apprise API](https://appriseit.com/services/apprise_api/)  | apprise:// or apprises:// | (TCP) 80 or 443 | apprise://hostname/Token
+| [AWS SES](https://appriseit.com/services/ses/)  | ses://   | (TCP) 443   | ses://user@domain/AccessKeyID/AccessSecretKey/RegionName<br/>ses://user@domain/AccessKeyID/AccessSecretKey/RegionName/email1/email2/emailN
+| [Bark](https://appriseit.com/services/bark/)  | bark://   | (TCP) 80 or 443   | bark://hostname<br />bark://hostname/device_key<br />bark://hostname/device_key1/device_key2/device_keyN<br/>barks://hostname<br />barks://hostname/device_key<br />barks://hostname/device_key1/device_key2/device_keyN
+| [BlueSky](https://appriseit.com/services/bluesky/) | bluesky://  | (TCP) 443   | bluesky://Handle:AppPw<br />bluesky://Handle:AppPw/TargetHandle<br />bluesky://Handle:AppPw/TargetHandle1/TargetHandle2/TargetHandleN
+| [Brevo](https://appriseit.com/services/brevo/) | brevo://  | (TCP) 443   | brevo://APIToken:FromEmail/<br />brevo://APIToken:FromEmail/ToEmail<br />brevo://APIToken:FromEmail/ToEmail1/ToEmail2/ToEmailN/
+| [Chanify](https://appriseit.com/services/chanify/) | chantify://    | (TCP) 443    | chantify://token
+| [Discord](https://appriseit.com/services/discord/)  | discord://   | (TCP) 443   | discord://webhook_id/webhook_token<br />discord://avatar@webhook_id/webhook_token
+| [Dot.](https://appriseit.com/services/dot/)  | dot:// | (TCP) 443 | dot://apikey@device_id/text/<br />dot://apikey@device_id/image/<br />**Note**: `device_id` is the Quote/0 hardware serial
+| [Emby](https://appriseit.com/services/emby/)  | emby:// or embys:// | (TCP) 8096 | emby://user@hostname/<br />emby://user:password@hostname
+| [Enigma2](https://appriseit.com/services/enigma2/)  | enigma2:// or enigma2s:// | (TCP) 80 or 443 | enigma2://hostname
+| [FCM](https://appriseit.com/services/fcm/) | fcm://    | (TCP) 443    | fcm://project@apikey/DEVICE_ID<br />fcm://project@apikey/#TOPIC<br/>fcm://project@apikey/DEVICE_ID1/#topic1/#topic2/DEVICE_ID2/
+| [Feishu](https://appriseit.com/services/feishu/) | feishu://    | (TCP) 443    | feishu://token
+| [Flock](https://appriseit.com/services/flock/) | flock://    | (TCP) 443    | flock://token<br/>flock://botname@token<br/>flock://app_token/u:userid<br/>flock://app_token/g:channel_id<br/>flock://app_token/u:userid/g:channel_id
+| [Google Chat](https://appriseit.com/services/googlechat/) | gchat://    | (TCP) 443    | gchat://workspace/key/token
+| [Gotify](https://appriseit.com/services/gotify/) | gotify:// or gotifys://   | (TCP) 80 or 443    | gotify://hostname/token<br />gotifys://hostname/token?priority=high
+| [Growl](https://appriseit.com/services/growl/)  | growl://   | (UDP) 23053   | growl://hostname<br />growl://hostname:portno<br />growl://password@hostname<br />growl://password@hostname:port</br>**Note**: you can also use the get parameter _version_ which can allow the growl request to behave using the older v1.x protocol. An example would look like: growl://hostname?version=1
+| [Guilded](https://appriseit.com/services/guilded/)  | guilded://   | (TCP) 443   | guilded://webhook_id/webhook_token<br />guilded://avatar@webhook_id/webhook_token
+| [Home Assistant](https://appriseit.com/services/homeassistant/)       | hassio:// or hassios://   | (TCP) 8123 or 443 | hassio://hostname/accesstoken<br />hassio://user@hostname/accesstoken<br />hassio://user:password@hostname:port/accesstoken<br />hassio://hostname/optional/path/accesstoken
+| [IFTTT](https://appriseit.com/services/ifttt/) | ifttt://    | (TCP) 443    | ifttt://webhooksID/Event<br />ifttt://webhooksID/Event1/Event2/EventN<br/>ifttt://webhooksID/Event1/?+Key=Value<br/>ifttt://webhooksID/Event1/?-Key=value1
+| [IRC](https://appriseit.com/services/irc/) | irc:// or ircs://   | (TCP) 6667 or 6697 | ircs://user:pass@irc.server/@user<br /> ircs://user:pass@irc.server/#channel?join=true&mode=nickserv<br/>ircs://user:pass@znc.server/@user1/@user2/@user3/#channel1
+| [Jellyfin](https://appriseit.com/services/jellyfin/)  | jellyfin:// or jellyfins:// | (TCP) 8096 | jellyfin://user@hostname/<br />jellyfins://user:password@hostname
+| [Join](https://appriseit.com/services/join/) | join://   | (TCP) 443    | join://apikey/device<br />join://apikey/device1/device2/deviceN/<br />join://apikey/group<br />join://apikey/groupA/groupB/groupN<br />join://apikey/DeviceA/groupA/groupN/DeviceN/
+| [KODI](https://appriseit.com/services/kodi/) | kodi:// or kodis://    | (TCP) 8080 or 443   | kodi://hostname<br />kodi://user@hostname<br />kodi://user:password@hostname:port
+| [Kumulos](https://appriseit.com/services/kumulos/) | kumulos:// | (TCP) 443 | kumulos://apikey/serverkey
+| [LaMetric Time](https://appriseit.com/services/lametric/) | lametric:// | (TCP) 443 | lametric://apikey@device_ipaddr<br/>lametric://apikey@hostname:port<br/>lametric://client_id@client_secret
+| [Lark](https://appriseit.com/services/lark/) | lark://  | (TCP) 443   | lark://BotToken
+| [Line](https://appriseit.com/services/line/) | line:// | (TCP) 443 | line://Token@User<br/>line://Token/User1/User2/UserN
+| [Mailgun](https://appriseit.com/services/mailgun/) | mailgun:// | (TCP) 443 | mailgun://user@hostname/apikey<br />mailgun://user@hostname/apikey/email<br />mailgun://user@hostname/apikey/email1/email2/emailN<br />mailgun://user@hostname/apikey/?name="From%20User"
+| [Mastodon](https://appriseit.com/services/mastodon/) | mastodon:// or mastodons://| (TCP) 80 or 443  | mastodon://access_key@hostname<br />mastodon://access_key@hostname/@user<br />mastodon://access_key@hostname/@user1/@user2/@userN
+| [Matrix](https://appriseit.com/services/matrix/) | matrix:// or matrixs://  | (TCP) 80 or 443 | matrix://hostname<br />matrix://user@hostname<br />matrixs://user:pass@hostname:port/#room_alias<br />matrixs://user:pass@hostname:port/!room_id<br />matrixs://user:pass@hostname:port/#room_alias/!room_id/#room2<br />matrixs://token@hostname:port/?webhook=matrix<br />matrix://user:token@hostname/?webhook=slack&format=markdown
+| [Mattermost](https://appriseit.com/services/mattermost/) | mmost:// or mmosts:// | (TCP) 8065 | mmost://hostname/authkey<br />mmost://hostname:80/authkey<br />mmost://user@hostname:80/authkey<br />mmost://hostname/authkey?channel=channel<br />mmosts://hostname/authkey<br />mmosts://user@hostname/authkey<br />
+| [Microsoft Power Automate / Workflows (MSTeams)](https://appriseit.com/services/workflows/) | workflows://  | (TCP) 443   | workflows://WorkflowID/Signature/
+| [Microsoft Teams](https://appriseit.com/services/msteams/) | msteams://  | (TCP) 443   | msteams://TokenA/TokenB/TokenC/
+| [Misskey](https://appriseit.com/services/misskey/) | misskey:// or misskeys://| (TCP) 80 or 443  | misskey://access_token@hostname
+| [MQTT](https://appriseit.com/services/mqtt/) | mqtt://  or mqtts:// | (TCP) 1883 or 8883   | mqtt://hostname/topic<br />mqtt://user@hostname/topic<br />mqtts://user:pass@hostname:9883/topic
+| [Nextcloud](https://appriseit.com/services/nextcloud/) | ncloud:// or nclouds:// | (TCP) 80 or 443 | ncloud://adminuser:pass@host/User<br/>nclouds://adminuser:pass@host/User1/User2/UserN
+| [NextcloudTalk](https://appriseit.com/services/nextcloudtalk/) | nctalk:// or nctalks:// | (TCP) 80 or 443 | nctalk://user:pass@host/RoomId<br/>nctalks://user:pass@host/RoomId1/RoomId2/RoomIdN
+| [Notica](https://appriseit.com/services/notica/) | notica://  | (TCP) 443   | notica://Token/
+| [NotificationAPI](https://appriseit.com/services/notificationapi/) | napi://  | (TCP) 443   | napi://ClientID/ClientSecret/Target<br />napi://ClientID/ClientSecret/Target1/Target2/TargetN<br />napi://MessageType@ClientID/ClientSecret/Target
+| [Notifiarr](https://appriseit.com/services/notifiarr/) | notifiarr:// | (TCP) 443 | notifiarr://apikey/#channel<br />notifiarr://apikey/#channel1/#channel2/#channeln
+| [Notifico](https://appriseit.com/services/notifico/) | notifico://  | (TCP) 443   | notifico://ProjectID/MessageHook/
+| [ntfy](https://appriseit.com/services/ntfy/) | ntfy://  | (TCP) 80 or 443   | ntfy://topic/<br/>ntfys://topic/
+| [Office 365](https://appriseit.com/services/office365/) | o365://  | (TCP) 443   | o365://TenantID:AccountEmail/ClientID/ClientSecret<br />o365://TenantID:AccountEmail/ClientID/ClientSecret/TargetEmail<br />o365://TenantID:AccountEmail/ClientID/ClientSecret/TargetEmail1/TargetEmail2/TargetEmailN
+| [OneSignal](https://appriseit.com/services/onesignal/) | onesignal:// | (TCP) 443 | onesignal://AppID@APIKey/PlayerID<br/>onesignal://TemplateID:AppID@APIKey/UserID<br/>onesignal://AppID@APIKey/#IncludeSegment<br/>onesignal://AppID@APIKey/Email
+| [Opsgenie](https://appriseit.com/services/opsgenie/) | opsgenie:// | (TCP) 443 | opsgenie://APIKey<br/>opsgenie://APIKey/UserID<br/>opsgenie://APIKey/#Team<br/>opsgenie://APIKey/\*Schedule<br/>opsgenie://APIKey/^Escalation
+| [PagerDuty](https://appriseit.com/services/pagerduty/) | pagerduty:// | (TCP) 443 | pagerduty://IntegrationKey@ApiKey<br/>pagerduty://IntegrationKey@ApiKey/Source/Component
+| [PagerTree](https://appriseit.com/services/pagertree/) | pagertree:// | (TCP) 443 | pagertree://integration_id
+| [ParsePlatform](https://appriseit.com/services/parseplatform/) | parsep:// or parseps:// | (TCP) 80 or 443 | parsep://AppID:MasterKey@Hostname<br/>parseps://AppID:MasterKey@Hostname
+| [PopcornNotify](https://appriseit.com/services/popcornnotify/) | popcorn://  | (TCP) 443   | popcorn://ApiKey/ToPhoneNo<br/>popcorn://ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>popcorn://ApiKey/ToEmail<br/>popcorn://ApiKey/ToEmail1/ToEmail2/ToEmailN/<br/>popcorn://ApiKey/ToPhoneNo1/ToEmail1/ToPhoneNoN/ToEmailN
+| [Prowl](https://appriseit.com/services/prowl/) | prowl://   | (TCP) 443    | prowl://apikey<br />prowl://apikey/providerkey
+| [PushBullet](https://appriseit.com/services/pushbullet/) | pbul://    | (TCP) 443    | pbul://accesstoken<br />pbul://accesstoken/#channel<br/>pbul://accesstoken/A_DEVICE_ID<br />pbul://accesstoken/email@address.com<br />pbul://accesstoken/#channel/#channel2/email@address.net/DEVICE
+| [Pushjet](https://appriseit.com/services/pushjet/) | pjet:// or pjets:// | (TCP) 80 or 443 | pjet://hostname/secret<br />pjet://hostname:port/secret<br />pjets://secret@hostname/secret<br />pjets://hostname:port/secret
+| [Push (Techulus)](https://appriseit.com/services/techulus/) | push://    | (TCP) 443    | push://apikey/
+| [Pushed](https://appriseit.com/services/pushed/) | pushed://    | (TCP) 443    | pushed://appkey/appsecret/<br/>pushed://appkey/appsecret/#ChannelAlias<br/>pushed://appkey/appsecret/#ChannelAlias1/#ChannelAlias2/#ChannelAliasN<br/>pushed://appkey/appsecret/@UserPushedID<br/>pushed://appkey/appsecret/@UserPushedID1/@UserPushedID2/@UserPushedIDN
+| [PushMe](https://appriseit.com/services/pushme/) | pushme://  | (TCP) 443   | pushme://Token/
+| [Pushover](https://appriseit.com/services/pushover/)  | pover://   | (TCP) 443   | pover://user@token<br />pover://user@token/DEVICE<br />pover://user@token/DEVICE1/DEVICE2/DEVICEN<br />**Note**: you must specify both your user_id and token
+| [Pushplus](https://appriseit.com/services/pushplus/) | pushplus://  | (TCP) 443   | pushplus://Token
+| [PushSafer](https://appriseit.com/services/pushsafer/)  | psafer:// or psafers://  | (TCP) 80 or 443  | psafer://privatekey<br />psafers://privatekey/DEVICE<br />psafer://privatekey/DEVICE1/DEVICE2/DEVICEN
+| [Pushy](https://appriseit.com/services/pushy/)  | pushy://  | (TCP) 443  | pushy://apikey/DEVICE<br />pushy://apikey/DEVICE1/DEVICE2/DEVICEN<br />pushy://apikey/TOPIC<br />pushy://apikey/TOPIC1/TOPIC2/TOPICN
+| [PushDeer](https://appriseit.com/services/pushdeer/) | pushdeer:// or pushdeers:// | (TCP) 80 or 443 | pushdeer://pushKey<br />pushdeer://hostname/pushKey<br />pushdeer://hostname:port/pushKey
+| [QQ Push](https://appriseit.com/services/qq/) | qq://  | (TCP) 443   | qq://Token
+| [Reddit](https://appriseit.com/services/reddit/) | reddit:// | (TCP) 443   | reddit://user:password@app_id/app_secret/subreddit<br />reddit://user:password@app_id/app_secret/sub1/sub2/subN
+| [Resend](https://appriseit.com/services/resend/) | resend://  | (TCP) 443   | resend://APIToken:FromEmail/<br />resend://APIToken:FromEmail/ToEmail<br />resend://APIToken:FromEmail/ToEmail1/ToEmail2/ToEmailN/
+| [Revolt](https://appriseit.com/services/revolt/) | revolt:// | (TCP) 443   |  revolt://bottoken/ChannelID<br />revolt://bottoken/ChannelID1/ChannelID2/ChannelIDN |
+| [Rocket.Chat](https://appriseit.com/services/rocketchat/) | rocket:// or rockets://  | (TCP) 80 or 443   | rocket://user:password@hostname/RoomID/Channel<br />rockets://user:password@hostname:443/#Channel1/#Channel1/RoomID<br />rocket://user:password@hostname/#Channel<br />rocket://webhook@hostname<br />rockets://webhook@hostname/@User/#Channel
+| [RSyslog](https://appriseit.com/services/rsyslog/) | rsyslog://  | (UDP) 514 | rsyslog://hostname<br />rsyslog://hostname/Facility
+| [Ryver](https://appriseit.com/services/ryver/) | ryver://  | (TCP) 443   | ryver://Organization/Token<br />ryver://botname@Organization/Token
+| [SendGrid](https://appriseit.com/services/sendgrid/) | sendgrid://  | (TCP) 443   | sendgrid://APIToken:FromEmail/<br />sendgrid://APIToken:FromEmail/ToEmail<br />sendgrid://APIToken:FromEmail/ToEmail1/ToEmail2/ToEmailN/
+| [SendPulse](https://appriseit.com/services/sendpulse/) | sendpulse://  | (TCP) 443   | sendpulse://user@host/ClientId/ClientSecret<br />sendpulse://user@host/ClientId/clientSecret/ToEmail<br />sendpulse://user@host/ClientId/ClientSecret/ToEmail1/ToEmail2/ToEmailN/
+| [ServerChan](https://appriseit.com/services/serverchan/) | schan://   | (TCP) 443    | schan://sendkey/
+| [Signal API](https://appriseit.com/services/signal/) | signal://  or signals:// | (TCP) 80 or 443  | signal://hostname:port/FromPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [SIGNL4](https://appriseit.com/services/signl4/) | signl4://  | (TCP) 80 or 443  | signl4://hostname
+| [SimplePush](https://appriseit.com/services/simplepush/) | spush://   | (TCP) 443    | spush://apikey<br />spush://salt:password@apikey<br />spush://apikey?event=Apprise
+| [Slack](https://appriseit.com/services/slack/) | slack://  | (TCP) 443   | slack://TokenA/TokenB/TokenC/<br />slack://TokenA/TokenB/TokenC/Channel<br />slack://botname@TokenA/TokenB/TokenC/Channel<br />slack://user@TokenA/TokenB/TokenC/Channel1/Channel2/ChannelN
+| [SMTP2Go](https://appriseit.com/services/smtp2go/) | smtp2go:// | (TCP) 443 | smtp2go://user@hostname/apikey<br />smtp2go://user@hostname/apikey/email<br />smtp2go://user@hostname/apikey/email1/email2/emailN<br />smtp2go://user@hostname/apikey/?name="From%20User"
+| [SparkPost](https://appriseit.com/services/sparkpost/) | sparkpost:// | (TCP) 443 | sparkpost://user@hostname/apikey<br />sparkpost://user@hostname/apikey/email<br />sparkpost://user@hostname/apikey/email1/email2/emailN<br />sparkpost://user@hostname/apikey/?name="From%20User"
+| [Spike.sh](https://appriseit.com/services/spike/) | spike://  | (TCP) 443   | spike://Token
+| [Splunk](https://appriseit.com/services/splunk/) | splunk:// or victorops:/ | (TCP) 443 | splunk://route_key@apikey<br />splunk://route_key@apikey/entity_id
+| [Spug Push](https://appriseit.com/services/spugpush/) | spugpush://  | (TCP) 443   | spugpush://Token
+| [Streamlabs](https://appriseit.com/services/streamlabs/) | strmlabs:// | (TCP) 443 | strmlabs://AccessToken/<br/>strmlabs://AccessToken/?name=name&identifier=identifier&amount=0&currency=USD
+| [Synology Chat](https://appriseit.com/services/synology_chat/) | synology:// or synologys:// |  (TCP) 80 or 443 | synology://hostname/token<br />synology://hostname:port/token
+| [Syslog](https://appriseit.com/services/syslog/) | syslog://  | n/a | syslog://<br />syslog://Facility
+| [Telegram](https://appriseit.com/services/telegram/) | tgram://  | (TCP) 443   | tgram://bottoken/ChatID<br />tgram://bottoken/ChatID1/ChatID2/ChatIDN
+| [Twitter](https://appriseit.com/services/twitter/) | twitter://  | (TCP) 443   | twitter://CKey/CSecret/AKey/ASecret<br/>twitter://user@CKey/CSecret/AKey/ASecret<br/>twitter://CKey/CSecret/AKey/ASecret/User1/User2/User2<br/>twitter://CKey/CSecret/AKey/ASecret?mode=tweet
+| [Twist](https://appriseit.com/services/twist/) | twist://  | (TCP) 443   | twist://pasword:login<br/>twist://password:login/#channel<br/>twist://password:login/#team:channel<br/>twist://password:login/#team:channel1/channel2/#team3:channel
+| [Vapid (WebPush)](https://appriseit.com/services/vapid/) | vapid://    | (TCP) 443    | vapid://subscriber/target<br/>vapid://subscriber/target?subfile=path&keyfile=path
+| [Viber](https://appriseit.com/services/viber/) | viber://    | (TCP) 443    | viber://token/target
+| [Webex Teams (Cisco)](https://appriseit.com/services/wxteams/) | wxteams://  | (TCP) 443   | wxteams://Token
+| [WeCom Bot](https://appriseit.com/services/wecombot/) | wecombot://  | (TCP) 443   | wecombot://BotKey
+| [WhatsApp](https://appriseit.com/services/whatsapp/) | whatsapp://  | (TCP) 443   | whatsapp://AccessToken@FromPhoneID/ToPhoneNo<br/>whatsapp://Template:AccessToken@FromPhoneID/ToPhoneNo
+| [WxPusher](https://appriseit.com/services/wxpusher/) | wxpusher://  | (TCP) 443   | wxpusher://AppToken@UserID1/UserID2/UserIDN<br/>wxpusher://AppToken@Topic1/Topic2/Topic3<br/>wxpusher://AppToken@UserID1/Topic1/
+| [XBMC](https://appriseit.com/services/xbmc/) | xbmc:// or xbmcs://    | (TCP) 8080 or 443   | xbmc://hostname<br />xbmc://user@hostname<br />xbmc://user:password@hostname:port
+| [XMPP](https://appriseit.com/services/xmpp/) | xmpp:// or xmpps://    | (TCP) 5222 or 5223   | xmpp://user:pass@hostname<br />xmpps://user:pass@hostname/jid<br />xmpps://user:pass@hostname/jid1/jid2@example.ca
+| [Zulip Chat](https://appriseit.com/services/zulip/) | zulip://  | (TCP) 443   | zulip://botname@Organization/Token<br />zulip://botname@Organization/Token/Stream<br />zulip://botname@Organization/Token/Email
+
+## SMS Notifications
+
+SMS Notifications for the most part do not have a both a `title` and `body`.  They consist of a single `body` which is usually no more then 160 characters in length.  When using Apprise, the `title` and `body` are therefore combined into a single message prior to their transmission.
+
+| Notification Service | Service ID | Default Port | Example Syntax |
+| -------------------- | ---------- | ------------ | -------------- |
+| [46elks](https://appriseit.com/services/46elks/) | 46elks://  | (TCP) 443   | 46elks://user:password@FromPhoneNo<br/>46elks://user:password@FromPhoneNo/ToPhoneNo<br/>46elks://user:password@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Africas Talking](https://appriseit.com/services/africas_talking/) | atalk://  | (TCP) 443   | atalk://AppUser@ApiKey/ToPhoneNo<br/>atalk://AppUser@ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Automated Packet Reporting System (ARPS)](https://appriseit.com/services/aprs/)  | aprs:// | (TCP) 10152 | aprs://user:pass@callsign<br/>aprs://user:pass@callsign1/callsign2/callsignN
+| [AWS SNS](https://appriseit.com/services/sns/)  | sns://   | (TCP) 443   | sns://AccessKeyID/AccessSecretKey/RegionName/+PhoneNo<br/>sns://AccessKeyID/AccessSecretKey/RegionName/+PhoneNo1/+PhoneNo2/+PhoneNoN<br/>sns://AccessKeyID/AccessSecretKey/RegionName/Topic<br/>sns://AccessKeyID/AccessSecretKey/RegionName/Topic1/Topic2/TopicN
+| [BulkSMS](https://appriseit.com/services/bulksms/) | bulksms://  | (TCP) 443   | bulksms://user:password@ToPhoneNo<br/>bulksms://User:Password@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [BulkVS](https://appriseit.com/services/bulkvs/) | bulkvs://  | (TCP) 443   | bulkvs://user:password@FromPhoneNo<br/>bulkvs://user:password@FromPhoneNo/ToPhoneNo<br/>bulkvs://user:password@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Burst SMS](https://appriseit.com/services/burstsms/) | burstsms://  | (TCP) 443   | burstsms://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo<br/>burstsms://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Clickatell](https://appriseit.com/services/clickatell/)                         | clickatell://               | (TCP) 443       | clickatell://ApiKey/ToPhoneNo<br/>clickatell://FromPhoneNo@ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
+| [ClickSend](https://appriseit.com/services/clicksend/) | clicksend://  | (TCP) 443   | clicksend://user:pass@PhoneNo<br/>clicksend://user:pass@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
+| [DAPNET](https://appriseit.com/services/dapnet/) | dapnet://  | (TCP) 80   | dapnet://user:pass@callsign<br/>dapnet://user:pass@callsign1/callsign2/callsignN
+| [D7 Networks](https://appriseit.com/services/d7networks/) | d7sms://  | (TCP) 443   | d7sms://token@PhoneNo<br/>d7sms://token@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
+| [DingTalk](https://appriseit.com/services/dingtalk/)  | dingtalk://   | (TCP) 443   | dingtalk://token/<br />dingtalk://token/ToPhoneNo<br />dingtalk://token/ToPhoneNo1/ToPhoneNo2/ToPhoneNo1/
+| [Free-Mobile](https://appriseit.com/services/freemobile/)  | freemobile://   | (TCP) 443   | freemobile://user@password/
+| [httpSMS](https://appriseit.com/services/httpsms/) | httpsms://  | (TCP) 443   | httpsms://ApiKey@FromPhoneNo<br/>httpsms://ApiKey@FromPhoneNo/ToPhoneNo<br/>httpsms://ApiKey@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Kavenegar](https://appriseit.com/services/kavenegar/) | kavenegar://  | (TCP) 443   | kavenegar://ApiKey/ToPhoneNo<br/>kavenegar://FromPhoneNo@ApiKey/ToPhoneNo<br/>kavenegar://ApiKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
+| [MessageBird](https://appriseit.com/services/messagebird/) | msgbird://  | (TCP) 443   | msgbird://ApiKey/FromPhoneNo<br/>msgbird://ApiKey/FromPhoneNo/ToPhoneNo<br/>msgbird://ApiKey/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [MSG91](https://appriseit.com/services/msg91/) | msg91://  | (TCP) 443   | msg91://TemplateID@AuthKey/ToPhoneNo<br/>msg91://TemplateID@AuthKey/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Plivo](https://appriseit.com/services/plivo/) | plivo://  | (TCP) 443   | plivo://AuthID@Token@FromPhoneNo<br/>plivo://AuthID@Token/FromPhoneNo/ToPhoneNo<br/>plivo://AuthID@Token/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Seven](https://appriseit.com/services/seven/)                                   | seven://                    | (TCP) 443   | seven://ApiKey/FromPhoneNo<br/>seven://ApiKey/FromPhoneNo/ToPhoneNo<br/>seven://ApiKey/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Sociรฉtรฉ Franรงaise du Radiotรฉlรฉphone (SFR)](https://appriseit.com/services/sfr/) | sfr://   | (TCP) 443    | sfr://user:password>@spaceId/ToPhoneNo<br/>sfr://user:password>@spaceId/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Signal API](https://appriseit.com/services/signal/) | signal://  or signals:// | (TCP) 80 or 443  | signal://hostname:port/FromPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo<br/>signal://hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Sinch](https://appriseit.com/services/sinch/) | sinch://  | (TCP) 443   | sinch://ServicePlanId:ApiToken@FromPhoneNo<br/>sinch://ServicePlanId:ApiToken@FromPhoneNo/ToPhoneNo<br/>sinch://ServicePlanId:ApiToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>sinch://ServicePlanId:ApiToken@ShortCode/ToPhoneNo<br/>sinch://ServicePlanId:ApiToken@ShortCode/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [SMPP](https://appriseit.com/services/smpp/)    | smpp:// or smpps://  | (TCP) 443  | smpp://user:password@hostname:port/FromPhoneNo/ToPhoneNo<br/>smpps://user:password@hostname:port/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN
+| [SMSEagle](https://appriseit.com/services/smseagle/) | smseagle:// or smseagles:// | (TCP) 80 or 443  | smseagles://hostname:port/ToPhoneNo<br/>smseagles://hostname:port/@ToContact<br/>smseagles://hostname:port/#ToGroup<br/>smseagles://hostname:port/ToPhoneNo1/#ToGroup/@ToContact/
+| [SMS Manager](https://appriseit.com/services/sms_manager/) | smsmgr://  | (TCP) 443   | smsmgr://ApiKey@ToPhoneNo<br/>smsmgr://ApiKey@ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Threema Gateway](https://appriseit.com/services/threema/) | threema://  | (TCP) 443   | threema://GatewayID@secret/ToPhoneNo<br/>threema://GatewayID@secret/ToEmail<br/>threema://GatewayID@secret/ToThreemaID/<br/>threema://GatewayID@secret/ToEmail/ToThreemaID/ToPhoneNo/...
+| [Twilio](https://appriseit.com/services/twilio/) | twilio://  | (TCP) 443   | twilio://AccountSid:AuthToken@FromPhoneNo<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo?apikey=Key<br/>twilio://AccountSid:AuthToken@ShortCode/ToPhoneNo<br/>twilio://AccountSid:AuthToken@ShortCode/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo?method=call<br/>twilio://AccountSid:AuthToken@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN?method=call
+| [Voipms](https://appriseit.com/services/voipms/) | voipms://  | (TCP) 443   | voipms://password:email/FromPhoneNo<br/>voipms://password:email/FromPhoneNo/ToPhoneNo<br/>voipms://password:email/FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+| [Vonage](https://appriseit.com/services/vonage/) (formerly Nexmo) | vonage://  | (TCP) 443   | vonage://ApiKey:ApiSecret@FromPhoneNo<br/>vonage://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo<br/>vonage://ApiKey:ApiSecret@FromPhoneNo/ToPhoneNo1/ToPhoneNo2/ToPhoneNoN/
+
+## Desktop Notifications
+
+| Notification Service | Service ID | Default Port | Example Syntax |
+| -------------------- | ---------- | ------------ | -------------- |
+| [Linux DBus Notifications](https://appriseit.com/services/dbus/)  | dbus://<br />qt://<br />glib://<br />kde://  | n/a  | dbus://<br />qt://<br />glib://<br />kde://
+| [Linux Gnome Notifications](https://appriseit.com/services/gnome/) | gnome://    |        n/a          | gnome://
+| [MacOS X Notifications](https://appriseit.com/services/macosx/) | macosx://    |        n/a          | macosx://
+| [Windows Notifications](https://appriseit.com/services/windows/) | windows://    |        n/a          | windows://
+
+## Email Notifications
+
+| Service ID | Default Port | Example Syntax |
+| ---------- | ------------ | -------------- |
+| [mailto://](https://appriseit.com/services/email/)  |  (TCP) 25    | mailto://userid:pass@domain.com<br />mailto://domain.com?user=userid&pass=password<br/>mailto://domain.com:2525?user=userid&pass=password<br />mailto://user@gmail.com&pass=password<br />mailto://mySendingUsername:mySendingPassword@example.com?to=receivingAddress@example.com<br />mailto://userid:password@example.com?smtp=mail.example.com&from=noreply@example.com&name=no%20reply
+| [mailtos://](https://appriseit.com/services/email/) |  (TCP) 587   | mailtos://userid:pass@domain.com<br />mailtos://domain.com?user=userid&pass=password<br/>mailtos://domain.com:465?user=userid&pass=password<br />mailtos://user@hotmail.com&pass=password<br />mailtos://mySendingUsername:mySendingPassword@example.com?to=receivingAddress@example.com<br />mailtos://userid:password@example.com?smtp=mail.example.com&from=noreply@example.com&name=no%20reply
+
+Apprise have some email services built right into it (such as yahoo, fastmail, hotmail, gmail, etc) that greatly simplify the mailto:// service.  See more details [here](https://appriseit.com/services/email/).
+
+## Custom Notifications
+
+| Post Method          | Service ID | Default Port | Example Syntax |
+| -------------------- | ---------- | ------------ | -------------- |
+| [Form](https://appriseit.com/services/form/)       | form:// or forms://   | (TCP) 80 or 443 | form://hostname<br />form://user@hostname<br />form://user:password@hostname:port<br />form://hostname/a/path/to/post/to
+| [JSON](https://appriseit.com/services/json/)       | json:// or jsons://   | (TCP) 80 or 443 | json://hostname<br />json://user@hostname<br />json://user:password@hostname:port<br />json://hostname/a/path/to/post/to
+| [XML](https://appriseit.com/services/xml/)         | xml:// or xmls://   | (TCP) 80 or 443 | xml://hostname<br />xml://user@hostname<br />xml://user:password@hostname:port<br />xml://hostname/a/path/to/post/to
+
+# Installation
+
+The easiest way is to install Apprise from PyPI:
+```bash
+pip install apprise
+```
+
+Apprise is also packaged as an RPM and available through [EPEL](https://docs.fedoraproject.org/en-US/epel/) supporting CentOS, Redhat, Rocky, Oracle Linux, etc.
+```bash
+# Follow instructions on https://docs.fedoraproject.org/en-US/epel
+# to get your system connected up to EPEL and then:
+# Redhat/CentOS 7.x users
+yum install apprise
+
+# Redhat/Rocky Linux 8.x+ and/or Fedora Users
+dnf install apprise
+```
+
+You can also check out the [Graphical version of Apprise](https://github.com/caronc/apprise-api) to centralize your configuration and notifications through a manageable webpage.
+
+# Command Line Usage
+
+A small command line interface (CLI) tool is also provided with this package called *apprise*. If you know the server urls you wish to notify, you can simply provide them all on the command line and send your notifications that way:
+```bash
+# Send a notification to as many servers as you want
+# as you can easily chain one after another (the -vv provides some
+# additional verbosity to help let you know what is going on):
+apprise -vv -t 'my title' -b 'my notification body' \
+   'mailto://myemail:mypass@gmail.com' \
+   'pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b'
+
+# If you don't specify a --body (-b) then stdin is used allowing
+# you to use the tool as part of your every day administration:
+cat /proc/cpuinfo | apprise -vv -t 'cpu info' \
+   'mailto://myemail:mypass@gmail.com'
+
+# The title field is totally optional
+uptime | apprise -vv \
+   'discord:///4174216298/JHMHI8qBe7bk2ZwO5U711o3dV_js'
+```
+
+## CLI Configuration Files
+
+No one wants to put their credentials out for everyone to see on the command line.  No problem *apprise* also supports configuration files.  It can handle both a specific YAML format or a very simple TEXT format. You can also pull these configuration files via an HTTP query too! Read more about the expected structure of the configuration files [here](https://appriseit.com/config/).
+
+```bash
+# By default if no url or configuration is specified apprise will attempt to load
+# configuration files (if present) from:
+#  ~/.apprise
+#  ~/.apprise.yaml
+#  ~/.config/apprise.conf
+#  ~/.config/apprise.yaml
+#  /etc/apprise.conf
+#  /etc/apprise.yaml
+
+# Also a subdirectory handling allows you to leverage plugins
+#  ~/.apprise/apprise
+#  ~/.apprise/apprise.yaml
+#  ~/.config/apprise/apprise.conf
+#  ~/.config/apprise/apprise.yaml
+#  /etc/apprise/apprise.yaml
+#  /etc/apprise/apprise.conf
+
+# Windows users can store their default configuration files here:
+#  %APPDATA%/Apprise/apprise.conf
+#  %APPDATA%/Apprise/apprise.yaml
+#  %LOCALAPPDATA%/Apprise/apprise.conf
+#  %LOCALAPPDATA%/Apprise/apprise.yaml
+#  %ALLUSERSPROFILE%\Apprise\apprise.conf
+#  %ALLUSERSPROFILE%\Apprise\apprise.yaml
+#  %PROGRAMFILES%\Apprise\apprise.conf
+#  %PROGRAMFILES%\Apprise\apprise.yaml
+#  %COMMONPROGRAMFILES%\Apprise\apprise.conf
+#  %COMMONPROGRAMFILES%\Apprise\apprise.yaml
+
+# The configuration files specified above can also be identified with a `.yml`
+# extension or even just entirely removing the `.conf` extension altogether.
+
+# If you loaded one of those files, your command line gets really easy:
+apprise -vv -t 'my title' -b 'my notification body'
+
+# If you want to deviate from the default paths or specify more than one,
+# just specify them using the --config switch:
+apprise -vv -t 'my title' -b 'my notification body' \
+   --config=/path/to/my/config.yml
+
+# Got lots of configuration locations? No problem, you can specify them all:
+# Apprise can even fetch the configuration from over a network!
+apprise -vv -t 'my title' -b 'my notification body' \
+   --config=/path/to/my/config.yml \
+   --config=https://localhost/my/apprise/config
+```
+
+## CLI Tagging Support
+
+Apprise allows you to tag your services in your configuration to organize them (e.g., `family`, `devops`, `critical`). You can then filter which services to notify using the `--tag` (`-g`) switch.
+
+It is important to understand how Apprise handles multiple tags:
+
+* **OR Logic (Union)**: To notify services that have *either* Tag A **OR** Tag B, specify the `-g` switch multiple times.
+* **AND Logic (Intersection)**: To notify services that have *both* Tag A **AND** Tag B, separate the tags with a comma.
+
+```bash
+# OR Logic: Notify any service tagged 'devops' OR 'admin'
+apprise -vv -t "Union Test" \
+   --config=~/apprise.yml \
+   -g devops -g admin
+
+# AND Logic: Notify only services tagged with BOTH 'devops' AND 'critical'
+apprise -vv -t "Intersection Test" \
+   --config=~/apprise.yml \
+   -g devops,critical
+
+## CLI File Attachments
+
+Apprise also supports file attachments too! Specify as many attachments to a notification as you want.
+```bash
+# Send a funny image you found on the internet to a colleague:
+apprise -vv --title 'Agile Joke' \
+        --body 'Did you see this one yet?' \
+        --attach https://i.redd.it/my2t4d2fx0u31.jpg \
+        'mailto://myemail:mypass@gmail.com'
+
+# Easily send an update from a critical server to your dev team
+apprise -vv --title 'system crash' \
+        --body 'I do not think Jim fixed the bug; see attached...' \
+        --attach /var/log/myprogram.log \
+        --attach /var/debug/core.2345 \
+        --tag devteam
+```
+
+## CLI Loading Custom Notifications/Hooks
+
+To create your own custom `schema://` hook so that you can trigger your own custom code,
+simply include the `@notify` decorator to wrap your function.
+```python
+from apprise.decorators import notify
+#
+# The below assumes you want to catch foobar:// calls:
+#
+@notify(on="foobar", name="My Custom Foobar Plugin")
+def my_custom_notification_wrapper(body, title, notify_type, *args, **kwargs):
+    """My custom notification function that triggers on all foobar:// calls
+    """
+    # Write all of your code here... as an example...
+    print("{}: {} - {}".format(notify_type.upper(), title, body))
+
+    # Returning True/False is a way to relay your status back to Apprise.
+    # Returning nothing (None by default) is always interpreted as a Success
+```
+
+Once you've defined your custom hook, you just need to tell Apprise where it is at runtime.
+```bash
+# By default if no plugin path is specified apprise will attempt to load
+# all plugin files (if present) from the following directory paths:
+#  ~/.apprise/plugins
+#  ~/.config/apprise/plugins
+#  /var/lib/apprise/plugins
+
+# Windows users can store their default plugin files in these directories:
+#  %APPDATA%/Apprise/plugins
+#  %LOCALAPPDATA%/Apprise/plugins
+#  %ALLUSERSPROFILE%\Apprise\plugins
+#  %PROGRAMFILES%\Apprise\plugins
+#  %COMMONPROGRAMFILES%\Apprise\plugins
+
+# If you placed your plugin file within one of the directories already defined
+# above, then your call simply needs to look like:
+apprise -vv --title 'custom override' \
+        --body 'the body of my message' \
+        foobar:\\
+
+# However you can override the path like so
+apprise -vv --title 'custom override' \
+        --body 'the body of my message' \
+        --plugin-path /path/to/my/plugin.py \
+        foobar:\\
+```
+
+You can read more about creating your own custom notifications and/or hooks [here](https://appriseit.com/library/extending/decorator/).
+
+## CLI Environment Variables
+
+Those using the Command Line Interface (CLI) can also leverage environment variables to pre-set the default settings:
+
+| Variable                | Description       |
+|------------------------ | ----------------- |
+| `APPRISE_URLS`          |  Specify the default URLs to notify IF none are otherwise specified on the command line explicitly. If the `--config` (`-c`) is specified, then this will overrides any reference to this variable. Use white space and/or a comma (`,`) to delimit multiple entries.
+|  `APPRISE_CONFIG_PATH`  | Explicitly specify the config search path to use (overriding the default). The path(s) defined here must point to the absolute filename to open/reference. Use a semi-colon (`;`), line-feed (`\n`), and/or carriage return (`\r`) to delimit multiple entries.
+|  `APPRISE_PLUGIN_PATH`  | Explicitly specify the custom plugin search path to use (overriding the default). Use a semi-colon (`;`), line-feed (`\n`), and/or carriage return (`\r`) to delimit multiple entries.
+|  `APPRISE_STORAGE_PATH` | Explicitly specify the persistent storage path to use (overriding the default).
+
+# Developer API Usage
+
+To send a notification from within your python application, just do the following:
+```python
+import apprise
+
+# Create an Apprise instance
+apobj = apprise.Apprise()
+
+# Add all of the notification services by their server url.
+# A sample email notification:
+apobj.add('mailto://myuserid:mypass@gmail.com')
+
+# A sample pushbullet notification
+apobj.add('pbul://o.gn5kj6nfhv736I7jC3cj3QLRiyhgl98b')
+
+# Then notify these services any time you desire. The below would
+# notify all of the services loaded into our Apprise object.
+apobj.notify(
+    body='what a great notification service!',
+    title='my notification title',
+)
+```
+
+## API Configuration Files
+
+Developers need access to configuration files too. The good news is their use just involves declaring another object (called *AppriseConfig*) that the *Apprise* object can ingest.  You can also freely mix and match config and notification entries as often as you wish! You can read more about the expected structure of the configuration files [here](https://appriseit.com/getting-started/configuration/).
+```python
+import apprise
+
+# Create an Apprise instance
+apobj = apprise.Apprise()
+
+# Create an Config instance
+config = apprise.AppriseConfig()
+
+# Add a configuration source:
+config.add('/path/to/my/config.yml')
+
+# Add another...
+config.add('https://myserver:8080/path/to/config')
+
+# Make sure to add our config into our apprise object
+apobj.add(config)
+
+# You can mix and match; add an entry directly if you want too
+# In this entry we associate the 'admin' tag with our notification
+apobj.add('mailto://myuser:mypass@hotmail.com', tag='admin')
+
+# Then notify these services any time you desire. The below would
+# notify all of the services that have not been bound to any specific
+# tag.
+apobj.notify(
+    body='what a great notification service!',
+    title='my notification title',
+)
+
+# Tagging allows you to specifically target only specific notification
+# services you've loaded:
+apobj.notify(
+    body='send a notification to our admin group',
+    title='Attention Admins',
+    # notify any services tagged with the 'admin' tag
+    tag='admin',
+)
+
+# If you want to notify absolutely everything (regardless of whether
+# it's been tagged or not), just use the reserved tag of 'all':
+apobj.notify(
+    body='send a notification to our admin group',
+    title='Attention Admins',
+    # notify absolutely everything loaded, regardless on whether
+    # it has a tag associated with it or not:
+    tag='all',
+)
+```
+
+## API File Attachments
+
+Attachments are very easy to send using the Apprise API:
+```python
+import apprise
+
+# Create an Apprise instance
+apobj = apprise.Apprise()
+
+# Add at least one service you want to notify
+apobj.add('mailto://myuser:mypass@hotmail.com')
+
+# Then send your attachment.
+apobj.notify(
+    title='A great photo of our family',
+    body='The flash caused Jane to close her eyes! hah! :)',
+    attach='/local/path/to/my/DSC_003.jpg',
+)
+
+# Send a web based attachment too! In the below example, we connect to a home
+# security camera and send a live image to an email. By default remote web
+# content is cached, but for a security camera we might want to call notify
+# again later in our code, so we want our last image retrieved to expire(in
+# this case after 3 seconds).
+apobj.notify(
+    title='Latest security image',
+    attach='http://admin:password@hikvision-cam01/ISAPI/Streaming/channels/101/picture?cache=3'
+)
+```
+
+To send more than one attachment, just use a list, set, or tuple instead:
+```python
+import apprise
+
+# Create an Apprise instance
+apobj = apprise.Apprise()
+
+# Add at least one service you want to notify
+apobj.add('mailto://myuser:mypass@hotmail.com')
+
+# Now add all of the entries we're interested in:
+attach = (
+    # ?name= allows us to rename the actual jpeg as found on the site
+    # to be another name when sent to our receipient(s)
+    'https://i.redd.it/my2t4d2fx0u31.jpg?name=FlyingToMars.jpg',
+
+    # Now add another:
+    '/path/to/funny/joke.gif',
+)
+
+# Send your multiple attachments with a single notify call:
+apobj.notify(
+    title='Some good jokes.',
+    body='Hey guys, check out these!',
+    attach=attach,
+)
+```
+
+## API Loading Custom Notifications/Hooks
+
+By default, no custom plugins are loaded at all for those building from within the Apprise API.
+It's at the developers discretion to load custom modules. But should you choose to do so, it's as easy
+as including the path reference in the `AppriseAsset()` object prior to the initialization of your `Apprise()`
+instance.
+
+For example:
+```python
+from apprise import Apprise
+from apprise import AppriseAsset
+
+# Prepare your Asset object so that you can enable the custom plugins to
+# be loaded for your instance of Apprise...
+asset = AppriseAsset(plugin_paths="/path/to/scan")
+
+# OR You can also generate scan more then one file too:
+asset = AppriseAsset(
+    plugin_paths=[
+        # Iterate over all python libraries found in the root of the
+        # specified path. This is NOT a recursive (directory) scan; only
+        # the first level is parsed. HOWEVER, if a directory containing
+        # an __init__.py is found, it will be included in the load.
+        "/dir/containing/many/python/libraries",
+
+        # An absolute path to a plugin.py to exclusively load
+        "/path/to/plugin.py",
+
+        # if you point to a directory that has an __init__.py file found in
+        # it, then only that file is loaded (it's similar to point to a
+        # absolute .py file. Hence, there is no (level 1) scanning at all
+        # within the directory specified.
+        "/path/to/dir/library"
+    ]
+)
+
+# Now that we've got our asset, we just work with our Apprise object as we
+# normally do
+aobj = Apprise(asset=asset)
+
+# If our new custom `foobar://` library was loaded (presuming we prepared
+# one like in the examples above).  then you would be able to safely add it
+# into Apprise at this point
+aobj.add('foobar://')
+
+# Send our notification out through our foobar://
+aobj.notify("test")
+```
+
+You can read more about creating your own custom notifications and/or hooks [here](https://appriseit.com/library/extending/decorator/).
+
+# Persistent Storage
+
+Persistent storage allows Apprise to cache re-occurring actions optionaly to disk. This can greatly reduce the overhead used to send a notification.
+
+There are 3 Persistent Storage operational states Apprise can operate using:
+1. `auto`:  Flush gathered cache information to the filesystem on demand.  This option is incredibly light weight.  This is the default behavior for all CLI usage.
+   * Developers who choose to use this operational mode can also force cached information manually if they choose.
+   * The CLI will use this operational mode by default.
+1. `flush`: Flushes any cache information to the filesystem during every transaction.
+1. `memory`: Effectively disable Persistent Storage.  Any caching of data required by each plugin used is done in memory.  Apprise effectively operates as it always did before peristent storage was available. This setting ensures no content is every written to disk.
+   * By default this is the mode Apprise will operate under for those developing with it unless they configure it to otherwise operate as `auto` or `flush`.  This is done through the `AppriseAsset()` object and is explained further on in this documentation.
+
+## CLI Persistent Storage Commands
+
+You can provide the keyword `storage` on your CLI call to see the persistent storage options available to you.
+```bash
+# List all of the occupied space used by Apprise's Persistent Storage:
+apprise storage list
+
+# list is the default option, so the following does the same thing:
+apprise storage
+
+# You can prune all of your storage older then 30 days
+# and not accessed for this period like so:
+apprise storage prune
+
+# You can do a hard reset (and wipe all persistent storage) with:
+apprise storage clean
+
+```
+
+You can also filter your results by adding tags and/or URL Identifiers.  When you get a listing (`apprise storage list`), you may see:
+```
+   # example output of 'apprise storage list':
+   1. f7077a65                                             0.00B    unused
+      - matrixs://abcdef:****@synapse.example12.com/%23general?image=no&mode=off&version=3&msgtype...
+      tags: team
+
+   2. 0e873a46                                            81.10B    active
+      - tgram://W...U//?image=False&detect=yes&silent=no&preview=no&content=before&mdv=v1&format=m...
+      tags: personal
+
+   3. abcd123                                             12.00B    stale
+
+```
+The (persistent storage) cache states are:
+ - `unused`: This plugin has not commited anything to disk for reuse/cache purposes
+ - `active`: This plugin has written content to disk.  Or at the very least, it has prepared a persistent storage location it can write into.
+ - `stale`: The system detected a location where a URL may have possibly written to in the past, but there is nothing linking to it using the URLs provided.  It is likely wasting space or is no longer of any use.
+
+You can use this information to filter your results by specifying _URL ID_ (UID) values after your command.  For example:
+```bash
+# The below commands continue with the example already identified above
+# the following would match abcd123 (even though just ab was provided)
+# The output would only list the 'stale' entry above
+apprise storage list ab
+
+# knowing our filter is safe, we could remove it
+# the below command would not obstruct our other to URLs and would only
+# remove our stale one:
+apprise storage clean ab
+
+# Entries can be filtered by tag as well:
+apprise storage list --tag=team
+
+# You can match on multiple URL ID's as well:
+# The followin would actually match the URL ID's of 1. and .2 above
+apprise storage list f 0
+```
+When using the CLI, Persistent storage is set to the operational mode of `auto` by default, you can change this by providing `--storage-mode=` (`-SM`) during your calls.  If you want to ensure it's always set to a value of your choice.
+
+For more information on persistent storage, [visit here](https://appriseit.com/cli/persistent-storage/).
+
+## API Persistent Storage Commands
+For developers, persistent storage is set in the operational mode of `memory` by default.
+
+It's at the developers discretion to enable it (by switching it to either `auto` or `flush`). Should you choose to do so: it's as easy as including the information in the `AppriseAsset()` object prior to the initialization of your `Apprise()` instance.
+
+For example:
+```python
+from apprise import Apprise
+from apprise import AppriseAsset
+from apprise import PersistentStoreMode
+
+# Prepare a location the persistent storage can write it's cached content to.
+# By setting this path, this immediately assumes you wish to operate the
+# persistent storage in the operational 'auto' mode
+asset = AppriseAsset(storage_path="/path/to/save/data")
+
+# If you want to be more explicit and set more options, then you may do the
+# following
+asset = AppriseAsset(
+    # Set our storage path directory (minimum requirement to enable it)
+    storage_path="/path/to/save/data",
+
+    # Set the mode... the options are:
+    # 1. PersistentStoreMode.MEMORY
+    #       - disable persistent storage from writing to disk
+    # 2. PersistentStoreMode.AUTO
+    #       - write to disk on demand
+    # 3. PersistentStoreMode.FLUSH
+    #       - write to disk always and often
+    storage_mode=PersistentStoreMode.FLUSH
+
+    # The URL IDs are by default 8 characters in length. You can increase and
+    # decrease it's value here.  The value must be > 2. The default value is 8
+    # if not otherwise specified
+    storage_idlen=8,
+)
+
+# Now that we've got our asset, we just work with our Apprise object as we
+# normally do
+aobj = Apprise(asset=asset)
+```
+
+For more information on persistent storage, [visit here](https://appriseit.com/library/persistent-storage/).
+
+# Want To Learn More?
+
+If you're interested in reading more about this and other methods on how to customize your own notifications, please check out the following links:
+* ๐Ÿ“ฃ [Using the CLI](https://appriseit.com/cli/)
+* ๐Ÿ› ๏ธ [Development API](https://appriseit.com/library/)
+* โš™๏ธ [Configuration File Help](https://appriseit.com/getting-started/configuration/)
+* โšก [Create Your Own Custom Notifications](https://appriseit.com/library/extending/decorator/)
+* ๐ŸŒŽ [Apprise API/Web Interface](https://github.com/caronc/apprise-api/)
+* ๐Ÿ“– [Apprise Documentation Source](https://github.com/caronc/apprise-docs/)
+* ๐Ÿ”ง [Troubleshooting](https://appriseit.com/qa/)
+* ๐ŸŽ‰ [Showcase](https://appriseit.com/contributing/showcase/)
+
+Want to help make Apprise better?
+* ๐Ÿ’ก [Contribute to the Apprise Code Base](https://appriseit.com/contributing/)
+* โค๏ธ [Sponsorship and Donations](https://appriseit.com/contributing/sponsors/)
diff --git a/libs/apprise-1.9.8.dist-info/RECORD b/libs/apprise-1.9.8.dist-info/RECORD
new file mode 100644
index 0000000000..9f0dfa6a34
--- /dev/null
+++ b/libs/apprise-1.9.8.dist-info/RECORD
@@ -0,0 +1,233 @@
+../../bin/apprise,sha256=41ocDdUKbn8QbOtncNxcwagiZ6d2DL1ARZyEgip9OYA,186
+apprise-1.9.8.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+apprise-1.9.8.dist-info/METADATA,sha256=An6sk6bAqQdJRDAfr8KhZhyohL-i_h37eGX6V5R4aVM,56830
+apprise-1.9.8.dist-info/RECORD,,
+apprise-1.9.8.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apprise-1.9.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+apprise-1.9.8.dist-info/entry_points.txt,sha256=71YypBuNdjAKiaLsiMG40HEfLHxkU4Mi7o_S0s0d8wI,45
+apprise-1.9.8.dist-info/licenses/LICENSE,sha256=msAH6Aa9cZnPMVit_4OhY1GuhcRjc8NTOpi5YZdRA_I,1343
+apprise-1.9.8.dist-info/top_level.txt,sha256=JrCRn-_rXw5LMKXkIgMSE4E0t1Ks9TYrBH54Pflwjkk,8
+apprise/__init__.py,sha256=wZB-1ATAsyV-rjXvPa2MOI4vfYxWO6gsZ_yGoZD7PYk,3851
+apprise/apprise.py,sha256=urhgoEWyI9AzAjbkY6XmNUcsrdU-4KWYYT0CHspHE2g,36087
+apprise/apprise_attachment.py,sha256=PUvsVkFrFodtYY5KKWApGwVzRucTJIcSsRjy0YDE7xM,13642
+apprise/apprise_config.py,sha256=fPiTCS4wEG2R-IOXbVe3Jzd_dJgoOkLVrYndFkMFNDY,17964
+apprise/asset.py,sha256=2Epg10nieZKt5yFEgq2Qq_bTpijiICjaHK2oeGv_tmc,17701
+apprise/assets/NotifyXML-1.0.xsd,sha256=292qQ_IUl5EWDhPyzm9UTT0C2rVvJkyGar8jiODkJs8,986
+apprise/assets/NotifyXML-1.1.xsd,sha256=bjR3CGG4AEXoJjYkGCbDttKHSkPP1FlIWO02E7G59g4,1758
+apprise/assets/themes/default/apprise-failure-128x128.ico,sha256=Mt0ptfHJaN3Wsv5UCNDn9_3lyEDHxVDv1JdaDEI_xCA,67646
+apprise/assets/themes/default/apprise-failure-128x128.png,sha256=66ps8TDPxVH3g9PlObJqF-0x952CjnqQyN3zvpRcOT8,16135
+apprise/assets/themes/default/apprise-failure-256x256.png,sha256=bQBsKKCsKfR9EqgYOZrcVcVa5y8qG58PN2mEqO5eNRI,41931
+apprise/assets/themes/default/apprise-failure-32x32.png,sha256=vH0pZffIDCvkejpr3fJHGXW__8Yc3R_p0bacX6t6l18,2437
+apprise/assets/themes/default/apprise-failure-72x72.png,sha256=EP5A8DHRDr9srgupFSwOoyQ308bNJ8aL192J_L4K-ec,7600
+apprise/assets/themes/default/apprise-info-128x128.ico,sha256=F5_CirmXueRCRI5Z_Crf6TS6jVIXTJlRD83zw1oJ66g,67646
+apprise/assets/themes/default/apprise-info-128x128.png,sha256=bBqRZAgQey-gkmJrnFhPbzjILSrljE59mRkgj3raMQo,16671
+apprise/assets/themes/default/apprise-info-256x256.png,sha256=B5r_O4d9MHCmSWZwfbqQgZSp-ZetTdiBSwKcMTF1aFA,43331
+apprise/assets/themes/default/apprise-info-32x32.png,sha256=lt3NZ95TzkiCNVNlurrB2fE2nriMa1wftl7nrNXmb6c,2485
+apprise/assets/themes/default/apprise-info-72x72.png,sha256=kDnsZpqNUZGqs9t1ECUup7FOfXUIL-rupnQCYJp9So4,7875
+apprise/assets/themes/default/apprise-logo.png,sha256=85ttALudKkLmiqilJT7mUQLUXRFmM1AK89rnwLm313s,160907
+apprise/assets/themes/default/apprise-success-128x128.ico,sha256=uCopPwdQjxgfohKazHaDzYs9y4oiaOpL048PYC6WRlg,67646
+apprise/assets/themes/default/apprise-success-128x128.png,sha256=nvDuU_QqhGlw6cMtdj7Mv-gPgqCEx-0DaaXn1KBLVYg,17446
+apprise/assets/themes/default/apprise-success-256x256.png,sha256=vXfKuxY3n0eeXHKdb9hTxICxOEn7HjAQ4IZpX0HSLzc,48729
+apprise/assets/themes/default/apprise-success-32x32.png,sha256=Jg9pFJh3YPI-LiPBebyJ7Z4Vt7BRecaE8AsRjQVIkME,2471
+apprise/assets/themes/default/apprise-success-72x72.png,sha256=FQbgvIhqKOhEK0yvrhaSpai0R7hrkTt_-GaC2KUgCCk,7858
+apprise/assets/themes/default/apprise-warning-128x128.ico,sha256=6XaQPOx0oWK_xbhr4Yhb7qNazCWwSs9lk2SYR2MHTrQ,67646
+apprise/assets/themes/default/apprise-warning-128x128.png,sha256=pf5c4Ph7jWH7gf39dJoieSj8TzAsY3TXI-sGISGVIW4,16784
+apprise/assets/themes/default/apprise-warning-256x256.png,sha256=SY-xlaiXaj420iEYKC2_fJxU-yj2SuaQg6xfPNi83bw,43708
+apprise/assets/themes/default/apprise-warning-32x32.png,sha256=97R2ywNvcwczhBoWEIgajVtWjgT8fLs4FCCz4wu0dwc,2472
+apprise/assets/themes/default/apprise-warning-72x72.png,sha256=L8moEInkO_OLxoOcuvN7rmrGZo64iJeH20o-24MQghE,7913
+apprise/attachment/__init__.py,sha256=HVj63cGWbHlQrUy8WedaDFtvSRMPKsATb8lvKXfR-6A,1654
+apprise/attachment/base.py,sha256=oAB4Bdfof7tEgGtJUqPtFR9INEPGfvWOwuXf4sARN_s,16463
+apprise/attachment/file.py,sha256=J14LHyloDOVq1rXlqIeX7pkb9MCBH7C2DAEqNLExeGw,4953
+apprise/attachment/http.py,sha256=r7sphh4tb9JRcZ8l2BRJfyGErPeIRDWo--Ae_FuFYOg,13843
+apprise/attachment/memory.py,sha256=6j2kdFV32Zu8mod7Asiiwf6ByaRvf2PVCLIV28UIFYg,6873
+apprise/cli.py,sha256=u_DaRmwlDk81tOaa43VZ_6nBQaINxFCh2Mxc-9B4YWE,37773
+apprise/common.py,sha256=5a2s8yQtqm3BbdhM0cd9aIvZR5yGvwl9ioLOnNbwW7s,6863
+apprise/compat.py,sha256=hjaMSzwCcdodK79bZ54_vxhhO_KhcidIen-tJwE0NQQ,2043
+apprise/config/__init__.py,sha256=BrkAKU9NZ_dN8KuiUwBjYB9U7gU1wVW95uksS9rAbmI,1655
+apprise/config/base.py,sha256=t2gDb8-OAGINKo_aZfxvZsJIUPU3xZeXT9M7SDa9cjs,55848
+apprise/config/file.py,sha256=-y5oCdn1m9Sv8zfLSWwcw0jXj5nwDPv2r1i-eS_jSOE,6119
+apprise/config/http.py,sha256=V2U93piWl94umfKDIDsm66esR4lAmx-VLPvSP187Ed8,9445
+apprise/config/memory.py,sha256=J49cB4MFDvJADgnZVCX1GmNSwrQm-wnFsi6o1nY22vg,2733
+apprise/conversion.py,sha256=O-PjprtH1sMN1z9_sj6AMXsAd9jvbku8hvRdoSh_Ggg,6393
+apprise/decorators/__init__.py,sha256=UJvg7JUgzj50yr_uQqZd1Z2y6My-T9oeR2Luc1nUDJw,1456
+apprise/decorators/base.py,sha256=oXGf9ByHG5HZ8WMqZwTKTmBvUq1RBHFZ5QIljBtqhvQ,7879
+apprise/decorators/notify.py,sha256=yNtbZ3zID6cYnR6b-UTuZ0ILmZETwPO0HK2ZzjpvOUI,5066
+apprise/emojis.py,sha256=_IR06DNsTMAWpYzkZSm_zqVP0MKLtmCvlWS9jv07kE4,87630
+apprise/exception.py,sha256=9mOUrGXxLzwdpMo7XEk4iMUaED5FJU6QiSf9q5-NQdk,2512
+apprise/i18n/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apprise/i18n/apprise.pot,sha256=emswBY3tz-4tnvXR9yqj6B0LvHb_skcWkyhrbbM7h5I,44287
+apprise/i18n/en/LC_MESSAGES/apprise.mo,sha256=6TR8Gayv6E8LR9HLdbRnCVzRP_rdyIrIiCuCPt9-CT4,3655
+apprise/i18n/en/LC_MESSAGES/apprise.po,sha256=c3E2UB7PAqwxjb1IZ8ydvh4hL88Wz7YQF8snWepAung,47558
+apprise/locale.py,sha256=Qg0Jr49cPQQctNrzCSuzrWd27YMGgoG7shrAt6kepJU,8983
+apprise/logger.py,sha256=01qEr8aL2RrGnl7DNaawEbBLnGZr0izn9vb6e4e974U,6715
+apprise/manager.py,sha256=mmXPHMWFxEpFOPj3rpdOOYUQcsXNwl0eH7_2jGGHV7g,29624
+apprise/manager_attachment.py,sha256=Zqqq6X-m1qvIKbbqdXvCuuwfbzE7kXSBmDVjKD_Vkvg,2134
+apprise/manager_config.py,sha256=7Sw8ab_JhyxkCVFlkSfElYCacAq7immLrO6RyeOQe-0,2139
+apprise/manager_plugins.py,sha256=L_g-nxr_qyoZ-GyYvOskK2NLXyOBbRJCHFILOVgba_E,2137
+apprise/persistent_store.py,sha256=hr73A9lazx31fA0yz7wKOuPaDSHT-z4BkddC9RSNpiU,61030
+apprise/plugins/__init__.py,sha256=trbtZemgqRGdwGm493UCaRjTV94L8jzhRxgi-7KEQuQ,18665
+apprise/plugins/africas_talking.py,sha256=2U9PW46BwENnV14ZYoaIbTSKhxt_eaSZXGmMcaVtu6w,16624
+apprise/plugins/apprise_api.py,sha256=FPErT1UIlZniLqpT49qyNXGyVgs7lJTteWqZzWtP-tk,18134
+apprise/plugins/aprs.py,sha256=7Vmvv1pHjZWijpEjrgjuGjAb3dQko_kGO-ah4IFg9Io,25117
+apprise/plugins/bark.py,sha256=w-0YJ4Q6-uHYKLCqZKMrhmDzeISrU4tWc7HxSNdTYMw,19003
+apprise/plugins/base.py,sha256=3e4O6YtKc_gnull9Bp77nnTHEIm-a_-VS27QnlYp0P4,37080
+apprise/plugins/bluesky.py,sha256=lot_KKYhvVdwt6hGAUZdTRLGg2oLHkz9bJLpx8LF6u4,23303
+apprise/plugins/brevo.py,sha256=h33VyQ108W09sZwLFc28jvz8Jok0EuvLhTn-MGqlDzU,19388
+apprise/plugins/bulksms.py,sha256=N1xU5C3Jdbxi6bGNQY87i8XjZA12UwxNfq0A48noNuU,17036
+apprise/plugins/bulkvs.py,sha256=L7SASQxVox6QCQDYiVqM631o_7R6Mz3-UyexR0HFnGI,13922
+apprise/plugins/burstsms.py,sha256=HBFd-QYuVcsdLuBEwhzbzwErVuR9fiXD3RG-qUA8WkQ,16149
+apprise/plugins/chanify.py,sha256=lUBM7MXWvjBJNL3_ISIoNvZnArTFpEEnBPJcGBhWcWw,6887
+apprise/plugins/clickatell.py,sha256=R3oc3ZksikJYgV-iAMpc12lyjkvavayUftH6TbKB4K4,10367
+apprise/plugins/clicksend.py,sha256=TM52u60aM9OxRulhhDgrZPaV5o48wS96WlOzzxhEgdA,12014
+apprise/plugins/custom_form.py,sha256=HnMmOQoXBLeApGE9vD8LI_c57JsZkB0V3wd72fPONxw,19121
+apprise/plugins/custom_json.py,sha256=fkzDYCZ_zFT1g_Att9BifvJEMKdBIUuYGjAj50rIN2g,15012
+apprise/plugins/custom_xml.py,sha256=bnyusnF36BG0TD8OfgaU_PM6wD06SplcJmFPJjOqn6A,18441
+apprise/plugins/d7networks.py,sha256=sEVihX4Wm9AiVI2harLkGtqpSB0NLVRkeeVk6jfqBqU,15494
+apprise/plugins/dapnet.py,sha256=FIkaboR2m0Zgae4pl5LjsLeC3C_97pHLKoXtToPRpRM,13855
+apprise/plugins/dbus.py,sha256=SNv-nQlcFQIRgHNTcAr_tfVqcygqfn3k2rnUPOGz5qA,14495
+apprise/plugins/dingtalk.py,sha256=hd2LHBDaPAy241-NXtvgrmpegvpPPEKkEWrFa84yfZc,12343
+apprise/plugins/discord.py,sha256=OfiyW5_PzLXnlUTLre_91Rkwc_Av5Q8LvOGZS5ZDcTQ,30868
+apprise/plugins/dot.py,sha256=fzHv8MC2QSB0nb58Tja1G0WfliAfQPPBMMKRXseP-Vo,20666
+apprise/plugins/email/__init__.py,sha256=kTDw88J0x5MVAJC7UIXI-RpiGgzoXI0YanBXvvciylE,1917
+apprise/plugins/email/base.py,sha256=e_A2INbASt76PxX9_IOpKVjtGW6QiXgwvAoJavhy5PU,41205
+apprise/plugins/email/common.py,sha256=oJiGN2GKiXaDbiiJI0CSB32FIf8dqLuVqrJA75KLeJw,2527
+apprise/plugins/email/templates.py,sha256=tAxROfw2Q7XNmWSgggLnQXttGfY0cGJHQqpeCT9hsck,10353
+apprise/plugins/emby.py,sha256=HpR4WAcp8rwbgvwXpSQ3mJ3lE2plPBkQQ3_udQ10nYk,22567
+apprise/plugins/enigma2.py,sha256=vh8qAGmldV4ln1Y9zzYB3gYfhl07zRkgBnDV6ERP5W0,12109
+apprise/plugins/fcm/__init__.py,sha256=69qDcMxtfh8tZOY8gzZp0oFK9fX2NbMWPiEDC-19bGw,22158
+apprise/plugins/fcm/color.py,sha256=rqSeq9Bc6gmwKAqOMLNvSJDFUAKIBwDP5lDxpYd1ClA,4609
+apprise/plugins/fcm/common.py,sha256=yaEc5lOrEr5UFHd24CKhNNZW39PKDqR6Uxa8IwXVBP0,1687
+apprise/plugins/fcm/oauth.py,sha256=iqs5DRqR8dTWI8EiltzlCAn8aWl-gPZi7st7AErO0BE,11147
+apprise/plugins/fcm/priority.py,sha256=8y1E1iHPCH34sas1sGg5fFmyo_lTQpe0o473hUNjQ_0,6904
+apprise/plugins/feishu.py,sha256=kqPjitwmUf2ca62u_NKtiRF8FVFQ-zyeJkBrjfa4jYQ,7497
+apprise/plugins/flock.py,sha256=3s_xc91Jvvso4j8IzvlmSCX_YkEXQJYOUcjTUMzpBdk,13092
+apprise/plugins/fluxer.py,sha256=IjicrZfA_t93kxPAEtoKVXNQlCxX1Zb4niDpqmtINcY,36147
+apprise/plugins/fortysixelks.py,sha256=5mO6UYgO319A1HfT_Av8jdbXfjhL5qZLAZMRftawQgM,11937
+apprise/plugins/freemobile.py,sha256=RHZHrpwdQJYHr8KGzteipNN-bZLsvEWGqFAYO1cK2qc,6910
+apprise/plugins/glib.py,sha256=rQV1hH7lHRio1b2ZFvZJNTDV5Iwa_F_5d2uS83I8h5E,12920
+apprise/plugins/gnome.py,sha256=2Ykzkdncf0UfI4ok-hZIuhQC3__u10U12PBUGbjvWVU,9295
+apprise/plugins/google_chat.py,sha256=LJI1FLHWRcX3gjspnF3xVCquWt7O0V3JSDt0IcfLjPU,13588
+apprise/plugins/gotify.py,sha256=XgTM2FZlTQwRXD4wfMvYYcIujP8dcEqYM5cDhnj0gN4,11162
+apprise/plugins/growl.py,sha256=A9UYAKrEqBgQzSZlxwiRUN8s7CLRx3M8QowLTY-_KgA,14947
+apprise/plugins/guilded.py,sha256=ARbx9otLNOMoeYNKftLTu8uuDnkmt91jk61zt9HdgN8,3801
+apprise/plugins/home_assistant.py,sha256=CjOVejsI95CdkHDjTw38SxFIoz5BxpiWJj1_1p7gXYk,11669
+apprise/plugins/httpsms.py,sha256=nIC7noesMHLwMXO9vC-92zJx8_v2PFyh6jsivwBR5ow,11457
+apprise/plugins/ifttt.py,sha256=PUsvapfXAreWYyKKTAjDFLHP1Os9vu9VOHPcMKHVnaA,13899
+apprise/plugins/irc/__init__.py,sha256=FnlnCevX7Hxc8zea6r3yqOJimIucLNM6YMDStcfebL8,1493
+apprise/plugins/irc/base.py,sha256=oxjXLj9cpF-vbR0I02nZWQwcA0zlMv7tvxex7Cc4icQ,16860
+apprise/plugins/irc/client.py,sha256=4usfuD7kFARXl2VdviKuG3tQ1DinlrXBoaICbM6QnEg,12788
+apprise/plugins/irc/protocol.py,sha256=4jTetI-FuguaR1R2dBSEoHofYUw7-Q6iMBTFUdDe6zY,6539
+apprise/plugins/irc/state.py,sha256=HI4ZR0wXZUiM5q9Q7rAVW0xpQu7_WIlmBAHbRP0L9KE,7301
+apprise/plugins/irc/templates.py,sha256=tbr4nZ9NR_RlqZXMNfNmtj_F5pxcGkWnsXfxeMLeDYA,2709
+apprise/plugins/jellyfin.py,sha256=Qsqtq0oPXQfZgZekykk6d5TvJBFY7rrBHRpulERczhQ,2155
+apprise/plugins/join.py,sha256=ypse-K0Kp8XpYalogZ3ayVDfxkdZddOFPNuyeY7caEk,14167
+apprise/plugins/kavenegar.py,sha256=onekhFAjWH-3vd1INxSO4p9_VHmKi-19h7ydGdDkjKI,12937
+apprise/plugins/kumulos.py,sha256=L0f5MdNn2gae8-JDy3wDWVNkJqJ9aLyoTbPeAVk1XGg,8464
+apprise/plugins/lametric.py,sha256=FjhugijcodU4j_SgxGuJgbKYLfp5rsPdm9mseJBDTt4,40183
+apprise/plugins/lark.py,sha256=JdAU4YpeXK2bQtvX1BQdqLJ9Dutesavd4USTThiwmy8,6424
+apprise/plugins/line.py,sha256=_Rg4x4LhPB02HWaVJ9znFohOqAMrOvH_1XeOoNf5Dfc,10972
+apprise/plugins/macosx.py,sha256=x5FE8ccOHg3H7r6Q9Q2N24XpHkCUVsk5xbER1Oj7d9Q,8365
+apprise/plugins/mailgun.py,sha256=f7l1AvYP8BeIvXxpYmh9olzydCEz2_lHa3s0kv1n_EQ,26591
+apprise/plugins/mastodon.py,sha256=CXm0UWddiLBJ5_OrMdkfZ5xrsgGkA0kh_hRlVjjrmVc,36655
+apprise/plugins/matrix.py,sha256=JMujdt0XnClQasKcrJcXL2WysmIKyavo7dQyjSyc0AM,65360
+apprise/plugins/mattermost.py,sha256=QvxvsySE5qneIgAIIMR7WhlOI3_TFK4cWuMSKYfNvQQ,25346
+apprise/plugins/messagebird.py,sha256=cydwBE6RD40HXmJP1Fxkd1XeyvaL2FKqarec4UEzv-s,12569
+apprise/plugins/misskey.py,sha256=mNy2RaspVNOxC9AfpNLM30vTHjDAnZq-oxAW_JtK_dI,10055
+apprise/plugins/mqtt.py,sha256=vo1ay92eEz7cWdLk3_POJOESxQxKOjvRP0lRbzLqi0s,21522
+apprise/plugins/msg91.py,sha256=Nehhtoi_JM2rcP-FhFgiT40ivYgB3DovR2QbB6eCoTE,13153
+apprise/plugins/msteams.py,sha256=rT9VTQdzgZDwUN2kt1IzIlMirz00Sjyw68J-XGPBFrc,27533
+apprise/plugins/nextcloud.py,sha256=km6s73zggAqnsJ5klMfgxW0w0eVsnUNRsg6JN0_3d3I,20174
+apprise/plugins/nextcloudtalk.py,sha256=f18YWEhNCkjOz4XjFeX3oeg-JR7u-mItKfXm4YXv3yE,11667
+apprise/plugins/notica.py,sha256=dvQlQx2QBvpzvIcDRVHReP36EiuXAlXgQOC8hpUlOyc,13541
+apprise/plugins/notifiarr.py,sha256=UscluMX7WJXNx74ANH013Ob83RMBIfPTtGmeZwWdRPI,15829
+apprise/plugins/notificationapi.py,sha256=vjWeqrmq44QejcyTFiRVcNV0qVqrkMlMUyv62N0FY7A,33843
+apprise/plugins/notifico.py,sha256=KPE7AIN16INkoFxCxw83nMTzkTjqG-jYJpcHUZMpz00,12619
+apprise/plugins/ntfy.py,sha256=nbT-XHmF8PGYqDMxdhjFaB_Nf2B3JXZEdy32eaH9P0w,32547
+apprise/plugins/office365.py,sha256=XA4V3zlqgVbXVP-wJgVtALGlOkrxKhBOx7uMwTFpD7Y,38391
+apprise/plugins/one_signal.py,sha256=xcb_r2zQ0K4LepBWqZ5n8aSasM1okglJ3pDTaecVaXY,23941
+apprise/plugins/opsgenie.py,sha256=2g3R7EpIUuaEyKei6DvJ4Nd8hhWfyzKPGQIRKcFsKxQ,29465
+apprise/plugins/pagerduty.py,sha256=T-QaKTGI_Hw8Yv59L5m_Iyl_IimF0p648YoxwckhfQA,18843
+apprise/plugins/pagertree.py,sha256=bPdX37D43PnfpjCGeSWRGCvUx4gAeGU2o9SP_MUBnl0,14225
+apprise/plugins/parseplatform.py,sha256=INnv_RTfQeYqOi9K2Pymma8VnqbfbvLajkthhQobX_s,11087
+apprise/plugins/plivo.py,sha256=MKp3wj1SO3BQrJMXUVgVQtmIkbn4zjVLS9jXP4zzv0k,14124
+apprise/plugins/popcorn_notify.py,sha256=DgAt0sA9P4qIEQUQKQ1prz7DyOyZF4_2joNfXDBkaCM,11091
+apprise/plugins/prowl.py,sha256=iSZoy6VHjLnk7zaOIBJznMtd0coE3GKl1CMxE13kiV0,10242
+apprise/plugins/pushbullet.py,sha256=PBc6RFPbi8Ohv8OrZUZRam5rvj8-7fJ00_twpjDXUrA,16236
+apprise/plugins/pushdeer.py,sha256=Ap3R2IVjfcyVzSgpLC5tYym0U4SNoalTtbOgs16ymL4,7246
+apprise/plugins/pushed.py,sha256=PsTUAIQLjaS3vHhYmnLZ47P186_dSeCKbN7JZ2NRLjU,12638
+apprise/plugins/pushjet.py,sha256=tSD5LymHK8EuXrWixYBC3e5idz3BRX2yzsYprOsgY2U,9591
+apprise/plugins/pushme.py,sha256=hfnK-9DQzgrCcHtDxuYxjI7N1_ZgtQpZWnUEkjEaI_E,7415
+apprise/plugins/pushover.py,sha256=Mk7xaT7lvDjrhtMu2YWKLa0SkFb2ywZMIWSRH9BQYHI,22103
+apprise/plugins/pushplus.py,sha256=iHASnXcQ1xdrf8Opz0NA0DJxsOSlVIrUn6ugnlputtY,5683
+apprise/plugins/pushsafer.py,sha256=Q9HKYtpqCajuhbljiZzZ01eho9_YU0vKUelETUWwOzE,28301
+apprise/plugins/pushy.py,sha256=jFPChiF9U1mHVPYsrbicdWSgGR3kPrMgQGIJAf7jQgo,12837
+apprise/plugins/qq.py,sha256=RcUEcwgjrX-dNjfB4k7XHWsiC1HuKUJiMcwuXN32_pM,5655
+apprise/plugins/reddit.py,sha256=yIFnLAWIzbnb7UTx8mio2j9WzJaw5zN54nZNx34AcFo,26183
+apprise/plugins/resend.py,sha256=HnV4hUizz7XFIReLHtYQsRtHV1G6BccI-gk9X4nLqBI,20362
+apprise/plugins/revolt.py,sha256=HEagDzGVrYIlqJXc185aq4ATXSCnfmWUpk-bb-hOBL0,14900
+apprise/plugins/rocketchat.py,sha256=Qcpbd06yo548RlDZnJNSpaeb4J728Ox04BDuiaimWts,26677
+apprise/plugins/rsyslog.py,sha256=lZRnTglk-dM87dRd1hMrnLBYvCWwYWMEiF3zrAPUB7M,12516
+apprise/plugins/ryver.py,sha256=Ns-fy6DOboVycrCGKigx0kSDzSawPRTCxx5YxP1TZoA,12249
+apprise/plugins/sendgrid.py,sha256=9XD98TDubjQOfFppOrVEV3iGYbwYWakG4ZOUPNu2JVw,19228
+apprise/plugins/sendpulse.py,sha256=rMNs1cFvErzALD7lw6p_PyjzxLvO7HRbcTUxfgT7YHA,27428
+apprise/plugins/serverchan.py,sha256=VWtgW8AgIPHqBtJu_Uhpjd8ZSaPCkkFlobZP5ZLLDkw,6026
+apprise/plugins/ses.py,sha256=Hg80nMOVCvXi5OW6rfUp7sjLMe7gWoykxeIo6WYThaM,34848
+apprise/plugins/seven.py,sha256=kfG2Xw55vTaDoOSsAe2SESESThAVydwULFZ5m5blDSM,12451
+apprise/plugins/sfr.py,sha256=UTNdwvYNZ_CojLC0qNwZBT9F1GZQsYICD1Z0LK7QVzw,15185
+apprise/plugins/signal_api.py,sha256=9kqu2_vTX_AViNhn2FcHixg4nNSuFeQrA8FOvGmgRHc,18656
+apprise/plugins/signl4.py,sha256=f7xYu9bseoT3iufQvD7GmhTPRMMTLdOWsfXfXPQ6u3w,11260
+apprise/plugins/simplepush.py,sha256=9j0VqAQ2v8tv6--sZS_2On5CNMK_UBLJRlHDwx6zi0w,12137
+apprise/plugins/sinch.py,sha256=Fxd4VLgDHlGYECWIVmP_bXIQmllEGQ6aJw_0OgJHWew,17456
+apprise/plugins/slack.py,sha256=tQF2konKYyGgp7YQBDI3nhCwV4PpQ-jS1mjUTKmJaIs,48562
+apprise/plugins/smpp.py,sha256=EbWMFnt3ACWAtHzxjZLWSmrQ5kJbUL23LpfON6mvOu0,11759
+apprise/plugins/smseagle.py,sha256=XKCzj6tnxNBy7J5sEeQxNItL4xz1yA-2ShqvVu20fZk,26241
+apprise/plugins/smsmanager.py,sha256=QycgH5UqHvEAoMXMrMJJunHIsALDjYIr6o8df6kj574,14706
+apprise/plugins/smtp2go.py,sha256=IBIy8lQPgIgVioeSDVbITGCq87QjCAYFti1M05j6d78,20956
+apprise/plugins/sns.py,sha256=KxGre-BFLkLdMkJHYiGkGRovpyan8sMSPH13_TeuS2I,24519
+apprise/plugins/sparkpost.py,sha256=qKYuaoCaOJ59T6wnEa3-bGU-ihpnSg8adKulDuYoNpQ,28205
+apprise/plugins/spike.py,sha256=PKSYQvjNCKM9VN5VSa-BCIR5WVyinHoKL2rCVBI3Jc4,5963
+apprise/plugins/splunk.py,sha256=HeBg6FEM1xbuXHNv2XSKkZ74rpaFcUVzTeUegC5xGHI,17182
+apprise/plugins/spugpush.py,sha256=q4pd7G7TBQ2hYd_3qZ5bAdR--nufENbXdtjEpkVK4oc,5616
+apprise/plugins/streamlabs.py,sha256=ys7jnREK9aFowY3rKjz2K_0ufaz2szZczHUCXcZSr7k,16622
+apprise/plugins/synology.py,sha256=2bgOCWMP4i7uUn8Hpxz85e_MsIESS1I23KHLJ45N0ek,11857
+apprise/plugins/syslog.py,sha256=0-E8qJeiKJCElWKcsRQkqFW74yUmF7mT699sFabNHTc,10799
+apprise/plugins/techuluspush.py,sha256=ahi_4sBY3VSECCdPzhDL1snuN0oCEqVMxi5OvxvXbAE,7412
+apprise/plugins/telegram.py,sha256=KBrQXPgYJdbJ--hEiZ0RfN0JbGrXmZ98tCOIDjgdhA4,40886
+apprise/plugins/threema.py,sha256=jjIARxit74jX_WQmom1BPj8-vi5AkK7xM9vNAFssOnA,12287
+apprise/plugins/twilio.py,sha256=wRGstpOOQ_jnpCHfjKm-R5SwUIzQZYwmay8H0srDa9I,21752
+apprise/plugins/twist.py,sha256=RM75TRbioN9PPGvkKY5031IB1uQBTVaTMgyEmjB3mZM,26944
+apprise/plugins/twitter.py,sha256=AApwLbHfvePJinHMToovp_ESTJ0lW8fNcu0VnVaTFqs,31870
+apprise/plugins/vapid/__init__.py,sha256=tgxaZH-QDXSwTJa5GPw9cjW3mc0X1DG0VB_z2Llacd4,20545
+apprise/plugins/vapid/subscription.py,sha256=v6IWFIyifxTHCs3Y-lNuEcFUOeZ8Q_sXuPWZhDeuscI,13139
+apprise/plugins/viber.py,sha256=m6nDkOwkEVfPEDaO7tQdKlv5OT8Zpnv1LzRYGBPUBRE,11511
+apprise/plugins/voipms.py,sha256=U1cRyImG0xQnYEOifKKRzNMFjlEpiy8bjNYKutUUwow,13335
+apprise/plugins/vonage.py,sha256=Nr4mZDPnPbQb5BdAcoa3KHCpQzH3WBBZuO9R0lcTiiI,13752
+apprise/plugins/webexteams.py,sha256=sEbtMh-YyxCyNNPjLpiYPpV4wCudzJOqYolBzSmH4sY,9886
+apprise/plugins/wecombot.py,sha256=G1gBM4JAzlISHmrRBuI2DSodJhPLpZSo3l5UNcwo7yw,9159
+apprise/plugins/whatsapp.py,sha256=EA9eSADSwgtZHIvEfjqg7IRUbmSLwf698RB39mQDx4A,20846
+apprise/plugins/windows.py,sha256=ozKn8c620kWufxRrgW0G4xIFKrgDP4k0PNufA4b3WFQ,9289
+apprise/plugins/workflows.py,sha256=D4wl5QGX4wRA3_2Oljvkhdx8JJMicJpHjPDf0JZP1ag,22918
+apprise/plugins/wxpusher.py,sha256=2PQCHD8BORYkYeQmWbhMSmqZIfyOdPb4PNAsxkliyIY,13119
+apprise/plugins/xbmc.py,sha256=65_OtJvuaf4Wyn1cqo4ehi2BvJmhrUr53gkqLMadQ50,13071
+apprise/plugins/xmpp/__init__.py,sha256=MHHkHXkuAccQmd54fd5jLdpFTrID7fa6XtnqKQx_SUo,1496
+apprise/plugins/xmpp/adapter.py,sha256=DkKJIJOayei96W-jKyCh0DLJFFT5xlnYpv5At-mt6UY,32095
+apprise/plugins/xmpp/base.py,sha256=8NTYZJJte3SzN_VECLkY-sbPLcqvYU3vc4fp-YA-n9U,14730
+apprise/plugins/xmpp/common.py,sha256=P4_esSvRzgUJNbJB4FNfG_Ec42kf6anPr3jWq77wSQI,2106
+apprise/plugins/zulip.py,sha256=psxDXX8luootHqiElSVtvMRFYQ8_XZLMpGS5CYe-2DA,14531
+apprise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apprise/url.py,sha256=NSS9PwWbj2edxPCWFnFZvc8lnlOE0dA-Yi_c4ysyqhY,35434
+apprise/utils/__init__.py,sha256=-XVQG23gk_zU6BF_ugbAan8ChfJmycmuI-gDVLexW88,1406
+apprise/utils/base64.py,sha256=oRzRs78Di2Gh8nOPVw9kDXkgtPb3O74jfmQ_O4lGfXQ,3771
+apprise/utils/cwe312.py,sha256=6PhiMZqvcWhO9k8cPF0AYo9kBbmX5WEP9Qx4HHE2vTg,7767
+apprise/utils/disk.py,sha256=hKKGA6KMIihqsk9PW4syCtbbOAbCwlraV8Zmub7SJRM,5659
+apprise/utils/format.py,sha256=FxLD6yBcR1PeKAT_a1STo4r5oNv1hUb0DYQGWpZbg0k,6916
+apprise/utils/logic.py,sha256=feRCj1ttRuZADg5_vi9ITcofkV9QuxWOP7BB3mCuo5g,4578
+apprise/utils/module.py,sha256=DYUvpbmcHc0GimpBIwqwDatPzNYVHdKl_r9nCT2KDcQ,2054
+apprise/utils/parse.py,sha256=QWsNdJ39GyHp4TXYZiUk-tKMqsYF2RqLLoRqiSQPhPA,39926
+apprise/utils/pem.py,sha256=FfBjI-I_gjI9ON-K2lId-3gCQrU7L0Cx62USmD8rdOk,28025
+apprise/utils/pgp.py,sha256=qlpYOvyFoZ75ReLDJNqguBeT3K2rrVZPGHBnHUnfhjY,11607
+apprise/utils/sanitize.py,sha256=2SoNrdlX-ZAFQryxgGQixIUWrWO-_lwI3M7ZTYMsJ8I,9532
+apprise/utils/singleton.py,sha256=OUSF4C5yzIQm8wNEkXtSw_pTEKVueXfgaLdOe-fiOe4,1795
+apprise/utils/socket.py,sha256=QHjWbqd4IV2wcTl5a3GZeD8EIkCsA2Wq-EBjPpmrI0E,21903
+apprise/utils/templates.py,sha256=6t1dJmx2l3pqiJEFZLFZWHkpPz2WS92mjRCEG4HSMGA,3245
+apprise/utils/time.py,sha256=W3_y338hpaArJqNr2UIHGjPinEOi2oeBiF2hR3lvF9M,2877
diff --git a/libs/Mako-1.3.8.dist-info/REQUESTED b/libs/apprise-1.9.8.dist-info/REQUESTED
similarity index 100%
rename from libs/Mako-1.3.8.dist-info/REQUESTED
rename to libs/apprise-1.9.8.dist-info/REQUESTED
diff --git a/libs/apprise-1.9.8.dist-info/WHEEL b/libs/apprise-1.9.8.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/apprise-1.9.8.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/apprise-1.9.2.dist-info/entry_points.txt b/libs/apprise-1.9.8.dist-info/entry_points.txt
similarity index 100%
rename from libs/apprise-1.9.2.dist-info/entry_points.txt
rename to libs/apprise-1.9.8.dist-info/entry_points.txt
diff --git a/libs/apprise-1.9.8.dist-info/licenses/LICENSE b/libs/apprise-1.9.8.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..8ff150bc08
--- /dev/null
+++ b/libs/apprise-1.9.8.dist-info/licenses/LICENSE
@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/apprise-1.9.2.dist-info/top_level.txt b/libs/apprise-1.9.8.dist-info/top_level.txt
similarity index 100%
rename from libs/apprise-1.9.2.dist-info/top_level.txt
rename to libs/apprise-1.9.8.dist-info/top_level.txt
diff --git a/libs/apprise/__init__.py b/libs/apprise/__init__.py
index e9f496539a..1e17ea8c9e 100644
--- a/libs/apprise/__init__.py
+++ b/libs/apprise/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,81 +25,98 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__title__ = 'Apprise'
-__version__ = '1.9.2'
-__author__ = 'Chris Caron'
-__license__ = 'BSD 2-Clause'
-__copywrite__ = 'Copyright (C) 2025 Chris Caron <lead2gold@gmail.com>'
-__email__ = 'lead2gold@gmail.com'
-__status__ = 'Production'
-
-from .common import NotifyType
-from .common import NOTIFY_TYPES
-from .common import NotifyImageSize
-from .common import NOTIFY_IMAGE_SIZES
-from .common import NotifyFormat
-from .common import NOTIFY_FORMATS
-from .common import OverflowMode
-from .common import OVERFLOW_MODES
-from .common import ConfigFormat
-from .common import CONFIG_FORMATS
-from .common import ContentIncludeMode
-from .common import CONTENT_INCLUDE_MODES
-from .common import ContentLocation
-from .common import CONTENT_LOCATIONS
-from .common import PersistentStoreMode
-from .common import PERSISTENT_STORE_MODES
-
-from .url import URLBase
-from .url import PrivacyMode
-from .plugins.base import NotifyBase
-from .config.base import ConfigBase
-from .attachment.base import AttachBase
-from . import exception
+__title__ = "Apprise"
+__description__: str = \
+    "Push Notifications that work with just about every platform!"
+__version__ = "1.9.8"
+__author__ = "Chris Caron"
+__email__ = "lead2gold@gmail.com"
+__license__ = "BSD 2-Clause"
+__copyright__ = "Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>"
+__status__ = "Production"
 
+from . import decorators, exception
 from .apprise import Apprise
-from .locale import AppriseLocale
-from .asset import AppriseAsset
-from .persistent_store import PersistentStore
-from .apprise_config import AppriseConfig
 from .apprise_attachment import AppriseAttachment
+from .apprise_config import AppriseConfig
+from .asset import AppriseAsset
+from .attachment.base import AttachBase
+from .common import (
+    CONFIG_FORMATS,
+    CONTENT_INCLUDE_MODES,
+    CONTENT_LOCATIONS,
+    NOTIFY_FORMATS,
+    NOTIFY_IMAGE_SIZES,
+    NOTIFY_TYPES,
+    OVERFLOW_MODES,
+    PERSISTENT_STORE_MODES,
+    PERSISTENT_STORE_STATES,
+    ConfigFormat,
+    ContentIncludeMode,
+    ContentLocation,
+    NotifyFormat,
+    NotifyImageSize,
+    NotifyType,
+    OverflowMode,
+    PersistentStoreMode,
+)
+from .config.base import ConfigBase
+from .locale import AppriseLocale
+
+# Inherit our logging with our additional entries added to it
+from .logger import LOGGER_NAME, LogCapture, logger, logging
 from .manager_attachment import AttachmentManager
 from .manager_config import ConfigurationManager
 from .manager_plugins import NotificationManager
-from . import decorators
-
-# Inherit our logging with our additional entries added to it
-from .logger import logging
-from .logger import logger
-from .logger import LogCapture
+from .persistent_store import PersistentStore
+from .plugins.base import NotifyBase
+from .url import PrivacyMode, URLBase
 
 # Set default logging handler to avoid "No handler found" warnings.
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
 __all__ = [
+    "CONFIG_FORMATS",
+    "CONTENT_INCLUDE_MODES",
+    "CONTENT_LOCATIONS",
+    "LOGGER_NAME",
+    "NOTIFY_FORMATS",
+    "NOTIFY_IMAGE_SIZES",
+    "NOTIFY_TYPES",
+    "OVERFLOW_MODES",
+    "PERSISTENT_STORE_MODES",
+    "PERSISTENT_STORE_STATES",
     # Core
-    'Apprise', 'AppriseAsset', 'AppriseConfig', 'AppriseAttachment', 'URLBase',
-    'NotifyBase', 'ConfigBase', 'AttachBase', 'AppriseLocale',
-    'PersistentStore',
-
-    # Exceptions
-    'exception',
-
-    # Reference
-    'NotifyType', 'NotifyImageSize', 'NotifyFormat', 'OverflowMode',
-    'NOTIFY_TYPES', 'NOTIFY_IMAGE_SIZES', 'NOTIFY_FORMATS', 'OVERFLOW_MODES',
-    'ConfigFormat', 'CONFIG_FORMATS',
-    'ContentIncludeMode', 'CONTENT_INCLUDE_MODES',
-    'ContentLocation', 'CONTENT_LOCATIONS',
-    'PersistentStoreMode', 'PERSISTENT_STORE_MODES',
-    'PrivacyMode',
-
+    "Apprise",
+    "AppriseAsset",
+    "AppriseAttachment",
+    "AppriseConfig",
+    "AppriseLocale",
+    "AttachBase",
+    "AttachmentManager",
+    "ConfigBase",
+    "ConfigFormat",
+    "ConfigurationManager",
+    "ContentIncludeMode",
+    "ContentLocation",
+    "LogCapture",
     # Managers
-    'NotificationManager', 'ConfigurationManager', 'AttachmentManager',
-
+    "NotificationManager",
+    "NotifyBase",
+    "NotifyFormat",
+    "NotifyImageSize",
+    # Reference
+    "NotifyType",
+    "OverflowMode",
+    "PersistentStore",
+    "PersistentStoreMode",
+    "PrivacyMode",
+    "URLBase",
     # Decorator
-    'decorators',
-
+    "decorators",
+    # Exceptions
+    "exception",
     # Logging
-    'logging', 'logger', 'LogCapture',
+    "logger",
+    "logging",
 ]
diff --git a/libs/apprise/apprise.py b/libs/apprise/apprise.py
index 9af55b5faf..924b47bb9d 100644
--- a/libs/apprise/apprise.py
+++ b/libs/apprise/apprise.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,59 +25,74 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import annotations
+
 import asyncio
+from collections.abc import Iterator
 import concurrent.futures as cf
-import os
 from itertools import chain
-from . import common
+import os
+from typing import Any, Optional, Union
+
+from . import __version__, common, plugins
+from .apprise_attachment import AppriseAttachment
+from .apprise_config import AppriseConfig
+from .asset import AppriseAsset
+from .common import ContentLocation
+from .config.base import ConfigBase
 from .conversion import convert_between
-from .utils.logic import is_exclusive_match
-from .utils.parse import parse_list, parse_urls
-from .utils.cwe312 import cwe312_url
-from .manager_plugins import NotificationManager
 from .emojis import apply_emojis
-from .logger import logger
-from .asset import AppriseAsset
-from .apprise_config import AppriseConfig
-from .apprise_attachment import AppriseAttachment
 from .locale import AppriseLocale
-from .config.base import ConfigBase
+from .logger import logger
+from .manager_plugins import NotificationManager
 from .plugins.base import NotifyBase
-
-from . import plugins
-from . import __version__
+from .utils.cwe312 import cwe312_url
+from .utils.logic import is_exclusive_match
+from .utils.parse import parse_list, parse_urls
 
 # Grant access to our Notification Manager Singleton
 N_MGR = NotificationManager()
 
 
 class Apprise:
-    """
-    Our Notification Manager
-
-    """
-
-    def __init__(self, servers=None, asset=None, location=None, debug=False):
-        """
-        Loads a set of server urls while applying the Asset() module to each
+    """Our Notification Manager."""
+
+    def __init__(
+        self,
+        servers: Optional[
+            Union[
+                str,
+                dict,
+                NotifyBase,
+                AppriseConfig,
+                ConfigBase,
+                list[Union[str, dict, NotifyBase, AppriseConfig, ConfigBase]],
+            ]
+        ] = None,
+        asset: Optional[AppriseAsset] = None,
+        location: Optional[ContentLocation] = None,
+        debug: bool = False,
+    ) -> None:
+        """Loads a set of server urls while applying the Asset() module to each
         if specified.
 
         If no asset is provided, then the default asset is used.
 
-        Optionally specify a global ContentLocation for a more strict means
-        of handling Attachments.
+        Optionally specify a global ContentLocation for a more strict means of
+        handling Attachments.
         """
 
         # Initialize a server list of URLs
-        self.servers = list()
+        self.servers = []
 
         # Assigns an central asset object that will be later passed into each
         # notification plugin.  Assets contain information such as the local
         # directory images can be found in. It can also identify remote
         # URL paths that contain the images you want to present to the end
         # user. If no asset is specified, then the default one is used.
-        self.asset = \
+        self.asset = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         if servers:
             self.add(servers)
@@ -95,9 +109,13 @@ def __init__(self, servers=None, asset=None, location=None, debug=False):
         self.location = location
 
     @staticmethod
-    def instantiate(url, asset=None, tag=None, suppress_exceptions=True):
-        """
-        Returns the instance of a instantiated plugin based on the provided
+    def instantiate(
+        url: Union[str, dict],
+        asset: Optional[AppriseAsset] = None,
+        tag: Optional[Union[str, list[str]]] = None,
+        suppress_exceptions: bool = True,
+    ) -> Optional[NotifyBase]:
+        """Returns the instance of a instantiated plugin based on the provided
         Server URL.  If the url fails to be parsed, then None is returned.
 
         The specified url can be either a string (the URL itself) or a
@@ -129,7 +147,8 @@ def instantiate(url, asset=None, tag=None, suppress_exceptions=True):
         if isinstance(url, str):
             # Acquire our url tokens
             results = plugins.url_to_dict(
-                url, secure_logging=asset.secure_logging)
+                url, secure_logging=asset.secure_logging
+            )
 
             if results is None:
                 # Failed to parse the server URL; detailed logging handled
@@ -140,73 +159,86 @@ def instantiate(url, asset=None, tag=None, suppress_exceptions=True):
             # We already have our result set
             results = url
 
-            if results.get('schema') not in N_MGR:
+            if results.get("schema") not in N_MGR:
                 # schema is a mandatory dictionary item as it is the only way
                 # we can index into our loaded plugins
                 logger.error('Dictionary does not include a "schema" entry.')
                 logger.trace(
-                    'Invalid dictionary unpacked as:{}{}'.format(
-                        os.linesep, os.linesep.join(
-                            ['{}="{}"'.format(k, v)
-                             for k, v in results.items()])))
+                    "Invalid dictionary unpacked as:{}{}".format(
+                        os.linesep,
+                        os.linesep.join(
+                            [f'{k}="{v}"' for k, v in results.items()]
+                        ),
+                    )
+                )
                 return None
 
             logger.trace(
-                'Dictionary unpacked as:{}{}'.format(
-                    os.linesep, os.linesep.join(
-                        ['{}="{}"'.format(k, v) for k, v in results.items()])))
+                "Dictionary unpacked as:{}{}".format(
+                    os.linesep,
+                    os.linesep.join(
+                        [f'{k}="{v}"' for k, v in results.items()]
+                    ),
+                )
+            )
 
         # Otherwise we handle the invalid input specified
         else:
             logger.error(
-                'An invalid URL type (%s) was specified for instantiation',
-                type(url))
+                "An invalid URL type (%s) was specified for instantiation",
+                type(url),
+            )
             return None
 
-        if not N_MGR[results['schema']].enabled:
+        if not N_MGR[results["schema"]].enabled:
             #
             # First Plugin Enable Check (Pre Initialization)
             #
 
             # Plugin has been disabled at a global level
             logger.error(
-                '%s:// is disabled on this system.', results['schema'])
+                "%s:// is disabled on this system.", results["schema"]
+            )
             return None
 
         # Build a list of tags to associate with the newly added notifications
-        results['tag'] = set(parse_list(tag))
+        results["tag"] = set(parse_list(tag))
 
         # Set our Asset Object
-        results['asset'] = asset
+        results["asset"] = asset
 
         if suppress_exceptions:
             try:
                 # Attempt to create an instance of our plugin using the parsed
                 # URL information
-                plugin = N_MGR[results['schema']](**results)
+                plugin = N_MGR[results["schema"]](**results)
 
                 # Create log entry of loaded URL
                 logger.debug(
-                    'Loaded {} URL: {}'.format(
-                        N_MGR[results['schema']].service_name,
-                        plugin.url(privacy=asset.secure_logging)))
+                    "Loaded {} URL: {}".format(
+                        N_MGR[results["schema"]].service_name,
+                        plugin.url(privacy=asset.secure_logging),
+                    )
+                )
 
             except Exception:
                 # CWE-312 (Secure Logging) Handling
-                loggable_url = url if not asset.secure_logging \
-                    else cwe312_url(url)
+                loggable_url = (
+                    url if not asset.secure_logging else cwe312_url(url)
+                )
 
                 # the arguments are invalid or can not be used.
                 logger.error(
-                    'Could not load {} URL: {}'.format(
-                        N_MGR[results['schema']].service_name,
-                        loggable_url))
+                    "Could not load {} URL: {}".format(
+                        N_MGR[results["schema"]].service_name, loggable_url
+                    )
+                )
                 return None
 
         else:
             # Attempt to create an instance of our plugin using the parsed
             # URL information but don't wrap it in a try catch
-            plugin = N_MGR[results['schema']](**results)
+            plugin = N_MGR[results["schema"]](**results)
 
         if not plugin.enabled:
             #
@@ -223,14 +255,26 @@ def instantiate(url, asset=None, tag=None, suppress_exceptions=True):
             # are polling what is available. These services that become
             # disabled thereafter are shown initially that they can be used.
             logger.error(
-                '%s:// has become disabled on this system.', results['schema'])
+                "%s:// has become disabled on this system.", results["schema"]
+            )
             return None
 
         return plugin
 
-    def add(self, servers, asset=None, tag=None):
-        """
-        Adds one or more server URLs into our list.
+    def add(
+        self,
+        servers: Union[
+            str,
+            dict,
+            NotifyBase,
+            AppriseConfig,
+            ConfigBase,
+            list[Union[str, dict, NotifyBase, AppriseConfig, ConfigBase]],
+        ],
+        asset: Optional[AppriseAsset] = None,
+        tag: Optional[Union[str, list[str]]] = None,
+    ) -> bool:
+        """Adds one or more server URLs into our list.
 
         You can override the global asset if you wish by including it with the
         server(s) that you add.
@@ -264,27 +308,29 @@ def add(self, servers, asset=None, tag=None):
 
         elif not isinstance(servers, (tuple, set, list)):
             logger.error(
-                "An invalid notification (type={}) was specified.".format(
-                    type(servers)))
+                f"An invalid notification (type={type(servers)}) was"
+                " specified."
+            )
             return False
 
-        for _server in servers:
+        for server in servers:
 
-            if isinstance(_server, (ConfigBase, NotifyBase, AppriseConfig)):
+            if isinstance(server, (ConfigBase, NotifyBase, AppriseConfig)):
                 # Go ahead and just add our plugin into our list
-                self.servers.append(_server)
+                self.servers.append(server)
                 continue
 
-            elif not isinstance(_server, (str, dict)):
+            elif not isinstance(server, (str, dict)):
                 logger.error(
-                    "An invalid notification (type={}) was specified.".format(
-                        type(_server)))
+                    f"An invalid notification (type={type(server)}) was"
+                    " specified."
+                )
                 return_status = False
                 continue
 
             # Instantiate ourselves an object, this function throws or
             # returns None if it fails
-            instance = Apprise.instantiate(_server, asset=asset, tag=tag)
+            instance = Apprise.instantiate(server, asset=asset, tag=tag)
             if not isinstance(instance, NotifyBase):
                 # No logging is required as instantiate() handles failure
                 # and/or success reasons for us
@@ -297,18 +343,16 @@ def add(self, servers, asset=None, tag=None):
         # Return our status
         return return_status
 
-    def clear(self):
-        """
-        Empties our server list
-
-        """
+    def clear(self) -> None:
+        """Empties our server list."""
         self.servers[:] = []
 
-    def find(self, tag=common.MATCH_ALL_TAG, match_always=True):
-        """
-        Returns a list of all servers matching against the tag specified.
-
-        """
+    def find(
+        self,
+        tag: Any = common.MATCH_ALL_TAG,
+        match_always: bool = True,
+    ) -> Iterator[NotifyBase]:
+        """Returns a list of all servers matching against the tag specified."""
 
         # Build our tag setup
         #   - top level entries are treated as an 'or'
@@ -332,51 +376,66 @@ def find(self, tag=common.MATCH_ALL_TAG, match_always=True):
                 servers = entry.servers()
 
             else:
-                servers = [entry, ]
+                servers = [
+                    entry,
+                ]
 
             for server in servers:
                 # Apply our tag matching based on our defined logic
                 if is_exclusive_match(
-                        logic=tag, data=server.tags,
-                        match_all=common.MATCH_ALL_TAG,
-                        match_always=match_always):
+                    logic=tag,
+                    data=server.tags,
+                    match_all=common.MATCH_ALL_TAG,
+                    match_always=match_always,
+                ):
                     yield server
         return
 
-    def notify(self, body, title='', notify_type=common.NotifyType.INFO,
-               body_format=None, tag=common.MATCH_ALL_TAG, match_always=True,
-               attach=None, interpret_escapes=None):
-        """
-        Send a notification to all the plugins previously loaded.
-
-        If the body_format specified is NotifyFormat.MARKDOWN, it will
-        be converted to HTML if the Notification type expects this.
-
-        if the tag is specified (either a string or a set/list/tuple
-        of strings), then only the notifications flagged with that
-        tagged value are notified.  By default, all added services
-        are notified (tag=MATCH_ALL_TAG)
-
-        This function returns True if all notifications were successfully
-        sent, False if even just one of them fails, and None if no
-        notifications were sent at all as a result of tag filtering and/or
-        simply having empty configuration files that were read.
+    def notify(
+        self,
+        body: Union[str, bytes],
+        title: Union[str, bytes] = "",
+        notify_type: Union[str, common.NotifyType] = common.NotifyType.INFO,
+        body_format: Optional[str] = None,
+        tag: Any = common.MATCH_ALL_TAG,
+        match_always: bool = True,
+        attach: Any = None,
+        interpret_escapes: Optional[bool] = None,
+    ) -> Optional[bool]:
+        """Send a notification to all the plugins previously loaded.
+
+        If the body_format specified is NotifyFormat.MARKDOWN, it will be
+        converted to HTML if the Notification type expects this.
+
+        if the tag is specified (either a string or a set/list/tuple of
+        strings), then only the notifications flagged with that tagged value
+        are notified.  By default, all added services are notified
+        (tag=MATCH_ALL_TAG)
+
+        This function returns True if all notifications were successfully sent,
+        False if even just one of them fails, and None if no notifications were
+        sent at all as a result of tag filtering and/or simply having empty
+        configuration files that were read.
 
         Attach can contain a list of attachment URLs.  attach can also be
-        represented by an AttachBase() (or list of) object(s). This
-        identifies the products you wish to notify
+        represented by an AttachBase() (or list of) object(s). This identifies
+        the products you wish to notify
 
-        Set interpret_escapes to True if you want to pre-escape a string
-        such as turning a \n into an actual new line, etc.
+        Set interpret_escapes to True if you want to pre-escape a string such
+        as turning a \n into an actual new line, etc.
         """
 
         try:
             # Process arguments and build synchronous and asynchronous calls
             # (this step can throw internal errors).
             sequential_calls, parallel_calls = self._create_notify_calls(
-                body, title,
-                notify_type=notify_type, body_format=body_format,
-                tag=tag, match_always=match_always, attach=attach,
+                body,
+                title,
+                notify_type=notify_type,
+                body_format=body_format,
+                tag=tag,
+                match_always=match_always,
+                attach=attach,
                 interpret_escapes=interpret_escapes,
             )
 
@@ -392,19 +451,22 @@ def notify(self, body, title='', notify_type=common.NotifyType.INFO,
         parallel_result = Apprise._notify_parallel_threadpool(*parallel_calls)
         return sequential_result and parallel_result
 
-    async def async_notify(self, *args, **kwargs):
-        """
-        Send a notification to all the plugins previously loaded, for
+    async def async_notify(
+        self,
+        *args: Any,
+        **kwargs: Any
+    ) -> Optional[bool]:
+        """Send a notification to all the plugins previously loaded, for
         asynchronous callers.
 
         The arguments are identical to those of Apprise.notify().
-
         """
         try:
             # Process arguments and build synchronous and asynchronous calls
             # (this step can throw internal errors).
             sequential_calls, parallel_calls = self._create_notify_calls(
-                *args, **kwargs)
+                *args, **kwargs
+            )
 
         except TypeError:
             # No notifications sent, and there was an internal error.
@@ -415,13 +477,13 @@ async def async_notify(self, *args, **kwargs):
             return None
 
         sequential_result = Apprise._notify_sequential(*sequential_calls)
-        parallel_result = \
-            await Apprise._notify_parallel_asyncio(*parallel_calls)
+        parallel_result = await Apprise._notify_parallel_asyncio(
+            *parallel_calls
+        )
         return sequential_result and parallel_result
 
     def _create_notify_calls(self, *args, **kwargs):
-        """
-        Creates notifications for all the plugins loaded.
+        """Creates notifications for all the plugins loaded.
 
         Returns a list of (server, notify() kwargs) tuples for plugins with
         parallelism disabled and another list for plugins with parallelism
@@ -432,7 +494,7 @@ def _create_notify_calls(self, *args, **kwargs):
 
         # Split into sequential and parallel notify() calls.
         sequential, parallel = [], []
-        for (server, notify_kwargs) in all_calls:
+        for server, notify_kwargs in all_calls:
             if server.asset.async_mode:
                 parallel.append((server, notify_kwargs))
             else:
@@ -440,14 +502,18 @@ def _create_notify_calls(self, *args, **kwargs):
 
         return sequential, parallel
 
-    def _create_notify_gen(self, body, title='',
-                           notify_type=common.NotifyType.INFO,
-                           body_format=None, tag=common.MATCH_ALL_TAG,
-                           match_always=True, attach=None,
-                           interpret_escapes=None):
-        """
-        Internal generator function for _create_notify_calls().
-        """
+    def _create_notify_gen(
+        self,
+        body,
+        title="",
+        notify_type=common.NotifyType.INFO,
+        body_format=None,
+        tag=common.MATCH_ALL_TAG,
+        match_always=True,
+        attach=None,
+        interpret_escapes=None,
+    ):
+        """Internal generator function for _create_notify_calls()."""
 
         if len(self) == 0:
             # Nothing to notify
@@ -460,6 +526,18 @@ def _create_notify_gen(self, body, title='',
             logger.error(msg)
             raise TypeError(msg)
 
+        try:
+            notify_type = (
+                notify_type if isinstance(notify_type, common.NotifyType)
+                else common.NotifyType(notify_type.lower())
+            )
+
+        except (AttributeError, ValueError, TypeError):
+            err = (
+                f"An invalid notification type ({notify_type}) was "
+                "specified.")
+            raise TypeError(err) from None
+
         try:
             if title and isinstance(title, bytes):
                 title = title.decode(self.asset.encoding)
@@ -468,27 +546,34 @@ def _create_notify_gen(self, body, title='',
                 body = body.decode(self.asset.encoding)
 
         except UnicodeDecodeError:
-            msg = 'The content passed into Apprise was not of encoding ' \
-                  'type: {}'.format(self.asset.encoding)
+            msg = (
+                "The content passed into Apprise was not of encoding "
+                f"type: {self.asset.encoding}"
+            )
             logger.error(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         # Tracks conversions
-        conversion_body_map = dict()
-        conversion_title_map = dict()
+        conversion_body_map = {}
+        conversion_title_map = {}
 
         # Prepare attachments if required
         if attach is not None and not isinstance(attach, AppriseAttachment):
             attach = AppriseAttachment(
-                attach, asset=self.asset, location=self.location)
+                attach, asset=self.asset, location=self.location
+            )
 
         # Allow Asset default value
-        body_format = self.asset.body_format \
-            if body_format is None else body_format
+        body_format = (
+            self.asset.body_format if body_format is None else body_format
+        )
 
         # Allow Asset default value
-        interpret_escapes = self.asset.interpret_escapes \
-            if interpret_escapes is None else interpret_escapes
+        interpret_escapes = (
+            self.asset.interpret_escapes
+            if interpret_escapes is None
+            else interpret_escapes
+        )
 
         # Iterate over our loaded plugins
         for server in self.find(tag, match_always=match_always):
@@ -499,8 +584,11 @@ def _create_notify_gen(self, body, title='',
             # First we need to generate a key we will use to determine if we
             # need to build our data out.  Entries without are merged with
             # the body at this stage.
-            key = server.notify_format if server.title_maxlen > 0\
-                else f'_{server.notify_format}'
+            key = (
+                server.notify_format
+                if server.title_maxlen > 0
+                else f"_{server.notify_format}"
+            )
 
             if server.interpret_emojis:
                 # alter our key slightly to handle emojis since their value is
@@ -510,19 +598,21 @@ def _create_notify_gen(self, body, title='',
             if key not in conversion_title_map:
 
                 # Prepare our title
-                conversion_title_map[key] = '' if not title else title
+                conversion_title_map[key] = title if title else ""
 
                 # Conversion of title only occurs for services where the title
                 # is blended with the body (title_maxlen <= 0)
                 if conversion_title_map[key] and server.title_maxlen <= 0:
                     conversion_title_map[key] = convert_between(
-                        body_format, server.notify_format,
-                        content=conversion_title_map[key])
+                        body_format,
+                        server.notify_format,
+                        content=conversion_title_map[key],
+                    )
 
                 # Our body is always converted no matter what
-                conversion_body_map[key] = \
-                    convert_between(
-                        body_format, server.notify_format, content=body)
+                conversion_body_map[key] = convert_between(
+                    body_format, server.notify_format, content=body
+                )
 
                 if interpret_escapes:
                     #
@@ -532,50 +622,52 @@ def _create_notify_gen(self, body, title='',
                     try:
                         # Added overhead required due to Python 3 Encoding Bug
                         # identified here: https://bugs.python.org/issue21331
-                        conversion_body_map[key] = \
-                            conversion_body_map[key]\
-                            .encode('ascii', 'backslashreplace')\
-                            .decode('unicode-escape')
-
-                        conversion_title_map[key] = \
-                            conversion_title_map[key]\
-                            .encode('ascii', 'backslashreplace')\
-                            .decode('unicode-escape')
+                        conversion_body_map[key] = (
+                            conversion_body_map[key]
+                            .encode("ascii", "backslashreplace")
+                            .decode("unicode-escape")
+                        )
+
+                        conversion_title_map[key] = (
+                            conversion_title_map[key]
+                            .encode("ascii", "backslashreplace")
+                            .decode("unicode-escape")
+                        )
 
                     except AttributeError:
                         # Must be of string type
-                        msg = 'Failed to escape message body'
+                        msg = "Failed to escape message body"
                         logger.error(msg)
-                        raise TypeError(msg)
+                        raise TypeError(msg) from None
 
                 if server.interpret_emojis:
                     #
                     # Convert our :emoji: definitions
                     #
 
-                    conversion_body_map[key] = \
-                        apply_emojis(conversion_body_map[key])
-                    conversion_title_map[key] = \
-                        apply_emojis(conversion_title_map[key])
-
-            kwargs = dict(
-                body=conversion_body_map[key],
-                title=conversion_title_map[key],
-                notify_type=notify_type,
-                attach=attach,
-                body_format=body_format
-            )
+                    conversion_body_map[key] = apply_emojis(
+                        conversion_body_map[key]
+                    )
+                    conversion_title_map[key] = apply_emojis(
+                        conversion_title_map[key]
+                    )
+
+            kwargs = {
+                "body": conversion_body_map[key],
+                "title": conversion_title_map[key],
+                "notify_type": notify_type,
+                "attach": attach,
+                "body_format": body_format,
+            }
             yield (server, kwargs)
 
     @staticmethod
     def _notify_sequential(*servers_kwargs):
-        """
-        Process a list of notify() calls sequentially and synchronously.
-        """
+        """Process a list of notify() calls sequentially and synchronously."""
 
         success = True
 
-        for (server, kwargs) in servers_kwargs:
+        for server, kwargs in servers_kwargs:
             try:
                 # Send notification
                 result = server.notify(**kwargs)
@@ -595,9 +687,7 @@ def _notify_sequential(*servers_kwargs):
 
     @staticmethod
     def _notify_parallel_threadpool(*servers_kwargs):
-        """
-        Process a list of notify() calls in parallel and synchronously.
-        """
+        """Process a list of notify() calls in parallel and synchronously."""
 
         n_calls = len(servers_kwargs)
 
@@ -611,12 +701,15 @@ def _notify_parallel_threadpool(*servers_kwargs):
 
         # Create log entry
         logger.info(
-            'Notifying %d service(s) with threads.', len(servers_kwargs))
+            "Notifying %d service(s) with threads.", len(servers_kwargs)
+        )
 
         with cf.ThreadPoolExecutor() as executor:
             success = True
-            futures = [executor.submit(server.notify, **kwargs)
-                       for (server, kwargs) in servers_kwargs]
+            futures = [
+                executor.submit(server.notify, **kwargs)
+                for (server, kwargs) in servers_kwargs
+            ]
 
             for future in cf.as_completed(futures):
                 try:
@@ -637,9 +730,8 @@ def _notify_parallel_threadpool(*servers_kwargs):
 
     @staticmethod
     async def _notify_parallel_asyncio(*servers_kwargs):
-        """
-        Process a list of async_notify() calls in parallel and asynchronously.
-        """
+        """Process a list of async_notify() calls in parallel and
+        asynchronously."""
 
         n_calls = len(servers_kwargs)
 
@@ -653,7 +745,8 @@ async def _notify_parallel_asyncio(*servers_kwargs):
 
         # Create log entry
         logger.info(
-            'Notifying %d service(s) asynchronously.', len(servers_kwargs))
+            "Notifying %d service(s) asynchronously.", len(servers_kwargs)
+        )
 
         async def do_call(server, kwargs):
             return await server.async_notify(**kwargs)
@@ -661,8 +754,10 @@ async def do_call(server, kwargs):
         cors = (do_call(server, kwargs) for (server, kwargs) in servers_kwargs)
         results = await asyncio.gather(*cors, return_exceptions=True)
 
-        if any(isinstance(status, Exception)
-               and not isinstance(status, TypeError) for status in results):
+        if any(
+            isinstance(status, Exception) and not isinstance(status, TypeError)
+            for status in results
+        ):
             # A catch all so we don't have to abort early just because
             # one of our plugins has a bug in it.
             logger.exception("Unhandled Notification Exception")
@@ -674,20 +769,22 @@ async def do_call(server, kwargs):
 
         return all(results)
 
-    def details(self, lang=None, show_requirements=False, show_disabled=False):
-        """
-        Returns the details associated with the Apprise object
-
-        """
+    def details(
+        self,
+        lang: Optional[str] = None,
+        show_requirements: bool = False,
+        show_disabled: bool = False,
+    ) -> dict[str, Any]:
+        """Returns the details associated with the Apprise object."""
 
         # general object returned
         response = {
             # Defines the current version of Apprise
-            'version': __version__,
+            "version": __version__,
             # Lists all of the currently supported Notifications
-            'schemas': [],
+            "schemas": [],
             # Includes the configured asset details
-            'asset': self.asset.details(),
+            "asset": self.asset.details(),
         }
 
         for plugin in N_MGR.plugins():
@@ -695,79 +792,83 @@ def details(self, lang=None, show_requirements=False, show_disabled=False):
             # their status:
 
             content = {
-                'service_name': getattr(plugin, 'service_name', None),
-                'service_url': getattr(plugin, 'service_url', None),
-                'setup_url': getattr(plugin, 'setup_url', None),
+                "service_name": getattr(plugin, "service_name", None),
+                "service_url": getattr(plugin, "service_url", None),
+                "setup_url": getattr(plugin, "setup_url", None),
                 # Placeholder - populated below
-                'details': None,
-
+                "details": None,
                 # Let upstream service know of the plugins that support
                 # attachments
-                'attachment_support': getattr(
-                    plugin, 'attachment_support', False),
-
+                "attachment_support": getattr(
+                    plugin, "attachment_support", False
+                ),
                 # Differentiat between what is a custom loaded plugin and
                 # which is native.
-                'category': getattr(plugin, 'category', None)
+                "category": getattr(plugin, "category", None),
             }
 
             # Standard protocol(s) should be None or a tuple
-            enabled = getattr(plugin, 'enabled', True)
+            enabled = getattr(plugin, "enabled", True)
             if not show_disabled and not enabled:
                 # Do not show inactive plugins
                 continue
 
             elif show_disabled:
                 # Add current state to response
-                content['enabled'] = enabled
+                content["enabled"] = enabled
 
             # Standard protocol(s) should be None or a tuple
-            protocols = getattr(plugin, 'protocol', None)
+            protocols = getattr(plugin, "protocol", None)
             if isinstance(protocols, str):
-                protocols = (protocols, )
+                protocols = (protocols,)
 
             # Secure protocol(s) should be None or a tuple
-            secure_protocols = getattr(plugin, 'secure_protocol', None)
+            secure_protocols = getattr(plugin, "secure_protocol", None)
             if isinstance(secure_protocols, str):
-                secure_protocols = (secure_protocols, )
+                secure_protocols = (secure_protocols,)
 
             # Add our protocol details to our content
             content.update({
-                'protocols': protocols,
-                'secure_protocols': secure_protocols,
+                "protocols": protocols,
+                "secure_protocols": secure_protocols,
             })
 
             if not lang:
                 # Simply return our results
-                content['details'] = plugins.details(plugin)
+                content["details"] = plugins.details(plugin)
                 if show_requirements:
-                    content['requirements'] = plugins.requirements(plugin)
+                    content["requirements"] = plugins.requirements(plugin)
 
             else:
                 # Emulate the specified language when returning our results
                 with self.locale.lang_at(lang):
-                    content['details'] = plugins.details(plugin)
+                    content["details"] = plugins.details(plugin)
                     if show_requirements:
-                        content['requirements'] = plugins.requirements(plugin)
+                        content["requirements"] = plugins.requirements(plugin)
 
             # Build our response object
-            response['schemas'].append(content)
+            response["schemas"].append(content)
 
         return response
 
-    def urls(self, privacy=False):
-        """
-        Returns all of the loaded URLs defined in this apprise object.
-        """
-        return [x.url(privacy=privacy) for x in self.servers]
+    def urls(self, privacy: bool = False) -> list[str]:
+        """Returns all of the loaded URLs defined in this apprise object."""
+        urls = []
+        for s in self.servers:
+            if isinstance(s, (ConfigBase, AppriseConfig)):
+                for s_ in s.servers():
+                    urls.append(s_.url(privacy=privacy))
+            else:
+                urls.append(s.url(privacy=privacy))
+        return urls
 
-    def pop(self, index):
-        """
-        Removes an indexed Notification Service from the stack and returns it.
+    def pop(self, index: int) -> NotifyBase:
+        """Removes an indexed Notification Service from the stack and returns
+        it.
 
         The thing is we can never pop AppriseConfig() entries, only what was
-        loaded within them. So pop needs to carefully iterate over our list
-        and only track actual entries.
+        loaded within them. So pop needs to carefully iterate over our list and
+        only track actual entries.
         """
 
         # Tracking variables
@@ -783,11 +884,17 @@ def pop(self, index):
 
                     if offset >= index:
                         # we can pop an element from our config stack
-                        fn = s.pop if isinstance(s, ConfigBase) \
+                        fn = (
+                            s.pop
+                            if isinstance(s, ConfigBase)
                             else s.server_pop
+                        )
 
-                        return fn(index if prev_offset == -1
-                                  else (index - prev_offset - 1))
+                        return fn(
+                            index
+                            if prev_offset == -1
+                            else (index - prev_offset - 1)
+                        )
 
             else:
                 offset = prev_offset + 1
@@ -798,12 +905,10 @@ def pop(self, index):
             prev_offset = offset
 
         # If we reach here, then we indexed out of range
-        raise IndexError('list index out of range')
+        raise IndexError("list index out of range")
 
-    def __getitem__(self, index):
-        """
-        Returns the indexed server entry of a loaded notification server
-        """
+    def __getitem__(self, index: int) -> NotifyBase:
+        """Returns the indexed server entry of a loaded notification server."""
         # Tracking variables
         prev_offset = -1
         offset = prev_offset
@@ -817,8 +922,11 @@ def __getitem__(self, index):
                     offset = prev_offset + len(servers)
 
                     if offset >= index:
-                        return servers[index if prev_offset == -1
-                                       else (index - prev_offset - 1)]
+                        return servers[(
+                            index
+                            if prev_offset == -1
+                            else (index - prev_offset - 1)
+                        )]
 
             else:
                 offset = prev_offset + 1
@@ -829,58 +937,77 @@ def __getitem__(self, index):
             prev_offset = offset
 
         # If we reach here, then we indexed out of range
-        raise IndexError('list index out of range')
+        raise IndexError("list index out of range")
 
-    def __getstate__(self):
-        """
-        Pickle Support dumps()
-        """
+    def __getstate__(self) -> dict[str, object]:
+        """Pickle Support dumps()"""
         attributes = {
-            'asset': self.asset,
+            "asset": self.asset,
             # Prepare our URL list as we need to extract the associated tags
             # and asset details associated with it
-            'urls': [{
-                'url': server.url(privacy=False),
-                'tag': server.tags if server.tags else None,
-                'asset': server.asset} for server in self.servers],
-            'locale': self.locale,
-            'debug': self.debug,
-            'location': self.location,
+            "urls": [
+                {
+                    "url": server.url(privacy=False),
+                    "tag": server.tags if server.tags else None,
+                    "asset": server.asset,
+                }
+                for server in self.servers
+            ],
+            "locale": self.locale,
+            "debug": self.debug,
+            "location": self.location.value if self.location else None,
         }
 
         return attributes
 
-    def __setstate__(self, state):
-        """
-        Pickle Support loads()
-        """
-        self.servers = list()
-        self.asset = state['asset']
-        self.locale = state['locale']
-        self.location = state['location']
-        for entry in state['urls']:
-            self.add(entry['url'], asset=entry['asset'], tag=entry['tag'])
-
-    def __bool__(self):
-        """
-        Allows the Apprise object to be wrapped in an 'if statement'.
+    def __setstate__(self, state: dict[str, object]) -> None:
+        """Pickle Support loads()"""
+        self.servers = []
+        self.asset = state["asset"]
+        self.locale = state["locale"]
+
+        location = state.get("location")
+        self.location = (
+            location if isinstance(location, ContentLocation)
+            else ContentLocation(location)
+            if location is not None
+            else None
+        )
+
+        for entry in state["urls"]:
+            self.add(entry["url"], asset=entry["asset"], tag=entry["tag"])
+
+    def __bool__(self) -> bool:
+        """Allows the Apprise object to be wrapped in an 'if statement'.
+
         True is returned if at least one service has been loaded.
         """
         return len(self) > 0
 
-    def __iter__(self):
-        """
-        Returns an iterator to each of our servers loaded. This includes those
-        found inside configuration.
-        """
-        return chain(*[[s] if not isinstance(s, (ConfigBase, AppriseConfig))
-                       else iter(s.servers()) for s in self.servers])
+    def __iter__(self) -> Iterator[NotifyBase]:
+        """Returns an iterator to each of our servers loaded.
 
-    def __len__(self):
+        This includes those found inside configuration.
         """
-        Returns the number of servers loaded; this includes those found within
-        loaded configuration. This funtion nnever actually counts the
-        Config entry themselves (if they exist), only what they contain.
+        return chain(*[
+            (
+                [s]
+                if not isinstance(s, (ConfigBase, AppriseConfig))
+                else iter(s.servers())
+            )
+            for s in self.servers
+        ])
+
+    def __len__(self) -> int:
+        """Returns the number of servers loaded; this includes those found
+        within loaded configuration.
+
+        This funtion nnever actually counts the Config entry themselves (if
+        they exist), only what they contain.
         """
-        return sum([1 if not isinstance(s, (ConfigBase, AppriseConfig))
-                    else len(s.servers()) for s in self.servers])
+        return sum((
+                1
+                if not isinstance(s, (ConfigBase, AppriseConfig))
+                else len(s.servers())
+            )
+            for s in self.servers)
diff --git a/libs/apprise/apprise.pyi b/libs/apprise/apprise.pyi
deleted file mode 100644
index 5a34c9c654..0000000000
--- a/libs/apprise/apprise.pyi
+++ /dev/null
@@ -1,62 +0,0 @@
-from typing import Any, Dict, List, Iterable, Iterator, Optional
-
-from . import (AppriseAsset, AppriseAttachment, AppriseConfig, ConfigBase,
-               NotifyBase, NotifyFormat, NotifyType)
-from .common import ContentLocation
-
-_Server = Union[str, ConfigBase, NotifyBase, AppriseConfig]
-_Servers = Union[_Server, Dict[Any, _Server], Iterable[_Server]]
-# Can't define this recursively as mypy doesn't support recursive types:
-# https://github.com/python/mypy/issues/731
-_Tag = Union[str, Iterable[Union[str, Iterable[str]]]]
-
-class Apprise:
-    def __init__(
-        self,
-        servers: _Servers = ...,
-        asset: Optional[AppriseAsset] = ...,
-        location: Optional[ContentLocation] = ...,
-        debug: bool = ...
-    ) -> None: ...
-    @staticmethod
-    def instantiate(
-        url: Union[str, Dict[str, NotifyBase]],
-        asset: Optional[AppriseAsset] = ...,
-        tag: Optional[_Tag] = ...,
-        suppress_exceptions: bool = ...
-    ) -> NotifyBase: ...
-    def add(
-        self,
-        servers: _Servers = ...,
-        asset: Optional[AppriseAsset] = ...,
-        tag: Optional[_Tag] = ...
-    ) -> bool: ...
-    def clear(self) -> None: ...
-    def find(self, tag: str = ...) -> Iterator[Apprise]: ...
-    def notify(
-        self,
-        body: str,
-        title: str = ...,
-        notify_type: NotifyType = ...,
-        body_format: NotifyFormat = ...,
-        tag: _Tag = ...,
-        attach: Optional[AppriseAttachment] = ...,
-        interpret_escapes: Optional[bool] = ...
-    ) -> bool: ...
-    async def async_notify(
-        self,
-        body: str,
-        title: str = ...,
-        notify_type: NotifyType = ...,
-        body_format: NotifyFormat = ...,
-        tag: _Tag = ...,
-        attach: Optional[AppriseAttachment] = ...,
-        interpret_escapes: Optional[bool] = ...
-    ) -> bool: ...
-    def details(self, lang: Optional[str] = ...) -> Dict[str, Any]: ...
-    def urls(self, privacy: bool = ...) -> Iterable[str]: ...
-    def pop(self, index: int) -> ConfigBase: ...
-    def __getitem__(self, index: int) -> ConfigBase: ...
-    def __bool__(self) -> bool: ...
-    def __iter__(self) -> Iterator[ConfigBase]: ...
-    def __len__(self) -> int: ...
\ No newline at end of file
diff --git a/libs/apprise/apprise_attachment.py b/libs/apprise/apprise_attachment.py
index 855b42d440..64c58a2ce2 100644
--- a/libs/apprise/apprise_attachment.py
+++ b/libs/apprise/apprise_attachment.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,13 +25,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from . import URLBase
-from .attachment.base import AttachBase
+from collections.abc import Iterator
+from typing import Any, Optional, Union
+
 from .asset import AppriseAsset
-from .manager_attachment import AttachmentManager
-from .logger import logger
+from .attachment.base import AttachBase
 from .common import ContentLocation
-from .common import CONTENT_LOCATIONS
+from .logger import logger
+from .manager_attachment import AttachmentManager
+from .url import URLBase
 from .utils.parse import GET_SCHEMA_RE
 
 # Grant access to our Notification Manager Singleton
@@ -40,15 +41,18 @@
 
 
 class AppriseAttachment:
-    """
-    Our Apprise Attachment File Manager
-
-    """
-
-    def __init__(self, paths=None, asset=None, cache=True, location=None,
-                 **kwargs):
-        """
-        Loads all of the paths/urls specified (if any).
+    """Our Apprise Attachment File Manager."""
+
+    def __init__(
+        self,
+        paths: Optional[Union[str, list[
+            Union[str, AttachBase, "AppriseAttachment"]]]] = None,
+        asset: Optional[AppriseAsset] = None,
+        cache: Union[bool, int] = True,
+        location: Optional[Union[str, ContentLocation]] = None,
+        **kwargs: Any,
+    ) -> None:
+        """Loads all of the paths/urls specified (if any).
 
         The path can either be a single string identifying one explicit
         location, otherwise you can pass in a series of locations to scan
@@ -78,45 +82,60 @@ def __init__(self, paths=None, asset=None, cache=True, location=None,
           - LOCAL:        The least restrictive mode as local files can be
                           referenced in addition to hosted.
 
-        In all both HOSTED and LOCAL modes, INACCESSIBLE attachment types will
+        In all but HOSTED and LOCAL modes, INACCESSIBLE attachment types will
         continue to be inaccessible.  However if you set this field (location)
         to None (it's default value) the attachment location category will not
         be tested in any way (all attachment types will be allowed).
 
         The location field is also a global option that can be set when
         initializing the Apprise object.
-
         """
 
         # Initialize our attachment listings
-        self.attachments = list()
+        self.attachments = []
 
         # Set our cache flag
         self.cache = cache
 
         # Prepare our Asset Object
-        self.asset = \
+        self.asset = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
-        if location is not None and location not in CONTENT_LOCATIONS:
-            msg = "An invalid Attachment location ({}) was specified." \
-                  .format(location)
-            logger.warning(msg)
-            raise TypeError(msg)
-
-        # Store our location
-        self.location = location
+        if location:
+            try:
+                self.location = (
+                    location if isinstance(location, ContentLocation)
+                    else ContentLocation(location.lower())
+                )
+
+            except (AttributeError, ValueError):
+                err = (
+                    f"An invalid Attachment location ({location}) was "
+                    "specified.",
+                )
+                logger.warning(err)
+                raise TypeError(err) from None
+        else:
+            # do not set location if no initialization was made for it
+            self.location = None
 
         # Now parse any paths specified
-        if paths is not None:
-            # Store our path(s)
-            if not self.add(paths):
-                # Parse Source domain based on from_addr
-                raise TypeError("One or more attachments could not be added.")
-
-    def add(self, attachments, asset=None, cache=None):
-        """
-        Adds one or more attachments into our list.
+        if paths is not None and not self.add(paths):
+            raise TypeError("One or more attachments could not be added.")
+
+    def add(
+        self,
+        attachments: Union[
+            str,
+            AttachBase,
+            "AppriseAttachment",
+            list[Union[str, AttachBase, "AppriseAttachment"]],
+        ],
+        asset: Optional[AppriseAsset] = None,
+        cache: Optional[Union[bool, int]] = None,
+    ) -> bool:
+        """Adds one or more attachments into our list.
 
         By default we cache our responses so that subsiquent calls does not
         cause the content to be retrieved again.  For local file references
@@ -144,60 +163,66 @@ def add(self, attachments, asset=None, cache=None):
 
         if isinstance(attachments, (AttachBase, str)):
             # store our instance
-            attachments = (attachments, )
+            attachments = (attachments,)
 
         elif not isinstance(attachments, (tuple, set, list)):
             logger.error(
-                'An invalid attachment url (type={}) was '
-                'specified.'.format(type(attachments)))
+                f"An invalid attachment url (type={type(attachments)}) was "
+                "specified."
+            )
             return False
 
         # Iterate over our attachments
-        for _attachment in attachments:
+        for attachment in attachments:
             if self.location == ContentLocation.INACCESSIBLE:
                 logger.warning(
-                    "Attachments are disabled; ignoring {}"
-                    .format(_attachment))
+                    f"Attachments are disabled; ignoring {attachment}"
+                )
                 return_status = False
                 continue
 
-            if isinstance(_attachment, str):
-                logger.debug("Loading attachment: {}".format(_attachment))
+            if isinstance(attachment, str):
+                logger.debug(f"Loading attachment: {attachment}")
                 # Instantiate ourselves an object, this function throws or
                 # returns None if it fails
                 instance = AppriseAttachment.instantiate(
-                    _attachment, asset=asset, cache=cache)
+                    attachment, asset=asset, cache=cache
+                )
                 if not isinstance(instance, AttachBase):
                     return_status = False
                     continue
 
-            elif isinstance(_attachment, AppriseAttachment):
+            elif isinstance(attachment, AppriseAttachment):
                 # We were provided a list of Apprise Attachments
                 # append our content together
-                instance = _attachment.attachments
+                instance = attachment.attachments
 
-            elif not isinstance(_attachment, AttachBase):
+            elif not isinstance(attachment, AttachBase):
                 logger.warning(
-                    "An invalid attachment (type={}) was specified.".format(
-                        type(_attachment)))
+                    f"An invalid attachment (type={type(attachment)}) was"
+                    " specified."
+                )
                 return_status = False
                 continue
 
             else:
                 # our entry is of type AttachBase, so just go ahead and point
                 # our instance to it for some post processing below
-                instance = _attachment
+                instance = attachment
 
             # Apply some simple logic if our location flag is set
-            if self.location and ((
+            if self.location and (
+                (
                     self.location == ContentLocation.HOSTED
-                    and instance.location != ContentLocation.HOSTED)
-                    or instance.location == ContentLocation.INACCESSIBLE):
+                    and instance.location != ContentLocation.HOSTED
+                )
+                or instance.location == ContentLocation.INACCESSIBLE
+            ):
                 logger.warning(
-                    "Attachment was disallowed due to accessibility "
-                    "restrictions ({}->{}): {}".format(
-                        self.location, instance.location,
-                        instance.url(privacy=True)))
+                    "Attachment was disallowed due to accessibility"
+                    f" restrictions ({self.location}->{instance.location}):"
+                    f" {instance.url(privacy=True)}"
+                )
                 return_status = False
                 continue
 
@@ -212,30 +237,33 @@ def add(self, attachments, asset=None, cache=None):
         return return_status
 
     @staticmethod
-    def instantiate(url, asset=None, cache=None, suppress_exceptions=True):
-        """
-        Returns the instance of a instantiated attachment plugin based on
+    def instantiate(
+        url: str,
+        asset: Optional[AppriseAsset] = None,
+        cache: Optional[Union[bool, int]] = None,
+        suppress_exceptions: bool = True,
+    ) -> Optional[AttachBase]:
+        """Returns the instance of a instantiated attachment plugin based on
         the provided Attachment URL.  If the url fails to be parsed, then None
         is returned.
 
         A specified cache value will over-ride anything set
-
         """
         # Attempt to acquire the schema at the very least to allow our
         # attachment based urls.
         schema = GET_SCHEMA_RE.match(url)
         if schema is None:
             # Plan B is to assume we're dealing with a file
-            schema = 'file'
-            url = '{}://{}'.format(schema, URLBase.quote(url))
+            schema = "file"
+            url = f"{schema}://{URLBase.quote(url)}"
 
         else:
             # Ensure our schema is always in lower case
-            schema = schema.group('schema').lower()
+            schema = schema.group("schema").lower()
 
             # Some basic validation
             if schema not in A_MGR:
-                logger.warning('Unsupported schema {}.'.format(schema))
+                logger.warning(f"Unsupported schema {schema}.")
                 return None
 
         # Parse our url details of the server object as dictionary containing
@@ -244,78 +272,83 @@ def instantiate(url, asset=None, cache=None, suppress_exceptions=True):
 
         if not results:
             # Failed to parse the server URL
-            logger.warning('Unparseable URL {}.'.format(url))
+            logger.warning(f"Unparseable URL {url}.")
             return None
 
         # Prepare our Asset Object
-        results['asset'] = \
+        results["asset"] = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         if cache is not None:
             # Force an over-ride of the cache value to what we have specified
-            results['cache'] = cache
+            results["cache"] = cache
 
         if suppress_exceptions:
             try:
                 # Attempt to create an instance of our plugin using the parsed
                 # URL information
-                attach_plugin = A_MGR[results['schema']](**results)
+                attach_plugin = A_MGR[results["schema"]](**results)
 
             except Exception:
                 # the arguments are invalid or can not be used.
-                logger.warning('Could not load URL: %s' % url)
+                logger.warning(f"Could not load URL: {url}")
                 return None
 
         else:
             # Attempt to create an instance of our plugin using the parsed
             # URL information but don't wrap it in a try catch
-            attach_plugin = A_MGR[results['schema']](**results)
+            attach_plugin = A_MGR[results["schema"]](**results)
 
         return attach_plugin
 
-    def clear(self):
-        """
-        Empties our attachment list
-
-        """
+    def sync(
+        self,
+        abort_on_error: bool = True,
+        abort_if_empty: bool = True,
+    ) -> bool:
+        """Itereates over all of the attachments and retrieves them."""
+        return (
+            False
+            if abort_if_empty and not self.attachments
+            else (
+                next((False for a in self.attachments if not a), True)
+                if abort_on_error
+                else next((True for a in self.attachments), True)
+            )
+        )
+
+    def clear(self) -> None:
+        """Empties our attachment list."""
         self.attachments[:] = []
 
-    def size(self):
-        """
-        Returns the total size of accumulated attachments
-        """
-        return sum([len(a) for a in self.attachments if len(a) > 0])
+    def size(self) -> int:
+        """Returns the total size of accumulated attachments."""
+        return sum(len(a) for a in self.attachments if len(a) > 0)
 
-    def pop(self, index=-1):
-        """
-        Removes an indexed Apprise Attachment from the stack and returns it.
+    def pop(self, index: int = -1) -> AttachBase:
+        """Removes an indexed Apprise Attachment from the stack and returns it.
 
         by default the last element is poped from the list
         """
         # Remove our entry
         return self.attachments.pop(index)
 
-    def __getitem__(self, index):
-        """
-        Returns the indexed entry of a loaded apprise attachments
-        """
+    def __getitem__(self, index: int) -> AttachBase:
+        """Returns the indexed entry of a loaded apprise attachments."""
         return self.attachments[index]
 
-    def __bool__(self):
-        """
-        Allows the Apprise object to be wrapped in an 'if statement'.
+    def __bool__(self) -> bool:
+        """Allows the Apprise object to be wrapped in an 'if statement'.
+
         True is returned if at least one service has been loaded.
         """
-        return True if self.attachments else False
+        return bool(self.attachments)
 
-    def __iter__(self):
-        """
-        Returns an iterator to our attachment list
-        """
+    def __iter__(self) -> Iterator[AttachBase]:
+        """Returns an iterator to our attachment list."""
         return iter(self.attachments)
 
-    def __len__(self):
-        """
-        Returns the number of attachment entries loaded
-        """
+    def __len__(self) -> int:
+        """Returns the number of attachment entries loaded."""
         return len(self.attachments)
diff --git a/libs/apprise/apprise_attachment.pyi b/libs/apprise/apprise_attachment.pyi
deleted file mode 100644
index a28acb1445..0000000000
--- a/libs/apprise/apprise_attachment.pyi
+++ /dev/null
@@ -1,37 +0,0 @@
-from typing import Any, Iterable, Optional, Union
-
-from . import AppriseAsset, ContentLocation
-from .attachment import AttachBase
-
-_Attachment = Union[str, AttachBase]
-_Attachments = Iterable[_Attachment]
-
-class AppriseAttachment:
-    def __init__(
-        self,
-        paths: Optional[_Attachments] = ...,
-        asset: Optional[AppriseAttachment] = ...,
-        cache: bool = ...,
-        location: Optional[ContentLocation] = ...,
-        **kwargs: Any
-    ) -> None: ...
-    def add(
-        self,
-        attachments: _Attachments,
-        asset: Optional[AppriseAttachment] = ...,
-        cache: Optional[bool] = ...
-    ) -> bool: ...
-    @staticmethod
-    def instantiate(
-        url: str,
-        asset: Optional[AppriseAsset] = ...,
-        cache: Optional[bool] = ...,
-        suppress_exceptions: bool = ...
-    ) -> NotifyBase: ...
-    def clear(self) -> None: ...
-    def size(self) -> int: ...
-    def pop(self, index: int = ...) -> AttachBase: ...
-    def __getitem__(self, index: int) -> AttachBase: ...
-    def __bool__(self) -> bool: ...
-    def __iter__(self) -> Iterator[AttachBase]: ...
-    def __len__(self) -> int: ...
\ No newline at end of file
diff --git a/libs/apprise/apprise_config.py b/libs/apprise/apprise_config.py
index 5262b5be49..58551db7bc 100644
--- a/libs/apprise/apprise_config.py
+++ b/libs/apprise/apprise_config.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,33 +25,43 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from . import ConfigBase
-from . import CONFIG_FORMATS
-from .manager_config import ConfigurationManager
-from . import URLBase
-from .asset import AppriseAsset
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
 from . import common
-from .utils.parse import GET_SCHEMA_RE, parse_list
-from .utils.logic import is_exclusive_match
+from .asset import AppriseAsset
+from .config.base import ConfigBase
 from .logger import logger
+from .manager_config import ConfigurationManager
+from .url import URLBase
+from .utils.logic import is_exclusive_match
+from .utils.parse import GET_SCHEMA_RE, parse_list
+
+if TYPE_CHECKING:
+    from .plugins.base import NotifyBase
 
 # Grant access to our Configuration Manager Singleton
 C_MGR = ConfigurationManager()
 
 
 class AppriseConfig:
-    """
-    Our Apprise Configuration File Manager
-
-        - Supports a list of URLs defined one after another (text format)
-        - Supports a destinct YAML configuration format
+    """Our Apprise Configuration File Manager.
 
+    - Supports a list of URLs defined one after another (text format)
+    - Supports a destinct YAML configuration format
     """
 
-    def __init__(self, paths=None, asset=None, cache=True, recursion=0,
-                 insecure_includes=False, **kwargs):
-        """
-        Loads all of the paths specified (if any).
+    def __init__(
+        self,
+        paths: str | list[str] | None = None,
+        asset: AppriseAsset | None = None,
+        cache: bool | int = True,
+        recursion: int = 0,
+        insecure_includes: bool = False,
+        **kwargs: Any,
+    ) -> None:
+        """Loads all of the paths specified (if any).
 
         The path can either be a single string identifying one explicit
         location, otherwise you can pass in a series of locations to scan
@@ -99,11 +108,12 @@ def __init__(self, paths=None, asset=None, cache=True, recursion=0,
         """
 
         # Initialize a server list of URLs
-        self.configs = list()
+        self.configs = []
 
         # Prepare our Asset Object
-        self.asset = \
+        self.asset = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         # Set our cache flag
         self.cache = cache
@@ -120,10 +130,16 @@ def __init__(self, paths=None, asset=None, cache=True, recursion=0,
 
         return
 
-    def add(self, configs, asset=None, tag=None, cache=True, recursion=None,
-            insecure_includes=None):
-        """
-        Adds one or more config URLs into our list.
+    def add(
+        self,
+        configs: str | ConfigBase | list[str | ConfigBase],
+        asset: AppriseAsset | None = None,
+        tag: str | list[str] | None = None,
+        cache: bool | int = True,
+        recursion: int | None = None,
+        insecure_includes: bool | None = None,
+    ) -> bool:
+        """Adds one or more config URLs into our list.
 
         You can override the global asset if you wish by including it with the
         config(s) that you add.
@@ -144,9 +160,9 @@ def add(self, configs, asset=None, tag=None, cache=True, recursion=None,
 
         Optionally override the default recursion value.
 
-        Optionally override the insecure_includes flag.
-        if insecure_includes is set to True then all plugins that are
-        set to a STRICT mode will be a treated as ALWAYS.
+        Optionally override the insecure_includes flag. if insecure_includes is
+        set to True then all plugins that are set to a STRICT mode will be a
+        treated as ALWAYS.
         """
 
         # Initialize our return status
@@ -159,9 +175,11 @@ def add(self, configs, asset=None, tag=None, cache=True, recursion=None,
         recursion = recursion if recursion is not None else self.recursion
 
         # Initialize our default insecure_includes value
-        insecure_includes = \
-            insecure_includes if insecure_includes is not None \
+        insecure_includes = (
+            insecure_includes
+            if insecure_includes is not None
             else self.insecure_includes
+        )
 
         if asset is None:
             # prepare default asset
@@ -174,36 +192,43 @@ def add(self, configs, asset=None, tag=None, cache=True, recursion=None,
 
         elif isinstance(configs, str):
             # Save our path
-            configs = (configs, )
+            configs = (configs,)
 
         elif not isinstance(configs, (tuple, set, list)):
             logger.error(
-                'An invalid configuration path (type={}) was '
-                'specified.'.format(type(configs)))
+                f"An invalid configuration path (type={type(configs)}) was "
+                "specified."
+            )
             return False
 
         # Iterate over our configuration
-        for _config in configs:
+        for config in configs:
 
-            if isinstance(_config, ConfigBase):
+            if isinstance(config, ConfigBase):
                 # Go ahead and just add our configuration into our list
-                self.configs.append(_config)
+                self.configs.append(config)
                 continue
 
-            elif not isinstance(_config, str):
+            elif not isinstance(config, str):
                 logger.warning(
-                    "An invalid configuration (type={}) was specified.".format(
-                        type(_config)))
+                    f"An invalid configuration (type={type(config)}) was"
+                    " specified."
+                )
                 return_status = False
                 continue
 
-            logger.debug("Loading configuration: {}".format(_config))
+            logger.debug(f"Loading configuration: {config}")
 
             # Instantiate ourselves an object, this function throws or
             # returns None if it fails
             instance = AppriseConfig.instantiate(
-                _config, asset=asset, tag=tag, cache=cache,
-                recursion=recursion, insecure_includes=insecure_includes)
+                config,
+                asset=asset,
+                tag=tag,
+                cache=cache,
+                recursion=recursion,
+                insecure_includes=insecure_includes,
+            )
             if not isinstance(instance, ConfigBase):
                 return_status = False
                 continue
@@ -214,31 +239,39 @@ def add(self, configs, asset=None, tag=None, cache=True, recursion=None,
         # Return our status
         return return_status
 
-    def add_config(self, content, asset=None, tag=None, format=None,
-                   recursion=None, insecure_includes=None):
-        """
-        Adds one configuration file in it's raw format. Content gets loaded as
-        a memory based object and only exists for the life of this
+    def add_config(
+        self,
+        content: str,
+        asset: AppriseAsset | None = None,
+        tag: str | list[str] | None = None,
+        format: str | None = None,
+        recursion: int | None = None,
+        insecure_includes: bool | None = None,
+    ) -> bool:
+        """Adds one configuration file in it's raw format. Content gets loaded
+        as a memory based object and only exists for the life of this
         AppriseConfig object it was loaded into.
 
-        If you know the format ('yaml' or 'text') you can specify
-        it for slightly less overhead during this call.  Otherwise the
-        configuration is auto-detected.
+        If you know the format ('yaml' or 'text') you can specify it for
+        slightly less overhead during this call.  Otherwise the configuration
+        is auto-detected.
 
         Optionally override the default recursion value.
 
-        Optionally override the insecure_includes flag.
-        if insecure_includes is set to True then all plugins that are
-        set to a STRICT mode will be a treated as ALWAYS.
+        Optionally override the insecure_includes flag. if insecure_includes is
+        set to True then all plugins that are set to a STRICT mode will be a
+        treated as ALWAYS.
         """
 
         # Initialize our default recursion value
         recursion = recursion if recursion is not None else self.recursion
 
         # Initialize our default insecure_includes value
-        insecure_includes = \
-            insecure_includes if insecure_includes is not None \
+        insecure_includes = (
+            insecure_includes
+            if insecure_includes is not None
             else self.insecure_includes
+        )
 
         if asset is None:
             # prepare default asset
@@ -246,20 +279,28 @@ def add_config(self, content, asset=None, tag=None, format=None,
 
         if not isinstance(content, str):
             logger.warning(
-                "An invalid configuration (type={}) was specified.".format(
-                    type(content)))
+                f"An invalid configuration (type={type(content)}) was"
+                " specified."
+            )
             return False
 
-        logger.debug("Loading raw configuration: {}".format(content))
+        logger.debug(f"Loading raw configuration: {content}")
 
         # Create ourselves a ConfigMemory Object to store our configuration
-        instance = C_MGR['memory'](
-            content=content, format=format, asset=asset, tag=tag,
-            recursion=recursion, insecure_includes=insecure_includes)
-
-        if instance.config_format not in CONFIG_FORMATS:
+        instance = C_MGR["memory"](
+            content=content,
+            format=format,
+            asset=asset,
+            tag=tag,
+            recursion=recursion,
+            insecure_includes=insecure_includes,
+        )
+
+        if not (instance.config_format and
+                instance.config_format.value in common.CONFIG_FORMATS):
             logger.warning(
-                "The format of the configuration could not be deteced.")
+                "The format of the configuration could not be detected."
+            )
             return False
 
         # Add our initialized plugin to our server listings
@@ -268,21 +309,23 @@ def add_config(self, content, asset=None, tag=None, format=None,
         # Return our status
         return True
 
-    def servers(self, tag=common.MATCH_ALL_TAG, match_always=True, *args,
-                **kwargs):
-        """
-        Returns all of our servers dynamically build based on parsed
+    def servers(
+        self,
+        tag: str | list[str] = common.MATCH_ALL_TAG,
+        match_always: bool = True,
+        *args: Any,
+        **kwargs: Any,
+    ) -> list[NotifyBase]:
+        """Returns all of our servers dynamically build based on parsed
         configuration.
 
         If a tag is specified, it applies to the configuration sources
         themselves and not the notification services inside them.
 
-        This is for filtering the configuration files polled for
-        results.
-
-        If the anytag is set, then any notification that is found
-        set with that tag are included in the response.
+        This is for filtering the configuration files polled for results.
 
+        If the anytag is set, then any notification that is found set with that
+        tag are included in the response.
         """
 
         # A match_always flag allows us to pick up on our 'any' keyword
@@ -299,14 +342,17 @@ def servers(self, tag=common.MATCH_ALL_TAG, match_always=True, *args,
         #     tag=[('tagA', 'tagC'), 'tagB']  = (tagA and tagC) or tagB
         #     tag=[('tagB', 'tagC')]          = tagB and tagC
 
-        response = list()
+        response = []
 
         for entry in self.configs:
 
             # Apply our tag matching based on our defined logic
             if is_exclusive_match(
-                    logic=tag, data=entry.tags, match_all=common.MATCH_ALL_TAG,
-                    match_always=match_always):
+                logic=tag,
+                data=entry.tags,
+                match_all=common.MATCH_ALL_TAG,
+                match_always=match_always,
+            ):
                 # Build ourselves a list of services dynamically and return the
                 # as a list
                 response.extend(entry.servers())
@@ -314,30 +360,35 @@ def servers(self, tag=common.MATCH_ALL_TAG, match_always=True, *args,
         return response
 
     @staticmethod
-    def instantiate(url, asset=None, tag=None, cache=None,
-                    recursion=0, insecure_includes=False,
-                    suppress_exceptions=True):
-        """
-        Returns the instance of a instantiated configuration plugin based on
-        the provided Config URL.  If the url fails to be parsed, then None
-        is returned.
-
+    def instantiate(
+        url: str,
+        asset: AppriseAsset | None = None,
+        tag: str | list[str] | None = None,
+        cache: bool | int | None = None,
+        recursion: int = 0,
+        insecure_includes: bool = False,
+        suppress_exceptions: bool = True,
+    ) -> ConfigBase | None:
+        """Returns the instance of a instantiated configuration plugin based on
+        the provided Config URL.
+
+        If the url fails to be parsed, then None is returned.
         """
         # Attempt to acquire the schema at the very least to allow our
         # configuration based urls.
         schema = GET_SCHEMA_RE.match(url)
         if schema is None:
             # Plan B is to assume we're dealing with a file
-            schema = 'file'
-            url = '{}://{}'.format(schema, URLBase.quote(url))
+            schema = "file"
+            url = f"{schema}://{URLBase.quote(url)}"
 
         else:
             # Ensure our schema is always in lower case
-            schema = schema.group('schema').lower()
+            schema = schema.group("schema").lower()
 
             # Some basic validation
             if schema not in C_MGR:
-                logger.warning('Unsupported schema {}.'.format(schema))
+                logger.warning(f"Unsupported schema {schema}.")
                 return None
 
         # Parse our url details of the server object as dictionary containing
@@ -346,55 +397,51 @@ def instantiate(url, asset=None, tag=None, cache=None,
 
         if not results:
             # Failed to parse the server URL
-            logger.warning('Unparseable URL {}.'.format(url))
+            logger.warning(f"Unparseable URL {url}.")
             return None
 
         # Build a list of tags to associate with the newly added notifications
-        results['tag'] = set(parse_list(tag))
+        results["tag"] = set(parse_list(tag))
 
         # Prepare our Asset Object
-        results['asset'] = \
+        results["asset"] = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         if cache is not None:
             # Force an over-ride of the cache value to what we have specified
-            results['cache'] = cache
+            results["cache"] = cache
 
         # Recursion can never be parsed from the URL
-        results['recursion'] = recursion
+        results["recursion"] = recursion
 
         # Insecure includes flag can never be parsed from the URL
-        results['insecure_includes'] = insecure_includes
+        results["insecure_includes"] = insecure_includes
 
         if suppress_exceptions:
             try:
                 # Attempt to create an instance of our plugin using the parsed
                 # URL information
-                cfg_plugin = C_MGR[results['schema']](**results)
+                cfg_plugin = C_MGR[results["schema"]](**results)
 
             except Exception:
                 # the arguments are invalid or can not be used.
-                logger.warning('Could not load URL: %s' % url)
+                logger.warning(f"Could not load URL: {url}")
                 return None
 
         else:
             # Attempt to create an instance of our plugin using the parsed
             # URL information but don't wrap it in a try catch
-            cfg_plugin = C_MGR[results['schema']](**results)
+            cfg_plugin = C_MGR[results["schema"]](**results)
 
         return cfg_plugin
 
-    def clear(self):
-        """
-        Empties our configuration list
-
-        """
+    def clear(self) -> None:
+        """Empties our configuration list."""
         self.configs[:] = []
 
-    def server_pop(self, index):
-        """
-        Removes an indexed Apprise Notification from the servers
-        """
+    def server_pop(self, index: int) -> NotifyBase:
+        """Removes an indexed Apprise Notification from the servers."""
 
         # Tracking variables
         prev_offset = -1
@@ -408,45 +455,43 @@ def server_pop(self, index):
 
                 if offset >= index:
                     # we can pop an notification from our config stack
-                    return entry.pop(index if prev_offset == -1
-                                     else (index - prev_offset - 1))
+                    return entry.pop(
+                        index
+                        if prev_offset == -1
+                        else (index - prev_offset - 1)
+                    )
 
                 # Update our old offset
                 prev_offset = offset
 
         # If we reach here, then we indexed out of range
-        raise IndexError('list index out of range')
+        raise IndexError("list index out of range")
 
-    def pop(self, index=-1):
-        """
-        Removes an indexed Apprise Configuration from the stack and returns it.
+    def pop(self, index: int = -1) -> ConfigBase:
+        """Removes an indexed Apprise Configuration from the stack and returns
+        it.
 
         By default, the last element is removed from the list
         """
         # Remove our entry
         return self.configs.pop(index)
 
-    def __getitem__(self, index):
-        """
-        Returns the indexed config entry of a loaded apprise configuration
-        """
+    def __getitem__(self, index: int) -> ConfigBase:
+        """Returns the indexed config entry of a loaded apprise
+        configuration."""
         return self.configs[index]
 
-    def __bool__(self):
-        """
-        Allows the Apprise object to be wrapped in an 'if statement'.
+    def __bool__(self) -> bool:
+        """Allows the Apprise object to be wrapped in an 'if statement'.
+
         True is returned if at least one service has been loaded.
         """
-        return True if self.configs else False
+        return bool(self.configs)
 
-    def __iter__(self):
-        """
-        Returns an iterator to our config list
-        """
+    def __iter__(self):  # type: () -> Iterator[ConfigBase]
+        """Returns an iterator to our config list."""
         return iter(self.configs)
 
-    def __len__(self):
-        """
-        Returns the number of config entries loaded
-        """
+    def __len__(self) -> int:
+        """Returns the number of config entries loaded."""
         return len(self.configs)
diff --git a/libs/apprise/apprise_config.pyi b/libs/apprise/apprise_config.pyi
deleted file mode 100644
index 9ea819ac39..0000000000
--- a/libs/apprise/apprise_config.pyi
+++ /dev/null
@@ -1,48 +0,0 @@
-from typing import Any, Iterable, Iterator, List, Optional, Union
-
-from . import AppriseAsset, NotifyBase
-from .config import ConfigBase
-
-_Configs = Union[ConfigBase, str, Iterable[str]]
-
-class AppriseConfig:
-    def __init__(
-        self,
-        paths: Optional[_Configs] = ...,
-        asset: Optional[AppriseAsset] = ...,
-        cache: bool = ...,
-        recursion: int = ...,
-        insecure_includes: bool = ...,
-        **kwargs: Any
-    ) -> None: ...
-    def add(
-        self,
-        configs: _Configs,
-        asset: Optional[AppriseAsset] = ...,
-        cache: bool = ...,
-        recursion: Optional[bool] = ...,
-        insecure_includes: Optional[bool] = ...
-    ) -> bool: ...
-    def add_config(
-        self,
-        content: str,
-        asset: Optional[AppriseAsset] = ...,
-        tag: Optional[str] = ...,
-        format: Optional[str] = ...,
-        recursion: Optional[int] = ...,
-        insecure_includes: Optional[bool] = ...
-    ) -> bool: ...
-    def servers(self, tag: str = ..., *args: Any, **kwargs: Any) -> List[ConfigBase]: ...
-    def instantiate(
-        url: str,
-        asset: Optional[AppriseAsset] = ...,
-        tag: Optional[str] = ...,
-        cache: Optional[bool] = ...
-    ) -> NotifyBase: ...
-    def clear(self) -> None: ...
-    def server_pop(self, index: int) -> ConfigBase: ...
-    def pop(self, index: int = ...) -> ConfigBase: ...
-    def __getitem__(self, index: int) -> ConfigBase: ...
-    def __bool__(self) -> bool: ...
-    def __iter__(self) -> Iterator[ConfigBase]: ...
-    def __len__(self) -> int: ...
\ No newline at end of file
diff --git a/libs/apprise/asset.py b/libs/apprise/asset.py
index aef90f08f3..548ca1d165 100644
--- a/libs/apprise/asset.py
+++ b/libs/apprise/asset.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,89 +25,97 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from datetime import datetime, tzinfo
+from os.path import abspath, dirname, isfile, join
 import re
+from typing import Any, Optional, Union
 from uuid import uuid4
-from os.path import join
-from os.path import dirname
-from os.path import isfile
-from os.path import abspath
-from .common import NotifyType
-from .common import PersistentStoreMode
-from .manager_plugins import NotificationManager
 
+from .common import (
+    NotifyFormat,
+    NotifyImageSize,
+    NotifyType,
+    PersistentStoreMode,
+)
+from .manager_plugins import NotificationManager
+from .utils.time import zoneinfo
 
 # Grant access to our Notification Manager Singleton
 N_MGR = NotificationManager()
 
 
 class AppriseAsset:
-    """
-    Provides a supplimentary class that can be used to provide extra
-    information and details that can be used by Apprise such as providing
-    an alternate location to where images/icons can be found and the
-    URL masks.
-
-    Any variable that starts with an underscore (_) can only be initialized
-    by this class manually and will/can not be parsed from a configuration
-    file.
+    """Provides a supplimentary class that can be used to provide extra
+    information and details that can be used by Apprise such as providing an
+    alternate location to where images/icons can be found and the URL masks.
 
+    Any variable that starts with an underscore (_) can only be initialized by
+    this class manually and will/can not be parsed from a configuration file.
     """
+
     # Application Identifier
-    app_id = 'Apprise'
+    app_id = "Apprise"
 
     # Application Description
-    app_desc = 'Apprise Notifications'
+    app_desc = "Apprise Notifications"
 
     # Provider URL
-    app_url = 'https://github.com/caronc/apprise'
+    app_url = "https://github.com/caronc/apprise"
 
     # A Simple Mapping of Colors; For every NOTIFY_TYPE identified,
     # there should be a mapping to it's color here:
     html_notify_map = {
-        NotifyType.INFO: '#3AA3E3',
-        NotifyType.SUCCESS: '#3AA337',
-        NotifyType.FAILURE: '#A32037',
-        NotifyType.WARNING: '#CACF29',
+        NotifyType.INFO: "#3AA3E3",
+        NotifyType.SUCCESS: "#3AA337",
+        NotifyType.FAILURE: "#A32037",
+        NotifyType.WARNING: "#CACF29",
     }
 
     # The default color to return if a mapping isn't found in our table above
-    default_html_color = '#888888'
+    default_html_color = "#888888"
 
     # Ascii Notification
     ascii_notify_map = {
-        NotifyType.INFO: '[i]',
-        NotifyType.SUCCESS: '[+]',
-        NotifyType.FAILURE: '[!]',
-        NotifyType.WARNING: '[~]',
+        NotifyType.INFO: "[i]",
+        NotifyType.SUCCESS: "[+]",
+        NotifyType.FAILURE: "[!]",
+        NotifyType.WARNING: "[~]",
     }
 
     # The default ascii to return if a mapping isn't found in our table above
-    default_ascii_chars = '[?]'
+    default_ascii_chars = "[?]"
 
     # The default image extension to use
-    default_extension = '.png'
+    default_extension = ".png"
+
+    # The default image size if one isn't specified
+    default_image_size = NotifyImageSize.XY_256
 
     # The default theme
-    theme = 'default'
+    theme = "default"
 
     # Image URL Mask
-    image_url_mask = \
-        'https://github.com/caronc/apprise/raw/master/apprise/assets/' \
-        'themes/{THEME}/apprise-{TYPE}-{XY}{EXTENSION}'
+    image_url_mask = (
+        "https://github.com/caronc/apprise/raw/master/apprise/assets/"
+        "themes/{THEME}/apprise-{TYPE}-{XY}{EXTENSION}"
+    )
 
     # Application Logo
-    image_url_logo = \
-        'https://github.com/caronc/apprise/raw/master/apprise/assets/' \
-        'themes/{THEME}/apprise-logo.png'
+    image_url_logo = (
+        "https://github.com/caronc/apprise/raw/master/apprise/assets/"
+        "themes/{THEME}/apprise-logo.png"
+    )
 
     # Image Path Mask
-    image_path_mask = abspath(join(
-        dirname(__file__),
-        'assets',
-        'themes',
-        '{THEME}',
-        'apprise-{TYPE}-{XY}{EXTENSION}',
-    ))
+    image_path_mask = abspath(
+        join(
+            dirname(__file__),
+            "assets",
+            "themes",
+            "{THEME}",
+            "apprise-{TYPE}-{XY}{EXTENSION}",
+        )
+    )
 
     # This value can also be set on calls to Apprise.notify(). This allows
     # you to let Apprise upfront the type of data being passed in.  This
@@ -141,7 +148,7 @@ class AppriseAsset:
     interpret_escapes = False
 
     # Defines the encoding of the content passed into Apprise
-    encoding = 'utf-8'
+    encoding = "utf-8"
 
     # Automatically generate our Pretty Good Privacy (PGP) keys if one isn't
     # present and our environment configuration allows for it.
@@ -149,6 +156,12 @@ class AppriseAsset:
     # if Persistent Storage was set to `memory`
     pgp_autogen = True
 
+    # Automatically generate our Privacy Enhanced Mail (PEM) keys if one isn't
+    # present and our environment configuration allows for it.
+    # For example, a case where the environment wouldn't allow for it would be
+    # if Persistent Storage was set to `memory`
+    pem_autogen = True
+
     # For more detail see CWE-312 @
     #    https://cwe.mitre.org/data/definitions/312.html
     #
@@ -170,7 +183,7 @@ class AppriseAsset:
 
     # Optionally define the default salt to apply to all persistent storage
     # namespace generation (unless over-ridden)
-    __storage_salt = b''
+    __storage_salt = b""
 
     # Optionally define the namespace length of the directories created by
     # the storage. If this is set to zero, then the length is pre-determined
@@ -194,19 +207,31 @@ class AppriseAsset:
     # A unique identifer we can use to associate our calling source
     _uid = str(uuid4())
 
-    def __init__(self, plugin_paths=None, storage_path=None,
-                 storage_mode=None, storage_salt=None,
-                 storage_idlen=None, **kwargs):
-        """
-        Asset Initialization
-
-        """
+    # Default timezone to use (pass in timezone value)
+    # A list of timezones can be found here:
+    # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+    # You can specify things such as 'America/Montreal'
+    # If no timezone is specified, then the one detected on the system
+    # is uzed
+    _tzinfo = None
+
+    def __init__(
+        self,
+        plugin_paths: Optional[list[str]] = None,
+        storage_path: Optional[str] = None,
+        storage_mode: Optional[Union[str, PersistentStoreMode]] = None,
+        storage_salt: Optional[Union[str, bytes]] = None,
+        storage_idlen: Optional[int] = None,
+        timezone: Optional[Union[str, tzinfo]] = None,
+        **kwargs: Any
+    ) -> None:
+        """Asset Initialization."""
         # Assign default arguments if specified
         for key, value in kwargs.items():
             if not hasattr(AppriseAsset, key):
                 raise AttributeError(
-                    'AppriseAsset init(): '
-                    'An invalid key {} was specified.'.format(key))
+                    f"AppriseAsset init(): An invalid key {key} was specified."
+                )
 
             setattr(self, key, value)
 
@@ -221,19 +246,42 @@ def __init__(self, plugin_paths=None, storage_path=None,
 
         if storage_mode:
             # Define how our persistent storage behaves
-            self.__storage_mode = storage_mode
+            try:
+                self.__storage_mode = (
+                    storage_mode if isinstance(storage_mode, NotifyFormat)
+                    else PersistentStoreMode(storage_mode.lower())
+                )
+
+            except (AttributeError, ValueError, TypeError):
+                err = (
+                    f"An invalid persistent store mode ({storage_mode}) was "
+                    "specified.")
+                raise AttributeError(err) from None
 
         if isinstance(storage_idlen, int):
             # Define the number of characters utilized from our namespace lengh
             if storage_idlen < 0:
                 # Unsupported type
                 raise ValueError(
-                    'AppriseAsset storage_idlen(): Value must '
-                    'be an integer and > 0')
+                    "AppriseAsset storage_idlen(): Value must "
+                    "be an integer and > 0"
+                )
 
             # Store value
             self.__storage_idlen = storage_idlen
 
+        if isinstance(timezone, tzinfo):
+            self._tzinfo = timezone
+
+        elif timezone is not None:
+            self._tzinfo = zoneinfo(timezone)
+            if not self._tzinfo:
+                raise AttributeError(
+                    "AppriseAsset timezone provided is invalid") from None
+        else:
+            # Default our timezone to what is detected on the system
+            self._tzinfo = datetime.now().astimezone().tzinfo
+
         if storage_salt is not None:
             # Define the number of characters utilized from our namespace lengh
 
@@ -247,17 +295,22 @@ def __init__(self, plugin_paths=None, storage_path=None,
                 except UnicodeEncodeError:
                     # Bad data; don't pass it along
                     raise ValueError(
-                        'AppriseAsset namespace_salt(): '
-                        'Value provided could not be encoded')
+                        "AppriseAsset namespace_salt(): "
+                        "Value provided could not be encoded"
+                    ) from None
 
             else:  # Unsupported
                 raise ValueError(
-                    'AppriseAsset namespace_salt(): Value provided must be '
-                    'string or bytes object')
+                    "AppriseAsset namespace_salt(): Value provided must be "
+                    "string or bytes object"
+                )
 
-    def color(self, notify_type, color_type=None):
-        """
-        Returns an HTML mapped color based on passed in notify type
+    def color(
+        self,
+        notify_type: NotifyType,
+        color_type: Optional[type] = None,
+    ) -> Union[str, int, tuple[int, int, int]]:
+        """Returns an HTML mapped color based on passed in notify type.
 
         if color_type is:
            None    then a standard hex string is returned as
@@ -265,12 +318,12 @@ def color(self, notify_type, color_type=None):
 
            int     then the integer representation is returned
            tuple   then the the red, green, blue is returned in a tuple
-
         """
 
         # Attempt to get the type, otherwise return a default grey
         # if we couldn't look up the entry
-        color = self.html_notify_map.get(notify_type, self.default_html_color)
+        color = self.html_notify_map.get(
+            notify_type, self.default_html_color)
         if color_type is None:
             # This is the default return type
             return color
@@ -285,22 +338,25 @@ def color(self, notify_type, color_type=None):
 
         # Unsupported type
         raise ValueError(
-            'AppriseAsset html_color(): An invalid color_type was specified.')
-
-    def ascii(self, notify_type):
-        """
-        Returns an ascii representation based on passed in notify type
+            "AppriseAsset html_color(): An invalid color_type was specified."
+        )
 
-        """
+    def ascii(self, notify_type: NotifyType) -> str:
+        """Returns an ascii representation based on passed in notify type."""
         # look our response up
-        return self.ascii_notify_map.get(notify_type, self.default_ascii_chars)
-
-    def image_url(self, notify_type, image_size, logo=False, extension=None):
-        """
-        Apply our mask to our image URL
+        return self.ascii_notify_map.get(
+            notify_type, self.default_ascii_chars)
+
+    def image_url(
+        self,
+        notify_type: NotifyType,
+        image_size: Optional[NotifyImageSize] = None,
+        logo: bool = False,
+        extension: Optional[str] = None,
+    ) -> Optional[str]:
+        """Apply our mask to our image URL.
 
         if logo is set to True, then the logo_url is used instead
-
         """
 
         url_mask = self.image_url_logo if logo else self.image_url_mask
@@ -311,27 +367,32 @@ def image_url(self, notify_type, image_size, logo=False, extension=None):
         if extension is None:
             extension = self.default_extension
 
+        if image_size is None:
+            image_size = self.default_image_size
+
         re_map = {
-            '{THEME}': self.theme if self.theme else '',
-            '{TYPE}': notify_type,
-            '{XY}': image_size,
-            '{EXTENSION}': extension,
+            "{THEME}": self.theme if self.theme else "",
+            "{TYPE}": notify_type.value,
+            "{XY}": image_size.value,
+            "{EXTENSION}": extension,
         }
 
         # Iterate over above list and store content accordingly
         re_table = re.compile(
-            r'(' + '|'.join(re_map.keys()) + r')',
+            r"(" + "|".join(re_map.keys()) + r")",
             re.IGNORECASE,
         )
 
         return re_table.sub(lambda x: re_map[x.group()], url_mask)
 
-    def image_path(self, notify_type, image_size, must_exist=True,
-                   extension=None):
-        """
-        Apply our mask to our image file path
-
-        """
+    def image_path(
+        self,
+        notify_type: NotifyType,
+        image_size: NotifyImageSize,
+        must_exist: bool = True,
+        extension: Optional[str] = None,
+    ) -> Optional[str]:
+        """Apply our mask to our image file path."""
 
         if not self.image_path_mask:
             # No image to return
@@ -341,15 +402,15 @@ def image_path(self, notify_type, image_size, must_exist=True,
             extension = self.default_extension
 
         re_map = {
-            '{THEME}': self.theme if self.theme else '',
-            '{TYPE}': notify_type,
-            '{XY}': image_size,
-            '{EXTENSION}': extension,
+            "{THEME}": self.theme if self.theme else "",
+            "{TYPE}": notify_type.value,
+            "{XY}": image_size.value,
+            "{EXTENSION}": extension,
         }
 
         # Iterate over above list and store content accordingly
         re_table = re.compile(
-            r'(' + '|'.join(re_map.keys()) + r')',
+            r"(" + "|".join(re_map.keys()) + r")",
             re.IGNORECASE,
         )
 
@@ -361,11 +422,14 @@ def image_path(self, notify_type, image_size, must_exist=True,
         # Return what we parsed
         return path
 
-    def image_raw(self, notify_type, image_size, extension=None):
-        """
-        Returns the raw image if it can (otherwise the function returns None)
-
-        """
+    def image_raw(
+        self,
+        notify_type: NotifyType,
+        image_size: NotifyImageSize,
+        extension: Optional[str] = None,
+    ) -> Optional[bytes]:
+        """Returns the raw image if it can (otherwise the function returns
+        None)"""
 
         path = self.image_path(
             notify_type=notify_type,
@@ -374,88 +438,77 @@ def image_raw(self, notify_type, image_size, extension=None):
         )
         if path:
             try:
-                with open(path, 'rb') as fd:
+                with open(path, "rb") as fd:
                     return fd.read()
 
-            except (OSError, IOError):
+            except OSError:
                 # We can't access the file
                 return None
 
         return None
 
-    def details(self):
-        """
-        Returns the details associated with the AppriseAsset object
-
-        """
+    def details(self) -> dict[str, str]:
+        """Returns the details associated with the AppriseAsset object."""
         return {
-            'app_id': self.app_id,
-            'app_desc': self.app_desc,
-            'default_extension': self.default_extension,
-            'theme': self.theme,
-            'image_path_mask': self.image_path_mask,
-            'image_url_mask': self.image_url_mask,
-            'image_url_logo': self.image_url_logo,
+            "app_id": self.app_id,
+            "app_desc": self.app_desc,
+            "default_extension": self.default_extension,
+            "theme": self.theme,
+            "image_path_mask": self.image_path_mask,
+            "image_url_mask": self.image_url_mask,
+            "image_url_logo": self.image_url_logo,
         }
 
     @staticmethod
-    def hex_to_rgb(value):
-        """
-        Takes a hex string (such as #00ff00) and returns a tuple in the form
+    def hex_to_rgb(value: str) -> tuple[int, int, int]:
+        """Takes a hex string (such as #00ff00) and returns a tuple in the form
         of (red, green, blue)
 
         eg: #00ff00 becomes : (0, 65535, 0)
-
         """
-        value = value.lstrip('#')
+        value = value.lstrip("#")
         lv = len(value)
-        return tuple(int(value[i:i + lv // 3], 16)
-                     for i in range(0, lv, lv // 3))
+        return tuple(
+            int(value[i : i + lv // 3], 16) for i in range(0, lv, lv // 3)
+        )
 
     @staticmethod
-    def hex_to_int(value):
-        """
-        Takes a hex string (such as #00ff00) and returns its integer
-        equivalent
+    def hex_to_int(value: str) -> int:
+        """Takes a hex string (such as #00ff00) and returns its integer
+        equivalent.
 
         eg: #00000f becomes : 15
-
         """
-        return int(value.lstrip('#'), 16)
+        return int(value.lstrip("#"), 16)
 
     @property
-    def plugin_paths(self):
-        """
-        Return the plugin paths defined
-        """
+    def plugin_paths(self) -> list[str]:
+        """Return the plugin paths defined."""
         return self.__plugin_paths
 
     @property
-    def storage_path(self):
-        """
-        Return the persistent storage path defined
-        """
+    def storage_path(self) -> Optional[str]:
+        """Return the persistent storage path defined."""
         return self.__storage_path
 
     @property
-    def storage_mode(self):
-        """
-        Return the persistent storage mode defined
-        """
+    def storage_mode(self) -> PersistentStoreMode:
+        """Return the persistent storage mode defined."""
 
         return self.__storage_mode
 
     @property
-    def storage_salt(self):
-        """
-        Return the provided namespace salt; this is always of type bytes
-        """
+    def storage_salt(self) -> bytes:
+        """Return the provided namespace salt; this is always of type bytes."""
         return self.__storage_salt
 
     @property
-    def storage_idlen(self):
-        """
-        Return the persistent storage id length
-        """
+    def storage_idlen(self) -> int:
+        """Return the persistent storage id length."""
 
         return self.__storage_idlen
+
+    @property
+    def tzinfo(self) -> tzinfo:
+        """Return the timezone object"""
+        return self._tzinfo
diff --git a/libs/apprise/asset.pyi b/libs/apprise/asset.pyi
deleted file mode 100644
index 08303341b1..0000000000
--- a/libs/apprise/asset.pyi
+++ /dev/null
@@ -1,34 +0,0 @@
-from typing import Dict, Optional
-
-from . import NotifyFormat, NotifyType
-
-class AppriseAsset:
-    app_id: str
-    app_desc: str
-    app_url: str
-    html_notify_map: Dict[NotifyType, str]
-    default_html_color: str
-    default_extension: str
-    theme: Optional[str]
-    image_url_mask: str
-    image_url_logo: str
-    image_path_mask: Optional[str]
-    body_format: Optional[NotifyFormat]
-    async_mode: bool
-    interpret_escapes: bool
-    def __init__(
-        self,
-        app_id: str = ...,
-        app_desc: str = ...,
-        app_url: str = ...,
-        html_notify_map: Dict[NotifyType, str] = ...,
-        default_html_color: str = ...,
-        default_extension: str = ...,
-        theme: Optional[str] = ...,
-        image_url_mask: str = ...,
-        image_url_logo: str = ...,
-        image_path_mask: Optional[str] = ...,
-        body_format: Optional[NotifyFormat] = ...,
-        async_mode: bool = ...,
-        interpret_escapes: bool = ...
-    ) -> None: ...
\ No newline at end of file
diff --git a/libs/apprise/attachment/__init__.py b/libs/apprise/attachment/__init__.py
index 1f09941dc2..884095a963 100644
--- a/libs/apprise/attachment/__init__.py
+++ b/libs/apprise/attachment/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,14 +26,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Used for testing
-from .base import AttachBase
 from ..manager_attachment import AttachmentManager
+from .base import AttachBase
 
 # Initalize our Attachment Manager Singleton
 A_MGR = AttachmentManager()
 
 __all__ = [
     # Reference
-    'AttachBase',
-    'AttachmentManager',
+    "AttachBase",
+    "AttachmentManager",
 ]
diff --git a/libs/apprise/attachment/base.py b/libs/apprise/attachment/base.py
index 0161cab08f..5020958c96 100644
--- a/libs/apprise/attachment/base.py
+++ b/libs/apprise/attachment/base.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,34 +25,34 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import base64
+import contextlib
+import mimetypes
 import os
 import time
-import mimetypes
-import base64
+
 from .. import exception
-from ..url import URLBase
-from ..utils.parse import parse_bool
 from ..common import ContentLocation
 from ..locale import gettext_lazy as _
+from ..url import URLBase
+from ..utils.parse import parse_bool
 
 
 class AttachBase(URLBase):
-    """
-    This is the base class for all supported attachment types
-    """
+    """This is the base class for all supported attachment types."""
 
     # For attachment type detection; this amount of data is read into memory
     # 128KB (131072B)
     max_detect_buffer_size = 131072
 
     # Unknown mimetype
-    unknown_mimetype = 'application/octet-stream'
+    unknown_mimetype = "application/octet-stream"
 
     # Our filename when we can't otherwise determine one
-    unknown_filename = 'apprise-attachment'
+    unknown_filename = "apprise-attachment"
 
     # Our filename extension when we can't otherwise determine one
-    unknown_filename_extension = '.obj'
+    unknown_filename_extension = ".obj"
 
     # The strict argument is a flag specifying whether the list of known MIME
     # types is limited to only the official types registered with IANA. When
@@ -79,33 +78,32 @@ class AttachBase(URLBase):
     # These act the same way as tokens except they are optional and/or
     # have default values set if mandatory. This rule must be followed
     template_args = {
-        'cache': {
-            'name': _('Cache Age'),
-            'type': 'int',
+        "cache": {
+            "name": _("Cache Age"),
+            "type": "int",
             # We default to (600) which means we cache for 10 minutes
-            'default': 600,
+            "default": 600,
         },
-        'mime': {
-            'name': _('Forced Mime Type'),
-            'type': 'string',
+        "mime": {
+            "name": _("Forced Mime Type"),
+            "type": "string",
         },
-        'name': {
-            'name': _('Forced File Name'),
-            'type': 'string',
+        "name": {
+            "name": _("Forced File Name"),
+            "type": "string",
         },
-        'verify': {
-            'name': _('Verify SSL'),
+        "verify": {
+            "name": _("Verify SSL"),
             # SSL Certificate Authority Verification
-            'type': 'bool',
+            "type": "bool",
             # Provide a default
-            'default': True,
+            "default": True,
         },
     }
 
     def __init__(self, name=None, mimetype=None, cache=None, **kwargs):
-        """
-        Initialize some general logging and common server arguments that will
-        keep things consistent when working with the configurations that
+        """Initialize some general logging and common server arguments that
+        will keep things consistent when working with the configurations that
         inherit this class.
 
         Optionally provide a filename to over-ride name associated with the
@@ -160,15 +158,13 @@ def __init__(self, name=None, mimetype=None, cache=None, **kwargs):
                 self.cache = cache if isinstance(cache, bool) else int(cache)
 
             except (TypeError, ValueError):
-                err = 'An invalid cache value ({}) was specified.'.format(
-                    cache)
+                err = f"An invalid cache value ({cache}) was specified."
                 self.logger.warning(err)
-                raise TypeError(err)
+                raise TypeError(err) from None
 
             # Some simple error checking
             if self.cache < 0:
-                err = 'A negative cache value ({}) was specified.'.format(
-                    cache)
+                err = f"A negative cache value ({cache}) was specified."
                 self.logger.warning(err)
                 raise TypeError(err)
 
@@ -176,22 +172,28 @@ def __init__(self, name=None, mimetype=None, cache=None, **kwargs):
             self.cache = None
 
         # Validate mimetype if specified
-        if self._mimetype:
-            if next((t for t in mimetypes.types_map.values()
-                     if self._mimetype == t), None) is None:
-                err = 'An invalid mime-type ({}) was specified.'.format(
-                    mimetype)
-                self.logger.warning(err)
-                raise TypeError(err)
+        if self._mimetype and (
+                next(
+                    (
+                        t
+                        for t in mimetypes.types_map.values()
+                        if self._mimetype == t
+                    ),
+                    None,
+                )
+                is None):
+            err = f"An invalid mime-type ({mimetype}) was specified."
+            self.logger.warning(err)
+            raise TypeError(err)
 
         return
 
     @property
     def path(self):
-        """
-        Returns the absolute path to the filename. If this is not known or
-        is know but has been considered expired (due to cache setting), then
-        content is re-retrieved prior to returning.
+        """Returns the absolute path to the filename.
+
+        If this is not known or is know but has been considered expired (due to
+        cache setting), then content is re-retrieved prior to returning.
         """
 
         if not self.exists():
@@ -202,9 +204,7 @@ def path(self):
 
     @property
     def name(self):
-        """
-        Returns the filename
-        """
+        """Returns the filename."""
         if self._name:
             # return our fixed content
             return self._name
@@ -216,20 +216,19 @@ def name(self):
         if not self.detected_name:
             # If we get here, our download was successful but we don't have a
             # filename based on our content.
-            extension = mimetypes.guess_extension(self.mimetype)
-            self.detected_name = '{}{}'.format(
-                self.unknown_filename,
-                extension if extension else self.unknown_filename_extension)
+            ext = mimetypes.guess_extension(self.mimetype)
+            self.detected_name = (
+                f"{self.unknown_filename}"
+                f"{ext if ext else self.unknown_filename_extension}"
+            )
 
         return self.detected_name
 
     @property
     def mimetype(self):
-        """
-        Returns mime type (if one is present).
+        """Returns mime type (if one is present).
 
-        Content is cached once determied to prevent overhead of future
-        calls.
+        Content is cached once determied to prevent overhead of future calls.
         """
         if not self.exists():
             # we could not obtain our attachment
@@ -242,36 +241,40 @@ def mimetype(self):
         if not self.detected_mimetype:
             # guess_type() returns: (type, encoding) and sets type to None
             # if it can't otherwise determine it.
-            try:
+            with contextlib.suppress(TypeError):
                 # Directly reference _name and detected_name to prevent
                 # recursion loop (as self.name calls this function)
                 self.detected_mimetype, _ = mimetypes.guess_type(
-                    self._name if self._name
-                    else self.detected_name, strict=self.strict)
-
-            except TypeError:
-                # Thrown if None was specified in filename section
-                pass
+                    self._name if self._name else self.detected_name,
+                    strict=self.strict,
+                )
 
         # Return our mime type
-        return self.detected_mimetype \
-            if self.detected_mimetype else self.unknown_mimetype
+        return (
+            self.detected_mimetype
+            if self.detected_mimetype
+            else self.unknown_mimetype
+        )
 
     def exists(self, retrieve_if_missing=True):
-        """
-        Simply returns true if the object has downloaded and stored the
-        attachment AND the attachment has not expired.
-        """
+        """Simply returns true if the object has downloaded and stored the
+        attachment AND the attachment has not expired."""
         if self.location == ContentLocation.INACCESSIBLE:
             # our content is inaccessible
             return False
 
-        cache = self.template_args['cache']['default'] \
-            if self.cache is None else self.cache
+        cache = (
+            self.template_args["cache"]["default"]
+            if self.cache is None
+            else self.cache
+        )
 
         try:
-            if self.download_path and os.path.isfile(self.download_path) \
-                    and cache:
+            if (
+                self.download_path
+                and os.path.isfile(self.download_path)
+                and cache
+            ):
 
                 # We have enough reason to look further into our cached content
                 # and verify it has not expired.
@@ -281,53 +284,56 @@ def exists(self, retrieve_if_missing=True):
 
                 # Verify our cache time to determine whether we will get our
                 # content again.
-                age_in_sec = \
-                    time.time() - os.stat(self.download_path).st_mtime
+                age_in_sec = time.time() - os.stat(self.download_path).st_mtime
                 if age_in_sec <= cache:
                     return True
 
-        except (OSError, IOError):
+        except OSError:
             # The file is not present
             pass
 
         return False if not retrieve_if_missing else self.download()
 
-    def base64(self, encoding='ascii'):
-        """
-        Returns the attachment object as a base64 string otherwise
-        None is returned if an error occurs.
+    def base64(self, encoding="ascii"):
+        """Returns the attachment object as a base64 string otherwise None is
+        returned if an error occurs.
 
         If encoding is set to None, then it is not encoded when returned
         """
         if not self:
             # We could not access the attachment
             self.logger.error(
-                'Could not access attachment {}.'.format(
-                    self.url(privacy=True)))
+                f"Could not access attachment {self.url(privacy=True)}."
+            )
             raise exception.AppriseFileNotFound("Attachment Missing")
 
         try:
             with self.open() as f:
                 # Prepare our Attachment in Base64
-                return base64.b64encode(f.read()).decode(encoding) \
-                    if encoding else base64.b64encode(f.read())
+                return (
+                    base64.b64encode(f.read()).decode(encoding)
+                    if encoding
+                    else base64.b64encode(f.read())
+                )
 
-        except (TypeError, FileNotFoundError):
+        except (FileNotFoundError):
             # We no longer have a path to open
-            raise exception.AppriseFileNotFound("Attachment Missing")
+            raise exception.AppriseFileNotFound("Attachment Missing") from None
 
-        except (TypeError, OSError, IOError) as e:
+        except (TypeError, OSError) as e:
             self.logger.warning(
-                'An I/O error occurred while reading {}.'.format(
-                    self.name if self else 'attachment'))
-            self.logger.debug('I/O Exception: %s' % str(e))
-            raise exception.AppriseDiskIOError("Attachment Access Error")
+                "An I/O error occurred while reading {}.".format(
+                    self.name if self else "attachment"
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
+            raise exception.AppriseDiskIOError(
+                "Attachment Access Error") from e
 
     def invalidate(self):
-        """
-        Release any temporary data that may be open by child classes.
-        Externally fetched content should be automatically cleaned up when
-        this function is called.
+        """Release any temporary data that may be open by child classes.
+        Externally fetched content should be automatically cleaned up when this
+        function is called.
 
         This function should also reset the following entries to None:
           - detected_name : Should identify a human readable filename
@@ -345,8 +351,7 @@ def invalidate(self):
         return
 
     def download(self):
-        """
-        This function must be over-ridden by inheriting classes.
+        """This function must be over-ridden by inheriting classes.
 
         Inherited classes MUST populate:
           - detected_name: Should identify a human readable filename
@@ -356,19 +361,17 @@ def download(self):
         If a download fails, you should ensure these values are set to None.
         """
         raise NotImplementedError(
-            "download() is implimented by the child class.")
+            "download() is implimented by the child class."
+        )
 
-    def open(self, mode='rb'):
-        """
-        return our file pointer and track it (we'll auto close later)
-        """
-        pointer = open(self.path, mode=mode)
+    def open(self, mode="rb"):
+        """Return our file pointer and track it (we'll auto close later)"""
+        pointer = open(self.path, mode=mode)  # noqa: SIM115
         self.__pointers.add(pointer)
         return pointer
 
     def chunk(self, size=5242880):
-        """
-        A Generator that yield chunks of a file with the specified size.
+        """A Generator that yield chunks of a file with the specified size.
 
         By default the chunk size is set to 5MB (5242880 bytes)
         """
@@ -382,15 +385,12 @@ def chunk(self, size=5242880):
                 yield chunk
 
     def __enter__(self):
-        """
-        support with keyword
-        """
+        """Support with keyword."""
         return self.open()
 
     def __exit__(self, value_type, value, traceback):
-        """
-        stub to do nothing; but support exit of with statement gracefully
-        """
+        """Stub to do nothing; but support exit of with statement
+        gracefully."""
         return
 
     @staticmethod
@@ -413,40 +413,38 @@ def parse_url(url, verify_host=True, mimetype_db=None, sanitize=True):
         """
 
         results = URLBase.parse_url(
-            url, verify_host=verify_host, sanitize=sanitize)
+            url, verify_host=verify_host, sanitize=sanitize
+        )
 
         if not results:
             # We're done; we failed to parse our url
             return results
 
         # Allow overriding the default config mime type
-        if 'mime' in results['qsd']:
-            results['mimetype'] = results['qsd'].get('mime', '') \
-                .strip().lower()
+        if "mime" in results["qsd"]:
+            results["mimetype"] = (
+                results["qsd"].get("mime", "").strip().lower()
+            )
 
         # Allow overriding the default file name
-        if 'name' in results['qsd']:
-            results['name'] = results['qsd'].get('name', '') \
-                .strip().lower()
+        if "name" in results["qsd"]:
+            results["name"] = results["qsd"].get("name", "").strip().lower()
 
         # Our cache value
-        if 'cache' in results['qsd']:
+        if "cache" in results["qsd"]:
             # First try to get it's integer value
             try:
-                results['cache'] = int(results['qsd']['cache'])
+                results["cache"] = int(results["qsd"]["cache"])
 
             except (ValueError, TypeError):
                 # No problem, it just isn't an integer; now treat it as a bool
                 # instead:
-                results['cache'] = parse_bool(results['qsd']['cache'])
+                results["cache"] = parse_bool(results["qsd"]["cache"])
 
         return results
 
     def __len__(self):
-        """
-        Returns the filesize of the attachment.
-
-        """
+        """Returns the filesize of the attachment."""
         if not self:
             return 0
 
@@ -458,14 +456,12 @@ def __len__(self):
             return 0
 
     def __bool__(self):
-        """
-        Allows the Apprise object to be wrapped in an based 'if statement'.
+        """Allows the Apprise object to be wrapped in an based 'if statement'.
+
         True is returned if our content was downloaded correctly.
         """
-        return True if self.path else False
+        return bool(self.path)
 
     def __del__(self):
-        """
-        Perform any house cleaning
-        """
+        """Perform any house cleaning."""
         self.invalidate()
diff --git a/libs/apprise/attachment/base.pyi b/libs/apprise/attachment/base.pyi
deleted file mode 100644
index 66b7179d36..0000000000
--- a/libs/apprise/attachment/base.pyi
+++ /dev/null
@@ -1,36 +0,0 @@
-from typing import Any, Dict, Optional
-
-from .. import ContentLocation
-
-class AttachBase:
-    max_detect_buffer_size: int
-    unknown_mimetype: str
-    unknown_filename: str
-    unknown_filename_extension: str
-    strict: bool
-    max_file_size: int
-    location: ContentLocation
-    template_args: Dict[str, Any]
-    def __init__(
-        self,
-        name: Optional[str] = ...,
-        mimetype: Optional[str] = ...,
-        cache: Optional[bool] = ...,
-        **kwargs: Any
-    ) -> None: ...
-    @property
-    def path(self) -> Optional[str]: ...
-    @property
-    def name(self) -> Optional[str]: ...
-    @property
-    def mimetype(self) -> Optional[str]: ...
-    def exists(self) -> bool: ...
-    def invalidate(self) -> None: ...
-    def download(self) -> bool: ...
-    @staticmethod
-    def parse_url(
-        url: str,
-        verify_host: bool = ...
-    ) -> Dict[str, Any]: ...
-    def __len__(self) -> int: ...
-    def __bool__(self) -> bool: ...
diff --git a/libs/apprise/attachment/file.py b/libs/apprise/attachment/file.py
index 20f01ce403..0e96d3999e 100644
--- a/libs/apprise/attachment/file.py
+++ b/libs/apprise/attachment/file.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,34 +25,30 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
 import os
-from .base import AttachBase
-from ..utils.disk import path_decode
+import re
+
 from ..common import ContentLocation
 from ..locale import gettext_lazy as _
+from ..utils.disk import path_decode
+from .base import AttachBase
 
 
 class AttachFile(AttachBase):
-    """
-    A wrapper for File based attachment sources
-    """
+    """A wrapper for File based attachment sources."""
 
     # The default descriptive name associated with the service
-    service_name = _('Local File')
+    service_name = _("Local File")
 
     # The default protocol
-    protocol = 'file'
+    protocol = "file"
 
     # Content is local to the same location as the apprise instance
     # being called (server-side)
     location = ContentLocation.LOCAL
 
     def __init__(self, path, **kwargs):
-        """
-        Initialize Local File Attachment Object
-
-        """
+        """Initialize Local File Attachment Object."""
         super().__init__(**kwargs)
 
         # Store path but mark it dirty since we have not performed any
@@ -65,30 +60,30 @@ def __init__(self, path, **kwargs):
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
 
         if self._mimetype:
             # A mime-type was enforced
-            params['mime'] = self._mimetype
+            params["mime"] = self._mimetype
 
         if self._name:
             # A name was enforced
-            params['name'] = self._name
+            params["name"] = self._name
 
-        return 'file://{path}{params}'.format(
+        return "file://{path}{params}".format(
             path=self.quote(self.__original_path),
-            params='?{}'.format(self.urlencode(params, safe='/'))
-            if params else '',
+            params=(
+                "?{}".format(self.urlencode(params, safe="/"))
+                if params
+                else ""
+            ),
         )
 
     def download(self, **kwargs):
-        """
-        Perform retrieval of our data.
+        """Perform retrieval of our data.
 
         For file base attachments, our data already exists, so we only need to
         validate it.
@@ -108,14 +103,17 @@ def download(self, **kwargs):
         except OSError:
             return False
 
-        if self.max_file_size > 0 and \
-                os.path.getsize(self.dirty_path) > self.max_file_size:
+        if (
+            self.max_file_size > 0
+            and os.path.getsize(self.dirty_path) > self.max_file_size
+        ):
 
             # The content to attach is to large
             self.logger.error(
-                'Content exceeds allowable maximum file length '
-                '({}KB): {}'.format(
-                    int(self.max_file_size / 1024), self.url(privacy=True)))
+                "Content exceeds allowable maximum file length"
+                f" ({int(self.max_file_size / 1024)}KB):"
+                f" {self.url(privacy=True)}"
+            )
 
             # Return False (signifying a failure)
             return False
@@ -131,20 +129,17 @@ def download(self, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL so that we can handle all different file paths
-        and return it as our path object
-
-        """
+        """Parses the URL so that we can handle all different file paths and
+        return it as our path object."""
 
         results = AttachBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early; it's not a good URL
             return results
 
-        match = re.match(r'file://(?P<path>[^?]+)(\?.*)?', url, re.I)
+        match = re.match(r"file://(?P<path>[^?]+)(\?.*)?", url, re.I)
         if not match:
             return None
 
-        results['path'] = AttachFile.unquote(match.group('path'))
+        results["path"] = AttachFile.unquote(match.group("path"))
         return results
diff --git a/libs/apprise/attachment/http.py b/libs/apprise/attachment/http.py
index 0c7ccc5db9..633f898fdb 100644
--- a/libs/apprise/attachment/http.py
+++ b/libs/apprise/attachment/http.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,30 +25,31 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
+import contextlib
 import os
-import requests
-import threading
+import re
 from tempfile import NamedTemporaryFile
-from .base import AttachBase
+import threading
+
+import requests
+
 from ..common import ContentLocation
-from ..url import PrivacyMode
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from .base import AttachBase
 
 
 class AttachHTTP(AttachBase):
-    """
-    A wrapper for HTTP based attachment sources
-    """
+    """A wrapper for HTTP based attachment sources."""
 
     # The default descriptive name associated with the service
-    service_name = _('Web Based')
+    service_name = _("Web Based")
 
     # The default protocol
-    protocol = 'http'
+    protocol = "http"
 
     # The default secure protocol
-    secure_protocol = 'https'
+    secure_protocol = "https"
 
     # The number of bytes in memory to read from the remote source at a time
     chunk_size = 8192
@@ -61,20 +61,18 @@ class AttachHTTP(AttachBase):
     _lock = threading.Lock()
 
     def __init__(self, headers=None, **kwargs):
-        """
-        Initialize HTTP Object
+        """Initialize HTTP Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
-        self.schema = 'https' if self.secure else 'http'
+        self.schema = "https" if self.secure else "http"
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = '/'
+            self.fullpath = "/"
 
         self.headers = {}
         if headers:
@@ -86,15 +84,17 @@ def __init__(self, headers=None, **kwargs):
 
         # Our Query String Dictionary; we use this to track arguments
         # specified that aren't otherwise part of this class
-        self.qsd = {k: v for k, v in kwargs.get('qsd', {}).items()
-                    if k not in self.template_args}
+        self.qsd = {
+            k: v
+            for k, v in kwargs.get("qsd", {}).items()
+            if k not in self.template_args
+        }
 
         return
 
     def download(self, **kwargs):
-        """
-        Perform retrieval of the configuration based on the specified request
-        """
+        """Perform retrieval of the configuration based on the specified
+        request."""
 
         if self.location == ContentLocation.INACCESSIBLE:
             # our content is inaccessible
@@ -102,7 +102,7 @@ def download(self, **kwargs):
 
         # prepare header
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Apply any/all header over-rides defined
@@ -112,9 +112,9 @@ def download(self, **kwargs):
         if self.user:
             auth = (self.user, self.password)
 
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         url += self.fullpath
 
@@ -129,67 +129,74 @@ def download(self, **kwargs):
                 # Due to locking; it's possible a concurrent thread already
                 # handled the retrieval in which case we can safely move on
                 self.logger.trace(
-                    'HTTP Attachment %s already retrieved',
-                    self._temp_file.name)
+                    "HTTP Attachment %s already retrieved",
+                    self._temp_file.name,
+                )
                 return True
 
             # Ensure any existing content set has been invalidated
             self.invalidate()
 
             self.logger.debug(
-                'HTTP Attachment Fetch URL: %s (cert_verify=%r)' % (
-                    url, self.verify_certificate))
+                "HTTP Attachment Fetch URL:"
+                f" {url} (cert_verify={self.verify_certificate!r})"
+            )
 
             try:
                 # Make our request
                 with requests.get(
-                        url,
-                        headers=headers,
-                        auth=auth,
-                        params=self.qsd,
-                        verify=self.verify_certificate,
-                        timeout=self.request_timeout,
-                        stream=True) as r:
+                    url,
+                    headers=headers,
+                    auth=auth,
+                    params=self.qsd,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                    stream=True,
+                ) as r:
 
                     # Handle Errors
                     r.raise_for_status()
 
                     # Get our file-size (if known)
                     try:
-                        file_size = int(r.headers.get('Content-Length', '0'))
+                        file_size = int(r.headers.get("Content-Length", "0"))
                     except (TypeError, ValueError):
                         # Handle edge case where Content-Length is a bad value
                         file_size = 0
 
                     # Perform a little Q/A on file limitations and restrictions
-                    if self.max_file_size > 0 and \
-                            file_size > self.max_file_size:
+                    if (
+                        self.max_file_size > 0
+                        and file_size > self.max_file_size
+                    ):
 
                         # The content retrieved is to large
                         self.logger.error(
-                            'HTTP response exceeds allowable maximum file '
-                            'length ({}KB): {}'.format(
-                                int(self.max_file_size / 1024),
-                                self.url(privacy=True)))
+                            "HTTP response exceeds allowable maximum file"
+                            f" length ({int(self.max_file_size / 1024)}KB):"
+                            f" {self.url(privacy=True)}"
+                        )
 
                         # Return False (signifying a failure)
                         return False
 
                     # Detect config format based on mime if the format isn't
                     # already enforced
-                    self.detected_mimetype = r.headers.get('Content-Type')
+                    self.detected_mimetype = r.headers.get("Content-Type")
 
-                    d = r.headers.get('Content-Disposition', '')
+                    d = r.headers.get("Content-Disposition", "")
                     result = re.search(
-                        "filename=['\"]?(?P<name>[^'\"]+)['\"]?", d, re.I)
+                        r"filename=['\"]?(?P<name>[^'\"]+)['\"]?", d, re.I
+                    )
                     if result:
-                        self.detected_name = result.group('name').strip()
+                        self.detected_name = result.group("name").strip()
 
                     # Create a temporary file to work with; delete must be set
                     # to False or it isn't compatible with Microsoft Windows
                     # instances. In lieu of this, __del__ will clean up the
                     # file for us.
-                    self._temp_file = NamedTemporaryFile(delete=False)
+                    self._temp_file = \
+                        NamedTemporaryFile(delete=False)  # noqa: SIM115
 
                     # Get our chunk size
                     chunk_size = self.chunk_size
@@ -212,11 +219,11 @@ def download(self, **kwargs):
                                 if bytes_written > self.max_file_size:
                                     # The content retrieved is to large
                                     self.logger.error(
-                                        'HTTP response exceeds allowable '
-                                        'maximum file length '
-                                        '({}KB): {}'.format(
-                                            int(self.max_file_size / 1024),
-                                            self.url(privacy=True)))
+                                        "HTTP response exceeds allowable"
+                                        " maximum file length"
+                                        f" ({int(self.max_file_size / 1024)}"
+                                        f"KB): {self.url(privacy=True)}"
+                                    )
 
                                     # Invalidate any variables previously set
                                     self.invalidate()
@@ -224,9 +231,11 @@ def download(self, **kwargs):
                                     # Return False (signifying a failure)
                                     return False
 
-                                elif bytes_written + chunk_size \
-                                        > self.max_file_size:
-                                    # Adjust out next read to accomodate up to
+                                elif (
+                                    bytes_written + chunk_size
+                                    > self.max_file_size
+                                ):
+                                    # Adjust out next read to accommodate up to
                                     # our limit +1. This will prevent us from
                                     # reading to much into our memory buffer
                                     self.max_file_size - bytes_written + 1
@@ -242,9 +251,10 @@ def download(self, **kwargs):
 
             except requests.RequestException as e:
                 self.logger.error(
-                    'A Connection error occurred retrieving HTTP '
-                    'configuration from %s.' % self.host)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred retrieving HTTP "
+                    f"configuration from {self.host}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Invalidate any variables previously set
                 self.invalidate()
@@ -252,14 +262,15 @@ def download(self, **kwargs):
                 # Return False (signifying a failure)
                 return False
 
-            except (IOError, OSError):
+            except OSError:
                 # IOError is present for backwards compatibility with Python
                 # versions older then 3.3.  >= 3.3 throw OSError now.
 
                 # Could not open and/or write the temporary file
                 self.logger.error(
-                    'Could not write attachment to disk: {}'.format(
-                        self.url(privacy=True)))
+                    "Could not write attachment to disk:"
+                    f" {self.url(privacy=True)}"
+                )
 
                 # Invalidate any variables previously set
                 self.invalidate()
@@ -271,21 +282,15 @@ def download(self, **kwargs):
         return True
 
     def invalidate(self):
-        """
-        Close our temporary file
-        """
+        """Close our temporary file."""
         if self._temp_file:
-            self.logger.trace(
-                'Attachment cleanup of %s', self._temp_file.name)
+            self.logger.trace("Attachment cleanup of %s", self._temp_file.name)
             self._temp_file.close()
 
-            try:
+            with contextlib.suppress(OSError):
                 # Ensure our file is removed (if it exists)
                 os.unlink(self._temp_file.name)
 
-            except OSError:
-                pass
-
             # Reset our temporary file to prevent from entering
             # this block again
             self._temp_file = None
@@ -293,15 +298,11 @@ def invalidate(self):
         super().invalidate()
 
     def __del__(self):
-        """
-        Tidy memory if open
-        """
+        """Tidy memory if open."""
         self.invalidate()
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
@@ -309,59 +310,59 @@ def url(self, privacy=False, *args, **kwargs):
         # Prepare our cache value
         if self.cache is not None:
             if isinstance(self.cache, bool) or not self.cache:
-                cache = 'yes' if self.cache else 'no'
+                cache = "yes" if self.cache else "no"
             else:
                 cache = int(self.cache)
 
             # Set our cache value
-            params['cache'] = cache
+            params["cache"] = cache
 
         if self._mimetype:
             # A format was enforced
-            params['mime'] = self._mimetype
+            params["mime"] = self._mimetype
 
         if self._name:
             # A name was enforced
-            params['name'] = self._name
+            params["name"] = self._name
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Apply any remaining entries to our URL
         params.update(self.qsd)
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=self.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=self.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=self.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=self.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}{fullpath}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
-            hostname=self.quote(self.host, safe=''),
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=self.quote(self.fullpath, safe='/'),
-            params=self.urlencode(params, safe='/'),
+            hostname=self.quote(self.host, safe=""),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=self.quote(self.fullpath, safe="/"),
+            params=self.urlencode(params, safe="/"),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = AttachBase.parse_url(url, sanitize=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -369,7 +370,7 @@ def parse_url(url):
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set
-        results['headers'] = results['qsd-']
-        results['headers'].update(results['qsd+'])
+        results["headers"] = results["qsd-"]
+        results["headers"].update(results["qsd+"])
 
         return results
diff --git a/libs/apprise/attachment/memory.py b/libs/apprise/attachment/memory.py
index fe6e33fce9..c7ebdbd60d 100644
--- a/libs/apprise/attachment/memory.py
+++ b/libs/apprise/attachment/memory.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,38 +25,40 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
-import os
-import io
 import base64
-from .base import AttachBase
+import io
+import os
+import re
+import uuid
+
 from .. import exception
 from ..common import ContentLocation
 from ..locale import gettext_lazy as _
-import uuid
+from .base import AttachBase
 
 
 class AttachMemory(AttachBase):
-    """
-    A wrapper for Memory based attachment sources
-    """
+    """A wrapper for Memory based attachment sources."""
 
     # The default descriptive name associated with the service
-    service_name = _('Memory')
+    service_name = _("Memory")
 
     # The default protocol
-    protocol = 'memory'
+    protocol = "memory"
 
     # Content is local to the same location as the apprise instance
     # being called (server-side)
     location = ContentLocation.LOCAL
 
-    def __init__(self, content=None, name=None, mimetype=None,
-                 encoding='utf-8', **kwargs):
-        """
-        Initialize Memory Based Attachment Object
-
-        """
+    def __init__(
+        self,
+        content=None,
+        name=None,
+        mimetype=None,
+        encoding="utf-8",
+        **kwargs,
+    ):
+        """Initialize Memory Based Attachment Object."""
         # Create our BytesIO object
         self._data = io.BytesIO()
 
@@ -68,15 +69,16 @@ def __init__(self, content=None, name=None, mimetype=None,
         elif isinstance(content, str):
             content = content.encode(encoding)
             if mimetype is None:
-                mimetype = 'text/plain'
+                mimetype = "text/plain"
 
             if not name:
                 # Generate a unique filename
-                name = str(uuid.uuid4()) + '.txt'
+                name = str(uuid.uuid4()) + ".txt"
 
         elif not isinstance(content, bytes):
             raise TypeError(
-                'Provided content for memory attachment is invalid')
+                "Provided content for memory attachment is invalid"
+            )
 
         # Store our content
         if content:
@@ -84,11 +86,11 @@ def __init__(self, content=None, name=None, mimetype=None,
 
         if mimetype is None:
             # Default mimetype
-            mimetype = 'application/octet-stream'
+            mimetype = "application/octet-stream"
 
         if not name:
             # Generate a unique filename
-            name = str(uuid.uuid4()) + '.dat'
+            name = str(uuid.uuid4()) + ".dat"
 
         # Initialize our base object
         super().__init__(name=name, mimetype=mimetype, **kwargs)
@@ -96,40 +98,32 @@ def __init__(self, content=None, name=None, mimetype=None,
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'mime': self._mimetype,
+            "mime": self._mimetype,
         }
 
-        return 'memory://{name}?{params}'.format(
+        return "memory://{name}?{params}".format(
             name=self.quote(self._name),
-            params=self.urlencode(params, safe='/')
+            params=self.urlencode(params, safe="/"),
         )
 
     def open(self, *args, **kwargs):
-        """
-        return our memory object
-        """
+        """Return our memory object."""
         # Return our object
         self._data.seek(0, 0)
         return self._data
 
     def __enter__(self):
-        """
-        support with clause
-        """
+        """Support with clause."""
         # Return our object
         self._data.seek(0, 0)
         return self._data
 
     def download(self, **kwargs):
-        """
-        Handle memory download() call
-        """
+        """Handle memory download() call."""
 
         if self.location == ContentLocation.INACCESSIBLE:
             # our content is inaccessible
@@ -138,77 +132,74 @@ def download(self, **kwargs):
         if self.max_file_size > 0 and len(self) > self.max_file_size:
             # The content to attach is to large
             self.logger.error(
-                'Content exceeds allowable maximum memory size '
-                '({}KB): {}'.format(
-                    int(self.max_file_size / 1024), self.url(privacy=True)))
+                "Content exceeds allowable maximum memory size"
+                f" ({int(self.max_file_size / 1024)}KB):"
+                f" {self.url(privacy=True)}"
+            )
 
             # Return False (signifying a failure)
             return False
 
         return True
 
-    def base64(self, encoding='ascii'):
-        """
-        We need to over-ride this since the base64 sub-library seems to close
-        our file descriptor making it no longer referencable.
-        """
+    def base64(self, encoding="ascii"):
+        """We need to over-ride this since the base64 sub-library seems to
+        close our file descriptor making it no longer referencable."""
 
         if not self:
             # We could not access the attachment
             self.logger.error(
-                'Could not access attachment {}.'.format(
-                    self.url(privacy=True)))
+                f"Could not access attachment {self.url(privacy=True)}."
+            )
             raise exception.AppriseFileNotFound("Attachment Missing")
         self._data.seek(0, 0)
 
-        return base64.b64encode(self._data.read()).decode(encoding) \
-            if encoding else base64.b64encode(self._data.read())
+        return (
+            base64.b64encode(self._data.read()).decode(encoding)
+            if encoding
+            else base64.b64encode(self._data.read())
+        )
 
     def invalidate(self):
-        """
-        Removes data
-        """
+        """Removes data."""
         self._data.truncate(0)
         return
 
     def exists(self):
-        """
-        over-ride exists() call
-        """
+        """Over-ride exists() call."""
         size = len(self)
-        return True if self.location != ContentLocation.INACCESSIBLE \
-            and size > 0 and (
-                self.max_file_size <= 0 or
-                (self.max_file_size > 0 and size <= self.max_file_size)) \
-            else False
+        return bool(
+            self.location != ContentLocation.INACCESSIBLE
+            and size > 0
+            and (
+                self.max_file_size <= 0
+                or (self.max_file_size > 0 and size <= self.max_file_size)
+            )
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL so that we can handle all different file paths
-        and return it as our path object
-
-        """
+        """Parses the URL so that we can handle all different file paths and
+        return it as our path object."""
 
         results = AttachBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early; it's not a good URL
             return results
 
-        if 'name' not in results:
+        if "name" not in results:
             # Allow fall-back to be from URL
-            match = re.match(r'memory://(?P<path>[^?]+)(\?.*)?', url, re.I)
+            match = re.match(r"memory://(?P<path>[^?]+)(\?.*)?", url, re.I)
             if match:
                 # Store our filename only (ignore any defined paths)
-                results['name'] = \
-                    os.path.basename(AttachMemory.unquote(match.group('path')))
+                results["name"] = os.path.basename(
+                    AttachMemory.unquote(match.group("path"))
+                )
         return results
 
     @property
     def path(self):
-        """
-        return the filename
-        """
+        """Return the filename."""
         if not self.exists():
             # we could not obtain our path
             return None
@@ -216,15 +207,12 @@ def path(self):
         return self._name
 
     def __len__(self):
-        """
-        Returns the size of he memory attachment
-
-        """
+        """Returns the size of he memory attachment."""
         return self._data.getbuffer().nbytes
 
     def __bool__(self):
-        """
-        Allows the Apprise object to be wrapped in an based 'if statement'.
+        """Allows the Apprise object to be wrapped in an based 'if statement'.
+
         True is returned if our content was downloaded correctly.
         """
 
diff --git a/libs/apprise/cli.py b/libs/apprise/cli.py
index 121fc95f43..dbe11886ca 100644
--- a/libs/apprise/cli.py
+++ b/libs/apprise/cli.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,185 +25,212 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import click
-import textwrap
 import logging
-import platform
-import sys
 import os
-import shutil
+from os.path import exists, isfile
+import platform
 import re
+import shutil
+import sys
+import textwrap
 
-from os.path import isfile
-from os.path import exists
-
-from . import Apprise
-from . import AppriseAsset
-from . import AppriseConfig
-from . import PersistentStore
+import click
 
-from .utils.parse import parse_list
-from .utils.disk import dir_size, bytes_to_str, path_decode
-from .common import NOTIFY_TYPES
-from .common import NOTIFY_FORMATS
-from .common import PERSISTENT_STORE_MODES
-from .common import PersistentStoreState
-from .common import ContentLocation
+from . import (
+    Apprise,
+    AppriseAsset,
+    AppriseConfig,
+    PersistentStore,
+    __copyright__,
+    __license__,
+    __title__,
+    __version__,
+)
+from .common import (
+    NOTIFY_FORMATS,
+    NOTIFY_TYPES,
+    PERSISTENT_STORE_MODES,
+    ContentLocation,
+    NotifyFormat,
+    NotifyType,
+    PersistentStoreMode,
+    PersistentStoreState,
+)
 from .logger import logger
+from .utils.disk import bytes_to_str, dir_size, path_decode
+from .utils.parse import parse_list
 
-from . import __title__
-from . import __version__
-from . import __license__
-from . import __copywrite__
-
-# By default we allow looking 1 level down recursivly in Apprise configuration
+# By default we allow looking 1 level down recursively in Apprise configuration
 # files.
 DEFAULT_RECURSION_DEPTH = 1
 
 # Default number of days to prune persistent storage
-DEFAULT_STORAGE_PRUNE_DAYS = \
-    int(os.environ.get('APPRISE_STORAGE_PRUNE_DAYS', 30))
+DEFAULT_STORAGE_PRUNE_DAYS = int(
+    os.environ.get("APPRISE_STORAGE_PRUNE_DAYS", 30)
+)
 
 # The default URL ID Length
-DEFAULT_STORAGE_UID_LENGTH = \
-    int(os.environ.get('APPRISE_STORAGE_UID_LENGTH', 8))
+DEFAULT_STORAGE_UID_LENGTH = int(
+    os.environ.get("APPRISE_STORAGE_UID_LENGTH", 8)
+)
 
-# Defines the envrionment variable to parse if defined. This is ONLY
+# Defines the environment variable to parse if defined. This is ONLY
 # Referenced if:
 # - No Configuration Files were found/loaded/specified
 # - No URLs were provided directly into the CLI Call
-DEFAULT_ENV_APPRISE_URLS = 'APPRISE_URLS'
+DEFAULT_ENV_APPRISE_URLS = "APPRISE_URLS"
 
-# Defines the over-ride path for the configuration files read
-DEFAULT_ENV_APPRISE_CONFIG_PATH = 'APPRISE_CONFIG_PATH'
+# Defines the override path for the configuration files read
+DEFAULT_ENV_APPRISE_CONFIG_PATH = "APPRISE_CONFIG_PATH"
 
-# Defines the over-ride path for the plugins to load
-DEFAULT_ENV_APPRISE_PLUGIN_PATH = 'APPRISE_PLUGIN_PATH'
+# Defines the override path for the plugins to load
+DEFAULT_ENV_APPRISE_PLUGIN_PATH = "APPRISE_PLUGIN_PATH"
 
-# Defines the over-ride path for the persistent storage
-DEFAULT_ENV_APPRISE_STORAGE_PATH = 'APPRISE_STORAGE_PATH'
+# Defines the override path for the persistent storage
+DEFAULT_ENV_APPRISE_STORAGE_PATH = "APPRISE_STORAGE_PATH"
 
 # Defines our click context settings adding -h to the additional options that
 # can be specified to get the help menu to come up
-CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+CONTEXT_SETTINGS = {"help_option_names": ["-h", "--help"]}
 
 # Define our default configuration we use if nothing is otherwise specified
 DEFAULT_CONFIG_PATHS = (
     # Legacy Path Support
-    '~/.apprise',
-    '~/.apprise.conf',
-    '~/.apprise.yml',
-    '~/.apprise.yaml',
-    '~/.config/apprise',
-    '~/.config/apprise.conf',
-    '~/.config/apprise.yml',
-    '~/.config/apprise.yaml',
-
+    "~/.apprise",
+    "~/.apprise.conf",
+    "~/.apprise.yml",
+    "~/.apprise.yaml",
+    "~/.config/apprise",
+    "~/.config/apprise.conf",
+    "~/.config/apprise.yml",
+    "~/.config/apprise.yaml",
     # Plugin Support Extended Directory Search Paths
-    '~/.apprise/apprise',
-    '~/.apprise/apprise.conf',
-    '~/.apprise/apprise.yml',
-    '~/.apprise/apprise.yaml',
-    '~/.config/apprise/apprise',
-    '~/.config/apprise/apprise.conf',
-    '~/.config/apprise/apprise.yml',
-    '~/.config/apprise/apprise.yaml',
-
+    "~/.apprise/apprise",
+    "~/.apprise/apprise.conf",
+    "~/.apprise/apprise.yml",
+    "~/.apprise/apprise.yaml",
+    "~/.config/apprise/apprise",
+    "~/.config/apprise/apprise.conf",
+    "~/.config/apprise/apprise.yml",
+    "~/.config/apprise/apprise.yaml",
     # Global Configuration File Support
-    '/etc/apprise',
-    '/etc/apprise.yml',
-    '/etc/apprise.yaml',
-    '/etc/apprise/apprise',
-    '/etc/apprise/apprise.conf',
-    '/etc/apprise/apprise.yml',
-    '/etc/apprise/apprise.yaml',
+    "/etc/apprise",
+    "/etc/apprise.yml",
+    "/etc/apprise.yaml",
+    "/etc/apprise/apprise",
+    "/etc/apprise/apprise.conf",
+    "/etc/apprise/apprise.yml",
+    "/etc/apprise/apprise.yaml",
 )
 
 # Define our paths to search for plugins
 DEFAULT_PLUGIN_PATHS = (
-    '~/.apprise/plugins',
-    '~/.config/apprise/plugins',
-
+    "~/.apprise/plugins",
+    "~/.config/apprise/plugins",
     # Global Plugin Support
-    '/var/lib/apprise/plugins',
+    "/var/lib/apprise/plugins",
+)
+
+
+#
+# General Options and Defaults
+#
+DEFAULT_NOTIFY_TYPE = NotifyType.INFO
+
+NOTIFY_TYPE_CHOICES: tuple[NotifyType, ...] = (
+    NotifyType.INFO,
+    NotifyType.SUCCESS,
+    NotifyType.WARNING,
+    NotifyType.FAILURE,
+)
+
+DEFAULT_NOTIFY_FORMAT = NotifyFormat.TEXT
+
+NOTIFY_FORMAT_CHOICES: tuple[NotifyFormat, ...] = (
+    NotifyFormat.TEXT,
+    NotifyFormat.MARKDOWN,
+    NotifyFormat.HTML,
 )
 
 #
 # Persistent Storage
 #
-DEFAULT_STORAGE_PATH = '~/.local/share/apprise/cache'
+DEFAULT_STORAGE_PATH = "~/.local/share/apprise/cache"
+
+# Storage Mode
+DEFAULT_STORAGE_MODE = PersistentStoreMode.AUTO
+
+# Create an ordered list of options (first is default)
+PERSISTENT_STORE_MODE_CHOICES: tuple[PersistentStoreMode, ...] = (
+    PersistentStoreMode.AUTO,
+    PersistentStoreMode.FLUSH,
+    PersistentStoreMode.MEMORY,
+)
 
 # Detect Windows
-if platform.system() == 'Windows':
+if platform.system() == "Windows":
     # Default Config Search Path for Windows Users
     DEFAULT_CONFIG_PATHS = (
-        '%APPDATA%\\Apprise\\apprise',
-        '%APPDATA%\\Apprise\\apprise.conf',
-        '%APPDATA%\\Apprise\\apprise.yml',
-        '%APPDATA%\\Apprise\\apprise.yaml',
-        '%LOCALAPPDATA%\\Apprise\\apprise',
-        '%LOCALAPPDATA%\\Apprise\\apprise.conf',
-        '%LOCALAPPDATA%\\Apprise\\apprise.yml',
-        '%LOCALAPPDATA%\\Apprise\\apprise.yaml',
-
+        "%APPDATA%\\Apprise\\apprise",
+        "%APPDATA%\\Apprise\\apprise.conf",
+        "%APPDATA%\\Apprise\\apprise.yml",
+        "%APPDATA%\\Apprise\\apprise.yaml",
+        "%LOCALAPPDATA%\\Apprise\\apprise",
+        "%LOCALAPPDATA%\\Apprise\\apprise.conf",
+        "%LOCALAPPDATA%\\Apprise\\apprise.yml",
+        "%LOCALAPPDATA%\\Apprise\\apprise.yaml",
         #
         # Global Support
         #
-
         # C:\ProgramData\Apprise
-        '%ALLUSERSPROFILE%\\Apprise\\apprise',
-        '%ALLUSERSPROFILE%\\Apprise\\apprise.conf',
-        '%ALLUSERSPROFILE%\\Apprise\\apprise.yml',
-        '%ALLUSERSPROFILE%\\Apprise\\apprise.yaml',
-
+        "%ALLUSERSPROFILE%\\Apprise\\apprise",
+        "%ALLUSERSPROFILE%\\Apprise\\apprise.conf",
+        "%ALLUSERSPROFILE%\\Apprise\\apprise.yml",
+        "%ALLUSERSPROFILE%\\Apprise\\apprise.yaml",
         # C:\Program Files\Apprise
-        '%PROGRAMFILES%\\Apprise\\apprise',
-        '%PROGRAMFILES%\\Apprise\\apprise.conf',
-        '%PROGRAMFILES%\\Apprise\\apprise.yml',
-        '%PROGRAMFILES%\\Apprise\\apprise.yaml',
-
+        "%PROGRAMFILES%\\Apprise\\apprise",
+        "%PROGRAMFILES%\\Apprise\\apprise.conf",
+        "%PROGRAMFILES%\\Apprise\\apprise.yml",
+        "%PROGRAMFILES%\\Apprise\\apprise.yaml",
         # C:\Program Files\Common Files
-        '%COMMONPROGRAMFILES%\\Apprise\\apprise',
-        '%COMMONPROGRAMFILES%\\Apprise\\apprise.conf',
-        '%COMMONPROGRAMFILES%\\Apprise\\apprise.yml',
-        '%COMMONPROGRAMFILES%\\Apprise\\apprise.yaml',
+        "%COMMONPROGRAMFILES%\\Apprise\\apprise",
+        "%COMMONPROGRAMFILES%\\Apprise\\apprise.conf",
+        "%COMMONPROGRAMFILES%\\Apprise\\apprise.yml",
+        "%COMMONPROGRAMFILES%\\Apprise\\apprise.yaml",
     )
 
     # Default Plugin Search Path for Windows Users
     DEFAULT_PLUGIN_PATHS = (
-        '%APPDATA%\\Apprise\\plugins',
-        '%LOCALAPPDATA%\\Apprise\\plugins',
-
+        "%APPDATA%\\Apprise\\plugins",
+        "%LOCALAPPDATA%\\Apprise\\plugins",
         #
         # Global Support
         #
-
         # C:\ProgramData\Apprise\plugins
-        '%ALLUSERSPROFILE%\\Apprise\\plugins',
+        "%ALLUSERSPROFILE%\\Apprise\\plugins",
         # C:\Program Files\Apprise\plugins
-        '%PROGRAMFILES%\\Apprise\\plugins',
+        "%PROGRAMFILES%\\Apprise\\plugins",
         # C:\Program Files\Common Files
-        '%COMMONPROGRAMFILES%\\Apprise\\plugins',
+        "%COMMONPROGRAMFILES%\\Apprise\\plugins",
     )
 
     #
     # Persistent Storage
     #
-    DEFAULT_STORAGE_PATH = '%APPDATA%/Apprise/cache'
+    DEFAULT_STORAGE_PATH = "%APPDATA%/Apprise/cache"
 
 
 class PersistentStorageMode:
-    """
-    Persistent Storage Modes
-    """
+    """Persistent Storage Modes."""
+
     # List all detected configuration loaded
-    LIST = 'list'
+    LIST = "list"
 
     # Prune persistent storage based on age
-    PRUNE = 'prune'
+    PRUNE = "prune"
 
-    # Reset all (reguardless of age)
-    CLEAR = 'clear'
+    # Reset all (regardless of age)
+    CLEAR = "clear"
 
 
 # Define the types in a list for validation purposes
@@ -214,43 +240,48 @@ class PersistentStorageMode:
     PersistentStorageMode.CLEAR,
 )
 
-if os.environ.get('APPRISE_STORAGE_PATH', '').strip():
-    # Over-ride Default Storage Path
-    DEFAULT_STORAGE_PATH = os.environ.get('APPRISE_STORAGE_PATH')
+if os.environ.get("APPRISE_STORAGE_PATH", "").strip():
+    # Override Default Storage Path
+    DEFAULT_STORAGE_PATH = os.environ.get("APPRISE_STORAGE_PATH")
 
 
 def print_version_msg():
-    """
-    Prints version message when -V or --version is specified.
-
-    """
-    result = list()
-    result.append('{} v{}'.format(__title__, __version__))
-    result.append(__copywrite__)
-    result.append(
-        'This code is licensed under the {} License.'.format(__license__))
-    click.echo('\n'.join(result))
+    """Prints version message when -V or --version is specified."""
+    result = []
+    result.append(f"{__title__} v{__version__}")
+    result.append(__copyright__)
+    result.append(f"This code is licensed under the {__license__} License.")
+    click.echo("\n".join(result))
 
 
 class CustomHelpCommand(click.Command):
     def format_help(self, ctx, formatter):
-        formatter.write_text('Usage:')
+        formatter.write_text("Usage:")
         formatter.write_text(
-            '   apprise [OPTIONS] [APPRISE_URL [APPRISE_URL2 [APPRISE_URL3]]]')
+            "   apprise [OPTIONS] [APPRISE_URL [APPRISE_URL2 [APPRISE_URL3]]]"
+        )
         formatter.write_text(
-            '   apprise storage [OPTIONS] [ACTION] [UID1 [UID2 [UID3]]]')
+            "   apprise storage [OPTIONS] [ACTION] [UID1 [UID2 [UID3]]]"
+        )
 
         # Custom help message
-        formatter.write_text('')
+        formatter.write_text("")
         content = (
-            'Send a notification to all of the specified servers '
-            'identified by their URLs',
-            'the content provided within the title, body and '
-            'notification-type.',
-            '',
-            'For a list of all of the supported services and information on '
-            'how to use ',
-            'them, check out at https://github.com/caronc/apprise')
+            (
+                "Send a notification to all of the specified servers "
+                "identified by their URLs"
+            ),
+            (
+                "the content provided within the title, body and "
+                "notification-type."
+            ),
+            "",
+            (
+                "For a list of all of the supported services and information"
+                " on how to use "
+            ),
+            "them, check out https://github.com/caronc/apprise",
+        )
 
         for line in content:
             formatter.write_text(line)
@@ -260,23 +291,33 @@ def format_help(self, ctx, formatter):
         self.format_epilog(ctx, formatter)
 
         # Custom 'Actions:' section after the 'Options:'
-        formatter.write_text('')
-        formatter.write_text('Actions:')
+        formatter.write_text("")
+        formatter.write_text("Actions:")
 
         actions = [(
-            'storage', 'Access the persistent storage disk administration',
-            [(
-                'list',
-                'List all URL IDs associated with detected URL(s). '
-                'This is also the default action ran if nothing is provided',
-            ), (
-                'prune',
-                'Eliminates stale entries found based on '
-                '--storage-prune-days (-SPD)',
-            ), (
-                'clean',
-                'Removes any persistent data created by Apprise',
-            )],
+            "storage",
+            "Access the persistent storage disk administration",
+            [
+                (
+                    "list",
+                    (
+                        "List all URL IDs associated with detected URL(s)."
+                        " This is also the default action run if nothing is"
+                        " provided"
+                    ),
+                ),
+                (
+                    "prune",
+                    (
+                        "Eliminates stale entries found based on "
+                        "--storage-prune-days (-SPD)"
+                    ),
+                ),
+                (
+                    "clean",
+                    "Removes any persistent data created by Apprise",
+                ),
+            ],
         )]
 
         #
@@ -290,24 +331,29 @@ def format_help(self, ctx, formatter):
         # label padding (for alignment)
         action_label_width = 10
 
-        space = ' '
-        space_re = re.compile(r'\r*\n')
+        space = " "
+        space_re = re.compile(r"\r*\n")
         cols = 80
         indent = 10
 
         # Format each action and its subactions
         for action, description, sub_actions in actions:
             # Our action indent
-            ai = ' ' * action_indent
+            ai = " " * action_indent
             # Format the main action description
-            formatted_description = space_re.split(textwrap.fill(
-                description, width=(cols - indent - action_indent),
-                initial_indent=space * indent,
-                subsequent_indent=space * indent))
+            formatted_description = space_re.split(
+                textwrap.fill(
+                    description,
+                    width=(cols - indent - action_indent),
+                    initial_indent=space * indent,
+                    subsequent_indent=space * indent,
+                )
+            )
             for no, line in enumerate(formatted_description):
                 if not no:
                     formatter.write_text(
-                        f'{ai}{action:<{action_label_width}}{line}')
+                        f"{ai}{action:<{action_label_width}}{line}"
+                    )
 
                 else:  # pragma: no cover
                     # Note: no branch is set intentionally since this is not
@@ -316,129 +362,279 @@ def format_help(self, ctx, formatter):
                     #       know it works because we repeat this process with
                     #       our sub-options below
                     formatter.write_text(
-                        f'{ai}{space:<{action_label_width}}{line}')
+                        f"{ai}{space:<{action_label_width}}{line}"
+                    )
 
             # Format each subaction
-            ai = ' ' * (action_indent * 2)
+            ai = " " * (action_indent * 2)
             for action, description in sub_actions:
-                formatted_description = space_re.split(textwrap.fill(
-                    description, width=(cols - indent - (action_indent * 3)),
-                    initial_indent=space * (indent - action_indent),
-                    subsequent_indent=space * (indent - action_indent)))
+                formatted_description = space_re.split(
+                    textwrap.fill(
+                        description,
+                        width=(cols - indent - (action_indent * 3)),
+                        initial_indent=space * (indent - action_indent),
+                        subsequent_indent=space * (indent - action_indent),
+                    )
+                )
 
                 for no, line in enumerate(formatted_description):
                     if not no:
                         formatter.write_text(
-                            f'{ai}{action:<{action_label_width}}{line}')
+                            f"{ai}{action:<{action_label_width}}{line}"
+                        )
                     else:
                         formatter.write_text(
-                            f'{ai}{space:<{action_label_width}}{line}')
+                            f"{ai}{space:<{action_label_width}}{line}"
+                        )
 
         # Include any epilog or additional text
         self.format_epilog(ctx, formatter)
 
 
 @click.command(context_settings=CONTEXT_SETTINGS, cls=CustomHelpCommand)
-@click.option('--body', '-b', default=None, type=str,
-              help='Specify the message body. If no body is specified then '
-              'content is read from <stdin>.')
-@click.option('--title', '-t', default=None, type=str,
-              help='Specify the message title. This field is complete '
-              'optional.')
-@click.option('--plugin-path', '-P', default=None, type=str, multiple=True,
-              metavar='PATH',
-              help='Specify one or more plugin paths to scan.')
-@click.option('--storage-path', '-S', default=DEFAULT_STORAGE_PATH, type=str,
-              metavar='PATH',
-              help='Specify the path to the persistent storage location '
-              '(default={}).'.format(DEFAULT_STORAGE_PATH))
-@click.option('--storage-prune-days', '-SPD',
-              default=DEFAULT_STORAGE_PRUNE_DAYS, type=int,
-              help='Define the number of days the storage prune '
-              'should run using. Setting this to zero (0) will eliminate '
-              'all accumulated content. By default this value is {} days.'
-              .format(DEFAULT_STORAGE_PRUNE_DAYS))
-@click.option('--storage-uid-length', '-SUL',
-              default=DEFAULT_STORAGE_UID_LENGTH, type=int,
-              help='Define the number of unique characters to store persistent'
-              'cache in. By default this value is {} characters.'
-              .format(DEFAULT_STORAGE_UID_LENGTH))
-@click.option('--storage-mode', '-SM', default=PERSISTENT_STORE_MODES[0],
-              type=str, metavar='MODE',
-              help='Specify the persistent storage operational mode '
-              '(default={}). Possible values are "{}", and "{}".'.format(
-                  PERSISTENT_STORE_MODES[0], '", "'.join(
-                      PERSISTENT_STORE_MODES[:-1]),
-                  PERSISTENT_STORE_MODES[-1]))
-@click.option('--config', '-c', default=None, type=str, multiple=True,
-              metavar='CONFIG_URL',
-              help='Specify one or more configuration locations.')
-@click.option('--attach', '-a', default=None, type=str, multiple=True,
-              metavar='ATTACHMENT_URL',
-              help='Specify one or more attachment.')
-@click.option('--notification-type', '-n', default=NOTIFY_TYPES[0], type=str,
-              metavar='TYPE',
-              help='Specify the message type (default={}). '
-              'Possible values are "{}", and "{}".'.format(
-                  NOTIFY_TYPES[0], '", "'.join(NOTIFY_TYPES[:-1]),
-                  NOTIFY_TYPES[-1]))
-@click.option('--input-format', '-i', default=NOTIFY_FORMATS[0], type=str,
-              metavar='FORMAT',
-              help='Specify the message input format (default={}). '
-              'Possible values are "{}", and "{}".'.format(
-                  NOTIFY_FORMATS[0], '", "'.join(NOTIFY_FORMATS[:-1]),
-                  NOTIFY_FORMATS[-1]))
-@click.option('--theme', '-T', default='default', type=str, metavar='THEME',
-              help='Specify the default theme.')
-@click.option('--tag', '-g', default=None, type=str, multiple=True,
-              metavar='TAG', help='Specify one or more tags to filter '
-              'which services to notify. Use multiple --tag (-g) entries to '
-              '"OR" the tags together and comma separated to "AND" them. '
-              'If no tags are specified then all services are notified.')
-@click.option('--disable-async', '-Da', is_flag=True,
-              help='Send all notifications sequentially')
-@click.option('--dry-run', '-d', is_flag=True,
-              help='Perform a trial run but only prints the notification '
-              'services to-be triggered to stdout. Notifications are never '
-              'sent using this mode.')
-@click.option('--details', '-l', is_flag=True,
-              help='Prints details about the current services supported by '
-              'Apprise.')
-@click.option('--recursion-depth', '-R', default=DEFAULT_RECURSION_DEPTH,
-              type=int,
-              help='The number of recursive import entries that can be '
-              'loaded from within Apprise configuration. By default '
-              'this is set to {}.'.format(DEFAULT_RECURSION_DEPTH))
-@click.option('--verbose', '-v', count=True,
-              help='Makes the operation more talkative. Use multiple v to '
-              'increase the verbosity. I.e.: -vvvv')
-@click.option('--interpret-escapes', '-e', is_flag=True,
-              help='Enable interpretation of backslash escapes')
-@click.option('--interpret-emojis', '-j', is_flag=True,
-              help='Enable interpretation of :emoji: definitions')
-@click.option('--debug', '-D', is_flag=True, help='Debug mode')
-@click.option('--version', '-V', is_flag=True,
-              help='Display the apprise version and exit.')
-@click.argument('urls', nargs=-1,
-                metavar='SERVER_URL [SERVER_URL2 [SERVER_URL3]]',)
+@click.option(
+    "--body",
+    "-b",
+    default=None,
+    type=str,
+    help=(
+        "Specify the message body. If no body is specified then "
+        "content is read from <stdin>."
+    ),
+)
+@click.option(
+    "--title",
+    "-t",
+    default=None,
+    type=str,
+    help="Specify the message title. This field is completely optional.",
+)
+@click.option(
+    "--plugin-path",
+    "-P",
+    default=None,
+    type=str,
+    multiple=True,
+    metavar="PATH",
+    help="Specify one or more plugin paths to scan.",
+)
+@click.option(
+    "--storage-path",
+    "-S",
+    default=DEFAULT_STORAGE_PATH,
+    type=str,
+    metavar="PATH",
+    help=(
+        "Specify the path to the persistent storage location "
+        f"(default={DEFAULT_STORAGE_PATH})."
+    ),
+)
+@click.option(
+    "--storage-prune-days",
+    "-SPD",
+    default=DEFAULT_STORAGE_PRUNE_DAYS,
+    type=int,
+    help=(
+        "Define the number of days the storage prune should run using."
+        " Setting this to zero (0) will eliminate all accumulated content. By"
+        f" default this value is {DEFAULT_STORAGE_PRUNE_DAYS} days."
+    ),
+)
+@click.option(
+    "--storage-uid-length",
+    "-SUL",
+    default=DEFAULT_STORAGE_UID_LENGTH,
+    type=int,
+    help=(
+        "Define the number of unique characters to store persistent cache in."
+        f" By default this value is {DEFAULT_STORAGE_UID_LENGTH} characters."
+    ),
+)
+@click.option(
+    "--storage-mode",
+    "-SM",
+    default=DEFAULT_STORAGE_MODE.value,
+    type=str,
+    metavar="MODE",
+    help=(
+        "Specify the persistent storage operational mode "
+        f'(default={DEFAULT_STORAGE_MODE.value}). '
+        'Possible values are: "{}".'.format(
+            '", "'.join(mode.value for mode in PERSISTENT_STORE_MODE_CHOICES)
+        )
+    ),
+)
+@click.option(
+    "--config",
+    "-c",
+    default=None,
+    type=str,
+    multiple=True,
+    metavar="CONFIG_URL",
+    help="Specify one or more configuration locations.",
+)
+@click.option(
+    "--attach",
+    "-a",
+    default=None,
+    type=str,
+    multiple=True,
+    metavar="ATTACHMENT_URL",
+    help="Specify one or more attachments.",
+)
+@click.option(
+    "--notification-type",
+    "-n",
+    default=DEFAULT_NOTIFY_TYPE.value,
+    type=str,
+    metavar="TYPE",
+    help=(
+        f"Specify the message type (default={DEFAULT_NOTIFY_TYPE.value}). "
+        'Possible values are: "{}".'.format(
+            '", "'.join(nt.value for nt in NOTIFY_TYPE_CHOICES)
+        )
+    ),
+)
+@click.option(
+    "--input-format",
+    "-i",
+    default=DEFAULT_NOTIFY_FORMAT.value,
+    type=str,
+    metavar="FORMAT",
+    help=(
+        f"Specify the message input format "
+        f"(default={DEFAULT_NOTIFY_FORMAT.value}). "
+        'Possible values are: "{}".'.format(
+            '", "'.join(fmt.value for fmt in NOTIFY_FORMAT_CHOICES)
+        )
+    ),
+)
+@click.option(
+    "--theme",
+    "-T",
+    default="default",
+    type=str,
+    metavar="THEME",
+    help="Specify the default theme.",
+)
+@click.option(
+    "--tag",
+    "-g",
+    default=None,
+    type=str,
+    multiple=True,
+    metavar="TAG",
+    help=(
+        "Specify one or more tags to filter which services to notify. Use "
+        "multiple --tag (-g) entries to match ANY tag. Use comma separators "
+        "to require ALL tags (strict match). Omit to notify untagged services "
+        'only, or use "all" to notify everything.'
+    ),
+)
+@click.option(
+    "--disable-async",
+    "-Da",
+    is_flag=True,
+    help="Send all notifications sequentially",
+)
+@click.option(
+    "--dry-run",
+    "-d",
+    is_flag=True,
+    help=(
+        "Perform a trial run but only prints the notification "
+        "services to-be triggered to stdout. Notifications are never "
+        "sent using this mode."
+    ),
+)
+@click.option(
+    "--details",
+    "-l",
+    is_flag=True,
+    help="Prints details about the current services supported by Apprise.",
+)
+@click.option(
+    "--recursion-depth",
+    "-R",
+    default=DEFAULT_RECURSION_DEPTH,
+    type=int,
+    help=(
+        "The number of recursive import entries that can be "
+        "loaded from within Apprise configuration. By default "
+        f"this is set to {DEFAULT_RECURSION_DEPTH}."
+    ),
+)
+@click.option(
+    "--verbose",
+    "-v",
+    count=True,
+    help=(
+        "Makes the operation more talkative. Use multiple v to "
+        "increase the verbosity. I.e.: -vvvv"
+    ),
+)
+@click.option(
+    "--interpret-escapes",
+    "-e",
+    is_flag=True,
+    help="Enable interpretation of backslash escapes",
+)
+@click.option(
+    "--interpret-emojis",
+    "-j",
+    is_flag=True,
+    help="Enable interpretation of :emoji: definitions",
+)
+@click.option("--debug", "-D", is_flag=True, help="Debug mode")
+@click.option(
+    "--version",
+    "-V",
+    is_flag=True,
+    help="Display the apprise version and exit.",
+)
+@click.argument(
+    "urls",
+    nargs=-1,
+    metavar="SERVER_URL [SERVER_URL2 [SERVER_URL3]]",
+)
 @click.pass_context
-def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
-         input_format, dry_run, recursion_depth, verbose, disable_async,
-         details, interpret_escapes, interpret_emojis, plugin_path,
-         storage_path, storage_mode, storage_prune_days, storage_uid_length,
-         debug, version):
-    """
-    Send a notification to all of the specified servers identified by their
+def main(
+    ctx,
+    body,
+    title,
+    config,
+    attach,
+    urls,
+    notification_type,
+    theme,
+    tag,
+    input_format,
+    dry_run,
+    recursion_depth,
+    verbose,
+    disable_async,
+    details,
+    interpret_escapes,
+    interpret_emojis,
+    plugin_path,
+    storage_path,
+    storage_mode,
+    storage_prune_days,
+    storage_uid_length,
+    debug,
+    version,
+):
+    """Send a notification to all of the specified servers identified by their
     URLs the content provided within the title, body and notification-type.
 
-    For a list of all of the supported services and information on how to
-    use them, check out at https://github.com/caronc/apprise
+    For a list of all of the supported services and information on how to use
+    them, check out https://github.com/caronc/apprise
     """
     # Note: Click ignores the return values of functions it wraps, If you
     #       want to return a specific error code, you must call ctx.exit()
     #       as you will see below.
 
-    debug = True if debug else False
+    debug = bool(debug)
     if debug:
         # Verbosity must be a minimum of 3
         verbose = 3 if verbose < 3 else verbose
@@ -467,12 +663,12 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
         logger.setLevel(logging.ERROR)
 
     # Format our logger
-    formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
+    formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
     ch.setFormatter(formatter)
     logger.addHandler(ch)
 
     # Update our asyncio logger
-    asyncio_logger = logging.getLogger('asyncio')
+    asyncio_logger = logging.getLogger("asyncio")
     for handler in logger.handlers:
         asyncio_logger.addHandler(handler)
     asyncio_logger.setLevel(logger.level)
@@ -485,8 +681,9 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
     notification_type = notification_type.strip().lower()
     if notification_type not in NOTIFY_TYPES:
         click.echo(
-            'The --notification-type (-n) value of {} is not supported.'
-            .format(notification_type))
+            f"The --notification-type (-n) value of {notification_type} is not"
+            " supported."
+        )
         click.echo("Try 'apprise --help' for more information.")
         # 2 is the same exit code returned by Click if there is a parameter
         # issue.  For consistency, we also return a 2
@@ -495,8 +692,9 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
     input_format = input_format.strip().lower()
     if input_format not in NOTIFY_FORMATS:
         click.echo(
-            'The --input-format (-i) value of {} is not supported.'
-            .format(input_format))
+            f"The --input-format (-i) value of {input_format} is not"
+            " supported."
+        )
         click.echo("Try 'apprise --help' for more information.")
         # 2 is the same exit code returned by Click if there is a parameter
         # issue.  For consistency, we also return a 2
@@ -505,50 +703,56 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
     storage_mode = storage_mode.strip().lower()
     if storage_mode not in PERSISTENT_STORE_MODES:
         click.echo(
-            'The --storage-mode (-SM) value of {} is not supported.'
-            .format(storage_mode))
+            f"The --storage-mode (-SM) value of {storage_mode} is not"
+            " supported."
+        )
         click.echo("Try 'apprise --help' for more information.")
         # 2 is the same exit code returned by Click if there is a parameter
         # issue.  For consistency, we also return a 2
         ctx.exit(2)
 
     #
-    # Apply Environment Over-rides if defined
+    # Apply Environment Overrides if defined
     #
-    _config_paths = DEFAULT_CONFIG_PATHS
-    if 'APPRISE_CONFIG' in os.environ:
+    config_paths = DEFAULT_CONFIG_PATHS
+    if "APPRISE_CONFIG" in os.environ:
         # Deprecate (this was from previous versions of Apprise <= 1.9.1)
         logger.deprecate(
-            'APPRISE_CONFIG environment variable has been changed to '
-            f'{DEFAULT_ENV_APPRISE_CONFIG_PATH}')
+            "APPRISE_CONFIG environment variable has been changed to "
+            f"{DEFAULT_ENV_APPRISE_CONFIG_PATH}"
+        )
         logger.debug(
-            'Loading provided APPRISE_CONFIG (deprecated) environment '
-            'variable')
-        _config_paths = (os.environ.get('APPRISE_CONFIG', '').strip(), )
+            "Loading provided APPRISE_CONFIG (deprecated) environment variable"
+        )
+        config_paths = (os.environ.get("APPRISE_CONFIG", "").strip(),)
 
     elif DEFAULT_ENV_APPRISE_CONFIG_PATH in os.environ:
         logger.debug(
-            f'Loading provided {DEFAULT_ENV_APPRISE_CONFIG_PATH} '
-            'environment variable')
-        _config_paths = re.split(
-            r'[\r\n;]+', os.environ.get(
-                DEFAULT_ENV_APPRISE_CONFIG_PATH).strip())
-
-    _plugin_paths = DEFAULT_PLUGIN_PATHS
+            f"Loading provided {DEFAULT_ENV_APPRISE_CONFIG_PATH} "
+            "environment variable"
+        )
+        config_paths = re.split(
+            r"[\r\n;]+",
+            os.environ.get(DEFAULT_ENV_APPRISE_CONFIG_PATH).strip(),
+        )
+
+    plugin_paths_ = DEFAULT_PLUGIN_PATHS
     if DEFAULT_ENV_APPRISE_PLUGIN_PATH in os.environ:
         logger.debug(
-            f'Loading provided {DEFAULT_ENV_APPRISE_PLUGIN_PATH} environment '
-            'variable')
-        _plugin_paths = re.split(
-            r'[\r\n;]+', os.environ.get(
-                DEFAULT_ENV_APPRISE_PLUGIN_PATH).strip())
+            f"Loading provided {DEFAULT_ENV_APPRISE_PLUGIN_PATH} environment "
+            "variable"
+        )
+        plugin_paths_ = re.split(
+            r"[\r\n;]+",
+            os.environ.get(DEFAULT_ENV_APPRISE_PLUGIN_PATH).strip(),
+        )
 
     if DEFAULT_ENV_APPRISE_STORAGE_PATH in os.environ:
         logger.debug(
-            f'Loading provided {DEFAULT_ENV_APPRISE_STORAGE_PATH} environment '
-            'variable')
-        storage_path = \
-            os.environ.get(DEFAULT_ENV_APPRISE_STORAGE_PATH).strip()
+            f"Loading provided {DEFAULT_ENV_APPRISE_STORAGE_PATH} environment "
+            "variable"
+        )
+        storage_path = os.environ.get(DEFAULT_ENV_APPRISE_STORAGE_PATH).strip()
 
     #
     # Continue with initialization process
@@ -556,14 +760,17 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
 
     # Prepare a default set of plugin paths to scan; anything specified
     # on the CLI always trumps
-    plugin_paths = \
-        [path for path in _plugin_paths if exists(path_decode(path))] \
-        if not plugin_path else plugin_path
+    plugin_paths = (
+        plugin_path
+        if plugin_path
+        else [path for path in plugin_paths_ if exists(path_decode(path))]
+    )
 
     if storage_uid_length < 2:
         click.echo(
-            'The --storage-uid-length (-SUL) value can not be lower '
-            'then two (2).')
+            "The --storage-uid-length (-SUL) value can not be lower "
+            "than two (2)."
+        )
         click.echo("Try 'apprise --help' for more information.")
 
         # 2 is the same exit code returned by Click if there is a
@@ -574,40 +781,32 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
     asset = AppriseAsset(
         # Our body format
         body_format=input_format,
-
         # Interpret Escapes
         interpret_escapes=interpret_escapes,
-
         # Interpret Emojis
         interpret_emojis=None if not interpret_emojis else True,
-
         # Set the theme
         theme=theme,
-
         # Async mode allows a user to send all of their notifications
         # asynchronously. This was made an option incase there are problems
         # in the future where it is better that everything runs sequentially/
         # synchronously instead.
         async_mode=disable_async is not True,
-
         # Load our plugins
         plugin_paths=plugin_paths,
-
         # Load our persistent storage path
         storage_path=path_decode(storage_path),
-
         # Our storage URL ID Length
         storage_idlen=storage_uid_length,
-
         # Define if we flush to disk as soon as possible or not when required
-        storage_mode=storage_mode
+        storage_mode=storage_mode,
     )
 
     # Create our Apprise object
     a = Apprise(asset=asset, debug=debug, location=ContentLocation.LOCAL)
 
     # Track if we are performing a storage action
-    storage_action = True if urls and 'storage'.startswith(urls[0]) else False
+    storage_action = bool(urls and "storage".startswith(urls[0]))
 
     if details:
         # Print details and exit
@@ -615,74 +814,90 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
 
         # Sort our results:
         plugins = sorted(
-            results['schemas'], key=lambda i: str(i['service_name']))
+            results["schemas"], key=lambda i: str(i["service_name"])
+        )
         for entry in plugins:
-            protocols = [] if not entry['protocols'] else \
-                [p for p in entry['protocols']
-                 if isinstance(p, str)]
+            protocols = (
+                []
+                if not entry["protocols"]
+                else [p for p in entry["protocols"] if isinstance(p, str)]
+            )
             protocols.extend(
-                [] if not entry['secure_protocols'] else
-                [p for p in entry['secure_protocols']
-                 if isinstance(p, str)])
+                []
+                if not entry["secure_protocols"]
+                else [
+                    p for p in entry["secure_protocols"] if isinstance(p, str)
+                ]
+            )
 
             if len(protocols) == 1:
                 # Simplify view by swapping {schema} with the single
                 # protocol value
 
                 # Convert tuple to list
-                entry['details']['templates'] = \
-                    list(entry['details']['templates'])
-
-                for x in range(len(entry['details']['templates'])):
-                    entry['details']['templates'][x] = \
-                        re.sub(
-                            r'^[^}]+}://',
-                            '{}://'.format(protocols[0]),
-                            entry['details']['templates'][x])
-
-            fg = "green" if entry['enabled'] else "red"
-            if entry['category'] == 'custom':
+                entry["details"]["templates"] = list(
+                    entry["details"]["templates"]
+                )
+
+                for x in range(len(entry["details"]["templates"])):
+                    entry["details"]["templates"][x] = re.sub(
+                        r"^[^}]+}://",
+                        f"{protocols[0]}://",
+                        entry["details"]["templates"][x],
+                    )
+
+            fg = "green" if entry["enabled"] else "red"
+            if entry["category"] == "custom":
                 # Identify these differently
                 fg = "cyan"
                 # Flip the enable switch so it forces the requirements
                 # to be displayed
-                entry['enabled'] = False
+                entry["enabled"] = False
 
-            click.echo(click.style(
-                '{} {:<30} '.format(
-                    '+' if entry['enabled'] else '-',
-                    str(entry['service_name'])), fg=fg, bold=True),
-                nl=(not entry['enabled'] or len(protocols) == 1))
+            click.echo(
+                click.style(
+                    "{} {:<30} ".format(
+                        "+" if entry["enabled"] else "-",
+                        str(entry["service_name"]),
+                    ),
+                    fg=fg,
+                    bold=True,
+                ),
+                nl=(not entry["enabled"] or len(protocols) == 1),
+            )
 
-            if not entry['enabled']:
-                if entry['requirements']['details']:
-                    click.echo(
-                        '   ' + str(entry['requirements']['details']))
+            if not entry["enabled"]:
+                if entry["requirements"]["details"]:
+                    click.echo("   " + str(entry["requirements"]["details"]))
 
-                if entry['requirements']['packages_required']:
-                    click.echo('   Python Packages Required:')
-                    for req in entry['requirements']['packages_required']:
-                        click.echo('     - ' + req)
+                if entry["requirements"]["packages_required"]:
+                    click.echo("   Python Packages Required:")
+                    for req in entry["requirements"]["packages_required"]:
+                        click.echo("     - " + req)
 
-                if entry['requirements']['packages_recommended']:
-                    click.echo('   Python Packages Recommended:')
-                    for req in entry['requirements']['packages_recommended']:
-                        click.echo('     - ' + req)
+                if entry["requirements"]["packages_recommended"]:
+                    click.echo("   Python Packages Recommended:")
+                    for req in entry["requirements"]["packages_recommended"]:
+                        click.echo("     - " + req)
 
                 # new line padding between entries
-                if entry['category'] == 'native':
+                if entry["category"] == "native":
                     click.echo()
                     continue
 
             if len(protocols) > 1:
-                click.echo('| Schema(s): {}'.format(
-                    ', '.join(protocols),
-                ))
+                click.echo(
+                    "| Schema(s): {}".format(
+                        ", ".join(protocols),
+                    )
+                )
 
-            prefix = '   - '
-            click.echo('{}{}'.format(
-                prefix,
-                '\n{}'.format(prefix).join(entry['details']['templates'])))
+            prefix = "   - "
+            click.echo(
+                "{}{}".format(
+                    prefix, f"\n{prefix}".join(entry["details"]["templates"])
+                )
+            )
 
             # new line padding between entries
             click.echo()
@@ -700,7 +915,8 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
         if tag:
             # Ignore any tags specified
             logger.warning(
-                '--tag (-g) entries are ignored when using specified URLs')
+                "--tag (-g) entries are ignored when using specified URLs"
+            )
             tag = None
 
         # Load our URLs (if any defined)
@@ -710,23 +926,26 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
         if config:
             # Provide a warning to the end user if they specified both
             logger.warning(
-                'You defined both URLs and a --config (-c) entry; '
-                'Only the URLs will be referenced.')
+                "You defined both URLs and a --config (-c) entry; "
+                "Only the URLs will be referenced."
+            )
 
     elif config:
         # We load our configuration file(s) now only if no URLs were specified
         # Specified config entries trump all
-        a.add(AppriseConfig(
-            paths=config, asset=asset, recursion=recursion_depth))
+        a.add(
+            AppriseConfig(paths=config, asset=asset, recursion=recursion_depth)
+        )
 
-    elif os.environ.get(DEFAULT_ENV_APPRISE_URLS, '').strip():
+    elif os.environ.get(DEFAULT_ENV_APPRISE_URLS, "").strip():
         logger.debug(
-            f'Loading provided {DEFAULT_ENV_APPRISE_URLS} environment '
-            'variable')
+            f"Loading provided {DEFAULT_ENV_APPRISE_URLS} environment variable"
+        )
         if tag:
             # Ignore any tags specified
             logger.warning(
-                '--tag (-g) entries are ignored when using specified URLs')
+                "--tag (-g) entries are ignored when using specified URLs"
+            )
             tag = None
 
         # Attempt to use our APPRISE_URLS environment variable (if populated)
@@ -734,14 +953,19 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
 
     else:
         # Load default configuration
-        a.add(AppriseConfig(
-            paths=[f for f in _config_paths if isfile(path_decode(f))],
-            asset=asset, recursion=recursion_depth))
+        a.add(
+            AppriseConfig(
+                paths=[f for f in config_paths if isfile(path_decode(f))],
+                asset=asset,
+                recursion=recursion_depth,
+            )
+        )
 
     if not dry_run and not (a or storage_action):
         click.echo(
-            'You must specify at least one server URL or populated '
-            'configuration file.')
+            "You must specify at least one server URL or populated "
+            "configuration file."
+        )
         click.echo("Try 'apprise --help' for more information.")
         ctx.exit(1)
 
@@ -758,8 +982,9 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
         #
         if storage_prune_days < 0:
             click.echo(
-                'The --storage-prune-days (-SPD) value can not be lower '
-                'then zero (0).')
+                "The --storage-prune-days (-SPD) value can not be lower "
+                "than zero (0)."
+            )
             click.echo("Try 'apprise --help' for more information.")
 
             # 2 is the same exit code returned by Click if there is a
@@ -776,86 +1001,108 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
 
         action = PERSISTENT_STORAGE_MODES[0]
         if filter_uids:
-            _action = next(  # pragma: no branch
-                (a for a in PERSISTENT_STORAGE_MODES
-                 if a.startswith(filter_uids[0])), None)
+            action_ = next(  # pragma: no branch
+                (
+                    a
+                    for a in PERSISTENT_STORAGE_MODES
+                    if a.startswith(filter_uids[0])
+                ),
+                None,
+            )
 
-            if _action:
+            if action_:
                 # pop 'action' off the head of our list
                 filter_uids = filter_uids[1:]
-                action = _action
+                action = action_
 
         # Get our detected URL IDs
         uids = {}
-        for plugin in (a if not tags else a.find(tag=tags)):
-            _id = plugin.url_id()
-            if not _id:
+        for plugin in a if not tags else a.find(tag=tags):
+            id_ = plugin.url_id()
+            if not id_:
                 continue
 
             if filter_uids and next(
-                    (False for n in filter_uids if _id.startswith(n)), True):
+                (False for n in filter_uids if id_.startswith(n)), True
+            ):
                 continue
 
-            if _id not in uids:
-                uids[_id] = {
-                    'plugins': [plugin],
-                    'state': PersistentStoreState.UNUSED,
-                    'size': 0,
+            if id_ not in uids:
+                uids[id_] = {
+                    "plugins": [plugin],
+                    "state": PersistentStoreState.UNUSED.value,
+                    "size": 0,
                 }
 
             else:
-                # It's possible to have more then one URL point to the same
-                # location (thus match against the same url id more then once
-                uids[_id]['plugins'].append(plugin)
+                # It's possible to have more than one URL point to the same
+                # location (thus match against the same url id more than once
+                uids[id_]["plugins"].append(plugin)
 
         if action == PersistentStorageMode.LIST:
             detected_uid = PersistentStore.disk_scan(
                 # Use our asset path as it has already been properly parsed
                 path=asset.storage_path,
-
                 # Provide filter if specified
                 namespace=filter_uids,
             )
-            for _id in detected_uid:
-                size, _ = dir_size(os.path.join(asset.storage_path, _id))
-                if _id in uids:
-                    uids[_id]['state'] = PersistentStoreState.ACTIVE
-                    uids[_id]['size'] = size
+            for id_ in detected_uid:
+                size, _ = dir_size(os.path.join(asset.storage_path, id_))
+                if id_ in uids:
+                    uids[id_]["state"] = PersistentStoreState.ACTIVE.value
+                    uids[id_]["size"] = size
 
                 elif not tags:
-                    uids[_id] = {
-                        'plugins': [],
+                    uids[id_] = {
+                        "plugins": [],
                         # No cross reference (wasted space?)
-                        'state': PersistentStoreState.STALE,
+                        "state": PersistentStoreState.STALE.value,
                         # Acquire disk space
-                        'size': size,
+                        "size": size,
                     }
 
             for idx, (uid, meta) in enumerate(uids.items()):
-                fg = "green" \
-                    if meta['state'] == PersistentStoreState.ACTIVE else (
+                fg = (
+                    "green"
+                    if meta["state"] == PersistentStoreState.ACTIVE.value
+                    else (
                         "red"
-                        if meta['state'] == PersistentStoreState.STALE else
-                        "white")
+                        if meta["state"] == PersistentStoreState.STALE.value
+                        else "white"
+                    )
+                )
 
                 if idx > 0:
                     # New line
                     click.echo()
-                click.echo("{: 4d}. ".format(idx + 1), nl=False)
-                click.echo(click.style("{:<52} {:<8} {}".format(
-                    uid, bytes_to_str(meta['size']), meta['state']),
-                    fg=fg, bold=True))
-
-                for entry in meta['plugins']:
+                click.echo(f"{idx + 1: 4d}. ", nl=False)
+                click.echo(
+                    click.style(
+                        "{:<52} {:<8} {}".format(
+                            uid, bytes_to_str(meta["size"]), meta["state"]
+                        ),
+                        fg=fg,
+                        bold=True,
+                    )
+                )
+
+                for entry in meta["plugins"]:
                     url = entry.url(privacy=True)
-                    click.echo("{:>7} {}".format(
-                        '-',
-                        url if len(url) <= (columns - 8) else '{}...'.format(
-                            url[:columns - 11])))
+                    click.echo(
+                        "{:>7} {}".format(
+                            "-",
+                            (
+                                url
+                                if len(url) <= (columns - 8)
+                                else f"{url[:columns - 11]}..."
+                            ),
+                        )
+                    )
 
                     if entry.tags:
-                        click.echo("{:>10}: {}".format(
-                            'tags', ', '.join(entry.tags)))
+                        click.echo(
+                            "{:>10}: {}".format("tags", ", ".join(entry.tags))
+                        )
 
         else:  # PersistentStorageMode.PRUNE or PersistentStorageMode.CLEAR
             if action == PersistentStorageMode.CLEAR:
@@ -866,10 +1113,11 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
                 # Use our asset path as it has already been properly parsed
                 path=asset.storage_path,
                 # Provide our namespaces if they exist
-                namespace=None if not filter_uids else filter_uids,
+                namespace=filter_uids if filter_uids else None,
                 # Convert expiry from days to seconds
                 expires=storage_prune_days * 60 * 60 * 24,
-                action=not dry_run)
+                action=not dry_run,
+            )
 
             ctx.exit(0)
             # end if disk_prune()
@@ -879,14 +1127,18 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
 
     if not dry_run:
         if body is None:
-            logger.trace('No --body (-b) specified; reading from stdin')
+            logger.trace("No --body (-b) specified; reading from stdin")
             # if no body was specified, then read from STDIN
-            body = click.get_text_stream('stdin').read()
+            body = click.get_text_stream("stdin").read()
 
         # now print it out
         result = a.notify(
-            body=body, title=title, notify_type=notification_type, tag=tags,
-            attach=attach)
+            body=body,
+            title=title,
+            notify_type=notification_type,
+            tag=tags,
+            attach=attach,
+        )
     else:
         # Number of columns to assume in the terminal.  In future, maybe this
         # can be detected and made dynamic. The actual column count is 80, but
@@ -900,18 +1152,27 @@ def main(ctx, body, title, config, attach, urls, notification_type, theme, tag,
 
         for idx, server in enumerate(a.find(tag=tags)):
             url = server.url(privacy=True)
-            click.echo("{: 4d}. {}".format(
-                idx + 1,
-                url if len(url) <= (columns - 8) else '{}...'.format(
-                    url[:columns - 9])))
+            click.echo(
+                "{: 4d}. {}".format(
+                    idx + 1,
+                    (
+                        url
+                        if len(url) <= (columns - 8)
+                        else f"{url[:columns - 9]}..."
+                    ),
+                )
+            )
 
             # Share our URL ID
-            click.echo("{:>10}: {}".format(
-                'uid', '- n/a -' if not server.url_id()
-                else server.url_id()))
+            click.echo(
+                "{:>10}: {}".format(
+                    "uid",
+                    "- n/a -" if not server.url_id() else server.url_id(),
+                )
+            )
 
             if server.tags:
-                click.echo("{:>10}: {}".format('tags', ', '.join(server.tags)))
+                click.echo("{:>10}: {}".format("tags", ", ".join(server.tags)))
 
         # Initialize a default response of nothing matched, otherwise
         # if we matched at least one entry, we can return True
diff --git a/libs/apprise/common.py b/libs/apprise/common.py
index 9b8e993c25..ec62eaf592 100644
--- a/libs/apprise/common.py
+++ b/libs/apprise/common.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,207 +25,182 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from enum import Enum
 
-class NotifyType:
-    """
-    A simple mapping of notification types most commonly used with
-    all types of logging and notification services.
-    """
-    INFO = 'info'
-    SUCCESS = 'success'
-    WARNING = 'warning'
-    FAILURE = 'failure'
 
+class NotifyType(str, Enum):
+    """A simple mapping of notification types most commonly used with all types
+    of logging and notification services."""
 
-NOTIFY_TYPES = (
-    NotifyType.INFO,
-    NotifyType.SUCCESS,
-    NotifyType.WARNING,
-    NotifyType.FAILURE,
-)
+    INFO = "info"
+    SUCCESS = "success"
+    WARNING = "warning"
+    FAILURE = "failure"
 
 
-class NotifyImageSize:
-    """
-    A list of pre-defined image sizes to make it easier to work with defined
-    plugins.
-    """
-    XY_32 = '32x32'
-    XY_72 = '72x72'
-    XY_128 = '128x128'
-    XY_256 = '256x256'
+# Define our types so we can verify if we need to
+NOTIFY_TYPES: frozenset[str] = frozenset(e.value for e in NotifyType)
 
 
-NOTIFY_IMAGE_SIZES = (
-    NotifyImageSize.XY_32,
-    NotifyImageSize.XY_72,
-    NotifyImageSize.XY_128,
-    NotifyImageSize.XY_256,
-)
+class NotifyImageSize(str, Enum):
+    """A list of pre-defined image sizes to make it easier to work with defined
+    plugins."""
 
+    XY_32 = "32x32"
+    XY_72 = "72x72"
+    XY_128 = "128x128"
+    XY_256 = "256x256"
 
-class NotifyFormat:
-    """
-    A list of pre-defined text message formats that can be passed via the
-    apprise library.
-    """
-    TEXT = 'text'
-    HTML = 'html'
-    MARKDOWN = 'markdown'
 
+# Define our image sizes so we can verify if we need to
+NOTIFY_IMAGE_SIZES: frozenset[str] = \
+    frozenset(e.value for e in NotifyImageSize)
 
-NOTIFY_FORMATS = (
-    NotifyFormat.TEXT,
-    NotifyFormat.HTML,
-    NotifyFormat.MARKDOWN,
-)
 
+class NotifyFormat(str, Enum):
+    """A list of pre-defined text message formats that can be passed via the
+    apprise library."""
 
-class OverflowMode:
-    """
-    A list of pre-defined modes of how to handle the text when it exceeds the
-    defined maximum message size.
-    """
+    TEXT = "text"
+    HTML = "html"
+    MARKDOWN = "markdown"
+
+
+# Define our formats so we can verify if we need to
+NOTIFY_FORMATS: frozenset[str] = frozenset(e.value for e in NotifyFormat)
+
+
+class OverflowMode(str, Enum):
+    """A list of pre-defined modes of how to handle the text when it exceeds
+    the defined maximum message size."""
 
     # Send the data as is; untouched.  Let the upstream server decide how the
     # content is handled.  Some upstream services might gracefully handle this
     # with expected intentions; others might not.
-    UPSTREAM = 'upstream'
+    UPSTREAM = "upstream"
 
     # Always truncate the text when it exceeds the maximum message size and
     # send it anyway
-    TRUNCATE = 'truncate'
+    TRUNCATE = "truncate"
 
     # Split the message into multiple smaller messages that fit within the
     # limits of what is expected.  The smaller messages are sent
-    SPLIT = 'split'
+    SPLIT = "split"
 
 
 # Define our modes so we can verify if we need to
-OVERFLOW_MODES = (
-    OverflowMode.UPSTREAM,
-    OverflowMode.TRUNCATE,
-    OverflowMode.SPLIT,
-)
+OVERFLOW_MODES: frozenset[str] = frozenset(e.value for e in OverflowMode)
 
 
-class ConfigFormat:
-    """
-    A list of pre-defined config formats that can be passed via the
-    apprise library.
-    """
+class ConfigFormat(str, Enum):
+    """A list of pre-defined config formats that can be passed via the apprise
+    library."""
 
     # A text based configuration. This consists of a list of URLs delimited by
     # a new line.  pound/hashtag (#) or semi-colon (;) can be used as comment
     # characters.
-    TEXT = 'text'
+    TEXT = "text"
 
     # YAML files allow a more rich of an experience when settig up your
     # apprise configuration files.
-    YAML = 'yaml'
+    YAML = "yaml"
 
 
 # Define our configuration formats mostly used for verification
-CONFIG_FORMATS = (
-    ConfigFormat.TEXT,
-    ConfigFormat.YAML,
-)
+CONFIG_FORMATS: frozenset[str] = frozenset(e.value for e in ConfigFormat)
 
 
-class ContentIncludeMode:
-    """
-    The different Content inclusion modes.  All content based plugins will
-    have one of these associated with it.
+class ContentIncludeMode(str, Enum):
+    """The different Content inclusion modes.
+
+    All content based plugins will have one of these associated with it.
     """
+
     # - Content inclusion of same type only; hence a file:// can include
     #   a file://
     # - Cross file inclusion is not allowed unless insecure_includes (a flag)
     #   is set to True. In these cases STRICT acts as type ALWAYS
-    STRICT = 'strict'
+    STRICT = "strict"
 
     # This content type can never be included
-    NEVER = 'never'
+    NEVER = "never"
 
     # This content can always be included
-    ALWAYS = 'always'
+    ALWAYS = "always"
 
 
-CONTENT_INCLUDE_MODES = (
-    ContentIncludeMode.STRICT,
-    ContentIncludeMode.NEVER,
-    ContentIncludeMode.ALWAYS,
-)
+# Define our file inclusion types so we can verify if we need to
+CONTENT_INCLUDE_MODES: frozenset[str] = \
+    frozenset(e.value for e in ContentIncludeMode)
 
 
-class ContentLocation:
-    """
-    This is primarily used for handling file attachments.  The idea is
-    to track the source of the attachment itself.  We don't want
-    remote calls to a server to access local attachments for example.
+class ContentLocation(str, Enum):
+    """This is primarily used for handling file attachments.  The idea is to
+    track the source of the attachment itself.  We don't want remote calls to a
+    server to access local attachments for example.
 
-    By knowing the attachment type and cross-associating it with how
-    we plan on accessing the content, we can make a judgement call
-    (for security reasons) if we will allow it.
+    By knowing the attachment type and cross-associating it with how we plan on
+    accessing the content, we can make a judgement call (for security reasons)
+    if we will allow it.
 
-    Obviously local uses of apprise can access both local and remote
-    type files.
+    Obviously local uses of apprise can access both local and remote type
+    files.
     """
+
     # Content is located locally (on the same server as apprise)
-    LOCAL = 'local'
+    LOCAL = "local"
 
     # Content is located in a remote location
-    HOSTED = 'hosted'
+    HOSTED = "hosted"
 
     # Content is inaccessible
-    INACCESSIBLE = 'n/a'
+    INACCESSIBLE = "n/a"
 
 
-CONTENT_LOCATIONS = (
-    ContentLocation.LOCAL,
-    ContentLocation.HOSTED,
-    ContentLocation.INACCESSIBLE,
-)
+# Define our location types so we can verify if we need to
+CONTENT_LOCATIONS: frozenset[str] = frozenset(e.value for e in ContentLocation)
 
 
-class PersistentStoreMode:
+class PersistentStoreMode(str, Enum):
     # Allow persistent storage; write on demand
-    AUTO = 'auto'
+    AUTO = "auto"
 
     # Always flush every change to disk after it's saved. This has higher i/o
     # but enforces disk reflects what was set immediately
-    FLUSH = 'flush'
+    FLUSH = "flush"
 
     # memory based store only
-    MEMORY = 'memory'
+    MEMORY = "memory"
 
 
-PERSISTENT_STORE_MODES = (
-    PersistentStoreMode.AUTO,
-    PersistentStoreMode.FLUSH,
-    PersistentStoreMode.MEMORY,
-)
+# Define our persistent storage modes so we can verify if we need to
+PERSISTENT_STORE_MODES: frozenset[str] = \
+    frozenset(e.value for e in PersistentStoreMode)
 
 
-class PersistentStoreState:
-    """
-    Defines the persistent states describing what has been cached
-    """
+class PersistentStoreState(str, Enum):
+    """Defines the persistent states describing what has been cached."""
+
     # Persistent Directory is actively cross-referenced against a matching URL
-    ACTIVE = 'active'
+    ACTIVE = "active"
 
     # Persistent Directory is no longer being used or has no cross-reference
-    STALE = 'stale'
+    STALE = "stale"
 
     # Persistent Directory is not utilizing any disk space at all, however
     # it potentially could if the plugin it successfully cross-references
     # is utilized
-    UNUSED = 'unused'
+    UNUSED = "unused"
+
 
+# Define our persistent storage states so we can verify if we need to
+PERSISTENT_STORE_STATES: frozenset[str] = \
+    frozenset(e.value for e in PersistentStoreState)
 
 # This is a reserved tag that is automatically assigned to every
 # Notification Plugin
-MATCH_ALL_TAG = 'all'
+MATCH_ALL_TAG = "all"
 
 # Will cause notification to trigger under any circumstance even if an
 # exclusive tagging was provided.
-MATCH_ALWAYS_TAG = 'always'
+MATCH_ALWAYS_TAG = "always"
diff --git a/libs/apprise/common.pyi b/libs/apprise/common.pyi
deleted file mode 100644
index 862fc4f272..0000000000
--- a/libs/apprise/common.pyi
+++ /dev/null
@@ -1,22 +0,0 @@
-import types
-import typing as t
-
-
-class NotifyType:
-    INFO: NotifyType
-    SUCCESS: NotifyType
-    WARNING: NotifyType
-    FAILURE: NotifyType
-
-class NotifyFormat:
-    TEXT: NotifyFormat
-    HTML: NotifyFormat
-    MARKDOWN: NotifyFormat
-
-class ContentLocation:
-    LOCAL: ContentLocation
-    HOSTED: ContentLocation
-    INACCESSIBLE: ContentLocation
-
-
-NOTIFY_MODULE_MAP: t.Dict[str, t.Dict[str, t.Union[t.Type["NotifyBase"], types.ModuleType]]]
diff --git a/libs/apprise/compat.py b/libs/apprise/compat.py
new file mode 100644
index 0000000000..cbf343f23e
--- /dev/null
+++ b/libs/apprise/compat.py
@@ -0,0 +1,50 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Added for Python 3.9 Compatibility
+
+from dataclasses import dataclass as _dataclass
+from typing import Any, Callable, TypeVar
+
+_T = TypeVar("_T")
+
+
+def dataclass_compat(*dargs: Any, **dkwargs: Any) -> Callable[[_T], _T]:
+    """
+    dataclass() wrapper that drops unsupported kwargs on older Python.
+
+    Python 3.9 does not support slots= in dataclasses.dataclass().
+    """
+    try:
+        return _dataclass(*dargs, **dkwargs)
+
+    except TypeError:
+        # Only strip slots when it is the cause
+        if "slots" in dkwargs:
+            dkwargs.pop("slots", None)
+            return _dataclass(*dargs, **dkwargs)
+        raise
diff --git a/libs/apprise/config/__init__.py b/libs/apprise/config/__init__.py
index edcc550793..7069e7f94c 100644
--- a/libs/apprise/config/__init__.py
+++ b/libs/apprise/config/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,14 +26,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # Used for testing
-from .base import ConfigBase
 from ..manager_config import ConfigurationManager
+from .base import ConfigBase
 
 # Initalize our Config Manager Singleton
 C_MGR = ConfigurationManager()
 
 __all__ = [
     # Reference
-    'ConfigBase',
-    'ConfigurationManager',
+    "ConfigBase",
+    "ConfigurationManager",
 ]
diff --git a/libs/apprise/config/base.py b/libs/apprise/config/base.py
index 5aa64312b5..cfe306f9e5 100644
--- a/libs/apprise/config/base.py
+++ b/libs/apprise/config/base.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,24 +24,27 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+from __future__ import annotations
 
+from collections import deque
 import os
 import re
-import yaml
 import time
 
-from .. import plugins
-from .. import common
+import yaml
+
+from .. import common, plugins
 from ..asset import AppriseAsset
-from ..url import URLBase
-from ..utils.parse import GET_SCHEMA_RE, parse_list, parse_bool, parse_urls
-from ..utils.cwe312 import cwe312_url
+from ..logger import logging
 from ..manager_config import ConfigurationManager
 from ..manager_plugins import NotificationManager
+from ..url import URLBase
+from ..utils.cwe312 import cwe312_url
+from ..utils.parse import GET_SCHEMA_RE, parse_bool, parse_list, parse_urls
+from ..utils.time import zoneinfo
 
 # Test whether token is valid or not
-VALID_TOKEN = re.compile(
-    r'(?P<token>[a-z0-9][a-z0-9_]+)', re.I)
+VALID_TOKEN = re.compile(r"(?P<token>[a-z0-9][a-z0-9_]+)", re.I)
 
 # Grant access to our Notification Manager Singleton
 N_MGR = NotificationManager()
@@ -52,12 +54,10 @@
 
 
 class ConfigBase(URLBase):
-    """
-    This is the base class for all supported configuration sources
-    """
+    """This is the base class for all supported configuration sources."""
 
     # The Default Encoding to use if not otherwise detected
-    encoding = 'utf-8'
+    encoding = "utf-8"
 
     # The default expected configuration format unless otherwise
     # detected by the sub-modules
@@ -79,11 +79,15 @@ class ConfigBase(URLBase):
     # the config path manages the handling of relative include
     config_path = os.getcwd()
 
-    def __init__(self, cache=True, recursion=0, insecure_includes=False,
-                 **kwargs):
-        """
-        Initialize some general logging and common server arguments that will
-        keep things consistent when working with the configurations that
+    def __init__(
+        self,
+        cache: bool | int = True,
+        recursion: int = 0,
+        insecure_includes: bool = False,
+        **kwargs: object,
+    ) -> None:
+        """Initialize some general logging and common server arguments that
+        will keep things consistent when working with the configurations that
         inherit this class.
 
         By default we cache our responses so that subsiquent calls does not
@@ -137,51 +141,52 @@ def __init__(self, cache=True, recursion=0, insecure_includes=False,
         # Initialize our insecure_includes flag
         self.insecure_includes = insecure_includes
 
-        if 'encoding' in kwargs:
+        if "encoding" in kwargs:
             # Store the encoding
-            self.encoding = kwargs.get('encoding')
+            self.encoding = kwargs.get("encoding")
 
-        if 'format' in kwargs \
-                and isinstance(kwargs['format'], str):
-            # Store the enforced config format
-            self.config_format = kwargs.get('format').lower()
+        fmt = kwargs.get("format")
+        if fmt:
+            try:
+                self.config_format = (
+                    fmt if isinstance(fmt, common.ConfigFormat)
+                    else common.ConfigFormat(fmt.lower())
+                )
 
-            if self.config_format not in common.CONFIG_FORMATS:
-                # Simple error checking
-                err = 'An invalid config format ({}) was specified.'.format(
-                    self.config_format)
+            except (AttributeError, ValueError):
+                err = f"An invalid config format ({fmt}) was specified."
                 self.logger.warning(err)
-                raise TypeError(err)
+                raise TypeError(err) from None
 
         # Set our cache flag; it can be True or a (positive) integer
         try:
             self.cache = cache if isinstance(cache, bool) else int(cache)
             if self.cache < 0:
-                err = 'A negative cache value ({}) was specified.'.format(
-                    cache)
+                err = f"A negative cache value ({cache}) was specified."
                 self.logger.warning(err)
                 raise TypeError(err)
 
         except (ValueError, TypeError):
-            err = 'An invalid cache value ({}) was specified.'.format(cache)
+            err = f"An invalid cache value ({cache}) was specified."
             self.logger.warning(err)
-            raise TypeError(err)
+            raise TypeError(err) from None
 
         return
 
-    def servers(self, asset=None, **kwargs):
-        """
-        Performs reads loaded configuration and returns all of the services
-        that could be parsed and loaded.
-
-        """
+    def servers(
+        self,
+        asset: AppriseAsset | None = None,
+        **kwargs: object,
+    ) -> list[plugins.NotifyBase]:
+        """Performs reads loaded configuration and returns all of the services
+        that could be parsed and loaded."""
 
         if not self.expired():
             # We already have cached results to return; use them
             return self._cached_servers
 
         # Our cached response object
-        self._cached_servers = list()
+        self._cached_servers = []
 
         # read() causes the child class to do whatever it takes for the
         # config plugin to load the data source and return unparsed content
@@ -196,12 +201,14 @@ def servers(self, asset=None, **kwargs):
 
         # Our Configuration format uses a default if one wasn't one detected
         # or enfored.
-        config_format = \
-            self.default_config_format \
-            if self.config_format is None else self.config_format
+        config_format = (
+            self.default_config_format
+            if self.config_format is None
+            else self.config_format
+        )
 
         # Dynamically load our parse_ function based on our config format
-        fn = getattr(ConfigBase, 'config_parse_{}'.format(config_format))
+        fn = getattr(ConfigBase, f"config_parse_{config_format.value}")
 
         # Initialize our asset object
         asset = asset if isinstance(asset, AppriseAsset) else self.asset
@@ -209,6 +216,11 @@ def servers(self, asset=None, **kwargs):
         # Execute our config parse function which always returns a tuple
         # of our servers and our configuration
         servers, configs = fn(content=content, asset=asset)
+
+        # Free memory
+        del content
+
+        # Add entry to our server list
         self._cached_servers.extend(servers)
 
         # Configuration files were detected; recursively populate them
@@ -221,27 +233,29 @@ def servers(self, asset=None, **kwargs):
                 schema = GET_SCHEMA_RE.match(url)
                 if schema is None:
                     # Plan B is to assume we're dealing with a file
-                    schema = 'file'
+                    schema = "file"
                     if not os.path.isabs(url):
                         # We're dealing with a relative path; prepend
                         # our current config path
                         url = os.path.join(self.config_path, url)
 
-                    url = '{}://{}'.format(schema, URLBase.quote(url))
+                    url = f"{schema}://{URLBase.quote(url)}"
 
                 else:
                     # Ensure our schema is always in lower case
-                    schema = schema.group('schema').lower()
+                    schema = schema.group("schema").lower()
 
                     # Some basic validation
                     if schema not in C_MGR:
                         ConfigBase.logger.warning(
-                            'Unsupported include schema {}.'.format(schema))
+                            f"Unsupported include schema {schema}."
+                        )
                         continue
 
                 # CWE-312 (Secure Logging) Handling
-                loggable_url = url if not asset.secure_logging \
-                    else cwe312_url(url)
+                loggable_url = (
+                    url if not asset.secure_logging else cwe312_url(url)
+                )
 
                 # Parse our url details of the server object as dictionary
                 # containing all of the information parsed from our URL
@@ -249,94 +263,93 @@ def servers(self, asset=None, **kwargs):
                 if not results:
                     # Failed to parse the server URL
                     self.logger.warning(
-                        'Unparseable include URL {}'.format(loggable_url))
+                        f"Unparseable include URL {loggable_url}"
+                    )
                     continue
 
                 # Handle cross inclusion based on allow_cross_includes rules
-                if (C_MGR[schema].allow_cross_includes ==
-                        common.ContentIncludeMode.STRICT
-                        and schema not in self.schemas()
-                        and not self.insecure_includes) or C_MGR[schema] \
-                        .allow_cross_includes == \
-                        common.ContentIncludeMode.NEVER:
+                if (
+                    C_MGR[schema].allow_cross_includes
+                    == common.ContentIncludeMode.STRICT
+                    and schema not in self.schemas()
+                    and not self.insecure_includes
+                ) or C_MGR[
+                    schema
+                ].allow_cross_includes == common.ContentIncludeMode.NEVER:
 
                     # Prevent the loading if insecure base protocols
                     ConfigBase.logger.warning(
-                        'Including {}:// based configuration is prohibited. '
-                        'Ignoring URL {}'.format(schema, loggable_url))
+                        f"Including {schema}:// based configuration is"
+                        f" prohibited. Ignoring URL {loggable_url}"
+                    )
                     continue
 
                 # Prepare our Asset Object
-                results['asset'] = asset
+                results["asset"] = asset
 
                 # No cache is required because we're just lumping this in
                 # and associating it with the cache value we've already
                 # declared (prior to our recursion)
-                results['cache'] = False
+                results["cache"] = False
 
                 # Recursion can never be parsed from the URL; we decrement
                 # it one level
-                results['recursion'] = self.recursion - 1
+                results["recursion"] = self.recursion - 1
 
                 # Insecure Includes flag can never be parsed from the URL
-                results['insecure_includes'] = self.insecure_includes
+                results["insecure_includes"] = self.insecure_includes
 
                 try:
                     # Attempt to create an instance of our plugin using the
                     # parsed URL information
-                    cfg_plugin = C_MGR[results['schema']](**results)
+                    cfg_plugin = C_MGR[results["schema"]](**results)
 
                 except Exception as e:
                     # the arguments are invalid or can not be used.
                     self.logger.warning(
-                        'Could not load include URL: {}'.format(loggable_url))
-                    self.logger.debug('Loading Exception: {}'.format(str(e)))
+                        f"Could not load include URL: {loggable_url}"
+                    )
+                    self.logger.debug(f"Loading Exception: {e!s}")
                     continue
 
                 # if we reach here, we can now add this servers found
                 # in this configuration file to our list
-                self._cached_servers.extend(
-                    cfg_plugin.servers(asset=asset))
-
-                # We no longer need our configuration object
-                del cfg_plugin
+                self._cached_servers.extend(cfg_plugin.servers(asset=asset))
 
             else:
                 # CWE-312 (Secure Logging) Handling
-                loggable_url = url if not asset.secure_logging \
-                    else cwe312_url(url)
+                loggable_url = (
+                    url if not asset.secure_logging else cwe312_url(url)
+                )
 
                 self.logger.debug(
-                    'Recursion limit reached; ignoring Include URL: %s',
-                    loggable_url)
+                    "Recursion limit reached; ignoring Include URL: %s",
+                    loggable_url,
+                )
 
         if self._cached_servers:
             self.logger.info(
-                'Loaded {} entries from {}'.format(
-                    len(self._cached_servers),
-                    self.url(privacy=asset.secure_logging)))
+                f"Loaded {len(self._cached_servers)} entries from"
+                f" {self.url(privacy=asset.secure_logging)}"
+            )
         else:
             self.logger.warning(
-                'Failed to load Apprise configuration from {}'.format(
-                    self.url(privacy=asset.secure_logging)))
+                "Failed to load Apprise configuration from"
+                f" {self.url(privacy=asset.secure_logging)}"
+            )
 
         # Set the time our content was cached at
         self._cached_time = time.time()
 
         return self._cached_servers
 
-    def read(self):
-        """
-        This object should be implimented by the child classes
-
-        """
+    def read(self) -> str | None:
+        """This object should be implimented by the child classes."""
         return None
 
-    def expired(self):
-        """
-        Simply returns True if the configuration should be considered
-        as expired or False if content should be retrieved.
-        """
+    def expired(self) -> bool:
+        """Simply returns True if the configuration should be considered as
+        expired or False if content should be retrieved."""
         if isinstance(self._cached_servers, list) and self.cache:
             # We have enough reason to look further into our cached content
             # and verify it has not expired.
@@ -356,7 +369,7 @@ def expired(self):
         return True
 
     @staticmethod
-    def __normalize_tag_groups(group_tags):
+    def __normalize_tag_groups(group_tags: dict[str, set[str]]) -> None:
         """
         Used to normalize a tag assign map which looks like:
           {
@@ -373,11 +386,10 @@ def __normalize_tag_groups(group_tags):
 
         """
         # Prepare a key set list we can use
-        tag_groups = set([str(x) for x in group_tags.keys()])
+        tag_groups = {str(x) for x in group_tags}
 
         def _expand(tags, ignore=None):
-            """
-            Expands based on tag provided and returns a set
+            """Expands based on tag provided and returns a set.
 
             this also updates the group_tags while it goes
             """
@@ -414,7 +426,7 @@ def _expand(tags, ignore=None):
 
                     # Go deeper (recursion)
                     ignore.add(tag)
-                    group_tags[gtag] = _expand(set([gtag]), ignore=ignore)
+                    group_tags[gtag] = _expand({gtag}, ignore=ignore)
                     results |= group_tags[gtag]
 
                     # Pop ignore
@@ -424,14 +436,18 @@ def _expand(tags, ignore=None):
 
         for tag in tag_groups:
             # Get our tags
-            group_tags[tag] |= _expand(set([tag]))
+            group_tags[tag] |= _expand({tag})
             if not group_tags[tag]:
                 ConfigBase.logger.warning(
-                    'The group {} has no tags assigned to it'.format(tag))
+                    f"The group {tag} has no tags assigned to it"
+                )
                 del group_tags[tag]
 
     @staticmethod
-    def parse_url(url, verify_host=True):
+    def parse_url(
+        url: str,
+        verify_host: bool = True,
+    ) -> dict[str, object] | None:
         """Parses the URL and returns it broken apart into a dictionary.
 
         This is very specific and customized for Apprise.
@@ -456,38 +472,40 @@ def parse_url(url, verify_host=True):
             return results
 
         # Allow overriding the default config format
-        if 'format' in results['qsd']:
-            results['format'] = results['qsd'].get('format')
-            if results['format'] not in common.CONFIG_FORMATS:
+        if "format" in results["qsd"]:
+            results["format"] = results["qsd"].get("format")
+            if results["format"] not in common.CONFIG_FORMATS:
                 URLBase.logger.warning(
-                    'Unsupported format specified {}'.format(
-                        results['format']))
-                del results['format']
+                    "Unsupported format specified {}".format(results["format"])
+                )
+                del results["format"]
 
         # Defines the encoding of the payload
-        if 'encoding' in results['qsd']:
-            results['encoding'] = results['qsd'].get('encoding')
+        if "encoding" in results["qsd"]:
+            results["encoding"] = results["qsd"].get("encoding")
 
         # Our cache value
-        if 'cache' in results['qsd']:
+        if "cache" in results["qsd"]:
             # First try to get it's integer value
             try:
-                results['cache'] = int(results['qsd']['cache'])
+                results["cache"] = int(results["qsd"]["cache"])
 
             except (ValueError, TypeError):
                 # No problem, it just isn't an integer; now treat it as a bool
                 # instead:
-                results['cache'] = parse_bool(results['qsd']['cache'])
+                results["cache"] = parse_bool(results["qsd"]["cache"])
 
         return results
 
     @staticmethod
-    def detect_config_format(content, **kwargs):
-        """
-        Takes the specified content and attempts to detect the format type
-
-        The function returns the actual format type if detected, otherwise
-        it returns None
+    def detect_config_format(
+        content: str,
+        **kwargs: object,
+    ) -> common.ConfigFormat | None:
+        """Takes the specified content and attempts to detect the format type.
+
+        The function returns the actual format type if detected, otherwise it
+        returns None
         """
 
         # Detect Format Logic:
@@ -503,18 +521,19 @@ def detect_config_format(content, **kwargs):
 
         # Define what a valid line should look like
         valid_line_re = re.compile(
-            r'^\s*(?P<line>([;#]+(?P<comment>.*))|'
-            r'(?P<text>((?P<tag>[ \t,a-z0-9_-]+)=)?[a-z0-9]+://.*)|'
-            r'((?P<yaml>[a-z0-9]+):.*))?$', re.I)
+            r"^\s*(?P<line>([;#]+(?P<comment>.*))|"
+            r"(?P<text>((?P<tag>[ \t,a-z0-9_-]+)=)?[a-z0-9]+://.*)|"
+            r"((?P<yaml>[a-z0-9]+):.*))?$",
+            re.I,
+        )
 
         try:
             # split our content up to read line by line
-            content = re.split(r'\r*\n', content)
+            content = re.split(r"\r*\n", content)
 
         except TypeError:
             # content was not expected string type
-            ConfigBase.logger.error(
-                'Invalid Apprise configuration specified.')
+            ConfigBase.logger.error("Invalid Apprise configuration specified.")
             return None
 
         # By default set our return value to None since we don't know
@@ -529,24 +548,25 @@ def detect_config_format(content, **kwargs):
             if not result:
                 # Invalid syntax
                 ConfigBase.logger.error(
-                    'Undetectable Apprise configuration found '
-                    'based on line {}.'.format(line))
+                    "Undetectable Apprise configuration found "
+                    f"based on line {line}."
+                )
                 # Take an early exit
                 return None
 
             # Attempt to detect configuration
-            if result.group('yaml'):
+            if result.group("yaml"):
                 config_format = common.ConfigFormat.YAML
                 ConfigBase.logger.debug(
-                    'Detected YAML configuration '
-                    'based on line {}.'.format(line))
+                    f"Detected YAML configuration based on line {line}."
+                )
                 break
 
-            elif result.group('text'):
+            elif result.group("text"):
                 config_format = common.ConfigFormat.TEXT
                 ConfigBase.logger.debug(
-                    'Detected TEXT configuration '
-                    'based on line {}.'.format(line))
+                    f"Detected TEXT configuration based on line {line}."
+                )
                 break
 
             # If we reach here, we have a comment entry
@@ -556,11 +576,16 @@ def detect_config_format(content, **kwargs):
         return config_format
 
     @staticmethod
-    def config_parse(content, asset=None, config_format=None, **kwargs):
-        """
-        Takes the specified config content and loads it based on the specified
-        config_format. If a format isn't specified, then it is auto detected.
-
+    def config_parse(
+        content: str,
+        asset: AppriseAsset | None = None,
+        config_format: str | common.ConfigFormat | None = None,
+        **kwargs: object,
+    ) -> tuple[list[object], list[str]]:
+        """Takes the specified config content and loads it based on the
+        specified config_format.
+
+        If a format isn't specified, then it is auto detected.
         """
 
         if config_format is None:
@@ -569,27 +594,35 @@ def config_parse(content, asset=None, config_format=None, **kwargs):
 
             if not config_format:
                 # We couldn't detect configuration
-                ConfigBase.logger.error('Could not detect configuration')
-                return (list(), list())
+                ConfigBase.logger.error("Could not detect configuration")
+                return ([], [])
+
+        try:
+            config_format = (
+                config_format if isinstance(config_format, common.ConfigFormat)
+                else common.ConfigFormat(config_format.lower())
+            )
 
-        if config_format not in common.CONFIG_FORMATS:
-            # Invalid configuration type specified
+        except (AttributeError, ValueError):
             ConfigBase.logger.error(
-                'An invalid configuration format ({}) was specified'.format(
-                    config_format))
-            return (list(), list())
+                f"An invalid configuration format ({config_format}) was"
+                " specified"
+            )
+            return ([], [])
 
         # Dynamically load our parse_ function based on our config format
-        fn = getattr(ConfigBase, 'config_parse_{}'.format(config_format))
+        fn = getattr(ConfigBase, f"config_parse_{config_format.value}")
 
         # Execute our config parse function which always returns a list
         return fn(content=content, asset=asset)
 
     @staticmethod
-    def config_parse_text(content, asset=None):
-        """
-        Parse the specified content as though it were a simple text file only
-        containing a list of URLs.
+    def config_parse_text(
+        content: str,
+        asset: AppriseAsset | None = None,
+    ) -> tuple[list[object], list[str]]:
+        """Parse the specified content as though it were a simple text file
+        only containing a list of URLs.
 
         Return a tuple that looks like (servers, configs) where:
           - servers contains a list of loaded notification plugins
@@ -617,14 +650,13 @@ def config_parse_text(content, asset=None):
 
             # Assign tag contents to a group identifier
             <Group(s)>=<Tag(s)>
-
         """
         # A list of loaded Notification Services
-        servers = list()
+        servers = []
 
         # A list of additional configuration files referenced using
         # the include keyword
-        configs = list()
+        configs = []
 
         # Track all of the tags we want to assign later on
         group_tags = {}
@@ -637,39 +669,44 @@ def config_parse_text(content, asset=None):
 
         # Define what a valid line should look like
         valid_line_re = re.compile(
-            r'^\s*(?P<line>([;#]+(?P<comment>.*))|'
-            r'(\s*(?P<tags>[a-z0-9, \t_-]+)\s*=|=)?\s*'
-            r'((?P<url>[a-z0-9]{1,12}://.*)|(?P<assign>[a-z0-9, \t_-]+))|'
-            r'include\s+(?P<config>.+))?\s*$', re.I)
+            r"^\s*(?P<line>([;#]+(?P<comment>.*))|"
+            r"(\s*(?P<tags>[a-z0-9, \t_-]+)\s*=|=)?\s*"
+            r"((?P<url>[a-z0-9]{1,32}://.*)|(?P<assign>[a-z0-9, \t_-]+))|"
+            r"include\s+(?P<config>.+))?\s*$",
+            re.I,
+        )
 
         try:
             # split our content up to read line by line
-            content = re.split(r'\r*\n', content)
+            content = re.split(r"\r*\n", content)
 
         except TypeError:
             # content was not expected string type
             ConfigBase.logger.error(
-                'Invalid Apprise TEXT based configuration specified.')
-            return (list(), list())
+                "Invalid Apprise TEXT based configuration specified."
+            )
+            return ([], [])
 
         for line, entry in enumerate(content, start=1):
             result = valid_line_re.match(entry)
             if not result:
                 # Invalid syntax
                 ConfigBase.logger.error(
-                    'Invalid Apprise TEXT configuration format found '
-                    '{} on line {}.'.format(entry, line))
+                    "Invalid Apprise TEXT configuration format found "
+                    f"{entry} on line {line}."
+                )
 
                 # Assume this is a file we shouldn't be parsing. It's owner
                 # can read the error printed to screen and take action
                 # otherwise.
-                return (list(), list())
+                return ([], [])
 
             # Retrieve our line
-            url, assign, config = \
-                result.group('url'), \
-                result.group('assign'), \
-                result.group('config')
+            url, assign, config = (
+                result.group("url"),
+                result.group("assign"),
+                result.group("config"),
+            )
 
             if not (url or config or assign):
                 # Comment/empty line; do nothing
@@ -677,27 +714,27 @@ def config_parse_text(content, asset=None):
 
             if config:
                 # CWE-312 (Secure Logging) Handling
-                loggable_url = config if not asset.secure_logging \
-                    else cwe312_url(config)
+                loggable_url = (
+                    config if not asset.secure_logging else cwe312_url(config)
+                )
 
-                ConfigBase.logger.debug(
-                    'Include URL: {}'.format(loggable_url))
+                ConfigBase.logger.debug(f"Include URL: {loggable_url}")
 
                 # Store our include line
                 configs.append(config.strip())
                 continue
 
             # CWE-312 (Secure Logging) Handling
-            loggable_url = url if not asset.secure_logging \
-                else cwe312_url(url)
+            loggable_url = url if not asset.secure_logging else cwe312_url(url)
 
             if assign:
-                groups = set(parse_list(result.group('tags'), cast=str))
+                groups = set(parse_list(result.group("tags"), cast=str))
                 if not groups:
                     # no tags were assigned
                     ConfigBase.logger.warning(
-                        'Unparseable tag assignment - no group(s) '
-                        'on line {}'.format(line))
+                        "Unparseable tag assignment - no group(s) "
+                        f"on line {line}"
+                    )
                     continue
 
                 # Get our tags
@@ -705,8 +742,9 @@ def config_parse_text(content, asset=None):
                 if not tags:
                     # no tags were assigned
                     ConfigBase.logger.warning(
-                        'Unparseable tag assignment - no tag(s) to assign '
-                        'on line {}'.format(line))
+                        "Unparseable tag assignment - no tag(s) to assign "
+                        f"on line {line}"
+                    )
                     continue
 
                 # Update our tag group map
@@ -715,31 +753,32 @@ def config_parse_text(content, asset=None):
                         group_tags[tag_group] = set()
 
                     # ensure our tag group is never included in the assignment
-                    group_tags[tag_group] |= tags - set([tag_group])
+                    group_tags[tag_group] |= tags - {tag_group}
                 continue
 
             # Acquire our url tokens
             results = plugins.url_to_dict(
-                url, secure_logging=asset.secure_logging)
+                url, secure_logging=asset.secure_logging
+            )
             if results is None:
                 # Failed to parse the server URL
                 ConfigBase.logger.warning(
-                    'Unparseable URL {} on line {}.'.format(
-                        loggable_url, line))
+                    f"Unparseable URL {loggable_url} on line {line}."
+                )
                 continue
 
             # Build a list of tags to associate with the newly added
             # notifications if any were set
-            results['tag'] = set(parse_list(result.group('tags'), cast=str))
+            results["tag"] = set(parse_list(result.group("tags"), cast=str))
 
             # Set our Asset Object
-            results['asset'] = asset
+            results["asset"] = asset
 
             # Store our preloaded entries
             preloaded.append({
-                'results': results,
-                'line': line,
-                'loggable_url': loggable_url,
+                "results": results,
+                "line": line,
+                "loggable_url": loggable_url,
             })
 
         #
@@ -753,7 +792,7 @@ def config_parse_text(content, asset=None):
         #
         for entry in preloaded:
             # Point to our results entry for easier reference below
-            results = entry['results']
+            results = entry["results"]
 
             #
             # Apply our tag groups if they're defined
@@ -761,26 +800,30 @@ def config_parse_text(content, asset=None):
             for group, tags in group_tags.items():
                 # Detect if anything assigned to this tag also maps back to a
                 # group.  If so we want to add the group to our list
-                if next((True for tag in results['tag']
-                         if tag in tags), False):
-                    results['tag'].add(group)
+                if next(
+                    (True for tag in results["tag"] if tag in tags), False
+                ):
+                    results["tag"].add(group)
 
             try:
                 # Attempt to create an instance of our plugin using the
                 # parsed URL information
-                plugin = N_MGR[results['schema']](**results)
+                plugin = N_MGR[results["schema"]](**results)
 
                 # Create log entry of loaded URL
                 ConfigBase.logger.debug(
-                    'Loaded URL: %s', plugin.url(
-                        privacy=results['asset'].secure_logging))
+                    "Loaded URL: %s",
+                    plugin.url(privacy=results["asset"].secure_logging),
+                )
 
             except Exception as e:
                 # the arguments are invalid or can not be used.
                 ConfigBase.logger.warning(
-                    'Could not load URL {} on line {}.'.format(
-                        entry['loggable_url'], entry['line']))
-                ConfigBase.logger.debug('Loading Exception: %s' % str(e))
+                    "Could not load URL {} on line {}.".format(
+                        entry["loggable_url"], entry["line"]
+                    )
+                )
+                ConfigBase.logger.debug(f"Loading Exception: {e!s}")
                 continue
 
             # if we reach here, we successfully loaded our data
@@ -790,9 +833,11 @@ def config_parse_text(content, asset=None):
         return (servers, configs)
 
     @staticmethod
-    def config_parse_yaml(content, asset=None):
-        """
-        Parse the specified content as though it were a yaml file
+    def config_parse_yaml(
+        content: str,
+        asset: AppriseAsset | None = None,
+    ) -> tuple[list[object], list[str]]:
+        """Parse the specified content as though it were a yaml file
         specifically formatted for Apprise.
 
         Return a tuple that looks like (servers, configs) where:
@@ -801,15 +846,14 @@ def config_parse_yaml(content, asset=None):
             referenced.
 
         You may optionally associate an asset with the notification.
-
         """
 
         # A list of loaded Notification Services
-        servers = list()
+        servers = []
 
         # A list of additional configuration files referenced using
         # the include keyword
-        configs = list()
+        configs = []
 
         # Group Assignments
         group_tags = {}
@@ -821,60 +865,81 @@ def config_parse_yaml(content, asset=None):
             # Load our data (safely)
             result = yaml.load(content, Loader=yaml.SafeLoader)
 
-        except (AttributeError,
-                yaml.parser.ParserError,
-                yaml.error.MarkedYAMLError) as e:
+        except (
+            AttributeError,
+            yaml.parser.ParserError,
+            yaml.error.MarkedYAMLError,
+        ) as e:
             # Invalid content
-            ConfigBase.logger.error(
-                'Invalid Apprise YAML data specified.')
-            ConfigBase.logger.debug(
-                'YAML Exception:{}{}'.format(os.linesep, e))
-            return (list(), list())
+            ConfigBase.logger.error("Invalid Apprise YAML data specified.")
+            ConfigBase.logger.debug(f"YAML Exception:{os.linesep}{e}")
+            return ([], [])
 
         if not isinstance(result, dict):
             # Invalid content
             ConfigBase.logger.error(
-                'Invalid Apprise YAML based configuration specified.')
-            return (list(), list())
+                "Invalid Apprise YAML based configuration specified."
+            )
+            return ([], [])
 
         # YAML Version
-        version = result.get('version', 1)
+        version = result.get("version", 1)
         if version != 1:
             # Invalid syntax
             ConfigBase.logger.error(
-                'Invalid Apprise YAML version specified {}.'.format(version))
-            return (list(), list())
+                f"Invalid Apprise YAML version specified {version}."
+            )
+            return ([], [])
 
         #
         # global asset object
         #
         asset = asset if isinstance(asset, AppriseAsset) else AppriseAsset()
-        tokens = result.get('asset', None)
+
+        # Prepare our default timezone
+        default_timezone = asset.tzinfo
+
+        # Acquire our asset tokens
+        tokens = result.get("asset", None)
         if tokens and isinstance(tokens, dict):
-            for k, v in tokens.items():
+            raw_tz = tokens.get("timezone", tokens.get("tz"))
+            if isinstance(raw_tz, str):
+                default_timezone = zoneinfo(re.sub(r"[^\w/-]+", "", raw_tz))
+                if not default_timezone:
+                    ConfigBase.logger.warning(
+                        'Ignored invalid timezone "%s"', raw_tz)
+                    default_timezone = asset.tzinfo
+                else:
+                    asset._tzinfo = default_timezone
+
+            elif raw_tz is not None:
+                ConfigBase.logger.warning(
+                    'Ignored invalid timezone "%r"', raw_tz)
 
-                if k.startswith('_') or k.endswith('_'):
+            # Iterate over remaining tokens
+            for k, v in tokens.items():
+                if k.startswith("_") or k.endswith("_"):
                     # Entries are considered reserved if they start or end
                     # with an underscore
-                    ConfigBase.logger.warning(
-                        'Ignored asset key "{}".'.format(k))
+                    ConfigBase.logger.warning(f'Ignored asset key "{k}".')
                     continue
 
-                if not (hasattr(asset, k) and
-                        isinstance(getattr(asset, k),
-                                   (bool, str))):
+                if not (
+                    hasattr(asset, k)
+                    and isinstance(getattr(asset, k), (bool, str))
+                ):
 
                     # We can't set a function or non-string set value
-                    ConfigBase.logger.warning(
-                        'Invalid asset key "{}".'.format(k))
+                    ConfigBase.logger.warning(f'Invalid asset key "{k}".')
                     continue
 
                 if v is None:
                     # Convert to an empty string
-                    v = ''
+                    v = ""
 
-                if (isinstance(v, (bool, str))
-                        and isinstance(getattr(asset, k), bool)):
+                if isinstance(v, (bool, str)) and isinstance(
+                    getattr(asset, k), bool
+                ):
 
                     # If the object in the Asset is a boolean, then
                     # we want to convert the specified string to
@@ -887,15 +952,14 @@ def config_parse_yaml(content, asset=None):
 
                 else:
                     # we must set strings with a string
-                    ConfigBase.logger.warning(
-                        'Invalid asset value to "{}".'.format(k))
+                    ConfigBase.logger.warning(f'Invalid asset value to "{k}".')
                     continue
         #
         # global tag root directive
         #
         global_tags = set()
 
-        tags = result.get('tag', None)
+        tags = result.get("tag", result.get("tags", None))
         if tags and isinstance(tags, (list, tuple, str)):
             # Store any preset tags
             global_tags = set(parse_list(tags, cast=str))
@@ -903,23 +967,23 @@ def config_parse_yaml(content, asset=None):
         #
         # groups root directive
         #
-        groups = result.get('groups', None)
+        groups = result.get("groups", None)
         if isinstance(groups, dict):
             #
             # Dictionary
             #
-            for _groups, tags in groups.items():
-                for group in parse_list(_groups, cast=str):
+            for groups_, tags in groups.items():
+                for group in parse_list(groups_, cast=str):
                     if isinstance(tags, (list, tuple)):
-                        _tags = set()
+                        tags_ = set()
                         for e in tags:
                             if isinstance(e, dict):
-                                _tags |= set(e.keys())
+                                tags_ |= set(e.keys())
                             else:
-                                _tags |= set(parse_list(e, cast=str))
+                                tags_ |= set(parse_list(e, cast=str))
 
                         # Final assignment
-                        tags = _tags
+                        tags = tags_
 
                     else:
                         tags = set(parse_list(tags, cast=str))
@@ -939,22 +1003,22 @@ def config_parse_yaml(content, asset=None):
             for no, entry in enumerate(groups):
                 if not isinstance(entry, dict):
                     ConfigBase.logger.warning(
-                        'No assignment for group {}, entry #{}'.format(
-                            entry, no + 1))
+                        f"No assignment for group {entry}, entry #{no + 1}"
+                    )
                     continue
 
-                for _groups, tags in entry.items():
-                    for group in parse_list(_groups, cast=str):
+                for groups_, tags in entry.items():
+                    for group in parse_list(groups_, cast=str):
                         if isinstance(tags, (list, tuple)):
-                            _tags = set()
+                            tags_ = set()
                             for e in tags:
                                 if isinstance(e, dict):
-                                    _tags |= set(e.keys())
+                                    tags_ |= set(e.keys())
                                 else:
-                                    _tags |= set(parse_list(e, cast=str))
+                                    tags_ |= set(parse_list(e, cast=str))
 
                             # Final assignment
-                            tags = _tags
+                            tags = tags_
 
                         else:
                             tags = set(parse_list(tags, cast=str))
@@ -967,7 +1031,7 @@ def config_parse_yaml(content, asset=None):
 
         # include root directive
         #
-        includes = result.get('include', None)
+        includes = result.get("include", None)
         if isinstance(includes, str):
             # Support a single inline string or multiple ones separated by a
             # comma and/or space
@@ -975,10 +1039,10 @@ def config_parse_yaml(content, asset=None):
 
         elif not isinstance(includes, (list, tuple)):
             # Not a problem; we simply have no includes
-            includes = list()
+            includes = []
 
         # Iterate over each config URL
-        for no, url in enumerate(includes):
+        for _no, url in enumerate(includes):
 
             if isinstance(url, str):
                 # Support a single inline string or multiple ones separated by
@@ -987,26 +1051,25 @@ def config_parse_yaml(content, asset=None):
 
             elif isinstance(url, dict):
                 # Store the url and ignore arguments associated
-                configs.extend(u for u in url.keys())
+                configs.extend(u for u in url)
 
         #
         # urls root directive
         #
-        urls = result.get('urls', None)
+        urls = result.get("urls", None)
         if not isinstance(urls, (list, tuple)):
             # Not a problem; we simply have no urls
-            urls = list()
+            urls = []
 
         # Iterate over each URL
         for no, url in enumerate(urls):
 
             # Our results object is what we use to instantiate our object if
             # we can. Reset it to None on each iteration
-            results = list()
+            results = []
 
             # CWE-312 (Secure Logging) Handling
-            loggable_url = url if not asset.secure_logging \
-                else cwe312_url(url)
+            loggable_url = url if not asset.secure_logging else cwe312_url(url)
 
             if isinstance(url, str):
                 # We're just a simple URL string...
@@ -1016,22 +1079,23 @@ def config_parse_yaml(content, asset=None):
                     # config file at least has something to take action
                     # with.
                     ConfigBase.logger.warning(
-                        'Invalid URL {}, entry #{}'.format(
-                            loggable_url, no + 1))
+                        f"Invalid URL {loggable_url}, entry #{no + 1}"
+                    )
                     continue
 
                 # We found a valid schema worthy of tracking; store it's
                 # details:
-                _results = plugins.url_to_dict(
-                    url, secure_logging=asset.secure_logging)
-                if _results is None:
+                results_ = plugins.url_to_dict(
+                    url, secure_logging=asset.secure_logging
+                )
+                if results_ is None:
                     ConfigBase.logger.warning(
-                        'Unparseable URL {}, entry #{}'.format(
-                            loggable_url, no + 1))
+                        f"Unparseable URL {loggable_url}, entry #{no + 1}"
+                    )
                     continue
 
                 # add our results to our global set
-                results.append(_results)
+                results.append(results_)
 
             elif isinstance(url, dict):
                 # We are a url string with additional unescaped options. In
@@ -1042,41 +1106,51 @@ def config_parse_yaml(content, asset=None):
                 it = iter(url.items())
 
                 # Track the URL to-load
-                _url = None
+                url_ = None
 
                 # Track last acquired schema
                 schema = None
-                for key, tokens in it:
+
+                for key, tokens_ in it:
                     # Test our schema
-                    _schema = GET_SCHEMA_RE.match(key)
-                    if _schema is None:
+                    schema_ = GET_SCHEMA_RE.match(key)
+                    if schema_ is None:
                         # Log invalid entries so that maintainer of config
                         # config file at least has something to take action
                         # with.
                         ConfigBase.logger.warning(
-                            'Ignored entry {} found under urls, entry #{}'
-                            .format(key, no + 1))
+                            f"Ignored entry {key} found under urls, entry"
+                            f" #{no + 1}"
+                        )
                         continue
 
                     # Store our schema
-                    schema = _schema.group('schema').lower()
+                    schema = schema_.group("schema").lower()
 
                     # Store our URL and Schema Regex
-                    _url = key
+                    url_ = key
+
+                    # Update our token assignment
+                    tokens = tokens_
+
+                    # We're done
+                    break
 
-                if _url is None:
+                if url_ is None:
                     # the loop above failed to match anything
                     ConfigBase.logger.warning(
-                        'Unsupported URL, entry #{}'.format(no + 1))
+                        f"Unsupported URL, entry #{no + 1}"
+                    )
                     continue
 
-                _results = plugins.url_to_dict(
-                    _url, secure_logging=asset.secure_logging)
-                if _results is None:
+                results_ = plugins.url_to_dict(
+                    url_, secure_logging=asset.secure_logging
+                )
+                if results_ is None:
                     # Setup dictionary
-                    _results = {
+                    results_ = {
                         # Minimum requirements
-                        'schema': schema,
+                        "schema": schema,
                     }
 
                 if isinstance(tokens, (list, tuple, set)):
@@ -1085,20 +1159,21 @@ def config_parse_yaml(content, asset=None):
                     for entries in tokens:
                         # Copy ourselves a template of our parsed URL as a base
                         # to work with
-                        r = _results.copy()
+                        r = results_.copy()
 
                         # We are a url string with additional unescaped options
                         if isinstance(entries, dict):
-                            _url, tokens = next(iter(url.items()))
+                            url_, tokens = next(iter(url.items()))
 
                             # Tags you just can't over-ride
-                            if 'schema' in entries:
-                                del entries['schema']
+                            if "schema" in entries:
+                                del entries["schema"]
 
                             # support our special tokens (if they're present)
                             if schema in N_MGR:
                                 entries = ConfigBase._special_token_handler(
-                                    schema, entries)
+                                    schema, entries
+                                )
 
                             # Extend our dictionary with our new entries
                             r.update(entries)
@@ -1110,11 +1185,12 @@ def config_parse_yaml(content, asset=None):
                     # support our special tokens (if they're present)
                     if schema in N_MGR:
                         tokens = ConfigBase._special_token_handler(
-                            schema, tokens)
+                            schema, tokens
+                        )
 
                     # Copy ourselves a template of our parsed URL as a base to
                     # work with
-                    r = _results.copy()
+                    r = results_.copy()
 
                     # add our result set
                     r.update(tokens)
@@ -1124,71 +1200,97 @@ def config_parse_yaml(content, asset=None):
 
                 else:
                     # add our results to our global set
-                    results.append(_results)
+                    results.append(results_)
 
             else:
                 # Unsupported
                 ConfigBase.logger.warning(
-                    'Unsupported Apprise YAML entry #{}'.format(no + 1))
+                    f"Unsupported Apprise YAML entry #{no + 1}"
+                )
                 continue
 
             # Track our entries
             entry = 0
 
+            # Prepare our results for post-processing
+            results = deque(results)
+
             while len(results):
                 # Increment our entry count
                 entry += 1
 
                 # Grab our first item
-                _results = results.pop(0)
+                results_ = results.popleft()
 
-                if _results['schema'] not in N_MGR:
+                if results_["schema"] not in N_MGR:
                     # the arguments are invalid or can not be used.
                     ConfigBase.logger.warning(
-                        'An invalid Apprise schema ({}) in YAML configuration '
-                        'entry #{}, item #{}'
-                        .format(_results['schema'], no + 1, entry))
+                        "An invalid Apprise schema ({}) in YAML configuration "
+                        "entry #{}, item #{}".format(
+                            results_["schema"], no + 1, entry
+                        )
+                    )
                     continue
 
                 # tag is a special keyword that is managed by Apprise object.
                 # The below ensures our tags are set correctly
-                if 'tag' in _results:
+                if "tag" in results_:
+                    # Tidy our list up
+                    results_["tag"] = (
+                        set(parse_list(results_["tag"], cast=str))
+                        | global_tags
+                    )
+                    if "tags" in results_:
+                        ConfigBase.logger.warning((
+                            "URL #{}: {} contains both 'tag' and 'tags' "
+                            "keyword").format(no + 1, url))
+                        del results_["tags"]
+
+                elif "tags" in results_:
                     # Tidy our list up
-                    _results['tag'] = set(
-                        parse_list(_results['tag'], cast=str)) | global_tags
+                    results_["tag"] = (
+                        set(parse_list(results_["tags"], cast=str))
+                        | global_tags
+                    )
+                    # Should not carry forward
+                    del results_["tags"]
 
                 else:
                     # Just use the global settings
-                    _results['tag'] = global_tags
+                    results_["tag"] = global_tags
 
-                for key in list(_results.keys()):
+                for key in list(results_.keys()):
                     # Strip out any tokens we know that we can't accept and
                     # warn the user
                     match = VALID_TOKEN.match(key)
                     if not match:
                         ConfigBase.logger.warning(
-                            'Ignoring invalid token ({}) found in YAML '
-                            'configuration entry #{}, item #{}'
-                            .format(key, no + 1, entry))
-                        del _results[key]
-
-                ConfigBase.logger.trace(
-                    'URL #{}: {} unpacked as:{}{}'
-                    .format(no + 1, url, os.linesep, os.linesep.join(
-                        ['{}="{}"'.format(k, a)
-                         for k, a in _results.items()])))
+                            f"Ignoring invalid token ({key}) found in YAML "
+                            f"configuration entry #{no + 1}, item #{entry}"
+                        )
+                        del results_[key]
+
+                if ConfigBase.logger.isEnabledFor(logging.TRACE):
+                    ConfigBase.logger.trace(
+                        "URL #%d: %s unpacked as:%s%s",
+                        no + 1,
+                        url,
+                        os.linesep,
+                        os.linesep.join(
+                            [f'{k}="{a}"' for k, a in results_.items()]),
+                    )
 
                 # Prepare our Asset Object
-                _results['asset'] = asset
+                results_["asset"] = asset
 
                 # Handle post processing of result set
-                _results = URLBase.post_process_parse_url_results(_results)
+                results_ = URLBase.post_process_parse_url_results(results_)
 
                 # Store our preloaded entries
                 preloaded.append({
-                    'results': _results,
-                    'entry': no + 1,
-                    'item': entry,
+                    "results": results_,
+                    "entry": no + 1,
+                    "item": entry,
                 })
 
         #
@@ -1202,7 +1304,7 @@ def config_parse_yaml(content, asset=None):
         #
         for entry in preloaded:
             # Point to our results entry for easier reference below
-            results = entry['results']
+            results = entry["results"]
 
             #
             # Apply our tag groups if they're defined
@@ -1210,38 +1312,41 @@ def config_parse_yaml(content, asset=None):
             for group, tags in group_tags.items():
                 # Detect if anything assigned to this tag also maps back to a
                 # group.  If so we want to add the group to our list
-                if next((True for tag in results['tag']
-                         if tag in tags), False):
-                    results['tag'].add(group)
+                if next(
+                    (True for tag in results["tag"] if tag in tags), False
+                ):
+                    results["tag"].add(group)
 
             # Now we generate our plugin
             try:
                 # Attempt to create an instance of our plugin using the
                 # parsed URL information
-                plugin = N_MGR[results['schema']](**results)
+                plugin = N_MGR[results["schema"]](**results)
 
                 # Create log entry of loaded URL
                 ConfigBase.logger.debug(
-                    'Loaded URL: %s', plugin.url(
-                        privacy=results['asset'].secure_logging))
+                    "Loaded URL: %s",
+                    plugin.url(privacy=results["asset"].secure_logging),
+                )
 
             except Exception as e:
                 # the arguments are invalid or can not be used.
                 ConfigBase.logger.warning(
-                    'Could not load Apprise YAML configuration '
-                    'entry #{}, item #{}'
-                    .format(entry['entry'], entry['item']))
-                ConfigBase.logger.debug('Loading Exception: %s' % str(e))
+                    "Could not load Apprise YAML configuration "
+                    "entry #{}, item #{}".format(entry["entry"], entry["item"])
+                )
+                ConfigBase.logger.debug(f"Loading Exception: {e!s}")
                 continue
 
             # if we reach here, we successfully loaded our data
             servers.append(plugin)
 
+        preloaded.clear()
         return (servers, configs)
 
-    def pop(self, index=-1):
-        """
-        Removes an indexed Notification Service from the stack and returns it.
+    def pop(self, index: int = -1) -> object:
+        """Removes an indexed Notification Service from the stack and returns
+        it.
 
         By default, the last element of the list is removed.
         """
@@ -1253,10 +1358,17 @@ def pop(self, index=-1):
         # Pop the element off of the stack
         return self._cached_servers.pop(index)
 
+    def clear_cache(self) -> None:
+        """Cleans cache"""
+        self._cached_servers = None
+        self._cached_time = None
+
     @staticmethod
-    def _special_token_handler(schema, tokens):
-        """
-        This function takes a list of tokens and updates them to no longer
+    def _special_token_handler(
+        schema: str,
+        tokens: dict[str, object],
+    ) -> dict[str, object]:
+        """This function takes a list of tokens and updates them to no longer
         include any special tokens such as +,-, and :
 
         - schema must be a valid schema of a supported plugin type
@@ -1274,12 +1386,14 @@ def _special_token_handler(schema, tokens):
         for kw, meta in N_MGR[schema].template_kwargs.items():
 
             # Determine our prefix:
-            prefix = meta.get('prefix', '+')
+            prefix = meta.get("prefix", "+")
 
             # Detect any matches
-            matches = \
-                {k[1:]: str(v) for k, v in tokens.items()
-                 if k.startswith(prefix)}
+            matches = {
+                k[1:]: str(v)
+                for k, v in tokens.items()
+                if k.startswith(prefix)
+            }
 
             if not matches:
                 # we're done with this entry
@@ -1287,11 +1401,12 @@ def _special_token_handler(schema, tokens):
 
             if not isinstance(tokens.get(kw), dict):
                 # Invalid; correct it
-                tokens[kw] = dict()
+                tokens[kw] = {}
 
             # strip out processed tokens
-            tokens = {k: v for k, v in tokens.items()
-                      if not k.startswith(prefix)}
+            tokens = {
+                k: v for k, v in tokens.items() if not k.startswith(prefix)
+            }
 
             # Update our entries
             tokens[kw].update(matches)
@@ -1318,38 +1433,36 @@ def _special_token_handler(schema, tokens):
 
         for key in list(tokens.keys()):
 
-            if key not in class_templates['args']:
+            if key not in class_templates["args"]:
                 # No need to handle non-arg entries
                 continue
 
             # get our `map_to` and/or 'alias_of' value (if it exists)
-            map_to = class_templates['args'][key].get(
-                'alias_of', class_templates['args'][key].get('map_to', ''))
+            map_to = class_templates["args"][key].get(
+                "alias_of", class_templates["args"][key].get("map_to", "")
+            )
 
             if map_to == key:
                 # We're already good as we are now
                 continue
 
-            if map_to in class_templates['tokens']:
-                meta = class_templates['tokens'][map_to]
+            if map_to in class_templates["tokens"]:
+                meta = class_templates["tokens"][map_to]
 
             else:
-                meta = class_templates['args'].get(
-                    map_to, class_templates['args'][key])
+                meta = class_templates["args"].get(
+                    map_to, class_templates["args"][key]
+                )
 
             # Perform a translation/mapping if our code reaches here
             value = tokens[key]
             del tokens[key]
 
             # Detect if we're dealign with a list or not
-            is_list = re.search(
-                r'^list:.*',
-                meta.get('type'),
-                re.IGNORECASE)
+            is_list = re.search(r"^list:.*", meta.get("type"), re.IGNORECASE)
 
             if map_to not in tokens:
-                tokens[map_to] = [] if is_list \
-                    else meta.get('default')
+                tokens[map_to] = [] if is_list else meta.get("default")
 
             elif is_list and not isinstance(tokens.get(map_to), list):
                 # Convert ourselves to a list if we aren't already
@@ -1357,10 +1470,8 @@ def _special_token_handler(schema, tokens):
 
             # Type Conversion
             if re.search(
-                    r'^(choice:)?string',
-                    meta.get('type'),
-                    re.IGNORECASE) \
-                    and not isinstance(value, str):
+                r"^(choice:)?string", meta.get("type"), re.IGNORECASE
+            ) and not isinstance(value, str):
 
                 # Ensure our format is as expected
                 value = str(value)
@@ -1368,7 +1479,7 @@ def _special_token_handler(schema, tokens):
             # Apply any further translations if required (absolute map)
             # This is the case when an arg maps to a token which further
             # maps to a different function arg on the class constructor
-            abs_map = meta.get('map_to', map_to)
+            abs_map = meta.get("map_to", map_to)
 
             # Set our token as how it was provided by the configuration
             if isinstance(tokens.get(map_to), list):
@@ -1380,44 +1491,38 @@ def _special_token_handler(schema, tokens):
         # Return our tokens
         return tokens
 
-    def __getitem__(self, index):
-        """
-        Returns the indexed server entry associated with the loaded
-        notification servers
-        """
+    def __getitem__(self, index: int) -> object:
+        """Returns the indexed server entry associated with the loaded
+        notification servers."""
         if not isinstance(self._cached_servers, list):
             # Generate ourselves a list of content we can pull from
             self.servers()
 
         return self._cached_servers[index]
 
-    def __iter__(self):
-        """
-        Returns an iterator to our server list
-        """
+    def __iter__(self) -> object:
+        """Returns an iterator to our server list."""
         if not isinstance(self._cached_servers, list):
             # Generate ourselves a list of content we can pull from
             self.servers()
 
         return iter(self._cached_servers)
 
-    def __len__(self):
-        """
-        Returns the total number of servers loaded
-        """
+    def __len__(self) -> int:
+        """Returns the total number of servers loaded."""
         if not isinstance(self._cached_servers, list):
             # Generate ourselves a list of content we can pull from
             self.servers()
 
         return len(self._cached_servers)
 
-    def __bool__(self):
-        """
-        Allows the Apprise object to be wrapped in an 'if statement'.
+    def __bool__(self) -> bool:
+        """Allows the Apprise object to be wrapped in an 'if statement'.
+
         True is returned if our content was downloaded correctly.
         """
         if not isinstance(self._cached_servers, list):
             # Generate ourselves a list of content we can pull from
             self.servers()
 
-        return True if self._cached_servers else False
+        return bool(self._cached_servers)
diff --git a/libs/apprise/config/base.pyi b/libs/apprise/config/base.pyi
deleted file mode 100644
index abff1204d8..0000000000
--- a/libs/apprise/config/base.pyi
+++ /dev/null
@@ -1,3 +0,0 @@
-from .. import URLBase
-
-class ConfigBase(URLBase): ...
\ No newline at end of file
diff --git a/libs/apprise/config/file.py b/libs/apprise/config/file.py
index 3edd6d9a9c..a689466698 100644
--- a/libs/apprise/config/file.py
+++ b/libs/apprise/config/file.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,36 +25,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
 import os
-from .base import ConfigBase
-from ..utils.disk import path_decode
-from ..common import ConfigFormat
-from ..common import ContentIncludeMode
+import re
+
+from ..common import ConfigFormat, ContentIncludeMode
 from ..locale import gettext_lazy as _
+from ..utils.disk import path_decode
+from .base import ConfigBase
 
 
 class ConfigFile(ConfigBase):
-    """
-    A wrapper for File based configuration sources
-    """
+    """A wrapper for File based configuration sources."""
 
     # The default descriptive name associated with the service
-    service_name = _('Local File')
+    service_name = _("Local File")
 
     # The default protocol
-    protocol = 'file'
+    protocol = "file"
 
     # Configuration file inclusion can only be of the same type
     allow_cross_includes = ContentIncludeMode.STRICT
 
     def __init__(self, path, **kwargs):
-        """
-        Initialize File Object
+        """Initialize File Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
@@ -71,61 +66,60 @@ def __init__(self, path, **kwargs):
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our cache value
         if isinstance(self.cache, bool) or not self.cache:
-            cache = 'yes' if self.cache else 'no'
+            cache = "yes" if self.cache else "no"
 
         else:
             cache = int(self.cache)
 
         # Define any URL parameters
         params = {
-            'encoding': self.encoding,
-            'cache': cache,
+            "encoding": self.encoding,
+            "cache": cache,
         }
 
         if self.config_format:
             # A format was enforced; make sure it's passed back with the url
-            params['format'] = self.config_format
+            params["format"] = self.config_format
 
-        return 'file://{path}{params}'.format(
+        return "file://{path}{params}".format(
             path=self.quote(self.__original_path),
-            params='?{}'.format(self.urlencode(params)) if params else '',
+            params=f"?{self.urlencode(params)}" if params else "",
         )
 
     def read(self, **kwargs):
-        """
-        Perform retrieval of the configuration based on the specified request
-        """
+        """Perform retrieval of the configuration based on the specified
+        request."""
 
         response = None
 
         try:
-            if self.max_buffer_size > 0 and \
-                    os.path.getsize(self.path) > self.max_buffer_size:
+            if (
+                self.max_buffer_size > 0
+                and os.path.getsize(self.path) > self.max_buffer_size
+            ):
 
                 # Content exceeds maximum buffer size
                 self.logger.error(
-                    'File size exceeds maximum allowable buffer length'
-                    ' ({}KB).'.format(int(self.max_buffer_size / 1024)))
+                    "File size exceeds maximum allowable buffer length"
+                    f" ({int(self.max_buffer_size / 1024)}KB)."
+                )
                 return None
 
         except OSError:
             # getsize() can throw this acception if the file is missing
             # and or simply isn't accessible
-            self.logger.error(
-                'File is not accessible: {}'.format(self.path))
+            self.logger.error(f"File is not accessible: {self.path}")
             return None
 
         # Always call throttle before any server i/o is made
         self.throttle()
 
         try:
-            with open(self.path, "rt", encoding=self.encoding) as f:
+            with open(self.path, encoding=self.encoding) as f:
                 # Store our content for parsing
                 response = f.read()
 
@@ -135,24 +129,26 @@ def read(self, **kwargs):
             # understand the encoding of..
 
             self.logger.error(
-                'File not using expected encoding ({}) : {}'.format(
-                    self.encoding, self.path))
+                f"File not using expected encoding ({self.encoding}) :"
+                f" {self.path}"
+            )
             return None
 
-        except (IOError, OSError):
+        except OSError:
             # IOError is present for backwards compatibility with Python
             # versions older then 3.3.  >= 3.3 throw OSError now.
 
             # Could not open and/or read the file; this is not a problem since
             # we scan a lot of default paths.
-            self.logger.error(
-                'File can not be opened for read: {}'.format(self.path))
+            self.logger.error(f"File can not be opened for read: {self.path}")
             return None
 
         # Detect config format based on file extension if it isn't already
         # enforced
-        if self.config_format is None and \
-                re.match(r'^.*\.ya?ml\s*$', self.path, re.I) is not None:
+        if (
+            self.config_format is None
+            and re.match(r"^.*\.ya?ml\s*$", self.path, re.I) is not None
+        ):
 
             # YAML Filename Detected
             self.default_config_format = ConfigFormat.YAML
@@ -162,20 +158,17 @@ def read(self, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL so that we can handle all different file paths
-        and return it as our path object
-
-        """
+        """Parses the URL so that we can handle all different file paths and
+        return it as our path object."""
 
         results = ConfigBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early; it's not a good URL
             return results
 
-        match = re.match(r'[a-z0-9]+://(?P<path>[^?]+)(\?.*)?', url, re.I)
+        match = re.match(r"[a-z0-9]+://(?P<path>[^?]+)(\?.*)?", url, re.I)
         if not match:
             return None
 
-        results['path'] = ConfigFile.unquote(match.group('path'))
+        results["path"] = ConfigFile.unquote(match.group("path"))
         return results
diff --git a/libs/apprise/config/http.py b/libs/apprise/config/http.py
index b9c83510aa..a062136ff2 100644
--- a/libs/apprise/config/http.py
+++ b/libs/apprise/config/http.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,39 +26,38 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import re
+
 import requests
-from .base import ConfigBase
-from ..common import ConfigFormat
-from ..common import ContentIncludeMode
-from ..url import PrivacyMode
+
+from ..common import ConfigFormat, ContentIncludeMode
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from .base import ConfigBase
 
 # Support YAML formats
 # text/yaml
 # text/x-yaml
 # application/yaml
 # application/x-yaml
-MIME_IS_YAML = re.compile('(text|application)/(x-)?yaml', re.I)
+MIME_IS_YAML = re.compile(r"(text|application)/(x-)?yaml", re.I)
 
 # Support TEXT formats
 # text/plain
 # text/html
-MIME_IS_TEXT = re.compile('text/(plain|html)', re.I)
+MIME_IS_TEXT = re.compile(r"text/(plain|html)", re.I)
 
 
 class ConfigHTTP(ConfigBase):
-    """
-    A wrapper for HTTP based configuration sources
-    """
+    """A wrapper for HTTP based configuration sources."""
 
     # The default descriptive name associated with the service
-    service_name = _('Web Based')
+    service_name = _("Web Based")
 
     # The default protocol
-    protocol = 'http'
+    protocol = "http"
 
     # The default secure protocol
-    secure_protocol = 'https'
+    secure_protocol = "https"
 
     # If an HTTP error occurs, define the number of characters you still want
     # to read back.  This is useful for debugging purposes, but nothing else.
@@ -71,20 +69,18 @@ class ConfigHTTP(ConfigBase):
     allow_cross_includes = ContentIncludeMode.ALWAYS
 
     def __init__(self, headers=None, **kwargs):
-        """
-        Initialize HTTP Object
+        """Initialize HTTP Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
-        self.schema = 'https' if self.secure else 'http'
+        self.schema = "https" if self.secure else "http"
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = '/'
+            self.fullpath = "/"
 
         self.headers = {}
         if headers:
@@ -94,21 +90,19 @@ def __init__(self, headers=None, **kwargs):
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our cache value
         if isinstance(self.cache, bool) or not self.cache:
-            cache = 'yes' if self.cache else 'no'
+            cache = "yes" if self.cache else "no"
 
         else:
             cache = int(self.cache)
 
         # Define any arguments set
         params = {
-            'encoding': self.encoding,
-            'cache': cache,
+            "encoding": self.encoding,
+            "cache": cache,
         }
 
         # Extend our parameters
@@ -116,44 +110,46 @@ def url(self, privacy=False, *args, **kwargs):
 
         if self.config_format:
             # A format was enforced; make sure it's passed back with the url
-            params['format'] = self.config_format
+            params["format"] = self.config_format
 
         # Append our headers into our args
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=self.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=self.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=self.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=self.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}{fullpath}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
-            hostname=self.quote(self.host, safe=''),
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=self.quote(self.fullpath, safe='/'),
+            hostname=self.quote(self.host, safe=""),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=self.quote(self.fullpath, safe="/"),
             params=self.urlencode(params),
         )
 
     def read(self, **kwargs):
-        """
-        Perform retrieval of the configuration based on the specified request
-        """
+        """Perform retrieval of the configuration based on the specified
+        request."""
 
         # prepare XML Object
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Apply any/all header over-rides defined
@@ -163,15 +159,15 @@ def read(self, **kwargs):
         if self.user:
             auth = (self.user, self.password)
 
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         url += self.fullpath
 
-        self.logger.debug('HTTP POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
+        self.logger.debug(
+            f"HTTP POST URL: {url} (cert_verify={self.verify_certificate!r})"
+        )
 
         # Prepare our response object
         response = None
@@ -185,44 +181,49 @@ def read(self, **kwargs):
         try:
             # Make our request
             with requests.post(
-                    url,
-                    headers=headers,
-                    auth=auth,
-                    verify=self.verify_certificate,
-                    timeout=self.request_timeout,
-                    stream=True) as r:
+                url,
+                headers=headers,
+                auth=auth,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+                stream=True,
+            ) as r:
 
                 # Handle Errors
                 r.raise_for_status()
 
                 # Get our file-size (if known)
                 try:
-                    file_size = int(r.headers.get('Content-Length', '0'))
+                    file_size = int(r.headers.get("Content-Length", "0"))
                 except (TypeError, ValueError):
                     # Handle edge case where Content-Length is a bad value
                     file_size = 0
 
                 # Store our response
-                if self.max_buffer_size > 0 \
-                        and file_size > self.max_buffer_size:
+                if (
+                    self.max_buffer_size > 0
+                    and file_size > self.max_buffer_size
+                ):
 
                     # Provide warning of data truncation
                     self.logger.error(
-                        'HTTP config response exceeds maximum buffer length '
-                        '({}KB);'.format(int(self.max_buffer_size / 1024)))
+                        "HTTP config response exceeds maximum buffer length "
+                        f"({int(self.max_buffer_size / 1024)}KB);"
+                    )
 
                     # Return None - buffer execeeded
                     return None
 
                 # Store our result (but no more than our buffer length)
-                response = r.text[:self.max_buffer_size + 1]
+                response = r.text[: self.max_buffer_size + 1]
 
                 # Verify that our content did not exceed the buffer size:
                 if len(response) > self.max_buffer_size:
                     # Provide warning of data truncation
                     self.logger.error(
-                        'HTTP config response exceeds maximum buffer length '
-                        '({}KB);'.format(int(self.max_buffer_size / 1024)))
+                        "HTTP config response exceeds maximum buffer length "
+                        f"({int(self.max_buffer_size / 1024)}KB);"
+                    )
 
                     # Return None - buffer execeeded
                     return None
@@ -230,7 +231,8 @@ def read(self, **kwargs):
                 # Detect config format based on mime if the format isn't
                 # already enforced
                 content_type = r.headers.get(
-                    'Content-Type', 'application/octet-stream')
+                    "Content-Type", "application/octet-stream"
+                )
                 if self.config_format is None and content_type:
                     if MIME_IS_YAML.match(content_type) is not None:
 
@@ -244,9 +246,10 @@ def read(self, **kwargs):
 
         except requests.RequestException as e:
             self.logger.error(
-                'A Connection error occurred retrieving HTTP '
-                'configuration from %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred retrieving HTTP "
+                f"configuration from {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return None (signifying a failure)
             return None
@@ -256,11 +259,8 @@ def read(self, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = ConfigBase.parse_url(url)
 
         if not results:
@@ -269,7 +269,7 @@ def parse_url(url):
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set
-        results['headers'] = results['qsd-']
-        results['headers'].update(results['qsd+'])
+        results["headers"] = results["qsd-"]
+        results["headers"].update(results["qsd+"])
 
         return results
diff --git a/libs/apprise/config/memory.py b/libs/apprise/config/memory.py
index b2d70096e4..8c391820b7 100644
--- a/libs/apprise/config/memory.py
+++ b/libs/apprise/config/memory.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,28 +25,25 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .base import ConfigBase
 from ..locale import gettext_lazy as _
+from .base import ConfigBase
 
 
 class ConfigMemory(ConfigBase):
-    """
-    For information that was loaded from memory and does not
-    persist anywhere.
-    """
+    """For information that was loaded from memory and does not persist
+    anywhere."""
 
     # The default descriptive name associated with the service
-    service_name = _('Memory')
+    service_name = _("Memory")
 
     # The default protocol
-    protocol = 'memory'
+    protocol = "memory"
 
     def __init__(self, content, **kwargs):
-        """
-        Initialize Memory Object
+        """Initialize Memory Object.
 
-        Memory objects just store the raw configuration in memory.  There is
-        no external reference point. It's always considered cached.
+        Memory objects just store the raw configuration in memory.  There is no
+        external reference point. It's always considered cached.
         """
         super().__init__(**kwargs)
 
@@ -56,30 +52,24 @@ def __init__(self, content, **kwargs):
 
         if self.config_format is None:
             # Detect our format if possible
-            self.config_format = \
-                ConfigMemory.detect_config_format(self.content)
+            self.config_format = ConfigMemory.detect_config_format(
+                self.content
+            )
 
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
-        return 'memory://'
+        return "memory://"
 
     def read(self, **kwargs):
-        """
-        Simply return content stored into memory
-        """
+        """Simply return content stored into memory."""
 
         return self.content
 
     @staticmethod
     def parse_url(url):
-        """
-        Memory objects have no parseable URL
-
-        """
+        """Memory objects have no parseable URL."""
         # These URLs can not be parsed
         return None
diff --git a/libs/apprise/conversion.py b/libs/apprise/conversion.py
index 7f691eae44..e4930f61d6 100644
--- a/libs/apprise/conversion.py
+++ b/libs/apprise/conversion.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,18 +25,18 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from html.parser import HTMLParser
 import re
+
 from markdown import markdown
+
 from .common import NotifyFormat
 from .url import URLBase
 
-from html.parser import HTMLParser
-
 
 def convert_between(from_format, to_format, content):
-    """
-    Converts between different suported formats. If no conversion exists,
-    or the selected one fails, the original text will be returned.
+    """Converts between different suported formats. If no conversion exists, or
+    the selected one fails, the original text will be returned.
 
     This function returns the content translated (if required)
     """
@@ -55,26 +54,22 @@ def convert_between(from_format, to_format, content):
 
 
 def markdown_to_html(content):
-    """
-    Converts specified content from markdown to HTML.
-    """
-    return markdown(content, extensions=[
-        'markdown.extensions.nl2br', 'markdown.extensions.tables'])
+    """Converts specified content from markdown to HTML."""
+    return markdown(
+        content,
+        extensions=["markdown.extensions.nl2br", "markdown.extensions.tables"],
+    )
 
 
 def text_to_html(content):
-    """
-    Converts specified content from plain text to HTML.
-    """
+    """Converts specified content from plain text to HTML."""
 
     # First eliminate any carriage returns
     return URLBase.escape_html(content, convert_new_lines=True)
 
 
 def html_to_text(content):
-    """
-    Converts a content from HTML to plain text.
-    """
+    """Converts a content from HTML to plain text."""
 
     parser = HTMLConverter()
     parser.feed(content)
@@ -82,20 +77,46 @@ def html_to_text(content):
     return parser.converted
 
 
-class HTMLConverter(HTMLParser, object):
+class HTMLConverter(HTMLParser):
     """An HTML to plain text converter tuned for email messages."""
 
     # The following tags must start on a new line
-    BLOCK_TAGS = ('p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-                  'div', 'td', 'th', 'code', 'pre', 'label', 'li',)
+    BLOCK_TAGS = (
+        "p",
+        "h1",
+        "h2",
+        "h3",
+        "h4",
+        "h5",
+        "h6",
+        "div",
+        "td",
+        "th",
+        "code",
+        "pre",
+        "label",
+        "li",
+    )
 
     # the folowing tags ignore any internal text
     IGNORE_TAGS = (
-        'form', 'input', 'textarea', 'select', 'ul', 'ol', 'style', 'link',
-        'meta', 'title', 'html', 'head', 'script')
+        "form",
+        "input",
+        "textarea",
+        "select",
+        "ul",
+        "ol",
+        "style",
+        "link",
+        "meta",
+        "title",
+        "html",
+        "head",
+        "script",
+    )
 
     # Condense Whitespace
-    WS_TRIM = re.compile(r'[\s]+', re.DOTALL | re.MULTILINE)
+    WS_TRIM = re.compile(r"[\s]+", re.DOTALL | re.MULTILINE)
 
     # Sentinel value for block tag boundaries, which may be consolidated into a
     # single line break.
@@ -115,12 +136,11 @@ def __init__(self, **kwargs):
         self.converted = ""
 
     def close(self):
-        string = ''.join(self._finalize(self._result))
+        string = "".join(self._finalize(self._result))
         self.converted = string.strip()
 
     def _finalize(self, result):
-        """
-        Combines and strips consecutive strings, then converts consecutive
+        """Combines and strips consecutive strings, then converts consecutive
         block ends into singleton newlines.
 
         [ {be} " Hello " {be} {be} " World!" ] -> "\nHello\nWorld!"
@@ -136,7 +156,7 @@ def _finalize(self, result):
                     continue
 
                 # First block end; yield the current string, plus a newline.
-                yield accum.strip() + '\n'
+                yield accum.strip() + "\n"
                 accum = None
 
             # Multiple consecutive strings; combine them.
@@ -152,48 +172,40 @@ def _finalize(self, result):
             yield accum.strip()
 
     def handle_data(self, data, *args, **kwargs):
-        """
-        Store our data if it is not on the ignore list
-        """
+        """Store our data if it is not on the ignore list."""
 
         # initialize our previous flag
         if self._do_store:
 
             # Tidy our whitespace
-            content = self.WS_TRIM.sub(' ', data)
+            content = self.WS_TRIM.sub(" ", data)
             self._result.append(content)
 
     def handle_starttag(self, tag, attrs):
-        """
-        Process our starting HTML Tag
-        """
+        """Process our starting HTML Tag."""
         # Toggle initial states
         self._do_store = tag not in self.IGNORE_TAGS
 
         if tag in self.BLOCK_TAGS:
             self._result.append(self.BLOCK_END)
 
-        if tag == 'li':
-            self._result.append('- ')
+        if tag == "li":
+            self._result.append("- ")
 
-        elif tag == 'br':
-            self._result.append('\n')
+        elif tag == "br":
+            self._result.append("\n")
 
-        elif tag == 'hr':
+        elif tag == "hr":
             if self._result and isinstance(self._result[-1], str):
-                self._result[-1] = self._result[-1].rstrip(' ')
-            else:
-                pass
+                self._result[-1] = self._result[-1].rstrip(" ")
 
-            self._result.append('\n---\n')
+            self._result.append("\n---\n")
 
-        elif tag == 'blockquote':
-            self._result.append(' >')
+        elif tag == "blockquote":
+            self._result.append(" >")
 
     def handle_endtag(self, tag):
-        """
-        Edge case handling of open/close tags
-        """
+        """Edge case handling of open/close tags."""
         self._do_store = True
 
         if tag in self.BLOCK_TAGS:
diff --git a/libs/apprise/decorators/__init__.py b/libs/apprise/decorators/__init__.py
index bba1b3b064..9d57312c22 100644
--- a/libs/apprise/decorators/__init__.py
+++ b/libs/apprise/decorators/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,7 +27,4 @@
 
 from .notify import notify
 
-
-__all__ = [
-    'notify'
-]
+__all__ = ["notify"]
diff --git a/libs/apprise/decorators/base.py b/libs/apprise/decorators/base.py
index 82b90f18d0..1fcdb15f2f 100644
--- a/libs/apprise/decorators/base.py
+++ b/libs/apprise/decorators/base.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,31 +26,32 @@
 # POSSIBILITY OF SUCH DAMAGE.USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from ..plugins.base import NotifyBase
-from ..manager_plugins import NotificationManager
-from ..utils.parse import URL_DETAILS_RE, parse_url, url_assembly
-from ..utils.logic import dict_full_update
+import inspect
+
 from .. import common
 from ..logger import logger
-import inspect
+from ..manager_plugins import NotificationManager
+from ..plugins.base import NotifyBase
+from ..utils.logic import dict_full_update
+from ..utils.parse import URL_DETAILS_RE, parse_url, url_assembly
 
 # Grant access to our Notification Manager Singleton
 N_MGR = NotificationManager()
 
 
 class CustomNotifyPlugin(NotifyBase):
-    """
-    Apprise Custom Plugin Hook
+    """Apprise Custom Plugin Hook.
 
     This gets initialized based on @notify decorator definitions
-
     """
-    # Our Custom notification
-    service_url = 'https://github.com/caronc/apprise/wiki/Custom_Notification'
+
+    # Our Custom notification; identify the URL users can go to learn
+    # more about the service this wrapper supports:
+    service_url = "https://appriseit.com/library/extending/decorator/"
 
     # Over-ride our category since this inheritance of the NotifyBase class
     # should be treated differently.
-    category = 'custom'
+    category = "custom"
 
     # Support Attachments
     attachment_support = True
@@ -60,60 +60,58 @@ class CustomNotifyPlugin(NotifyBase):
     storage_mode = common.PersistentStoreMode.AUTO
 
     # Define object templates
-    templates = (
-        '{schema}://',
-    )
+    templates = ("{schema}://",)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns arguments retrieved
-
-        """
+        """Parses the URL and returns arguments retrieved."""
         return parse_url(url, verify_host=False, simple=True)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        General URL assembly
-        """
-        return '{schema}://'.format(schema=self.secure_protocol)
+        """General URL assembly."""
+        return f"{self.secure_protocol}://"
 
     @staticmethod
     def instantiate_plugin(url, send_func, name=None):
-        """
-        The function used to add a new notification plugin based on the schema
-        parsed from the provided URL into our supported matrix structure.
-        """
+        """The function used to add a new notification plugin based on the
+        schema parsed from the provided URL into our supported matrix
+        structure."""
 
         if not isinstance(url, str):
-            msg = 'An invalid custom notify url/schema ({}) provided in ' \
-                'function {}.'.format(url, send_func.__name__)
+            msg = (
+                f"An invalid custom notify url/schema ({url}) provided in "
+                f"function {send_func.__name__}."
+            )
             logger.warning(msg)
             return None
 
         # Validate that our schema is okay
         re_match = URL_DETAILS_RE.match(url)
         if not re_match:
-            msg = 'An invalid custom notify url/schema ({}) provided in ' \
-                'function {}.'.format(url, send_func.__name__)
+            msg = (
+                f"An invalid custom notify url/schema ({url}) provided in "
+                f"function {send_func.__name__}."
+            )
             logger.warning(msg)
             return None
 
         # Acquire our schema
-        schema = re_match.group('schema').lower()
+        schema = re_match.group("schema").lower()
 
-        if not re_match.group('base'):
-            url = '{}://'.format(schema)
+        if not re_match.group("base"):
+            url = f"{schema}://"
 
         # Keep a default set of arguments to apply to all called references
         base_args = parse_url(
-            url, default_schema=schema, verify_host=False, simple=True)
+            url, default_schema=schema, verify_host=False, simple=True
+        )
 
         if schema in N_MGR:
             # we're already handling this object
-            msg = 'The schema ({}) is already defined and could not be ' \
-                'loaded from custom notify function {}.' \
-                .format(url, send_func.__name__)
+            msg = (
+                f"The schema ({url}) is already defined and could not be "
+                f"loaded from custom notify function {send_func.__name__}."
+            )
             logger.warning(msg)
             return None
 
@@ -124,15 +122,18 @@ def instantiate_plugin(url, send_func, name=None):
         class CustomNotifyPluginWrapper(CustomNotifyPlugin):
 
             # Our Service Name
-            service_name = name if isinstance(name, str) \
-                and name else 'Custom - {}'.format(schema)
+            service_name = (
+                name
+                if isinstance(name, str) and name
+                else f"Custom - {schema}"
+            )
 
             # Store our matched schema
             secure_protocol = schema
 
             requirements = {
                 # Define our required packaging in order to work
-                'details': "Source: {}".format(inspect.getfile(send_func))
+                "details": f"Source: {inspect.getfile(send_func)}"
             }
 
             # Assign our send() function
@@ -142,18 +143,14 @@ class CustomNotifyPluginWrapper(CustomNotifyPlugin):
             _base_args = base_args
 
             def __init__(self, **kwargs):
-                """
-                Our initialization
-
-                """
+                """Our initialization."""
                 #  init parent
                 super().__init__(**kwargs)
 
                 self._default_args = {}
 
                 # Some variables do not need to be set
-                if 'secure' in kwargs:
-                    del kwargs['secure']
+                kwargs.pop("secure", None)
 
                 # Apply our updates based on what was parsed
                 dict_full_update(self._default_args, self._base_args)
@@ -161,52 +158,54 @@ def __init__(self, **kwargs):
 
                 # Update our arguments (applying them to what we originally)
                 # initialized as
-                self._default_args['url'] = url_assembly(**self._default_args)
-
-            def send(self, body, title='', notify_type=common.NotifyType.INFO,
-                     *args, **kwargs):
-                """
-                Our send() call which triggers our hook
-                """
+                self._default_args["url"] = url_assembly(**self._default_args)
+
+            def send(
+                self,
+                body,
+                title="",
+                notify_type=common.NotifyType.INFO,
+                *args,
+                **kwargs,
+            ):
+                """Our send() call which triggers our hook."""
 
                 response = False
                 try:
                     # Enforce a boolean response
                     result = self.__send(
-                        body, title, notify_type, *args,
-                        meta=self._default_args, **kwargs)
-
-                    if result is None:
-                        # The wrapper did not define a return (or returned
-                        # None)
-                        # this is treated as a successful return as it is
-                        # assumed the developer did not care about the result
-                        # of the call.
-                        response = True
-
-                    else:
-                        # Perform boolean check (allowing obects to also be
-                        # returned and check against the __bool__ call
-                        response = True if result else False
+                        body,
+                        title,
+                        notify_type.value,
+                        *args,
+                        meta=self._default_args,
+                        **kwargs,
+                    )
+
+                    # None and True are both considered successful
+                    # False however is passed along further upstream
+                    response = True if result is None else bool(result)
 
                 except Exception as e:
                     # Unhandled Exception
                     self.logger.warning(
-                        'An exception occured sending a %s notification.',
-                        N_MGR[self.secure_protocol].service_name)
+                        "An exception occured sending a %s notification.",
+                        N_MGR[self.secure_protocol].service_name,
+                    )
                     self.logger.debug(
-                        '%s Exception: %s',
-                        N_MGR[self.secure_protocol], str(e))
+                        "%s Exception: %s", N_MGR[self.secure_protocol], e)
                     return False
 
                 if response:
                     self.logger.info(
-                        'Sent %s notification.',
-                        N_MGR[self.secure_protocol].service_name)
+                        "Sent %s notification.",
+                        N_MGR[self.secure_protocol].service_name,
+                    )
                 else:
                     self.logger.warning(
-                        'Failed to send %s notification.',
-                        N_MGR[self.secure_protocol].service_name)
+                        "Failed to send %s notification.",
+                        N_MGR[self.secure_protocol].service_name,
+                    )
                 return response
 
         # Store our plugin into our core map file
diff --git a/libs/apprise/decorators/notify.py b/libs/apprise/decorators/notify.py
index 41e49de855..882e19e827 100644
--- a/libs/apprise/decorators/notify.py
+++ b/libs/apprise/decorators/notify.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -113,14 +112,14 @@ def your_action(body, title, *args, **kwargs)
     treated as as success (True).
 
     """
+
     def wrapper(func):
-        """
-        Instantiate our custom (notification) plugin
-        """
+        """Instantiate our custom (notification) plugin."""
 
         # Generate
         CustomNotifyPlugin.instantiate_plugin(
-            url=on, send_func=func, name=name)
+            url=on, send_func=func, name=name
+        )
 
         return func
 
diff --git a/libs/apprise/emojis.py b/libs/apprise/emojis.py
index 6b9f2dec01..cf6c4ae543 100644
--- a/libs/apprise/emojis.py
+++ b/libs/apprise/emojis.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,10 +27,11 @@
 
 import re
 import time
+
 from .logger import logger
 
 # All Emoji's are wrapped in this character
-DELIM = ':'
+DELIM = ":"
 
 # the map simply contains the emoji that should be mapped to the regular
 # expression it should be swapped on.
@@ -40,2208 +40,2110 @@
     #
     # Face Smiling
     #
-    DELIM + r'grinning' + DELIM: '๐Ÿ˜„',
-    DELIM + r'smile' + DELIM: '๐Ÿ˜„',
-    DELIM + r'(laughing|satisfied)' + DELIM: '๐Ÿ˜†',
-    DELIM + r'rofl' + DELIM: '๐Ÿคฃ',
-    DELIM + r'slightly_smiling_face' + DELIM: '๐Ÿ™‚',
-    DELIM + r'wink' + DELIM: '๐Ÿ˜‰',
-    DELIM + r'innocent' + DELIM: '๐Ÿ˜‡',
-    DELIM + r'smiley' + DELIM: '๐Ÿ˜ƒ',
-    DELIM + r'grin' + DELIM: '๐Ÿ˜ƒ',
-    DELIM + r'sweat_smile' + DELIM: '๐Ÿ˜…',
-    DELIM + r'joy' + DELIM: '๐Ÿ˜‚',
-    DELIM + r'upside_down_face' + DELIM: '๐Ÿ™ƒ',
-    DELIM + r'blush' + DELIM: '๐Ÿ˜Š',
-
+    DELIM + r"grinning" + DELIM: "๐Ÿ˜„",
+    DELIM + r"smile" + DELIM: "๐Ÿ˜„",
+    DELIM + r"(laughing|satisfied)" + DELIM: "๐Ÿ˜†",
+    DELIM + r"rofl" + DELIM: "๐Ÿคฃ",
+    DELIM + r"slightly_smiling_face" + DELIM: "๐Ÿ™‚",
+    DELIM + r"wink" + DELIM: "๐Ÿ˜‰",
+    DELIM + r"innocent" + DELIM: "๐Ÿ˜‡",
+    DELIM + r"smiley" + DELIM: "๐Ÿ˜ƒ",
+    DELIM + r"grin" + DELIM: "๐Ÿ˜ƒ",
+    DELIM + r"sweat_smile" + DELIM: "๐Ÿ˜…",
+    DELIM + r"joy" + DELIM: "๐Ÿ˜‚",
+    DELIM + r"upside_down_face" + DELIM: "๐Ÿ™ƒ",
+    DELIM + r"blush" + DELIM: "๐Ÿ˜Š",
     #
     # Face Affection
     #
-    DELIM + r'smiling_face_with_three_hearts' + DELIM: '๐Ÿฅฐ',
-    DELIM + r'star_struck' + DELIM: '๐Ÿคฉ',
-    DELIM + r'kissing' + DELIM: '๐Ÿ˜—',
-    DELIM + r'kissing_closed_eyes' + DELIM: '๐Ÿ˜š',
-    DELIM + r'smiling_face_with_tear' + DELIM: '๐Ÿฅฒ',
-    DELIM + r'heart_eyes' + DELIM: '๐Ÿ˜',
-    DELIM + r'kissing_heart' + DELIM: '๐Ÿ˜˜',
-    DELIM + r'relaxed' + DELIM: 'โ˜บ๏ธ',
-    DELIM + r'kissing_smiling_eyes' + DELIM: '๐Ÿ˜™',
-
+    DELIM + r"smiling_face_with_three_hearts" + DELIM: "๐Ÿฅฐ",
+    DELIM + r"star_struck" + DELIM: "๐Ÿคฉ",
+    DELIM + r"kissing" + DELIM: "๐Ÿ˜—",
+    DELIM + r"kissing_closed_eyes" + DELIM: "๐Ÿ˜š",
+    DELIM + r"smiling_face_with_tear" + DELIM: "๐Ÿฅฒ",
+    DELIM + r"heart_eyes" + DELIM: "๐Ÿ˜",
+    DELIM + r"kissing_heart" + DELIM: "๐Ÿ˜˜",
+    DELIM + r"relaxed" + DELIM: "โ˜บ๏ธ",
+    DELIM + r"kissing_smiling_eyes" + DELIM: "๐Ÿ˜™",
     #
     # Face Tongue
     #
-    DELIM + r'yum' + DELIM: '๐Ÿ˜‹',
-    DELIM + r'stuck_out_tongue_winking_eye' + DELIM: '๐Ÿ˜œ',
-    DELIM + r'stuck_out_tongue_closed_eyes' + DELIM: '๐Ÿ˜',
-    DELIM + r'stuck_out_tongue' + DELIM: '๐Ÿ˜›',
-    DELIM + r'zany_face' + DELIM: '๐Ÿคช',
-    DELIM + r'money_mouth_face' + DELIM: '๐Ÿค‘',
-
+    DELIM + r"yum" + DELIM: "๐Ÿ˜‹",
+    DELIM + r"stuck_out_tongue_winking_eye" + DELIM: "๐Ÿ˜œ",
+    DELIM + r"stuck_out_tongue_closed_eyes" + DELIM: "๐Ÿ˜",
+    DELIM + r"stuck_out_tongue" + DELIM: "๐Ÿ˜›",
+    DELIM + r"zany_face" + DELIM: "๐Ÿคช",
+    DELIM + r"money_mouth_face" + DELIM: "๐Ÿค‘",
     #
     # Face Hand
     #
-    DELIM + r'hugs' + DELIM: '๐Ÿค—',
-    DELIM + r'shushing_face' + DELIM: '๐Ÿคซ',
-    DELIM + r'hand_over_mouth' + DELIM: '๐Ÿคญ',
-    DELIM + r'thinking' + DELIM: '๐Ÿค”',
-
+    DELIM + r"hugs" + DELIM: "๐Ÿค—",
+    DELIM + r"shushing_face" + DELIM: "๐Ÿคซ",
+    DELIM + r"hand_over_mouth" + DELIM: "๐Ÿคญ",
+    DELIM + r"thinking" + DELIM: "๐Ÿค”",
     #
     # Face Neutral Skeptical
     #
-    DELIM + r'zipper_mouth_face' + DELIM: '๐Ÿค',
-    DELIM + r'neutral_face' + DELIM: '๐Ÿ˜',
-    DELIM + r'no_mouth' + DELIM: '๐Ÿ˜ถ',
-    DELIM + r'smirk' + DELIM: '๐Ÿ˜',
-    DELIM + r'roll_eyes' + DELIM: '๐Ÿ™„',
-    DELIM + r'face_exhaling' + DELIM: '๐Ÿ˜ฎโ€๐Ÿ’จ',
-    DELIM + r'raised_eyebrow' + DELIM: '๐Ÿคจ',
-    DELIM + r'expressionless' + DELIM: '๐Ÿ˜‘',
-    DELIM + r'face_in_clouds' + DELIM: '๐Ÿ˜ถโ€๐ŸŒซ๏ธ',
-    DELIM + r'unamused' + DELIM: '๐Ÿ˜’',
-    DELIM + r'grimacing' + DELIM: '๐Ÿ˜ฌ',
-    DELIM + r'lying_face' + DELIM: '๐Ÿคฅ',
-
+    DELIM + r"zipper_mouth_face" + DELIM: "๐Ÿค",
+    DELIM + r"neutral_face" + DELIM: "๐Ÿ˜",
+    DELIM + r"no_mouth" + DELIM: "๐Ÿ˜ถ",
+    DELIM + r"smirk" + DELIM: "๐Ÿ˜",
+    DELIM + r"roll_eyes" + DELIM: "๐Ÿ™„",
+    DELIM + r"face_exhaling" + DELIM: "๐Ÿ˜ฎโ€๐Ÿ’จ",
+    DELIM + r"raised_eyebrow" + DELIM: "๐Ÿคจ",
+    DELIM + r"expressionless" + DELIM: "๐Ÿ˜‘",
+    DELIM + r"face_in_clouds" + DELIM: "๐Ÿ˜ถโ€๐ŸŒซ๏ธ",
+    DELIM + r"unamused" + DELIM: "๐Ÿ˜’",
+    DELIM + r"grimacing" + DELIM: "๐Ÿ˜ฌ",
+    DELIM + r"lying_face" + DELIM: "๐Ÿคฅ",
     #
     # Face Sleepy
     #
-    DELIM + r'relieved' + DELIM: '๐Ÿ˜Œ',
-    DELIM + r'sleepy' + DELIM: '๐Ÿ˜ช',
-    DELIM + r'sleeping' + DELIM: '๐Ÿ˜ด',
-    DELIM + r'pensive' + DELIM: '๐Ÿ˜”',
-    DELIM + r'drooling_face' + DELIM: '๐Ÿคค',
-
+    DELIM + r"relieved" + DELIM: "๐Ÿ˜Œ",
+    DELIM + r"sleepy" + DELIM: "๐Ÿ˜ช",
+    DELIM + r"sleeping" + DELIM: "๐Ÿ˜ด",
+    DELIM + r"pensive" + DELIM: "๐Ÿ˜”",
+    DELIM + r"drooling_face" + DELIM: "๐Ÿคค",
     #
     # Face Unwell
     #
-    DELIM + r'mask' + DELIM: '๐Ÿ˜ท',
-    DELIM + r'face_with_head_bandage' + DELIM: '๐Ÿค•',
-    DELIM + r'vomiting_face' + DELIM: '๐Ÿคฎ',
-    DELIM + r'hot_face' + DELIM: '๐Ÿฅต',
-    DELIM + r'woozy_face' + DELIM: '๐Ÿฅด',
-    DELIM + r'face_with_spiral_eyes' + DELIM: '๐Ÿ˜ตโ€๐Ÿ’ซ',
-    DELIM + r'face_with_thermometer' + DELIM: '๐Ÿค’',
-    DELIM + r'nauseated_face' + DELIM: '๐Ÿคข',
-    DELIM + r'sneezing_face' + DELIM: '๐Ÿคง',
-    DELIM + r'cold_face' + DELIM: '๐Ÿฅถ',
-    DELIM + r'dizzy_face' + DELIM: '๐Ÿ˜ต',
-    DELIM + r'exploding_head' + DELIM: '๐Ÿคฏ',
-
+    DELIM + r"mask" + DELIM: "๐Ÿ˜ท",
+    DELIM + r"face_with_head_bandage" + DELIM: "๐Ÿค•",
+    DELIM + r"vomiting_face" + DELIM: "๐Ÿคฎ",
+    DELIM + r"hot_face" + DELIM: "๐Ÿฅต",
+    DELIM + r"woozy_face" + DELIM: "๐Ÿฅด",
+    DELIM + r"face_with_spiral_eyes" + DELIM: "๐Ÿ˜ตโ€๐Ÿ’ซ",
+    DELIM + r"face_with_thermometer" + DELIM: "๐Ÿค’",
+    DELIM + r"nauseated_face" + DELIM: "๐Ÿคข",
+    DELIM + r"sneezing_face" + DELIM: "๐Ÿคง",
+    DELIM + r"cold_face" + DELIM: "๐Ÿฅถ",
+    DELIM + r"dizzy_face" + DELIM: "๐Ÿ˜ต",
+    DELIM + r"exploding_head" + DELIM: "๐Ÿคฏ",
     #
     # Face Hat
     #
-    DELIM + r'cowboy_hat_face' + DELIM: '๐Ÿค ',
-    DELIM + r'disguised_face' + DELIM: '๐Ÿฅธ',
-    DELIM + r'partying_face' + DELIM: '๐Ÿฅณ',
-
+    DELIM + r"cowboy_hat_face" + DELIM: "๐Ÿค ",
+    DELIM + r"disguised_face" + DELIM: "๐Ÿฅธ",
+    DELIM + r"partying_face" + DELIM: "๐Ÿฅณ",
     #
     # Face Glasses
     #
-    DELIM + r'sunglasses' + DELIM: '๐Ÿ˜Ž',
-    DELIM + r'monocle_face' + DELIM: '๐Ÿง',
-    DELIM + r'nerd_face' + DELIM: '๐Ÿค“',
-
+    DELIM + r"sunglasses" + DELIM: "๐Ÿ˜Ž",
+    DELIM + r"monocle_face" + DELIM: "๐Ÿง",
+    DELIM + r"nerd_face" + DELIM: "๐Ÿค“",
     #
     # Face Concerned
     #
-    DELIM + r'confused' + DELIM: '๐Ÿ˜•',
-    DELIM + r'slightly_frowning_face' + DELIM: '๐Ÿ™',
-    DELIM + r'open_mouth' + DELIM: '๐Ÿ˜ฎ',
-    DELIM + r'astonished' + DELIM: '๐Ÿ˜ฒ',
-    DELIM + r'pleading_face' + DELIM: '๐Ÿฅบ',
-    DELIM + r'anguished' + DELIM: '๐Ÿ˜ง',
-    DELIM + r'cold_sweat' + DELIM: '๐Ÿ˜ฐ',
-    DELIM + r'cry' + DELIM: '๐Ÿ˜ข',
-    DELIM + r'scream' + DELIM: '๐Ÿ˜ฑ',
-    DELIM + r'persevere' + DELIM: '๐Ÿ˜ฃ',
-    DELIM + r'sweat' + DELIM: '๐Ÿ˜“',
-    DELIM + r'tired_face' + DELIM: '๐Ÿ˜ซ',
-    DELIM + r'worried' + DELIM: '๐Ÿ˜Ÿ',
-    DELIM + r'frowning_face' + DELIM: 'โ˜น๏ธ',
-    DELIM + r'hushed' + DELIM: '๐Ÿ˜ฏ',
-    DELIM + r'flushed' + DELIM: '๐Ÿ˜ณ',
-    DELIM + r'frowning' + DELIM: '๐Ÿ˜ฆ',
-    DELIM + r'fearful' + DELIM: '๐Ÿ˜จ',
-    DELIM + r'disappointed_relieved' + DELIM: '๐Ÿ˜ฅ',
-    DELIM + r'sob' + DELIM: '๐Ÿ˜ญ',
-    DELIM + r'confounded' + DELIM: '๐Ÿ˜–',
-    DELIM + r'disappointed' + DELIM: '๐Ÿ˜ž',
-    DELIM + r'weary' + DELIM: '๐Ÿ˜ฉ',
-    DELIM + r'yawning_face' + DELIM: '๐Ÿฅฑ',
-
+    DELIM + r"confused" + DELIM: "๐Ÿ˜•",
+    DELIM + r"slightly_frowning_face" + DELIM: "๐Ÿ™",
+    DELIM + r"open_mouth" + DELIM: "๐Ÿ˜ฎ",
+    DELIM + r"astonished" + DELIM: "๐Ÿ˜ฒ",
+    DELIM + r"pleading_face" + DELIM: "๐Ÿฅบ",
+    DELIM + r"anguished" + DELIM: "๐Ÿ˜ง",
+    DELIM + r"cold_sweat" + DELIM: "๐Ÿ˜ฐ",
+    DELIM + r"cry" + DELIM: "๐Ÿ˜ข",
+    DELIM + r"scream" + DELIM: "๐Ÿ˜ฑ",
+    DELIM + r"persevere" + DELIM: "๐Ÿ˜ฃ",
+    DELIM + r"sweat" + DELIM: "๐Ÿ˜“",
+    DELIM + r"tired_face" + DELIM: "๐Ÿ˜ซ",
+    DELIM + r"worried" + DELIM: "๐Ÿ˜Ÿ",
+    DELIM + r"frowning_face" + DELIM: "โ˜น๏ธ",
+    DELIM + r"hushed" + DELIM: "๐Ÿ˜ฏ",
+    DELIM + r"flushed" + DELIM: "๐Ÿ˜ณ",
+    DELIM + r"frowning" + DELIM: "๐Ÿ˜ฆ",
+    DELIM + r"fearful" + DELIM: "๐Ÿ˜จ",
+    DELIM + r"disappointed_relieved" + DELIM: "๐Ÿ˜ฅ",
+    DELIM + r"sob" + DELIM: "๐Ÿ˜ญ",
+    DELIM + r"confounded" + DELIM: "๐Ÿ˜–",
+    DELIM + r"disappointed" + DELIM: "๐Ÿ˜ž",
+    DELIM + r"weary" + DELIM: "๐Ÿ˜ฉ",
+    DELIM + r"yawning_face" + DELIM: "๐Ÿฅฑ",
     #
     # Face Negative
     #
-    DELIM + r'triumph' + DELIM: '๐Ÿ˜ค',
-    DELIM + r'angry' + DELIM: '๐Ÿ˜ ',
-    DELIM + r'smiling_imp' + DELIM: '๐Ÿ˜ˆ',
-    DELIM + r'skull' + DELIM: '๐Ÿ’€',
-    DELIM + r'(pout|rage)' + DELIM: '๐Ÿ˜ก',
-    DELIM + r'cursing_face' + DELIM: '๐Ÿคฌ',
-    DELIM + r'imp' + DELIM: '๐Ÿ‘ฟ',
-    DELIM + r'skull_and_crossbones' + DELIM: 'โ˜ ๏ธ',
-
+    DELIM + r"triumph" + DELIM: "๐Ÿ˜ค",
+    DELIM + r"angry" + DELIM: "๐Ÿ˜ ",
+    DELIM + r"smiling_imp" + DELIM: "๐Ÿ˜ˆ",
+    DELIM + r"skull" + DELIM: "๐Ÿ’€",
+    DELIM + r"(pout|rage)" + DELIM: "๐Ÿ˜ก",
+    DELIM + r"cursing_face" + DELIM: "๐Ÿคฌ",
+    DELIM + r"imp" + DELIM: "๐Ÿ‘ฟ",
+    DELIM + r"skull_and_crossbones" + DELIM: "โ˜ ๏ธ",
     #
     # Face Costume
     #
-    DELIM + r'(hankey|poop|shit)' + DELIM: '๐Ÿ’ฉ',
-    DELIM + r'japanese_ogre' + DELIM: '๐Ÿ‘น',
-    DELIM + r'ghost' + DELIM: '๐Ÿ‘ป',
-    DELIM + r'space_invader' + DELIM: '๐Ÿ‘พ',
-    DELIM + r'clown_face' + DELIM: '๐Ÿคก',
-    DELIM + r'japanese_goblin' + DELIM: '๐Ÿ‘บ',
-    DELIM + r'alien' + DELIM: '๐Ÿ‘ฝ',
-    DELIM + r'robot' + DELIM: '๐Ÿค–',
-
+    DELIM + r"(hankey|poop|shit)" + DELIM: "๐Ÿ’ฉ",
+    DELIM + r"japanese_ogre" + DELIM: "๐Ÿ‘น",
+    DELIM + r"ghost" + DELIM: "๐Ÿ‘ป",
+    DELIM + r"space_invader" + DELIM: "๐Ÿ‘พ",
+    DELIM + r"clown_face" + DELIM: "๐Ÿคก",
+    DELIM + r"japanese_goblin" + DELIM: "๐Ÿ‘บ",
+    DELIM + r"alien" + DELIM: "๐Ÿ‘ฝ",
+    DELIM + r"robot" + DELIM: "๐Ÿค–",
     #
     # Cat Face
     #
-    DELIM + r'smiley_cat' + DELIM: '๐Ÿ˜บ',
-    DELIM + r'joy_cat' + DELIM: '๐Ÿ˜น',
-    DELIM + r'smirk_cat' + DELIM: '๐Ÿ˜ผ',
-    DELIM + r'scream_cat' + DELIM: '๐Ÿ™€',
-    DELIM + r'pouting_cat' + DELIM: '๐Ÿ˜พ',
-    DELIM + r'smile_cat' + DELIM: '๐Ÿ˜ธ',
-    DELIM + r'heart_eyes_cat' + DELIM: '๐Ÿ˜ป',
-    DELIM + r'kissing_cat' + DELIM: '๐Ÿ˜ฝ',
-    DELIM + r'crying_cat_face' + DELIM: '๐Ÿ˜ฟ',
-
+    DELIM + r"smiley_cat" + DELIM: "๐Ÿ˜บ",
+    DELIM + r"joy_cat" + DELIM: "๐Ÿ˜น",
+    DELIM + r"smirk_cat" + DELIM: "๐Ÿ˜ผ",
+    DELIM + r"scream_cat" + DELIM: "๐Ÿ™€",
+    DELIM + r"pouting_cat" + DELIM: "๐Ÿ˜พ",
+    DELIM + r"smile_cat" + DELIM: "๐Ÿ˜ธ",
+    DELIM + r"heart_eyes_cat" + DELIM: "๐Ÿ˜ป",
+    DELIM + r"kissing_cat" + DELIM: "๐Ÿ˜ฝ",
+    DELIM + r"crying_cat_face" + DELIM: "๐Ÿ˜ฟ",
     #
     # Monkey Face
     #
-    DELIM + r'see_no_evil' + DELIM: '๐Ÿ™ˆ',
-    DELIM + r'speak_no_evil' + DELIM: '๐Ÿ™Š',
-    DELIM + r'hear_no_evil' + DELIM: '๐Ÿ™‰',
-
+    DELIM + r"see_no_evil" + DELIM: "๐Ÿ™ˆ",
+    DELIM + r"speak_no_evil" + DELIM: "๐Ÿ™Š",
+    DELIM + r"hear_no_evil" + DELIM: "๐Ÿ™‰",
     #
     # Heart
     #
-    DELIM + r'love_letter' + DELIM: '๐Ÿ’Œ',
-    DELIM + r'gift_heart' + DELIM: '๐Ÿ’',
-    DELIM + r'heartpulse' + DELIM: '๐Ÿ’—',
-    DELIM + r'revolving_hearts' + DELIM: '๐Ÿ’ž',
-    DELIM + r'heart_decoration' + DELIM: '๐Ÿ’Ÿ',
-    DELIM + r'broken_heart' + DELIM: '๐Ÿ’”',
-    DELIM + r'mending_heart' + DELIM: 'โค๏ธโ€๐Ÿฉน',
-    DELIM + r'orange_heart' + DELIM: '๐Ÿงก',
-    DELIM + r'green_heart' + DELIM: '๐Ÿ’š',
-    DELIM + r'purple_heart' + DELIM: '๐Ÿ’œ',
-    DELIM + r'black_heart' + DELIM: '๐Ÿ–ค',
-    DELIM + r'cupid' + DELIM: '๐Ÿ’˜',
-    DELIM + r'sparkling_heart' + DELIM: '๐Ÿ’–',
-    DELIM + r'heartbeat' + DELIM: '๐Ÿ’“',
-    DELIM + r'two_hearts' + DELIM: '๐Ÿ’•',
-    DELIM + r'heavy_heart_exclamation' + DELIM: 'โฃ๏ธ',
-    DELIM + r'heart_on_fire' + DELIM: 'โค๏ธโ€๐Ÿ”ฅ',
-    DELIM + r'heart' + DELIM: 'โค๏ธ',
-    DELIM + r'yellow_heart' + DELIM: '๐Ÿ’›',
-    DELIM + r'blue_heart' + DELIM: '๐Ÿ’™',
-    DELIM + r'brown_heart' + DELIM: '๐ŸคŽ',
-    DELIM + r'white_heart' + DELIM: '๐Ÿค',
-
+    DELIM + r"love_letter" + DELIM: "๐Ÿ’Œ",
+    DELIM + r"gift_heart" + DELIM: "๐Ÿ’",
+    DELIM + r"heartpulse" + DELIM: "๐Ÿ’—",
+    DELIM + r"revolving_hearts" + DELIM: "๐Ÿ’ž",
+    DELIM + r"heart_decoration" + DELIM: "๐Ÿ’Ÿ",
+    DELIM + r"broken_heart" + DELIM: "๐Ÿ’”",
+    DELIM + r"mending_heart" + DELIM: "โค๏ธโ€๐Ÿฉน",
+    DELIM + r"orange_heart" + DELIM: "๐Ÿงก",
+    DELIM + r"green_heart" + DELIM: "๐Ÿ’š",
+    DELIM + r"purple_heart" + DELIM: "๐Ÿ’œ",
+    DELIM + r"black_heart" + DELIM: "๐Ÿ–ค",
+    DELIM + r"cupid" + DELIM: "๐Ÿ’˜",
+    DELIM + r"sparkling_heart" + DELIM: "๐Ÿ’–",
+    DELIM + r"heartbeat" + DELIM: "๐Ÿ’“",
+    DELIM + r"two_hearts" + DELIM: "๐Ÿ’•",
+    DELIM + r"heavy_heart_exclamation" + DELIM: "โฃ๏ธ",
+    DELIM + r"heart_on_fire" + DELIM: "โค๏ธโ€๐Ÿ”ฅ",
+    DELIM + r"heart" + DELIM: "โค๏ธ",
+    DELIM + r"yellow_heart" + DELIM: "๐Ÿ’›",
+    DELIM + r"blue_heart" + DELIM: "๐Ÿ’™",
+    DELIM + r"brown_heart" + DELIM: "๐ŸคŽ",
+    DELIM + r"white_heart" + DELIM: "๐Ÿค",
     #
     # Emotion
     #
-    DELIM + r'kiss' + DELIM: '๐Ÿ’‹',
-    DELIM + r'anger' + DELIM: '๐Ÿ’ข',
-    DELIM + r'dizzy' + DELIM: '๐Ÿ’ซ',
-    DELIM + r'dash' + DELIM: '๐Ÿ’จ',
-    DELIM + r'speech_balloon' + DELIM: '๐Ÿ’ฌ',
-    DELIM + r'left_speech_bubble' + DELIM: '๐Ÿ—จ๏ธ',
-    DELIM + r'thought_balloon' + DELIM: '๐Ÿ’ญ',
-    DELIM + r'100' + DELIM: '๐Ÿ’ฏ',
-    DELIM + r'(boom|collision)' + DELIM: '๐Ÿ’ฅ',
-    DELIM + r'sweat_drops' + DELIM: '๐Ÿ’ฆ',
-    DELIM + r'hole' + DELIM: '๐Ÿ•ณ๏ธ',
-    DELIM + r'eye_speech_bubble' + DELIM: '๐Ÿ‘๏ธโ€๐Ÿ—จ๏ธ',
-    DELIM + r'right_anger_bubble' + DELIM: '๐Ÿ—ฏ๏ธ',
-    DELIM + r'zzz' + DELIM: '๐Ÿ’ค',
-
+    DELIM + r"kiss" + DELIM: "๐Ÿ’‹",
+    DELIM + r"anger" + DELIM: "๐Ÿ’ข",
+    DELIM + r"dizzy" + DELIM: "๐Ÿ’ซ",
+    DELIM + r"dash" + DELIM: "๐Ÿ’จ",
+    DELIM + r"speech_balloon" + DELIM: "๐Ÿ’ฌ",
+    DELIM + r"left_speech_bubble" + DELIM: "๐Ÿ—จ๏ธ",
+    DELIM + r"thought_balloon" + DELIM: "๐Ÿ’ญ",
+    DELIM + r"100" + DELIM: "๐Ÿ’ฏ",
+    DELIM + r"(boom|collision)" + DELIM: "๐Ÿ’ฅ",
+    DELIM + r"sweat_drops" + DELIM: "๐Ÿ’ฆ",
+    DELIM + r"hole" + DELIM: "๐Ÿ•ณ๏ธ",
+    DELIM + r"eye_speech_bubble" + DELIM: "๐Ÿ‘๏ธโ€๐Ÿ—จ๏ธ",
+    DELIM + r"right_anger_bubble" + DELIM: "๐Ÿ—ฏ๏ธ",
+    DELIM + r"zzz" + DELIM: "๐Ÿ’ค",
     #
     # Hand Fingers Open
     #
-    DELIM + r'wave' + DELIM: '๐Ÿ‘‹',
-    DELIM + r'raised_hand_with_fingers_splayed' + DELIM: '๐Ÿ–๏ธ',
-    DELIM + r'vulcan_salute' + DELIM: '๐Ÿ––',
-    DELIM + r'raised_back_of_hand' + DELIM: '๐Ÿคš',
-    DELIM + r'(raised_)?hand' + DELIM: 'โœ‹',
-
+    DELIM + r"wave" + DELIM: "๐Ÿ‘‹",
+    DELIM + r"raised_hand_with_fingers_splayed" + DELIM: "๐Ÿ–๏ธ",
+    DELIM + r"vulcan_salute" + DELIM: "๐Ÿ––",
+    DELIM + r"raised_back_of_hand" + DELIM: "๐Ÿคš",
+    DELIM + r"(raised_)?hand" + DELIM: "โœ‹",
     #
     # Hand Fingers Partial
     #
-    DELIM + r'ok_hand' + DELIM: '๐Ÿ‘Œ',
-    DELIM + r'pinched_fingers' + DELIM: '๐ŸคŒ',
-    DELIM + r'pinching_hand' + DELIM: '๐Ÿค',
-    DELIM + r'v' + DELIM: 'โœŒ๏ธ',
-    DELIM + r'crossed_fingers' + DELIM: '๐Ÿคž',
-    DELIM + r'love_you_gesture' + DELIM: '๐ŸคŸ',
-    DELIM + r'metal' + DELIM: '๐Ÿค˜',
-    DELIM + r'call_me_hand' + DELIM: '๐Ÿค™',
-
+    DELIM + r"ok_hand" + DELIM: "๐Ÿ‘Œ",
+    DELIM + r"pinched_fingers" + DELIM: "๐ŸคŒ",
+    DELIM + r"pinching_hand" + DELIM: "๐Ÿค",
+    DELIM + r"v" + DELIM: "โœŒ๏ธ",
+    DELIM + r"crossed_fingers" + DELIM: "๐Ÿคž",
+    DELIM + r"love_you_gesture" + DELIM: "๐ŸคŸ",
+    DELIM + r"metal" + DELIM: "๐Ÿค˜",
+    DELIM + r"call_me_hand" + DELIM: "๐Ÿค™",
     #
     # Hand Single Finger
     #
-    DELIM + r'point_left' + DELIM: '๐Ÿ‘ˆ',
-    DELIM + r'point_right' + DELIM: '๐Ÿ‘‰',
-    DELIM + r'point_up_2' + DELIM: '๐Ÿ‘†',
-    DELIM + r'(fu|middle_finger)' + DELIM: '๐Ÿ–•',
-    DELIM + r'point_down' + DELIM: '๐Ÿ‘‡',
-    DELIM + r'point_up' + DELIM: 'โ˜๏ธ',
-
+    DELIM + r"point_left" + DELIM: "๐Ÿ‘ˆ",
+    DELIM + r"point_right" + DELIM: "๐Ÿ‘‰",
+    DELIM + r"point_up_2" + DELIM: "๐Ÿ‘†",
+    DELIM + r"(fu|middle_finger)" + DELIM: "๐Ÿ–•",
+    DELIM + r"point_down" + DELIM: "๐Ÿ‘‡",
+    DELIM + r"point_up" + DELIM: "โ˜๏ธ",
     #
     # Hand Fingers Closed
     #
-    DELIM + r'(\+1|thumbsup)' + DELIM: '๐Ÿ‘',
-    DELIM + r'(-1|thumbsdown)' + DELIM: '๐Ÿ‘Ž',
-    DELIM + r'fist' + DELIM: 'โœŠ',
-    DELIM + r'(fist_(raised|oncoming)|(face)?punch)' + DELIM: '๐Ÿ‘Š',
-    DELIM + r'fist_left' + DELIM: '๐Ÿค›',
-    DELIM + r'fist_right' + DELIM: '๐Ÿคœ',
-
+    DELIM + r"(\+1|thumbsup)" + DELIM: "๐Ÿ‘",
+    DELIM + r"(-1|thumbsdown)" + DELIM: "๐Ÿ‘Ž",
+    DELIM + r"fist" + DELIM: "โœŠ",
+    DELIM + r"(fist_(raised|oncoming)|(face)?punch)" + DELIM: "๐Ÿ‘Š",
+    DELIM + r"fist_left" + DELIM: "๐Ÿค›",
+    DELIM + r"fist_right" + DELIM: "๐Ÿคœ",
     #
     # Hands
     #
-    DELIM + r'clap' + DELIM: '๐Ÿ‘',
-    DELIM + r'raised_hands' + DELIM: '๐Ÿ™Œ',
-    DELIM + r'open_hands' + DELIM: '๐Ÿ‘',
-    DELIM + r'palms_up_together' + DELIM: '๐Ÿคฒ',
-    DELIM + r'handshake' + DELIM: '๐Ÿค',
-    DELIM + r'pray' + DELIM: '๐Ÿ™',
-
+    DELIM + r"clap" + DELIM: "๐Ÿ‘",
+    DELIM + r"raised_hands" + DELIM: "๐Ÿ™Œ",
+    DELIM + r"open_hands" + DELIM: "๐Ÿ‘",
+    DELIM + r"palms_up_together" + DELIM: "๐Ÿคฒ",
+    DELIM + r"handshake" + DELIM: "๐Ÿค",
+    DELIM + r"pray" + DELIM: "๐Ÿ™",
     #
     # Hand Prop
     #
-    DELIM + r'writing_hand' + DELIM: 'โœ๏ธ',
-    DELIM + r'nail_care' + DELIM: '๐Ÿ’…',
-    DELIM + r'selfie' + DELIM: '๐Ÿคณ',
-
+    DELIM + r"writing_hand" + DELIM: "โœ๏ธ",
+    DELIM + r"nail_care" + DELIM: "๐Ÿ’…",
+    DELIM + r"selfie" + DELIM: "๐Ÿคณ",
     #
     # Body Parts
     #
-    DELIM + r'muscle' + DELIM: '๐Ÿ’ช',
-    DELIM + r'mechanical_arm' + DELIM: '๐Ÿฆพ',
-    DELIM + r'mechanical_leg' + DELIM: '๐Ÿฆฟ',
-    DELIM + r'leg' + DELIM: '๐Ÿฆต',
-    DELIM + r'foot' + DELIM: '๐Ÿฆถ',
-    DELIM + r'ear' + DELIM: '๐Ÿ‘‚',
-    DELIM + r'ear_with_hearing_aid' + DELIM: '๐Ÿฆป',
-    DELIM + r'nose' + DELIM: '๐Ÿ‘ƒ',
-    DELIM + r'brain' + DELIM: '๐Ÿง ',
-    DELIM + r'anatomical_heart' + DELIM: '๐Ÿซ€',
-    DELIM + r'lungs' + DELIM: '๐Ÿซ',
-    DELIM + r'tooth' + DELIM: '๐Ÿฆท',
-    DELIM + r'bone' + DELIM: '๐Ÿฆด',
-    DELIM + r'eyes' + DELIM: '๐Ÿ‘€',
-    DELIM + r'eye' + DELIM: '๐Ÿ‘๏ธ',
-    DELIM + r'tongue' + DELIM: '๐Ÿ‘…',
-    DELIM + r'lips' + DELIM: '๐Ÿ‘„',
-
+    DELIM + r"muscle" + DELIM: "๐Ÿ’ช",
+    DELIM + r"mechanical_arm" + DELIM: "๐Ÿฆพ",
+    DELIM + r"mechanical_leg" + DELIM: "๐Ÿฆฟ",
+    DELIM + r"leg" + DELIM: "๐Ÿฆต",
+    DELIM + r"foot" + DELIM: "๐Ÿฆถ",
+    DELIM + r"ear" + DELIM: "๐Ÿ‘‚",
+    DELIM + r"ear_with_hearing_aid" + DELIM: "๐Ÿฆป",
+    DELIM + r"nose" + DELIM: "๐Ÿ‘ƒ",
+    DELIM + r"brain" + DELIM: "๐Ÿง ",
+    DELIM + r"anatomical_heart" + DELIM: "๐Ÿซ€",
+    DELIM + r"lungs" + DELIM: "๐Ÿซ",
+    DELIM + r"tooth" + DELIM: "๐Ÿฆท",
+    DELIM + r"bone" + DELIM: "๐Ÿฆด",
+    DELIM + r"eyes" + DELIM: "๐Ÿ‘€",
+    DELIM + r"eye" + DELIM: "๐Ÿ‘๏ธ",
+    DELIM + r"tongue" + DELIM: "๐Ÿ‘…",
+    DELIM + r"lips" + DELIM: "๐Ÿ‘„",
     #
     # Person
     #
-    DELIM + r'baby' + DELIM: '๐Ÿ‘ถ',
-    DELIM + r'child' + DELIM: '๐Ÿง’',
-    DELIM + r'boy' + DELIM: '๐Ÿ‘ฆ',
-    DELIM + r'girl' + DELIM: '๐Ÿ‘ง',
-    DELIM + r'adult' + DELIM: '๐Ÿง‘',
-    DELIM + r'blond_haired_person' + DELIM: '๐Ÿ‘ฑ',
-    DELIM + r'man' + DELIM: '๐Ÿ‘จ',
-    DELIM + r'bearded_person' + DELIM: '๐Ÿง”',
-    DELIM + r'man_beard' + DELIM: '๐Ÿง”โ€โ™‚๏ธ',
-    DELIM + r'woman_beard' + DELIM: '๐Ÿง”โ€โ™€๏ธ',
-    DELIM + r'red_haired_man' + DELIM: '๐Ÿ‘จโ€๐Ÿฆฐ',
-    DELIM + r'curly_haired_man' + DELIM: '๐Ÿ‘จโ€๐Ÿฆฑ',
-    DELIM + r'white_haired_man' + DELIM: '๐Ÿ‘จโ€๐Ÿฆณ',
-    DELIM + r'bald_man' + DELIM: '๐Ÿ‘จโ€๐Ÿฆฒ',
-    DELIM + r'woman' + DELIM: '๐Ÿ‘ฉ',
-    DELIM + r'red_haired_woman' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆฐ',
-    DELIM + r'person_red_hair' + DELIM: '๐Ÿง‘โ€๐Ÿฆฐ',
-    DELIM + r'curly_haired_woman' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆฑ',
-    DELIM + r'person_curly_hair' + DELIM: '๐Ÿง‘โ€๐Ÿฆฑ',
-    DELIM + r'white_haired_woman' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆณ',
-    DELIM + r'person_white_hair' + DELIM: '๐Ÿง‘โ€๐Ÿฆณ',
-    DELIM + r'bald_woman' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆฒ',
-    DELIM + r'person_bald' + DELIM: '๐Ÿง‘โ€๐Ÿฆฒ',
-    DELIM + r'blond_(haired_)?woman' + DELIM: '๐Ÿ‘ฑโ€โ™€๏ธ',
-    DELIM + r'blond_haired_man' + DELIM: '๐Ÿ‘ฑโ€โ™‚๏ธ',
-    DELIM + r'older_adult' + DELIM: '๐Ÿง“',
-    DELIM + r'older_man' + DELIM: '๐Ÿ‘ด',
-    DELIM + r'older_woman' + DELIM: '๐Ÿ‘ต',
-
+    DELIM + r"baby" + DELIM: "๐Ÿ‘ถ",
+    DELIM + r"child" + DELIM: "๐Ÿง’",
+    DELIM + r"boy" + DELIM: "๐Ÿ‘ฆ",
+    DELIM + r"girl" + DELIM: "๐Ÿ‘ง",
+    DELIM + r"adult" + DELIM: "๐Ÿง‘",
+    DELIM + r"blond_haired_person" + DELIM: "๐Ÿ‘ฑ",
+    DELIM + r"man" + DELIM: "๐Ÿ‘จ",
+    DELIM + r"bearded_person" + DELIM: "๐Ÿง”",
+    DELIM + r"man_beard" + DELIM: "๐Ÿง”โ€โ™‚๏ธ",
+    DELIM + r"woman_beard" + DELIM: "๐Ÿง”โ€โ™€๏ธ",
+    DELIM + r"red_haired_man" + DELIM: "๐Ÿ‘จโ€๐Ÿฆฐ",
+    DELIM + r"curly_haired_man" + DELIM: "๐Ÿ‘จโ€๐Ÿฆฑ",
+    DELIM + r"white_haired_man" + DELIM: "๐Ÿ‘จโ€๐Ÿฆณ",
+    DELIM + r"bald_man" + DELIM: "๐Ÿ‘จโ€๐Ÿฆฒ",
+    DELIM + r"woman" + DELIM: "๐Ÿ‘ฉ",
+    DELIM + r"red_haired_woman" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆฐ",
+    DELIM + r"person_red_hair" + DELIM: "๐Ÿง‘โ€๐Ÿฆฐ",
+    DELIM + r"curly_haired_woman" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆฑ",
+    DELIM + r"person_curly_hair" + DELIM: "๐Ÿง‘โ€๐Ÿฆฑ",
+    DELIM + r"white_haired_woman" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆณ",
+    DELIM + r"person_white_hair" + DELIM: "๐Ÿง‘โ€๐Ÿฆณ",
+    DELIM + r"bald_woman" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆฒ",
+    DELIM + r"person_bald" + DELIM: "๐Ÿง‘โ€๐Ÿฆฒ",
+    DELIM + r"blond_(haired_)?woman" + DELIM: "๐Ÿ‘ฑโ€โ™€๏ธ",
+    DELIM + r"blond_haired_man" + DELIM: "๐Ÿ‘ฑโ€โ™‚๏ธ",
+    DELIM + r"older_adult" + DELIM: "๐Ÿง“",
+    DELIM + r"older_man" + DELIM: "๐Ÿ‘ด",
+    DELIM + r"older_woman" + DELIM: "๐Ÿ‘ต",
     #
     # Person Gesture
     #
-    DELIM + r'frowning_person' + DELIM: '๐Ÿ™',
-    DELIM + r'frowning_man' + DELIM: '๐Ÿ™โ€โ™‚๏ธ',
-    DELIM + r'frowning_woman' + DELIM: '๐Ÿ™โ€โ™€๏ธ',
-    DELIM + r'pouting_face' + DELIM: '๐Ÿ™Ž',
-    DELIM + r'pouting_man' + DELIM: '๐Ÿ™Žโ€โ™‚๏ธ',
-    DELIM + r'pouting_woman' + DELIM: '๐Ÿ™Žโ€โ™€๏ธ',
-    DELIM + r'no_good' + DELIM: '๐Ÿ™…',
-    DELIM + r'(ng|no_good)_man' + DELIM: '๐Ÿ™…โ€โ™‚๏ธ',
-    DELIM + r'(ng_woman|no_good_woman)' + DELIM: '๐Ÿ™…โ€โ™€๏ธ',
-    DELIM + r'ok_person' + DELIM: '๐Ÿ™†',
-    DELIM + r'ok_man' + DELIM: '๐Ÿ™†โ€โ™‚๏ธ',
-    DELIM + r'ok_woman' + DELIM: '๐Ÿ™†โ€โ™€๏ธ',
-    DELIM + r'(information_desk|tipping_hand_)person' + DELIM: '๐Ÿ’',
-    DELIM + r'(sassy_man|tipping_hand_man)' + DELIM: '๐Ÿ’โ€โ™‚๏ธ',
-    DELIM + r'(sassy_woman|tipping_hand_woman)' + DELIM: '๐Ÿ’โ€โ™€๏ธ',
-    DELIM + r'raising_hand' + DELIM: '๐Ÿ™‹',
-    DELIM + r'raising_hand_man' + DELIM: '๐Ÿ™‹โ€โ™‚๏ธ',
-    DELIM + r'raising_hand_woman' + DELIM: '๐Ÿ™‹โ€โ™€๏ธ',
-    DELIM + r'deaf_person' + DELIM: '๐Ÿง',
-    DELIM + r'deaf_man' + DELIM: '๐Ÿงโ€โ™‚๏ธ',
-    DELIM + r'deaf_woman' + DELIM: '๐Ÿงโ€โ™€๏ธ',
-    DELIM + r'bow' + DELIM: '๐Ÿ™‡',
-    DELIM + r'bowing_man' + DELIM: '๐Ÿ™‡โ€โ™‚๏ธ',
-    DELIM + r'bowing_woman' + DELIM: '๐Ÿ™‡โ€โ™€๏ธ',
-    DELIM + r'facepalm' + DELIM: '๐Ÿคฆ',
-    DELIM + r'man_facepalming' + DELIM: '๐Ÿคฆโ€โ™‚๏ธ',
-    DELIM + r'woman_facepalming' + DELIM: '๐Ÿคฆโ€โ™€๏ธ',
-    DELIM + r'shrug' + DELIM: '๐Ÿคท',
-    DELIM + r'man_shrugging' + DELIM: '๐Ÿคทโ€โ™‚๏ธ',
-    DELIM + r'woman_shrugging' + DELIM: '๐Ÿคทโ€โ™€๏ธ',
-
+    DELIM + r"frowning_person" + DELIM: "๐Ÿ™",
+    DELIM + r"frowning_man" + DELIM: "๐Ÿ™โ€โ™‚๏ธ",
+    DELIM + r"frowning_woman" + DELIM: "๐Ÿ™โ€โ™€๏ธ",
+    DELIM + r"pouting_face" + DELIM: "๐Ÿ™Ž",
+    DELIM + r"pouting_man" + DELIM: "๐Ÿ™Žโ€โ™‚๏ธ",
+    DELIM + r"pouting_woman" + DELIM: "๐Ÿ™Žโ€โ™€๏ธ",
+    DELIM + r"no_good" + DELIM: "๐Ÿ™…",
+    DELIM + r"(ng|no_good)_man" + DELIM: "๐Ÿ™…โ€โ™‚๏ธ",
+    DELIM + r"(ng_woman|no_good_woman)" + DELIM: "๐Ÿ™…โ€โ™€๏ธ",
+    DELIM + r"ok_person" + DELIM: "๐Ÿ™†",
+    DELIM + r"ok_man" + DELIM: "๐Ÿ™†โ€โ™‚๏ธ",
+    DELIM + r"ok_woman" + DELIM: "๐Ÿ™†โ€โ™€๏ธ",
+    DELIM + r"(information_desk|tipping_hand_)person" + DELIM: "๐Ÿ’",
+    DELIM + r"(sassy_man|tipping_hand_man)" + DELIM: "๐Ÿ’โ€โ™‚๏ธ",
+    DELIM + r"(sassy_woman|tipping_hand_woman)" + DELIM: "๐Ÿ’โ€โ™€๏ธ",
+    DELIM + r"raising_hand" + DELIM: "๐Ÿ™‹",
+    DELIM + r"raising_hand_man" + DELIM: "๐Ÿ™‹โ€โ™‚๏ธ",
+    DELIM + r"raising_hand_woman" + DELIM: "๐Ÿ™‹โ€โ™€๏ธ",
+    DELIM + r"deaf_person" + DELIM: "๐Ÿง",
+    DELIM + r"deaf_man" + DELIM: "๐Ÿงโ€โ™‚๏ธ",
+    DELIM + r"deaf_woman" + DELIM: "๐Ÿงโ€โ™€๏ธ",
+    DELIM + r"bow" + DELIM: "๐Ÿ™‡",
+    DELIM + r"bowing_man" + DELIM: "๐Ÿ™‡โ€โ™‚๏ธ",
+    DELIM + r"bowing_woman" + DELIM: "๐Ÿ™‡โ€โ™€๏ธ",
+    DELIM + r"facepalm" + DELIM: "๐Ÿคฆ",
+    DELIM + r"man_facepalming" + DELIM: "๐Ÿคฆโ€โ™‚๏ธ",
+    DELIM + r"woman_facepalming" + DELIM: "๐Ÿคฆโ€โ™€๏ธ",
+    DELIM + r"shrug" + DELIM: "๐Ÿคท",
+    DELIM + r"man_shrugging" + DELIM: "๐Ÿคทโ€โ™‚๏ธ",
+    DELIM + r"woman_shrugging" + DELIM: "๐Ÿคทโ€โ™€๏ธ",
     #
     # Person Role
     #
-    DELIM + r'health_worker' + DELIM: '๐Ÿง‘โ€โš•๏ธ',
-    DELIM + r'man_health_worker' + DELIM: '๐Ÿ‘จโ€โš•๏ธ',
-    DELIM + r'woman_health_worker' + DELIM: '๐Ÿ‘ฉโ€โš•๏ธ',
-    DELIM + r'student' + DELIM: '๐Ÿง‘โ€๐ŸŽ“',
-    DELIM + r'man_student' + DELIM: '๐Ÿ‘จโ€๐ŸŽ“',
-    DELIM + r'woman_student' + DELIM: '๐Ÿ‘ฉโ€๐ŸŽ“',
-    DELIM + r'teacher' + DELIM: '๐Ÿง‘โ€๐Ÿซ',
-    DELIM + r'man_teacher' + DELIM: '๐Ÿ‘จโ€๐Ÿซ',
-    DELIM + r'woman_teacher' + DELIM: '๐Ÿ‘ฉโ€๐Ÿซ',
-    DELIM + r'judge' + DELIM: '๐Ÿง‘โ€โš–๏ธ',
-    DELIM + r'man_judge' + DELIM: '๐Ÿ‘จโ€โš–๏ธ',
-    DELIM + r'woman_judge' + DELIM: '๐Ÿ‘ฉโ€โš–๏ธ',
-    DELIM + r'farmer' + DELIM: '๐Ÿง‘โ€๐ŸŒพ',
-    DELIM + r'man_farmer' + DELIM: '๐Ÿ‘จโ€๐ŸŒพ',
-    DELIM + r'woman_farmer' + DELIM: '๐Ÿ‘ฉโ€๐ŸŒพ',
-    DELIM + r'cook' + DELIM: '๐Ÿง‘โ€๐Ÿณ',
-    DELIM + r'man_cook' + DELIM: '๐Ÿ‘จโ€๐Ÿณ',
-    DELIM + r'woman_cook' + DELIM: '๐Ÿ‘ฉโ€๐Ÿณ',
-    DELIM + r'mechanic' + DELIM: '๐Ÿง‘โ€๐Ÿ”ง',
-    DELIM + r'man_mechanic' + DELIM: '๐Ÿ‘จโ€๐Ÿ”ง',
-    DELIM + r'woman_mechanic' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ”ง',
-    DELIM + r'factory_worker' + DELIM: '๐Ÿง‘โ€๐Ÿญ',
-    DELIM + r'man_factory_worker' + DELIM: '๐Ÿ‘จโ€๐Ÿญ',
-    DELIM + r'woman_factory_worker' + DELIM: '๐Ÿ‘ฉโ€๐Ÿญ',
-    DELIM + r'office_worker' + DELIM: '๐Ÿง‘โ€๐Ÿ’ผ',
-    DELIM + r'man_office_worker' + DELIM: '๐Ÿ‘จโ€๐Ÿ’ผ',
-    DELIM + r'woman_office_worker' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ’ผ',
-    DELIM + r'scientist' + DELIM: '๐Ÿง‘โ€๐Ÿ”ฌ',
-    DELIM + r'man_scientist' + DELIM: '๐Ÿ‘จโ€๐Ÿ”ฌ',
-    DELIM + r'woman_scientist' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ”ฌ',
-    DELIM + r'technologist' + DELIM: '๐Ÿง‘โ€๐Ÿ’ป',
-    DELIM + r'man_technologist' + DELIM: '๐Ÿ‘จโ€๐Ÿ’ป',
-    DELIM + r'woman_technologist' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ’ป',
-    DELIM + r'singer' + DELIM: '๐Ÿง‘โ€๐ŸŽค',
-    DELIM + r'man_singer' + DELIM: '๐Ÿ‘จโ€๐ŸŽค',
-    DELIM + r'woman_singer' + DELIM: '๐Ÿ‘ฉโ€๐ŸŽค',
-    DELIM + r'artist' + DELIM: '๐Ÿง‘โ€๐ŸŽจ',
-    DELIM + r'man_artist' + DELIM: '๐Ÿ‘จโ€๐ŸŽจ',
-    DELIM + r'woman_artist' + DELIM: '๐Ÿ‘ฉโ€๐ŸŽจ',
-    DELIM + r'pilot' + DELIM: '๐Ÿง‘โ€โœˆ๏ธ',
-    DELIM + r'man_pilot' + DELIM: '๐Ÿ‘จโ€โœˆ๏ธ',
-    DELIM + r'woman_pilot' + DELIM: '๐Ÿ‘ฉโ€โœˆ๏ธ',
-    DELIM + r'astronaut' + DELIM: '๐Ÿง‘โ€๐Ÿš€',
-    DELIM + r'man_astronaut' + DELIM: '๐Ÿ‘จโ€๐Ÿš€',
-    DELIM + r'woman_astronaut' + DELIM: '๐Ÿ‘ฉโ€๐Ÿš€',
-    DELIM + r'firefighter' + DELIM: '๐Ÿง‘โ€๐Ÿš’',
-    DELIM + r'man_firefighter' + DELIM: '๐Ÿ‘จโ€๐Ÿš’',
-    DELIM + r'woman_firefighter' + DELIM: '๐Ÿ‘ฉโ€๐Ÿš’',
-    DELIM + r'cop' + DELIM: '๐Ÿ‘ฎ',
-    DELIM + r'police(_officer|man)' + DELIM: '๐Ÿ‘ฎโ€โ™‚๏ธ',
-    DELIM + r'policewoman' + DELIM: '๐Ÿ‘ฎโ€โ™€๏ธ',
-    DELIM + r'detective' + DELIM: '๐Ÿ•ต๏ธ',
-    DELIM + r'male_detective' + DELIM: '๐Ÿ•ต๏ธโ€โ™‚๏ธ',
-    DELIM + r'female_detective' + DELIM: '๐Ÿ•ต๏ธโ€โ™€๏ธ',
-    DELIM + r'guard' + DELIM: '๐Ÿ’‚',
-    DELIM + r'guardsman' + DELIM: '๐Ÿ’‚โ€โ™‚๏ธ',
-    DELIM + r'guardswoman' + DELIM: '๐Ÿ’‚โ€โ™€๏ธ',
-    DELIM + r'ninja' + DELIM: '๐Ÿฅท',
-    DELIM + r'construction_worker' + DELIM: '๐Ÿ‘ท',
-    DELIM + r'construction_worker_man' + DELIM: '๐Ÿ‘ทโ€โ™‚๏ธ',
-    DELIM + r'construction_worker_woman' + DELIM: '๐Ÿ‘ทโ€โ™€๏ธ',
-    DELIM + r'prince' + DELIM: '๐Ÿคด',
-    DELIM + r'princess' + DELIM: '๐Ÿ‘ธ',
-    DELIM + r'person_with_turban' + DELIM: '๐Ÿ‘ณ',
-    DELIM + r'man_with_turban' + DELIM: '๐Ÿ‘ณโ€โ™‚๏ธ',
-    DELIM + r'woman_with_turban' + DELIM: '๐Ÿ‘ณโ€โ™€๏ธ',
-    DELIM + r'man_with_gua_pi_mao' + DELIM: '๐Ÿ‘ฒ',
-    DELIM + r'woman_with_headscarf' + DELIM: '๐Ÿง•',
-    DELIM + r'person_in_tuxedo' + DELIM: '๐Ÿคต',
-    DELIM + r'man_in_tuxedo' + DELIM: '๐Ÿคตโ€โ™‚๏ธ',
-    DELIM + r'woman_in_tuxedo' + DELIM: '๐Ÿคตโ€โ™€๏ธ',
-    DELIM + r'person_with_veil' + DELIM: '๐Ÿ‘ฐ',
-    DELIM + r'man_with_veil' + DELIM: '๐Ÿ‘ฐโ€โ™‚๏ธ',
-    DELIM + r'(bride|woman)_with_veil' + DELIM: '๐Ÿ‘ฐโ€โ™€๏ธ',
-    DELIM + r'pregnant_woman' + DELIM: '๐Ÿคฐ',
-    DELIM + r'breast_feeding' + DELIM: '๐Ÿคฑ',
-    DELIM + r'woman_feeding_baby' + DELIM: '๐Ÿ‘ฉโ€๐Ÿผ',
-    DELIM + r'man_feeding_baby' + DELIM: '๐Ÿ‘จโ€๐Ÿผ',
-    DELIM + r'person_feeding_baby' + DELIM: '๐Ÿง‘โ€๐Ÿผ',
-
+    DELIM + r"health_worker" + DELIM: "๐Ÿง‘โ€โš•๏ธ",
+    DELIM + r"man_health_worker" + DELIM: "๐Ÿ‘จโ€โš•๏ธ",
+    DELIM + r"woman_health_worker" + DELIM: "๐Ÿ‘ฉโ€โš•๏ธ",
+    DELIM + r"student" + DELIM: "๐Ÿง‘โ€๐ŸŽ“",
+    DELIM + r"man_student" + DELIM: "๐Ÿ‘จโ€๐ŸŽ“",
+    DELIM + r"woman_student" + DELIM: "๐Ÿ‘ฉโ€๐ŸŽ“",
+    DELIM + r"teacher" + DELIM: "๐Ÿง‘โ€๐Ÿซ",
+    DELIM + r"man_teacher" + DELIM: "๐Ÿ‘จโ€๐Ÿซ",
+    DELIM + r"woman_teacher" + DELIM: "๐Ÿ‘ฉโ€๐Ÿซ",
+    DELIM + r"judge" + DELIM: "๐Ÿง‘โ€โš–๏ธ",
+    DELIM + r"man_judge" + DELIM: "๐Ÿ‘จโ€โš–๏ธ",
+    DELIM + r"woman_judge" + DELIM: "๐Ÿ‘ฉโ€โš–๏ธ",
+    DELIM + r"farmer" + DELIM: "๐Ÿง‘โ€๐ŸŒพ",
+    DELIM + r"man_farmer" + DELIM: "๐Ÿ‘จโ€๐ŸŒพ",
+    DELIM + r"woman_farmer" + DELIM: "๐Ÿ‘ฉโ€๐ŸŒพ",
+    DELIM + r"cook" + DELIM: "๐Ÿง‘โ€๐Ÿณ",
+    DELIM + r"man_cook" + DELIM: "๐Ÿ‘จโ€๐Ÿณ",
+    DELIM + r"woman_cook" + DELIM: "๐Ÿ‘ฉโ€๐Ÿณ",
+    DELIM + r"mechanic" + DELIM: "๐Ÿง‘โ€๐Ÿ”ง",
+    DELIM + r"man_mechanic" + DELIM: "๐Ÿ‘จโ€๐Ÿ”ง",
+    DELIM + r"woman_mechanic" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ”ง",
+    DELIM + r"factory_worker" + DELIM: "๐Ÿง‘โ€๐Ÿญ",
+    DELIM + r"man_factory_worker" + DELIM: "๐Ÿ‘จโ€๐Ÿญ",
+    DELIM + r"woman_factory_worker" + DELIM: "๐Ÿ‘ฉโ€๐Ÿญ",
+    DELIM + r"office_worker" + DELIM: "๐Ÿง‘โ€๐Ÿ’ผ",
+    DELIM + r"man_office_worker" + DELIM: "๐Ÿ‘จโ€๐Ÿ’ผ",
+    DELIM + r"woman_office_worker" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ’ผ",
+    DELIM + r"scientist" + DELIM: "๐Ÿง‘โ€๐Ÿ”ฌ",
+    DELIM + r"man_scientist" + DELIM: "๐Ÿ‘จโ€๐Ÿ”ฌ",
+    DELIM + r"woman_scientist" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ”ฌ",
+    DELIM + r"technologist" + DELIM: "๐Ÿง‘โ€๐Ÿ’ป",
+    DELIM + r"man_technologist" + DELIM: "๐Ÿ‘จโ€๐Ÿ’ป",
+    DELIM + r"woman_technologist" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ’ป",
+    DELIM + r"singer" + DELIM: "๐Ÿง‘โ€๐ŸŽค",
+    DELIM + r"man_singer" + DELIM: "๐Ÿ‘จโ€๐ŸŽค",
+    DELIM + r"woman_singer" + DELIM: "๐Ÿ‘ฉโ€๐ŸŽค",
+    DELIM + r"artist" + DELIM: "๐Ÿง‘โ€๐ŸŽจ",
+    DELIM + r"man_artist" + DELIM: "๐Ÿ‘จโ€๐ŸŽจ",
+    DELIM + r"woman_artist" + DELIM: "๐Ÿ‘ฉโ€๐ŸŽจ",
+    DELIM + r"pilot" + DELIM: "๐Ÿง‘โ€โœˆ๏ธ",
+    DELIM + r"man_pilot" + DELIM: "๐Ÿ‘จโ€โœˆ๏ธ",
+    DELIM + r"woman_pilot" + DELIM: "๐Ÿ‘ฉโ€โœˆ๏ธ",
+    DELIM + r"astronaut" + DELIM: "๐Ÿง‘โ€๐Ÿš€",
+    DELIM + r"man_astronaut" + DELIM: "๐Ÿ‘จโ€๐Ÿš€",
+    DELIM + r"woman_astronaut" + DELIM: "๐Ÿ‘ฉโ€๐Ÿš€",
+    DELIM + r"firefighter" + DELIM: "๐Ÿง‘โ€๐Ÿš’",
+    DELIM + r"man_firefighter" + DELIM: "๐Ÿ‘จโ€๐Ÿš’",
+    DELIM + r"woman_firefighter" + DELIM: "๐Ÿ‘ฉโ€๐Ÿš’",
+    DELIM + r"cop" + DELIM: "๐Ÿ‘ฎ",
+    DELIM + r"police(_officer|man)" + DELIM: "๐Ÿ‘ฎโ€โ™‚๏ธ",
+    DELIM + r"policewoman" + DELIM: "๐Ÿ‘ฎโ€โ™€๏ธ",
+    DELIM + r"detective" + DELIM: "๐Ÿ•ต๏ธ",
+    DELIM + r"male_detective" + DELIM: "๐Ÿ•ต๏ธโ€โ™‚๏ธ",
+    DELIM + r"female_detective" + DELIM: "๐Ÿ•ต๏ธโ€โ™€๏ธ",
+    DELIM + r"guard" + DELIM: "๐Ÿ’‚",
+    DELIM + r"guardsman" + DELIM: "๐Ÿ’‚โ€โ™‚๏ธ",
+    DELIM + r"guardswoman" + DELIM: "๐Ÿ’‚โ€โ™€๏ธ",
+    DELIM + r"ninja" + DELIM: "๐Ÿฅท",
+    DELIM + r"construction_worker" + DELIM: "๐Ÿ‘ท",
+    DELIM + r"construction_worker_man" + DELIM: "๐Ÿ‘ทโ€โ™‚๏ธ",
+    DELIM + r"construction_worker_woman" + DELIM: "๐Ÿ‘ทโ€โ™€๏ธ",
+    DELIM + r"prince" + DELIM: "๐Ÿคด",
+    DELIM + r"princess" + DELIM: "๐Ÿ‘ธ",
+    DELIM + r"person_with_turban" + DELIM: "๐Ÿ‘ณ",
+    DELIM + r"man_with_turban" + DELIM: "๐Ÿ‘ณโ€โ™‚๏ธ",
+    DELIM + r"woman_with_turban" + DELIM: "๐Ÿ‘ณโ€โ™€๏ธ",
+    DELIM + r"man_with_gua_pi_mao" + DELIM: "๐Ÿ‘ฒ",
+    DELIM + r"woman_with_headscarf" + DELIM: "๐Ÿง•",
+    DELIM + r"person_in_tuxedo" + DELIM: "๐Ÿคต",
+    DELIM + r"man_in_tuxedo" + DELIM: "๐Ÿคตโ€โ™‚๏ธ",
+    DELIM + r"woman_in_tuxedo" + DELIM: "๐Ÿคตโ€โ™€๏ธ",
+    DELIM + r"person_with_veil" + DELIM: "๐Ÿ‘ฐ",
+    DELIM + r"man_with_veil" + DELIM: "๐Ÿ‘ฐโ€โ™‚๏ธ",
+    DELIM + r"(bride|woman)_with_veil" + DELIM: "๐Ÿ‘ฐโ€โ™€๏ธ",
+    DELIM + r"pregnant_woman" + DELIM: "๐Ÿคฐ",
+    DELIM + r"breast_feeding" + DELIM: "๐Ÿคฑ",
+    DELIM + r"woman_feeding_baby" + DELIM: "๐Ÿ‘ฉโ€๐Ÿผ",
+    DELIM + r"man_feeding_baby" + DELIM: "๐Ÿ‘จโ€๐Ÿผ",
+    DELIM + r"person_feeding_baby" + DELIM: "๐Ÿง‘โ€๐Ÿผ",
     #
     # Person Fantasy
     #
-    DELIM + r'angel' + DELIM: '๐Ÿ‘ผ',
-    DELIM + r'santa' + DELIM: '๐ŸŽ…',
-    DELIM + r'mrs_claus' + DELIM: '๐Ÿคถ',
-    DELIM + r'mx_claus' + DELIM: '๐Ÿง‘โ€๐ŸŽ„',
-    DELIM + r'superhero' + DELIM: '๐Ÿฆธ',
-    DELIM + r'superhero_man' + DELIM: '๐Ÿฆธโ€โ™‚๏ธ',
-    DELIM + r'superhero_woman' + DELIM: '๐Ÿฆธโ€โ™€๏ธ',
-    DELIM + r'supervillain' + DELIM: '๐Ÿฆน',
-    DELIM + r'supervillain_man' + DELIM: '๐Ÿฆนโ€โ™‚๏ธ',
-    DELIM + r'supervillain_woman' + DELIM: '๐Ÿฆนโ€โ™€๏ธ',
-    DELIM + r'mage' + DELIM: '๐Ÿง™',
-    DELIM + r'mage_man' + DELIM: '๐Ÿง™โ€โ™‚๏ธ',
-    DELIM + r'mage_woman' + DELIM: '๐Ÿง™โ€โ™€๏ธ',
-    DELIM + r'fairy' + DELIM: '๐Ÿงš',
-    DELIM + r'fairy_man' + DELIM: '๐Ÿงšโ€โ™‚๏ธ',
-    DELIM + r'fairy_woman' + DELIM: '๐Ÿงšโ€โ™€๏ธ',
-    DELIM + r'vampire' + DELIM: '๐Ÿง›',
-    DELIM + r'vampire_man' + DELIM: '๐Ÿง›โ€โ™‚๏ธ',
-    DELIM + r'vampire_woman' + DELIM: '๐Ÿง›โ€โ™€๏ธ',
-    DELIM + r'merperson' + DELIM: '๐Ÿงœ',
-    DELIM + r'merman' + DELIM: '๐Ÿงœโ€โ™‚๏ธ',
-    DELIM + r'mermaid' + DELIM: '๐Ÿงœโ€โ™€๏ธ',
-    DELIM + r'elf' + DELIM: '๐Ÿง',
-    DELIM + r'elf_man' + DELIM: '๐Ÿงโ€โ™‚๏ธ',
-    DELIM + r'elf_woman' + DELIM: '๐Ÿงโ€โ™€๏ธ',
-    DELIM + r'genie' + DELIM: '๐Ÿงž',
-    DELIM + r'genie_man' + DELIM: '๐Ÿงžโ€โ™‚๏ธ',
-    DELIM + r'genie_woman' + DELIM: '๐Ÿงžโ€โ™€๏ธ',
-    DELIM + r'zombie' + DELIM: '๐ŸงŸ',
-    DELIM + r'zombie_man' + DELIM: '๐ŸงŸโ€โ™‚๏ธ',
-    DELIM + r'zombie_woman' + DELIM: '๐ŸงŸโ€โ™€๏ธ',
-
+    DELIM + r"angel" + DELIM: "๐Ÿ‘ผ",
+    DELIM + r"santa" + DELIM: "๐ŸŽ…",
+    DELIM + r"mrs_claus" + DELIM: "๐Ÿคถ",
+    DELIM + r"mx_claus" + DELIM: "๐Ÿง‘โ€๐ŸŽ„",
+    DELIM + r"superhero" + DELIM: "๐Ÿฆธ",
+    DELIM + r"superhero_man" + DELIM: "๐Ÿฆธโ€โ™‚๏ธ",
+    DELIM + r"superhero_woman" + DELIM: "๐Ÿฆธโ€โ™€๏ธ",
+    DELIM + r"supervillain" + DELIM: "๐Ÿฆน",
+    DELIM + r"supervillain_man" + DELIM: "๐Ÿฆนโ€โ™‚๏ธ",
+    DELIM + r"supervillain_woman" + DELIM: "๐Ÿฆนโ€โ™€๏ธ",
+    DELIM + r"mage" + DELIM: "๐Ÿง™",
+    DELIM + r"mage_man" + DELIM: "๐Ÿง™โ€โ™‚๏ธ",
+    DELIM + r"mage_woman" + DELIM: "๐Ÿง™โ€โ™€๏ธ",
+    DELIM + r"fairy" + DELIM: "๐Ÿงš",
+    DELIM + r"fairy_man" + DELIM: "๐Ÿงšโ€โ™‚๏ธ",
+    DELIM + r"fairy_woman" + DELIM: "๐Ÿงšโ€โ™€๏ธ",
+    DELIM + r"vampire" + DELIM: "๐Ÿง›",
+    DELIM + r"vampire_man" + DELIM: "๐Ÿง›โ€โ™‚๏ธ",
+    DELIM + r"vampire_woman" + DELIM: "๐Ÿง›โ€โ™€๏ธ",
+    DELIM + r"merperson" + DELIM: "๐Ÿงœ",
+    DELIM + r"merman" + DELIM: "๐Ÿงœโ€โ™‚๏ธ",
+    DELIM + r"mermaid" + DELIM: "๐Ÿงœโ€โ™€๏ธ",
+    DELIM + r"elf" + DELIM: "๐Ÿง",
+    DELIM + r"elf_man" + DELIM: "๐Ÿงโ€โ™‚๏ธ",
+    DELIM + r"elf_woman" + DELIM: "๐Ÿงโ€โ™€๏ธ",
+    DELIM + r"genie" + DELIM: "๐Ÿงž",
+    DELIM + r"genie_man" + DELIM: "๐Ÿงžโ€โ™‚๏ธ",
+    DELIM + r"genie_woman" + DELIM: "๐Ÿงžโ€โ™€๏ธ",
+    DELIM + r"zombie" + DELIM: "๐ŸงŸ",
+    DELIM + r"zombie_man" + DELIM: "๐ŸงŸโ€โ™‚๏ธ",
+    DELIM + r"zombie_woman" + DELIM: "๐ŸงŸโ€โ™€๏ธ",
     #
     # Person Activity
     #
-    DELIM + r'massage' + DELIM: '๐Ÿ’†',
-    DELIM + r'massage_man' + DELIM: '๐Ÿ’†โ€โ™‚๏ธ',
-    DELIM + r'massage_woman' + DELIM: '๐Ÿ’†โ€โ™€๏ธ',
-    DELIM + r'haircut' + DELIM: '๐Ÿ’‡',
-    DELIM + r'haircut_man' + DELIM: '๐Ÿ’‡โ€โ™‚๏ธ',
-    DELIM + r'haircut_woman' + DELIM: '๐Ÿ’‡โ€โ™€๏ธ',
-    DELIM + r'walking' + DELIM: '๐Ÿšถ',
-    DELIM + r'walking_man' + DELIM: '๐Ÿšถโ€โ™‚๏ธ',
-    DELIM + r'walking_woman' + DELIM: '๐Ÿšถโ€โ™€๏ธ',
-    DELIM + r'standing_person' + DELIM: '๐Ÿง',
-    DELIM + r'standing_man' + DELIM: '๐Ÿงโ€โ™‚๏ธ',
-    DELIM + r'standing_woman' + DELIM: '๐Ÿงโ€โ™€๏ธ',
-    DELIM + r'kneeling_person' + DELIM: '๐ŸงŽ',
-    DELIM + r'kneeling_man' + DELIM: '๐ŸงŽโ€โ™‚๏ธ',
-    DELIM + r'kneeling_woman' + DELIM: '๐ŸงŽโ€โ™€๏ธ',
-    DELIM + r'person_with_probing_cane' + DELIM: '๐Ÿง‘โ€๐Ÿฆฏ',
-    DELIM + r'man_with_probing_cane' + DELIM: '๐Ÿ‘จโ€๐Ÿฆฏ',
-    DELIM + r'woman_with_probing_cane' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆฏ',
-    DELIM + r'person_in_motorized_wheelchair' + DELIM: '๐Ÿง‘โ€๐Ÿฆผ',
-    DELIM + r'man_in_motorized_wheelchair' + DELIM: '๐Ÿ‘จโ€๐Ÿฆผ',
-    DELIM + r'woman_in_motorized_wheelchair' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆผ',
-    DELIM + r'person_in_manual_wheelchair' + DELIM: '๐Ÿง‘โ€๐Ÿฆฝ',
-    DELIM + r'man_in_manual_wheelchair' + DELIM: '๐Ÿ‘จโ€๐Ÿฆฝ',
-    DELIM + r'woman_in_manual_wheelchair' + DELIM: '๐Ÿ‘ฉโ€๐Ÿฆฝ',
-    DELIM + r'runn(er|ing)' + DELIM: '๐Ÿƒ',
-    DELIM + r'running_man' + DELIM: '๐Ÿƒโ€โ™‚๏ธ',
-    DELIM + r'running_woman' + DELIM: '๐Ÿƒโ€โ™€๏ธ',
-    DELIM + r'(dancer|woman_dancing)' + DELIM: '๐Ÿ’ƒ',
-    DELIM + r'man_dancing' + DELIM: '๐Ÿ•บ',
-    DELIM + r'business_suit_levitating' + DELIM: '๐Ÿ•ด๏ธ',
-    DELIM + r'dancers' + DELIM: '๐Ÿ‘ฏ',
-    DELIM + r'dancing_men' + DELIM: '๐Ÿ‘ฏโ€โ™‚๏ธ',
-    DELIM + r'dancing_women' + DELIM: '๐Ÿ‘ฏโ€โ™€๏ธ',
-    DELIM + r'sauna_person' + DELIM: '๐Ÿง–',
-    DELIM + r'sauna_man' + DELIM: '๐Ÿง–โ€โ™‚๏ธ',
-    DELIM + r'sauna_woman' + DELIM: '๐Ÿง–โ€โ™€๏ธ',
-    DELIM + r'climbing' + DELIM: '๐Ÿง—',
-    DELIM + r'climbing_man' + DELIM: '๐Ÿง—โ€โ™‚๏ธ',
-    DELIM + r'climbing_woman' + DELIM: '๐Ÿง—โ€โ™€๏ธ',
-
+    DELIM + r"massage" + DELIM: "๐Ÿ’†",
+    DELIM + r"massage_man" + DELIM: "๐Ÿ’†โ€โ™‚๏ธ",
+    DELIM + r"massage_woman" + DELIM: "๐Ÿ’†โ€โ™€๏ธ",
+    DELIM + r"haircut" + DELIM: "๐Ÿ’‡",
+    DELIM + r"haircut_man" + DELIM: "๐Ÿ’‡โ€โ™‚๏ธ",
+    DELIM + r"haircut_woman" + DELIM: "๐Ÿ’‡โ€โ™€๏ธ",
+    DELIM + r"walking" + DELIM: "๐Ÿšถ",
+    DELIM + r"walking_man" + DELIM: "๐Ÿšถโ€โ™‚๏ธ",
+    DELIM + r"walking_woman" + DELIM: "๐Ÿšถโ€โ™€๏ธ",
+    DELIM + r"standing_person" + DELIM: "๐Ÿง",
+    DELIM + r"standing_man" + DELIM: "๐Ÿงโ€โ™‚๏ธ",
+    DELIM + r"standing_woman" + DELIM: "๐Ÿงโ€โ™€๏ธ",
+    DELIM + r"kneeling_person" + DELIM: "๐ŸงŽ",
+    DELIM + r"kneeling_man" + DELIM: "๐ŸงŽโ€โ™‚๏ธ",
+    DELIM + r"kneeling_woman" + DELIM: "๐ŸงŽโ€โ™€๏ธ",
+    DELIM + r"person_with_probing_cane" + DELIM: "๐Ÿง‘โ€๐Ÿฆฏ",
+    DELIM + r"man_with_probing_cane" + DELIM: "๐Ÿ‘จโ€๐Ÿฆฏ",
+    DELIM + r"woman_with_probing_cane" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆฏ",
+    DELIM + r"person_in_motorized_wheelchair" + DELIM: "๐Ÿง‘โ€๐Ÿฆผ",
+    DELIM + r"man_in_motorized_wheelchair" + DELIM: "๐Ÿ‘จโ€๐Ÿฆผ",
+    DELIM + r"woman_in_motorized_wheelchair" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆผ",
+    DELIM + r"person_in_manual_wheelchair" + DELIM: "๐Ÿง‘โ€๐Ÿฆฝ",
+    DELIM + r"man_in_manual_wheelchair" + DELIM: "๐Ÿ‘จโ€๐Ÿฆฝ",
+    DELIM + r"woman_in_manual_wheelchair" + DELIM: "๐Ÿ‘ฉโ€๐Ÿฆฝ",
+    DELIM + r"runn(er|ing)" + DELIM: "๐Ÿƒ",
+    DELIM + r"running_man" + DELIM: "๐Ÿƒโ€โ™‚๏ธ",
+    DELIM + r"running_woman" + DELIM: "๐Ÿƒโ€โ™€๏ธ",
+    DELIM + r"(dancer|woman_dancing)" + DELIM: "๐Ÿ’ƒ",
+    DELIM + r"man_dancing" + DELIM: "๐Ÿ•บ",
+    DELIM + r"business_suit_levitating" + DELIM: "๐Ÿ•ด๏ธ",
+    DELIM + r"dancers" + DELIM: "๐Ÿ‘ฏ",
+    DELIM + r"dancing_men" + DELIM: "๐Ÿ‘ฏโ€โ™‚๏ธ",
+    DELIM + r"dancing_women" + DELIM: "๐Ÿ‘ฏโ€โ™€๏ธ",
+    DELIM + r"sauna_person" + DELIM: "๐Ÿง–",
+    DELIM + r"sauna_man" + DELIM: "๐Ÿง–โ€โ™‚๏ธ",
+    DELIM + r"sauna_woman" + DELIM: "๐Ÿง–โ€โ™€๏ธ",
+    DELIM + r"climbing" + DELIM: "๐Ÿง—",
+    DELIM + r"climbing_man" + DELIM: "๐Ÿง—โ€โ™‚๏ธ",
+    DELIM + r"climbing_woman" + DELIM: "๐Ÿง—โ€โ™€๏ธ",
     #
     # Person Sport
     #
-    DELIM + r'person_fencing' + DELIM: '๐Ÿคบ',
-    DELIM + r'horse_racing' + DELIM: '๐Ÿ‡',
-    DELIM + r'skier' + DELIM: 'โ›ท๏ธ',
-    DELIM + r'snowboarder' + DELIM: '๐Ÿ‚',
-    DELIM + r'golfing' + DELIM: '๐ŸŒ๏ธ',
-    DELIM + r'golfing_man' + DELIM: '๐ŸŒ๏ธโ€โ™‚๏ธ',
-    DELIM + r'golfing_woman' + DELIM: '๐ŸŒ๏ธโ€โ™€๏ธ',
-    DELIM + r'surfer' + DELIM: '๐Ÿ„',
-    DELIM + r'surfing_man' + DELIM: '๐Ÿ„โ€โ™‚๏ธ',
-    DELIM + r'surfing_woman' + DELIM: '๐Ÿ„โ€โ™€๏ธ',
-    DELIM + r'rowboat' + DELIM: '๐Ÿšฃ',
-    DELIM + r'rowing_man' + DELIM: '๐Ÿšฃโ€โ™‚๏ธ',
-    DELIM + r'rowing_woman' + DELIM: '๐Ÿšฃโ€โ™€๏ธ',
-    DELIM + r'swimmer' + DELIM: '๐ŸŠ',
-    DELIM + r'swimming_man' + DELIM: '๐ŸŠโ€โ™‚๏ธ',
-    DELIM + r'swimming_woman' + DELIM: '๐ŸŠโ€โ™€๏ธ',
-    DELIM + r'bouncing_ball_person' + DELIM: 'โ›น๏ธ',
-    DELIM + r'(basketball|bouncing_ball)_man' + DELIM: 'โ›น๏ธโ€โ™‚๏ธ',
-    DELIM + r'(basketball|bouncing_ball)_woman' + DELIM: 'โ›น๏ธโ€โ™€๏ธ',
-    DELIM + r'weight_lifting' + DELIM: '๐Ÿ‹๏ธ',
-    DELIM + r'weight_lifting_man' + DELIM: '๐Ÿ‹๏ธโ€โ™‚๏ธ',
-    DELIM + r'weight_lifting_woman' + DELIM: '๐Ÿ‹๏ธโ€โ™€๏ธ',
-    DELIM + r'bicyclist' + DELIM: '๐Ÿšด',
-    DELIM + r'biking_man' + DELIM: '๐Ÿšดโ€โ™‚๏ธ',
-    DELIM + r'biking_woman' + DELIM: '๐Ÿšดโ€โ™€๏ธ',
-    DELIM + r'mountain_bicyclist' + DELIM: '๐Ÿšต',
-    DELIM + r'mountain_biking_man' + DELIM: '๐Ÿšตโ€โ™‚๏ธ',
-    DELIM + r'mountain_biking_woman' + DELIM: '๐Ÿšตโ€โ™€๏ธ',
-    DELIM + r'cartwheeling' + DELIM: '๐Ÿคธ',
-    DELIM + r'man_cartwheeling' + DELIM: '๐Ÿคธโ€โ™‚๏ธ',
-    DELIM + r'woman_cartwheeling' + DELIM: '๐Ÿคธโ€โ™€๏ธ',
-    DELIM + r'wrestling' + DELIM: '๐Ÿคผ',
-    DELIM + r'men_wrestling' + DELIM: '๐Ÿคผโ€โ™‚๏ธ',
-    DELIM + r'women_wrestling' + DELIM: '๐Ÿคผโ€โ™€๏ธ',
-    DELIM + r'water_polo' + DELIM: '๐Ÿคฝ',
-    DELIM + r'man_playing_water_polo' + DELIM: '๐Ÿคฝโ€โ™‚๏ธ',
-    DELIM + r'woman_playing_water_polo' + DELIM: '๐Ÿคฝโ€โ™€๏ธ',
-    DELIM + r'handball_person' + DELIM: '๐Ÿคพ',
-    DELIM + r'man_playing_handball' + DELIM: '๐Ÿคพโ€โ™‚๏ธ',
-    DELIM + r'woman_playing_handball' + DELIM: '๐Ÿคพโ€โ™€๏ธ',
-    DELIM + r'juggling_person' + DELIM: '๐Ÿคน',
-    DELIM + r'man_juggling' + DELIM: '๐Ÿคนโ€โ™‚๏ธ',
-    DELIM + r'woman_juggling' + DELIM: '๐Ÿคนโ€โ™€๏ธ',
-
+    DELIM + r"person_fencing" + DELIM: "๐Ÿคบ",
+    DELIM + r"horse_racing" + DELIM: "๐Ÿ‡",
+    DELIM + r"skier" + DELIM: "โ›ท๏ธ",
+    DELIM + r"snowboarder" + DELIM: "๐Ÿ‚",
+    DELIM + r"golfing" + DELIM: "๐ŸŒ๏ธ",
+    DELIM + r"golfing_man" + DELIM: "๐ŸŒ๏ธโ€โ™‚๏ธ",
+    DELIM + r"golfing_woman" + DELIM: "๐ŸŒ๏ธโ€โ™€๏ธ",
+    DELIM + r"surfer" + DELIM: "๐Ÿ„",
+    DELIM + r"surfing_man" + DELIM: "๐Ÿ„โ€โ™‚๏ธ",
+    DELIM + r"surfing_woman" + DELIM: "๐Ÿ„โ€โ™€๏ธ",
+    DELIM + r"rowboat" + DELIM: "๐Ÿšฃ",
+    DELIM + r"rowing_man" + DELIM: "๐Ÿšฃโ€โ™‚๏ธ",
+    DELIM + r"rowing_woman" + DELIM: "๐Ÿšฃโ€โ™€๏ธ",
+    DELIM + r"swimmer" + DELIM: "๐ŸŠ",
+    DELIM + r"swimming_man" + DELIM: "๐ŸŠโ€โ™‚๏ธ",
+    DELIM + r"swimming_woman" + DELIM: "๐ŸŠโ€โ™€๏ธ",
+    DELIM + r"bouncing_ball_person" + DELIM: "โ›น๏ธ",
+    DELIM + r"(basketball|bouncing_ball)_man" + DELIM: "โ›น๏ธโ€โ™‚๏ธ",
+    DELIM + r"(basketball|bouncing_ball)_woman" + DELIM: "โ›น๏ธโ€โ™€๏ธ",
+    DELIM + r"weight_lifting" + DELIM: "๐Ÿ‹๏ธ",
+    DELIM + r"weight_lifting_man" + DELIM: "๐Ÿ‹๏ธโ€โ™‚๏ธ",
+    DELIM + r"weight_lifting_woman" + DELIM: "๐Ÿ‹๏ธโ€โ™€๏ธ",
+    DELIM + r"bicyclist" + DELIM: "๐Ÿšด",
+    DELIM + r"biking_man" + DELIM: "๐Ÿšดโ€โ™‚๏ธ",
+    DELIM + r"biking_woman" + DELIM: "๐Ÿšดโ€โ™€๏ธ",
+    DELIM + r"mountain_bicyclist" + DELIM: "๐Ÿšต",
+    DELIM + r"mountain_biking_man" + DELIM: "๐Ÿšตโ€โ™‚๏ธ",
+    DELIM + r"mountain_biking_woman" + DELIM: "๐Ÿšตโ€โ™€๏ธ",
+    DELIM + r"cartwheeling" + DELIM: "๐Ÿคธ",
+    DELIM + r"man_cartwheeling" + DELIM: "๐Ÿคธโ€โ™‚๏ธ",
+    DELIM + r"woman_cartwheeling" + DELIM: "๐Ÿคธโ€โ™€๏ธ",
+    DELIM + r"wrestling" + DELIM: "๐Ÿคผ",
+    DELIM + r"men_wrestling" + DELIM: "๐Ÿคผโ€โ™‚๏ธ",
+    DELIM + r"women_wrestling" + DELIM: "๐Ÿคผโ€โ™€๏ธ",
+    DELIM + r"water_polo" + DELIM: "๐Ÿคฝ",
+    DELIM + r"man_playing_water_polo" + DELIM: "๐Ÿคฝโ€โ™‚๏ธ",
+    DELIM + r"woman_playing_water_polo" + DELIM: "๐Ÿคฝโ€โ™€๏ธ",
+    DELIM + r"handball_person" + DELIM: "๐Ÿคพ",
+    DELIM + r"man_playing_handball" + DELIM: "๐Ÿคพโ€โ™‚๏ธ",
+    DELIM + r"woman_playing_handball" + DELIM: "๐Ÿคพโ€โ™€๏ธ",
+    DELIM + r"juggling_person" + DELIM: "๐Ÿคน",
+    DELIM + r"man_juggling" + DELIM: "๐Ÿคนโ€โ™‚๏ธ",
+    DELIM + r"woman_juggling" + DELIM: "๐Ÿคนโ€โ™€๏ธ",
     #
     # Person Resting
     #
-    DELIM + r'lotus_position' + DELIM: '๐Ÿง˜',
-    DELIM + r'lotus_position_man' + DELIM: '๐Ÿง˜โ€โ™‚๏ธ',
-    DELIM + r'lotus_position_woman' + DELIM: '๐Ÿง˜โ€โ™€๏ธ',
-    DELIM + r'bath' + DELIM: '๐Ÿ›€',
-    DELIM + r'sleeping_bed' + DELIM: '๐Ÿ›Œ',
-
+    DELIM + r"lotus_position" + DELIM: "๐Ÿง˜",
+    DELIM + r"lotus_position_man" + DELIM: "๐Ÿง˜โ€โ™‚๏ธ",
+    DELIM + r"lotus_position_woman" + DELIM: "๐Ÿง˜โ€โ™€๏ธ",
+    DELIM + r"bath" + DELIM: "๐Ÿ›€",
+    DELIM + r"sleeping_bed" + DELIM: "๐Ÿ›Œ",
     #
     # Family
     #
-    DELIM + r'people_holding_hands' + DELIM: '๐Ÿง‘โ€๐Ÿคโ€๐Ÿง‘',
-    DELIM + r'two_women_holding_hands' + DELIM: '๐Ÿ‘ญ',
-    DELIM + r'couple' + DELIM: '๐Ÿ‘ซ',
-    DELIM + r'two_men_holding_hands' + DELIM: '๐Ÿ‘ฌ',
-    DELIM + r'couplekiss' + DELIM: '๐Ÿ’',
-    DELIM + r'couplekiss_man_woman' + DELIM: '๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ’‹โ€๐Ÿ‘จ',
-    DELIM + r'couplekiss_man_man' + DELIM: '๐Ÿ‘จโ€โค๏ธโ€๐Ÿ’‹โ€๐Ÿ‘จ',
-    DELIM + r'couplekiss_woman_woman' + DELIM: '๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ’‹โ€๐Ÿ‘ฉ',
-    DELIM + r'couple_with_heart' + DELIM: '๐Ÿ’‘',
-    DELIM + r'couple_with_heart_woman_man' + DELIM: '๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ‘จ',
-    DELIM + r'couple_with_heart_man_man' + DELIM: '๐Ÿ‘จโ€โค๏ธโ€๐Ÿ‘จ',
-    DELIM + r'couple_with_heart_woman_woman' + DELIM: '๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ‘ฉ',
-    DELIM + r'family_man_woman_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_woman_girl' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ง',
-    DELIM + r'family_man_woman_girl_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_woman_boy_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_woman_girl_girl' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ง',
-    DELIM + r'family_man_man_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_man_girl' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘ง',
-    DELIM + r'family_man_man_girl_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_man_boy_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_man_girl_girl' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ง',
-    DELIM + r'family_woman_woman_boy' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆ',
-    DELIM + r'family_woman_woman_girl' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘ง',
-    DELIM + r'family_woman_woman_girl_boy' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ',
-    DELIM + r'family_woman_woman_boy_boy' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ',
-    DELIM + r'family_woman_woman_girl_girl' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ง',
-    DELIM + r'family_man_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_boy_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_girl' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘ง',
-    DELIM + r'family_man_girl_boy' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ฆ',
-    DELIM + r'family_man_girl_girl' + DELIM: '๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ง',
-    DELIM + r'family_woman_boy' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฆ',
-    DELIM + r'family_woman_boy_boy' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ',
-    DELIM + r'family_woman_girl' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘ง',
-    DELIM + r'family_woman_girl_boy' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ',
-    DELIM + r'family_woman_girl_girl' + DELIM: '๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ง',
-
+    DELIM + r"people_holding_hands" + DELIM: "๐Ÿง‘โ€๐Ÿคโ€๐Ÿง‘",
+    DELIM + r"two_women_holding_hands" + DELIM: "๐Ÿ‘ญ",
+    DELIM + r"couple" + DELIM: "๐Ÿ‘ซ",
+    DELIM + r"two_men_holding_hands" + DELIM: "๐Ÿ‘ฌ",
+    DELIM + r"couplekiss" + DELIM: "๐Ÿ’",
+    DELIM + r"couplekiss_man_woman" + DELIM: "๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ’‹โ€๐Ÿ‘จ",
+    DELIM + r"couplekiss_man_man" + DELIM: "๐Ÿ‘จโ€โค๏ธโ€๐Ÿ’‹โ€๐Ÿ‘จ",
+    DELIM + r"couplekiss_woman_woman" + DELIM: "๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ’‹โ€๐Ÿ‘ฉ",
+    DELIM + r"couple_with_heart" + DELIM: "๐Ÿ’‘",
+    DELIM + r"couple_with_heart_woman_man" + DELIM: "๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ‘จ",
+    DELIM + r"couple_with_heart_man_man" + DELIM: "๐Ÿ‘จโ€โค๏ธโ€๐Ÿ‘จ",
+    DELIM + r"couple_with_heart_woman_woman" + DELIM: "๐Ÿ‘ฉโ€โค๏ธโ€๐Ÿ‘ฉ",
+    DELIM + r"family_man_woman_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_woman_girl" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ง",
+    DELIM + r"family_man_woman_girl_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_woman_boy_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_woman_girl_girl" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ง",
+    DELIM + r"family_man_man_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_man_girl" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘ง",
+    DELIM + r"family_man_man_girl_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_man_boy_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_man_girl_girl" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ง",
+    DELIM + r"family_woman_woman_boy" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆ",
+    DELIM + r"family_woman_woman_girl" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘ง",
+    DELIM + r"family_woman_woman_girl_boy" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ",
+    DELIM + r"family_woman_woman_boy_boy" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ",
+    DELIM + r"family_woman_woman_girl_girl" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ง",
+    DELIM + r"family_man_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_boy_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_girl" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘ง",
+    DELIM + r"family_man_girl_boy" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ฆ",
+    DELIM + r"family_man_girl_girl" + DELIM: "๐Ÿ‘จโ€๐Ÿ‘งโ€๐Ÿ‘ง",
+    DELIM + r"family_woman_boy" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฆ",
+    DELIM + r"family_woman_boy_boy" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ฆโ€๐Ÿ‘ฆ",
+    DELIM + r"family_woman_girl" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘ง",
+    DELIM + r"family_woman_girl_boy" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ฆ",
+    DELIM + r"family_woman_girl_girl" + DELIM: "๐Ÿ‘ฉโ€๐Ÿ‘งโ€๐Ÿ‘ง",
     #
     # Person Symbol
     #
-    DELIM + r'speaking_head' + DELIM: '๐Ÿ—ฃ๏ธ',
-    DELIM + r'bust_in_silhouette' + DELIM: '๐Ÿ‘ค',
-    DELIM + r'busts_in_silhouette' + DELIM: '๐Ÿ‘ฅ',
-    DELIM + r'people_hugging' + DELIM: '๐Ÿซ‚',
-    DELIM + r'family' + DELIM: '๐Ÿ‘ช',
-    DELIM + r'footprints' + DELIM: '๐Ÿ‘ฃ',
-
+    DELIM + r"speaking_head" + DELIM: "๐Ÿ—ฃ๏ธ",
+    DELIM + r"bust_in_silhouette" + DELIM: "๐Ÿ‘ค",
+    DELIM + r"busts_in_silhouette" + DELIM: "๐Ÿ‘ฅ",
+    DELIM + r"people_hugging" + DELIM: "๐Ÿซ‚",
+    DELIM + r"family" + DELIM: "๐Ÿ‘ช",
+    DELIM + r"footprints" + DELIM: "๐Ÿ‘ฃ",
     #
     # Animal Mammal
     #
-    DELIM + r'monkey_face' + DELIM: '๐Ÿต',
-    DELIM + r'monkey' + DELIM: '๐Ÿ’',
-    DELIM + r'gorilla' + DELIM: '๐Ÿฆ',
-    DELIM + r'orangutan' + DELIM: '๐Ÿฆง',
-    DELIM + r'dog' + DELIM: '๐Ÿถ',
-    DELIM + r'dog2' + DELIM: '๐Ÿ•',
-    DELIM + r'guide_dog' + DELIM: '๐Ÿฆฎ',
-    DELIM + r'service_dog' + DELIM: '๐Ÿ•โ€๐Ÿฆบ',
-    DELIM + r'poodle' + DELIM: '๐Ÿฉ',
-    DELIM + r'wolf' + DELIM: '๐Ÿบ',
-    DELIM + r'fox_face' + DELIM: '๐ŸฆŠ',
-    DELIM + r'raccoon' + DELIM: '๐Ÿฆ',
-    DELIM + r'cat' + DELIM: '๐Ÿฑ',
-    DELIM + r'cat2' + DELIM: '๐Ÿˆ',
-    DELIM + r'black_cat' + DELIM: '๐Ÿˆโ€โฌ›',
-    DELIM + r'lion' + DELIM: '๐Ÿฆ',
-    DELIM + r'tiger' + DELIM: '๐Ÿฏ',
-    DELIM + r'tiger2' + DELIM: '๐Ÿ…',
-    DELIM + r'leopard' + DELIM: '๐Ÿ†',
-    DELIM + r'horse' + DELIM: '๐Ÿด',
-    DELIM + r'racehorse' + DELIM: '๐ŸŽ',
-    DELIM + r'unicorn' + DELIM: '๐Ÿฆ„',
-    DELIM + r'zebra' + DELIM: '๐Ÿฆ“',
-    DELIM + r'deer' + DELIM: '๐ŸฆŒ',
-    DELIM + r'bison' + DELIM: '๐Ÿฆฌ',
-    DELIM + r'cow' + DELIM: '๐Ÿฎ',
-    DELIM + r'ox' + DELIM: '๐Ÿ‚',
-    DELIM + r'water_buffalo' + DELIM: '๐Ÿƒ',
-    DELIM + r'cow2' + DELIM: '๐Ÿ„',
-    DELIM + r'pig' + DELIM: '๐Ÿท',
-    DELIM + r'pig2' + DELIM: '๐Ÿ–',
-    DELIM + r'boar' + DELIM: '๐Ÿ—',
-    DELIM + r'pig_nose' + DELIM: '๐Ÿฝ',
-    DELIM + r'ram' + DELIM: '๐Ÿ',
-    DELIM + r'sheep' + DELIM: '๐Ÿ‘',
-    DELIM + r'goat' + DELIM: '๐Ÿ',
-    DELIM + r'dromedary_camel' + DELIM: '๐Ÿช',
-    DELIM + r'camel' + DELIM: '๐Ÿซ',
-    DELIM + r'llama' + DELIM: '๐Ÿฆ™',
-    DELIM + r'giraffe' + DELIM: '๐Ÿฆ’',
-    DELIM + r'elephant' + DELIM: '๐Ÿ˜',
-    DELIM + r'mammoth' + DELIM: '๐Ÿฆฃ',
-    DELIM + r'rhinoceros' + DELIM: '๐Ÿฆ',
-    DELIM + r'hippopotamus' + DELIM: '๐Ÿฆ›',
-    DELIM + r'mouse' + DELIM: '๐Ÿญ',
-    DELIM + r'mouse2' + DELIM: '๐Ÿ',
-    DELIM + r'rat' + DELIM: '๐Ÿ€',
-    DELIM + r'hamster' + DELIM: '๐Ÿน',
-    DELIM + r'rabbit' + DELIM: '๐Ÿฐ',
-    DELIM + r'rabbit2' + DELIM: '๐Ÿ‡',
-    DELIM + r'chipmunk' + DELIM: '๐Ÿฟ๏ธ',
-    DELIM + r'beaver' + DELIM: '๐Ÿฆซ',
-    DELIM + r'hedgehog' + DELIM: '๐Ÿฆ”',
-    DELIM + r'bat' + DELIM: '๐Ÿฆ‡',
-    DELIM + r'bear' + DELIM: '๐Ÿป',
-    DELIM + r'polar_bear' + DELIM: '๐Ÿปโ€โ„๏ธ',
-    DELIM + r'koala' + DELIM: '๐Ÿจ',
-    DELIM + r'panda_face' + DELIM: '๐Ÿผ',
-    DELIM + r'sloth' + DELIM: '๐Ÿฆฅ',
-    DELIM + r'otter' + DELIM: '๐Ÿฆฆ',
-    DELIM + r'skunk' + DELIM: '๐Ÿฆจ',
-    DELIM + r'kangaroo' + DELIM: '๐Ÿฆ˜',
-    DELIM + r'badger' + DELIM: '๐Ÿฆก',
-    DELIM + r'(feet|paw_prints)' + DELIM: '๐Ÿพ',
-
+    DELIM + r"monkey_face" + DELIM: "๐Ÿต",
+    DELIM + r"monkey" + DELIM: "๐Ÿ’",
+    DELIM + r"gorilla" + DELIM: "๐Ÿฆ",
+    DELIM + r"orangutan" + DELIM: "๐Ÿฆง",
+    DELIM + r"dog" + DELIM: "๐Ÿถ",
+    DELIM + r"dog2" + DELIM: "๐Ÿ•",
+    DELIM + r"guide_dog" + DELIM: "๐Ÿฆฎ",
+    DELIM + r"service_dog" + DELIM: "๐Ÿ•โ€๐Ÿฆบ",
+    DELIM + r"poodle" + DELIM: "๐Ÿฉ",
+    DELIM + r"wolf" + DELIM: "๐Ÿบ",
+    DELIM + r"fox_face" + DELIM: "๐ŸฆŠ",
+    DELIM + r"raccoon" + DELIM: "๐Ÿฆ",
+    DELIM + r"cat" + DELIM: "๐Ÿฑ",
+    DELIM + r"cat2" + DELIM: "๐Ÿˆ",
+    DELIM + r"black_cat" + DELIM: "๐Ÿˆโ€โฌ›",
+    DELIM + r"lion" + DELIM: "๐Ÿฆ",
+    DELIM + r"tiger" + DELIM: "๐Ÿฏ",
+    DELIM + r"tiger2" + DELIM: "๐Ÿ…",
+    DELIM + r"leopard" + DELIM: "๐Ÿ†",
+    DELIM + r"horse" + DELIM: "๐Ÿด",
+    DELIM + r"racehorse" + DELIM: "๐ŸŽ",
+    DELIM + r"unicorn" + DELIM: "๐Ÿฆ„",
+    DELIM + r"zebra" + DELIM: "๐Ÿฆ“",
+    DELIM + r"deer" + DELIM: "๐ŸฆŒ",
+    DELIM + r"bison" + DELIM: "๐Ÿฆฌ",
+    DELIM + r"cow" + DELIM: "๐Ÿฎ",
+    DELIM + r"ox" + DELIM: "๐Ÿ‚",
+    DELIM + r"water_buffalo" + DELIM: "๐Ÿƒ",
+    DELIM + r"cow2" + DELIM: "๐Ÿ„",
+    DELIM + r"pig" + DELIM: "๐Ÿท",
+    DELIM + r"pig2" + DELIM: "๐Ÿ–",
+    DELIM + r"boar" + DELIM: "๐Ÿ—",
+    DELIM + r"pig_nose" + DELIM: "๐Ÿฝ",
+    DELIM + r"ram" + DELIM: "๐Ÿ",
+    DELIM + r"sheep" + DELIM: "๐Ÿ‘",
+    DELIM + r"goat" + DELIM: "๐Ÿ",
+    DELIM + r"dromedary_camel" + DELIM: "๐Ÿช",
+    DELIM + r"camel" + DELIM: "๐Ÿซ",
+    DELIM + r"llama" + DELIM: "๐Ÿฆ™",
+    DELIM + r"giraffe" + DELIM: "๐Ÿฆ’",
+    DELIM + r"elephant" + DELIM: "๐Ÿ˜",
+    DELIM + r"mammoth" + DELIM: "๐Ÿฆฃ",
+    DELIM + r"rhinoceros" + DELIM: "๐Ÿฆ",
+    DELIM + r"hippopotamus" + DELIM: "๐Ÿฆ›",
+    DELIM + r"mouse" + DELIM: "๐Ÿญ",
+    DELIM + r"mouse2" + DELIM: "๐Ÿ",
+    DELIM + r"rat" + DELIM: "๐Ÿ€",
+    DELIM + r"hamster" + DELIM: "๐Ÿน",
+    DELIM + r"rabbit" + DELIM: "๐Ÿฐ",
+    DELIM + r"rabbit2" + DELIM: "๐Ÿ‡",
+    DELIM + r"chipmunk" + DELIM: "๐Ÿฟ๏ธ",
+    DELIM + r"beaver" + DELIM: "๐Ÿฆซ",
+    DELIM + r"hedgehog" + DELIM: "๐Ÿฆ”",
+    DELIM + r"bat" + DELIM: "๐Ÿฆ‡",
+    DELIM + r"bear" + DELIM: "๐Ÿป",
+    DELIM + r"polar_bear" + DELIM: "๐Ÿปโ€โ„๏ธ",
+    DELIM + r"koala" + DELIM: "๐Ÿจ",
+    DELIM + r"panda_face" + DELIM: "๐Ÿผ",
+    DELIM + r"sloth" + DELIM: "๐Ÿฆฅ",
+    DELIM + r"otter" + DELIM: "๐Ÿฆฆ",
+    DELIM + r"skunk" + DELIM: "๐Ÿฆจ",
+    DELIM + r"kangaroo" + DELIM: "๐Ÿฆ˜",
+    DELIM + r"badger" + DELIM: "๐Ÿฆก",
+    DELIM + r"(feet|paw_prints)" + DELIM: "๐Ÿพ",
     #
     # Animal Bird
     #
-    DELIM + r'turkey' + DELIM: '๐Ÿฆƒ',
-    DELIM + r'chicken' + DELIM: '๐Ÿ”',
-    DELIM + r'rooster' + DELIM: '๐Ÿ“',
-    DELIM + r'hatching_chick' + DELIM: '๐Ÿฃ',
-    DELIM + r'baby_chick' + DELIM: '๐Ÿค',
-    DELIM + r'hatched_chick' + DELIM: '๐Ÿฅ',
-    DELIM + r'bird' + DELIM: '๐Ÿฆ',
-    DELIM + r'penguin' + DELIM: '๐Ÿง',
-    DELIM + r'dove' + DELIM: '๐Ÿ•Š๏ธ',
-    DELIM + r'eagle' + DELIM: '๐Ÿฆ…',
-    DELIM + r'duck' + DELIM: '๐Ÿฆ†',
-    DELIM + r'swan' + DELIM: '๐Ÿฆข',
-    DELIM + r'owl' + DELIM: '๐Ÿฆ‰',
-    DELIM + r'dodo' + DELIM: '๐Ÿฆค',
-    DELIM + r'feather' + DELIM: '๐Ÿชถ',
-    DELIM + r'flamingo' + DELIM: '๐Ÿฆฉ',
-    DELIM + r'peacock' + DELIM: '๐Ÿฆš',
-    DELIM + r'parrot' + DELIM: '๐Ÿฆœ',
-
+    DELIM + r"turkey" + DELIM: "๐Ÿฆƒ",
+    DELIM + r"chicken" + DELIM: "๐Ÿ”",
+    DELIM + r"rooster" + DELIM: "๐Ÿ“",
+    DELIM + r"hatching_chick" + DELIM: "๐Ÿฃ",
+    DELIM + r"baby_chick" + DELIM: "๐Ÿค",
+    DELIM + r"hatched_chick" + DELIM: "๐Ÿฅ",
+    DELIM + r"bird" + DELIM: "๐Ÿฆ",
+    DELIM + r"penguin" + DELIM: "๐Ÿง",
+    DELIM + r"dove" + DELIM: "๐Ÿ•Š๏ธ",
+    DELIM + r"eagle" + DELIM: "๐Ÿฆ…",
+    DELIM + r"duck" + DELIM: "๐Ÿฆ†",
+    DELIM + r"swan" + DELIM: "๐Ÿฆข",
+    DELIM + r"owl" + DELIM: "๐Ÿฆ‰",
+    DELIM + r"dodo" + DELIM: "๐Ÿฆค",
+    DELIM + r"feather" + DELIM: "๐Ÿชถ",
+    DELIM + r"flamingo" + DELIM: "๐Ÿฆฉ",
+    DELIM + r"peacock" + DELIM: "๐Ÿฆš",
+    DELIM + r"parrot" + DELIM: "๐Ÿฆœ",
     #
     # Animal Amphibian
     #
-    DELIM + r'frog' + DELIM: '๐Ÿธ',
-
+    DELIM + r"frog" + DELIM: "๐Ÿธ",
     #
     # Animal Reptile
     #
-    DELIM + r'crocodile' + DELIM: '๐ŸŠ',
-    DELIM + r'turtle' + DELIM: '๐Ÿข',
-    DELIM + r'lizard' + DELIM: '๐ŸฆŽ',
-    DELIM + r'snake' + DELIM: '๐Ÿ',
-    DELIM + r'dragon_face' + DELIM: '๐Ÿฒ',
-    DELIM + r'dragon' + DELIM: '๐Ÿ‰',
-    DELIM + r'sauropod' + DELIM: '๐Ÿฆ•',
-    DELIM + r't-rex' + DELIM: '๐Ÿฆ–',
-
+    DELIM + r"crocodile" + DELIM: "๐ŸŠ",
+    DELIM + r"turtle" + DELIM: "๐Ÿข",
+    DELIM + r"lizard" + DELIM: "๐ŸฆŽ",
+    DELIM + r"snake" + DELIM: "๐Ÿ",
+    DELIM + r"dragon_face" + DELIM: "๐Ÿฒ",
+    DELIM + r"dragon" + DELIM: "๐Ÿ‰",
+    DELIM + r"sauropod" + DELIM: "๐Ÿฆ•",
+    DELIM + r"t-rex" + DELIM: "๐Ÿฆ–",
     #
     # Animal Marine
     #
-    DELIM + r'whale' + DELIM: '๐Ÿณ',
-    DELIM + r'whale2' + DELIM: '๐Ÿ‹',
-    DELIM + r'dolphin' + DELIM: '๐Ÿฌ',
-    DELIM + r'(seal|flipper)' + DELIM: '๐Ÿฆญ',
-    DELIM + r'fish' + DELIM: '๐ŸŸ',
-    DELIM + r'tropical_fish' + DELIM: '๐Ÿ ',
-    DELIM + r'blowfish' + DELIM: '๐Ÿก',
-    DELIM + r'shark' + DELIM: '๐Ÿฆˆ',
-    DELIM + r'octopus' + DELIM: '๐Ÿ™',
-    DELIM + r'shell' + DELIM: '๐Ÿš',
-
+    DELIM + r"whale" + DELIM: "๐Ÿณ",
+    DELIM + r"whale2" + DELIM: "๐Ÿ‹",
+    DELIM + r"dolphin" + DELIM: "๐Ÿฌ",
+    DELIM + r"(seal|flipper)" + DELIM: "๐Ÿฆญ",
+    DELIM + r"fish" + DELIM: "๐ŸŸ",
+    DELIM + r"tropical_fish" + DELIM: "๐Ÿ ",
+    DELIM + r"blowfish" + DELIM: "๐Ÿก",
+    DELIM + r"shark" + DELIM: "๐Ÿฆˆ",
+    DELIM + r"octopus" + DELIM: "๐Ÿ™",
+    DELIM + r"shell" + DELIM: "๐Ÿš",
     #
     # Animal Bug
     #
-    DELIM + r'snail' + DELIM: '๐ŸŒ',
-    DELIM + r'butterfly' + DELIM: '๐Ÿฆ‹',
-    DELIM + r'bug' + DELIM: '๐Ÿ›',
-    DELIM + r'ant' + DELIM: '๐Ÿœ',
-    DELIM + r'bee' + DELIM: '๐Ÿ',
-    DELIM + r'honeybee' + DELIM: '๐Ÿชฒ',
-    DELIM + r'(lady_)?beetle' + DELIM: '๐Ÿž',
-    DELIM + r'cricket' + DELIM: '๐Ÿฆ—',
-    DELIM + r'cockroach' + DELIM: '๐Ÿชณ',
-    DELIM + r'spider' + DELIM: '๐Ÿ•ท๏ธ',
-    DELIM + r'spider_web' + DELIM: '๐Ÿ•ธ๏ธ',
-    DELIM + r'scorpion' + DELIM: '๐Ÿฆ‚',
-    DELIM + r'mosquito' + DELIM: '๐ŸฆŸ',
-    DELIM + r'fly' + DELIM: '๐Ÿชฐ',
-    DELIM + r'worm' + DELIM: '๐Ÿชฑ',
-    DELIM + r'microbe' + DELIM: '๐Ÿฆ ',
-
+    DELIM + r"snail" + DELIM: "๐ŸŒ",
+    DELIM + r"butterfly" + DELIM: "๐Ÿฆ‹",
+    DELIM + r"bug" + DELIM: "๐Ÿ›",
+    DELIM + r"ant" + DELIM: "๐Ÿœ",
+    DELIM + r"bee" + DELIM: "๐Ÿ",
+    DELIM + r"honeybee" + DELIM: "๐Ÿชฒ",
+    DELIM + r"(lady_)?beetle" + DELIM: "๐Ÿž",
+    DELIM + r"cricket" + DELIM: "๐Ÿฆ—",
+    DELIM + r"cockroach" + DELIM: "๐Ÿชณ",
+    DELIM + r"spider" + DELIM: "๐Ÿ•ท๏ธ",
+    DELIM + r"spider_web" + DELIM: "๐Ÿ•ธ๏ธ",
+    DELIM + r"scorpion" + DELIM: "๐Ÿฆ‚",
+    DELIM + r"mosquito" + DELIM: "๐ŸฆŸ",
+    DELIM + r"fly" + DELIM: "๐Ÿชฐ",
+    DELIM + r"worm" + DELIM: "๐Ÿชฑ",
+    DELIM + r"microbe" + DELIM: "๐Ÿฆ ",
     #
     # Plant Flower
     #
-    DELIM + r'bouquet' + DELIM: '๐Ÿ’',
-    DELIM + r'cherry_blossom' + DELIM: '๐ŸŒธ',
-    DELIM + r'white_flower' + DELIM: '๐Ÿ’ฎ',
-    DELIM + r'rosette' + DELIM: '๐Ÿต๏ธ',
-    DELIM + r'rose' + DELIM: '๐ŸŒน',
-    DELIM + r'wilted_flower' + DELIM: '๐Ÿฅ€',
-    DELIM + r'hibiscus' + DELIM: '๐ŸŒบ',
-    DELIM + r'sunflower' + DELIM: '๐ŸŒป',
-    DELIM + r'blossom' + DELIM: '๐ŸŒผ',
-    DELIM + r'tulip' + DELIM: '๐ŸŒท',
-
+    DELIM + r"bouquet" + DELIM: "๐Ÿ’",
+    DELIM + r"cherry_blossom" + DELIM: "๐ŸŒธ",
+    DELIM + r"white_flower" + DELIM: "๐Ÿ’ฎ",
+    DELIM + r"rosette" + DELIM: "๐Ÿต๏ธ",
+    DELIM + r"rose" + DELIM: "๐ŸŒน",
+    DELIM + r"wilted_flower" + DELIM: "๐Ÿฅ€",
+    DELIM + r"hibiscus" + DELIM: "๐ŸŒบ",
+    DELIM + r"sunflower" + DELIM: "๐ŸŒป",
+    DELIM + r"blossom" + DELIM: "๐ŸŒผ",
+    DELIM + r"tulip" + DELIM: "๐ŸŒท",
     #
     # Plant Other
     #
-    DELIM + r'seedling' + DELIM: '๐ŸŒฑ',
-    DELIM + r'potted_plant' + DELIM: '๐Ÿชด',
-    DELIM + r'evergreen_tree' + DELIM: '๐ŸŒฒ',
-    DELIM + r'deciduous_tree' + DELIM: '๐ŸŒณ',
-    DELIM + r'palm_tree' + DELIM: '๐ŸŒด',
-    DELIM + r'cactus' + DELIM: '๐ŸŒต',
-    DELIM + r'ear_of_rice' + DELIM: '๐ŸŒพ',
-    DELIM + r'herb' + DELIM: '๐ŸŒฟ',
-    DELIM + r'shamrock' + DELIM: 'โ˜˜๏ธ',
-    DELIM + r'four_leaf_clover' + DELIM: '๐Ÿ€',
-    DELIM + r'maple_leaf' + DELIM: '๐Ÿ',
-    DELIM + r'fallen_leaf' + DELIM: '๐Ÿ‚',
-    DELIM + r'leaves' + DELIM: '๐Ÿƒ',
-    DELIM + r'mushroom' + DELIM: '๐Ÿ„',
-
+    DELIM + r"seedling" + DELIM: "๐ŸŒฑ",
+    DELIM + r"potted_plant" + DELIM: "๐Ÿชด",
+    DELIM + r"evergreen_tree" + DELIM: "๐ŸŒฒ",
+    DELIM + r"deciduous_tree" + DELIM: "๐ŸŒณ",
+    DELIM + r"palm_tree" + DELIM: "๐ŸŒด",
+    DELIM + r"cactus" + DELIM: "๐ŸŒต",
+    DELIM + r"ear_of_rice" + DELIM: "๐ŸŒพ",
+    DELIM + r"herb" + DELIM: "๐ŸŒฟ",
+    DELIM + r"shamrock" + DELIM: "โ˜˜๏ธ",
+    DELIM + r"four_leaf_clover" + DELIM: "๐Ÿ€",
+    DELIM + r"maple_leaf" + DELIM: "๐Ÿ",
+    DELIM + r"fallen_leaf" + DELIM: "๐Ÿ‚",
+    DELIM + r"leaves" + DELIM: "๐Ÿƒ",
+    DELIM + r"mushroom" + DELIM: "๐Ÿ„",
     #
     # Food Fruit
     #
-    DELIM + r'grapes' + DELIM: '๐Ÿ‡',
-    DELIM + r'melon' + DELIM: '๐Ÿˆ',
-    DELIM + r'watermelon' + DELIM: '๐Ÿ‰',
-    DELIM + r'(orange|mandarin|tangerine)' + DELIM: '๐ŸŠ',
-    DELIM + r'lemon' + DELIM: '๐Ÿ‹',
-    DELIM + r'banana' + DELIM: '๐ŸŒ',
-    DELIM + r'pineapple' + DELIM: '๐Ÿ',
-    DELIM + r'mango' + DELIM: '๐Ÿฅญ',
-    DELIM + r'apple' + DELIM: '๐ŸŽ',
-    DELIM + r'green_apple' + DELIM: '๐Ÿ',
-    DELIM + r'pear' + DELIM: '๐Ÿ',
-    DELIM + r'peach' + DELIM: '๐Ÿ‘',
-    DELIM + r'cherries' + DELIM: '๐Ÿ’',
-    DELIM + r'strawberry' + DELIM: '๐Ÿ“',
-    DELIM + r'blueberries' + DELIM: '๐Ÿซ',
-    DELIM + r'kiwi_fruit' + DELIM: '๐Ÿฅ',
-    DELIM + r'tomato' + DELIM: '๐Ÿ…',
-    DELIM + r'olive' + DELIM: '๐Ÿซ’',
-    DELIM + r'coconut' + DELIM: '๐Ÿฅฅ',
-
+    DELIM + r"grapes" + DELIM: "๐Ÿ‡",
+    DELIM + r"melon" + DELIM: "๐Ÿˆ",
+    DELIM + r"watermelon" + DELIM: "๐Ÿ‰",
+    DELIM + r"(orange|mandarin|tangerine)" + DELIM: "๐ŸŠ",
+    DELIM + r"lemon" + DELIM: "๐Ÿ‹",
+    DELIM + r"banana" + DELIM: "๐ŸŒ",
+    DELIM + r"pineapple" + DELIM: "๐Ÿ",
+    DELIM + r"mango" + DELIM: "๐Ÿฅญ",
+    DELIM + r"apple" + DELIM: "๐ŸŽ",
+    DELIM + r"green_apple" + DELIM: "๐Ÿ",
+    DELIM + r"pear" + DELIM: "๐Ÿ",
+    DELIM + r"peach" + DELIM: "๐Ÿ‘",
+    DELIM + r"cherries" + DELIM: "๐Ÿ’",
+    DELIM + r"strawberry" + DELIM: "๐Ÿ“",
+    DELIM + r"blueberries" + DELIM: "๐Ÿซ",
+    DELIM + r"kiwi_fruit" + DELIM: "๐Ÿฅ",
+    DELIM + r"tomato" + DELIM: "๐Ÿ…",
+    DELIM + r"olive" + DELIM: "๐Ÿซ’",
+    DELIM + r"coconut" + DELIM: "๐Ÿฅฅ",
     #
     # Food Vegetable
     #
-    DELIM + r'avocado' + DELIM: '๐Ÿฅ‘',
-    DELIM + r'eggplant' + DELIM: '๐Ÿ†',
-    DELIM + r'potato' + DELIM: '๐Ÿฅ”',
-    DELIM + r'carrot' + DELIM: '๐Ÿฅ•',
-    DELIM + r'corn' + DELIM: '๐ŸŒฝ',
-    DELIM + r'hot_pepper' + DELIM: '๐ŸŒถ๏ธ',
-    DELIM + r'bell_pepper' + DELIM: '๐Ÿซ‘',
-    DELIM + r'cucumber' + DELIM: '๐Ÿฅ’',
-    DELIM + r'leafy_green' + DELIM: '๐Ÿฅฌ',
-    DELIM + r'broccoli' + DELIM: '๐Ÿฅฆ',
-    DELIM + r'garlic' + DELIM: '๐Ÿง„',
-    DELIM + r'onion' + DELIM: '๐Ÿง…',
-    DELIM + r'peanuts' + DELIM: '๐Ÿฅœ',
-    DELIM + r'chestnut' + DELIM: '๐ŸŒฐ',
-
+    DELIM + r"avocado" + DELIM: "๐Ÿฅ‘",
+    DELIM + r"eggplant" + DELIM: "๐Ÿ†",
+    DELIM + r"potato" + DELIM: "๐Ÿฅ”",
+    DELIM + r"carrot" + DELIM: "๐Ÿฅ•",
+    DELIM + r"corn" + DELIM: "๐ŸŒฝ",
+    DELIM + r"hot_pepper" + DELIM: "๐ŸŒถ๏ธ",
+    DELIM + r"bell_pepper" + DELIM: "๐Ÿซ‘",
+    DELIM + r"cucumber" + DELIM: "๐Ÿฅ’",
+    DELIM + r"leafy_green" + DELIM: "๐Ÿฅฌ",
+    DELIM + r"broccoli" + DELIM: "๐Ÿฅฆ",
+    DELIM + r"garlic" + DELIM: "๐Ÿง„",
+    DELIM + r"onion" + DELIM: "๐Ÿง…",
+    DELIM + r"peanuts" + DELIM: "๐Ÿฅœ",
+    DELIM + r"chestnut" + DELIM: "๐ŸŒฐ",
     #
     # Food Prepared
     #
-    DELIM + r'bread' + DELIM: '๐Ÿž',
-    DELIM + r'croissant' + DELIM: '๐Ÿฅ',
-    DELIM + r'baguette_bread' + DELIM: '๐Ÿฅ–',
-    DELIM + r'flatbread' + DELIM: '๐Ÿซ“',
-    DELIM + r'pretzel' + DELIM: '๐Ÿฅจ',
-    DELIM + r'bagel' + DELIM: '๐Ÿฅฏ',
-    DELIM + r'pancakes' + DELIM: '๐Ÿฅž',
-    DELIM + r'waffle' + DELIM: '๐Ÿง‡',
-    DELIM + r'cheese' + DELIM: '๐Ÿง€',
-    DELIM + r'meat_on_bone' + DELIM: '๐Ÿ–',
-    DELIM + r'poultry_leg' + DELIM: '๐Ÿ—',
-    DELIM + r'cut_of_meat' + DELIM: '๐Ÿฅฉ',
-    DELIM + r'bacon' + DELIM: '๐Ÿฅ“',
-    DELIM + r'hamburger' + DELIM: '๐Ÿ”',
-    DELIM + r'fries' + DELIM: '๐ŸŸ',
-    DELIM + r'pizza' + DELIM: '๐Ÿ•',
-    DELIM + r'hotdog' + DELIM: '๐ŸŒญ',
-    DELIM + r'sandwich' + DELIM: '๐Ÿฅช',
-    DELIM + r'taco' + DELIM: '๐ŸŒฎ',
-    DELIM + r'burrito' + DELIM: '๐ŸŒฏ',
-    DELIM + r'tamale' + DELIM: '๐Ÿซ”',
-    DELIM + r'stuffed_flatbread' + DELIM: '๐Ÿฅ™',
-    DELIM + r'falafel' + DELIM: '๐Ÿง†',
-    DELIM + r'egg' + DELIM: '๐Ÿฅš',
-    DELIM + r'fried_egg' + DELIM: '๐Ÿณ',
-    DELIM + r'shallow_pan_of_food' + DELIM: '๐Ÿฅ˜',
-    DELIM + r'stew' + DELIM: '๐Ÿฒ',
-    DELIM + r'fondue' + DELIM: '๐Ÿซ•',
-    DELIM + r'bowl_with_spoon' + DELIM: '๐Ÿฅฃ',
-    DELIM + r'green_salad' + DELIM: '๐Ÿฅ—',
-    DELIM + r'popcorn' + DELIM: '๐Ÿฟ',
-    DELIM + r'butter' + DELIM: '๐Ÿงˆ',
-    DELIM + r'salt' + DELIM: '๐Ÿง‚',
-    DELIM + r'canned_food' + DELIM: '๐Ÿฅซ',
-
+    DELIM + r"bread" + DELIM: "๐Ÿž",
+    DELIM + r"croissant" + DELIM: "๐Ÿฅ",
+    DELIM + r"baguette_bread" + DELIM: "๐Ÿฅ–",
+    DELIM + r"flatbread" + DELIM: "๐Ÿซ“",
+    DELIM + r"pretzel" + DELIM: "๐Ÿฅจ",
+    DELIM + r"bagel" + DELIM: "๐Ÿฅฏ",
+    DELIM + r"pancakes" + DELIM: "๐Ÿฅž",
+    DELIM + r"waffle" + DELIM: "๐Ÿง‡",
+    DELIM + r"cheese" + DELIM: "๐Ÿง€",
+    DELIM + r"meat_on_bone" + DELIM: "๐Ÿ–",
+    DELIM + r"poultry_leg" + DELIM: "๐Ÿ—",
+    DELIM + r"cut_of_meat" + DELIM: "๐Ÿฅฉ",
+    DELIM + r"bacon" + DELIM: "๐Ÿฅ“",
+    DELIM + r"hamburger" + DELIM: "๐Ÿ”",
+    DELIM + r"fries" + DELIM: "๐ŸŸ",
+    DELIM + r"pizza" + DELIM: "๐Ÿ•",
+    DELIM + r"hotdog" + DELIM: "๐ŸŒญ",
+    DELIM + r"sandwich" + DELIM: "๐Ÿฅช",
+    DELIM + r"taco" + DELIM: "๐ŸŒฎ",
+    DELIM + r"burrito" + DELIM: "๐ŸŒฏ",
+    DELIM + r"tamale" + DELIM: "๐Ÿซ”",
+    DELIM + r"stuffed_flatbread" + DELIM: "๐Ÿฅ™",
+    DELIM + r"falafel" + DELIM: "๐Ÿง†",
+    DELIM + r"egg" + DELIM: "๐Ÿฅš",
+    DELIM + r"fried_egg" + DELIM: "๐Ÿณ",
+    DELIM + r"shallow_pan_of_food" + DELIM: "๐Ÿฅ˜",
+    DELIM + r"stew" + DELIM: "๐Ÿฒ",
+    DELIM + r"fondue" + DELIM: "๐Ÿซ•",
+    DELIM + r"bowl_with_spoon" + DELIM: "๐Ÿฅฃ",
+    DELIM + r"green_salad" + DELIM: "๐Ÿฅ—",
+    DELIM + r"popcorn" + DELIM: "๐Ÿฟ",
+    DELIM + r"butter" + DELIM: "๐Ÿงˆ",
+    DELIM + r"salt" + DELIM: "๐Ÿง‚",
+    DELIM + r"canned_food" + DELIM: "๐Ÿฅซ",
     #
     # Food Asian
     #
-    DELIM + r'bento' + DELIM: '๐Ÿฑ',
-    DELIM + r'rice_cracker' + DELIM: '๐Ÿ˜',
-    DELIM + r'rice_ball' + DELIM: '๐Ÿ™',
-    DELIM + r'rice' + DELIM: '๐Ÿš',
-    DELIM + r'curry' + DELIM: '๐Ÿ›',
-    DELIM + r'ramen' + DELIM: '๐Ÿœ',
-    DELIM + r'spaghetti' + DELIM: '๐Ÿ',
-    DELIM + r'sweet_potato' + DELIM: '๐Ÿ ',
-    DELIM + r'oden' + DELIM: '๐Ÿข',
-    DELIM + r'sushi' + DELIM: '๐Ÿฃ',
-    DELIM + r'fried_shrimp' + DELIM: '๐Ÿค',
-    DELIM + r'fish_cake' + DELIM: '๐Ÿฅ',
-    DELIM + r'moon_cake' + DELIM: '๐Ÿฅฎ',
-    DELIM + r'dango' + DELIM: '๐Ÿก',
-    DELIM + r'dumpling' + DELIM: '๐ŸฅŸ',
-    DELIM + r'fortune_cookie' + DELIM: '๐Ÿฅ ',
-    DELIM + r'takeout_box' + DELIM: '๐Ÿฅก',
-
+    DELIM + r"bento" + DELIM: "๐Ÿฑ",
+    DELIM + r"rice_cracker" + DELIM: "๐Ÿ˜",
+    DELIM + r"rice_ball" + DELIM: "๐Ÿ™",
+    DELIM + r"rice" + DELIM: "๐Ÿš",
+    DELIM + r"curry" + DELIM: "๐Ÿ›",
+    DELIM + r"ramen" + DELIM: "๐Ÿœ",
+    DELIM + r"spaghetti" + DELIM: "๐Ÿ",
+    DELIM + r"sweet_potato" + DELIM: "๐Ÿ ",
+    DELIM + r"oden" + DELIM: "๐Ÿข",
+    DELIM + r"sushi" + DELIM: "๐Ÿฃ",
+    DELIM + r"fried_shrimp" + DELIM: "๐Ÿค",
+    DELIM + r"fish_cake" + DELIM: "๐Ÿฅ",
+    DELIM + r"moon_cake" + DELIM: "๐Ÿฅฎ",
+    DELIM + r"dango" + DELIM: "๐Ÿก",
+    DELIM + r"dumpling" + DELIM: "๐ŸฅŸ",
+    DELIM + r"fortune_cookie" + DELIM: "๐Ÿฅ ",
+    DELIM + r"takeout_box" + DELIM: "๐Ÿฅก",
     #
     # Food Marine
     #
-    DELIM + r'crab' + DELIM: '๐Ÿฆ€',
-    DELIM + r'lobster' + DELIM: '๐Ÿฆž',
-    DELIM + r'shrimp' + DELIM: '๐Ÿฆ',
-    DELIM + r'squid' + DELIM: '๐Ÿฆ‘',
-    DELIM + r'oyster' + DELIM: '๐Ÿฆช',
-
+    DELIM + r"crab" + DELIM: "๐Ÿฆ€",
+    DELIM + r"lobster" + DELIM: "๐Ÿฆž",
+    DELIM + r"shrimp" + DELIM: "๐Ÿฆ",
+    DELIM + r"squid" + DELIM: "๐Ÿฆ‘",
+    DELIM + r"oyster" + DELIM: "๐Ÿฆช",
     #
     # Food Sweet
     #
-    DELIM + r'icecream' + DELIM: '๐Ÿฆ',
-    DELIM + r'shaved_ice' + DELIM: '๐Ÿง',
-    DELIM + r'ice_cream' + DELIM: '๐Ÿจ',
-    DELIM + r'doughnut' + DELIM: '๐Ÿฉ',
-    DELIM + r'cookie' + DELIM: '๐Ÿช',
-    DELIM + r'birthday' + DELIM: '๐ŸŽ‚',
-    DELIM + r'cake' + DELIM: '๐Ÿฐ',
-    DELIM + r'cupcake' + DELIM: '๐Ÿง',
-    DELIM + r'pie' + DELIM: '๐Ÿฅง',
-    DELIM + r'chocolate_bar' + DELIM: '๐Ÿซ',
-    DELIM + r'candy' + DELIM: '๐Ÿฌ',
-    DELIM + r'lollipop' + DELIM: '๐Ÿญ',
-    DELIM + r'custard' + DELIM: '๐Ÿฎ',
-    DELIM + r'honey_pot' + DELIM: '๐Ÿฏ',
-
+    DELIM + r"icecream" + DELIM: "๐Ÿฆ",
+    DELIM + r"shaved_ice" + DELIM: "๐Ÿง",
+    DELIM + r"ice_cream" + DELIM: "๐Ÿจ",
+    DELIM + r"doughnut" + DELIM: "๐Ÿฉ",
+    DELIM + r"cookie" + DELIM: "๐Ÿช",
+    DELIM + r"birthday" + DELIM: "๐ŸŽ‚",
+    DELIM + r"cake" + DELIM: "๐Ÿฐ",
+    DELIM + r"cupcake" + DELIM: "๐Ÿง",
+    DELIM + r"pie" + DELIM: "๐Ÿฅง",
+    DELIM + r"chocolate_bar" + DELIM: "๐Ÿซ",
+    DELIM + r"candy" + DELIM: "๐Ÿฌ",
+    DELIM + r"lollipop" + DELIM: "๐Ÿญ",
+    DELIM + r"custard" + DELIM: "๐Ÿฎ",
+    DELIM + r"honey_pot" + DELIM: "๐Ÿฏ",
     #
     # Drink
     #
-    DELIM + r'baby_bottle' + DELIM: '๐Ÿผ',
-    DELIM + r'milk_glass' + DELIM: '๐Ÿฅ›',
-    DELIM + r'coffee' + DELIM: 'โ˜•',
-    DELIM + r'teapot' + DELIM: '๐Ÿซ–',
-    DELIM + r'tea' + DELIM: '๐Ÿต',
-    DELIM + r'sake' + DELIM: '๐Ÿถ',
-    DELIM + r'champagne' + DELIM: '๐Ÿพ',
-    DELIM + r'wine_glass' + DELIM: '๐Ÿท',
-    DELIM + r'cocktail' + DELIM: '๐Ÿธ',
-    DELIM + r'tropical_drink' + DELIM: '๐Ÿน',
-    DELIM + r'beer' + DELIM: '๐Ÿบ',
-    DELIM + r'beers' + DELIM: '๐Ÿป',
-    DELIM + r'clinking_glasses' + DELIM: '๐Ÿฅ‚',
-    DELIM + r'tumbler_glass' + DELIM: '๐Ÿฅƒ',
-    DELIM + r'cup_with_straw' + DELIM: '๐Ÿฅค',
-    DELIM + r'bubble_tea' + DELIM: '๐Ÿง‹',
-    DELIM + r'beverage_box' + DELIM: '๐Ÿงƒ',
-    DELIM + r'mate' + DELIM: '๐Ÿง‰',
-    DELIM + r'ice_cube' + DELIM: '๐ŸงŠ',
-
+    DELIM + r"baby_bottle" + DELIM: "๐Ÿผ",
+    DELIM + r"milk_glass" + DELIM: "๐Ÿฅ›",
+    DELIM + r"coffee" + DELIM: "โ˜•",
+    DELIM + r"teapot" + DELIM: "๐Ÿซ–",
+    DELIM + r"tea" + DELIM: "๐Ÿต",
+    DELIM + r"sake" + DELIM: "๐Ÿถ",
+    DELIM + r"champagne" + DELIM: "๐Ÿพ",
+    DELIM + r"wine_glass" + DELIM: "๐Ÿท",
+    DELIM + r"cocktail" + DELIM: "๐Ÿธ",
+    DELIM + r"tropical_drink" + DELIM: "๐Ÿน",
+    DELIM + r"beer" + DELIM: "๐Ÿบ",
+    DELIM + r"beers" + DELIM: "๐Ÿป",
+    DELIM + r"clinking_glasses" + DELIM: "๐Ÿฅ‚",
+    DELIM + r"tumbler_glass" + DELIM: "๐Ÿฅƒ",
+    DELIM + r"cup_with_straw" + DELIM: "๐Ÿฅค",
+    DELIM + r"bubble_tea" + DELIM: "๐Ÿง‹",
+    DELIM + r"beverage_box" + DELIM: "๐Ÿงƒ",
+    DELIM + r"mate" + DELIM: "๐Ÿง‰",
+    DELIM + r"ice_cube" + DELIM: "๐ŸงŠ",
     #
     # Dishware
     #
-    DELIM + r'chopsticks' + DELIM: '๐Ÿฅข',
-    DELIM + r'plate_with_cutlery' + DELIM: '๐Ÿฝ๏ธ',
-    DELIM + r'fork_and_knife' + DELIM: '๐Ÿด',
-    DELIM + r'spoon' + DELIM: '๐Ÿฅ„',
-    DELIM + r'(hocho|knife)' + DELIM: '๐Ÿ”ช',
-    DELIM + r'amphora' + DELIM: '๐Ÿบ',
-
+    DELIM + r"chopsticks" + DELIM: "๐Ÿฅข",
+    DELIM + r"plate_with_cutlery" + DELIM: "๐Ÿฝ๏ธ",
+    DELIM + r"fork_and_knife" + DELIM: "๐Ÿด",
+    DELIM + r"spoon" + DELIM: "๐Ÿฅ„",
+    DELIM + r"(hocho|knife)" + DELIM: "๐Ÿ”ช",
+    DELIM + r"amphora" + DELIM: "๐Ÿบ",
     #
     # Place Map
     #
-    DELIM + r'earth_africa' + DELIM: '๐ŸŒ',
-    DELIM + r'earth_americas' + DELIM: '๐ŸŒŽ',
-    DELIM + r'earth_asia' + DELIM: '๐ŸŒ',
-    DELIM + r'globe_with_meridians' + DELIM: '๐ŸŒ',
-    DELIM + r'world_map' + DELIM: '๐Ÿ—บ๏ธ',
-    DELIM + r'japan' + DELIM: '๐Ÿ—พ',
-    DELIM + r'compass' + DELIM: '๐Ÿงญ',
-
+    DELIM + r"earth_africa" + DELIM: "๐ŸŒ",
+    DELIM + r"earth_americas" + DELIM: "๐ŸŒŽ",
+    DELIM + r"earth_asia" + DELIM: "๐ŸŒ",
+    DELIM + r"globe_with_meridians" + DELIM: "๐ŸŒ",
+    DELIM + r"world_map" + DELIM: "๐Ÿ—บ๏ธ",
+    DELIM + r"japan" + DELIM: "๐Ÿ—พ",
+    DELIM + r"compass" + DELIM: "๐Ÿงญ",
     #
     # Place Geographic
     #
-    DELIM + r'mountain_snow' + DELIM: '๐Ÿ”๏ธ',
-    DELIM + r'mountain' + DELIM: 'โ›ฐ๏ธ',
-    DELIM + r'volcano' + DELIM: '๐ŸŒ‹',
-    DELIM + r'mount_fuji' + DELIM: '๐Ÿ—ป',
-    DELIM + r'camping' + DELIM: '๐Ÿ•๏ธ',
-    DELIM + r'beach_umbrella' + DELIM: '๐Ÿ–๏ธ',
-    DELIM + r'desert' + DELIM: '๐Ÿœ๏ธ',
-    DELIM + r'desert_island' + DELIM: '๐Ÿ๏ธ',
-    DELIM + r'national_park' + DELIM: '๐Ÿž๏ธ',
-
+    DELIM + r"mountain_snow" + DELIM: "๐Ÿ”๏ธ",
+    DELIM + r"mountain" + DELIM: "โ›ฐ๏ธ",
+    DELIM + r"volcano" + DELIM: "๐ŸŒ‹",
+    DELIM + r"mount_fuji" + DELIM: "๐Ÿ—ป",
+    DELIM + r"camping" + DELIM: "๐Ÿ•๏ธ",
+    DELIM + r"beach_umbrella" + DELIM: "๐Ÿ–๏ธ",
+    DELIM + r"desert" + DELIM: "๐Ÿœ๏ธ",
+    DELIM + r"desert_island" + DELIM: "๐Ÿ๏ธ",
+    DELIM + r"national_park" + DELIM: "๐Ÿž๏ธ",
     #
     # Place Building
     #
-    DELIM + r'stadium' + DELIM: '๐ŸŸ๏ธ',
-    DELIM + r'classical_building' + DELIM: '๐Ÿ›๏ธ',
-    DELIM + r'building_construction' + DELIM: '๐Ÿ—๏ธ',
-    DELIM + r'bricks' + DELIM: '๐Ÿงฑ',
-    DELIM + r'rock' + DELIM: '๐Ÿชจ',
-    DELIM + r'wood' + DELIM: '๐Ÿชต',
-    DELIM + r'hut' + DELIM: '๐Ÿ›–',
-    DELIM + r'houses' + DELIM: '๐Ÿ˜๏ธ',
-    DELIM + r'derelict_house' + DELIM: '๐Ÿš๏ธ',
-    DELIM + r'house' + DELIM: '๐Ÿ ',
-    DELIM + r'house_with_garden' + DELIM: '๐Ÿก',
-    DELIM + r'office' + DELIM: '๐Ÿข',
-    DELIM + r'post_office' + DELIM: '๐Ÿฃ',
-    DELIM + r'european_post_office' + DELIM: '๐Ÿค',
-    DELIM + r'hospital' + DELIM: '๐Ÿฅ',
-    DELIM + r'bank' + DELIM: '๐Ÿฆ',
-    DELIM + r'hotel' + DELIM: '๐Ÿจ',
-    DELIM + r'love_hotel' + DELIM: '๐Ÿฉ',
-    DELIM + r'convenience_store' + DELIM: '๐Ÿช',
-    DELIM + r'school' + DELIM: '๐Ÿซ',
-    DELIM + r'department_store' + DELIM: '๐Ÿฌ',
-    DELIM + r'factory' + DELIM: '๐Ÿญ',
-    DELIM + r'japanese_castle' + DELIM: '๐Ÿฏ',
-    DELIM + r'european_castle' + DELIM: '๐Ÿฐ',
-    DELIM + r'wedding' + DELIM: '๐Ÿ’’',
-    DELIM + r'tokyo_tower' + DELIM: '๐Ÿ—ผ',
-    DELIM + r'statue_of_liberty' + DELIM: '๐Ÿ—ฝ',
-
+    DELIM + r"stadium" + DELIM: "๐ŸŸ๏ธ",
+    DELIM + r"classical_building" + DELIM: "๐Ÿ›๏ธ",
+    DELIM + r"building_construction" + DELIM: "๐Ÿ—๏ธ",
+    DELIM + r"bricks" + DELIM: "๐Ÿงฑ",
+    DELIM + r"rock" + DELIM: "๐Ÿชจ",
+    DELIM + r"wood" + DELIM: "๐Ÿชต",
+    DELIM + r"hut" + DELIM: "๐Ÿ›–",
+    DELIM + r"houses" + DELIM: "๐Ÿ˜๏ธ",
+    DELIM + r"derelict_house" + DELIM: "๐Ÿš๏ธ",
+    DELIM + r"house" + DELIM: "๐Ÿ ",
+    DELIM + r"house_with_garden" + DELIM: "๐Ÿก",
+    DELIM + r"office" + DELIM: "๐Ÿข",
+    DELIM + r"post_office" + DELIM: "๐Ÿฃ",
+    DELIM + r"european_post_office" + DELIM: "๐Ÿค",
+    DELIM + r"hospital" + DELIM: "๐Ÿฅ",
+    DELIM + r"bank" + DELIM: "๐Ÿฆ",
+    DELIM + r"hotel" + DELIM: "๐Ÿจ",
+    DELIM + r"love_hotel" + DELIM: "๐Ÿฉ",
+    DELIM + r"convenience_store" + DELIM: "๐Ÿช",
+    DELIM + r"school" + DELIM: "๐Ÿซ",
+    DELIM + r"department_store" + DELIM: "๐Ÿฌ",
+    DELIM + r"factory" + DELIM: "๐Ÿญ",
+    DELIM + r"japanese_castle" + DELIM: "๐Ÿฏ",
+    DELIM + r"european_castle" + DELIM: "๐Ÿฐ",
+    DELIM + r"wedding" + DELIM: "๐Ÿ’’",
+    DELIM + r"tokyo_tower" + DELIM: "๐Ÿ—ผ",
+    DELIM + r"statue_of_liberty" + DELIM: "๐Ÿ—ฝ",
     #
     # Place Religious
     #
-    DELIM + r'church' + DELIM: 'โ›ช',
-    DELIM + r'mosque' + DELIM: '๐Ÿ•Œ',
-    DELIM + r'hindu_temple' + DELIM: '๐Ÿ›•',
-    DELIM + r'synagogue' + DELIM: '๐Ÿ•',
-    DELIM + r'shinto_shrine' + DELIM: 'โ›ฉ๏ธ',
-    DELIM + r'kaaba' + DELIM: '๐Ÿ•‹',
-
+    DELIM + r"church" + DELIM: "โ›ช",
+    DELIM + r"mosque" + DELIM: "๐Ÿ•Œ",
+    DELIM + r"hindu_temple" + DELIM: "๐Ÿ›•",
+    DELIM + r"synagogue" + DELIM: "๐Ÿ•",
+    DELIM + r"shinto_shrine" + DELIM: "โ›ฉ๏ธ",
+    DELIM + r"kaaba" + DELIM: "๐Ÿ•‹",
     #
     # Place Other
     #
-    DELIM + r'fountain' + DELIM: 'โ›ฒ',
-    DELIM + r'tent' + DELIM: 'โ›บ',
-    DELIM + r'foggy' + DELIM: '๐ŸŒ',
-    DELIM + r'night_with_stars' + DELIM: '๐ŸŒƒ',
-    DELIM + r'cityscape' + DELIM: '๐Ÿ™๏ธ',
-    DELIM + r'sunrise_over_mountains' + DELIM: '๐ŸŒ„',
-    DELIM + r'sunrise' + DELIM: '๐ŸŒ…',
-    DELIM + r'city_sunset' + DELIM: '๐ŸŒ†',
-    DELIM + r'city_sunrise' + DELIM: '๐ŸŒ‡',
-    DELIM + r'bridge_at_night' + DELIM: '๐ŸŒ‰',
-    DELIM + r'hotsprings' + DELIM: 'โ™จ๏ธ',
-    DELIM + r'carousel_horse' + DELIM: '๐ŸŽ ',
-    DELIM + r'ferris_wheel' + DELIM: '๐ŸŽก',
-    DELIM + r'roller_coaster' + DELIM: '๐ŸŽข',
-    DELIM + r'barber' + DELIM: '๐Ÿ’ˆ',
-    DELIM + r'circus_tent' + DELIM: '๐ŸŽช',
-
+    DELIM + r"fountain" + DELIM: "โ›ฒ",
+    DELIM + r"tent" + DELIM: "โ›บ",
+    DELIM + r"foggy" + DELIM: "๐ŸŒ",
+    DELIM + r"night_with_stars" + DELIM: "๐ŸŒƒ",
+    DELIM + r"cityscape" + DELIM: "๐Ÿ™๏ธ",
+    DELIM + r"sunrise_over_mountains" + DELIM: "๐ŸŒ„",
+    DELIM + r"sunrise" + DELIM: "๐ŸŒ…",
+    DELIM + r"city_sunset" + DELIM: "๐ŸŒ†",
+    DELIM + r"city_sunrise" + DELIM: "๐ŸŒ‡",
+    DELIM + r"bridge_at_night" + DELIM: "๐ŸŒ‰",
+    DELIM + r"hotsprings" + DELIM: "โ™จ๏ธ",
+    DELIM + r"carousel_horse" + DELIM: "๐ŸŽ ",
+    DELIM + r"ferris_wheel" + DELIM: "๐ŸŽก",
+    DELIM + r"roller_coaster" + DELIM: "๐ŸŽข",
+    DELIM + r"barber" + DELIM: "๐Ÿ’ˆ",
+    DELIM + r"circus_tent" + DELIM: "๐ŸŽช",
     #
     # Transport Ground
     #
-    DELIM + r'steam_locomotive' + DELIM: '๐Ÿš‚',
-    DELIM + r'railway_car' + DELIM: '๐Ÿšƒ',
-    DELIM + r'bullettrain_side' + DELIM: '๐Ÿš„',
-    DELIM + r'bullettrain_front' + DELIM: '๐Ÿš…',
-    DELIM + r'train2' + DELIM: '๐Ÿš†',
-    DELIM + r'metro' + DELIM: '๐Ÿš‡',
-    DELIM + r'light_rail' + DELIM: '๐Ÿšˆ',
-    DELIM + r'station' + DELIM: '๐Ÿš‰',
-    DELIM + r'tram' + DELIM: '๐ŸšŠ',
-    DELIM + r'monorail' + DELIM: '๐Ÿš',
-    DELIM + r'mountain_railway' + DELIM: '๐Ÿšž',
-    DELIM + r'train' + DELIM: '๐Ÿš‹',
-    DELIM + r'bus' + DELIM: '๐ŸšŒ',
-    DELIM + r'oncoming_bus' + DELIM: '๐Ÿš',
-    DELIM + r'trolleybus' + DELIM: '๐ŸšŽ',
-    DELIM + r'minibus' + DELIM: '๐Ÿš',
-    DELIM + r'ambulance' + DELIM: '๐Ÿš‘',
-    DELIM + r'fire_engine' + DELIM: '๐Ÿš’',
-    DELIM + r'police_car' + DELIM: '๐Ÿš“',
-    DELIM + r'oncoming_police_car' + DELIM: '๐Ÿš”',
-    DELIM + r'taxi' + DELIM: '๐Ÿš•',
-    DELIM + r'oncoming_taxi' + DELIM: '๐Ÿš–',
-    DELIM + r'car' + DELIM: '๐Ÿš—',
-    DELIM + r'(red_car|oncoming_automobile)' + DELIM: '๐Ÿš˜',
-    DELIM + r'blue_car' + DELIM: '๐Ÿš™',
-    DELIM + r'pickup_truck' + DELIM: '๐Ÿ›ป',
-    DELIM + r'truck' + DELIM: '๐Ÿšš',
-    DELIM + r'articulated_lorry' + DELIM: '๐Ÿš›',
-    DELIM + r'tractor' + DELIM: '๐Ÿšœ',
-    DELIM + r'racing_car' + DELIM: '๐ŸŽ๏ธ',
-    DELIM + r'motorcycle' + DELIM: '๐Ÿ๏ธ',
-    DELIM + r'motor_scooter' + DELIM: '๐Ÿ›ต',
-    DELIM + r'manual_wheelchair' + DELIM: '๐Ÿฆฝ',
-    DELIM + r'motorized_wheelchair' + DELIM: '๐Ÿฆผ',
-    DELIM + r'auto_rickshaw' + DELIM: '๐Ÿ›บ',
-    DELIM + r'bike' + DELIM: '๐Ÿšฒ',
-    DELIM + r'kick_scooter' + DELIM: '๐Ÿ›ด',
-    DELIM + r'skateboard' + DELIM: '๐Ÿ›น',
-    DELIM + r'roller_skate' + DELIM: '๐Ÿ›ผ',
-    DELIM + r'busstop' + DELIM: '๐Ÿš',
-    DELIM + r'motorway' + DELIM: '๐Ÿ›ฃ๏ธ',
-    DELIM + r'railway_track' + DELIM: '๐Ÿ›ค๏ธ',
-    DELIM + r'oil_drum' + DELIM: '๐Ÿ›ข๏ธ',
-    DELIM + r'fuelpump' + DELIM: 'โ›ฝ',
-    DELIM + r'rotating_light' + DELIM: '๐Ÿšจ',
-    DELIM + r'traffic_light' + DELIM: '๐Ÿšฅ',
-    DELIM + r'vertical_traffic_light' + DELIM: '๐Ÿšฆ',
-    DELIM + r'stop_sign' + DELIM: '๐Ÿ›‘',
-    DELIM + r'construction' + DELIM: '๐Ÿšง',
-
+    DELIM + r"steam_locomotive" + DELIM: "๐Ÿš‚",
+    DELIM + r"railway_car" + DELIM: "๐Ÿšƒ",
+    DELIM + r"bullettrain_side" + DELIM: "๐Ÿš„",
+    DELIM + r"bullettrain_front" + DELIM: "๐Ÿš…",
+    DELIM + r"train2" + DELIM: "๐Ÿš†",
+    DELIM + r"metro" + DELIM: "๐Ÿš‡",
+    DELIM + r"light_rail" + DELIM: "๐Ÿšˆ",
+    DELIM + r"station" + DELIM: "๐Ÿš‰",
+    DELIM + r"tram" + DELIM: "๐ŸšŠ",
+    DELIM + r"monorail" + DELIM: "๐Ÿš",
+    DELIM + r"mountain_railway" + DELIM: "๐Ÿšž",
+    DELIM + r"train" + DELIM: "๐Ÿš‹",
+    DELIM + r"bus" + DELIM: "๐ŸšŒ",
+    DELIM + r"oncoming_bus" + DELIM: "๐Ÿš",
+    DELIM + r"trolleybus" + DELIM: "๐ŸšŽ",
+    DELIM + r"minibus" + DELIM: "๐Ÿš",
+    DELIM + r"ambulance" + DELIM: "๐Ÿš‘",
+    DELIM + r"fire_engine" + DELIM: "๐Ÿš’",
+    DELIM + r"police_car" + DELIM: "๐Ÿš“",
+    DELIM + r"oncoming_police_car" + DELIM: "๐Ÿš”",
+    DELIM + r"taxi" + DELIM: "๐Ÿš•",
+    DELIM + r"oncoming_taxi" + DELIM: "๐Ÿš–",
+    DELIM + r"car" + DELIM: "๐Ÿš—",
+    DELIM + r"(red_car|oncoming_automobile)" + DELIM: "๐Ÿš˜",
+    DELIM + r"blue_car" + DELIM: "๐Ÿš™",
+    DELIM + r"pickup_truck" + DELIM: "๐Ÿ›ป",
+    DELIM + r"truck" + DELIM: "๐Ÿšš",
+    DELIM + r"articulated_lorry" + DELIM: "๐Ÿš›",
+    DELIM + r"tractor" + DELIM: "๐Ÿšœ",
+    DELIM + r"racing_car" + DELIM: "๐ŸŽ๏ธ",
+    DELIM + r"motorcycle" + DELIM: "๐Ÿ๏ธ",
+    DELIM + r"motor_scooter" + DELIM: "๐Ÿ›ต",
+    DELIM + r"manual_wheelchair" + DELIM: "๐Ÿฆฝ",
+    DELIM + r"motorized_wheelchair" + DELIM: "๐Ÿฆผ",
+    DELIM + r"auto_rickshaw" + DELIM: "๐Ÿ›บ",
+    DELIM + r"bike" + DELIM: "๐Ÿšฒ",
+    DELIM + r"kick_scooter" + DELIM: "๐Ÿ›ด",
+    DELIM + r"skateboard" + DELIM: "๐Ÿ›น",
+    DELIM + r"roller_skate" + DELIM: "๐Ÿ›ผ",
+    DELIM + r"busstop" + DELIM: "๐Ÿš",
+    DELIM + r"motorway" + DELIM: "๐Ÿ›ฃ๏ธ",
+    DELIM + r"railway_track" + DELIM: "๐Ÿ›ค๏ธ",
+    DELIM + r"oil_drum" + DELIM: "๐Ÿ›ข๏ธ",
+    DELIM + r"fuelpump" + DELIM: "โ›ฝ",
+    DELIM + r"rotating_light" + DELIM: "๐Ÿšจ",
+    DELIM + r"traffic_light" + DELIM: "๐Ÿšฅ",
+    DELIM + r"vertical_traffic_light" + DELIM: "๐Ÿšฆ",
+    DELIM + r"stop_sign" + DELIM: "๐Ÿ›‘",
+    DELIM + r"construction" + DELIM: "๐Ÿšง",
     #
     # Transport Water
     #
-    DELIM + r'anchor' + DELIM: 'โš“',
-    DELIM + r'(sailboat|boat)' + DELIM: 'โ›ต',
-    DELIM + r'canoe' + DELIM: '๐Ÿ›ถ',
-    DELIM + r'speedboat' + DELIM: '๐Ÿšค',
-    DELIM + r'passenger_ship' + DELIM: '๐Ÿ›ณ๏ธ',
-    DELIM + r'ferry' + DELIM: 'โ›ด๏ธ',
-    DELIM + r'motor_boat' + DELIM: '๐Ÿ›ฅ๏ธ',
-    DELIM + r'ship' + DELIM: '๐Ÿšข',
-
+    DELIM + r"anchor" + DELIM: "โš“",
+    DELIM + r"(sailboat|boat)" + DELIM: "โ›ต",
+    DELIM + r"canoe" + DELIM: "๐Ÿ›ถ",
+    DELIM + r"speedboat" + DELIM: "๐Ÿšค",
+    DELIM + r"passenger_ship" + DELIM: "๐Ÿ›ณ๏ธ",
+    DELIM + r"ferry" + DELIM: "โ›ด๏ธ",
+    DELIM + r"motor_boat" + DELIM: "๐Ÿ›ฅ๏ธ",
+    DELIM + r"ship" + DELIM: "๐Ÿšข",
     #
     # Transport Air
     #
-    DELIM + r'airplane' + DELIM: 'โœˆ๏ธ',
-    DELIM + r'small_airplane' + DELIM: '๐Ÿ›ฉ๏ธ',
-    DELIM + r'flight_departure' + DELIM: '๐Ÿ›ซ',
-    DELIM + r'flight_arrival' + DELIM: '๐Ÿ›ฌ',
-    DELIM + r'parachute' + DELIM: '๐Ÿช‚',
-    DELIM + r'seat' + DELIM: '๐Ÿ’บ',
-    DELIM + r'helicopter' + DELIM: '๐Ÿš',
-    DELIM + r'suspension_railway' + DELIM: '๐ŸšŸ',
-    DELIM + r'mountain_cableway' + DELIM: '๐Ÿš ',
-    DELIM + r'aerial_tramway' + DELIM: '๐Ÿšก',
-    DELIM + r'artificial_satellite' + DELIM: '๐Ÿ›ฐ๏ธ',
-    DELIM + r'rocket' + DELIM: '๐Ÿš€',
-    DELIM + r'flying_saucer' + DELIM: '๐Ÿ›ธ',
-
+    DELIM + r"airplane" + DELIM: "โœˆ๏ธ",
+    DELIM + r"small_airplane" + DELIM: "๐Ÿ›ฉ๏ธ",
+    DELIM + r"flight_departure" + DELIM: "๐Ÿ›ซ",
+    DELIM + r"flight_arrival" + DELIM: "๐Ÿ›ฌ",
+    DELIM + r"parachute" + DELIM: "๐Ÿช‚",
+    DELIM + r"seat" + DELIM: "๐Ÿ’บ",
+    DELIM + r"helicopter" + DELIM: "๐Ÿš",
+    DELIM + r"suspension_railway" + DELIM: "๐ŸšŸ",
+    DELIM + r"mountain_cableway" + DELIM: "๐Ÿš ",
+    DELIM + r"aerial_tramway" + DELIM: "๐Ÿšก",
+    DELIM + r"artificial_satellite" + DELIM: "๐Ÿ›ฐ๏ธ",
+    DELIM + r"rocket" + DELIM: "๐Ÿš€",
+    DELIM + r"flying_saucer" + DELIM: "๐Ÿ›ธ",
     #
     # Hotel
     #
-    DELIM + r'bellhop_bell' + DELIM: '๐Ÿ›Ž๏ธ',
-    DELIM + r'luggage' + DELIM: '๐Ÿงณ',
-
+    DELIM + r"bellhop_bell" + DELIM: "๐Ÿ›Ž๏ธ",
+    DELIM + r"luggage" + DELIM: "๐Ÿงณ",
     #
     # Time
     #
-    DELIM + r'hourglass' + DELIM: 'โŒ›',
-    DELIM + r'hourglass_flowing_sand' + DELIM: 'โณ',
-    DELIM + r'watch' + DELIM: 'โŒš',
-    DELIM + r'alarm_clock' + DELIM: 'โฐ',
-    DELIM + r'stopwatch' + DELIM: 'โฑ๏ธ',
-    DELIM + r'timer_clock' + DELIM: 'โฒ๏ธ',
-    DELIM + r'mantelpiece_clock' + DELIM: '๐Ÿ•ฐ๏ธ',
-    DELIM + r'clock12' + DELIM: '๐Ÿ•›',
-    DELIM + r'clock1230' + DELIM: '๐Ÿ•ง',
-    DELIM + r'clock1' + DELIM: '๐Ÿ•',
-    DELIM + r'clock130' + DELIM: '๐Ÿ•œ',
-    DELIM + r'clock2' + DELIM: '๐Ÿ•‘',
-    DELIM + r'clock230' + DELIM: '๐Ÿ•',
-    DELIM + r'clock3' + DELIM: '๐Ÿ•’',
-    DELIM + r'clock330' + DELIM: '๐Ÿ•ž',
-    DELIM + r'clock4' + DELIM: '๐Ÿ•“',
-    DELIM + r'clock430' + DELIM: '๐Ÿ•Ÿ',
-    DELIM + r'clock5' + DELIM: '๐Ÿ•”',
-    DELIM + r'clock530' + DELIM: '๐Ÿ• ',
-    DELIM + r'clock6' + DELIM: '๐Ÿ••',
-    DELIM + r'clock630' + DELIM: '๐Ÿ•ก',
-    DELIM + r'clock7' + DELIM: '๐Ÿ•–',
-    DELIM + r'clock730' + DELIM: '๐Ÿ•ข',
-    DELIM + r'clock8' + DELIM: '๐Ÿ•—',
-    DELIM + r'clock830' + DELIM: '๐Ÿ•ฃ',
-    DELIM + r'clock9' + DELIM: '๐Ÿ•˜',
-    DELIM + r'clock930' + DELIM: '๐Ÿ•ค',
-    DELIM + r'clock10' + DELIM: '๐Ÿ•™',
-    DELIM + r'clock1030' + DELIM: '๐Ÿ•ฅ',
-    DELIM + r'clock11' + DELIM: '๐Ÿ•š',
-    DELIM + r'clock1130' + DELIM: '๐Ÿ•ฆ',
-
+    DELIM + r"hourglass" + DELIM: "โŒ›",
+    DELIM + r"hourglass_flowing_sand" + DELIM: "โณ",
+    DELIM + r"watch" + DELIM: "โŒš",
+    DELIM + r"alarm_clock" + DELIM: "โฐ",
+    DELIM + r"stopwatch" + DELIM: "โฑ๏ธ",
+    DELIM + r"timer_clock" + DELIM: "โฒ๏ธ",
+    DELIM + r"mantelpiece_clock" + DELIM: "๐Ÿ•ฐ๏ธ",
+    DELIM + r"clock12" + DELIM: "๐Ÿ•›",
+    DELIM + r"clock1230" + DELIM: "๐Ÿ•ง",
+    DELIM + r"clock1" + DELIM: "๐Ÿ•",
+    DELIM + r"clock130" + DELIM: "๐Ÿ•œ",
+    DELIM + r"clock2" + DELIM: "๐Ÿ•‘",
+    DELIM + r"clock230" + DELIM: "๐Ÿ•",
+    DELIM + r"clock3" + DELIM: "๐Ÿ•’",
+    DELIM + r"clock330" + DELIM: "๐Ÿ•ž",
+    DELIM + r"clock4" + DELIM: "๐Ÿ•“",
+    DELIM + r"clock430" + DELIM: "๐Ÿ•Ÿ",
+    DELIM + r"clock5" + DELIM: "๐Ÿ•”",
+    DELIM + r"clock530" + DELIM: "๐Ÿ• ",
+    DELIM + r"clock6" + DELIM: "๐Ÿ••",
+    DELIM + r"clock630" + DELIM: "๐Ÿ•ก",
+    DELIM + r"clock7" + DELIM: "๐Ÿ•–",
+    DELIM + r"clock730" + DELIM: "๐Ÿ•ข",
+    DELIM + r"clock8" + DELIM: "๐Ÿ•—",
+    DELIM + r"clock830" + DELIM: "๐Ÿ•ฃ",
+    DELIM + r"clock9" + DELIM: "๐Ÿ•˜",
+    DELIM + r"clock930" + DELIM: "๐Ÿ•ค",
+    DELIM + r"clock10" + DELIM: "๐Ÿ•™",
+    DELIM + r"clock1030" + DELIM: "๐Ÿ•ฅ",
+    DELIM + r"clock11" + DELIM: "๐Ÿ•š",
+    DELIM + r"clock1130" + DELIM: "๐Ÿ•ฆ",
     # Sky & Weather
-    DELIM + r'new_moon' + DELIM: '๐ŸŒ‘',
-    DELIM + r'waxing_crescent_moon' + DELIM: '๐ŸŒ’',
-    DELIM + r'first_quarter_moon' + DELIM: '๐ŸŒ“',
-    DELIM + r'moon' + DELIM: '๐ŸŒ”',
-    DELIM + r'(waxing_gibbous_moon|full_moon)' + DELIM: '๐ŸŒ•',
-    DELIM + r'waning_gibbous_moon' + DELIM: '๐ŸŒ–',
-    DELIM + r'last_quarter_moon' + DELIM: '๐ŸŒ—',
-    DELIM + r'waning_crescent_moon' + DELIM: '๐ŸŒ˜',
-    DELIM + r'crescent_moon' + DELIM: '๐ŸŒ™',
-    DELIM + r'new_moon_with_face' + DELIM: '๐ŸŒš',
-    DELIM + r'first_quarter_moon_with_face' + DELIM: '๐ŸŒ›',
-    DELIM + r'last_quarter_moon_with_face' + DELIM: '๐ŸŒœ',
-    DELIM + r'thermometer' + DELIM: '๐ŸŒก๏ธ',
-    DELIM + r'sunny' + DELIM: 'โ˜€๏ธ',
-    DELIM + r'full_moon_with_face' + DELIM: '๐ŸŒ',
-    DELIM + r'sun_with_face' + DELIM: '๐ŸŒž',
-    DELIM + r'ringed_planet' + DELIM: '๐Ÿช',
-    DELIM + r'star' + DELIM: 'โญ',
-    DELIM + r'star2' + DELIM: '๐ŸŒŸ',
-    DELIM + r'stars' + DELIM: '๐ŸŒ ',
-    DELIM + r'milky_way' + DELIM: '๐ŸŒŒ',
-    DELIM + r'cloud' + DELIM: 'โ˜๏ธ',
-    DELIM + r'partly_sunny' + DELIM: 'โ›…',
-    DELIM + r'cloud_with_lightning_and_rain' + DELIM: 'โ›ˆ๏ธ',
-    DELIM + r'sun_behind_small_cloud' + DELIM: '๐ŸŒค๏ธ',
-    DELIM + r'sun_behind_large_cloud' + DELIM: '๐ŸŒฅ๏ธ',
-    DELIM + r'sun_behind_rain_cloud' + DELIM: '๐ŸŒฆ๏ธ',
-    DELIM + r'cloud_with_rain' + DELIM: '๐ŸŒง๏ธ',
-    DELIM + r'cloud_with_snow' + DELIM: '๐ŸŒจ๏ธ',
-    DELIM + r'cloud_with_lightning' + DELIM: '๐ŸŒฉ๏ธ',
-    DELIM + r'tornado' + DELIM: '๐ŸŒช๏ธ',
-    DELIM + r'fog' + DELIM: '๐ŸŒซ๏ธ',
-    DELIM + r'wind_face' + DELIM: '๐ŸŒฌ๏ธ',
-    DELIM + r'cyclone' + DELIM: '๐ŸŒ€',
-    DELIM + r'rainbow' + DELIM: '๐ŸŒˆ',
-    DELIM + r'closed_umbrella' + DELIM: '๐ŸŒ‚',
-    DELIM + r'open_umbrella' + DELIM: 'โ˜‚๏ธ',
-    DELIM + r'umbrella' + DELIM: 'โ˜”',
-    DELIM + r'parasol_on_ground' + DELIM: 'โ›ฑ๏ธ',
-    DELIM + r'zap' + DELIM: 'โšก',
-    DELIM + r'snowflake' + DELIM: 'โ„๏ธ',
-    DELIM + r'snowman_with_snow' + DELIM: 'โ˜ƒ๏ธ',
-    DELIM + r'snowman' + DELIM: 'โ›„',
-    DELIM + r'comet' + DELIM: 'โ˜„๏ธ',
-    DELIM + r'fire' + DELIM: '๐Ÿ”ฅ',
-    DELIM + r'droplet' + DELIM: '๐Ÿ’ง',
-    DELIM + r'ocean' + DELIM: '๐ŸŒŠ',
-
+    DELIM + r"new_moon" + DELIM: "๐ŸŒ‘",
+    DELIM + r"waxing_crescent_moon" + DELIM: "๐ŸŒ’",
+    DELIM + r"first_quarter_moon" + DELIM: "๐ŸŒ“",
+    DELIM + r"moon" + DELIM: "๐ŸŒ”",
+    DELIM + r"(waxing_gibbous_moon|full_moon)" + DELIM: "๐ŸŒ•",
+    DELIM + r"waning_gibbous_moon" + DELIM: "๐ŸŒ–",
+    DELIM + r"last_quarter_moon" + DELIM: "๐ŸŒ—",
+    DELIM + r"waning_crescent_moon" + DELIM: "๐ŸŒ˜",
+    DELIM + r"crescent_moon" + DELIM: "๐ŸŒ™",
+    DELIM + r"new_moon_with_face" + DELIM: "๐ŸŒš",
+    DELIM + r"first_quarter_moon_with_face" + DELIM: "๐ŸŒ›",
+    DELIM + r"last_quarter_moon_with_face" + DELIM: "๐ŸŒœ",
+    DELIM + r"thermometer" + DELIM: "๐ŸŒก๏ธ",
+    DELIM + r"sunny" + DELIM: "โ˜€๏ธ",
+    DELIM + r"full_moon_with_face" + DELIM: "๐ŸŒ",
+    DELIM + r"sun_with_face" + DELIM: "๐ŸŒž",
+    DELIM + r"ringed_planet" + DELIM: "๐Ÿช",
+    DELIM + r"star" + DELIM: "โญ",
+    DELIM + r"star2" + DELIM: "๐ŸŒŸ",
+    DELIM + r"stars" + DELIM: "๐ŸŒ ",
+    DELIM + r"milky_way" + DELIM: "๐ŸŒŒ",
+    DELIM + r"cloud" + DELIM: "โ˜๏ธ",
+    DELIM + r"partly_sunny" + DELIM: "โ›…",
+    DELIM + r"cloud_with_lightning_and_rain" + DELIM: "โ›ˆ๏ธ",
+    DELIM + r"sun_behind_small_cloud" + DELIM: "๐ŸŒค๏ธ",
+    DELIM + r"sun_behind_large_cloud" + DELIM: "๐ŸŒฅ๏ธ",
+    DELIM + r"sun_behind_rain_cloud" + DELIM: "๐ŸŒฆ๏ธ",
+    DELIM + r"cloud_with_rain" + DELIM: "๐ŸŒง๏ธ",
+    DELIM + r"cloud_with_snow" + DELIM: "๐ŸŒจ๏ธ",
+    DELIM + r"cloud_with_lightning" + DELIM: "๐ŸŒฉ๏ธ",
+    DELIM + r"tornado" + DELIM: "๐ŸŒช๏ธ",
+    DELIM + r"fog" + DELIM: "๐ŸŒซ๏ธ",
+    DELIM + r"wind_face" + DELIM: "๐ŸŒฌ๏ธ",
+    DELIM + r"cyclone" + DELIM: "๐ŸŒ€",
+    DELIM + r"rainbow" + DELIM: "๐ŸŒˆ",
+    DELIM + r"closed_umbrella" + DELIM: "๐ŸŒ‚",
+    DELIM + r"open_umbrella" + DELIM: "โ˜‚๏ธ",
+    DELIM + r"umbrella" + DELIM: "โ˜”",
+    DELIM + r"parasol_on_ground" + DELIM: "โ›ฑ๏ธ",
+    DELIM + r"zap" + DELIM: "โšก",
+    DELIM + r"snowflake" + DELIM: "โ„๏ธ",
+    DELIM + r"snowman_with_snow" + DELIM: "โ˜ƒ๏ธ",
+    DELIM + r"snowman" + DELIM: "โ›„",
+    DELIM + r"comet" + DELIM: "โ˜„๏ธ",
+    DELIM + r"fire" + DELIM: "๐Ÿ”ฅ",
+    DELIM + r"droplet" + DELIM: "๐Ÿ’ง",
+    DELIM + r"ocean" + DELIM: "๐ŸŒŠ",
     #
     # Event
     #
-    DELIM + r'jack_o_lantern' + DELIM: '๐ŸŽƒ',
-    DELIM + r'christmas_tree' + DELIM: '๐ŸŽ„',
-    DELIM + r'fireworks' + DELIM: '๐ŸŽ†',
-    DELIM + r'sparkler' + DELIM: '๐ŸŽ‡',
-    DELIM + r'firecracker' + DELIM: '๐Ÿงจ',
-    DELIM + r'sparkles' + DELIM: 'โœจ',
-    DELIM + r'balloon' + DELIM: '๐ŸŽˆ',
-    DELIM + r'tada' + DELIM: '๐ŸŽ‰',
-    DELIM + r'confetti_ball' + DELIM: '๐ŸŽŠ',
-    DELIM + r'tanabata_tree' + DELIM: '๐ŸŽ‹',
-    DELIM + r'bamboo' + DELIM: '๐ŸŽ',
-    DELIM + r'dolls' + DELIM: '๐ŸŽŽ',
-    DELIM + r'flags' + DELIM: '๐ŸŽ',
-    DELIM + r'wind_chime' + DELIM: '๐ŸŽ',
-    DELIM + r'rice_scene' + DELIM: '๐ŸŽ‘',
-    DELIM + r'red_envelope' + DELIM: '๐Ÿงง',
-    DELIM + r'ribbon' + DELIM: '๐ŸŽ€',
-    DELIM + r'gift' + DELIM: '๐ŸŽ',
-    DELIM + r'reminder_ribbon' + DELIM: '๐ŸŽ—๏ธ',
-    DELIM + r'tickets' + DELIM: '๐ŸŽŸ๏ธ',
-    DELIM + r'ticket' + DELIM: '๐ŸŽซ',
-
+    DELIM + r"jack_o_lantern" + DELIM: "๐ŸŽƒ",
+    DELIM + r"christmas_tree" + DELIM: "๐ŸŽ„",
+    DELIM + r"fireworks" + DELIM: "๐ŸŽ†",
+    DELIM + r"sparkler" + DELIM: "๐ŸŽ‡",
+    DELIM + r"firecracker" + DELIM: "๐Ÿงจ",
+    DELIM + r"sparkles" + DELIM: "โœจ",
+    DELIM + r"balloon" + DELIM: "๐ŸŽˆ",
+    DELIM + r"tada" + DELIM: "๐ŸŽ‰",
+    DELIM + r"confetti_ball" + DELIM: "๐ŸŽŠ",
+    DELIM + r"tanabata_tree" + DELIM: "๐ŸŽ‹",
+    DELIM + r"bamboo" + DELIM: "๐ŸŽ",
+    DELIM + r"dolls" + DELIM: "๐ŸŽŽ",
+    DELIM + r"flags" + DELIM: "๐ŸŽ",
+    DELIM + r"wind_chime" + DELIM: "๐ŸŽ",
+    DELIM + r"rice_scene" + DELIM: "๐ŸŽ‘",
+    DELIM + r"red_envelope" + DELIM: "๐Ÿงง",
+    DELIM + r"ribbon" + DELIM: "๐ŸŽ€",
+    DELIM + r"gift" + DELIM: "๐ŸŽ",
+    DELIM + r"reminder_ribbon" + DELIM: "๐ŸŽ—๏ธ",
+    DELIM + r"tickets" + DELIM: "๐ŸŽŸ๏ธ",
+    DELIM + r"ticket" + DELIM: "๐ŸŽซ",
     #
     # Award Medal
     #
-    DELIM + r'medal_military' + DELIM: '๐ŸŽ–๏ธ',
-    DELIM + r'trophy' + DELIM: '๐Ÿ†',
-    DELIM + r'medal_sports' + DELIM: '๐Ÿ…',
-    DELIM + r'1st_place_medal' + DELIM: '๐Ÿฅ‡',
-    DELIM + r'2nd_place_medal' + DELIM: '๐Ÿฅˆ',
-    DELIM + r'3rd_place_medal' + DELIM: '๐Ÿฅ‰',
-
+    DELIM + r"medal_military" + DELIM: "๐ŸŽ–๏ธ",
+    DELIM + r"trophy" + DELIM: "๐Ÿ†",
+    DELIM + r"medal_sports" + DELIM: "๐Ÿ…",
+    DELIM + r"1st_place_medal" + DELIM: "๐Ÿฅ‡",
+    DELIM + r"2nd_place_medal" + DELIM: "๐Ÿฅˆ",
+    DELIM + r"3rd_place_medal" + DELIM: "๐Ÿฅ‰",
     #
     # Sport
     #
-    DELIM + r'soccer' + DELIM: 'โšฝ',
-    DELIM + r'baseball' + DELIM: 'โšพ',
-    DELIM + r'softball' + DELIM: '๐ŸฅŽ',
-    DELIM + r'basketball' + DELIM: '๐Ÿ€',
-    DELIM + r'volleyball' + DELIM: '๐Ÿ',
-    DELIM + r'football' + DELIM: '๐Ÿˆ',
-    DELIM + r'rugby_football' + DELIM: '๐Ÿ‰',
-    DELIM + r'tennis' + DELIM: '๐ŸŽพ',
-    DELIM + r'flying_disc' + DELIM: '๐Ÿฅ',
-    DELIM + r'bowling' + DELIM: '๐ŸŽณ',
-    DELIM + r'cricket_game' + DELIM: '๐Ÿ',
-    DELIM + r'field_hockey' + DELIM: '๐Ÿ‘',
-    DELIM + r'ice_hockey' + DELIM: '๐Ÿ’',
-    DELIM + r'lacrosse' + DELIM: '๐Ÿฅ',
-    DELIM + r'ping_pong' + DELIM: '๐Ÿ“',
-    DELIM + r'badminton' + DELIM: '๐Ÿธ',
-    DELIM + r'boxing_glove' + DELIM: '๐ŸฅŠ',
-    DELIM + r'martial_arts_uniform' + DELIM: '๐Ÿฅ‹',
-    DELIM + r'goal_net' + DELIM: '๐Ÿฅ…',
-    DELIM + r'golf' + DELIM: 'โ›ณ',
-    DELIM + r'ice_skate' + DELIM: 'โ›ธ๏ธ',
-    DELIM + r'fishing_pole_and_fish' + DELIM: '๐ŸŽฃ',
-    DELIM + r'diving_mask' + DELIM: '๐Ÿคฟ',
-    DELIM + r'running_shirt_with_sash' + DELIM: '๐ŸŽฝ',
-    DELIM + r'ski' + DELIM: '๐ŸŽฟ',
-    DELIM + r'sled' + DELIM: '๐Ÿ›ท',
-    DELIM + r'curling_stone' + DELIM: '๐ŸฅŒ',
-
+    DELIM + r"soccer" + DELIM: "โšฝ",
+    DELIM + r"baseball" + DELIM: "โšพ",
+    DELIM + r"softball" + DELIM: "๐ŸฅŽ",
+    DELIM + r"basketball" + DELIM: "๐Ÿ€",
+    DELIM + r"volleyball" + DELIM: "๐Ÿ",
+    DELIM + r"football" + DELIM: "๐Ÿˆ",
+    DELIM + r"rugby_football" + DELIM: "๐Ÿ‰",
+    DELIM + r"tennis" + DELIM: "๐ŸŽพ",
+    DELIM + r"flying_disc" + DELIM: "๐Ÿฅ",
+    DELIM + r"bowling" + DELIM: "๐ŸŽณ",
+    DELIM + r"cricket_game" + DELIM: "๐Ÿ",
+    DELIM + r"field_hockey" + DELIM: "๐Ÿ‘",
+    DELIM + r"ice_hockey" + DELIM: "๐Ÿ’",
+    DELIM + r"lacrosse" + DELIM: "๐Ÿฅ",
+    DELIM + r"ping_pong" + DELIM: "๐Ÿ“",
+    DELIM + r"badminton" + DELIM: "๐Ÿธ",
+    DELIM + r"boxing_glove" + DELIM: "๐ŸฅŠ",
+    DELIM + r"martial_arts_uniform" + DELIM: "๐Ÿฅ‹",
+    DELIM + r"goal_net" + DELIM: "๐Ÿฅ…",
+    DELIM + r"golf" + DELIM: "โ›ณ",
+    DELIM + r"ice_skate" + DELIM: "โ›ธ๏ธ",
+    DELIM + r"fishing_pole_and_fish" + DELIM: "๐ŸŽฃ",
+    DELIM + r"diving_mask" + DELIM: "๐Ÿคฟ",
+    DELIM + r"running_shirt_with_sash" + DELIM: "๐ŸŽฝ",
+    DELIM + r"ski" + DELIM: "๐ŸŽฟ",
+    DELIM + r"sled" + DELIM: "๐Ÿ›ท",
+    DELIM + r"curling_stone" + DELIM: "๐ŸฅŒ",
     #
     # Game
     #
-    DELIM + r'dart' + DELIM: '๐ŸŽฏ',
-    DELIM + r'yo_yo' + DELIM: '๐Ÿช€',
-    DELIM + r'kite' + DELIM: '๐Ÿช',
-    DELIM + r'gun' + DELIM: '๐Ÿ”ซ',
-    DELIM + r'8ball' + DELIM: '๐ŸŽฑ',
-    DELIM + r'crystal_ball' + DELIM: '๐Ÿ”ฎ',
-    DELIM + r'magic_wand' + DELIM: '๐Ÿช„',
-    DELIM + r'video_game' + DELIM: '๐ŸŽฎ',
-    DELIM + r'joystick' + DELIM: '๐Ÿ•น๏ธ',
-    DELIM + r'slot_machine' + DELIM: '๐ŸŽฐ',
-    DELIM + r'game_die' + DELIM: '๐ŸŽฒ',
-    DELIM + r'jigsaw' + DELIM: '๐Ÿงฉ',
-    DELIM + r'teddy_bear' + DELIM: '๐Ÿงธ',
-    DELIM + r'pinata' + DELIM: '๐Ÿช…',
-    DELIM + r'nesting_dolls' + DELIM: '๐Ÿช†',
-    DELIM + r'spades' + DELIM: 'โ™ ๏ธ',
-    DELIM + r'hearts' + DELIM: 'โ™ฅ๏ธ',
-    DELIM + r'diamonds' + DELIM: 'โ™ฆ๏ธ',
-    DELIM + r'clubs' + DELIM: 'โ™ฃ๏ธ',
-    DELIM + r'chess_pawn' + DELIM: 'โ™Ÿ๏ธ',
-    DELIM + r'black_joker' + DELIM: '๐Ÿƒ',
-    DELIM + r'mahjong' + DELIM: '๐Ÿ€„',
-    DELIM + r'flower_playing_cards' + DELIM: '๐ŸŽด',
-
+    DELIM + r"dart" + DELIM: "๐ŸŽฏ",
+    DELIM + r"yo_yo" + DELIM: "๐Ÿช€",
+    DELIM + r"kite" + DELIM: "๐Ÿช",
+    DELIM + r"gun" + DELIM: "๐Ÿ”ซ",
+    DELIM + r"8ball" + DELIM: "๐ŸŽฑ",
+    DELIM + r"crystal_ball" + DELIM: "๐Ÿ”ฎ",
+    DELIM + r"magic_wand" + DELIM: "๐Ÿช„",
+    DELIM + r"video_game" + DELIM: "๐ŸŽฎ",
+    DELIM + r"joystick" + DELIM: "๐Ÿ•น๏ธ",
+    DELIM + r"slot_machine" + DELIM: "๐ŸŽฐ",
+    DELIM + r"game_die" + DELIM: "๐ŸŽฒ",
+    DELIM + r"jigsaw" + DELIM: "๐Ÿงฉ",
+    DELIM + r"teddy_bear" + DELIM: "๐Ÿงธ",
+    DELIM + r"pinata" + DELIM: "๐Ÿช…",
+    DELIM + r"nesting_dolls" + DELIM: "๐Ÿช†",
+    DELIM + r"spades" + DELIM: "โ™ ๏ธ",
+    DELIM + r"hearts" + DELIM: "โ™ฅ๏ธ",
+    DELIM + r"diamonds" + DELIM: "โ™ฆ๏ธ",
+    DELIM + r"clubs" + DELIM: "โ™ฃ๏ธ",
+    DELIM + r"chess_pawn" + DELIM: "โ™Ÿ๏ธ",
+    DELIM + r"black_joker" + DELIM: "๐Ÿƒ",
+    DELIM + r"mahjong" + DELIM: "๐Ÿ€„",
+    DELIM + r"flower_playing_cards" + DELIM: "๐ŸŽด",
     #
     # Arts & Crafts
     #
-    DELIM + r'performing_arts' + DELIM: '๐ŸŽญ',
-    DELIM + r'framed_picture' + DELIM: '๐Ÿ–ผ๏ธ',
-    DELIM + r'art' + DELIM: '๐ŸŽจ',
-    DELIM + r'thread' + DELIM: '๐Ÿงต',
-    DELIM + r'sewing_needle' + DELIM: '๐Ÿชก',
-    DELIM + r'yarn' + DELIM: '๐Ÿงถ',
-    DELIM + r'knot' + DELIM: '๐Ÿชข',
-
+    DELIM + r"performing_arts" + DELIM: "๐ŸŽญ",
+    DELIM + r"framed_picture" + DELIM: "๐Ÿ–ผ๏ธ",
+    DELIM + r"art" + DELIM: "๐ŸŽจ",
+    DELIM + r"thread" + DELIM: "๐Ÿงต",
+    DELIM + r"sewing_needle" + DELIM: "๐Ÿชก",
+    DELIM + r"yarn" + DELIM: "๐Ÿงถ",
+    DELIM + r"knot" + DELIM: "๐Ÿชข",
     #
     # Clothing
     #
-    DELIM + r'eyeglasses' + DELIM: '๐Ÿ‘“',
-    DELIM + r'dark_sunglasses' + DELIM: '๐Ÿ•ถ๏ธ',
-    DELIM + r'goggles' + DELIM: '๐Ÿฅฝ',
-    DELIM + r'lab_coat' + DELIM: '๐Ÿฅผ',
-    DELIM + r'safety_vest' + DELIM: '๐Ÿฆบ',
-    DELIM + r'necktie' + DELIM: '๐Ÿ‘”',
-    DELIM + r't?shirt' + DELIM: '๐Ÿ‘•',
-    DELIM + r'jeans' + DELIM: '๐Ÿ‘–',
-    DELIM + r'scarf' + DELIM: '๐Ÿงฃ',
-    DELIM + r'gloves' + DELIM: '๐Ÿงค',
-    DELIM + r'coat' + DELIM: '๐Ÿงฅ',
-    DELIM + r'socks' + DELIM: '๐Ÿงฆ',
-    DELIM + r'dress' + DELIM: '๐Ÿ‘—',
-    DELIM + r'kimono' + DELIM: '๐Ÿ‘˜',
-    DELIM + r'sari' + DELIM: '๐Ÿฅป',
-    DELIM + r'one_piece_swimsuit' + DELIM: '๐Ÿฉฑ',
-    DELIM + r'swim_brief' + DELIM: '๐Ÿฉฒ',
-    DELIM + r'shorts' + DELIM: '๐Ÿฉณ',
-    DELIM + r'bikini' + DELIM: '๐Ÿ‘™',
-    DELIM + r'womans_clothes' + DELIM: '๐Ÿ‘š',
-    DELIM + r'purse' + DELIM: '๐Ÿ‘›',
-    DELIM + r'handbag' + DELIM: '๐Ÿ‘œ',
-    DELIM + r'pouch' + DELIM: '๐Ÿ‘',
-    DELIM + r'shopping' + DELIM: '๐Ÿ›๏ธ',
-    DELIM + r'school_satchel' + DELIM: '๐ŸŽ’',
-    DELIM + r'thong_sandal' + DELIM: '๐Ÿฉด',
-    DELIM + r'(mans_)?shoe' + DELIM: '๐Ÿ‘ž',
-    DELIM + r'athletic_shoe' + DELIM: '๐Ÿ‘Ÿ',
-    DELIM + r'hiking_boot' + DELIM: '๐Ÿฅพ',
-    DELIM + r'flat_shoe' + DELIM: '๐Ÿฅฟ',
-    DELIM + r'high_heel' + DELIM: '๐Ÿ‘ ',
-    DELIM + r'sandal' + DELIM: '๐Ÿ‘ก',
-    DELIM + r'ballet_shoes' + DELIM: '๐Ÿฉฐ',
-    DELIM + r'boot' + DELIM: '๐Ÿ‘ข',
-    DELIM + r'crown' + DELIM: '๐Ÿ‘‘',
-    DELIM + r'womans_hat' + DELIM: '๐Ÿ‘’',
-    DELIM + r'tophat' + DELIM: '๐ŸŽฉ',
-    DELIM + r'mortar_board' + DELIM: '๐ŸŽ“',
-    DELIM + r'billed_cap' + DELIM: '๐Ÿงข',
-    DELIM + r'military_helmet' + DELIM: '๐Ÿช–',
-    DELIM + r'rescue_worker_helmet' + DELIM: 'โ›‘๏ธ',
-    DELIM + r'prayer_beads' + DELIM: '๐Ÿ“ฟ',
-    DELIM + r'lipstick' + DELIM: '๐Ÿ’„',
-    DELIM + r'ring' + DELIM: '๐Ÿ’',
-    DELIM + r'gem' + DELIM: '๐Ÿ’Ž',
-
+    DELIM + r"eyeglasses" + DELIM: "๐Ÿ‘“",
+    DELIM + r"dark_sunglasses" + DELIM: "๐Ÿ•ถ๏ธ",
+    DELIM + r"goggles" + DELIM: "๐Ÿฅฝ",
+    DELIM + r"lab_coat" + DELIM: "๐Ÿฅผ",
+    DELIM + r"safety_vest" + DELIM: "๐Ÿฆบ",
+    DELIM + r"necktie" + DELIM: "๐Ÿ‘”",
+    DELIM + r"t?shirt" + DELIM: "๐Ÿ‘•",
+    DELIM + r"jeans" + DELIM: "๐Ÿ‘–",
+    DELIM + r"scarf" + DELIM: "๐Ÿงฃ",
+    DELIM + r"gloves" + DELIM: "๐Ÿงค",
+    DELIM + r"coat" + DELIM: "๐Ÿงฅ",
+    DELIM + r"socks" + DELIM: "๐Ÿงฆ",
+    DELIM + r"dress" + DELIM: "๐Ÿ‘—",
+    DELIM + r"kimono" + DELIM: "๐Ÿ‘˜",
+    DELIM + r"sari" + DELIM: "๐Ÿฅป",
+    DELIM + r"one_piece_swimsuit" + DELIM: "๐Ÿฉฑ",
+    DELIM + r"swim_brief" + DELIM: "๐Ÿฉฒ",
+    DELIM + r"shorts" + DELIM: "๐Ÿฉณ",
+    DELIM + r"bikini" + DELIM: "๐Ÿ‘™",
+    DELIM + r"womans_clothes" + DELIM: "๐Ÿ‘š",
+    DELIM + r"purse" + DELIM: "๐Ÿ‘›",
+    DELIM + r"handbag" + DELIM: "๐Ÿ‘œ",
+    DELIM + r"pouch" + DELIM: "๐Ÿ‘",
+    DELIM + r"shopping" + DELIM: "๐Ÿ›๏ธ",
+    DELIM + r"school_satchel" + DELIM: "๐ŸŽ’",
+    DELIM + r"thong_sandal" + DELIM: "๐Ÿฉด",
+    DELIM + r"(mans_)?shoe" + DELIM: "๐Ÿ‘ž",
+    DELIM + r"athletic_shoe" + DELIM: "๐Ÿ‘Ÿ",
+    DELIM + r"hiking_boot" + DELIM: "๐Ÿฅพ",
+    DELIM + r"flat_shoe" + DELIM: "๐Ÿฅฟ",
+    DELIM + r"high_heel" + DELIM: "๐Ÿ‘ ",
+    DELIM + r"sandal" + DELIM: "๐Ÿ‘ก",
+    DELIM + r"ballet_shoes" + DELIM: "๐Ÿฉฐ",
+    DELIM + r"boot" + DELIM: "๐Ÿ‘ข",
+    DELIM + r"crown" + DELIM: "๐Ÿ‘‘",
+    DELIM + r"womans_hat" + DELIM: "๐Ÿ‘’",
+    DELIM + r"tophat" + DELIM: "๐ŸŽฉ",
+    DELIM + r"mortar_board" + DELIM: "๐ŸŽ“",
+    DELIM + r"billed_cap" + DELIM: "๐Ÿงข",
+    DELIM + r"military_helmet" + DELIM: "๐Ÿช–",
+    DELIM + r"rescue_worker_helmet" + DELIM: "โ›‘๏ธ",
+    DELIM + r"prayer_beads" + DELIM: "๐Ÿ“ฟ",
+    DELIM + r"lipstick" + DELIM: "๐Ÿ’„",
+    DELIM + r"ring" + DELIM: "๐Ÿ’",
+    DELIM + r"gem" + DELIM: "๐Ÿ’Ž",
     #
     # Sound
     #
-    DELIM + r'mute' + DELIM: '๐Ÿ”‡',
-    DELIM + r'speaker' + DELIM: '๐Ÿ”ˆ',
-    DELIM + r'sound' + DELIM: '๐Ÿ”‰',
-    DELIM + r'loud_sound' + DELIM: '๐Ÿ”Š',
-    DELIM + r'loudspeaker' + DELIM: '๐Ÿ“ข',
-    DELIM + r'mega' + DELIM: '๐Ÿ“ฃ',
-    DELIM + r'postal_horn' + DELIM: '๐Ÿ“ฏ',
-    DELIM + r'bell' + DELIM: '๐Ÿ””',
-    DELIM + r'no_bell' + DELIM: '๐Ÿ”•',
-
+    DELIM + r"mute" + DELIM: "๐Ÿ”‡",
+    DELIM + r"speaker" + DELIM: "๐Ÿ”ˆ",
+    DELIM + r"sound" + DELIM: "๐Ÿ”‰",
+    DELIM + r"loud_sound" + DELIM: "๐Ÿ”Š",
+    DELIM + r"loudspeaker" + DELIM: "๐Ÿ“ข",
+    DELIM + r"mega" + DELIM: "๐Ÿ“ฃ",
+    DELIM + r"postal_horn" + DELIM: "๐Ÿ“ฏ",
+    DELIM + r"bell" + DELIM: "๐Ÿ””",
+    DELIM + r"no_bell" + DELIM: "๐Ÿ”•",
     #
     # Music
     #
-    DELIM + r'musical_score' + DELIM: '๐ŸŽผ',
-    DELIM + r'musical_note' + DELIM: '๐ŸŽต',
-    DELIM + r'notes' + DELIM: '๐ŸŽถ',
-    DELIM + r'studio_microphone' + DELIM: '๐ŸŽ™๏ธ',
-    DELIM + r'level_slider' + DELIM: '๐ŸŽš๏ธ',
-    DELIM + r'control_knobs' + DELIM: '๐ŸŽ›๏ธ',
-    DELIM + r'microphone' + DELIM: '๐ŸŽค',
-    DELIM + r'headphones' + DELIM: '๐ŸŽง',
-    DELIM + r'radio' + DELIM: '๐Ÿ“ป',
-
+    DELIM + r"musical_score" + DELIM: "๐ŸŽผ",
+    DELIM + r"musical_note" + DELIM: "๐ŸŽต",
+    DELIM + r"notes" + DELIM: "๐ŸŽถ",
+    DELIM + r"studio_microphone" + DELIM: "๐ŸŽ™๏ธ",
+    DELIM + r"level_slider" + DELIM: "๐ŸŽš๏ธ",
+    DELIM + r"control_knobs" + DELIM: "๐ŸŽ›๏ธ",
+    DELIM + r"microphone" + DELIM: "๐ŸŽค",
+    DELIM + r"headphones" + DELIM: "๐ŸŽง",
+    DELIM + r"radio" + DELIM: "๐Ÿ“ป",
     #
     # Musical Instrument
     #
-    DELIM + r'saxophone' + DELIM: '๐ŸŽท',
-    DELIM + r'accordion' + DELIM: '๐Ÿช—',
-    DELIM + r'guitar' + DELIM: '๐ŸŽธ',
-    DELIM + r'musical_keyboard' + DELIM: '๐ŸŽน',
-    DELIM + r'trumpet' + DELIM: '๐ŸŽบ',
-    DELIM + r'violin' + DELIM: '๐ŸŽป',
-    DELIM + r'banjo' + DELIM: '๐Ÿช•',
-    DELIM + r'drum' + DELIM: '๐Ÿฅ',
-    DELIM + r'long_drum' + DELIM: '๐Ÿช˜',
-
+    DELIM + r"saxophone" + DELIM: "๐ŸŽท",
+    DELIM + r"accordion" + DELIM: "๐Ÿช—",
+    DELIM + r"guitar" + DELIM: "๐ŸŽธ",
+    DELIM + r"musical_keyboard" + DELIM: "๐ŸŽน",
+    DELIM + r"trumpet" + DELIM: "๐ŸŽบ",
+    DELIM + r"violin" + DELIM: "๐ŸŽป",
+    DELIM + r"banjo" + DELIM: "๐Ÿช•",
+    DELIM + r"drum" + DELIM: "๐Ÿฅ",
+    DELIM + r"long_drum" + DELIM: "๐Ÿช˜",
     #
     # Phone
     #
-    DELIM + r'iphone' + DELIM: '๐Ÿ“ฑ',
-    DELIM + r'calling' + DELIM: '๐Ÿ“ฒ',
-    DELIM + r'phone' + DELIM: 'โ˜Ž๏ธ',
-    DELIM + r'telephone(_receiver)?' + DELIM: '๐Ÿ“ž',
-    DELIM + r'pager' + DELIM: '๐Ÿ“Ÿ',
-    DELIM + r'fax' + DELIM: '๐Ÿ“ ',
-
+    DELIM + r"iphone" + DELIM: "๐Ÿ“ฑ",
+    DELIM + r"calling" + DELIM: "๐Ÿ“ฒ",
+    DELIM + r"phone" + DELIM: "โ˜Ž๏ธ",
+    DELIM + r"telephone(_receiver)?" + DELIM: "๐Ÿ“ž",
+    DELIM + r"pager" + DELIM: "๐Ÿ“Ÿ",
+    DELIM + r"fax" + DELIM: "๐Ÿ“ ",
     #
     # Computer
     #
-    DELIM + r'battery' + DELIM: '๐Ÿ”‹',
-    DELIM + r'electric_plug' + DELIM: '๐Ÿ”Œ',
-    DELIM + r'computer' + DELIM: '๐Ÿ’ป',
-    DELIM + r'desktop_computer' + DELIM: '๐Ÿ–ฅ๏ธ',
-    DELIM + r'printer' + DELIM: '๐Ÿ–จ๏ธ',
-    DELIM + r'keyboard' + DELIM: 'โŒจ๏ธ',
-    DELIM + r'computer_mouse' + DELIM: '๐Ÿ–ฑ๏ธ',
-    DELIM + r'trackball' + DELIM: '๐Ÿ–ฒ๏ธ',
-    DELIM + r'minidisc' + DELIM: '๐Ÿ’ฝ',
-    DELIM + r'floppy_disk' + DELIM: '๐Ÿ’พ',
-    DELIM + r'cd' + DELIM: '๐Ÿ’ฟ',
-    DELIM + r'dvd' + DELIM: '๐Ÿ“€',
-    DELIM + r'abacus' + DELIM: '๐Ÿงฎ',
-
+    DELIM + r"battery" + DELIM: "๐Ÿ”‹",
+    DELIM + r"electric_plug" + DELIM: "๐Ÿ”Œ",
+    DELIM + r"computer" + DELIM: "๐Ÿ’ป",
+    DELIM + r"desktop_computer" + DELIM: "๐Ÿ–ฅ๏ธ",
+    DELIM + r"printer" + DELIM: "๐Ÿ–จ๏ธ",
+    DELIM + r"keyboard" + DELIM: "โŒจ๏ธ",
+    DELIM + r"computer_mouse" + DELIM: "๐Ÿ–ฑ๏ธ",
+    DELIM + r"trackball" + DELIM: "๐Ÿ–ฒ๏ธ",
+    DELIM + r"minidisc" + DELIM: "๐Ÿ’ฝ",
+    DELIM + r"floppy_disk" + DELIM: "๐Ÿ’พ",
+    DELIM + r"cd" + DELIM: "๐Ÿ’ฟ",
+    DELIM + r"dvd" + DELIM: "๐Ÿ“€",
+    DELIM + r"abacus" + DELIM: "๐Ÿงฎ",
     #
     # Light & Video
     #
-    DELIM + r'movie_camera' + DELIM: '๐ŸŽฅ',
-    DELIM + r'film_strip' + DELIM: '๐ŸŽž๏ธ',
-    DELIM + r'film_projector' + DELIM: '๐Ÿ“ฝ๏ธ',
-    DELIM + r'clapper' + DELIM: '๐ŸŽฌ',
-    DELIM + r'tv' + DELIM: '๐Ÿ“บ',
-    DELIM + r'camera' + DELIM: '๐Ÿ“ท',
-    DELIM + r'camera_flash' + DELIM: '๐Ÿ“ธ',
-    DELIM + r'video_camera' + DELIM: '๐Ÿ“น',
-    DELIM + r'vhs' + DELIM: '๐Ÿ“ผ',
-    DELIM + r'mag' + DELIM: '๐Ÿ”',
-    DELIM + r'mag_right' + DELIM: '๐Ÿ”Ž',
-    DELIM + r'candle' + DELIM: '๐Ÿ•ฏ๏ธ',
-    DELIM + r'bulb' + DELIM: '๐Ÿ’ก',
-    DELIM + r'flashlight' + DELIM: '๐Ÿ”ฆ',
-    DELIM + r'(izakaya_)?lantern' + DELIM: '๐Ÿฎ',
-    DELIM + r'diya_lamp' + DELIM: '๐Ÿช”',
-
+    DELIM + r"movie_camera" + DELIM: "๐ŸŽฅ",
+    DELIM + r"film_strip" + DELIM: "๐ŸŽž๏ธ",
+    DELIM + r"film_projector" + DELIM: "๐Ÿ“ฝ๏ธ",
+    DELIM + r"clapper" + DELIM: "๐ŸŽฌ",
+    DELIM + r"tv" + DELIM: "๐Ÿ“บ",
+    DELIM + r"camera" + DELIM: "๐Ÿ“ท",
+    DELIM + r"camera_flash" + DELIM: "๐Ÿ“ธ",
+    DELIM + r"video_camera" + DELIM: "๐Ÿ“น",
+    DELIM + r"vhs" + DELIM: "๐Ÿ“ผ",
+    DELIM + r"mag" + DELIM: "๐Ÿ”",
+    DELIM + r"mag_right" + DELIM: "๐Ÿ”Ž",
+    DELIM + r"candle" + DELIM: "๐Ÿ•ฏ๏ธ",
+    DELIM + r"bulb" + DELIM: "๐Ÿ’ก",
+    DELIM + r"flashlight" + DELIM: "๐Ÿ”ฆ",
+    DELIM + r"(izakaya_)?lantern" + DELIM: "๐Ÿฎ",
+    DELIM + r"diya_lamp" + DELIM: "๐Ÿช”",
     #
     # Book Paper
     #
-    DELIM + r'notebook_with_decorative_cover' + DELIM: '๐Ÿ“”',
-    DELIM + r'closed_book' + DELIM: '๐Ÿ“•',
-    DELIM + r'(open_)?book' + DELIM: '๐Ÿ“–',
-    DELIM + r'green_book' + DELIM: '๐Ÿ“—',
-    DELIM + r'blue_book' + DELIM: '๐Ÿ“˜',
-    DELIM + r'orange_book' + DELIM: '๐Ÿ“™',
-    DELIM + r'books' + DELIM: '๐Ÿ“š',
-    DELIM + r'notebook' + DELIM: '๐Ÿ““',
-    DELIM + r'ledger' + DELIM: '๐Ÿ“’',
-    DELIM + r'page_with_curl' + DELIM: '๐Ÿ“ƒ',
-    DELIM + r'scroll' + DELIM: '๐Ÿ“œ',
-    DELIM + r'page_facing_up' + DELIM: '๐Ÿ“„',
-    DELIM + r'newspaper' + DELIM: '๐Ÿ“ฐ',
-    DELIM + r'newspaper_roll' + DELIM: '๐Ÿ—ž๏ธ',
-    DELIM + r'bookmark_tabs' + DELIM: '๐Ÿ“‘',
-    DELIM + r'bookmark' + DELIM: '๐Ÿ”–',
-    DELIM + r'label' + DELIM: '๐Ÿท๏ธ',
-
+    DELIM + r"notebook_with_decorative_cover" + DELIM: "๐Ÿ“”",
+    DELIM + r"closed_book" + DELIM: "๐Ÿ“•",
+    DELIM + r"(open_)?book" + DELIM: "๐Ÿ“–",
+    DELIM + r"green_book" + DELIM: "๐Ÿ“—",
+    DELIM + r"blue_book" + DELIM: "๐Ÿ“˜",
+    DELIM + r"orange_book" + DELIM: "๐Ÿ“™",
+    DELIM + r"books" + DELIM: "๐Ÿ“š",
+    DELIM + r"notebook" + DELIM: "๐Ÿ““",
+    DELIM + r"ledger" + DELIM: "๐Ÿ“’",
+    DELIM + r"page_with_curl" + DELIM: "๐Ÿ“ƒ",
+    DELIM + r"scroll" + DELIM: "๐Ÿ“œ",
+    DELIM + r"page_facing_up" + DELIM: "๐Ÿ“„",
+    DELIM + r"newspaper" + DELIM: "๐Ÿ“ฐ",
+    DELIM + r"newspaper_roll" + DELIM: "๐Ÿ—ž๏ธ",
+    DELIM + r"bookmark_tabs" + DELIM: "๐Ÿ“‘",
+    DELIM + r"bookmark" + DELIM: "๐Ÿ”–",
+    DELIM + r"label" + DELIM: "๐Ÿท๏ธ",
     #
     # Money
     #
-    DELIM + r'moneybag' + DELIM: '๐Ÿ’ฐ',
-    DELIM + r'coin' + DELIM: '๐Ÿช™',
-    DELIM + r'yen' + DELIM: '๐Ÿ’ด',
-    DELIM + r'dollar' + DELIM: '๐Ÿ’ต',
-    DELIM + r'euro' + DELIM: '๐Ÿ’ถ',
-    DELIM + r'pound' + DELIM: '๐Ÿ’ท',
-    DELIM + r'money_with_wings' + DELIM: '๐Ÿ’ธ',
-    DELIM + r'credit_card' + DELIM: '๐Ÿ’ณ',
-    DELIM + r'receipt' + DELIM: '๐Ÿงพ',
-    DELIM + r'chart' + DELIM: '๐Ÿ’น',
-
+    DELIM + r"moneybag" + DELIM: "๐Ÿ’ฐ",
+    DELIM + r"coin" + DELIM: "๐Ÿช™",
+    DELIM + r"yen" + DELIM: "๐Ÿ’ด",
+    DELIM + r"dollar" + DELIM: "๐Ÿ’ต",
+    DELIM + r"euro" + DELIM: "๐Ÿ’ถ",
+    DELIM + r"pound" + DELIM: "๐Ÿ’ท",
+    DELIM + r"money_with_wings" + DELIM: "๐Ÿ’ธ",
+    DELIM + r"credit_card" + DELIM: "๐Ÿ’ณ",
+    DELIM + r"receipt" + DELIM: "๐Ÿงพ",
+    DELIM + r"chart" + DELIM: "๐Ÿ’น",
     #
     # Mail
     #
-    DELIM + r'envelope' + DELIM: 'โœ‰๏ธ',
-    DELIM + r'e-?mail' + DELIM: '๐Ÿ“ง',
-    DELIM + r'incoming_envelope' + DELIM: '๐Ÿ“จ',
-    DELIM + r'envelope_with_arrow' + DELIM: '๐Ÿ“ฉ',
-    DELIM + r'outbox_tray' + DELIM: '๐Ÿ“ค',
-    DELIM + r'inbox_tray' + DELIM: '๐Ÿ“ฅ',
-    DELIM + r'package' + DELIM: '๐Ÿ“ฆ',
-    DELIM + r'mailbox' + DELIM: '๐Ÿ“ซ',
-    DELIM + r'mailbox_closed' + DELIM: '๐Ÿ“ช',
-    DELIM + r'mailbox_with_mail' + DELIM: '๐Ÿ“ฌ',
-    DELIM + r'mailbox_with_no_mail' + DELIM: '๐Ÿ“ญ',
-    DELIM + r'postbox' + DELIM: '๐Ÿ“ฎ',
-    DELIM + r'ballot_box' + DELIM: '๐Ÿ—ณ๏ธ',
-
+    DELIM + r"envelope" + DELIM: "โœ‰๏ธ",
+    DELIM + r"e-?mail" + DELIM: "๐Ÿ“ง",
+    DELIM + r"incoming_envelope" + DELIM: "๐Ÿ“จ",
+    DELIM + r"envelope_with_arrow" + DELIM: "๐Ÿ“ฉ",
+    DELIM + r"outbox_tray" + DELIM: "๐Ÿ“ค",
+    DELIM + r"inbox_tray" + DELIM: "๐Ÿ“ฅ",
+    DELIM + r"package" + DELIM: "๐Ÿ“ฆ",
+    DELIM + r"mailbox" + DELIM: "๐Ÿ“ซ",
+    DELIM + r"mailbox_closed" + DELIM: "๐Ÿ“ช",
+    DELIM + r"mailbox_with_mail" + DELIM: "๐Ÿ“ฌ",
+    DELIM + r"mailbox_with_no_mail" + DELIM: "๐Ÿ“ญ",
+    DELIM + r"postbox" + DELIM: "๐Ÿ“ฎ",
+    DELIM + r"ballot_box" + DELIM: "๐Ÿ—ณ๏ธ",
     #
     # Writing
     #
-    DELIM + r'pencil2' + DELIM: 'โœ๏ธ',
-    DELIM + r'black_nib' + DELIM: 'โœ’๏ธ',
-    DELIM + r'fountain_pen' + DELIM: '๐Ÿ–‹๏ธ',
-    DELIM + r'pen' + DELIM: '๐Ÿ–Š๏ธ',
-    DELIM + r'paintbrush' + DELIM: '๐Ÿ–Œ๏ธ',
-    DELIM + r'crayon' + DELIM: '๐Ÿ–๏ธ',
-    DELIM + r'(memo|pencil)' + DELIM: '๐Ÿ“',
-
+    DELIM + r"pencil2" + DELIM: "โœ๏ธ",
+    DELIM + r"black_nib" + DELIM: "โœ’๏ธ",
+    DELIM + r"fountain_pen" + DELIM: "๐Ÿ–‹๏ธ",
+    DELIM + r"pen" + DELIM: "๐Ÿ–Š๏ธ",
+    DELIM + r"paintbrush" + DELIM: "๐Ÿ–Œ๏ธ",
+    DELIM + r"crayon" + DELIM: "๐Ÿ–๏ธ",
+    DELIM + r"(memo|pencil)" + DELIM: "๐Ÿ“",
     #
     # Office
     #
-    DELIM + r'briefcase' + DELIM: '๐Ÿ’ผ',
-    DELIM + r'file_folder' + DELIM: '๐Ÿ“',
-    DELIM + r'open_file_folder' + DELIM: '๐Ÿ“‚',
-    DELIM + r'card_index_dividers' + DELIM: '๐Ÿ—‚๏ธ',
-    DELIM + r'date' + DELIM: '๐Ÿ“…',
-    DELIM + r'calendar' + DELIM: '๐Ÿ“†',
-    DELIM + r'spiral_notepad' + DELIM: '๐Ÿ—’๏ธ',
-    DELIM + r'spiral_calendar' + DELIM: '๐Ÿ—“๏ธ',
-    DELIM + r'card_index' + DELIM: '๐Ÿ“‡',
-    DELIM + r'chart_with_upwards_trend' + DELIM: '๐Ÿ“ˆ',
-    DELIM + r'chart_with_downwards_trend' + DELIM: '๐Ÿ“‰',
-    DELIM + r'bar_chart' + DELIM: '๐Ÿ“Š',
-    DELIM + r'clipboard' + DELIM: '๐Ÿ“‹',
-    DELIM + r'pushpin' + DELIM: '๐Ÿ“Œ',
-    DELIM + r'round_pushpin' + DELIM: '๐Ÿ“',
-    DELIM + r'paperclip' + DELIM: '๐Ÿ“Ž',
-    DELIM + r'paperclips' + DELIM: '๐Ÿ–‡๏ธ',
-    DELIM + r'straight_ruler' + DELIM: '๐Ÿ“',
-    DELIM + r'triangular_ruler' + DELIM: '๐Ÿ“',
-    DELIM + r'scissors' + DELIM: 'โœ‚๏ธ',
-    DELIM + r'card_file_box' + DELIM: '๐Ÿ—ƒ๏ธ',
-    DELIM + r'file_cabinet' + DELIM: '๐Ÿ—„๏ธ',
-    DELIM + r'wastebasket' + DELIM: '๐Ÿ—‘๏ธ',
-
+    DELIM + r"briefcase" + DELIM: "๐Ÿ’ผ",
+    DELIM + r"file_folder" + DELIM: "๐Ÿ“",
+    DELIM + r"open_file_folder" + DELIM: "๐Ÿ“‚",
+    DELIM + r"card_index_dividers" + DELIM: "๐Ÿ—‚๏ธ",
+    DELIM + r"date" + DELIM: "๐Ÿ“…",
+    DELIM + r"calendar" + DELIM: "๐Ÿ“†",
+    DELIM + r"spiral_notepad" + DELIM: "๐Ÿ—’๏ธ",
+    DELIM + r"spiral_calendar" + DELIM: "๐Ÿ—“๏ธ",
+    DELIM + r"card_index" + DELIM: "๐Ÿ“‡",
+    DELIM + r"chart_with_upwards_trend" + DELIM: "๐Ÿ“ˆ",
+    DELIM + r"chart_with_downwards_trend" + DELIM: "๐Ÿ“‰",
+    DELIM + r"bar_chart" + DELIM: "๐Ÿ“Š",
+    DELIM + r"clipboard" + DELIM: "๐Ÿ“‹",
+    DELIM + r"pushpin" + DELIM: "๐Ÿ“Œ",
+    DELIM + r"round_pushpin" + DELIM: "๐Ÿ“",
+    DELIM + r"paperclip" + DELIM: "๐Ÿ“Ž",
+    DELIM + r"paperclips" + DELIM: "๐Ÿ–‡๏ธ",
+    DELIM + r"straight_ruler" + DELIM: "๐Ÿ“",
+    DELIM + r"triangular_ruler" + DELIM: "๐Ÿ“",
+    DELIM + r"scissors" + DELIM: "โœ‚๏ธ",
+    DELIM + r"card_file_box" + DELIM: "๐Ÿ—ƒ๏ธ",
+    DELIM + r"file_cabinet" + DELIM: "๐Ÿ—„๏ธ",
+    DELIM + r"wastebasket" + DELIM: "๐Ÿ—‘๏ธ",
     #
     # Lock
     #
-    DELIM + r'lock' + DELIM: '๐Ÿ”’',
-    DELIM + r'unlock' + DELIM: '๐Ÿ”“',
-    DELIM + r'lock_with_ink_pen' + DELIM: '๐Ÿ”',
-    DELIM + r'closed_lock_with_key' + DELIM: '๐Ÿ”',
-    DELIM + r'key' + DELIM: '๐Ÿ”‘',
-    DELIM + r'old_key' + DELIM: '๐Ÿ—๏ธ',
-
+    DELIM + r"lock" + DELIM: "๐Ÿ”’",
+    DELIM + r"unlock" + DELIM: "๐Ÿ”“",
+    DELIM + r"lock_with_ink_pen" + DELIM: "๐Ÿ”",
+    DELIM + r"closed_lock_with_key" + DELIM: "๐Ÿ”",
+    DELIM + r"key" + DELIM: "๐Ÿ”‘",
+    DELIM + r"old_key" + DELIM: "๐Ÿ—๏ธ",
     #
     # Tool
     #
-    DELIM + r'hammer' + DELIM: '๐Ÿ”จ',
-    DELIM + r'axe' + DELIM: '๐Ÿช“',
-    DELIM + r'pick' + DELIM: 'โ›๏ธ',
-    DELIM + r'hammer_and_pick' + DELIM: 'โš’๏ธ',
-    DELIM + r'hammer_and_wrench' + DELIM: '๐Ÿ› ๏ธ',
-    DELIM + r'dagger' + DELIM: '๐Ÿ—ก๏ธ',
-    DELIM + r'crossed_swords' + DELIM: 'โš”๏ธ',
-    DELIM + r'bomb' + DELIM: '๐Ÿ’ฃ',
-    DELIM + r'boomerang' + DELIM: '๐Ÿชƒ',
-    DELIM + r'bow_and_arrow' + DELIM: '๐Ÿน',
-    DELIM + r'shield' + DELIM: '๐Ÿ›ก๏ธ',
-    DELIM + r'carpentry_saw' + DELIM: '๐Ÿชš',
-    DELIM + r'wrench' + DELIM: '๐Ÿ”ง',
-    DELIM + r'screwdriver' + DELIM: '๐Ÿช›',
-    DELIM + r'nut_and_bolt' + DELIM: '๐Ÿ”ฉ',
-    DELIM + r'gear' + DELIM: 'โš™๏ธ',
-    DELIM + r'clamp' + DELIM: '๐Ÿ—œ๏ธ',
-    DELIM + r'balance_scale' + DELIM: 'โš–๏ธ',
-    DELIM + r'probing_cane' + DELIM: '๐Ÿฆฏ',
-    DELIM + r'link' + DELIM: '๐Ÿ”—',
-    DELIM + r'chains' + DELIM: 'โ›“๏ธ',
-    DELIM + r'hook' + DELIM: '๐Ÿช',
-    DELIM + r'toolbox' + DELIM: '๐Ÿงฐ',
-    DELIM + r'magnet' + DELIM: '๐Ÿงฒ',
-    DELIM + r'ladder' + DELIM: '๐Ÿชœ',
-
+    DELIM + r"hammer" + DELIM: "๐Ÿ”จ",
+    DELIM + r"axe" + DELIM: "๐Ÿช“",
+    DELIM + r"pick" + DELIM: "โ›๏ธ",
+    DELIM + r"hammer_and_pick" + DELIM: "โš’๏ธ",
+    DELIM + r"hammer_and_wrench" + DELIM: "๐Ÿ› ๏ธ",
+    DELIM + r"dagger" + DELIM: "๐Ÿ—ก๏ธ",
+    DELIM + r"crossed_swords" + DELIM: "โš”๏ธ",
+    DELIM + r"bomb" + DELIM: "๐Ÿ’ฃ",
+    DELIM + r"boomerang" + DELIM: "๐Ÿชƒ",
+    DELIM + r"bow_and_arrow" + DELIM: "๐Ÿน",
+    DELIM + r"shield" + DELIM: "๐Ÿ›ก๏ธ",
+    DELIM + r"carpentry_saw" + DELIM: "๐Ÿชš",
+    DELIM + r"wrench" + DELIM: "๐Ÿ”ง",
+    DELIM + r"screwdriver" + DELIM: "๐Ÿช›",
+    DELIM + r"nut_and_bolt" + DELIM: "๐Ÿ”ฉ",
+    DELIM + r"gear" + DELIM: "โš™๏ธ",
+    DELIM + r"clamp" + DELIM: "๐Ÿ—œ๏ธ",
+    DELIM + r"balance_scale" + DELIM: "โš–๏ธ",
+    DELIM + r"probing_cane" + DELIM: "๐Ÿฆฏ",
+    DELIM + r"link" + DELIM: "๐Ÿ”—",
+    DELIM + r"chains" + DELIM: "โ›“๏ธ",
+    DELIM + r"hook" + DELIM: "๐Ÿช",
+    DELIM + r"toolbox" + DELIM: "๐Ÿงฐ",
+    DELIM + r"magnet" + DELIM: "๐Ÿงฒ",
+    DELIM + r"ladder" + DELIM: "๐Ÿชœ",
     #
     # Science
     #
-    DELIM + r'alembic' + DELIM: 'โš—๏ธ',
-    DELIM + r'test_tube' + DELIM: '๐Ÿงช',
-    DELIM + r'petri_dish' + DELIM: '๐Ÿงซ',
-    DELIM + r'dna' + DELIM: '๐Ÿงฌ',
-    DELIM + r'microscope' + DELIM: '๐Ÿ”ฌ',
-    DELIM + r'telescope' + DELIM: '๐Ÿ”ญ',
-    DELIM + r'satellite' + DELIM: '๐Ÿ“ก',
-
+    DELIM + r"alembic" + DELIM: "โš—๏ธ",
+    DELIM + r"test_tube" + DELIM: "๐Ÿงช",
+    DELIM + r"petri_dish" + DELIM: "๐Ÿงซ",
+    DELIM + r"dna" + DELIM: "๐Ÿงฌ",
+    DELIM + r"microscope" + DELIM: "๐Ÿ”ฌ",
+    DELIM + r"telescope" + DELIM: "๐Ÿ”ญ",
+    DELIM + r"satellite" + DELIM: "๐Ÿ“ก",
     #
     # Medical
     #
-    DELIM + r'syringe' + DELIM: '๐Ÿ’‰',
-    DELIM + r'drop_of_blood' + DELIM: '๐Ÿฉธ',
-    DELIM + r'pill' + DELIM: '๐Ÿ’Š',
-    DELIM + r'adhesive_bandage' + DELIM: '๐Ÿฉน',
-    DELIM + r'stethoscope' + DELIM: '๐Ÿฉบ',
-
+    DELIM + r"syringe" + DELIM: "๐Ÿ’‰",
+    DELIM + r"drop_of_blood" + DELIM: "๐Ÿฉธ",
+    DELIM + r"pill" + DELIM: "๐Ÿ’Š",
+    DELIM + r"adhesive_bandage" + DELIM: "๐Ÿฉน",
+    DELIM + r"stethoscope" + DELIM: "๐Ÿฉบ",
     #
     # Household
     #
-    DELIM + r'door' + DELIM: '๐Ÿšช',
-    DELIM + r'elevator' + DELIM: '๐Ÿ›—',
-    DELIM + r'mirror' + DELIM: '๐Ÿชž',
-    DELIM + r'window' + DELIM: '๐ŸชŸ',
-    DELIM + r'bed' + DELIM: '๐Ÿ›๏ธ',
-    DELIM + r'couch_and_lamp' + DELIM: '๐Ÿ›‹๏ธ',
-    DELIM + r'chair' + DELIM: '๐Ÿช‘',
-    DELIM + r'toilet' + DELIM: '๐Ÿšฝ',
-    DELIM + r'plunger' + DELIM: '๐Ÿช ',
-    DELIM + r'shower' + DELIM: '๐Ÿšฟ',
-    DELIM + r'bathtub' + DELIM: '๐Ÿ›',
-    DELIM + r'mouse_trap' + DELIM: '๐Ÿชค',
-    DELIM + r'razor' + DELIM: '๐Ÿช’',
-    DELIM + r'lotion_bottle' + DELIM: '๐Ÿงด',
-    DELIM + r'safety_pin' + DELIM: '๐Ÿงท',
-    DELIM + r'broom' + DELIM: '๐Ÿงน',
-    DELIM + r'basket' + DELIM: '๐Ÿงบ',
-    DELIM + r'roll_of_paper' + DELIM: '๐Ÿงป',
-    DELIM + r'bucket' + DELIM: '๐Ÿชฃ',
-    DELIM + r'soap' + DELIM: '๐Ÿงผ',
-    DELIM + r'toothbrush' + DELIM: '๐Ÿชฅ',
-    DELIM + r'sponge' + DELIM: '๐Ÿงฝ',
-    DELIM + r'fire_extinguisher' + DELIM: '๐Ÿงฏ',
-    DELIM + r'shopping_cart' + DELIM: '๐Ÿ›’',
-
+    DELIM + r"door" + DELIM: "๐Ÿšช",
+    DELIM + r"elevator" + DELIM: "๐Ÿ›—",
+    DELIM + r"mirror" + DELIM: "๐Ÿชž",
+    DELIM + r"window" + DELIM: "๐ŸชŸ",
+    DELIM + r"bed" + DELIM: "๐Ÿ›๏ธ",
+    DELIM + r"couch_and_lamp" + DELIM: "๐Ÿ›‹๏ธ",
+    DELIM + r"chair" + DELIM: "๐Ÿช‘",
+    DELIM + r"toilet" + DELIM: "๐Ÿšฝ",
+    DELIM + r"plunger" + DELIM: "๐Ÿช ",
+    DELIM + r"shower" + DELIM: "๐Ÿšฟ",
+    DELIM + r"bathtub" + DELIM: "๐Ÿ›",
+    DELIM + r"mouse_trap" + DELIM: "๐Ÿชค",
+    DELIM + r"razor" + DELIM: "๐Ÿช’",
+    DELIM + r"lotion_bottle" + DELIM: "๐Ÿงด",
+    DELIM + r"safety_pin" + DELIM: "๐Ÿงท",
+    DELIM + r"broom" + DELIM: "๐Ÿงน",
+    DELIM + r"basket" + DELIM: "๐Ÿงบ",
+    DELIM + r"roll_of_paper" + DELIM: "๐Ÿงป",
+    DELIM + r"bucket" + DELIM: "๐Ÿชฃ",
+    DELIM + r"soap" + DELIM: "๐Ÿงผ",
+    DELIM + r"toothbrush" + DELIM: "๐Ÿชฅ",
+    DELIM + r"sponge" + DELIM: "๐Ÿงฝ",
+    DELIM + r"fire_extinguisher" + DELIM: "๐Ÿงฏ",
+    DELIM + r"shopping_cart" + DELIM: "๐Ÿ›’",
     #
     # Other Object
     #
-    DELIM + r'smoking' + DELIM: '๐Ÿšฌ',
-    DELIM + r'coffin' + DELIM: 'โšฐ๏ธ',
-    DELIM + r'headstone' + DELIM: '๐Ÿชฆ',
-    DELIM + r'funeral_urn' + DELIM: 'โšฑ๏ธ',
-    DELIM + r'nazar_amulet' + DELIM: '๐Ÿงฟ',
-    DELIM + r'moyai' + DELIM: '๐Ÿ—ฟ',
-    DELIM + r'placard' + DELIM: '๐Ÿชง',
-
+    DELIM + r"smoking" + DELIM: "๐Ÿšฌ",
+    DELIM + r"coffin" + DELIM: "โšฐ๏ธ",
+    DELIM + r"headstone" + DELIM: "๐Ÿชฆ",
+    DELIM + r"funeral_urn" + DELIM: "โšฑ๏ธ",
+    DELIM + r"nazar_amulet" + DELIM: "๐Ÿงฟ",
+    DELIM + r"moyai" + DELIM: "๐Ÿ—ฟ",
+    DELIM + r"placard" + DELIM: "๐Ÿชง",
     #
     # Transport Sign
     #
-    DELIM + r'atm' + DELIM: '๐Ÿง',
-    DELIM + r'put_litter_in_its_place' + DELIM: '๐Ÿšฎ',
-    DELIM + r'potable_water' + DELIM: '๐Ÿšฐ',
-    DELIM + r'wheelchair' + DELIM: 'โ™ฟ',
-    DELIM + r'mens' + DELIM: '๐Ÿšน',
-    DELIM + r'womens' + DELIM: '๐Ÿšบ',
-    DELIM + r'restroom' + DELIM: '๐Ÿšป',
-    DELIM + r'baby_symbol' + DELIM: '๐Ÿšผ',
-    DELIM + r'wc' + DELIM: '๐Ÿšพ',
-    DELIM + r'passport_control' + DELIM: '๐Ÿ›‚',
-    DELIM + r'customs' + DELIM: '๐Ÿ›ƒ',
-    DELIM + r'baggage_claim' + DELIM: '๐Ÿ›„',
-    DELIM + r'left_luggage' + DELIM: '๐Ÿ›…',
-
+    DELIM + r"atm" + DELIM: "๐Ÿง",
+    DELIM + r"put_litter_in_its_place" + DELIM: "๐Ÿšฎ",
+    DELIM + r"potable_water" + DELIM: "๐Ÿšฐ",
+    DELIM + r"wheelchair" + DELIM: "โ™ฟ",
+    DELIM + r"mens" + DELIM: "๐Ÿšน",
+    DELIM + r"womens" + DELIM: "๐Ÿšบ",
+    DELIM + r"restroom" + DELIM: "๐Ÿšป",
+    DELIM + r"baby_symbol" + DELIM: "๐Ÿšผ",
+    DELIM + r"wc" + DELIM: "๐Ÿšพ",
+    DELIM + r"passport_control" + DELIM: "๐Ÿ›‚",
+    DELIM + r"customs" + DELIM: "๐Ÿ›ƒ",
+    DELIM + r"baggage_claim" + DELIM: "๐Ÿ›„",
+    DELIM + r"left_luggage" + DELIM: "๐Ÿ›…",
     #
     # Warning
     #
-    DELIM + r'warning' + DELIM: 'โš ๏ธ',
-    DELIM + r'children_crossing' + DELIM: '๐Ÿšธ',
-    DELIM + r'no_entry' + DELIM: 'โ›”',
-    DELIM + r'no_entry_sign' + DELIM: '๐Ÿšซ',
-    DELIM + r'no_bicycles' + DELIM: '๐Ÿšณ',
-    DELIM + r'no_smoking' + DELIM: '๐Ÿšญ',
-    DELIM + r'do_not_litter' + DELIM: '๐Ÿšฏ',
-    DELIM + r'non-potable_water' + DELIM: '๐Ÿšฑ',
-    DELIM + r'no_pedestrians' + DELIM: '๐Ÿšท',
-    DELIM + r'no_mobile_phones' + DELIM: '๐Ÿ“ต',
-    DELIM + r'underage' + DELIM: '๐Ÿ”ž',
-    DELIM + r'radioactive' + DELIM: 'โ˜ข๏ธ',
-    DELIM + r'biohazard' + DELIM: 'โ˜ฃ๏ธ',
-
+    DELIM + r"warning" + DELIM: "โš ๏ธ",
+    DELIM + r"children_crossing" + DELIM: "๐Ÿšธ",
+    DELIM + r"no_entry" + DELIM: "โ›”",
+    DELIM + r"no_entry_sign" + DELIM: "๐Ÿšซ",
+    DELIM + r"no_bicycles" + DELIM: "๐Ÿšณ",
+    DELIM + r"no_smoking" + DELIM: "๐Ÿšญ",
+    DELIM + r"do_not_litter" + DELIM: "๐Ÿšฏ",
+    DELIM + r"non-potable_water" + DELIM: "๐Ÿšฑ",
+    DELIM + r"no_pedestrians" + DELIM: "๐Ÿšท",
+    DELIM + r"no_mobile_phones" + DELIM: "๐Ÿ“ต",
+    DELIM + r"underage" + DELIM: "๐Ÿ”ž",
+    DELIM + r"radioactive" + DELIM: "โ˜ข๏ธ",
+    DELIM + r"biohazard" + DELIM: "โ˜ฃ๏ธ",
     #
     # Arrow
     #
-    DELIM + r'arrow_up' + DELIM: 'โฌ†๏ธ',
-    DELIM + r'arrow_upper_right' + DELIM: 'โ†—๏ธ',
-    DELIM + r'arrow_right' + DELIM: 'โžก๏ธ',
-    DELIM + r'arrow_lower_right' + DELIM: 'โ†˜๏ธ',
-    DELIM + r'arrow_down' + DELIM: 'โฌ‡๏ธ',
-    DELIM + r'arrow_lower_left' + DELIM: 'โ†™๏ธ',
-    DELIM + r'arrow_left' + DELIM: 'โฌ…๏ธ',
-    DELIM + r'arrow_upper_left' + DELIM: 'โ†–๏ธ',
-    DELIM + r'arrow_up_down' + DELIM: 'โ†•๏ธ',
-    DELIM + r'left_right_arrow' + DELIM: 'โ†”๏ธ',
-    DELIM + r'leftwards_arrow_with_hook' + DELIM: 'โ†ฉ๏ธ',
-    DELIM + r'arrow_right_hook' + DELIM: 'โ†ช๏ธ',
-    DELIM + r'arrow_heading_up' + DELIM: 'โคด๏ธ',
-    DELIM + r'arrow_heading_down' + DELIM: 'โคต๏ธ',
-    DELIM + r'arrows_clockwise' + DELIM: '๐Ÿ”ƒ',
-    DELIM + r'arrows_counterclockwise' + DELIM: '๐Ÿ”„',
-    DELIM + r'back' + DELIM: '๐Ÿ”™',
-    DELIM + r'end' + DELIM: '๐Ÿ”š',
-    DELIM + r'on' + DELIM: '๐Ÿ”›',
-    DELIM + r'soon' + DELIM: '๐Ÿ”œ',
-    DELIM + r'top' + DELIM: '๐Ÿ”',
-
+    DELIM + r"arrow_up" + DELIM: "โฌ†๏ธ",
+    DELIM + r"arrow_upper_right" + DELIM: "โ†—๏ธ",
+    DELIM + r"arrow_right" + DELIM: "โžก๏ธ",
+    DELIM + r"arrow_lower_right" + DELIM: "โ†˜๏ธ",
+    DELIM + r"arrow_down" + DELIM: "โฌ‡๏ธ",
+    DELIM + r"arrow_lower_left" + DELIM: "โ†™๏ธ",
+    DELIM + r"arrow_left" + DELIM: "โฌ…๏ธ",
+    DELIM + r"arrow_upper_left" + DELIM: "โ†–๏ธ",
+    DELIM + r"arrow_up_down" + DELIM: "โ†•๏ธ",
+    DELIM + r"left_right_arrow" + DELIM: "โ†”๏ธ",
+    DELIM + r"leftwards_arrow_with_hook" + DELIM: "โ†ฉ๏ธ",
+    DELIM + r"arrow_right_hook" + DELIM: "โ†ช๏ธ",
+    DELIM + r"arrow_heading_up" + DELIM: "โคด๏ธ",
+    DELIM + r"arrow_heading_down" + DELIM: "โคต๏ธ",
+    DELIM + r"arrows_clockwise" + DELIM: "๐Ÿ”ƒ",
+    DELIM + r"arrows_counterclockwise" + DELIM: "๐Ÿ”„",
+    DELIM + r"back" + DELIM: "๐Ÿ”™",
+    DELIM + r"end" + DELIM: "๐Ÿ”š",
+    DELIM + r"on" + DELIM: "๐Ÿ”›",
+    DELIM + r"soon" + DELIM: "๐Ÿ”œ",
+    DELIM + r"top" + DELIM: "๐Ÿ”",
     #
     # Religion
     #
-    DELIM + r'place_of_worship' + DELIM: '๐Ÿ›',
-    DELIM + r'atom_symbol' + DELIM: 'โš›๏ธ',
-    DELIM + r'om' + DELIM: '๐Ÿ•‰๏ธ',
-    DELIM + r'star_of_david' + DELIM: 'โœก๏ธ',
-    DELIM + r'wheel_of_dharma' + DELIM: 'โ˜ธ๏ธ',
-    DELIM + r'yin_yang' + DELIM: 'โ˜ฏ๏ธ',
-    DELIM + r'latin_cross' + DELIM: 'โœ๏ธ',
-    DELIM + r'orthodox_cross' + DELIM: 'โ˜ฆ๏ธ',
-    DELIM + r'star_and_crescent' + DELIM: 'โ˜ช๏ธ',
-    DELIM + r'peace_symbol' + DELIM: 'โ˜ฎ๏ธ',
-    DELIM + r'menorah' + DELIM: '๐Ÿ•Ž',
-    DELIM + r'six_pointed_star' + DELIM: '๐Ÿ”ฏ',
-
+    DELIM + r"place_of_worship" + DELIM: "๐Ÿ›",
+    DELIM + r"atom_symbol" + DELIM: "โš›๏ธ",
+    DELIM + r"om" + DELIM: "๐Ÿ•‰๏ธ",
+    DELIM + r"star_of_david" + DELIM: "โœก๏ธ",
+    DELIM + r"wheel_of_dharma" + DELIM: "โ˜ธ๏ธ",
+    DELIM + r"yin_yang" + DELIM: "โ˜ฏ๏ธ",
+    DELIM + r"latin_cross" + DELIM: "โœ๏ธ",
+    DELIM + r"orthodox_cross" + DELIM: "โ˜ฆ๏ธ",
+    DELIM + r"star_and_crescent" + DELIM: "โ˜ช๏ธ",
+    DELIM + r"peace_symbol" + DELIM: "โ˜ฎ๏ธ",
+    DELIM + r"menorah" + DELIM: "๐Ÿ•Ž",
+    DELIM + r"six_pointed_star" + DELIM: "๐Ÿ”ฏ",
     #
     # Zodiac
     #
-    DELIM + r'aries' + DELIM: 'โ™ˆ',
-    DELIM + r'taurus' + DELIM: 'โ™‰',
-    DELIM + r'gemini' + DELIM: 'โ™Š',
-    DELIM + r'cancer' + DELIM: 'โ™‹',
-    DELIM + r'leo' + DELIM: 'โ™Œ',
-    DELIM + r'virgo' + DELIM: 'โ™',
-    DELIM + r'libra' + DELIM: 'โ™Ž',
-    DELIM + r'scorpius' + DELIM: 'โ™',
-    DELIM + r'sagittarius' + DELIM: 'โ™',
-    DELIM + r'capricorn' + DELIM: 'โ™‘',
-    DELIM + r'aquarius' + DELIM: 'โ™’',
-    DELIM + r'pisces' + DELIM: 'โ™“',
-    DELIM + r'ophiuchus' + DELIM: 'โ›Ž',
-
+    DELIM + r"aries" + DELIM: "โ™ˆ",
+    DELIM + r"taurus" + DELIM: "โ™‰",
+    DELIM + r"gemini" + DELIM: "โ™Š",
+    DELIM + r"cancer" + DELIM: "โ™‹",
+    DELIM + r"leo" + DELIM: "โ™Œ",
+    DELIM + r"virgo" + DELIM: "โ™",
+    DELIM + r"libra" + DELIM: "โ™Ž",
+    DELIM + r"scorpius" + DELIM: "โ™",
+    DELIM + r"sagittarius" + DELIM: "โ™",
+    DELIM + r"capricorn" + DELIM: "โ™‘",
+    DELIM + r"aquarius" + DELIM: "โ™’",
+    DELIM + r"pisces" + DELIM: "โ™“",
+    DELIM + r"ophiuchus" + DELIM: "โ›Ž",
     #
     # Av Symbol
     #
-    DELIM + r'twisted_rightwards_arrows' + DELIM: '๐Ÿ”€',
-    DELIM + r'repeat' + DELIM: '๐Ÿ”',
-    DELIM + r'repeat_one' + DELIM: '๐Ÿ”‚',
-    DELIM + r'arrow_forward' + DELIM: 'โ–ถ๏ธ',
-    DELIM + r'fast_forward' + DELIM: 'โฉ',
-    DELIM + r'next_track_button' + DELIM: 'โญ๏ธ',
-    DELIM + r'play_or_pause_button' + DELIM: 'โฏ๏ธ',
-    DELIM + r'arrow_backward' + DELIM: 'โ—€๏ธ',
-    DELIM + r'rewind' + DELIM: 'โช',
-    DELIM + r'previous_track_button' + DELIM: 'โฎ๏ธ',
-    DELIM + r'arrow_up_small' + DELIM: '๐Ÿ”ผ',
-    DELIM + r'arrow_double_up' + DELIM: 'โซ',
-    DELIM + r'arrow_down_small' + DELIM: '๐Ÿ”ฝ',
-    DELIM + r'arrow_double_down' + DELIM: 'โฌ',
-    DELIM + r'pause_button' + DELIM: 'โธ๏ธ',
-    DELIM + r'stop_button' + DELIM: 'โน๏ธ',
-    DELIM + r'record_button' + DELIM: 'โบ๏ธ',
-    DELIM + r'eject_button' + DELIM: 'โ๏ธ',
-    DELIM + r'cinema' + DELIM: '๐ŸŽฆ',
-    DELIM + r'low_brightness' + DELIM: '๐Ÿ”…',
-    DELIM + r'high_brightness' + DELIM: '๐Ÿ”†',
-    DELIM + r'signal_strength' + DELIM: '๐Ÿ“ถ',
-    DELIM + r'vibration_mode' + DELIM: '๐Ÿ“ณ',
-    DELIM + r'mobile_phone_off' + DELIM: '๐Ÿ“ด',
-
+    DELIM + r"twisted_rightwards_arrows" + DELIM: "๐Ÿ”€",
+    DELIM + r"repeat" + DELIM: "๐Ÿ”",
+    DELIM + r"repeat_one" + DELIM: "๐Ÿ”‚",
+    DELIM + r"arrow_forward" + DELIM: "โ–ถ๏ธ",
+    DELIM + r"fast_forward" + DELIM: "โฉ",
+    DELIM + r"next_track_button" + DELIM: "โญ๏ธ",
+    DELIM + r"play_or_pause_button" + DELIM: "โฏ๏ธ",
+    DELIM + r"arrow_backward" + DELIM: "โ—€๏ธ",
+    DELIM + r"rewind" + DELIM: "โช",
+    DELIM + r"previous_track_button" + DELIM: "โฎ๏ธ",
+    DELIM + r"arrow_up_small" + DELIM: "๐Ÿ”ผ",
+    DELIM + r"arrow_double_up" + DELIM: "โซ",
+    DELIM + r"arrow_down_small" + DELIM: "๐Ÿ”ฝ",
+    DELIM + r"arrow_double_down" + DELIM: "โฌ",
+    DELIM + r"pause_button" + DELIM: "โธ๏ธ",
+    DELIM + r"stop_button" + DELIM: "โน๏ธ",
+    DELIM + r"record_button" + DELIM: "โบ๏ธ",
+    DELIM + r"eject_button" + DELIM: "โ๏ธ",
+    DELIM + r"cinema" + DELIM: "๐ŸŽฆ",
+    DELIM + r"low_brightness" + DELIM: "๐Ÿ”…",
+    DELIM + r"high_brightness" + DELIM: "๐Ÿ”†",
+    DELIM + r"signal_strength" + DELIM: "๐Ÿ“ถ",
+    DELIM + r"vibration_mode" + DELIM: "๐Ÿ“ณ",
+    DELIM + r"mobile_phone_off" + DELIM: "๐Ÿ“ด",
     #
     # Gender
     #
-    DELIM + r'female_sign' + DELIM: 'โ™€๏ธ',
-    DELIM + r'male_sign' + DELIM: 'โ™‚๏ธ',
-    DELIM + r'transgender_symbol' + DELIM: 'โšง๏ธ',
-
+    DELIM + r"female_sign" + DELIM: "โ™€๏ธ",
+    DELIM + r"male_sign" + DELIM: "โ™‚๏ธ",
+    DELIM + r"transgender_symbol" + DELIM: "โšง๏ธ",
     #
     # Math
     #
-    DELIM + r'heavy_multiplication_x' + DELIM: 'โœ–๏ธ',
-    DELIM + r'heavy_plus_sign' + DELIM: 'โž•',
-    DELIM + r'heavy_minus_sign' + DELIM: 'โž–',
-    DELIM + r'heavy_division_sign' + DELIM: 'โž—',
-    DELIM + r'infinity' + DELIM: 'โ™พ๏ธ',
-
+    DELIM + r"heavy_multiplication_x" + DELIM: "โœ–๏ธ",
+    DELIM + r"heavy_plus_sign" + DELIM: "โž•",  # noqa: RUF001
+    DELIM + r"heavy_minus_sign" + DELIM: "โž–",  # noqa: RUF001
+    DELIM + r"heavy_division_sign" + DELIM: "โž—",
+    DELIM + r"infinity" + DELIM: "โ™พ๏ธ",
     #
     # Punctuation
     #
-    DELIM + r'bangbang' + DELIM: 'โ€ผ๏ธ',
-    DELIM + r'interrobang' + DELIM: 'โ‰๏ธ',
-    DELIM + r'question' + DELIM: 'โ“',
-    DELIM + r'grey_question' + DELIM: 'โ”',
-    DELIM + r'grey_exclamation' + DELIM: 'โ•',
-    DELIM + r'(heavy_exclamation_mark|exclamation)' + DELIM: 'โ—',
-    DELIM + r'wavy_dash' + DELIM: 'ใ€ฐ๏ธ',
-
+    DELIM + r"bangbang" + DELIM: "โ€ผ๏ธ",
+    DELIM + r"interrobang" + DELIM: "โ‰๏ธ",
+    DELIM + r"question" + DELIM: "โ“",
+    DELIM + r"grey_question" + DELIM: "โ”",
+    DELIM + r"grey_exclamation" + DELIM: "โ•",
+    DELIM + r"(heavy_exclamation_mark|exclamation)" + DELIM: "โ—",
+    DELIM + r"wavy_dash" + DELIM: "ใ€ฐ๏ธ",
     #
     # Currency
     #
-    DELIM + r'currency_exchange' + DELIM: '๐Ÿ’ฑ',
-    DELIM + r'heavy_dollar_sign' + DELIM: '๐Ÿ’ฒ',
-
+    DELIM + r"currency_exchange" + DELIM: "๐Ÿ’ฑ",
+    DELIM + r"heavy_dollar_sign" + DELIM: "๐Ÿ’ฒ",
     #
     # Other Symbol
     #
-    DELIM + r'medical_symbol' + DELIM: 'โš•๏ธ',
-    DELIM + r'recycle' + DELIM: 'โ™ป๏ธ',
-    DELIM + r'fleur_de_lis' + DELIM: 'โšœ๏ธ',
-    DELIM + r'trident' + DELIM: '๐Ÿ”ฑ',
-    DELIM + r'name_badge' + DELIM: '๐Ÿ“›',
-    DELIM + r'beginner' + DELIM: '๐Ÿ”ฐ',
-    DELIM + r'o' + DELIM: 'โญ•',
-    DELIM + r'white_check_mark' + DELIM: 'โœ…',
-    DELIM + r'ballot_box_with_check' + DELIM: 'โ˜‘๏ธ',
-    DELIM + r'heavy_check_mark' + DELIM: 'โœ”๏ธ',
-    DELIM + r'x' + DELIM: 'โŒ',
-    DELIM + r'negative_squared_cross_mark' + DELIM: 'โŽ',
-    DELIM + r'curly_loop' + DELIM: 'โžฐ',
-    DELIM + r'loop' + DELIM: 'โžฟ',
-    DELIM + r'part_alternation_mark' + DELIM: 'ใ€ฝ๏ธ',
-    DELIM + r'eight_spoked_asterisk' + DELIM: 'โœณ๏ธ',
-    DELIM + r'eight_pointed_black_star' + DELIM: 'โœด๏ธ',
-    DELIM + r'sparkle' + DELIM: 'โ‡๏ธ',
-    DELIM + r'copyright' + DELIM: 'ยฉ๏ธ',
-    DELIM + r'registered' + DELIM: 'ยฎ๏ธ',
-    DELIM + r'tm' + DELIM: 'โ„ข๏ธ',
-
+    DELIM + r"medical_symbol" + DELIM: "โš•๏ธ",
+    DELIM + r"recycle" + DELIM: "โ™ป๏ธ",
+    DELIM + r"fleur_de_lis" + DELIM: "โšœ๏ธ",
+    DELIM + r"trident" + DELIM: "๐Ÿ”ฑ",
+    DELIM + r"name_badge" + DELIM: "๐Ÿ“›",
+    DELIM + r"beginner" + DELIM: "๐Ÿ”ฐ",
+    DELIM + r"o" + DELIM: "โญ•",
+    DELIM + r"white_check_mark" + DELIM: "โœ…",
+    DELIM + r"ballot_box_with_check" + DELIM: "โ˜‘๏ธ",
+    DELIM + r"heavy_check_mark" + DELIM: "โœ”๏ธ",
+    DELIM + r"x" + DELIM: "โŒ",
+    DELIM + r"negative_squared_cross_mark" + DELIM: "โŽ",
+    DELIM + r"curly_loop" + DELIM: "โžฐ",
+    DELIM + r"loop" + DELIM: "โžฟ",
+    DELIM + r"part_alternation_mark" + DELIM: "ใ€ฝ๏ธ",
+    DELIM + r"eight_spoked_asterisk" + DELIM: "โœณ๏ธ",
+    DELIM + r"eight_pointed_black_star" + DELIM: "โœด๏ธ",
+    DELIM + r"sparkle" + DELIM: "โ‡๏ธ",
+    DELIM + r"copyright" + DELIM: "ยฉ๏ธ",
+    DELIM + r"registered" + DELIM: "ยฎ๏ธ",
+    DELIM + r"tm" + DELIM: "โ„ข๏ธ",
     #
     # Keycap
     #
-    DELIM + r'hash' + DELIM: '#๏ธโƒฃ',
-    DELIM + r'asterisk' + DELIM: '*๏ธโƒฃ',
-    DELIM + r'zero' + DELIM: '0๏ธโƒฃ',
-    DELIM + r'one' + DELIM: '1๏ธโƒฃ',
-    DELIM + r'two' + DELIM: '2๏ธโƒฃ',
-    DELIM + r'three' + DELIM: '3๏ธโƒฃ',
-    DELIM + r'four' + DELIM: '4๏ธโƒฃ',
-    DELIM + r'five' + DELIM: '5๏ธโƒฃ',
-    DELIM + r'six' + DELIM: '6๏ธโƒฃ',
-    DELIM + r'seven' + DELIM: '7๏ธโƒฃ',
-    DELIM + r'eight' + DELIM: '8๏ธโƒฃ',
-    DELIM + r'nine' + DELIM: '9๏ธโƒฃ',
-    DELIM + r'keycap_ten' + DELIM: '๐Ÿ”Ÿ',
-
+    DELIM + r"hash" + DELIM: "#๏ธโƒฃ",
+    DELIM + r"asterisk" + DELIM: "*๏ธโƒฃ",
+    DELIM + r"zero" + DELIM: "0๏ธโƒฃ",
+    DELIM + r"one" + DELIM: "1๏ธโƒฃ",
+    DELIM + r"two" + DELIM: "2๏ธโƒฃ",
+    DELIM + r"three" + DELIM: "3๏ธโƒฃ",
+    DELIM + r"four" + DELIM: "4๏ธโƒฃ",
+    DELIM + r"five" + DELIM: "5๏ธโƒฃ",
+    DELIM + r"six" + DELIM: "6๏ธโƒฃ",
+    DELIM + r"seven" + DELIM: "7๏ธโƒฃ",
+    DELIM + r"eight" + DELIM: "8๏ธโƒฃ",
+    DELIM + r"nine" + DELIM: "9๏ธโƒฃ",
+    DELIM + r"keycap_ten" + DELIM: "๐Ÿ”Ÿ",
     #
     # Alphanum
     #
-    DELIM + r'capital_abcd' + DELIM: '๐Ÿ” ',
-    DELIM + r'abcd' + DELIM: '๐Ÿ”ก',
-    DELIM + r'1234' + DELIM: '๐Ÿ”ข',
-    DELIM + r'symbols' + DELIM: '๐Ÿ”ฃ',
-    DELIM + r'abc' + DELIM: '๐Ÿ”ค',
-    DELIM + r'a' + DELIM: '๐Ÿ…ฐ๏ธ',
-    DELIM + r'ab' + DELIM: '๐Ÿ†Ž',
-    DELIM + r'b' + DELIM: '๐Ÿ…ฑ๏ธ',
-    DELIM + r'cl' + DELIM: '๐Ÿ†‘',
-    DELIM + r'cool' + DELIM: '๐Ÿ†’',
-    DELIM + r'free' + DELIM: '๐Ÿ†“',
-    DELIM + r'information_source' + DELIM: 'โ„น๏ธ',
-    DELIM + r'id' + DELIM: '๐Ÿ†”',
-    DELIM + r'm' + DELIM: 'โ“‚๏ธ',
-    DELIM + r'new' + DELIM: '๐Ÿ†•',
-    DELIM + r'ng' + DELIM: '๐Ÿ†–',
-    DELIM + r'o2' + DELIM: '๐Ÿ…พ๏ธ',
-    DELIM + r'ok' + DELIM: '๐Ÿ†—',
-    DELIM + r'parking' + DELIM: '๐Ÿ…ฟ๏ธ',
-    DELIM + r'sos' + DELIM: '๐Ÿ†˜',
-    DELIM + r'up' + DELIM: '๐Ÿ†™',
-    DELIM + r'vs' + DELIM: '๐Ÿ†š',
-    DELIM + r'koko' + DELIM: '๐Ÿˆ',
-    DELIM + r'sa' + DELIM: '๐Ÿˆ‚๏ธ',
-    DELIM + r'u6708' + DELIM: '๐Ÿˆท๏ธ',
-    DELIM + r'u6709' + DELIM: '๐Ÿˆถ',
-    DELIM + r'u6307' + DELIM: '๐Ÿˆฏ',
-    DELIM + r'ideograph_advantage' + DELIM: '๐Ÿ‰',
-    DELIM + r'u5272' + DELIM: '๐Ÿˆน',
-    DELIM + r'u7121' + DELIM: '๐Ÿˆš',
-    DELIM + r'u7981' + DELIM: '๐Ÿˆฒ',
-    DELIM + r'accept' + DELIM: '๐Ÿ‰‘',
-    DELIM + r'u7533' + DELIM: '๐Ÿˆธ',
-    DELIM + r'u5408' + DELIM: '๐Ÿˆด',
-    DELIM + r'u7a7a' + DELIM: '๐Ÿˆณ',
-    DELIM + r'congratulations' + DELIM: 'ใŠ—๏ธ',
-    DELIM + r'secret' + DELIM: 'ใŠ™๏ธ',
-    DELIM + r'u55b6' + DELIM: '๐Ÿˆบ',
-    DELIM + r'u6e80' + DELIM: '๐Ÿˆต',
-
+    DELIM + r"capital_abcd" + DELIM: "๐Ÿ” ",
+    DELIM + r"abcd" + DELIM: "๐Ÿ”ก",
+    DELIM + r"1234" + DELIM: "๐Ÿ”ข",
+    DELIM + r"symbols" + DELIM: "๐Ÿ”ฃ",
+    DELIM + r"abc" + DELIM: "๐Ÿ”ค",
+    DELIM + r"a" + DELIM: "๐Ÿ…ฐ๏ธ",
+    DELIM + r"ab" + DELIM: "๐Ÿ†Ž",
+    DELIM + r"b" + DELIM: "๐Ÿ…ฑ๏ธ",
+    DELIM + r"cl" + DELIM: "๐Ÿ†‘",
+    DELIM + r"cool" + DELIM: "๐Ÿ†’",
+    DELIM + r"free" + DELIM: "๐Ÿ†“",
+    DELIM + r"information_source" + DELIM: "โ„น๏ธ",  # noqa: RUF001
+    DELIM + r"id" + DELIM: "๐Ÿ†”",
+    DELIM + r"m" + DELIM: "โ“‚๏ธ",
+    DELIM + r"new" + DELIM: "๐Ÿ†•",
+    DELIM + r"ng" + DELIM: "๐Ÿ†–",
+    DELIM + r"o2" + DELIM: "๐Ÿ…พ๏ธ",
+    DELIM + r"ok" + DELIM: "๐Ÿ†—",
+    DELIM + r"parking" + DELIM: "๐Ÿ…ฟ๏ธ",
+    DELIM + r"sos" + DELIM: "๐Ÿ†˜",
+    DELIM + r"up" + DELIM: "๐Ÿ†™",
+    DELIM + r"vs" + DELIM: "๐Ÿ†š",
+    DELIM + r"koko" + DELIM: "๐Ÿˆ",
+    DELIM + r"sa" + DELIM: "๐Ÿˆ‚๏ธ",
+    DELIM + r"u6708" + DELIM: "๐Ÿˆท๏ธ",
+    DELIM + r"u6709" + DELIM: "๐Ÿˆถ",
+    DELIM + r"u6307" + DELIM: "๐Ÿˆฏ",
+    DELIM + r"ideograph_advantage" + DELIM: "๐Ÿ‰",
+    DELIM + r"u5272" + DELIM: "๐Ÿˆน",
+    DELIM + r"u7121" + DELIM: "๐Ÿˆš",
+    DELIM + r"u7981" + DELIM: "๐Ÿˆฒ",
+    DELIM + r"accept" + DELIM: "๐Ÿ‰‘",
+    DELIM + r"u7533" + DELIM: "๐Ÿˆธ",
+    DELIM + r"u5408" + DELIM: "๐Ÿˆด",
+    DELIM + r"u7a7a" + DELIM: "๐Ÿˆณ",
+    DELIM + r"congratulations" + DELIM: "ใŠ—๏ธ",
+    DELIM + r"secret" + DELIM: "ใŠ™๏ธ",
+    DELIM + r"u55b6" + DELIM: "๐Ÿˆบ",
+    DELIM + r"u6e80" + DELIM: "๐Ÿˆต",
     #
     # Geometric
     #
-    DELIM + r'red_circle' + DELIM: '๐Ÿ”ด',
-    DELIM + r'orange_circle' + DELIM: '๐ŸŸ ',
-    DELIM + r'yellow_circle' + DELIM: '๐ŸŸก',
-    DELIM + r'green_circle' + DELIM: '๐ŸŸข',
-    DELIM + r'large_blue_circle' + DELIM: '๐Ÿ”ต',
-    DELIM + r'purple_circle' + DELIM: '๐ŸŸฃ',
-    DELIM + r'brown_circle' + DELIM: '๐ŸŸค',
-    DELIM + r'black_circle' + DELIM: 'โšซ',
-    DELIM + r'white_circle' + DELIM: 'โšช',
-    DELIM + r'red_square' + DELIM: '๐ŸŸฅ',
-    DELIM + r'orange_square' + DELIM: '๐ŸŸง',
-    DELIM + r'yellow_square' + DELIM: '๐ŸŸจ',
-    DELIM + r'green_square' + DELIM: '๐ŸŸฉ',
-    DELIM + r'blue_square' + DELIM: '๐ŸŸฆ',
-    DELIM + r'purple_square' + DELIM: '๐ŸŸช',
-    DELIM + r'brown_square' + DELIM: '๐ŸŸซ',
-    DELIM + r'black_large_square' + DELIM: 'โฌ›',
-    DELIM + r'white_large_square' + DELIM: 'โฌœ',
-    DELIM + r'black_medium_square' + DELIM: 'โ—ผ๏ธ',
-    DELIM + r'white_medium_square' + DELIM: 'โ—ป๏ธ',
-    DELIM + r'black_medium_small_square' + DELIM: 'โ—พ',
-    DELIM + r'white_medium_small_square' + DELIM: 'โ—ฝ',
-    DELIM + r'black_small_square' + DELIM: 'โ–ช๏ธ',
-    DELIM + r'white_small_square' + DELIM: 'โ–ซ๏ธ',
-    DELIM + r'large_orange_diamond' + DELIM: '๐Ÿ”ถ',
-    DELIM + r'large_blue_diamond' + DELIM: '๐Ÿ”ท',
-    DELIM + r'small_orange_diamond' + DELIM: '๐Ÿ”ธ',
-    DELIM + r'small_blue_diamond' + DELIM: '๐Ÿ”น',
-    DELIM + r'small_red_triangle' + DELIM: '๐Ÿ”บ',
-    DELIM + r'small_red_triangle_down' + DELIM: '๐Ÿ”ป',
-    DELIM + r'diamond_shape_with_a_dot_inside' + DELIM: '๐Ÿ’ ',
-    DELIM + r'radio_button' + DELIM: '๐Ÿ”˜',
-    DELIM + r'white_square_button' + DELIM: '๐Ÿ”ณ',
-    DELIM + r'black_square_button' + DELIM: '๐Ÿ”ฒ',
-
+    DELIM + r"red_circle" + DELIM: "๐Ÿ”ด",
+    DELIM + r"orange_circle" + DELIM: "๐ŸŸ ",
+    DELIM + r"yellow_circle" + DELIM: "๐ŸŸก",
+    DELIM + r"green_circle" + DELIM: "๐ŸŸข",
+    DELIM + r"large_blue_circle" + DELIM: "๐Ÿ”ต",
+    DELIM + r"purple_circle" + DELIM: "๐ŸŸฃ",
+    DELIM + r"brown_circle" + DELIM: "๐ŸŸค",
+    DELIM + r"black_circle" + DELIM: "โšซ",
+    DELIM + r"white_circle" + DELIM: "โšช",
+    DELIM + r"red_square" + DELIM: "๐ŸŸฅ",
+    DELIM + r"orange_square" + DELIM: "๐ŸŸง",
+    DELIM + r"yellow_square" + DELIM: "๐ŸŸจ",
+    DELIM + r"green_square" + DELIM: "๐ŸŸฉ",
+    DELIM + r"blue_square" + DELIM: "๐ŸŸฆ",
+    DELIM + r"purple_square" + DELIM: "๐ŸŸช",
+    DELIM + r"brown_square" + DELIM: "๐ŸŸซ",
+    DELIM + r"black_large_square" + DELIM: "โฌ›",
+    DELIM + r"white_large_square" + DELIM: "โฌœ",
+    DELIM + r"black_medium_square" + DELIM: "โ—ผ๏ธ",
+    DELIM + r"white_medium_square" + DELIM: "โ—ป๏ธ",
+    DELIM + r"black_medium_small_square" + DELIM: "โ—พ",
+    DELIM + r"white_medium_small_square" + DELIM: "โ—ฝ",
+    DELIM + r"black_small_square" + DELIM: "โ–ช๏ธ",
+    DELIM + r"white_small_square" + DELIM: "โ–ซ๏ธ",
+    DELIM + r"large_orange_diamond" + DELIM: "๐Ÿ”ถ",
+    DELIM + r"large_blue_diamond" + DELIM: "๐Ÿ”ท",
+    DELIM + r"small_orange_diamond" + DELIM: "๐Ÿ”ธ",
+    DELIM + r"small_blue_diamond" + DELIM: "๐Ÿ”น",
+    DELIM + r"small_red_triangle" + DELIM: "๐Ÿ”บ",
+    DELIM + r"small_red_triangle_down" + DELIM: "๐Ÿ”ป",
+    DELIM + r"diamond_shape_with_a_dot_inside" + DELIM: "๐Ÿ’ ",
+    DELIM + r"radio_button" + DELIM: "๐Ÿ”˜",
+    DELIM + r"white_square_button" + DELIM: "๐Ÿ”ณ",
+    DELIM + r"black_square_button" + DELIM: "๐Ÿ”ฒ",
     #
     # Flag
     #
-    DELIM + r'checkered_flag' + DELIM: '๐Ÿ',
-    DELIM + r'triangular_flag_on_post' + DELIM: '๐Ÿšฉ',
-    DELIM + r'crossed_flags' + DELIM: '๐ŸŽŒ',
-    DELIM + r'black_flag' + DELIM: '๐Ÿด',
-    DELIM + r'white_flag' + DELIM: '๐Ÿณ๏ธ',
-    DELIM + r'rainbow_flag' + DELIM: '๐Ÿณ๏ธโ€๐ŸŒˆ',
-    DELIM + r'transgender_flag' + DELIM: '๐Ÿณ๏ธโ€โšง๏ธ',
-    DELIM + r'pirate_flag' + DELIM: '๐Ÿดโ€โ˜ ๏ธ',
-
+    DELIM + r"checkered_flag" + DELIM: "๐Ÿ",
+    DELIM + r"triangular_flag_on_post" + DELIM: "๐Ÿšฉ",
+    DELIM + r"crossed_flags" + DELIM: "๐ŸŽŒ",
+    DELIM + r"black_flag" + DELIM: "๐Ÿด",
+    DELIM + r"white_flag" + DELIM: "๐Ÿณ๏ธ",
+    DELIM + r"rainbow_flag" + DELIM: "๐Ÿณ๏ธโ€๐ŸŒˆ",
+    DELIM + r"transgender_flag" + DELIM: "๐Ÿณ๏ธโ€โšง๏ธ",
+    DELIM + r"pirate_flag" + DELIM: "๐Ÿดโ€โ˜ ๏ธ",
     #
     # Country Flag
     #
-    DELIM + r'ascension_island' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡จ',
-    DELIM + r'andorra' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฉ',
-    DELIM + r'united_arab_emirates' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ช',
-    DELIM + r'afghanistan' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ซ',
-    DELIM + r'antigua_barbuda' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฌ',
-    DELIM + r'anguilla' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฎ',
-    DELIM + r'albania' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฑ',
-    DELIM + r'armenia' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฒ',
-    DELIM + r'angola' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ด',
-    DELIM + r'antarctica' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ถ',
-    DELIM + r'argentina' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ท',
-    DELIM + r'american_samoa' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ธ',
-    DELIM + r'austria' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡น',
-    DELIM + r'australia' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡บ',
-    DELIM + r'aruba' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ผ',
-    DELIM + r'aland_islands' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฝ',
-    DELIM + r'azerbaijan' + DELIM: '๐Ÿ‡ฆ๐Ÿ‡ฟ',
-    DELIM + r'bosnia_herzegovina' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฆ',
-    DELIM + r'barbados' + DELIM: '๐Ÿ‡ง๐Ÿ‡ง',
-    DELIM + r'bangladesh' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฉ',
-    DELIM + r'belgium' + DELIM: '๐Ÿ‡ง๐Ÿ‡ช',
-    DELIM + r'burkina_faso' + DELIM: '๐Ÿ‡ง๐Ÿ‡ซ',
-    DELIM + r'bulgaria' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฌ',
-    DELIM + r'bahrain' + DELIM: '๐Ÿ‡ง๐Ÿ‡ญ',
-    DELIM + r'burundi' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฎ',
-    DELIM + r'benin' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฏ',
-    DELIM + r'st_barthelemy' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฑ',
-    DELIM + r'bermuda' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฒ',
-    DELIM + r'brunei' + DELIM: '๐Ÿ‡ง๐Ÿ‡ณ',
-    DELIM + r'bolivia' + DELIM: '๐Ÿ‡ง๐Ÿ‡ด',
-    DELIM + r'caribbean_netherlands' + DELIM: '๐Ÿ‡ง๐Ÿ‡ถ',
-    DELIM + r'brazil' + DELIM: '๐Ÿ‡ง๐Ÿ‡ท',
-    DELIM + r'bahamas' + DELIM: '๐Ÿ‡ง๐Ÿ‡ธ',
-    DELIM + r'bhutan' + DELIM: '๐Ÿ‡ง๐Ÿ‡น',
-    DELIM + r'bouvet_island' + DELIM: '๐Ÿ‡ง๐Ÿ‡ป',
-    DELIM + r'botswana' + DELIM: '๐Ÿ‡ง๐Ÿ‡ผ',
-    DELIM + r'belarus' + DELIM: '๐Ÿ‡ง๐Ÿ‡พ',
-    DELIM + r'belize' + DELIM: '๐Ÿ‡ง๐Ÿ‡ฟ',
-    DELIM + r'canada' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฆ',
-    DELIM + r'cocos_islands' + DELIM: '๐Ÿ‡จ๐Ÿ‡จ',
-    DELIM + r'congo_kinshasa' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฉ',
-    DELIM + r'central_african_republic' + DELIM: '๐Ÿ‡จ๐Ÿ‡ซ',
-    DELIM + r'congo_brazzaville' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฌ',
-    DELIM + r'switzerland' + DELIM: '๐Ÿ‡จ๐Ÿ‡ญ',
-    DELIM + r'cote_divoire' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฎ',
-    DELIM + r'cook_islands' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฐ',
-    DELIM + r'chile' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฑ',
-    DELIM + r'cameroon' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฒ',
-    DELIM + r'cn' + DELIM: '๐Ÿ‡จ๐Ÿ‡ณ',
-    DELIM + r'colombia' + DELIM: '๐Ÿ‡จ๐Ÿ‡ด',
-    DELIM + r'clipperton_island' + DELIM: '๐Ÿ‡จ๐Ÿ‡ต',
-    DELIM + r'costa_rica' + DELIM: '๐Ÿ‡จ๐Ÿ‡ท',
-    DELIM + r'cuba' + DELIM: '๐Ÿ‡จ๐Ÿ‡บ',
-    DELIM + r'cape_verde' + DELIM: '๐Ÿ‡จ๐Ÿ‡ป',
-    DELIM + r'curacao' + DELIM: '๐Ÿ‡จ๐Ÿ‡ผ',
-    DELIM + r'christmas_island' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฝ',
-    DELIM + r'cyprus' + DELIM: '๐Ÿ‡จ๐Ÿ‡พ',
-    DELIM + r'czech_republic' + DELIM: '๐Ÿ‡จ๐Ÿ‡ฟ',
-    DELIM + r'de' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ช',
-    DELIM + r'diego_garcia' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ฌ',
-    DELIM + r'djibouti' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ฏ',
-    DELIM + r'denmark' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ฐ',
-    DELIM + r'dominica' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ฒ',
-    DELIM + r'dominican_republic' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ด',
-    DELIM + r'algeria' + DELIM: '๐Ÿ‡ฉ๐Ÿ‡ฟ',
-    DELIM + r'ceuta_melilla' + DELIM: '๐Ÿ‡ช๐Ÿ‡ฆ',
-    DELIM + r'ecuador' + DELIM: '๐Ÿ‡ช๐Ÿ‡จ',
-    DELIM + r'estonia' + DELIM: '๐Ÿ‡ช๐Ÿ‡ช',
-    DELIM + r'egypt' + DELIM: '๐Ÿ‡ช๐Ÿ‡ฌ',
-    DELIM + r'western_sahara' + DELIM: '๐Ÿ‡ช๐Ÿ‡ญ',
-    DELIM + r'eritrea' + DELIM: '๐Ÿ‡ช๐Ÿ‡ท',
-    DELIM + r'es' + DELIM: '๐Ÿ‡ช๐Ÿ‡ธ',
-    DELIM + r'ethiopia' + DELIM: '๐Ÿ‡ช๐Ÿ‡น',
-    DELIM + r'(eu|european_union)' + DELIM: '๐Ÿ‡ช๐Ÿ‡บ',
-    DELIM + r'finland' + DELIM: '๐Ÿ‡ซ๐Ÿ‡ฎ',
-    DELIM + r'fiji' + DELIM: '๐Ÿ‡ซ๐Ÿ‡ฏ',
-    DELIM + r'falkland_islands' + DELIM: '๐Ÿ‡ซ๐Ÿ‡ฐ',
-    DELIM + r'micronesia' + DELIM: '๐Ÿ‡ซ๐Ÿ‡ฒ',
-    DELIM + r'faroe_islands' + DELIM: '๐Ÿ‡ซ๐Ÿ‡ด',
-    DELIM + r'fr' + DELIM: '๐Ÿ‡ซ๐Ÿ‡ท',
-    DELIM + r'gabon' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ฆ',
-    DELIM + r'(uk|gb)' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ง',
-    DELIM + r'grenada' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ฉ',
-    DELIM + r'georgia' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ช',
-    DELIM + r'french_guiana' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ซ',
-    DELIM + r'guernsey' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ฌ',
-    DELIM + r'ghana' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ญ',
-    DELIM + r'gibraltar' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ฎ',
-    DELIM + r'greenland' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ฑ',
-    DELIM + r'gambia' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ฒ',
-    DELIM + r'guinea' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ณ',
-    DELIM + r'guadeloupe' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ต',
-    DELIM + r'equatorial_guinea' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ถ',
-    DELIM + r'greece' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ท',
-    DELIM + r'south_georgia_south_sandwich_islands' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ธ',
-    DELIM + r'guatemala' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡น',
-    DELIM + r'guam' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡บ',
-    DELIM + r'guinea_bissau' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡ผ',
-    DELIM + r'guyana' + DELIM: '๐Ÿ‡ฌ๐Ÿ‡พ',
-    DELIM + r'hong_kong' + DELIM: '๐Ÿ‡ญ๐Ÿ‡ฐ',
-    DELIM + r'heard_mcdonald_islands' + DELIM: '๐Ÿ‡ญ๐Ÿ‡ฒ',
-    DELIM + r'honduras' + DELIM: '๐Ÿ‡ญ๐Ÿ‡ณ',
-    DELIM + r'croatia' + DELIM: '๐Ÿ‡ญ๐Ÿ‡ท',
-    DELIM + r'haiti' + DELIM: '๐Ÿ‡ญ๐Ÿ‡น',
-    DELIM + r'hungary' + DELIM: '๐Ÿ‡ญ๐Ÿ‡บ',
-    DELIM + r'canary_islands' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡จ',
-    DELIM + r'indonesia' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ฉ',
-    DELIM + r'ireland' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ช',
-    DELIM + r'israel' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ฑ',
-    DELIM + r'isle_of_man' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ฒ',
-    DELIM + r'india' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ณ',
-    DELIM + r'british_indian_ocean_territory' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ด',
-    DELIM + r'iraq' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ถ',
-    DELIM + r'iran' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ท',
-    DELIM + r'iceland' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡ธ',
-    DELIM + r'it' + DELIM: '๐Ÿ‡ฎ๐Ÿ‡น',
-    DELIM + r'jersey' + DELIM: '๐Ÿ‡ฏ๐Ÿ‡ช',
-    DELIM + r'jamaica' + DELIM: '๐Ÿ‡ฏ๐Ÿ‡ฒ',
-    DELIM + r'jordan' + DELIM: '๐Ÿ‡ฏ๐Ÿ‡ด',
-    DELIM + r'jp' + DELIM: '๐Ÿ‡ฏ๐Ÿ‡ต',
-    DELIM + r'kenya' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ช',
-    DELIM + r'kyrgyzstan' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ฌ',
-    DELIM + r'cambodia' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ญ',
-    DELIM + r'kiribati' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ฎ',
-    DELIM + r'comoros' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ฒ',
-    DELIM + r'st_kitts_nevis' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ณ',
-    DELIM + r'north_korea' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ต',
-    DELIM + r'kr' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ท',
-    DELIM + r'kuwait' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ผ',
-    DELIM + r'cayman_islands' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡พ',
-    DELIM + r'kazakhstan' + DELIM: '๐Ÿ‡ฐ๐Ÿ‡ฟ',
-    DELIM + r'laos' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ฆ',
-    DELIM + r'lebanon' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ง',
-    DELIM + r'st_lucia' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡จ',
-    DELIM + r'liechtenstein' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ฎ',
-    DELIM + r'sri_lanka' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ฐ',
-    DELIM + r'liberia' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ท',
-    DELIM + r'lesotho' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ธ',
-    DELIM + r'lithuania' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡น',
-    DELIM + r'luxembourg' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡บ',
-    DELIM + r'latvia' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡ป',
-    DELIM + r'libya' + DELIM: '๐Ÿ‡ฑ๐Ÿ‡พ',
-    DELIM + r'morocco' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฆ',
-    DELIM + r'monaco' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡จ',
-    DELIM + r'moldova' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฉ',
-    DELIM + r'montenegro' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ช',
-    DELIM + r'st_martin' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ซ',
-    DELIM + r'madagascar' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฌ',
-    DELIM + r'marshall_islands' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ญ',
-    DELIM + r'macedonia' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฐ',
-    DELIM + r'mali' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฑ',
-    DELIM + r'myanmar' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฒ',
-    DELIM + r'mongolia' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ณ',
-    DELIM + r'macau' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ด',
-    DELIM + r'northern_mariana_islands' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ต',
-    DELIM + r'martinique' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ถ',
-    DELIM + r'mauritania' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ท',
-    DELIM + r'montserrat' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ธ',
-    DELIM + r'malta' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡น',
-    DELIM + r'mauritius' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡บ',
-    DELIM + r'maldives' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ป',
-    DELIM + r'malawi' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ผ',
-    DELIM + r'mexico' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฝ',
-    DELIM + r'malaysia' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡พ',
-    DELIM + r'mozambique' + DELIM: '๐Ÿ‡ฒ๐Ÿ‡ฟ',
-    DELIM + r'namibia' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ฆ',
-    DELIM + r'new_caledonia' + DELIM: '๐Ÿ‡ณ๐Ÿ‡จ',
-    DELIM + r'niger' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ช',
-    DELIM + r'norfolk_island' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ซ',
-    DELIM + r'nigeria' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ฌ',
-    DELIM + r'nicaragua' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ฎ',
-    DELIM + r'netherlands' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ฑ',
-    DELIM + r'norway' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ด',
-    DELIM + r'nepal' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ต',
-    DELIM + r'nauru' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ท',
-    DELIM + r'niue' + DELIM: '๐Ÿ‡ณ๐Ÿ‡บ',
-    DELIM + r'new_zealand' + DELIM: '๐Ÿ‡ณ๐Ÿ‡ฟ',
-    DELIM + r'oman' + DELIM: '๐Ÿ‡ด๐Ÿ‡ฒ',
-    DELIM + r'panama' + DELIM: '๐Ÿ‡ต๐Ÿ‡ฆ',
-    DELIM + r'peru' + DELIM: '๐Ÿ‡ต๐Ÿ‡ช',
-    DELIM + r'french_polynesia' + DELIM: '๐Ÿ‡ต๐Ÿ‡ซ',
-    DELIM + r'papua_new_guinea' + DELIM: '๐Ÿ‡ต๐Ÿ‡ฌ',
-    DELIM + r'philippines' + DELIM: '๐Ÿ‡ต๐Ÿ‡ญ',
-    DELIM + r'pakistan' + DELIM: '๐Ÿ‡ต๐Ÿ‡ฐ',
-    DELIM + r'poland' + DELIM: '๐Ÿ‡ต๐Ÿ‡ฑ',
-    DELIM + r'st_pierre_miquelon' + DELIM: '๐Ÿ‡ต๐Ÿ‡ฒ',
-    DELIM + r'pitcairn_islands' + DELIM: '๐Ÿ‡ต๐Ÿ‡ณ',
-    DELIM + r'puerto_rico' + DELIM: '๐Ÿ‡ต๐Ÿ‡ท',
-    DELIM + r'palestinian_territories' + DELIM: '๐Ÿ‡ต๐Ÿ‡ธ',
-    DELIM + r'portugal' + DELIM: '๐Ÿ‡ต๐Ÿ‡น',
-    DELIM + r'palau' + DELIM: '๐Ÿ‡ต๐Ÿ‡ผ',
-    DELIM + r'paraguay' + DELIM: '๐Ÿ‡ต๐Ÿ‡พ',
-    DELIM + r'qatar' + DELIM: '๐Ÿ‡ถ๐Ÿ‡ฆ',
-    DELIM + r'reunion' + DELIM: '๐Ÿ‡ท๐Ÿ‡ช',
-    DELIM + r'romania' + DELIM: '๐Ÿ‡ท๐Ÿ‡ด',
-    DELIM + r'serbia' + DELIM: '๐Ÿ‡ท๐Ÿ‡ธ',
-    DELIM + r'ru' + DELIM: '๐Ÿ‡ท๐Ÿ‡บ',
-    DELIM + r'rwanda' + DELIM: '๐Ÿ‡ท๐Ÿ‡ผ',
-    DELIM + r'saudi_arabia' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฆ',
-    DELIM + r'solomon_islands' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ง',
-    DELIM + r'seychelles' + DELIM: '๐Ÿ‡ธ๐Ÿ‡จ',
-    DELIM + r'sudan' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฉ',
-    DELIM + r'sweden' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ช',
-    DELIM + r'singapore' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฌ',
-    DELIM + r'st_helena' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ญ',
-    DELIM + r'slovenia' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฎ',
-    DELIM + r'svalbard_jan_mayen' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฏ',
-    DELIM + r'slovakia' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฐ',
-    DELIM + r'sierra_leone' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฑ',
-    DELIM + r'san_marino' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฒ',
-    DELIM + r'senegal' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ณ',
-    DELIM + r'somalia' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ด',
-    DELIM + r'suriname' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ท',
-    DELIM + r'south_sudan' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ธ',
-    DELIM + r'sao_tome_principe' + DELIM: '๐Ÿ‡ธ๐Ÿ‡น',
-    DELIM + r'el_salvador' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ป',
-    DELIM + r'sint_maarten' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฝ',
-    DELIM + r'syria' + DELIM: '๐Ÿ‡ธ๐Ÿ‡พ',
-    DELIM + r'swaziland' + DELIM: '๐Ÿ‡ธ๐Ÿ‡ฟ',
-    DELIM + r'tristan_da_cunha' + DELIM: '๐Ÿ‡น๐Ÿ‡ฆ',
-    DELIM + r'turks_caicos_islands' + DELIM: '๐Ÿ‡น๐Ÿ‡จ',
-    DELIM + r'chad' + DELIM: '๐Ÿ‡น๐Ÿ‡ฉ',
-    DELIM + r'french_southern_territories' + DELIM: '๐Ÿ‡น๐Ÿ‡ซ',
-    DELIM + r'togo' + DELIM: '๐Ÿ‡น๐Ÿ‡ฌ',
-    DELIM + r'thailand' + DELIM: '๐Ÿ‡น๐Ÿ‡ญ',
-    DELIM + r'tajikistan' + DELIM: '๐Ÿ‡น๐Ÿ‡ฏ',
-    DELIM + r'tokelau' + DELIM: '๐Ÿ‡น๐Ÿ‡ฐ',
-    DELIM + r'timor_leste' + DELIM: '๐Ÿ‡น๐Ÿ‡ฑ',
-    DELIM + r'turkmenistan' + DELIM: '๐Ÿ‡น๐Ÿ‡ฒ',
-    DELIM + r'tunisia' + DELIM: '๐Ÿ‡น๐Ÿ‡ณ',
-    DELIM + r'tonga' + DELIM: '๐Ÿ‡น๐Ÿ‡ด',
-    DELIM + r'tr' + DELIM: '๐Ÿ‡น๐Ÿ‡ท',
-    DELIM + r'trinidad_tobago' + DELIM: '๐Ÿ‡น๐Ÿ‡น',
-    DELIM + r'tuvalu' + DELIM: '๐Ÿ‡น๐Ÿ‡ป',
-    DELIM + r'taiwan' + DELIM: '๐Ÿ‡น๐Ÿ‡ผ',
-    DELIM + r'tanzania' + DELIM: '๐Ÿ‡น๐Ÿ‡ฟ',
-    DELIM + r'ukraine' + DELIM: '๐Ÿ‡บ๐Ÿ‡ฆ',
-    DELIM + r'uganda' + DELIM: '๐Ÿ‡บ๐Ÿ‡ฌ',
-    DELIM + r'us_outlying_islands' + DELIM: '๐Ÿ‡บ๐Ÿ‡ฒ',
-    DELIM + r'united_nations' + DELIM: '๐Ÿ‡บ๐Ÿ‡ณ',
-    DELIM + r'us' + DELIM: '๐Ÿ‡บ๐Ÿ‡ธ',
-    DELIM + r'uruguay' + DELIM: '๐Ÿ‡บ๐Ÿ‡พ',
-    DELIM + r'uzbekistan' + DELIM: '๐Ÿ‡บ๐Ÿ‡ฟ',
-    DELIM + r'vatican_city' + DELIM: '๐Ÿ‡ป๐Ÿ‡ฆ',
-    DELIM + r'st_vincent_grenadines' + DELIM: '๐Ÿ‡ป๐Ÿ‡จ',
-    DELIM + r'venezuela' + DELIM: '๐Ÿ‡ป๐Ÿ‡ช',
-    DELIM + r'british_virgin_islands' + DELIM: '๐Ÿ‡ป๐Ÿ‡ฌ',
-    DELIM + r'us_virgin_islands' + DELIM: '๐Ÿ‡ป๐Ÿ‡ฎ',
-    DELIM + r'vietnam' + DELIM: '๐Ÿ‡ป๐Ÿ‡ณ',
-    DELIM + r'vanuatu' + DELIM: '๐Ÿ‡ป๐Ÿ‡บ',
-    DELIM + r'wallis_futuna' + DELIM: '๐Ÿ‡ผ๐Ÿ‡ซ',
-    DELIM + r'samoa' + DELIM: '๐Ÿ‡ผ๐Ÿ‡ธ',
-    DELIM + r'kosovo' + DELIM: '๐Ÿ‡ฝ๐Ÿ‡ฐ',
-    DELIM + r'yemen' + DELIM: '๐Ÿ‡พ๐Ÿ‡ช',
-    DELIM + r'mayotte' + DELIM: '๐Ÿ‡พ๐Ÿ‡น',
-    DELIM + r'south_africa' + DELIM: '๐Ÿ‡ฟ๐Ÿ‡ฆ',
-    DELIM + r'zambia' + DELIM: '๐Ÿ‡ฟ๐Ÿ‡ฒ',
-    DELIM + r'zimbabwe' + DELIM: '๐Ÿ‡ฟ๐Ÿ‡ผ',
-
+    DELIM + r"ascension_island" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡จ",
+    DELIM + r"andorra" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฉ",
+    DELIM + r"united_arab_emirates" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ช",
+    DELIM + r"afghanistan" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ซ",
+    DELIM + r"antigua_barbuda" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฌ",
+    DELIM + r"anguilla" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฎ",
+    DELIM + r"albania" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฑ",
+    DELIM + r"armenia" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฒ",
+    DELIM + r"angola" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ด",
+    DELIM + r"antarctica" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ถ",
+    DELIM + r"argentina" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ท",
+    DELIM + r"american_samoa" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ธ",
+    DELIM + r"austria" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡น",
+    DELIM + r"australia" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡บ",
+    DELIM + r"aruba" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ผ",
+    DELIM + r"aland_islands" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฝ",
+    DELIM + r"azerbaijan" + DELIM: "๐Ÿ‡ฆ๐Ÿ‡ฟ",
+    DELIM + r"bosnia_herzegovina" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฆ",
+    DELIM + r"barbados" + DELIM: "๐Ÿ‡ง๐Ÿ‡ง",
+    DELIM + r"bangladesh" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฉ",
+    DELIM + r"belgium" + DELIM: "๐Ÿ‡ง๐Ÿ‡ช",
+    DELIM + r"burkina_faso" + DELIM: "๐Ÿ‡ง๐Ÿ‡ซ",
+    DELIM + r"bulgaria" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฌ",
+    DELIM + r"bahrain" + DELIM: "๐Ÿ‡ง๐Ÿ‡ญ",
+    DELIM + r"burundi" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฎ",
+    DELIM + r"benin" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฏ",
+    DELIM + r"st_barthelemy" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฑ",
+    DELIM + r"bermuda" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฒ",
+    DELIM + r"brunei" + DELIM: "๐Ÿ‡ง๐Ÿ‡ณ",
+    DELIM + r"bolivia" + DELIM: "๐Ÿ‡ง๐Ÿ‡ด",
+    DELIM + r"caribbean_netherlands" + DELIM: "๐Ÿ‡ง๐Ÿ‡ถ",
+    DELIM + r"brazil" + DELIM: "๐Ÿ‡ง๐Ÿ‡ท",
+    DELIM + r"bahamas" + DELIM: "๐Ÿ‡ง๐Ÿ‡ธ",
+    DELIM + r"bhutan" + DELIM: "๐Ÿ‡ง๐Ÿ‡น",
+    DELIM + r"bouvet_island" + DELIM: "๐Ÿ‡ง๐Ÿ‡ป",
+    DELIM + r"botswana" + DELIM: "๐Ÿ‡ง๐Ÿ‡ผ",
+    DELIM + r"belarus" + DELIM: "๐Ÿ‡ง๐Ÿ‡พ",
+    DELIM + r"belize" + DELIM: "๐Ÿ‡ง๐Ÿ‡ฟ",
+    DELIM + r"canada" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฆ",
+    DELIM + r"cocos_islands" + DELIM: "๐Ÿ‡จ๐Ÿ‡จ",
+    DELIM + r"congo_kinshasa" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฉ",
+    DELIM + r"central_african_republic" + DELIM: "๐Ÿ‡จ๐Ÿ‡ซ",
+    DELIM + r"congo_brazzaville" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฌ",
+    DELIM + r"switzerland" + DELIM: "๐Ÿ‡จ๐Ÿ‡ญ",
+    DELIM + r"cote_divoire" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฎ",
+    DELIM + r"cook_islands" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฐ",
+    DELIM + r"chile" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฑ",
+    DELIM + r"cameroon" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฒ",
+    DELIM + r"cn" + DELIM: "๐Ÿ‡จ๐Ÿ‡ณ",
+    DELIM + r"colombia" + DELIM: "๐Ÿ‡จ๐Ÿ‡ด",
+    DELIM + r"clipperton_island" + DELIM: "๐Ÿ‡จ๐Ÿ‡ต",
+    DELIM + r"costa_rica" + DELIM: "๐Ÿ‡จ๐Ÿ‡ท",
+    DELIM + r"cuba" + DELIM: "๐Ÿ‡จ๐Ÿ‡บ",
+    DELIM + r"cape_verde" + DELIM: "๐Ÿ‡จ๐Ÿ‡ป",
+    DELIM + r"curacao" + DELIM: "๐Ÿ‡จ๐Ÿ‡ผ",
+    DELIM + r"christmas_island" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฝ",
+    DELIM + r"cyprus" + DELIM: "๐Ÿ‡จ๐Ÿ‡พ",
+    DELIM + r"czech_republic" + DELIM: "๐Ÿ‡จ๐Ÿ‡ฟ",
+    DELIM + r"de" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ช",
+    DELIM + r"diego_garcia" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ฌ",
+    DELIM + r"djibouti" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ฏ",
+    DELIM + r"denmark" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ฐ",
+    DELIM + r"dominica" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ฒ",
+    DELIM + r"dominican_republic" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ด",
+    DELIM + r"algeria" + DELIM: "๐Ÿ‡ฉ๐Ÿ‡ฟ",
+    DELIM + r"ceuta_melilla" + DELIM: "๐Ÿ‡ช๐Ÿ‡ฆ",
+    DELIM + r"ecuador" + DELIM: "๐Ÿ‡ช๐Ÿ‡จ",
+    DELIM + r"estonia" + DELIM: "๐Ÿ‡ช๐Ÿ‡ช",
+    DELIM + r"egypt" + DELIM: "๐Ÿ‡ช๐Ÿ‡ฌ",
+    DELIM + r"western_sahara" + DELIM: "๐Ÿ‡ช๐Ÿ‡ญ",
+    DELIM + r"eritrea" + DELIM: "๐Ÿ‡ช๐Ÿ‡ท",
+    DELIM + r"es" + DELIM: "๐Ÿ‡ช๐Ÿ‡ธ",
+    DELIM + r"ethiopia" + DELIM: "๐Ÿ‡ช๐Ÿ‡น",
+    DELIM + r"(eu|european_union)" + DELIM: "๐Ÿ‡ช๐Ÿ‡บ",
+    DELIM + r"finland" + DELIM: "๐Ÿ‡ซ๐Ÿ‡ฎ",
+    DELIM + r"fiji" + DELIM: "๐Ÿ‡ซ๐Ÿ‡ฏ",
+    DELIM + r"falkland_islands" + DELIM: "๐Ÿ‡ซ๐Ÿ‡ฐ",
+    DELIM + r"micronesia" + DELIM: "๐Ÿ‡ซ๐Ÿ‡ฒ",
+    DELIM + r"faroe_islands" + DELIM: "๐Ÿ‡ซ๐Ÿ‡ด",
+    DELIM + r"fr" + DELIM: "๐Ÿ‡ซ๐Ÿ‡ท",
+    DELIM + r"gabon" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ฆ",
+    DELIM + r"(uk|gb)" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ง",
+    DELIM + r"grenada" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ฉ",
+    DELIM + r"georgia" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ช",
+    DELIM + r"french_guiana" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ซ",
+    DELIM + r"guernsey" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ฌ",
+    DELIM + r"ghana" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ญ",
+    DELIM + r"gibraltar" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ฎ",
+    DELIM + r"greenland" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ฑ",
+    DELIM + r"gambia" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ฒ",
+    DELIM + r"guinea" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ณ",
+    DELIM + r"guadeloupe" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ต",
+    DELIM + r"equatorial_guinea" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ถ",
+    DELIM + r"greece" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ท",
+    DELIM + r"south_georgia_south_sandwich_islands" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ธ",
+    DELIM + r"guatemala" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡น",
+    DELIM + r"guam" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡บ",
+    DELIM + r"guinea_bissau" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡ผ",
+    DELIM + r"guyana" + DELIM: "๐Ÿ‡ฌ๐Ÿ‡พ",
+    DELIM + r"hong_kong" + DELIM: "๐Ÿ‡ญ๐Ÿ‡ฐ",
+    DELIM + r"heard_mcdonald_islands" + DELIM: "๐Ÿ‡ญ๐Ÿ‡ฒ",
+    DELIM + r"honduras" + DELIM: "๐Ÿ‡ญ๐Ÿ‡ณ",
+    DELIM + r"croatia" + DELIM: "๐Ÿ‡ญ๐Ÿ‡ท",
+    DELIM + r"haiti" + DELIM: "๐Ÿ‡ญ๐Ÿ‡น",
+    DELIM + r"hungary" + DELIM: "๐Ÿ‡ญ๐Ÿ‡บ",
+    DELIM + r"canary_islands" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡จ",
+    DELIM + r"indonesia" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ฉ",
+    DELIM + r"ireland" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ช",
+    DELIM + r"israel" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ฑ",
+    DELIM + r"isle_of_man" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ฒ",
+    DELIM + r"india" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ณ",
+    DELIM + r"british_indian_ocean_territory" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ด",
+    DELIM + r"iraq" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ถ",
+    DELIM + r"iran" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ท",
+    DELIM + r"iceland" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡ธ",
+    DELIM + r"it" + DELIM: "๐Ÿ‡ฎ๐Ÿ‡น",
+    DELIM + r"jersey" + DELIM: "๐Ÿ‡ฏ๐Ÿ‡ช",
+    DELIM + r"jamaica" + DELIM: "๐Ÿ‡ฏ๐Ÿ‡ฒ",
+    DELIM + r"jordan" + DELIM: "๐Ÿ‡ฏ๐Ÿ‡ด",
+    DELIM + r"jp" + DELIM: "๐Ÿ‡ฏ๐Ÿ‡ต",
+    DELIM + r"kenya" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ช",
+    DELIM + r"kyrgyzstan" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ฌ",
+    DELIM + r"cambodia" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ญ",
+    DELIM + r"kiribati" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ฎ",
+    DELIM + r"comoros" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ฒ",
+    DELIM + r"st_kitts_nevis" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ณ",
+    DELIM + r"north_korea" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ต",
+    DELIM + r"kr" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ท",
+    DELIM + r"kuwait" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ผ",
+    DELIM + r"cayman_islands" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡พ",
+    DELIM + r"kazakhstan" + DELIM: "๐Ÿ‡ฐ๐Ÿ‡ฟ",
+    DELIM + r"laos" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ฆ",
+    DELIM + r"lebanon" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ง",
+    DELIM + r"st_lucia" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡จ",
+    DELIM + r"liechtenstein" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ฎ",
+    DELIM + r"sri_lanka" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ฐ",
+    DELIM + r"liberia" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ท",
+    DELIM + r"lesotho" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ธ",
+    DELIM + r"lithuania" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡น",
+    DELIM + r"luxembourg" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡บ",
+    DELIM + r"latvia" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡ป",
+    DELIM + r"libya" + DELIM: "๐Ÿ‡ฑ๐Ÿ‡พ",
+    DELIM + r"morocco" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฆ",
+    DELIM + r"monaco" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡จ",
+    DELIM + r"moldova" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฉ",
+    DELIM + r"montenegro" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ช",
+    DELIM + r"st_martin" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ซ",
+    DELIM + r"madagascar" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฌ",
+    DELIM + r"marshall_islands" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ญ",
+    DELIM + r"macedonia" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฐ",
+    DELIM + r"mali" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฑ",
+    DELIM + r"myanmar" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฒ",
+    DELIM + r"mongolia" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ณ",
+    DELIM + r"macau" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ด",
+    DELIM + r"northern_mariana_islands" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ต",
+    DELIM + r"martinique" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ถ",
+    DELIM + r"mauritania" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ท",
+    DELIM + r"montserrat" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ธ",
+    DELIM + r"malta" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡น",
+    DELIM + r"mauritius" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡บ",
+    DELIM + r"maldives" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ป",
+    DELIM + r"malawi" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ผ",
+    DELIM + r"mexico" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฝ",
+    DELIM + r"malaysia" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡พ",
+    DELIM + r"mozambique" + DELIM: "๐Ÿ‡ฒ๐Ÿ‡ฟ",
+    DELIM + r"namibia" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ฆ",
+    DELIM + r"new_caledonia" + DELIM: "๐Ÿ‡ณ๐Ÿ‡จ",
+    DELIM + r"niger" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ช",
+    DELIM + r"norfolk_island" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ซ",
+    DELIM + r"nigeria" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ฌ",
+    DELIM + r"nicaragua" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ฎ",
+    DELIM + r"netherlands" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ฑ",
+    DELIM + r"norway" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ด",
+    DELIM + r"nepal" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ต",
+    DELIM + r"nauru" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ท",
+    DELIM + r"niue" + DELIM: "๐Ÿ‡ณ๐Ÿ‡บ",
+    DELIM + r"new_zealand" + DELIM: "๐Ÿ‡ณ๐Ÿ‡ฟ",
+    DELIM + r"oman" + DELIM: "๐Ÿ‡ด๐Ÿ‡ฒ",
+    DELIM + r"panama" + DELIM: "๐Ÿ‡ต๐Ÿ‡ฆ",
+    DELIM + r"peru" + DELIM: "๐Ÿ‡ต๐Ÿ‡ช",
+    DELIM + r"french_polynesia" + DELIM: "๐Ÿ‡ต๐Ÿ‡ซ",
+    DELIM + r"papua_new_guinea" + DELIM: "๐Ÿ‡ต๐Ÿ‡ฌ",
+    DELIM + r"philippines" + DELIM: "๐Ÿ‡ต๐Ÿ‡ญ",
+    DELIM + r"pakistan" + DELIM: "๐Ÿ‡ต๐Ÿ‡ฐ",
+    DELIM + r"poland" + DELIM: "๐Ÿ‡ต๐Ÿ‡ฑ",
+    DELIM + r"st_pierre_miquelon" + DELIM: "๐Ÿ‡ต๐Ÿ‡ฒ",
+    DELIM + r"pitcairn_islands" + DELIM: "๐Ÿ‡ต๐Ÿ‡ณ",
+    DELIM + r"puerto_rico" + DELIM: "๐Ÿ‡ต๐Ÿ‡ท",
+    DELIM + r"palestinian_territories" + DELIM: "๐Ÿ‡ต๐Ÿ‡ธ",
+    DELIM + r"portugal" + DELIM: "๐Ÿ‡ต๐Ÿ‡น",
+    DELIM + r"palau" + DELIM: "๐Ÿ‡ต๐Ÿ‡ผ",
+    DELIM + r"paraguay" + DELIM: "๐Ÿ‡ต๐Ÿ‡พ",
+    DELIM + r"qatar" + DELIM: "๐Ÿ‡ถ๐Ÿ‡ฆ",
+    DELIM + r"reunion" + DELIM: "๐Ÿ‡ท๐Ÿ‡ช",
+    DELIM + r"romania" + DELIM: "๐Ÿ‡ท๐Ÿ‡ด",
+    DELIM + r"serbia" + DELIM: "๐Ÿ‡ท๐Ÿ‡ธ",
+    DELIM + r"ru" + DELIM: "๐Ÿ‡ท๐Ÿ‡บ",
+    DELIM + r"rwanda" + DELIM: "๐Ÿ‡ท๐Ÿ‡ผ",
+    DELIM + r"saudi_arabia" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฆ",
+    DELIM + r"solomon_islands" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ง",
+    DELIM + r"seychelles" + DELIM: "๐Ÿ‡ธ๐Ÿ‡จ",
+    DELIM + r"sudan" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฉ",
+    DELIM + r"sweden" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ช",
+    DELIM + r"singapore" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฌ",
+    DELIM + r"st_helena" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ญ",
+    DELIM + r"slovenia" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฎ",
+    DELIM + r"svalbard_jan_mayen" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฏ",
+    DELIM + r"slovakia" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฐ",
+    DELIM + r"sierra_leone" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฑ",
+    DELIM + r"san_marino" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฒ",
+    DELIM + r"senegal" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ณ",
+    DELIM + r"somalia" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ด",
+    DELIM + r"suriname" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ท",
+    DELIM + r"south_sudan" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ธ",
+    DELIM + r"sao_tome_principe" + DELIM: "๐Ÿ‡ธ๐Ÿ‡น",
+    DELIM + r"el_salvador" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ป",
+    DELIM + r"sint_maarten" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฝ",
+    DELIM + r"syria" + DELIM: "๐Ÿ‡ธ๐Ÿ‡พ",
+    DELIM + r"swaziland" + DELIM: "๐Ÿ‡ธ๐Ÿ‡ฟ",
+    DELIM + r"tristan_da_cunha" + DELIM: "๐Ÿ‡น๐Ÿ‡ฆ",
+    DELIM + r"turks_caicos_islands" + DELIM: "๐Ÿ‡น๐Ÿ‡จ",
+    DELIM + r"chad" + DELIM: "๐Ÿ‡น๐Ÿ‡ฉ",
+    DELIM + r"french_southern_territories" + DELIM: "๐Ÿ‡น๐Ÿ‡ซ",
+    DELIM + r"togo" + DELIM: "๐Ÿ‡น๐Ÿ‡ฌ",
+    DELIM + r"thailand" + DELIM: "๐Ÿ‡น๐Ÿ‡ญ",
+    DELIM + r"tajikistan" + DELIM: "๐Ÿ‡น๐Ÿ‡ฏ",
+    DELIM + r"tokelau" + DELIM: "๐Ÿ‡น๐Ÿ‡ฐ",
+    DELIM + r"timor_leste" + DELIM: "๐Ÿ‡น๐Ÿ‡ฑ",
+    DELIM + r"turkmenistan" + DELIM: "๐Ÿ‡น๐Ÿ‡ฒ",
+    DELIM + r"tunisia" + DELIM: "๐Ÿ‡น๐Ÿ‡ณ",
+    DELIM + r"tonga" + DELIM: "๐Ÿ‡น๐Ÿ‡ด",
+    DELIM + r"tr" + DELIM: "๐Ÿ‡น๐Ÿ‡ท",
+    DELIM + r"trinidad_tobago" + DELIM: "๐Ÿ‡น๐Ÿ‡น",
+    DELIM + r"tuvalu" + DELIM: "๐Ÿ‡น๐Ÿ‡ป",
+    DELIM + r"taiwan" + DELIM: "๐Ÿ‡น๐Ÿ‡ผ",
+    DELIM + r"tanzania" + DELIM: "๐Ÿ‡น๐Ÿ‡ฟ",
+    DELIM + r"ukraine" + DELIM: "๐Ÿ‡บ๐Ÿ‡ฆ",
+    DELIM + r"uganda" + DELIM: "๐Ÿ‡บ๐Ÿ‡ฌ",
+    DELIM + r"us_outlying_islands" + DELIM: "๐Ÿ‡บ๐Ÿ‡ฒ",
+    DELIM + r"united_nations" + DELIM: "๐Ÿ‡บ๐Ÿ‡ณ",
+    DELIM + r"us" + DELIM: "๐Ÿ‡บ๐Ÿ‡ธ",
+    DELIM + r"uruguay" + DELIM: "๐Ÿ‡บ๐Ÿ‡พ",
+    DELIM + r"uzbekistan" + DELIM: "๐Ÿ‡บ๐Ÿ‡ฟ",
+    DELIM + r"vatican_city" + DELIM: "๐Ÿ‡ป๐Ÿ‡ฆ",
+    DELIM + r"st_vincent_grenadines" + DELIM: "๐Ÿ‡ป๐Ÿ‡จ",
+    DELIM + r"venezuela" + DELIM: "๐Ÿ‡ป๐Ÿ‡ช",
+    DELIM + r"british_virgin_islands" + DELIM: "๐Ÿ‡ป๐Ÿ‡ฌ",
+    DELIM + r"us_virgin_islands" + DELIM: "๐Ÿ‡ป๐Ÿ‡ฎ",
+    DELIM + r"vietnam" + DELIM: "๐Ÿ‡ป๐Ÿ‡ณ",
+    DELIM + r"vanuatu" + DELIM: "๐Ÿ‡ป๐Ÿ‡บ",
+    DELIM + r"wallis_futuna" + DELIM: "๐Ÿ‡ผ๐Ÿ‡ซ",
+    DELIM + r"samoa" + DELIM: "๐Ÿ‡ผ๐Ÿ‡ธ",
+    DELIM + r"kosovo" + DELIM: "๐Ÿ‡ฝ๐Ÿ‡ฐ",
+    DELIM + r"yemen" + DELIM: "๐Ÿ‡พ๐Ÿ‡ช",
+    DELIM + r"mayotte" + DELIM: "๐Ÿ‡พ๐Ÿ‡น",
+    DELIM + r"south_africa" + DELIM: "๐Ÿ‡ฟ๐Ÿ‡ฆ",
+    DELIM + r"zambia" + DELIM: "๐Ÿ‡ฟ๐Ÿ‡ฒ",
+    DELIM + r"zimbabwe" + DELIM: "๐Ÿ‡ฟ๐Ÿ‡ผ",
     #
     # Subdivision Flag
     #
-    DELIM + r'england' + DELIM: '๐Ÿด๓ ง๓ ข๓ ฅ๓ ฎ๓ ง๓ ฟ',
-    DELIM + r'scotland' + DELIM: '๐Ÿด๓ ง๓ ข๓ ณ๓ ฃ๓ ด๓ ฟ',
-    DELIM + r'wales' + DELIM: '๐Ÿด๓ ง๓ ข๓ ท๓ ฌ๓ ณ๓ ฟ',
+    DELIM + r"england" + DELIM: "๐Ÿด๓ ง๓ ข๓ ฅ๓ ฎ๓ ง๓ ฟ",
+    DELIM + r"scotland" + DELIM: "๐Ÿด๓ ง๓ ข๓ ณ๓ ฃ๓ ด๓ ฟ",
+    DELIM + r"wales" + DELIM: "๐Ÿด๓ ง๓ ข๓ ท๓ ฌ๓ ณ๓ ฟ",
 }
 
 # Define our singlton
@@ -2249,10 +2151,8 @@
 
 
 def apply_emojis(content):
-    """
-    Takes the content and swaps any matched emoji's found with their
-    utf-8 encoded mapping
-    """
+    """Takes the content and swaps any matched emoji's found with their utf-8
+    encoded mapping."""
 
     global EMOJI_COMPILED_MAP
 
@@ -2260,14 +2160,13 @@ def apply_emojis(content):
         t_start = time.time()
         # Perform our compilation
         EMOJI_COMPILED_MAP = re.compile(
-            r'(' + '|'.join(EMOJI_MAP.keys()) + r')',
-            re.IGNORECASE)
-        logger.trace(
-            'Emoji engine loaded in {:.4f}s'.format((time.time() - t_start)))
+            r"(" + "|".join(EMOJI_MAP.keys()) + r")", re.IGNORECASE
+        )
+        logger.trace(f"Emoji engine loaded in {time.time() - t_start:.4f}s")
 
     try:
         return EMOJI_COMPILED_MAP.sub(lambda x: EMOJI_MAP[x.group()], content)
 
     except TypeError:
         # No change; but force string return
-        return ''
+        return ""
diff --git a/libs/apprise/exception.py b/libs/apprise/exception.py
index 216e5cc74f..aa1907722f 100644
--- a/libs/apprise/exception.py
+++ b/libs/apprise/exception.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,33 +28,36 @@
 
 
 class AppriseException(Exception):
-    """
-    Base Apprise Exception Class
-    """
+    """Base Apprise Exception Class."""
+
     def __init__(self, message, error_code=0):
         super().__init__(message)
         self.error_code = error_code
 
 
 class ApprisePluginException(AppriseException):
-    """
-    Class object for handling exceptions raised from within a plugin
-    """
+    """Class object for handling exceptions raised from within a plugin."""
+
     def __init__(self, message, error_code=600):
         super().__init__(message, error_code=error_code)
 
 
 class AppriseDiskIOError(AppriseException):
-    """
-    Thrown when an disk i/o error occurs
-    """
+    """Thrown when an disk i/o error occurs."""
+
     def __init__(self, message, error_code=errno.EIO):
         super().__init__(message, error_code=error_code)
 
 
+class AppriseInvalidData(AppriseException):
+    """Thrown when bad data was passed into an internal function."""
+
+    def __init__(self, message, error_code=errno.EINVAL):
+        super().__init__(message, error_code=error_code)
+
+
 class AppriseFileNotFound(AppriseDiskIOError, FileNotFoundError):
-    """
-    Thrown when a persistent write occured in MEMORY mode
-    """
+    """Thrown when a persistent write occured in MEMORY mode."""
+
     def __init__(self, message):
         super().__init__(message, error_code=errno.ENOENT)
diff --git a/libs/apprise/i18n/apprise.pot b/libs/apprise/i18n/apprise.pot
new file mode 100644
index 0000000000..37194e5d02
--- /dev/null
+++ b/libs/apprise/i18n/apprise.pot
@@ -0,0 +1,1762 @@
+# Translations template for PROJECT.
+# Copyright (C) 2026 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2026.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2026-03-08 16:43-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.18.0\n"
+
+#: apprise/attachment/base.py:96 apprise/url.py:141
+msgid "Verify SSL"
+msgstr ""
+
+#: apprise/url.py:151
+msgid "Socket Read Timeout"
+msgstr ""
+
+#: apprise/url.py:165
+msgid "Socket Connect Timeout"
+msgstr ""
+
+#: apprise/attachment/base.py:82
+msgid "Cache Age"
+msgstr ""
+
+#: apprise/attachment/base.py:88
+msgid "Forced Mime Type"
+msgstr ""
+
+#: apprise/attachment/base.py:92
+msgid "Forced File Name"
+msgstr ""
+
+#: apprise/attachment/file.py:41 apprise/config/file.py:41
+msgid "Local File"
+msgstr ""
+
+#: apprise/attachment/http.py:46 apprise/config/http.py:54
+msgid "Web Based"
+msgstr ""
+
+#: apprise/attachment/memory.py:44 apprise/config/memory.py:37
+msgid "Memory"
+msgstr ""
+
+#: apprise/plugins/__init__.py:280
+msgid "Schema"
+msgstr ""
+
+#: apprise/plugins/__init__.py:401
+msgid "No dependencies."
+msgstr ""
+
+#: apprise/plugins/__init__.py:404
+msgid "Packages are required to function."
+msgstr ""
+
+#: apprise/plugins/__init__.py:408
+msgid "Packages are recommended to improve functionality."
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:132
+msgid "App User Name"
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:138 apprise/plugins/brevo.py:112
+#: apprise/plugins/burstsms.py:104 apprise/plugins/clicksend.py:98
+#: apprise/plugins/dot.py:121 apprise/plugins/fcm/__init__.py:143
+#: apprise/plugins/httpsms.py:77 apprise/plugins/join.py:140
+#: apprise/plugins/kavenegar.py:115 apprise/plugins/kumulos.py:87
+#: apprise/plugins/mailgun.py:146 apprise/plugins/messagebird.py:78
+#: apprise/plugins/one_signal.py:113 apprise/plugins/opsgenie.py:236
+#: apprise/plugins/pagerduty.py:131 apprise/plugins/popcorn_notify.py:71
+#: apprise/plugins/prowl.py:121 apprise/plugins/resend.py:107
+#: apprise/plugins/sendgrid.py:116 apprise/plugins/seven.py:75
+#: apprise/plugins/simplepush.py:101 apprise/plugins/smsmanager.py:106
+#: apprise/plugins/smtp2go.py:118 apprise/plugins/sparkpost.py:169
+#: apprise/plugins/splunk.py:165 apprise/plugins/techuluspush.py:97
+#: apprise/plugins/twilio.py:197 apprise/plugins/vapid/__init__.py:152
+#: apprise/plugins/vonage.py:80
+msgid "API Key"
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:145 apprise/plugins/fortysixelks.py:106
+msgid "Target Phone"
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:150 apprise/plugins/aprs.py:187
+#: apprise/plugins/bark.py:159 apprise/plugins/brevo.py:129
+#: apprise/plugins/bulksms.py:137 apprise/plugins/bulkvs.py:110
+#: apprise/plugins/burstsms.py:131 apprise/plugins/clickatell.py:90
+#: apprise/plugins/clicksend.py:112 apprise/plugins/d7networks.py:110
+#: apprise/plugins/dapnet.py:138 apprise/plugins/dingtalk.py:111
+#: apprise/plugins/email/base.py:140 apprise/plugins/fcm/__init__.py:168
+#: apprise/plugins/flock.py:125 apprise/plugins/fortysixelks.py:111
+#: apprise/plugins/httpsms.py:97 apprise/plugins/irc/base.py:149
+#: apprise/plugins/join.py:172 apprise/plugins/kavenegar.py:135
+#: apprise/plugins/line.py:93 apprise/plugins/mailgun.py:157
+#: apprise/plugins/mastodon.py:190 apprise/plugins/matrix.py:262
+#: apprise/plugins/mattermost.py:185 apprise/plugins/messagebird.py:99
+#: apprise/plugins/mqtt.py:174 apprise/plugins/msg91.py:123
+#: apprise/plugins/nextcloud.py:148 apprise/plugins/nextcloudtalk.py:101
+#: apprise/plugins/notifiarr.py:103 apprise/plugins/notificationapi.py:187
+#: apprise/plugins/ntfy.py:241 apprise/plugins/office365.py:148
+#: apprise/plugins/one_signal.py:141 apprise/plugins/plivo.py:114
+#: apprise/plugins/popcorn_notify.py:89 apprise/plugins/pushbullet.py:105
+#: apprise/plugins/pushed.py:107 apprise/plugins/pushover.py:206
+#: apprise/plugins/pushsafer.py:376 apprise/plugins/pushy.py:97
+#: apprise/plugins/reddit.py:170 apprise/plugins/resend.py:124
+#: apprise/plugins/revolt.py:112 apprise/plugins/rocketchat.py:166
+#: apprise/plugins/sendgrid.py:133 apprise/plugins/sendpulse.py:136
+#: apprise/plugins/seven.py:88 apprise/plugins/sfr.py:113
+#: apprise/plugins/signal_api.py:138 apprise/plugins/sinch.py:140
+#: apprise/plugins/slack.py:248 apprise/plugins/smpp.py:128
+#: apprise/plugins/smseagle.py:172 apprise/plugins/smsmanager.py:119
+#: apprise/plugins/sns.py:138 apprise/plugins/telegram.py:359
+#: apprise/plugins/threema.py:115 apprise/plugins/twilio.py:174
+#: apprise/plugins/twist.py:123 apprise/plugins/twitter.py:168
+#: apprise/plugins/vapid/__init__.py:158 apprise/plugins/voipms.py:107
+#: apprise/plugins/vonage.py:108 apprise/plugins/whatsapp.py:126
+#: apprise/plugins/wxpusher.py:139 apprise/plugins/xmpp/base.py:118
+#: apprise/plugins/zulip.py:153
+msgid "Targets"
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:168
+msgid "From"
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:174 apprise/plugins/bulksms.py:170
+#: apprise/plugins/bulkvs.py:131 apprise/plugins/burstsms.py:166
+#: apprise/plugins/clicksend.py:130 apprise/plugins/d7networks.py:128
+#: apprise/plugins/dapnet.py:167 apprise/plugins/mailgun.py:194
+#: apprise/plugins/mastodon.py:215 apprise/plugins/one_signal.py:161
+#: apprise/plugins/opsgenie.py:288 apprise/plugins/plivo.py:137
+#: apprise/plugins/popcorn_notify.py:104 apprise/plugins/signal_api.py:155
+#: apprise/plugins/smseagle.py:190 apprise/plugins/smsmanager.py:152
+#: apprise/plugins/smtp2go.py:151 apprise/plugins/sparkpost.py:209
+#: apprise/plugins/twitter.py:193
+msgid "Batch Mode"
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:179
+msgid "SMS Mode"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:102 apprise/plugins/bark.py:134
+#: apprise/plugins/custom_form.py:121 apprise/plugins/custom_json.py:103
+#: apprise/plugins/custom_xml.py:103 apprise/plugins/emby.py:85
+#: apprise/plugins/enigma2.py:110 apprise/plugins/fluxer.py:159
+#: apprise/plugins/gotify.py:129 apprise/plugins/growl.py:140
+#: apprise/plugins/home_assistant.py:79 apprise/plugins/irc/base.py:117
+#: apprise/plugins/lametric.py:460 apprise/plugins/mastodon.py:168
+#: apprise/plugins/matrix.py:220 apprise/plugins/mattermost.py:151
+#: apprise/plugins/misskey.py:117 apprise/plugins/mqtt.py:147
+#: apprise/plugins/nextcloud.py:116 apprise/plugins/nextcloudtalk.py:74
+#: apprise/plugins/notica.py:126 apprise/plugins/ntfy.py:211
+#: apprise/plugins/parseplatform.py:90 apprise/plugins/pushdeer.py:75
+#: apprise/plugins/pushjet.py:71 apprise/plugins/rocketchat.py:120
+#: apprise/plugins/rsyslog.py:180 apprise/plugins/signal_api.py:97
+#: apprise/plugins/smseagle.py:135 apprise/plugins/synology.py:83
+#: apprise/plugins/workflows.py:125 apprise/plugins/xbmc.py:96
+#: apprise/plugins/xmpp/base.py:96
+msgid "Hostname"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:107 apprise/plugins/bark.py:139
+#: apprise/plugins/custom_form.py:126 apprise/plugins/custom_json.py:108
+#: apprise/plugins/custom_xml.py:108 apprise/plugins/email/base.py:129
+#: apprise/plugins/emby.py:90 apprise/plugins/enigma2.py:115
+#: apprise/plugins/fluxer.py:163 apprise/plugins/gotify.py:140
+#: apprise/plugins/growl.py:145 apprise/plugins/home_assistant.py:84
+#: apprise/plugins/irc/base.py:122 apprise/plugins/lametric.py:464
+#: apprise/plugins/mastodon.py:178 apprise/plugins/matrix.py:224
+#: apprise/plugins/mattermost.py:167 apprise/plugins/misskey.py:127
+#: apprise/plugins/mqtt.py:152 apprise/plugins/nextcloud.py:121
+#: apprise/plugins/nextcloudtalk.py:79 apprise/plugins/notica.py:130
+#: apprise/plugins/ntfy.py:215 apprise/plugins/parseplatform.py:95
+#: apprise/plugins/pushdeer.py:79 apprise/plugins/pushjet.py:76
+#: apprise/plugins/rocketchat.py:125 apprise/plugins/rsyslog.py:185
+#: apprise/plugins/signal_api.py:102 apprise/plugins/smpp.py:108
+#: apprise/plugins/smseagle.py:140 apprise/plugins/synology.py:88
+#: apprise/plugins/workflows.py:130 apprise/plugins/xbmc.py:101
+#: apprise/plugins/xmpp/base.py:101
+msgid "Port"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:113 apprise/plugins/bark.py:145
+#: apprise/plugins/bluesky.py:119 apprise/plugins/custom_form.py:132
+#: apprise/plugins/custom_json.py:114 apprise/plugins/custom_xml.py:114
+#: apprise/plugins/emby.py:97 apprise/plugins/enigma2.py:121
+#: apprise/plugins/freemobile.py:78 apprise/plugins/home_assistant.py:90
+#: apprise/plugins/lametric.py:471 apprise/plugins/matrix.py:230
+#: apprise/plugins/nextcloud.py:127 apprise/plugins/nextcloudtalk.py:85
+#: apprise/plugins/notica.py:136 apprise/plugins/ntfy.py:221
+#: apprise/plugins/opsgenie.py:242 apprise/plugins/pushjet.py:88
+#: apprise/plugins/rocketchat.py:131 apprise/plugins/signal_api.py:108
+#: apprise/plugins/smpp.py:92 apprise/plugins/synology.py:94
+#: apprise/plugins/xbmc.py:107
+msgid "Username"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:117 apprise/plugins/aprs.py:172
+#: apprise/plugins/bark.py:149 apprise/plugins/bluesky.py:124
+#: apprise/plugins/bulksms.py:117 apprise/plugins/bulkvs.py:90
+#: apprise/plugins/custom_form.py:136 apprise/plugins/custom_json.py:118
+#: apprise/plugins/custom_xml.py:118 apprise/plugins/dapnet.py:123
+#: apprise/plugins/email/base.py:119 apprise/plugins/emby.py:101
+#: apprise/plugins/enigma2.py:125 apprise/plugins/freemobile.py:83
+#: apprise/plugins/growl.py:151 apprise/plugins/home_assistant.py:94
+#: apprise/plugins/irc/base.py:132 apprise/plugins/matrix.py:234
+#: apprise/plugins/mqtt.py:163 apprise/plugins/nextcloud.py:131
+#: apprise/plugins/nextcloudtalk.py:90 apprise/plugins/notica.py:140
+#: apprise/plugins/ntfy.py:225 apprise/plugins/pushjet.py:92
+#: apprise/plugins/reddit.py:145 apprise/plugins/rocketchat.py:135
+#: apprise/plugins/signal_api.py:112 apprise/plugins/simplepush.py:108
+#: apprise/plugins/smpp.py:97 apprise/plugins/synology.py:98
+#: apprise/plugins/twist.py:101 apprise/plugins/voipms.py:88
+#: apprise/plugins/xbmc.py:111 apprise/plugins/xmpp/base.py:112
+msgid "Password"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:122 apprise/plugins/chanify.py:74
+#: apprise/plugins/dingtalk.py:93 apprise/plugins/feishu.py:80
+#: apprise/plugins/gotify.py:123 apprise/plugins/mattermost.py:157
+#: apprise/plugins/notica.py:119 apprise/plugins/notifiarr.py:91
+#: apprise/plugins/ntfy.py:230 apprise/plugins/pushme.py:62
+#: apprise/plugins/ryver.py:99 apprise/plugins/serverchan.py:70
+#: apprise/plugins/slack.py:294 apprise/plugins/synology.py:103
+#: apprise/plugins/webexteams.py:116 apprise/plugins/zulip.py:136
+msgid "Token"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:136 apprise/plugins/ntfy.py:288
+#: apprise/plugins/opsgenie.py:307 apprise/plugins/pagertree.py:133
+msgid "Tags"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:140
+msgid "Query Method"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:154 apprise/plugins/custom_form.py:165
+#: apprise/plugins/custom_json.py:141 apprise/plugins/custom_xml.py:141
+#: apprise/plugins/enigma2.py:153 apprise/plugins/nextcloud.py:181
+#: apprise/plugins/nextcloudtalk.py:122 apprise/plugins/notica.py:156
+#: apprise/plugins/pagertree.py:142 apprise/plugins/synology.py:128
+msgid "HTTP Header"
+msgstr ""
+
+#: apprise/plugins/aprs.py:167 apprise/plugins/bulksms.py:112
+#: apprise/plugins/bulkvs.py:85 apprise/plugins/clicksend.py:93
+#: apprise/plugins/dapnet.py:118 apprise/plugins/email/base.py:115
+#: apprise/plugins/mailgun.py:136 apprise/plugins/mqtt.py:158
+#: apprise/plugins/reddit.py:140 apprise/plugins/sendpulse.py:108
+#: apprise/plugins/smtp2go.py:108 apprise/plugins/sparkpost.py:159
+msgid "User Name"
+msgstr ""
+
+#: apprise/plugins/aprs.py:178 apprise/plugins/aprs.py:199
+#: apprise/plugins/dapnet.py:129 apprise/plugins/dapnet.py:150
+msgid "Target Callsign"
+msgstr ""
+
+#: apprise/plugins/aprs.py:204
+msgid "Resend Delay"
+msgstr ""
+
+#: apprise/plugins/aprs.py:211
+msgid "Locale"
+msgstr ""
+
+#: apprise/plugins/bark.py:154 apprise/plugins/fcm/__init__.py:157
+#: apprise/plugins/pushbullet.py:89 apprise/plugins/pushover.py:200
+#: apprise/plugins/pushsafer.py:366 apprise/plugins/pushy.py:85
+msgid "Target Device"
+msgstr ""
+
+#: apprise/plugins/bark.py:174 apprise/plugins/lametric.py:516
+#: apprise/plugins/macosx.py:124 apprise/plugins/pushover.py:223
+#: apprise/plugins/pushsafer.py:392 apprise/plugins/pushy.py:110
+msgid "Sound"
+msgstr ""
+
+#: apprise/plugins/bark.py:179
+msgid "Level"
+msgstr ""
+
+#: apprise/plugins/bark.py:184
+msgid "Volume"
+msgstr ""
+
+#: apprise/plugins/bark.py:190 apprise/plugins/ntfy.py:270
+#: apprise/plugins/pagerduty.py:172
+msgid "Click"
+msgstr ""
+
+#: apprise/plugins/bark.py:194 apprise/plugins/pushy.py:114
+msgid "Badge"
+msgstr ""
+
+#: apprise/plugins/bark.py:199
+msgid "Category"
+msgstr ""
+
+#: apprise/plugins/bark.py:203 apprise/plugins/join.py:158
+#: apprise/plugins/pagerduty.py:163
+msgid "Group"
+msgstr ""
+
+#: apprise/plugins/bark.py:207 apprise/plugins/dbus.py:225
+#: apprise/plugins/discord.py:196 apprise/plugins/fcm/__init__.py:197
+#: apprise/plugins/flock.py:136 apprise/plugins/fluxer.py:250
+#: apprise/plugins/glib.py:187 apprise/plugins/gnome.py:154
+#: apprise/plugins/growl.py:175 apprise/plugins/join.py:182
+#: apprise/plugins/line.py:108 apprise/plugins/macosx.py:115
+#: apprise/plugins/matrix.py:273 apprise/plugins/mattermost.py:211
+#: apprise/plugins/msteams.py:200 apprise/plugins/notifiarr.py:125
+#: apprise/plugins/ntfy.py:256 apprise/plugins/one_signal.py:155
+#: apprise/plugins/pagerduty.py:191 apprise/plugins/ryver.py:124
+#: apprise/plugins/slack.py:259 apprise/plugins/telegram.py:370
+#: apprise/plugins/vapid/__init__.py:204 apprise/plugins/windows.py:106
+#: apprise/plugins/workflows.py:162 apprise/plugins/xbmc.py:129
+msgid "Include Image"
+msgstr ""
+
+#: apprise/plugins/bark.py:213 apprise/plugins/mattermost.py:207
+#: apprise/plugins/revolt.py:128
+msgid "Icon URL"
+msgstr ""
+
+#: apprise/plugins/bark.py:217 apprise/plugins/streamlabs.py:119
+msgid "Call"
+msgstr ""
+
+#: apprise/plugins/base.py:192
+msgid "Overflow Mode"
+msgstr ""
+
+#: apprise/plugins/base.py:207
+msgid "Notify Format"
+msgstr ""
+
+#: apprise/plugins/base.py:217
+msgid "Interpret Emojis"
+msgstr ""
+
+#: apprise/plugins/base.py:227
+msgid "Persistent Storage"
+msgstr ""
+
+#: apprise/plugins/base.py:237
+msgid "Timezone"
+msgstr ""
+
+#: apprise/plugins/brevo.py:119 apprise/plugins/resend.py:114
+#: apprise/plugins/sendgrid.py:123
+msgid "Source Email"
+msgstr ""
+
+#: apprise/plugins/brevo.py:124 apprise/plugins/email/base.py:135
+#: apprise/plugins/mailgun.py:152 apprise/plugins/notificationapi.py:172
+#: apprise/plugins/office365.py:143 apprise/plugins/one_signal.py:124
+#: apprise/plugins/popcorn_notify.py:84 apprise/plugins/pushbullet.py:100
+#: apprise/plugins/pushsafer.py:371 apprise/plugins/resend.py:119
+#: apprise/plugins/sendgrid.py:128 apprise/plugins/sendpulse.py:131
+#: apprise/plugins/slack.py:231 apprise/plugins/threema.py:105
+msgid "Target Email"
+msgstr ""
+
+#: apprise/plugins/brevo.py:143 apprise/plugins/email/base.py:165
+#: apprise/plugins/mailgun.py:186 apprise/plugins/notificationapi.py:218
+#: apprise/plugins/office365.py:162 apprise/plugins/resend.py:138
+#: apprise/plugins/sendgrid.py:147 apprise/plugins/sendpulse.py:152
+#: apprise/plugins/ses.py:206 apprise/plugins/smtp2go.py:143
+#: apprise/plugins/sparkpost.py:201
+msgid "Carbon Copy"
+msgstr ""
+
+#: apprise/plugins/brevo.py:147 apprise/plugins/email/base.py:169
+#: apprise/plugins/mailgun.py:190 apprise/plugins/notificationapi.py:222
+#: apprise/plugins/office365.py:166 apprise/plugins/resend.py:142
+#: apprise/plugins/sendgrid.py:151 apprise/plugins/sendpulse.py:156
+#: apprise/plugins/ses.py:210 apprise/plugins/smtp2go.py:147
+#: apprise/plugins/sparkpost.py:205
+msgid "Blind Carbon Copy"
+msgstr ""
+
+#: apprise/plugins/brevo.py:151 apprise/plugins/ses.py:196
+msgid "Reply To Email"
+msgstr ""
+
+#: apprise/plugins/bulksms.py:123 apprise/plugins/bulkvs.py:103
+#: apprise/plugins/burstsms.py:124 apprise/plugins/clickatell.py:83
+#: apprise/plugins/clicksend.py:105 apprise/plugins/d7networks.py:103
+#: apprise/plugins/dingtalk.py:106 apprise/plugins/httpsms.py:90
+#: apprise/plugins/kavenegar.py:128 apprise/plugins/messagebird.py:92
+#: apprise/plugins/msg91.py:116 apprise/plugins/plivo.py:107
+#: apprise/plugins/popcorn_notify.py:77 apprise/plugins/seven.py:81
+#: apprise/plugins/signal_api.py:124 apprise/plugins/sinch.py:127
+#: apprise/plugins/smpp.py:121 apprise/plugins/smseagle.py:151
+#: apprise/plugins/smsmanager.py:112 apprise/plugins/sns.py:125
+#: apprise/plugins/threema.py:98 apprise/plugins/twilio.py:161
+#: apprise/plugins/voipms.py:100 apprise/plugins/vonage.py:101
+#: apprise/plugins/whatsapp.py:119
+msgid "Target Phone No"
+msgstr ""
+
+#: apprise/plugins/bulksms.py:130 apprise/plugins/nextcloud.py:142
+msgid "Target Group"
+msgstr ""
+
+#: apprise/plugins/bulksms.py:152 apprise/plugins/bulkvs.py:96
+#: apprise/plugins/bulkvs.py:125 apprise/plugins/clickatell.py:78
+#: apprise/plugins/fortysixelks.py:100 apprise/plugins/httpsms.py:83
+#: apprise/plugins/httpsms.py:115 apprise/plugins/signal_api.py:117
+#: apprise/plugins/sinch.py:120 apprise/plugins/smpp.py:114
+#: apprise/plugins/smsmanager.py:137 apprise/plugins/twilio.py:154
+#: apprise/plugins/voipms.py:94 apprise/plugins/vonage.py:94
+msgid "From Phone No"
+msgstr ""
+
+#: apprise/plugins/bulksms.py:158
+msgid "Route Group"
+msgstr ""
+
+#: apprise/plugins/bulksms.py:165 apprise/plugins/d7networks.py:123
+msgid "Unicode Characters"
+msgstr ""
+
+#: apprise/plugins/burstsms.py:111 apprise/plugins/threema.py:92
+#: apprise/plugins/vonage.py:87
+msgid "API Secret"
+msgstr ""
+
+#: apprise/plugins/burstsms.py:118
+msgid "Sender ID"
+msgstr ""
+
+#: apprise/plugins/burstsms.py:155
+msgid "Country"
+msgstr ""
+
+#: apprise/plugins/burstsms.py:164
+msgid "validity"
+msgstr ""
+
+#: apprise/plugins/chanify.py:47
+msgid "Chanify"
+msgstr ""
+
+#: apprise/plugins/clickatell.py:45
+msgid "Clickatell"
+msgstr ""
+
+#: apprise/plugins/clickatell.py:72 apprise/plugins/rocketchat.py:140
+msgid "API Token"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:148 apprise/plugins/custom_json.py:130
+#: apprise/plugins/custom_xml.py:130
+msgid "Fetch Method"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:154
+msgid "Attach File As"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:169 apprise/plugins/custom_json.py:145
+#: apprise/plugins/custom_xml.py:145 apprise/plugins/pagertree.py:146
+msgid "Payload Extras"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:173 apprise/plugins/custom_json.py:149
+#: apprise/plugins/custom_xml.py:149
+msgid "GET Params"
+msgstr ""
+
+#: apprise/plugins/d7networks.py:97
+msgid "API Access Token"
+msgstr ""
+
+#: apprise/plugins/d7networks.py:141 apprise/plugins/seven.py:107
+msgid "Originating Address"
+msgstr ""
+
+#: apprise/plugins/dapnet.py:155 apprise/plugins/gotify.py:153
+#: apprise/plugins/growl.py:163 apprise/plugins/join.py:188
+#: apprise/plugins/lametric.py:494 apprise/plugins/ntfy.py:282
+#: apprise/plugins/opsgenie.py:293 apprise/plugins/prowl.py:141
+#: apprise/plugins/pushover.py:217 apprise/plugins/pushsafer.py:387
+#: apprise/plugins/smseagle.py:210
+msgid "Priority"
+msgstr ""
+
+#: apprise/plugins/dapnet.py:161
+msgid "Transmitter Groups"
+msgstr ""
+
+#: apprise/plugins/dbus.py:153
+msgid "libdbus-1.so.x must be installed."
+msgstr ""
+
+#: apprise/plugins/dbus.py:157 apprise/plugins/glib.py:126
+msgid "DBus Notification"
+msgstr ""
+
+#: apprise/plugins/dbus.py:201 apprise/plugins/glib.py:163
+#: apprise/plugins/gnome.py:142 apprise/plugins/pagertree.py:128
+msgid "Urgency"
+msgstr ""
+
+#: apprise/plugins/dbus.py:213 apprise/plugins/glib.py:175
+msgid "X-Axis"
+msgstr ""
+
+#: apprise/plugins/dbus.py:219 apprise/plugins/glib.py:181
+msgid "Y-Axis"
+msgstr ""
+
+#: apprise/plugins/dingtalk.py:100 apprise/plugins/signl4.py:76
+msgid "Secret"
+msgstr ""
+
+#: apprise/plugins/discord.py:125 apprise/plugins/flock.py:106
+#: apprise/plugins/fluxer.py:169 apprise/plugins/ryver.py:106
+#: apprise/plugins/slack.py:186 apprise/plugins/viber.py:95
+#: apprise/plugins/zulip.py:124
+msgid "Bot Name"
+msgstr ""
+
+#: apprise/plugins/discord.py:130 apprise/plugins/fluxer.py:174
+#: apprise/plugins/ifttt.py:103
+msgid "Webhook ID"
+msgstr ""
+
+#: apprise/plugins/discord.py:136 apprise/plugins/fluxer.py:181
+#: apprise/plugins/google_chat.py:118
+msgid "Webhook Token"
+msgstr ""
+
+#: apprise/plugins/discord.py:149 apprise/plugins/fluxer.py:201
+msgid "Text To Speech"
+msgstr ""
+
+#: apprise/plugins/discord.py:154 apprise/plugins/fluxer.py:206
+msgid "Avatar Image"
+msgstr ""
+
+#: apprise/plugins/discord.py:159 apprise/plugins/fluxer.py:211
+#: apprise/plugins/ntfy.py:262
+msgid "Avatar URL"
+msgstr ""
+
+#: apprise/plugins/discord.py:163 apprise/plugins/fluxer.py:215
+#: apprise/plugins/pushover.py:229
+msgid "URL"
+msgstr ""
+
+#: apprise/plugins/discord.py:172 apprise/plugins/fluxer.py:222
+msgid "Thread ID"
+msgstr ""
+
+#: apprise/plugins/discord.py:176 apprise/plugins/fluxer.py:230
+msgid "Display Footer"
+msgstr ""
+
+#: apprise/plugins/discord.py:181 apprise/plugins/fluxer.py:235
+msgid "Footer Logo"
+msgstr ""
+
+#: apprise/plugins/discord.py:186 apprise/plugins/fluxer.py:240
+msgid "Use Fields"
+msgstr ""
+
+#: apprise/plugins/discord.py:191 apprise/plugins/fluxer.py:245
+msgid "Discord Flags"
+msgstr ""
+
+#: apprise/plugins/discord.py:205 apprise/plugins/fluxer.py:256
+msgid "Ping Users/Roles"
+msgstr ""
+
+#: apprise/plugins/dot.py:127
+msgid "Device Serial Number"
+msgstr ""
+
+#: apprise/plugins/dot.py:133
+msgid "API Mode"
+msgstr ""
+
+#: apprise/plugins/dot.py:147
+msgid "Refresh Now"
+msgstr ""
+
+#: apprise/plugins/dot.py:153
+msgid "Text Signature"
+msgstr ""
+
+#: apprise/plugins/dot.py:157
+msgid "Icon Base64 (Text API)"
+msgstr ""
+
+#: apprise/plugins/dot.py:161
+msgid "Image Base64 (Image API)"
+msgstr ""
+
+#: apprise/plugins/dot.py:166
+msgid "Link"
+msgstr ""
+
+#: apprise/plugins/dot.py:170
+msgid "Border"
+msgstr ""
+
+#: apprise/plugins/dot.py:177
+msgid "Dither Type"
+msgstr ""
+
+#: apprise/plugins/dot.py:183
+msgid "Dither Kernel"
+msgstr ""
+
+#: apprise/plugins/emby.py:112
+msgid "Modal"
+msgstr ""
+
+#: apprise/plugins/enigma2.py:130 apprise/plugins/gotify.py:134
+#: apprise/plugins/mattermost.py:163 apprise/plugins/notica.py:145
+msgid "Path"
+msgstr ""
+
+#: apprise/plugins/enigma2.py:140
+msgid "Server Timeout"
+msgstr ""
+
+#: apprise/plugins/feishu.py:49
+msgid "Feishu"
+msgstr ""
+
+#: apprise/plugins/flock.py:99 apprise/plugins/twitter.py:150
+msgid "Access Key"
+msgstr ""
+
+#: apprise/plugins/flock.py:111
+msgid "To User ID"
+msgstr ""
+
+#: apprise/plugins/flock.py:118
+msgid "To Channel ID"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:182 apprise/plugins/fcm/__init__.py:188
+#: apprise/plugins/fluxer.py:195 apprise/plugins/lametric.py:510
+#: apprise/plugins/mattermost.py:223 apprise/plugins/notificationapi.py:209
+#: apprise/plugins/ntfy.py:296 apprise/plugins/vapid/__init__.py:169
+msgid "Mode"
+msgstr ""
+
+#: apprise/plugins/fluxer.py:226
+msgid "Thread Name"
+msgstr ""
+
+#: apprise/plugins/fortysixelks.py:58
+msgid "46elks"
+msgstr ""
+
+#: apprise/plugins/fortysixelks.py:89
+msgid "API Username"
+msgstr ""
+
+#: apprise/plugins/fortysixelks.py:94
+msgid "API Password"
+msgstr ""
+
+#: apprise/plugins/freemobile.py:48
+msgid "Free-Mobile"
+msgstr ""
+
+#: apprise/plugins/glib.py:122
+msgid "libdbus-1.so.x or libdbus-2.so.x must be installed."
+msgstr ""
+
+#: apprise/plugins/gnome.py:100
+msgid "A local Gnome environment is required."
+msgstr ""
+
+#: apprise/plugins/gnome.py:104
+msgid "Gnome Notification"
+msgstr ""
+
+#: apprise/plugins/google_chat.py:106
+msgid "Workspace"
+msgstr ""
+
+#: apprise/plugins/google_chat.py:112
+msgid "Webhook Key"
+msgstr ""
+
+#: apprise/plugins/google_chat.py:124
+msgid "Thread Key"
+msgstr ""
+
+#: apprise/plugins/growl.py:169 apprise/plugins/mqtt.py:195
+#: apprise/plugins/msteams.py:206 apprise/plugins/nextcloud.py:163
+msgid "Version"
+msgstr ""
+
+#: apprise/plugins/growl.py:181
+msgid "Sticky"
+msgstr ""
+
+#: apprise/plugins/home_assistant.py:99
+msgid "Long-Lived Access Token"
+msgstr ""
+
+#: apprise/plugins/home_assistant.py:113
+msgid "Notification ID"
+msgstr ""
+
+#: apprise/plugins/ifttt.py:109
+msgid "Events"
+msgstr ""
+
+#: apprise/plugins/ifttt.py:129
+msgid "Add Tokens"
+msgstr ""
+
+#: apprise/plugins/ifttt.py:133
+msgid "Remove Tokens"
+msgstr ""
+
+#: apprise/plugins/join.py:147
+msgid "Device ID"
+msgstr ""
+
+#: apprise/plugins/join.py:153
+msgid "Device Name"
+msgstr ""
+
+#: apprise/plugins/kavenegar.py:122 apprise/plugins/messagebird.py:85
+#: apprise/plugins/plivo.py:100
+msgid "Source Phone No"
+msgstr ""
+
+#: apprise/plugins/kumulos.py:99
+msgid "Server Key"
+msgstr ""
+
+#: apprise/plugins/lametric.py:436
+msgid "Device API Key"
+msgstr ""
+
+#: apprise/plugins/lametric.py:442 apprise/plugins/one_signal.py:102
+#: apprise/plugins/parseplatform.py:101
+msgid "App ID"
+msgstr ""
+
+#: apprise/plugins/lametric.py:448
+msgid "App Version"
+msgstr ""
+
+#: apprise/plugins/lametric.py:455
+msgid "App Access Token"
+msgstr ""
+
+#: apprise/plugins/lametric.py:500
+msgid "Custom Icon"
+msgstr ""
+
+#: apprise/plugins/lametric.py:504
+msgid "Icon Type"
+msgstr ""
+
+#: apprise/plugins/lametric.py:521
+msgid "Cycles"
+msgstr ""
+
+#: apprise/plugins/lark.py:47
+msgid "Lark (Feishu)"
+msgstr ""
+
+#: apprise/plugins/lark.py:67 apprise/plugins/revolt.py:98
+#: apprise/plugins/telegram.py:344
+msgid "Bot Token"
+msgstr ""
+
+#: apprise/plugins/line.py:82 apprise/plugins/mastodon.py:173
+#: apprise/plugins/matrix.py:239 apprise/plugins/misskey.py:122
+#: apprise/plugins/pushbullet.py:83 apprise/plugins/pushover.py:194
+#: apprise/plugins/smseagle.py:146 apprise/plugins/spugpush.py:68
+#: apprise/plugins/streamlabs.py:105 apprise/plugins/whatsapp.py:99
+msgid "Access Token"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:137 apprise/plugins/line.py:88
+#: apprise/plugins/mastodon.py:184 apprise/plugins/matrix.py:244
+#: apprise/plugins/nextcloud.py:136 apprise/plugins/one_signal.py:129
+#: apprise/plugins/opsgenie.py:258 apprise/plugins/pushed.py:95
+#: apprise/plugins/rocketchat.py:155 apprise/plugins/slack.py:236
+#: apprise/plugins/twitter.py:162 apprise/plugins/zulip.py:143
+msgid "Target User"
+msgstr ""
+
+#: apprise/plugins/macosx.py:65
+msgid ""
+"Only works with Mac OS X 10.8 and higher. Additionally  requires that "
+"/usr/local/bin/terminal-notifier is locally accessible."
+msgstr ""
+
+#: apprise/plugins/macosx.py:72
+msgid "MacOSX Notification"
+msgstr ""
+
+#: apprise/plugins/macosx.py:128
+msgid "Open/Click URL"
+msgstr ""
+
+#: apprise/plugins/email/base.py:124 apprise/plugins/mailgun.py:141
+#: apprise/plugins/sendpulse.py:112 apprise/plugins/smtp2go.py:113
+#: apprise/plugins/sparkpost.py:164
+msgid "Domain"
+msgstr ""
+
+#: apprise/plugins/email/base.py:160 apprise/plugins/mailgun.py:168
+#: apprise/plugins/resend.py:154 apprise/plugins/ses.py:201
+#: apprise/plugins/smtp2go.py:135 apprise/plugins/sparkpost.py:186
+msgid "From Name"
+msgstr ""
+
+#: apprise/plugins/mailgun.py:176 apprise/plugins/notificationapi.py:203
+#: apprise/plugins/opsgenie.py:281 apprise/plugins/pagerduty.py:176
+#: apprise/plugins/sparkpost.py:191
+msgid "Region Name"
+msgstr ""
+
+#: apprise/plugins/email/base.py:209 apprise/plugins/mailgun.py:204
+#: apprise/plugins/smtp2go.py:161 apprise/plugins/sparkpost.py:219
+msgid "Email Header"
+msgstr ""
+
+#: apprise/plugins/mailgun.py:208 apprise/plugins/msteams.py:222
+#: apprise/plugins/notificationapi.py:246 apprise/plugins/sparkpost.py:223
+#: apprise/plugins/workflows.py:201
+msgid "Template Tokens"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:204 apprise/plugins/misskey.py:143
+msgid "Visibility"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:210 apprise/plugins/twitter.py:185
+msgid "Cache Results"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:220
+msgid "Sensitive Attachments"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:225
+msgid "Spoiler Text"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:229
+msgid "Idempotency-Key"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:233
+msgid "Language Code"
+msgstr ""
+
+#: apprise/plugins/matrix.py:250 apprise/plugins/rocketchat.py:161
+msgid "Target Room ID"
+msgstr ""
+
+#: apprise/plugins/matrix.py:256
+msgid "Target Room Alias"
+msgstr ""
+
+#: apprise/plugins/matrix.py:279
+msgid "Server Discovery"
+msgstr ""
+
+#: apprise/plugins/matrix.py:284
+msgid "Force Home Server on Room IDs"
+msgstr ""
+
+#: apprise/plugins/matrix.py:289 apprise/plugins/rocketchat.py:177
+#: apprise/plugins/ryver.py:118
+msgid "Webhook Mode"
+msgstr ""
+
+#: apprise/plugins/matrix.py:295
+msgid "Matrix API Verion"
+msgstr ""
+
+#: apprise/plugins/matrix.py:301 apprise/plugins/notificationapi.py:154
+msgid "Message Type"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:128 apprise/plugins/mattermost.py:147
+#: apprise/plugins/xmpp/base.py:107
+msgid "User"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:143 apprise/plugins/mattermost.py:173
+#: apprise/plugins/notifiarr.py:97 apprise/plugins/pushbullet.py:94
+#: apprise/plugins/pushed.py:101 apprise/plugins/rocketchat.py:149
+#: apprise/plugins/slack.py:242 apprise/plugins/twist.py:112
+msgid "Target Channel"
+msgstr ""
+
+#: apprise/plugins/mattermost.py:179 apprise/plugins/twist.py:118
+msgid "Target Channel ID"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:169
+msgid "Target Queue"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:188
+msgid "QOS"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:201 apprise/plugins/notificationapi.py:161
+#: apprise/plugins/office365.py:130 apprise/plugins/sendpulse.py:117
+msgid "Client ID"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:205
+msgid "Use Session"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:210
+msgid "Retain Messages"
+msgstr ""
+
+#: apprise/plugins/msg91.py:102 apprise/plugins/sendpulse.py:161
+msgid "Template ID"
+msgstr ""
+
+#: apprise/plugins/msg91.py:109
+msgid "Authentication Key"
+msgstr ""
+
+#: apprise/plugins/msg91.py:138
+msgid "Short URL"
+msgstr ""
+
+#: apprise/plugins/msg91.py:148 apprise/plugins/whatsapp.py:168
+msgid "Template Mapping"
+msgstr ""
+
+#: apprise/plugins/msteams.py:151
+msgid "Team Name"
+msgstr ""
+
+#: apprise/plugins/msteams.py:159 apprise/plugins/slack.py:203
+msgid "Token A"
+msgstr ""
+
+#: apprise/plugins/msteams.py:168 apprise/plugins/slack.py:211
+msgid "Token B"
+msgstr ""
+
+#: apprise/plugins/msteams.py:177 apprise/plugins/slack.py:219
+msgid "Token C"
+msgstr ""
+
+#: apprise/plugins/msteams.py:186
+msgid "Token D"
+msgstr ""
+
+#: apprise/plugins/msteams.py:212 apprise/plugins/workflows.py:180
+msgid "Template Path"
+msgstr ""
+
+#: apprise/plugins/nextcloud.py:169 apprise/plugins/nextcloudtalk.py:113
+msgid "URL Prefix"
+msgstr ""
+
+#: apprise/plugins/nextcloudtalk.py:43
+msgid "Nextcloud Talk"
+msgstr ""
+
+#: apprise/plugins/nextcloudtalk.py:96
+msgid "Room ID"
+msgstr ""
+
+#: apprise/plugins/notifiarr.py:121
+msgid "Discord Event ID"
+msgstr ""
+
+#: apprise/plugins/notifiarr.py:131 apprise/plugins/pagerduty.py:145
+msgid "Source"
+msgstr ""
+
+#: apprise/plugins/notificationapi.py:166 apprise/plugins/office365.py:137
+#: apprise/plugins/sendpulse.py:124
+msgid "Client Secret"
+msgstr ""
+
+#: apprise/plugins/notificationapi.py:177
+msgid "Target ID"
+msgstr ""
+
+#: apprise/plugins/notificationapi.py:182
+msgid "Target SMS"
+msgstr ""
+
+#: apprise/plugins/notificationapi.py:198
+msgid "Channels"
+msgstr ""
+
+#: apprise/plugins/email/base.py:185 apprise/plugins/notificationapi.py:226
+#: apprise/plugins/resend.py:146
+msgid "Reply To"
+msgstr ""
+
+#: apprise/plugins/email/base.py:155 apprise/plugins/notificationapi.py:231
+#: apprise/plugins/sendpulse.py:147 apprise/plugins/ses.py:154
+msgid "From Email"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:153 apprise/plugins/notifico.py:124
+msgid "Project ID"
+msgstr ""
+
+#: apprise/plugins/notifico.py:133
+msgid "Message Hook"
+msgstr ""
+
+#: apprise/plugins/notifico.py:148
+msgid "IRC Colors"
+msgstr ""
+
+#: apprise/plugins/notifico.py:154
+msgid "Prefix"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:235
+msgid "Topic"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:252
+msgid "Attach"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:266
+msgid "Attach Filename"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:274
+msgid "Delay"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:278 apprise/plugins/twist.py:107
+msgid "Email"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:292
+msgid "Actions"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:305
+msgid "Authentication Type"
+msgstr ""
+
+#: apprise/plugins/office365.py:118
+msgid "Tenant Domain"
+msgstr ""
+
+#: apprise/plugins/office365.py:125
+msgid "Account Email or Object ID"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:108 apprise/plugins/sendgrid.py:157
+msgid "Template"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:119
+msgid "Target Player ID"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:135
+msgid "Include Segment"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:166
+msgid "Enable Contents"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:172
+msgid "Decode Template Args"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:181
+msgid "Subtitle"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:185 apprise/plugins/sfr.py:125
+#: apprise/plugins/whatsapp.py:130
+msgid "Language"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:195
+msgid "Custom Data"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:199
+msgid "Postback Data"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:246
+msgid "Target Escalation"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:252
+msgid "Target Schedule"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:264
+msgid "Target Team"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:270
+msgid "Targets "
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:299
+msgid "Entity"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:303
+msgid "Alias"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:314 apprise/plugins/pagertree.py:118
+#: apprise/plugins/splunk.py:202
+msgid "Action"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:325
+msgid "Details"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:329 apprise/plugins/splunk.py:213
+msgid "Action Mapping"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:138 apprise/plugins/spike.py:68
+msgid "Integration Key"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:151
+msgid "Component"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:167
+msgid "Class"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:185
+msgid "Severity"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:202
+msgid "Custom Details"
+msgstr ""
+
+#: apprise/plugins/pagertree.py:105
+msgid "Integration ID"
+msgstr ""
+
+#: apprise/plugins/pagertree.py:124
+msgid "Third Party ID"
+msgstr ""
+
+#: apprise/plugins/pagertree.py:150
+msgid "Meta Extras"
+msgstr ""
+
+#: apprise/plugins/parseplatform.py:107
+msgid "Master Key"
+msgstr ""
+
+#: apprise/plugins/parseplatform.py:120
+msgid "Device"
+msgstr ""
+
+#: apprise/plugins/plivo.py:88
+msgid "Auth ID"
+msgstr ""
+
+#: apprise/plugins/plivo.py:94 apprise/plugins/sinch.py:113
+#: apprise/plugins/twilio.py:147
+msgid "Auth Token"
+msgstr ""
+
+#: apprise/plugins/prowl.py:128
+msgid "Provider Key"
+msgstr ""
+
+#: apprise/plugins/pushdeer.py:85
+msgid "Pushkey"
+msgstr ""
+
+#: apprise/plugins/pushed.py:83
+msgid "Application Key"
+msgstr ""
+
+#: apprise/plugins/pushed.py:89 apprise/plugins/reddit.py:158
+msgid "Application Secret"
+msgstr ""
+
+#: apprise/plugins/pushjet.py:82
+msgid "Secret Key"
+msgstr ""
+
+#: apprise/plugins/pushme.py:81 apprise/plugins/signal_api.py:160
+#: apprise/plugins/smseagle.py:195
+msgid "Show Status"
+msgstr ""
+
+#: apprise/plugins/pushover.py:188
+msgid "User Key"
+msgstr ""
+
+#: apprise/plugins/pushover.py:234
+msgid "URL Title"
+msgstr ""
+
+#: apprise/plugins/pushover.py:239
+msgid "Retry"
+msgstr ""
+
+#: apprise/plugins/pushover.py:245
+msgid "Expire"
+msgstr ""
+
+#: apprise/plugins/pushplus.py:48
+msgid "Pushplus"
+msgstr ""
+
+#: apprise/plugins/pushplus.py:68 apprise/plugins/qq.py:66
+msgid "User Token"
+msgstr ""
+
+#: apprise/plugins/pushsafer.py:360
+msgid "Private Key"
+msgstr ""
+
+#: apprise/plugins/pushsafer.py:397
+msgid "Vibration"
+msgstr ""
+
+#: apprise/plugins/pushy.py:79
+msgid "Secret API Key"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:162 apprise/plugins/pushy.py:91
+#: apprise/plugins/sns.py:131 apprise/plugins/wxpusher.py:128
+msgid "Target Topic"
+msgstr ""
+
+#: apprise/plugins/qq.py:46
+msgid "QQ Push"
+msgstr ""
+
+#: apprise/plugins/reddit.py:151
+msgid "Application ID"
+msgstr ""
+
+#: apprise/plugins/reddit.py:165
+msgid "Target Subreddit"
+msgstr ""
+
+#: apprise/plugins/reddit.py:185
+msgid "Kind"
+msgstr ""
+
+#: apprise/plugins/reddit.py:191
+msgid "Flair ID"
+msgstr ""
+
+#: apprise/plugins/reddit.py:196
+msgid "Flair Text"
+msgstr ""
+
+#: apprise/plugins/reddit.py:201
+msgid "NSFW"
+msgstr ""
+
+#: apprise/plugins/reddit.py:207
+msgid "Is Ad?"
+msgstr ""
+
+#: apprise/plugins/reddit.py:213
+msgid "Send Replies"
+msgstr ""
+
+#: apprise/plugins/reddit.py:219
+msgid "Is Spoiler"
+msgstr ""
+
+#: apprise/plugins/reddit.py:225
+msgid "Resubmit Flag"
+msgstr ""
+
+#: apprise/plugins/revolt.py:104
+msgid "Channel ID"
+msgstr ""
+
+#: apprise/plugins/revolt.py:130
+msgid "Embed URL"
+msgstr ""
+
+#: apprise/plugins/rocketchat.py:145
+msgid "Webhook"
+msgstr ""
+
+#: apprise/plugins/rocketchat.py:182
+msgid "Use Avatar"
+msgstr ""
+
+#: apprise/plugins/rsyslog.py:173 apprise/plugins/syslog.py:144
+msgid "Facility"
+msgstr ""
+
+#: apprise/plugins/rsyslog.py:203 apprise/plugins/syslog.py:161
+msgid "Log PID"
+msgstr ""
+
+#: apprise/plugins/ryver.py:93 apprise/plugins/zulip.py:130
+msgid "Organization"
+msgstr ""
+
+#: apprise/plugins/sendgrid.py:166 apprise/plugins/sendpulse.py:175
+msgid "Template Data"
+msgstr ""
+
+#: apprise/plugins/ses.py:160 apprise/plugins/sns.py:106
+msgid "Access Key ID"
+msgstr ""
+
+#: apprise/plugins/ses.py:166 apprise/plugins/sns.py:112
+msgid "Secret Access Key"
+msgstr ""
+
+#: apprise/plugins/ses.py:172 apprise/plugins/sinch.py:160
+#: apprise/plugins/sns.py:118
+msgid "Region"
+msgstr ""
+
+#: apprise/plugins/ses.py:179 apprise/plugins/smtp2go.py:124
+#: apprise/plugins/sparkpost.py:175
+msgid "Target Emails"
+msgstr ""
+
+#: apprise/plugins/seven.py:115 apprise/plugins/smseagle.py:205
+msgid "Flash"
+msgstr ""
+
+#: apprise/plugins/seven.py:119
+msgid "Label"
+msgstr ""
+
+#: apprise/plugins/sfr.py:58
+msgid "Sociรฉtรฉ Franรงaise du Radiotรฉlรฉphone"
+msgstr ""
+
+#: apprise/plugins/sfr.py:90
+msgid "Service ID"
+msgstr ""
+
+#: apprise/plugins/sfr.py:95
+msgid "Service Password"
+msgstr ""
+
+#: apprise/plugins/sfr.py:101
+msgid "Space ID"
+msgstr ""
+
+#: apprise/plugins/sfr.py:107
+msgid "Recipient Phone Number"
+msgstr ""
+
+#: apprise/plugins/sfr.py:131
+msgid "Sender Name"
+msgstr ""
+
+#: apprise/plugins/sfr.py:138
+msgid "Media Type"
+msgstr ""
+
+#: apprise/plugins/sfr.py:145
+msgid "Timeout"
+msgstr ""
+
+#: apprise/plugins/sfr.py:151
+msgid "TTS Voice"
+msgstr ""
+
+#: apprise/plugins/signal_api.py:131 apprise/plugins/smseagle.py:158
+msgid "Target Group ID"
+msgstr ""
+
+#: apprise/plugins/signl4.py:86
+msgid "Service"
+msgstr ""
+
+#: apprise/plugins/signl4.py:90
+msgid "Location"
+msgstr ""
+
+#: apprise/plugins/signl4.py:94
+msgid "Alerting Scenario"
+msgstr ""
+
+#: apprise/plugins/signl4.py:98
+msgid "Filtering"
+msgstr ""
+
+#: apprise/plugins/signl4.py:103
+msgid "External ID"
+msgstr ""
+
+#: apprise/plugins/signl4.py:107
+msgid "Status"
+msgstr ""
+
+#: apprise/plugins/simplepush.py:113
+msgid "Salt"
+msgstr ""
+
+#: apprise/plugins/simplepush.py:126
+msgid "Event"
+msgstr ""
+
+#: apprise/plugins/sinch.py:106 apprise/plugins/twilio.py:140
+msgid "Account SID"
+msgstr ""
+
+#: apprise/plugins/sinch.py:134 apprise/plugins/twilio.py:168
+msgid "Target Short Code"
+msgstr ""
+
+#: apprise/plugins/slack.py:194
+msgid "OAuth Access Token"
+msgstr ""
+
+#: apprise/plugins/slack.py:225
+msgid "Target Encoded ID"
+msgstr ""
+
+#: apprise/plugins/slack.py:265
+msgid "Include Footer"
+msgstr ""
+
+#: apprise/plugins/slack.py:273
+msgid "Use Blocks"
+msgstr ""
+
+#: apprise/plugins/slack.py:282
+msgid "Include Timestamp"
+msgstr ""
+
+#: apprise/plugins/slack.py:288 apprise/plugins/twitter.py:179
+msgid "Message Mode"
+msgstr ""
+
+#: apprise/plugins/smpp.py:61
+msgid "SMPP"
+msgstr ""
+
+#: apprise/plugins/smpp.py:103
+msgid "Host"
+msgstr ""
+
+#: apprise/plugins/smseagle.py:165
+msgid "Target Contact"
+msgstr ""
+
+#: apprise/plugins/smseagle.py:200
+msgid "Test Only"
+msgstr ""
+
+#: apprise/plugins/smsmanager.py:146
+msgid "Gateway"
+msgstr ""
+
+#: apprise/plugins/spike.py:48
+msgid "Spike.sh"
+msgstr ""
+
+#: apprise/plugins/splunk.py:117
+msgid "Splunk On-Call"
+msgstr ""
+
+#: apprise/plugins/splunk.py:172
+msgid "Target Routing Key"
+msgstr ""
+
+#: apprise/plugins/splunk.py:179
+msgid "Entity ID"
+msgstr ""
+
+#: apprise/plugins/spugpush.py:48
+msgid "SpugPush"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:125
+msgid "Alert Type"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:131
+msgid "Image Link"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:136
+msgid "Sound Link"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:141 apprise/plugins/windows.py:100
+#: apprise/plugins/xbmc.py:123
+msgid "Duration"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:147
+msgid "Special Text Color"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:153
+msgid "Amount"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:159
+msgid "Currency"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:165
+msgid "Name"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:171
+msgid "Identifier"
+msgstr ""
+
+#: apprise/plugins/synology.py:116
+msgid "Upload"
+msgstr ""
+
+#: apprise/plugins/syslog.py:167
+msgid "Log to STDERR"
+msgstr ""
+
+#: apprise/plugins/telegram.py:353
+msgid "Target Chat ID"
+msgstr ""
+
+#: apprise/plugins/telegram.py:376
+msgid "Detect Bot Owner"
+msgstr ""
+
+#: apprise/plugins/telegram.py:382
+msgid "Silent Notification"
+msgstr ""
+
+#: apprise/plugins/telegram.py:387
+msgid "Web Page Preview"
+msgstr ""
+
+#: apprise/plugins/telegram.py:392
+msgid "Topic Thread ID"
+msgstr ""
+
+#: apprise/plugins/telegram.py:399
+msgid "Markdown Version"
+msgstr ""
+
+#: apprise/plugins/telegram.py:408
+msgid "Content Placement"
+msgstr ""
+
+#: apprise/plugins/threema.py:85
+msgid "Gateway ID"
+msgstr ""
+
+#: apprise/plugins/threema.py:110
+msgid "Target Threema ID"
+msgstr ""
+
+#: apprise/plugins/twilio.py:203
+msgid "Notification Method: sms or call"
+msgstr ""
+
+#: apprise/plugins/twitter.py:138
+msgid "Consumer Key"
+msgstr ""
+
+#: apprise/plugins/twitter.py:144
+msgid "Consumer Secret"
+msgstr ""
+
+#: apprise/plugins/twitter.py:156
+msgid "Access Secret"
+msgstr ""
+
+#: apprise/plugins/viber.py:49
+msgid "Viber"
+msgstr ""
+
+#: apprise/plugins/viber.py:81
+msgid "Authentication Token"
+msgstr ""
+
+#: apprise/plugins/viber.py:87
+msgid "Receiver IDs"
+msgstr ""
+
+#: apprise/plugins/viber.py:101
+msgid "Bot Avatar URL"
+msgstr ""
+
+#: apprise/plugins/voipms.py:83
+msgid "User Email"
+msgstr ""
+
+#: apprise/plugins/vapid/__init__.py:179 apprise/plugins/vonage.py:136
+msgid "ttl"
+msgstr ""
+
+#: apprise/plugins/wecombot.py:99
+msgid "Bot Webhook Key"
+msgstr ""
+
+#: apprise/plugins/whatsapp.py:106
+msgid "Template Name"
+msgstr ""
+
+#: apprise/plugins/whatsapp.py:112
+msgid "From Phone ID"
+msgstr ""
+
+#: apprise/plugins/windows.py:62
+msgid "A local Microsoft Windows environment is required."
+msgstr ""
+
+#: apprise/plugins/workflows.py:137
+msgid "Workflow ID"
+msgstr ""
+
+#: apprise/plugins/workflows.py:145
+msgid "Signature"
+msgstr ""
+
+#: apprise/plugins/workflows.py:168
+msgid "Use Power Automate URL"
+msgstr ""
+
+#: apprise/plugins/workflows.py:175
+msgid "Wrap Text"
+msgstr ""
+
+#: apprise/plugins/workflows.py:190
+msgid "API Version"
+msgstr ""
+
+#: apprise/plugins/wxpusher.py:121
+msgid "App Token"
+msgstr ""
+
+#: apprise/plugins/wxpusher.py:133
+msgid "Target User ID"
+msgstr ""
+
+#: apprise/plugins/zulip.py:148
+msgid "Target Stream"
+msgstr ""
+
+#: apprise/plugins/email/base.py:150
+msgid "To Email"
+msgstr ""
+
+#: apprise/plugins/email/base.py:173
+msgid "SMTP Server"
+msgstr ""
+
+#: apprise/plugins/email/base.py:178 apprise/plugins/xmpp/base.py:129
+msgid "Secure Mode"
+msgstr ""
+
+#: apprise/plugins/email/base.py:190
+msgid "PGP Encryption"
+msgstr ""
+
+#: apprise/plugins/email/base.py:196
+msgid "PGP Public Key Path"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:148
+msgid "OAuth2 KeyFile"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:193
+msgid "Custom Image URL"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:205
+msgid "Notification Color"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:215
+msgid "Data Entries"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:159
+msgid "Real Name"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:160
+msgid "Nickname"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:162
+msgid "Join Channels"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:167
+msgid "Auth Mode"
+msgstr ""
+
+#: apprise/plugins/vapid/__init__.py:193
+msgid "PEM Private KeyFile"
+msgstr ""
+
+#: apprise/plugins/vapid/__init__.py:199
+msgid "Subscripion File"
+msgstr ""
+
+#: apprise/plugins/xmpp/base.py:136
+msgid "Get Roster"
+msgstr ""
+
+#: apprise/plugins/xmpp/base.py:141
+msgid "Use Subject"
+msgstr ""
+
+#: apprise/plugins/xmpp/base.py:146
+msgid "Keep Connection Alive"
+msgstr ""
+
diff --git a/libs/apprise/i18n/en/LC_MESSAGES/apprise.mo b/libs/apprise/i18n/en/LC_MESSAGES/apprise.mo
index 8eafd65129..01f1f728d3 100644
Binary files a/libs/apprise/i18n/en/LC_MESSAGES/apprise.mo and b/libs/apprise/i18n/en/LC_MESSAGES/apprise.mo differ
diff --git a/libs/apprise/i18n/en/LC_MESSAGES/apprise.po b/libs/apprise/i18n/en/LC_MESSAGES/apprise.po
new file mode 100644
index 0000000000..22a1923350
--- /dev/null
+++ b/libs/apprise/i18n/en/LC_MESSAGES/apprise.po
@@ -0,0 +1,1882 @@
+# English translations for apprise.
+# Copyright (C) 2026 Chris Caron
+# This file is distributed under the same license as the apprise project.
+# Chris Caron <lead2gold@gmail.com>, 2026.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apprise 1.9.8\n"
+"Report-Msgid-Bugs-To: lead2gold@gmail.com\n"
+"POT-Creation-Date: 2026-03-08 16:43-0400\n"
+"PO-Revision-Date: 2019-05-24 20:00-0400\n"
+"Last-Translator: Chris Caron <lead2gold@gmail.com>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.18.0\n"
+
+#: apprise/attachment/base.py:96 apprise/url.py:141
+msgid "Verify SSL"
+msgstr "Verify SSL"
+
+#: apprise/url.py:151
+#, fuzzy
+msgid "Socket Read Timeout"
+msgstr "Server Timeout"
+
+#: apprise/url.py:165
+#, fuzzy
+msgid "Socket Connect Timeout"
+msgstr "Server Timeout"
+
+#: apprise/attachment/base.py:82
+msgid "Cache Age"
+msgstr ""
+
+#: apprise/attachment/base.py:88
+msgid "Forced Mime Type"
+msgstr ""
+
+#: apprise/attachment/base.py:92
+msgid "Forced File Name"
+msgstr ""
+
+#: apprise/attachment/file.py:41 apprise/config/file.py:41
+msgid "Local File"
+msgstr ""
+
+#: apprise/attachment/http.py:46 apprise/config/http.py:54
+msgid "Web Based"
+msgstr ""
+
+#: apprise/attachment/memory.py:44 apprise/config/memory.py:37
+msgid "Memory"
+msgstr ""
+
+#: apprise/plugins/__init__.py:280
+msgid "Schema"
+msgstr "Schema"
+
+#: apprise/plugins/__init__.py:401
+msgid "No dependencies."
+msgstr ""
+
+#: apprise/plugins/__init__.py:404
+msgid "Packages are required to function."
+msgstr ""
+
+#: apprise/plugins/__init__.py:408
+msgid "Packages are recommended to improve functionality."
+msgstr ""
+
+#: apprise/plugins/africas_talking.py:132
+#, fuzzy
+msgid "App User Name"
+msgstr "User Name"
+
+#: apprise/plugins/africas_talking.py:138 apprise/plugins/brevo.py:112
+#: apprise/plugins/burstsms.py:104 apprise/plugins/clicksend.py:98
+#: apprise/plugins/dot.py:121 apprise/plugins/fcm/__init__.py:143
+#: apprise/plugins/httpsms.py:77 apprise/plugins/join.py:140
+#: apprise/plugins/kavenegar.py:115 apprise/plugins/kumulos.py:87
+#: apprise/plugins/mailgun.py:146 apprise/plugins/messagebird.py:78
+#: apprise/plugins/one_signal.py:113 apprise/plugins/opsgenie.py:236
+#: apprise/plugins/pagerduty.py:131 apprise/plugins/popcorn_notify.py:71
+#: apprise/plugins/prowl.py:121 apprise/plugins/resend.py:107
+#: apprise/plugins/sendgrid.py:116 apprise/plugins/seven.py:75
+#: apprise/plugins/simplepush.py:101 apprise/plugins/smsmanager.py:106
+#: apprise/plugins/smtp2go.py:118 apprise/plugins/sparkpost.py:169
+#: apprise/plugins/splunk.py:165 apprise/plugins/techuluspush.py:97
+#: apprise/plugins/twilio.py:197 apprise/plugins/vapid/__init__.py:152
+#: apprise/plugins/vonage.py:80
+msgid "API Key"
+msgstr "API Key"
+
+#: apprise/plugins/africas_talking.py:145 apprise/plugins/fortysixelks.py:106
+#, fuzzy
+msgid "Target Phone"
+msgstr "Target Phone No"
+
+#: apprise/plugins/africas_talking.py:150 apprise/plugins/aprs.py:187
+#: apprise/plugins/bark.py:159 apprise/plugins/brevo.py:129
+#: apprise/plugins/bulksms.py:137 apprise/plugins/bulkvs.py:110
+#: apprise/plugins/burstsms.py:131 apprise/plugins/clickatell.py:90
+#: apprise/plugins/clicksend.py:112 apprise/plugins/d7networks.py:110
+#: apprise/plugins/dapnet.py:138 apprise/plugins/dingtalk.py:111
+#: apprise/plugins/email/base.py:140 apprise/plugins/fcm/__init__.py:168
+#: apprise/plugins/flock.py:125 apprise/plugins/fortysixelks.py:111
+#: apprise/plugins/httpsms.py:97 apprise/plugins/irc/base.py:149
+#: apprise/plugins/join.py:172 apprise/plugins/kavenegar.py:135
+#: apprise/plugins/line.py:93 apprise/plugins/mailgun.py:157
+#: apprise/plugins/mastodon.py:190 apprise/plugins/matrix.py:262
+#: apprise/plugins/mattermost.py:185 apprise/plugins/messagebird.py:99
+#: apprise/plugins/mqtt.py:174 apprise/plugins/msg91.py:123
+#: apprise/plugins/nextcloud.py:148 apprise/plugins/nextcloudtalk.py:101
+#: apprise/plugins/notifiarr.py:103 apprise/plugins/notificationapi.py:187
+#: apprise/plugins/ntfy.py:241 apprise/plugins/office365.py:148
+#: apprise/plugins/one_signal.py:141 apprise/plugins/plivo.py:114
+#: apprise/plugins/popcorn_notify.py:89 apprise/plugins/pushbullet.py:105
+#: apprise/plugins/pushed.py:107 apprise/plugins/pushover.py:206
+#: apprise/plugins/pushsafer.py:376 apprise/plugins/pushy.py:97
+#: apprise/plugins/reddit.py:170 apprise/plugins/resend.py:124
+#: apprise/plugins/revolt.py:112 apprise/plugins/rocketchat.py:166
+#: apprise/plugins/sendgrid.py:133 apprise/plugins/sendpulse.py:136
+#: apprise/plugins/seven.py:88 apprise/plugins/sfr.py:113
+#: apprise/plugins/signal_api.py:138 apprise/plugins/sinch.py:140
+#: apprise/plugins/slack.py:248 apprise/plugins/smpp.py:128
+#: apprise/plugins/smseagle.py:172 apprise/plugins/smsmanager.py:119
+#: apprise/plugins/sns.py:138 apprise/plugins/telegram.py:359
+#: apprise/plugins/threema.py:115 apprise/plugins/twilio.py:174
+#: apprise/plugins/twist.py:123 apprise/plugins/twitter.py:168
+#: apprise/plugins/vapid/__init__.py:158 apprise/plugins/voipms.py:107
+#: apprise/plugins/vonage.py:108 apprise/plugins/whatsapp.py:126
+#: apprise/plugins/wxpusher.py:139 apprise/plugins/xmpp/base.py:118
+#: apprise/plugins/zulip.py:153
+msgid "Targets"
+msgstr "Targets"
+
+#: apprise/plugins/africas_talking.py:168
+#, fuzzy
+msgid "From"
+msgstr "Rooms"
+
+#: apprise/plugins/africas_talking.py:174 apprise/plugins/bulksms.py:170
+#: apprise/plugins/bulkvs.py:131 apprise/plugins/burstsms.py:166
+#: apprise/plugins/clicksend.py:130 apprise/plugins/d7networks.py:128
+#: apprise/plugins/dapnet.py:167 apprise/plugins/mailgun.py:194
+#: apprise/plugins/mastodon.py:215 apprise/plugins/one_signal.py:161
+#: apprise/plugins/opsgenie.py:288 apprise/plugins/plivo.py:137
+#: apprise/plugins/popcorn_notify.py:104 apprise/plugins/signal_api.py:155
+#: apprise/plugins/smseagle.py:190 apprise/plugins/smsmanager.py:152
+#: apprise/plugins/smtp2go.py:151 apprise/plugins/sparkpost.py:209
+#: apprise/plugins/twitter.py:193
+#, fuzzy
+msgid "Batch Mode"
+msgstr "Webhook Mode"
+
+#: apprise/plugins/africas_talking.py:179
+#, fuzzy
+msgid "SMS Mode"
+msgstr "Secure Mode"
+
+#: apprise/plugins/apprise_api.py:102 apprise/plugins/bark.py:134
+#: apprise/plugins/custom_form.py:121 apprise/plugins/custom_json.py:103
+#: apprise/plugins/custom_xml.py:103 apprise/plugins/emby.py:85
+#: apprise/plugins/enigma2.py:110 apprise/plugins/fluxer.py:159
+#: apprise/plugins/gotify.py:129 apprise/plugins/growl.py:140
+#: apprise/plugins/home_assistant.py:79 apprise/plugins/irc/base.py:117
+#: apprise/plugins/lametric.py:460 apprise/plugins/mastodon.py:168
+#: apprise/plugins/matrix.py:220 apprise/plugins/mattermost.py:151
+#: apprise/plugins/misskey.py:117 apprise/plugins/mqtt.py:147
+#: apprise/plugins/nextcloud.py:116 apprise/plugins/nextcloudtalk.py:74
+#: apprise/plugins/notica.py:126 apprise/plugins/ntfy.py:211
+#: apprise/plugins/parseplatform.py:90 apprise/plugins/pushdeer.py:75
+#: apprise/plugins/pushjet.py:71 apprise/plugins/rocketchat.py:120
+#: apprise/plugins/rsyslog.py:180 apprise/plugins/signal_api.py:97
+#: apprise/plugins/smseagle.py:135 apprise/plugins/synology.py:83
+#: apprise/plugins/workflows.py:125 apprise/plugins/xbmc.py:96
+#: apprise/plugins/xmpp/base.py:96
+msgid "Hostname"
+msgstr "Hostname"
+
+#: apprise/plugins/apprise_api.py:107 apprise/plugins/bark.py:139
+#: apprise/plugins/custom_form.py:126 apprise/plugins/custom_json.py:108
+#: apprise/plugins/custom_xml.py:108 apprise/plugins/email/base.py:129
+#: apprise/plugins/emby.py:90 apprise/plugins/enigma2.py:115
+#: apprise/plugins/fluxer.py:163 apprise/plugins/gotify.py:140
+#: apprise/plugins/growl.py:145 apprise/plugins/home_assistant.py:84
+#: apprise/plugins/irc/base.py:122 apprise/plugins/lametric.py:464
+#: apprise/plugins/mastodon.py:178 apprise/plugins/matrix.py:224
+#: apprise/plugins/mattermost.py:167 apprise/plugins/misskey.py:127
+#: apprise/plugins/mqtt.py:152 apprise/plugins/nextcloud.py:121
+#: apprise/plugins/nextcloudtalk.py:79 apprise/plugins/notica.py:130
+#: apprise/plugins/ntfy.py:215 apprise/plugins/parseplatform.py:95
+#: apprise/plugins/pushdeer.py:79 apprise/plugins/pushjet.py:76
+#: apprise/plugins/rocketchat.py:125 apprise/plugins/rsyslog.py:185
+#: apprise/plugins/signal_api.py:102 apprise/plugins/smpp.py:108
+#: apprise/plugins/smseagle.py:140 apprise/plugins/synology.py:88
+#: apprise/plugins/workflows.py:130 apprise/plugins/xbmc.py:101
+#: apprise/plugins/xmpp/base.py:101
+msgid "Port"
+msgstr "Port"
+
+#: apprise/plugins/apprise_api.py:113 apprise/plugins/bark.py:145
+#: apprise/plugins/bluesky.py:119 apprise/plugins/custom_form.py:132
+#: apprise/plugins/custom_json.py:114 apprise/plugins/custom_xml.py:114
+#: apprise/plugins/emby.py:97 apprise/plugins/enigma2.py:121
+#: apprise/plugins/freemobile.py:78 apprise/plugins/home_assistant.py:90
+#: apprise/plugins/lametric.py:471 apprise/plugins/matrix.py:230
+#: apprise/plugins/nextcloud.py:127 apprise/plugins/nextcloudtalk.py:85
+#: apprise/plugins/notica.py:136 apprise/plugins/ntfy.py:221
+#: apprise/plugins/opsgenie.py:242 apprise/plugins/pushjet.py:88
+#: apprise/plugins/rocketchat.py:131 apprise/plugins/signal_api.py:108
+#: apprise/plugins/smpp.py:92 apprise/plugins/synology.py:94
+#: apprise/plugins/xbmc.py:107
+msgid "Username"
+msgstr "Username"
+
+#: apprise/plugins/apprise_api.py:117 apprise/plugins/aprs.py:172
+#: apprise/plugins/bark.py:149 apprise/plugins/bluesky.py:124
+#: apprise/plugins/bulksms.py:117 apprise/plugins/bulkvs.py:90
+#: apprise/plugins/custom_form.py:136 apprise/plugins/custom_json.py:118
+#: apprise/plugins/custom_xml.py:118 apprise/plugins/dapnet.py:123
+#: apprise/plugins/email/base.py:119 apprise/plugins/emby.py:101
+#: apprise/plugins/enigma2.py:125 apprise/plugins/freemobile.py:83
+#: apprise/plugins/growl.py:151 apprise/plugins/home_assistant.py:94
+#: apprise/plugins/irc/base.py:132 apprise/plugins/matrix.py:234
+#: apprise/plugins/mqtt.py:163 apprise/plugins/nextcloud.py:131
+#: apprise/plugins/nextcloudtalk.py:90 apprise/plugins/notica.py:140
+#: apprise/plugins/ntfy.py:225 apprise/plugins/pushjet.py:92
+#: apprise/plugins/reddit.py:145 apprise/plugins/rocketchat.py:135
+#: apprise/plugins/signal_api.py:112 apprise/plugins/simplepush.py:108
+#: apprise/plugins/smpp.py:97 apprise/plugins/synology.py:98
+#: apprise/plugins/twist.py:101 apprise/plugins/voipms.py:88
+#: apprise/plugins/xbmc.py:111 apprise/plugins/xmpp/base.py:112
+msgid "Password"
+msgstr "Password"
+
+#: apprise/plugins/apprise_api.py:122 apprise/plugins/chanify.py:74
+#: apprise/plugins/dingtalk.py:93 apprise/plugins/feishu.py:80
+#: apprise/plugins/gotify.py:123 apprise/plugins/mattermost.py:157
+#: apprise/plugins/notica.py:119 apprise/plugins/notifiarr.py:91
+#: apprise/plugins/ntfy.py:230 apprise/plugins/pushme.py:62
+#: apprise/plugins/ryver.py:99 apprise/plugins/serverchan.py:70
+#: apprise/plugins/slack.py:294 apprise/plugins/synology.py:103
+#: apprise/plugins/webexteams.py:116 apprise/plugins/zulip.py:136
+msgid "Token"
+msgstr "Token"
+
+#: apprise/plugins/apprise_api.py:136 apprise/plugins/ntfy.py:288
+#: apprise/plugins/opsgenie.py:307 apprise/plugins/pagertree.py:133
+#, fuzzy
+msgid "Tags"
+msgstr "Targets"
+
+#: apprise/plugins/apprise_api.py:140
+msgid "Query Method"
+msgstr ""
+
+#: apprise/plugins/apprise_api.py:154 apprise/plugins/custom_form.py:165
+#: apprise/plugins/custom_json.py:141 apprise/plugins/custom_xml.py:141
+#: apprise/plugins/enigma2.py:153 apprise/plugins/nextcloud.py:181
+#: apprise/plugins/nextcloudtalk.py:122 apprise/plugins/notica.py:156
+#: apprise/plugins/pagertree.py:142 apprise/plugins/synology.py:128
+msgid "HTTP Header"
+msgstr "HTTP Header"
+
+#: apprise/plugins/aprs.py:167 apprise/plugins/bulksms.py:112
+#: apprise/plugins/bulkvs.py:85 apprise/plugins/clicksend.py:93
+#: apprise/plugins/dapnet.py:118 apprise/plugins/email/base.py:115
+#: apprise/plugins/mailgun.py:136 apprise/plugins/mqtt.py:158
+#: apprise/plugins/reddit.py:140 apprise/plugins/sendpulse.py:108
+#: apprise/plugins/smtp2go.py:108 apprise/plugins/sparkpost.py:159
+msgid "User Name"
+msgstr "User Name"
+
+#: apprise/plugins/aprs.py:178 apprise/plugins/aprs.py:199
+#: apprise/plugins/dapnet.py:129 apprise/plugins/dapnet.py:150
+#, fuzzy
+msgid "Target Callsign"
+msgstr "Target Emails"
+
+#: apprise/plugins/aprs.py:204
+msgid "Resend Delay"
+msgstr ""
+
+#: apprise/plugins/aprs.py:211
+msgid "Locale"
+msgstr ""
+
+#: apprise/plugins/bark.py:154 apprise/plugins/fcm/__init__.py:157
+#: apprise/plugins/pushbullet.py:89 apprise/plugins/pushover.py:200
+#: apprise/plugins/pushsafer.py:366 apprise/plugins/pushy.py:85
+msgid "Target Device"
+msgstr "Target Device"
+
+#: apprise/plugins/bark.py:174 apprise/plugins/lametric.py:516
+#: apprise/plugins/macosx.py:124 apprise/plugins/pushover.py:223
+#: apprise/plugins/pushsafer.py:392 apprise/plugins/pushy.py:110
+msgid "Sound"
+msgstr "Sound"
+
+#: apprise/plugins/bark.py:179
+msgid "Level"
+msgstr ""
+
+#: apprise/plugins/bark.py:184
+msgid "Volume"
+msgstr ""
+
+#: apprise/plugins/bark.py:190 apprise/plugins/ntfy.py:270
+#: apprise/plugins/pagerduty.py:172
+msgid "Click"
+msgstr ""
+
+#: apprise/plugins/bark.py:194 apprise/plugins/pushy.py:114
+msgid "Badge"
+msgstr ""
+
+#: apprise/plugins/bark.py:199
+msgid "Category"
+msgstr ""
+
+#: apprise/plugins/bark.py:203 apprise/plugins/join.py:158
+#: apprise/plugins/pagerduty.py:163
+msgid "Group"
+msgstr "Group"
+
+#: apprise/plugins/bark.py:207 apprise/plugins/dbus.py:225
+#: apprise/plugins/discord.py:196 apprise/plugins/fcm/__init__.py:197
+#: apprise/plugins/flock.py:136 apprise/plugins/fluxer.py:250
+#: apprise/plugins/glib.py:187 apprise/plugins/gnome.py:154
+#: apprise/plugins/growl.py:175 apprise/plugins/join.py:182
+#: apprise/plugins/line.py:108 apprise/plugins/macosx.py:115
+#: apprise/plugins/matrix.py:273 apprise/plugins/mattermost.py:211
+#: apprise/plugins/msteams.py:200 apprise/plugins/notifiarr.py:125
+#: apprise/plugins/ntfy.py:256 apprise/plugins/one_signal.py:155
+#: apprise/plugins/pagerduty.py:191 apprise/plugins/ryver.py:124
+#: apprise/plugins/slack.py:259 apprise/plugins/telegram.py:370
+#: apprise/plugins/vapid/__init__.py:204 apprise/plugins/windows.py:106
+#: apprise/plugins/workflows.py:162 apprise/plugins/xbmc.py:129
+msgid "Include Image"
+msgstr "Include Image"
+
+#: apprise/plugins/bark.py:213 apprise/plugins/mattermost.py:207
+#: apprise/plugins/revolt.py:128
+msgid "Icon URL"
+msgstr ""
+
+#: apprise/plugins/bark.py:217 apprise/plugins/streamlabs.py:119
+msgid "Call"
+msgstr ""
+
+#: apprise/plugins/base.py:192
+msgid "Overflow Mode"
+msgstr "Overflow Mode"
+
+#: apprise/plugins/base.py:207
+msgid "Notify Format"
+msgstr "Notify Format"
+
+#: apprise/plugins/base.py:217
+#, fuzzy
+msgid "Interpret Emojis"
+msgstr "Target Emails"
+
+#: apprise/plugins/base.py:227
+msgid "Persistent Storage"
+msgstr ""
+
+#: apprise/plugins/base.py:237
+#, fuzzy
+msgid "Timezone"
+msgstr "Server Timeout"
+
+#: apprise/plugins/brevo.py:119 apprise/plugins/resend.py:114
+#: apprise/plugins/sendgrid.py:123
+#, fuzzy
+msgid "Source Email"
+msgstr "Source JID"
+
+#: apprise/plugins/brevo.py:124 apprise/plugins/email/base.py:135
+#: apprise/plugins/mailgun.py:152 apprise/plugins/notificationapi.py:172
+#: apprise/plugins/office365.py:143 apprise/plugins/one_signal.py:124
+#: apprise/plugins/popcorn_notify.py:84 apprise/plugins/pushbullet.py:100
+#: apprise/plugins/pushsafer.py:371 apprise/plugins/resend.py:119
+#: apprise/plugins/sendgrid.py:128 apprise/plugins/sendpulse.py:131
+#: apprise/plugins/slack.py:231 apprise/plugins/threema.py:105
+msgid "Target Email"
+msgstr "Target Email"
+
+#: apprise/plugins/brevo.py:143 apprise/plugins/email/base.py:165
+#: apprise/plugins/mailgun.py:186 apprise/plugins/notificationapi.py:218
+#: apprise/plugins/office365.py:162 apprise/plugins/resend.py:138
+#: apprise/plugins/sendgrid.py:147 apprise/plugins/sendpulse.py:152
+#: apprise/plugins/ses.py:206 apprise/plugins/smtp2go.py:143
+#: apprise/plugins/sparkpost.py:201
+msgid "Carbon Copy"
+msgstr ""
+
+#: apprise/plugins/brevo.py:147 apprise/plugins/email/base.py:169
+#: apprise/plugins/mailgun.py:190 apprise/plugins/notificationapi.py:222
+#: apprise/plugins/office365.py:166 apprise/plugins/resend.py:142
+#: apprise/plugins/sendgrid.py:151 apprise/plugins/sendpulse.py:156
+#: apprise/plugins/ses.py:210 apprise/plugins/smtp2go.py:147
+#: apprise/plugins/sparkpost.py:205
+msgid "Blind Carbon Copy"
+msgstr ""
+
+#: apprise/plugins/brevo.py:151 apprise/plugins/ses.py:196
+#, fuzzy
+msgid "Reply To Email"
+msgstr "To Email"
+
+#: apprise/plugins/bulksms.py:123 apprise/plugins/bulkvs.py:103
+#: apprise/plugins/burstsms.py:124 apprise/plugins/clickatell.py:83
+#: apprise/plugins/clicksend.py:105 apprise/plugins/d7networks.py:103
+#: apprise/plugins/dingtalk.py:106 apprise/plugins/httpsms.py:90
+#: apprise/plugins/kavenegar.py:128 apprise/plugins/messagebird.py:92
+#: apprise/plugins/msg91.py:116 apprise/plugins/plivo.py:107
+#: apprise/plugins/popcorn_notify.py:77 apprise/plugins/seven.py:81
+#: apprise/plugins/signal_api.py:124 apprise/plugins/sinch.py:127
+#: apprise/plugins/smpp.py:121 apprise/plugins/smseagle.py:151
+#: apprise/plugins/smsmanager.py:112 apprise/plugins/sns.py:125
+#: apprise/plugins/threema.py:98 apprise/plugins/twilio.py:161
+#: apprise/plugins/voipms.py:100 apprise/plugins/vonage.py:101
+#: apprise/plugins/whatsapp.py:119
+msgid "Target Phone No"
+msgstr "Target Phone No"
+
+#: apprise/plugins/bulksms.py:130 apprise/plugins/nextcloud.py:142
+#, fuzzy
+msgid "Target Group"
+msgstr "Target Topic"
+
+#: apprise/plugins/bulksms.py:152 apprise/plugins/bulkvs.py:96
+#: apprise/plugins/bulkvs.py:125 apprise/plugins/clickatell.py:78
+#: apprise/plugins/fortysixelks.py:100 apprise/plugins/httpsms.py:83
+#: apprise/plugins/httpsms.py:115 apprise/plugins/signal_api.py:117
+#: apprise/plugins/sinch.py:120 apprise/plugins/smpp.py:114
+#: apprise/plugins/smsmanager.py:137 apprise/plugins/twilio.py:154
+#: apprise/plugins/voipms.py:94 apprise/plugins/vonage.py:94
+msgid "From Phone No"
+msgstr "From Phone No"
+
+#: apprise/plugins/bulksms.py:158
+#, fuzzy
+msgid "Route Group"
+msgstr "Group"
+
+#: apprise/plugins/bulksms.py:165 apprise/plugins/d7networks.py:123
+msgid "Unicode Characters"
+msgstr ""
+
+#: apprise/plugins/burstsms.py:111 apprise/plugins/threema.py:92
+#: apprise/plugins/vonage.py:87
+#, fuzzy
+msgid "API Secret"
+msgstr "Application Secret"
+
+#: apprise/plugins/burstsms.py:118
+#, fuzzy
+msgid "Sender ID"
+msgstr "To User ID"
+
+#: apprise/plugins/burstsms.py:155
+msgid "Country"
+msgstr ""
+
+#: apprise/plugins/burstsms.py:164
+msgid "validity"
+msgstr ""
+
+#: apprise/plugins/chanify.py:47
+msgid "Chanify"
+msgstr ""
+
+#: apprise/plugins/clickatell.py:45
+msgid "Clickatell"
+msgstr ""
+
+#: apprise/plugins/clickatell.py:72 apprise/plugins/rocketchat.py:140
+#, fuzzy
+msgid "API Token"
+msgstr "API Key"
+
+#: apprise/plugins/custom_form.py:148 apprise/plugins/custom_json.py:130
+#: apprise/plugins/custom_xml.py:130
+msgid "Fetch Method"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:154
+msgid "Attach File As"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:169 apprise/plugins/custom_json.py:145
+#: apprise/plugins/custom_xml.py:145 apprise/plugins/pagertree.py:146
+msgid "Payload Extras"
+msgstr ""
+
+#: apprise/plugins/custom_form.py:173 apprise/plugins/custom_json.py:149
+#: apprise/plugins/custom_xml.py:149
+msgid "GET Params"
+msgstr ""
+
+#: apprise/plugins/d7networks.py:97
+#, fuzzy
+msgid "API Access Token"
+msgstr "Access Token"
+
+#: apprise/plugins/d7networks.py:141 apprise/plugins/seven.py:107
+msgid "Originating Address"
+msgstr ""
+
+#: apprise/plugins/dapnet.py:155 apprise/plugins/gotify.py:153
+#: apprise/plugins/growl.py:163 apprise/plugins/join.py:188
+#: apprise/plugins/lametric.py:494 apprise/plugins/ntfy.py:282
+#: apprise/plugins/opsgenie.py:293 apprise/plugins/prowl.py:141
+#: apprise/plugins/pushover.py:217 apprise/plugins/pushsafer.py:387
+#: apprise/plugins/smseagle.py:210
+msgid "Priority"
+msgstr "Priority"
+
+#: apprise/plugins/dapnet.py:161
+msgid "Transmitter Groups"
+msgstr ""
+
+#: apprise/plugins/dbus.py:153
+msgid "libdbus-1.so.x must be installed."
+msgstr ""
+
+#: apprise/plugins/dbus.py:157 apprise/plugins/glib.py:126
+msgid "DBus Notification"
+msgstr ""
+
+#: apprise/plugins/dbus.py:201 apprise/plugins/glib.py:163
+#: apprise/plugins/gnome.py:142 apprise/plugins/pagertree.py:128
+msgid "Urgency"
+msgstr "Urgency"
+
+#: apprise/plugins/dbus.py:213 apprise/plugins/glib.py:175
+msgid "X-Axis"
+msgstr "X-Axis"
+
+#: apprise/plugins/dbus.py:219 apprise/plugins/glib.py:181
+msgid "Y-Axis"
+msgstr "Y-Axis"
+
+#: apprise/plugins/dingtalk.py:100 apprise/plugins/signl4.py:76
+#, fuzzy
+msgid "Secret"
+msgstr "Secret Key"
+
+#: apprise/plugins/discord.py:125 apprise/plugins/flock.py:106
+#: apprise/plugins/fluxer.py:169 apprise/plugins/ryver.py:106
+#: apprise/plugins/slack.py:186 apprise/plugins/viber.py:95
+#: apprise/plugins/zulip.py:124
+msgid "Bot Name"
+msgstr "Bot Name"
+
+#: apprise/plugins/discord.py:130 apprise/plugins/fluxer.py:174
+#: apprise/plugins/ifttt.py:103
+msgid "Webhook ID"
+msgstr "Webhook ID"
+
+#: apprise/plugins/discord.py:136 apprise/plugins/fluxer.py:181
+#: apprise/plugins/google_chat.py:118
+msgid "Webhook Token"
+msgstr "Webhook Token"
+
+#: apprise/plugins/discord.py:149 apprise/plugins/fluxer.py:201
+msgid "Text To Speech"
+msgstr "Text To Speech"
+
+#: apprise/plugins/discord.py:154 apprise/plugins/fluxer.py:206
+msgid "Avatar Image"
+msgstr "Avatar Image"
+
+#: apprise/plugins/discord.py:159 apprise/plugins/fluxer.py:211
+#: apprise/plugins/ntfy.py:262
+#, fuzzy
+msgid "Avatar URL"
+msgstr "Avatar Image"
+
+#: apprise/plugins/discord.py:163 apprise/plugins/fluxer.py:215
+#: apprise/plugins/pushover.py:229
+msgid "URL"
+msgstr ""
+
+#: apprise/plugins/discord.py:172 apprise/plugins/fluxer.py:222
+msgid "Thread ID"
+msgstr ""
+
+#: apprise/plugins/discord.py:176 apprise/plugins/fluxer.py:230
+msgid "Display Footer"
+msgstr "Display Footer"
+
+#: apprise/plugins/discord.py:181 apprise/plugins/fluxer.py:235
+msgid "Footer Logo"
+msgstr "Footer Logo"
+
+#: apprise/plugins/discord.py:186 apprise/plugins/fluxer.py:240
+#, fuzzy
+msgid "Use Fields"
+msgstr "To User ID"
+
+#: apprise/plugins/discord.py:191 apprise/plugins/fluxer.py:245
+msgid "Discord Flags"
+msgstr ""
+
+#: apprise/plugins/discord.py:205 apprise/plugins/fluxer.py:256
+msgid "Ping Users/Roles"
+msgstr ""
+
+#: apprise/plugins/dot.py:127
+#, fuzzy
+msgid "Device Serial Number"
+msgstr "Device ID"
+
+#: apprise/plugins/dot.py:133
+#, fuzzy
+msgid "API Mode"
+msgstr "API Key"
+
+#: apprise/plugins/dot.py:147
+msgid "Refresh Now"
+msgstr ""
+
+#: apprise/plugins/dot.py:153
+msgid "Text Signature"
+msgstr ""
+
+#: apprise/plugins/dot.py:157
+msgid "Icon Base64 (Text API)"
+msgstr ""
+
+#: apprise/plugins/dot.py:161
+msgid "Image Base64 (Image API)"
+msgstr ""
+
+#: apprise/plugins/dot.py:166
+msgid "Link"
+msgstr ""
+
+#: apprise/plugins/dot.py:170
+#, fuzzy
+msgid "Border"
+msgstr "Modal"
+
+#: apprise/plugins/dot.py:177
+msgid "Dither Type"
+msgstr ""
+
+#: apprise/plugins/dot.py:183
+msgid "Dither Kernel"
+msgstr ""
+
+#: apprise/plugins/emby.py:112
+msgid "Modal"
+msgstr "Modal"
+
+#: apprise/plugins/enigma2.py:130 apprise/plugins/gotify.py:134
+#: apprise/plugins/mattermost.py:163 apprise/plugins/notica.py:145
+msgid "Path"
+msgstr ""
+
+#: apprise/plugins/enigma2.py:140
+msgid "Server Timeout"
+msgstr "Server Timeout"
+
+#: apprise/plugins/feishu.py:49
+msgid "Feishu"
+msgstr ""
+
+#: apprise/plugins/flock.py:99 apprise/plugins/twitter.py:150
+msgid "Access Key"
+msgstr "Access Key"
+
+#: apprise/plugins/flock.py:111
+msgid "To User ID"
+msgstr "To User ID"
+
+#: apprise/plugins/flock.py:118
+msgid "To Channel ID"
+msgstr "To Channel ID"
+
+#: apprise/plugins/fcm/__init__.py:182 apprise/plugins/fcm/__init__.py:188
+#: apprise/plugins/fluxer.py:195 apprise/plugins/lametric.py:510
+#: apprise/plugins/mattermost.py:223 apprise/plugins/notificationapi.py:209
+#: apprise/plugins/ntfy.py:296 apprise/plugins/vapid/__init__.py:169
+#, fuzzy
+msgid "Mode"
+msgstr "Modal"
+
+#: apprise/plugins/fluxer.py:226
+#, fuzzy
+msgid "Thread Name"
+msgstr "Bot Name"
+
+#: apprise/plugins/fortysixelks.py:58
+msgid "46elks"
+msgstr ""
+
+#: apprise/plugins/fortysixelks.py:89
+#, fuzzy
+msgid "API Username"
+msgstr "User Name"
+
+#: apprise/plugins/fortysixelks.py:94
+#, fuzzy
+msgid "API Password"
+msgstr "Password"
+
+#: apprise/plugins/freemobile.py:48
+msgid "Free-Mobile"
+msgstr ""
+
+#: apprise/plugins/glib.py:122
+msgid "libdbus-1.so.x or libdbus-2.so.x must be installed."
+msgstr ""
+
+#: apprise/plugins/gnome.py:100
+msgid "A local Gnome environment is required."
+msgstr ""
+
+#: apprise/plugins/gnome.py:104
+msgid "Gnome Notification"
+msgstr ""
+
+#: apprise/plugins/google_chat.py:106
+msgid "Workspace"
+msgstr ""
+
+#: apprise/plugins/google_chat.py:112
+#, fuzzy
+msgid "Webhook Key"
+msgstr "Webhook Token"
+
+#: apprise/plugins/google_chat.py:124
+#, fuzzy
+msgid "Thread Key"
+msgstr "Secret Key"
+
+#: apprise/plugins/growl.py:169 apprise/plugins/mqtt.py:195
+#: apprise/plugins/msteams.py:206 apprise/plugins/nextcloud.py:163
+msgid "Version"
+msgstr "Version"
+
+#: apprise/plugins/growl.py:181
+msgid "Sticky"
+msgstr ""
+
+#: apprise/plugins/home_assistant.py:99
+#, fuzzy
+msgid "Long-Lived Access Token"
+msgstr "Access Token"
+
+#: apprise/plugins/home_assistant.py:113
+msgid "Notification ID"
+msgstr ""
+
+#: apprise/plugins/ifttt.py:109
+msgid "Events"
+msgstr "Events"
+
+#: apprise/plugins/ifttt.py:129
+msgid "Add Tokens"
+msgstr "Add Tokens"
+
+#: apprise/plugins/ifttt.py:133
+msgid "Remove Tokens"
+msgstr "Remove Tokens"
+
+#: apprise/plugins/join.py:147
+msgid "Device ID"
+msgstr "Device ID"
+
+#: apprise/plugins/join.py:153
+#, fuzzy
+msgid "Device Name"
+msgstr "Device ID"
+
+#: apprise/plugins/kavenegar.py:122 apprise/plugins/messagebird.py:85
+#: apprise/plugins/plivo.py:100
+#, fuzzy
+msgid "Source Phone No"
+msgstr "Target Phone No"
+
+#: apprise/plugins/kumulos.py:99
+#, fuzzy
+msgid "Server Key"
+msgstr "Secret Key"
+
+#: apprise/plugins/lametric.py:436
+#, fuzzy
+msgid "Device API Key"
+msgstr "Device ID"
+
+#: apprise/plugins/lametric.py:442 apprise/plugins/one_signal.py:102
+#: apprise/plugins/parseplatform.py:101
+msgid "App ID"
+msgstr ""
+
+#: apprise/plugins/lametric.py:448
+#, fuzzy
+msgid "App Version"
+msgstr "Version"
+
+#: apprise/plugins/lametric.py:455
+#, fuzzy
+msgid "App Access Token"
+msgstr "Access Token"
+
+#: apprise/plugins/lametric.py:500
+msgid "Custom Icon"
+msgstr ""
+
+#: apprise/plugins/lametric.py:504
+msgid "Icon Type"
+msgstr ""
+
+#: apprise/plugins/lametric.py:521
+msgid "Cycles"
+msgstr ""
+
+#: apprise/plugins/lark.py:47
+msgid "Lark (Feishu)"
+msgstr ""
+
+#: apprise/plugins/lark.py:67 apprise/plugins/revolt.py:98
+#: apprise/plugins/telegram.py:344
+msgid "Bot Token"
+msgstr "Bot Token"
+
+#: apprise/plugins/line.py:82 apprise/plugins/mastodon.py:173
+#: apprise/plugins/matrix.py:239 apprise/plugins/misskey.py:122
+#: apprise/plugins/pushbullet.py:83 apprise/plugins/pushover.py:194
+#: apprise/plugins/smseagle.py:146 apprise/plugins/spugpush.py:68
+#: apprise/plugins/streamlabs.py:105 apprise/plugins/whatsapp.py:99
+msgid "Access Token"
+msgstr "Access Token"
+
+#: apprise/plugins/irc/base.py:137 apprise/plugins/line.py:88
+#: apprise/plugins/mastodon.py:184 apprise/plugins/matrix.py:244
+#: apprise/plugins/nextcloud.py:136 apprise/plugins/one_signal.py:129
+#: apprise/plugins/opsgenie.py:258 apprise/plugins/pushed.py:95
+#: apprise/plugins/rocketchat.py:155 apprise/plugins/slack.py:236
+#: apprise/plugins/twitter.py:162 apprise/plugins/zulip.py:143
+msgid "Target User"
+msgstr "Target User"
+
+#: apprise/plugins/macosx.py:65
+msgid ""
+"Only works with Mac OS X 10.8 and higher. Additionally  requires that /usr/"
+"local/bin/terminal-notifier is locally accessible."
+msgstr ""
+
+#: apprise/plugins/macosx.py:72
+msgid "MacOSX Notification"
+msgstr ""
+
+#: apprise/plugins/macosx.py:128
+msgid "Open/Click URL"
+msgstr ""
+
+#: apprise/plugins/email/base.py:124 apprise/plugins/mailgun.py:141
+#: apprise/plugins/sendpulse.py:112 apprise/plugins/smtp2go.py:113
+#: apprise/plugins/sparkpost.py:164
+msgid "Domain"
+msgstr "Domain"
+
+#: apprise/plugins/email/base.py:160 apprise/plugins/mailgun.py:168
+#: apprise/plugins/resend.py:154 apprise/plugins/ses.py:201
+#: apprise/plugins/smtp2go.py:135 apprise/plugins/sparkpost.py:186
+msgid "From Name"
+msgstr "From Name"
+
+#: apprise/plugins/mailgun.py:176 apprise/plugins/notificationapi.py:203
+#: apprise/plugins/opsgenie.py:281 apprise/plugins/pagerduty.py:176
+#: apprise/plugins/sparkpost.py:191
+msgid "Region Name"
+msgstr "Region Name"
+
+#: apprise/plugins/email/base.py:209 apprise/plugins/mailgun.py:204
+#: apprise/plugins/smtp2go.py:161 apprise/plugins/sparkpost.py:219
+#, fuzzy
+msgid "Email Header"
+msgstr "HTTP Header"
+
+#: apprise/plugins/mailgun.py:208 apprise/plugins/msteams.py:222
+#: apprise/plugins/notificationapi.py:246 apprise/plugins/sparkpost.py:223
+#: apprise/plugins/workflows.py:201
+#, fuzzy
+msgid "Template Tokens"
+msgstr "Remove Tokens"
+
+#: apprise/plugins/mastodon.py:204 apprise/plugins/misskey.py:143
+msgid "Visibility"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:210 apprise/plugins/twitter.py:185
+msgid "Cache Results"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:220
+msgid "Sensitive Attachments"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:225
+msgid "Spoiler Text"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:229
+msgid "Idempotency-Key"
+msgstr ""
+
+#: apprise/plugins/mastodon.py:233
+msgid "Language Code"
+msgstr ""
+
+#: apprise/plugins/matrix.py:250 apprise/plugins/rocketchat.py:161
+msgid "Target Room ID"
+msgstr "Target Room ID"
+
+#: apprise/plugins/matrix.py:256
+msgid "Target Room Alias"
+msgstr "Target Room Alias"
+
+#: apprise/plugins/matrix.py:279
+#, fuzzy
+msgid "Server Discovery"
+msgstr "Server Timeout"
+
+#: apprise/plugins/matrix.py:284
+msgid "Force Home Server on Room IDs"
+msgstr ""
+
+#: apprise/plugins/matrix.py:289 apprise/plugins/rocketchat.py:177
+#: apprise/plugins/ryver.py:118
+msgid "Webhook Mode"
+msgstr "Webhook Mode"
+
+#: apprise/plugins/matrix.py:295
+msgid "Matrix API Verion"
+msgstr ""
+
+#: apprise/plugins/matrix.py:301 apprise/plugins/notificationapi.py:154
+msgid "Message Type"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:128 apprise/plugins/mattermost.py:147
+#: apprise/plugins/xmpp/base.py:107
+#, fuzzy
+msgid "User"
+msgstr "Username"
+
+#: apprise/plugins/irc/base.py:143 apprise/plugins/mattermost.py:173
+#: apprise/plugins/notifiarr.py:97 apprise/plugins/pushbullet.py:94
+#: apprise/plugins/pushed.py:101 apprise/plugins/rocketchat.py:149
+#: apprise/plugins/slack.py:242 apprise/plugins/twist.py:112
+msgid "Target Channel"
+msgstr "Target Channel"
+
+#: apprise/plugins/mattermost.py:179 apprise/plugins/twist.py:118
+#, fuzzy
+msgid "Target Channel ID"
+msgstr "Target Channel"
+
+#: apprise/plugins/mqtt.py:169
+#, fuzzy
+msgid "Target Queue"
+msgstr "Target User"
+
+#: apprise/plugins/mqtt.py:188
+msgid "QOS"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:201 apprise/plugins/notificationapi.py:161
+#: apprise/plugins/office365.py:130 apprise/plugins/sendpulse.py:117
+#, fuzzy
+msgid "Client ID"
+msgstr "Account SID"
+
+#: apprise/plugins/mqtt.py:205
+msgid "Use Session"
+msgstr ""
+
+#: apprise/plugins/mqtt.py:210
+msgid "Retain Messages"
+msgstr ""
+
+#: apprise/plugins/msg91.py:102 apprise/plugins/sendpulse.py:161
+msgid "Template ID"
+msgstr ""
+
+#: apprise/plugins/msg91.py:109
+#, fuzzy
+msgid "Authentication Key"
+msgstr "Application Key"
+
+#: apprise/plugins/msg91.py:138
+msgid "Short URL"
+msgstr ""
+
+#: apprise/plugins/msg91.py:148 apprise/plugins/whatsapp.py:168
+msgid "Template Mapping"
+msgstr ""
+
+#: apprise/plugins/msteams.py:151
+#, fuzzy
+msgid "Team Name"
+msgstr "Bot Name"
+
+#: apprise/plugins/msteams.py:159 apprise/plugins/slack.py:203
+msgid "Token A"
+msgstr "Token A"
+
+#: apprise/plugins/msteams.py:168 apprise/plugins/slack.py:211
+msgid "Token B"
+msgstr "Token B"
+
+#: apprise/plugins/msteams.py:177 apprise/plugins/slack.py:219
+msgid "Token C"
+msgstr "Token C"
+
+#: apprise/plugins/msteams.py:186
+#, fuzzy
+msgid "Token D"
+msgstr "Token C"
+
+#: apprise/plugins/msteams.py:212 apprise/plugins/workflows.py:180
+msgid "Template Path"
+msgstr ""
+
+#: apprise/plugins/nextcloud.py:169 apprise/plugins/nextcloudtalk.py:113
+msgid "URL Prefix"
+msgstr ""
+
+#: apprise/plugins/nextcloudtalk.py:43
+msgid "Nextcloud Talk"
+msgstr ""
+
+#: apprise/plugins/nextcloudtalk.py:96
+#, fuzzy
+msgid "Room ID"
+msgstr "Target Room ID"
+
+#: apprise/plugins/notifiarr.py:121
+msgid "Discord Event ID"
+msgstr ""
+
+#: apprise/plugins/notifiarr.py:131 apprise/plugins/pagerduty.py:145
+#, fuzzy
+msgid "Source"
+msgstr "Source JID"
+
+#: apprise/plugins/notificationapi.py:166 apprise/plugins/office365.py:137
+#: apprise/plugins/sendpulse.py:124
+#, fuzzy
+msgid "Client Secret"
+msgstr "Access Secret"
+
+#: apprise/plugins/notificationapi.py:177
+#, fuzzy
+msgid "Target ID"
+msgstr "Target User"
+
+#: apprise/plugins/notificationapi.py:182
+#, fuzzy
+msgid "Target SMS"
+msgstr "Targets"
+
+#: apprise/plugins/notificationapi.py:198
+msgid "Channels"
+msgstr "Channels"
+
+#: apprise/plugins/email/base.py:185 apprise/plugins/notificationapi.py:226
+#: apprise/plugins/resend.py:146
+msgid "Reply To"
+msgstr ""
+
+#: apprise/plugins/email/base.py:155 apprise/plugins/notificationapi.py:231
+#: apprise/plugins/sendpulse.py:147 apprise/plugins/ses.py:154
+msgid "From Email"
+msgstr "From Email"
+
+#: apprise/plugins/fcm/__init__.py:153 apprise/plugins/notifico.py:124
+#, fuzzy
+msgid "Project ID"
+msgstr "Target JID"
+
+#: apprise/plugins/notifico.py:133
+msgid "Message Hook"
+msgstr ""
+
+#: apprise/plugins/notifico.py:148
+msgid "IRC Colors"
+msgstr ""
+
+#: apprise/plugins/notifico.py:154
+msgid "Prefix"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:235
+msgid "Topic"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:252
+msgid "Attach"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:266
+msgid "Attach Filename"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:274
+msgid "Delay"
+msgstr ""
+
+#: apprise/plugins/ntfy.py:278 apprise/plugins/twist.py:107
+#, fuzzy
+msgid "Email"
+msgstr "To Email"
+
+#: apprise/plugins/ntfy.py:292
+#, fuzzy
+msgid "Actions"
+msgstr "Duration"
+
+#: apprise/plugins/ntfy.py:305
+#, fuzzy
+msgid "Authentication Type"
+msgstr "Authorization Token"
+
+#: apprise/plugins/office365.py:118
+#, fuzzy
+msgid "Tenant Domain"
+msgstr "Domain"
+
+#: apprise/plugins/office365.py:125
+msgid "Account Email or Object ID"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:108 apprise/plugins/sendgrid.py:157
+msgid "Template"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:119
+#, fuzzy
+msgid "Target Player ID"
+msgstr "Target Tag ID"
+
+#: apprise/plugins/one_signal.py:135
+#, fuzzy
+msgid "Include Segment"
+msgstr "Include Image"
+
+#: apprise/plugins/one_signal.py:166
+msgid "Enable Contents"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:172
+msgid "Decode Template Args"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:181
+msgid "Subtitle"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:185 apprise/plugins/sfr.py:125
+#: apprise/plugins/whatsapp.py:130
+msgid "Language"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:195
+msgid "Custom Data"
+msgstr ""
+
+#: apprise/plugins/one_signal.py:199
+msgid "Postback Data"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:246
+#, fuzzy
+msgid "Target Escalation"
+msgstr "Target Chat ID"
+
+#: apprise/plugins/opsgenie.py:252
+#, fuzzy
+msgid "Target Schedule"
+msgstr "Target Channel"
+
+#: apprise/plugins/opsgenie.py:264
+#, fuzzy
+msgid "Target Team"
+msgstr "Target Email"
+
+#: apprise/plugins/opsgenie.py:270
+#, fuzzy
+msgid "Targets "
+msgstr "Targets"
+
+#: apprise/plugins/opsgenie.py:299
+msgid "Entity"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:303
+msgid "Alias"
+msgstr ""
+
+#: apprise/plugins/opsgenie.py:314 apprise/plugins/pagertree.py:118
+#: apprise/plugins/splunk.py:202
+#, fuzzy
+msgid "Action"
+msgstr "Duration"
+
+#: apprise/plugins/opsgenie.py:325
+#, fuzzy
+msgid "Details"
+msgstr "Target Emails"
+
+#: apprise/plugins/opsgenie.py:329 apprise/plugins/splunk.py:213
+msgid "Action Mapping"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:138 apprise/plugins/spike.py:68
+#, fuzzy
+msgid "Integration Key"
+msgstr "Application Key"
+
+#: apprise/plugins/pagerduty.py:151
+#, fuzzy
+msgid "Component"
+msgstr "From Phone No"
+
+#: apprise/plugins/pagerduty.py:167
+msgid "Class"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:185
+msgid "Severity"
+msgstr ""
+
+#: apprise/plugins/pagerduty.py:202
+#, fuzzy
+msgid "Custom Details"
+msgstr "To Email"
+
+#: apprise/plugins/pagertree.py:105
+msgid "Integration ID"
+msgstr ""
+
+#: apprise/plugins/pagertree.py:124
+msgid "Third Party ID"
+msgstr ""
+
+#: apprise/plugins/pagertree.py:150
+msgid "Meta Extras"
+msgstr ""
+
+#: apprise/plugins/parseplatform.py:107
+#, fuzzy
+msgid "Master Key"
+msgstr "User Key"
+
+#: apprise/plugins/parseplatform.py:120
+#, fuzzy
+msgid "Device"
+msgstr "Device ID"
+
+#: apprise/plugins/plivo.py:88
+#, fuzzy
+msgid "Auth ID"
+msgstr "Account SID"
+
+#: apprise/plugins/plivo.py:94 apprise/plugins/sinch.py:113
+#: apprise/plugins/twilio.py:147
+msgid "Auth Token"
+msgstr "Auth Token"
+
+#: apprise/plugins/prowl.py:128
+msgid "Provider Key"
+msgstr "Provider Key"
+
+#: apprise/plugins/pushdeer.py:85
+#, fuzzy
+msgid "Pushkey"
+msgstr "User Key"
+
+#: apprise/plugins/pushed.py:83
+msgid "Application Key"
+msgstr "Application Key"
+
+#: apprise/plugins/pushed.py:89 apprise/plugins/reddit.py:158
+msgid "Application Secret"
+msgstr "Application Secret"
+
+#: apprise/plugins/pushjet.py:82
+msgid "Secret Key"
+msgstr "Secret Key"
+
+#: apprise/plugins/pushme.py:81 apprise/plugins/signal_api.py:160
+#: apprise/plugins/smseagle.py:195
+msgid "Show Status"
+msgstr ""
+
+#: apprise/plugins/pushover.py:188
+msgid "User Key"
+msgstr "User Key"
+
+#: apprise/plugins/pushover.py:234
+msgid "URL Title"
+msgstr ""
+
+#: apprise/plugins/pushover.py:239
+msgid "Retry"
+msgstr ""
+
+#: apprise/plugins/pushover.py:245
+msgid "Expire"
+msgstr ""
+
+#: apprise/plugins/pushplus.py:48
+msgid "Pushplus"
+msgstr ""
+
+#: apprise/plugins/pushplus.py:68 apprise/plugins/qq.py:66
+#, fuzzy
+msgid "User Token"
+msgstr "User Key"
+
+#: apprise/plugins/pushsafer.py:360
+#, fuzzy
+msgid "Private Key"
+msgstr "Provider Key"
+
+#: apprise/plugins/pushsafer.py:397
+#, fuzzy
+msgid "Vibration"
+msgstr "Duration"
+
+#: apprise/plugins/pushy.py:79
+#, fuzzy
+msgid "Secret API Key"
+msgstr "Secret Key"
+
+#: apprise/plugins/fcm/__init__.py:162 apprise/plugins/pushy.py:91
+#: apprise/plugins/sns.py:131 apprise/plugins/wxpusher.py:128
+msgid "Target Topic"
+msgstr "Target Topic"
+
+#: apprise/plugins/qq.py:46
+msgid "QQ Push"
+msgstr ""
+
+#: apprise/plugins/reddit.py:151
+#, fuzzy
+msgid "Application ID"
+msgstr "Application Key"
+
+#: apprise/plugins/reddit.py:165
+#, fuzzy
+msgid "Target Subreddit"
+msgstr "Target User"
+
+#: apprise/plugins/reddit.py:185
+msgid "Kind"
+msgstr ""
+
+#: apprise/plugins/reddit.py:191
+msgid "Flair ID"
+msgstr ""
+
+#: apprise/plugins/reddit.py:196
+msgid "Flair Text"
+msgstr ""
+
+#: apprise/plugins/reddit.py:201
+msgid "NSFW"
+msgstr ""
+
+#: apprise/plugins/reddit.py:207
+msgid "Is Ad?"
+msgstr ""
+
+#: apprise/plugins/reddit.py:213
+msgid "Send Replies"
+msgstr ""
+
+#: apprise/plugins/reddit.py:219
+msgid "Is Spoiler"
+msgstr ""
+
+#: apprise/plugins/reddit.py:225
+msgid "Resubmit Flag"
+msgstr ""
+
+#: apprise/plugins/revolt.py:104
+#, fuzzy
+msgid "Channel ID"
+msgstr "To Channel ID"
+
+#: apprise/plugins/revolt.py:130
+msgid "Embed URL"
+msgstr ""
+
+#: apprise/plugins/rocketchat.py:145
+msgid "Webhook"
+msgstr "Webhook"
+
+#: apprise/plugins/rocketchat.py:182
+msgid "Use Avatar"
+msgstr "Use Avatar"
+
+#: apprise/plugins/rsyslog.py:173 apprise/plugins/syslog.py:144
+msgid "Facility"
+msgstr ""
+
+#: apprise/plugins/rsyslog.py:203 apprise/plugins/syslog.py:161
+msgid "Log PID"
+msgstr ""
+
+#: apprise/plugins/ryver.py:93 apprise/plugins/zulip.py:130
+msgid "Organization"
+msgstr "Organization"
+
+#: apprise/plugins/sendgrid.py:166 apprise/plugins/sendpulse.py:175
+msgid "Template Data"
+msgstr ""
+
+#: apprise/plugins/ses.py:160 apprise/plugins/sns.py:106
+msgid "Access Key ID"
+msgstr "Access Key ID"
+
+#: apprise/plugins/ses.py:166 apprise/plugins/sns.py:112
+msgid "Secret Access Key"
+msgstr "Secret Access Key"
+
+#: apprise/plugins/ses.py:172 apprise/plugins/sinch.py:160
+#: apprise/plugins/sns.py:118
+msgid "Region"
+msgstr "Region"
+
+#: apprise/plugins/ses.py:179 apprise/plugins/smtp2go.py:124
+#: apprise/plugins/sparkpost.py:175
+msgid "Target Emails"
+msgstr "Target Emails"
+
+#: apprise/plugins/seven.py:115 apprise/plugins/smseagle.py:205
+msgid "Flash"
+msgstr ""
+
+#: apprise/plugins/seven.py:119
+msgid "Label"
+msgstr ""
+
+#: apprise/plugins/sfr.py:58
+msgid "Sociรฉtรฉ Franรงaise du Radiotรฉlรฉphone"
+msgstr ""
+
+#: apprise/plugins/sfr.py:90
+#, fuzzy
+msgid "Service ID"
+msgstr "Device ID"
+
+#: apprise/plugins/sfr.py:95
+#, fuzzy
+msgid "Service Password"
+msgstr "Password"
+
+#: apprise/plugins/sfr.py:101
+#, fuzzy
+msgid "Space ID"
+msgstr "Source JID"
+
+#: apprise/plugins/sfr.py:107
+msgid "Recipient Phone Number"
+msgstr ""
+
+#: apprise/plugins/sfr.py:131
+#, fuzzy
+msgid "Sender Name"
+msgstr "User Name"
+
+#: apprise/plugins/sfr.py:138
+msgid "Media Type"
+msgstr ""
+
+#: apprise/plugins/sfr.py:145
+#, fuzzy
+msgid "Timeout"
+msgstr "Server Timeout"
+
+#: apprise/plugins/sfr.py:151
+#, fuzzy
+msgid "TTS Voice"
+msgstr "Target Device"
+
+#: apprise/plugins/signal_api.py:131 apprise/plugins/smseagle.py:158
+#, fuzzy
+msgid "Target Group ID"
+msgstr "Target Room ID"
+
+#: apprise/plugins/signl4.py:86
+#, fuzzy
+msgid "Service"
+msgstr "Device ID"
+
+#: apprise/plugins/signl4.py:90
+#, fuzzy
+msgid "Location"
+msgstr "Duration"
+
+#: apprise/plugins/signl4.py:94
+msgid "Alerting Scenario"
+msgstr ""
+
+#: apprise/plugins/signl4.py:98
+msgid "Filtering"
+msgstr ""
+
+#: apprise/plugins/signl4.py:103
+#, fuzzy
+msgid "External ID"
+msgstr "To User ID"
+
+#: apprise/plugins/signl4.py:107
+#, fuzzy
+msgid "Status"
+msgstr "Targets"
+
+#: apprise/plugins/simplepush.py:113
+msgid "Salt"
+msgstr ""
+
+#: apprise/plugins/simplepush.py:126
+#, fuzzy
+msgid "Event"
+msgstr "Events"
+
+#: apprise/plugins/sinch.py:106 apprise/plugins/twilio.py:140
+msgid "Account SID"
+msgstr "Account SID"
+
+#: apprise/plugins/sinch.py:134 apprise/plugins/twilio.py:168
+msgid "Target Short Code"
+msgstr "Target Short Code"
+
+#: apprise/plugins/slack.py:194
+#, fuzzy
+msgid "OAuth Access Token"
+msgstr "Access Token"
+
+#: apprise/plugins/slack.py:225
+msgid "Target Encoded ID"
+msgstr "Target Encoded ID"
+
+#: apprise/plugins/slack.py:265
+#, fuzzy
+msgid "Include Footer"
+msgstr "Include Image"
+
+#: apprise/plugins/slack.py:273
+msgid "Use Blocks"
+msgstr ""
+
+#: apprise/plugins/slack.py:282
+#, fuzzy
+msgid "Include Timestamp"
+msgstr "Include Image"
+
+#: apprise/plugins/slack.py:288 apprise/plugins/twitter.py:179
+#, fuzzy
+msgid "Message Mode"
+msgstr "Secure Mode"
+
+#: apprise/plugins/smpp.py:61
+msgid "SMPP"
+msgstr ""
+
+#: apprise/plugins/smpp.py:103
+#, fuzzy
+msgid "Host"
+msgstr "Hostname"
+
+#: apprise/plugins/smseagle.py:165
+#, fuzzy
+msgid "Target Contact"
+msgstr "Target Chat ID"
+
+#: apprise/plugins/smseagle.py:200
+msgid "Test Only"
+msgstr ""
+
+#: apprise/plugins/smsmanager.py:146
+msgid "Gateway"
+msgstr ""
+
+#: apprise/plugins/spike.py:48
+msgid "Spike.sh"
+msgstr ""
+
+#: apprise/plugins/splunk.py:117
+msgid "Splunk On-Call"
+msgstr ""
+
+#: apprise/plugins/splunk.py:172
+#, fuzzy
+msgid "Target Routing Key"
+msgstr "Target Tag ID"
+
+#: apprise/plugins/splunk.py:179
+msgid "Entity ID"
+msgstr ""
+
+#: apprise/plugins/spugpush.py:48
+msgid "SpugPush"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:125
+msgid "Alert Type"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:131
+msgid "Image Link"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:136
+#, fuzzy
+msgid "Sound Link"
+msgstr "Sound"
+
+#: apprise/plugins/streamlabs.py:141 apprise/plugins/windows.py:100
+#: apprise/plugins/xbmc.py:123
+msgid "Duration"
+msgstr "Duration"
+
+#: apprise/plugins/streamlabs.py:147
+msgid "Special Text Color"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:153
+msgid "Amount"
+msgstr ""
+
+#: apprise/plugins/streamlabs.py:159
+#, fuzzy
+msgid "Currency"
+msgstr "Urgency"
+
+#: apprise/plugins/streamlabs.py:165
+#, fuzzy
+msgid "Name"
+msgstr "Username"
+
+#: apprise/plugins/streamlabs.py:171
+msgid "Identifier"
+msgstr ""
+
+#: apprise/plugins/synology.py:116
+msgid "Upload"
+msgstr ""
+
+#: apprise/plugins/syslog.py:167
+msgid "Log to STDERR"
+msgstr ""
+
+#: apprise/plugins/telegram.py:353
+msgid "Target Chat ID"
+msgstr "Target Chat ID"
+
+#: apprise/plugins/telegram.py:376
+msgid "Detect Bot Owner"
+msgstr "Detect Bot Owner"
+
+#: apprise/plugins/telegram.py:382
+msgid "Silent Notification"
+msgstr ""
+
+#: apprise/plugins/telegram.py:387
+msgid "Web Page Preview"
+msgstr ""
+
+#: apprise/plugins/telegram.py:392
+msgid "Topic Thread ID"
+msgstr ""
+
+#: apprise/plugins/telegram.py:399
+#, fuzzy
+msgid "Markdown Version"
+msgstr "Version"
+
+#: apprise/plugins/telegram.py:408
+msgid "Content Placement"
+msgstr ""
+
+#: apprise/plugins/threema.py:85
+msgid "Gateway ID"
+msgstr ""
+
+#: apprise/plugins/threema.py:110
+#, fuzzy
+msgid "Target Threema ID"
+msgstr "Target Tag ID"
+
+#: apprise/plugins/twilio.py:203
+msgid "Notification Method: sms or call"
+msgstr ""
+
+#: apprise/plugins/twitter.py:138
+msgid "Consumer Key"
+msgstr "Consumer Key"
+
+#: apprise/plugins/twitter.py:144
+msgid "Consumer Secret"
+msgstr "Consumer Secret"
+
+#: apprise/plugins/twitter.py:156
+msgid "Access Secret"
+msgstr "Access Secret"
+
+#: apprise/plugins/viber.py:49
+msgid "Viber"
+msgstr ""
+
+#: apprise/plugins/viber.py:81
+#, fuzzy
+msgid "Authentication Token"
+msgstr "Application Key"
+
+#: apprise/plugins/viber.py:87
+msgid "Receiver IDs"
+msgstr ""
+
+#: apprise/plugins/viber.py:101
+#, fuzzy
+msgid "Bot Avatar URL"
+msgstr "Avatar Image"
+
+#: apprise/plugins/voipms.py:83
+#, fuzzy
+msgid "User Email"
+msgstr "From Email"
+
+#: apprise/plugins/vapid/__init__.py:179 apprise/plugins/vonage.py:136
+msgid "ttl"
+msgstr ""
+
+#: apprise/plugins/wecombot.py:99
+#, fuzzy
+msgid "Bot Webhook Key"
+msgstr "Webhook Token"
+
+#: apprise/plugins/whatsapp.py:106
+msgid "Template Name"
+msgstr ""
+
+#: apprise/plugins/whatsapp.py:112
+#, fuzzy
+msgid "From Phone ID"
+msgstr "From Phone No"
+
+#: apprise/plugins/windows.py:62
+msgid "A local Microsoft Windows environment is required."
+msgstr ""
+
+#: apprise/plugins/workflows.py:137
+#, fuzzy
+msgid "Workflow ID"
+msgstr "Overflow Mode"
+
+#: apprise/plugins/workflows.py:145
+msgid "Signature"
+msgstr ""
+
+#: apprise/plugins/workflows.py:168
+msgid "Use Power Automate URL"
+msgstr ""
+
+#: apprise/plugins/workflows.py:175
+msgid "Wrap Text"
+msgstr ""
+
+#: apprise/plugins/workflows.py:190
+#, fuzzy
+msgid "API Version"
+msgstr "Version"
+
+#: apprise/plugins/wxpusher.py:121
+#, fuzzy
+msgid "App Token"
+msgstr "Auth Token"
+
+#: apprise/plugins/wxpusher.py:133
+#, fuzzy
+msgid "Target User ID"
+msgstr "Target User"
+
+#: apprise/plugins/zulip.py:148
+#, fuzzy
+msgid "Target Stream"
+msgstr "Target User"
+
+#: apprise/plugins/email/base.py:150
+msgid "To Email"
+msgstr "To Email"
+
+#: apprise/plugins/email/base.py:173
+msgid "SMTP Server"
+msgstr "SMTP Server"
+
+#: apprise/plugins/email/base.py:178 apprise/plugins/xmpp/base.py:129
+msgid "Secure Mode"
+msgstr "Secure Mode"
+
+#: apprise/plugins/email/base.py:190
+msgid "PGP Encryption"
+msgstr ""
+
+#: apprise/plugins/email/base.py:196
+msgid "PGP Public Key Path"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:148
+msgid "OAuth2 KeyFile"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:193
+msgid "Custom Image URL"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:205
+msgid "Notification Color"
+msgstr ""
+
+#: apprise/plugins/fcm/__init__.py:215
+msgid "Data Entries"
+msgstr ""
+
+#: apprise/plugins/irc/base.py:159
+#, fuzzy
+msgid "Real Name"
+msgstr "Bot Name"
+
+#: apprise/plugins/irc/base.py:160
+#, fuzzy
+msgid "Nickname"
+msgstr "Username"
+
+#: apprise/plugins/irc/base.py:162
+#, fuzzy
+msgid "Join Channels"
+msgstr "Channels"
+
+#: apprise/plugins/irc/base.py:167
+#, fuzzy
+msgid "Auth Mode"
+msgstr "Webhook Mode"
+
+#: apprise/plugins/vapid/__init__.py:193
+msgid "PEM Private KeyFile"
+msgstr ""
+
+#: apprise/plugins/vapid/__init__.py:199
+msgid "Subscripion File"
+msgstr ""
+
+#: apprise/plugins/xmpp/base.py:136
+#, fuzzy
+msgid "Get Roster"
+msgstr "Target User"
+
+#: apprise/plugins/xmpp/base.py:141
+msgid "Use Subject"
+msgstr ""
+
+#: apprise/plugins/xmpp/base.py:146
+#, fuzzy
+msgid "Keep Connection Alive"
+msgstr "Server Timeout"
diff --git a/libs/apprise/locale.py b/libs/apprise/locale.py
index f113cf5601..c06aff1cc5 100644
--- a/libs/apprise/locale.py
+++ b/libs/apprise/locale.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,16 +25,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
 import ctypes
 import locale
-import contextlib
 import os
+from os.path import abspath, dirname, join
 import re
-from os.path import join
-from os.path import dirname
-from os.path import abspath
-from .logger import logger
+from typing import Union
 
+from .logger import logger
 
 # This gets toggled to True if we succeed
 GETTEXT_LOADED = False
@@ -54,39 +52,37 @@
 
 
 class AppriseLocale:
-    """
-    A wrapper class to gettext so that we can manipulate multiple lanaguages
-    on the fly if required.
-
-    """
+    """A wrapper class to gettext so that we can manipulate multiple lanaguages
+    on the fly if required."""
 
     # Define our translation domain
-    _domain = 'apprise'
+    _domain = "apprise"
 
     # The path to our translations
-    _locale_dir = abspath(join(dirname(__file__), 'i18n'))
+    _locale_dir = abspath(join(dirname(__file__), "i18n"))
 
     # Locale regular expression
     _local_re = re.compile(
-        r'^((?P<ansii>C)|(?P<lang>([a-z]{2}))([_:](?P<country>[a-z]{2}))?)'
-        r'(\.(?P<enc>[a-z0-9-]+))?$', re.IGNORECASE)
+        r"^((?P<ansii>C)|(?P<lang>([a-z]{2}))([_:](?P<country>[a-z]{2}))?)"
+        r"(\.(?P<enc>[a-z0-9-]+))?$",
+        re.IGNORECASE,
+    )
 
     # Define our default encoding
-    _default_encoding = 'utf-8'
+    _default_encoding = "utf-8"
 
     # The function to assign `_` by default
-    _fn = 'gettext'
+    _fn = "gettext"
 
     # The language we should fall back to if all else fails
-    _default_language = 'en'
+    _default_language = "en"
 
     def __init__(self, language=None):
-        """
-        Initializes our object, if a language is specified, then we
-        initialize ourselves to that, otherwise we use whatever we detect
-        from the local operating system. If all else fails, we resort to the
-        defined default_language.
+        """Initializes our object, if a language is specified, then we
+        initialize ourselves to that, otherwise we use whatever we detect from
+        the local operating system.
 
+        If all else fails, we resort to the defined default_language.
         """
 
         # Cache previously loaded translations
@@ -106,16 +102,17 @@ def __init__(self, language=None):
         self.add(self.lang)
 
     def add(self, lang=None, set_default=True):
-        """
-        Add a language to our list
-        """
+        """Add a language to our list."""
         lang = lang if lang else self._default_language
         if lang not in self._gtobjs:
             # Load our gettext object and install our language
             try:
                 self._gtobjs[lang] = gettext.translation(
-                    self._domain, localedir=self._locale_dir, languages=[lang],
-                    fallback=False)
+                    self._domain,
+                    localedir=self._locale_dir,
+                    languages=[lang],
+                    fallback=False,
+                )
 
                 # The non-intrusive method of applying the gettext change to
                 # the global namespace only
@@ -124,8 +121,9 @@ def add(self, lang=None, set_default=True):
             except FileNotFoundError:
                 # The translation directory does not exist
                 logger.debug(
-                    'Could not load translation path: %s',
-                    join(self._locale_dir, lang))
+                    "Could not load translation path: %s",
+                    join(self._locale_dir, lang),
+                )
 
                 # Fallback (handle case where self.lang does not exist)
                 if self.lang not in self._gtobjs:
@@ -134,10 +132,10 @@ def add(self, lang=None, set_default=True):
 
                 return False
 
-            logger.trace('Loaded language %s', lang)
+            logger.trace("Loaded language %s", lang)
 
         if set_default:
-            logger.debug('Language set to %s', lang)
+            logger.debug("Language set to %s", lang)
             self.lang = lang
 
         return True
@@ -172,8 +170,7 @@ def lang_at(self, lang, mapto=_fn):
 
     @property
     def gettext(self):
-        """
-        Return the current language gettext() function
+        """Return the current language gettext() function.
 
         Useful for assigning to `_`
         """
@@ -181,9 +178,7 @@ def gettext(self):
 
     @staticmethod
     def detect_language(lang=None, detect_fallback=True):
-        """
-        Returns the language (if it's retrievable)
-        """
+        """Returns the language (if it's retrievable)"""
         # We want to only use the 2 character version of this language
         # hence en_CA becomes en, en_US becomes en.
         if not isinstance(lang, str):
@@ -194,19 +189,20 @@ def detect_language(lang=None, detect_fallback=True):
             # Posix lookup
             lookup = os.environ.get
             localename = None
-            for variable in ('LC_ALL', 'LC_CTYPE', 'LANG', 'LANGUAGE'):
+            for variable in ("LC_ALL", "LC_CTYPE", "LANG", "LANGUAGE"):
                 localename = lookup(variable, None)
                 if localename:
                     result = AppriseLocale._local_re.match(localename)
-                    if result and result.group('lang'):
-                        return result.group('lang').lower()
+                    if result and result.group("lang"):
+                        return result.group("lang").lower()
 
             # Windows handling
-            if hasattr(ctypes, 'windll'):
+            if hasattr(ctypes, "windll"):
                 windll = ctypes.windll.kernel32
                 try:
                     lang = locale.windows_locale[
-                        windll.GetUserDefaultUILanguage()]
+                        windll.GetUserDefaultUILanguage()
+                    ]
 
                     # Our detected windows language
                     return lang[0:2].lower()
@@ -220,7 +216,7 @@ def detect_language(lang=None, detect_fallback=True):
                 # Acquire our locale
                 lang = locale.getlocale()[0]
                 # Compatibility for Python >= 3.12
-                if lang == 'C':
+                if lang == "C":
                     lang = AppriseLocale._default_language
 
             except (ValueError, TypeError) as e:
@@ -229,32 +225,27 @@ def detect_language(lang=None, detect_fallback=True):
                 # case, we want to better notify the end user of this. Users
                 # receiving this error should check their environment
                 # variables.
-                logger.warning(
-                    'Language detection failure / {}'.format(str(e)))
+                logger.warning(f"Language detection failure / {e!s}")
                 return None
 
         return None if not lang else lang[0:2].lower()
 
     def __getstate__(self):
-        """
-        Pickle Support dumps()
-        """
+        """Pickle Support dumps()"""
         state = self.__dict__.copy()
 
         # Remove the unpicklable entries.
-        del state['_gtobjs']
-        del state['_AppriseLocale__fn_map']
+        del state["_gtobjs"]
+        del state["_AppriseLocale__fn_map"]
         return state
 
     def __setstate__(self, state):
-        """
-        Pickle Support loads()
-        """
+        """Pickle Support loads()"""
         self.__dict__.update(state)
         # Our mapping to our _fn
         self.__fn_map = None
         self._gtobjs = {}
-        self.add(state['lang'], set_default=True)
+        self.add(state["lang"], set_default=True)
 
 
 #
@@ -264,15 +255,11 @@ def __setstate__(self, state):
 
 
 class LazyTranslation:
-    """
-    Doesn't translate anything until str() or unicode() references
-    are made.
+    """Doesn't translate anything until str() or unicode() references are
+    made."""
 
-    """
     def __init__(self, text, *args, **kwargs):
-        """
-        Store our text
-        """
+        """Store our text."""
         self.text = text
 
         super().__init__(*args, **kwargs)
@@ -283,7 +270,10 @@ def __str__(self):
 
 # Lazy translation handling
 def gettext_lazy(text):
-    """
-    A dummy function that can be referenced
-    """
+    """A dummy function that can be referenced."""
+
     return LazyTranslation(text=text)
+
+
+# Identify our Translatable content
+Translatable = Union[str, LazyTranslation]
diff --git a/libs/apprise/logger.py b/libs/apprise/logger.py
index c8c9d67103..89ef90725d 100644
--- a/libs/apprise/logger.py
+++ b/libs/apprise/logger.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,12 +25,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import os
-import logging
+import contextlib
 from io import StringIO
+import logging
+import os
 
 # The root identifier needed to monitor 'apprise' logging
-LOGGER_NAME = 'apprise'
+LOGGER_NAME = "apprise"
 
 # Define a verbosity level that is a noisier then debug mode
 logging.TRACE = logging.DEBUG - 1
@@ -54,9 +54,7 @@ def trace(self, message, *args, **kwargs):
 
 
 def deprecate(self, message, *args, **kwargs):
-    """
-    Deprication Warning Logging
-    """
+    """Deprication Warning Logging."""
     if self.isEnabledFor(logging.DEPRECATE):
         self._log(logging.DEPRECATE, message, args, **kwargs)
 
@@ -70,25 +68,29 @@ def deprecate(self, message, *args, **kwargs):
 
 
 class LogCapture:
+    """A class used to allow one to instantiate loggers that write to memory
+    for temporary purposes. e.g.:
+
+    1.  with LogCapture() as captured:
+    2.
+    3.      # Send our notification(s)
+    4.      aobj.notify("hello world")
+    5.
+    6.      # retrieve our logs produced by the above call via our
+    7.      # `captured` StringIO object we have access to within the `with`
+    8.      # block here:
+    9.      print(captured.getvalue())
     """
-    A class used to allow one to instantiate loggers that write to
-    memory for temporary purposes. e.g.:
-
-       1.  with LogCapture() as captured:
-       2.
-       3.      # Send our notification(s)
-       4.      aobj.notify("hello world")
-       5.
-       6.      # retrieve our logs produced by the above call via our
-       7.      # `captured` StringIO object we have access to within the `with`
-       8.      # block here:
-       9.      print(captured.getvalue())
 
-    """
-    def __init__(self, path=None, level=None, name=LOGGER_NAME, delete=True,
-                 fmt='%(asctime)s - %(levelname)s - %(message)s'):
-        """
-        Instantiate a temporary log capture object
+    def __init__(
+        self,
+        path=None,
+        level=None,
+        name=LOGGER_NAME,
+        delete=True,
+        fmt="%(asctime)s - %(levelname)s - %(message)s",
+    ):
+        """Instantiate a temporary log capture object.
 
         If a path is specified, then log content is sent to that file instead
         of a StringIO object.
@@ -99,7 +101,6 @@ def __init__(self, path=None, level=None, name=LOGGER_NAME, delete=True,
         they are not automatically cleaned up afterwards.
 
         Optionally over-ride the fmt as well if you wish.
-
         """
         # Our memory buffer placeholder
         self.__buffer_ptr = StringIO()
@@ -117,23 +118,25 @@ def __init__(self, path=None, level=None, name=LOGGER_NAME, delete=True,
         self.__logger = logging.getLogger(name)
 
         # Prepare our handler
-        self.__handler = logging.StreamHandler(self.__buffer_ptr) \
-            if not self.__path else logging.FileHandler(
-                self.__path, mode='a', encoding='utf-8')
+        self.__handler = (
+            logging.StreamHandler(self.__buffer_ptr)
+            if not self.__path
+            else logging.FileHandler(self.__path, mode="a", encoding="utf-8")
+        )
 
         # Use the specified level, otherwise take on the already
         # effective level of our logger
         self.__handler.setLevel(
-            self.__level if self.__level is not None
-            else self.__logger.getEffectiveLevel())
+            self.__level
+            if self.__level is not None
+            else self.__logger.getEffectiveLevel()
+        )
 
         # Prepare our formatter
         self.__handler.setFormatter(logging.Formatter(fmt))
 
     def __enter__(self):
-        """
-        Allows logger manipulation within a 'with' block
-        """
+        """Allows logger manipulation within a 'with' block."""
 
         if self.__level is not None:
             # Temporary adjust our log level if required
@@ -153,11 +156,11 @@ def __enter__(self):
         if self.__path:
             # If a path has been identified, ensure we can write to the path
             # and that the file exists
-            with open(self.__path, 'a'):
+            with open(self.__path, "a"):
                 os.utime(self.__path, None)
 
             # Update our buffer pointer
-            self.__buffer_ptr = open(self.__path, 'r')
+            self.__buffer_ptr = open(self.__path)
 
         # Add our handler
         self.__logger.addHandler(self.__handler)
@@ -166,9 +169,7 @@ def __enter__(self):
         return self.__buffer_ptr
 
     def __exit__(self, exc_type, exc_value, tb):
-        """
-        removes the handler gracefully when the with block has completed
-        """
+        """Removes the handler gracefully when the with block has completed."""
 
         # Flush our content
         self.__handler.flush()
@@ -186,16 +187,8 @@ def __exit__(self, exc_type, exc_value, tb):
             self.__buffer_ptr.close()
             self.__handler.close()
             if self.__delete:
-                try:
+                with contextlib.suppress(OSError):
                     # Always remove file afterwards
                     os.unlink(self.__path)
 
-                except OSError:
-                    # It's okay if the file does not exist
-                    pass
-
-        if exc_type is not None:
-            # pass exception on if one was generated
-            return False
-
-        return True
+        return exc_type is None
diff --git a/libs/apprise/manager.py b/libs/apprise/manager.py
index d44357be4a..5e8fdb5d12 100644
--- a/libs/apprise/manager.py
+++ b/libs/apprise/manager.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,52 +25,47 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
+import hashlib
+import inspect
 import os
+from os.path import abspath, dirname, join
 import re
 import sys
-import time
-import hashlib
-import inspect
 import threading
-from .utils.module import import_module
-from .utils.singleton import Singleton
-from .utils.parse import parse_list
-from .utils.disk import path_decode
-from os.path import dirname
-from os.path import abspath
-from os.path import join
+import time
 
 from .logger import logger
+from .utils.disk import path_decode
+from .utils.module import import_module
+from .utils.parse import parse_list
+from .utils.singleton import Singleton
 
 
 class PluginManager(metaclass=Singleton):
-    """
-    Designed to be a singleton object to maintain all initialized loading
-    of modules in memory.
-    """
+    """Designed to be a singleton object to maintain all initialized loading of
+    modules in memory."""
 
     # Description (used for logging)
-    name = 'Singleton Plugin'
+    name = "Singleton Plugin"
 
     # Memory Space
-    _id = 'undefined'
+    _id = "undefined"
 
     # Our Module Python path name
-    module_name_prefix = f'apprise.{_id}'
+    module_name_prefix = f"apprise.{_id}"
 
     # The module path to scan
     module_path = join(abspath(dirname(__file__)), _id)
 
     # For filtering our result when scanning a module
-    module_filter_re = re.compile(r'^(?P<name>((?!_)[A-Za-z0-9]+))$')
+    module_filter_re = re.compile(r"^(?P<name>((?!_)[A-Za-z0-9]+))$")
 
     # thread safe loading
     _lock = threading.Lock()
 
     def __init__(self, *args, **kwargs):
-        """
-        Over-ride our class instantiation to provide a singleton
-        """
+        """Over-ride our class instantiation to provide a singleton."""
 
         self._module_map = None
         self._schema_map = None
@@ -115,22 +109,22 @@ def __init__(self, *args, **kwargs):
         self._loaded = set()
 
     def unload_modules(self, disable_native=False):
-        """
-        Reset our object and unload all modules
-        """
+        """Reset our object and unload all modules."""
 
         with self._lock:
             if self._custom_module_map:
                 # Handle Custom Module Assignments
                 for meta in self._custom_module_map.values():
-                    if meta['name'] not in self._module_map:
+                    if meta["name"] not in self._module_map:
                         # Nothing to remove
                         continue
 
                     # For the purpose of tidying up un-used modules in memory
-                    loaded = [m for m in sys.modules.keys()
-                              if m.startswith(
-                                  self._module_map[meta['name']]['path'])]
+                    loaded = [
+                        m
+                        for m in sys.modules
+                        if m.startswith(self._module_map[meta["name"]]["path"])
+                    ]
 
                     for module_path in loaded:
                         del sys.modules[module_path]
@@ -154,9 +148,7 @@ def unload_modules(self, disable_native=False):
             self._paths_previously_scanned = set()
 
     def load_modules(self, path=None, name=None, force=False):
-        """
-        Load our modules into memory
-        """
+        """Load our modules into memory."""
 
         # Default value
         module_name_prefix = self.module_name_prefix if name is None else name
@@ -181,8 +173,8 @@ def load_modules(self, path=None, name=None, force=False):
             # The .py extension is optional as we support loading directories
             # too
             module_re = re.compile(
-                r'^(?P<name>(?!base|_)[a-z0-9_]+)(\.py)?$',
-                re.I)
+                r"^(?P<name>(?!base|_)[a-z0-9_]+)(\.py)?$", re.I
+            )
 
             t_start = time.time()
             for f in os.listdir(module_path):
@@ -193,62 +185,73 @@ def load_modules(self, path=None, name=None, force=False):
                     continue
 
                 # Store our notification/plugin name:
-                module_name = match.group('name')
-                module_pyname = '{}.{}'.format(module_name_prefix, module_name)
+                module_name = match.group("name")
+                module_pyname = f"{module_name_prefix}.{module_name}"
 
                 if module_name in self._module_map:
                     logger.warning(
                         "%s(s) (%s) already loaded; ignoring %s",
-                        self.name, module_name, os.path.join(module_path, f))
+                        self.name,
+                        module_name,
+                        os.path.join(module_path, f),
+                    )
                     continue
 
                 try:
                     module = __import__(
                         module_pyname,
-                        globals(), locals(),
-                        fromlist=[module_name])
+                        globals(),
+                        locals(),
+                        fromlist=[module_name],
+                    )
 
                 except ImportError:
                     # No problem, we can try again another way...
                     module = import_module(
-                        os.path.join(module_path, f), module_pyname)
+                        os.path.join(module_path, f), module_pyname
+                    )
                     if not module:
                         # logging found in import_module and not needed here
                         continue
 
                 module_class = None
-                for m_class in [obj for obj in dir(module)
-                                if self.module_filter_re.match(obj)]:
+                for m_class in [
+                    obj
+                    for obj in dir(module)
+                    if self.module_filter_re.match(obj)
+                ]:
                     # Get our plugin
                     plugin = getattr(module, m_class)
-                    if not hasattr(plugin, 'app_id'):
+                    if not hasattr(plugin, "app_id"):
                         # Filter out non-notification modules
                         logger.trace(
                             "(%s.%s) import failed; no app_id defined in %s",
-                            self.name, m_class, os.path.join(module_path, f))
+                            self.name,
+                            m_class,
+                            os.path.join(module_path, f),
+                        )
                         continue
 
                     # Add our plugin name to our module map
                     self._module_map[module_name] = {
-                        'plugin': set([plugin]),
-                        'module': module,
-                        'path': '{}.{}'.format(
-                            module_name_prefix, module_name),
-                        'native': True,
+                        "plugin": {plugin},
+                        "module": module,
+                        "path": f"{module_name_prefix}.{module_name}",
+                        "native": True,
                     }
 
-                    fn = getattr(plugin, 'schemas', None)
-                    schemas = set([]) if not callable(fn) else fn(plugin)
+                    fn = getattr(plugin, "schemas", None)
+                    schemas = set() if not callable(fn) else fn(plugin)
 
                     # map our schema to our plugin
                     for schema in schemas:
                         if schema in self._schema_map:
                             logger.error(
-                                "{} schema ({}) mismatch detected -"
-                                ' {} already maps to {}'
-                                .format(self.name, schema,
-                                        self._schema_map[schema],
-                                        plugin))
+                                f"{self.name} schema ({schema}) mismatch"
+                                " detected -"
+                                f" {self._schema_map[schema]} already maps to"
+                                f" {plugin}"
+                            )
                             continue
 
                         # Assign plugin
@@ -265,42 +268,45 @@ def load_modules(self, path=None, name=None, force=False):
                     logger.trace(
                         "%s (%s) import failed; no filename/Class "
                         "match found in %s",
-                        self.name, module_name, os.path.join(module_path, f))
+                        self.name,
+                        module_name,
+                        os.path.join(module_path, f),
+                    )
                     continue
 
                 logger.trace(
-                    '{} {} loaded in {:.6f}s'.format(
-                        self.name, module_name, (time.time() - tl_start)))
+                    f"{self.name} {module_name} loaded in"
+                    f" {time.time() - tl_start:.6f}s"
+                )
 
             # Track the directory loaded so we never load it again
             self._loaded.add(module_path)
 
             logger.debug(
-                '{} {}(s) and {} Schema(s) loaded in {:.4f}s'
-                .format(
-                    self.name,
-                    len(self._module_map) - module_count,
-                    len(self._schema_map) - schema_count,
-                    (time.time() - t_start)))
+                f"{len(self._module_map) - module_count} {self.name}(s) and"
+                f" {len(self._schema_map) - schema_count} Schema(s) loaded in"
+                f" {time.time() - t_start:.4f}s"
+            )
 
     def module_detection(self, paths, cache=True):
-        """
-        Leverage the @notify decorator and load all objects found matching
-        this.
-        """
+        """Leverage the @notify decorator and load all objects found matching
+        this."""
         # A simple restriction that we don't allow periods in the filename at
         # all so it can't be hidden (Linux OS's) and it won't conflict with
         # Python path naming.  This also prevents us from loading any python
         # file that starts with an underscore or dash
         # We allow for __init__.py as well
         module_re = re.compile(
-            r'^(?P<name>[_a-z0-9][a-z0-9._-]+)?(\.py)?$', re.I)
+            r"^(?P<name>[_a-z0-9][a-z0-9._-]+)?(\.py)?$", re.I
+        )
 
         # Validate if we're a loadable Python file or not
-        valid_python_file_re = re.compile(r'.+\.py(o|c)?$', re.IGNORECASE)
+        valid_python_file_re = re.compile(r".+\.py(o|c)?$", re.IGNORECASE)
 
         if isinstance(paths, str):
-            paths = [paths, ]
+            paths = [
+                paths,
+            ]
 
         if not paths or not isinstance(paths, (tuple, list)):
             # We're done
@@ -312,19 +318,18 @@ def _import_module(path):
             # another's namespace
             if not (path and valid_python_file_re.match(path)):
                 # Ignore file/module type
-                logger.trace('Plugin Scan: Skipping %s', path)
+                logger.trace("Plugin Scan: Skipping %s", path)
                 return
 
             t_start = time.time()
-            module_name = hashlib.sha1(path.encode('utf-8')).hexdigest()
+            module_name = hashlib.sha1(path.encode("utf-8")).hexdigest()
             module_pyname = "{prefix}.{name}".format(
-                prefix='apprise.custom.module', name=module_name)
+                prefix="apprise.custom.module", name=module_name
+            )
 
             if module_pyname in self._custom_module_map:
                 # First clear out existing entries
-                for schema in \
-                        self._custom_module_map[module_pyname]['notify']\
-                        .keys():
+                for schema in self._custom_module_map[module_pyname]["notify"]:
 
                     # Remove any mapped modules to this file
                     del self._schema_map[schema]
@@ -336,35 +341,39 @@ def _import_module(path):
             module = import_module(path, module_pyname)
             if not module:
                 # No problem, we can't use this object
-                logger.warning('Failed to load custom module: %s', _path)
+                logger.warning("Failed to load custom module: %s", path_)
                 return
 
             # Print our loaded modules if any
             if module_pyname in self._custom_module_map:
                 logger.debug(
-                    'Custom module %s - %d schema(s) (name=%s) '
-                    'loaded in %.6fs', _path,
-                    len(self._custom_module_map[module_pyname]['notify']),
-                    module_name, (time.time() - t_start))
+                    "Custom module %s - %d schema(s) (name=%s) "
+                    "loaded in %.6fs",
+                    path_,
+                    len(self._custom_module_map[module_pyname]["notify"]),
+                    module_name,
+                    (time.time() - t_start),
+                )
 
                 # Add our plugin name to our module map
                 self._module_map[module_name] = {
-                    'plugin': set(),
-                    'module': module,
-                    'path': module_pyname,
-                    'native': False,
+                    "plugin": set(),
+                    "module": module,
+                    "path": module_pyname,
+                    "native": False,
                 }
 
-                for schema, meta in\
-                        self._custom_module_map[module_pyname]['notify']\
-                        .items():
+                for schema, _meta in self._custom_module_map[module_pyname][
+                    "notify"
+                ].items():
 
                     # For mapping purposes; map our element in our main list
-                    self._module_map[module_name]['plugin'].add(
-                        self._schema_map[schema])
+                    self._module_map[module_name]["plugin"].add(
+                        self._schema_map[schema]
+                    )
 
                     # Log our success
-                    logger.info('Loaded custom notification: %s://', schema)
+                    logger.info("Loaded custom notification: %s://", schema)
             else:
                 # The code reaches here if we successfully loaded the Python
                 # module but no hooks/triggers were found. So we can safely
@@ -375,40 +384,44 @@ def _import_module(path):
             # end of _import_module()
             return
 
-        for _path in paths:
-            path = path_decode(_path)
-            if (cache and path in self._paths_previously_scanned) \
-                    or not os.path.exists(path):
+        for path_ in paths:
+            path = path_decode(path_)
+            if (
+                cache and path in self._paths_previously_scanned
+            ) or not os.path.exists(path):
                 # We're done as we've already scanned this
                 continue
 
             # Store our path as a way of hashing it has been handled
             self._paths_previously_scanned.add(path)
 
-            if os.path.isdir(path) and not \
-                    os.path.isfile(os.path.join(path, '__init__.py')):
+            if os.path.isdir(path) and not os.path.isfile(
+                os.path.join(path, "__init__.py")
+            ):
 
-                logger.debug('Scanning for custom plugins in: %s', path)
+                logger.debug("Scanning for custom plugins in: %s", path)
                 for entry in os.listdir(path):
                     re_match = module_re.match(entry)
                     if not re_match:
                         # keep going
-                        logger.trace('Plugin Scan: Ignoring %s', entry)
+                        logger.trace("Plugin Scan: Ignoring %s", entry)
                         continue
 
                     new_path = os.path.join(path, entry)
                     if os.path.isdir(new_path):
                         # Update our path
-                        new_path = os.path.join(path, entry, '__init__.py')
+                        new_path = os.path.join(path, entry, "__init__.py")
                         if not os.path.isfile(new_path):
                             logger.trace(
-                                'Plugin Scan: Ignoring %s',
-                                os.path.join(path, entry))
+                                "Plugin Scan: Ignoring %s",
+                                os.path.join(path, entry),
+                            )
                             continue
 
-                    if not cache or \
-                            (cache and new_path not in
-                             self._paths_previously_scanned):
+                    if not cache or (
+                        cache
+                        and new_path not in self._paths_previously_scanned
+                    ):
                         # Load our module
                         _import_module(new_path)
 
@@ -419,7 +432,7 @@ def _import_module(path):
                     # This logic is safe to apply because we already
                     # validated the directories state above; update our
                     # path
-                    path = os.path.join(path, '__init__.py')
+                    path = os.path.join(path, "__init__.py")
                     if cache and path in self._paths_previously_scanned:
                         continue
 
@@ -430,7 +443,7 @@ def _import_module(path):
                 # must be a match and must have a .py extension
                 if not re_match or not re_match.group(1):
                     # keep going
-                    logger.trace('Plugin Scan: Ignoring %s', path)
+                    logger.trace("Plugin Scan: Ignoring %s", path)
                     continue
 
                 # Load our module
@@ -438,10 +451,8 @@ def _import_module(path):
 
         return None
 
-    def add(self, plugin, schemas=None, url=None, send_func=None):
-        """
-        Ability to manually add Notification services to our stack
-        """
+    def add(self, plugin, schemas=None, url=None, send_func=None, force=False):
+        """Ability to manually add Notification services to our stack."""
 
         if not self:
             # Lazy load
@@ -450,7 +461,9 @@ def add(self, plugin, schemas=None, url=None, send_func=None):
         # Acquire a list of schemas
         p_schemas = parse_list(plugin.secure_protocol, plugin.protocol)
         if isinstance(schemas, str):
-            schemas = [schemas, ]
+            schemas = [
+                schemas,
+            ]
 
         elif schemas is None:
             # Default
@@ -459,26 +472,57 @@ def add(self, plugin, schemas=None, url=None, send_func=None):
         if not schemas or not isinstance(schemas, (set, tuple, list)):
             # We're done
             logger.error(
-                'The schemas provided (type %s) is unsupported; '
-                'loaded from %s.',
+                "The schemas provided (type %s) is unsupported; "
+                "loaded from %s.",
                 type(schemas),
-                send_func.__name__ if send_func else plugin.__class__.__name__)
+                send_func.__name__ if send_func else plugin.__class__.__name__,
+            )
             return False
 
         # Convert our schemas into a set
-        schemas = set([s.lower() for s in schemas]) | set(p_schemas)
+        schemas = {s.lower() for s in schemas} | set(p_schemas)
 
         # Valdation
         conflict = [s for s in schemas if s in self]
         if conflict:
-            # we're already handling this schema
-            logger.warning(
-                'The schema(s) (%s) are already defined and could not be '
-                'loaded from %s%s.',
-                ', '.join(conflict),
-                'custom notify function ' if send_func else '',
-                send_func.__name__ if send_func else plugin.__class__.__name__)
-            return False
+            if force:
+                # Force implies that we unmap any conflicting schema entries
+                # at the Apprise level, but we do not unload any previously
+                # imported modules. This ensures other classes can safely
+                # subclass from prior notify classes.
+                logger.debug(
+                    "The schema(s) (%s) are already defined and will be "
+                    "force loaded; overriding %s%s.",
+                    ", ".join(conflict),
+                    "custom notify function " if send_func else "",
+                    send_func.__name__ if send_func
+                    else plugin.__class__.__name__,
+                )
+                self.remove(*conflict, unload=False)
+
+            else:
+                logger.warning(
+                    "The schema(s) (%s) are already defined and could not be "
+                    "loaded from %s%s.",
+                    ", ".join(conflict),
+                    "custom notify function " if send_func else "",
+                    send_func.__name__ if send_func
+                    else plugin.__class__.__name__,
+                )
+                return False
+
+            # Re-check for conflicts after unmapping
+            conflict = [s for s in schemas if s in self]
+            if conflict:
+                logger.warning(
+                    "The schema(s) (%s) are already defined and could not be "
+                    "loaded from %s%s.",
+                    ", ".join(conflict),
+                    "custom notify function " if send_func else "",
+                    send_func.__name__ if send_func
+                    else plugin.__class__.__name__,
+                )
+                return False
 
         if send_func:
             # Acquire the function name
@@ -495,37 +539,37 @@ def add(self, plugin, schemas=None, url=None, send_func=None):
                 self._custom_module_map[module_name] = {
                     # Name can be useful for indexing back into the
                     # _module_map object; this is the key to do it with:
-                    'name': module_name.split('.')[-1],
-
+                    "name": module_name.split(".")[-1],
                     # The path to the module loaded
-                    'path': path,
-
+                    "path": path,
                     # Initialize our template
-                    'notify': {},
+                    "notify": {},
                 }
 
             for schema in schemas:
-                self._custom_module_map[module_name]['notify'][schema] = {
+                self._custom_module_map[module_name]["notify"][schema] = {
                     # The name of the send function the @notify decorator
                     # wrapped
-                    'fn_name': fn_name,
+                    "fn_name": fn_name,
                     # The URL that was provided in the @notify decorator call
                     # associated with the 'on='
-                    'url': url,
+                    "url": url,
                 }
 
         else:
             module_name = hashlib.sha1(
-                ''.join(schemas).encode('utf-8')).hexdigest()
+                "".join(schemas).encode("utf-8")
+            ).hexdigest()
             module_pyname = "{prefix}.{name}".format(
-                prefix='apprise.adhoc.module', name=module_name)
+                prefix="apprise.adhoc.module", name=module_name
+            )
 
             # Add our plugin name to our module map
             self._module_map[module_name] = {
-                'plugin': set([plugin]),
-                'module': None,
-                'path': module_pyname,
-                'native': False,
+                "plugin": {plugin},
+                "module": None,
+                "path": module_pyname,
+                "native": False,
             }
 
         for schema in schemas:
@@ -534,38 +578,30 @@ def add(self, plugin, schemas=None, url=None, send_func=None):
 
         return True
 
-    def remove(self, *schemas):
-        """
-        Removes a loaded element (if defined)
-        """
+    def remove(self, *schemas, unload=True):
+        """Removes a loaded element (if defined)"""
         if not self:
             # Lazy load
             self.load_modules()
 
         for schema in schemas:
-            try:
-                del self[schema]
-
-            except KeyError:
-                pass
+            with contextlib.suppress(KeyError):
+                self._unmap_schema(schema, unload=unload)
 
     def plugins(self, include_disabled=True):
-        """
-        Return all of our loaded plugins
-        """
+        """Return all of our loaded plugins."""
         if not self:
             # Lazy load
             self.load_modules()
 
         for module in self._module_map.values():
-            for plugin in module['plugin']:
+            for plugin in module["plugin"]:
                 if not include_disabled and not plugin.enabled:
                     continue
                 yield plugin
 
     def schemas(self, include_disabled=True):
-        """
-        Return all of our loaded schemas
+        """Return all of our loaded schemas.
 
         if include_disabled == True, then even disabled notifications are
         returned
@@ -575,13 +611,14 @@ def schemas(self, include_disabled=True):
             self.load_modules()
 
         # Return our list
-        return list(self._schema_map.keys()) if include_disabled else \
-            [s for s in self._schema_map.keys() if self._schema_map[s].enabled]
+        return (
+            list(self._schema_map.keys())
+            if include_disabled
+            else [s for s in self._schema_map if self._schema_map[s].enabled]
+        )
 
     def disable(self, *schemas):
-        """
-        Disables the modules associated with the specified schemas
-        """
+        """Disables the modules associated with the specified schemas."""
         if not self:
             # Lazy load
             self.load_modules()
@@ -598,9 +635,7 @@ def disable(self, *schemas):
             self._disabled.add(schema)
 
     def enable_only(self, *schemas):
-        """
-        Disables the modules associated with the specified schemas
-        """
+        """Disables the modules associated with the specified schemas."""
         if not self:
             # Lazy load
             self.load_modules()
@@ -611,7 +646,8 @@ def enable_only(self, *schemas):
         for plugin in self.plugins():
             # Get our plugin's schema list
             p_schemas = set(
-                parse_list(plugin.secure_protocol, plugin.protocol))
+                parse_list(plugin.secure_protocol, plugin.protocol)
+            )
 
             if not schemas & p_schemas:
                 if plugin.enabled:
@@ -629,9 +665,7 @@ def enable_only(self, *schemas):
                 plugin.enabled = True
 
     def __contains__(self, schema):
-        """
-        Checks if a schema exists
-        """
+        """Checks if a schema exists."""
         if not self:
             # Lazy load
             self.load_modules()
@@ -639,31 +673,76 @@ def __contains__(self, schema):
         return schema in self._schema_map
 
     def __delitem__(self, schema):
+        """
+        removes schema map and also unloads it from memory
+        """
+        self._unmap_schema(schema, unload=True)
+
+    def __setitem__(self, schema, plugin):
+        """Support fast assigning of Plugin/Notification Objects."""
         if not self:
             # Lazy load
             self.load_modules()
 
-        # Get our plugin (otherwise we throw a KeyError) which is
-        # intended on del action that doesn't align
+        # Set default values if not otherwise set
+        if not plugin.service_name:
+            # Assign service name if one doesn't exist
+            plugin.service_name = f"{schema}://"
+
+        p_schemas = set(parse_list(plugin.secure_protocol, plugin.protocol))
+        if not p_schemas:
+            # Assign our protocol
+            plugin.secure_protocol = schema
+            p_schemas.add(schema)
+
+        elif schema not in p_schemas:
+            # Add our others (if defined)
+            plugin.secure_protocol = {
+                schema,
+                *parse_list(plugin.secure_protocol),
+            }
+            p_schemas.add(schema)
+
+        if not self.add(plugin, schemas=p_schemas):
+            raise KeyError("Conflicting Assignment")
+
+    def _unmap_schema(self, schema, *, unload=True):
+        """Unmap a schema entry without necessarily unloading modules.
+
+        This function removes the schema mapping and updates internal cross
+        references. When unload is True (default), modules are removed from
+        sys.modules when they are no longer referenced by Apprise. When unload
+        is False, the unmapping is performed but any imported modules remain
+        intact in sys.modules.
+        """
+
+        if not self:
+            # Lazy load
+            self.load_modules()
+
+        # Get our plugin (otherwise we throw a KeyError) which is intended on
+        # unmap action that doesn't align.
         plugin = self._schema_map[schema]
 
         # Our list of all schema entries
-        p_schemas = set([schema])
+        p_schemas = {schema}
 
         for key in list(self._module_map.keys()):
-            if plugin in self._module_map[key]['plugin']:
+            if plugin in self._module_map[key]["plugin"]:
                 # Remove our plugin
-                self._module_map[key]['plugin'].remove(plugin)
+                self._module_map[key]["plugin"].remove(plugin)
 
                 # Custom Plugin Entry; Clean up cross reference
-                module_pyname = self._module_map[key]['path']
-                if not self._module_map[key]['native'] and \
-                        module_pyname in self._custom_module_map:
+                module_pyname = self._module_map[key]["path"]
+                if (
+                    not self._module_map[key]["native"]
+                    and module_pyname in self._custom_module_map
+                ):
 
-                    del self.\
-                        _custom_module_map[module_pyname]['notify'][schema]
+                    del self._custom_module_map[module_pyname][
+                        "notify"][schema]
 
-                    if not self._custom_module_map[module_pyname]['notify']:
+                    if not self._custom_module_map[module_pyname]["notify"]:
                         #
                         # Last custom loaded element
                         #
@@ -671,61 +750,34 @@ def __delitem__(self, schema):
                         # Free up custom object entry
                         del self._custom_module_map[module_pyname]
 
-                if not self._module_map[key]['plugin']:
+                if not self._module_map[key]["plugin"]:
                     #
                     # Last element
                     #
-                    if self._module_map[key]['native']:
+                    if self._module_map[key]["native"]:
                         # Get our plugin's schema list
-                        p_schemas = \
-                            set([s for s in parse_list(
-                                 plugin.secure_protocol, plugin.protocol)
-                                 if s in self._schema_map])
-
-                    # free system memory
-                    if self._module_map[key]['module']:
-                        del sys.modules[self._module_map[key]['path']]
-
-                    # free last remaining pointer in module map
+                        p_schemas = {
+                            s
+                            for s in parse_list(
+                                plugin.secure_protocol, plugin.protocol
+                            )
+                            if s in self._schema_map
+                        }
+
+                    # Free system memory only when unload=True
+                    if unload and self._module_map[key]["module"]:
+                        with contextlib.suppress(KeyError):
+                            del sys.modules[self._module_map[key]["path"]]
+
+                    # Free last remaining pointer in module map
                     del self._module_map[key]
 
         for schema in p_schemas:
-            # Final Tidy
+            # Final tidy
             del self._schema_map[schema]
 
-    def __setitem__(self, schema, plugin):
-        """
-        Support fast assigning of Plugin/Notification Objects
-        """
-        if not self:
-            # Lazy load
-            self.load_modules()
-
-        # Set default values if not otherwise set
-        if not plugin.service_name:
-            # Assign service name if one doesn't exist
-            plugin.service_name = f'{schema}://'
-
-        p_schemas = set(
-            parse_list(plugin.secure_protocol, plugin.protocol))
-        if not p_schemas:
-            # Assign our protocol
-            plugin.secure_protocol = schema
-            p_schemas.add(schema)
-
-        elif schema not in p_schemas:
-            # Add our others (if defined)
-            plugin.secure_protocol = \
-                set([schema] + parse_list(plugin.secure_protocol))
-            p_schemas.add(schema)
-
-        if not self.add(plugin, schemas=p_schemas):
-            raise KeyError('Conflicting Assignment')
-
     def __getitem__(self, schema):
-        """
-        Returns the indexed plugin identified by the schema specified
-        """
+        """Returns the indexed plugin identified by the schema specified."""
         if not self:
             # Lazy load
             self.load_modules()
@@ -733,9 +785,7 @@ def __getitem__(self, schema):
         return self._schema_map[schema]
 
     def __iter__(self):
-        """
-        Returns an iterator so we can iterate over our loaded modules
-        """
+        """Returns an iterator so we can iterate over our loaded modules."""
         if not self:
             # Lazy load
             self.load_modules()
@@ -743,9 +793,7 @@ def __iter__(self):
         return iter(self._module_map.values())
 
     def __len__(self):
-        """
-        Returns the number of modules/plugins loaded
-        """
+        """Returns the number of modules/plugins loaded."""
         if not self:
             # Lazy load
             self.load_modules()
@@ -753,7 +801,5 @@ def __len__(self):
         return len(self._module_map)
 
     def __bool__(self):
-        """
-        Determines if object has loaded or not
-        """
-        return True if self._loaded and self._module_map is not None else False
+        """Determines if object has loaded or not."""
+        return bool(self._loaded and self._module_map is not None)
diff --git a/libs/apprise/manager_attachment.py b/libs/apprise/manager_attachment.py
index ffd31ebc95..3e612f14e4 100644
--- a/libs/apprise/manager_attachment.py
+++ b/libs/apprise/manager_attachment.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,34 +25,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from os.path import abspath, dirname, join
 import re
-from os.path import dirname
-from os.path import abspath
-from os.path import join
+
 from .manager import PluginManager
 
 
 class AttachmentManager(PluginManager):
-    """
-    Designed to be a singleton object to maintain all initialized
-    attachment plugins/modules in memory.
-    """
+    """Designed to be a singleton object to maintain all initialized attachment
+    plugins/modules in memory."""
 
     # Description (used for logging)
-    name = 'Attachment Plugin'
+    name = "Attachment Plugin"
 
     # Filename Prefix to filter on
-    fname_prefix = 'Attach'
+    fname_prefix = "Attach"
 
     # Memory Space
-    _id = 'attachment'
+    _id = "attachment"
 
     # Our Module Python path name
-    module_name_prefix = f'apprise.{_id}'
+    module_name_prefix = f"apprise.{_id}"
 
     # The module path to scan
     module_path = join(abspath(dirname(__file__)), _id)
 
     # For filtering our result set
     module_filter_re = re.compile(
-        r'^(?P<name>' + fname_prefix + r'(?!Base)[A-Za-z0-9]+)$')
+        r"^(?P<name>" + fname_prefix + r"(?!Base)[A-Za-z0-9]+)$"
+    )
diff --git a/libs/apprise/manager_config.py b/libs/apprise/manager_config.py
index d7b0fe0834..0544a65004 100644
--- a/libs/apprise/manager_config.py
+++ b/libs/apprise/manager_config.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,34 +25,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from os.path import abspath, dirname, join
 import re
-from os.path import dirname
-from os.path import abspath
-from os.path import join
+
 from .manager import PluginManager
 
 
 class ConfigurationManager(PluginManager):
-    """
-    Designed to be a singleton object to maintain all initialized
-    configuration plugins/modules in memory.
-    """
+    """Designed to be a singleton object to maintain all initialized
+    configuration plugins/modules in memory."""
 
     # Description (used for logging)
-    name = 'Configuration Plugin'
+    name = "Configuration Plugin"
 
     # Filename Prefix to filter on
-    fname_prefix = 'Config'
+    fname_prefix = "Config"
 
     # Memory Space
-    _id = 'config'
+    _id = "config"
 
     # Our Module Python path name
-    module_name_prefix = f'apprise.{_id}'
+    module_name_prefix = f"apprise.{_id}"
 
     # The module path to scan
     module_path = join(abspath(dirname(__file__)), _id)
 
     # For filtering our result set
     module_filter_re = re.compile(
-        r'^(?P<name>' + fname_prefix + r'(?!Base)[A-Za-z0-9]+)$')
+        r"^(?P<name>" + fname_prefix + r"(?!Base)[A-Za-z0-9]+)$"
+    )
diff --git a/libs/apprise/manager_plugins.py b/libs/apprise/manager_plugins.py
index 0eb5465e76..00ac595118 100644
--- a/libs/apprise/manager_plugins.py
+++ b/libs/apprise/manager_plugins.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,35 +25,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from os.path import abspath, dirname, join
 import re
-from os.path import dirname
-from os.path import abspath
-from os.path import join
+
 from .manager import PluginManager
 
 
 class NotificationManager(PluginManager):
-    """
-    Designed to be a singleton object to maintain all initialized notifications
-    in memory.
-    """
+    """Designed to be a singleton object to maintain all initialized
+    notifications in memory."""
 
     # Description (used for logging)
-    name = 'Notification Plugin'
+    name = "Notification Plugin"
 
     # Filename Prefix to filter on
-    fname_prefix = 'Notify'
+    fname_prefix = "Notify"
 
     # Memory Space
-    _id = 'plugins'
+    _id = "plugins"
 
     # Our Module Python path name
-    module_name_prefix = f'apprise.{_id}'
+    module_name_prefix = f"apprise.{_id}"
 
     # The module path to scan
     module_path = join(abspath(dirname(__file__)), _id)
 
     # For filtering our result set
     module_filter_re = re.compile(
-        r'^(?P<name>' + fname_prefix +
-        r'(?!Base|ImageSize|Type)[A-Za-z0-9]+)$')
+        r"^(?P<name>" + fname_prefix + r"(?!Base|ImageSize|Type)[A-Za-z0-9]+)$"
+    )
diff --git a/libs/apprise/persistent_store.py b/libs/apprise/persistent_store.py
index 8299d6f459..926647af87 100644
--- a/libs/apprise/persistent_store.py
+++ b/libs/apprise/persistent_store.py
@@ -1,82 +1,81 @@
-# -*- coding: utf-8 -*-
+# BSD 2-Clause License
 #
-# Copyright (C) 2025 Chris Caron <lead2gold@gmail.com>
-# All rights reserved.
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
-# This code is licensed under the MIT License.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files(the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions :
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
 #
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-import os
-import re
-import gzip
-import zlib
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
 import base64
-import glob
-import tempfile
-import json
 import binascii
-from . import exception
+import builtins
+import contextlib
+from datetime import datetime, timedelta, timezone
+import glob
+import gzip
+import hashlib
 from itertools import chain
-from datetime import datetime, timezone, timedelta
+import json
+import os
+import re
+import tempfile
 import time
-import hashlib
-from .common import PersistentStoreMode, PERSISTENT_STORE_MODES
-from .utils.disk import path_decode
+from typing import Any, Optional, Union
+import zlib
+
+from . import exception
+from .common import PersistentStoreMode
 from .logger import logger
+from .utils.disk import path_decode
 
 # Used for writing/reading time stored in cache file
 EPOCH = datetime(1970, 1, 1, tzinfo=timezone.utc)
 
 # isoformat is spelled out for compatibility with Python v3.6
-AWARE_DATE_ISO_FORMAT = '%Y-%m-%dT%H:%M:%S.%f%z'
-NAIVE_DATE_ISO_FORMAT = '%Y-%m-%dT%H:%M:%S.%f'
+AWARE_DATE_ISO_FORMAT = "%Y-%m-%dT%H:%M:%S.%f%z"
+NAIVE_DATE_ISO_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
 
 
 def _ntf_tidy(ntf):
-    """
-    Reusable NamedTemporaryFile cleanup
-    """
+    """Reusable NamedTemporaryFile Cleanup."""
     if ntf:
         # Cleanup
-        try:
+        with contextlib.suppress(OSError):
             ntf.close()
 
-        except OSError:
-            # Already closed
-            pass
-
         try:
             os.unlink(ntf.name)
-            logger.trace(
-                'Persistent temporary file removed: %s', ntf.name)
+            logger.trace("Persistent temporary file removed: %s", ntf.name)
 
         except (FileNotFoundError, AttributeError):
             # AttributeError: something weird was passed in, no action required
             # FileNotFound: no worries; we were removing it anyway
             pass
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             logger.error(
-                'Persistent temporary file removal failed: %s',
-                ntf.name)
-            logger.debug(
-                'Persistent Storage Exception: %s', str(e))
+                "Persistent temporary file removal failed: %s", ntf.name
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
 
 
 class CacheObject:
@@ -84,10 +83,13 @@ class CacheObject:
     hash_engine = hashlib.sha256
     hash_length = 6
 
-    def __init__(self, value=None, expires=False, persistent=True):
-        """
-        Tracks our objects and associates a time limit with them
-        """
+    def __init__(
+        self,
+        value: Any = None,
+        expires: Union[bool, float, int, datetime, None] = False,
+        persistent: bool = True,
+    ) -> None:
+        """Tracks our objects and associates a time limit with them."""
 
         self.__value = value
         self.__class_name = value.__class__.__name__
@@ -97,18 +99,21 @@ def __init__(self, value=None, expires=False, persistent=True):
             self.set_expiry(expires)
 
         # Whether or not we persist this object to disk or not
-        self.__persistent = True if persistent else False
-
-    def set(self, value, expires=None, persistent=None):
-        """
-        Sets fields on demand, if set to none, then they are left as is
+        self.__persistent = bool(persistent)
 
-        The intent of set is that it allows you to set a new a value
-        and optionally alter meta information against it.
+    def set(
+        self,
+        value: Any,
+        expires: Union[bool, float, int, datetime, None] = None,
+        persistent: Optional[bool] = None,
+    ) -> None:
+        """Sets fields on demand, if set to none, then they are left as is.
 
-        If expires or persistent isn't specified then their previous values
-        are used.
+        The intent of set is that it allows you to set a new a value and
+        optionally alter meta information against it.
 
+        If expires or persistent isn't specified then their previous values are
+        used.
         """
 
         self.__value = value
@@ -117,12 +122,11 @@ def set(self, value, expires=None, persistent=None):
             self.set_expiry(expires)
 
         if persistent is not None:
-            self.__persistent = True if persistent else False
+            self.__persistent = bool(persistent)
 
-    def set_expiry(self, expires=None):
-        """
-        Sets a new expiry
-        """
+    def set_expiry(self, expires:
+                   Union[datetime, bool, float, int, None] = None) -> None:
+        """Sets a new expiry."""
 
         if isinstance(expires, datetime):
             self.__expires = expires.astimezone(timezone.utc)
@@ -136,72 +140,82 @@ def set_expiry(self, expires=None):
             self.__expires = datetime.now(tz=timezone.utc)
 
         elif isinstance(expires, (float, int)):
-            self.__expires = \
-                datetime.now(tz=timezone.utc) + timedelta(seconds=expires)
+            self.__expires = datetime.now(tz=timezone.utc) + timedelta(
+                seconds=expires
+            )
 
         else:  # Unsupported
             raise AttributeError(
-                f"An invalid expiry time ({expires} was specified")
-
-    def hash(self):
-        """
-        Our checksum to track the validity of our data
-        """
-        try:
-            return self.hash_engine(
-                str(self).encode('utf-8'), usedforsecurity=False).hexdigest()
+                f"An invalid expiry time ({expires} was specified"
+            )
 
-        except TypeError:
-            # Python <= v3.8 - usedforsecurity flag does not work
-            return self.hash_engine(str(self).encode('utf-8')).hexdigest()
+    def hash(self) -> str:
+        """Our checksum to track the validity of our data."""
+        return self.hash_engine(
+            str(self).encode("utf-8"), usedforsecurity=False
+        ).hexdigest()
 
-    def json(self):
-        """
-        Returns our preparable json object
-        """
+    def json(self) -> Optional[dict[str, Any]]:
+        """Returns our preparable json object."""
 
         return {
-            'v': self.__value,
-            'x': (self.__expires - EPOCH).total_seconds()
-            if self.__expires else None,
-            'c': self.__class_name if not isinstance(self.__value, datetime)
-            else (
-                'aware_datetime' if self.__value.tzinfo else 'naive_datetime'),
-            '!': self.hash()[:self.hash_length],
+            "v": self.__value,
+            "x": (
+                (self.__expires - EPOCH).total_seconds()
+                if self.__expires
+                else None
+            ),
+            "c": (
+                self.__class_name
+                if not isinstance(self.__value, datetime)
+                else (
+                    "aware_datetime"
+                    if self.__value.tzinfo
+                    else "naive_datetime"
+                )
+            ),
+            "!": self.hash()[: self.hash_length],
         }
 
     @staticmethod
-    def instantiate(content, persistent=True, verify=True):
-        """
-        Loads back data read in and returns a CacheObject or None if it could
-        not be loaded. You can pass in the contents of CacheObject.json() and
-        you'll receive a copy assuming the hash checks okay
+    def instantiate(
+        content: dict[str, Any],
+        persistent: bool = True,
+        verify: bool = True,
+    ) -> Optional["CacheObject"]:
+        """Loads back data read in and returns a CacheObject or None if it
+        could not be loaded.
 
+        You can pass in the contents of CacheObject.json() and you'll receive a
+        copy assuming the hash checks okay
         """
         try:
-            value = content['v']
-            expires = content['x']
+            value = content["v"]
+            expires = content["x"]
             if expires is not None:
                 expires = datetime.fromtimestamp(expires, timezone.utc)
 
             # Acquire some useful integrity objects
-            class_name = content.get('c', '')
+            class_name = content.get("c", "")
             if not isinstance(class_name, str):
-                raise TypeError('Class name not expected string')
+                raise TypeError("Class name not expected string")
 
-            hashsum = content.get('!', '')
+            hashsum = content.get("!", "")
             if not isinstance(hashsum, str):
-                raise TypeError('SHA1SUM not expected string')
+                raise TypeError("SHA1SUM not expected string")
 
         except (TypeError, KeyError) as e:
-            logger.trace(f'CacheObject could not be parsed from {content}')
-            logger.trace('CacheObject exception: %s', str(e))
+            logger.trace(f"CacheObject could not be parsed from {content}")
+            logger.trace("CacheObject exception: %s", str(e))
             return None
 
-        if class_name in ('aware_datetime', 'naive_datetime', 'datetime'):
+        if class_name in ("aware_datetime", "naive_datetime", "datetime"):
             # If datetime is detected, it will fall under the naive category
-            iso_format = AWARE_DATE_ISO_FORMAT \
-                if class_name[0] == 'a' else NAIVE_DATE_ISO_FORMAT
+            iso_format = (
+                AWARE_DATE_ISO_FORMAT
+                if class_name[0] == "a"
+                else NAIVE_DATE_ISO_FORMAT
+            )
             try:
                 # Python v3.6 Support
                 value = datetime.strptime(value, iso_format)
@@ -210,64 +224,63 @@ def instantiate(content, persistent=True, verify=True):
                 # TypeError is thrown if content is not string
                 # ValueError is thrown if the string is not a valid format
                 logger.trace(
-                    f'CacheObject (dt) corrupted loading from {content}')
+                    f"CacheObject (dt) corrupted loading from {content}"
+                )
                 return None
 
-        elif class_name == 'bytes':
+        elif class_name == "bytes":
             try:
                 # Convert our object back to a bytes
                 value = base64.b64decode(value)
 
             except binascii.Error:
                 logger.trace(
-                    f'CacheObject (bin) corrupted loading from {content}')
+                    f"CacheObject (bin) corrupted loading from {content}"
+                )
                 return None
 
         # Initialize our object
         co = CacheObject(value, expires, persistent=persistent)
-        if verify and co.hash()[:co.hash_length] != hashsum:
+        if verify and co.hash()[: co.hash_length] != hashsum:
             # Our object was tampered with
-            logger.debug(f'Tampering detected with cache entry {co}')
+            logger.debug(f"Tampering detected with cache entry {co}")
             del co
             return None
 
         return co
 
     @property
-    def value(self):
-        """
-        Returns our value
-        """
+    def value(self) -> Any:
+        """Returns our value."""
         return self.__value
 
     @property
-    def persistent(self):
-        """
-        Returns our persistent value
-        """
+    def persistent(self) -> bool:
+        """Returns our persistent value."""
         return self.__persistent
 
     @property
-    def expires(self):
-        """
-        Returns the datetime the object will expire
-        """
+    def expires(self) -> Optional[datetime]:
+        """Returns the datetime the object will expire."""
         return self.__expires
 
     @property
-    def expires_sec(self):
-        """
-        Returns the number of seconds from now the object will expire
-        """
-
-        return None if self.__expires is None else max(
-            0.0, (self.__expires - datetime.now(tz=timezone.utc))
-            .total_seconds())
+    def expires_sec(self) -> Optional[float]:
+        """Returns the number of seconds from now the object will expire."""
+
+        return (
+            None
+            if self.__expires is None
+            else max(
+                0.0,
+                (
+                    self.__expires - datetime.now(tz=timezone.utc)
+                ).total_seconds(),
+            )
+        )
 
-    def __bool__(self):
-        """
-        Returns True it the object hasn't expired, and False if it has
-        """
+    def __bool__(self) -> bool:
+        """Returns True it the object hasn't expired, and False if it has."""
         if self.__expires is None:
             # No Expiry
             return True
@@ -275,48 +288,45 @@ def __bool__(self):
         # Calculate if we've expired or not
         return self.__expires > datetime.now(tz=timezone.utc)
 
-    def __eq__(self, other):
-        """
-        Handles equality == flag
-        """
+    def __eq__(self, other) -> bool:
+        """Handles equality == flag."""
         if isinstance(other, CacheObject):
             return str(self) == str(other)
 
         return self.__value == other
 
-    def __str__(self):
-        """
-        string output of our data
-        """
-        persistent = '+' if self.persistent else '-'
-        return f'{self.__class_name}:{persistent}:{self.__value} expires: ' +\
-            ('never' if self.__expires is None
-             else self.__expires.strftime(NAIVE_DATE_ISO_FORMAT))
+    def __str__(self) -> str:
+        """String output of our data."""
+        persistent = "+" if self.persistent else "-"
+        return f"{self.__class_name}:{persistent}:{self.__value} expires: " + (
+            "never"
+            if self.__expires is None
+            else self.__expires.strftime(NAIVE_DATE_ISO_FORMAT)
+        )
 
 
 class CacheJSONEncoder(json.JSONEncoder):
-    """
-    A JSON Encoder for handling each of our cache objects
-    """
+    """A JSON Encoder for handling each of our cache objects."""
 
     def default(self, entry):
         if isinstance(entry, datetime):
             return entry.strftime(
-                AWARE_DATE_ISO_FORMAT if entry.tzinfo is not None
-                else NAIVE_DATE_ISO_FORMAT)
+                AWARE_DATE_ISO_FORMAT
+                if entry.tzinfo is not None
+                else NAIVE_DATE_ISO_FORMAT
+            )
 
         elif isinstance(entry, CacheObject):
             return entry.json()
 
         elif isinstance(entry, bytes):
-            return base64.b64encode(entry).decode('utf-8')
+            return base64.b64encode(entry).decode("utf-8")
 
         return super().default(entry)
 
 
 class PersistentStore:
-    """
-    An object to make working with persistent storage easier
+    """An object to make working with persistent storage easier.
 
     read() and write() are used for direct file i/o
 
@@ -331,41 +341,46 @@ class PersistentStore:
     default_file_expiry = 2678400
 
     # File encoding to use
-    encoding = 'utf-8'
+    encoding = "utf-8"
 
     # Default data set
-    base_key = 'default'
+    base_key = "default"
 
     # Directory to store cache
-    __cache_key = 'cache'
+    __cache_key = "cache"
 
     # Our Temporary working directory
-    temp_dir = 'tmp'
+    temp_dir = "tmp"
 
     # The directory our persistent store content gets placed in
-    data_dir = 'var'
+    data_dir = "var"
 
     # Our Persistent Store File Extension
-    __extension = '.psdata'
+    __extension = ".psdata"
 
     # Identify our backup file extension
-    __backup_extension = '._psbak'
+    __backup_extension = "._psbak"
 
     # Used to verify the key specified is valid
     #  - must start with an alpha_numeric
     #  - following optional characters can include period, underscore and
     #    equal
-    __valid_key = re.compile(r'[a-z0-9][a-z0-9._-]*', re.I)
+    __valid_key = re.compile(r"[a-z0-9][a-z0-9._-]*", re.I)
 
     # Reference only
     __not_found_ref = (None, None)
 
-    def __init__(self, path=None, namespace='default', mode=None):
-        """
-        Provide the namespace to work within. namespaces can only contain
-        alpha-numeric characters with the exception of '-' (dash), '_'
-        (underscore), and '.' (period). The namespace must be be relative
-        to the current URL being controlled.
+    def __init__(
+        self,
+        path: Optional[str] = None,
+        namespace: str = "default",
+        mode: Optional[Union[str, PersistentStoreMode]] = None,
+    ) -> None:
+        """Provide the namespace to work within.
+
+        namespaces can only contain alpha-numeric characters with the exception
+        of '-' (dash), '_' (underscore), and '.' (period). The namespace must
+        be be relative to the current URL being controlled.
         """
         # Initalize our mode so __del__() calls don't go bad on the
         # error checking below
@@ -377,17 +392,19 @@ def __init__(self, path=None, namespace='default', mode=None):
         # Files to renew on calls to flush
         self.__renew = set()
 
-        if not isinstance(namespace, str) \
-                or not self.__valid_key.match(namespace):
+        if not isinstance(namespace, str) or not self.__valid_key.match(
+            namespace
+        ):
             raise AttributeError(
                 f"Persistent Storage namespace ({namespace}) provided is"
-                " invalid")
+                " invalid"
+            )
 
         if isinstance(path, str):
             # A storage path has been defined
             if mode is None:
                 # Store Default if no mode was provided along side of it
-                mode = PERSISTENT_STORE_MODES[0]
+                mode = PersistentStoreMode.AUTO
 
             # Store our information
             self.__base_path = os.path.join(path_decode(path), namespace)
@@ -400,13 +417,6 @@ def __init__(self, path=None, namespace='default', mode=None):
             self.__temp_path = None
             self.__data_path = None
 
-        if mode not in PERSISTENT_STORE_MODES:
-            raise AttributeError(
-                f"Persistent Storage mode ({mode}) provided is invalid")
-
-        # Store our mode
-        self.__mode = mode
-
         # Tracks when we have content to flush
         self.__dirty = False
 
@@ -417,17 +427,34 @@ def __init__(self, path=None, namespace='default', mode=None):
         # Internal Cache
         self._cache = None
 
+        try:
+            # Store our mode
+            self.__mode = (
+                mode if isinstance(mode, PersistentStoreMode)
+                else PersistentStoreMode(mode.lower())
+            )
+
+        except (AttributeError, ValueError):
+            err = (
+                f"An invalid persistent storage mode ({mode}) was specified.",
+            )
+            logger.warning(err)
+            raise AttributeError(err) from None
+
         # Prepare our environment
         self.__prepare()
 
-    def read(self, key=None, compress=True, expires=False):
-        """
-        Returns the content of the persistent store object
+    def read(
+        self,
+        key: Optional[str] = None,
+        compress: bool = True,
+        expires: Union[bool, float, int] = False,
+    ) -> Optional[bytes]:
+        """Returns the content of the persistent store object.
 
         if refresh is set to True, then the file's modify time is updated
-        preventing it from getting caught in prune calls.  It's a means
-        of allowing it to persist and not get cleaned up in later prune
-        calls.
+        preventing it from getting caught in prune calls.  It's a means of
+        allowing it to persist and not get cleaned up in later prune calls.
 
         Content is always returned as a byte object
         """
@@ -435,8 +462,11 @@ def read(self, key=None, compress=True, expires=False):
             with self.open(key, mode="rb", compress=compress) as fd:
                 results = fd.read(self.max_file_size)
                 if expires is False:
-                    self.__renew.add(os.path.join(
-                        self.__data_path, f"{key}{self.__extension}"))
+                    self.__renew.add(
+                        os.path.join(
+                            self.__data_path, f"{key}{self.__extension}"
+                        )
+                    )
 
                 return results
 
@@ -446,18 +476,22 @@ def read(self, key=None, compress=True, expires=False):
             #   - Logging of error already occurred inside self.open()
             pass
 
-        except (OSError, zlib.error, EOFError, UnicodeDecodeError,
-                IOError) as e:
+        except (OSError, zlib.error, EOFError, UnicodeDecodeError) as e:
             # We can't access the file or it does not exist
-            logger.warning('Could not read with persistent key: %s', key)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+            logger.warning("Could not read with persistent key: %s", key)
+            logger.debug("Persistent Storage Exception: %s", str(e))
 
         # return none
         return None
 
-    def write(self, data, key=None, compress=True, _recovery=False):
-        """
-        Writes the content to the persistent store if it doesn't exceed our
+    def write(
+        self,
+        data: Union[bytes, str, Any],
+        key: Optional[str] = None,
+        compress: bool = True,
+        _recovery: bool = False,
+    ) -> bool:
+        """Writes the content to the persistent store if it doesn't exceed our
         filesize limit.
 
         Content is always written as a byte object
@@ -470,32 +504,38 @@ def write(self, data, key=None, compress=True, _recovery=False):
 
         elif not isinstance(key, str) or not self.__valid_key.match(key):
             raise AttributeError(
-                f"Persistent Storage key ({key} provided is invalid")
+                f"Persistent Storage key ({key} provided is invalid"
+            )
 
         if not isinstance(data, (bytes, str)):
             # One last check, we will accept read() objets with the expectation
             # it will return a binary dataset
-            if not (hasattr(data, 'read') and callable(getattr(data, 'read'))):
+            if not (hasattr(data, "read") and callable(data.read)):
                 raise AttributeError(
-                    "Invalid data type {} provided to Persistent Storage"
-                    .format(type(data)))
+                    f"Invalid data type {type(data)} provided to Persistent"
+                    " Storage"
+                )
 
             try:
                 # Read in our data
                 data = data.read()
                 if not isinstance(data, (bytes, str)):
                     raise AttributeError(
-                        "Invalid data type {} provided to Persistent Storage"
-                        .format(type(data)))
+                        f"Invalid data type {type(data)} provided to"
+                        " Persistent Storage"
+                    )
 
             except Exception as e:
                 logger.warning(
-                    'Could read() from potential iostream with persistent '
-                    'key: %s', key)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Could read() from potential iostream with persistent "
+                    "key: %s",
+                    key,
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
                 raise exception.AppriseDiskIOError(
-                    "Invalid data type {} provided to Persistent Storage"
-                    .format(type(data)))
+                    f"Invalid data type {type(data)} provided to Persistent"
+                    " Storage"
+                ) from None
 
         if self.__mode == PersistentStoreMode.MEMORY:
             # Nothing further can be done
@@ -513,14 +553,14 @@ def write(self, data, key=None, compress=True, _recovery=False):
             prev_size = os.stat(io_file).st_size
 
         except FileNotFoundError:
-            # No worries, no size to accomodate
+            # No worries, no size to accommodate
             prev_size = 0
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             # Permission error of some kind or disk problem...
             # There is nothing we can do at this point
-            logger.warning('Could not write with persistent key: %s', key)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+            logger.warning("Could not write with persistent key: %s", key)
+            logger.debug("Persistent Storage Exception: %s", str(e))
             return False
 
         # Create a temporary file to write our content into
@@ -531,17 +571,17 @@ def write(self, data, key=None, compress=True, _recovery=False):
             if isinstance(data, str):
                 data = data.encode(self.encoding)
 
-            ntf = tempfile.NamedTemporaryFile(
-                mode="wb", dir=self.__temp_path,
-                delete=False)
+            ntf = tempfile.NamedTemporaryFile(  # noqa: SIM115
+                mode="wb", dir=self.__temp_path, delete=False
+            )
 
             # Close our file
             ntf.close()
 
             # Pointer to our open call
-            _open = open if not compress else gzip.open
+            open_ = open if not compress else gzip.open
 
-            with _open(ntf.name, mode='wb') as fd:
+            with open_(ntf.name, mode="wb") as fd:
                 # Write our content
                 fd.write(data)
 
@@ -550,15 +590,18 @@ def write(self, data, key=None, compress=True, _recovery=False):
 
             # Log our progress
             logger.trace(
-                'Wrote %d bytes of data to persistent key: %s',
-                new_file_size, key)
+                "Wrote %d bytes of data to persistent key: %s",
+                new_file_size,
+                key,
+            )
 
         except FileNotFoundError:
             # This happens if the directory path is gone preventing the file
             # from being created...
             if not _recovery:
                 return self.write(
-                    data=data, key=key, compress=compress, _recovery=True)
+                    data=data, key=key, compress=compress, _recovery=True
+                )
 
             # We've already made our best effort to recover if we are here in
             # our code base... we're going to have to exit
@@ -569,24 +612,26 @@ def write(self, data, key=None, compress=True, _recovery=False):
             # Early Exit
             return False
 
-        except (OSError, UnicodeEncodeError, IOError, zlib.error) as e:
+        except (OSError, UnicodeEncodeError, zlib.error) as e:
             # We can't access the file or it does not exist
-            logger.warning('Could not write to persistent key: %s', key)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+            logger.warning("Could not write to persistent key: %s", key)
+            logger.debug("Persistent Storage Exception: %s", str(e))
 
             # Tidy our Named Temporary File
             _ntf_tidy(ntf)
 
             return False
 
-        if self.max_file_size > 0 and (
-                new_file_size + self.size() - prev_size) > self.max_file_size:
+        if (
+            self.max_file_size > 0
+            and (new_file_size + self.size() - prev_size) > self.max_file_size
+        ):
             # The content to store is to large
             logger.warning(
-                'Persistent content exceeds allowable maximum file length '
-                '({}KB); provide {}KB'.format(
-                    int(self.max_file_size / 1024),
-                    int(new_file_size / 1024)))
+                "Persistent content exceeds allowable maximum file length"
+                f" ({int(self.max_file_size / 1024)}KB); provide"
+                f" {int(new_file_size / 1024)}KB"
+            )
             return False
 
         # Return our final move
@@ -605,16 +650,16 @@ def write(self, data, key=None, compress=True, _recovery=False):
         return True
 
     def __move(self, src, dst):
-        """
-        Moves the new file in place and handles the old if it exists already
+        """Moves the new file in place and handles the old if it exists already
         If the transaction fails in any way, the old file is swapped back.
 
         Function returns True if successful and False if not.
         """
 
         # A temporary backup of the file we want to move in place
-        dst_backup = dst[:-len(self.__backup_extension)] + \
-            self.__backup_extension
+        dst_backup = (
+            dst[: -len(self.__backup_extension)] + self.__backup_extension
+        )
 
         #
         # Backup the old file (if it exists) allowing us to have a restore
@@ -624,37 +669,42 @@ def __move(self, src, dst):
             # make sure the file isn't already present; if it is; remove it
             os.unlink(dst_backup)
             logger.trace(
-                'Removed previous persistent backup file: %s', dst_backup)
+                "Removed previous persistent backup file: %s", dst_backup
+            )
 
         except FileNotFoundError:
             # no worries; we were removing it anyway
             pass
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             # Permission error of some kind or disk problem...
             # There is nothing we can do at this point
             logger.warning(
-                'Could not previous persistent data backup: %s', dst_backup)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Could not previous persistent data backup: %s", dst_backup
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
             return False
 
         try:
             # Back our file up so we have a fallback
             os.rename(dst, dst_backup)
             logger.trace(
-                'Persistent storage backup file created: %s', dst_backup)
+                "Persistent storage backup file created: %s", dst_backup
+            )
 
         except FileNotFoundError:
             # Not a problem; this is a brand new file we're writing
             # There is nothing to backup
             pass
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             # This isn't good... we couldn't put our new file in place
             logger.warning(
-                'Could not install persistent content %s -> %s',
-                dst, os.path.basename(dst_backup))
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Could not install persistent content %s -> %s",
+                dst,
+                os.path.basename(dst_backup),
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
             return False
 
         #
@@ -662,41 +712,52 @@ def __move(self, src, dst):
         #
         try:
             os.rename(src, dst)
-            logger.trace('Persistent file installed: %s', dst)
+            logger.trace("Persistent file installed: %s", dst)
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             # This isn't good... we couldn't put our new file in place
             # Begin fall-back process before leaving the funtion
             logger.warning(
-                'Could not install persistent content %s -> %s',
-                src, os.path.basename(dst))
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Could not install persistent content %s -> %s",
+                src,
+                os.path.basename(dst),
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
             try:
                 # Restore our old backup (if it exists)
                 os.rename(dst_backup, dst)
-                logger.trace(
-                    'Restoring original persistent content: %s', dst)
+                logger.trace("Restoring original persistent content: %s", dst)
 
             except FileNotFoundError:
                 # Not a problem
                 pass
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # Permission error of some kind or disk problem...
                 # There is nothing we can do at this point
                 logger.warning(
-                    'Failed to restore original persistent file: %s', dst)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Failed to restore original persistent file: %s", dst
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
 
             return False
 
         return True
 
-    def open(self, key=None, mode='r', buffering=-1, encoding=None,
-             errors=None, newline=None, closefd=True, opener=None,
-             compress=False, compresslevel=9):
-        """
-        Returns an iterator to our our file within our namespace identified
+    def open(
+        self,
+        key: Optional[str] = None,
+        mode: str = "r",
+        buffering: int = -1,
+        encoding: Optional[str] = None,
+        errors: Optional[str] = None,
+        newline: Optional[str] = None,
+        closefd: bool = True,
+        opener: Optional[Any] = None,
+        compress: bool = False,
+        compresslevel: int = 9,
+    ) -> Any:
+        """Returns an iterator to our our file within our namespace identified
         by the key provided.
 
         If no key is provided, then the default is used
@@ -707,7 +768,8 @@ def open(self, key=None, mode='r', buffering=-1, encoding=None,
 
         elif not isinstance(key, str) or not self.__valid_key.match(key):
             raise AttributeError(
-                f"Persistent Storage key ({key} provided is invalid")
+                f"Persistent Storage key ({key} provided is invalid"
+            )
 
         if self.__mode == PersistentStoreMode.MEMORY:
             # Nothing further can be done
@@ -715,47 +777,70 @@ def open(self, key=None, mode='r', buffering=-1, encoding=None,
 
         io_file = os.path.join(self.__data_path, f"{key}{self.__extension}")
         try:
-            return open(
-                io_file, mode=mode, buffering=buffering, encoding=encoding,
-                errors=errors, newline=newline, closefd=closefd,
-                opener=opener) \
-                if not compress else gzip.open(
-                    io_file, compresslevel=compresslevel, encoding=encoding,
-                    errors=errors, newline=newline)
+            return (
+                open(
+                    io_file,
+                    mode=mode,
+                    buffering=buffering,
+                    encoding=encoding,
+                    errors=errors,
+                    newline=newline,
+                    closefd=closefd,
+                    opener=opener,
+                )
+                if not compress
+                else gzip.open(
+                    io_file,
+                    compresslevel=compresslevel,
+                    encoding=encoding,
+                    errors=errors,
+                    newline=newline,
+                )
+            )
 
         except FileNotFoundError:
             # pass along (but wrap with Apprise exception)
             raise exception.AppriseFileNotFound(
-                f"No such file or directory: '{io_file}'")
+                f"No such file or directory: '{io_file}'"
+            ) from None
 
-        except (OSError, IOError, zlib.error) as e:
+        except (OSError, zlib.error) as e:
             # We can't access the file or it does not exist
-            logger.warning('Could not read with persistent key: %s', key)
-            logger.debug('Persistent Storage Exception: %s', str(e))
-            raise exception.AppriseDiskIOError(str(e))
-
-    def get(self, key, default=None, lazy=True):
-        """
-        Fetches from cache
-        """
+            logger.warning("Could not read with persistent key: %s", key)
+            logger.debug("Persistent Storage Exception: %s", str(e))
+            raise exception.AppriseDiskIOError(str(e)) from None
+
+    def get(
+        self,
+        key: str,
+        default: Any = None,
+        lazy: bool = True,
+    ) -> Any:
+        """Fetches from cache."""
 
         if self._cache is None and not self.__load_cache():
             return default
 
-        if key in self._cache and \
-                not self.__mode == PersistentStoreMode.MEMORY and \
-                not self.__dirty:
+        if (
+            key in self._cache
+            and self.__mode != PersistentStoreMode.MEMORY
+            and not self.__dirty
+        ):
 
             # ensure we renew our content
             self.__renew.add(self.cache_file)
 
-        return self._cache[key].value \
-            if key in self._cache and self._cache[key] else default
+        return self._cache[key].value if self._cache.get(key) else default
 
-    def set(self, key, value, expires=None, persistent=True, lazy=True):
-        """
-        Cache reference
-        """
+    def set(
+        self,
+        key: str,
+        value: Any,
+        expires: Union[float, int, datetime, bool, None] = None,
+        persistent: bool = True,
+        lazy: bool = True,
+    ) -> bool:
+        """Cache reference."""
 
         if self._cache is None and not self.__load_cache():
             return False
@@ -782,9 +867,8 @@ def set(self, key, value, expires=None, persistent=True, lazy=True):
 
         return True
 
-    def clear(self, *args):
-        """
-        Remove one or more cache entry by it's key
+    def clear(self, *args: str) -> Optional[bool]:
+        """Remove one or more cache entry by it's key.
 
             e.g: clear('key')
                  clear('key1', 'key2', key-12')
@@ -820,10 +904,8 @@ def clear(self, *args):
             # Flush changes to disk
             return self.flush()
 
-    def prune(self):
-        """
-        Eliminates expired cache entries
-        """
+    def prune(self) -> bool:
+        """Eliminates expired cache entries."""
         if self._cache is None and not self.__load_cache():
             return False
 
@@ -847,8 +929,7 @@ def prune(self):
         return change
 
     def __load_cache(self, _recovery=False):
-        """
-        Loads our cache
+        """Loads our cache.
 
         _recovery is reserved for internal usage and should not be changed
         """
@@ -864,7 +945,7 @@ def __load_cache(self, _recovery=False):
         # Prepare our cache file
         cache_file = self.cache_file
         try:
-            with gzip.open(cache_file, 'rb') as f:
+            with gzip.open(cache_file, "rb") as f:
                 # Read our ontent from disk
                 self._cache = {}
                 for k, v in json.loads(f.read().decode(self.encoding)).items():
@@ -877,32 +958,40 @@ def __load_cache(self, _recovery=False):
                         # Track changes from our loadset
                         self.__dirty = True
 
-        except (UnicodeDecodeError, json.decoder.JSONDecodeError, zlib.error,
-                TypeError, AttributeError, EOFError):
+        except (
+            UnicodeDecodeError,
+            json.decoder.JSONDecodeError,
+            zlib.error,
+            TypeError,
+            AttributeError,
+            EOFError,
+        ):
 
             # Let users known there was a problem
             logger.warning(
-                'Corrupted access persistent cache content: %s',
-                cache_file)
+                "Corrupted access persistent cache content: %s", cache_file
+            )
 
             if not _recovery:
                 try:
                     os.unlink(cache_file)
                     logger.trace(
-                        'Removed previous persistent cache content: %s',
-                        cache_file)
+                        "Removed previous persistent cache content: %s",
+                        cache_file,
+                    )
 
                 except FileNotFoundError:
                     # no worries; we were removing it anyway
                     pass
 
-                except (OSError, IOError) as e:
+                except OSError as e:
                     # Permission error of some kind or disk problem...
                     # There is nothing we can do at this point
                     logger.warning(
-                        'Could not remove persistent cache content: %s',
-                        cache_file)
-                    logger.debug('Persistent Storage Exception: %s', str(e))
+                        "Could not remove persistent cache content: %s",
+                        cache_file,
+                    )
+                    logger.debug("Persistent Storage Exception: %s", str(e))
                     return False
                 return self.__load_cache(_recovery=True)
 
@@ -912,33 +1001,33 @@ def __load_cache(self, _recovery=False):
             # No problem; no cache to load
             self._cache = {}
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             # Permission error of some kind or disk problem...
             # There is nothing we can do at this point
             logger.warning(
-                'Could not load persistent cache for namespace %s',
-                os.path.basename(self.__base_path))
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Could not load persistent cache for namespace %s",
+                os.path.basename(self.__base_path),
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
             return False
 
         # Ensure our dirty flag is set to False
         return True
 
     def __prepare(self, flush=True):
-        """
-        Prepares a working environment
-        """
+        """Prepares a working environment."""
         if self.__mode != PersistentStoreMode.MEMORY:
             # Ensure our path exists
             try:
                 os.makedirs(self.__base_path, mode=0o770, exist_ok=True)
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # Permission error
                 logger.debug(
-                    'Could not create persistent store directory %s',
-                    self.__base_path)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Could not create persistent store directory %s",
+                    self.__base_path,
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
 
                 # Mode changed back to MEMORY
                 self.__mode = PersistentStoreMode.MEMORY
@@ -947,12 +1036,13 @@ def __prepare(self, flush=True):
             try:
                 os.makedirs(self.__temp_path, mode=0o770, exist_ok=True)
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # Permission error
                 logger.debug(
-                    'Could not create persistent store directory %s',
-                    self.__temp_path)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Could not create persistent store directory %s",
+                    self.__temp_path,
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
 
                 # Mode changed back to MEMORY
                 self.__mode = PersistentStoreMode.MEMORY
@@ -960,36 +1050,41 @@ def __prepare(self, flush=True):
             try:
                 os.makedirs(self.__data_path, mode=0o770, exist_ok=True)
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # Permission error
                 logger.debug(
-                    'Could not create persistent store directory %s',
-                    self.__data_path)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Could not create persistent store directory %s",
+                    self.__data_path,
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
 
                 # Mode changed back to MEMORY
                 self.__mode = PersistentStoreMode.MEMORY
 
             if self.__mode is PersistentStoreMode.MEMORY:
                 logger.warning(
-                    'The persistent storage could not be fully initialized; '
-                    'operating in MEMORY mode')
+                    "The persistent storage could not be fully initialized; "
+                    "operating in MEMORY mode"
+                )
 
             else:
                 if self._cache:
                     # Recovery taking place
                     self.__dirty = True
                     logger.warning(
-                        'The persistent storage environment was disrupted')
+                        "The persistent storage environment was disrupted"
+                    )
 
                     if self.__mode is PersistentStoreMode.FLUSH and flush:
                         # Flush changes to disk
                         return self.flush(_recovery=True)
 
-    def flush(self, force=False, _recovery=False):
-        """
-        Save's our cache to disk
-        """
+    def flush(
+        self,
+        force: bool = False,
+        _recovery: bool = False,
+    ) -> bool:
+        """Save's our cache to disk."""
 
         if self._cache is None or self.__mode == PersistentStoreMode.MEMORY:
             # nothing to do
@@ -1003,20 +1098,20 @@ def flush(self, force=False, _recovery=False):
             try:
                 # (access_time, modify_time)
                 os.utime(path, (ftime, ftime))
-                logger.trace('file timestamp updated: %s', path)
+                logger.trace("file timestamp updated: %s", path)
 
             except FileNotFoundError:
                 # No worries... move along
                 pass
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # We can't access the file or it does not exist
-                logger.debug('Could not update file timestamp: %s', path)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                logger.debug("Could not update file timestamp: %s", path)
+                logger.debug("Persistent Storage Exception: %s", str(e))
 
         if not force and self.__dirty is False:
             # Nothing further to do
-            logger.trace('Persistent cache is consistent with memory map')
+            logger.trace("Persistent cache is consistent with memory map")
             return True
 
         if _recovery:
@@ -1033,44 +1128,47 @@ def flush(self, force=False, _recovery=False):
             #
             # We're deleting the cache file s there are no entries left in it
             #
-            backup_file = cache_file[:-len(self.__backup_extension)] + \
-                self.__backup_extension
+            backup_file = (
+                cache_file[: -len(self.__backup_extension)]
+                + self.__backup_extension
+            )
 
             try:
                 os.unlink(backup_file)
                 logger.trace(
-                    'Removed previous persistent cache backup: %s',
-                    backup_file)
+                    "Removed previous persistent cache backup: %s", backup_file
+                )
 
             except FileNotFoundError:
                 # no worries; we were removing it anyway
                 pass
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # Permission error of some kind or disk problem...
                 # There is nothing we can do at this point
                 logger.warning(
-                    'Could not remove persistent cache backup: %s',
-                    backup_file)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Could not remove persistent cache backup: %s", backup_file
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
                 return False
 
             try:
                 os.rename(cache_file, backup_file)
                 logger.trace(
-                    'Persistent cache backup file created: %s',
-                    backup_file)
+                    "Persistent cache backup file created: %s", backup_file
+                )
 
             except FileNotFoundError:
                 # Not a problem; do not create a log entry
                 pass
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # This isn't good... we couldn't put our new file in place
                 logger.warning(
-                    'Could not remove stale persistent cache file: %s',
-                    cache_file)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                    "Could not remove stale persistent cache file: %s",
+                    cache_file,
+                )
+                logger.debug("Persistent Storage Exception: %s", str(e))
                 return False
             return True
 
@@ -1082,9 +1180,12 @@ def flush(self, force=False, _recovery=False):
         ntf = None
 
         try:
-            ntf = tempfile.NamedTemporaryFile(
-                mode="w+", encoding=self.encoding, dir=self.__temp_path,
-                delete=False)
+            ntf = tempfile.NamedTemporaryFile(  # noqa: SIM115
+                mode="w+",
+                encoding=self.encoding,
+                dir=self.__temp_path,
+                delete=False,
+            )
 
             ntf.close()
 
@@ -1105,9 +1206,10 @@ def flush(self, force=False, _recovery=False):
 
         except OSError as e:
             logger.error(
-                'Persistent temporary directory inaccessible: %s',
-                self.__temp_path)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Persistent temporary directory inaccessible: %s",
+                self.__temp_path,
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
 
             # Tidy our Named Temporary File
             _ntf_tidy(ntf)
@@ -1117,20 +1219,28 @@ def flush(self, force=False, _recovery=False):
 
         try:
             # write our content currently saved to disk to our temporary file
-            with gzip.open(ntf.name, 'wb') as f:
+            with gzip.open(ntf.name, "wb") as f:
                 # Write our content to disk
-                f.write(json.dumps(
-                    {k: v for k, v in self._cache.items()
-                     if v and v.persistent},
-                    separators=(',', ':'),
-                    cls=CacheJSONEncoder).encode(self.encoding))
+                f.write(
+                    json.dumps(
+                        {
+                            k: v
+                            for k, v in self._cache.items()
+                            if v and v.persistent
+                        },
+                        separators=(",", ":"),
+                        cls=CacheJSONEncoder,
+                    ).encode(self.encoding)
+                )
 
         except TypeError as e:
             # JSON object contains content that can not be encoded to disk
             logger.error(
-                'Persistent temporary file can not be written to '
-                'due to bad input data: %s', ntf.name)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Persistent temporary file can not be written to "
+                "due to bad input data: %s",
+                ntf.name,
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
 
             # Tidy our Named Temporary File
             _ntf_tidy(ntf)
@@ -1140,9 +1250,9 @@ def flush(self, force=False, _recovery=False):
 
         except (OSError, EOFError, zlib.error) as e:
             logger.error(
-                'Persistent temporary file inaccessible: %s',
-                ntf.name)
-            logger.debug('Persistent Storage Exception: %s', str(e))
+                "Persistent temporary file inaccessible: %s", ntf.name
+            )
+            logger.debug("Persistent Storage Exception: %s", str(e))
 
             # Tidy our Named Temporary File
             _ntf_tidy(ntf)
@@ -1162,10 +1272,12 @@ def flush(self, force=False, _recovery=False):
 
         return True
 
-    def files(self, exclude=True, lazy=True):
-        """
-        Returns the total files
-        """
+    def files(
+        self,
+        exclude: bool = True,
+        lazy: bool = True,
+    ) -> list[str]:
+        """Returns the total files."""
 
         if lazy and exclude in self.__cache_files:
             # Take an early exit with our cached results
@@ -1183,54 +1295,73 @@ def files(self, exclude=True, lazy=True):
             # A list of criteria that should be excluded from the size count
             self.__exclude_list = (
                 # Exclude backup cache file from count
-                re.compile(re.escape(os.path.join(
-                    self.__base_path,
-                    f'{self.__cache_key}{self.__backup_extension}'))),
-
+                re.compile(
+                    re.escape(
+                        os.path.join(
+                            self.__base_path,
+                            f"{self.__cache_key}{self.__backup_extension}",
+                        )
+                    )
+                ),
                 # Exclude temporary files
-                re.compile(re.escape(self.__temp_path) + r'[/\\].+'),
-
+                re.compile(re.escape(self.__temp_path) + r"[/\\].+"),
                 # Exclude custom backup persistent files
                 re.compile(
-                    re.escape(self.__data_path) + r'[/\\].+' + re.escape(
-                        self.__backup_extension)),
+                    re.escape(self.__data_path)
+                    + r"[/\\].+"
+                    + re.escape(self.__backup_extension)
+                ),
             )
 
         try:
             if exclude:
-                self.__cache_files[exclude] = \
-                    [path for path in filter(os.path.isfile, glob.glob(
-                        os.path.join(self.__base_path, '**', '*'),
-                        recursive=True))
-                        if next((False for p in self.__exclude_list
-                                 if p.match(path)), True)]
+                self.__cache_files[exclude] = [
+                    path
+                    for path in filter(
+                        os.path.isfile,
+                        glob.glob(
+                            os.path.join(self.__base_path, "**", "*"),
+                            recursive=True,
+                        ),
+                    )
+                    if next(
+                        (False for p in self.__exclude_list if p.match(path)),
+                        True,
+                    )
+                ]
 
             else:  # No exclusion list applied
-                self.__cache_files[exclude] = \
-                    [path for path in filter(os.path.isfile, glob.glob(
-                        os.path.join(self.__base_path, '**', '*'),
-                        recursive=True))]
+                self.__cache_files[exclude] = list(
+                    filter(
+                        os.path.isfile,
+                        glob.glob(
+                            os.path.join(self.__base_path, "**", "*"),
+                            recursive=True,
+                        ),
+                    )
+                )
 
-        except (OSError, IOError):
+        except OSError:
             # We can't access the directory or it does not exist
             self.__cache_files[exclude] = []
 
         return self.__cache_files[exclude]
 
     @staticmethod
-    def disk_scan(path, namespace=None, closest=True):
-        """
-        Scansk a path provided and returns namespaces detected
-        """
+    def disk_scan(
+        path: str,
+        namespace: Optional[Union[str, list[str]]] = None,
+        closest: bool = True,
+    ) -> list[str]:
+        """Scansk a path provided and returns namespaces detected."""
 
-        logger.trace('Persistent path can of: %s', path)
+        logger.trace("Persistent path can of: %s", path)
 
         def is_namespace(x):
-            """
-            Validate what was detected is a valid namespace
-            """
-            return os.path.isdir(os.path.join(path, x)) \
-                and PersistentStore.__valid_key.match(x)
+            """Validate what was detected is a valid namespace."""
+            return os.path.isdir(
+                os.path.join(path, x)
+            ) and PersistentStore.__valid_key.match(x)
 
         # Handle our namespace searching
         if namespace:
@@ -1240,38 +1371,51 @@ def is_namespace(x):
             elif not isinstance(namespace, (tuple, set, list)):
                 raise AttributeError(
                     "namespace must be None, a string, or a tuple/set/list "
-                    "of strings")
+                    "of strings"
+                )
 
         try:
             # Acquire all of the files in question
-            namespaces = \
-                [ns for ns in filter(is_namespace, os.listdir(path))
-                 if not namespace or next(
-                     (True for n in namespace if ns.startswith(n)), False)] \
-                if closest else  \
-                [ns for ns in filter(is_namespace, os.listdir(path))
-                 if not namespace or ns in namespace]
+            namespaces = (
+                [
+                    ns
+                    for ns in filter(is_namespace, os.listdir(path))
+                    if not namespace
+                    or next(
+                        (True for n in namespace if ns.startswith(n)), False
+                    )
+                ]
+                if closest
+                else [
+                    ns
+                    for ns in filter(is_namespace, os.listdir(path))
+                    if not namespace or ns in namespace
+                ]
+            )
 
         except FileNotFoundError:
             # no worries; Nothing to do
-            logger.debug('Disk Prune path not found; nothing to clean.')
+            logger.debug("Disk Prune path not found; nothing to clean.")
             return []
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             # Permission error of some kind or disk problem...
             # There is nothing we can do at this point
-            logger.error(
-                'Disk Scan detetcted inaccessible path: %s', path)
-            logger.debug(
-                'Persistent Storage Exception: %s', str(e))
+            logger.error("Disk Scan detetcted inaccessible path: %s", path)
+            logger.debug("Persistent Storage Exception: %s", str(e))
             return []
 
         return namespaces
 
     @staticmethod
-    def disk_prune(path, namespace=None, expires=None, action=False):
-        """
-        Prune persistent disk storage entries that are old and/or unreferenced
+    def disk_prune(
+        path: str,
+        namespace: Optional[Union[str, list[str]]] = None,
+        expires: Optional[Union[int, float]] = None,
+        action: bool = False,
+    ) -> dict[str, list[dict[str, Union[str, bool]]]]:
+        """Prune persistent disk storage entries that are old and/or
+        unreferenced.
 
         you must specify a path to perform the prune within
 
@@ -1280,23 +1424,24 @@ def disk_prune(path, namespace=None, expires=None, action=False):
 
         if action is not set to False, directories to be removed are returned
         only
-
         """
 
         # Prepare our File Expiry
-        expires = datetime.now() - timedelta(seconds=expires) \
-            if isinstance(expires, (float, int)) and expires >= 0 \
+        expires = (
+            datetime.now() - timedelta(seconds=expires)
+            if isinstance(expires, (float, int)) and expires >= 0
             else PersistentStore.default_file_expiry
+        )
 
         # Get our namespaces
         namespaces = PersistentStore.disk_scan(path, namespace)
 
         # Track matches
-        _map = {}
+        map_ = {}
 
         for namespace in namespaces:
             # Prepare our map
-            _map[namespace] = []
+            map_[namespace] = []
 
             # Reference Directories
             base_dir = os.path.join(path, namespace)
@@ -1306,26 +1451,52 @@ def disk_prune(path, namespace=None, expires=None, action=False):
             # Careful to only focus on files created by this Persistent Store
             # object
             files = [
-                os.path.join(base_dir, f'{PersistentStore.__cache_key}'
-                             f'{PersistentStore.__extension}'),
-                os.path.join(base_dir, f'{PersistentStore.__cache_key}'
-                             f'{PersistentStore.__backup_extension}'),
+                os.path.join(
+                    base_dir,
+                    f"{PersistentStore.__cache_key}"
+                    f"{PersistentStore.__extension}",
+                ),
+                os.path.join(
+                    base_dir,
+                    f"{PersistentStore.__cache_key}"
+                    f"{PersistentStore.__backup_extension}",
+                ),
             ]
 
             # Update our files (applying what was defined above too)
             valid_data_re = re.compile(
-                r'.*(' + re.escape(PersistentStore.__extension) +
-                r'|' + re.escape(PersistentStore.__backup_extension) + r')$')
+                r".*("
+                + re.escape(PersistentStore.__extension)
+                + r"|"
+                + re.escape(PersistentStore.__backup_extension)
+                + r")$"
+            )
 
-            files = [path for path in filter(
-                os.path.isfile, chain(glob.glob(
-                    os.path.join(data_dir, '*'), recursive=False), files))
-                if valid_data_re.match(path)]
+            files = [
+                path
+                for path in filter(
+                    os.path.isfile,
+                    chain(
+                        glob.glob(
+                            os.path.join(data_dir, "*"), recursive=False
+                        ),
+                        files,
+                    ),
+                )
+                if valid_data_re.match(path)
+            ]
 
             # Now all temporary files
-            files.extend([path for path in filter(
-                os.path.isfile, glob.glob(
-                    os.path.join(temp_dir, '*'), recursive=False))])
+            files.extend(
+                list(
+                    filter(
+                        os.path.isfile,
+                        glob.glob(
+                            os.path.join(temp_dir, "*"), recursive=False
+                        ),
+                    )
+                )
+            )
 
             # Track if we should do a directory sweep later on
             dir_sweep = True
@@ -1339,14 +1510,17 @@ def disk_prune(path, namespace=None, expires=None, action=False):
                     # no worries; we were removing it anyway
                     continue
 
-                except (OSError, IOError) as e:
+                except OSError as e:
                     # Permission error of some kind or disk problem...
                     # There is nothing we can do at this point
                     logger.error(
-                        'Disk Prune (ns=%s, clean=%s) detetcted inaccessible '
-                        'file: %s', namespace, 'yes' if action else 'no', file)
-                    logger.debug(
-                        'Persistent Storage Exception: %s', str(e))
+                        "Disk Prune (ns=%s, clean=%s) detetcted inaccessible "
+                        "file: %s",
+                        namespace,
+                        "yes" if action else "no",
+                        file,
+                    )
+                    logger.debug("Persistent Storage Exception: %s", str(e))
 
                     # No longer worth doing a directory sweep
                     dir_sweep = False
@@ -1359,19 +1533,22 @@ def disk_prune(path, namespace=None, expires=None, action=False):
                 # Handle Removing
                 #
                 record = {
-                    'path': file,
-                    'removed': False,
+                    "path": file,
+                    "removed": False,
                 }
 
                 if action:
                     try:
                         os.unlink(file)
                         # Update our record
-                        record['removed'] = True
+                        record["removed"] = True
                         logger.info(
-                            'Disk Prune (ns=%s, clean=%s) removed persistent '
-                            'file: %s', namespace,
-                            'yes' if action else 'no', file)
+                            "Disk Prune (ns=%s, clean=%s) removed persistent "
+                            "file: %s",
+                            namespace,
+                            "yes" if action else "no",
+                            file,
+                        )
 
                     except FileNotFoundError:
                         # no longer worth doing a directory sweep
@@ -1380,22 +1557,26 @@ def disk_prune(path, namespace=None, expires=None, action=False):
                         # otherwise, no worries; we were removing the file
                         # anyway
 
-                    except (OSError, IOError) as e:
+                    except OSError as e:
                         # Permission error of some kind or disk problem...
                         # There is nothing we can do at this point
                         logger.error(
-                            'Disk Prune (ns=%s, clean=%s) failed to remove '
-                            'persistent file: %s', namespace,
-                            'yes' if action else 'no', file)
+                            "Disk Prune (ns=%s, clean=%s) failed to remove "
+                            "persistent file: %s",
+                            namespace,
+                            "yes" if action else "no",
+                            file,
+                        )
 
                         logger.debug(
-                            'Persistent Storage Exception: %s', str(e))
+                            "Persistent Storage Exception: %s", str(e)
+                        )
 
                         # No longer worth doing a directory sweep
                         dir_sweep = False
 
                 # Store our record
-                _map[namespace].append(record)
+                map_[namespace].append(record)
 
             # Memory tidy
             del files
@@ -1408,18 +1589,23 @@ def disk_prune(path, namespace=None, expires=None, action=False):
                         try:
                             os.rmdir(dirpath)
                             logger.info(
-                                'Disk Prune (ns=%s, clean=%s) removed '
-                                'persistent dir: %s', namespace,
-                                'yes' if action else 'no', dirpath)
+                                "Disk Prune (ns=%s, clean=%s) removed "
+                                "persistent dir: %s",
+                                namespace,
+                                "yes" if action else "no",
+                                dirpath,
+                            )
                         except OSError:
                             # do nothing;
                             pass
-        return _map
+        return map_
 
-    def size(self, exclude=True, lazy=True):
-        """
-        Returns the total size of the persistent storage in bytes
-        """
+    def size(
+        self,
+        exclude: bool = True,
+        lazy: bool = True,
+    ) -> int:
+        """Returns the total size of the persistent storage in bytes."""
 
         if lazy and self.__cache_size is not None:
             # Take an early exit
@@ -1432,29 +1618,24 @@ def size(self, exclude=True, lazy=True):
 
         # Get a list of files (file paths) in the given directory
         try:
-            self.__cache_size = sum(
-                [os.stat(path).st_size for path in
-                    self.files(exclude=exclude, lazy=lazy)])
+            self.__cache_size = sum(os.stat(path).st_size
+                for path in self.files(exclude=exclude, lazy=lazy))
 
-        except (OSError, IOError):
+        except OSError:
             # We can't access the directory or it does not exist
             self.__cache_size = 0
 
         return self.__cache_size
 
-    def __del__(self):
-        """
-        Deconstruction of our object
-        """
+    def __del__(self) -> None:
+        """Deconstruction of our object."""
 
         if self.__mode == PersistentStoreMode.AUTO:
             # Flush changes to disk
             self.flush()
 
-    def __delitem__(self, key):
-        """
-        Remove a cache entry by it's key
-        """
+    def __delitem__(self, key: str) -> None:
+        """Remove a cache entry by it's key."""
         if self._cache is None and not self.__load_cache():
             raise KeyError("Could not initialize cache")
 
@@ -1476,21 +1657,19 @@ def __delitem__(self, key):
 
         return
 
-    def __contains__(self, key):
-        """
-        Verify if our storage contains the key specified or not.
-        In additiont to this, if the content is expired, it is considered
-        to be not contained in the storage.
+    def __contains__(self, key: str) -> bool:
+        """Verify if our storage contains the key specified or not.
+
+        In additiont to this, if the content is expired, it is considered to be
+        not contained in the storage.
         """
         if self._cache is None and not self.__load_cache():
             return False
 
         return key in self._cache and self._cache[key]
 
-    def __setitem__(self, key, value):
-        """
-        Sets a cache value without disrupting existing settings in place
-        """
+    def __setitem__(self, key: str, value: Any) -> None:
+        """Sets a cache value without disrupting existing settings in place."""
 
         if self._cache is None and not self.__load_cache():
             raise KeyError("Could not initialize cache")
@@ -1512,10 +1691,8 @@ def __setitem__(self, key, value):
 
         return
 
-    def __getitem__(self, key):
-        """
-        Returns the indexed value
-        """
+    def __getitem__(self, key: str) -> Any:
+        """Returns the indexed value."""
 
         if self._cache is None and not self.__load_cache():
             raise KeyError("Could not initialize cache")
@@ -1526,40 +1703,46 @@ def __getitem__(self, key):
 
         return result
 
-    def keys(self):
-        """
-        Returns our keys
-        """
+    def keys(self) -> builtins.set[str]:
+        """Returns our keys."""
         if self._cache is None and not self.__load_cache():
             # There are no keys to return
             return {}.keys()
 
         return self._cache.keys()
 
-    def delete(self, *args, all=None, temp=None, cache=None, validate=True):
-        """
-        Manages our file space and tidys it up
+    def delete(
+        self,
+        *args: str,
+        all: Optional[bool] = None,
+        temp: Optional[bool] = None,
+        cache: Optional[bool] = None,
+        validate: bool = True,
+    ) -> bool:
+        """Manages our file space and tidys it up.
 
-        delete('key', 'key2')
-        delete(all=True)
-        delete(temp=True, cache=True)
+        delete('key', 'key2') delete(all=True) delete(temp=True, cache=True)
         """
 
         # Our failure flag
         has_error = False
 
         valid_key_re = re.compile(
-            r'^(?P<key>.+)(' +
-            re.escape(self.__backup_extension) +
-            r'|' + re.escape(self.__extension) + r')$', re.I)
+            r"^(?P<key>.+)("
+            + re.escape(self.__backup_extension)
+            + r"|"
+            + re.escape(self.__extension)
+            + r")$",
+            re.I,
+        )
 
         # Default asignments
         if all is None:
-            all = True if not (len(args) or temp or cache) else False
+            all = bool(not (len(args) or temp or cache))
         if temp is None:
-            temp = True if all else False
+            temp = bool(all)
         if cache is None:
-            cache = True if all else False
+            cache = bool(all)
 
         if cache and self._cache:
             # Reset our object
@@ -1580,14 +1763,21 @@ def delete(self, *args, all=None, temp=None, cache=None, validate=True):
             if base == self.__base_path and cache:
                 # We're handling a cache file (hopefully)
                 result = valid_key_re.match(fname)
-                key = None if not result else (
-                    result['key'] if self.__valid_key.match(result['key'])
-                    else None)
+                key = (
+                    None
+                    if not result
+                    else (
+                        result["key"]
+                        if self.__valid_key.match(result["key"])
+                        else None
+                    )
+                )
 
                 if validate and key != self.__cache_key:
                     # We're not dealing with a cache key
                     logger.debug(
-                        'Persistent File cleanup ignoring file: %s', path)
+                        "Persistent File cleanup ignoring file: %s", path
+                    )
                     continue
 
                 #
@@ -1597,20 +1787,28 @@ def delete(self, *args, all=None, temp=None, cache=None, validate=True):
             elif base == self.__data_path and (args or all):
                 # We're handling a file found in our custom data path
                 result = valid_key_re.match(fname)
-                key = None if not result else (
-                    result['key'] if self.__valid_key.match(result['key'])
-                    else None)
+                key = (
+                    None
+                    if not result
+                    else (
+                        result["key"]
+                        if self.__valid_key.match(result["key"])
+                        else None
+                    )
+                )
 
                 if validate and key is None:
                     # we're set to validate and a non-valid file was found
                     logger.debug(
-                        'Persistent File cleanup ignoring file: %s', path)
+                        "Persistent File cleanup ignoring file: %s", path
+                    )
                     continue
 
                 elif not all and (key is None or key not in args):
                     # no match found
                     logger.debug(
-                        'Persistent File cleanup ignoring file: %s', path)
+                        "Persistent File cleanup ignoring file: %s", path
+                    )
                     continue
 
                 #
@@ -1626,24 +1824,23 @@ def delete(self, *args, all=None, temp=None, cache=None, validate=True):
 
             else:
                 # No match; move on
-                logger.debug('Persistent File cleanup ignoring file: %s', path)
+                logger.debug("Persistent File cleanup ignoring file: %s", path)
                 continue
 
             try:
                 os.unlink(path)
-                logger.info('Removed persistent file: %s', ppath)
+                logger.info("Removed persistent file: %s", ppath)
 
             except FileNotFoundError:
                 # no worries; we were removing it anyway
                 pass
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 # Permission error of some kind or disk problem...
                 # There is nothing we can do at this point
                 has_error = True
-                logger.error(
-                    'Failed to remove persistent file: %s', ppath)
-                logger.debug('Persistent Storage Exception: %s', str(e))
+                logger.error("Failed to remove persistent file: %s", ppath)
+                logger.debug("Persistent Storage Exception: %s", str(e))
 
         # Reset our reference variables
         self.__cache_size = None
@@ -1652,25 +1849,19 @@ def delete(self, *args, all=None, temp=None, cache=None, validate=True):
         return not has_error
 
     @property
-    def cache_file(self):
-        """
-        Returns the full path to the namespace directory
-        """
+    def cache_file(self) -> str:
+        """Returns the full path to the namespace directory."""
         return os.path.join(
             self.__base_path,
-            f'{self.__cache_key}{self.__extension}',
+            f"{self.__cache_key}{self.__extension}",
         )
 
     @property
-    def path(self):
-        """
-        Returns the full path to the namespace directory
-        """
+    def path(self) -> Optional[str]:
+        """Returns the full path to the namespace directory."""
         return self.__base_path
 
     @property
-    def mode(self):
-        """
-        Returns the full path to the namespace directory
-        """
+    def mode(self) -> PersistentStoreMode:
+        """Returns the Persistent Storage mode."""
         return self.__mode
diff --git a/libs/apprise/plugins/__init__.py b/libs/apprise/plugins/__init__.py
index 87c840e201..b486e9577c 100644
--- a/libs/apprise/plugins/__init__.py
+++ b/libs/apprise/plugins/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,137 +25,137 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import os
 import copy
+import os
 
-# Used for testing
-from .base import NotifyBase
-
-from ..common import NotifyImageSize
-from ..common import NOTIFY_IMAGE_SIZES
-from ..common import NotifyType
-from ..common import NOTIFY_TYPES
-from ..utils.cwe312 import cwe312_url
-from ..utils.parse import parse_list, GET_SCHEMA_RE
+from ..common import (
+    NOTIFY_IMAGE_SIZES,
+    NOTIFY_TYPES,
+    NotifyImageSize,
+    NotifyType,
+)
+from ..locale import LazyTranslation, gettext_lazy as _
 from ..logger import logger
-from ..locale import gettext_lazy as _
-from ..locale import LazyTranslation
 from ..manager_plugins import NotificationManager
+from ..utils.cwe312 import cwe312_url
+from ..utils.parse import GET_SCHEMA_RE, parse_list
 
+# Used for testing
+from .base import NotifyBase
 
 # Grant access to our Notification Manager Singleton
 N_MGR = NotificationManager()
 
 __all__ = [
+    "NOTIFY_IMAGE_SIZES",
+    "NOTIFY_TYPES",
+    "NotifyBase",
     # Reference
-    'NotifyImageSize', 'NOTIFY_IMAGE_SIZES', 'NotifyType', 'NOTIFY_TYPES',
-    'NotifyBase',
-
+    "NotifyImageSize",
+    "NotifyType",
     # Tokenizer
-    'url_to_dict',
+    "url_to_dict",
 ]
 
 
 def _sanitize_token(tokens, default_delimiter):
-    """
-    This is called by the details() function and santizes the output by
+    """This is called by the details() function and santizes the output by
     populating expected and consistent arguments if they weren't otherwise
-    specified.
-
-    """
+    specified."""
 
     # Used for tracking groups
     group_map = {}
 
     # Iterate over our tokens
-    for key in tokens.keys():
+    for key in tokens:
 
-        for element in tokens[key].keys():
+        for element in tokens[key]:
             # Perform translations (if detected to do so)
             if isinstance(tokens[key][element], LazyTranslation):
                 tokens[key][element] = str(tokens[key][element])
 
-        if 'alias_of' in tokens[key]:
+        if "alias_of" in tokens[key]:
             # Do not touch this field
             continue
 
-        elif 'name' not in tokens[key]:
+        elif "name" not in tokens[key]:
             # Default to key
-            tokens[key]['name'] = key
+            tokens[key]["name"] = key
 
-        if 'map_to' not in tokens[key]:
+        if "map_to" not in tokens[key]:
             # Default type to key
-            tokens[key]['map_to'] = key
+            tokens[key]["map_to"] = key
 
         # Track our map_to objects
-        if tokens[key]['map_to'] not in group_map:
-            group_map[tokens[key]['map_to']] = set()
-        group_map[tokens[key]['map_to']].add(key)
+        if tokens[key]["map_to"] not in group_map:
+            group_map[tokens[key]["map_to"]] = set()
+        group_map[tokens[key]["map_to"]].add(key)
 
-        if 'type' not in tokens[key]:
+        if "type" not in tokens[key]:
             # Default type to string
-            tokens[key]['type'] = 'string'
+            tokens[key]["type"] = "string"
 
-        elif tokens[key]['type'].startswith('list'):
-            if 'delim' not in tokens[key]:
+        elif tokens[key]["type"].startswith("list"):
+            if "delim" not in tokens[key]:
                 # Default list delimiter (if not otherwise specified)
-                tokens[key]['delim'] = default_delimiter
+                tokens[key]["delim"] = default_delimiter
 
-            if key in group_map[tokens[key]['map_to']]:  # pragma: no branch
+            if key in group_map[tokens[key]["map_to"]]:  # pragma: no branch
                 # Remove ourselves from the list
-                group_map[tokens[key]['map_to']].remove(key)
+                group_map[tokens[key]["map_to"]].remove(key)
 
             # Pointing to the set directly so we can dynamically update
             # ourselves
-            tokens[key]['group'] = group_map[tokens[key]['map_to']]
+            tokens[key]["group"] = group_map[tokens[key]["map_to"]]
 
-        elif tokens[key]['type'].startswith('choice') \
-                and 'default' not in tokens[key] \
-                and 'values' in tokens[key] \
-                and len(tokens[key]['values']) == 1:
+        elif (
+            tokens[key]["type"].startswith("choice")
+            and "default" not in tokens[key]
+            and "values" in tokens[key]
+            and len(tokens[key]["values"]) == 1
+        ):
 
             # If there is only one choice; then make it the default
             #  - support dictionaries too
-            tokens[key]['default'] = tokens[key]['values'][0] \
-                if not isinstance(tokens[key]['values'], dict) \
-                else next(iter(tokens[key]['values']))
+            tokens[key]["default"] = (
+                tokens[key]["values"][0]
+                if not isinstance(tokens[key]["values"], dict)
+                else next(iter(tokens[key]["values"]))
+            )
 
-        if 'values' in tokens[key] and isinstance(tokens[key]['values'], dict):
+        if "values" in tokens[key] and isinstance(tokens[key]["values"], dict):
             # Convert values into a list if it was defined as a dictionary
-            tokens[key]['values'] = [k for k in tokens[key]['values'].keys()]
+            tokens[key]["values"] = list(tokens[key]["values"].keys())
 
-        if 'regex' in tokens[key]:
+        if "regex" in tokens[key]:
             # Verify that we are a tuple; convert strings to tuples
-            if isinstance(tokens[key]['regex'], str):
+            if isinstance(tokens[key]["regex"], str):
                 # Default tuple setup
-                tokens[key]['regex'] = \
-                    (tokens[key]['regex'], None)
+                tokens[key]["regex"] = (tokens[key]["regex"], None)
 
-            elif not isinstance(tokens[key]['regex'], (list, tuple)):
+            elif not isinstance(tokens[key]["regex"], (list, tuple)):
                 # Invalid regex
-                del tokens[key]['regex']
+                del tokens[key]["regex"]
 
-        if 'required' not in tokens[key]:
+        if "required" not in tokens[key]:
             # Default required is False
-            tokens[key]['required'] = False
+            tokens[key]["required"] = False
 
-        if 'private' not in tokens[key]:
+        if "private" not in tokens[key]:
             # Private flag defaults to False if not set
-            tokens[key]['private'] = False
+            tokens[key]["private"] = False
     return
 
 
 def details(plugin):
-    """
-    Provides templates that can be used by developers to build URLs
+    """Provides templates that can be used by developers to build URLs
     dynamically.
 
-    If a list of templates is provided, then they will be used over
-    the default value.
+    If a list of templates is provided, then they will be used over the default
+    value.
 
-    If a list of tokens are provided, then they will over-ride any
-    additional settings built from this script and/or will be appended
-    to them afterwards.
+    If a list of tokens are provided, then they will over-ride any additional
+    settings built from this script and/or will be appended to them afterwards.
     """
 
     # Our unique list of parsing will be based on the provided templates
@@ -210,7 +209,7 @@ def details(plugin):
     #
     #            # Use regex if you want to share the regular expression
     #            # required to validate the field. The regex will never
-    #            # accomodate the prefix (if one is specified).  That is
+    #            # accommodate the prefix (if one is specified).  That is
     #            # up to the user building the URLs to include the prefix
     #            # on the URL when constructing it.
     #            # The format is ('regex', 'reg options')
@@ -222,7 +221,7 @@ def details(plugin):
     #
     #            # By default the key of this object is to be interpreted
     #            # as the argument to the notification in question. However
-    #            # To accomodate cases where there are multiple types that
+    #            # To accommodate cases where there are multiple types that
     #            # all map to the same entry, one can find a map_to value.
     #            'map_to': 'function_arg',
     #
@@ -277,71 +276,69 @@ def details(plugin):
     template_kwargs = copy.deepcopy(plugin.template_kwargs)
 
     # We automatically create a schema entry
-    template_tokens['schema'] = {
-        'name': _('Schema'),
-        'type': 'choice:string',
-        'required': True,
-        'values': parse_list(plugin.secure_protocol, plugin.protocol)
+    template_tokens["schema"] = {
+        "name": _("Schema"),
+        "type": "choice:string",
+        "required": True,
+        "values": parse_list(plugin.secure_protocol, plugin.protocol),
     }
 
     # Sanitize our tokens
-    _sanitize_token(template_tokens, default_delimiter=('/', ))
+    _sanitize_token(template_tokens, default_delimiter=("/",))
     # Delimiter(s) are space and/or comma
-    _sanitize_token(template_args, default_delimiter=(',', ' '))
-    _sanitize_token(template_kwargs, default_delimiter=(',', ' '))
+    _sanitize_token(template_args, default_delimiter=(",", " "))
+    _sanitize_token(template_kwargs, default_delimiter=(",", " "))
 
     # Argument/Option Handling
     for key in list(template_args.keys()):
 
-        if 'alias_of' in template_args[key]:
+        if "alias_of" in template_args[key]:
             # Check if the mapped reference is a list; if it is, then
             # we need to store a different delimiter
-            alias_of = template_tokens.get(template_args[key]['alias_of'], {})
-            if alias_of.get('type', '').startswith('list') \
-                    and 'delim' not in template_args[key]:
+            alias_of = template_tokens.get(template_args[key]["alias_of"], {})
+            if (
+                alias_of.get("type", "").startswith("list")
+                and "delim" not in template_args[key]
+            ):
                 # Set a default delimiter of a comma and/or space if one
                 # hasn't already been specified
-                template_args[key]['delim'] = (',', ' ')
+                template_args[key]["delim"] = (",", " ")
 
         # _lookup_default looks up what the default value
-        if '_lookup_default' in template_args[key]:
-            template_args[key]['default'] = getattr(
-                plugin, template_args[key]['_lookup_default'])
+        if "_lookup_default" in template_args[key]:
+            template_args[key]["default"] = getattr(
+                plugin, template_args[key]["_lookup_default"]
+            )
 
             # Tidy as we don't want to pass this along in response
-            del template_args[key]['_lookup_default']
+            del template_args[key]["_lookup_default"]
 
         # _exists_if causes the argument to only exist IF after checking
         # the return of an internal variable requiring a check
-        if '_exists_if' in template_args[key]:
-            if not getattr(plugin,
-                           template_args[key]['_exists_if']):
+        if "_exists_if" in template_args[key]:
+            if not getattr(plugin, template_args[key]["_exists_if"]):
                 # Remove entire object
                 del template_args[key]
 
             else:
                 # We only nee to remove this key
-                del template_args[key]['_exists_if']
+                del template_args[key]["_exists_if"]
 
     return {
-        'templates': templates,
-        'tokens': template_tokens,
-        'args': template_args,
-        'kwargs': template_kwargs,
+        "templates": templates,
+        "tokens": template_tokens,
+        "args": template_args,
+        "kwargs": template_kwargs,
     }
 
 
 def requirements(plugin):
-    """
-    Provides a list of packages and its requirement details
-
-    """
+    """Provides a list of packages and its requirement details."""
     requirements = {
         # Use the description to provide a human interpretable description of
         # what is required to make the plugin work. This is only nessisary
         # if there are package dependencies
-        'details': '',
-
+        "details": "",
         # Define any required packages needed for the plugin to run.  This is
         # an array of strings that simply look like lines in the
         # `requirements.txt` file...
@@ -354,83 +351,82 @@ def requirements(plugin):
         #   'cryptography < 3.4`,
         # ]
         #
-        'packages_required': [],
-
+        "packages_required": [],
         # Recommended packages identify packages that are not required to make
         # your plugin work, but would improve it's use or grant it access to
         # full functionality (that might otherwise be limited).
-
         # Similar to `packages_required`, you would identify each entry in
         # the array as you would in a `requirements.txt` file.
         #
         #   - Do not re-provide entries already in the `packages_required`
-        'packages_recommended': [],
+        "packages_recommended": [],
     }
 
     # Populate our template differently if we don't find anything above
-    if not (hasattr(plugin, 'requirements')
-            and isinstance(plugin.requirements, dict)):
+    if not (
+        hasattr(plugin, "requirements")
+        and isinstance(plugin.requirements, dict)
+    ):
         # We're done early
         return requirements
 
     # Get our required packages
-    _req_packages = plugin.requirements.get('packages_required')
-    if isinstance(_req_packages, str):
+    req_packages = plugin.requirements.get("packages_required")
+    if isinstance(req_packages, str):
         # Convert to list
-        _req_packages = [_req_packages]
+        req_packages = [req_packages]
 
-    elif not isinstance(_req_packages, (set, list, tuple)):
+    elif not isinstance(req_packages, (set, list, tuple)):
         # Allow one to set the required packages to None (as an example)
-        _req_packages = []
+        req_packages = []
 
-    requirements['packages_required'] = [str(p) for p in _req_packages]
+    requirements["packages_required"] = [str(p) for p in req_packages]
 
     # Get our recommended packages
-    _opt_packages = plugin.requirements.get('packages_recommended')
-    if isinstance(_opt_packages, str):
+    opt_packages = plugin.requirements.get("packages_recommended")
+    if isinstance(opt_packages, str):
         # Convert to list
-        _opt_packages = [_opt_packages]
+        opt_packages = [opt_packages]
 
-    elif not isinstance(_opt_packages, (set, list, tuple)):
+    elif not isinstance(opt_packages, (set, list, tuple)):
         # Allow one to set the recommended packages to None (as an example)
-        _opt_packages = []
+        opt_packages = []
 
-    requirements['packages_recommended'] = [str(p) for p in _opt_packages]
+    requirements["packages_recommended"] = [str(p) for p in opt_packages]
 
     # Get our package details
-    _req_details = plugin.requirements.get('details')
-    if not _req_details:
-        if not (_req_packages or _opt_packages):
-            _req_details = _('No dependencies.')
+    req_details = plugin.requirements.get("details")
+    if not req_details:
+        if not (req_packages or opt_packages):
+            req_details = _("No dependencies.")
 
-        elif _req_packages:
-            _req_details = _('Packages are required to function.')
+        elif req_packages:
+            req_details = _("Packages are required to function.")
 
         else:  # opt_packages
-            _req_details = \
-                _('Packages are recommended to improve functionality.')
+            req_details = _(
+                "Packages are recommended to improve functionality."
+            )
     else:
         # Store our details if defined
-        requirements['details'] = _req_details
+        requirements["details"] = req_details
 
     # Return our compiled package requirements
     return requirements
 
 
 def url_to_dict(url, secure_logging=True):
-    """
-    Takes an apprise URL and returns the tokens associated with it
-    if they can be acquired based on the plugins available.
+    """Takes an apprise URL and returns the tokens associated with it if they
+    can be acquired based on the plugins available.
 
-    None is returned if the URL could not be parsed, otherwise the
-    tokens are returned.
+    None is returned if the URL could not be parsed, otherwise the tokens are
+    returned.
 
-    These tokens can be loaded into apprise through it's add()
-    function.
+    These tokens can be loaded into apprise through it's add() function.
     """
 
     # swap hash (#) tag values with their html version
-    _url = url.replace('/#', '/%23')
+    url_ = url.replace("/#", "/%23")
 
     # CWE-312 (Secure Logging) Handling
     loggable_url = url if not secure_logging else cwe312_url(url)
@@ -438,14 +434,14 @@ def url_to_dict(url, secure_logging=True):
     # Attempt to acquire the schema at the very least to allow our plugins to
     # determine if they can make a better interpretation of a URL geared for
     # them.
-    schema = GET_SCHEMA_RE.match(_url)
+    schema = GET_SCHEMA_RE.match(url_)
     if schema is None:
         # Not a valid URL; take an early exit
-        logger.error('Unsupported URL: {}'.format(loggable_url))
+        logger.error(f"Unsupported URL: {loggable_url}")
         return None
 
     # Ensure our schema is always in lower case
-    schema = schema.group('schema').lower()
+    schema = schema.group("schema").lower()
     if schema not in N_MGR:
         # Give the user the benefit of the doubt that the user may be using
         # one of the URLs provided to them by their notification service.
@@ -453,31 +449,40 @@ def url_to_dict(url, secure_logging=True):
         # native_url() parse function
         results = None
         for plugin in N_MGR.plugins():
-            results = plugin.parse_native_url(_url)
+            results = plugin.parse_native_url(url_)
             if results:
                 break
 
         if not results:
-            logger.error('Unparseable URL {}'.format(loggable_url))
+            logger.error(f"Unparseable URL {loggable_url}")
             return None
 
-        logger.trace('URL {} unpacked as:{}{}'.format(
-            url, os.linesep, os.linesep.join(
-                ['{}="{}"'.format(k, v) for k, v in results.items()])))
+        logger.trace(
+            "URL {} unpacked as:{}{}".format(
+                url,
+                os.linesep,
+                os.linesep.join([f'{k}="{v}"' for k, v in results.items()]),
+            )
+        )
 
     else:
         # Parse our url details of the server object as dictionary
         # containing all of the information parsed from our URL
-        results = N_MGR[schema].parse_url(_url)
+        results = N_MGR[schema].parse_url(url_)
         if not results:
-            logger.error('Unparseable {} URL {}'.format(
-                N_MGR[schema].service_name, loggable_url))
+            logger.error(
+                f"Unparseable {N_MGR[schema].service_name} URL {loggable_url}"
+            )
             return None
 
-        logger.trace('{} URL {} unpacked as:{}{}'.format(
-            N_MGR[schema].service_name, url,
-            os.linesep, os.linesep.join(
-                ['{}="{}"'.format(k, v) for k, v in results.items()])))
+        logger.trace(
+            "{} URL {} unpacked as:{}{}".format(
+                N_MGR[schema].service_name,
+                url,
+                os.linesep,
+                os.linesep.join([f'{k}="{v}"' for k, v in results.items()]),
+            )
+        )
 
     # Return our results
     return results
diff --git a/libs/apprise/plugins/africas_talking.py b/libs/apprise/plugins/africas_talking.py
index 5975876484..4a4efc637a 100644
--- a/libs/apprise/plugins/africas_talking.py
+++ b/libs/apprise/plugins/africas_talking.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,25 +32,28 @@
 # API Details: https://developers.africastalking.com/docs/sms/sending/bulk
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import (
-    is_phone_no, parse_bool, parse_phone_no, validate_regex)
 from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from .base import NotifyBase
 
 
 class AfricasTalkingSMSMode:
-    """
-    Africas Talking SMS Mode
-    """
+    """Africas Talking SMS Mode."""
+
     # BulkSMS Mode
-    BULKSMS = 'bulksms'
+    BULKSMS = "bulksms"
 
     # Premium Mode
-    PREMIUM = 'premium'
+    PREMIUM = "premium"
 
     # Sandbox Mode
-    SANDBOX = 'sandbox'
+    SANDBOX = "sandbox"
 
 
 # Define the types in a list for validation purposes
@@ -64,48 +66,49 @@ class AfricasTalkingSMSMode:
 
 # Extend HTTP Error Messages
 AFRICAS_TALKING_HTTP_ERROR_MAP = {
-    100: 'Processed',
-    101: 'Sent',
-    102: 'Queued',
-    401: 'Risk Hold',
-    402: 'Invalid Sender ID',
-    403: 'Invalid Phone Number',
-    404: 'Unsupported Number Type',
-    405: 'Insufficient Balance',
-    406: 'User In Blacklist',
-    407: 'Could Not Route',
-    409: 'Do Not Disturb Rejection',
-    500: 'Internal Server Error',
-    501: 'Gateway Error',
-    502: 'Rejected By Gateway',
+    100: "Processed",
+    101: "Sent",
+    102: "Queued",
+    401: "Risk Hold",
+    402: "Invalid Sender ID",
+    403: "Invalid Phone Number",
+    404: "Unsupported Number Type",
+    405: "Insufficient Balance",
+    406: "User In Blacklist",
+    407: "Could Not Route",
+    409: "Do Not Disturb Rejection",
+    500: "Internal Server Error",
+    501: "Gateway Error",
+    502: "Rejected By Gateway",
 }
 
 
 class NotifyAfricasTalking(NotifyBase):
-    """
-    A wrapper for Africas Talking Notifications
-    """
+    """A wrapper for Africas Talking Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Africas Talking'
+    service_name = "Africas Talking"
 
     # The services URL
-    service_url = 'https://africastalking.com/'
+    service_url = "https://africastalking.com/"
 
     # The default secure protocol
-    secure_protocol = 'atalk'
+    secure_protocol = "atalk"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_africas_talking'
+    setup_url = "https://appriseit.com/services/africas_talking/"
 
     # Africas Talking API Request URLs
     notify_url = {
-        AfricasTalkingSMSMode.BULKSMS:
-        'https://api.africastalking.com/version1/messaging',
-        AfricasTalkingSMSMode.PREMIUM:
-        'https://content.africastalking.com/version1/messaging',
-        AfricasTalkingSMSMode.SANDBOX:
-        'https://api.sandbox.africastalking.com/version1/messaging',
+        AfricasTalkingSMSMode.BULKSMS: (
+            "https://api.africastalking.com/version1/messaging"
+        ),
+        AfricasTalkingSMSMode.PREMIUM: (
+            "https://content.africastalking.com/version1/messaging"
+        ),
+        AfricasTalkingSMSMode.SANDBOX: (
+            "https://api.sandbox.africastalking.com/version1/messaging"
+        ),
     }
 
     # The maximum allowable characters allowed in the title per message
@@ -119,146 +122,172 @@ class NotifyAfricasTalking(NotifyBase):
     default_batch_size = 50
 
     # Define object templates
-    templates = (
-        '{schema}://{appuser}@{apikey}/{targets}',
-    )
+    templates = ("{schema}://{appuser}@{apikey}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'appuser': {
-            'name': _('App User Name'),
-            'type': 'string',
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
-            'required': True,
-        },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
-        },
-        'target_phone': {
-            'name': _('Target Phone'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "appuser": {
+                "name": _("App User Name"),
+                "type": "string",
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+                "required": True,
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'apikey': {
-            'alias_of': 'apikey',
-        },
-        'from': {
-            # Your registered short code or alphanumeric
-            'name': _('From'),
-            'type': 'string',
-            'default': 'AFRICASTKNG',
-            'map_to': 'sender',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-        'mode': {
-            'name': _('SMS Mode'),
-            'type': 'choice:string',
-            'values': AFRICAS_TALKING_SMS_MODES,
-            'default': AFRICAS_TALKING_SMS_MODES[0],
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "apikey": {
+                "alias_of": "apikey",
+            },
+            "from": {
+                # Your registered short code or alphanumeric
+                "name": _("From"),
+                "type": "string",
+                "default": "AFRICASTKNG",
+                "map_to": "sender",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
+            "mode": {
+                "name": _("SMS Mode"),
+                "type": "choice:string",
+                "values": AFRICAS_TALKING_SMS_MODES,
+                "default": AFRICAS_TALKING_SMS_MODES[0],
+            },
         },
-    })
+    )
 
-    def __init__(self, appuser, apikey, targets=None, sender=None, batch=None,
-                 mode=None, **kwargs):
-        """
-        Initialize Africas Talking Object
-        """
+    def __init__(
+        self,
+        appuser,
+        apikey,
+        targets=None,
+        sender=None,
+        batch=None,
+        mode=None,
+        **kwargs,
+    ):
+        """Initialize Africas Talking Object."""
         super().__init__(**kwargs)
 
         self.appuser = validate_regex(
-            appuser, *self.template_tokens['appuser']['regex'])
+            appuser, *self.template_tokens["appuser"]["regex"]
+        )
         if not self.appuser:
-            msg = 'The Africas Talking appuser specified ({}) is invalid.'\
-                .format(appuser)
+            msg = (
+                f"The Africas Talking appuser specified ({appuser}) is"
+                " invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'The Africas Talking apikey specified ({}) is invalid.'\
-                .format(apikey)
+            msg = (
+                f"The Africas Talking apikey specified ({apikey}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Prepare Sender
-        self.sender = self.template_args['from']['default'] \
-            if sender is None else sender
+        self.sender = (
+            self.template_args["from"]["default"] if sender is None else sender
+        )
 
         # Prepare Batch Mode Flag
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else batch
+        self.batch = (
+            self.template_args["batch"]["default"] if batch is None else batch
+        )
 
-        self.mode = self.template_args['mode']['default'] \
-            if not isinstance(mode, str) else mode.lower()
+        self.mode = (
+            self.template_args["mode"]["default"]
+            if not isinstance(mode, str)
+            else mode.lower()
+        )
 
         if isinstance(mode, str) and mode:
             self.mode = next(
-                (a for a in AFRICAS_TALKING_SMS_MODES if a.startswith(
-                    mode.lower())), None)
+                (
+                    a
+                    for a in AFRICAS_TALKING_SMS_MODES
+                    if a.startswith(mode.lower())
+                ),
+                None,
+            )
 
             if self.mode not in AFRICAS_TALKING_SMS_MODES:
-                msg = 'The Africas Talking mode specified ({}) is invalid.'\
-                    .format(mode)
+                msg = (
+                    f"The Africas Talking mode specified ({mode}) is invalid."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.mode = self.template_args['mode']['default']
+            self.mode = self.template_args["mode"]["default"]
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
             # Carry forward '+' if defined, otherwise do not...
             self.targets.append(
-                ('+' + result['full'])
-                if target.lstrip()[0] == '+' else result['full'])
+                ("+" + result["full"])
+                if target.lstrip()[0] == "+"
+                else result["full"]
+            )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Africas Talking Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Africas Talking Notification."""
 
         if not self.targets:
             # There is no one to email; we're done
             self.logger.warning(
-                'There are no Africas Talking recipients to notify')
+                "There are no Africas Talking recipients to notify"
+            )
             return False
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Accept': 'application/json',
-            'apiKey': self.apikey,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Accept": "application/json",
+            "apiKey": self.apikey,
         }
 
         # error tracking (used for function return)
@@ -271,24 +300,27 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         for index in range(0, len(self.targets), batch_size):
             # Prepare our payload
             payload = {
-                'username': self.appuser,
-                'to': ','.join(self.targets[index:index + batch_size]),
-                'from': self.sender,
-                'message': body,
+                "username": self.appuser,
+                "to": ",".join(self.targets[index : index + batch_size]),
+                "from": self.sender,
+                "message": body,
             }
 
             # Acquire our URL
             notify_url = self.notify_url[self.mode]
 
             self.logger.debug(
-                'Africas Talking POST URL: %s (cert_verify=%r)' % (
-                    notify_url, self.verify_certificate))
-            self.logger.debug('Africas Talking Payload: %s' % str(payload))
+                "Africas Talking POST URL:"
+                f" {notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Africas Talking Payload: {payload!s}")
 
             # Printable target detail
-            p_target = self.targets[index] if batch_size == 1 \
-                else '{} target(s)'.format(
-                    len(self.targets[index:index + batch_size]))
+            p_target = (
+                self.targets[index]
+                if batch_size == 1
+                else f"{len(self.targets[index:index + batch_size])} target(s)"
+            )
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -316,20 +348,24 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code not in (100, 101, 102, requests.codes.ok):
                     # We had a problem
-                    status_str = \
+                    status_str = (
                         NotifyAfricasTalking.http_response_code_lookup(
-                            r.status_code, AFRICAS_TALKING_HTTP_ERROR_MAP)
+                            r.status_code, AFRICAS_TALKING_HTTP_ERROR_MAP
+                        )
+                    )
 
                     self.logger.warning(
-                        'Failed to send Africas Talking notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Africas Talking notification to {}: "
+                        "{}{}error={}.".format(
                             p_target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -337,14 +373,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent Africas Talking notification to {}.'
-                        .format(p_target))
+                        f"Sent Africas Talking notification to {p_target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Africas Talking '
-                    'notification to {}.'.format(p_target))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Africas Talking "
+                    f"notification to {p_target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -354,115 +391,116 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.appuser, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
+            "batch": "yes" if self.batch else "no",
         }
 
-        if self.sender != self.template_args['from']['default']:
+        if self.sender != self.template_args["from"]["default"]:
             # Set our sender if it was set
-            params['from'] = self.sender
+            params["from"] = self.sender
 
-        if self.mode != self.template_args['mode']['default']:
+        if self.mode != self.template_args["mode"]["default"]:
             # Set our mode
-            params['mode'] = self.mode
+            params["mode"] = self.mode
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{appuser}@{apikey}/{targets}?{params}'.format(
+        return "{schema}://{appuser}@{apikey}/{targets}?{params}".format(
             schema=self.secure_protocol,
-            appuser=NotifyAfricasTalking.quote(self.appuser, safe=''),
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(
-                [NotifyAfricasTalking.quote(x, safe='+')
-                 for x in self.targets]),
+            appuser=NotifyAfricasTalking.quote(self.appuser, safe=""),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                [NotifyAfricasTalking.quote(x, safe="+") for x in self.targets]
+            ),
             params=NotifyAfricasTalking.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The Application User ID
-        results['appuser'] = NotifyAfricasTalking.unquote(results['user'])
+        results["appuser"] = NotifyAfricasTalking.unquote(results["user"])
 
         # Prepare our targets
-        results['targets'] = []
+        results["targets"] = []
 
         # Our Application APIKey
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
             # Store our apikey if specified as keyword
-            results['apikey'] = \
-                NotifyAfricasTalking.unquote(results['qsd']['apikey'])
+            results["apikey"] = NotifyAfricasTalking.unquote(
+                results["qsd"]["apikey"]
+            )
 
             # This means our host is actually a phone number (target)
-            results['targets'].append(
-                NotifyAfricasTalking.unquote(results['host']))
+            results["targets"].append(
+                NotifyAfricasTalking.unquote(results["host"])
+            )
 
         else:
             # First item is our apikey
-            results['apikey'] = NotifyAfricasTalking.unquote(results['host'])
+            results["apikey"] = NotifyAfricasTalking.unquote(results["host"])
 
         # Store our remaining targets found on path
-        results['targets'].extend(
-            NotifyAfricasTalking.split_path(results['fullpath']))
+        results["targets"].extend(
+            NotifyAfricasTalking.split_path(results["fullpath"])
+        )
 
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['sender'] = \
-                NotifyAfricasTalking.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["sender"] = NotifyAfricasTalking.unquote(
+                results["qsd"]["from"]
+            )
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyAfricasTalking.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyAfricasTalking.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Get our Mode
-        if 'mode' in results['qsd'] and len(results['qsd']['mode']):
-            results['mode'] = \
-                NotifyAfricasTalking.unquote(results['qsd']['mode'])
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            results["mode"] = NotifyAfricasTalking.unquote(
+                results["qsd"]["mode"]
+            )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch',
-                NotifyAfricasTalking.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyAfricasTalking.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/apprise_api.py b/libs/apprise/plugins/apprise_api.py
index a261620366..a0bacd7041 100644
--- a/libs/apprise/plugins/apprise_api.py
+++ b/libs/apprise/plugins/apprise_api.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,24 +25,26 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from json import dumps
+import logging
 import re
+
 import requests
-from json import dumps
 
 from .. import exception
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_list, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 
 class AppriseAPIMethod:
-    """
-    Defines the method to post data tot he remote server
-    """
-    JSON = 'json'
-    FORM = 'form'
+    """Defines the method to post data tot he remote server."""
+
+    JSON = "json"
+    FORM = "form"
 
 
 APPRISE_API_METHODS = (
@@ -53,24 +54,22 @@ class AppriseAPIMethod:
 
 
 class NotifyAppriseAPI(NotifyBase):
-    """
-    A wrapper for Apprise (Persistent) API Notifications
-    """
+    """A wrapper for Apprise (Persistent) API Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Apprise API'
+    service_name = "Apprise API"
 
     # The services URL
-    service_url = 'https://github.com/caronc/apprise-api'
+    service_url = "https://github.com/caronc/apprise-api"
 
     # The default protocol
-    protocol = 'apprise'
+    protocol = "apprise"
 
     # The default secure protocol
-    secure_protocol = 'apprises'
+    secure_protocol = "apprises"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_apprise_api'
+    setup_url = "https://appriseit.com/services/apprise_api/"
 
     # Support attachments
     attachment_support = True
@@ -85,96 +84,104 @@ class NotifyAppriseAPI(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{token}',
-        '{schema}://{host}:{port}/{token}',
-        '{schema}://{user}@{host}/{token}',
-        '{schema}://{user}@{host}:{port}/{token}',
-        '{schema}://{user}:{password}@{host}/{token}',
-        '{schema}://{user}:{password}@{host}:{port}/{token}',
+        "{schema}://{host}/{token}",
+        "{schema}://{host}:{port}/{token}",
+        "{schema}://{user}@{host}/{token}",
+        "{schema}://{user}@{host}:{port}/{token}",
+        "{schema}://{user}:{password}@{host}/{token}",
+        "{schema}://{user}:{password}@{host}:{port}/{token}",
     )
 
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[A-Z0-9_-]{1,128}$", "i"),
+            },
         },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[A-Z0-9_-]{1,128}$', 'i'),
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'tags': {
-            'name': _('Tags'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "tags": {
+                "name": _("Tags"),
+                "type": "string",
+            },
+            "method": {
+                "name": _("Query Method"),
+                "type": "choice:string",
+                "values": APPRISE_API_METHODS,
+                "default": APPRISE_API_METHODS[0],
+            },
+            "to": {
+                "alias_of": "token",
+            },
         },
-        'method': {
-            'name': _('Query Method'),
-            'type': 'choice:string',
-            'values': APPRISE_API_METHODS,
-            'default': APPRISE_API_METHODS[0],
-        },
-        'to': {
-            'alias_of': 'token',
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, token=None, tags=None, method=None, headers=None,
-                 **kwargs):
-        """
-        Initialize Apprise API Object
+    def __init__(
+        self, token=None, tags=None, method=None, headers=None, **kwargs
+    ):
+        """Initialize Apprise API Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'The Apprise API token specified ({}) is invalid.'\
-                .format(token)
+            msg = f"The Apprise API token specified ({token}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        self.method = self.template_args['method']['default'] \
-            if not isinstance(method, str) else method.lower()
+        self.method = (
+            self.template_args["method"]["default"]
+            if not isinstance(method, str)
+            else method.lower()
+        )
 
         if self.method not in APPRISE_API_METHODS:
-            msg = 'The method specified ({}) is invalid.'.format(method)
+            msg = f"The method specified ({method}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -189,64 +196,75 @@ def __init__(self, token=None, tags=None, method=None, headers=None,
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'method': self.method,
+            "method": self.method,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         if self.__tags:
-            params['tags'] = ','.join([x for x in self.__tags])
+            params["tags"] = ",".join(list(self.__tags))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyAppriseAPI.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyAppriseAPI.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyAppriseAPI.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyAppriseAPI.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
 
-        fullpath = self.fullpath.strip('/')
-        return '{schema}://{auth}{hostname}{port}{fullpath}{token}' \
-               '/?{params}'.format(
-                   schema=self.secure_protocol
-                   if self.secure else self.protocol,
-                   auth=auth,
-                   # never encode hostname since we're expecting it to be a
-                   # valid one
-                   hostname=self.host,
-                   port='' if self.port is None or self.port == default_port
-                        else ':{}'.format(self.port),
-                   fullpath='/{}/'.format(NotifyAppriseAPI.quote(
-                       fullpath, safe='/')) if fullpath else '/',
-                   token=self.pprint(self.token, privacy, safe=''),
-                   params=NotifyAppriseAPI.urlencode(params))
-
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Apprise API Notification
-        """
+        fullpath = self.fullpath.strip("/")
+        return (
+            "{schema}://{auth}{hostname}{port}{fullpath}{token}"
+            "/?{params}".format(
+                schema=self.secure_protocol if self.secure else self.protocol,
+                auth=auth,
+                # never encode hostname since we're expecting it to be a
+                # valid one
+                hostname=self.host,
+                port=(
+                    ""
+                    if self.port is None or self.port == default_port
+                    else f":{self.port}"
+                ),
+                fullpath=(
+                    "/{}/".format(NotifyAppriseAPI.quote(fullpath, safe="/"))
+                    if fullpath
+                    else "/"
+                ),
+                token=self.pprint(self.token, privacy, safe=""),
+                params=NotifyAppriseAPI.urlencode(params),
+            )
+        )
+
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Apprise API Notification."""
 
         # Prepare HTTP Headers
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Apply any/all header over-rides defined
@@ -260,94 +278,109 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Apprise API attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Apprise API attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     # Our Attachment filename
-                    filename = attachment.name \
-                        if attachment.name else f'file{no:03}.dat'
+                    filename = (
+                        attachment.name
+                        if attachment.name
+                        else f"file{no:03}.dat"
+                    )
 
                     if self.method == AppriseAPIMethod.JSON:
                         # Output must be in a DataURL format (that's what
                         # PushSafer calls it):
                         attachments.append({
                             "filename": filename,
-                            'base64': attachment.base64(),
-                            'mimetype': attachment.mimetype,
+                            "base64": attachment.base64(),
+                            "mimetype": attachment.mimetype,
                         })
 
                     else:  # AppriseAPIMethod.FORM
                         files.append((
-                            'file{:02d}'.format(no),
+                            f"file{no:02d}",
                             (
                                 filename,
-                                open(attachment.path, 'rb'),
+                                # file handle is safely closed in `finally`;
+                                # inline open is intentional
+                                open(attachment.path, "rb"),  # noqa: SIM115
                                 attachment.mimetype,
-                            )
+                            ),
                         ))
 
                 except (TypeError, OSError, exception.AppriseException):
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access AppriseAPI attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access AppriseAPI attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending AppriseAPI attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending AppriseAPI attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         # prepare Apprise API Object
         payload = {
             # Apprise API Payload
-            'title': title,
-            'body': body,
-            'type': notify_type,
-            'format': self.notify_format,
+            "title": title,
+            "body": body,
+            "type": notify_type.value,
+            "format": self.notify_format.value,
         }
 
         if self.method == AppriseAPIMethod.JSON:
-            headers['Content-Type'] = 'application/json'
+            headers["Content-Type"] = "application/json"
 
             if attachments:
-                payload['attachments'] = attachments
+                payload["attachments"] = attachments
 
             payload = dumps(payload)
 
         if self.__tags:
-            payload['tag'] = self.__tags
+            payload["tag"] = self.__tags
 
         auth = None
         if self.user:
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        fullpath = self.fullpath.strip('/')
-        url += '{}'.format('/' + fullpath) if fullpath else ''
-        url += '/notify/{}'.format(self.token)
+        fullpath = self.fullpath.strip("/")
+        url += "{}".format("/" + fullpath) if fullpath else ""
+        url += f"/notify/{self.token}"
 
         # Some entries can not be over-ridden
         headers.update({
             # Our response to be in JSON format always
-            'Accept': 'application/json',
+            "Accept": "application/json",
             # Pass our Source UUID4 Identifier
-            'X-Apprise-ID': self.asset._uid,
+            "X-Apprise-ID": self.asset._uid,
             # Pass our current recursion count to our upstream server
-            'X-Apprise-Recursion-Count': str(self.asset._recursion + 1),
+            "X-Apprise-Recursion-Count": str(self.asset._recursion + 1),
         })
 
-        self.logger.debug('Apprise API POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Apprise API Payload: %s' % str(payload))
+        # Some Debug Logging
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                "Apprise API POST URL:"
+                f" {url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(
+                "Apprise API Payload: %s", sanitize_payload(payload))
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -364,39 +397,44 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyAppriseAPI.http_response_code_lookup(r.status_code)
+                status_str = NotifyAppriseAPI.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Apprise API notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Apprise API notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
                 self.logger.info(
-                    'Sent Apprise API notification; method=%s.', self.method)
+                    "Sent Apprise API notification; method=%s.", self.method
+                )
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Apprise API '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Apprise API "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while reading one of the '
-                'attached files.')
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while reading one of the "
+                "attached files."
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return False
 
         finally:
@@ -414,34 +452,48 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^http(?P<secure>s?)://(?P<hostname>[A-Z0-9._-]+)'
-            r'(:(?P<port>[0-9]+))?'
-            r'(?P<path>/[^?]+?)?/notify/(?P<token>[A-Z0-9_-]{1,32})/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^http(?P<secure>s?)://(?P<hostname>[A-Z0-9._-]+)"
+            r"(:(?P<port>[0-9]+))?"
+            r"(?P<path>/[^?]+?)?/notify/(?P<token>[A-Z0-9_-]{1,32})/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyAppriseAPI.parse_url(
-                '{schema}://{hostname}{port}{path}/{token}/{params}'.format(
-                    schema=NotifyAppriseAPI.secure_protocol
-                    if result.group('secure') else NotifyAppriseAPI.protocol,
-                    hostname=result.group('hostname'),
-                    port='' if not result.group('port')
-                    else ':{}'.format(result.group('port')),
-                    path='' if not result.group('path')
-                    else result.group('path'),
-                    token=result.group('token'),
-                    params='' if not result.group('params')
-                    else '?{}'.format(result.group('params'))))
+                "{schema}://{hostname}{port}{path}/{token}/{params}".format(
+                    schema=(
+                        NotifyAppriseAPI.secure_protocol
+                        if result.group("secure")
+                        else NotifyAppriseAPI.protocol
+                    ),
+                    hostname=result.group("hostname"),
+                    port=(
+                        ""
+                        if not result.group("port")
+                        else ":{}".format(result.group("port"))
+                    ),
+                    path=(
+                        ""
+                        if not result.group("path")
+                        else result.group("path")
+                    ),
+                    token=result.group("token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else "?{}".format(result.group("params"))
+                    ),
+                )
+            )
 
         return None
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
@@ -449,40 +501,44 @@ def parse_url(url):
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = \
-            {NotifyAppriseAPI.unquote(x): NotifyAppriseAPI.unquote(y)
-             for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyAppriseAPI.unquote(x): NotifyAppriseAPI.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Support the passing of tags in the URL
-        if 'tags' in results['qsd'] and len(results['qsd']['tags']):
-            results['tags'] = \
-                NotifyAppriseAPI.parse_list(results['qsd']['tags'])
+        if "tags" in results["qsd"] and len(results["qsd"]["tags"]):
+            results["tags"] = NotifyAppriseAPI.parse_list(
+                results["qsd"]["tags"]
+            )
 
         # Support the 'to' & 'token' variable so that we can support rooms
         # this way too.
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = \
-                NotifyAppriseAPI.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyAppriseAPI.unquote(
+                results["qsd"]["token"]
+            )
 
-        elif 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['token'] = NotifyAppriseAPI.unquote(results['qsd']['to'])
+        elif "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["token"] = NotifyAppriseAPI.unquote(results["qsd"]["to"])
 
         else:
             # Start with a list of path entries to work with
-            entries = NotifyAppriseAPI.split_path(results['fullpath'])
+            entries = NotifyAppriseAPI.split_path(results["fullpath"])
             if entries:
                 # use our last entry found
-                results['token'] = entries[-1]
+                results["token"] = entries[-1]
 
                 # pop our last entry off
                 entries = entries[:-1]
 
                 # re-assemble our full path
-                results['fullpath'] = '/'.join(entries)
+                results["fullpath"] = "/".join(entries)
 
         # Set method if specified
-        if 'method' in results['qsd'] and len(results['qsd']['method']):
-            results['method'] = \
-                NotifyAppriseAPI.unquote(results['qsd']['method'])
+        if "method" in results["qsd"] and len(results["qsd"]["method"]):
+            results["method"] = NotifyAppriseAPI.unquote(
+                results["qsd"]["method"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/aprs.py b/libs/apprise/plugins/aprs.py
index bf50af9bba..33d40fbe43 100644
--- a/libs/apprise/plugins/aprs.py
+++ b/libs/apprise/plugins/aprs.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -67,16 +66,18 @@
 # http://www.aprs.org/doc/APRS101.PDF
 #
 
+import contextlib
+from itertools import chain
+import re
 import socket
 import sys
-from itertools import chain
-from .base import NotifyBase
+
+from .. import __version__
+from ..common import NotifyType
 from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyType
 from ..utils.parse import is_call_sign, parse_call_sign
-from .. import __version__
-import re
+from .base import NotifyBase
 
 # Fixed APRS-IS server locales
 # Default is 'EURO'
@@ -104,14 +105,11 @@
 }
 
 # Our compiled mapping of bad characters
-APRS_COMPILED_MAP = re.compile(
-    r'(' + '|'.join(APRS_BAD_CHARMAP.keys()) + r')')
+APRS_COMPILED_MAP = re.compile(r"(" + "|".join(APRS_BAD_CHARMAP.keys()) + r")")
 
 
 class NotifyAprs(NotifyBase):
-    """
-    A wrapper for APRS Notifications via APRS-IS
-    """
+    """A wrapper for APRS Notifications via APRS-IS."""
 
     # The default descriptive name associated with the Notification
     service_name = "Aprs"
@@ -123,7 +121,7 @@ class NotifyAprs(NotifyBase):
     secure_protocol = "aprs"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = "https://github.com/caronc/apprise/wiki/Notify_aprs"
+    setup_url = "https://appriseit.com/services/aprs/"
 
     # APRS default port, supported by all core servers
     # Details: https://www.aprs-is.net/Connecting.aspx
@@ -156,7 +154,7 @@ class NotifyAprs(NotifyBase):
     request_rate_per_sec = 0.8
 
     # Encoding of retrieved content
-    aprs_encoding = 'latin-1'
+    aprs_encoding = "latin-1"
 
     # Define object templates
     templates = ("{schema}://{user}:{password}@{targets}",)
@@ -190,7 +188,7 @@ class NotifyAprs(NotifyBase):
                 "type": "list:string",
                 "required": True,
             },
-        }
+        },
     )
 
     # Define our template arguments
@@ -215,21 +213,18 @@ class NotifyAprs(NotifyBase):
                 "values": APRS_LOCALES,
                 "default": "EURO",
             },
-        }
+        },
     )
 
     def __init__(self, targets=None, locale=None, delay=None, **kwargs):
-        """
-        Initialize APRS Object
-        """
+        """Initialize APRS Object."""
         super().__init__(**kwargs)
 
         # Our (future) socket sobject
         self.sock = None
 
         # Parse our targets
-        self.targets = list()
-
+        self.targets = []
         """
         Check if the user has provided credentials
         """
@@ -262,21 +257,19 @@ def __init__(self, targets=None, locale=None, delay=None, **kwargs):
         """
         self.user = self.user.upper()
         self.device_id = self.device_id.upper()
-
         """
         Check if the user has provided a locale for the
         APRS-IS-server and validate it, if necessary
         """
-        if locale:
-            if locale.upper() not in APRS_LOCALES:
-                msg = (
-                    "Unsupported APRS-IS server locale. "
-                    "Received: {}. Valid: {}".format(
-                        locale, ", ".join(str(x) for x in APRS_LOCALES.keys())
-                    )
+        if locale and locale.upper() not in APRS_LOCALES:
+            msg = (
+                "Unsupported APRS-IS server locale. "
+                "Received: {}. Valid: {}".format(
+                    locale, ", ".join(str(x) for x in APRS_LOCALES)
                 )
-                self.logger.warning(msg)
-                raise TypeError(msg)
+            )
+            self.logger.warning(msg)
+            raise TypeError(msg)
 
         # Update our delay
         if delay is None:
@@ -285,28 +278,29 @@ def __init__(self, targets=None, locale=None, delay=None, **kwargs):
         else:
             try:
                 self.delay = float(delay)
-                if self.delay < NotifyAprs.template_args["delay"]["min"]:
-                    raise ValueError()
-
-                elif self.delay >= NotifyAprs.template_args["delay"]["max"]:
+                if (
+                    self.delay < NotifyAprs.template_args["delay"]["min"]
+                    or self.delay >= NotifyAprs.template_args["delay"]["max"]
+                ):
                     raise ValueError()
 
             except (TypeError, ValueError):
-                msg = "Unsupported APRS-IS delay ({}) specified. ".format(
-                    delay)
+                msg = f"Unsupported APRS-IS delay ({delay}) specified. "
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
         # Bump up our request_rate
         self.request_rate_per_sec += self.delay
 
         # Set the transmitter group
-        self.locale = \
-            NotifyAprs.template_args["locale"]["default"] \
-            if not locale else locale.upper()
+        self.locale = (
+            NotifyAprs.template_args["locale"]["default"]
+            if not locale
+            else locale.upper()
+        )
 
         # Used for URL generation afterwards only
-        self.invalid_targets = list()
+        self.invalid_targets = []
 
         for target in parse_call_sign(targets):
             # Validate targets and drop bad ones
@@ -315,9 +309,7 @@ def __init__(self, targets=None, locale=None, delay=None, **kwargs):
             result = is_call_sign(target)
             if not result:
                 self.logger.warning(
-                    "Dropping invalid Amateur radio call sign ({}).".format(
-                        target
-                    ),
+                    f"Dropping invalid Amateur radio call sign ({target}).",
                 )
                 self.invalid_targets.append(target.upper())
                 continue
@@ -328,28 +320,17 @@ def __init__(self, targets=None, locale=None, delay=None, **kwargs):
         return
 
     def socket_close(self):
-        """
-        Closes the socket connection whereas present
-        """
+        """Closes the socket connection whereas present."""
         if self.sock:
-            try:
+            with contextlib.suppress(Exception):
                 self.sock.close()
-
-            except Exception:
-                # No worries if socket exception thrown on close()
-                pass
-
             self.sock = None
 
     def socket_open(self):
-        """
-        Establishes the connection to the APRS-IS
-        socket server
-        """
+        """Establishes the connection to the APRS-IS socket server."""
         self.logger.debug(
-            "Creating socket connection with APRS-IS {}:{}".format(
-                APRS_LOCALES[self.locale], self.notify_port
-            )
+            "Creating socket connection with APRS-IS"
+            f" {APRS_LOCALES[self.locale]}:{self.notify_port}"
         )
 
         try:
@@ -359,23 +340,23 @@ def socket_open(self):
             )
 
         except ConnectionError as e:
-            self.logger.debug("Socket Exception socket_open: %s", str(e))
+            self.logger.debug("Socket Exception socket_open: %s", e)
             self.sock = None
             return False
 
         except socket.gaierror as e:
-            self.logger.debug("Socket Exception socket_open: %s", str(e))
+            self.logger.debug("Socket Exception socket_open: %s", e)
             self.sock = None
             return False
 
         except socket.timeout as e:
             self.logger.debug(
-                "Socket Timeout Exception socket_open: %s", str(e))
+                "Socket Timeout Exception socket_open: %s", e)
             self.sock = None
             return False
 
         except Exception as e:
-            self.logger.debug("General Exception socket_open: %s", str(e))
+            self.logger.debug("General Exception socket_open: %s", e)
             self.sock = None
             return False
 
@@ -387,7 +368,7 @@ def socket_open(self):
             # Get the physical host/port of the server
             host, port = self.sock.getpeername()
             # and create debug info
-            self.logger.debug("Connected to {}:{}".format(host, port))
+            self.logger.debug(f"Connected to {host}:{port}")
 
         except ValueError:
             # Seens as if we are running on an operating
@@ -399,9 +380,8 @@ def socket_open(self):
         return True
 
     def aprsis_login(self):
-        """
-        Generate the APRS-IS login string, send it to the server
-        and parse the response
+        """Generate the APRS-IS login string, send it to the server and parse
+        the response.
 
         Returns True/False wrt whether the login was successful
         """
@@ -413,8 +393,9 @@ def aprsis_login(self):
             return False
 
         # APRS-IS login string, see https://www.aprs-is.net/Connecting.aspx
-        login_str = "user {0} pass {1} vers apprise {2}\r\n".format(
-            self.user, self.password, __version__
+        login_str = (
+            f"user {self.user} pass {self.password} vers apprise"
+            f" {__version__}\r\n"
         )
 
         # Send the data & abort in case of error
@@ -457,22 +438,19 @@ def aprsis_login(self):
             # ValueError is returned if there were not enough elements to
             # populate the response
             self.logger.warning(
-                "socket_login: " "received invalid response from APRS-IS"
+                "socket_login: received invalid response from APRS-IS"
             )
             self.socket_close()
             return False
 
         if callsign != self.user:
-            self.logger.warning(
-                "socket_login: " "call signs differ: %s" % callsign
-            )
+            self.logger.warning(f"socket_login: call signs differ: {callsign}")
             self.socket_close()
             return False
 
         if status.startswith("unverified"):
             self.logger.warning(
-                "socket_login: "
-                "invalid APRS-IS password for given call sign"
+                "socket_login: invalid APRS-IS password for given call sign"
             )
             self.socket_close()
             return False
@@ -481,9 +459,7 @@ def aprsis_login(self):
         return True
 
     def socket_send(self, tx_data):
-        """
-        Generic "Send data to a socket"
-        """
+        """Generic "Send data to a socket"."""
         self.logger.debug("socket_send: init")
 
         # Check if we are connected
@@ -507,21 +483,17 @@ def socket_send(self, tx_data):
             self.sock.sendall(payload)
 
         except socket.gaierror as e:
-            self.logger.warning("Socket Exception socket_send: %s" % str(e))
+            self.logger.warning(f"Socket Exception socket_send: {e!s}")
             self.sock = None
             return False
 
         except socket.timeout as e:
-            self.logger.warning(
-                "Socket Timeout Exception " "socket_send: %s" % str(e)
-            )
+            self.logger.warning(f"Socket Timeout Exception socket_send: {e!s}")
             self.sock = None
             return False
 
         except Exception as e:
-            self.logger.warning(
-                "General Exception " "socket_send: %s" % str(e)
-            )
+            self.logger.warning(f"General Exception socket_send: {e!s}")
             self.sock = None
             return False
 
@@ -533,18 +505,14 @@ def socket_send(self, tx_data):
         return True
 
     def socket_reset(self):
-        """
-        Resets the socket's buffer
-        """
+        """Resets the socket's buffer."""
         self.logger.debug("socket_reset: init")
         _ = self.socket_receive(0)
         self.logger.debug("socket_reset: successful")
         return True
 
     def socket_receive(self, rx_len):
-        """
-        Generic "Receive data from a socket"
-        """
+        """Generic "Receive data from a socket"."""
         self.logger.debug("socket_receive: init")
 
         # Check if we are connected
@@ -564,43 +532,38 @@ def socket_receive(self, rx_len):
             rx_buf = self.sock.recv(rx_len)
 
         except socket.gaierror as e:
-            self.logger.warning(
-                "Socket Exception socket_receive: %s" % str(e)
-            )
+            self.logger.warning(f"Socket Exception socket_receive: {e!s}")
             self.sock = None
             return False
 
         except socket.timeout as e:
             self.logger.warning(
-                "Socket Timeout Exception " "socket_receive: %s" % str(e)
+                f"Socket Timeout Exception socket_receive: {e!s}"
             )
             self.sock = None
             return False
 
         except Exception as e:
-            self.logger.warning(
-                "General Exception " "socket_receive: %s" % str(e)
-            )
+            self.logger.warning(f"General Exception socket_receive: {e!s}")
             self.sock = None
             return False
 
         rx_buf = (
             rx_buf.decode(self.aprs_encoding)
-            if sys.version_info[0] >= 3 else rx_buf
+            if sys.version_info[0] >= 3
+            else rx_buf
         )
 
         # There will be no data in case we reset the socket
         if rx_len > 0:
-            self.logger.debug("Received content: {}".format(rx_buf))
+            self.logger.debug(f"Received content: {rx_buf}")
 
         self.logger.debug("socket_receive: successful")
 
         return rx_buf.rstrip()
 
     def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform APRS Notification
-        """
+        """Perform APRS Notification."""
 
         if not self.targets:
             # There is no one to notify; we're done
@@ -643,11 +606,10 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
         # First remove all characters from the
         # payload that would break APRS
         # see https://www.aprs.org/doc/APRS101.PDF pg. 71
-        payload = re.sub("[{}|~]+", "", payload)
+        payload = re.sub(r"[{}|~]+", "", payload)
 
-        payload = (  # pragma: no branch
-            APRS_COMPILED_MAP.sub(
-                lambda x: APRS_BAD_CHARMAP[x.group()], payload)
+        payload = APRS_COMPILED_MAP.sub(  # pragma: no branch
+            lambda x: APRS_BAD_CHARMAP[x.group()], payload
         )
 
         # Finally, constrain output string to 67 characters as
@@ -658,21 +620,21 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
         # let's amend our payload respectively
         payload = payload.rstrip("\r\n") + "\r\n"
 
-        self.logger.debug("Payload setup complete: {}".format(payload))
+        self.logger.debug(f"Payload setup complete: {payload}")
 
         # send the message to our target call sign(s)
         for index in range(0, len(targets)):
             # prepare the output string
             # Format:
             # Device ID/TOCALL - our call sign - target call sign - body
-            buffer = "{}>{}::{:9}:{}".format(
-                self.user, self.device_id, targets[index], payload
+            buffer = (
+                f"{self.user}>{self.device_id}::{targets[index]:9}:{payload}"
             )
 
             # and send the content to the socket
             # Note that there will be no response from APRS and
             # that all exceptions are handled within the 'send' method
-            self.logger.debug("Sending APRS message: {}".format(buffer))
+            self.logger.debug(f"Sending APRS message: {buffer}")
 
             # send the content
             if not self.socket_send(buffer):
@@ -687,24 +649,23 @@ def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
         self.logger.debug("Closing socket.")
         self.socket_close()
         self.logger.info(
-            "Sent %d/%d APRS-IS notification(s)", index + 1, len(targets))
+            "Sent %d/%d APRS-IS notification(s)", index + 1, len(targets)
+        )
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
 
         if self.locale != NotifyAprs.template_args["locale"]["default"]:
             # Store our locale if not default
-            params['locale'] = self.locale
+            params["locale"] = self.locale
 
         if self.delay != NotifyAprs.template_args["delay"]["default"]:
             # Store our locale if not default
-            params['delay'] = "{:.2f}".format(self.delay)
+            params["delay"] = f"{self.delay:.2f}"
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
@@ -720,43 +681,40 @@ def url(self, privacy=False, *args, **kwargs):
         return "{schema}://{auth}{targets}?{params}".format(
             schema=self.secure_protocol,
             auth=auth,
-            targets="/".join(chain(
-                [self.pprint(x, privacy, safe="") for x in self.targets],
-                [self.pprint(x, privacy, safe="")
-                 for x in self.invalid_targets],
-            )),
+            targets="/".join(
+                chain(
+                    [self.pprint(x, privacy, safe="") for x in self.targets],
+                    [
+                        self.pprint(x, privacy, safe="")
+                        for x in self.invalid_targets
+                    ],
+                )
+            ),
             params=NotifyAprs.urlencode(params),
         )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.user, self.password, self.locale)
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     def __del__(self):
-        """
-        Ensure we close any lingering connections
-        """
+        """Ensure we close any lingering connections."""
         self.socket_close()
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -769,8 +727,8 @@ def parse_url(url):
         results["targets"].extend(NotifyAprs.split_path(results["fullpath"]))
 
         # Get Delay (if set)
-        if 'delay' in results['qsd'] and len(results['qsd']['delay']):
-            results['delay'] = NotifyAprs.unquote(results['qsd']['delay'])
+        if "delay" in results["qsd"] and len(results["qsd"]["delay"]):
+            results["delay"] = NotifyAprs.unquote(results["qsd"]["delay"])
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
diff --git a/libs/apprise/plugins/bark.py b/libs/apprise/plugins/bark.py
index 0122598d43..6dad9f3dbf 100644
--- a/libs/apprise/plugins/bark.py
+++ b/libs/apprise/plugins/bark.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,16 +28,15 @@
 #
 # API: https://github.com/Finb/bark-server/blob/master/docs/API_V2.md#python
 #
-import requests
 import json
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool
-from ..locale import gettext_lazy as _
+import requests
 
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list
+from .base import NotifyBase
 
 # Sounds generated off of: https://github.com/Finb/Bark/tree/master/Sounds
 BARK_SOUNDS = (
@@ -79,16 +77,15 @@
 
 # Supported Level Entries
 class NotifyBarkLevel:
-    """
-    Defines the Bark Level options
-    """
-    ACTIVE = 'active'
+    """Defines the Bark Level options."""
+
+    ACTIVE = "active"
 
-    TIME_SENSITIVE = 'timeSensitive'
+    TIME_SENSITIVE = "timeSensitive"
 
-    PASSIVE = 'passive'
+    PASSIVE = "passive"
 
-    CRITICAL = 'critical'
+    CRITICAL = "critical"
 
 
 BARK_LEVELS = (
@@ -100,24 +97,22 @@ class NotifyBarkLevel:
 
 
 class NotifyBark(NotifyBase):
-    """
-    A wrapper for Notify Bark Notifications
-    """
+    """A wrapper for Notify Bark Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Bark'
+    service_name = "Bark"
 
     # The services URL
-    service_url = 'https://github.com/Finb/Bark'
+    service_url = "https://github.com/Finb/Bark"
 
     # The default protocol
-    protocol = 'bark'
+    protocol = "bark"
 
     # The default secure protocol
-    secure_protocol = 'barks'
+    secure_protocol = "barks"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_bark'
+    setup_url = "https://appriseit.com/services/bark/"
 
     # Allows the user to specify the NotifyImageSize object; this is supported
     # through the webhook
@@ -125,111 +120,138 @@ class NotifyBark(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{targets}',
-        '{schema}://{host}:{port}/{targets}',
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
+        "{schema}://{host}/{targets}",
+        "{schema}://{host}:{port}/{targets}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
     )
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "target_device": {
+                "name": _("Target Device"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'sound': {
-            'name': _('Sound'),
-            'type': 'choice:string',
-            'values': BARK_SOUNDS,
-        },
-        'level': {
-            'name': _('Level'),
-            'type': 'choice:string',
-            'values': BARK_LEVELS,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "sound": {
+                "name": _("Sound"),
+                "type": "choice:string",
+                "values": BARK_SOUNDS,
+            },
+            "level": {
+                "name": _("Level"),
+                "type": "choice:string",
+                "values": BARK_LEVELS,
+            },
+            "volume": {
+                "name": _("Volume"),
+                "type": "int",
+                "min": 0,
+                "max": 10,
+            },
+            "click": {
+                "name": _("Click"),
+                "type": "string",
+            },
+            "badge": {
+                "name": _("Badge"),
+                "type": "int",
+                "min": 0,
+            },
+            "category": {
+                "name": _("Category"),
+                "type": "string",
+            },
+            "group": {
+                "name": _("Group"),
+                "type": "string",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "icon": {
+                "name": _("Icon URL"),
+                "type": "string",
+            },
+            "call": {
+                "name": _("Call"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'volume': {
-            'name': _('Volume'),
-            'type': 'int',
-            'min': 0,
-            'max': 10,
-        },
-        'click': {
-            'name': _('Click'),
-            'type': 'string',
-        },
-        'badge': {
-            'name': _('Badge'),
-            'type': 'int',
-            'min': 0,
-        },
-        'category': {
-            'name': _('Category'),
-            'type': 'string',
-        },
-        'group': {
-            'name': _('Group'),
-            'type': 'string',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-    })
+    )
 
-    def __init__(self, targets=None, include_image=True, sound=None,
-                 category=None, group=None, level=None, click=None,
-                 badge=None, volume=None, **kwargs):
-        """
-        Initialize Notify Bark Object
-        """
+    def __init__(
+        self,
+        targets=None,
+        include_image=True,
+        sound=None,
+        category=None,
+        group=None,
+        level=None,
+        click=None,
+        badge=None,
+        volume=None,
+        icon=None,
+        call=None,
+        **kwargs,
+    ):
+        """Initialize Notify Bark Object."""
         super().__init__(**kwargs)
 
         # Prepare our URL
-        self.notify_url = '%s://%s%s/push' % (
-            'https' if self.secure else 'http',
+        self.notify_url = "{}://{}{}/push".format(
+            "https" if self.secure else "http",
             self.host,
-            ':{}'.format(self.port)
-            if (self.port and isinstance(self.port, int)) else '',
+            (
+                f":{self.port}"
+                if (self.port and isinstance(self.port, int))
+                else ""
+            ),
         )
 
         # Assign our category
-        self.category = \
-            category if isinstance(category, str) else None
+        self.category = category if isinstance(category, str) else None
 
         # Assign our group
         self.group = group if isinstance(group, str) else None
@@ -259,14 +281,21 @@ def __init__(self, targets=None, include_image=True, sound=None,
         except ValueError:
             self.badge = None
             self.logger.warning(
-                'The specified Bark badge ({}) is not valid ', badge)
+                "The specified Bark badge ({}) is not valid ", badge
+            )
 
         # Sound (easy-lookup)
-        self.sound = None if not sound else next(
-            (f for f in BARK_SOUNDS if f.startswith(sound.lower())), None)
+        self.sound = (
+            None
+            if not sound
+            else next(
+                (f for f in BARK_SOUNDS if f.startswith(sound.lower())), None
+            )
+        )
         if sound and not self.sound:
             self.logger.warning(
-                'The specified Bark sound ({}) was not found ', sound)
+                "The specified Bark sound ({}) was not found ", sound
+            )
 
         # Volume
         self.volume = None
@@ -278,40 +307,51 @@ def __init__(self, targets=None, include_image=True, sound=None,
 
             except (TypeError, ValueError):
                 self.logger.warning(
-                    'The specified Bark volume ({}) is not valid. '
-                    'Must be between 0 and 10', volume)
+                    "The specified Bark volume ({}) is not valid. "
+                    "Must be between 0 and 10",
+                    volume,
+                )
+
+        # Call
+        self.call = parse_bool(call)
+
+        # Icon URL
+        self.icon = icon if isinstance(icon, str) else None
 
         # Level
-        self.level = None if not level else next(
-            (f for f in BARK_LEVELS if f[0] == level[0]), None)
+        self.level = (
+            None
+            if not level
+            else next((f for f in BARK_LEVELS if f[0] == level[0]), None)
+        )
         if level and not self.level:
             self.logger.warning(
-                'The specified Bark level ({}) is not valid ', level)
+                "The specified Bark level ({}) is not valid ", level
+            )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Bark Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Bark Notification."""
 
         # error tracking (used for function return)
         has_error = False
 
         if not self.targets:
             # We have nothing to notify; we're done
-            self.logger.warning('There are no Bark devices to notify')
+            self.logger.warning("There are no Bark devices to notify")
             return False
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json; charset=utf-8",
         }
 
         # Prepare our payload (sample below)
         # {
         #     "body": "Test Bark Server",
+        #     "markdown": "# Markdown Content",
         #     "device_key": "nysrshcqielvoxsa",
         #     "title": "bleem",
         #     "category": "category",
@@ -319,40 +359,54 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         #     "badge": 1,
         #     "icon": "https://day.app/assets/images/avatar.jpg",
         #     "group": "test",
+        #     "level": "active",
+        #     "volume": 5,
+        #     "call": 1,
         #     "url": "https://mritd.com"
         # }
         payload = {
-            'title': title if title else self.app_desc,
-            'body': body,
+            "title": title if title else self.app_desc,
         }
 
+        if self.notify_format == NotifyFormat.MARKDOWN:
+            payload["markdown"] = body
+        else:
+            payload["body"] = body
+
         # Acquire our image url if configured to do so
-        image_url = None if not self.include_image else \
-            self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
-        if image_url:
-            payload['icon'] = image_url
+        # Use custom icon if provided, otherwise use default image
+        if self.icon:
+            payload["icon"] = self.icon
+        elif image_url:
+            payload["icon"] = image_url
 
         if self.sound:
-            payload['sound'] = self.sound
+            payload["sound"] = self.sound
 
         if self.click:
-            payload['url'] = self.click
+            payload["url"] = self.click
 
         if self.badge:
-            payload['badge'] = self.badge
+            payload["badge"] = self.badge
 
         if self.level:
-            payload['level'] = self.level
+            payload["level"] = self.level
 
         if self.category:
-            payload['category'] = self.category
+            payload["category"] = self.category
 
         if self.group:
-            payload['group'] = self.group
+            payload["group"] = self.group
 
         if self.volume:
-            payload['volume'] = self.volume
+            payload["volume"] = self.volume
+
+        if self.call:
+            payload["call"] = 1
 
         auth = None
         if self.user:
@@ -365,11 +419,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Retrieve our device key
             target = targets.pop()
 
-            payload['device_key'] = target
-            self.logger.debug('Bark POST URL: %s (cert_verify=%r)' % (
-                self.notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('Bark Payload: %s' % str(payload))
+            payload["device_key"] = target
+            self.logger.debug(
+                "Bark POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Bark Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -384,34 +439,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBark.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyBark.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Bark notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Bark notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Bark notification to {}.'.format(target))
+                    self.logger.info(f"Sent Bark notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Bark '
-                    'notification to {}.'.format(target))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Bark "
+                    f"notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -421,90 +478,94 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
+            "image": "yes" if self.include_image else "no",
         }
 
         if self.sound:
-            params['sound'] = self.sound
+            params["sound"] = self.sound
 
         if self.click:
-            params['click'] = self.click
+            params["click"] = self.click
 
         if self.badge:
-            params['badge'] = str(self.badge)
+            params["badge"] = str(self.badge)
 
         if self.level:
-            params['level'] = self.level
+            params["level"] = self.level
 
         if self.volume:
-            params['volume'] = str(self.volume)
+            params["volume"] = str(self.volume)
 
         if self.category:
-            params['category'] = self.category
+            params["category"] = self.category
 
         if self.group:
-            params['group'] = self.group
+            params["group"] = self.group
+
+        if self.icon:
+            params["icon"] = self.icon
+
+        if self.call:
+            params["call"] = "yes"
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyBark.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyBark.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyBark.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyBark.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}/{targets}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{targets}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            targets='/'.join(
-                [NotifyBark.quote('{}'.format(x)) for x in self.targets]),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets="/".join([NotifyBark.quote(f"{x}") for x in self.targets]),
             params=NotifyBark.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url)
         if not results:
@@ -512,50 +573,68 @@ def parse_url(url):
             return results
 
         # Apply our targets
-        results['targets'] = NotifyBark.split_path(results['fullpath'])
+        results["targets"] = NotifyBark.split_path(results["fullpath"])
 
         # Category
-        if 'category' in results['qsd'] and results['qsd']['category']:
-            results['category'] = NotifyBark.unquote(
-                results['qsd']['category'].strip())
+        if "category" in results["qsd"] and results["qsd"]["category"]:
+            results["category"] = NotifyBark.unquote(
+                results["qsd"]["category"].strip()
+            )
 
         # Group
-        if 'group' in results['qsd'] and results['qsd']['group']:
-            results['group'] = NotifyBark.unquote(
-                results['qsd']['group'].strip())
+        if "group" in results["qsd"] and results["qsd"]["group"]:
+            results["group"] = NotifyBark.unquote(
+                results["qsd"]["group"].strip()
+            )
 
         # Badge
-        if 'badge' in results['qsd'] and results['qsd']['badge']:
-            results['badge'] = NotifyBark.unquote(
-                results['qsd']['badge'].strip())
+        if "badge" in results["qsd"] and results["qsd"]["badge"]:
+            results["badge"] = NotifyBark.unquote(
+                results["qsd"]["badge"].strip()
+            )
 
         # Volume
-        if 'volume' in results['qsd'] and results['qsd']['volume']:
-            results['volume'] = NotifyBark.unquote(
-                results['qsd']['volume'].strip())
+        if "volume" in results["qsd"] and results["qsd"]["volume"]:
+            results["volume"] = NotifyBark.unquote(
+                results["qsd"]["volume"].strip()
+            )
 
         # Level
-        if 'level' in results['qsd'] and results['qsd']['level']:
-            results['level'] = NotifyBark.unquote(
-                results['qsd']['level'].strip())
+        if "level" in results["qsd"] and results["qsd"]["level"]:
+            results["level"] = NotifyBark.unquote(
+                results["qsd"]["level"].strip()
+            )
 
         # Click (URL)
-        if 'click' in results['qsd'] and results['qsd']['click']:
-            results['click'] = NotifyBark.unquote(
-                results['qsd']['click'].strip())
+        if "click" in results["qsd"] and results["qsd"]["click"]:
+            results["click"] = NotifyBark.unquote(
+                results["qsd"]["click"].strip()
+            )
 
         # Sound
-        if 'sound' in results['qsd'] and results['qsd']['sound']:
-            results['sound'] = NotifyBark.unquote(
-                results['qsd']['sound'].strip())
+        if "sound" in results["qsd"] and results["qsd"]["sound"]:
+            results["sound"] = NotifyBark.unquote(
+                results["qsd"]["sound"].strip()
+            )
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyBark.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyBark.parse_list(results["qsd"]["to"])
 
         # use image= for consistency with the other plugins
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
+
+        # Icon URL
+        if "icon" in results["qsd"] and results["qsd"]["icon"]:
+            results["icon"] = NotifyBark.unquote(
+                results["qsd"]["icon"].strip()
+            )
+
+        # Call
+        results["call"] = parse_bool(
+            results["qsd"].get("call", False)
+        )
 
         return results
diff --git a/libs/apprise/plugins/base.py b/libs/apprise/plugins/base.py
index a50cdf0713..444728bd08 100644
--- a/libs/apprise/plugins/base.py
+++ b/libs/apprise/plugins/base.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,27 +26,41 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import asyncio
-import re
+from collections.abc import Generator
+from datetime import tzinfo
 from functools import partial
+import re
+from typing import Any, ClassVar, Optional, TypedDict, Union
+from zoneinfo import ZoneInfo
 
+from ..apprise_attachment import AppriseAttachment
+from ..common import (
+    NOTIFY_FORMATS,
+    OVERFLOW_MODES,
+    NotifyFormat,
+    NotifyImageSize,
+    NotifyType,
+    OverflowMode,
+    PersistentStoreMode,
+)
+from ..locale import Translatable, gettext_lazy as _
+from ..persistent_store import PersistentStore
 from ..url import URLBase
-from ..common import NotifyType
+from ..utils.format import smart_split
 from ..utils.parse import parse_bool
-from ..common import NOTIFY_TYPES
-from ..common import NotifyFormat
-from ..common import NOTIFY_FORMATS
-from ..common import OverflowMode
-from ..common import OVERFLOW_MODES
-from ..common import PersistentStoreMode
-from ..locale import gettext_lazy as _
-from ..persistent_store import PersistentStore
-from ..apprise_attachment import AppriseAttachment
+from ..utils.time import zoneinfo
+
+
+class RequirementsSpec(TypedDict, total=False):
+    """Defines our plugin requirements."""
+
+    packages_required: Optional[Union[str, list[str]]]
+    packages_recommended: Optional[Union[str, list[str]]]
+    details: Optional[Translatable]
 
 
 class NotifyBase(URLBase):
-    """
-    This is the base class for all notification services
-    """
+    """This is the base class for all notification services."""
 
     # An internal flag used to test the state of the plugin. If set to
     # False, then the plugin is not used.  Plugins can disable themselves
@@ -63,16 +76,16 @@ class NotifyBase(URLBase):
     #  native: Is a native plugin written/stored in `apprise/plugins/Notify*`
     #  custom: Is a custom plugin written/stored in a users plugin directory
     #          that they loaded at execution time.
-    category = 'native'
+    category = "native"
 
     # Some plugins may require additional packages above what is provided
     # already by Apprise.
     #
     # Use this section to relay this information to the users of the script to
     # help guide them with what they need to know if they plan on using your
-    # plugin.   The below configuration should otherwise accomodate all normal
+    # plugin.   The below configuration should otherwise accommodate all normal
     # situations and will not requrie any updating:
-    requirements = {
+    requirements: ClassVar[RequirementsSpec] = {
         # Use the description to provide a human interpretable description of
         # what is required to make the plugin work. This is only nessisary
         # if there are package dependencies.  Setting this to default will
@@ -83,8 +96,7 @@ class NotifyBase(URLBase):
         #  from apprise.AppriseLocale import gettext_lazy as _
         #
         # 'details': _('My detailed requirements')
-        'details': None,
-
+        "details": None,
         # Define any required packages needed for the plugin to run.  This is
         # an array of strings that simply look like lines residing in a
         # `requirements.txt` file...
@@ -93,17 +105,15 @@ class NotifyBase(URLBase):
         # 'packages_required': [
         #   'cryptography < 3.4`,
         # ]
-        'packages_required': [],
-
+        "packages_required": [],
         # Recommended packages identify packages that are not required to make
         # your plugin work, but would improve it's use or grant it access to
         # full functionality (that might otherwise be limited).
-
         # Similar to `packages_required`, you would identify each entry in
         # the array as you would in a `requirements.txt` file.
         #
         #   - Do not re-provide entries already in the `packages_required`
-        'packages_recommended': [],
+        "packages_recommended": [],
     }
 
     # The services URL
@@ -135,6 +145,10 @@ class NotifyBase(URLBase):
     # Persistent storage default settings
     persistent_storage = True
 
+    # Timezone Default; by setting it to None, the timezone detected
+    # on the server is used
+    timezone = None
+
     # Default Notify Format
     notify_format = NotifyFormat.TEXT
 
@@ -165,58 +179,71 @@ class NotifyBase(URLBase):
     # titles, by default apprise tries to give a plesant view and convert the
     # title so that it can be placed into the body. The default is to just
     # use a <b> tag.  The below causes the <b>title</b> to get generated:
-    default_html_tag_id = 'b'
+    default_html_tag_id = "b"
 
     # Here is where we define all of the arguments we accept on the url
     # such as: schema://whatever/?overflow=upstream&format=text
     # These act the same way as tokens except they are optional and/or
     # have default values set if mandatory. This rule must be followed
-    template_args = dict(URLBase.template_args, **{
-        'overflow': {
-            'name': _('Overflow Mode'),
-            'type': 'choice:string',
-            'values': OVERFLOW_MODES,
-            # Provide a default
-            'default': overflow_mode,
-            # look up default using the following parent class value at
-            # runtime. The variable name identified here (in this case
-            # overflow_mode) is checked and it's result is placed over-top of
-            # the 'default'. This is done because once a parent class inherits
-            # this one, the overflow_mode already set as a default 'could' be
-            # potentially over-ridden and changed to a different value.
-            '_lookup_default': 'overflow_mode',
+    template_args = dict(
+        URLBase.template_args,
+        **{
+            "overflow": {
+                "name": _("Overflow Mode"),
+                "type": "choice:string",
+                "values": OVERFLOW_MODES,
+                # Provide a default
+                "default": overflow_mode,
+                # look up default using the following parent class value at
+                # runtime. The variable name identified here (in this case
+                # overflow_mode) is checked and it's result is placed over-top
+                # of the 'default'. This is done because once a parent class
+                # inherits this one, the overflow_mode already set as a default
+                # 'could' be potentially over-ridden and changed to a different
+                # value.
+                "_lookup_default": "overflow_mode",
+            },
+            "format": {
+                "name": _("Notify Format"),
+                "type": "choice:string",
+                "values": NOTIFY_FORMATS,
+                # Provide a default
+                "default": notify_format,
+                # look up default using the following parent class value at
+                # runtime.
+                "_lookup_default": "notify_format",
+            },
+            "emojis": {
+                "name": _("Interpret Emojis"),
+                # SSL Certificate Authority Verification
+                "type": "bool",
+                # Provide a default
+                "default": interpret_emojis,
+                # look up default using the following parent class value at
+                # runtime.
+                "_lookup_default": "interpret_emojis",
+            },
+            "store": {
+                "name": _("Persistent Storage"),
+                # Use Persistent Storage
+                "type": "bool",
+                # Provide a default
+                "default": persistent_storage,
+                # look up default using the following parent class value at
+                # runtime.
+                "_lookup_default": "persistent_storage",
+            },
+            "tz": {
+                "name": _("Timezone"),
+                "type": "string",
+                # Provide a default
+                "default": timezone,
+                # look up default using the following parent class value at
+                # runtime.
+                "_lookup_default": "timezone",
+            },
         },
-        'format': {
-            'name': _('Notify Format'),
-            'type': 'choice:string',
-            'values': NOTIFY_FORMATS,
-            # Provide a default
-            'default': notify_format,
-            # look up default using the following parent class value at
-            # runtime.
-            '_lookup_default': 'notify_format',
-        },
-        'emojis': {
-            'name': _('Interpret Emojis'),
-            # SSL Certificate Authority Verification
-            'type': 'bool',
-            # Provide a default
-            'default': interpret_emojis,
-            # look up default using the following parent class value at
-            # runtime.
-            '_lookup_default': 'interpret_emojis',
-        },
-        'store': {
-            'name': _('Persistent Storage'),
-            # Use Persistent Storage
-            'type': 'bool',
-            # Provide a default
-            'default': persistent_storage,
-            # look up default using the following parent class value at
-            # runtime.
-            '_lookup_default': 'persistent_storage',
-        },
-    })
+    )
 
     #
     # Overflow Defaults / Configuration applicable to SPLIT mode only
@@ -266,12 +293,16 @@ class NotifyBase(URLBase):
     #  restrictions and that of body_maxlen
     overflow_amalgamate_title = False
 
-    def __init__(self, **kwargs):
-        """
-        Initialize some general configuration that will keep things consistent
-        when working with the notifiers that will inherit this class.
+    # Identifies the timezone to use;  if this is not over-ridden, then the
+    # timezone defined in the AppriseAsset() object is used instead.  The
+    # Below is expected to be in a ZoneInfo type already.  You can have this
+    # automatically initialized by specifying ?tz= on the Apprise URLs
+    __tzinfo = None
 
-        """
+    def __init__(self, **kwargs):
+        """Initialize some general configuration that will keep things
+        consistent when working with the notifiers that will inherit this
+        class."""
 
         super().__init__(**kwargs)
 
@@ -292,123 +323,138 @@ def __init__(self, **kwargs):
 
         # Take a default
         self.interpret_emojis = self.asset.interpret_emojis
-        if 'emojis' in kwargs:
+        if "emojis" in kwargs:
             # possibly over-ride default
-            self.interpret_emojis = True if self.interpret_emojis \
-                in (None, True) and \
-                parse_bool(
-                    kwargs.get('emojis', False),
-                    default=NotifyBase.template_args['emojis']['default']) \
-                else False
-
-        if 'format' in kwargs:
-            # Store the specified format if specified
-            notify_format = kwargs.get('format', '')
-            if notify_format.lower() not in NOTIFY_FORMATS:
-                msg = 'Invalid notification format {}'.format(notify_format)
-                self.logger.error(msg)
-                raise TypeError(msg)
-
-            # Provide override
-            self.notify_format = notify_format
-
-        if 'overflow' in kwargs:
-            # Store the specified format if specified
-            overflow = kwargs.get('overflow', '')
-            if overflow.lower() not in OVERFLOW_MODES:
-                msg = 'Invalid overflow method {}'.format(overflow)
-                self.logger.error(msg)
-                raise TypeError(msg)
-
-            # Provide override
-            self.overflow_mode = overflow
+            self.interpret_emojis = bool(
+                self.interpret_emojis in (None, True)
+                and parse_bool(
+                    kwargs.get("emojis", False),
+                    default=NotifyBase.template_args["emojis"]["default"],
+                )
+            )
+
+        if "format" in kwargs:
+            value = kwargs["format"]
+            try:
+                self.notify_format = (
+                    value if isinstance(value, NotifyFormat)
+                    else NotifyFormat(value.lower())
+                )
+
+            except (AttributeError, ValueError):
+                err = (
+                    f"An invalid notification format ({value}) was "
+                    "specified.")
+                self.logger.warning(err)
+                raise TypeError(err) from None
+
+        if "tz" in kwargs:
+            value = kwargs["tz"]
+            self.__tzinfo = zoneinfo(value)
+            if not self.__tzinfo:
+                err = (
+                    f"An invalid notification timezone ({value}) was "
+                    "specified.")
+                self.logger.warning(err)
+                raise TypeError(err) from None
+
+        if "overflow" in kwargs:
+            value = kwargs["overflow"]
+            try:
+                self.overflow_mode = (
+                    value if isinstance(value, OverflowMode)
+                    else OverflowMode(value.lower())
+                )
+
+            except (AttributeError, ValueError):
+                err = f"An invalid overflow method ({value}) was specified."
+                self.logger.warning(err)
+                raise TypeError(err) from None
 
         # Prepare our Persistent Storage switch
         self.persistent_storage = parse_bool(
-            kwargs.get('store', NotifyBase.persistent_storage))
+            kwargs.get("store", NotifyBase.persistent_storage)
+        )
         if not self.persistent_storage:
             # Enforce the disabling of cache (ortherwise defaults are use)
             self.url_identifier = False
             self.__cached_url_identifier = None
 
-    def image_url(self, notify_type, logo=False, extension=None,
-                  image_size=None):
-        """
-        Returns Image URL if possible
-        """
-
-        if not self.image_size:
-            return None
-
-        if notify_type not in NOTIFY_TYPES:
+    def image_url(
+        self,
+        notify_type: NotifyType,
+        image_size: Optional[NotifyImageSize] = None,
+        logo: bool = False,
+        extension: Optional[str] = None,
+    ) -> Optional[str]:
+        """Returns Image URL if possible."""
+
+        image_size = self.image_size if image_size is None else image_size
+        if not image_size:
             return None
 
         return self.asset.image_url(
             notify_type=notify_type,
-            image_size=self.image_size if image_size is None else image_size,
+            image_size=image_size,
             logo=logo,
             extension=extension,
         )
 
-    def image_path(self, notify_type, extension=None):
-        """
-        Returns the path of the image if it can
-        """
+    def image_path(
+        self,
+        notify_type: NotifyType,
+        extension: Optional[str] = None,
+    ) -> Optional[str]:
+        """Returns the path of the image if it can."""
         if not self.image_size:
             return None
 
-        if notify_type not in NOTIFY_TYPES:
-            return None
-
         return self.asset.image_path(
             notify_type=notify_type,
             image_size=self.image_size,
             extension=extension,
         )
 
-    def image_raw(self, notify_type, extension=None):
-        """
-        Returns the raw image if it can
-        """
+    def image_raw(
+        self,
+        notify_type: NotifyType,
+        extension: Optional[str] = None,
+    ) -> Optional[bytes]:
+        """Returns the raw image if it can."""
         if not self.image_size:
             return None
 
-        if notify_type not in NOTIFY_TYPES:
-            return None
-
         return self.asset.image_raw(
             notify_type=notify_type,
             image_size=self.image_size,
             extension=extension,
         )
 
-    def color(self, notify_type, color_type=None):
-        """
-        Returns the html color (hex code) associated with the notify_type
-        """
-        if notify_type not in NOTIFY_TYPES:
-            return None
+    def color(
+        self,
+        notify_type: NotifyType,
+        color_type: Optional[type] = None,
+    ) -> Union[str, int, tuple[int, int, int]]:
+        """Returns the html color (hex code) associated with the
+        notify_type."""
 
         return self.asset.color(
             notify_type=notify_type,
             color_type=color_type,
         )
 
-    def ascii(self, notify_type):
-        """
-        Returns the ascii characters associated with the notify_type
-        """
-        if notify_type not in NOTIFY_TYPES:
-            return None
+    def ascii(
+        self,
+        notify_type: NotifyType,
+    ) -> str:
+        """Returns the ascii characters associated with the notify_type."""
 
         return self.asset.ascii(
             notify_type=notify_type,
         )
 
-    def notify(self, *args, **kwargs):
-        """
-        Performs notification
-        """
+    def notify(self, *args: Any, **kwargs: Any) -> bool:
+        """Performs notification."""
         try:
             # Build a list of dictionaries that can be used to call send().
             send_calls = list(self._build_send_calls(*args, **kwargs))
@@ -423,10 +469,8 @@ def notify(self, *args, **kwargs):
             the_calls = [self.send(**kwargs2) for kwargs2 in send_calls]
             return all(the_calls)
 
-    async def async_notify(self, *args, **kwargs):
-        """
-        Performs notification for asynchronous callers
-        """
+    async def async_notify(self, *args: Any, **kwargs: Any) -> bool:
+        """Performs notification for asynchronous callers."""
         try:
             # Build a list of dictionaries that can be used to call send().
             send_calls = list(self._build_send_calls(*args, **kwargs))
@@ -450,13 +494,18 @@ async def do_send(**kwargs2):
             the_cors = (do_send(**kwargs2) for kwargs2 in send_calls)
             return all(await asyncio.gather(*the_cors))
 
-    def _build_send_calls(self, body=None, title=None,
-                          notify_type=NotifyType.INFO, overflow=None,
-                          attach=None, body_format=None, **kwargs):
-        """
-        Get a list of dictionaries that can be used to call send() or
-        (in the future) async_send().
-        """
+    def _build_send_calls(
+        self,
+        body: Optional[str] = None,
+        title: Optional[str] = None,
+        notify_type: NotifyType = NotifyType.INFO,
+        overflow: Optional[Union[str, OverflowMode]] = None,
+        attach: Optional[Union[list[str], AppriseAttachment]] = None,
+        body_format: Optional[NotifyFormat] = None,
+        **kwargs: Any,
+    ) -> Generator[dict[str, Any], None, None]:
+        """Get a list of dictionaries that can be used to call send() or (in
+        the future) async_send()."""
 
         if not self.enabled:
             # Deny notifications issued to services that are disabled
@@ -474,7 +523,7 @@ def _build_send_calls(self, body=None, title=None,
                 raise
 
             # Handle situations where the body is None
-            body = '' if not body else body
+            body = body if body else ""
 
         elif not (body or attach):
             # If there is not an attachment at the very least, a body must be
@@ -490,13 +539,15 @@ def _build_send_calls(self, body=None, title=None,
             # Knowing this, if the plugin itself doesn't support sending
             # attachments, there is nothing further to do here, just move
             # along.
-            msg = f"{self.service_name} does not support attachments; " \
+            msg = (
+                f"{self.service_name} does not support attachments; "
                 " service skipped"
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Handle situations where the title is None
-        title = '' if not title else title
+        title = title if title else ""
 
         # Truncate flag set with attachments ensures that only 1
         # attachment passes through. In the event there could be many
@@ -506,26 +557,35 @@ def _build_send_calls(self, body=None, title=None,
         overflow = self.overflow_mode if overflow is None else overflow
         if attach and len(attach) > 1 and overflow == OverflowMode.TRUNCATE:
             # Save first attachment
-            _attach = AppriseAttachment(attach[0], asset=self.asset)
+            attach_ = AppriseAttachment(attach[0], asset=self.asset)
         else:
             # reference same attachment
-            _attach = attach
+            attach_ = attach
 
         # Apply our overflow (if defined)
         for chunk in self._apply_overflow(
-                body=body, title=title, overflow=overflow,
-                body_format=body_format):
+            body=body, title=title, overflow=overflow, body_format=body_format
+        ):
 
             # Send notification
-            yield dict(
-                body=chunk['body'], title=chunk['title'],
-                notify_type=notify_type, attach=_attach,
-                body_format=body_format
-            )
-
-    def _apply_overflow(self, body, title=None, overflow=None,
-                        body_format=None):
+            yield {
+                "body": chunk["body"],
+                "title": chunk["title"],
+                "notify_type": notify_type,
+                "attach": attach_,
+                "body_format": body_format,
+            }
+
+    def _apply_overflow(
+        self,
+        body: Optional[str],
+        title: Optional[str] = None,
+        overflow: Optional[Union[str, OverflowMode]] = None,
+        body_format: Optional[NotifyFormat] = None,
+    ) -> list[dict[str, str]]:
         """
+        Apply overflow behaviour (UPSTREAM, TRUNCATE, SPLIT) to title/body.
+
         Takes the message body and title as input.  This function then
         applies any defined overflow restrictions associated with the
         notification service and may alter the message if/as required.
@@ -541,224 +601,288 @@ def _apply_overflow(self, body, title=None, overflow=None,
                     title: 'the title goes here',
                     body: 'the continued message body goes here',
                 },
-
             ]
         """
+        response: list[dict[str, str]] = []
 
-        response = list()
-
-        # tidy
-        title = '' if not title else title.strip()
-        body = '' if not body else body.rstrip()
+        # Tidy
+        title = "" if not title else title.strip()
+        body = "" if not body else body.rstrip()
 
+        # Default overflow mode
         if overflow is None:
-            # default
             overflow = self.overflow_mode
 
+        # Default effective body format
+        if body_format is None:
+            body_format = self.notify_format
+
+        # If the service does not support a title, amalgamate into body
         if self.title_maxlen <= 0 and len(title) > 0:
             if self.notify_format == NotifyFormat.HTML:
-                # Content is appended to body as html
-                body = '<{open_tag}>{title}</{close_tag}>' \
-                    '<br />\r\n{body}'.format(
-                        open_tag=self.default_html_tag_id,
-                        title=title,
-                        close_tag=self.default_html_tag_id,
-                        body=body)
-
-            elif self.notify_format == NotifyFormat.MARKDOWN and \
-                    body_format == NotifyFormat.TEXT:
+                body = (
+                    f"<{self.default_html_tag_id}>{title}"
+                    f"</{self.default_html_tag_id}>"
+                    f"<br />\r\n{body}"
+                )
+
+            elif (
+                self.notify_format == NotifyFormat.MARKDOWN
+                and body_format == NotifyFormat.TEXT
+            ):
                 # Content is appended to body as markdown
-                title = title.lstrip('\r\n \t\v\f#-')
+                title = title.lstrip("\r\n \t\v\f#-")
                 if title:
-                    # Content is appended to body as text
-                    body = '# {}\r\n{}'.format(title, body)
+                    body = f"# {title}\r\n{body}"
 
             else:
-                # Content is appended to body as text
-                body = '{}\r\n{}'.format(title, body)
+                body = f"{title}\r\n{body}"
 
-            title = ''
+            title = ""
 
-        # Enforce the line count first always
+        # Enforce line count
         if self.body_max_line_count > 0:
-            # Limit results to just the first 2 line otherwise
-            # there is just to much content to display
-            body = re.split(r'\r*\n', body)
-            body = '\r\n'.join(body[0:self.body_max_line_count])
+            lines = re.split(r"\r*\n", body)
+            body = "\r\n".join(lines[0 : self.body_max_line_count])
 
+        # UPSTREAM mode: do not touch content
         if overflow == OverflowMode.UPSTREAM:
-            # Nothing more to do
-            response.append({'body': body, 'title': title})
+            response.append({"body": body, "title": title})
             return response
 
-        # a value of '2' allows for the \r\n that is applied when
-        # amalgamating the title
-        overflow_buffer = max(2, self.overflow_buffer) \
-            if (self.title_maxlen == 0 and len(title)) \
+        # a value of '2' allows for the \r\n that is applied when amalgamating
+        overflow_buffer = (
+            max(2, self.overflow_buffer)
+            if (self.title_maxlen == 0 and len(title))
             else self.overflow_buffer
+        )
 
         #
-        # If we reach here in our code, then we're using TRUNCATE, or SPLIT
-        # actions which require some math to handle the data
+        # TRUNCATE and SPLIT require sizing logic
         #
 
-        # Handle situations where our body and title are amalamated into one
-        # calculation
-        title_maxlen = self.title_maxlen \
-            if not self.overflow_amalgamate_title \
-            else min(len(title) + self.overflow_max_display_count_width,
-                     self.title_maxlen, self.body_maxlen)
+        # Handle situations where body and title are amalgamated
+        title_maxlen = (
+            self.title_maxlen
+            if not self.overflow_amalgamate_title
+            else min(
+                len(title) + self.overflow_max_display_count_width,
+                self.title_maxlen,
+                self.body_maxlen,
+            )
+        )
 
         if len(title) > title_maxlen:
-            # Truncate our Title
+            # Truncate our title
             title = title[:title_maxlen].rstrip()
 
-        if self.overflow_amalgamate_title and (
-                self.body_maxlen - overflow_buffer) >= title_maxlen:
-            body_maxlen = (self.body_maxlen if not title else (
-                self.body_maxlen - title_maxlen)) - overflow_buffer
-        else:
+        # Compute body_maxlen as per legacy logic
+        if (
+            self.overflow_amalgamate_title
+            and (self.body_maxlen - overflow_buffer) >= title_maxlen
+        ):
             # status quo
-            body_maxlen = self.body_maxlen \
-                if not self.overflow_amalgamate_title else \
-                (self.body_maxlen - overflow_buffer)
+            body_maxlen = (
+                self.body_maxlen
+                if not title
+                else (self.body_maxlen - title_maxlen)
+            ) - overflow_buffer
+        else:
+            # If the body fits, we're done
+            body_maxlen = (
+                self.body_maxlen
+                if not self.overflow_amalgamate_title
+                else (self.body_maxlen - overflow_buffer)
+            )
 
+        # If the body fits, we are done
         if body_maxlen > 0 and len(body) <= body_maxlen:
-            response.append({'body': body, 'title': title})
+            response.append({"body": body, "title": title})
             return response
 
+        # TRUNCATE mode: hard truncation (no smart-splitting)
         if overflow == OverflowMode.TRUNCATE:
-            # Truncate our body and return
             response.append({
-                'body': body[:body_maxlen].lstrip('\r\n\x0b\x0c').rstrip(),
-                'title': title,
+                "body": body[:body_maxlen].lstrip("\r\n\x0b\x0c").rstrip(),
+                "title": title,
             })
-            # For truncate mode, we're done now
             return response
 
+        #
+        # SPLIT mode
+        #
+
+        # Detect if we only display our title once or not (legacy logic)
         if self.overflow_display_title_once is None:
             # Detect if we only display our title once or not:
-            overflow_display_title_once = \
-                True if self.overflow_amalgamate_title and \
-                body_maxlen < self.overflow_display_count_threshold \
-                else False
+            overflow_display_title_once = bool(
+                self.overflow_amalgamate_title
+                and body_maxlen < self.overflow_display_count_threshold
+            )
         else:
-            # Take on defined value
-
             overflow_display_title_once = self.overflow_display_title_once
 
-        # If we reach here, then we are in SPLIT mode.
-        # For here, we want to split the message as many times as we have to
-        # in order to fit it within the designated limits.
+        # SPLIT mode with repeated title (with/without counter)
         if not overflow_display_title_once and not (
-                # edge case that can occur when overflow_display_title_once is
-                # forced off, but no body exists
-                self.overflow_amalgamate_title and body_maxlen <= 0):
-
-            show_counter = title and len(body) > body_maxlen and \
-                ((self.overflow_amalgamate_title and
-                  body_maxlen >= self.overflow_display_count_threshold) or
-                 (not self.overflow_amalgamate_title and
-                  title_maxlen > self.overflow_display_count_threshold)) and (
-                title_maxlen > (self.overflow_max_display_count_width +
-                                overflow_buffer) and
-                self.title_maxlen >= self.overflow_display_count_threshold)
-
-            count = 0
-            template = ''
-            if show_counter:
-                # introduce padding
-                body_maxlen -= overflow_buffer
+            # edge case: amalgamated title but no body space
+            self.overflow_amalgamate_title
+            and body_maxlen <= 0
+        ):
+            # Decide whether to show a counter (legacy condition)
+            show_counter = (
+                title
+                and len(body) > body_maxlen
+                and (
+                    (
+                        self.overflow_amalgamate_title
+                        and body_maxlen >=
+                        self.overflow_display_count_threshold
+                    )
+                    or (
+                        not self.overflow_amalgamate_title
+                        and title_maxlen >
+                        self.overflow_display_count_threshold
+                    )
+                )
+                and (
+                    title_maxlen >
+                    (self.overflow_max_display_count_width + overflow_buffer)
+                    and self.title_maxlen >=
+                    self.overflow_display_count_threshold
+                )
+            )
 
-                count = int(len(body) / body_maxlen) \
-                    + (1 if len(body) % body_maxlen else 0)
+            effective_body_maxlen = body_maxlen
+            if show_counter:
+                # introduce padding for the counter
+                effective_body_maxlen -= overflow_buffer
+
+            # Use smart splitting instead of naive slicing
+            chunks = smart_split(
+                body,
+                effective_body_maxlen,
+                body_format,
+            )
+            count = len(chunks)
 
-                # Detect padding and prepare template
+            template = ""
+            if show_counter:
                 digits = len(str(count))
-                template = ' [{:0%d}/{:0%d}]' % (digits, digits)
-
-                # Update our counter
                 overflow_display_count_width = 4 + (digits * 2)
-                if overflow_display_count_width <= \
-                        self.overflow_max_display_count_width:
-                    if len(title) > \
-                            title_maxlen - overflow_display_count_width:
-                        # Truncate our title further
-                        title = title[:title_maxlen -
-                                      overflow_display_count_width]
-
-                else:  # Way to many messages to display
-                    show_counter = False
 
-            response = [{
-                'body': body[i: i + body_maxlen]
-                .lstrip('\r\n\x0b\x0c').rstrip(),
-                'title': title + (
-                    '' if not show_counter else
-                    template.format(idx, count))} for idx, i in
-                enumerate(range(0, len(body), body_maxlen), start=1)]
+                if (
+                    overflow_display_count_width
+                    <= self.overflow_max_display_count_width
+                ):
+                    # Truncate title further if needed to make room for counter
+                    if (
+                        len(title)
+                        > title_maxlen - overflow_display_count_width
+                    ):
+                        title = title[
+                            : title_maxlen - overflow_display_count_width
+                        ]
+                    template = f" [{{:0{digits}d}}/{{:0{digits}d}}]"
+                else:
+                    # Too many messages; fall back to repeated title without
+                    # counter displayed
+                    show_counter = False
 
-        else:   # Display title once and move on
             response = []
-            try:
-                i = range(0, len(body), body_maxlen)[0]
-
+            for idx, chunk_body in enumerate(chunks, start=1):
+                suffix = template.format(idx, count) if show_counter else ""
                 response.append({
-                    'body': body[i: i + body_maxlen]
-                    .lstrip('\r\n\x0b\x0c').rstrip(),
-                    'title': title,
+                    "body": chunk_body.lstrip("\r\n\x0b\x0c").rstrip(),
+                    "title": f"{title}{suffix}",
                 })
 
-            except (ValueError, IndexError):
-                # IndexError:
-                #  - This happens if there simply was no body to display
-
-                # ValueError:
-                #  - This happens when body_maxlen < 0 (due to title being
-                #    so large)
+        else:
+            #
+            # SPLIT mode, display title once and move on
+            # (this covers both overflow_display_title_once=True
+            #  and the edge case body_maxlen <= 0 with amalgamated title)
+            #
+            response = []
+            consumed = 0
+            remainder = body
+
+            if body_maxlen > 0 and body:
+                # First chunk uses body_maxlen (which already accounts for
+                # the title)
+                first_chunks = smart_split(
+                    body,
+                    body_maxlen,
+                    body_format,
+                )
+                first_body = first_chunks[0] if first_chunks else ""
+                consumed = len(first_body)
+                remainder = body[consumed:]
 
-                # No worries; send title along
                 response.append({
-                    'body': '',
-                    'title': title,
+                    "body": first_body.lstrip("\r\n\x0b\x0c").rstrip(),
+                    "title": title,
                 })
 
-                # Ensure our start is set properly
-                body_maxlen = 0
-
-            # Now re-calculate based on the increased length
-            for i in range(body_maxlen, len(body), self.body_maxlen):
+            else:
+                # body_maxlen <= 0 or no body; send title only, still honouring
+                # body
                 response.append({
-                    'body': body[i: i + self.body_maxlen]
-                    .lstrip('\r\n\x0b\x0c').rstrip(),
-                    'title': '',
+                    "body": "",
+                    "title": title,
                 })
+                # remainder stays as full body; will be split below
+
+            # Remaining chunks: no title, use the full body_maxlen of the
+            # service
+            if remainder:
+                more_chunks = smart_split(
+                    remainder,
+                    self.body_maxlen,
+                    body_format,
+                )
+                for chunk_body in more_chunks:
+                    response.append({
+                        "body": chunk_body.lstrip("\r\n\x0b\x0c").rstrip(),
+                        "title": "",
+                    })
 
         return response
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Should preform the actual notification itself.
-
-        """
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        **kwargs: Any,
+    ) -> bool:
+        """Should preform the actual notification itself."""
         raise NotImplementedError(
-            "send() is not implimented by the child class.")
+            "send() is not implimented by the child class."
+        )
 
-    def url_parameters(self, *args, **kwargs):
-        """
-        Provides a default set of parameters to work with. This can greatly
-        simplify URL construction in the acommpanied url() function in all
-        defined plugin services.
+    def url_parameters(
+        self,
+        *args: Any,
+        **kwargs: Any,
+    ) -> dict[str, Any]:
+        """Provides a default set of parameters to work with.
+
+        This can greatly simplify URL construction in the acommpanied url()
+        function in all defined plugin services.
         """
 
         params = {
-            'format': self.notify_format,
-            'overflow': self.overflow_mode,
+            "format": self.notify_format.value,
+            "overflow": self.overflow_mode.value,
         }
 
+        # Timezone Information (if ZoneInfo)
+        if self.__tzinfo and isinstance(self.__tzinfo, ZoneInfo):
+            params["tz"] = self.__tzinfo.key
+
         # Persistent Storage Setting
         if self.persistent_storage != NotifyBase.persistent_storage:
-            params['store'] = 'yes' if self.persistent_storage else 'no'
+            params["store"] = "yes" if self.persistent_storage else "no"
 
         params.update(super().url_parameters(*args, **kwargs))
 
@@ -766,7 +890,11 @@ def url_parameters(self, *args, **kwargs):
         return params
 
     @staticmethod
-    def parse_url(url, verify_host=True, plus_to_space=False):
+    def parse_url(
+        url: str,
+        verify_host: bool = True,
+        plus_to_space: bool = False,
+    ) -> Optional[dict[str, Any]]:
         """Parses the URL and returns it broken apart into a dictionary.
 
         This is very specific and customized for Apprise.
@@ -785,80 +913,92 @@ def parse_url(url, verify_host=True, plus_to_space=False):
             successful, otherwise None is returned.
         """
         results = URLBase.parse_url(
-            url, verify_host=verify_host, plus_to_space=plus_to_space)
+            url, verify_host=verify_host, plus_to_space=plus_to_space
+        )
 
         if not results:
             # We're done; we failed to parse our url
             return results
 
         # Allow overriding the default format
-        if 'format' in results['qsd']:
-            results['format'] = results['qsd'].get('format')
-            if results['format'] not in NOTIFY_FORMATS:
+        if "format" in results["qsd"]:
+            results["format"] = results["qsd"].get("format", "").lower()
+            if results["format"] not in NOTIFY_FORMATS:
                 URLBase.logger.warning(
-                    'Unsupported format specified {}'.format(
-                        results['format']))
-                del results['format']
+                    "Unsupported format specified "
+                    f"{results['qsd']['format']!r}"
+                )
+                del results["format"]
 
         # Allow overriding the default overflow
-        if 'overflow' in results['qsd']:
-            results['overflow'] = results['qsd'].get('overflow')
-            if results['overflow'] not in OVERFLOW_MODES:
+        if "overflow" in results["qsd"]:
+            results["overflow"] = results["qsd"].get("overflow", "").lower()
+            if results["overflow"] not in OVERFLOW_MODES:
                 URLBase.logger.warning(
-                    'Unsupported overflow specified {}'.format(
-                        results['overflow']))
-                del results['overflow']
+                    "Unsupported overflow mode specified "
+                    f"{results['qsd']['overflow']!r}"
+                )
+                del results["overflow"]
 
         # Allow emoji's override
-        if 'emojis' in results['qsd']:
-            results['emojis'] = parse_bool(results['qsd'].get('emojis'))
+        if "emojis" in results["qsd"]:
+            results["emojis"] = parse_bool(results["qsd"].get("emojis"))
             # Store our persistent storage boolean
 
-        if 'store' in results['qsd']:
-            results['store'] = results['qsd']['store']
+        # Allow overriding the default timezone
+        if "tz" in results["qsd"]:
+            results["tz"] = results["qsd"].get("tz", "")
+
+        if "store" in results["qsd"]:
+            results["store"] = results["qsd"]["store"]
 
         return results
 
     @staticmethod
-    def parse_native_url(url):
-        """
-        This is a base class that can be optionally over-ridden by child
-        classes who can build their Apprise URL based on the one provided
-        by the notification service they choose to use.
-
-        The intent of this is to make Apprise a little more userfriendly
-        to people who aren't familiar with constructing URLs and wish to
-        use the ones that were just provied by their notification serivice
-        that they're using.
-
-        This function will return None if the passed in URL can't be matched
-        as belonging to the notification service. Otherwise this function
-        should return the same set of results that parse_url() does.
+    def parse_native_url(url: str) -> Optional[dict[str, Any]]:
+        """This is a base class that can be optionally over-ridden by child
+        classes who can build their Apprise URL based on the one provided by
+        the notification service they choose to use.
+
+        The intent of this is to make Apprise a little more userfriendly to
+        people who aren't familiar with constructing URLs and wish to use the
+        ones that were just provied by their notification serivice that they're
+        using.
+
+        This function will return None if the passed in URL can't be matched as
+        belonging to the notification service. Otherwise this function should
+        return the same set of results that parse_url() does.
         """
         return None
 
     @property
     def store(self):
-        """
-        Returns a pointer to our persistent store for use.
-
-          The best use cases are:
-           self.store.get('key')
-           self.store.set('key', 'value')
-           self.store.delete('key1', 'key2', ...)
+        """Returns a pointer to our persistent store for use.
 
-          You can also access the keys this way:
-           self.store['key']
+        The best use cases are:
+         self.store.get('key')
+         self.store.set('key', 'value')
+         self.store.delete('key1', 'key2', ...)
 
-          And clear them:
-           del self.store['key']
+        You can also access the keys this way:
+         self.store['key']
 
+        And clear them:
+         del self.store['key']
         """
         if self.__store is None:
             # Initialize our persistent store for use
             self.__store = PersistentStore(
                 namespace=self.url_id(),
                 path=self.asset.storage_path,
-                mode=self.asset.storage_mode)
+                mode=self.asset.storage_mode,
+            )
 
         return self.__store
+
+    @property
+    def tzinfo(self) -> tzinfo:
+        """Returns our tzinfo file associated with this plugin if set
+        otherwise the default timezone is returned.
+        """
+        return self.__tzinfo if self.__tzinfo else self.asset.tzinfo
diff --git a/libs/apprise/plugins/base.pyi b/libs/apprise/plugins/base.pyi
deleted file mode 100644
index 9cf3e404c8..0000000000
--- a/libs/apprise/plugins/base.pyi
+++ /dev/null
@@ -1 +0,0 @@
-class NotifyBase: ...
\ No newline at end of file
diff --git a/libs/apprise/plugins/bluesky.py b/libs/apprise/plugins/bluesky.py
new file mode 100644
index 0000000000..d52ac9e5e4
--- /dev/null
+++ b/libs/apprise/plugins/bluesky.py
@@ -0,0 +1,688 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# 1. Create a BlueSky account
+# 2. Access Settings -> Privacy and Security
+# 3. Generate an App Password.  Optionally grant yourself access to Direct
+#    Messages if you want to be able to send them
+# 4. Assemble your Apprise URL like:
+#       bluesky://handle@you-token-here
+#
+from datetime import datetime, timedelta, timezone
+import json
+import re
+
+import requests
+
+from ..attachment.base import AttachBase
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from .base import NotifyBase
+
+# For parsing handles
+HANDLE_HOST_PARSE_RE = re.compile(r"(?P<handle>[^.]+)\.+(?P<host>.+)$")
+
+IS_USER = re.compile(r"^\s*@?(?P<user>[A-Z0-9_]+)(\.+(?P<host>.+))?$", re.I)
+
+
+class NotifyBlueSky(NotifyBase):
+    """A wrapper for BlueSky Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "BlueSky"
+
+    # The services URL
+    service_url = "https://bluesky.us/"
+
+    # Protocol
+    secure_protocol = ("bsky", "bluesky")
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/bluesky/"
+
+    # Support attachments
+    attachment_support = True
+
+    # XRPC Suffix URLs; Structured as:
+    #  https://host/{suffix}
+
+    # Taken right from google.auth.helpers:
+    clock_skew = timedelta(seconds=10)
+
+    # 1 hour in seconds (the lifetime of our token)
+    access_token_lifetime_sec = timedelta(seconds=3600)
+
+    # Detect your Decentralized Identitifer (DID), then you can get your Auth
+    # Token.
+    xrpc_suffix_did = "/xrpc/com.atproto.identity.resolveHandle"
+    xrpc_suffix_session = "/xrpc/com.atproto.server.createSession"
+    xrpc_suffix_record = "/xrpc/com.atproto.repo.createRecord"
+    xrpc_suffix_blob = "/xrpc/com.atproto.repo.uploadBlob"
+    plc_directory = "https://plc.directory/{did}"
+
+    # BlueSky is kind enough to return how many more requests we're allowed to
+    # continue to make within it's header response as:
+    # RateLimit-Reset: The epoc time (in seconds) we can expect our
+    #                   rate-limit to be reset.
+    # RateLimit-Remaining: an integer identifying how many requests we're
+    #                      still allow to make.
+    request_rate_per_sec = 0
+
+    # For Tracking Purposes
+    ratelimit_reset = datetime.now(timezone.utc).replace(tzinfo=None)
+
+    # Remaining messages
+    ratelimit_remaining = 1
+
+    # The default BlueSky host to use if one isn't specified
+    bluesky_default_host = "bsky.social"
+
+    # Our message body size
+    body_maxlen = 280
+
+    # BlueSky does not support a title
+    title_maxlen = 0
+
+    # Define object templates
+    templates = ("{schema}://{user}@{password}",)
+
+    # Define our template tokens
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+        },
+    )
+
+    def __init__(self, **kwargs):
+        """Initialize BlueSky Object."""
+        super().__init__(**kwargs)
+
+        # Our access token
+        self.__access_token = self.store.get("access_token")
+        self.__refresh_token = None
+        self.__access_token_expiry = datetime.now(timezone.utc)
+        self.__endpoint = self.store.get("endpoint")
+
+        if not self.user:
+            msg = "A BlueSky UserID/Handle must be specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Set our default host
+        self.host = self.bluesky_default_host
+        self.__endpoint = (
+            f"https://{self.host}" if not self.host else self.__endpoint
+        )
+
+        # Identify our Handle (if define)
+        results = HANDLE_HOST_PARSE_RE.match(self.user)
+        if results:
+            self.user = results.group("handle").strip()
+            self.host = results.group("host").strip()
+
+        return
+
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform BlueSky Notification."""
+
+        if not self.__access_token and not self.login():
+            # We failed to authenticate - we're done
+            return False
+
+        # Track our returning blob IDs as they're stored on the BlueSky server
+        blobs = []
+
+        if attach and self.attachment_support:
+            url = f"{self.__endpoint}{self.xrpc_suffix_blob}"
+            # We need to upload our payload first so that we can source it
+            # in remaining messages
+            for no, attachment in enumerate(attach, start=1):
+
+                # Perform some simple error checking
+                if not attachment:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
+                    return False
+
+                if not re.match(r"^image/.*", attachment.mimetype, re.I):
+                    # Only support images at this time
+                    self.logger.warning(
+                        "Ignoring unsupported BlueSky attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
+                    continue
+
+                self.logger.debug(
+                    "Preparing BlueSky attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
+
+                # Upload our image and get our blob associated with it
+                postokay, response = self._fetch(
+                    url,
+                    payload=attachment,
+                )
+
+                if not postokay:
+                    # We can't post our attachment
+                    return False
+
+                # Prepare our filename
+                filename = (
+                    attachment.name if attachment.name else f"file{no:03}.dat"
+                )
+
+                if not (isinstance(response, dict) and response.get("blob")):
+                    self.logger.debug(
+                        "Could not attach the file to BlueSky: %s (mime=%s)",
+                        filename,
+                        attachment.mimetype,
+                    )
+                    continue
+
+                blobs.append((response.get("blob"), filename))
+
+        # Prepare our URL
+        did, endpoint = self.get_identifier()
+        url = f"{endpoint}{self.xrpc_suffix_record}"
+
+        # prepare our batch of payloads to create
+        payloads = []
+
+        payload = {
+            "collection": "app.bsky.feed.post",
+            "repo": did,
+            "record": {
+                "text": body,
+                # 'YYYY-mm-ddTHH:MM:SSZ'
+                "createdAt": datetime.now(tz=timezone.utc).strftime("%FT%XZ"),
+                "$type": "app.bsky.feed.post",
+            },
+        }
+
+        if blobs:
+            for no, blob in enumerate(blobs, start=1):
+                payload_ = payload.copy()
+                if no > 1:
+                    #
+                    # multiple instances
+                    #
+                    # 1. update createdAt time
+                    # 2. Change text to identify image no
+                    payload_["record"]["createdAt"] = datetime.now(
+                        tz=timezone.utc
+                    ).strftime("%FT%XZ")
+                    payload_["record"]["text"] = f"{no:02d}/{len(blobs):02d}"
+
+                payload_["record"]["embed"] = {
+                    "images": [{
+                        "image": blob[0],
+                        "alt": blob[1],
+                    }],
+                    "$type": "app.bsky.embed.images",
+                }
+                payloads.append(payload_)
+        else:
+            payloads.append(payload)
+
+        for payload in payloads:
+            # Send Login Information
+            postokay, response = self._fetch(
+                url,
+                payload=json.dumps(payload),
+            )
+            if not postokay:
+                # We failed
+                # Bad responses look like:
+                # {
+                #   'error': 'InvalidRequest',
+                #   'message': 'reason'
+                # }
+                return False
+        return True
+
+    def get_identifier(self, user=None, login=False):
+        """Performs a Decentralized User Lookup and returns the identifier."""
+
+        if user is None:
+            user = self.user
+
+        user = f"{user}.{self.host}" if "." not in user else f"{user}"
+        did_key = f"did.{user}"
+        endpoint_key = f"endpoint.{user}"
+
+        did = self.store.get(did_key)
+        endpoint = self.store.get(endpoint_key)
+        if did and endpoint:
+            # Early return
+            return did, endpoint
+
+        # Step 1: Acquire DID from bsky.app
+        url = f"https://public.api.bsky.app{self.xrpc_suffix_did}"
+        params = {"handle": user}
+
+        # Send Login Information
+        postokay, response = self._fetch(
+            url,
+            params=params,
+            method="GET",
+            # We set this boolean so internal recursion doesn't take place.
+            login=login,
+        )
+
+        if not postokay or not response or "did" not in response:
+            # We failed
+            return (False, False)
+
+        # Store our DID
+        did = response.get("did")
+
+        # Step 2: Use DID to find the PDS
+        if did.startswith("did:plc:"):
+            pds_url = self.plc_directory.format(did=did)
+
+            # PDS Query
+            postokay, service_response = self._fetch(
+                pds_url,
+                method="GET",
+                # We set this boolean so internal recursion doesn't take place.
+                login=login,
+            )
+            if (
+                not postokay
+                or not service_response
+                or "service" not in service_response
+            ):
+                # We failed
+                return (False, False)
+
+            endpoint = next(
+                (
+                    s["serviceEndpoint"]
+                    for s in service_response.get("service", [])
+                    if s["type"] == "AtprotoPersonalDataServer"
+                ),
+                None,
+            )
+
+        elif did.startswith("did:web:"):
+            # Convert to domain
+            domain = did[8:]
+            web_did_url = f"https://{domain}/.well-known/did.json"
+            postokay, service_response = self._fetch(
+                web_did_url,
+                method="GET",
+                # We set this boolean so internal recursion doesn't take place.
+                login=login,
+            )
+            if (
+                not postokay
+                or not service_response
+                or "service" not in service_response
+            ):
+                # We failed
+                self.logger.warning(
+                    "Could not fetch DID document for did:web identity "
+                    f"{did}; ensure {web_did_url} is available."
+                )
+                return (False, False)
+
+            endpoint = next(
+                (
+                    s["serviceEndpoint"]
+                    for s in service_response.get("service", [])
+                    if s["type"] == "AtprotoPersonalDataServer"
+                ),
+                None,
+            )
+
+        else:
+            self.logger.warning(
+                f"Unknown BlueSky DID scheme detected in {did}"
+            )
+            return (False, False)
+
+        # Step 3: Send to correct endpoint
+        if not endpoint:
+            self.logger.warning("Failed to resolve BlueSky PDS endpoint")
+            return (False, False)
+
+        self.store.set(did_key, did)
+        self.store.set(endpoint_key, endpoint)
+        return (did, endpoint)
+
+    def login(self):
+        """A simple wrapper to authenticate with the BlueSky Server."""
+
+        # Acquire our Decentralized Identitifer
+        did, self.__endpoint = self.get_identifier(self.user, login=True)
+        if not did:
+            return False
+
+        url = f"{self.__endpoint}{self.xrpc_suffix_session}"
+
+        payload = {
+            "identifier": did,
+            "password": self.password,
+        }
+
+        # Send Login Information
+        postokay, response = self._fetch(
+            url,
+            payload=json.dumps(payload),
+            # We set this boolean so internal recursion doesn't take place.
+            login=True,
+        )
+
+        # Our response object looks like this (content has been altered for
+        # presentation purposes):
+        # {
+        #  'did': 'did:plc:ruk414jakghak402j1jqekj2',
+        #  'didDoc': {
+        #    '@context': [
+        #      'https://www.w3.org/ns/did/v1',
+        #      'https://w3id.org/security/multikey/v1',
+        #      'https://w3id.org/security/suites/secp256k1-2019/v1'
+        #    ],
+        #    'id': 'did:plc:ruk414jakghak402j1jqekj2',
+        #    'alsoKnownAs': ['at://apprise.bsky.social'],
+        #    'verificationMethod': [
+        #      {
+        #        'id': 'did:plc:ruk414jakghak402j1jqekj2#atproto',
+        #        'type': 'Multikey',
+        #        'controller': 'did:plc:ruk414jakghak402j1jqekj2',
+        #        'publicKeyMultibase' 'redacted'
+        #      }
+        #    ],
+        #  'service': [
+        #      {
+        #        'id': '#atproto_pds',
+        #        'type': 'AtprotoPersonalDataServer',
+        #        'serviceEndpoint':
+        #           'https://woodtuft.us-west.host.bsky.network'
+        #      }
+        #    ]
+        #  },
+        #  'handle': 'apprise.bsky.social',
+        #  'email': 'whoami@gmail.com',
+        #  'emailConfirmed': True,
+        #  'emailAuthFactor': False,
+        #  'accessJwt': 'redacted',
+        #  'refreshJwt': 'redacted',
+        #  'active': True,
+        # }
+
+        if not postokay or not response:
+            # We failed
+            return False
+
+        # Acquire our Token
+        self.__access_token = response.get("accessJwt")
+
+        # Handle other optional arguments we can use
+        self.__access_token_expiry = (
+            self.access_token_lifetime_sec
+            + datetime.now(timezone.utc)
+            - self.clock_skew
+        )
+
+        # The Refresh Token
+        self.__refresh_token = response.get("refreshJwt", self.__refresh_token)
+        self.store.set(
+            "access_token", self.__access_token, self.__access_token_expiry
+        )
+        self.store.set(
+            "refresh_token", self.__refresh_token, self.__access_token_expiry
+        )
+        self.store.set("endpoint", self.__endpoint)
+
+        self.logger.info(
+            f"Authenticated to BlueSky as {self.user}.{self.host}"
+        )
+        return True
+
+    def _fetch(
+        self,
+        url,
+        payload=None,
+        params=None,
+        method="POST",
+        content_type=None,
+        login=False,
+    ):
+        """Wrapper to BlueSky API requests object."""
+
+        # use what was specified, otherwise build headers dynamically
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": (
+                payload.mimetype
+                if isinstance(payload, AttachBase)
+                else (
+                    "application/x-www-form-urlencoded; charset=utf-8"
+                    if method == "GET"
+                    else "application/json"
+                )
+            ),
+        }
+
+        if self.__access_token:
+            # Set our token
+            headers["Authorization"] = f"Bearer {self.__access_token}"
+
+        # Some Debug Logging
+        self.logger.debug(
+            f"BlueSky {method} URL:"
+            f" {url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(
+            "BlueSky Payload: %s",
+            (
+                str(payload)
+                if not isinstance(payload, AttachBase)
+                else "attach: " + payload.name
+            ),
+        )
+
+        # By default set wait to None
+        wait = None
+
+        if self.ratelimit_remaining == 0:
+            # Determine how long we should wait for or if we should wait at
+            # all. This isn't fool-proof because we can't be sure the client
+            # time (calling this script) is completely synced up with the
+            # Twitter server.  One would hope we're on NTP and our clocks are
+            # the same allowing this to role smoothly:
+
+            now = datetime.now(timezone.utc).replace(tzinfo=None)
+            if now < self.ratelimit_reset:
+                # We need to throttle for the difference in seconds
+                # We add 0.3 seconds to the end just to allow a grace
+                # period.
+                wait = (self.ratelimit_reset - now).total_seconds() + 0.3
+
+        # Always call throttle before any remote server i/o is made;
+        self.throttle(wait=wait)
+
+        # Initialize a default value for our content value
+        content = {}
+
+        # acquire our request mode
+        fn = requests.post if method == "POST" else requests.get
+        try:
+            r = fn(
+                url,
+                data=(
+                    payload
+                    if not isinstance(payload, AttachBase)
+                    else payload.open()
+                ),
+                params=params,
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            # Get our JSON content if it's possible
+            try:
+                content = json.loads(r.content)
+
+            except (TypeError, ValueError, AttributeError):
+                # TypeError = r.content is not a String
+                # ValueError = r.content is Unparsable
+                # AttributeError = r.content is None
+                content = {}
+
+            # Rate limit handling... our header objects at this point are:
+            # 'RateLimit-Limit': '10',     # Total # of requests per hour
+            # 'RateLimit-Remaining': '9',  # Requests remaining
+            # 'RateLimit-Reset': '1741631362',  # Epoch Time
+            # 'RateLimit-Policy': '10;w=86400' # NoEntries;w=<window>
+            try:
+                # Capture rate limiting if possible
+                self.ratelimit_remaining = int(
+                    r.headers.get("ratelimit-remaining")
+                )
+                self.ratelimit_reset = datetime.fromtimestamp(
+                    int(r.headers.get("ratelimit-reset")), timezone.utc
+                ).replace(tzinfo=None)
+
+            except (TypeError, ValueError):
+                # This is returned if we could not retrieve this information
+                # gracefully accept this state and move on
+                pass
+
+            if r.status_code != requests.codes.ok:
+                # We had a problem
+                status_str = NotifyBlueSky.http_response_code_lookup(
+                    r.status_code
+                )
+
+                self.logger.warning(
+                    "Failed to send BlueSky {} to {}: {}error={}.".format(
+                        method, url, ", " if status_str else "", r.status_code
+                    )
+                )
+
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                # Mark our failure
+                return (False, content)
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                f"Exception received when sending BlueSky {method} to {url}: "
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
+
+            # Mark our failure
+            return (False, content)
+
+        except OSError as e:
+            self.logger.warning(
+                "An I/O error occurred while handling {}.".format(
+                    payload.name
+                    if isinstance(payload, AttachBase)
+                    else payload
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
+            return (False, content)
+
+        return (True, content)
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (
+            self.secure_protocol[0],
+            self.user,
+            self.password,
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        # Apply our other parameters
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        user = self.user
+        if self.host != self.bluesky_default_host:
+            user += f".{self.host}"
+
+        # our URL
+        return "{schema}://{user}@{password}?{params}".format(
+            schema=self.secure_protocol[0],
+            user=NotifyBlueSky.quote(user, safe=""),
+            password=self.pprint(
+                self.password, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            params=NotifyBlueSky.urlencode(params),
+        )
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        if not results.get("password") and results["host"]:
+            results["password"] = NotifyBlueSky.unquote(results["host"])
+
+        # Do not use host field
+        results["host"] = None
+        return results
diff --git a/libs/apprise/plugins/brevo.py b/libs/apprise/plugins/brevo.py
new file mode 100644
index 0000000000..bc24a02a69
--- /dev/null
+++ b/libs/apprise/plugins/brevo.py
@@ -0,0 +1,573 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# API Reference: https://developers.brevo.com/reference/getting-started-1
+
+from json import dumps
+import logging
+from os.path import splitext
+
+import requests
+
+from .. import exception
+from ..common import NotifyFormat, NotifyType
+from ..conversion import convert_between
+from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_list, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
+
+# Extend HTTP Error Messages (most common Brevo SMTP errors)
+BREVO_HTTP_ERROR_MAP = {
+    400: "Bad Request - Invalid payload or missing parameters.",
+    401: "Unauthorized - Invalid Brevo API key.",
+    402: "Payment Required - Plan limitation or credit issue.",
+    429: "Too Many Requests - Rate limit exceeded.",
+}
+
+# Comprehensive list of Brevo-supported extensions for Transactional Emails
+# Source: Brevo API Documentation & Transactional Attachment Guidelines
+BREVO_VALID_EXTENSIONS = (
+    # Documents & Text
+    "xlsx", "xls", "ods", "docx", "docm", "doc", "csv", "pdf", "txt",
+    "rtf", "msg", "pub", "mobi", "ppt", "pptx", "eps", "odt", "ics",
+    "xml", "css", "html", "htm", "shtml",
+    # Images
+    "gif", "jpg", "jpeg", "png", "tif", "tiff", "bmp", "cgm",
+    # Archives
+    "zip", "tar", "ez", "pkpass",
+    # Audio
+    "mp3", "m4a", "m4v", "wma", "ogg", "flac", "wav", "aif", "aifc", "aiff",
+    # Video
+    "mp4", "mov", "avi", "mkv", "mpeg", "mpg", "wmv"
+)
+
+
+class NotifyBrevo(NotifyBase):
+    """A wrapper for Notify Brevo Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "Brevo"
+
+    # The services URL
+    service_url = "https://www.brevo.com/"
+
+    # The default secure protocol
+    secure_protocol = "brevo"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/brevo/"
+
+    # Default to markdown
+    notify_format = NotifyFormat.HTML
+
+    # The default Email API URL to use
+    notify_url = "https://api.brevo.com/v3/smtp/email"
+
+    # Support attachments
+    attachment_support = True
+
+    # Allow 300 requests per minute.
+    # 60/300 = 0.2
+    request_rate_per_sec = 0.2
+
+    # The default subject to use if one isn't specified.
+    default_empty_subject = "<no subject>"
+
+    # Define object templates
+    templates = (
+        "{schema}://{apikey}:{from_email}",
+        "{schema}://{apikey}:{from_email}/{targets}",
+    )
+
+    # Define our template arguments
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-zA-Z0-9._-]+$", "i"),
+            },
+            "from_email": {
+                "name": _("Source Email"),
+                "type": "string",
+                "required": True,
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+        },
+    )
+
+    # Define our template arguments
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "reply": {
+                "name": _("Reply To Email"),
+                "type": "string",
+                "map_to": "reply_to",
+            },
+        },
+    )
+
+    def __init__(
+        self,
+        apikey,
+        from_email,
+        targets=None,
+        reply_to=None,
+        cc=None,
+        bcc=None,
+        **kwargs,
+    ):
+        """Initialize Notify Brevo Object."""
+        super().__init__(**kwargs)
+
+        # API Key (associated with project)
+        self.apikey = validate_regex(
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
+        if not self.apikey:
+            msg = f"An invalid Brevo API Key ({apikey}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        result = is_email(from_email)
+        if not result:
+            msg = f"Invalid ~From~ email specified: {from_email}"
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Store email address
+        self.from_email = result["full_email"]
+
+        # Reply-to
+        self.reply_to = None
+        if reply_to:
+            result = is_email(reply_to)
+            if not result:
+                msg = "An invalid Brevo Reply To ({}) was specified.".format(
+                    f"{reply_to}")
+                self.logger.warning(msg)
+                raise TypeError(msg)
+
+            self.reply_to = (
+                    result["name"] if result["name"] else False,
+                    result["full_email"],
+                )
+
+        # Acquire Targets (To Emails)
+        self.targets = []
+
+        # Acquire Carbon Copies
+        self.cc = set()
+
+        # Acquire Blind Carbon Copies
+        self.bcc = set()
+
+        # Validate recipients (to:) and drop bad ones:
+        if targets:
+            for recipient in parse_list(targets):
+
+                result = is_email(recipient)
+                if result:
+                    self.targets.append(result["full_email"])
+                    continue
+
+                self.logger.warning(
+                    f"Dropped invalid email ({recipient}) specified.",
+                )
+        else:
+            # add ourselves
+            self.targets.append(self.from_email)
+
+        # Validate recipients (cc:) and drop bad ones:
+        for recipient in parse_list(cc):
+
+            result = is_email(recipient)
+            if result:
+                self.cc.add(result["full_email"])
+                continue
+
+            self.logger.warning(
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
+            )
+
+        # Validate recipients (bcc:) and drop bad ones:
+        for recipient in parse_list(bcc):
+
+            result = is_email(recipient)
+            if result:
+                self.bcc.add(result["full_email"])
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
+            )
+
+        return
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol, self.apikey, self.from_email)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        # Our URL parameters
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        if len(self.cc) > 0:
+            # Handle our Carbon Copy Addresses
+            params["cc"] = ",".join(self.cc)
+
+        if len(self.bcc) > 0:
+            # Handle our Blind Carbon Copy Addresses
+            params["bcc"] = ",".join(self.bcc)
+
+        if self.reply_to:
+            # Handle our reply to address
+            params["reply"] = (
+                "{} <{}>".format(*self.reply_to)
+                if self.reply_to[0]
+                else self.reply_to[1]
+            )
+
+        # a simple boolean check as to whether we display our target emails
+        # or not
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0] == self.from_email
+        )
+
+        return "{schema}://{apikey}:{from_email}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            # never encode email since it plays a huge role in our hostname
+            from_email=self.from_email,
+            targets=(
+                ""
+                if not has_targets
+                else "/".join(
+                    [NotifyBrevo.quote(x, safe="") for x in self.targets]
+                )
+            ),
+            params=NotifyBrevo.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification."""
+        return max(len(self.targets), 1)
+
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Brevo Notification."""
+
+        if not self.targets:
+            # There is no one to email; we're done
+            self.logger.warning(
+                "There are no Brevo email recipients to notify")
+            return False
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "api-key": self.apikey,
+        }
+
+        # error tracking (used for function return)
+        has_error = False
+
+        # A Simple Email Payload Template
+        payload_ = {
+            "sender": {
+                "email": self.from_email,
+            },
+            # Placeholder, filled per target
+            "to": [{"email": None}],
+            "subject": title if title else self.default_empty_subject,
+        }
+        # Body selection
+        use_html = self.notify_format == NotifyFormat.HTML
+
+        if use_html:
+            # body already normalised; keep your existing logic
+            payload_["htmlContent"] = body
+            payload_["textContent"] = convert_between(
+                NotifyFormat.HTML, NotifyFormat.TEXT, body
+            )
+        else:
+            # Plain text requested, but Brevo still wants HTML
+            payload_["textContent"] = body
+            payload_["htmlContent"] = convert_between(
+                NotifyFormat.TEXT, NotifyFormat.HTML, body
+            )
+
+        if attach and self.attachment_support:
+            attachments = []
+
+            # Send our attachments
+            for no, attachment in enumerate(attach, start=1):
+                # Perform some simple error checking
+                if not attachment:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access Brevo attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
+                    return False
+
+                # Brevo does not track content/mime type and relies 100%
+                # entirely on the filename extension as to whether or not it
+                # will accept it or not.
+                #
+                # The below prepares a safe_name (which can't be .dat like
+                # other plugins since Brevo rejects that type). For this
+                # reason .txt is chosen intentionally for this circumstance.
+
+                # Use the attachment name if available, otherwise default to a
+                # generic name
+                raw_name = attachment.name \
+                    if attachment.name else f"file{no:03}.txt"
+
+                # If the filename does NOT match a supported extension, append
+                # .txt
+                _, ext = splitext(raw_name)
+                safe_name = f"{raw_name}.txt" if (
+                    not ext or ext[1:].lower()
+                    not in BREVO_VALID_EXTENSIONS) else raw_name
+
+                try:
+                    attachments.append({
+                        "content": attachment.base64(),
+                        "name": safe_name,
+                    })
+
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access Brevo attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
+                    return False
+
+                self.logger.debug(
+                    "Appending Brevo attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
+
+            # Append our attachments to the payload
+            payload_.update({
+                "attachment": attachments,
+            })
+
+        if self.reply_to:
+            payload_["replyTo"] = {"email": self.reply_to[1]}
+
+        targets = list(self.targets)
+        while len(targets) > 0:
+            target = targets.pop(0)
+
+            # Create a copy of our template
+            payload = payload_.copy()
+
+            # the cc, bcc, to field must be unique or SendMail will fail, the
+            # below code prepares this by ensuring the target isn't in the cc
+            # list or bcc list. It also makes sure the cc list does not contain
+            # any of the bcc entries
+            cc = self.cc - self.bcc - {target}
+            bcc = self.bcc - {target}
+
+            # Set our main recipient
+            payload["to"] = [{"email": target}]
+
+            if len(cc):
+                payload["cc"] = [{"email": email} for email in cc]
+
+            if len(bcc):
+                payload["bcc"] = [{"email": email} for email in bcc]
+
+            # Some Debug Logging
+            if self.logger.isEnabledFor(logging.DEBUG):
+                # Due to attachments; output can be quite heavy and io
+                # intensive.
+                # To accommodate this, we only show our debug payload
+                # information if required.
+                self.logger.debug(
+                    "Brevo POST URL:"
+                    f" {self.notify_url} "
+                    f"(cert_verify={self.verify_certificate!r})"
+                )
+                self.logger.debug(
+                    "Brevo Payload: %s", sanitize_payload(payload))
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    self.notify_url,
+                    data=dumps(payload),
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+                if r.status_code not in (
+                    requests.codes.ok,
+                    requests.codes.accepted,
+                    requests.codes.created,
+                ):
+                    # We had a problem
+                    status_str = NotifyBrevo.http_response_code_lookup(
+                        r.status_code, BREVO_HTTP_ERROR_MAP
+                    )
+
+                    self.logger.warning(
+                        "Failed to send Brevo notification to {}: "
+                        "{}{}error={}.".format(
+                            target,
+                            status_str,
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
+
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                else:
+                    self.logger.info(
+                        f"Sent Brevo notification to {target}."
+                    )
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occurred sending Brevo "
+                    f"notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
+
+                # Mark our failure
+                has_error = True
+                continue
+
+        return not has_error
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+
+        results = NotifyBase.parse_url(url)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Our URL looks like this:
+        #    {schema}://{apikey}:{from_email}/{targets}
+        #
+        # which actually equates to:
+        #    {schema}://{user}:{password}@{host}/{email1}/{email2}/etc..
+        #                 ^       ^         ^
+        #                 |       |         |
+        #              apikey     -from addr-
+
+        if not results.get("user"):
+            # An API Key as not properly specified
+            return None
+
+        if not results.get("password"):
+            # A From Email was not correctly specified
+            return None
+
+        # Prepare our API Key
+        results["apikey"] = NotifyBrevo.unquote(results["user"])
+
+        # Prepare our From Email Address
+        results["from_email"] = "{}@{}".format(
+            NotifyBrevo.unquote(results["password"]),
+            NotifyBrevo.unquote(results["host"]),
+        )
+
+        # Acquire our targets
+        results["targets"] = NotifyBrevo.split_path(results["fullpath"])
+
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyBrevo.parse_list(
+                results["qsd"]["to"]
+            )
+
+        # Handle Carbon Copy Addresses
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = NotifyBrevo.parse_list(results["qsd"]["cc"])
+
+        # Handle Blind Carbon Copy Addresses
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = NotifyBrevo.parse_list(results["qsd"]["bcc"])
+
+        # Handle Reply To Address
+        if "reply" in results["qsd"] and len(results["qsd"]["reply"]):
+            results["reply_to"] = NotifyBrevo.unquote(results["qsd"]["reply"])
+
+        return results
diff --git a/libs/apprise/plugins/bulksms.py b/libs/apprise/plugins/bulksms.py
index c5608fa686..372c8fce6c 100644
--- a/libs/apprise/plugins/bulksms.py
+++ b/libs/apprise/plugins/bulksms.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -32,27 +31,27 @@
 #
 # API is documented here:
 #   - https://www.bulksms.com/developer/json/v1/#tag/Message
+from itertools import chain
+import json
 import re
+
 import requests
-import json
-from itertools import chain
-from .base import NotifyBase
-from ..url import PrivacyMode
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..locale import gettext_lazy as _
-
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_bool, parse_phone_no
+from .base import NotifyBase
 
 IS_GROUP_RE = re.compile(
-    r'^(@?(?P<group>[A-Z0-9_-]+))$',
+    r"^(@?(?P<group>[A-Z0-9_-]+))$",
     re.IGNORECASE,
 )
 
 
-class BulkSMSRoutingGroup(object):
-    """
-    The different categories of routing
-    """
+class BulkSMSRoutingGroup:
+    """The different categories of routing."""
+
     ECONOMY = "ECONOMY"
     STANDARD = "STANDARD"
     PREMIUM = "PREMIUM"
@@ -66,34 +65,31 @@ class BulkSMSRoutingGroup(object):
 )
 
 
-class BulkSMSEncoding(object):
-    """
-    The different categories of routing
-    """
+class BulkSMSEncoding:
+    """The different categories of routing."""
+
     TEXT = "TEXT"
     UNICODE = "UNICODE"
     BINARY = "BINARY"
 
 
 class NotifyBulkSMS(NotifyBase):
-    """
-    A wrapper for BulkSMS Notifications
-    """
+    """A wrapper for BulkSMS Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'BulkSMS'
+    service_name = "BulkSMS"
 
     # The services URL
-    service_url = 'https://bulksms.com/'
+    service_url = "https://bulksms.com/"
 
     # All notification requests are secure
-    secure_protocol = 'bulksms'
+    secure_protocol = "bulksms"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_bulksms'
+    setup_url = "https://appriseit.com/services/bulksms/"
 
     # BulkSMS uses the http protocol with JSON requests
-    notify_url = 'https://api.bulksms.com/v1/messages'
+    notify_url = "https://api.bulksms.com/v1/messages"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -106,147 +102,165 @@ class NotifyBulkSMS(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{user}:{password}@{targets}',
-    )
+    templates = ("{schema}://{user}:{password}@{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "target_group": {
+                "name": _("Target Group"),
+                "type": "string",
+                "prefix": "@",
+                "regex": (r"^[A-Z0-9 _-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'target_group': {
-            'name': _('Target Group'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[A-Z0-9 _-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-        'route': {
-            'name': _('Route Group'),
-            'type': 'choice:string',
-            'values': BULKSMS_ROUTING_GROUPS,
-            'default': BulkSMSRoutingGroup.STANDARD,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "route": {
+                "name": _("Route Group"),
+                "type": "choice:string",
+                "values": BULKSMS_ROUTING_GROUPS,
+                "default": BulkSMSRoutingGroup.STANDARD,
+            },
+            "unicode": {
+                # Unicode characters
+                "name": _("Unicode Characters"),
+                "type": "bool",
+                "default": True,
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'unicode': {
-            # Unicode characters
-            'name': _('Unicode Characters'),
-            'type': 'bool',
-            'default': True,
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
-    def __init__(self, source=None, targets=None, unicode=None, batch=None,
-                 route=None, **kwargs):
-        """
-        Initialize BulkSMS Object
-        """
-        super(NotifyBulkSMS, self).__init__(**kwargs)
+    def __init__(
+        self,
+        source=None,
+        targets=None,
+        unicode=None,
+        batch=None,
+        route=None,
+        **kwargs,
+    ):
+        """Initialize BulkSMS Object."""
+        super().__init__(**kwargs)
 
         self.source = None
         if source:
             result = is_phone_no(source)
             if not result:
-                msg = 'The Account (From) Phone # specified ' \
-                      '({}) is invalid.'.format(source)
+                msg = (
+                    "The Account (From) Phone # specified "
+                    f"({source}) is invalid."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             # Tidy source
-            self.source = '+{}'.format(result['full'])
+            self.source = "+{}".format(result["full"])
 
         # Setup our route
-        self.route = self.template_args['route']['default'] \
-            if not isinstance(route, str) else route.upper()
+        self.route = (
+            self.template_args["route"]["default"]
+            if not isinstance(route, str)
+            else route.upper()
+        )
         if self.route not in BULKSMS_ROUTING_GROUPS:
-            msg = 'The route specified ({}) is invalid.'.format(route)
+            msg = f"The route specified ({route}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Define whether or not we should set the unicode flag
-        self.unicode = self.template_args['unicode']['default'] \
-            if unicode is None else bool(unicode)
+        self.unicode = (
+            self.template_args["unicode"]["default"]
+            if unicode is None
+            else bool(unicode)
+        )
 
         # Define whether or not we should operate in a batch mode
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else bool(batch)
+        self.batch = (
+            self.template_args["batch"]["default"]
+            if batch is None
+            else bool(batch)
+        )
 
         # Parse our targets
-        self.targets = list()
-        self.groups = list()
+        self.targets = []
+        self.groups = []
 
         for target in parse_phone_no(targets):
             # Parse each phone number we found
             result = is_phone_no(target)
             if result:
-                self.targets.append('+{}'.format(result['full']))
+                self.targets.append("+{}".format(result["full"]))
                 continue
 
             group_re = IS_GROUP_RE.match(target)
             if group_re and not target.isdigit():
                 # If the target specified is all digits, it MUST have a @
                 # in front of it to eliminate any ambiguity
-                self.groups.append(group_re.group('group'))
+                self.groups.append(group_re.group("group"))
                 continue
 
             self.logger.warning(
-                'Dropped invalid phone # and/or Group '
-                '({}) specified.'.format(target),
+                f"Dropped invalid phone # and/or Group ({target}) specified.",
             )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform BulkSMS Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform BulkSMS Notification."""
 
         if not (self.password and self.user):
             self.logger.warning(
-                'There were no valid login credentials provided')
+                "There were no valid login credentials provided"
+            )
             return False
 
         if not (self.targets or self.groups):
             # We have nothing to notify
-            self.logger.warning('There are no BulkSMS targets to notify')
+            self.logger.warning("There are no BulkSMS targets to notify")
             return False
 
         # Send in batches if identified to do so
@@ -257,34 +271,42 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
         payload = {
             # The To gets populated in the loop below
-            'to': None,
-            'body': body,
-            'routingGroup': self.route,
-            'encoding': BulkSMSEncoding.UNICODE
-            if self.unicode else BulkSMSEncoding.TEXT,
+            "to": None,
+            "body": body,
+            "routingGroup": self.route,
+            "encoding": (
+                BulkSMSEncoding.UNICODE
+                if self.unicode
+                else BulkSMSEncoding.TEXT
+            ),
             # Options are NONE, ALL and ERRORS
-            'deliveryReports': "ERRORS"
+            "deliveryReports": "ERRORS",
         }
 
         if self.source:
             payload.update({
-                'from': self.source,
+                "from": self.source,
             })
 
         # Authentication
         auth = (self.user, self.password)
 
         # Prepare our targets
-        targets = list(self.targets) if batch_size == 1 else \
-            [self.targets[index:index + batch_size]
-             for index in range(0, len(self.targets), batch_size)]
+        targets = (
+            list(self.targets)
+            if batch_size == 1
+            else [
+                self.targets[index : index + batch_size]
+                for index in range(0, len(self.targets), batch_size)
+            ]
+        )
         targets += [{"type": "GROUP", "name": g} for g in self.groups]
 
         while len(targets):
@@ -292,22 +314,24 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our user
-            payload['to'] = target
+            payload["to"] = target
 
             # Printable reference
             if isinstance(target, dict):
-                p_target = target['name']
+                p_target = target["name"]
 
             elif isinstance(target, list):
-                p_target = '{} targets'.format(len(target))
+                p_target = f"{len(target)} targets"
 
             else:
                 p_target = target
 
             # Some Debug Logging
-            self.logger.debug('BulkSMS POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('BulkSMS Payload: {}' .format(payload))
+            self.logger.debug(
+                "BulkSMS POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"BulkSMS Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -342,24 +366,29 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # ]
 
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
 
                     self.logger.warning(
-                        'Failed to send BulkSMS notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send BulkSMS notification to {}: "
+                        "{}{}error={}.".format(
                             p_target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -367,13 +396,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent BulkSMS notification to {}.'.format(p_target))
+                        f"Sent BulkSMS notification to {p_target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending BulkSMS: to %s ',
-                    p_target)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending BulkSMS: to %s ",
+                    p_target,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -382,41 +413,48 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'unicode': 'yes' if self.unicode else 'no',
-            'batch': 'yes' if self.batch else 'no',
-            'route': self.route,
+            "unicode": "yes" if self.unicode else "no",
+            "batch": "yes" if self.batch else "no",
+            "route": self.route,
         }
 
         if self.source:
-            params['from'] = self.source
+            params["from"] = self.source
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{user}:{password}@{targets}/?{params}'.format(
+        return "{schema}://{user}:{password}@{targets}/?{params}".format(
             schema=self.secure_protocol,
-            user=self.pprint(self.user, privacy, safe=''),
+            user=self.pprint(self.user, privacy, safe=""),
             password=self.pprint(
-                self.password, privacy, mode=PrivacyMode.Secret, safe=''),
-            targets='/'.join(chain(
-                [NotifyBulkSMS.quote('{}'.format(x), safe='+')
-                 for x in self.targets],
-                [NotifyBulkSMS.quote('@{}'.format(x), safe='@')
-                 for x in self.groups])),
-            params=NotifyBulkSMS.urlencode(params))
+                self.password, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            targets="/".join(
+                chain(
+                    [
+                        NotifyBulkSMS.quote(f"{x}", safe="+")
+                        for x in self.targets
+                    ],
+                    [
+                        NotifyBulkSMS.quote(f"@{x}", safe="@")
+                        for x in self.groups
+                    ],
+                )
+            ),
+            params=NotifyBulkSMS.urlencode(params),
+        )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol,
@@ -425,9 +463,7 @@ def url_identifier(self):
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
 
         #
         # Factor batch into calculation
@@ -437,18 +473,16 @@ def __len__(self):
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets + len(self.groups)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -456,36 +490,40 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = [
-            NotifyBulkSMS.unquote(results['host']),
-            *NotifyBulkSMS.split_path(results['fullpath'])]
+        results["targets"] = [
+            NotifyBulkSMS.unquote(results["host"]),
+            *NotifyBulkSMS.split_path(results["fullpath"]),
+        ]
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyBulkSMS.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyBulkSMS.unquote(results["qsd"]["from"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyBulkSMS.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyBulkSMS.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Unicode Characters
-        results['unicode'] = \
-            parse_bool(results['qsd'].get(
-                'unicode', NotifyBulkSMS.template_args['unicode']['default']))
+        results["unicode"] = parse_bool(
+            results["qsd"].get(
+                "unicode", NotifyBulkSMS.template_args["unicode"]["default"]
+            )
+        )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyBulkSMS.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyBulkSMS.template_args["batch"]["default"]
+            )
+        )
 
         # Allow one to define a route group
-        if 'route' in results['qsd'] and len(results['qsd']['route']):
-            results['route'] = \
-                NotifyBulkSMS.unquote(results['qsd']['route'])
+        if "route" in results["qsd"] and len(results["qsd"]["route"]):
+            results["route"] = NotifyBulkSMS.unquote(results["qsd"]["route"])
 
         return results
diff --git a/libs/apprise/plugins/bulkvs.py b/libs/apprise/plugins/bulkvs.py
index 835887a904..244f7164de 100644
--- a/libs/apprise/plugins/bulkvs.py
+++ b/libs/apprise/plugins/bulkvs.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,34 +32,34 @@
 # API is documented here:
 #   - https://portal.bulkvs.com/api/v1.0/documentation#/\
 #             Messaging/post_messageSend
-import requests
 import json
-from .base import NotifyBase
-from ..url import PrivacyMode
+
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_bool, parse_phone_no
+from .base import NotifyBase
 
 
 class NotifyBulkVS(NotifyBase):
-    """
-    A wrapper for BulkVS Notifications
-    """
+    """A wrapper for BulkVS Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'BulkVS'
+    service_name = "BulkVS"
 
     # The services URL
-    service_url = 'https://www.bulkvs.com/'
+    service_url = "https://www.bulkvs.com/"
 
     # All notification requests are secure
-    secure_protocol = 'bulkvs'
+    secure_protocol = "bulkvs"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_bulkvs'
+    setup_url = "https://appriseit.com/services/bulkvs/"
 
     # BulkVS uses the http protocol with JSON requests
-    notify_url = 'https://portal.bulkvs.com/api/v1.0/messageSend'
+    notify_url = "https://portal.bulkvs.com/api/v1.0/messageSend"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -74,101 +73,109 @@ class NotifyBulkVS(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}:{password}@{from_phone}/{targets}',
-        '{schema}://{user}:{password}@{from_phone}',
+        "{schema}://{user}:{password}@{from_phone}/{targets}",
+        "{schema}://{user}:{password}@{from_phone}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-    })
+    )
 
     def __init__(self, source=None, targets=None, batch=None, **kwargs):
-        """
-        Initialize BulkVS Object
-        """
-        super(NotifyBulkVS, self).__init__(**kwargs)
+        """Initialize BulkVS Object."""
+        super().__init__(**kwargs)
 
         if not (self.user and self.password):
-            msg = 'A BulkVS user/pass was not provided.'
+            msg = "A BulkVS user/pass was not provided."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         result = is_phone_no(source)
         if not result:
-            msg = 'The Account (From) Phone # specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = (
+                f"The Account (From) Phone # specified ({source}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Tidy source
-        self.source = result['full']
+        self.source = result["full"]
 
         # Define whether or not we should operate in a batch mode
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else bool(batch)
+        self.batch = (
+            self.template_args["batch"]["default"]
+            if batch is None
+            else bool(batch)
+        )
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         has_error = False
         for target in parse_phone_no(targets):
             # Parse each phone number we found
             result = is_phone_no(target)
             if result:
-                self.targets.append(result['full'])
+                self.targets.append(result["full"])
                 continue
 
             has_error = True
             self.logger.warning(
-                'Dropped invalid phone # ({}) specified.'.format(target),
+                f"Dropped invalid phone # ({target}) specified.",
             )
 
         if not targets and not has_error:
@@ -177,14 +184,12 @@ def __init__(self, source=None, targets=None, batch=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform BulkVS Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform BulkVS Notification."""
 
         if not self.targets:
             # We have nothing to notify
-            self.logger.warning('There are no BulkVS targets to notify')
+            self.logger.warning("There are no BulkVS targets to notify")
             return False
 
         # Send in batches if identified to do so
@@ -195,45 +200,52 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
         payload = {
             # The To gets populated in the loop below
-            'From': self.source,
-            'To': None,
-            'Message': body,
+            "From": self.source,
+            "To": None,
+            "Message": body,
         }
 
         # Authentication
         auth = (self.user, self.password)
 
         # Prepare our targets
-        targets = list(self.targets) if batch_size == 1 else \
-            [self.targets[index:index + batch_size]
-             for index in range(0, len(self.targets), batch_size)]
+        targets = (
+            list(self.targets)
+            if batch_size == 1
+            else [
+                self.targets[index : index + batch_size]
+                for index in range(0, len(self.targets), batch_size)
+            ]
+        )
 
         while len(targets):
             # Get our target to notify
             target = targets.pop(0)
 
             # Prepare our user
-            payload['To'] = target
+            payload["To"] = target
 
             # Printable reference
             if isinstance(target, list):
-                p_target = '{} targets'.format(len(target))
+                p_target = f"{len(target)} targets"
 
             else:
                 p_target = target
 
             # Some Debug Logging
-            self.logger.debug('BulkVS POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('BulkVS Payload: {}' .format(payload))
+            self.logger.debug(
+                "BulkVS POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"BulkVS Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -265,22 +277,25 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # }
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
 
                     self.logger.warning(
-                        'Failed to send BulkVS notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send BulkVS notification to {}: "
+                        "{}{}error={}.".format(
                             p_target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -288,13 +303,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent BulkVS notification to {}.'.format(p_target))
+                        f"Sent BulkVS notification to {p_target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending BulkVS: to %s ',
-                    p_target)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending BulkVS: to %s ",
+                    p_target,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -304,46 +321,48 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.source, self.user, self.password)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
+            "batch": "yes" if self.batch else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # A nice way of cleaning up the URL length a bit
-        targets = [] if len(self.targets) == 1 \
-            and self.targets[0] == self.source else self.targets
-
-        return '{schema}://{user}:{password}@{source}/{targets}' \
-            '?{params}'.format(
+        targets = (
+            []
+            if len(self.targets) == 1 and self.targets[0] == self.source
+            else self.targets
+        )
+
+        return (
+            "{schema}://{user}:{password}@{source}/{targets}?{params}".format(
                 schema=self.secure_protocol,
                 source=self.source,
-                user=self.pprint(self.user, privacy, safe=''),
+                user=self.pprint(self.user, privacy, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
-                targets='/'.join([
-                    NotifyBulkVS.quote('{}'.format(x), safe='+')
-                    for x in targets]),
-                params=NotifyBulkVS.urlencode(params))
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
+                targets="/".join(
+                    [NotifyBulkVS.quote(f"{x}", safe="+") for x in targets]
+                ),
+                params=NotifyBulkVS.urlencode(params),
+            )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
 
         #
         # Factor batch into calculation
@@ -351,18 +370,16 @@ def __len__(self):
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets) if self.targets else 1
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -371,31 +388,34 @@ def parse_url(url):
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyBulkVS.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyBulkVS.unquote(results["qsd"]["from"])
 
             # hostname will also be a target in this case
-            results['targets'] = [
-                *NotifyBulkVS.parse_phone_no(results['host']),
-                *NotifyBulkVS.split_path(results['fullpath'])]
+            results["targets"] = [
+                *NotifyBulkVS.parse_phone_no(results["host"]),
+                *NotifyBulkVS.split_path(results["fullpath"]),
+            ]
 
         else:
             # store our source
-            results['source'] = NotifyBulkVS.unquote(results['host'])
+            results["source"] = NotifyBulkVS.unquote(results["host"])
 
             # store targets
-            results['targets'] = NotifyBulkVS.split_path(results['fullpath'])
+            results["targets"] = NotifyBulkVS.split_path(results["fullpath"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyBulkVS.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyBulkVS.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyBulkVS.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyBulkVS.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/burstsms.py b/libs/apprise/plugins/burstsms.py
index 0cebddabbd..154366ffb8 100644
--- a/libs/apprise/plugins/burstsms.py
+++ b/libs/apprise/plugins/burstsms.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,23 +32,27 @@
 #
 import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import (
-    is_phone_no, parse_phone_no, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from .base import NotifyBase
 
 
 class BurstSMSCountryCode:
     # Australia
-    AU = 'au'
+    AU = "au"
     # New Zeland
-    NZ = 'nz'
+    NZ = "nz"
     # United Kingdom
-    UK = 'gb'
+    UK = "gb"
     # United States
-    US = 'us'
+    US = "us"
 
 
 BURST_SMS_COUNTRY_CODES = (
@@ -61,18 +64,16 @@ class BurstSMSCountryCode:
 
 
 class NotifyBurstSMS(NotifyBase):
-    """
-    A wrapper for Burst SMS Notifications
-    """
+    """A wrapper for Burst SMS Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Burst SMS'
+    service_name = "Burst SMS"
 
     # The services URL
-    service_url = 'https://burstsms.com/'
+    service_url = "https://burstsms.com/"
 
     # The default protocol
-    secure_protocol = 'burstsms'
+    secure_protocol = "burstsms"
 
     # The maximum amount of SMS Messages that can reside within a single
     # batch transfer based on:
@@ -80,10 +81,10 @@ class NotifyBurstSMS(NotifyBase):
     default_batch_size = 500
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_burst_sms'
+    setup_url = "https://appriseit.com/services/burstsms/"
 
     # Burst SMS uses the http protocol with JSON requests
-    notify_url = 'https://api.transmitsms.com/send-sms.json'
+    notify_url = "https://api.transmitsms.com/send-sms.json"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -93,168 +94,176 @@ class NotifyBurstSMS(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}:{secret}@{sender_id}/{targets}',
-    )
+    templates = ("{schema}://{apikey}:{secret}@{sender_id}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-            'private': True,
-        },
-        'secret': {
-            'name': _('API Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-        'sender_id': {
-            'name': _('Sender ID'),
-            'type': 'string',
-            'required': True,
-            'map_to': 'source',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+                "private": True,
+            },
+            "secret": {
+                "name": _("API Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "sender_id": {
+                "name": _("Sender ID"),
+                "type": "string",
+                "required": True,
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'sender_id',
-        },
-        'key': {
-            'alias_of': 'apikey',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "sender_id",
+            },
+            "key": {
+                "alias_of": "apikey",
+            },
+            "secret": {
+                "alias_of": "secret",
+            },
+            "country": {
+                "name": _("Country"),
+                "type": "choice:string",
+                "values": BURST_SMS_COUNTRY_CODES,
+                "default": BurstSMSCountryCode.US,
+            },
+            # Validity
+            # Expire a message send if it is undeliverable (defined in minutes)
+            # If set to Zero (0); this is the default and sets the max validity
+            # period
+            "validity": {"name": _("validity"), "type": "int", "default": 0},
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'secret': {
-            'alias_of': 'secret',
-        },
-        'country': {
-            'name': _('Country'),
-            'type': 'choice:string',
-            'values': BURST_SMS_COUNTRY_CODES,
-            'default': BurstSMSCountryCode.US,
-        },
-        # Validity
-        # Expire a message send if it is undeliverable (defined in minutes)
-        # If set to Zero (0); this is the default and sets the max validity
-        # period
-        'validity': {
-            'name': _('validity'),
-            'type': 'int',
-            'default': 0
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
-    def __init__(self, apikey, secret, source, targets=None, country=None,
-                 validity=None, batch=None, **kwargs):
-        """
-        Initialize Burst SMS Object
-        """
+    def __init__(
+        self,
+        apikey,
+        secret,
+        source,
+        targets=None,
+        country=None,
+        validity=None,
+        batch=None,
+        **kwargs,
+    ):
+        """Initialize Burst SMS Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Burst SMS API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Burst SMS API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # API Secret (associated with project)
         self.secret = validate_regex(
-            secret, *self.template_tokens['secret']['regex'])
+            secret, *self.template_tokens["secret"]["regex"]
+        )
         if not self.secret:
-            msg = 'An invalid Burst SMS API Secret ' \
-                  '({}) was specified.'.format(secret)
+            msg = f"An invalid Burst SMS API Secret ({secret}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if not country:
-            self.country = self.template_args['country']['default']
+            self.country = self.template_args["country"]["default"]
 
         else:
             self.country = country.lower().strip()
             if country not in BURST_SMS_COUNTRY_CODES:
-                msg = 'An invalid Burst SMS country ' \
-                      '({}) was specified.'.format(country)
+                msg = (
+                    f"An invalid Burst SMS country ({country}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         # Set our Validity
-        self.validity = self.template_args['validity']['default']
+        self.validity = self.template_args["validity"]["default"]
         if validity:
             try:
                 self.validity = int(validity)
 
             except (ValueError, TypeError):
-                msg = 'The Burst SMS Validity specified ({}) is invalid.'\
-                    .format(validity)
+                msg = (
+                    f"The Burst SMS Validity specified ({validity}) is"
+                    " invalid."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
         # Prepare Batch Mode Flag
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else batch
+        self.batch = (
+            self.template_args["batch"]["default"] if batch is None else batch
+        )
 
         # The Sender ID
         self.source = validate_regex(source)
         if not self.source:
-            msg = 'The Account Sender ID specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = f"The Account Sender ID specified ({source}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Burst SMS Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Burst SMS Notification."""
 
         if not self.targets:
             self.logger.warning(
-                'There are no valid Burst SMS targets to notify.')
+                "There are no valid Burst SMS targets to notify."
+            )
             return False
 
         # error tracking (used for function return)
@@ -262,8 +271,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
         }
 
         # Prepare our authentication
@@ -271,14 +280,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our payload
         payload = {
-            'countrycode': self.country,
-            'message': body,
-
+            "countrycode": self.country,
+            "message": body,
             # Sender ID
-            'from': self.source,
-
+            "from": self.source,
             # The to gets populated in the loop below
-            'to': None,
+            "to": None,
         }
 
         # Send in batches if identified to do so
@@ -290,12 +297,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         for index in range(0, len(targets), batch_size):
 
             # Prepare our user
-            payload['to'] = ','.join(self.targets[index:index + batch_size])
+            payload["to"] = ",".join(self.targets[index : index + batch_size])
 
             # Some Debug Logging
-            self.logger.debug('Burst SMS POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('Burst SMS Payload: {}' .format(payload))
+            self.logger.debug(
+                "Burst SMS POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Burst SMS Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -312,20 +321,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBurstSMS.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyBurstSMS.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Burst SMS notification to {} '
-                        'target(s): {}{}error={}.'.format(
-                            len(self.targets[index:index + batch_size]),
+                        "Failed to send Burst SMS notification to {} "
+                        "target(s): {}{}error={}.".format(
+                            len(self.targets[index : index + batch_size]),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -333,15 +344,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent Burst SMS notification to %d target(s).' %
-                        len(self.targets[index:index + batch_size]))
+                        "Sent Burst SMS notification to "
+                        f"{len(self.targets[index : index + batch_size])} "
+                        "target(s)."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Burst SMS '
-                    'notification to %d target(s).' %
-                    len(self.targets[index:index + batch_size]))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    f"A Connection error occurred sending Burst SMS "
+                    "notification to "
+                    f"{len(self.targets[index : index + batch_size])} "
+                    "target(s)."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -350,118 +365,118 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'country': self.country,
-            'batch': 'yes' if self.batch else 'no',
+            "country": self.country,
+            "batch": "yes" if self.batch else "no",
         }
 
         if self.validity:
-            params['validity'] = str(self.validity)
+            params["validity"] = str(self.validity)
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{key}:{secret}@{source}/{targets}/?{params}'.format(
+        return "{schema}://{key}:{secret}@{source}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            key=self.pprint(self.apikey, privacy, safe=''),
+            key=self.pprint(self.apikey, privacy, safe=""),
             secret=self.pprint(
-                self.secret, privacy, mode=PrivacyMode.Secret, safe=''),
-            source=NotifyBurstSMS.quote(self.source, safe=''),
-            targets='/'.join(
-                [NotifyBurstSMS.quote(x, safe='') for x in self.targets]),
-            params=NotifyBurstSMS.urlencode(params))
+                self.secret, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            source=NotifyBurstSMS.quote(self.source, safe=""),
+            targets="/".join(
+                [NotifyBurstSMS.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyBurstSMS.urlencode(params),
+        )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey, self.secret, self.source)
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The hostname is our source (Sender ID)
-        results['source'] = NotifyBurstSMS.unquote(results['host'])
+        results["source"] = NotifyBurstSMS.unquote(results["host"])
 
         # Get any remaining targets
-        results['targets'] = NotifyBurstSMS.split_path(results['fullpath'])
+        results["targets"] = NotifyBurstSMS.split_path(results["fullpath"])
 
         # Get our account_side and auth_token from the user/pass config
-        results['apikey'] = NotifyBurstSMS.unquote(results['user'])
-        results['secret'] = NotifyBurstSMS.unquote(results['password'])
+        results["apikey"] = NotifyBurstSMS.unquote(results["user"])
+        results["secret"] = NotifyBurstSMS.unquote(results["password"])
 
         # API Key
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
             # Extract the API Key from an argument
-            results['apikey'] = \
-                NotifyBurstSMS.unquote(results['qsd']['key'])
+            results["apikey"] = NotifyBurstSMS.unquote(results["qsd"]["key"])
 
         # API Secret
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
             # Extract the API Secret from an argument
-            results['secret'] = \
-                NotifyBurstSMS.unquote(results['qsd']['secret'])
+            results["secret"] = NotifyBurstSMS.unquote(
+                results["qsd"]["secret"]
+            )
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyBurstSMS.unquote(results['qsd']['from'])
-        if 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifyBurstSMS.unquote(results['qsd']['source'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyBurstSMS.unquote(results["qsd"]["from"])
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifyBurstSMS.unquote(
+                results["qsd"]["source"]
+            )
 
         # Support country
-        if 'country' in results['qsd'] and len(results['qsd']['country']):
-            results['country'] = \
-                NotifyBurstSMS.unquote(results['qsd']['country'])
+        if "country" in results["qsd"] and len(results["qsd"]["country"]):
+            results["country"] = NotifyBurstSMS.unquote(
+                results["qsd"]["country"]
+            )
 
         # Support validity value
-        if 'validity' in results['qsd'] and len(results['qsd']['validity']):
-            results['validity'] = \
-                NotifyBurstSMS.unquote(results['qsd']['validity'])
+        if "validity" in results["qsd"] and len(results["qsd"]["validity"]):
+            results["validity"] = NotifyBurstSMS.unquote(
+                results["qsd"]["validity"]
+            )
 
         # Get Batch Mode Flag
-        if 'batch' in results['qsd'] and len(results['qsd']['batch']):
-            results['batch'] = parse_bool(results['qsd']['batch'])
+        if "batch" in results["qsd"] and len(results["qsd"]["batch"]):
+            results["batch"] = parse_bool(results["qsd"]["batch"])
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyBurstSMS.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyBurstSMS.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/chanify.py b/libs/apprise/plugins/chanify.py
index caf314942f..70d3c62b64 100644
--- a/libs/apprise/plugins/chanify.py
+++ b/libs/apprise/plugins/chanify.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,36 +34,32 @@
 
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NotifyChanify(NotifyBase):
-    """
-    A wrapper for Chanify Notifications
-    """
+    """A wrapper for Chanify Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = _('Chanify')
+    service_name = _("Chanify")
 
     # The services URL
-    service_url = 'https://chanify.net/'
+    service_url = "https://chanify.net/"
 
     # The default secure protocol
-    secure_protocol = 'chanify'
+    secure_protocol = "chanify"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_chanify'
+    setup_url = "https://appriseit.com/services/chanify/"
 
     # Notification URL
-    notify_url = 'https://api.chanify.net/v1/sender/{token}/'
+    notify_url = "https://api.chanify.net/v1/sender/{token}/"
 
     # Define object templates
-    templates = (
-        '{schema}://{token}',
-    )
+    templates = ("{schema}://{token}",)
 
     # The title is not used
     title_maxlen = 0
@@ -72,58 +67,60 @@ class NotifyChanify(NotifyBase):
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9._-]+$", "i"),
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'token': {
-            'alias_of': 'token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "token": {
+                "alias_of": "token",
+            },
         },
-    })
+    )
 
     def __init__(self, token, **kwargs):
-        """
-        Initialize Chanify Object
-        """
+        """Initialize Chanify Object."""
         super().__init__(**kwargs)
 
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'The Chanify token specified ({}) is invalid.'\
-                .format(token)
+            msg = f"The Chanify token specified ({token}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Send our notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send our notification."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
         }
 
         # Our Message
-        payload = {
-            'text': body
-        }
+        payload = {"text": body}
 
-        self.logger.debug('Chanify GET URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate))
-        self.logger.debug('Chanify Payload: %s' % str(payload))
+        self.logger.debug(
+            "Chanify GET URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Chanify Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -138,29 +135,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyChanify.http_response_code_lookup(r.status_code)
+                status_str = NotifyChanify.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Chanify notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Chanify notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Chanify notification.')
+                self.logger.info("Sent Chanify notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Chanify '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Chanify notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -168,35 +167,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return True
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{token}/?{params}'.format(
+        return "{schema}://{token}/?{params}".format(
             schema=self.secure_protocol,
-            token=self.pprint(self.token, privacy, safe=''),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyChanify.urlencode(params),
         )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         # parse_url already handles getting the `user` and `password` fields
         # populated.
@@ -206,10 +200,10 @@ def parse_url(url):
             return results
 
         # Allow over-ride
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifyChanify.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyChanify.unquote(results["qsd"]["token"])
 
         else:
-            results['token'] = NotifyChanify.unquote(results['host'])
+            results["token"] = NotifyChanify.unquote(results["host"])
 
         return results
diff --git a/libs/apprise/plugins/clickatell.py b/libs/apprise/plugins/clickatell.py
new file mode 100644
index 0000000000..8233854a0e
--- /dev/null
+++ b/libs/apprise/plugins/clickatell.py
@@ -0,0 +1,303 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+from itertools import chain
+
+# To use this service you will need a Clickatell account to which you can get
+# your API_TOKEN at:
+#     https://www.clickatell.com/
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
+
+
+class NotifyClickatell(NotifyBase):
+    """A wrapper for Clickatell Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("Clickatell")
+
+    # The services URL
+    service_url = "https://www.clickatell.com/"
+
+    # All notification requests are secure
+    secure_protocol = "clickatell"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/clickatell/"
+
+    # Clickatell API Endpoint
+    notify_url = "https://platform.clickatell.com/messages/http/send"
+
+    # A title can not be used for SMS Messages.  Setting this to zero will
+    # cause any title (if defined) to get placed into the message body.
+    title_maxlen = 0
+
+    templates = (
+        "{schema}://{apikey}/{targets}",
+        "{schema}://{source}@{apikey}/{targets}",
+    )
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "source": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
+        },
+    )
+
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "apikey": {"alias_of": "apikey"},
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "source",
+            },
+        },
+    )
+
+    def __init__(self, apikey, source=None, targets=None, **kwargs):
+        """Initialize Clickatell Object."""
+
+        super().__init__(**kwargs)
+
+        self.apikey = validate_regex(apikey)
+        if not self.apikey:
+            msg = f"An invalid Clickatell API Token ({apikey}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.source = None
+        if source:
+            result = is_phone_no(source)
+            if not result:
+                msg = (
+                    "The Account (From) Phone # specified "
+                    f"({source}) is invalid."
+                )
+                self.logger.warning(msg)
+
+                raise TypeError(msg)
+
+            # Tidy source
+            self.source = result["full"]
+
+        # Used for URL generation afterwards only
+        self._invalid_targets = []
+
+        # Parse our targets
+        self.targets = []
+
+        for target in parse_phone_no(targets, prefix=True):
+            # Validate targets and drop bad ones:
+            result = is_phone_no(target)
+            if not result:
+                self.logger.warning(
+                    f"Dropped invalid phone # ({target}) specified.",
+                )
+                self._invalid_targets.append(target)
+                continue
+
+            # store valid phone number
+            self.targets.append(result["full"])
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.apikey, self.source)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        return "{schema}://{source}{apikey}/{targets}/?{params}".format(
+            schema=self.secure_protocol,
+            source=f"{self.source}@" if self.source else "",
+            apikey=self.pprint(self.apikey, privacy, safe="="),
+            targets="/".join([
+                NotifyClickatell.quote(t, safe="")
+                for t in chain(self.targets, self._invalid_targets)
+            ]),
+            params=self.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification.
+
+        Always return 1 at least
+        """
+        return len(self.targets) if self.targets else 1
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Clickatell Notification."""
+
+        if not self.targets:
+            # There were no targets to notify
+            self.logger.warning("There were no Clickatell targets to notify")
+            return False
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
+            "Content-Type": "application/json",
+        }
+
+        params_base = {
+            "apiKey": self.apikey,
+            "from": self.source,
+            "content": body,
+        }
+
+        # error tracking (used for function return)
+        has_error = False
+
+        for target in self.targets:
+            params = params_base.copy()
+            params["to"] = target
+
+            # Some Debug Logging
+            self.logger.debug(
+                "Clickatell GET URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Clickatell Payload: {params}")
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+
+            try:
+                r = requests.get(
+                    self.notify_url,
+                    params=params,
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+
+                if (
+                    r.status_code != requests.codes.ok
+                    and r.status_code != requests.codes.accepted
+                ):
+                    # We had a problem
+                    status_str = self.http_response_code_lookup(r.status_code)
+
+                    self.logger.warning(
+                        "Failed to send Clickatell notification: "
+                        "{}{}error={}.".format(
+                            status_str,
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
+
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                else:
+                    self.logger.info(
+                        "Sent Clickatell notification to %s", target
+                    )
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occurred sending Clickatell: to %s ",
+                    target,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
+                # Mark our failure
+                has_error = True
+                continue
+
+        return not has_error
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't parse the URL
+            return results
+
+        results["targets"] = NotifyClickatell.split_path(results["fullpath"])
+        results["apikey"] = NotifyClickatell.unquote(results["host"])
+
+        if results["user"]:
+            results["source"] = NotifyClickatell.unquote(results["user"])
+
+        # Support the 'to' variable so that we can support targets this way too
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyClickatell.parse_phone_no(
+                results["qsd"]["to"]
+            )
+
+        # Support the 'from'  and 'source' variable so that we can support
+        # targets this way too.
+        # The 'from' makes it easier to use yaml configuration
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyClickatell.unquote(
+                results["qsd"]["from"]
+            )
+
+        return results
diff --git a/libs/apprise/plugins/clicksend.py b/libs/apprise/plugins/clicksend.py
index f37bd283ae..cada8e690b 100644
--- a/libs/apprise/plugins/clicksend.py
+++ b/libs/apprise/plugins/clicksend.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -39,40 +38,39 @@
 # The API reference used to build this plugin was documented here:
 #  https://developers.clicksend.com/docs/rest/v3/
 #
-import requests
 from json import dumps
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_bool, parse_phone_no
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 CLICKSEND_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 
 class NotifyClickSend(NotifyBase):
-    """
-    A wrapper for ClickSend Notifications
-    """
+    """A wrapper for ClickSend Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'ClickSend'
+    service_name = "ClickSend"
 
     # The services URL
-    service_url = 'https://clicksend.com/'
+    service_url = "https://clicksend.com/"
 
     # The default secure protocol
-    secure_protocol = 'clicksend'
+    secure_protocol = "clicksend"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_clicksend'
+    setup_url = "https://appriseit.com/services/clicksend/"
 
     # ClickSend uses the http protocol with JSON requests
-    notify_url = 'https://rest.clicksend.com/v3/sms/send'
+    notify_url = "https://rest.clicksend.com/v3/sms/send"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -85,67 +83,69 @@ class NotifyClickSend(NotifyBase):
     default_batch_size = 1000
 
     # Define object templates
-    templates = (
-        '{schema}://{user}:{apikey}@{targets}',
-    )
+    templates = ("{schema}://{user}:{apikey}@{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "map_to": "password",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'map_to': 'password',
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "key": {
+                "alias_of": "apikey",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'key': {
-            'alias_of': 'apikey',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
     def __init__(self, targets=None, batch=False, **kwargs):
-        """
-        Initialize ClickSend Object
-        """
+        """Initialize ClickSend Object."""
         super().__init__(**kwargs)
 
         # Prepare Batch Mode Flag
         self.batch = batch
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         if not (self.user and self.password):
-            msg = 'A ClickSend user/pass was not provided.'
+            msg = "A ClickSend user/pass was not provided."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -154,51 +154,50 @@ def __init__(self, targets=None, batch=False, **kwargs):
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform ClickSend Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform ClickSend Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no ClickSend targets to notify.')
+            self.logger.warning("There were no ClickSend targets to notify.")
             return False
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json; charset=utf-8",
         }
 
         # error tracking (used for function return)
         has_error = False
 
         # prepare JSON Object
-        payload = {
-            'messages': []
-        }
+        payload = {"messages": []}
 
         # Send in batches if identified to do so
         default_batch_size = 1 if not self.batch else self.default_batch_size
 
         for index in range(0, len(self.targets), default_batch_size):
-            payload['messages'] = [{
-                'source': 'php',
-                'body': body,
-                'to': '+{}'.format(to),
-            } for to in self.targets[index:index + default_batch_size]]
-
-            self.logger.debug('ClickSend POST URL: %s (cert_verify=%r)' % (
-                self.notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('ClickSend Payload: %s' % str(payload))
+            payload["messages"] = [
+                {
+                    "source": "php",
+                    "body": body,
+                    "to": f"+{to}",
+                }
+                for to in self.targets[index : index + default_batch_size]
+            ]
+
+            self.logger.debug(
+                "ClickSend POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"ClickSend Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -213,22 +212,27 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyClickSend.http_response_code_lookup(
-                            r.status_code, CLICKSEND_HTTP_ERROR_MAP)
+                    status_str = NotifyClickSend.http_response_code_lookup(
+                        r.status_code, CLICKSEND_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send {} ClickSend notification{}: '
-                        '{}{}error={}.'.format(
-                            len(payload['messages']),
-                            ' to {}'.format(self.targets[index])
-                            if default_batch_size == 1 else '(s)',
+                        "Failed to send {} ClickSend notification{}: "
+                        "{}{}error={}.".format(
+                            len(payload["messages"]),
+                            (
+                                f" to {self.targets[index]}"
+                                if default_batch_size == 1
+                                else "(s)"
+                            ),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -236,18 +240,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent {} ClickSend notification{}.'
-                        .format(
-                            len(payload['messages']),
-                            ' to {}'.format(self.targets[index])
-                            if default_batch_size == 1 else '(s)',
-                        ))
+                        "Sent {} ClickSend notification{}.".format(
+                            len(payload["messages"]),
+                            (
+                                f" to {self.targets[index]}"
+                                if default_batch_size == 1
+                                else "(s)"
+                            ),
+                        )
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending {} ClickSend '
-                    'notification(s).'.format(len(payload['messages'])))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending {} ClickSend "
+                    "notification(s).".format(len(payload["messages"]))
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -256,90 +264,88 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
+            "batch": "yes" if self.batch else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Setup Authentication
-        auth = '{user}:{password}@'.format(
-            user=NotifyClickSend.quote(self.user, safe=''),
+        auth = "{user}:{password}@".format(
+            user=NotifyClickSend.quote(self.user, safe=""),
             password=self.pprint(
-                self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                self.password, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
         )
 
-        return '{schema}://{auth}{targets}?{params}'.format(
+        return "{schema}://{auth}{targets}?{params}".format(
             schema=self.secure_protocol,
             auth=auth,
-            targets='/'.join(
-                [NotifyClickSend.quote(x, safe='') for x in self.targets]),
+            targets="/".join(
+                [NotifyClickSend.quote(x, safe="") for x in self.targets]
+            ),
             params=NotifyClickSend.urlencode(params),
         )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.password)
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # All elements are targets
-        results['targets'] = [NotifyClickSend.unquote(results['host'])]
+        results["targets"] = [NotifyClickSend.unquote(results["host"])]
 
         # All entries after the hostname are additional targets
-        results['targets'].extend(
-            NotifyClickSend.split_path(results['fullpath']))
+        results["targets"].extend(
+            NotifyClickSend.split_path(results["fullpath"])
+        )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get('batch', False))
+        results["batch"] = parse_bool(results["qsd"].get("batch", False))
 
         # API Key
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
             # Extract the API Key from an argument
-            results['password'] = \
-                NotifyClickSend.unquote(results['qsd']['key'])
+            results["password"] = NotifyClickSend.unquote(
+                results["qsd"]["key"]
+            )
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyClickSend.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyClickSend.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/custom_form.py b/libs/apprise/plugins/custom_form.py
index 0a1ef96a45..5cae8c8f26 100644
--- a/libs/apprise/plugins/custom_form.py
+++ b/libs/apprise/plugins/custom_form.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,40 +26,30 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import re
+
 import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyType
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from .base import NotifyBase
 
 
 class FORMPayloadField:
-    """
-    Identifies the fields available in the FORM Payload
-    """
-    VERSION = 'version'
-    TITLE = 'title'
-    MESSAGE = 'message'
-    MESSAGETYPE = 'type'
+    """Identifies the fields available in the FORM Payload."""
+
+    VERSION = "version"
+    TITLE = "title"
+    MESSAGE = "message"
+    MESSAGETYPE = "type"
 
 
 # Defines the method to send the notification
-METHODS = (
-    'POST',
-    'GET',
-    'DELETE',
-    'PUT',
-    'HEAD',
-    'PATCH'
-)
+METHODS = ("POST", "GET", "DELETE", "PUT", "HEAD", "PATCH")
 
 
 class NotifyForm(NotifyBase):
-    """
-    A wrapper for Form Notifications
-    """
+    """A wrapper for Form Notifications."""
 
     # Support
     # - file*
@@ -72,28 +61,29 @@ class NotifyForm(NotifyBase):
     # - file
     # The code will convert the ? or * to the digit increments
     __attach_as_re = re.compile(
-        r'((?P<match1>(?P<id1a>[a-z0-9_-]+)?'
-        r'(?P<wc1>[*?+$:.%]+)(?P<id1b>[a-z0-9_-]+))'
-        r'|(?P<match2>(?P<id2>[a-z0-9_-]+)(?P<wc2>[*?+$:.%]?)))',
-        re.IGNORECASE)
+        r"((?P<match1>(?P<id1a>[a-z0-9_-]+)?"
+        r"(?P<wc1>[*?+$:.%]+)(?P<id1b>[a-z0-9_-]+))"
+        r"|(?P<match2>(?P<id2>[a-z0-9_-]+)(?P<wc2>[*?+$:.%]?)))",
+        re.IGNORECASE,
+    )
 
     # Our count
-    attach_as_count = '{:02d}'
+    attach_as_count = "{:02d}"
 
     # the default attach_as value
-    attach_as_default = f'file{attach_as_count}'
+    attach_as_default = f"file{attach_as_count}"
 
     # The default descriptive name associated with the Notification
-    service_name = 'Form'
+    service_name = "Form"
 
     # The default protocol
-    protocol = 'form'
+    protocol = "form"
 
     # The default secure protocol
-    secure_protocol = 'forms'
+    secure_protocol = "forms"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_Custom_Form'
+    setup_url = "https://appriseit.com/services/form/"
 
     # Support attachments
     attachment_support = True
@@ -109,97 +99,110 @@ class NotifyForm(NotifyBase):
     # Version: Major.Minor,  Major is only updated if the entire schema is
     # changed. If just adding new items (or removing old ones, only increment
     # the Minor!
-    form_version = '1.0'
+    form_version = "1.0"
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{user}@{host}',
-        '{schema}://{user}@{host}:{port}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{user}@{host}",
+        "{schema}://{user}@{host}:{port}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
     )
 
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'method': {
-            'name': _('Fetch Method'),
-            'type': 'choice:string',
-            'values': METHODS,
-            'default': METHODS[0],
-        },
-        'attach-as': {
-            'name': _('Attach File As'),
-            'type': 'string',
-            'default': 'file*',
-            'map_to': 'attach_as',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "method": {
+                "name": _("Fetch Method"),
+                "type": "choice:string",
+                "values": METHODS,
+                "default": METHODS[0],
+            },
+            "attach-as": {
+                "name": _("Attach File As"),
+                "type": "string",
+                "default": "file*",
+                "map_to": "attach_as",
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
-        'payload': {
-            'name': _('Payload Extras'),
-            'prefix': ':',
+        "payload": {
+            "name": _("Payload Extras"),
+            "prefix": ":",
         },
-        'params': {
-            'name': _('GET Params'),
-            'prefix': '-',
+        "params": {
+            "name": _("GET Params"),
+            "prefix": "-",
         },
     }
 
-    def __init__(self, headers=None, method=None, payload=None, params=None,
-                 attach_as=None, **kwargs):
-        """
-        Initialize Form Object
+    def __init__(
+        self,
+        headers=None,
+        method=None,
+        payload=None,
+        params=None,
+        attach_as=None,
+        **kwargs,
+    ):
+        """Initialize Form Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = ''
+            self.fullpath = ""
 
-        self.method = self.template_args['method']['default'] \
-            if not isinstance(method, str) else method.upper()
+        self.method = (
+            self.template_args["method"]["default"]
+            if not isinstance(method, str)
+            else method.upper()
+        )
 
         if self.method not in METHODS:
-            msg = 'The method specified ({}) is invalid.'.format(method)
+            msg = f"The method specified ({method}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -212,24 +215,23 @@ def __init__(self, headers=None, method=None, payload=None, params=None,
         else:
             result = self.__attach_as_re.match(attach_as.strip())
             if not result:
-                msg = 'The attach-as specified ({}) is invalid.'.format(
-                    attach_as)
+                msg = f"The attach-as specified ({attach_as}) is invalid."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
-            self.attach_as = ''
+            self.attach_as = ""
             self.attach_multi_support = False
-            if result.group('match1'):
-                if result.group('id1a'):
-                    self.attach_as += result.group('id1a')
+            if result.group("match1"):
+                if result.group("id1a"):
+                    self.attach_as += result.group("id1a")
 
                 self.attach_as += self.attach_as_count
                 self.attach_multi_support = True
-                self.attach_as += result.group('id1b')
+                self.attach_as += result.group("id1b")
 
             else:  # result.group('match2'):
-                self.attach_as += result.group('id2')
-                if result.group('wc2'):
+                self.attach_as += result.group("id2")
+                if result.group("wc2"):
                     self.attach_as += self.attach_as_count
                     self.attach_multi_support = True
 
@@ -272,15 +274,19 @@ def __init__(self, headers=None, method=None, payload=None, params=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Form Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Form Notification."""
 
         # Prepare HTTP Headers
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Apply any/all header over-rides defined
@@ -294,40 +300,55 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     files.append((
-                        self.attach_as.format(no)
-                        if self.attach_multi_support else self.attach_as, (
-                            attachment.name
-                            if attachment.name else f'file{no:03}.dat',
-                            open(attachment.path, 'rb'),
-                            attachment.mimetype)
+                        (
+                            self.attach_as.format(no)
+                            if self.attach_multi_support
+                            else self.attach_as
+                        ),
+                        (
+                            (
+                                attachment.name
+                                if attachment.name
+                                else f"file{no:03}.dat"
+                            ),
+                            # file handle is safely closed in `finally`; inline
+                            # open is intentional
+                            open(attachment.path, "rb"),  # noqa: SIM115
+                            attachment.mimetype,
+                        ),
                     ))
 
-                except (OSError, IOError) as e:
+                except OSError as e:
                     self.logger.warning(
-                        'An I/O error occurred while opening {}.'.format(
-                            attachment.name if attachment else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                        "An I/O error occurred while opening {}.".format(
+                            attachment.name if attachment else "attachment"
+                        )
+                    )
+                    self.logger.debug(f"I/O Exception: {e!s}")
                     return False
 
             if not self.attach_multi_support and no > 1:
                 self.logger.warning(
-                    'Multiple attachments provided while '
-                    'form:// Multi-Attachment Support not enabled')
+                    "Multiple attachments provided while "
+                    "form:// Multi-Attachment Support not enabled"
+                )
 
         # prepare Form Object
         payload = {}
 
         for key, value in (
-                (FORMPayloadField.VERSION, self.form_version),
-                (FORMPayloadField.TITLE, title),
-                (FORMPayloadField.MESSAGE, body),
-                (FORMPayloadField.MESSAGETYPE, notify_type)):
+            (FORMPayloadField.VERSION, self.form_version),
+            (FORMPayloadField.TITLE, title),
+            (FORMPayloadField.MESSAGE, body),
+            (FORMPayloadField.MESSAGETYPE, notify_type.value),
+        ):
 
             if not self.payload_map[key]:
                 # Do not store element in payload response
@@ -342,36 +363,37 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         url += self.fullpath
 
-        self.logger.debug('Form %s URL: %s (cert_verify=%r)' % (
-            self.method, url, self.verify_certificate,
-        ))
-        self.logger.debug('Form Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Form {self.method} URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Form Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
 
-        if self.method == 'GET':
+        if self.method == "GET":
             method = requests.get
             payload.update(self.params)
 
-        elif self.method == 'PUT':
+        elif self.method == "PUT":
             method = requests.put
 
-        elif self.method == 'PATCH':
+        elif self.method == "PATCH":
             method = requests.patch
 
-        elif self.method == 'DELETE':
+        elif self.method == "DELETE":
             method = requests.delete
 
-        elif self.method == 'HEAD':
+        elif self.method == "HEAD":
             method = requests.head
 
         else:  # POST
@@ -380,9 +402,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         try:
             r = method(
                 url,
-                files=None if not files else files,
-                data=payload if self.method != 'GET' else None,
-                params=payload if self.method == 'GET' else self.params,
+                files=files if files else None,
+                data=payload if self.method != "GET" else None,
+                params=payload if self.method == "GET" else self.params,
                 headers=headers,
                 auth=auth,
                 verify=self.verify_certificate,
@@ -390,38 +412,43 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             )
             if r.status_code < 200 or r.status_code >= 300:
                 # We had a problem
-                status_str = \
-                    NotifyForm.http_response_code_lookup(r.status_code)
+                status_str = NotifyForm.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Form %s notification: %s%serror=%s.',
+                    "Failed to send Form %s notification: %s%serror=%s.",
                     self.method,
                     status_str,
-                    ', ' if status_str else '',
-                    str(r.status_code))
+                    ", " if status_str else "",
+                    r.status_code,
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Form %s notification.', self.method)
+                self.logger.info("Sent Form %s notification.", self.method)
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Form '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Form "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while reading one of the '
-                'attached files.')
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while reading one of the "
+                "attached files."
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return False
 
         finally:
@@ -433,107 +460,114 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
-            self.fullpath.rstrip('/'),
+            self.fullpath.rstrip("/"),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'method': self.method,
+            "method": self.method,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Append our GET params into our parameters
-        params.update({'-{}'.format(k): v for k, v in self.params.items()})
+        params.update({f"-{k}": v for k, v in self.params.items()})
 
         # Append our payload extra's into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.payload_extras.items()})
-        params.update(
-            {':{}'.format(k): v for k, v in self.payload_overrides.items()})
+        params.update({f":{k}": v for k, v in self.payload_extras.items()})
+        params.update({f":{k}": v for k, v in self.payload_overrides.items()})
 
         if self.attach_as != self.attach_as_default:
             # Provide Attach-As extension details
-            params['attach-as'] = self.attach_as
+            params["attach-as"] = self.attach_as
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyForm.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyForm.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyForm.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyForm.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}{fullpath}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=NotifyForm.quote(self.fullpath, safe='/')
-            if self.fullpath else '/',
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=(
+                NotifyForm.quote(self.fullpath, safe="/")
+                if self.fullpath
+                else "/"
+            ),
             params=NotifyForm.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # store any additional payload extra's defined
-        results['payload'] = {NotifyForm.unquote(x): NotifyForm.unquote(y)
-                              for x, y in results['qsd:'].items()}
+        results["payload"] = {
+            NotifyForm.unquote(x): NotifyForm.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {NotifyForm.unquote(x): NotifyForm.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyForm.unquote(x): NotifyForm.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Add our GET paramters in the event the user wants to pass these along
-        results['params'] = {NotifyForm.unquote(x): NotifyForm.unquote(y)
-                             for x, y in results['qsd-'].items()}
+        results["params"] = {
+            NotifyForm.unquote(x): NotifyForm.unquote(y)
+            for x, y in results["qsd-"].items()
+        }
 
         # Allow Attach-As Support which over-rides the name of the filename
         # posted with the form://
         # the default is file01, file02, file03, etc
-        if 'attach-as' in results['qsd'] and len(results['qsd']['attach-as']):
-            results['attach_as'] = results['qsd']['attach-as']
+        if "attach-as" in results["qsd"] and len(results["qsd"]["attach-as"]):
+            results["attach_as"] = results["qsd"]["attach-as"]
 
         # Set method if not otherwise set
-        if 'method' in results['qsd'] and len(results['qsd']['method']):
-            results['method'] = NotifyForm.unquote(results['qsd']['method'])
+        if "method" in results["qsd"] and len(results["qsd"]["method"]):
+            results["method"] = NotifyForm.unquote(results["qsd"]["method"])
 
         return results
diff --git a/libs/apprise/plugins/custom_json.py b/libs/apprise/plugins/custom_json.py
index bd232f6e95..3a7c8dc162 100644
--- a/libs/apprise/plugins/custom_json.py
+++ b/libs/apprise/plugins/custom_json.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,55 +25,47 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import requests
 from json import dumps
+import logging
+
+import requests
 
 from .. import exception
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyType
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 
 class JSONPayloadField:
-    """
-    Identifies the fields available in the JSON Payload
-    """
-    VERSION = 'version'
-    TITLE = 'title'
-    MESSAGE = 'message'
-    ATTACHMENTS = 'attachments'
-    MESSAGETYPE = 'type'
+    """Identifies the fields available in the JSON Payload."""
+
+    VERSION = "version"
+    TITLE = "title"
+    MESSAGE = "message"
+    ATTACHMENTS = "attachments"
+    MESSAGETYPE = "type"
 
 
 # Defines the method to send the notification
-METHODS = (
-    'POST',
-    'GET',
-    'DELETE',
-    'PUT',
-    'HEAD',
-    'PATCH'
-)
+METHODS = ("POST", "GET", "DELETE", "PUT", "HEAD", "PATCH")
 
 
 class NotifyJSON(NotifyBase):
-    """
-    A wrapper for JSON Notifications
-    """
+    """A wrapper for JSON Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'JSON'
+    service_name = "JSON"
 
     # The default protocol
-    protocol = 'json'
+    protocol = "json"
 
     # The default secure protocol
-    secure_protocol = 'jsons'
+    secure_protocol = "jsons"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_Custom_JSON'
+    setup_url = "https://appriseit.com/services/json/"
 
     # Support attachments
     attachment_support = True
@@ -90,91 +81,98 @@ class NotifyJSON(NotifyBase):
     # Version: Major.Minor,  Major is only updated if the entire schema is
     # changed. If just adding new items (or removing old ones, only increment
     # the Minor!
-    json_version = '1.0'
+    json_version = "1.0"
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{user}@{host}',
-        '{schema}://{user}@{host}:{port}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{user}@{host}",
+        "{schema}://{user}@{host}:{port}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
     )
 
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'method': {
-            'name': _('Fetch Method'),
-            'type': 'choice:string',
-            'values': METHODS,
-            'default': METHODS[0],
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "method": {
+                "name": _("Fetch Method"),
+                "type": "choice:string",
+                "values": METHODS,
+                "default": METHODS[0],
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
-        'payload': {
-            'name': _('Payload Extras'),
-            'prefix': ':',
+        "payload": {
+            "name": _("Payload Extras"),
+            "prefix": ":",
         },
-        'params': {
-            'name': _('GET Params'),
-            'prefix': '-',
+        "params": {
+            "name": _("GET Params"),
+            "prefix": "-",
         },
     }
 
-    def __init__(self, headers=None, method=None, payload=None, params=None,
-                 **kwargs):
-        """
-        Initialize JSON Object
+    def __init__(
+        self, headers=None, method=None, payload=None, params=None, **kwargs
+    ):
+        """Initialize JSON Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = ''
+            self.fullpath = ""
 
-        self.method = self.template_args['method']['default'] \
-            if not isinstance(method, str) else method.upper()
+        self.method = (
+            self.template_args["method"]["default"]
+            if not isinstance(method, str)
+            else method.upper()
+        )
 
         if self.method not in METHODS:
-            msg = 'The method specified ({}) is invalid.'.format(method)
+            msg = f"The method specified ({method}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -195,16 +193,20 @@ def __init__(self, headers=None, method=None, payload=None, params=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform JSON Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform JSON Notification."""
 
         # Prepare HTTP Headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json'
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Apply any/all header over-rides defined
@@ -218,28 +220,34 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Custom JSON attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Custom JSON attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     attachments.append({
-                        "filename": attachment.name
-                        if attachment.name else f'file{no:03}.dat',
-                        'base64': attachment.base64(),
-                        'mimetype': attachment.mimetype,
+                        "filename": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
+                        "base64": attachment.base64(),
+                        "mimetype": attachment.mimetype,
                     })
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Custom JSON attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Custom JSON attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending Custom JSON attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending Custom JSON attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         # Prepare JSON Object
         payload = {
@@ -247,7 +255,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             JSONPayloadField.TITLE: title,
             JSONPayloadField.MESSAGE: body,
             JSONPayloadField.ATTACHMENTS: attachments,
-            JSONPayloadField.MESSAGETYPE: notify_type,
+            JSONPayloadField.MESSAGETYPE: notify_type.value,
         }
 
         for key, value in self.payload_extras.items():
@@ -271,35 +279,41 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         url += self.fullpath
 
-        self.logger.debug('JSON POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('JSON Payload: %s' % str(payload))
+        # Some Debug Logging
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                f"JSON POST URL: {url} "
+                f"(cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug("JSON Payload: %s", sanitize_payload(payload))
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
 
-        if self.method == 'GET':
+        if self.method == "GET":
             method = requests.get
 
-        elif self.method == 'PUT':
+        elif self.method == "PUT":
             method = requests.put
 
-        elif self.method == 'PATCH':
+        elif self.method == "PATCH":
             method = requests.patch
 
-        elif self.method == 'DELETE':
+        elif self.method == "DELETE":
             method = requests.delete
 
-        elif self.method == 'HEAD':
+        elif self.method == "HEAD":
             method = requests.head
 
         else:  # POST
@@ -317,29 +331,33 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             )
             if r.status_code < 200 or r.status_code >= 300:
                 # We had a problem
-                status_str = \
-                    NotifyJSON.http_response_code_lookup(r.status_code)
+                status_str = NotifyJSON.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send JSON %s notification: %s%serror=%s.',
+                    "Failed to send JSON %s notification: %s%serror=%s.",
                     self.method,
                     status_str,
-                    ', ' if status_str else '',
-                    str(r.status_code))
+                    ", " if status_str else "",
+                    r.status_code,
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent JSON %s notification.', self.method)
+                self.logger.info("Sent JSON %s notification.", self.method)
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending JSON '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending JSON "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -348,95 +366,103 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
-            self.fullpath.rstrip('/'),
+            self.fullpath.rstrip("/"),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'method': self.method,
+            "method": self.method,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Append our GET params into our parameters
-        params.update({'-{}'.format(k): v for k, v in self.params.items()})
+        params.update({f"-{k}": v for k, v in self.params.items()})
 
         # Append our payload extra's into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.payload_extras.items()})
+        params.update({f":{k}": v for k, v in self.payload_extras.items()})
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyJSON.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyJSON.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyJSON.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyJSON.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}{fullpath}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=NotifyJSON.quote(self.fullpath, safe='/')
-            if self.fullpath else '/',
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=(
+                NotifyJSON.quote(self.fullpath, safe="/")
+                if self.fullpath
+                else "/"
+            ),
             params=NotifyJSON.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # store any additional payload extra's defined
-        results['payload'] = {NotifyJSON.unquote(x): NotifyJSON.unquote(y)
-                              for x, y in results['qsd:'].items()}
+        results["payload"] = {
+            NotifyJSON.unquote(x): NotifyJSON.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {NotifyJSON.unquote(x): NotifyJSON.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyJSON.unquote(x): NotifyJSON.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Add our GET paramters in the event the user wants to pass these along
-        results['params'] = {NotifyJSON.unquote(x): NotifyJSON.unquote(y)
-                             for x, y in results['qsd-'].items()}
+        results["params"] = {
+            NotifyJSON.unquote(x): NotifyJSON.unquote(y)
+            for x, y in results["qsd-"].items()
+        }
 
         # Set method if not otherwise set
-        if 'method' in results['qsd'] and len(results['qsd']['method']):
-            results['method'] = NotifyJSON.unquote(results['qsd']['method'])
+        if "method" in results["qsd"] and len(results["qsd"]["method"]):
+            results["method"] = NotifyJSON.unquote(results["qsd"]["method"])
 
         return results
diff --git a/libs/apprise/plugins/custom_xml.py b/libs/apprise/plugins/custom_xml.py
index ba062f1102..9cbcbcc36f 100644
--- a/libs/apprise/plugins/custom_xml.py
+++ b/libs/apprise/plugins/custom_xml.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,54 +25,46 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import logging
 import re
+
 import requests
 
 from .. import exception
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyType
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 
 class XMLPayloadField:
-    """
-    Identifies the fields available in the JSON Payload
-    """
-    VERSION = 'Version'
-    TITLE = 'Subject'
-    MESSAGE = 'Message'
-    MESSAGETYPE = 'MessageType'
+    """Identifies the fields available in the JSON Payload."""
+
+    VERSION = "Version"
+    TITLE = "Subject"
+    MESSAGE = "Message"
+    MESSAGETYPE = "MessageType"
 
 
 # Defines the method to send the notification
-METHODS = (
-    'POST',
-    'GET',
-    'DELETE',
-    'PUT',
-    'HEAD',
-    'PATCH'
-)
+METHODS = ("POST", "GET", "DELETE", "PUT", "HEAD", "PATCH")
 
 
 class NotifyXML(NotifyBase):
-    """
-    A wrapper for XML Notifications
-    """
+    """A wrapper for XML Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'XML'
+    service_name = "XML"
 
     # The default protocol
-    protocol = 'xml'
+    protocol = "xml"
 
     # The default secure protocol
-    secure_protocol = 'xmls'
+    secure_protocol = "xmls"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_Custom_XML'
+    setup_url = "https://appriseit.com/services/xml/"
 
     # Support attachments
     attachment_support = True
@@ -86,82 +77,87 @@ class NotifyXML(NotifyBase):
     request_rate_per_sec = 0
 
     # XSD Information
-    xsd_ver = '1.1'
-    xsd_default_url = \
-        'https://raw.githubusercontent.com/caronc/apprise/master' \
-        '/apprise/assets/NotifyXML-{version}.xsd'
+    xsd_ver = "1.1"
+    xsd_default_url = (
+        "https://raw.githubusercontent.com/caronc/apprise/master"
+        "/apprise/assets/NotifyXML-{version}.xsd"
+    )
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{user}@{host}',
-        '{schema}://{user}@{host}:{port}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{user}@{host}",
+        "{schema}://{user}@{host}:{port}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
     )
 
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'method': {
-            'name': _('Fetch Method'),
-            'type': 'choice:string',
-            'values': METHODS,
-            'default': METHODS[0],
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "method": {
+                "name": _("Fetch Method"),
+                "type": "choice:string",
+                "values": METHODS,
+                "default": METHODS[0],
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
-        'payload': {
-            'name': _('Payload Extras'),
-            'prefix': ':',
+        "payload": {
+            "name": _("Payload Extras"),
+            "prefix": ":",
         },
-        'params': {
-            'name': _('GET Params'),
-            'prefix': '-',
+        "params": {
+            "name": _("GET Params"),
+            "prefix": "-",
         },
     }
 
-    def __init__(self, headers=None, method=None, payload=None, params=None,
-                 **kwargs):
-        """
-        Initialize XML Object
+    def __init__(
+        self, headers=None, method=None, payload=None, params=None, **kwargs
+    ):
+        """Initialize XML Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
@@ -178,15 +174,18 @@ def __init__(self, headers=None, method=None, payload=None, params=None,
     </soapenv:Body>
 </soapenv:Envelope>"""
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = ''
+            self.fullpath = ""
 
-        self.method = self.template_args['method']['default'] \
-            if not isinstance(method, str) else method.upper()
+        self.method = (
+            self.template_args["method"]["default"]
+            if not isinstance(method, str)
+            else method.upper()
+        )
 
         if self.method not in METHODS:
-            msg = 'The method specified ({}) is invalid.'.format(method)
+            msg = f"The method specified ({method}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -218,11 +217,11 @@ def __init__(self, headers=None, method=None, payload=None, params=None,
             # Store our extra payload entries (but tidy them up since they will
             # become XML Keys (they can't contain certain characters
             for k, v in payload.items():
-                key = re.sub(r'[^A-Za-z0-9_-]*', '', k)
+                key = re.sub(r"[^A-Za-z0-9_-]*", "", k)
                 if not key:
                     self.logger.warning(
-                        'Ignoring invalid XML Stanza element name({})'
-                        .format(k))
+                        f"Ignoring invalid XML Stanza element name({k})"
+                    )
                     continue
 
                 # Any values set in the payload to alter a system related one
@@ -237,39 +236,53 @@ def __init__(self, headers=None, method=None, payload=None, params=None,
                     self.payload_extras[key] = v
 
         # Set our xsd url
-        self.xsd_url = None if self.payload_overrides or self.payload_extras \
+        self.xsd_url = (
+            None
+            if self.payload_overrides or self.payload_extras
             else self.xsd_default_url.format(version=self.xsd_ver)
+        )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform XML Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform XML Notification."""
 
         # Prepare HTTP Headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/xml'
+            "User-Agent": self.app_id,
+            "Content-Type": "application/xml",
         }
 
         # Apply any/all header over-rides defined
         headers.update(self.headers)
 
         # Our XML Attachmement subsitution
-        xml_attachments = ''
+        xml_attachments = ""
 
         payload_base = {}
 
         for key, value in (
-                (XMLPayloadField.VERSION, self.xsd_ver),
-                (XMLPayloadField.TITLE, NotifyXML.escape_html(
-                    title, whitespace=False)),
-                (XMLPayloadField.MESSAGE, NotifyXML.escape_html(
-                    body, whitespace=False)),
-                (XMLPayloadField.MESSAGETYPE, NotifyXML.escape_html(
-                    notify_type, whitespace=False))):
+            (XMLPayloadField.VERSION, self.xsd_ver),
+            (
+                XMLPayloadField.TITLE,
+                NotifyXML.escape_html(title, whitespace=False),
+            ),
+            (
+                XMLPayloadField.MESSAGE,
+                NotifyXML.escape_html(body, whitespace=False),
+            ),
+            (
+                XMLPayloadField.MESSAGETYPE,
+                NotifyXML.escape_html(notify_type.value, whitespace=False),
+            ),
+        ):
 
             if not self.payload_map[key]:
                 # Do not store element in payload response
@@ -277,13 +290,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             payload_base[self.payload_map[key]] = value
 
         # Apply our payload extras
-        payload_base.update(
-            {k: NotifyXML.escape_html(v, whitespace=False)
-                for k, v in self.payload_extras.items()})
+        payload_base.update({
+            k: NotifyXML.escape_html(v, whitespace=False)
+            for k, v in self.payload_extras.items()
+        })
 
         # Base Entres
-        xml_base = ''.join(
-            ['<{}>{}</{}>'.format(k, v, k) for k, v in payload_base.items()])
+        xml_base = "".join(
+            [f"<{k}>{v}</{k}>" for k, v in payload_base.items()]
+        )
 
         attachments = []
         if attach and self.attachment_support:
@@ -292,49 +307,61 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Custom XML attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Custom XML attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     # Prepare our Attachment in Base64
-                    entry = \
-                        '<Attachment filename="{}" mimetype="{}">'.format(
-                            NotifyXML.escape_html(
-                                attachment.name if attachment.name
-                                else f'file{no:03}.dat', whitespace=False),
-                            NotifyXML.escape_html(
-                                attachment.mimetype, whitespace=False))
+                    entry = '<Attachment filename="{}" mimetype="{}">'.format(
+                        NotifyXML.escape_html(
+                            (
+                                attachment.name
+                                if attachment.name
+                                else f"file{no:03}.dat"
+                            ),
+                            whitespace=False,
+                        ),
+                        NotifyXML.escape_html(
+                            attachment.mimetype, whitespace=False
+                        ),
+                    )
                     entry += attachment.base64()
-                    entry += '</Attachment>'
+                    entry += "</Attachment>"
                     attachments.append(entry)
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Custom XML attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Custom XML attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending Custom XML attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending Custom XML attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
             # Update our xml_attachments record:
-            xml_attachments = \
-                '<Attachments format="base64">' + \
-                ''.join(attachments) + '</Attachments>'
+            xml_attachments = (
+                '<Attachments format="base64">'
+                + "".join(attachments)
+                + "</Attachments>"
+            )
 
         re_map = {
-            '{{XSD_URL}}':
-            f' xmlns:xsi="{self.xsd_url}"' if self.xsd_url else '',
-            '{{ATTACHMENTS}}': xml_attachments,
-            '{{CORE}}': xml_base,
+            "{{XSD_URL}}": (
+                f' xmlns:xsi="{self.xsd_url}"' if self.xsd_url else ""
+            ),
+            "{{ATTACHMENTS}}": xml_attachments,
+            "{{CORE}}": xml_base,
         }
 
         # Iterate over above list and store content accordingly
         re_table = re.compile(
-            r'(' + '|'.join(re_map.keys()) + r')',
+            r"(" + "|".join(re_map.keys()) + r")",
             re.IGNORECASE,
         )
 
@@ -343,37 +370,43 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         url += self.fullpath
         payload = re_table.sub(lambda x: re_map[x.group()], self.payload)
 
-        self.logger.debug('XML POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-
-        self.logger.debug('XML Payload: %s' % str(payload))
+        # Some Debug Logging
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                f"XML POST URL: {url} "
+                f"(cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(
+                "XML Payload: %s", sanitize_payload(payload))
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
 
-        if self.method == 'GET':
+        if self.method == "GET":
             method = requests.get
 
-        elif self.method == 'PUT':
+        elif self.method == "PUT":
             method = requests.put
 
-        elif self.method == 'PATCH':
+        elif self.method == "PATCH":
             method = requests.patch
 
-        elif self.method == 'DELETE':
+        elif self.method == "DELETE":
             method = requests.delete
 
-        elif self.method == 'HEAD':
+        elif self.method == "HEAD":
             method = requests.head
 
         else:  # POST
@@ -390,29 +423,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             )
             if r.status_code < 200 or r.status_code >= 300:
                 # We had a problem
-                status_str = \
-                    NotifyXML.http_response_code_lookup(r.status_code)
+                status_str = NotifyXML.http_response_code_lookup(r.status_code)
 
                 self.logger.warning(
-                    'Failed to send JSON %s notification: %s%serror=%s.',
+                    "Failed to send JSON %s notification: %s%serror=%s.",
                     self.method,
                     status_str,
-                    ', ' if status_str else '',
-                    str(r.status_code))
+                    ", " if status_str else "",
+                    r.status_code,
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent XML %s notification.', self.method)
+                self.logger.info("Sent XML %s notification.", self.method)
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending XML '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending XML "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -421,97 +456,104 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
-            self.fullpath.rstrip('/'),
+            self.fullpath.rstrip("/"),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'method': self.method,
+            "method": self.method,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Append our GET params into our parameters
-        params.update({'-{}'.format(k): v for k, v in self.params.items()})
+        params.update({f"-{k}": v for k, v in self.params.items()})
 
         # Append our payload extra's into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.payload_extras.items()})
-        params.update(
-            {':{}'.format(k): v for k, v in self.payload_overrides.items()})
+        params.update({f":{k}": v for k, v in self.payload_extras.items()})
+        params.update({f":{k}": v for k, v in self.payload_overrides.items()})
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyXML.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyXML.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyXML.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyXML.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}{fullpath}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=NotifyXML.quote(self.fullpath, safe='/')
-            if self.fullpath else '/',
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=(
+                NotifyXML.quote(self.fullpath, safe="/")
+                if self.fullpath
+                else "/"
+            ),
             params=NotifyXML.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # store any additional payload extra's defined
-        results['payload'] = {NotifyXML.unquote(x): NotifyXML.unquote(y)
-                              for x, y in results['qsd:'].items()}
+        results["payload"] = {
+            NotifyXML.unquote(x): NotifyXML.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {NotifyXML.unquote(x): NotifyXML.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyXML.unquote(x): NotifyXML.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Add our GET paramters in the event the user wants to pass these along
-        results['params'] = {NotifyXML.unquote(x): NotifyXML.unquote(y)
-                             for x, y in results['qsd-'].items()}
+        results["params"] = {
+            NotifyXML.unquote(x): NotifyXML.unquote(y)
+            for x, y in results["qsd-"].items()
+        }
 
         # Set method if not otherwise set
-        if 'method' in results['qsd'] and len(results['qsd']['method']):
-            results['method'] = NotifyXML.unquote(results['qsd']['method'])
+        if "method" in results["qsd"] and len(results["qsd"]["method"]):
+            results["method"] = NotifyXML.unquote(results["qsd"]["method"])
 
         return results
diff --git a/libs/apprise/plugins/d7networks.py b/libs/apprise/plugins/d7networks.py
index cdc7e815e5..3d4b6a4d54 100644
--- a/libs/apprise/plugins/d7networks.py
+++ b/libs/apprise/plugins/d7networks.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,48 +34,50 @@
 #
 # API Reference: https://d7networks.com/docs/Messages/Send_Message/
 
+from json import dumps, loads
+
 import requests
-from json import dumps
-from json import loads
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import (
-    is_phone_no, parse_phone_no, validate_regex, parse_bool)
 from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 D7NETWORKS_HTTP_ERROR_MAP = {
-    401: 'Invalid Argument(s) Specified.',
-    403: 'Unauthorized - Authentication Failure.',
-    412: 'A Routing Error Occured',
-    500: 'A Serverside Error Occured Handling the Request.',
+    401: "Invalid Argument(s) Specified.",
+    403: "Unauthorized - Authentication Failure.",
+    412: "A Routing Error Occured",
+    500: "A Serverside Error Occured Handling the Request.",
 }
 
 
 class NotifyD7Networks(NotifyBase):
-    """
-    A wrapper for D7 Networks Notifications
-    """
+    """A wrapper for D7 Networks Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'D7 Networks'
+    service_name = "D7 Networks"
 
     # The services URL
-    service_url = 'https://d7networks.com/'
+    service_url = "https://d7networks.com/"
 
     # All notification requests are secure
-    secure_protocol = 'd7sms'
+    secure_protocol = "d7sms"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_d7networks'
+    setup_url = "https://appriseit.com/services/d7networks/"
 
     # D7 Networks single notification URL
-    notify_url = 'https://api.d7networks.com/messages/v1/send'
+    notify_url = "https://api.d7networks.com/messages/v1/send"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -86,115 +87,122 @@ class NotifyD7Networks(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{token}@{targets}',
-    )
+    templates = ("{schema}://{token}@{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('API Access Token'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("API Access Token"),
+                "type": "string",
+                "required": True,
+                "private": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'unicode': {
-            # Unicode characters (default is 'auto')
-            'name': _('Unicode Characters'),
-            'type': 'bool',
-            'default': False,
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'source': {
-            # Originating address,In cases where the rewriting of the sender's
-            # address is supported or permitted by the SMS-C. This is used to
-            # transmit the message, this number is transmitted as the
-            # originating address and is completely optional.
-            'name': _('Originating Address'),
-            'type': 'string',
-            'map_to': 'source',
-
-        },
-        'from': {
-            'alias_of': 'source',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "unicode": {
+                # Unicode characters (default is 'auto')
+                "name": _("Unicode Characters"),
+                "type": "bool",
+                "default": False,
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "source": {
+                # Originating address,In cases where the rewriting of the
+                # sender's address is supported or permitted by the SMS-C.
+                # This is used to transmit the message, this number is
+                # transmitted as the originating address and is completely
+                # optional.
+                "name": _("Originating Address"),
+                "type": "string",
+                "map_to": "source",
+            },
+            "from": {
+                "alias_of": "source",
+            },
         },
-    })
+    )
 
-    def __init__(self, token=None, targets=None, source=None,
-                 batch=False, unicode=None, **kwargs):
-        """
-        Initialize D7 Networks Object
-        """
+    def __init__(
+        self,
+        token=None,
+        targets=None,
+        source=None,
+        batch=False,
+        unicode=None,
+        **kwargs,
+    ):
+        """Initialize D7 Networks Object."""
         super().__init__(**kwargs)
 
         # Prepare Batch Mode Flag
         self.batch = batch
 
         # Setup our source address (if defined)
-        self.source = None \
-            if not isinstance(source, str) else source.strip()
+        self.source = None if not isinstance(source, str) else source.strip()
 
         # Define whether or not we should set the unicode flag
-        self.unicode = self.template_args['unicode']['default'] \
-            if unicode is None else bool(unicode)
+        self.unicode = (
+            self.template_args["unicode"]["default"]
+            if unicode is None
+            else bool(unicode)
+        )
 
         # The token associated with the account
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'The D7 Networks token specified ({}) is invalid.'\
-                .format(token)
+            msg = f"The D7 Networks token specified ({token}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Depending on whether we are set to batch mode or single mode this
-        redirects to the appropriate handling
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Depending on whether we are set to batch mode or single mode this
+        redirects to the appropriate handling."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no D7 Networks targets to notify.')
+            self.logger.warning("There were no D7 Networks targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -202,24 +210,24 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
-            'Authorization': f'Bearer {self.token}',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
         }
 
         payload = {
-            'message_globals': {
-                'channel': 'sms',
+            "message_globals": {
+                "channel": "sms",
             },
-            'messages': [{
+            "messages": [{
                 # Populated later on
-                'recipients': None,
-                'content': body,
-                'data_coding':
+                "recipients": None,
+                "content": body,
+                "data_coding":
                 # auto is a better substitute over 'text' as text is easier to
                 # detect from a post than `unicode` is.
-                'auto' if not self.unicode else 'unicode',
+                "auto" if not self.unicode else "unicode",
             }],
         }
 
@@ -227,14 +235,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         targets = list(self.targets)
 
         if self.source:
-            payload['message_globals']['originator'] = self.source
+            payload["message_globals"]["originator"] = self.source
 
         target = None
         while len(targets):
 
             if self.batch:
                 # Prepare our payload
-                payload['messages'][0]['recipients'] = self.targets
+                payload["messages"][0]["recipients"] = self.targets
 
                 # Reset our targets so we don't keep going. This is required
                 # because we're in batch mode; we only need to loop once.
@@ -246,13 +254,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 target = targets.pop(0)
 
                 # Prepare our payload
-                payload['messages'][0]['recipients'] = [target]
+                payload["messages"][0]["recipients"] = [target]
 
             # Some Debug Logging
             self.logger.debug(
-                'D7 Networks POST URL: {} (cert_verify={})'.format(
-                    self.notify_url, self.verify_certificate))
-            self.logger.debug('D7 Networks Payload: {}' .format(payload))
+                "D7 Networks POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"D7 Networks Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -266,16 +275,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
 
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(
-                            r.status_code, D7NETWORKS_HTTP_ERROR_MAP)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code, D7NETWORKS_HTTP_ERROR_MAP
+                    )
 
                     try:
                         # Update our status response if we can
                         json_response = loads(r.content)
-                        status_str = json_response.get('message', status_str)
+                        status_str = json_response.get("message", status_str)
 
                     except (AttributeError, TypeError, ValueError):
                         # ValueError = r.content is Unparsable
@@ -287,15 +298,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         pass
 
                     self.logger.warning(
-                        'Failed to send D7 Networks SMS notification to {}: '
-                        '{}{}error={}.'.format(
-                            ', '.join(target) if self.batch else target,
+                        "Failed to send D7 Networks SMS notification to {}: "
+                        "{}{}error={}.".format(
+                            ", ".join(target) if self.batch else target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -305,23 +318,24 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                     if self.batch:
                         self.logger.info(
-                            'Sent D7 Networks batch SMS notification to '
-                            '{} target(s).'.format(len(self.targets)))
+                            "Sent D7 Networks batch SMS notification to "
+                            f"{len(self.targets)} target(s)."
+                        )
 
                     else:
                         self.logger.info(
-                            'Sent D7 Networks SMS notification to {}.'.format(
-                                target))
+                            f"Sent D7 Networks SMS notification to {target}."
+                        )
 
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                    self.logger.debug(f"Response Details:\r\n{r.content}")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending D7 Networks:%s ' % (
-                        ', '.join(self.targets)) + 'notification.'
+                    "A Connection error occurred sending D7 Networks:{} "
+                    .format(", ".join(self.targets))
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
                 # Mark our failure
                 has_error = True
                 continue
@@ -329,42 +343,40 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
-            'unicode': 'yes' if self.unicode else 'no',
+            "batch": "yes" if self.batch else "no",
+            "unicode": "yes" if self.unicode else "no",
         }
 
         if self.source:
-            params['from'] = self.source
+            params["from"] = self.source
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{token}@{targets}/?{params}'.format(
+        return "{schema}://{token}@{targets}/?{params}".format(
             schema=self.secure_protocol,
-            token=self.pprint(self.token, privacy, safe=''),
-            targets='/'.join(
-                [NotifyD7Networks.quote(x, safe='') for x in self.targets]),
-            params=NotifyD7Networks.urlencode(params))
+            token=self.pprint(self.token, privacy, safe=""),
+            targets="/".join(
+                [NotifyD7Networks.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyD7Networks.urlencode(params),
+        )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
@@ -372,65 +384,67 @@ def __len__(self):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = \
-                NotifyD7Networks.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyD7Networks.unquote(
+                results["qsd"]["token"]
+            )
 
-        elif results['user']:
-            results['token'] = NotifyD7Networks.unquote(results['user'])
+        elif results["user"]:
+            results["token"] = NotifyD7Networks.unquote(results["user"])
 
-            if results['password']:
+            if results["password"]:
                 # Support token containing a colon (:)
-                results['token'] += \
-                    ':' + NotifyD7Networks.unquote(results['password'])
+                results["token"] += ":" + NotifyD7Networks.unquote(
+                    results["password"]
+                )
 
-        elif results['password']:
+        elif results["password"]:
             # Support token starting with a colon (:)
-            results['token'] = \
-                ':' + NotifyD7Networks.unquote(results['password'])
+            results["token"] = ":" + NotifyD7Networks.unquote(
+                results["password"]
+            )
 
         # Initialize our targets
-        results['targets'] = list()
+        results["targets"] = []
 
         # The store our first target stored in the hostname
-        results['targets'].append(NotifyD7Networks.unquote(results['host']))
+        results["targets"].append(NotifyD7Networks.unquote(results["host"]))
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'].extend(
-            NotifyD7Networks.split_path(results['fullpath']))
+        results["targets"].extend(
+            NotifyD7Networks.split_path(results["fullpath"])
+        )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get('batch', False))
+        results["batch"] = parse_bool(results["qsd"].get("batch", False))
 
         # Get Unicode Flag
-        results['unicode'] = \
-            parse_bool(results['qsd'].get('unicode', False))
+        results["unicode"] = parse_bool(results["qsd"].get("unicode", False))
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyD7Networks.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyD7Networks.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Support the 'from' and source variable
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyD7Networks.unquote(results['qsd']['from'])
-
-        elif 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifyD7Networks.unquote(results['qsd']['source'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyD7Networks.unquote(
+                results["qsd"]["from"]
+            )
+
+        elif "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifyD7Networks.unquote(
+                results["qsd"]["source"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/dapnet.py b/libs/apprise/plugins/dapnet.py
index f117095c80..3325bc19e5 100644
--- a/libs/apprise/plugins/dapnet.py
+++ b/libs/apprise/plugins/dapnet.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -51,12 +50,11 @@
 import requests
 from requests.auth import HTTPBasicAuth
 
-from .base import NotifyBase
+from ..common import NotifyType
 from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyType
-from ..utils.parse import (
-    is_call_sign, parse_call_sign, parse_list, parse_bool)
+from ..utils.parse import is_call_sign, parse_bool, parse_call_sign, parse_list
+from .base import NotifyBase
 
 
 class DapnetPriority:
@@ -65,42 +63,39 @@ class DapnetPriority:
 
 
 DAPNET_PRIORITIES = {
-    DapnetPriority.NORMAL: 'normal',
-    DapnetPriority.EMERGENCY: 'emergency',
+    DapnetPriority.NORMAL: "normal",
+    DapnetPriority.EMERGENCY: "emergency",
 }
 
 
 DAPNET_PRIORITY_MAP = {
     # Maps against string 'normal'
-    'n': DapnetPriority.NORMAL,
+    "n": DapnetPriority.NORMAL,
     # Maps against string 'emergency'
-    'e': DapnetPriority.EMERGENCY,
-
+    "e": DapnetPriority.EMERGENCY,
     # Entries to additionally support (so more like Dapnet's API)
-    '0': DapnetPriority.NORMAL,
-    '1': DapnetPriority.EMERGENCY,
+    "0": DapnetPriority.NORMAL,
+    "1": DapnetPriority.EMERGENCY,
 }
 
 
 class NotifyDapnet(NotifyBase):
-    """
-    A wrapper for DAPNET / Hampager Notifications
-    """
+    """A wrapper for DAPNET / Hampager Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Dapnet'
+    service_name = "Dapnet"
 
     # The services URL
-    service_url = 'https://hampager.de/'
+    service_url = "https://hampager.de/"
 
     # The default secure protocol
-    secure_protocol = 'dapnet'
+    secure_protocol = "dapnet"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_dapnet'
+    setup_url = "https://appriseit.com/services/dapnet/"
 
     # Dapnet uses the http protocol with JSON requests
-    notify_url = 'http://www.hampager.de:8080/calls'
+    notify_url = "http://www.hampager.de:8080/calls"
 
     # The maximum length of the body
     body_maxlen = 80
@@ -113,96 +108,103 @@ class NotifyDapnet(NotifyBase):
     default_batch_size = 50
 
     # Define object templates
-    templates = ('{schema}://{user}:{password}@{targets}',)
+    templates = ("{schema}://{user}:{password}@{targets}",)
 
     # Define our template tokens
     template_tokens = dict(
         NotifyBase.template_tokens,
         **{
-            'user': {
-                'name': _('User Name'),
-                'type': 'string',
-                'required': True,
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
             },
-            'password': {
-                'name': _('Password'),
-                'type': 'string',
-                'private': True,
-                'required': True,
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
             },
-            'target_callsign': {
-                'name': _('Target Callsign'),
-                'type': 'string',
-                'regex': (
-                    r'^[a-z0-9]{2,5}(-[a-z0-9]{1,2})?$', 'i',
+            "target_callsign": {
+                "name": _("Target Callsign"),
+                "type": "string",
+                "regex": (
+                    r"^[a-z0-9]{2,5}(-[a-z0-9]{1,2})?$",
+                    "i",
                 ),
-                'map_to': 'targets',
+                "map_to": "targets",
             },
-            'targets': {
-                'name': _('Targets'),
-                'type': 'list:string',
-                'required': True,
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
             },
-        }
+        },
     )
 
     # Define our template arguments
     template_args = dict(
         NotifyBase.template_args,
         **{
-            'to': {
-                'name': _('Target Callsign'),
-                'type': 'string',
-                'map_to': 'targets',
+            "to": {
+                "name": _("Target Callsign"),
+                "type": "string",
+                "map_to": "targets",
             },
-            'priority': {
-                'name': _('Priority'),
-                'type': 'choice:int',
-                'values': DAPNET_PRIORITIES,
-                'default': DapnetPriority.NORMAL,
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": DAPNET_PRIORITIES,
+                "default": DapnetPriority.NORMAL,
             },
-            'txgroups': {
-                'name': _('Transmitter Groups'),
-                'type': 'string',
-                'default': 'dl-all',
-                'private': True,
+            "txgroups": {
+                "name": _("Transmitter Groups"),
+                "type": "string",
+                "default": "dl-all",
+                "private": True,
             },
-            'batch': {
-                'name': _('Batch Mode'),
-                'type': 'bool',
-                'default': False,
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
             },
-        }
+        },
     )
 
-    def __init__(self, targets=None, priority=None, txgroups=None,
-                 batch=False, **kwargs):
-        """
-        Initialize Dapnet Object
-        """
+    def __init__(
+        self, targets=None, priority=None, txgroups=None, batch=False, **kwargs
+    ):
+        """Initialize Dapnet Object."""
         super().__init__(**kwargs)
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         # The Priority of the message
         self.priority = int(
-            NotifyDapnet.template_args['priority']['default']
-            if priority is None else
-            next((
-                v for k, v in DAPNET_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyDapnet.template_args['priority']['default']))
+            NotifyDapnet.template_args["priority"]["default"]
+            if priority is None
+            else next(
+                (
+                    v
+                    for k, v in DAPNET_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyDapnet.template_args["priority"]["default"],
+            )
+        )
 
         if not (self.user and self.password):
-            msg = 'A Dapnet user/pass was not provided.'
+            msg = "A Dapnet user/pass was not provided."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Get the transmitter group
         self.txgroups = parse_list(
-            NotifyDapnet.template_args['txgroups']['default']
-            if not txgroups else txgroups)
+            txgroups
+            if txgroups
+            else NotifyDapnet.template_args["txgroups"]["default"]
+        )
 
         # Prepare Batch Mode Flag
         self.batch = batch
@@ -212,34 +214,32 @@ def __init__(self, targets=None, priority=None, txgroups=None,
             result = is_call_sign(target)
             if not result:
                 self.logger.warning(
-                    'Dropping invalid Amateur radio call sign ({}).'.format(
-                        target),
+                    f"Dropping invalid Amateur radio call sign ({target}).",
                 )
                 continue
 
             # Store callsign without SSID and ignore duplicates
-            if result['callsign'] not in self.targets:
-                self.targets.append(result['callsign'])
+            if result["callsign"] not in self.targets:
+                self.targets.append(result["callsign"])
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Dapnet Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Dapnet Notification."""
 
         if not self.targets:
             # There is no one to email; we're done
             self.logger.warning(
-                'There are no Amateur radio callsigns to notify')
+                "There are no Amateur radio callsigns to notify"
+            )
             return False
 
         # Send in batches if identified to do so
         batch_size = 1 if not self.batch else self.default_batch_size
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json; charset=utf-8",
         }
 
         # error tracking (used for function return)
@@ -252,14 +252,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # prepare JSON payload
             payload = {
-                'text': body,
-                'callSignNames': targets[index:index + batch_size],
-                'transmitterGroupNames': self.txgroups,
-                'emergency': (self.priority == DapnetPriority.EMERGENCY),
+                "text": body,
+                "callSignNames": targets[index : index + batch_size],
+                "transmitterGroupNames": self.txgroups,
+                "emergency": self.priority == DapnetPriority.EMERGENCY,
             }
 
-            self.logger.debug('DAPNET POST URL: %s' % self.notify_url)
-            self.logger.debug('DAPNET Payload: %s' % dumps(payload))
+            self.logger.debug(f"DAPNET POST URL: {self.notify_url}")
+            self.logger.debug(f"DAPNET Payload: {dumps(payload)}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -269,7 +269,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     data=dumps(payload),
                     headers=headers,
                     auth=HTTPBasicAuth(
-                        username=self.user, password=self.password),
+                        username=self.user, password=self.password
+                    ),
                     verify=self.verify_certificate,
                     timeout=self.request_timeout,
                 )
@@ -277,33 +278,33 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     # We had a problem
 
                     self.logger.warning(
-                        'Failed to send DAPNET notification {} to {}: '
-                        'error={}.'.format(
-                            payload['text'],
-                            ' to {}'.format(self.targets),
-                            r.status_code
+                        "Failed to send DAPNET notification {} to {}: "
+                        "error={}.".format(
+                            payload["text"],
+                            f" to {self.targets}",
+                            r.status_code,
                         )
                     )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
 
                 else:
                     self.logger.info(
-                        'Sent \'{}\' DAPNET notification {}'.format(
-                            payload['text'], 'to {}'.format(self.targets)
+                        "Sent '{}' DAPNET notification {}".format(
+                            payload["text"], f"to {self.targets}"
                         )
                     )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending DAPNET '
-                    'notification to {}'.format(self.targets)
+                    "A Connection error occurred sending DAPNET "
+                    f"notification to {self.targets}"
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -311,102 +312,101 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'priority':
-                DAPNET_PRIORITIES[self.template_args['priority']['default']]
+            "priority": (
+                DAPNET_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in DAPNET_PRIORITIES
-                else DAPNET_PRIORITIES[self.priority],
-            'batch': 'yes' if self.batch else 'no',
-            'txgroups': ','.join(self.txgroups),
+                else DAPNET_PRIORITIES[self.priority]
+            ),
+            "batch": "yes" if self.batch else "no",
+            "txgroups": ",".join(self.txgroups),
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Setup Authentication
-        auth = '{user}:{password}@'.format(
+        auth = "{user}:{password}@".format(
             user=NotifyDapnet.quote(self.user, safe=""),
             password=self.pprint(
-                self.password, privacy, mode=PrivacyMode.Secret, safe=''
+                self.password, privacy, mode=PrivacyMode.Secret, safe=""
             ),
         )
 
-        return '{schema}://{auth}{targets}?{params}'.format(
+        return "{schema}://{auth}{targets}?{params}".format(
             schema=self.secure_protocol,
             auth=auth,
-            targets='/'.join([self.pprint(x, privacy, safe='')
-                              for x in self.targets]),
+            targets="/".join(
+                [self.pprint(x, privacy, safe="") for x in self.targets]
+            ),
             params=NotifyDapnet.urlencode(params),
         )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.password)
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # All elements are targets
-        results['targets'] = [NotifyDapnet.unquote(results['host'])]
+        results["targets"] = [NotifyDapnet.unquote(results["host"])]
 
         # All entries after the hostname are additional targets
-        results['targets'].extend(NotifyDapnet.split_path(results['fullpath']))
+        results["targets"].extend(NotifyDapnet.split_path(results["fullpath"]))
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyDapnet.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyDapnet.parse_list(results["qsd"]["to"])
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyDapnet.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyDapnet.unquote(
+                results["qsd"]["priority"]
+            )
 
         # Check for one or multiple transmitter groups (comma separated)
         # and split them up, when necessary
-        if 'txgroups' in results['qsd']:
-            results['txgroups'] = \
-                [x.lower() for x in
-                 NotifyDapnet.parse_list(results['qsd']['txgroups'])]
+        if "txgroups" in results["qsd"]:
+            results["txgroups"] = [
+                x.lower()
+                for x in NotifyDapnet.parse_list(results["qsd"]["txgroups"])
+            ]
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyDapnet.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyDapnet.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/dbus.py b/libs/apprise/plugins/dbus.py
index 31aa9210fc..94c11248f6 100644
--- a/libs/apprise/plugins/dbus.py
+++ b/libs/apprise/plugins/dbus.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,11 +26,11 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import sys
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_bool
+
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 # Default our global support flag
 NOTIFY_DBUS_SUPPORT_ENABLED = False
@@ -45,18 +44,14 @@
 
 
 try:
-    # dbus essentials
-    from dbus import SessionBus
-    from dbus import Interface
-    from dbus import Byte
-    from dbus import ByteArray
-    from dbus import DBusException
+    # D-Bus Message Bus Daemon 1.12.XX Essentials
+    from dbus import Byte, ByteArray, DBusException, Interface, SessionBus
 
     #
     # now we try to determine which mainloop(s) we can access
     #
 
-    # glib
+    # glib/dbus
     try:
         from dbus.mainloop.glib import DBusGMainLoop
         LOOP_GLIB = DBusGMainLoop()
@@ -75,8 +70,7 @@
         pass
 
     # We're good as long as at least one
-    NOTIFY_DBUS_SUPPORT_ENABLED = (
-        LOOP_GLIB is not None or LOOP_QT is not None)
+    NOTIFY_DBUS_SUPPORT_ENABLED = LOOP_GLIB is not None or LOOP_QT is not None
 
     # ImportError: When using gi.repository you must not import static modules
     # like "gobject". Please change all occurrences of "import gobject" to
@@ -88,7 +82,7 @@
     try:
         # The following is required for Image/Icon loading only
         import gi
-        gi.require_version('GdkPixbuf', '2.0')
+        gi.require_version("GdkPixbuf", "2.0")
         from gi.repository import GdkPixbuf
         NOTIFY_DBUS_IMAGE_SUPPORT = True
 
@@ -109,10 +103,9 @@
 # The key to value pairs are the actual supported schema's matched
 # up with the Main Loop they should reference when accessed.
 MAINLOOP_MAP = {
-    'qt': LOOP_QT,
-    'kde': LOOP_QT,
-    'glib': LOOP_GLIB,
-    'dbus': LOOP_QT if LOOP_QT else LOOP_GLIB,
+    "qt": LOOP_QT,
+    "kde": LOOP_QT,
+    "dbus": LOOP_QT if LOOP_QT else LOOP_GLIB,
 }
 
 
@@ -125,48 +118,46 @@ class DBusUrgency:
 
 DBUS_URGENCIES = {
     # Note: This also acts as a reverse lookup mapping
-    DBusUrgency.LOW: 'low',
-    DBusUrgency.NORMAL: 'normal',
-    DBusUrgency.HIGH: 'high',
+    DBusUrgency.LOW: "low",
+    DBusUrgency.NORMAL: "normal",
+    DBusUrgency.HIGH: "high",
 }
 
 DBUS_URGENCY_MAP = {
     # Maps against string 'low'
-    'l': DBusUrgency.LOW,
+    "l": DBusUrgency.LOW,
     # Maps against string 'moderate'
-    'm': DBusUrgency.LOW,
+    "m": DBusUrgency.LOW,
     # Maps against string 'normal'
-    'n': DBusUrgency.NORMAL,
+    "n": DBusUrgency.NORMAL,
     # Maps against string 'high'
-    'h': DBusUrgency.HIGH,
+    "h": DBusUrgency.HIGH,
     # Maps against string 'emergency'
-    'e': DBusUrgency.HIGH,
+    "e": DBusUrgency.HIGH,
 
     # Entries to additionally support (so more like DBus's API)
-    '0': DBusUrgency.LOW,
-    '1': DBusUrgency.NORMAL,
-    '2': DBusUrgency.HIGH,
+    "0": DBusUrgency.LOW,
+    "1": DBusUrgency.NORMAL,
+    "2": DBusUrgency.HIGH,
 }
 
 
 class NotifyDBus(NotifyBase):
-    """
-    A wrapper for local DBus/Qt Notifications
-    """
+    """A wrapper for local DBus/Qt Notifications."""
 
     # Set our global enabled flag
     enabled = NOTIFY_DBUS_SUPPORT_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'details': _('libdbus-1.so.x must be installed.')
+        "details": _("libdbus-1.so.x must be installed.")
     }
 
     # The default descriptive name associated with the Notification
-    service_name = _('DBus Notification')
+    service_name = _("DBus Notification")
 
     # The services URL
-    service_url = 'http://www.freedesktop.org/Software/dbus/'
+    service_url = "http://www.freedesktop.org/Software/dbus/"
 
     # The default protocols
     # Python 3 keys() does not return a list object, it is its own dict_keys()
@@ -176,7 +167,7 @@ class NotifyDBus(NotifyBase):
     protocol = list(MAINLOOP_MAP.keys())
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_dbus'
+    setup_url = "https://appriseit.com/services/dbus/"
 
     # No throttling required for DBus queries
     request_rate_per_sec = 0
@@ -192,57 +183,62 @@ class NotifyDBus(NotifyBase):
     body_max_line_count = 10
 
     # The following are required to hook into the notifications:
-    dbus_interface = 'org.freedesktop.Notifications'
-    dbus_setting_location = '/org/freedesktop/Notifications'
+    dbus_interface = "org.freedesktop.Notifications"
+    dbus_setting_location = "/org/freedesktop/Notifications"
 
     # No URL Identifier will be defined for this service as there simply isn't
     # enough details to uniquely identify one dbus:// from another.
     url_identifier = False
 
     # Define object templates
-    templates = (
-        '{schema}://',
-    )
+    templates = ("{schema}://",)
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'urgency': {
-            'name': _('Urgency'),
-            'type': 'choice:int',
-            'values': DBUS_URGENCIES,
-            'default': DBusUrgency.NORMAL,
-        },
-        'priority': {
-            # Apprise uses 'priority' everywhere; it's just a nice consistent
-            # feel to be able to use it here as well. Just map the
-            # value back to 'priority'
-            'alias_of': 'urgency',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "urgency": {
+                "name": _("Urgency"),
+                "type": "choice:int",
+                "values": DBUS_URGENCIES,
+                "default": DBusUrgency.NORMAL,
+            },
+            "priority": {
+                # Apprise uses 'priority' everywhere; it's just a nice
+                # consistent feel to be able to use it here as well. Just map
+                # the value back to 'priority'
+                "alias_of": "urgency",
+            },
+            "x": {
+                "name": _("X-Axis"),
+                "type": "int",
+                "min": 0,
+                "map_to": "x_axis",
+            },
+            "y": {
+                "name": _("Y-Axis"),
+                "type": "int",
+                "min": 0,
+                "map_to": "y_axis",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-        'x': {
-            'name': _('X-Axis'),
-            'type': 'int',
-            'min': 0,
-            'map_to': 'x_axis',
-        },
-        'y': {
-            'name': _('Y-Axis'),
-            'type': 'int',
-            'min': 0,
-            'map_to': 'y_axis',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-    })
+    )
 
-    def __init__(self, urgency=None, x_axis=None, y_axis=None,
-                 include_image=True, **kwargs):
-        """
-        Initialize DBus Object
-        """
+    def __init__(
+        self,
+        urgency=None,
+        x_axis=None,
+        y_axis=None,
+        include_image=True,
+        **kwargs,
+    ):
+        """Initialize DBus Object."""
 
         super().__init__(**kwargs)
 
@@ -250,22 +246,26 @@ def __init__(self, urgency=None, x_axis=None, y_axis=None,
         self.registry = {}
 
         # Store our schema; default to dbus
-        self.schema = kwargs.get('schema', 'dbus')
+        self.schema = kwargs.get("schema", "dbus")
 
         if self.schema not in MAINLOOP_MAP:
-            msg = 'The schema specified ({}) is not supported.' \
-                .format(self.schema)
+            msg = f"The schema specified ({self.schema}) is not supported."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The urgency of the message
         self.urgency = int(
-            NotifyDBus.template_args['urgency']['default']
-            if urgency is None else
-            next((
-                v for k, v in DBUS_URGENCY_MAP.items()
-                if str(urgency).lower().startswith(k)),
-                NotifyDBus.template_args['urgency']['default']))
+            NotifyDBus.template_args["urgency"]["default"]
+            if urgency is None
+            else next(
+                (
+                    v
+                    for k, v in DBUS_URGENCY_MAP.items()
+                    if str(urgency).lower().startswith(k)
+                ),
+                NotifyDBus.template_args["urgency"]["default"],
+            )
+        )
 
         # Our x/y axis settings
         if x_axis or y_axis:
@@ -275,10 +275,12 @@ def __init__(self, urgency=None, x_axis=None, y_axis=None,
 
             except (TypeError, ValueError):
                 # Invalid x/y values specified
-                msg = 'The x,y coordinates specified ({},{}) are invalid.'\
-                    .format(x_axis, y_axis)
+                msg = (
+                    f"The x,y coordinates specified ({x_axis},{y_axis}) are"
+                    " invalid."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
         else:
             self.x_axis = None
             self.y_axis = None
@@ -286,25 +288,23 @@ def __init__(self, urgency=None, x_axis=None, y_axis=None,
         # Track whether we want to add an image to the notification.
         self.include_image = include_image
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform DBus Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform DBus Notification."""
         # Acquire our session
         try:
             session = SessionBus(mainloop=MAINLOOP_MAP[self.schema])
 
         except DBusException as e:
             # Handle exception
-            self.logger.warning('Failed to send DBus notification.')
-            self.logger.debug(f'DBus Exception: {e}')
+            self.logger.warning("Failed to send DBus notification.")
+            self.logger.debug(f"DBus Exception: {e}")
             return False
 
         # If there is no title, but there is a body, swap the two to get rid
         # of the weird whitespace
         if not title:
             title = body
-            body = ''
+            body = ""
 
         # acquire our dbus object
         dbus_obj = session.get_object(
@@ -319,18 +319,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         )
 
         # image path
-        icon_path = None if not self.include_image \
-            else self.image_path(notify_type, extension='.ico')
+        icon_path = (
+            None
+            if not self.include_image
+            else self.image_path(notify_type, extension=".ico")
+        )
 
         # Our meta payload
-        meta_payload = {
-            "urgency": Byte(self.urgency)
-        }
+        meta_payload = {"urgency": Byte(self.urgency)}
 
         if not (self.x_axis is None and self.y_axis is None):
             # Set x/y access if these were set
-            meta_payload['x'] = self.x_axis
-            meta_payload['y'] = self.y_axis
+            meta_payload["x"] = self.x_axis
+            meta_payload["y"] = self.y_axis
 
         if NOTIFY_DBUS_IMAGE_SUPPORT and icon_path:
             try:
@@ -338,20 +339,21 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 image = GdkPixbuf.Pixbuf.new_from_file(icon_path)
 
                 # Associate our image to our notification
-                meta_payload['icon_data'] = (
+                meta_payload["icon_data"] = (
                     image.get_width(),
                     image.get_height(),
                     image.get_rowstride(),
                     image.get_has_alpha(),
                     image.get_bits_per_sample(),
                     image.get_n_channels(),
-                    ByteArray(image.get_pixels())
+                    ByteArray(image.get_pixels()),
                 )
 
             except Exception as e:
                 self.logger.warning(
-                    "Could not load notification icon (%s).", icon_path)
-                self.logger.debug(f'DBus Exception: {e}')
+                    "Could not load notification icon (%s).", icon_path
+                )
+                self.logger.debug(f"DBus Exception: {e}")
 
         try:
             # Always call throttle() before any remote execution is made
@@ -363,40 +365,39 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # Message ID (0 = New Message)
                 0,
                 # Icon (str) - not used
-                '',
+                "",
                 # Title
                 str(title),
                 # Body
                 str(body),
                 # Actions
-                list(),
+                [],
                 # Meta
                 meta_payload,
                 # Message Timeout
                 self.message_timeout_ms,
             )
 
-            self.logger.info('Sent DBus notification.')
+            self.logger.info("Sent DBus notification.")
 
         except Exception as e:
-            self.logger.warning('Failed to send DBus notification.')
-            self.logger.debug(f'DBus Exception: {e}')
+            self.logger.warning("Failed to send DBus notification.")
+            self.logger.debug(f"DBus Exception: {e}")
             return False
 
         return True
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'urgency':
-                DBUS_URGENCIES[self.template_args['urgency']['default']]
+            "image": "yes" if self.include_image else "no",
+            "urgency": (
+                DBUS_URGENCIES[self.template_args["urgency"]["default"]]
                 if self.urgency not in DBUS_URGENCIES
-                else DBUS_URGENCIES[self.urgency],
+                else DBUS_URGENCIES[self.urgency]
+            ),
         }
 
         # Extend our parameters
@@ -404,48 +405,43 @@ def url(self, privacy=False, *args, **kwargs):
 
         # x in (x,y) screen coordinates
         if self.x_axis:
-            params['x'] = str(self.x_axis)
+            params["x"] = str(self.x_axis)
 
         # y in (x,y) screen coordinates
         if self.y_axis:
-            params['y'] = str(self.y_axis)
+            params["y"] = str(self.y_axis)
 
-        return '{schema}://_/?{params}'.format(
-            schema=self.schema,
-            params=NotifyDBus.urlencode(params),
-        )
+        return f"{self.schema}://_/?{NotifyDBus.urlencode(params)}"
 
     @staticmethod
     def parse_url(url):
-        """
-        There are no parameters nessisary for this protocol; simply having
-        gnome:// is all you need.  This function just makes sure that
-        is in place.
+        """There are no parameters nessisary for this protocol; simply having
+        gnome:// is all you need.
 
+        This function just makes sure that is in place.
         """
 
         results = NotifyBase.parse_url(url, verify_host=False)
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         # DBus supports urgency, but we we also support the keyword priority
         # so that it is consistent with some of the other plugins
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
             # We intentionally store the priority in the urgency section
-            results['urgency'] = \
-                NotifyDBus.unquote(results['qsd']['priority'])
+            results["urgency"] = NotifyDBus.unquote(results["qsd"]["priority"])
 
-        if 'urgency' in results['qsd'] and len(results['qsd']['urgency']):
-            results['urgency'] = \
-                NotifyDBus.unquote(results['qsd']['urgency'])
+        if "urgency" in results["qsd"] and len(results["qsd"]["urgency"]):
+            results["urgency"] = NotifyDBus.unquote(results["qsd"]["urgency"])
 
         # handle x,y coordinates
-        if 'x' in results['qsd'] and len(results['qsd']['x']):
-            results['x_axis'] = NotifyDBus.unquote(results['qsd'].get('x'))
+        if "x" in results["qsd"] and len(results["qsd"]["x"]):
+            results["x_axis"] = NotifyDBus.unquote(results["qsd"].get("x"))
 
-        if 'y' in results['qsd'] and len(results['qsd']['y']):
-            results['y_axis'] = NotifyDBus.unquote(results['qsd'].get('y'))
+        if "y" in results["qsd"] and len(results["qsd"]["y"]):
+            results["y_axis"] = NotifyDBus.unquote(results["qsd"].get("y"))
 
         return results
diff --git a/libs/apprise/plugins/dingtalk.py b/libs/apprise/plugins/dingtalk.py
index 84de85db07..0c4bdfb744 100644
--- a/libs/apprise/plugins/dingtalk.py
+++ b/libs/apprise/plugins/dingtalk.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,20 +25,20 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import base64
+import hashlib
+import hmac
+from json import dumps
 import re
 import time
-import hmac
-import hashlib
-import base64
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
+from ..common import NotifyFormat, NotifyType
+from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyFormat
-from ..common import NotifyType
 from ..utils.parse import parse_list, validate_regex
-from ..locale import gettext_lazy as _
+from .base import NotifyBase
 
 # Register at https://dingtalk.com
 #   - Download their PC based software as it is the only way you can create
@@ -52,28 +51,26 @@
 #  dingtalk://{access_token}/{phone_no_1}/{phone_no_2}/{phone_no_N/
 
 # Some Phone Number Detection
-IS_PHONE_NO = re.compile(r'^\+?(?P<phone>[0-9\s)(+-]+)\s*$')
+IS_PHONE_NO = re.compile(r"^\+?(?P<phone>[0-9\s)(+-]+)\s*$")
 
 
 class NotifyDingTalk(NotifyBase):
-    """
-    A wrapper for DingTalk Notifications
-    """
+    """A wrapper for DingTalk Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'DingTalk'
+    service_name = "DingTalk"
 
     # The services URL
-    service_url = 'https://www.dingtalk.com/'
+    service_url = "https://www.dingtalk.com/"
 
     # All notification requests are secure
-    secure_protocol = 'dingtalk'
+    secure_protocol = "dingtalk"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_dingtalk'
+    setup_url = "https://appriseit.com/services/dingtalk/"
 
     # DingTalk API
-    notify_url = 'https://oapi.dingtalk.com/robot/send?access_token={token}'
+    notify_url = "https://oapi.dingtalk.com/robot/send?access_token={token}"
 
     # Do not set title_maxlen as it is set in a property value below
     # since the length varies depending if we are doing a markdown
@@ -82,89 +79,92 @@ class NotifyDingTalk(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{token}/',
-        '{schema}://{token}/{targets}/',
-        '{schema}://{secret}@{token}/',
-        '{schema}://{secret}@{token}/{targets}/',
+        "{schema}://{token}/",
+        "{schema}://{token}/{targets}/",
+        "{schema}://{secret}@{token}/",
+        "{schema}://{secret}@{token}/{targets}/",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-        'secret': {
-            'name': _('Secret'),
-            'type': 'string',
-            'private': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "secret": {
+                "name": _("Secret"),
+                "type": "string",
+                "private": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "target_phone_no": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_phone_no': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "token": {
+                "alias_of": "token",
+            },
+            "secret": {
+                "alias_of": "secret",
+            },
         },
-        'token': {
-            'alias_of': 'token',
-        },
-        'secret': {
-            'alias_of': 'secret',
-        },
-    })
+    )
 
     def __init__(self, token, targets=None, secret=None, **kwargs):
-        """
-        Initialize DingTalk Object
-        """
+        """Initialize DingTalk Object."""
         super().__init__(**kwargs)
 
         # Secret Key (associated with project)
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'An invalid DingTalk API Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid DingTalk API Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.secret = None
         if secret:
             self.secret = validate_regex(
-                secret, *self.template_tokens['secret']['regex'])
+                secret, *self.template_tokens["secret"]["regex"]
+            )
             if not self.secret:
-                msg = 'An invalid DingTalk Secret ' \
-                      '({}) was specified.'.format(token)
+                msg = f"An invalid DingTalk Secret ({token}) was specified."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_list(targets):
             # Validate targets and drop bad ones:
             result = IS_PHONE_NO.match(target)
             if result:
                 # Further check our phone # for it's digit count
-                result = ''.join(re.findall(r'\d+', result.group('phone')))
+                result = "".join(re.findall(r"\d+", result.group("phone")))
                 if len(result) < 11 or len(result) > 14:
                     self.logger.warning(
-                        'Dropped invalid phone # '
-                        '({}) specified.'.format(target),
+                        f"Dropped invalid phone # ({target}) specified.",
                     )
                     continue
 
@@ -173,47 +173,43 @@ def __init__(self, token, targets=None, secret=None, **kwargs):
                 continue
 
             self.logger.warning(
-                'Dropped invalid phone # '
-                '({}) specified.'.format(target),
+                f"Dropped invalid phone # ({target}) specified.",
             )
 
         return
 
     def get_signature(self):
-        """
-        Calculates time-based signature so that we can send arbitrary messages.
-        """
+        """Calculates time-based signature so that we can send arbitrary
+        messages."""
         timestamp = str(round(time.time() * 1000))
-        secret_enc = self.secret.encode('utf-8')
-        str_to_sign_enc = \
-            "{}\n{}".format(timestamp, self.secret).encode('utf-8')
+        secret_enc = self.secret.encode("utf-8")
+        str_to_sign_enc = f"{timestamp}\n{self.secret}".encode()
         hmac_code = hmac.new(
-            secret_enc, str_to_sign_enc, digestmod=hashlib.sha256).digest()
-        signature = NotifyDingTalk.quote(base64.b64encode(hmac_code), safe='')
+            secret_enc, str_to_sign_enc, digestmod=hashlib.sha256
+        ).digest()
+        signature = NotifyDingTalk.quote(base64.b64encode(hmac_code), safe="")
         return timestamp, signature
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform DingTalk Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform DingTalk Notification."""
 
         payload = {
-            'msgtype': 'text',
-            'at': {
-                'atMobiles': self.targets,
-                'isAtAll': False,
-            }
+            "msgtype": "text",
+            "at": {
+                "atMobiles": self.targets,
+                "isAtAll": False,
+            },
         }
 
         if self.notify_format == NotifyFormat.MARKDOWN:
-            payload['markdown'] = {
-                'title': title,
-                'text': body,
+            payload["markdown"] = {
+                "title": title,
+                "text": body,
             }
 
         else:
-            payload['text'] = {
-                'content': body,
+            payload["text"] = {
+                "content": body,
             }
 
         # Our Notification URL
@@ -223,20 +219,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         if self.secret:
             timestamp, signature = self.get_signature()
             params = {
-                'timestamp': timestamp,
-                'sign': signature,
+                "timestamp": timestamp,
+                "sign": signature,
             }
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json'
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Some Debug Logging
-        self.logger.debug('DingTalk URL: {} (cert_verify={})'.format(
-            notify_url, self.verify_certificate))
-        self.logger.debug('DingTalk Payload: {}' .format(payload))
+        self.logger.debug(
+            "DingTalk URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"DingTalk Payload: {payload}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -248,119 +246,124 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 headers=headers,
                 params=params,
                 verify=self.verify_certificate,
+                timeout=self.request_timeout,
             )
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyDingTalk.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyDingTalk.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send DingTalk notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send DingTalk notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+
                 return False
 
             else:
-                self.logger.info('Sent DingTalk notification.')
+                self.logger.info("Sent DingTalk notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occured sending DingTalk '
-                'notification.'
+                "A Connection error occured sending DingTalk notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     @property
     def title_maxlen(self):
-        """
-        The title isn't used when not in markdown mode.
-        """
-        return NotifyBase.title_maxlen \
-            if self.notify_format == NotifyFormat.MARKDOWN else 0
+        """The title isn't used when not in markdown mode."""
+        return (
+            NotifyBase.title_maxlen
+            if self.notify_format == NotifyFormat.MARKDOWN
+            else 0
+        )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any arguments set
         args = {
-            'format': self.notify_format,
-            'overflow': self.overflow_mode,
-            'verify': 'yes' if self.verify_certificate else 'no',
+            "format": self.notify_format,
+            "overflow": self.overflow_mode,
+            "verify": "yes" if self.verify_certificate else "no",
         }
 
-        return '{schema}://{secret}{token}/{targets}/?{args}'.format(
+        return "{schema}://{secret}{token}/{targets}/?{args}".format(
             schema=self.secure_protocol,
-            secret='' if not self.secret else '{}@'.format(self.pprint(
-                self.secret, privacy, mode=PrivacyMode.Secret, safe='')),
-            token=self.pprint(self.token, privacy, safe=''),
-            targets='/'.join(
-                [NotifyDingTalk.quote(x, safe='') for x in self.targets]),
-            args=NotifyDingTalk.urlencode(args))
+            secret=(
+                ""
+                if not self.secret
+                else "{}@".format(
+                    self.pprint(
+                        self.secret, privacy, mode=PrivacyMode.Secret, safe=""
+                    )
+                )
+            ),
+            token=self.pprint(self.token, privacy, safe=""),
+            targets="/".join(
+                [NotifyDingTalk.quote(x, safe="") for x in self.targets]
+            ),
+            args=NotifyDingTalk.urlencode(args),
+        )
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.secret, self.token)
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to substantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to
+        substantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        results['token'] = NotifyDingTalk.unquote(results['host'])
+        results["token"] = NotifyDingTalk.unquote(results["host"])
 
         # if a user has been defined, use it's value as the secret
-        if results.get('user'):
-            results['secret'] = results.get('user')
+        if results.get("user"):
+            results["secret"] = results.get("user")
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyDingTalk.split_path(results['fullpath'])
+        results["targets"] = NotifyDingTalk.split_path(results["fullpath"])
 
         # Support the use of the `token` keyword argument
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = \
-                NotifyDingTalk.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyDingTalk.unquote(results["qsd"]["token"])
 
         # Support the use of the `secret` keyword argument
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
-            results['secret'] = \
-                NotifyDingTalk.unquote(results['qsd']['secret'])
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            results["secret"] = NotifyDingTalk.unquote(
+                results["qsd"]["secret"]
+            )
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyDingTalk.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyDingTalk.parse_list(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/discord.py b/libs/apprise/plugins/discord.py
index 14974cb875..3b05f1232f 100644
--- a/libs/apprise/plugins/discord.py
+++ b/libs/apprise/plugins/discord.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -43,46 +42,45 @@
 # API Documentation on Webhooks:
 #    - https://discord.com/developers/docs/resources/webhook
 #
+from __future__ import annotations
+
+from datetime import datetime, timedelta, timezone
+from itertools import chain
+from json import dumps
 import re
+from typing import Any
+
 import requests
-from json import dumps
-from datetime import timedelta
-from datetime import datetime
-from datetime import timezone
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_bool, validate_regex
-from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
-
-# Used to detect user/role IDs
+# Used to detect user/role IDs and @here/@everyone tokens.
 USER_ROLE_DETECTION_RE = re.compile(
-    r'\s*(?:<@(?P<role>&?)(?P<id>[0-9]+)>|@(?P<value>[a-z0-9]+))', re.I)
+    r"\s*(?:<?@(?P<role>&?)(?P<id>[0-9]+)>?|@(?P<value>[a-z0-9]+))", re.I
+)
 
 
 class NotifyDiscord(NotifyBase):
-    """
-    A wrapper to Discord Notifications
+    """A wrapper to Discord Notifications."""
 
-    """
     # The default descriptive name associated with the Notification
-    service_name = 'Discord'
+    service_name = "Discord"
 
     # The services URL
-    service_url = 'https://discord.com/'
+    service_url = "https://discord.com/"
 
     # The default secure protocol
-    secure_protocol = 'discord'
+    secure_protocol = "discord"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_discord'
+    setup_url = "https://appriseit.com/services/discord/"
 
     # Discord Webhook
-    notify_url = 'https://discord.com/api/webhooks'
+    notify_url = "https://discord.com/api/webhooks"
 
     # Support attachments
     attachment_support = True
@@ -115,106 +113,137 @@ class NotifyDiscord(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{webhook_id}/{webhook_token}',
-        '{schema}://{botname}@{webhook_id}/{webhook_token}',
+        "{schema}://{webhook_id}/{webhook_token}",
+        "{schema}://{botname}@{webhook_id}/{webhook_token}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'botname': {
-            'name': _('Bot Name'),
-            'type': 'string',
-            'map_to': 'user',
-        },
-        'webhook_id': {
-            'name': _('Webhook ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "botname": {
+                "name": _("Bot Name"),
+                "type": "string",
+                "map_to": "user",
+            },
+            "webhook_id": {
+                "name": _("Webhook ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "webhook_token": {
+                "name": _("Webhook Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
         },
-        'webhook_token': {
-            'name': _('Webhook Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'tts': {
-            'name': _('Text To Speech'),
-            'type': 'bool',
-            'default': False,
-        },
-        'avatar': {
-            'name': _('Avatar Image'),
-            'type': 'bool',
-            'default': True,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "tts": {
+                "name": _("Text To Speech"),
+                "type": "bool",
+                "default": False,
+            },
+            "avatar": {
+                "name": _("Avatar Image"),
+                "type": "bool",
+                "default": True,
+            },
+            "avatar_url": {
+                "name": _("Avatar URL"),
+                "type": "string",
+            },
+            "href": {
+                "name": _("URL"),
+                "type": "string",
+            },
+            "url": {
+                "alias_of": "href",
+            },
+            # Send a message to the specified thread within a webhook's
+            # channel. The thread will automatically be unarchived.
+            "thread": {
+                "name": _("Thread ID"),
+                "type": "string",
+            },
+            "footer": {
+                "name": _("Display Footer"),
+                "type": "bool",
+                "default": False,
+            },
+            "footer_logo": {
+                "name": _("Footer Logo"),
+                "type": "bool",
+                "default": True,
+            },
+            "fields": {
+                "name": _("Use Fields"),
+                "type": "bool",
+                "default": True,
+            },
+            "flags": {
+                "name": _("Discord Flags"),
+                "type": "int",
+                "min": 0,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            # Explicit ping targets. Examples:
+            #  - ping=12345,67890
+            #  - ping=<@12345>,<@&67890>,@here
+            "ping": {
+                "name": _("Ping Users/Roles"),
+                "type": "list:string",
+            },
         },
-        'avatar_url': {
-            'name': _('Avatar URL'),
-            'type': 'string',
-        },
-        'href': {
-            'name': _('URL'),
-            'type': 'string',
-        },
-        'url': {
-            'alias_of': 'href',
-        },
-        # Send a message to the specified thread within a webhook's channel.
-        # The thread will automatically be unarchived.
-        'thread': {
-            'name': _('Thread ID'),
-            'type': 'string',
-        },
-        'footer': {
-            'name': _('Display Footer'),
-            'type': 'bool',
-            'default': False,
-        },
-        'footer_logo': {
-            'name': _('Footer Logo'),
-            'type': 'bool',
-            'default': True,
-        },
-        'fields': {
-            'name': _('Use Fields'),
-            'type': 'bool',
-            'default': True,
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-    })
-
-    def __init__(self, webhook_id, webhook_token, tts=False, avatar=True,
-                 footer=False, footer_logo=True, include_image=False,
-                 fields=True, avatar_url=None, href=None, thread=None,
-                 **kwargs):
-        """
-        Initialize Discord Object
+    )
 
-        """
+    def __init__(
+        self,
+        webhook_id: str,
+        webhook_token: str,
+        tts: bool = False,
+        avatar: bool = True,
+        footer: bool = False,
+        footer_logo: bool = True,
+        include_image: bool = False,
+        fields: bool = True,
+        avatar_url: str | None = None,
+        href: str | None = None,
+        thread: str | None = None,
+        flags: int | None = None,
+        ping: list[str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        """Initialize Discord Object."""
         super().__init__(**kwargs)
 
         # Webhook ID (associated with project)
         self.webhook_id = validate_regex(webhook_id)
         if not self.webhook_id:
-            msg = 'An invalid Discord Webhook ID ' \
-                  '({}) was specified.'.format(webhook_id)
+            msg = (
+                f"An invalid Discord Webhook ID ({webhook_id}) was "
+                "specified.")
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Webhook Token (associated with project)
         self.webhook_token = validate_regex(webhook_token)
         if not self.webhook_token:
-            msg = 'An invalid Discord Webhook Token ' \
-                  '({}) was specified.'.format(webhook_token)
+            msg = (
+                "An invalid Discord Webhook Token "
+                f"({webhook_token}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -247,7 +276,25 @@ def __init__(self, webhook_id, webhook_token, tts=False, avatar=True,
         # A URL to have the title link to
         self.href = href
 
-        # For Tracking Purposes
+        # A URL to have the title link to
+        if flags:
+            try:
+                self.flags = int(flags)
+                if self.flags < NotifyDiscord.template_args["flags"]["min"]:
+                    raise ValueError()
+
+            except (TypeError, ValueError):
+                msg = (
+                    f"An invalid Discord flags setting ({flags}) was "
+                    "specified.")
+                self.logger.warning(msg)
+                raise TypeError(msg) from None
+        else:
+            self.flags = None
+
+        # Ping targets (tokens from URL, already split by parse_list)
+        self.ping: list[str] = parse_list(ping)
+
         self.ratelimit_reset = datetime.now(timezone.utc).replace(tzinfo=None)
 
         # Default to 1.0
@@ -255,73 +302,93 @@ def __init__(self, webhook_id, webhook_token, tts=False, avatar=True,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Discord Notification
-        """
-
-        payload = {
-            # Text-To-Speech
-            'tts': self.tts,
-
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        attach: list[AttachBase] | None = None,
+        **kwargs: Any,
+    ) -> bool:
+        """Perform Discord Notification."""
+
+        payload: dict[str, Any] = {
+            "tts": self.tts,
             # If Text-To-Speech is set to True, then we do not want to wait
             # for the whole message before continuing. Otherwise, we wait
-            'wait': self.tts is False,
+            "wait": self.tts is False,
         }
 
+        if self.flags:
+            # Set our flag if defined:
+            payload["flags"] = self.flags
+
         # Acquire image_url
         image_url = self.image_url(notify_type)
 
         if self.avatar and (image_url or self.avatar_url):
-            payload['avatar_url'] = \
+            payload["avatar_url"] = (
                 self.avatar_url if self.avatar_url else image_url
+            )
 
         if self.user:
             # Optionally override the default username of the webhook
-            payload['username'] = self.user
+            payload["username"] = self.user
 
         # Associate our thread_id with our message
-        params = {'thread_id': self.thread_id} if self.thread_id else None
+        params = {"thread_id": self.thread_id} if self.thread_id else None
+
+        # Ping handling rules:
+        # - If ping= is set, it is an additive if in MARKDOWN mode otherwise
+        #   it is explicit for TEXT/HTML formats.
+        # - Otherwise, ping detection only happens in MARKDOWN mode
+        if self.notify_format == NotifyFormat.MARKDOWN:
+            if self.ping:
+                payload.update(self.ping_payload(body, " ".join(self.ping)))
+            else:
+                payload.update(self.ping_payload(body))
+
+        # TEXT/HTML: no body parsing, ping= is exclusive
+        elif self.ping:
+            payload.update(self.ping_payload(" ".join(self.ping)))
 
         if body:
-            # our fields variable
-            fields = []
+            # Track extra embed fields (if used)
+            fields: list[dict[str, str]] = []
 
             if self.notify_format == NotifyFormat.MARKDOWN:
                 # Use embeds for payload
-                payload['embeds'] = [{
-                    'author': {
-                        'name': self.app_id,
-                        'url': self.app_url,
+                payload["embeds"] = [{
+                    "author": {
+                        "name": self.app_id,
+                        "url": self.app_url,
                     },
-                    'title': title,
-                    'description': body,
-
+                    "title": title,
+                    "description": body,
                     # Our color associated with our notification
-                    'color': self.color(notify_type, int),
+                    "color": self.color(notify_type, int),
                 }]
 
                 if self.href:
-                    payload['embeds'][0]['url'] = self.href
+                    payload["embeds"][0]["url"] = self.href
 
                 if self.footer:
                     # Acquire logo URL
                     logo_url = self.image_url(notify_type, logo=True)
 
                     # Set Footer text to our app description
-                    payload['embeds'][0]['footer'] = {
-                        'text': self.app_desc,
+                    payload["embeds"][0]["footer"] = {
+                        "text": self.app_desc,
                     }
 
                     if self.footer_logo and logo_url:
-                        payload['embeds'][0]['footer']['icon_url'] = logo_url
+                        payload["embeds"][0]["footer"]["icon_url"] = logo_url
 
                 if self.include_image and image_url:
-                    payload['embeds'][0]['thumbnail'] = {
-                        'url': image_url,
-                        'height': 256,
-                        'width': 256,
+                    payload["embeds"][0]["thumbnail"] = {
+                        "url": image_url,
+                        "height": 256,
+                        "width": 256,
                     }
 
                 if self.fields:
@@ -329,58 +396,35 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     description, fields = self.extract_markdown_sections(body)
 
                     # Swap first entry for description
-                    payload['embeds'][0]['description'] = description
+                    payload["embeds"][0]["description"] = description
                     if fields:
                         # Apply our additional parsing for a better
                         # presentation
-                        payload['embeds'][0]['fields'] = \
-                            fields[:self.discord_max_fields]
-
-                        # Remove entry from head of fields
-                        fields = fields[self.discord_max_fields:]
-
+                        payload["embeds"][0]["fields"] = fields[
+                            : self.discord_max_fields
+                        ]
+                        fields = fields[self.discord_max_fields :]
             else:
-                # not markdown
-                payload['content'] = \
-                    body if not title else "{}\r\n{}".format(title, body)
-
-            # parse for user id's <@123> and role IDs <@&456>
-            results = USER_ROLE_DETECTION_RE.findall(body)
-            if results:
-                payload['allow_mentions'] = {
-                    'parse': [],
-                    'users': [],
-                    'roles': [],
-                }
-
-                _content = []
-                for (is_role, no, value) in results:
-                    if value:
-                        payload['allow_mentions']['parse'].append(value)
-                        _content.append(f'@{value}')
-
-                    elif is_role:
-                        payload['allow_mentions']['roles'].append(no)
-                        _content.append(f'<@&{no}>')
-
-                    else:  # is_user
-                        payload['allow_mentions']['users'].append(no)
-                        _content.append(f'<@{no}>')
-
-                if self.notify_format == NotifyFormat.MARKDOWN:
-                    # Add pingable elements to content field
-                    payload['content'] = '๐Ÿ‘‰ ' + ' '.join(_content)
+                # TEXT or HTML:
+                # - No ping detection unless ping= was provided.
+                # - If ping= was provided, ping_payload() already generated
+                #   payload["content"] starting with "๐Ÿ‘‰ ...", and we append
+                #   it.
+                payload["content"] = (
+                    body if not title else f"{title}\r\n{body}"
+                ) + payload.get("content", "")
 
             if not self._send(payload, params=params):
                 # We failed to post our message
                 return False
 
-            # Process any remaining fields IF set
+            # Send remaining fields (if any)
             if fields:
-                payload['embeds'][0]['description'] = ''
+                payload["embeds"][0]["description"] = ""
                 for i in range(0, len(fields), self.discord_max_fields):
-                    payload['embeds'][0]['fields'] = \
-                        fields[i:i + self.discord_max_fields]
+                    payload["embeds"][0]["fields"] = fields[
+                        i : i + self.discord_max_fields
+                    ]
                     if not self._send(payload):
                         # We failed to post our message
                         return False
@@ -390,29 +434,25 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             # and assigned values for re-use here too
             payload.update({
                 # Text-To-Speech
-                'tts': False,
+                "tts": False,
                 # Wait until the upload has posted itself before continuing
-                'wait': True,
+                "wait": True,
             })
 
             #
             # Remove our text/title based content for attachment use
             #
-            if 'embeds' in payload:
-                del payload['embeds']
-
-            if 'content' in payload:
-                del payload['content']
-
-            if 'allow_mentions' in payload:
-                del payload['allow_mentions']
+            payload.pop("embeds", None)
+            payload.pop("content", None)
+            payload.pop("allow_mentions", None)
 
             #
             # Send our attachments
             #
             for attachment in attach:
                 self.logger.info(
-                    'Posting Discord Attachment {}'.format(attachment.name))
+                    f"Posting Discord Attachment {attachment.name}"
+                )
                 if not self._send(payload, params=params, attach=attachment):
                     # We failed to post our message
                     return False
@@ -420,31 +460,33 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         # Otherwise return
         return True
 
-    def _send(self, payload, attach=None, params=None, rate_limit=1,
-              **kwargs):
-        """
-        Wrapper to the requests (post) object
-        """
+    def _send(
+        self,
+        payload: dict[str, Any],
+        attach: AttachBase | None = None,
+        params: dict[str, str] | None = None,
+        rate_limit: int = 1,
+        **kwargs: Any,
+    ) -> bool:
+        """Wrapper to the requests (post) object."""
 
         # Our headers
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Construct Notify URL
-        notify_url = '{0}/{1}/{2}'.format(
-            self.notify_url,
-            self.webhook_id,
-            self.webhook_token,
+        notify_url = (
+            f"{self.notify_url}/{self.webhook_id}/{self.webhook_token}"
         )
 
-        self.logger.debug('Discord POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Discord Payload: %s' % str(payload))
+        self.logger.debug(
+            "Discord POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Discord Payload: {payload!s}")
 
-        # By default set wait to None
-        wait = None
+        wait: float | None = None
 
         if self.ratelimit_remaining <= 0.0:
             # Determine how long we should wait for or if we should wait at
@@ -457,8 +499,10 @@ def _send(self, payload, attach=None, params=None, rate_limit=1,
             if now < self.ratelimit_reset:
                 # We need to throttle for the difference in seconds
                 wait = abs(
-                    (self.ratelimit_reset - now + self.clock_skew)
-                    .total_seconds())
+                    (
+                        self.ratelimit_reset - now + self.clock_skew
+                    ).total_seconds()
+                )
 
         # Always call throttle before any remote server i/o is made;
         self.throttle(wait=wait)
@@ -468,13 +512,13 @@ def _send(self, payload, attach=None, params=None, rate_limit=1,
             if not attach:
                 # We could not access the attachment
                 self.logger.error(
-                    'Could not access attachment {}.'.format(
-                        attach.url(privacy=True)))
+                    f"Could not access attachment {attach.url(privacy=True)}."
+                )
                 return False
 
             self.logger.debug(
-                'Posting Discord attachment {}'.format(
-                    attach.url(privacy=True)))
+                f"Posting Discord attachment {attach.url(privacy=True)}"
+            )
 
         # Our attachment path (if specified)
         files = None
@@ -482,10 +526,16 @@ def _send(self, payload, attach=None, params=None, rate_limit=1,
 
             # Open our attachment path if required:
             if attach:
-                files = {'file': (attach.name, open(attach.path, 'rb'))}
-
+                files = {
+                    "file": (
+                        attach.name,
+                        # file handle is safely closed in `finally`; inline
+                        # open is intentional
+                        open(attach.path, "rb"),  # noqa: SIM115
+                    )
+                }
             else:
-                headers['Content-Type'] = 'application/json; charset=utf-8'
+                headers["Content-Type"] = "application/json; charset=utf-8"
 
             r = requests.post(
                 notify_url,
@@ -500,12 +550,12 @@ def _send(self, payload, attach=None, params=None, rate_limit=1,
             # Handle rate limiting (if specified)
             try:
                 # Store our rate limiting (if provided)
-                self.ratelimit_remaining = \
-                    float(r.headers.get(
-                        'X-RateLimit-Remaining'))
+                self.ratelimit_remaining = float(
+                    r.headers.get("X-RateLimit-Remaining")
+                )
                 self.ratelimit_reset = datetime.fromtimestamp(
-                    int(r.headers.get('X-RateLimit-Reset')),
-                    timezone.utc).replace(tzinfo=None)
+                    int(r.headers.get("X-RateLimit-Reset")), timezone.utc
+                ).replace(tzinfo=None)
 
             except (TypeError, ValueError):
                 # This is returned if we could not retrieve this
@@ -513,123 +563,141 @@ def _send(self, payload, attach=None, params=None, rate_limit=1,
                 pass
 
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifyBase.http_response_code_lookup(r.status_code)
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
 
-                if r.status_code == requests.codes.too_many_requests \
-                        and rate_limit > 0:
+                if (
+                    r.status_code == requests.codes.too_many_requests
+                    and rate_limit > 0
+                ):
 
                     # handle rate limiting
                     self.logger.warning(
-                        'Discord rate limiting in effect; '
-                        'blocking for %.2f second(s)',
-                        self.ratelimit_remaining)
+                        "Discord rate limiting in effect; "
+                        "blocking for %.2f second(s)",
+                        self.ratelimit_remaining,
+                    )
 
                     # Try one more time before failing
                     return self._send(
-                        payload=payload, attach=attach, params=params,
-                        rate_limit=rate_limit - 1, **kwargs)
+                        payload=payload,
+                        attach=attach,
+                        params=params,
+                        rate_limit=rate_limit - 1,
+                        **kwargs,
+                    )
 
                 self.logger.warning(
-                    'Failed to send {}to Discord notification: '
-                    '{}{}error={}.'.format(
-                        attach.name if attach else '',
+                    "Failed to send {}to Discord notification: "
+                    "{}{}error={}.".format(
+                        attach.name if attach else "",
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Discord {}.'.format(
-                    'attachment' if attach else 'notification'))
+                self.logger.info(
+                    "Sent Discord {}.".format(
+                        "attachment" if attach else "notification"
+                    )
+                )
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred posting {}to Discord.'.format(
-                    attach.name if attach else ''))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred posting {}to Discord.".format(
+                    attach.name if attach else ""
+                )
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while reading {}.'.format(
-                    attach.name if attach else 'attachment'))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while reading {}.".format(
+                    attach.name if attach else "attachment"
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return False
 
         finally:
             # Close our file (if it's open) stored in the second element
             # of our files tuple (index 1)
             if files:
-                files['file'][1].close()
+                files["file"][1].close()
 
         return True
 
-    def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Returns the URL built dynamically based on specified arguments."""
 
-        # Define any URL parameters
-        params = {
-            'tts': 'yes' if self.tts else 'no',
-            'avatar': 'yes' if self.avatar else 'no',
-            'footer': 'yes' if self.footer else 'no',
-            'footer_logo': 'yes' if self.footer_logo else 'no',
-            'image': 'yes' if self.include_image else 'no',
-            'fields': 'yes' if self.fields else 'no',
+        params: dict[str, str] = {
+            "tts": "yes" if self.tts else "no",
+            "avatar": "yes" if self.avatar else "no",
+            "footer": "yes" if self.footer else "no",
+            "footer_logo": "yes" if self.footer_logo else "no",
+            "image": "yes" if self.include_image else "no",
+            "fields": "yes" if self.fields else "no",
         }
 
         if self.avatar_url:
-            params['avatar_url'] = self.avatar_url
+            params["avatar_url"] = self.avatar_url
+
+        if self.flags:
+            params["flags"] = str(self.flags)
 
         if self.href:
-            params['href'] = self.href
+            params["href"] = self.href
 
         if self.thread_id:
-            params['thread'] = self.thread_id
+            params["thread"] = self.thread_id
+
+        if self.ping:
+            # Let Apprise urlencode handle list formatting
+            params["ping"] = ",".join(self.ping)
 
         # Ensure our botname is set
-        botname = f'{self.user}@' if self.user else ''
+        botname = f"{self.user}@" if self.user else ""
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{botname}{webhook_id}/{webhook_token}/?{params}' \
-            .format(
+        return (
+            "{schema}://{bname}{webhook_id}/{webhook_token}/?{params}".format(
                 schema=self.secure_protocol,
-                botname=botname,
-                webhook_id=self.pprint(self.webhook_id, privacy, safe=''),
+                bname=botname,
+                webhook_id=self.pprint(self.webhook_id, privacy, safe=""),
                 webhook_token=self.pprint(
-                    self.webhook_token, privacy, safe=''),
+                    self.webhook_token, privacy, safe=""),
                 params=NotifyDiscord.urlencode(params),
             )
+        )
 
     @property
-    def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
-        """
+    def url_identifier(self) -> tuple[str, str, str]:
+        """Returns all of the identifiers that make this URL unique."""
         return (self.secure_protocol, self.webhook_id, self.webhook_token)
 
     @staticmethod
-    def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
+    def parse_url(url: str) -> dict[str, Any] | None:
+        """Parses the URL and returns arguments for instantiating this object.
 
         Syntax:
           discord://webhook_id/webhook_token
-
         """
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -637,75 +705,83 @@ def parse_url(url):
             return results
 
         # Store our webhook ID
-        webhook_id = NotifyDiscord.unquote(results['host'])
+        webhook_id = NotifyDiscord.unquote(results["host"])
 
         # Now fetch our tokens
         try:
-            webhook_token = \
-                NotifyDiscord.split_path(results['fullpath'])[0]
+            webhook_token = NotifyDiscord.split_path(results["fullpath"])[0]
 
         except IndexError:
             # Force some bad values that will get caught
             # in parsing later
             webhook_token = None
 
-        results['webhook_id'] = webhook_id
-        results['webhook_token'] = webhook_token
+        results["webhook_id"] = webhook_id
+        results["webhook_token"] = webhook_token
 
         # Text To Speech
-        results['tts'] = parse_bool(results['qsd'].get('tts', False))
+        results["tts"] = parse_bool(results["qsd"].get("tts", False))
 
         # Use sections
         # effectively detect multiple fields and break them off
         # into sections
-        results['fields'] = parse_bool(results['qsd'].get('fields', True))
+        results["fields"] = parse_bool(results["qsd"].get("fields", True))
 
         # Use Footer
-        results['footer'] = parse_bool(results['qsd'].get('footer', False))
+        results["footer"] = parse_bool(results["qsd"].get("footer", False))
 
         # Use Footer Logo
-        results['footer_logo'] = \
-            parse_bool(results['qsd'].get('footer_logo', True))
+        results["footer_logo"] = parse_bool(
+            results["qsd"].get("footer_logo", True)
+        )
 
         # Update Avatar Icon
-        results['avatar'] = parse_bool(results['qsd'].get('avatar', True))
+        results["avatar"] = parse_bool(results["qsd"].get("avatar", True))
 
         # Boolean to include an image or not
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyDiscord.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyDiscord.template_args["image"]["default"]
+            )
+        )
+
+        if "botname" in results["qsd"]:
+            # Alias to User
+            results["user"] = NotifyDiscord.unquote(results["qsd"]["botname"])
 
-        if 'botname' in results['qsd']:
+        if "flags" in results["qsd"]:
             # Alias to User
-            results['user'] = \
-                NotifyDiscord.unquote(results['qsd']['botname'])
+            results["flags"] = NotifyDiscord.unquote(results["qsd"]["flags"])
 
         # Extract avatar url if it was specified
-        if 'avatar_url' in results['qsd']:
-            results['avatar_url'] = \
-                NotifyDiscord.unquote(results['qsd']['avatar_url'])
+        if "avatar_url" in results["qsd"]:
+            results["avatar_url"] = NotifyDiscord.unquote(
+                results["qsd"]["avatar_url"]
+            )
 
         # Extract url if it was specified
-        if 'href' in results['qsd']:
-            results['href'] = \
-                NotifyDiscord.unquote(results['qsd']['href'])
+        if "href" in results["qsd"]:
+            results["href"] = NotifyDiscord.unquote(results["qsd"]["href"])
 
-        elif 'url' in results['qsd']:
-            results['href'] = \
-                NotifyDiscord.unquote(results['qsd']['url'])
+        elif "url" in results["qsd"]:
+            results["href"] = NotifyDiscord.unquote(results["qsd"]["url"])
             # Markdown is implied
-            results['format'] = NotifyFormat.MARKDOWN
+            results["format"] = NotifyFormat.MARKDOWN
 
         # Extract thread id if it was specified
-        if 'thread' in results['qsd']:
-            results['thread'] = \
-                NotifyDiscord.unquote(results['qsd']['thread'])
+        if "thread" in results["qsd"]:
+            results["thread"] = NotifyDiscord.unquote(results["qsd"]["thread"])
             # Markdown is implied
-            results['format'] = NotifyFormat.MARKDOWN
+            results["format"] = NotifyFormat.MARKDOWN
+
+        # Extract ping targets, comma/space separated
+        if "ping" in results["qsd"]:
+            results["ping"] = NotifyDiscord.unquote(results["qsd"]["ping"])
 
         return results
 
     @staticmethod
-    def parse_native_url(url):
+    def parse_native_url(url: str) -> dict[str, Any] | None:
         """
         Support https://discord.com/api/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
         Support Legacy URL as well:
@@ -713,56 +789,118 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://discord(app)?\.com/api/webhooks/'
-            r'(?P<webhook_id>[0-9]+)/'
-            r'(?P<webhook_token>[A-Z0-9_-]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://discord(app)?\.com/api/webhooks/"
+            r"(?P<webhook_id>[0-9]+)/"
+            r"(?P<webhook_token>[A-Z0-9_-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyDiscord.parse_url(
-                '{schema}://{webhook_id}/{webhook_token}/{params}'.format(
+                "{schema}://{webhook_id}/{webhook_token}/{params}".format(
                     schema=NotifyDiscord.secure_protocol,
-                    webhook_id=result.group('webhook_id'),
-                    webhook_token=result.group('webhook_token'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    webhook_id=result.group("webhook_id"),
+                    webhook_token=result.group("webhook_token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
 
-    @staticmethod
-    def extract_markdown_sections(markdown):
+    def ping_payload(self, *args: str) -> dict[str, Any]:
         """
-        Takes a string in a markdown type format and extracts
-        the headers and their corresponding sections into individual
-        fields that get passed as an embed entry to Discord.
+        Takes one or more strings and applies the payload associated with
+        pinging the users detected within.
 
+        This returns a dict that may contain:
+          - allow_mentions
+          - content (starting with "๐Ÿ‘‰ " and containing mention tokens)
         """
+
+        payload: dict[str, Any] = {}
+
+        roles: set[str] = set()
+        users: set[str] = set()
+        parse: set[str] = set()
+
+        for arg in args:
+            # parse for user id's <@123> and role IDs <@&456>
+            results = USER_ROLE_DETECTION_RE.findall(arg)
+            if not results:
+                continue
+
+            for is_role, no, value in results:
+                if value:
+                    parse.add(value)
+
+                elif is_role:
+                    roles.add(no)
+
+                else:  # is_user
+                    users.add(no)
+
+        if not (roles or users or parse):
+            # Nothing to add
+            return payload
+
+        payload["allow_mentions"] = {
+            "parse": list(parse),
+            "users": list(users),
+            "roles": list(roles),
+        }
+
+        payload["content"] = "๐Ÿ‘‰ " + " ".join(
+            chain(
+                [f"@{value}" for value in parse],
+                [f"<@&{value}>" for value in roles],
+                [f"<@{value}>" for value in users],
+            )
+        )
+
+        return payload
+
+    @staticmethod
+    def extract_markdown_sections(
+            markdown: str) -> tuple[str, list[dict[str, str]]]:
+        """Extract headers and their corresponding sections into embed
+        fields."""
+
         # Search for any header information found without it's own section
         # identifier
         match = re.match(
-            r'^\s*(?P<desc>[^\s#]+.*?)(?=\s*$|[\r\n]+\s*#)',
-            markdown, flags=re.S)
+            r"^\s*(?P<desc>[^\s#]+.*?)(?=\s*$|[\r\n]+\s*#)",
+            markdown,
+            flags=re.S,
+        )
 
-        description = match.group('desc').strip() if match else ''
+        description = match.group("desc").strip() if match else ""
         if description:
             # Strip description from our string since it has been handled
             # now.
-            markdown = re.sub(re.escape(description), '', markdown, count=1)
+            markdown = re.sub(re.escape(description), "", markdown, count=1)
 
         regex = re.compile(
-            r'\s*#[# \t\v]*(?P<name>[^\n]+)(\n|\s*$)'
-            r'\s*((?P<value>[^#].+?)(?=\s*$|[\r\n]+\s*#))?', flags=re.S)
+            r"\s*#[# \t\v]*(?P<name>[^\n]+)(\n|\s*$)"
+            r"\s*((?P<value>[^#].+?)(?=\s*$|[\r\n]+\s*#))?",
+            flags=re.S,
+        )
 
         common = regex.finditer(markdown)
-        fields = list()
+        fields: list[dict[str, str]] = []
         for el in common:
             d = el.groupdict()
 
             fields.append({
-                'name': d.get('name', '').strip('#`* \r\n\t\v'),
-                'value': '```{}\n{}```'.format(
-                    'md' if d.get('value') else '',
-                    d.get('value').strip() + '\n' if d.get('value') else '',
+                "name": d.get("name", "").strip("#`* \r\n\t\v"),
+                "value": "```{}\n{}```".format(
+                    "md" if d.get("value") else "",
+                    (d.get("value").strip() + "\n" if d.get("value") else ""),
                 ),
             })
 
diff --git a/libs/apprise/plugins/dot.py b/libs/apprise/plugins/dot.py
new file mode 100644
index 0000000000..5b386059f0
--- /dev/null
+++ b/libs/apprise/plugins/dot.py
@@ -0,0 +1,618 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+#
+# API: https://dot.mindreset.tech/docs/service/studio/api/text_api
+#      https://dot.mindreset.tech/docs/service/studio/api/image_api
+#
+# Text API Fields:
+#   - refreshNow (bool, optional, default true): controls display timing.
+#   - deviceId (string, required): unique device serial.
+#   - title (string, optional): title text shown on screen.
+#   - message (string, optional): body text shown on screen.
+#   - signature (string, optional): footer/signature text.
+#   - icon (string, optional): base64 PNG icon (40px x 40px).
+#   - link (string, optional): tap-to-interact target URL.
+#
+# Image API Fields:
+#   - refreshNow (bool, optional, default true): controls display timing.
+#   - deviceId (string, required): unique device serial.
+#   - image (string, required): base64 PNG image (296px x 152px).
+#   - link (string, optional): tap-to-interact target URL.
+#   - border (number, optional, default 0): 0=white, 1=black frame.
+#   - ditherType (string, optional, default DIFFUSION): dithering mode.
+#   - ditherKernel (string, optional, default FLOYD_STEINBERG):
+#     dithering kernel.
+
+from contextlib import suppress
+import json
+import logging
+
+import requests
+
+from ..common import NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
+
+# Supported Dither Types
+DOT_DITHER_TYPES = (
+    "DIFFUSION",
+    "ORDERED",
+    "NONE",
+)
+
+# Supported Dither Kernels
+DOT_DITHER_KERNELS = (
+    "THRESHOLD",
+    "ATKINSON",
+    "BURKES",
+    "FLOYD_STEINBERG",
+    "SIERRA2",
+    "STUCKI",
+    "JARVIS_JUDICE_NINKE",
+    "DIFFUSION_ROW",
+    "DIFFUSION_COLUMN",
+    "DIFFUSION_2D",
+)
+
+
+class NotifyDot(NotifyBase):
+    """A wrapper for Dot. Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "Dot."
+    # Alias: devices marketed as "Quote/0" remain discoverable.
+
+    # The services URL
+    service_url = "https://dot.mindreset.tech"
+
+    # All notification requests are secure
+    secure_protocol = "dot"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/dot/"
+
+    # Allows the user to specify the NotifyImageSize object
+    image_size = NotifyImageSize.XY_128
+
+    # Support Attachments
+    attachment_support = True
+
+    # Supported API modes
+    SUPPORTED_MODES = ("text", "image")
+
+    DEFAULT_MODE = "text"
+
+    # Define object templates
+    templates = ("{schema}://{apikey}@{device_id}/{mode}/",)
+
+    # Define our template arguments
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+            },
+            "device_id": {
+                "name": _("Device Serial Number"),
+                "type": "string",
+                "required": True,
+                "map_to": "device_id",
+            },
+            "mode": {
+                "name": _("API Mode"),
+                "type": "choice:string",
+                "values": SUPPORTED_MODES,
+                "default": DEFAULT_MODE,
+                "map_to": "mode",
+            },
+        },
+    )
+
+    # Define our template arguments
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "refresh": {
+                "name": _("Refresh Now"),
+                "type": "bool",
+                "default": True,
+                "map_to": "refresh_now",
+            },
+            "signature": {
+                "name": _("Text Signature"),
+                "type": "string",
+            },
+            "icon": {
+                "name": _("Icon Base64 (Text API)"),
+                "type": "string",
+            },
+            "image": {
+                "name": _("Image Base64 (Image API)"),
+                "type": "string",
+                "map_to": "image_data",
+            },
+            "link": {
+                "name": _("Link"),
+                "type": "string",
+            },
+            "border": {
+                "name": _("Border"),
+                "type": "int",
+                "min": 0,
+                "max": 1,
+                "default": 0,
+            },
+            "dither_type": {
+                "name": _("Dither Type"),
+                "type": "choice:string",
+                "values": DOT_DITHER_TYPES,
+                "default": "DIFFUSION",
+            },
+            "dither_kernel": {
+                "name": _("Dither Kernel"),
+                "type": "choice:string",
+                "values": DOT_DITHER_KERNELS,
+                "default": "FLOYD_STEINBERG",
+            },
+        },
+    )
+    # Note:
+    # - icon (Text API): base64 PNG icon (40px x 40px) in lower-left corner.
+    #   Can be provided via `icon` parameter or first attachment.
+    # - image (Image API): base64 PNG image (296px x 152px) supplied via
+    #   configuration `image` parameter or first attachment.
+    # - Only the first attachment is used; multiple attachments trigger a
+    #   warning.
+
+    def __init__(
+        self,
+        apikey=None,
+        device_id=None,
+        mode=DEFAULT_MODE,
+        refresh_now=True,
+        signature=None,
+        icon=None,
+        link=None,
+        border=None,
+        dither_type=None,
+        dither_kernel=None,
+        image_data=None,
+        **kwargs,
+    ):
+        """Initialize Notify Dot Object."""
+        super().__init__(**kwargs)
+
+        # API Key (from user)
+        self.apikey = apikey
+
+        # Device ID tracks the Dot hardware serial.
+        self.device_id = device_id
+
+        # Refresh Now flag: True shows content immediately (default).
+        self.refresh_now = parse_bool(refresh_now, default=True)
+
+        # API mode ("text" or "image")
+        self.mode = (
+            mode.lower()
+            if isinstance(mode, str) and mode.lower() in self.SUPPORTED_MODES
+            else self.DEFAULT_MODE
+        )
+        if (
+            not isinstance(mode, str)
+            or mode.lower() not in self.SUPPORTED_MODES
+        ):
+            self.logger.warning(
+                "Unsupported Dot mode (%s) specified; defaulting to '%s'.",
+                mode,
+                self.mode,
+            )
+
+        # Signature text used by the Text API footer.
+        self.signature = signature if isinstance(signature, str) else None
+
+        # Icon for the Text API (base64 PNG 40x40, lower-left corner).
+        # Note: distinct from the Image API "image" field.
+        self.icon = icon if isinstance(icon, str) else None
+
+        # Image payload for the Image API (base64 PNG 296x152).
+        self.image_data = image_data if isinstance(image_data, str) else None
+        if self.mode == "text" and self.image_data:
+            self.logger.warning(
+                "Image data provided in text mode; ignoring configurable"
+                " image payload."
+            )
+            self.image_data = None
+
+        # Link for tap-to-interact navigation.
+        self.link = link if isinstance(link, str) else None
+
+        # Border for the Image API
+        self.border = border
+
+        # Dither type for Image API
+        self.dither_type = dither_type
+
+        # Dither kernel for the Image API
+        self.dither_kernel = dither_kernel
+
+        # Text API endpoint
+        self.text_api_url = "https://dot.mindreset.tech/api/open/text"
+
+        # Image API endpoint
+        self.image_api_url = "https://dot.mindreset.tech/api/open/image"
+
+        return
+
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Dot Notification."""
+
+        if not self.apikey:
+            self.logger.warning("No API key was specified")
+            return False
+
+        if not self.device_id:
+            self.logger.warning("No device ID was specified")
+            return False
+
+        # Prepare our headers
+        headers = {
+            "Authorization": f"Bearer {self.apikey}",
+            "Content-Type": "application/json",
+            "User-Agent": self.app_id,
+        }
+
+        if self.mode == "image":
+            if title or body:
+                self.logger.warning(
+                    "Title and body are not supported in image mode "
+                    "and will be ignored."
+                )
+
+            image_data = (
+                self.image_data if isinstance(self.image_data, str) else None
+            )
+
+            # Use first attachment as image if no image_data provided
+            # attachment.base64() returns base64-encoded string for API
+            if not image_data and attach and self.attachment_support:
+                if len(attach) > 1:
+                    self.logger.warning(
+                        "Multiple attachments provided; only the first "
+                        "one will be used as image."
+                    )
+                try:
+                    attachment = attach[0]
+                    if attachment:
+                        # Convert attachment to base64-encoded string
+                        image_data = attachment.base64()
+                except Exception as e:
+                    self.logger.warning(f"Failed to process attachment: {e!s}")
+
+            if not image_data:
+                self.logger.warning(
+                    "Image API mode selected but no image data was provided."
+                )
+                return False
+
+            # Use Image API
+            # Image API payload:
+            #   refreshNow: display timing control.
+            #   deviceId: Dot device serial (required).
+            #   image: base64 PNG 296x152 (required).
+            #   link: optional tap target.
+            #   border: optional frame color.
+            #   ditherType: optional dithering mode.
+            #   ditherKernel: optional dithering kernel.
+            payload = {
+                "refreshNow": self.refresh_now,
+                "deviceId": self.device_id,
+                "image": image_data,  # Image payload shown on screen
+            }
+
+            if self.link:
+                payload["link"] = self.link
+
+            if self.border is not None:
+                payload["border"] = self.border
+
+            if self.dither_type is not None:
+                payload["ditherType"] = self.dither_type
+
+            if self.dither_kernel is not None:
+                payload["ditherKernel"] = self.dither_kernel
+
+            api_url = self.image_api_url
+
+        else:
+            # Use Text API
+            # Text API payload:
+            #   refreshNow: display timing control.
+            #   deviceId: Dot device serial (required).
+            #   title: optional title on screen.
+            #   message: optional body on screen.
+            #   signature: optional footer text.
+            #   icon: optional base64 PNG icon (40x40).
+            #   link: optional tap target.
+            payload = {
+                "refreshNow": self.refresh_now,
+                "deviceId": self.device_id,
+            }
+
+            if title:
+                payload["title"] = title
+
+            if body:
+                payload["message"] = body
+
+            if self.signature:
+                payload["signature"] = (
+                    self.signature
+                )  # Footer/signature displayed on screen
+
+            # Use first attachment as icon if no icon provided
+            # attachment.base64() returns base64-encoded string for API
+            icon_data = self.icon
+            if not icon_data and attach and self.attachment_support:
+                if len(attach) > 1:
+                    self.logger.warning(
+                        "Multiple attachments provided; only the first "
+                        "one will be used as icon."
+                    )
+                try:
+                    attachment = attach[0]
+                    if attachment:
+                        # Convert attachment to base64-encoded string
+                        icon_data = attachment.base64()
+                except Exception as e:
+                    self.logger.warning(f"Failed to process attachment: {e!s}")
+
+            if icon_data:
+                # Text API icon payload
+                payload["icon"] = icon_data
+
+            if self.link:
+                payload["link"] = self.link
+
+            api_url = self.text_api_url
+
+        # Some Debug Logging
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                "Dot POST URL:"
+                f" {api_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug("Dot Payload %s", sanitize_payload(payload))
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+
+        try:
+            r = requests.post(
+                api_url,
+                data=json.dumps(payload),
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            if r.status_code == requests.codes.ok:
+                self.logger.info(f"Sent Dot notification to {self.device_id}.")
+                return True
+
+            # We had a problem
+            status_str = NotifyDot.http_response_code_lookup(r.status_code)
+
+            self.logger.warning(
+                "Failed to send Dot notification to {}: "
+                "{}{}error={}.".format(
+                    self.device_id,
+                    status_str,
+                    ", " if status_str else "",
+                    r.status_code,
+                )
+            )
+
+            self.logger.debug(
+                "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+            return False
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                "A Connection error occurred sending Dot "
+                f"notification to {self.device_id}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
+
+            return False
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another similar one.
+        """
+        return (
+            self.secure_protocol,
+            self.apikey,
+            self.device_id,
+            self.mode,
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        # Define any URL parameters
+        params = {
+            "refresh": "yes" if self.refresh_now else "no",
+        }
+
+        if self.mode == "text":
+            if self.signature:
+                params["signature"] = self.signature
+
+            if self.icon:
+                params["icon"] = self.icon
+
+            if self.link:
+                params["link"] = self.link
+
+        else:  # image mode
+            if self.image_data:
+                params["image"] = self.image_data
+
+            if self.link:
+                params["link"] = self.link
+
+            if self.border is not None:
+                params["border"] = str(self.border)
+
+            if self.dither_type and self.dither_type != "DIFFUSION":
+                params["dither_type"] = self.dither_type
+
+            if self.dither_kernel and self.dither_kernel != "FLOYD_STEINBERG":
+                params["dither_kernel"] = self.dither_kernel
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        mode_segment = f"/{self.mode}/"
+
+        return "{schema}://{apikey}@{device_id}{mode}?{params}".format(
+            schema=self.secure_protocol,
+            apikey=self.pprint(
+                self.apikey, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            device_id=NotifyDot.quote(self.device_id, safe=""),
+            mode=mode_segment,
+            params=NotifyDot.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification."""
+        return 1 if self.device_id else 0
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+
+        results = NotifyBase.parse_url(url)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Determine API mode from path (default to text)
+        mode = NotifyDot.DEFAULT_MODE
+        path_tokens = NotifyDot.split_path(results.get("fullpath"))
+        if path_tokens:
+            candidate = path_tokens.pop(0).lower()
+            if candidate in NotifyDot.SUPPORTED_MODES:
+                mode = candidate
+            else:
+                NotifyDot.logger.warning(
+                    "Unsupported Dot mode (%s) detected; defaulting to '%s'.",
+                    candidate,
+                    NotifyDot.DEFAULT_MODE,
+                )
+        results["mode"] = mode
+        remaining_path = "/".join(path_tokens)
+        results["fullpath"] = "/" + remaining_path if remaining_path else "/"
+        results["path"] = remaining_path
+
+        # Extract API key from user
+        user = results.get("user")
+        if user:
+            results["apikey"] = NotifyDot.unquote(user)
+
+        # Extract device ID from hostname
+        host = results.get("host")
+        if host:
+            results["device_id"] = NotifyDot.unquote(host)
+
+        # Refresh Now
+        refresh_value = results["qsd"].get("refresh")
+        if refresh_value:
+            results["refresh_now"] = parse_bool(refresh_value.strip())
+
+        # Signature
+        signature_value = results["qsd"].get("signature")
+        if signature_value:
+            results["signature"] = NotifyDot.unquote(signature_value.strip())
+
+        # Icon
+        icon_value = results["qsd"].get("icon")
+        if icon_value:
+            results["icon"] = NotifyDot.unquote(icon_value.strip())
+
+        # Link
+        link_value = results["qsd"].get("link")
+        if link_value:
+            results["link"] = NotifyDot.unquote(link_value.strip())
+
+        # Border
+        border_value = results["qsd"].get("border")
+        if border_value:
+            with suppress(TypeError, ValueError):
+                results["border"] = int(border_value.strip())
+
+        # Dither Type
+        dither_type_value = results["qsd"].get("dither_type")
+        if dither_type_value:
+            results["dither_type"] = NotifyDot.unquote(
+                dither_type_value.strip()
+            )
+
+        # Dither Kernel
+        dither_kernel_value = results["qsd"].get("dither_kernel")
+        if dither_kernel_value:
+            results["dither_kernel"] = NotifyDot.unquote(
+                dither_kernel_value.strip()
+            )
+
+        # Image (Image API)
+        image_value = results["qsd"].get("image")
+        if image_value:
+            results["image_data"] = NotifyDot.unquote(image_value.strip())
+
+        return results
diff --git a/libs/apprise/plugins/email/__init__.py b/libs/apprise/plugins/email/__init__.py
index d2d7e6be75..835b52898c 100644
--- a/libs/apprise/plugins/email/__init__.py
+++ b/libs/apprise/plugins/email/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,24 +29,23 @@
 
 from .base import NotifyEmail
 from .common import (
-    AppriseEmailException, EmailMessage, SecureMailMode, SECURE_MODES,
-    WebBaseLogin)
+    SECURE_MODES,
+    AppriseEmailException,
+    EmailMessage,
+    SecureMailMode,
+    WebBaseLogin,
+)
 from .templates import EMAIL_TEMPLATES
 
 # Globally Default encoding mode set to Quoted Printable.
-charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8')
+charset.add_charset("utf-8", charset.QP, charset.QP, "utf-8")
 
 __all__ = [
-    # Reference
-    'NotifyEmail',
-
-    # Pretty Good Privacy
-    'ApprisePGPController', 'ApprisePGPException',
-
-    # Other
-    'AppriseEmailException', 'EmailMessage', 'SecureMailMode', 'SECURE_MODES',
-    'WebBaseLogin',
-
-    # Additional entries that may be useful to some developers
-    'EMAIL_TEMPLATES', 'PGP_SUPPORT',
+    "EMAIL_TEMPLATES",
+    "SECURE_MODES",
+    "AppriseEmailException",
+    "EmailMessage",
+    "NotifyEmail",
+    "SecureMailMode",
+    "WebBaseLogin",
 ]
diff --git a/libs/apprise/plugins/email/base.py b/libs/apprise/plugins/email/base.py
index ce89cb3d7d..2aa00d3c5a 100644
--- a/libs/apprise/plugins/email/base.py
+++ b/libs/apprise/plugins/email/base.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,32 +25,39 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
-import smtplib
-from email.mime.text import MIMEText
+from datetime import datetime
+from email.header import Header
 from email.mime.application import MIMEApplication
-from email.mime.multipart import MIMEMultipart
 from email.mime.base import MIMEBase
-from email.utils import formataddr, make_msgid
-from email.header import Header
-
-from socket import error as SocketError
-from datetime import datetime
-from datetime import timezone
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from email.utils import format_datetime, formataddr, make_msgid
+import re
+import smtplib
+from typing import Optional
 
-from ..base import NotifyBase
-from ...url import PrivacyMode
-from ...common import NotifyFormat, NotifyType
+from ...common import NotifyFormat, NotifyType, PersistentStoreMode
 from ...conversion import convert_between
-from ...utils import pgp as _pgp
-from ...utils.parse import (
-    is_ipaddr, is_email, parse_emails, is_hostname, parse_bool)
 from ...locale import gettext_lazy as _
 from ...logger import logger
-from .common import (
-    AppriseEmailException, EmailMessage, SecureMailMode, SECURE_MODES,
-    WebBaseLogin)
+from ...url import PrivacyMode
+from ...utils import pgp as _pgp
+from ...utils.parse import (
+    is_email,
+    is_hostname,
+    is_ipaddr,
+    parse_bool,
+    parse_emails,
+)
+from ..base import NotifyBase
 from . import templates
+from .common import (
+    SECURE_MODES,
+    AppriseEmailException,
+    EmailMessage,
+    SecureMailMode,
+    WebBaseLogin,
+)
 
 
 class NotifyEmail(NotifyBase):
@@ -61,20 +67,24 @@ class NotifyEmail(NotifyBase):
     """
 
     # The default descriptive name associated with the Notification
-    service_name = 'E-Mail'
+    service_name = "E-Mail"
 
     # The default simple (insecure) protocol
-    protocol = 'mailto'
+    protocol = "mailto"
 
     # The default secure protocol
-    secure_protocol = 'mailtos'
+    secure_protocol = "mailtos"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_email'
+    setup_url = "https://appriseit.com/services/email/"
 
     # Support attachments
     attachment_support = True
 
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference; this allows us to auto-generate our config if needed
+    storage_mode = PersistentStoreMode.AUTO
+
     # Default Notify Format
     notify_format = NotifyFormat.HTML
 
@@ -83,121 +93,138 @@ class NotifyEmail(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{host}/{targets}',
-        '{schema}://{host}:{port}/{targets}',
-        '{schema}://{user}@{host}',
-        '{schema}://{user}@{host}:{port}',
-        '{schema}://{user}@{host}/{targets}',
-        '{schema}://{user}@{host}:{port}/{targets}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{host}/{targets}",
+        "{schema}://{host}:{port}/{targets}",
+        "{schema}://{user}@{host}",
+        "{schema}://{user}@{host}:{port}",
+        "{schema}://{user}@{host}/{targets}",
+        "{schema}://{user}@{host}:{port}/{targets}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'host': {
-            'name': _('Domain'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "host": {
+                "name": _("Domain"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'name': _('To Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'from': {
-            'name': _('From Email'),
-            'type': 'string',
-            'map_to': 'from_addr',
-        },
-        'name': {
-            'name': _('From Name'),
-            'type': 'string',
-            'map_to': 'from_addr',
-        },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'smtp': {
-            'name': _('SMTP Server'),
-            'type': 'string',
-            'map_to': 'smtp_host',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "name": _("To Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "from": {
+                "name": _("From Email"),
+                "type": "string",
+                "map_to": "from_addr",
+            },
+            "name": {
+                "name": _("From Name"),
+                "type": "string",
+                "map_to": "from_addr",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "smtp": {
+                "name": _("SMTP Server"),
+                "type": "string",
+                "map_to": "smtp_host",
+            },
+            "mode": {
+                "name": _("Secure Mode"),
+                "type": "choice:string",
+                "values": SECURE_MODES,
+                "default": SecureMailMode.STARTTLS,
+                "map_to": "secure_mode",
+            },
+            "reply": {
+                "name": _("Reply To"),
+                "type": "list:string",
+                "map_to": "reply_to",
+            },
+            "pgp": {
+                "name": _("PGP Encryption"),
+                "type": "bool",
+                "map_to": "use_pgp",
+                "default": False,
+            },
+            "pgpkey": {
+                "name": _("PGP Public Key Path"),
+                "type": "string",
+                "private": True,
+                # By default persistent storage is referenced
+                "default": "",
+                "map_to": "pgp_key",
+            },
         },
-        'mode': {
-            'name': _('Secure Mode'),
-            'type': 'choice:string',
-            'values': SECURE_MODES,
-            'default': SecureMailMode.STARTTLS,
-            'map_to': 'secure_mode',
-        },
-        'reply': {
-            'name': _('Reply To'),
-            'type': 'list:string',
-            'map_to': 'reply_to',
-        },
-        'pgp': {
-            'name': _('PGP Encryption'),
-            'type': 'bool',
-            'map_to': 'use_pgp',
-            'default': False,
-        },
-        'pgpkey': {
-            'name': _('PGP Public Key Path'),
-            'type': 'string',
-            'private': True,
-            # By default persistent storage is referenced
-            'default': '',
-            'map_to': 'pgp_key',
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('Email Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("Email Header"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
-                 targets=None, cc=None, bcc=None, reply_to=None, headers=None,
-                 use_pgp=None, pgp_key=None, **kwargs):
+    def __init__(
+        self,
+        smtp_host=None,
+        from_addr=None,
+        secure_mode=None,
+        targets=None,
+        cc=None,
+        bcc=None,
+        reply_to=None,
+        headers=None,
+        use_pgp=None,
+        pgp_key=None,
+        **kwargs,
+    ):
         """
         Initialize Email Object
 
@@ -207,7 +234,7 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         super().__init__(**kwargs)
 
         # Acquire Email 'To'
-        self.targets = list()
+        self.targets = []
 
         # Acquire Carbon Copies
         self.cc = set()
@@ -228,24 +255,29 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
 
         # Now we want to construct the To and From email
         # addresses from the URL provided
-        self.from_addr = [False, '']
+        self.from_addr = [False, ""]
 
         # Now detect the SMTP Server
-        self.smtp_host = \
-            smtp_host if isinstance(smtp_host, str) else ''
+        self.smtp_host = smtp_host if isinstance(smtp_host, str) else ""
 
         # Now detect secure mode
         if secure_mode:
-            self.secure_mode = None \
-                if not isinstance(secure_mode, str) \
+            self.secure_mode = (
+                None
+                if not isinstance(secure_mode, str)
                 else secure_mode.lower()
+            )
         else:
-            self.secure_mode = SecureMailMode.INSECURE \
-                if not self.secure else self.template_args['mode']['default']
+            self.secure_mode = (
+                SecureMailMode.INSECURE
+                if not self.secure
+                else self.template_args["mode"]["default"]
+            )
 
         if self.secure_mode not in SECURE_MODES:
-            msg = 'The secure mode specified ({}) is invalid.'\
-                  .format(secure_mode)
+            msg = "The secure mode specified ({}) is invalid.".format(
+                secure_mode
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -253,48 +285,53 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         for recipient in parse_emails(cc):
             email = is_email(recipient)
             if email:
-                self.cc.add(email['full_email'])
+                self.cc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Carbon Copy email ({}) specified.".format(
+                    recipient
+                ),
             )
 
         # Validate recipients (bcc:) and drop bad ones:
         for recipient in parse_emails(bcc):
             email = is_email(recipient)
             if email:
-                self.bcc.add(email['full_email'])
+                self.bcc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                "({}) specified.".format(recipient),
             )
 
         # Validate recipients (reply-to:) and drop bad ones:
         for recipient in parse_emails(reply_to):
             email = is_email(recipient)
             if email:
-                self.reply_to.add(email['full_email'])
+                self.reply_to.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Reply To email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Reply To email ({}) specified.".format(
+                    recipient
+                ),
             )
 
         # Apply any defaults based on certain known configurations
@@ -303,24 +340,28 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         if self.user:
             if self.host:
                 # Prepare the bases of our email
-                self.from_addr = [self.app_id, '{}@{}'.format(
-                    re.split(r'[\s@]+', self.user)[0],
-                    self.host,
-                )]
+                self.from_addr = [
+                    self.app_id,
+                    "{}@{}".format(
+                        re.split(r"[\s@]+", self.user)[0],
+                        self.host,
+                    ),
+                ]
 
             else:
                 result = is_email(self.user)
                 if result:
                     # Prepare the bases of our email and include domain
-                    self.host = result['domain']
+                    self.host = result["domain"]
                     self.from_addr = [self.app_id, self.user]
 
         if from_addr:
             result = is_email(from_addr)
             if result:
                 self.from_addr = (
-                    result['name'] if result['name'] else False,
-                    result['full_email'])
+                    result["name"] if result["name"] else False,
+                    result["full_email"],
+                )
             else:
                 # Only update the string but use the already detected info
                 self.from_addr[0] = from_addr
@@ -328,9 +369,11 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         result = is_email(self.from_addr[1])
         if not result:
             # Parse Source domain based on from_addr
-            msg = 'Invalid ~From~ email specified: {}'.format(
-                '{} <{}>'.format(self.from_addr[0], self.from_addr[1])
-                if self.from_addr[0] else '{}'.format(self.from_addr[1]))
+            msg = "Invalid ~From~ email specified: {}".format(
+                "{} <{}>".format(self.from_addr[0], self.from_addr[1])
+                if self.from_addr[0]
+                else "{}".format(self.from_addr[1])
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -342,14 +385,16 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
             for recipient in parse_emails(targets):
                 result = is_email(recipient)
                 if result:
-                    self.targets.append(
-                        (result['name'] if result['name'] else False,
-                            result['full_email']))
+                    self.targets.append((
+                        result["name"] if result["name"] else False,
+                        result["full_email"],
+                    ))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid To email '
-                    '({}) specified.'.format(recipient),
+                    "Dropped invalid To email ({}) specified.".format(
+                        recipient
+                    ),
                 )
 
         else:
@@ -363,7 +408,7 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
         if not self.port:
             # Assign our port based on our secure_mode if not otherwise
             # detected
-            self.port = SECURE_MODES[self.secure_mode]['default_port']
+            self.port = SECURE_MODES[self.secure_mode]["default_port"]
 
         # if there is still no smtp_host then we fall back to the hostname
         if not self.smtp_host:
@@ -371,19 +416,24 @@ def __init__(self, smtp_host=None, from_addr=None, secure_mode=None,
 
         # Prepare our Pretty Good Privacy Object
         self.pgp = _pgp.ApprisePGPController(
-            path=self.store.path, pub_keyfile=pgp_key,
-            email=self.from_addr[1], asset=self.asset)
+            path=self.store.path,
+            pub_keyfile=pgp_key,
+            email=self.from_addr[1],
+            asset=self.asset,
+        )
 
         # We store so we can generate a URL later on
         self.pgp_key = pgp_key
 
-        self.use_pgp = use_pgp if not None \
-            else self.template_args['pgp']['default']
+        self.use_pgp = (
+            use_pgp if not None else self.template_args["pgp"]["default"]
+        )
 
         if self.use_pgp and not _pgp.PGP_SUPPORT:
             self.logger.warning(
-                'PGP Support is not available on this installation; '
-                'ask admin to install PGPy')
+                "PGP Support is not available on this installation; "
+                "ask admin to install PGPy"
+            )
 
         return
 
@@ -393,7 +443,7 @@ def apply_email_defaults(self, secure_mode=None, port=None, **kwargs):
         it was provided.
         """
 
-        if self.smtp_host or not self.user:
+        if self.smtp_host:
             # SMTP Server was explicitly specified, therefore it is assumed
             # the caller knows what he's doing and is intentionally
             # over-riding any smarts to be applied. We also can not apply
@@ -401,45 +451,54 @@ def apply_email_defaults(self, secure_mode=None, port=None, **kwargs):
             return
 
         # detect our email address using our user/host combo
-        from_addr = '{}@{}'.format(
-            re.split(r'[\s@]+', self.user)[0],
-            self.host,
+        from_addr = (
+            "{}@{}".format(
+                re.split(r"[\s@]+", self.user)[0],
+                self.host,
+            )
+            if self.user
+            else self.host
         )
 
         for i in range(len(templates.EMAIL_TEMPLATES)):  # pragma: no branch
-            self.logger.trace('Scanning %s against %s' % (
-                from_addr, templates.EMAIL_TEMPLATES[i][0]
-            ))
+            self.logger.trace(
+                "Scanning %s against %s",
+                from_addr, templates.EMAIL_TEMPLATES[i][0])
+
             match = templates.EMAIL_TEMPLATES[i][1].match(from_addr)
             if match:
                 self.logger.info(
-                    'Applying %s Defaults' %
-                    templates.EMAIL_TEMPLATES[i][0],
-                )
+                    f"Applying {templates.EMAIL_TEMPLATES[i][0]} Defaults")
+
                 # the secure flag can not be altered if defined in the template
-                self.secure = templates.EMAIL_TEMPLATES[i][2]\
-                    .get('secure', self.secure)
+                self.secure = templates.EMAIL_TEMPLATES[i][2].get(
+                    "secure", self.secure
+                )
 
                 # The SMTP Host check is already done above; if it was
                 # specified we wouldn't even reach this part of the code.
-                self.smtp_host = templates.EMAIL_TEMPLATES[i][2]\
-                    .get('smtp_host', self.smtp_host)
+                self.smtp_host = templates.EMAIL_TEMPLATES[i][2].get(
+                    "smtp_host", self.smtp_host
+                )
 
                 # The following can be over-ridden if defined manually in the
                 # Apprise URL.  Otherwise they take on the template value
                 if not port:
-                    self.port = templates.EMAIL_TEMPLATES[i][2]\
-                        .get('port', self.port)
+                    self.port = templates.EMAIL_TEMPLATES[i][2].get(
+                        "port", self.port
+                    )
                 if not secure_mode:
-                    self.secure_mode = templates.EMAIL_TEMPLATES[i][2]\
-                        .get('secure_mode', self.secure_mode)
+                    self.secure_mode = templates.EMAIL_TEMPLATES[i][2].get(
+                        "secure_mode", self.secure_mode
+                    )
 
                 # Adjust email login based on the defined usertype. If no entry
                 # was specified, then we default to having them all set (which
                 # basically implies that there are no restrictions and use use
                 # whatever was specified)
-                login_type = \
-                    templates.EMAIL_TEMPLATES[i][2].get('login_type', [])
+                login_type = templates.EMAIL_TEMPLATES[i][2].get(
+                    "login_type", []
+                )
                 if login_type:
                     # only apply additional logic to our user if a login_type
                     # was specified.
@@ -447,25 +506,41 @@ def apply_email_defaults(self, secure_mode=None, port=None, **kwargs):
                         if WebBaseLogin.EMAIL not in login_type:
                             # Email specified but login type
                             # not supported; switch it to user id
-                            self.user = match.group('id')
+                            self.user = match.group("id")
 
                         else:
                             # Enforce our host information
-                            self.host = self.user.split('@')[1]
+                            self.host = self.user.split("@")[1]
 
                     elif WebBaseLogin.USERID not in login_type:
                         # user specified but login type
                         # not supported; switch it to email
-                        self.user = '{}@{}'.format(self.user, self.host)
+                        self.user = "{}@{}".format(self.user, self.host)
+
+                if (
+                    "from_user" in templates.EMAIL_TEMPLATES[i][2]
+                    and not self.from_addr[1]
+                ):
+
+                    # Update our from address if defined
+                    self.from_addr[1] = "{}@{}".format(
+                        templates.EMAIL_TEMPLATES[i][2]["from_user"], self.host
+                    )
 
                 break
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
 
         if not self.targets:
             # There is no one to email; we're done
-            logger.warning('There are no Email recipients to notify')
+            logger.warning("There are no Email recipients to notify")
             return False
 
         # error tracking (used for function return)
@@ -478,10 +553,10 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         self.throttle()
 
         try:
-            self.logger.debug('Connecting to remote SMTP server...')
+            self.logger.debug("Connecting to remote SMTP server...")
             socket_func = smtplib.SMTP
             if self.secure_mode == SecureMailMode.SSL:
-                self.logger.debug('Securing connection with SSL...')
+                self.logger.debug("Securing connection with SSL...")
                 socket_func = smtplib.SMTP_SSL
 
             socket = socket_func(
@@ -493,57 +568,67 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
             if self.secure_mode == SecureMailMode.STARTTLS:
                 # Handle Secure Connections
-                self.logger.debug('Securing connection with STARTTLS...')
+                self.logger.debug("Securing connection with STARTTLS...")
                 socket.starttls()
 
-            self.logger.trace('Login ID: {}'.format(self.user))
+            self.logger.trace("Login ID: {}".format(self.user))
             if self.user and self.password:
-                # Apply Login credetials
-                self.logger.debug('Applying user credentials...')
+                # Apply Login credentials
+                self.logger.debug("Applying user credentials...")
                 socket.login(self.user, self.password)
 
             # Prepare our headers
             headers = {
-                'X-Application': self.app_id,
+                "X-Application": self.app_id,
             }
             headers.update(self.headers)
 
             # Iterate over our email messages we can generate and then
             # send them off.
             for message in NotifyEmail.prepare_emails(
-                    subject=title, body=body, notify_format=self.notify_format,
-                    from_addr=self.from_addr, to=self.targets,
-                    cc=self.cc, bcc=self.bcc, reply_to=self.reply_to,
-                    smtp_host=self.smtp_host,
-                    attach=attach, headers=headers, names=self.names,
-                    pgp=self.pgp if self.use_pgp else None):
+                subject=title,
+                body=body,
+                notify_format=self.notify_format,
+                from_addr=self.from_addr,
+                to=self.targets,
+                cc=self.cc,
+                bcc=self.bcc,
+                reply_to=self.reply_to,
+                smtp_host=self.smtp_host,
+                attach=attach,
+                headers=headers,
+                names=self.names,
+                pgp=self.pgp if self.use_pgp else None,
+                tzinfo=self.tzinfo,
+            ):
                 try:
                     socket.sendmail(
-                        self.from_addr[1],
-                        message.to_addrs,
-                        message.body)
+                        self.from_addr[1], message.to_addrs, message.body
+                    )
 
-                    self.logger.info('Sent Email to %s', message.recipient)
+                    self.logger.info("Sent Email to %s", message.recipient)
 
-                except (SocketError, smtplib.SMTPException, RuntimeError) as e:
+                except (OSError, smtplib.SMTPException, RuntimeError) as e:
                     self.logger.warning(
-                        'Sending email to "%s" failed.', message.recipient)
-                    self.logger.debug(f'Socket Exception: {e}')
+                        'Sending email to "%s" failed.', message.recipient
+                    )
+                    self.logger.debug(f"Socket Exception: {e}")
 
                     # Mark as failure
                     has_error = True
 
-        except (SocketError, smtplib.SMTPException, RuntimeError) as e:
+        except (OSError, smtplib.SMTPException, RuntimeError) as e:
             self.logger.warning(
                 'Connection error while submitting email to "%s"',
-                self.smtp_host)
-            self.logger.debug(f'Socket Exception: {e}')
+                self.smtp_host,
+            )
+            self.logger.debug(f"Socket Exception: {e}")
 
             # Mark as failure
             has_error = True
 
         except AppriseEmailException as e:
-            self.logger.debug(f'Socket Exception: {e}')
+            self.logger.debug(f"Socket Exception: {e}")
 
             # Mark as failure
             has_error = True
@@ -565,15 +650,15 @@ def url(self, privacy=False, *args, **kwargs):
 
         # Define an URL parameters
         params = {
-            'pgp': 'yes' if self.use_pgp else 'no',
+            "pgp": "yes" if self.use_pgp else "no",
         }
 
         # Store our public key back into your URL
         if self.pgp_key is not None:
-            params['pgp_key'] = NotifyEmail.quote(self.pgp_key, safe=':\\/')
+            params["pgp_key"] = NotifyEmail.quote(self.pgp_key, safe=":\\/")
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({"+{}".format(k): v for k, v in self.headers.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
@@ -585,91 +670,116 @@ def url(self, privacy=False, *args, **kwargs):
 
         if self.smtp_host != self.host:
             # Apply our SMTP Host only if it differs from the provided hostname
-            params['smtp'] = self.smtp_host
+            params["smtp"] = self.smtp_host
 
         if self.secure:
-            # Mode is only requried if we're dealing with a secure connection
-            params['mode'] = self.secure_mode
+            # Mode is only required if we're dealing with a secure connection
+            params["mode"] = self.secure_mode
 
         if self.from_addr[0] and self.from_addr[0] != self.app_id:
             # A custom name was provided
-            params['from'] = self.from_addr[0] if not from_addr else \
-                formataddr((self.from_addr[0], from_addr), charset='utf-8')
+            params["from"] = (
+                self.from_addr[0]
+                if not from_addr
+                else formataddr(
+                    (self.from_addr[0], from_addr), charset="utf-8"
+                )
+            )
 
         elif from_addr:
-            params['from'] = formataddr((False, from_addr), charset='utf-8')
+            params["from"] = formataddr((False, from_addr), charset="utf-8")
 
         elif not self.user:
-            params['from'] = \
-                formataddr((False, self.from_addr[1]), charset='utf-8')
+            params["from"] = formataddr(
+                (False, self.from_addr[1]), charset="utf-8"
+            )
 
         if self.cc:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join([
+            params["cc"] = ",".join([
                 formataddr(
-                    (self.names[e] if e in self.names else False, e),
+                    (self.names.get(e, False), e),
                     # Swap comma for it's escaped url code (if detected) since
                     # we're using that as a delimiter
-                    charset='utf-8').replace(',', '%2C')
-                for e in self.cc])
+                    charset="utf-8",
+                ).replace(",", "%2C")
+                for e in self.cc
+            ])
 
         if self.bcc:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join([
+            params["bcc"] = ",".join([
                 formataddr(
-                    (self.names[e] if e in self.names else False, e),
+                    (self.names.get(e, False), e),
                     # Swap comma for it's escaped url code (if detected) since
                     # we're using that as a delimiter
-                    charset='utf-8').replace(',', '%2C')
-                for e in self.bcc])
+                    charset="utf-8",
+                ).replace(",", "%2C")
+                for e in self.bcc
+            ])
 
         if self.reply_to:
             # Handle our Reply-To Addresses
-            params['reply'] = ','.join([
+            params["reply"] = ",".join([
                 formataddr(
-                    (self.names[e] if e in self.names else False, e),
-                    # Swap comma for it's escaped url code (if detected) since
+                    (self.names.get(e, False), e),
+                    # Swap comma for its escaped url code (if detected) since
                     # we're using that as a delimiter
-                    charset='utf-8').replace(',', '%2C')
-                for e in self.reply_to])
+                    charset="utf-8",
+                ).replace(",", "%2C")
+                for e in self.reply_to
+            ])
 
         # pull email suffix from username (if present)
-        user = None if not self.user else self.user.split('@')[0]
+        user = None if not self.user else self.user.split("@")[0]
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyEmail.quote(user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyEmail.quote(user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif user:
             # user url
-            auth = '{user}@'.format(
-                user=NotifyEmail.quote(user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyEmail.quote(user, safe=""),
             )
 
         # Default Port setup
-        default_port = SECURE_MODES[self.secure_mode]['default_port']
+        default_port = SECURE_MODES[self.secure_mode]["default_port"]
 
         # a simple boolean check as to whether we display our target emails
         # or not
-        has_targets = \
-            not (len(self.targets) == 1
-                 and self.targets[0][1] == self.from_addr[1])
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0][1] == self.from_addr[1]
+        )
 
-        return '{schema}://{auth}{hostname}{port}/{targets}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{targets}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            targets='' if not has_targets else '/'.join(
-                [NotifyEmail.quote('{}{}'.format(
-                    '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                    safe='') for e in self.targets]),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else ":{}".format(self.port)
+            ),
+            targets=(
+                ""
+                if not has_targets
+                else "/".join([
+                    NotifyEmail.quote(
+                        "{}{}".format(
+                            "" if not e[0] else "{}:".format(e[0]), e[1]
+                        ),
+                        safe="",
+                    )
+                    for e in self.targets
+                ])
+            ),
             params=NotifyEmail.urlencode(params),
         )
 
@@ -677,14 +787,20 @@ def url(self, privacy=False, *args, **kwargs):
     def url_identifier(self):
         """
         Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
+        another similar one. Targets or end points should never be identified
         here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.smtp_host,
-            self.port if self.port
-            else SECURE_MODES[self.secure_mode]['default_port'],
+            self.user,
+            self.password,
+            self.host,
+            self.smtp_host,
+            (
+                self.port
+                if self.port
+                else SECURE_MODES[self.secure_mode]["default_port"]
+            ),
         )
 
     def __len__(self):
@@ -706,90 +822,95 @@ def parse_url(url):
             return results
 
         # Prepare our target lists
-        results['targets'] = []
+        results["targets"] = []
 
-        if is_ipaddr(results['host']):
+        if is_ipaddr(results["host"]):
             # Silently move on and do not disrupt any configuration
             pass
 
-        elif not is_hostname(results['host'], ipv4=False, ipv6=False,
-                             underscore=False):
+        elif not is_hostname(
+            results["host"], ipv4=False, ipv6=False, underscore=False
+        ):
 
-            if is_email(NotifyEmail.unquote(results['host'])):
+            if is_email(NotifyEmail.unquote(results["host"])):
                 # Don't lose defined email addresses
-                results['targets'].append(NotifyEmail.unquote(results['host']))
+                results["targets"].append(NotifyEmail.unquote(results["host"]))
 
             # Detect if we have a valid hostname or not; be sure to reset it's
             # value if invalid; we'll attempt to figure this out later on
-            results['host'] = ''
+            results["host"] = ""
 
         # Get PGP Flag
-        results['use_pgp'] = \
-            parse_bool(results['qsd'].get(
-                'pgp', NotifyEmail.template_args['pgp']['default']))
+        results["use_pgp"] = parse_bool(
+            results["qsd"].get(
+                "pgp", NotifyEmail.template_args["pgp"]["default"]
+            )
+        )
 
         # Get PGP Public Key Override
-        if 'pgpkey' in results['qsd'] and results['qsd']['pgpkey']:
-            results['pgp_key'] = \
-                NotifyEmail.unquote(results['qsd']['pgpkey'])
+        if "pgpkey" in results["qsd"] and results["qsd"]["pgpkey"]:
+            results["pgp_key"] = NotifyEmail.unquote(results["qsd"]["pgpkey"])
 
         # The From address is a must; either through the use of templates
         # from= entry and/or merging the user and hostname together, this
         # must be calculated or parse_url will fail.
-        from_addr = ''
+        from_addr = ""
 
         # The server we connect to to send our mail to
-        smtp_host = ''
+        smtp_host = ""
 
         # Get our potential email targets; if none our found we'll just
         # add one to ourselves
-        results['targets'] += NotifyEmail.split_path(results['fullpath'])
+        results["targets"] += NotifyEmail.split_path(results["fullpath"])
 
         # Attempt to detect 'to' email address
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].append(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(results["qsd"]["to"])
 
         # Attempt to detect 'from' email address
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            from_addr = NotifyEmail.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            from_addr = NotifyEmail.unquote(results["qsd"]["from"])
 
-            if 'name' in results['qsd'] and len(results['qsd']['name']):
+            if "name" in results["qsd"] and len(results["qsd"]["name"]):
                 from_addr = formataddr(
-                    (NotifyEmail.unquote(results['qsd']['name']), from_addr),
-                    charset='utf-8')
+                    (NotifyEmail.unquote(results["qsd"]["name"]), from_addr),
+                    charset="utf-8",
+                )
 
-        elif 'name' in results['qsd'] and len(results['qsd']['name']):
+        elif "name" in results["qsd"] and len(results["qsd"]["name"]):
             # Extract from name to associate with from address
-            from_addr = NotifyEmail.unquote(results['qsd']['name'])
+            from_addr = NotifyEmail.unquote(results["qsd"]["name"])
 
         # Store SMTP Host if specified
-        if 'smtp' in results['qsd'] and len(results['qsd']['smtp']):
+        if "smtp" in results["qsd"] and len(results["qsd"]["smtp"]):
             # Extract the smtp server
-            smtp_host = NotifyEmail.unquote(results['qsd']['smtp'])
+            smtp_host = NotifyEmail.unquote(results["qsd"]["smtp"])
 
-        if 'mode' in results['qsd'] and len(results['qsd']['mode']):
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
             # Extract the secure mode to over-ride the default
-            results['secure_mode'] = results['qsd']['mode'].lower()
+            results["secure_mode"] = results["qsd"]["mode"].lower()
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = results['qsd']['cc']
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = results["qsd"]["cc"]
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = results['qsd']['bcc']
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = results["qsd"]["bcc"]
 
         # Handle Reply To Addresses
-        if 'reply' in results['qsd'] and len(results['qsd']['reply']):
-            results['reply_to'] = results['qsd']['reply']
+        if "reply" in results["qsd"] and len(results["qsd"]["reply"]):
+            results["reply_to"] = results["qsd"]["reply"]
 
-        results['from_addr'] = from_addr
-        results['smtp_host'] = smtp_host
+        results["from_addr"] = from_addr
+        results["smtp_host"] = smtp_host
 
         # Add our Meta Headers that the user can provide with their outbound
         # emails
-        results['headers'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         return results
 
@@ -804,22 +925,33 @@ def _get_charset(input_string):
         """
         if not input_string:
             return None
-        return 'utf-8' if not all(ord(c) < 128 for c in input_string) else None
+        return "utf-8" if not all(ord(c) < 128 for c in input_string) else None
 
     @staticmethod
-    def prepare_emails(subject, body, from_addr, to,
-                       cc=set(), bcc=set(), reply_to=set(),
-                       # Providing an SMTP Host helps improve Email Message-ID
-                       # and avoids getting flagged as spam
-                       smtp_host=None,
-                       # Can be either 'html' or 'text'
-                       notify_format=NotifyFormat.HTML,
-                       attach=None, headers=dict(),
-                       # Names can be a dictionary
-                       names=None,
-                       # Pretty Good Privacy Support; Pass in an
-                       # ApprisePGPController if you wish to use it
-                       pgp=None):
+    def prepare_emails(
+        subject,
+        body,
+        from_addr,
+        to,
+        cc: Optional[set] = None,
+        bcc: Optional[set] = None,
+        reply_to: Optional[set] = None,
+        # Providing an SMTP Host helps improve Email Message-ID
+        # and avoids getting flagged as spam
+        smtp_host=None,
+        # Can be either 'html' or 'text'
+        notify_format=NotifyFormat.HTML,
+        attach=None,
+        headers: Optional[dict] = None,
+        # Names can be a dictionary
+        names=None,
+        # Pretty Good Privacy Support; Pass in an
+        # ApprisePGPController if you wish to use it
+        pgp=None,
+        # Define our timezone; if one isn't provided, then we use
+        # the system time instead
+        tzinfo=None,
+    ):
         """
         Generator for emails
             from_addr: must be in format: (from_name, from_addr)
@@ -847,17 +979,28 @@ def prepare_emails(subject, body, from_addr, to,
 
                    Pass in an ApprisePGPController() if you wish to use this
         """
-
         if not to:
             # There is no one to email; we're done
-            msg = 'There are no Email recipients to notify'
+            msg = "There are no Email recipients to notify"
             logger.warning(msg)
-            raise AppriseEmailException(msg)
+            raise AppriseEmailException(msg) from None
 
         elif pgp and not _pgp.PGP_SUPPORT:
-            msg = 'PGP Support unavailable; install PGPy library'
+            msg = "PGP Support unavailable; install PGPy library"
             logger.warning(msg)
-            raise AppriseEmailException(msg)
+            raise AppriseEmailException(msg) from None
+
+        if headers is None:
+            headers = {}
+
+        if cc is None:
+            cc = set()
+
+        if bcc is None:
+            bcc = set()
+
+        if reply_to is None:
+            reply_to = set()
 
         if not names:
             # Prepare a empty dictionary to prevent errors/warnings
@@ -865,9 +1008,13 @@ def prepare_emails(subject, body, from_addr, to,
 
         if not smtp_host:
             # Generate a host identifier (used for Message-ID Creation)
-            smtp_host = from_addr[1].split('@')[1]
+            smtp_host = from_addr[1].split("@")[1]
 
-        logger.debug('SMTP Host: {smtp_host}')
+        if not tzinfo:
+            # use server time
+            tzinfo = datetime.now().astimezone().tzinfo
+
+        logger.debug(f"SMTP Host: {smtp_host}")
 
         # Create a copy of the targets list
         emails = list(to)
@@ -876,55 +1023,60 @@ def prepare_emails(subject, body, from_addr, to,
             to_name, to_addr = emails.pop(0)
 
             # Strip target out of cc list if in To or Bcc
-            _cc = (cc - bcc - set([to_addr]))
+            cc_ = cc - bcc - {to_addr}
 
             # Strip target out of bcc list if in To
-            _bcc = (bcc - set([to_addr]))
+            bcc_ = bcc - {to_addr}
 
             # Strip target out of reply_to list if in To
-            _reply_to = (reply_to - set([to_addr]))
+            reply_to_ = reply_to - {to_addr}
 
             # Format our cc addresses to support the Name field
-            _cc = [formataddr(
-                (names.get(addr, False), addr), charset='utf-8')
-                for addr in _cc]
+            cc_ = [
+                formataddr((names.get(addr, False), addr), charset="utf-8")
+                for addr in cc_
+            ]
 
             # Format our bcc addresses to support the Name field
-            _bcc = [formataddr(
-                (names.get(addr, False), addr), charset='utf-8')
-                for addr in _bcc]
+            bcc_ = [
+                formataddr((names.get(addr, False), addr), charset="utf-8")
+                for addr in bcc_
+            ]
 
-            if reply_to:
+            if reply_to_:
                 # Format our reply-to addresses to support the Name field
-                reply_to = [formataddr(
-                    (names.get(addr, False), addr), charset='utf-8')
-                    for addr in reply_to]
+                reply_to = [
+                    formataddr((names.get(addr, False), addr), charset="utf-8")
+                    for addr in reply_to_
+                ]
 
             logger.debug(
-                'Email From: {}'.format(
-                    formataddr(from_addr, charset='utf-8')))
-
-            logger.debug('Email To: {}'.format(to_addr))
-            if _cc:
-                logger.debug('Email Cc: {}'.format(', '.join(_cc)))
-            if _bcc:
-                logger.debug('Email Bcc: {}'.format(', '.join(_bcc)))
-            if _reply_to:
-                logger.debug(
-                    'Email Reply-To: {}'.format(', '.join(_reply_to))
-                )
+                "Email From: {}".format(formataddr(from_addr, charset="utf-8"))
+            )
+
+            logger.debug("Email To: {}".format(to_addr))
+            if cc_:
+                logger.debug("Email Cc: {}".format(", ".join(cc_)))
+            if bcc_:
+                logger.debug("Email Bcc: {}".format(", ".join(bcc_)))
+            if reply_to_:
+                logger.debug("Email Reply-To: {}".format(", ".join(reply_to_)))
 
             # Prepare Email Message
             if notify_format == NotifyFormat.HTML:
                 base = MIMEMultipart("alternative")
-                base.attach(MIMEText(
-                    convert_between(
-                        NotifyFormat.HTML, NotifyFormat.TEXT, body),
-                    'plain', 'utf-8')
+                base.attach(
+                    MIMEText(
+                        convert_between(
+                            NotifyFormat.HTML, NotifyFormat.TEXT, body
+                        ),
+                        "plain",
+                        "utf-8",
+                    )
                 )
-                base.attach(MIMEText(body, 'html', 'utf-8'))
+                base.attach(MIMEText(body, "html", "utf-8"))
             else:
-                base = MIMEText(body, 'plain', 'utf-8')
+                base = MIMEText(body, "plain", "utf-8")
 
             if attach:
                 mixed = MIMEMultipart("mixed")
@@ -936,27 +1088,34 @@ def prepare_emails(subject, body, from_addr, to,
                         # exit since this isn't what the end user wanted
 
                         # We could not access the attachment
-                        msg = 'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True))
+                        msg = "Could not access attachment {}.".format(
+                            attachment.url(privacy=True)
+                        )
                         logger.warning(msg)
                         raise AppriseEmailException(msg)
 
                     logger.debug(
-                        'Preparing Email attachment {}'.format(
-                            attachment.url(privacy=True)))
+                        "Preparing Email attachment {}".format(
+                            attachment.url(privacy=True)
+                        )
+                    )
 
                     with open(attachment.path, "rb") as abody:
                         app = MIMEApplication(abody.read())
                         app.set_type(attachment.mimetype)
 
                         # Prepare our attachment name
-                        filename = attachment.name \
-                            if attachment.name else f'file{no:03}.dat'
+                        filename = (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        )
 
                         app.add_header(
-                            'Content-Disposition',
+                            "Content-Disposition",
                             'attachment; filename="{}"'.format(
-                                Header(filename, 'utf-8')),
+                                Header(filename, "utf-8")
+                            ),
                         )
                         mixed.attach(app)
                 base = mixed
@@ -964,31 +1123,34 @@ def prepare_emails(subject, body, from_addr, to,
             if pgp:
                 logger.debug("Securing Email with PGP Encryption")
                 # Set our header information to include in the encryption
-                base['From'] = formataddr(
-                    (None, from_addr[1]), charset='utf-8')
-                base['To'] = formataddr((None, to_addr), charset='utf-8')
-                base['Subject'] = \
-                    Header(subject, NotifyEmail._get_charset(subject))
+                base["From"] = formataddr(
+                    (None, from_addr[1]), charset="utf-8"
+                )
+                base["To"] = formataddr((None, to_addr), charset="utf-8")
+                base["Subject"] = Header(
+                    subject, NotifyEmail._get_charset(subject)
+                )
 
                 # Apply our encryption
-                encrypted_content = \
-                    pgp.encrypt(base.as_string(), to_addr)
+                encrypted_content = pgp.encrypt(base.as_string(), to_addr)
 
                 if not encrypted_content:
                     # Unable to send notification
-                    msg = 'Unable to encrypt email via PGP'
+                    msg = "Unable to encrypt email via PGP"
                     logger.warning(msg)
                     raise AppriseEmailException(msg)
 
-                # prepare our messsage
+                # prepare our message
                 base = MIMEMultipart(
-                    "encrypted", protocol="application/pgp-encrypted")
+                    "encrypted", protocol="application/pgp-encrypted"
+                )
 
                 # Store Autocrypt header (DeltaChat Support)
                 base.add_header(
                     "Autocrypt",
-                    "addr=%s; prefer-encrypt=mutual" % formataddr(
-                        (False, to_addr), charset='utf-8'))
+                    f"addr={formataddr((False, to_addr), charset='utf-8')}; "
+                    "prefer-encrypt=mutual"
+                )
 
                 # Set Encryption Info Part
                 enc_payload = MIMEText("Version: 1", "plain")
@@ -1003,22 +1165,22 @@ def prepare_emails(subject, body, from_addr, to,
             for k, v in headers.items():
                 base[k] = Header(v, NotifyEmail._get_charset(v))
 
-            base['Subject'] = \
-                Header(subject, NotifyEmail._get_charset(subject))
-            base['From'] = formataddr(from_addr, charset='utf-8')
-            base['To'] = formataddr((to_name, to_addr), charset='utf-8')
-            base['Message-ID'] = make_msgid(domain=smtp_host)
-            base['Date'] = \
-                datetime.now(timezone.utc)\
-                .strftime("%a, %d %b %Y %H:%M:%S +0000")
+            base["Subject"] = Header(
+                subject, NotifyEmail._get_charset(subject)
+            )
+            base["From"] = formataddr(from_addr, charset="utf-8")
+            base["To"] = formataddr((to_name, to_addr), charset="utf-8")
+            base["Message-ID"] = make_msgid(domain=smtp_host)
+            base["Date"] = format_datetime(datetime.now(tz=tzinfo))
 
             if cc:
-                base['Cc'] = ','.join(_cc)
+                base["Cc"] = ",".join(cc_)
 
-            if reply_to:
-                base['Reply-To'] = ','.join(_reply_to)
+            if reply_to_:
+                base["Reply-To"] = ",".join(reply_to)
 
             yield EmailMessage(
                 recipient=to_addr,
-                to_addrs=[to_addr] + list(_cc) + list(_bcc),
-                body=base.as_string())
+                to_addrs=[to_addr, *list(cc_), *list(bcc_)],
+                body=base.as_string(),
+            )
diff --git a/libs/apprise/plugins/email/common.py b/libs/apprise/plugins/email/common.py
index e6a29deb86..eed4709ca5 100644
--- a/libs/apprise/plugins/email/common.py
+++ b/libs/apprise/plugins/email/common.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,7 +27,6 @@
 
 
 import dataclasses
-import typing as t
 
 from ...exception import ApprisePluginException
 
@@ -37,6 +35,7 @@ class AppriseEmailException(ApprisePluginException):
     """
     Thrown when there is an error with the Email Attachment
     """
+
     def __init__(self, message, error_code=601):
         super().__init__(message, error_code=error_code)
 
@@ -46,11 +45,12 @@ class WebBaseLogin:
     This class is just used in conjunction of the default emailers
     to best formulate a login to it using the data detected
     """
+
     # User Login must be Email Based
-    EMAIL = 'Email'
+    EMAIL = "Email"
 
     # User Login must UserID Based
-    USERID = 'UserID'
+    USERID = "UserID"
 
 
 # Secure Email Modes
@@ -63,13 +63,13 @@ class SecureMailMode:
 # Define all of the secure modes (used during validation)
 SECURE_MODES = {
     SecureMailMode.STARTTLS: {
-        'default_port': 587,
+        "default_port": 587,
     },
     SecureMailMode.SSL: {
-        'default_port': 465,
+        "default_port": 465,
     },
     SecureMailMode.INSECURE: {
-        'default_port': 25,
+        "default_port": 25,
     },
 }
 
@@ -79,6 +79,7 @@ class EmailMessage:
     """
     Our message structure
     """
+
     recipient: str
-    to_addrs: t.List[str]
+    to_addrs: list[str]
     body: str
diff --git a/libs/apprise/plugins/email/templates.py b/libs/apprise/plugins/email/templates.py
index ac31357365..777de3f784 100644
--- a/libs/apprise/plugins/email/templates.py
+++ b/libs/apprise/plugins/email/templates.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,7 +27,8 @@
 
 
 import re
-from .common import (SecureMailMode, WebBaseLogin)
+
+from .common import SecureMailMode, WebBaseLogin
 
 # To attempt to make this script stupid proof, if we detect an email address
 # that is part of the this table, we can pre-use a lot more defaults if they
@@ -36,237 +36,275 @@
 EMAIL_TEMPLATES = (
     # Google GMail
     (
-        'Google Mail',
+        "Google Mail",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>gmail\.com)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@" r"(?P<domain>gmail\.com)$",
+            re.I,
+        ),
         {
-            'port': 587,
-            'smtp_host': 'smtp.gmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 587,
+            "smtp_host": "smtp.gmail.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Yandex
     (
-        'Yandex',
+        "Yandex",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>yandex\.(com|ru|ua|by|kz|uz|tr|fr))$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>yandex\.(com|ru|ua|by|kz|uz|tr|fr))$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.yandex.ru',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.USERID, )
+            "port": 465,
+            "smtp_host": "smtp.yandex.ru",
+            "secure": True,
+            "secure_mode": SecureMailMode.SSL,
+            "login_type": (WebBaseLogin.USERID,),
         },
     ),
-
     # Microsoft Hotmail
     (
-        'Microsoft Hotmail',
+        "Microsoft Hotmail",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(hotmail|live)\.com(\.au)?)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>(hotmail|live)\.com(\.au)?)$",
+            re.I,
+        ),
         {
-            'port': 587,
-            'smtp_host': 'smtp-mail.outlook.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 587,
+            "smtp_host": "smtp-mail.outlook.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Microsoft Outlook
     (
-        'Microsoft Outlook',
+        "Microsoft Outlook",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(smtp\.)?outlook\.com(\.au)?)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>(smtp\.)?outlook\.com(\.au)?)$",
+            re.I,
+        ),
         {
-            'port': 587,
-            'smtp_host': 'smtp.outlook.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 587,
+            "smtp_host": "smtp.outlook.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Microsoft Office 365 (Email Server)
     # You must specify an authenticated sender address in the from= settings
     # and a valid email in the to= to deliver your emails to
     (
-        'Microsoft Office 365',
-        re.compile(
-            r'^[^@]+@(?P<domain>(smtp\.)?office365\.com)$', re.I),
+        "Microsoft Office 365",
+        re.compile(r"^[^@]+@(?P<domain>(smtp\.)?office365\.com)$", re.I),
         {
-            'port': 587,
-            'smtp_host': 'smtp.office365.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
+            "port": 587,
+            "smtp_host": "smtp.office365.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
         },
     ),
-
     # Yahoo Mail
     (
-        'Yahoo Mail',
+        "Yahoo Mail",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>yahoo\.(ca|com))$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>yahoo\.(ca|com))$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.mail.yahoo.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 465,
+            "smtp_host": "smtp.mail.yahoo.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
+        },
+    ),
+    # GMX Mail
+    (
+        "GMX Mail",
+        re.compile(
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>gmx\.(com|net|de|at|ch|fr))$",
+            re.I,
+        ),
+        {
+            "port": 587,
+            "smtp_host": "mail.gmx.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Fast Mail (Series 1)
     (
-        'Fast Mail',
+        "Fast Mail",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>fastmail\.(com|cn|co\.uk|com\.au|de|es|fm|fr|im|'
-            r'in|jp|mx|net|nl|org|se|to|tw|uk|us))$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>fastmail\.(com|cn|co\.uk|com\.au|de|es|fm|fr|im|"
+            r"in|jp|mx|net|nl|org|se|to|tw|uk|us))$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.fastmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 465,
+            "smtp_host": "smtp.fastmail.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.SSL,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Fast Mail (Series 2)
     (
-        'Fast Mail Extended Addresses',
+        "Fast Mail Extended Addresses",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>123mail\.org|airpost\.net|eml\.cc|fmail\.co\.uk|'
-            r'fmgirl\.com|fmguy\.com|mailbolt\.com|mailcan\.com|'
-            r'mailhaven\.com|mailmight\.com|ml1\.net|mm\.st|myfastmail\.com|'
-            r'proinbox\.com|promessage\.com|rushpost\.com|sent\.(as|at|com)|'
-            r'speedymail\.org|warpmail\.net|xsmail\.com|150mail\.com|'
-            r'150ml\.com|16mail\.com|2-mail\.com|4email\.net|50mail\.com|'
-            r'allmail\.net|bestmail\.us|cluemail\.com|elitemail\.org|'
-            r'emailcorner\.net|emailengine\.(net|org)|emailgroups\.net|'
-            r'emailplus\.org|emailuser\.net|f-m\.fm|fast-email\.com|'
-            r'fast-mail\.org|fastem\.com|fastemail\.us|fastemailer\.com|'
-            r'fastest\.cc|fastimap\.com|fastmailbox\.net|fastmessaging\.com|'
-            r'fea\.st|fmailbox\.com|ftml\.net|h-mail\.us|hailmail\.net|'
-            r'imap-mail\.com|imap\.cc|imapmail\.org|inoutbox\.com|'
-            r'internet-e-mail\.com|internet-mail\.org|internetemails\.net|'
-            r'internetmailing\.net|jetemail\.net|justemail\.net|'
-            r'letterboxes\.org|mail-central\.com|mail-page\.com|'
-            r'mailandftp\.com|mailas\.com|mailc\.net|mailforce\.net|'
-            r'mailftp\.com|mailingaddress\.org|mailite\.com|mailnew\.com|'
-            r'mailsent\.net|mailservice\.ms|mailup\.net|mailworks\.org|'
-            r'mymacmail\.com|nospammail\.net|ownmail\.net|petml\.com|'
-            r'postinbox\.com|postpro\.net|realemail\.net|reallyfast\.biz|'
-            r'reallyfast\.info|speedpost\.net|ssl-mail\.com|swift-mail\.com|'
-            r'the-fastest\.net|the-quickest\.com|theinternetemail\.com|'
-            r'veryfast\.biz|veryspeedy\.net|yepmail\.net)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>123mail\.org|airpost\.net|eml\.cc|fmail\.co\.uk|"
+            r"fmgirl\.com|fmguy\.com|mailbolt\.com|mailcan\.com|"
+            r"mailhaven\.com|mailmight\.com|ml1\.net|mm\.st|myfastmail\.com|"
+            r"proinbox\.com|promessage\.com|rushpost\.com|sent\.(as|at|com)|"
+            r"speedymail\.org|warpmail\.net|xsmail\.com|150mail\.com|"
+            r"150ml\.com|16mail\.com|2-mail\.com|4email\.net|50mail\.com|"
+            r"allmail\.net|bestmail\.us|cluemail\.com|elitemail\.org|"
+            r"emailcorner\.net|emailengine\.(net|org)|emailgroups\.net|"
+            r"emailplus\.org|emailuser\.net|f-m\.fm|fast-email\.com|"
+            r"fast-mail\.org|fastem\.com|fastemail\.us|fastemailer\.com|"
+            r"fastest\.cc|fastimap\.com|fastmailbox\.net|fastmessaging\.com|"
+            r"fea\.st|fmailbox\.com|ftml\.net|h-mail\.us|hailmail\.net|"
+            r"imap-mail\.com|imap\.cc|imapmail\.org|inoutbox\.com|"
+            r"internet-e-mail\.com|internet-mail\.org|internetemails\.net|"
+            r"internetmailing\.net|jetemail\.net|justemail\.net|"
+            r"letterboxes\.org|mail-central\.com|mail-page\.com|"
+            r"mailandftp\.com|mailas\.com|mailc\.net|mailforce\.net|"
+            r"mailftp\.com|mailingaddress\.org|mailite\.com|mailnew\.com|"
+            r"mailsent\.net|mailservice\.ms|mailup\.net|mailworks\.org|"
+            r"mymacmail\.com|nospammail\.net|ownmail\.net|petml\.com|"
+            r"postinbox\.com|postpro\.net|realemail\.net|reallyfast\.biz|"
+            r"reallyfast\.info|speedpost\.net|ssl-mail\.com|swift-mail\.com|"
+            r"the-fastest\.net|the-quickest\.com|theinternetemail\.com|"
+            r"veryfast\.biz|veryspeedy\.net|yepmail\.net)$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.fastmail.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 465,
+            "smtp_host": "smtp.fastmail.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.SSL,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Zoho Mail (Free)
     (
-        'Zoho Mail',
+        "Zoho Mail",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>zoho(mail)?\.com)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>zoho(mail)?\.com)$",
+            re.I,
+        ),
         {
-            'port': 587,
-            'smtp_host': 'smtp.zoho.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 587,
+            "smtp_host": "smtp.zoho.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # SendGrid (Email Server)
     # You must specify an authenticated sender address in the from= settings
     # and a valid email in the to= to deliver your emails to
     (
-        'SendGrid',
+        "SendGrid",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(\.smtp)?sendgrid\.(com|net))$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>(\.smtp)?sendgrid\.(com|net))$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.sendgrid.net',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.USERID, )
+            "port": 465,
+            "smtp_host": "smtp.sendgrid.net",
+            "secure": True,
+            "secure_mode": SecureMailMode.SSL,
+            "login_type": (WebBaseLogin.USERID,),
         },
     ),
-
     # 163.com
     (
-        '163.com',
+        "163.com",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>163\.com)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@" r"(?P<domain>163\.com)$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.163.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 465,
+            "smtp_host": "smtp.163.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.SSL,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Foxmail.com
     (
-        'Foxmail.com',
+        "Foxmail.com",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(foxmail|qq)\.com)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>(foxmail|qq)\.com)$",
+            re.I,
+        ),
         {
-            'port': 587,
-            'smtp_host': 'smtp.qq.com',
-            'secure': True,
-            'secure_mode': SecureMailMode.STARTTLS,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 587,
+            "smtp_host": "smtp.qq.com",
+            "secure": True,
+            "secure_mode": SecureMailMode.STARTTLS,
+            "login_type": (WebBaseLogin.EMAIL,),
         },
     ),
-
     # Comcast.net
     (
-        'Comcast.net',
+        "Comcast.net",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>(comcast)\.net)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@"
+            r"(?P<domain>(comcast)\.net)$",
+            re.I,
+        ),
         {
-            'port': 465,
-            'smtp_host': 'smtp.comcast.net',
-            'secure': True,
-            'secure_mode': SecureMailMode.SSL,
-            'login_type': (WebBaseLogin.EMAIL, )
+            "port": 465,
+            "smtp_host": "smtp.comcast.net",
+            "secure": True,
+            "secure_mode": SecureMailMode.SSL,
+            "login_type": (WebBaseLogin.EMAIL,),
+        },
+    ),
+    # Localhost handling
+    (
+        "Local Mail Server",
+        re.compile(
+            r"^(((?P<label>[^+]+)\+)?(?P<id>[^@]+)@)?"
+            r"(?P<domain>localhost(\.localdomain)?)$",
+            re.I,
+        ),
+        {
+            # Provide a default user if one isn't provided
+            "from_user": "root",
+            "smtp_host": None,
         },
     ),
-
     # Catch All
     (
-        'Custom',
+        "Custom",
         re.compile(
-            r'^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@'
-            r'(?P<domain>.+)$', re.I),
+            r"^((?P<label>[^+]+)\+)?(?P<id>[^@]+)@" r"(?P<domain>.+)$", re.I
+        ),
         {
             # Setting smtp_host to None is a way of
             # auto-detecting it based on other parameters
             # specified.  There is no reason to ever modify
             # this Catch All
-            'smtp_host': None,
+            "smtp_host": None,
         },
     ),
 )
diff --git a/libs/apprise/plugins/emby.py b/libs/apprise/plugins/emby.py
index 479eaf23f0..6064d9de04 100644
--- a/libs/apprise/plugins/emby.py
+++ b/libs/apprise/plugins/emby.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,43 +28,42 @@
 # Emby Docker configuration: https://hub.docker.com/r/emby/embyserver/
 # Authentication: https://github.com/MediaBrowser/Emby/wiki/Authentication
 # Notifications: https://github.com/MediaBrowser/Emby/wiki/Remote-control
-import requests
 import hashlib
-from json import dumps
-from json import loads
+from json import dumps, loads
+
+import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..utils.parse import parse_bool
-from ..common import NotifyType
 from .. import __version__ as VERSION
+from ..common import NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 
 class NotifyEmby(NotifyBase):
-    """
-    A wrapper for Emby Notifications
-    """
+    """A wrapper for Emby Notifications."""
+
     # The default descriptive name associated with the Notification
-    service_name = 'Emby'
+    service_name = "Emby"
 
     # The services URL
-    service_url = 'https://emby.media/'
+    service_url = "https://emby.media/"
 
     # The default protocol
-    protocol = 'emby'
+    protocol = "emby"
 
     # The default secure protocol
-    secure_protocol = 'embys'
+    secure_protocol = "embys"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_emby'
+    setup_url = "https://appriseit.com/services/emby/"
 
     # By default Emby requires you to provide it a device id
     # The following was just a random uuid4 generated one.  There
     # is no real reason to change this, but hey; that's what open
     # source is for right?
-    emby_device_id = '48df9504-6843-49be-9f2d-a685e25a0bc8'
+    emby_device_id = "48df9504-6843-49be-9f2d-a685e25a0bc8"
 
     # The Emby message timeout; basically it is how long should our message be
     # displayed for.  The value is in milli-seconds
@@ -73,57 +71,60 @@ class NotifyEmby(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-            'default': 8096
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+                "default": 8096,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-    })
+    )
 
-    template_args = dict(NotifyBase.template_args, **{
-        'modal': {
-            'name': _('Modal'),
-            'type': 'bool',
-            'default': False,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "modal": {
+                "name": _("Modal"),
+                "type": "bool",
+                "default": False,
+            },
         },
-    })
+    )
 
     def __init__(self, modal=False, **kwargs):
-        """
-        Initialize Emby Object
-
-        """
+        """Initialize Emby Object."""
         super().__init__(**kwargs)
 
         if self.secure:
-            self.schema = 'https'
+            self.schema = "https"
 
         else:
-            self.schema = 'http'
+            self.schema = "http"
 
         # Our access token does not get created until we first
         # authenticate with our Emby server. The same goes for the
@@ -137,42 +138,37 @@ def __init__(self, modal=False, **kwargs):
 
         if not self.port:
             # Assign default port if one isn't otherwise specified:
-            self.port = self.template_tokens['port']['default']
+            self.port = self.template_tokens["port"]["default"]
 
         if not self.user:
             # User was not specified
-            msg = 'No Emby username was specified.'
+            msg = "No Emby username was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         return
 
     def login(self, **kwargs):
-        """
-        Creates our authentication token and prepares our header
-
-        """
+        """Creates our authentication token and prepares our header."""
 
         if self.is_authenticated:
             # Log out first before we log back in
             self.logout()
 
         # Prepare our login url
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if self.port:
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        url += '/Users/AuthenticateByName'
+        url += "/Users/AuthenticateByName"
 
         # Initialize our payload
-        payload = {
-            'Username': self.user
-        }
+        payload = {"Username": self.user}
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'X-Emby-Authorization': self.emby_auth_header,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Emby-Authorization": self.emby_auth_header,
         }
 
         if self.password:
@@ -181,27 +177,28 @@ def login(self, **kwargs):
             #    pw - password in plain text
             #    password - password in Sha1
             #    passwordMd5 - password in MD5
-            payload['pw'] = self.password
+            payload["pw"] = self.password
 
             password_md5 = hashlib.md5()
-            password_md5.update(self.password.encode('utf-8'))
-            payload['passwordMd5'] = password_md5.hexdigest()
+            password_md5.update(self.password.encode("utf-8"))
+            payload["passwordMd5"] = password_md5.hexdigest()
 
             password_sha1 = hashlib.sha1()
-            password_sha1.update(self.password.encode('utf-8'))
-            payload['password'] = password_sha1.hexdigest()
+            password_sha1.update(self.password.encode("utf-8"))
+            payload["password"] = password_sha1.hexdigest()
 
         else:
             # Backwards compatibility
-            payload['password'] = ''
-            payload['passwordMd5'] = ''
+            payload["password"] = ""
+            payload["passwordMd5"] = ""
 
             # April 1st, 2018 and newer requirement:
-            payload['pw'] = ''
+            payload["pw"] = ""
 
         self.logger.debug(
-            'Emby login() POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate))
+            "Emby login() POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
 
         try:
             r = requests.post(
@@ -214,27 +211,32 @@ def login(self, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyEmby.http_response_code_lookup(r.status_code)
+                status_str = NotifyEmby.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to authenticate Emby user {} details: '
-                    '{}{}error={}.'.format(
+                    "Failed to authenticate Emby user {} details: "
+                    "{}{}error={}.".format(
                         self.user,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred authenticating a user with Emby '
-                'at %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred authenticating a user with Emby "
+                f"at {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -252,7 +254,7 @@ def login(self, **kwargs):
             return False
 
         # Acquire our Access Token
-        self.access_token = results.get('AccessToken')
+        self.access_token = results.get("AccessToken")
 
         # Acquire our UserId. It can be in one (or both) of the
         # following locations in the response:
@@ -266,20 +268,16 @@ def login(self, **kwargs):
         #   }
         #
         # The below just safely covers both grounds.
-        self.user_id = results.get('Id')
-        if not self.user_id:
-            if 'User' in results:
-                self.user_id = results['User'].get('Id')
+        self.user_id = results.get("Id")
+        if not self.user_id and "User" in results:
+            self.user_id = results["User"].get("Id")
 
         # No user was found matching the specified
         return self.is_authenticated
 
     def sessions(self, user_controlled=True):
-        """
-        Acquire our Session Identifiers and store them in a dictionary
-        indexed by the session id itself.
-
-        """
+        """Acquire our Session Identifiers and store them in a dictionary
+        indexed by the session id itself."""
         # A single session might look like this:
         # {
         #    u'AdditionalUsers': [],
@@ -339,34 +337,35 @@ def sessions(self, user_controlled=True):
         # Prepare a dict() object to control our sessions; the keys are
         # the sessions while the details associated with the session
         # are stored inside.
-        sessions = dict()
+        sessions = {}
 
         if not self.is_authenticated and not self.login():
             # Authenticate if we aren't already
             return sessions
 
         # Prepare our login url
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if self.port:
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        url += '/Sessions'
+        url += "/Sessions"
 
         if user_controlled is True:
             # Only return sessions that can be managed by the current Emby
             # user.
-            url += '?ControllableByUserId=%s' % self.user_id
+            url += f"?ControllableByUserId={self.user_id}"
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'X-Emby-Authorization': self.emby_auth_header,
-            'X-MediaBrowser-Token': self.access_token,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Emby-Authorization": self.emby_auth_header,
+            "X-MediaBrowser-Token": self.access_token,
         }
 
         self.logger.debug(
-            'Emby session() GET URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate))
+            "Emby session() GET URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
 
         try:
             r = requests.get(
@@ -378,27 +377,31 @@ def sessions(self, user_controlled=True):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyEmby.http_response_code_lookup(r.status_code)
+                status_str = NotifyEmby.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to acquire Emby session for user {}: '
-                    '{}{}error={}.'.format(
+                    "Failed to acquire Emby session for user {}: "
+                    "{}{}error={}.".format(
                         self.user,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 # Return; we're done
                 return sessions
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred querying Emby '
-                'for session information at %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred querying Emby "
+                f"for session information at {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return sessions
@@ -416,38 +419,36 @@ def sessions(self, user_controlled=True):
             return sessions
 
         for entry in results:
-            session = entry.get('Id')
+            session = entry.get("Id")
             if session:
                 sessions[session] = entry
 
         return sessions
 
     def logout(self, **kwargs):
-        """
-        Logs out of an already-authenticated session
-
-        """
+        """Logs out of an already-authenticated session."""
         if not self.is_authenticated:
             # We're not authenticated; there is nothing to do
             return True
 
         # Prepare our login url
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if self.port:
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        url += '/Sessions/Logout'
+        url += "/Sessions/Logout"
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'X-Emby-Authorization': self.emby_auth_header,
-            'X-MediaBrowser-Token': self.access_token,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Emby-Authorization": self.emby_auth_header,
+            "X-MediaBrowser-Token": self.access_token,
         }
 
         self.logger.debug(
-            'Emby logout() POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate))
+            "Emby logout() POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
         try:
             r = requests.post(
                 url,
@@ -457,34 +458,38 @@ def logout(self, **kwargs):
             )
 
             if r.status_code not in (
-                    # We're already logged out
-                    requests.codes.unauthorized,
-                    # The below show up if we were 'just' logged out
-                    requests.codes.ok,
-                    requests.codes.no_content):
+                # We're already logged out
+                requests.codes.unauthorized,
+                # The below show up if we were 'just' logged out
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifyEmby.http_response_code_lookup(r.status_code)
+                status_str = NotifyEmby.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to logoff Emby user {}: '
-                    '{}{}error={}.'.format(
+                    "Failed to logoff Emby user {}: {}{}error={}.".format(
                         self.user,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 # Return; we're done
                 return False
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred querying Emby '
-                'to logoff user %s at %s.' % (self.user, self.host))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred querying Emby "
+                f"to logoff user {self.user} at {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -496,10 +501,8 @@ def logout(self, **kwargs):
         self.user_id = None
         return True
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Emby Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Emby Notification."""
         if not self.is_authenticated and not self.login():
             # Authenticate if we aren't already
             return False
@@ -507,31 +510,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         # Acquire our list of sessions
         sessions = self.sessions().keys()
         if not sessions:
-            self.logger.warning('There were no Emby sessions to notify.')
+            self.logger.warning("There were no Emby sessions to notify.")
             # We don't need to fail; there really is no one to notify
             return True
 
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if self.port:
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         # Append our remaining path
-        url += '/Sessions/%s/Message'
+        url += "/Sessions/%s/Message"
 
         # Prepare Emby Object
         payload = {
-            'Header': title,
-            'Text': body,
+            "Header": title,
+            "Text": body,
         }
 
         if not self.modal:
-            payload['TimeoutMs'] = self.emby_message_timeout_ms
+            payload["TimeoutMs"] = self.emby_message_timeout_ms
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'X-Emby-Authorization': self.emby_auth_header,
-            'X-MediaBrowser-Token': self.access_token,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Emby-Authorization": self.emby_auth_header,
+            "X-MediaBrowser-Token": self.access_token,
         }
 
         # Track whether or not we had a failure or not.
@@ -541,10 +544,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Update our session
             session_url = url % session
 
-            self.logger.debug('Emby POST URL: %s (cert_verify=%r)' % (
-                session_url, self.verify_certificate,
-            ))
-            self.logger.debug('Emby Payload: %s' % str(payload))
+            self.logger.debug(
+                "Emby POST URL:"
+                f" {session_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Emby Payload: {payload!s}")
 
             # Always call throttle before the requests are made
             self.throttle()
@@ -558,34 +562,38 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     timeout=self.request_timeout,
                 )
                 if r.status_code not in (
-                        requests.codes.ok,
-                        requests.codes.no_content):
+                    requests.codes.ok,
+                    requests.codes.no_content,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyEmby.http_response_code_lookup(r.status_code)
+                    status_str = NotifyEmby.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Emby notification: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Emby notification: "
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                    self.logger.debug(f"Response Details:\r\n{r.content}")
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info('Sent Emby notification.')
+                    self.logger.info("Sent Emby notification.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Emby '
-                    'notification to %s.' % self.host)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Emby "
+                    f"notification to {self.host}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -595,142 +603,94 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.user, self.password, self.host,
+            self.secure_protocol,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'modal': 'yes' if self.modal else 'no',
+            "modal": "yes" if self.modal else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyEmby.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyEmby.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         else:  # self.user is set
-            auth = '{user}@'.format(
-                user=NotifyEmby.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyEmby.quote(self.user, safe=""),
             )
 
-        return '{schema}://{auth}{hostname}{port}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             hostname=self.host,
-            port='' if self.port is None
-                 or self.port == self.template_tokens['port']['default']
-                 else ':{}'.format(self.port),
+            port=(
+                ""
+                if self.port is None
+                or self.port == self.template_tokens["port"]["default"]
+                else f":{self.port}"
+            ),
             params=NotifyEmby.urlencode(params),
         )
 
     @property
     def is_authenticated(self):
-        """
-        Returns True if we're authenticated and False if not.
-
-        """
-        return True if self.access_token and self.user_id else False
+        """Returns True if we're authenticated and False if not."""
+        return bool(self.access_token and self.user_id)
 
     @property
     def emby_auth_header(self):
-        """
-        Generates the X-Emby-Authorization header response based on whether
-        we're authenticated or not.
-
-        """
+        """Generates the X-Emby-Authorization header response based on whether
+        we're authenticated or not."""
         # Specific to Emby
         header_args = [
-            ('MediaBrowser Client', self.app_id),
-            ('Device', self.app_id),
-            ('DeviceId', self.emby_device_id),
-            ('Version', str(VERSION)),
+            ("MediaBrowser Client", self.app_id),
+            ("Device", self.app_id),
+            ("DeviceId", self.emby_device_id),
+            ("Version", str(VERSION)),
         ]
 
         if self.user_id:
             # Append UserId variable if we're authenticated
-            header_args.append(('UserId', self.user))
+            header_args.append(("UserId", self.user))
 
-        return ', '.join(['%s="%s"' % (k, v) for k, v in header_args])
+        return ", ".join([f'{k}="{v}"' for k, v in header_args])
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early
             return results
 
         # Modal type popup (default False)
-        results['modal'] = parse_bool(results['qsd'].get('modal', False))
+        results["modal"] = parse_bool(results["qsd"].get("modal", False))
 
         return results
 
     def __del__(self):
-        """
-        Destructor
-        """
-        try:
-            self.logout()
-
-        except LookupError:  # pragma: no cover
-            # Python v3.5 call to requests can sometimes throw the exception
-            #   "/usr/lib64/python3.7/socket.py", line 748, in getaddrinfo
-            #   LookupError: unknown encoding: idna
-            #
-            # This occurs every time when running unit-tests against Apprise:
-            # LANG=C.UTF-8 PYTHONPATH=$(pwd) py.test-3.7
-            #
-            # There has been an open issue on this since Jan 2017.
-            #   - https://bugs.python.org/issue29288
-            #
-            # A ~similar~ issue can be identified here in the requests
-            # ticket system as unresolved and has provided workarounds
-            #   - https://github.com/kennethreitz/requests/issues/3578
-            pass
-
-        except ImportError:  # pragma: no cover
-            # The actual exception is `ModuleNotFoundError` however ImportError
-            # grants us backwards compatibility with versions of Python older
-            # than v3.6
-
-            # Python code that makes early calls to sys.exit() can cause
-            # the __del__() code to run. However, in some newer versions of
-            # Python, this causes the `sys` library to no longer be
-            # available. The stack overflow also goes on to suggest that
-            # it's not wise to use the __del__() as a destructor
-            # which is the case here.
-
-            # https://stackoverflow.com/questions/67218341/\
-            #       modulenotfounderror-import-of-time-halted-none-in-sys-\
-            #           modules-occured-when-obj?noredirect=1&lq=1
-            #
-            #
-            # Also see: https://stackoverflow.com/questions\
-            #       /1481488/what-is-the-del-method-and-how-do-i-call-it
-
-            # At this time it seems clean to try to log out (if we can)
-            # but not throw any unnecessary exceptions (like this one) to
-            # the end user if we don't have to.
-            pass
+        """Destructor."""
+        self.logout()
diff --git a/libs/apprise/plugins/enigma2.py b/libs/apprise/plugins/enigma2.py
index 0c3df98742..8ee1a8b0a5 100644
--- a/libs/apprise/plugins/enigma2.py
+++ b/libs/apprise/plugins/enigma2.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,13 +33,14 @@
 # - https://github.com/E2OpenPlugins/e2openplugin-OpenWebif/wiki/\
 #       OpenWebif-API-documentation#message
 
-import requests
 from json import loads
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+import requests
+
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from .base import NotifyBase
 
 
 class Enigma2MessageType:
@@ -60,24 +60,22 @@ class Enigma2MessageType:
 
 
 class NotifyEnigma2(NotifyBase):
-    """
-    A wrapper for Enigma2 Notifications
-    """
+    """A wrapper for Enigma2 Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Enigma2'
+    service_name = "Enigma2"
 
     # The services URL
-    service_url = 'https://dreambox.de/'
+    service_url = "https://dreambox.de/"
 
     # The default protocol
-    protocol = 'enigma2'
+    protocol = "enigma2"
 
     # The default secure protocol
-    secure_protocol = 'enigma2s'
+    secure_protocol = "enigma2s"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_enigma2'
+    setup_url = "https://appriseit.com/services/enigma2/"
 
     # Enigma2 does not support a title
     title_maxlen = 0
@@ -90,70 +88,75 @@ class NotifyEnigma2(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{user}@{host}',
-        '{schema}://{user}@{host}:{port}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
-        '{schema}://{host}/{fullpath}',
-        '{schema}://{host}:{port}/{fullpath}',
-        '{schema}://{user}@{host}/{fullpath}',
-        '{schema}://{user}@{host}:{port}/{fullpath}',
-        '{schema}://{user}:{password}@{host}/{fullpath}',
-        '{schema}://{user}:{password}@{host}:{port}/{fullpath}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{user}@{host}",
+        "{schema}://{user}@{host}:{port}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
+        "{schema}://{host}/{fullpath}",
+        "{schema}://{host}:{port}/{fullpath}",
+        "{schema}://{user}@{host}/{fullpath}",
+        "{schema}://{user}@{host}:{port}/{fullpath}",
+        "{schema}://{user}:{password}@{host}/{fullpath}",
+        "{schema}://{user}:{password}@{host}:{port}/{fullpath}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "fullpath": {
+                "name": _("Path"),
+                "type": "string",
+            },
         },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'fullpath': {
-            'name': _('Path'),
-            'type': 'string',
-        },
-    })
-
-    template_args = dict(NotifyBase.template_args, **{
-        'timeout': {
-            'name': _('Server Timeout'),
-            'type': 'int',
-            # The number of seconds to display the message for
-            'default': 13,
-            # -1 means infinit
-            'min': -1,
+    )
+
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "timeout": {
+                "name": _("Server Timeout"),
+                "type": "int",
+                # The number of seconds to display the message for
+                "default": 13,
+                # -1 means infinit
+                "min": -1,
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
     }
 
     def __init__(self, timeout=None, headers=None, **kwargs):
-        """
-        Initialize Enigma2 Object
+        """Initialize Enigma2 Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
@@ -162,17 +165,17 @@ def __init__(self, timeout=None, headers=None, **kwargs):
 
         try:
             self.timeout = int(timeout)
-            if self.timeout < self.template_args['timeout']['min']:
+            if self.timeout < self.template_args["timeout"]["min"]:
                 # Bulletproof; can't go lower then min value
-                self.timeout = self.template_args['timeout']['min']
+                self.timeout = self.template_args["timeout"]["min"]
 
         except (ValueError, TypeError):
             # Use default timeout
-            self.timeout = self.template_args['timeout']['default']
+            self.timeout = self.template_args["timeout"]["default"]
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = '/'
+            self.fullpath = "/"
 
         self.headers = {}
         if headers:
@@ -183,75 +186,75 @@ def __init__(self, timeout=None, headers=None, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol,
-            self.user, self.password, self.host,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
-            self.fullpath.rstrip('/'),
+            self.fullpath.rstrip("/"),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'timeout': str(self.timeout),
+            "timeout": str(self.timeout),
         }
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyEnigma2.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyEnigma2.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyEnigma2.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyEnigma2.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}{fullpath}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=NotifyEnigma2.quote(self.fullpath, safe='/'),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=NotifyEnigma2.quote(self.fullpath, safe="/"),
             params=NotifyEnigma2.urlencode(params),
         )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Enigma2 Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Enigma2 Notification."""
 
         # prepare Enigma2 Object
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         params = {
-            'text': body,
-            'type': MESSAGE_MAPPING.get(
-                notify_type, Enigma2MessageType.INFO),
-            'timeout': self.timeout,
+            "text": body,
+            "type": MESSAGE_MAPPING.get(notify_type, Enigma2MessageType.INFO),
+            "timeout": self.timeout,
         }
 
         # Apply any/all header over-rides defined
@@ -262,19 +265,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         # Prepare our message URL
-        url += self.fullpath.rstrip('/') + '/api/message'
+        url += self.fullpath.rstrip("/") + "/api/message"
 
-        self.logger.debug('Enigma2 POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Enigma2 Parameters: %s' % str(params))
+        self.logger.debug(
+            "Enigma2 POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Enigma2 Parameters: {params!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -291,17 +295,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyEnigma2.http_response_code_lookup(r.status_code)
+                status_str = NotifyEnigma2.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Enigma2 notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Enigma2 notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
@@ -309,7 +315,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # We were able to post our message; now lets evaluate the response
             try:
                 # Acquire our result
-                result = loads(r.content).get('result', False)
+                result = loads(r.content).get("result", False)
 
             except (AttributeError, TypeError, ValueError):
                 # ValueError = r.content is Unparsable
@@ -321,19 +327,21 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if not result:
                 self.logger.warning(
-                    'Failed to send Enigma2 notification: '
-                    'There was no server acknowledgement.')
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                    "Failed to send Enigma2 notification: "
+                    "There was no server acknowledgement."
+                )
+                self.logger.debug(f"Response Details:\r\n{r.content}")
                 # Return; we're done
                 return False
 
-            self.logger.info('Sent Enigma2 notification.')
+            self.logger.info("Sent Enigma2 notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Enigma2 '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Enigma2 "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -342,11 +350,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
@@ -354,12 +359,13 @@ def parse_url(url):
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {
+        results["headers"] = {
             NotifyEnigma2.unquote(x): NotifyEnigma2.unquote(y)
-            for x, y in results['qsd+'].items()}
+            for x, y in results["qsd+"].items()
+        }
 
         # Save timeout value (if specified)
-        if 'timeout' in results['qsd'] and len(results['qsd']['timeout']):
-            results['timeout'] = results['qsd']['timeout']
+        if "timeout" in results["qsd"] and len(results["qsd"]["timeout"]):
+            results["timeout"] = results["qsd"]["timeout"]
 
         return results
diff --git a/libs/apprise/plugins/fcm/__init__.py b/libs/apprise/plugins/fcm/__init__.py
index de6ede07a7..143b35d7e2 100644
--- a/libs/apprise/plugins/fcm/__init__.py
+++ b/libs/apprise/plugins/fcm/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -48,18 +47,19 @@
 #
 # If you Generate a new private key, it will provide a .json file
 # You will need this in order to send an apprise messag
-import requests
 from json import dumps
-from ..base import NotifyBase
-from ...common import NotifyType
-from ...utils.parse import validate_regex, parse_list, parse_bool
-from ...utils.logic import dict_full_update
-from ...common import NotifyImageSize
+
+import requests
+
 from ...apprise_attachment import AppriseAttachment
+from ...common import NotifyImageSize, NotifyType
 from ...locale import gettext_lazy as _
-from .common import (FCMMode, FCM_MODES)
-from .priority import (FCM_PRIORITIES, FCMPriorityManager)
+from ...utils.logic import dict_full_update
+from ...utils.parse import parse_bool, parse_list, validate_regex
+from ..base import NotifyBase
 from .color import FCMColorManager
+from .common import FCM_MODES, FCMMode
+from .priority import FCM_PRIORITIES, FCMPriorityManager
 
 # Default our global support flag
 NOTIFY_FCM_SUPPORT_ENABLED = False
@@ -80,41 +80,40 @@ class GoogleOAuth:
 
 # Our lookup map
 FCM_HTTP_ERROR_MAP = {
-    400: 'A bad request was made to the server.',
-    401: 'The provided API Key was not valid.',
-    404: 'The token could not be registered.',
+    400: "A bad request was made to the server.",
+    401: "The provided API Key was not valid.",
+    404: "The token could not be registered.",
 }
 
 
 class NotifyFCM(NotifyBase):
-    """
-    A wrapper for Google's Firebase Cloud Messaging Notifications
-    """
+    """A wrapper for Google's Firebase Cloud Messaging Notifications."""
 
     # Set our global enabled flag
     enabled = NOTIFY_FCM_SUPPORT_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'packages_required': 'cryptography'
+        "packages_required": "cryptography"
     }
 
     # The default descriptive name associated with the Notification
-    service_name = 'Firebase Cloud Messaging'
+    service_name = "Firebase Cloud Messaging"
 
     # The services URL
-    service_url = 'https://firebase.google.com'
+    service_url = "https://firebase.google.com"
 
     # The default protocol
-    secure_protocol = 'fcm'
+    secure_protocol = "fcm"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_fcm'
+    setup_url = "https://appriseit.com/services/fcm/"
 
     # Project Notification
     # https://firebase.google.com/docs/cloud-messaging/send-message
-    notify_oauth2_url = \
+    notify_oauth2_url = (
         "https://fcm.googleapis.com/v1/projects/{project}/messages:send"
+    )
 
     notify_legacy_url = "https://fcm.googleapis.com/fcm/send"
 
@@ -131,94 +130,108 @@ class NotifyFCM(NotifyBase):
     # Define object templates
     templates = (
         # OAuth2
-        '{schema}://{project}/{targets}?keyfile={keyfile}',
+        "{schema}://{project}/{targets}?keyfile={keyfile}",
         # Legacy Mode
-        '{schema}://{apikey}/{targets}',
+        "{schema}://{apikey}/{targets}",
     )
 
     # Define our template
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-        },
-        'keyfile': {
-            'name': _('OAuth2 KeyFile'),
-            'type': 'string',
-            'private': True,
-        },
-        'project': {
-            'name': _('Project ID'),
-            'type': 'string',
-        },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_topic': {
-            'name': _('Target Topic'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+            },
+            "keyfile": {
+                "name": _("OAuth2 KeyFile"),
+                "type": "string",
+                "private": True,
+            },
+            "project": {
+                "name": _("Project ID"),
+                "type": "string",
+            },
+            "target_device": {
+                "name": _("Target Device"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_topic": {
+                "name": _("Target Topic"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'mode': {
-            'name': _('Mode'),
-            'type': 'choice:string',
-            'values': FCM_MODES,
-            'default': FCMMode.Legacy,
-        },
-        'priority': {
-            'name': _('Mode'),
-            'type': 'choice:string',
-            'values': FCM_PRIORITIES,
-        },
-        'image_url': {
-            'name': _('Custom Image URL'),
-            'type': 'string',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "mode": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": FCM_MODES,
+                "default": FCMMode.Legacy,
+            },
+            "priority": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": FCM_PRIORITIES,
+            },
+            "image_url": {
+                "name": _("Custom Image URL"),
+                "type": "string",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            # Color can either be yes, no, or a #rrggbb (
+            # rrggbb without hashtag is accepted to)
+            "color": {
+                "name": _("Notification Color"),
+                "type": "string",
+                "default": "yes",
+            },
         },
-        # Color can either be yes, no, or a #rrggbb (
-        # rrggbb without hashtag is accepted to)
-        'color': {
-            'name': _('Notification Color'),
-            'type': 'string',
-            'default': 'yes',
-        },
-    })
+    )
 
     # Define our data entry
     template_kwargs = {
-        'data_kwargs': {
-            'name': _('Data Entries'),
-            'prefix': '+',
+        "data_kwargs": {
+            "name": _("Data Entries"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, project, apikey, targets=None, mode=None, keyfile=None,
-                 data_kwargs=None, image_url=None, include_image=False,
-                 color=None, priority=None, **kwargs):
-        """
-        Initialize Firebase Cloud Messaging
-
-        """
+    def __init__(
+        self,
+        project,
+        apikey,
+        targets=None,
+        mode=None,
+        keyfile=None,
+        data_kwargs=None,
+        image_url=None,
+        include_image=False,
+        color=None,
+        priority=None,
+        **kwargs,
+    ):
+        """Initialize Firebase Cloud Messaging."""
         super().__init__(**kwargs)
 
         if mode is None:
@@ -227,10 +240,13 @@ def __init__(self, project, apikey, targets=None, mode=None, keyfile=None,
 
         else:
             # Setup our mode
-            self.mode = NotifyFCM.template_tokens['mode']['default'] \
-                if not isinstance(mode, str) else mode.lower()
+            self.mode = (
+                NotifyFCM.template_tokens["mode"]["default"]
+                if not isinstance(mode, str)
+                else mode.lower()
+            )
             if self.mode and self.mode not in FCM_MODES:
-                msg = 'The FCM mode specified ({}) is invalid.'.format(mode)
+                msg = f"The FCM mode specified ({mode}) is invalid."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -247,20 +263,21 @@ def __init__(self, project, apikey, targets=None, mode=None, keyfile=None,
 
         # Initialize our Google OAuth module we can work with
         self.oauth = GoogleOAuth(
-            user_agent=self.app_id, timeout=self.request_timeout,
-            verify_certificate=self.verify_certificate)
+            user_agent=self.app_id,
+            timeout=self.request_timeout,
+            verify_certificate=self.verify_certificate,
+        )
 
         if self.mode == FCMMode.OAuth2:
             # The project ID associated with the account
             self.project = validate_regex(project)
             if not self.project:
-                msg = 'An invalid FCM Project ID ' \
-                      '({}) was specified.'.format(project)
+                msg = f"An invalid FCM Project ID ({project}) was specified."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             if not keyfile:
-                msg = 'No FCM JSON KeyFile was specified.'
+                msg = "No FCM JSON KeyFile was specified."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -276,8 +293,7 @@ def __init__(self, project, apikey, targets=None, mode=None, keyfile=None,
             # The apikey associated with the account
             self.apikey = validate_regex(apikey)
             if not self.apikey:
-                msg = 'An invalid FCM API key ' \
-                      '({}) was specified.'.format(apikey)
+                msg = f"An invalid FCM API key ({apikey}) was specified."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -310,42 +326,39 @@ def __init__(self, project, apikey, targets=None, mode=None, keyfile=None,
 
     @property
     def access_token(self):
-        """
-        Generates a access_token based on the keyfile provided
-        """
+        """Generates a access_token based on the keyfile provided."""
         keyfile = self.keyfile[0]
         if not keyfile:
             # We could not access the keyfile
             self.logger.error(
-                'Could not access FCM keyfile {}.'.format(
-                    keyfile.url(privacy=True)))
+                f"Could not access FCM keyfile {keyfile.url(privacy=True)}."
+            )
             return None
 
         if not self.oauth.load(keyfile.path):
             self.logger.error(
-                'FCM keyfile {} could not be loaded.'.format(
-                    keyfile.url(privacy=True)))
+                f"FCM keyfile {keyfile.url(privacy=True)} could not be loaded."
+            )
             return None
 
         # Verify our project id against the one provided in our keyfile
         if self.project != self.oauth.project_id:
             self.logger.error(
-                'FCM keyfile {} identifies itself for a different project'
-                .format(keyfile.url(privacy=True)))
+                f"FCM keyfile {keyfile.url(privacy=True)} identifies itself"
+                " for a different project"
+            )
             return None
 
         # Return our generated key; the below returns None if a token could
         # not be acquired
         return self.oauth.access_token
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform FCM Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform FCM Notification."""
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning('There are no FCM devices or topics to notify')
+            self.logger.warning("There are no FCM devices or topics to notify")
             return False
 
         if self.mode == FCMMode.OAuth2:
@@ -356,9 +369,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 return False
 
             headers = {
-                'User-Agent': self.app_id,
-                'Content-Type': 'application/json',
-                "Authorization": "Bearer {}".format(access_token),
+                "User-Agent": self.app_id,
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {access_token}",
             }
 
             # Prepare our notify URL
@@ -366,17 +379,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         else:  # FCMMode.Legacy
             headers = {
-                'User-Agent': self.app_id,
-                'Content-Type': 'application/json',
-                "Authorization": "key={}".format(self.apikey),
+                "User-Agent": self.app_id,
+                "Content-Type": "application/json",
+                "Authorization": f"key={self.apikey}",
             }
 
             # Prepare our notify URL
             notify_url = self.notify_legacy_url
 
         # Acquire image url
-        image = self.image_url(notify_type) \
-            if not self.image_src else self.image_src
+        image = (
+            self.image_url(notify_type)
+            if not self.image_src
+            else self.image_src
+        )
 
         has_error = False
         # Create a copy of the targets list
@@ -386,80 +402,84 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if self.mode == FCMMode.OAuth2:
                 payload = {
-                    'message': {
-                        'token': None,
-                        'notification': {
-                            'title': title,
-                            'body': body,
-                        }
+                    "message": {
+                        "token": None,
+                        "notification": {
+                            "title": title,
+                            "body": body,
+                        },
                     }
                 }
 
                 if self.color:
                     # Acquire our color
-                    payload['message']['android'] = {
-                        'notification': {'color': self.color.get(notify_type)}}
+                    payload["message"]["android"] = {
+                        "notification": {"color": self.color.get(notify_type)}
+                    }
 
                 if self.include_image and image:
-                    payload['message']['notification']['image'] = image
+                    payload["message"]["notification"]["image"] = image
 
                 if self.data_kwargs:
-                    payload['message']['data'] = self.data_kwargs
+                    payload["message"]["data"] = self.data_kwargs
 
-                if recipient[0] == '#':
-                    payload['message']['topic'] = recipient[1:]
+                if recipient[0] == "#":
+                    payload["message"]["topic"] = recipient[1:]
                     self.logger.debug(
-                        "FCM recipient %s parsed as a topic",
-                        recipient[1:])
+                        "FCM recipient %s parsed as a topic", recipient[1:]
+                    )
 
                 else:
-                    payload['message']['token'] = recipient
+                    payload["message"]["token"] = recipient
                     self.logger.debug(
-                        "FCM recipient %s parsed as a device token",
-                        recipient)
+                        "FCM recipient %s parsed as a device token", recipient
+                    )
 
             else:  # FCMMode.Legacy
                 payload = {
-                    'notification': {
-                        'notification': {
-                            'title': title,
-                            'body': body,
+                    "notification": {
+                        "notification": {
+                            "title": title,
+                            "body": body,
                         }
                     }
                 }
 
                 if self.color:
                     # Acquire our color
-                    payload['notification']['notification']['color'] = \
+                    payload["notification"]["notification"]["color"] = (
                         self.color.get(notify_type)
+                    )
 
                 if self.include_image and image:
-                    payload['notification']['notification']['image'] = image
+                    payload["notification"]["notification"]["image"] = image
 
                 if self.data_kwargs:
-                    payload['data'] = self.data_kwargs
+                    payload["data"] = self.data_kwargs
 
-                if recipient[0] == '#':
-                    payload['to'] = '/topics/{}'.format(recipient)
+                if recipient[0] == "#":
+                    payload["to"] = f"/topics/{recipient}"
                     self.logger.debug(
-                        "FCM recipient %s parsed as a topic",
-                        recipient[1:])
+                        "FCM recipient %s parsed as a topic", recipient[1:]
+                    )
 
                 else:
-                    payload['to'] = recipient
+                    payload["to"] = recipient
                     self.logger.debug(
-                        "FCM recipient %s parsed as a device token",
-                        recipient)
+                        "FCM recipient %s parsed as a device token", recipient
+                    )
 
             # A more advanced dict.update() that recursively includes
             # sub-dictionaries as well
             dict_full_update(payload, self.priority.payload())
 
             self.logger.debug(
-                'FCM %s POST URL: %s (cert_verify=%r)',
-                self.mode, notify_url, self.verify_certificate,
+                "FCM %s POST URL: %s (cert_verify=%r)",
+                self.mode,
+                notify_url,
+                self.verify_certificate,
             )
-            self.logger.debug('FCM %s Payload: %s', self.mode, str(payload))
+            self.logger.debug("FCM %s Payload: %s", self.mode, payload)
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -472,34 +492,37 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     timeout=self.request_timeout,
                 )
                 if r.status_code not in (
-                        requests.codes.ok, requests.codes.no_content):
+                    requests.codes.ok,
+                    requests.codes.no_content,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(
-                            r.status_code, FCM_HTTP_ERROR_MAP)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code, FCM_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send {} FCM notification: '
-                        '{}{}error={}.'.format(
+                        "Failed to send {} FCM notification: "
+                        "{}{}error={}.".format(
                             self.mode,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n%s', r.content)
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     has_error = True
 
                 else:
-                    self.logger.info('Sent %s FCM notification.', self.mode)
+                    self.logger.info("Sent %s FCM notification.", self.mode)
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending FCM '
-                    'notification.'
+                    "A Connection error occurred sending FCM notification."
                 )
-                self.logger.debug('Socket Exception: %s', str(e))
+                self.logger.debug("Socket Exception: %s", e)
 
                 has_error = True
 
@@ -507,129 +530,121 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.mode, self.apikey, self.project)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'mode': self.mode,
-            'image': 'yes' if self.include_image else 'no',
-            'color': str(self.color),
+            "mode": self.mode,
+            "image": "yes" if self.include_image else "no",
+            "color": str(self.color),
         }
 
         if self.priority:
             # Store our priority if one was defined
-            params['priority'] = str(self.priority)
+            params["priority"] = str(self.priority)
 
         if self.keyfile:
             # Include our keyfile if specified
-            params['keyfile'] = NotifyFCM.quote(
-                self.keyfile[0].url(privacy=privacy), safe='')
+            params["keyfile"] = NotifyFCM.quote(
+                self.keyfile[0].url(privacy=privacy), safe=""
+            )
 
         if self.image_src:
             # Include our image path as part of our URL payload
-            params['image_url'] = self.image_src
+            params["image_url"] = self.image_src
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Add our data keyword/args into our URL response
-        params.update(
-            {'+{}'.format(k): v for k, v in self.data_kwargs.items()})
+        params.update({f"+{k}": v for k, v in self.data_kwargs.items()})
 
-        reference = NotifyFCM.quote(self.project) \
-            if self.mode == FCMMode.OAuth2 \
-            else self.pprint(self.apikey, privacy, safe='')
+        reference = (
+            NotifyFCM.quote(self.project)
+            if self.mode == FCMMode.OAuth2
+            else self.pprint(self.apikey, privacy, safe="")
+        )
 
-        return '{schema}://{reference}/{targets}?{params}'.format(
+        return "{schema}://{reference}/{targets}?{params}".format(
             schema=self.secure_protocol,
             reference=reference,
-            targets='/'.join(
-                [NotifyFCM.quote(x) for x in self.targets]),
+            targets="/".join([NotifyFCM.quote(x) for x in self.targets]),
             params=NotifyFCM.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The apikey/project is stored in the hostname
-        results['apikey'] = NotifyFCM.unquote(results['host'])
-        results['project'] = results['apikey']
+        results["apikey"] = NotifyFCM.unquote(results["host"])
+        results["project"] = results["apikey"]
 
         # Get our Device IDs
-        results['targets'] = NotifyFCM.split_path(results['fullpath'])
+        results["targets"] = NotifyFCM.split_path(results["fullpath"])
 
         # Get our mode
-        results['mode'] = results['qsd'].get('mode')
+        results["mode"] = results["qsd"].get("mode")
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyFCM.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyFCM.parse_list(results["qsd"]["to"])
 
         # Our Project ID
-        if 'project' in results['qsd'] and results['qsd']['project']:
-            results['project'] = \
-                NotifyFCM.unquote(results['qsd']['project'])
+        if "project" in results["qsd"] and results["qsd"]["project"]:
+            results["project"] = NotifyFCM.unquote(results["qsd"]["project"])
 
         # Our Web API Key
-        if 'apikey' in results['qsd'] and results['qsd']['apikey']:
-            results['apikey'] = \
-                NotifyFCM.unquote(results['qsd']['apikey'])
+        if "apikey" in results["qsd"] and results["qsd"]["apikey"]:
+            results["apikey"] = NotifyFCM.unquote(results["qsd"]["apikey"])
 
         # Our Keyfile (JSON)
-        if 'keyfile' in results['qsd'] and results['qsd']['keyfile']:
-            results['keyfile'] = \
-                NotifyFCM.unquote(results['qsd']['keyfile'])
+        if "keyfile" in results["qsd"] and results["qsd"]["keyfile"]:
+            results["keyfile"] = NotifyFCM.unquote(results["qsd"]["keyfile"])
 
         # Our Priority
-        if 'priority' in results['qsd'] and results['qsd']['priority']:
-            results['priority'] = \
-                NotifyFCM.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and results["qsd"]["priority"]:
+            results["priority"] = NotifyFCM.unquote(results["qsd"]["priority"])
 
         # Our Color
-        if 'color' in results['qsd'] and results['qsd']['color']:
-            results['color'] = \
-                NotifyFCM.unquote(results['qsd']['color'])
+        if "color" in results["qsd"] and results["qsd"]["color"]:
+            results["color"] = NotifyFCM.unquote(results["qsd"]["color"])
 
         # Boolean to include an image or not
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyFCM.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyFCM.template_args["image"]["default"]
+            )
+        )
 
         # Extract image_url if it was specified
-        if 'image_url' in results['qsd']:
-            results['image_url'] = \
-                NotifyFCM.unquote(results['qsd']['image_url'])
-            if 'image' not in results['qsd']:
+        if "image_url" in results["qsd"]:
+            results["image_url"] = NotifyFCM.unquote(
+                results["qsd"]["image_url"]
+            )
+            if "image" not in results["qsd"]:
                 # Toggle default behaviour if a custom image was provided
                 # but ONLY if the `image` boolean was not set
-                results['include_image'] = True
+                results["include_image"] = True
 
         # Store our data keyword/args if specified
-        results['data_kwargs'] = results['qsd+']
+        results["data_kwargs"] = results["qsd+"]
 
         return results
diff --git a/libs/apprise/plugins/fcm/color.py b/libs/apprise/plugins/fcm/color.py
index 1904330a2d..5e4da59a0d 100644
--- a/libs/apprise/plugins/fcm/color.py
+++ b/libs/apprise/plugins/fcm/color.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,34 +33,36 @@
 # https://firebase.google.com/docs/reference/fcm/rest/v1/\
 #       projects.messages#androidnotification
 import re
-from ...utils.parse import parse_bool
-from ...common import NotifyType
+
 from ...asset import AppriseAsset
+from ...common import NotifyType
+from ...utils.parse import parse_bool
 
 
 class FCMColorManager:
-    """
-    A Simple object to accept either a boolean value
-      - True: Use colors provided by Apprise
-      - False: Do not use colors at all
-      - rrggbb: where you provide the rgb values (hence #333333)
-      - rgb: is also accepted as rgb values (hence #333)
+    """A Simple object to accept either a boolean value.
 
-      For RGB colors, the hashtag is optional
+    - True: Use colors provided by Apprise
+    - False: Do not use colors at all
+    - rrggbb: where you provide the rgb values (hence #333333)
+    - rgb: is also accepted as rgb values (hence #333)
+
+    For RGB colors, the hashtag is optional
     """
 
     __color_rgb = re.compile(
-        r'#?((?P<r1>[0-9A-F]{2})(?P<g1>[0-9A-F]{2})(?P<b1>[0-9A-F]{2})'
-        r'|(?P<r2>[0-9A-F])(?P<g2>[0-9A-F])(?P<b2>[0-9A-F]))', re.IGNORECASE)
+        r"#?((?P<r1>[0-9A-F]{2})(?P<g1>[0-9A-F]{2})(?P<b1>[0-9A-F]{2})"
+        r"|(?P<r2>[0-9A-F])(?P<g2>[0-9A-F])(?P<b2>[0-9A-F]))",
+        re.IGNORECASE,
+    )
 
     def __init__(self, color, asset=None):
-        """
-        Parses the color object accordingly
-        """
+        """Parses the color object accordingly."""
 
         # Initialize an asset object if one isn't otherwise defined
-        self.asset = asset \
-            if isinstance(asset, AppriseAsset) else AppriseAsset()
+        self.asset = (
+            asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         # Prepare our color
         self.color = color
@@ -69,27 +70,29 @@ def __init__(self, color, asset=None):
             self.color = self.__color_rgb.match(color)
             if self.color:
                 # Store our RGB value as #rrggbb
-                self.color = '{red}{green}{blue}'.format(
-                    red=self.color.group('r1'),
-                    green=self.color.group('g1'),
-                    blue=self.color.group('b1')).lower() \
-                    if self.color.group('r1') else \
-                    '{red1}{red2}{green1}{green2}{blue1}{blue2}'.format(
-                    red1=self.color.group('r2'),
-                    red2=self.color.group('r2'),
-                    green1=self.color.group('g2'),
-                    green2=self.color.group('g2'),
-                    blue1=self.color.group('b2'),
-                    blue2=self.color.group('b2')).lower()
+                self.color = (
+                    "{red}{green}{blue}".format(
+                        red=self.color.group("r1"),
+                        green=self.color.group("g1"),
+                        blue=self.color.group("b1"),
+                    ).lower()
+                    if self.color.group("r1")
+                    else "{red1}{red2}{green1}{green2}{blue1}{blue2}".format(
+                        red1=self.color.group("r2"),
+                        red2=self.color.group("r2"),
+                        green1=self.color.group("g2"),
+                        green2=self.color.group("g2"),
+                        blue1=self.color.group("b2"),
+                        blue2=self.color.group("b2"),
+                    ).lower()
+                )
 
         if self.color is None:
             # Color not determined, so base it on boolean parser
             self.color = parse_bool(color)
 
     def get(self, notify_type=NotifyType.INFO):
-        """
-        Returns color or true/false value based on configuration
-        """
+        """Returns color or true/false value based on configuration."""
 
         if isinstance(self.color, bool) and self.color:
             # We want to use the asset value
@@ -97,25 +100,22 @@ def get(self, notify_type=NotifyType.INFO):
 
         elif self.color:
             # return our color as is
-            return '#' + self.color
+            return "#" + self.color
 
         # No color to return
         return None
 
     def __str__(self):
-        """
-        our color representation
-        """
+        """Our color representation."""
         if isinstance(self.color, bool):
-            return 'yes' if self.color else 'no'
+            return "yes" if self.color else "no"
 
         # otherwise return our color
         return self.color
 
     def __bool__(self):
-        """
-        Allows this object to be wrapped in an 'if statement'.
+        """Allows this object to be wrapped in an 'if statement'.
+
         True is returned if a color was loaded
         """
-        return True if self.color is True or \
-            isinstance(self.color, str) else False
+        return bool(self.color is True or isinstance(self.color, str))
diff --git a/libs/apprise/plugins/fcm/common.py b/libs/apprise/plugins/fcm/common.py
index 18560680d9..833f025bd3 100644
--- a/libs/apprise/plugins/fcm/common.py
+++ b/libs/apprise/plugins/fcm/common.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,10 +25,10 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+
 class FCMMode:
-    """
-    Define the Firebase Cloud Messaging Modes
-    """
+    """Define the Firebase Cloud Messaging Modes."""
+
     # The legacy way of sending a message
     Legacy = "legacy"
 
diff --git a/libs/apprise/plugins/fcm/oauth.py b/libs/apprise/plugins/fcm/oauth.py
index 444c7d2371..04b103633b 100644
--- a/libs/apprise/plugins/fcm/oauth.py
+++ b/libs/apprise/plugins/fcm/oauth.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -32,47 +31,42 @@
 #  2. Click Generate New Private Key, then confirm by clicking Generate Key.
 #  3. Securely store the JSON file containing the key.
 
-import requests
 import base64
-import json
 import calendar
-from cryptography.hazmat import backends
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives import asymmetric
-from cryptography.exceptions import UnsupportedAlgorithm
-from datetime import datetime
-from datetime import timedelta
-from datetime import timezone
+from datetime import datetime, timedelta, timezone
+import json
 from json.decoder import JSONDecodeError
 from urllib.parse import urlencode as _urlencode
 
+from cryptography.exceptions import UnsupportedAlgorithm
+from cryptography.hazmat import backends
+from cryptography.hazmat.primitives import asymmetric, hashes, serialization
+import requests
+
 from ...logger import logger
 
 
 class GoogleOAuth:
-    """
-    A OAuth simplified implimentation to Google's Firebase Cloud Messaging
+    """A OAuth simplified implimentation to Google's Firebase Cloud
+    Messaging."""
 
-    """
     scopes = [
-        'https://www.googleapis.com/auth/firebase.messaging',
+        "https://www.googleapis.com/auth/firebase.messaging",
     ]
 
     # 1 hour in seconds (the lifetime of our token)
     access_token_lifetime_sec = timedelta(seconds=3600)
 
     # The default URI to use if one is not found
-    default_token_uri = 'https://oauth2.googleapis.com/token'
+    default_token_uri = "https://oauth2.googleapis.com/token"
 
     # Taken right from google.auth.helpers:
     clock_skew = timedelta(seconds=10)
 
-    def __init__(self, user_agent=None, timeout=(5, 4),
-                 verify_certificate=True):
-        """
-        Initialize our OAuth object
-        """
+    def __init__(
+        self, user_agent=None, timeout=(5, 4), verify_certificate=True
+    ):
+        """Initialize our OAuth object."""
 
         # Wether or not to verify ssl
         self.verify_certificate = verify_certificate
@@ -87,12 +81,10 @@ def __init__(self, user_agent=None, timeout=(5, 4),
         self.__reset()
 
     def __reset(self):
-        """
-        Reset object internal variables
-        """
+        """Reset object internal variables."""
 
         # Google Keyfile Encoding
-        self.encoding = 'utf-8'
+        self.encoding = "utf-8"
 
         # Our retrieved JSON content (unmangled)
         self.content = None
@@ -106,9 +98,7 @@ def __reset(self):
         self.__access_token_expiry = datetime.now(timezone.utc)
 
     def load(self, path):
-        """
-        Generate our SSL details
-        """
+        """Generate our SSL details."""
 
         # Reset our objects
         self.content = None
@@ -117,48 +107,58 @@ def load(self, path):
         self.__access_token_expiry = datetime.now(timezone.utc)
 
         try:
-            with open(path, mode="r", encoding=self.encoding) as fp:
+            with open(path, encoding=self.encoding) as fp:
                 self.content = json.loads(fp.read())
 
-        except (OSError, IOError):
-            logger.debug('FCM keyfile {} could not be accessed'.format(path))
+        except OSError:
+            logger.debug(f"FCM keyfile {path} could not be accessed")
             return False
 
         except JSONDecodeError as e:
             logger.debug(
-                'FCM keyfile {} generated a JSONDecodeError: {}'.format(
-                    path, e))
+                f"FCM keyfile {path} generated a JSONDecodeError: {e}"
+            )
             return False
 
         if not isinstance(self.content, dict):
-            logger.debug(
-                'FCM keyfile {} is incorrectly structured'.format(path))
+            logger.debug(f"FCM keyfile {path} is incorrectly structured")
             self.__reset()
             return False
 
         # Verify we've got the correct tokens in our content to work with
-        is_valid = next((False for k in (
-            'client_email', 'private_key_id', 'private_key',
-            'type', 'project_id') if not self.content.get(k)), True)
+        is_valid = next(
+            (
+                False
+                for k in (
+                    "client_email",
+                    "private_key_id",
+                    "private_key",
+                    "type",
+                    "project_id",
+                )
+                if not self.content.get(k)
+            ),
+            True,
+        )
 
         if not is_valid:
-            logger.debug(
-                'FCM keyfile {} is missing required information'.format(path))
+            logger.debug(f"FCM keyfile {path} is missing required information")
             self.__reset()
             return False
 
         # Verify our service_account type
-        if self.content.get('type') != 'service_account':
-            logger.debug(
-                'FCM keyfile {} is not of type service_account'.format(path))
+        if self.content.get("type") != "service_account":
+            logger.debug(f"FCM keyfile {path} is not of type service_account")
             self.__reset()
             return False
 
         # Prepare our private key which is in PKCS8 PEM format
         try:
             self.private_key = serialization.load_pem_private_key(
-                self.content.get('private_key').encode(self.encoding),
-                password=None, backend=backends.default_backend())
+                self.content.get("private_key").encode(self.encoding),
+                password=None,
+                backend=backends.default_backend(),
+            )
 
         except (TypeError, ValueError):
             # ValueError: If the PEM data could not be decrypted or if its
@@ -166,14 +166,14 @@ def load(self, path):
             # TypeError:  If a password was given and the private key was
             #             not encrypted. Or if the key was encrypted but
             #             no password was supplied.
-            logger.error('FCM provided private key is invalid.')
+            logger.error("FCM provided private key is invalid.")
             self.__reset()
             return False
 
         except UnsupportedAlgorithm:
             # If the serialized key is of a type that is not supported by
             # the backend.
-            logger.error('FCM provided private key is not supported')
+            logger.error("FCM provided private key is not supported")
             self.__reset()
             return False
 
@@ -182,18 +182,19 @@ def load(self, path):
 
     @property
     def access_token(self):
-        """
-        Returns our access token (if it hasn't expired yet)
-          - if we do not have one we'll fetch one.
-          - if it expired, we'll renew it
-          - if a key simply can't be acquired, then we return None
+        """Returns our access token (if it hasn't expired yet)
+
+        - if we do not have one we'll fetch one.
+        - if it expired, we'll renew it
+        - if a key simply can't be acquired, then we return None
         """
 
         if not self.private_key or not self.content:
             # invalid content (or not loaded)
             logger.error(
-                'No FCM JSON keyfile content loaded to generate a access '
-                'token with.')
+                "No FCM JSON keyfile content loaded to generate a access "
+                "token with."
+            )
             return None
 
         if self.__access_token_expiry > datetime.now(timezone.utc):
@@ -201,9 +202,9 @@ def access_token(self):
             return self.__access_token
 
         # If we reach here we need to prepare our payload
-        token_uri = self.content.get('token_uri', self.default_token_uri)
-        service_email = self.content.get('client_email')
-        key_identifier = self.content.get('private_key_id')
+        token_uri = self.content.get("token_uri", self.default_token_uri)
+        service_email = self.content.get("client_email")
+        key_identifier = self.content.get("private_key_id")
 
         # Generate our Assertion
         now = datetime.now(timezone.utc)
@@ -223,20 +224,24 @@ def access_token(self):
 
         # JWT Details
         header = {
-            'typ': 'JWT',
-            'alg': 'RS256' if isinstance(
-                self.private_key, asymmetric.rsa.RSAPrivateKey) else 'ES256',
-
+            "typ": "JWT",
+            "alg": (
+                "RS256"
+                if isinstance(self.private_key, asymmetric.rsa.RSAPrivateKey)
+                else "ES256"
+            ),
             # Key Identifier
-            'kid': key_identifier,
+            "kid": key_identifier,
         }
 
         # Encodes base64 strings removing any padding characters.
         segments = [
             base64.urlsafe_b64encode(
-                json.dumps(header).encode(self.encoding)).rstrip(b"="),
+                json.dumps(header).encode(self.encoding)
+            ).rstrip(b"="),
             base64.urlsafe_b64encode(
-                json.dumps(payload).encode(self.encoding)).rstrip(b"="),
+                json.dumps(payload).encode(self.encoding)
+            ).rstrip(b"="),
         ]
 
         signing_input = b".".join(segments)
@@ -251,17 +256,17 @@ def access_token(self):
         assertion = b".".join(segments)
 
         http_payload = _urlencode({
-            'assertion': assertion,
-            'grant_type': 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+            "assertion": assertion,
+            "grant_type": "urn:ietf:params:oauth:grant-type:jwt-bearer",
         })
 
         http_headers = {
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "Content-Type": "application/x-www-form-urlencoded",
         }
         if self.user_agent:
-            http_headers['User-Agent'] = self.user_agent
+            http_headers["User-Agent"] = self.user_agent
 
-        logger.info('Refreshing FCM Access Token')
+        logger.info("Refreshing FCM Access Token")
         try:
             r = requests.post(
                 token_uri,
@@ -273,47 +278,46 @@ def access_token(self):
             if r.status_code != requests.codes.ok:
                 # We had a problem
                 logger.warning(
-                    'Failed to update FCM Access Token error={}.'
-                    .format(r.status_code))
+                    f"Failed to update FCM Access Token error={r.status_code}."
+                )
 
                 logger.debug(
-                    'Response Details:\r\n%s', r.content)
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
                 return None
 
         except requests.RequestException as e:
             logger.warning(
-                'A Connection error occurred refreshing FCM '
-                'Access Token.'
+                "A Connection error occurred refreshing FCM Access Token."
             )
-            logger.debug('Socket Exception: %s', str(e))
+            logger.debug("Socket Exception: %s", str(e))
             return None
 
         # If we get here, we made our request successfully, now we need
         # to parse out the data
         response = json.loads(r.content)
-        self.__access_token = response['access_token']
+        self.__access_token = response["access_token"]
         self.__refresh_token = response.get(
-            'refresh_token', self.__refresh_token)
+            "refresh_token", self.__refresh_token
+        )
 
-        if 'expires_in' in response:
-            delta = timedelta(seconds=int(response['expires_in']))
-            self.__access_token_expiry = \
+        if "expires_in" in response:
+            delta = timedelta(seconds=int(response["expires_in"]))
+            self.__access_token_expiry = (
                 delta + datetime.now(timezone.utc) - self.clock_skew
+            )
 
         else:
             # Allow some grace before we expire
             self.__access_token_expiry = expiry - self.clock_skew
 
         logger.debug(
-            'Access Token successfully acquired: %s', self.__access_token)
+            "Access Token successfully acquired: %s", self.__access_token
+        )
 
         # Return our token
         return self.__access_token
 
     @property
     def project_id(self):
-        """
-        Returns the project id found in the file
-        """
-        return None if not self.content \
-            else self.content.get('project_id')
+        """Returns the project id found in the file."""
+        return None if not self.content else self.content.get("project_id")
diff --git a/libs/apprise/plugins/fcm/priority.py b/libs/apprise/plugins/fcm/priority.py
index 2768d396fd..037801bc05 100644
--- a/libs/apprise/plugins/fcm/priority.py
+++ b/libs/apprise/plugins/fcm/priority.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -32,8 +31,8 @@
 
 # Legacy priorities are defined here:
 # - https://firebase.google.com/docs/cloud-messaging/http-server-ref
-from .common import (FCMMode, FCM_MODES)
 from ...logger import logger
+from .common import FCM_MODES, FCMMode
 
 
 class NotificationPriority:
@@ -62,14 +61,13 @@ class NotificationPriority:
             more to battery drain compared with normal priority messages.
     """
 
-    NORMAL = 'NORMAL'
-    HIGH = 'HIGH'
+    NORMAL = "NORMAL"
+    HIGH = "HIGH"
 
 
 class FCMPriority:
-    """
-    Defines our accepted priorites
-    """
+    """Defines our accepted priorites."""
+
     MIN = "min"
 
     LOW = "low"
@@ -91,161 +89,110 @@ class FCMPriority:
 
 
 class FCMPriorityManager:
-    """
-    A Simple object to make it easier to work with FCM set priorities
-    """
+    """A Simple object to make it easier to work with FCM set priorities."""
 
     priority_map = {
         FCMPriority.MIN: {
             FCMMode.OAuth2: {
-                'message': {
-                    'android': {
-                        'priority': NotificationPriority.NORMAL
-                    },
-                    'apns': {
-                        'headers': {
-                            'apns-priority': "5"
-                        }
-                    },
-                    'webpush': {
-                        'headers': {
-                            'Urgency': 'very-low'
-                        }
-                    },
+                "message": {
+                    "android": {"priority": NotificationPriority.NORMAL},
+                    "apns": {"headers": {"apns-priority": "5"}},
+                    "webpush": {"headers": {"Urgency": "very-low"}},
                 }
             },
             FCMMode.Legacy: {
-                'priority': 'normal',
-            }
+                "priority": "normal",
+            },
         },
         FCMPriority.LOW: {
             FCMMode.OAuth2: {
-                'message': {
-                    'android': {
-                        'priority': NotificationPriority.NORMAL
-                    },
-                    'apns': {
-                        'headers': {
-                            'apns-priority': "5"
-                        }
-                    },
-                    'webpush': {
-                        'headers': {
-                            'Urgency': 'low'
-                        }
-                    }
+                "message": {
+                    "android": {"priority": NotificationPriority.NORMAL},
+                    "apns": {"headers": {"apns-priority": "5"}},
+                    "webpush": {"headers": {"Urgency": "low"}},
                 }
             },
             FCMMode.Legacy: {
-                'priority': 'normal',
-            }
+                "priority": "normal",
+            },
         },
         FCMPriority.NORMAL: {
             FCMMode.OAuth2: {
-                'message': {
-                    'android': {
-                        'priority': NotificationPriority.NORMAL
-                    },
-                    'apns': {
-                        'headers': {
-                            'apns-priority': "5"
-                        }
-                    },
-                    'webpush': {
-                        'headers': {
-                            'Urgency': 'normal'
-                        }
-                    }
+                "message": {
+                    "android": {"priority": NotificationPriority.NORMAL},
+                    "apns": {"headers": {"apns-priority": "5"}},
+                    "webpush": {"headers": {"Urgency": "normal"}},
                 }
             },
             FCMMode.Legacy: {
-                'priority': 'normal',
-            }
+                "priority": "normal",
+            },
         },
         FCMPriority.HIGH: {
             FCMMode.OAuth2: {
-                'message': {
-                    'android': {
-                        'priority': NotificationPriority.HIGH
-                    },
-                    'apns': {
-                        'headers': {
-                            'apns-priority': "10"
-                        }
-                    },
-                    'webpush': {
-                        'headers': {
-                            'Urgency': 'high'
-                        }
-                    }
+                "message": {
+                    "android": {"priority": NotificationPriority.HIGH},
+                    "apns": {"headers": {"apns-priority": "10"}},
+                    "webpush": {"headers": {"Urgency": "high"}},
                 }
             },
             FCMMode.Legacy: {
-                'priority': 'high',
-            }
+                "priority": "high",
+            },
         },
         FCMPriority.MAX: {
             FCMMode.OAuth2: {
-                'message': {
-                    'android': {
-                        'priority': NotificationPriority.HIGH
-                    },
-                    'apns': {
-                        'headers': {
-                            'apns-priority': "10"
-                        }
-                    },
-                    'webpush': {
-                        'headers': {
-                            'Urgency': 'high'
-                        }
-                    }
+                "message": {
+                    "android": {"priority": NotificationPriority.HIGH},
+                    "apns": {"headers": {"apns-priority": "10"}},
+                    "webpush": {"headers": {"Urgency": "high"}},
                 }
             },
             FCMMode.Legacy: {
-                'priority': 'high',
-            }
-        }
+                "priority": "high",
+            },
+        },
     }
 
     def __init__(self, mode, priority=None):
-        """
-        Takes a FCMMode and Priority
-        """
+        """Takes a FCMMode and Priority."""
 
         self.mode = mode
         if self.mode not in FCM_MODES:
-            msg = 'The FCM mode specified ({}) is invalid.'.format(mode)
+            msg = f"The FCM mode specified ({mode}) is invalid."
             logger.warning(msg)
             raise TypeError(msg)
 
         self.priority = None
         if priority:
-            self.priority = \
-                next((p for p in FCM_PRIORITIES
-                      if p.startswith(priority[:2].lower())), None)
+            self.priority = next(
+                (
+                    p
+                    for p in FCM_PRIORITIES
+                    if p.startswith(priority[:2].lower())
+                ),
+                None,
+            )
             if not self.priority:
-                msg = 'An invalid FCM Priority ' \
-                      '({}) was specified.'.format(priority)
+                msg = f"An invalid FCM Priority ({priority}) was specified."
                 logger.warning(msg)
                 raise TypeError(msg)
 
     def payload(self):
-        """
-        Returns our payload depending on our mode
-        """
-        return self.priority_map[self.priority][self.mode] \
-            if self.priority else {}
+        """Returns our payload depending on our mode."""
+        return (
+            self.priority_map[self.priority][self.mode]
+            if self.priority
+            else {}
+        )
 
     def __str__(self):
-        """
-        our priority representation
-        """
-        return self.priority if self.priority else ''
+        """Our priority representation."""
+        return self.priority if self.priority else ""
 
     def __bool__(self):
-        """
-        Allows this object to be wrapped in an 'if statement'.
+        """Allows this object to be wrapped in an 'if statement'.
+
         True is returned if a priority was loaded
         """
-        return True if self.priority else False
+        return bool(self.priority)
diff --git a/libs/apprise/plugins/feishu.py b/libs/apprise/plugins/feishu.py
index 0e75bec2c1..8f74a2e52f 100644
--- a/libs/apprise/plugins/feishu.py
+++ b/libs/apprise/plugins/feishu.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,39 +32,36 @@
 #    https://open.feishu.cn/document/client-docs/bot-v3/add-custom-bot
 #
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NotifyFeishu(NotifyBase):
-    """
-    A wrapper for Feishu Notifications
-    """
+    """A wrapper for Feishu Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = _('Feishu')
+    service_name = _("Feishu")
 
     # The services URL
-    service_url = 'https://open.feishu.cn/'
+    service_url = "https://open.feishu.cn/"
 
     # The default secure protocol
-    secure_protocol = 'feishu'
+    secure_protocol = "feishu"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_feishu'
+    setup_url = "https://appriseit.com/services/feishu/"
 
     # Notification URL
-    notify_url = 'https://open.feishu.cn/open-apis/bot/v2/hook/{token}/'
+    notify_url = "https://open.feishu.cn/open-apis/bot/v2/hook/{token}/"
 
     # Define object templates
-    templates = (
-        '{schema}://{token}',
-    )
+    templates = ("{schema}://{token}",)
 
     # The title is not used
     title_maxlen = 0
@@ -77,61 +73,65 @@ class NotifyFeishu(NotifyBase):
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'token': {
-            'alias_of': 'token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "token": {
+                "alias_of": "token",
+            },
         },
-    })
+    )
 
     def __init__(self, token, **kwargs):
-        """
-        Initialize Feishu Object
-        """
+        """Initialize Feishu Object."""
         super().__init__(**kwargs)
 
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'The Feishu token specified ({}) is invalid.'\
-                .format(token)
+            msg = f"The Feishu token specified ({token}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Send our notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send our notification."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': "application/json",
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Our Message
         payload = {
-            'msg_type': 'text',
+            "msg_type": "text",
             "content": {
                 "text": body,
-            }
+            },
         }
 
-        self.logger.debug('Feishu GET URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate))
-        self.logger.debug('Feishu Payload: %s' % str(payload))
+        self.logger.debug(
+            "Feishu GET URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Feishu Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -139,7 +139,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         try:
             r = requests.post(
                 self.notify_url.format(token=self.token),
-                data=dumps(payload).encode('utf-8'),
+                data=dumps(payload).encode("utf-8"),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
@@ -163,29 +163,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # }
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyFeishu.http_response_code_lookup(r.status_code)
+                status_str = NotifyFeishu.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Feishu notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Feishu notification: {}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Feishu notification.')
+                self.logger.info("Sent Feishu notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Feishu '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Feishu notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -194,34 +195,29 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{token}/?{params}'.format(
+        return "{schema}://{token}/?{params}".format(
             schema=self.secure_protocol,
-            token=self.pprint(self.token, privacy, safe=''),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyFeishu.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         # parse_url already handles getting the `user` and `password` fields
         # populated.
@@ -231,10 +227,10 @@ def parse_url(url):
             return results
 
         # Allow over-ride
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifyFeishu.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyFeishu.unquote(results["qsd"]["token"])
 
         else:
-            results['token'] = NotifyFeishu.unquote(results['host'])
+            results["token"] = NotifyFeishu.unquote(results["host"])
 
         return results
diff --git a/libs/apprise/plugins/flock.py b/libs/apprise/plugins/flock.py
index 223648e1de..ed6973281e 100644
--- a/libs/apprise/plugins/flock.py
+++ b/libs/apprise/plugins/flock.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -40,123 +39,123 @@
 #
 #  It becomes your 'token' that you will pass into this class
 #
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..common import NotifyImageSize
-from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
-
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 FLOCK_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 # Used to detect a channel/user
-IS_CHANNEL_RE = re.compile(r'^(#|g:)(?P<id>[A-Z0-9_]+)$', re.I)
-IS_USER_RE = re.compile(r'^(@|u:)?(?P<id>[A-Z0-9_]+)$', re.I)
+IS_CHANNEL_RE = re.compile(r"^(#|g:)(?P<id>[A-Z0-9_]+)$", re.I)
+IS_USER_RE = re.compile(r"^(@|u:)?(?P<id>[A-Z0-9_]+)$", re.I)
 
 
 class NotifyFlock(NotifyBase):
-    """
-    A wrapper for Flock Notifications
-    """
+    """A wrapper for Flock Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Flock'
+    service_name = "Flock"
 
     # The services URL
-    service_url = 'https://flock.com/'
+    service_url = "https://flock.com/"
 
     # The default secure protocol
-    secure_protocol = 'flock'
+    secure_protocol = "flock"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_flock'
+    setup_url = "https://appriseit.com/services/flock/"
 
     # Flock uses the http protocol with JSON requests
-    notify_url = 'https://api.flock.com/hooks/sendMessage'
+    notify_url = "https://api.flock.com/hooks/sendMessage"
 
     # API Wrapper
-    notify_api = 'https://api.flock.co/v1/chat.sendMessage'
+    notify_api = "https://api.flock.co/v1/chat.sendMessage"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
 
     # Define object templates
     templates = (
-        '{schema}://{token}',
-        '{schema}://{botname}@{token}',
-        '{schema}://{botname}@{token}/{targets}',
-        '{schema}://{token}/{targets}',
+        "{schema}://{token}",
+        "{schema}://{botname}@{token}",
+        "{schema}://{botname}@{token}/{targets}",
+        "{schema}://{token}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Access Key'),
-            'type': 'string',
-            'regex': (r'^[a-z0-9-]+$', 'i'),
-            'private': True,
-            'required': True,
-        },
-        'botname': {
-            'name': _('Bot Name'),
-            'type': 'string',
-            'map_to': 'user',
-        },
-        'to_user': {
-            'name': _('To User ID'),
-            'type': 'string',
-            'prefix': '@',
-            'regex': (r'^[A-Z0-9_]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Access Key"),
+                "type": "string",
+                "regex": (r"^[a-z0-9-]+$", "i"),
+                "private": True,
+                "required": True,
+            },
+            "botname": {
+                "name": _("Bot Name"),
+                "type": "string",
+                "map_to": "user",
+            },
+            "to_user": {
+                "name": _("To User ID"),
+                "type": "string",
+                "prefix": "@",
+                "regex": (r"^[A-Z0-9_]+$", "i"),
+                "map_to": "targets",
+            },
+            "to_channel": {
+                "name": _("To Channel ID"),
+                "type": "string",
+                "prefix": "#",
+                "regex": (r"^[A-Z0-9_]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'to_channel': {
-            'name': _('To Channel ID'),
-            'type': 'string',
-            'prefix': '#',
-            'regex': (r'^[A-Z0-9_]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-    })
+    )
 
     def __init__(self, token, targets=None, include_image=True, **kwargs):
-        """
-        Initialize Flock Object
-        """
+        """Initialize Flock Object."""
         super().__init__(**kwargs)
 
         # Build ourselves a target list
-        self.targets = list()
+        self.targets = []
 
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'An invalid Flock Access Key ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Flock Access Key ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -173,59 +172,62 @@ def __init__(self, token, targets=None, include_image=True, **kwargs):
         for target in targets:
             result = IS_USER_RE.match(target)
             if result:
-                self.targets.append('u:' + result.group('id'))
+                self.targets.append("u:" + result.group("id"))
                 continue
 
             result = IS_CHANNEL_RE.match(target)
             if result:
-                self.targets.append('g:' + result.group('id'))
+                self.targets.append("g:" + result.group("id"))
                 continue
 
             has_error = True
             self.logger.warning(
-                'Ignoring invalid target ({}) specified.'.format(target))
+                f"Ignoring invalid target ({target}) specified."
+            )
 
         if has_error and not self.targets:
             # We have a bot token and no target(s) to message
-            msg = 'No Flock targets to notify.'
+            msg = "No Flock targets to notify."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Flock Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Flock Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # error tracking (used for function return)
         has_error = False
 
         if self.notify_format == NotifyFormat.HTML:
-            body = '<flockml>{}</flockml>'.format(body)
+            body = f"<flockml>{body}</flockml>"
 
         else:
             title = NotifyFlock.escape_html(title, whitespace=False)
             body = NotifyFlock.escape_html(body, whitespace=False)
 
-            body = '<flockml>{}{}</flockml>'.format(
-                '' if not title else '<b>{}</b><br/>'.format(title), body)
+            body = "<flockml>{}{}</flockml>".format(
+                "" if not title else f"<b>{title}</b><br/>", body
+            )
 
         payload = {
-            'token': self.token,
-            'flockml': body,
-            'sendAs': {
-                'name': self.app_id if not self.user else self.user,
+            "token": self.token,
+            "flockml": body,
+            "sendAs": {
+                "name": self.app_id if not self.user else self.user,
                 # A Profile Image is only configured if we're configured to
                 # allow it
-                'profileImage': None if not self.include_image
-                else self.image_url(notify_type),
-            }
+                "profileImage": (
+                    None
+                    if not self.include_image
+                    else self.image_url(notify_type)
+                ),
+            },
         }
 
         if len(self.targets):
@@ -237,31 +239,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 target = targets.pop(0)
 
                 # Copy and update our payload
-                _payload = payload.copy()
-                _payload['to'] = target
+                payload_ = payload.copy()
+                payload_["to"] = target
 
-                if not self._post(self.notify_api, headers, _payload):
+                if not self._post(self.notify_api, headers, payload_):
                     has_error = True
 
         else:
             # Webhook
-            url = '{}/{}'.format(self.notify_url, self.token)
+            url = f"{self.notify_url}/{self.token}"
             if not self._post(url, headers, payload):
                 has_error = True
 
         return not has_error
 
     def _post(self, url, headers, payload):
-        """
-        A wrapper to the requests object
-        """
+        """A wrapper to the requests object."""
 
         # error tracking (used for function return)
         has_error = False
 
-        self.logger.debug('Flock POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate))
-        self.logger.debug('Flock Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Flock POST URL: {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Flock Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -275,31 +276,30 @@ def _post(self, url, headers, payload):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyFlock.http_response_code_lookup(
-                        r.status_code, FLOCK_HTTP_ERROR_MAP)
+                status_str = NotifyFlock.http_response_code_lookup(
+                    r.status_code, FLOCK_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Flock notification : '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Flock notification : {}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Mark our failure
                 has_error = True
 
             else:
-                self.logger.info('Sent Flock notification.')
+                self.logger.info("Sent Flock notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Flock notification.'
+                "A Connection error occurred sending Flock notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             has_error = True
@@ -308,49 +308,42 @@ def _post(self, url, headers, payload):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
+            "image": "yes" if self.include_image else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{token}/{targets}?{params}'\
-            .format(
-                schema=self.secure_protocol,
-                token=self.pprint(self.token, privacy, safe=''),
-                targets='/'.join(
-                    [NotifyFlock.quote(target, safe='')
-                     for target in self.targets]),
-                params=NotifyFlock.urlencode(params),
-            )
+        return "{schema}://{token}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            token=self.pprint(self.token, privacy, safe=""),
+            targets="/".join(
+                [NotifyFlock.quote(target, safe="") for target in self.targets]
+            ),
+            params=NotifyFlock.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -358,18 +351,19 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyFlock.split_path(results['fullpath'])
+        results["targets"] = NotifyFlock.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += NotifyFlock.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyFlock.parse_list(results["qsd"]["to"])
 
         # The first token is stored in the hostname
-        results['token'] = NotifyFlock.unquote(results['host'])
+        results["token"] = NotifyFlock.unquote(results["host"])
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         return results
 
@@ -380,16 +374,24 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://api\.flock\.com/hooks/sendMessage/'
-            r'(?P<token>[a-z0-9-]{24})/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://api\.flock\.com/hooks/sendMessage/"
+            r"(?P<token>[a-z0-9-]{24})/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyFlock.parse_url(
-                '{schema}://{token}/{params}'.format(
+                "{schema}://{token}/{params}".format(
                     schema=NotifyFlock.secure_protocol,
-                    token=result.group('token'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    token=result.group("token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/fluxer.py b/libs/apprise/plugins/fluxer.py
new file mode 100644
index 0000000000..b868fa198a
--- /dev/null
+++ b/libs/apprise/plugins/fluxer.py
@@ -0,0 +1,1080 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# For this to work correctly you need to create a webhook. To do this just
+# click on the little gear icon next to the channel you're part of. From
+# here you'll be able to access the Webhooks menu and create a new one.
+#
+#  When you've completed, you'll get a URL that looks a little like this:
+#  https://api.fluxer.app/webhooks/417429632418316298/\
+#         JHZ7lQml277CDHmQKMHI8qBe7bk2ZwO5UKjCiOAF7711o33MyqU344Qpgv7YTpadV
+#
+#  Simplified, it looks like this:
+#     https://api.fluxer.app/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
+#  or:
+#     https://api.fluxer.app/v1/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
+#
+#  This plugin will simply work using the url of:
+#     fluxer://WEBHOOK_ID/WEBHOOK_TOKEN
+#
+from __future__ import annotations
+
+import contextlib
+from datetime import datetime, timedelta, timezone
+from itertools import chain
+from json import dumps
+import re
+from typing import Any
+
+import requests
+
+from ..attachment.base import AttachBase
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_hostname,
+    is_ipaddr,
+    parse_bool,
+    parse_list,
+    validate_regex,
+)
+from .base import NotifyBase
+
+# Used to detect user/role IDs and @here/@everyone tokens.
+USER_ROLE_DETECTION_RE = re.compile(
+    r"\s*(?:<?@(?P<role>&?)(?P<id>[0-9]+)>?|@(?P<value>[a-z0-9]+))",
+    re.I,
+)
+
+
+class FluxerMode:
+    """Define Fluxer Notification Modes."""
+
+    # App posts upstream to the developer API on Fluxer's website
+    CLOUD = "cloud"
+
+    # Running a dedicated private Fluxer Server
+    PRIVATE = "private"
+
+
+FLUXER_MODES = (
+    FluxerMode.CLOUD,
+    FluxerMode.PRIVATE,
+)
+
+
+class NotifyFluxer(NotifyBase):
+    """A wrapper for Fluxer Webhook Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "Fluxer"
+
+    # The Services URL
+    service_url = "https://fluxer.app/"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/fluxer/"
+
+    # The default protocol
+    protocol = "fluxer"
+
+    # The default secure protocol
+    secure_protocol = "fluxers"
+
+    # Allows the user to specify the NotifyImageSize object
+    image_size = NotifyImageSize.XY_256
+
+    # Discord is kind enough to return how many more requests we're allowed to
+    # continue to make within it's header response as:
+    # Retry-After: number of seconds to try again
+    request_rate_per_sec = 0
+
+    # Support attachments
+    attachment_support = True
+
+    # Maximum number of attachments allowed per message
+    fluxer_max_files = 10
+
+    # The default period of time to wait if we can not determine the reason
+    # for the 429 (to many) request
+    default_delay_sec = 1.0
+
+    # The maximum allowable characters allowed in the body per message
+    body_maxlen = 2000
+
+    # The 2000 characters above defined by the body_maxlen include that of the
+    # title. Setting this to True ensures overflow options behave properly
+    overflow_amalgamate_title = True
+
+    # Fluxer limit for number of embed fields per message
+    fluxer_max_fields = 10
+
+    # If our hostname matches the following we automatically enforce cloud
+    # mode
+    __auto_cloud_host = re.compile(r"fluxer\.app", re.IGNORECASE)
+
+    # Default upstream/cloud host if none is defined
+    cloud_notify_host = "https://api.fluxer.app"
+
+    # Webhook URLs used by the Fluxer API.
+    notify_url = "{prefix}/webhooks/{webhook_id}/{webhook_token}"
+
+    templates = (
+        "{schema}://{webhook_id}/{webhook_token}",
+        "{schema}://{host}/{webhook_id}/{webhook_token}",
+        "{schema}://{host}:{port}/{webhook_id}/{webhook_token}",
+        "{schema}://{botname}@{webhook_id}/{webhook_token}",
+        "{schema}://{botname}@{host}:{port}/{webhook_id}/{webhook_token}",
+    )
+
+    # Define our template tokens
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "botname": {
+                "name": _("Bot Name"),
+                "type": "string",
+                "map_to": "user",
+            },
+            "webhook_id": {
+                "name": _("Webhook ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[0-9]{10,}$", "i"),
+            },
+            "webhook_token": {
+                "name": _("Webhook Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Za-z0-9_\-]{16,}$", "i"),
+            },
+        },
+    )
+
+    # Define our template arguments
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "mode": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": FLUXER_MODES,
+                "default": FluxerMode.CLOUD,
+            },
+            "tts": {
+                "name": _("Text To Speech"),
+                "type": "bool",
+                "default": False,
+            },
+            "avatar": {
+                "name": _("Avatar Image"),
+                "type": "bool",
+                "default": True,
+            },
+            "avatar_url": {
+                "name": _("Avatar URL"),
+                "type": "string",
+            },
+            "href": {
+                "name": _("URL"),
+                "type": "string",
+            },
+            "url": {
+                "alias_of": "href",
+            },
+            "thread": {
+                "name": _("Thread ID"),
+                "type": "string",
+            },
+            "thread_name": {
+                "name": _("Thread Name"),
+                "type": "string",
+            },
+            "footer": {
+                "name": _("Display Footer"),
+                "type": "bool",
+                "default": False,
+            },
+            "footer_logo": {
+                "name": _("Footer Logo"),
+                "type": "bool",
+                "default": True,
+            },
+            "fields": {
+                "name": _("Use Fields"),
+                "type": "bool",
+                "default": True,
+            },
+            "flags": {
+                "name": _("Discord Flags"),
+                "type": "int",
+                "min": 0,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            "ping": {
+                "name": _("Ping Users/Roles"),
+                "type": "list:string",
+            },
+            "name": {
+                "alias_of": "botname",
+            },
+        },
+    )
+
+    def __init__(
+        self,
+        webhook_id: str,
+        webhook_token: str,
+        mode: str | None = None,
+        tts: bool = False,
+        avatar: bool = True,
+        footer: bool = False,
+        footer_logo: bool = True,
+        include_image: bool = False,
+        fields: bool = True,
+        avatar_url: str | None = None,
+        href: str | None = None,
+        thread: str | None = None,
+        thread_name: str | None = None,
+        flags: int | None = None,
+        ping: list[str] | None = None,
+        **kwargs: Any,
+    ) -> None:
+        """Initialize Fluxer Object."""
+
+        super().__init__(**kwargs)
+
+        # Webhook ID (associated with project)
+        self.webhook_id = validate_regex(
+            webhook_id, *self.template_tokens["webhook_id"]["regex"]
+        )
+        if not self.webhook_id:
+            msg = f"An invalid Fluxer Webhook ID ({webhook_id}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Webhook Token (associated with project)
+        self.webhook_token = validate_regex(
+            webhook_token, *self.template_tokens["webhook_token"]["regex"]
+        )
+        if not self.webhook_token:
+            msg = (
+                "An invalid Fluxer Webhook Token "
+                f"({webhook_token}) was specified."
+            )
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Prepare our mode
+        self.mode = (
+            mode.strip().lower()
+            if isinstance(mode, str)
+            else self.template_args["mode"]["default"]
+        )
+
+        if self.mode not in FLUXER_MODES:
+            msg = f"An invalid Fluxer Mode ({mode}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        if not self.host and self.mode == FluxerMode.PRIVATE:
+            # No host provided
+            msg = f"An invalid Fluxer Hostname ({self.host}) was provided."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        if self.mode == FluxerMode.PRIVATE and \
+                self.__auto_cloud_host.search(self.host):
+            # Is a Fluxer Cloud API
+            self.mode = FluxerMode.CLOUD
+            self.logger.warning(
+                "Fluxer mode changed to %s mode because fluxer.app found "
+                "in %s",
+                self.mode,
+                self.host,
+            )
+
+        # Text To Speech
+        self.tts = tts if isinstance(tts, bool) \
+            else parse_bool(tts, self.template_args["tts"]["default"])
+
+        # Avatar
+        self.avatar = avatar if isinstance(avatar, bool) \
+            else parse_bool(avatar, self.template_args["avatar"]["default"])
+
+        # Footer
+        self.footer = footer if isinstance(footer, bool) \
+            else parse_bool(footer, self.template_args["footer"]["default"])
+
+        # Footer Logo
+        self.footer_logo = footer_logo if isinstance(footer_logo, bool) \
+            else parse_bool(
+                footer_logo, self.template_args["footer_logo"]["default"])
+
+        # Include Image
+        self.include_image = include_image if isinstance(include_image, bool) \
+            else parse_bool(
+                include_image, self.template_args["image"]["default"])
+
+        # Fields
+        self.fields = fields if isinstance(fields, bool) \
+            else parse_bool(fields, self.template_args["fields"]["default"])
+
+        self.thread_id = thread
+        self.thread_name = thread_name
+
+        self.avatar_url = avatar_url
+        self.href = href
+
+        if flags:
+            try:
+                self.flags = int(flags)
+                if self.flags < self.template_args["flags"]["min"]:
+                    raise ValueError()
+
+            except (TypeError, ValueError):
+                msg = (
+                    f"An invalid Fluxer flags setting ({flags}) was specified."
+                )
+                self.logger.warning(msg)
+                raise TypeError(msg) from None
+        else:
+            self.flags = None
+
+        self.ping: list[str] = parse_list(ping)
+
+        self.ratelimit_reset = datetime.now(timezone.utc).replace(tzinfo=None)
+        self.ratelimit_remaining = self.default_delay_sec
+
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        attach=None,
+        **kwargs: Any,
+    ) -> bool:
+
+        """Perform Fluxer Notification."""
+
+        # Prepare our headers:
+        payload = {
+            "tts": self.tts,
+            # If Text-To-Speech is set to True, then we do not want to wait
+            # for the whole message before continuing. Otherwise, we wait
+            "wait": self.tts is False,
+        }
+
+        # Acquire image_url
+        image_url = self.image_url(notify_type)
+
+        if self.avatar and (image_url or self.avatar_url):
+            payload["avatar_url"] = (
+                self.avatar_url if self.avatar_url else image_url
+            )
+
+        if self.user:
+            # Optionally override the default username of the webhook
+            payload["username"] = self.user
+
+        if self.thread_name:
+            payload["thread_name"] = self.thread_name
+
+        params = {"thread_id": self.thread_id} if self.thread_id else None
+
+        if self.notify_format == NotifyFormat.MARKDOWN:
+            if self.ping:
+                payload.update(self.ping_payload(body, " ".join(self.ping)))
+            else:
+                payload.update(self.ping_payload(body))
+
+        elif self.ping:
+            payload.update(self.ping_payload(" ".join(self.ping)))
+
+        if body:
+            fields: list[dict[str, str]] = []
+
+            if self.notify_format == NotifyFormat.MARKDOWN:
+                embed: dict[str, Any] = {
+                    "author": {
+                        "name": self.app_id,
+                        "url": self.app_url,
+                    },
+                    "description": body,
+                    "color": self.color(notify_type, int),
+                }
+
+                # Fluxer strictly validates fields; omit 'title' if it's empty
+                if title:
+                    embed["title"] = title
+
+                payload["embeds"] = [embed]
+
+                if self.href:
+                    payload["embeds"][0]["url"] = self.href
+
+                if self.footer:
+                    logo_url = self.image_url(notify_type, logo=True)
+                    payload["embeds"][0]["footer"] = {
+                        "text": self.app_desc,
+                    }
+                    if self.footer_logo and logo_url:
+                        payload["embeds"][0]["footer"]["icon_url"] = logo_url
+
+                if self.include_image and image_url:
+                    payload["embeds"][0]["thumbnail"] = {
+                        "url": image_url,
+                        "height": 256,
+                        "width": 256,
+                    }
+
+                if self.fields:
+                    # Break titles out so that we can sort them in embeds
+                    description, fields = self.extract_markdown_sections(body)
+
+                    # Swap first entry for description
+                    payload["embeds"][0]["description"] = description
+                    if fields:
+                        # Apply our additional parsing for a better
+                        # presentation
+                        payload["embeds"][0]["fields"] = fields[
+                            : self.fluxer_max_fields
+                        ]
+                        fields = fields[self.fluxer_max_fields :]
+
+            else:
+                # TEXT or HTML:
+                # - No ping detection unless ping= was provided.
+                # - If ping= was provided, ping_payload() already generated
+                #   payload["content"] starting with "๐Ÿ‘‰ ...", and we append
+                #   it.
+                payload["content"] = (
+                    body if not title else f"{title}\r\n{body}"
+                ) + payload.get("content", "")
+
+            if not self._send(payload, params=params):
+                # We failed to post our message
+                return False
+
+            # Send remaining fields (if any)
+            if fields:
+                payload["embeds"][0]["description"] = ""
+                for i in range(0, len(fields), self.fluxer_max_fields):
+                    payload["embeds"][0]["fields"] = fields[
+                        i : i + self.fluxer_max_fields
+                    ]
+                    if not self._send(payload, params=params):
+                        return False
+
+        if attach and self.attachment_support:
+
+            # Update our payload; the idea is to preserve it's other detected
+            # and assigned values for re-use here too
+            payload.update({
+                # Text-To-Speech can be off so we don't read the filename
+                "tts": False,
+                # no tts; no need to wait
+                "wait": False,
+            })
+
+            #
+            # Remove our text/title based content for attachment use
+            #
+            payload.pop("embeds", None)
+            payload.pop("allow_mentions", None)
+
+            #
+            # Send our attachments
+            #
+            for attachment in attach:
+                self.logger.info(
+                    f"Posting Fluxer Attachment {attachment.name}"
+                )
+
+                if not self._send(payload, params=params, attach=attachment):
+                    # We failed to post our message
+                    return False
+
+        return True
+
+    def _send(
+        self,
+        payload: dict[str, Any],
+        params: dict[str, str] | None = None,
+        rate_limit: int = 1,
+        attach: AttachBase | None = None,
+        **kwargs: Any,
+    ) -> bool:
+        """Wrapper to the requests (post) object."""
+
+        # Our headers
+        headers = {
+            "User-Agent": self.app_id,
+        }
+
+        if self.mode == FluxerMode.CLOUD:
+            prefix = self.cloud_notify_host
+
+        else:
+            # Prepare our Fluxer Template URL
+            schema = "https" if self.secure else "http"
+
+            # Construct Notify URL
+            prefix = f"{schema}://{self.host}"
+            if isinstance(self.port, int):
+                prefix += f":{self.port}"
+
+        notify_url = self.notify_url.format(
+            prefix=prefix,
+            webhook_id=self.webhook_id,
+            webhook_token=self.webhook_token,
+        )
+
+        safe_url = self.notify_url.format(
+            prefix=prefix,
+            webhook_id=self.pprint(self.webhook_id, True, safe=""),
+            webhook_token=self.pprint(self.webhook_token, True, safe=""),
+        )
+
+        self.logger.debug(
+            "Fluxer POST URL: %s (cert_verify=%r)",
+            safe_url,
+            self.verify_certificate,
+        )
+        self.logger.debug("Fluxer Payload: %s", payload)
+
+        wait: float | None = None
+
+        if self.ratelimit_remaining <= 0.0:
+            now = datetime.now(timezone.utc).replace(tzinfo=None)
+
+            if now >= self.ratelimit_reset:
+                # Our block window has passed; clear it so we do not keep
+                # re-entering this logic on subsequent sends.
+                self.ratelimit_remaining = 1.0
+                wait = None
+
+            else:
+                wait = (self.ratelimit_reset - now).total_seconds()
+
+        self.throttle(wait=wait)
+
+        # Perform some simple error checking
+        if isinstance(attach, AttachBase):
+            if not attach:
+                # We could not access the attachment
+                self.logger.error(
+                    f"Could not access attachment {attach.url(privacy=True)}."
+                )
+                return False
+
+            self.logger.debug(
+                f"Posting Fluxer attachment {attach.url(privacy=True)}"
+            )
+
+        # Our attachment path (if specified)
+        files = None
+        data: dict[str, Any] | str
+        try:
+
+            # Open our attachment path if required:
+            if attach:
+                #
+                # Fluxer requires content to be provided
+                #
+                payload.update({
+                    "content": attach.name,
+                    "attachments": [{
+                        "id": 0,
+                        "filename": attach.name,
+                    }],
+                })
+                files = {
+                    "files[0]": (
+                        attach.name,
+                        # file handle is safely closed in `finally`; inline
+                        # open is intentional
+                        open(attach.path, "rb"),  # noqa: SIM115
+                        # Explicitly declare the file type so the server
+                        # doesn't hang
+                        attach.mimetype,
+                    )
+                }
+                data = {
+                    "payload_json": dumps(payload),
+                }
+            else:
+                headers["Content-Type"] = "application/json; charset=utf-8"
+                data = dumps(payload)
+
+            r = requests.post(
+                notify_url,
+                params=params,
+                data=data,
+                files=files,
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            if r.status_code == requests.codes.too_many_requests:
+                # Determine a delay (seconds) using Retry-After
+                delay = self.default_delay_sec
+                try:
+                    ra = r.headers.get("Retry-After")
+                    if ra is not None:
+                        delay = float(ra)
+
+                except (TypeError, ValueError):
+                    delay = self.default_delay_sec
+
+                # Enforce a minimum delay
+                delay = max(self.default_delay_sec, delay)
+
+                # Put ourselves into a blocked state until ratelimit_reset
+                now = datetime.now(timezone.utc).replace(tzinfo=None)
+                self.ratelimit_remaining = 0.0
+                self.ratelimit_reset = now + timedelta(seconds=delay)
+
+                self.logger.warning(
+                    "Fluxer rate limiting in effect; blocking for %.2f "
+                    "second(s)",
+                    delay,
+                )
+
+                if rate_limit > 0:
+                    # Prevent file handle leak before recursion
+                    if files:
+                        for file_info in files.values():
+                            with contextlib.suppress(Exception):
+                                file_info[1].close()
+                        files = None
+
+                    # Recursive retry; next _send() invocation will hit the
+                    # ratelimit_remaining<=0 gate and sleep via throttle()
+                    return self._send(
+                        payload=payload,
+                        params=params,
+                        rate_limit=rate_limit - 1,
+                        attach=attach,
+                        **kwargs,
+                    )
+
+                # No retries left
+                return False
+
+            if r.status_code not in (
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
+
+                self.logger.warning(
+                    "Failed to send Fluxer notification: %s, error=%d.",
+                    status_str,
+                    r.status_code,
+                )
+
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000]
+                )
+                return False
+
+            self.logger.info("Sent Fluxer notification.")
+
+            # Reset Rate Limiting (a bit of a hacky approach for now)
+            # TODO: Learn more about how ratelimiting works with Fluxer
+            self.ratelimit_reset = \
+                datetime.now(timezone.utc).replace(tzinfo=None)
+            self.ratelimit_remaining = self.default_delay_sec
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                "A Connection error occurred sending Fluxer notification."
+            )
+            self.logger.debug("Socket Exception: %s", e)
+            return False
+
+        except OSError as e:
+            self.logger.warning(
+                "An I/O error occurred while reading attachment(s)")
+            self.logger.debug(f"I/O Exception: {e!s}")
+            return False
+
+        finally:
+            # Close our file (if it's open) stored in the second element
+            # of our files tuple (index 1)
+            if files:
+                for file_info in files.values():
+                    with contextlib.suppress(Exception):
+                        file_info[1].close()
+
+        return True
+
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Returns the URL built dynamically based on specified arguments."""
+
+        params: dict[str, str] = {
+            "mode": self.mode,
+            "tts": "yes" if self.tts else "no",
+            "avatar": "yes" if self.avatar else "no",
+            "footer": "yes" if self.footer else "no",
+            "footer_logo": "yes" if self.footer_logo else "no",
+            "image": "yes" if self.include_image else "no",
+            "fields": "yes" if self.fields else "no",
+        }
+
+        if self.avatar_url:
+            params["avatar_url"] = self.avatar_url
+
+        if self.flags is not None:
+            params["flags"] = str(self.flags)
+
+        if self.href:
+            params["href"] = self.href
+
+        if self.thread_id:
+            params["thread"] = self.thread_id
+
+        if self.thread_name:
+            params["thread_name"] = self.thread_name
+
+        if self.ping:
+            params["ping"] = ",".join(self.ping)
+
+        botname = f"{self.user}@" if self.user else ""
+
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        if self.mode == FluxerMode.PRIVATE:
+            default_port = 443 if self.secure else 80
+            port = (
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            )
+
+            schema = self.secure_protocol if self.secure else self.protocol
+            return (
+                "{schema}://{bname}{host}{port}/{webhook_id}/{webhook_token}"
+                "/?{params}".format(
+                    schema=schema,
+                    bname=botname,
+                    host=self.host,
+                    port=port,
+                    webhook_id=self.pprint(self.webhook_id, privacy, safe=""),
+                    webhook_token=self.pprint(
+                        self.webhook_token, privacy, safe=""
+                    ),
+                    params=NotifyFluxer.urlencode(params),
+                )
+            )
+
+        # Cloud Mode
+        return (
+            "{schema}://{bname}{webhook_id}/{webhook_token}/?{params}".format(
+                schema=self.protocol,
+                bname=botname,
+                webhook_id=self.pprint(self.webhook_id, privacy, safe=""),
+                webhook_token=self.pprint(
+                    self.webhook_token, privacy, safe=""
+                ),
+                params=NotifyFluxer.urlencode(params),
+            )
+        )
+
+    @property
+    def url_identifier(self) -> tuple[Any, ...]:
+        """Returns all of the identifiers that make this URL unique."""
+        kwargs = (
+            (
+                self.secure_protocol
+                if self.mode == FluxerMode.CLOUD
+                else (self.secure_protocol if self.secure else self.protocol)
+            ),
+            self.host if self.mode == FluxerMode.PRIVATE else "",
+            (
+                "" if self.mode == FluxerMode.CLOUD
+                else (self.port if self.port else (443 if self.secure else 80))
+            ),
+            self.webhook_id,
+            self.webhook_token,
+        )
+
+        return kwargs
+
+    @staticmethod
+    def parse_url(url: str) -> dict[str, Any] | None:
+        """Parses the URL and returns arguments for instantiating this object.
+
+        Syntax:
+          fluxer://webhook_id/webhook_token
+        """
+
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Tokenize our URL
+        tokens = [
+            NotifyFluxer.unquote(results["host"]),
+            *NotifyFluxer.split_path(results["fullpath"]),
+        ]
+
+        # Text To Speech
+        results["tts"] = parse_bool(results["qsd"].get(
+            "tts", NotifyFluxer.template_args["tts"]["default"]))
+
+        # Mode override
+        if "mode" in results["qsd"] and results["qsd"]["mode"]:
+            results["mode"] = NotifyFluxer.unquote(
+                results["qsd"]["mode"].strip().lower()
+            )
+
+        else:
+            # We can try to detect the mode based on the validity of the
+            # hostname.
+            #
+            # This isn't a surfire way to do things though; it's best to
+            # specify the mode= flag
+            results["mode"] = (
+                FluxerMode.PRIVATE
+                if (
+                    (
+                        is_hostname(results["host"])
+                        or is_ipaddr(results["host"])
+                    )
+                    and len(tokens) > 2
+                )
+                else FluxerMode.CLOUD
+            )
+
+        results["footer"] = parse_bool(
+            results["qsd"].get(
+                "footer", NotifyFluxer.template_args["footer"]["default"]
+            )
+        )
+        results["footer_logo"] = parse_bool(
+            results["qsd"].get(
+                "footer_logo",
+                NotifyFluxer.template_args["footer_logo"]["default"]
+            )
+        )
+        results["fields"] = parse_bool(
+            results["qsd"].get(
+                "fields", NotifyFluxer.template_args["fields"]["default"]
+            )
+        )
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyFluxer.template_args["image"]["default"]
+            )
+        )
+
+        if "botname" in results["qsd"]:
+            results["user"] = NotifyFluxer.unquote(results["qsd"]["botname"])
+
+        elif "name" in results["qsd"]:
+            results["user"] = NotifyFluxer.unquote(results["qsd"]["name"])
+
+        if "flags" in results["qsd"]:
+            results["flags"] = NotifyFluxer.unquote(results["qsd"]["flags"])
+
+        if "avatar_url" in results["qsd"]:
+            results["avatar_url"] = NotifyFluxer.unquote(
+                results["qsd"]["avatar_url"]
+            )
+
+        if "href" in results["qsd"]:
+            results["href"] = NotifyFluxer.unquote(results["qsd"]["href"])
+            results["format"] = NotifyFormat.MARKDOWN
+
+        elif "url" in results["qsd"]:
+            results["href"] = NotifyFluxer.unquote(results["qsd"]["url"])
+            results["format"] = NotifyFormat.MARKDOWN
+
+        # Update Avatar Icon
+        results["avatar"] = parse_bool(results["qsd"].get(
+            "avatar", NotifyFluxer.template_args["avatar"]["default"]))
+
+        if "thread" in results["qsd"]:
+            results["thread"] = NotifyFluxer.unquote(results["qsd"]["thread"])
+            results["format"] = NotifyFormat.MARKDOWN
+
+        if "thread_name" in results["qsd"]:
+            results["thread_name"] = NotifyFluxer.unquote(
+                results["qsd"]["thread_name"]
+            )
+
+        if "ping" in results["qsd"]:
+            results["ping"] = NotifyFluxer.unquote(results["qsd"]["ping"])
+
+        # Pop our tokens from back to front
+        results["webhook_token"] = None if not tokens else tokens.pop()
+        results["webhook_id"] = None if not tokens else tokens.pop()
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url: str) -> dict[str, Any] | None:
+        """
+        Supported:
+          - https://api.fluxer.app/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
+          - https://api.fluxer.app/v1/webhooks/WEBHOOK_ID/WEBHOOK_TOKEN
+        """
+
+        result = re.match(
+            r"^https?://(api\.)?fluxer\.app/"
+            r"(?:(?:v[0-9]+/)?webhooks)/"
+            r"(?P<webhook_id>[0-9]+)/"
+            r"(?P<webhook_token>[A-Z0-9_-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
+
+        if result:
+            return NotifyFluxer.parse_url(
+                "{schema}://{webhook_id}/{webhook_token}/{params}".format(
+                    schema=NotifyFluxer.secure_protocol,
+                    webhook_id=result.group("webhook_id"),
+                    webhook_token=result.group("webhook_token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
+
+        return None
+
+    def ping_payload(self, *args: str) -> dict[str, Any]:
+        """Build allow_mentions + mention content."""
+
+        payload: dict[str, Any] = {}
+
+        roles: set[str] = set()
+        users: set[str] = set()
+        parse: set[str] = set()
+
+        for arg in args:
+            # parse for user id's <@123> and role IDs <@&456>
+            results = USER_ROLE_DETECTION_RE.findall(arg)
+            if not results:
+                continue
+
+            for is_role, no, value in results:
+                if value:
+                    parse.add(value)
+
+                elif is_role:
+                    roles.add(no)
+
+                else:  # is_user
+                    users.add(no)
+
+        if not (roles or users or parse):
+            # Nothing to add
+            return payload
+
+        payload["allow_mentions"] = {
+            "parse": list(parse),
+            "users": list(users),
+            "roles": list(roles),
+        }
+
+        payload["content"] = "๐Ÿ‘‰ " + " ".join(
+            chain(
+                [f"@{value}" for value in parse],
+                [f"<@&{value}>" for value in roles],
+                [f"<@{value}>" for value in users],
+            )
+        )
+
+        return payload
+
+    @staticmethod
+    def extract_markdown_sections(
+            markdown: str) -> tuple[str, list[dict[str, str]]]:
+        """Extract headers and their corresponding sections into embed
+        fields."""
+
+        # Search for any header information found without it's own section
+        # identifier
+        match = re.match(
+            r"^\s*(?P<desc>[^\s#]+.*?)(?=\s*$|[\r\n]+\s*#)",
+            markdown,
+            flags=re.S,
+        )
+
+        description = match.group("desc").strip() if match else ""
+        if description:
+            # Strip description from our string since it has been handled
+            # now.
+            markdown = re.sub(re.escape(description), "", markdown, count=1)
+
+        regex = re.compile(
+            r"\s*#[# \t\v]*(?P<name>[^\n]+)(\n|\s*$)"
+            r"\s*((?P<value>[^#].+?)(?=\s*$|[\r\n]+\s*#))?",
+            flags=re.S,
+        )
+
+        common = regex.finditer(markdown)
+        fields: list[dict[str, str]] = []
+        for el in common:
+            d = el.groupdict()
+
+            fields.append({
+                "name": d.get("name", "").strip("#`* \r\n\t\v"),
+                "value": "```{}\n{}```".format(
+                    "md" if d.get("value") else "",
+                    (d.get("value").strip() + "\n" if d.get("value") else ""),
+                ),
+            })
+
+        return description, fields
diff --git a/libs/apprise/plugins/fortysixelks.py b/libs/apprise/plugins/fortysixelks.py
new file mode 100644
index 0000000000..cb1579e0cf
--- /dev/null
+++ b/libs/apprise/plugins/fortysixelks.py
@@ -0,0 +1,370 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+"""
+46elks SMS Notification Service.
+
+Minimal URL formats (source ends up being target):
+  - 46elks://user:pass@/+15551234567
+  - 46elks://user:pass@/+15551234567/+46701234567
+  - 46elks://user:pass@/+15551234567?from=Acme
+"""
+
+from __future__ import annotations
+
+from collections.abc import Iterable
+import re
+from typing import Any, Optional
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import (
+    is_phone_no,
+    parse_phone_no,
+)
+from .base import NotifyBase
+
+
+class Notify46Elks(NotifyBase):
+    """A wrapper for 46elks Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("46elks")
+
+    # The services URL
+    service_url = "https://46elks.com"
+
+    # The default secure protocol
+    secure_protocol = ("46elks", "elks")
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/46elks/"
+
+    # 46elksAPI Request URLs
+    notify_url = "https://api.46elks.com/a1/sms"
+
+    # The maximum allowable characters allowed in the title per message
+    title_maxlen = 0
+
+    # The maximum allowable characters allowed in the body per message
+    body_maxlen = 160
+
+    # Define object templates
+    templates = (
+        "{schema}://{user}:{password}@/{from_phone}",
+        "{schema}://{user}:{password}@/{from_phone}/{targets}",
+    )
+
+    # Define our template tokens
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("API Username"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("API Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "required": True,
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+        },
+    )
+
+    # Define our template arguments
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone",
+            },
+        },
+    )
+
+    def __init__(
+        self,
+        targets: Optional[Iterable[str]] = None,
+        source: Optional[str] = None,
+        **kwargs: Any,
+    ) -> None:
+        """
+        Initialise 46elks notifier.
+
+        :param targets: Iterable of phone numbers. E.164 is recommended.
+        :param source: Optional source ID or E.164 number.
+        """
+        super().__init__(**kwargs)
+
+        # Prepare our source
+        self.source: Optional[str] = (source or "").strip() or None
+
+        if not self.password:
+            msg = "No 46elks password was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        elif not self.user:
+            msg = "No 46elks user was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Parse our targets
+        self.targets = []
+
+        if not targets and is_phone_no(self.source):
+            targets = [self.source]
+
+        for target in parse_phone_no(targets):
+            # Validate targets and drop bad ones:
+            result = is_phone_no(target)
+            if not result:
+                self.logger.warning(
+                    f"Dropped invalid phone # ({target}) specified.",
+                )
+                continue
+
+            # store valid phone number
+            # Carry forward '+' if defined, otherwise do not...
+            self.targets.append(
+                ("+" + result["full"])
+                if target.lstrip()[0] == "+"
+                else result["full"]
+            )
+
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        **kwargs: Any,
+    ) -> bool:
+        """Perform 46elks Notification."""
+
+        if not self.targets:
+            # There is no one to email; we're done
+            self.logger.warning(
+                "There are no 46elks recipients to notify"
+            )
+            return False
+
+        headers = {
+            "User-Agent": self.app_id,
+        }
+
+        # error tracking (used for function return)
+        has_error = False
+
+        targets = list(self.targets)
+        while targets:
+            target = targets.pop(0)
+
+            # Prepare our payload
+            payload = {
+                "to": target,
+                "from": self.source,
+                "message": body,
+            }
+
+            self.logger.debug(
+                "46elks POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"46elks Payload: {payload!s}")
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    self.notify_url,
+                    data=payload,
+                    headers=headers,
+                    auth=(self.user, self.password),
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+                if r.status_code != requests.codes.ok:
+                    # We had a problem
+                    status_str = (
+                        Notify46Elks.http_response_code_lookup(
+                            r.status_code
+                        )
+                    )
+
+                    self.logger.warning(
+                        "Failed to send 46elks notification to {}: "
+                        "{}{}error={}.".format(
+                            target,
+                            status_str,
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
+
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                else:
+                    self.logger.info(
+                        f"Sent 46elks notification to {target}."
+                    )
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occurred sending 46elks"
+                    f" notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
+
+                # Mark our failure
+                has_error = True
+                continue
+
+        return not has_error
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another similar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol[0], self.user, self.password, self.source)
+
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Returns the URL built dynamically based on specified arguments."""
+
+        # Initialize our parameters
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        # Apprise URL can be condensed and target can be eliminated if its
+        # our source phone no
+        targets = (
+            [] if len(self.targets) == 1 and
+            self.source in self.targets else self.targets)
+
+        return "{schema}://{user}:{pw}@{source}/{targets}?{params}".format(
+            schema=self.secure_protocol[0],
+            user=self.quote(self.user, safe=""),
+            source=self.source if self.source else "",
+            pw=self.pprint(
+                self.password, privacy, mode=PrivacyMode.Secret, safe=""),
+            targets="/".join(
+                [Notify46Elks.quote(x, safe="+") for x in targets]
+            ),
+            params=Notify46Elks.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification."""
+        targets = len(self.targets)
+        return targets if targets > 0 else 1
+
+    @staticmethod
+    def parse_native_url(url):
+        """
+        Support https://user:pw@api.46elks.com/a1/sms?to=+15551234567&from=Acme
+        """
+
+        result = re.match(
+            r"^https?://(?P<credentials>[^@]+)@"
+            r"api\.46elks\.com/a1/sms/?"
+            r"(?P<params>\?.+)$",
+            url,
+            re.I,
+        )
+
+        if result:
+            return Notify46Elks.parse_url(
+                "{schema}://{credentials}@/{params}".format(
+                    schema=Notify46Elks.secure_protocol[0],
+                    credentials=result.group("credentials"),
+                    params=result.group("params"),
+                )
+            )
+
+        return None
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Prepare our targets
+        results["targets"] = []
+
+        # The 'from' makes it easier to use yaml configuration
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = Notify46Elks.unquote(
+                results["qsd"]["from"]
+            )
+
+        elif results["host"]:
+            results["source"] = Notify46Elks.unquote(results["host"])
+
+        # Store our remaining targets found on path
+        results["targets"].extend(
+            Notify46Elks.split_path(results["fullpath"])
+        )
+
+        # Support the 'to' variable so that we can support targets this way too
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += Notify46Elks.parse_phone_no(
+                results["qsd"]["to"]
+            )
+
+        return results
diff --git a/libs/apprise/plugins/freemobile.py b/libs/apprise/plugins/freemobile.py
index 827c837fd9..606735b5dc 100644
--- a/libs/apprise/plugins/freemobile.py
+++ b/libs/apprise/plugins/freemobile.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,38 +32,35 @@
 #      https://smsapi.free-mobile.fr/sendmsg
 #
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
+from .base import NotifyBase
 
 
 class NotifyFreeMobile(NotifyBase):
-    """
-    A wrapper for Free-Mobile Notifications
-    """
+    """A wrapper for Free-Mobile Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = _('Free-Mobile')
+    service_name = _("Free-Mobile")
 
     # The services URL
-    service_url = 'https://mobile.free.fr/'
+    service_url = "https://mobile.free.fr/"
 
     # The default secure protocol
-    secure_protocol = 'freemobile'
+    secure_protocol = "freemobile"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_freemobile'
+    setup_url = "https://appriseit.com/services/freemobile/"
 
     # Plain Text Notification URL
-    notify_url = 'https://smsapi.free-mobile.fr/sendmsg'
+    notify_url = "https://smsapi.free-mobile.fr/sendmsg"
 
     # Define object templates
-    templates = (
-        '{schema}://{user}@{password}',
-    )
+    templates = ("{schema}://{user}@{password}",)
 
     # The title is not used
     title_maxlen = 0
@@ -75,29 +71,31 @@ class NotifyFreeMobile(NotifyBase):
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-    })
+    )
 
     def __init__(self, **kwargs):
-        """
-        Initialize Free Mobile Object
-        """
+        """Initialize Free Mobile Object."""
         super().__init__(**kwargs)
 
         if not (self.user and self.password):
-            msg = 'A FreeMobile user and password ' \
-                  'combination was not provided.'
+            msg = (
+                "A FreeMobile user and password combination was not provided."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -105,49 +103,43 @@ def __init__(self, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.password)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{user}@{password}/?{params}'.format(
+        return "{schema}://{user}@{password}/?{params}".format(
             schema=self.secure_protocol,
             user=self.user,
-            password=self.pprint(self.password, privacy, safe=''),
+            password=self.pprint(self.password, privacy, safe=""),
             params=NotifyFreeMobile.urlencode(params),
         )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Send our notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send our notification."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
-        payload = {
-            'user': self.user,
-            'pass': self.password,
-            'msg': body
-        }
+        payload = {"user": self.user, "pass": self.password, "msg": body}
 
-        self.logger.debug('Free Mobile GET URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate))
-        self.logger.debug('Free Mobile Payload: %s' % str(payload))
+        self.logger.debug(
+            "Free Mobile GET URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Free Mobile Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -155,36 +147,38 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         try:
             r = requests.post(
                 self.notify_url,
-                data=dumps(payload).encode('utf-8'),
+                data=dumps(payload).encode("utf-8"),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyFreeMobile.http_response_code_lookup(r.status_code)
+                status_str = NotifyFreeMobile.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Free Mobile notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Free Mobile notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Free Mobile notification.')
+                self.logger.info("Sent Free Mobile notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Free Mobile '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Free Mobile notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -193,11 +187,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         # parse_url already handles getting the `user` and `password` fields
         # populated.
@@ -208,7 +199,7 @@ def parse_url(url):
 
         # The hostname can act as the password if specified and a password
         # was otherwise not (specified):
-        if not results.get('password'):
-            results['password'] = NotifyFreeMobile.unquote(results['host'])
+        if not results.get("password"):
+            results["password"] = NotifyFreeMobile.unquote(results["host"])
 
         return results
diff --git a/libs/apprise/plugins/glib.py b/libs/apprise/plugins/glib.py
new file mode 100644
index 0000000000..b05179808e
--- /dev/null
+++ b/libs/apprise/plugins/glib.py
@@ -0,0 +1,393 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+import sys
+
+from ..common import NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
+
+# Default our global support flag
+NOTIFY_GLIB_SUPPORT_ENABLED = False
+
+# Image support is dependant on the GdkPixbuf library being available
+NOTIFY_GLIB_IMAGE_SUPPORT = False
+
+
+try:
+    # glib essentials
+    import gi
+    gi.require_version("Gio", "2.0")
+    gi.require_version("GLib", "2.0")
+    from gi.repository import Gio, GLib
+
+    # We're good
+    NOTIFY_GLIB_SUPPORT_ENABLED = True
+
+    # ImportError: When using gi.repository you must not import static modules
+    # like "gobject". Please change all occurrences of "import gobject" to
+    # "from gi.repository import GObject".
+    # See: https://bugzilla.gnome.org/show_bug.cgi?id=709183
+    if "gobject" in sys.modules:  # pragma: no cover
+        del sys.modules["gobject"]
+
+    try:
+        # The following is required for Image/Icon loading only
+        gi.require_version("GdkPixbuf", "2.0")
+        from gi.repository import GdkPixbuf
+        NOTIFY_GLIB_IMAGE_SUPPORT = True
+
+    except (ImportError, ValueError, AttributeError):
+        # No problem; this will get caught in outer try/catch
+
+        # A ValueError will get thrown upon calling gi.require_version() if
+        # GDK/GTK isn't installed on the system but gi is.
+        pass
+
+except ImportError:
+    # No problem; we just simply can't support this plugin; we could
+    # be in microsoft windows, or we just don't have the python-gobject
+    # library available to us (or maybe one we don't support)?
+    pass
+
+
+# Urgencies
+class GLibUrgency:
+    LOW = 0
+    NORMAL = 1
+    HIGH = 2
+
+
+GLIB_URGENCIES = {
+    # Note: This also acts as a reverse lookup mapping
+    GLibUrgency.LOW: "low",
+    GLibUrgency.NORMAL: "normal",
+    GLibUrgency.HIGH: "high",
+}
+
+GLIB_URGENCY_MAP = {
+    # Maps against string 'low'
+    "l": GLibUrgency.LOW,
+    # Maps against string 'moderate'
+    "m": GLibUrgency.LOW,
+    # Maps against string 'normal'
+    "n": GLibUrgency.NORMAL,
+    # Maps against string 'high'
+    "h": GLibUrgency.HIGH,
+    # Maps against string 'emergency'
+    "e": GLibUrgency.HIGH,
+
+    # Entries to additionally support (so more like DBus's API)
+    "0": GLibUrgency.LOW,
+    "1": GLibUrgency.NORMAL,
+    "2": GLibUrgency.HIGH,
+}
+
+
+class NotifyGLib(NotifyBase):
+    """
+    A wrapper for local GLib/Gio Notifications
+    """
+
+    # Set our global enabled flag
+    enabled = NOTIFY_GLIB_SUPPORT_ENABLED
+
+    requirements = {
+        # Define our required packaging in order to work
+        "details": _("libdbus-1.so.x or libdbus-2.so.x must be installed.")
+    }
+
+    # The default descriptive name associated with the Notification
+    service_name = _("DBus Notification")
+
+    # The services URL
+    service_url = \
+        "https://lazka.github.io/pgi-docs/Gio-2.0/classes/DBusProxy.html"
+
+    # The default protocols
+    protocol = ("glib", "gio")
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/dbus/"
+
+    # No throttling required for DBus queries
+    request_rate_per_sec = 0
+
+    # Allows the user to specify the NotifyImageSize object
+    image_size = NotifyImageSize.XY_128
+
+    # The number of milliseconds to keep the message present for
+    message_timeout_ms = 13000
+
+    # Limit results to just the first 10 line otherwise there is just to much
+    # content to display
+    body_max_line_count = 10
+
+    # The following are required to hook into the notifications:
+    glib_interface = "org.freedesktop.Notifications"
+    glib_setting_location = "/org/freedesktop/Notifications"
+
+    # Define object templates
+    templates = (
+        "{schema}://",
+    )
+
+    # Define our template arguments
+    template_args = dict(NotifyBase.template_args, **{
+        "urgency": {
+            "name": _("Urgency"),
+            "type": "choice:int",
+            "values": GLIB_URGENCIES,
+            "default": GLibUrgency.NORMAL,
+        },
+        "priority": {
+            # Apprise uses 'priority' everywhere; it's just a nice consistent
+            # feel to be able to use it here as well. Just map the
+            # value back to 'priority'
+            "alias_of": "urgency",
+        },
+        "x": {
+            "name": _("X-Axis"),
+            "type": "int",
+            "min": 0,
+            "map_to": "x_axis",
+        },
+        "y": {
+            "name": _("Y-Axis"),
+            "type": "int",
+            "min": 0,
+            "map_to": "y_axis",
+        },
+        "image": {
+            "name": _("Include Image"),
+            "type": "bool",
+            "default": True,
+            "map_to": "include_image",
+        },
+    })
+
+    def __init__(self, urgency=None, x_axis=None, y_axis=None,
+                 include_image=True, **kwargs):
+        """
+        Initialize DBus Object
+        """
+
+        super().__init__(**kwargs)
+
+        # Track our notifications
+        self.registry = {}
+
+        # The urgency of the message
+        self.urgency = int(
+            NotifyGLib.template_args["urgency"]["default"]
+            if urgency is None else
+            next((
+                v for k, v in GLIB_URGENCY_MAP.items()
+                if str(urgency).lower().startswith(k)),
+                NotifyGLib.template_args["urgency"]["default"]))
+
+        # Our x/y axis settings
+        if x_axis or y_axis:
+            try:
+                self.x_axis = int(x_axis)
+                self.y_axis = int(y_axis)
+
+            except (TypeError, ValueError):
+                # Invalid x/y values specified
+                msg = "The x,y coordinates specified ({},{}) are invalid."\
+                    .format(x_axis, y_axis)
+                self.logger.warning(msg)
+                raise TypeError(msg) from None
+        else:
+            self.x_axis = None
+            self.y_axis = None
+
+        # Track whether we want to add an image to the notification.
+        self.include_image = include_image
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """
+        Perform GLib/Gio Notification
+        """
+        # Acquire our gio interface
+        try:
+            gio_iface = Gio.DBusProxy.new_for_bus_sync(
+                Gio.BusType.SESSION,
+                Gio.DBusProxyFlags.NONE,
+                None,
+                self.glib_interface,
+                self.glib_setting_location,
+                self.glib_interface,
+                None,
+            )
+
+        except GLib.Error as e:
+            # Handle exception
+            self.logger.warning("Failed to send GLib/Gio notification.")
+            self.logger.debug(f"GLib/Gio Exception: {e}")
+            return False
+
+        # If there is no title, but there is a body, swap the two to get rid
+        # of the weird whitespace
+        if not title:
+            title = body
+            body = ""
+
+        # image path
+        icon_path = None if not self.include_image \
+            else self.image_path(notify_type, extension=".ico")
+
+        # Our meta payload
+        meta_payload = {
+            "urgency": GLib.Variant("y", self.urgency),
+        }
+
+        if not (self.x_axis is None and self.y_axis is None):
+            # Set x/y access if these were set
+            meta_payload["x"] = GLib.Variant("i", self.x_axis)
+            meta_payload["y"] = GLib.Variant("i", self.y_axis)
+
+        if NOTIFY_GLIB_IMAGE_SUPPORT and icon_path:
+            try:
+                # Use Pixbuf to create the proper image type
+                image = GdkPixbuf.Pixbuf.new_from_file(icon_path)
+
+                # Associate our image to our notification
+                meta_payload["icon_data"] = GLib.Variant(
+                    "(iiibiiay)",
+                    (
+                        image.get_width(),
+                        image.get_height(),
+                        image.get_rowstride(),
+                        image.get_has_alpha(),
+                        image.get_bits_per_sample(),
+                        image.get_n_channels(),
+                        image.get_pixels(),
+                    ),
+                )
+
+            except Exception as e:
+                self.logger.warning(
+                    "Could not load notification icon (%s).", icon_path)
+                self.logger.debug(f"GLib/Gio Exception: {e}")
+
+        try:
+            # Always call throttle() before any remote execution is made
+            self.throttle()
+
+            gio_iface.Notify(
+                "(susssasa{sv}i)",
+                # Application Identifier
+                self.app_id,
+                # Message ID (0 = New Message)
+                0,
+                # Icon (str) - not used
+                "",
+                # Title
+                str(title),
+                # Body
+                str(body),
+                # Actions
+                [],
+                # Meta
+                meta_payload,
+                # Message Timeout
+                self.message_timeout_ms,
+            )
+
+            self.logger.info("Sent GLib/Gio notification.")
+
+        except Exception as e:
+            self.logger.warning("Failed to send GLib/Gio notification.")
+            self.logger.debug(f"GLib/Gio Exception: {e}")
+            return False
+
+        return True
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {
+            "image": "yes" if self.include_image else "no",
+            "urgency":
+                GLIB_URGENCIES[self.template_args["urgency"]["default"]]
+                if self.urgency not in GLIB_URGENCIES
+                else GLIB_URGENCIES[self.urgency],
+        }
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        # x in (x,y) screen coordinates
+        if self.x_axis:
+            params["x"] = str(self.x_axis)
+
+        # y in (x,y) screen coordinates
+        if self.y_axis:
+            params["y"] = str(self.y_axis)
+
+        schema = self.protocol[0]
+        return f"{schema}://_/?{NotifyGLib.urlencode(params)}"
+
+    @staticmethod
+    def parse_url(url):
+        """
+        There are no parameters necessary for this protocol; simply having
+        gnome:// is all you need.  This function just makes sure that
+        is in place.
+
+        """
+
+        results = NotifyBase.parse_url(url, verify_host=False)
+
+        # Include images with our message
+        results["include_image"] = \
+            parse_bool(results["qsd"].get("image", True))
+
+        # GLib/Gio supports urgency, but we we also support the keyword
+        # priority so that it is consistent with some of the other plugins
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            # We intentionally store the priority in the urgency section
+            results["urgency"] = \
+                NotifyGLib.unquote(results["qsd"]["priority"])
+
+        if "urgency" in results["qsd"] and len(results["qsd"]["urgency"]):
+            results["urgency"] = \
+                NotifyGLib.unquote(results["qsd"]["urgency"])
+
+        # handle x,y coordinates
+        if "x" in results["qsd"] and len(results["qsd"]["x"]):
+            results["x_axis"] = NotifyGLib.unquote(results["qsd"].get("x"))
+
+        if "y" in results["qsd"] and len(results["qsd"]["y"]):
+            results["y_axis"] = NotifyGLib.unquote(results["qsd"].get("y"))
+
+        return results
diff --git a/libs/apprise/plugins/gnome.py b/libs/apprise/plugins/gnome.py
index ae148aefab..43332a5733 100644
--- a/libs/apprise/plugins/gnome.py
+++ b/libs/apprise/plugins/gnome.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,11 +25,10 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_bool
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 # Default our global support flag
 NOTIFY_GNOME_SUPPORT_ENABLED = False
@@ -41,10 +39,10 @@
 
     # require_version() call is required otherwise we generate a warning
     gi.require_version("Notify", "0.7")
+    gi.require_version("GdkPixbuf", "2.0")
 
     # We can import the actual libraries we care about now:
-    from gi.repository import Notify
-    from gi.repository import GdkPixbuf
+    from gi.repository import GdkPixbuf, Notify
 
     # We're good to go!
     NOTIFY_GNOME_SUPPORT_ENABLED = True
@@ -67,55 +65,52 @@ class GnomeUrgency:
 
 
 GNOME_URGENCIES = {
-    GnomeUrgency.LOW: 'low',
-    GnomeUrgency.NORMAL: 'normal',
-    GnomeUrgency.HIGH: 'high',
+    GnomeUrgency.LOW: "low",
+    GnomeUrgency.NORMAL: "normal",
+    GnomeUrgency.HIGH: "high",
 }
 
 
 GNOME_URGENCY_MAP = {
     # Maps against string 'low'
-    'l': GnomeUrgency.LOW,
+    "l": GnomeUrgency.LOW,
     # Maps against string 'moderate'
-    'm': GnomeUrgency.LOW,
+    "m": GnomeUrgency.LOW,
     # Maps against string 'normal'
-    'n': GnomeUrgency.NORMAL,
+    "n": GnomeUrgency.NORMAL,
     # Maps against string 'high'
-    'h': GnomeUrgency.HIGH,
+    "h": GnomeUrgency.HIGH,
     # Maps against string 'emergency'
-    'e': GnomeUrgency.HIGH,
-
+    "e": GnomeUrgency.HIGH,
     # Entries to additionally support (so more like Gnome's API)
-    '0': GnomeUrgency.LOW,
-    '1': GnomeUrgency.NORMAL,
-    '2': GnomeUrgency.HIGH,
+    "0": GnomeUrgency.LOW,
+    "1": GnomeUrgency.NORMAL,
+    "2": GnomeUrgency.HIGH,
 }
 
 
 class NotifyGnome(NotifyBase):
-    """
-    A wrapper for local Gnome Notifications
-    """
+    """A wrapper for local Gnome Notifications."""
 
     # Set our global enabled flag
     enabled = NOTIFY_GNOME_SUPPORT_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'details': _('A local Gnome environment is required.')
+        "details": _("A local Gnome environment is required.")
     }
 
     # The default descriptive name associated with the Notification
-    service_name = _('Gnome Notification')
+    service_name = _("Gnome Notification")
 
     # The service URL
-    service_url = 'https://www.gnome.org/'
+    service_url = "https://www.gnome.org/"
 
     # The default protocol
-    protocol = 'gnome'
+    protocol = "gnome"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_gnome'
+    setup_url = "https://appriseit.com/services/gnome/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_128
@@ -137,63 +132,68 @@ class NotifyGnome(NotifyBase):
     url_identifier = False
 
     # Define object templates
-    templates = (
-        '{schema}://',
-    )
+    templates = ("{schema}://",)
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'urgency': {
-            'name': _('Urgency'),
-            'type': 'choice:int',
-            'values': GNOME_URGENCIES,
-            'default': GnomeUrgency.NORMAL,
-        },
-        'priority': {
-            # Apprise uses 'priority' everywhere; it's just a nice consistent
-            # feel to be able to use it here as well. Just map the
-            # value back to 'priority'
-            'alias_of': 'urgency',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "urgency": {
+                "name": _("Urgency"),
+                "type": "choice:int",
+                "values": GNOME_URGENCIES,
+                "default": GnomeUrgency.NORMAL,
+            },
+            "priority": {
+                # Apprise uses 'priority' everywhere; it's just a nice
+                # consistent feel to be able to use it here as well. Just map
+                # the value back to 'priority'
+                "alias_of": "urgency",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-    })
+    )
 
     def __init__(self, urgency=None, include_image=True, **kwargs):
-        """
-        Initialize Gnome Object
-        """
+        """Initialize Gnome Object."""
 
         super().__init__(**kwargs)
 
         # The urgency of the message
         self.urgency = int(
-            NotifyGnome.template_args['urgency']['default']
-            if urgency is None else
-            next((
-                v for k, v in GNOME_URGENCY_MAP.items()
-                if str(urgency).lower().startswith(k)),
-                NotifyGnome.template_args['urgency']['default']))
+            NotifyGnome.template_args["urgency"]["default"]
+            if urgency is None
+            else next(
+                (
+                    v
+                    for k, v in GNOME_URGENCY_MAP.items()
+                    if str(urgency).lower().startswith(k)
+                ),
+                NotifyGnome.template_args["urgency"]["default"],
+            )
+        )
 
         # Track whether we want to add an image to the notification.
         self.include_image = include_image
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Gnome Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Gnome Notification."""
 
         try:
             # App initialization
             Notify.init(self.app_id)
 
             # image path
-            icon_path = None if not self.include_image \
-                else self.image_path(notify_type, extension='.ico')
+            icon_path = (
+                None
+                if not self.include_image
+                else self.image_path(notify_type, extension=".ico")
+            )
 
             # Build message body
             notification = Notify.Notification.new(body)
@@ -215,65 +215,62 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 except Exception as e:
                     self.logger.warning(
-                        "Could not load notification icon (%s).", icon_path)
-                    self.logger.debug(f'Gnome Exception: {e}')
+                        "Could not load notification icon (%s).", icon_path
+                    )
+                    self.logger.debug(f"Gnome Exception: {e}")
 
             notification.show()
-            self.logger.info('Sent Gnome notification.')
+            self.logger.info("Sent Gnome notification.")
 
         except Exception as e:
-            self.logger.warning('Failed to send Gnome notification.')
-            self.logger.debug(f'Gnome Exception: {e}')
+            self.logger.warning("Failed to send Gnome notification.")
+            self.logger.debug(f"Gnome Exception: {e}")
             return False
 
         return True
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'urgency':
-                GNOME_URGENCIES[self.template_args['urgency']['default']]
+            "image": "yes" if self.include_image else "no",
+            "urgency": (
+                GNOME_URGENCIES[self.template_args["urgency"]["default"]]
                 if self.urgency not in GNOME_URGENCIES
-                else GNOME_URGENCIES[self.urgency],
+                else GNOME_URGENCIES[self.urgency]
+            ),
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://?{params}'.format(
-            schema=self.protocol,
-            params=NotifyGnome.urlencode(params),
-        )
+        return f"{self.protocol}://?{NotifyGnome.urlencode(params)}"
 
     @staticmethod
     def parse_url(url):
-        """
-        There are no parameters nessisary for this protocol; simply having
-        gnome:// is all you need.  This function just makes sure that
-        is in place.
+        """There are no parameters nessisary for this protocol; simply having
+        gnome:// is all you need.
 
+        This function just makes sure that is in place.
         """
 
         results = NotifyBase.parse_url(url, verify_host=False)
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         # Gnome supports urgency, but we we also support the keyword priority
         # so that it is consistent with some of the other plugins
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
             # We intentionally store the priority in the urgency section
-            results['urgency'] = \
-                NotifyGnome.unquote(results['qsd']['priority'])
+            results["urgency"] = NotifyGnome.unquote(
+                results["qsd"]["priority"]
+            )
 
-        if 'urgency' in results['qsd'] and len(results['qsd']['urgency']):
-            results['urgency'] = \
-                NotifyGnome.unquote(results['qsd']['urgency'])
+        if "urgency" in results["qsd"] and len(results["qsd"]["urgency"]):
+            results["urgency"] = NotifyGnome.unquote(results["qsd"]["urgency"])
 
         return results
diff --git a/libs/apprise/plugins/google_chat.py b/libs/apprise/plugins/google_chat.py
index 013fa68394..ee1ba9cebc 100644
--- a/libs/apprise/plugins/google_chat.py
+++ b/libs/apprise/plugins/google_chat.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -54,36 +53,34 @@
 #         incoming-bot-python
 #    - https://developers.google.com/hangouts/chat/reference/rest
 #
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import validate_regex
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NotifyGoogleChat(NotifyBase):
-    """
-    A wrapper to Google Chat Notifications
+    """A wrapper to Google Chat Notifications."""
 
-    """
     # The default descriptive name associated with the Notification
-    service_name = 'Google Chat'
+    service_name = "Google Chat"
 
     # The services URL
-    service_url = 'https://chat.google.com/'
+    service_url = "https://chat.google.com/"
 
     # The default secure protocol
-    secure_protocol = 'gchat'
+    secure_protocol = "gchat"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_googlechat'
+    setup_url = "https://appriseit.com/services/googlechat/"
 
     # Google Chat Webhook
-    notify_url = 'https://chat.googleapis.com/v1/spaces/{workspace}/messages'
+    notify_url = "https://chat.googleapis.com/v1/spaces/{workspace}/messages"
 
     # Default Notify Format
     notify_format = NotifyFormat.MARKDOWN
@@ -97,90 +94,102 @@ class NotifyGoogleChat(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{workspace}/{webhook_key}/{webhook_token}',
-        '{schema}://{workspace}/{webhook_key}/{webhook_token}/{thread_key}',
+        "{schema}://{workspace}/{webhook_key}/{webhook_token}",
+        "{schema}://{workspace}/{webhook_key}/{webhook_token}/{thread_key}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'workspace': {
-            'name': _('Workspace'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'webhook_key': {
-            'name': _('Webhook Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'webhook_token': {
-            'name': _('Webhook Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'thread_key': {
-            'name': _('Thread Key'),
-            'type': 'string',
-            'private': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "workspace": {
+                "name": _("Workspace"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "webhook_key": {
+                "name": _("Webhook Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "webhook_token": {
+                "name": _("Webhook Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "thread_key": {
+                "name": _("Thread Key"),
+                "type": "string",
+                "private": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'workspace': {
-            'alias_of': 'workspace',
-        },
-        'key': {
-            'alias_of': 'webhook_key',
-        },
-        'token': {
-            'alias_of': 'webhook_token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "workspace": {
+                "alias_of": "workspace",
+            },
+            "key": {
+                "alias_of": "webhook_key",
+            },
+            "token": {
+                "alias_of": "webhook_token",
+            },
+            "thread": {
+                "alias_of": "thread_key",
+            },
         },
-        'thread': {
-            'alias_of': 'thread_key',
-        },
-    })
-
-    def __init__(self, workspace, webhook_key, webhook_token,
-                 thread_key=None, **kwargs):
-        """
-        Initialize Google Chat Object
+    )
 
-        """
+    def __init__(
+        self, workspace, webhook_key, webhook_token, thread_key=None, **kwargs
+    ):
+        """Initialize Google Chat Object."""
         super().__init__(**kwargs)
 
         # Workspace (associated with project)
         self.workspace = validate_regex(workspace)
         if not self.workspace:
-            msg = 'An invalid Google Chat Workspace ' \
-                  '({}) was specified.'.format(workspace)
+            msg = (
+                "An invalid Google Chat Workspace "
+                f"({workspace}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Webhook Key (associated with project)
         self.webhook_key = validate_regex(webhook_key)
         if not self.webhook_key:
-            msg = 'An invalid Google Chat Webhook Key ' \
-                  '({}) was specified.'.format(webhook_key)
+            msg = (
+                "An invalid Google Chat Webhook Key "
+                f"({webhook_key}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Webhook Token (associated with project)
         self.webhook_token = validate_regex(webhook_token)
         if not self.webhook_token:
-            msg = 'An invalid Google Chat Webhook Token ' \
-                  '({}) was specified.'.format(webhook_token)
+            msg = (
+                "An invalid Google Chat Webhook Token "
+                f"({webhook_token}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if thread_key:
             self.thread_key = validate_regex(thread_key)
             if not self.thread_key:
-                msg = 'An invalid Google Chat Thread Key ' \
-                      '({}) was specified.'.format(thread_key)
+                msg = (
+                    "An invalid Google Chat Thread Key "
+                    f"({thread_key}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
@@ -188,20 +197,18 @@ def __init__(self, workspace, webhook_key, webhook_token,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Google Chat Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Google Chat Notification."""
 
         # Our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json; charset=utf-8",
         }
 
         payload = {
             # Our Message
-            'text': body,
+            "text": body,
         }
 
         # Construct Notify URL
@@ -211,18 +218,27 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         params = {
             # Prepare our URL Parameters
-            'token': self.webhook_token,
-            'key': self.webhook_key,
+            "token": self.webhook_token,
+            "key": self.webhook_key,
         }
 
         if self.thread_key:
-            params['threadKey'] = self.thread_key
-
-        self.logger.debug('Google Chat POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Google Chat Parameters: %s' % str(params))
-        self.logger.debug('Google Chat Payload: %s' % str(payload))
+            params.update({
+                "messageReplyOption": "REPLY_MESSAGE_FALLBACK_TO_NEW_THREAD",
+            })
+
+            payload.update({
+                "thread": {
+                    "thread_key": self.thread_key,
+                }
+            })
+
+        self.logger.debug(
+            "Google Chat POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Google Chat Parameters: {params!s}")
+        self.logger.debug(f"Google Chat Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -236,75 +252,81 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 timeout=self.request_timeout,
             )
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifyBase.http_response_code_lookup(r.status_code)
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Google Chat notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Google Chat notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Google Chat notification.')
+                self.logger.info("Sent Google Chat notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred postingto Google Chat.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred postingto Google Chat."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.workspace, self.webhook_key,
+            self.secure_protocol,
+            self.workspace,
+            self.webhook_key,
             self.webhook_token,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Set our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{workspace}/{key}/{token}/{thread}?{params}'.format(
+        return "{schema}://{workspace}/{key}/{token}/{thread}?{params}".format(
             schema=self.secure_protocol,
-            workspace=self.pprint(self.workspace, privacy, safe=''),
-            key=self.pprint(self.webhook_key, privacy, safe=''),
-            token=self.pprint(self.webhook_token, privacy, safe=''),
-            thread='' if not self.thread_key
-            else self.pprint(self.thread_key, privacy, safe=''),
+            workspace=self.pprint(self.workspace, privacy, safe=""),
+            key=self.pprint(self.webhook_key, privacy, safe=""),
+            token=self.pprint(self.webhook_token, privacy, safe=""),
+            thread=(
+                ""
+                if not self.thread_key
+                else self.pprint(self.thread_key, privacy, safe="")
+            ),
             params=NotifyGoogleChat.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object.
 
         Syntax:
           gchat://workspace/webhook_key/webhook_token
           gchat://workspace/webhook_key/webhook_token/thread_key
-
         """
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -312,43 +334,48 @@ def parse_url(url):
             return results
 
         # Store our Workspace
-        results['workspace'] = NotifyGoogleChat.unquote(results['host'])
+        results["workspace"] = NotifyGoogleChat.unquote(results["host"])
 
         # Acquire our tokens
-        tokens = NotifyGoogleChat.split_path(results['fullpath'])
+        tokens = NotifyGoogleChat.split_path(results["fullpath"])
 
         # Store our Webhook Key
-        results['webhook_key'] = tokens.pop(0) if tokens else None
+        results["webhook_key"] = tokens.pop(0) if tokens else None
 
         # Store our Webhook Token
-        results['webhook_token'] = tokens.pop(0) if tokens else None
+        results["webhook_token"] = tokens.pop(0) if tokens else None
 
         # Store our Thread Key
-        results['thread_key'] = tokens.pop(0) if tokens else None
+        results["thread_key"] = tokens.pop(0) if tokens else None
 
         # Support arguments as overrides (if specified)
-        if 'workspace' in results['qsd']:
-            results['workspace'] = \
-                NotifyGoogleChat.unquote(results['qsd']['workspace'])
+        if "workspace" in results["qsd"]:
+            results["workspace"] = NotifyGoogleChat.unquote(
+                results["qsd"]["workspace"]
+            )
 
-        if 'key' in results['qsd']:
-            results['webhook_key'] = \
-                NotifyGoogleChat.unquote(results['qsd']['key'])
+        if "key" in results["qsd"]:
+            results["webhook_key"] = NotifyGoogleChat.unquote(
+                results["qsd"]["key"]
+            )
 
-        if 'token' in results['qsd']:
-            results['webhook_token'] = \
-                NotifyGoogleChat.unquote(results['qsd']['token'])
+        if "token" in results["qsd"]:
+            results["webhook_token"] = NotifyGoogleChat.unquote(
+                results["qsd"]["token"]
+            )
 
-        if 'thread' in results['qsd']:
-            results['thread_key'] = \
-                NotifyGoogleChat.unquote(results['qsd']['thread'])
+        if "thread" in results["qsd"]:
+            results["thread_key"] = NotifyGoogleChat.unquote(
+                results["qsd"]["thread"]
+            )
 
-        elif 'threadkey' in results['qsd']:
+        elif "threadkey" in results["qsd"]:
             # Support Google Chat's Thread Key (if set)
             # keys are always made lowercase; so check above is attually
             # testing threadKey successfully as well
-            results['thread_key'] = \
-                NotifyGoogleChat.unquote(results['qsd']['threadkey'])
+            results["thread_key"] = NotifyGoogleChat.unquote(
+                results["qsd"]["threadkey"]
+            )
 
         return results
 
@@ -363,15 +390,19 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https://chat\.googleapis\.com/v1/spaces/'
-            r'(?P<workspace>[A-Z0-9_-]+)/messages/*(?P<params>.+)$',
-            url, re.I)
+            r"^https://chat\.googleapis\.com/v1/spaces/"
+            r"(?P<workspace>[A-Z0-9_-]+)/messages/*(?P<params>.+)$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyGoogleChat.parse_url(
-                '{schema}://{workspace}/{params}'.format(
+                "{schema}://{workspace}/{params}".format(
                     schema=NotifyGoogleChat.secure_protocol,
-                    workspace=result.group('workspace'),
-                    params=result.group('params')))
+                    workspace=result.group("workspace"),
+                    params=result.group("params"),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/gotify.py b/libs/apprise/plugins/gotify.py
index c06333ffc8..ef99a4a96f 100644
--- a/libs/apprise/plugins/gotify.py
+++ b/libs/apprise/plugins/gotify.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,16 +27,17 @@
 
 # Gotify Docker configuration: https://hub.docker.com/r/gotify/server
 # Example: https://github.com/gotify/server/blob/\
-#        f2c2688f0b5e6a816bbcec768ca1c0de5af76b88/ADD_MESSAGE_EXAMPLES.md#python
+#      f2c2688f0b5e6a816bbcec768ca1c0de5af76b88/ADD_MESSAGE_EXAMPLES.md#python
 # API: https://gotify.net/docs/swagger-docs
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyType, NotifyFormat
-from ..utils.parse import validate_regex
+import requests
+
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 # Priorities
@@ -51,176 +51,182 @@ class GotifyPriority:
 
 GOTIFY_PRIORITIES = {
     # Note: This also acts as a reverse lookup mapping
-    GotifyPriority.LOW: 'low',
-    GotifyPriority.MODERATE: 'moderate',
-    GotifyPriority.NORMAL: 'normal',
-    GotifyPriority.HIGH: 'high',
-    GotifyPriority.EMERGENCY: 'emergency',
+    GotifyPriority.LOW: "low",
+    GotifyPriority.MODERATE: "moderate",
+    GotifyPriority.NORMAL: "normal",
+    GotifyPriority.HIGH: "high",
+    GotifyPriority.EMERGENCY: "emergency",
 }
 
 GOTIFY_PRIORITY_MAP = {
     # Maps against string 'low'
-    'l': GotifyPriority.LOW,
+    "l": GotifyPriority.LOW,
     # Maps against string 'moderate'
-    'm': GotifyPriority.MODERATE,
+    "m": GotifyPriority.MODERATE,
     # Maps against string 'normal'
-    'n': GotifyPriority.NORMAL,
+    "n": GotifyPriority.NORMAL,
     # Maps against string 'high'
-    'h': GotifyPriority.HIGH,
+    "h": GotifyPriority.HIGH,
     # Maps against string 'emergency'
-    'e': GotifyPriority.EMERGENCY,
-
+    "e": GotifyPriority.EMERGENCY,
     # Entries to additionally support (so more like Gotify's API)
-    '10': GotifyPriority.EMERGENCY,
+    "10": GotifyPriority.EMERGENCY,
     # ^ 10 needs to be checked before '1' below or it will match the wrong
     # priority
-    '0': GotifyPriority.LOW, '1': GotifyPriority.LOW, '2': GotifyPriority.LOW,
-    '3': GotifyPriority.MODERATE, '4': GotifyPriority.MODERATE,
-    '5': GotifyPriority.NORMAL, '6': GotifyPriority.NORMAL,
-    '7': GotifyPriority.NORMAL,
-    '8': GotifyPriority.HIGH, '9': GotifyPriority.HIGH,
+    "0": GotifyPriority.LOW,
+    "1": GotifyPriority.LOW,
+    "2": GotifyPriority.LOW,
+    "3": GotifyPriority.MODERATE,
+    "4": GotifyPriority.MODERATE,
+    "5": GotifyPriority.NORMAL,
+    "6": GotifyPriority.NORMAL,
+    "7": GotifyPriority.NORMAL,
+    "8": GotifyPriority.HIGH,
+    "9": GotifyPriority.HIGH,
 }
 
 
 class NotifyGotify(NotifyBase):
-    """
-    A wrapper for Gotify Notifications
-    """
+    """A wrapper for Gotify Notifications."""
+
     # The default descriptive name associated with the Notification
-    service_name = 'Gotify'
+    service_name = "Gotify"
 
     # The services URL
-    service_url = 'https://github.com/gotify/server'
+    service_url = "https://github.com/gotify/server"
 
     # The default protocol
-    protocol = 'gotify'
+    protocol = "gotify"
 
     # The default secure protocol
-    secure_protocol = 'gotifys'
+    secure_protocol = "gotifys"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_gotify'
+    setup_url = "https://appriseit.com/services/gotify/"
 
     # Disable throttle rate
     request_rate_per_sec = 0
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{token}',
-        '{schema}://{host}:{port}/{token}',
-        '{schema}://{host}{path}{token}',
-        '{schema}://{host}:{port}{path}{token}',
+        "{schema}://{host}/{token}",
+        "{schema}://{host}:{port}/{token}",
+        "{schema}://{host}{path}{token}",
+        "{schema}://{host}:{port}{path}{token}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "path": {
+                "name": _("Path"),
+                "type": "string",
+                "map_to": "fullpath",
+                "default": "/",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
         },
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'path': {
-            'name': _('Path'),
-            'type': 'string',
-            'map_to': 'fullpath',
-            'default': '/',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': GOTIFY_PRIORITIES,
-            'default': GotifyPriority.NORMAL,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": GOTIFY_PRIORITIES,
+                "default": GotifyPriority.NORMAL,
+            },
         },
-    })
+    )
 
     def __init__(self, token, priority=None, **kwargs):
-        """
-        Initialize Gotify Object
-
-        """
+        """Initialize Gotify Object."""
         super().__init__(**kwargs)
 
         # Token (associated with project)
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Gotify Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Gotify Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # prepare our fullpath
-        self.fullpath = kwargs.get('fullpath', '/')
+        self.fullpath = kwargs.get("fullpath", "/")
 
         # The Priority of the message
         self.priority = int(
-            NotifyGotify.template_args['priority']['default']
-            if priority is None else
-            next((
-                v for k, v in GOTIFY_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyGotify.template_args['priority']['default']))
+            NotifyGotify.template_args["priority"]["default"]
+            if priority is None
+            else next(
+                (
+                    v
+                    for k, v in GOTIFY_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyGotify.template_args["priority"]["default"],
+            )
+        )
 
         if self.secure:
-            self.schema = 'https'
+            self.schema = "https"
 
         else:
-            self.schema = 'http'
+            self.schema = "http"
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Gotify Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Gotify Notification."""
 
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if self.port:
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         # Append our remaining path
-        url += '{fullpath}message'.format(fullpath=self.fullpath)
+        url += f"{self.fullpath}message"
 
         # Prepare Gotify Object
         payload = {
-            'priority': self.priority,
-            'title': title,
-            'message': body,
+            "priority": self.priority,
+            "title": title,
+            "message": body,
         }
 
         if self.notify_format == NotifyFormat.MARKDOWN:
             payload["extras"] = {
-                "client::display": {
-                    "contentType": "text/markdown"
-                }
+                "client::display": {"contentType": "text/markdown"}
             }
 
         # Our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'X-Gotify-Key': self.token,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Gotify-Key": self.token,
         }
 
-        self.logger.debug('Gotify POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Gotify Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Gotify POST URL: {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Gotify Payload: {payload!s}")
 
         # Always call throttle before the requests are made
         self.throttle()
@@ -235,30 +241,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyGotify.http_response_code_lookup(r.status_code)
+                status_str = NotifyGotify.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Gotify notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Gotify notification: {}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Mark our failure
                 return False
 
             else:
-                self.logger.info('Sent Gotify notification.')
+                self.logger.info("Sent Gotify notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Gotify '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Gotify "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             return False
@@ -267,29 +274,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
-            self.fullpath.rstrip('/'),
+            self.fullpath.rstrip("/"),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'priority':
-                GOTIFY_PRIORITIES[self.template_args['priority']['default']]
+            "priority": (
+                GOTIFY_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in GOTIFY_PRIORITIES
-                else GOTIFY_PRIORITIES[self.priority],
+                else GOTIFY_PRIORITIES[self.priority]
+            ),
         }
 
         # Extend our parameters
@@ -297,49 +305,50 @@ def url(self, privacy=False, *args, **kwargs):
 
         # Our default port
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{hostname}{port}{fullpath}{token}/?{params}'.format(
+        return "{schema}://{hostname}{port}{fullpath}{token}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=NotifyGotify.quote(self.fullpath, safe='/'),
-            token=self.pprint(self.token, privacy, safe=''),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=NotifyGotify.quote(self.fullpath, safe="/"),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyGotify.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early
             return results
 
         # Retrieve our escaped entries found on the fullpath
-        entries = NotifyBase.split_path(results['fullpath'])
+        entries = NotifyBase.split_path(results["fullpath"])
 
         # optionally find the provider key
         try:
             # The last entry is our token
-            results['token'] = entries.pop()
+            results["token"] = entries.pop()
 
         except IndexError:
             # No token was set
-            results['token'] = None
+            results["token"] = None
 
         # Re-assemble our full path
-        results['fullpath'] = \
-            '/' if not entries else '/{}/'.format('/'.join(entries))
+        results["fullpath"] = (
+            "/" if not entries else "/{}/".format("/".join(entries))
+        )
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyGotify.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyGotify.unquote(
+                results["qsd"]["priority"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/growl.py b/libs/apprise/plugins/growl.py
index 7cca60dc5f..d9eb2d1cf9 100644
--- a/libs/apprise/plugins/growl.py
+++ b/libs/apprise/plugins/growl.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,12 +25,11 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from .base import NotifyBase
+from ..common import NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyType
 from ..utils.parse import parse_bool
-from ..locale import gettext_lazy as _
+from .base import NotifyBase
 
 # Default our global support flag
 NOTIFY_GROWL_SUPPORT_ENABLED = False
@@ -59,58 +57,55 @@ class GrowlPriority:
 
 GROWL_PRIORITIES = {
     # Note: This also acts as a reverse lookup mapping
-    GrowlPriority.LOW: 'low',
-    GrowlPriority.MODERATE: 'moderate',
-    GrowlPriority.NORMAL: 'normal',
-    GrowlPriority.HIGH: 'high',
-    GrowlPriority.EMERGENCY: 'emergency',
+    GrowlPriority.LOW: "low",
+    GrowlPriority.MODERATE: "moderate",
+    GrowlPriority.NORMAL: "normal",
+    GrowlPriority.HIGH: "high",
+    GrowlPriority.EMERGENCY: "emergency",
 }
 
 GROWL_PRIORITY_MAP = {
     # Maps against string 'low'
-    'l': GrowlPriority.LOW,
+    "l": GrowlPriority.LOW,
     # Maps against string 'moderate'
-    'm': GrowlPriority.MODERATE,
+    "m": GrowlPriority.MODERATE,
     # Maps against string 'normal'
-    'n': GrowlPriority.NORMAL,
+    "n": GrowlPriority.NORMAL,
     # Maps against string 'high'
-    'h': GrowlPriority.HIGH,
+    "h": GrowlPriority.HIGH,
     # Maps against string 'emergency'
-    'e': GrowlPriority.EMERGENCY,
-
+    "e": GrowlPriority.EMERGENCY,
     # Entries to additionally support (so more like Growl's API)
-    '-2': GrowlPriority.LOW,
-    '-1': GrowlPriority.MODERATE,
-    '0': GrowlPriority.NORMAL,
-    '1': GrowlPriority.HIGH,
-    '2': GrowlPriority.EMERGENCY,
+    "-2": GrowlPriority.LOW,
+    "-1": GrowlPriority.MODERATE,
+    "0": GrowlPriority.NORMAL,
+    "1": GrowlPriority.HIGH,
+    "2": GrowlPriority.EMERGENCY,
 }
 
 
 class NotifyGrowl(NotifyBase):
-    """
-    A wrapper to Growl Notifications
+    """A wrapper to Growl Notifications."""
 
-    """
     # Set our global enabled flag
     enabled = NOTIFY_GROWL_SUPPORT_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'packages_required': 'gntp'
+        "packages_required": "gntp"
     }
 
     # The default descriptive name associated with the Notification
-    service_name = 'Growl'
+    service_name = "Growl"
 
     # The services URL
-    service_url = 'http://growl.info/'
+    service_url = "http://growl.info/"
 
     # The default protocol
-    protocol = 'growl'
+    protocol = "growl"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_growl'
+    setup_url = "https://appriseit.com/services/growl/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -131,77 +126,93 @@ class NotifyGrowl(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{password}@{host}',
-        '{schema}://{password}@{host}:{port}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{password}@{host}",
+        "{schema}://{password}@{host}:{port}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': GROWL_PRIORITIES,
-            'default': GrowlPriority.NORMAL,
-        },
-        'version': {
-            'name': _('Version'),
-            'type': 'choice:int',
-            'values': (1, 2),
-            'default': 2,
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'sticky': {
-            'name': _('Sticky'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'sticky',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": GROWL_PRIORITIES,
+                "default": GrowlPriority.NORMAL,
+            },
+            "version": {
+                "name": _("Version"),
+                "type": "choice:int",
+                "values": (1, 2),
+                "default": 2,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "sticky": {
+                "name": _("Sticky"),
+                "type": "bool",
+                "default": True,
+                "map_to": "sticky",
+            },
         },
-    })
+    )
 
-    def __init__(self, priority=None, version=2, include_image=True,
-                 sticky=False, **kwargs):
-        """
-        Initialize Growl Object
-        """
+    def __init__(
+        self,
+        priority=None,
+        version=2,
+        include_image=True,
+        sticky=False,
+        **kwargs,
+    ):
+        """Initialize Growl Object."""
         super().__init__(**kwargs)
 
         if not self.port:
             self.port = self.default_port
 
         # The Priority of the message
-        self.priority = NotifyGrowl.template_args['priority']['default'] \
-            if not priority else \
-            next((
-                v for k, v in GROWL_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyGrowl.template_args['priority']['default'])
+        self.priority = (
+            NotifyGrowl.template_args["priority"]["default"]
+            if not priority
+            else next(
+                (
+                    v
+                    for k, v in GROWL_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyGrowl.template_args["priority"]["default"],
+            )
+        )
 
         # Our Registered object
         self.growl = None
@@ -219,61 +230,67 @@ def __init__(self, priority=None, version=2, include_image=True,
         return
 
     def register(self):
-        """
-        Registers with the Growl server
-        """
+        """Registers with the Growl server."""
         payload = {
-            'applicationName': self.app_id,
-            'notifications': [self.growl_notification_type, ],
-            'defaultNotifications': [self.growl_notification_type, ],
-            'hostname': self.host,
-            'port': self.port,
+            "applicationName": self.app_id,
+            "notifications": [
+                self.growl_notification_type,
+            ],
+            "defaultNotifications": [
+                self.growl_notification_type,
+            ],
+            "hostname": self.host,
+            "port": self.port,
         }
 
         if self.password is not None:
-            payload['password'] = self.password
+            payload["password"] = self.password
 
-        self.logger.debug('Growl Registration Payload: %s' % str(payload))
+        self.logger.debug(f"Growl Registration Payload: {payload!s}")
         self.growl = gntp.notifier.GrowlNotifier(**payload)
 
         try:
             self.growl.register()
 
         except gntp.errors.NetworkError:
-            msg = 'A network error error occurred registering ' \
-                  'with Growl at {}.'.format(self.host)
+            msg = (
+                "A network error error occurred registering "
+                f"with Growl at {self.host}."
+            )
             self.logger.warning(msg)
             return False
 
         except gntp.errors.ParseError:
-            msg = 'A parsing error error occurred registering ' \
-                  'with Growl at {}.'.format(self.host)
+            msg = (
+                "A parsing error error occurred registering "
+                f"with Growl at {self.host}."
+            )
             self.logger.warning(msg)
             return False
 
         except gntp.errors.AuthError:
-            msg = 'An authentication error error occurred registering ' \
-                  'with Growl at {}.'.format(self.host)
+            msg = (
+                "An authentication error error occurred registering "
+                f"with Growl at {self.host}."
+            )
             self.logger.warning(msg)
             return False
 
         except gntp.errors.UnsupportedError:
-            msg = 'An unsupported error occurred registering with ' \
-                  'Growl at {}.'.format(self.host)
+            msg = (
+                "An unsupported error occurred registering with "
+                f"Growl at {self.host}."
+            )
             self.logger.warning(msg)
             return False
 
-        self.logger.debug(
-            'Growl server registration completed successfully.'
-        )
+        self.logger.debug("Growl server registration completed successfully.")
 
         # Return our state
         return True
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Growl Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Growl Notification."""
         # Register ourselves with the server if we haven't done so already
         if not self.growl and not self.register():
             # We failed to register
@@ -282,28 +299,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         icon = None
         if self.version >= 2:
             # URL Based
-            icon = None if not self.include_image \
-                else self.image_url(notify_type)
+            icon = (
+                None if not self.include_image else self.image_url(notify_type)
+            )
 
         else:
             # Raw
-            icon = None if not self.include_image \
-                else self.image_raw(notify_type)
+            icon = (
+                None if not self.include_image else self.image_raw(notify_type)
+            )
 
         payload = {
-            'noteType': self.growl_notification_type,
-            'title': title,
-            'description': body,
-            'icon': icon is not None,
-            'sticky': self.sticky,
-            'priority': self.priority,
+            "noteType": self.growl_notification_type,
+            "title": title,
+            "description": body,
+            "icon": icon is not None,
+            "sticky": self.sticky,
+            "priority": self.priority,
         }
-        self.logger.debug('Growl Payload: %s' % str(payload))
+        self.logger.debug(f"Growl Payload: {payload!s}")
 
         # Update icon of payload to be raw data; this is intentionally done
         # here after we spit the debug message above (so we don't try to
         # print the binary contents of an image
-        payload['icon'] = icon
+        payload["icon"] = icon
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -313,12 +332,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             response = self.growl.notify(**payload)
             if not isinstance(response, bool):
                 self.logger.warning(
-                    'Growl notification failed to send with response: %s' %
-                    str(response),
+                    "Growl notification failed to send with response:"
+                    f" {response!s}",
                 )
 
             else:
-                self.logger.info('Sent Growl notification.')
+                self.logger.info("Sent Growl notification.")
 
         except gntp.errors.BaseError as e:
             # Since Growl servers listen for UDP broadcasts, it's possible
@@ -329,9 +348,10 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # However, if the host/server is unavailable, you will get to this
             # point of the code.
             self.logger.warning(
-                'A Connection error occurred sending Growl '
-                'notification to %s.' % self.host)
-            self.logger.debug('Growl Exception: %s' % str(e))
+                "A Connection error occurred sending Growl "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Growl Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -340,106 +360,115 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
+            self.user,
+            self.password,
+            self.host,
             self.port if self.port else self.default_port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'sticky': 'yes' if self.sticky else 'no',
-            'priority':
-                GROWL_PRIORITIES[self.template_args['priority']['default']]
+            "image": "yes" if self.include_image else "no",
+            "sticky": "yes" if self.sticky else "no",
+            "priority": (
+                GROWL_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in GROWL_PRIORITIES
-                else GROWL_PRIORITIES[self.priority],
-            'version': self.version,
+                else GROWL_PRIORITIES[self.priority]
+            ),
+            "version": self.version,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        auth = ''
+        auth = ""
         if self.user:
             # The growl password is stored in the user field
-            auth = '{password}@'.format(
+            auth = "{password}@".format(
                 password=self.pprint(
-                    self.user, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.user, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
 
-        return '{schema}://{auth}{hostname}{port}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == self.default_port
-                 else ':{}'.format(self.port),
+            port=(
+                ""
+                if self.port is None or self.port == self.default_port
+                else f":{self.port}"
+            ),
             params=NotifyGrowl.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         version = None
-        if 'version' in results['qsd'] and len(results['qsd']['version']):
+        if "version" in results["qsd"] and len(results["qsd"]["version"]):
             # Allow the user to specify the version of the protocol to use.
             try:
                 version = int(
-                    NotifyGrowl.unquote(
-                        results['qsd']['version']).strip().split('.')[0])
+                    NotifyGrowl.unquote(results["qsd"]["version"])
+                    .strip()
+                    .split(".")[0]
+                )
 
             except (AttributeError, IndexError, TypeError, ValueError):
                 NotifyGrowl.logger.warning(
-                    'An invalid Growl version of "%s" was specified and will '
-                    'be ignored.' % results['qsd']['version']
+                    'An invalid Growl version of "{}" was specified and will '
+                    "be ignored.".format(results["qsd"]["version"])
                 )
                 pass
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyGrowl.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyGrowl.unquote(
+                results["qsd"]["priority"]
+            )
 
         # Because of the URL formatting, the password is actually where the
         # username field is. For this reason, we just preform this small hack
         # to make it (the URL) conform correctly. The following strips out the
         # existing password entry (if exists) so that it can be swapped with
         # the new one we specify.
-        if results.get('password', None) is None:
-            results['password'] = results.get('user', None)
+        if results.get("password", None) is None:
+            results["password"] = results.get("user", None)
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image',
-                       NotifyGrowl.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyGrowl.template_args["image"]["default"]
+            )
+        )
 
         # Include images with our message
-        results['sticky'] = \
-            parse_bool(results['qsd'].get('sticky',
-                       NotifyGrowl.template_args['sticky']['default']))
+        results["sticky"] = parse_bool(
+            results["qsd"].get(
+                "sticky", NotifyGrowl.template_args["sticky"]["default"]
+            )
+        )
 
         # Set our version
         if version:
-            results['version'] = version
+            results["version"] = version
 
         return results
diff --git a/libs/apprise/plugins/guilded.py b/libs/apprise/plugins/guilded.py
index 29cd492bf5..d8aa896be8 100644
--- a/libs/apprise/plugins/guilded.py
+++ b/libs/apprise/plugins/guilded.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -45,30 +44,28 @@
 #
 
 import re
+
 # Import namespace so the class won't conflict with the actual Notify object
 from . import discord
 
 
 class NotifyGuilded(discord.NotifyDiscord):
-    """
-    A wrapper to Guilded Notifications
-
-    """
+    """A wrapper to Guilded Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Guilded'
+    service_name = "Guilded"
 
     # The services URL
-    service_url = 'https://guilded.gg/'
+    service_url = "https://guilded.gg/"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_guilded'
+    setup_url = "https://appriseit.com/services/guilded/"
 
     # The default secure protocol
-    secure_protocol = 'guilded'
+    secure_protocol = "guilded"
 
     # Guilded Webhook
-    notify_url = 'https://media.guilded.gg/webhooks'
+    notify_url = "https://media.guilded.gg/webhooks"
 
     @staticmethod
     def parse_native_url(url):
@@ -77,19 +74,27 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://(media\.)?guilded\.gg/webhooks/'
+            r"^https?://(media\.)?guilded\.gg/webhooks/"
             # a UUID, but we do we really need to be _that_ picky?
-            r'(?P<webhook_id>[-0-9a-f]+)/'
-            r'(?P<webhook_token>[A-Z0-9_-]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"(?P<webhook_id>[-0-9a-f]+)/"
+            r"(?P<webhook_token>[A-Z0-9_-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyGuilded.parse_url(
-                '{schema}://{webhook_id}/{webhook_token}/{params}'.format(
+                "{schema}://{webhook_id}/{webhook_token}/{params}".format(
                     schema=NotifyGuilded.secure_protocol,
-                    webhook_id=result.group('webhook_id'),
-                    webhook_token=result.group('webhook_token'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    webhook_id=result.group("webhook_id"),
+                    webhook_token=result.group("webhook_token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/home_assistant.py b/libs/apprise/plugins/home_assistant.py
index c580e04ed2..ed45bc8c32 100644
--- a/libs/apprise/plugins/home_assistant.py
+++ b/libs/apprise/plugins/home_assistant.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,98 +28,100 @@
 # You must generate a "Long-Lived Access Token". This can be done from your
 # Home Assistant Profile page.
 
-import requests
 from json import dumps
-
 from uuid import uuid4
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NotifyHomeAssistant(NotifyBase):
-    """
-    A wrapper for Home Assistant Notifications
-    """
+    """A wrapper for Home Assistant Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'HomeAssistant'
+    service_name = "HomeAssistant"
 
     # The services URL
-    service_url = 'https://www.home-assistant.io/'
+    service_url = "https://www.home-assistant.io/"
 
     # Insecure Protocol Access
-    protocol = 'hassio'
+    protocol = "hassio"
 
     # Secure Protocol
-    secure_protocol = 'hassios'
+    secure_protocol = "hassios"
 
     # Default to Home Assistant Default Insecure port of 8123 instead of 80
     default_insecure_port = 8123
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_homeassistant'
+    setup_url = "https://appriseit.com/services/homeassistant/"
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{accesstoken}',
-        '{schema}://{host}:{port}/{accesstoken}',
-        '{schema}://{user}@{host}/{accesstoken}',
-        '{schema}://{user}@{host}:{port}/{accesstoken}',
-        '{schema}://{user}:{password}@{host}/{accesstoken}',
-        '{schema}://{user}:{password}@{host}:{port}/{accesstoken}',
+        "{schema}://{host}/{accesstoken}",
+        "{schema}://{host}:{port}/{accesstoken}",
+        "{schema}://{user}@{host}/{accesstoken}",
+        "{schema}://{user}@{host}:{port}/{accesstoken}",
+        "{schema}://{user}:{password}@{host}/{accesstoken}",
+        "{schema}://{user}:{password}@{host}:{port}/{accesstoken}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "accesstoken": {
+                "name": _("Long-Lived Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
         },
-        'accesstoken': {
-            'name': _('Long-Lived Access Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'nid': {
-            # Optional Unique Notification ID
-            'name': _('Notification ID'),
-            'type': 'string',
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "nid": {
+                # Optional Unique Notification ID
+                "name": _("Notification ID"),
+                "type": "string",
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+            },
         },
-    })
+    )
 
     def __init__(self, accesstoken, nid=None, **kwargs):
-        """
-        Initialize Home Assistant Object
-        """
+        """Initialize Home Assistant Object."""
         super().__init__(**kwargs)
 
-        self.fullpath = kwargs.get('fullpath', '')
+        self.fullpath = kwargs.get("fullpath", "")
 
         if not (self.secure or self.port):
             # Use default insecure port
@@ -129,43 +130,44 @@ def __init__(self, accesstoken, nid=None, **kwargs):
         # Long-Lived Access token (generated from User Profile)
         self.accesstoken = validate_regex(accesstoken)
         if not self.accesstoken:
-            msg = 'An invalid Home Assistant Long-Lived Access Token ' \
-                  '({}) was specified.'.format(accesstoken)
+            msg = (
+                "An invalid Home Assistant Long-Lived Access Token "
+                f"({accesstoken}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # An Optional Notification Identifier
         self.nid = None
         if nid:
-            self.nid = validate_regex(
-                nid, *self.template_args['nid']['regex'])
+            self.nid = validate_regex(nid, *self.template_args["nid"]["regex"])
             if not self.nid:
-                msg = 'An invalid Home Assistant Notification Identifier ' \
-                      '({}) was specified.'.format(nid)
+                msg = (
+                    "An invalid Home Assistant Notification Identifier "
+                    f"({nid}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Sends Message
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Sends Message."""
 
         # Prepare our persistent_notification.create payload
         payload = {
-            'title': title,
-            'message': body,
+            "title": title,
+            "message": body,
             # Use a unique ID so we don't over-write the last message
             # we posted. Otherwise use the notification id specified
-            'notification_id': self.nid if self.nid else str(uuid4()),
+            "notification_id": self.nid if self.nid else str(uuid4()),
         }
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer {}'.format(self.accesstoken),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.accesstoken}",
         }
 
         auth = None
@@ -173,19 +175,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '{}://{}'.format(schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        url += self.fullpath.rstrip('/') + \
-            '/api/services/persistent_notification/create'
+        url += (
+            self.fullpath.rstrip("/")
+            + "/api/services/persistent_notification/create"
+        )
 
-        self.logger.debug('Home Assistant POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Home Assistant Payload: %s' % str(payload))
+        self.logger.debug(
+            "Home Assistant POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Home Assistant Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -201,30 +206,32 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyHomeAssistant.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyHomeAssistant.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Home Assistant notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Home Assistant notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Home Assistant notification.')
+                self.logger.info("Sent Home Assistant notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Home Assistant '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Home Assistant "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -233,71 +240,84 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
-            self.port if self.port else (
-                443 if self.secure else self.default_insecure_port),
-            self.fullpath.rstrip('/'),
+            self.user,
+            self.password,
+            self.host,
+            (
+                self.port
+                if self.port
+                else (443 if self.secure else self.default_insecure_port)
+            ),
+            self.fullpath.rstrip("/"),
             self.accesstoken,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
         if self.nid:
-            params['nid'] = self.nid
+            params["nid"] = self.nid
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyHomeAssistant.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyHomeAssistant.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyHomeAssistant.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyHomeAssistant.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else self.default_insecure_port
 
-        url = '{schema}://{auth}{hostname}{port}{fullpath}' \
-              '{accesstoken}/?{params}'
+        url = (
+            "{schema}://{auth}{hostname}{port}{fullpath}"
+            "{accesstoken}/?{params}"
+        )
 
         return url.format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if not self.port or self.port == default_port
-            else ':{}'.format(self.port),
-            fullpath='/' if not self.fullpath else '/{}/'.format(
-                NotifyHomeAssistant.quote(self.fullpath.strip('/'), safe='/')),
-            accesstoken=self.pprint(self.accesstoken, privacy, safe=''),
+            port=(
+                ""
+                if not self.port or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=(
+                "/"
+                if not self.fullpath
+                else "/{}/".format(
+                    NotifyHomeAssistant.quote(
+                        self.fullpath.strip("/"), safe="/"
+                    )
+                )
+            ),
+            accesstoken=self.pprint(self.accesstoken, privacy, safe=""),
             params=NotifyHomeAssistant.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -305,25 +325,26 @@ def parse_url(url):
             return results
 
         # Get our Long-Lived Access Token
-        if 'accesstoken' in results['qsd'] and \
-                len(results['qsd']['accesstoken']):
-            results['accesstoken'] = \
-                NotifyHomeAssistant.unquote(results['qsd']['accesstoken'])
+        if "accesstoken" in results["qsd"] and len(
+            results["qsd"]["accesstoken"]
+        ):
+            results["accesstoken"] = NotifyHomeAssistant.unquote(
+                results["qsd"]["accesstoken"]
+            )
 
         else:
             # Acquire our full path
-            fullpath = NotifyHomeAssistant.split_path(results['fullpath'])
+            fullpath = NotifyHomeAssistant.split_path(results["fullpath"])
 
             # Otherwise pop the last element from our path to be it
-            results['accesstoken'] = fullpath.pop() if fullpath else None
+            results["accesstoken"] = fullpath.pop() if fullpath else None
 
             # Re-assemble our full path
-            results['fullpath'] = '/' + '/'.join(fullpath) if fullpath else ''
+            results["fullpath"] = "/" + "/".join(fullpath) if fullpath else ""
 
         # Allow the specification of a unique notification_id so that
         # it will always replace the last one sent.
-        if 'nid' in results['qsd'] and len(results['qsd']['nid']):
-            results['nid'] = \
-                NotifyHomeAssistant.unquote(results['qsd']['nid'])
+        if "nid" in results["qsd"] and len(results["qsd"]["nid"]):
+            results["nid"] = NotifyHomeAssistant.unquote(results["qsd"]["nid"])
 
         return results
diff --git a/libs/apprise/plugins/httpsms.py b/libs/apprise/plugins/httpsms.py
index 9592580271..91a4c66103 100644
--- a/libs/apprise/plugins/httpsms.py
+++ b/libs/apprise/plugins/httpsms.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,33 +28,33 @@
 # To use this service you will need a httpSMS account
 # You will need credits (new accounts start with a few)
 #     https://httpsms.com
-import requests
 import json
-from .base import NotifyBase
+
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 
 class NotifyHttpSMS(NotifyBase):
-    """
-    A wrapper for HttpSMS Notifications
-    """
+    """A wrapper for HttpSMS Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'httpSMS'
+    service_name = "httpSMS"
 
     # The services URL
-    service_url = 'https://httpsms.com'
+    service_url = "https://httpsms.com"
 
     # All notification requests are secure
-    secure_protocol = 'httpsms'
+    secure_protocol = "httpsms"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_httpsms'
+    setup_url = "https://appriseit.com/services/httpsms/"
 
     # HttpSMS uses the http protocol with JSON requests
-    notify_url = 'https://api.httpsms.com/v1/messages/send'
+    notify_url = "https://api.httpsms.com/v1/messages/send"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -66,91 +65,96 @@ class NotifyHttpSMS(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}@{from_phone}',
-        '{schema}://{apikey}@{from_phone}/{targets}',
+        "{schema}://{apikey}@{from_phone}",
+        "{schema}://{apikey}@{from_phone}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-            'required': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'key': {
-            'alias_of': 'apikey',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "key": {
+                "alias_of": "apikey",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-    })
+    )
 
     def __init__(self, apikey=None, source=None, targets=None, **kwargs):
-        """
-        Initialize HttpSMS Object
-        """
-        super(NotifyHttpSMS, self).__init__(**kwargs)
+        """Initialize HttpSMS Object."""
+        super().__init__(**kwargs)
 
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid API Key ({}) was specified.'.format(apikey)
+            msg = f"An invalid API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         result = is_phone_no(source)
         if not result:
-            msg = 'The Account (From) Phone # specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = (
+                f"The Account (From) Phone # specified ({source}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Tidy source
-        self.source = result['full']
+        self.source = result["full"]
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         has_error = False
         for target in parse_phone_no(targets):
             # Parse each phone number we found
             result = is_phone_no(target)
             if result:
-                self.targets.append(result['full'])
+                self.targets.append(result["full"])
                 continue
 
             has_error = True
             self.logger.warning(
-                'Dropped invalid phone # ({}) specified.'.format(target),
+                f"Dropped invalid phone # ({target}) specified.",
             )
 
         if not targets and not has_error:
@@ -159,14 +163,12 @@ def __init__(self, apikey=None, source=None, targets=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform HttpSMS Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform HttpSMS Notification."""
 
         if not self.targets:
             # We have nothing to notify
-            self.logger.warning('There are no HttpSMS targets to notify')
+            self.logger.warning("There are no HttpSMS targets to notify")
             return False
 
         # error tracking (used for function return)
@@ -174,17 +176,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'x-api-key': self.apikey,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "x-api-key": self.apikey,
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
         payload = {
             # The To gets populated in the loop below
-            'from': '+' + self.source,
-            'to': None,
-            'content': body,
+            "from": "+" + self.source,
+            "to": None,
+            "content": body,
         }
 
         # Prepare our targets
@@ -194,12 +196,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our user
-            payload['to'] = '+' + target
+            payload["to"] = "+" + target
 
             # Some Debug Logging
-            self.logger.debug('HttpSMS POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('HttpSMS Payload: {}' .format(payload))
+            self.logger.debug(
+                "HttpSMS POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"HttpSMS Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -214,36 +218,39 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
 
                     self.logger.warning(
-                        'Failed to send HttpSMS notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send HttpSMS notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent HttpSMS notification to {}.'.format(target))
+                    self.logger.info(f"Sent HttpSMS notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending HttpSMS: to %s ',
-                    target)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending HttpSMS: to %s ",
+                    target,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -253,49 +260,45 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.source, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         # A nice way of cleaning up the URL length a bit
-        targets = [] if len(self.targets) == 1 \
-            and self.targets[0] == self.source else self.targets
-
-        return '{schema}://{apikey}@{source}/{targets}' \
-            '?{params}'.format(
-                schema=self.secure_protocol,
-                source=self.source,
-                apikey=self.pprint(self.apikey, privacy, safe=''),
-                targets='/'.join([
-                    NotifyHttpSMS.quote('{}'.format(x), safe='+')
-                    for x in targets]),
-                params=NotifyHttpSMS.urlencode(params))
+        targets = (
+            []
+            if len(self.targets) == 1 and self.targets[0] == self.source
+            else self.targets
+        )
+
+        return "{schema}://{apikey}@{source}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            source=self.source,
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                [NotifyHttpSMS.quote(f"{x}", safe="+") for x in targets]
+            ),
+            params=NotifyHttpSMS.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
 
         return len(self.targets) if self.targets else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -303,35 +306,35 @@ def parse_url(url):
             return results
 
         # Get our API Key
-        results['apikey'] = NotifyHttpSMS.unquote(results['user'])
+        results["apikey"] = NotifyHttpSMS.unquote(results["user"])
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyHttpSMS.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyHttpSMS.unquote(results["qsd"]["from"])
 
             # hostname will also be a target in this case
-            results['targets'] = [
-                *NotifyHttpSMS.parse_phone_no(results['host']),
-                *NotifyHttpSMS.split_path(results['fullpath'])]
+            results["targets"] = [
+                *NotifyHttpSMS.parse_phone_no(results["host"]),
+                *NotifyHttpSMS.split_path(results["fullpath"]),
+            ]
 
         else:
             # store our source
-            results['source'] = NotifyHttpSMS.unquote(results['host'])
+            results["source"] = NotifyHttpSMS.unquote(results["host"])
 
             # store targets
-            results['targets'] = NotifyHttpSMS.split_path(results['fullpath'])
+            results["targets"] = NotifyHttpSMS.split_path(results["fullpath"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyHttpSMS.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyHttpSMS.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
-            results['apikey'] = \
-                NotifyHttpSMS.unquote(results['qsd']['key'])
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
+            results["apikey"] = NotifyHttpSMS.unquote(results["qsd"]["key"])
 
         return results
diff --git a/libs/apprise/plugins/ifttt.py b/libs/apprise/plugins/ifttt.py
index e169fb39e7..940386a351 100644
--- a/libs/apprise/plugins/ifttt.py
+++ b/libs/apprise/plugins/ifttt.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -40,127 +39,128 @@
 #
 # For each event you create you will assign it a name (this will be known as
 # the {event} when building your URL.
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
 
 
 class NotifyIFTTT(NotifyBase):
-    """
-    A wrapper for IFTTT Notifications
-
-    """
+    """A wrapper for IFTTT Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'IFTTT'
+    service_name = "IFTTT"
 
     # The services URL
-    service_url = 'https://ifttt.com/'
+    service_url = "https://ifttt.com/"
 
     # The default protocol
-    secure_protocol = 'ifttt'
+    secure_protocol = "ifttt"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_ifttt'
+    setup_url = "https://appriseit.com/services/ifttt/"
 
     # Even though you'll add 'Ingredients' as {{ Value1 }} to your Applets,
     # you must use their lowercase value in the HTTP POST.
-    ifttt_default_key_prefix = 'value'
+    ifttt_default_key_prefix = "value"
 
     # The default IFTTT Key to use when mapping the title text to the IFTTT
     # event. The idea here is if someone wants to over-ride the default and
     # change it to another Ingredient Name (in 2018, you were limited to have
     # value1, value2, and value3).
-    ifttt_default_title_key = 'value1'
+    ifttt_default_title_key = "value1"
 
     # The default IFTTT Key to use when mapping the body text to the IFTTT
     # event. The idea here is if someone wants to over-ride the default and
     # change it to another Ingredient Name (in 2018, you were limited to have
     # value1, value2, and value3).
-    ifttt_default_body_key = 'value2'
+    ifttt_default_body_key = "value2"
 
     # The default IFTTT Key to use when mapping the body text to the IFTTT
     # event. The idea here is if someone wants to over-ride the default and
     # change it to another Ingredient Name (in 2018, you were limited to have
     # value1, value2, and value3).
-    ifttt_default_type_key = 'value3'
+    ifttt_default_type_key = "value3"
 
     # IFTTT uses the http protocol with JSON requests
-    notify_url = 'https://maker.ifttt.com/' \
-                 'trigger/{event}/with/key/{webhook_id}'
+    notify_url = (
+        "https://maker.ifttt.com/trigger/{event}/with/key/{webhook_id}"
+    )
 
     # Define object templates
-    templates = (
-        '{schema}://{webhook_id}/{events}',
-    )
+    templates = ("{schema}://{webhook_id}/{events}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'webhook_id': {
-            'name': _('Webhook ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'events': {
-            'name': _('Events'),
-            'type': 'list:string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "webhook_id": {
+                "name": _("Webhook ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "events": {
+                "name": _("Events"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'events',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "events",
+            },
         },
-    })
+    )
 
     # Define our token control
     template_kwargs = {
-        'add_tokens': {
-            'name': _('Add Tokens'),
-            'prefix': '+',
+        "add_tokens": {
+            "name": _("Add Tokens"),
+            "prefix": "+",
         },
-        'del_tokens': {
-            'name': _('Remove Tokens'),
-            'prefix': '-',
+        "del_tokens": {
+            "name": _("Remove Tokens"),
+            "prefix": "-",
         },
     }
 
-    def __init__(self, webhook_id, events, add_tokens=None, del_tokens=None,
-                 **kwargs):
-        """
-        Initialize IFTTT Object
+    def __init__(
+        self, webhook_id, events, add_tokens=None, del_tokens=None, **kwargs
+    ):
+        """Initialize IFTTT Object.
 
-        add_tokens can optionally be a dictionary of key/value pairs
-        that you want to include in the IFTTT post to the server.
-
-        del_tokens can optionally be a list/tuple/set of tokens
-        that you want to eliminate from the IFTTT post.  There isn't
-        much real functionality to this one unless you want to remove
-        reference to Value1, Value2, and/or Value3
+        add_tokens can optionally be a dictionary of key/value pairs that you
+        want to include in the IFTTT post to the server.
 
+        del_tokens can optionally be a list/tuple/set of tokens that you want
+        to eliminate from the IFTTT post.  There isn't much real functionality
+        to this one unless you want to remove reference to Value1, Value2,
+        and/or Value3
         """
         super().__init__(**kwargs)
 
         # Webhook ID (associated with project)
         self.webhook_id = validate_regex(webhook_id)
         if not self.webhook_id:
-            msg = 'An invalid IFTTT Webhook ID ' \
-                  '({}) was specified.'.format(webhook_id)
+            msg = f"An invalid IFTTT Webhook ID ({webhook_id}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our Events we wish to trigger
         self.events = parse_list(events)
         if not self.events:
-            msg = 'You must specify at least one event you wish to trigger on.'
+            msg = "You must specify at least one event you wish to trigger on."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -180,26 +180,26 @@ def __init__(self, webhook_id, events, add_tokens=None, del_tokens=None,
                 self.del_tokens = set(del_tokens.keys())
 
             else:
-                msg = 'del_token must be a list; {} was provided'.format(
-                    str(type(del_tokens)))
+                msg = (
+                    f"del_token must be a list; {type(del_tokens)!s} was"
+                    " provided"
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform IFTTT Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform IFTTT Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # prepare JSON Object
         payload = {
             self.ifttt_default_title_key: title,
             self.ifttt_default_body_key: body,
-            self.ifttt_default_type_key: notify_type,
+            self.ifttt_default_type_key: notify_type.value,
         }
 
         # Add any new tokens expected (this can also potentially override
@@ -208,8 +208,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Eliminate fields flagged for removal otherwise ensure all tokens are
         # lowercase since that is what the IFTTT server expects from us.
-        payload = {x.lower(): y for x, y in payload.items()
-                   if x not in self.del_tokens}
+        payload = {
+            x.lower(): y
+            for x, y in payload.items()
+            if x not in self.del_tokens
+        }
 
         # error tracking (used for function return)
         has_error = False
@@ -228,10 +231,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 event=event,
             )
 
-            self.logger.debug('IFTTT POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('IFTTT Payload: %s' % str(payload))
+            self.logger.debug(
+                "IFTTT POST URL:"
+                f" {url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"IFTTT Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -245,40 +249,42 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     timeout=self.request_timeout,
                 )
                 self.logger.debug(
-                    u"IFTTT HTTP response headers: %r" % r.headers)
-                self.logger.debug(
-                    u"IFTTT HTTP response body: %r" % r.content)
+                    f"IFTTT HTTP response headers: {r.headers!r}"
+                )
+                self.logger.debug(f"IFTTT HTTP response body: {r.content!r}")
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyIFTTT.http_response_code_lookup(r.status_code)
+                    status_str = NotifyIFTTT.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send IFTTT notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send IFTTT notification to {}: "
+                        "{}{}error={}.".format(
                             event,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent IFTTT notification to %s.' % event)
+                    self.logger.info(f"Sent IFTTT notification to {event}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending IFTTT:%s ' % (
-                        event) + 'notification.'
+                    f"A Connection error occurred sending IFTTT:{event} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -288,76 +294,70 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.webhook_id)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         # Store any new key/value pairs added to our list
-        params.update({'+{}'.format(k): v for k, v in self.add_tokens})
-        params.update({'-{}'.format(k): '' for k in self.del_tokens})
+        params.update({f"+{k}": v for k, v in self.add_tokens})
+        params.update({f"-{k}": "" for k in self.del_tokens})
 
-        return '{schema}://{webhook_id}@{events}/?{params}'.format(
+        return "{schema}://{webhook_id}@{events}/?{params}".format(
             schema=self.secure_protocol,
-            webhook_id=self.pprint(self.webhook_id, privacy, safe=''),
-            events='/'.join([NotifyIFTTT.quote(x, safe='')
-                             for x in self.events]),
+            webhook_id=self.pprint(self.webhook_id, privacy, safe=""),
+            events="/".join(
+                [NotifyIFTTT.quote(x, safe="") for x in self.events]
+            ),
             params=NotifyIFTTT.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.events)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Our API Key is the hostname if no user is specified
-        results['webhook_id'] = \
-            results['user'] if results['user'] else results['host']
+        results["webhook_id"] = (
+            results["user"] if results["user"] else results["host"]
+        )
 
         # Unquote our API Key
-        results['webhook_id'] = NotifyIFTTT.unquote(results['webhook_id'])
+        results["webhook_id"] = NotifyIFTTT.unquote(results["webhook_id"])
 
         # Parse our add_token and del_token arguments (if specified)
-        results['add_token'] = results['qsd+']
-        results['del_token'] = results['qsd-']
+        results["add_token"] = results["qsd+"]
+        results["del_token"] = results["qsd-"]
 
         # Our Event
-        results['events'] = list()
-        if results['user']:
+        results["events"] = []
+        if results["user"]:
             # If a user was defined, then the hostname is actually a event
             # too
-            results['events'].append(NotifyIFTTT.unquote(results['host']))
+            results["events"].append(NotifyIFTTT.unquote(results["host"]))
 
         # Now fetch the remaining tokens
-        results['events'].extend(NotifyIFTTT.split_path(results['fullpath']))
+        results["events"].extend(NotifyIFTTT.split_path(results["fullpath"]))
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['events'] += \
-                NotifyIFTTT.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["events"] += NotifyIFTTT.parse_list(results["qsd"]["to"])
 
         return results
 
@@ -368,19 +368,30 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://maker\.ifttt\.com/use/'
-            r'(?P<webhook_id>[A-Z0-9_-]+)'
-            r'((?P<events>(/[A-Z0-9_-]+)+))?'
-            r'/?(?P<params>\?.+)?$', url, re.I)
+            r"^https?://maker\.ifttt\.com/use/"
+            r"(?P<webhook_id>[A-Z0-9_-]+)"
+            r"((?P<events>(/[A-Z0-9_-]+)+))?"
+            r"/?(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyIFTTT.parse_url(
-                '{schema}://{webhook_id}{events}{params}'.format(
+                "{schema}://{webhook_id}{events}{params}".format(
                     schema=NotifyIFTTT.secure_protocol,
-                    webhook_id=result.group('webhook_id'),
-                    events='' if not result.group('events')
-                    else '@{}'.format(result.group('events')),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    webhook_id=result.group("webhook_id"),
+                    events=(
+                        ""
+                        if not result.group("events")
+                        else "@{}".format(result.group("events"))
+                    ),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/irc/__init__.py b/libs/apprise/plugins/irc/__init__.py
new file mode 100644
index 0000000000..8a599aa647
--- /dev/null
+++ b/libs/apprise/plugins/irc/__init__.py
@@ -0,0 +1,34 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""IRC Notifications."""
+
+from .base import NotifyIRC
+
+__all__ = [
+    "NotifyIRC",
+]
diff --git a/libs/apprise/plugins/irc/base.py b/libs/apprise/plugins/irc/base.py
new file mode 100644
index 0000000000..0fee6da729
--- /dev/null
+++ b/libs/apprise/plugins/irc/base.py
@@ -0,0 +1,494 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""IRC Notifications.
+
+This is simplified IRC client designed for notification delivery.
+It focuses on reliability and predictable behaviour, not full IRC features.
+
+URL formats (examples):
+  - irc://hostname/#channel/@user
+  - irc://user@hostname/#channel
+  - irc://user:password@hostname/#channel
+  - ircs://hostname/#channel  (TLS, default port 6697)
+
+Targets:
+  - Channels are specified as #channel
+  - Users are specified as @nickname
+"""
+
+from __future__ import annotations
+
+from itertools import chain
+import re
+from typing import Any, Optional
+
+from ...common import NotifyType
+from ...locale import gettext_lazy as _
+from ...url import PrivacyMode
+from ...utils.parse import parse_bool, parse_list
+from ...utils.socket import AppriseSocketError
+from ..base import NotifyBase
+from . import templates
+from .client import IRCClient
+from .protocol import IRC_AUTH_MODES, IRCAuthMode, normalise_channel
+
+IS_USER = re.compile(r"^\s*(@|%40)?(?P<user>[^ \t\r\n@#]+)$", re.I)
+
+IS_CHANNEL = re.compile(
+    r"^\s*(#|%23)"
+    r"(?P<channel>[^ \t\r\n@#:]+)"
+    r"(?::(?P<key>[^ \t\r\n]+))?\s*$",
+    re.I,
+)
+
+
+class NotifyIRC(NotifyBase):
+    """A wrapper to IRC servers using TCP or TLS."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "IRC"
+
+    # The services URL
+    service_url = "https://ircv3.net/"
+
+    # The default insecure protocol
+    protocol = "irc"
+
+    # The default secure protocol
+    secure_protocol = "ircs"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/irc/"
+
+    # RFC 2812 maximum IRC message length is 512 bytes including CRLF.
+    # Keep a conservative payload budget to accommodate prefix overhead.
+    body_maxlen = 380
+
+    # IRC is not fast... there is a lot of handshaking that takes place
+    # between us and the remote server. During development of this plugin
+    # it took on average 18-22s to register with #EFnet; setting the value
+    # to 30.0s to be conservative with others as their mileage may vary
+    irc_register_timeout = 30.0
+
+    # Avoid flooding
+    request_rate_per_sec = 0.02
+
+    # Title is prepended to body
+    title_maxlen = 0
+
+    templates = (
+        "{schema}://{host}/{targets}",
+        "{schema}://{host}:{port}/{targets}",
+        "{schema}://{user}@{host}/{targets}",
+        "{schema}://{user}@{host}:{port}/{targets}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
+    )
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("User"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+        },
+    )
+
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {"alias_of": "targets"},
+            "name": {"name": _("Real Name"), "type": "string"},
+            "nick": {"name": _("Nickname"), "type": "string"},
+            "join": {
+                "name": _("Join Channels"),
+                "type": "bool",
+                "default": True,
+            },
+            "mode": {
+                "name": _("Auth Mode"),
+                "type": "choice:string",
+                "values": IRC_AUTH_MODES,
+                "default": IRCAuthMode.SERVER,
+            },
+        },
+    )
+
+    def __init__(
+        self,
+        targets: Optional[list[str]] = None,
+        name: Optional[str] = None,
+        join: Optional[bool] = None,
+        nick: Optional[str] = None,
+        mode: Optional[str] = None,
+        **kwargs: Any,
+    ) -> None:
+
+        super().__init__(**kwargs)
+
+        # Join Channel
+        self.join = (
+            parse_bool(join, self.template_args["join"]["default"])
+            if join is not None
+            else self.template_args["join"]["default"]
+        )
+
+        self.nickname = (nick or "").strip() or (self.user or "").strip()
+
+        # Initialized value (as it is used in apply_irc_defaults())
+        self.auth_mode = self.template_args["mode"]["default"]
+
+        # Apply template defaults only where the user did not supply values
+        self.apply_irc_defaults(**kwargs)
+
+        if isinstance(mode, str) and mode.strip():
+            self.auth_mode = mode.strip().lower()
+            self.auth_mode = next(
+                (a for a in IRC_AUTH_MODES
+                 if a.startswith(self.auth_mode)), None
+            )
+            if self.auth_mode not in IRC_AUTH_MODES:
+                msg = f"The IRC auth mode specified ({mode}) is invalid."
+                self.logger.warning(msg)
+                raise TypeError(msg)
+
+        self.fullname = (name or "").strip()
+
+        # For storing our channels and users to message
+        self.channels: dict[str, Optional[str]] = {}
+        self.users: list[str] = []
+
+        # Set our timeouts
+        srt = float(self.socket_read_timeout or 0.0)
+        self.join_timeout = max(6.0, min(12.0, srt or 6.0))
+        self.send_timeout = max(4.0, min(10.0, srt or 4.0))
+
+        # Identify our targets
+        self.targets = []
+        for target in parse_list(targets):
+            match = IS_CHANNEL.match(target)
+            if match:
+                channel = match.group("channel")
+                key = match.group("key")
+                self.channels[channel] = key
+                continue
+
+            match = IS_USER.match(target)
+            if match:
+                self.users.append(match.group("user"))
+                continue
+
+            self.logger.warning("Dropped invalid IRC target (%s).", target)
+
+    def apply_irc_defaults(self, port=None, **kwargs):
+        """
+        A function that prefills defaults based on the irc details
+        provided.
+        """
+        if self.port:
+            # IRC port was explicitly specified, therefore it is assumed
+            # the caller knows what they're doing and is intentionally
+            # overriding any smart defaults that might otherwise be applied.
+            return
+
+        for i in range(len(templates.IRC_TEMPLATES)):  # pragma: no branch
+            self.logger.trace(
+                "Scanning %s against %s",
+                self.host, templates.IRC_TEMPLATES[i][0])
+
+            match = templates.IRC_TEMPLATES[i][1].match(self.host)
+            if match:
+                self.logger.info(
+                    f"Applying {templates.IRC_TEMPLATES[i][0]} Defaults")
+
+                # the secure flag can not be altered if defined in the template
+                self.secure = templates.IRC_TEMPLATES[i][2].get(
+                    "secure", self.secure,
+                )
+
+                # store default port
+                self.port = templates.IRC_TEMPLATES[i][2].get(
+                    "port", self.port,
+                )
+
+                self.auth_mode = templates.IRC_TEMPLATES[i][2].get(
+                    "mode", self.auth_mode,
+                )
+                break
+
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        attach: Any = None,
+        **kwargs: Any,
+    ) -> bool:
+        """Send a notification to IRC targets."""
+
+        if not (self.channels or self.users):
+            self.logger.warning("No IRC targets specified.")
+            return False
+
+        # prepare ourselves a nickname
+        nickname = self.nickname or IRCClient.nick_generation(
+            prefix=self.app_id,
+        )
+
+        self.throttle()
+
+        client = IRCClient(
+            host=self.host,
+            nickname=nickname,
+            fullname=self.fullname or self.app_desc,
+            port=self.port,
+            secure=self.secure,
+            verify=self.verify_certificate,
+            timeout=self.socket_read_timeout,
+            # In ZNC mode, authentication is performed against the bouncer
+            # itself. ZNC configurations expect the PASS line to include the
+            # username.
+            password=self.password if self.auth_mode != IRCAuthMode.ZNC
+            else f"{self.user}:{self.password}",
+            auth_mode=self.auth_mode,
+            nick_generator=IRCClient.nick_generation,
+        )
+
+        try:
+            client.connect()
+            client.register(
+                timeout=self.irc_register_timeout,
+                prefix=self.app_id,
+            )
+
+            # ZNC operates as a bouncer, so perform a quick sanity check that
+            # the connection is alive before issuing commands.
+            if self.auth_mode == IRCAuthMode.ZNC \
+                    and not client.check_connection(
+                    timeout=min(5.0, float(self.send_timeout or 5.0))):
+                raise AppriseSocketError("ZNC connection check failed")
+
+            message = body if not title else f"{title} {body}".strip()
+
+            for c, key in self.channels.items():
+                chan = normalise_channel(c)
+                if self.join or key:
+                    client.join(
+                        channel=chan,
+                        key=key,
+                        timeout=self.join_timeout,
+                        prefix=self.app_id,
+                    )
+
+                client.privmsg(
+                    target=chan,
+                    message=message,
+                    timeout=self.send_timeout,
+                )
+                self.logger.info(
+                    "Sent IRC notification to #%s as @%s",
+                    c,
+                    client.nickname,
+                )
+
+            for u in self.users:
+                target = u.lstrip("@")
+                client.privmsg(
+                    target=target,
+                    message=message,
+                    timeout=self.send_timeout,
+                )
+                self.logger.info(
+                    "Sent IRC notification to @%s as @%s",
+                    u,
+                    client.nickname,
+                )
+
+            client.quit(message=self.app_desc, timeout=self.send_timeout)
+            return True
+
+        except (AppriseSocketError, OSError, TimeoutError) as e:
+            self.logger.warning(
+                "Failed to send IRC notification to %s as @%s.",
+                self.host,
+                nickname,
+            )
+            self.logger.debug("IRC Exception: %s", e)
+            return False
+
+        finally:
+            client.close()
+
+    @property
+    def url_identifier(
+            self) -> tuple[str, Optional[str], Optional[str], Optional[str]]:
+        """Return the pieces that uniquely identify this configuration."""
+        return (
+            self.secure_protocol if self.secure else self.protocol,
+            self.host,
+            self.user,
+            self.password,
+        )
+
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Return the URL representation of this notification."""
+        params: dict[str, Any] = {
+            "verify": self.verify_certificate,
+            "join": self.join,
+        }
+
+        if self.auth_mode and self.auth_mode != IRCAuthMode.SERVER:
+            params["mode"] = self.auth_mode
+
+        if self.fullname:
+            params["name"] = self.fullname
+
+        if self.nickname and self.nickname != (self.user or ""):
+            params["nick"] = self.nickname
+
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        auth = ""
+        if self.user and self.password:
+            auth = "{user}:{password}@".format(
+                user=self.quote(self.user, safe=""),
+                password=self.pprint(
+                    self.password,
+                    privacy,
+                    mode=PrivacyMode.Secret,
+                    safe="",
+                ),
+            )
+        elif self.user:
+            auth = "{user}@".format(user=self.quote(self.user, safe=""))
+
+        default_port = IRCClient.default_secure_port \
+            if self.secure else IRCClient.default_insecure_port
+
+        port = self.port if isinstance(self.port, int) else (
+            IRCClient.default_secure_port
+            if self.secure else IRCClient.default_insecure_port
+        )
+
+        port = "" if port == default_port else f":{port}"
+
+        schema = self.secure_protocol if self.secure else self.protocol
+        return "{schema}://{auth}{host}{port}/{targets}?{params}".format(
+            schema=schema,
+            auth=auth,
+            host=self.host,
+            port=port,
+            targets="/".join(chain(
+                [self.quote(f"#{c}" if not k else "#{}:{}".format(
+                    c,
+                    self.pprint(
+                        k,
+                        privacy,
+                        mode=PrivacyMode.Secret,
+                        safe="")),
+                    safe="#") for c, k in self.channels.items()],
+                [self.quote(f"@{u}", safe="@")
+                 for u in self.users],
+            )),
+            params=self.urlencode(params),
+        )
+
+    @staticmethod
+    def parse_url(url: str) -> Optional[dict[str, Any]]:
+        """Parse an IRC URL into constructor arguments."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            return None
+
+        results["targets"] = []
+
+        if "host" in results["qsd"] and len(results["qsd"]["host"]):
+            # a host was defined which means the first entry is actually one
+            # of our targets
+            results["targets"].append(NotifyIRC.unquote(results["host"]))
+
+        # Store remaining targets
+        results["targets"].extend(NotifyIRC.split_path(results["fullpath"]))
+
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyIRC.parse_list(
+                NotifyIRC.unquote(results["qsd"]["to"])
+            )
+
+        # Get Join Channel Flag
+        results["join"] = parse_bool(
+            results["qsd"].get(
+                "join", NotifyIRC.template_args["join"]["default"]
+            )
+        )
+
+        # Get our IRC Name
+        if "name" in results["qsd"] and len(results["qsd"]["name"]):
+            results["name"] = NotifyIRC.unquote(results["qsd"]["name"])
+
+        if "nick" in results["qsd"] and len(results["qsd"]["nick"]):
+            results["nick"] = NotifyIRC.unquote(results["qsd"]["nick"])
+
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            results["mode"] = NotifyIRC.unquote(results["qsd"]["mode"])
+
+        return results
diff --git a/libs/apprise/plugins/irc/client.py b/libs/apprise/plugins/irc/client.py
new file mode 100644
index 0000000000..f00a08ed4e
--- /dev/null
+++ b/libs/apprise/plugins/irc/client.py
@@ -0,0 +1,362 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""A minimal IRC client for notification delivery."""
+
+from __future__ import annotations
+
+from collections import deque
+import logging
+import random
+import string
+import time
+from typing import Callable, Optional, Union
+
+from ...logger import logger
+from ...utils.socket import AppriseSocketError, SocketTransport
+from .protocol import (
+    IRCAuthMode,
+    is_ping,
+    normalise_channel,
+    parse_irc_line,
+    ping_payload,
+)
+from .state import IRCActionKind, IRCContext, IRCStateMachine
+
+NickGenerator = Callable[[str, int, int], str]
+
+
+class IRCClient:
+    """Socket-driven IRC Client."""
+
+    # IRC Default Ports
+    default_insecure_port = 6667
+    default_secure_port = 6697
+
+    # When we're blocking and awaiting the server, we increase the
+    # frequency to poll for an update.
+    pump_interval = 0.75
+
+    # EFNet only allows nicknames to be 9 characters, default to that.
+    nickname_max_length = 9
+
+    # How many times we retry on 432/433 before failing.
+    nickname_collision_max = 3
+
+    def __init__(
+        self,
+        host: str,
+        nickname: str,
+        fullname: str,
+        port: Optional[int] = None,
+        secure: bool = False,
+        verify: bool = True,
+        timeout: Optional[float] = None,
+        password: Optional[str] = None,
+        auth_mode: str = IRCAuthMode.SERVER,
+        nick_generator: Optional[NickGenerator] = None,
+        nick_length: Optional[int] = None,
+    ) -> None:
+
+        # Detect port if not set
+        port = port if port is not None else (
+            self.default_secure_port
+            if secure else self.default_insecure_port
+        )
+
+        self.transport = SocketTransport(
+            host,
+            port,
+            secure=secure,
+            verify=verify,
+            timeout=timeout,
+        )
+
+        self._nick_generator = nick_generator
+        self._nick_length = (
+            int(nick_length)
+            if nick_length else int(self.nickname_max_length)
+        )
+        self._nick_collision = 0
+
+        self.auth_mode = auth_mode
+
+        ctx = IRCContext(
+            desired_nick=nickname,
+            accepted_nick=nickname,
+            fullname=fullname,
+            password=password,
+        )
+        self.sm = IRCStateMachine(ctx)
+        self._out_queue = deque()  # type: Deque[bytes]
+        self._inbuf = bytearray()
+
+    @property
+    def nickname(self) -> str:
+        """Returns the accepted nickname."""
+        return self.sm.ctx.accepted_nick
+
+    def connect(self) -> None:
+        self.transport.connect()
+
+    def close(self) -> None:
+        self.transport.close()
+
+    def _queue(self, line: str) -> None:
+        """
+        Queues message for outbound delivery to the IRC Server
+        """
+        payload = (line + "\r\n").encode("utf-8", errors="replace")
+        self._out_queue.append(payload)
+
+    def _write(self, line: Union[str, bytes], deadline: float) -> None:
+        """Write content directly to IRC."""
+        remaining = max(0.0, deadline - time.monotonic())
+        if remaining <= 0.0:
+            raise TimeoutError("timeout while writing IRC commands")
+
+        payload = (line + "\r\n").encode("utf-8", errors="replace") \
+            if isinstance(line, str) else line
+        self.transport.write(payload, flush=True, timeout=remaining)
+        if logger.isEnabledFor(logging.TRACE):
+            logger.trace(
+                "IRC write: %s", payload.rstrip(b"\r")
+                .decode("utf-8", errors="replace").rstrip())
+
+    def _flush(self, deadline: float) -> None:
+        """Flush all queued information to the IRC server."""
+        while self._out_queue:
+            self._write(self._out_queue[0], deadline=deadline)
+            self._out_queue.popleft()
+
+    def _read(self, deadline: float) -> Optional[str]:
+        """
+        Read incoming content from IRC Server
+        """
+        while True:
+            if b"\n" in self._inbuf:
+                line, _, rest = self._inbuf.partition(b"\n")
+                self._inbuf = bytearray(rest)
+                response = line.rstrip(b"\r").decode("utf-8", errors="replace")
+                logger.trace("IRC read: %s", response)
+                return response
+
+            remaining = max(0.0, deadline - time.monotonic())
+            if remaining <= 0.0:
+                logger.trace(
+                    "IRC read timeout - deadline=%.2fs", deadline)
+                return None
+
+            chunk = self.transport.read(4096, blocking=True, timeout=remaining)
+            if not chunk:
+                return None
+            self._inbuf.extend(chunk)
+
+    def _nickname_collision_handler(self, prefix: str) -> str:
+        if not self._nick_generator:
+            raise AppriseSocketError("Nickname collision and no generator")
+
+        if self._nick_collision >= int(self.nickname_collision_max):
+            raise AppriseSocketError("Nickname is already in use")
+
+        self._nick_collision += 1
+        self.sm.ctx.desired_nick = self._nick_generator(
+            prefix,
+            self._nick_length,
+            self._nick_collision,
+        )
+        return self.sm.ctx.desired_nick
+
+    def _tick(self, deadline: float) -> float:
+        remaining = max(0.0, deadline - time.monotonic())
+        if remaining <= 0.0:
+            return deadline
+        return time.monotonic() + min(self.pump_interval, remaining)
+
+    def _handshake(self, deadline: float, prefix: str) -> None:
+        while True:
+            line = self._read(deadline=deadline)
+            if not line:
+                # We've completed
+                return
+
+            msg = parse_irc_line(line)  # type: IRCMessage
+
+            if is_ping(msg):
+                self._write(f"PONG :{ping_payload(msg)}", deadline=deadline)
+                continue
+
+            if msg.numeric in (432, 433):
+                new_nick = self._nickname_collision_handler(prefix)
+                # Send immediately, do not queue.
+                self._write("NICK {}".format(new_nick), deadline=deadline)
+                continue
+
+            for act in self.sm.on_message(msg):
+                if act.kind == IRCActionKind.FAIL and act.reason:
+                    raise AppriseSocketError(act.reason)
+                if act.kind == IRCActionKind.SEND and act.line:
+                    self._write(act.line, deadline=deadline)
+
+    def register(self, timeout: float, prefix: str) -> None:
+        """Register with the IRC server, and optionally NickServ identify.
+
+        - SERVER mode: sends PASS during registration (if password provided)
+        - NICKSERV mode: does not send PASS, performs NickServ IDENTIFY after
+          registration completes
+        - NONE mode: no authentication is performed
+        """
+        tl_start = time.time()
+        deadline = time.monotonic() + float(timeout)
+
+        # PASS during registration is only used for SERVER and ZNC.
+        if self.auth_mode not in (IRCAuthMode.SERVER, IRCAuthMode.ZNC):
+            self.sm.ctx.password = None
+
+        logger.trace("IRC registration started")
+        for act in self.sm.start_registration():
+            if act.kind == IRCActionKind.SEND and act.line:
+                self._queue(act.line)
+
+        while time.monotonic() < deadline and not self.sm.ctx.registered:
+            self._flush(deadline)
+            self._handshake(self._tick(deadline), prefix=prefix)
+
+        if not self.sm.ctx.registered:
+            logger.trace(
+                "IRC registration timeout - %.6fs elapsed",
+                time.time() - tl_start,
+            )
+            raise TimeoutError("IRC registration timeout")
+
+        logger.trace(
+            "IRC registration completed in %.6fs",
+            time.time() - tl_start,
+        )
+
+        # NickServ identify is only performed after we are registered, and only
+        # when explicitly requested via auth_mode.
+        if self.auth_mode == IRCAuthMode.NICKSERV:
+            self.identify(timeout=timeout)
+
+    def check_connection(self, timeout: float) -> bool:
+        """Verify we can talk to the server by completing a PING/PONG."""
+        deadline = time.monotonic() + float(timeout)
+        token = "apprise"
+
+        # Send a ping and wait until we observe a PONG carrying our token.
+        self._write(f"PING :{token}", deadline=deadline)
+
+        while time.monotonic() < deadline:
+            line = self._read(deadline=deadline)
+            if not line:
+                continue
+
+            msg = parse_irc_line(line)
+            if msg.command.upper() == "PONG":
+                # Some IRC servers/bouncers do not echo our token back
+                # reliably. Observing any PONG after issuing our PING is
+                # sufficient.
+                return True
+
+        return False
+
+    def join(
+        self,
+        channel: str,
+        timeout: float,
+        prefix: str,
+        key: Optional[str] = None,
+    ) -> None:
+
+        chan = normalise_channel(channel)
+        if chan in self.sm.ctx.joined:
+            # Nothing to do, we are already there.
+            return
+        deadline = time.monotonic() + float(timeout)
+
+        for act in self.sm.request_join(chan, key=key):
+            if act.kind == IRCActionKind.SEND and act.line:
+                self._queue(act.line)
+
+        while time.monotonic() < deadline and chan not in self.sm.ctx.joined:
+            self._flush(deadline)
+            self._handshake(self._tick(deadline), prefix=prefix)
+
+        if chan not in self.sm.ctx.joined:
+            logger.debug("IRC join confirmation not observed for %s", chan)
+
+    def privmsg(self, target: str, message: str, timeout: float) -> None:
+        """Handle the sending of private messages."""
+        deadline = time.monotonic() + float(timeout)
+        self._queue(f"PRIVMSG {target} :{message}")
+        self._flush(deadline)
+        self._handshake(self._tick(deadline), prefix="")
+
+    def identify(self, timeout: float) -> None:
+        """Identify with NickServ after registration."""
+        if not self.sm.ctx.password:
+            return
+
+        if self.auth_mode != IRCAuthMode.NICKSERV:
+            return
+
+        deadline = time.monotonic() + float(timeout)
+        self._queue(
+            "PRIVMSG NickServ :IDENTIFY {}".format(
+                self.sm.ctx.password
+            )
+        )
+        self._flush(deadline)
+        self._handshake(
+            self._tick(deadline),
+            prefix="",
+        )
+
+    def quit(self, message: str, timeout: float) -> None:
+        deadline = time.monotonic() + float(timeout)
+        for act in self.sm.request_quit(message):
+            if act.kind == IRCActionKind.SEND and act.line:
+                self._queue(act.line)
+        self._flush(deadline)
+
+    @staticmethod
+    def nick_generation(
+            prefix: str, length: Optional[int] = None,
+            collision: int = 0) -> str:
+        """Generate a nickname suitable for retry after collision."""
+        if length is None:
+            # Default Assignment
+            length = IRCClient.nickname_max_length
+
+        base = "{}".format(prefix)[:length - 3].strip().lower()
+        charset = string.ascii_lowercase + string.digits + "_"
+        suffix = "".join(random.choice(charset) for _ in range(max(1, length)))
+        nick = "{}{}".format(base, suffix)
+        if collision:
+            nick = "{}{}".format(nick[: max(0, length - 1)], collision % 10)
+        return nick[:length]
diff --git a/libs/apprise/plugins/irc/protocol.py b/libs/apprise/plugins/irc/protocol.py
new file mode 100644
index 0000000000..f12fc44820
--- /dev/null
+++ b/libs/apprise/plugins/irc/protocol.py
@@ -0,0 +1,203 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""IRC protocol parsing helpers.
+
+This module contains *pure* helpers used by the IRC client/state machine.
+
+Design goals:
+- Be conservative: parse only what we need for reliability.
+- Avoid RFC rabbit holes: implement RFC 1459-ish behaviour for numerics,
+  PING/PONG, JOIN detection, and channel normalisation.
+- Keep parsing side-effect free: no state mutations happen here.
+
+Terminology refresher (IRC line shape, simplified):
+    [":" <prefix> <SPACE>] <command> <params> [":" <trailing>]
+
+Examples:
+    :server.example 001 nick :Welcome to the network
+    PING :123456
+    :nick!user@host JOIN :#channel
+    :server 366 nick #channel :End of /NAMES list.
+"""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from ...compat import dataclass_compat as dataclass
+
+
+class IRCAuthMode:
+    """IRC authentication mode.
+
+    The IRC plugin uses a small set of authentication strategies, selected
+    by URL parsing logic. These values are treated as constants and are used
+    by the client (connection setup) rather than by the parsing/state code.
+
+    NONE
+        No authentication.
+    SERVER
+        Use PASS <password> during registration.
+    NICKSERV
+        Authenticate after registration via NickServ IDENTIFY.
+    ZNC
+        Connect to a ZNC bouncer and presume registration is already handled.
+        In this mode, the client generally avoids emitting registration flows.
+    """
+
+    # No authentication
+    NONE = "none"
+
+    # PASS <password> during registration
+    SERVER = "server"
+
+    # NickServ IDENTIFY after registration
+    NICKSERV = "nickserv"
+
+    # ZNC bouncer mode - connects to bouncer only - presumes registration
+    ZNC = "znc"
+
+
+IRC_AUTH_MODES = (
+    IRCAuthMode.ZNC,
+    IRCAuthMode.SERVER,
+    IRCAuthMode.NICKSERV,
+    IRCAuthMode.NONE,
+)
+
+
+@dataclass(frozen=True, slots=True)
+class IRCMessage:
+    """A parsed IRC line.
+
+    raw
+        The line as received (minus CRLF).
+    prefix
+        Optional prefix (nick/server). Examples:
+            server.example
+            nick!user@host
+    command
+        The IRC command, for example: PRIVMSG, JOIN, PING, or a numeric string.
+    params
+        A tuple of middle parameters (space separated).
+    trailing
+        The trailing parameter (after ' :'), which may contain spaces.
+
+    Notes on numerics:
+        Numeric replies are three digits as a string. This helper provides
+        a .numeric property that returns an int, or None when not numeric.
+    """
+
+    raw: str
+    prefix: Optional[str]
+    command: str
+    params: tuple[str, ...]
+    trailing: Optional[str]
+
+    @property
+    def numeric(self) -> Optional[int]:
+        """Return numeric reply code as int when command is a 3-digit
+        string."""
+        if self.command.isdigit() and len(self.command) == 3:
+            return int(self.command)
+        return None
+
+
+def parse_irc_line(line: str) -> IRCMessage:
+    """Parse an IRC line into its components.
+
+    This is intentionally tolerant and small, but sufficient for:
+    - detecting PINGs (command == 'PING')
+    - reading common numeric replies (001, 376/422, 366, error codes)
+    - identifying JOIN completion
+    - extracting the welcome nick from 001
+
+    The parser follows the usual IRC split rules:
+    - prefix is optional and begins with ':' at the start of the line
+    - trailing is optional and begins with ' :' and consumes the remainder
+    - params are any remaining space-delimited tokens after command
+    """
+    raw = line.rstrip("\r\n")
+    prefix: Optional[str] = None
+    trailing: Optional[str] = None
+
+    s = raw
+
+    # Prefix is only present at the beginning of the message.
+    if s.startswith(":"):
+        parts = s[1:].split(" ", 1)
+        prefix = parts[0] if parts else None
+        s = parts[1] if len(parts) > 1 else ""
+
+    # Trailing is indicated by " :"; it may contain spaces and consumes the
+    # rest.
+    if " :" in s:
+        before, after = s.split(" :", 1)
+        trailing = after
+        s = before
+
+    s = s.strip()
+    if not s:
+        return IRCMessage(
+            raw=raw, prefix=prefix, command="", params=(), trailing=trailing)
+
+    bits = s.split()
+    command = bits[0]
+    params = tuple(bits[1:]) if len(bits) > 1 else ()
+    return IRCMessage(
+        raw=raw, prefix=prefix, command=command, params=params,
+        trailing=trailing)
+
+
+def is_ping(msg: IRCMessage) -> bool:
+    """True when message is a PING request."""
+    return msg.command.upper() == "PING"
+
+
+def ping_payload(msg: IRCMessage) -> str:
+    """Extract the payload to use when responding to a PING."""
+    if msg.trailing is not None:
+        return msg.trailing
+    return msg.params[0] if msg.params else ""
+
+
+def extract_welcome_nick(msg: IRCMessage) -> Optional[str]:
+    """Extract the nickname from the numeric 001 (welcome) message."""
+    if msg.numeric != 1:
+        return None
+    if msg.params:
+        return msg.params[0]
+    return None
+
+
+def normalise_channel(name: str) -> str:
+    """Normalise a channel name to include '#'."""
+    name = name.strip()
+    if not name:
+        return name
+    return name if name.startswith("#") else f"#{name}"
diff --git a/libs/apprise/plugins/irc/state.py b/libs/apprise/plugins/irc/state.py
new file mode 100644
index 0000000000..db4c1e3c3c
--- /dev/null
+++ b/libs/apprise/plugins/irc/state.py
@@ -0,0 +1,216 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""IRC State Machine.
+
+The client reads IRC lines, parses them into :class:`IRCMessage`, and feeds
+them into :meth:`IRCStateMachine.on_message`. The return value is a list of
+:class:`IRCAction` objects that describe what the client should do next.
+
+Responsibilities:
+- Client: I/O (socket), PING/PONG, retries/backoff, timeouts.
+- State machine: registration/join progress, mapping known numeric errors
+  to a terminal failure, tracking accepted nick, tracking joined channels.
+"""
+
+from __future__ import annotations
+
+from dataclasses import field
+from enum import Enum, auto
+from typing import Optional
+
+from ...compat import dataclass_compat as dataclass
+from .protocol import IRCMessage, extract_welcome_nick
+
+
+class IRCState(Enum):
+    """High-level connection state."""
+
+    DISCONNECTED = auto()
+    REGISTERING = auto()
+    READY = auto()
+    JOINING = auto()
+    QUITTING = auto()
+    ERROR = auto()
+
+
+class IRCActionKind(Enum):
+    """Action returned by the state machine."""
+
+    SEND = auto()
+    FAIL = auto()
+    NOOP = auto()
+
+
+@dataclass(frozen=True, slots=True)
+class IRCAction:
+    """Represents the next step for the client."""
+
+    kind: IRCActionKind
+    line: Optional[str] = None
+    reason: Optional[str] = None
+
+
+@dataclass(slots=True)
+class IRCContext:
+    """Mutable context shared between client and state machine."""
+
+    desired_nick: str
+    accepted_nick: str
+    fullname: str
+    password: Optional[str] = None
+    registered: bool = False
+    motd_done: bool = False
+    joined: set[str] = field(default_factory=set)
+    last_error: Optional[str] = None
+
+
+def _err(msg: IRCMessage) -> str:
+    """Build a human readable error message from an IRC message."""
+    if msg.trailing:
+        return msg.trailing
+    return " ".join(msg.params) if msg.params else "IRC error"
+
+
+REGISTER_ERRORS = {
+    464: "Password incorrect",
+    465: "Banned from server",
+    468: "Only registered users allowed",
+}
+
+JOIN_ERRORS = {
+    403: "No such channel",
+    471: "Channel is full",
+    473: "Invite only channel",
+    474: "Banned from channel",
+    475: "Bad channel key",
+    476: "Bad channel mask",
+    477: "Need to be registered",
+    489: "Cannot join channel",
+}
+
+
+class IRCStateMachine:
+    """State machine driven by inbound IRC messages."""
+
+    def __init__(self, ctx: IRCContext) -> None:
+        self.ctx = ctx
+        self.state: IRCState = IRCState.DISCONNECTED
+
+    def start_registration(self) -> list[IRCAction]:
+        """Begin registration by emitting PASS/NICK/USER as required."""
+        self.state = IRCState.REGISTERING
+        out: list[IRCAction] = []
+        if self.ctx.password:
+            out.append(IRCAction(
+                IRCActionKind.SEND, line=f"PASS {self.ctx.password}"))
+        out.append(IRCAction(
+            IRCActionKind.SEND, line=f"NICK {self.ctx.desired_nick}"))
+        out.append(
+            IRCAction(
+                IRCActionKind.SEND,
+                line=f"USER {self.ctx.desired_nick} 0 * :{self.ctx.fullname}",
+            ),
+        )
+        return out
+
+    def on_message(self, msg: IRCMessage) -> list[IRCAction]:
+        """Process an inbound IRC message and emit next actions."""
+        if self.state in (IRCState.ERROR, IRCState.QUITTING):
+            return []
+
+        actions: list[IRCAction] = []
+        n = msg.numeric
+
+        if self.state == IRCState.REGISTERING:
+            if n in REGISTER_ERRORS:
+                self.ctx.last_error = f"{REGISTER_ERRORS[n]}: {_err(msg)}"
+                self.state = IRCState.ERROR
+                return [IRCAction(
+                    IRCActionKind.FAIL, reason=self.ctx.last_error)]
+
+            if n in (432, 433):
+                actions.append(IRCAction(
+                    IRCActionKind.SEND, line=f"NICK {self.ctx.desired_nick}"))
+                return actions
+
+            if n == 1:
+                nick = extract_welcome_nick(msg)
+                if nick:
+                    self.ctx.accepted_nick = nick
+                self.ctx.registered = True
+                self.state = IRCState.READY
+                return actions
+
+            if n in (376, 422):
+                self.ctx.motd_done = True
+                if self.ctx.registered:
+                    self.state = IRCState.READY
+                return actions
+
+        if self.state == IRCState.JOINING:
+            if n in JOIN_ERRORS:
+                self.ctx.last_error = f"{JOIN_ERRORS[n]}: {_err(msg)}"
+                self.state = IRCState.ERROR
+                return [IRCAction(
+                    IRCActionKind.FAIL, reason=self.ctx.last_error)]
+
+            if n == 443 and len(msg.params) >= 2:
+                chan = msg.params[1]
+                self.ctx.joined.add(chan)
+                self.state = IRCState.READY
+                return actions
+
+            if n == 366 and len(msg.params) >= 2:
+                chan = msg.params[1]
+                self.ctx.joined.add(chan)
+                self.state = IRCState.READY
+                return actions
+
+            if msg.command.upper() == "JOIN":
+                chan = msg.trailing or (msg.params[0] if msg.params else "")
+                if chan:
+                    self.ctx.joined.add(chan)
+                    self.state = IRCState.READY
+                return actions
+
+        return actions
+
+    def request_join(
+            self, channel: str, key: Optional[str] = None) -> list[IRCAction]:
+        """Request a channel join and enter JOINING state."""
+        self.state = IRCState.JOINING
+
+        if key:
+            return [IRCAction(
+                IRCActionKind.SEND, line=f"JOIN {channel} {key}")]
+        return [IRCAction(IRCActionKind.SEND, line=f"JOIN {channel}")]
+
+    def request_quit(self, message: str) -> list[IRCAction]:
+        """Request a quit and enter QUITTING state."""
+        self.state = IRCState.QUITTING
+        return [IRCAction(IRCActionKind.SEND, line=f"QUIT :{message}")]
diff --git a/libs/apprise/plugins/irc/templates.py b/libs/apprise/plugins/irc/templates.py
new file mode 100644
index 0000000000..81eb96637b
--- /dev/null
+++ b/libs/apprise/plugins/irc/templates.py
@@ -0,0 +1,83 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""IRC templates used to auto-apply defaults based on known networks.
+
+This mirrors the email template strategy, but is intentionally minimal.
+Templates only apply defaults when the user has not explicitly specified the
+value in their URL.
+
+Each entry is a tuple of:
+  (label, compiled_regex, defaults)
+
+Supported defaults:
+  - secure: bool
+  - port: int
+  - mode: str  (server|nickserv|none)
+"""
+
+from __future__ import annotations
+
+import re
+
+from .protocol import IRCAuthMode
+
+IRC_TEMPLATES = (
+    # SynIRC: NickServ common, TLS default 6697
+    (
+        "SynIRC",
+        re.compile(r"^.+\.synirc\.net$", re.I),
+        {
+            "secure": True,
+            "port": 6697,
+            "mode": IRCAuthMode.NICKSERV,
+        },
+    ),
+
+    # Libera.Chat: TLS default 6697, NickServ common (SASL also common but
+    # not implemented here)
+    (
+        "Libera.Chat",
+        re.compile(r"^.+\.libera\.chat$", re.I),
+        {
+            "secure": True,
+            "port": 6697,
+            "mode": IRCAuthMode.NICKSERV,
+        },
+    ),
+
+    # EFnet: traditionally plain 6667, auth varies widely
+    (
+        "EFnet",
+        re.compile(r"^.+\.efnet\.org$", re.I),
+        {
+            "secure": False,
+            "port": 6667,
+            "mode": IRCAuthMode.SERVER,
+        },
+    ),
+)
diff --git a/libs/apprise/plugins/jellyfin.py b/libs/apprise/plugins/jellyfin.py
new file mode 100644
index 0000000000..d116ce4d80
--- /dev/null
+++ b/libs/apprise/plugins/jellyfin.py
@@ -0,0 +1,56 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""Jellyfin Notification Plugin.
+
+Jellyfin is a fork of Emby and kept compatible endpoints for the on-screen
+message / remote control features used by Apprise.
+
+"""
+
+from __future__ import annotations
+
+from . import emby
+
+
+class NotifyJellyfin(emby.NotifyEmby):
+    """Send notifications to Jellyfin (Emby-compatible) servers."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "Jellyfin"
+
+    # The services URL
+    service_url = "https://jellyfin.org/"
+
+    # The default protocol
+    protocol = "jellyfin"
+
+    # The default secure protocol
+    secure_protocol = "jellyfins"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/jellyfin/"
diff --git a/libs/apprise/plugins/join.py b/libs/apprise/plugins/join.py
index 35d8518751..3790e2d7e3 100644
--- a/libs/apprise/plugins/join.py
+++ b/libs/apprise/plugins/join.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -37,25 +36,25 @@
 #   https://play.google.com/store/apps/details?id=com.joaomgcd.join
 
 import re
+
 import requests
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 JOIN_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 # Used to detect a device
-IS_DEVICE_RE = re.compile(r'^[a-z0-9]{32}$', re.I)
+IS_DEVICE_RE = re.compile(r"^[a-z0-9]{32}$", re.I)
 
 # Used to detect a device
 IS_GROUP_RE = re.compile(
-    r'(group\.)?(?P<name>(all|android|chrome|windows10|phone|tablet|pc))',
+    r"(group\.)?(?P<name>(all|android|chrome|windows10|phone|tablet|pc))",
     re.IGNORECASE,
 )
 
@@ -74,54 +73,52 @@ class JoinPriority:
 
 JOIN_PRIORITIES = {
     # Note: This also acts as a reverse lookup mapping
-    JoinPriority.LOW: 'low',
-    JoinPriority.MODERATE: 'moderate',
-    JoinPriority.NORMAL: 'normal',
-    JoinPriority.HIGH: 'high',
-    JoinPriority.EMERGENCY: 'emergency',
+    JoinPriority.LOW: "low",
+    JoinPriority.MODERATE: "moderate",
+    JoinPriority.NORMAL: "normal",
+    JoinPriority.HIGH: "high",
+    JoinPriority.EMERGENCY: "emergency",
 }
 
 JOIN_PRIORITY_MAP = {
     # Maps against string 'low'
-    'l': JoinPriority.LOW,
+    "l": JoinPriority.LOW,
     # Maps against string 'moderate'
-    'm': JoinPriority.MODERATE,
+    "m": JoinPriority.MODERATE,
     # Maps against string 'normal'
-    'n': JoinPriority.NORMAL,
+    "n": JoinPriority.NORMAL,
     # Maps against string 'high'
-    'h': JoinPriority.HIGH,
+    "h": JoinPriority.HIGH,
     # Maps against string 'emergency'
-    'e': JoinPriority.EMERGENCY,
-
+    "e": JoinPriority.EMERGENCY,
     # Entries to additionally support (so more like Join's API)
-    '-2': JoinPriority.LOW,
-    '-1': JoinPriority.MODERATE,
-    '0': JoinPriority.NORMAL,
-    '1': JoinPriority.HIGH,
-    '2': JoinPriority.EMERGENCY,
+    "-2": JoinPriority.LOW,
+    "-1": JoinPriority.MODERATE,
+    "0": JoinPriority.NORMAL,
+    "1": JoinPriority.HIGH,
+    "2": JoinPriority.EMERGENCY,
 }
 
 
 class NotifyJoin(NotifyBase):
-    """
-    A wrapper for Join Notifications
-    """
+    """A wrapper for Join Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Join'
+    service_name = "Join"
 
     # The services URL
-    service_url = 'https://joaoapps.com/join/'
+    service_url = "https://joaoapps.com/join/"
 
     # The default protocol
-    secure_protocol = 'join'
+    secure_protocol = "join"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_join'
+    setup_url = "https://appriseit.com/services/join/"
 
     # Join uses the http protocol with JSON requests
-    notify_url = \
-        'https://joinjoaomgcd.appspot.com/_ah/api/messaging/v1/sendPush'
+    notify_url = (
+        "https://joinjoaomgcd.appspot.com/_ah/api/messaging/v1/sendPush"
+    )
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -130,70 +127,79 @@ class NotifyJoin(NotifyBase):
     body_maxlen = 1000
 
     # The default group to use if none is specified
-    default_join_group = 'group.all'
+    default_join_group = "group.all"
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}/{targets}',
-    )
+    templates = ("{schema}://{apikey}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'regex': (r'^[a-z0-9]{32}$', 'i'),
-            'private': True,
-            'required': True,
-        },
-        'device': {
-            'name': _('Device ID'),
-            'type': 'string',
-            'regex': (r'^[a-z0-9]{32}$', 'i'),
-            'map_to': 'targets',
-        },
-        'device_name': {
-            'name': _('Device Name'),
-            'type': 'string',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "regex": (r"^[a-z0-9]{32}$", "i"),
+                "private": True,
+                "required": True,
+            },
+            "device": {
+                "name": _("Device ID"),
+                "type": "string",
+                "regex": (r"^[a-z0-9]{32}$", "i"),
+                "map_to": "targets",
+            },
+            "device_name": {
+                "name": _("Device Name"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "group": {
+                "name": _("Group"),
+                "type": "choice:string",
+                "values": (
+                    "all",
+                    "android",
+                    "chrome",
+                    "windows10",
+                    "phone",
+                    "tablet",
+                    "pc",
+                ),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'group': {
-            'name': _('Group'),
-            'type': 'choice:string',
-            'values': (
-                'all', 'android', 'chrome', 'windows10', 'phone', 'tablet',
-                'pc'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
-
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': JOIN_PRIORITIES,
-            'default': JoinPriority.NORMAL,
-        },
-        'to': {
-            'alias_of': 'targets',
+    )
+
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": JOIN_PRIORITIES,
+                "default": JoinPriority.NORMAL,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-    })
+    )
 
-    def __init__(self, apikey, targets=None, include_image=True, priority=None,
-                 **kwargs):
-        """
-        Initialize Join Object
-        """
+    def __init__(
+        self, apikey, targets=None, include_image=True, priority=None, **kwargs
+    ):
+        """Initialize Join Object."""
         super().__init__(**kwargs)
 
         # Track whether or not we want to send an image with our notification
@@ -202,24 +208,29 @@ def __init__(self, apikey, targets=None, include_image=True, priority=None,
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Join API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Join API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The Priority of the message
         self.priority = int(
-            NotifyJoin.template_args['priority']['default']
-            if priority is None else
-            next((
-                v for k, v in JOIN_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyJoin.template_args['priority']['default']))
+            NotifyJoin.template_args["priority"]["default"]
+            if priority is None
+            else next(
+                (
+                    v
+                    for k, v in JOIN_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyJoin.template_args["priority"]["default"],
+            )
+        )
 
         # Prepare a list of targets to store entries into
-        self.targets = list()
+        self.targets = []
 
         # Prepare a parsed list of targets
         targets = parse_list(targets)
@@ -235,21 +246,20 @@ def __init__(self, apikey, targets=None, include_image=True, priority=None,
             group_re = IS_GROUP_RE.match(target)
             if group_re:
                 self.targets.append(
-                    'group.{}'.format(group_re.group('name').lower()))
+                    "group.{}".format(group_re.group("name").lower())
+                )
                 continue
 
             self.targets.append(target)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Join Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Join Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
         }
 
         # error tracking (used for function return)
@@ -263,36 +273,38 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             url_args = {
-                'apikey': self.apikey,
-                'priority': str(self.priority),
-                'title': title,
-                'text': body,
+                "apikey": self.apikey,
+                "priority": str(self.priority),
+                "title": title,
+                "text": body,
             }
 
             if IS_GROUP_RE.match(target) or IS_DEVICE_RE.match(target):
-                url_args['deviceId'] = target
+                url_args["deviceId"] = target
 
             else:
                 # Support Device Names
-                url_args['deviceNames'] = target
+                url_args["deviceNames"] = target
 
             # prepare our image for display if configured to do so
-            image_url = None if not self.include_image \
-                else self.image_url(notify_type)
+            image_url = (
+                None if not self.include_image else self.image_url(notify_type)
+            )
 
             if image_url:
-                url_args['icon'] = image_url
+                url_args["icon"] = image_url
 
             # prepare payload
             payload = {}
 
             # Prepare the URL
-            url = '%s?%s' % (self.notify_url, NotifyJoin.urlencode(url_args))
+            url = f"{self.notify_url}?{NotifyJoin.urlencode(url_args)}"
 
-            self.logger.debug('Join POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('Join Payload: %s' % str(payload))
+            self.logger.debug(
+                "Join POST URL:"
+                f" {url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Join Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -308,34 +320,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyJoin.http_response_code_lookup(
-                            r.status_code, JOIN_HTTP_ERROR_MAP)
+                    status_str = NotifyJoin.http_response_code_lookup(
+                        r.status_code, JOIN_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send Join notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Join notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info('Sent Join notification to %s.' % target)
+                    self.logger.info(f"Sent Join notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Join:%s '
-                    'notification.' % target
+                    f"A Connection error occurred sending Join:{target} "
+                    "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -345,83 +359,81 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
         # Define any URL parameters
         params = {
-            'priority':
-                JOIN_PRIORITIES[self.template_args['priority']['default']]
+            "priority": (
+                JOIN_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in JOIN_PRIORITIES
-                else JOIN_PRIORITIES[self.priority],
-            'image': 'yes' if self.include_image else 'no',
+                else JOIN_PRIORITIES[self.priority]
+            ),
+            "image": "yes" if self.include_image else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{apikey}/{targets}/?{params}'.format(
+        return "{schema}://{apikey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join([NotifyJoin.quote(x, safe='')
-                              for x in self.targets]),
-            params=NotifyJoin.urlencode(params))
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                [NotifyJoin.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyJoin.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Our API Key is the hostname if no user is specified
-        results['apikey'] = \
-            results['user'] if results['user'] else results['host']
+        results["apikey"] = (
+            results["user"] if results["user"] else results["host"]
+        )
 
         # Unquote our API Key
-        results['apikey'] = NotifyJoin.unquote(results['apikey'])
+        results["apikey"] = NotifyJoin.unquote(results["apikey"])
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyJoin.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyJoin.unquote(
+                results["qsd"]["priority"]
+            )
 
         # Our Devices
-        results['targets'] = list()
-        if results['user']:
+        results["targets"] = []
+        if results["user"]:
             # If a user was defined, then the hostname is actually a target
             # too
-            results['targets'].append(NotifyJoin.unquote(results['host']))
+            results["targets"].append(NotifyJoin.unquote(results["host"]))
 
         # Now fetch the remaining tokens
-        results['targets'].extend(
-            NotifyJoin.split_path(results['fullpath']))
+        results["targets"].extend(NotifyJoin.split_path(results["fullpath"]))
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += NotifyJoin.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyJoin.parse_list(results["qsd"]["to"])
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         return results
diff --git a/libs/apprise/plugins/kavenegar.py b/libs/apprise/plugins/kavenegar.py
index bab3584f98..838e9863b4 100644
--- a/libs/apprise/plugins/kavenegar.py
+++ b/libs/apprise/plugins/kavenegar.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,64 +34,65 @@
 # This provider does not accept +1 (for example) as a country code. You need
 # to specify 001 instead.
 #
-import requests
 from json import loads
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 # Based on https://kavenegar.com/rest.html
 KAVENEGAR_HTTP_ERROR_MAP = {
-    200: 'The request was approved',
-    400: 'Parameters are incomplete',
-    401: 'Account has been disabled',
-    402: 'The operation failed',
-    403: 'The API Key is invalid',
-    404: 'The method is unknown',
-    405: 'The GET/POST request is wrong',
-    406: 'Invalid mandatory parameters sent',
-    407: 'You canot access the information you want',
-    409: 'The server is unable to response',
-    411: 'The recipient is invalid',
-    412: 'The sender is invalid',
-    413: 'Message empty or message length exceeded',
-    414: 'The number of recipients is more than 200',
-    415: 'The start index is larger then the total',
-    416: 'The source IP of the service does not match the settings',
-    417: 'The submission date is incorrect, '
-         'either expired or not in the correct format',
-    418: 'Your account credit is insufficient',
-    422: 'Data cannot be processed due to invalid characters',
-    501: 'SMS can only be sent to the account holder number',
+    200: "The request was approved",
+    400: "Parameters are incomplete",
+    401: "Account has been disabled",
+    402: "The operation failed",
+    403: "The API Key is invalid",
+    404: "The method is unknown",
+    405: "The GET/POST request is wrong",
+    406: "Invalid mandatory parameters sent",
+    407: "You canot access the information you want",
+    409: "The server is unable to response",
+    411: "The recipient is invalid",
+    412: "The sender is invalid",
+    413: "Message empty or message length exceeded",
+    414: "The number of recipients is more than 200",
+    415: "The start index is larger then the total",
+    416: "The source IP of the service does not match the settings",
+    417: (
+        "The submission date is incorrect, "
+        "either expired or not in the correct format"
+    ),
+    418: "Your account credit is insufficient",
+    422: "Data cannot be processed due to invalid characters",
+    501: "SMS can only be sent to the account holder number",
 }
 
 
 class NotifyKavenegar(NotifyBase):
-    """
-    A wrapper for Kavenegar Notifications
-    """
+    """A wrapper for Kavenegar Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Kavenegar'
+    service_name = "Kavenegar"
 
     # The services URL
-    service_url = 'https://kavenegar.com/'
+    service_url = "https://kavenegar.com/"
 
     # All notification requests are secure
-    secure_protocol = 'kavenegar'
+    secure_protocol = "kavenegar"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_kavenegar'
+    setup_url = "https://appriseit.com/services/kavenegar/"
 
     # Kavenegar single notification URL
-    notify_url = 'http://api.kavenegar.com/v1/{apikey}/sms/send.json'
+    notify_url = "http://api.kavenegar.com/v1/{apikey}/sms/send.json"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -103,61 +103,65 @@ class NotifyKavenegar(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}/{targets}',
-        '{schema}://{source}@{apikey}/{targets}',
+        "{schema}://{apikey}/{targets}",
+        "{schema}://{source}@{apikey}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "source": {
+                "name": _("Source Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'source': {
-            'name': _('Source Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "source",
+            },
         },
-        'from': {
-            'alias_of': 'source',
-        },
-    })
+    )
 
     def __init__(self, apikey, source=None, targets=None, **kwargs):
-        """
-        Initialize Kavenegar Object
-        """
+        """Initialize Kavenegar Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Kavenegar API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Kavenegar API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -165,40 +169,36 @@ def __init__(self, apikey, source=None, targets=None, **kwargs):
         if source is not None:
             result = is_phone_no(source)
             if not result:
-                msg = 'The Kavenegar source specified ({}) is invalid.'\
-                    .format(source)
+                msg = f"The Kavenegar source specified ({source}) is invalid."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             # Store our source
-            self.source = result['full']
+            self.source = result["full"]
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Sends SMS Message
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Sends SMS Message."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no Kavenegar targets to notify.')
+            self.logger.warning("There were no Kavenegar targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -206,8 +206,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
         }
 
         # Our URL
@@ -222,19 +222,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # Prepare our payload
             payload = {
-                'receptor': target,
-                'message': body,
+                "receptor": target,
+                "message": body,
             }
 
             if self.source:
                 # Only set source if specified
-                payload['sender'] = self.source
+                payload["sender"] = self.source
 
             # Some Debug Logging
             self.logger.debug(
-                'Kavenegar POST URL: {} (cert_verify={})'.format(
-                    url, self.verify_certificate))
-            self.logger.debug('Kavenegar Payload: {}' .format(payload))
+                "Kavenegar POST URL:"
+                f" {url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Kavenegar Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -248,16 +249,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
 
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(
-                            r.status_code, KAVENEGAR_HTTP_ERROR_MAP)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code, KAVENEGAR_HTTP_ERROR_MAP
+                    )
 
                     try:
                         # Update our status response if we can
                         json_response = loads(r.content)
-                        status_str = json_response.get('message', status_str)
+                        status_str = json_response.get("message", status_str)
 
                     except (AttributeError, TypeError, ValueError):
                         # ValueError = r.content is Unparsable
@@ -269,15 +272,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         pass
 
                     self.logger.warning(
-                        'Failed to send Kavenegar SMS notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Kavenegar SMS notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -285,17 +290,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 # If we reach here; the message was sent
                 self.logger.info(
-                    'Sent Kavenegar SMS notification to {}.'.format(target))
+                    f"Sent Kavenegar SMS notification to {target}."
+                )
 
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Kavenegar:%s ' % (
-                        ', '.join(self.targets)) + 'notification.'
+                    "A Connection error occurred sending Kavenegar:{} ".format(
+                        ", ".join(self.targets)
+                    )
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
                 # Mark our failure
                 has_error = True
                 continue
@@ -304,66 +311,61 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.source, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{source}{apikey}/{targets}?{params}'.format(
+        return "{schema}://{source}{apikey}/{targets}?{params}".format(
             schema=self.secure_protocol,
-            source='' if not self.source else '{}@'.format(self.source),
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(
-                [NotifyKavenegar.quote(x, safe='') for x in self.targets]),
-            params=NotifyKavenegar.urlencode(params))
+            source="" if not self.source else f"{self.source}@",
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                [NotifyKavenegar.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyKavenegar.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Store the source if specified
-        if results.get('user', None):
-            results['source'] = results['user']
+        if results.get("user", None):
+            results["source"] = results["user"]
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyKavenegar.split_path(results['fullpath'])
+        results["targets"] = NotifyKavenegar.split_path(results["fullpath"])
 
         # The hostname is our authentication key
-        results['apikey'] = NotifyKavenegar.unquote(results['host'])
+        results["apikey"] = NotifyKavenegar.unquote(results["host"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyKavenegar.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyKavenegar.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyKavenegar.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyKavenegar.unquote(results["qsd"]["from"])
 
         return results
diff --git a/libs/apprise/plugins/kumulos.py b/libs/apprise/plugins/kumulos.py
index 8d50ecc171..f11b4a23ba 100644
--- a/libs/apprise/plugins/kumulos.py
+++ b/libs/apprise/plugins/kumulos.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -36,41 +35,40 @@
 # The API reference used to build this plugin was documented here:
 #  https://docs.kumulos.com/messaging/api/#sending-in-app-messages
 #
-import requests
 from json import dumps
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 KUMULOS_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid API and/or Server Key.',
-    422: 'Unprocessable Entity - The request was unparsable.',
-    400: 'Bad Request - Targeted users do not exist or have unsubscribed.',
+    401: "Unauthorized - Invalid API and/or Server Key.",
+    422: "Unprocessable Entity - The request was unparsable.",
+    400: "Bad Request - Targeted users do not exist or have unsubscribed.",
 }
 
 
 class NotifyKumulos(NotifyBase):
-    """
-    A wrapper for Kumulos Notifications
-    """
+    """A wrapper for Kumulos Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Kumulos'
+    service_name = "Kumulos"
 
     # The services URL
-    service_url = 'https://kumulos.com/'
+    service_url = "https://kumulos.com/"
 
     # The default secure protocol
-    secure_protocol = 'kumulos'
+    secure_protocol = "kumulos"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_kumulos'
+    setup_url = "https://appriseit.com/services/kumulos/"
 
     # Kumulos uses the http protocol with JSON requests
-    notify_url = 'https://messages.kumulos.com/v2/notifications'
+    notify_url = "https://messages.kumulos.com/v2/notifications"
 
     # The maximum allowable characters allowed in the title per message
     title_maxlen = 64
@@ -79,83 +77,84 @@ class NotifyKumulos(NotifyBase):
     body_maxlen = 240
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}/{serverkey}',
-    )
+    templates = ("{schema}://{apikey}/{serverkey}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            # UUID4
-            'regex': (r'^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-'
-                      r'[89ab][0-9a-f]{3}-[0-9a-f]{12}$', 'i')
-        },
-        'serverkey': {
-            'name': _('Server Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9+]{36}$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                # UUID4
+                "regex": (
+                    r"^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-"
+                    r"[89ab][0-9a-f]{3}-[0-9a-f]{12}$",
+                    "i",
+                ),
+            },
+            "serverkey": {
+                "name": _("Server Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9+]{36}$", "i"),
+            },
         },
-    })
+    )
 
     def __init__(self, apikey, serverkey, **kwargs):
-        """
-        Initialize Kumulos Object
-        """
+        """Initialize Kumulos Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Kumulos API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Kumulos API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Server Key (associated with project)
         self.serverkey = validate_regex(
-            serverkey, *self.template_tokens['serverkey']['regex'])
+            serverkey, *self.template_tokens["serverkey"]["regex"]
+        )
         if not self.serverkey:
-            msg = 'An invalid Kumulos Server Key ' \
-                  '({}) was specified.'.format(serverkey)
+            msg = f"An invalid Kumulos Server Key ({serverkey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Kumulos Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Kumulos Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
         }
 
         # prepare JSON Object
         payload = {
-            'target': {
-                'broadcast': True,
+            "target": {
+                "broadcast": True,
             },
-            'content': {
-                'title': title,
-                'message': body,
+            "content": {
+                "title": title,
+                "message": body,
             },
         }
 
         # Determine Authentication
         auth = (self.apikey, self.serverkey)
 
-        self.logger.debug('Kumulos POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Kumulos Payload: %s' % str(payload))
+        self.logger.debug(
+            "Kumulos POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Kumulos Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -170,80 +169,76 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyKumulos.http_response_code_lookup(
-                        r.status_code, KUMULOS_HTTP_ERROR_MAP)
+                status_str = NotifyKumulos.http_response_code_lookup(
+                    r.status_code, KUMULOS_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Kumulos notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Kumulos notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False
 
             else:
-                self.logger.info('Sent Kumulos notification.')
+                self.logger.info("Sent Kumulos notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Kumulos '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Kumulos notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey, self.serverkey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{apikey}/{serverkey}/?{params}'.format(
+        return "{schema}://{apikey}/{serverkey}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            serverkey=self.pprint(self.serverkey, privacy, safe=''),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            serverkey=self.pprint(self.serverkey, privacy, safe=""),
             params=NotifyKumulos.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The first token is stored in the hostname
-        results['apikey'] = NotifyKumulos.unquote(results['host'])
+        results["apikey"] = NotifyKumulos.unquote(results["host"])
 
         # Now fetch the remaining tokens
         try:
-            results['serverkey'] = \
-                NotifyKumulos.split_path(results['fullpath'])[0]
+            results["serverkey"] = NotifyKumulos.split_path(
+                results["fullpath"]
+            )[0]
 
         except IndexError:
             # no token
-            results['serverkey'] = None
+            results["serverkey"] = None
 
         return results
diff --git a/libs/apprise/plugins/lametric.py b/libs/apprise/plugins/lametric.py
index 73888410dd..4f2ddbd28b 100644
--- a/libs/apprise/plugins/lametric.py
+++ b/libs/apprise/plugins/lametric.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -87,27 +86,31 @@
 # - https://developer.lametric.com/icons
 
 
+import contextlib
+from json import dumps
 import re
+
 import requests
-from json import dumps
-from .base import NotifyBase
+
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
-from ..utils.parse import validate_regex, is_hostname, is_ipaddr
+from ..utils.parse import is_hostname, is_ipaddr, validate_regex
+from .base import NotifyBase
 
 # A URL Parser to detect App ID
 LAMETRIC_APP_ID_DETECTOR_RE = re.compile(
-    r'(com\.lametric\.)?(?P<app_id>[0-9a-z.-]{1,64})'
-    r'(/(?P<app_ver>[1-9][0-9]*))?', re.I)
+    r"(com\.lametric\.)?(?P<app_id>[0-9a-z.-]{1,64})"
+    r"(/(?P<app_ver>[1-9][0-9]*))?",
+    re.I,
+)
 
 # Tokens are huge
-LAMETRIC_IS_APP_TOKEN = re.compile(r'^[a-z0-9]{80,}==$', re.I)
+LAMETRIC_IS_APP_TOKEN = re.compile(r"^[a-z0-9]{80,}==$", re.I)
 
 
 class LametricMode:
-    """
-    Define Lametric Notification Modes
-    """
+    """Define Lametric Notification Modes."""
+
     # App posts upstream to the developer API on Lametric's website
     CLOUD = "cloud"
 
@@ -122,9 +125,7 @@ class LametricMode:
 
 
 class LametricPriority:
-    """
-    Priority of the message
-    """
+    """Priority of the message."""
 
     # info: this priority means that notification will be displayed on the
     #        same โ€œlevelโ€ as all other notifications on the device that come
@@ -132,14 +133,14 @@ class LametricPriority:
     #        be shown when screensaver is active. By default message is sent
     #        with "info" priority. This level of notification should be used
     #        for notifications like news, weather, temperature, etc.
-    INFO = 'info'
+    INFO = "info"
 
     # warning: notifications with this priority will interrupt ones sent with
     #           lower priority (โ€œinfoโ€). Should be used to notify the user
     #           about something important but not critical. For example,
     #           events like โ€œsomeone is coming homeโ€ should use this priority
     #           when sending notifications from smart home.
-    WARNING = 'warning'
+    WARNING = "warning"
 
     # critical: the most important notifications. Interrupts notification
     #            with priority info or warning and is displayed even if
@@ -148,7 +149,7 @@ class LametricPriority:
     #            really important notifications like notifications from smoke
     #            detectors, water leak sensors, etc. Use it for events that
     #            require human interaction immediately.
-    CRITICAL = 'critical'
+    CRITICAL = "critical"
 
 
 LAMETRIC_PRIORITIES = (
@@ -159,22 +160,20 @@ class LametricPriority:
 
 
 class LametricIconType:
-    """
-    Represents the nature of notification.
-    """
+    """Represents the nature of notification."""
 
     # info  - "i" icon will be displayed prior to the notification. Means that
     #         notification contains information, no need to take actions on it.
-    INFO = 'info'
+    INFO = "info"
 
     # alert: "!!!" icon will be displayed prior to the notification. Use it
     #         when you want the user to pay attention to that notification as
     #         it indicates that something bad happened and user must take
     #         immediate action.
-    ALERT = 'alert'
+    ALERT = "alert"
 
     # none: no notification icon will be shown.
-    NONE = 'none'
+    NONE = "none"
 
 
 LAMETRIC_ICON_TYPES = (
@@ -185,89 +184,121 @@ class LametricIconType:
 
 
 class LametricSoundCategory:
-    """
-    Define Sound Categories
-    """
+    """Define Sound Categories."""
+
     NOTIFICATIONS = "notifications"
     ALARMS = "alarms"
 
 
 class LametricSound:
-    """
-    There are 2 categories of sounds, to make things simple we just lump them
-    all togther in one class object.
+    """There are 2 categories of sounds, to make things simple we just lump
+    them all togther in one class object.
 
     Syntax is (Category, (AlarmID, Alias1, Alias2, ...))
     """
 
     # Alarm Category Sounds
-    ALARM01 = (LametricSoundCategory.ALARMS, ('alarm1', 'a1', 'a01'))
-    ALARM02 = (LametricSoundCategory.ALARMS, ('alarm2', 'a2', 'a02'))
-    ALARM03 = (LametricSoundCategory.ALARMS, ('alarm3', 'a3', 'a03'))
-    ALARM04 = (LametricSoundCategory.ALARMS, ('alarm4', 'a4', 'a04'))
-    ALARM05 = (LametricSoundCategory.ALARMS, ('alarm5', 'a5', 'a05'))
-    ALARM06 = (LametricSoundCategory.ALARMS, ('alarm6', 'a6', 'a06'))
-    ALARM07 = (LametricSoundCategory.ALARMS, ('alarm7', 'a7', 'a07'))
-    ALARM08 = (LametricSoundCategory.ALARMS, ('alarm8', 'a8', 'a08'))
-    ALARM09 = (LametricSoundCategory.ALARMS, ('alarm9', 'a9', 'a09'))
-    ALARM10 = (LametricSoundCategory.ALARMS, ('alarm10', 'a10'))
-    ALARM11 = (LametricSoundCategory.ALARMS, ('alarm11', 'a11'))
-    ALARM12 = (LametricSoundCategory.ALARMS, ('alarm12', 'a12'))
-    ALARM13 = (LametricSoundCategory.ALARMS, ('alarm13', 'a13'))
+    ALARM01 = (LametricSoundCategory.ALARMS, ("alarm1", "a1", "a01"))
+    ALARM02 = (LametricSoundCategory.ALARMS, ("alarm2", "a2", "a02"))
+    ALARM03 = (LametricSoundCategory.ALARMS, ("alarm3", "a3", "a03"))
+    ALARM04 = (LametricSoundCategory.ALARMS, ("alarm4", "a4", "a04"))
+    ALARM05 = (LametricSoundCategory.ALARMS, ("alarm5", "a5", "a05"))
+    ALARM06 = (LametricSoundCategory.ALARMS, ("alarm6", "a6", "a06"))
+    ALARM07 = (LametricSoundCategory.ALARMS, ("alarm7", "a7", "a07"))
+    ALARM08 = (LametricSoundCategory.ALARMS, ("alarm8", "a8", "a08"))
+    ALARM09 = (LametricSoundCategory.ALARMS, ("alarm9", "a9", "a09"))
+    ALARM10 = (LametricSoundCategory.ALARMS, ("alarm10", "a10"))
+    ALARM11 = (LametricSoundCategory.ALARMS, ("alarm11", "a11"))
+    ALARM12 = (LametricSoundCategory.ALARMS, ("alarm12", "a12"))
+    ALARM13 = (LametricSoundCategory.ALARMS, ("alarm13", "a13"))
 
     # Notification Category Sounds
-    BICYCLE = (LametricSoundCategory.NOTIFICATIONS, ('bicycle', 'bike'))
-    CAR = (LametricSoundCategory.NOTIFICATIONS, ('car', ))
-    CASH = (LametricSoundCategory.NOTIFICATIONS, ('cash', ))
-    CAT = (LametricSoundCategory.NOTIFICATIONS, ('cat', ))
-    DOG01 = (LametricSoundCategory.NOTIFICATIONS, ('dog', 'dog1', 'dog01'))
-    DOG02 = (LametricSoundCategory.NOTIFICATIONS, ('dog2', 'dog02'))
-    ENERGY = (LametricSoundCategory.NOTIFICATIONS, ('energy', ))
-    KNOCK = (LametricSoundCategory.NOTIFICATIONS, ('knock-knock', 'knock'))
-    EMAIL = (LametricSoundCategory.NOTIFICATIONS, (
-        'letter_email', 'letter', 'email'))
-    LOSE01 = (LametricSoundCategory.NOTIFICATIONS, ('lose1', 'lose01', 'lose'))
-    LOSE02 = (LametricSoundCategory.NOTIFICATIONS, ('lose2', 'lose02'))
-    NEGATIVE01 = (LametricSoundCategory.NOTIFICATIONS, (
-        'negative1', 'negative01', 'neg01', 'neg1', '-'))
-    NEGATIVE02 = (LametricSoundCategory.NOTIFICATIONS, (
-        'negative2', 'negative02', 'neg02', 'neg2', '--'))
-    NEGATIVE03 = (LametricSoundCategory.NOTIFICATIONS, (
-        'negative3', 'negative03', 'neg03', 'neg3', '---'))
-    NEGATIVE04 = (LametricSoundCategory.NOTIFICATIONS, (
-        'negative4', 'negative04', 'neg04', 'neg4', '----'))
-    NEGATIVE05 = (LametricSoundCategory.NOTIFICATIONS, (
-        'negative5', 'negative05', 'neg05', 'neg5', '-----'))
-    NOTIFICATION01 = (LametricSoundCategory.NOTIFICATIONS, (
-        'notification', 'notification1', 'notification01', 'not01', 'not1'))
-    NOTIFICATION02 = (LametricSoundCategory.NOTIFICATIONS, (
-        'notification2', 'notification02', 'not02', 'not2'))
-    NOTIFICATION03 = (LametricSoundCategory.NOTIFICATIONS, (
-        'notification3', 'notification03', 'not03', 'not3'))
-    NOTIFICATION04 = (LametricSoundCategory.NOTIFICATIONS, (
-        'notification4', 'notification04', 'not04', 'not4'))
-    OPEN_DOOR = (LametricSoundCategory.NOTIFICATIONS, (
-        'open_door', 'open', 'door'))
-    POSITIVE01 = (LametricSoundCategory.NOTIFICATIONS, (
-        'positive1', 'positive01', 'pos01', 'p1', '+'))
-    POSITIVE02 = (LametricSoundCategory.NOTIFICATIONS, (
-        'positive2', 'positive02', 'pos02', 'p2', '++'))
-    POSITIVE03 = (LametricSoundCategory.NOTIFICATIONS, (
-        'positive3', 'positive03', 'pos03', 'p3', '+++'))
-    POSITIVE04 = (LametricSoundCategory.NOTIFICATIONS, (
-        'positive4', 'positive04', 'pos04', 'p4', '++++'))
-    POSITIVE05 = (LametricSoundCategory.NOTIFICATIONS, (
-        'positive5', 'positive05', 'pos05', 'p5', '+++++'))
-    POSITIVE06 = (LametricSoundCategory.NOTIFICATIONS, (
-        'positive6', 'positive06', 'pos06', 'p6', '++++++'))
-    STATISTIC = (LametricSoundCategory.NOTIFICATIONS, ('statistic', 'stat'))
-    THUNDER = (LametricSoundCategory.NOTIFICATIONS, ('thunder'))
-    WATER01 = (LametricSoundCategory.NOTIFICATIONS, ('water1', 'water01'))
-    WATER02 = (LametricSoundCategory.NOTIFICATIONS, ('water2', 'water02'))
-    WIN01 = (LametricSoundCategory.NOTIFICATIONS, ('win', 'win01', 'win1'))
-    WIN02 = (LametricSoundCategory.NOTIFICATIONS, ('win2', 'win02'))
-    WIND = (LametricSoundCategory.NOTIFICATIONS, ('wind', ))
-    WIND_SHORT = (LametricSoundCategory.NOTIFICATIONS, ('wind_short', ))
+    BICYCLE = (LametricSoundCategory.NOTIFICATIONS, ("bicycle", "bike"))
+    CAR = (LametricSoundCategory.NOTIFICATIONS, ("car",))
+    CASH = (LametricSoundCategory.NOTIFICATIONS, ("cash",))
+    CAT = (LametricSoundCategory.NOTIFICATIONS, ("cat",))
+    DOG01 = (LametricSoundCategory.NOTIFICATIONS, ("dog", "dog1", "dog01"))
+    DOG02 = (LametricSoundCategory.NOTIFICATIONS, ("dog2", "dog02"))
+    ENERGY = (LametricSoundCategory.NOTIFICATIONS, ("energy",))
+    KNOCK = (LametricSoundCategory.NOTIFICATIONS, ("knock-knock", "knock"))
+    EMAIL = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("letter_email", "letter", "email"),
+    )
+    LOSE01 = (LametricSoundCategory.NOTIFICATIONS, ("lose1", "lose01", "lose"))
+    LOSE02 = (LametricSoundCategory.NOTIFICATIONS, ("lose2", "lose02"))
+    NEGATIVE01 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("negative1", "negative01", "neg01", "neg1", "-"),
+    )
+    NEGATIVE02 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("negative2", "negative02", "neg02", "neg2", "--"),
+    )
+    NEGATIVE03 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("negative3", "negative03", "neg03", "neg3", "---"),
+    )
+    NEGATIVE04 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("negative4", "negative04", "neg04", "neg4", "----"),
+    )
+    NEGATIVE05 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("negative5", "negative05", "neg05", "neg5", "-----"),
+    )
+    NOTIFICATION01 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("notification", "notification1", "notification01", "not01", "not1"),
+    )
+    NOTIFICATION02 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("notification2", "notification02", "not02", "not2"),
+    )
+    NOTIFICATION03 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("notification3", "notification03", "not03", "not3"),
+    )
+    NOTIFICATION04 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("notification4", "notification04", "not04", "not4"),
+    )
+    OPEN_DOOR = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("open_door", "open", "door"),
+    )
+    POSITIVE01 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("positive1", "positive01", "pos01", "p1", "+"),
+    )
+    POSITIVE02 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("positive2", "positive02", "pos02", "p2", "++"),
+    )
+    POSITIVE03 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("positive3", "positive03", "pos03", "p3", "+++"),
+    )
+    POSITIVE04 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("positive4", "positive04", "pos04", "p4", "++++"),
+    )
+    POSITIVE05 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("positive5", "positive05", "pos05", "p5", "+++++"),
+    )
+    POSITIVE06 = (
+        LametricSoundCategory.NOTIFICATIONS,
+        ("positive6", "positive06", "pos06", "p6", "++++++"),
+    )
+    STATISTIC = (LametricSoundCategory.NOTIFICATIONS, ("statistic", "stat"))
+    THUNDER = (LametricSoundCategory.NOTIFICATIONS, "thunder")
+    WATER01 = (LametricSoundCategory.NOTIFICATIONS, ("water1", "water01"))
+    WATER02 = (LametricSoundCategory.NOTIFICATIONS, ("water2", "water02"))
+    WIN01 = (LametricSoundCategory.NOTIFICATIONS, ("win", "win01", "win1"))
+    WIN02 = (LametricSoundCategory.NOTIFICATIONS, ("win2", "win02"))
+    WIND = (LametricSoundCategory.NOTIFICATIONS, ("wind",))
+    WIND_SHORT = (LametricSoundCategory.NOTIFICATIONS, ("wind_short",))
 
 
 # A listing of all the sounds; the order DOES matter, content is read from
@@ -277,66 +308,94 @@ class LametricSound:
 # which is very close to 'alarm10'
 LAMETRIC_SOUNDS = (
     # Alarm Category Entries
-    LametricSound.ALARM13, LametricSound.ALARM12, LametricSound.ALARM11,
-    LametricSound.ALARM10, LametricSound.ALARM09, LametricSound.ALARM08,
-    LametricSound.ALARM07, LametricSound.ALARM06, LametricSound.ALARM05,
-    LametricSound.ALARM04, LametricSound.ALARM03, LametricSound.ALARM02,
+    LametricSound.ALARM13,
+    LametricSound.ALARM12,
+    LametricSound.ALARM11,
+    LametricSound.ALARM10,
+    LametricSound.ALARM09,
+    LametricSound.ALARM08,
+    LametricSound.ALARM07,
+    LametricSound.ALARM06,
+    LametricSound.ALARM05,
+    LametricSound.ALARM04,
+    LametricSound.ALARM03,
+    LametricSound.ALARM02,
     LametricSound.ALARM01,
-
     # Notification Category Entries
-    LametricSound.BICYCLE, LametricSound.CAR, LametricSound.CASH,
-    LametricSound.CAT, LametricSound.DOG02, LametricSound.DOG01,
-    LametricSound.ENERGY, LametricSound.KNOCK, LametricSound.EMAIL,
-    LametricSound.LOSE02, LametricSound.LOSE01, LametricSound.NEGATIVE01,
-    LametricSound.NEGATIVE02, LametricSound.NEGATIVE03,
-    LametricSound.NEGATIVE04, LametricSound.NEGATIVE05,
-    LametricSound.NOTIFICATION04, LametricSound.NOTIFICATION03,
-    LametricSound.NOTIFICATION02, LametricSound.NOTIFICATION01,
-    LametricSound.OPEN_DOOR, LametricSound.POSITIVE01,
-    LametricSound.POSITIVE02, LametricSound.POSITIVE03,
-    LametricSound.POSITIVE04, LametricSound.POSITIVE05,
-    LametricSound.POSITIVE01, LametricSound.STATISTIC, LametricSound.THUNDER,
-    LametricSound.WATER02, LametricSound.WATER01, LametricSound.WIND,
-    LametricSound.WIND_SHORT, LametricSound.WIN01, LametricSound.WIN02,
+    LametricSound.BICYCLE,
+    LametricSound.CAR,
+    LametricSound.CASH,
+    LametricSound.CAT,
+    LametricSound.DOG02,
+    LametricSound.DOG01,
+    LametricSound.ENERGY,
+    LametricSound.KNOCK,
+    LametricSound.EMAIL,
+    LametricSound.LOSE02,
+    LametricSound.LOSE01,
+    LametricSound.NEGATIVE01,
+    LametricSound.NEGATIVE02,
+    LametricSound.NEGATIVE03,
+    LametricSound.NEGATIVE04,
+    LametricSound.NEGATIVE05,
+    LametricSound.NOTIFICATION04,
+    LametricSound.NOTIFICATION03,
+    LametricSound.NOTIFICATION02,
+    LametricSound.NOTIFICATION01,
+    LametricSound.OPEN_DOOR,
+    LametricSound.POSITIVE01,
+    LametricSound.POSITIVE02,
+    LametricSound.POSITIVE03,
+    LametricSound.POSITIVE04,
+    LametricSound.POSITIVE05,
+    LametricSound.POSITIVE01,
+    LametricSound.STATISTIC,
+    LametricSound.THUNDER,
+    LametricSound.WATER02,
+    LametricSound.WATER01,
+    LametricSound.WIND,
+    LametricSound.WIND_SHORT,
+    LametricSound.WIN01,
+    LametricSound.WIN02,
 )
 
 
 class NotifyLametric(NotifyBase):
-    """
-    A wrapper for LaMetric Notifications
-    """
+    """A wrapper for LaMetric Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'LaMetric'
+    service_name = "LaMetric"
 
     # The services URL
-    service_url = 'https://lametric.com'
+    service_url = "https://lametric.com"
 
     # The default protocol
-    protocol = 'lametric'
+    protocol = "lametric"
 
     # The default secure protocol
-    secure_protocol = 'lametrics'
+    secure_protocol = "lametrics"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_lametric'
+    setup_url = "https://appriseit.com/services/lametric/"
 
     # Lametric does have titles when creating a message
     title_maxlen = 0
 
     # URL used for notifying Lametric App's created in the Dev Portal
-    cloud_notify_url = 'https://developer.lametric.com/api/v1' \
-                       '/dev/widget/update/com.lametric.{app_id}/{app_ver}'
+    cloud_notify_url = (
+        "https://developer.lametric.com/api/v1"
+        "/dev/widget/update/com.lametric.{app_id}/{app_ver}"
+    )
 
     # URL used for local notifications directly to the device
-    device_notify_url = '{schema}://{host}{port}/api/v2/device/notifications'
+    device_notify_url = "{schema}://{host}{port}/api/v2/device/notifications"
 
     # The Device User ID
-    default_device_user = 'dev'
+    default_device_user = "dev"
 
     # Track all icon mappings back to Apprise Icon NotifyType's
     # See: https://developer.lametric.com/icons
@@ -347,132 +406,148 @@ class NotifyLametric(NotifyBase):
     #            https://developer.lametric.com/icons
     lametric_icon_id_mapping = {
         # 620/Info
-        NotifyType.INFO: 'i620',
+        NotifyType.INFO: "i620",
         # 9182/info_good
-        NotifyType.SUCCESS: 'i9182',
+        NotifyType.SUCCESS: "i9182",
         # 9183/info_caution
-        NotifyType.WARNING: 'i9183',
+        NotifyType.WARNING: "i9183",
         # 9184/info_error
-        NotifyType.FAILURE: 'i9184',
+        NotifyType.FAILURE: "i9184",
     }
 
     # Define object templates
     templates = (
         # Cloud (App) Mode
-        '{schema}://{app_token}@{app_id}',
-        '{schema}://{app_token}@{app_id}/{app_ver}',
-
+        "{schema}://{app_token}@{app_id}",
+        "{schema}://{app_token}@{app_id}/{app_ver}",
         # Device Mode
-        '{schema}://{apikey}@{host}',
-        '{schema}://{user}:{apikey}@{host}',
-        '{schema}://{apikey}@{host}:{port}',
-        '{schema}://{user}:{apikey}@{host}:{port}',
+        "{schema}://{apikey}@{host}",
+        "{schema}://{user}:{apikey}@{host}",
+        "{schema}://{apikey}@{host}:{port}",
+        "{schema}://{user}:{apikey}@{host}:{port}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        # Used for Local Device mode
-        'apikey': {
-            'name': _('Device API Key'),
-            'type': 'string',
-            'private': True,
-        },
-        # Used for Cloud mode
-        'app_id': {
-            'name': _('App ID'),
-            'type': 'string',
-            'private': True,
-        },
-        # Used for Cloud mode
-        'app_ver': {
-            'name': _('App Version'),
-            'type': 'string',
-            'regex': (r'^[1-9][0-9]*$', ''),
-            'default': '1',
-        },
-        # Used for Cloud mode
-        'app_token': {
-            'name': _('App Access Token'),
-            'type': 'string',
-            'regex': (r'^[A-Z0-9]{80,}==$', 'i'),
-        },
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-            'default': 8080,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            # Used for Local Device mode
+            "apikey": {
+                "name": _("Device API Key"),
+                "type": "string",
+                "private": True,
+            },
+            # Used for Cloud mode
+            "app_id": {
+                "name": _("App ID"),
+                "type": "string",
+                "private": True,
+            },
+            # Used for Cloud mode
+            "app_ver": {
+                "name": _("App Version"),
+                "type": "string",
+                "regex": (r"^[1-9][0-9]*$", ""),
+                "default": "1",
+            },
+            # Used for Cloud mode
+            "app_token": {
+                "name": _("App Access Token"),
+                "type": "string",
+                "regex": (r"^[A-Z0-9]{80,}==$", "i"),
+            },
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+                "default": 8080,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
         },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'apikey': {
-            'alias_of': 'apikey',
-        },
-        'app_id': {
-            'alias_of': 'app_id',
-        },
-        'app_ver': {
-            'alias_of': 'app_ver',
-        },
-        'app_token': {
-            'alias_of': 'app_token',
-        },
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:string',
-            'values': LAMETRIC_PRIORITIES,
-            'default': LametricPriority.INFO,
-        },
-        'icon': {
-            'name': _('Custom Icon'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "apikey": {
+                "alias_of": "apikey",
+            },
+            "app_id": {
+                "alias_of": "app_id",
+            },
+            "app_ver": {
+                "alias_of": "app_ver",
+            },
+            "app_token": {
+                "alias_of": "app_token",
+            },
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:string",
+                "values": LAMETRIC_PRIORITIES,
+                "default": LametricPriority.INFO,
+            },
+            "icon": {
+                "name": _("Custom Icon"),
+                "type": "string",
+            },
+            "icon_type": {
+                "name": _("Icon Type"),
+                "type": "choice:string",
+                "values": LAMETRIC_ICON_TYPES,
+                "default": LametricIconType.NONE,
+            },
+            "mode": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": LAMETRIC_MODES,
+                "default": LametricMode.DEVICE,
+            },
+            "sound": {
+                "name": _("Sound"),
+                "type": "string",
+            },
+            # Lifetime is in seconds
+            "cycles": {
+                "name": _("Cycles"),
+                "type": "int",
+                "min": 0,
+                "default": 1,
+            },
         },
-        'icon_type': {
-            'name': _('Icon Type'),
-            'type': 'choice:string',
-            'values': LAMETRIC_ICON_TYPES,
-            'default': LametricIconType.NONE,
-        },
-        'mode': {
-            'name': _('Mode'),
-            'type': 'choice:string',
-            'values': LAMETRIC_MODES,
-            'default': LametricMode.DEVICE,
-        },
-        'sound': {
-            'name': _('Sound'),
-            'type': 'string',
-        },
-        # Lifetime is in seconds
-        'cycles': {
-            'name': _('Cycles'),
-            'type': 'int',
-            'min': 0,
-            'default': 1,
-        },
-    })
+    )
 
-    def __init__(self, apikey=None, app_token=None, app_id=None,
-                 app_ver=None, priority=None, icon=None, icon_type=None,
-                 sound=None, mode=None, cycles=None, **kwargs):
-        """
-        Initialize LaMetric Object
-        """
+    def __init__(
+        self,
+        apikey=None,
+        app_token=None,
+        app_id=None,
+        app_ver=None,
+        priority=None,
+        icon=None,
+        icon_type=None,
+        sound=None,
+        mode=None,
+        cycles=None,
+        **kwargs,
+    ):
+        """Initialize LaMetric Object."""
         super().__init__(**kwargs)
 
-        self.mode = mode.strip().lower() \
-            if isinstance(mode, str) \
-            else self.template_args['mode']['default']
+        self.mode = (
+            mode.strip().lower()
+            if isinstance(mode, str)
+            else self.template_args["mode"]["default"]
+        )
 
         # Default Cloud Argument
         self.lametric_app_id = None
@@ -483,7 +558,7 @@ def __init__(self, apikey=None, app_token=None, app_id=None,
         self.lametric_apikey = None
 
         if self.mode not in LAMETRIC_MODES:
-            msg = 'An invalid LaMetric Mode ({}) was specified.'.format(mode)
+            msg = f"An invalid LaMetric Mode ({mode}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -491,70 +566,89 @@ def __init__(self, apikey=None, app_token=None, app_id=None,
             try:
                 results = LAMETRIC_APP_ID_DETECTOR_RE.match(app_id)
             except TypeError:
-                msg = 'An invalid LaMetric Application ID ' \
-                      '({}) was specified.'.format(app_id)
+                msg = (
+                    "An invalid LaMetric Application ID "
+                    f"({app_id}) was specified."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
             # Detect our Access Token
             self.lametric_app_access_token = validate_regex(
-                app_token,
-                *self.template_tokens['app_token']['regex'])
+                app_token, *self.template_tokens["app_token"]["regex"]
+            )
             if not self.lametric_app_access_token:
-                msg = 'An invalid LaMetric Application Access Token ' \
-                      '({}) was specified.'.format(app_token)
+                msg = (
+                    "An invalid LaMetric Application Access Token "
+                    f"({app_token}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             # If app_ver is specified, it over-rides all
             if app_ver:
                 self.lametric_app_ver = validate_regex(
-                    app_ver, *self.template_tokens['app_ver']['regex'])
+                    app_ver, *self.template_tokens["app_ver"]["regex"]
+                )
                 if not self.lametric_app_ver:
-                    msg = 'An invalid LaMetric Application Version ' \
-                          '({}) was specified.'.format(app_ver)
+                    msg = (
+                        "An invalid LaMetric Application Version "
+                        f"({app_ver}) was specified."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
 
             else:
                 # If app_ver wasn't specified, we parse it from the
                 # Application ID
-                self.lametric_app_ver = results.group('app_ver') \
-                    if results.group('app_ver') else \
-                    self.template_tokens['app_ver']['default']
+                self.lametric_app_ver = (
+                    results.group("app_ver")
+                    if results.group("app_ver")
+                    else self.template_tokens["app_ver"]["default"]
+                )
 
             # Store our Application ID
-            self.lametric_app_id = results.group('app_id')
+            self.lametric_app_id = results.group("app_id")
 
         if self.mode == LametricMode.DEVICE:
             self.lametric_apikey = validate_regex(apikey)
             if not self.lametric_apikey:
-                msg = 'An invalid LaMetric Device API Key ' \
-                      '({}) was specified.'.format(apikey)
+                msg = (
+                    "An invalid LaMetric Device API Key "
+                    f"({apikey}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         if priority not in LAMETRIC_PRIORITIES:
-            self.priority = self.template_args['priority']['default']
+            self.priority = self.template_args["priority"]["default"]
 
         else:
             self.priority = priority
 
         # assign our icon (if it was defined); we also eliminate
         # any hashtag (#) entries that might be present
-        self.icon = re.search(r'[#\s]*(?P<value>.+?)\s*$', icon) \
-            .group('value') if isinstance(icon, str) else None
+        self.icon = (
+            re.search(r"[#\s]*(?P<value>.+?)\s*$", icon).group("value")
+            if isinstance(icon, str)
+            else None
+        )
 
         if icon_type not in LAMETRIC_ICON_TYPES:
-            self.icon_type = self.template_args['icon_type']['default']
+            self.icon_type = self.template_args["icon_type"]["default"]
 
         else:
             self.icon_type = icon_type
 
         # The number of times the message should be displayed
-        self.cycles = self.template_args['cycles']['default'] \
-            if not (isinstance(cycles, int) and
-                    cycles > self.template_args['cycles']['min']) else cycles
+        self.cycles = (
+            self.template_args["cycles"]["default"]
+            if not (
+                isinstance(cycles, int)
+                and cycles > self.template_args["cycles"]["min"]
+            )
+            else cycles
+        )
 
         self.sound = None
         if isinstance(sound, str):
@@ -562,17 +656,14 @@ def __init__(self, apikey=None, app_token=None, app_id=None,
             self.sound = self.sound_lookup(sound.strip().lower())
             if self.sound is None:
                 self.logger.warning(
-                    'An invalid LaMetric sound ({}) was specified.'.format(
-                        sound))
+                    f"An invalid LaMetric sound ({sound}) was specified."
+                )
         return
 
     @staticmethod
     def sound_lookup(lookup):
-        """
-        A simple match function that takes string and returns the
-        LametricSound object it was found in.
-
-        """
+        """A simple match function that takes string and returns the
+        LametricSound object it was found in."""
 
         for x in LAMETRIC_SOUNDS:
             match = next((f for f in x[1] if f.startswith(lookup)), None)
@@ -584,92 +675,92 @@ def sound_lookup(lookup):
         return None
 
     def _cloud_notification_payload(self, body, notify_type, headers):
-        """
-        Return URL and payload for cloud directed requests
-        """
+        """Return URL and payload for cloud directed requests."""
 
         # Update header entries
         headers.update({
-            'X-Access-Token': self.lametric_apikey,
+            "X-Access-Token": self.lametric_apikey,
         })
 
         if self.sound:
             self.logger.warning(
-                'LaMetric sound setting is unavailable in Cloud mode')
+                "LaMetric sound setting is unavailable in Cloud mode"
+            )
 
-        if self.priority != self.template_args['priority']['default']:
+        if self.priority != self.template_args["priority"]["default"]:
             self.logger.warning(
-                'LaMetric priority setting is unavailable in Cloud mode')
+                "LaMetric priority setting is unavailable in Cloud mode"
+            )
 
-        if self.icon_type != self.template_args['icon_type']['default']:
+        if self.icon_type != self.template_args["icon_type"]["default"]:
             self.logger.warning(
-                'LaMetric icon_type setting is unavailable in Cloud mode')
+                "LaMetric icon_type setting is unavailable in Cloud mode"
+            )
 
-        if self.cycles != self.template_args['cycles']['default']:
+        if self.cycles != self.template_args["cycles"]["default"]:
             self.logger.warning(
-                'LaMetric cycle settings is unavailable in Cloud mode')
+                "LaMetric cycle settings is unavailable in Cloud mode"
+            )
 
         # Assign our icon if the user specified a custom one, otherwise
         # choose from our pre-set list (based on notify_type)
-        icon = self.icon if self.icon \
+        icon = (
+            self.icon
+            if self.icon
             else self.lametric_icon_id_mapping[notify_type]
+        )
 
         # Our Payload
         # Cloud Notifications don't have as much functionality
         # You can not set priority and/or sound
         payload = {
-            "frames": [
-                {
-                    "icon": icon,
-                    "text": body,
-                    "index": 0,
-                }
-            ]
+            "frames": [{
+                "icon": icon,
+                "text": body,
+                "index": 0,
+            }]
         }
 
         # Prepare our Cloud Notify URL
         notify_url = self.cloud_notify_url.format(
-            app_id=self.lametric_app_id, app_ver=self.lametric_app_ver)
+            app_id=self.lametric_app_id, app_ver=self.lametric_app_ver
+        )
 
         # Return request parameters
         return (notify_url, None, payload)
 
     def _device_notification_payload(self, body, notify_type, headers):
-        """
-        Return URL and Payload for Device directed requests
-        """
+        """Return URL and Payload for Device directed requests."""
 
         # Assign our icon if the user specified a custom one, otherwise
         # choose from our pre-set list (based on notify_type)
-        icon = self.icon if self.icon \
+        icon = (
+            self.icon
+            if self.icon
             else self.lametric_icon_id_mapping[notify_type]
+        )
 
         # Our Payload
         payload = {
             # Priority of the message
             "priority": self.priority,
-
             # Icon Type: Represents the nature of notification
             "icon_type": self.icon_type,
-
             # The time notification lives in queue to be displayed in
             # milliseconds (ms). The default lifetime is 2 minutes (120000ms).
             # If notification stayed in queue for longer than lifetime
             # milliseconds - it will not be displayed.
             "lifetime": 120000,
-
             "model": {
                 # cycles - the number of times message should be displayed. If
                 # cycles is set to 0, notification will stay on the screen
                 # until user dismisses it manually. By default it is set to 1.
                 "cycles": self.cycles,
-                "frames": [
-                    {
-                        "icon": icon,
-                        "text": body,
-                    }
-                ]
-            }
+                "frames": [{
+                    "icon": icon,
+                    "text": body,
+                }],
+            },
         }
 
         if self.sound:
@@ -677,10 +768,8 @@ def _device_notification_payload(self, body, notify_type, headers):
             payload["model"]["sound"] = {
                 # The sound category
                 "category": self.sound[0],
-
                 # The first element of our tuple is always the id
                 "id": self.sound[1][0],
-
                 # repeat - defines the number of times sound must be played.
                 # If set to 0 sound will be played until notification is
                 # dismissed. By default the value is set to 1.
@@ -698,37 +787,39 @@ def _device_notification_payload(self, body, notify_type, headers):
         notify_url = self.device_notify_url.format(
             schema="https" if self.secure else "http",
             host=self.host,
-            port=':{}'.format(
-                self.port if self.port
-                else self.template_tokens['port']['default']))
+            port=":{}".format(
+                self.port
+                if self.port
+                else self.template_tokens["port"]["default"]
+            ),
+        )
 
         # Return request parameters
         return (notify_url, auth, payload)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform LaMetric Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform LaMetric Notification."""
 
         # Prepare our headers:
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
-            'Cache-Control': 'no-cache',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "Cache-Control": "no-cache",
         }
 
         # Depending on the mode, the payload is gathered by
         # - _device_notification_payload()
         # - _cloud_notification_payload()
         (notify_url, auth, payload) = getattr(
-            self, '_{}_notification_payload'.format(self.mode))(
-                body=body, notify_type=notify_type, headers=headers)
+            self, f"_{self.mode}_notification_payload"
+        )(body=body, notify_type=notify_type, headers=headers)
 
-        self.logger.debug('LaMetric POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('LaMetric Payload: %s' % str(payload))
+        self.logger.debug(
+            "LaMetric POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"LaMetric Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -750,31 +841,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # }
 
             if r.status_code not in (
-                    requests.codes.created, requests.codes.ok):
+                requests.codes.created,
+                requests.codes.ok,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyLametric.http_response_code_lookup(r.status_code)
+                status_str = NotifyLametric.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send LaMetric notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send LaMetric notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent LaMetric notification.')
+                self.logger.info("Sent LaMetric notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending LaMetric '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending LaMetric "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -783,18 +879,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         if self.mode == LametricMode.DEVICE:
             return (
                 self.secure_protocol if self.secure else self.protocol,
-                self.user, self.lametric_apikey, self.host,
-                self.port if self.port else (
-                    443 if self.secure else
-                    self.template_tokens['port']['default']),
+                self.user,
+                self.lametric_apikey,
+                self.host,
+                (
+                    self.port
+                    if self.port
+                    else (
+                        443
+                        if self.secure
+                        else self.template_tokens["port"]["default"]
+                    )
+                ),
             )
 
         return (
@@ -805,13 +909,11 @@ def url_identifier(self):
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'mode': self.mode,
+            "mode": self.mode,
         }
 
         # Extend our parameters
@@ -819,137 +921,144 @@ def url(self, privacy=False, *args, **kwargs):
 
         if self.icon:
             # Assign our icon IF one was specified
-            params['icon'] = self.icon
+            params["icon"] = self.icon
 
         if self.mode == LametricMode.CLOUD:
             # Upstream/LaMetric App Return
-            return '{schema}://{token}@{app_id}/{app_ver}/?{params}'.format(
+            return "{schema}://{token}@{app_id}/{app_ver}/?{params}".format(
                 schema=self.protocol,
                 token=self.pprint(
-                    self.lametric_app_access_token, privacy, safe=''),
-                app_id=self.pprint(self.lametric_app_id, privacy, safe=''),
-                app_ver=NotifyLametric.quote(self.lametric_app_ver, safe=''),
-                params=NotifyLametric.urlencode(params))
+                    self.lametric_app_access_token, privacy, safe=""
+                ),
+                app_id=self.pprint(self.lametric_app_id, privacy, safe=""),
+                app_ver=NotifyLametric.quote(self.lametric_app_ver, safe=""),
+                params=NotifyLametric.urlencode(params),
+            )
 
         #
         # If we reach here then we're dealing with LametricMode.DEVICE
         #
-        if self.priority != self.template_args['priority']['default']:
-            params['priority'] = self.priority
+        if self.priority != self.template_args["priority"]["default"]:
+            params["priority"] = self.priority
 
-        if self.icon_type != self.template_args['icon_type']['default']:
-            params['icon_type'] = self.icon_type
+        if self.icon_type != self.template_args["icon_type"]["default"]:
+            params["icon_type"] = self.icon_type
 
-        if self.cycles != self.template_args['cycles']['default']:
-            params['cycles'] = self.cycles
+        if self.cycles != self.template_args["cycles"]["default"]:
+            params["cycles"] = self.cycles
 
         if self.sound:
             # Store our sound entry
             # The first element of our tuple is always the id
-            params['sound'] = self.sound[1][0]
+            params["sound"] = self.sound[1][0]
 
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{apikey}@'.format(
-                user=NotifyLametric.quote(self.user, safe=''),
-                apikey=self.pprint(self.lametric_apikey, privacy, safe=''),
+            auth = "{user}:{apikey}@".format(
+                user=NotifyLametric.quote(self.user, safe=""),
+                apikey=self.pprint(self.lametric_apikey, privacy, safe=""),
             )
         else:  # self.apikey is set
-            auth = '{apikey}@'.format(
-                apikey=self.pprint(self.lametric_apikey, privacy, safe=''),
+            auth = "{apikey}@".format(
+                apikey=self.pprint(self.lametric_apikey, privacy, safe=""),
             )
 
         # Local Return
-        return '{schema}://{auth}{hostname}{port}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None
-                 or self.port == self.template_tokens['port']['default']
-                 else ':{}'.format(self.port),
+            port=(
+                ""
+                if self.port is None
+                or self.port == self.template_tokens["port"]["default"]
+                else f":{self.port}"
+            ),
             params=NotifyLametric.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if results.get('user') and not results.get('password'):
+        if results.get("user") and not results.get("password"):
             # Handle URL like:
             # schema://user@host
 
             # This becomes the password
-            results['password'] = results['user']
-            results['user'] = None
+            results["password"] = results["user"]
+            results["user"] = None
 
         # Get unquoted entries
-        entries = NotifyLametric.split_path(results['fullpath'])
+        entries = NotifyLametric.split_path(results["fullpath"])
 
         # Priority Handling
-        if 'priority' in results['qsd'] and results['qsd']['priority']:
-            results['priority'] = NotifyLametric.unquote(
-                results['qsd']['priority'].strip().lower())
+        if "priority" in results["qsd"] and results["qsd"]["priority"]:
+            results["priority"] = NotifyLametric.unquote(
+                results["qsd"]["priority"].strip().lower()
+            )
 
         # Icon Type
-        if 'icon' in results['qsd'] and results['qsd']['icon']:
-            results['icon'] = NotifyLametric.unquote(
-                results['qsd']['icon'].strip().lower())
+        if "icon" in results["qsd"] and results["qsd"]["icon"]:
+            results["icon"] = NotifyLametric.unquote(
+                results["qsd"]["icon"].strip().lower()
+            )
 
         # Icon Type
-        if 'icon_type' in results['qsd'] and results['qsd']['icon_type']:
-            results['icon_type'] = NotifyLametric.unquote(
-                results['qsd']['icon_type'].strip().lower())
+        if "icon_type" in results["qsd"] and results["qsd"]["icon_type"]:
+            results["icon_type"] = NotifyLametric.unquote(
+                results["qsd"]["icon_type"].strip().lower()
+            )
 
         # Sound
-        if 'sound' in results['qsd'] and results['qsd']['sound']:
-            results['sound'] = NotifyLametric.unquote(
-                results['qsd']['sound'].strip().lower())
+        if "sound" in results["qsd"] and results["qsd"]["sound"]:
+            results["sound"] = NotifyLametric.unquote(
+                results["qsd"]["sound"].strip().lower()
+            )
 
         # API Key (Device Mode)
-        if 'apikey' in results['qsd'] and results['qsd']['apikey']:
+        if "apikey" in results["qsd"] and results["qsd"]["apikey"]:
             # Extract API Key from an argument
-            results['apikey'] = \
-                NotifyLametric.unquote(results['qsd']['apikey'])
+            results["apikey"] = NotifyLametric.unquote(
+                results["qsd"]["apikey"]
+            )
 
         # App ID
-        if 'app' in results['qsd'] \
-                and results['qsd']['app']:
+        if "app" in results["qsd"] and results["qsd"]["app"]:
 
             # Extract the App ID from an argument
-            results['app_id'] = \
-                NotifyLametric.unquote(results['qsd']['app'])
+            results["app_id"] = NotifyLametric.unquote(results["qsd"]["app"])
 
         # App Version
-        if 'app_ver' in results['qsd'] \
-                and results['qsd']['app_ver']:
+        if "app_ver" in results["qsd"] and results["qsd"]["app_ver"]:
 
             # Extract the App ID from an argument
-            results['app_ver'] = \
-                NotifyLametric.unquote(results['qsd']['app_ver'])
+            results["app_ver"] = NotifyLametric.unquote(
+                results["qsd"]["app_ver"]
+            )
 
         elif entries:
             # Store our app id
-            results['app_ver'] = entries.pop(0)
+            results["app_ver"] = entries.pop(0)
 
-        if 'token' in results['qsd'] and results['qsd']['token']:
+        if "token" in results["qsd"] and results["qsd"]["token"]:
             # Extract Application Access Token from an argument
-            results['app_token'] = \
-                NotifyLametric.unquote(results['qsd']['token'])
+            results["app_token"] = NotifyLametric.unquote(
+                results["qsd"]["token"]
+            )
 
         # Mode override
-        if 'mode' in results['qsd'] and results['qsd']['mode']:
-            results['mode'] = NotifyLametric.unquote(
-                results['qsd']['mode'].strip().lower())
+        if "mode" in results["qsd"] and results["qsd"]["mode"]:
+            results["mode"] = NotifyLametric.unquote(
+                results["qsd"]["mode"].strip().lower()
+            )
         else:
             # We can try to detect the mode based on the validity of the
             # hostname. We can also scan the validity of the Application
@@ -957,42 +1066,47 @@ def parse_url(url):
             #
             # This isn't a surfire way to do things though; it's best to
             # specify the mode= flag
-            results['mode'] = LametricMode.DEVICE \
-                if ((is_hostname(results['host']) or
-                    is_ipaddr(results['host'])) and
-
+            results["mode"] = (
+                LametricMode.DEVICE
+                if (
+                    (
+                        is_hostname(results["host"])
+                        or is_ipaddr(results["host"])
+                    )
+                    and
                     # make sure password is not an Access Token
-                    (results['password'] and not
-                        LAMETRIC_IS_APP_TOKEN.match(results['password'])) and
-
+                    (
+                        results["password"]
+                        and not LAMETRIC_IS_APP_TOKEN.match(
+                            results["password"]
+                        )
+                    )
+                    and
                     # Scan for app_ flags
-                    next((f for f in results.keys()
-                          if f.startswith('app_')), None) is None) \
+                    next((f for f in results if f.startswith("app_")), None)
+                    is None
+                )
                 else LametricMode.CLOUD
+            )
 
         # Handle defaults if not set
-        if results['mode'] == LametricMode.DEVICE:
+        if results["mode"] == LametricMode.DEVICE:
             # Device Mode Defaults
-            if 'apikey' not in results:
-                results['apikey'] = \
-                    NotifyLametric.unquote(results['password'])
+            if "apikey" not in results:
+                results["apikey"] = NotifyLametric.unquote(results["password"])
 
         else:
             # CLOUD Mode Defaults
-            if 'app_id' not in results:
-                results['app_id'] = \
-                    NotifyLametric.unquote(results['host'])
-            if 'app_token' not in results:
-                results['app_token'] = \
-                    NotifyLametric.unquote(results['password'])
+            if "app_id" not in results:
+                results["app_id"] = NotifyLametric.unquote(results["host"])
+            if "app_token" not in results:
+                results["app_token"] = NotifyLametric.unquote(
+                    results["password"]
+                )
 
         # Set cycles
-        try:
-            results['cycles'] = abs(int(results['qsd'].get('cycles')))
-
-        except (TypeError, ValueError):
-            # Not a valid integer; ignore entry
-            pass
+        with contextlib.suppress(TypeError, ValueError):
+            results["cycles"] = abs(int(results["qsd"].get("cycles")))
 
         return results
 
@@ -1011,22 +1125,36 @@ def parse_native_url(url):
         # ?token={APP_ACCESS_TOKEN} to the parameters at the end or the
         # URL will fail to load in later stages.
         result = re.match(
-            r'^http(?P<secure>s)?://(?P<host>[^/]+)'
-            r'/api/(?P<api_ver>v[1-9]*[0-9]+)'
-            r'/dev/widget/update/'
-            r'com\.lametric\.(?P<app_id>[0-9a-z.-]{1,64})'
-            r'(/(?P<app_ver>[1-9][0-9]*))?/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^http(?P<secure>s)?://(?P<host>[^/]+)"
+            r"/api/(?P<api_ver>v[1-9]*[0-9]+)"
+            r"/dev/widget/update/"
+            r"com\.lametric\.(?P<app_id>[0-9a-z.-]{1,64})"
+            r"(/(?P<app_ver>[1-9][0-9]*))?/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyLametric.parse_url(
-                '{schema}://{app_id}{app_ver}/{params}'.format(
-                    schema=NotifyLametric.secure_protocol
-                    if result.group('secure') else NotifyLametric.protocol,
-                    app_id=result.group('app_id'),
-                    app_ver='/{}'.format(result.group('app_ver'))
-                    if result.group('app_ver') else '',
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                "{schema}://{app_id}{app_ver}/{params}".format(
+                    schema=(
+                        NotifyLametric.secure_protocol
+                        if result.group("secure")
+                        else NotifyLametric.protocol
+                    ),
+                    app_id=result.group("app_id"),
+                    app_ver=(
+                        "/{}".format(result.group("app_ver"))
+                        if result.group("app_ver")
+                        else ""
+                    ),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/lark.py b/libs/apprise/plugins/lark.py
new file mode 100644
index 0000000000..4681e53923
--- /dev/null
+++ b/libs/apprise/plugins/lark.py
@@ -0,0 +1,188 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Details at:
+# https://open.larksuite.com/document/client-docs/bot-v3/add-bot
+
+import json
+import re
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
+
+
+class NotifyLark(NotifyBase):
+    """A wrapper for Lark (Feishu) Notifications via Webhook."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("Lark (Feishu)")
+
+    service_url = "https://open.larksuite.com/"
+
+    # The default protocol
+    secure_protocol = "lark"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/lark/"
+
+    # This is the static part of the webhook URL; only the token varies.
+    notify_url = "https://open.larksuite.com/open-apis/bot/v2/hook/"
+
+    # Define object templates
+    templates = ("{schema}://{token}",)
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Bot Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9-]+$", "i"),
+            },
+        },
+    )
+
+    def __init__(self, token, **kwargs):
+        """Initialize Email Object.
+
+        The smtp_host and secure_mode can be automatically detected depending
+        on how the URL was built
+        """
+        super().__init__(**kwargs)
+
+        # The token associated with the account
+        self.token = validate_regex(
+            token, *self.template_tokens["token"]["regex"]
+        )
+        if not self.token:
+            msg = f"The Lark Bot Token token specified ({token}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.webhook_url = f"{self.notify_url}{self.token}"
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+        return (
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{NotifyLark.urlencode(params)}"
+        )
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Returns all of the identifiers that make this URL unique from
+        another similar one.
+
+        Targets or end points should never be identified here.
+        """
+        self.throttle()
+
+        payload = {
+            "msg_type": "text",
+            "content": {"text": f"{title}\n{body}" if title else body},
+        }
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+        }
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+        try:
+            r = requests.post(
+                self.webhook_url,
+                headers=headers,
+                data=json.dumps(payload),
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+            if r.status_code != requests.codes.ok:
+                self.logger.warning(
+                    "Lark notification failed: %d - %s", r.status_code, r.text
+                )
+                return False
+
+        except requests.RequestException as e:
+            self.logger.warning(f"Lark Exception: {e}")
+            return False
+
+        self.logger.info("Lark notification sent successfully.")
+        return True
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another similar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol, self.token)
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Set our token if found as an argument
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyLark.unquote(results["qsd"]["token"])
+
+        else:
+            # Fall back to hose (if defined here)
+            results["token"] = NotifyLark.unquote(results["host"])
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """
+        Support https://open.larksuite.com/open-apis/bot/v2/hook//WEBHOOK_TOKEN
+        """
+        match = re.match(
+            r"^https://open\.larksuite\.com/open-apis/bot/v2/hook/([\w-]+)$",
+            url,
+            re.I,
+        )
+        if not match:
+            return None
+
+        return NotifyLark.parse_url(
+            f"{NotifyLark.secure_protocol}://{match.group(1)}"
+        )
diff --git a/libs/apprise/plugins/line.py b/libs/apprise/plugins/line.py
index bcca3e13c9..76ceffac58 100644
--- a/libs/apprise/plugins/line.py
+++ b/libs/apprise/plugins/line.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,41 +28,38 @@
 #
 # API Docs: https://developers.line.biz/en/reference/messaging-api/
 
-import requests
-import re
 from json import dumps
+import re
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..utils.parse import validate_regex, parse_list, parse_bool
-from ..locale import gettext_lazy as _
+import requests
 
+from ..common import NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Used to break path apart into list of streams
-TARGET_LIST_DELIM = re.compile(r'[ \t\r\n,#\\/]+')
+TARGET_LIST_DELIM = re.compile(r"[ \t\r\n,#\\/]+")
 
 
 class NotifyLine(NotifyBase):
-    """
-    A wrapper for Line Notifications
-    """
+    """A wrapper for Line Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Line'
+    service_name = "Line"
 
     # The services URL
-    service_url = 'https://line.me/'
+    service_url = "https://line.me/"
 
     # Secure Protocol
-    secure_protocol = 'line'
+    secure_protocol = "line"
 
     # The URL refererenced for remote Notifications
-    notify_url = 'https://api.line.me/v2/bot/message/push'
+    notify_url = "https://api.line.me/v2/bot/message/push"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_line'
+    setup_url = "https://appriseit.com/services/line/"
 
     # We don't support titles for Line notifications
     title_maxlen = 0
@@ -76,54 +72,55 @@ class NotifyLine(NotifyBase):
     image_size = NotifyImageSize.XY_128
 
     # Define object templates
-    templates = (
-        '{schema}://{token}/{targets}',
-    )
+    templates = ("{schema}://{token}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'private': True,
-            'required': True
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-    })
+    )
 
     def __init__(self, token, targets=None, include_image=True, **kwargs):
-        """
-        Initialize Line Object
-        """
+        """Initialize Line Object."""
         super().__init__(**kwargs)
 
         # Long-Lived Access token (generated from User Profile)
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Access Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Access Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -134,18 +131,16 @@ def __init__(self, token, targets=None, include_image=True, **kwargs):
         self.targets = parse_list(targets)
 
         # A dictionary of cached users
-        self.__cached_users = dict()
+        self.__cached_users = {}
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Send our Line Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send our Line Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no Line targets to notify.')
+            self.logger.warning("There were no Line targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -153,29 +148,27 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer {}'.format(self.token),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.token}",
         }
 
         # Prepare our persistent_notification.create payload
         payload = {
             "to": None,
-            "messages": [
-                {
-                    "type": "text",
-                    "text": body,
-                    "sender": {
-                        "name": self.app_id,
-                    }
-
-                }
-            ]
+            "messages": [{
+                "type": "text",
+                "text": body,
+                "sender": {
+                    "name": self.app_id,
+                },
+            }],
         }
 
         # Acquire our image url if configured to do so
-        image_url = None if not self.include_image else \
-            self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if image_url:
             payload["messages"][0]["sender"]["iconUrl"] = image_url
@@ -185,12 +178,13 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         while len(targets):
             target = targets.pop(0)
 
-            payload['to'] = target
+            payload["to"] = target
 
-            self.logger.debug('Line POST URL: %s (cert_verify=%r)' % (
-                self.notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('Line Payload: %s' % str(payload))
+            self.logger.debug(
+                "Line POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Line Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -204,34 +198,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyLine.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyLine.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Line notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Line notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Line notification to {}.'.format(target))
+                    self.logger.info(f"Sent Line notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Line '
-                    'notification to {}.'.format(target))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Line "
+                    f"notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -241,49 +237,44 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
+            "image": "yes" if self.include_image else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{token}/{targets}?{params}'.format(
+        return "{schema}://{token}/{targets}?{params}".format(
             schema=self.secure_protocol,
             # never encode hostname since we're expecting it to be a valid one
             token=self.pprint(
-                self.token, privacy, mode=PrivacyMode.Secret, safe=''),
-            targets='/'.join(
-                [self.pprint(x, privacy, safe='') for x in self.targets]),
+                self.token, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            targets="/".join(
+                [self.pprint(x, privacy, safe="") for x in self.targets]
+            ),
             params=NotifyLine.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -291,37 +282,44 @@ def parse_url(url):
             return results
 
         # Get unquoted entries
-        results['targets'] = NotifyLine.split_path(results['fullpath'])
+        results["targets"] = NotifyLine.split_path(results["fullpath"])
 
         # The 'token' makes it easier to use yaml configuration
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = \
-                NotifyLine.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyLine.unquote(results["qsd"]["token"])
         else:
-            results['token'] = NotifyLine.unquote(results['host'])
+            results["token"] = NotifyLine.unquote(results["host"])
 
             # Line Long Lived Tokens included forward slashes in them.
             # As a result we need to parse further into our path and look
             # for the entry that ends in an equal symbol.
-            if not results['token'].endswith('='):
+            if not results["token"].endswith("="):
                 for index, entry in enumerate(
-                        list(results['targets']), start=1):
-                    if entry.endswith('='):
+                    list(results["targets"]), start=1
+                ):
+                    if entry.endswith("="):
                         # Found
-                        results['token'] += \
-                            '/' + '/'.join(results['targets'][0:index])
-                        results['targets'] = results['targets'][index:]
+                        results["token"] += "/" + "/".join(
+                            results["targets"][0:index]
+                        )
+                        results["targets"] = results["targets"][index:]
                         break
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += [x for x in filter(
-                bool, TARGET_LIST_DELIM.split(
-                    NotifyLine.unquote(results['qsd']['to'])))]
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += list(
+                filter(
+                    bool,
+                    TARGET_LIST_DELIM.split(
+                        NotifyLine.unquote(results["qsd"]["to"])
+                    ),
+                )
+            )
 
         return results
diff --git a/libs/apprise/plugins/lunasea.py b/libs/apprise/plugins/lunasea.py
deleted file mode 100644
index 09a7ab541a..0000000000
--- a/libs/apprise/plugins/lunasea.py
+++ /dev/null
@@ -1,456 +0,0 @@
-# -*- coding: utf-8 -*-
-# BSD 2-Clause License
-#
-# Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# API:
-#   https://docs.lunasea.app/lunasea/notifications/custom-notifications
-#
-import re
-import requests
-from json import dumps
-
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..utils.parse import (
-    parse_list, is_hostname, is_ipaddr, parse_bool)
-from ..locale import gettext_lazy as _
-from ..url import PrivacyMode
-
-
-class LunaSeaMode:
-    """
-    Define LunaSea Notification Modes
-    """
-    # App posts upstream to the developer API on LunaSea's website
-    CLOUD = "cloud"
-
-    # Running a dedicated private ntfy Server
-    PRIVATE = "private"
-
-
-LUNASEA_MODES = (
-    LunaSeaMode.CLOUD,
-    LunaSeaMode.PRIVATE,
-)
-
-
-class NotifyLunaSea(NotifyBase):
-    """
-    A wrapper for LunaSea Notifications
-    """
-
-    # The default descriptive name associated with the Notification
-    service_name = 'LunaSea'
-
-    # The services URL
-    service_url = 'https://luasea.app'
-
-    # The default insecure protocol
-    protocol = ('lunasea', 'lsea')
-
-    # The default secure protocol
-    secure_protocol = ('lunaseas', 'lseas')
-
-    # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_lunasea'
-
-    # Allows the user to specify the NotifyImageSize object
-    image_size = NotifyImageSize.XY_256
-
-    # LunaSea Notification Details
-    cloud_notify_url = 'https://notify.lunasea.app'
-    notify_user_path = '/v1/custom/user/{}'
-    notify_device_path = '/v1/custom/device/{}'
-
-    # if our hostname matches the following we automatically enforce
-    # cloud mode
-    __auto_cloud_host = re.compile(r'(notify\.)?lunasea\.app', re.IGNORECASE)
-
-    # Define object templates
-    templates = (
-        '{schema}://{targets}',
-        '{schema}://{host}/{targets}',
-        '{schema}://{host}:{port}/{targets}',
-        '{schema}://{user}@{host}/{targets}',
-        '{schema}://{user}@{host}:{port}/{targets}',
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
-    )
-
-    # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'prefix': '+',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
-
-    # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-        'mode': {
-            'name': _('Mode'),
-            'type': 'choice:string',
-            'values': LUNASEA_MODES,
-            'default': LunaSeaMode.PRIVATE,
-        },
-    })
-
-    def __init__(self, targets=None, mode=None, token=None,
-                 include_image=False, **kwargs):
-        """
-        Initialize LunaSea Object
-        """
-        super().__init__(**kwargs)
-
-        # Show image associated with notification
-        self.include_image = \
-            self.template_args['image']['default'] \
-            if include_image is None else include_image
-
-        # Prepare our mode
-        self.mode = mode.strip().lower() \
-            if isinstance(mode, str) \
-            else self.template_args['mode']['default']
-
-        if self.mode not in LUNASEA_MODES:
-            msg = 'An invalid LunaSea mode ({}) was specified.'.format(mode)
-            self.logger.warning(msg)
-            raise TypeError(msg)
-
-        self.targets = []
-        for target in parse_list(targets):
-            if len(target) < 4:
-                self.logger.warning(
-                    'A specified target ({}) is invalid and will be '
-                    'ignored'.format(target))
-                continue
-
-            if target[0] == '+':
-                # Device
-                self.targets.append(('+', target[1:]))
-
-            elif target[0] == '@':
-                # User
-                self.targets.append(('@', target[1:]))
-
-            else:
-                # User
-                self.targets.append(('@', target))
-
-        return
-
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform LunaSea Notification
-        """
-
-        # error tracking (used for function return)
-        has_error = False
-
-        if not len(self.targets):
-            # We have nothing to notify; we're done
-            self.logger.warning('There are no LunaSea targets to notify')
-            return False
-
-        # Prepare our headers
-        headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
-        }
-
-        # prepare payload
-        payload = {
-            'title': title if title else self.app_desc,
-            'body': body,
-        }
-
-        # Acquire image_url
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
-
-        if image_url:
-            payload['image'] = image_url
-
-        # Prepare our Authentication (if defined)
-        if self.user and self.password:
-            auth = (self.user, self.password)
-
-        else:
-            # No Auth
-            auth = None
-
-        if self.mode == LunaSeaMode.CLOUD:
-            # Cloud Service
-            notify_url = self.cloud_notify_url
-
-        else:
-            # Local Hosting
-            schema = 'https' if self.secure else 'http'
-
-            notify_url = '%s://%s' % (schema, self.host)
-            if isinstance(self.port, int):
-                notify_url += ':%d' % self.port
-
-        # Create a copy of the targets list
-        targets = list(self.targets)
-        while len(targets):
-            target = targets.pop(0)
-
-            if target[0] == '+':
-                url = notify_url + self.notify_device_path.format(target[1])
-
-            else:
-                url = notify_url + self.notify_user_path.format(target[1])
-
-            self.logger.debug('LunaSea POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('LunaSea Payload: %s' % str(payload))
-
-            # Always call throttle before any remote server i/o is made
-            self.throttle()
-
-            try:
-                r = requests.post(
-                    url,
-                    data=dumps(payload),
-                    headers=headers,
-                    auth=auth,
-                    verify=self.verify_certificate,
-                    timeout=self.request_timeout,
-                )
-
-                if r.status_code not in (
-                        requests.codes.ok, requests.codes.no_content):
-                    # We had a problem
-                    status_str = \
-                        NotifyLunaSea.http_response_code_lookup(r.status_code)
-
-                    self.logger.warning(
-                        'Failed to deliver payload to LunaSea:'
-                        '{}{}error={}.'.format(
-                            status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
-
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
-
-                    has_error = True
-
-                # otherwise we were successful
-                continue
-
-            except requests.RequestException as e:
-                self.logger.warning(
-                    'A Connection error occurred communicating with LunaSea.')
-                self.logger.debug('Socket Exception: %s' % str(e))
-
-                has_error = True
-
-        return not has_error
-
-    @property
-    def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
-        """
-        secure = self.secure_protocol[0] \
-            if self.mode == LunaSeaMode.CLOUD else (
-                self.secure_protocol[0] if self.secure else self.protocol[0])
-        return (
-            secure,
-            self.host if self.mode == LunaSeaMode.PRIVATE else None,
-            self.port if self.port else (443 if self.secure else 80),
-            self.user if self.user else None,
-            self.password if self.password else None,
-        )
-
-    def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
-
-        params = {
-            'mode': self.mode,
-            'image': 'yes' if self.include_image else 'no',
-        }
-
-        # Our URL parameters
-        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
-
-        auth = ''
-        if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyLunaSea.quote(self.user, safe=''),
-                password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret,
-                    safe=''),
-            )
-        elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyLunaSea.quote(self.user, safe=''),
-            )
-
-        if self.mode == LunaSeaMode.PRIVATE:
-            default_port = 443 if self.secure else 80
-            return '{schema}://{auth}{host}{port}/{targets}?{params}'.format(
-                schema=self.secure_protocol[0]
-                if self.secure else self.protocol[0],
-                auth=auth,
-                host=self.host,
-                port='' if self.port is None or self.port == default_port
-                else ':{}'.format(self.port),
-                targets='/'.join(
-                    [NotifyLunaSea.quote(x[0] + x[1], safe='@+')
-                     for x in self.targets]),
-                params=NotifyLunaSea.urlencode(params)
-            )
-
-        else:  # Cloud mode
-            return '{schema}://{auth}{targets}?{params}'.format(
-                schema=self.protocol[0],
-                auth=auth,
-                targets='/'.join(
-                    [NotifyLunaSea.quote(x[0] + x[1], safe='@+')
-                     for x in self.targets]),
-                params=NotifyLunaSea.urlencode(params)
-            )
-
-    def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
-        # always return 1
-        return 1 if not self.targets else len(self.targets)
-
-    @staticmethod
-    def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
-        results = NotifyBase.parse_url(url, verify_host=False)
-        if not results:
-            # We're done early as we couldn't load the results
-            return results
-
-        # Fetch our targets
-        results['targets'] = NotifyLunaSea.split_path(results['fullpath'])
-
-        # Boolean to include an image or not
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyLunaSea.template_args['image']['default']))
-
-        # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyLunaSea.parse_list(results['qsd']['to'])
-
-        # Mode override
-        if 'mode' in results['qsd'] and results['qsd']['mode']:
-            results['mode'] = NotifyLunaSea.unquote(
-                results['qsd']['mode'].strip().lower())
-
-        else:
-            # We can try to detect the mode based on the validity of the
-            # hostname.
-            #
-            # This isn't a surfire way to do things though; it's best to
-            # specify the mode= flag
-            results['mode'] = LunaSeaMode.PRIVATE \
-                if ((is_hostname(results['host'])
-                    or is_ipaddr(results['host'])) and results['targets']) \
-                else LunaSeaMode.CLOUD
-
-        if results['mode'] == LunaSeaMode.CLOUD:
-            # Store first entry as it can be a topic too in this case
-            # But only if we also rule it out not being the words
-            # lunasea.app itself, something that starts wiht an non-alpha
-            # numeric character:
-            if not NotifyLunaSea.__auto_cloud_host.search(results['host']):
-                # Add it to the front of the list for consistency
-                results['targets'].insert(0, results['host'])
-
-        elif results['mode'] == LunaSeaMode.PRIVATE and \
-                not (is_hostname(results['host'] or
-                     is_ipaddr(results['host']))):
-            # Invalid Host for LunaSeaMode.PRIVATE
-            return None
-
-        return results
diff --git a/libs/apprise/plugins/macosx.py b/libs/apprise/plugins/macosx.py
index 6107d33e7f..b72f373efd 100644
--- a/libs/apprise/plugins/macosx.py
+++ b/libs/apprise/plugins/macosx.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,34 +25,33 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import os
 import platform
 import subprocess
-import os
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_bool
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 # Default our global support flag
 NOTIFY_MACOSX_SUPPORT_ENABLED = False
 
 
-if platform.system() == 'Darwin':
+if platform.system() == "Darwin":
     # Check this is Mac OS X 10.8, or higher
-    major, minor = platform.mac_ver()[0].split('.')[:2]
+    major, minor = platform.mac_ver()[0].split(".")[:2]
 
     # Toggle our enabled flag, if version is correct and executable
     # found. This is done in such a way to provide verbosity to the
     # end user, so they know why it may or may not work for them.
-    NOTIFY_MACOSX_SUPPORT_ENABLED = \
-        (int(major) > 10 or (int(major) == 10 and int(minor) >= 8))
+    NOTIFY_MACOSX_SUPPORT_ENABLED = int(major) > 10 or (
+        int(major) == 10 and int(minor) >= 8
+    )
 
 
 class NotifyMacOSX(NotifyBase):
-    """
-    A wrapper for the MacOS X terminal-notifier tool
+    """A wrapper for the MacOS X terminal-notifier tool.
 
     Source: https://github.com/julienXX/terminal-notifier
     """
@@ -63,23 +61,24 @@ class NotifyMacOSX(NotifyBase):
 
     requirements = {
         # Define our required packaging in order to work
-        'details': _(
-            'Only works with Mac OS X 10.8 and higher. Additionally '
-            ' requires that /usr/local/bin/terminal-notifier is locally '
-            'accessible.')
+        "details": _(
+            "Only works with Mac OS X 10.8 and higher. Additionally "
+            " requires that /usr/local/bin/terminal-notifier is locally "
+            "accessible."
+        )
     }
 
     # The default descriptive name associated with the Notification
-    service_name = _('MacOSX Notification')
+    service_name = _("MacOSX Notification")
 
     # The services URL
-    service_url = 'https://github.com/julienXX/terminal-notifier'
+    service_url = "https://github.com/julienXX/terminal-notifier"
 
     # The default protocol
-    protocol = 'macosx'
+    protocol = "macosx"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_macosx'
+    setup_url = "https://appriseit.com/services/macosx/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_128
@@ -98,43 +97,42 @@ class NotifyMacOSX(NotifyBase):
 
     # The possible paths to the terminal-notifier
     notify_paths = (
-        '/opt/homebrew/bin/terminal-notifier',
-        '/usr/local/bin/terminal-notifier',
-        '/usr/bin/terminal-notifier',
-        '/bin/terminal-notifier',
-        '/opt/local/bin/terminal-notifier',
+        "/opt/homebrew/bin/terminal-notifier",
+        "/usr/local/bin/terminal-notifier",
+        "/usr/bin/terminal-notifier",
+        "/bin/terminal-notifier",
+        "/opt/local/bin/terminal-notifier",
     )
 
     # Define object templates
-    templates = (
-        '{schema}://',
-    )
+    templates = ("{schema}://",)
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        # Play the NAME sound when the notification appears.
-        # Sound names are listed in Sound Preferences.
-        # Use 'default' for the default sound.
-        'sound': {
-            'name': _('Sound'),
-            'type': 'string',
-        },
-        'click': {
-            'name': _('Open/Click URL'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            # Play the NAME sound when the notification appears.
+            # Sound names are listed in Sound Preferences.
+            # Use 'default' for the default sound.
+            "sound": {
+                "name": _("Sound"),
+                "type": "string",
+            },
+            "click": {
+                "name": _("Open/Click URL"),
+                "type": "string",
+            },
         },
-    })
+    )
 
     def __init__(self, sound=None, include_image=True, click=None, **kwargs):
-        """
-        Initialize MacOSX Object
-        """
+        """Initialize MacOSX Object."""
 
         super().__init__(**kwargs)
 
@@ -143,7 +141,8 @@ def __init__(self, sound=None, include_image=True, click=None, **kwargs):
 
         # Acquire the path to the `terminal-notifier` program.
         self.notify_path = next(  # pragma: no branch
-            (p for p in self.notify_paths if os.access(p, os.X_OK)), None)
+            (p for p in self.notify_paths if os.access(p, os.X_OK)), None
+        )
 
         # Click URL
         # Allow user to provide the `--open` argument on the notify wrapper
@@ -152,46 +151,46 @@ def __init__(self, sound=None, include_image=True, click=None, **kwargs):
         # Set sound object (no q/a for now)
         self.sound = sound
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform MacOSX Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform MacOSX Notification."""
 
         if not (self.notify_path and os.access(self.notify_path, os.X_OK)):
             self.logger.warning(
                 "MacOSX Notifications requires one of the following to "
-                "be in place: '{}'.".format(
-                    '\', \''.join(self.notify_paths)))
+                "be in place: '{}'.".format("', '".join(self.notify_paths))
+            )
             return False
 
         # Start with our notification path
         cmd = [
             self.notify_path,
-            '-message', body,
+            "-message",
+            body,
         ]
 
         # Title is an optional switch
         if title:
-            cmd.extend(['-title', title])
+            cmd.extend(["-title", title])
 
         if self.click:
-            cmd.extend(['-open', self.click])
+            cmd.extend(["-open", self.click])
 
         # The sound to play
         if self.sound:
-            cmd.extend(['-sound', self.sound])
+            cmd.extend(["-sound", self.sound])
 
         # Support any defined images if set
-        image_path = None if not self.include_image \
-            else self.image_url(notify_type)
+        image_path = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
         if image_path:
-            cmd.extend(['-appIcon', image_path])
+            cmd.extend(["-appIcon", image_path])
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
 
         # Capture some output for helpful debugging later on
-        self.logger.debug('MacOSX CMD: {}'.format(' '.join(cmd)))
+        self.logger.debug("MacOSX CMD: {}".format(" ".join(cmd)))
 
         # Send our notification
         output = subprocess.Popen(cmd)
@@ -200,59 +199,54 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         output.wait()
 
         if output.returncode:
-            self.logger.warning('Failed to send MacOSX notification.')
-            self.logger.exception('MacOSX Exception')
+            self.logger.warning("Failed to send MacOSX notification.")
+            self.logger.exception("MacOSX Exception")
             return False
 
-        self.logger.info('Sent MacOSX notification.')
+        self.logger.info("Sent MacOSX notification.")
         return True
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parametrs
         params = {
-            'image': 'yes' if self.include_image else 'no',
+            "image": "yes" if self.include_image else "no",
         }
 
         if self.click:
-            params['click'] = self.click
+            params["click"] = self.click
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         if self.sound:
             # Store our sound
-            params['sound'] = self.sound
+            params["sound"] = self.sound
 
-        return '{schema}://_/?{params}'.format(
-            schema=self.protocol,
-            params=NotifyMacOSX.urlencode(params),
-        )
+        return f"{self.protocol}://_/?{NotifyMacOSX.urlencode(params)}"
 
     @staticmethod
     def parse_url(url):
-        """
-        There are no parameters nessisary for this protocol; simply having
-        gnome:// is all you need.  This function just makes sure that
-        is in place.
+        """There are no parameters nessisary for this protocol; simply having
+        gnome:// is all you need.
 
+        This function just makes sure that is in place.
         """
 
         results = NotifyBase.parse_url(url, verify_host=False)
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         # Support 'click'
-        if 'click' in results['qsd'] and len(results['qsd']['click']):
-            results['click'] = NotifyMacOSX.unquote(results['qsd']['click'])
+        if "click" in results["qsd"] and len(results["qsd"]["click"]):
+            results["click"] = NotifyMacOSX.unquote(results["qsd"]["click"])
 
         # Support 'sound'
-        if 'sound' in results['qsd'] and len(results['qsd']['sound']):
-            results['sound'] = NotifyMacOSX.unquote(results['qsd']['sound'])
+        if "sound" in results["qsd"] and len(results["qsd"]["sound"]):
+            results["sound"] = NotifyMacOSX.unquote(results["qsd"]["sound"])
 
         return results
diff --git a/libs/apprise/plugins/mailgun.py b/libs/apprise/plugins/mailgun.py
index a7d5258e3e..9186c0b8a9 100644
--- a/libs/apprise/plugins/mailgun.py
+++ b/libs/apprise/plugins/mailgun.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -54,37 +53,37 @@
 #  the email will be transmitted from.  If no email address is specified
 #  then it will also become the 'to' address as well.
 #
-import requests
 from email.utils import formataddr
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import (
-    parse_emails, parse_bool, is_email, validate_regex)
-from ..logger import logger
+
+import requests
+
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..logger import logger
+from ..utils.parse import is_email, parse_bool, parse_emails, validate_regex
+from .base import NotifyBase
 
 # Provide some known codes Mailgun uses and what they translate to:
 # Based on https://documentation.mailgun.com/en/latest/api-intro.html#errors
 MAILGUN_HTTP_ERROR_MAP = {
-    400: 'A bad request was made to the server.',
-    401: 'The provided API Key was not valid.',
-    402: 'The request failed for a reason out of your control.',
-    404: 'The requested API query is not valid.',
-    413: 'Provided attachment is to big.',
+    400: "A bad request was made to the server.",
+    401: "The provided API Key was not valid.",
+    402: "The request failed for a reason out of your control.",
+    404: "The requested API query is not valid.",
+    413: "Provided attachment is to big.",
 }
 
 
 # Priorities
 class MailgunRegion:
-    US = 'us'
-    EU = 'eu'
+    US = "us"
+    EU = "eu"
 
 
 # Mailgun APIs
 MAILGUN_API_LOOKUP = {
-    MailgunRegion.US: 'https://api.mailgun.net/v3/',
-    MailgunRegion.EU: 'https://api.eu.mailgun.net/v3/',
+    MailgunRegion.US: "https://api.mailgun.net/v3/",
+    MailgunRegion.EU: "https://api.eu.mailgun.net/v3/",
 }
 
 # A List of our regions we can use for verification
@@ -95,25 +94,23 @@ class MailgunRegion:
 
 
 class NotifyMailgun(NotifyBase):
-    """
-    A wrapper for Mailgun Notifications
-    """
+    """A wrapper for Mailgun Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Mailgun'
+    service_name = "Mailgun"
 
     # The services URL
-    service_url = 'https://www.mailgun.com/'
+    service_url = "https://www.mailgun.com/"
 
     # All notification requests are secure
-    secure_protocol = 'mailgun'
+    secure_protocol = "mailgun"
 
     # Mailgun advertises they allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_mailgun'
+    setup_url = "https://appriseit.com/services/mailgun/"
 
     # Support attachments
     attachment_support = True
@@ -127,110 +124,123 @@ class NotifyMailgun(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}@{host}:{apikey}/',
-        '{schema}://{user}@{host}:{apikey}/{targets}',
+        "{schema}://{user}@{host}:{apikey}/",
+        "{schema}://{user}@{host}:{apikey}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "host": {
+                "name": _("Domain"),
+                "type": "string",
+                "required": True,
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'host': {
-            'name': _('Domain'),
-            'type': 'string',
-            'required': True,
-        },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'name': {
-            'name': _('From Name'),
-            'type': 'string',
-            'map_to': 'from_addr',
-        },
-        'from': {
-            'alias_of': 'name',
-        },
-        'region': {
-            'name': _('Region Name'),
-            'type': 'choice:string',
-            'values': MAILGUN_REGIONS,
-            'default': MailgunRegion.US,
-            'map_to': 'region_name',
-        },
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "name": {
+                "name": _("From Name"),
+                "type": "string",
+                "map_to": "from_addr",
+            },
+            "from": {
+                "alias_of": "name",
+            },
+            "region": {
+                "name": _("Region Name"),
+                "type": "choice:string",
+                "values": MAILGUN_REGIONS,
+                "default": MailgunRegion.US,
+                "map_to": "region_name",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('Email Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("Email Header"),
+            "prefix": "+",
         },
-        'tokens': {
-            'name': _('Template Tokens'),
-            'prefix': ':',
+        "tokens": {
+            "name": _("Template Tokens"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, apikey, targets, cc=None, bcc=None, from_addr=None,
-                 region_name=None, headers=None, tokens=None, batch=False,
-                 **kwargs):
-        """
-        Initialize Mailgun Object
-        """
+    def __init__(
+        self,
+        apikey,
+        targets,
+        cc=None,
+        bcc=None,
+        from_addr=None,
+        region_name=None,
+        headers=None,
+        tokens=None,
+        batch=False,
+        **kwargs,
+    ):
+        """Initialize Mailgun Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid Mailgun API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Mailgun API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Validate our username
         if not self.user:
-            msg = 'No Mailgun username was specified.'
+            msg = "No Mailgun username was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Acquire Email 'To'
-        self.targets = list()
+        self.targets = []
 
         # Acquire Carbon Copies
         self.cc = set()
@@ -256,37 +266,37 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_addr=None,
 
         # Store our region
         try:
-            self.region_name = \
-                NotifyMailgun.template_args['region']['default'] \
-                if region_name is None else region_name.lower()
+            self.region_name = (
+                NotifyMailgun.template_args["region"]["default"]
+                if region_name is None
+                else region_name.lower()
+            )
 
             if self.region_name not in MAILGUN_REGIONS:
                 # allow the outer except to handle this common response
                 raise
         except:
             # Invalid region specified
-            msg = 'The Mailgun region specified ({}) is invalid.' \
-                  .format(region_name)
+            msg = f"The Mailgun region specified ({region_name}) is invalid."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         # Get our From username (if specified)
-        self.from_addr = [
-            self.app_id, '{user}@{host}'.format(
-                user=self.user, host=self.host)]
+        self.from_addr = [self.app_id, f"{self.user}@{self.host}"]
 
         if from_addr:
             result = is_email(from_addr)
             if result:
                 self.from_addr = (
-                    result['name'] if result['name'] else False,
-                    result['full_email'])
+                    result["name"] if result["name"] else False,
+                    result["full_email"],
+                )
             else:
                 self.from_addr[0] = from_addr
 
         if not is_email(self.from_addr[1]):
             # Parse Source domain based on from_addr
-            msg = 'Invalid ~From~ email format: {}'.format(self.from_addr)
+            msg = f"Invalid ~From~ email format: {self.from_addr}"
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -295,14 +305,14 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_addr=None,
             for recipient in parse_emails(targets):
                 result = is_email(recipient)
                 if result:
-                    self.targets.append(
-                        (result['name'] if result['name'] else False,
-                            result['full_email']))
+                    self.targets.append((
+                        result["name"] if result["name"] else False,
+                        result["full_email"],
+                    ))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid To email '
-                    '({}) specified.'.format(recipient),
+                    f"Dropped invalid To email ({recipient}) specified.",
                 )
 
         else:
@@ -313,44 +323,48 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_addr=None,
         for recipient in parse_emails(cc):
             email = is_email(recipient)
             if email:
-                self.cc.add(email['full_email'])
+                self.cc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
             )
 
         # Validate recipients (bcc:) and drop bad ones:
         for recipient in parse_emails(bcc):
             email = is_email(recipient)
             if email:
-                self.bcc.add(email['full_email'])
+                self.bcc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
             )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Mailgun Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Mailgun Notification."""
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning(
-                'There are no Email recipients to notify')
+            self.logger.warning("There are no Email recipients to notify")
             return False
 
         # error tracking (used for function return)
@@ -361,8 +375,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
         }
 
         # Track our potential files
@@ -374,73 +388,79 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Preparing Mailgun attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Preparing Mailgun attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
                 # Prepare our filename
-                filename = attachment.name \
-                    if attachment.name \
-                    else 'file{no:03}.dat'.format(no=idx + 1)
+                filename = (
+                    attachment.name
+                    if attachment.name
+                    else f"file{idx + 1:03}.dat"
+                )
 
                 try:
-                    files['attachment[{}]'.format(idx)] = \
-                        (filename, open(attachment.path, 'rb'))
-
-                except (OSError, IOError) as e:
+                    files[f"attachment[{idx}]"] = (
+                        filename,
+                        # file handle is safely closed through this code
+                        # ignoring of SIM115 is intentional
+                        open(attachment.path, "rb"),  # noqa: SIM115
+                    )
+
+                except OSError as e:
                     self.logger.warning(
-                        'An I/O error occurred while opening {}.'.format(
-                            attachment.name if attachment
-                            else 'attachment'))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                        "An I/O error occurred while opening {}.".format(
+                            attachment.name if attachment else "attachment"
+                        )
+                    )
+                    self.logger.debug(f"I/O Exception: {e!s}")
 
                     # tidy up any open files before we make our early
                     # return
                     for entry in files.values():
-                        self.logger.trace(
-                            'Closing attachment {}'.format(entry[0]))
+                        self.logger.trace(f"Closing attachment {entry[0]}")
                         entry[1].close()
 
                     return False
 
-        reply_to = formataddr(self.from_addr, charset='utf-8')
+        reply_to = formataddr(self.from_addr, charset="utf-8")
 
         # Prepare our payload
         payload = {
             # pass skip-verification switch upstream too
-            'o:skip-verification': not self.verify_certificate,
-
+            "o:skip-verification": not self.verify_certificate,
             # Base payload options
-            'from': reply_to,
-            'subject': title,
+            "from": reply_to,
+            "subject": title,
         }
 
         if self.notify_format == NotifyFormat.HTML:
-            payload['html'] = body
+            payload["html"] = body
 
         else:
-            payload['text'] = body
+            payload["text"] = body
 
         # Prepare our URL as it's based on our hostname
-        url = '{}{}/messages'.format(
-            MAILGUN_API_LOOKUP[self.region_name], self.host)
+        url = f"{MAILGUN_API_LOOKUP[self.region_name]}{self.host}/messages"
 
         # Create a copy of the targets list
         emails = list(self.targets)
 
         for index in range(0, len(emails), batch_size):
             # Initialize our cc list
-            cc = (self.cc - self.bcc)
+            cc = self.cc - self.bcc
 
             # Initialize our bcc list
             bcc = set(self.bcc)
 
             # Initialize our to list
-            to = list()
+            to = []
 
             # Ensure we're pointed to the head of the attachment; this doesn't
             # do much for the first iteration through this loop as we're
@@ -450,71 +470,80 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             for entry in files.values():
                 try:
                     self.logger.trace(
-                        'Seeking to head of attachment {}'.format(entry[0]))
+                        f"Seeking to head of attachment {entry[0]}"
+                    )
                     entry[1].seek(0)
 
-                except (OSError, IOError) as e:
+                except OSError as e:
                     self.logger.warning(
-                        'An I/O error occurred seeking to head of attachment '
-                        '{}.'.format(entry[0]))
-                    self.logger.debug('I/O Exception: %s' % str(e))
+                        "An I/O error occurred seeking to head of attachment "
+                        f"{entry[0]}."
+                    )
+                    self.logger.debug(f"I/O Exception: {e!s}")
 
                     # tidy up any open files before we make our early
                     # return
                     for entry in files.values():
-                        self.logger.trace(
-                            'Closing attachment {}'.format(entry[0]))
+                        self.logger.trace(f"Closing attachment {entry[0]}")
                         entry[1].close()
 
                     return False
 
-            for to_addr in self.targets[index:index + batch_size]:
+            for to_addr in self.targets[index : index + batch_size]:
                 # Strip target out of cc list if in To
-                cc = (cc - set([to_addr[1]]))
+                cc = cc - {to_addr[1]}
 
                 # Strip target out of bcc list if in To
-                bcc = (bcc - set([to_addr[1]]))
+                bcc = bcc - {to_addr[1]}
 
                 # Prepare our `to`
-                to.append(formataddr(to_addr, charset='utf-8'))
+                to.append(formataddr(to_addr, charset="utf-8"))
 
             # Prepare our To
-            payload['to'] = ','.join(to)
+            payload["to"] = ",".join(to)
 
             if cc:
                 # Format our cc addresses to support the Name field
-                payload['cc'] = ','.join([formataddr(
-                    (self.names.get(addr, False), addr), charset='utf-8')
-                    for addr in cc])
+                payload["cc"] = ",".join([
+                    formataddr(
+                        (self.names.get(addr, False), addr),
+                        charset="utf-8",
+                    )
+                    for addr in cc
+                ])
 
             # Format our bcc addresses to support the Name field
             if bcc:
-                payload['bcc'] = ','.join(bcc)
+                payload["bcc"] = ",".join(bcc)
 
             # Store our token entries; users can reference these as %value%
             # in their email message.
             if self.tokens:
-                payload.update(
-                    {'v:{}'.format(k): v for k, v in self.tokens.items()})
+                payload.update({f"v:{k}": v for k, v in self.tokens.items()})
 
             # Store our header entries if defined into the payload
             # in their payload
             if self.headers:
-                payload.update(
-                    {'h:{}'.format(k): v for k, v in self.headers.items()})
+                payload.update({f"h:{k}": v for k, v in self.headers.items()})
 
             # Some Debug Logging
-            self.logger.debug('Mailgun POST URL: {} (cert_verify={})'.format(
-                url, self.verify_certificate))
-            self.logger.debug('Mailgun Payload: {}' .format(payload))
+            self.logger.debug(
+                "Mailgun POST URL:"
+                f" {url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Mailgun Payload: {payload}")
 
             # For logging output of success and errors; we get a head count
             # of our outbound details:
-            verbose_dest = ', '.join(
-                [x[1] for x in self.targets[index:index + batch_size]]) \
-                if len(self.targets[index:index + batch_size]) <= 3 \
-                else '{} recipients'.format(
-                    len(self.targets[index:index + batch_size]))
+            verbose_dest = (
+                ", ".join(
+                    [x[1] for x in self.targets[index : index + batch_size]]
+                )
+                if len(self.targets[index : index + batch_size]) <= 3
+                else (
+                    f"{len(self.targets[index:index + batch_size])} recipients"
+                )
+            )
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -524,27 +553,29 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     auth=("api", self.apikey),
                     data=payload,
                     headers=headers,
-                    files=None if not files else files,
+                    files=files if files else None,
                     verify=self.verify_certificate,
                     timeout=self.request_timeout,
                 )
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(
-                            r.status_code, MAILGUN_HTTP_ERROR_MAP)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code, MAILGUN_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send Mailgun notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Mailgun notification to {}: "
+                        "{}{}error={}.".format(
                             verbose_dest,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -552,24 +583,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 else:
                     self.logger.info(
-                        'Sent Mailgun notification to {}.'.format(
-                            verbose_dest))
+                        f"Sent Mailgun notification to {verbose_dest}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Mailgun:%s ' % (
-                        verbose_dest) + 'notification.'
+                    "A Connection error occurred sending"
+                    f" Mailgun:{verbose_dest} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
                 continue
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 self.logger.warning(
-                    'An I/O error occurred while reading attachments')
-                self.logger.debug('I/O Exception: %s' % str(e))
+                    "An I/O error occurred while reading attachments"
+                )
+                self.logger.debug(f"I/O Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -577,96 +610,103 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
         # Close any potential attachments that are still open
         for entry in files.values():
-            self.logger.trace(
-                'Closing attachment {}'.format(entry[0]))
+            self.logger.trace(f"Closing attachment {entry[0]}")
             entry[1].close()
 
         return not has_error
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.host, self.apikey, self.region_name,
+            self.secure_protocol,
+            self.host,
+            self.apikey,
+            self.region_name,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'region': self.region_name,
-            'batch': 'yes' if self.batch else 'no',
+            "region": self.region_name,
+            "batch": "yes" if self.batch else "no",
         }
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Append our template tokens into our parameters
-        params.update({':{}'.format(k): v for k, v in self.tokens.items()})
+        params.update({f":{k}": v for k, v in self.tokens.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         if self.from_addr[0]:
             # from_addr specified; pass it back on the url
-            params['name'] = self.from_addr[0]
+            params["name"] = self.from_addr[0]
 
         if self.cc:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join(
-                ['{}{}'.format(
-                    '' if not e not in self.names
-                    else '{}:'.format(self.names[e]), e) for e in self.cc])
+            params["cc"] = ",".join([
+                "{}{}".format(
+                    "" if not e not in self.names else f"{self.names[e]}:",
+                    e,
+                )
+                for e in self.cc
+            ])
 
         if self.bcc:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join(self.bcc)
+            params["bcc"] = ",".join(self.bcc)
 
         # a simple boolean check as to whether we display our target emails
         # or not
-        has_targets = \
-            not (len(self.targets) == 1
-                 and self.targets[0][1] == self.from_addr)
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0][1] == self.from_addr
+        )
 
-        return '{schema}://{user}@{host}/{apikey}/{targets}/?{params}'.format(
+        return "{schema}://{user}@{host}/{apikey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
             host=self.host,
-            user=NotifyMailgun.quote(self.user, safe=''),
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='' if not has_targets else '/'.join(
-                [NotifyMailgun.quote('{}{}'.format(
-                    '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                    safe='') for e in self.targets]),
-            params=NotifyMailgun.urlencode(params))
+            user=NotifyMailgun.quote(self.user, safe=""),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets=(
+                ""
+                if not has_targets
+                else "/".join([
+                    NotifyMailgun.quote(
+                        "{}{}".format("" if not e[0] else f"{e[0]}:", e[1]),
+                        safe="",
+                    )
+                    for e in self.targets
+                ])
+            ),
+            params=NotifyMailgun.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -674,65 +714,79 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyMailgun.split_path(results['fullpath'])
+        results["targets"] = NotifyMailgun.split_path(results["fullpath"])
 
         # Our very first entry is reserved for our api key
         try:
-            results['apikey'] = results['targets'].pop(0)
+            results["apikey"] = results["targets"].pop(0)
 
         except IndexError:
             # We're done - no API Key found
-            results['apikey'] = None
+            results["apikey"] = None
 
         # Attempt to detect 'from' email address
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['from_addr'] = \
-                NotifyMailgun.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["from_addr"] = NotifyMailgun.unquote(
+                results["qsd"]["from"]
+            )
 
-            if 'name' in results['qsd'] and len(results['qsd']['name']):
+            if "name" in results["qsd"] and len(results["qsd"]["name"]):
                 # Depricate use of both `from=` and `name=` in the same url as
                 # they will be synomomus of one another in the future.
-                results['from_addr'] = formataddr(
-                    (NotifyMailgun.unquote(results['qsd']['name']),
-                     results['from_addr']), charset='utf-8')
+                results["from_addr"] = formataddr(
+                    (
+                        NotifyMailgun.unquote(results["qsd"]["name"]),
+                        results["from_addr"],
+                    ),
+                    charset="utf-8",
+                )
                 logger.warning(
-                    'Mailgun name= and from= are synonymous; '
-                    'use one or the other.')
+                    "Mailgun name= and from= are synonymous; "
+                    "use one or the other."
+                )
 
-        elif 'name' in results['qsd'] and len(results['qsd']['name']):
+        elif "name" in results["qsd"] and len(results["qsd"]["name"]):
             # Extract from name to associate with from address
-            results['from_addr'] = \
-                NotifyMailgun.unquote(results['qsd']['name'])
+            results["from_addr"] = NotifyMailgun.unquote(
+                results["qsd"]["name"]
+            )
 
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
             # Acquire region if defined
-            results['region_name'] = \
-                NotifyMailgun.unquote(results['qsd']['region'])
+            results["region_name"] = NotifyMailgun.unquote(
+                results["qsd"]["region"]
+            )
 
         # Handle 'to' email address
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].append(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(results["qsd"]["to"])
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = results['qsd']['cc']
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = results["qsd"]["cc"]
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = results['qsd']['bcc']
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = results["qsd"]["bcc"]
 
         # Add our Meta Headers that the user can provide with their outbound
         # emails
-        results['headers'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Add our template tokens (if defined)
-        results['tokens'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                             for x, y in results['qsd:'].items()}
+        results["tokens"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyMailgun.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyMailgun.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/mastodon.py b/libs/apprise/plugins/mastodon.py
index 5206fd371c..161326bf31 100644
--- a/libs/apprise/plugins/mastodon.py
+++ b/libs/apprise/plugins/mastodon.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,21 +25,20 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
-import requests
+import contextlib
 from copy import deepcopy
+from datetime import datetime, timezone
 from json import dumps, loads
-from datetime import datetime
-from datetime import timezone
+import re
+
+import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool, validate_regex
-from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Accept:
 # - @username
@@ -48,31 +46,32 @@
 # - username@host.com
 # - @username@host.com
 IS_USER = re.compile(
-    r'^\s*@?(?P<user>[A-Z0-9_]+(?:@(?P<host>[A-Z0-9_.-]+))?)$', re.I)
+    r"^\s*@?(?P<user>[A-Z0-9_]+(?:@(?P<host>[A-Z0-9_.-]+))?)$", re.I
+)
 
 USER_DETECTION_RE = re.compile(
-    r'(@[A-Z0-9_]+(?:@[A-Z0-9_.-]+)?)(?=$|[\s,.&()\[\]]+)', re.I)
+    r"(@[A-Z0-9_]+(?:@[A-Z0-9_.-]+)?)(?=$|[\s,.&()\[\]]+)", re.I
+)
 
 
 class MastodonMessageVisibility:
-    """
-    The visibility of any status message made
-    """
+    """The visibility of any status message made."""
+
     # post visibility defaults to the accounts default-visibilty setting
-    DEFAULT = 'default'
+    DEFAULT = "default"
 
     # post will be visible only to mentioned users
     # similar to a Twitter DM
-    DIRECT = 'direct'
+    DIRECT = "direct"
 
     # post will be visible only to followers
-    PRIVATE = 'private'
+    PRIVATE = "private"
 
     # post will be public but not appear on the public timeline
-    UNLISTED = 'unlisted'
+    UNLISTED = "unlisted"
 
     # post will be public
-    PUBLIC = 'public'
+    PUBLIC = "public"
 
 
 # Define the types in a list for validation purposes
@@ -86,24 +85,22 @@ class MastodonMessageVisibility:
 
 
 class NotifyMastodon(NotifyBase):
-    """
-    A wrapper for Notify Mastodon Notifications
-    """
+    """A wrapper for Notify Mastodon Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Mastodon'
+    service_name = "Mastodon"
 
     # The services URL
-    service_url = 'https://joinmastodon.org'
+    service_url = "https://joinmastodon.org"
 
     # The default protocol
-    protocol = ('mastodon', 'toot')
+    protocol = ("mastodon", "toot")
 
     # The default secure protocol
-    secure_protocol = ('mastodons', 'toots')
+    secure_protocol = ("mastodons", "toots")
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_mastodon'
+    setup_url = "https://appriseit.com/services/mastodon/"
 
     # Support attachments
     attachment_support = True
@@ -120,16 +117,16 @@ class NotifyMastodon(NotifyBase):
     # Mastodon API Reference To Acquire Current Users Information
     # See: https://docs.joinmastodon.org/methods/accounts/
     # Requires Scope Element: read:accounts
-    mastodon_whoami = '/api/v1/accounts/verify_credentials'
+    mastodon_whoami = "/api/v1/accounts/verify_credentials"
 
     # URL for posting media files
-    mastodon_media = '/api/v1/media'
+    mastodon_media = "/api/v1/media"
 
     # URL for posting status messages
-    mastodon_toot = '/api/v1/statuses'
+    mastodon_toot = "/api/v1/statuses"
 
     # URL for posting direct messages
-    mastodon_dm = '/api/v1/dm'
+    mastodon_dm = "/api/v1/dm"
 
     # The title is not used
     title_maxlen = 0
@@ -157,144 +154,171 @@ class NotifyMastodon(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{token}@{host}',
-        '{schema}://{token}@{host}:{port}',
-        '{schema}://{token}@{host}/{targets}',
-        '{schema}://{token}@{host}:{port}/{targets}',
+        "{schema}://{token}@{host}",
+        "{schema}://{token}@{host}:{port}",
+        "{schema}://{token}@{host}/{targets}",
+        "{schema}://{token}@{host}:{port}/{targets}",
     )
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'token': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'token': {
-            'alias_of': 'token',
-        },
-        'visibility': {
-            'name': _('Visibility'),
-            'type': 'choice:string',
-            'values': MASTODON_MESSAGE_VISIBILITIES,
-            'default': MastodonMessageVisibility.DEFAULT,
-        },
-        'cache': {
-            'name': _('Cache Results'),
-            'type': 'bool',
-            'default': True,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "token": {
+                "alias_of": "token",
+            },
+            "visibility": {
+                "name": _("Visibility"),
+                "type": "choice:string",
+                "values": MASTODON_MESSAGE_VISIBILITIES,
+                "default": MastodonMessageVisibility.DEFAULT,
+            },
+            "cache": {
+                "name": _("Cache Results"),
+                "type": "bool",
+                "default": True,
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": True,
+            },
+            "sensitive": {
+                "name": _("Sensitive Attachments"),
+                "type": "bool",
+                "default": False,
+            },
+            "spoiler": {
+                "name": _("Spoiler Text"),
+                "type": "string",
+            },
+            "key": {
+                "name": _("Idempotency-Key"),
+                "type": "string",
+            },
+            "language": {
+                "name": _("Language Code"),
+                "type": "string",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': True,
-        },
-        'sensitive': {
-            'name': _('Sensitive Attachments'),
-            'type': 'bool',
-            'default': False,
-        },
-        'spoiler': {
-            'name': _('Spoiler Text'),
-            'type': 'string',
-        },
-        'key': {
-            'name': _('Idempotency-Key'),
-            'type': 'string',
-        },
-        'language': {
-            'name': _('Language Code'),
-            'type': 'string',
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, token=None, targets=None, batch=True,
-                 sensitive=None, spoiler=None, visibility=None, cache=True,
-                 key=None, language=None, **kwargs):
-        """
-        Initialize Notify Mastodon Object
-        """
+    def __init__(
+        self,
+        token=None,
+        targets=None,
+        batch=True,
+        sensitive=None,
+        spoiler=None,
+        visibility=None,
+        cache=True,
+        key=None,
+        language=None,
+        **kwargs,
+    ):
+        """Initialize Notify Mastodon Object."""
         super().__init__(**kwargs)
 
         # Set our schema
-        self.schema = 'https' if self.secure else 'http'
+        self.schema = "https" if self.secure else "http"
 
         # Initialize our cache value
         self._whoami_cache = None
 
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Mastodon Access Token was specified.'
+            msg = "An invalid Mastodon Access Token was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if visibility:
             # Input is a string; attempt to get the lookup from our
             # sound mapping
-            vis = 'invalid' if not isinstance(visibility, str) \
+            vis = (
+                "invalid"
+                if not isinstance(visibility, str)
                 else visibility.lower().strip()
+            )
 
             # This little bit of black magic allows us to match against
             # against multiple versions of the same string
             # ... etc
-            self.visibility = \
-                next((v for v in MASTODON_MESSAGE_VISIBILITIES
-                      if v.startswith(vis)), None)
+            self.visibility = next(
+                (
+                    v
+                    for v in MASTODON_MESSAGE_VISIBILITIES
+                    if v.startswith(vis)
+                ),
+                None,
+            )
 
             if self.visibility not in MASTODON_MESSAGE_VISIBILITIES:
-                msg = 'The Mastodon visibility specified ({}) is invalid.' \
-                    .format(visibility)
+                msg = (
+                    f"The Mastodon visibility specified ({visibility}) is"
+                    " invalid."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         else:
-            self.visibility = \
-                self.template_args['visibility']['default']
+            self.visibility = self.template_args["visibility"]["default"]
 
         # Prepare our URL
-        self.api_url = '%s://%s' % (self.schema, self.host)
+        self.api_url = f"{self.schema}://{self.host}"
 
         if isinstance(self.port, int):
-            self.api_url += ':%d' % self.port
+            self.api_url += f":{self.port}"
 
         # Set Cache Flag
         self.cache = cache
 
         # Prepare Image Batch Mode Flag
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else batch
+        self.batch = (
+            self.template_args["batch"]["default"] if batch is None else batch
+        )
 
         # Images to be marked sensitive
-        self.sensitive = self.template_args['sensitive']['default'] \
-            if sensitive is None else sensitive
+        self.sensitive = (
+            self.template_args["sensitive"]["default"]
+            if sensitive is None
+            else sensitive
+        )
 
         # Text marked as being a spoiler
         self.spoiler = spoiler if isinstance(spoiler, str) else None
@@ -314,13 +338,13 @@ def __init__(self, token=None, targets=None, batch=True,
         # Identify our targets
         for target in parse_list(targets):
             match = IS_USER.match(target)
-            if match and match.group('user'):
-                self.targets.append('@' + match.group('user'))
+            if match and match.group("user"):
+                self.targets.append("@" + match.group("user"))
                 continue
 
             has_error = True
             self.logger.warning(
-                'Dropped invalid Mastodon user ({}) specified.'.format(target),
+                f"Dropped invalid Mastodon user ({target}) specified.",
             )
 
         if has_error and not self.targets:
@@ -328,7 +352,7 @@ def __init__(self, token=None, targets=None, batch=True,
             # and we failed to load any of them.  Since it's also valid to
             # notify no one at all (which means we notify ourselves), it's
             # important we don't switch from the users original intentions
-            msg = 'No Mastodon targets to notify.'
+            msg = "No Mastodon targets to notify."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -336,26 +360,26 @@ def __init__(self, token=None, targets=None, batch=True,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol[0], self.token, self.host,
+            self.secure_protocol[0],
+            self.token,
+            self.host,
             self.port if self.port else (443 if self.secure else 80),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'visibility': self.visibility,
-            'batch': 'yes' if self.batch else 'no',
-            'sensitive': 'yes' if self.sensitive else 'no',
+            "visibility": self.visibility,
+            "batch": "yes" if self.batch else "no",
+            "sensitive": "yes" if self.sensitive else "no",
         }
 
         # Extend our parameters
@@ -363,44 +387,51 @@ def url(self, privacy=False, *args, **kwargs):
 
         if self.spoiler:
             # Our Spoiler if one was specified
-            params['spoiler'] = self.spoiler
+            params["spoiler"] = self.spoiler
 
         if self.idempotency_key:
             # Our Idempotency Key
-            params['key'] = self.idempotency_key
+            params["key"] = self.idempotency_key
 
         if self.language:
             # Override Language
-            params['language'] = self.language
+            params["language"] = self.language
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{token}@{host}{port}/{targets}?{params}'.format(
-            schema=self.secure_protocol[0]
-            if self.secure else self.protocol[0],
+        return "{schema}://{token}@{host}{port}/{targets}?{params}".format(
+            schema=(
+                self.secure_protocol[0] if self.secure else self.protocol[0]
+            ),
             token=self.pprint(
-                self.token, privacy, mode=PrivacyMode.Secret, safe=''),
+                self.token, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
             # never encode hostname since we're expecting it to be a valid one
             host=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            targets='/'.join(
-                [NotifyMastodon.quote(x, safe='@') for x in self.targets]),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets="/".join(
+                [NotifyMastodon.quote(x, safe="@") for x in self.targets]
+            ),
             params=NotifyMastodon.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        wrapper to _send since we can alert more then one channel
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Wrapper to _send since we can alert more then one channel."""
 
         # Build a list of our attachments
         attachments = []
@@ -409,15 +440,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         # adding @user entries that were already placed in the message body
         users = set(USER_DETECTION_RE.findall(body))
         targets = users - set(self.targets.copy())
-        if not self.targets and self.visibility == \
-                MastodonMessageVisibility.DIRECT:
+        if (
+            not self.targets
+            and self.visibility == MastodonMessageVisibility.DIRECT
+        ):
 
             result = self._whoami()
             if not result:
                 # Could not access our status
                 return False
 
-            myself = '@' + next(iter(result.keys()))
+            myself = "@" + next(iter(result.keys()))
             if myself in users:
                 targets.remove(myself)
 
@@ -432,8 +465,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 #
@@ -451,17 +485,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 # Audio (MP3, OGG, WAV, FLAC, OPUS, AAC, M4A, 3GP) up to 40MB.
                 #  - Audio will be transcoded to MP3 using V2 VBR (roughly
                 #      192kbps).
-                if not re.match(r'^(image|video|audio)/.*',
-                                attachment.mimetype, re.I):
+                if not re.match(
+                    r"^(image|video|audio)/.*", attachment.mimetype, re.I
+                ):
                     # Only support images at this time
                     self.logger.warning(
-                        'Ignoring unsupported Mastodon attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Ignoring unsupported Mastodon attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     continue
 
                 self.logger.debug(
-                    'Preparing Mastodon attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Preparing Mastodon attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
                 # Upload our image and get our id associated with it
                 postokay, response = self._request(
@@ -471,20 +508,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 if not postokay:
                     # We can't post our attachment
-                    if response and 'authorized scopes' \
-                            in response.get('error', ''):
+                    if response and "authorized scopes" in response.get(
+                        "error", ""
+                    ):
                         self.logger.warning(
-                            'Failed to Send Attachment to Mastodon: '
-                            'missing scope: write:media')
+                            "Failed to Send Attachment to Mastodon: "
+                            "missing scope: write:media"
+                        )
 
                     # All other failures should cause us to abort
                     return False
 
-                if not (isinstance(response, dict)
-                        and response.get('id')):
+                if not (isinstance(response, dict) and response.get("id")):
                     self.logger.debug(
-                        'Could not attach the file to Mastodon: %s (mime=%s)',
-                        attachment.name, attachment.mimetype)
+                        "Could not attach the file to Mastodon: %s (mime=%s)",
+                        attachment.name,
+                        attachment.mimetype,
+                    )
                     continue
 
                 # If we get here, our output will look something like this:
@@ -516,35 +556,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 response.update({
                     # Update our response to additionally include the
                     # attachment details
-                    'file_name': attachment.name,
-                    'file_mime': attachment.mimetype,
-                    'file_path': attachment.path,
+                    "file_name": attachment.name,
+                    "file_mime": attachment.mimetype,
+                    "file_path": attachment.path,
                 })
 
                 # Save our pre-prepared payload for attachment posting
                 attachments.append(response)
 
         payload = {
-            'status': '{} {}'.format(' '.join(targets), body)
-            if targets else body,
-            'sensitive': self.sensitive,
+            "status": (
+                "{} {}".format(" ".join(targets), body) if targets else body
+            ),
+            "sensitive": self.sensitive,
         }
 
         # Handle Visibility Flag
         if self.visibility != MastodonMessageVisibility.DEFAULT:
-            payload['visibility'] = self.visibility
+            payload["visibility"] = self.visibility
 
         # Set Spoiler text (if set)
         if self.spoiler:
-            payload['spoiler_text'] = self.spoiler
+            payload["spoiler_text"] = self.spoiler
 
         # Set Idempotency-Key (if set)
         if self.idempotency_key:
-            payload['Idempotency-Key'] = self.idempotency_key
+            payload["Idempotency-Key"] = self.idempotency_key
 
         # Set Language
         if self.language:
-            payload['language'] = self.language
+            payload["language"] = self.language
 
         payloads = []
         if not attachments:
@@ -552,14 +593,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
         else:
             # Group our images if batch is set to do so
-            batch_size = 1 if not self.batch \
-                else self.__toot_non_gif_images_batch
+            batch_size = (
+                1 if not self.batch else self.__toot_non_gif_images_batch
+            )
 
             # Track our batch control in our message generation
             batches = []
             batch = []
             for attachment in attachments:
-                batch.append(attachment['id'])
+                batch.append(attachment["id"])
                 # Mastodon supports batching images together.  This allows
                 # the batching of multiple images together.  Mastodon also
                 # makes it clear that you can't batch `gif` files; they need
@@ -574,9 +616,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 # If you passed in, image, image, gif, image. <- This would
                 # produce 3 images (as the first 2 images could be lumped
                 # together as a batch)
-                if not re.match(
-                        r'^image/(png|jpe?g)', attachment['file_mime'], re.I) \
-                        or len(batch) >= batch_size:
+                if (
+                    not re.match(
+                        r"^image/(png|jpe?g)", attachment["file_mime"], re.I
+                    )
+                    or len(batch) >= batch_size
+                ):
                     batches.append(batch)
                     batch = []
 
@@ -584,21 +629,21 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 batches.append(batch)
 
             for no, media_ids in enumerate(batches):
-                _payload = deepcopy(payload)
-                _payload['media_ids'] = media_ids
+                payload_ = deepcopy(payload)
+                payload_["media_ids"] = media_ids
 
                 if no or not body:
                     # strip text and replace it with the image representation
-                    _payload['status'] = \
-                        '{:02d}/{:02d}'.format(no + 1, len(batches))
+                    payload_["status"] = f"{no + 1:02d}/{len(batches):02d}"
                     # No longer sensitive information
-                    _payload['sensitive'] = False
+                    payload_["sensitive"] = False
                     if self.idempotency_key:
                         # Support multiposts while a Idempotency Key has been
                         # defined
-                        _payload['Idempotency-Key'] = '{}-part{:02d}'.format(
-                            self.idempotency_key, no)
-                payloads.append(_payload)
+                        payload_["Idempotency-Key"] = (
+                            f"{self.idempotency_key}-part{no:02d}"
+                        )
+                payloads.append(payload_)
 
         # Error Tracking
         has_error = False
@@ -610,11 +655,13 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 has_error = True
 
                 # We can't post our attachment
-                if response and 'authorized scopes' \
-                        in response.get('error', ''):
+                if response and "authorized scopes" in response.get(
+                    "error", ""
+                ):
                     self.logger.warning(
-                        'Failed to Send Status to Mastodon: '
-                        'missing scope: write:statuses')
+                        "Failed to Send Status to Mastodon: "
+                        "missing scope: write:statuses"
+                    )
 
                 continue
 
@@ -713,28 +760,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             # }
 
             try:
-                url = '{}/web/@{}'.format(
-                    self.api_url,
-                    response['account']['username'])
+                url = "{}/web/@{}".format(
+                    self.api_url, response["account"]["username"]
+                )
 
             except (KeyError, TypeError):
-                url = 'unknown'
+                url = "unknown"
 
             self.logger.debug(
-                'Mastodon [%.2d/%.2d] (%d attached) delivered to %s',
-                no, len(payloads), len(payload.get('media_ids', [])), url)
+                "Mastodon [%.2d/%.2d] (%d attached) delivered to %s",
+                no,
+                len(payloads),
+                len(payload.get("media_ids", [])),
+                url,
+            )
 
             self.logger.info(
-                'Sent [%.2d/%.2d] Mastodon notification as public toot.',
-                no, len(payloads))
+                "Sent [%.2d/%.2d] Mastodon notification as public toot.",
+                no,
+                len(payloads),
+            )
 
         return not has_error
 
     def _whoami(self, lazy=True):
-        """
-        Looks details of current authenticated user
-
-        """
+        """Looks details of current authenticated user."""
 
         if lazy and self._whoami_cache is not None:
             # Use cached response
@@ -743,7 +793,7 @@ def _whoami(self, lazy=True):
         # Send Mastodon Whoami request
         postokay, response = self._request(
             self.mastodon_whoami,
-            method='GET',
+            method="GET",
         )
 
         if postokay:
@@ -779,57 +829,60 @@ def _whoami(self, lazy=True):
             #   'emojis': [],
             #   'fields': []
             # }
-            try:
+            with contextlib.suppress(TypeError, KeyError):
                 # Cache our response for future references
-                self._whoami_cache = {
-                    response['username']: response['id']}
+                self._whoami_cache = {response["username"]: response["id"]}
 
-            except (TypeError, KeyError):
-                pass
-
-        elif response and 'authorized scopes' in response.get('error', ''):
+        elif response and "authorized scopes" in response.get("error", ""):
             self.logger.warning(
-                'Failed to lookup Mastodon Auth details; '
-                'missing scope: read:accounts')
+                "Failed to lookup Mastodon Auth details; "
+                "missing scope: read:accounts"
+            )
 
         return self._whoami_cache if postokay else {}
 
-    def _request(self, path, payload=None, method='POST'):
-        """
-        Wrapper to Mastodon API requests object
-        """
+    def _request(self, path, payload=None, method="POST"):
+        """Wrapper to Mastodon API requests object."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Authorization': f'Bearer {self.token}',
+            "User-Agent": self.app_id,
+            "Authorization": f"Bearer {self.token}",
         }
 
         data = None
         files = None
 
         # Prepare our message
-        url = '{}{}'.format(self.api_url, path)
+        url = f"{self.api_url}{path}"
 
         # Some Debug Logging
-        self.logger.debug('Mastodon {} URL: {} (cert_verify={})'.format(
-            method, url, self.verify_certificate))
+        self.logger.debug(
+            f"Mastodon {method} URL:"
+            f" {url} (cert_verify={self.verify_certificate})"
+        )
 
         # Open our attachment path if required:
         if isinstance(payload, AttachBase):
             # prepare payload
             files = {
-                'file': (payload.name, open(payload.path, 'rb'),
-                         'application/octet-stream')}
+                "file": (
+                    payload.name,
+                    # file handle is safely closed in `finally`; inline open
+                    # is intentional
+                    open(payload.path, "rb"),  # noqa: SIM115
+                    "application/octet-stream",
+                )
+            }
 
             # Provide a description
             data = {
-                'description': payload.name,
+                "description": payload.name,
             }
 
         else:
-            headers['Content-Type'] = 'application/json'
+            headers["Content-Type"] = "application/json"
             data = dumps(payload)
-            self.logger.debug('Mastodon Payload: %s' % str(payload))
+            self.logger.debug(f"Mastodon Payload: {payload!s}")
 
         # Default content response object
         content = {}
@@ -855,7 +908,7 @@ def _request(self, path, payload=None, method='POST'):
         self.throttle(wait=wait)
 
         # acquire our request mode
-        fn = requests.post if method == 'POST' else requests.get
+        fn = requests.post if method == "POST" else requests.get
 
         try:
             r = fn(
@@ -877,33 +930,35 @@ def _request(self, path, payload=None, method='POST'):
                 content = {}
 
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.created,
-                    requests.codes.accepted):
+                requests.codes.ok,
+                requests.codes.created,
+                requests.codes.accepted,
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifyMastodon.http_response_code_lookup(r.status_code)
+                status_str = NotifyMastodon.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Mastodon {} to {}: '
-                    '{}error={}.'.format(
-                        method,
-                        url,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Mastodon {} to {}: {}error={}.".format(
+                        method, url, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Mark our failure
                 return (False, content)
 
             try:
                 # Capture rate limiting if possible
-                self.ratelimit_remaining = \
-                    int(r.headers.get('X-RateLimit-Remaining'))
+                self.ratelimit_remaining = int(
+                    r.headers.get("X-RateLimit-Remaining")
+                )
                 self.ratelimit_reset = datetime.fromtimestamp(
-                    int(r.headers.get('X-RateLimit-Limit')), timezone.utc
+                    int(r.headers.get("X-RateLimit-Limit")), timezone.utc
                 ).replace(tzinfo=None)
 
             except (TypeError, ValueError):
@@ -913,89 +968,97 @@ def _request(self, path, payload=None, method='POST'):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'Exception received when sending Mastodon {} to {}: '.
-                format(method, url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"Exception received when sending Mastodon {method} to {url}: "
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             return (False, content)
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while handling {}.'.format(
-                    payload.name if isinstance(payload, AttachBase)
-                    else payload))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while handling {}.".format(
+                    payload.name
+                    if isinstance(payload, AttachBase)
+                    else payload
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return (False, content)
 
         finally:
             # Close our file (if it's open) stored in the second element
             # of our files tuple (index 1)
             if files:
-                files['file'][1].close()
+                files["file"][1].close()
 
         return (True, content)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifyMastodon.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyMastodon.unquote(results["qsd"]["token"])
 
-        elif not results['password'] and results['user']:
-            results['token'] = NotifyMastodon.unquote(results['user'])
+        elif not results["password"] and results["user"]:
+            results["token"] = NotifyMastodon.unquote(results["user"])
 
         # Apply our targets
-        results['targets'] = NotifyMastodon.split_path(results['fullpath'])
+        results["targets"] = NotifyMastodon.split_path(results["fullpath"])
 
         # The defined Mastodon visibility
-        if 'visibility' in results['qsd'] and \
-                len(results['qsd']['visibility']):
+        if "visibility" in results["qsd"] and len(
+            results["qsd"]["visibility"]
+        ):
             # Simplified version
-            results['visibility'] = \
-                NotifyMastodon.unquote(results['qsd']['visibility'])
+            results["visibility"] = NotifyMastodon.unquote(
+                results["qsd"]["visibility"]
+            )
 
-        elif results['schema'].startswith('toot'):
-            results['visibility'] = MastodonMessageVisibility.PUBLIC
+        elif results["schema"].startswith("toot"):
+            results["visibility"] = MastodonMessageVisibility.PUBLIC
 
         # Get Idempotency Key (if specified)
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
-            results['key'] = \
-                NotifyMastodon.unquote(results['qsd']['key'])
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
+            results["key"] = NotifyMastodon.unquote(results["qsd"]["key"])
 
         # Get Spoiler Text
-        if 'spoiler' in results['qsd'] and len(results['qsd']['spoiler']):
-            results['spoiler'] = \
-                NotifyMastodon.unquote(results['qsd']['spoiler'])
+        if "spoiler" in results["qsd"] and len(results["qsd"]["spoiler"]):
+            results["spoiler"] = NotifyMastodon.unquote(
+                results["qsd"]["spoiler"]
+            )
 
         # Get Language (if specified)
-        if 'language' in results['qsd'] and len(results['qsd']['language']):
-            results['language'] = \
-                NotifyMastodon.unquote(results['qsd']['language'])
+        if "language" in results["qsd"] and len(results["qsd"]["language"]):
+            results["language"] = NotifyMastodon.unquote(
+                results["qsd"]["language"]
+            )
 
         # Get Sensitive Flag (for Attachments)
-        results['sensitive'] = \
-            parse_bool(results['qsd'].get(
-                'sensitive',
-                NotifyMastodon.template_args['sensitive']['default']))
+        results["sensitive"] = parse_bool(
+            results["qsd"].get(
+                "sensitive",
+                NotifyMastodon.template_args["sensitive"]["default"],
+            )
+        )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyMastodon.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyMastodon.template_args["batch"]["default"]
+            )
+        )
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyMastodon.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyMastodon.parse_list(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/matrix.py b/libs/apprise/plugins/matrix.py
index ffc4e3e9c8..ebb6502c84 100644
--- a/libs/apprise/plugins/matrix.py
+++ b/libs/apprise/plugins/matrix.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,60 +29,66 @@
 # - https://github.com/matrix-org/matrix-python-sdk
 # - https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.rst
 #
+from json import dumps, loads
 import re
-import requests
+from time import time
 import uuid
+
 from markdown import markdown
-from json import dumps
-from json import loads
-from time import time
+import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+from ..common import (
+    NotifyFormat,
+    NotifyImageSize,
+    NotifyType,
+    PersistentStoreMode,
+)
 from ..exception import AppriseException
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..common import NotifyFormat
-from ..common import PersistentStoreMode
-from ..utils.parse import (
-    parse_bool, parse_list, is_hostname, validate_regex)
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_hostname, parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Define default path
-MATRIX_V1_WEBHOOK_PATH = '/api/v1/matrix/hook'
-MATRIX_V2_API_PATH = '/_matrix/client/r0'
-MATRIX_V3_API_PATH = '/_matrix/client/v3'
-MATRIX_V3_MEDIA_PATH = '/_matrix/media/v3'
-MATRIX_V2_MEDIA_PATH = '/_matrix/media/r0'
+MATRIX_V1_WEBHOOK_PATH = "/api/v1/matrix/hook"
+MATRIX_V2_API_PATH = "/_matrix/client/r0"
+MATRIX_V3_API_PATH = "/_matrix/client/v3"
+MATRIX_V3_MEDIA_PATH = "/_matrix/media/v3"
+MATRIX_V2_MEDIA_PATH = "/_matrix/media/r0"
 
 
 class MatrixDiscoveryException(AppriseException):
-    """
-    Apprise Matrix Exception Class
-    """
+    """Apprise Matrix Exception Class."""
 
 
 # Extend HTTP Error Messages
 MATRIX_HTTP_ERROR_MAP = {
-    403: 'Unauthorized - Invalid Token.',
-    429: 'Rate limit imposed; wait 2s and try again',
+    403: "Unauthorized - Invalid Token.",
+    429: "Rate limit imposed; wait 2s and try again",
 }
 
 # Matrix Room Syntax
 IS_ROOM_ALIAS = re.compile(
-    r'^\s*(#|%23)?(?P<room>[a-z0-9-]+)((:|%3A)'
-    r'(?P<home_server>[a-z0-9.-]+))?\s*$', re.I)
+    r"^\s*(#|%23)?(?P<room>[A-Za-z0-9._=-]+)((:|%3A)"
+    r"(?P<home_server>[A-Za-z0-9.-]+))?\s*$",
+    re.I,
+)
 
 # Room ID MUST start with an exclamation to avoid ambiguity
 IS_ROOM_ID = re.compile(
-    r'^\s*(!|&#33;|%21)(?P<room>[a-z0-9-]+)((:|%3A)'
-    r'(?P<home_server>[a-z0-9.-]+))?\s*$', re.I)
+    r"^\s*(!|&#33;|%21)(?P<room>[A-Za-z0-9._=-]+)((:|%3A)"
+    r"(?P<home_server>[A-Za-z0-9.-]+))?\s*$",
+    re.I,
+)
+
+
+# Matrix is_image check
+IS_IMAGE = re.compile(r"^image/.*", re.I)
 
 
 class MatrixMessageType:
-    """
-    The Matrix Message types
-    """
+    """The Matrix Message types."""
+
     TEXT = "text"
     NOTICE = "notice"
 
@@ -134,27 +139,25 @@ class MatrixWebhookMode:
 
 
 class NotifyMatrix(NotifyBase):
-    """
-    A wrapper for Matrix Notifications
-    """
+    """A wrapper for Matrix Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Matrix'
+    service_name = "Matrix"
 
     # The services URL
-    service_url = 'https://matrix.org/'
+    service_url = "https://matrix.org/"
 
     # The default protocol
-    protocol = 'matrix'
+    protocol = "matrix"
 
     # The default secure protocol
-    secure_protocol = 'matrixs'
+    secure_protocol = "matrixs"
 
     # Support Attachments
     attachment_support = True
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_matrix'
+    setup_url = "https://appriseit.com/services/matrix/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_32
@@ -177,7 +180,7 @@ class NotifyMatrix(NotifyBase):
     default_retries = 2
 
     # The number of micro seconds to wait if we get a 429 error code and
-    # the server doesn't remind us how long we shoul wait for
+    # the server doesn't remind us how long we should wait for
     default_wait_ms = 1000
 
     # Our default is to no not use persistent storage beyond in-memory
@@ -188,8 +191,8 @@ class NotifyMatrix(NotifyBase):
     default_cache_expiry_sec = 60 * 60 * 24 * 20
 
     # Used for server discovery
-    discovery_base_key = '__discovery_base'
-    discovery_identity_key = '__discovery_identity'
+    discovery_base_key = "__discovery_base"
+    discovery_identity_key = "__discovery_identity"
 
     # Defines how long we cache our discovery for
     discovery_cache_length_sec = 86400
@@ -197,114 +200,130 @@ class NotifyMatrix(NotifyBase):
     # Define object templates
     templates = (
         # Targets are ignored when using t2bot mode; only a token is required
-        '{schema}://{token}',
-        '{schema}://{user}@{token}',
-
+        "{schema}://{token}",
+        "{schema}://{user}@{token}",
         # Matrix Server
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
-        '{schema}://{token}@{host}/{targets}',
-        '{schema}://{token}@{host}:{port}/{targets}',
-
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
+        "{schema}://{token}@{host}/{targets}",
+        "{schema}://{token}@{host}:{port}/{targets}",
         # Webhook mode
-        '{schema}://{user}:{token}@{host}/{targets}',
-        '{schema}://{user}:{token}@{host}:{port}/{targets}',
+        "{schema}://{user}:{token}@{host}/{targets}",
+        "{schema}://{user}:{token}@{host}:{port}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'token': {
-            'name': _('Access Token'),
-            'private': True,
-            'map_to': 'password',
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'target_room_id': {
-            'name': _('Target Room ID'),
-            'type': 'string',
-            'prefix': '!',
-            'map_to': 'targets',
-        },
-        'target_room_alias': {
-            'name': _('Target Room Alias'),
-            'type': 'string',
-            'prefix': '!',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "token": {
+                "name": _("Access Token"),
+                "private": True,
+                "map_to": "password",
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_room_id": {
+                "name": _("Target Room ID"),
+                "type": "string",
+                "prefix": "!",
+                "map_to": "targets",
+            },
+            "target_room_alias": {
+                "name": _("Target Room Alias"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-        'discovery': {
-            'name': _('Server Discovery'),
-            'type': 'bool',
-            'default': True,
-        },
-        'mode': {
-            'name': _('Webhook Mode'),
-            'type': 'choice:string',
-            'values': MATRIX_WEBHOOK_MODES,
-            'default': MatrixWebhookMode.DISABLED,
-        },
-        'version': {
-            'name': _('Matrix API Verion'),
-            'type': 'choice:string',
-            'values': MATRIX_VERSIONS,
-            'default': MatrixVersion.V3,
-        },
-        'msgtype': {
-            'name': _('Message Type'),
-            'type': 'choice:string',
-            'values': MATRIX_MESSAGE_TYPES,
-            'default': MatrixMessageType.TEXT,
-        },
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            "discovery": {
+                "name": _("Server Discovery"),
+                "type": "bool",
+                "default": True,
+            },
+            "hsreq": {
+                "name": _("Force Home Server on Room IDs"),
+                "type": "bool",
+                "default": True,
+            },
+            "mode": {
+                "name": _("Webhook Mode"),
+                "type": "choice:string",
+                "values": MATRIX_WEBHOOK_MODES,
+                "default": MatrixWebhookMode.DISABLED,
+            },
+            "version": {
+                "name": _("Matrix API Verion"),
+                "type": "choice:string",
+                "values": MATRIX_VERSIONS,
+                "default": MatrixVersion.V3,
+            },
+            "msgtype": {
+                "name": _("Message Type"),
+                "type": "choice:string",
+                "values": MATRIX_MESSAGE_TYPES,
+                "default": MatrixMessageType.TEXT,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "token": {
+                "alias_of": "token",
+            },
         },
-        'token': {
-            'alias_of': 'token',
-        },
-    })
+    )
 
-    def __init__(self, targets=None, mode=None, msgtype=None, version=None,
-                 include_image=None, discovery=None, **kwargs):
-        """
-        Initialize Matrix Object
-        """
+    def __init__(
+        self,
+        targets=None,
+        mode=None,
+        msgtype=None,
+        version=None,
+        include_image=None,
+        discovery=None,
+        hsreq=None,
+        **kwargs,
+    ):
+        """Initialize Matrix Object."""
         super().__init__(**kwargs)
 
         # Prepare a list of rooms to connect and notify
@@ -323,61 +342,87 @@ def __init__(self, targets=None, mode=None, msgtype=None, version=None,
         self.transaction_id = 0
 
         # Place an image inline with the message body
-        self.include_image = self.template_args['image']['default'] \
-            if include_image is None else include_image
+        self.include_image = (
+            self.template_args["image"]["default"]
+            if include_image is None
+            else include_image
+        )
 
         # Prepare Delegate Server Lookup Check
-        self.discovery = self.template_args['discovery']['default'] \
-            if discovery is None else discovery
+        self.discovery = (
+            self.template_args["discovery"]["default"]
+            if discovery is None
+            else discovery
+        )
+
+        # When enabled, room IDs missing a ':homeserver' segment will
+        # be treated as legacy identifiers and automatically suffixed
+        # with the authenticated homeserver.
+        self.hsreq = (
+            self.template_args["hsreq"]["default"]
+            if hsreq is None
+            else hsreq
+        )
 
         # Setup our mode
-        self.mode = self.template_args['mode']['default'] \
-            if not isinstance(mode, str) else mode.lower()
+        self.mode = (
+            self.template_args["mode"]["default"]
+            if not isinstance(mode, str)
+            else mode.lower()
+        )
         if self.mode and self.mode not in MATRIX_WEBHOOK_MODES:
-            msg = 'The mode specified ({}) is invalid.'.format(mode)
+            msg = f"The mode specified ({mode}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Setup our version
-        self.version = self.template_args['version']['default'] \
-            if not isinstance(version, str) else version
+        self.version = (
+            self.template_args["version"]["default"]
+            if not isinstance(version, str)
+            else version
+        )
         if self.version not in MATRIX_VERSIONS:
-            msg = 'The version specified ({}) is invalid.'.format(version)
+            msg = f"The version specified ({version}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Setup our message type
-        self.msgtype = self.template_args['msgtype']['default'] \
-            if not isinstance(msgtype, str) else msgtype.lower()
+        self.msgtype = (
+            self.template_args["msgtype"]["default"]
+            if not isinstance(msgtype, str)
+            else msgtype.lower()
+        )
         if self.msgtype and self.msgtype not in MATRIX_MESSAGE_TYPES:
-            msg = 'The msgtype specified ({}) is invalid.'.format(msgtype)
+            msg = f"The msgtype specified ({msgtype}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if self.mode == MatrixWebhookMode.T2BOT:
             # t2bot configuration requires that a webhook id is specified
             self.access_token = validate_regex(
-                self.password, r'^[a-z0-9]{64}$', 'i')
+                self.password, r"^[a-z0-9]{64}$", "i"
+            )
             if not self.access_token:
-                msg = 'An invalid T2Bot/Matrix Webhook ID ' \
-                      '({}) was specified.'.format(self.password)
+                msg = (
+                    "An invalid T2Bot/Matrix Webhook ID "
+                    f"({self.password}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         elif not is_hostname(self.host):
-            msg = 'An invalid Matrix Hostname ({}) was specified'\
-                  .format(self.host)
+            msg = f"An invalid Matrix Hostname ({self.host}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         else:
             # Verify port if specified
             if self.port is not None and not (
-                    isinstance(self.port, int)
-                    and self.port >= self.template_tokens['port']['min']
-                    and self.port <= self.template_tokens['port']['max']):
-                msg = 'An invalid Matrix Port ({}) was specified'\
-                      .format(self.port)
+                isinstance(self.port, int)
+                and self.port >= self.template_tokens["port"]["min"]
+                and self.port <= self.template_tokens["port"]["max"]
+            ):
+                msg = f"An invalid Matrix Port ({self.port}) was specified"
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -390,54 +435,53 @@ def __init__(self, targets=None, mode=None, msgtype=None, version=None,
         #
         if self.mode != MatrixWebhookMode.T2BOT:
             # our home server gets populated after a login/registration
-            self.home_server = self.store.get('home_server')
+            self.home_server = self.store.get("home_server")
 
             # our user_id gets populated after a login/registration
-            self.user_id = self.store.get('user_id')
+            self.user_id = self.store.get("user_id")
 
             # This gets initialized after a login/registration
-            self.access_token = self.store.get('access_token')
+            self.access_token = self.store.get("access_token")
 
         # This gets incremented for each request made against the v3 API
-        self.transaction_id = 0 if not self.access_token \
-            else self.store.get('transaction_id', 0)
+        self.transaction_id = (
+            0 if not self.access_token else self.store.get("transaction_id", 0)
+        )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Matrix Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Matrix Notification."""
 
         # Call the _send_ function applicable to whatever mode we're in
         # - calls _send_webhook_notification if the mode variable is set
         # - calls _send_server_notification if the mode variable is not set
-        return getattr(self, '_send_{}_notification'.format(
-            'webhook' if self.mode != MatrixWebhookMode.DISABLED
-            else 'server'))(
-                body=body, title=title, notify_type=notify_type, **kwargs)
-
-    def _send_webhook_notification(self, body, title='',
-                                   notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Matrix Notification as a webhook
-        """
+        return getattr(
+            self,
+            "_send_{}_notification".format(
+                "webhook"
+                if self.mode != MatrixWebhookMode.DISABLED
+                else "server"
+            ),
+        )(body=body, title=title, notify_type=notify_type, **kwargs)
+
+    def _send_webhook_notification(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """Perform Matrix Notification as a webhook."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         if self.mode != MatrixWebhookMode.T2BOT:
             # Acquire our access token from our URL
             access_token = self.password if self.password else self.user
 
-            default_port = 443 if self.secure else 80
-
             # Prepare our URL
-            url = '{schema}://{hostname}:{port}{webhook_path}/{token}'.format(
-                schema='https' if self.secure else 'http',
+            url = "{schema}://{hostname}{port}{webhook_path}/{token}".format(
+                schema="https" if self.secure else "http",
                 hostname=self.host,
-                port='' if self.port is None
-                or self.port == default_port else self.port,
+                port=("" if not self.port else f":{self.port}"),
                 webhook_path=MATRIX_V1_WEBHOOK_PATH,
                 token=access_token,
             )
@@ -448,17 +492,20 @@ def _send_webhook_notification(self, body, title='',
             #
 
             # Prepare our URL
-            url = 'https://webhooks.t2bot.io/api/v1/matrix/hook/' \
-                '{token}'.format(token=self.access_token)
+            url = (
+                "https://webhooks.t2bot.io/api/v1/matrix/hook/"
+                f"{self.access_token}"
+            )
 
         # Retrieve our payload
-        payload = getattr(self, '_{}_webhook_payload'.format(self.mode))(
-            body=body, title=title, notify_type=notify_type, **kwargs)
+        payload = getattr(self, f"_{self.mode}_webhook_payload")(
+            body=body, title=title, notify_type=notify_type, **kwargs
+        )
 
-        self.logger.debug('Matrix POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Matrix Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Matrix POST URL: {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Matrix Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -473,155 +520,162 @@ def _send_webhook_notification(self, body, title='',
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyMatrix.http_response_code_lookup(
-                        r.status_code, MATRIX_HTTP_ERROR_MAP)
+                status_str = NotifyMatrix.http_response_code_lookup(
+                    r.status_code, MATRIX_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Matrix notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Matrix notification: {}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Matrix notification.')
+                self.logger.info("Sent Matrix notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Matrix notification.'
+                "A Connection error occurred sending Matrix notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             # Return; we're done
             return False
 
         return True
 
-    def _slack_webhook_payload(self, body, title='',
-                               notify_type=NotifyType.INFO, **kwargs):
-        """
-        Format the payload for a Slack based message
+    def _slack_webhook_payload(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """Format the payload for a Slack based message."""
 
-        """
-
-        if not hasattr(self, '_re_slack_formatting_rules'):
+        if not hasattr(self, "_re_slack_formatting_rules"):
             # Prepare some one-time slack formatting variables
 
             self._re_slack_formatting_map = {
                 # New lines must become the string version
-                r'\r\*\n': '\\n',
+                r"\r\*\n": "\\n",
                 # Escape other special characters
-                r'&': '&amp;',
-                r'<': '&lt;',
-                r'>': '&gt;',
+                r"&": "&amp;",
+                r"<": "&lt;",
+                r">": "&gt;",
             }
 
             # Iterate over above list and store content accordingly
             self._re_slack_formatting_rules = re.compile(
-                r'(' + '|'.join(self._re_slack_formatting_map.keys()) + r')',
+                r"(" + "|".join(self._re_slack_formatting_map.keys()) + r")",
                 re.IGNORECASE,
             )
 
         # Perform Formatting
         title = self._re_slack_formatting_rules.sub(  # pragma: no branch
-            lambda x: self._re_slack_formatting_map[x.group()], title,
+            lambda x: self._re_slack_formatting_map[x.group()],
+            title,
         )
 
         body = self._re_slack_formatting_rules.sub(  # pragma: no branch
-            lambda x: self._re_slack_formatting_map[x.group()], body,
+            lambda x: self._re_slack_formatting_map[x.group()],
+            body,
         )
 
         # prepare JSON Object
         payload = {
-            'username': self.user if self.user else self.app_id,
+            "username": self.user if self.user else self.app_id,
             # Use Markdown language
-            'mrkdwn': (self.notify_format == NotifyFormat.MARKDOWN),
-            'attachments': [{
-                'title': title,
-                'text': body,
-                'color': self.color(notify_type),
-                'ts': time(),
-                'footer': self.app_id,
+            "mrkdwn": self.notify_format == NotifyFormat.MARKDOWN,
+            "attachments": [{
+                "title": title,
+                "text": body,
+                "color": self.color(notify_type),
+                "ts": time(),
+                "footer": self.app_id,
             }],
         }
 
         return payload
 
-    def _matrix_webhook_payload(self, body, title='',
-                                notify_type=NotifyType.INFO, **kwargs):
-        """
-        Format the payload for a Matrix based message
-
-        """
+    def _matrix_webhook_payload(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """Format the payload for a Matrix based message."""
 
         payload = {
-            'displayName':
-                self.user if self.user else self.app_id,
-            'format': 'plain' if self.notify_format == NotifyFormat.TEXT
-            else 'html',
-            'text': '',
+            "displayName": self.user if self.user else self.app_id,
+            "format": (
+                "plain" if self.notify_format == NotifyFormat.TEXT else "html"
+            ),
+            "text": "",
         }
 
         if self.notify_format == NotifyFormat.HTML:
-            payload['text'] = '{title}{body}'.format(
-                title='' if not title else '<h1>{}</h1>'.format(
-                    NotifyMatrix.escape_html(title)),
-                body=body)
+            payload["text"] = "{title}{body}".format(
+                title=(
+                    ""
+                    if not title
+                    else f"<h1>{NotifyMatrix.escape_html(title)}</h1>"
+                ),
+                body=body,
+            )
 
         elif self.notify_format == NotifyFormat.MARKDOWN:
-            payload['text'] = '{title}{body}'.format(
-                title='' if not title else '<h1>{}</h1>'.format(
-                    NotifyMatrix.escape_html(title)),
-                body=markdown(body))
+            payload["text"] = "{title}{body}".format(
+                title=(
+                    ""
+                    if not title
+                    else f"<h1>{NotifyMatrix.escape_html(title)}</h1>"
+                ),
+                body=markdown(body),
+            )
 
         else:  # NotifyFormat.TEXT
-            payload['text'] = \
-                body if not title else '{}\r\n{}'.format(title, body)
+            payload["text"] = body if not title else f"{title}\r\n{body}"
 
         return payload
 
-    def _t2bot_webhook_payload(self, body, title='',
-                               notify_type=NotifyType.INFO, **kwargs):
-        """
-        Format the payload for a T2Bot Matrix based messages
-
-        """
+    def _t2bot_webhook_payload(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """Format the payload for a T2Bot Matrix based messages."""
 
         # Retrieve our payload
         payload = self._matrix_webhook_payload(
-            body=body, title=title, notify_type=notify_type, **kwargs)
+            body=body, title=title, notify_type=notify_type, **kwargs
+        )
 
         # Acquire our image url if we're configured to do so
-        image_url = None if not self.include_image else \
-            self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if image_url:
             # t2bot can take an avatarUrl Entry
-            payload['avatarUrl'] = image_url
+            payload["avatarUrl"] = image_url
 
         return payload
 
-    def _send_server_notification(self, body, title='',
-                                  notify_type=NotifyType.INFO, attach=None,
-                                  **kwargs):
-        """
-        Perform Direct Matrix Server Notification (no webhook)
-        """
+    def _send_server_notification(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Direct Matrix Server Notification (no webhook)"""
 
         if self.access_token is None and self.password and not self.user:
             self.access_token = self.password
             self.transaction_id = uuid.uuid4()
 
-        if self.access_token is None:
+        if self.access_token is None and not self._login() \
+                and not self._register():
             # We need to register
-            if not self._login():
-                if not self._register():
-                    return False
+            return False
 
         if len(self.rooms) == 0:
             # Attempt to retrieve a list of already joined channels
@@ -630,7 +684,8 @@ def _send_server_notification(self, body, title='',
             if len(self.rooms) == 0:
                 # Nothing to notify
                 self.logger.warning(
-                    'There were no Matrix rooms specified to notify.')
+                    "There were no Matrix rooms specified to notify."
+                )
                 return False
 
         # Create a copy of our rooms to join and message
@@ -651,112 +706,137 @@ def _send_server_notification(self, body, title='',
             # Get our room
             room = rooms.pop(0)
 
+            # Set method according to MatrixVersion
+            method = "PUT" if self.version == MatrixVersion.V3 else "POST"
+
             # Get our room_id from our response
             room_id = self._room_join(room)
             if not room_id:
                 # Notify our user about our failure
-                self.logger.warning(
-                    'Could not join Matrix room {}.'.format((room)))
+                self.logger.warning(f"Could not join Matrix room {room}.")
 
                 # Mark our failure
                 has_error = True
                 continue
 
             # Acquire our image url if we're configured to do so
-            image_url = None if not self.include_image else \
-                self.image_url(notify_type)
+            image_url = (
+                None if not self.include_image else self.image_url(notify_type)
+            )
 
             # Build our path
             if self.version == MatrixVersion.V3:
-                path = '/rooms/{}/send/m.room.message/{}'.format(
-                    NotifyMatrix.quote(room_id),
-                    self.transaction_id,
-                )
+                path = f"/rooms/{NotifyMatrix.quote(room_id)}" \
+                    f"/send/m.room.message/{self.transaction_id}"
 
             else:
-                path = '/rooms/{}/send/m.room.message'.format(
-                    NotifyMatrix.quote(room_id))
-
-            if self.version == MatrixVersion.V2:
-                #
-                # Attachments don't work beyond V2 at this time
-                #
-                if image_url:
-                    # Define our payload
-                    image_payload = {
-                        'msgtype': 'm.image',
-                        'url': image_url,
-                        'body': '{}'.format(
-                            notify_type if not title else title),
-                    }
-
-                    # Post our content
-                    postokay, response = self._fetch(
-                        path, payload=image_payload)
+                path = (
+                    f"/rooms/{NotifyMatrix.quote(room_id)}/send/m.room.message"
+                )
+
+            if image_url and self.version == MatrixVersion.V2:
+                # Define our payload
+                image_payload = {
+                    "msgtype": "m.image",
+                    "url": image_url,
+                    "body": f"{title if title else notify_type}",
+                }
+
+                # Post our content
+                postokay, _, _ = self._fetch(
+                    path, payload=image_payload)
+                if not postokay:
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+            if attachments:
+                for attachment in attachments:
+                    attachment["room_id"] = room_id
+                    attachment["type"] = "m.room.message"
+
+                    postokay, _, _ = self._fetch(
+                        path, payload=attachment, method=method)
+
+                    # Increment the transaction ID to avoid future messages
+                    # being recognized as retransmissions and ignored
+                    if self.version == MatrixVersion.V3 \
+                       and self.access_token != self.password:
+                        self.transaction_id += 1
+                        self.store.set(
+                            "transaction_id", self.transaction_id,
+                            expires=self.default_cache_expiry_sec)
+                        path = "/rooms/{}/send/m.room.message/{}".format(
+                            NotifyMatrix.quote(room_id),
+                            self.transaction_id,
+                        )
+
                     if not postokay:
                         # Mark our failure
                         has_error = True
                         continue
 
-                if attachments:
-                    for attachment in attachments:
-                        attachment['room_id'] = room_id
-                        attachment['type'] = 'm.room.message'
-
-                        postokay, response = self._fetch(
-                            path, payload=attachment)
-                        if not postokay:
-                            # Mark our failure
-                            has_error = True
-                            continue
-
             # Define our payload
             payload = {
-                'msgtype': 'm.{}'.format(self.msgtype),
-                'body': '{title}{body}'.format(
-                    title='' if not title else '# {}\r\n'.format(title),
-                    body=body),
+                "msgtype": f"m.{self.msgtype}",
+                "body": "{title}{body}".format(
+                    title="" if not title else f"# {title}\r\n", body=body
+                ),
             }
 
             # Update our payload advance formatting for the services that
             # support them.
             if self.notify_format == NotifyFormat.HTML:
                 payload.update({
-                    'format': 'org.matrix.custom.html',
-                    'formatted_body': '{title}{body}'.format(
-                        title='' if not title else '<h1>{}</h1>'.format(title),
+                    "format": "org.matrix.custom.html",
+                    "formatted_body": "{title}{body}".format(
+                        title="" if not title else f"<h1>{title}</h1>",
                         body=body,
-                    )
+                    ),
                 })
 
             elif self.notify_format == NotifyFormat.MARKDOWN:
+                title_ = (
+                    ""
+                    if not title
+                    else (
+                        "<h1>"
+                        f"{NotifyMatrix.escape_html(title, whitespace=False)}"
+                        "</h1>"
+                    )
+                )
+
                 payload.update({
-                    'format': 'org.matrix.custom.html',
-                    'formatted_body': '{title}{body}'.format(
-                        title='' if not title else '<h1>{}</h1>'.format(
-                            NotifyMatrix.escape_html(title, whitespace=False)),
+                    "format": "org.matrix.custom.html",
+                    "formatted_body": "{title}{body}".format(
+                        title=title_,
                         body=markdown(body),
-                    )
+                    ),
                 })
 
             # Post our content
-            method = 'PUT' if self.version == MatrixVersion.V3 else 'POST'
-            postokay, response = self._fetch(
-                path, payload=payload, method=method)
+            postokay, _, _ = self._fetch(
+                path, payload=payload, method=method
+            )
 
             # Increment the transaction ID to avoid future messages being
             # recognized as retransmissions and ignored
-            if self.version == MatrixVersion.V3 \
-               and self.access_token != self.password:
+            if (
+                self.version == MatrixVersion.V3
+                and self.access_token != self.password
+            ):
                 self.transaction_id += 1
                 self.store.set(
-                    'transaction_id', self.transaction_id,
-                    expires=self.default_cache_expiry_sec)
+                    "transaction_id",
+                    self.transaction_id,
+                    expires=self.default_cache_expiry_sec,
+                )
 
             if not postokay:
                 # Notify our user
                 self.logger.warning(
-                    'Could not send notification Matrix room {}.'.format(room))
+                    f"Could not send notification Matrix room {room}."
+                )
 
                 # Mark our failure
                 has_error = True
@@ -765,27 +845,22 @@ def _send_server_notification(self, body, title='',
         return not has_error
 
     def _send_attachments(self, attach):
-        """
-        Posts all of the provided attachments
-        """
+        """Posts all of the provided attachments."""
 
         payloads = []
-        if self.version != MatrixVersion.V2:
-            self.logger.warning(
-                'Add ?v=2 to Apprise URL to support Attachments')
-            return next((False for a in attach if not a), [])
 
         for attachment in attach:
             if not attachment:
                 # invalid attachment (bad file)
                 return False
 
-            if not re.match(r'^image/', attachment.mimetype, re.I):
+            if not IS_IMAGE.match(attachment.mimetype) \
+               and self.version == MatrixVersion.V2:
                 # unsuppored at this time
                 continue
 
-            postokay, response = \
-                self._fetch('/upload', attachment=attachment)
+            postokay, response, _ = \
+                self._fetch("/upload", attachment=attachment)
             if not (postokay and isinstance(response, dict)):
                 # Failed to perform upload
                 return False
@@ -795,168 +870,166 @@ def _send_attachments(self, attach):
             #     "content_uri": "mxc://example.com/a-unique-key"
             # }
 
-            # FUTURE if self.version == MatrixVersion.V3:
-            # FUTURE     # Prepare our payload
-            # FUTURE     payloads.append({
-            # FUTURE         "body": attachment.name,
-            # FUTURE         "info": {
-            # FUTURE             "mimetype": attachment.mimetype,
-            # FUTURE             "size": len(attachment),
-            # FUTURE         },
-            # FUTURE         "msgtype": "m.image",
-            # FUTURE         "url": response.get('content_uri'),
-            # FUTURE     })
-
-            # FUTURE else:
-            # FUTURE     # Prepare our payload
-            # FUTURE     payloads.append({
-            # FUTURE         "info": {
-            # FUTURE             "mimetype": attachment.mimetype,
-            # FUTURE         },
-            # FUTURE         "msgtype": "m.image",
-            # FUTURE         "body": "tta.webp",
-            # FUTURE         "url": response.get('content_uri'),
-            # FUTURE     })
-
-            # Prepare our payload
-            payloads.append({
-                "info": {
-                    "mimetype": attachment.mimetype,
-                },
-                "msgtype": "m.image",
-                "body": "tta.webp",
-                "url": response.get('content_uri'),
-            })
+            if self.version == MatrixVersion.V3:
+                # Prepare our payload
+                is_image = IS_IMAGE.match(attachment.mimetype)
+                payloads.append({
+                    "body": attachment.name,
+                    "info": {
+                        "mimetype": attachment.mimetype,
+                        "size": len(attachment),
+                    },
+                    "msgtype": "m.image" if is_image else "m.file",
+                    "url": response.get("content_uri"),
+                })
+                if not is_image:
+                    # Setup `m.file'
+                    payloads[-1]["filename"] = attachment.name
+
+            else:
+                # Prepare our payload
+                payloads.append({
+                    "info": {
+                        "mimetype": attachment.mimetype,
+                    },
+                    "msgtype": "m.image",
+                    "body": "tta.webp",
+                    "url": response.get("content_uri"),
+                })
 
         return payloads
 
     def _register(self):
-        """
-        Register with the service if possible.
-        """
+        """Register with the service if possible."""
 
         # Prepare our Registration Payload. This will only work if registration
         # is enabled for the public
         payload = {
-            'kind': 'user',
-            'auth': {'type': 'm.login.dummy'},
+            "kind": "user",
+            "auth": {"type": "m.login.dummy"},
         }
 
         # parameters
         params = {
-            'kind': 'user',
+            "kind": "user",
         }
 
         # If a user is not specified, one will be randomly generated for you.
         # If you do not specify a password, you will be unable to login to the
         # account if you forget the access_token.
         if self.user:
-            payload['username'] = self.user
+            payload["username"] = self.user
 
         if self.password:
-            payload['password'] = self.password
+            payload["password"] = self.password
 
         # Register
-        postokay, response = \
-            self._fetch('/register', payload=payload, params=params)
+        postokay, response, _ = self._fetch(
+            "/register", payload=payload, params=params
+        )
         if not (postokay and isinstance(response, dict)):
             # Failed to register
             return False
 
         # Pull the response details
-        self.access_token = response.get('access_token')
-        self.home_server = response.get('home_server')
-        self.user_id = response.get('user_id')
+        self.access_token = response.get("access_token")
+        self.home_server = response.get("home_server")
+        self.user_id = response.get("user_id")
 
         self.store.set(
-            'access_token', self.access_token,
-            expires=self.default_cache_expiry_sec)
+            "access_token",
+            self.access_token,
+            expires=self.default_cache_expiry_sec,
+        )
         self.store.set(
-            'home_server', self.home_server,
-            expires=self.default_cache_expiry_sec)
+            "home_server",
+            self.home_server,
+            expires=self.default_cache_expiry_sec,
+        )
         self.store.set(
-            'user_id', self.user_id,
-            expires=self.default_cache_expiry_sec)
+            "user_id", self.user_id, expires=self.default_cache_expiry_sec
+        )
 
         if self.access_token is not None:
             # Store our token into our store
-            self.logger.debug(
-                'Registered successfully with Matrix server.')
+            self.logger.debug("Registered successfully with Matrix server.")
             return True
 
         return False
 
     def _login(self):
-        """
-        Acquires the matrix token required for making future requests. If we
-        fail we return False, otherwise we return True
+        """Acquires the matrix token required for making future requests.
+
+        If we fail we return False, otherwise we return True
         """
 
         if self.access_token:
             # Login not required; silently skip-over
             return True
 
-        if (self.user and self.password):
+        if self.user and self.password:
             # Prepare our Authentication Payload
             if self.version == MatrixVersion.V3:
                 payload = {
-                    'type': 'm.login.password',
-                    'identifier': {
-                        'type': 'm.id.user',
-                        'user': self.user,
+                    "type": "m.login.password",
+                    "identifier": {
+                        "type": "m.id.user",
+                        "user": self.user,
                     },
-                    'password': self.password,
+                    "password": self.password,
                 }
 
             else:
                 payload = {
-                    'type': 'm.login.password',
-                    'user': self.user,
-                    'password': self.password,
+                    "type": "m.login.password",
+                    "user": self.user,
+                    "password": self.password,
                 }
 
         else:
             # It's not possible to register since we need these 2 values to
             # make the action possible.
             self.logger.warning(
-                'Failed to login to Matrix server: '
-                'token or user/pass combo is missing.')
+                "Failed to login to Matrix server: "
+                "token or user/pass combo is missing."
+            )
             return False
 
         # Build our URL
-        postokay, response = self._fetch('/login', payload=payload)
+        postokay, response, _ = self._fetch("/login", payload=payload)
         if not (postokay and isinstance(response, dict)):
             # Failed to login
             return False
 
         # Pull the response details
-        self.access_token = response.get('access_token')
-        self.home_server = response.get('home_server')
-        self.user_id = response.get('user_id')
+        self.access_token = response.get("access_token")
+        self.home_server = response.get("home_server")
+        self.user_id = response.get("user_id")
 
         if not self.access_token:
             return False
 
-        self.logger.debug(
-            'Authenticated successfully with Matrix server.')
+        self.logger.debug("Authenticated successfully with Matrix server.")
 
         # Store our token into our store
         self.store.set(
-            'access_token', self.access_token,
-            expires=self.default_cache_expiry_sec)
+            "access_token",
+            self.access_token,
+            expires=self.default_cache_expiry_sec,
+        )
         self.store.set(
-            'home_server', self.home_server,
-            expires=self.default_cache_expiry_sec)
+            "home_server",
+            self.home_server,
+            expires=self.default_cache_expiry_sec,
+        )
         self.store.set(
-            'user_id', self.user_id,
-            expires=self.default_cache_expiry_sec)
+            "user_id", self.user_id, expires=self.default_cache_expiry_sec
+        )
 
         return True
 
     def _logout(self):
-        """
-        Relinquishes token from remote server
-        """
+        """Relinquishes token from remote server."""
 
         if not self.access_token:
             # Login not required; silently skip-over
@@ -966,8 +1039,8 @@ def _logout(self):
         payload = {}
 
         # Expire our token
-        postokay, response = self._fetch('/logout', payload=payload)
-        if not postokay:
+        postokay, response, _ = self._fetch("/logout", payload=payload)
+        if not postokay and response.get("errcode") != "M_UNKNOWN_TOKEN":
             # If we get here, the token was declared as having already
             # been expired.  The response looks like this:
             # {
@@ -977,8 +1050,7 @@ def _logout(self):
             #
             # In this case it's okay to safely return True because
             # we're logged out in this case.
-            if response.get('errcode') != u'M_UNKNOWN_TOKEN':
-                return False
+            return False
 
         # else: The response object looks like this if we were successful:
         #  {}
@@ -990,19 +1062,18 @@ def _logout(self):
 
         # clear our tokens
         self.store.clear(
-            'access_token', 'home_server', 'user_id', 'transaction_id')
+            "access_token", "home_server", "user_id", "transaction_id"
+        )
 
-        self.logger.debug(
-            'Unauthenticated successfully with Matrix server.')
+        self.logger.debug("Unauthenticated successfully with Matrix server.")
 
         return True
 
     def _room_join(self, room):
-        """
-        Joins a matrix room if we're not already in it. Otherwise it attempts
-        to create it if it doesn't exist and always returns
-        the room_id if it was successful, otherwise it returns None
+        """Joins a matrix room if we're not already in it.
 
+        Otherwise it attempts to create it if it doesn't exist and always
+        returns the room_id if it was successful, otherwise it returns None
         """
 
         if not self.access_token:
@@ -1019,60 +1090,82 @@ def _room_join(self, room):
         # Check if it's a room id...
         result = IS_ROOM_ID.match(room)
         if result:
-            # We detected ourselves the home_server
-            home_server = result.group('home_server') \
-                if result.group('home_server') else self.home_server
-
-            # It was a room ID; simple mapping:
-            room_id = "!{}:{}".format(
-                result.group('room'),
-                home_server,
+            room_token = result.group("room")
+            explicit_home_server = result.group("home_server")
+
+            # Determine the homeserver context (used for cache metadata)
+            home_server = (
+                explicit_home_server
+                if explicit_home_server else self.home_server
             )
 
+            # When hsreq is enabled (legacy behaviour), we always require a
+            # ':homeserver' segment on room IDs. Otherwise, we honour exactly
+            # what the caller provided and do not synthesise a homeserver when
+            # it was not specified.
+            cache_key = f"!{room_token}:{home_server}"
+            if explicit_home_server or self.hsreq:
+                room_id = cache_key
+            else:
+                room_id = f"!{room_token}"
+
             # Check our cache for speed:
             try:
-                # We're done as we've already joined the channel
-                return self.store[room_id]['id']
+                return self.store[cache_key]["id"]
 
             except KeyError:
-                # No worries, we'll try to acquire the info
                 pass
 
             # Build our URL
-            path = '/join/{}'.format(NotifyMatrix.quote(room_id))
-
-            # Make our query
-            postokay, _ = self._fetch(path, payload=payload)
-            if postokay:
-                # Cache our entry for fast access later
-                self.store.set(room_id, {
-                    'id': room_id,
-                    'home_server': home_server,
-                })
+            path = f"/join/{NotifyMatrix.quote(room_id)}"
 
-            return room_id if postokay else None
+            # Attempt to join the channel
+            postokay, response, _status_code = \
+                self._fetch(path, payload=payload)
+            if not postokay:
+                return None
+
+            # Prefer the server-provided room_id if one was returned,
+            # otherwise fall back to whatever we joined with.
+            joined_id = (
+                response.get("room_id") if isinstance(response, dict) else None
+            ) or room_id
+
+            # Cache mapping for faster future lookups.
+            self.store.set(
+                cache_key,
+                {
+                    "id": joined_id,
+                    "home_server": home_server,
+                },
+            )
+
+            return joined_id
 
         # Try to see if it's an alias then...
         result = IS_ROOM_ALIAS.match(room)
         if not result:
             # There is nothing else it could be
             self.logger.warning(
-                'Ignoring illegally formed room {} '
-                'from Matrix server list.'.format(room))
+                f"Ignoring illegally formed room {room} "
+                "from Matrix server list."
+            )
             return None
 
         # If we reach here, we're dealing with a channel alias
-        home_server = self.home_server \
-            if not result.group('home_server') \
-            else result.group('home_server')
+        home_server = (
+            self.home_server
+            if not result.group("home_server")
+            else result.group("home_server")
+        )
 
         # tidy our room (alias) identifier
-        room = '#{}:{}'.format(result.group('room'), home_server)
+        room = "#{}:{}".format(result.group("room"), home_server)
 
         # Check our cache for speed:
         try:
             # We're done as we've already joined the channel
-            return self.store[room]['id']
+            return self.store[room]["id"]
 
         except KeyError:
             # No worries, we'll try to acquire the info
@@ -1081,27 +1174,42 @@ def _room_join(self, room):
         # If we reach here, we need to join the channel
 
         # Build our URL
-        path = '/join/{}'.format(NotifyMatrix.quote(room))
+        path = f"/join/{NotifyMatrix.quote(room)}"
 
         # Attempt to join the channel
-        postokay, response = self._fetch(path, payload=payload)
+        postokay, response, status_code = self._fetch(path, payload=payload)
         if postokay:
             # Cache our entry for fast access later
-            self.store.set(room, {
-                'id': response.get('room_id'),
-                'home_server': home_server,
-            })
+            self.store.set(
+                room,
+                {
+                    "id": response.get("room_id"),
+                    "home_server": home_server,
+                },
+            )
 
-            return response.get('room_id')
+            return response.get("room_id")
 
-        # Try to create the channel
-        return self._room_create(room)
+        # Only attempt to create a room when the server clearly indicates
+        # the alias does not exist. A join can fail for many reasons, such as
+        # invite required, auth failure, or permissions, and in those cases
+        # auto-creating is both noisy and incorrect.
+        if (status_code == requests.codes.not_found
+                or response.get("errcode") == "M_NOT_FOUND"):
+            return self._room_create(room)
+
+        self.logger.warning(
+            "Could not join Matrix room alias %s (error=%s). "
+            "If this is a private room, ensure the user is invited or "
+            "already joined, or specify the room_id (!...).",
+            room,
+            status_code,
+        )
+        return None
 
     def _room_create(self, room):
-        """
-        Creates a matrix room and return it's room_id if successful
-        otherwise None is returned.
-        """
+        """Creates a matrix room and return it's room_id if successful
+        otherwise None is returned."""
         if not self.access_token:
             # We can't create a room if we're not logged in
             return None
@@ -1117,24 +1225,28 @@ def _room_create(self, room):
             return None
 
         # Our home_server
-        home_server = result.group('home_server') \
-            if result.group('home_server') else self.home_server
+        home_server = (
+            result.group("home_server")
+            if result.group("home_server")
+            else self.home_server
+        )
 
         # update our room details
-        room = '#{}:{}'.format(result.group('room'), home_server)
+        room = "#{}:{}".format(result.group("room"), home_server)
 
         # Prepare our Create Payload
         payload = {
-            'room_alias_name': result.group('room'),
+            "room_alias_name": result.group("room"),
             # Set our channel name
-            'name': '#{} - {}'.format(result.group('room'), self.app_desc),
+            "name": "#{} - {}".format(result.group("room"), self.app_desc),
             # hide the room by default; let the user open it up if they wish
             # to others.
-            'visibility': 'private',
-            'preset': 'trusted_private_chat',
+            "visibility": "private",
+            "preset": "trusted_private_chat",
         }
 
-        postokay, response = self._fetch('/createRoom', payload=payload)
+        postokay, response, _ = \
+            self._fetch("/createRoom", payload=payload)
         if not postokay:
             # Failed to create channel
             # Typical responses:
@@ -1142,36 +1254,38 @@ def _room_create(self, room):
             #      u'error': u'Room alias already taken'}
             #   - {u'errcode': u'M_UNKNOWN',
             #      u'error': u'Internal server error'}
-            if (response and response.get('errcode') == 'M_ROOM_IN_USE'):
+            if response and response.get("errcode") == "M_ROOM_IN_USE":
                 return self._room_id(room)
             return None
 
         # Cache our entry for fast access later
-        self.store.set(response.get('room_alias'), {
-            'id': response.get('room_id'),
-            'home_server': home_server,
-        })
+        self.store.set(
+            response.get("room_alias"),
+            {
+                "id": response.get("room_id"),
+                "home_server": home_server,
+            },
+        )
 
-        return response.get('room_id')
+        return response.get("room_id")
 
     def _joined_rooms(self):
-        """
-        Returns a list of the current rooms the logged in user
-        is a part of.
-        """
+        """Returns a list of the current rooms the logged in user is a part
+        of."""
 
         if not self.access_token:
             # No list is possible
-            return list()
+            return []
 
-        postokay, response = self._fetch(
-            '/joined_rooms', payload=None, method='GET')
+        postokay, response, _ = self._fetch(
+            "/joined_rooms", payload=None, method="GET"
+        )
         if not postokay:
             # Failed to retrieve listings
-            return list()
+            return []
 
         # Return our list of rooms
-        return response.get('joined_rooms', list())
+        return response.get("joined_rooms", [])
 
     def _room_id(self, room):
         """Get room id from its alias.
@@ -1197,43 +1311,57 @@ def _room_id(self, room):
             return None
 
         # Our home_server
-        home_server = result.group('home_server') \
-            if result.group('home_server') else self.home_server
+        home_server = (
+            result.group("home_server")
+            if result.group("home_server")
+            else self.home_server
+        )
 
         # update our room details
-        room = '#{}:{}'.format(result.group('room'), home_server)
+        room = "#{}:{}".format(result.group("room"), home_server)
 
         # Make our request
-        postokay, response = self._fetch(
-            "/directory/room/{}".format(
-                NotifyMatrix.quote(room)), payload=None, method='GET')
+        postokay, response, _ = self._fetch(
+            f"/directory/room/{NotifyMatrix.quote(room)}",
+            payload=None,
+            method="GET",
+        )
 
         if postokay:
             return response.get("room_id")
 
         return None
 
-    def _fetch(self, path, payload=None, params={}, attachment=None,
-               method='POST', url_override=None):
-        """
-        Wrapper to request.post() to manage it's response better and make
+    def _fetch(
+        self,
+        path,
+        payload=None,
+        params=None,
+        attachment=None,
+        method="POST",
+        url_override=None,
+    ):
+        """Wrapper to request.post() to manage it's response better and make
         the send() function cleaner and easier to maintain.
 
-        This function returns True if the _post was successful and False
-        if it wasn't.
+        This function always returns a 3-tuple:
+            (success, response, status_code)
 
-        this function returns the status code if url_override is used
+        The response is a dict when JSON is parseable, otherwise an empty dict.
+        The status_code defaults to 500 on local failures.
         """
 
         # Define our headers
+        if params is None:
+            params = {}
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
         }
 
         if self.access_token is not None:
-            headers["Authorization"] = 'Bearer %s' % self.access_token
+            headers["Authorization"] = f"Bearer {self.access_token}"
 
         # Server Discovery / Well-known URI
         if url_override:
@@ -1245,25 +1373,24 @@ def _fetch(self, path, payload=None, params={}, attachment=None,
 
             except MatrixDiscoveryException:
                 # Discovery failed; we're done
-                return (False, {})
+                return (False, {}, requests.codes.internal_server_error)
 
         # Default return status code
         status_code = requests.codes.internal_server_error
 
-        if path == '/upload':
-            # FUTURE if self.version == MatrixVersion.V3:
-            # FUTURE     url += MATRIX_V3_MEDIA_PATH + path
+        if path == "/upload":
+            if self.version == MatrixVersion.V3:
+                url += MATRIX_V3_MEDIA_PATH + path
 
-            # FUTURE else:
-            # FUTURE     url += MATRIX_V2_MEDIA_PATH + path
-            url += MATRIX_V2_MEDIA_PATH + path
+            else:
+                url += MATRIX_V2_MEDIA_PATH + path
 
-            params.update({'filename': attachment.name})
-            with open(attachment.path, 'rb') as fp:
+            params.update({"filename": attachment.name})
+            with open(attachment.path, "rb") as fp:
                 payload = fp.read()
 
             # Update our content type
-            headers['Content-Type'] = attachment.mimetype
+            headers["Content-Type"] = attachment.mimetype
 
         elif not url_override:
             if self.version == MatrixVersion.V3:
@@ -1276,8 +1403,14 @@ def _fetch(self, path, payload=None, params={}, attachment=None,
         response = {}
 
         # fetch function
-        fn = requests.post if method == 'POST' else (
-            requests.put if method == 'PUT' else requests.get)
+        fn = (
+            requests.post
+            if method == "POST"
+            else (requests.put if method == "PUT" else requests.get)
+        )
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
 
         # Define how many attempts we'll make if we get caught in a throttle
         # event
@@ -1287,12 +1420,18 @@ def _fetch(self, path, payload=None, params={}, attachment=None,
             # Decrement our throttle retry count
             retries -= 1
 
-            self.logger.debug('Matrix %s URL: %s (cert_verify=%r)' % (
-                'POST' if method == 'POST' else (
-                    requests.put if method == 'PUT' else 'GET'),
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('Matrix Payload: %s' % str(payload))
+            self.logger.debug(
+                "Matrix {} URL: {} (cert_verify={!r})".format(
+                    (
+                        "POST"
+                        if method == "POST"
+                        else ("PUT" if method == "PUT" else "GET")
+                    ),
+                    url,
+                    self.verify_certificate,
+                )
+            )
+            self.logger.debug(f"Matrix Payload: {payload!s}")
 
             # Initialize our response object
             r = None
@@ -1301,7 +1440,7 @@ def _fetch(self, path, payload=None, params={}, attachment=None,
                 r = fn(
                     url,
                     data=dumps(payload) if not attachment else payload,
-                    params=None if not params else params,
+                    params=params if params else None,
                     headers=headers,
                     verify=self.verify_certificate,
                     timeout=self.request_timeout,
@@ -1311,88 +1450,90 @@ def _fetch(self, path, payload=None, params={}, attachment=None,
                 status_code = r.status_code
 
                 self.logger.debug(
-                    'Matrix Response: code=%d, %s' % (
-                        r.status_code, str(r.content)))
+                    f"Matrix Response: code={r.status_code}, {r.content!s}"
+                )
                 response = loads(r.content)
 
                 if r.status_code == requests.codes.too_many_requests:
-                    wait = self.default_wait_ms / 1000
+                    wait_ms = self.default_wait_ms
                     try:
-                        wait = response['retry_after_ms'] / 1000
+                        wait_ms = response["retry_after_ms"]
 
                     except KeyError:
                         try:
-                            errordata = response['error']
-                            wait = errordata['retry_after_ms'] / 1000
+                            errordata = response["error"]
+                            wait_ms = errordata["retry_after_ms"]
                         except KeyError:
                             pass
 
                     self.logger.warning(
-                        'Matrix server requested we throttle back {}ms; '
-                        'retries left {}.'.format(wait, retries))
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Matrix server requested we throttle back "
+                        f"{wait_ms}ms; retries left {retries}."
+                    )
+                    self.logger.debug(f"Response Details:\r\n{r.content}")
 
                     # Throttle for specified wait
-                    self.throttle(wait=wait)
+                    self.throttle(wait=wait_ms / 1000)
 
                     # Try again
                     continue
 
                 elif r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyMatrix.http_response_code_lookup(
-                            r.status_code, MATRIX_HTTP_ERROR_MAP)
+                    status_str = NotifyMatrix.http_response_code_lookup(
+                        r.status_code, MATRIX_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to handshake with Matrix server: '
-                        '{}{}error={}.'.format(
+                        "Failed to handshake with Matrix server: "
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                    self.logger.debug(f"Response Details:\r\n{r.content}")
 
                     # Return; we're done
-                    return (
-                        False if not url_override else status_code, response)
+                    return (False, response, status_code)
 
             except (AttributeError, TypeError, ValueError):
                 # This gets thrown if we can't parse our JSON Response
                 #  - ValueError = r.content is Unparsable
                 #  - TypeError = r.content is None
                 #  - AttributeError = r is None
-                self.logger.warning('Invalid response from Matrix server.')
+                self.logger.warning("Invalid response from Matrix server.")
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
-                return (False if not url_override else status_code, {})
+                    "Response Details:\r\n%r",
+                    b"" if not r else (r.content or b""))
+                return (False, {}, status_code)
 
             except (requests.TooManyRedirects, requests.RequestException) as e:
                 self.logger.warning(
-                    'A Connection error occurred while registering with Matrix'
-                    ' server.')
-                self.logger.debug('Socket Exception: %s', str(e))
+                    "A Connection error occurred while registering with Matrix"
+                    " server."
+                )
+                self.logger.debug("Socket Exception: %s", e)
                 # Return; we're done
-                return (False if not url_override else status_code, response)
+                return (False, response, status_code)
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 self.logger.warning(
-                    'An I/O error occurred while reading {}.'.format(
-                        attachment.name if attachment else 'unknown file'))
-                self.logger.debug('I/O Exception: %s', str(e))
-                return (False if not url_override else status_code, {})
+                    "An I/O error occurred while reading {}.".format(
+                        attachment.name if attachment else "unknown file"
+                    )
+                )
+                self.logger.debug("I/O Exception: %s", e)
+                return (False, {}, status_code)
 
-            return (True if not url_override else status_code, response)
+            return (True, response, status_code)
 
         # If we get here, we ran out of retries
-        return (False if not url_override else status_code, {})
+        return (False, {}, status_code)
 
     def __del__(self):
-        """
-        Ensure we relinquish our token
-        """
+        """Ensure we relinquish our token."""
         if self.mode == MatrixWebhookMode.T2BOT:
             # nothing to do
             return
@@ -1402,195 +1543,175 @@ def __del__(self):
             # re-use our credentials with
             return
 
-        if self.access_token is not None \
-           and self.access_token == self.password and not self.user:
+        if (
+            self.access_token is not None
+            and self.access_token == self.password
+            and not self.user
+        ):
             return
 
-        try:
-            self._logout()
-
-        except LookupError:  # pragma: no cover
-            # Python v3.5 call to requests can sometimes throw the exception
-            #   "/usr/lib64/python3.7/socket.py", line 748, in getaddrinfo
-            #   LookupError: unknown encoding: idna
-            #
-            # This occurs every time when running unit-tests against Apprise:
-            # LANG=C.UTF-8 PYTHONPATH=$(pwd) py.test-3.7
-            #
-            # There has been an open issue on this since Jan 2017.
-            #   - https://bugs.python.org/issue29288
-            #
-            # A ~similar~ issue can be identified here in the requests
-            # ticket system as unresolved and has provided workarounds
-            #   - https://github.com/kennethreitz/requests/issues/3578
-            pass
-
-        except ImportError:  # pragma: no cover
-            # The actual exception is `ModuleNotFoundError` however ImportError
-            # grants us backwards compatibility with versions of Python older
-            # than v3.6
-
-            # Python code that makes early calls to sys.exit() can cause
-            # the __del__() code to run. However, in some newer versions of
-            # Python, this causes the `sys` library to no longer be
-            # available. The stack overflow also goes on to suggest that
-            # it's not wise to use the __del__() as a destructor
-            # which is the case here.
-
-            # https://stackoverflow.com/questions/67218341/\
-            #       modulenotfounderror-import-of-time-halted-none-in-sys-\
-            #           modules-occured-when-obj?noredirect=1&lq=1
-            #
-            #
-            # Also see: https://stackoverflow.com/questions\
-            #       /1481488/what-is-the-del-method-and-how-do-i-call-it
-
-            # At this time it seems clean to try to log out (if we can)
-            # but not throw any unnecessary exceptions (like this one) to
-            # the end user if we don't have to.
-            pass
+        self._logout()
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.host if self.mode != MatrixWebhookMode.T2BOT
-            else self.access_token,
+            (
+                self.host
+                if self.mode != MatrixWebhookMode.T2BOT
+                else self.access_token
+            ),
             self.port if self.port else (443 if self.secure else 80),
             self.user if self.mode != MatrixWebhookMode.T2BOT else None,
             self.password if self.mode != MatrixWebhookMode.T2BOT else None,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'mode': self.mode,
-            'version': self.version,
-            'msgtype': self.msgtype,
-            'discovery': 'yes' if self.discovery else 'no',
+            "image": "yes" if self.include_image else "no",
+            "mode": self.mode,
+            "version": self.version,
+            "msgtype": self.msgtype,
+            "discovery": "yes" if self.discovery else "no",
+            "hsreq": "yes" if self.hsreq else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        auth = ''
+        auth = ""
         if self.mode != MatrixWebhookMode.T2BOT:
             # Determine Authentication
             if self.user and self.password:
-                auth = '{user}:{password}@'.format(
-                    user=NotifyMatrix.quote(self.user, safe=''),
+                auth = "{user}:{password}@".format(
+                    user=NotifyMatrix.quote(self.user, safe=""),
                     password=self.pprint(
-                        self.password, privacy, mode=PrivacyMode.Secret,
-                        safe=''),
+                        self.password,
+                        privacy,
+                        mode=PrivacyMode.Secret,
+                        safe="",
+                    ),
                 )
 
             elif self.user or self.password:
-                auth = '{value}@'.format(
+                auth = "{value}@".format(
                     value=NotifyMatrix.quote(
-                        self.user if self.user else self.password, safe=''),
+                        self.user if self.user else self.password, safe=""
+                    ),
                 )
 
-        default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}/{rooms}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{rooms}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
-            hostname=NotifyMatrix.quote(self.host, safe='')
-            if self.mode != MatrixWebhookMode.T2BOT
-            else self.pprint(self.access_token, privacy, safe=''),
-            port='' if self.port is None
-            or self.port == default_port else ':{}'.format(self.port),
-            rooms=NotifyMatrix.quote('/'.join(self.rooms)),
+            hostname=(
+                NotifyMatrix.quote(self.host, safe="")
+                if self.mode != MatrixWebhookMode.T2BOT
+                else self.pprint(self.access_token, privacy, safe="")
+            ),
+            port=("" if not self.port else f":{self.port}"),
+            rooms=NotifyMatrix.quote("/".join(self.rooms)),
             params=NotifyMatrix.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.rooms)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if not results.get('host'):
+        if not results.get("host"):
             return None
 
         # Get our rooms
-        results['targets'] = NotifyMatrix.split_path(results['fullpath'])
+        results["targets"] = NotifyMatrix.split_path(results["fullpath"])
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += NotifyMatrix.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyMatrix.parse_list(results["qsd"]["to"])
 
         # Boolean to include an image or not
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyMatrix.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyMatrix.template_args["image"]["default"]
+            )
+        )
 
         # Boolean to perform a server discovery
-        results['discovery'] = parse_bool(results['qsd'].get(
-            'discovery', NotifyMatrix.template_args['discovery']['default']))
+        results["discovery"] = parse_bool(
+            results["qsd"].get(
+                "discovery", NotifyMatrix.template_args["discovery"]["default"]
+            )
+        )
+
+        # Boolean to enforce ':homeserver' on room IDs when missing
+        results["hsreq"] = parse_bool(
+            results["qsd"].get(
+                "hsreq", NotifyMatrix.template_args["hsreq"]["default"]
+            )
+        )
 
         # Get our mode
-        results['mode'] = results['qsd'].get('mode')
+        results["mode"] = results["qsd"].get("mode")
 
         # t2bot detection... look for just a hostname, and/or just a user/host
         # if we match this; we can go ahead and set the mode (but only if
         # it was otherwise not set)
-        if results['mode'] is None \
-                and not results['password'] \
-                and not results['targets']:
+        if (
+            results["mode"] is None
+            and not results["password"]
+            and not results["targets"]
+        ):
 
             # Default mode to t2bot
-            results['mode'] = MatrixWebhookMode.T2BOT
+            results["mode"] = MatrixWebhookMode.T2BOT
 
-        if results['mode'] and \
-                results['mode'].lower() == MatrixWebhookMode.T2BOT:
+        if (
+            results["mode"]
+            and results["mode"].lower() == MatrixWebhookMode.T2BOT
+        ):
             # unquote our hostname and pass it in as the password/token
-            results['password'] = NotifyMatrix.unquote(results['host'])
+            results["password"] = NotifyMatrix.unquote(results["host"])
 
         # Support the message type keyword
-        if 'msgtype' in results['qsd'] and len(results['qsd']['msgtype']):
-            results['msgtype'] = \
-                NotifyMatrix.unquote(results['qsd']['msgtype'])
+        if "msgtype" in results["qsd"] and len(results["qsd"]["msgtype"]):
+            results["msgtype"] = NotifyMatrix.unquote(
+                results["qsd"]["msgtype"]
+            )
 
         # Support the use of the token= keyword
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['password'] = NotifyMatrix.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["password"] = NotifyMatrix.unquote(results["qsd"]["token"])
 
-        elif not results['password'] and results['user']:
+        elif not results["password"] and results["user"]:
             # swap
-            results['password'] = results['user']
-            results['user'] = None
+            results["password"] = results["user"]
+            results["user"] = None
 
         # Support the use of the version= or v= keyword
-        if 'version' in results['qsd'] and len(results['qsd']['version']):
-            results['version'] = \
-                NotifyMatrix.unquote(results['qsd']['version'])
+        if "version" in results["qsd"] and len(results["qsd"]["version"]):
+            results["version"] = NotifyMatrix.unquote(
+                results["qsd"]["version"]
+            )
 
-        elif 'v' in results['qsd'] and len(results['qsd']['v']):
-            results['version'] = NotifyMatrix.unquote(results['qsd']['v'])
+        elif "v" in results["qsd"] and len(results["qsd"]["v"]):
+            results["version"] = NotifyMatrix.unquote(results["qsd"]["v"])
 
         return results
 
@@ -1601,19 +1722,27 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://webhooks\.t2bot\.io/api/v[0-9]+/matrix/hook/'
-            r'(?P<webhook_token>[A-Z0-9_-]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://webhooks\.t2bot\.io/api/v[0-9]+/matrix/hook/"
+            r"(?P<webhook_token>[A-Z0-9_-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
-            mode = 'mode={}'.format(MatrixWebhookMode.T2BOT)
+            mode = f"mode={MatrixWebhookMode.T2BOT}"
 
             return NotifyMatrix.parse_url(
-                '{schema}://{webhook_token}/{params}'.format(
+                "{schema}://{webhook_token}/{params}".format(
                     schema=NotifyMatrix.secure_protocol,
-                    webhook_token=result.group('webhook_token'),
-                    params='?{}'.format(mode) if not result.group('params')
-                    else '{}&{}'.format(result.group('params'), mode)))
+                    webhook_token=result.group("webhook_token"),
+                    params=(
+                        f"?{mode}"
+                        if not result.group("params")
+                        else "{}&{}".format(result.group("params"), mode)
+                    ),
+                )
+            )
 
         return None
 
@@ -1625,7 +1754,7 @@ def server_discovery(self):
 
         if not (self.discovery and self.secure):
             # Nothing further to do with insecure server setups
-            return ''
+            return ""
 
         # Get our content from cache
         base_url, identity_url = (
@@ -1637,11 +1766,17 @@ def server_discovery(self):
             # We can use our cached value and return early
             return base_url
 
-        # 1. Extract the server name from the userโ€™s Matrix ID by splitting
         # the Matrix ID at the first colon.
-        verify_url = f'https://{self.host}/.well-known/matrix/client'
-        code, wk_response = self._fetch(
-            None, method='GET', url_override=verify_url)
+        verify_url = \
+            "{schema}://{hostname}{port}/.well-known/matrix/client".format(
+                schema="https" if self.secure else "http",
+                hostname=self.host,
+                port=("" if not self.port else f":{self.port}"),
+            )
+
+        _, response, status_code = self._fetch(
+            None, method="GET", url_override=verify_url
+        )
 
         # Output may look as follows:
         # {
@@ -1653,137 +1788,164 @@ def server_discovery(self):
         #     }
         # }
 
-        if code == requests.codes.not_found:
+        if status_code == requests.codes.not_found:
             # This is an acceptable response; we're done
             self.logger.debug(
-                'Matrix Well-Known Base URI not found at %s', verify_url)
+                "Matrix Well-Known Base URI not found at %s", verify_url
+            )
 
             # Set our keys out for fast recall later on
             self.store.set(
-                self.discovery_base_key, '',
-                expires=self.discovery_cache_length_sec)
+                self.discovery_base_key,
+                "",
+                expires=self.discovery_cache_length_sec,
+            )
             self.store.set(
-                self.discovery_identity_key, '',
-                expires=self.discovery_cache_length_sec)
-            return ''
+                self.discovery_identity_key,
+                "",
+                expires=self.discovery_cache_length_sec,
+            )
+            return ""
 
-        elif code != requests.codes.ok:
+        elif status_code != requests.codes.ok:
             # We're done early as we couldn't load the results
-            msg = 'Matrix Well-Known Base URI Discovery Failed'
+            msg = "Matrix Well-Known Base URI Discovery Failed"
             self.logger.warning(
-                '%s - %s returned error code: %d', msg, verify_url, code)
-            raise MatrixDiscoveryException(msg, error_code=code)
+                    "%s - %s returned error code: %d",
+                    msg, verify_url, status_code,
+            )
+            raise MatrixDiscoveryException(msg, error_code=status_code)
 
-        if not wk_response:
+        if not response:
             # This is an acceptable response; we simply do nothing
             self.logger.debug(
-                'Matrix Well-Known Base URI not defined %s', verify_url)
+                "Matrix Well-Known Base URI not defined %s", verify_url
+            )
 
             # Set our keys out for fast recall later on
             self.store.set(
-                self.discovery_base_key, '',
-                expires=self.discovery_cache_length_sec)
+                self.discovery_base_key,
+                "",
+                expires=self.discovery_cache_length_sec,
+            )
             self.store.set(
-                self.discovery_identity_key, '',
-                expires=self.discovery_cache_length_sec)
-            return ''
+                self.discovery_identity_key,
+                "",
+                expires=self.discovery_cache_length_sec,
+            )
+            return ""
 
         #
         # Parse our m.homeserver information
         #
         try:
-            base_url = wk_response['m.homeserver']['base_url'].rstrip('/')
+            base_url = response["m.homeserver"]["base_url"].rstrip("/")
             results = NotifyBase.parse_url(base_url, verify_host=True)
 
         except (AttributeError, TypeError, KeyError):
             # AttributeError: result wasn't a string (rstrip failed)
-            # TypeError     : wk_response wasn't a dictionary
-            # KeyError      : wk_response not to standards
+            # TypeError     : response wasn't a dictionary
+            # KeyError      : response not to standards
             results = None
 
         if not results:
-            msg = 'Matrix Well-Known Base URI Discovery Failed'
+            msg = "Matrix Well-Known Base URI Discovery Failed"
             self.logger.warning(
-                '%s - m.homeserver payload is missing or invalid: %s',
-                msg, str(wk_response))
+                "%s - m.homeserver payload is missing or invalid: %s",
+                msg,
+                response,
+            )
             raise MatrixDiscoveryException(msg)
 
         #
         # Our .well-known extraction was successful; now we need to verify
         # that the version information resolves.
         #
-        verify_url = f'{base_url}/_matrix/client/versions'
+        verify_url = f"{base_url}/_matrix/client/versions"
         # Post our content
-        code, response = self._fetch(
-            None, method='GET', url_override=verify_url)
-        if code != requests.codes.ok:
+        _, _, status_code = self._fetch(
+            None, method="GET", url_override=verify_url
+        )
+        if status_code != requests.codes.ok:
             # We're done early as we couldn't load the results
-            msg = 'Matrix Well-Known Base URI Discovery Verification Failed'
+            msg = "Matrix Well-Known Base URI Discovery Verification Failed"
             self.logger.warning(
-                '%s - %s returned error code: %d', msg, verify_url, code)
-            raise MatrixDiscoveryException(msg, error_code=code)
+                    "%s - %s returned error code: %d",
+                    msg, verify_url, status_code,
+            )
+            raise MatrixDiscoveryException(msg, error_code=status_code)
 
         #
         # Phase 2: Handle m.identity_server IF defined
         #
-        if 'm.identity_server' in wk_response:
+        if "m.identity_server" in response:
             try:
-                identity_url = \
-                    wk_response['m.identity_server']['base_url'].rstrip('/')
+                identity_url = response["m.identity_server"][
+                    "base_url"
+                ].rstrip("/")
                 results = NotifyBase.parse_url(identity_url, verify_host=True)
 
             except (AttributeError, TypeError, KeyError):
                 # AttributeError: result wasn't a string (rstrip failed)
-                # TypeError     : wk_response wasn't a dictionary
-                # KeyError      : wk_response not to standards
+                # TypeError     : response wasn't a dictionary
+                # KeyError      : response not to standards
                 results = None
 
             if not results:
-                msg = 'Matrix Well-Known Identity URI Discovery Failed'
+                msg = "Matrix Well-Known Identity URI Discovery Failed"
                 self.logger.warning(
-                    '%s - m.identity_server payload is missing or invalid: %s',
-                    msg, str(wk_response))
+                    "%s - m.identity_server payload is missing or invalid: %s",
+                    msg,
+                    response,
+                )
                 raise MatrixDiscoveryException(msg)
 
             #
             #  Verify identity server found
             #
-            verify_url = f'{identity_url}/_matrix/identity/v2'
+            verify_url = f"{identity_url}/_matrix/identity/v2"
 
             # Post our content
-            code, response = self._fetch(
-                None, method='GET', url_override=verify_url)
-            if code != requests.codes.ok:
+            _postokay, _, status_code = self._fetch(
+                None, method="GET", url_override=verify_url
+            )
+            if status_code != requests.codes.ok:
                 # We're done early as we couldn't load the results
-                msg = 'Matrix Well-Known Identity URI Discovery Failed'
+                msg = "Matrix Well-Known Identity URI Discovery Failed"
                 self.logger.warning(
-                    '%s - %s returned error code: %d', msg, verify_url, code)
-                raise MatrixDiscoveryException(msg, error_code=code)
+                    "%s - %s returned error code: %d",
+                    msg, verify_url, status_code,
+                )
+                raise MatrixDiscoveryException(msg, error_code=status_code)
 
             # Update our cache
             self.store.set(
-                self.discovery_identity_key, identity_url,
+                self.discovery_identity_key,
+                identity_url,
                 # Add 2 seconds to prevent this key from expiring before base
-                expires=self.discovery_cache_length_sec + 2)
+                expires=self.discovery_cache_length_sec + 2,
+            )
         else:
             # No identity server
             self.store.set(
-                self.discovery_identity_key, '',
+                self.discovery_identity_key,
+                "",
                 # Add 2 seconds to prevent this key from expiring before base
-                expires=self.discovery_cache_length_sec + 2)
+                expires=self.discovery_cache_length_sec + 2,
+            )
 
         # Update our cache
         self.store.set(
-            self.discovery_base_key, base_url,
-            expires=self.discovery_cache_length_sec)
+            self.discovery_base_key,
+            base_url,
+            expires=self.discovery_cache_length_sec,
+        )
 
         return base_url
 
     @property
     def base_url(self):
-        """
-        Returns the base_url if known
-        """
+        """Returns the base_url if known."""
         try:
             base_url = self.server_discovery()
             if base_url:
@@ -1792,24 +1954,21 @@ def base_url(self):
 
         except MatrixDiscoveryException:
             self.store.clear(
-                self.discovery_base_key, self.discovery_identity_key)
+                self.discovery_base_key, self.discovery_identity_key
+            )
             raise
 
         # If we get hear, we need to build our URL dynamically based on what
         # was provided to us during the plugins initialization
-        default_port = 443 if self.secure else 80
-
-        return '{schema}://{hostname}{port}'.format(
-            schema='https' if self.secure else 'http',
+        return "{schema}://{hostname}{port}".format(
+            schema="https" if self.secure else "http",
             hostname=self.host,
-            port='' if self.port is None
-            or self.port == default_port else f':{self.port}')
+            port=("" if not self.port else f":{self.port}"),
+        )
 
     @property
     def identity_url(self):
-        """
-        Returns the identity_url if known
-        """
+        """Returns the identity_url if known."""
         base_url = self.base_url
         identity_url = self.store.get(self.discovery_identity_key)
-        return base_url if not identity_url else identity_url
+        return identity_url if identity_url else base_url
diff --git a/libs/apprise/plugins/mattermost.py b/libs/apprise/plugins/mattermost.py
index bf2bd171d0..4cee958c1a 100644
--- a/libs/apprise/plugins/mattermost.py
+++ b/libs/apprise/plugins/mattermost.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,6 +24,27 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+"""
+Mattermost Notifications.
+
+This plugin supports 2 modes of operation:
+
+1. Webhook mode (default):
+   - Uses Mattermost Incoming Webhooks: /hooks/<webhook_token>
+   - Targets are channel names (for example: '#support' or 'support')
+   - If no targets are specified, Mattermost uses the webhook default
+
+2. Bot mode (mode=bot):
+   - Uses Mattermost REST API: /api/v4/posts
+   - Requires a Bot (or User) Access Token (Bearer token)
+   - Targets are channel_id values by default
+   - Channel name resolution is supported when a team is known
+
+"""
+
+from __future__ import annotations
+
+from itertools import chain
 
 # Create an incoming webhook; the website will provide you with something like:
 #  http://localhost:8065/hooks/yobjmukpaw3r3urc5h6i369yima
@@ -35,41 +55,59 @@
 # mmost://localhost:8065/yobjmukpaw3r3urc5h6i369yima
 #  - swap http with mmost
 #  - drop /hooks/ reference
-
+from json import dumps, loads
 import re
+from typing import Any
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_bool, parse_list, validate_regex
+from ..common import NotifyImageSize, NotifyType, PersistentStoreMode
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Some Reference Locations:
 # - https://docs.mattermost.com/developer/webhooks-incoming.html
 # - https://docs.mattermost.com/administration/config-settings.html
 
+IS_CHANNEL = re.compile(r"^(#|%23)(?P<name>[A-Za-z0-9_-]+)$")
+IS_CHANNEL_ID = re.compile(r"^(\+|%2B)?(?P<name>[A-Za-z0-9_-]+)$")
+
+
+class MattermostMode:
+    """Supported Mattermost integration modes."""
+
+    # Incoming webhook mode
+    WEBHOOK = "webhook"
+
+    # Bot API mode
+    BOT = "bot"
+
+
+# Define our Mattermost Modes
+MATTERMOST_MODES = (
+    MattermostMode.WEBHOOK,
+    MattermostMode.BOT,
+)
+
 
 class NotifyMattermost(NotifyBase):
-    """
-    A wrapper for Mattermost Notifications
-    """
+    """A wrapper for Mattermost Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Mattermost'
+    service_name = "Mattermost"
 
     # The services URL
-    service_url = 'https://mattermost.com/'
+    service_url = "https://mattermost.com/"
 
     # The default protocol
-    protocol = 'mmost'
+    protocol = "mmost"
 
     # The default secure protocol
-    secure_protocol = 'mmosts'
+    secure_protocol = "mmosts"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_mattermost'
+    setup_url = "https://appriseit.com/services/mattermost/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -80,151 +118,390 @@ class NotifyMattermost(NotifyBase):
     # Mattermost does not have a title
     title_maxlen = 0
 
-    # Define object templates
+    # Allow persistent caching of bot channel lookups
+    storage_mode = PersistentStoreMode.AUTO
+
+    # Keep our cache for 20 days
+    default_cache_expiry_sec = 60 * 60 * 24 * 20
+
+    # Lower rate req since service is self hosted in most
+    # circumstances
+    request_rate_per_sec = 0.02
+
     templates = (
-        '{schema}://{host}/{token}',
-        '{schema}://{host}:{port}/{token}',
-        '{schema}://{host}/{fullpath}/{token}',
-        '{schema}://{host}:{port}/{fullpath}/{token}',
-        '{schema}://{botname}@{host}/{token}',
-        '{schema}://{botname}@{host}:{port}/{token}',
-        '{schema}://{botname}@{host}/{fullpath}/{token}',
-        '{schema}://{botname}@{host}:{port}/{fullpath}/{token}',
+        "{schema}://{host}/{token}",
+        "{schema}://{host}:{port}/{token}",
+        "{schema}://{host}/{fullpath}/{token}",
+        "{schema}://{host}:{port}/{fullpath}/{token}",
+        "{schema}://{user}@{host}/{token}",
+        "{schema}://{user}@{host}:{port}/{token}",
+        "{schema}://{user}@{host}/{fullpath}/{token}",
+        "{schema}://{user}@{host}:{port}/{fullpath}/{token}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'token': {
-            'name': _('Webhook Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'fullpath': {
-            'name': _('Path'),
-            'type': 'string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User"),
+                "type": "string",
+            },
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "token": {
+                # Webhook Token (webhook mode) OR Access Token (bot mode)
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "fullpath": {
+                "name": _("Path"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "target_channel_id": {
+                "name": _("Target Channel ID"),
+                "type": "string",
+                "prefix": "",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'botname': {
-            'name': _('Bot Name'),
-            'type': 'string',
-            'map_to': 'user',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'channels': {
-            'name': _('Channels'),
-            'type': 'list:string',
-        },
-        'channel': {
-            'alias_of': 'channels',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "channel": {
+                # Backwards compatible
+                "alias_of": "targets",
+            },
+            "channels": {
+                # Backwards compatible
+                "alias_of": "targets",
+            },
+            "icon_url": {
+                "name": _("Icon URL"),
+                "type": "string",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "team": {
+                "alias_of": "user",
+            },
+            "botname": {
+                "alias_of": "user",
+            },
+            "mode": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": MATTERMOST_MODES,
+                "default": MATTERMOST_MODES[0],
+            },
         },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'to': {
-            'alias_of': 'channels',
-        },
-    })
+    )
 
-    def __init__(self, token, fullpath=None, channels=None,
-                 include_image=False, **kwargs):
-        """
-        Initialize Mattermost Object
-        """
+    def __init__(
+        self,
+        token: str,
+        fullpath: str | None = None,
+        targets: list[str] | str | None = None,
+        include_image: bool = False,
+        icon_url: str | None = None,
+        mode: str | None = None,
+        **kwargs: Any,
+    ) -> None:
+        """Initialize Mattermost object."""
         super().__init__(**kwargs)
 
-        if self.secure:
-            self.schema = 'https'
+        self.schema = "https" if self.secure else "http"
+        self.fullpath = (
+            "" if not isinstance(fullpath, str) else fullpath.strip()
+        )
 
+        # Mode
+        if isinstance(mode, str) and mode.strip():
+            mode_ = mode.strip().lower()
+            self.mode = next(
+                (m for m in MATTERMOST_MODES if m.startswith(mode_)), None
+            )
+            if self.mode not in MATTERMOST_MODES:
+                msg = f"The Mattermost mode specified ({mode}) is invalid."
+                self.logger.warning(msg)
+                raise TypeError(msg)
         else:
-            self.schema = 'http'
+            self.mode = self.template_args["mode"]["default"]
 
-        # our full path
-        self.fullpath = '' if not isinstance(
-            fullpath, str) else fullpath.strip()
-
-        # Authorization Token (associated with project)
+        # Token (webhook token in webhook mode, bearer token in bot mode)
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Mattermost Authorization Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Mattermost Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        # Optional Channels (strip off any channel prefix entries if present)
-        self.channels = [x.lstrip('#') for x in parse_list(channels)]
+        # Used for URL generation afterwards only
+        self._invalid_targets = []
+
+        # Channels:
+        self.targets = []
+        for target in parse_list(targets):
+            result = IS_CHANNEL.match(target)
+            if result:
+                if self.mode == MattermostMode.BOT and not self.user:
+                    # No team was defined and we're in BOT mode
+                    self.logger.warning(
+                        "Mattermost bot mode requires a team to resolve "
+                        "%s, dropping it.",
+                        target,
+                    )
+                    self._invalid_targets.append(target)
+                    continue
+
+                # store valid channel
+                self.targets.append(("#", result.group("name")))
+                continue
+
+            result = IS_CHANNEL_ID.match(target)
+            if result:
+                if self.mode == MattermostMode.WEBHOOK:
+                    # store valid channel
+                    self.targets.append(("#", result.group("name")))
+
+                else:  # MattermostMode.BOT
+                    # store valid channel_id
+                    self.targets.append(("+", result.group("name")))
+                continue
+
+            self.logger.warning(
+                "Dropping invalid Mattermost target %s",
+                target,
+            )
+            self._invalid_targets.append(target)
 
-        # Place a thumbnail image inline with the message body
+        # Webhook mode features (ignored in bot mode)
         self.include_image = include_image
 
-        return
+        # Support a user-provided icon URL
+        self.icon_url = icon_url
+
+    def __len__(self) -> int:
+        """Returns the number of outbound HTTP requests expected."""
+        return max(1, len(self.targets))
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
+    def _channel_lookup(self, channel: str) -> str | None:
         """
-        Perform Mattermost Notification
+        Resolve a channel name to a channel_id.
+
+        Resolution occurs only during send(); results are persistently cached.
         """
+        # Attempt to pull from Persistent Storage if available
+        key = f"c:{channel}"
+        cached = self.store.get(key)
+        if cached:
+            return cached
+
+        port = "" if self.port is None else f":{self.port}"
+        team = NotifyMattermost.quote(self.user, safe="")
+        name = NotifyMattermost.quote(channel, safe="")
+
+        headers: dict[str, str] = {
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
+            "Authorization": f"Bearer {self.token}",
+        }
 
-        # Create a copy of our channels, otherwise place a dummy entry
-        channels = list(self.channels) if self.channels else [None, ]
+        url = "{}://{}{}{}/api/v4/teams/name/{}/channels/name/{}".format(
+            self.schema,
+            self.host,
+            port,
+            self.fullpath.rstrip("/"),
+            team,
+            name,
+        )
 
-        headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json'
-        }
+        self.logger.debug(
+            "Mattermost channel lookup URL: %s (cert_verify=%r)",
+            url,
+            self.verify_certificate,
+        )
 
-        # prepare JSON Object
-        payload = {
-            'text': body,
-            'icon_url': None,
-        }
+        self.throttle()
 
-        # Acquire our image url if configured to do so
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
+        try:
+            r = requests.get(
+                url,
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
 
-        if image_url:
-            # Set our image configuration if told to do so
-            payload['icon_url'] = image_url
+            if r.status_code != requests.codes.ok:
+                status = self.http_response_code_lookup(r.status_code)
+                self.logger.warning(
+                    "Mattermost channel lookup failed for %s: %s, error=%d.",
+                    channel,
+                    status,
+                    r.status_code,
+                )
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000]
+                )
+                return None
 
-        # Set our user
-        payload['username'] = self.user if self.user else self.app_id
+            try:
+                data = loads(r.content.decode("utf-8"))
+
+            except (AttributeError, TypeError, ValueError):
+                # ValueError = r.content is Unparsable
+                # TypeError = r.content is None
+                # AttributeError = r is None
+                self.logger.debug(
+                    "Mattermost channel lookup response was not JSON:\r\n%r",
+                    (r.content or b"")[:2000],
+                )
+                return None
+
+            channel_id = data.get("id")
+            if not isinstance(channel_id, str) or not channel_id.strip():
+                return None
+
+            self.store.set(
+                key,
+                channel_id,
+                expires=self.default_cache_expiry_sec,
+            )
+            return channel_id
 
-        # For error tracking
+        except requests.RequestException as e:
+            self.logger.warning(
+                "A Connection error occurred performing Mattermost channel "
+                "lookup for %s.",
+                channel,
+            )
+            self.logger.debug("Socket Exception: %s", e)
+            return None
+
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        **kwargs: Any,
+    ) -> bool:
+        """Perform Mattermost Notification."""
+
+        if self.mode == MattermostMode.BOT and not self.targets:
+            self.logger.warning(
+                "Mattermost BOT mode has no valid channels to notify, "
+                "aborting."
+            )
+            return False
+
+        # Initialize our error tracking
         has_error = False
 
-        while len(channels):
-            # Pop a channel off of the list
-            channel = channels.pop(0)
+        # Prepare our port reference in advance
+        port = "" if self.port is None else f":{self.port}"
 
-            if channel:
-                payload['channel'] = channel
+        headers: dict[str, str] = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+        }
 
-            url = '{}://{}:{}{}/hooks/{}'.format(
-                self.schema, self.host, self.port,
-                self.fullpath.rstrip('/'), self.token)
+        if self.mode == MattermostMode.BOT:
+            url = "{}://{}{}{}/api/v4/posts".format(
+                self.schema, self.host, port, self.fullpath.rstrip("/")
+            )
 
-            self.logger.debug('Mattermost POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('Mattermost Payload: %s' % str(payload))
+            # Append headers
+            headers["Authorization"] = f"Bearer {self.token}"
+            expected = (requests.codes.created, requests.codes.ok)
+
+        else:  # self.mode == MattermostMode.WEBHOOK
+            url = "{}://{}{}{}/hooks/{}".format(
+                self.schema,
+                self.host,
+                port,
+                self.fullpath.rstrip("/"),
+                self.token,
+            )
+            expected = (requests.codes.ok,)
+
+        # Iterate over our targets
+        targets = self.targets.copy()
+        if self.mode == MattermostMode.WEBHOOK and not targets:
+            targets = [(None, None)]
+
+        for kind, value in targets:
+            target = value
+            if kind == "#" and self.mode == MattermostMode.BOT:
+                target = self._channel_lookup(value)
+                if not target:
+                    has_error = True
+                    continue
+
+            if self.mode == MattermostMode.BOT:
+                payload: dict[str, Any] = {
+                    "channel_id": target,
+                    "message": body,
+                }
+
+            else:
+                payload: dict[str, Any] = {
+                    "text": body,
+                }
+
+                image_url = self.icon_url
+                if not image_url and self.include_image:
+                    image_url = self.image_url(notify_type)
+
+                if image_url:
+                    payload["icon_url"] = image_url
+
+                payload["username"] = (
+                    self.user if self.user else self.app_id
+                )
+
+                if target:
+                    payload["channel"] = target
+
+            self.logger.debug(
+                "Mattermost %s POST URL: %s (cert_verify=%r)",
+                self.mode,
+                url,
+                self.verify_certificate,
+            )
+            self.logger.debug(
+                "Mattermost %s Payload: %s", self.mode, payload
+            )
 
-            # Always call throttle before any remote server i/o is made
             self.throttle()
 
             try:
@@ -236,43 +513,37 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     timeout=self.request_timeout,
                 )
 
-                if r.status_code != requests.codes.ok:
-                    # We had a problem
-                    status_str = \
-                        NotifyMattermost.http_response_code_lookup(
-                            r.status_code)
-
+                if r.status_code not in expected:
+                    status = self.http_response_code_lookup(r.status_code)
                     self.logger.warning(
-                        'Failed to send Mattermost notification{}: '
-                        '{}{}error={}.'.format(
-                            '' if not channel
-                            else ' to channel {}'.format(channel),
-                            status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
-
+                        "Failed to send Mattermost notification to "
+                        "%s: %s, error=%d.",
+                        f"channel_id {target}"
+                        if self.mode == MattermostMode.BOT
+                        else f"channel {target}",
+                        status,
+                        r.status_code,
+                    )
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
-
-                    # Flag our error
+                        "Response Details:\r\n%r",
+                        (r.content or b"")[:2000],
+                    )
                     has_error = True
                     continue
 
-                else:
-                    self.logger.info(
-                        'Sent Mattermost notification{}.'.format(
-                            '' if not channel
-                            else ' to channel {}'.format(channel)))
+                self.logger.info(
+                    "Sent Mattermost %s notification to %s.",
+                    self.mode,
+                    target,
+                )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Mattermost '
-                    'notification{}.'.format(
-                        '' if not channel
-                        else ' to channel {}'.format(channel)))
-                self.logger.debug('Socket Exception: %s' % str(e))
-
-                # Flag our error
+                    "A Connection error occurred sending Mattermost "
+                    "%s notification to %s.",
+                    self.mode, target,
+                )
+                self.logger.debug("Socket Exception: %s", e)
                 has_error = True
                 continue
 
@@ -280,70 +551,93 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     @property
-    def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+    def url_identifier(self) -> tuple[Any, ...]:
+        """Returns all of the identifiers that make this URL unique from
+        another similar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.token, self.host, self.port, self.fullpath,
+            self.mode,
+            self.token,
+            self.host,
+            self.port,
+            self.fullpath,
+            self.user if self.mode == MattermostMode.BOT else None,
         )
 
-    def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Returns the URL built dynamically based on specified arguments."""
 
-        # Define any URL parameters
-        params = {
-            'image': 'yes' if self.include_image else 'no',
+        params: dict[str, Any] = {
+            "image": "yes" if self.include_image else "no",
         }
 
-        # Extend our parameters
+        if self.mode != self.template_args["mode"]["default"]:
+            params["mode"] = self.mode
+
+        if self.mode == MattermostMode.WEBHOOK and self.icon_url:
+            params["icon_url"] = self.icon_url
+
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        if self.channels:
+        if self.targets:
             # historically the value only accepted one channel and is
             # therefore identified as 'channel'. Channels have always been
             # optional, so that is why this setting is nested in an if block
-            params['channel'] = ','.join(
-                [NotifyMattermost.quote(x, safe='') for x in self.channels])
+            entries = []
+            for kind, value in self.targets:
+                if kind == "#":
+                    entries.append(f"#{value}")
+                else:
+                    entries.append(f"+{value}")
+
+            params["to"] = ",".join(chain(
+                [NotifyMattermost.quote(v, safe="#+") for v in entries],
+                [NotifyMattermost.quote(x, safe="")
+                 for x in self._invalid_targets],
+            ))
 
         default_port = 443 if self.secure else 80
         default_schema = self.secure_protocol if self.secure else self.protocol
 
-        # Determine if there is a botname present
-        botname = ''
+        # Determine if there is a source present
+        source = ""
         if self.user:
-            botname = '{botname}@'.format(
-                botname=NotifyMattermost.quote(self.user, safe=''),
+            source = "{source}@".format(
+                source=NotifyMattermost.quote(self.user, safe=""),
             )
 
-        return \
-            '{schema}://{botname}{hostname}{port}{fullpath}{token}' \
-            '/?{params}'.format(
+        return (
+            "{schema}://{source}{hostname}{port}{fullpath}{token}"
+            "/?{params}".format(
                 schema=default_schema,
-                botname=botname,
+                source=source,
                 # never encode hostname since we're expecting it to be a valid
                 # one
                 hostname=self.host,
-                port='' if self.port is None or self.port == default_port
-                else ':{}'.format(self.port),
-                fullpath='/' if not self.fullpath else '{}/'.format(
-                    NotifyMattermost.quote(self.fullpath, safe='/')),
-                token=self.pprint(self.token, privacy, safe=''),
+                port=(
+                    ""
+                    if self.port is None or self.port == default_port
+                    else f":{self.port}"
+                ),
+                fullpath=(
+                    "/"
+                    if not self.fullpath
+                    else "{}/".format(
+                        NotifyMattermost.quote(self.fullpath, safe="/")
+                    )
+                ),
+                token=self.pprint(self.token, privacy, safe=""),
                 params=NotifyMattermost.urlencode(params),
             )
+        )
 
     @staticmethod
-    def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+    def parse_url(url: str):
+        """Parses the URL and returns enough arguments that can allow us to
+        re-instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
@@ -351,41 +645,69 @@ def parse_url(url):
 
         # Acquire our tokens; the last one will always be our token
         # all entries before it will be our path
-        tokens = NotifyMattermost.split_path(results['fullpath'])
-
-        results['token'] = None if not tokens else tokens.pop()
+        tokens = NotifyMattermost.split_path(results["fullpath"])
 
-        # Store our path
-        results['fullpath'] = '' if not tokens \
-            else '/{}'.format('/'.join(tokens))
+        results["token"] = None if not tokens else tokens.pop()
+        results["fullpath"] = (
+            "" if not tokens else "/{}".format("/".join(tokens))
+        )
 
         # Define our optional list of channels to notify
-        results['channels'] = list()
+        results["targets"] = []
 
-        # Support both 'to' (for yaml configuration) and channel=
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
+        # Support both 'to' (for yaml configuration) and channel(s)=
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
             # Allow the user to specify the channel to post to
-            results['channels'].extend(
-                NotifyMattermost.parse_list(results['qsd']['to']))
+            results["targets"].extend(
+                NotifyMattermost.parse_list(results["qsd"]["to"])
+            )
 
-        if 'channel' in results['qsd'] and len(results['qsd']['channel']):
-            # Allow the user to specify the channel to post to
-            results['channels'].extend(
-                NotifyMattermost.parse_list(results['qsd']['channel']))
+        if "channel" in results["qsd"] and len(results["qsd"]["channel"]):
+            results["targets"].extend(
+                NotifyMattermost.parse_list(results["qsd"]["channel"])
+            )
 
-        if 'channels' in results['qsd'] and len(results['qsd']['channels']):
+        if "channels" in results["qsd"] and len(results["qsd"]["channels"]):
             # Allow the user to specify the channel to post to
-            results['channels'].extend(
-                NotifyMattermost.parse_list(results['qsd']['channels']))
+            results["targets"].extend(
+                NotifyMattermost.parse_list(results["qsd"]["channels"])
+            )
 
         # Image manipulation
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyMattermost.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyMattermost.template_args["image"]["default"]
+            )
+        )
+
+        # Our Mode
+        if "mode" in results["qsd"] and results["qsd"]["mode"]:
+            results["mode"] = NotifyMattermost.unquote(
+                results["qsd"]["mode"]
+            )
+
+        # Team support (bot mode lookup). This maps to `user`.
+        if "team" in results["qsd"] and results["qsd"]["team"]:
+            results["user"] = NotifyMattermost.unquote(
+                results["qsd"]["team"]
+            )
+            if "mode" not in results:
+                results["mode"] = MattermostMode.BOT
+
+        elif "botname" in results["qsd"] and results["qsd"]["botname"]:
+            results["user"] = NotifyMattermost.unquote(
+                results["qsd"]["botname"]
+            )
+
+        if "icon_url" in results["qsd"]:
+            results["icon_url"] = NotifyMattermost.unquote(
+                results["qsd"]["icon_url"]
+            )
 
         return results
 
     @staticmethod
-    def parse_native_url(url):
+    def parse_native_url(url: str) -> dict[str, Any] | None:
         """
         Support parsing the webhook straight from URL
             https://HOST:443/workflows/WORKFLOWID/triggers/manual/paths/invoke
@@ -394,31 +716,45 @@ def parse_native_url(url):
 
         # Match our workflows webhook URL and re-assemble
         result = re.match(
-            r'^http(?P<secure>s?)://(?P<host>mattermost\.[A-Z0-9_.-]+)'
-            r'(:(?P<port>[1-9][0-9]{0,5}))?'
-            r'/hooks/'
-            r'(?P<token>[A-Z0-9_-]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^http(?P<secure>s?)://(?P<host>mattermost\.[A-Z0-9_.-]+)"
+            r"(:(?P<port>[1-9][0-9]{0,5}))?"
+            r"/hooks/"
+            r"(?P<token>[A-Z0-9_-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
-            default_port = \
-                int(result.group('port')) if result.group('port') else (
-                    443 if result.group('secure') else 80)
+            default_port = (
+                int(result.group("port"))
+                if result.group("port")
+                else (443 if result.group("secure") else 80)
+            )
 
-            default_schema = \
-                NotifyMattermost.secure_protocol \
-                if result.group('secure') else NotifyMattermost.protocol
+            default_schema = (
+                NotifyMattermost.secure_protocol
+                if result.group("secure")
+                else NotifyMattermost.protocol
+            )
 
             # Construct our URL
             return NotifyMattermost.parse_url(
-                '{schema}://{host}{port}/{token}'
-                '/{params}'.format(
+                "{schema}://{host}{port}/{token}/{params}".format(
                     schema=default_schema,
-                    host=result.group('host'),
-                    port='' if not result.group('port')
-                    or int(result.group('port')) == default_port
-                    else f':{default_port}',
-                    token=result.group('token'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    host=result.group("host"),
+                    port=(
+                        ""
+                        if not result.group("port")
+                        or int(result.group("port")) == default_port
+                        else f":{default_port}"
+                    ),
+                    token=result.group("token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
         return None
diff --git a/libs/apprise/plugins/messagebird.py b/libs/apprise/plugins/messagebird.py
index 62be76aba0..671187ca51 100644
--- a/libs/apprise/plugins/messagebird.py
+++ b/libs/apprise/plugins/messagebird.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,31 +33,29 @@
 
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 
 class NotifyMessageBird(NotifyBase):
-    """
-    A wrapper for MessageBird Notifications
-    """
+    """A wrapper for MessageBird Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'MessageBird'
+    service_name = "MessageBird"
 
     # The services URL
-    service_url = 'https://messagebird.com'
+    service_url = "https://messagebird.com"
 
     # The default protocol
-    secure_protocol = 'msgbird'
+    secure_protocol = "msgbird"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_messagebird'
+    setup_url = "https://appriseit.com/services/messagebird/"
 
     # MessageBird uses the http protocol with JSON requests
-    notify_url = 'https://rest.messagebird.com/messages'
+    notify_url = "https://rest.messagebird.com/messages"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -69,76 +66,79 @@ class NotifyMessageBird(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}/{source}',
-        '{schema}://{apikey}/{source}/{targets}',
+        "{schema}://{apikey}/{source}",
+        "{schema}://{apikey}/{source}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9]{25}$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9]{25}$", "i"),
+            },
+            "source": {
+                "name": _("Source Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "required": True,
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'source': {
-            'name': _('Source Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'required': True,
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        }
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'source',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "source",
+            },
         },
-    })
+    )
 
     def __init__(self, apikey, source, targets=None, **kwargs):
-        """
-        Initialize MessageBird Object
-        """
+        """Initialize MessageBird Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid MessageBird API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid MessageBird API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         result = is_phone_no(source)
         if not result:
-            msg = 'The MessageBird source specified ({}) is invalid.'\
-                .format(source)
+            msg = f"The MessageBird source specified ({source}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our source
-        self.source = result['full']
+        self.source = result["full"]
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         targets = parse_phone_no(targets)
         if not targets:
@@ -152,24 +152,21 @@ def __init__(self, apikey, source, targets=None, **kwargs):
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform MessageBird Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform MessageBird Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no MessageBird targets to notify.')
+            self.logger.warning("There were no MessageBird targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -177,17 +174,16 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Authorization': 'AccessKey {}'.format(self.apikey),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Authorization": f"AccessKey {self.apikey}",
         }
 
         # Prepare our payload
         payload = {
-            'originator': '+{}'.format(self.source),
-            'recipients': None,
-            'body': body,
-
+            "originator": f"+{self.source}",
+            "recipients": None,
+            "body": body,
         }
 
         # Create a copy of the targets list
@@ -198,13 +194,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our user
-            payload['recipients'] = '+{}'.format(target)
+            payload["recipients"] = f"+{target}"
 
             # Some Debug Logging
             self.logger.debug(
-                'MessageBird POST URL: {} (cert_verify={})'.format(
-                    self.notify_url, self.verify_certificate))
-            self.logger.debug('MessageBird Payload: {}' .format(payload))
+                "MessageBird POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"MessageBird Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -251,22 +248,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # }
 
                 if r.status_code not in (
-                        requests.codes.ok, requests.codes.created):
+                    requests.codes.ok,
+                    requests.codes.created,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyMessageBird.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyMessageBird.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send MessageBird notification to {}: '
-                        '{}{}error={}.'.format(
-                            ','.join(target),
+                        "Failed to send MessageBird notification to {}: "
+                        "{}{}error={}.".format(
+                            ",".join(target),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -274,14 +275,16 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent MessageBird notification to {}.'.format(target))
+                        f"Sent MessageBird notification to {target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending MessageBird:%s ' % (
-                        target) + 'notification.'
+                    "A Connection error occurred sending"
+                    f" MessageBird:{target} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -291,43 +294,38 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey, self.source)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{apikey}/{source}/{targets}/?{params}'.format(
+        return "{schema}://{apikey}/{source}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
             source=self.source,
-            targets='/'.join(
-                [NotifyMessageBird.quote(x, safe='') for x in self.targets]),
-            params=NotifyMessageBird.urlencode(params))
+            targets="/".join(
+                [NotifyMessageBird.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyMessageBird.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -336,28 +334,30 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyMessageBird.split_path(results['fullpath'])
+        results["targets"] = NotifyMessageBird.split_path(results["fullpath"])
 
         try:
             # The first path entry is the source/originator
-            results['source'] = results['targets'].pop(0)
+            results["source"] = results["targets"].pop(0)
 
         except IndexError:
             # No path specified... this URL is potentially un-parseable; we can
             # hope for a from= entry
-            results['source'] = None
+            results["source"] = None
 
         # The hostname is our authentication key
-        results['apikey'] = NotifyMessageBird.unquote(results['host'])
+        results["apikey"] = NotifyMessageBird.unquote(results["host"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyMessageBird.parse_phone_no(results['qsd']['to'])
-
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyMessageBird.unquote(results['qsd']['from'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyMessageBird.parse_phone_no(
+                results["qsd"]["to"]
+            )
+
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyMessageBird.unquote(
+                results["qsd"]["from"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/misskey.py b/libs/apprise/plugins/misskey.py
index 6a90902616..f52987d5b5 100644
--- a/libs/apprise/plugins/misskey.py
+++ b/libs/apprise/plugins/misskey.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -44,27 +43,27 @@
 # This plugin also supports taking the URL (as identified above) directly
 # as well.
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class MisskeyVisibility:
-    """
-    The visibility of any note created
-    """
+    """The visibility of any note created."""
+
     # post will be public
-    PUBLIC = 'public'
+    PUBLIC = "public"
 
-    HOME = 'home'
+    HOME = "home"
 
-    FOLLOWERS = 'followers'
+    FOLLOWERS = "followers"
 
-    SPECIFIED = 'specified'
+    SPECIFIED = "specified"
 
 
 # Define the types in a list for validation purposes
@@ -77,24 +76,22 @@ class MisskeyVisibility:
 
 
 class NotifyMisskey(NotifyBase):
-    """
-    A wrapper for Misskey Notifications
-    """
+    """A wrapper for Misskey Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Misskey'
+    service_name = "Misskey"
 
     # The services URL
-    service_url = 'https://misskey-hub.net/'
+    service_url = "https://misskey-hub.net/"
 
     # The default protocol
-    protocol = 'misskey'
+    protocol = "misskey"
 
     # The default secure protocol
-    secure_protocol = 'misskeys'
+    secure_protocol = "misskeys"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_misskey'
+    setup_url = "https://appriseit.com/services/misskey/"
 
     # The title is not used
     title_maxlen = 0
@@ -103,110 +100,117 @@ class NotifyMisskey(NotifyBase):
     body_maxlen = 512
 
     # Define object templates
-    templates = (
-        '{schema}://{project_id}/{msghook}',
-    )
+    templates = ("{schema}://{project_id}/{msghook}",)
 
     # Define object templates
     templates = (
-        '{schema}://{token}@{host}',
-        '{schema}://{token}@{host}:{port}',
+        "{schema}://{token}@{host}",
+        "{schema}://{token}@{host}:{port}",
     )
 
     # Define our template arguments
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'token': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'token': {
-            'alias_of': 'token',
-        },
-        'visibility': {
-            'name': _('Visibility'),
-            'type': 'choice:string',
-            'values': MISSKEY_VISIBILITIES,
-            'default': MisskeyVisibility.PUBLIC,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "token": {
+                "alias_of": "token",
+            },
+            "visibility": {
+                "name": _("Visibility"),
+                "type": "choice:string",
+                "values": MISSKEY_VISIBILITIES,
+                "default": MisskeyVisibility.PUBLIC,
+            },
         },
-    })
+    )
 
     def __init__(self, token=None, visibility=None, **kwargs):
-        """
-        Initialize Misskey Object
-        """
+        """Initialize Misskey Object."""
         super().__init__(**kwargs)
 
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Misskey Access Token was specified.'
+            msg = "An invalid Misskey Access Token was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if visibility:
             # Input is a string; attempt to get the lookup from our
             # sound mapping
-            vis = 'invalid' if not isinstance(visibility, str) \
+            vis = (
+                "invalid"
+                if not isinstance(visibility, str)
                 else visibility.lower().strip()
+            )
 
             # This little bit of black magic allows us to match against
             # against multiple versions of the same string ... etc
-            self.visibility = \
-                next((v for v in MISSKEY_VISIBILITIES
-                      if v.startswith(vis)), None)
+            self.visibility = next(
+                (v for v in MISSKEY_VISIBILITIES if v.startswith(vis)), None
+            )
 
             if self.visibility not in MISSKEY_VISIBILITIES:
-                msg = 'The Misskey visibility specified ({}) is invalid.' \
-                    .format(visibility)
+                msg = (
+                    f"The Misskey visibility specified ({visibility}) is"
+                    " invalid."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.visibility = self.template_args['visibility']['default']
+            self.visibility = self.template_args["visibility"]["default"]
 
         # Prepare our URL
-        self.schema = 'https' if self.secure else 'http'
-        self.api_url = '%s://%s' % (self.schema, self.host)
+        self.schema = "https" if self.secure else "http"
+        self.api_url = f"{self.schema}://{self.host}"
 
         if isinstance(self.port, int):
-            self.api_url += ':%d' % self.port
+            self.api_url += f":{self.port}"
 
         return
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.token, self.host, self.port,
+            self.token,
+            self.host,
+            self.port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         params = {
-            'visibility': self.visibility,
+            "visibility": self.visibility,
         }
 
         # Extend our parameters
@@ -214,37 +218,37 @@ def url(self, privacy=False, *args, **kwargs):
 
         host = self.host
         if isinstance(self.port, int):
-            host += ':%d' % self.port
+            host += f":{self.port}"
 
-        return '{schema}://{token}@{host}/?{params}'.format(
+        return "{schema}://{token}@{host}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             host=host,
-            token=self.pprint(self.token, privacy, safe=''),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyMisskey.urlencode(params),
         )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        wrapper to _send since we can alert more then one channel
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Wrapper to _send since we can alert more then one channel."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
         payload = {
-            'i': self.token,
-            'text': body,
-            'visibility': self.visibility,
+            "i": self.token,
+            "text": body,
+            "visibility": self.visibility,
         }
 
-        api_url = f'{self.api_url}/api/notes/create'
-        self.logger.debug('Misskey GET URL: %s (cert_verify=%r)' % (
-            api_url, self.verify_certificate))
-        self.logger.debug('Misskey Payload: %s' % str(payload))
+        api_url = f"{self.api_url}/api/notes/create"
+        self.logger.debug(
+            "Misskey GET URL:"
+            f" {api_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Misskey Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -259,29 +263,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyMisskey.http_response_code_lookup(r.status_code)
+                status_str = NotifyMisskey.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Misskey notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Misskey notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Misskey notification.')
+                self.logger.info("Sent Misskey notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Misskey '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Misskey notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -290,27 +296,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifyMisskey.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyMisskey.unquote(results["qsd"]["token"])
 
-        elif not results['password'] and results['user']:
-            results['token'] = NotifyMisskey.unquote(results['user'])
+        elif not results["password"] and results["user"]:
+            results["token"] = NotifyMisskey.unquote(results["user"])
 
         # Capture visibility if specified
-        if 'visibility' in results['qsd'] and \
-                len(results['qsd']['visibility']):
-            results['visibility'] = \
-                NotifyMisskey.unquote(results['qsd']['visibility'])
+        if "visibility" in results["qsd"] and len(
+            results["qsd"]["visibility"]
+        ):
+            results["visibility"] = NotifyMisskey.unquote(
+                results["qsd"]["visibility"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/mqtt.py b/libs/apprise/plugins/mqtt.py
index a48295f3a3..a7c0b26c37 100644
--- a/libs/apprise/plugins/mqtt.py
+++ b/libs/apprise/plugins/mqtt.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,16 +32,17 @@
 # as their inline documentation is pretty good!
 #   https://github.com/eclipse/paho.mqtt.python\
 #           /blob/master/src/paho/mqtt/client.py
-import ssl
-import re
-from time import sleep
 from datetime import datetime
 from os.path import isfile
-from .base import NotifyBase
-from ..url import PrivacyMode
+import re
+import ssl
+from time import sleep
+
 from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list
+from .base import NotifyBase
 
 # Default our global support flag
 NOTIFY_MQTT_SUPPORT_ENABLED = False
@@ -79,29 +79,27 @@
 
 
 class NotifyMQTT(NotifyBase):
-    """
-    A wrapper for MQTT Notifications
-    """
+    """A wrapper for MQTT Notifications."""
 
     # Set our global enabled flag
     enabled = NOTIFY_MQTT_SUPPORT_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'packages_required': 'paho-mqtt != 2.0.*'
+        "packages_required": "paho-mqtt != 2.0.*"
     }
 
     # The default descriptive name associated with the Notification
-    service_name = 'MQTT Notification'
+    service_name = "MQTT Notification"
 
     # The default protocol
-    protocol = 'mqtt'
+    protocol = "mqtt"
 
     # Secure protocol
-    secure_protocol = 'mqtts'
+    secure_protocol = "mqtts"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_mqtt'
+    setup_url = "https://appriseit.com/services/mqtt/"
 
     # MQTT does not have a title
     title_maxlen = 0
@@ -136,85 +134,97 @@ class NotifyMQTT(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}@{host}/{topic}',
-        '{schema}://{user}@{host}:{port}/{topic}',
-        '{schema}://{user}:{password}@{host}/{topic}',
-        '{schema}://{user}:{password}@{host}:{port}/{topic}',
+        "{schema}://{user}@{host}/{topic}",
+        "{schema}://{user}@{host}:{port}/{topic}",
+        "{schema}://{user}:{password}@{host}/{topic}",
+        "{schema}://{user}:{password}@{host}:{port}/{topic}",
     )
 
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "topic": {
+                "name": _("Target Queue"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'topic': {
-            'name': _('Target Queue'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'qos': {
-            'name': _('QOS'),
-            'type': 'int',
-            'default': 0,
-            'min': 0,
-            'max': 2,
-        },
-        'version': {
-            'name': _('Version'),
-            'type': 'choice:string',
-            'values': HUMAN_MQTT_PROTOCOL_MAP,
-            'default': "v3.1.1",
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "qos": {
+                "name": _("QOS"),
+                "type": "int",
+                "default": 0,
+                "min": 0,
+                "max": 2,
+            },
+            "version": {
+                "name": _("Version"),
+                "type": "choice:string",
+                "values": HUMAN_MQTT_PROTOCOL_MAP,
+                "default": "v3.1.1",
+            },
+            "client_id": {
+                "name": _("Client ID"),
+                "type": "string",
+            },
+            "session": {
+                "name": _("Use Session"),
+                "type": "bool",
+                "default": False,
+            },
+            "retain": {
+                "name": _("Retain Messages"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'client_id': {
-            'name': _('Client ID'),
-            'type': 'string',
-        },
-        'session': {
-            'name': _('Use Session'),
-            'type': 'bool',
-            'default': False,
-        },
-        'retain': {
-            'name': _('Retain Messages'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
-    def __init__(self, targets=None, version=None, qos=None,
-                 client_id=None, session=None, retain=None, **kwargs):
-        """
-        Initialize MQTT Object
-        """
+    def __init__(
+        self,
+        targets=None,
+        version=None,
+        qos=None,
+        client_id=None,
+        session=None,
+        retain=None,
+        **kwargs,
+    ):
+        """Initialize MQTT Object."""
 
         super().__init__(**kwargs)
 
@@ -222,7 +232,7 @@ def __init__(self, targets=None, version=None, qos=None,
         self.topics = parse_list(targets)
 
         if version is None:
-            self.version = self.template_args['version']['default']
+            self.version = self.template_args["version"]["default"]
         else:
             self.version = version
 
@@ -230,33 +240,46 @@ def __init__(self, targets=None, version=None, qos=None,
         self.client_id = client_id
 
         # Maintain our session (associated with our user id if set)
-        self.session = self.template_args['session']['default'] \
-            if session is None or not self.client_id \
+        self.session = (
+            self.template_args["session"]["default"]
+            if session is None or not self.client_id
             else parse_bool(session)
+        )
 
         # Our Retain Message Flag
-        self.retain = self.template_args['retain']['default'] \
-            if retain is None else parse_bool(retain)
+        self.retain = (
+            self.template_args["retain"]["default"]
+            if retain is None
+            else parse_bool(retain)
+        )
 
         # Set up our Quality of Service (QoS)
         try:
-            self.qos = self.template_args['qos']['default'] \
-                if qos is None else int(qos)
+            self.qos = (
+                self.template_args["qos"]["default"]
+                if qos is None
+                else int(qos)
+            )
 
-            if self.qos < self.template_args['qos']['min'] \
-                    or self.qos > self.template_args['qos']['max']:
+            if (
+                self.qos < self.template_args["qos"]["min"]
+                or self.qos > self.template_args["qos"]["max"]
+            ):
                 # Let error get handle on exceptio higher up
                 raise ValueError("")
 
         except (ValueError, TypeError):
-            msg = 'An invalid MQTT QOS ({}) was specified.'.format(qos)
+            msg = f"An invalid MQTT QOS ({qos}) was specified."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         if not self.port:
             # Assign port (if not otherwise set)
-            self.port = self.mqtt_secure_port \
-                if self.secure else self.mqtt_insecure_port
+            self.port = (
+                self.mqtt_secure_port
+                if self.secure
+                else self.mqtt_insecure_port
+            )
 
         self.ca_certs = None
         if self.secure:
@@ -265,26 +288,35 @@ def __init__(self, targets=None, version=None, qos=None,
             #       It could be useful to inform the user _where_ Apprise
             #       tried to find the root CA certificates file.
             self.ca_certs = next(
-                (cert for cert in self.CA_CERTIFICATE_FILE_LOCATIONS
-                 if isfile(cert)), None)
+                (
+                    cert
+                    for cert in self.CA_CERTIFICATE_FILE_LOCATIONS
+                    if isfile(cert)
+                ),
+                None,
+            )
 
         # Set up our MQTT Publisher
         try:
             # Get our protocol
-            self.mqtt_protocol = \
-                MQTT_PROTOCOL_MAP[re.sub(r'[^0-9]+', '', self.version)]
+            self.mqtt_protocol = MQTT_PROTOCOL_MAP[
+                re.sub(r"[^0-9]+", "", self.version)
+            ]
 
-        except (KeyError):
-            msg = 'An invalid MQTT Protocol version ' \
-                '({}) was specified.'.format(version)
+        except KeyError:
+            msg = (
+                f"An invalid MQTT Protocol version ({version}) was specified."
+            )
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         # Our MQTT Client Object
         self.client = mqtt.Client(
             client_id=self.client_id,
-            clean_session=not self.session, userdata=None,
-            protocol=self.mqtt_protocol, transport=self.mqtt_transport,
+            clean_session=not self.session,
+            userdata=None,
+            protocol=self.mqtt_protocol,
+            transport=self.mqtt_transport,
         )
 
         # Our maximum number of in-flight messages
@@ -294,50 +326,58 @@ def __init__(self, targets=None, version=None, qos=None,
         # once
         self.__initial_connect = True
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform MQTT Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform MQTT Notification."""
 
         if len(self.topics) == 0:
             # There were no services to notify
-            self.logger.warning('There were no MQTT topics to notify.')
+            self.logger.warning("There were no MQTT topics to notify.")
             return False
 
         # For logging:
-        url = '{host}:{port}'.format(host=self.host, port=self.port)
+        url = f"{self.host}:{self.port}"
 
         try:
             if self.__initial_connect:
                 # Our initial connection
                 if self.user:
                     self.client.username_pw_set(
-                        self.user, password=self.password)
+                        self.user, password=self.password
+                    )
 
                 if self.secure:
                     if self.ca_certs is None:
                         self.logger.error(
-                            'MQTT secure communication can not be verified, '
-                            'CA certificates file missing')
+                            "MQTT secure communication can not be verified, "
+                            "CA certificates file missing"
+                        )
                         return False
 
                     self.client.tls_set(
-                        ca_certs=self.ca_certs, certfile=None, keyfile=None,
+                        ca_certs=self.ca_certs,
+                        certfile=None,
+                        keyfile=None,
                         cert_reqs=ssl.CERT_REQUIRED,
                         tls_version=ssl.PROTOCOL_TLS,
-                        ciphers=None)
+                        ciphers=None,
+                    )
 
                     # Set our TLS Verify Flag
                     self.client.tls_insecure_set(not self.verify_certificate)
 
                 # Establish our connection
-                if self.client.connect(
-                        self.host, port=self.port,
-                        keepalive=self.mqtt_keepalive) \
-                        != mqtt.MQTT_ERR_SUCCESS:
+                if (
+                    self.client.connect(
+                        self.host,
+                        port=self.port,
+                        keepalive=self.mqtt_keepalive,
+                    )
+                    != mqtt.MQTT_ERR_SUCCESS
+                ):
                     self.logger.warning(
-                        'An MQTT connection could not be established for {}'.
-                        format(url))
+                        "An MQTT connection could not be established for"
+                        f" {url}"
+                    )
                     return False
 
                 # Start our client loop
@@ -361,42 +401,46 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 topic = topics.pop()
 
                 # For logging:
-                url = '{host}:{port}/{topic}'.format(
-                    host=self.host,
-                    port=self.port,
-                    topic=topic)
+                url = f"{self.host}:{self.port}/{topic}"
 
                 # Always call throttle before any remote server i/o is made
                 self.throttle()
 
                 # handle a re-connection
-                if not self.client.is_connected() and \
-                        self.client.reconnect() != mqtt.MQTT_ERR_SUCCESS:
+                if (
+                    not self.client.is_connected()
+                    and self.client.reconnect() != mqtt.MQTT_ERR_SUCCESS
+                ):
                     self.logger.warning(
-                        'An MQTT connection could not be sustained for {}'.
-                        format(url))
+                        f"An MQTT connection could not be sustained for {url}"
+                    )
                     has_error = True
                     break
 
                 # Some Debug Logging
-                self.logger.debug('MQTT POST URL: {} (cert_verify={})'.format(
-                    url, self.verify_certificate))
-                self.logger.debug('MQTT Payload: %s' % str(body))
+                self.logger.debug(
+                    "MQTT POST URL:"
+                    f" {url} (cert_verify={self.verify_certificate})"
+                )
+                self.logger.debug(f"MQTT Payload: {body!s}")
 
                 result = self.client.publish(
-                    topic, payload=body, qos=self.qos, retain=self.retain)
+                    topic, payload=body, qos=self.qos, retain=self.retain
+                )
 
                 if result.rc != mqtt.MQTT_ERR_SUCCESS:
                     # Toggle our status
                     self.logger.warning(
-                        'An error (rc={}) occured when sending MQTT to {}'.
-                        format(result.rc, url))
+                        f"An error (rc={result.rc}) occured when sending MQTT"
+                        f" to {url}"
+                    )
                     has_error = True
                     break
 
                 elif not result.is_published():
                     self.logger.debug(
-                        'Blocking until MQTT payload is published...')
+                        "Blocking until MQTT payload is published..."
+                    )
                     reference = datetime.now()
                     while not has_error and not result.is_published():
                         # Throttle
@@ -406,115 +450,124 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         elapsed = (datetime.now() - reference).total_seconds()
                         if elapsed >= self.socket_read_timeout:
                             self.logger.warning(
-                                'The MQTT message could not be delivered')
+                                "The MQTT message could not be delivered"
+                            )
                             has_error = True
 
                 # if we reach here; we're at the bottom of our loop
                 # we loop around and do the next topic now
 
         except ConnectionError as e:
-            self.logger.warning(
-                'MQTT Connection Error received from {}'.format(url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.warning(f"MQTT Connection Error received from {url}")
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         except ssl.CertificateError as e:
             self.logger.warning(
-                'MQTT SSL Certificate Error received from {}'.format(url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"MQTT SSL Certificate Error received from {url}"
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         except ValueError as e:
             # ValueError's are thrown from publish() call if there is a problem
-            self.logger.warning(
-                'MQTT Publishing error received: from {}'.format(url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.warning(f"MQTT Publishing error received: from {url}")
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         if not has_error:
             # Verbal notice
-            self.logger.info('Sent MQTT notification')
+            self.logger.info("Sent MQTT notification")
 
         return not has_error
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host,
-            self.port if self.port else (
-                self.mqtt_secure_port if self.secure
-                else self.mqtt_insecure_port),
-            self.fullpath.rstrip('/'),
+            self.user,
+            self.password,
+            self.host,
+            (
+                self.port
+                if self.port
+                else (
+                    self.mqtt_secure_port
+                    if self.secure
+                    else self.mqtt_insecure_port
+                )
+            ),
+            self.fullpath.rstrip("/"),
             self.client_id,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'version': self.version,
-            'qos': str(self.qos),
-            'session': 'yes' if self.session else 'no',
-            'retain': 'yes' if self.retain else 'no',
+            "version": self.version,
+            "qos": str(self.qos),
+            "session": "yes" if self.session else "no",
+            "retain": "yes" if self.retain else "no",
         }
 
         if self.client_id:
             # Our client id is set if specified
-            params['client_id'] = self.client_id
+            params["client_id"] = self.client_id
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyMQTT.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyMQTT.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyMQTT.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyMQTT.quote(self.user, safe=""),
             )
 
-        default_port = self.mqtt_secure_port \
-            if self.secure else self.mqtt_insecure_port
+        default_port = (
+            self.mqtt_secure_port if self.secure else self.mqtt_insecure_port
+        )
 
-        return '{schema}://{auth}{hostname}{port}/{targets}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{targets}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            targets=','.join(
-                [NotifyMQTT.quote(x, safe='/') for x in self.topics]),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets=",".join(
+                [NotifyMQTT.quote(x, safe="/") for x in self.topics]
+            ),
             params=NotifyMQTT.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.topics)
 
     @staticmethod
     def parse_url(url):
-        """
-        There are no parameters nessisary for this protocol; simply having
-        windows:// is all you need.  This function just makes sure that
-        is in place.
+        """There are no parameters nessisary for this protocol; simply having
+        windows:// is all you need.
 
+        This function just makes sure that is in place.
         """
 
         results = NotifyBase.parse_url(url)
@@ -524,47 +577,48 @@ def parse_url(url):
 
         try:
             # Acquire topic(s)
-            results['targets'] = parse_list(
-                NotifyMQTT.unquote(results['fullpath'].lstrip('/')))
+            results["targets"] = parse_list(
+                NotifyMQTT.unquote(results["fullpath"].lstrip("/"))
+            )
 
         except AttributeError:
             # No 'fullpath' specified
-            results['targets'] = []
+            results["targets"] = []
 
         # The MQTT protocol version to use
-        if 'version' in results['qsd'] and len(results['qsd']['version']):
-            results['version'] = \
-                NotifyMQTT.unquote(results['qsd']['version'])
+        if "version" in results["qsd"] and len(results["qsd"]["version"]):
+            results["version"] = NotifyMQTT.unquote(results["qsd"]["version"])
 
         # The MQTT Client ID
-        if 'client_id' in results['qsd'] and len(results['qsd']['client_id']):
-            results['client_id'] = \
-                NotifyMQTT.unquote(results['qsd']['client_id'])
+        if "client_id" in results["qsd"] and len(results["qsd"]["client_id"]):
+            results["client_id"] = NotifyMQTT.unquote(
+                results["qsd"]["client_id"]
+            )
 
-        if 'session' in results['qsd'] and len(results['qsd']['session']):
-            results['session'] = parse_bool(results['qsd']['session'])
+        if "session" in results["qsd"] and len(results["qsd"]["session"]):
+            results["session"] = parse_bool(results["qsd"]["session"])
 
         # Message Retain Flag
-        if 'retain' in results['qsd'] and len(results['qsd']['retain']):
-            results['retain'] = parse_bool(results['qsd']['retain'])
+        if "retain" in results["qsd"] and len(results["qsd"]["retain"]):
+            results["retain"] = parse_bool(results["qsd"]["retain"])
 
         # The MQTT Quality of Service to use
-        if 'qos' in results['qsd'] and len(results['qsd']['qos']):
-            results['qos'] = \
-                NotifyMQTT.unquote(results['qsd']['qos'])
+        if "qos" in results["qsd"] and len(results["qsd"]["qos"]):
+            results["qos"] = NotifyMQTT.unquote(results["qsd"]["qos"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].extend(
-                NotifyMQTT.parse_list(results['qsd']['to']))
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].extend(
+                NotifyMQTT.parse_list(results["qsd"]["to"])
+            )
 
         # return results
         return results
 
     @property
     def CA_CERTIFICATE_FILE_LOCATIONS(self):
-        """
-        Return possible locations to root certificate authority (CA) bundles.
+        """Return possible locations to root certificate authority (CA)
+        bundles.
 
         Taken from https://golang.org/src/crypto/x509/root_linux.go
         TODO: Maybe refactor to a general utility function?
@@ -584,12 +638,13 @@ def CA_CERTIFICATE_FILE_LOCATIONS(self):
             "/usr/local/etc/ca-certificates/cert.pem",
         ]
 
-        # Certifi provides Mozillaโ€™s carefully curated collection of Root
+        # Certifi provides Mozilla's carefully curated collection of Root
         # Certificates for validating the trustworthiness of SSL certificates
         # while verifying the identity of TLS hosts. It has been extracted from
         # the Requests project.
         try:
             import certifi
+
             candidates.append(certifi.where())
         except ImportError:  # pragma: no cover
             pass
diff --git a/libs/apprise/plugins/msg91.py b/libs/apprise/plugins/msg91.py
index 5b3cc46bbf..e69bda17b2 100644
--- a/libs/apprise/plugins/msg91.py
+++ b/libs/apprise/plugins/msg91.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,47 +34,50 @@
 #
 # Get details on the API used in this plugin here:
 #   - https://docs.msg91.com/reference/send-sms
+from json import dumps
 import re
+
 import requests
-from json import dumps
-from .base import NotifyBase
+
 from ..common import NotifyType
-from ..utils.parse import (
-    is_phone_no, parse_phone_no, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from .base import NotifyBase
 
 
 class MSG91PayloadField:
-    """
-    Identifies the fields available in the JSON Payload
-    """
-    BODY = 'body'
-    MESSAGETYPE = 'type'
+    """Identifies the fields available in the JSON Payload."""
+
+    BODY = "body"
+    MESSAGETYPE = "type"
 
 
 # Add entries here that are reserved
-RESERVED_KEYWORDS = ('mobiles', )
+RESERVED_KEYWORDS = ("mobiles",)
 
 
 class NotifyMSG91(NotifyBase):
-    """
-    A wrapper for MSG91 Notifications
-    """
+    """A wrapper for MSG91 Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'MSG91'
+    service_name = "MSG91"
 
     # The services URL
-    service_url = 'https://msg91.com'
+    service_url = "https://msg91.com"
 
     # The default protocol
-    secure_protocol = 'msg91'
+    secure_protocol = "msg91"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_msg91'
+    setup_url = "https://appriseit.com/services/msg91/"
 
     # MSG91 uses the http protocol with JSON requests
-    notify_url = 'https://control.msg91.com/api/v5/flow/'
+    notify_url = "https://control.msg91.com/api/v5/flow/"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -86,109 +88,121 @@ class NotifyMSG91(NotifyBase):
 
     # Our supported mappings and component keys
     component_key_re = re.compile(
-        r'(?P<key>((?P<id>[a-z0-9_-])?|(?P<map>body|type)))', re.IGNORECASE)
+        r"(?P<key>((?P<id>[a-z0-9_-])?|(?P<map>body|type)))", re.IGNORECASE
+    )
 
     # Define object templates
-    templates = (
-        '{schema}://{template}@{authkey}/{targets}',
-    )
+    templates = ("{schema}://{template}@{authkey}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'template': {
-            'name': _('Template ID'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9 _-]+$', 'i'),
-        },
-        'authkey': {
-            'name': _('Authentication Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "template": {
+                "name": _("Template ID"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9 _-]+$", "i"),
+            },
+            "authkey": {
+                "name": _("Authentication Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "short_url": {
+                "name": _("Short URL"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'short_url': {
-            'name': _('Short URL'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'template_mapping': {
-            'name': _('Template Mapping'),
-            'prefix': ':',
+        "template_mapping": {
+            "name": _("Template Mapping"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, template, authkey, targets=None, short_url=None,
-                 template_mapping=None, **kwargs):
-        """
-        Initialize MSG91 Object
-        """
+    def __init__(
+        self,
+        template,
+        authkey,
+        targets=None,
+        short_url=None,
+        template_mapping=None,
+        **kwargs,
+    ):
+        """Initialize MSG91 Object."""
         super().__init__(**kwargs)
 
         # Authentication Key (associated with project)
         self.authkey = validate_regex(
-            authkey, *self.template_tokens['authkey']['regex'])
+            authkey, *self.template_tokens["authkey"]["regex"]
+        )
         if not self.authkey:
-            msg = 'An invalid MSG91 Authentication Key ' \
-                  '({}) was specified.'.format(authkey)
+            msg = (
+                "An invalid MSG91 Authentication Key "
+                f"({authkey}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Template ID
         self.template = validate_regex(
-            template, *self.template_tokens['template']['regex'])
+            template, *self.template_tokens["template"]["regex"]
+        )
         if not self.template:
-            msg = 'An invalid MSG91 Template ID ' \
-                  '({}) was specified.'.format(template)
+            msg = f"An invalid MSG91 Template ID ({template}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if short_url is None:
-            self.short_url = self.template_args['short_url']['default']
+            self.short_url = self.template_args["short_url"]["default"]
 
         else:
             self.short_url = parse_bool(short_url)
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         self.template_mapping = {}
         if template_mapping:
@@ -197,29 +211,27 @@ def __init__(self, template, authkey, targets=None, short_url=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform MSG91 Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform MSG91 Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no MSG91 targets to notify.')
+            self.logger.warning("There were no MSG91 targets to notify.")
             return False
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'authkey': self.authkey,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "authkey": self.authkey,
         }
 
         # Base
         recipient_payload = {
-            'mobiles': None,
+            "mobiles": None,
             # Keyword Tokens
             MSG91PayloadField.BODY: body,
-            MSG91PayloadField.MESSAGETYPE: notify_type,
+            MSG91PayloadField.MESSAGETYPE: notify_type.value,
         }
 
         # Prepare Recipient Payload Object
@@ -227,7 +239,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if key in RESERVED_KEYWORDS:
                 self.logger.warning(
-                    'Ignoring MSG91 custom payload entry %s', key)
+                    "Ignoring MSG91 custom payload entry %s", key
+                )
                 continue
 
             if key in recipient_payload:
@@ -248,21 +261,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         recipients = []
         for target in self.targets:
             recipient = recipient_payload.copy()
-            recipient['mobiles'] = target
+            recipient["mobiles"] = target
             recipients.append(recipient)
 
         # Prepare our payload
         payload = {
-            'template_id': self.template,
-            'short_url': 1 if self.short_url else 0,
+            "template_id": self.template,
+            "short_url": 1 if self.short_url else 0,
             # target phone numbers are sent with a comma delimiter
-            'recipients': recipients,
+            "recipients": recipients,
         }
 
         # Some Debug Logging
-        self.logger.debug('MSG91 POST URL: {} (cert_verify={})'.format(
-            self.notify_url, self.verify_certificate))
-        self.logger.debug('MSG91 Payload: {}' .format(payload))
+        self.logger.debug(
+            "MSG91 POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"MSG91 Payload: {payload}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -278,32 +293,38 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyMSG91.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyMSG91.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send MSG91 notification to {}: '
-                    '{}{}error={}.'.format(
-                        ','.join(self.targets),
+                    "Failed to send MSG91 notification to {}: "
+                    "{}{}error={}.".format(
+                        ",".join(self.targets),
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+
                 return False
 
             else:
                 self.logger.info(
-                    'Sent MSG91 notification to %s.' % ','.join(self.targets))
+                    "Sent MSG91 notification to {}.".format(
+                        ",".join(self.targets)
+                    )
+                )
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending MSG91:%s '
-                'notification.' % ','.join(self.targets)
+                "A Connection error occurred sending MSG91:{} "
+                "notification.".format(",".join(self.targets))
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False
 
@@ -311,21 +332,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.template, self.authkey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'short_url': str(self.short_url),
+            "short_url": str(self.short_url),
         }
 
         # Extend our parameters
@@ -333,31 +352,27 @@ def url(self, privacy=False, *args, **kwargs):
 
         # Payload body extras prefixed with a ':' sign
         # Append our payload extras into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.template_mapping.items()})
+        params.update({f":{k}": v for k, v in self.template_mapping.items()})
 
-        return '{schema}://{template}@{authkey}/{targets}/?{params}'.format(
+        return "{schema}://{template}@{authkey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            template=self.pprint(self.template, privacy, safe=''),
-            authkey=self.pprint(self.authkey, privacy, safe=''),
-            targets='/'.join(
-                [NotifyMSG91.quote(x, safe='') for x in self.targets]),
-            params=NotifyMSG91.urlencode(params))
+            template=self.pprint(self.template, privacy, safe=""),
+            authkey=self.pprint(self.authkey, privacy, safe=""),
+            targets="/".join(
+                [NotifyMSG91.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyMSG91.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -366,27 +381,28 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyMSG91.split_path(results['fullpath'])
+        results["targets"] = NotifyMSG91.split_path(results["fullpath"])
 
         # The hostname is our authentication key
-        results['authkey'] = NotifyMSG91.unquote(results['host'])
+        results["authkey"] = NotifyMSG91.unquote(results["host"])
 
         # The template id is kept in the user field
-        results['template'] = NotifyMSG91.unquote(results['user'])
+        results["template"] = NotifyMSG91.unquote(results["user"])
 
-        if 'short_url' in results['qsd'] and len(results['qsd']['short_url']):
-            results['short_url'] = parse_bool(results['qsd']['short_url'])
+        if "short_url" in results["qsd"] and len(results["qsd"]["short_url"]):
+            results["short_url"] = parse_bool(results["qsd"]["short_url"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyMSG91.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyMSG91.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # store any additional payload extra's defined
-        results['template_mapping'] = {
+        results["template_mapping"] = {
             NotifyMSG91.unquote(x): NotifyMSG91.unquote(y)
-            for x, y in results['qsd:'].items()
+            for x, y in results["qsd:"].items()
         }
 
         return results
diff --git a/libs/apprise/plugins/msteams.py b/libs/apprise/plugins/msteams.py
index ce3b90c468..fc35c5cc95 100644
--- a/libs/apprise/plugins/msteams.py
+++ b/libs/apprise/plugins/msteams.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -76,48 +75,51 @@
 # These 3 tokens need to be placed in the URL after the Team
 #   msteams://TEAM/ABCD/DEFG/HIJK
 #
-import re
-import requests
 import json
 from json.decoder import JSONDecodeError
+import re
+
+import requests
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import parse_bool, validate_regex
-from ..utils.templates import apply_template, TemplateType
 from ..apprise_attachment import AppriseAttachment
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from ..utils.templates import TemplateType, apply_template
+from .base import NotifyBase
 
 
 class NotifyMSTeams(NotifyBase):
-    """
-    A wrapper for Microsoft Teams Notifications
-    """
+    """A wrapper for Microsoft Teams Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'MSTeams'
+    service_name = "MSTeams"
 
     # The services URL
-    service_url = 'https://teams.micrsoft.com/'
+    service_url = "https://teams.micrsoft.com/"
 
     # The default secure protocol
-    secure_protocol = 'msteams'
+    secure_protocol = "msteams"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_msteams'
+    setup_url = "https://appriseit.com/services/msteams/"
 
     # MSTeams uses the http protocol with JSON requests
-    notify_url_v1 = 'https://outlook.office.com/webhook/' \
-        '{token_a}/IncomingWebhook/{token_b}/{token_c}'
+    notify_url_v1 = (
+        "https://outlook.office.com/webhook/"
+        "{token_a}/IncomingWebhook/{token_b}/{token_c}"
+    )
 
     # New MSTeams webhook (as of April 11th, 2021)
-    notify_url_v2 = 'https://{team}.webhook.office.com/webhookb2/' \
-        '{token_a}/IncomingWebhook/{token_b}/{token_c}'
+    notify_url_v2 = (
+        "https://{team}.webhook.office.com/webhookb2/"
+        "{token_a}/IncomingWebhook/{token_b}/{token_c}"
+    )
 
-    notify_url_v3 = 'https://{team}.webhook.office.com/webhookb2/' \
-        '{token_a}/IncomingWebhook/{token_b}/{token_c}/{token_d}'
+    notify_url_v3 = (
+        "https://{team}.webhook.office.com/webhookb2/"
+        "{token_a}/IncomingWebhook/{token_b}/{token_c}/{token_d}"
+    )
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -135,93 +137,107 @@ class NotifyMSTeams(NotifyBase):
     # Define object templates
     templates = (
         # New required format
-        '{schema}://{team}/{token_a}/{token_b}/{token_c}',
-
+        "{schema}://{team}/{token_a}/{token_b}/{token_c}",
         # Deprecated
-        '{schema}://{token_a}/{token_b}/{token_c}',
+        "{schema}://{token_a}/{token_b}/{token_c}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        # The Microsoft Team Name
-        'team': {
-            'name': _('Team Name'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
-        },
-        # Token required as part of the API request
-        #  /AAAAAAAAA@AAAAAAAAA/........./.........
-        'token_a': {
-            'name': _('Token A'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9-]+@[A-Z0-9-]+$', 'i'),
-        },
-        # Token required as part of the API request
-        #  /................../BBBBBBBBB/..........
-        'token_b': {
-            'name': _('Token B'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            # The Microsoft Team Name
+            "team": {
+                "name": _("Team Name"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+            },
+            # Token required as part of the API request
+            #  /AAAAAAAAA@AAAAAAAAA/........./.........
+            "token_a": {
+                "name": _("Token A"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9-]+@[A-Z0-9-]+$", "i"),
+            },
+            # Token required as part of the API request
+            #  /................../BBBBBBBBB/..........
+            "token_b": {
+                "name": _("Token B"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            # Token required as part of the API request
+            #  /........./........./CCCCCCCCCCCCCCCCCCCCCCCC
+            "token_c": {
+                "name": _("Token C"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9-]+$", "i"),
+            },
+            # Token required as part of the API request
+            #  /........./........./........./DDDDDDDDDDDDDDDDD
+            "token_d": {
+                "name": _("Token D"),
+                "type": "string",
+                "private": True,
+                "required": False,
+                "regex": (r"^V2[a-zA-Z0-9-_]+$", "i"),
+            },
         },
-        # Token required as part of the API request
-        #  /........./........./CCCCCCCCCCCCCCCCCCCCCCCC
-        'token_c': {
-            'name': _('Token C'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9-]+$', 'i'),
-        },
-        # Token required as part of the API request
-        #  /........./........./........./DDDDDDDDDDDDDDDDD
-        'token_d': {
-            'name': _('Token D'),
-            'type': 'string',
-            'private': True,
-            'required': False,
-            'regex': (r'^V2[a-zA-Z0-9-_]+$', 'i'),
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-        'version': {
-            'name': _('Version'),
-            'type': 'choice:int',
-            'values': (1, 2, 3),
-            'default': 2,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            "version": {
+                "name": _("Version"),
+                "type": "choice:int",
+                "values": (1, 2, 3),
+                "default": 2,
+            },
+            "template": {
+                "name": _("Template Path"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'template': {
-            'name': _('Template Path'),
-            'type': 'string',
-            'private': True,
-        },
-    })
+    )
 
     # Define our token control
     template_kwargs = {
-        'tokens': {
-            'name': _('Template Tokens'),
-            'prefix': ':',
+        "tokens": {
+            "name": _("Template Tokens"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, token_a, token_b, token_c, token_d=None, team=None,
-                 version=None, include_image=True, template=None, tokens=None,
-                 **kwargs):
-        """
-        Initialize Microsoft Teams Object
+    def __init__(
+        self,
+        token_a,
+        token_b,
+        token_c,
+        token_d=None,
+        team=None,
+        version=None,
+        include_image=True,
+        template=None,
+        tokens=None,
+        **kwargs,
+    ):
+        """Initialize Microsoft Teams Object.
 
         You can optional specify a template and identify arguments you
         wish to populate your template with when posting.  Some reserved
@@ -235,16 +251,15 @@ def __init__(self, token_a, token_b, token_c, token_d=None, team=None,
 
         except TypeError:
             # None was specified... take on default
-            self.version = self.template_args['version']['default']
+            self.version = self.template_args["version"]["default"]
 
         except ValueError:
             # invalid content was provided; let this get caught in the next
             # validation check for the version
             self.version = None
 
-        if self.version not in self.template_args['version']['values']:
-            msg = 'An invalid MSTeams Version ' \
-                  '({}) was specified.'.format(version)
+        if self.version not in self.template_args["version"]["values"]:
+            msg = f"An invalid MSTeams Version ({version}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -253,37 +268,45 @@ def __init__(self, token_a, token_b, token_c, token_d=None, team=None,
             NotifyBase.logger.deprecate(
                 "Apprise requires you to identify your Microsoft Team name as "
                 "part of the URL. e.g.: "
-                "msteams://TEAM-NAME/{token_a}/{token_b}/{token_c}")
+                f"msteams://TEAM-NAME/{token_a}/{token_b}/{token_c}"
+            )
 
             # Fallback
-            self.team = 'outlook'
+            self.team = "outlook"
 
         self.token_a = validate_regex(
-            token_a, *self.template_tokens['token_a']['regex'])
+            token_a, *self.template_tokens["token_a"]["regex"]
+        )
         if not self.token_a:
-            msg = 'An invalid MSTeams (first) Token ' \
-                  '({}) was specified.'.format(token_a)
+            msg = (
+                f"An invalid MSTeams (first) Token ({token_a}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.token_b = validate_regex(
-            token_b, *self.template_tokens['token_b']['regex'])
+            token_b, *self.template_tokens["token_b"]["regex"]
+        )
         if not self.token_b:
-            msg = 'An invalid MSTeams (second) Token ' \
-                  '({}) was specified.'.format(token_b)
+            msg = (
+                f"An invalid MSTeams (second) Token ({token_b}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.token_c = validate_regex(
-            token_c, *self.template_tokens['token_c']['regex'])
+            token_c, *self.template_tokens["token_c"]["regex"]
+        )
         if not self.token_c:
-            msg = 'An invalid MSTeams (third) Token ' \
-                  '({}) was specified.'.format(token_c)
+            msg = (
+                f"An invalid MSTeams (third) Token ({token_c}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.token_d = validate_regex(
-            token_d, *self.template_tokens['token_d']['regex'])
+            token_d, *self.template_tokens["token_d"]["regex"]
+        )
 
         # Place a thumbnail image inline with the message body
         self.include_image = include_image
@@ -302,8 +325,10 @@ def __init__(self, token_a, token_b, token_c, token_d=None, team=None,
             self.tokens.update(tokens)
 
         elif tokens:
-            msg = 'The specified MSTeams Template Tokens ' \
-                  '({}) are not identified as a dictionary.'.format(tokens)
+            msg = (
+                "The specified MSTeams Template Tokens "
+                f"({tokens}) are not identified as a dictionary."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -312,19 +337,20 @@ def __init__(self, token_a, token_b, token_c, token_d=None, team=None,
             "December 31, 2025. It is advised that you switch to "
             "Microsoft Power Automate (already supported by Apprise as "
             "workflows://. For more information visit: "
-            "https://github.com/caronc/apprise/wiki/Notify_workflows")
+            "https://appriseit.com/services/workflows/"
+        )
 
-    def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
-                    **kwargs):
-        """
-        This function generates our payload whether it be the generic one
-        Apprise generates by default, or one provided by a specified
-        external template.
-        """
+    def gen_payload(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """This function generates our payload whether it be the generic one
+        Apprise generates by default, or one provided by a specified external
+        template."""
 
         # Acquire our to-be footer icon if configured to do so
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if not self.template:
             # By default we use a generic working payload if there was
@@ -340,11 +366,11 @@ def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
                         "activityTitle": title,
                         "text": body,
                     },
-                ]
+                ],
             }
 
             if image_url:
-                payload['sections'][0]['activityImage'] = image_url
+                payload["sections"][0]["activityImage"] = image_url
 
             return payload
 
@@ -353,74 +379,78 @@ def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
         if not template:
             # We could not access the attachment
             self.logger.error(
-                'Could not access MSTeam template {}.'.format(
-                    template.url(privacy=True)))
+                "Could not access MSTeam template"
+                f" {template.url(privacy=True)}."
+            )
             return False
 
         # Take a copy of our token dictionary
         tokens = self.tokens.copy()
 
         # Apply some defaults template values
-        tokens['app_body'] = body
-        tokens['app_title'] = title
-        tokens['app_type'] = notify_type
-        tokens['app_id'] = self.app_id
-        tokens['app_desc'] = self.app_desc
-        tokens['app_color'] = self.color(notify_type)
-        tokens['app_image_url'] = image_url
-        tokens['app_url'] = self.app_url
+        tokens["app_body"] = body
+        tokens["app_title"] = title
+        tokens["app_type"] = notify_type.value
+        tokens["app_id"] = self.app_id
+        tokens["app_desc"] = self.app_desc
+        tokens["app_color"] = self.color(notify_type)
+        tokens["app_image_url"] = image_url
+        tokens["app_url"] = self.app_url
 
         # Enforce Application mode
-        tokens['app_mode'] = TemplateType.JSON
+        tokens["app_mode"] = TemplateType.JSON
 
         try:
-            with open(template.path, 'r') as fp:
+            with open(template.path) as fp:
                 content = json.loads(apply_template(fp.read(), **tokens))
 
-        except (OSError, IOError):
+        except OSError:
             self.logger.error(
-                'MSTeam template {} could not be read.'.format(
-                    template.url(privacy=True)))
+                f"MSTeam template {template.url(privacy=True)} could not be"
+                " read."
+            )
             return None
 
         except JSONDecodeError as e:
             self.logger.error(
-                'MSTeam template {} contains invalid JSON.'.format(
-                    template.url(privacy=True)))
-            self.logger.debug('JSONDecodeError: {}'.format(e))
+                f"MSTeam template {template.url(privacy=True)} contains"
+                " invalid JSON."
+            )
+            self.logger.debug(f"JSONDecodeError: {e}")
             return None
 
         # Load our JSON data (if valid)
         has_error = False
-        if '@type' not in content:
+        if "@type" not in content:
             self.logger.error(
-                'MSTeam template {} is missing @type kwarg.'.format(
-                    template.url(privacy=True)))
+                f"MSTeam template {template.url(privacy=True)} is missing"
+                " @type kwarg."
+            )
             has_error = True
 
-        if '@context' not in content:
+        if "@context" not in content:
             self.logger.error(
-                'MSTeam template {} is missing @context kwarg.'.format(
-                    template.url(privacy=True)))
+                f"MSTeam template {template.url(privacy=True)} is missing"
+                " @context kwarg."
+            )
             has_error = True
 
         return content if not has_error else None
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Microsoft Teams Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Microsoft Teams Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         if self.version == 1:
             notify_url = self.notify_url_v1.format(
                 token_a=self.token_a,
                 token_b=self.token_b,
-                token_c=self.token_c)
+                token_c=self.token_c,
+            )
 
         if self.version == 2:
             notify_url = self.notify_url_v2.format(
@@ -440,16 +470,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Generate our payload if it's possible
         payload = self.gen_payload(
-            body=body, title=title, notify_type=notify_type, **kwargs)
+            body=body, title=title, notify_type=notify_type, **kwargs
+        )
         if not payload:
             # No need to present a reason; that will come from the
             # gen_payload() function itself
             return False
 
-        self.logger.debug('MSTeams POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('MSTeams Payload: %s' % str(payload))
+        self.logger.debug(
+            "MSTeams POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"MSTeams Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -463,29 +495,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyMSTeams.http_response_code_lookup(r.status_code)
+                status_str = NotifyMSTeams.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send MSTeams notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send MSTeams notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # We failed
                 return False
 
             else:
-                self.logger.info('Sent MSTeams notification.')
+                self.logger.info("Sent MSTeams notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending MSTeams notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending MSTeams notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # We failed
             return False
@@ -494,82 +528,85 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol,
             self.team if self.version > 1 else None,
-            self.token_a, self.token_b, self.token_c,
+            self.token_a,
+            self.token_b,
+            self.token_c,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
+            "image": "yes" if self.include_image else "no",
         }
 
-        if self.version != self.template_args['version']['default']:
-            params['version'] = str(self.version)
+        if self.version != self.template_args["version"]["default"]:
+            params["version"] = str(self.version)
 
         if self.template:
-            params['template'] = NotifyMSTeams.quote(
-                self.template[0].url(), safe='')
+            params["template"] = NotifyMSTeams.quote(
+                self.template[0].url(), safe=""
+            )
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
         # Store any template entries if specified
-        params.update({':{}'.format(k): v for k, v in self.tokens.items()})
+        params.update({f":{k}": v for k, v in self.tokens.items()})
 
         result = None
 
         if self.version == 1:
-            result = '{schema}://{token_a}/{token_b}/{token_c}/'\
-                '?{params}'.format(
+            result = (
+                "{schema}://{token_a}/{token_b}/{token_c}/?{params}".format(
                     schema=self.secure_protocol,
-                    token_a=self.pprint(self.token_a, privacy, safe='@'),
-                    token_b=self.pprint(self.token_b, privacy, safe=''),
-                    token_c=self.pprint(self.token_c, privacy, safe=''),
+                    token_a=self.pprint(self.token_a, privacy, safe="@"),
+                    token_b=self.pprint(self.token_b, privacy, safe=""),
+                    token_c=self.pprint(self.token_c, privacy, safe=""),
                     params=NotifyMSTeams.urlencode(params),
                 )
+            )
 
         if self.version == 2:
-            result = '{schema}://{team}/{token_a}/{token_b}/{token_c}/'\
-                '?{params}'.format(
+            result = (
+                "{schema}://{team}/{token_a}/{token_b}/{token_c}/"
+                "?{params}".format(
                     schema=self.secure_protocol,
-                    team=NotifyMSTeams.quote(self.team, safe=''),
-                    token_a=self.pprint(self.token_a, privacy, safe=''),
-                    token_b=self.pprint(self.token_b, privacy, safe=''),
-                    token_c=self.pprint(self.token_c, privacy, safe=''),
+                    team=NotifyMSTeams.quote(self.team, safe=""),
+                    token_a=self.pprint(self.token_a, privacy, safe=""),
+                    token_b=self.pprint(self.token_b, privacy, safe=""),
+                    token_c=self.pprint(self.token_c, privacy, safe=""),
                     params=NotifyMSTeams.urlencode(params),
                 )
+            )
 
         if self.version == 3:
-            result = '{schema}://{team}/{token_a}/{token_b}/{token_c}/'\
-                '{token_d}/?{params}'.format(
+            result = (
+                "{schema}://{team}/{token_a}/{token_b}/{token_c}/"
+                "{token_d}/?{params}".format(
                     schema=self.secure_protocol,
-                    team=NotifyMSTeams.quote(self.team, safe=''),
-                    token_a=self.pprint(self.token_a, privacy, safe=''),
-                    token_b=self.pprint(self.token_b, privacy, safe=''),
-                    token_c=self.pprint(self.token_c, privacy, safe=''),
-                    token_d=self.pprint(self.token_d, privacy, safe=''),
+                    team=NotifyMSTeams.quote(self.team, safe=""),
+                    token_a=self.pprint(self.token_a, privacy, safe=""),
+                    token_b=self.pprint(self.token_b, privacy, safe=""),
+                    token_c=self.pprint(self.token_c, privacy, safe=""),
+                    token_d=self.pprint(self.token_d, privacy, safe=""),
                     params=NotifyMSTeams.urlencode(params),
                 )
+            )
         return result
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -577,62 +614,68 @@ def parse_url(url):
             return results
 
         # Get unquoted entries
-        entries = NotifyMSTeams.split_path(results['fullpath'])
+        entries = NotifyMSTeams.split_path(results["fullpath"])
 
         # Deprecated mode (backwards compatibility)
-        if results.get('user'):
+        if results.get("user"):
             # If a user was found, it's because it's still part of the first
             # token, so we concatinate them
-            results['token_a'] = '{}@{}'.format(
-                NotifyMSTeams.unquote(results['user']),
-                NotifyMSTeams.unquote(results['host']),
+            results["token_a"] = "{}@{}".format(
+                NotifyMSTeams.unquote(results["user"]),
+                NotifyMSTeams.unquote(results["host"]),
             )
 
         else:
             # Get the Team from the hostname
-            results['team'] = NotifyMSTeams.unquote(results['host'])
+            results["team"] = NotifyMSTeams.unquote(results["host"])
 
             # Get the token from the path
-            results['token_a'] = None if not entries \
-                else NotifyMSTeams.unquote(entries.pop(0))
+            results["token_a"] = (
+                None if not entries else NotifyMSTeams.unquote(entries.pop(0))
+            )
 
-        results['token_b'] = None if not entries \
-            else NotifyMSTeams.unquote(entries.pop(0))
-        results['token_c'] = None if not entries \
-            else NotifyMSTeams.unquote(entries.pop(0))
-        results['token_d'] = None if not entries \
-            else NotifyMSTeams.unquote(entries.pop(0))
+        results["token_b"] = (
+            None if not entries else NotifyMSTeams.unquote(entries.pop(0))
+        )
+        results["token_c"] = (
+            None if not entries else NotifyMSTeams.unquote(entries.pop(0))
+        )
+        results["token_d"] = (
+            None if not entries else NotifyMSTeams.unquote(entries.pop(0))
+        )
 
         # Get Image
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         # Get Team name if defined
-        if 'team' in results['qsd'] and results['qsd']['team']:
-            results['team'] = \
-                NotifyMSTeams.unquote(results['qsd']['team'])
+        if "team" in results["qsd"] and results["qsd"]["team"]:
+            results["team"] = NotifyMSTeams.unquote(results["qsd"]["team"])
 
         # Template Handling
-        if 'template' in results['qsd'] and results['qsd']['template']:
-            results['template'] = \
-                NotifyMSTeams.unquote(results['qsd']['template'])
+        if "template" in results["qsd"] and results["qsd"]["template"]:
+            results["template"] = NotifyMSTeams.unquote(
+                results["qsd"]["template"]
+            )
 
         # Override version if defined
-        if 'version' in results['qsd'] and results['qsd']['version']:
-            results['version'] = \
-                NotifyMSTeams.unquote(results['qsd']['version'])
+        if "version" in results["qsd"] and results["qsd"]["version"]:
+            results["version"] = NotifyMSTeams.unquote(
+                results["qsd"]["version"]
+            )
 
         else:
             version = 1
-            if results.get('team'):
+            if results.get("team"):
                 version = 2
-            if results.get('token_d'):
+            if results.get("token_d"):
                 version = 3
             # Set our version if not otherwise set
-            results['version'] = version
+            results["version"] = version
 
         # Store our tokens
-        results['tokens'] = results['qsd:']
+        results["tokens"] = results["qsd:"]
 
         return results
 
@@ -653,61 +696,81 @@ def parse_native_url(url):
         # of this is just to detect that were dealing with an msteams url
         # token parsing will occur once we initialize the function
         result = re.match(
-            r'^https?://(?P<team>[^.]+)(?P<v2a>\.webhook)?\.office\.com/'
-            r'webhook(?P<v2b>b2)?/'
-            r'(?P<token_a>[A-Z0-9-]+@[A-Z0-9-]+)/'
-            r'IncomingWebhook/'
-            r'(?P<token_b>[A-Z0-9]+)/'
-            r'(?P<token_c>[A-Z0-9-]+)/'
-            r'(?P<token_d>V2[A-Z0-9-_]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://(?P<team>[^.]+)(?P<v2a>\.webhook)?\.office\.com/"
+            r"webhook(?P<v2b>b2)?/"
+            r"(?P<token_a>[A-Z0-9-]+@[A-Z0-9-]+)/"
+            r"IncomingWebhook/"
+            r"(?P<token_b>[A-Z0-9]+)/"
+            r"(?P<token_c>[A-Z0-9-]+)/"
+            r"(?P<token_d>V2[A-Z0-9-_]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             # Version 3 URL
             return NotifyMSTeams.parse_url(
-                '{schema}://{team}/{token_a}/{token_b}/{token_c}/{token_d}'
-                '/{params}'.format(
+                "{schema}://{team}/{token_a}/{token_b}/{token_c}/{token_d}"
+                "/{params}".format(
                     schema=NotifyMSTeams.secure_protocol,
-                    team=result.group('team'),
-                    token_a=result.group('token_a'),
-                    token_b=result.group('token_b'),
-                    token_c=result.group('token_c'),
-                    token_d=result.group('token_d'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    team=result.group("team"),
+                    token_a=result.group("token_a"),
+                    token_b=result.group("token_b"),
+                    token_c=result.group("token_c"),
+                    token_d=result.group("token_d"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         result = re.match(
-            r'^https?://(?P<team>[^.]+)(?P<v2a>\.webhook)?\.office\.com/'
-            r'webhook(?P<v2b>b2)?/'
-            r'(?P<token_a>[A-Z0-9-]+@[A-Z0-9-]+)/'
-            r'IncomingWebhook/'
-            r'(?P<token_b>[A-Z0-9]+)/'
-            r'(?P<token_c>[A-Z0-9-]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://(?P<team>[^.]+)(?P<v2a>\.webhook)?\.office\.com/"
+            r"webhook(?P<v2b>b2)?/"
+            r"(?P<token_a>[A-Z0-9-]+@[A-Z0-9-]+)/"
+            r"IncomingWebhook/"
+            r"(?P<token_b>[A-Z0-9]+)/"
+            r"(?P<token_c>[A-Z0-9-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
-            if result.group('v2a'):
+            if result.group("v2a"):
                 # Version 2 URL
                 return NotifyMSTeams.parse_url(
-                    '{schema}://{team}/{token_a}/{token_b}/{token_c}'
-                    '/{params}'.format(
+                    "{schema}://{team}/{token_a}/{token_b}/{token_c}"
+                    "/{params}".format(
                         schema=NotifyMSTeams.secure_protocol,
-                        team=result.group('team'),
-                        token_a=result.group('token_a'),
-                        token_b=result.group('token_b'),
-                        token_c=result.group('token_c'),
-                        params='' if not result.group('params')
-                        else result.group('params')))
+                        team=result.group("team"),
+                        token_a=result.group("token_a"),
+                        token_b=result.group("token_b"),
+                        token_c=result.group("token_c"),
+                        params=(
+                            ""
+                            if not result.group("params")
+                            else result.group("params")
+                        ),
+                    )
+                )
             else:
                 # Version 1 URLs
                 # team is also set to 'outlook' in this case
                 return NotifyMSTeams.parse_url(
-                    '{schema}://{token_a}/{token_b}/{token_c}'
-                    '/{params}'.format(
+                    "{schema}://{token_a}/{token_b}/{token_c}/{params}".format(
                         schema=NotifyMSTeams.secure_protocol,
-                        token_a=result.group('token_a'),
-                        token_b=result.group('token_b'),
-                        token_c=result.group('token_c'),
-                        params='' if not result.group('params')
-                        else result.group('params')))
+                        token_a=result.group("token_a"),
+                        token_b=result.group("token_b"),
+                        token_c=result.group("token_c"),
+                        params=(
+                            ""
+                            if not result.group("params")
+                            else result.group("params")
+                        ),
+                    )
+                )
         return None
diff --git a/libs/apprise/plugins/nextcloud.py b/libs/apprise/plugins/nextcloud.py
index 1e86585fed..d762768fa5 100644
--- a/libs/apprise/plugins/nextcloud.py
+++ b/libs/apprise/plugins/nextcloud.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,34 +25,64 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from itertools import chain
+from json import loads
+import re
+
 import requests
 
-from .base import NotifyBase
+from ..common import NotifyType, PersistentStoreMode
+from ..exception import AppriseException
+from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyType
 from ..utils.parse import parse_list
-from ..locale import gettext_lazy as _
+from .base import NotifyBase
+
+# Is Group Detection
+IS_GROUP = re.compile(
+    r"^\s*((#|%23)(?P<group>[a-z0-9_-]+)|"
+    r"((#|%23)?(?P<all>all|everyone|\*)))\s*$",
+    re.I,
+)
+
+# Is User Detection
+IS_USER = re.compile(
+    r"^\s*(@|%40)?(?P<user>[a-z0-9_-]+)\s*$",
+    re.I,
+)
+
+
+class NextcloudGroupDiscoveryException(AppriseException):
+    """Apprise Nextcloud Group Discovery Exception Class."""
 
 
 class NotifyNextcloud(NotifyBase):
-    """
-    A wrapper for Nextcloud Notifications
+    """A wrapper for Nextcloud Notifications.
+
+    Targets can be individual users, groups, or everyone:
+    - user: specify one or more usernames as path segments
+    - group: prefix with a hash (e.g., ``#DevTeam``)
+    - everyone: use ``all`` (aliases: ``everyone``, ``*``)
+
+    Group and everyone expansion uses Nextcloud's OCS provisioning API and
+    requires appropriate permissions (typically an admin account) and the
+    provisioning API enabled on the server.
     """
 
     # The default descriptive name associated with the Notification
-    service_name = 'Nextcloud'
+    service_name = "Nextcloud"
 
     # The services URL
-    service_url = 'https://nextcloud.com/'
+    service_url = "https://nextcloud.com/"
 
     # Insecure protocol (for those self hosted requests)
-    protocol = 'ncloud'
+    protocol = "ncloud"
 
     # The default protocol (this is secure for notica)
-    secure_protocol = 'nclouds'
+    secure_protocol = "nclouds"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_nextcloud'
+    setup_url = "https://appriseit.com/services/nextcloud/"
 
     # Nextcloud title length
     title_maxlen = 255
@@ -61,103 +90,154 @@ class NotifyNextcloud(NotifyBase):
     # Defines the maximum allowable characters per message.
     body_maxlen = 4000
 
+    # Our default is to not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.AUTO
+
+    # Defines how long we cache our discovery for
+    group_discovery_cache_length_sec = 86400
+
+    # unique identifier to cache the 'all' group category
+    all_group_id = "all"
+
     # Define object templates
     templates = (
-        '{schema}://{host}/{targets}',
-        '{schema}://{host}:{port}/{targets}',
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
+        "{schema}://{host}/{targets}",
+        "{schema}://{host}:{port}/{targets}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "map_to": "targets",
+                "prefix": "@",
+            },
+            "target_group": {
+                "name": _("Target Group"),
+                "type": "string",
+                "map_to": "targets",
+                "prefix": "#",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        # Nextcloud uses different API end points depending on the version
-        # being used however the (API) payload remains the same.  Allow users
-        # to specify the version they are using:
-        'version': {
-            'name': _('Version'),
-            'type': 'int',
-            'min': 1,
-            'default': 21,
-        },
-        'url_prefix': {
-            'name': _('URL Prefix'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            # Nextcloud uses different API end points depending on the version
+            # being used however the (API) payload remains the same.  Allow
+            # users to specify the version they are using:
+            "version": {
+                "name": _("Version"),
+                "type": "int",
+                "min": 1,
+                "default": 21,
+            },
+            "url_prefix": {
+                "name": _("URL Prefix"),
+                "type": "string",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, targets=None, version=None, headers=None,
-                 url_prefix=None, **kwargs):
-        """
-        Initialize Nextcloud Object
-        """
+    def __init__(
+        self,
+        targets=None,
+        version=None,
+        headers=None,
+        url_prefix=None,
+        **kwargs,
+    ):
+        """Initialize Nextcloud Object."""
         super().__init__(**kwargs)
 
         # Store our targets
-        self.targets = parse_list(targets)
+        self.targets = []
+        self.groups = set()
+
+        for target in parse_list(targets):
+            results = IS_GROUP.match(target)
+            if results:
+                group_id = (
+                    self.all_group_id
+                    if results.group("all") else results.group("group"))
+
+                self.groups.add(group_id)
+                self.logger.debug("Added Nextcloud group '%s'", group_id)
+                continue
+
+            results = IS_USER.match(target)
+            if results:
+                # Store our target
+                self.targets.append(results.group("user"))
+                self.logger.debug(
+                    "Added Nextcloud user '%s'", self.targets[-1])
+                continue
 
-        self.version = self.template_args['version']['default']
+            self.logger.warning(
+                "Ignored invalid Nextcloud user/group '%s'", target)
+
+        self.version = self.template_args["version"]["default"]
         if version is not None:
             try:
                 self.version = int(version)
-                if self.version < self.template_args['version']['min']:
+                if self.version < self.template_args["version"]["min"]:
                     # Let upper exception handle this
                     raise ValueError()
 
             except (ValueError, TypeError):
-                msg = 'At invalid Nextcloud version ({}) was specified.'\
-                    .format(version)
+                msg = (
+                    f"At invalid Nextcloud version ({version}) was specified."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
         # Support URL Prefix
-        self.url_prefix = '' if not url_prefix \
-            else url_prefix.strip('/')
+        self.url_prefix = "" if not url_prefix else (
+            "/" + url_prefix.strip("/"))
 
         self.headers = {}
         if headers:
@@ -166,191 +246,350 @@ def __init__(self, targets=None, version=None, headers=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Nextcloud Notification
-        """
+    def _fetch(self, payload=None, target=None, group=None):
+        """Wrapper to NextCloud API requests object."""
 
-        if len(self.targets) == 0:
-            # There were no services to notify
-            self.logger.warning('There were no Nextcloud targets to notify.')
-            return False
+        # our method
+        method = "POST" if target else "GET"
 
         # Prepare our Header
         headers = {
-            'User-Agent': self.app_id,
-            'OCS-APIREQUEST': 'true',
+            "User-Agent": self.app_id,
+            "OCS-APIREQUEST": "true",
+            "Accept": "application/json",
         }
 
         # Apply any/all header over-rides defined
         headers.update(self.headers)
 
-        # error tracking (used for function return)
-        has_error = False
+        # Prepare base URL fragments
+        scheme = "https" if self.secure else "http"
+        host_port = (
+            self.host
+            if not isinstance(self.port, int)
+            else f"{self.host}:{self.port}"
+        )
+        base = f"{scheme}://{host_port}"
+        if self.url_prefix:
+            base = f"{base}{self.url_prefix}"
 
-        # Create a copy of the targets list
-        targets = list(self.targets)
-        while len(targets):
-            target = targets.pop(0)
+        # Auth
+        auth = (self.user, self.password) if self.user else None
 
-            # Prepare our Payload
-            payload = {
-                'shortMessage': title if title else self.app_desc,
-            }
-            if body:
-                # Only store the longMessage if a body was defined; nextcloud
-                # doesn't take kindly to empty longMessage entries.
-                payload['longMessage'] = body
+        # our URL Parameters
+        params = {}
 
-            auth = None
-            if self.user:
-                auth = (self.user, self.password)
+        # our response
+        content = None
 
+        if target:
             # Nextcloud URL based on version used
-            notify_url = '{schema}://{host}/{url_prefix}/ocs/v2.php/'\
-                'apps/admin_notifications/' \
-                'api/v1/notifications/{target}' \
-                if self.version < 21 else \
-                '{schema}://{host}/{url_prefix}/ocs/v2.php/'\
-                'apps/notifications/'\
-                'api/v2/admin_notifications/{target}'
-
-            notify_url = notify_url.format(
-                schema='https' if self.secure else 'http',
-                host=self.host if not isinstance(self.port, int)
-                else '{}:{}'.format(self.host, self.port),
-                url_prefix=self.url_prefix,
-                target=target,
+            query = f'v{self.version} Notify "{target}"'
+            esc_target = NotifyNextcloud.quote(target)
+            url = (
+                f"{base}/ocs/v2.php/"
+                "apps/admin_notifications/"
+                f"api/v1/notifications/{esc_target}"
+                if self.version < 21
+                else (
+                    f"{base}/ocs/v2.php/"
+                    "apps/notifications/"
+                    f"api/v2/admin_notifications/{esc_target}"
+                )
             )
 
+        elif group:
+            query = f'Group "{group}"'
+            params = {
+                "format": "json",
+            }
+            esc_group = NotifyNextcloud.quote(group)
+            url = f"{base}/ocs/v1.php/cloud/groups/{esc_group}"
+
+        else:  # Users
+            query = "Users"
+            params = {
+                "format": "json",
+            }
+            url = f"{base}/ocs/v1.php/cloud/users"
+
+        self.throttle()
+        self.logger.debug(
+            "Nextcloud %s %s URL: %s (cert_verify=%r)",
+            query,
+            method,
+            url,
+            self.verify_certificate,
+        )
+
+        if payload:
             self.logger.debug(
-                'Nextcloud v%d POST URL: %s (cert_verify=%r)',
-                self.version, notify_url, self.verify_certificate)
-            self.logger.debug(
-                'Nextcloud v%d Payload: %s',
-                self.version, str(payload))
+                "Nextcloud v%d Payload: %s", self.version, payload
+            )
 
-            # Always call throttle before any remote server i/o is made
-            self.throttle()
+        try:
+            # Prepare our request object
+            request = requests.post if target else requests.get
+
+            r = request(
+                url,
+                headers=headers,
+                data=payload,
+                params=params,
+                auth=auth,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
 
             try:
-                r = requests.post(
-                    notify_url,
-                    data=payload,
-                    headers=headers,
-                    auth=auth,
-                    verify=self.verify_certificate,
-                    timeout=self.request_timeout,
+                content = loads(r.content)
+
+            except (AttributeError, TypeError, ValueError):
+                # ValueError = r.content is Unparsable
+                # TypeError = r.content is None
+                # AttributeError = r is None
+                content = {}
+
+            if r.status_code != requests.codes.ok:
+                status_str = NotifyNextcloud.http_response_code_lookup(
+                    r.status_code
                 )
-                if r.status_code != requests.codes.ok:
-                    # We had a problem
-                    status_str = \
-                        NotifyNextcloud.http_response_code_lookup(
-                            r.status_code)
-
-                    self.logger.warning(
-                        'Failed to send Nextcloud v{} notification:'
-                        '{}{}error={}.'.format(
-                            self.version,
-                            status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
-
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
-                    # track our failure
-                    has_error = True
-                    continue
-
-                else:
-                    self.logger.info(
-                        'Sent Nextcloud %d notification.', self.version)
-
-            except requests.RequestException as e:
+
                 self.logger.warning(
-                    'A Connection error occurred sending Nextcloud v%d'
-                    'notification.', self.version)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "Failed to send Nextcloud %s: %s%serror=%d.",
+                    query,
+                    status_str,
+                    ", " if status_str else "",
+                    r.status_code,
+                )
+
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
-                # track our failure
+                if target:
+                    return (False, content)
+
+                raise NextcloudGroupDiscoveryException(
+                    f"{query} non-200 response")
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                "A Connection error occurred with Nextcloud %s",
+                query,
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
+
+            if target:
+                return (False, None)
+            raise NextcloudGroupDiscoveryException(
+                f"{query} socket exception") from None
+
+        self.logger.info("Sent Nextcloud %s", query)
+        return (True, content)
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Nextcloud Notification."""
+
+        # Create a copy of our targets
+        targets = set(self.targets)
+
+        # Initialize our has_error flag
+        has_error = False
+
+        if self.groups:
+            # Append our group lookup
+            try:
+                for group in self.groups:
+                    if group == self.all_group_id:
+                        targets |= self.all_users()
+
+                    else:
+                        # specific group
+                        targets |= self.users_by_group(group)
+
+            except NextcloudGroupDiscoveryException:
+                # logging already handled within all_users and user_by_group()
+                return False
+
+        if not targets:
+            # There were no services to notify
+            self.logger.warning("There were no Nextcloud targets to notify.")
+            return False
+
+        for target in targets:
+            # Prepare our Payload
+            payload = {
+                "shortMessage": title if title else self.app_desc,
+            }
+            if body:
+                # Only store the longMessage if a body was defined; nextcloud
+                # doesn't take kindly to empty longMessage entries.
+                payload["longMessage"] = body
+
+            is_okay, _ = self._fetch(payload, target)
+            if not is_okay:
+                # Toggle our status
                 has_error = True
-                continue
 
         return not has_error
 
+    def users_by_group(self, group):
+        """
+        Lists users associated with a provided group
+        """
+
+        # Check our cache
+        targets = self.store.get(group)
+        if targets is not None:
+            # Returned cached value
+            self.logger.trace(
+                f"Using Nextcloud cached response for group '{group}' "
+                "query")
+            return set(targets)
+
+        # _fetch throws an exception if it fails, so we can
+        # go ahead and ignore checking for it.
+        _, response = self._fetch(group=group)
+
+        # Initialize our targets
+        targets = set()
+
+        # If we get here, our fetch was successful; look up our users
+        users = response.get("ocs", {}).get("data", {}).get("users")
+        if isinstance(users, list):
+            targets = {
+                s for u in users if (s := str(u).strip())
+            }
+
+        if not targets:
+            self.logger.warning(
+                "No users associated with Nextcloud group '%s'", group
+            )
+
+        self.store.set(
+            group, list(targets),
+            expires=self.group_discovery_cache_length_sec)
+        return targets
+
+    def all_users(self):
+        """
+        Lists users associated with Nextcloud instance
+        """
+        # Check our cache
+        targets = self.store.get(self.all_group_id)
+        if targets is not None:
+            self.logger.trace(
+                "Using Nextcloud cached response for all-user query")
+            return set(targets)
+
+        # _fetch throws an exception if it fails, so we can
+        # go ahead and ignore checking for it.
+        _, response = self._fetch()
+
+        # Initialize our targets
+        targets = set()
+
+        # If we get here, our fetch was successful; look up our users
+        users = response.get("ocs", {}).get("data", {}).get("users")
+        if isinstance(users, list):
+            targets = {
+                s for u in users if (s := str(u).strip())
+            }
+
+        if not targets:
+            self.logger.warning(
+                "Failed to retrieve all users from Nextcloud",
+            )
+            # early exit; no cache
+            return targets
+
+        self.store.set(
+            self.all_group_id,
+            list(targets), expires=self.group_discovery_cache_length_sec)
+        return targets
+
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
+            self.url_prefix,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Create URL parameters from our headers
-        params = {'+{}'.format(k): v for k, v in self.headers.items()}
+        params = {f"+{k}": v for k, v in self.headers.items()}
 
         # Set our version
-        params['version'] = str(self.version)
+        params["version"] = str(self.version)
 
-        if self.url_prefix:
-            params['url_prefix'] = self.url_prefix
+        if self.url_prefix.rstrip("/"):
+            params["url_prefix"] = self.url_prefix
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyNextcloud.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyNextcloud.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyNextcloud.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyNextcloud.quote(self.user, safe=""),
             )
 
+        group_prefix = self.template_tokens["target_group"]["prefix"]
+        user_prefix = self.template_tokens["target_user"]["prefix"]
+
         default_port = 443 if self.secure else 80
+        return "{schema}://{auth}{hostname}{port}/{targets}?{params}".format(
+            schema=self.secure_protocol if self.secure else self.protocol,
+            auth=auth,
+            # never encode hostname since we're expecting it to be a
+            # valid one
+            hostname=self.host,
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets="/".join([
+                NotifyNextcloud.quote(x, safe=(group_prefix + user_prefix))
+                for x in chain(
+                    # Groups are prefixed with a pound/hashtag symbol
+                    [f"{group_prefix}{x}" for x in self.groups],
+                    # Users
+                    [f"{user_prefix}{x}" for x in self.targets],
+                )
+            ]),
 
-        return '{schema}://{auth}{hostname}{port}/{targets}?{params}' \
-               .format(
-                   schema=self.secure_protocol
-                   if self.secure else self.protocol,
-                   auth=auth,
-                   # never encode hostname since we're expecting it to be a
-                   # valid one
-                   hostname=self.host,
-                   port='' if self.port is None or self.port == default_port
-                        else ':{}'.format(self.port),
-                   targets='/'.join([NotifyNextcloud.quote(x)
-                                     for x in self.targets]),
-                   params=NotifyNextcloud.urlencode(params),
-               )
+            params=NotifyNextcloud.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
-        targets = len(self.targets)
-        return targets if targets else 1
+        """Returns the number of targets associated with this notification."""
+        targets = len(self.targets) + len(self.groups)
+        return max(1, targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url)
         if not results:
@@ -358,29 +597,33 @@ def parse_url(url):
             return results
 
         # Fetch our targets
-        results['targets'] = \
-            NotifyNextcloud.split_path(results['fullpath'])
+        results["targets"] = NotifyNextcloud.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyNextcloud.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyNextcloud.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Allow users to over-ride the Nextcloud version being used
-        if 'version' in results['qsd'] and len(results['qsd']['version']):
-            results['version'] = \
-                NotifyNextcloud.unquote(results['qsd']['version'])
+        if "version" in results["qsd"] and len(results["qsd"]["version"]):
+            results["version"] = NotifyNextcloud.unquote(
+                results["qsd"]["version"]
+            )
 
         # Support URL Prefixes
-        if 'url_prefix' in results['qsd'] \
-                and len(results['qsd']['url_prefix']):
-            results['url_prefix'] = \
-                NotifyNextcloud.unquote(results['qsd']['url_prefix'])
+        if "url_prefix" in results["qsd"] and len(
+            results["qsd"]["url_prefix"]
+        ):
+            results["url_prefix"] = NotifyNextcloud.unquote(
+                results["qsd"]["url_prefix"]
+            )
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {
+        results["headers"] = {
             NotifyNextcloud.unquote(x): NotifyNextcloud.unquote(y)
-            for x, y in results['qsd+'].items()}
+            for x, y in results["qsd+"].items()
+        }
 
         return results
diff --git a/libs/apprise/plugins/nextcloudtalk.py b/libs/apprise/plugins/nextcloudtalk.py
index 3d5fc4d532..03da7bdf63 100644
--- a/libs/apprise/plugins/nextcloudtalk.py
+++ b/libs/apprise/plugins/nextcloudtalk.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,35 +25,34 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from json import dumps
+
 import requests
 
-from json import dumps
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import parse_list
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_list
+from .base import NotifyBase
 
 
 class NotifyNextcloudTalk(NotifyBase):
-    """
-    A wrapper for Nextcloud Talk Notifications
-    """
+    """A wrapper for Nextcloud Talk Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = _('Nextcloud Talk')
+    service_name = _("Nextcloud Talk")
 
     # The services URL
-    service_url = 'https://nextcloud.com/talk'
+    service_url = "https://nextcloud.com/talk"
 
     # Insecure protocol (for those self hosted requests)
-    protocol = 'nctalk'
+    protocol = "nctalk"
 
     # The default protocol (this is secure for notica)
-    secure_protocol = 'nctalks'
+    secure_protocol = "nctalks"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_nextcloudtalk'
+    setup_url = "https://appriseit.com/services/nextcloudtalk/"
 
     # Nextcloud title length
     title_maxlen = 255
@@ -64,70 +62,74 @@ class NotifyNextcloudTalk(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_room_id": {
+                "name": _("Room ID"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-            'required': True,
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_room_id': {
-            'name': _('Room ID'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'url_prefix': {
-            'name': _('URL Prefix'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "url_prefix": {
+                "name": _("URL Prefix"),
+                "type": "string",
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
     }
 
     def __init__(self, targets=None, headers=None, url_prefix=None, **kwargs):
-        """
-        Initialize Nextcloud Talk Object
-        """
+        """Initialize Nextcloud Talk Object."""
         super().__init__(**kwargs)
 
         if self.user is None or self.password is None:
-            msg = 'User and password have to be specified.'
+            msg = "A NextCloudTalk User and Password must be specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -135,8 +137,7 @@ def __init__(self, targets=None, headers=None, url_prefix=None, **kwargs):
         self.targets = parse_list(targets)
 
         # Support URL Prefix
-        self.url_prefix = '' if not url_prefix \
-            else url_prefix.strip('/')
+        self.url_prefix = "" if not url_prefix else url_prefix.strip("/")
 
         self.headers = {}
         if headers:
@@ -145,23 +146,22 @@ def __init__(self, targets=None, headers=None, url_prefix=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Nextcloud Talk Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Nextcloud Talk Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
             self.logger.warning(
-                'There were no Nextcloud Talk targets to notify.')
+                "There were no Nextcloud Talk targets to notify."
+            )
             return False
 
         # Prepare our Header
         headers = {
-            'User-Agent': self.app_id,
-            'OCS-APIRequest': 'true',
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "OCS-APIRequest": "true",
+            "Accept": "application/json",
+            "Content-Type": "application/json",
         }
 
         # Apply any/all header over-rides defined
@@ -178,32 +178,40 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Prepare our Payload
             if not body:
                 payload = {
-                    'message': title if title else self.app_desc,
+                    "message": title if title else self.app_desc,
                 }
             else:
                 payload = {
-                    'message': title + '\r\n' + body
-                    if title else self.app_desc + '\r\n' + body,
+                    "message": (
+                        title + "\r\n" + body
+                        if title
+                        else self.app_desc + "\r\n" + body
+                    ),
                 }
 
             # Nextcloud Talk URL
-            notify_url = '{schema}://{host}/{url_prefix}'\
-                         '/ocs/v2.php/apps/spreed/api/v1/chat/{target}'
+            notify_url = (
+                "{schema}://{host}/{url_prefix}"
+                f"/ocs/v2.php/apps/spreed/api/v1/chat/{target}"
+            )
 
             notify_url = notify_url.format(
-                schema='https' if self.secure else 'http',
-                host=self.host if not isinstance(self.port, int)
-                else '{}:{}'.format(self.host, self.port),
+                schema="https" if self.secure else "http",
+                host=(
+                    self.host
+                    if not isinstance(self.port, int)
+                    else f"{self.host}:{self.port}"
+                ),
                 url_prefix=self.url_prefix,
                 target=target,
             )
 
             self.logger.debug(
-                'Nextcloud Talk POST URL: %s (cert_verify=%r)',
-                notify_url, self.verify_certificate)
-            self.logger.debug(
-                'Nextcloud Talk Payload: %s',
-                str(payload))
+                "Nextcloud Talk POST URL: %s (cert_verify=%r)",
+                notify_url,
+                self.verify_certificate,
+            )
+            self.logger.debug("Nextcloud Talk Payload: %s", payload)
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -218,34 +226,39 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     timeout=self.request_timeout,
                 )
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyNextcloudTalk.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyNextcloudTalk.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Nextcloud Talk notification:'
-                        '{}{}error={}.'.format(
+                        "Failed to send Nextcloud Talk notification:"
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
                     # track our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Nextcloud Talk notification.')
+                    self.logger.info("Sent Nextcloud Talk notification.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Nextcloud Talk '
-                    'notification.')
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Nextcloud Talk "
+                    "notification."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # track our failure
                 has_error = True
@@ -255,67 +268,65 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our default set of parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
         if self.url_prefix:
-            params['url_prefix'] = self.url_prefix
+            params["url_prefix"] = self.url_prefix
 
         # Determine Authentication
-        auth = '{user}:{password}@'.format(
-            user=NotifyNextcloudTalk.quote(self.user, safe=''),
+        auth = "{user}:{password}@".format(
+            user=NotifyNextcloudTalk.quote(self.user, safe=""),
             password=self.pprint(
-                self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                self.password, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
         )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}/{targets}?{params}' \
-               .format(
-                   schema=self.secure_protocol
-                   if self.secure else self.protocol,
-                   auth=auth,
-                   # never encode hostname since we're expecting it to be a
-                   # valid one
-                   hostname=self.host,
-                   port='' if self.port is None or self.port == default_port
-                        else ':{}'.format(self.port),
-                   targets='/'.join([NotifyNextcloudTalk.quote(x)
-                                     for x in self.targets]),
-                   params=NotifyNextcloudTalk.urlencode(params),
-               )
+        return "{schema}://{auth}{hostname}{port}/{targets}?{params}".format(
+            schema=self.secure_protocol if self.secure else self.protocol,
+            auth=auth,
+            # never encode hostname since we're expecting it to be a
+            # valid one
+            hostname=self.host,
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets="/".join(
+                [NotifyNextcloudTalk.quote(x) for x in self.targets]
+            ),
+            params=NotifyNextcloudTalk.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url)
         if not results:
@@ -323,19 +334,23 @@ def parse_url(url):
             return results
 
         # Fetch our targets
-        results['targets'] = \
-            NotifyNextcloudTalk.split_path(results['fullpath'])
+        results["targets"] = NotifyNextcloudTalk.split_path(
+            results["fullpath"]
+        )
 
         # Support URL Prefixes
-        if 'url_prefix' in results['qsd'] \
-                and len(results['qsd']['url_prefix']):
-            results['url_prefix'] = \
-                NotifyNextcloudTalk.unquote(results['qsd']['url_prefix'])
+        if "url_prefix" in results["qsd"] and len(
+            results["qsd"]["url_prefix"]
+        ):
+            results["url_prefix"] = NotifyNextcloudTalk.unquote(
+                results["qsd"]["url_prefix"]
+            )
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {
+        results["headers"] = {
             NotifyNextcloudTalk.unquote(x): NotifyNextcloudTalk.unquote(y)
-            for x, y in results['qsd+'].items()}
+            for x, y in results["qsd+"].items()
+        }
 
         return results
diff --git a/libs/apprise/plugins/notica.py b/libs/apprise/plugins/notica.py
index 7e860ca074..4375f447ef 100644
--- a/libs/apprise/plugins/notica.py
+++ b/libs/apprise/plugins/notica.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -41,25 +40,25 @@
 #       notica://abc123
 #
 import re
+
 import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NoticaMode:
-    """
-    Tracks if we're accessing the notica upstream server or a locally hosted
-    one.
-    """
+    """Tracks if we're accessing the notica upstream server or a locally hosted
+    one."""
+
     # We're dealing with a self hosted service
-    SELFHOSTED = 'selfhosted'
+    SELFHOSTED = "selfhosted"
 
     # We're dealing with the official hosted service at https://notica.us
-    OFFICIAL = 'official'
+    OFFICIAL = "official"
 
 
 # Define our Notica Modes
@@ -70,107 +69,103 @@ class NoticaMode:
 
 
 class NotifyNotica(NotifyBase):
-    """
-    A wrapper for Notica Notifications
-    """
+    """A wrapper for Notica Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Notica'
+    service_name = "Notica"
 
     # The services URL
-    service_url = 'https://notica.us/'
+    service_url = "https://notica.us/"
 
     # Insecure protocol (for those self hosted requests)
-    protocol = 'notica'
+    protocol = "notica"
 
     # The default protocol (this is secure for notica)
-    secure_protocol = 'noticas'
+    secure_protocol = "noticas"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_notica'
+    setup_url = "https://appriseit.com/services/notica/"
 
     # Notica URL
-    notify_url = 'https://notica.us/?{token}'
+    notify_url = "https://notica.us/?{token}"
 
     # Notica does not support a title
     title_maxlen = 0
 
     # Define object templates
     templates = (
-        '{schema}://{token}',
-
+        "{schema}://{token}",
         # Self-hosted notica servers
-        '{schema}://{host}/{token}',
-        '{schema}://{host}:{port}/{token}',
-        '{schema}://{user}@{host}/{token}',
-        '{schema}://{user}@{host}:{port}/{token}',
-        '{schema}://{user}:{password}@{host}/{token}',
-        '{schema}://{user}:{password}@{host}:{port}/{token}',
-
+        "{schema}://{host}/{token}",
+        "{schema}://{host}:{port}/{token}",
+        "{schema}://{user}@{host}/{token}",
+        "{schema}://{user}@{host}:{port}/{token}",
+        "{schema}://{user}:{password}@{host}/{token}",
+        "{schema}://{user}:{password}@{host}:{port}/{token}",
         # Self-hosted notica servers (with custom path)
-        '{schema}://{host}{path}/{token}',
-        '{schema}://{host}:{port}/{path}/{token}',
-        '{schema}://{user}@{host}/{path}/{token}',
-        '{schema}://{user}@{host}:{port}{path}/{token}',
-        '{schema}://{user}:{password}@{host}{path}/{token}',
-        '{schema}://{user}:{password}@{host}:{port}/{path}/{token}',
+        "{schema}://{host}{path}/{token}",
+        "{schema}://{host}:{port}/{path}/{token}",
+        "{schema}://{user}@{host}/{path}/{token}",
+        "{schema}://{user}@{host}:{port}{path}/{token}",
+        "{schema}://{user}:{password}@{host}{path}/{token}",
+        "{schema}://{user}:{password}@{host}:{port}/{path}/{token}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': r'^\?*(?P<token>[^/]+)\s*$'
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": r"^\?*(?P<token>[^/]+)\s*$",
+            },
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "path": {
+                "name": _("Path"),
+                "type": "string",
+                "map_to": "fullpath",
+                "default": "/",
+            },
         },
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'path': {
-            'name': _('Path'),
-            'type': 'string',
-            'map_to': 'fullpath',
-            'default': '/',
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
     }
 
     def __init__(self, token, headers=None, **kwargs):
-        """
-        Initialize Notica Object
-        """
+        """Initialize Notica Object."""
         super().__init__(**kwargs)
 
         # Token (associated with project)
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Notica Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Notica Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -178,9 +173,9 @@ def __init__(self, token, headers=None, **kwargs):
         self.mode = NoticaMode.SELFHOSTED if self.host else NoticaMode.OFFICIAL
 
         # prepare our fullpath
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = '/'
+            self.fullpath = "/"
 
         self.headers = {}
         if headers:
@@ -189,18 +184,16 @@ def __init__(self, token, headers=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Notica Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Notica Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded'
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
         }
 
         # Prepare our payload
-        payload = 'd:{}'.format(body)
+        payload = f"d:{body}"
 
         # Auth is used for SELFHOSTED queries
         auth = None
@@ -219,21 +212,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 auth = (self.user, self.password)
 
             # Set our schema
-            schema = 'https' if self.secure else 'http'
+            schema = "https" if self.secure else "http"
 
             # Prepare our notify_url
-            notify_url = '%s://%s' % (schema, self.host)
+            notify_url = f"{schema}://{self.host}"
             if isinstance(self.port, int):
-                notify_url += ':%d' % self.port
+                notify_url += f":{self.port}"
 
-            notify_url += '{fullpath}?token={token}'.format(
-                fullpath=self.fullpath,
-                token=self.token)
+            notify_url += f"{self.fullpath}?token={self.token}"
 
-        self.logger.debug('Notica POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Notica Payload: %s' % str(payload))
+        self.logger.debug(
+            "Notica POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Notica Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -249,29 +241,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyNotica.http_response_code_lookup(r.status_code)
+                status_str = NotifyNotica.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Notica notification:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Notica notification:{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Notica notification.')
+                self.logger.info("Sent Notica notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Notica notification.',
+                "A Connection error occurred sending Notica notification.",
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -280,111 +273,115 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.mode, self.token, self.user, self.password, self.host,
+            self.mode,
+            self.token,
+            self.user,
+            self.password,
+            self.host,
             self.port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if self.mode == NoticaMode.OFFICIAL:
             # Official URLs are easy to assemble
-            return '{schema}://{token}/?{params}'.format(
+            return "{schema}://{token}/?{params}".format(
                 schema=self.protocol,
-                token=self.pprint(self.token, privacy, safe=''),
+                token=self.pprint(self.token, privacy, safe=""),
                 params=NotifyNotica.urlencode(params),
             )
 
         # If we reach here then we are assembling a self hosted URL
 
         # Append URL parameters from our headers
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Authorization can be used for self-hosted sollutions
-        auth = ''
+        auth = ""
 
         # Determine Authentication
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyNotica.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyNotica.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyNotica.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyNotica.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}{token}/?{params}' \
-               .format(
-                   schema=self.secure_protocol
-                   if self.secure else self.protocol,
-                   auth=auth,
-                   hostname=NotifyNotica.quote(self.host, safe=''),
-                   port='' if self.port is None or self.port == default_port
-                        else ':{}'.format(self.port),
-                   fullpath=NotifyNotica.quote(
-                       self.fullpath, safe='/'),
-                   token=self.pprint(self.token, privacy, safe=''),
-                   params=NotifyNotica.urlencode(params),
-               )
+        return (
+            "{schema}://{auth}{hostname}{port}{fullpath}{token}/?{params}"
+            .format(
+                schema=self.secure_protocol if self.secure else self.protocol,
+                auth=auth,
+                hostname=NotifyNotica.quote(self.host, safe=""),
+                port=(
+                    ""
+                    if self.port is None or self.port == default_port
+                    else f":{self.port}"
+                ),
+                fullpath=NotifyNotica.quote(self.fullpath, safe="/"),
+                token=self.pprint(self.token, privacy, safe=""),
+                params=NotifyNotica.urlencode(params),
+            )
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Get unquoted entries
-        entries = NotifyNotica.split_path(results['fullpath'])
+        entries = NotifyNotica.split_path(results["fullpath"])
         if not entries:
             # If there are no path entries, then we're only dealing with the
             # official website
-            results['mode'] = NoticaMode.OFFICIAL
+            results["mode"] = NoticaMode.OFFICIAL
 
             # Store our token using the host
-            results['token'] = NotifyNotica.unquote(results['host'])
+            results["token"] = NotifyNotica.unquote(results["host"])
 
             # Unset our host
-            results['host'] = None
+            results["host"] = None
 
         else:
             # Otherwise we're running a self hosted instance
-            results['mode'] = NoticaMode.SELFHOSTED
+            results["mode"] = NoticaMode.SELFHOSTED
 
             # The last element in the list is our token
-            results['token'] = entries.pop()
+            results["token"] = entries.pop()
 
             # Re-assemble our full path
-            results['fullpath'] = \
-                '/' if not entries else '/{}/'.format('/'.join(entries))
+            results["fullpath"] = (
+                "/" if not entries else "/{}/".format("/".join(entries))
+            )
 
             # Add our headers that the user can potentially over-ride if they
             # wish to to our returned result set and tidy entries by unquoting
             # them
-            results['headers'] = {
+            results["headers"] = {
                 NotifyNotica.unquote(x): NotifyNotica.unquote(y)
-                for x, y in results['qsd+'].items()}
+                for x, y in results["qsd+"].items()
+            }
 
         return results
 
@@ -395,15 +392,23 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://notica\.us/?'
-            r'\??(?P<token>[^&]+)([&\s]*(?P<params>.+))?$', url, re.I)
+            r"^https?://notica\.us/?"
+            r"\??(?P<token>[^&]+)([&\s]*(?P<params>.+))?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyNotica.parse_url(
-                '{schema}://{token}/{params}'.format(
+                "{schema}://{token}/{params}".format(
                     schema=NotifyNotica.protocol,
-                    token=result.group('token'),
-                    params='' if not result.group('params')
-                    else '?{}'.format(result.group('params'))))
+                    token=result.group("token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else "?{}".format(result.group("params"))
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/notifiarr.py b/libs/apprise/plugins/notifiarr.py
index cd01a53f2d..fdf1dfe4c0 100644
--- a/libs/apprise/plugins/notifiarr.py
+++ b/libs/apprise/plugins/notifiarr.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,23 +25,22 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from itertools import chain
+from json import dumps
 import re
+
 import requests
-from json import dumps
-from itertools import chain
 
-from .base import NotifyBase
-from ..common import NotifyType
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
-from ..common import NotifyImageSize
-from ..utils.parse import parse_list, parse_bool, validate_regex
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 from .discord import USER_ROLE_DETECTION_RE
 
 # Used to break path apart into list of channels
-CHANNEL_LIST_DELIM = re.compile(r'[ \t\r\n,#\\/]+')
+CHANNEL_LIST_DELIM = re.compile(r"[ \t\r\n,#\\/]+")
 
-CHANNEL_REGEX = re.compile(
-    r'^\s*(\#|\%35)?(?P<channel>[0-9]+)', re.I)
+CHANNEL_REGEX = re.compile(r"^\s*(\#|\%35)?(?P<channel>[0-9]+)", re.I)
 
 # For API Details see:
 # https://notifiarr.wiki/Client/Installation
@@ -53,24 +51,22 @@
 
 
 class NotifyNotifiarr(NotifyBase):
-    """
-    A wrapper for Notifiarr Notifications
-    """
+    """A wrapper for Notifiarr Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Notifiarr'
+    service_name = "Notifiarr"
 
     # The services URL
-    service_url = 'https://notifiarr.com/'
+    service_url = "https://notifiarr.com/"
 
     # The default secure protocol
-    secure_protocol = 'notifiarr'
+    secure_protocol = "notifiarr"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_notifiarr'
+    setup_url = "https://appriseit.com/services/notifiarr/"
 
     # The Notification URL
-    notify_url = 'https://notifiarr.com/api/v1/notification/apprise'
+    notify_url = "https://notifiarr.com/api/v1/notification/apprise"
 
     # Notifiarr Throttling (knowing in advance reduces 429 responses)
     # define('NOTIFICATION_LIMIT_SECOND_USER', 5);
@@ -83,85 +79,93 @@ class NotifyNotifiarr(NotifyBase):
     image_size = NotifyImageSize.XY_256
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}/{targets}',
-    )
+    templates = ("{schema}://{apikey}/{targets}",)
 
     # Define our apikeys; these are the minimum apikeys required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('Token'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-        },
-        'target_channel': {
-            'name': _('Target Channel'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("Token"),
+                "type": "string",
+                "required": True,
+                "private": True,
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'key': {
-            'alias_of': 'apikey',
-        },
-        'apikey': {
-            'alias_of': 'apikey',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "key": {
+                "alias_of": "apikey",
+            },
+            "apikey": {
+                "alias_of": "apikey",
+            },
+            "event": {
+                "name": _("Discord Event ID"),
+                "type": "int",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            "source": {
+                "name": _("Source"),
+                "type": "string",
+            },
+            "from": {"alias_of": "source"},
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'event': {
-            'name': _('Discord Event ID'),
-            'type': 'int',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-        'source': {
-            'name': _('Source'),
-            'type': 'string',
-        },
-        'from': {
-            'alias_of': 'source'
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, apikey=None, include_image=None,
-                 event=None, targets=None, source=None, **kwargs):
-        """
-        Initialize Notifiarr Object
+    def __init__(
+        self,
+        apikey=None,
+        include_image=None,
+        event=None,
+        targets=None,
+        source=None,
+        **kwargs,
+    ):
+        """Initialize Notifiarr Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
         self.apikey = apikey
         if not self.apikey:
-            msg = 'An invalid Notifiarr APIKey ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Notifiarr APIKey ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Place a thumbnail image inline with the message body
-        self.include_image = include_image \
-            if isinstance(include_image, bool) \
-            else self.template_args['image']['default']
+        self.include_image = (
+            include_image
+            if isinstance(include_image, bool)
+            else self.template_args["image"]["default"]
+        )
 
         # Prepare our source (if set)
         self.source = validate_regex(source)
@@ -172,38 +176,39 @@ def __init__(self, apikey=None, include_image=None,
                 self.event = int(event)
 
             except (ValueError, TypeError):
-                msg = 'An invalid Notifiarr Discord Event ID ' \
-                      '({}) was specified.'.format(event)
+                msg = (
+                    "An invalid Notifiarr Discord Event ID "
+                    f"({event}) was specified."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
         # Prepare our targets
         self.targets = {
-            'channels': [],
-            'invalid': [],
+            "channels": [],
+            "invalid": [],
         }
 
         for target in parse_list(targets):
             result = CHANNEL_REGEX.match(target)
             if result:
                 # Store role information
-                self.targets['channels'].append(int(result.group('channel')))
+                self.targets["channels"].append(int(result.group("channel")))
                 continue
 
             self.logger.warning(
-                'Dropped invalid channel '
-                '({}) specified.'.format(target),
+                f"Dropped invalid channel ({target}) specified.",
             )
-            self.targets['invalid'].append(target)
+            self.targets["invalid"].append(target)
 
         return
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
@@ -211,47 +216,43 @@ def url_identifier(self):
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
+            "image": "yes" if self.include_image else "no",
         }
 
         if self.source:
-            params['source'] = self.source
+            params["source"] = self.source
 
         if self.event:
-            params['event'] = self.event
+            params["event"] = self.event
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{apikey}' \
-            '/{targets}?{params}'.format(
-                schema=self.secure_protocol,
-                apikey=self.pprint(self.apikey, privacy, safe=''),
-                targets='/'.join(
-                    [NotifyNotifiarr.quote(x, safe='+#@') for x in chain(
-                        # Channels
-                        ['#{}'.format(x) for x in self.targets['channels']],
-                        # Pass along the same invalid entries as were provided
-                        self.targets['invalid'],
-                    )]),
-                params=NotifyNotifiarr.urlencode(params),
-            )
+        return "{schema}://{apikey}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join([
+                NotifyNotifiarr.quote(x, safe="+#@")
+                for x in chain(
+                    # Channels
+                    [f"#{x}" for x in self.targets["channels"]],
+                    # Pass along the same invalid entries as were provided
+                    self.targets["invalid"],
+                )
+            ]),
+            params=NotifyNotifiarr.urlencode(params),
+        )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Notifiarr Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Notifiarr Notification."""
 
-        if not self.targets['channels']:
+        if not self.targets["channels"]:
             # There were no services to notify
-            self.logger.warning(
-                'There were no Notifiarr channels to notify.')
+            self.logger.warning("There were no Notifiarr channels to notify.")
             return False
 
         # No error to start with
@@ -262,65 +263,73 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Define our mentions
         mentions = {
-            'pingUser': [],
-            'pingRole': [],
-            'content': [],
+            "pingUser": [],
+            "pingRole": [],
+            "content": [],
         }
 
         # parse for user id's <@123> and role IDs <@&456>
         results = USER_ROLE_DETECTION_RE.findall(body)
         if results:
-            for (is_role, no, value) in results:
+            for is_role, no, value in results:
                 if value:
                     # @everybody, @admin, etc - unsupported
-                    mentions['content'].append(f'@{value}')
+                    mentions["content"].append(f"@{value}")
 
                 elif is_role:
-                    mentions['pingRole'].append(no)
-                    mentions['content'].append(f'<@&{no}>')
+                    mentions["pingRole"].append(no)
+                    mentions["content"].append(f"<@&{no}>")
 
                 else:  # is_user
-                    mentions['pingUser'].append(no)
-                    mentions['content'].append(f'<@{no}>')
+                    mentions["pingUser"].append(no)
+                    mentions["content"].append(f"<@{no}>")
 
-        for idx, channel in enumerate(self.targets['channels']):
+        for _idx, channel in enumerate(self.targets["channels"]):
             # prepare Notifiarr Object
             payload = {
-                'source': self.source if self.source else self.app_id,
-                'type': notify_type,
-                'notification': {
-                    'update': True if self.event else False,
-                    'name': self.app_id,
-                    'event': str(self.event)
-                    if self.event else "",
+                "source": self.source if self.source else self.app_id,
+                "type": notify_type.value,
+                "notification": {
+                    "update": bool(self.event),
+                    "name": self.app_id,
+                    "event": str(self.event) if self.event else "",
                 },
-                'discord': {
-                    'color': self.color(notify_type),
-                    'ping': {
+                "discord": {
+                    "color": self.color(notify_type),
+                    "ping": {
                         # Only 1 user is supported, so truncate the rest
-                        'pingUser': 0 if not mentions['pingUser']
-                        else mentions['pingUser'][0],
+                        "pingUser": (
+                            0
+                            if not mentions["pingUser"]
+                            else mentions["pingUser"][0]
+                        ),
                         # Only 1 role is supported, so truncate the rest
-                        'pingRole': 0 if not mentions['pingRole']
-                        else mentions['pingRole'][0],
+                        "pingRole": (
+                            0
+                            if not mentions["pingRole"]
+                            else mentions["pingRole"][0]
+                        ),
                     },
-                    'text': {
-                        'title': title,
-                        'content': '' if not mentions['content']
-                        else '๐Ÿ‘‰ ' + ' '.join(mentions['content']),
-                        'description': body,
-                        'footer': self.app_desc,
+                    "text": {
+                        "title": title,
+                        "content": (
+                            ""
+                            if not mentions["content"]
+                            else "๐Ÿ‘‰ " + " ".join(mentions["content"])
+                        ),
+                        "description": body,
+                        "footer": self.app_desc,
                     },
-                    'ids': {
-                        'channel': channel,
-                    }
-                }
+                    "ids": {
+                        "channel": channel,
+                    },
+                },
             }
 
             if self.include_image and image_url:
-                payload['discord']['text']['icon'] = image_url
-                payload['discord']['images'] = {
-                    'thumbnail': image_url,
+                payload["discord"]["text"]["icon"] = image_url
+                payload["discord"]["images"] = {
+                    "thumbnail": image_url,
                 }
 
             if not self._send(payload):
@@ -329,20 +338,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def _send(self, payload):
-        """
-        Send notification
-        """
-        self.logger.debug('Notifiarr POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Notifiarr Payload: %s' % str(payload))
+        """Send notification."""
+        self.logger.debug(
+            "Notifiarr POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Notifiarr Payload: {payload!s}")
 
         # Prepare HTTP Headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'text/plain',
-            'X-api-Key': self.apikey,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "text/plain",
+            "X-api-Key": self.apikey,
         }
 
         # Always call throttle before any remote server i/o is made
@@ -358,29 +366,32 @@ def _send(self, payload):
             )
             if r.status_code < 200 or r.status_code >= 300:
                 # We had a problem
-                status_str = \
-                    NotifyNotifiarr.http_response_code_lookup(r.status_code)
+                status_str = NotifyNotifiarr.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Notifiarr %s notification: '
-                    '%serror=%s.',
+                    "Failed to send Notifiarr %s notification: %serror=%s.",
                     status_str,
-                    ', ' if status_str else '',
-                    str(r.status_code))
+                    ", " if status_str else "",
+                    r.status_code,
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Notifiarr notification.')
+                self.logger.info("Sent Notifiarr notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Notifiarr '
-                'Chat notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Notifiarr "
+                f"Chat notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -388,73 +399,71 @@ def _send(self, payload):
         return True
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
-        targets = len(self.targets['channels']) + len(self.targets['invalid'])
+        """Returns the number of targets associated with this notification."""
+        targets = len(self.targets["channels"]) + len(self.targets["invalid"])
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Get channels
-        results['targets'] = NotifyNotifiarr.split_path(results['fullpath'])
+        results["targets"] = NotifyNotifiarr.split_path(results["fullpath"])
 
-        if 'event' in results['qsd'] and \
-                len(results['qsd']['event']):
-            results['event'] = \
-                NotifyNotifiarr.unquote(results['qsd']['event'])
+        if "event" in results["qsd"] and len(results["qsd"]["event"]):
+            results["event"] = NotifyNotifiarr.unquote(results["qsd"]["event"])
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', False))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", False)
+        )
 
         # Track if we need to extract the hostname as a target
         host_is_potential_target = False
 
-        if 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifyNotifiarr.unquote(results['qsd']['source'])
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifyNotifiarr.unquote(
+                results["qsd"]["source"]
+            )
 
-        elif 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyNotifiarr.unquote(results['qsd']['from'])
+        elif "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyNotifiarr.unquote(results["qsd"]["from"])
 
         # Set our apikey if found as an argument
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
-            results['apikey'] = \
-                NotifyNotifiarr.unquote(results['qsd']['apikey'])
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = NotifyNotifiarr.unquote(
+                results["qsd"]["apikey"]
+            )
 
             host_is_potential_target = True
 
-        elif 'key' in results['qsd'] and len(results['qsd']['key']):
-            results['apikey'] = \
-                NotifyNotifiarr.unquote(results['qsd']['key'])
+        elif "key" in results["qsd"] and len(results["qsd"]["key"]):
+            results["apikey"] = NotifyNotifiarr.unquote(results["qsd"]["key"])
 
             host_is_potential_target = True
 
         else:
             # Pop the first element (this is the api key)
-            results['apikey'] = \
-                NotifyNotifiarr.unquote(results['host'])
+            results["apikey"] = NotifyNotifiarr.unquote(results["host"])
 
-        if host_is_potential_target is True and results['host']:
-            results['targets'].append(NotifyNotifiarr.unquote(results['host']))
+        if host_is_potential_target is True and results["host"]:
+            results["targets"].append(NotifyNotifiarr.unquote(results["host"]))
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += [x for x in filter(
-                bool, CHANNEL_LIST_DELIM.split(
-                    NotifyNotifiarr.unquote(results['qsd']['to'])))]
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += list(
+                filter(
+                    bool,
+                    CHANNEL_LIST_DELIM.split(
+                        NotifyNotifiarr.unquote(results["qsd"]["to"])
+                    ),
+                )
+            )
 
         return results
diff --git a/libs/apprise/plugins/notificationapi.py b/libs/apprise/plugins/notificationapi.py
new file mode 100644
index 0000000000..370e651df8
--- /dev/null
+++ b/libs/apprise/plugins/notificationapi.py
@@ -0,0 +1,951 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Simple API Reference:
+#  - https://www.notificationapi.com/docs/reference/server#send
+
+from __future__ import annotations
+
+import base64
+from email.utils import formataddr
+from itertools import chain
+from json import dumps, loads
+import re
+
+import requests
+
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
+from ..conversion import convert_between
+from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_email,
+    is_phone_no,
+    parse_emails,
+    parse_list,
+    validate_regex,
+)
+from .base import NotifyBase
+
+# Used to detect ID
+IS_VALID_ID_RE = re.compile(
+    r"^\s*(@|%40)?(?P<id>[\w_-]+)\s*$", re.I)
+
+
+class NotificationAPIRegion:
+    """Regions."""
+
+    CA = "ca"
+    US = "us"
+    EU = "eu"
+
+
+# NotificationAPI endpoints
+NOTIFICATIONAPI_API_LOOKUP = {
+    NotificationAPIRegion.US: "https://api.notificationapi.com",
+    NotificationAPIRegion.CA: "https://api.ca.notificationapi.com",
+    NotificationAPIRegion.EU: "https://api.eu.notificationapi.com",
+}
+
+# A List of our regions we can use for verification
+NOTIFICATIONAPI_REGIONS = (
+    NotificationAPIRegion.US,
+    NotificationAPIRegion.CA,
+    NotificationAPIRegion.EU,
+)
+
+
+class NotificationAPIChannel:
+    """Channels"""
+
+    EMAIL = "email"
+    SMS = "sms"
+    INAPP = "inapp"
+    WEB_PUSH = "web_push"
+    MOBILE_PUSH = "mobile_push"
+    SLACK = "slack"
+
+
+# A List of our channels we can use for verification
+NOTIFICATIONAPI_CHANNELS: frozenset[str] = frozenset([
+    NotificationAPIChannel.EMAIL,
+    NotificationAPIChannel.SMS,
+    NotificationAPIChannel.INAPP,
+    NotificationAPIChannel.WEB_PUSH,
+    NotificationAPIChannel.MOBILE_PUSH,
+    NotificationAPIChannel.SLACK,
+])
+
+
+class NotificationAPIMode:
+    """Modes"""
+
+    TEMPLATE = "template"
+    MESSAGE = "message"
+
+
+# A List of our channels we can use for verification
+NOTIFICATIONAPI_MODES: frozenset[str] = frozenset([
+    NotificationAPIMode.TEMPLATE,
+    NotificationAPIMode.MESSAGE,
+])
+
+
+class NotifyNotificationAPI(NotifyBase):
+    """
+    A wrapper for NotificationAPI Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = "NotificationAPI"
+
+    # The services URL
+    service_url = "https://www.notificationapi.com/"
+
+    # The default secure protocol
+    secure_protocol = ("napi", "notificationapi")
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/notificationapi/"
+
+    # If no NotificationAPI Message Type is specified, then the following is
+    # used
+    default_message_type = "apprise"
+
+    # Allow 300 requests per minute.
+    # 60/300 = 0.2
+    request_rate_per_sec = 0.2
+
+    # Allows the user to specify the NotifyImageSize object
+    image_size = NotifyImageSize.XY_72
+
+    # Define object templates
+    templates = (
+        "{schema}://{client_id}/{client_secret}/{targets}",
+        "{schema}://{type}@{client_id}/{client_secret}/{targets}",
+    )
+
+    # Explicit URL tokens we care about (all others from base are ignored)
+    template_tokens = dict(NotifyBase.template_tokens, **{
+        "type": {
+            "name": _("Message Type"),
+            "type": "string",
+            "regex": (r"^[A-Z0-9_-]+$", "i"),
+            "required": True,
+            "map_to": "message_type",
+        },
+        "client_id": {
+            "name": _("Client ID"),
+            "type": "string",
+            "required": True,
+        },
+        "client_secret": {
+            "name": _("Client Secret"),
+            "type": "string",
+            "required": True,
+            "private": True,
+        },
+        "target_email": {
+            "name": _("Target Email"),
+            "type": "string",
+            "map_to": "targets",
+        },
+        "target_id": {
+            "name": _("Target ID"),
+            "type": "string",
+            "map_to": "targets",
+        },
+        "target_sms": {
+            "name": _("Target SMS"),
+            "type": "string",
+            "map_to": "targets",
+        },
+        "targets": {
+            "name": _("Targets"),
+            "type": "list:string",
+        },
+    })
+
+    # Supported query args
+    template_args = dict(NotifyBase.template_args, **{
+        "type": {
+            "alias_of": "type",
+        },
+        "channels": {
+            "name": _("Channels"),
+            "type": "list:string",
+            "values": NOTIFICATIONAPI_CHANNELS,
+        },
+        "region": {
+            "name": _("Region Name"),
+            "type": "choice:string",
+            "values": NOTIFICATIONAPI_REGIONS,
+            "default": NotificationAPIRegion.US,
+        },
+        "mode": {
+            "name": _("Mode"),
+            "type": "choice:string",
+            "values": NOTIFICATIONAPI_MODES,
+        },
+        "to": {
+            "alias_of": "targets",
+        },
+        # Email Values
+        "cc": {
+            "name": _("Carbon Copy"),
+            "type": "list:string",
+        },
+        "bcc": {
+            "name": _("Blind Carbon Copy"),
+            "type": "list:string",
+        },
+        "reply": {
+            "name": _("Reply To"),
+            "type": "string",
+            "map_to": "reply_to",
+        },
+        "from": {
+            "name": _("From Email"),
+            "type": "string",
+            "map_to": "from_addr",
+        },
+        "id": {
+            "alias_of": "client_id",
+        },
+        "secret": {
+            "alias_of": "client_secret",
+        }
+    })
+
+    # Define our token control
+    template_kwargs = {
+        "tokens": {
+            "name": _("Template Tokens"),
+            "prefix": ":",
+        },
+    }
+
+    def __init__(self, client_id, client_secret, message_type=None,
+                 targets=None, cc=None, bcc=None, reply_to=None,
+                 channels=None, region=None, mode=None, from_addr=None,
+                 tokens=None, **kwargs):
+        """
+        Initialize Notify NotificationAPI Object
+        """
+        super().__init__(**kwargs)
+
+        # Client ID
+        self.client_id = validate_regex(client_id)
+        if not self.client_id:
+            msg = "An invalid NotificationAPI Client ID " \
+                  "({}) was specified.".format(client_id)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Client Secret
+        self.client_secret = validate_regex(client_secret)
+        if not self.client_secret:
+            msg = "An invalid NotificationAPI Client Secret " \
+                  "({}) was specified.".format(client_secret)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # For tracking our email -> name lookups
+        self.names = {}
+
+        # Prepare our From Address
+        from_addr_ = [self.app_id, ""]
+        self.from_addr = None
+        if isinstance(from_addr, str):
+            result = is_email(from_addr)
+            if result:
+                from_addr_ = (
+                    result["name"] if result["name"] else from_addr_[0],
+                    result["full_email"])
+            else:
+                # Only update the string but use the already detected info
+                from_addr_[0] = from_addr
+
+                # Store our lookup
+            self.from_addr = from_addr_[1]
+        self.names[from_addr_[1]] = from_addr_[0]
+
+        # Prepare our Reply-To Address
+        self.reply_to = {}
+        if isinstance(reply_to, str):
+            result = is_email(reply_to)
+            if result and "full_email" in result:
+                self.reply_to = {
+                    "senderName": result["name"]
+                    if result["name"] else from_addr_[0],
+                    "senderEmail": result["full_email"],
+                }
+
+        # Our Targets are delimited by found ids
+        self.targets = []
+        if mode and isinstance(mode, str):
+            self.mode = next(
+                (a for a in NOTIFICATIONAPI_MODES if a.startswith(mode)), None
+            )
+            if self.mode not in NOTIFICATIONAPI_MODES:
+                msg = \
+                    f"The NotificationAPI mode specified ({mode}) is invalid."
+                self.logger.warning(msg)
+                raise TypeError(msg)
+        else:
+            # Detect mode based on whether or not a message_type was provided
+            self.mode = NotificationAPIMode.MESSAGE if not message_type else \
+                NotificationAPIMode.TEMPLATE
+
+        if not message_type:
+            # Assign a default message type
+            self.message_type = self.default_message_type
+
+        else:
+            self.message_type = validate_regex(
+                message_type, *self.template_tokens["type"]["regex"])
+            if not self.message_type:
+                msg = "An invalid NotificationAPI Message Type " \
+                      "({}) was specified.".format(message_type)
+                self.logger.warning(msg)
+                raise TypeError(msg)
+
+        # Precompute auth header
+        # Ruby/docs show POST "/{client_id}/sender" with:
+        #      Basic base64(client_id:client_secret)
+        # https://www.notificationapi.com/docs/reference/server
+        token = base64.b64encode(
+            f"{self.client_id}:{self.client_secret}".encode()).decode("ascii")
+        self.auth_header = f"Basic {token}"
+
+        # Acquire Carbon Copies
+        self.cc = set()
+
+        # Acquire Blind Carbon Copies
+        self.bcc = set()
+
+        # Store our region
+        try:
+            self.region = (
+                self.template_args["region"]["default"]
+                if region is None else region.lower()
+            )
+
+            if self.region not in NOTIFICATIONAPI_REGIONS:
+                # allow the outer except to handle this common response
+                raise IndexError()
+
+        except (AttributeError, IndexError, TypeError):
+            # Invalid region specified
+            msg = \
+                f"The NotificationAPI region specified ({region}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg) from None
+
+        # Initialize an empty set of channels
+        self.channels = set()
+        for channel_ in parse_list(channels):
+            channel = channel_.lower()
+            if channel not in NOTIFICATIONAPI_CHANNELS:
+                # Invalid channel specified
+                msg = (
+                    "The NotificationAPI forced channel specified "
+                    f"({channel}) is invalid.")
+                self.logger.warning(msg)
+                raise TypeError(msg) from None
+            self.channels.add(channel)
+
+        # Used for URL generation afterwards only
+        self._invalid_targets = []
+
+        if targets:
+            current_target = {}
+            for entry in parse_list(targets, sort=False):
+                result = is_email(entry)
+                if result:
+                    if "email" not in current_target:
+                        current_target["email"] = result["full_email"]
+                        if not self.channels:
+                            self.channels.add(NotificationAPIChannel.EMAIL)
+                            self.logger.info(
+                                "The NotificationAPI default channel of "
+                                f"{NotificationAPIChannel.EMAIL} was set.")
+                        continue
+
+                    elif "id" in current_target:
+                        # Store and move on
+                        self.targets.append(current_target)
+                        current_target = {
+                            "email": result["full_email"]
+                        }
+                        continue
+
+                    # if we got here, we have to many emails making it now
+                    # ambiguous as to who the sender intended to notify
+                    msg = (
+                        "The NotificationAPI received too many emails "
+                        "creating an ambiguous situation; aborted at "
+                        f"'{entry}'.")
+                    self.logger.warning(msg)
+                    raise TypeError(msg) from None
+
+                result = is_phone_no(entry)
+                if result:
+                    if "number" not in current_target:
+                        current_target["number"] = \
+                            ("+" if entry[0] == "+" else "") + result["full"]
+                        if not self.channels:
+                            self.channels.add(NotificationAPIChannel.SMS)
+                            self.logger.info(
+                                "The NotificationAPI default channel of "
+                                f"{NotificationAPIChannel.SMS} was set.")
+                        continue
+
+                    elif "id" in current_target:
+                        # Store and move on
+                        self.targets.append(current_target)
+                        current_target = {
+                            "number": result["full"]
+                        }
+                        continue
+
+                    # if we got here, we have to many emails making it now
+                    # ambiguous as to who the sender intended to notify
+                    msg = (
+                        "The NotificationAPI received too many phone no's "
+                        "creating an ambiguous situation; aborted at "
+                        f"'{entry}'.")
+                    self.logger.warning(msg)
+                    raise TypeError(msg) from None
+
+                result = IS_VALID_ID_RE.match(entry)
+                if result:
+                    if "id" not in current_target:
+                        current_target["id"] = result.group("id")
+                        continue
+
+                    # Store id in next target and move on
+                    self.targets.append(current_target)
+                    current_target = {
+                        "id": result.group("id")
+                    }
+                    continue
+
+                self.logger.warning(
+                    "Dropped invalid NotificationAPI target "
+                    f"({entry}) specified")
+                self._invalid_targets.append(entry)
+                continue
+
+            if "id" in current_target:
+                # Store our final entry
+                self.targets.append(current_target)
+                current_target = {}
+
+            if current_target:
+                # we have email or sms, but no id to go with it
+                msg = (
+                    "The NotificationAPI did not detect an id to "
+                    "correlate the following with {}".format(
+                        str(current_target)))
+                self.logger.warning(msg)
+                raise TypeError(msg) from None
+
+        # Validate recipients (cc:) and drop bad ones:
+        for recipient in parse_emails(cc):
+            result = is_email(recipient)
+            if result:
+                self.cc.add(result["full_email"])
+                if result["name"]:
+                    self.names[result["full_email"]] = result["name"]
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Carbon Copy email "
+                "({}) specified.".format(recipient),
+            )
+
+        # Validate recipients (bcc:) and drop bad ones:
+        for recipient in parse_emails(bcc):
+
+            result = is_email(recipient)
+            if result:
+                self.bcc.add(result["full_email"])
+                if result["name"]:
+                    self.names[result["full_email"]] = result["name"]
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Blind Carbon Copy email "
+                "({}) specified.".format(recipient),
+            )
+
+        # Template functionality
+        self.tokens = {}
+        if isinstance(tokens, dict):
+            self.tokens.update(tokens)
+
+        return
+
+    @property
+    def url_identifier(self):
+        """
+        Returns all of the identifiers that make this URL unique from
+        another similar one. Targets or end points should never be identified
+        here.
+        """
+        return (self.secure_protocol[0], self.client_id, self.client_secret)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {
+            "mode": self.mode,
+        }
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        if len(self.cc) > 0:
+            # Handle our Carbon Copy Addresses
+            params["cc"] = ",".join([
+                formataddr(
+                    (self.names.get(e, False), e),
+                    # Swap comma for it's escaped url code (if detected) since
+                    # we're using that as a delimiter
+                    charset="utf-8").replace(",", "%2C")
+                for e in self.cc])
+
+        if len(self.bcc) > 0:
+            # Handle our Blind Carbon Copy Addresses
+            params["bcc"] = ",".join([
+                formataddr(
+                    (self.names.get(e, False), e),
+                    # Swap comma for it's escaped url code (if detected) since
+                    # we're using that as a delimiter
+                    charset="utf-8").replace(",", "%2C")
+                for e in self.bcc])
+
+        if self.reply_to:
+            # Handle our Reply-To Address
+            params["reply"] = formataddr(
+                (self.reply_to["senderName"], self.reply_to["senderEmail"]),
+                # Swap comma for its escaped url code (if detected) since
+                # we're using that as a delimiter
+                charset="utf-8",
+            )
+
+        if self.channels:
+            # Prepare our default channel
+            params["channels"] = ",".join(self.channels)
+
+        if self.region != self.template_args["region"]["default"]:
+            # Prepare our default region
+            params["region"] = self.region
+
+        # handle from=
+        if self.from_addr and self.names[self.from_addr] != self.app_id:
+            params["from"] = self.names[self.from_addr]
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+        # Store any template entries if specified
+        params.update({f":{k}": v for k, v in self.tokens.items()})
+
+        targets = []
+        for target in self.targets:
+            # ID is always present
+            targets.append(f"@{target['id']}")
+            if "number" in target:
+                targets.append(f"{target['number']}")
+            if "email" in target:
+                targets.append(f"{target['email']}")
+
+        mtype = f"{self.message_type}@" \
+            if self.message_type != self.default_message_type else ""
+        return "{schema}://{mtype}{cid}/{secret}/{targets}?{params}".format(
+            schema=self.secure_protocol[0],
+            mtype=mtype,
+            cid=self.pprint(self.client_id, privacy, safe=""),
+            secret=self.pprint(self.client_secret, privacy, safe=""),
+            targets=NotifyNotificationAPI.quote("/".join(
+                chain(targets, self._invalid_targets)), safe="/"),
+            params=NotifyNotificationAPI.urlencode(params),
+        )
+
+    def __len__(self):
+        """
+        Returns the number of targets associated with this notification
+        """
+
+        return max(1, len(self.targets))
+
+    def gen_payload(self, body, title="", notify_type=NotifyType.INFO,
+                    **kwargs):
+        """
+        generates our NotificationAPI payload
+        """
+
+        payload_ = {
+            "type": self.message_type,
+        }
+        if self.mode == NotificationAPIMode.TEMPLATE:
+            # Take a copy of our token dictionary
+            parameters = self.tokens.copy()
+
+            # Apply some defaults template values
+            parameters["appBody"] = body
+            parameters["appTitle"] = title
+            parameters["appType"] = notify_type.value
+            parameters["appId"] = self.app_id
+            parameters["appDescription"] = self.app_desc
+            parameters["appColor"] = self.color(notify_type)
+            parameters["appImageUrl"] = self.image_url(notify_type)
+            parameters["appUrl"] = self.app_url
+
+            # A Simple Email Payload Template
+            payload_.update({
+                "parameters": {**parameters},
+            })
+
+        else:
+            # Acquire text version of body if provided
+            text_body = convert_between(
+                NotifyFormat.HTML, NotifyFormat.TEXT, body) \
+                if self.notify_format == NotifyFormat.HTML else body
+
+            for channel in self.channels:
+                # Python v3.10 supports `match/case` but since Apprise aims to
+                # be compatible with Python v3.9+, we must use if/else for the
+                # time being
+                if channel == NotificationAPIChannel.SMS:
+                    payload_.update({
+                        NotificationAPIChannel.SMS: {
+                            "message": (title + "\n" + text_body)
+                            if title else text_body,
+                        },
+                    })
+
+                elif channel == NotificationAPIChannel.EMAIL:
+                    html_body = convert_between(
+                        NotifyFormat.TEXT, NotifyFormat.HTML, body) \
+                        if self.notify_format != NotifyFormat.HTML else body
+
+                    payload_.update({
+                        NotificationAPIChannel.EMAIL: {
+                            "subject": title if title else self.app_id,
+                            "html": html_body,
+                        },
+                    })
+
+                    if self.from_addr:
+                        payload_[NotificationAPIChannel.EMAIL].update({
+                            "senderEmail": self.from_addr,
+                            "senderName": self.names[self.from_addr],
+                        })
+
+                elif channel == NotificationAPIChannel.INAPP:
+                    payload_.update({
+                        NotificationAPIChannel.INAPP: {
+                            "title": title if title else self.app_id,
+                            "image": self.image_url(notify_type),
+                        },
+                    })
+
+                elif channel == NotificationAPIChannel.WEB_PUSH:
+                    payload_.update({
+                        NotificationAPIChannel.WEB_PUSH: {
+                            "title": title if title else self.app_id,
+                            "message": text_body,
+                            "icon": self.image_url(notify_type),
+                        },
+                    })
+
+                elif channel == NotificationAPIChannel.MOBILE_PUSH:
+                    payload_.update({
+                        NotificationAPIChannel.MOBILE_PUSH: {
+                            "title": title if title else self.app_id,
+                            "message": text_body,
+                        },
+                    })
+
+                else:  # channel == NotificationAPIChannel.SLACK
+                    payload_.update({
+                        NotificationAPIChannel.SLACK: {
+                            "text": (title + "\n" + text_body)
+                            if title else text_body,
+                        },
+                    })
+
+        # Copy our list to work with
+        targets = list(self.targets)
+        if self.from_addr:
+            payload_.update({
+                "options": {
+                    "email": {
+                        "fromAddress": self.from_addr,
+                        "fromName": self.names[self.from_addr]}}})
+
+        elif self.cc or self.bcc:
+            # Set up shell
+            payload_.update({"options": {"email": {}}})
+
+        while len(targets) > 0:
+            target = targets.pop(0)
+
+            # Create a copy of our template
+            payload = payload_.copy()
+
+            # the cc, bcc, to field must be unique or SendMail will fail,
+            # the below code prepares this by ensuring the target isn't in
+            # the cc list or bcc list. It also makes sure the cc list does
+            # not contain any of the bcc entries
+            if "email" in target:
+                cc = (self.cc - self.bcc - {target["email"]})
+                bcc = (self.bcc - {target["email"]})
+
+            else:
+                # Assume defaults
+                cc = self.cc
+                bcc = self.bcc
+
+            #
+            # Prepare our 'to'
+            #
+            payload["to"] = {**target}
+
+            # Support cc/bcc
+            if len(cc):
+                payload["options"]["email"]["ccAddresses"] = list(cc)
+            if len(bcc):
+                payload["options"]["email"]["bccAddresses"] = list(bcc)
+
+            yield payload
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """
+        Perform NotificationAPI Notification
+        """
+
+        # error tracking (used for function return)
+        has_error = False
+
+        if not self.targets:
+            # There is no one to email or send an sms message to; we're done
+            self.logger.warning(
+                "There are no NotificationAPI recipients to notify"
+            )
+            return False
+
+        # Prepare our URL
+        url = (
+            f"{NOTIFICATIONAPI_API_LOOKUP[self.region]}/"
+            f"{self.client_id}/sender")
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": self.auth_header,
+        }
+
+        for payload in self.gen_payload(
+                body, title=title, notify_type=notify_type, **kwargs):
+            # Perform our post
+            self.logger.debug(
+                "NotificationAPI POST URL: {} (cert_verify={!r})".format(
+                    url, self.verify_certificate))
+            self.logger.debug(
+                "NotificationAPI Payload: %s", payload["to"]["id"])
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    url,
+                    data=dumps(payload),
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+
+                try:
+                    loads(r.content)
+
+                except (AttributeError, TypeError, ValueError):
+                    # This gets thrown if we can't parse our JSON Response
+                    #  - ValueError = r.content is Unparsable
+                    #  - TypeError = r.content is None
+                    #  - AttributeError = r is None
+                    self.logger.warning(
+                        "Invalid response from NotificationAPI server.")
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    # Record our failure
+                    has_error = True
+                    continue
+
+                # Reference status code
+                status_code = r.status_code
+
+                if status_code not in (
+                        requests.codes.ok, requests.codes.accepted):
+                    # We had a problem
+                    status_str = \
+                        NotifyNotificationAPI.http_response_code_lookup(
+                            status_code)
+
+                    self.logger.warning(
+                        "Failed to send NotificationAPI notification to %s: "
+                        "%s%serror=%d",
+                        payload["to"]["id"],
+                        status_str,
+                        ", " if status_str else "",
+                        status_code)
+
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    # Record our failure
+                    has_error = True
+
+                else:
+                    self.logger.info(
+                        "Sent NotificationAPI notification to %s.",
+                        payload["to"]["id"])
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occurred sending NotificationAPI "
+                    "notification to %s.", payload["to"]["id"])
+                self.logger.debug("Socket Exception: {}".format(str(e)))
+
+                # Record our failure
+                has_error = True
+
+        return not has_error
+
+    @staticmethod
+    def parse_url(url):
+        """
+        Parses the URL and returns enough arguments that can allow
+        us to re-instantiate this object.
+
+        """
+
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Define our minimum requirements; defining them now saves us from
+        # having to if/else all kinds of branches below...
+        results["client_id"] = None
+        results["client_secret"] = None
+
+        # Prepare our targets (starting with our host)
+        results["targets"] = []
+        if results["host"]:
+            results["targets"].append(
+                NotifyNotificationAPI.unquote(results["host"]))
+
+        # For tracking email sources
+        results["from_addr"] = None
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["from_addr"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["from"].rstrip())
+
+        # First 2 elements are the client_id and client_secret
+        # Following are targets
+        results["targets"] += \
+            NotifyNotificationAPI.split_path(results["fullpath"])
+        # check for our client id
+        if "id" in results["qsd"] and len(results["qsd"]["id"]):
+            # Store our Client ID
+            results["client_id"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["id"])
+
+        elif results["targets"]:
+            # Store our Client ID
+            results["client_id"] = results["targets"].pop(0)
+
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            # Store our Client Secret
+            results["client_secret"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["secret"])
+
+        elif results["targets"]:
+            # Store our Client Secret
+            results["client_secret"] = results["targets"].pop(0)
+
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
+            results["region"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["region"])
+
+        if "channels" in results["qsd"] and len(results["qsd"]["channels"]):
+            results["channels"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["channels"])
+
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            results["mode"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["mode"])
+
+        if "reply" in results["qsd"] and len(results["qsd"]["reply"]):
+            results["reply_to"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["reply"])
+
+        # Handling of Message Type
+        if "type" in results["qsd"] and len(results["qsd"]["type"]):
+            results["message_type"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["type"])
+
+        elif results["user"]:
+            # Pull from user
+            results["message_type"] = \
+                NotifyNotificationAPI.unquote(results["user"])
+
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(
+                NotifyNotificationAPI.unquote(results["qsd"]["to"]))
+
+        # Handle Carbon Copy Addresses
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["cc"])
+
+        # Handle Blind Carbon Copy Addresses
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = \
+                NotifyNotificationAPI.unquote(results["qsd"]["bcc"])
+
+        # Store our tokens
+        results["tokens"] = results["qsd:"]
+
+        return results
diff --git a/libs/apprise/plugins/notifico.py b/libs/apprise/plugins/notifico.py
index df7088ce3b..eca8c3c53b 100644
--- a/libs/apprise/plugins/notifico.py
+++ b/libs/apprise/plugins/notifico.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -42,70 +41,69 @@
 # as well.
 
 import re
+
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import parse_bool, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from .base import NotifyBase
 
 
 class NotificoFormat:
     # Resets all formatting
-    Reset = '\x0F'
+    Reset = "\x0f"
 
     # Formatting
-    Bold = '\x02'
-    Italic = '\x1D'
-    Underline = '\x1F'
-    BGSwap = '\x16'
+    Bold = "\x02"
+    Italic = "\x1d"
+    Underline = "\x1f"
+    BGSwap = "\x16"
 
 
 class NotificoColor:
     # Resets Color
-    Reset = '\x03'
+    Reset = "\x03"
 
     # Colors
-    White = '\x0300'
-    Black = '\x0301'
-    Blue = '\x0302'
-    Green = '\x0303'
-    Red = '\x0304'
-    Brown = '\x0305'
-    Purple = '\x0306'
-    Orange = '\x0307'
-    Yellow = '\x0308',
-    LightGreen = '\x0309'
-    Teal = '\x0310'
-    LightCyan = '\x0311'
-    LightBlue = '\x0312'
-    Violet = '\x0313'
-    Grey = '\x0314'
-    LightGrey = '\x0315'
+    White = "\x0300"
+    Black = "\x0301"
+    Blue = "\x0302"
+    Green = "\x0303"
+    Red = "\x0304"
+    Brown = "\x0305"
+    Purple = "\x0306"
+    Orange = "\x0307"
+    Yellow = ("\x0308",)
+    LightGreen = "\x0309"
+    Teal = "\x0310"
+    LightCyan = "\x0311"
+    LightBlue = "\x0312"
+    Violet = "\x0313"
+    Grey = "\x0314"
+    LightGrey = "\x0315"
 
 
 class NotifyNotifico(NotifyBase):
-    """
-    A wrapper for Notifico Notifications
-    """
+    """A wrapper for Notifico Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Notifico'
+    service_name = "Notifico"
 
     # The services URL
-    service_url = 'https://n.tkte.ch'
+    service_url = "https://n.tkte.ch"
 
     # The default protocol
-    protocol = 'notifico'
+    protocol = "notifico"
 
     # The default secure protocol
-    secure_protocol = 'notifico'
+    secure_protocol = "notifico"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_notifico'
+    setup_url = "https://appriseit.com/services/notifico/"
 
     # Plain Text Notification URL
-    notify_url = 'https://n.tkte.ch/h/{proj}/{hook}'
+    notify_url = "https://n.tkte.ch/h/{proj}/{hook}"
 
     # The title is not used
     title_maxlen = 0
@@ -114,71 +112,75 @@ class NotifyNotifico(NotifyBase):
     body_maxlen = 512
 
     # Define object templates
-    templates = (
-        '{schema}://{project_id}/{msghook}',
-    )
+    templates = ("{schema}://{project_id}/{msghook}",)
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        # The Project ID is found as the first part of the URL
-        #  /1234/........................
-        'project_id': {
-            'name': _('Project ID'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[0-9]+$', ''),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            # The Project ID is found as the first part of the URL
+            #  /1234/........................
+            "project_id": {
+                "name": _("Project ID"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[0-9]+$", ""),
+            },
+            # The Message Hook follows the Project ID
+            #  /..../AbCdEfGhIjKlMnOpQrStUvWX
+            "msghook": {
+                "name": _("Message Hook"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
         },
-        # The Message Hook follows the Project ID
-        #  /..../AbCdEfGhIjKlMnOpQrStUvWX
-        'msghook': {
-            'name': _('Message Hook'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        # You can optionally pass IRC colors into
-        'color': {
-            'name': _('IRC Colors'),
-            'type': 'bool',
-            'default': True,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            # You can optionally pass IRC colors into
+            "color": {
+                "name": _("IRC Colors"),
+                "type": "bool",
+                "default": True,
+            },
+            # You can optionally pass IRC color into
+            "prefix": {
+                "name": _("Prefix"),
+                "type": "bool",
+                "default": True,
+            },
         },
+    )
 
-        # You can optionally pass IRC color into
-        'prefix': {
-            'name': _('Prefix'),
-            'type': 'bool',
-            'default': True,
-        },
-    })
-
-    def __init__(self, project_id, msghook, color=True, prefix=True,
-                 **kwargs):
-        """
-        Initialize Notifico Object
-        """
+    def __init__(self, project_id, msghook, color=True, prefix=True, **kwargs):
+        """Initialize Notifico Object."""
         super().__init__(**kwargs)
 
         # Assign our message hook
         self.project_id = validate_regex(
-            project_id, *self.template_tokens['project_id']['regex'])
+            project_id, *self.template_tokens["project_id"]["regex"]
+        )
         if not self.project_id:
-            msg = 'An invalid Notifico Project ID ' \
-                  '({}) was specified.'.format(project_id)
+            msg = (
+                f"An invalid Notifico Project ID ({project_id}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Assign our message hook
         self.msghook = validate_regex(
-            msghook, *self.template_tokens['msghook']['regex'])
+            msghook, *self.template_tokens["msghook"]["regex"]
+        )
         if not self.msghook:
-            msg = 'An invalid Notifico Message Token ' \
-                  '({}) was specified.'.format(msghook)
+            msg = (
+                f"An invalid Notifico Message Token ({msghook}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -198,97 +200,98 @@ def __init__(self, project_id, msghook, color=True, prefix=True,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.project_id, self.msghook)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'color': 'yes' if self.color else 'no',
-            'prefix': 'yes' if self.prefix else 'no',
+            "color": "yes" if self.color else "no",
+            "prefix": "yes" if self.prefix else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{proj}/{hook}/?{params}'.format(
+        return "{schema}://{proj}/{hook}/?{params}".format(
             schema=self.secure_protocol,
-            proj=self.pprint(self.project_id, privacy, safe=''),
-            hook=self.pprint(self.msghook, privacy, safe=''),
+            proj=self.pprint(self.project_id, privacy, safe=""),
+            hook=self.pprint(self.msghook, privacy, safe=""),
             params=NotifyNotifico.urlencode(params),
         )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        wrapper to _send since we can alert more then one channel
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Wrapper to _send since we can alert more then one channel."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
         }
 
         # Prepare our IRC Prefix
-        color = ''
-        token = ''
+        color = ""
+        token = ""
         if notify_type == NotifyType.INFO:
             color = NotificoColor.Teal
-            token = 'i'
+            token = "i"
 
         elif notify_type == NotifyType.SUCCESS:
             color = NotificoColor.LightGreen
-            token = 'โœ”'
+            token = "โœ”"
 
         elif notify_type == NotifyType.WARNING:
             color = NotificoColor.Orange
-            token = '!'
+            token = "!"
 
         elif notify_type == NotifyType.FAILURE:
             color = NotificoColor.Red
-            token = 'โœ—'
+            token = "โœ—"
 
         if self.color:
             # Colors were specified, make sure we capture and correctly
             # allow them to exist inline in the message
             # \g<1> is less ambiguous than \1
-            body = re.sub(r'\\x03(\d{0,2})', r'\\x03\g<1>', body)
+            body = re.sub(r"\\x03(\d{0,2})", r"\\x03\g<1>", body)
 
         else:
             # no colors specified, make sure we strip out any colors found
             # to make the string read-able
-            body = re.sub(r'\\x03(\d{1,2}(,[0-9]{1,2})?)?', r'', body)
+            body = re.sub(r"\\x03(\d{1,2}(,[0-9]{1,2})?)?", r"", body)
 
         # Prepare our payload
         payload = {
-            'payload': body if not self.prefix
-            else '{}[{}]{} {}{}{}: {}{}'.format(
-                # Token [?] at the head
-                color if self.color else '',
-                token,
-                NotificoColor.Reset if self.color else '',
-                # App ID
-                NotificoFormat.Bold if self.color else '',
-                self.app_id,
-                NotificoFormat.Reset if self.color else '',
-                # Message Body
-                body,
-                # Reset
-                NotificoFormat.Reset if self.color else '',
+            "payload": (
+                body
+                if not self.prefix
+                else "{}[{}]{} {}{}{}: {}{}".format(
+                    # Token [?] at the head
+                    color if self.color else "",
+                    token,
+                    NotificoColor.Reset if self.color else "",
+                    # App ID
+                    NotificoFormat.Bold if self.color else "",
+                    self.app_id,
+                    NotificoFormat.Reset if self.color else "",
+                    # Message Body
+                    body,
+                    # Reset
+                    NotificoFormat.Reset if self.color else "",
+                )
             ),
         }
 
-        self.logger.debug('Notifico GET URL: %s (cert_verify=%r)' % (
-            self.api_url, self.verify_certificate))
-        self.logger.debug('Notifico Payload: %s' % str(payload))
+        self.logger.debug(
+            "Notifico GET URL:"
+            f" {self.api_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Notifico Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -303,29 +306,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyNotifico.http_response_code_lookup(r.status_code)
+                status_str = NotifyNotifico.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Notifico notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Notifico notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Notifico notification.')
+                self.logger.info("Sent Notifico notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Notifico '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Notifico notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -334,11 +339,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -346,23 +348,22 @@ def parse_url(url):
             return results
 
         # The first token is stored in the hostname
-        results['project_id'] = NotifyNotifico.unquote(results['host'])
+        results["project_id"] = NotifyNotifico.unquote(results["host"])
 
         # Get Message Hook
         try:
-            results['msghook'] = NotifyNotifico.split_path(
-                results['fullpath'])[0]
+            results["msghook"] = NotifyNotifico.split_path(
+                results["fullpath"]
+            )[0]
 
         except IndexError:
-            results['msghook'] = None
+            results["msghook"] = None
 
         # Include Color
-        results['color'] = \
-            parse_bool(results['qsd'].get('color', True))
+        results["color"] = parse_bool(results["qsd"].get("color", True))
 
         # Include Prefix
-        results['prefix'] = \
-            parse_bool(results['qsd'].get('prefix', True))
+        results["prefix"] = parse_bool(results["qsd"].get("prefix", True))
 
         return results
 
@@ -373,18 +374,26 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://n\.tkte\.ch/h/'
-            r'(?P<proj>[0-9]+)/'
-            r'(?P<hook>[A-Z0-9]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://n\.tkte\.ch/h/"
+            r"(?P<proj>[0-9]+)/"
+            r"(?P<hook>[A-Z0-9]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyNotifico.parse_url(
-                '{schema}://{proj}/{hook}/{params}'.format(
+                "{schema}://{proj}/{hook}/{params}".format(
                     schema=NotifyNotifico.secure_protocol,
-                    proj=result.group('proj'),
-                    hook=result.group('hook'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    proj=result.group("proj"),
+                    hook=result.group("hook"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/ntfy.py b/libs/apprise/plugins/ntfy.py
index 58d8db6dcf..8be5883a5a 100644
--- a/libs/apprise/plugins/ntfy.py
+++ b/libs/apprise/plugins/ntfy.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,28 +34,31 @@
 #   ntfy://ntfy.local.domain/my-topic
 #   ntfys://ntfy.local.domain:8080/my-topic
 #   ntfy://ntfy.local.domain/?priority=max
+from json import dumps, loads
+from os.path import basename
 import re
+from urllib.parse import quote
+
 import requests
-from json import loads
-from json import dumps
-from os.path import basename
 
-from .base import NotifyBase
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..locale import gettext_lazy as _
-from ..utils.parse import (
-    parse_list, parse_bool, is_hostname, is_ipaddr, validate_regex)
-from ..url import PrivacyMode
 from ..attachment.base import AttachBase
 from ..attachment.memory import AttachMemory
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import (
+    is_hostname,
+    is_ipaddr,
+    parse_bool,
+    parse_list,
+    validate_regex,
+)
+from .base import NotifyBase
 
 
 class NtfyMode:
-    """
-    Define ntfy Notification Modes
-    """
+    """Define ntfy Notification Modes."""
+
     # App posts upstream to the developer API on ntfy's website
     CLOUD = "cloud"
 
@@ -71,13 +73,12 @@ class NtfyMode:
 
 # A Simple regular expression used to auto detect Auth mode if it isn't
 # otherwise specified:
-NTFY_AUTH_DETECT_RE = re.compile('tk_[^ \t]+', re.IGNORECASE)
+NTFY_AUTH_DETECT_RE = re.compile(r"tk_[^ \t]+", re.IGNORECASE)
 
 
 class NtfyAuth:
-    """
-    Define ntfy Authentication Modes
-    """
+    """Define ntfy Authentication Modes."""
+
     # Basic auth (user and password provided)
     BASIC = "basic"
 
@@ -92,14 +93,13 @@ class NtfyAuth:
 
 
 class NtfyPriority:
-    """
-    Ntfy Priority Definitions
-    """
-    MAX = 'max'
-    HIGH = 'high'
-    NORMAL = 'default'
-    LOW = 'low'
-    MIN = 'min'
+    """Ntfy Priority Definitions."""
+
+    MAX = "max"
+    HIGH = "high"
+    NORMAL = "default"
+    LOW = "low"
+    MIN = "min"
 
 
 NTFY_PRIORITIES = (
@@ -113,59 +113,55 @@ class NtfyPriority:
 NTFY_PRIORITY_MAP = {
     # Maps against string 'low' but maps to Moderate to avoid
     # conflicting with actual ntfy mappings
-    'l': NtfyPriority.LOW,
+    "l": NtfyPriority.LOW,
     # Maps against string 'moderate'
-    'mo': NtfyPriority.LOW,
+    "mo": NtfyPriority.LOW,
     # Maps against string 'normal'
-    'n': NtfyPriority.NORMAL,
+    "n": NtfyPriority.NORMAL,
     # Maps against string 'high'
-    'h': NtfyPriority.HIGH,
+    "h": NtfyPriority.HIGH,
     # Maps against string 'emergency'
-    'e': NtfyPriority.MAX,
-
+    "e": NtfyPriority.MAX,
     # Entries to additionally support (so more like Ntfy's API)
     # Maps against string 'min'
-    'mi': NtfyPriority.MIN,
+    "mi": NtfyPriority.MIN,
     # Maps against string 'max'
-    'ma': NtfyPriority.MAX,
+    "ma": NtfyPriority.MAX,
     # Maps against string 'default'
-    'd': NtfyPriority.NORMAL,
-
+    "d": NtfyPriority.NORMAL,
     # support 1-5 values as well
-    '1': NtfyPriority.MIN,
+    "1": NtfyPriority.MIN,
     # Maps against string 'moderate'
-    '2': NtfyPriority.LOW,
+    "2": NtfyPriority.LOW,
     # Maps against string 'normal'
-    '3': NtfyPriority.NORMAL,
+    "3": NtfyPriority.NORMAL,
     # Maps against string 'high'
-    '4': NtfyPriority.HIGH,
+    "4": NtfyPriority.HIGH,
     # Maps against string 'emergency'
-    '5': NtfyPriority.MAX,
+    "5": NtfyPriority.MAX,
 }
 
 
 class NotifyNtfy(NotifyBase):
-    """
-    A wrapper for ntfy Notifications
-    """
+    """A wrapper for ntfy Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'ntfy'
+    service_name = "ntfy"
 
     # The services URL
-    service_url = 'https://ntfy.sh/'
+    service_url = "https://ntfy.sh/"
 
     # Insecure protocol (for those self hosted requests)
-    protocol = 'ntfy'
+    protocol = "ntfy"
 
     # The default protocol
-    secure_protocol = 'ntfys'
+    secure_protocol = "ntfys"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_ntfy'
+    setup_url = "https://appriseit.com/services/ntfy/"
 
     # Default upstream/cloud host if none is defined
-    cloud_notify_url = 'https://ntfy.sh'
+    cloud_notify_url = "https://ntfy.sh"
 
     # Support attachments
     attachment_support = True
@@ -192,137 +188,161 @@ class NotifyNtfy(NotifyBase):
 
     # if our hostname matches the following we automatically enforce
     # cloud mode
-    __auto_cloud_host = re.compile(r'ntfy\.sh', re.IGNORECASE)
+    __auto_cloud_host = re.compile(r"ntfy\.sh", re.IGNORECASE)
 
     # Define object templates
     templates = (
-        '{schema}://{topic}',
-        '{schema}://{host}/{targets}',
-        '{schema}://{host}:{port}/{targets}',
-        '{schema}://{user}@{host}/{targets}',
-        '{schema}://{user}@{host}:{port}/{targets}',
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
-        '{schema}://{token}@{host}/{targets}',
-        '{schema}://{token}@{host}:{port}/{targets}',
+        "{schema}://{topic}",
+        "{schema}://{host}/{targets}",
+        "{schema}://{host}:{port}/{targets}",
+        "{schema}://{user}@{host}/{targets}",
+        "{schema}://{user}@{host}:{port}/{targets}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
+        "{schema}://{token}@{host}/{targets}",
+        "{schema}://{token}@{host}:{port}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+            },
+            "topic": {
+                "name": _("Topic"),
+                "type": "string",
+                "map_to": "targets",
+                "regex": (r"^[a-z0-9_-]{1,64}$", "i"),
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'topic': {
-            'name': _('Topic'),
-            'type': 'string',
-            'map_to': 'targets',
-            'regex': (r'^[a-z0-9_-]{1,64}$', 'i')
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'attach': {
-            'name': _('Attach'),
-            'type': 'string',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'avatar_url': {
-            'name': _('Avatar URL'),
-            'type': 'string',
-        },
-        'filename': {
-            'name': _('Attach Filename'),
-            'type': 'string',
-        },
-        'click': {
-            'name': _('Click'),
-            'type': 'string',
-        },
-        'delay': {
-            'name': _('Delay'),
-            'type': 'string',
-        },
-        'email': {
-            'name': _('Email'),
-            'type': 'string',
-        },
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:string',
-            'values': NTFY_PRIORITIES,
-            'default': NtfyPriority.NORMAL,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "attach": {
+                "name": _("Attach"),
+                "type": "string",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "avatar_url": {
+                "name": _("Avatar URL"),
+                "type": "string",
+            },
+            "filename": {
+                "name": _("Attach Filename"),
+                "type": "string",
+            },
+            "click": {
+                "name": _("Click"),
+                "type": "string",
+            },
+            "delay": {
+                "name": _("Delay"),
+                "type": "string",
+            },
+            "email": {
+                "name": _("Email"),
+                "type": "string",
+            },
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:string",
+                "values": NTFY_PRIORITIES,
+                "default": NtfyPriority.NORMAL,
+            },
+            "tags": {
+                "name": _("Tags"),
+                "type": "string",
+            },
+            "actions": {
+                "name": _("Actions"),
+                "type": "string",
+            },
+            "mode": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": NTFY_MODES,
+                "default": NtfyMode.PRIVATE,
+            },
+            "token": {
+                "alias_of": "token",
+            },
+            "auth": {
+                "name": _("Authentication Type"),
+                "type": "choice:string",
+                "values": NTFY_AUTH,
+                "default": NtfyAuth.BASIC,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'tags': {
-            'name': _('Tags'),
-            'type': 'string',
-        },
-        'mode': {
-            'name': _('Mode'),
-            'type': 'choice:string',
-            'values': NTFY_MODES,
-            'default': NtfyMode.PRIVATE,
-        },
-        'token': {
-            'alias_of': 'token',
-        },
-        'auth': {
-            'name': _('Authentication Type'),
-            'type': 'choice:string',
-            'values': NTFY_AUTH,
-            'default': NtfyAuth.BASIC,
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, targets=None, attach=None, filename=None, click=None,
-                 delay=None, email=None, priority=None, tags=None, mode=None,
-                 include_image=True, avatar_url=None, auth=None, token=None,
-                 **kwargs):
-        """
-        Initialize ntfy Object
-        """
+    def __init__(
+        self,
+        targets=None,
+        attach=None,
+        filename=None,
+        click=None,
+        delay=None,
+        email=None,
+        priority=None,
+        tags=None,
+        actions=None,
+        mode=None,
+        include_image=True,
+        avatar_url=None,
+        auth=None,
+        token=None,
+        **kwargs,
+    ):
+        """Initialize ntfy Object."""
         super().__init__(**kwargs)
 
         # Prepare our mode
-        self.mode = mode.strip().lower() \
-            if isinstance(mode, str) \
-            else self.template_args['mode']['default']
+        self.mode = (
+            mode.strip().lower()
+            if isinstance(mode, str)
+            else self.template_args["mode"]["default"]
+        )
 
         if self.mode not in NTFY_MODES:
-            msg = 'An invalid ntfy Mode ({}) was specified.'.format(mode)
+            msg = f"An invalid ntfy Mode ({mode}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -330,13 +350,16 @@ def __init__(self, targets=None, attach=None, filename=None, click=None,
         self.include_image = include_image
 
         # Prepare our authentication type
-        self.auth = auth.strip().lower() \
-            if isinstance(auth, str) \
-            else self.template_args['auth']['default']
+        self.auth = (
+            auth.strip().lower()
+            if isinstance(auth, str)
+            else self.template_args["auth"]["default"]
+        )
 
         if self.auth not in NTFY_AUTH:
-            msg = 'An invalid ntfy Authentication type ({}) was specified.' \
-                .format(auth)
+            msg = (
+                f"An invalid ntfy Authentication type ({auth}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -347,7 +370,16 @@ def __init__(self, targets=None, attach=None, filename=None, click=None,
         self.filename = filename
 
         # A clickthrough option for notifications
-        self.click = click
+        # Support Internationalized URLs
+        self.click = (
+            None
+            if not isinstance(click, str)
+            else (
+                click
+                if not any(ord(char) > 127 for char in click)
+                else quote(click, safe=":/?&=[]")
+            )
+        )
 
         # Time delay for notifications (various string formats)
         self.delay = delay
@@ -359,16 +391,25 @@ def __init__(self, targets=None, attach=None, filename=None, click=None,
         self.token = token
 
         # The Priority of the message
-        self.priority = NotifyNtfy.template_args['priority']['default'] \
-            if not priority else \
-            next((
-                v for k, v in NTFY_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyNtfy.template_args['priority']['default'])
+        self.priority = (
+            NotifyNtfy.template_args["priority"]["default"]
+            if not priority
+            else next(
+                (
+                    v
+                    for k, v in NTFY_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyNtfy.template_args["priority"]["default"],
+            )
+        )
 
         # Any optional tags to attach to the notification
         self.__tags = parse_list(tags)
 
+        # Action buttons
+        self.__actions = actions
+
         # Avatar URL
         # This allows a user to provide an over-ride to the otherwise
         # dynamically generated avatar url images
@@ -377,37 +418,42 @@ def __init__(self, targets=None, attach=None, filename=None, click=None,
         # Build list of topics
         topics = parse_list(targets)
         self.topics = []
-        for _topic in topics:
+        for topic_ in topics:
             topic = validate_regex(
-                _topic, *self.template_tokens['topic']['regex'])
+                topic_, *self.template_tokens["topic"]["regex"]
+            )
             if not topic:
                 self.logger.warning(
-                    'A specified ntfy topic ({}) is invalid and will be '
-                    'ignored'.format(_topic))
+                    f"A specified ntfy topic ({topic_}) is invalid and will be"
+                    " ignored"
+                )
                 continue
             self.topics.append(topic)
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform ntfy Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform ntfy Notification."""
 
         # error tracking (used for function return)
         has_error = False
 
         if not len(self.topics):
             # We have nothing to notify; we're done
-            self.logger.warning('There are no ntfy topics to notify')
+            self.logger.warning("There are no ntfy topics to notify")
             return False
 
         # Acquire image_url
         image_url = self.image_url(notify_type)
 
         if self.include_image and (image_url or self.avatar_url):
-            image_url = \
-                self.avatar_url if self.avatar_url else image_url
+            image_url = self.avatar_url if self.avatar_url else image_url
         else:
             image_url = None
 
@@ -423,46 +469,58 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 for no, attachment in enumerate(attach):
 
                     # First message only includes the text (if defined)
-                    _body = body if not no and body else None
-                    _title = title if not no and title else None
+                    body_ = body if not no and body else None
+                    title_ = title if not no and title else None
 
                     # Perform some simple error checking
                     if not attachment:
                         # We could not access the attachment
                         self.logger.error(
-                            'Could not access attachment {}.'.format(
-                                attachment.url(privacy=True)))
+                            "Could not access attachment"
+                            f" {attachment.url(privacy=True)}."
+                        )
                         return False
 
                     self.logger.debug(
-                        'Preparing ntfy attachment {}'.format(
-                            attachment.url(privacy=True)))
+                        "Preparing ntfy attachment"
+                        f" {attachment.url(privacy=True)}"
+                    )
 
-                    okay, response = self._send(
-                        topic, body=_body, title=_title, image_url=image_url,
-                        attach=attachment)
+                    okay, _response = self._send(
+                        topic,
+                        body=body_,
+                        title=title_,
+                        image_url=image_url,
+                        attach=attachment,
+                    )
                     if not okay:
                         # We can't post our attachment; abort immediately
                         return False
             else:
                 # Send our Notification Message
-                okay, response = self._send(
-                    topic, body=body, title=title, image_url=image_url)
+                okay, _response = self._send(
+                    topic, body=body, title=title, image_url=image_url
+                )
                 if not okay:
                     # Mark our failure, but contiue to move on
                     has_error = True
 
         return not has_error
 
-    def _send(self, topic, body=None, title=None, attach=None, image_url=None,
-              **kwargs):
-        """
-        Wrapper to the requests (post) object
-        """
+    def _send(
+        self,
+        topic,
+        body=None,
+        title=None,
+        attach=None,
+        image_url=None,
+        **kwargs,
+    ):
+        """Wrapper to the requests (post) object."""
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # See https://ntfy.sh/docs/publish/#publish-as-json
@@ -483,73 +541,77 @@ def _send(self, topic, body=None, title=None, attach=None, image_url=None,
 
             elif self.auth == NtfyAuth.TOKEN:
                 if not self.token:
-                    self.logger.warning('No Ntfy Token was specified')
+                    self.logger.warning("No Ntfy Token was specified")
                     return False, None
 
                 # Set Token
-                headers['Authorization'] = f'Bearer {self.token}'
+                headers["Authorization"] = f"Bearer {self.token}"
 
             # Prepare our ntfy Template URL
-            schema = 'https' if self.secure else 'http'
+            schema = "https" if self.secure else "http"
 
-            notify_url = '%s://%s' % (schema, self.host)
+            notify_url = f"{schema}://{self.host}"
             if isinstance(self.port, int):
-                notify_url += ':%d' % self.port
+                notify_url += f":{self.port}"
 
         if not attach:
-            headers['Content-Type'] = 'application/json'
+            headers["Content-Type"] = "application/json"
 
-            data['topic'] = topic
+            data["topic"] = topic
             virt_payload = data
 
             if self.attach:
-                virt_payload['attach'] = self.attach
+                virt_payload["attach"] = self.attach
 
                 if self.filename:
-                    virt_payload['filename'] = self.filename
+                    virt_payload["filename"] = self.filename
 
         else:
             # Point our payload to our parameters
             virt_payload = params
-            notify_url += '/{topic}'.format(topic=topic)
+            notify_url += f"/{topic}"
 
             # Prepare our Header
-            virt_payload['filename'] = attach.name
+            virt_payload["filename"] = attach.name
 
             with attach as fp:
                 data = fp.read()
 
         if image_url:
-            headers['X-Icon'] = image_url
+            headers["X-Icon"] = image_url
 
         if title:
-            virt_payload['title'] = title
+            virt_payload["title"] = title
 
         if body:
-            virt_payload['message'] = body
+            virt_payload["message"] = body
 
         if self.notify_format == NotifyFormat.MARKDOWN:
             # Support Markdown
-            headers['X-Markdown'] = 'yes'
+            headers["X-Markdown"] = "yes"
 
         if self.priority != NtfyPriority.NORMAL:
-            headers['X-Priority'] = self.priority
+            headers["X-Priority"] = self.priority
 
         if self.delay is not None:
-            headers['X-Delay'] = self.delay
+            headers["X-Delay"] = self.delay
 
         if self.click is not None:
-            headers['X-Click'] = self.click
+            headers["X-Click"] = quote(self.click, safe=":/?@&=#")
 
         if self.email is not None:
-            headers['X-Email'] = self.email
+            headers["X-Email"] = self.email
 
         if self.__tags:
-            headers['X-Tags'] = ",".join(self.__tags)
+            headers["X-Tags"] = ",".join(self.__tags)
 
-        self.logger.debug('ntfy POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
+        if self.__actions:
+            headers["X-Actions"] = self.__actions
+
+        self.logger.debug(
+            "ntfy POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
 
         # Default response type
         response = None
@@ -560,26 +622,33 @@ def _send(self, topic, body=None, title=None, attach=None, image_url=None,
                 # Convert to an attachment
 
                 if self.notify_format == NotifyFormat.MARKDOWN:
-                    mimetype = 'text/markdown'
+                    mimetype = "text/markdown"
 
                 elif self.notify_format == NotifyFormat.TEXT:
-                    mimetype = 'text/plain'
+                    mimetype = "text/plain"
 
                 else:  # self.notify_format == NotifyFormat.HTML:
-                    mimetype = 'text/html'
+                    mimetype = "text/html"
 
                 attach = AttachMemory(
                     mimetype=mimetype,
-                    content='{title}{body}'.format(
-                        title=title + '\n' if title else '', body=body))
+                    content="{title}{body}".format(
+                        title=title + "\n" if title else "", body=body
+                    ),
+                )
 
                 # Recursively send the message body as an attachment instead
                 return self._send(
-                    topic=topic, body='', title='', attach=attach,
-                    image_url=image_url, **kwargs)
+                    topic=topic,
+                    body="",
+                    title="",
+                    attach=attach,
+                    image_url=image_url,
+                    **kwargs,
+                )
 
-        self.logger.debug('ntfy Payload: %s' % str(virt_payload))
-        self.logger.debug('ntfy Headers: %s' % str(headers))
+        self.logger.debug(f"ntfy Payload: {virt_payload!s}")
+        self.logger.debug(f"ntfy Headers: {headers!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -596,8 +665,9 @@ def _send(self, topic, body=None, title=None, attach=None, image_url=None,
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyBase.http_response_code_lookup(r.status_code)
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
 
                 # set up our status code to use
                 status_code = r.status_code
@@ -605,9 +675,8 @@ def _send(self, topic, body=None, title=None, attach=None, image_url=None,
                 try:
                     # Update our status response if we can
                     response = loads(r.content)
-                    status_str = response.get('error', status_str)
-                    status_code = \
-                        int(response.get('code', status_code))
+                    status_str = response.get("error", status_str)
+                    status_code = int(response.get("code", status_code))
 
                 except (AttributeError, TypeError, ValueError):
                     # ValueError = r.content is Unparsable
@@ -620,53 +689,63 @@ def _send(self, topic, body=None, title=None, attach=None, image_url=None,
 
                 self.logger.warning(
                     "Failed to send ntfy notification to topic '{}': "
-                    '{}{}error={}.'.format(
+                    "{}{}error={}.".format(
                         topic,
                         status_str,
-                        ', ' if status_str else '',
-                        status_code))
+                        ", " if status_str else "",
+                        status_code,
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False, response
 
             # otherwise we were successful
-            self.logger.info(
-                "Sent ntfy notification to '{}'.".format(notify_url))
+            self.logger.info(f"Sent ntfy notification to '{notify_url}'.")
 
             return True, response
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending ntfy:%s ' % (
-                    notify_url) + 'notification.'
+                f"A Connection error occurred sending ntfy:{notify_url} "
+                + "notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while handling {}.'.format(
-                    attach.name if isinstance(attach, AttachBase)
-                    else virt_payload))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while handling {}.".format(
+                    attach.name
+                    if isinstance(attach, AttachBase)
+                    else virt_payload
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
 
         return False, response
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
 
         kwargs = [
-            self.secure_protocol if self.mode == NtfyMode.CLOUD else (
-                self.secure_protocol if self.secure else self.protocol),
-            self.host if self.mode == NtfyMode.PRIVATE else '',
-            443 if self.mode == NtfyMode.CLOUD else (
-                self.port if self.port else (443 if self.secure else 80)),
+            (
+                self.secure_protocol
+                if self.mode == NtfyMode.CLOUD
+                else (self.secure_protocol if self.secure else self.protocol)
+            ),
+            self.host if self.mode == NtfyMode.PRIVATE else "",
+            (
+                443
+                if self.mode == NtfyMode.CLOUD
+                else (self.port if self.port else (443 if self.secure else 80))
+            ),
         ]
 
         if self.mode == NtfyMode.PRIVATE:
@@ -682,179 +761,203 @@ def url_identifier(self):
         return kwargs
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         default_port = 443 if self.secure else 80
 
         params = {
-            'priority': self.priority,
-            'mode': self.mode,
-            'image': 'yes' if self.include_image else 'no',
-            'auth': self.auth,
+            "priority": self.priority,
+            "mode": self.mode,
+            "image": "yes" if self.include_image else "no",
+            "auth": self.auth,
         }
 
         if self.avatar_url:
-            params['avatar_url'] = self.avatar_url
+            params["avatar_url"] = self.avatar_url
 
         if self.attach is not None:
-            params['attach'] = self.attach
+            params["attach"] = self.attach
 
         if self.click is not None:
-            params['click'] = self.click
+            params["click"] = self.click
 
         if self.delay is not None:
-            params['delay'] = self.delay
+            params["delay"] = self.delay
 
         if self.email is not None:
-            params['email'] = self.email
+            params["email"] = self.email
 
         if self.__tags:
-            params['tags'] = ','.join(self.__tags)
+            params["tags"] = ",".join(self.__tags)
+
+        if self.__actions:
+            params["actions"] = self.__actions
 
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.auth == NtfyAuth.BASIC:
             if self.user and self.password:
-                auth = '{user}:{password}@'.format(
-                    user=NotifyNtfy.quote(self.user, safe=''),
+                auth = "{user}:{password}@".format(
+                    user=NotifyNtfy.quote(self.user, safe=""),
                     password=self.pprint(
-                        self.password, privacy, mode=PrivacyMode.Secret,
-                        safe=''),
+                        self.password,
+                        privacy,
+                        mode=PrivacyMode.Secret,
+                        safe="",
+                    ),
                 )
             elif self.user:
-                auth = '{user}@'.format(
-                    user=NotifyNtfy.quote(self.user, safe=''),
+                auth = "{user}@".format(
+                    user=NotifyNtfy.quote(self.user, safe=""),
                 )
 
         elif self.token:  # NtfyAuth.TOKEN also
-            auth = '{token}@'.format(
-                token=self.pprint(self.token, privacy, safe=''),
+            auth = "{token}@".format(
+                token=self.pprint(self.token, privacy, safe=""),
             )
 
         if self.mode == NtfyMode.PRIVATE:
-            return '{schema}://{auth}{host}{port}/{targets}?{params}'.format(
+            return "{schema}://{auth}{host}{port}/{targets}?{params}".format(
                 schema=self.secure_protocol if self.secure else self.protocol,
                 auth=auth,
                 host=self.host,
-                port='' if self.port is None or self.port == default_port
-                else ':{}'.format(self.port),
-                targets='/'.join(
-                    [NotifyNtfy.quote(x, safe='') for x in self.topics]),
-                params=NotifyNtfy.urlencode(params)
+                port=(
+                    ""
+                    if self.port is None or self.port == default_port
+                    else f":{self.port}"
+                ),
+                targets="/".join(
+                    [NotifyNtfy.quote(x, safe="") for x in self.topics]
+                ),
+                params=NotifyNtfy.urlencode(params),
             )
 
         else:  # Cloud mode
-            return '{schema}://{targets}?{params}'.format(
+            return "{schema}://{targets}?{params}".format(
                 schema=self.secure_protocol,
-                targets='/'.join(
-                    [NotifyNtfy.quote(x, safe='') for x in self.topics]),
-                params=NotifyNtfy.urlencode(params)
+                targets="/".join(
+                    [NotifyNtfy.quote(x, safe="") for x in self.topics]
+                ),
+                params=NotifyNtfy.urlencode(params),
             )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return 1 if not self.topics else len(self.topics)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyNtfy.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyNtfy.unquote(
+                results["qsd"]["priority"]
+            )
 
-        if 'attach' in results['qsd'] and len(results['qsd']['attach']):
-            results['attach'] = NotifyNtfy.unquote(results['qsd']['attach'])
-            _results = NotifyBase.parse_url(results['attach'])
-            if _results:
-                results['filename'] = \
-                    None if _results['fullpath'] \
-                    else basename(_results['fullpath'])
+        if "attach" in results["qsd"] and len(results["qsd"]["attach"]):
+            results["attach"] = NotifyNtfy.unquote(results["qsd"]["attach"])
+            results_ = NotifyBase.parse_url(results["attach"])
+            if results_:
+                results["filename"] = (
+                    None
+                    if results_["fullpath"]
+                    else basename(results_["fullpath"])
+                )
+
+            if "filename" in results["qsd"] and len(
+                results["qsd"]["filename"]
+            ):
+                results["filename"] = basename(
+                    NotifyNtfy.unquote(results["qsd"]["filename"])
+                )
 
-            if 'filename' in results['qsd'] and \
-                    len(results['qsd']['filename']):
-                results['filename'] = \
-                    basename(NotifyNtfy.unquote(results['qsd']['filename']))
+        if "click" in results["qsd"] and len(results["qsd"]["click"]):
+            results["click"] = NotifyNtfy.unquote(results["qsd"]["click"])
 
-        if 'click' in results['qsd'] and len(results['qsd']['click']):
-            results['click'] = NotifyNtfy.unquote(results['qsd']['click'])
+        if "delay" in results["qsd"] and len(results["qsd"]["delay"]):
+            results["delay"] = NotifyNtfy.unquote(results["qsd"]["delay"])
 
-        if 'delay' in results['qsd'] and len(results['qsd']['delay']):
-            results['delay'] = NotifyNtfy.unquote(results['qsd']['delay'])
+        if "email" in results["qsd"] and len(results["qsd"]["email"]):
+            results["email"] = NotifyNtfy.unquote(results["qsd"]["email"])
 
-        if 'email' in results['qsd'] and len(results['qsd']['email']):
-            results['email'] = NotifyNtfy.unquote(results['qsd']['email'])
+        if "tags" in results["qsd"] and len(results["qsd"]["tags"]):
+            results["tags"] = parse_list(
+                NotifyNtfy.unquote(results["qsd"]["tags"])
+            )
 
-        if 'tags' in results['qsd'] and len(results['qsd']['tags']):
-            results['tags'] = \
-                parse_list(NotifyNtfy.unquote(results['qsd']['tags']))
+        if "actions" in results["qsd"] and len(results["qsd"]["actions"]):
+            results["actions"] = NotifyNtfy.unquote(results["qsd"]["actions"])
 
         # Boolean to include an image or not
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyNtfy.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyNtfy.template_args["image"]["default"]
+            )
+        )
 
         # Extract avatar url if it was specified
-        if 'avatar_url' in results['qsd']:
-            results['avatar_url'] = \
-                NotifyNtfy.unquote(results['qsd']['avatar_url'])
+        if "avatar_url" in results["qsd"]:
+            results["avatar_url"] = NotifyNtfy.unquote(
+                results["qsd"]["avatar_url"]
+            )
 
         # Acquire our targets/topics
-        results['targets'] = NotifyNtfy.split_path(results['fullpath'])
+        results["targets"] = NotifyNtfy.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyNtfy.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyNtfy.parse_list(results["qsd"]["to"])
 
         # Token Specified
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Token presumed to be the one in use
-            results['auth'] = NtfyAuth.TOKEN
-            results['token'] = NotifyNtfy.unquote(results['qsd']['token'])
+            results["auth"] = NtfyAuth.TOKEN
+            results["token"] = NotifyNtfy.unquote(results["qsd"]["token"])
 
         # Auth override
-        if 'auth' in results['qsd'] and results['qsd']['auth']:
-            results['auth'] = NotifyNtfy.unquote(
-                results['qsd']['auth'].strip().lower())
+        if "auth" in results["qsd"] and results["qsd"]["auth"]:
+            results["auth"] = NotifyNtfy.unquote(
+                results["qsd"]["auth"].strip().lower()
+            )
 
-        if not results.get('auth') and results['user'] \
-                and not results['password']:
+        if (
+            not results.get("auth")
+            and results["user"]
+            and not results["password"]
+        ):
             # We can try to detect the authentication type on the formatting of
             # the username. Look for tk_.*
             #
             # This isn't a surfire way to do things though; it's best to
             # specify the auth= flag
-            results['auth'] = NtfyAuth.TOKEN \
-                if NTFY_AUTH_DETECT_RE.match(results['user']) \
+            results["auth"] = (
+                NtfyAuth.TOKEN
+                if NTFY_AUTH_DETECT_RE.match(results["user"])
                 else NtfyAuth.BASIC
+            )
 
-        if results.get('auth') == NtfyAuth.TOKEN and not results.get('token'):
-            if results['user'] and not results['password']:
+        if results.get("auth") == NtfyAuth.TOKEN and not results.get("token"):
+            if results["user"] and not results["password"]:
                 # Make sure we properly set our token
-                results['token'] = NotifyNtfy.unquote(results['user'])
+                results["token"] = NotifyNtfy.unquote(results["user"])
 
-            elif results['password']:
+            elif results["password"]:
                 # Make sure we properly set our token
-                results['token'] = NotifyNtfy.unquote(results['password'])
+                results["token"] = NotifyNtfy.unquote(results["password"])
 
         # Mode override
-        if 'mode' in results['qsd'] and results['qsd']['mode']:
-            results['mode'] = NotifyNtfy.unquote(
-                results['qsd']['mode'].strip().lower())
+        if "mode" in results["qsd"] and results["qsd"]["mode"]:
+            results["mode"] = NotifyNtfy.unquote(
+                results["qsd"]["mode"].strip().lower()
+            )
 
         else:
             # We can try to detect the mode based on the validity of the
@@ -862,23 +965,30 @@ def parse_url(url):
             #
             # This isn't a surfire way to do things though; it's best to
             # specify the mode= flag
-            results['mode'] = NtfyMode.PRIVATE \
-                if ((is_hostname(results['host'])
-                    or is_ipaddr(results['host'])) and results['targets']) \
+            results["mode"] = (
+                NtfyMode.PRIVATE
+                if (
+                    (
+                        is_hostname(results["host"])
+                        or is_ipaddr(results["host"])
+                    )
+                    and results["targets"]
+                )
                 else NtfyMode.CLOUD
+            )
 
-        if results['mode'] == NtfyMode.CLOUD:
+        if results["mode"] == NtfyMode.CLOUD:
             # Store first entry as it can be a topic too in this case
             # But only if we also rule it out not being the words
             # ntfy.sh itself, something that starts wiht an non-alpha numeric
             # character:
-            if not NotifyNtfy.__auto_cloud_host.search(results['host']):
+            if not NotifyNtfy.__auto_cloud_host.search(results["host"]):
                 # Add it to the front of the list for consistency
-                results['targets'].insert(0, results['host'])
+                results["targets"].insert(0, results["host"])
 
-        elif results['mode'] == NtfyMode.PRIVATE and \
-                not (is_hostname(results['host'] or
-                     is_ipaddr(results['host']))):
+        elif results["mode"] == NtfyMode.PRIVATE and not (
+            is_hostname(results["host"] or is_ipaddr(results["host"]))
+        ):
             # Invalid Host for NtfyMode.PRIVATE
             return None
 
@@ -893,19 +1003,29 @@ def parse_native_url(url):
         # Quick lookup for users who want to just paste
         # the ntfy.sh url directly into Apprise
         result = re.match(
-            r'^(http|ntfy)s?://ntfy\.sh'
-            r'(?P<topics>/[^?]+)?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^(http|ntfy)s?://ntfy\.sh"
+            r"(?P<topics>/[^?]+)?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
-            mode = 'mode=%s' % NtfyMode.CLOUD
+            mode = f"mode={NtfyMode.CLOUD}"
             return NotifyNtfy.parse_url(
-                '{schema}://{topics}{params}'.format(
+                "{schema}://{topics}{params}".format(
                     schema=NotifyNtfy.secure_protocol,
-                    topics=result.group('topics')
-                    if result.group('topics') else '',
-                    params='?%s' % mode
-                    if not result.group('params')
-                    else result.group('params') + '&%s' % mode))
+                    topics=(
+                        result.group("topics")
+                        if result.group("topics")
+                        else ""
+                    ),
+                    params=(
+                        f"?{mode}"
+                        if not result.group("params")
+                        else result.group("params") + f"&{mode}"
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/office365.py b/libs/apprise/plugins/office365.py
index c0069f9193..32ce5f424b 100644
--- a/libs/apprise/plugins/office365.py
+++ b/libs/apprise/plugins/office365.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -39,47 +38,46 @@
 #       - For Large Attachments: Mail.ReadWrite
 #       - For Email Lookups: User.Read.All
 #
-import requests
+from datetime import datetime, timedelta
 import json
+import logging
 from uuid import uuid4
-from datetime import datetime
-from datetime import timedelta
-from .base import NotifyBase
+
+import requests
+
 from .. import exception
+from ..common import NotifyFormat, NotifyType, PersistentStoreMode
+from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyFormat
-from ..common import NotifyType
 from ..utils.parse import is_email, parse_emails, validate_regex
-from ..locale import gettext_lazy as _
-from ..common import PersistentStoreMode
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 
 class NotifyOffice365(NotifyBase):
-    """
-    A wrapper for Office 365 Notifications
-    """
+    """A wrapper for Office 365 Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Office 365'
+    service_name = "Office 365"
 
     # The services URL
-    service_url = 'https://office.com/'
+    service_url = "https://office.com/"
 
     # The default protocol
-    secure_protocol = ('azure', 'o365')
+    secure_protocol = ("azure", "o365")
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_office365'
+    setup_url = "https://appriseit.com/services/office365/"
 
     # URL to Microsoft Graph Server
-    graph_url = 'https://graph.microsoft.com'
+    graph_url = "https://graph.microsoft.com"
 
     # Authentication URL
-    auth_url = 'https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token'
+    auth_url = "https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
 
     # Support attachments
     attachment_support = True
@@ -100,7 +98,7 @@ class NotifyOffice365(NotifyBase):
     # resource you want to use.
     # see https://docs.microsoft.com/en-us/azure/active-directory/develop/\
     #       v2-permissions-and-consent#the-default-scope
-    scope = '.default'
+    scope = ".default"
 
     # Default Notify Format
     notify_format = NotifyFormat.HTML
@@ -108,82 +106,95 @@ class NotifyOffice365(NotifyBase):
     # Define object templates
     templates = (
         # Send as user (only supported method)
-        '{schema}://{source}/{tenant}/{client_id}/{secret}',
-        '{schema}://{source}/{tenant}/{client_id}/{secret}/{targets}',
+        "{schema}://{source}/{tenant}/{client_id}/{secret}",
+        "{schema}://{source}/{tenant}/{client_id}/{secret}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'tenant': {
-            'name': _('Tenant Domain'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9-]+$', 'i'),
-        },
-        'source': {
-            'name': _('Account Email or Object ID'),
-            'type': 'string',
-            'required': True,
-        },
-        'client_id': {
-            'name': _('Client ID'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9-]+$', 'i'),
-        },
-        'secret': {
-            'name': _('Client Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "tenant": {
+                "name": _("Tenant Domain"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9-]+$", "i"),
+            },
+            "source": {
+                "name": _("Account Email or Object ID"),
+                "type": "string",
+                "required": True,
+            },
+            "client_id": {
+                "name": _("Client ID"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9-]+$", "i"),
+            },
+            "secret": {
+                "name": _("Client Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'oauth_id': {
-            'alias_of': 'client_id',
-        },
-        'oauth_secret': {
-            'alias_of': 'secret',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "oauth_id": {
+                "alias_of": "client_id",
+            },
+            "oauth_secret": {
+                "alias_of": "secret",
+            },
         },
-    })
+    )
 
-    def __init__(self, tenant, client_id, secret, source=None,
-                 targets=None, cc=None, bcc=None, **kwargs):
-        """
-        Initialize Office 365 Object
-        """
+    def __init__(
+        self,
+        tenant,
+        client_id,
+        secret,
+        source=None,
+        targets=None,
+        cc=None,
+        bcc=None,
+        **kwargs,
+    ):
+        """Initialize Office 365 Object."""
         super().__init__(**kwargs)
 
         # Tenant identifier
         self.tenant = validate_regex(
-            tenant, *self.template_tokens['tenant']['regex'])
+            tenant, *self.template_tokens["tenant"]["regex"]
+        )
         if not self.tenant:
-            msg = 'An invalid Office 365 Tenant' \
-                  '({}) was specified.'.format(tenant)
+            msg = f"An invalid Office 365 Tenant({tenant}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -192,18 +203,23 @@ def __init__(self, tenant, client_id, secret, source=None,
 
         # Client Key (associated with generated OAuth2 Login)
         self.client_id = validate_regex(
-            client_id, *self.template_tokens['client_id']['regex'])
+            client_id, *self.template_tokens["client_id"]["regex"]
+        )
         if not self.client_id:
-            msg = 'An invalid Office 365 Client OAuth2 ID ' \
-                  '({}) was specified.'.format(client_id)
+            msg = (
+                "An invalid Office 365 Client OAuth2 ID "
+                f"({client_id}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Client Secret (associated with generated OAuth2 Login)
         self.secret = validate_regex(secret)
         if not self.secret:
-            msg = 'An invalid Office 365 Client OAuth2 Secret ' \
-                  '({}) was specified.'.format(secret)
+            msg = (
+                "An invalid Office 365 Client OAuth2 Secret "
+                f"({secret}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -217,7 +233,7 @@ def __init__(self, tenant, client_id, secret, source=None,
         self.bcc = set()
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         if targets:
             for recipient in parse_emails(targets):
@@ -225,19 +241,20 @@ def __init__(self, tenant, client_id, secret, source=None,
                 result = is_email(recipient)
                 if result:
                     # Add our email to our target list
-                    self.targets.append(
-                        (result['name'] if result['name'] else False,
-                            result['full_email']))
+                    self.targets.append((
+                        result["name"] if result["name"] else False,
+                        result["full_email"],
+                    ))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid To email ({}) specified.'
-                    .format(recipient))
+                    f"Dropped invalid To email ({recipient}) specified."
+                )
 
         else:
             result = is_email(self.source)
             if not result:
-                self.logger.warning('No Target Office 365 Email Detected')
+                self.logger.warning("No Target Office 365 Email Detected")
 
             else:
                 # If our target email list is empty we want to add ourselves to
@@ -248,32 +265,33 @@ def __init__(self, tenant, client_id, secret, source=None,
         for recipient in parse_emails(cc):
             email = is_email(recipient)
             if email:
-                self.cc.add(email['full_email'])
+                self.cc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
             )
 
         # Validate recipients (bcc:) and drop bad ones:
         for recipient in parse_emails(bcc):
             email = is_email(recipient)
             if email:
-                self.bcc.add(email['full_email'])
+                self.bcc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
             )
 
         # Our token is acquired upon a successful login
@@ -285,31 +303,33 @@ def __init__(self, tenant, client_id, secret, source=None,
         # Our email source; we detect this if the source is an ObjectID
         # If it is unknown we set this to None
         # User is the email associated with the account
-        self.from_email = self.store.get('from')
+        self.from_email = self.store.get("from")
         result = is_email(self.source)
         if result:
-            self.from_email = result['full_email']
-            self.from_name = \
-                result['name'] or self.store.get('name')
+            self.from_email = result["full_email"]
+            self.from_name = result["name"] or self.store.get("name")
 
         else:
-            self.from_name = self.store.get('name')
+            self.from_name = self.store.get("name")
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Office 365 Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Office 365 Notification."""
 
         # error tracking (used for function return)
         has_error = False
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning(
-                'There are no Email recipients to notify')
+            self.logger.warning("There are no Email recipients to notify")
             return False
 
         if self.from_email is None:
@@ -318,21 +338,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 return False
 
             # Acquire our from_email
-            url = "https://graph.microsoft.com/v1.0/users/{}".format(
-                self.source)
-            postokay, response = self._fetch(url=url, method='GET')
+            url = f"https://graph.microsoft.com/v1.0/users/{self.source}"
+            postokay, response = self._fetch(url=url, method="GET")
             if not postokay:
                 self.logger.warning(
-                    'Could not acquire From email address; ensure '
-                    '"User.Read.All" Application scope is set!')
+                    "Could not acquire From email address; ensure "
+                    '"User.Read.All" Application scope is set!'
+                )
 
             else:  # Acquire our from_email (if possible)
-                from_email = \
-                    response.get("mail") or response.get("userPrincipalName")
+                from_email = response.get("mail") or response.get(
+                    "userPrincipalName"
+                )
                 result = is_email(from_email)
                 if not result:
                     self.logger.warning(
-                        'Could not get From email from the Azure endpoint.')
+                        "Could not get From email from the Azure endpoint."
+                    )
 
                     # Prevent re-occuring upstream fetches for info that isn't
                     # there
@@ -340,59 +362,50 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 else:
                     # Store our email for future reference
-                    self.from_email = result['full_email']
-                    self.store.set('from', result['full_email'])
+                    self.from_email = result["full_email"]
+                    self.store.set("from", result["full_email"])
 
                     self.from_name = response.get("displayName")
                     if self.from_name:
-                        self.store.set('name', self.from_name)
+                        self.store.set("name", self.from_name)
 
         # Setup our Content Type
-        content_type = \
-            'HTML' if self.notify_format == NotifyFormat.HTML else 'Text'
+        content_type = (
+            "HTML" if self.notify_format == NotifyFormat.HTML else "Text"
+        )
 
         # Prepare our payload
         payload = {
-            'message': {
-                'subject': title,
-                'body': {
-                    'contentType': content_type,
-                    'content': body,
+            "message": {
+                "subject": title,
+                "body": {
+                    "contentType": content_type,
+                    "content": body,
                 },
             },
             # Below takes a string (not bool) of either 'true' or 'false'
-            'saveToSentItems': 'true'
+            "saveToSentItems": "true",
         }
 
         if self.from_email:
             # Apply from email if it is known
-            payload.update({
-                'message': {
-                    'from': {
-                        "emailAddress": {
-                            "address": self.from_email,
-                            "name": self.from_name or self.app_id,
-                        }
-                    },
-                }
+            payload["message"].update({
+                "from": {
+                    "emailAddress": {
+                        "address": self.from_email,
+                        "name": self.from_name or self.app_id,
+                    }
+                },
             })
 
         # Create a copy of the email list
         emails = list(self.targets)
 
         # Define our URL to post to
-        url = '{graph_url}/v1.0/users/{userid}/sendMail'.format(
-            graph_url=self.graph_url,
-            userid=self.source,
-        )
+        url = f"{self.graph_url}/v1.0/users/{self.source}/sendMail"
 
         # Prepare our Draft URL
-        draft_url = \
-            '{graph_url}/v1.0/users/{userid}/messages' \
-            .format(
-                graph_url=self.graph_url,
-                userid=self.source,
-            )
+        draft_url = f"{self.graph_url}/v1.0/users/{self.source}/messages"
 
         small_attachments = []
         large_attachments = []
@@ -406,17 +419,21 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Office 365 attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Office 365 attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 if len(attachment) > self.outlook_attachment_inline_max:
                     # Messages larger then xMB need to be uploaded after; a
                     # draft email must be prepared; below is our session
                     large_attachments.append({
-                        'obj': attachment,
-                        'name': attachment.name
-                        if attachment.name else f'file{no:03}.dat',
+                        "obj": attachment,
+                        "name": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
                     })
                     continue
 
@@ -425,29 +442,33 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     small_attachments.append({
                         "@odata.type": "#microsoft.graph.fileAttachment",
                         # Name of the attachment (as it should appear in email)
-                        "name": attachment.name
-                        if attachment.name else f'file{no:03}.dat',
+                        "name": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
                         # MIME type of the attachment
                         "contentType": "attachment.mimetype",
                         # Base64 Content
                         "contentBytes": attachment.base64(),
-
                     })
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Office 365 attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Office 365 attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending Office 365 attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending Office 365 attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         if small_attachments:
             # Store Attachments
-            payload['message']['attachments'] = small_attachments
+            payload["message"]["attachments"] = small_attachments
 
         while len(emails):
             # authenticate ourselves if we aren't already; but this function
@@ -461,67 +482,92 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             to_name, to_addr = emails.pop(0)
 
             # Strip target out of cc list if in To or Bcc
-            cc = (self.cc - self.bcc - set([to_addr]))
+            cc = self.cc - self.bcc - {to_addr}
 
             # Strip target out of bcc list if in To
-            bcc = (self.bcc - set([to_addr]))
+            bcc = self.bcc - {to_addr}
 
             # Prepare our email
-            payload['message']['toRecipients'] = [{
-                'emailAddress': {
-                    'address': to_addr
-                }
-            }]
+            payload["message"]["toRecipients"] = [
+                {"emailAddress": {"address": to_addr}}
+            ]
             if to_name:
                 # Apply our To Name
-                payload['message']['toRecipients'][0]['emailAddress']['name'] \
-                    = to_name
+                payload["message"]["toRecipients"][0]["emailAddress"][
+                    "name"
+                ] = to_name
 
-            self.logger.debug('{}Email To: {}'.format(
-                'Draft' if large_attachments else '', to_addr))
+            self.logger.debug(
+                "{}Email To: {}".format(
+                    "Draft" if large_attachments else "", to_addr
+                )
+            )
 
             if cc:
                 # Prepare our CC list
-                payload['message']['ccRecipients'] = []
+                payload["message"]["ccRecipients"] = []
                 for addr in cc:
-                    _payload = {'address': addr}
+                    payload_ = {"address": addr}
                     if self.names.get(addr):
-                        _payload['name'] = self.names[addr]
+                        payload_["name"] = self.names[addr]
 
                     # Store our address in our payload
-                    payload['message']['ccRecipients']\
-                        .append({'emailAddress': _payload})
+                    payload["message"]["ccRecipients"].append(
+                        {"emailAddress": payload_}
+                    )
 
-                self.logger.debug('{}Email Cc: {}'.format(
-                    'Draft' if large_attachments else '', ', '.join(
-                        ['{}{}'.format(
-                            '' if self.names.get(e)
-                            else '{}: '.format(
-                                self.names[e]), e) for e in cc])))
+                self.logger.debug(
+                    "{}Email Cc: {}".format(
+                        "Draft" if large_attachments else "",
+                        ", ".join([
+                            "{}{}".format(
+                                (
+                                    ""
+                                    if self.names.get(e)
+                                    else f"{self.names[e]}: "
+                                ),
+                                e,
+                            )
+                            for e in cc
+                        ]),
+                    )
+                )
 
             if bcc:
                 # Prepare our CC list
-                payload['message']['bccRecipients'] = []
+                payload["message"]["bccRecipients"] = []
                 for addr in bcc:
-                    _payload = {'address': addr}
+                    payload_ = {"address": addr}
                     if self.names.get(addr):
-                        _payload['name'] = self.names[addr]
+                        payload_["name"] = self.names[addr]
 
                     # Store our address in our payload
-                    payload['message']['bccRecipients']\
-                        .append({'emailAddress': _payload})
+                    payload["message"]["bccRecipients"].append(
+                        {"emailAddress": payload_}
+                    )
 
-                self.logger.debug('{}Email Bcc: {}'.format(
-                    'Draft' if large_attachments else '', ', '.join(
-                        ['{}{}'.format(
-                            '' if self.names.get(e)
-                            else '{}: '.format(
-                                self.names[e]), e) for e in bcc])))
+                self.logger.debug(
+                    "{}Email Bcc: {}".format(
+                        "Draft" if large_attachments else "",
+                        ", ".join([
+                            "{}{}".format(
+                                (
+                                    ""
+                                    if self.names.get(e)
+                                    else f"{self.names[e]}: "
+                                ),
+                                e,
+                            )
+                            for e in bcc
+                        ]),
+                    )
+                )
 
             # Perform upstream post
             postokay, response = self._fetch(
-                url=url if not large_attachments
-                else draft_url, payload=payload)
+                url=url if not large_attachments else draft_url,
+                payload=payload,
+            )
 
             # Test if we were okay
             if not postokay:
@@ -537,19 +583,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 message_id = response.get("id")
                 if not message_id:
                     self.logger.warning(
-                        'Email Draft ID could not be retrieved')
+                        "Email Draft ID could not be retrieved"
+                    )
                     has_error = True
                     continue
 
-                self.logger.debug('Email Draft ID: {}'.format(message_id))
+                self.logger.debug(f"Email Draft ID: {message_id}")
                 # In future, the below could probably be called via async
                 has_attach_error = False
                 for attachment in large_attachments:
                     if not self.upload_attachment(
-                            attachment['obj'], message_id, attachment['name']):
+                        attachment["obj"], message_id, attachment["name"]
+                    ):
                         self.logger.warning(
-                            'Could not prepare attachment session for %s',
-                            attachment['name'])
+                            "Could not prepare attachment session for %s",
+                            attachment["name"],
+                        )
 
                         has_error = True
                         has_attach_error = True
@@ -560,9 +609,10 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     continue
 
                 # Send off our draft
-                attach_url = \
-                    "https://graph.microsoft.com/v1.0/users/" \
+                attach_url = (
+                    "https://graph.microsoft.com/v1.0/users/"
                     "{}/messages/{}/send"
+                )
 
                 attach_url = attach_url.format(
                     self.source,
@@ -573,7 +623,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 postokay, response = self._fetch(url=url)
                 if not postokay:
                     self.logger.warning(
-                        'Could not send drafted email id: {} ', message_id)
+                        "Could not send drafted email id: {} ", message_id
+                    )
                     has_error = True
                     continue
 
@@ -585,35 +636,37 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         return not has_error
 
     def upload_attachment(self, attachment, message_id, name=None):
-        """
-        Uploads an attachment to a session
-        """
+        """Uploads an attachment to a session."""
 
         # Perform some simple error checking
         if not attachment:
             # We could not access the attachment
             self.logger.error(
-                'Could not access Office 365 attachment {}.'.format(
-                    attachment.url(privacy=True)))
+                "Could not access Office 365 attachment"
+                f" {attachment.url(privacy=True)}."
+            )
             return False
 
         # Our Session URL
-        url = \
-            '{graph_url}/v1.0/users/{userid}/message/{message_id}' \
-            .format(
-                graph_url=self.graph_url,
-                userid=self.source,
-                message_id=message_id,
-            ) + '/attachments/createUploadSession'
+        url = (
+            f"{self.graph_url}/v1.0/users/{self.source}/message/{message_id}"
+            + "/attachments/createUploadSession"
+        )
 
         file_size = len(attachment)
 
         payload = {
             "AttachmentItem": {
                 "attachmentType": "file",
-                "name": name if name else (
-                    attachment.name
-                    if attachment.name else '{}.dat'.format(str(uuid4()))),
+                "name": (
+                    name
+                    if name
+                    else (
+                        attachment.name
+                        if attachment.name
+                        else f"{uuid4()!s}.dat"
+                    )
+                ),
                 # MIME type of the attachment
                 "contentType": attachment.mimetype,
                 "size": file_size,
@@ -629,7 +682,7 @@ def upload_attachment(self, attachment, message_id, name=None):
         if not postokay:
             return False
 
-        upload_url = response.get('uploadUrl')
+        upload_url = response.get("uploadUrl")
         if not upload_url:
             return False
 
@@ -642,16 +695,19 @@ def upload_attachment(self, attachment, message_id, name=None):
 
             # Define headers for this chunk
             headers = {
-                'User-Agent': self.app_id,
-                'Content-Length': str(len(chunk)),
-                'Content-Range':
-                f'bytes {start_byte}-{end_byte}/{file_size}'
+                "User-Agent": self.app_id,
+                "Content-Length": str(len(chunk)),
+                "Content-Range": f"bytes {start_byte}-{end_byte}/{file_size}",
             }
 
             # Upload the chunk
             postokay, response = self._fetch(
-                upload_url, chunk, headers=headers, content_type=None,
-                method='PUT')
+                upload_url,
+                chunk,
+                headers=headers,
+                content_type=None,
+                method="PUT",
+            )
             if not postokay:
                 return False
 
@@ -659,14 +715,11 @@ def upload_attachment(self, attachment, message_id, name=None):
         return postokay
 
     def authenticate(self):
-        """
-        Logs into and acquires us an authentication token to work with
-        """
+        """Logs into and acquires us an authentication token to work with."""
 
         if self.token and self.token_expiry > datetime.now():
             # If we're already authenticated and our token is still valid
-            self.logger.debug(
-                'Already authenticate with token {}'.format(self.token))
+            self.logger.debug(f"Already authenticate with token {self.token}")
             return True
 
         # If we reach here, we've either expired, or we need to authenticate
@@ -674,12 +727,10 @@ def authenticate(self):
 
         # Prepare our payload
         payload = {
-            'grant_type': 'client_credentials',
-            'client_id': self.client_id,
-            'client_secret': self.secret,
-            'scope': '{graph_url}/{scope}'.format(
-                graph_url=self.graph_url,
-                scope=self.scope),
+            "grant_type": "client_credentials",
+            "client_id": self.client_id,
+            "client_secret": self.secret,
+            "scope": f"{self.graph_url}/{self.scope}",
         }
 
         # Prepare our URL
@@ -708,8 +759,10 @@ def authenticate(self):
         #    }
 
         postokay, response = self._fetch(
-            url=url, payload=payload,
-            content_type='application/x-www-form-urlencoded')
+            url=url,
+            payload=payload,
+            content_type="application/x-www-form-urlencoded",
+        )
         if not postokay:
             return False
 
@@ -720,8 +773,9 @@ def authenticate(self):
             # Extract our time from our response and subtrace 10 seconds from
             # it to give us some wiggle/grace people to re-authenticate if we
             # need to
-            self.token_expiry = datetime.now() + \
-                timedelta(seconds=int(response.get('expires_in')) - 10)
+            self.token_expiry = datetime.now() + timedelta(
+                seconds=int(response.get("expires_in")) - 10
+            )
 
         except (ValueError, AttributeError, TypeError):
             # ValueError: expires_in wasn't an integer
@@ -731,69 +785,88 @@ def authenticate(self):
             return False
 
         # Go ahead and store our token if it's available
-        self.token = response.get('access_token')
+        self.token = response.get("access_token")
 
         # We're authenticated
-        return True if self.token else False
-
-    def _fetch(self, url, payload=None, headers=None,
-               content_type='application/json', method='POST'):
-        """
-        Wrapper to request object
-
-        """
+        return bool(self.token)
+
+    def _fetch(
+        self,
+        url,
+        payload=None,
+        headers=None,
+        content_type="application/json",
+        method="POST",
+    ):
+        """Wrapper to request object."""
 
         # Prepare our headers:
         if not headers:
             headers = {
-                'User-Agent': self.app_id,
-                'Content-Type': content_type,
+                "User-Agent": self.app_id,
+                "Content-Type": content_type,
             }
 
         if self.token:
             # Are we authenticated?
-            headers['Authorization'] = 'Bearer ' + self.token
+            headers["Authorization"] = "Bearer " + self.token
 
         # Default content response object
         content = {}
 
         # Some Debug Logging
-        self.logger.debug('Office 365 %s URL: {} (cert_verify={})'.format(
-            url, self.verify_certificate), method)
-        self.logger.debug('Office 365 Payload: {}' .format(payload))
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                "Office 365 %s URL:"
+                f" {url} (cert_verify={self.verify_certificate})",
+                method,
+            )
+            self.logger.debug(
+                "Office 365 Payload: %s", sanitize_payload(payload))
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
 
         # fetch function
-        req = requests.post if method == 'POST' else (
-            requests.put if method == 'PUT' else requests.get)
+        req = (
+            requests.post
+            if method == "POST"
+            else (requests.put if method == "PUT" else requests.get)
+        )
 
         try:
             r = req(
                 url,
-                data=json.dumps(payload)
-                if content_type and content_type.endswith('/json')
-                else payload,
+                data=(
+                    json.dumps(payload)
+                    if content_type and content_type.endswith("/json")
+                    else payload
+                ),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
             )
 
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.created,
-                    requests.codes.accepted):
+                requests.codes.ok,
+                requests.codes.created,
+                requests.codes.accepted,
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifyOffice365.http_response_code_lookup(r.status_code)
+                status_str = NotifyOffice365.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Office 365 %s to {}: '
-                    '{}error={}.'.format(
-                        url,
-                        ', ' if status_str else '',
-                        r.status_code), method)
+                    "Failed to send Office 365 %s to {}: {}error={}.".format(
+                        url, ", " if status_str else "", r.status_code
+                    ),
+                    method,
+                )
 
                 # A Response could look like this if a Scope element was not
                 # found:
@@ -838,7 +911,7 @@ def _fetch(self, url, payload=None, headers=None,
                 # }
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Mark our failure
                 return (False, content)
@@ -854,9 +927,10 @@ def _fetch(self, url, payload=None, headers=None,
 
         except requests.RequestException as e:
             self.logger.warning(
-                'Exception received when sending Office 365 %s to {}: '.
-                format(url), method)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"Exception received when sending Office 365 %s to {url}: ",
+                method,
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             return (False, content)
@@ -865,68 +939,74 @@ def _fetch(self, url, payload=None, headers=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol[0], self.source, self.tenant, self.client_id,
+            self.secure_protocol[0],
+            self.source,
+            self.tenant,
+            self.client_id,
             self.secret,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Extend our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if self.cc:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join(
-                ['{}{}'.format(
-                    '' if not self.names.get(e)
-                    else '{}:'.format(self.names[e]), e) for e in self.cc])
+            params["cc"] = ",".join([
+                "{}{}".format(
+                    "" if not self.names.get(e) else f"{self.names[e]}:", e
+                )
+                for e in self.cc
+            ])
 
         if self.bcc:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join(
-                ['{}{}'.format(
-                    '' if not self.names.get(e)
-                    else '{}:'.format(self.names[e]), e) for e in self.bcc])
+            params["bcc"] = ",".join([
+                "{}{}".format(
+                    "" if not self.names.get(e) else f"{self.names[e]}:", e
+                )
+                for e in self.bcc
+            ])
 
-        return '{schema}://{source}/{tenant}/{client_id}/{secret}' \
-            '/{targets}/?{params}'.format(
+        return (
+            "{schema}://{source}/{tenant}/{client_id}/{secret}"
+            "/{targets}/?{params}".format(
                 schema=self.secure_protocol[0],
-                tenant=self.pprint(self.tenant, privacy, safe=''),
+                tenant=self.pprint(self.tenant, privacy, safe=""),
                 # email does not need to be escaped because it should
                 # already be a valid host and username at this point
                 source=self.source,
-                client_id=self.pprint(self.client_id, privacy, safe=''),
+                client_id=self.pprint(self.client_id, privacy, safe=""),
                 secret=self.pprint(
-                    self.secret, privacy, mode=PrivacyMode.Secret,
-                    safe=''),
-                targets='/'.join(
-                    [NotifyOffice365.quote('{}{}'.format(
-                        '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                        safe='@') for e in self.targets]),
-                params=NotifyOffice365.urlencode(params))
+                    self.secret, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
+                targets="/".join([
+                    NotifyOffice365.quote(
+                        "{}{}".format("" if not e[0] else f"{e[0]}:", e[1]),
+                        safe="@",
+                    )
+                    for e in self.targets
+                ]),
+                params=NotifyOffice365.urlencode(params),
+            )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -938,97 +1018,101 @@ def parse_url(url):
         # where each email found we mark as a target. Once we run out
         # of targets, the presume the remainder of the entries are part
         # of the secret key (since it can contain slashes in it)
-        entries = NotifyOffice365.split_path(results['fullpath'])
+        entries = NotifyOffice365.split_path(results["fullpath"])
 
         # Initialize our tenant
-        results['tenant'] = None
+        results["tenant"] = None
 
         # Initialize our email
-        results['email'] = None
+        results["email"] = None
 
         # From Email
-        if 'from' in results['qsd'] and \
-                len(results['qsd']['from']):
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
             # Extract the sending account's information
-            results['source'] = \
-                NotifyOffice365.unquote(results['qsd']['from'])
+            results["source"] = NotifyOffice365.unquote(results["qsd"]["from"])
 
         # If tenant is occupied, then the user defined makes up our source
-        elif results['user']:
-            results['source'] = '{}@{}'.format(
-                NotifyOffice365.unquote(results['user']),
-                NotifyOffice365.unquote(results['host']),
+        elif results["user"]:
+            results["source"] = "{}@{}".format(
+                NotifyOffice365.unquote(results["user"]),
+                NotifyOffice365.unquote(results["host"]),
             )
 
         else:
             # Object ID instead of email
-            results['source'] = NotifyOffice365.unquote(results['host'])
+            results["source"] = NotifyOffice365.unquote(results["host"])
 
         # Tenant
-        if 'tenant' in results['qsd'] and len(results['qsd']['tenant']):
+        if "tenant" in results["qsd"] and len(results["qsd"]["tenant"]):
             # Extract the Tenant from the argument
-            results['tenant'] = \
-                NotifyOffice365.unquote(results['qsd']['tenant'])
+            results["tenant"] = NotifyOffice365.unquote(
+                results["qsd"]["tenant"]
+            )
 
         elif entries:
-            results['tenant'] = NotifyOffice365.unquote(entries.pop(0))
+            results["tenant"] = NotifyOffice365.unquote(entries.pop(0))
 
         # OAuth2 ID
-        if 'oauth_id' in results['qsd'] and len(results['qsd']['oauth_id']):
+        if "oauth_id" in results["qsd"] and len(results["qsd"]["oauth_id"]):
             # Extract the API Key from an argument
-            results['client_id'] = \
-                NotifyOffice365.unquote(results['qsd']['oauth_id'])
+            results["client_id"] = NotifyOffice365.unquote(
+                results["qsd"]["oauth_id"]
+            )
 
         elif entries:
             # Get our client_id is the first entry on the path
-            results['client_id'] = NotifyOffice365.unquote(entries.pop(0))
+            results["client_id"] = NotifyOffice365.unquote(entries.pop(0))
 
         #
         # Prepare our target listing
         #
-        results['targets'] = list()
+        results["targets"] = []
         while entries:
             # Pop the last entry
             entry = NotifyOffice365.unquote(entries.pop(-1))
 
             if is_email(entry):
                 # Store our email and move on
-                results['targets'].append(entry)
+                results["targets"].append(entry)
                 continue
 
             # If we reach here, the entry we just popped is part of the secret
             # key, so put it back
-            entries.append(NotifyOffice365.quote(entry, safe=''))
+            entries.append(NotifyOffice365.quote(entry, safe=""))
 
             # We're done
             break
 
         # OAuth2 Secret
-        if 'oauth_secret' in results['qsd'] and \
-                len(results['qsd']['oauth_secret']):
+        if "oauth_secret" in results["qsd"] and len(
+            results["qsd"]["oauth_secret"]
+        ):
             # Extract the API Secret from an argument
-            results['secret'] = \
-                NotifyOffice365.unquote(results['qsd']['oauth_secret'])
+            results["secret"] = NotifyOffice365.unquote(
+                results["qsd"]["oauth_secret"]
+            )
 
         else:
             # Assemble our secret key which is a combination of the host
             # followed by all entries in the full path that follow up until
             # the first email
-            results['secret'] = '/'.join(
-                [NotifyOffice365.unquote(x) for x in entries])
+            results["secret"] = "/".join(
+                [NotifyOffice365.unquote(x) for x in entries]
+            )
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyOffice365.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyOffice365.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = results['qsd']['cc']
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = results["qsd"]["cc"]
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = results['qsd']['bcc']
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = results["qsd"]["bcc"]
 
         return results
diff --git a/libs/apprise/plugins/one_signal.py b/libs/apprise/plugins/one_signal.py
index b32899cec9..5b42aad5b2 100644
--- a/libs/apprise/plugins/one_signal.py
+++ b/libs/apprise/plugins/one_signal.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -33,26 +32,26 @@
 #  - https://documentation.onesignal.com/docs/accounts-and-keys
 #  - https://documentation.onesignal.com/reference/create-notification
 
-import requests
-from json import dumps
 from itertools import chain
+from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..utils.base64 import decode_b64_dict, encode_b64_dict
-from ..utils.parse import validate_regex, parse_list, parse_bool, is_email
+import requests
+
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.base64 import decode_b64_dict, encode_b64_dict
+from ..utils.parse import is_email, parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 
 class OneSignalCategory:
-    """
-    We define the different category types that we can notify via OneSignal
-    """
-    PLAYER = 'include_player_ids'
-    EMAIL = 'include_email_tokens'
-    USER = 'include_external_user_ids'
-    SEGMENT = 'included_segments'
+    """We define the different category types that we can notify via
+    OneSignal."""
+
+    PLAYER = "include_player_ids"
+    EMAIL = "include_email_tokens"
+    USER = "include_external_user_ids"
+    SEGMENT = "included_segments"
 
 
 ONESIGNAL_CATEGORIES = (
@@ -64,20 +63,19 @@ class OneSignalCategory:
 
 
 class NotifyOneSignal(NotifyBase):
-    """
-    A wrapper for OneSignal Notifications
-    """
+    """A wrapper for OneSignal Notifications."""
+
     # The default descriptive name associated with the Notification
-    service_name = 'OneSignal'
+    service_name = "OneSignal"
 
     # The services URL
-    service_url = 'https://onesignal.com'
+    service_url = "https://onesignal.com"
 
     # The default protocol
-    secure_protocol = 'onesignal'
+    secure_protocol = "onesignal"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_onesignal'
+    setup_url = "https://appriseit.com/services/onesignal/"
 
     # Notification
     notify_url = "https://api.onesignal.com/notifications"
@@ -90,153 +88,176 @@ class NotifyOneSignal(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{app}@{apikey}/{targets}',
-        '{schema}://{template}:{app}@{apikey}/{targets}',
+        "{schema}://{app}@{apikey}/{targets}",
+        "{schema}://{template}:{app}@{apikey}/{targets}",
     )
 
     # Define our template
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        # The App_ID is a UUID
-        # such as: 8250eaf6-1a58-489e-b136-7c74a864b434
-        'app': {
-            'name': _('App ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'template': {
-            'name': _('Template'),
-            'type': 'string',
-            'private': True,
-        },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_player': {
-            'name': _('Target Player ID'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'target_segment': {
-            'name': _('Include Segment'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            # The App_ID is a UUID
+            # such as: 8250eaf6-1a58-489e-b136-7c74a864b434
+            "app": {
+                "name": _("App ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "template": {
+                "name": _("Template"),
+                "type": "string",
+                "private": True,
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_player": {
+                "name": _("Target Player ID"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_segment": {
+                "name": _("Include Segment"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-    })
+    )
 
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-        'contents': {
-            'name': _('Enable Contents'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'use_contents',
-        },
-        'decode': {
-            'name': _('Decode Template Args'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'decode_tpl_args',
-        },
-        'template': {
-            'alias_of': 'template',
-        },
-        'subtitle': {
-            'name': _('Subtitle'),
-            'type': 'string',
-        },
-        'language': {
-            'name': _('Language'),
-            'type': 'string',
-            'default': 'en',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
+            "contents": {
+                "name": _("Enable Contents"),
+                "type": "bool",
+                "default": True,
+                "map_to": "use_contents",
+            },
+            "decode": {
+                "name": _("Decode Template Args"),
+                "type": "bool",
+                "default": False,
+                "map_to": "decode_tpl_args",
+            },
+            "template": {
+                "alias_of": "template",
+            },
+            "subtitle": {
+                "name": _("Subtitle"),
+                "type": "string",
+            },
+            "language": {
+                "name": _("Language"),
+                "type": "string",
+                "default": "en",
+            },
         },
-    })
+    )
 
     # Define our token control
     template_kwargs = {
-        'custom': {
-            'name': _('Custom Data'),
-            'prefix': ':',
+        "custom": {
+            "name": _("Custom Data"),
+            "prefix": ":",
         },
-        'postback': {
-            'name': _('Postback Data'),
-            'prefix': '+',
+        "postback": {
+            "name": _("Postback Data"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, app, apikey, targets=None, include_image=True,
-                 template=None, subtitle=None, language=None, batch=None,
-                 use_contents=None, decode_tpl_args=None,
-                 custom=None, postback=None, **kwargs):
-        """
-        Initialize OneSignal
-
-        """
+    def __init__(
+        self,
+        app,
+        apikey,
+        targets=None,
+        include_image=True,
+        template=None,
+        subtitle=None,
+        language=None,
+        batch=None,
+        use_contents=None,
+        decode_tpl_args=None,
+        custom=None,
+        postback=None,
+        **kwargs,
+    ):
+        """Initialize OneSignal."""
         super().__init__(**kwargs)
 
         # The apikey associated with the account
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid OneSignal API key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid OneSignal API key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The App ID associated with the account
         self.app = validate_regex(app)
         if not self.app:
-            msg = 'An invalid OneSignal Application ID ' \
-                  '({}) was specified.'.format(app)
+            msg = f"An invalid OneSignal Application ID ({app}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Prepare Batch Mode Flag
-        self.batch_size = self.default_batch_size if (
-            batch if batch is not None else
-            self.template_args['batch']['default']) else 1
+        self.batch_size = (
+            self.default_batch_size
+            if (
+                batch
+                if batch is not None
+                else self.template_args["batch"]["default"]
+            )
+            else 1
+        )
 
         # Prepare Use Contents Flag
-        self.use_contents = True if (
-            use_contents if use_contents is not None else
-            self.template_args['contents']['default']) else False
+        self.use_contents = bool(
+            use_contents
+            if use_contents is not None
+            else self.template_args["contents"]["default"]
+        )
 
         # Prepare Decode Template Arguments Flag
-        self.decode_tpl_args = True if (
-            decode_tpl_args if decode_tpl_args is not None else
-            self.template_args['decode']['default']) else False
+        self.decode_tpl_args = bool(
+            decode_tpl_args
+            if decode_tpl_args is not None
+            else self.template_args["decode"]["default"]
+        )
 
         # Place a thumbnail image inline with the message body
         self.include_image = include_image
@@ -256,57 +277,63 @@ def __init__(self, app, apikey, targets=None, include_image=True,
         self.subtitle = subtitle
 
         # Our Language
-        self.language = language.strip().lower()[0:2]\
-            if language \
-            else NotifyOneSignal.template_args['language']['default']
+        self.language = (
+            language.strip().lower()[0:2]
+            if language
+            else NotifyOneSignal.template_args["language"]["default"]
+        )
 
         if not self.language or len(self.language) != 2:
-            msg = 'An invalid OneSignal Language ({}) was specified.'.format(
-                language)
+            msg = f"An invalid OneSignal Language ({language}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Sort our targets
-        for _target in parse_list(targets):
-            target = _target.strip()
+        for target_ in parse_list(targets):
+            target = target_.strip()
             if len(target) < 2:
-                self.logger.debug('Ignoring OneSignal Entry: %s' % target)
+                self.logger.debug(f"Ignoring OneSignal Entry: {target}")
                 continue
 
             if target.startswith(
-                    NotifyOneSignal.template_tokens
-                    ['target_user']['prefix']):
+                NotifyOneSignal.template_tokens["target_user"]["prefix"]
+            ):
 
                 self.targets[OneSignalCategory.USER].append(target)
                 self.logger.debug(
-                    'Detected OneSignal UserID: %s' %
-                    self.targets[OneSignalCategory.USER][-1])
+                    "Detected OneSignal UserID:"
+                    f" {self.targets[OneSignalCategory.USER][-1]}"
+                )
                 continue
 
             if target.startswith(
-                    NotifyOneSignal.template_tokens
-                    ['target_segment']['prefix']):
+                NotifyOneSignal.template_tokens["target_segment"]["prefix"]
+            ):
 
                 self.targets[OneSignalCategory.SEGMENT].append(target)
                 self.logger.debug(
-                    'Detected OneSignal Include Segment: %s' %
-                    self.targets[OneSignalCategory.SEGMENT][-1])
+                    "Detected OneSignal Include Segment:"
+                    f" {self.targets[OneSignalCategory.SEGMENT][-1]}"
+                )
                 continue
 
             result = is_email(target)
             if result:
-                self.targets[OneSignalCategory.EMAIL]\
-                    .append(result['full_email'])
+                self.targets[OneSignalCategory.EMAIL].append(
+                    result["full_email"]
+                )
                 self.logger.debug(
-                    'Detected OneSignal Email: %s' %
-                    self.targets[OneSignalCategory.EMAIL][-1])
+                    "Detected OneSignal Email:"
+                    f" {self.targets[OneSignalCategory.EMAIL][-1]}"
+                )
 
             else:
                 # Add element as Player ID
                 self.targets[OneSignalCategory.PLAYER].append(target)
                 self.logger.debug(
-                    'Detected OneSignal Player ID: %s' %
-                    self.targets[OneSignalCategory.PLAYER][-1])
+                    "Detected OneSignal Player ID:"
+                    f" {self.targets[OneSignalCategory.PLAYER][-1]}"
+                )
 
         # Custom Data
         self.custom_data = {}
@@ -317,8 +344,10 @@ def __init__(self, app, apikey, targets=None, include_image=True,
             self.custom_data.update(custom)
 
         elif custom:
-            msg = 'The specified OneSignal Custom Data ' \
-                  '({}) are not identified as a dictionary.'.format(custom)
+            msg = (
+                "The specified OneSignal Custom Data "
+                f"({custom}) are not identified as a dictionary."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -328,29 +357,29 @@ def __init__(self, app, apikey, targets=None, include_image=True,
             self.postback_data.update(postback)
 
         elif postback:
-            msg = 'The specified OneSignal Postback Data ' \
-                  '({}) are not identified as a dictionary.'.format(postback)
+            msg = (
+                "The specified OneSignal Postback Data "
+                f"({postback}) are not identified as a dictionary."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform OneSignal Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform OneSignal Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json; charset=utf-8',
-            "Authorization": "Basic {}".format(self.apikey),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json; charset=utf-8",
+            "Authorization": f"Basic {self.apikey}",
         }
 
         has_error = False
         sent_count = 0
 
         payload = {
-            'app_id': self.app,
-            'contents': {
+            "app_id": self.app,
+            "contents": {
                 self.language: body,
             },
             # Sending true wakes your app from background to run custom native
@@ -358,68 +387,77 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Note: Not applicable if the app is in the "force-quit" state
             #      (i.e app was swiped away). Omit the contents field to
             #      prevent displaying a visible notification.
-            'content_available': True,
+            "content_available": True,
         }
 
         if self.template_id:
             # Store template information
-            payload['template_id'] = self.template_id
+            payload["template_id"] = self.template_id
 
             if not self.use_contents:
                 # Only if a template is defined can contents be removed
-                del payload['contents']
+                del payload["contents"]
 
         # Set our data if defined
         if self.custom_data:
             payload.update({
-                'custom_data': self.custom_data,
+                "custom_data": self.custom_data,
             })
 
         # Set our postback data if defined
         if self.postback_data:
             payload.update({
-                'data': self.postback_data,
+                "data": self.postback_data,
             })
 
         if title:
             # Display our title if defined
-            payload.update({
-                'headings': {
-                    self.language: title,
-                }})
+            payload.update(
+                {
+                    "headings": {
+                        self.language: title,
+                    }
+                }
+            )
 
         if self.subtitle:
             payload.update({
-                'subtitle': {
+                "subtitle": {
                     self.language: self.subtitle,
                 },
             })
 
         # Acquire our large_icon image URL (if set)
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
         if image_url:
-            payload['large_icon'] = image_url
+            payload["large_icon"] = image_url
 
         # Acquire our small_icon image URL (if set)
-        image_url = None if not self.include_image \
+        image_url = (
+            None
+            if not self.include_image
             else self.image_url(notify_type, image_size=NotifyImageSize.XY_32)
+        )
         if image_url:
-            payload['small_icon'] = image_url
+            payload["small_icon"] = image_url
 
         for category in ONESIGNAL_CATEGORIES:
             # Create a pointer to our list of targets for specified category
             targets = self.targets[category]
             for index in range(0, len(targets), self.batch_size):
-                payload[category] = targets[index:index + self.batch_size]
+                payload[category] = targets[index : index + self.batch_size]
 
                 # Track our sent count
                 sent_count += len(payload[category])
 
-                self.logger.debug('OneSignal POST URL: %s (cert_verify=%r)' % (
-                    self.notify_url, self.verify_certificate,
-                ))
-                self.logger.debug('OneSignal Payload: %s' % str(payload))
+                self.logger.debug(
+                    "OneSignal POST URL:"
+                    f" {self.notify_url} "
+                    f"(cert_verify={self.verify_certificate!r})"
+                )
+                self.logger.debug(f"OneSignal Payload: {payload!s}")
 
                 # Always call throttle before any remote server i/o is made
                 self.throttle()
@@ -432,64 +470,70 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         timeout=self.request_timeout,
                     )
                     if r.status_code not in (
-                            requests.codes.ok, requests.codes.no_content):
+                        requests.codes.ok,
+                        requests.codes.no_content,
+                    ):
                         # We had a problem
-                        status_str = \
-                            NotifyOneSignal.http_response_code_lookup(
-                                r.status_code)
+                        status_str = NotifyOneSignal.http_response_code_lookup(
+                            r.status_code
+                        )
 
                         self.logger.warning(
-                            'Failed to send OneSignal notification: '
-                            '{}{}error={}.'.format(
+                            "Failed to send OneSignal notification: "
+                            "{}{}error={}.".format(
                                 status_str,
-                                ', ' if status_str else '',
-                                r.status_code))
+                                ", " if status_str else "",
+                                r.status_code,
+                            )
+                        )
 
                         self.logger.debug(
-                            'Response Details:\r\n%s', r.content)
+                            "Response Details:\r\n%r",
+                            (r.content or b"")[:2000])
 
                         has_error = True
 
                     else:
-                        self.logger.info('Sent OneSignal notification.')
+                        self.logger.info("Sent OneSignal notification.")
 
                 except requests.RequestException as e:
                     self.logger.warning(
-                        'A Connection error occurred sending OneSignal '
-                        'notification.'
+                        "A Connection error occurred sending OneSignal "
+                        "notification."
                     )
-                    self.logger.debug('Socket Exception: %s', str(e))
+                    self.logger.debug("Socket Exception: %s", e)
 
                     has_error = True
 
         if not sent_count:
             # There is no one to notify; we need to capture this and not
             # return a valid
-            self.logger.warning('There are no OneSignal targets to notify')
+            self.logger.warning("There are no OneSignal targets to notify")
             return False
 
         return not has_error
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.template_id, self.app, self.apikey,
+            self.secure_protocol,
+            self.template_id,
+            self.app,
+            self.apikey,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'batch': 'yes' if self.batch_size > 1 else 'no',
+            "image": "yes" if self.include_image else "no",
+            "batch": "yes" if self.batch_size > 1 else "no",
         }
 
         # Extend our parameters
@@ -498,49 +542,72 @@ def url(self, privacy=False, *args, **kwargs):
         custom_data, needs_decoding = encode_b64_dict(self.custom_data)
         # custom_data, needs_decoding = self.custom_data, False
         # Save our template data
-        params.update(
-            {':{}'.format(k): v for k, v in custom_data.items()}
-        )
+        params.update({f":{k}": v for k, v in custom_data.items()})
 
         # Save our postback data
-        params.update(
-            {'+{}'.format(k): v for k, v in self.postback_data.items()})
+        params.update({f"+{k}": v for k, v in self.postback_data.items()})
 
-        if self.use_contents != self.template_args['contents']['default']:
-            params['contents'] = 'yes' if self.use_contents else 'no'
+        if self.use_contents != self.template_args["contents"]["default"]:
+            params["contents"] = "yes" if self.use_contents else "no"
 
-        if (self.decode_tpl_args != self.template_args['decode']['default']
-                or needs_decoding):
-            params['decode'] = 'yes' if (self.decode_tpl_args or
-                                         needs_decoding) else 'no'
+        if (
+            self.decode_tpl_args != self.template_args["decode"]["default"]
+            or needs_decoding
+        ):
+            params["decode"] = (
+                "yes" if (self.decode_tpl_args or needs_decoding) else "no"
+            )
 
-        return '{schema}://{tp_id}{app}@{apikey}/{targets}?{params}'.format(
+        return "{schema}://{tp_id}{app}@{apikey}/{targets}?{params}".format(
             schema=self.secure_protocol,
-            tp_id='{}:'.format(
-                self.pprint(self.template_id, privacy, safe=''))
-            if self.template_id else '',
-            app=self.pprint(self.app, privacy, safe=''),
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(chain(
-                [NotifyOneSignal.quote(x)
-                    for x in self.targets[OneSignalCategory.PLAYER]],
-                [NotifyOneSignal.quote(x)
-                    for x in self.targets[OneSignalCategory.EMAIL]],
-                [NotifyOneSignal.quote('{}{}'.format(
-                    NotifyOneSignal.template_tokens
-                    ['target_user']['prefix'], x), safe='')
-                    for x in self.targets[OneSignalCategory.USER]],
-                [NotifyOneSignal.quote('{}{}'.format(
-                    NotifyOneSignal.template_tokens
-                    ['target_segment']['prefix'], x), safe='')
-                    for x in self.targets[OneSignalCategory.SEGMENT]])),
+            tp_id=(
+                "{}:".format(self.pprint(self.template_id, privacy, safe=""))
+                if self.template_id
+                else ""
+            ),
+            app=self.pprint(self.app, privacy, safe=""),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                chain(
+                    [
+                        NotifyOneSignal.quote(x)
+                        for x in self.targets[OneSignalCategory.PLAYER]
+                    ],
+                    [
+                        NotifyOneSignal.quote(x)
+                        for x in self.targets[OneSignalCategory.EMAIL]
+                    ],
+                    [
+                        NotifyOneSignal.quote(
+                            "{}{}".format(
+                                NotifyOneSignal.template_tokens["target_user"][
+                                    "prefix"
+                                ],
+                                x,
+                            ),
+                            safe="",
+                        )
+                        for x in self.targets[OneSignalCategory.USER]
+                    ],
+                    [
+                        NotifyOneSignal.quote(
+                            "{}{}".format(
+                                NotifyOneSignal.template_tokens[
+                                    "target_segment"
+                                ]["prefix"],
+                                x,
+                            ),
+                            safe="",
+                        )
+                        for x in self.targets[OneSignalCategory.SEGMENT]
+                    ],
+                )
+            ),
             params=NotifyOneSignal.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
@@ -548,100 +615,103 @@ def __len__(self):
             # Batches can only be sent by group (you can't combine groups into
             # a single batch)
             total_targets = 0
-            for k, m in self.targets.items():
+            for _k, m in self.targets.items():
                 targets = len(m)
-                total_targets += int(targets / self.batch_size) + \
-                    (1 if targets % self.batch_size else 0)
+                total_targets += int(targets / self.batch_size) + (
+                    1 if targets % self.batch_size else 0
+                )
             return total_targets
 
         # Normal batch count; just count the targets
-        return sum([len(m) for _, m in self.targets.items()])
+        return sum(len(m) for _, m in self.targets.items())
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if not results.get('password'):
+        if not results.get("password"):
             # The APP ID identifier associated with the account
-            results['app'] = NotifyOneSignal.unquote(results['user'])
+            results["app"] = NotifyOneSignal.unquote(results["user"])
 
         else:
             # The APP ID identifier associated with the account
-            results['app'] = NotifyOneSignal.unquote(results['password'])
+            results["app"] = NotifyOneSignal.unquote(results["password"])
             # The Template ID
-            results['template'] = NotifyOneSignal.unquote(results['user'])
+            results["template"] = NotifyOneSignal.unquote(results["user"])
 
         # Get Image Boolean (if set)
-        results['include_image'] = \
-            parse_bool(
-                results['qsd'].get(
-                    'image',
-                    NotifyOneSignal.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyOneSignal.template_args["image"]["default"]
+            )
+        )
 
         # Get Batch Boolean (if set)
-        results['batch'] = \
-            parse_bool(
-                results['qsd'].get(
-                    'batch',
-                    NotifyOneSignal.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyOneSignal.template_args["batch"]["default"]
+            )
+        )
 
         # Get Use Contents Boolean (if set)
-        results['use_contents'] = \
-            parse_bool(
-                results['qsd'].get(
-                    'contents',
-                    NotifyOneSignal.template_args['contents']['default']))
+        results["use_contents"] = parse_bool(
+            results["qsd"].get(
+                "contents",
+                NotifyOneSignal.template_args["contents"]["default"],
+            )
+        )
 
         # Get Use Contents Boolean (if set)
-        results['decode_tpl_args'] = \
-            parse_bool(
-                results['qsd'].get(
-                    'decode',
-                    NotifyOneSignal.template_args['decode']['default']))
+        results["decode_tpl_args"] = parse_bool(
+            results["qsd"].get(
+                "decode", NotifyOneSignal.template_args["decode"]["default"]
+            )
+        )
 
         # The API Key is stored in the hostname
-        results['apikey'] = NotifyOneSignal.unquote(results['host'])
+        results["apikey"] = NotifyOneSignal.unquote(results["host"])
 
         # Get our Targets
-        results['targets'] = NotifyOneSignal.split_path(results['fullpath'])
+        results["targets"] = NotifyOneSignal.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyOneSignal.parse_list(results['qsd']['to'])
-
-        if 'app' in results['qsd'] and len(results['qsd']['app']):
-            results['app'] = \
-                NotifyOneSignal.unquote(results['qsd']['app'])
-
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
-            results['apikey'] = \
-                NotifyOneSignal.unquote(results['qsd']['apikey'])
-
-        if 'template' in results['qsd'] and len(results['qsd']['template']):
-            results['template'] = \
-                NotifyOneSignal.unquote(results['qsd']['template'])
-
-        if 'subtitle' in results['qsd'] and len(results['qsd']['subtitle']):
-            results['subtitle'] = \
-                NotifyOneSignal.unquote(results['qsd']['subtitle'])
-
-        if 'lang' in results['qsd'] and len(results['qsd']['lang']):
-            results['language'] = \
-                NotifyOneSignal.unquote(results['qsd']['lang'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyOneSignal.parse_list(
+                results["qsd"]["to"]
+            )
+
+        if "app" in results["qsd"] and len(results["qsd"]["app"]):
+            results["app"] = NotifyOneSignal.unquote(results["qsd"]["app"])
+
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = NotifyOneSignal.unquote(
+                results["qsd"]["apikey"]
+            )
+
+        if "template" in results["qsd"] and len(results["qsd"]["template"]):
+            results["template"] = NotifyOneSignal.unquote(
+                results["qsd"]["template"]
+            )
+
+        if "subtitle" in results["qsd"] and len(results["qsd"]["subtitle"]):
+            results["subtitle"] = NotifyOneSignal.unquote(
+                results["qsd"]["subtitle"]
+            )
+
+        if "lang" in results["qsd"] and len(results["qsd"]["lang"]):
+            results["language"] = NotifyOneSignal.unquote(
+                results["qsd"]["lang"]
+            )
 
         # Store our custom data
-        results['custom'] = results['qsd:']
+        results["custom"] = results["qsd:"]
 
         # Store our postback data
-        results['postback'] = results['qsd+']
+        results["postback"] = results["qsd+"]
 
         return results
diff --git a/libs/apprise/plugins/opsgenie.py b/libs/apprise/plugins/opsgenie.py
index 013c1ded55..1c10aae644 100644
--- a/libs/apprise/plugins/opsgenie.py
+++ b/libs/apprise/plugins/opsgenie.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -46,25 +45,24 @@
 # API Documentation: https://docs.opsgenie.com/docs/alert-api
 # API Integration Docs: https://docs.opsgenie.com/docs/api-integration
 
-import requests
-from json import dumps, loads
 import hashlib
+from json import dumps, loads
 
-from .base import NotifyBase
-from ..common import NotifyType, NOTIFY_TYPES
-from ..common import PersistentStoreMode
-from ..utils.parse import validate_regex, is_uuid, parse_list, parse_bool
+import requests
+
+from ..common import NOTIFY_TYPES, NotifyType, PersistentStoreMode
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_uuid, parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 
 class OpsgenieCategory(NotifyBase):
-    """
-    We define the different category types that we can notify
-    """
-    USER = 'user'
-    SCHEDULE = 'schedule'
-    ESCALATION = 'escalation'
-    TEAM = 'team'
+    """We define the different category types that we can notify."""
+
+    USER = "user"
+    SCHEDULE = "schedule"
+    ESCALATION = "escalation"
+    TEAM = "team"
 
 
 OPSGENIE_CATEGORIES = (
@@ -76,26 +74,25 @@ class OpsgenieCategory(NotifyBase):
 
 
 class OpsgenieAlertAction:
-    """
-    Defines the supported actions
-    """
+    """Defines the supported actions."""
+
     # Use mapping (specify :key=arg to over-ride)
-    MAP = 'map'
+    MAP = "map"
 
     # Create new alert (default)
-    NEW = 'new'
+    NEW = "new"
 
     # Close Alert
-    CLOSE = 'close'
+    CLOSE = "close"
 
     # Delete Alert
-    DELETE = 'delete'
+    DELETE = "delete"
 
     # Acknowledge Alert
-    ACKNOWLEDGE = 'acknowledge'
+    ACKNOWLEDGE = "acknowledge"
 
     # Add note to alert
-    NOTE = 'note'
+    NOTE = "note"
 
 
 OPSGENIE_ACTIONS = (
@@ -118,14 +115,14 @@ class OpsgenieAlertAction:
 
 # Regions
 class OpsgenieRegion:
-    US = 'us'
-    EU = 'eu'
+    US = "us"
+    EU = "eu"
 
 
 # Opsgenie APIs
 OPSGENIE_API_LOOKUP = {
-    OpsgenieRegion.US: 'https://api.opsgenie.com/v2/alerts',
-    OpsgenieRegion.EU: 'https://api.eu.opsgenie.com/v2/alerts',
+    OpsgenieRegion.US: "https://api.opsgenie.com/v2/alerts",
+    OpsgenieRegion.EU: "https://api.eu.opsgenie.com/v2/alerts",
 }
 
 # A List of our regions we can use for verification
@@ -146,56 +143,53 @@ class OpsgeniePriority:
 
 OPSGENIE_PRIORITIES = {
     # Note: This also acts as a reverse lookup mapping
-    OpsgeniePriority.LOW: 'low',
-    OpsgeniePriority.MODERATE: 'moderate',
-    OpsgeniePriority.NORMAL: 'normal',
-    OpsgeniePriority.HIGH: 'high',
-    OpsgeniePriority.EMERGENCY: 'emergency',
+    OpsgeniePriority.LOW: "low",
+    OpsgeniePriority.MODERATE: "moderate",
+    OpsgeniePriority.NORMAL: "normal",
+    OpsgeniePriority.HIGH: "high",
+    OpsgeniePriority.EMERGENCY: "emergency",
 }
 
 OPSGENIE_PRIORITY_MAP = {
     # Maps against string 'low'
-    'l': OpsgeniePriority.LOW,
+    "l": OpsgeniePriority.LOW,
     # Maps against string 'moderate'
-    'm': OpsgeniePriority.MODERATE,
+    "m": OpsgeniePriority.MODERATE,
     # Maps against string 'normal'
-    'n': OpsgeniePriority.NORMAL,
+    "n": OpsgeniePriority.NORMAL,
     # Maps against string 'high'
-    'h': OpsgeniePriority.HIGH,
+    "h": OpsgeniePriority.HIGH,
     # Maps against string 'emergency'
-    'e': OpsgeniePriority.EMERGENCY,
-
+    "e": OpsgeniePriority.EMERGENCY,
     # Entries to additionally support (so more like Opsgenie's API)
-    '1': OpsgeniePriority.LOW,
-    '2': OpsgeniePriority.MODERATE,
-    '3': OpsgeniePriority.NORMAL,
-    '4': OpsgeniePriority.HIGH,
-    '5': OpsgeniePriority.EMERGENCY,
+    "1": OpsgeniePriority.LOW,
+    "2": OpsgeniePriority.MODERATE,
+    "3": OpsgeniePriority.NORMAL,
+    "4": OpsgeniePriority.HIGH,
+    "5": OpsgeniePriority.EMERGENCY,
     # Support p-prefix
-    'p1': OpsgeniePriority.LOW,
-    'p2': OpsgeniePriority.MODERATE,
-    'p3': OpsgeniePriority.NORMAL,
-    'p4': OpsgeniePriority.HIGH,
-    'p5': OpsgeniePriority.EMERGENCY,
+    "p1": OpsgeniePriority.LOW,
+    "p2": OpsgeniePriority.MODERATE,
+    "p3": OpsgeniePriority.NORMAL,
+    "p4": OpsgeniePriority.HIGH,
+    "p5": OpsgeniePriority.EMERGENCY,
 }
 
 
 class NotifyOpsgenie(NotifyBase):
-    """
-    A wrapper for Opsgenie Notifications
-    """
+    """A wrapper for Opsgenie Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Opsgenie'
+    service_name = "Opsgenie"
 
     # The services URL
-    service_url = 'https://opsgenie.com/'
+    service_url = "https://opsgenie.com/"
 
     # All notification requests are secure
-    secure_protocol = 'opsgenie'
+    secure_protocol = "opsgenie"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_opsgenie'
+    setup_url = "https://appriseit.com/services/opsgenie/"
 
     # The maximum length of the body
     body_maxlen = 15000
@@ -228,177 +222,210 @@ class NotifyOpsgenie(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}',
-        '{schema}://{user}@{apikey}',
-        '{schema}://{apikey}/{targets}',
-        '{schema}://{user}@{apikey}/{targets}',
+        "{schema}://{apikey}",
+        "{schema}://{user}@{apikey}",
+        "{schema}://{apikey}/{targets}",
+        "{schema}://{user}@{apikey}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'target_escalation': {
-            'name': _('Target Escalation'),
-            'prefix': '^',
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_schedule': {
-            'name': _('Target Schedule'),
-            'type': 'string',
-            'prefix': '*',
-            'map_to': 'targets',
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'target_team': {
-            'name': _('Target Team'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "target_escalation": {
+                "name": _("Target Escalation"),
+                "prefix": "^",
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_schedule": {
+                "name": _("Target Schedule"),
+                "type": "string",
+                "prefix": "*",
+                "map_to": "targets",
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_team": {
+                "name": _("Target Team"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets "),
+                "type": "list:string",
+            },
         },
-        'targets': {
-            'name': _('Targets '),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'region': {
-            'name': _('Region Name'),
-            'type': 'choice:string',
-            'values': OPSGENIE_REGIONS,
-            'default': OpsgenieRegion.US,
-            'map_to': 'region_name',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': OPSGENIE_PRIORITIES,
-            'default': OpsgeniePriority.NORMAL,
-        },
-        'entity': {
-            'name': _('Entity'),
-            'type': 'string',
-        },
-        'alias': {
-            'name': _('Alias'),
-            'type': 'string',
-        },
-        'tags': {
-            'name': _('Tags'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "region": {
+                "name": _("Region Name"),
+                "type": "choice:string",
+                "values": OPSGENIE_REGIONS,
+                "default": OpsgenieRegion.US,
+                "map_to": "region_name",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": OPSGENIE_PRIORITIES,
+                "default": OpsgeniePriority.NORMAL,
+            },
+            "entity": {
+                "name": _("Entity"),
+                "type": "string",
+            },
+            "alias": {
+                "name": _("Alias"),
+                "type": "string",
+            },
+            "tags": {
+                "name": _("Tags"),
+                "type": "string",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "action": {
+                "name": _("Action"),
+                "type": "choice:string",
+                "values": OPSGENIE_ACTIONS,
+                "default": OPSGENIE_ACTIONS[0],
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'action': {
-            'name': _('Action'),
-            'type': 'choice:string',
-            'values': OPSGENIE_ACTIONS,
-            'default': OPSGENIE_ACTIONS[0],
-        }
-    })
+    )
 
     # Map of key-value pairs to use as custom properties of the alert.
     template_kwargs = {
-        'details': {
-            'name': _('Details'),
-            'prefix': '+',
+        "details": {
+            "name": _("Details"),
+            "prefix": "+",
         },
-        'mapping': {
-            'name': _('Action Mapping'),
-            'prefix': ':',
+        "mapping": {
+            "name": _("Action Mapping"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, apikey, targets, region_name=None, details=None,
-                 priority=None, alias=None, entity=None, batch=False,
-                 tags=None, action=None, mapping=None, **kwargs):
-        """
-        Initialize Opsgenie Object
-        """
+    def __init__(
+        self,
+        apikey,
+        targets,
+        region_name=None,
+        details=None,
+        priority=None,
+        alias=None,
+        entity=None,
+        batch=False,
+        tags=None,
+        action=None,
+        mapping=None,
+        **kwargs,
+    ):
+        """Initialize Opsgenie Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid Opsgenie API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Opsgenie API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The Priority of the message
-        self.priority = NotifyOpsgenie.template_args['priority']['default'] \
-            if not priority else \
-            next((
-                v for k, v in OPSGENIE_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyOpsgenie.template_args['priority']['default'])
+        self.priority = (
+            NotifyOpsgenie.template_args["priority"]["default"]
+            if not priority
+            else next(
+                (
+                    v
+                    for k, v in OPSGENIE_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyOpsgenie.template_args["priority"]["default"],
+            )
+        )
 
         # Store our region
         try:
-            self.region_name = self.opsgenie_default_region \
-                if region_name is None else region_name.lower()
+            self.region_name = (
+                self.opsgenie_default_region
+                if region_name is None
+                else region_name.lower()
+            )
 
             if self.region_name not in OPSGENIE_REGIONS:
                 # allow the outer except to handle this common response
                 raise
         except:
             # Invalid region specified
-            msg = 'The Opsgenie region specified ({}) is invalid.' \
-                  .format(region_name)
+            msg = f"The Opsgenie region specified ({region_name}) is invalid."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         if action and isinstance(action, str):
             self.action = next(
-                (a for a in OPSGENIE_ACTIONS if a.startswith(action)), None)
+                (a for a in OPSGENIE_ACTIONS if a.startswith(action)), None
+            )
             if self.action not in OPSGENIE_ACTIONS:
-                msg = 'The Opsgenie action specified ({}) is invalid.'\
-                    .format(action)
+                msg = f"The Opsgenie action specified ({action}) is invalid."
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.action = self.template_args['action']['default']
+            self.action = self.template_args["action"]["default"]
 
         # Store our mappings
         self.mapping = self.opsgenie_message_map.copy()
         if mapping and isinstance(mapping, dict):
-            for _k, _v in mapping.items():
+            for k_, v_ in mapping.items():
                 # Get our mapping
-                k = next((t for t in NOTIFY_TYPES if t.startswith(_k)), None)
+                k = next((t for t in NOTIFY_TYPES if t.startswith(k_)), None)
                 if not k:
-                    msg = 'The Opsgenie mapping key specified ({}) ' \
-                        'is invalid.'.format(_k)
+                    msg = (
+                        f"The Opsgenie mapping key specified ({k_}) "
+                        "is invalid."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
 
-                _v_lower = _v.lower()
-                v = next((v for v in OPSGENIE_ACTIONS[1:]
-                          if v.startswith(_v_lower)), None)
+                v_lower = v_.lower()
+                v = next(
+                    (
+                        v
+                        for v in OPSGENIE_ACTIONS[1:]
+                        if v.startswith(v_lower)
+                    ),
+                    None,
+                )
                 if not v:
-                    msg = 'The Opsgenie mapping value (assigned to {}) ' \
-                          'specified ({}) is invalid.'.format(k, _v)
+                    msg = (
+                        f"The Opsgenie mapping value (assigned to {k}) "
+                        f"specified ({v_}) is invalid."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
 
@@ -426,69 +453,86 @@ def __init__(self, apikey, targets, region_name=None, details=None,
         self.targets = []
 
         # Sort our targets
-        for _target in parse_list(targets):
-            target = _target.strip()
+        for target_ in parse_list(targets):
+            target = target_.strip()
             if len(target) < 2:
-                self.logger.debug('Ignoring Opsgenie Entry: %s' % target)
+                self.logger.debug(f"Ignoring Opsgenie Entry: {target}")
                 continue
 
-            if target.startswith(NotifyOpsgenie.template_tokens
-                                 ['target_team']['prefix']):
+            if target.startswith(
+                NotifyOpsgenie.template_tokens["target_team"]["prefix"]
+            ):
 
                 self.targets.append(
-                    {'type': OpsgenieCategory.TEAM, 'id': target[1:]}
-                    if is_uuid(target[1:]) else
-                    {'type': OpsgenieCategory.TEAM, 'name': target[1:]})
+                    {"type": OpsgenieCategory.TEAM, "id": target[1:]}
+                    if is_uuid(target[1:])
+                    else {"type": OpsgenieCategory.TEAM, "name": target[1:]}
+                )
 
-            elif target.startswith(NotifyOpsgenie.template_tokens
-                                   ['target_schedule']['prefix']):
+            elif target.startswith(
+                NotifyOpsgenie.template_tokens["target_schedule"]["prefix"]
+            ):
 
                 self.targets.append(
-                    {'type': OpsgenieCategory.SCHEDULE, 'id': target[1:]}
-                    if is_uuid(target[1:]) else
-                    {'type': OpsgenieCategory.SCHEDULE, 'name': target[1:]})
-
-            elif target.startswith(NotifyOpsgenie.template_tokens
-                                   ['target_escalation']['prefix']):
+                    {"type": OpsgenieCategory.SCHEDULE, "id": target[1:]}
+                    if is_uuid(target[1:])
+                    else {
+                        "type": OpsgenieCategory.SCHEDULE,
+                        "name": target[1:],
+                    }
+                )
+
+            elif target.startswith(
+                NotifyOpsgenie.template_tokens["target_escalation"]["prefix"]
+            ):
 
                 self.targets.append(
-                    {'type': OpsgenieCategory.ESCALATION, 'id': target[1:]}
-                    if is_uuid(target[1:]) else
-                    {'type': OpsgenieCategory.ESCALATION, 'name': target[1:]})
-
-            elif target.startswith(NotifyOpsgenie.template_tokens
-                                   ['target_user']['prefix']):
+                    {"type": OpsgenieCategory.ESCALATION, "id": target[1:]}
+                    if is_uuid(target[1:])
+                    else {
+                        "type": OpsgenieCategory.ESCALATION,
+                        "name": target[1:],
+                    }
+                )
+
+            elif target.startswith(
+                NotifyOpsgenie.template_tokens["target_user"]["prefix"]
+            ):
 
                 self.targets.append(
-                    {'type': OpsgenieCategory.USER, 'id': target[1:]}
-                    if is_uuid(target[1:]) else
-                    {'type': OpsgenieCategory.USER, 'username': target[1:]})
+                    {"type": OpsgenieCategory.USER, "id": target[1:]}
+                    if is_uuid(target[1:])
+                    else {
+                        "type": OpsgenieCategory.USER,
+                        "username": target[1:],
+                    }
+                )
 
             else:
                 # Ambiguious entry; treat it as a user but not before
                 # displaying a warning to the end user first:
                 self.logger.debug(
-                    'Treating ambigious Opsgenie target %s as a user', target)
+                    "Treating ambigious Opsgenie target %s as a user", target
+                )
                 self.targets.append(
-                    {'type': OpsgenieCategory.USER, 'id': target}
-                    if is_uuid(target) else
-                    {'type': OpsgenieCategory.USER, 'username': target})
+                    {"type": OpsgenieCategory.USER, "id": target}
+                    if is_uuid(target)
+                    else {"type": OpsgenieCategory.USER, "username": target}
+                )
 
     def _fetch(self, method, url, payload, params=None):
-        """
-        Performs server retrieval/update and returns JSON Response
-        """
+        """Performs server retrieval/update and returns JSON Response."""
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Authorization': 'GenieKey {}'.format(self.apikey),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": f"GenieKey {self.apikey}",
         }
 
         # Some Debug Logging
         self.logger.debug(
-            'Opsgenie POST URL: {} (cert_verify={})'.format(
-                url, self.verify_certificate))
-        self.logger.debug('Opsgenie Payload: {}' .format(payload))
+            f"Opsgenie POST URL: {url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"Opsgenie Payload: {payload}")
 
         # Initialize our response object
         content = {}
@@ -523,46 +567,47 @@ def _fetch(self, method, url, payload, params=None):
                 content = {}
 
             if r.status_code not in (
-                    requests.codes.accepted, requests.codes.ok):
-                status_str = \
-                    NotifyBase.http_response_code_lookup(
-                        r.status_code)
+                requests.codes.accepted,
+                requests.codes.ok,
+            ):
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Opsgenie notification:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Opsgenie notification:"
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
-                return (False, content.get('requestId'))
+                return (False, content.get("requestId"))
 
             # If we reach here; the message was sent
-            self.logger.info('Sent Opsgenie notification')
-            self.logger.debug(
-                'Response Details:\r\n{}'.format(r.content))
+            self.logger.info("Sent Opsgenie notification")
 
-            return (True, content.get('requestId'))
+            return (True, content.get("requestId"))
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Opsgenie '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Opsgenie notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
-        return (False, content.get('requestId'))
+        return (False, content.get("requestId"))
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Opsgenie Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Opsgenie Notification."""
 
         # Get our Opsgenie Action
-        action = OPSGENIE_ALERT_MAP[notify_type] \
-            if self.action == OpsgenieAlertAction.MAP else self.action
+        action = (
+            OPSGENIE_ALERT_MAP[notify_type]
+            if self.action == OpsgenieAlertAction.MAP
+            else self.action
+        )
 
         # Prepare our URL as it's based on our hostname
         notify_url = OPSGENIE_API_LOOKUP[self.region_name]
@@ -575,10 +620,16 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # For indexing in persistent store
         key = hashlib.sha1(
-            (self.entity if self.entity else (
-                self.alias if self.alias else (
-                    title if title else self.app_id)))
-            .encode('utf-8')).hexdigest()[0:10]
+            (
+                self.entity
+                if self.entity
+                else (
+                    self.alias
+                    if self.alias
+                    else (title if title else self.app_id)
+                )
+            ).encode("utf-8")
+        ).hexdigest()[0:10]
 
         # Get our Opsgenie Request IDs
         request_ids = self.store.get(key, [])
@@ -588,38 +639,39 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         if action == OpsgenieAlertAction.NEW:
             # Create a copy ouf our details object
             details = self.details.copy()
-            if 'type' not in details:
-                details['type'] = notify_type
+            if "type" not in details:
+                details["type"] = notify_type.value
 
             # Use body if title not set
-            title_body = body if not title else title
+            title_body = title if title else body
 
             # Prepare our payload
             payload = {
-                'source': self.app_desc,
-                'message': title_body,
-                'description': body,
-                'details': details,
-                'priority': 'P{}'.format(self.priority),
+                "source": self.app_desc,
+                "message": title_body,
+                "description": body,
+                "details": details,
+                "priority": f"P{self.priority}",
             }
 
             # Use our body directive if we exceed the minimum message
             # limitation
-            if len(payload['message']) > self.opsgenie_body_minlen:
-                payload['message'] = '{}...'.format(
-                    title_body[:self.opsgenie_body_minlen - 3])
+            if len(payload["message"]) > self.opsgenie_body_minlen:
+                payload["message"] = (
+                    f"{title_body[:self.opsgenie_body_minlen - 3]}..."
+                )
 
             if self.__tags:
-                payload['tags'] = self.__tags
+                payload["tags"] = self.__tags
 
             if self.entity:
-                payload['entity'] = self.entity
+                payload["entity"] = self.entity
 
             if self.alias:
-                payload['alias'] = self.alias
+                payload["alias"] = self.alias
 
             if self.user:
-                payload['user'] = self.user
+                payload["user"] = self.user
 
             # reset our request IDs - we will re-populate them
             request_ids = []
@@ -629,12 +681,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 if self.targets:
                     # If there were no targets identified, then we simply
                     # just iterate once without the responders set
-                    payload['responders'] = \
-                        self.targets[index:index + self.batch_size]
+                    payload["responders"] = self.targets[
+                        index : index + self.batch_size
+                    ]
 
                 # Perform our post
-                success, request_id = self._fetch(
-                    method, notify_url, payload)
+                success, request_id = self._fetch(method, notify_url, payload)
 
                 if success and request_id:
                     # Save our response
@@ -649,32 +701,32 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         elif request_ids:
             # Prepare our payload
             payload = {
-                'source': self.app_desc,
-                'note': body,
+                "source": self.app_desc,
+                "note": body,
             }
 
             if self.user:
-                payload['user'] = self.user
+                payload["user"] = self.user
 
             # Prepare our Identifier type
             params = {
-                'identifierType': 'id',
+                "identifierType": "id",
             }
 
             for request_id in request_ids:
                 if action == OpsgenieAlertAction.DELETE:
                     # Update our URL
-                    url = f'{notify_url}/{request_id}'
+                    url = f"{notify_url}/{request_id}"
                     method = requests.delete
 
                 elif action == OpsgenieAlertAction.ACKNOWLEDGE:
-                    url = f'{notify_url}/{request_id}/acknowledge'
+                    url = f"{notify_url}/{request_id}/acknowledge"
 
                 elif action == OpsgenieAlertAction.CLOSE:
-                    url = f'{notify_url}/{request_id}/close'
+                    url = f"{notify_url}/{request_id}/close"
 
                 else:  # action == OpsgenieAlertAction.CLOSE:
-                    url = f'{notify_url}/{request_id}/notes'
+                    url = f"{notify_url}/{request_id}/notes"
 
                 # Perform our post
                 success, _ = self._fetch(method, url, payload, params)
@@ -688,166 +740,179 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         else:
             self.logger.info(
-                'No Opsgenie notification sent due to (nothing to %s) '
-                'condition', self.action)
+                "No Opsgenie notification sent due to (nothing to %s) "
+                "condition",
+                self.action,
+            )
 
         return not has_error
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.region_name, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'action': self.action,
-            'region': self.region_name,
-            'priority':
-                OPSGENIE_PRIORITIES[self.template_args['priority']['default']]
+            "action": self.action,
+            "region": self.region_name,
+            "priority": (
+                OPSGENIE_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in OPSGENIE_PRIORITIES
-                else OPSGENIE_PRIORITIES[self.priority],
-            'batch': 'yes' if self.batch_size > 1 else 'no',
+                else OPSGENIE_PRIORITIES[self.priority]
+            ),
+            "batch": "yes" if self.batch_size > 1 else "no",
         }
 
         # Assign our entity value (if defined)
         if self.entity:
-            params['entity'] = self.entity
+            params["entity"] = self.entity
 
         # Assign our alias value (if defined)
         if self.alias:
-            params['alias'] = self.alias
+            params["alias"] = self.alias
 
         # Assign our tags (if specifed)
         if self.__tags:
-            params['tags'] = ','.join(self.__tags)
+            params["tags"] = ",".join(self.__tags)
 
         # Append our details into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.details.items()})
+        params.update({f"+{k}": v for k, v in self.details.items()})
 
         # Append our assignment extra's into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.mapping.items()})
+        params.update({f":{k.value}": v for k, v in self.mapping.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # A map allows us to map our target types so they can be correctly
         # placed back into your URL below. Hence map the 'user' -> '@'
-        __map = {
-            OpsgenieCategory.USER:
-                NotifyOpsgenie.template_tokens['target_user']['prefix'],
-            OpsgenieCategory.SCHEDULE:
-                NotifyOpsgenie.template_tokens['target_schedule']['prefix'],
-            OpsgenieCategory.ESCALATION:
-                NotifyOpsgenie.template_tokens['target_escalation']['prefix'],
-            OpsgenieCategory.TEAM:
-                NotifyOpsgenie.template_tokens['target_team']['prefix'],
+        map_ = {
+            OpsgenieCategory.USER: NotifyOpsgenie.template_tokens[
+                "target_user"
+            ]["prefix"],
+            OpsgenieCategory.SCHEDULE: NotifyOpsgenie.template_tokens[
+                "target_schedule"
+            ]["prefix"],
+            OpsgenieCategory.ESCALATION: NotifyOpsgenie.template_tokens[
+                "target_escalation"
+            ]["prefix"],
+            OpsgenieCategory.TEAM: NotifyOpsgenie.template_tokens[
+                "target_team"
+            ]["prefix"],
         }
 
-        return '{schema}://{user}{apikey}/{targets}/?{params}'.format(
+        return "{schema}://{user}{apikey}/{targets}?{params}".format(
             schema=self.secure_protocol,
-            user='{}@'.format(self.user) if self.user else '',
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(
-                [NotifyOpsgenie.quote('{}{}'.format(
-                    __map[x['type']],
-                    x.get('id', x.get('name', x.get('username')))))
-                    for x in self.targets]),
-            params=NotifyOpsgenie.urlencode(params))
+            user=f"{self.user}@" if self.user else "",
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join([
+                NotifyOpsgenie.quote(
+                    "{}{}".format(
+                        map_[x["type"]],
+                        x.get("id", x.get("name", x.get("username"))),
+                    )
+                )
+                for x in self.targets
+            ]),
+            params=NotifyOpsgenie.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         targets = len(self.targets)
         if self.batch_size > 1:
-            targets = int(targets / self.batch_size) + \
-                (1 if targets % self.batch_size else 0)
+            targets = int(targets / self.batch_size) + (
+                1 if targets % self.batch_size else 0
+            )
 
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The API Key is stored in the hostname
-        results['apikey'] = NotifyOpsgenie.unquote(results['host'])
+        results["apikey"] = NotifyOpsgenie.unquote(results["host"])
 
         # Get our Targets
-        results['targets'] = NotifyOpsgenie.split_path(results['fullpath'])
+        results["targets"] = NotifyOpsgenie.split_path(results["fullpath"])
 
         # Add our Meta Detail keys
-        results['details'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["details"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyOpsgenie.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyOpsgenie.unquote(
+                results["qsd"]["priority"]
+            )
 
         # Get Batch Boolean (if set)
-        results['batch'] = \
-            parse_bool(
-                results['qsd'].get(
-                    'batch',
-                    NotifyOpsgenie.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyOpsgenie.template_args["batch"]["default"]
+            )
+        )
 
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
-            results['apikey'] = \
-                NotifyOpsgenie.unquote(results['qsd']['apikey'])
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = NotifyOpsgenie.unquote(
+                results["qsd"]["apikey"]
+            )
 
-        if 'tags' in results['qsd'] and len(results['qsd']['tags']):
+        if "tags" in results["qsd"] and len(results["qsd"]["tags"]):
             # Extract our tags
-            results['tags'] = \
-                parse_list(NotifyOpsgenie.unquote(results['qsd']['tags']))
+            results["tags"] = parse_list(
+                NotifyOpsgenie.unquote(results["qsd"]["tags"])
+            )
 
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
             # Extract our region
-            results['region_name'] = \
-                NotifyOpsgenie.unquote(results['qsd']['region'])
+            results["region_name"] = NotifyOpsgenie.unquote(
+                results["qsd"]["region"]
+            )
 
-        if 'entity' in results['qsd'] and len(results['qsd']['entity']):
+        if "entity" in results["qsd"] and len(results["qsd"]["entity"]):
             # Extract optional entity field
-            results['entity'] = \
-                NotifyOpsgenie.unquote(results['qsd']['entity'])
+            results["entity"] = NotifyOpsgenie.unquote(
+                results["qsd"]["entity"]
+            )
 
-        if 'alias' in results['qsd'] and len(results['qsd']['alias']):
+        if "alias" in results["qsd"] and len(results["qsd"]["alias"]):
             # Extract optional alias field
-            results['alias'] = \
-                NotifyOpsgenie.unquote(results['qsd']['alias'])
+            results["alias"] = NotifyOpsgenie.unquote(results["qsd"]["alias"])
 
         # Handle 'to' email address
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].append(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(results["qsd"]["to"])
 
         # Store our action (if defined)
-        if 'action' in results['qsd'] and len(results['qsd']['action']):
-            results['action'] = \
-                NotifyOpsgenie.unquote(results['qsd']['action'])
+        if "action" in results["qsd"] and len(results["qsd"]["action"]):
+            results["action"] = NotifyOpsgenie.unquote(
+                results["qsd"]["action"]
+            )
 
         # store any custom mapping defined
-        results['mapping'] = \
-            {NotifyOpsgenie.unquote(x): NotifyOpsgenie.unquote(y)
-             for x, y in results['qsd:'].items()}
+        results["mapping"] = {
+            NotifyOpsgenie.unquote(x): NotifyOpsgenie.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         return results
diff --git a/libs/apprise/plugins/pagerduty.py b/libs/apprise/plugins/pagerduty.py
index 054fab9c0d..68517f579a 100644
--- a/libs/apprise/plugins/pagerduty.py
+++ b/libs/apprise/plugins/pagerduty.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -31,28 +30,27 @@
 #       368ae3d938c9e-send-an-event-to-pager-duty
 #
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..utils.parse import validate_regex, parse_bool
+import requests
+
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, validate_regex
+from .base import NotifyBase
 
 
 class PagerDutySeverity:
-    """
-    Defines the Pager Duty Severity Levels
-    """
-    INFO = 'info'
+    """Defines the Pager Duty Severity Levels."""
+
+    INFO = "info"
 
-    WARNING = 'warning'
+    WARNING = "warning"
 
-    ERROR = 'error'
+    ERROR = "error"
 
-    CRITICAL = 'critical'
+    CRITICAL = "critical"
 
 
 # Map all support Apprise Categories with the Pager Duty ones
@@ -73,14 +71,14 @@ class PagerDutySeverity:
 
 # Priorities
 class PagerDutyRegion:
-    US = 'us'
-    EU = 'eu'
+    US = "us"
+    EU = "eu"
 
 
 # SparkPost APIs
 PAGERDUTY_API_LOOKUP = {
-    PagerDutyRegion.US: 'https://events.pagerduty.com/v2/enqueue',
-    PagerDutyRegion.EU: 'https://events.eu.pagerduty.com/v2/enqueue',
+    PagerDutyRegion.US: "https://events.pagerduty.com/v2/enqueue",
+    PagerDutyRegion.EU: "https://events.eu.pagerduty.com/v2/enqueue",
 }
 
 # A List of our regions we can use for verification
@@ -91,21 +89,19 @@ class PagerDutyRegion:
 
 
 class NotifyPagerDuty(NotifyBase):
-    """
-    A wrapper for Pager Duty Notifications
-    """
+    """A wrapper for Pager Duty Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pager Duty'
+    service_name = "Pager Duty"
 
     # The services URL
-    service_url = 'https://pagerduty.com/'
+    service_url = "https://pagerduty.com/"
 
     # Secure Protocol
-    secure_protocol = 'pagerduty'
+    secure_protocol = "pagerduty"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pagerduty'
+    setup_url = "https://appriseit.com/services/pagerduty/"
 
     # We don't support titles for Pager Duty notifications
     title_maxlen = 0
@@ -115,166 +111,196 @@ class NotifyPagerDuty(NotifyBase):
     image_size = NotifyImageSize.XY_128
 
     # Our event action type
-    event_action = 'trigger'
+    event_action = "trigger"
 
     # The default region to use if one isn't otherwise specified
     default_region = PagerDutyRegion.US
 
     # Define object templates
     templates = (
-        '{schema}://{integrationkey}@{apikey}',
-        '{schema}://{integrationkey}@{apikey}/{source}',
-        '{schema}://{integrationkey}@{apikey}/{source}/{component}',
+        "{schema}://{integrationkey}@{apikey}",
+        "{schema}://{integrationkey}@{apikey}/{source}",
+        "{schema}://{integrationkey}@{apikey}/{source}/{component}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True
-        },
-        # Optional but triggers V2 API
-        'integrationkey': {
-            'name': _('Integration Key'),
-            'type': 'string',
-            'private': True,
-            'required': True
-        },
-        'source': {
-            # Optional Source Identifier (preferably a FQDN)
-            'name': _('Source'),
-            'type': 'string',
-            'default': 'Apprise',
-        },
-        'component': {
-            # Optional Component Identifier
-            'name': _('Component'),
-            'type': 'string',
-            'default': 'Notification',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            # Optional but triggers V2 API
+            "integrationkey": {
+                "name": _("Integration Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "source": {
+                # Optional Source Identifier (preferably a FQDN)
+                "name": _("Source"),
+                "type": "string",
+                "default": "Apprise",
+            },
+            "component": {
+                # Optional Component Identifier
+                "name": _("Component"),
+                "type": "string",
+                "default": "Notification",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'group': {
-            'name': _('Group'),
-            'type': 'string',
-        },
-        'class': {
-            'name': _('Class'),
-            'type': 'string',
-            'map_to': 'class_id',
-        },
-        'click': {
-            'name': _('Click'),
-            'type': 'string',
-        },
-        'region': {
-            'name': _('Region Name'),
-            'type': 'choice:string',
-            'values': PAGERDUTY_REGIONS,
-            'default': PagerDutyRegion.US,
-            'map_to': 'region_name',
-        },
-        # The severity is automatically determined, however you can optionally
-        # over-ride its value and force it to be what you want
-        'severity': {
-            'name': _('Severity'),
-            'type': 'choice:string',
-            'values': PAGERDUTY_SEVERITIES,
-            'map_to': 'severity',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "group": {
+                "name": _("Group"),
+                "type": "string",
+            },
+            "class": {
+                "name": _("Class"),
+                "type": "string",
+                "map_to": "class_id",
+            },
+            "click": {
+                "name": _("Click"),
+                "type": "string",
+            },
+            "region": {
+                "name": _("Region Name"),
+                "type": "choice:string",
+                "values": PAGERDUTY_REGIONS,
+                "default": PagerDutyRegion.US,
+                "map_to": "region_name",
+            },
+            # The severity is automatically determined, however you can
+            # optionally over-ride its value and force it to be what you want
+            "severity": {
+                "name": _("Severity"),
+                "type": "choice:string",
+                "values": PAGERDUTY_SEVERITIES,
+                "map_to": "severity",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'details': {
-            'name': _('Custom Details'),
-            'prefix': '+',
+        "details": {
+            "name": _("Custom Details"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, apikey, integrationkey=None, source=None,
-                 component=None, group=None, class_id=None,
-                 include_image=True, click=None, details=None,
-                 region_name=None, severity=None, **kwargs):
-        """
-        Initialize Pager Duty Object
-        """
+    def __init__(
+        self,
+        apikey,
+        integrationkey=None,
+        source=None,
+        component=None,
+        group=None,
+        class_id=None,
+        include_image=True,
+        click=None,
+        details=None,
+        region_name=None,
+        severity=None,
+        **kwargs,
+    ):
+        """Initialize Pager Duty Object."""
         super().__init__(**kwargs)
 
         # Long-Lived Access token (generated from User Profile)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid Pager Duty API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Pager Duty API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.integration_key = validate_regex(integrationkey)
         if not self.integration_key:
-            msg = 'An invalid Pager Duty Routing Key ' \
-                  '({}) was specified.'.format(integrationkey)
+            msg = (
+                "An invalid Pager Duty Routing Key "
+                f"({integrationkey}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # An Optional Source
-        self.source = self.template_tokens['source']['default']
+        self.source = self.template_tokens["source"]["default"]
         if source:
             self.source = validate_regex(source)
             if not self.source:
-                msg = 'An invalid Pager Duty Notification Source ' \
-                      '({}) was specified.'.format(source)
+                msg = (
+                    "An invalid Pager Duty Notification Source "
+                    f"({source}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.component = self.template_tokens['source']['default']
+            self.component = self.template_tokens["source"]["default"]
 
         # An Optional Component
-        self.component = self.template_tokens['component']['default']
+        self.component = self.template_tokens["component"]["default"]
         if component:
             self.component = validate_regex(component)
             if not self.component:
-                msg = 'An invalid Pager Duty Notification Component ' \
-                      '({}) was specified.'.format(component)
+                msg = (
+                    "An invalid Pager Duty Notification Component "
+                    f"({component}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.component = self.template_tokens['component']['default']
+            self.component = self.template_tokens["component"]["default"]
 
         # Store our region
         try:
-            self.region_name = self.default_region \
-                if region_name is None else region_name.lower()
+            self.region_name = (
+                self.default_region
+                if region_name is None
+                else region_name.lower()
+            )
 
             if self.region_name not in PAGERDUTY_REGIONS:
                 # allow the outer except to handle this common response
-                raise
-        except:
+                raise IndexError()
+
+        except (AttributeError, IndexError, TypeError):
             # Invalid region specified
-            msg = 'The PagerDuty region specified ({}) is invalid.' \
-                  .format(region_name)
+            msg = f"The PagerDuty region specified ({region_name}) is invalid."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         # The severity (if specified)
-        self.severity = \
-            None if severity is None else next((
-                s for s in PAGERDUTY_SEVERITIES
-                if str(s).lower().startswith(severity)), False)
+        self.severity = (
+            None
+            if severity is None
+            else next(
+                (
+                    s
+                    for s in PAGERDUTY_SEVERITIES
+                    if str(s).lower().startswith(severity)
+                ),
+                False,
+            )
+        )
 
         if self.severity is False:
             # Invalid severity specified
-            msg = 'The PagerDuty severity specified ({}) is invalid.' \
-                  .format(severity)
+            msg = f"The PagerDuty severity specified ({severity}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -297,74 +323,74 @@ def __init__(self, apikey, integrationkey=None, source=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Send our PagerDuty Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send our PagerDuty Notification."""
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Authorization': 'Token token={}'.format(self.apikey),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": f"Token token={self.apikey}",
         }
 
         # Prepare our persistent_notification.create payload
         payload = {
             # Define our integration key
-            'routing_key': self.integration_key,
-
+            "routing_key": self.integration_key,
             # Prepare our payload
-            'payload': {
-                'summary': body,
-
+            "payload": {
+                "summary": body,
                 # Set our severity
-                'severity': PAGERDUTY_SEVERITY_MAP[notify_type]
-                if not self.severity else self.severity,
-
+                "severity": (
+                    PAGERDUTY_SEVERITY_MAP[notify_type]
+                    if not self.severity
+                    else self.severity
+                ),
                 # Our Alerting Source/Component
-                'source': self.source,
-                'component': self.component,
+                "source": self.source,
+                "component": self.component,
             },
-            'client': self.app_id,
+            "client": self.app_id,
             # Our Event Action
-            'event_action': self.event_action,
+            "event_action": self.event_action,
         }
 
         if self.group:
-            payload['payload']['group'] = self.group
+            payload["payload"]["group"] = self.group
 
         if self.class_id:
-            payload['payload']['class'] = self.class_id
+            payload["payload"]["class"] = self.class_id
 
         if self.click:
-            payload['links'] = [{
+            payload["links"] = [{
                 "href": self.click,
             }]
 
         # Acquire our image url if configured to do so
-        image_url = None if not self.include_image else \
-            self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if image_url:
-            payload['images'] = [{
-                'src': image_url,
-                'alt': notify_type,
+            payload["images"] = [{
+                "src": image_url,
+                "alt": notify_type.value,
             }]
 
         if self.details:
-            payload['payload']['custom_details'] = {}
+            payload["payload"]["custom_details"] = {}
             # Apply any provided custom details
             for k, v in self.details.items():
-                payload['payload']['custom_details'][k] = v
+                payload["payload"]["custom_details"][k] = v
 
         # Prepare our URL based on region
         notify_url = PAGERDUTY_API_LOOKUP[self.region_name]
 
-        self.logger.debug('Pager Duty POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Pager Duty Payload: %s' % str(payload))
+        self.logger.debug(
+            "Pager Duty POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Pager Duty Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -378,33 +404,37 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 timeout=self.request_timeout,
             )
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.created,
-                    requests.codes.accepted):
+                requests.codes.ok,
+                requests.codes.created,
+                requests.codes.accepted,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyPagerDuty.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyPagerDuty.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Pager Duty notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Pager Duty notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Pager Duty notification.')
+                self.logger.info("Sent Pager Duty notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Pager Duty '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Pager Duty "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -413,69 +443,67 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.integration_key, self.apikey,
+            self.secure_protocol,
+            self.integration_key,
+            self.apikey,
             self.source,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'region': self.region_name,
-            'image': 'yes' if self.include_image else 'no',
+            "region": self.region_name,
+            "image": "yes" if self.include_image else "no",
         }
         if self.class_id:
-            params['class'] = self.class_id
+            params["class"] = self.class_id
 
         if self.group:
-            params['group'] = self.group
+            params["group"] = self.group
 
         if self.click is not None:
-            params['click'] = self.click
+            params["click"] = self.click
 
         if self.severity:
-            params['severity'] = self.severity
+            params["severity"] = self.severity
 
         # Append our custom entries our parameters
-        params.update({'+{}'.format(k): v for k, v in self.details.items()})
+        params.update({f"+{k}": v for k, v in self.details.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        url = '{schema}://{integration_key}@{apikey}/' \
-              '{source}/{component}?{params}'
+        url = (
+            "{schema}://{integration_key}@{apikey}/"
+            "{source}/{component}?{params}"
+        )
 
         return url.format(
             schema=self.secure_protocol,
             # never encode hostname since we're expecting it to be a valid one
             integration_key=self.pprint(
-                self.integration_key, privacy, mode=PrivacyMode.Secret,
-                safe=''),
+                self.integration_key, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
             apikey=self.pprint(
-                self.apikey, privacy, mode=PrivacyMode.Secret, safe=''),
-            source=self.pprint(
-                self.source, privacy, safe=''),
-            component=self.pprint(
-                self.component, privacy, safe=''),
+                self.apikey, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            source=self.pprint(self.source, privacy, safe=""),
+            component=self.pprint(self.component, privacy, safe=""),
             params=NotifyPagerDuty.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -483,67 +511,77 @@ def parse_url(url):
             return results
 
         # The 'apikey' makes it easier to use yaml configuration
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
-            results['apikey'] = \
-                NotifyPagerDuty.unquote(results['qsd']['apikey'])
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = NotifyPagerDuty.unquote(
+                results["qsd"]["apikey"]
+            )
         else:
-            results['apikey'] = NotifyPagerDuty.unquote(results['host'])
+            results["apikey"] = NotifyPagerDuty.unquote(results["host"])
 
         # The 'integrationkey' makes it easier to use yaml configuration
-        if 'integrationkey' in results['qsd'] and \
-                len(results['qsd']['integrationkey']):
-            results['integrationkey'] = \
-                NotifyPagerDuty.unquote(results['qsd']['integrationkey'])
+        if "integrationkey" in results["qsd"] and len(
+            results["qsd"]["integrationkey"]
+        ):
+            results["integrationkey"] = NotifyPagerDuty.unquote(
+                results["qsd"]["integrationkey"]
+            )
         else:
-            results['integrationkey'] = \
-                NotifyPagerDuty.unquote(results['user'])
+            results["integrationkey"] = NotifyPagerDuty.unquote(
+                results["user"]
+            )
 
-        if 'click' in results['qsd'] and len(results['qsd']['click']):
-            results['click'] = NotifyPagerDuty.unquote(results['qsd']['click'])
+        if "click" in results["qsd"] and len(results["qsd"]["click"]):
+            results["click"] = NotifyPagerDuty.unquote(results["qsd"]["click"])
 
-        if 'group' in results['qsd'] and len(results['qsd']['group']):
-            results['group'] = \
-                NotifyPagerDuty.unquote(results['qsd']['group'])
+        if "group" in results["qsd"] and len(results["qsd"]["group"]):
+            results["group"] = NotifyPagerDuty.unquote(results["qsd"]["group"])
 
-        if 'class' in results['qsd'] and len(results['qsd']['class']):
-            results['class_id'] = \
-                NotifyPagerDuty.unquote(results['qsd']['class'])
+        if "class" in results["qsd"] and len(results["qsd"]["class"]):
+            results["class_id"] = NotifyPagerDuty.unquote(
+                results["qsd"]["class"]
+            )
 
-        if 'severity' in results['qsd'] and len(results['qsd']['severity']):
-            results['severity'] = \
-                NotifyPagerDuty.unquote(results['qsd']['severity'])
+        if "severity" in results["qsd"] and len(results["qsd"]["severity"]):
+            results["severity"] = NotifyPagerDuty.unquote(
+                results["qsd"]["severity"]
+            )
 
         # Acquire our full path
-        fullpath = NotifyPagerDuty.split_path(results['fullpath'])
+        fullpath = NotifyPagerDuty.split_path(results["fullpath"])
 
         # Get our source
-        if 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifyPagerDuty.unquote(results['qsd']['source'])
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifyPagerDuty.unquote(
+                results["qsd"]["source"]
+            )
         else:
-            results['source'] = fullpath.pop(0) if fullpath else None
+            results["source"] = fullpath.pop(0) if fullpath else None
 
         # Get our component
-        if 'component' in results['qsd'] and len(results['qsd']['component']):
-            results['component'] = \
-                NotifyPagerDuty.unquote(results['qsd']['component'])
+        if "component" in results["qsd"] and len(results["qsd"]["component"]):
+            results["component"] = NotifyPagerDuty.unquote(
+                results["qsd"]["component"]
+            )
         else:
-            results['component'] = fullpath.pop(0) if fullpath else None
+            results["component"] = fullpath.pop(0) if fullpath else None
 
         # Add our custom details key/value pairs that the user can potentially
         # over-ride if they wish to to our returned result set and tidy
         # entries by unquoting them
-        results['details'] = {
+        results["details"] = {
             NotifyPagerDuty.unquote(x): NotifyPagerDuty.unquote(y)
-            for x, y in results['qsd+'].items()}
+            for x, y in results["qsd+"].items()
+        }
 
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
             # Extract from name to associate with from address
-            results['region_name'] = \
-                NotifyPagerDuty.unquote(results['qsd']['region'])
+            results["region_name"] = NotifyPagerDuty.unquote(
+                results["qsd"]["region"]
+            )
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         return results
diff --git a/libs/apprise/plugins/pagertree.py b/libs/apprise/plugins/pagertree.py
index faca547da2..b1527e2ef8 100644
--- a/libs/apprise/plugins/pagertree.py
+++ b/libs/apprise/plugins/pagertree.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,22 +25,22 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import requests
 from json import dumps
-
 from uuid import uuid4
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
 
 
 # Actions
 class PagerTreeAction:
-    CREATE = 'create'
-    ACKNOWLEDGE = 'acknowledge'
-    RESOLVE = 'resolve'
+    CREATE = "create"
+    ACKNOWLEDGE = "acknowledge"
+    RESOLVE = "resolve"
 
 
 # Urgencies
@@ -54,117 +53,129 @@ class PagerTreeUrgency:
 
 
 PAGERTREE_ACTIONS = {
-    PagerTreeAction.CREATE: 'create',
-    PagerTreeAction.ACKNOWLEDGE: 'acknowledge',
-    PagerTreeAction.RESOLVE: 'resolve',
+    PagerTreeAction.CREATE: "create",
+    PagerTreeAction.ACKNOWLEDGE: "acknowledge",
+    PagerTreeAction.RESOLVE: "resolve",
 }
 
 PAGERTREE_URGENCIES = {
     # Note: This also acts as a reverse lookup mapping
-    PagerTreeUrgency.SILENT: 'silent',
-    PagerTreeUrgency.LOW: 'low',
-    PagerTreeUrgency.MEDIUM: 'medium',
-    PagerTreeUrgency.HIGH: 'high',
-    PagerTreeUrgency.CRITICAL: 'critical',
+    PagerTreeUrgency.SILENT: "silent",
+    PagerTreeUrgency.LOW: "low",
+    PagerTreeUrgency.MEDIUM: "medium",
+    PagerTreeUrgency.HIGH: "high",
+    PagerTreeUrgency.CRITICAL: "critical",
 }
 # Extend HTTP Error Messages
 PAGERTREE_HTTP_ERROR_MAP = {
-    402: 'Payment Required - Please subscribe or upgrade',
-    403: 'Forbidden - Blocked',
-    404: 'Not Found - Invalid Integration ID',
-    405: 'Method Not Allowed - Integration Disabled',
-    429: 'Too Many Requests - Rate Limit Exceeded',
+    402: "Payment Required - Please subscribe or upgrade",
+    403: "Forbidden - Blocked",
+    404: "Not Found - Invalid Integration ID",
+    405: "Method Not Allowed - Integration Disabled",
+    429: "Too Many Requests - Rate Limit Exceeded",
 }
 
 
 class NotifyPagerTree(NotifyBase):
-    """
-    A wrapper for PagerTree Notifications
-    """
+    """A wrapper for PagerTree Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'PagerTree'
+    service_name = "PagerTree"
 
     # The services URL
-    service_url = 'https://pagertree.com/'
+    service_url = "https://pagertree.com/"
 
     # All PagerTree requests are secure
-    secure_protocol = 'pagertree'
+    secure_protocol = "pagertree"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pagertree'
+    setup_url = "https://appriseit.com/services/pagertree/"
 
     # PagerTree uses the http protocol with JSON requests
-    notify_url = 'https://api.pagertree.com/integration/{}'
+    notify_url = "https://api.pagertree.com/integration/{}"
 
     # Define object templates
-    templates = (
-        '{schema}://{integration}',
-    )
+    templates = ("{schema}://{integration}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'integration': {
-            'name': _('Integration ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        }
-    })
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "integration": {
+                "name": _("Integration ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            }
+        },
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'action': {
-            'name': _('Action'),
-            'type': 'choice:string',
-            'values': PAGERTREE_ACTIONS,
-            'default': PagerTreeAction.CREATE,
-        },
-        'thirdparty': {
-            'name': _('Third Party ID'),
-            'type': 'string',
-        },
-        'urgency': {
-            'name': _('Urgency'),
-            'type': 'choice:string',
-            'values': PAGERTREE_URGENCIES,
-        },
-        'tags': {
-            'name': _('Tags'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "action": {
+                "name": _("Action"),
+                "type": "choice:string",
+                "values": PAGERTREE_ACTIONS,
+                "default": PagerTreeAction.CREATE,
+            },
+            "thirdparty": {
+                "name": _("Third Party ID"),
+                "type": "string",
+            },
+            "urgency": {
+                "name": _("Urgency"),
+                "type": "choice:string",
+                "values": PAGERTREE_URGENCIES,
+            },
+            "tags": {
+                "name": _("Tags"),
+                "type": "string",
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
-        'payload_extras': {
-            'name': _('Payload Extras'),
-            'prefix': ':',
+        "payload_extras": {
+            "name": _("Payload Extras"),
+            "prefix": ":",
         },
-        'meta_extras': {
-            'name': _('Meta Extras'),
-            'prefix': '-',
+        "meta_extras": {
+            "name": _("Meta Extras"),
+            "prefix": "-",
         },
     }
 
-    def __init__(self, integration, action=None, thirdparty=None,
-                 urgency=None, tags=None, headers=None,
-                 payload_extras=None, meta_extras=None, **kwargs):
-        """
-        Initialize PagerTree Object
-        """
+    def __init__(
+        self,
+        integration,
+        action=None,
+        thirdparty=None,
+        urgency=None,
+        tags=None,
+        headers=None,
+        payload_extras=None,
+        meta_extras=None,
+        **kwargs,
+    ):
+        """Initialize PagerTree Object."""
         super().__init__(**kwargs)
 
         # Integration ID (associated with account)
-        self.integration = \
-            validate_regex(integration, r'^int_[a-zA-Z0-9\-_]{7,14}$')
+        self.integration = validate_regex(
+            integration, r"^int_[a-zA-Z0-9\-_]{7,14}$"
+        )
         if not self.integration:
-            msg = 'An invalid PagerTree Integration ID ' \
-                  '({}) was specified.'.format(integration)
+            msg = (
+                "An invalid PagerTree Integration ID "
+                f"({integration}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -175,8 +186,10 @@ def __init__(self, integration, action=None, thirdparty=None,
             # An id was specified, we want to validate it
             self.thirdparty = validate_regex(thirdparty)
             if not self.thirdparty:
-                msg = 'An invalid PagerTree third party ID ' \
-                      '({}) was specified.'.format(thirdparty)
+                msg = (
+                    "An invalid PagerTree third party ID "
+                    f"({thirdparty}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -196,29 +209,27 @@ def __init__(self, integration, action=None, thirdparty=None,
             self.meta_extras.update(meta_extras)
 
         # Setup our action
-        self.action = NotifyPagerTree.template_args['action']['default'] \
-            if action not in PAGERTREE_ACTIONS else \
-            PAGERTREE_ACTIONS[action]
+        self.action = (
+            NotifyPagerTree.template_args["action"]["default"]
+            if action not in PAGERTREE_ACTIONS
+            else PAGERTREE_ACTIONS[action]
+        )
 
         # Setup our urgency
-        self.urgency = \
-            None if urgency not in PAGERTREE_URGENCIES else \
-            PAGERTREE_URGENCIES[urgency]
+        self.urgency = PAGERTREE_URGENCIES.get(urgency)
 
         # Any optional tags to attach to the notification
         self.__tags = parse_list(tags)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform PagerTree Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform PagerTree Notification."""
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Apply any/all header over-rides defined
@@ -228,19 +239,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         # prepare JSON Object
         payload = {
             # Generate an ID (unless one was explicitly forced to be used)
-            'id': self.thirdparty if self.thirdparty else str(uuid4()),
-            'event_type': self.action,
+            "id": self.thirdparty if self.thirdparty else str(uuid4()),
+            "event_type": self.action,
         }
 
         if self.action == PagerTreeAction.CREATE:
-            payload['title'] = title if title else self.app_desc
-            payload['description'] = body
+            payload["title"] = title if title else self.app_desc
+            payload["description"] = body
 
-            payload['meta'] = self.meta_extras
-            payload['tags'] = self.__tags
+            payload["meta"] = self.meta_extras
+            payload["tags"] = self.__tags
 
             if self.urgency is not None:
-                payload['urgency'] = self.urgency
+                payload["urgency"] = self.urgency
 
         # Apply any/all payload over-rides defined
         payload.update(self.payload_extras)
@@ -248,10 +259,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         # Prepare our URL based on integration
         notify_url = self.notify_url.format(self.integration)
 
-        self.logger.debug('PagerTree POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('PagerTree Payload: %s' % str(payload))
+        self.logger.debug(
+            "PagerTree POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"PagerTree Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -265,33 +277,37 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 timeout=self.request_timeout,
             )
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.created,
-                    requests.codes.accepted):
+                requests.codes.ok,
+                requests.codes.created,
+                requests.codes.accepted,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyPagerTree.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyPagerTree.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send PagerTree notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send PagerTree notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent PagerTree notification.')
+                self.logger.info("Sent PagerTree notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending PagerTree '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending PagerTree "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -300,63 +316,56 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.integration)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'action': self.action,
+            "action": self.action,
         }
 
         if self.thirdparty:
-            params['tid'] = self.thirdparty
+            params["tid"] = self.thirdparty
 
         if self.urgency:
-            params['urgency'] = self.urgency
+            params["urgency"] = self.urgency
 
         if self.__tags:
-            params['tags'] = ','.join([x for x in self.__tags])
+            params["tags"] = ",".join(list(self.__tags))
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Headers prefixed with a '+' sign
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Meta: {} prefixed with a '-' sign
         # Append our meta extras into our parameters
-        params.update(
-            {'-{}'.format(k): v for k, v in self.meta_extras.items()})
+        params.update({f"-{k}": v for k, v in self.meta_extras.items()})
 
         # Payload body extras prefixed with a ':' sign
         # Append our payload extras into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.payload_extras.items()})
+        params.update({f":{k}": v for k, v in self.payload_extras.items()})
 
-        return '{schema}://{integration}?{params}'.format(
+        return "{schema}://{integration}?{params}".format(
             schema=self.secure_protocol,
             # never encode hostname since we're expecting it to be a valid one
-            integration=self.pprint(self.integration, privacy, safe=''),
+            integration=self.pprint(self.integration, privacy, safe=""),
             params=NotifyPagerTree.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
 
         if not results:
@@ -365,64 +374,71 @@ def parse_url(url):
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {
+        results["headers"] = {
             NotifyPagerTree.unquote(x): NotifyPagerTree.unquote(y)
-            for x, y in results['qsd+'].items()
+            for x, y in results["qsd+"].items()
         }
 
         # store any additional payload extra's defined
-        results['payload_extras'] = {
+        results["payload_extras"] = {
             NotifyPagerTree.unquote(x): NotifyPagerTree.unquote(y)
-            for x, y in results['qsd:'].items()
+            for x, y in results["qsd:"].items()
         }
 
         # store any additional meta extra's defined
-        results['meta_extras'] = {
+        results["meta_extras"] = {
             NotifyPagerTree.unquote(x): NotifyPagerTree.unquote(y)
-            for x, y in results['qsd-'].items()
+            for x, y in results["qsd-"].items()
         }
 
         # Integration ID
-        if 'id' in results['qsd'] and len(results['qsd']['id']):
+        if "id" in results["qsd"] and len(results["qsd"]["id"]):
             # Shortened version of integration id
-            results['integration'] = \
-                NotifyPagerTree.unquote(results['qsd']['id'])
+            results["integration"] = NotifyPagerTree.unquote(
+                results["qsd"]["id"]
+            )
 
-        elif 'integration' in results['qsd'] and \
-                len(results['qsd']['integration']):
-            results['integration'] = \
-                NotifyPagerTree.unquote(results['qsd']['integration'])
+        elif "integration" in results["qsd"] and len(
+            results["qsd"]["integration"]
+        ):
+            results["integration"] = NotifyPagerTree.unquote(
+                results["qsd"]["integration"]
+            )
 
         else:
-            results['integration'] = \
-                NotifyPagerTree.unquote(results['host'])
+            results["integration"] = NotifyPagerTree.unquote(results["host"])
 
         # Set our thirdparty
 
-        if 'tid' in results['qsd'] and len(results['qsd']['tid']):
+        if "tid" in results["qsd"] and len(results["qsd"]["tid"]):
             # Shortened version of thirdparty
-            results['thirdparty'] = \
-                NotifyPagerTree.unquote(results['qsd']['tid'])
+            results["thirdparty"] = NotifyPagerTree.unquote(
+                results["qsd"]["tid"]
+            )
 
-        elif 'thirdparty' in results['qsd'] and \
-                len(results['qsd']['thirdparty']):
-            results['thirdparty'] = \
-                NotifyPagerTree.unquote(results['qsd']['thirdparty'])
+        elif "thirdparty" in results["qsd"] and len(
+            results["qsd"]["thirdparty"]
+        ):
+            results["thirdparty"] = NotifyPagerTree.unquote(
+                results["qsd"]["thirdparty"]
+            )
 
         # Set our urgency
-        if 'action' in results['qsd'] and \
-                len(results['qsd']['action']):
-            results['action'] = \
-                NotifyPagerTree.unquote(results['qsd']['action'])
+        if "action" in results["qsd"] and len(results["qsd"]["action"]):
+            results["action"] = NotifyPagerTree.unquote(
+                results["qsd"]["action"]
+            )
 
         # Set our urgency
-        if 'urgency' in results['qsd'] and len(results['qsd']['urgency']):
-            results['urgency'] = \
-                NotifyPagerTree.unquote(results['qsd']['urgency'])
+        if "urgency" in results["qsd"] and len(results["qsd"]["urgency"]):
+            results["urgency"] = NotifyPagerTree.unquote(
+                results["qsd"]["urgency"]
+            )
 
         # Set our tags
-        if 'tags' in results['qsd'] and len(results['qsd']['tags']):
-            results['tags'] = \
-                parse_list(NotifyPagerTree.unquote(results['qsd']['tags']))
+        if "tags" in results["qsd"] and len(results["qsd"]["tags"]):
+            results["tags"] = parse_list(
+                NotifyPagerTree.unquote(results["qsd"]["tags"])
+            )
 
         return results
diff --git a/libs/apprise/plugins/parseplatform.py b/libs/apprise/plugins/parseplatform.py
index d5f0b22b36..70f3708661 100644
--- a/libs/apprise/plugins/parseplatform.py
+++ b/libs/apprise/plugins/parseplatform.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,29 +25,30 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 # Used to break path apart into list of targets
-TARGET_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
+TARGET_LIST_DELIM = re.compile(r"[ \t\r\n,\\/]+")
 
 
 # Priorities
 class ParsePlatformDevice:
     # All Devices
-    ALL = 'all'
+    ALL = "all"
 
     # Apple IOS (APNS)
-    IOS = 'ios'
+    IOS = "ios"
 
     # Android/Firebase (FCM)
-    ANDROID = 'android'
+    ANDROID = "android"
 
 
 PARSE_PLATFORM_DEVICES = (
@@ -59,97 +59,103 @@ class ParsePlatformDevice:
 
 
 class NotifyParsePlatform(NotifyBase):
-    """
-    A wrapper for Parse Platform Notifications
-    """
+    """A wrapper for Parse Platform Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Parse Platform'
+    service_name = "Parse Platform"
 
     # The services URL
-    service_url = ' https://parseplatform.org/'
+    service_url = " https://parseplatform.org/"
 
     # insecure notifications (using http)
-    protocol = 'parsep'
+    protocol = "parsep"
 
     # Secure notifications (using https)
-    secure_protocol = 'parseps'
+    secure_protocol = "parseps"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_parseplatform'
+    setup_url = "https://appriseit.com/services/parseplatform/"
 
     # Define object templates
     templates = (
-        '{schema}://{app_id}:{master_key}@{host}',
-        '{schema}://{app_id}:{master_key}@{host}:{port}',
+        "{schema}://{app_id}:{master_key}@{host}",
+        "{schema}://{app_id}:{master_key}@{host}:{port}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'app_id': {
-            'name': _('App ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'master_key': {
-            'name': _('Master Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "app_id": {
+                "name": _("App ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "master_key": {
+                "name": _("Master Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'device': {
-            'name': _('Device'),
-            'type': 'choice:string',
-            'values': PARSE_PLATFORM_DEVICES,
-            'default': ParsePlatformDevice.ALL,
-        },
-        'app_id': {
-            'alias_of': 'app_id',
-        },
-        'master_key': {
-            'alias_of': 'master_key',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "device": {
+                "name": _("Device"),
+                "type": "choice:string",
+                "values": PARSE_PLATFORM_DEVICES,
+                "default": ParsePlatformDevice.ALL,
+            },
+            "app_id": {
+                "alias_of": "app_id",
+            },
+            "master_key": {
+                "alias_of": "master_key",
+            },
         },
-    })
+    )
 
     def __init__(self, app_id, master_key, device=None, **kwargs):
-        """
-        Initialize Parse Platform Object
-        """
+        """Initialize Parse Platform Object."""
         super().__init__(**kwargs)
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
         if not isinstance(self.fullpath, str):
-            self.fullpath = '/'
+            self.fullpath = "/"
 
         # Application ID
         self.application_id = validate_regex(app_id)
         if not self.application_id:
-            msg = 'An invalid Parse Platform Application ID ' \
-                  '({}) was specified.'.format(app_id)
+            msg = (
+                "An invalid Parse Platform Application ID "
+                f"({app_id}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Master Key
         self.master_key = validate_regex(master_key)
         if not self.master_key:
-            msg = 'An invalid Parse Platform Master Key ' \
-                  '({}) was specified.'.format(master_key)
+            msg = (
+                "An invalid Parse Platform Master Key "
+                f"({master_key}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -159,62 +165,66 @@ def __init__(self, app_id, master_key, device=None, **kwargs):
         if device:
             self.device = device.lower()
             if device not in PARSE_PLATFORM_DEVICES:
-                msg = 'An invalid Parse Platform device ' \
-                      '({}) was specified.'.format(device)
+                msg = (
+                    "An invalid Parse Platform device "
+                    f"({device}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.device = self.template_args['device']['default']
+            self.device = self.template_args["device"]["default"]
 
         if self.device == ParsePlatformDevice.ALL:
-            self.devices = [d for d in PARSE_PLATFORM_DEVICES
-                            if d != ParsePlatformDevice.ALL]
+            self.devices = [
+                d
+                for d in PARSE_PLATFORM_DEVICES
+                if d != ParsePlatformDevice.ALL
+            ]
         else:
             # Store our device
             self.devices.append(device)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Parse Platform Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Parse Platform Notification."""
 
         # Prepare our headers:
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'X-Parse-Application-Id': self.application_id,
-            'X-Parse-Master-Key': self.master_key,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": self.application_id,
+            "X-Parse-Master-Key": self.master_key,
         }
 
         # prepare our payload
         payload = {
-            'where': {
-                'deviceType': {
-                    '$in': self.devices,
+            "where": {
+                "deviceType": {
+                    "$in": self.devices,
                 }
             },
-            'data': {
-                'title': title,
-                'alert': body,
-            }
+            "data": {
+                "title": title,
+                "alert": body,
+            },
         }
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
         # Our Notification URL
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        url += self.fullpath.rstrip('/') + '/parse/push/'
+        url += self.fullpath.rstrip("/") + "/parse/push/"
 
-        self.logger.debug('Parse Platform POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Parse Platform Payload: %s' % str(payload))
+        self.logger.debug(
+            "Parse Platform POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Parse Platform Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -225,32 +235,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 data=dumps(payload),
                 headers=headers,
                 verify=self.verify_certificate,
+                timeout=self.request_timeout,
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = NotifyParsePlatform.\
-                    http_response_code_lookup(r.status_code)
+                status_str = NotifyParsePlatform.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Parse Platform notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Parse Platform notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Parse Platform notification.')
+                self.logger.info("Sent Parse Platform notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occured sending Parse Platform '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occured sending Parse Platform "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -259,25 +273,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.application_id, self.master_key, self.host, self.port,
+            self.application_id,
+            self.master_key,
+            self.host,
+            self.port,
             self.fullpath,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any arguments set
         params = {
-            'device': self.device,
+            "device": self.device,
         }
 
         # Extend our parameters
@@ -285,25 +300,27 @@ def url(self, privacy=False, *args, **kwargs):
 
         default_port = 443 if self.secure else 80
 
-        return \
-            '{schema}://{app_id}:{master_key}@' \
-            '{hostname}{port}{fullpath}/?{params}'.format(
+        return (
+            "{schema}://{app_id}:{master_key}@"
+            "{hostname}{port}{fullpath}/?{params}".format(
                 schema=self.secure_protocol if self.secure else self.protocol,
-                app_id=self.pprint(self.application_id, privacy, safe=''),
-                master_key=self.pprint(self.master_key, privacy, safe=''),
-                hostname=NotifyParsePlatform.quote(self.host, safe=''),
-                port='' if self.port is None or self.port == default_port
-                     else ':{}'.format(self.port),
-                fullpath=NotifyParsePlatform.quote(self.fullpath, safe='/'),
-                params=NotifyParsePlatform.urlencode(params))
+                app_id=self.pprint(self.application_id, privacy, safe=""),
+                master_key=self.pprint(self.master_key, privacy, safe=""),
+                hostname=NotifyParsePlatform.quote(self.host, safe=""),
+                port=(
+                    ""
+                    if self.port is None or self.port == default_port
+                    else f":{self.port}"
+                ),
+                fullpath=NotifyParsePlatform.quote(self.fullpath, safe="/"),
+                params=NotifyParsePlatform.urlencode(params),
+            )
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to substantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to
+        substantiate this object."""
         results = NotifyBase.parse_url(url)
 
         if not results:
@@ -311,23 +328,25 @@ def parse_url(url):
             return results
 
         # App ID is retrieved from the user
-        results['app_id'] = NotifyParsePlatform.unquote(results['user'])
+        results["app_id"] = NotifyParsePlatform.unquote(results["user"])
 
         # Master Key is retrieved from the password
-        results['master_key'] = \
-            NotifyParsePlatform.unquote(results['password'])
+        results["master_key"] = NotifyParsePlatform.unquote(
+            results["password"]
+        )
 
         # Device support override
-        if 'device' in results['qsd'] and len(results['qsd']['device']):
-            results['device'] = results['qsd']['device']
+        if "device" in results["qsd"] and len(results["qsd"]["device"]):
+            results["device"] = results["qsd"]["device"]
 
         # Allow app_id attribute over-ride
-        if 'app_id' in results['qsd'] and len(results['qsd']['app_id']):
-            results['app_id'] = results['qsd']['app_id']
+        if "app_id" in results["qsd"] and len(results["qsd"]["app_id"]):
+            results["app_id"] = results["qsd"]["app_id"]
 
         # Allow master_key attribute over-ride
-        if 'master_key' in results['qsd'] \
-                and len(results['qsd']['master_key']):
-            results['master_key'] = results['qsd']['master_key']
+        if "master_key" in results["qsd"] and len(
+            results["qsd"]["master_key"]
+        ):
+            results["master_key"] = results["qsd"]["master_key"]
 
         return results
diff --git a/libs/apprise/plugins/plivo.py b/libs/apprise/plugins/plivo.py
index 893c0e94bc..7967cb5d1c 100644
--- a/libs/apprise/plugins/plivo.py
+++ b/libs/apprise/plugins/plivo.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
-# BSD 3-Clause License
+# BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2023, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -14,10 +13,6 @@
 #    this list of conditions and the following disclaimer in the documentation
 #    and/or other materials provided with the distribution.
 #
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -36,35 +31,38 @@
 #   - https://console.plivo.com/dashboard/
 #
 
+from json import dumps
+
 import requests
 
-from json import dumps
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import (
-    parse_bool, is_phone_no, parse_phone_no, validate_regex)
 from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from .base import NotifyBase
 
 
 class NotifyPlivo(NotifyBase):
-    """
-    A wrapper for Plivo Notifications
-    """
+    """A wrapper for Plivo Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Plivo'
+    service_name = "Plivo"
 
     # The services URL
-    service_url = 'https://plivo.com'
+    service_url = "https://plivo.com"
 
     # The default protocol
-    secure_protocol = 'plivo'
+    secure_protocol = "plivo"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_plivo'
+    setup_url = "https://appriseit.com/services/plivo/"
 
     # Plivo uses the http protocol with JSON requests
-    notify_url = 'https://api.plivo.com/v1/Account/{auth_id}/Message/'
+    notify_url = "https://api.plivo.com/v1/Account/{auth_id}/Message/"
 
     # The maximum number of messages that can be sent in a single batch
     default_batch_size = 20
@@ -78,92 +76,102 @@ class NotifyPlivo(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{auth_id}@{token}/{source}',
-        '{schema}://{auth_id}@{token}/{source}/{targets}',
+        "{schema}://{auth_id}@{token}/{source}",
+        "{schema}://{auth_id}@{token}/{source}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'auth_id': {
-            'name': _('Auth ID'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[a-z0-9]{20,30}$', 'i'),
-        },
-        'token': {
-            'name': _('Auth Token'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[a-z0-9]{30,50}$', 'i'),
-        },
-        'source': {
-            'name': _('Source Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'required': True,
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "auth_id": {
+                "name": _("Auth ID"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[a-z0-9]{20,30}$", "i"),
+            },
+            "token": {
+                "name": _("Auth Token"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[a-z0-9]{30,50}$", "i"),
+            },
+            "source": {
+                "name": _("Source Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "required": True,
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        }
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'source',
-        },
-        'token': {
-            'alias_of': 'token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "source",
+            },
+            "token": {
+                "alias_of": "token",
+            },
+            "id": {
+                "alias_of": "auth_id",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'id': {
-            'alias_of': 'auth_id',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
-    def __init__(self, auth_id, token, source, targets=None, batch=None,
-                 **kwargs):
-        """
-        Initialize Plivo Object
-        """
-        super(NotifyPlivo, self).__init__(**kwargs)
+    def __init__(
+        self, auth_id, token, source, targets=None, batch=None, **kwargs
+    ):
+        """Initialize Plivo Object."""
+        super().__init__(**kwargs)
 
         self.auth_id = validate_regex(
-            auth_id, *self.template_tokens['auth_id']['regex'])
+            auth_id, *self.template_tokens["auth_id"]["regex"]
+        )
         if not self.auth_id:
-            msg = 'The Plivo authentication ID specified ({}) is ' \
-                'invalid.'.format(auth_id)
+            msg = (
+                f"The Plivo authentication ID specified ({auth_id}) is "
+                "invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'The Plivo authentication token specified ({}) is ' \
-                'invalid.'.format(token)
+            msg = (
+                f"The Plivo authentication token specified ({token}) is "
+                "invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         result = is_phone_no(source)
         if not result:
-            msg = 'The Plivo source specified ({}) is invalid.'\
-                .format(source)
+            msg = f"The Plivo source specified ({source}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -171,7 +179,7 @@ def __init__(self, auth_id, token, source, targets=None, batch=None,
         self.source = f'+{result["full"]}'
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         if targets:
             for target in parse_phone_no(targets):
@@ -183,26 +191,25 @@ def __init__(self, auth_id, token, source, targets=None, batch=None,
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
         else:
             # No sources specified, use our own phone no
             self.targets.append(self.source)
 
         # Set batch
-        self.batch = batch if batch is not None \
-            else self.template_args['batch']['default']
+        self.batch = (
+            batch
+            if batch is not None
+            else self.template_args["batch"]["default"]
+        )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Plivo Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Plivo Notification."""
 
         if not self.targets:
             # There were no services to notify
-            self.logger.warning(
-                'There were no Plivo targets to notify.')
+            self.logger.warning("There were no Plivo targets to notify.")
             return False
 
         # Initialize our has_error flag
@@ -210,8 +217,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Prepare our authentication
@@ -219,9 +226,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our payload
         payload = {
-            'src': self.source,
-            'dst': None,
-            'text': body,
+            "src": self.source,
+            "dst": None,
+            "text": body,
         }
 
         # Send in batches if identified to do so
@@ -229,14 +236,16 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         for index in range(0, len(self.targets), batch_size):
             # Prepare our phone no (< delimits more then one)
-            payload['recipients'] = \
-                ','.join(self.targets[index:index + batch_size])
+            payload["recipients"] = ",".join(
+                self.targets[index : index + batch_size]
+            )
 
             # Some Debug Logging
             self.logger.debug(
-                'Plivo POST URL: {} (cert_verify={})'.format(
-                    self.notify_url, self.verify_certificate))
-            self.logger.debug('Plivo Payload: {}' .format(payload))
+                "Plivo POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Plivo Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -251,24 +260,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
 
                 if r.status_code not in (
-                        requests.codes.ok, requests.codes.accepted):
+                    requests.codes.ok,
+                    requests.codes.accepted,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyPlivo.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyPlivo.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send {} Plivo notification{}: '
-                        '{}{}error={}.'.format(
-                            len(self.targets[index:index + batch_size]),
-                            ' to {}'.format(self.targets[index])
-                            if batch_size == 1 else '(s)',
+                        "Failed to send {} Plivo notification{}: "
+                        "{}{}error={}.".format(
+                            len(self.targets[index : index + batch_size]),
+                            (
+                                f" to {self.targets[index]}"
+                                if batch_size == 1
+                                else "(s)"
+                            ),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -276,18 +292,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Send {} Plivo notification{}'.format(
-                            len(self.targets[index:index + batch_size]),
-                            ' to {}'.format(self.targets[index])
-                            if batch_size == 1 else '(s)',
-                        ))
+                        "Send {} Plivo notification{}".format(
+                            len(self.targets[index : index + batch_size]),
+                            (
+                                f" to {self.targets[index]}"
+                                if batch_size == 1
+                                else "(s)"
+                            ),
+                        )
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occured sending Plivo:%s ' % (
-                        self.targets) + 'notification.'
+                    f"A Connection error occured sending Plivo:{self.targets} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -297,43 +317,44 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.auth_id, self.token, self.source,
+            self.auth_id,
+            self.token,
+            self.source,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any arguments set
         params = {
-            'batch': 'yes' if self.batch else 'no',
+            "batch": "yes" if self.batch else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{auth_id}@{token}/{source}/' \
-            '{targets}/?{params}'.format(
+        return (
+            "{schema}://{auth_id}@{token}/{source}/{targets}/?{params}".format(
                 schema=self.secure_protocol,
-                auth_id=self.pprint(self.auth_id, privacy, safe=''),
-                token=self.pprint(self.token, privacy, safe=''),
+                auth_id=self.pprint(self.auth_id, privacy, safe=""),
+                token=self.pprint(self.token, privacy, safe=""),
                 source=self.source,
-                targets='/'.join(
-                    [NotifyPlivo.quote(x, safe='+') for x in self.targets]),
-                params=NotifyPlivo.urlencode(params))
+                targets="/".join(
+                    [NotifyPlivo.quote(x, safe="+") for x in self.targets]
+                ),
+                params=NotifyPlivo.urlencode(params),
+            )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
@@ -341,11 +362,8 @@ def __len__(self):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to substantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to
+        substantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -353,51 +371,54 @@ def parse_url(url):
             return results
 
         # The Auth ID is in the username field
-        if 'id' in results['qsd'] and len(results['qsd']['id']):
-            results['auth_id'] = NotifyPlivo.unquote(results['qsd']['id'])
+        if "id" in results["qsd"] and len(results["qsd"]["id"]):
+            results["auth_id"] = NotifyPlivo.unquote(results["qsd"]["id"])
 
         else:
-            results['auth_id'] = NotifyPlivo.unquote(results['user'])
+            results["auth_id"] = NotifyPlivo.unquote(results["user"])
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyPlivo.split_path(results['fullpath'])
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        results["targets"] = NotifyPlivo.split_path(results["fullpath"])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Store token
-            results['token'] = NotifyPlivo.unquote(results['qsd']['token'])
+            results["token"] = NotifyPlivo.unquote(results["qsd"]["token"])
 
             # go ahead and put the host entry in the targets list
-            if results['host']:
-                results['targets'].insert(
-                    0, NotifyPlivo.unquote(results['host']))
+            if results["host"]:
+                results["targets"].insert(
+                    0, NotifyPlivo.unquote(results["host"])
+                )
 
         else:
             # The hostname is our authentication key
-            results['token'] = NotifyPlivo.unquote(results['host'])
+            results["token"] = NotifyPlivo.unquote(results["host"])
 
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyPlivo.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyPlivo.unquote(results["qsd"]["from"])
 
         else:
             try:
                 # The first path entry is the source/originator
-                results['source'] = results['targets'].pop(0)
+                results["source"] = results["targets"].pop(0)
 
             except IndexError:
                 # No source specified...
-                results['source'] = None
+                results["source"] = None
                 pass
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPlivo.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPlivo.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyPlivo.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyPlivo.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/popcorn_notify.py b/libs/apprise/plugins/popcorn_notify.py
index 3318a554e6..74cacac8d3 100644
--- a/libs/apprise/plugins/popcorn_notify.py
+++ b/libs/apprise/plugins/popcorn_notify.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,92 +27,97 @@
 
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import (
-    is_email, is_phone_no, parse_list, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_email,
+    is_phone_no,
+    parse_bool,
+    parse_list,
+    validate_regex,
+)
+from .base import NotifyBase
 
 
 class NotifyPopcornNotify(NotifyBase):
-    """
-    A wrapper for PopcornNotify Notifications
-    """
+    """A wrapper for PopcornNotify Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'PopcornNotify'
+    service_name = "PopcornNotify"
 
     # The services URL
-    service_url = 'https://popcornnotify.com/'
+    service_url = "https://popcornnotify.com/"
 
     # The default protocol
-    secure_protocol = 'popcorn'
+    secure_protocol = "popcorn"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_popcornnotify'
+    setup_url = "https://appriseit.com/services/popcornnotify/"
 
     # PopcornNotify uses the http protocol
-    notify_url = 'https://popcornnotify.com/notify'
+    notify_url = "https://popcornnotify.com/notify"
 
     # The maximum targets to include when doing batch transfers
     default_batch_size = 10
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}/{targets}',
-    )
+    templates = ("{schema}://{apikey}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'regex': (r'^[a-z0-9]+$', 'i'),
-            'required': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "regex": (r"^[a-z0-9]+$", "i"),
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        }
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-    })
+    )
 
     def __init__(self, apikey, targets=None, batch=False, **kwargs):
-        """
-        Initialize PopcornNotify Object
-        """
+        """Initialize PopcornNotify Object."""
         super().__init__(**kwargs)
 
         # Access Token (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid PopcornNotify API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid PopcornNotify API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -121,36 +125,34 @@ def __init__(self, apikey, targets=None, batch=False, **kwargs):
         self.batch = batch
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_list(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if result:
                 # store valid phone number
-                self.targets.append(result['full'])
+                self.targets.append(result["full"])
                 continue
 
             result = is_email(target)
             if result:
                 # store valid email
-                self.targets.append(result['full_email'])
+                self.targets.append(result["full_email"])
                 continue
 
             self.logger.warning(
-                'Dropped invalid target '
-                '({}) specified.'.format(target),
+                f"Dropped invalid target ({target}) specified.",
             )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform PopcornNotify Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform PopcornNotify Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
             self.logger.warning(
-                'There were no PopcornNotify targets to notify.')
+                "There were no PopcornNotify targets to notify."
+            )
             return False
 
         # error tracking (used for function return)
@@ -158,14 +160,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
         }
 
         # Prepare our payload
         payload = {
-            'message': body,
-            'subject': title,
+            "message": body,
+            "subject": title,
         }
 
         auth = (self.apikey, None)
@@ -175,13 +177,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         for index in range(0, len(self.targets), batch_size):
             # Prepare our recipients
-            payload['recipients'] = \
-                ','.join(self.targets[index:index + batch_size])
+            payload["recipients"] = ",".join(
+                self.targets[index : index + batch_size]
+            )
 
-            self.logger.debug('PopcornNotify POST URL: %s (cert_verify=%r)' % (
-                self.notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('PopcornNotify Payload: %s' % str(payload))
+            self.logger.debug(
+                "PopcornNotify POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"PopcornNotify Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -196,22 +200,27 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyPopcornNotify.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyPopcornNotify.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send {} PopcornNotify notification{}: '
-                        '{}{}error={}.'.format(
-                            len(self.targets[index:index + batch_size]),
-                            ' to {}'.format(self.targets[index])
-                            if batch_size == 1 else '(s)',
+                        "Failed to send {} PopcornNotify notification{}: "
+                        "{}{}error={}.".format(
+                            len(self.targets[index : index + batch_size]),
+                            (
+                                f" to {self.targets[index]}"
+                                if batch_size == 1
+                                else "(s)"
+                            ),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -219,19 +228,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent {} PopcornNotify notification{}.'
-                        .format(
-                            len(self.targets[index:index + batch_size]),
-                            ' to {}'.format(self.targets[index])
-                            if batch_size == 1 else '(s)',
-                        ))
+                        "Sent {} PopcornNotify notification{}.".format(
+                            len(self.targets[index : index + batch_size]),
+                            (
+                                f" to {self.targets[index]}"
+                                if batch_size == 1
+                                else "(s)"
+                            ),
+                        )
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occured sending {} PopcornNotify '
-                    'notification(s).'.format(
-                        len(self.targets[index:index + batch_size])))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occured sending"
+                    f" {len(self.targets[index:index + batch_size])} "
+                    "PopcornNotify notification(s)."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -241,55 +254,51 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
+            "batch": "yes" if self.batch else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{apikey}/{targets}/?{params}'.format(
+        return "{schema}://{apikey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(
-                [NotifyPopcornNotify.quote(x, safe='') for x in self.targets]),
-            params=NotifyPopcornNotify.urlencode(params))
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                [NotifyPopcornNotify.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyPopcornNotify.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -298,20 +307,21 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = \
-            NotifyPopcornNotify.split_path(results['fullpath'])
+        results["targets"] = NotifyPopcornNotify.split_path(
+            results["fullpath"]
+        )
 
         # The hostname is our authentication key
-        results['apikey'] = NotifyPopcornNotify.unquote(results['host'])
+        results["apikey"] = NotifyPopcornNotify.unquote(results["host"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPopcornNotify.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPopcornNotify.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get('batch', False))
+        results["batch"] = parse_bool(results["qsd"].get("batch", False))
 
         return results
diff --git a/libs/apprise/plugins/prowl.py b/libs/apprise/plugins/prowl.py
index 358cdb3ee2..f45bd7f930 100644
--- a/libs/apprise/plugins/prowl.py
+++ b/libs/apprise/plugins/prowl.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,12 +25,14 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
+
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 # Priorities
@@ -45,59 +46,56 @@ class ProwlPriority:
 
 PROWL_PRIORITIES = {
     # Note: This also acts as a reverse lookup mapping
-    ProwlPriority.LOW: 'low',
-    ProwlPriority.MODERATE: 'moderate',
-    ProwlPriority.NORMAL: 'normal',
-    ProwlPriority.HIGH: 'high',
-    ProwlPriority.EMERGENCY: 'emergency',
+    ProwlPriority.LOW: "low",
+    ProwlPriority.MODERATE: "moderate",
+    ProwlPriority.NORMAL: "normal",
+    ProwlPriority.HIGH: "high",
+    ProwlPriority.EMERGENCY: "emergency",
 }
 
 PROWL_PRIORITY_MAP = {
     # Maps against string 'low'
-    'l': ProwlPriority.LOW,
+    "l": ProwlPriority.LOW,
     # Maps against string 'moderate'
-    'm': ProwlPriority.MODERATE,
+    "m": ProwlPriority.MODERATE,
     # Maps against string 'normal'
-    'n': ProwlPriority.NORMAL,
+    "n": ProwlPriority.NORMAL,
     # Maps against string 'high'
-    'h': ProwlPriority.HIGH,
+    "h": ProwlPriority.HIGH,
     # Maps against string 'emergency'
-    'e': ProwlPriority.EMERGENCY,
-
+    "e": ProwlPriority.EMERGENCY,
     # Entries to additionally support (so more like Prowl's API)
-    '-2': ProwlPriority.LOW,
-    '-1': ProwlPriority.MODERATE,
-    '0': ProwlPriority.NORMAL,
-    '1': ProwlPriority.HIGH,
-    '2': ProwlPriority.EMERGENCY,
+    "-2": ProwlPriority.LOW,
+    "-1": ProwlPriority.MODERATE,
+    "0": ProwlPriority.NORMAL,
+    "1": ProwlPriority.HIGH,
+    "2": ProwlPriority.EMERGENCY,
 }
 
 # Provide some known codes Prowl uses and what they translate to:
 PROWL_HTTP_ERROR_MAP = {
-    406: 'IP address has exceeded API limit',
-    409: 'Request not aproved.',
+    406: "IP address has exceeded API limit",
+    409: "Request not aproved.",
 }
 
 
 class NotifyProwl(NotifyBase):
-    """
-    A wrapper for Prowl Notifications
-    """
+    """A wrapper for Prowl Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Prowl'
+    service_name = "Prowl"
 
     # The services URL
-    service_url = 'https://www.prowlapp.com/'
+    service_url = "https://www.prowlapp.com/"
 
     # The default secure protocol
-    secure_protocol = 'prowl'
+    secure_protocol = "prowl"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_prowl'
+    setup_url = "https://appriseit.com/services/prowl/"
 
     # Prowl uses the http protocol with JSON requests
-    notify_url = 'https://api.prowlapp.com/publicapi/add'
+    notify_url = "https://api.prowlapp.com/publicapi/add"
 
     # Disable throttle rate for Prowl requests since they are normally
     # local anyway
@@ -111,67 +109,80 @@ class NotifyProwl(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}',
-        '{schema}://{apikey}/{providerkey}',
+        "{schema}://{apikey}",
+        "{schema}://{apikey}/{providerkey}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Za-z0-9]{40}$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Za-z0-9]{40}$", "i"),
+            },
+            "providerkey": {
+                "name": _("Provider Key"),
+                "type": "string",
+                "private": True,
+                "regex": (r"^[A-Za-z0-9]{40}$", "i"),
+            },
         },
-        'providerkey': {
-            'name': _('Provider Key'),
-            'type': 'string',
-            'private': True,
-            'regex': (r'^[A-Za-z0-9]{40}$', 'i'),
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': PROWL_PRIORITIES,
-            'default': ProwlPriority.NORMAL,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": PROWL_PRIORITIES,
+                "default": ProwlPriority.NORMAL,
+            },
         },
-    })
+    )
 
     def __init__(self, apikey, providerkey=None, priority=None, **kwargs):
-        """
-        Initialize Prowl Object
-        """
+        """Initialize Prowl Object."""
         super().__init__(**kwargs)
 
         # The Priority of the message
-        self.priority = NotifyProwl.template_args['priority']['default'] \
-            if not priority else \
-            next((
-                v for k, v in PROWL_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyProwl.template_args['priority']['default'])
+        self.priority = (
+            NotifyProwl.template_args["priority"]["default"]
+            if not priority
+            else next(
+                (
+                    v
+                    for k, v in PROWL_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyProwl.template_args["priority"]["default"],
+            )
+        )
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Prowl API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Prowl API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store the provider key (if specified)
         if providerkey:
             self.providerkey = validate_regex(
-                providerkey, *self.template_tokens['providerkey']['regex'])
+                providerkey, *self.template_tokens["providerkey"]["regex"]
+            )
             if not self.providerkey:
-                msg = 'An invalid Prowl Provider Key ' \
-                      '({}) was specified.'.format(providerkey)
+                msg = (
+                    "An invalid Prowl Provider Key "
+                    f"({providerkey}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -181,32 +192,31 @@ def __init__(self, apikey, providerkey=None, priority=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Prowl Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Prowl Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-type': "application/x-www-form-urlencoded",
+            "User-Agent": self.app_id,
+            "Content-type": "application/x-www-form-urlencoded",
         }
 
         # prepare JSON Object
         payload = {
-            'apikey': self.apikey,
-            'application': self.app_id,
-            'event': title,
-            'description': body,
-            'priority': self.priority,
+            "apikey": self.apikey,
+            "application": self.app_id,
+            "event": title,
+            "description": body,
+            "priority": self.priority,
         }
 
         if self.providerkey:
-            payload['providerkey'] = self.providerkey
+            payload["providerkey"] = self.providerkey
 
-        self.logger.debug('Prowl POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Prowl Payload: %s' % str(payload))
+        self.logger.debug(
+            "Prowl POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Prowl Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -221,29 +231,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyBase.http_response_code_lookup(
-                        r.status_code, PROWL_HTTP_ERROR_MAP)
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code, PROWL_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Prowl notification:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Prowl notification:{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Prowl notification.')
+                self.logger.info("Sent Prowl notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Prowl notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Prowl notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -252,62 +263,57 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey, self.providerkey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'priority':
-                PROWL_PRIORITIES[self.template_args['priority']['default']]
+            "priority": (
+                PROWL_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in PROWL_PRIORITIES
-                else PROWL_PRIORITIES[self.priority],
+                else PROWL_PRIORITIES[self.priority]
+            ),
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{apikey}/{providerkey}/?{params}'.format(
+        return "{schema}://{apikey}/{providerkey}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            providerkey=self.pprint(self.providerkey, privacy, safe=''),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            providerkey=self.pprint(self.providerkey, privacy, safe=""),
             params=NotifyProwl.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Set the API Key
-        results['apikey'] = NotifyProwl.unquote(results['host'])
+        results["apikey"] = NotifyProwl.unquote(results["host"])
 
         # Optionally try to find the provider key
-        try:
-            results['providerkey'] = \
-                NotifyProwl.split_path(results['fullpath'])[0]
-
-        except IndexError:
-            pass
+        with contextlib.suppress(IndexError):
+            results["providerkey"] = NotifyProwl.split_path(
+                results["fullpath"]
+            )[0]
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyProwl.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyProwl.unquote(
+                results["qsd"]["priority"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/pushbullet.py b/libs/apprise/plugins/pushbullet.py
index ee0bcf7f7e..3ac3af5039 100644
--- a/libs/apprise/plugins/pushbullet.py
+++ b/libs/apprise/plugins/pushbullet.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,120 +25,128 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from json import dumps, loads
+
 import requests
-from json import dumps
-from json import loads
 
-from .base import NotifyBase
+from ..attachment.base import AttachBase
 from ..common import NotifyType
-from ..utils.parse import is_email, parse_list, validate_regex
 from ..locale import gettext_lazy as _
-from ..attachment.base import AttachBase
+from ..utils.parse import is_email, parse_list, validate_regex
+from .base import NotifyBase
 
 # Flag used as a placeholder to sending to all devices
-PUSHBULLET_SEND_TO_ALL = 'ALL_DEVICES'
+PUSHBULLET_SEND_TO_ALL = "ALL_DEVICES"
 
 # Provide some known codes Pushbullet uses and what they translate to:
 PUSHBULLET_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 
 class NotifyPushBullet(NotifyBase):
-    """
-    A wrapper for PushBullet Notifications
-    """
+    """A wrapper for PushBullet Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pushbullet'
+    service_name = "Pushbullet"
 
     # The services URL
-    service_url = 'https://www.pushbullet.com/'
+    service_url = "https://www.pushbullet.com/"
 
     # The default secure protocol
-    secure_protocol = 'pbul'
+    secure_protocol = "pbul"
 
     # Allow 50 requests per minute (Tier 2).
     # 60/50 = 0.2
     request_rate_per_sec = 1.2
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushbullet'
+    setup_url = "https://appriseit.com/services/pushbullet/"
 
     # PushBullet uses the http protocol with JSON requests
-    notify_url = 'https://api.pushbullet.com/v2/{}'
+    notify_url = "https://api.pushbullet.com/v2/{}"
 
     # Support attachments
     attachment_support = True
 
     # Define object templates
     templates = (
-        '{schema}://{accesstoken}',
-        '{schema}://{accesstoken}/{targets}',
+        "{schema}://{accesstoken}",
+        "{schema}://{accesstoken}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'accesstoken': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "accesstoken": {
+                "name": _("Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_device": {
+                "name": _("Target Device"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_channel': {
-            'name': _('Target Channel'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
         },
-    })
+    )
 
     def __init__(self, accesstoken, targets=None, **kwargs):
-        """
-        Initialize PushBullet Object
-        """
+        """Initialize PushBullet Object."""
         super().__init__(**kwargs)
 
         # Access Token (associated with project)
         self.accesstoken = validate_regex(accesstoken)
         if not self.accesstoken:
-            msg = 'An invalid PushBullet Access Token ' \
-                  '({}) was specified.'.format(accesstoken)
+            msg = (
+                "An invalid PushBullet Access Token "
+                f"({accesstoken}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.targets = parse_list(targets)
         if len(self.targets) == 0:
-            self.targets = (PUSHBULLET_SEND_TO_ALL, )
+            self.targets = (PUSHBULLET_SEND_TO_ALL,)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform PushBullet Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform PushBullet Notification."""
 
         # error tracking (used for function return)
         has_error = False
@@ -156,25 +163,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Preparing PushBullet attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Preparing PushBullet attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
                 # prepare payload
                 payload = {
-                    'file_name': attachment.name
-                    if attachment.name else f'file{no:03}.dat',
-                    'file_type': attachment.mimetype,
+                    "file_name": (
+                        attachment.name
+                        if attachment.name
+                        else f"file{no:03}.dat"
+                    ),
+                    "file_type": attachment.mimetype,
                 }
                 # First thing we need to do is make a request so that we can
                 # get a URL to post our request to.
                 # see: https://docs.pushbullet.com/#upload-request
                 okay, response = self._send(
-                    self.notify_url.format('upload-request'), payload)
+                    self.notify_url.format("upload-request"), payload
+                )
                 if not okay:
                     # We can't post our attachment
                     return False
@@ -199,17 +212,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     # our response at the same time as preparing our payload
                     payload = {
                         # PushBullet v2/pushes file type:
-                        'type': 'file',
-                        'file_name': response['file_name'],
-                        'file_type': response['file_type'],
-                        'file_url': response['file_url'],
+                        "type": "file",
+                        "file_name": response["file_name"],
+                        "file_type": response["file_type"],
+                        "file_url": response["file_url"],
                     }
 
-                    if response['file_type'].startswith('image/'):
+                    if response["file_type"].startswith("image/"):
                         # Allow image to be displayed inline (if image type)
-                        payload['image_url'] = response['file_url']
+                        payload["image_url"] = response["file_url"]
 
-                    upload_url = response['upload_url']
+                    upload_url = response["upload_url"]
 
                 except (KeyError, TypeError):
                     # A method of verifying our content exists
@@ -230,67 +243,71 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
             # prepare payload
             payload = {
-                'type': 'note',
-                'title': title,
-                'body': body,
+                "type": "note",
+                "title": title,
+                "body": body,
             }
 
             # Check if an email was defined
             match = is_email(recipient)
             if match:
-                payload['email'] = match['full_email']
+                payload["email"] = match["full_email"]
                 self.logger.debug(
-                    "PushBullet recipient {} parsed as an email address"
-                    .format(recipient))
+                    f"PushBullet recipient {recipient} parsed as an email"
+                    " address"
+                )
 
             elif recipient is PUSHBULLET_SEND_TO_ALL:
                 # Send to all
                 pass
 
-            elif recipient[0] == '#':
-                payload['channel_tag'] = recipient[1:]
+            elif recipient[0] == "#":
+                payload["channel_tag"] = recipient[1:]
                 self.logger.debug(
-                    "PushBullet recipient {} parsed as a channel"
-                    .format(recipient))
+                    f"PushBullet recipient {recipient} parsed as a channel"
+                )
 
             else:
-                payload['device_iden'] = recipient
+                payload["device_iden"] = recipient
                 self.logger.debug(
-                    "PushBullet recipient {} parsed as a device"
-                    .format(recipient))
+                    f"PushBullet recipient {recipient} parsed as a device"
+                )
 
             if body:
                 okay, response = self._send(
-                    self.notify_url.format('pushes'), payload)
+                    self.notify_url.format("pushes"), payload
+                )
                 if not okay:
                     has_error = True
                     continue
 
                 self.logger.info(
-                    'Sent PushBullet notification to "%s".' % (recipient))
+                    f'Sent PushBullet notification to "{recipient}".'
+                )
 
             for attach_payload in attachments:
                 # Send our attachments to our same user (already prepared as
                 # our payload object)
                 okay, response = self._send(
-                    self.notify_url.format('pushes'), attach_payload)
+                    self.notify_url.format("pushes"), attach_payload
+                )
                 if not okay:
                     has_error = True
                     continue
 
                 self.logger.info(
                     'Sent PushBullet attachment ({}) to "{}".'.format(
-                        attach_payload['file_name'], recipient))
+                        attach_payload["file_name"], recipient
+                    )
+                )
 
         return not has_error
 
     def _send(self, url, payload, **kwargs):
-        """
-        Wrapper to the requests (post) object
-        """
+        """Wrapper to the requests (post) object."""
 
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Some default values for our request object to which we'll update
@@ -300,15 +317,16 @@ def _send(self, url, payload, **kwargs):
 
         if not isinstance(payload, AttachBase):
             # Send our payload as a JSON object
-            headers['Content-Type'] = 'application/json'
+            headers["Content-Type"] = "application/json"
             data = dumps(payload) if payload else None
 
-        auth = (self.accesstoken, '')
+        auth = (self.accesstoken, "")
 
-        self.logger.debug('PushBullet POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('PushBullet Payload: %s' % str(payload))
+        self.logger.debug(
+            "PushBullet POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"PushBullet Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -319,7 +337,13 @@ def _send(self, url, payload, **kwargs):
         try:
             # Open our attachment path if required:
             if isinstance(payload, AttachBase):
-                files = {'file': (payload.name, open(payload.path, 'rb'))}
+                files = {
+                    "file": (
+                        payload.name,
+                        # file handle is safely closed in `finally`; inline
+                        # open is intentional
+                        open(payload.path, "rb"),  # noqa: SIM115
+                    )}
 
             r = requests.post(
                 url,
@@ -343,21 +367,23 @@ def _send(self, url, payload, **kwargs):
                 response = r.content
 
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyPushBullet.http_response_code_lookup(
-                        r.status_code, PUSHBULLET_HTTP_ERROR_MAP)
+                status_str = NotifyPushBullet.http_response_code_lookup(
+                    r.status_code, PUSHBULLET_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to deliver payload to PushBullet:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to deliver payload to PushBullet:"
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False, response
 
@@ -366,83 +392,81 @@ def _send(self, url, payload, **kwargs):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred communicating with PushBullet.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred communicating with PushBullet."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False, response
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while handling {}.'.format(
-                    payload.name if isinstance(payload, AttachBase)
-                    else payload))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while handling {}.".format(
+                    payload.name
+                    if isinstance(payload, AttachBase)
+                    else payload
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return False, response
 
         finally:
             # Close our file (if it's open) stored in the second element
             # of our files tuple (index 1)
             if files:
-                files['file'][1].close()
+                files["file"][1].close()
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.accesstoken)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        targets = '/'.join([NotifyPushBullet.quote(x) for x in self.targets])
+        targets = "/".join([NotifyPushBullet.quote(x) for x in self.targets])
         if targets == PUSHBULLET_SEND_TO_ALL:
             # keyword is reserved for internal usage only; it's safe to remove
             # it from the recipients list
-            targets = ''
+            targets = ""
 
-        return '{schema}://{accesstoken}/{targets}/?{params}'.format(
+        return "{schema}://{accesstoken}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            accesstoken=self.pprint(self.accesstoken, privacy, safe=''),
+            accesstoken=self.pprint(self.accesstoken, privacy, safe=""),
             targets=targets,
-            params=NotifyPushBullet.urlencode(params))
+            params=NotifyPushBullet.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Fetch our targets
-        results['targets'] = \
-            NotifyPushBullet.split_path(results['fullpath'])
+        results["targets"] = NotifyPushBullet.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPushBullet.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPushBullet.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Setup the token; we store it in Access Token for global
         # plugin consistency with naming conventions
-        results['accesstoken'] = NotifyPushBullet.unquote(results['host'])
+        results["accesstoken"] = NotifyPushBullet.unquote(results["host"])
 
         return results
diff --git a/libs/apprise/plugins/pushdeer.py b/libs/apprise/plugins/pushdeer.py
index 26bf9b881c..617b8e8e30 100644
--- a/libs/apprise/plugins/pushdeer.py
+++ b/libs/apprise/plugins/pushdeer.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,97 +28,94 @@
 import requests
 
 from ..common import NotifyType
-from .base import NotifyBase
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 # Syntax:
 #  schan://{key}/
 
 
 class NotifyPushDeer(NotifyBase):
-    """
-    A wrapper for PushDeer Notifications
-    """
+    """A wrapper for PushDeer Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'PushDeer'
+    service_name = "PushDeer"
 
     # The services URL
-    service_url = 'https://www.pushdeer.com/'
+    service_url = "https://www.pushdeer.com/"
 
     # Insecure Protocol Access
-    protocol = 'pushdeer'
+    protocol = "pushdeer"
 
     # Secure Protocol
-    secure_protocol = 'pushdeers'
+    secure_protocol = "pushdeers"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_PushDeer'
+    setup_url = "https://appriseit.com/services/pushdeer/"
 
     # Default hostname
-    default_hostname = 'api2.pushdeer.com'
+    default_hostname = "api2.pushdeer.com"
 
     # PushDeer API
-    notify_url = '{schema}://{host}:{port}/message/push?pushkey={pushKey}'
+    notify_url = "{schema}://{host}:{port}/message/push?pushkey={pushKey}"
 
     # Define object templates
     templates = (
-        '{schema}://{pushkey}',
-        '{schema}://{host}/{pushkey}',
-        '{schema}://{host}:{port}/{pushkey}',
+        "{schema}://{pushkey}",
+        "{schema}://{host}/{pushkey}",
+        "{schema}://{host}:{port}/{pushkey}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'pushkey': {
-            'name': _('Pushkey'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "pushkey": {
+                "name": _("Pushkey"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
         },
-    })
+    )
 
     def __init__(self, pushkey, **kwargs):
-        """
-        Initialize PushDeer Object
-        """
+        """Initialize PushDeer Object."""
         super().__init__(**kwargs)
 
         # PushKey (associated with project)
         self.push_key = validate_regex(
-            pushkey, *self.template_tokens['pushkey']['regex'])
+            pushkey, *self.template_tokens["pushkey"]["regex"]
+        )
         if not self.push_key:
-            msg = 'An invalid PushDeer API Pushkey ' \
-                  '({}) was specified.'.format(pushkey)
+            msg = f"An invalid PushDeer API Pushkey ({pushkey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform PushDeer Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform PushDeer Notification."""
 
         # Prepare our persistent_notification.create payload
         payload = {
-            'text': title if title else body,
-            'type': 'text',
-            'desp': body if title else '',
+            "text": title if title else body,
+            "type": "text",
+            "desp": body if title else "",
         }
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
         # Set host
         host = self.default_hostname
@@ -133,12 +129,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Our Notification URL
         notify_url = self.notify_url.format(
-            schema=schema, host=host, port=port, pushKey=self.push_key)
+            schema=schema, host=host, port=port, pushKey=self.push_key
+        )
 
         # Some Debug Logging
-        self.logger.debug('PushDeer URL: {} (cert_verify={})'.format(
-            notify_url, self.verify_certificate))
-        self.logger.debug('PushDeer Payload: {}'.format(payload))
+        self.logger.debug(
+            "PushDeer URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"PushDeer Payload: {payload}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -152,79 +151,78 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyPushDeer.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyPushDeer.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send PushDeer notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send PushDeer notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+
                 return False
 
             else:
-                self.logger.info('Sent PushDeer notification.')
+                self.logger.info("Sent PushDeer notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occured sending PushDeer '
-                'notification.'
+                "A Connection error occured sending PushDeer notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.push_key, self.host, self.port,
+            self.push_key,
+            self.host,
+            self.port,
         )
 
     def url(self, privacy=False):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         if self.host:
-            url = '{schema}://{host}{port}/{pushkey}'
+            url = "{schema}://{host}{port}/{pushkey}"
         else:
-            url = '{schema}://{pushkey}'
+            url = "{schema}://{pushkey}"
 
         return url.format(
             schema=self.secure_protocol if self.secure else self.protocol,
             host=self.host,
-            port='' if not self.port else ':{}'.format(self.port),
-            pushkey=self.pprint(self.push_key, privacy, safe=''))
+            port="" if not self.port else f":{self.port}",
+            pushkey=self.pprint(self.push_key, privacy, safe=""),
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to substantiate this object.
-        """
+        """Parses the URL and returns enough arguments that can allow us to
+        substantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't parse the URL
             return results
 
-        fullpaths = NotifyPushDeer.split_path(results['fullpath'])
+        fullpaths = NotifyPushDeer.split_path(results["fullpath"])
 
         if len(fullpaths) == 0:
-            results['pushkey'] = results['host']
-            results['host'] = None
+            results["pushkey"] = results["host"]
+            results["host"] = None
         else:
-            results['pushkey'] = fullpaths.pop()
+            results["pushkey"] = fullpaths.pop()
 
         return results
diff --git a/libs/apprise/plugins/pushed.py b/libs/apprise/plugins/pushed.py
index c7646a0914..28b2323f06 100644
--- a/libs/apprise/plugins/pushed.py
+++ b/libs/apprise/plugins/pushed.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,44 +25,42 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from itertools import chain
+from json import dumps
 import re
+
 import requests
-from json import dumps
-from itertools import chain
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
 
 # Used to detect and parse channels
-IS_CHANNEL = re.compile(r'^#?(?P<name>[A-Za-z0-9]+)$')
+IS_CHANNEL = re.compile(r"^#?(?P<name>[A-Za-z0-9]+)$")
 
 # Used to detect and parse a users push id
-IS_USER_PUSHED_ID = re.compile(r'^@(?P<name>[A-Za-z0-9]+)$')
+IS_USER_PUSHED_ID = re.compile(r"^@(?P<name>[A-Za-z0-9]+)$")
 
 
 class NotifyPushed(NotifyBase):
-    """
-    A wrapper to Pushed Notifications
-
-    """
+    """A wrapper to Pushed Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pushed'
+    service_name = "Pushed"
 
     # The services URL
-    service_url = 'https://pushed.co/'
+    service_url = "https://pushed.co/"
 
     # The default secure protocol
-    secure_protocol = 'pushed'
+    secure_protocol = "pushed"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushed'
+    setup_url = "https://appriseit.com/services/pushed/"
 
     # Pushed uses the http protocol with JSON requests
-    notify_url = 'https://api.pushed.co/1/push'
+    notify_url = "https://api.pushed.co/1/push"
 
     # A title can not be used for Pushed Messages.  Setting this to zero will
     # cause any title (if defined) to get placed into the message body.
@@ -74,77 +71,83 @@ class NotifyPushed(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{app_key}/{app_secret}',
-        '{schema}://{app_key}/{app_secret}@{targets}',
+        "{schema}://{app_key}/{app_secret}",
+        "{schema}://{app_key}/{app_secret}@{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'app_key': {
-            'name': _('Application Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'app_secret': {
-            'name': _('Application Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'prefix': '@',
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_channel': {
-            'name': _('Target Channel'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "app_key": {
+                "name": _("Application Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "app_secret": {
+                "name": _("Application Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "prefix": "@",
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
         },
-    })
+    )
 
     def __init__(self, app_key, app_secret, targets=None, **kwargs):
-        """
-        Initialize Pushed Object
-
-        """
+        """Initialize Pushed Object."""
         super().__init__(**kwargs)
 
         # Application Key (associated with project)
         self.app_key = validate_regex(app_key)
         if not self.app_key:
-            msg = 'An invalid Pushed Application Key ' \
-                  '({}) was specified.'.format(app_key)
+            msg = (
+                f"An invalid Pushed Application Key ({app_key}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Access Secret (associated with project)
         self.app_secret = validate_regex(app_secret)
         if not self.app_secret:
-            msg = 'An invalid Pushed Application Secret ' \
-                  '({}) was specified.'.format(app_secret)
+            msg = (
+                "An invalid Pushed Application Secret "
+                f"({app_secret}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Initialize channel list
-        self.channels = list()
+        self.channels = []
 
         # Initialize user list
-        self.users = list()
+        self.users = []
 
         # Get our targets
         targets = parse_list(targets)
@@ -154,43 +157,40 @@ def __init__(self, app_key, app_secret, targets=None, **kwargs):
                 result = IS_CHANNEL.match(target)
                 if result:
                     # store valid device
-                    self.channels.append(result.group('name'))
+                    self.channels.append(result.group("name"))
                     continue
 
                 result = IS_USER_PUSHED_ID.match(target)
                 if result:
                     # store valid room
-                    self.users.append(result.group('name'))
+                    self.users.append(result.group("name"))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid channel/userid '
-                    '(%s) specified.' % target,
+                    f"Dropped invalid channel/userid ({target}) specified.",
                 )
 
             if len(self.channels) + len(self.users) == 0:
                 # We have no valid channels or users to notify after
                 # explicitly identifying at least one.
-                msg = 'No Pushed targets to notify.'
+                msg = "No Pushed targets to notify."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Pushed Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Pushed Notification."""
 
         # Initiaize our error tracking
         has_error = False
 
         # prepare JSON Object
         payload = {
-            'app_key': self.app_key,
-            'app_secret': self.app_secret,
-            'target_type': 'app',
-            'content': body,
+            "app_key": self.app_key,
+            "app_secret": self.app_secret,
+            "target_type": "app",
+            "content": body,
         }
 
         # So the logic is as follows:
@@ -203,7 +203,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         if len(self.channels) + len(self.users) == 0:
             # Just notify the app
             return self._send(
-                payload=payload, notify_type=notify_type, **kwargs)
+                payload=payload, notify_type=notify_type, **kwargs
+            )
 
         # If our code reaches here, we want to target channels and users (by
         # their Pushed_ID instead...
@@ -213,30 +214,32 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         users = list(self.users)
 
         # Copy our payload
-        _payload = dict(payload)
-        _payload['target_type'] = 'channel'
+        payload_ = dict(payload)
+        payload_["target_type"] = "channel"
 
         while len(channels) > 0:
             # Get Channel
-            _payload['target_alias'] = channels.pop(0)
+            payload_["target_alias"] = channels.pop(0)
 
             if not self._send(
-                    payload=_payload, notify_type=notify_type, **kwargs):
+                payload=payload_, notify_type=notify_type, **kwargs
+            ):
 
                 # toggle flag
                 has_error = True
 
         # Copy our payload
-        _payload = dict(payload)
-        _payload['target_type'] = 'pushed_id'
+        payload_ = dict(payload)
+        payload_["target_type"] = "pushed_id"
 
         # Send all our defined User Pushed ID's
         while len(users):
             # Get User's Pushed ID
-            _payload['pushed_id'] = users.pop(0)
+            payload_["pushed_id"] = users.pop(0)
 
             if not self._send(
-                    payload=_payload, notify_type=notify_type, **kwargs):
+                payload=payload_, notify_type=notify_type, **kwargs
+            ):
 
                 # toggle flag
                 has_error = True
@@ -244,21 +247,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def _send(self, payload, notify_type, **kwargs):
-        """
-        A lower level call that directly pushes a payload to the Pushed
-        Notification servers.  This should never be called directly; it is
-        referenced automatically through the send() function.
+        """A lower level call that directly pushes a payload to the Pushed
+        Notification servers.
+
+        This should never be called directly; it is referenced automatically
+        through the send() function.
         """
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json'
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
-        self.logger.debug('Pushed POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Pushed Payload: %s' % str(payload))
+        self.logger.debug(
+            "Pushed POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Pushed Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -274,28 +279,30 @@ def _send(self, payload, notify_type, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyPushed.http_response_code_lookup(r.status_code)
+                status_str = NotifyPushed.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Pushed notification:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Pushed notification:{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Pushed notification.')
+                self.logger.info("Sent Pushed notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Pushed notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Pushed notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -304,58 +311,55 @@ def _send(self, payload, notify_type, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.app_key, self.app_secret)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{app_key}/{app_secret}/{targets}/?{params}'.format(
+        return "{schema}://{app_key}/{app_secret}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            app_key=self.pprint(self.app_key, privacy, safe=''),
+            app_key=self.pprint(self.app_key, privacy, safe=""),
             app_secret=self.pprint(
-                self.app_secret, privacy, mode=PrivacyMode.Secret, safe=''),
-            targets='/'.join(
-                [NotifyPushed.quote(x) for x in chain(
+                self.app_secret, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            targets="/".join([
+                NotifyPushed.quote(x)
+                for x in chain(
                     # Channels are prefixed with a pound/hashtag symbol
-                    ['#{}'.format(x) for x in self.channels],
+                    [f"#{x}" for x in self.channels],
                     # Users are prefixed with an @ symbol
-                    ['@{}'.format(x) for x in self.users],
-                )]),
-            params=NotifyPushed.urlencode(params))
+                    [f"@{x}" for x in self.users],
+                )
+            ]),
+            params=NotifyPushed.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.channels) + len(self.users)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The first token is stored in the hostname
-        app_key = NotifyPushed.unquote(results['host'])
+        app_key = NotifyPushed.unquote(results["host"])
 
-        entries = NotifyPushed.split_path(results['fullpath'])
+        entries = NotifyPushed.split_path(results["fullpath"])
         # Now fetch the remaining tokens
         try:
             app_secret = entries.pop(0)
@@ -367,14 +371,13 @@ def parse_url(url):
             app_key = None
 
         # Get our recipients (based on remaining entries)
-        results['targets'] = entries
+        results["targets"] = entries
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPushed.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPushed.parse_list(results["qsd"]["to"])
 
-        results['app_key'] = app_key
-        results['app_secret'] = app_secret
+        results["app_key"] = app_key
+        results["app_secret"] = app_secret
 
         return results
diff --git a/libs/apprise/plugins/pushjet.py b/libs/apprise/plugins/pushjet.py
index 54d381eeef..ccbc9265d7 100644
--- a/libs/apprise/plugins/pushjet.py
+++ b/libs/apprise/plugins/pushjet.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,32 +25,31 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NotifyPushjet(NotifyBase):
-    """
-    A wrapper for Pushjet Notifications
-    """
+    """A wrapper for Pushjet Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pushjet'
+    service_name = "Pushjet"
 
     # The default protocol
-    protocol = 'pjet'
+    protocol = "pjet"
 
     # The default secure protocol
-    secure_protocol = 'pjets'
+    secure_protocol = "pjets"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushjet'
+    setup_url = "https://appriseit.com/services/pushjet/"
 
     # Disable throttle rate for Pushjet requests since they are normally
     # local anyway (the remote/online service is no more)
@@ -59,59 +57,64 @@ class NotifyPushjet(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}:{port}/{secret_key}',
-        '{schema}://{host}/{secret_key}',
-        '{schema}://{user}:{password}@{host}:{port}/{secret_key}',
-        '{schema}://{user}:{password}@{host}/{secret_key}',
+        "{schema}://{host}:{port}/{secret_key}",
+        "{schema}://{host}/{secret_key}",
+        "{schema}://{user}:{password}@{host}:{port}/{secret_key}",
+        "{schema}://{user}:{password}@{host}/{secret_key}",
     )
 
     # Define our tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'secret_key': {
-            'name': _('Secret Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "secret_key": {
+                "name": _("Secret Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-    })
+    )
 
-    template_args = dict(NotifyBase.template_args, **{
-        'secret': {
-            'alias_of': 'secret_key',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "secret": {
+                "alias_of": "secret_key",
+            },
         },
-    })
+    )
 
     def __init__(self, secret_key, **kwargs):
-        """
-        Initialize Pushjet Object
-        """
+        """Initialize Pushjet Object."""
         super().__init__(**kwargs)
 
         # Secret Key (associated with project)
         self.secret_key = validate_regex(secret_key)
         if not self.secret_key:
-            msg = 'An invalid Pushjet Secret Key ' \
-                  '({}) was specified.'.format(secret_key)
+            msg = (
+                f"An invalid Pushjet Secret Key ({secret_key}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -119,20 +122,22 @@ def __init__(self, secret_key, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port, self.secret_key,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
+            self.secret_key,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
@@ -140,61 +145,66 @@ def url(self, privacy=False, *args, **kwargs):
         default_port = 443 if self.secure else 80
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyPushjet.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyPushjet.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
 
-        return '{schema}://{auth}{hostname}{port}/{secret}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{secret}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
             secret=self.pprint(
-                self.secret_key, privacy, mode=PrivacyMode.Secret, safe=''),
+                self.secret_key, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
             params=NotifyPushjet.urlencode(params),
         )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Pushjet Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Pushjet Notification."""
 
         params = {
-            'secret': self.secret_key,
+            "secret": self.secret_key,
         }
 
         # prepare Pushjet Object
         payload = {
-            'message': body,
-            'title': title,
-            'link': None,
-            'level': None,
+            "message": body,
+            "title": title,
+            "link": None,
+            "level": None,
         }
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
         }
 
         auth = None
         if self.user:
             auth = (self.user, self.password)
 
-        notify_url = '{schema}://{host}{port}/message/'.format(
+        notify_url = "{schema}://{host}{port}/message/".format(
             schema="https" if self.secure else "http",
             host=self.host,
-            port=':{}'.format(self.port) if self.port else '')
+            port=f":{self.port}" if self.port else "",
+        )
 
-        self.logger.debug('Pushjet POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Pushjet Payload: %s' % str(payload))
+        self.logger.debug(
+            "Pushjet POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Pushjet Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -211,29 +221,32 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyPushjet.http_response_code_lookup(r.status_code)
+                status_str = NotifyPushjet.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Pushjet notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Pushjet notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Pushjet notification.')
+                self.logger.info("Sent Pushjet notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Pushjet '
-                'notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Pushjet "
+                f"notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -242,9 +255,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object.
 
         Syntax:
            pjet://hostname/secret_key
@@ -263,18 +275,20 @@ def parse_url(url):
 
         try:
             # Retrieve our secret_key from the first entry in the url path
-            results['secret_key'] = \
-                NotifyPushjet.split_path(results['fullpath'])[0]
+            results["secret_key"] = NotifyPushjet.split_path(
+                results["fullpath"]
+            )[0]
 
         except IndexError:
             # no secret key specified
-            results['secret_key'] = None
+            results["secret_key"] = None
 
         # Allow over-riding the secret by specifying it as an argument
         # this allows people who have http-auth infront to login
         # through it in addition to supporting the secret key
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
-            results['secret_key'] = \
-                NotifyPushjet.unquote(results['qsd']['secret'])
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            results["secret_key"] = NotifyPushjet.unquote(
+                results["qsd"]["secret"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/pushme.py b/libs/apprise/plugins/pushme.py
index 6799a28734..e4385588e7 100644
--- a/libs/apprise/plugins/pushme.py
+++ b/libs/apprise/plugins/pushme.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,74 +27,72 @@
 
 import requests
 
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import validate_regex, parse_bool
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from .base import NotifyBase
 
 
 class NotifyPushMe(NotifyBase):
-    """
-    A wrapper for PushMe Notifications
-    """
+    """A wrapper for PushMe Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'PushMe'
+    service_name = "PushMe"
 
     # The services URL
-    service_url = 'https://push.i-i.me/'
+    service_url = "https://push.i-i.me/"
 
     # Insecure protocol (for those self hosted requests)
-    protocol = 'pushme'
+    protocol = "pushme"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushme'
+    setup_url = "https://appriseit.com/services/pushme/"
 
     # PushMe URL
-    notify_url = 'https://push.i-i.me/'
+    notify_url = "https://push.i-i.me/"
 
     # Define object templates
-    templates = (
-        '{schema}://{token}',
-    )
+    templates = ("{schema}://{token}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'token': {
-            'alias_of': 'token',
-        },
-        'push_key': {
-            'alias_of': 'token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "token": {
+                "alias_of": "token",
+            },
+            "push_key": {
+                "alias_of": "token",
+            },
+            "status": {
+                "name": _("Show Status"),
+                "type": "bool",
+                "default": True,
+            },
         },
-        'status': {
-            'name': _('Show Status'),
-            'type': 'bool',
-            'default': True,
-        },
-    })
+    )
 
     def __init__(self, token, status=None, **kwargs):
-        """
-        Initialize PushMe Object
-        """
+        """Initialize PushMe Object."""
         super().__init__(**kwargs)
 
         # Token (associated with project)
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid PushMe Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid PushMe Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -104,29 +101,34 @@ def __init__(self, token, status=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform PushMe Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform PushMe Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Prepare our payload
         params = {
-            'push_key': self.token,
-            'title': title if not self.status
-            else '{} {}'.format(self.asset.ascii(notify_type), title),
-            'content': body,
-            'type': 'markdown'
-            if self.notify_format == NotifyFormat.MARKDOWN else 'text'
+            "push_key": self.token,
+            "title": (
+                title
+                if not self.status
+                else f"{self.asset.ascii(notify_type)} {title}"
+            ),
+            "content": body,
+            "type": (
+                "markdown"
+                if self.notify_format == NotifyFormat.MARKDOWN
+                else "text"
+            ),
         }
 
-        self.logger.debug('PushMe POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('PushMe Payload: %s' % str(params))
+        self.logger.debug(
+            "PushMe POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"PushMe Payload: {params!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -141,29 +143,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyPushMe.http_response_code_lookup(r.status_code)
+                status_str = NotifyPushMe.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send PushMe notification:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send PushMe notification:{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent PushMe notification.')
+                self.logger.info("Sent PushMe notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending PushMe notification.',
+                "A Connection error occurred sending PushMe notification.",
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -172,58 +175,52 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'status': 'yes' if self.status else 'no',
+            "status": "yes" if self.status else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Official URLs are easy to assemble
-        return '{schema}://{token}/?{params}'.format(
+        return "{schema}://{token}/?{params}".format(
             schema=self.protocol,
-            token=self.pprint(self.token, privacy, safe=''),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyPushMe.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Store our token using the host
-        results['token'] = NotifyPushMe.unquote(results['host'])
+        results["token"] = NotifyPushMe.unquote(results["host"])
 
         # The 'token' makes it easier to use yaml configuration
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifyPushMe.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyPushMe.unquote(results["qsd"]["token"])
 
-        elif 'push_key' in results['qsd'] and len(results['qsd']['push_key']):
+        elif "push_key" in results["qsd"] and len(results["qsd"]["push_key"]):
             # Support 'push_key' if specified
-            results['token'] = NotifyPushMe.unquote(results['qsd']['push_key'])
+            results["token"] = NotifyPushMe.unquote(results["qsd"]["push_key"])
 
         # Get status switch
-        results['status'] = \
-            parse_bool(results['qsd'].get('status', True))
+        results["status"] = parse_bool(results["qsd"].get("status", True))
 
         return results
diff --git a/libs/apprise/plugins/pushover.py b/libs/apprise/plugins/pushover.py
index b51c506a5f..7f969f2336 100644
--- a/libs/apprise/plugins/pushover.py
+++ b/libs/apprise/plugins/pushover.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,23 +25,24 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
+from itertools import chain
 import re
+
 import requests
-from itertools import chain
 
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyFormat
+from ..attachment.base import AttachBase
+from ..common import NotifyFormat, NotifyType
 from ..conversion import convert_between
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
-from ..attachment.base import AttachBase
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
 
 # Flag used as a placeholder to sending to all devices
-PUSHOVER_SEND_TO_ALL = 'ALL_DEVICES'
+PUSHOVER_SEND_TO_ALL = "ALL_DEVICES"
 
 # Used to detect a Device
-VALIDATE_DEVICE = re.compile(r'^\s*(?P<device>[a-z0-9_-]{1,25})\s*$', re.I)
+VALIDATE_DEVICE = re.compile(r"^\s*(?P<device>[a-z0-9_-]{1,25})\s*$", re.I)
 
 
 # Priorities
@@ -56,28 +56,28 @@ class PushoverPriority:
 
 # Sounds
 class PushoverSound:
-    PUSHOVER = 'pushover'
-    BIKE = 'bike'
-    BUGLE = 'bugle'
-    CASHREGISTER = 'cashregister'
-    CLASSICAL = 'classical'
-    COSMIC = 'cosmic'
-    FALLING = 'falling'
-    GAMELAN = 'gamelan'
-    INCOMING = 'incoming'
-    INTERMISSION = 'intermission'
-    MAGIC = 'magic'
-    MECHANICAL = 'mechanical'
-    PIANOBAR = 'pianobar'
-    SIREN = 'siren'
-    SPACEALARM = 'spacealarm'
-    TUGBOAT = 'tugboat'
-    ALIEN = 'alien'
-    CLIMB = 'climb'
-    PERSISTENT = 'persistent'
-    ECHO = 'echo'
-    UPDOWN = 'updown'
-    NONE = 'none'
+    PUSHOVER = "pushover"
+    BIKE = "bike"
+    BUGLE = "bugle"
+    CASHREGISTER = "cashregister"
+    CLASSICAL = "classical"
+    COSMIC = "cosmic"
+    FALLING = "falling"
+    GAMELAN = "gamelan"
+    INCOMING = "incoming"
+    INTERMISSION = "intermission"
+    MAGIC = "magic"
+    MECHANICAL = "mechanical"
+    PIANOBAR = "pianobar"
+    SIREN = "siren"
+    SPACEALARM = "spacealarm"
+    TUGBOAT = "tugboat"
+    ALIEN = "alien"
+    CLIMB = "climb"
+    PERSISTENT = "persistent"
+    ECHO = "echo"
+    UPDOWN = "updown"
+    NONE = "none"
 
 
 PUSHOVER_SOUNDS = (
@@ -107,58 +107,55 @@ class PushoverSound:
 
 PUSHOVER_PRIORITIES = {
     # Note: This also acts as a reverse lookup mapping
-    PushoverPriority.LOW: 'low',
-    PushoverPriority.MODERATE: 'moderate',
-    PushoverPriority.NORMAL: 'normal',
-    PushoverPriority.HIGH: 'high',
-    PushoverPriority.EMERGENCY: 'emergency',
+    PushoverPriority.LOW: "low",
+    PushoverPriority.MODERATE: "moderate",
+    PushoverPriority.NORMAL: "normal",
+    PushoverPriority.HIGH: "high",
+    PushoverPriority.EMERGENCY: "emergency",
 }
 
 PUSHOVER_PRIORITY_MAP = {
     # Maps against string 'low'
-    'l': PushoverPriority.LOW,
+    "l": PushoverPriority.LOW,
     # Maps against string 'moderate'
-    'm': PushoverPriority.MODERATE,
+    "m": PushoverPriority.MODERATE,
     # Maps against string 'normal'
-    'n': PushoverPriority.NORMAL,
+    "n": PushoverPriority.NORMAL,
     # Maps against string 'high'
-    'h': PushoverPriority.HIGH,
+    "h": PushoverPriority.HIGH,
     # Maps against string 'emergency'
-    'e': PushoverPriority.EMERGENCY,
-
+    "e": PushoverPriority.EMERGENCY,
     # Entries to additionally support (so more like Pushover's API)
-    '-2': PushoverPriority.LOW,
-    '-1': PushoverPriority.MODERATE,
-    '0': PushoverPriority.NORMAL,
-    '1': PushoverPriority.HIGH,
-    '2': PushoverPriority.EMERGENCY,
+    "-2": PushoverPriority.LOW,
+    "-1": PushoverPriority.MODERATE,
+    "0": PushoverPriority.NORMAL,
+    "1": PushoverPriority.HIGH,
+    "2": PushoverPriority.EMERGENCY,
 }
 
 # Extend HTTP Error Messages
 PUSHOVER_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 
 class NotifyPushover(NotifyBase):
-    """
-    A wrapper for Pushover Notifications
-    """
+    """A wrapper for Pushover Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pushover'
+    service_name = "Pushover"
 
     # The services URL
-    service_url = 'https://pushover.net/'
+    service_url = "https://pushover.net/"
 
     # All pushover requests are secure
-    secure_protocol = 'pover'
+    secure_protocol = "pover"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushover'
+    setup_url = "https://appriseit.com/services/pushover/"
 
     # Pushover uses the http protocol with JSON requests
-    notify_url = 'https://api.pushover.net/1/messages.json'
+    notify_url = "https://api.pushover.net/1/messages.json"
 
     # Support attachments
     attachment_support = True
@@ -169,109 +166,121 @@ class NotifyPushover(NotifyBase):
     # Default Pushover sound
     default_pushover_sound = PushoverSound.PUSHOVER
 
-    # 2.5MB is the maximum supported image filesize as per documentation
-    # here: https://pushover.net/api#attachments (Dec 26th, 2019)
-    attach_max_size_bytes = 2621440
+    # 5MB is the maximum supported image filesize as per documentation
+    # here: https://pushover.net/api#limits (Oct 5th, 2025)
+    attach_max_size_bytes = 5242880
 
     # The regular expression of the current attachment supported mime types
     # At this time it is only images
-    attach_supported_mime_type = r'^image/.*'
+    attach_supported_mime_type = r"^image/.*"
 
     # Define object templates
     templates = (
-        '{schema}://{user_key}@{token}',
-        '{schema}://{user_key}@{token}/{targets}',
+        "{schema}://{user_key}@{token}",
+        "{schema}://{user_key}@{token}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user_key': {
-            'name': _('User Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'token': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'regex': (r'^[a-z0-9_-]{1,25}$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user_key": {
+                "name": _("User Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_device": {
+                "name": _("Target Device"),
+                "type": "string",
+                "regex": (r"^[a-z0-9_-]{1,25}$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': PUSHOVER_PRIORITIES,
-            'default': PushoverPriority.NORMAL,
-        },
-        'sound': {
-            'name': _('Sound'),
-            'type': 'string',
-            'regex': (r'^[a-z]{1,12}$', 'i'),
-            'default': PushoverSound.PUSHOVER,
-        },
-        'url': {
-            'name': _('URL'),
-            'map_to': 'supplemental_url',
-            'type': 'string',
-        },
-        'url_title': {
-            'name': _('URL Title'),
-            'map_to': 'supplemental_url_title',
-            'type': 'string'
-        },
-        'retry': {
-            'name': _('Retry'),
-            'type': 'int',
-            'min': 30,
-            'default': 900,  # 15 minutes
-        },
-        'expire': {
-            'name': _('Expire'),
-            'type': 'int',
-            'min': 0,
-            'max': 10800,
-            'default': 3600,  # 1 hour
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": PUSHOVER_PRIORITIES,
+                "default": PushoverPriority.NORMAL,
+            },
+            "sound": {
+                "name": _("Sound"),
+                "type": "string",
+                "regex": (r"^[a-z]{1,12}$", "i"),
+                "default": PushoverSound.PUSHOVER,
+            },
+            "url": {
+                "name": _("URL"),
+                "map_to": "supplemental_url",
+                "type": "string",
+            },
+            "url_title": {
+                "name": _("URL Title"),
+                "map_to": "supplemental_url_title",
+                "type": "string",
+            },
+            "retry": {
+                "name": _("Retry"),
+                "type": "int",
+                "min": 30,
+                "default": 900,  # 15 minutes
+            },
+            "expire": {
+                "name": _("Expire"),
+                "type": "int",
+                "min": 0,
+                "max": 10800,
+                "default": 3600,  # 1 hour
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, user_key, token, targets=None, priority=None,
-                 sound=None, retry=None, expire=None, supplemental_url=None,
-                 supplemental_url_title=None, **kwargs):
-        """
-        Initialize Pushover Object
-        """
+    def __init__(
+        self,
+        user_key,
+        token,
+        targets=None,
+        priority=None,
+        sound=None,
+        retry=None,
+        expire=None,
+        supplemental_url=None,
+        supplemental_url_title=None,
+        **kwargs,
+    ):
+        """Initialize Pushover Object."""
         super().__init__(**kwargs)
 
         # Access Token (associated with project)
         self.token = validate_regex(token)
         if not self.token:
-            msg = 'An invalid Pushover Access Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Pushover Access Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # User Key (associated with project)
         self.user_key = validate_regex(user_key)
         if not self.user_key:
-            msg = 'An invalid Pushover User Key ' \
-                  '({}) was specified.'.format(user_key)
+            msg = f"An invalid Pushover User Key ({user_key}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -279,10 +288,10 @@ def __init__(self, user_key, token, targets=None, priority=None,
         targets = parse_list(targets)
 
         # Track any invalid entries
-        self.invalid_targets = list()
+        self.invalid_targets = []
 
         if len(targets) == 0:
-            self.targets = (PUSHOVER_SEND_TO_ALL, )
+            self.targets = (PUSHOVER_SEND_TO_ALL,)
 
         else:
             self.targets = []
@@ -290,12 +299,11 @@ def __init__(self, user_key, token, targets=None, priority=None,
                 result = VALIDATE_DEVICE.match(target)
                 if result:
                     # Store device information
-                    self.targets.append(result.group('device'))
+                    self.targets.append(result.group("device"))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid Pushover device '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid Pushover device ({target}) specified.",
                 )
                 self.invalid_targets.append(target)
 
@@ -304,113 +312,123 @@ def __init__(self, user_key, token, targets=None, priority=None,
         self.supplemental_url_title = supplemental_url_title
 
         # Setup our sound
-        self.sound = NotifyPushover.default_pushover_sound \
-            if not isinstance(sound, str) else sound.lower()
+        self.sound = (
+            NotifyPushover.default_pushover_sound
+            if not isinstance(sound, str)
+            else sound.lower()
+        )
         if self.sound and self.sound not in PUSHOVER_SOUNDS:
-            msg = 'Using custom sound specified ({}). '.format(sound)
+            msg = f"Using custom sound specified ({sound}). "
             self.logger.debug(msg)
 
         # The Priority of the message
         self.priority = int(
-            NotifyPushover.template_args['priority']['default']
-            if priority is None else
-            next((
-                v for k, v in PUSHOVER_PRIORITY_MAP.items()
-                if str(priority).lower().startswith(k)),
-                NotifyPushover.template_args['priority']['default']))
+            NotifyPushover.template_args["priority"]["default"]
+            if priority is None
+            else next(
+                (
+                    v
+                    for k, v in PUSHOVER_PRIORITY_MAP.items()
+                    if str(priority).lower().startswith(k)
+                ),
+                NotifyPushover.template_args["priority"]["default"],
+            )
+        )
 
         # The following are for emergency alerts
         if self.priority == PushoverPriority.EMERGENCY:
 
             # How often to resend notification, in seconds
-            self.retry = self.template_args['retry']['default']
-            try:
+            self.retry = self.template_args["retry"]["default"]
+            with contextlib.suppress(ValueError, TypeError):
+                # Get our retry value
                 self.retry = int(retry)
-            except (ValueError, TypeError):
-                # Do nothing
-                pass
 
             # How often to resend notification, in seconds
-            self.expire = self.template_args['expire']['default']
-            try:
+            self.expire = self.template_args["expire"]["default"]
+            with contextlib.suppress(ValueError, TypeError):
+                # Acquire our expiry value
                 self.expire = int(expire)
-            except (ValueError, TypeError):
-                # Do nothing
-                pass
 
             if self.retry < 30:
-                msg = 'Pushover retry must be at least 30 seconds.'
+                msg = "Pushover retry must be at least 30 seconds."
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             if self.expire < 0 or self.expire > 10800:
-                msg = 'Pushover expire must reside in the range of ' \
-                      '0 to 10800 seconds.'
+                msg = (
+                    "Pushover expire must reside in the range of "
+                    "0 to 10800 seconds."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Pushover Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Pushover Notification."""
 
         if not self.targets:
             # There were no services to notify
-            self.logger.warning(
-                'There were no Pushover targets to notify.')
+            self.logger.warning("There were no Pushover targets to notify.")
             return False
 
         # prepare JSON Object
         payload = {
-            'token': self.token,
-            'user': self.user_key,
-            'priority': str(self.priority),
-            'title': title if title else self.app_desc,
-            'message': body,
-            'device': ','.join(self.targets),
-            'sound': self.sound,
+            "token": self.token,
+            "user": self.user_key,
+            "priority": str(self.priority),
+            "title": title if title else self.app_desc,
+            "message": body,
+            "device": ",".join(self.targets),
+            "sound": self.sound,
         }
 
         if self.supplemental_url:
-            payload['url'] = self.supplemental_url
+            payload["url"] = self.supplemental_url
 
         if self.supplemental_url_title:
-            payload['url_title'] = self.supplemental_url_title
+            payload["url_title"] = self.supplemental_url_title
 
         if self.notify_format == NotifyFormat.HTML:
             # https://pushover.net/api#html
-            payload['html'] = 1
+            payload["html"] = 1
 
         elif self.notify_format == NotifyFormat.MARKDOWN:
-            payload['message'] = convert_between(
-                NotifyFormat.MARKDOWN, NotifyFormat.HTML, body)
-            payload['html'] = 1
+            payload["message"] = convert_between(
+                NotifyFormat.MARKDOWN, NotifyFormat.HTML, body
+            )
+            payload["html"] = 1
 
         if self.priority == PushoverPriority.EMERGENCY:
-            payload.update({'retry': self.retry, 'expire': self.expire})
+            payload.update({"retry": self.retry, "expire": self.expire})
 
         if attach and self.attachment_support:
             # Create a copy of our payload
-            _payload = payload.copy()
+            payload_ = payload.copy()
 
             # Send with attachments
             for no, attachment in enumerate(attach):
                 if no or not body:
                     # To handle multiple attachments, clean up our message
-                    _payload['message'] = attachment.name
+                    payload_["message"] = attachment.name
 
-                if not self._send(_payload, attachment):
+                if not self._send(payload_, attachment):
                     # Mark our failure
                     return False
 
                 # Clear our title if previously set
-                _payload['title'] = ''
+                payload_["title"] = ""
 
                 # No need to alarm for each consecutive attachment uploaded
                 # afterwards
-                _payload['sound'] = PushoverSound.NONE
+                payload_["sound"] = PushoverSound.NONE
 
         else:
             # Simple send
@@ -419,32 +437,28 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         return True
 
     def _send(self, payload, attach=None):
-        """
-        Wrapper to the requests (post) object
-        """
+        """Wrapper to the requests (post) object."""
 
         if isinstance(attach, AttachBase):
             # Perform some simple error checking
             if not attach:
                 # We could not access the attachment
                 self.logger.error(
-                    'Could not access attachment {}.'.format(
-                        attach.url(privacy=True)))
+                    f"Could not access attachment {attach.url(privacy=True)}."
+                )
                 return False
 
             # Perform some basic checks as we want to gracefully skip
             # over unsupported mime types.
             if not re.match(
-                    self.attach_supported_mime_type,
-                    attach.mimetype,
-                    re.I):
+                self.attach_supported_mime_type, attach.mimetype, re.I
+            ):
                 # No problem; we just don't support this attachment
                 # type; gracefully move along
                 self.logger.debug(
-                    'Ignored unsupported Pushover attachment ({}): {}'
-                    .format(
-                        attach.mimetype,
-                        attach.url(privacy=True)))
+                    "Ignored unsupported Pushover attachment"
+                    f" ({attach.mimetype}): {attach.url(privacy=True)}"
+                )
 
                 attach = None
 
@@ -452,36 +466,39 @@ def _send(self, payload, attach=None):
                 # If we get here, we're dealing with a supported image.
                 # Verify that the filesize is okay though.
                 file_size = len(attach)
-                if not (file_size > 0
-                        and file_size <= self.attach_max_size_bytes):
+                if not (
+                    file_size > 0 and file_size <= self.attach_max_size_bytes
+                ):
 
                     # File size is no good
                     self.logger.warning(
-                        'Pushover attachment size ({}B) exceeds limit: {}'
-                        .format(file_size, attach.url(privacy=True)))
+                        f"Pushover attachment size ({file_size}B) exceeds"
+                        f" limit: {attach.url(privacy=True)}"
+                    )
 
                     return False
 
                 self.logger.debug(
-                    'Posting Pushover attachment {}'.format(
-                        attach.url(privacy=True)))
+                    f"Posting Pushover attachment {attach.url(privacy=True)}"
+                )
 
         # Default Header
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Authentication
-        auth = (self.token, '')
+        auth = (self.token, "")
 
         # Some default values for our request object to which we'll update
         # depending on what our payload is
         files = None
 
-        self.logger.debug('Pushover POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Pushover Payload: %s' % str(payload))
+        self.logger.debug(
+            "Pushover POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Pushover Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -489,7 +506,13 @@ def _send(self, payload, attach=None):
         try:
             # Open our attachment path if required:
             if attach:
-                files = {'attachment': (attach.name, open(attach.path, 'rb'))}
+                files = {
+                    "attachment": (
+                        attach.name,
+                        # file handle is safely closed in `finally`; inline
+                        # open is intentional
+                        open(attach.path, "rb"),  # noqa: SIM115
+                    )}
 
             r = requests.post(
                 self.notify_url,
@@ -503,146 +526,154 @@ def _send(self, payload, attach=None):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyPushover.http_response_code_lookup(
-                        r.status_code, PUSHOVER_HTTP_ERROR_MAP)
+                status_str = NotifyPushover.http_response_code_lookup(
+                    r.status_code, PUSHOVER_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Pushover notification to {}: '
-                    '{}{}error={}.'.format(
-                        payload['device'],
+                    "Failed to send Pushover notification to {}: "
+                    "{}{}error={}.".format(
+                        payload["device"],
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False
 
             else:
                 self.logger.info(
-                    'Sent Pushover notification to %s.' % payload['device'])
+                    "Sent Pushover notification to {}.".format(
+                        payload["device"]
+                    )
+                )
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Pushover:%s ' % (
-                    payload['device']) + 'notification.'
+                "A Connection error occurred sending Pushover:{} ".format(
+                    payload["device"]
+                )
+                + "notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while reading {}.'.format(
-                    attach.name if attach else 'attachment'))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while reading {}.".format(
+                    attach.name if attach else "attachment"
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return False
 
         finally:
             # Close our file (if it's open) stored in the second element
             # of our files tuple (index 1)
             if files:
-                files['attachment'][1].close()
+                files["attachment"][1].close()
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user_key, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'priority':
-                PUSHOVER_PRIORITIES[self.template_args['priority']['default']]
+            "priority": (
+                PUSHOVER_PRIORITIES[self.template_args["priority"]["default"]]
                 if self.priority not in PUSHOVER_PRIORITIES
-                else PUSHOVER_PRIORITIES[self.priority],
+                else PUSHOVER_PRIORITIES[self.priority]
+            ),
         }
 
         # Only add expire and retry for emergency messages,
         # pushover ignores for all other priorities
         if self.priority == PushoverPriority.EMERGENCY:
-            params.update({'expire': self.expire, 'retry': self.retry})
+            params.update({"expire": self.expire, "retry": self.retry})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Escape our devices
-        devices = '/'.join(
-            [NotifyPushover.quote(x, safe='')
-             for x in chain(self.targets, self.invalid_targets)])
+        devices = "/".join([
+            NotifyPushover.quote(x, safe="")
+            for x in chain(self.targets, self.invalid_targets)
+        ])
 
         if devices == PUSHOVER_SEND_TO_ALL:
             # keyword is reserved for internal usage only; it's safe to remove
             # it from the devices list
-            devices = ''
+            devices = ""
 
-        return '{schema}://{user_key}@{token}/{devices}/?{params}'.format(
+        return "{schema}://{user_key}@{token}/{devices}/?{params}".format(
             schema=self.secure_protocol,
-            user_key=self.pprint(self.user_key, privacy, safe=''),
-            token=self.pprint(self.token, privacy, safe=''),
+            user_key=self.pprint(self.user_key, privacy, safe=""),
+            token=self.pprint(self.token, privacy, safe=""),
             devices=devices,
-            params=NotifyPushover.urlencode(params))
+            params=NotifyPushover.urlencode(params),
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Set our priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyPushover.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyPushover.unquote(
+                results["qsd"]["priority"]
+            )
 
         # Retrieve all of our targets
-        results['targets'] = NotifyPushover.split_path(results['fullpath'])
+        results["targets"] = NotifyPushover.split_path(results["fullpath"])
 
         # User Key is retrieved from the user
-        results['user_key'] = NotifyPushover.unquote(results['user'])
+        results["user_key"] = NotifyPushover.unquote(results["user"])
 
         # Get the sound
-        if 'sound' in results['qsd'] and len(results['qsd']['sound']):
-            results['sound'] = \
-                NotifyPushover.unquote(results['qsd']['sound'])
+        if "sound" in results["qsd"] and len(results["qsd"]["sound"]):
+            results["sound"] = NotifyPushover.unquote(results["qsd"]["sound"])
 
         # Get the supplementary url
-        if 'url' in results['qsd'] and len(results['qsd']['url']):
-            results['supplemental_url'] = NotifyPushover.unquote(
-                results['qsd']['url']
+        if "url" in results["qsd"] and len(results["qsd"]["url"]):
+            results["supplemental_url"] = NotifyPushover.unquote(
+                results["qsd"]["url"]
             )
-        if 'url_title' in results['qsd'] and len(results['qsd']['url_title']):
-            results['supplemental_url_title'] = results['qsd']['url_title']
+        if "url_title" in results["qsd"] and len(results["qsd"]["url_title"]):
+            results["supplemental_url_title"] = results["qsd"]["url_title"]
 
         # Get expire and retry
-        if 'expire' in results['qsd'] and len(results['qsd']['expire']):
-            results['expire'] = results['qsd']['expire']
-        if 'retry' in results['qsd'] and len(results['qsd']['retry']):
-            results['retry'] = results['qsd']['retry']
+        if "expire" in results["qsd"] and len(results["qsd"]["expire"]):
+            results["expire"] = results["qsd"]["expire"]
+        if "retry" in results["qsd"] and len(results["qsd"]["retry"]):
+            results["retry"] = results["qsd"]["retry"]
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPushover.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPushover.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Token
-        results['token'] = NotifyPushover.unquote(results['host'])
+        results["token"] = NotifyPushover.unquote(results["host"])
 
         return results
diff --git a/libs/apprise/plugins/pushplus.py b/libs/apprise/plugins/pushplus.py
new file mode 100644
index 0000000000..faf2f8c373
--- /dev/null
+++ b/libs/apprise/plugins/pushplus.py
@@ -0,0 +1,171 @@
+#
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Details at:
+# https://www.pushplus.plus/doc/guide/api.html
+
+import json
+import re
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
+
+
+class NotifyPushplus(NotifyBase):
+    """A wrapper for Pushplus Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("Pushplus")
+
+    # The services URL
+    service_url = "https://www.pushplus.plus/"
+
+    # The default secure protocol
+    secure_protocol = "pushplus"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/pushplus/"
+
+    # URL used to send notifications with
+    notify_url = "https://www.pushplus.plus/send"
+
+    templates = ("{schema}://{token}",)
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("User Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9_-]{32,64}$", "i"),
+            },
+        },
+    )
+
+    def __init__(self, token, **kwargs):
+        """Initialize Pushplus Object."""
+        super().__init__(**kwargs)
+
+        self.token = validate_regex(
+            token, *self.template_tokens["token"]["regex"]
+        )
+        if not self.token:
+            msg = f"The Pushplus token ({token}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+        return (
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
+        )
+
+    @property
+    def url_identifier(self):
+        """Returns a unique identifier for this plugin instance."""
+        return (self.secure_protocol, self.token)
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send a Pushplus Notification."""
+        payload = {
+            "token": self.token,
+            "title": title if title else body,
+            "content": body,
+        }
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+        }
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+
+        try:
+            response = requests.post(
+                self.notify_url,
+                headers=headers,
+                data=json.dumps(payload),
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            if response.status_code != requests.codes.ok:
+                self.logger.warning(
+                    "Pushplus notification failed: %d - %s",
+                    response.status_code,
+                    response.text,
+                )
+                return False
+
+        except requests.RequestException as e:
+            self.logger.warning(f"Pushplus Exception: {e}")
+            return False
+
+        self.logger.info("Pushplus notification sent successfully.")
+        return True
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns arguments to re-instantiate the
+        object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            return results
+
+        if "token" in results["qsd"] and results["qsd"]["token"]:
+            results["token"] = NotifyPushplus.unquote(results["qsd"]["token"])
+        else:
+            results["token"] = NotifyPushplus.unquote(results["host"])
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """Parse native Pushplus-style URL."""
+        match = re.match(
+            r"^https://www\.pushplus\.plus/send\?token=([a-z0-9_-]+)$",
+            url,
+            re.I,
+        )
+        if not match:
+            return None
+
+        return NotifyPushplus.parse_url(
+            f"{NotifyPushplus.secure_protocol}://{match.group(1)}"
+        )
diff --git a/libs/apprise/plugins/pushsafer.py b/libs/apprise/plugins/pushsafer.py
index 12717b6629..19cb39db06 100644
--- a/libs/apprise/plugins/pushsafer.py
+++ b/libs/apprise/plugins/pushsafer.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,20 +25,22 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import requests
 from json import loads
+import logging
+
+import requests
 
-from .base import NotifyBase
 from .. import exception
 from ..common import NotifyType
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 
 class PushSaferSound:
-    """
-    Defines all of the supported PushSafe sounds
-    """
+    """Defines all of the supported PushSafe sounds."""
+
     # Silent
     SILENT = 0
     # Ahem (IM)
@@ -166,84 +167,84 @@ class PushSaferSound:
 
 PUSHSAFER_SOUND_MAP = {
     # Device Default,
-    'silent': PushSaferSound.SILENT,
-    'ahem': PushSaferSound.AHEM,
-    'applause': PushSaferSound.APPLAUSE,
-    'arrow': PushSaferSound.ARROW,
-    'baby': PushSaferSound.BABY,
-    'bell': PushSaferSound.BELL,
-    'bicycle': PushSaferSound.BICYCLE,
-    'bike': PushSaferSound.BICYCLE,
-    'boing': PushSaferSound.BOING,
-    'buzzer': PushSaferSound.BUZZER,
-    'camera': PushSaferSound.CAMERA,
-    'carhorn': PushSaferSound.CAR_HORN,
-    'horn': PushSaferSound.CAR_HORN,
-    'cashregister': PushSaferSound.CASH_REGISTER,
-    'chime': PushSaferSound.CHIME,
-    'creakydoor': PushSaferSound.CREAKY_DOOR,
-    'cuckooclock': PushSaferSound.CUCKOO_CLOCK,
-    'cuckoo': PushSaferSound.CUCKOO_CLOCK,
-    'disconnect': PushSaferSound.DISCONNECT,
-    'dog': PushSaferSound.DOG,
-    'doorbell': PushSaferSound.DOORBELL,
-    'fanfare': PushSaferSound.FANFARE,
-    'gunshot': PushSaferSound.GUN_SHOT,
-    'honk': PushSaferSound.HONK,
-    'jawharp': PushSaferSound.JAW_HARP,
-    'morse': PushSaferSound.MORSE,
-    'electric': PushSaferSound.ELECTRICITY,
-    'radiotuner': PushSaferSound.RADIO_TURNER,
-    'sirens': PushSaferSound.SIRENS,
-    'militarytrumpets': PushSaferSound.MILITARY_TRUMPETS,
-    'military': PushSaferSound.MILITARY_TRUMPETS,
-    'trumpets': PushSaferSound.MILITARY_TRUMPETS,
-    'ufo': PushSaferSound.UFO,
-    'whahwhah': PushSaferSound.LONG_WHAH,
-    'whah': PushSaferSound.SHORT_WHAH,
-    'goodye': PushSaferSound.GOODBYE,
-    'hello': PushSaferSound.HELLO,
-    'no': PushSaferSound.NO,
-    'okay': PushSaferSound.OKAY,
-    'ok': PushSaferSound.OKAY,
-    'ooohhhweee': PushSaferSound.OOOHHHWEEE,
-    'warn': PushSaferSound.WARNING,
-    'warning': PushSaferSound.WARNING,
-    'welcome': PushSaferSound.WELCOME,
-    'yeah': PushSaferSound.YEAH,
-    'yes': PushSaferSound.YES,
-    'beep': PushSaferSound.BEEP1,
-    'beep1': PushSaferSound.BEEP1,
-    'weee': PushSaferSound.WEEE,
-    'wee': PushSaferSound.WEEE,
-    'cutinout': PushSaferSound.CUTINOUT,
-    'flickglass': PushSaferSound.FLICK_GLASS,
-    'laser': PushSaferSound.LASER,
-    'windchime': PushSaferSound.WIND_CHIME,
-    'echo': PushSaferSound.ECHO,
-    'zipper': PushSaferSound.ZIPPER,
-    'hihat': PushSaferSound.HIHAT,
-    'beep2': PushSaferSound.BEEP2,
-    'beep3': PushSaferSound.BEEP3,
-    'beep4': PushSaferSound.BEEP4,
-    'alarmarmed': PushSaferSound.ALARM_ARMED,
-    'armed': PushSaferSound.ALARM_ARMED,
-    'alarmdisarmed': PushSaferSound.ALARM_DISARMED,
-    'disarmed': PushSaferSound.ALARM_DISARMED,
-    'backupready': PushSaferSound.BACKUP_READY,
-    'dooropen': PushSaferSound.DOOR_OPENED,
-    'dopen': PushSaferSound.DOOR_OPENED,
-    'doorclosed': PushSaferSound.DOOR_CLOSED,
-    'dclosed': PushSaferSound.DOOR_CLOSED,
-    'windowopen': PushSaferSound.WINDOW_OPEN,
-    'wopen': PushSaferSound.WINDOW_OPEN,
-    'windowclosed': PushSaferSound.WINDOW_CLOSED,
-    'wclosed': PushSaferSound.WINDOW_CLOSED,
-    'lighton': PushSaferSound.LIGHT_ON,
-    'lon': PushSaferSound.LIGHT_ON,
-    'lightoff': PushSaferSound.LIGHT_OFF,
-    'loff': PushSaferSound.LIGHT_OFF,
-    'doorbellrang': PushSaferSound.DOORBELL_RANG,
+    "silent": PushSaferSound.SILENT,
+    "ahem": PushSaferSound.AHEM,
+    "applause": PushSaferSound.APPLAUSE,
+    "arrow": PushSaferSound.ARROW,
+    "baby": PushSaferSound.BABY,
+    "bell": PushSaferSound.BELL,
+    "bicycle": PushSaferSound.BICYCLE,
+    "bike": PushSaferSound.BICYCLE,
+    "boing": PushSaferSound.BOING,
+    "buzzer": PushSaferSound.BUZZER,
+    "camera": PushSaferSound.CAMERA,
+    "carhorn": PushSaferSound.CAR_HORN,
+    "horn": PushSaferSound.CAR_HORN,
+    "cashregister": PushSaferSound.CASH_REGISTER,
+    "chime": PushSaferSound.CHIME,
+    "creakydoor": PushSaferSound.CREAKY_DOOR,
+    "cuckooclock": PushSaferSound.CUCKOO_CLOCK,
+    "cuckoo": PushSaferSound.CUCKOO_CLOCK,
+    "disconnect": PushSaferSound.DISCONNECT,
+    "dog": PushSaferSound.DOG,
+    "doorbell": PushSaferSound.DOORBELL,
+    "fanfare": PushSaferSound.FANFARE,
+    "gunshot": PushSaferSound.GUN_SHOT,
+    "honk": PushSaferSound.HONK,
+    "jawharp": PushSaferSound.JAW_HARP,
+    "morse": PushSaferSound.MORSE,
+    "electric": PushSaferSound.ELECTRICITY,
+    "radiotuner": PushSaferSound.RADIO_TURNER,
+    "sirens": PushSaferSound.SIRENS,
+    "militarytrumpets": PushSaferSound.MILITARY_TRUMPETS,
+    "military": PushSaferSound.MILITARY_TRUMPETS,
+    "trumpets": PushSaferSound.MILITARY_TRUMPETS,
+    "ufo": PushSaferSound.UFO,
+    "whahwhah": PushSaferSound.LONG_WHAH,
+    "whah": PushSaferSound.SHORT_WHAH,
+    "goodye": PushSaferSound.GOODBYE,
+    "hello": PushSaferSound.HELLO,
+    "no": PushSaferSound.NO,
+    "okay": PushSaferSound.OKAY,
+    "ok": PushSaferSound.OKAY,
+    "ooohhhweee": PushSaferSound.OOOHHHWEEE,
+    "warn": PushSaferSound.WARNING,
+    "warning": PushSaferSound.WARNING,
+    "welcome": PushSaferSound.WELCOME,
+    "yeah": PushSaferSound.YEAH,
+    "yes": PushSaferSound.YES,
+    "beep": PushSaferSound.BEEP1,
+    "beep1": PushSaferSound.BEEP1,
+    "weee": PushSaferSound.WEEE,
+    "wee": PushSaferSound.WEEE,
+    "cutinout": PushSaferSound.CUTINOUT,
+    "flickglass": PushSaferSound.FLICK_GLASS,
+    "laser": PushSaferSound.LASER,
+    "windchime": PushSaferSound.WIND_CHIME,
+    "echo": PushSaferSound.ECHO,
+    "zipper": PushSaferSound.ZIPPER,
+    "hihat": PushSaferSound.HIHAT,
+    "beep2": PushSaferSound.BEEP2,
+    "beep3": PushSaferSound.BEEP3,
+    "beep4": PushSaferSound.BEEP4,
+    "alarmarmed": PushSaferSound.ALARM_ARMED,
+    "armed": PushSaferSound.ALARM_ARMED,
+    "alarmdisarmed": PushSaferSound.ALARM_DISARMED,
+    "disarmed": PushSaferSound.ALARM_DISARMED,
+    "backupready": PushSaferSound.BACKUP_READY,
+    "dooropen": PushSaferSound.DOOR_OPENED,
+    "dopen": PushSaferSound.DOOR_OPENED,
+    "doorclosed": PushSaferSound.DOOR_CLOSED,
+    "dclosed": PushSaferSound.DOOR_CLOSED,
+    "windowopen": PushSaferSound.WINDOW_OPEN,
+    "wopen": PushSaferSound.WINDOW_OPEN,
+    "windowclosed": PushSaferSound.WINDOW_CLOSED,
+    "wclosed": PushSaferSound.WINDOW_CLOSED,
+    "lighton": PushSaferSound.LIGHT_ON,
+    "lon": PushSaferSound.LIGHT_ON,
+    "lightoff": PushSaferSound.LIGHT_OFF,
+    "loff": PushSaferSound.LIGHT_OFF,
+    "doorbellrang": PushSaferSound.DOORBELL_RANG,
 }
 
 
@@ -266,15 +267,15 @@ class PushSaferPriority:
 
 PUSHSAFER_PRIORITY_MAP = {
     # short for 'low'
-    'low': PushSaferPriority.LOW,
+    "low": PushSaferPriority.LOW,
     # short for 'medium'
-    'medium': PushSaferPriority.MODERATE,
+    "medium": PushSaferPriority.MODERATE,
     # short for 'normal'
-    'normal': PushSaferPriority.NORMAL,
+    "normal": PushSaferPriority.NORMAL,
     # short for 'high'
-    'high': PushSaferPriority.HIGH,
+    "high": PushSaferPriority.HIGH,
     # short for 'emergency'
-    'emergency': PushSaferPriority.EMERGENCY,
+    "emergency": PushSaferPriority.EMERGENCY,
 }
 
 # Identify the priority ou want to designate as the fall back
@@ -283,9 +284,8 @@ class PushSaferPriority:
 
 # Vibrations
 class PushSaferVibration:
-    """
-    Defines the acceptable vibration settings for notification
-    """
+    """Defines the acceptable vibration settings for notification."""
+
     # x1
     LOW = 1
     # x2
@@ -304,32 +304,30 @@ class PushSaferVibration:
 # At this time, the following pictures can be attached to each notification
 # at one time. When more are supported, just add their argument below
 PICTURE_PARAMETER = (
-    'p',
-    'p2',
-    'p3',
+    "p",
+    "p2",
+    "p3",
 )
 
 
 # Flag used as a placeholder to sending to all devices
-PUSHSAFER_SEND_TO_ALL = 'a'
+PUSHSAFER_SEND_TO_ALL = "a"
 
 
 class NotifyPushSafer(NotifyBase):
-    """
-    A wrapper for PushSafer Notifications
-    """
+    """A wrapper for PushSafer Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pushsafer'
+    service_name = "Pushsafer"
 
     # The services URL
-    service_url = 'https://www.pushsafer.com/'
+    service_url = "https://www.pushsafer.com/"
 
     # The default insecure protocol
-    protocol = 'psafer'
+    protocol = "psafer"
 
     # The default secure protocol
-    secure_protocol = 'psafers'
+    secure_protocol = "psafers"
 
     # Support attachments
     attachment_support = True
@@ -341,70 +339,81 @@ class NotifyPushSafer(NotifyBase):
     default_pushsafer_icon = 25
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushsafer'
+    setup_url = "https://appriseit.com/services/pushsafer/"
 
     # Defines the hostname to post content to; since this service supports
     # both insecure and secure methods, we set the {schema} just before we
     # post the message upstream.
-    notify_url = '{schema}://www.pushsafer.com/api'
+    notify_url = "{schema}://www.pushsafer.com/api"
 
     # Define object templates
     templates = (
-        '{schema}://{privatekey}',
-        '{schema}://{privatekey}/{targets}',
+        "{schema}://{privatekey}",
+        "{schema}://{privatekey}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'privatekey': {
-            'name': _('Private Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "privatekey": {
+                "name": _("Private Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_device": {
+                "name": _("Target Device"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': PUSHSAFER_PRIORITIES,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": PUSHSAFER_PRIORITIES,
+            },
+            "sound": {
+                "name": _("Sound"),
+                "type": "choice:string",
+                "values": PUSHSAFER_SOUND_MAP,
+            },
+            "vibration": {
+                "name": _("Vibration"),
+                "type": "choice:int",
+                "values": PUSHSAFER_VIBRATIONS,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'sound': {
-            'name': _('Sound'),
-            'type': 'choice:string',
-            'values': PUSHSAFER_SOUND_MAP,
-        },
-        'vibration': {
-            'name': _('Vibration'),
-            'type': 'choice:int',
-            'values': PUSHSAFER_VIBRATIONS,
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, privatekey, targets=None, priority=None, sound=None,
-                 vibration=None, **kwargs):
-        """
-        Initialize PushSafer Object
-        """
+    def __init__(
+        self,
+        privatekey,
+        targets=None,
+        priority=None,
+        sound=None,
+        vibration=None,
+        **kwargs,
+    ):
+        """Initialize PushSafer Object."""
         super().__init__(**kwargs)
 
         #
@@ -429,26 +438,38 @@ def __init__(self, privatekey, targets=None, priority=None, sound=None,
             # low, lo, l (for low);
             # normal, norma, norm, nor, no, n (for normal)
             # ... etc
-            match = next((key for key in PUSHSAFER_PRIORITY_MAP.keys()
-                         if key.startswith(priority)), None) \
-                if priority else None
+            match = (
+                next(
+                    (
+                        key
+                        for key in PUSHSAFER_PRIORITY_MAP
+                        if key.startswith(priority)
+                    ),
+                    None,
+                )
+                if priority
+                else None
+            )
 
             # Now test to see if we got a match
             if not match:
-                msg = 'An invalid PushSafer priority ' \
-                      '({}) was specified.'.format(priority)
+                msg = (
+                    "An invalid PushSafer priority "
+                    f"({priority}) was specified."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
             # store our successfully looked up priority
             self.priority = PUSHSAFER_PRIORITY_MAP[match]
 
-        if self.priority is not None and \
-                self.priority not in PUSHSAFER_PRIORITY_MAP.values():
-            msg = 'An invalid PushSafer priority ' \
-                  '({}) was specified.'.format(priority)
+        if (
+            self.priority is not None
+            and self.priority not in PUSHSAFER_PRIORITY_MAP.values()
+        ):
+            msg = f"An invalid PushSafer priority ({priority}) was specified."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         #
         # Sound
@@ -471,26 +492,35 @@ def __init__(self, privatekey, targets=None, priority=None, sound=None,
             # This little bit of black magic allows us to match against
             # against multiple versions of the same string
             # ... etc
-            match = next((key for key in PUSHSAFER_SOUND_MAP.keys()
-                         if key.startswith(sound)), None) \
-                if sound else None
+            match = (
+                next(
+                    (
+                        key
+                        for key in PUSHSAFER_SOUND_MAP
+                        if key.startswith(sound)
+                    ),
+                    None,
+                )
+                if sound
+                else None
+            )
 
             # Now test to see if we got a match
             if not match:
-                msg = 'An invalid PushSafer sound ' \
-                      '({}) was specified.'.format(sound)
+                msg = f"An invalid PushSafer sound ({sound}) was specified."
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
             # store our successfully looked up sound
             self.sound = PUSHSAFER_SOUND_MAP[match]
 
-        if self.sound is not None and \
-                self.sound not in PUSHSAFER_SOUND_MAP.values():
-            msg = 'An invalid PushSafer sound ' \
-                  '({}) was specified.'.format(sound)
+        if (
+            self.sound is not None
+            and self.sound not in PUSHSAFER_SOUND_MAP.values()
+        ):
+            msg = f"An invalid PushSafer sound ({sound}) was specified."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         #
         # Vibration
@@ -505,38 +535,46 @@ def __init__(self, privatekey, targets=None, priority=None, sound=None,
             self.vibration = None
 
         except ValueError:
-            msg = 'An invalid PushSafer vibration ' \
-                  '({}) was specified.'.format(vibration)
+            msg = (
+                f"An invalid PushSafer vibration ({vibration}) was specified."
+            )
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         if self.vibration and self.vibration not in PUSHSAFER_VIBRATIONS:
-            msg = 'An invalid PushSafer vibration ' \
-                  '({}) was specified.'.format(vibration)
+            msg = (
+                f"An invalid PushSafer vibration ({vibration}) was specified."
+            )
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         #
         # Private Key (associated with project)
         #
         self.privatekey = validate_regex(privatekey)
         if not self.privatekey:
-            msg = 'An invalid PushSafer Private Key ' \
-                  '({}) was specified.'.format(privatekey)
+            msg = (
+                "An invalid PushSafer Private Key "
+                f"({privatekey}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.targets = parse_list(targets)
         if len(self.targets) == 0:
-            self.targets = (PUSHSAFER_SEND_TO_ALL, )
+            self.targets = (PUSHSAFER_SEND_TO_ALL,)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform PushSafer Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform PushSafer Notification."""
 
         # error tracking (used for function return)
         has_error = False
@@ -552,43 +590,48 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access PushSafer attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access PushSafer attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
-                if not attachment.mimetype.startswith('image/'):
+                if not attachment.mimetype.startswith("image/"):
                     # Attachment not supported; continue peacefully
                     self.logger.debug(
-                        'Ignoring unsupported PushSafer attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Ignoring unsupported PushSafer attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     continue
 
                 self.logger.debug(
-                    'Posting PushSafer attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Posting PushSafer attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
                 try:
                     # Output must be in a DataURL format (that's what
                     # PushSafer calls it):
                     attachments.append((
-                        attachment.name
-                        if attachment.name else f'file{no:03}.dat',
-                        'data:{};base64,{}'.format(
-                            attachment.mimetype,
-                            attachment.base64(),
-                        )
+                        (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
+                        f"data:{attachment.mimetype};base64,{attachment.base64()}",
                     ))
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access PushSafer attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access PushSafer attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending PushSafer attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending PushSafer attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         # Create a copy of the targets list
         targets = list(self.targets)
@@ -597,90 +640,97 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
             # prepare payload
             payload = {
-                't': title,
-                'm': body,
+                "t": title,
+                "m": body,
                 # Our default icon to use
-                'i': self.default_pushsafer_icon,
+                "i": self.default_pushsafer_icon,
                 # Notification Color
-                'c': self.color(notify_type),
+                "c": self.color(notify_type),
                 # Target Recipient
-                'd': recipient,
+                "d": recipient,
             }
 
             if self.sound is not None:
                 # Only apply sound setting if it was specified
-                payload['s'] = str(self.sound)
+                payload["s"] = str(self.sound)
 
             if self.vibration is not None:
                 # Only apply vibration setting
-                payload['v'] = str(self.vibration)
+                payload["v"] = str(self.vibration)
 
             if not attachments:
-                okay, response = self._send(payload)
+                okay, _response = self._send(payload)
                 if not okay:
                     has_error = True
                     continue
 
                 self.logger.info(
-                    'Sent PushSafer notification to "%s".' % (recipient))
+                    f'Sent PushSafer notification to "{recipient}".'
+                )
 
             else:
                 # Create a copy of our payload object
-                _payload = payload.copy()
+                payload_ = payload.copy()
 
-                for idx in range(
-                        0, len(attachments), len(PICTURE_PARAMETER)):
+                for idx in range(0, len(attachments), len(PICTURE_PARAMETER)):
                     # Send our attachments to our same user (already prepared
                     # as our payload object)
                     for c, attachment in enumerate(
-                            attachments[idx:idx + len(PICTURE_PARAMETER)]):
+                        attachments[idx : idx + len(PICTURE_PARAMETER)]
+                    ):
 
                         # Get our attachment information
                         filename, dataurl = attachment
-                        _payload.update({PICTURE_PARAMETER[c]: dataurl})
+                        payload_.update({PICTURE_PARAMETER[c]: dataurl})
 
                         self.logger.debug(
-                            'Added attachment (%s) to "%s".' % (
-                                filename, recipient))
+                            f'Added attachment ({filename}) to "{recipient}".'
+                        )
 
-                    okay, response = self._send(_payload)
+                    okay, _response = self._send(payload_)
                     if not okay:
                         has_error = True
                         continue
 
                     self.logger.info(
-                        'Sent PushSafer attachment (%s) to "%s".' % (
-                            filename, recipient))
+                        f"Sent PushSafer attachment ({filename}) to"
+                        f' "{recipient}".'
+                    )
 
                     # More then the maximum messages shouldn't cause all of
                     # the text to loop on future iterations
-                    _payload = payload.copy()
-                    _payload['t'] = ''
-                    _payload['m'] = '...'
+                    payload_ = payload.copy()
+                    payload_["t"] = ""
+                    payload_["m"] = "..."
 
         return not has_error
 
     def _send(self, payload, **kwargs):
-        """
-        Wrapper to the requests (post) object
-        """
+        """Wrapper to the requests (post) object."""
 
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Prepare the notification URL to post to
         notify_url = self.notify_url.format(
-            schema='https' if self.secure else 'http'
+            schema="https" if self.secure else "http"
         )
 
         # Store the payload key
-        payload['k'] = self.privatekey
-
-        self.logger.debug('PushSafer POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('PushSafer Payload: %s' % str(payload))
+        payload["k"] = self.privatekey
+
+        # Some Debug Logging
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                "PushSafer POST URL:"
+                f" {notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(
+                "PushSafer Payload: %s", sanitize_payload(payload))
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -689,8 +739,8 @@ def _send(self, payload, **kwargs):
         response = None
 
         # Initialize our Pushsafer expected responses
-        _code = None
-        _str = 'Unknown'
+        code = None
+        str_ = "Unknown"
 
         try:
             # Open our attachment path if required:
@@ -704,9 +754,12 @@ def _send(self, payload, **kwargs):
 
             try:
                 response = loads(r.content)
-                _code = response.get('status')
-                _str = response.get('success', _str) \
-                    if _code == 1 else response.get('error', _str)
+                code = response.get("status")
+                str_ = (
+                    response.get("success", str_)
+                    if code == 1
+                    else response.get("error", str_)
+                )
 
             except (AttributeError, TypeError, ValueError):
                 # ValueError = r.content is Unparsable
@@ -717,34 +770,35 @@ def _send(self, payload, **kwargs):
                 response = r.content
 
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyPushSafer.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyPushSafer.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to deliver payload to PushSafer:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to deliver payload to PushSafer:"
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False, response
 
-            elif _code != 1:
+            elif code != 1:
                 # It's a bit backwards, but:
                 #    1 is returned if we succeed
                 #    0 is returned if we fail
                 self.logger.warning(
-                    'Failed to deliver payload to PushSafer;'
-                    ' error={}.'.format(_str))
+                    f"Failed to deliver payload to PushSafer; error={str_}."
+                )
 
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 return False, response
 
@@ -753,17 +807,18 @@ def _send(self, payload, **kwargs):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred communicating with PushSafer.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred communicating with PushSafer."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False, response
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
@@ -771,83 +826,87 @@ def url_identifier(self):
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if self.priority is not None:
             # Store our priority; but only if it was specified
-            params['priority'] = \
-                next((key for key, value in PUSHSAFER_PRIORITY_MAP.items()
-                      if value == self.priority),
-                     DEFAULT_PRIORITY)  # pragma: no cover
+            params["priority"] = next(
+                (
+                    key
+                    for key, value in PUSHSAFER_PRIORITY_MAP.items()
+                    if value == self.priority
+                ),
+                DEFAULT_PRIORITY,
+            )  # pragma: no cover
 
         if self.sound is not None:
             # Store our sound; but only if it was specified
-            params['sound'] = \
-                next((key for key, value in PUSHSAFER_SOUND_MAP.items()
-                      if value == self.sound), '')  # pragma: no cover
+            params["sound"] = next(
+                (
+                    key
+                    for key, value in PUSHSAFER_SOUND_MAP.items()
+                    if value == self.sound
+                ),
+                "",
+            )  # pragma: no cover
 
         if self.vibration is not None:
             # Store our vibration; but only if it was specified
-            params['vibration'] = str(self.vibration)
+            params["vibration"] = str(self.vibration)
 
-        targets = '/'.join([NotifyPushSafer.quote(x) for x in self.targets])
+        targets = "/".join([NotifyPushSafer.quote(x) for x in self.targets])
         if targets == PUSHSAFER_SEND_TO_ALL:
             # keyword is reserved for internal usage only; it's safe to remove
             # it from the recipients list
-            targets = ''
+            targets = ""
 
-        return '{schema}://{privatekey}/{targets}?{params}'.format(
+        return "{schema}://{privatekey}/{targets}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
-            privatekey=self.pprint(self.privatekey, privacy, safe=''),
+            privatekey=self.pprint(self.privatekey, privacy, safe=""),
             targets=targets,
-            params=NotifyPushSafer.urlencode(params))
+            params=NotifyPushSafer.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Fetch our targets
-        results['targets'] = \
-            NotifyPushSafer.split_path(results['fullpath'])
+        results["targets"] = NotifyPushSafer.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPushSafer.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPushSafer.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Setup the token; we store it in Private Key for global
         # plugin consistency with naming conventions
-        results['privatekey'] = NotifyPushSafer.unquote(results['host'])
+        results["privatekey"] = NotifyPushSafer.unquote(results["host"])
 
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifyPushSafer.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifyPushSafer.unquote(
+                results["qsd"]["priority"]
+            )
 
-        if 'sound' in results['qsd'] and len(results['qsd']['sound']):
-            results['sound'] = \
-                NotifyPushSafer.unquote(results['qsd']['sound'])
+        if "sound" in results["qsd"] and len(results["qsd"]["sound"]):
+            results["sound"] = NotifyPushSafer.unquote(results["qsd"]["sound"])
 
-        if 'vibration' in results['qsd'] and len(results['qsd']['vibration']):
-            results['vibration'] = \
-                NotifyPushSafer.unquote(results['qsd']['vibration'])
+        if "vibration" in results["qsd"] and len(results["qsd"]["vibration"]):
+            results["vibration"] = NotifyPushSafer.unquote(
+                results["qsd"]["vibration"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/pushy.py b/libs/apprise/plugins/pushy.py
index 21cc5e4bd8..a91058a3b2 100644
--- a/libs/apprise/plugins/pushy.py
+++ b/libs/apprise/plugins/pushy.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,112 +26,112 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # API reference: https://pushy.me/docs/api/send-notifications
+from itertools import chain
+from json import dumps, loads
 import re
+
 import requests
-from itertools import chain
 
-from json import dumps, loads
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
 
 # Used to detect a Device and Topic
-VALIDATE_DEVICE = re.compile(r'^@(?P<device>[a-z0-9]+)$', re.I)
-VALIDATE_TOPIC = re.compile(r'^[#]?(?P<topic>[a-z0-9]+)$', re.I)
+VALIDATE_DEVICE = re.compile(r"^@(?P<device>[a-z0-9]+)$", re.I)
+VALIDATE_TOPIC = re.compile(r"^[#]?(?P<topic>[a-z0-9]+)$", re.I)
 
 # Extend HTTP Error Messages
 PUSHY_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 
 class NotifyPushy(NotifyBase):
-    """
-    A wrapper for Pushy Notifications
-    """
+    """A wrapper for Pushy Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Pushy'
+    service_name = "Pushy"
 
     # The services URL
-    service_url = 'https://pushy.me/'
+    service_url = "https://pushy.me/"
 
     # All Pushy requests are secure
-    secure_protocol = 'pushy'
+    secure_protocol = "pushy"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_pushy'
+    setup_url = "https://appriseit.com/services/pushy/"
 
     # Pushy uses the http protocol with JSON requests
-    notify_url = 'https://api.pushy.me/push?api_key={apikey}'
+    notify_url = "https://api.pushy.me/push?api_key={apikey}"
 
     # The maximum allowable characters allowed in the body per message
     body_maxlen = 4096
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}/{targets}',
-    )
+    templates = ("{schema}://{apikey}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('Secret API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("Secret API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_device": {
+                "name": _("Target Device"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_topic": {
+                "name": _("Target Topic"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'target_device': {
-            'name': _('Target Device'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'target_topic': {
-            'name': _('Target Topic'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'sound': {
-            # Specify something like ping.aiff
-            'name': _('Sound'),
-            'type': 'string',
-        },
-        'badge': {
-            'name': _('Badge'),
-            'type': 'int',
-            'min': 0,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "sound": {
+                # Specify something like ping.aiff
+                "name": _("Sound"),
+                "type": "string",
+            },
+            "badge": {
+                "name": _("Badge"),
+                "type": "int",
+                "min": 0,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "key": {
+                "alias_of": "apikey",
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'key': {
-            'alias_of': 'apikey',
-        },
-    })
+    )
 
     def __init__(self, apikey, targets=None, sound=None, badge=None, **kwargs):
-        """
-        Initialize Pushy Object
-        """
+        """Initialize Pushy Object."""
         super().__init__(**kwargs)
 
         # Access Token (associated with project)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid Pushy Secret API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Pushy Secret API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -143,17 +142,16 @@ def __init__(self, apikey, targets=None, sound=None, badge=None, **kwargs):
         for target in parse_list(targets):
             result = VALIDATE_TOPIC.match(target)
             if result:
-                self.topics.append(result.group('topic'))
+                self.topics.append(result.group("topic"))
                 continue
 
             result = VALIDATE_DEVICE.match(target)
             if result:
-                self.devices.append(result.group('device'))
+                self.devices.append(result.group("device"))
                 continue
 
             self.logger.warning(
-                'Dropped invalid topic/device  '
-                '({}) specified.'.format(target),
+                f"Dropped invalid topic/device  ({target}) specified.",
             )
 
         # Setup our sound
@@ -175,18 +173,17 @@ def __init__(self, apikey, targets=None, sound=None, badge=None, **kwargs):
         except ValueError:
             self.badge = None
             self.logger.warning(
-                'The specified Pushy badge ({}) is not valid ', badge)
+                "The specified Pushy badge ({}) is not valid ", badge
+            )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Pushy Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Pushy Notification."""
 
         if len(self.topics) + len(self.devices) == 0:
             # There were no services to notify
-            self.logger.warning('There were no Pushy targets to notify.')
+            self.logger.warning("There were no Pushy targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -194,9 +191,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Default Header
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accepts': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accepts": "application/json",
         }
 
         # Our URL
@@ -213,29 +210,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # prepare JSON Object
             payload = {
                 # Mandatory fields
-                'to': target,
+                "to": target,
                 "data": {
                     "message": body,
                 },
                 "notification": {
-                    'body': body,
-                }
+                    "body": body,
+                },
             }
 
             # Optional payload items
             if title:
-                payload['notification']['title'] = title
+                payload["notification"]["title"] = title
 
             if self.sound:
-                payload['notification']['sound'] = self.sound
+                payload["notification"]["sound"] = self.sound
 
             if self.badge is not None:
-                payload['notification']['badge'] = self.badge
+                payload["notification"]["badge"] = self.badge
 
-            self.logger.debug('Pushy POST URL: %s (cert_verify=%r)' % (
-                notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('Pushy Payload: %s' % str(payload))
+            self.logger.debug(
+                "Pushy POST URL:"
+                f" {notify_url} (cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Pushy Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -268,41 +266,45 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     # AttributeError = r is None
                     content = {
                         "success": False,
-                        "id": '',
+                        "id": "",
                         "info": {},
                     }
 
-                if r.status_code != requests.codes.ok \
-                        or not content.get('success'):
+                if r.status_code != requests.codes.ok or not content.get(
+                    "success"
+                ):
 
                     # We had a problem
-                    status_str = \
-                        NotifyPushy.http_response_code_lookup(
-                            r.status_code, PUSHY_HTTP_ERROR_MAP)
+                    status_str = NotifyPushy.http_response_code_lookup(
+                        r.status_code, PUSHY_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send Pushy notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Pushy notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Pushy notification to %s.' % target)
+                    self.logger.info(f"Sent Pushy notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Pushy:%s '
-                    'notification', target)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Pushy:%s "
+                    "notification",
+                    target,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 has_error = True
                 continue
@@ -311,82 +313,77 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
         if self.sound:
-            params['sound'] = self.sound
+            params["sound"] = self.sound
 
         if self.badge is not None:
-            params['badge'] = str(self.badge)
+            params["badge"] = str(self.badge)
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{apikey}/{targets}/?{params}'.format(
+        return "{schema}://{apikey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(
-                [NotifyPushy.quote(x, safe='@#') for x in chain(
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join([
+                NotifyPushy.quote(x, safe="@#")
+                for x in chain(
                     # Topics are prefixed with a pound/hashtag symbol
-                    ['#{}'.format(x) for x in self.topics],
+                    [f"#{x}" for x in self.topics],
                     # Devices
-                    ['@{}'.format(x) for x in self.devices],
-                )]),
-            params=NotifyPushy.urlencode(params))
+                    [f"@{x}" for x in self.devices],
+                )
+            ]),
+            params=NotifyPushy.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.topics) + len(self.devices)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Token
-        results['apikey'] = NotifyPushy.unquote(results['host'])
+        results["apikey"] = NotifyPushy.unquote(results["host"])
 
         # Retrieve all of our targets
-        results['targets'] = NotifyPushy.split_path(results['fullpath'])
+        results["targets"] = NotifyPushy.split_path(results["fullpath"])
 
         # Get the sound
-        if 'sound' in results['qsd'] and len(results['qsd']['sound']):
-            results['sound'] = \
-                NotifyPushy.unquote(results['qsd']['sound'])
+        if "sound" in results["qsd"] and len(results["qsd"]["sound"]):
+            results["sound"] = NotifyPushy.unquote(results["qsd"]["sound"])
 
         # Badge
-        if 'badge' in results['qsd'] and results['qsd']['badge']:
-            results['badge'] = NotifyPushy.unquote(
-                results['qsd']['badge'].strip())
+        if "badge" in results["qsd"] and results["qsd"]["badge"]:
+            results["badge"] = NotifyPushy.unquote(
+                results["qsd"]["badge"].strip()
+            )
 
         # Support key variable to store Secret API Key
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
-            results['apikey'] = results['qsd']['key']
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
+            results["apikey"] = results["qsd"]["key"]
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyPushy.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyPushy.parse_list(results["qsd"]["to"])
 
         return results
diff --git a/libs/apprise/plugins/qq.py b/libs/apprise/plugins/qq.py
new file mode 100644
index 0000000000..51a8c190fa
--- /dev/null
+++ b/libs/apprise/plugins/qq.py
@@ -0,0 +1,167 @@
+#
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Assumes QQ Push API provided by third-party bridge like message-pusher
+
+import re
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
+
+
+class NotifyQQ(NotifyBase):
+    """A wrapper for QQ Push Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("QQ Push")
+
+    # The services URL
+    service_url = "https://github.com/songquanpeng/message-pusher"
+
+    # The default secure protocol
+    secure_protocol = "qq"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/qq/"
+
+    # URL used to send notifications with
+    notify_url = "https://qmsg.zendee.cn/send/"
+
+    templates = ("{schema}://{token}",)
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("User Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]{24,64}$", "i"),
+            },
+        },
+    )
+
+    def __init__(self, token, **kwargs):
+        """Initialize QQ Push Object.
+
+        Args:
+            token (str): User push token from QQ Push provider (e.g., Qmsg)
+        """
+        super().__init__(**kwargs)
+
+        self.token = validate_regex(
+            token, *self.template_tokens["token"]["regex"]
+        )
+        if not self.token:
+            msg = f"The QQ Push token ({token}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.webhook_url = f"{self.notify_url}{self.token}"
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+        return (
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
+        )
+
+    @property
+    def url_identifier(self):
+        """Returns a unique identifier for this plugin instance."""
+        return (self.secure_protocol, self.token)
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send a QQ Push Notification."""
+        payload = {"msg": f"{title}\n{body}" if title else body}
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
+        }
+
+        self.throttle()
+        try:
+            response = requests.post(
+                self.webhook_url,
+                headers=headers,
+                data=payload,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            if response.status_code != requests.codes.ok:
+                self.logger.warning(
+                    "QQ Push notification failed: %d - %s",
+                    response.status_code,
+                    response.text,
+                )
+                return False
+
+        except requests.RequestException as e:
+            self.logger.warning(f"QQ Push Exception: {e}")
+            return False
+
+        self.logger.info("QQ Push notification sent successfully.")
+        return True
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns arguments to re-instantiate the
+        object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            return results
+
+        if "token" in results["qsd"] and results["qsd"]["token"]:
+            results["token"] = NotifyQQ.unquote(results["qsd"]["token"])
+        else:
+            results["token"] = NotifyQQ.unquote(results["host"])
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """Parse native QQ push-style URL into Apprise format."""
+        match = re.match(
+            r"^https://qmsg\.zendee\.cn/send/([a-z0-9]+)$", url, re.I
+        )
+        if not match:
+            return None
+
+        return NotifyQQ.parse_url(
+            f"{NotifyQQ.secure_protocol}://{match.group(1)}"
+        )
diff --git a/libs/apprise/plugins/reddit.py b/libs/apprise/plugins/reddit.py
index 2133761329..5f1a595f85 100644
--- a/libs/apprise/plugins/reddit.py
+++ b/libs/apprise/plugins/reddit.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -47,39 +46,36 @@
 #   - https://www.reddit.com/dev/api/
 #   - https://www.reddit.com/dev/api/#POST_api_submit
 #   - https://github.com/reddit-archive/reddit/wiki/API
-import requests
+from datetime import datetime, timedelta, timezone
 from json import loads
-from datetime import timedelta
-from datetime import datetime
-from datetime import timezone
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool, validate_regex
-from ..locale import gettext_lazy as _
+import requests
+
 from .. import __title__, __version__
+from ..common import NotifyFormat, NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 REDDIT_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token',
+    401: "Unauthorized - Invalid Token",
 }
 
 
 class RedditMessageKind:
-    """
-    Define the kinds of messages supported
-    """
+    """Define the kinds of messages supported."""
+
     # Attempt to auto-detect the type prior to passing along the message to
     # Reddit
-    AUTO = 'auto'
+    AUTO = "auto"
 
     # A common message
-    SELF = 'self'
+    SELF = "self"
 
     # A Hyperlink
-    LINK = 'link'
+    LINK = "link"
 
 
 REDDIT_MESSAGE_KINDS = (
@@ -90,21 +86,19 @@ class RedditMessageKind:
 
 
 class NotifyReddit(NotifyBase):
-    """
-    A wrapper for Notify Reddit Notifications
-    """
+    """A wrapper for Notify Reddit Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Reddit'
+    service_name = "Reddit"
 
     # The services URL
-    service_url = 'https://reddit.com'
+    service_url = "https://reddit.com"
 
     # The default secure protocol
-    secure_protocol = 'reddit'
+    secure_protocol = "reddit"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_reddit'
+    setup_url = "https://appriseit.com/services/reddit/"
 
     # The maximum size of the message
     body_maxlen = 6000
@@ -116,8 +110,8 @@ class NotifyReddit(NotifyBase):
     notify_format = NotifyFormat.MARKDOWN
 
     # The default Notification URL to use
-    auth_url = 'https://www.reddit.com/api/v1/access_token'
-    submit_url = 'https://oauth.reddit.com/api/submit'
+    auth_url = "https://www.reddit.com/api/v1/access_token"
+    submit_url = "https://oauth.reddit.com/api/submit"
 
     # Reddit is kind enough to return how many more requests we're allowed to
     # continue to make within it's header response as:
@@ -135,108 +129,123 @@ class NotifyReddit(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}:{password}@{app_id}/{app_secret}/{targets}',
+        "{schema}://{user}:{password}@{app_id}/{app_secret}/{targets}",
     )
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'app_id': {
-            'name': _('Application ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
-        },
-        'app_secret': {
-            'name': _('Application Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
-        },
-        'target_subreddit': {
-            'name': _('Target Subreddit'),
-            'type': 'string',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "app_id": {
+                "name": _("Application ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+            },
+            "app_secret": {
+                "name": _("Application Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+            },
+            "target_subreddit": {
+                "name": _("Target Subreddit"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'kind': {
-            'name': _('Kind'),
-            'type': 'choice:string',
-            'values': REDDIT_MESSAGE_KINDS,
-            'default': RedditMessageKind.AUTO,
-        },
-        'flair_id': {
-            'name': _('Flair ID'),
-            'type': 'string',
-            'map_to': 'flair_id',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "kind": {
+                "name": _("Kind"),
+                "type": "choice:string",
+                "values": REDDIT_MESSAGE_KINDS,
+                "default": RedditMessageKind.AUTO,
+            },
+            "flair_id": {
+                "name": _("Flair ID"),
+                "type": "string",
+                "map_to": "flair_id",
+            },
+            "flair_text": {
+                "name": _("Flair Text"),
+                "type": "string",
+                "map_to": "flair_text",
+            },
+            "nsfw": {
+                "name": _("NSFW"),
+                "type": "bool",
+                "default": False,
+                "map_to": "nsfw",
+            },
+            "ad": {
+                "name": _("Is Ad?"),
+                "type": "bool",
+                "default": False,
+                "map_to": "advertisement",
+            },
+            "replies": {
+                "name": _("Send Replies"),
+                "type": "bool",
+                "default": True,
+                "map_to": "sendreplies",
+            },
+            "spoiler": {
+                "name": _("Is Spoiler"),
+                "type": "bool",
+                "default": False,
+                "map_to": "spoiler",
+            },
+            "resubmit": {
+                "name": _("Resubmit Flag"),
+                "type": "bool",
+                "default": False,
+                "map_to": "resubmit",
+            },
         },
-        'flair_text': {
-            'name': _('Flair Text'),
-            'type': 'string',
-            'map_to': 'flair_text',
-        },
-        'nsfw': {
-            'name': _('NSFW'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'nsfw',
-        },
-        'ad': {
-            'name': _('Is Ad?'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'advertisement',
-        },
-        'replies': {
-            'name': _('Send Replies'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'sendreplies',
-        },
-        'spoiler': {
-            'name': _('Is Spoiler'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'spoiler',
-        },
-        'resubmit': {
-            'name': _('Resubmit Flag'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'resubmit',
-        },
-    })
+    )
 
-    def __init__(self, app_id=None, app_secret=None, targets=None,
-                 kind=None, nsfw=False, sendreplies=True, resubmit=False,
-                 spoiler=False, advertisement=False,
-                 flair_id=None, flair_text=None, **kwargs):
-        """
-        Initialize Notify Reddit Object
-        """
+    def __init__(
+        self,
+        app_id=None,
+        app_secret=None,
+        targets=None,
+        kind=None,
+        nsfw=False,
+        sendreplies=True,
+        resubmit=False,
+        spoiler=False,
+        advertisement=False,
+        flair_id=None,
+        flair_text=None,
+        **kwargs,
+    ):
+        """Initialize Notify Reddit Object."""
         super().__init__(**kwargs)
 
         # Initialize subreddit list
@@ -266,53 +275,52 @@ def __init__(self, app_id=None, app_secret=None, targets=None,
         self.__access_token = None
         self.__access_token_expiry = datetime.now(timezone.utc)
 
-        self.kind = kind.strip().lower() \
-            if isinstance(kind, str) \
-            else self.template_args['kind']['default']
+        self.kind = (
+            kind.strip().lower()
+            if isinstance(kind, str)
+            else self.template_args["kind"]["default"]
+        )
 
         if self.kind not in REDDIT_MESSAGE_KINDS:
-            msg = 'An invalid Reddit message kind ({}) was specified'.format(
-                kind)
+            msg = f"An invalid Reddit message kind ({kind}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.user = validate_regex(self.user)
         if not self.user:
-            msg = 'An invalid Reddit User ID ' \
-                  '({}) was specified'.format(self.user)
+            msg = f"An invalid Reddit User ID ({self.user}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.password = validate_regex(self.password)
         if not self.password:
-            msg = 'An invalid Reddit Password ' \
-                  '({}) was specified'.format(self.password)
+            msg = f"An invalid Reddit Password ({self.password}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.client_id = validate_regex(
-            app_id, *self.template_tokens['app_id']['regex'])
+            app_id, *self.template_tokens["app_id"]["regex"]
+        )
         if not self.client_id:
-            msg = 'An invalid Reddit App ID ' \
-                  '({}) was specified'.format(app_id)
+            msg = f"An invalid Reddit App ID ({app_id}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.client_secret = validate_regex(
-            app_secret, *self.template_tokens['app_secret']['regex'])
+            app_secret, *self.template_tokens["app_secret"]["regex"]
+        )
         if not self.client_secret:
-            msg = 'An invalid Reddit App Secret ' \
-                  '({}) was specified'.format(app_secret)
+            msg = f"An invalid Reddit App Secret ({app_secret}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Build list of subreddits
         self.subreddits = [
-            sr.lstrip('#') for sr in parse_list(targets) if sr.lstrip('#')]
+            sr.lstrip("#") for sr in parse_list(targets) if sr.lstrip("#")
+        ]
 
         if not self.subreddits:
-            self.logger.warning(
-                'No subreddits were identified to be notified')
+            self.logger.warning("No subreddits were identified to be notified")
 
         # For Rate Limit Tracking Purposes
         self.ratelimit_reset = datetime.now(timezone.utc).replace(tzinfo=None)
@@ -324,73 +332,78 @@ def __init__(self, app_id=None, app_secret=None, targets=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.client_id, self.client_secret,
-            self.user, self.password,
+            self.secure_protocol,
+            self.client_id,
+            self.client_secret,
+            self.user,
+            self.password,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'kind': self.kind,
-            'ad': 'yes' if self.advertisement else 'no',
-            'nsfw': 'yes' if self.nsfw else 'no',
-            'resubmit': 'yes' if self.resubmit else 'no',
-            'replies': 'yes' if self.sendreplies else 'no',
-            'spoiler': 'yes' if self.spoiler else 'no',
+            "kind": self.kind,
+            "ad": "yes" if self.advertisement else "no",
+            "nsfw": "yes" if self.nsfw else "no",
+            "resubmit": "yes" if self.resubmit else "no",
+            "replies": "yes" if self.sendreplies else "no",
+            "spoiler": "yes" if self.spoiler else "no",
         }
 
         # Flair support
         if self.flair_id:
-            params['flair_id'] = self.flair_id
+            params["flair_id"] = self.flair_id
 
         if self.flair_text:
-            params['flair_text'] = self.flair_text
+            params["flair_text"] = self.flair_text
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{user}:{password}@{app_id}/{app_secret}' \
-            '/{targets}/?{params}'.format(
+        return (
+            "{schema}://{user}:{password}@{app_id}/{app_secret}"
+            "/{targets}/?{params}".format(
                 schema=self.secure_protocol,
-                user=NotifyReddit.quote(self.user, safe=''),
+                user=NotifyReddit.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
                 app_id=self.pprint(
-                    self.client_id, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.client_id, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
                 app_secret=self.pprint(
-                    self.client_secret, privacy, mode=PrivacyMode.Secret,
-                    safe=''),
-                targets='/'.join(
-                    [NotifyReddit.quote(x, safe='') for x in self.subreddits]),
+                    self.client_secret,
+                    privacy,
+                    mode=PrivacyMode.Secret,
+                    safe="",
+                ),
+                targets="/".join(
+                    [NotifyReddit.quote(x, safe="") for x in self.subreddits]
+                ),
                 params=NotifyReddit.urlencode(params),
             )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.subreddits)
 
     def login(self):
-        """
-        A simple wrapper to authenticate with the Reddit Server
-        """
+        """A simple wrapper to authenticate with the Reddit Server."""
 
         # Prepare our payload
         payload = {
-            'grant_type': 'password',
-            'username': self.user,
-            'password': self.password,
+            "grant_type": "password",
+            "username": self.user,
+            "password": self.password,
         }
 
         # Enforce a False flag setting before calling _fetch()
@@ -419,35 +432,37 @@ def login(self):
         # }
 
         # Acquire our token
-        self.__access_token = response.get('access_token')
+        self.__access_token = response.get("access_token")
 
         # Handle other optional arguments we can use
-        if 'expires_in' in response:
-            delta = timedelta(seconds=int(response['expires_in']))
-            self.__access_token_expiry = \
+        if "expires_in" in response:
+            delta = timedelta(seconds=int(response["expires_in"]))
+            self.__access_token_expiry = (
                 delta + datetime.now(timezone.utc) - self.clock_skew
+            )
         else:
-            self.__access_token_expiry = self.access_token_lifetime_sec + \
-                datetime.now(timezone.utc) - self.clock_skew
+            self.__access_token_expiry = (
+                self.access_token_lifetime_sec
+                + datetime.now(timezone.utc)
+                - self.clock_skew
+            )
 
         # The Refresh Token
         self.__refresh_token = response.get(
-            'refresh_token', self.__refresh_token)
+            "refresh_token", self.__refresh_token
+        )
 
         if self.__access_token:
-            self.logger.info('Authenticated to Reddit as {}'.format(self.user))
+            self.logger.info(f"Authenticated to Reddit as {self.user}")
             return True
 
-        self.logger.warning(
-            'Failed to authenticate to Reddit as {}'.format(self.user))
+        self.logger.warning(f"Failed to authenticate to Reddit as {self.user}")
 
         # Mark our failure
         return False
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Reddit Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Reddit Notification."""
 
         # error tracking (used for function return)
         has_error = False
@@ -458,15 +473,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         if not len(self.subreddits):
             # We have nothing to notify; we're done
-            self.logger.warning('There are no Reddit targets to notify')
+            self.logger.warning("There are no Reddit targets to notify")
             return False
 
         # Prepare our Message Type/Kind
         if self.kind == RedditMessageKind.AUTO:
             parsed = NotifyBase.parse_url(body)
             # Detect a link
-            if parsed and parsed.get('schema', '').startswith('http') \
-                    and parsed.get('host'):
+            if (
+                parsed
+                and parsed.get("schema", "").startswith("http")
+                and parsed.get("host")
+            ):
                 kind = RedditMessageKind.LINK
 
             else:
@@ -482,34 +500,34 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # Prepare our payload
             payload = {
-                'ad': True if self.advertisement else False,
-                'api_type': 'json',
-                'extension': 'json',
-                'sr': subreddit,
-                'title': title if title else self.app_desc,
-                'kind': kind,
-                'nsfw': True if self.nsfw else False,
-                'resubmit': True if self.resubmit else False,
-                'sendreplies': True if self.sendreplies else False,
-                'spoiler': True if self.spoiler else False,
+                "ad": bool(self.advertisement),
+                "api_type": "json",
+                "extension": "json",
+                "sr": subreddit,
+                "title": title if title else self.app_desc,
+                "kind": kind,
+                "nsfw": bool(self.nsfw),
+                "resubmit": bool(self.resubmit),
+                "sendreplies": bool(self.sendreplies),
+                "spoiler": bool(self.spoiler),
             }
 
             if self.flair_id:
-                payload['flair_id'] = self.flair_id
+                payload["flair_id"] = self.flair_id
 
             if self.flair_text:
-                payload['flair_text'] = self.flair_text
+                payload["flair_text"] = self.flair_text
 
             if kind == RedditMessageKind.LINK:
                 payload.update({
-                    'url': body,
+                    "url": body,
                 })
             else:
                 payload.update({
-                    'text': body,
+                    "text": body,
                 })
 
-            postokay, response = self._fetch(self.submit_url, payload=payload)
+            postokay, _response = self._fetch(self.submit_url, payload=payload)
             # only toggle has_error flag if we had an error
             if not postokay:
                 # Mark our failure
@@ -517,33 +535,28 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 continue
 
             # If we reach here, we were successful
-            self.logger.info(
-                'Sent Reddit notification to {}'.format(
-                    subreddit))
+            self.logger.info(f"Sent Reddit notification to {subreddit}")
 
         return not has_error
 
     def _fetch(self, url, payload=None):
-        """
-        Wrapper to Reddit API requests object
-        """
+        """Wrapper to Reddit API requests object."""
 
         # use what was specified, otherwise build headers dynamically
-        headers = {
-            'User-Agent': '{} v{}'.format(__title__, __version__)
-        }
+        headers = {"User-Agent": f"{__title__} v{__version__}"}
 
         if self.__access_token:
             # Set our token
-            headers['Authorization'] = 'Bearer {}'.format(self.__access_token)
+            headers["Authorization"] = f"Bearer {self.__access_token}"
 
         # Prepare our url
         url = self.submit_url if self.__access_token else self.auth_url
 
         # Some Debug Logging
-        self.logger.debug('Reddit POST URL: {} (cert_verify={})'.format(
-            url, self.verify_certificate))
-        self.logger.debug('Reddit Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Reddit POST URL: {url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"Reddit Payload: {payload!s}")
 
         # By default set wait to None
         wait = None
@@ -559,8 +572,10 @@ def _fetch(self, url, payload=None):
             if now < self.ratelimit_reset:
                 # We need to throttle for the difference in seconds
                 wait = abs(
-                    (self.ratelimit_reset - now + self.clock_skew)
-                    .total_seconds())
+                    (
+                        self.ratelimit_reset - now + self.clock_skew
+                    ).total_seconds()
+                )
 
         # Always call throttle before any remote server i/o is made;
         self.throttle(wait=wait)
@@ -573,8 +588,11 @@ def _fetch(self, url, payload=None):
             r = requests.post(
                 url,
                 data=payload,
-                auth=None if self.__access_token
-                else (self.client_id, self.client_secret),
+                auth=(
+                    None
+                    if self.__access_token
+                    else (self.client_id, self.client_secret)
+                ),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
@@ -582,23 +600,26 @@ def _fetch(self, url, payload=None):
 
             #  We attempt to login again and retry the original request
             #  if we aren't in the process of handling a login already
-            if r.status_code != requests.codes.ok \
-                    and self.__access_token and url != self.auth_url:
+            if (
+                r.status_code != requests.codes.ok
+                and self.__access_token
+                and url != self.auth_url
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifyReddit.http_response_code_lookup(
-                        r.status_code, REDDIT_HTTP_ERROR_MAP)
+                status_str = NotifyReddit.http_response_code_lookup(
+                    r.status_code, REDDIT_HTTP_ERROR_MAP
+                )
 
                 self.logger.debug(
-                    'Taking countermeasures after failed to send to Reddit '
-                    '{}: {}error={}'.format(
-                        url,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Taking countermeasures after failed to send to Reddit "
+                    "{}: {}error={}".format(
+                        url, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # We failed to authenticate with our token; login one more
                 # time and retry this original request
@@ -611,7 +632,7 @@ def _fetch(self, url, payload=None):
                     data=payload,
                     headers=headers,
                     verify=self.verify_certificate,
-                    timeout=self.request_timeout
+                    timeout=self.request_timeout,
                 )
 
             # Get our JSON content if it's possible
@@ -624,63 +645,60 @@ def _fetch(self, url, payload=None):
                 # AttributeError = r.content is None
 
                 # We had a problem
-                status_str = \
-                    NotifyReddit.http_response_code_lookup(
-                        r.status_code, REDDIT_HTTP_ERROR_MAP)
+                status_str = NotifyReddit.http_response_code_lookup(
+                    r.status_code, REDDIT_HTTP_ERROR_MAP
+                )
 
                 # Reddit always returns a JSON response
                 self.logger.warning(
-                    'Failed to send to Reddit after countermeasures {}: '
-                    '{}error={}'.format(
-                        url,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send to Reddit after countermeasures {}: "
+                    "{}error={}".format(
+                        url, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
                 return (False, {})
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyReddit.http_response_code_lookup(
-                        r.status_code, REDDIT_HTTP_ERROR_MAP)
+                status_str = NotifyReddit.http_response_code_lookup(
+                    r.status_code, REDDIT_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send to Reddit {}: '
-                    '{}error={}'.format(
-                        url,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send to Reddit {}: {}error={}".format(
+                        url, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 # Mark our failure
                 return (False, content)
 
-            errors = [] if not content else \
-                content.get('json', {}).get('errors', [])
+            errors = (
+                []
+                if not content
+                else content.get("json", {}).get("errors", [])
+            )
             if errors:
                 self.logger.warning(
-                    'Failed to send to Reddit {}: '
-                    '{}'.format(
-                        url,
-                        str(errors)))
+                    f"Failed to send to Reddit {url}: {errors!s}"
+                )
 
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 # Mark our failure
                 return (False, content)
 
             try:
                 # Store our rate limiting (if provided)
-                self.ratelimit_remaining = \
-                    float(r.headers.get(
-                        'X-RateLimit-Remaining'))
+                self.ratelimit_remaining = float(
+                    r.headers.get("X-RateLimit-Remaining")
+                )
                 self.ratelimit_reset = datetime.fromtimestamp(
-                    int(r.headers.get('X-RateLimit-Reset')), timezone.utc
+                    int(r.headers.get("X-RateLimit-Reset")), timezone.utc
                 ).replace(tzinfo=None)
 
             except (TypeError, ValueError):
@@ -690,9 +708,9 @@ def _fetch(self, url, payload=None):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'Exception received when sending Reddit to {}'.
-                format(url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"Exception received when sending Reddit to {url}"
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             return (False, content)
@@ -701,72 +719,67 @@ def _fetch(self, url, payload=None):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Acquire our targets
-        results['targets'] = NotifyReddit.split_path(results['fullpath'])
+        results["targets"] = NotifyReddit.split_path(results["fullpath"])
 
         # Kind override
-        if 'kind' in results['qsd'] and results['qsd']['kind']:
-            results['kind'] = NotifyReddit.unquote(
-                results['qsd']['kind'].strip().lower())
+        if "kind" in results["qsd"] and results["qsd"]["kind"]:
+            results["kind"] = NotifyReddit.unquote(
+                results["qsd"]["kind"].strip().lower()
+            )
         else:
-            results['kind'] = RedditMessageKind.AUTO
+            results["kind"] = RedditMessageKind.AUTO
 
         # Is an Ad?
-        results['ad'] = \
-            parse_bool(results['qsd'].get('ad', False))
+        results["ad"] = parse_bool(results["qsd"].get("ad", False))
 
         # Get Not Safe For Work (NSFW) Flag
-        results['nsfw'] = \
-            parse_bool(results['qsd'].get('nsfw', False))
+        results["nsfw"] = parse_bool(results["qsd"].get("nsfw", False))
 
         # Send Replies Flag
-        results['replies'] = \
-            parse_bool(results['qsd'].get('replies', True))
+        results["replies"] = parse_bool(results["qsd"].get("replies", True))
 
         # Resubmit Flag
-        results['resubmit'] = \
-            parse_bool(results['qsd'].get('resubmit', False))
+        results["resubmit"] = parse_bool(results["qsd"].get("resubmit", False))
 
         # Is Spoiler Flag
-        results['spoiler'] = \
-            parse_bool(results['qsd'].get('spoiler', False))
+        results["spoiler"] = parse_bool(results["qsd"].get("spoiler", False))
 
-        if 'flair_text' in results['qsd']:
-            results['flair_text'] = \
-                NotifyReddit.unquote(results['qsd']['flair_text'])
+        if "flair_text" in results["qsd"]:
+            results["flair_text"] = NotifyReddit.unquote(
+                results["qsd"]["flair_text"]
+            )
 
-        if 'flair_id' in results['qsd']:
-            results['flair_id'] = \
-                NotifyReddit.unquote(results['qsd']['flair_id'])
+        if "flair_id" in results["qsd"]:
+            results["flair_id"] = NotifyReddit.unquote(
+                results["qsd"]["flair_id"]
+            )
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyReddit.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyReddit.parse_list(results["qsd"]["to"])
 
-        if 'app_id' in results['qsd']:
-            results['app_id'] = \
-                NotifyReddit.unquote(results['qsd']['app_id'])
+        if "app_id" in results["qsd"]:
+            results["app_id"] = NotifyReddit.unquote(results["qsd"]["app_id"])
         else:
             # The App/Bot ID is the hostname
-            results['app_id'] = NotifyReddit.unquote(results['host'])
+            results["app_id"] = NotifyReddit.unquote(results["host"])
 
-        if 'app_secret' in results['qsd']:
-            results['app_secret'] = \
-                NotifyReddit.unquote(results['qsd']['app_secret'])
+        if "app_secret" in results["qsd"]:
+            results["app_secret"] = NotifyReddit.unquote(
+                results["qsd"]["app_secret"]
+            )
         else:
             # The first target identified is the App secret
-            results['app_secret'] = \
-                None if not results['targets'] else results['targets'].pop(0)
+            results["app_secret"] = (
+                None if not results["targets"] else results["targets"].pop(0)
+            )
 
         return results
diff --git a/libs/apprise/plugins/resend.py b/libs/apprise/plugins/resend.py
new file mode 100644
index 0000000000..d433b2d7d7
--- /dev/null
+++ b/libs/apprise/plugins/resend.py
@@ -0,0 +1,605 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# You will need an API Key for this plugin to work.
+# From the Settings -> API Keys you can click "Create API Key" if you don't
+# have one already. The key must have at least the "Mail Send" permission
+# to work.
+#
+# The schema to use the plugin looks like this:
+#    {schema}://{apikey}:{from_addr}
+#
+# Your {from_addr} must be comprissed of your Resend Authenticated
+# Domain.
+
+# Simple API Reference:
+#  - https://resend.com/onboarding
+
+from email.utils import formataddr
+from json import dumps
+import logging
+
+import requests
+
+from .. import exception
+from ..common import NotifyFormat, NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_emails, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
+
+RESEND_HTTP_ERROR_MAP = {
+    200: "Successful request.",
+    400: "Check that the parameters were correct.",
+    401: "The API key used was missing.",
+    403: "The API key used was invalid.",
+    404: "The resource was not found.",
+    429: "The rate limit was exceeded.",
+}
+
+
+class NotifyResend(NotifyBase):
+    """A wrapper for Notify Resend Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = "Resend"
+
+    # The services URL
+    service_url = "https://resend.com"
+
+    # The default secure protocol
+    secure_protocol = "resend"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/resend/"
+
+    # Default to markdown
+    notify_format = NotifyFormat.HTML
+
+    # The default Email API URL to use
+    notify_url = "https://api.resend.com/emails"
+
+    # Support attachments
+    attachment_support = True
+
+    # Allow 300 requests per minute.
+    # 60/300 = 0.2
+    request_rate_per_sec = 0.2
+
+    # The default subject to use if one isn't specified.
+    default_empty_subject = "<no subject>"
+
+    # Define object templates
+    templates = (
+        "{schema}://{apikey}:{from_addr}",
+        "{schema}://{apikey}:{from_addr}/{targets}",
+    )
+
+    # Define our template arguments
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9._-]+$", "i"),
+            },
+            "from_addr": {
+                "name": _("Source Email"),
+                "type": "string",
+                "required": True,
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+        },
+    )
+
+    # Define our template arguments
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "reply": {
+                "name": _("Reply To"),
+                "type": "list:string",
+                "map_to": "reply_to",
+            },
+            "from": {
+                "map_to": "from_addr",
+            },
+            "name": {
+                "name": _("From Name"),
+                "map_to": "from_addr",
+            },
+            "apikey": {
+                "map_to": "apikey",
+            },
+        },
+    )
+
+    def __init__(
+        self, apikey, from_addr, targets=None, cc=None, bcc=None,
+        reply_to=None, **kwargs):
+        """Initialize Notify Resend Object."""
+        super().__init__(**kwargs)
+
+        # API Key (associated with project)
+        self.apikey = validate_regex(
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
+        if not self.apikey:
+            msg = f"An invalid Resend API Key ({apikey}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Acquire Targets (To Emails)
+        self.targets = []
+
+        # Acquire Carbon Copies
+        self.cc = set()
+
+        # Acquire Blind Carbon Copies
+        self.bcc = set()
+
+        # Acquire Reply To
+        self.reply_to = set()
+
+        # For tracking our email -> name lookups
+        self.names = {}
+
+        result = is_email(from_addr)
+        if not result:
+            # Invalid from
+            msg = "Invalid ~From~ email specified: {}".format(from_addr)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # initialize our from address
+        self.from_addr = (
+            result["name"] if result["name"] is not None else False,
+            result["full_email"],
+        )
+
+        # Update our Name if specified
+        self.names[self.from_addr[1]] = (
+            result["name"] if result["name"] else False
+        )
+
+        # Acquire our targets
+        targets = parse_emails(targets)
+        if targets:
+            # Validate recipients (to:) and drop bad ones:
+            for recipient in targets:
+
+                result = is_email(recipient)
+                if result:
+                    self.targets.append(result["full_email"])
+                    continue
+
+                self.logger.warning(
+                    f"Dropped invalid email ({recipient}) specified.",
+                )
+        else:
+            # If our target email list is empty we want to add ourselves to it
+            self.targets.append(self.from_addr[1])
+
+        # Validate recipients (cc:) and drop bad ones:
+        for recipient in parse_emails(cc):
+
+            result = is_email(recipient)
+            if result:
+                self.cc.add(result["full_email"])
+
+                # Index our name (if one exists)
+                self.names[result["full_email"]] = (
+                    result["name"] if result["name"] else False
+                )
+                continue
+
+            self.logger.warning(
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
+            )
+
+        # Validate recipients (bcc:) and drop bad ones:
+        for recipient in parse_emails(bcc):
+
+            result = is_email(recipient)
+            if result:
+                self.bcc.add(result["full_email"])
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
+            )
+
+        # Validate recipients (reply-to:) and drop bad ones:
+        for recipient in parse_emails(reply_to):
+            result = is_email(recipient)
+            if result:
+                self.reply_to.add(result["full_email"])
+
+                # Index our name (if one exists)
+                self.names[result["full_email"]] = (
+                    result["name"] if result["name"] else False
+                )
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Reply To email ({}) specified.".format(
+                    recipient
+                ),
+            )
+
+        return
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol, self.apikey, self.from_addr)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        # Our URL parameters
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        if self.cc:
+            # Handle our Carbon Copy Addresses
+            params["cc"] = ",".join([
+                formataddr(
+                    (self.names.get(e, False), e),
+                    # Swap comma for it's escaped url code (if detected) since
+                    # we're using that as a delimiter
+                    charset="utf-8",
+                ).replace(",", "%2C")
+                for e in self.cc
+            ])
+
+        if len(self.bcc) > 0:
+            # Handle our Blind Carbon Copy Addresses
+            params["bcc"] = ",".join(self.bcc)
+
+        if self.reply_to:
+            # Handle our Reply-To Addresses
+            params["reply"] = ",".join([
+                formataddr(
+                    (self.names.get(e, False), e),
+                    # Swap comma for its escaped url code (if detected) since
+                    # we're using that as a delimiter
+                    charset="utf-8",
+                ).replace(",", "%2C")
+                for e in self.reply_to
+            ])
+
+        # a simple boolean check as to whether we display our target emails
+        # or not
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0] == self.from_addr[1])
+
+        if self.from_addr[0] and self.from_addr[0] != self.app_id:
+            # A custom name was provided
+            params["name"] = self.from_addr[0]
+
+        return "{schema}://{apikey}:{from_addr}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            # never encode email since it plays a huge role in our hostname
+            from_addr=self.from_addr[1],
+            targets=(
+                ""
+                if not has_targets
+                else "/".join(
+                    [NotifyResend.quote(x, safe="@") for x in self.targets]
+                )
+            ),
+            params=NotifyResend.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification."""
+        return len(self.targets)
+
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Resend Notification."""
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.apikey}",
+        }
+
+        # error tracking (used for function return)
+        has_error = False
+
+        # Prepare our from_name
+        self.from_addr[0] \
+            if self.from_addr[0] is not False else self.app_id
+
+        payload_ = {
+            "from": formataddr(self.from_addr, charset="utf-8"),
+            # A subject is a requirement, so if none is specified we must
+            # set a default with at least 1 character or Resend will deny
+            # our request
+            "subject": title if title else self.default_empty_subject,
+            (
+                "text" if self.notify_format == NotifyFormat.TEXT else "html"
+            ): body,
+        }
+
+        if attach and self.attachment_support:
+            attachments = []
+
+            # Send our attachments
+            for no, attachment in enumerate(attach, start=1):
+                # Perform some simple error checking
+                if not attachment:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access Resend attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
+                    return False
+
+                try:
+                    attachments.append({
+                        "content": attachment.base64(),
+                        "filename": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
+                        "type": "application/octet-stream",
+                        "disposition": "attachment",
+                    })
+
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access Resend attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
+                    return False
+
+                self.logger.debug(
+                    "Appending Resend attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
+
+            # Append our attachments to the payload
+            payload_.update({
+                "attachments": attachments,
+            })
+
+        targets = list(self.targets)
+        while len(targets) > 0:
+            target = targets.pop(0)
+
+            # Create a copy of our template
+            payload = payload_.copy()
+
+            # unique cc/bcc list management
+            cc = self.cc - self.bcc - {target}
+            bcc = self.bcc - {target}
+
+            # handle our reply to
+            reply_to = self.reply_to - {target}
+
+            # Format our cc addresses to support the Name field
+            cc = [
+                formataddr((self.names.get(addr, False), addr),
+                           charset="utf-8")
+                for addr in cc
+            ]
+
+            # Format our reply-to addresses to support the Name field
+            reply_to = [
+                formataddr((self.names.get(addr, False), addr),
+                           charset="utf-8")
+                for addr in reply_to
+            ]
+
+            # Set our target
+            payload["to"] = target
+
+            if cc:
+                payload["cc"] = cc
+
+            if len(bcc):
+                payload["bcc"] = list(bcc)
+
+            if reply_to:
+                payload["reply_to"] = reply_to
+
+            # Some Debug Logging
+            if self.logger.isEnabledFor(logging.DEBUG):
+                # Due to attachments; output can be quite heavy and io
+                # intensive.
+                # To accommodate this, we only show our debug payload
+                # information if required.
+                self.logger.debug(
+                    "Resend POST URL:"
+                    f" {self.notify_url} "
+                    f"(cert_verify={self.verify_certificate!r})"
+                )
+                self.logger.debug(
+                    "Resend Payload: %s", sanitize_payload(payload))
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    self.notify_url,
+                    data=dumps(payload),
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+                if r.status_code not in (
+                    requests.codes.ok,
+                    requests.codes.accepted,
+                ):
+                    # We had a problem
+                    status_str = NotifyResend.http_response_code_lookup(
+                        r.status_code, RESEND_HTTP_ERROR_MAP
+                    )
+
+                    self.logger.warning(
+                        "Failed to send Resend notification to {}: "
+                        "{}{}error={}.".format(
+                            target,
+                            status_str,
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
+
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                else:
+                    self.logger.info(f"Sent Resend notification to {target}.")
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occurred sending Resend "
+                    f"notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
+
+                # Mark our failure
+                has_error = True
+                continue
+
+        return not has_error
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Our URL looks like this:
+        #    {schema}://{apikey}:{from_addr}/{targets}
+        #
+        # which actually equates to:
+        #    {schema}://{user}:{password}@{host}/{email1}/{email2}/etc..
+        #                 ^       ^         ^
+        #                 |       |         |
+        #              apikey     -from addr-
+
+        # Prepare our API Key
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = \
+                NotifyResend.unquote(results["qsd"]["apikey"])
+
+        else:
+            results["apikey"] = NotifyResend.unquote(results["user"])
+
+        # Our Targets
+        results["targets"] = []
+
+        # Attempt to detect 'from' email address
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["from_addr"] = NotifyResend.unquote(results["qsd"]["from"])
+
+            if results.get("host"):
+                results["targets"].append(
+                    NotifyResend.unquote(results["host"]))
+
+        else:
+            # Prepare our From Email Address
+            results["from_addr"] = "{}@{}".format(
+                NotifyResend.unquote(
+                    results["password"]
+                    if results["password"] else results["user"]),
+                NotifyResend.unquote(results["host"]),
+            )
+
+        if "name" in results["qsd"] and len(results["qsd"]["name"]):
+            results["from_addr"] = formataddr((
+                NotifyResend.unquote(results["qsd"]["name"]),
+                results["from_addr"]), charset="utf-8")
+
+        # Acquire our targets
+        results["targets"].extend(NotifyResend.split_path(results["fullpath"]))
+
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyResend.parse_list(results["qsd"]["to"])
+
+        # Handle Carbon Copy Addresses
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = NotifyResend.parse_list(results["qsd"]["cc"])
+
+        # Handle Blind Carbon Copy Addresses
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = NotifyResend.parse_list(results["qsd"]["bcc"])
+
+        # Handle Reply To Addresses
+        if "reply" in results["qsd"] and len(results["qsd"]["reply"]):
+            results["reply_to"] = results["qsd"]["reply"]
+
+        return results
diff --git a/libs/apprise/plugins/revolt.py b/libs/apprise/plugins/revolt.py
index 59836a38ff..23b09a3d27 100644
--- a/libs/apprise/plugins/revolt.py
+++ b/libs/apprise/plugins/revolt.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -36,39 +35,34 @@
 #    - https://api.revolt.chat/swagger/index.html
 #
 
-import requests
+from datetime import datetime, timedelta, timezone
 from json import dumps, loads
-from datetime import timedelta
-from datetime import datetime
-from datetime import timezone
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import validate_regex, parse_list
+import requests
+
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
 
 
 class NotifyRevolt(NotifyBase):
-    """
-    A wrapper for Revolt Notifications
+    """A wrapper for Revolt Notifications."""
 
-    """
     # The default descriptive name associated with the Notification
-    service_name = 'Revolt'
+    service_name = "Revolt"
 
     # The services URL
-    service_url = 'https://revolt.chat/'
+    service_url = "https://revolt.chat/"
 
     # The default secure protocol
-    secure_protocol = 'revolt'
+    secure_protocol = "revolt"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_revolt'
+    setup_url = "https://appriseit.com/services/revolt/"
 
     # Revolt Channel Message
-    notify_url = 'https://api.revolt.chat/'
+    notify_url = "https://api.revolt.chat/"
 
     # Revolt supports attachments but doesn't support it here (for now)
     attachment_support = False
@@ -94,63 +88,62 @@ class NotifyRevolt(NotifyBase):
     title_maxlen = 100
 
     # Define object templates
-    templates = (
-        '{schema}://{bot_token}/{targets}',
-    )
+    templates = ("{schema}://{bot_token}/{targets}",)
 
     # Defile out template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'bot_token': {
-            'name': _('Bot Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "bot_token": {
+                "name": _("Bot Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_channel": {
+                "name": _("Channel ID"),
+                "type": "string",
+                "map_to": "targets",
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+                "private": True,
+                "required": True,
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_channel': {
-            'name': _('Channel ID'),
-            'type': 'string',
-            'map_to': 'targets',
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
-            'private': True,
-            'required': True,
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'channel': {
-            'alias_of': 'targets',
-        },
-        'bot_token': {
-            'alias_of': 'bot_token',
-        },
-        'icon_url': {
-            'name': _('Icon URL'),
-            'type': 'string'
-        },
-        'url': {
-            'name': _('Embed URL'),
-            'type': 'string',
-            'map_to': 'link',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "channel": {
+                "alias_of": "targets",
+            },
+            "bot_token": {
+                "alias_of": "bot_token",
+            },
+            "icon_url": {"name": _("Icon URL"), "type": "string"},
+            "url": {
+                "name": _("Embed URL"),
+                "type": "string",
+                "map_to": "link",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, bot_token, targets, icon_url=None, link=None,
-                 **kwargs):
+    def __init__(self, bot_token, targets, icon_url=None, link=None, **kwargs):
         super().__init__(**kwargs)
 
         # Bot Token
         self.bot_token = validate_regex(bot_token)
         if not self.bot_token:
-            msg = 'An invalid Revolt Bot Token ' \
-                '({}) was specified.'.format(bot_token)
+            msg = f"An invalid Revolt Bot Token ({bot_token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -158,12 +151,12 @@ def __init__(self, bot_token, targets, icon_url=None, link=None,
         self.targets = []
         for target in parse_list(targets):
             results = validate_regex(
-                target, *self.template_tokens['target_channel']['regex'])
+                target, *self.template_tokens["target_channel"]["regex"]
+            )
 
             if not results:
                 self.logger.warning(
-                    'Dropped invalid Revolt channel ({}) specified.'
-                    .format(target),
+                    f"Dropped invalid Revolt channel ({target}) specified.",
                 )
                 continue
 
@@ -184,46 +177,42 @@ def __init__(self, bot_token, targets, icon_url=None, link=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Revolt Notification
-
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Revolt Notification."""
 
         if len(self.targets) == 0:
-            self.logger.warning('There were not Revolt channels to notify.')
+            self.logger.warning("There were not Revolt channels to notify.")
             return False
 
         payload = {}
 
         # Acquire image_url
-        image_url = self.icon_url \
-            if self.icon_url else self.image_url(notify_type)
+        image_url = (
+            self.icon_url if self.icon_url else self.image_url(notify_type)
+        )
 
         if self.notify_format == NotifyFormat.MARKDOWN:
-            payload['embeds'] = [{
-                'title': None if not title else title[0:self.title_maxlen],
-                'description': body,
-
+            payload["embeds"] = [{
+                "title": None if not title else title[0 : self.title_maxlen],
+                "description": body,
                 # Our color associated with our notification
-                'colour': self.color(notify_type),
-                'replies': None
+                "colour": self.color(notify_type),
+                "replies": None,
             }]
 
             if image_url:
-                payload['embeds'][0]['icon_url'] = image_url
+                payload["embeds"][0]["icon_url"] = image_url
 
             if self.link:
-                payload['embeds'][0]['url'] = self.link
+                payload["embeds"][0]["url"] = self.link
 
         else:
-            payload['content'] = \
-                body if not title else "{}\n{}".format(title, body)
+            payload["content"] = body if not title else f"{title}\n{body}"
 
         has_error = False
         channel_ids = list(self.targets)
         for channel_id in channel_ids:
-            postokay, response = self._send(payload, channel_id)
+            postokay, _response = self._send(payload, channel_id)
             if not postokay:
                 # Failed to send message
                 has_error = True
@@ -231,43 +220,39 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return not has_error
 
     def _send(self, payload, channel_id, retries=1, **kwargs):
-        """
-        Wrapper to the requests (post) object
-
-        """
+        """Wrapper to the requests (post) object."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'X-Bot-Token': self.bot_token,
-            'Content-Type': 'application/json; charset=utf-8',
-            'Accept': 'application/json; charset=utf-8',
+            "User-Agent": self.app_id,
+            "X-Bot-Token": self.bot_token,
+            "Content-Type": "application/json; charset=utf-8",
+            "Accept": "application/json; charset=utf-8",
         }
 
-        notify_url = '{0}channels/{1}/messages'.format(
-            self.notify_url,
-            channel_id
-        )
+        notify_url = f"{self.notify_url}channels/{channel_id}/messages"
 
-        self.logger.debug('Revolt POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate
-        ))
-        self.logger.debug('Revolt Payload: %s' % str(payload))
+        self.logger.debug(
+            "Revolt POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Revolt Payload: {payload!s}")
 
         # By default set wait to None
         wait = None
 
         now = datetime.now(timezone.utc).replace(tzinfo=None)
-        if self.ratelimit_remaining <= 0.0:
+        if self.ratelimit_remaining <= 0.0 and now < self.ratelimit_reset:
             # Determine how long we should wait for or if we should wait at
             # all. This isn't fool-proof because we can't be sure the client
             # time (calling this script) is completely synced up with the
             # Discord server.  One would hope we're on NTP and our clocks are
-            # the same allowing this to role smoothly:
-            if now < self.ratelimit_reset:
-                # We need to throttle for the difference in seconds
-                wait = abs(
-                    (self.ratelimit_reset - now + self.clock_skew)
-                    .total_seconds())
+            # the same allowing this to role smoothly and set our throttle
+            # accordingly
+            wait = abs(
+                (
+                    self.ratelimit_reset - now + self.clock_skew
+                ).total_seconds()
+            )
 
         # Default content response object
         content = {}
@@ -281,7 +266,7 @@ def _send(self, payload, channel_id, retries=1, **kwargs):
                 data=dumps(payload),
                 headers=headers,
                 verify=self.verify_certificate,
-                timeout=self.request_timeout
+                timeout=self.request_timeout,
             )
 
             try:
@@ -296,11 +281,14 @@ def _send(self, payload, channel_id, retries=1, **kwargs):
             # Handle rate limiting (if specified)
             try:
                 # Store our rate limiting (if provided)
-                self.ratelimit_remaining = \
-                    int(r.headers.get('X-RateLimit-Remaining'))
-                self.ratelimit_reset = \
-                    now + timedelta(seconds=(int(
-                        r.headers.get('X-RateLimit-Reset-After')) / 1000))
+                self.ratelimit_remaining = int(
+                    r.headers.get("X-RateLimit-Remaining")
+                )
+                self.ratelimit_reset = now + timedelta(
+                    seconds=(
+                        int(r.headers.get("X-RateLimit-Reset-After")) / 1000
+                    )
+                )
 
             except (TypeError, ValueError):
                 # This is returned if we could not retrieve this
@@ -308,138 +296,148 @@ def _send(self, payload, channel_id, retries=1, **kwargs):
                 pass
 
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
 
                 # Some details to debug by
-                self.logger.debug('Response Details:\r\n{}'.format(
-                    content if content else r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r",
+                    content if content else (r.content or b"")[:2000])
 
                 # We had a problem
-                status_str = \
-                    NotifyBase.http_response_code_lookup(r.status_code)
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Revolt request limit reached; '
-                    'instructed to throttle for %.3fs',
-                    abs((self.ratelimit_reset - now + self.clock_skew)
-                        .total_seconds()))
+                    "Revolt request limit reached; "
+                    "instructed to throttle for %.3fs",
+                    abs(
+                        (
+                            self.ratelimit_reset - now + self.clock_skew
+                        ).total_seconds()
+                    ),
+                )
 
-                if r.status_code == requests.codes.too_many_requests \
-                        and retries > 0:
+                if (
+                    r.status_code == requests.codes.too_many_requests
+                    and retries > 0
+                ):
 
                     # Try again
                     return self._send(
-                        payload=payload, channel_id=channel_id,
-                        retries=retries - 1, **kwargs)
+                        payload=payload,
+                        channel_id=channel_id,
+                        retries=retries - 1,
+                        **kwargs,
+                    )
 
                 self.logger.warning(
-                    'Failed to send to Revolt notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send to Revolt notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 # Return; we're done
                 return (False, content)
 
             else:
-                self.logger.info('Sent Revolt notification.')
+                self.logger.info("Sent Revolt notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred posting to Revolt.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred posting to Revolt."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return (False, content)
 
         return (True, content)
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.bot_token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
 
         if self.icon_url:
-            params['icon_url'] = self.icon_url
+            params["icon_url"] = self.icon_url
 
         if self.link:
-            params['url'] = self.link
+            params["url"] = self.link
 
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{bot_token}/{targets}/?{params}'.format(
+        return "{schema}://{bot_token}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            bot_token=self.pprint(self.bot_token, privacy, safe=''),
-            targets='/'.join(
-                [self.pprint(x, privacy, safe='') for x in self.targets]),
+            bot_token=self.pprint(self.bot_token, privacy, safe=""),
+            targets="/".join(
+                [self.pprint(x, privacy, safe="") for x in self.targets]
+            ),
             params=NotifyRevolt.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return 1 if not self.targets else len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Store our bot token
-        bot_token = NotifyRevolt.unquote(results['host'])
+        bot_token = NotifyRevolt.unquote(results["host"])
 
         # Now fetch the Channel IDs
-        targets = NotifyRevolt.split_path(results['fullpath'])
+        targets = NotifyRevolt.split_path(results["fullpath"])
 
-        results['bot_token'] = bot_token
-        results['targets'] = targets
+        results["bot_token"] = bot_token
+        results["targets"] = targets
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyRevolt.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyRevolt.parse_list(results["qsd"]["to"])
 
         # Support channel id on the URL string (if specified)
-        if 'channel' in results['qsd']:
-            results['targets'] += \
-                NotifyRevolt.parse_list(results['qsd']['channel'])
+        if "channel" in results["qsd"]:
+            results["targets"] += NotifyRevolt.parse_list(
+                results["qsd"]["channel"]
+            )
 
         # Support bot token on the URL string (if specified)
-        if 'bot_token' in results['qsd']:
-            results['bot_token'] = \
-                NotifyRevolt.unquote(results['qsd']['bot_token'])
+        if "bot_token" in results["qsd"]:
+            results["bot_token"] = NotifyRevolt.unquote(
+                results["qsd"]["bot_token"]
+            )
 
-        if 'icon_url' in results['qsd']:
-            results['icon_url'] = \
-                NotifyRevolt.unquote(results['qsd']['icon_url'])
+        if "icon_url" in results["qsd"]:
+            results["icon_url"] = NotifyRevolt.unquote(
+                results["qsd"]["icon_url"]
+            )
 
-        if 'url' in results['qsd']:
-            results['link'] = NotifyRevolt.unquote(results['qsd']['url'])
+        if "url" in results["qsd"]:
+            results["link"] = NotifyRevolt.unquote(results["qsd"]["url"])
 
-        if 'format' not in results['qsd'] and (
-                'url' in results or 'icon_url' in results):
+        if "format" not in results["qsd"] and (
+            "url" in results or "icon_url" in results
+        ):
             # Markdown is implied
-            results['format'] = NotifyFormat.MARKDOWN
+            results["format"] = NotifyFormat.MARKDOWN
 
         return results
diff --git a/libs/apprise/plugins/rocketchat.py b/libs/apprise/plugins/rocketchat.py
index 35e1678343..2d248a62a8 100644
--- a/libs/apprise/plugins/rocketchat.py
+++ b/libs/apprise/plugins/rocketchat.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,35 +25,32 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from itertools import chain
+from json import dumps, loads
 import re
+
 import requests
-from json import loads
-from json import dumps
-from itertools import chain
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyImageSize
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list
+from .base import NotifyBase
 
-IS_CHANNEL = re.compile(r'^#(?P<name>[A-Za-z0-9_-]+)$')
-IS_USER = re.compile(r'^@(?P<name>[A-Za-z0-9._-]+)$')
-IS_ROOM_ID = re.compile(r'^(?P<name>[A-Za-z0-9]+)$')
+IS_CHANNEL = re.compile(r"^#(?P<name>[A-Za-z0-9_-]+)$")
+IS_USER = re.compile(r"^@(?P<name>[A-Za-z0-9._-]+)$")
+IS_ROOM_ID = re.compile(r"^(?P<name>[A-Za-z0-9]+)$")
 
 # Extend HTTP Error Messages
 RC_HTTP_ERROR_MAP = {
-    400: 'Channel/RoomId is wrong format, or missing from server.',
-    401: 'Authentication tokens provided is invalid or missing.',
+    400: "Channel/RoomId is wrong format, or missing from server.",
+    401: "Authentication tokens provided is invalid or missing.",
 }
 
 
 class RocketChatAuthMode:
-    """
-    The Chat Authentication mode is detected
-    """
+    """The Chat Authentication mode is detected."""
+
     # providing a webhook
     WEBHOOK = "webhook"
 
@@ -74,24 +70,22 @@ class RocketChatAuthMode:
 
 
 class NotifyRocketChat(NotifyBase):
-    """
-    A wrapper for Notify Rocket.Chat Notifications
-    """
+    """A wrapper for Notify Rocket.Chat Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Rocket.Chat'
+    service_name = "Rocket.Chat"
 
     # The services URL
-    service_url = 'https://rocket.chat/'
+    service_url = "https://rocket.chat/"
 
     # The default protocol
-    protocol = 'rocket'
+    protocol = "rocket"
 
     # The default secure protocol
-    secure_protocol = 'rockets'
+    secure_protocol = "rockets"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_rocketchat'
+    setup_url = "https://appriseit.com/services/rocketchat/"
 
     # Allows the user to specify the NotifyImageSize object; this is supported
     # through the webhook
@@ -108,114 +102,119 @@ class NotifyRocketChat(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}:{password}@{host}:{port}/{targets}',
-        '{schema}://{user}:{password}@{host}/{targets}',
-        '{schema}://{user}:{token}@{host}:{port}/{targets}',
-        '{schema}://{user}:{token}@{host}/{targets}',
-        '{schema}://{webhook}@{host}',
-        '{schema}://{webhook}@{host}:{port}',
-        '{schema}://{webhook}@{host}/{targets}',
-        '{schema}://{webhook}@{host}:{port}/{targets}',
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{token}@{host}:{port}/{targets}",
+        "{schema}://{user}:{token}@{host}/{targets}",
+        "{schema}://{webhook}@{host}",
+        "{schema}://{webhook}@{host}:{port}",
+        "{schema}://{webhook}@{host}/{targets}",
+        "{schema}://{webhook}@{host}:{port}/{targets}",
     )
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'token': {
-            'name': _('API Token'),
-            'map_to': 'password',
-            'private': True,
-        },
-        'webhook': {
-            'name': _('Webhook'),
-            'type': 'string',
-        },
-        'target_channel': {
-            'name': _('Target Channel'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'target_room': {
-            'name': _('Target Room ID'),
-            'type': 'string',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "token": {
+                "name": _("API Token"),
+                "map_to": "password",
+                "private": True,
+            },
+            "webhook": {
+                "name": _("Webhook"),
+                "type": "string",
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_room": {
+                "name": _("Target Room ID"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'mode': {
-            'name': _('Webhook Mode'),
-            'type': 'choice:string',
-            'values': ROCKETCHAT_AUTH_MODES,
-        },
-        'avatar': {
-            'name': _('Use Avatar'),
-            'type': 'bool',
-            'default': False,
-        },
-        'webhook': {
-            'alias_of': 'webhook',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "mode": {
+                "name": _("Webhook Mode"),
+                "type": "choice:string",
+                "values": ROCKETCHAT_AUTH_MODES,
+            },
+            "avatar": {
+                "name": _("Use Avatar"),
+                "type": "bool",
+                "default": False,
+            },
+            "webhook": {
+                "alias_of": "webhook",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
         },
-        'to': {
-            'alias_of': 'targets',
-        },
-    })
+    )
 
-    def __init__(self, webhook=None, targets=None, mode=None, avatar=None,
-                 **kwargs):
-        """
-        Initialize Notify Rocket.Chat Object
-        """
+    def __init__(
+        self, webhook=None, targets=None, mode=None, avatar=None, **kwargs
+    ):
+        """Initialize Notify Rocket.Chat Object."""
         super().__init__(**kwargs)
 
         # Set our schema
-        self.schema = 'https' if self.secure else 'http'
+        self.schema = "https" if self.secure else "http"
 
         # Prepare our URL
-        self.api_url = '%s://%s' % (self.schema, self.host)
+        self.api_url = f"{self.schema}://{self.host}"
 
         if isinstance(self.port, int):
-            self.api_url += ':%d' % self.port
+            self.api_url += f":{self.port}"
 
         # Initialize channels list
-        self.channels = list()
+        self.channels = []
 
         # Initialize room list
-        self.rooms = list()
+        self.rooms = []
 
         # Initialize user list (webhook only)
-        self.users = list()
+        self.users = []
 
         # Assign our webhook (if defined)
         self.webhook = webhook
@@ -225,13 +224,10 @@ def __init__(self, webhook=None, targets=None, mode=None, avatar=None,
         self.headers = {}
 
         # Authentication mode
-        self.mode = None \
-            if not isinstance(mode, str) \
-            else mode.lower()
+        self.mode = None if not isinstance(mode, str) else mode.lower()
 
         if self.mode and self.mode not in ROCKETCHAT_AUTH_MODES:
-            msg = 'The authentication mode specified ({}) is invalid.'.format(
-                mode)
+            msg = f"The authentication mode specified ({mode}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -246,27 +242,32 @@ def __init__(self, webhook=None, targets=None, mode=None, avatar=None,
                 self.mode = RocketChatAuthMode.BASIC
 
             self.logger.debug(
-                "Auto-Detected Rocketchat Auth Mode: %s", self.mode)
+                "Auto-Detected Rocketchat Auth Mode: %s", self.mode
+            )
 
-        if self.mode in (RocketChatAuthMode.BASIC, RocketChatAuthMode.TOKEN) \
-                and not (self.user and self.password):
+        if self.mode in (
+            RocketChatAuthMode.BASIC,
+            RocketChatAuthMode.TOKEN,
+        ) and not (self.user and self.password):
             # Username & Password is required for Rocket Chat to work
-            msg = 'No Rocket.Chat {} was specified.'.format(
-                'user/pass combo' if self.mode == RocketChatAuthMode.BASIC else
-                'user/apikey')
+            msg = "No Rocket.Chat {} was specified.".format(
+                "user/pass combo"
+                if self.mode == RocketChatAuthMode.BASIC
+                else "user/apikey"
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         elif self.mode == RocketChatAuthMode.WEBHOOK and not self.webhook:
-            msg = 'No Rocket.Chat Incoming Webhook was specified.'
+            msg = "No Rocket.Chat Incoming Webhook was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         if self.mode == RocketChatAuthMode.TOKEN:
             # Set our headers for further communication
             self.headers.update({
-                'X-User-Id': self.user,
-                'X-Auth-Token': self.password,
+                "X-User-Id": self.user,
+                "X-Auth-Token": self.password,
             })
 
         # Validate recipients and drop bad ones:
@@ -274,29 +275,31 @@ def __init__(self, webhook=None, targets=None, mode=None, avatar=None,
             result = IS_CHANNEL.match(recipient)
             if result:
                 # store valid device
-                self.channels.append(result.group('name'))
+                self.channels.append(result.group("name"))
                 continue
 
             result = IS_ROOM_ID.match(recipient)
             if result:
                 # store valid room
-                self.rooms.append(result.group('name'))
+                self.rooms.append(result.group("name"))
                 continue
 
             result = IS_USER.match(recipient)
             if result:
                 # store valid room
-                self.users.append(result.group('name'))
+                self.users.append(result.group("name"))
                 continue
 
             self.logger.warning(
-                'Dropped invalid channel/room/user '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid channel/room/user ({recipient}) specified.",
             )
 
-        if self.mode == RocketChatAuthMode.BASIC and \
-                len(self.rooms) == 0 and len(self.channels) == 0:
-            msg = 'No Rocket.Chat room and/or channels specified to notify.'
+        if (
+            self.mode == RocketChatAuthMode.BASIC
+            and len(self.rooms) == 0
+            and len(self.channels) == 0
+        ):
+            msg = "No Rocket.Chat room and/or channels specified to notify."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -320,30 +323,31 @@ def __init__(self, webhook=None, targets=None, mode=None, avatar=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
             self.host,
             self.port if self.port else (443 if self.secure else 80),
             self.user,
-            self.password if self.mode in (
-                RocketChatAuthMode.BASIC, RocketChatAuthMode.TOKEN)
-            else self.webhook,
+            (
+                self.password
+                if self.mode
+                in (RocketChatAuthMode.BASIC, RocketChatAuthMode.TOKEN)
+                else self.webhook
+            ),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'avatar': 'yes' if self.avatar else 'no',
-            'mode': self.mode,
+            "avatar": "yes" if self.avatar else "no",
+            "mode": self.mode,
         }
 
         # Extend our parameters
@@ -351,83 +355,91 @@ def url(self, privacy=False, *args, **kwargs):
 
         # Determine Authentication
         if self.mode in (RocketChatAuthMode.BASIC, RocketChatAuthMode.TOKEN):
-            auth = '{user}:{password}@'.format(
-                user=NotifyRocketChat.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyRocketChat.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
 
         else:
-            auth = '{user}{webhook}@'.format(
-                user='{}:'.format(NotifyRocketChat.quote(self.user, safe=''))
-                if self.user else '',
-                webhook=self.pprint(self.webhook, privacy,
-                                    mode=PrivacyMode.Secret, safe=''),
+            auth = "{user}{webhook}@".format(
+                user=(
+                    "{}:".format(NotifyRocketChat.quote(self.user, safe=""))
+                    if self.user
+                    else ""
+                ),
+                webhook=self.pprint(
+                    self.webhook, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}/{targets}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{targets}/?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            targets='/'.join(
-                [NotifyRocketChat.quote(x, safe='@#') for x in chain(
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets="/".join([
+                NotifyRocketChat.quote(x, safe="@#")
+                for x in chain(
                     # Channels are prefixed with a pound/hashtag symbol
-                    ['#{}'.format(x) for x in self.channels],
+                    [f"#{x}" for x in self.channels],
                     # Rooms are as is
                     self.rooms,
                     # Users
-                    ['@{}'.format(x) for x in self.users],
-                )]),
+                    [f"@{x}" for x in self.users],
+                )
+            ]),
             params=NotifyRocketChat.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.channels) + len(self.rooms) + len(self.users)
         return targets if targets > 0 else 1
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        wrapper to _send since we can alert more then one channel
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Wrapper to _send since we can alert more then one channel."""
 
         # Call the _send_ function applicable to whatever mode we're in
         # - calls _send_webhook_notification if the mode variable is set
         # - calls _send_basic_notification if the mode variable is not set
-        return getattr(self, '_send_{}_notification'.format(
-            RocketChatAuthMode.WEBHOOK
-            if self.mode == RocketChatAuthMode.WEBHOOK
-            else RocketChatAuthMode.BASIC))(
-                body=body, title=title, notify_type=notify_type, **kwargs)
-
-    def _send_webhook_notification(self, body, title='',
-                                   notify_type=NotifyType.INFO, **kwargs):
-        """
-        Sends a webhook notification
-        """
+        return getattr(
+            self,
+            "_send_{}_notification".format(
+                RocketChatAuthMode.WEBHOOK
+                if self.mode == RocketChatAuthMode.WEBHOOK
+                else RocketChatAuthMode.BASIC
+            ),
+        )(body=body, title=title, notify_type=notify_type, **kwargs)
+
+    def _send_webhook_notification(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """Sends a webhook notification."""
 
         # Our payload object
         payload = self._payload(body, title, notify_type)
 
         # Assemble our webhook URL
-        path = 'hooks/{}'.format(self.webhook)
+        path = f"hooks/{self.webhook}"
 
         # Build our list of channels/rooms/users (if any identified)
-        targets = ['@{}'.format(u) for u in self.users]
-        targets.extend(['#{}'.format(c) for c in self.channels])
-        targets.extend(['{}'.format(r) for r in self.rooms])
+        targets = [f"@{u}" for u in self.users]
+        targets.extend([f"#{c}" for c in self.channels])
+        targets.extend([f"{r}" for r in self.rooms])
 
         if len(targets) == 0:
             # We can take an early exit
             return self._send(
-                payload, notify_type=notify_type, path=path, **kwargs)
+                payload, notify_type=notify_type, path=path, **kwargs
+            )
 
         # Otherwise we want to iterate over each of the targets
 
@@ -439,43 +451,43 @@ def _send_webhook_notification(self, body, title='',
             target = targets.pop(0)
 
             # Assign our channel/room/user
-            payload['channel'] = target
+            payload["channel"] = target
 
             if not self._send(
-                    payload, notify_type=notify_type, path=path, **kwargs):
+                payload, notify_type=notify_type, path=path, **kwargs
+            ):
 
                 # toggle flag
                 has_error = True
 
         return not has_error
 
-    def _send_basic_notification(self, body, title='',
-                                 notify_type=NotifyType.INFO, **kwargs):
-        """
-        Authenticates with the server using a user/pass combo for
-        notifications.
-        """
+    def _send_basic_notification(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """Authenticates with the server using a user/pass combo for
+        notifications."""
         # Track whether we authenticated okay
 
         if self.mode == RocketChatAuthMode.BASIC and not self.login():
             return False
 
         # prepare JSON Object
-        _payload = self._payload(body, title, notify_type)
+        payload_ = self._payload(body, title, notify_type)
 
         # Initiaize our error tracking
         has_error = False
 
         # Build our list of channels/rooms/users (if any identified)
-        channels = ['@{}'.format(u) for u in self.users]
-        channels.extend(['#{}'.format(c) for c in self.channels])
+        channels = [f"@{u}" for u in self.users]
+        channels.extend([f"#{c}" for c in self.channels])
 
         # Create a copy of our channels to notify against
-        payload = _payload.copy()
+        payload = payload_.copy()
         while len(channels) > 0:
             # Get Channel
             channel = channels.pop(0)
-            payload['channel'] = channel
+            payload["channel"] = channel
 
             if not self._send(payload, notify_type=notify_type, **kwargs):
 
@@ -484,11 +496,11 @@ def _send_basic_notification(self, body, title='',
 
         # Create a copy of our room id's to notify against
         rooms = list(self.rooms)
-        payload = _payload.copy()
+        payload = payload_.copy()
         while len(rooms):
             # Get Room
             room = rooms.pop(0)
-            payload['roomId'] = room
+            payload["roomId"] = room
 
             if not self._send(payload, notify_type=notify_type, **kwargs):
 
@@ -501,10 +513,8 @@ def _send_basic_notification(self, body, title='',
 
         return not has_error
 
-    def _payload(self, body, title='', notify_type=NotifyType.INFO):
-        """
-        Prepares a payload object
-        """
+    def _payload(self, body, title="", notify_type=NotifyType.INFO):
+        """Prepares a payload object."""
         # prepare JSON Object
         payload = {
             "text": body,
@@ -513,29 +523,30 @@ def _payload(self, body, title='', notify_type=NotifyType.INFO):
         # apply our images if they're set to be displayed
         image_url = self.image_url(notify_type)
         if self.avatar and image_url:
-            payload['avatar'] = image_url
+            payload["avatar"] = image_url
 
         return payload
 
-    def _send(self, payload, notify_type, path='api/v1/chat.postMessage',
-              **kwargs):
-        """
-        Perform Notify Rocket.Chat Notification
-        """
+    def _send(
+        self, payload, notify_type, path="api/v1/chat.postMessage", **kwargs
+    ):
+        """Perform Notify Rocket.Chat Notification."""
 
-        api_url = '{}/{}'.format(self.api_url, path)
+        api_url = f"{self.api_url}/{path}"
 
-        self.logger.debug('Rocket.Chat POST URL: %s (cert_verify=%r)' % (
-            api_url, self.verify_certificate))
-        self.logger.debug('Rocket.Chat Payload: %s' % str(payload))
+        self.logger.debug(
+            "Rocket.Chat POST URL:"
+            f" {api_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Rocket.Chat Payload: {payload!s}")
 
         # Copy our existing headers
         headers = self.headers.copy()
 
         # Apply minimum headers
         headers.update({
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         })
 
         # Always call throttle before any remote server i/o is made
@@ -551,32 +562,35 @@ def _send(self, payload, notify_type, path='api/v1/chat.postMessage',
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyRocketChat.http_response_code_lookup(
-                        r.status_code, RC_HTTP_ERROR_MAP)
+                status_str = NotifyRocketChat.http_response_code_lookup(
+                    r.status_code, RC_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Rocket.Chat {}:notification: '
-                    '{}{}error={}.'.format(
+                    "Failed to send Rocket.Chat {}:notification: "
+                    "{}{}error={}.".format(
                         self.mode,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info(
-                    'Sent Rocket.Chat {}:notification.'.format(self.mode))
+                self.logger.info(f"Sent Rocket.Chat {self.mode}:notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Rocket.Chat '
-                '{}:notification.'.format(self.mode))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Rocket.Chat "
+                f"{self.mode}:notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -584,17 +598,14 @@ def _send(self, payload, notify_type, path='api/v1/chat.postMessage',
         return True
 
     def login(self):
-        """
-        login to our server
-
-        """
+        """Login to our server."""
 
         payload = {
-            'username': self.user,
-            'password': self.password,
+            "username": self.user,
+            "password": self.password,
         }
 
-        api_url = '{}/{}'.format(self.api_url, 'api/v1/login')
+        api_url = "{}/{}".format(self.api_url, "api/v1/login")
 
         try:
             r = requests.post(
@@ -605,37 +616,41 @@ def login(self):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyRocketChat.http_response_code_lookup(
-                        r.status_code, RC_HTTP_ERROR_MAP)
+                status_str = NotifyRocketChat.http_response_code_lookup(
+                    r.status_code, RC_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to authenticate {} with Rocket.Chat: '
-                    '{}{}error={}.'.format(
+                    "Failed to authenticate {} with Rocket.Chat: "
+                    "{}{}error={}.".format(
                         self.user,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.debug('Rocket.Chat authentication successful')
+                self.logger.debug("Rocket.Chat authentication successful")
                 response = loads(r.content)
-                if response.get('status') != "success":
+                if response.get("status") != "success":
                     self.logger.warning(
-                        'Could not authenticate {} with Rocket.Chat.'.format(
-                            self.user))
+                        f"Could not authenticate {self.user} with Rocket.Chat."
+                    )
                     return False
 
                 # Set our headers for further communication
-                self.headers['X-Auth-Token'] = response.get(
-                    'data', {'authToken': None}).get('authToken')
-                self.headers['X-User-Id'] = response.get(
-                    'data', {'userId': None}).get('userId')
+                self.headers["X-Auth-Token"] = response.get(
+                    "data", {"authToken": None}
+                ).get("authToken")
+                self.headers["X-User-Id"] = response.get(
+                    "data", {"userId": None}
+                ).get("userId")
 
         except (AttributeError, TypeError, ValueError):
             # Our response was not the JSON type we had expected it to be
@@ -643,25 +658,25 @@ def login(self):
             # - TypeError = r.content is None
             # - AttributeError = r is None
             self.logger.warning(
-                'A commuication error occurred authenticating {} on '
-                'Rocket.Chat.'.format(self.user))
+                f"A commuication error occurred authenticating {self.user} on "
+                "Rocket.Chat."
+            )
             return False
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A connection error occurred authenticating {} on '
-                'Rocket.Chat.'.format(self.user))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"A connection error occurred authenticating {self.user} on "
+                "Rocket.Chat."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     def logout(self):
-        """
-        logout of our server
-        """
+        """Logout of our server."""
 
-        api_url = '{}/{}'.format(self.api_url, 'api/v1/logout')
+        api_url = "{}/{}".format(self.api_url, "api/v1/logout")
 
         try:
             r = requests.post(
@@ -672,44 +687,44 @@ def logout(self):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyRocketChat.http_response_code_lookup(
-                        r.status_code, RC_HTTP_ERROR_MAP)
+                status_str = NotifyRocketChat.http_response_code_lookup(
+                    r.status_code, RC_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to logoff {} from Rocket.Chat: '
-                    '{}{}error={}.'.format(
+                    "Failed to logoff {} from Rocket.Chat: "
+                    "{}{}error={}.".format(
                         self.user,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 # Return; we're done
                 return False
 
             else:
                 self.logger.debug(
-                    'Rocket.Chat log off successful; response %s.' % (
-                        r.content))
+                    f"Rocket.Chat log off successful; response {r.content}."
+                )
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred logging off the '
-                'Rocket.Chat server')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred logging off the "
+                "Rocket.Chat server"
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         try:
             # Attempt to detect the webhook (if specified in the URL)
@@ -721,9 +736,12 @@ def parse_url(url):
             # rocket://webhook@host
             # rocket://user:webhook@host
             match = re.match(
-                r'^\s*(?P<schema>[^:]+://)((?P<user>[^:]+):)?'
-                r'(?P<webhook>[a-z0-9]+(/|%2F)'
-                r'[a-z0-9]+)\@(?P<url>.+)$', url, re.I)
+                r"^\s*(?P<schema>[^:]+://)((?P<user>[^:]+):)?"
+                r"(?P<webhook>[a-z0-9]+(/|%2F)"
+                r"[a-z0-9]+)\@(?P<url>.+)$",
+                url,
+                re.I,
+            )
 
         except TypeError:
             # Not a string
@@ -731,11 +749,14 @@ def parse_url(url):
 
         if match:
             # Re-assemble our URL without the webhook
-            url = '{schema}{user}{url}'.format(
-                schema=match.group('schema'),
-                user='{}@'.format(match.group('user'))
-                if match.group('user') else '',
-                url=match.group('url'),
+            url = "{schema}{user}{url}".format(
+                schema=match.group("schema"),
+                user=(
+                    "{}@".format(match.group("user"))
+                    if match.group("user")
+                    else ""
+                ),
+                url=match.group("url"),
             )
 
         results = NotifyBase.parse_url(url)
@@ -745,33 +766,35 @@ def parse_url(url):
 
         if match:
             # store our webhook
-            results['webhook'] = \
-                NotifyRocketChat.unquote(match.group('webhook'))
+            results["webhook"] = NotifyRocketChat.unquote(
+                match.group("webhook")
+            )
 
             # Take on the password too in the event we're in basic mode
             # We do not unquote() as this is done at a later state
-            results['password'] = match.group('webhook')
+            results["password"] = match.group("webhook")
 
         # Apply our targets
-        results['targets'] = NotifyRocketChat.split_path(results['fullpath'])
+        results["targets"] = NotifyRocketChat.split_path(results["fullpath"])
 
         # The user may have forced the mode
-        if 'mode' in results['qsd'] and len(results['qsd']['mode']):
-            results['mode'] = \
-                NotifyRocketChat.unquote(results['qsd']['mode'])
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            results["mode"] = NotifyRocketChat.unquote(results["qsd"]["mode"])
 
         # avatar icon
-        if 'avatar' in results['qsd'] and len(results['qsd']['avatar']):
-            results['avatar'] = parse_bool(results['qsd'].get('avatar', True))
+        if "avatar" in results["qsd"] and len(results["qsd"]["avatar"]):
+            results["avatar"] = parse_bool(results["qsd"].get("avatar", True))
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyRocketChat.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyRocketChat.parse_list(
+                results["qsd"]["to"]
+            )
 
         # The 'webhook' over-ride (if specified)
-        if 'webhook' in results['qsd'] and len(results['qsd']['webhook']):
-            results['webhook'] = \
-                NotifyRocketChat.unquote(results['qsd']['webhook'])
+        if "webhook" in results["qsd"] and len(results["qsd"]["webhook"]):
+            results["webhook"] = NotifyRocketChat.unquote(
+                results["qsd"]["webhook"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/rsyslog.py b/libs/apprise/plugins/rsyslog.py
index cadf11cc77..ef8a5789d1 100644
--- a/libs/apprise/plugins/rsyslog.py
+++ b/libs/apprise/plugins/rsyslog.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -29,17 +28,16 @@
 import os
 import socket
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 
 class syslog:
-    """
-    Extrapoloated information from the syslog library so that this plugin
-    would not be dependent on it.
-    """
+    """Extrapoloated information from the syslog library so that this plugin
+    would not be dependent on it."""
+
     # Notification Categories
     LOG_KERN = 0
     LOG_USER = 8
@@ -68,27 +66,26 @@ class syslog:
 
 
 class SyslogFacility:
-    """
-    All of the supported facilities
-    """
-    KERN = 'kern'
-    USER = 'user'
-    MAIL = 'mail'
-    DAEMON = 'daemon'
-    AUTH = 'auth'
-    SYSLOG = 'syslog'
-    LPR = 'lpr'
-    NEWS = 'news'
-    UUCP = 'uucp'
-    CRON = 'cron'
-    LOCAL0 = 'local0'
-    LOCAL1 = 'local1'
-    LOCAL2 = 'local2'
-    LOCAL3 = 'local3'
-    LOCAL4 = 'local4'
-    LOCAL5 = 'local5'
-    LOCAL6 = 'local6'
-    LOCAL7 = 'local7'
+    """All of the supported facilities."""
+
+    KERN = "kern"
+    USER = "user"
+    MAIL = "mail"
+    DAEMON = "daemon"
+    AUTH = "auth"
+    SYSLOG = "syslog"
+    LPR = "lpr"
+    NEWS = "news"
+    UUCP = "uucp"
+    CRON = "cron"
+    LOCAL0 = "local0"
+    LOCAL1 = "local1"
+    LOCAL2 = "local2"
+    LOCAL3 = "local3"
+    LOCAL4 = "local4"
+    LOCAL5 = "local5"
+    LOCAL6 = "local6"
+    LOCAL7 = "local7"
 
 
 SYSLOG_FACILITY_MAP = {
@@ -143,74 +140,76 @@ class SyslogFacility:
 
 
 class NotifyRSyslog(NotifyBase):
-    """
-    A wrapper for Remote Syslog Notifications
-    """
+    """A wrapper for Remote Syslog Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Remote Syslog'
+    service_name = "Remote Syslog"
 
     # The services URL
-    service_url = 'https://tools.ietf.org/html/rfc5424'
+    service_url = "https://tools.ietf.org/html/rfc5424"
 
     # The default protocol
-    protocol = 'rsyslog'
+    protocol = "rsyslog"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_rsyslog'
+    setup_url = "https://appriseit.com/services/rsyslog/"
 
     # Disable throttle rate for RSyslog requests
     request_rate_per_sec = 0
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{host}/{facility}',
-        '{schema}://{host}:{port}/{facility}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{host}/{facility}",
+        "{schema}://{host}:{port}/{facility}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'facility': {
-            'name': _('Facility'),
-            'type': 'choice:string',
-            'values': [k for k in SYSLOG_FACILITY_MAP.keys()],
-            'default': SyslogFacility.USER,
-            'required': True,
-        },
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "facility": {
+                "name": _("Facility"),
+                "type": "choice:string",
+                "values": list(SYSLOG_FACILITY_MAP),
+                "default": SyslogFacility.USER,
+                "required": True,
+            },
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+                "default": 514,
+            },
         },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-            'default': 514,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'facility': {
-            # We map back to the same element defined in template_tokens
-            'alias_of': 'facility',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "facility": {
+                # We map back to the same element defined in template_tokens
+                "alias_of": "facility",
+            },
+            "logpid": {
+                "name": _("Log PID"),
+                "type": "bool",
+                "default": True,
+                "map_to": "log_pid",
+            },
         },
-        'logpid': {
-            'name': _('Log PID'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'log_pid',
-        },
-    })
+    )
 
     def __init__(self, facility=None, log_pid=True, **kwargs):
-        """
-        Initialize RSyslog Object
-        """
+        """Initialize RSyslog Object."""
         super().__init__(**kwargs)
 
         if facility:
@@ -218,50 +217,46 @@ def __init__(self, facility=None, log_pid=True, **kwargs):
                 self.facility = SYSLOG_FACILITY_MAP[facility]
 
             except KeyError:
-                msg = 'An invalid syslog facility ' \
-                      '({}) was specified.'.format(facility)
+                msg = f"An invalid syslog facility ({facility}) was specified."
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
         else:
-            self.facility = \
-                SYSLOG_FACILITY_MAP[
-                    self.template_tokens['facility']['default']]
+            self.facility = SYSLOG_FACILITY_MAP[
+                self.template_tokens["facility"]["default"]
+            ]
 
         # Include PID with each message.
         self.log_pid = log_pid
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform RSyslog Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform RSyslog Notification."""
 
         if title:
             # Format title
-            body = '{}: {}'.format(title, body)
+            body = f"{title}: {body}"
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
         host = self.host
-        port = self.port if self.port \
-            else self.template_tokens['port']['default']
-
-        if self.log_pid:
-            payload = '<%d>- %d - %s' % (
-                SYSLOG_PUBLISH_MAP[notify_type] + self.facility * 8,
-                os.getpid(), body)
+        port = (
+            self.port if self.port else self.template_tokens["port"]["default"]
+        )
 
-        else:
-            payload = '<%d>- %s' % (
-                SYSLOG_PUBLISH_MAP[notify_type] + self.facility * 8, body)
+        priority = SYSLOG_PUBLISH_MAP[notify_type] + self.facility * 8
+        payload = f"<{priority}>- {os.getpid()} {body}" \
+            if self.log_pid else f"<{priority}>- {body}"
 
         # send UDP packet to upstream server
         self.logger.debug(
-            'RSyslog Host: %s:%d/%s',
-            host, port, SYSLOG_FACILITY_RMAP[self.facility])
-        self.logger.debug('RSyslog Payload: %s' % str(payload))
+            "RSyslog Host: %s:%d/%s",
+            host,
+            port,
+            SYSLOG_FACILITY_RMAP[self.facility],
+        )
+        self.logger.debug(f"RSyslog Payload: {payload!s}")
 
         # our sent bytes
         sent = 0
@@ -269,82 +264,92 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
             sock.settimeout(self.socket_connect_timeout)
-            sent = sock.sendto(payload.encode('utf-8'), (host, port))
+            sent = sock.sendto(payload.encode("utf-8"), (host, port))
             sock.close()
 
         except socket.gaierror as e:
             self.logger.warning(
-                'A connection error occurred sending RSyslog '
-                'notification to %s:%d/%s', host, port,
-                SYSLOG_FACILITY_RMAP[self.facility]
+                "A connection error occurred sending RSyslog "
+                "notification to %s:%d/%s",
+                host,
+                port,
+                SYSLOG_FACILITY_RMAP[self.facility],
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         except socket.timeout as e:
             self.logger.warning(
-                'A connection timeout occurred sending RSyslog '
-                'notification to %s:%d/%s', host, port,
-                SYSLOG_FACILITY_RMAP[self.facility]
+                "A connection timeout occurred sending RSyslog "
+                "notification to %s:%d/%s",
+                host,
+                port,
+                SYSLOG_FACILITY_RMAP[self.facility],
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         if sent < len(payload):
             self.logger.warning(
-                'RSyslog sent %d byte(s) but intended to send %d byte(s)',
-                sent, len(payload))
+                "RSyslog sent %d byte(s) but intended to send %d byte(s)",
+                sent,
+                len(payload),
+            )
             return False
 
-        self.logger.info('Sent RSyslog notification.')
+        self.logger.info("Sent RSyslog notification.")
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.protocol, self.host,
-            self.port if self.port
-            else self.template_tokens['port']['default'],
+            self.protocol,
+            self.host,
+            (
+                self.port
+                if self.port
+                else self.template_tokens["port"]["default"]
+            ),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'logpid': 'yes' if self.log_pid else 'no',
+            "logpid": "yes" if self.log_pid else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{hostname}{port}/{facility}/?{params}'.format(
+        return "{schema}://{hostname}{port}/{facility}/?{params}".format(
             schema=self.protocol,
-            hostname=NotifyRSyslog.quote(self.host, safe=''),
-            port='' if self.port is None
-            or self.port == self.template_tokens['port']['default']
-            else ':{}'.format(self.port),
-            facility=self.template_tokens['facility']['default']
-            if self.facility not in SYSLOG_FACILITY_RMAP
-            else SYSLOG_FACILITY_RMAP[self.facility],
+            hostname=NotifyRSyslog.quote(self.host, safe=""),
+            port=(
+                ""
+                if self.port is None
+                or self.port == self.template_tokens["port"]["default"]
+                else f":{self.port}"
+            ),
+            facility=(
+                self.template_tokens["facility"]["default"]
+                if self.facility not in SYSLOG_FACILITY_RMAP
+                else SYSLOG_FACILITY_RMAP[self.facility]
+            ),
             params=NotifyRSyslog.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -353,7 +358,7 @@ def parse_url(url):
         tokens = []
 
         # Get our path values
-        tokens.extend(NotifyRSyslog.split_path(results['fullpath']))
+        tokens.extend(NotifyRSyslog.split_path(results["fullpath"]))
 
         # Initialization
         facility = None
@@ -364,8 +369,8 @@ def parse_url(url):
 
         # However if specified on the URL, that will over-ride what was
         # identified
-        if 'facility' in results['qsd'] and len(results['qsd']['facility']):
-            facility = results['qsd']['facility'].lower()
+        if "facility" in results["qsd"] and len(results["qsd"]["facility"]):
+            facility = results["qsd"]["facility"].lower()
 
         if facility and facility not in SYSLOG_FACILITY_MAP:
             # Find first match; if no match is found we set the result
@@ -373,17 +378,20 @@ def parse_url(url):
             # during the __init__() call. The benifit of doing this
             # check here is if we do have a valid match, we can support
             # short form matches like 'u' which will match against user
-            facility = next((f for f in SYSLOG_FACILITY_MAP.keys()
-                             if f.startswith(facility)), facility)
+            facility = next(
+                (f for f in SYSLOG_FACILITY_MAP if f.startswith(facility)),
+                facility,
+            )
 
         # Save facility if set
         if facility:
-            results['facility'] = facility
+            results["facility"] = facility
 
         # Include PID as part of the message logged
-        results['log_pid'] = parse_bool(
-            results['qsd'].get(
-                'logpid',
-                NotifyRSyslog.template_args['logpid']['default']))
+        results["log_pid"] = parse_bool(
+            results["qsd"].get(
+                "logpid", NotifyRSyslog.template_args["logpid"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/ryver.py b/libs/apprise/plugins/ryver.py
index a23059b600..b3ec0aa4e0 100644
--- a/libs/apprise/plugins/ryver.py
+++ b/libs/apprise/plugins/ryver.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,23 +33,22 @@
 #                          |                                        |
 #  These are important <---^----------------------------------------^
 #
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_bool, validate_regex
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from .base import NotifyBase
 
 
 class RyverWebhookMode:
-    """
-    Ryver supports to webhook modes
-    """
-    SLACK = 'slack'
-    RYVER = 'ryver'
+    """Ryver supports to webhook modes."""
+
+    SLACK = "slack"
+    RYVER = "ryver"
 
 
 # Define the types in a list for validation purposes
@@ -61,21 +59,19 @@ class RyverWebhookMode:
 
 
 class NotifyRyver(NotifyBase):
-    """
-    A wrapper for Ryver Notifications
-    """
+    """A wrapper for Ryver Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Ryver'
+    service_name = "Ryver"
 
     # The services URL
-    service_url = 'https://ryver.com/'
+    service_url = "https://ryver.com/"
 
     # The default secure protocol
-    secure_protocol = 'ryver'
+    secure_protocol = "ryver"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_ryver'
+    setup_url = "https://appriseit.com/services/ryver/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -85,80 +81,91 @@ class NotifyRyver(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{organization}/{token}',
-        '{schema}://{botname}@{organization}/{token}',
+        "{schema}://{organization}/{token}",
+        "{schema}://{botname}@{organization}/{token}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'organization': {
-            'name': _('Organization'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]{3,32}$', 'i'),
-        },
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[A-Z0-9]{15}$', 'i'),
-        },
-        'botname': {
-            'name': _('Bot Name'),
-            'type': 'string',
-            'map_to': 'user',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "organization": {
+                "name": _("Organization"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]{3,32}$", "i"),
+            },
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[A-Z0-9]{15}$", "i"),
+            },
+            "botname": {
+                "name": _("Bot Name"),
+                "type": "string",
+                "map_to": "user",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'mode': {
-            'name': _('Webhook Mode'),
-            'type': 'choice:string',
-            'values': RYVER_WEBHOOK_MODES,
-            'default': RyverWebhookMode.RYVER,
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "mode": {
+                "name": _("Webhook Mode"),
+                "type": "choice:string",
+                "values": RYVER_WEBHOOK_MODES,
+                "default": RyverWebhookMode.RYVER,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-    })
+    )
 
-    def __init__(self, organization, token, mode=RyverWebhookMode.RYVER,
-                 include_image=True, **kwargs):
-        """
-        Initialize Ryver Object
-        """
+    def __init__(
+        self,
+        organization,
+        token,
+        mode=RyverWebhookMode.RYVER,
+        include_image=True,
+        **kwargs,
+    ):
+        """Initialize Ryver Object."""
         super().__init__(**kwargs)
 
         # API Token (associated with project)
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'An invalid Ryver API Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Ryver API Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Organization (associated with project)
         self.organization = validate_regex(
-            organization, *self.template_tokens['organization']['regex'])
+            organization, *self.template_tokens["organization"]["regex"]
+        )
         if not self.organization:
-            msg = 'An invalid Ryver Organization ' \
-                  '({}) was specified.'.format(organization)
+            msg = (
+                "An invalid Ryver Organization "
+                f"({organization}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our webhook mode
-        self.mode = None \
-            if not isinstance(mode, str) else mode.lower()
+        self.mode = None if not isinstance(mode, str) else mode.lower()
 
         if self.mode not in RYVER_WEBHOOK_MODES:
-            msg = 'The Ryver webhook mode specified ({}) is invalid.' \
-                .format(mode)
+            msg = f"The Ryver webhook mode specified ({mode}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -169,65 +176,63 @@ def __init__(self, organization, token, mode=RyverWebhookMode.RYVER,
         # https://api.slack.com/docs/message-formatting
         self._re_formatting_map = {
             # New lines must become the string version
-            r'\r\*\n': '\\n',
+            r"\r\*\n": "\\n",
             # Escape other special characters
-            r'&': '&amp;',
-            r'<': '&lt;',
-            r'>': '&gt;',
+            r"&": "&amp;",
+            r"<": "&lt;",
+            r">": "&gt;",
         }
 
         # Iterate over above list and store content accordingly
         self._re_formatting_rules = re.compile(
-            r'(' + '|'.join(self._re_formatting_map.keys()) + r')',
+            r"(" + "|".join(self._re_formatting_map.keys()) + r")",
             re.IGNORECASE,
         )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Ryver Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Ryver Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         if self.mode == RyverWebhookMode.SLACK:
             # Perform Slack formatting
             title = self._re_formatting_rules.sub(  # pragma: no branch
-                lambda x: self._re_formatting_map[x.group()], title,
+                lambda x: self._re_formatting_map[x.group()],
+                title,
             )
             body = self._re_formatting_rules.sub(  # pragma: no branch
-                lambda x: self._re_formatting_map[x.group()], body,
+                lambda x: self._re_formatting_map[x.group()],
+                body,
             )
 
-        url = 'https://{}.ryver.com/application/webhook/{}'.format(
-            self.organization,
-            self.token,
-        )
+        url = f"https://{self.organization}.ryver.com/application/webhook/{self.token}"
 
         # prepare JSON Object
         payload = {
-            'body': body if not title else '**{}**\r\n{}'.format(title, body),
-            'createSource': {
-                'displayName': self.user,
-                'avatar': None,
+            "body": body if not title else f"**{title}**\r\n{body}",
+            "createSource": {
+                "displayName": self.user,
+                "avatar": None,
             },
         }
 
         # Acquire our image url if configured to do so
-        image_url = None if not self.include_image else \
-            self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if image_url:
-            payload['createSource']['avatar'] = image_url
+            payload["createSource"]["avatar"] = image_url
 
-        self.logger.debug('Ryver POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Ryver Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Ryver POST URL: {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Ryver Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -243,79 +248,76 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyBase.http_response_code_lookup(r.status_code)
+                status_str = NotifyBase.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Ryver notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Ryver notification: {}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Ryver notification.')
+                self.logger.info("Sent Ryver notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Ryver:%s ' % (
-                    self.organization) + 'notification.'
+                "A Connection error occurred sending"
+                f" Ryver:{self.organization} "
+                + "notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.organization, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'mode': self.mode,
+            "image": "yes" if self.include_image else "no",
+            "mode": self.mode,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine if there is a botname present
-        botname = ''
+        botname = ""
         if self.user:
-            botname = '{botname}@'.format(
-                botname=NotifyRyver.quote(self.user, safe=''),
+            botname = "{botname}@".format(
+                botname=NotifyRyver.quote(self.user, safe=""),
             )
 
-        return '{schema}://{botname}{organization}/{token}/?{params}'.format(
+        return "{schema}://{botname}{organization}/{token}/?{params}".format(
             schema=self.secure_protocol,
             botname=botname,
-            organization=NotifyRyver.quote(self.organization, safe=''),
-            token=self.pprint(self.token, privacy, safe=''),
+            organization=NotifyRyver.quote(self.organization, safe=""),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyRyver.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -323,23 +325,23 @@ def parse_url(url):
             return results
 
         # The first token is stored in the hostname
-        results['organization'] = NotifyRyver.unquote(results['host'])
+        results["organization"] = NotifyRyver.unquote(results["host"])
 
         # Now fetch the remaining tokens
         try:
-            results['token'] = \
-                NotifyRyver.split_path(results['fullpath'])[0]
+            results["token"] = NotifyRyver.split_path(results["fullpath"])[0]
 
         except IndexError:
             # no token
-            results['token'] = None
+            results["token"] = None
 
         # Retrieve the mode
-        results['mode'] = results['qsd'].get('mode', RyverWebhookMode.RYVER)
+        results["mode"] = results["qsd"].get("mode", RyverWebhookMode.RYVER)
 
         # use image= for consistency with the other plugins
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         return results
 
@@ -350,17 +352,25 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://(?P<org>[A-Z0-9_-]+)\.ryver\.com/application/webhook/'
-            r'(?P<webhook_token>[A-Z0-9]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://(?P<org>[A-Z0-9_-]+)\.ryver\.com/application/webhook/"
+            r"(?P<webhook_token>[A-Z0-9]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyRyver.parse_url(
-                '{schema}://{org}/{webhook_token}/{params}'.format(
+                "{schema}://{org}/{webhook_token}/{params}".format(
                     schema=NotifyRyver.secure_protocol,
-                    org=result.group('org'),
-                    webhook_token=result.group('webhook_token'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    org=result.group("org"),
+                    webhook_token=result.group("webhook_token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/sendgrid.py b/libs/apprise/plugins/sendgrid.py
index f02a326d86..556e4eee94 100644
--- a/libs/apprise/plugins/sendgrid.py
+++ b/libs/apprise/plugins/sendgrid.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -46,49 +45,52 @@
 #  - https://sendgrid.com/docs/ui/sending-email/\
 #       how-to-send-an-email-with-dynamic-transactional-templates/
 
-import requests
 from json import dumps
+import logging
+
+import requests
 
-from .base import NotifyBase
 from .. import exception
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_list, is_email, validate_regex
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
-
+from ..utils.parse import is_email, parse_list, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 SENDGRID_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - You do not have authorization to make the request.',
-    413: 'Payload To Large - The JSON payload you have included in your '
-         'request is too large.',
-    429: 'Too Many Requests - The number of requests you have made exceeds '
-         'SendGridโ€™s rate limitations.',
+    401: "Unauthorized - You do not have authorization to make the request.",
+    413: (
+        "Payload To Large - The JSON payload you have included in your "
+        "request is too large."
+    ),
+    429: (
+        "Too Many Requests - The number of requests you have made exceeds "
+        "SendGrid's rate limitations."
+    ),
 }
 
 
 class NotifySendGrid(NotifyBase):
-    """
-    A wrapper for Notify SendGrid Notifications
-    """
+    """A wrapper for Notify SendGrid Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'SendGrid'
+    service_name = "SendGrid"
 
     # The services URL
-    service_url = 'https://sendgrid.com'
+    service_url = "https://sendgrid.com"
 
     # The default secure protocol
-    secure_protocol = 'sendgrid'
+    secure_protocol = "sendgrid"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_sendgrid'
+    setup_url = "https://appriseit.com/services/sendgrid/"
 
     # Default to markdown
     notify_format = NotifyFormat.HTML
 
     # The default Email API URL to use
-    notify_url = 'https://api.sendgrid.com/v3/mail/send'
+    notify_url = "https://api.sendgrid.com/v3/mail/send"
 
     # Support attachments
     attachment_support = True
@@ -98,95 +100,108 @@ class NotifySendGrid(NotifyBase):
     request_rate_per_sec = 0.2
 
     # The default subject to use if one isn't specified.
-    default_empty_subject = '<no subject>'
+    default_empty_subject = "<no subject>"
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}:{from_email}',
-        '{schema}://{apikey}:{from_email}/{targets}',
+        "{schema}://{apikey}:{from_email}",
+        "{schema}://{apikey}:{from_email}/{targets}",
     )
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9._-]+$', 'i'),
-        },
-        'from_email': {
-            'name': _('Source Email'),
-            'type': 'string',
-            'required': True,
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9._-]+$", "i"),
+            },
+            "from_email": {
+                "name": _("Source Email"),
+                "type": "string",
+                "required": True,
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'template': {
-            # Template ID
-            # The template ID is 64 characters with one dash (d-uuid)
-            'name': _('Template'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "template": {
+                # Template ID
+                # The template ID is 64 characters with one dash (d-uuid)
+                "name": _("Template"),
+                "type": "string",
+            },
         },
-    })
+    )
 
     # Support Template Dynamic Variables (Substitutions)
     template_kwargs = {
-        'template_data': {
-            'name': _('Template Data'),
-            'prefix': '+',
+        "template_data": {
+            "name": _("Template Data"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, apikey, from_email, targets=None, cc=None,
-                 bcc=None, template=None, template_data=None, **kwargs):
-        """
-        Initialize Notify SendGrid Object
-        """
+    def __init__(
+        self,
+        apikey,
+        from_email,
+        targets=None,
+        cc=None,
+        bcc=None,
+        template=None,
+        template_data=None,
+        **kwargs,
+    ):
+        """Initialize Notify SendGrid Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid SendGrid API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid SendGrid API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         result = is_email(from_email)
         if not result:
-            msg = 'Invalid ~From~ email specified: {}'.format(from_email)
+            msg = f"Invalid ~From~ email specified: {from_email}"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store email address
-        self.from_email = result['full_email']
+        self.from_email = result["full_email"]
 
         # Acquire Targets (To Emails)
-        self.targets = list()
+        self.targets = []
 
         # Acquire Carbon Copies
         self.cc = set()
@@ -198,33 +213,36 @@ def __init__(self, apikey, from_email, targets=None, cc=None,
         self.template = template
 
         # Now our dynamic template data (if defined)
-        self.template_data = template_data \
-            if isinstance(template_data, dict) else {}
+        self.template_data = (
+            template_data if isinstance(template_data, dict) else {}
+        )
 
         # Validate recipients (to:) and drop bad ones:
-        for recipient in parse_list(targets):
+        if targets:
+            for recipient in parse_list(targets):
 
-            result = is_email(recipient)
-            if result:
-                self.targets.append(result['full_email'])
-                continue
+                result = is_email(recipient)
+                if result:
+                    self.targets.append(result["full_email"])
+                    continue
 
-            self.logger.warning(
-                'Dropped invalid email '
-                '({}) specified.'.format(recipient),
-            )
+                self.logger.warning(
+                    f"Dropped invalid email ({recipient}) specified.",
+                )
+        else:
+            # add ourselves
+            self.targets.append(self.from_email)
 
         # Validate recipients (cc:) and drop bad ones:
         for recipient in parse_list(cc):
 
             result = is_email(recipient)
             if result:
-                self.cc.add(result['full_email'])
+                self.cc.add(result["full_email"])
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
             )
 
         # Validate recipients (bcc:) and drop bad ones:
@@ -232,106 +250,116 @@ def __init__(self, apikey, from_email, targets=None, cc=None,
 
             result = is_email(recipient)
             if result:
-                self.bcc.add(result['full_email'])
+                self.bcc.add(result["full_email"])
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
             )
 
-        if len(self.targets) == 0:
-            # Notify ourselves
-            self.targets.append(self.from_email)
-
         return
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey, self.from_email)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if len(self.cc) > 0:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join(self.cc)
+            params["cc"] = ",".join(self.cc)
 
         if len(self.bcc) > 0:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join(self.bcc)
+            params["bcc"] = ",".join(self.bcc)
 
         if self.template:
             # Handle our Template ID if if was specified
-            params['template'] = self.template
+            params["template"] = self.template
 
         # Append our template_data into our parameter list
-        params.update(
-            {'+{}'.format(k): v for k, v in self.template_data.items()})
+        params.update({f"+{k}": v for k, v in self.template_data.items()})
 
         # a simple boolean check as to whether we display our target emails
         # or not
-        has_targets = \
-            not (len(self.targets) == 1 and self.targets[0] == self.from_email)
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0] == self.from_email
+        )
 
-        return '{schema}://{apikey}:{from_email}/{targets}?{params}'.format(
+        return "{schema}://{apikey}:{from_email}/{targets}?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
             # never encode email since it plays a huge role in our hostname
             from_email=self.from_email,
-            targets='' if not has_targets else '/'.join(
-                [NotifySendGrid.quote(x, safe='') for x in self.targets]),
+            targets=(
+                ""
+                if not has_targets
+                else "/".join(
+                    [NotifySendGrid.quote(x, safe="") for x in self.targets]
+                )
+            ),
             params=NotifySendGrid.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
-        return len(self.targets)
-
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform SendGrid Notification
-        """
+        """Returns the number of targets associated with this notification."""
+        return max(1, len(self.targets))
+
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform SendGrid Notification."""
+
+        if not self.targets:
+            # There is no one to email; we're done
+            self.logger.warning(
+                "There are no SendGrid email recipients to notify")
+            return False
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Authorization': 'Bearer {}'.format(self.apikey),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.apikey}",
         }
 
         # error tracking (used for function return)
         has_error = False
 
         # A Simple Email Payload Template
-        _payload = {
-            'personalizations': [{
+        payload_ = {
+            "personalizations": [{
                 # Placeholder
-                'to': [{'email': None}],
+                "to": [{"email": None}],
             }],
-            'from': {
-                'email': self.from_email,
+            "from": {
+                "email": self.from_email,
             },
             # A subject is a requirement, so if none is specified we must
             # set a default with at least 1 character or SendGrid will deny
             # our request
-            'subject': title if title else self.default_empty_subject,
-            'content': [{
-                'type': 'text/plain'
-                if self.notify_format == NotifyFormat.TEXT else 'text/html',
-                'value': body,
+            "subject": title if title else self.default_empty_subject,
+            "content": [{
+                "type": (
+                    "text/plain"
+                    if self.notify_format == NotifyFormat.TEXT
+                    else "text/html"
+                ),
+                "value": body,
             }],
         }
 
@@ -344,71 +372,89 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SendGrid attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SendGrid attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     attachments.append({
                         "content": attachment.base64(),
-                        "filename": attachment.name
-                        if attachment.name else f'file{no:03}.dat',
+                        "filename": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
                         "type": "application/octet-stream",
-                        "disposition": "attachment"
+                        "disposition": "attachment",
                     })
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SendGrid attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SendGrid attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending SendGrid attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending SendGrid attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
             # Append our attachments to the payload
-            _payload.update({
-                'attachments': attachments,
+            payload_.update({
+                "attachments": attachments,
             })
 
         if self.template:
-            _payload['template_id'] = self.template
+            payload_["template_id"] = self.template
 
             if self.template_data:
-                _payload['personalizations'][0]['dynamic_template_data'] = \
-                    {k: v for k, v in self.template_data.items()}
+                payload_["personalizations"][0]["dynamic_template_data"] = (
+                    dict(self.template_data.items())
+                )
 
         targets = list(self.targets)
         while len(targets) > 0:
             target = targets.pop(0)
 
             # Create a copy of our template
-            payload = _payload.copy()
+            payload = payload_.copy()
 
             # the cc, bcc, to field must be unique or SendMail will fail, the
             # below code prepares this by ensuring the target isn't in the cc
             # list or bcc list. It also makes sure the cc list does not contain
             # any of the bcc entries
-            cc = (self.cc - self.bcc - set([target]))
-            bcc = (self.bcc - set([target]))
+            cc = self.cc - self.bcc - {target}
+            bcc = self.bcc - {target}
 
             # Set our target
-            payload['personalizations'][0]['to'][0]['email'] = target
+            payload["personalizations"][0]["to"][0]["email"] = target
 
             if len(cc):
-                payload['personalizations'][0]['cc'] = \
-                    [{'email': email} for email in cc]
+                payload["personalizations"][0]["cc"] = [
+                    {"email": email} for email in cc
+                ]
 
             if len(bcc):
-                payload['personalizations'][0]['bcc'] = \
-                    [{'email': email} for email in bcc]
-
-            self.logger.debug('SendGrid POST URL: %s (cert_verify=%r)' % (
-                self.notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('SendGrid Payload: %s' % str(payload))
+                payload["personalizations"][0]["bcc"] = [
+                    {"email": email} for email in bcc
+                ]
+
+            # Some Debug Logging
+            if self.logger.isEnabledFor(logging.DEBUG):
+                # Due to attachments; output can be quite heavy and io
+                # intensive.
+                # To accommodate this, we only show our debug payload
+                # information if required.
+                self.logger.debug(
+                    "SendGrid POST URL:"
+                    f" {self.notify_url} "
+                    f"(cert_verify={self.verify_certificate!r})"
+                )
+                self.logger.debug(
+                    "SendGrid Payload: %s", sanitize_payload(payload))
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -421,22 +467,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     timeout=self.request_timeout,
                 )
                 if r.status_code not in (
-                        requests.codes.ok, requests.codes.accepted):
+                    requests.codes.ok,
+                    requests.codes.accepted,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifySendGrid.http_response_code_lookup(
-                            r.status_code, SENDGRID_HTTP_ERROR_MAP)
+                    status_str = NotifySendGrid.http_response_code_lookup(
+                        r.status_code, SENDGRID_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send SendGrid notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send SendGrid notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -444,13 +494,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 else:
                     self.logger.info(
-                        'Sent SendGrid notification to {}.'.format(target))
+                        f"Sent SendGrid notification to {target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending SendGrid '
-                    'notification to {}.'.format(target))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending SendGrid "
+                    f"notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -460,11 +512,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url)
         if not results:
@@ -480,47 +529,47 @@ def parse_url(url):
         #                 |       |         |
         #              apikey     -from addr-
 
-        if not results.get('user'):
+        if not results.get("user"):
             # An API Key as not properly specified
             return None
 
-        if not results.get('password'):
+        if not results.get("password"):
             # A From Email was not correctly specified
             return None
 
         # Prepare our API Key
-        results['apikey'] = NotifySendGrid.unquote(results['user'])
+        results["apikey"] = NotifySendGrid.unquote(results["user"])
 
         # Prepare our From Email Address
-        results['from_email'] = '{}@{}'.format(
-            NotifySendGrid.unquote(results['password']),
-            NotifySendGrid.unquote(results['host']),
+        results["from_email"] = "{}@{}".format(
+            NotifySendGrid.unquote(results["password"]),
+            NotifySendGrid.unquote(results["host"]),
         )
 
         # Acquire our targets
-        results['targets'] = NotifySendGrid.split_path(results['fullpath'])
+        results["targets"] = NotifySendGrid.split_path(results["fullpath"])
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySendGrid.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySendGrid.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = \
-                NotifySendGrid.parse_list(results['qsd']['cc'])
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = NotifySendGrid.parse_list(results["qsd"]["cc"])
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = \
-                NotifySendGrid.parse_list(results['qsd']['bcc'])
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = NotifySendGrid.parse_list(results["qsd"]["bcc"])
 
         # Handle Blind Carbon Copy Addresses
-        if 'template' in results['qsd'] and len(results['qsd']['template']):
-            results['template'] = \
-                NotifySendGrid.unquote(results['qsd']['template'])
+        if "template" in results["qsd"] and len(results["qsd"]["template"]):
+            results["template"] = NotifySendGrid.unquote(
+                results["qsd"]["template"]
+            )
 
         # Add any template substitutions
-        results['template_data'] = results['qsd+']
+        results["template_data"] = results["qsd+"]
 
         return results
diff --git a/libs/apprise/plugins/sendpulse.py b/libs/apprise/plugins/sendpulse.py
new file mode 100644
index 0000000000..5ddee7d132
--- /dev/null
+++ b/libs/apprise/plugins/sendpulse.py
@@ -0,0 +1,786 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Simple API Reference:
+#  - https://sendpulse.com/integrations/api/smtp
+
+import base64
+from email.utils import formataddr
+from json import dumps, loads
+import logging
+import re
+
+import requests
+
+from .. import exception
+from ..common import NotifyFormat, NotifyType, PersistentStoreMode
+from ..conversion import convert_between
+from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_emails, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
+
+
+class NotifySendPulse(NotifyBase):
+    """
+    A wrapper for Notify SendPulse Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = "SendPulse"
+
+    # The services URL
+    service_url = "https://sendpulse.com"
+
+    # The default secure protocol
+    secure_protocol = "sendpulse"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/sendpulse/"
+
+    # Default to markdown
+    notify_format = NotifyFormat.HTML
+
+    # The default Email API URL to use
+    notify_email_url = "https://api.sendpulse.com/smtp/emails"
+
+    # Our OAuth Query
+    notify_oauth_url = "https://api.sendpulse.com/oauth/access_token"
+
+    # Support attachments
+    attachment_support = True
+
+    # Allow 300 requests per minute.
+    # 60/300 = 0.2
+    request_rate_per_sec = 0.2
+
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference
+    storage_mode = PersistentStoreMode.AUTO
+
+    # Token expiry if not detected in seconds (below is 1 hr)
+    token_expiry = 3600
+
+    # The number of seconds to grace for early token renewal
+    # Below states that 10 seconds bfore our token expiry, we'll
+    # attempt to renew it
+    token_expiry_edge = 10
+
+    # Support attachments
+    attachment_support = True
+
+    # The default subject to use if one isn't specified.
+    default_empty_subject = "<no subject>"
+
+    # Define object templates
+    templates = (
+        "{schema}://{user}@{host}/{client_secret}/",
+        "{schema}://{user}@{host}/{client_id}/{client_secret}/{targets}",
+    )
+
+    # Define our template arguments
+    template_tokens = dict(NotifyBase.template_tokens, **{
+        "user": {
+            "name": _("User Name"),
+            "type": "string",
+        },
+        "host": {
+            "name": _("Domain"),
+            "type": "string",
+            "required": True,
+        },
+        "client_id": {
+            "name": _("Client ID"),
+            "type": "string",
+            "required": True,
+            "private": True,
+            "regex": (r"^[A-Z0-9._-]+$", "i"),
+        },
+        "client_secret": {
+            "name": _("Client Secret"),
+            "type": "string",
+            "required": True,
+            "private": True,
+            "regex": (r"^[A-Z0-9._-]+$", "i"),
+        },
+        "target_email": {
+            "name": _("Target Email"),
+            "type": "string",
+            "map_to": "targets",
+        },
+        "targets": {
+            "name": _("Targets"),
+            "type": "list:string",
+        },
+    })
+
+    # Define our template arguments
+    template_args = dict(NotifyBase.template_args, **{
+        "to": {
+            "alias_of": "targets",
+        },
+        "from": {
+            "name": _("From Email"),
+            "type": "string",
+            "map_to": "from_addr",
+        },
+        "cc": {
+            "name": _("Carbon Copy"),
+            "type": "list:string",
+        },
+        "bcc": {
+            "name": _("Blind Carbon Copy"),
+            "type": "list:string",
+        },
+        "template": {
+            # The template ID is an integer
+            "name": _("Template ID"),
+            "type": "int",
+        },
+        "id": {
+            "alias_of": "client_id",
+        },
+        "secret": {
+            "alias_of": "client_secret",
+        }
+    })
+
+    # Support Template Dynamic Variables (Substitutions)
+    template_kwargs = {
+        "template_data": {
+            "name": _("Template Data"),
+            "prefix": "+",
+        },
+    }
+
+    def __init__(self, client_id, client_secret, from_addr=None, targets=None,
+                 cc=None, bcc=None, template=None, template_data=None,
+                 **kwargs):
+        """
+        Initialize Notify SendPulse Object
+        """
+        super().__init__(**kwargs)
+
+        # For tracking our email -> name lookups
+        self.names = {}
+
+        # Temporary from_addr to work with for parsing
+        from_addr_ = [self.app_id, ""]
+
+        if self.user:
+            if self.host:
+                # Prepare the bases of our email
+                from_addr_ = [from_addr_[0], "{}@{}".format(
+                    re.split(r"[\s@]+", self.user)[0],
+                    self.host,
+                )]
+
+            else:
+                result = is_email(self.user)
+                if result:
+                    # Prepare the bases of our email and include domain
+                    self.host = result["domain"]
+                    from_addr_ = [
+                        result["name"] if result["name"]
+                        else from_addr_[0], self.user]
+
+        if isinstance(from_addr, str):
+            result = is_email(from_addr)
+            if result:
+                from_addr_ = (
+                    result["name"] if result["name"] else from_addr_[0],
+                    result["full_email"])
+            else:
+                # Only update the string but use the already detected info
+                from_addr_[0] = from_addr
+
+        result = is_email(from_addr_[1])
+        if not result:
+            # Parse Source domain based on from_addr
+            msg = "Invalid ~From~ email specified: {}".format(
+                "{} <{}>".format(from_addr_[0], from_addr_[1])
+                if from_addr_[0] else "{}".format(from_addr_[1]))
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Store our lookup
+        self.from_addr = from_addr_[1]
+        self.names[from_addr_[1]] = from_addr_[0]
+
+        # Client ID
+        self.client_id = validate_regex(
+            client_id, *self.template_tokens["client_id"]["regex"])
+        if not self.client_id:
+            msg = "An invalid SendPulse Client ID " \
+                  "({}) was specified.".format(client_id)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Client Secret
+        self.client_secret = validate_regex(
+            client_secret, *self.template_tokens["client_secret"]["regex"])
+        if not self.client_secret:
+            msg = "An invalid SendPulse Client Secret " \
+                  "({}) was specified.".format(client_secret)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Acquire Targets (To Emails)
+        self.targets = []
+
+        # Acquire Carbon Copies
+        self.cc = set()
+
+        # Acquire Blind Carbon Copies
+        self.bcc = set()
+
+        # No template
+        self.template = None
+        if template:
+            try:
+                # Store our template
+                self.template = int(template)
+
+            except (TypeError, ValueError):
+                # Not a valid integer; ignore entry
+                err = "The SendPulse Template ID specified ({}) is invalid."\
+                    .format(template)
+                self.logger.warning(err)
+                raise TypeError(err) from None
+
+        # Now our dynamic template data (if defined)
+        self.template_data = template_data \
+            if isinstance(template_data, dict) else {}
+
+        if targets:
+            # Validate recipients (to:) and drop bad ones:
+            for recipient in parse_emails(targets):
+                result = is_email(recipient)
+                if result:
+                    self.targets.append(result["full_email"])
+                    if result["name"]:
+                        self.names[result["full_email"]] = result["name"]
+                    continue
+
+                self.logger.warning(
+                    "Dropped invalid To email "
+                    "({}) specified.".format(recipient),
+                )
+
+        else:
+            # If our target email list is empty we want to add ourselves to it
+            self.targets.append(self.from_addr)
+
+        # Validate recipients (cc:) and drop bad ones:
+        for recipient in parse_emails(cc):
+
+            result = is_email(recipient)
+            if result:
+                self.cc.add(result["full_email"])
+                if result["name"]:
+                    self.names[result["full_email"]] = result["name"]
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Carbon Copy email "
+                "({}) specified.".format(recipient),
+            )
+
+        # Validate recipients (bcc:) and drop bad ones:
+        for recipient in parse_emails(bcc):
+
+            result = is_email(recipient)
+            if result:
+                self.bcc.add(result["full_email"])
+                if result["name"]:
+                    self.names[result["full_email"]] = result["name"]
+                continue
+
+            self.logger.warning(
+                "Dropped invalid Blind Carbon Copy email "
+                "({}) specified.".format(recipient),
+            )
+
+        if len(self.targets) == 0:
+            # Notify ourselves
+            self.targets.append(self.from_addr)
+
+        return
+
+    @property
+    def url_identifier(self):
+        """
+        Returns all of the identifiers that make this URL unique from
+        another simliar one. Targets or end points should never be identified
+        here.
+        """
+        return (self.secure_protocol, self.client_id, self.client_secret)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Our URL parameters
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        if len(self.cc) > 0:
+            # Handle our Carbon Copy Addresses
+            params["cc"] = ",".join([
+                formataddr(
+                    (self.names.get(e, False), e),
+                    # Swap comma for it's escaped url code (if detected) since
+                    # we're using that as a delimiter
+                    charset="utf-8").replace(",", "%2C")
+                for e in self.cc])
+
+        if len(self.bcc) > 0:
+            # Handle our Blind Carbon Copy Addresses
+            params["bcc"] = ",".join([
+                formataddr(
+                    (self.names.get(e, False), e),
+                    # Swap comma for it's escaped url code (if detected) since
+                    # we're using that as a delimiter
+                    charset="utf-8").replace(",", "%2C")
+                for e in self.bcc])
+
+        if self.template:
+            # Handle our Template ID if if was specified
+            params["template"] = self.template
+
+        # handle from=
+        if self.names[self.from_addr] != self.app_id:
+            params["from"] = self.names[self.from_addr]
+
+        # Append our template_data into our parameter list
+        params.update(
+            {"+{}".format(k): v for k, v in self.template_data.items()})
+
+        # a simple boolean check as to whether we display our target emails
+        # or not
+        has_targets = \
+            not (len(self.targets) == 1 and self.targets[0] == self.from_addr)
+
+        return "{schema}://{source}/{cid}/{secret}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            source=self.from_addr,
+            cid=self.pprint(self.client_id, privacy, safe=""),
+            secret=self.pprint(self.client_secret, privacy, safe=""),
+            targets="" if not has_targets else "/".join(
+                [NotifySendPulse.quote(x, safe="") for x in self.targets]),
+            params=NotifySendPulse.urlencode(params),
+        )
+
+    def __len__(self):
+        """
+        Returns the number of targets associated with this notification
+        """
+        return len(self.targets)
+
+    def login(self):
+        """
+        Authenticates with the server to get a access_token
+        """
+        self.store.clear("access_token")
+        payload = {
+            "grant_type": "client_credentials",
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+        }
+
+        success, response = self._fetch(self.notify_oauth_url, payload)
+        if not success:
+            return False
+
+        access_token = response.get("access_token")
+
+        # If we get here, we're authenticated
+        try:
+            expires = \
+                int(response.get("expires_in")) - self.token_expiry_edge
+            if expires <= self.token_expiry_edge:
+                self.logger.error(
+                    "SendPulse token expiry limit returned was invalid")
+                return False
+
+            elif expires > self.token_expiry:
+                self.logger.warning(
+                    "SendPulse token expiry limit fixed to: {}s"
+                    .format(self.token_expiry))
+                expires = self.token_expiry - self.token_expiry_edge
+
+        except (AttributeError, TypeError, ValueError):
+            # expires_in was not an integer
+            self.logger.warning(
+                "SendPulse token expiry limit presumed to be: {}s".format(
+                    self.token_expiry))
+            expires = self.token_expiry - self.token_expiry_edge
+
+        self.store.set("access_token", access_token, expires=expires)
+
+        return access_token
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, attach=None,
+             **kwargs):
+        """
+        Perform SendPulse Notification
+        """
+
+        access_token = self.store.get("access_token") or self.login()
+        if not access_token:
+            return False
+
+        # error tracking (used for function return)
+        has_error = False
+
+        # A Simple Email Payload Template
+        payload_ = {
+            "email": {
+                "from": {
+                    "name": self.names[self.from_addr],
+                    "email": self.from_addr,
+                },
+                # To is populated further on
+                "to": [],
+                # A subject is a requirement, so if none is specified we must
+                # set a default with at least 1 character or SendPulse will
+                # deny our request
+                "subject": title if title else self.default_empty_subject,
+            }
+        }
+
+        # Prepare Email Message
+        if self.notify_format == NotifyFormat.HTML:
+            # HTML
+            payload_["email"].update({
+                "text": convert_between(
+                    NotifyFormat.HTML, NotifyFormat.TEXT, body),
+                "html": base64.b64encode(body.encode("utf-8")).decode("ascii"),
+            })
+
+        else:  # Text
+            payload_["email"]["text"] = body
+
+        if attach and self.attachment_support:
+            attachments = {}
+
+            # Send our attachments
+            for no, attachment in enumerate(attach, start=1):
+                # Perform some simple error checking
+                if not attachment:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access SendPulse attachment {}.".format(
+                            attachment.url(privacy=True)))
+                    return False
+
+                try:
+                    attachments[
+                        attachment.name if attachment.name
+                        else f"file{no:03}.dat"] = attachment.base64()
+
+                except exception.AppriseException:
+                    # We could not access the attachment
+                    self.logger.error(
+                        "Could not access SendPulse attachment {}.".format(
+                            attachment.url(privacy=True)))
+                    return False
+
+                self.logger.debug(
+                    "Appending SendPulse attachment {}".format(
+                        attachment.url(privacy=True)))
+
+            # Append our attachments to the payload
+            payload_["email"].update({
+                "attachments_binary": attachments,
+            })
+
+        if self.template:
+            payload_["email"].update({
+                "template": {
+                    "id": self.template,
+                    "variables": self.template_data,
+                }})
+
+        targets = list(self.targets)
+        while len(targets) > 0:
+            target = targets.pop(0)
+
+            # Create a copy of our template
+            payload = payload_.copy()
+
+            # the cc, bcc, to field must be unique or SendMail will fail, the
+            # below code prepares this by ensuring the target isn't in the cc
+            # list or bcc list. It also makes sure the cc list does not contain
+            # any of the bcc entries
+            cc = (self.cc - self.bcc - {target})
+            bcc = (self.bcc - {target})
+
+            #
+            # prepare our 'to'
+            #
+            to = {
+                "email": target
+            }
+            if target in self.names:
+                to["name"] = self.names[target]
+
+            # Set our target
+            payload["email"]["to"] = [to]
+
+            if len(cc):
+                payload["email"]["cc"] = []
+                for email in cc:
+                    item = {
+                        "email": email,
+                    }
+                if email in self.names:
+                    item["name"] = self.names[email]
+
+                payload["email"]["cc"].append(item)
+
+            if len(bcc):
+                payload["email"]["bcc"] = []
+                for email in bcc:
+                    item = {
+                        "email": email,
+                    }
+                if email in self.names:
+                    item["name"] = self.names[email]
+
+                payload["email"]["bcc"].append(item)
+
+            # Perform our post
+            success, _response = self._fetch(
+                self.notify_email_url, payload, target, retry=1)
+            if not success:
+                has_error = True
+                continue
+
+        return not has_error
+
+    def _fetch(self, url, payload, target=None, retry=0):
+        """
+        Wrapper to request.post() to manage it's response better and make
+        the send() function cleaner and easier to maintain.
+
+        This function returns True if the _post was successful and False
+        if it wasn't.
+        """
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+        }
+
+        access_token = self.store.get("access_token")
+        if access_token:
+            headers.update({"Authorization": f"Bearer {access_token}"})
+
+        # Some Debug Logging
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                f"SendPulse POST URL: {url}"
+                f"(cert_verify={self.verify_certificate!r})")
+            self.logger.debug(
+                "SendPulse Payload: %s", sanitize_payload(payload))
+
+        # Prepare our default response
+        response = {}
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+        try:
+            r = requests.post(
+                url,
+                data=dumps(payload),
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            try:
+                response = loads(r.content)
+
+            except (AttributeError, TypeError, ValueError):
+                # This gets thrown if we can't parse our JSON Response
+                #  - ValueError = r.content is Unparsable
+                #  - TypeError = r.content is None
+                #  - AttributeError = r is None
+                self.logger.warning("Invalid response from SendPulse server.")
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+                return (False, {})
+
+            # Reference status code
+            status_code = r.status_code
+
+            # Key likely expired, we'll reset it and try one more time
+            if status_code == requests.codes.unauthorized \
+                    and retry and self.login():
+                return self._fetch(url, payload, target, retry=retry - 1)
+
+            if status_code not in (
+                    requests.codes.ok, requests.codes.accepted):
+                # We had a problem
+                status_str = \
+                    NotifySendPulse.http_response_code_lookup(
+                        status_code)
+
+                if target:
+                    self.logger.warning(
+                        "Failed to send SendPulse notification to {}: "
+                        "{}{}error={}.".format(
+                            target,
+                            status_str,
+                            ", " if status_str else "",
+                            status_code))
+                else:
+                    self.logger.warning(
+                        "SendPulse Authentication Request failed: "
+                        "{}{}error={}.".format(
+                            status_str,
+                            ", " if status_str else "",
+                            status_code))
+
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+            else:
+                if target:
+                    self.logger.info(
+                        "Sent SendPulse notification to {}.".format(target))
+                else:
+                    self.logger.debug("SendPulse authentication successful")
+
+                return (True, response)
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                "A Connection error occurred sending SendPulse "
+                "notification to {}.".format(target))
+            self.logger.debug("Socket Exception: {}".format(str(e)))
+
+        return (False, response)
+
+    @staticmethod
+    def parse_url(url):
+        """
+        Parses the URL and returns enough arguments that can allow
+        us to re-instantiate this object.
+
+        """
+
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Define our minimum requirements; defining them now saves us from
+        # having to if/else all kinds of branches below...
+        results["from_addr"] = None
+        results["client_id"] = None
+        results["client_secret"] = None
+
+        # Prepare our targets
+        results["targets"] = []
+
+        # Our URL looks like this:
+        #    {schema}://{from_addr}:{client_id}/{client_secret}/{targets}
+        #
+        # which actually equates to:
+        #    {schema}://{user}@{host}/{client_id}/{client_secret}
+        #                                  /{email1}/{email2}/etc..
+        #                 ^       ^
+        #                 |       |
+        #                -from addr-
+        if "from" in results["qsd"]:
+            results["from_addr"] = \
+                NotifySendPulse.unquote(results["qsd"]["from"].rstrip())
+
+            if is_email(results["from_addr"]):
+                # Our hostname is free'd up to be interpreted as part of the
+                # targets
+                results["targets"].append(
+                    NotifySendPulse.unquote(results["host"]))
+                results["host"] = ""
+
+        if "user" in results["qsd"] and \
+                is_email(NotifySendPulse.unquote(results["user"])):
+            # Our hostname is free'd up to be interpreted as part of the
+            # targets
+            results["targets"].append(NotifySendPulse.unquote(results["host"]))
+            results["host"] = ""
+
+        # Get our potential email targets
+        # First 2 elements are the client_id and client_secret
+        results["targets"] += NotifySendPulse.split_path(results["fullpath"])
+        # check for our client id
+        if "id" in results["qsd"] and len(results["qsd"]["id"]):
+            # Store our Client ID
+            results["client_id"] = \
+                NotifySendPulse.unquote(results["qsd"]["id"])
+
+        elif results["targets"]:
+            # Store our Client ID
+            results["client_id"] = results["targets"].pop(0)
+
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            # Store our Client Secret
+            results["client_secret"] = \
+                NotifySendPulse.unquote(results["qsd"]["secret"])
+
+        elif results["targets"]:
+            # Store our Client Secret
+            results["client_secret"] = results["targets"].pop(0)
+
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(
+                NotifySendPulse.unquote(results["qsd"]["to"]))
+
+        # Handle Carbon Copy Addresses
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = \
+                NotifySendPulse.unquote(results["qsd"]["cc"])
+
+        # Handle Blind Carbon Copy Addresses
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = \
+                NotifySendPulse.unquote(results["qsd"]["bcc"])
+
+        # Handle Blind Carbon Copy Addresses
+        if "template" in results["qsd"] and len(results["qsd"]["template"]):
+            results["template"] = \
+                NotifySendPulse.unquote(results["qsd"]["template"])
+
+        # Add any template substitutions
+        results["template_data"] = results["qsd+"]
+
+        return results
diff --git a/libs/apprise/plugins/serverchan.py b/libs/apprise/plugins/serverchan.py
index 252f58e7b7..2d2d3fc548 100644
--- a/libs/apprise/plugins/serverchan.py
+++ b/libs/apprise/plugins/serverchan.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,13 +26,13 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 import re
+
 import requests
 
 from ..common import NotifyType
-from .base import NotifyBase
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
-
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 # Register at https://sct.ftqq.com/
 #   - do as the page describe and you will get the token
@@ -43,72 +42,69 @@
 
 
 class NotifyServerChan(NotifyBase):
-    """
-    A wrapper for ServerChan Notifications
-    """
+    """A wrapper for ServerChan Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'ServerChan'
+    service_name = "ServerChan"
 
     # The services URL
-    service_url = 'https://sct.ftqq.com/'
+    service_url = "https://sct.ftqq.com/"
 
     # All notification requests are secure
-    secure_protocol = 'schan'
+    secure_protocol = "schan"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_serverchan'
+    setup_url = "https://appriseit.com/services/serverchan/"
 
     # ServerChan API
-    notify_url = 'https://sctapi.ftqq.com/{token}.send'
+    notify_url = "https://sctapi.ftqq.com/{token}.send"
 
     # Define object templates
-    templates = (
-        '{schema}://{token}',
-    )
+    templates = ("{schema}://{token}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9-]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9-]+$", "i"),
+            },
         },
-    })
+    )
 
     def __init__(self, token, **kwargs):
-        """
-        Initialize ServerChan Object
-        """
+        """Initialize ServerChan Object."""
         super().__init__(**kwargs)
 
         # Token (associated with project)
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'An invalid ServerChan API Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid ServerChan API Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform ServerChan Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform ServerChan Notification."""
         payload = {
-            'title': title,
-            'desp': body,
+            "title": title,
+            "desp": body,
         }
 
         # Our Notification URL
         notify_url = self.notify_url.format(token=self.token)
 
         # Some Debug Logging
-        self.logger.debug('ServerChan URL: {} (cert_verify={})'.format(
-            notify_url, self.verify_certificate))
-        self.logger.debug('ServerChan Payload: {}'.format(payload))
+        self.logger.debug(
+            "ServerChan URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"ServerChan Payload: {payload}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -117,69 +113,68 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             r = requests.post(
                 notify_url,
                 data=payload,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
             )
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyServerChan.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyServerChan.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send ServerChan notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send ServerChan notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
                 return False
 
             else:
-                self.logger.info('Sent ServerChan notification.')
+                self.logger.info("Sent ServerChan notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occured sending ServerChan '
-                'notification.'
+                "A Connection error occured sending ServerChan notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def url(self, privacy=False):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
-        return '{schema}://{token}'.format(
+        return "{schema}://{token}".format(
             schema=self.secure_protocol,
-            token=self.pprint(self.token, privacy, safe=''))
+            token=self.pprint(self.token, privacy, safe=""),
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to substantiate this object.
-        """
+        """Parses the URL and returns enough arguments that can allow us to
+        substantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't parse the URL
             return results
 
-        pattern = 'schan://([a-zA-Z0-9]+)/' + \
-                  ('?' if not url.endswith('/') else '')
+        pattern = "schan://([a-zA-Z0-9]+)/" + (
+            "?" if not url.endswith("/") else ""
+        )
         result = re.match(pattern, url)
-        results['token'] = result.group(1) if result else ''
+        results["token"] = result.group(1) if result else ""
         return results
diff --git a/libs/apprise/plugins/ses.py b/libs/apprise/plugins/ses.py
index 00c890c526..62aef2ccda 100644
--- a/libs/apprise/plugins/ses.py
+++ b/libs/apprise/plugins/ses.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -79,56 +78,54 @@
 #
 #
 
-import re
-import hmac
 import base64
-import requests
-from hashlib import sha256
-from datetime import datetime
-from datetime import timezone
 from collections import OrderedDict
-from xml.etree import ElementTree
-from email.mime.text import MIMEText
+from datetime import datetime, timezone
+from email.header import Header
 from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
 from email.utils import formataddr
-from email.header import Header
+from hashlib import sha256
+import hmac
+import re
 from urllib.parse import quote
+from xml.etree import ElementTree
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_emails, validate_regex, is_email
+import requests
+
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_email, parse_emails, validate_regex
+from .base import NotifyBase
 
 # Our Regin Identifier
 # support us-gov-west-1 syntax as well
 IS_REGION = re.compile(
-    r'^\s*(?P<country>[a-z]{2})-(?P<area>[a-z-]+?)-(?P<no>[0-9]+)\s*$', re.I)
+    r"^\s*(?P<country>[a-z]{2})-(?P<area>[a-z-]+?)-(?P<no>[0-9]+)\s*$", re.I
+)
 
 # Extend HTTP Error Messages
 AWS_HTTP_ERROR_MAP = {
-    403: 'Unauthorized - Invalid Access/Secret Key Combination.',
+    403: "Unauthorized - Invalid Access/Secret Key Combination.",
 }
 
 
 class NotifySES(NotifyBase):
-    """
-    A wrapper for AWS SES (Amazon Simple Email Service)
-    """
+    """A wrapper for AWS SES (Amazon Simple Email Service)"""
 
     # The default descriptive name associated with the Notification
-    service_name = 'AWS Simple Email Service (SES)'
+    service_name = "AWS Simple Email Service (SES)"
 
     # The services URL
-    service_url = 'https://aws.amazon.com/ses/'
+    service_url = "https://aws.amazon.com/ses/"
 
     # The default secure protocol
-    secure_protocol = 'ses'
+    secure_protocol = "ses"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_ses'
+    setup_url = "https://appriseit.com/services/ses/"
 
     # Support attachments
     attachment_support = True
@@ -142,117 +139,134 @@ class NotifySES(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{from_email}/{access_key_id}/{secret_access_key}/'
-        '{region}/{targets}',
-        '{schema}://{from_email}/{access_key_id}/{secret_access_key}/'
-        '{region}',
+        (
+            "{schema}://{from_email}/{access_key_id}/{secret_access_key}/"
+            "{region}/{targets}"
+        ),
+        "{schema}://{from_email}/{access_key_id}/{secret_access_key}/{region}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'from_email': {
-            'name': _('From Email'),
-            'type': 'string',
-            'map_to': 'from_addr',
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "from_email": {
+                "name": _("From Email"),
+                "type": "string",
+                "map_to": "from_addr",
+                "required": True,
+            },
+            "access_key_id": {
+                "name": _("Access Key ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "secret_access_key": {
+                "name": _("Secret Access Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "region": {
+                "name": _("Region"),
+                "type": "string",
+                "regex": (r"^[a-z]{2}-[a-z-]+?-[0-9]+$", "i"),
+                "required": True,
+                "map_to": "region_name",
+            },
+            "targets": {
+                "name": _("Target Emails"),
+                "type": "list:string",
+            },
         },
-        'access_key_id': {
-            'name': _('Access Key ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'secret_access_key': {
-            'name': _('Secret Access Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'region': {
-            'name': _('Region'),
-            'type': 'string',
-            'regex': (r'^[a-z]{2}-[a-z-]+?-[0-9]+$', 'i'),
-            'required': True,
-            'map_to': 'region_name',
-        },
-        'targets': {
-            'name': _('Target Emails'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'from_email',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_email",
+            },
+            "reply": {
+                "name": _("Reply To Email"),
+                "type": "string",
+                "map_to": "reply_to",
+            },
+            "name": {
+                "name": _("From Name"),
+                "type": "string",
+                "map_to": "from_name",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "access": {
+                "alias_of": "access_key_id",
+            },
+            "secret": {
+                "alias_of": "secret_access_key",
+            },
+            "region": {
+                "alias_of": "region",
+            },
         },
-        'reply': {
-            'name': _('Reply To Email'),
-            'type': 'string',
-            'map_to': 'reply_to',
-        },
-        'name': {
-            'name': _('From Name'),
-            'type': 'string',
-            'map_to': 'from_name',
-        },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'access': {
-            'alias_of': 'access_key_id',
-        },
-        'secret': {
-            'alias_of': 'secret_access_key',
-        },
-        'region': {
-            'alias_of': 'region',
-        },
-    })
+    )
 
-    def __init__(self, access_key_id, secret_access_key, region_name,
-                 reply_to=None, from_addr=None, from_name=None, targets=None,
-                 cc=None, bcc=None, **kwargs):
-        """
-        Initialize Notify AWS SES Object
-        """
+    def __init__(
+        self,
+        access_key_id,
+        secret_access_key,
+        region_name,
+        reply_to=None,
+        from_addr=None,
+        from_name=None,
+        targets=None,
+        cc=None,
+        bcc=None,
+        **kwargs,
+    ):
+        """Initialize Notify AWS SES Object."""
         super().__init__(**kwargs)
 
         # Store our AWS API Access Key
         self.aws_access_key_id = validate_regex(access_key_id)
         if not self.aws_access_key_id:
-            msg = 'An invalid AWS Access Key ID was specified.'
+            msg = "An invalid AWS Access Key ID was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our AWS API Secret Access key
         self.aws_secret_access_key = validate_regex(secret_access_key)
         if not self.aws_secret_access_key:
-            msg = 'An invalid AWS Secret Access Key ' \
-                  '({}) was specified.'.format(secret_access_key)
+            msg = (
+                "An invalid AWS Secret Access Key "
+                f"({secret_access_key}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Acquire our AWS Region Name:
         # eg. us-east-1, cn-north-1, us-west-2, ...
         self.aws_region_name = validate_regex(
-            region_name, *self.template_tokens['region']['regex'])
+            region_name, *self.template_tokens["region"]["regex"]
+        )
         if not self.aws_region_name:
-            msg = 'An invalid AWS Region ({}) was specified.'.format(
-                region_name)
+            msg = f"An invalid AWS Region ({region_name}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Acquire Email 'To'
-        self.targets = list()
+        self.targets = []
 
         # Acquire Carbon Copies
         self.cc = set()
@@ -264,17 +278,16 @@ def __init__(self, access_key_id, secret_access_key, region_name,
         self.names = {}
 
         # Set our notify_url based on our region
-        self.notify_url = 'https://email.{}.amazonaws.com'\
-            .format(self.aws_region_name)
+        self.notify_url = f"https://email.{self.aws_region_name}.amazonaws.com"
 
         # AWS Service Details
-        self.aws_service_name = 'ses'
-        self.aws_canonical_uri = '/'
+        self.aws_service_name = "ses"
+        self.aws_canonical_uri = "/"
 
         # AWS Authentication Details
-        self.aws_auth_version = 'AWS4'
-        self.aws_auth_algorithm = 'AWS4-HMAC-SHA256'
-        self.aws_auth_request = 'aws4_request'
+        self.aws_auth_version = "AWS4"
+        self.aws_auth_algorithm = "AWS4-HMAC-SHA256"
+        self.aws_auth_request = "aws4_request"
 
         # Get our From username (if specified)
         self.from_name = from_name
@@ -284,12 +297,12 @@ def __init__(self, access_key_id, secret_access_key, region_name,
 
         else:
             # Get our from email address
-            self.from_addr = '{user}@{host}'.format(
-                user=self.user, host=self.host) if self.user else None
+            self.from_addr = f"{self.user}@{self.host}" if self.user else None
 
         if not (self.from_addr and is_email(self.from_addr)):
-            msg = 'An invalid AWS From ({}) was specified.'.format(
-                '{user}@{host}'.format(user=self.user, host=self.host))
+            msg = "An invalid AWS From ({}) was specified.".format(
+                f"{self.user}@{self.host}"
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -297,92 +310,107 @@ def __init__(self, access_key_id, secret_access_key, region_name,
         if reply_to:
             result = is_email(reply_to)
             if not result:
-                msg = 'An invalid AWS Reply To ({}) was specified.'.format(
-                    '{user}@{host}'.format(user=self.user, host=self.host))
+                msg = "An invalid AWS Reply To ({}) was specified.".format(
+                    f"{reply_to}"
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             self.reply_to = (
-                result['name'] if result['name'] else False,
-                result['full_email'])
+                result["name"] if result["name"] else False,
+                result["full_email"],
+            )
 
         if targets:
             # Validate recipients (to:) and drop bad ones:
             for recipient in parse_emails(targets):
                 result = is_email(recipient)
                 if result:
-                    self.targets.append(
-                        (result['name'] if result['name'] else False,
-                            result['full_email']))
+                    self.targets.append((
+                        result["name"] if result["name"] else False,
+                        result["full_email"],
+                    ))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid To email '
-                    '({}) specified.'.format(recipient),
+                    f"Dropped invalid To email ({recipient}) specified.",
                 )
 
         else:
             # If our target email list is empty we want to add ourselves to it
             self.targets.append(
-                (self.from_name if self.from_name else False, self.from_addr))
+                (self.from_name if self.from_name else False, self.from_addr)
+            )
 
         # Validate recipients (cc:) and drop bad ones:
         for recipient in parse_emails(cc):
             email = is_email(recipient)
             if email:
-                self.cc.add(email['full_email'])
+                self.cc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
             )
 
         # Validate recipients (bcc:) and drop bad ones:
         for recipient in parse_emails(bcc):
             email = is_email(recipient)
             if email:
-                self.bcc.add(email['full_email'])
+                self.bcc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
             )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        wrapper to send_notification since we can alert more then one channel
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Wrapper to send_notification since we can alert more then one
+        channel."""
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning(
-                'There are no SES email recipients to notify')
+            self.logger.warning("There are no SES email recipients to notify")
             return False
 
         # error tracking (used for function return)
         has_error = False
 
         # Initialize our default from name
-        from_name = self.from_name if self.from_name \
-            else self.reply_to[0] if self.reply_to and \
-            self.reply_to[0] else self.app_desc
+        from_name = (
+            self.from_name
+            if self.from_name
+            else (
+                self.reply_to[0]
+                if self.reply_to and self.reply_to[0]
+                else self.app_desc
+            )
+        )
 
         reply_to = (
-            from_name, self.from_addr
-            if not self.reply_to else self.reply_to[1])
+            from_name,
+            self.from_addr if not self.reply_to else self.reply_to[1],
+        )
 
         # Create a copy of the targets list
         emails = list(self.targets)
@@ -391,55 +419,67 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             to_name, to_addr = emails.pop(0)
 
             # Strip target out of cc list if in To or Bcc
-            cc = (self.cc - self.bcc - set([to_addr]))
+            cc = self.cc - self.bcc - {to_addr}
 
             # Strip target out of bcc list if in To
-            bcc = (self.bcc - set([to_addr]))
+            bcc = self.bcc - {to_addr}
 
             # Format our cc addresses to support the Name field
-            cc = [formataddr(
-                (self.names.get(addr, False), addr), charset='utf-8')
-                for addr in cc]
+            cc = [
+                formataddr(
+                    (self.names.get(addr, False), addr), charset="utf-8"
+                )
+                for addr in cc
+            ]
 
             # Format our bcc addresses to support the Name field
-            bcc = [formataddr(
-                (self.names.get(addr, False), addr), charset='utf-8')
-                for addr in bcc]
+            bcc = [
+                formataddr(
+                    (self.names.get(addr, False), addr), charset="utf-8"
+                )
+                for addr in bcc
+            ]
 
-            self.logger.debug('Email From: {} <{}>'.format(
-                quote(reply_to[0], ' '),
-                quote(reply_to[1], '@ ')))
+            self.logger.debug(
+                "Email From: {} <{}>".format(
+                    quote(reply_to[0], " "), quote(reply_to[1], "@ ")
+                )
+            )
 
-            self.logger.debug('Email To: {}'.format(to_addr))
+            self.logger.debug(f"Email To: {to_addr}")
             if cc:
-                self.logger.debug('Email Cc: {}'.format(', '.join(cc)))
+                self.logger.debug("Email Cc: {}".format(", ".join(cc)))
             if bcc:
-                self.logger.debug('Email Bcc: {}'.format(', '.join(bcc)))
+                self.logger.debug("Email Bcc: {}".format(", ".join(bcc)))
 
             # Prepare Email Message
             if self.notify_format == NotifyFormat.HTML:
-                content = MIMEText(body, 'html', 'utf-8')
+                content = MIMEText(body, "html", "utf-8")
 
             else:
-                content = MIMEText(body, 'plain', 'utf-8')
+                content = MIMEText(body, "plain", "utf-8")
 
             # Create a Multipart container if there is an attachment
-            base = MIMEMultipart() \
-                if attach and self.attachment_support else content
+            base = (
+                MIMEMultipart()
+                if attach and self.attachment_support
+                else content
+            )
 
             # TODO: Deduplicate with `NotifyEmail`?
-            base['Subject'] = Header(title, 'utf-8')
-            base['From'] = formataddr(
+            base["Subject"] = Header(title, "utf-8")
+            base["From"] = formataddr(
                 (from_name if from_name else False, self.from_addr),
-                charset='utf-8')
-            base['To'] = formataddr((to_name, to_addr), charset='utf-8')
+                charset="utf-8",
+            )
+            base["To"] = formataddr((to_name, to_addr), charset="utf-8")
             if reply_to[1] != self.from_addr:
-                base['Reply-To'] = formataddr(reply_to, charset='utf-8')
-            base['Cc'] = ','.join(cc)
-            base['Date'] = \
-                datetime.now(
-                    timezone.utc).strftime("%a, %d %b %Y %H:%M:%S +0000")
-            base['X-Application'] = self.app_id
+                base["Reply-To"] = formataddr(reply_to, charset="utf-8")
+            base["Cc"] = ",".join(cc)
+            base["Date"] = datetime.now(timezone.utc).strftime(
+                "%a, %d %b %Y %H:%M:%S +0000"
+            )
+            base["X-Application"] = self.app_id
 
             if attach and self.attachment_support:
                 # First attach our body to our content as the first element
@@ -453,47 +493,56 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                         # We could not access the attachment
                         self.logger.error(
-                            'Could not access attachment {}.'.format(
-                                attachment.url(privacy=True)))
+                            "Could not access attachment"
+                            f" {attachment.url(privacy=True)}."
+                        )
 
                         return False
 
                     self.logger.debug(
-                        'Preparing Email attachment {}'.format(
-                            attachment.url(privacy=True)))
+                        "Preparing Email attachment"
+                        f" {attachment.url(privacy=True)}"
+                    )
 
                     with open(attachment.path, "rb") as abody:
                         app = MIMEApplication(abody.read())
                         app.set_type(attachment.mimetype)
 
-                        filename = attachment.name \
-                            if attachment.name else f'file{no:03}.dat'
+                        filename = (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        )
 
                         app.add_header(
-                            'Content-Disposition',
+                            "Content-Disposition",
                             'attachment; filename="{}"'.format(
-                                Header(filename, 'utf-8')),
+                                Header(filename, "utf-8")
+                            ),
                         )
 
                         base.attach(app)
 
             # Prepare our payload object
             payload = {
-                'Action': 'SendRawEmail',
-                'Version': '2010-12-01',
-                'RawMessage.Data': base64.b64encode(
-                    base.as_string().encode('utf-8')).decode('utf-8')
+                "Action": "SendRawEmail",
+                "Version": "2010-12-01",
+                "RawMessage.Data": (
+                    base64.b64encode(base.as_string().encode("utf-8")).decode(
+                        "utf-8"
+                    )
+                ),
             }
 
-            for no, email in enumerate(([to_addr] + bcc + cc), start=1):
-                payload['Destinations.member.{}'.format(no)] = email
+            for no, email in enumerate(([to_addr, *bcc, *cc]), start=1):
+                payload[f"Destinations.member.{no}"] = email
 
             # Specify from address
-            payload['Source'] = '{} <{}>'.format(
-                quote(from_name, ' '),
-                quote(self.from_addr, '@ '))
+            payload["Source"] = "{} <{}>".format(
+                quote(from_name, " "), quote(self.from_addr, "@ ")
+            )
 
-            (result, response) = self._post(payload=payload, to=to_addr)
+            (result, _response) = self._post(payload=payload, to=to_addr)
             if not result:
                 # Mark our failure
                 has_error = True
@@ -502,12 +551,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         return not has_error
 
     def _post(self, payload, to):
-        """
-        Wrapper to request.post() to manage it's response better and make
+        """Wrapper to request.post() to manage it's response better and make
         the send() function cleaner and easier to maintain.
 
-        This function returns True if the _post was successful and False
-        if it wasn't.
+        This function returns True if the _post was successful and False if it
+        wasn't.
         """
 
         # Always call throttle before any remote server i/o is made; for AWS
@@ -524,10 +572,11 @@ def _post(self, payload, to):
         # Prepare our AWS Headers based on our payload
         headers = self.aws_prepare_request(payload)
 
-        self.logger.debug('AWS SES POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('AWS SES Payload (%d bytes)', len(payload))
+        self.logger.debug(
+            "AWS SES POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug("AWS SES Payload (%d bytes)", len(payload))
 
         try:
             r = requests.post(
@@ -540,68 +589,67 @@ def _post(self, payload, to):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifySES.http_response_code_lookup(
-                        r.status_code, AWS_HTTP_ERROR_MAP)
+                status_str = NotifySES.http_response_code_lookup(
+                    r.status_code, AWS_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send AWS SES notification to {}: '
-                    '{}{}error={}.'.format(
+                    "Failed to send AWS SES notification to {}: "
+                    "{}{}error={}.".format(
                         to,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return (False, NotifySES.aws_response_to_dict(r.text))
 
             else:
-                self.logger.info(
-                    'Sent AWS SES notification to "%s".' % (to))
+                self.logger.info(f'Sent AWS SES notification to "{to}".')
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending AWS SES '
-                'notification to "%s".' % (to),
+                "A Connection error occurred sending AWS SES "
+                f'notification to "{to}".',
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return (False, NotifySES.aws_response_to_dict(None))
 
         return (True, NotifySES.aws_response_to_dict(r.text))
 
     def aws_prepare_request(self, payload, reference=None):
-        """
-        Takes the intended payload and returns the headers for it.
+        """Takes the intended payload and returns the headers for it.
 
         The payload is presumed to have been already urlencoded()
-
         """
 
         # Define our AWS SES header
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
-
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
             # Populated below
-            'Content-Length': 0,
-            'Authorization': None,
-            'X-Amz-Date': None,
+            "Content-Length": 0,
+            "Authorization": None,
+            "X-Amz-Date": None,
         }
 
         # Get a reference time (used for header construction)
         reference = datetime.now(timezone.utc)
 
         # Provide Content-Length
-        headers['Content-Length'] = str(len(payload))
+        headers["Content-Length"] = str(len(payload))
 
         # Amazon Date Format
-        amzdate = reference.strftime('%Y%m%dT%H%M%SZ')
-        headers['X-Amz-Date'] = amzdate
+        amzdate = reference.strftime("%Y%m%dT%H%M%SZ")
+        headers["X-Amz-Date"] = amzdate
 
         # Credential Scope
-        scope = '{date}/{region}/{service}/{request}'.format(
-            date=reference.strftime('%Y%m%d'),
+        scope = "{date}/{region}/{service}/{request}".format(
+            date=reference.strftime("%Y%m%d"),
             region=self.aws_region_name,
             service=self.aws_service_name,
             request=self.aws_auth_request,
@@ -609,91 +657,78 @@ def aws_prepare_request(self, payload, reference=None):
 
         # Similar to headers; but a subset.  keys must be lowercase
         signed_headers = OrderedDict([
-            ('content-type', headers['Content-Type']),
-            ('host', 'email.{region}.amazonaws.com'.format(
-                region=self.aws_region_name)),
-            ('x-amz-date', headers['X-Amz-Date']),
+            ("content-type", headers["Content-Type"]),
+            ("host", f"email.{self.aws_region_name}.amazonaws.com"),
+            ("x-amz-date", headers["X-Amz-Date"]),
         ])
 
         #
         # Build Canonical Request Object
         #
-        canonical_request = '\n'.join([
+        canonical_request = "\n".join([
             # Method
-            u'POST',
-
+            "POST",
             # URL
             self.aws_canonical_uri,
-
             # Query String (none set for POST)
-            '',
-
+            "",
             # Header Content (must include \n at end!)
             # All entries except characters in amazon date must be
             # lowercase
-            '\n'.join(['%s:%s' % (k, v)
-                      for k, v in signed_headers.items()]) + '\n',
-
+            "\n".join([f"{k}:{v}" for k, v in signed_headers.items()]) + "\n",
             # Header Entries (in same order identified above)
-            ';'.join(signed_headers.keys()),
-
+            ";".join(signed_headers.keys()),
             # Payload
-            sha256(payload.encode('utf-8')).hexdigest(),
+            sha256(payload.encode("utf-8")).hexdigest(),
         ])
 
         # Prepare Unsigned Signature
-        to_sign = '\n'.join([
+        to_sign = "\n".join([
             self.aws_auth_algorithm,
             amzdate,
             scope,
-            sha256(canonical_request.encode('utf-8')).hexdigest(),
+            sha256(canonical_request.encode("utf-8")).hexdigest(),
         ])
 
         # Our Authorization header
-        headers['Authorization'] = ', '.join([
-            '{algorithm} Credential={key}/{scope}'.format(
-                algorithm=self.aws_auth_algorithm,
-                key=self.aws_access_key_id,
-                scope=scope,
+        headers["Authorization"] = ", ".join([
+            (
+                f"{self.aws_auth_algorithm} "
+                f"Credential={self.aws_access_key_id}/{scope}"
             ),
-            'SignedHeaders={signed_headers}'.format(
-                signed_headers=';'.join(signed_headers.keys()),
-            ),
-            'Signature={signature}'.format(
-                signature=self.aws_auth_signature(to_sign, reference)
+            "SignedHeaders={signed_headers}".format(
+                signed_headers=";".join(signed_headers.keys()),
             ),
+            f"Signature={self.aws_auth_signature(to_sign, reference)}",
         ])
 
         return headers
 
     def aws_auth_signature(self, to_sign, reference):
-        """
-        Generates a AWS v4 signature based on provided payload
-        which should be in the form of a string.
-        """
+        """Generates a AWS v4 signature based on provided payload which should
+        be in the form of a string."""
 
         def _sign(key, msg, to_hex=False):
-            """
-            Perform AWS Signing
-            """
+            """Perform AWS Signing."""
             if to_hex:
-                return hmac.new(key, msg.encode('utf-8'), sha256).hexdigest()
-            return hmac.new(key, msg.encode('utf-8'), sha256).digest()
+                return hmac.new(key, msg.encode("utf-8"), sha256).hexdigest()
+            return hmac.new(key, msg.encode("utf-8"), sha256).digest()
 
-        _date = _sign((
-            self.aws_auth_version +
-            self.aws_secret_access_key).encode('utf-8'),
-            reference.strftime('%Y%m%d'))
+        date = _sign(
+            (self.aws_auth_version + self.aws_secret_access_key).encode(
+                "utf-8"
+            ),
+            reference.strftime("%Y%m%d"),
+        )
 
-        _region = _sign(_date, self.aws_region_name)
-        _service = _sign(_region, self.aws_service_name)
-        _signed = _sign(_service, self.aws_auth_request)
-        return _sign(_signed, to_sign, to_hex=True)
+        region = _sign(date, self.aws_region_name)
+        service = _sign(region, self.aws_service_name)
+        signed = _sign(service, self.aws_auth_request)
+        return _sign(signed, to_sign, to_hex=True)
 
     @staticmethod
     def aws_response_to_dict(aws_response):
-        """
-        Takes an AWS Response object as input and returns it as a dictionary
+        """Takes an AWS Response object as input and returns it as a dictionary
         but not befor extracting out what is useful to us first.
 
         eg:
@@ -724,21 +759,20 @@ def aws_response_to_dict(aws_response):
         # then identify the value we want to map them to in our response
         # object
         aws_keep_map = {
-            'RequestId': 'request_id',
-            'MessageId': 'message_id',
-
+            "RequestId": "request_id",
+            "MessageId": "message_id",
             # Error Message Handling
-            'Type': 'error_type',
-            'Code': 'error_code',
-            'Message': 'error_message',
+            "Type": "error_type",
+            "Code": "error_code",
+            "Message": "error_message",
         }
 
         # A default response object that we'll manipulate as we pull more data
         # from our AWS Response object
         response = {
-            'type': None,
-            'request_id': None,
-            'message_id': None,
+            "type": None,
+            "request_id": None,
+            "message_id": None,
         }
 
         try:
@@ -746,10 +780,11 @@ def aws_response_to_dict(aws_response):
             # reference to namespacing (if present) as it makes parsing
             # the tree so much easier.
             root = ElementTree.fromstring(
-                re.sub(' xmlns="[^"]+"', '', aws_response, count=1))
+                re.sub(r' xmlns="[^"]+"', "", aws_response, count=1)
+            )
 
             # Store our response tag object name
-            response['type'] = str(root.tag)
+            response["type"] = str(root.tag)
 
             def _xml_iter(root, response):
                 if len(root) > 0:
@@ -757,7 +792,7 @@ def _xml_iter(root, response):
                         # use recursion to parse everything
                         _xml_iter(child, response)
 
-                elif root.tag in aws_keep_map.keys():
+                elif root.tag in aws_keep_map:
                     response[aws_keep_map[root.tag]] = (root.text).strip()
 
             # Recursivly iterate over our AWS Response to extract the
@@ -773,80 +808,96 @@ def _xml_iter(root, response):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.from_addr, self.aws_access_key_id,
-            self.aws_secret_access_key, self.aws_region_name,
+            self.secure_protocol,
+            self.from_addr,
+            self.aws_access_key_id,
+            self.aws_secret_access_key,
+            self.aws_region_name,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Acquire any global URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if self.from_name is not None:
             # from_name specified; pass it back on the url
-            params['name'] = self.from_name
+            params["name"] = self.from_name
 
         if self.cc:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join(
-                ['{}{}'.format(
-                    '' if not e not in self.names
-                    else '{}:'.format(self.names[e]), e) for e in self.cc])
+            params["cc"] = ",".join([
+                "{}{}".format(
+                    "" if not e not in self.names else f"{self.names[e]}:",
+                    e,
+                )
+                for e in self.cc
+            ])
 
         if self.bcc:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join(self.bcc)
+            params["bcc"] = ",".join(self.bcc)
 
         if self.reply_to:
             # Handle our reply to address
-            params['reply'] = '{} <{}>'.format(*self.reply_to) \
-                if self.reply_to[0] else self.reply_to[1]
+            params["reply"] = (
+                "{} <{}>".format(*self.reply_to)
+                if self.reply_to[0]
+                else self.reply_to[1]
+            )
 
         # a simple boolean check as to whether we display our target emails
         # or not
-        has_targets = \
-            not (len(self.targets) == 1
-                 and self.targets[0][1] == self.from_addr)
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0][1] == self.from_addr
+        )
 
-        return '{schema}://{from_addr}/{key_id}/{key_secret}/{region}/' \
-            '{targets}/?{params}'.format(
+        return (
+            "{schema}://{from_addr}/{key_id}/{key_secret}/{region}/"
+            "{targets}/?{params}".format(
                 schema=self.secure_protocol,
-                from_addr=NotifySES.quote(self.from_addr, safe='@'),
-                key_id=self.pprint(self.aws_access_key_id, privacy, safe=''),
+                from_addr=NotifySES.quote(self.from_addr, safe="@"),
+                key_id=self.pprint(self.aws_access_key_id, privacy, safe=""),
                 key_secret=self.pprint(
-                    self.aws_secret_access_key, privacy,
-                    mode=PrivacyMode.Secret, safe=''),
-                region=NotifySES.quote(self.aws_region_name, safe=''),
-                targets='' if not has_targets else '/'.join(
-                    [NotifySES.quote('{}{}'.format(
-                        '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                        safe='') for e in self.targets]),
+                    self.aws_secret_access_key,
+                    privacy,
+                    mode=PrivacyMode.Secret,
+                    safe="",
+                ),
+                region=NotifySES.quote(self.aws_region_name, safe=""),
+                targets=(
+                    ""
+                    if not has_targets
+                    else "/".join([
+                        NotifySES.quote(
+                            "{}{}".format(
+                                "" if not e[0] else f"{e[0]}:", e[1]
+                            ),
+                            safe="",
+                        )
+                        for e in self.targets
+                    ])
+                ),
                 params=NotifySES.urlencode(params),
             )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -854,7 +905,7 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        entries = NotifySES.split_path(results['fullpath'])
+        entries = NotifySES.split_path(results["fullpath"])
 
         # The AWS Access Key ID is stored in the first entry
         access_key_id = entries.pop(0) if entries else None
@@ -869,7 +920,7 @@ def parse_url(url):
         # We need to iterate over each entry in the fullpath and find our
         # region. Once we get there we stop and build our secret from our
         # accumulated data.
-        secret_access_key_parts = list()
+        secret_access_key_parts = []
 
         # Section 1: Get Region and Access Secret
         index = 0
@@ -880,9 +931,9 @@ def parse_url(url):
             if result:
                 # Ensure region is nicely formatted
                 region_name = "{country}-{area}-{no}".format(
-                    country=result.group('country').lower(),
-                    area=result.group('area').lower(),
-                    no=result.group('no'),
+                    country=result.group("country").lower(),
+                    area=result.group("area").lower(),
+                    no=result.group("no"),
                 )
 
                 # We're done with Section 1 of our url (the credentials)
@@ -897,59 +948,62 @@ def parse_url(url):
             secret_access_key_parts.append(entry)
 
         # Prepare our Secret Access Key
-        secret_access_key = '/'.join(secret_access_key_parts) \
-            if secret_access_key_parts else None
+        secret_access_key = (
+            "/".join(secret_access_key_parts)
+            if secret_access_key_parts
+            else None
+        )
 
         # Section 2: Get our Recipients (basically all remaining entries)
-        results['targets'] = entries[index:]
+        results["targets"] = entries[index:]
 
-        if 'name' in results['qsd'] and len(results['qsd']['name']):
+        if "name" in results["qsd"] and len(results["qsd"]["name"]):
             # Extract from name to associate with from address
-            results['from_name'] = \
-                NotifySES.unquote(results['qsd']['name'])
+            results["from_name"] = NotifySES.unquote(results["qsd"]["name"])
 
         # Handle 'to' email address
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].append(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(results["qsd"]["to"])
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = NotifySES.parse_list(results['qsd']['cc'])
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = NotifySES.parse_list(results["qsd"]["cc"])
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = NotifySES.parse_list(results['qsd']['bcc'])
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = NotifySES.parse_list(results["qsd"]["bcc"])
 
         # Handle From Address handling
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['from_addr'] = \
-                NotifySES.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["from_addr"] = NotifySES.unquote(results["qsd"]["from"])
 
         # Handle Reply To Address
-        if 'reply' in results['qsd'] and len(results['qsd']['reply']):
-            results['reply_to'] = \
-                NotifySES.unquote(results['qsd']['reply'])
+        if "reply" in results["qsd"] and len(results["qsd"]["reply"]):
+            results["reply_to"] = NotifySES.unquote(results["qsd"]["reply"])
 
         # Handle secret_access_key over-ride
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
-            results['secret_access_key'] = \
-                NotifySES.unquote(results['qsd']['secret'])
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            results["secret_access_key"] = NotifySES.unquote(
+                results["qsd"]["secret"]
+            )
         else:
-            results['secret_access_key'] = secret_access_key
+            results["secret_access_key"] = secret_access_key
 
         # Handle access key id over-ride
-        if 'access' in results['qsd'] and len(results['qsd']['access']):
-            results['access_key_id'] = \
-                NotifySES.unquote(results['qsd']['access'])
+        if "access" in results["qsd"] and len(results["qsd"]["access"]):
+            results["access_key_id"] = NotifySES.unquote(
+                results["qsd"]["access"]
+            )
         else:
-            results['access_key_id'] = access_key_id
+            results["access_key_id"] = access_key_id
 
         # Handle region name id over-ride
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
-            results['region_name'] = \
-                NotifySES.unquote(results['qsd']['region'])
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
+            results["region_name"] = NotifySES.unquote(
+                results["qsd"]["region"]
+            )
         else:
-            results['region_name'] = region_name
+            results["region_name"] = region_name
 
         # Return our result set
         return results
diff --git a/libs/apprise/plugins/seven.py b/libs/apprise/plugins/seven.py
index 2536647f4c..f147821626 100644
--- a/libs/apprise/plugins/seven.py
+++ b/libs/apprise/plugins/seven.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,33 +29,33 @@
 # Get your (apikey) from here:
 #   - https://help.seven.io/en/api-key-access
 #
-import requests
 import json
-from .base import NotifyBase
+
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_bool, parse_phone_no
+from .base import NotifyBase
 
 
 class NotifySeven(NotifyBase):
-    """
-    A wrapper for seven Notifications
-    """
+    """A wrapper for seven Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'seven'
+    service_name = "seven"
 
     # The services URL
-    service_url = 'https://www.seven.io'
+    service_url = "https://www.seven.io"
 
     # The default protocol
-    secure_protocol = 'seven'
+    secure_protocol = "seven"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_seven'
+    setup_url = "https://appriseit.com/services/seven/"
 
     # Seven uses the http protocol with JSON requests
-    notify_url = 'https://gateway.seven.io/api/sms'
+    notify_url = "https://gateway.seven.io/api/sms"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -66,84 +65,117 @@ class NotifySeven(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}/{targets}',
-    )
+    templates = ("{schema}://{apikey}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        }
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "source": {
+                # Originating address,In cases where the rewriting of the
+                # sender's address is supported or permitted by the SMS-C.
+                # This is used to transmit the message, this number is
+                # transmitted as the originating address and is completely
+                # optional.
+                "name": _("Originating Address"),
+                "type": "string",
+                "map_to": "source",
+            },
+            "from": {
+                "alias_of": "source",
+            },
+            "flash": {
+                "name": _("Flash"),
+                "type": "bool",
+                "default": False,
+            },
+            "label": {"name": _("Label"), "type": "string"},
         },
-    })
+    )
 
-    def __init__(self, apikey, targets=None, **kwargs):
-        """
-        Initialize Seven Object
-        """
+    def __init__(
+        self,
+        apikey,
+        targets=None,
+        source=None,
+        flash=None,
+        label=None,
+        **kwargs,
+    ):
+        """Initialize Seven Object."""
         super().__init__(**kwargs)
         # API Key (associated with project)
         self.apikey = apikey
         if not self.apikey:
-            msg = 'An invalid seven API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid seven API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
+        self.source = None if not isinstance(source, str) else source.strip()
+        self.flash = (
+            self.template_args["flash"]["default"]
+            if flash is None
+            else bool(flash)
+        )
+        self.label = None if not isinstance(label, str) else label.strip()
+
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
         return
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another similar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform seven Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform seven Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no seven targets to notify.')
+            self.logger.warning("There were no seven targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -151,29 +183,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'SentWith': 'Apprise',
-            'X-Api-Key': self.apikey,
+            "Accept": "application/json",
+            "Content-Type": "application/json",
+            "SentWith": "Apprise",
+            "X-Api-Key": self.apikey,
         }
 
         # Prepare our payload
         payload = {
-            'to': None,
-            'text': body,
+            "to": None,
+            "text": body,
         }
+        if self.source:
+            payload["from"] = self.source
+        if self.flash:
+            payload["flash"] = self.flash
+        if self.label:
+            payload["label"] = self.label
         # Create a copy of the targets list
         targets = list(self.targets)
         while len(targets):
             # Get our target to notify
             target = targets.pop(0)
             # Prepare our user
-            payload['to'] = '+{}'.format(target)
+            payload["to"] = f"+{target}"
             # Some Debug Logging
             self.logger.debug(
-                'seven POST URL: {} (cert_verify={})'.format(
-                    self.notify_url, self.verify_certificate))
-            self.logger.debug('seven Payload: {}' .format(payload))
+                "seven POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"seven Payload: {payload}")
             # Always call throttle before any remote server i/o is made
             self.throttle()
             try:
@@ -210,64 +249,73 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 #     ]
                 # }
                 if r.status_code not in (
-                        requests.codes.ok, requests.codes.created):
+                    requests.codes.ok,
+                    requests.codes.created,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifySeven.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifySeven.http_response_code_lookup(
+                        r.status_code
+                    )
                     self.logger.warning(
-                        'Failed to send seven notification to {}: '
-                        '{}{}error={}.'.format(
-                            ','.join(target),
+                        "Failed to send seven notification to {}: "
+                        "{}{}error={}.".format(
+                            ",".join(target),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
                     # Mark our failure
                     has_error = True
                     continue
                 else:
-                    self.logger.info(
-                        'Sent seven notification to {}.'.format(target))
+                    self.logger.info(f"Sent seven notification to {target}.")
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending seven:%s ' % (
-                        target) + 'notification.'
+                    f"A Connection error occurred sending seven:{target} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
                 # Mark our failure
                 has_error = True
                 continue
         return not has_error
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
+
+        params = {
+            "flash": "yes" if self.flash else "no",
+        }
+        if self.source:
+            params["from"] = self.source
+        if self.label:
+            params["label"] = self.label
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
-        return '{schema}://{apikey}/{targets}/?{params}'.format(
+
+        return "{schema}://{apikey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='/'.join(
-                [NotifySeven.quote(x, safe='') for x in self.targets]),
-            params=NotifySeven.urlencode(params))
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join(
+                [NotifySeven.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifySeven.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -276,15 +324,26 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifySeven.split_path(results['fullpath'])
+        results["targets"] = NotifySeven.split_path(results["fullpath"])
 
         # The hostname is our authentication key
-        results['apikey'] = NotifySeven.unquote(results['host'])
+        results["apikey"] = NotifySeven.unquote(results["host"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySeven.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySeven.parse_phone_no(
+                results["qsd"]["to"]
+            )
+
+        # Support the 'from' and source variable
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifySeven.unquote(results["qsd"]["from"])
+
+        elif "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifySeven.unquote(results["qsd"]["source"])
+
+        results["flash"] = parse_bool(results["qsd"].get("flash", False))
+        results["label"] = results["qsd"].get("label", None)
 
         return results
diff --git a/libs/apprise/plugins/sfr.py b/libs/apprise/plugins/sfr.py
index 2c8e7ece25..1d528195e7 100644
--- a/libs/apprise/plugins/sfr.py
+++ b/libs/apprise/plugins/sfr.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -41,37 +40,36 @@
 # 2. Url will look like this
 #    https://www.dmc.sfr-sh.fr/DmcWS/1.5.8/JsonService/<apiGroup>/<apicall>
 
-import requests
 import json
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
-from ..utils.parse import is_phone_no, parse_phone_no
 from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_phone_no
+from .base import NotifyBase
 
 
 class NotifySFR(NotifyBase):
-    """
-    A wrapper for SFR French Telecom DMC API
-    """
+    """A wrapper for SFR French Telecom DMC API."""
 
     # The default descriptive name associated with the Notification
-    service_name = _('Sociรฉtรฉ Franรงaise du Radiotรฉlรฉphone')
+    service_name = _("Sociรฉtรฉ Franรงaise du Radiotรฉlรฉphone")
 
     # The services URL
-    service_url = 'https://www.sfr.fr/'
+    service_url = "https://www.sfr.fr/"
 
     # The default protocol
-    protocol = 'sfr'
+    protocol = "sfr"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_sfr'
+    setup_url = "https://appriseit.com/services/sfr/"
 
     # SFR api
     notify_url = (
-        'https://www.dmc.sfr-sh.fr/DmcWS/1.5.8/JsonService/'
-        'MessagesUnitairesWS/addSingleCall'  # this is the actual api call
+        "https://www.dmc.sfr-sh.fr/DmcWS/1.5.8/JsonService/"
+        "MessagesUnitairesWS/addSingleCall"  # this is the actual api call
     )
 
     # The maximum length of the body
@@ -82,118 +80,123 @@ class NotifySFR(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{user}:{password}@{space_id}/{targets}',
-    )
+    templates = ("{schema}://{user}:{password}@{space_id}/{targets}",)
 
     # Define our tokens
     template_tokens = dict(
-        NotifyBase.template_tokens, **{
-            'user': {
-                'name': _('Service ID'),
-                'type': 'string',
-                'required': True,
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("Service ID"),
+                "type": "string",
+                "required": True,
             },
-            'password': {
-                'name': _('Service Password'),
-                'type': 'string',
-                'private': True,
-                'required': True,
+            "password": {
+                "name": _("Service Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
             },
-            'space_id': {
-                'name': _('Space ID'),
-                'type': 'string',
-                'private': True,
-                'required': True,
+            "space_id": {
+                "name": _("Space ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
             },
-            'target': {
-                'name': _('Recipient Phone Number'),
-                'type': 'string',
-                'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-                'map_to': 'targets',
+            "target": {
+                "name": _("Recipient Phone Number"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
             },
-            'targets': {
-                'name': _('Targets'),
-                'type': 'list:string',
-                'required': True,
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
             },
-        }
+        },
     )
 
     # Define our template arguments
     template_args = dict(
-        NotifyBase.template_args, **{
-            'lang': {
-                'name': _('Language'),
-                'type': 'string',
-                'default': 'fr_FR',
-                'required': True,
-            },
-            'sender': {
-                'name': _('Sender Name'),
-                'type': 'string',
-                'required': True,
-                'default': '',
+        NotifyBase.template_args,
+        **{
+            "lang": {
+                "name": _("Language"),
+                "type": "string",
+                "default": "fr_FR",
+                "required": True,
             },
-            'from': {
-                'alias_of': 'sender'
+            "sender": {
+                "name": _("Sender Name"),
+                "type": "string",
+                "required": True,
+                "default": "",
             },
-            'media': {
-                'name': _('Media Type'),
-                'type': 'string',
-                'required': True,
-                'default': 'SMSUnicode',
-                'values': ['SMS', 'SMSLong', 'SMSUnicode', 'SMSUnicodeLong'],
+            "from": {"alias_of": "sender"},
+            "media": {
+                "name": _("Media Type"),
+                "type": "string",
+                "required": True,
+                "default": "SMSUnicode",
+                "values": ["SMS", "SMSLong", "SMSUnicode", "SMSUnicodeLong"],
             },
-            'timeout': {
-                'name': _('Timeout'),
-                'type': 'int',
-                'default': 2880,
-                'required': False,
+            "timeout": {
+                "name": _("Timeout"),
+                "type": "int",
+                "default": 2880,
+                "required": False,
             },
-            'voice': {
-                'name': _('TTS Voice'),
-                'type': 'string',
-                'default': 'claire08s',
-                'values': ['claire08s', 'laura8k'],
-                'required': False,
+            "voice": {
+                "name": _("TTS Voice"),
+                "type": "string",
+                "default": "claire08s",
+                "values": ["claire08s", "laura8k"],
+                "required": False,
             },
-            'to': {
-                'alias_of': 'targets',
+            "to": {
+                "alias_of": "targets",
             },
-        }
+        },
     )
 
-    def __init__(self, space_id=None, targets=None, lang=None, sender=None,
-                 media=None, timeout=None, voice=None, **kwargs):
-        """
-        Initialize SFR Object
-        """
+    def __init__(
+        self,
+        space_id=None,
+        targets=None,
+        lang=None,
+        sender=None,
+        media=None,
+        timeout=None,
+        voice=None,
+        **kwargs,
+    ):
+        """Initialize SFR Object."""
         super().__init__(**kwargs)
 
         if not (self.user and self.password):
-            msg = 'A SFR user (serviceId) and password (servicePassword) ' \
-                  'combination was not provided.'
+            msg = (
+                "A SFR user (serviceId) and password (servicePassword) "
+                "combination was not provided."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.space_id = space_id
         if not self.space_id:
-            msg = 'A SFR Space ID is required.'
+            msg = "A SFR Space ID is required."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        self.voice = voice \
-            if voice else self.template_args['voice']['default']
-        self.lang = lang \
-            if lang else self.template_args['lang']['default']
-        self.media = media \
-            if media else self.template_args['media']['default']
-        self.sender = sender \
-            if sender else self.template_args['sender']['default']
+        self.voice = voice if voice else self.template_args["voice"]["default"]
+        self.lang = lang if lang else self.template_args["lang"]["default"]
+        self.media = media if media else self.template_args["media"]["default"]
+        self.sender = (
+            sender if sender else self.template_args["sender"]["default"]
+        )
 
         # Set our Time to Live Flag
-        self.timeout = self.template_args['timeout']['default']
+        self.timeout = self.template_args["timeout"]["default"]
         try:
             self.timeout = int(timeout)
 
@@ -203,33 +206,32 @@ def __init__(self, space_id=None, targets=None, lang=None, sender=None,
             pass
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         if not self.targets:
-            msg = ('No receiver phone number has been provided. Please '
-                   'provide as least one valid phone number.')
+            msg = (
+                "No receiver phone number has been provided. Please "
+                "provide as least one valid phone number."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform the SFR notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform the SFR notification."""
 
         # error tracking (used for function return)
         has_error = False
@@ -239,25 +241,25 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Construct the authentication JSON
         auth_payload = json.dumps({
-            'serviceId': self.user,
-            'servicePassword': self.password,
-            'spaceId': self.space_id,
-            'lang': self.lang,
+            "serviceId": self.user,
+            "servicePassword": self.password,
+            "spaceId": self.space_id,
+            "lang": self.lang,
         })
 
         base_payload = {
             # Can be 'SMS', 'SMSLong', 'SMSUnicode', or 'SMSUnicodeLong'
-            'media': self.media,
+            "media": self.media,
             # Content of the message
-            'textMsg': body,
+            "textMsg": body,
             # Receiver's phone number (set below)
-            'to': None,
+            "to": None,
             # Optional, default to ''
-            'from': self.sender,
+            "from": self.sender,
             # Optional, default 2880 minutes
-            'timeout': self.timeout,
+            "timeout": self.timeout,
             # Optional, default to French voice
-            'ttsVoice': self.voice,
+            "ttsVoice": self.voice,
         }
 
         while len(targets):
@@ -265,21 +267,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our target phone no
-            base_payload['to'] = target
+            base_payload["to"] = target
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
 
             # Finalize our payload
             payload = {
-                'authenticate': auth_payload,
-                'messageUnitaire': json.dumps(base_payload, ensure_ascii=True)
+                "authenticate": auth_payload,
+                "messageUnitaire": json.dumps(base_payload, ensure_ascii=True),
             }
 
             # Some Debug Logging
-            self.logger.debug('SFR POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('SFR Payload: {}' .format(payload))
+            self.logger.debug(
+                "SFR POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"SFR Payload: {payload}")
 
             try:
                 r = requests.post(
@@ -300,24 +304,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 # Check if the request was successfull
                 if r.status_code not in (
-                        requests.codes.ok,
-                        requests.codes.no_content,
+                    requests.codes.ok,
+                    requests.codes.no_content,
                 ):
                     # We had a problem
-                    status_str = \
-                        NotifySFR.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifySFR.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send SFR notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send SFR notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -326,28 +332,28 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # SFR returns a code 200 even if the authentication fails
                 # It then indicates in the content['success'] field the
                 # Actual state of the transaction
-                if not content.get('success', False):
+                if not content.get("success", False):
                     self.logger.warning(
-                        'SFR Notification to {} was not sent by the server: '
-                        'server_error={}, fatal={}.'.format(
+                        "SFR Notification to {} was not sent by the server: "
+                        "server_error={}, fatal={}.".format(
                             target,
-                            content.get('errorCode', 'UNKNOWN'),
-                            content.get('fatal', 'True'),
-                        ))
+                            content.get("errorCode", "UNKNOWN"),
+                            content.get("fatal", "True"),
+                        )
+                    )
 
                     # Mark our failure
                     has_error = True
                     continue
 
-                self.logger.info(
-                    'Sent SFR notification to %s.' % target)
+                self.logger.info(f"Sent SFR notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending SFR:%s '
-                    'notification.' % target
+                    f"A Connection error occurred sending SFR:{target} "
+                    "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -357,58 +363,56 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.space_id,
+            self.user,
+            self.password,
+            self.space_id,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
         # Define any URL parameters
         params = {
-            'from': self.sender,
-            'timeout': str(self.timeout),
-            'voice': self.voice,
-            'lang': self.lang,
-            'media': self.media,
+            "from": self.sender,
+            "timeout": str(self.timeout),
+            "voice": self.voice,
+            "lang": self.lang,
+            "media": self.media,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{user}:{password}@{sid}/{targets}?{params}'.format(
+        return "{schema}://{user}:{password}@{sid}/{targets}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             user=self.user,
             password=self.pprint(
                 self.password,
                 privacy,
                 mode=PrivacyMode.Secret,
-                safe='',
+                safe="",
+            ),
+            sid=self.pprint(self.space_id, privacy, safe=""),
+            targets="/".join(
+                [NotifySFR.quote(x, safe="") for x in self.targets]
             ),
-            sid=self.pprint(self.space_id, privacy, safe=''),
-            targets='/'.join(
-                [NotifySFR.quote(x, safe='') for x in self.targets]),
             params=self.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parse the URL and return arguments required to initialize this plugin
-        """
+        """Parse the URL and return arguments required to initialize this
+        plugin."""
         # NotifyBase.parse_url() will make the initial parsing of your string
         # very easy to use. It will tokenize the entire URL for you.  The
         # tokens are then passed into your __init__() function you defined to
@@ -421,22 +425,24 @@ def parse_url(url):
             return results
 
         # Extract user and password
-        results['space_id'] = results.get('host')
-        results['targets'] = NotifySFR.split_path(results['fullpath'])
+        results["space_id"] = results.get("host")
+        results["targets"] = NotifySFR.split_path(results["fullpath"])
 
         # Extract additional parameters
-        qsd = results.get('qsd', {})
-        results['sender'] = \
-            NotifySFR.unquote(qsd.get('sender', qsd.get('from')))
-        results['timeout'] = NotifySFR.unquote(qsd.get('timeout'))
-        results['voice'] = NotifySFR.unquote(qsd.get('voice'))
-        results['lang'] = NotifySFR.unquote(qsd.get('lang'))
-        results['media'] = NotifySFR.unquote(qsd.get('media'))
+        qsd = results.get("qsd", {})
+        results["sender"] = NotifySFR.unquote(
+            qsd.get("sender", qsd.get("from"))
+        )
+        results["timeout"] = NotifySFR.unquote(qsd.get("timeout"))
+        results["voice"] = NotifySFR.unquote(qsd.get("voice"))
+        results["lang"] = NotifySFR.unquote(qsd.get("lang"))
+        results["media"] = NotifySFR.unquote(qsd.get("media"))
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySFR.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySFR.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/signal_api.py b/libs/apprise/plugins/signal_api.py
index 92860d0d60..a6ccc30067 100644
--- a/libs/apprise/plugins/signal_api.py
+++ b/libs/apprise/plugins/signal_api.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,41 +25,44 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from __future__ import annotations
+
+from json import dumps
+import logging
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyType
 from .. import exception
-from ..utils.parse import is_phone_no, parse_phone_no, parse_bool
-from ..url import PrivacyMode
+from ..common import NotifyType
 from ..locale import gettext_lazy as _
-
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_bool, parse_phone_no
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase, NotifyFormat
 
 GROUP_REGEX = re.compile(
-    r'^\s*((\@|\%40)?(group\.)|\@|\%40)(?P<group>[a-z0-9_=-]+)', re.I)
+    r"^\s*((\@|\%40)?(group\.)|\@|\%40)(?P<group>[a-z0-9_=-]+)", re.I
+)
 
 
 class NotifySignalAPI(NotifyBase):
-    """
-    A wrapper for SignalAPI Notifications
-    """
+    """A wrapper for SignalAPI Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Signal API'
+    service_name = "Signal API"
 
     # The services URL
-    service_url = 'https://bbernhard.github.io/signal-cli-rest-api/'
+    service_url = "https://bbernhard.github.io/signal-cli-rest-api/"
 
     # The default protocol
-    protocol = 'signal'
+    protocol = "signal"
 
     # The default protocol
-    secure_protocol = 'signals'
+    secure_protocol = "signals"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_signal'
+    setup_url = "https://appriseit.com/services/signal/"
 
     # Support attachments
     attachment_support = True
@@ -73,94 +75,99 @@ class NotifySignalAPI(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{from_phone}',
-        '{schema}://{host}:{port}/{from_phone}',
-        '{schema}://{user}@{host}/{from_phone}',
-        '{schema}://{user}@{host}:{port}/{from_phone}',
-        '{schema}://{user}:{password}@{host}/{from_phone}',
-        '{schema}://{user}:{password}@{host}:{port}/{from_phone}',
-        '{schema}://{host}/{from_phone}/{targets}',
-        '{schema}://{host}:{port}/{from_phone}/{targets}',
-        '{schema}://{user}@{host}/{from_phone}/{targets}',
-        '{schema}://{user}@{host}:{port}/{from_phone}/{targets}',
-        '{schema}://{user}:{password}@{host}/{from_phone}/{targets}',
-        '{schema}://{user}:{password}@{host}:{port}/{from_phone}/{targets}',
+        "{schema}://{host}/{from_phone}",
+        "{schema}://{host}:{port}/{from_phone}",
+        "{schema}://{user}@{host}/{from_phone}",
+        "{schema}://{user}@{host}:{port}/{from_phone}",
+        "{schema}://{user}:{password}@{host}/{from_phone}",
+        "{schema}://{user}:{password}@{host}:{port}/{from_phone}",
+        "{schema}://{host}/{from_phone}/{targets}",
+        "{schema}://{host}:{port}/{from_phone}/{targets}",
+        "{schema}://{user}@{host}/{from_phone}/{targets}",
+        "{schema}://{user}@{host}:{port}/{from_phone}/{targets}",
+        "{schema}://{user}:{password}@{host}/{from_phone}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{from_phone}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "target_channel": {
+                "name": _("Target Group ID"),
+                "type": "string",
+                "prefix": "@",
+                "regex": (r"^[a-z0-9_=-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'target_channel': {
-            'name': _('Target Group ID'),
-            'type': 'string',
-            'prefix': '@',
-            'regex': (r'^[a-z0-9_=-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        }
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'from_phone',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
+            "status": {
+                "name": _("Show Status"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-        'status': {
-            'name': _('Show Status'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
-    def __init__(self, source=None, targets=None, batch=False, status=False,
-                 **kwargs):
-        """
-        Initialize SignalAPI Object
-        """
+    def __init__(
+        self, source=None, targets=None, batch=False, status=False, **kwargs
+    ):
+        """Initialize SignalAPI Object."""
         super().__init__(**kwargs)
 
         # Prepare Batch Mode Flag
@@ -170,20 +177,22 @@ def __init__(self, source=None, targets=None, batch=False, status=False,
         self.status = status
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         # Used for URL generation afterwards only
-        self.invalid_targets = list()
+        self.invalid_targets = []
 
         # Manage our Source Phone
         result = is_phone_no(source)
         if not result:
-            msg = 'An invalid Signal API Source Phone No ' \
-                  '({}) was provided.'.format(source)
+            msg = (
+                "An invalid Signal API Source Phone No "
+                f"({source}) was provided."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        self.source = '+{}'.format(result['full'])
+        self.source = "+{}".format(result["full"])
 
         if targets:
             # Validate our targerts
@@ -192,19 +201,19 @@ def __init__(self, source=None, targets=None, batch=False, status=False,
                 result = is_phone_no(target)
                 if result:
                     # store valid phone number
-                    self.targets.append('+{}'.format(result['full']))
+                    self.targets.append("+{}".format(result["full"]))
                     continue
 
                 result = GROUP_REGEX.match(target)
                 if result:
                     # Just store group information
                     self.targets.append(
-                        'group.{}'.format(result.group('group')))
+                        "group.{}".format(result.group("group"))
+                    )
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid phone/group '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone/group ({target}) specified.",
                 )
                 self.invalid_targets.append(target)
                 continue
@@ -215,16 +224,19 @@ def __init__(self, source=None, targets=None, batch=False, status=False,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Signal API Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Signal API Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning(
-                'There were no Signal API targets to notify.')
+            self.logger.warning("There were no Signal API targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -237,8 +249,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Signal API attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Signal API attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
@@ -247,20 +260,28 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access Signal API attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access Signal API attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending Signal API attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending Signal API attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
+        # Support Styled (Markdown formatting)
+        text_mode = (
+            "styled" if self.notify_format == NotifyFormat.MARKDOWN
+            else "normal"
+        )
+
         # Format defined here:
         #   https://bbernhard.github.io/signal-cli-rest-api\
         #       /#/Messages/post_v2_send
@@ -277,16 +298,24 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         # }
         # Prepare our payload
         payload = {
-            'message': "{}{}".format(
-                '' if not self.status else '{} '.format(
-                    self.asset.ascii(notify_type)), body).rstrip(),
+            "message": (
+                "{}{}".format(
+                    (
+                        ""
+                        if not self.status
+                        else f"{self.asset.ascii(notify_type)} "
+                    ),
+                    body,
+                ).rstrip()
+            ),
             "number": self.source,
-            "recipients": []
+            "text_mode": text_mode,
+            "recipients": [],
         }
 
         if attachments:
             # Store our attachments
-            payload['base64_attachments'] = attachments
+            payload["base64_attachments"] = attachments
 
         # Determine Authentication
         auth = None
@@ -294,25 +323,39 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
         # Construct our URL
-        notify_url = '%s://%s' % (schema, self.host)
+        notify_url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            notify_url += ':%d' % self.port
-        notify_url += '/v2/send'
+            notify_url += f":{self.port}"
+        notify_url += "/v2/send"
 
         # Send in batches if identified to do so
         batch_size = 1 if not self.batch else self.default_batch_size
 
         for index in range(0, len(self.targets), batch_size):
             # Prepare our recipients
-            payload['recipients'] = self.targets[index:index + batch_size]
-
-            self.logger.debug('Signal API POST URL: %s (cert_verify=%r)' % (
-                notify_url, self.verify_certificate,
-            ))
-            self.logger.debug('Signal API Payload: %s' % str(payload))
+            payload["recipients"] = self.targets[index : index + batch_size]
+
+            # Some Debug Logging
+            if self.logger.isEnabledFor(logging.DEBUG):
+                # Due to attachments; output can be quite heavy and io
+                # intensive.
+                # To accommodate this, we only show our debug payload
+                # information if required.
+                self.logger.debug(
+                    "Signal API POST URL:"
+                    f" {notify_url} (cert_verify={self.verify_certificate!r})"
+                )
+                log_payload = dict(payload)
+                log_payload.pop("recipients", None)
+                self.logger.debug(
+                    "Signal API Payload: %s", sanitize_payload(log_payload))
+                self.logger.debug(
+                    "Signal API Recipients: %s",
+                    payload.get("recipients", []),
+                )
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -326,24 +369,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     timeout=self.request_timeout,
                 )
                 if r.status_code not in (
-                        requests.codes.ok, requests.codes.created):
+                    requests.codes.ok,
+                    requests.codes.created,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifySignalAPI.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifySignalAPI.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send {} Signal API notification{}: '
-                        '{}{}error={}.'.format(
-                            len(self.targets[index:index + batch_size]),
-                            ' to {}'.format(self.targets[index])
-                            if batch_size == 1 else '(s)',
+                        "Failed to send {} Signal API notification{}: "
+                        "{}{}error={}.".format(
+                            len(self.targets[index : index + batch_size]),
+                            (
+                                f" to {self.targets[index]}"
+                                if batch_size == 1
+                                else "(s)"
+                            ),
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -351,19 +401,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 else:
                     self.logger.info(
-                        'Sent {} Signal API notification{}.'
-                        .format(
-                            len(self.targets[index:index + batch_size]),
-                            ' to {}'.format(self.targets[index])
-                            if batch_size == 1 else '(s)',
-                        ))
+                        "Sent {} Signal API notification{}.".format(
+                            len(self.targets[index : index + batch_size]),
+                            (
+                                f" to {self.targets[index]}"
+                                if batch_size == 1
+                                else "(s)"
+                            ),
+                        )
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occured sending {} Signal API '
-                    'notification(s).'.format(
-                        len(self.targets[index:index + batch_size])))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occured sending"
+                    f" {len(self.targets[index:index + batch_size])} Signal"
+                    " API notification(s)."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -373,41 +427,44 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port, self.source,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
+            self.source,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
-            'status': 'yes' if self.status else 'no',
+            "batch": "yes" if self.batch else "no",
+            "status": "yes" if self.status else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifySignalAPI.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifySignalAPI.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifySignalAPI.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifySignalAPI.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
@@ -424,45 +481,43 @@ def url(self, privacy=False, *args, **kwargs):
         else:
             # append @ to non-phone number entries as they are groups
             # Remove group. prefix as well
-            targets = \
-                ['@{}'.format(x[6:]) if x[0] != '+'
-                 else x for x in self.targets]
+            targets = [f"@{x[6:]}" if x[0] != "+" else x for x in self.targets]
 
-        return '{schema}://{auth}{hostname}{port}/{src}/{dst}?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/{src}/{dst}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
             src=self.source,
-            dst='/'.join(
-                [NotifySignalAPI.quote(x, safe='@+') for x in targets]),
+            dst="/".join(
+                [NotifySignalAPI.quote(x, safe="@+") for x in targets]
+            ),
             params=NotifySignalAPI.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -471,32 +526,29 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = \
-            NotifySignalAPI.split_path(results['fullpath'])
+        results["targets"] = NotifySignalAPI.split_path(results["fullpath"])
 
         # The hostname is our authentication key
-        results['apikey'] = NotifySignalAPI.unquote(results['host'])
+        results["apikey"] = NotifySignalAPI.unquote(results["host"])
 
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifySignalAPI.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifySignalAPI.unquote(results["qsd"]["from"])
 
-        elif results['targets']:
+        elif results["targets"]:
             # The from phone no is the first entry in the list otherwise
-            results['source'] = results['targets'].pop(0)
+            results["source"] = results["targets"].pop(0)
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySignalAPI.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySignalAPI.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get('batch', False))
+        results["batch"] = parse_bool(results["qsd"].get("batch", False))
 
         # Get status switch
-        results['status'] = \
-            parse_bool(results['qsd'].get('status', False))
+        results["status"] = parse_bool(results["qsd"].get("status", False))
 
         return results
diff --git a/libs/apprise/plugins/signl4.py b/libs/apprise/plugins/signl4.py
new file mode 100644
index 0000000000..567b11acb7
--- /dev/null
+++ b/libs/apprise/plugins/signl4.py
@@ -0,0 +1,350 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# API Refererence:
+#   - https://docs.signl4.com/integrations/webhook/webhook.html
+#
+
+from json import dumps
+from typing import Any, Optional
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, validate_regex
+from .base import NotifyBase
+
+
+class NotifySIGNL4(NotifyBase):
+    """
+    A wrapper for SIGNL4 Notifications
+    """
+
+    # The default descriptive name associated with the Notification
+    service_name = "SIGNL4"
+
+    # The services URL
+    service_url = "https://signl4.com/"
+
+    # Secure Protocol
+    secure_protocol = "signl4"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/signl4/"
+
+    # Our event action type
+    event_action = "trigger"
+
+    # Our default notification URL
+    notify_url = "https://connect.signl4.com/webhook/{secret}/"
+
+    # Define object templates
+    templates = (
+        "{schema}://{secret}",
+    )
+
+    # Define our template tokens
+    template_tokens = dict(NotifyBase.template_tokens, **{
+        # SIGNL4 team or integration secret
+        "secret": {
+            "name": _("Secret"),
+            "type": "string",
+            "private": True,
+            "required": True
+        },
+    })
+
+    # Define our template arguments
+    template_args = dict(NotifyBase.template_args, **{
+        "service": {
+            "name": _("Service"),
+            "type": "string",
+        },
+        "location": {
+            "name": _("Location"),
+            "type": "string",
+        },
+        "alerting_scenario": {
+            "name": _("Alerting Scenario"),
+            "type": "string",
+        },
+        "filtering": {
+            "name": _("Filtering"),
+            "type": "bool",
+            "default": False,
+        },
+        "external_id": {
+            "name": _("External ID"),
+            "type": "string",
+        },
+        "status": {
+            "name": _("Status"),
+            "type": "string",
+        },
+    })
+
+    def __init__(
+        self,
+        secret: str,
+        service: Optional[str] = None,
+        location: Optional[str] = None,
+        alerting_scenario: Optional[str] = None,
+        filtering: Optional[bool] = None,
+        external_id: Optional[str] = None,
+        status: Optional[str] = None,
+        **kwargs: Any
+    ) -> None:
+        """
+        Initialize SIGNL4 Object
+        """
+        super().__init__(**kwargs)
+
+        # SIGNL4 team or integration secret
+        self.secret = validate_regex(secret)
+        if not self.secret:
+            msg = "An invalid SIGNL4 team or integration secret " \
+                  "({}) was specified.".format(secret)
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # A service option for notifications
+        self.service = service
+
+        # A location option for notifications
+        self.location = location
+
+        # A alerting_scenario option for notifications
+        self.alerting_scenario = alerting_scenario
+
+        # A filtering option for notifications
+        self.filtering = (
+            self.template_args["filtering"]["default"]
+            if filtering is None
+            else bool(filtering)
+        )
+
+        # A external_id option for notifications
+        self.external_id = external_id
+
+        # A location option for notifications
+        self.status = status
+
+        return
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """
+        Send our SIGNL4 Notification
+        """
+
+        # Prepare our headers
+        headers = {
+            "Content-Type": "application/json",
+        }
+
+        # Prepare our persistent_notification.create payload
+        payload = {
+            "title": title if title else self.app_desc,
+            "body": body,
+            "X-S4-SourceSystem": self.app_id,
+        }
+
+        if self.service:
+            payload["X-S4-Service"] = self.service
+
+        if self.alerting_scenario:
+            payload["X-S4-AlertingScenario"] = self.alerting_scenario
+
+        if self.location:
+            payload["X-S4-Location"] = self.location
+
+        if self.filtering:
+            payload["X-S4-Filtering"] = self.filtering
+
+        if self.external_id:
+            payload["X-S4-ExternalID"] = self.external_id
+
+        if self.status:
+            payload["X-S4-Status"] = self.status
+
+        # Prepare our URL
+        notify_url = self.notify_url.format(secret=self.secret)
+
+        self.logger.debug(
+            "SIGNL4 POST URL: %s (cert_verify=%s)",
+            notify_url, self.verify_certificate)
+        self.logger.debug("SIGNL4 Payload: %r", payload)
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+
+        try:
+            r = requests.post(
+                notify_url,
+                data=dumps(payload),
+                headers=headers,
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+            if r.status_code not in (
+                    requests.codes.ok, requests.codes.created,
+                    requests.codes.accepted):
+                # We had a problem
+                status_str = \
+                    NotifySIGNL4.http_response_code_lookup(
+                        r.status_code)
+
+                self.logger.warning(
+                    "Failed to send SIGNL4 notification: "
+                    "{}{}error={}.".format(
+                        status_str,
+                        ", " if status_str else "",
+                        r.status_code))
+
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                # Return; we're done
+                return False
+
+            else:
+                self.logger.info("Sent SIGNL4 notification.")
+
+        except requests.RequestException as e:
+            self.logger.warning(
+                "A Connection error occurred sending SIGNL4 "
+                "notification to %s", self.host)
+            self.logger.debug("Socket Exception: %s", e)
+
+            # Return; we're done
+            return False
+
+        return True
+
+    @property
+    def url_identifier(self):
+        """
+        Returns all of the identifiers that make this URL unique from
+        another simliar one. Targets or end points should never be identified
+        here.
+        """
+        return (
+            self.secure_protocol, self.secret,
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """
+        Returns the URL built dynamically based on specified arguments.
+        """
+
+        # Define any URL parameters
+        params = {}
+
+        if self.service is not None:
+            params["service"] = self.service
+
+        if self.location is not None:
+            params["location"] = self.location
+
+        if self.alerting_scenario is not None:
+            params["alerting_scenario"] = self.alerting_scenario
+
+        if self.filtering != self.template_args["filtering"]["default"]:
+            # Only add filtering if it is not the default value
+            params["filtering"] = "yes" if self.filtering else "no"
+
+        if self.external_id is not None:
+            params["external_id"] = self.external_id
+
+        if self.status is not None:
+            params["status"] = self.status
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        url = "{schema}://{secret}"
+
+        return url.format(
+            schema=self.secure_protocol,
+            # never encode hostname since we're expecting it to be a valid one
+            secret=self.pprint(
+                self.secret, privacy, mode=PrivacyMode.Secret, safe=""),
+            params=NotifySIGNL4.urlencode(params),
+        )
+
+    @staticmethod
+    def parse_url(url):
+        """
+        Parses the URL and returns enough arguments that can allow
+        us to re-instantiate this object.
+        """
+
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn"t load the results
+            return results
+
+        # The "secret" makes it easier to use yaml configuration
+        if "secret" in results["qsd"] and \
+                len(results["qsd"]["secret"]):
+            results["secret"] = \
+                NotifySIGNL4.unquote(results["qsd"]["secret"])
+        else:
+            results["secret"] = \
+                NotifySIGNL4.unquote(results["host"])
+
+        if "service" in results["qsd"] and len(results["qsd"]["service"]):
+            results["service"] = \
+                NotifySIGNL4.unquote(results["qsd"]["service"])
+
+        if "location" in results["qsd"] and len(results["qsd"]["location"]):
+            results["location"] = \
+                NotifySIGNL4.unquote(results["qsd"]["location"])
+
+        if "alerting_scenario" in results["qsd"] and \
+            len(results["qsd"]["alerting_scenario"]):
+            results["alerting_scenario"] = \
+                NotifySIGNL4.unquote(results["qsd"]["alerting_scenario"])
+
+        if "filtering" in results["qsd"] and len(results["qsd"]["filtering"]):
+            results["filtering"] = \
+                parse_bool(
+                    NotifySIGNL4.unquote(
+                        results["qsd"]["filtering"],
+                        NotifySIGNL4.template_args["filtering"]["default"]))
+
+        if "external_id" in results["qsd"] and \
+            len(results["qsd"]["external_id"]):
+            results["external_id"] = \
+                NotifySIGNL4.unquote(results["qsd"]["external_id"])
+
+        if "status" in results["qsd"] and len(results["qsd"]["status"]):
+            results["status"] = \
+                NotifySIGNL4.unquote(results["qsd"]["status"])
+
+        return results
diff --git a/libs/apprise/plugins/simplepush.py b/libs/apprise/plugins/simplepush.py
index 343621841b..38f3acd129 100644
--- a/libs/apprise/plugins/simplepush.py
+++ b/libs/apprise/plugins/simplepush.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,25 +25,27 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-from os import urandom
+from base64 import urlsafe_b64encode
+import hashlib
 from json import loads
+from os import urandom
+
 import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
-
-from base64 import urlsafe_b64encode
-import hashlib
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 try:
-    from cryptography.hazmat.primitives import padding
-    from cryptography.hazmat.primitives.ciphers import Cipher
-    from cryptography.hazmat.primitives.ciphers import algorithms
-    from cryptography.hazmat.primitives.ciphers import modes
     from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives import padding
+    from cryptography.hazmat.primitives.ciphers import (
+        Cipher,
+        algorithms,
+        modes,
+    )
 
     # We're good to go!
     NOTIFY_SIMPLEPUSH_ENABLED = True
@@ -55,32 +56,30 @@
 
 
 class NotifySimplePush(NotifyBase):
-    """
-    A wrapper for SimplePush Notifications
-    """
+    """A wrapper for SimplePush Notifications."""
 
     # Set our global enabled flag
     enabled = NOTIFY_SIMPLEPUSH_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'packages_required': 'cryptography'
+        "packages_required": "cryptography"
     }
 
     # The default descriptive name associated with the Notification
-    service_name = 'SimplePush'
+    service_name = "SimplePush"
 
     # The services URL
-    service_url = 'https://simplepush.io/'
+    service_url = "https://simplepush.io/"
 
     # The default secure protocol
-    secure_protocol = 'spush'
+    secure_protocol = "spush"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_simplepush'
+    setup_url = "https://appriseit.com/services/simplepush/"
 
     # SimplePush uses the http protocol with SimplePush requests
-    notify_url = 'https://api.simplepush.io/send'
+    notify_url = "https://api.simplepush.io/send"
 
     # The maximum allowable characters allowed in the body per message
     body_maxlen = 10000
@@ -90,52 +89,54 @@ class NotifySimplePush(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}',
-        '{schema}://{salt}:{password}@{apikey}',
+        "{schema}://{apikey}",
+        "{schema}://{salt}:{password}@{apikey}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-
-        # Used for encrypted logins
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'salt': {
-            'name': _('Salt'),
-            'type': 'string',
-            'private': True,
-            'map_to': 'user',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            # Used for encrypted logins
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "salt": {
+                "name": _("Salt"),
+                "type": "string",
+                "private": True,
+                "map_to": "user",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'event': {
-            'name': _('Event'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "event": {
+                "name": _("Event"),
+                "type": "string",
+            },
         },
-    })
+    )
 
     def __init__(self, apikey, event=None, **kwargs):
-        """
-        Initialize SimplePush Object
-        """
+        """Initialize SimplePush Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid SimplePush API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid SimplePush API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -143,8 +144,10 @@ def __init__(self, apikey, event=None, **kwargs):
             # Event Name (associated with project)
             self.event = validate_regex(event)
             if not self.event:
-                msg = 'An invalid SimplePush Event Name ' \
-                      '({}) was specified.'.format(event)
+                msg = (
+                    "An invalid SimplePush Event Name "
+                    f"({event}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -158,22 +161,26 @@ def __init__(self, apikey, event=None, **kwargs):
         self._key = None
 
     def _encrypt(self, content):
-        """
-        Encrypts message for use with SimplePush
-        """
+        """Encrypts message for use with SimplePush."""
 
         if self._iv is None:
             # initialization vector and cache it
             self._iv = urandom(algorithms.AES.block_size // 8)
 
             # convert vector into hex string (used in payload)
-            self._iv_hex = ''.join(["{:02x}".format(ord(self._iv[idx:idx + 1]))
-                                    for idx in range(len(self._iv))]).upper()
+            self._iv_hex = "".join([
+                f"{ord(self._iv[idx:idx + 1]):02x}"
+                for idx in range(len(self._iv))
+            ]).upper()
 
             # encrypted key and cache it
-            self._key = bytes(bytearray.fromhex(
-                hashlib.sha1('{}{}'.format(self.password, self.user)
-                             .encode('utf-8')).hexdigest()[0:32]))
+            self._key = bytes(
+                bytearray.fromhex(
+                    hashlib.sha1(
+                        f"{self.password}{self.user}".encode()
+                    ).hexdigest()[0:32]
+                )
+            )
 
         padder = padding.PKCS7(algorithms.AES.block_size).padder()
         content = padder.update(content.encode()) + padder.finalize()
@@ -193,54 +200,53 @@ def _encrypt(self, content):
         # In the event the website link above does not exist/work, a screen
         # capture of the reference to the requirement for this encryption
         # can also be found on the Apprise SimplePush Wiki:
-        #   https://github.com/caronc/apprise/wiki/Notify_simplepush\
-        #       #lock-aes-cbc-128-encryption-weakness
+        #   https://appriseit.com/services/simplepush/\
+        #        #-aes-cbc-128-encryption-weakness
         #
         encryptor = Cipher(
-            algorithms.AES(self._key),
-            modes.CBC(self._iv),
-            default_backend()).encryptor()
+            algorithms.AES(self._key), modes.CBC(self._iv), default_backend()
+        ).encryptor()
 
         return urlsafe_b64encode(
-            encryptor.update(content) + encryptor.finalize())
+            encryptor.update(content) + encryptor.finalize()
+        )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform SimplePush Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform SimplePush Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-type': "application/x-www-form-urlencoded",
+            "User-Agent": self.app_id,
+            "Content-type": "application/x-www-form-urlencoded",
         }
 
         # Prepare our payload
         payload = {
-            'key': self.apikey,
+            "key": self.apikey,
         }
 
         if self.password and self.user:
             body = self._encrypt(body)
             title = self._encrypt(title)
             payload.update({
-                'encrypted': 'true',
-                'iv': self._iv_hex,
+                "encrypted": "true",
+                "iv": self._iv_hex,
             })
 
         # prepare SimplePush Object
         payload.update({
-            'msg': body,
-            'title': title,
+            "msg": body,
+            "title": title,
         })
 
         if self.event:
             # Store Event
-            payload['event'] = self.event
+            payload["event"] = self.event
 
-        self.logger.debug('SimplePush POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('SimplePush Payload: %s' % str(payload))
+        self.logger.debug(
+            "SimplePush POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"SimplePush Payload: {payload!s}")
 
         # We need to rely on the status string returned in the SimplePush
         # response
@@ -262,8 +268,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Get our SimplePush response (if it's possible)
             try:
                 json_response = loads(r.content)
-                status_str = json_response.get('message')
-                status = json_response.get('status')
+                status_str = json_response.get("message")
+                status = json_response.get("status")
 
             except (TypeError, ValueError, AttributeError):
                 # TypeError = r.content is not a String
@@ -271,30 +277,35 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # AttributeError = r.content is None
                 pass
 
-            if r.status_code != requests.codes.ok or status != 'OK':
+            if r.status_code != requests.codes.ok or status != "OK":
                 # We had a problem
-                status_str = status_str if status_str else\
-                    NotifyBase.http_response_code_lookup(r.status_code)
+                status_str = (
+                    status_str
+                    if status_str
+                    else NotifyBase.http_response_code_lookup(r.status_code)
+                )
 
                 self.logger.warning(
-                    'Failed to send SimplePush notification:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send SimplePush notification:"
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent SimplePush notification.')
+                self.logger.info("Sent SimplePush notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending SimplePush notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending SimplePush notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -303,60 +314,58 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.password, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         if self.event:
-            params['event'] = self.event
+            params["event"] = self.event
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{salt}:{password}@'.format(
+            auth = "{salt}:{password}@".format(
                 salt=self.pprint(
-                    self.user, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.user, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
 
-        return '{schema}://{auth}{apikey}/?{params}'.format(
+        return "{schema}://{auth}{apikey}/?{params}".format(
             schema=self.secure_protocol,
             auth=auth,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
             params=NotifySimplePush.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Set the API Key
-        results['apikey'] = NotifySimplePush.unquote(results['host'])
+        results["apikey"] = NotifySimplePush.unquote(results["host"])
 
         # Event
-        if 'event' in results['qsd'] and len(results['qsd']['event']):
+        if "event" in results["qsd"] and len(results["qsd"]["event"]):
             # Extract the account sid from an argument
-            results['event'] = \
-                NotifySimplePush.unquote(results['qsd']['event'])
+            results["event"] = NotifySimplePush.unquote(
+                results["qsd"]["event"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/sinch.py b/libs/apprise/plugins/sinch.py
index 6a07c0b40f..45c7abe410 100644
--- a/libs/apprise/plugins/sinch.py
+++ b/libs/apprise/plugins/sinch.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -36,22 +35,22 @@
 # from). Activated phone numbers can be found on your dashboard here:
 #  - https://dashboard.sinch.com/numbers/your-numbers/numbers
 #
-import requests
 import json
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 
 class SinchRegion:
-    """
-    Defines the Sinch Server Regions
-    """
-    USA = 'us'
-    EUROPE = 'eu'
+    """Defines the Sinch Server Regions."""
+
+    USA = "us"
+    EUROPE = "eu"
 
 
 # Used for verification purposes
@@ -59,18 +58,16 @@ class SinchRegion:
 
 
 class NotifySinch(NotifyBase):
-    """
-    A wrapper for Sinch Notifications
-    """
+    """A wrapper for Sinch Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Sinch'
+    service_name = "Sinch"
 
     # The services URL
-    service_url = 'https://sinch.com/'
+    service_url = "https://sinch.com/"
 
     # All notification requests are secure
-    secure_protocol = 'sinch'
+    secure_protocol = "sinch"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
@@ -81,12 +78,12 @@ class NotifySinch(NotifyBase):
     validity_period = 14400
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_sinch'
+    setup_url = "https://appriseit.com/services/sinch/"
 
     # Sinch uses the http protocol with JSON requests
     #   - the 'spi' gets substituted with the Service Provider ID
     #     provided as part of the Apprise URL.
-    notify_url = 'https://{region}.sms.api.sinch.com/xms/v1/{spi}/batches'
+    notify_url = "https://{region}.sms.api.sinch.com/xms/v1/{spi}/batches"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -97,124 +94,148 @@ class NotifySinch(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{service_plan_id}:{api_token}@{from_phone}',
-        '{schema}://{service_plan_id}:{api_token}@{from_phone}/{targets}',
+        "{schema}://{service_plan_id}:{api_token}@{from_phone}",
+        "{schema}://{service_plan_id}:{api_token}@{from_phone}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'service_plan_id': {
-            'name': _('Account SID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-f0-9]+$', 'i'),
-        },
-        'api_token': {
-            'name': _('Auth Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-f0-9]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "service_plan_id": {
+                "name": _("Account SID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-f0-9]+$", "i"),
+            },
+            "api_token": {
+                "name": _("Auth Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-f0-9]+$", "i"),
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "short_code": {
+                "name": _("Target Short Code"),
+                "type": "string",
+                "regex": (r"^[0-9]{5,6}$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'short_code': {
-            'name': _('Target Short Code'),
-            'type': 'string',
-            'regex': (r'^[0-9]{5,6}$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone",
+            },
+            "spi": {
+                "alias_of": "service_plan_id",
+            },
+            "region": {
+                "name": _("Region"),
+                "type": "string",
+                "regex": (r"^[a-z]{2}$", "i"),
+                "default": SinchRegion.USA,
+            },
+            "token": {
+                "alias_of": "api_token",
+            },
         },
-        'from': {
-            'alias_of': 'from_phone',
-        },
-        'spi': {
-            'alias_of': 'service_plan_id',
-        },
-        'region': {
-            'name': _('Region'),
-            'type': 'string',
-            'regex': (r'^[a-z]{2}$', 'i'),
-            'default': SinchRegion.USA,
-        },
-        'token': {
-            'alias_of': 'api_token',
-        },
-    })
+    )
 
-    def __init__(self, service_plan_id, api_token, source, targets=None,
-                 region=None, **kwargs):
-        """
-        Initialize Sinch Object
-        """
+    def __init__(
+        self,
+        service_plan_id,
+        api_token,
+        source,
+        targets=None,
+        region=None,
+        **kwargs,
+    ):
+        """Initialize Sinch Object."""
         super().__init__(**kwargs)
 
         # The Account SID associated with the account
         self.service_plan_id = validate_regex(
-            service_plan_id, *self.template_tokens['service_plan_id']['regex'])
+            service_plan_id, *self.template_tokens["service_plan_id"]["regex"]
+        )
         if not self.service_plan_id:
-            msg = 'An invalid Sinch Account SID ' \
-                  '({}) was specified.'.format(service_plan_id)
+            msg = (
+                "An invalid Sinch Account SID "
+                f"({service_plan_id}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The Authentication Token associated with the account
         self.api_token = validate_regex(
-            api_token, *self.template_tokens['api_token']['regex'])
+            api_token, *self.template_tokens["api_token"]["regex"]
+        )
         if not self.api_token:
-            msg = 'An invalid Sinch Authentication Token ' \
-                  '({}) was specified.'.format(api_token)
+            msg = (
+                "An invalid Sinch Authentication Token "
+                f"({api_token}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Setup our region
-        self.region = self.template_args['region']['default'] \
-            if not isinstance(region, str) else region.lower()
+        self.region = (
+            self.template_args["region"]["default"]
+            if not isinstance(region, str)
+            else region.lower()
+        )
         if self.region and self.region not in SINCH_REGIONS:
-            msg = 'The region specified ({}) is invalid.'.format(region)
+            msg = f"The region specified ({region}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The Source Phone # and/or short-code
         result = is_phone_no(source, min_len=5)
         if not result:
-            msg = 'The Account (From) Phone # or Short-code specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = (
+                "The Account (From) Phone # or Short-code specified "
+                f"({source}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Tidy source
-        self.source = result['full']
+        self.source = result["full"]
 
         if len(self.source) < 11 or len(self.source) > 14:
             # A short code is a special 5 or 6 digit telephone number
             # that's shorter than a full phone number.
             if len(self.source) not in (5, 6):
-                msg = 'The Account (From) Phone # specified ' \
-                      '({}) is invalid.'.format(source)
+                msg = (
+                    "The Account (From) Phone # specified "
+                    f"({source}) is invalid."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -223,61 +244,56 @@ def __init__(self, service_plan_id, api_token, source, targets=None,
         else:
             # We're dealing with a phone number; so we need to just
             # place a plus symbol at the end of it
-            self.source = '+{}'.format(self.source)
+            self.source = f"+{self.source}"
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Parse each phone number we found
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append('+{}'.format(result['full']))
+            self.targets.append("+{}".format(result["full"]))
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Sinch Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Sinch Notification."""
 
-        if not self.targets:
-            if len(self.source) in (5, 6):
-                # Generate a warning since we're a short-code.  We need
-                # a number to message at minimum
-                self.logger.warning(
-                    'There are no valid Sinch targets to notify.')
-                return False
+        if not self.targets and len(self.source) in (5, 6):
+            # Generate a warning since we're a short-code.  We need
+            # a number to message at minimum
+            self.logger.warning("There are no valid Sinch targets to notify.")
+            return False
 
         # error tracking (used for function return)
         has_error = False
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Authorization': 'Bearer {}'.format(self.api_token),
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Authorization": f"Bearer {self.api_token}",
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
         payload = {
-            'body': body,
-            'from': self.source,
-
+            "body": body,
+            "from": self.source,
             # The To gets populated in the loop below
-            'to': None,
+            "to": None,
         }
 
         # Prepare our Sinch URL (spi = Service Provider ID)
         url = self.notify_url.format(
-            region=self.region, spi=self.service_plan_id)
+            region=self.region, spi=self.service_plan_id
+        )
 
         # Create a copy of the targets list
         targets = list(self.targets)
@@ -291,12 +307,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our user
-            payload['to'] = [target]
+            payload["to"] = [target]
 
             # Some Debug Logging
-            self.logger.debug('Sinch POST URL: {} (cert_verify={})'.format(
-                url, self.verify_certificate))
-            self.logger.debug('Sinch Payload: {}' .format(payload))
+            self.logger.debug(
+                "Sinch POST URL:"
+                f" {url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Sinch Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -324,10 +342,13 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 #  "flash_message": false
                 # }
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
@@ -335,8 +356,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     try:
                         # Update our status response if we can
                         json_response = json.loads(r.content)
-                        status_code = json_response.get('code', status_code)
-                        status_str = json_response.get('message', status_str)
+                        status_code = json_response.get("code", status_code)
+                        status_str = json_response.get("message", status_str)
 
                     except (AttributeError, TypeError, ValueError):
                         # ValueError = r.content is Unparsable
@@ -348,30 +369,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         pass
 
                     self.logger.warning(
-                        'Failed to send Sinch notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Sinch notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Sinch notification to {}.'.format(target))
+                    self.logger.info(f"Sent Sinch notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Sinch:%s ' % (
-                        target) + 'notification.'
+                    f"A Connection error occurred sending Sinch:{target} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -381,53 +403,51 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.service_plan_id, self.api_token, self.source,
+            self.service_plan_id,
+            self.api_token,
+            self.source,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'region': self.region,
+            "region": self.region,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{spi}:{token}@{source}/{targets}/?{params}'.format(
+        return "{schema}://{spi}:{token}@{source}/{targets}/?{params}".format(
             schema=self.secure_protocol,
             spi=self.pprint(
-                self.service_plan_id, privacy, mode=PrivacyMode.Tail, safe=''),
-            token=self.pprint(self.api_token, privacy, safe=''),
-            source=NotifySinch.quote(self.source, safe=''),
-            targets='/'.join(
-                [NotifySinch.quote(x, safe='') for x in self.targets]),
-            params=NotifySinch.urlencode(params))
+                self.service_plan_id, privacy, mode=PrivacyMode.Tail, safe=""
+            ),
+            token=self.pprint(self.api_token, privacy, safe=""),
+            source=NotifySinch.quote(self.source, safe=""),
+            targets="/".join(
+                [NotifySinch.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifySinch.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -435,47 +455,45 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifySinch.split_path(results['fullpath'])
+        results["targets"] = NotifySinch.split_path(results["fullpath"])
 
         # The hostname is our source number
-        results['source'] = NotifySinch.unquote(results['host'])
+        results["source"] = NotifySinch.unquote(results["host"])
 
         # Get our service_plan_ide and api_token from the user/pass config
-        results['service_plan_id'] = NotifySinch.unquote(results['user'])
-        results['api_token'] = NotifySinch.unquote(results['password'])
+        results["service_plan_id"] = NotifySinch.unquote(results["user"])
+        results["api_token"] = NotifySinch.unquote(results["password"])
 
         # Auth Token
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Extract the account spi from an argument
-            results['api_token'] = \
-                NotifySinch.unquote(results['qsd']['token'])
+            results["api_token"] = NotifySinch.unquote(results["qsd"]["token"])
 
         # Account SID
-        if 'spi' in results['qsd'] and len(results['qsd']['spi']):
+        if "spi" in results["qsd"] and len(results["qsd"]["spi"]):
             # Extract the account spi from an argument
-            results['service_plan_id'] = \
-                NotifySinch.unquote(results['qsd']['spi'])
+            results["service_plan_id"] = NotifySinch.unquote(
+                results["qsd"]["spi"]
+            )
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifySinch.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifySinch.unquote(results["qsd"]["from"])
 
-        if 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifySinch.unquote(results['qsd']['source'])
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifySinch.unquote(results["qsd"]["source"])
 
         # Allow one to define a region
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
-            results['region'] = \
-                NotifySinch.unquote(results['qsd']['region'])
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
+            results["region"] = NotifySinch.unquote(results["qsd"]["region"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySinch.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySinch.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/slack.py b/libs/apprise/plugins/slack.py
index 9fa6092e07..29d05148b2 100644
--- a/libs/apprise/plugins/slack.py
+++ b/libs/apprise/plugins/slack.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -72,84 +71,87 @@
 #        - You will be able to select the Bot App you previously created
 #        - Your bot will join your channel.
 
+import contextlib
+from json import dumps, loads
 import re
-import requests
-from json import dumps
-from json import loads
 from time import time
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import (
-    is_email, parse_bool, parse_list, validate_regex)
+import requests
+
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 SLACK_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 # Used to break path apart into list of channels
-CHANNEL_LIST_DELIM = re.compile(r'[ \t\r\n,#\\/]+')
+CHANNEL_LIST_DELIM = re.compile(r"[ \t\r\n,#\\/]+")
 
 # Channel Regular Expression Parsing
 CHANNEL_RE = re.compile(
-    r'^(?P<channel>[+#@]?[A-Z0-9_-]{1,32})(:(?P<thread_ts>[0-9.]+))?$', re.I)
+    r"^(?P<channel>[+#@]?[A-Z0-9_-]{1,32})(:(?P<thread_ts>[0-9.]+))?$", re.I
+)
 
 
 class SlackMode:
-    """
-    Tracks the mode of which we're using Slack
-    """
+    """Tracks the mode of which we're using Slack."""
+
     # We're dealing with a webhook
     # Our token looks like: T1JJ3T3L2/A1BRTD4JD/TIiajkdnlazkcOXrIdevi7
-    WEBHOOK = 'webhook'
+    WEBHOOK = "hook"
+
+    # Government Webhook
+    # Our token still looks like: T1JJ3T3L2/A1BRTD4JD/TIiajkdnlazkcOXrIdevi7
+    # however we have a different URL we post to
+    WEBHOOK_GOV = "gov-hook"
 
     # We're dealing with a bot (using the OAuth Access Token)
     # Our token looks like: xoxp-1234-1234-1234-abc124 or
     # Our token looks like: xoxb-1234-1234-abc124 or
-    BOT = 'bot'
+    BOT = "bot"
 
 
 # Define our Slack Modes
 SLACK_MODES = (
     SlackMode.WEBHOOK,
+    SlackMode.WEBHOOK_GOV,
     SlackMode.BOT,
 )
 
 
 class NotifySlack(NotifyBase):
-    """
-    A wrapper for Slack Notifications
-    """
+    """A wrapper for Slack Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Slack'
+    service_name = "Slack"
 
     # The services URL
-    service_url = 'https://slack.com/'
+    service_url = "https://slack.com/"
 
     # The default secure protocol
-    secure_protocol = 'slack'
+    secure_protocol = "slack"
 
     # Allow 50 requests per minute (Tier 2).
     # 60/50 = 0.2
     request_rate_per_sec = 1.2
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_slack'
+    setup_url = "https://appriseit.com/services/slack/"
 
     # Support attachments
     attachment_support = True
 
     # The maximum targets to include when doing batch transfers
-    # Slack Webhook URL
-    webhook_url = 'https://hooks.slack.com/services'
+    # Slack Webhook URLs
+    webhook_url = "https://hooks.slack.com/services"
+    webhook_gov_url = "https://hooks.slack-gov.com/services"
 
     # Slack API URL (used with Bots)
-    api_url = 'https://slack.com/api/{}'
+    api_url = "https://slack.com/api/{}"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_72
@@ -162,190 +164,243 @@ class NotifySlack(NotifyBase):
 
     # Bot's do not have default channels to notify; so #general
     # becomes the default channel in BOT mode
-    default_notification_channel = '#general'
+    default_notification_channel = "#general"
 
     # Define object templates
     templates = (
         # Webhook
-        '{schema}://{token_a}/{token_b}/{token_c}',
-        '{schema}://{botname}@{token_a}/{token_b}{token_c}',
-        '{schema}://{token_a}/{token_b}/{token_c}/{targets}',
-        '{schema}://{botname}@{token_a}/{token_b}/{token_c}/{targets}',
-
+        "{schema}://{token_a}/{token_b}/{token_c}",
+        "{schema}://{botname}@{token_a}/{token_b}{token_c}",
+        "{schema}://{token_a}/{token_b}/{token_c}/{targets}",
+        "{schema}://{botname}@{token_a}/{token_b}/{token_c}/{targets}",
         # Bot
-        '{schema}://{access_token}/',
-        '{schema}://{access_token}/{targets}',
+        "{schema}://{access_token}/",
+        "{schema}://{access_token}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'botname': {
-            'name': _('Bot Name'),
-            'type': 'string',
-            'map_to': 'user',
-        },
-        # Bot User OAuth Access Token
-        # which always starts with xoxp- e.g.:
-        #     xoxb-1234-1234-4ddbc191d40ee098cbaae6f3523ada2d
-        'access_token': {
-            'name': _('OAuth Access Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^xox[abp]-[A-Z0-9-]+$', 'i'),
-        },
-        # Token required as part of the Webhook request
-        #  /AAAAAAAAA/........./........................
-        'token_a': {
-            'name': _('Token A'),
-            'type': 'string',
-            'private': True,
-            'regex': (r'^[A-Z0-9]+$', 'i'),
-        },
-        # Token required as part of the Webhook request
-        #  /........./BBBBBBBBB/........................
-        'token_b': {
-            'name': _('Token B'),
-            'type': 'string',
-            'private': True,
-            'regex': (r'^[A-Z0-9]+$', 'i'),
-        },
-        # Token required as part of the Webhook request
-        #  /........./........./CCCCCCCCCCCCCCCCCCCCCCCC
-        'token_c': {
-            'name': _('Token C'),
-            'type': 'string',
-            'private': True,
-            'regex': (r'^[A-Za-z0-9]+$', 'i'),
-        },
-        'target_encoded_id': {
-            'name': _('Target Encoded ID'),
-            'type': 'string',
-            'prefix': '+',
-            'map_to': 'targets',
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "botname": {
+                "name": _("Bot Name"),
+                "type": "string",
+                "map_to": "user",
+            },
+            # Bot User OAuth Access Token
+            # which always starts with xoxp- e.g.:
+            #     xoxb-1234-1234-4ddbc191d40ee098cbaae6f3523ada2d
+            "access_token": {
+                "name": _("OAuth Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^(?:xoxe\.)?xox[abp]-[A-Z0-9-]+$", "i"),
+            },
+            # Token required as part of the Webhook request
+            #  /AAAAAAAAA/........./........................
+            "token_a": {
+                "name": _("Token A"),
+                "type": "string",
+                "private": True,
+                "regex": (r"^[A-Z0-9]+$", "i"),
+            },
+            # Token required as part of the Webhook request
+            #  /........./BBBBBBBBB/........................
+            "token_b": {
+                "name": _("Token B"),
+                "type": "string",
+                "private": True,
+                "regex": (r"^[A-Z0-9]+$", "i"),
+            },
+            # Token required as part of the Webhook request
+            #  /........./........./CCCCCCCCCCCCCCCCCCCCCCCC
+            "token_c": {
+                "name": _("Token C"),
+                "type": "string",
+                "private": True,
+                "regex": (r"^[A-Za-z0-9]+$", "i"),
+            },
+            "target_encoded_id": {
+                "name": _("Target Encoded ID"),
+                "type": "string",
+                "prefix": "+",
+                "map_to": "targets",
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "target_channels": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_channels': {
-            'name': _('Target Channel'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'footer': {
-            'name': _('Include Footer'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_footer',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "footer": {
+                "name": _("Include Footer"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_footer",
+            },
+            # Use Payload in Blocks (vs legacy way):
+            #  See: https://api.slack.com/reference/messaging/payload
+            "blocks": {
+                "name": _("Use Blocks"),
+                "type": "bool",
+                "default": False,
+                "map_to": "use_blocks",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "timestamp": {
+                "name": _("Include Timestamp"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_timestamp",
+            },
+            "mode": {
+                "name": _("Message Mode"),
+                "type": "choice:string",
+                "values": SLACK_MODES,
+                # mode is detected if not specified
+            },
+            "token": {
+                "name": _("Token"),
+                "alias_of": ("access_token", "token_a", "token_b", "token_c"),
+            },
         },
-        # Use Payload in Blocks (vs legacy way):
-        #  See: https://api.slack.com/reference/messaging/payload
-        'blocks': {
-            'name': _('Use Blocks'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'use_blocks',
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'token': {
-            'name': _('Token'),
-            'alias_of': ('access_token', 'token_a', 'token_b', 'token_c'),
-        },
-    })
+    )
 
     # Formatting requirements are defined here:
     # https://api.slack.com/docs/message-formatting
     _re_formatting_map = {
         # New lines must become the string version
-        r'\r\*\n': '\\n',
+        r"\r\*\n": "\\n",
         # Escape other special characters
-        r'&': '&amp;',
-        r'<': '&lt;',
-        r'>': '&gt;',
+        r"&": "&amp;",
+        r"<": "&lt;",
+        r">": "&gt;",
     }
 
     # To notify a channel, one uses <!channel|channel>
     _re_channel_support = re.compile(
-        r'(?P<match>(?:<|\&lt;)?[ \t]*'
-        r'!(?P<channel>[^| \n]+)'
-        r'(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)'
-        r'|(?:>|\&gt;)))', re.IGNORECASE)
+        r"(?P<match>(?:<|\&lt;)?[ \t]*"
+        r"!(?P<channel>[^| \n]+)"
+        r"(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)"
+        r"|(?:>|\&gt;)))",
+        re.IGNORECASE,
+    )
 
     # To notify a user by their ID, one uses <@U6TTX1F9R>
     _re_user_id_support = re.compile(
-        r'(?P<match>(?:<|\&lt;)?[ \t]*'
-        r'@(?P<userid>[^| \n]+)'
-        r'(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)'
-        r'|(?:>|\&gt;)))', re.IGNORECASE)
+        r"(?P<match>(?:<|\&lt;)?[ \t]*"
+        r"@(?P<userid>[^| \n]+)"
+        r"(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)"
+        r"|(?:>|\&gt;)))",
+        re.IGNORECASE,
+    )
 
     # The markdown in slack isn't [desc](url), it's <url|desc>
     #
-    # To accomodate this, we need to ensure we don't escape URLs that match
+    # To accommodate this, we need to ensure we don't escape URLs that match
     _re_url_support = re.compile(
-        r'(?P<match>(?:<|\&lt;)?[ \t]*'
-        r'(?P<url>(?:https?|mailto)://[^| \n]+)'
-        r'(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)'
-        r'|(?:>|\&gt;)))', re.IGNORECASE)
-
-    def __init__(self, access_token=None, token_a=None, token_b=None,
-                 token_c=None, targets=None, include_image=True,
-                 include_footer=True, use_blocks=None, **kwargs):
-        """
-        Initialize Slack Object
-        """
+        r"(?P<match>(?:<|\&lt;)?[ \t]*"
+        r"(?P<url>(?:https?|mailto)://[^| \n]+)"
+        r"(?:[ \t]*\|[ \t]*(?:(?P<val>[^\n]+?)[ \t]*)?(?:>|\&gt;)"
+        r"|(?:>|\&gt;)))",
+        re.IGNORECASE,
+    )
+
+    def __init__(
+        self,
+        access_token=None,
+        token_a=None,
+        token_b=None,
+        token_c=None,
+        targets=None,
+        include_image=None,
+        include_footer=None,
+        include_timestamp=None,
+        use_blocks=None,
+        mode=None,
+        **kwargs,
+    ):
+        """Initialize Slack Object."""
         super().__init__(**kwargs)
 
-        # Setup our mode
-        self.mode = SlackMode.BOT if access_token else SlackMode.WEBHOOK
+        # Store our webhook mode
+        if mode and isinstance(mode, str):
+            self.mode = next(
+                (a for a in SLACK_MODES if a.startswith(mode)), None
+            )
+            if self.mode not in SLACK_MODES:
+                msg = (
+                    f"The Slack mode specified ({mode}) is invalid."
+                )
+                self.logger.warning(msg)
+                raise TypeError(msg)
+
+        else:  # Detect
+            self.mode = SlackMode.BOT if access_token else SlackMode.WEBHOOK
 
-        if self.mode is SlackMode.WEBHOOK:
+        if self.mode in (SlackMode.WEBHOOK, SlackMode.WEBHOOK_GOV):
             self.access_token = None
             self.token_a = validate_regex(
-                token_a, *self.template_tokens['token_a']['regex'])
+                token_a, *self.template_tokens["token_a"]["regex"]
+            )
             if not self.token_a:
-                msg = 'An invalid Slack (first) Token ' \
-                      '({}) was specified.'.format(token_a)
+                msg = (
+                    "An invalid Slack (first) Token "
+                    f"({token_a}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             self.token_b = validate_regex(
-                token_b, *self.template_tokens['token_b']['regex'])
+                token_b, *self.template_tokens["token_b"]["regex"]
+            )
             if not self.token_b:
-                msg = 'An invalid Slack (second) Token ' \
-                      '({}) was specified.'.format(token_b)
+                msg = (
+                    "An invalid Slack (second) Token "
+                    f"({token_b}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             self.token_c = validate_regex(
-                token_c, *self.template_tokens['token_c']['regex'])
+                token_c, *self.template_tokens["token_c"]["regex"]
+            )
             if not self.token_c:
-                msg = 'An invalid Slack (third) Token ' \
-                      '({}) was specified.'.format(token_c)
+                msg = (
+                    "An invalid Slack (third) Token "
+                    f"({token_c}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
@@ -353,10 +408,13 @@ def __init__(self, access_token=None, token_a=None, token_b=None,
             self.token_b = None
             self.token_c = None
             self.access_token = validate_regex(
-                access_token, *self.template_tokens['access_token']['regex'])
+                access_token, *self.template_tokens["access_token"]["regex"]
+            )
             if not self.access_token:
-                msg = 'An invalid Slack OAuth Access Token ' \
-                      '({}) was specified.'.format(access_token)
+                msg = (
+                    "An invalid Slack OAuth Access Token "
+                    f"({access_token}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -365,10 +423,11 @@ def __init__(self, access_token=None, token_a=None, token_b=None,
         # specify a full email as a recipient via slack
         self._lookup_users = {}
 
-        self.use_blocks = parse_bool(
-            use_blocks, self.template_args['blocks']['default']) \
-            if use_blocks is not None \
-            else self.template_args['blocks']['default']
+        self.use_blocks = (
+            parse_bool(use_blocks, self.template_args["blocks"]["default"])
+            if use_blocks is not None
+            else self.template_args["blocks"]["default"]
+        )
 
         # Build list of channels
         self.channels = parse_list(targets)
@@ -377,26 +436,43 @@ def __init__(self, access_token=None, token_a=None, token_b=None,
             # channel it was created for; adding 'None' is just used as
             # a flag lower to not set the channels
             self.channels.append(
-                None if self.mode is SlackMode.WEBHOOK
-                else self.default_notification_channel)
+                None
+                if self.mode in (SlackMode.WEBHOOK, SlackMode.WEBHOOK_GOV)
+                else self.default_notification_channel
+            )
 
         # Iterate over above list and store content accordingly
         self._re_formatting_rules = re.compile(
-            r'(' + '|'.join(self._re_formatting_map.keys()) + r')',
+            r"(" + "|".join(self._re_formatting_map.keys()) + r")",
             re.IGNORECASE,
         )
         # Place a thumbnail image inline with the message body
-        self.include_image = include_image
+        self.include_image = \
+            self.template_args["image"]["default"] \
+            if include_image is None else include_image
 
         # Place a footer with each post
-        self.include_footer = include_footer
+        self.include_footer = \
+            self.template_args["footer"]["default"] \
+            if include_footer is None else include_footer
+
+        # timestamp inclusion (only applicable if footer also defined
+        self.include_timestamp = \
+            self.template_args["timestamp"]["default"] \
+            if include_timestamp is None \
+            else include_timestamp
+
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Slack Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Slack Notification."""
 
         # error tracking (used for function return)
         has_error = False
@@ -406,61 +482,66 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         #
         if self.use_blocks:
             # Our slack format
-            _slack_format = 'mrkdwn' \
-                if self.notify_format == NotifyFormat.MARKDOWN \
-                else 'plain_text'
+            slack_format = (
+                "mrkdwn"
+                if self.notify_format == NotifyFormat.MARKDOWN
+                else "plain_text"
+            )
 
             payload = {
-                'username': self.user if self.user else self.app_id,
-                'attachments': [{
-                    'blocks': [{
-                        'type': 'section',
-                        'text': {
-                            'type': _slack_format,
-                            'text': body
-                        }
+                "username": self.user if self.user else self.app_id,
+                "attachments": [{
+                    "blocks": [{
+                        "type": "section",
+                        "text": {"type": slack_format, "text": body},
                     }],
-                    'color': self.color(notify_type),
-                }]
+                    "color": self.color(notify_type),
+                }],
             }
 
             # Slack only accepts non-empty header sections
             if title:
-                payload['attachments'][0]['blocks'].insert(0, {
-                    'type': 'header',
-                    'text': {
-                        'type': 'plain_text',
-                        'text': title,
-                        'emoji': True
-                    }
-                })
+                payload["attachments"][0]["blocks"].insert(
+                    0,
+                    {
+                        "type": "header",
+                        "text": {
+                            "type": "plain_text",
+                            "text": title,
+                            "emoji": True,
+                        },
+                    },
+                )
 
             # Include the footer only if specified to do so
             if self.include_footer:
 
                 # Acquire our to-be footer icon if configured to do so
-                image_url = None if not self.include_image \
+                image_url = (
+                    None
+                    if not self.include_image
                     else self.image_url(notify_type)
+                )
 
                 # Prepare our footer based on the block structure
-                _footer = {
-                    'type': 'context',
-                    'elements': [{
-                        'type': _slack_format,
-                        'text': self.app_id
-                    }]
+                footer = {
+                    "type": "context",
+                    "elements": [{"type": slack_format, "text": self.app_id}],
                 }
 
                 if image_url:
-                    payload['icon_url'] = image_url
-
-                    _footer['elements'].insert(0, {
-                        'type': 'image',
-                        'image_url': image_url,
-                        'alt_text': notify_type
-                    })
+                    payload["icon_url"] = image_url
+
+                    footer["elements"].insert(
+                        0,
+                        {
+                            "type": "image",
+                            "image_url": image_url,
+                            "alt_text": notify_type,
+                        },
+                    )
 
-                payload['attachments'][0]['blocks'].append(_footer)
+                payload["attachments"][0]["blocks"].append(footer)
 
         else:
             #
@@ -468,7 +549,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             #
             if self.notify_format == NotifyFormat.MARKDOWN:
                 body = self._re_formatting_rules.sub(  # pragma: no branch
-                    lambda x: self._re_formatting_map[x.group()], body,
+                    lambda x: self._re_formatting_map[x.group()],
+                    body,
                 )
 
                 # Support <!channel|desc>, <!channel> entries
@@ -480,11 +562,10 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     # Update our string
                     body = re.sub(
                         re.escape(match[0]),
-                        '<!{channel}|{desc}>'.format(
-                            channel=channel, desc=desc)
-                        if desc else '<!{channel}>'.format(channel=channel),
+                        f"<!{channel}|{desc}>" if desc else f"<!{channel}>",
                         body,
-                        re.IGNORECASE)
+                        flags=re.IGNORECASE,
+                    )
 
                 # Support <@userid|desc>, <@channel> entries
                 for match in self._re_user_id_support.findall(body):
@@ -495,77 +576,87 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     # Update our string
                     body = re.sub(
                         re.escape(match[0]),
-                        '<@{user}|{desc}>'.format(user=user, desc=desc)
-                        if desc else '<@{user}>'.format(user=user),
+                        f"<@{user}|{desc}>" if desc else f"<@{user}>",
                         body,
-                        re.IGNORECASE)
+                        flags=re.IGNORECASE,
+                    )
 
                 # Support <url|desc>, <url> entries
                 for match in self._re_url_support.findall(body):
                     # Swap back any ampersands previously updaated
-                    url = match[1].replace('&amp;', '&')
+                    url = match[1].replace("&amp;", "&")
                     desc = match[2].strip()
 
                     # Update our string
                     body = re.sub(
                         re.escape(match[0]),
-                        '<{url}|{desc}>'.format(url=url, desc=desc)
-                        if desc else '<{url}>'.format(url=url),
+                        f"<{url}|{desc}>" if desc else f"<{url}>",
                         body,
-                        re.IGNORECASE)
+                        flags=re.IGNORECASE,
+                    )
 
             # Perform Formatting on title here; this is not needed for block
             # mode above
             title = self._re_formatting_rules.sub(  # pragma: no branch
-                lambda x: self._re_formatting_map[x.group()], title,
+                lambda x: self._re_formatting_map[x.group()],
+                title,
             )
 
             # Prepare JSON Object (applicable to both WEBHOOK and BOT mode)
             payload = {
-                'username': self.user if self.user else self.app_id,
+                "username": self.user if self.user else self.app_id,
                 # Use Markdown language
-                'mrkdwn': (self.notify_format == NotifyFormat.MARKDOWN),
-                'attachments': [{
-                    'title': title,
-                    'text': body,
-                    'color': self.color(notify_type),
-                    # Time
-                    'ts': time(),
+                "mrkdwn": self.notify_format == NotifyFormat.MARKDOWN,
+                "attachments": [{
+                    "title": title,
+                    "text": body,
+                    "color": self.color(notify_type),
                 }],
             }
+
             # Acquire our to-be footer icon if configured to do so
-            image_url = None if not self.include_image \
-                else self.image_url(notify_type)
+            image_url = (
+                None if not self.include_image else self.image_url(notify_type)
+            )
 
             if image_url:
-                payload['icon_url'] = image_url
+                payload["icon_url"] = image_url
 
             # Include the footer only if specified to do so
             if self.include_footer:
                 if image_url:
-                    payload['attachments'][0]['footer_icon'] = image_url
+                    payload["attachments"][0]["footer_icon"] = image_url
 
                 # Include the footer only if specified to do so
-                payload['attachments'][0]['footer'] = self.app_id
-
-        if attach and self.attachment_support \
-                and self.mode is SlackMode.WEBHOOK:
+                payload["attachments"][0]["footer"] = self.app_id
+
+                if self.include_timestamp:
+                    # Timestamp
+                    payload["attachments"][0]["ts"] = time()
+        if (
+            attach
+            and self.attachment_support
+            and self.mode in (SlackMode.WEBHOOK, SlackMode.WEBHOOK_GOV)
+        ):
             # Be friendly; let the user know why they can't send their
             # attachments if using the Webhook mode
-            self.logger.warning(
-                'Slack Webhooks do not support attachments.')
+            self.logger.warning("Slack Webhooks do not support attachments.")
 
         # Prepare our Slack URL (depends on mode)
         if self.mode is SlackMode.WEBHOOK:
-            url = '{}/{}/{}/{}'.format(
-                self.webhook_url,
-                self.token_a,
-                self.token_b,
-                self.token_c,
+            url = (
+                f"{self.webhook_url}/{self.token_a}"
+                f"/{self.token_b}/{self.token_c}"
+            )
+
+        elif self.mode is SlackMode.WEBHOOK_GOV:
+            url = (
+                f"{self.webhook_gov_url}/{self.token_a}"
+                f"/{self.token_b}/{self.token_c}"
             )
 
         else:  # SlackMode.BOT
-            url = self.api_url.format('chat.postMessage')
+            url = self.api_url.format("chat.postMessage")
 
         # Create a copy of the channel list
         channels = list(self.channels)
@@ -577,10 +668,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 # We'll perform a user lookup if we detect an email
                 email = is_email(channel)
                 if email:
-                    payload['channel'] = \
-                        self.lookup_userid(email['full_email'])
+                    payload["channel"] = self.lookup_userid(
+                        email["full_email"]
+                    )
 
-                    if not payload['channel']:
+                    if not payload["channel"]:
                         # Move along; any notifications/logging would have
                         # come from lookup_userid()
                         has_error = True
@@ -592,38 +684,40 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     if not result:
                         # Channel over-ride was specified
                         self.logger.warning(
-                            "The specified Slack target {} is invalid;"
-                            "skipping.".format(channel))
+                            f"The specified Slack target {channel} is invalid;"
+                            "skipping."
+                        )
 
                         # Mark our failure
                         has_error = True
                         continue
 
                     # Store oure content
-                    channel, thread_ts = \
-                        result.group('channel'), result.group('thread_ts')
+                    channel, thread_ts = result.group("channel"), result.group(
+                        "thread_ts"
+                    )
                     if thread_ts:
-                        payload['thread_ts'] = thread_ts
+                        payload["thread_ts"] = thread_ts
 
-                    elif 'thread_ts' in payload:
+                    elif "thread_ts" in payload:
                         # Handle situations where one channel has a thread_id
                         # specified, and the next does not.  We do not want to
                         # cary forward the last value specified
-                        del payload['thread_ts']
+                        del payload["thread_ts"]
 
-                    if channel[0] == '+':
+                    if channel[0] == "+":
                         # Treat as encoded id if prefixed with a +
-                        payload['channel'] = channel[1:]
+                        payload["channel"] = channel[1:]
 
-                    elif channel[0] == '@':
+                    elif channel[0] == "@":
                         # Treat @ value 'as is'
-                        payload['channel'] = channel
+                        payload["channel"] = channel
 
                     else:
                         # Prefix with channel hash tag (if not already)
-                        payload['channel'] = \
-                            channel if channel[0] == '#' \
-                            else '#{}'.format(channel)
+                        payload["channel"] = (
+                            channel if channel[0] == "#" else f"#{channel}"
+                        )
 
             response = self._send(url, payload)
             if not response:
@@ -633,16 +727,21 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
             # Store the valid channel or chat ID (for DMs) that will
             # be accepted by Slack's attachment method later.
-            if response.get('channel'):
-                attach_channel_list.append(response.get('channel'))
+            if response.get("channel"):
+                attach_channel_list.append(response.get("channel"))
 
             self.logger.info(
-                'Sent Slack notification{}.'.format(
-                    ' to {}'.format(channel)
-                    if channel is not None else ''))
+                "Sent Slack notification{}.".format(
+                    f" to {channel}" if channel is not None else ""
+                )
+            )
 
-        if attach and self.attachment_support and \
-                self.mode is SlackMode.BOT and attach_channel_list:
+        if (
+            attach
+            and self.attachment_support
+            and self.mode is SlackMode.BOT
+            and attach_channel_list
+        ):
             # Send our attachments (can only be done in bot mode)
             for no, attachment in enumerate(attach, start=1):
 
@@ -650,35 +749,40 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Posting Slack attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    f"Posting Slack attachment {attachment.url(privacy=True)}"
+                )
 
                 # Get the URL to which to upload the file.
                 # https://api.slack.com/methods/files.getUploadURLExternal
-                _params = {
-                    'filename': attachment.name
-                    if attachment.name else f'file{no:03}.dat',
-                    'length': len(attachment),
+                params = {
+                    "filename": (
+                        attachment.name
+                        if attachment.name
+                        else f"file{no:03}.dat"
+                    ),
+                    "length": len(attachment),
                 }
-                _url = self.api_url.format('files.getUploadURLExternal')
+                url_ = self.api_url.format("files.getUploadURLExternal")
                 response = self._send(
-                    _url, {}, http_method='get', params=_params
+                    url_, {}, http_method="get", params=params
                 )
                 if not (
-                    response and response.get('file_id')
-                    and response.get('upload_url')
+                    response
+                    and response.get("file_id")
+                    and response.get("upload_url")
                 ):
-                    self.logger.error('Could retrieve file upload URL.')
+                    self.logger.error("Could retrieve file upload URL.")
                     # We failed to get an upload URL, take an early exit
                     return False
 
-                file_id = response.get('file_id')
-                upload_url = response.get('upload_url')
+                file_id = response.get("file_id")
+                upload_url = response.get("upload_url")
 
                 # Upload file
                 response = self._send(upload_url, {}, attach=attachment)
@@ -686,15 +790,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 # Send file to channels
                 # https://api.slack.com/methods/files.completeUploadExternal
                 for channel_id in attach_channel_list:
-                    _payload = {
-                        'files': [{
+                    payload_ = {
+                        "files": [{
                             "id": file_id,
                             "title": attachment.name,
                         }],
-                        'channel_id': channel_id
+                        "channel_id": channel_id,
                     }
-                    _url = self.api_url.format('files.completeUploadExternal')
-                    response = self._send(_url, _payload)
+                    url_ = self.api_url.format("files.completeUploadExternal")
+                    response = self._send(url_, payload_)
                     # Expected response
                     # {
                     #     "ok": true,
@@ -705,8 +809,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     #         }
                     #     ]
                     # }
-                    if not (response and response.get('files')):
-                        self.logger.error('Failed to send file to channel.')
+                    if not (response and response.get("files")):
+                        self.logger.error("Failed to send file to channel.")
                         # We failed to send the file to the channel,
                         # take an early exit
                         return False
@@ -714,10 +818,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         return not has_error
 
     def lookup_userid(self, email):
-        """
-        Takes an email address and attempts to resolve/acquire it's user
-        id for notification purposes.
-        """
+        """Takes an email address and attempts to resolve/acquire it's user id
+        for notification purposes."""
         if email in self._lookup_users:
             # We're done as entry has already been retrieved
             return self._lookup_users[email]
@@ -725,29 +827,31 @@ def lookup_userid(self, email):
         if self.mode is not SlackMode.BOT:
             # You can not look up
             self.logger.warning(
-                'Emails can not be resolved to Slack User IDs unless you '
-                'have a bot configured.')
+                "Emails can not be resolved to Slack User IDs unless you "
+                "have a bot configured."
+            )
             return None
 
-        lookup_url = self.api_url.format('users.lookupByEmail')
+        lookup_url = self.api_url.format("users.lookupByEmail")
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Authorization': 'Bearer {}'.format(self.access_token),
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Authorization": f"Bearer {self.access_token}",
         }
 
         # we pass in our email address as the argument
         params = {
-            'email': email,
+            "email": email,
         }
 
-        self.logger.debug('Slack User Lookup POST URL: %s (cert_verify=%r)' % (
-            lookup_url, self.verify_certificate,
-        ))
-        self.logger.debug('Slack User Lookup Parameters: %s' % str(params))
+        self.logger.debug(
+            "Slack User Lookup POST URL:"
+            f" {lookup_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Slack User Lookup Parameters: {params!s}")
 
         # Initialize our HTTP JSON response
-        response = {'ok': False}
+        response = {"ok": False}
 
         # Initialize our detected user id (also the response to this function)
         user_id = None
@@ -764,14 +868,13 @@ def lookup_userid(self, email):
             )
 
             # Attachment posts return a JSON string
-            try:
-                response = loads(r.content)
+            with contextlib.suppress(AttributeError, TypeError, ValueError):
+                # Load our JSON object if we can
 
-            except (AttributeError, TypeError, ValueError):
                 # ValueError = r.content is Unparsable
                 # TypeError = r.content is None
                 # AttributeError = r is None
-                pass
+                response = loads(r.content)
 
             # We can get a 200 response, but still fail.  A failure message
             # might look like this (missing bot permissions):
@@ -782,22 +885,24 @@ def lookup_userid(self, email):
             #      'provided': 'calls:write,chat:write'
             #    }
 
-            if r.status_code != requests.codes.ok \
-                    or not (response and response.get('ok', False)):
+            if r.status_code != requests.codes.ok or not (
+                response and response.get("ok", False)
+            ):
 
                 # We had a problem
-                status_str = \
-                    NotifySlack.http_response_code_lookup(
-                        r.status_code, SLACK_HTTP_ERROR_MAP)
+                status_str = NotifySlack.http_response_code_lookup(
+                    r.status_code, SLACK_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send Slack User Lookup:'
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Slack User Lookup:{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
+
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
                 # Return; we're done
                 return False
 
@@ -852,46 +957,52 @@ def lookup_userid(self, email):
             #   }
             # }
             # We're only interested in the id
-            user_id = response['user']['id']
+            user_id = response["user"]["id"]
 
             # Cache it for future
             self._lookup_users[email] = user_id
             self.logger.info(
-                'Email %s resolves to the Slack User ID: %s.', email, user_id)
+                "Email %s resolves to the Slack User ID: %s.", email, user_id
+            )
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred looking up Slack User.',
+                "A Connection error occurred looking up Slack User.",
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             # Return; we're done
             return None
 
         return user_id
 
-    def _send(self, url, payload, attach=None, http_method='post', params=None,
-              **kwargs):
-        """
-        Wrapper to the requests (post) object
-        """
-        self.logger.debug('Slack POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Slack Payload: %s' % str(payload))
+    def _send(
+        self,
+        url,
+        payload,
+        attach=None,
+        http_method="post",
+        params=None,
+        **kwargs,
+    ):
+        """Wrapper to the requests (post) object."""
+        self.logger.debug(
+            f"Slack POST URL: {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Slack Payload: {payload!s}")
 
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
         }
 
         if not attach:
-            headers['Content-Type'] = 'application/json; charset=utf-8'
+            headers["Content-Type"] = "application/json; charset=utf-8"
 
         if self.mode is SlackMode.BOT:
-            headers['Authorization'] = 'Bearer {}'.format(self.access_token)
+            headers["Authorization"] = f"Bearer {self.access_token}"
 
         # Our response object
-        response = {'ok': False}
+        response = {"ok": False}
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -902,7 +1013,14 @@ def _send(self, url, payload, attach=None, http_method='post', params=None,
         try:
             # Open our attachment path if required:
             if attach:
-                files = {'file': (attach.name, open(attach.path, 'rb'))}
+                files = {
+                    "file": (
+                        attach.name,
+                        # file handle is safely closed in `finally`; inline
+                        # open is intentional
+                        open(attach.path, "rb"),  # noqa: SIM115
+                        ),
+                    }
 
             r = requests.request(
                 http_method,
@@ -916,14 +1034,12 @@ def _send(self, url, payload, attach=None, http_method='post', params=None,
             )
 
             # Posts return a JSON string
-            try:
-                response = loads(r.content)
-
-            except (AttributeError, TypeError, ValueError):
+            with contextlib.suppress(AttributeError, TypeError, ValueError):
+                # Load our JSON object if we can
                 # ValueError = r.content is Unparsable
                 # TypeError = r.content is None
                 # AttributeError = r is None
-                pass
+                response = loads(r.content)
 
             # Another response type is:
             # {
@@ -933,36 +1049,37 @@ def _send(self, url, payload, attach=None, http_method='post', params=None,
             status_okay = False
             if self.mode is SlackMode.BOT:
                 status_okay = (
-                    (response and response.get('ok', False)) or
+                    (response and response.get("ok", False))
+                    or
                     # Responses for file uploads look like this
                     # 'OK - <file length>'
                     (
-                        r.content and
-                        isinstance(r.content, bytes) and
-                        b'OK' in r.content
+                        r.content
+                        and isinstance(r.content, bytes)
+                        and b"OK" in r.content
                     )
                 )
-            elif r.content == b'ok':
+            elif r.content == b"ok":
                 # The text 'ok' is returned if this is a Webhook request
                 # So the below captures that as well.
                 status_okay = True
 
             if r.status_code != requests.codes.ok or not status_okay:
                 # We had a problem
-                status_str = \
-                    NotifySlack.http_response_code_lookup(
-                        r.status_code, SLACK_HTTP_ERROR_MAP)
+                status_str = NotifySlack.http_response_code_lookup(
+                    r.status_code, SLACK_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send{} to Slack: '
-                    '{}{}error={}.'.format(
-                        (' ' + attach.name) if attach else '',
+                    "Failed to send{} to Slack: {}{}error={}.".format(
+                        (" " + attach.name) if attach else "",
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
                 return False
 
             # Message Post Response looks like this:
@@ -1000,189 +1117,231 @@ def _send(self, url, payload, attach=None, http_method='post', params=None,
             # }
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred posting {}to Slack.'.format(
-                    attach.name if attach else ''))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred posting {}to Slack.".format(
+                    attach.name if attach else ""
+                )
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return False
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while reading {}.'.format(
-                    attach.name if attach else 'attachment'))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while reading {}.".format(
+                    attach.name if attach else "attachment"
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return False
 
         finally:
             # Close our file (if it's open) stored in the second element
             # of our files tuple (index 1)
             if files:
-                files['file'][1].close()
+                files["file"][1].close()
 
         # Return the response for processing
         return response
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.token_a, self.token_b, self.token_c,
+            self.secure_protocol,
+            self.token_a,
+            self.token_b,
+            self.token_c,
             self.access_token,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'footer': 'yes' if self.include_footer else 'no',
-            'blocks': 'yes' if self.use_blocks else 'no',
+            "image": "yes" if self.include_image else "no",
+            "footer": "yes" if self.include_footer else "no",
+            "timestamp": "yes" if self.include_timestamp else "no",
+            "blocks": "yes" if self.use_blocks else "no",
+            "mode": self.mode,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine if there is a botname present
-        botname = ''
+        botname = ""
         if self.user:
-            botname = '{botname}@'.format(
-                botname=NotifySlack.quote(self.user, safe=''),
+            botname = "{botname}@".format(
+                botname=NotifySlack.quote(self.user, safe=""),
             )
 
-        if self.mode == SlackMode.WEBHOOK:
-            return '{schema}://{botname}{token_a}/{token_b}/{token_c}/'\
-                '{targets}/?{params}'.format(
+        if self.mode in (SlackMode.WEBHOOK, SlackMode.WEBHOOK_GOV):
+            return (
+                "{schema}://{botname}{token_a}/{token_b}/{token_c}/"
+                "{targets}/?{params}".format(
                     schema=self.secure_protocol,
                     botname=botname,
-                    token_a=self.pprint(self.token_a, privacy, safe=''),
-                    token_b=self.pprint(self.token_b, privacy, safe=''),
-                    token_c=self.pprint(self.token_c, privacy, safe=''),
-                    targets='/'.join(
-                        [NotifySlack.quote(x, safe='')
-                            for x in self.channels]),
+                    token_a=self.pprint(self.token_a, privacy, safe=""),
+                    token_b=self.pprint(self.token_b, privacy, safe=""),
+                    token_c=self.pprint(self.token_c, privacy, safe=""),
+                    targets="/".join(
+                        [NotifySlack.quote(x, safe="") for x in self.channels]
+                    ),
                     params=NotifySlack.urlencode(params),
                 )
-        # else -> self.mode == SlackMode.BOT:
-        return '{schema}://{botname}{access_token}/{targets}/'\
-            '?{params}'.format(
-                schema=self.secure_protocol,
-                botname=botname,
-                access_token=self.pprint(self.access_token, privacy, safe=''),
-                targets='/'.join(
-                    [NotifySlack.quote(x, safe='') for x in self.channels]),
-                params=NotifySlack.urlencode(params),
             )
+        # else -> self.mode == SlackMode.BOT:
+        return "{schema}://{botname}{access_token}/{targets}/?{params}".format(
+            schema=self.secure_protocol,
+            botname=botname,
+            access_token=self.pprint(self.access_token, privacy, safe=""),
+            targets="/".join(
+                [NotifySlack.quote(x, safe="") for x in self.channels]
+            ),
+            params=NotifySlack.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.channels)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The first token is stored in the hostname
-        token = NotifySlack.unquote(results['host'])
+        token = NotifySlack.unquote(results["host"])
 
         # Get unquoted entries
-        entries = NotifySlack.split_path(results['fullpath'])
+        entries = NotifySlack.split_path(results["fullpath"])
 
         # Verify if our token_a us a bot token or part of a webhook:
-        if token.startswith('xo'):
+        if token.startswith("xo"):
             # We're dealing with a bot
-            results['access_token'] = token
+            results["access_token"] = token
 
         else:
             # We're dealing with a webhook
-            results['token_a'] = token
-            results['token_b'] = entries.pop(0) if entries else None
-            results['token_c'] = entries.pop(0) if entries else None
+            results["token_a"] = token
+            results["token_b"] = entries.pop(0) if entries else None
+            results["token_c"] = entries.pop(0) if entries else None
 
         # assign remaining entries to the channels we wish to notify
-        results['targets'] = entries
+        results["targets"] = entries
 
         # Support the token flag where you can set it to the bot token
         # or the webhook token (with slash delimiters)
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Break our entries up into a list; we can ue the Channel
             # list delimiter above since it doesn't contain any characters
             # we don't otherwise accept anyway in our token
-            entries = [x for x in filter(
-                bool, CHANNEL_LIST_DELIM.split(
-                    NotifySlack.unquote(results['qsd']['token'])))]
+            entries = list(
+                filter(
+                    bool,
+                    CHANNEL_LIST_DELIM.split(
+                        NotifySlack.unquote(results["qsd"]["token"])
+                    ),
+                )
+            )
 
             # check to see if we're dealing with a bot/user token
-            if entries and entries[0].startswith('xo'):
+            if entries and entries[0].startswith("xo"):
                 # We're dealing with a bot
-                results['access_token'] = entries[0]
-                results['token_a'] = None
-                results['token_b'] = None
-                results['token_c'] = None
+                results["access_token"] = entries[0]
+                results["token_a"] = None
+                results["token_b"] = None
+                results["token_c"] = None
 
             else:  # Webhook
-                results['access_token'] = None
-                results['token_a'] = entries.pop(0) if entries else None
-                results['token_b'] = entries.pop(0) if entries else None
-                results['token_c'] = entries.pop(0) if entries else None
+                results["access_token"] = None
+                results["token_a"] = entries.pop(0) if entries else None
+                results["token_b"] = entries.pop(0) if entries else None
+                results["token_c"] = entries.pop(0) if entries else None
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += [x for x in filter(
-                bool, CHANNEL_LIST_DELIM.split(
-                    NotifySlack.unquote(results['qsd']['to'])))]
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += list(
+                filter(
+                    bool,
+                    CHANNEL_LIST_DELIM.split(
+                        NotifySlack.unquote(results["qsd"]["to"])
+                    ),
+                )
+            )
 
         # Get Image Flag
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = \
+            parse_bool(results["qsd"].get(
+                "image", NotifySlack.template_args["image"]["default"]))
+
+        results["include_timestamp"] = \
+            parse_bool(results["qsd"].get(
+                "timestamp",
+                NotifySlack.template_args["timestamp"]["default"]))
 
         # Get Payload structure (use blocks?)
-        if 'blocks' in results['qsd'] and len(results['qsd']['blocks']):
-            results['use_blocks'] = parse_bool(results['qsd']['blocks'])
+        if "blocks" in results["qsd"] and len(results["qsd"]["blocks"]):
+            results["use_blocks"] = parse_bool(results["qsd"]["blocks"])
 
         # Get Footer Flag
-        results['include_footer'] = \
-            parse_bool(results['qsd'].get('footer', True))
+        results["include_footer"] = \
+            parse_bool(results["qsd"].get(
+                "footer", NotifySlack.template_args["footer"]["default"]))
+
+        # Get Mode
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            results["mode"] = NotifySlack.unquote(results["qsd"]["mode"])
 
         return results
 
     @staticmethod
     def parse_native_url(url):
         """
-        Support https://hooks.slack.com/services/TOKEN_A/TOKEN_B/TOKEN_C
+        Supports:
+          - https://hooks.slack.com/services/TOKEN_A/TOKEN_B/TOKEN_C
+          - https://hooks.slack-gov.com/services/TOKEN_A/TOKEN_B/TOKEN_C
         """
 
         result = re.match(
-            r'^https?://hooks\.slack\.com/services/'
-            r'(?P<token_a>[A-Z0-9]+)/'
-            r'(?P<token_b>[A-Z0-9]+)/'
-            r'(?P<token_c>[A-Z0-9]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://(?P<host>hooks\.slack(?P<gov>-gov)?\.com)/services/"
+            r"(?P<token_a>[A-Z0-9]+)/"
+            r"(?P<token_b>[A-Z0-9]+)/"
+            r"(?P<token_c>[A-Z0-9]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
+            params = (
+                ""
+                if not result.group("params")
+                else result.group("params")
+            )
+
+            if result.group("gov"):
+                # provide gov parameters
+                params = ("?" if not params else "&") + \
+                    f"mode={SlackMode.WEBHOOK_GOV}"
+
             return NotifySlack.parse_url(
-                '{schema}://{token_a}/{token_b}/{token_c}/{params}'.format(
+                "{schema}://{token_a}/{token_b}/{token_c}/{params}".format(
                     schema=NotifySlack.secure_protocol,
-                    token_a=result.group('token_a'),
-                    token_b=result.group('token_b'),
-                    token_c=result.group('token_c'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    token_a=result.group("token_a"),
+                    token_b=result.group("token_b"),
+                    token_c=result.group("token_c"),
+                    params=params,
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/smpp.py b/libs/apprise/plugins/smpp.py
new file mode 100644
index 0000000000..02e515960d
--- /dev/null
+++ b/libs/apprise/plugins/smpp.py
@@ -0,0 +1,346 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+from itertools import chain
+
+try:
+    import smpplib
+    import smpplib.consts
+    import smpplib.gsm
+
+    # We're good to go!
+    NOTIFY_SMPP_ENABLED = True
+
+except ImportError:
+    # cryptography is required in order for this package to work
+    NOTIFY_SMPP_ENABLED = False
+
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no
+from .base import NotifyBase
+
+
+class NotifySMPP(NotifyBase):
+    """A wrapper for SMPP Notifications."""
+
+    # Set our global enabled flag
+    enabled = NOTIFY_SMPP_ENABLED
+
+    requirements = {
+        # Define our required packaging in order to work
+        "packages_required": "smpplib"
+    }
+
+    # The default descriptive name associated with the Notification
+    service_name = _("SMPP")
+
+    # The services URL
+    service_url = "https://smpp.org/"
+
+    # The default protocol
+    protocol = "smpp"
+
+    # The default secure protocol
+    secure_protocol = "smpps"
+
+    # Default port setup
+    default_port = 2775
+    default_secure_port = 3550
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/smpp/"
+
+    # A title can not be used for SMS Messages.  Setting this to zero will
+    # cause any title (if defined) to get placed into the message body.
+    title_maxlen = 0
+
+    templates = (
+        "{schema}://{user}:{password}@{host}/{from_phone}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{from_phone}/{targets}",
+    )
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "host": {
+                "name": _("Host"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "required": True,
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
+        },
+    )
+
+    def __init__(self, source=None, targets=None, **kwargs):
+        """Initialize SMPP Object."""
+
+        super().__init__(**kwargs)
+
+        self.source = None
+
+        if not (self.user and self.password):
+            msg = "No SMPP user/pass combination was provided"
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        result = is_phone_no(source)
+        if not result:
+            msg = (
+                f"The Account (From) Phone # specified ({source}) is invalid."
+            )
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Tidy source
+        self.source = result["full"]
+
+        # Used for URL generation afterwards only
+        self._invalid_targets = []
+
+        # Parse our targets
+        self.targets = []
+
+        for target in parse_phone_no(targets, prefix=True):
+            # Validate targets and drop bad ones:
+            result = is_phone_no(target)
+            if not result:
+                self.logger.warning(
+                    f"Dropped invalid phone # ({target}) specified.",
+                )
+                self._invalid_targets.append(target)
+                continue
+
+            # store valid phone number
+            self.targets.append(result["full"])
+
+    @property
+    def url_identifier(self):
+        """Returns all the identifiers that make this URL unique from another
+        similar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (
+            self.secure_protocol if self.secure else self.protocol,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
+            self.source,
+        )
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        return (
+            "{schema}://{user}:{password}@{host}/{source}/{targets}/?{params}"
+        ).format(
+            schema=self.secure_protocol if self.secure else self.protocol,
+            user=self.user,
+            password=self.password,
+            host=f"{self.host}:{self.port}" if self.port else self.host,
+            source=self.source,
+            targets="/".join([
+                NotifySMPP.quote(t, safe="")
+                for t in chain(self.targets, self._invalid_targets)
+            ]),
+            params=self.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification.
+
+        Always return 1 at least
+        """
+        return len(self.targets) if self.targets else 1
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform SMPP Notification."""
+
+        if not self.targets:
+            # There were no targets to notify
+            self.logger.warning("There were no SMPP targets to notify")
+            return False
+
+        # error tracking (used for function return)
+        has_error = False
+
+        port = (
+            self.default_port if not self.secure else self.default_secure_port
+        )
+
+        client = smpplib.client.Client(
+            self.host, port, allow_unknown_opt_params=True
+        )
+        try:
+            client.connect()
+            client.bind_transmitter(
+                system_id=self.user, password=self.password
+            )
+
+        except smpplib.exceptions.ConnectionError as e:
+            self.logger.warning(
+                "Failed to establish connection to SMPP server"
+                f" {self.host}: {e}"
+            )
+            return False
+
+        for target in self.targets:
+            parts, encoding, msg_type = smpplib.gsm.make_parts(body)
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+
+            try:
+                for payload in parts:
+                    client.send_message(
+                        source_addr_ton=smpplib.consts.SMPP_TON_INTL,
+                        source_addr=self.source,
+                        dest_addr_ton=smpplib.consts.SMPP_TON_INTL,
+                        destination_addr=target,
+                        short_message=payload,
+                        data_coding=encoding,
+                        esm_class=msg_type,
+                        registered_delivery=True,
+                    )
+            except Exception as e:
+                self.logger.warning(f"Failed to send SMPP notification: {e}")
+                # Mark our failure
+                has_error = True
+                continue
+
+            self.logger.info("Sent SMPP notification to %s", target)
+
+        client.unbind()
+        client.disconnect()
+        return not has_error
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Support the 'from'  and 'source' variable so that we can support
+        # targets this way too.
+        # The 'from' makes it easier to use yaml configuration
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifySMPP.unquote(results["qsd"]["from"])
+
+            # hostname will also be a target in this case
+            results["targets"] = [
+                *NotifySMPP.parse_phone_no(results["host"]),
+                *NotifySMPP.split_path(results["fullpath"]),
+            ]
+
+        else:
+            # store our source
+            results["source"] = NotifySMPP.unquote(results["host"])
+
+            # store targets
+            results["targets"] = NotifySMPP.split_path(results["fullpath"])
+
+        # Support the 'to' variable so that we can support targets this way too
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySMPP.parse_phone_no(
+                results["qsd"]["to"]
+            )
+
+        results["targets"] = NotifySMPP.split_path(results["fullpath"])
+
+        # Support the 'to' variable so that we can support targets this way too
+        # 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySMPP.parse_phone_no(
+                results["qsd"]["to"]
+            )
+
+        # store any additional payload extras defined
+        results["payload"] = {
+            NotifySMPP.unquote(x): NotifySMPP.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
+
+        # Add our GET parameters in the event the user wants to pass them
+        results["params"] = {
+            NotifySMPP.unquote(x): NotifySMPP.unquote(y)
+            for x, y in results["qsd-"].items()
+        }
+
+        # Support the 'from' and 'source' variable so that we can support
+        # targets this way too.
+        # 'from' makes it easier to use yaml configuration
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifySMPP.unquote(results["qsd"]["from"])
+        elif results["targets"]:
+            # from phone number is the first entry in the list otherwise
+            results["source"] = results["targets"].pop(0)
+
+        return results
diff --git a/libs/apprise/plugins/smseagle.py b/libs/apprise/plugins/smseagle.py
index 6c545674c0..5a44dfbb38 100644
--- a/libs/apprise/plugins/smseagle.py
+++ b/libs/apprise/plugins/smseagle.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,25 +25,29 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from itertools import chain
+from json import dumps, loads
+import logging
 import re
+
 import requests
-from json import dumps, loads
-from itertools import chain
 
-from .base import NotifyBase
-from ..common import NotifyType
 from .. import exception
-from ..utils.parse import (
-    validate_regex, is_phone_no, parse_phone_no, parse_bool)
-from ..url import PrivacyMode
+from ..common import NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
+GROUP_REGEX = re.compile(r"^\s*(\#|\%35)(?P<group>[a-z0-9_-]+)", re.I)
 
-GROUP_REGEX = re.compile(
-    r'^\s*(\#|\%35)(?P<group>[a-z0-9_-]+)', re.I)
-
-CONTACT_REGEX = re.compile(
-    r'^\s*(\@|\%40)?(?P<contact>[a-z0-9_-]+)', re.I)
+CONTACT_REGEX = re.compile(r"^\s*(\@|\%40)?(?P<contact>[a-z0-9_-]+)", re.I)
 
 
 # Priorities
@@ -60,20 +63,20 @@ class SMSEaglePriority:
 
 SMSEAGLE_PRIORITY_MAP = {
     # short for 'normal'
-    'normal': SMSEaglePriority.NORMAL,
+    "normal": SMSEaglePriority.NORMAL,
     # short for 'high'
-    '+': SMSEaglePriority.HIGH,
-    'high': SMSEaglePriority.HIGH,
+    "+": SMSEaglePriority.HIGH,
+    "high": SMSEaglePriority.HIGH,
 }
 
 
 class SMSEagleCategory:
-    """
-    We define the different category types that we can notify via SMS Eagle
-    """
-    PHONE = 'phone'
-    GROUP = 'group'
-    CONTACT = 'contact'
+    """We define the different category types that we can notify via SMS
+    Eagle."""
+
+    PHONE = "phone"
+    GROUP = "group"
+    CONTACT = "contact"
 
 
 SMSEAGLE_CATEGORIES = (
@@ -84,27 +87,25 @@ class SMSEagleCategory:
 
 
 class NotifySMSEagle(NotifyBase):
-    """
-    A wrapper for SMSEagle Notifications
-    """
+    """A wrapper for SMSEagle Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'SMS Eagle'
+    service_name = "SMS Eagle"
 
     # The services URL
-    service_url = 'https://smseagle.eu'
+    service_url = "https://smseagle.eu"
 
     # The default protocol
-    protocol = 'smseagle'
+    protocol = "smseagle"
 
     # The default protocol
-    secure_protocol = 'smseagles'
+    secure_protocol = "smseagles"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_smseagle'
+    setup_url = "https://appriseit.com/services/smseagle/"
 
     # The path we send our notification to
-    notify_path = '/jsonrpc/sms'
+    notify_path = "/jsonrpc/sms"
 
     # Support attachments
     attachment_support = True
@@ -122,97 +123,110 @@ class NotifySMSEagle(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{token}@{host}/{targets}',
-        '{schema}://{token}@{host}:{port}/{targets}',
+        "{schema}://{token}@{host}/{targets}",
+        "{schema}://{token}@{host}:{port}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'token': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'required': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'target_group': {
-            'name': _('Target Group ID'),
-            'type': 'string',
-            'prefix': '#',
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'target_contact': {
-            'name': _('Target Contact'),
-            'type': 'string',
-            'prefix': '@',
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "target_group": {
+                "name": _("Target Group ID"),
+                "type": "string",
+                "prefix": "#",
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+                "map_to": "targets",
+            },
+            "target_contact": {
+                "name": _("Target Contact"),
+                "type": "string",
+                "prefix": "@",
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        }
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'token': {
-            'alias_of': 'token',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-        'status': {
-            'name': _('Show Status'),
-            'type': 'bool',
-            'default': False,
-        },
-        'test': {
-            'name': _('Test Only'),
-            'type': 'bool',
-            'default': False,
-        },
-        'flash': {
-            'name': _('Flash'),
-            'type': 'bool',
-            'default': False,
-        },
-        'priority': {
-            'name': _('Priority'),
-            'type': 'choice:int',
-            'values': SMSEAGLE_PRIORITIES,
-            'default': SMSEaglePriority.NORMAL,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "token": {
+                "alias_of": "token",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
+            "status": {
+                "name": _("Show Status"),
+                "type": "bool",
+                "default": False,
+            },
+            "test": {
+                "name": _("Test Only"),
+                "type": "bool",
+                "default": False,
+            },
+            "flash": {
+                "name": _("Flash"),
+                "type": "bool",
+                "default": False,
+            },
+            "priority": {
+                "name": _("Priority"),
+                "type": "choice:int",
+                "values": SMSEAGLE_PRIORITIES,
+                "default": SMSEaglePriority.NORMAL,
+            },
         },
-    })
+    )
 
-    def __init__(self, token=None, targets=None, priority=None, batch=False,
-                 status=False, flash=False, test=False, **kwargs):
-        """
-        Initialize SMSEagle Object
-        """
+    def __init__(
+        self,
+        token=None,
+        targets=None,
+        priority=None,
+        batch=False,
+        status=False,
+        flash=False,
+        test=False,
+        **kwargs,
+    ):
+        """Initialize SMSEagle Object."""
         super().__init__(**kwargs)
 
         # Prepare Flash Mode Flag
@@ -228,19 +242,20 @@ def __init__(self, token=None, targets=None, priority=None, batch=False,
         self.status = status
 
         # Parse our targets
-        self.target_phones = list()
-        self.target_groups = list()
-        self.target_contacts = list()
+        self.target_phones = []
+        self.target_groups = []
+        self.target_contacts = []
 
         # Used for URL generation afterwards only
-        self.invalid_targets = list()
+        self.invalid_targets = []
 
         # We always use a token if provided
-        self.token = validate_regex(self.user if not token else token)
+        self.token = validate_regex(token if token else self.user)
         if not self.token:
-            msg = \
-                'An invalid SMSEagle Access Token ({}) was specified.'.format(
-                    self.user if not token else token)
+            msg = (
+                "An invalid SMSEagle Access Token"
+                f" ({token if token else self.user}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -255,7 +270,7 @@ def __init__(self, token=None, targets=None, priority=None, batch=False,
 
         except TypeError:
             # NoneType means use Default; this is an okay exception
-            self.priority = self.template_args['priority']['default']
+            self.priority = self.template_args["priority"]["default"]
 
         except ValueError:
             # Input is a string; attempt to get the lookup from our
@@ -266,24 +281,35 @@ def __init__(self, token=None, targets=None, priority=None, batch=False,
             # low, lo, l (for low);
             # normal, norma, norm, nor, no, n (for normal)
             # ... etc
-            result = next((key for key in SMSEAGLE_PRIORITY_MAP.keys()
-                          if key.startswith(priority)), None) \
-                if priority else None
+            result = (
+                next(
+                    (
+                        key
+                        for key in SMSEAGLE_PRIORITY_MAP
+                        if key.startswith(priority)
+                    ),
+                    None,
+                )
+                if priority
+                else None
+            )
 
             # Now test to see if we got a match
             if not result:
-                msg = 'An invalid SMSEagle priority ' \
-                      '({}) was specified.'.format(priority)
+                msg = (
+                    f"An invalid SMSEagle priority ({priority}) was specified."
+                )
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
 
             # store our successfully looked up priority
             self.priority = SMSEAGLE_PRIORITY_MAP[result]
 
-        if self.priority is not None and \
-                self.priority not in SMSEAGLE_PRIORITY_MAP.values():
-            msg = 'An invalid SMSEagle priority ' \
-                  '({}) was specified.'.format(priority)
+        if (
+            self.priority is not None
+            and self.priority not in SMSEAGLE_PRIORITY_MAP.values()
+        ):
+            msg = f"An invalid SMSEagle priority ({priority}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -295,42 +321,49 @@ def __init__(self, token=None, targets=None, priority=None, batch=False,
             if result:
                 # store valid phone number
                 self.target_phones.append(
-                    '{}{}'.format(
-                        '' if target[0] != '+' else '+', result['full']))
+                    "{}{}".format(
+                        "" if target[0] != "+" else "+", result["full"]
+                    )
+                )
                 continue
 
             result = GROUP_REGEX.match(target)
             if result:
                 # Just store group information
-                self.target_groups.append(result.group('group'))
+                self.target_groups.append(result.group("group"))
                 continue
 
             result = CONTACT_REGEX.match(target)
             if result:
                 # Just store contact information
-                self.target_contacts.append(result.group('contact'))
+                self.target_contacts.append(result.group("contact"))
                 continue
 
             self.logger.warning(
-                'Dropped invalid phone/group/contact '
-                '({}) specified.'.format(target),
+                f"Dropped invalid phone/group/contact ({target}) specified.",
             )
             self.invalid_targets.append(target)
             continue
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform SMSEagle Notification
-        """
-
-        if not self.target_groups and not self.target_phones \
-                and not self.target_contacts:
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform SMSEagle Notification."""
+
+        if (
+            not self.target_groups
+            and not self.target_phones
+            and not self.target_contacts
+        ):
             # There were no services to notify
-            self.logger.warning(
-                'There were no SMSEagle targets to notify.')
+            self.logger.warning("There were no SMSEagle targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -343,77 +376,74 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SMSEagle attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SMSEagle attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
-                if not re.match(r'^image/.*', attachment.mimetype, re.I):
+                if not re.match(r"^image/.*", attachment.mimetype, re.I):
                     # Only support images at this time
                     self.logger.warning(
-                        'Ignoring unsupported SMSEagle attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Ignoring unsupported SMSEagle attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     continue
 
                 try:
                     # Prepare our Attachment in Base64
                     attachments.append({
-                        'content_type': attachment.mimetype,
-                        'content': attachment.base64(),
+                        "content_type": attachment.mimetype,
+                        "content": attachment.base64(),
                     })
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SMSEagle attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SMSEagle attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending SMSEagle attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending SMSEagle attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Prepare our payload
         params_template = {
             # Our Access Token
-            'access_token': self.token,
-
+            "access_token": self.token,
             # The message to send (populated below)
             "message": None,
-
             # 0 = normal priority, 1 = high priority
             "highpriority": self.priority,
-
             # Support unicode characters
             "unicode": 1,
-
             # sms or mms (if attachment)
-            "message_type": 'sms',
-
+            "message_type": "sms",
             # Response Types:
             #  simple: format response as simple object with one result field
             #  extended: format response as extended JSON object
-            "responsetype": 'extended',
-
+            "responsetype": "extended",
             # SMS will be sent as flash message (1 = yes, 0 = no)
             "flash": 1 if self.flash else 0,
-
             # Message Simulation
             "test": 1 if self.test else 0,
         }
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
         # Construct our URL
-        notify_url = '%s://%s' % (schema, self.host)
+        notify_url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            notify_url += ':%d' % self.port
+            notify_url += f":{self.port}"
         notify_url += self.notify_path
 
         # Send in batches if identified to do so
@@ -422,15 +452,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         notify_by = {
             SMSEagleCategory.PHONE: {
                 "method": "sms.send_sms",
-                'target': 'to',
+                "target": "to",
             },
             SMSEagleCategory.GROUP: {
                 "method": "sms.send_togroup",
-                'target': 'groupname',
+                "target": "groupname",
             },
             SMSEagleCategory.CONTACT: {
                 "method": "sms.send_tocontact",
-                'target': 'contactname',
+                "target": "contactname",
             },
         }
 
@@ -440,35 +470,45 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         for category in SMSEAGLE_CATEGORIES:
             # Create a copy of our template
             payload = {
-                'method': notify_by[category]['method'],
-                'params': {
-                    notify_by[category]['target']: None,
+                "method": notify_by[category]["method"],
+                "params": {
+                    notify_by[category]["target"]: None,
                 },
             }
 
             # Apply Template
-            payload['params'].update(params_template)
+            payload["params"].update(params_template)
 
             # Set our Message
             payload["params"]["message"] = "{}{}".format(
-                '' if not self.status else '{} '.format(
-                    self.asset.ascii(notify_type)), body)
+                "" if not self.status else f"{self.asset.ascii(notify_type)} ",
+                body,
+            )
 
             if attachments:
                 # Store our attachments
-                payload['params']['message_type'] = 'mms'
-                payload['params']['attachments'] = attachments
+                payload["params"]["message_type"] = "mms"
+                payload["params"]["attachments"] = attachments
 
-            targets = getattr(self, 'target_{}s'.format(category))
+            targets = getattr(self, f"target_{category}s")
             for index in range(0, len(targets), batch_size):
                 # Prepare our recipients
-                payload['params'][notify_by[category]['target']] = \
-                    ','.join(targets[index:index + batch_size])
-
-                self.logger.debug('SMSEagle POST URL: %s (cert_verify=%r)' % (
-                    notify_url, self.verify_certificate,
-                ))
-                self.logger.debug('SMSEagle Payload: %s' % str(payload))
+                payload["params"][notify_by[category]["target"]] = ",".join(
+                    targets[index : index + batch_size]
+                )
+                # Some Debug Logging
+                if self.logger.isEnabledFor(logging.DEBUG):
+                    # Due to attachments; output can be quite heavy and io
+                    # intensive.
+                    # To accommodate this, we only show our debug payload
+                    # information if required.
+                    self.logger.debug(
+                        "SMSEagle POST URL:"
+                        f" {notify_url} "
+                        f"(cert_verify={self.verify_certificate!r})"
+                    )
+                    self.logger.debug(
+                        "SMSEagle Payload: %s", sanitize_payload(payload))
 
                 # Always call throttle before any remote server i/o is made
                 self.throttle()
@@ -485,7 +525,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                         content = loads(r.content)
 
                         # Store our status
-                        status_str = str(content['result'])
+                        status_str = str(content["result"])
 
                     except (AttributeError, TypeError, ValueError, KeyError):
                         # ValueError = r.content is Unparsable
@@ -503,39 +543,57 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     # The below code handles both cases only only fails if a
                     # non-ok value was returned
 
-                    if r.status_code not in (
-                            requests.codes.ok, requests.codes.created) or \
-                            not isinstance(content.get('result'),
-                                           (dict, list)) or \
-                            (isinstance(content.get('result'), dict) and
-                             content['result'].get('status') != 'ok') or \
-                            (isinstance(content.get('result'), list) and
-                             next((True for entry in content.get('result')
-                                   if isinstance(entry, dict) and
-                                   entry.get('status') != 'ok'), False
-                                  )  # pragma: no cover
-                             ):
+                    if (
+                        r.status_code
+                        not in (requests.codes.ok, requests.codes.created)
+                        or not isinstance(content.get("result"), (dict, list))
+                        or (
+                            isinstance(content.get("result"), dict)
+                            and content["result"].get("status") != "ok"
+                        )
+                        or (
+                            isinstance(content.get("result"), list)
+                            and next(
+                                (
+                                    True
+                                    for entry in content.get("result")
+                                    if isinstance(entry, dict)
+                                    and entry.get("status") != "ok"
+                                ),
+                                False,
+                            )  # pragma: no cover
+                        )
+                    ):
 
                         # We had a problem
-                        status_str = content.get('result') \
-                            if content.get('result') else \
-                            NotifySMSEagle.http_response_code_lookup(
-                            r.status_code)
+                        status_str = (
+                            content.get("result")
+                            if content.get("result")
+                            else NotifySMSEagle.http_response_code_lookup(
+                                r.status_code
+                            )
+                        )
 
                         self.logger.warning(
-                            'Failed to send {} {} SMSEagle {} notification: '
-                            '{}{}error={}.'.format(
-                                len(targets[index:index + batch_size]),
-                                'to {}'.format(targets[index])
-                                if batch_size == 1 else '(s)',
+                            "Failed to send {} {} SMSEagle {} notification: "
+                            "{}{}error={}.".format(
+                                len(targets[index : index + batch_size]),
+                                (
+                                    f"to {targets[index]}"
+                                    if batch_size == 1
+                                    else "(s)"
+                                ),
                                 category,
                                 status_str,
-                                ', ' if status_str else '',
-                                r.status_code))
+                                ", " if status_str else "",
+                                r.status_code,
+                            )
+                        )
 
                         self.logger.debug(
-                            'Response {} Details:\r\n{}'.format(
-                                category.upper(), r.content))
+                            "Response"
+                            f" {category.upper()} Details:\r\n{r.content}"
+                        )
 
                         # Mark our failure
                         has_error = True
@@ -543,20 +601,24 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                     else:
                         self.logger.info(
-                            'Sent {} SMSEagle {} notification{}.'
-                            .format(
-                                len(targets[index:index + batch_size]),
+                            "Sent {} SMSEagle {} notification{}.".format(
+                                len(targets[index : index + batch_size]),
                                 category,
-                                ' to {}'.format(targets[index])
-                                if batch_size == 1 else '(s)',
-                            ))
+                                (
+                                    f" to {targets[index]}"
+                                    if batch_size == 1
+                                    else "(s)"
+                                ),
+                            )
+                        )
 
                 except requests.RequestException as e:
                     self.logger.warning(
-                        'A Connection error occured sending {} SMSEagle '
-                        '{} notification(s).'.format(
-                            len(targets[index:index + batch_size]), category))
-                    self.logger.debug('Socket Exception: %s' % str(e))
+                        "A Connection error occured sending"
+                        f" {len(targets[index:index + batch_size])} SMSEagle"
+                        f" {category} notification(s)."
+                    )
+                    self.logger.debug(f"Socket Exception: {e!s}")
 
                     # Mark our failure
                     has_error = True
@@ -566,69 +628,76 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.token, self.host, self.port,
+            self.token,
+            self.host,
+            self.port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
-            'status': 'yes' if self.status else 'no',
-            'flash': 'yes' if self.flash else 'no',
-            'test': 'yes' if self.test else 'no',
+            "batch": "yes" if self.batch else "no",
+            "status": "yes" if self.status else "no",
+            "flash": "yes" if self.flash else "no",
+            "test": "yes" if self.test else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        default_priority = self.template_args['priority']['default']
+        default_priority = self.template_args["priority"]["default"]
         if self.priority is not None:
             # Store our priority; but only if it was specified
-            params['priority'] = \
-                next((key for key, value in SMSEAGLE_PRIORITY_MAP.items()
-                      if value == self.priority),
-                     default_priority)  # pragma: no cover
+            params["priority"] = next(
+                (
+                    key
+                    for key, value in SMSEAGLE_PRIORITY_MAP.items()
+                    if value == self.priority
+                ),
+                default_priority,
+            )  # pragma: no cover
 
         # Default port handling
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{token}@{hostname}{port}/{targets}?{params}'.format(
+        return "{schema}://{token}@{hostname}{port}/{targets}?{params}".format(
             schema=self.secure_protocol if self.secure else self.protocol,
             token=self.pprint(
-                self.token, privacy, mode=PrivacyMode.Secret, safe=''),
+                self.token, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            targets='/'.join(
-                [NotifySMSEagle.quote(x, safe='#@') for x in chain(
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            targets="/".join([
+                NotifySMSEagle.quote(x, safe="#@")
+                for x in chain(
                     # Pass phones directly as is
                     self.target_phones,
                     # Contacts
-                    ['@{}'.format(x) for x in self.target_contacts],
+                    [f"@{x}" for x in self.target_contacts],
                     # Groups
-                    ['#{}'.format(x) for x in self.target_groups],
+                    [f"#{x}" for x in self.target_groups],
                     # Pass along the same invalid entries as were provided
                     self.invalid_targets,
-                )]),
+                )
+            ]),
             params=NotifySMSEagle.urlencode(params),
         )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
@@ -638,22 +707,23 @@ def __len__(self):
             # a single batch)
             total_targets = 0
             for c in SMSEAGLE_CATEGORIES:
-                targets = len(getattr(self, f'target_{c}s'))
-                total_targets += int(targets / batch_size) + \
-                    (1 if targets % batch_size else 0)
+                targets = len(getattr(self, f"target_{c}s"))
+                total_targets += int(targets / batch_size) + (
+                    1 if targets % batch_size else 0
+                )
             return total_targets
 
         # Normal batch count; just count the targets
-        return len(self.target_phones) + len(self.target_contacts) + \
-            len(self.target_groups)
+        return (
+            len(self.target_phones)
+            + len(self.target_contacts)
+            + len(self.target_groups)
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -662,40 +732,37 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = \
-            NotifySMSEagle.split_path(results['fullpath'])
+        results["targets"] = NotifySMSEagle.split_path(results["fullpath"])
 
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifySMSEagle.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifySMSEagle.unquote(results["qsd"]["token"])
 
-        elif not results['password'] and results['user']:
-            results['token'] = NotifySMSEagle.unquote(results['user'])
+        elif not results["password"] and results["user"]:
+            results["token"] = NotifySMSEagle.unquote(results["user"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySMSEagle.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySMSEagle.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get('batch', False))
+        results["batch"] = parse_bool(results["qsd"].get("batch", False))
 
         # Get Flash Mode Flag
-        results['flash'] = \
-            parse_bool(results['qsd'].get('flash', False))
+        results["flash"] = parse_bool(results["qsd"].get("flash", False))
 
         # Get Test Mode Flag
-        results['test'] = \
-            parse_bool(results['qsd'].get('test', False))
+        results["test"] = parse_bool(results["qsd"].get("test", False))
 
         # Get status switch
-        results['status'] = \
-            parse_bool(results['qsd'].get('status', False))
+        results["status"] = parse_bool(results["qsd"].get("status", False))
 
         # Get priority
-        if 'priority' in results['qsd'] and len(results['qsd']['priority']):
-            results['priority'] = \
-                NotifySMSEagle.unquote(results['qsd']['priority'])
+        if "priority" in results["qsd"] and len(results["qsd"]["priority"]):
+            results["priority"] = NotifySMSEagle.unquote(
+                results["qsd"]["priority"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/smsmanager.py b/libs/apprise/plugins/smsmanager.py
index 16bf130fc2..6c47d21297 100644
--- a/libs/apprise/plugins/smsmanager.py
+++ b/libs/apprise/plugins/smsmanager.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,17 +34,21 @@
 #    2. Generate an API key in web administration.
 
 import requests
-from .base import NotifyBase
+
 from ..common import NotifyType
-from ..utils.parse import (
-    is_phone_no, parse_phone_no, parse_bool, validate_regex)
 from ..locale import gettext_lazy as _
+from ..utils.parse import (
+    is_phone_no,
+    parse_bool,
+    parse_phone_no,
+    validate_regex,
+)
+from .base import NotifyBase
+
 
+class SMSManagerGateway:
+    """The different gateway values."""
 
-class SMSManagerGateway(object):
-    """
-    The different gateway values
-    """
     HIGH = "high"
     ECONOMY = "economy"
     LOW = "low"
@@ -62,24 +65,25 @@ class SMSManagerGateway(object):
 
 
 class NotifySMSManager(NotifyBase):
-    """
-    A wrapper for SMS Manager Notifications
-    """
+    """A wrapper for SMS Manager Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'SMS Manager'
+    service_name = "SMS Manager"
 
     # The services URL
-    service_url = 'https://smsmanager.cz'
+    service_url = "https://smsmanager.cz"
 
     # All notification requests are secure
-    secure_protocol = ('smsmgr', 'smsmanager',)
+    secure_protocol = (
+        "smsmgr",
+        "smsmanager",
+    )
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_sms_manager'
+    setup_url = "https://appriseit.com/services/sms_manager/"
 
     # SMS Manager uses the http protocol with JSON requests
-    notify_url = 'https://http-api.smsmanager.cz/Send'
+    notify_url = "https://http-api.smsmanager.cz/Send"
 
     # The maximum amount of texts that can go out in one batch
     default_batch_size = 4000
@@ -92,92 +96,107 @@ class NotifySMSManager(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}@{targets}',
-    )
+    templates = ("{schema}://{apikey}@{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'key': {
-            'alias_of': 'apikey',
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'sender',
-        },
-        'sender': {
-            'alias_of': 'from',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "key": {
+                "alias_of": "apikey",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "sender",
+            },
+            "sender": {
+                "alias_of": "from",
+            },
+            "gateway": {
+                "name": _("Gateway"),
+                "type": "choice:string",
+                "values": SMS_MANAGER_GATEWAYS,
+                "default": SMS_MANAGER_GATEWAYS[0],
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'gateway': {
-            'name': _('Gateway'),
-            'type': 'choice:string',
-            'values': SMS_MANAGER_GATEWAYS,
-            'default': SMS_MANAGER_GATEWAYS[0],
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
-    def __init__(self, apikey=None, sender=None, targets=None, batch=None,
-                 gateway=None, **kwargs):
-        """
-        Initialize SMS Manager Object
-        """
-        super(NotifySMSManager, self).__init__(**kwargs)
+    def __init__(
+        self,
+        apikey=None,
+        sender=None,
+        targets=None,
+        batch=None,
+        gateway=None,
+        **kwargs,
+    ):
+        """Initialize SMS Manager Object."""
+        super().__init__(**kwargs)
 
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid API Key ({}) was specified.'.format(apikey)
+            msg = f"An invalid API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Setup our gateway
-        self.gateway = self.template_args['gateway']['default'] \
-            if not isinstance(gateway, str) else gateway.lower()
+        self.gateway = (
+            self.template_args["gateway"]["default"]
+            if not isinstance(gateway, str)
+            else gateway.lower()
+        )
         if self.gateway not in SMS_MANAGER_GATEWAYS:
-            msg = 'The Gateway specified ({}) is invalid.'.format(gateway)
+            msg = f"The Gateway specified ({gateway}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Define whether or not we should operate in a batch mode
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else bool(batch)
+        self.batch = (
+            self.template_args["batch"]["default"]
+            if batch is None
+            else bool(batch)
+        )
 
         # Maximum 11 characters and must be approved by administrators of site
         self.sender = sender[0:11] if isinstance(sender, str) else None
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Parse each phone number we found
@@ -187,24 +206,24 @@ def __init__(self, apikey=None, sender=None, targets=None, batch=None,
             if result:
                 # Carry forward '+' if defined, otherwise do not...
                 self.targets.append(
-                    ('+' + result['full'])
-                    if target.lstrip()[0] == '+' else result['full'])
+                    ("+" + result["full"])
+                    if target.lstrip()[0] == "+"
+                    else result["full"]
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid phone # ({}) specified.'.format(target),
+                f"Dropped invalid phone # ({target}) specified.",
             )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform SMS Manager Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform SMS Manager Notification."""
 
         if not self.targets:
             # We have nothing to notify
-            self.logger.warning('There are no SMS Manager targets to notify')
+            self.logger.warning("There are no SMS Manager targets to notify")
             return False
 
         # error tracking (used for function return)
@@ -215,13 +234,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Prepare our targets
-        targets = list(self.targets) if batch_size == 1 else \
-            [self.targets[index:index + batch_size]
-             for index in range(0, len(self.targets), batch_size)]
+        targets = (
+            list(self.targets)
+            if batch_size == 1
+            else [
+                self.targets[index : index + batch_size]
+                for index in range(0, len(self.targets), batch_size)
+            ]
+        )
 
         while len(targets):
             # Get our target to notify
@@ -232,34 +256,35 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             #       mock testing issues (payload singleton isn't persistent
             #       when performing follow up checks on the params object.
             payload = {
-                'apikey': self.apikey,
-                'gateway': self.gateway,
+                "apikey": self.apikey,
+                "gateway": self.gateway,
                 # The number gets populated in the loop below
-                'number': None,
-                'message': body,
+                "number": None,
+                "message": body,
             }
 
             if self.sender:
                 # Sender is ony set if specified
-                payload['sender'] = self.sender
+                payload["sender"] = self.sender
 
             # Printable target details
             if isinstance(target, list):
-                p_target = '{} targets'.format(len(target))
+                p_target = f"{len(target)} targets"
 
                 # Prepare our target numbers
-                payload['number'] = ';'.join(target)
+                payload["number"] = ";".join(target)
 
             else:
                 p_target = target
                 # Prepare our target numbers
-                payload['number'] = target
+                payload["number"] = target
 
             # Some Debug Logging
             self.logger.debug(
-                'SMS Manager POST URL: {} (cert_verify={})'.format(
-                    self.notify_url, self.verify_certificate))
-            self.logger.debug('SMS Manager Payload: {}' .format(payload))
+                "SMS Manager POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"SMS Manager Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -274,22 +299,25 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
 
                     self.logger.warning(
-                        'Failed to send SMS Manager notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send SMS Manager notification to {}: "
+                        "{}{}error={}.".format(
                             p_target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -297,14 +325,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent SMS Manager notification to {}.'.format(
-                            p_target))
+                        f"Sent SMS Manager notification to {p_target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending SMS Manager: to %s ',
-                    p_target)
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending SMS Manager: to %s ",
+                    p_target,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -314,44 +343,40 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol[0], self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
-            'gateway': self.gateway,
+            "batch": "yes" if self.batch else "no",
+            "gateway": self.gateway,
         }
 
         if self.sender:
             # Set our sender if it was set
-            params['sender'] = self.sender
+            params["sender"] = self.sender
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{apikey}@{targets}' \
-            '?{params}'.format(
-                schema=self.secure_protocol[0],
-                apikey=self.pprint(self.apikey, privacy, safe=''),
-                targets='/'.join([
-                    NotifySMSManager.quote('{}'.format(x), safe='+')
-                    for x in self.targets]),
-                params=NotifySMSManager.urlencode(params))
+        return "{schema}://{apikey}@{targets}?{params}".format(
+            schema=self.secure_protocol[0],
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets="/".join([
+                NotifySMSManager.quote(f"{x}", safe="+") for x in self.targets
+            ]),
+            params=NotifySMSManager.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
 
         #
         # Factor batch into calculation
@@ -361,18 +386,16 @@ def __len__(self):
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -380,41 +403,47 @@ def parse_url(url):
             return results
 
         # Get our API Key
-        results['apikey'] = NotifySMSManager.unquote(results['user'])
+        results["apikey"] = NotifySMSManager.unquote(results["user"])
 
         # Store our targets
-        results['targets'] = [
-            *NotifySMSManager.parse_phone_no(results['host']),
-            *NotifySMSManager.split_path(results['fullpath'])]
+        results["targets"] = [
+            *NotifySMSManager.parse_phone_no(results["host"]),
+            *NotifySMSManager.split_path(results["fullpath"]),
+        ]
 
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['sender'] = \
-                NotifySMSManager.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["sender"] = NotifySMSManager.unquote(
+                results["qsd"]["from"]
+            )
 
-        elif 'sender' in results['qsd'] and len(results['qsd']['sender']):
+        elif "sender" in results["qsd"] and len(results["qsd"]["sender"]):
             # Support sender= value as well to align with SMS Manager API
-            results['sender'] = \
-                NotifySMSManager.unquote(results['qsd']['sender'])
+            results["sender"] = NotifySMSManager.unquote(
+                results["qsd"]["sender"]
+            )
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySMSManager.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySMSManager.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
-            results['apikey'] = \
-                NotifySMSManager.unquote(results['qsd']['key'])
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
+            results["apikey"] = NotifySMSManager.unquote(results["qsd"]["key"])
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifySMSManager.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifySMSManager.template_args["batch"]["default"]
+            )
+        )
 
         # Define our gateway
-        if 'gateway' in results['qsd'] and len(results['qsd']['gateway']):
-            results['gateway'] = \
-                NotifySMSManager.unquote(results['qsd']['gateway'])
+        if "gateway" in results["qsd"] and len(results["qsd"]["gateway"]):
+            results["gateway"] = NotifySMSManager.unquote(
+                results["qsd"]["gateway"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/smtp2go.py b/libs/apprise/plugins/smtp2go.py
index 23b31bfd98..15da215353 100644
--- a/libs/apprise/plugins/smtp2go.py
+++ b/libs/apprise/plugins/smtp2go.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -45,45 +44,45 @@
 #  the email will be transmitted from.  If no email address is specified
 #  then it will also become the 'to' address as well.
 #
-import requests
-from json import dumps
 from email.utils import formataddr
-from .base import NotifyBase
+from json import dumps
+import logging
+
+import requests
+
 from .. import exception
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import (
-    parse_emails, parse_bool, is_email, validate_regex)
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_bool, parse_emails, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 SMTP2GO_HTTP_ERROR_MAP = {
-    429: 'To many requests.',
+    429: "To many requests.",
 }
 
 
 class NotifySMTP2Go(NotifyBase):
-    """
-    A wrapper for SMTP2Go Notifications
-    """
+    """A wrapper for SMTP2Go Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'SMTP2Go'
+    service_name = "SMTP2Go"
 
     # The services URL
-    service_url = 'https://www.smtp2go.com/'
+    service_url = "https://www.smtp2go.com/"
 
     # All notification requests are secure
-    secure_protocol = 'smtp2go'
+    secure_protocol = "smtp2go"
 
     # SMTP2Go advertises they allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_smtp2go'
+    setup_url = "https://appriseit.com/services/smtp2go/"
 
     # Notify URL
-    notify_url = 'https://api.smtp2go.com/v3/email/send'
+    notify_url = "https://api.smtp2go.com/v3/email/send"
 
     # Support attachments
     attachment_support = True
@@ -97,90 +96,102 @@ class NotifySMTP2Go(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{user}@{host}:{apikey}/',
-        '{schema}://{user}@{host}:{apikey}/{targets}',
+        "{schema}://{user}@{host}:{apikey}/",
+        "{schema}://{user}@{host}:{apikey}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
-        },
-        'host': {
-            'name': _('Domain'),
-            'type': 'string',
-            'required': True,
-        },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "host": {
+                "name": _("Domain"),
+                "type": "string",
+                "required": True,
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "targets": {
+                "name": _("Target Emails"),
+                "type": "list:string",
+            },
         },
-        'targets': {
-            'name': _('Target Emails'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'name': {
-            'name': _('From Name'),
-            'type': 'string',
-            'map_to': 'from_name',
-        },
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "name": {
+                "name": _("From Name"),
+                "type": "string",
+                "map_to": "from_name",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('Email Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("Email Header"),
+            "prefix": "+",
         },
     }
 
-    def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
-                 headers=None, batch=False, **kwargs):
-        """
-        Initialize SMTP2Go Object
-        """
+    def __init__(
+        self,
+        apikey,
+        targets,
+        cc=None,
+        bcc=None,
+        from_name=None,
+        headers=None,
+        batch=False,
+        **kwargs,
+    ):
+        """Initialize SMTP2Go Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid SMTP2Go API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid SMTP2Go API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Validate our username
         if not self.user:
-            msg = 'No SMTP2Go username was specified.'
+            msg = "No SMTP2Go username was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Acquire Email 'To'
-        self.targets = list()
+        self.targets = []
 
         # Acquire Carbon Copies
         self.cc = set()
@@ -203,11 +214,11 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
         self.from_name = from_name
 
         # Get our from email address
-        self.from_addr = '{user}@{host}'.format(user=self.user, host=self.host)
+        self.from_addr = f"{self.user}@{self.host}"
 
         if not is_email(self.from_addr):
             # Parse Source domain based on from_addr
-            msg = 'Invalid ~From~ email format: {}'.format(self.from_addr)
+            msg = f"Invalid ~From~ email format: {self.from_addr}"
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -216,63 +227,68 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
             for recipient in parse_emails(targets):
                 result = is_email(recipient)
                 if result:
-                    self.targets.append(
-                        (result['name'] if result['name'] else False,
-                            result['full_email']))
+                    self.targets.append((
+                        result["name"] if result["name"] else False,
+                        result["full_email"],
+                    ))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid To email '
-                    '({}) specified.'.format(recipient),
+                    f"Dropped invalid To email ({recipient}) specified.",
                 )
 
         else:
             # If our target email list is empty we want to add ourselves to it
             self.targets.append(
-                (self.from_name if self.from_name else False, self.from_addr))
+                (self.from_name if self.from_name else False, self.from_addr)
+            )
 
         # Validate recipients (cc:) and drop bad ones:
         for recipient in parse_emails(cc):
             email = is_email(recipient)
             if email:
-                self.cc.add(email['full_email'])
+                self.cc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
             )
 
         # Validate recipients (bcc:) and drop bad ones:
         for recipient in parse_emails(bcc):
             email = is_email(recipient)
             if email:
-                self.bcc.add(email['full_email'])
+                self.bcc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
             )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform SMTP2Go Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform SMTP2Go Notification."""
 
         if not self.targets:
             # There is no one to email; we're done
-            self.logger.warning(
-                'There are no Email recipients to notify')
+            self.logger.warning("There are no Email recipients to notify")
             return False
 
         # error tracking (used for function return)
@@ -283,9 +299,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
+            "Content-Type": "application/json",
         }
 
         # Track our potential attachments
@@ -297,113 +313,134 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SMTP2Go attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SMTP2Go attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     # Format our attachment
                     attachments.append({
-                        'filename': attachment.name
-                        if attachment.name else f'file{no:03}.dat',
-                        'fileblob': attachment.base64(),
-                        'mimetype': attachment.mimetype,
+                        "filename": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
+                        "fileblob": attachment.base64(),
+                        "mimetype": attachment.mimetype,
                     })
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SMTP2Go attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SMTP2Go attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending SMTP2Go attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending SMTP2Go attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         sender = formataddr(
-            (self.from_name if self.from_name else False,
-             self.from_addr), charset='utf-8')
+            (self.from_name if self.from_name else False, self.from_addr),
+            charset="utf-8",
+        )
 
         # Prepare our payload
         payload = {
             # API Key
-            'api_key': self.apikey,
-
+            "api_key": self.apikey,
             # Base payload options
-            'sender': sender,
-            'subject': title,
-
+            "sender": sender,
+            "subject": title,
             # our To array
-            'to': [],
+            "to": [],
         }
 
         if attachments:
-            payload['attachments'] = attachments
+            payload["attachments"] = attachments
 
         if self.notify_format == NotifyFormat.HTML:
-            payload['html_body'] = body
+            payload["html_body"] = body
 
         else:
-            payload['text_body'] = body
+            payload["text_body"] = body
 
         # Create a copy of the targets list
         emails = list(self.targets)
 
         for index in range(0, len(emails), batch_size):
             # Initialize our cc list
-            cc = (self.cc - self.bcc)
+            cc = self.cc - self.bcc
 
             # Initialize our bcc list
             bcc = set(self.bcc)
 
             # Initialize our to list
-            to = list()
+            to = []
 
-            for to_addr in self.targets[index:index + batch_size]:
+            for to_addr in self.targets[index : index + batch_size]:
                 # Strip target out of cc list if in To
-                cc = (cc - set([to_addr[1]]))
+                cc = cc - {to_addr[1]}
 
                 # Strip target out of bcc list if in To
-                bcc = (bcc - set([to_addr[1]]))
+                bcc = bcc - {to_addr[1]}
 
                 # Prepare our `to`
-                to.append(formataddr(to_addr, charset='utf-8'))
+                to.append(formataddr(to_addr, charset="utf-8"))
 
             # Prepare our To
-            payload['to'] = to
+            payload["to"] = to
 
             if cc:
                 # Format our cc addresses to support the Name field
-                payload['cc'] = [formataddr(
-                    (self.names.get(addr, False), addr), charset='utf-8')
-                    for addr in cc]
+                payload["cc"] = [
+                    formataddr(
+                        (self.names.get(addr, False), addr), charset="utf-8"
+                    )
+                    for addr in cc
+                ]
 
             # Format our bcc addresses to support the Name field
             if bcc:
                 # set our bcc variable (convert to list first so it's
                 # JSON serializable)
-                payload['bcc'] = list(bcc)
+                payload["bcc"] = list(bcc)
 
             # Store our header entries if defined into the payload
             # in their payload
             if self.headers:
-                payload['custom_headers'] = \
-                    [{'header': k, 'value': v}
-                     for k, v in self.headers.items()]
+                payload["custom_headers"] = [
+                    {"header": k, "value": v} for k, v in self.headers.items()
+                ]
 
             # Some Debug Logging
-            self.logger.debug('SMTP2Go POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('SMTP2Go Payload: {}' .format(payload))
+            if self.logger.isEnabledFor(logging.DEBUG):
+                # Due to attachments; output can be quite heavy and io
+                # intensive.
+                # To accommodate this, we only show our debug payload
+                # information if required.
+                self.logger.debug(
+                    "SMTP2Go POST URL:"
+                    f" {self.notify_url} "
+                    f"(cert_verify={self.verify_certificate})"
+                )
+                self.logger.debug(
+                    "SMTP2Go Payload: %s", sanitize_payload(payload))
 
             # For logging output of success and errors; we get a head count
             # of our outbound details:
-            verbose_dest = ', '.join(
-                [x[1] for x in self.targets[index:index + batch_size]]) \
-                if len(self.targets[index:index + batch_size]) <= 3 \
-                else '{} recipients'.format(
-                    len(self.targets[index:index + batch_size]))
+            verbose_dest = (
+                ", ".join(
+                    [x[1] for x in self.targets[index : index + batch_size]]
+                )
+                if len(self.targets[index : index + batch_size]) <= 3
+                else (
+                    f"{len(self.targets[index:index + batch_size])} recipients"
+                )
+            )
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -418,20 +455,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(
-                            r.status_code, SMTP2GO_HTTP_ERROR_MAP)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code, SMTP2GO_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send SMTP2Go notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send SMTP2Go notification to {}: "
+                        "{}{}error={}.".format(
                             verbose_dest,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -439,24 +478,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 else:
                     self.logger.info(
-                        'Sent SMTP2Go notification to {}.'.format(
-                            verbose_dest))
+                        f"Sent SMTP2Go notification to {verbose_dest}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending SMTP2Go:%s ' % (
-                        verbose_dest) + 'notification.'
+                    "A Connection error occurred sending"
+                    f" SMTP2Go:{verbose_dest} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
                 continue
 
-            except (OSError, IOError) as e:
+            except OSError as e:
                 self.logger.warning(
-                    'An I/O error occurred while reading attachments')
-                self.logger.debug('I/O Exception: %s' % str(e))
+                    "An I/O error occurred while reading attachments"
+                )
+                self.logger.debug(f"I/O Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -466,83 +507,88 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.host, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'batch': 'yes' if self.batch else 'no',
+            "batch": "yes" if self.batch else "no",
         }
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         if self.from_name is not None:
             # from_name specified; pass it back on the url
-            params['name'] = self.from_name
+            params["name"] = self.from_name
 
         if self.cc:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join(
-                ['{}{}'.format(
-                    '' if not e not in self.names
-                    else '{}:'.format(self.names[e]), e) for e in self.cc])
+            params["cc"] = ",".join([
+                "{}{}".format(
+                    "" if not e not in self.names else f"{self.names[e]}:",
+                    e,
+                )
+                for e in self.cc
+            ])
 
         if self.bcc:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join(self.bcc)
+            params["bcc"] = ",".join(self.bcc)
 
         # a simple boolean check as to whether we display our target emails
         # or not
-        has_targets = \
-            not (len(self.targets) == 1
-                 and self.targets[0][1] == self.from_addr)
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0][1] == self.from_addr
+        )
 
-        return '{schema}://{user}@{host}/{apikey}/{targets}?{params}'.format(
+        return "{schema}://{user}@{host}/{apikey}/{targets}?{params}".format(
             schema=self.secure_protocol,
             host=self.host,
-            user=NotifySMTP2Go.quote(self.user, safe=''),
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='' if not has_targets else '/'.join(
-                [NotifySMTP2Go.quote('{}{}'.format(
-                    '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                    safe='') for e in self.targets]),
-            params=NotifySMTP2Go.urlencode(params))
+            user=NotifySMTP2Go.quote(self.user, safe=""),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets=(
+                ""
+                if not has_targets
+                else "/".join([
+                    NotifySMTP2Go.quote(
+                        "{}{}".format("" if not e[0] else f"{e[0]}:", e[1]),
+                        safe="",
+                    )
+                    for e in self.targets
+                ])
+            ),
+            params=NotifySMTP2Go.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -550,41 +596,46 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifySMTP2Go.split_path(results['fullpath'])
+        results["targets"] = NotifySMTP2Go.split_path(results["fullpath"])
 
         # Our very first entry is reserved for our api key
         try:
-            results['apikey'] = results['targets'].pop(0)
+            results["apikey"] = results["targets"].pop(0)
 
         except IndexError:
             # We're done - no API Key found
-            results['apikey'] = None
+            results["apikey"] = None
 
-        if 'name' in results['qsd'] and len(results['qsd']['name']):
+        if "name" in results["qsd"] and len(results["qsd"]["name"]):
             # Extract from name to associate with from address
-            results['from_name'] = \
-                NotifySMTP2Go.unquote(results['qsd']['name'])
+            results["from_name"] = NotifySMTP2Go.unquote(
+                results["qsd"]["name"]
+            )
 
         # Handle 'to' email address
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].append(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(results["qsd"]["to"])
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = results['qsd']['cc']
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = results["qsd"]["cc"]
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = results['qsd']['bcc']
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = results["qsd"]["bcc"]
 
         # Add our Meta Headers that the user can provide with their outbound
         # emails
-        results['headers'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifySMTP2Go.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifySMTP2Go.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/sns.py b/libs/apprise/plugins/sns.py
index bdea2b4dfa..c79003ec0b 100644
--- a/libs/apprise/plugins/sns.py
+++ b/libs/apprise/plugins/sns.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,21 +25,21 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import re
-import hmac
-import requests
-from hashlib import sha256
-from datetime import datetime
-from datetime import timezone
 from collections import OrderedDict
-from xml.etree import ElementTree
+from datetime import datetime, timezone
+from hashlib import sha256
+import hmac
 from itertools import chain
+import re
+from xml.etree import ElementTree
+
+import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_list, validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_list, validate_regex
+from .base import NotifyBase
 
 # Topic Detection
 # Summary: 256 Characters max, only alpha/numeric plus underscore (_) and
@@ -51,37 +50,36 @@
 #
 # Allow a starting hashtag (#) specification to help eliminate possible
 # ambiguity between a topic that is comprised of all digits and a phone number
-IS_TOPIC = re.compile(r'^#?(?P<name>[A-Za-z0-9_-]+)\s*$')
+IS_TOPIC = re.compile(r"^#?(?P<name>[A-Za-z0-9_-]+)\s*$")
 
 # Because our AWS Access Key Secret contains slashes, we actually use the
 # region as a delimiter. This is a bit hacky; but it's much easier than having
 # users of this product search though this Access Key Secret and escape all
 # of the forward slashes!
 IS_REGION = re.compile(
-    r'^\s*(?P<country>[a-z]{2})-(?P<area>[a-z-]+?)-(?P<no>[0-9]+)\s*$', re.I)
+    r"^\s*(?P<country>[a-z]{2})-(?P<area>[a-z-]+?)-(?P<no>[0-9]+)\s*$", re.I
+)
 
 # Extend HTTP Error Messages
 AWS_HTTP_ERROR_MAP = {
-    403: 'Unauthorized - Invalid Access/Secret Key Combination.',
+    403: "Unauthorized - Invalid Access/Secret Key Combination.",
 }
 
 
 class NotifySNS(NotifyBase):
-    """
-    A wrapper for AWS SNS (Amazon Simple Notification)
-    """
+    """A wrapper for AWS SNS (Amazon Simple Notification)"""
 
     # The default descriptive name associated with the Notification
-    service_name = 'AWS Simple Notification Service (SNS)'
+    service_name = "AWS Simple Notification Service (SNS)"
 
     # The services URL
-    service_url = 'https://aws.amazon.com/sns/'
+    service_url = "https://aws.amazon.com/sns/"
 
     # The default secure protocol
-    secure_protocol = 'sns'
+    secure_protocol = "sns"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_sns'
+    setup_url = "https://appriseit.com/services/sns/"
 
     # AWS is pretty good for handling data load so request limits
     # can occur in much shorter bursts
@@ -97,147 +95,155 @@ class NotifySNS(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{access_key_id}/{secret_access_key}/{region}/{targets}',
+        "{schema}://{access_key_id}/{secret_access_key}/{region}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'access_key_id': {
-            'name': _('Access Key ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "access_key_id": {
+                "name": _("Access Key ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "secret_access_key": {
+                "name": _("Secret Access Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "region": {
+                "name": _("Region"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[a-z]{2}-[a-z-]+?-[0-9]+$", "i"),
+                "map_to": "region_name",
+            },
+            "target_phone_no": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "map_to": "targets",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+            },
+            "target_topic": {
+                "name": _("Target Topic"),
+                "type": "string",
+                "map_to": "targets",
+                "prefix": "#",
+                "regex": (r"^[A-Za-z0-9_-]+$", "i"),
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'secret_access_key': {
-            'name': _('Secret Access Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'region': {
-            'name': _('Region'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[a-z]{2}-[a-z-]+?-[0-9]+$', 'i'),
-            'required': True,
-            'map_to': 'region_name',
-        },
-        'target_phone_no': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'map_to': 'targets',
-            'regex': (r'^[0-9\s)(+-]+$', 'i')
-        },
-        'target_topic': {
-            'name': _('Target Topic'),
-            'type': 'string',
-            'map_to': 'targets',
-            'prefix': '#',
-            'regex': (r'^[A-Za-z0-9_-]+$', 'i'),
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'access': {
-            'alias_of': 'access_key_id',
-        },
-        'secret': {
-            'alias_of': 'secret_access_key',
-        },
-        'region': {
-            'alias_of': 'region',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "access": {
+                "alias_of": "access_key_id",
+            },
+            "secret": {
+                "alias_of": "secret_access_key",
+            },
+            "region": {
+                "alias_of": "region",
+            },
         },
-    })
+    )
 
-    def __init__(self, access_key_id, secret_access_key, region_name,
-                 targets=None, **kwargs):
-        """
-        Initialize Notify AWS SNS Object
-        """
+    def __init__(
+        self,
+        access_key_id,
+        secret_access_key,
+        region_name,
+        targets=None,
+        **kwargs,
+    ):
+        """Initialize Notify AWS SNS Object."""
         super().__init__(**kwargs)
 
         # Store our AWS API Access Key
         self.aws_access_key_id = validate_regex(access_key_id)
         if not self.aws_access_key_id:
-            msg = 'An invalid AWS Access Key ID was specified.'
+            msg = "An invalid AWS Access Key ID was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our AWS API Secret Access key
         self.aws_secret_access_key = validate_regex(secret_access_key)
         if not self.aws_secret_access_key:
-            msg = 'An invalid AWS Secret Access Key ' \
-                  '({}) was specified.'.format(secret_access_key)
+            msg = (
+                "An invalid AWS Secret Access Key "
+                f"({secret_access_key}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Acquire our AWS Region Name:
         # eg. us-east-1, cn-north-1, us-west-2, ...
         self.aws_region_name = validate_regex(
-            region_name, *self.template_tokens['region']['regex'])
+            region_name, *self.template_tokens["region"]["regex"]
+        )
         if not self.aws_region_name:
-            msg = 'An invalid AWS Region ({}) was specified.'.format(
-                region_name)
+            msg = f"An invalid AWS Region ({region_name}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Initialize topic list
-        self.topics = list()
+        self.topics = []
 
         # Initialize numbers list
-        self.phone = list()
+        self.phone = []
 
         # Set our notify_url based on our region
-        self.notify_url = 'https://sns.{}.amazonaws.com/'\
-            .format(self.aws_region_name)
+        self.notify_url = f"https://sns.{self.aws_region_name}.amazonaws.com/"
 
         # AWS Service Details
-        self.aws_service_name = 'sns'
-        self.aws_canonical_uri = '/'
+        self.aws_service_name = "sns"
+        self.aws_canonical_uri = "/"
 
         # AWS Authentication Details
-        self.aws_auth_version = 'AWS4'
-        self.aws_auth_algorithm = 'AWS4-HMAC-SHA256'
-        self.aws_auth_request = 'aws4_request'
+        self.aws_auth_version = "AWS4"
+        self.aws_auth_algorithm = "AWS4-HMAC-SHA256"
+        self.aws_auth_request = "aws4_request"
 
         # Validate targets and drop bad ones:
         for target in parse_list(targets):
             result = is_phone_no(target)
             if result:
                 # store valid phone number in E.164 format
-                self.phone.append('+{}'.format(result['full']))
+                self.phone.append("+{}".format(result["full"]))
                 continue
 
             result = IS_TOPIC.match(target)
             if result:
                 # store valid topic
-                self.topics.append(result.group('name'))
+                self.topics.append(result.group("name"))
                 continue
 
             self.logger.warning(
-                'Dropped invalid phone/topic '
-                '(%s) specified.' % target,
+                f"Dropped invalid phone/topic ({target}) specified.",
             )
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        wrapper to send_notification since we can alert more then one channel
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Wrapper to send_notification since we can alert more then one
+        channel."""
 
         if len(self.phone) == 0 and len(self.topics) == 0:
             # We have a bot token and no target(s) to message
-            self.logger.warning('No AWS targets to notify.')
+            self.logger.warning("No AWS targets to notify.")
             return False
 
         # Initiaize our error tracking
@@ -254,10 +260,10 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # Prepare SNS Message Payload
             payload = {
-                'Action': u'Publish',
-                'Message': body,
-                'Version': u'2010-03-31',
-                'PhoneNumber': no,
+                "Action": "Publish",
+                "Message": body,
+                "Version": "2010-03-31",
+                "PhoneNumber": no,
             }
 
             (result, _) = self._post(payload=payload, to=no)
@@ -272,9 +278,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # First ensure our topic exists, if it doesn't, it gets created
             payload = {
-                'Action': u'CreateTopic',
-                'Version': u'2010-03-31',
-                'Name': topic,
+                "Action": "CreateTopic",
+                "Version": "2010-03-31",
+                "Name": topic,
             }
 
             (result, response) = self._post(payload=payload, to=topic)
@@ -283,7 +289,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 continue
 
             # Get the Amazon Resource Name
-            topic_arn = response.get('topic_arn')
+            topic_arn = response.get("topic_arn")
             if not topic_arn:
                 # Could not acquire our topic; we're done
                 error_count += 1
@@ -291,10 +297,10 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # Build our payload now that we know our topic_arn
             payload = {
-                'Action': u'Publish',
-                'Version': u'2010-03-31',
-                'TopicArn': topic_arn,
-                'Message': body,
+                "Action": "Publish",
+                "Version": "2010-03-31",
+                "TopicArn": topic_arn,
+                "Message": body,
             }
 
             # Send our payload to AWS
@@ -305,12 +311,11 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         return error_count == 0
 
     def _post(self, payload, to):
-        """
-        Wrapper to request.post() to manage it's response better and make
+        """Wrapper to request.post() to manage it's response better and make
         the send() function cleaner and easier to maintain.
 
-        This function returns True if the _post was successful and False
-        if it wasn't.
+        This function returns True if the _post was successful and False if it
+        wasn't.
         """
 
         # Always call throttle before any remote server i/o is made; for AWS
@@ -327,10 +332,11 @@ def _post(self, payload, to):
         # Prepare our AWS Headers based on our payload
         headers = self.aws_prepare_request(payload)
 
-        self.logger.debug('AWS POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('AWS Payload: %s' % str(payload))
+        self.logger.debug(
+            "AWS POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"AWS Payload: {payload!s}")
 
         try:
             r = requests.post(
@@ -343,68 +349,67 @@ def _post(self, payload, to):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifySNS.http_response_code_lookup(
-                        r.status_code, AWS_HTTP_ERROR_MAP)
+                status_str = NotifySNS.http_response_code_lookup(
+                    r.status_code, AWS_HTTP_ERROR_MAP
+                )
 
                 self.logger.warning(
-                    'Failed to send AWS notification to {}: '
-                    '{}{}error={}.'.format(
+                    "Failed to send AWS notification to {}: "
+                    "{}{}error={}.".format(
                         to,
                         status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return (False, NotifySNS.aws_response_to_dict(r.text))
 
             else:
-                self.logger.info(
-                    'Sent AWS notification to "%s".' % (to))
+                self.logger.info(f'Sent AWS notification to "{to}".')
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending AWS '
-                'notification to "%s".' % (to),
+                "A Connection error occurred sending AWS "
+                f'notification to "{to}".',
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
             return (False, NotifySNS.aws_response_to_dict(None))
 
         return (True, NotifySNS.aws_response_to_dict(r.text))
 
     def aws_prepare_request(self, payload, reference=None):
-        """
-        Takes the intended payload and returns the headers for it.
+        """Takes the intended payload and returns the headers for it.
 
         The payload is presumed to have been already urlencoded()
-
         """
 
         # Define our AWS header
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
-
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
             # Populated below
-            'Content-Length': 0,
-            'Authorization': None,
-            'X-Amz-Date': None,
+            "Content-Length": 0,
+            "Authorization": None,
+            "X-Amz-Date": None,
         }
 
         # Get a reference time (used for header construction)
         reference = datetime.now(timezone.utc)
 
         # Provide Content-Length
-        headers['Content-Length'] = str(len(payload))
+        headers["Content-Length"] = str(len(payload))
 
         # Amazon Date Format
-        amzdate = reference.strftime('%Y%m%dT%H%M%SZ')
-        headers['X-Amz-Date'] = amzdate
+        amzdate = reference.strftime("%Y%m%dT%H%M%SZ")
+        headers["X-Amz-Date"] = amzdate
 
         # Credential Scope
-        scope = '{date}/{region}/{service}/{request}'.format(
-            date=reference.strftime('%Y%m%d'),
+        scope = "{date}/{region}/{service}/{request}".format(
+            date=reference.strftime("%Y%m%d"),
             region=self.aws_region_name,
             service=self.aws_service_name,
             request=self.aws_auth_request,
@@ -412,92 +417,82 @@ def aws_prepare_request(self, payload, reference=None):
 
         # Similar to headers; but a subset.  keys must be lowercase
         signed_headers = OrderedDict([
-            ('content-type', headers['Content-Type']),
-            ('host', '{service}.{region}.amazonaws.com'.format(
-                service=self.aws_service_name,
-                region=self.aws_region_name)),
-            ('x-amz-date', headers['X-Amz-Date']),
+            ("content-type", headers["Content-Type"]),
+            (
+                "host",
+                f"{self.aws_service_name}"
+                f".{self.aws_region_name}.amazonaws.com",
+            ),
+            ("x-amz-date", headers["X-Amz-Date"]),
         ])
 
         #
         # Build Canonical Request Object
         #
-        canonical_request = '\n'.join([
+        canonical_request = "\n".join([
             # Method
-            u'POST',
-
+            "POST",
             # URL
             self.aws_canonical_uri,
-
             # Query String (none set for POST)
-            '',
-
+            "",
             # Header Content (must include \n at end!)
             # All entries except characters in amazon date must be
             # lowercase
-            '\n'.join(['%s:%s' % (k, v)
-                      for k, v in signed_headers.items()]) + '\n',
-
+            "\n".join([f"{k}:{v}" for k, v in signed_headers.items()]) + "\n",
             # Header Entries (in same order identified above)
-            ';'.join(signed_headers.keys()),
-
+            ";".join(signed_headers.keys()),
             # Payload
-            sha256(payload.encode('utf-8')).hexdigest(),
+            sha256(payload.encode("utf-8")).hexdigest(),
         ])
 
         # Prepare Unsigned Signature
-        to_sign = '\n'.join([
+        to_sign = "\n".join([
             self.aws_auth_algorithm,
             amzdate,
             scope,
-            sha256(canonical_request.encode('utf-8')).hexdigest(),
+            sha256(canonical_request.encode("utf-8")).hexdigest(),
         ])
 
         # Our Authorization header
-        headers['Authorization'] = ', '.join([
-            '{algorithm} Credential={key}/{scope}'.format(
-                algorithm=self.aws_auth_algorithm,
-                key=self.aws_access_key_id,
-                scope=scope,
-            ),
-            'SignedHeaders={signed_headers}'.format(
-                signed_headers=';'.join(signed_headers.keys()),
+        headers["Authorization"] = ", ".join([
+            (
+                f"{self.aws_auth_algorithm} "
+                f"Credential={self.aws_access_key_id}/{scope}"
             ),
-            'Signature={signature}'.format(
-                signature=self.aws_auth_signature(to_sign, reference)
+            "SignedHeaders={signed_headers}".format(
+                signed_headers=";".join(signed_headers.keys()),
             ),
+            f"Signature={self.aws_auth_signature(to_sign, reference)}",
         ])
 
         return headers
 
     def aws_auth_signature(self, to_sign, reference):
-        """
-        Generates a AWS v4 signature based on provided payload
-        which should be in the form of a string.
-        """
+        """Generates a AWS v4 signature based on provided payload which should
+        be in the form of a string."""
 
         def _sign(key, msg, to_hex=False):
-            """
-            Perform AWS Signing
-            """
+            """Perform AWS Signing."""
             if to_hex:
-                return hmac.new(key, msg.encode('utf-8'), sha256).hexdigest()
-            return hmac.new(key, msg.encode('utf-8'), sha256).digest()
+                return hmac.new(key, msg.encode("utf-8"), sha256).hexdigest()
+            return hmac.new(key, msg.encode("utf-8"), sha256).digest()
 
-        _date = _sign((
-            self.aws_auth_version +
-            self.aws_secret_access_key).encode('utf-8'),
-            reference.strftime('%Y%m%d'))
+        date = _sign(
+            (self.aws_auth_version + self.aws_secret_access_key).encode(
+                "utf-8"
+            ),
+            reference.strftime("%Y%m%d"),
+        )
 
-        _region = _sign(_date, self.aws_region_name)
-        _service = _sign(_region, self.aws_service_name)
-        _signed = _sign(_service, self.aws_auth_request)
-        return _sign(_signed, to_sign, to_hex=True)
+        region = _sign(date, self.aws_region_name)
+        service = _sign(region, self.aws_service_name)
+        signed = _sign(service, self.aws_auth_request)
+        return _sign(signed, to_sign, to_hex=True)
 
     @staticmethod
     def aws_response_to_dict(aws_response):
-        """
-        Takes an AWS Response object as input and returns it as a dictionary
+        """Takes an AWS Response object as input and returns it as a dictionary
         but not befor extracting out what is useful to us first.
 
         eg:
@@ -524,21 +519,20 @@ def aws_response_to_dict(aws_response):
         # then identify the value we want to map them to in our response
         # object
         aws_keep_map = {
-            'RequestId': 'request_id',
-            'TopicArn': 'topic_arn',
-            'MessageId': 'message_id',
-
+            "RequestId": "request_id",
+            "TopicArn": "topic_arn",
+            "MessageId": "message_id",
             # Error Message Handling
-            'Type': 'error_type',
-            'Code': 'error_code',
-            'Message': 'error_message',
+            "Type": "error_type",
+            "Code": "error_code",
+            "Message": "error_message",
         }
 
         # A default response object that we'll manipulate as we pull more data
         # from our AWS Response object
         response = {
-            'type': None,
-            'request_id': None,
+            "type": None,
+            "request_id": None,
         }
 
         try:
@@ -546,10 +540,11 @@ def aws_response_to_dict(aws_response):
             # reference to namespacing (if present) as it makes parsing
             # the tree so much easier.
             root = ElementTree.fromstring(
-                re.sub(' xmlns="[^"]+"', '', aws_response, count=1))
+                re.sub(r' xmlns="[^"]+"', "", aws_response, count=1)
+            )
 
             # Store our response tag object name
-            response['type'] = str(root.tag)
+            response["type"] = str(root.tag)
 
             def _xml_iter(root, response):
                 if len(root) > 0:
@@ -557,7 +552,7 @@ def _xml_iter(root, response):
                         # use recursion to parse everything
                         _xml_iter(child, response)
 
-                elif root.tag in aws_keep_map.keys():
+                elif root.tag in aws_keep_map:
                     response[aws_keep_map[root.tag]] = (root.text).strip()
 
             # Recursivly iterate over our AWS Response to extract the
@@ -573,62 +568,64 @@ def _xml_iter(root, response):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.aws_access_key_id,
-            self.aws_secret_access_key, self.aws_region_name,
+            self.secure_protocol,
+            self.aws_access_key_id,
+            self.aws_secret_access_key,
+            self.aws_region_name,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{key_id}/{key_secret}/{region}/{targets}/'\
-            '?{params}'.format(
+        return (
+            "{schema}://{key_id}/{key_secret}/{region}/{targets}/"
+            "?{params}".format(
                 schema=self.secure_protocol,
-                key_id=self.pprint(self.aws_access_key_id, privacy, safe=''),
+                key_id=self.pprint(self.aws_access_key_id, privacy, safe=""),
                 key_secret=self.pprint(
-                    self.aws_secret_access_key, privacy,
-                    mode=PrivacyMode.Secret, safe=''),
-                region=NotifySNS.quote(self.aws_region_name, safe=''),
-                targets='/'.join(
-                    [NotifySNS.quote(x) for x in chain(
+                    self.aws_secret_access_key,
+                    privacy,
+                    mode=PrivacyMode.Secret,
+                    safe="",
+                ),
+                region=NotifySNS.quote(self.aws_region_name, safe=""),
+                targets="/".join([
+                    NotifySNS.quote(x)
+                    for x in chain(
                         # Phone # are already prefixed with a plus symbol
                         self.phone,
                         # Topics are prefixed with a pound/hashtag symbol
-                        ['#{}'.format(x) for x in self.topics],
-                    )]),
+                        [f"#{x}" for x in self.topics],
+                    )
+                ]),
                 params=NotifySNS.urlencode(params),
             )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.phone) + len(self.topics)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The AWS Access Key ID is stored in the hostname
-        access_key_id = NotifySNS.unquote(results['host'])
+        access_key_id = NotifySNS.unquote(results["host"])
 
         # Our AWS Access Key Secret contains slashes in it which unfortunately
         # means it is of variable length after the hostname.  Since we require
@@ -640,10 +637,10 @@ def parse_url(url):
         # We need to iterate over each entry in the fullpath and find our
         # region. Once we get there we stop and build our secret from our
         # accumulated data.
-        secret_access_key_parts = list()
+        secret_access_key_parts = []
 
         # Start with a list of entries to work with
-        entries = NotifySNS.split_path(results['fullpath'])
+        entries = NotifySNS.split_path(results["fullpath"])
 
         # Section 1: Get Region and Access Secret
         index = 0
@@ -654,13 +651,13 @@ def parse_url(url):
             if result:
                 # We found our Region; Rebuild our access key secret based on
                 # all entries we found prior to this:
-                secret_access_key = '/'.join(secret_access_key_parts)
+                secret_access_key = "/".join(secret_access_key_parts)
 
                 # Ensure region is nicely formatted
                 region_name = "{country}-{area}-{no}".format(
-                    country=result.group('country').lower(),
-                    area=result.group('area').lower(),
-                    no=result.group('no'),
+                    country=result.group("country").lower(),
+                    area=result.group("area").lower(),
+                    no=result.group("no"),
                 )
 
                 # Track our index as we'll use this to grab the remaining
@@ -674,34 +671,36 @@ def parse_url(url):
             secret_access_key_parts.append(entry)
 
         # Section 2: Get our Recipients (basically all remaining entries)
-        results['targets'] = entries[index:]
+        results["targets"] = entries[index:]
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifySNS.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifySNS.parse_list(results["qsd"]["to"])
 
         # Handle secret_access_key over-ride
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
-            results['secret_access_key'] = \
-                NotifySNS.unquote(results['qsd']['secret'])
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            results["secret_access_key"] = NotifySNS.unquote(
+                results["qsd"]["secret"]
+            )
         else:
-            results['secret_access_key'] = secret_access_key
+            results["secret_access_key"] = secret_access_key
 
         # Handle access key id over-ride
-        if 'access' in results['qsd'] and len(results['qsd']['access']):
-            results['access_key_id'] = \
-                NotifySNS.unquote(results['qsd']['access'])
+        if "access" in results["qsd"] and len(results["qsd"]["access"]):
+            results["access_key_id"] = NotifySNS.unquote(
+                results["qsd"]["access"]
+            )
         else:
-            results['access_key_id'] = access_key_id
+            results["access_key_id"] = access_key_id
 
         # Handle region name id over-ride
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
-            results['region_name'] = \
-                NotifySNS.unquote(results['qsd']['region'])
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
+            results["region_name"] = NotifySNS.unquote(
+                results["qsd"]["region"]
+            )
         else:
-            results['region_name'] = region_name
+            results["region_name"] = region_name
 
         # Return our result set
         return results
diff --git a/libs/apprise/plugins/sparkpost.py b/libs/apprise/plugins/sparkpost.py
index 039942fb97..5a135598d4 100644
--- a/libs/apprise/plugins/sparkpost.py
+++ b/libs/apprise/plugins/sparkpost.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -54,44 +53,45 @@
 #
 # API Documentation: https://developers.sparkpost.com/api/
 # Specifically: https://developers.sparkpost.com/api/transmissions/
+import contextlib
+from email.utils import formataddr
+from json import dumps, loads
+import logging
+
 import requests
-from json import loads
-from json import dumps
-from .base import NotifyBase
+
 from .. import exception
-from ..common import NotifyType
-from ..common import NotifyFormat
-from email.utils import formataddr
-from ..utils.parse import (
-    validate_regex, parse_emails, parse_bool, is_email)
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_bool, parse_emails, validate_regex
+from ..utils.sanitize import sanitize_payload
+from .base import NotifyBase
 
 # Provide some known codes SparkPost uses and what they translate to:
 # Based on https://www.sparkpost.com/docs/tech-resources/extended-error-codes/
 SPARKPOST_HTTP_ERROR_MAP = {
-    400: 'A bad request was made to the server',
-    401: 'Invalid User ID and/or Unauthorized User',
-    403: 'Permission Denied; the provided API Key was not valid',
-    404: 'There is a problem with the server query URI.',
-    405: 'Invalid HTTP method',
-    420: 'Sending limit reached.',
-    422: 'Invalid data/format/type/length',
-    429: 'To many requests per sec; rate limit',
+    400: "A bad request was made to the server",
+    401: "Invalid User ID and/or Unauthorized User",
+    403: "Permission Denied; the provided API Key was not valid",
+    404: "There is a problem with the server query URI.",
+    405: "Invalid HTTP method",
+    420: "Sending limit reached.",
+    422: "Invalid data/format/type/length",
+    429: "To many requests per sec; rate limit",
 }
 
 
 class SparkPostRegion:
-    """
-    Regions
-    """
-    US = 'us'
-    EU = 'eu'
+    """Regions."""
+
+    US = "us"
+    EU = "eu"
 
 
 # SparkPost APIs
 SPARKPOST_API_LOOKUP = {
-    SparkPostRegion.US: 'https://api.sparkpost.com/api/v1',
-    SparkPostRegion.EU: 'https://api.eu.sparkpost.com/api/v1',
+    SparkPostRegion.US: "https://api.sparkpost.com/api/v1",
+    SparkPostRegion.EU: "https://api.eu.sparkpost.com/api/v1",
 }
 
 # A List of our regions we can use for verification
@@ -102,21 +102,19 @@ class SparkPostRegion:
 
 
 class NotifySparkPost(NotifyBase):
-    """
-    A wrapper for SparkPost Notifications
-    """
+    """A wrapper for SparkPost Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'SparkPost'
+    service_name = "SparkPost"
 
     # The services URL
-    service_url = 'https://sparkpost.com/'
+    service_url = "https://sparkpost.com/"
 
     # Support attachments
     attachment_support = True
 
     # All notification requests are secure
-    secure_protocol = 'sparkpost'
+    secure_protocol = "sparkpost"
 
     # SparkPost advertises they allow 300 requests per minute.
     # 60/300 = 0.2
@@ -142,109 +140,122 @@ class NotifySparkPost(NotifyBase):
     default_batch_size = 2000
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_sparkpost'
+    setup_url = "https://appriseit.com/services/sparkpost/"
 
     # Default Notify Format
     notify_format = NotifyFormat.HTML
 
     # Define object templates
     templates = (
-        '{schema}://{user}@{host}:{apikey}/',
-        '{schema}://{user}@{host}:{apikey}/{targets}',
+        "{schema}://{user}@{host}:{apikey}/",
+        "{schema}://{user}@{host}:{apikey}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'user': {
-            'name': _('User Name'),
-            'type': 'string',
-            'required': True,
-        },
-        'host': {
-            'name': _('Domain'),
-            'type': 'string',
-            'required': True,
-        },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'targets': {
-            'name': _('Target Emails'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "user": {
+                "name": _("User Name"),
+                "type": "string",
+                "required": True,
+            },
+            "host": {
+                "name": _("Domain"),
+                "type": "string",
+                "required": True,
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "targets": {
+                "name": _("Target Emails"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'name': {
-            'name': _('From Name'),
-            'type': 'string',
-            'map_to': 'from_name',
-        },
-        'region': {
-            'name': _('Region Name'),
-            'type': 'choice:string',
-            'values': SPARKPOST_REGIONS,
-            'default': SparkPostRegion.US,
-            'map_to': 'region_name',
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'cc': {
-            'name': _('Carbon Copy'),
-            'type': 'list:string',
-        },
-        'bcc': {
-            'name': _('Blind Carbon Copy'),
-            'type': 'list:string',
-        },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': False,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "name": {
+                "name": _("From Name"),
+                "type": "string",
+                "map_to": "from_name",
+            },
+            "region": {
+                "name": _("Region Name"),
+                "type": "choice:string",
+                "values": SPARKPOST_REGIONS,
+                "default": SparkPostRegion.US,
+                "map_to": "region_name",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "cc": {
+                "name": _("Carbon Copy"),
+                "type": "list:string",
+            },
+            "bcc": {
+                "name": _("Blind Carbon Copy"),
+                "type": "list:string",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": False,
+            },
         },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('Email Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("Email Header"),
+            "prefix": "+",
         },
-        'tokens': {
-            'name': _('Template Tokens'),
-            'prefix': ':',
+        "tokens": {
+            "name": _("Template Tokens"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
-                 region_name=None, headers=None, tokens=None, batch=None,
-                 **kwargs):
-        """
-        Initialize SparkPost Object
-        """
+    def __init__(
+        self,
+        apikey,
+        targets,
+        cc=None,
+        bcc=None,
+        from_name=None,
+        region_name=None,
+        headers=None,
+        tokens=None,
+        batch=None,
+        **kwargs,
+    ):
+        """Initialize SparkPost Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(apikey)
         if not self.apikey:
-            msg = 'An invalid SparkPost API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid SparkPost API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Validate our username
         if not self.user:
-            msg = 'No SparkPost username was specified.'
+            msg = "No SparkPost username was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Acquire Email 'To'
-        self.targets = list()
+        self.targets = []
 
         # Acquire Carbon Copies
         self.cc = set()
@@ -257,28 +268,31 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
 
         # Store our region
         try:
-            self.region_name = self.template_args['region']['default'] \
-                if region_name is None else region_name.lower()
+            self.region_name = (
+                self.template_args["region"]["default"]
+                if region_name is None
+                else region_name.lower()
+            )
 
             if self.region_name not in SPARKPOST_REGIONS:
                 # allow the outer except to handle this common response
-                raise
-        except:
+                raise IndexError()
+
+        except (AttributeError, IndexError, TypeError):
             # Invalid region specified
-            msg = 'The SparkPost region specified ({}) is invalid.' \
-                  .format(region_name)
+            msg = f"The SparkPost region specified ({region_name}) is invalid."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from None
 
         # Get our From username (if specified)
         self.from_name = from_name
 
         # Get our from email address
-        self.from_addr = '{user}@{host}'.format(user=self.user, host=self.host)
+        self.from_addr = f"{self.user}@{self.host}"
 
         if not is_email(self.from_addr):
             # Parse Source domain based on from_addr
-            msg = 'Invalid ~From~ email format: {}'.format(self.from_addr)
+            msg = f"Invalid ~From~ email format: {self.from_addr}"
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -293,107 +307,98 @@ def __init__(self, apikey, targets, cc=None, bcc=None, from_name=None,
             self.tokens.update(tokens)
 
         # Prepare Batch Mode Flag
-        self.batch = self.template_args['batch']['default'] \
-            if batch is None else batch
+        self.batch = (
+            self.template_args["batch"]["default"] if batch is None else batch
+        )
 
         if targets:
             # Validate recipients (to:) and drop bad ones:
             for recipient in parse_emails(targets):
                 result = is_email(recipient)
                 if result:
-                    self.targets.append(
-                        (result['name'] if result['name'] else False,
-                            result['full_email']))
+                    self.targets.append((
+                        result["name"] if result["name"] else False,
+                        result["full_email"],
+                    ))
                     continue
 
                 self.logger.warning(
-                    'Dropped invalid To email '
-                    '({}) specified.'.format(recipient),
+                    f"Dropped invalid To email ({recipient}) specified.",
                 )
 
         else:
             # If our target email list is empty we want to add ourselves to it
             self.targets.append(
-                (self.from_name if self.from_name else False, self.from_addr))
+                (self.from_name if self.from_name else False, self.from_addr)
+            )
 
         # Validate recipients (cc:) and drop bad ones:
         for recipient in parse_emails(cc):
             email = is_email(recipient)
             if email:
-                self.cc.add(email['full_email'])
+                self.cc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid Carbon Copy email ({recipient}) specified.",
             )
 
         # Validate recipients (bcc:) and drop bad ones:
         for recipient in parse_emails(bcc):
             email = is_email(recipient)
             if email:
-                self.bcc.add(email['full_email'])
+                self.bcc.add(email["full_email"])
 
                 # Index our name (if one exists)
-                self.names[email['full_email']] = \
-                    email['name'] if email['name'] else False
+                self.names[email["full_email"]] = (
+                    email["name"] if email["name"] else False
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid Blind Carbon Copy email '
-                '({}) specified.'.format(recipient),
+                "Dropped invalid Blind Carbon Copy email "
+                f"({recipient}) specified.",
             )
 
     def __post(self, payload, retry):
-        """
-        Performs the actual post and returns the response
-
-        """
+        """Performs the actual post and returns the response."""
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'Authorization': self.apikey,
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
+            "Content-Type": "application/json",
+            "Authorization": self.apikey,
         }
 
         # Prepare our URL as it's based on our hostname
-        url = '{}/transmissions/'.format(
-            SPARKPOST_API_LOOKUP[self.region_name])
+        url = f"{SPARKPOST_API_LOOKUP[self.region_name]}/transmissions/"
 
         # Some Debug Logging
-        self.logger.debug('SparkPost POST URL: {} (cert_verify={})'.format(
-            url, self.verify_certificate))
-
-        if 'attachments' in payload['content']:
-            # Since we print our payload; attachments make it a bit too noisy
-            # we just strip out the data block to accomodate it
-            log_payload = \
-                {k: v for k, v in payload.items() if k != "content"}
-            log_payload['content'] = \
-                {k: v for k, v in payload['content'].items()
-                 if k != "attachments"}
-            log_payload['content']['attachments'] = \
-                [{k: v for k, v in x.items() if k != "data"}
-                 for x in payload['content']['attachments']]
-        else:
-            # No tidying is needed
-            log_payload = payload
-
-        self.logger.debug('SparkPost Payload: {}' .format(log_payload))
+        if self.logger.isEnabledFor(logging.DEBUG):
+            # Due to attachments; output can be quite heavy and io intensive
+            # To accommodate this, we only show our debug payload information
+            # if required.
+            self.logger.debug(
+                "SparkPost POST URL:"
+                f" {url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(
+                "SparkPost Payload: %s", sanitize_payload(payload))
 
         wait = None
 
         # For logging output of success and errors; we get a head count
         # of our outbound details:
-        verbose_dest = ', '.join(
-            [x['address']['email'] for x in payload['recipients']]) \
-            if len(payload['recipients']) <= 3 \
-            else '{} recipients'.format(len(payload['recipients']))
+        verbose_dest = (
+            ", ".join([x["address"]["email"] for x in payload["recipients"]])
+            if len(payload["recipients"]) <= 3
+            else "{} recipients".format(len(payload["recipients"]))
+        )
 
         # Initialize our response object
         json_response = {}
@@ -434,43 +439,40 @@ def __post(self, payload, retry):
                 #   ]
                 # }
                 #
-                try:
-                    # Update our status response if we can
-                    json_response = loads(r.content)
-
-                except (AttributeError, TypeError, ValueError):
+                with contextlib.suppress(
+                        AttributeError, TypeError, ValueError):
+                    # Load our JSON Object if we can
                     # ValueError = r.content is Unparsable
                     # TypeError = r.content is None
                     # AttributeError = r is None
-
-                    # We could not parse JSON response.
-                    # We will just use the status we already have.
-                    pass
+                    json_response = loads(r.content)
 
                 status_code = r.status_code
 
-                payload['recipients'] = list()
+                payload["recipients"] = []
                 if status_code == requests.codes.ok:
                     self.logger.info(
-                        'Sent SparkPost notification to {}.'.format(
-                            verbose_dest))
+                        f"Sent SparkPost notification to {verbose_dest}."
+                    )
                     return status_code, json_response
 
                 # We had a problem if we get here
-                status_str = \
-                    NotifyBase.http_response_code_lookup(
-                        status_code, SPARKPOST_API_LOOKUP)
+                status_str = NotifyBase.http_response_code_lookup(
+                    status_code, SPARKPOST_API_LOOKUP
+                )
 
                 self.logger.warning(
-                    'Failed to send SparkPost notification to {}: '
-                    '{}{}error={}.'.format(
+                    "Failed to send SparkPost notification to {}: "
+                    "{}{}error={}.".format(
                         verbose_dest,
                         status_str,
-                        ', ' if status_str else '',
-                        status_code))
+                        ", " if status_str else "",
+                        status_code,
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 if status_code == requests.codes.too_many_requests and retry:
                     retry = retry - 1
@@ -480,25 +482,31 @@ def __post(self, payload, retry):
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending SparkPost '
-                    'notification')
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending SparkPost "
+                    "notification"
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
             # Anything else and we're done
             return status_code, json_response
 
         # Our code will never reach here (outside of infinite while loop above)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform SparkPost Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform SparkPost Notification."""
 
         if not self.targets:
             # There is no one to email; we're done
             self.logger.warning(
-                'There are no SparkPost Email recipients to notify')
+                "There are no SparkPost Email recipients to notify"
+            )
             return False
 
         # Initialize our has_error flag
@@ -507,96 +515,103 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
         # Send in batches if identified to do so
         batch_size = 1 if not self.batch else self.default_batch_size
 
-        reply_to = formataddr((self.from_name if self.from_name else False,
-                               self.from_addr), charset='utf-8')
+        reply_to = formataddr(
+            (self.from_name if self.from_name else False, self.from_addr),
+            charset="utf-8",
+        )
 
         payload = {
             "options": {
                 # When set to True, an image is included with the email which
                 # is used to detect if the user looked at the image or not.
-                'open_tracking': False,
-
+                "open_tracking": False,
                 # Track if links were clicked that were found within email
-                'click_tracking': False,
+                "click_tracking": False,
             },
             "content": {
                 "from": {
-                    "name": self.from_name
-                    if self.from_name else self.app_desc,
+                    "name": (
+                        self.from_name if self.from_name else self.app_desc
+                    ),
                     "email": self.from_addr,
                 },
-
                 # SparkPost does not allow empty subject lines or lines that
                 # only contain whitespace; Since Apprise allows an empty title
                 # parameter we swap empty title entries with the period
-                "subject": title if title.strip() else '.',
+                "subject": title if title.strip() else ".",
                 "reply_to": reply_to,
-            }
+            },
         }
 
         if self.notify_format == NotifyFormat.HTML:
-            payload['content']['html'] = body
+            payload["content"]["html"] = body
 
         else:
-            payload['content']['text'] = body
+            payload["content"]["text"] = body
 
         if attach and self.attachment_support:
             # Prepare ourselves an attachment object
-            payload['content']['attachments'] = []
+            payload["content"]["attachments"] = []
 
             for no, attachment in enumerate(attach, start=1):
                 # Perform some simple error checking
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SparkPost attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SparkPost attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 try:
                     # Prepare API Upload Payload
-                    payload['content']['attachments'].append({
-                        'name': attachment.name
-                        if attachment.name else f'file{no:03}.dat',
-                        'type': attachment.mimetype,
-                        'data': attachment.base64(),
+                    payload["content"]["attachments"].append({
+                        "name": (
+                            attachment.name
+                            if attachment.name
+                            else f"file{no:03}.dat"
+                        ),
+                        "type": attachment.mimetype,
+                        "data": attachment.base64(),
                     })
 
                 except exception.AppriseException:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access SparkPost attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access SparkPost attachment"
+                        f" {attachment.url(privacy=True)}."
+                    )
                     return False
 
                 self.logger.debug(
-                    'Appending SparkPost attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Appending SparkPost attachment"
+                    f" {attachment.url(privacy=True)}"
+                )
 
         # Take a copy of our token dictionary
         tokens = self.tokens.copy()
 
         # Apply some defaults template values
-        tokens['app_body'] = body
-        tokens['app_title'] = title
-        tokens['app_type'] = notify_type
-        tokens['app_id'] = self.app_id
-        tokens['app_desc'] = self.app_desc
-        tokens['app_color'] = self.color(notify_type)
-        tokens['app_url'] = self.app_url
+        tokens["app_body"] = body
+        tokens["app_title"] = title
+        tokens["app_type"] = notify_type.value
+        tokens["app_id"] = self.app_id
+        tokens["app_desc"] = self.app_desc
+        tokens["app_color"] = self.color(notify_type)
+        tokens["app_url"] = self.app_url
 
         # Store our tokens if they're identified
-        payload['substitution_data'] = self.tokens
+        payload["substitution_data"] = self.tokens
 
         # Create a copy of the targets list
         emails = list(self.targets)
 
         for index in range(0, len(emails), batch_size):
             # Generate our email listing
-            payload['recipients'] = list()
+            payload["recipients"] = []
 
             # Initialize our cc list
-            cc = (self.cc - self.bcc)
+            cc = self.cc - self.bcc
 
             # Initialize our bcc list
             bcc = set(self.bcc)
@@ -604,63 +619,64 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             # Initialize our headers
             headers = self.headers.copy()
 
-            for addr in self.targets[index:index + batch_size]:
+            for addr in self.targets[index : index + batch_size]:
                 entry = {
-                    'address': {
-                        'email': addr[1],
+                    "address": {
+                        "email": addr[1],
                     }
                 }
 
                 # Strip target out of cc list if in To
-                cc = (cc - set([addr[1]]))
+                cc = cc - {addr[1]}
 
                 # Strip target out of bcc list if in To
-                bcc = (bcc - set([addr[1]]))
+                bcc = bcc - {addr[1]}
 
                 if addr[0]:
-                    entry['address']['name'] = addr[0]
+                    entry["address"]["name"] = addr[0]
 
                 # Add our recipient to our list
-                payload['recipients'].append(entry)
+                payload["recipients"].append(entry)
 
             if cc:
                 # Handle our cc List
                 for addr in cc:
                     entry = {
-                        'address': {
-                            'email': addr,
-                            'header_to':
-                                # Take the first email in the To
-                                self.targets[index:index + batch_size][0][1],
+                        "address": {
+                            "email": addr,
+                            "header_to":
+                            # Take the first email in the To
+                            self.targets[index : index + batch_size][0][1],
                         },
                     }
 
                     if self.names.get(addr):
-                        entry['address']['name'] = self.names[addr]
+                        entry["address"]["name"] = self.names[addr]
 
                     # Add our recipient to our list
-                    payload['recipients'].append(entry)
+                    payload["recipients"].append(entry)
 
-                headers['CC'] = ','.join(cc)
+                headers["CC"] = ",".join(cc)
 
             # Handle our bcc
             for addr in bcc:
                 # Add our recipient to our list
-                payload['recipients'].append({
-                    'address': {
-                        'email': addr,
-                        'header_to':
-                            # Take the first email in the To
-                            self.targets[index:index + batch_size][0][1],
+                payload["recipients"].append({
+                    "address": {
+                        "email": addr,
+                        "header_to":
+                        # Take the first email in the To
+                        self.targets[index : index + batch_size][0][1],
                     },
                 })
 
             if headers:
-                payload['content']['headers'] = headers
+                payload["content"]["headers"] = headers
 
             # Send our message
-            status_code, response = \
-                self.__post(payload, self.sparkpost_retry_attempts)
+            status_code, _response = self.__post(
+                payload, self.sparkpost_retry_attempts
+            )
 
             # Failed
             if status_code != requests.codes.ok:
@@ -670,87 +686,92 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.apikey, self.host)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'region': self.region_name,
-            'batch': 'yes' if self.batch else 'no',
+            "region": self.region_name,
+            "batch": "yes" if self.batch else "no",
         }
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Append our template tokens into our parameters
-        params.update({':{}'.format(k): v for k, v in self.tokens.items()})
+        params.update({f":{k}": v for k, v in self.tokens.items()})
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         if self.from_name is not None:
             # from_name specified; pass it back on the url
-            params['name'] = self.from_name
+            params["name"] = self.from_name
 
         if self.cc:
             # Handle our Carbon Copy Addresses
-            params['cc'] = ','.join(
-                ['{}{}'.format(
-                    '' if not e not in self.names
-                    else '{}:'.format(self.names[e]), e) for e in self.cc])
+            params["cc"] = ",".join([
+                "{}{}".format(
+                    "" if not e not in self.names else f"{self.names[e]}:",
+                    e,
+                )
+                for e in self.cc
+            ])
 
         if self.bcc:
             # Handle our Blind Carbon Copy Addresses
-            params['bcc'] = ','.join(self.bcc)
+            params["bcc"] = ",".join(self.bcc)
 
         # a simple boolean check as to whether we display our target emails
         # or not
-        has_targets = \
-            not (len(self.targets) == 1
-                 and self.targets[0][1] == self.from_addr)
+        has_targets = not (
+            len(self.targets) == 1 and self.targets[0][1] == self.from_addr
+        )
 
-        return '{schema}://{user}@{host}/{apikey}/{targets}/?{params}'.format(
+        return "{schema}://{user}@{host}/{apikey}/{targets}/?{params}".format(
             schema=self.secure_protocol,
             host=self.host,
-            user=NotifySparkPost.quote(self.user, safe=''),
-            apikey=self.pprint(self.apikey, privacy, safe=''),
-            targets='' if not has_targets else '/'.join(
-                [NotifySparkPost.quote('{}{}'.format(
-                    '' if not e[0] else '{}:'.format(e[0]), e[1]),
-                    safe='') for e in self.targets]),
-            params=NotifySparkPost.urlencode(params))
+            user=NotifySparkPost.quote(self.user, safe=""),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
+            targets=(
+                ""
+                if not has_targets
+                else "/".join([
+                    NotifySparkPost.quote(
+                        "{}{}".format("" if not e[0] else f"{e[0]}:", e[1]),
+                        safe="",
+                    )
+                    for e in self.targets
+                ])
+            ),
+            params=NotifySparkPost.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         #
         # Factor batch into calculation
         #
         batch_size = 1 if not self.batch else self.default_batch_size
         targets = len(self.targets)
         if batch_size > 1:
-            targets = int(targets / batch_size) + \
-                (1 if targets % batch_size else 0)
+            targets = int(targets / batch_size) + (
+                1 if targets % batch_size else 0
+            )
 
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -758,50 +779,58 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifySparkPost.split_path(results['fullpath'])
+        results["targets"] = NotifySparkPost.split_path(results["fullpath"])
 
         # Our very first entry is reserved for our api key
         try:
-            results['apikey'] = results['targets'].pop(0)
+            results["apikey"] = results["targets"].pop(0)
 
         except IndexError:
             # We're done - no API Key found
-            results['apikey'] = None
+            results["apikey"] = None
 
-        if 'name' in results['qsd'] and len(results['qsd']['name']):
+        if "name" in results["qsd"] and len(results["qsd"]["name"]):
             # Extract from name to associate with from address
-            results['from_name'] = \
-                NotifySparkPost.unquote(results['qsd']['name'])
+            results["from_name"] = NotifySparkPost.unquote(
+                results["qsd"]["name"]
+            )
 
-        if 'region' in results['qsd'] and len(results['qsd']['region']):
+        if "region" in results["qsd"] and len(results["qsd"]["region"]):
             # Extract region
-            results['region_name'] = \
-                NotifySparkPost.unquote(results['qsd']['region'])
+            results["region_name"] = NotifySparkPost.unquote(
+                results["qsd"]["region"]
+            )
 
         # Handle 'to' email address
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'].append(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"].append(results["qsd"]["to"])
 
         # Handle Carbon Copy Addresses
-        if 'cc' in results['qsd'] and len(results['qsd']['cc']):
-            results['cc'] = results['qsd']['cc']
+        if "cc" in results["qsd"] and len(results["qsd"]["cc"]):
+            results["cc"] = results["qsd"]["cc"]
 
         # Handle Blind Carbon Copy Addresses
-        if 'bcc' in results['qsd'] and len(results['qsd']['bcc']):
-            results['bcc'] = results['qsd']['bcc']
+        if "bcc" in results["qsd"] and len(results["qsd"]["bcc"]):
+            results["bcc"] = results["qsd"]["bcc"]
 
         # Add our Meta Headers that the user can provide with their outbound
         # emails
-        results['headers'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                              for x, y in results['qsd+'].items()}
+        results["headers"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd+"].items()
+        }
 
         # Add our template tokens (if defined)
-        results['tokens'] = {NotifyBase.unquote(x): NotifyBase.unquote(y)
-                             for x, y in results['qsd:'].items()}
+        results["tokens"] = {
+            NotifyBase.unquote(x): NotifyBase.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifySparkPost.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifySparkPost.template_args["batch"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/spike.py b/libs/apprise/plugins/spike.py
new file mode 100644
index 0000000000..22584c72fc
--- /dev/null
+++ b/libs/apprise/plugins/spike.py
@@ -0,0 +1,178 @@
+#
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Details at:
+# https://www.spike.sh/docs/alerts/send-alerts-to-spike/
+
+import json
+import re
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
+
+
+class NotifySpike(NotifyBase):
+    """A wrapper for Spike.sh Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("Spike.sh")
+
+    # The services URL
+    service_url = "https://www.spike.sh/"
+
+    # The default secure protocol
+    secure_protocol = "spike"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/spike/"
+
+    # URL used to send notifications with
+    notify_url = "https://api.spike.sh/v1/alerts/"
+
+    templates = ("{schema}://{token}",)
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Integration Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]{32}$", "i"),
+            },
+        },
+    )
+
+    def __init__(self, token, **kwargs):
+        """Initialize Spike.sh Object."""
+        super().__init__(**kwargs)
+
+        self.token = validate_regex(
+            token, *self.template_tokens["token"]["regex"]
+        )
+        if not self.token:
+            msg = f"The Spike.sh integration key ({token}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.webhook_url = f"{self.notify_url}{self.token}"
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol, self.token)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+        return (
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
+        )
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send Spike.sh Notification."""
+
+        payload = {
+            "message": title if title else body,
+            "description": body,
+        }
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+        }
+
+        # Always call throttle before any remote server i/o is made
+        self.throttle()
+
+        try:
+            response = requests.post(
+                self.webhook_url,
+                headers=headers,
+                data=json.dumps(payload),
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+            if response.status_code != requests.codes.ok:
+                self.logger.warning(
+                    "Spike.sh notification failed: %d - %s",
+                    response.status_code,
+                    response.text,
+                )
+                return False
+
+        except requests.RequestException as e:
+            self.logger.warning(f"Spike.sh Exception: {e}")
+            return False
+
+        self.logger.info("Spike.sh notification sent successfully.")
+        return True
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns arguments to re-instantiate the
+        object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            return results
+
+        # Access token
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            # Extract the account sid from an argument
+            results["token"] = NotifySpike.unquote(results["qsd"]["token"])
+        else:
+            # Retrieve the token from the host
+            results["token"] = NotifySpike.unquote(results["host"])
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """Supports reverse-parsing a Spike.sh native URL into an Apprise
+        one."""
+        match = re.match(
+            r"^https://api\.spike\.sh/v1/alerts/([a-z0-9]{32})$", url, re.I
+        )
+        if not match:
+            return None
+
+        return NotifySpike.parse_url(
+            f"{NotifySpike.secure_protocol}://{match.group(1)}"
+        )
diff --git a/libs/apprise/plugins/splunk.py b/libs/apprise/plugins/splunk.py
index d9374255be..dddc70aaa5 100644
--- a/libs/apprise/plugins/splunk.py
+++ b/libs/apprise/plugins/splunk.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,41 +33,40 @@
 #       -guide/
 
 
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyType, NOTIFY_TYPES
-from ..utils.parse import validate_regex
+from ..common import NOTIFY_TYPES, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class SplunkAction:
-    """
-    Tracks the actions supported by Apprise Splunk Plugin
+    """Tracks the actions supported by Apprise Splunk Plugin."""
 
-    """
     # Use mapping (specify :key=arg to over-ride)
-    MAP = 'map'
+    MAP = "map"
 
     # Creates a timeline event but does not trigger an incident
-    INFO = 'info'
+    INFO = "info"
 
     # Triggers a warning (possibly causing incident) in all cases
-    WARNING = 'warning'
+    WARNING = "warning"
 
     # Triggers an incident in all cases
-    CRITICAL = 'critical'
+    CRITICAL = "critical"
 
     # Acknowldege entity_id provided in all cases
-    ACKNOWLEDGE = 'acknowledgement'
+    ACKNOWLEDGE = "acknowledgement"
 
     # Recovery entity_id provided in all cases
-    RECOVERY = 'recovery'
+    RECOVERY = "recovery"
 
     # Resolve (aliase of Recover)
-    RESOLVE = 'resolve'
+    RESOLVE = "resolve"
 
 
 # Define our Splunk Actions
@@ -84,23 +82,22 @@ class SplunkAction:
 
 
 class SplunkMessageType:
-    """
-    Defines the supported splunk message types
-    """
+    """Defines the supported splunk message types."""
+
     # Triggers an incident
-    CRITICAL = 'CRITICAL'
+    CRITICAL = "CRITICAL"
 
     # May trigger an incident, depending on your settings
-    WARNING = 'WARNING'
+    WARNING = "WARNING"
 
     # Acks an incident
-    ACKNOWLEDGEMENT = 'ACKNOWLEDGEMENT'
+    ACKNOWLEDGEMENT = "ACKNOWLEDGEMENT"
 
     # Creates a timeline event but does not trigger an incident
-    INFO = 'INFO'
+    INFO = "INFO"
 
     # Resolves an incident
-    RECOVERY = 'RECOVERY'
+    RECOVERY = "RECOVERY"
 
 
 # Defines our supported message types
@@ -114,30 +111,30 @@ class SplunkMessageType:
 
 
 class NotifySplunk(NotifyBase):
-    """
-    A wrapper for Splunk Notifications
-    """
+    """A wrapper for Splunk Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = _('Splunk On-Call')
+    service_name = _("Splunk On-Call")
 
     # The services URL
-    service_url = 'https://www.splunk.com/en_us/products/on-call.html'
+    service_url = "https://www.splunk.com/en_us/products/on-call.html"
 
     # The default secure protocol
-    secure_protocol = ('splunk', 'victorops')
+    secure_protocol = ("splunk", "victorops")
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_splunk'
+    setup_url = "https://appriseit.com/services/splunk/"
 
     # Notification URL
-    notify_url = 'https://alert.victorops.com/integrations/generic/20131114/'\
-                 'alert/{apikey}/{routing_key}'
+    notify_url = (
+        "https://alert.victorops.com/integrations/generic/20131114/"
+        "alert/{apikey}/{routing_key}"
+    )
 
     # Define object templates
     templates = (
-        '{schema}://{routing_key}@{apikey}',
-        '{schema}://{routing_key}@{apikey}/{entity_id}',
+        "{schema}://{routing_key}@{apikey}",
+        "{schema}://{routing_key}@{apikey}/{entity_id}",
     )
 
     # The title is not used
@@ -161,118 +158,141 @@ class NotifySplunk(NotifyBase):
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
-        },
-        'routing_key': {
-            'name': _('Target Routing Key'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
-        },
-        'entity_id': {
-            # Provide a value such as: "disk space/db01.mycompany.com"
-            'name': _('Entity ID'),
-            'type': 'string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+            },
+            "routing_key": {
+                "name": _("Target Routing Key"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+            },
+            "entity_id": {
+                # Provide a value such as: "disk space/db01.mycompany.com"
+                "name": _("Entity ID"),
+                "type": "string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'apikey': {
-            'alias_of': 'apikey',
-        },
-        'routing_key': {
-            'alias_of': 'routing_key',
-        },
-        'route': {
-            'alias_of': 'routing_key',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "apikey": {
+                "alias_of": "apikey",
+            },
+            "routing_key": {
+                "alias_of": "routing_key",
+            },
+            "route": {
+                "alias_of": "routing_key",
+            },
+            "entity_id": {
+                "alias_of": "entity_id",
+            },
+            "action": {
+                "name": _("Action"),
+                "type": "choice:string",
+                "values": SPLUNK_ACTIONS,
+                "default": SPLUNK_ACTIONS[0],
+            },
         },
-        'entity_id': {
-            'alias_of': 'entity_id',
-        },
-        'action': {
-            'name': _('Action'),
-            'type': 'choice:string',
-            'values': SPLUNK_ACTIONS,
-            'default': SPLUNK_ACTIONS[0],
-        }
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'mapping': {
-            'name': _('Action Mapping'),
-            'prefix': ':',
+        "mapping": {
+            "name": _("Action Mapping"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, apikey, routing_key, entity_id=None, action=None,
-                 mapping=None, **kwargs):
-        """
-        Initialize Splunk Object
-        """
+    def __init__(
+        self,
+        apikey,
+        routing_key,
+        entity_id=None,
+        action=None,
+        mapping=None,
+        **kwargs,
+    ):
+        """Initialize Splunk Object."""
         super().__init__(**kwargs)
 
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'The Splunk API Key specified ({}) is invalid.'\
-                .format(apikey)
+            msg = f"The Splunk API Key specified ({apikey}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.routing_key = validate_regex(
-            routing_key, *self.template_tokens['routing_key']['regex'])
+            routing_key, *self.template_tokens["routing_key"]["regex"]
+        )
         if not self.routing_key:
-            msg = 'The Splunk Routing Key specified ({}) is invalid.'\
-                .format(routing_key)
+            msg = (
+                f"The Splunk Routing Key specified ({routing_key}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        if not (isinstance(entity_id, str)
-                and len(entity_id.strip(' \r\n\t\v/'))):
+        if not (
+            isinstance(entity_id, str) and len(entity_id.strip(" \r\n\t\v/"))
+        ):
             # Use routing key
             self.entity_id = f"{self.app_id}/{self.routing_key}"
 
         else:
             # Assign what was defined:
-            self.entity_id = entity_id.strip(' \r\n\t\v/')
+            self.entity_id = entity_id.strip(" \r\n\t\v/")
 
         if action and isinstance(action, str):
             self.action = next(
-                (a for a in SPLUNK_ACTIONS if a.startswith(action)), None)
+                (a for a in SPLUNK_ACTIONS if a.startswith(action)), None
+            )
             if self.action not in SPLUNK_ACTIONS:
-                msg = 'The Splunk action specified ({}) is invalid.'\
-                    .format(action)
+                msg = f"The Splunk action specified ({action}) is invalid."
                 self.logger.warning(msg)
                 raise TypeError(msg)
         else:
-            self.action = self.template_args['action']['default']
+            self.action = self.template_args["action"]["default"]
 
         # Store our mappings
         self.mapping = self.splunk_message_map.copy()
         if mapping and isinstance(mapping, dict):
-            for _k, _v in mapping.items():
+            for k_, v_ in mapping.items():
                 # Get our mapping
-                k = next((t for t in NOTIFY_TYPES if t.startswith(_k)), None)
+                k = next((t for t in NOTIFY_TYPES if t.startswith(k_)), None)
                 if not k:
-                    msg = 'The Splunk mapping key specified ({}) is invalid.'\
-                        .format(_k)
+                    msg = (
+                        f"The Splunk mapping key specified ({k_}) is invalid."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
 
-                _v_upper = _v.upper()
-                v = next((v for v in SPLUNK_MESSAGE_TYPES
-                          if v.startswith(_v_upper)), None)
+                v_upper = v_.upper()
+                v = next(
+                    (
+                        v
+                        for v in SPLUNK_MESSAGE_TYPES
+                        if v.startswith(v_upper)
+                    ),
+                    None,
+                )
                 if not v:
-                    msg = 'The Splunk mapping value (assigned to {}) ' \
-                          'specified ({}) is invalid.'.format(k, _v)
+                    msg = (
+                        f"The Splunk mapping value (assigned to {k}) "
+                        f"specified ({v_}) is invalid."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
 
@@ -281,15 +301,13 @@ def __init__(self, apikey, routing_key, entity_id=None, action=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Send our notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send our notification."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': "application/json",
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Set up our message type
@@ -327,12 +345,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         }
 
         notify_url = self.notify_url.format(
-            apikey=self.apikey,
-            routing_key=self.routing_key)
+            apikey=self.apikey, routing_key=self.routing_key
+        )
 
-        self.logger.debug('Splunk GET URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate))
-        self.logger.debug('Splunk Payload: %s' % str(payload))
+        self.logger.debug(
+            "Splunk GET URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Splunk Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -340,7 +360,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         try:
             r = requests.post(
                 notify_url,
-                data=dumps(payload).encode('utf-8'),
+                data=dumps(payload).encode("utf-8"),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
@@ -353,29 +373,30 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifySplunk.http_response_code_lookup(r.status_code)
+                status_str = NotifySplunk.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Splunk notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Splunk notification: {}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Splunk notification.')
+                self.logger.info("Sent Splunk notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Splunk '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Splunk notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -384,49 +405,46 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol[0], self.routing_key, self.entity_id,
+            self.secure_protocol[0],
+            self.routing_key,
+            self.entity_id,
             self.apikey,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'action': self.action,
+            "action": self.action,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Append our assignment extra's into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.mapping.items()})
+        params.update({f":{k.value}": v for k, v in self.mapping.items()})
 
-        return '{schema}://{routing_key}@{apikey}/{entity_id}?{params}'.format(
+        return "{schema}://{routing_key}@{apikey}/{entity_id}?{params}".format(
             schema=self.secure_protocol[0],
             routing_key=self.routing_key,
-            entity_id='' if self.entity_id == self.routing_key
-            else self.entity_id,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
+            entity_id=(
+                "" if self.entity_id == self.routing_key else self.entity_id
+            ),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
             params=NotifySplunk.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         # parse_url already handles getting the `user` and `password` fields
         # populated.
@@ -436,39 +454,45 @@ def parse_url(url):
             return results
 
         # Entity ID
-        if 'entity_id' in results['qsd'] and len(results['qsd']['entity_id']):
-            results['entity_id'] = \
-                NotifySplunk.unquote(results['qsd']['entity_id'])
+        if "entity_id" in results["qsd"] and len(results["qsd"]["entity_id"]):
+            results["entity_id"] = NotifySplunk.unquote(
+                results["qsd"]["entity_id"]
+            )
         else:
-            results['entity_id'] = NotifySplunk.unquote(results['fullpath'])
+            results["entity_id"] = NotifySplunk.unquote(results["fullpath"])
 
         # API Key
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
-            results['apikey'] = NotifySplunk.unquote(results['qsd']['apikey'])
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = NotifySplunk.unquote(results["qsd"]["apikey"])
 
         else:
-            results['apikey'] = NotifySplunk.unquote(results['host'])
+            results["apikey"] = NotifySplunk.unquote(results["host"])
 
         # Routing Key
-        if 'routing_key' in results['qsd'] \
-                and len(results['qsd']['routing_key']):
-            results['routing_key'] = \
-                NotifySplunk.unquote(results['qsd']['routing_key'])
+        if "routing_key" in results["qsd"] and len(
+            results["qsd"]["routing_key"]
+        ):
+            results["routing_key"] = NotifySplunk.unquote(
+                results["qsd"]["routing_key"]
+            )
 
-        elif 'route' in results['qsd'] and len(results['qsd']['route']):
-            results['routing_key'] = \
-                NotifySplunk.unquote(results['qsd']['route'])
+        elif "route" in results["qsd"] and len(results["qsd"]["route"]):
+            results["routing_key"] = NotifySplunk.unquote(
+                results["qsd"]["route"]
+            )
 
         else:
-            results['routing_key'] = NotifySplunk.unquote(results['user'])
+            results["routing_key"] = NotifySplunk.unquote(results["user"])
 
         # Store our action (if defined)
-        if 'action' in results['qsd'] and len(results['qsd']['action']):
-            results['action'] = NotifySplunk.unquote(results['qsd']['action'])
+        if "action" in results["qsd"] and len(results["qsd"]["action"]):
+            results["action"] = NotifySplunk.unquote(results["qsd"]["action"])
 
         # store any custom mapping defined
-        results['mapping'] = {NotifySplunk.unquote(x): NotifySplunk.unquote(y)
-                              for x, y in results['qsd:'].items()}
+        results["mapping"] = {
+            NotifySplunk.unquote(x): NotifySplunk.unquote(y)
+            for x, y in results["qsd:"].items()
+        }
 
         return results
 
@@ -480,21 +504,32 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://alert\.victorops\.com/integrations/generic/'
-            r'(?P<version>[0-9]+)/alert/(?P<apikey>[0-9a-z_-]+)'
-            r'(/(?P<routing_key>[^?/]+))'
-            r'(/(?P<entity_id>[^?]+))?/*'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://alert\.victorops\.com/integrations/generic/"
+            r"(?P<version>[0-9]+)/alert/(?P<apikey>[0-9a-z_-]+)"
+            r"(/(?P<routing_key>[^?/]+))"
+            r"(/(?P<entity_id>[^?]+))?/*"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifySplunk.parse_url(
-                '{schema}://{routing_key}@{apikey}/{entity_id}{params}'.format(
+                "{schema}://{routing_key}@{apikey}/{entity_id}{params}".format(
                     schema=NotifySplunk.secure_protocol[0],
-                    apikey=result.group('apikey'),
-                    routing_key=result.group('routing_key'),
-                    entity_id='' if not result.group('entity_id')
-                    else result.group('entity_id'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    apikey=result.group("apikey"),
+                    routing_key=result.group("routing_key"),
+                    entity_id=(
+                        ""
+                        if not result.group("entity_id")
+                        else result.group("entity_id")
+                    ),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/spugpush.py b/libs/apprise/plugins/spugpush.py
new file mode 100644
index 0000000000..3af8754f47
--- /dev/null
+++ b/libs/apprise/plugins/spugpush.py
@@ -0,0 +1,169 @@
+#
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Details at:
+# https://docs.spug.dev/push/
+
+import json
+import re
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import validate_regex
+from .base import NotifyBase
+
+
+class NotifySpugpush(NotifyBase):
+    """A wrapper for SpugPush Notifications."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("SpugPush")
+
+    # The services URL
+    service_url = "https://docs.spug.dev/push/"
+
+    # The default secure protocol
+    secure_protocol = "spugpush"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/spugpush/"
+
+    # URL used to send notifications with
+    notify_url = "https://push.spug.dev/send/"
+
+    templates = ("{schema}://{token}",)
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-zA-Z0-9_-]{32,64}$", "i"),
+            },
+        },
+    )
+
+    def __init__(self, token, **kwargs):
+        """Initialize SpugPush Object."""
+        super().__init__(**kwargs)
+
+        self.token = validate_regex(
+            token, *self.template_tokens["token"]["regex"]
+        )
+        if not self.token:
+            msg = f"The SpugPush token ({token}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        self.webhook_url = f"{self.notify_url}{self.token}"
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+        return (
+            f"{self.secure_protocol}://"
+            f"{self.pprint(self.token, privacy, mode=PrivacyMode.Secret)}/"
+            f"?{self.urlencode(params)}"
+        )
+
+    @property
+    def url_identifier(self):
+        """Returns a unique identifier for this plugin instance."""
+        return (self.secure_protocol, self.token)
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Send a SpugPush Notification."""
+
+        payload = {
+            "title": title if title else body,
+            "content": body,
+        }
+
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+        }
+
+        self.throttle()
+        try:
+            response = requests.post(
+                self.webhook_url,
+                headers=headers,
+                data=json.dumps(payload),
+                verify=self.verify_certificate,
+                timeout=self.request_timeout,
+            )
+
+            if response.status_code != requests.codes.ok:
+                self.logger.warning(
+                    "SpugPush notification failed: %d - %s",
+                    response.status_code,
+                    response.text,
+                )
+                return False
+
+        except requests.RequestException as e:
+            self.logger.warning(f"SpugPush Exception: {e}")
+            return False
+
+        self.logger.info("SpugPush notification sent successfully.")
+        return True
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns arguments to re-instantiate the
+        object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            return results
+
+        if "token" in results["qsd"] and results["qsd"]["token"]:
+            results["token"] = NotifySpugpush.unquote(results["qsd"]["token"])
+        else:
+            results["token"] = NotifySpugpush.unquote(results["host"])
+
+        return results
+
+    @staticmethod
+    def parse_native_url(url):
+        """Parse native SpugPush webhook URL into Apprise format."""
+        match = re.match(
+            r"^https://push\.spug\.dev/send/([a-z0-9_-]+)$", url, re.I
+        )
+        if not match:
+            return None
+
+        return NotifySpugpush.parse_url(
+            f"{NotifySpugpush.secure_protocol}://{match.group(1)}"
+        )
diff --git a/libs/apprise/plugins/streamlabs.py b/libs/apprise/plugins/streamlabs.py
index 49bbb5b954..e5d9ffdc00 100644
--- a/libs/apprise/plugins/streamlabs.py
+++ b/libs/apprise/plugins/streamlabs.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -38,16 +37,16 @@
 #
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 # calls
 class StrmlabsCall:
-    ALERT = 'ALERTS'
-    DONATION = 'DONATIONS'
+    ALERT = "ALERTS"
+    DONATION = "DONATIONS"
 
 
 # A List of calls we can use for verification
@@ -59,10 +58,10 @@ class StrmlabsCall:
 
 # alerts
 class StrmlabsAlert:
-    FOLLOW = 'follow'
-    SUBSCRIPTION = 'subscription'
-    DONATION = 'donation'
-    HOST = 'host'
+    FOLLOW = "follow"
+    SUBSCRIPTION = "subscription"
+    DONATION = "donation"
+    HOST = "host"
 
 
 # A List of calls we can use for verification
@@ -75,128 +74,133 @@ class StrmlabsAlert:
 
 
 class NotifyStreamlabs(NotifyBase):
-    """
-    A wrapper to Streamlabs Donation Notifications
+    """A wrapper to Streamlabs Donation Notifications."""
 
-    """
     # The default descriptive name associated with the Notification
-    service_name = 'Streamlabs'
+    service_name = "Streamlabs"
 
     # The services URL
-    service_url = 'https://streamlabs.com/'
+    service_url = "https://streamlabs.com/"
 
     # The default secure protocol
-    secure_protocol = 'strmlabs'
+    secure_protocol = "strmlabs"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_streamlabs'
+    setup_url = "https://appriseit.com/services/streamlabs/"
 
     # Streamlabs Api endpoint
-    notify_url = 'https://streamlabs.com/api/v1.0/'
+    notify_url = "https://streamlabs.com/api/v1.0/"
 
     # The maximum allowable characters allowed in the body per message
     body_maxlen = 255
 
     # Define object templates
-    templates = (
-        '{schema}://{access_token}/',
-    )
+    templates = ("{schema}://{access_token}/",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'access_token': {
-            'name': _('Access Token'),
-            'private': True,
-            'required': True,
-            'type': 'string',
-            'regex': (r'^[a-z0-9]{40}$', 'i')
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "access_token": {
+                "name": _("Access Token"),
+                "private": True,
+                "required": True,
+                "type": "string",
+                "regex": (r"^[a-z0-9]{40}$", "i"),
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'call': {
-            'name': _('Call'),
-            'type': 'choice:string',
-            'values': STRMLABS_CALLS,
-            'default': StrmlabsCall.ALERT,
-        },
-        'alert_type': {
-            'name': _('Alert Type'),
-            'type': 'choice:string',
-            'values': STRMLABS_ALERTS,
-            'default': StrmlabsAlert.DONATION,
-        },
-        'image_href': {
-            'name': _('Image Link'),
-            'type': 'string',
-            'default': '',
-        },
-        'sound_href': {
-            'name': _('Sound Link'),
-            'type': 'string',
-            'default': '',
-        },
-        'duration': {
-            'name': _('Duration'),
-            'type': 'int',
-            'default': 1000,
-            'min': 0
-        },
-        'special_text_color': {
-            'name': _('Special Text Color'),
-            'type': 'string',
-            'default': '',
-            'regex': (r'^[A-Z]$', 'i'),
-        },
-        'amount': {
-            'name': _('Amount'),
-            'type': 'int',
-            'default': 0,
-            'min': 0
-        },
-        'currency': {
-            'name': _('Currency'),
-            'type': 'string',
-            'default': 'USD',
-            'regex': (r'^[A-Z]{3}$', 'i'),
-        },
-        'name': {
-            'name': _('Name'),
-            'type': 'string',
-            'default': 'Anon',
-            'regex': (r'^[^\s].{1,24}$', 'i')
-        },
-        'identifier': {
-            'name': _('Identifier'),
-            'type': 'string',
-            'default': 'Apprise',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "call": {
+                "name": _("Call"),
+                "type": "choice:string",
+                "values": STRMLABS_CALLS,
+                "default": StrmlabsCall.ALERT,
+            },
+            "alert_type": {
+                "name": _("Alert Type"),
+                "type": "choice:string",
+                "values": STRMLABS_ALERTS,
+                "default": StrmlabsAlert.DONATION,
+            },
+            "image_href": {
+                "name": _("Image Link"),
+                "type": "string",
+                "default": "",
+            },
+            "sound_href": {
+                "name": _("Sound Link"),
+                "type": "string",
+                "default": "",
+            },
+            "duration": {
+                "name": _("Duration"),
+                "type": "int",
+                "default": 1000,
+                "min": 0,
+            },
+            "special_text_color": {
+                "name": _("Special Text Color"),
+                "type": "string",
+                "default": "",
+                "regex": (r"^[A-Z]$", "i"),
+            },
+            "amount": {
+                "name": _("Amount"),
+                "type": "int",
+                "default": 0,
+                "min": 0,
+            },
+            "currency": {
+                "name": _("Currency"),
+                "type": "string",
+                "default": "USD",
+                "regex": (r"^[A-Z]{3}$", "i"),
+            },
+            "name": {
+                "name": _("Name"),
+                "type": "string",
+                "default": "Anon",
+                "regex": (r"^[^\s].{1,24}$", "i"),
+            },
+            "identifier": {
+                "name": _("Identifier"),
+                "type": "string",
+                "default": "Apprise",
+            },
         },
-    })
-
-    def __init__(self, access_token,
-                 call=StrmlabsCall.ALERT,
-                 alert_type=StrmlabsAlert.DONATION,
-                 image_href='', sound_href='', duration=1000,
-                 special_text_color='',
-                 amount=0, currency='USD', name='Anon',
-                 identifier='Apprise',
-                 **kwargs):
-        """
-        Initialize Streamlabs Object
+    )
 
-        """
+    def __init__(
+        self,
+        access_token,
+        call=StrmlabsCall.ALERT,
+        alert_type=StrmlabsAlert.DONATION,
+        image_href="",
+        sound_href="",
+        duration=1000,
+        special_text_color="",
+        amount=0,
+        currency="USD",
+        name="Anon",
+        identifier="Apprise",
+        **kwargs,
+    ):
+        """Initialize Streamlabs Object."""
         super().__init__(**kwargs)
 
         # access token is generated by user
         # using https://streamlabs.com/api/v1.0/token
         # Tokens for Streamlabs never need to be refreshed.
         self.access_token = validate_regex(
-            access_token,
-            *self.template_tokens['access_token']['regex']
+            access_token, *self.template_tokens["access_token"]["regex"]
         )
         if not self.access_token:
-            msg = 'An invalid Streamslabs access token was specified.'
+            msg = "An invalid Streamslabs access token was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -209,11 +213,10 @@ def __init__(self, access_token,
                 self.call = call
         except Exception as e:
             # Invalid region specified
-            msg = 'The streamlabs call specified ({}) is invalid.' \
-                .format(call)
+            msg = f"The streamlabs call specified ({call}) is invalid."
             self.logger.warning(msg)
-            self.logger.debug('Socket Exception: %s' % str(e))
-            raise TypeError(msg)
+            self.logger.debug(f"Socket Exception: {e!s}")
+            raise TypeError(msg) from None
 
         # Store the alert_type
         # only applicable when calling /alerts
@@ -225,11 +228,10 @@ def __init__(self, access_token,
                 self.alert_type = alert_type
         except Exception as e:
             # Invalid region specified
-            msg = 'The streamlabs alert type specified ({}) is invalid.' \
-                .format(call)
+            msg = f"The streamlabs alert type specified ({call}) is invalid."
             self.logger.warning(msg)
-            self.logger.debug('Socket Exception: %s' % str(e))
-            raise TypeError(msg)
+            self.logger.debug(f"Socket Exception: {e!s}")
+            raise TypeError(msg) from None
 
         # params only applicable when calling /alerts
         self.image_href = image_href
@@ -245,24 +247,20 @@ def __init__(self, access_token,
         # The 3 letter currency code for this donation.
         # Must be one of the supported currency codes.
         self.currency = validate_regex(
-            currency,
-            *self.template_args['currency']['regex']
+            currency, *self.template_args["currency"]["regex"]
         )
 
         # only applicable when calling /donations
         if not self.currency:
-            msg = 'An invalid Streamslabs currency was specified.'
+            msg = "An invalid Streamslabs currency was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # only applicable when calling /donations
         # The name of the donor
-        self.name = validate_regex(
-            name,
-            *self.template_args['name']['regex']
-        )
+        self.name = validate_regex(name, *self.template_args["name"]["regex"])
         if not self.name:
-            msg = 'An invalid Streamslabs donor was specified.'
+            msg = "An invalid Streamslabs donor was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -273,25 +271,23 @@ def __init__(self, access_token,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Streamlabs notification call (either donation or alert)
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Streamlabs notification call (either donation or alert)"""
 
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
         if self.call == StrmlabsCall.ALERT:
 
             data = {
-                'access_token': self.access_token,
-                'type': self.alert_type.lower(),
-                'image_href': self.image_href,
-                'sound_href': self.sound_href,
-                'message': title,
-                'user_massage': body,
-                'duration': self.duration,
-                'special_text_color': self.special_text_color,
+                "access_token": self.access_token,
+                "type": self.alert_type.lower(),
+                "image_href": self.image_href,
+                "sound_href": self.sound_href,
+                "message": title,
+                "user_massage": body,
+                "duration": self.duration,
+                "special_text_color": self.special_text_color,
             }
 
             try:
@@ -300,43 +296,45 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     headers=headers,
                     data=data,
                     verify=self.verify_certificate,
+                    timeout=self.request_timeout,
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyStreamlabs.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyStreamlabs.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Streamlabs alert: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Streamlabs alert: "
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
                     return False
 
                 else:
-                    self.logger.info('Sent Streamlabs alert.')
+                    self.logger.info("Sent Streamlabs alert.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Streamlabs '
-                    'alert.'
+                    "A Connection error occurred sending Streamlabs alert."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
                 return False
 
         if self.call == StrmlabsCall.DONATION:
             data = {
-                'name': self.name,
-                'identifier': self.identifier,
-                'amount': self.amount,
-                'currency': self.currency,
-                'access_token': self.access_token,
-                'message': body,
+                "name": self.name,
+                "identifier": self.identifier,
+                "amount": self.amount,
+                "currency": self.currency,
+                "access_token": self.access_token,
+                "message": body,
             }
 
             try:
@@ -345,84 +343,81 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     headers=headers,
                     data=data,
                     verify=self.verify_certificate,
+                    timeout=self.request_timeout,
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyStreamlabs.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyStreamlabs.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Streamlabs donation: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Streamlabs donation: "
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                    self.logger.debug(f"Response Details:\r\n{r.content}")
                     return False
 
                 else:
-                    self.logger.info('Sent Streamlabs donation.')
+                    self.logger.info("Sent Streamlabs donation.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Streamlabs '
-                    'donation.'
+                    "A Connection error occurred sending Streamlabs donation."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
                 return False
 
         return True
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.access_token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'call': self.call,
+            "call": self.call,
             # donation
-            'name': self.name,
-            'identifier': self.identifier,
-            'amount': self.amount,
-            'currency': self.currency,
+            "name": self.name,
+            "identifier": self.identifier,
+            "amount": self.amount,
+            "currency": self.currency,
             # alert
-            'alert_type': self.alert_type,
-            'image_href': self.image_href,
-            'sound_href': self.sound_href,
-            'duration': self.duration,
-            'special_text_color': self.special_text_color,
+            "alert_type": self.alert_type,
+            "image_href": self.image_href,
+            "sound_href": self.sound_href,
+            "duration": self.duration,
+            "special_text_color": self.special_text_color,
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
-        return '{schema}://{access_token}/?{params}'.format(
+        return "{schema}://{access_token}/?{params}".format(
             schema=self.secure_protocol,
-            access_token=self.pprint(self.access_token, privacy, safe=''),
+            access_token=self.pprint(self.access_token, privacy, safe=""),
             params=NotifyStreamlabs.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object.
 
         Syntax:
           strmlabs://access_token
-
         """
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -430,49 +425,61 @@ def parse_url(url):
             return results
 
         # Store our access code
-        access_token = NotifyStreamlabs.unquote(results['host'])
-        results['access_token'] = access_token
+        access_token = NotifyStreamlabs.unquote(results["host"])
+        results["access_token"] = access_token
 
         # call
-        if 'call' in results['qsd'] and results['qsd']['call']:
-            results['call'] = NotifyStreamlabs.unquote(
-                results['qsd']['call'].strip().upper())
+        if "call" in results["qsd"] and results["qsd"]["call"]:
+            results["call"] = NotifyStreamlabs.unquote(
+                results["qsd"]["call"].strip().upper()
+            )
         # donation - amount
-        if 'amount' in results['qsd'] and results['qsd']['amount']:
-            results['amount'] = NotifyStreamlabs.unquote(
-                results['qsd']['amount'])
+        if "amount" in results["qsd"] and results["qsd"]["amount"]:
+            results["amount"] = NotifyStreamlabs.unquote(
+                results["qsd"]["amount"]
+            )
         # donation - currency
-        if 'currency' in results['qsd'] and results['qsd']['currency']:
-            results['currency'] = NotifyStreamlabs.unquote(
-                results['qsd']['currency'].strip().upper())
+        if "currency" in results["qsd"] and results["qsd"]["currency"]:
+            results["currency"] = NotifyStreamlabs.unquote(
+                results["qsd"]["currency"].strip().upper()
+            )
         # donation - name
-        if 'name' in results['qsd'] and results['qsd']['name']:
-            results['name'] = NotifyStreamlabs.unquote(
-                results['qsd']['name'].strip().upper())
+        if "name" in results["qsd"] and results["qsd"]["name"]:
+            results["name"] = NotifyStreamlabs.unquote(
+                results["qsd"]["name"].strip().upper()
+            )
         # donation - identifier
-        if 'identifier' in results['qsd'] and results['qsd']['identifier']:
-            results['identifier'] = NotifyStreamlabs.unquote(
-                results['qsd']['identifier'].strip().upper())
+        if "identifier" in results["qsd"] and results["qsd"]["identifier"]:
+            results["identifier"] = NotifyStreamlabs.unquote(
+                results["qsd"]["identifier"].strip().upper()
+            )
         # alert - alert_type
-        if 'alert_type' in results['qsd'] and results['qsd']['alert_type']:
-            results['alert_type'] = NotifyStreamlabs.unquote(
-                results['qsd']['alert_type'])
+        if "alert_type" in results["qsd"] and results["qsd"]["alert_type"]:
+            results["alert_type"] = NotifyStreamlabs.unquote(
+                results["qsd"]["alert_type"]
+            )
         # alert - image_href
-        if 'image_href' in results['qsd'] and results['qsd']['image_href']:
-            results['image_href'] = NotifyStreamlabs.unquote(
-                results['qsd']['image_href'])
+        if "image_href" in results["qsd"] and results["qsd"]["image_href"]:
+            results["image_href"] = NotifyStreamlabs.unquote(
+                results["qsd"]["image_href"]
+            )
         # alert - sound_href
-        if 'sound_href' in results['qsd'] and results['qsd']['sound_href']:
-            results['sound_href'] = NotifyStreamlabs.unquote(
-                results['qsd']['sound_href'].strip().upper())
+        if "sound_href" in results["qsd"] and results["qsd"]["sound_href"]:
+            results["sound_href"] = NotifyStreamlabs.unquote(
+                results["qsd"]["sound_href"].strip().upper()
+            )
         # alert - duration
-        if 'duration' in results['qsd'] and results['qsd']['duration']:
-            results['duration'] = NotifyStreamlabs.unquote(
-                results['qsd']['duration'].strip().upper())
+        if "duration" in results["qsd"] and results["qsd"]["duration"]:
+            results["duration"] = NotifyStreamlabs.unquote(
+                results["qsd"]["duration"].strip().upper()
+            )
         # alert - special_text_color
-        if 'special_text_color' in results['qsd'] \
-                and results['qsd']['special_text_color']:
-            results['special_text_color'] = NotifyStreamlabs.unquote(
-                results['qsd']['special_text_color'].strip().upper())
+        if (
+            "special_text_color" in results["qsd"]
+            and results["qsd"]["special_text_color"]
+        ):
+            results["special_text_color"] = NotifyStreamlabs.unquote(
+                results["qsd"]["special_text_color"].strip().upper()
+            )
 
         return results
diff --git a/libs/apprise/plugins/synology.py b/libs/apprise/plugins/synology.py
index 63161c52a0..1204595c21 100644
--- a/libs/apprise/plugins/synology.py
+++ b/libs/apprise/plugins/synology.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,37 +25,36 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
-from ..url import PrivacyMode
+import requests
+
 from ..common import NotifyType
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from .base import NotifyBase
 
 # For API Details see:
 # https://kb.synology.com/en-au/DSM/help/Chat/chat_integration
 
 
 class NotifySynology(NotifyBase):
-    """
-    A wrapper for Synology Chat Notifications
-    """
+    """A wrapper for Synology Chat Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Synology Chat'
+    service_name = "Synology Chat"
 
     # The services URL
-    service_url = 'https://www.synology.com/'
+    service_url = "https://www.synology.com/"
 
     # The default protocol
-    protocol = 'synology'
+    protocol = "synology"
 
     # The default secure protocol
-    secure_protocol = 'synologys'
+    secure_protocol = "synologys"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_synology_chat'
+    setup_url = "https://appriseit.com/services/synology_chat/"
 
     # Title is to be part of body
     title_maxlen = 0
@@ -67,83 +65,86 @@ class NotifySynology(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{token}',
-        '{schema}://{host}:{port}/{token}',
-        '{schema}://{user}@{host}/{token}',
-        '{schema}://{user}@{host}:{port}/{token}',
-        '{schema}://{user}:{password}@{host}/{token}',
-        '{schema}://{user}:{password}@{host}:{port}/{token}',
+        "{schema}://{host}/{token}",
+        "{schema}://{host}:{port}/{token}",
+        "{schema}://{user}@{host}/{token}",
+        "{schema}://{user}@{host}:{port}/{token}",
+        "{schema}://{user}:{password}@{host}/{token}",
+        "{schema}://{user}:{password}@{host}:{port}/{token}",
     )
 
     # Define our tokens; these are the minimum tokens required required to
     # be passed into this function (as arguments). The syntax appends any
     # previously defined in the base package and builds onto them
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "required": True,
+                "private": True,
+            },
         },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-        },
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'file_url': {
-            'name': _('Upload'),
-            'type': 'string',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "file_url": {
+                "name": _("Upload"),
+                "type": "string",
+            },
+            "token": {
+                "alias_of": "token",
+            },
         },
-        'token': {
-            'alias_of': 'token',
-        },
-    })
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'headers': {
-            'name': _('HTTP Header'),
-            'prefix': '+',
+        "headers": {
+            "name": _("HTTP Header"),
+            "prefix": "+",
         },
     }
 
     def __init__(self, token=None, headers=None, file_url=None, **kwargs):
-        """
-        Initialize Synology Chat Object
+        """Initialize Synology Chat Object.
 
         headers can be a dictionary of key/value pairs that you want to
         additionally include as part of the server headers to post with
-
         """
         super().__init__(**kwargs)
 
         self.token = token
         if not self.token:
-            msg = 'An invalid Synology Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid Synology Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-        self.fullpath = kwargs.get('fullpath')
+        self.fullpath = kwargs.get("fullpath")
 
         # A URL to an attachment you want to upload (must be less then 32MB
         # Acording to API details (at the time of writing plugin)
@@ -158,74 +159,83 @@ def __init__(self, token=None, headers=None, file_url=None, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port, self.token,
-            self.fullpath.rstrip('/'),
+            self.user,
+            self.password,
+            self.host,
+            self.port,
+            self.token,
+            self.fullpath.rstrip("/"),
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
 
         if self.file_url:
-            params['file_url'] = self.file_url
+            params["file_url"] = self.file_url
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Append our headers into our parameters
-        params.update({'+{}'.format(k): v for k, v in self.headers.items()})
+        params.update({f"+{k}": v for k, v in self.headers.items()})
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifySynology.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifySynology.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifySynology.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifySynology.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
 
-        return '{schema}://{auth}{hostname}{port}/{token}' \
-            '{fullpath}?{params}'.format(
+        return (
+            "{schema}://{auth}{hostname}{port}/{token}"
+            "{fullpath}?{params}".format(
                 schema=self.secure_protocol if self.secure else self.protocol,
                 auth=auth,
                 # never encode hostname since we're expecting it to be a valid
                 # one
                 hostname=self.host,
-                port='' if self.port is None or self.port == default_port
-                     else ':{}'.format(self.port),
-                token=self.pprint(self.token, privacy, safe=''),
-                fullpath=NotifySynology.quote(self.fullpath, safe='/')
-                if self.fullpath else '/',
+                port=(
+                    ""
+                    if self.port is None or self.port == default_port
+                    else f":{self.port}"
+                ),
+                token=self.pprint(self.token, privacy, safe=""),
+                fullpath=(
+                    NotifySynology.quote(self.fullpath, safe="/")
+                    if self.fullpath
+                    else "/"
+                ),
                 params=NotifySynology.urlencode(params),
             )
+        )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Synology Chat Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Synology Chat Notification."""
 
         # Prepare HTTP Headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Accept': '*/*',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Accept": "*/*",
         }
 
         # Apply any/all header over-rides defined
@@ -233,18 +243,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # prepare Synology Object
         payload = {
-            'text': body,
+            "text": body,
         }
 
         if self.file_url:
-            payload['file_url'] = self.file_url
+            payload["file_url"] = self.file_url
 
         # Prepare our parameters
         params = {
-            'api': 'SYNO.Chat.External',
-            'method': 'incoming',
-            'version': 2,
-            'token': self.token,
+            "api": "SYNO.Chat.External",
+            "method": "incoming",
+            "version": 2,
+            "token": self.token,
         }
 
         auth = None
@@ -252,19 +262,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             auth = (self.user, self.password)
 
         # Set our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         # Prepare our Synology API URL
-        url += self.fullpath + '/webapi/entry.cgi'
+        url += self.fullpath + "/webapi/entry.cgi"
 
-        self.logger.debug('Synology Chat POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Synology Chat Payload: %s' % str(payload))
+        self.logger.debug(
+            "Synology Chat POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Synology Chat Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -281,29 +292,33 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code < 200 or r.status_code >= 300:
                 # We had a problem
-                status_str = \
-                    NotifySynology.http_response_code_lookup(r.status_code)
+                status_str = NotifySynology.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Synology Chat %s notification: '
-                    '%serror=%s.',
+                    "Failed to send Synology Chat %s notification: "
+                    "%serror=%s.",
                     status_str,
-                    ', ' if status_str else '',
-                    str(r.status_code))
+                    ", " if status_str else "",
+                    r.status_code,
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent Synology Chat notification.')
+                self.logger.info("Sent Synology Chat notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Synology '
-                'Chat notification to %s.' % self.host)
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Synology "
+                f"Chat notification to {self.host}."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -312,11 +327,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
@@ -324,28 +336,31 @@ def parse_url(url):
 
         # Add our headers that the user can potentially over-ride if they wish
         # to to our returned result set and tidy entries by unquoting them
-        results['headers'] = {
+        results["headers"] = {
             NotifySynology.unquote(x): NotifySynology.unquote(y)
-            for x, y in results['qsd+'].items()}
+            for x, y in results["qsd+"].items()
+        }
 
         # Set our token if found as an argument
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
-            results['token'] = NotifySynology.unquote(results['qsd']['token'])
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifySynology.unquote(results["qsd"]["token"])
 
         else:
             # Get unquoted entries
-            entries = NotifySynology.split_path(results['fullpath'])
+            entries = NotifySynology.split_path(results["fullpath"])
             if entries:
                 # Pop the first element
-                results['token'] = entries.pop(0)
+                results["token"] = entries.pop(0)
 
                 # Update our fullpath to not include our token
-                results['fullpath'] = \
-                    results['fullpath'][len(results['token']) + 1:]
+                results["fullpath"] = results["fullpath"][
+                    len(results["token"]) + 1:
+                ]
 
         # Set upload/file_url if not otherwise set
-        if 'file_url' in results['qsd'] and len(results['qsd']['file_url']):
-            results['file_url'] = \
-                NotifySynology.unquote(results['qsd']['file_url'])
+        if "file_url" in results["qsd"] and len(results["qsd"]["file_url"]):
+            results["file_url"] = NotifySynology.unquote(
+                results["qsd"]["file_url"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/syslog.py b/libs/apprise/plugins/syslog.py
index fc6af06ae0..8623f59c5c 100644
--- a/libs/apprise/plugins/syslog.py
+++ b/libs/apprise/plugins/syslog.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,34 +27,33 @@
 
 import syslog
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import parse_bool
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 
 class SyslogFacility:
-    """
-    All of the supported facilities
-    """
-    KERN = 'kern'
-    USER = 'user'
-    MAIL = 'mail'
-    DAEMON = 'daemon'
-    AUTH = 'auth'
-    SYSLOG = 'syslog'
-    LPR = 'lpr'
-    NEWS = 'news'
-    UUCP = 'uucp'
-    CRON = 'cron'
-    LOCAL0 = 'local0'
-    LOCAL1 = 'local1'
-    LOCAL2 = 'local2'
-    LOCAL3 = 'local3'
-    LOCAL4 = 'local4'
-    LOCAL5 = 'local5'
-    LOCAL6 = 'local6'
-    LOCAL7 = 'local7'
+    """All of the supported facilities."""
+
+    KERN = "kern"
+    USER = "user"
+    MAIL = "mail"
+    DAEMON = "daemon"
+    AUTH = "auth"
+    SYSLOG = "syslog"
+    LPR = "lpr"
+    NEWS = "news"
+    UUCP = "uucp"
+    CRON = "cron"
+    LOCAL0 = "local0"
+    LOCAL1 = "local1"
+    LOCAL2 = "local2"
+    LOCAL3 = "local3"
+    LOCAL4 = "local4"
+    LOCAL5 = "local5"
+    LOCAL6 = "local6"
+    LOCAL7 = "local7"
 
 
 SYSLOG_FACILITY_MAP = {
@@ -110,21 +108,19 @@ class SyslogFacility:
 
 
 class NotifySyslog(NotifyBase):
-    """
-    A wrapper for Syslog Notifications
-    """
+    """A wrapper for Syslog Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Syslog'
+    service_name = "Syslog"
 
     # The services URL
-    service_url = 'https://tools.ietf.org/html/rfc5424'
+    service_url = "https://tools.ietf.org/html/rfc5424"
 
     # The default protocol
-    protocol = 'syslog'
+    protocol = "syslog"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_syslog'
+    setup_url = "https://appriseit.com/services/syslog/"
 
     # No URL Identifier will be defined for this service as there simply isn't
     # enough details to uniquely identify one dbus:// from another.
@@ -136,45 +132,50 @@ class NotifySyslog(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://',
-        '{schema}://{facility}',
+        "{schema}://",
+        "{schema}://{facility}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'facility': {
-            'name': _('Facility'),
-            'type': 'choice:string',
-            'values': [k for k in SYSLOG_FACILITY_MAP.keys()],
-            'default': SyslogFacility.USER,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "facility": {
+                "name": _("Facility"),
+                "type": "choice:string",
+                "values": list(SYSLOG_FACILITY_MAP),
+                "default": SyslogFacility.USER,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'facility': {
-            # We map back to the same element defined in template_tokens
-            'alias_of': 'facility',
-        },
-        'logpid': {
-            'name': _('Log PID'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'log_pid',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "facility": {
+                # We map back to the same element defined in template_tokens
+                "alias_of": "facility",
+            },
+            "logpid": {
+                "name": _("Log PID"),
+                "type": "bool",
+                "default": True,
+                "map_to": "log_pid",
+            },
+            "logperror": {
+                "name": _("Log to STDERR"),
+                "type": "bool",
+                "default": False,
+                "map_to": "log_perror",
+            },
         },
-        'logperror': {
-            'name': _('Log to STDERR'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'log_perror',
-        },
-    })
+    )
 
-    def __init__(self, facility=None, log_pid=True, log_perror=False,
-                 **kwargs):
-        """
-        Initialize Syslog Object
-        """
+    def __init__(
+        self, facility=None, log_pid=True, log_perror=False, **kwargs
+    ):
+        """Initialize Syslog Object."""
         super().__init__(**kwargs)
 
         if facility:
@@ -182,14 +183,13 @@ def __init__(self, facility=None, log_pid=True, log_perror=False,
                 self.facility = SYSLOG_FACILITY_MAP[facility]
 
             except KeyError:
-                msg = 'An invalid syslog facility ' \
-                      '({}) was specified.'.format(facility)
+                msg = f"An invalid syslog facility ({facility}) was specified."
                 self.logger.warning(msg)
-                raise TypeError(msg)
+                raise TypeError(msg) from None
         else:
-            self.facility = \
-                SYSLOG_FACILITY_MAP[
-                    self.template_tokens['facility']['default']]
+            self.facility = SYSLOG_FACILITY_MAP[
+                self.template_tokens["facility"]["default"]
+            ]
 
         # Logging Options
         self.logoptions = 0
@@ -211,13 +211,12 @@ def __init__(self, facility=None, log_pid=True, log_perror=False,
 
         # Initialize our logging
         syslog.openlog(
-            self.app_id, logoption=self.logoptions, facility=self.facility)
+            self.app_id, logoption=self.logoptions, facility=self.facility
+        )
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Syslog Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Syslog Notification."""
 
         SYSLOG_PUBLISH_MAP = {
             NotifyType.INFO: syslog.LOG_INFO,
@@ -228,7 +227,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         if title:
             # Format title
-            body = '{}: {}'.format(title, body)
+            body = f"{title}: {body}"
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -238,54 +237,51 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         except KeyError:
             # An invalid notification type was specified
             self.logger.warning(
-                'An invalid notification type '
-                '({}) was specified.'.format(notify_type))
+                f"An invalid notification type ({notify_type}) was specified."
+            )
             return False
 
-        self.logger.info('Sent Syslog notification.')
+        self.logger.info("Sent Syslog notification.")
 
         return True
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'logperror': 'yes' if self.log_perror else 'no',
-            'logpid': 'yes' if self.log_pid else 'no',
+            "logperror": "yes" if self.log_perror else "no",
+            "logpid": "yes" if self.log_pid else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{facility}/?{params}'.format(
-            facility=self.template_tokens['facility']['default']
-            if self.facility not in SYSLOG_FACILITY_RMAP
-            else SYSLOG_FACILITY_RMAP[self.facility],
+        return "{schema}://{facility}/?{params}".format(
+            facility=(
+                self.template_tokens["facility"]["default"]
+                if self.facility not in SYSLOG_FACILITY_RMAP
+                else SYSLOG_FACILITY_RMAP[self.facility]
+            ),
             schema=self.protocol,
             params=NotifySyslog.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         tokens = []
-        if results['host']:
-            tokens.append(NotifySyslog.unquote(results['host']))
+        if results["host"]:
+            tokens.append(NotifySyslog.unquote(results["host"]))
 
         # Get our path values
-        tokens.extend(NotifySyslog.split_path(results['fullpath']))
+        tokens.extend(NotifySyslog.split_path(results["fullpath"]))
 
         # Initialization
         facility = None
@@ -296,8 +292,8 @@ def parse_url(url):
 
         # However if specified on the URL, that will over-ride what was
         # identified
-        if 'facility' in results['qsd'] and len(results['qsd']['facility']):
-            facility = results['qsd']['facility'].lower()
+        if "facility" in results["qsd"] and len(results["qsd"]["facility"]):
+            facility = results["qsd"]["facility"].lower()
 
         if facility and facility not in SYSLOG_FACILITY_MAP:
             # Find first match; if no match is found we set the result
@@ -305,23 +301,27 @@ def parse_url(url):
             # during the __init__() call. The benifit of doing this
             # check here is if we do have a valid match, we can support
             # short form matches like 'u' which will match against user
-            facility = next((f for f in SYSLOG_FACILITY_MAP.keys()
-                             if f.startswith(facility)), facility)
+            facility = next(
+                (f for f in SYSLOG_FACILITY_MAP if f.startswith(facility)),
+                facility,
+            )
 
         # Save facility if set
         if facility:
-            results['facility'] = facility
+            results["facility"] = facility
 
         # Include PID as part of the message logged
-        results['log_pid'] = parse_bool(
-            results['qsd'].get(
-                'logpid',
-                NotifySyslog.template_args['logpid']['default']))
+        results["log_pid"] = parse_bool(
+            results["qsd"].get(
+                "logpid", NotifySyslog.template_args["logpid"]["default"]
+            )
+        )
 
         # Print to stderr as well.
-        results['log_perror'] = parse_bool(
-            results['qsd'].get(
-                'logperror',
-                NotifySyslog.template_args['logperror']['default']))
+        results["log_perror"] = parse_bool(
+            results["qsd"].get(
+                "logperror", NotifySyslog.template_args["logperror"]["default"]
+            )
+        )
 
         return results
diff --git a/libs/apprise/plugins/techuluspush.py b/libs/apprise/plugins/techuluspush.py
index 61b31105c6..1e37b2a84c 100644
--- a/libs/apprise/plugins/techuluspush.py
+++ b/libs/apprise/plugins/techuluspush.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -50,95 +49,93 @@
 # - https://push.techulus.com/ - Main Website
 # - https://pushtechulus.docs.apiary.io - API Documentation
 
-import requests
 from json import dumps
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 # Token required as part of the API request
 # Used to prepare our UUID regex matching
-UUID4_RE = \
-    r'[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}'
+UUID4_RE = (
+    r"[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
+)
 
 
 class NotifyTechulusPush(NotifyBase):
-    """
-    A wrapper for Techulus Push Notifications
-    """
+    """A wrapper for Techulus Push Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Techulus Push'
+    service_name = "Techulus Push"
 
     # The services URL
-    service_url = 'https://push.techulus.com'
+    service_url = "https://push.techulus.com"
 
     # The default secure protocol
-    secure_protocol = 'push'
+    secure_protocol = "push"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_techulus'
+    setup_url = "https://appriseit.com/services/techulus/"
 
     # Techulus Push uses the http protocol with JSON requests
-    notify_url = 'https://push.techulus.com/api/v1/notify'
+    notify_url = "https://push.techulus.com/api/v1/notify"
 
     # The maximum allowable characters allowed in the body per message
     body_maxlen = 1000
 
     # Define object templates
-    templates = (
-        '{schema}://{apikey}',
-    )
+    templates = ("{schema}://{apikey}",)
 
     # Define our template apikeys
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^{}$'.format(UUID4_RE), 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (rf"^{UUID4_RE}$", "i"),
+            },
         },
-    })
+    )
 
     def __init__(self, apikey, **kwargs):
-        """
-        Initialize Techulus Push Object
-        """
+        """Initialize Techulus Push Object."""
         super().__init__(**kwargs)
 
         # The apikey associated with the account
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Techulus Push API key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Techulus Push API key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Techulus Push Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Techulus Push Notification."""
 
         # Setup our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'x-api-key': self.apikey,
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "x-api-key": self.apikey,
         }
 
         payload = {
-            'title': title,
-            'body': body,
+            "title": title,
+            "body": body,
         }
 
-        self.logger.debug('Techulus Push POST URL: %s (cert_verify=%r)' % (
-            self.notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Techulus Push Payload: %s' % str(payload))
+        self.logger.debug(
+            "Techulus Push POST URL:"
+            f" {self.notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Techulus Push Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -151,34 +148,35 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 timeout=self.request_timeout,
             )
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyTechulusPush.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyTechulusPush.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Techulus Push notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Techulus Push notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False
 
             else:
-                self.logger.info(
-                    'Sent Techulus Push notification.')
+                self.logger.info("Sent Techulus Push notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Techulus Push '
-                'notification.'
+                "A Connection error occurred sending Techulus Push "
+                "notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False
 
@@ -186,40 +184,35 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.apikey)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{apikey}/?{params}'.format(
+        return "{schema}://{apikey}/?{params}".format(
             schema=self.secure_protocol,
-            apikey=self.pprint(self.apikey, privacy, safe=''),
+            apikey=self.pprint(self.apikey, privacy, safe=""),
             params=NotifyTechulusPush.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The first apikey is stored in the hostname
-        results['apikey'] = NotifyTechulusPush.unquote(results['host'])
+        results["apikey"] = NotifyTechulusPush.unquote(results["host"])
 
         return results
diff --git a/libs/apprise/plugins/telegram.py b/libs/apprise/plugins/telegram.py
index d6c29aeba5..d267bc490e 100644
--- a/libs/apprise/plugins/telegram.py
+++ b/libs/apprise/plugins/telegram.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -52,21 +51,22 @@
 #
 # Development API Reference::
 #  - https://core.telegram.org/bots/api
-import requests
-import re
+from json import dumps, loads
 import os
+import re
 
-from json import loads
-from json import dumps
+import requests
 
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyImageSize
-from ..common import NotifyFormat
-from ..common import PersistentStoreMode
-from ..utils.parse import parse_bool, parse_list, validate_regex
-from ..locale import gettext_lazy as _
 from ..attachment.base import AttachBase
+from ..common import (
+    NotifyFormat,
+    NotifyImageSize,
+    NotifyType,
+    PersistentStoreMode,
+)
+from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
 TELEGRAM_IMAGE_XY = NotifyImageSize.XY_256
 
@@ -75,21 +75,20 @@
 # If the Chat ID is negative, then it's targeting a group
 # We can support :topic (an integer) if specified as well
 IS_CHAT_ID_RE = re.compile(
-    r'^((?P<idno>-?[0-9]{1,32})|(@|%40)?(?P<name>[a-z_-][a-z0-9_-]+))'
-    r'((:|%3A)(?P<topic>[0-9]+))?$',
+    r"^((?P<idno>-?[0-9]{1,32})|(@|%40)?(?P<name>[a-z_-][a-z0-9_-]+))"
+    r"((:|%3A)(?P<topic>[0-9]+))?$",
     re.IGNORECASE,
 )
 
 
 class TelegramMarkdownVersion:
-    """
-    Telegram Markdown Version
-    """
+    """Telegram Markdown Version."""
+
     # Classic (Original Telegram Markdown)
-    ONE = 'MARKDOWN'
+    ONE = "MARKDOWN"
 
     # Supports strikethrough and many other items
-    TWO = 'MarkdownV2'
+    TWO = "MarkdownV2"
 
 
 TELEGRAM_MARKDOWN_VERSION_MAP = {
@@ -104,15 +103,14 @@ class TelegramMarkdownVersion:
 
 TELEGRAM_MARKDOWN_VERSIONS = {
     # Note: This also acts as a reverse lookup mapping
-    TelegramMarkdownVersion.ONE: 'v1',
-    TelegramMarkdownVersion.TWO: 'v2',
+    TelegramMarkdownVersion.ONE: "v1",
+    TelegramMarkdownVersion.TWO: "v2",
 }
 
 
 class TelegramContentPlacement:
-    """
-    The Telegram Content Placement
-    """
+    """The Telegram Content Placement."""
+
     # Before Attachments
     BEFORE = "before"
     # After Attachments
@@ -127,26 +125,25 @@ class TelegramContentPlacement:
 
 
 class NotifyTelegram(NotifyBase):
-    """
-    A wrapper for Telegram Notifications
-    """
+    """A wrapper for Telegram Notifications."""
+
     # The default descriptive name associated with the Notification
-    service_name = 'Telegram'
+    service_name = "Telegram"
 
     # The services URL
-    service_url = 'https://telegram.org/'
+    service_url = "https://telegram.org/"
 
     # The default secure protocol
-    secure_protocol = 'tgram'
+    secure_protocol = "tgram"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_telegram'
+    setup_url = "https://appriseit.com/services/telegram/"
 
     # Default Notify Format
     notify_format = NotifyFormat.HTML
 
     # Telegram uses the http protocol with JSON requests
-    notify_url = 'https://api.telegram.org/bot'
+    notify_url = "https://api.telegram.org/bot"
 
     # Support attachments
     attachment_support = True
@@ -157,6 +154,11 @@ class NotifyTelegram(NotifyBase):
     # The maximum allowable characters allowed in the body per message
     body_maxlen = 4096
 
+    # The maximum number of characters a telegram attachment caption can be
+    # If an attachment is provided and the body is within the caption limit
+    # then it is captioned with the attachment instead.
+    telegram_caption_maxlen = 1024
+
     # Title is to be part of body
     title_maxlen = 0
 
@@ -169,63 +171,57 @@ class NotifyTelegram(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{bot_token}',
-        '{schema}://{bot_token}/{targets}',
+        "{schema}://{bot_token}",
+        "{schema}://{bot_token}/{targets}",
     )
 
     # Telegram Attachment Support
     mime_lookup = (
         # This list is intentionally ordered so that it can be scanned
         # from top to bottom.  The last entry is a catch-all
-
         # Animations are documented to only support gif or H.264/MPEG-4
         # Source: https://core.telegram.org/bots/api#sendanimation
         {
-            'regex': re.compile(r'^(image/gif|video/H264)', re.I),
-            'function_name': 'sendAnimation',
-            'key': 'animation',
+            "regex": re.compile(r"^(image/gif|video/H264)", re.I),
+            "function_name": "sendAnimation",
+            "key": "animation",
         },
-
         # This entry is intentially placed below the sendAnimiation allowing
         # it to catch gif files.  This then becomes a catch all to remaining
         # image types.
         # Source: https://core.telegram.org/bots/api#sendphoto
         {
-            'regex': re.compile(r'^image/.*', re.I),
-            'function_name': 'sendPhoto',
-            'key': 'photo',
+            "regex": re.compile(r"^image/.*", re.I),
+            "function_name": "sendPhoto",
+            "key": "photo",
         },
-
         # Video is documented to only support .mp4
         # Source: https://core.telegram.org/bots/api#sendvideo
         {
-            'regex': re.compile(r'^video/mp4', re.I),
-            'function_name': 'sendVideo',
-            'key': 'video',
+            "regex": re.compile(r"^video/mp4", re.I),
+            "function_name": "sendVideo",
+            "key": "video",
         },
-
         # Voice supports ogg
         # Source: https://core.telegram.org/bots/api#sendvoice
         {
-            'regex': re.compile(r'^(application|audio)/ogg', re.I),
-            'function_name': 'sendVoice',
-            'key': 'voice',
+            "regex": re.compile(r"^(application|audio)/ogg", re.I),
+            "function_name": "sendVoice",
+            "key": "voice",
         },
-
         # Audio supports mp3 and m4a only
         # Source: https://core.telegram.org/bots/api#sendaudio
         {
-            'regex': re.compile(r'^audio/(mpeg|mp4a-latm)', re.I),
-            'function_name': 'sendAudio',
-            'key': 'audio',
+            "regex": re.compile(r"^audio/(mpeg|mp4a-latm)", re.I),
+            "function_name": "sendAudio",
+            "key": "audio",
         },
-
         # Catch All (all other types)
         # Source: https://core.telegram.org/bots/api#senddocument
         {
-            'regex': re.compile(r'.*', re.I),
-            'function_name': 'sendDocument',
-            'key': 'document',
+            "regex": re.compile(r".*", re.I),
+            "function_name": "sendDocument",
+            "key": "document",
         },
     )
 
@@ -235,197 +231,252 @@ class NotifyTelegram(NotifyBase):
     # output the user expected
     __telegram_escape_html_entries = (
         # Comments
-        (re.compile(
-            r'\s*<!.+?-->\s*',
-            (re.I | re.M | re.S)), '', {}),
-
+        (re.compile(r"\s*<!.+?-->\s*", (re.I | re.M | re.S)), "", {}),
         # the following tags are not supported
-        (re.compile(
-            r'\s*<\s*(!?DOCTYPE|p|div|span|body|script|link|'
-            r'meta|html|font|head|label|form|input|textarea|select|iframe|'
-            r'source|script)([^a-z0-9>][^>]*)?>\s*',
-            (re.I | re.M | re.S)), '', {}),
-
+        (
+            re.compile(
+                r"\s*<\s*(!?DOCTYPE|p|div|span|body|script|link|"
+                r"meta|html|font|head|label|form|input|textarea|select|iframe|"
+                r"source|script)([^a-z0-9>][^>]*)?>\s*",
+                (re.I | re.M | re.S),
+            ),
+            "",
+            {},
+        ),
         # All closing tags to be removed are put here
-        (re.compile(
-            r'\s*<\s*/(span|body|script|meta|html|font|head|'
-            r'label|form|input|textarea|select|ol|ul|link|'
-            r'iframe|source|script)([^a-z0-9>][^>]*)?>\s*',
-            (re.I | re.M | re.S)), '', {}),
-
+        (
+            re.compile(
+                r"\s*<\s*/(span|body|script|meta|html|font|head|"
+                r"label|form|input|textarea|select|ol|ul|link|"
+                r"iframe|source|script)([^a-z0-9>][^>]*)?>\s*",
+                (re.I | re.M | re.S),
+            ),
+            "",
+            {},
+        ),
         # Bold
-        (re.compile(
-            r'<\s*(strong)([^a-z0-9>][^>]*)?>',
-            (re.I | re.M | re.S)), '<b>', {}),
-        (re.compile(
-            r'<\s*/\s*(strong)([^a-z0-9>][^>]*)?>',
-            (re.I | re.M | re.S)), '</b>', {}),
-        (re.compile(
-            r'\s*<\s*(h[1-6]|title)([^a-z0-9>][^>]*)?>\s*',
-            (re.I | re.M | re.S)), '{}<b>', {'html': '\r\n'}),
-        (re.compile(
-            r'\s*<\s*/\s*(h[1-6]|title)([^a-z0-9>][^>]*)?>\s*',
-            (re.I | re.M | re.S)),
-            '</b>{}', {'html': '<br/>'}),
-
+        (
+            re.compile(
+                r"<\s*(strong)([^a-z0-9>][^>]*)?>", (re.I | re.M | re.S)
+            ),
+            "<b>",
+            {},
+        ),
+        (
+            re.compile(
+                r"<\s*/\s*(strong)([^a-z0-9>][^>]*)?>", (re.I | re.M | re.S)
+            ),
+            "</b>",
+            {},
+        ),
+        (
+            re.compile(
+                r"\s*<\s*(h[1-6]|title)([^a-z0-9>][^>]*)?>\s*",
+                (re.I | re.M | re.S),
+            ),
+            "{}<b>",
+            {"html": "\r\n"},
+        ),
+        (
+            re.compile(
+                r"\s*<\s*/\s*(h[1-6]|title)([^a-z0-9>][^>]*)?>\s*",
+                (re.I | re.M | re.S),
+            ),
+            "</b>{}",
+            {"html": "<br/>"},
+        ),
         # Italic
-        (re.compile(
-            r'<\s*(caption|em)([^a-z0-9>][^>]*)?>',
-            (re.I | re.M | re.S)), '<i>', {}),
-        (re.compile(
-            r'<\s*/\s*(caption|em)([^a-z0-9>][^>]*)?>',
-            (re.I | re.M | re.S)), '</i>', {}),
-
+        (
+            re.compile(
+                r"<\s*(caption|em)([^a-z0-9>][^>]*)?>", (re.I | re.M | re.S)
+            ),
+            "<i>",
+            {},
+        ),
+        (
+            re.compile(
+                r"<\s*/\s*(caption|em)([^a-z0-9>][^>]*)?>",
+                (re.I | re.M | re.S),
+            ),
+            "</i>",
+            {},
+        ),
         # Bullet Lists
-        (re.compile(
-            r'<\s*li([^a-z0-9>][^>]*)?>\s*',
-            (re.I | re.M | re.S)), ' -', {}),
-
-        # convert pre tags to code (supported by Telegram)
-        (re.compile(
-            r'<\s*pre([^a-z0-9>][^>]*)?>',
-            (re.I | re.M | re.S)), '{}<code>', {'html': '\r\n'}),
-        (re.compile(
-            r'<\s*/\s*pre([^a-z0-9>][^>]*)?>',
-            (re.I | re.M | re.S)), '</code>{}', {'html': '\r\n'}),
-
+        (
+            re.compile(r"<\s*li([^a-z0-9>][^>]*)?>\s*", (re.I | re.M | re.S)),
+            " -",
+            {},
+        ),
         # New Lines
-        (re.compile(
-            r'\s*<\s*/?\s*(ol|ul|br|hr)\s*/?>\s*',
-            (re.I | re.M | re.S)), '\r\n', {}),
-        (re.compile(
-            r'\s*<\s*/\s*(br|p|hr|li|div)([^a-z0-9>][^>]*)?>\s*',
-            (re.I | re.M | re.S)), '\r\n', {}),
-
+        (
+            re.compile(
+                r"\s*<\s*/?\s*(ol|ul|br|hr)\s*/?>\s*", (re.I | re.M | re.S)
+            ),
+            "\r\n",
+            {},
+        ),
+        (
+            re.compile(
+                r"\s*<\s*/\s*(br|p|hr|li|div)([^a-z0-9>][^>]*)?>\s*",
+                (re.I | re.M | re.S),
+            ),
+            "\r\n",
+            {},
+        ),
         # HTML Spaces (&nbsp;) and tabs (&emsp;) aren't supported
         # See https://core.telegram.org/bots/api#html-style
-        (re.compile(r'\&nbsp;?', re.I), ' ', {}),
-
+        (re.compile(r"\&nbsp;?", re.I), " ", {}),
         # Tabs become 3 spaces
-        (re.compile(r'\&emsp;?', re.I), '   ', {}),
-
+        (re.compile(r"\&emsp;?", re.I), "   ", {}),
         # Some characters get re-escaped by the Telegram upstream
         # service so we need to convert these back,
-        (re.compile(r'\&apos;?', re.I), '\'', {}),
-        (re.compile(r'\&quot;?', re.I), '"', {}),
-
+        (re.compile(r"\&apos;?", re.I), "'", {}),
+        (re.compile(r"\&quot;?", re.I), '"', {}),
         # New line cleanup
-        (re.compile(r'\r*\n[\r\n]+', re.I), '\r\n', {}),
+        (re.compile(r"\r*\n[\r\n]+", re.I), "\r\n", {}),
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'bot_token': {
-            'name': _('Bot Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            # Token required as part of the API request, allow the word 'bot'
-            # infront of it
-            'regex': (r'^(bot)?(?P<key>[0-9]+:[a-z0-9_-]+)$', 'i'),
-        },
-        'target_user': {
-            'name': _('Target Chat ID'),
-            'type': 'string',
-            'map_to': 'targets',
-            'regex': (r'^((-?[0-9]{1,32})|([a-z_-][a-z0-9_-]+))$', 'i'),
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "bot_token": {
+                "name": _("Bot Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                # Token required as part of the API request, allow the word
+                # 'bot' infront of it
+                "regex": (r"^(bot)?(?P<key>[0-9]+:[a-z0-9_-]+)$", "i"),
+            },
+            "target_user": {
+                "name": _("Target Chat ID"),
+                "type": "string",
+                "map_to": "targets",
+                "regex": (r"^((-?[0-9]{1,32})|([a-z_-][a-z0-9_-]+))$", "i"),
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': False,
-            'map_to': 'include_image',
-        },
-        'detect': {
-            'name': _('Detect Bot Owner'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'detect_owner',
-        },
-        'silent': {
-            'name': _('Silent Notification'),
-            'type': 'bool',
-            'default': False,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": False,
+                "map_to": "include_image",
+            },
+            "detect": {
+                "name": _("Detect Bot Owner"),
+                "type": "bool",
+                "default": True,
+                "map_to": "detect_owner",
+            },
+            "silent": {
+                "name": _("Silent Notification"),
+                "type": "bool",
+                "default": False,
+            },
+            "preview": {
+                "name": _("Web Page Preview"),
+                "type": "bool",
+                "default": False,
+            },
+            "topic": {
+                "name": _("Topic Thread ID"),
+                "type": "int",
+            },
+            "thread": {
+                "alias_of": "topic",
+            },
+            "mdv": {
+                "name": _("Markdown Version"),
+                "type": "choice:string",
+                "values": ("v1", "v2"),
+                "default": "v1",
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "content": {
+                "name": _("Content Placement"),
+                "type": "choice:string",
+                "values": TELEGRAM_CONTENT_PLACEMENT,
+                "default": TelegramContentPlacement.BEFORE,
+            },
         },
-        'preview': {
-            'name': _('Web Page Preview'),
-            'type': 'bool',
-            'default': False,
-        },
-        'topic': {
-            'name': _('Topic Thread ID'),
-            'type': 'int',
-        },
-        'thread': {
-            'alias_of': 'topic',
-        },
-        'mdv': {
-            'name': _('Markdown Version'),
-            'type': 'choice:string',
-            'values': ('v1', 'v2'),
-            'default': 'v1',
-        },
-        'to': {
-            'alias_of': 'targets',
-        },
-        'content': {
-            'name': _('Content Placement'),
-            'type': 'choice:string',
-            'values': TELEGRAM_CONTENT_PLACEMENT,
-            'default': TelegramContentPlacement.BEFORE,
-        },
-    })
+    )
 
-    def __init__(self, bot_token, targets, detect_owner=True,
-                 include_image=False, silent=None, preview=None, topic=None,
-                 content=None, mdv=None, **kwargs):
-        """
-        Initialize Telegram Object
-        """
+    def __init__(
+        self,
+        bot_token,
+        targets,
+        detect_owner=True,
+        include_image=False,
+        silent=None,
+        preview=None,
+        topic=None,
+        content=None,
+        mdv=None,
+        **kwargs,
+    ):
+        """Initialize Telegram Object."""
         super().__init__(**kwargs)
 
         self.bot_token = validate_regex(
-            bot_token, *self.template_tokens['bot_token']['regex'],
-            fmt='{key}')
+            bot_token, *self.template_tokens["bot_token"]["regex"], fmt="{key}"
+        )
         if not self.bot_token:
-            err = 'The Telegram Bot Token specified ({}) is invalid.'.format(
-                bot_token)
+            err = f"The Telegram Bot Token specified ({bot_token}) is invalid."
             self.logger.warning(err)
             raise TypeError(err)
 
         # Get our Markdown Version
-        self.markdown_ver = \
-            TELEGRAM_MARKDOWN_VERSION_MAP[NotifyTelegram.
-                                          template_args['mdv']['default']] \
-            if mdv is None else \
-            next((
-                v for k, v in TELEGRAM_MARKDOWN_VERSION_MAP.items()
-                if str(mdv).lower().startswith(k)),
-                TELEGRAM_MARKDOWN_VERSION_MAP[NotifyTelegram.
-                                              template_args['mdv']['default']])
+        self.markdown_ver = (
+            TELEGRAM_MARKDOWN_VERSION_MAP[
+                NotifyTelegram.template_args["mdv"]["default"]
+            ]
+            if mdv is None
+            else next(
+                (
+                    v
+                    for k, v in TELEGRAM_MARKDOWN_VERSION_MAP.items()
+                    if str(mdv).lower().startswith(k)
+                ),
+                TELEGRAM_MARKDOWN_VERSION_MAP[
+                    NotifyTelegram.template_args["mdv"]["default"]
+                ],
+            )
+        )
 
         # Define whether or not we should make audible alarms
-        self.silent = self.template_args['silent']['default'] \
-            if silent is None else bool(silent)
+        self.silent = (
+            self.template_args["silent"]["default"]
+            if silent is None
+            else bool(silent)
+        )
 
         # Define whether or not we should display a web page preview
-        self.preview = self.template_args['preview']['default'] \
-            if preview is None else bool(preview)
+        self.preview = (
+            self.template_args["preview"]["default"]
+            if preview is None
+            else bool(preview)
+        )
 
         # Setup our content placement
-        self.content = self.template_args['content']['default'] \
-            if not isinstance(content, str) else content.lower()
+        self.content = (
+            self.template_args["content"]["default"]
+            if not isinstance(content, str)
+            else content.lower()
+        )
         if self.content and self.content not in TELEGRAM_CONTENT_PLACEMENT:
-            msg = 'The content placement specified ({}) is invalid.'\
-                .format(content)
+            msg = f"The content placement specified ({content}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -433,12 +484,11 @@ def __init__(self, bot_token, targets, detect_owner=True,
             try:
                 self.topic = int(topic)
 
-            except (TypeError, ValueError):
+            except (TypeError, ValueError) as exc:
                 # Not a valid integer; ignore entry
-                err = 'The Telegram Topic ID specified ({}) is invalid.'\
-                    .format(topic)
+                err = f"The Telegram Topic ID specified ({topic}) is invalid."
                 self.logger.warning(err)
-                raise TypeError(err)
+                raise TypeError(err) from exc
         else:
             # No Topic Thread
             self.topic = None
@@ -458,60 +508,63 @@ def __init__(self, bot_token, targets, detect_owner=True,
             results = IS_CHAT_ID_RE.match(target)
             if not results:
                 self.logger.warning(
-                    'Dropped invalid Telegram chat/group ({}) specified.'
-                    .format(target),
+                    f"Dropped invalid Telegram chat/group ({target}) "
+                    "specified.",
                 )
 
                 # Ensure we don't fall back to owner detection
                 self.detect_owner = False
                 continue
 
-            if results.group('topic'):
+            if results.group("topic"):
                 topic = int(
-                    results.group('topic')
-                    if results.group('topic') else self.topic)
+                    results.group("topic")
+                    if results.group("topic")
+                    else self.topic
+                )
             else:
                 # Default (if one set)
                 topic = self.topic
 
-            if results.group('name') is not None:
+            if results.group("name") is not None:
                 # Name
-                self.targets.append(('@%s' % results.group('name'), topic))
+                self.targets.append(
+                    ("@{}".format(results.group("name")), topic)
+                )
 
             else:  # ID
-                self.targets.append((int(results.group('idno')), topic))
+                self.targets.append((int(results.group("idno")), topic))
 
         # Track whether or not we want to send an image with our notification
         # or not.
         self.include_image = include_image
 
-    def send_media(self, target, notify_type, attach=None):
-        """
-        Sends a sticker based on the specified notify type
-
-        """
+    def send_media(self, target, notify_type, payload=None, attach=None):
+        """Sends a sticker based on the specified notify type."""
 
         # Prepare our Headers
+        if payload is None:
+            payload = {}
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         # Our function name and payload are determined on the path
-        function_name = 'SendPhoto'
-        key = 'photo'
+        function_name = "SendPhoto"
+        key = "photo"
         path = None
 
         if isinstance(attach, AttachBase):
             if not attach:
                 # We could not access the attachment
                 self.logger.error(
-                    'Could not access attachment {}.'.format(
-                        attach.url(privacy=True)))
+                    f"Could not access attachment {attach.url(privacy=True)}."
+                )
                 return False
 
             self.logger.debug(
-                'Posting Telegram attachment {}'.format(
-                    attach.url(privacy=True)))
+                f"Posting Telegram attachment {attach.url(privacy=True)}"
+            )
 
             # Store our path to our file
             path = attach.path
@@ -519,9 +572,11 @@ def send_media(self, target, notify_type, attach=None):
             mimetype = attach.mimetype
 
             # Process our attachment
-            function_name, key = \
-                next(((x['function_name'], x['key']) for x in self.mime_lookup
-                     if x['regex'].match(mimetype)))  # pragma: no cover
+            function_name, key = next(
+                (x["function_name"], x["key"])
+                for x in self.mime_lookup
+                if x["regex"].match(mimetype)
+            )  # pragma: no cover
 
         else:
             attach = self.image_path(notify_type) if attach is None else attach
@@ -533,11 +588,7 @@ def send_media(self, target, notify_type, attach=None):
             path = attach
             file_name = os.path.basename(path)
 
-        url = '%s%s/%s' % (
-            self.notify_url,
-            self.bot_token,
-            function_name,
-        )
+        url = f"{self.notify_url}{self.bot_token}/{function_name}"
 
         # Always call throttle before any remote server i/o is made;
         # Telegram throttles to occur before sending the image so that
@@ -547,18 +598,19 @@ def send_media(self, target, notify_type, attach=None):
         # Extract our target
         chat_id, topic = target
 
-        payload = {'chat_id': chat_id}
+        payload["chat_id"] = chat_id
         if topic:
-            payload['message_thread_id'] = topic
+            payload["message_thread_id"] = topic
 
         try:
-            with open(path, 'rb') as f:
+            with open(path, "rb") as f:
                 # Configure file payload (for upload)
                 files = {key: (file_name, f)}
 
                 self.logger.debug(
-                    'Telegram attachment POST URL: %s (cert_verify=%r)' % (
-                        url, self.verify_certificate))
+                    f"Telegram attachment POST URL: {url} "
+                    f"(cert_verify={self.verify_certificate!r})"
+                )
 
                 r = requests.post(
                     url,
@@ -571,18 +623,21 @@ def send_media(self, target, notify_type, attach=None):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = NotifyTelegram\
-                        .http_response_code_lookup(r.status_code)
+                    status_str = NotifyTelegram.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Telegram attachment: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Telegram attachment: "
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     return False
 
@@ -591,41 +646,34 @@ def send_media(self, target, notify_type, attach=None):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A connection error occurred posting Telegram '
-                'attachment.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A connection error occurred posting Telegram attachment."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
-        except (IOError, OSError):
+        except OSError:
             # IOError is present for backwards compatibility with Python
             # versions older then 3.3.  >= 3.3 throw OSError now.
 
             # Could not open and/or read the file; this is not a problem since
             # we scan a lot of default paths.
-            self.logger.error(
-                'File can not be opened for read: {}'.format(path))
+            self.logger.error(f"File can not be opened for read: {path}")
 
         return False
 
     def detect_bot_owner(self):
-        """
-        Takes a bot and attempts to detect it's chat id from that
-
-        """
+        """Takes a bot and attempts to detect it's chat id from that."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
-        url = '%s%s/%s' % (
-            self.notify_url,
-            self.bot_token,
-            'getUpdates'
-        )
+        url = "{}{}/{}".format(self.notify_url, self.bot_token, "getUpdates")
 
         self.logger.debug(
-            'Telegram User Detection POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate))
+            f"Telegram User Detection POST URL: {url} "
+            f"(cert_verify={self.verify_certificate!r})"
+        )
 
         # Track our response object
         response = None
@@ -640,12 +688,13 @@ def detect_bot_owner(self):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyTelegram.http_response_code_lookup(r.status_code)
+                status_str = NotifyTelegram.http_response_code_lookup(
+                    r.status_code
+                )
 
                 try:
                     # Try to get the error message if we can:
-                    error_msg = loads(r.content).get('description', 'unknown')
+                    error_msg = loads(r.content).get("description", "unknown")
 
                 except (AttributeError, TypeError, ValueError):
                     # ValueError = r.content is Unparsable
@@ -655,18 +704,21 @@ def detect_bot_owner(self):
 
                 if error_msg:
                     self.logger.warning(
-                        'Failed to detect the Telegram user: (%s) %s.' % (
-                            r.status_code, error_msg))
+                        "Failed to detect the Telegram user: "
+                        f"({r.status_code}) {error_msg}."
+                    )
 
                 else:
                     self.logger.warning(
-                        'Failed to detect the Telegram user: '
-                        '{}{}error={}.'.format(
+                        "Failed to detect the Telegram user: "
+                        "{}{}error={}.".format(
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(f"Response Details:\r\n{r.content}")
 
                 return 0
 
@@ -679,13 +731,15 @@ def detect_bot_owner(self):
             # - TypeError = r.content is None
             # - AttributeError = r is None
             self.logger.warning(
-                'A communication error occurred detecting the Telegram User.')
+                "A communication error occurred detecting the Telegram User."
+            )
             return 0
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A connection error occurred detecting the Telegram User.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A connection error occurred detecting the Telegram User."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
             return 0
 
         # A Response might look something like this:
@@ -710,97 +764,125 @@ def detect_bot_owner(self):
         #      "text":"/start",
         #      "entities":[{"offset":0,"length":6,"type":"bot_command"}]}}]
 
-        if response.get('ok', False):
-            for entry in response.get('result', []):
-                if 'message' in entry and 'from' in entry['message']:
-                    _id = entry['message']['from'].get('id', 0)
-                    _user = entry['message']['from'].get('first_name')
+        if response.get("ok", False):
+            for entry in response.get("result", []):
+                if "message" in entry and "from" in entry["message"]:
+                    id_ = entry["message"]["from"].get("id", 0)
+                    user = entry["message"]["from"].get("first_name")
                     self.logger.info(
-                        'Detected Telegram user %s (userid=%d)' % (_user, _id))
+                        "Detected Telegram user %s (userid=%d)", user, id_
+                    )
                     # Return our detected userid
-                    self.store.set('bot_owner', _id)
-                    return _id
+                    self.store.set("bot_owner", id_)
+                    return id_
 
         self.logger.warning(
-            'Failed to detect a Telegram user; '
-            'try sending your bot a message first.')
+            "Failed to detect a Telegram user; "
+            "try sending your bot a message first."
+        )
         return 0
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             body_format=None, **kwargs):
-        """
-        Perform Telegram Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        body_format=None,
+        **kwargs,
+    ):
+        """Perform Telegram Notification."""
 
         if len(self.targets) == 0 and self.detect_owner:
-            _id = self.store.get('bot_owner') or self.detect_bot_owner()
-            if _id:
+            id_ = self.store.get("bot_owner") or self.detect_bot_owner()
+            if id_:
                 # Permanently store our id in our target list for next time
-                self.targets.append((str(_id), self.topic))
+                self.targets.append((str(id_), self.topic))
                 self.logger.info(
-                    'Update your Telegram Apprise URL to read: '
-                    '{}'.format(self.url(privacy=True)))
+                    "Update your Telegram Apprise URL to read: "
+                    f"{self.url(privacy=True)}"
+                )
 
         if len(self.targets) == 0:
-            self.logger.warning('There were not Telegram chat_ids to notify.')
+            self.logger.warning("There were not Telegram chat_ids to notify.")
             return False
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # error tracking (used for function return)
         has_error = False
 
-        url = '%s%s/%s' % (
-            self.notify_url,
-            self.bot_token,
-            'sendMessage'
-        )
+        url = "{}{}/{}".format(self.notify_url, self.bot_token, "sendMessage")
 
-        _payload = {
+        payload_ = {
             # Notification Audible Control
-            'disable_notification': self.silent,
+            "disable_notification": self.silent,
             # Display Web Page Preview (if possible)
-            'disable_web_page_preview': not self.preview,
+            "disable_web_page_preview": not self.preview,
         }
 
         # Prepare Message Body
         if self.notify_format == NotifyFormat.MARKDOWN:
 
-            if body_format not in (None, NotifyFormat.MARKDOWN) \
-                    and self.markdown_ver == TelegramMarkdownVersion.TWO:
+            if (
+                body_format not in (None, NotifyFormat.MARKDOWN)
+                and self.markdown_ver == TelegramMarkdownVersion.TWO
+            ):
                 # Telegram Markdown v2 is not very accomodating to some
                 # characters such as the hashtag (#) which is fine in v1.
                 # To try and be accomodating we escape them in advance
                 # See: https://stackoverflow.com/a/69892704/355584
                 # Also: https://core.telegram.org/bots/api#markdownv2-style
-                body = re.sub(r'(?<!\\)([_*[\]()~`>#+=|{}.!-])', r'\\\1', body)
+                body = re.sub(r"(?<!\\)([_*[\]()~`>#+=|{}.!-])", r"\\\1", body)
 
-            _payload['parse_mode'] = self.markdown_ver
-            _payload['text'] = body
+            payload_["parse_mode"] = self.markdown_ver
+            payload_["text"] = body
 
         else:  # HTML
 
             # Use Telegram's HTML mode
-            _payload['parse_mode'] = 'HTML'
+            payload_["parse_mode"] = "HTML"
             for r, v, m in self.__telegram_escape_html_entries:
 
-                if 'html' in m:
+                if "html" in m:
                     # Handle special cases where we need to alter new lines
                     # for presentation purposes
-                    v = v.format(m['html'] if body_format in (
-                        NotifyFormat.HTML, NotifyFormat.MARKDOWN) else '')
+                    v = v.format(
+                        m["html"]
+                        if body_format
+                        in (NotifyFormat.HTML, NotifyFormat.MARKDOWN)
+                        else ""
+                    )
 
                 body = r.sub(v, body)
 
             # Prepare our payload based on HTML or TEXT
-            _payload['text'] = body
+            payload_["text"] = body
+
+        # Prepare our caption payload
+        caption_payload = (
+            {
+                "caption": payload_["text"],
+                "show_caption_above_media": (
+                    self.content == TelegramContentPlacement.BEFORE
+                ),
+                "parse_mode": payload_["parse_mode"],
+            }
+            if attach
+            and body
+            and len(payload_.get("text", "")) < self.telegram_caption_maxlen
+            else {}
+        )
 
         # Handle payloads without a body specified (but an attachment present)
-        attach_content = \
-            TelegramContentPlacement.AFTER if not body else self.content
+        attach_content = (
+            TelegramContentPlacement.AFTER
+            if not body or caption_payload
+            else self.content
+        )
 
         # Create a copy of the chat_ids list
         targets = list(self.targets)
@@ -809,28 +891,34 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
             chat_id, topic = target
 
             # Printable chat_id details
-            pchat_id = f'{chat_id}' if not topic else f'{chat_id}:{topic}'
+            pchat_id = f"{chat_id}" if not topic else f"{chat_id}:{topic}"
 
-            payload = _payload.copy()
-            payload['chat_id'] = chat_id
+            payload = payload_.copy()
+            payload["chat_id"] = chat_id
             if topic:
-                payload['message_thread_id'] = topic
+                payload["message_thread_id"] = topic
 
-            if self.include_image is True:
-                # Define our path
-                if not self.send_media(target, notify_type):
-                    # We failed to send the image associated with our
-                    notify_type
-                    self.logger.warning(
-                        'Failed to send Telegram type image to {}.',
-                        pchat_id)
+            if self.include_image is True and not self.send_media(
+                target, notify_type
+            ):
+                # We failed to send the image associated with our
+                # notify_type
+                self.logger.warning(
+                    "Failed to send Telegram attachment to {}.", pchat_id
+                )
 
-            if attach and self.attachment_support and \
-                    attach_content == TelegramContentPlacement.AFTER:
+            if (
+                attach
+                and self.attachment_support
+                and attach_content == TelegramContentPlacement.AFTER
+            ):
                 # Send our attachments now (if specified and if it exists)
                 if not self._send_attachments(
-                        target, notify_type=notify_type,
-                        attach=attach):
+                    target,
+                    notify_type=notify_type,
+                    payload=caption_payload,
+                    attach=attach,
+                ):
 
                     has_error = True
                     continue
@@ -839,15 +927,20 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     # Nothing more to do; move along to the next attachment
                     continue
 
+            if caption_payload:
+                # nothing further to do; move along to the next attachment
+                continue
+
             # Always call throttle before any remote server i/o is made;
             # Telegram throttles to occur before sending the image so that
             # content can arrive together.
             self.throttle()
 
-            self.logger.debug('Telegram POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('Telegram Payload: %s' % str(payload))
+            self.logger.debug(
+                f"Telegram POST URL: {url} "
+                f"(cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Telegram Payload: {payload!s}")
 
             try:
                 r = requests.post(
@@ -860,13 +953,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyTelegram.http_response_code_lookup(r.status_code)
+                    status_str = NotifyTelegram.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     try:
                         # Try to get the error message if we can:
                         error_msg = loads(r.content).get(
-                            'description', 'unknown')
+                            "description", "unknown"
+                        )
 
                     except (AttributeError, TypeError, ValueError):
                         # ValueError = r.content is Unparsable
@@ -875,14 +970,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                         error_msg = None
 
                     self.logger.warning(
-                        'Failed to send Telegram notification to {}: '
-                        '{}, error={}.'.format(
-                            pchat_id,
-                            error_msg if error_msg else status_str,
-                            r.status_code))
+                        f"Failed to send Telegram notification to {pchat_id}: "
+                        f"{error_msg if error_msg else status_str}, "
+                        f"error={r.status_code}."
+                    )
 
-                    self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                    self.logger.debug(f"Response Details:\r\n{r.content}")
 
                     # Flag our error
                     has_error = True
@@ -890,110 +983,120 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A connection error occurred sending Telegram:%s ' % (
-                        pchat_id) + 'notification.'
+                    f"A connection error occurred sending Telegram:{pchat_id} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Flag our error
                 has_error = True
                 continue
 
-            self.logger.info('Sent Telegram notification.')
+            self.logger.info("Sent Telegram notification.")
 
-            if attach and self.attachment_support \
-                    and attach_content == TelegramContentPlacement.BEFORE:
+            if (
+                attach
+                and self.attachment_support
+                and attach_content == TelegramContentPlacement.BEFORE
+                and not self._send_attachments(
+                    target=target, notify_type=notify_type, attach=attach
+                )
+            ):
                 # Send our attachments now (if specified and if it exists) as
                 # it was identified to send the content before the attachments
                 # which is now done.
-                if not self._send_attachments(
-                        target=target,
-                        notify_type=notify_type,
-                        attach=attach):
 
-                    has_error = True
-                    continue
+                has_error = True
+                continue
 
         return not has_error
 
-    def _send_attachments(self, target, notify_type, attach):
-        """
-        Sends our attachments
-        """
+    def _send_attachments(self, target, notify_type, attach, payload=None):
+        """Sends our attachments."""
+        if payload is None:
+            payload = {}
         has_error = False
         # Send our attachments now (if specified and if it exists)
-        for attachment in attach:
-            if not self.send_media(target, notify_type, attach=attachment):
+        for no, attachment in enumerate(attach, start=1):
+            payload = payload if payload and no == 1 else {}
+            payload.update({
+                "title": (
+                    attachment.name if attachment.name else f"file{no:03}.dat"
+                )
+            })
+
+            if not self.send_media(
+                target, notify_type, payload=payload, attach=attachment
+            ):
 
                 # We failed; don't continue
                 has_error = True
                 break
 
-            self.logger.info(
-                'Sent Telegram attachment: {}.'.format(attachment))
+            self.logger.info(f"Sent Telegram attachment: {attachment}.")
 
         return not has_error
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.bot_token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': self.include_image,
-            'detect': 'yes' if self.detect_owner else 'no',
-            'silent': 'yes' if self.silent else 'no',
-            'preview': 'yes' if self.preview else 'no',
-            'content': self.content,
-            'mdv': TELEGRAM_MARKDOWN_VERSIONS[self.markdown_ver],
+            "image": self.include_image,
+            "detect": "yes" if self.detect_owner else "no",
+            "silent": "yes" if self.silent else "no",
+            "preview": "yes" if self.preview else "no",
+            "content": self.content,
+            "mdv": TELEGRAM_MARKDOWN_VERSIONS[self.markdown_ver],
         }
 
         if self.topic:
-            params['topic'] = self.topic
+            params["topic"] = self.topic
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         targets = []
-        for (chat_id, _topic) in self.targets:
-            topic = _topic if _topic else self.topic
-
-            targets.append(''.join(
-                [NotifyTelegram.quote(f'{chat_id}', safe='@')
-                 if isinstance(chat_id, str) else f'{chat_id}',
-                 '' if not topic else f':{topic}']))
+        for chat_id, topic_ in self.targets:
+            topic = topic_ if topic_ else self.topic
+
+            targets.append(
+                "".join([
+                    (
+                        NotifyTelegram.quote(f"{chat_id}", safe="@")
+                        if isinstance(chat_id, str)
+                        else f"{chat_id}"
+                    ),
+                    "" if not topic else f":{topic}",
+                ])
+            )
 
         # No need to check the user token because the user automatically gets
         # appended into the list of chat ids
-        return '{schema}://{bot_token}/{targets}/?{params}'.format(
+        return "{schema}://{bot_token}/{targets}/?{params}".format(
             schema=self.secure_protocol,
-            bot_token=self.pprint(self.bot_token, privacy, safe=''),
-            targets='/'.join(targets),
-            params=NotifyTelegram.urlencode(params))
+            bot_token=self.pprint(self.bot_token, privacy, safe=""),
+            targets="/".join(targets),
+            params=NotifyTelegram.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return 1 if not self.targets else len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         # This is a dirty hack; but it's the only work around to tgram://
         # messages since the bot_token has a colon in it. It invalidates a
         # normal URL.
@@ -1005,10 +1108,13 @@ def parse_url(url):
         # we also check for %3A (incase the URL is encoded) as %3A == :
         try:
             tgram = re.match(
-                r'(?P<protocol>{schema}://)(bot)?(?P<prefix>([a-z0-9_-]+)'
-                r'(:[a-z0-9_-]+)?@)?(?P<btoken_a>[0-9]+)(:|%3A)+'
-                r'(?P<remaining>.*)$'.format(
-                    schema=NotifyTelegram.secure_protocol), url, re.I)
+                rf"(?P<protocol>{NotifyTelegram.secure_protocol}://)"
+                r"(bot)?(?P<prefix>([a-z0-9_-]+)"
+                r"(:[a-z0-9_-]+)?@)?(?P<btoken_a>[0-9]+)(:|%3A)+"
+                r"(?P<remaining>.*)$",
+                url,
+                re.I,
+            )
 
         except (TypeError, AttributeError):
             # url is bad; force tgram to be None
@@ -1018,75 +1124,83 @@ def parse_url(url):
             # Content is simply not parseable
             return None
 
-        if tgram.group('prefix'):
+        if tgram.group("prefix"):
             # Try again
-            results = NotifyBase.parse_url('%s%s%s/%s' % (
-                tgram.group('protocol'),
-                tgram.group('prefix'),
-                tgram.group('btoken_a'),
-                tgram.group('remaining')), verify_host=False)
+            results = NotifyBase.parse_url(
+                "{}{}{}/{}".format(
+                    tgram.group("protocol"),
+                    tgram.group("prefix"),
+                    tgram.group("btoken_a"),
+                    tgram.group("remaining"),
+                ),
+                verify_host=False,
+            )
 
         else:
             # Try again
-            results = NotifyBase.parse_url('%s%s/%s' % (
-                tgram.group('protocol'),
-                tgram.group('btoken_a'),
-                tgram.group('remaining')), verify_host=False)
+            results = NotifyBase.parse_url(
+                "{}{}/{}".format(
+                    tgram.group("protocol"),
+                    tgram.group("btoken_a"),
+                    tgram.group("remaining"),
+                ),
+                verify_host=False,
+            )
 
         # The first token is stored in the hostname
-        bot_token_a = NotifyTelegram.unquote(results['host'])
+        bot_token_a = NotifyTelegram.unquote(results["host"])
 
         # Get a nice unquoted list of path entries
-        entries = NotifyTelegram.split_path(results['fullpath'])
+        entries = NotifyTelegram.split_path(results["fullpath"])
 
         # Now fetch the remaining tokens
         bot_token_b = entries.pop(0)
 
-        bot_token = '%s:%s' % (bot_token_a, bot_token_b)
+        bot_token = f"{bot_token_a}:{bot_token_b}"
 
         # Store our chat ids (as these are the remaining entries)
-        results['targets'] = entries
+        results["targets"] = entries
 
         # content to be displayed 'before' or 'after' attachments
-        if 'content' in results['qsd'] and len(results['qsd']['content']):
-            results['content'] = results['qsd']['content']
+        if "content" in results["qsd"] and len(results["qsd"]["content"]):
+            results["content"] = results["qsd"]["content"]
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyTelegram.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyTelegram.parse_list(
+                results["qsd"]["to"]
+            )
 
         # Store our bot token
-        results['bot_token'] = bot_token
+        results["bot_token"] = bot_token
 
         # Support Markdown Version
-        if 'mdv' in results['qsd'] and len(results['qsd']['mdv']):
-            results['mdv'] = results['qsd']['mdv']
+        if "mdv" in results["qsd"] and len(results["qsd"]["mdv"]):
+            results["mdv"] = results["qsd"]["mdv"]
 
         # Support Thread Topic
-        if 'topic' in results['qsd'] and len(results['qsd']['topic']):
-            results['topic'] = results['qsd']['topic']
+        if "topic" in results["qsd"] and len(results["qsd"]["topic"]):
+            results["topic"] = results["qsd"]["topic"]
 
-        elif 'thread' in results['qsd'] and len(results['qsd']['thread']):
-            results['topic'] = results['qsd']['thread']
+        elif "thread" in results["qsd"] and len(results["qsd"]["thread"]):
+            results["topic"] = results["qsd"]["thread"]
 
         # Silent (Sends the message Silently); users will receive
         # notification with no sound.
-        results['silent'] = \
-            parse_bool(results['qsd'].get('silent', False))
+        results["silent"] = parse_bool(results["qsd"].get("silent", False))
 
         # Show Web Page Preview
-        results['preview'] = \
-            parse_bool(results['qsd'].get('preview', False))
+        results["preview"] = parse_bool(results["qsd"].get("preview", False))
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', False))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", False)
+        )
 
         # Include images with our message
-        results['detect_owner'] = \
-            parse_bool(
-                results['qsd'].get('detect', not results['targets']))
+        results["detect_owner"] = parse_bool(
+            results["qsd"].get("detect", not results["targets"])
+        )
 
         return results
diff --git a/libs/apprise/plugins/threema.py b/libs/apprise/plugins/threema.py
index 9230ddb074..0f73c27c9e 100644
--- a/libs/apprise/plugins/threema.py
+++ b/libs/apprise/plugins/threema.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -32,44 +31,42 @@
 # Read more about Threema Gateway API here:
 #   - https://gateway.threema.ch/en/developer/api
 
-import requests
 from itertools import chain
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, validate_regex, is_email, parse_list
-from ..url import PrivacyMode
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_email, is_phone_no, parse_list, validate_regex
+from .base import NotifyBase
 
 
 class ThreemaRecipientTypes:
-    """
-    The supported recipient specifiers
-    """
-    THREEMA_ID = 'to'
-    PHONE = 'phone'
-    EMAIL = 'email'
+    """The supported recipient specifiers."""
+
+    THREEMA_ID = "to"
+    PHONE = "phone"
+    EMAIL = "email"
 
 
 class NotifyThreema(NotifyBase):
-    """
-    A wrapper for Threema Gateway Notifications
-    """
+    """A wrapper for Threema Gateway Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Threema Gateway'
+    service_name = "Threema Gateway"
 
     # The services URL
-    service_url = 'https://gateway.threema.ch/'
+    service_url = "https://gateway.threema.ch/"
 
     # The default protocol
-    secure_protocol = 'threema'
+    secure_protocol = "threema"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_threema'
+    setup_url = "https://appriseit.com/services/threema/"
 
     # Threema Gateway uses the http protocol with JSON requests
-    notify_url = 'https://msgapi.threema.ch/send_simple'
+    notify_url = "https://msgapi.threema.ch/send_simple"
 
     # The maximum length of the body
     body_maxlen = 3500
@@ -78,104 +75,103 @@ class NotifyThreema(NotifyBase):
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{gateway_id}@{secret}/{targets}',
-    )
+    templates = ("{schema}://{gateway_id}@{secret}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'gateway_id': {
-            'name': _('Gateway ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'map_to': 'user',
-        },
-        'secret': {
-            'name': _('API Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "gateway_id": {
+                "name": _("Gateway ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "map_to": "user",
+            },
+            "secret": {
+                "name": _("API Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "target_email": {
+                "name": _("Target Email"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_threema_id": {
+                "name": _("Target Threema ID"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'target_email': {
-            'name': _('Target Email'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'target_threema_id': {
-            'name': _('Target Threema ID'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "gateway_id",
+            },
+            "gwid": {
+                "alias_of": "gateway_id",
+            },
+            "secret": {
+                "alias_of": "secret",
+            },
         },
-        'from': {
-            'alias_of': 'gateway_id',
-        },
-        'gwid': {
-            'alias_of': 'gateway_id',
-        },
-        'secret': {
-            'alias_of': 'secret',
-        },
-    })
+    )
 
     def __init__(self, secret=None, targets=None, **kwargs):
-        """
-        Initialize Threema Gateway Object
-        """
+        """Initialize Threema Gateway Object."""
         super().__init__(**kwargs)
 
         # Validate our params here.
 
         if not self.user:
-            msg = 'Threema Gateway ID must be specified'
+            msg = "Threema Gateway ID must be specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Verify our Gateway ID
         if len(self.user) != 8:
-            msg = 'Threema Gateway ID must be 8 characters in length'
+            msg = "Threema Gateway ID must be 8 characters in length"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Verify our secret
         self.secret = validate_regex(secret)
         if not self.secret:
-            msg = \
-                'An invalid Threema API Secret ({}) was specified'.format(
-                    secret)
+            msg = f"An invalid Threema API Secret ({secret}) was specified"
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         # Used for URL generation afterwards only
-        self.invalid_targets = list()
+        self.invalid_targets = []
 
         for target in parse_list(targets, allow_whitespace=False):
             if len(target) == 8:
                 # Store our user
-                self.targets.append(
-                    (ThreemaRecipientTypes.THREEMA_ID, target))
+                self.targets.append((ThreemaRecipientTypes.THREEMA_ID, target))
                 continue
 
             # Check if an email was defined
@@ -183,34 +179,34 @@ def __init__(self, secret=None, targets=None, **kwargs):
             if result:
                 # Store our user
                 self.targets.append(
-                    (ThreemaRecipientTypes.EMAIL, result['full_email']))
+                    (ThreemaRecipientTypes.EMAIL, result["full_email"])
+                )
                 continue
 
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if result:
                 # store valid phone number
-                self.targets.append((
-                    ThreemaRecipientTypes.PHONE, result['full']))
+                self.targets.append(
+                    (ThreemaRecipientTypes.PHONE, result["full"])
+                )
                 continue
 
             self.logger.warning(
-                'Dropped invalid user/email/phone '
-                '({}) specified'.format(target),
+                f"Dropped invalid user/email/phone ({target}) specified",
             )
             self.invalid_targets.append(target)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Threema Gateway Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Threema Gateway Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
             self.logger.warning(
-                'There were no Threema Gateway targets to notify')
+                "There were no Threema Gateway targets to notify"
+            )
             return False
 
         # error tracking (used for function return)
@@ -218,16 +214,16 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
-            'Accept': '*/*',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
+            "Accept": "*/*",
         }
 
         # Prepare our payload
-        _payload = {
-            'secret': self.secret,
-            'from': self.user,
-            'text': body.encode('utf-8'),
+        payload_ = {
+            "secret": self.secret,
+            "from": self.user,
+            "text": body.encode("utf-8"),
         }
 
         # Create a copy of the targets list
@@ -238,16 +234,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             key, target = targets.pop(0)
 
             # Prepare a payload object
-            payload = _payload.copy()
+            payload = payload_.copy()
 
             # Set Target
             payload[key] = target
 
             # Some Debug Logging
             self.logger.debug(
-                'Threema Gateway GET URL: {} (cert_verify={})'.format(
-                    self.notify_url, self.verify_certificate))
-            self.logger.debug('Threema Gateway Payload: {}' .format(payload))
+                "Threema Gateway GET URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Threema Gateway Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -263,20 +260,22 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyThreema.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyThreema.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Threema Gateway notification to {}: '
-                        '{}{}error={}'.format(
+                        "Failed to send Threema Gateway notification to {}: "
+                        "{}{}error={}".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -284,14 +283,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 # We wee successful
                 self.logger.info(
-                    'Sent Threema Gateway notification to %s' % target)
+                    f"Sent Threema Gateway notification to {target}"
+                )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Threema Gateway:%s '
-                    'notification' % target
+                    "A Connection error occurred sending Threema"
+                    f" Gateway:{target} notification"
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -301,76 +301,75 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.user, self.secret)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        schemaStr =  \
-            '{schema}://{gatewayid}@{secret}/{targets}?{params}'
+        schemaStr = "{schema}://{gatewayid}@{secret}/{targets}?{params}"
         return schemaStr.format(
             schema=self.secure_protocol,
             gatewayid=NotifyThreema.quote(self.user),
             secret=self.pprint(
-                self.secret, privacy, mode=PrivacyMode.Secret, safe=''),
-            targets='/'.join(chain(
-                [NotifyThreema.quote(x[1], safe='@+') for x in self.targets],
-                [NotifyThreema.quote(x, safe='@+')
-                 for x in self.invalid_targets])),
-            params=NotifyThreema.urlencode(params))
+                self.secret, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            targets="/".join(
+                chain(
+                    [
+                        NotifyThreema.quote(x[1], safe="@+")
+                        for x in self.targets
+                    ],
+                    [
+                        NotifyThreema.quote(x, safe="@+")
+                        for x in self.invalid_targets
+                    ],
+                )
+            ),
+            params=NotifyThreema.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        results['targets'] = list()
+        results["targets"] = []
 
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
-            results['secret'] = \
-                NotifyThreema.unquote(results['qsd']['secret'])
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
+            results["secret"] = NotifyThreema.unquote(results["qsd"]["secret"])
 
         else:
-            results['secret'] = NotifyThreema.unquote(results['host'])
+            results["secret"] = NotifyThreema.unquote(results["host"])
 
-        results['targets'] += \
-            NotifyThreema.split_path(results['fullpath'])
+        results["targets"] += NotifyThreema.split_path(results["fullpath"])
 
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['user'] = \
-                NotifyThreema.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["user"] = NotifyThreema.unquote(results["qsd"]["from"])
 
-        elif 'gwid' in results['qsd'] and len(results['qsd']['gwid']):
-            results['user'] = \
-                NotifyThreema.unquote(results['qsd']['gwid'])
+        elif "gwid" in results["qsd"] and len(results["qsd"]["gwid"]):
+            results["user"] = NotifyThreema.unquote(results["qsd"]["gwid"])
 
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyThreema.parse_list(
-                    results['qsd']['to'], allow_whitespace=False)
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyThreema.parse_list(
+                results["qsd"]["to"], allow_whitespace=False
+            )
 
         return results
diff --git a/libs/apprise/plugins/twilio.py b/libs/apprise/plugins/twilio.py
index 42daa1fba9..82f7ab4396 100644
--- a/libs/apprise/plugins/twilio.py
+++ b/libs/apprise/plugins/twilio.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,10 +29,11 @@
 # AUTH_TOKEN and ACCOUNT SID right from your console/dashboard at:
 #     https://www.twilio.com/console
 #
-# You will also need to send the SMS From a phone number or account id name.
+# You will also need to send the SMS or do the call From a phone number or
+# account id name.
 
-# This is identified as the source (or where the SMS message will originate
-# from). Activated phone numbers can be found on your dashboard here:
+# This is identified as the source (or where the SMS message or the call will
+# originate from). Activated phone numbers can be found on your dashboard here:
 #  - https://www.twilio.com/console/phone-numbers/incoming
 #
 # Alternatively, you can open your wallet and request a different Twilio
@@ -43,46 +43,57 @@
 # or consider purchasing a short-code from here:
 #    https://www.twilio.com/docs/glossary/what-is-a-short-code
 #
+from json import loads
 import re
+
 import requests
-from json import loads
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
-
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 # Twilio Mode Detection
 MODE_DETECT_RE = re.compile(
-    r'\s*((?P<mode>[^:]+)\s*:\s*)?(?P<phoneno>.+)$', re.I)
+    r"\s*((?P<mode>[^:]+)\s*:\s*)?(?P<phoneno>.+)$", re.I
+)
+
+
+class TwilioNotificationMethod:
+    """Twilio Notification Method."""
+
+    SMS = "sms"
+    CALL = "call"
+
+
+TWILIO_NOTIFICATION_METHODS = (
+    TwilioNotificationMethod.SMS,
+    TwilioNotificationMethod.CALL,
+)
 
 
 class TwilioMessageMode:
-    """
-    Twilio Message Mode
-    """
+    """Twilio Message Mode."""
+
     # SMS/MMS
-    TEXT = 'T'
+    TEXT = "T"
 
     # via WhatsApp
-    WHATSAPP = 'W'
+    WHATSAPP = "W"
 
 
 class NotifyTwilio(NotifyBase):
-    """
-    A wrapper for Twilio Notifications
-    """
+    """A wrapper for Twilio Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Twilio'
+    service_name = "Twilio"
 
     # The services URL
-    service_url = 'https://www.twilio.com/'
+    service_url = "https://www.twilio.com/"
 
     # All notification requests are secure
-    secure_protocol = 'twilio'
+    secure_protocol = "twilio"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
@@ -93,14 +104,23 @@ class NotifyTwilio(NotifyBase):
     validity_period = 14400
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_twilio'
+    setup_url = "https://appriseit.com/services/twilio/"
 
-    # Twilio uses the http protocol with JSON requests
-    notify_url = 'https://api.twilio.com/2010-04-01/Accounts/' \
-                 '{sid}/Messages.json'
+    # Twilio uses the http protocol with JSON message requests
+    notify_sms_url = (
+        "https://api.twilio.com/2010-04-01/Accounts/{sid}/Messages.json"
+    )
 
-    # The maximum length of the body
-    body_maxlen = 160
+    # Twilio uses the http protocol with JSON call requests
+    notify_call_url = (
+        "https://api.twilio.com/2010-04-01/Accounts/{sid}/Calls.json"
+    )
+
+    # The maximum length of the sms body
+    body_sms_maxlen = 160
+
+    # The maximum length of the call body in xml format
+    body_call_maxlen = 4000
 
     # A title can not be used for SMS Messages.  Setting this to zero will
     # cause any title (if defined) to get placed into the message body.
@@ -108,135 +128,196 @@ class NotifyTwilio(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{account_sid}:{auth_token}@{from_phone}',
-        '{schema}://{account_sid}:{auth_token}@{from_phone}/{targets}',
+        "{schema}://{account_sid}:{auth_token}@{from_phone}",
+        "{schema}://{account_sid}:{auth_token}@{from_phone}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'account_sid': {
-            'name': _('Account SID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^AC[a-f0-9]+$', 'i'),
-        },
-        'auth_token': {
-            'name': _('Auth Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^([a-z]+:)?\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^([a-z]+:)?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'short_code': {
-            'name': _('Target Short Code'),
-            'type': 'string',
-            'regex': (r'^[0-9]{5,6}$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "account_sid": {
+                "name": _("Account SID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^AC[a-f0-9]+$", "i"),
+            },
+            "auth_token": {
+                "name": _("Auth Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^([a-z]+:)?\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^([a-z]+:)?[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "short_code": {
+                "name": _("Target Short Code"),
+                "type": "string",
+                "regex": (r"^[0-9]{5,6}$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'from_phone',
-        },
-        'sid': {
-            'alias_of': 'account_sid',
-        },
-        'token': {
-            'alias_of': 'auth_token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone",
+            },
+            "sid": {
+                "alias_of": "account_sid",
+            },
+            "token": {
+                "alias_of": "auth_token",
+            },
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "regex": (r"^SK[a-f0-9]+$", "i"),
+            },
+            "method": {
+                "name": _("Notification Method: sms or call"),
+                "type": "choice:string",
+                "values": TWILIO_NOTIFICATION_METHODS,
+                "default": TWILIO_NOTIFICATION_METHODS[0],
+            },
         },
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'private': True,
-            'regex': (r'^SK[a-f0-9]+$', 'i'),
-        },
-    })
+    )
 
-    def __init__(self, account_sid, auth_token, source, targets=None,
-                 apikey=None, ** kwargs):
-        """
-        Initialize Twilio Object
-        """
+    def __init__(
+        self,
+        account_sid,
+        auth_token,
+        source,
+        targets=None,
+        apikey=None,
+        method=None,
+        **kwargs,
+    ):
+        """Initialize Twilio Object."""
         super().__init__(**kwargs)
 
         # The Account SID associated with the account
         self.account_sid = validate_regex(
-            account_sid, *self.template_tokens['account_sid']['regex'])
+            account_sid, *self.template_tokens["account_sid"]["regex"]
+        )
         if not self.account_sid:
-            msg = 'An invalid Twilio Account SID ' \
-                  '({}) was specified.'.format(account_sid)
+            msg = (
+                f"An invalid Twilio Account SID ({account_sid}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The Authentication Token associated with the account
         self.auth_token = validate_regex(
-            auth_token, *self.template_tokens['auth_token']['regex'])
+            auth_token, *self.template_tokens["auth_token"]["regex"]
+        )
         if not self.auth_token:
-            msg = 'An invalid Twilio Authentication Token ' \
-                  '({}) was specified.'.format(auth_token)
+            msg = (
+                "An invalid Twilio Authentication Token "
+                f"({auth_token}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The API Key associated with the account (optional)
         self.apikey = validate_regex(
-            apikey, *self.template_args['apikey']['regex'])
+            apikey, *self.template_args["apikey"]["regex"]
+        )
+
+        # Set notification method
+        if isinstance(method, str) and method:
+            self.method = next((
+                a
+                for a in TWILIO_NOTIFICATION_METHODS
+                if a.startswith(method.lower())
+            ),
+                None,
+            )
+
+            if self.method not in TWILIO_NOTIFICATION_METHODS:
+                msg = (
+                    f"The Twilio notification method specified ({method}) "
+                    "is invalid."
+                )
+                self.logger.warning(msg)
+                raise TypeError(msg)
+        else:
+            self.method = self.template_args["method"]["default"]
 
         # Detect mode
         result = MODE_DETECT_RE.match(source)
         if not result:
-            msg = 'The Account (From) Phone # or Short-code specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = (
+                "The Account (From) Phone # or Short-code specified "
+                f"({source}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # prepare our default mode to use for all numbers that follow in
         # target definitions
-        self.default_mode = TwilioMessageMode.WHATSAPP \
-            if result.group('mode') and \
-            result.group('mode')[0].lower() == 'w' \
+        self.default_mode = (
+            TwilioMessageMode.WHATSAPP
+            if result.group("mode") and result.group("mode")[0].lower() == "w"
             else TwilioMessageMode.TEXT
+        )
+
+        # Check compatibility between notification method and mode
+        if self.method == TwilioNotificationMethod.CALL and \
+                self.default_mode == TwilioMessageMode.WHATSAPP:
+            msg = (
+                "The notification method Call is not valid along "
+                "message mode Whatsapp."
+            )
+            self.logger.warning(msg)
+            raise TypeError(msg)
 
-        result = is_phone_no(result.group('phoneno'), min_len=5)
+        result = is_phone_no(result.group("phoneno"), min_len=5)
         if not result:
-            msg = 'The Account (From) Phone # or Short-code specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = (
+                "The Account (From) Phone # or Short-code specified "
+                f"({source}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store The Source Phone # and/or short-code
-        self.source = result['full']
+        self.source = result["full"]
 
         if len(self.source) < 11 or len(self.source) > 14:
             # https://www.twilio.com/docs/glossary/what-is-a-short-code
             # A short code is a special 5 or 6 digit telephone number
             # that's shorter than a full phone number.
             if len(self.source) not in (5, 6):
-                msg = 'The Account (From) Phone # specified ' \
-                      '({}) is invalid.'.format(source)
+                msg = (
+                    "The Account (From) Phone # specified "
+                    f"({source}) is invalid."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -245,75 +326,77 @@ def __init__(self, account_sid, auth_token, source, targets=None,
         else:
             # We're dealing with a phone number; so we need to just
             # place a plus symbol at the end of it
-            self.source = '+{}'.format(self.source)
+            self.source = f"+{self.source}"
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for entry in parse_phone_no(targets, prefix=True):
             # Detect mode
             # w: (or whatsapp:) will trigger whatsapp message otherwise
             #   sms/mms as normal
             result = MODE_DETECT_RE.match(entry)
-            mode = TwilioMessageMode.WHATSAPP if result.group('mode') and \
-                result.group('mode')[0].lower() == 'w' else self.default_mode
+            mode = (
+                TwilioMessageMode.WHATSAPP
+                if result.group("mode")
+                and result.group("mode")[0].lower() == "w"
+                else self.default_mode
+            )
 
             # Validate targets and drop bad ones:
-            result = is_phone_no(result.group('phoneno'))
+            result = is_phone_no(result.group("phoneno"))
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(entry),
+                    f"Dropped invalid phone # ({entry}) specified.",
                 )
                 continue
 
-            # We can't send twilio messages using short-codes as our source
-            if len(self.source) in (5, 6) and mode is \
-                    TwilioMessageMode.WHATSAPP:
+            # We can't use WhatsApp using short-codes as our source or
+            # for phone calls
+            if ((len(self.source) in (5, 6)
+                 or self.method == TwilioNotificationMethod.CALL)
+                    and mode is TwilioMessageMode.WHATSAPP):
                 self.logger.warning(
-                    'Dropped WhatsApp phone # '
-                    '({}) because source provided was a short-code.'.format(
-                        entry),
+                    f"Dropped WhatsApp phone # ({entry}) because source"
+                    " provided is a short-code or because notification"
+                    " method is phone call.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append((mode, '+{}'.format(result['full'])))
+            self.targets.append((mode, "+{}".format(result["full"])))
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Twilio Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Twilio Notification."""
 
-        if not self.targets:
-            if len(self.source) in (5, 6):
-                # Generate a warning since we're a short-code.  We need
-                # a number to message at minimum
-                self.logger.warning(
-                    'There are no valid Twilio targets to notify.')
-                return False
+        if not self.targets and len(self.source) in (5, 6):
+            # Generate a warning since we're a short-code.  We need
+            # a number to message at minimum
+            self.logger.warning("There are no valid Twilio targets to notify.")
+            return False
 
         # error tracking (used for function return)
         has_error = False
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
         }
 
         # Prepare our payload
-        payload = {
-            'Body': body,
-            # The From and To gets populated in the loop below
-            'From': None,
-            'To': None,
-        }
+        payload = {}
 
-        # Prepare our Twilio URL
-        url = self.notify_url.format(sid=self.account_sid)
+        # Prepare our Twilio URL and payload parameter according
+        # to notification method
+        if self.method == TwilioNotificationMethod.SMS:
+            url = self.notify_sms_url.format(sid=self.account_sid)
+            payload["Body"] = body
+        else:
+            url = self.notify_call_url.format(sid=self.account_sid)
+            payload["Twiml"] = body
 
         # Create a copy of the targets list
         targets = list(self.targets)
@@ -321,8 +404,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         # Set up our authentication. Prefer the API Key if provided.
         auth = (self.apikey or self.account_sid, self.auth_token)
 
-        if len(targets) == 0:
-            # No sources specified, use our own phone no
+        if len(targets) == 0 and self.method != TwilioNotificationMethod.CALL:
+            # No sources specified, use our own phone only with messages
             targets.append((self.default_mode, self.source))
 
         while len(targets):
@@ -331,17 +414,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # Prepare our user
             if mode is TwilioMessageMode.TEXT:
-                payload['From'] = self.source
-                payload['To'] = target
+                payload["From"] = self.source
+                payload["To"] = target
 
             else:  # WhatsApp support (via Twilio)
-                payload['From'] = f'whatsapp:{self.source}'
-                payload['To'] = f'whatsapp:{target}'
+                payload["From"] = f"whatsapp:{self.source}"
+                payload["To"] = f"whatsapp:{target}"
 
             # Some Debug Logging
-            self.logger.debug('Twilio POST URL: {} (cert_verify={})'.format(
-                url, self.verify_certificate))
-            self.logger.debug('Twilio Payload: {}' .format(payload))
+            self.logger.debug(
+                "Twilio POST URL:"
+                f" {url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Twilio Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -356,10 +441,13 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
 
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
@@ -367,8 +455,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     try:
                         # Update our status response if we can
                         json_response = loads(r.content)
-                        status_code = json_response.get('code', status_code)
-                        status_str = json_response.get('message', status_str)
+                        status_code = json_response.get("code", status_code)
+                        status_str = json_response.get("message", status_str)
 
                     except (AttributeError, TypeError, ValueError):
                         # ValueError = r.content is Unparsable
@@ -380,30 +468,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         pass
 
                     self.logger.warning(
-                        'Failed to send Twilio notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Twilio notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Twilio notification to {}.'.format(target))
+                    self.logger.info(f"Sent Twilio notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Twilio:%s ' % (
-                        target) + 'notification.'
+                    f"A Connection error occurred sending Twilio:{target} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -411,58 +500,73 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         return not has_error
 
+    @property
+    def body_maxlen(self):
+        """The maximum allowable characters allowed in the body per message.
+        It is dependent on the notification method."""
+        return self.body_sms_maxlen \
+            if self.method == TwilioNotificationMethod.SMS \
+            else self.body_call_maxlen
+
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.account_sid, self.auth_token,
+            self.secure_protocol,
+            self.account_sid,
+            self.auth_token,
             self.source,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
+        params["method"] = self.method
+
         if self.apikey is not None:
             # apikey specified; pass it back on the url
-            params['apikey'] = self.apikey
+            params["apikey"] = self.apikey
 
-        return '{schema}://{sid}:{token}@{source}/{targets}/?{params}'.format(
+        return "{schema}://{sid}:{token}@{source}/{targets}/?{params}".format(
             schema=self.secure_protocol,
             sid=self.pprint(
-                self.account_sid, privacy, mode=PrivacyMode.Tail, safe=''),
-            token=self.pprint(self.auth_token, privacy, safe=''),
+                self.account_sid, privacy, mode=PrivacyMode.Tail, safe=""
+            ),
+            token=self.pprint(self.auth_token, privacy, safe=""),
             source=NotifyTwilio.quote(
-                self.source if self.default_mode is TwilioMessageMode.TEXT
-                else 'w:{}'.format(self.source), safe=''),
-            targets='/'.join(
-                [NotifyTwilio.quote(
-                    x[1] if x[0] is TwilioMessageMode.TEXT
-                    else 'w:{}'.format(x[1]), safe='') for x in self.targets]),
-            params=NotifyTwilio.urlencode(params))
+                (
+                    self.source
+                    if self.default_mode is TwilioMessageMode.TEXT
+                    else f"w:{self.source}"
+                ),
+                safe="",
+            ),
+            targets="/".join([
+                NotifyTwilio.quote(
+                    (x[1] if x[0] is TwilioMessageMode.TEXT else f"w:{x[1]}"),
+                    safe="",
+                )
+                for x in self.targets
+            ]),
+            params=NotifyTwilio.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
 
         if not results:
@@ -471,45 +575,51 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyTwilio.split_path(results['fullpath'])
+        results["targets"] = NotifyTwilio.split_path(results["fullpath"])
 
         # The hostname is our source number
-        results['source'] = NotifyTwilio.unquote(results['host'])
+        results["source"] = NotifyTwilio.unquote(results["host"])
 
         # Get our account_side and auth_token from the user/pass config
-        results['account_sid'] = NotifyTwilio.unquote(results['user'])
-        results['auth_token'] = NotifyTwilio.unquote(results['password'])
+        results["account_sid"] = NotifyTwilio.unquote(results["user"])
+        results["auth_token"] = NotifyTwilio.unquote(results["password"])
 
         # Auth Token
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Extract the account sid from an argument
-            results['auth_token'] = \
-                NotifyTwilio.unquote(results['qsd']['token'])
+            results["auth_token"] = NotifyTwilio.unquote(
+                results["qsd"]["token"]
+            )
 
         # Account SID
-        if 'sid' in results['qsd'] and len(results['qsd']['sid']):
+        if "sid" in results["qsd"] and len(results["qsd"]["sid"]):
             # Extract the account sid from an argument
-            results['account_sid'] = \
-                NotifyTwilio.unquote(results['qsd']['sid'])
+            results["account_sid"] = NotifyTwilio.unquote(
+                results["qsd"]["sid"]
+            )
 
         # API Key
-        if 'apikey' in results['qsd'] and len(results['qsd']['apikey']):
-            results['apikey'] = results['qsd']['apikey']
+        if "apikey" in results["qsd"] and len(results["qsd"]["apikey"]):
+            results["apikey"] = results["qsd"]["apikey"]
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyTwilio.unquote(results['qsd']['from'])
-        if 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifyTwilio.unquote(results['qsd']['source'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyTwilio.unquote(results["qsd"]["from"])
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifyTwilio.unquote(results["qsd"]["source"])
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyTwilio.parse_phone_no(results['qsd']['to'], prefix=True)
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyTwilio.parse_phone_no(
+                results["qsd"]["to"], prefix=True
+            )
+
+        # Notification method
+        if "method" in results["qsd"] and len(results["qsd"]["method"]):
+            # Extract the notification method from an argument
+            results["method"] = NotifyTwilio.unquote(results["qsd"]["method"])
 
         return results
diff --git a/libs/apprise/plugins/twist.py b/libs/apprise/plugins/twist.py
index 9e7512fcb7..2a03ddf34b 100644
--- a/libs/apprise/plugins/twist.py
+++ b/libs/apprise/plugins/twist.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,48 +29,47 @@
 # All of the documentation needed to work with the Twist API can be found
 # here: https://developer.twist.com/v3/
 
+from itertools import chain
+from json import loads
 import re
+
 import requests
-from json import loads
-from itertools import chain
 
-from .base import NotifyBase
-from ..url import PrivacyMode
-from ..common import NotifyFormat
-from ..common import NotifyType
-from ..utils.parse import parse_list, is_email
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
-
+from ..url import PrivacyMode
+from ..utils.parse import is_email, parse_list
+from .base import NotifyBase
 
 # A workspace can also be interpreted as a team name too!
 IS_CHANNEL = re.compile(
-    r'^#?(?P<name>((?P<workspace>[A-Za-z0-9_-]+):)?'
-    r'(?P<channel>[^\s]{1,64}))$')
+    r"^#?(?P<name>((?P<workspace>[A-Za-z0-9_-]+):)?"
+    r"(?P<channel>[^\s]{1,64}))$"
+)
 
 IS_CHANNEL_ID = re.compile(
-    r'^(?P<name>((?P<workspace>[0-9]+):)?(?P<channel>[0-9]+))$')
+    r"^(?P<name>((?P<workspace>[0-9]+):)?(?P<channel>[0-9]+))$"
+)
 
 # Used to break apart list of potential tags by their delimiter
 # into a usable list.
-LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
+LIST_DELIM = re.compile(r"[ \t\r\n,\\/]+")
 
 
 class NotifyTwist(NotifyBase):
-    """
-    A wrapper for Notify Twist Notifications
-    """
+    """A wrapper for Notify Twist Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Twist'
+    service_name = "Twist"
 
     # The services URL
-    service_url = 'https://twist.com'
+    service_url = "https://twist.com"
 
     # The default secure protocol
-    secure_protocol = 'twist'
+    secure_protocol = "twist"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_twist'
+    setup_url = "https://appriseit.com/services/twist/"
 
     # The maximum size of the message
     body_maxlen = 1000
@@ -80,62 +78,66 @@ class NotifyTwist(NotifyBase):
     notify_format = NotifyFormat.MARKDOWN
 
     # The default Notification URL to use
-    api_url = 'https://api.twist.com/api/v3/'
+    api_url = "https://api.twist.com/api/v3/"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.2
 
     # The default channel to notify if no targets are specified
-    default_notification_channel = 'general'
+    default_notification_channel = "general"
 
     # Define object templates
     templates = (
-        '{schema}://{password}:{email}',
-        '{schema}://{password}:{email}/{targets}',
+        "{schema}://{password}:{email}",
+        "{schema}://{password}:{email}/{targets}",
     )
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "email": {
+                "name": _("Email"),
+                "type": "string",
+                "required": True,
+            },
+            "target_channel": {
+                "name": _("Target Channel"),
+                "type": "string",
+                "prefix": "#",
+                "map_to": "targets",
+            },
+            "target_channel_id": {
+                "name": _("Target Channel ID"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'email': {
-            'name': _('Email'),
-            'type': 'string',
-            'required': True,
-        },
-        'target_channel': {
-            'name': _('Target Channel'),
-            'type': 'string',
-            'prefix': '#',
-            'map_to': 'targets',
-        },
-        'target_channel_id': {
-            'name': _('Target Channel ID'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
         },
-    })
+    )
 
     def __init__(self, email=None, targets=None, **kwargs):
-        """
-        Initialize Notify Twist Object
-        """
+        """Initialize Notify Twist Object."""
         super().__init__(**kwargs)
 
         # Initialize channels list
@@ -168,36 +170,31 @@ def __init__(self, email=None, targets=None, **kwargs):
         #          ...
         #     },
         #  }
-        self._cached_channels = dict()
+        self._cached_channels = {}
 
         # Initialize our Email Object
-        self.email = email if email else '{}@{}'.format(
-            self.user,
-            self.host,
-        )
+        self.email = email if email else f"{self.user}@{self.host}"
 
         # Check if it is valid
         result = is_email(self.email)
         if not result:
             # let outer exception handle this
-            msg = 'The Twist Auth email specified ({}) is invalid.'\
-                .format(self.email)
+            msg = f"The Twist Auth email specified ({self.email}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Re-assign email based on what was parsed
-        self.email = result['full_email']
+        self.email = result["full_email"]
         if email:
             # Force user/host to be that of the defined email for
             # consistency. This is very important for those initializing
             # this object with the the email object would could potentially
             # cause inconsistency to contents in the NotifyBase() object
-            self.user = result['user']
-            self.host = result['domain']
+            self.user = result["user"]
+            self.host = result["domain"]
 
         if not self.password:
-            msg = 'No Twist password was specified with account: {}'\
-                .format(self.email)
+            msg = f"No Twist password was specified with account: {self.email}"
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -206,80 +203,81 @@ def __init__(self, email=None, targets=None, **kwargs):
             result = IS_CHANNEL_ID.match(recipient)
             if result:
                 # store valid channel id
-                self.channel_ids.add(result.group('name'))
+                self.channel_ids.add(result.group("name"))
                 continue
 
             result = IS_CHANNEL.match(recipient)
             if result:
                 # store valid device
-                self.channels.add(result.group('name').lower())
+                self.channels.add(result.group("name").lower())
                 continue
 
             self.logger.warning(
-                'Dropped invalid channel/id '
-                '({}) specified.'.format(recipient),
+                f"Dropped invalid channel/id ({recipient}) specified.",
             )
 
         if len(self.channels) + len(self.channel_ids) == 0:
             # Notify our default channel
             self.channels.add(self.default_notification_channel)
             self.logger.warning(
-                'Added default notification channel {}'.format(
-                    self.default_notification_channel))
+                "Added default notification channel "
+                f"{self.default_notification_channel}"
+            )
         return
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
             self.secure_protocol if self.secure else self.protocol,
-            self.user, self.password, self.host, self.port,
+            self.user,
+            self.password,
+            self.host,
+            self.port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{password}:{user}@{host}/{targets}/' \
-            '?{params}'.format(
+        return (
+            "{schema}://{password}:{user}@{host}/{targets}/?{params}".format(
                 schema=self.secure_protocol,
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
-                user=self.quote(self.user, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
+                user=self.quote(self.user, safe=""),
                 host=self.host,
-                targets='/'.join(
-                    [NotifyTwist.quote(x, safe='') for x in chain(
+                targets="/".join([
+                    NotifyTwist.quote(x, safe="")
+                    for x in chain(
                         # Channels are prefixed with a pound/hashtag symbol
-                        ['#{}'.format(x) for x in self.channels],
+                        [f"#{x}" for x in self.channels],
                         # Channel IDs
                         self.channel_ids,
-                    )]),
+                    )
+                ]),
                 params=NotifyTwist.urlencode(params),
             )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.channels) + len(self.channel_ids)
 
     def login(self):
-        """
-        A simple wrapper to authenticate with the Twist Server
-        """
+        """A simple wrapper to authenticate with the Twist Server."""
 
         # Prepare our payload
         payload = {
-            'email': self.email,
-            'password': self.password,
+            "email": self.email,
+            "password": self.password,
         }
 
         # Reset our default workspace
@@ -287,11 +285,11 @@ def login(self):
 
         # Reset our cached objects
         self._cached_workspaces = set()
-        self._cached_channels = dict()
+        self._cached_channels = {}
 
         # Send Login Information
         postokay, response = self._fetch(
-            'users/login',
+            "users/login",
             payload=payload,
             # We set this boolean so internal recursion doesn't take place.
             login=True,
@@ -355,25 +353,23 @@ def login(self):
         # }
 
         # Store our default workspace
-        self.default_workspace = response.get('default_workspace')
+        self.default_workspace = response.get("default_workspace")
 
         # Acquire our token
-        self.token = response.get('token')
+        self.token = response.get("token")
 
-        self.logger.info('Authenticated to Twist as {}'.format(self.email))
+        self.logger.info(f"Authenticated to Twist as {self.email}")
         return True
 
     def logout(self):
-        """
-        A simple wrapper to log out of the server
-        """
+        """A simple wrapper to log out of the server."""
 
         if not self.token:
             # Nothing more to do
             return True
 
         # Send Logout Message
-        postokay, response = self._fetch('users/logout')
+        _postokay, _response = self._fetch("users/logout")
 
         # reset our token
         self.token = None
@@ -382,8 +378,7 @@ def logout(self):
         return True
 
     def get_workspaces(self):
-        """
-        Returns all workspaces associated with this user account as a set
+        """Returns all workspaces associated with this user account as a set.
 
         This returned object is either an empty dictionary or one that
         looks like this:
@@ -397,12 +392,12 @@ def get_workspaces(self):
         """
         if not self.token and not self.login():
             # Nothing more to do
-            return dict()
+            return {}
 
-        postokay, response = self._fetch('workspaces/get')
+        postokay, response = self._fetch("workspaces/get")
         if not postokay or not response:
             # We failed to retrieve
-            return dict()
+            return {}
 
         # The response object looks like so:
         #   [
@@ -422,13 +417,12 @@ def get_workspaces(self):
         # object
         result = {}
         for entry in response:
-            result[entry.get('name', '').lower()] = entry.get('id', '')
+            result[entry.get("name", "").lower()] = entry.get("id", "")
 
         return result
 
     def get_channels(self, wid):
-        """
-        Simply returns the channel objects associated with the specified
+        """Simply returns the channel objects associated with the specified
         workspace id.
 
         This returned object is either an empty dictionary or one that
@@ -445,9 +439,8 @@ def get_channels(self, wid):
             # Nothing more to do
             return {}
 
-        payload = {'workspace_id': wid}
-        postokay, response = self._fetch(
-            'channels/get', payload=payload)
+        payload = {"workspace_id": wid}
+        postokay, response = self._fetch("channels/get", payload=payload)
 
         if not postokay or not isinstance(response, list):
             # We failed to retrieve
@@ -475,18 +468,17 @@ def get_channels(self, wid):
         # object
         result = {}
         for entry in response:
-            result[entry.get('name', '').lower()] = entry.get('id', '')
+            result[entry.get("name", "").lower()] = entry.get("id", "")
 
         return result
 
     def _channel_migration(self):
-        """
-        A simple wrapper to get all of the current workspaces including
-        the default one.  This plays a role in what channel(s) get notified
-        and where.
+        """A simple wrapper to get all of the current workspaces including the
+        default one.  This plays a role in what channel(s) get notified and
+        where.
 
-        A cache lookup has overhead, and is only required to be preformed
-        if the user specified channels by their string value
+        A cache lookup has overhead, and is only required to be preformed if
+        the user specified channels by their string value
         """
 
         if not self.token and not self.login():
@@ -497,11 +489,14 @@ def _channel_migration(self):
             # Nothing to do; take an early exit
             return True
 
-        if self.default_workspace \
-                and self.default_workspace not in self._cached_channels:
+        if (
+            self.default_workspace
+            and self.default_workspace not in self._cached_channels
+        ):
             # Get our default workspace entries
-            self._cached_channels[self.default_workspace] = \
-                self.get_channels(self.default_workspace)
+            self._cached_channels[self.default_workspace] = self.get_channels(
+                self.default_workspace
+            )
 
         # initialize our error tracking
         has_error = False
@@ -511,8 +506,8 @@ def _channel_migration(self):
             result = IS_CHANNEL.match(self.channels.pop())
 
             # Populate our key variables
-            workspace = result.group('workspace')
-            channel = result.group('channel').lower()
+            workspace = result.group("workspace")
+            channel = result.group("channel").lower()
 
             # Acquire our workspace_id if we can
             if workspace:
@@ -527,8 +522,9 @@ def _channel_migration(self):
                 if workspace not in self._cached_workspaces:
                     # not found
                     self.logger.warning(
-                        'The Twist User {} is not associated with the '
-                        'Team {}'.format(self.email, workspace))
+                        f"The Twist User {self.email} is not associated "
+                        f"with the Team {workspace}"
+                    )
 
                     # Toggle our return flag
                     has_error = True
@@ -542,22 +538,24 @@ def _channel_migration(self):
                 workspace_id = self.default_workspace
 
             # Check to see if our channel exists in our default workspace
-            if workspace_id in self._cached_channels \
-                    and channel in self._cached_channels[workspace_id]:
+            if (
+                workspace_id in self._cached_channels
+                and channel in self._cached_channels[workspace_id]
+            ):
                 # Store our channel ID
-                self.channel_ids.add('{}:{}'.format(
-                    workspace_id,
-                    self._cached_channels[workspace_id][channel],
-                ))
+                self.channel_ids.add(
+                    f"{workspace_id}"
+                    f":{self._cached_channels[workspace_id][channel]}"
+                )
                 continue
 
             # if we reach here, we failed to add our channel
             self.logger.warning(
-                'The Channel #{} was not found{}.'.format(
+                "The Channel #{} was not found{}.".format(
                     channel,
-                    '' if not workspace
-                    else ' with Team {}'.format(workspace),
-                ))
+                    "" if not workspace else f" with Team {workspace}",
+                )
+            )
 
             # Toggle our return flag
             has_error = True
@@ -566,10 +564,8 @@ def _channel_migration(self):
         # There is no need to handling failed log out attempts at this time
         return not has_error
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Twist Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Twist Notification."""
 
         # error tracking (used for function return)
         has_error = False
@@ -585,7 +581,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         if not len(self.channel_ids):
             # We have nothing to notify
-            self.logger.warning('There are no Twist targets to notify')
+            self.logger.warning("There are no Twist targets to notify")
             return False
 
         # Notify all of our identified channels
@@ -595,17 +591,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             result = IS_CHANNEL_ID.match(ids.pop())
 
             # We need both the workspace/team id and channel id
-            channel_id = int(result.group('channel'))
+            channel_id = int(result.group("channel"))
 
             # Prepare our payload
             payload = {
-                'channel_id': channel_id,
-                'title': title,
-                'content': body,
+                "channel_id": channel_id,
+                "title": title,
+                "content": body,
             }
 
-            postokay, response = self._fetch(
-                'threads/add',
+            postokay, _response = self._fetch(
+                "threads/add",
                 payload=payload,
             )
 
@@ -617,35 +613,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # If we reach here, we were successful
             self.logger.info(
-                'Sent Twist notification to {}.'.format(
-                    result.group('name')))
+                "Sent Twist notification to {}.".format(result.group("name"))
+            )
 
         return not has_error
 
-    def _fetch(self, url, payload=None, method='POST', login=False):
-        """
-        Wrapper to Twist API requests object
-        """
+    def _fetch(self, url, payload=None, method="POST", login=False):
+        """Wrapper to Twist API requests object."""
 
         # use what was specified, otherwise build headers dynamically
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
-        headers['Content-Type'] = \
-            'application/x-www-form-urlencoded; charset=utf-8'
+        headers["Content-Type"] = (
+            "application/x-www-form-urlencoded; charset=utf-8"
+        )
 
         if self.token:
             # Set our token
-            headers['Authorization'] = 'Bearer {}'.format(self.token)
+            headers["Authorization"] = f"Bearer {self.token}"
 
         # Prepare our api url
-        api_url = '{}{}'.format(self.api_url, url)
+        api_url = f"{self.api_url}{url}"
 
         # Some Debug Logging
-        self.logger.debug('Twist {} URL: {} (cert_verify={})'.format(
-            method, api_url, self.verify_certificate))
-        self.logger.debug('Twist Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Twist {method} URL: {api_url} "
+            f"(cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"Twist Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made;
         self.throttle()
@@ -654,7 +651,7 @@ def _fetch(self, url, payload=None, method='POST', login=False):
         content = {}
 
         # acquire our request mode
-        fn = requests.post if method == 'POST' else requests.get
+        fn = requests.post if method == "POST" else requests.get
         try:
             r = fn(
                 api_url,
@@ -691,54 +688,58 @@ def _fetch(self, url, payload=None, method='POST', login=False):
             #
             #  We attempt to login again and retry the original request
             #  if we aren't in the process of handling a login already
-            if r.status_code != requests.codes.ok and login is False \
-                    and isinstance(content, dict) and \
-                    content.get('error_code') in (120, 200):
-                # We failed to authenticate with our token; login one more
-                # time and retry this original request
-                if self.login():
-                    r = fn(
-                        api_url,
-                        data=payload,
-                        headers=headers,
-                        verify=self.verify_certificate,
-                        timeout=self.request_timeout
-                    )
-
-                    # Get our JSON content if it's possible
-                    try:
-                        content = loads(r.content)
-
-                    except (TypeError, ValueError, AttributeError):
-                        # TypeError = r.content is not a String
-                        # ValueError = r.content is Unparsable
-                        # AttributeError = r.content is None
-                        content = {}
+            if (
+                r.status_code != requests.codes.ok
+                and login is False
+                and isinstance(content, dict)
+                and content.get("error_code") in (120, 200)
+                and self.login()
+            ):
+
+                r = fn(
+                    api_url,
+                    data=payload,
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+
+                # Get our JSON content if it's possible
+                try:
+                    content = loads(r.content)
+
+                except (TypeError, ValueError, AttributeError):
+                    # TypeError = r.content is not a String
+                    # ValueError = r.content is Unparsable
+                    # AttributeError = r.content is None
+                    content = {}
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyTwist.http_response_code_lookup(r.status_code)
+                status_str = NotifyTwist.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Twist {} to {}: '
-                    '{}error={}.'.format(
+                    "Failed to send Twist {} to {}: {}error={}.".format(
                         method,
                         api_url,
-                        ', ' if status_str else '',
-                        r.status_code))
+                        ", " if status_str else "",
+                        r.status_code,
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Mark our failure
                 return (False, content)
 
         except requests.RequestException as e:
             self.logger.warning(
-                'Exception received when sending Twist {} to {}: '.
-                format(method, api_url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"Exception received when sending Twist {method} to {api_url}"
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             return (False, content)
@@ -747,27 +748,24 @@ def _fetch(self, url, payload=None, method='POST', login=False):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        if not results.get('user'):
+        if not results.get("user"):
             # A username is required
             return None
 
         # Acquire our targets
-        results['targets'] = NotifyTwist.split_path(results['fullpath'])
+        results["targets"] = NotifyTwist.split_path(results["fullpath"])
 
-        if not results.get('password'):
+        if not results.get("password"):
             # Password is required; we will accept the very first entry on the
             # path as a password instead
-            if len(results['targets']) == 0:
+            if len(results["targets"]) == 0:
                 # No targets to get our password from
                 return None
 
@@ -775,8 +773,9 @@ def parse_url(url):
             # unquoted later on in the process.  This step appears a bit
             # hacky, but it allows us to support the password in this location
             #   - twist://user@example.com/password
-            results['password'] = NotifyTwist.quote(
-                results['targets'].pop(0), safe='')
+            results["password"] = NotifyTwist.quote(
+                results["targets"].pop(0), safe=""
+            )
 
         else:
             # Now we handle our format:
@@ -795,61 +794,16 @@ def parse_url(url):
             # For the purpose of apprise simplifying this for us, we need to
             # swap these arguments when we prepare the email.
 
-            _password = results['user']
-            results['user'] = results['password']
-            results['password'] = _password
+            password = results["user"]
+            results["user"] = results["password"]
+            results["password"] = password
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyTwist.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyTwist.parse_list(results["qsd"]["to"])
 
         return results
 
     def __del__(self):
-        """
-        Destructor
-        """
-        try:
-            self.logout()
-
-        except LookupError:  # pragma: no cover
-            # Python v3.5 call to requests can sometimes throw the exception
-            #   "/usr/lib64/python3.7/socket.py", line 748, in getaddrinfo
-            #   LookupError: unknown encoding: idna
-            #
-            # This occurs every time when running unit-tests against Apprise:
-            # LANG=C.UTF-8 PYTHONPATH=$(pwd) py.test-3.7
-            #
-            # There has been an open issue on this since Jan 2017.
-            #   - https://bugs.python.org/issue29288
-            #
-            # A ~similar~ issue can be identified here in the requests
-            # ticket system as unresolved and has provided work-arounds
-            #   - https://github.com/kennethreitz/requests/issues/3578
-            pass
-
-        except ImportError:  # pragma: no cover
-            # The actual exception is `ModuleNotFoundError` however ImportError
-            # grants us backwards compatibility with versions of Python older
-            # than v3.6
-
-            # Python code that makes early calls to sys.exit() can cause
-            # the __del__() code to run. However, in some newer versions of
-            # Python, this causes the `sys` library to no longer be
-            # available. The stack overflow also goes on to suggest that
-            # it's not wise to use the __del__() as a destructor
-            # which is the case here.
-
-            # https://stackoverflow.com/questions/67218341/\
-            #       modulenotfounderror-import-of-time-halted-none-in-sys-\
-            #           modules-occured-when-obj?noredirect=1&lq=1
-            #
-            #
-            # Also see: https://stackoverflow.com/questions\
-            #       /1481488/what-is-the-del-method-and-how-do-i-call-it
-
-            # At this time it seems clean to try to log out (if we can)
-            # but not throw any unnecessary exceptions (like this one) to
-            # the end user if we don't have to.
-            pass
+        """Destructor."""
+        self.logout()
diff --git a/libs/apprise/plugins/twitter.py b/libs/apprise/plugins/twitter.py
index e16cedc1e8..bc795437ea 100644
--- a/libs/apprise/plugins/twitter.py
+++ b/libs/apprise/plugins/twitter.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,33 +27,33 @@
 
 # See https://developer.twitter.com/en/docs/direct-messages/\
 #           sending-and-receiving/api-reference/new-event.html
+import contextlib
+from copy import deepcopy
+from datetime import datetime, timezone
+from json import dumps, loads
 import re
+
 import requests
-from copy import deepcopy
-from datetime import datetime
-from datetime import timezone
 from requests_oauthlib import OAuth1
-from json import dumps
-from json import loads
-from .base import NotifyBase
-from ..url import PrivacyMode
+
+from ..attachment.base import AttachBase
 from ..common import NotifyType
-from ..utils.parse import parse_list, parse_bool, validate_regex
 from ..locale import gettext_lazy as _
-from ..attachment.base import AttachBase
+from ..url import PrivacyMode
+from ..utils.parse import parse_bool, parse_list, validate_regex
+from .base import NotifyBase
 
-IS_USER = re.compile(r'^\s*@?(?P<user>[A-Z0-9_]+)$', re.I)
+IS_USER = re.compile(r"^\s*@?(?P<user>[A-Z0-9_]+)$", re.I)
 
 
 class TwitterMessageMode:
-    """
-    Twitter Message Mode
-    """
+    """Twitter Message Mode."""
+
     # DM (a Direct Message)
-    DM = 'dm'
+    DM = "dm"
 
     # A Public Tweet
-    TWEET = 'tweet'
+    TWEET = "tweet"
 
 
 # Define the types in a list for validation purposes
@@ -65,22 +64,19 @@ class TwitterMessageMode:
 
 
 class NotifyTwitter(NotifyBase):
-    """
-    A wrapper to Twitter Notifications
-
-    """
+    """A wrapper to Twitter Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Twitter'
+    service_name = "Twitter"
 
     # The services URL
-    service_url = 'https://twitter.com/'
+    service_url = "https://twitter.com/"
 
     # The default secure protocol is twitter.
-    secure_protocol = ('x', 'twitter', 'tweet')
+    secure_protocol = ("x", "twitter", "tweet")
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_twitter'
+    setup_url = "https://appriseit.com/services/twitter/"
 
     # Support attachments
     attachment_support = True
@@ -94,24 +90,25 @@ class NotifyTwitter(NotifyBase):
     title_maxlen = 0
 
     # Twitter API Reference To Acquire Someone's Twitter ID
-    twitter_lookup = 'https://api.twitter.com/1.1/users/lookup.json'
+    twitter_lookup = "https://api.twitter.com/1.1/users/lookup.json"
 
     # Twitter API Reference To Acquire Current Users Information
-    twitter_whoami = \
-        'https://api.twitter.com/1.1/account/verify_credentials.json'
+    twitter_whoami = (
+        "https://api.twitter.com/1.1/account/verify_credentials.json"
+    )
 
     # Twitter API Reference To Send A Private DM
-    twitter_dm = 'https://api.twitter.com/1.1/direct_messages/events/new.json'
+    twitter_dm = "https://api.twitter.com/1.1/direct_messages/events/new.json"
 
     # Twitter API Reference To Send A Public Tweet
-    twitter_tweet = 'https://api.twitter.com/1.1/statuses/update.json'
+    twitter_tweet = "https://api.twitter.com/1.1/statuses/update.json"
 
     # it is documented on the site that the maximum images per tweet
     # is 4 (unless it's a GIF, then it's only 1)
     __tweet_non_gif_images_batch = 4
 
     # Twitter Media (Attachment) Upload Location
-    twitter_media = 'https://upload.twitter.com/1.1/media/upload.json'
+    twitter_media = "https://upload.twitter.com/1.1/media/upload.json"
 
     # Twitter is kind enough to return how many more requests we're allowed to
     # continue to make within it's header response as:
@@ -129,112 +126,135 @@ class NotifyTwitter(NotifyBase):
     ratelimit_remaining = 1
 
     templates = (
-        '{schema}://{ckey}/{csecret}/{akey}/{asecret}',
-        '{schema}://{ckey}/{csecret}/{akey}/{asecret}/{targets}',
+        "{schema}://{ckey}/{csecret}/{akey}/{asecret}",
+        "{schema}://{ckey}/{csecret}/{akey}/{asecret}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'ckey': {
-            'name': _('Consumer Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'csecret': {
-            'name': _('Consumer Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'akey': {
-            'name': _('Access Key'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'asecret': {
-            'name': _('Access Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'prefix': '@',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "ckey": {
+                "name": _("Consumer Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "csecret": {
+                "name": _("Consumer Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "akey": {
+                "name": _("Access Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "asecret": {
+                "name": _("Access Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "prefix": "@",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'mode': {
-            'name': _('Message Mode'),
-            'type': 'choice:string',
-            'values': TWITTER_MESSAGE_MODES,
-            'default': TwitterMessageMode.DM,
-        },
-        'cache': {
-            'name': _('Cache Results'),
-            'type': 'bool',
-            'default': True,
-        },
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "mode": {
+                "name": _("Message Mode"),
+                "type": "choice:string",
+                "values": TWITTER_MESSAGE_MODES,
+                "default": TwitterMessageMode.DM,
+            },
+            "cache": {
+                "name": _("Cache Results"),
+                "type": "bool",
+                "default": True,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "batch": {
+                "name": _("Batch Mode"),
+                "type": "bool",
+                "default": True,
+            },
         },
-        'batch': {
-            'name': _('Batch Mode'),
-            'type': 'bool',
-            'default': True,
-        },
-    })
-
-    def __init__(self, ckey, csecret, akey, asecret, targets=None,
-                 mode=TwitterMessageMode.DM, cache=True, batch=True, **kwargs):
-        """
-        Initialize Twitter Object
+    )
 
-        """
+    def __init__(
+        self,
+        ckey,
+        csecret,
+        akey,
+        asecret,
+        targets=None,
+        mode=None,
+        cache=True,
+        batch=True,
+        **kwargs,
+    ):
+        """Initialize Twitter Object."""
         super().__init__(**kwargs)
 
         self.ckey = validate_regex(ckey)
         if not self.ckey:
-            msg = 'An invalid Twitter Consumer Key was specified.'
+            msg = "An invalid Twitter Consumer Key was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.csecret = validate_regex(csecret)
         if not self.csecret:
-            msg = 'An invalid Twitter Consumer Secret was specified.'
+            msg = "An invalid Twitter Consumer Secret was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.akey = validate_regex(akey)
         if not self.akey:
-            msg = 'An invalid Twitter Access Key was specified.'
+            msg = "An invalid Twitter Access Key was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.asecret = validate_regex(asecret)
         if not self.asecret:
-            msg = 'An invalid Access Secret was specified.'
+            msg = "An invalid Access Secret was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our webhook mode
-        self.mode = self.template_args['mode']['default'] \
-            if not isinstance(mode, str) else mode.lower()
+        self.mode = (
+            self.template_args["mode"]["default"]
+            if not isinstance(mode, str)
+            else mode.lower()
+        )
 
-        if self.mode not in TWITTER_MESSAGE_MODES:
-            msg = 'The Twitter message mode specified ({}) is invalid.' \
-                .format(mode)
-            self.logger.warning(msg)
-            raise TypeError(msg)
+        if mode and isinstance(mode, str):
+            self.mode = next(
+                (a for a in TWITTER_MESSAGE_MODES if a.startswith(mode)), None
+            )
+            if self.mode not in TWITTER_MESSAGE_MODES:
+                msg = (
+                    f"The Twitter message mode specified ({mode}) is invalid."
+                )
+                self.logger.warning(msg)
+                raise TypeError(msg)
+        else:
+            self.mode = self.template_args["mode"]["default"]
 
         # Set Cache Flag
         self.cache = cache
@@ -249,13 +269,13 @@ def __init__(self, ckey, csecret, akey, asecret, targets=None,
         self.targets = []
         for target in parse_list(targets):
             match = IS_USER.match(target)
-            if match and match.group('user'):
-                self.targets.append(match.group('user'))
+            if match and match.group("user"):
+                self.targets.append(match.group("user"))
                 continue
 
             has_error = True
             self.logger.warning(
-                'Dropped invalid Twitter user ({}) specified.'.format(target),
+                f"Dropped invalid Twitter user ({target}) specified.",
             )
 
         if has_error and not self.targets:
@@ -263,9 +283,7 @@ def __init__(self, ckey, csecret, akey, asecret, targets=None,
             # and we failed to load any of them.  Since it's also valid to
             # notify no one at all (which means we notify ourselves), it's
             # important we don't switch from the users original intentions
-            msg = 'No Twitter targets to notify.'
-            self.logger.warning(msg)
-            raise TypeError(msg)
+            self.targets = None
 
         # Initialize our cache values
         self._whoami_cache = None
@@ -273,11 +291,19 @@ def __init__(self, ckey, csecret, akey, asecret, targets=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
-             **kwargs):
-        """
-        Perform Twitter Notification
-        """
+    def send(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attach=None,
+        **kwargs,
+    ):
+        """Perform Twitter Notification."""
+
+        if self.targets is None:
+            self.logger.warning("No valid Twitter targets to notify.")
+            return False
 
         # Build a list of our attachments
         attachments = []
@@ -291,20 +317,23 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 if not attachment:
                     # We could not access the attachment
                     self.logger.error(
-                        'Could not access attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Could not access attachment "
+                        f"'{attachment.url(privacy=True)}."
+                    )
                     return False
 
-                if not re.match(r'^image/.*', attachment.mimetype, re.I):
+                if not re.match(r"^image/.*", attachment.mimetype, re.I):
                     # Only support images at this time
                     self.logger.warning(
-                        'Ignoring unsupported Twitter attachment {}.'.format(
-                            attachment.url(privacy=True)))
+                        "Ignoring unsupported Twitter attachment "
+                        f"{attachment.url(privacy=True)}."
+                    )
                     continue
 
                 self.logger.debug(
-                    'Preparing Twitter attachment {}'.format(
-                        attachment.url(privacy=True)))
+                    "Preparing Twitter attachment "
+                    f"{attachment.url(privacy=True)}"
+                )
 
                 # Upload our image and get our id associated with it
                 # see: https://developer.twitter.com/en/docs/twitter-api/v1/\
@@ -319,14 +348,18 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                     return False
 
                 # Prepare our filename
-                filename = attachment.name \
-                    if attachment.name else f'file{no:03}.dat'
+                filename = (
+                    attachment.name if attachment.name else f"file{no:03}.dat"
+                )
 
-                if not (isinstance(response, dict)
-                        and response.get('media_id')):
+                if not (
+                    isinstance(response, dict) and response.get("media_id")
+                ):
                     self.logger.debug(
-                        'Could not attach the file to Twitter: %s (mime=%s)',
-                        filename, attachment.mimetype)
+                        "Could not attach the file to Twitter: %s (mime=%s)",
+                        filename,
+                        attachment.mimetype,
+                    )
                     continue
 
                 # If we get here, our output will look something like this:
@@ -346,9 +379,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
                 response.update({
                     # Update our response to additionally include the
                     # attachment details
-                    'file_name': filename,
-                    'file_mime': attachment.mimetype,
-                    'file_path': attachment.path,
+                    "file_name": filename,
+                    "file_mime": attachment.mimetype,
+                    "file_path": attachment.path,
                 })
 
                 # Save our pre-prepared payload for attachment posting
@@ -356,21 +389,29 @@ def send(self, body, title='', notify_type=NotifyType.INFO, attach=None,
 
         # - calls _send_tweet if the mode is set so
         # - calls _send_dm (direct message) otherwise
-        return getattr(self, '_send_{}'.format(self.mode))(
-            body=body, title=title, notify_type=notify_type,
-            attachments=attachments, **kwargs)
+        return getattr(self, f"_send_{self.mode}")(
+            body=body,
+            title=title,
+            notify_type=notify_type,
+            attachments=attachments,
+            **kwargs,
+        )
 
-    def _send_tweet(self, body, title='', notify_type=NotifyType.INFO,
-                    attachments=None, **kwargs):
-        """
-        Twitter Public Tweet
-        """
+    def _send_tweet(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attachments=None,
+        **kwargs,
+    ):
+        """Twitter Public Tweet."""
 
         # Error Tracking
         has_error = False
 
         payload = {
-            'status': body,
+            "status": body,
         }
 
         payloads = []
@@ -379,14 +420,15 @@ def _send_tweet(self, body, title='', notify_type=NotifyType.INFO,
 
         else:
             # Group our images if batch is set to do so
-            batch_size = 1 if not self.batch \
-                else self.__tweet_non_gif_images_batch
+            batch_size = (
+                1 if not self.batch else self.__tweet_non_gif_images_batch
+            )
 
             # Track our batch control in our message generation
             batches = []
             batch = []
             for attachment in attachments:
-                batch.append(str(attachment['media_id']))
+                batch.append(str(attachment["media_id"]))
 
                 # Twitter supports batching images together.  This allows
                 # the batching of multiple images together.  Twitter also
@@ -402,24 +444,26 @@ def _send_tweet(self, body, title='', notify_type=NotifyType.INFO,
                 # If you passed in, image, image, gif, image. <- This would
                 # produce 3 images (as the first 2 images could be lumped
                 # together as a batch)
-                if not re.match(
-                        r'^image/(png|jpe?g)', attachment['file_mime'], re.I) \
-                        or len(batch) >= batch_size:
-                    batches.append(','.join(batch))
+                if (
+                    not re.match(
+                        r"^image/(png|jpe?g)", attachment["file_mime"], re.I
+                    )
+                    or len(batch) >= batch_size
+                ):
+                    batches.append(",".join(batch))
                     batch = []
 
             if batch:
-                batches.append(','.join(batch))
+                batches.append(",".join(batch))
 
             for no, media_ids in enumerate(batches):
-                _payload = deepcopy(payload)
-                _payload['media_ids'] = media_ids
+                payload_ = deepcopy(payload)
+                payload_["media_ids"] = media_ids
 
                 if no or not body:
                     # strip text and replace it with the image representation
-                    _payload['status'] = \
-                        '{:02d}/{:02d}'.format(no + 1, len(batches))
-                payloads.append(_payload)
+                    payload_["status"] = f"{no + 1:02d}/{len(batches):02d}"
+                payloads.append(payload_)
 
         for no, payload in enumerate(payloads, start=1):
             # Send Tweet
@@ -434,69 +478,83 @@ def _send_tweet(self, body, title='', notify_type=NotifyType.INFO,
                 has_error = True
 
                 errors = []
-                try:
-                    errors = ['Error Code {}: {}'.format(
-                        e.get('code', 'unk'), e.get('message'))
-                        for e in response['errors']]
-
-                except (KeyError, TypeError):
-                    pass
+                with contextlib.suppress(KeyError, TypeError):
+                    errors = [
+                        "Error Code {}: {}".format(
+                            e.get("code", "unk"), e.get("message")
+                        )
+                        for e in response["errors"]
+                    ]
 
                 for error in errors:
                     self.logger.debug(
-                        'Tweet [%.2d/%.2d] Details: %s',
-                        no, len(payloads), error)
+                        "Tweet [%.2d/%.2d] Details: %s",
+                        no,
+                        len(payloads),
+                        error,
+                    )
                 continue
 
             try:
-                url = 'https://twitter.com/{}/status/{}'.format(
-                    response['user']['screen_name'],
-                    response['id_str'])
+                url = "https://twitter.com/{}/status/{}".format(
+                    response["user"]["screen_name"], response["id_str"]
+                )
 
             except (KeyError, TypeError):
-                url = 'unknown'
+                url = "unknown"
 
             self.logger.debug(
-                'Tweet [%.2d/%.2d] Details: %s', no, len(payloads), url)
+                "Tweet [%.2d/%.2d] Details: %s", no, len(payloads), url
+            )
 
             self.logger.info(
-                'Sent [%.2d/%.2d] Twitter notification as public tweet.',
-                no, len(payloads))
+                "Sent [%.2d/%.2d] Twitter notification as public tweet.",
+                no,
+                len(payloads),
+            )
 
         return not has_error
 
-    def _send_dm(self, body, title='', notify_type=NotifyType.INFO,
-                 attachments=None, **kwargs):
-        """
-        Twitter Direct Message
-        """
+    def _send_dm(
+        self,
+        body,
+        title="",
+        notify_type=NotifyType.INFO,
+        attachments=None,
+        **kwargs,
+    ):
+        """Twitter Direct Message."""
 
         # Error Tracking
         has_error = False
 
         payload = {
-            'event': {
-                'type': 'message_create',
-                'message_create': {
-                    'target': {
+            "event": {
+                "type": "message_create",
+                "message_create": {
+                    "target": {
                         # This gets assigned
-                        'recipient_id': None,
+                        "recipient_id": None,
                     },
-                    'message_data': {
-                        'text': body,
-                    }
-                }
+                    "message_data": {
+                        "text": body,
+                    },
+                },
             }
         }
 
         # Lookup our users (otherwise we look up ourselves)
-        targets = self._whoami(lazy=self.cache) if not len(self.targets) \
+        targets = (
+            self._whoami(lazy=self.cache)
+            if not len(self.targets)
             else self._user_lookup(self.targets, lazy=self.cache)
+        )
 
         if not targets:
             # We failed to lookup any users
             self.logger.warning(
-                'Failed to acquire user(s) to Direct Message via Twitter')
+                "Failed to acquire user(s) to Direct Message via Twitter"
+            )
             return False
 
         payloads = []
@@ -505,30 +563,28 @@ def _send_dm(self, body, title='', notify_type=NotifyType.INFO,
 
         else:
             for no, attachment in enumerate(attachments):
-                _payload = deepcopy(payload)
-                _data = _payload['event']['message_create']['message_data']
-                _data['attachment'] = {
-                    'type': 'media',
-                    'media': {
-                        'id': attachment['media_id']
-                    },
-                    'additional_owners':
-                    ','.join([str(x) for x in targets.values()])
+                payload_ = deepcopy(payload)
+                data = payload_["event"]["message_create"]["message_data"]
+                data["attachment"] = {
+                    "type": "media",
+                    "media": {"id": attachment["media_id"]},
+                    "additional_owners": ",".join(
+                        [str(x) for x in targets.values()]
+                    ),
                 }
                 if no or not body:
                     # strip text and replace it with the image representation
-                    _data['text'] = \
-                        '{:02d}/{:02d}'.format(no + 1, len(attachments))
-                payloads.append(_payload)
+                    data["text"] = f"{no + 1:02d}/{len(attachments):02d}"
+                payloads.append(payload_)
 
         for no, payload in enumerate(payloads, start=1):
             for screen_name, user_id in targets.items():
                 # Assign our user
-                target = payload['event']['message_create']['target']
-                target['recipient_id'] = user_id
+                target = payload["event"]["message_create"]["target"]
+                target["recipient_id"] = user_id
 
                 # Send Twitter DM
-                postokay, response = self._fetch(
+                postokay, _response = self._fetch(
                     self.twitter_dm,
                     payload=payload,
                 )
@@ -539,16 +595,14 @@ def _send_dm(self, body, title='', notify_type=NotifyType.INFO,
                     continue
 
                 self.logger.info(
-                    'Sent [{:02d}/{:02d}] Twitter DM notification to @{}.'
-                    .format(no, len(payloads), screen_name))
+                    f"Sent [{no:02d}/{len(payloads):02d}] "
+                    f"Twitter DM notification to @{screen_name}."
+                )
 
         return not has_error
 
     def _whoami(self, lazy=True):
-        """
-        Looks details of current authenticated user
-
-        """
+        """Looks details of current authenticated user."""
 
         if lazy and self._whoami_cache is not None:
             # Use cached response
@@ -560,15 +614,15 @@ def _whoami(self, lazy=True):
         # Send Twitter DM
         postokay, response = self._fetch(
             self.twitter_whoami,
-            method='GET',
+            method="GET",
             json=False,
         )
 
         if postokay:
             try:
-                results[response['screen_name']] = response['id']
+                results[response["screen_name"]] = response["id"]
                 self._whoami_cache = {
-                    response['screen_name']: response['id'],
+                    response["screen_name"]: response["id"],
                 }
 
                 self._user_cache.update(results)
@@ -579,8 +633,7 @@ def _whoami(self, lazy=True):
         return results
 
     def _user_lookup(self, screen_name, lazy=True):
-        """
-        Looks up a screen name and returns the user id
+        """Looks up a screen name and returns the user id.
 
         the screen_name can be a list/set/tuple as well
         """
@@ -593,8 +646,7 @@ def _user_lookup(self, screen_name, lazy=True):
 
         if lazy and self._user_cache:
             # Use cached response
-            results = {
-                k: v for k, v in self._user_cache.items() if k in names}
+            results = {k: v for k, v in self._user_cache.items() if k in names}
 
             # limit our names if they already exist in our cache
             names = [name for name in names if name not in results]
@@ -612,7 +664,7 @@ def _user_lookup(self, screen_name, lazy=True):
             postokay, response = self._fetch(
                 self.twitter_lookup,
                 payload={
-                    'screen_name': names[i:i + 100],
+                    "screen_name": names[i : i + 100],
                 },
                 json=False,
             )
@@ -623,11 +675,8 @@ def _user_lookup(self, screen_name, lazy=True):
 
             # Update our user index
             for entry in response:
-                try:
-                    results[entry['screen_name']] = entry['id']
-
-                except (TypeError, KeyError):
-                    pass
+                with contextlib.suppress(TypeError, KeyError):
+                    results[entry["screen_name"]] = entry["id"]
 
         # Cache our response for future use; this saves on un-nessisary extra
         # hits against the Twitter API when we already know the answer
@@ -635,13 +684,11 @@ def _user_lookup(self, screen_name, lazy=True):
 
         return results
 
-    def _fetch(self, url, payload=None, method='POST', json=True):
-        """
-        Wrapper to Twitter API requests object
-        """
+    def _fetch(self, url, payload=None, method="POST", json=True):
+        """Wrapper to Twitter API requests object."""
 
         headers = {
-            'User-Agent': self.app_id,
+            "User-Agent": self.app_id,
         }
 
         data = None
@@ -650,10 +697,17 @@ def _fetch(self, url, payload=None, method='POST', json=True):
         # Open our attachment path if required:
         if isinstance(payload, AttachBase):
             # prepare payload
-            files = {'media': (payload.name, open(payload.path, 'rb'))}
+            files = {
+                "media": (
+                    payload.name,
+                    # file handle is safely closed in `finally`; inline open is
+                    # intentional
+                    open(payload.path, "rb"),  # noqa: SIM115
+                ),
+            }
 
         elif json:
-            headers['Content-Type'] = 'application/json'
+            headers["Content-Type"] = "application/json"
             data = dumps(payload)
 
         else:
@@ -667,9 +721,11 @@ def _fetch(self, url, payload=None, method='POST', json=True):
         )
 
         # Some Debug Logging
-        self.logger.debug('Twitter {} URL: {} (cert_verify={})'.format(
-            method, url, self.verify_certificate))
-        self.logger.debug('Twitter Payload: %s' % str(payload))
+        self.logger.debug(
+            f"Twitter {method} URL: {url} "
+            f"(cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"Twitter Payload: {payload!s}")
 
         # By default set wait to None
         wait = None
@@ -695,7 +751,7 @@ def _fetch(self, url, payload=None, method='POST', json=True):
         self.throttle(wait=wait)
 
         # acquire our request mode
-        fn = requests.post if method == 'POST' else requests.get
+        fn = requests.post if method == "POST" else requests.get
         try:
             r = fn(
                 url,
@@ -718,29 +774,29 @@ def _fetch(self, url, payload=None, method='POST', json=True):
 
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyTwitter.http_response_code_lookup(r.status_code)
+                status_str = NotifyTwitter.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Twitter {} to {}: '
-                    '{}error={}.'.format(
-                        method,
-                        url,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Twitter {} to {}: {}error={}.".format(
+                        method, url, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Mark our failure
                 return (False, content)
 
             try:
                 # Capture rate limiting if possible
-                self.ratelimit_remaining = \
-                    int(r.headers.get('x-rate-limit-remaining'))
+                self.ratelimit_remaining = int(
+                    r.headers.get("x-rate-limit-remaining")
+                )
                 self.ratelimit_reset = datetime.fromtimestamp(
-                    int(r.headers.get('x-rate-limit-reset')), timezone.utc
+                    int(r.headers.get("x-rate-limit-reset")), timezone.utc
                 ).replace(tzinfo=None)
 
             except (TypeError, ValueError):
@@ -750,145 +806,153 @@ def _fetch(self, url, payload=None, method='POST', json=True):
 
         except requests.RequestException as e:
             self.logger.warning(
-                'Exception received when sending Twitter {} to {}: '.
-                format(method, url))
-            self.logger.debug('Socket Exception: %s' % str(e))
+                f"Exception received when sending Twitter {method} to {url}: "
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Mark our failure
             return (False, content)
 
-        except (OSError, IOError) as e:
+        except OSError as e:
             self.logger.warning(
-                'An I/O error occurred while handling {}.'.format(
-                    payload.name if isinstance(payload, AttachBase)
-                    else payload))
-            self.logger.debug('I/O Exception: %s' % str(e))
+                "An I/O error occurred while handling {}.".format(
+                    payload.name
+                    if isinstance(payload, AttachBase)
+                    else payload
+                )
+            )
+            self.logger.debug(f"I/O Exception: {e!s}")
             return (False, content)
 
         finally:
             # Close our file (if it's open) stored in the second element
             # of our files tuple (index 1)
             if files:
-                files['media'][1].close()
+                files["media"][1].close()
 
         return (True, content)
 
     @property
     def body_maxlen(self):
-        """
-        The maximum allowable characters allowed in the body per message
-        This is used during a Private DM Message Size (not Public Tweets
-        which are limited to 280 characters)
-        """
+        """The maximum allowable characters allowed in the body per message
+        This is used during a Private DM Message Size (not Public Tweets which
+        are limited to 280 characters)"""
         return 10000 if self.mode == TwitterMessageMode.DM else 280
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol[0], self.ckey, self.csecret, self.akey,
+            self.secure_protocol[0],
+            self.ckey,
+            self.csecret,
+            self.akey,
             self.asecret,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'mode': self.mode,
-            'batch': 'yes' if self.batch else 'no',
-            'cache': 'yes' if self.cache else 'no',
+            "mode": self.mode,
+            "batch": "yes" if self.batch else "no",
+            "cache": "yes" if self.cache else "no",
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{ckey}/{csecret}/{akey}/{asecret}' \
-            '/{targets}/?{params}'.format(
+        return (
+            "{schema}://{ckey}/{csecret}/{akey}/{asecret}"
+            "/{targets}?{params}".format(
                 schema=self.secure_protocol[0],
-                ckey=self.pprint(self.ckey, privacy, safe=''),
+                ckey=self.pprint(self.ckey, privacy, safe=""),
                 csecret=self.pprint(
-                    self.csecret, privacy, mode=PrivacyMode.Secret, safe=''),
-                akey=self.pprint(self.akey, privacy, safe=''),
+                    self.csecret, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
+                akey=self.pprint(self.akey, privacy, safe=""),
                 asecret=self.pprint(
-                    self.asecret, privacy, mode=PrivacyMode.Secret, safe=''),
-                targets='/'.join(
-                    [NotifyTwitter.quote('@{}'.format(target), safe='@')
-                     for target in self.targets]),
-                params=NotifyTwitter.urlencode(params))
+                    self.asecret, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
+                targets=(
+                    "/".join([
+                        NotifyTwitter.quote(f"@{target}", safe="@")
+                        for target in self.targets
+                    ])
+                    if self.targets
+                    else ""
+                ),
+                params=NotifyTwitter.urlencode(params),
+            )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # Acquire remaining tokens
-        tokens = NotifyTwitter.split_path(results['fullpath'])
+        tokens = NotifyTwitter.split_path(results["fullpath"])
 
         # The consumer token is stored in the hostname
-        results['ckey'] = NotifyTwitter.unquote(results['host'])
+        results["ckey"] = NotifyTwitter.unquote(results["host"])
 
         #
         # Now fetch the remaining tokens
         #
 
         # Consumer Secret
-        results['csecret'] = tokens.pop(0) if tokens else None
+        results["csecret"] = tokens.pop(0) if tokens else None
         # Access Token Key
-        results['akey'] = tokens.pop(0) if tokens else None
+        results["akey"] = tokens.pop(0) if tokens else None
         # Access Token Secret
-        results['asecret'] = tokens.pop(0) if tokens else None
+        results["asecret"] = tokens.pop(0) if tokens else None
 
         # The defined twitter mode
-        if 'mode' in results['qsd'] and len(results['qsd']['mode']):
-            results['mode'] = \
-                NotifyTwitter.unquote(results['qsd']['mode'])
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            results["mode"] = NotifyTwitter.unquote(results["qsd"]["mode"])
 
-        elif results['schema'].startswith('tweet'):
-            results['mode'] = TwitterMessageMode.TWEET
+        elif results["schema"].startswith("tweet"):
+            results["mode"] = TwitterMessageMode.TWEET
 
-        results['targets'] = []
+        results["targets"] = []
 
         # if a user has been defined, add it to the list of targets
-        if results.get('user'):
-            results['targets'].append(results.get('user'))
+        if results.get("user"):
+            results["targets"].append(results.get("user"))
 
         # Store any remaining items as potential targets
-        results['targets'].extend(tokens)
+        results["targets"].extend(tokens)
 
         # Get Cache Flag (reduces lookup hits)
-        if 'cache' in results['qsd'] and len(results['qsd']['cache']):
-            results['cache'] = \
-                parse_bool(results['qsd']['cache'], True)
+        if "cache" in results["qsd"] and len(results["qsd"]["cache"]):
+            results["cache"] = parse_bool(results["qsd"]["cache"], True)
 
         # Get Batch Mode Flag
-        results['batch'] = \
-            parse_bool(results['qsd'].get(
-                'batch', NotifyTwitter.template_args['batch']['default']))
+        results["batch"] = parse_bool(
+            results["qsd"].get(
+                "batch", NotifyTwitter.template_args["batch"]["default"]
+            )
+        )
 
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyTwitter.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyTwitter.parse_list(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/vapid/__init__.py b/libs/apprise/plugins/vapid/__init__.py
new file mode 100644
index 0000000000..15300a9a77
--- /dev/null
+++ b/libs/apprise/plugins/vapid/__init__.py
@@ -0,0 +1,616 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+import contextlib
+from itertools import chain
+from json import dumps
+import os
+import time
+
+import requests
+
+from ...common import NotifyImageSize, NotifyType, PersistentStoreMode
+from ...locale import gettext_lazy as _
+from ...utils import pem as _pem
+from ...utils.base64 import base64_urlencode
+from ...utils.parse import is_email, parse_bool, parse_list
+from ..base import NotifyBase
+from . import subscription
+
+
+class VapidPushMode:
+    """Supported Vapid Push Services."""
+
+    CHROME = "chrome"
+    FIREFOX = "firefox"
+    EDGE = "edge"
+    OPERA = "opera"
+    APPLE = "apple"
+    SAMSUNG = "samsung"
+    BRAVE = "brave"
+    GENERIC = "generic"
+
+
+VAPID_API_LOOKUP = {
+    VapidPushMode.CHROME: "https://fcm.googleapis.com/fcm/send",
+    VapidPushMode.FIREFOX: (
+        "https://updates.push.services.mozilla.com/wpush/v1"
+    ),
+    VapidPushMode.EDGE: (
+        "https://fcm.googleapis.com/fcm/send"
+    ),  # Edge uses FCM too
+    VapidPushMode.OPERA: (
+        "https://fcm.googleapis.com/fcm/send"
+    ),  # Opera is Chromium-based
+    VapidPushMode.APPLE: (
+        "https://web.push.apple.com"
+    ),  # Apple Web Push base endpoint
+    VapidPushMode.BRAVE: "https://fcm.googleapis.com/fcm/send",
+    VapidPushMode.SAMSUNG: "https://fcm.googleapis.com/fcm/send",
+    VapidPushMode.GENERIC: "https://fcm.googleapis.com/fcm/send",
+}
+
+VAPID_PUSH_MODES = (
+    VapidPushMode.CHROME,
+    VapidPushMode.FIREFOX,
+    VapidPushMode.EDGE,
+    VapidPushMode.OPERA,
+    VapidPushMode.APPLE,
+)
+
+
+class NotifyVapid(NotifyBase):
+    """A wrapper for WebPush/Vapid notifications."""
+
+    # Set our global enabled flag
+    enabled = subscription.CRYPTOGRAPHY_SUPPORT and _pem.PEM_SUPPORT
+
+    requirements = {
+        # Define our required packaging in order to work
+        "packages_required": "cryptography"
+    }
+
+    # The default descriptive name associated with the Notification
+    service_name = "Vapid Web Push Notifications"
+
+    # The services URL
+    service_url = (
+        "https://datatracker.ietf.org/doc/html/draft-thomson-webpush-vapid"
+    )
+
+    # The default protocol
+    secure_protocol = "vapid"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/vapid/"
+
+    # There is no reason we should exceed 5KB when reading in a PEM file.
+    # If it is more than this, then it is not accepted.
+    max_vapid_keyfile_size = 5000
+
+    # There is no reason we should exceed 5MB when reading in a JSON file.
+    # If it is more than this, then it is not accepted.
+    max_vapid_subfile_size = 5242880
+
+    # The maximum length of the messge can be 4096
+    # just choosing a safe number below this to allow for padding and
+    # encryption
+    body_maxlen = 4000
+
+    # A title can not be used for SMS Messages.  Setting this to zero will
+    # cause any title (if defined) to get placed into the message body.
+    title_maxlen = 0
+
+    # Our default is to no not use persistent storage beyond in-memory
+    # reference; this allows us to auto-generate our config if needed
+    storage_mode = PersistentStoreMode.AUTO
+
+    # 43200 = 12 hours
+    vapid_jwt_expiration_sec = 43200
+
+    # Subscription file
+    vapid_subscription_file = "subscriptions.json"
+
+    # Allows the user to specify the NotifyImageSize object
+    image_size = NotifyImageSize.XY_72
+
+    # Define object templates
+    templates = (
+        "{schema}://{subscriber}",
+        "{schema}://{subscriber}/{targets}",
+    )
+
+    # Define our template tokens
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "subscriber": {
+                "name": _("API Key"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+        },
+    )
+
+    # Define our template args
+    template_args = dict(
+        NotifyBase.template_tokens,
+        **{
+            "mode": {
+                "name": _("Mode"),
+                "type": "choice:string",
+                "values": VAPID_PUSH_MODES,
+                "default": VAPID_PUSH_MODES[0],
+                "map_to": "mode",
+            },
+            # Default Time To Live (defined in seconds)
+            # 0 (Zero) - message will be delivered only if the device is
+            # reacheable
+            "ttl": {
+                "name": _("ttl"),
+                "type": "int",
+                "default": 0,
+                "min": 0,
+                "max": 60,
+            },
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "subscriber",
+            },
+            "keyfile": {
+                # A Private Keyfile is required to sign header
+                "name": _("PEM Private KeyFile"),
+                "type": "string",
+                "private": True,
+            },
+            "subfile": {
+                # A Subscripion File is required to sign header
+                "name": _("Subscripion File"),
+                "type": "string",
+                "private": True,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+        },
+    )
+
+    def __init__(
+        self,
+        subscriber,
+        mode=None,
+        targets=None,
+        keyfile=None,
+        subfile=None,
+        include_image=None,
+        ttl=None,
+        **kwargs,
+    ):
+        """Initialize Vapid Messaging."""
+        super().__init__(**kwargs)
+
+        # Path to our Private Key file
+        self.keyfile = None
+
+        # Path to our subscription.json file
+        self.subfile = None
+
+        #
+        # Our Targets
+        #
+        self.targets = []
+        self._invalid_targets = []
+
+        # default subscriptions
+        self.subscriptions = {}
+        self.subscriptions_loaded = False
+        self.private_key_loaded = False
+
+        # Set our Time to Live Flag
+        self.ttl = self.template_args["ttl"]["default"]
+        if ttl is not None:
+            with contextlib.suppress(ValueError, TypeError):
+                # Store our TTL (Time To live) if it is a valid integer
+                self.ttl = int(ttl)
+
+            if (
+                self.ttl < self.template_args["ttl"]["min"]
+                or self.ttl > self.template_args["ttl"]["max"]
+            ):
+                msg = f"The Vapid TTL specified ({self.ttl}) is out of range."
+                self.logger.warning(msg)
+                raise TypeError(msg)
+
+        # Place a thumbnail image inline with the message body
+        self.include_image = (
+            self.template_args["image"]["default"]
+            if include_image is None
+            else include_image
+        )
+
+        result = is_email(subscriber)
+        if not result:
+            msg = f"An invalid Vapid Subscriber({subscriber}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+        self.subscriber = result["full_email"]
+
+        # Store our Mode/service
+        try:
+            self.mode = (
+                NotifyVapid.template_args["mode"]["default"]
+                if mode is None
+                else mode.lower()
+            )
+
+            if self.mode not in VAPID_PUSH_MODES:
+                # allow the outer except to handle this common response
+                raise IndexError()
+
+        except (AttributeError, IndexError, TypeError):
+            # Invalid region specified
+            msg = f"The Vapid mode specified ({mode}) is invalid."
+            self.logger.warning(msg)
+            raise TypeError(msg) from None
+
+        # Our Private keyfile
+        self.keyfile = keyfile
+
+        # Our Subscription file
+        self.subfile = subfile
+
+        # Prepare our PEM Object
+        self.pem = _pem.ApprisePEMController(self.store.path, asset=self.asset)
+
+        # Create our subscription object
+        self.subscriptions = subscription.WebPushSubscriptionManager(
+            asset=self.asset
+        )
+
+        if (
+            self.subfile is None
+            and self.store.mode != PersistentStoreMode.MEMORY
+            and self.asset.pem_autogen
+        ):
+
+            self.subfile = os.path.join(
+                self.store.path, self.vapid_subscription_file
+            )
+            if not os.path.exists(self.subfile) and self.subscriptions.write(
+                self.subfile
+            ):
+                self.logger.info(
+                    "Vapid auto-generated %s/%s",
+                    os.path.basename(self.store.path),
+                    self.vapid_subscription_file,
+                )
+
+        # Acquire our targets for parsing
+        self.targets = parse_list(targets)
+        if not self.targets:
+            # Add ourselves
+            self.targets.append(self.subscriber)
+
+        return
+
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Vapid Notification."""
+        if not self.private_key_loaded and (
+            (
+                self.keyfile
+                and not self.pem.private_key(autogen=False, autodetect=False)
+                and not self.pem.load_private_key(self.keyfile)
+            )
+            or (not self.keyfile and not self.pem)
+        ):
+            self.logger.warning(
+                "Provided Vapid/WebPush (PEM) Private Key file could "
+                "not be loaded."
+            )
+            self.private_key_loaded = True
+            return False
+        else:
+            self.private_key_loaded = True
+
+        if not self.targets:
+            # There is no one to notify; we're done
+            self.logger.warning("There are no Vapid targets to notify")
+            return False
+
+        if not self.subscriptions_loaded and self.subfile:
+            # Toggle our loaded flag to prevent trying again later
+            self.subscriptions_loaded = True
+            if not self.subscriptions.load(
+                self.subfile, byte_limit=self.max_vapid_subfile_size
+            ):
+                self.logger.warning(
+                    "Provided Vapid/WebPush subscriptions file could not be "
+                    "loaded."
+                )
+                return False
+
+        if not self.subscriptions:
+            self.logger.warning("Vapid could not load subscriptions")
+            return False
+
+        if not self.pem.private_key(autogen=False, autodetect=False):
+            self.logger.warning(
+                "No Vapid/WebPush (PEM) Private Key file could be loaded."
+            )
+            return False
+
+        # Prepare our notify URL (based on our mode)
+        notify_url = VAPID_API_LOOKUP[self.mode]
+        headers = {
+            "User-Agent": self.app_id,
+            "TTL": str(self.ttl),
+            "Content-Encoding": "aes128gcm",
+            "Content-Type": "application/octet-stream",
+            "Authorization": f"vapid t={self.jwt_token}, k={self.public_key}",
+        }
+
+        has_error = False
+
+        # Create a copy of the targets list
+        targets = list(self.targets)
+        while len(targets):
+            target = targets.pop(0)
+            if target not in self.subscriptions:
+                self.logger.warning(
+                    "Dropped Vapid user "
+                    f"({target}) specified - not found in subscriptions.json.",
+                )
+                # Save ourselves from doing this again
+                self._invalid_targets.append(target)
+                self.targets.remove(target)
+                has_error = True
+                continue
+
+            # Encrypt our payload
+            encrypted_payload = self.pem.encrypt_webpush(
+                body,
+                public_key=self.subscriptions[target].public_key,
+                auth_secret=self.subscriptions[target].auth_secret,
+            )
+
+            self.logger.debug(
+                "Vapid %s POST URL: %s (cert_verify=%r)",
+                self.mode,
+                notify_url,
+                self.verify_certificate,
+            )
+            self.logger.debug(
+                "Vapid %s Encrypted Payload: %d byte(s)", self.mode, len(body)
+            )
+
+            # Always call throttle before any remote server i/o is made
+            self.throttle()
+            try:
+                r = requests.post(
+                    notify_url,
+                    data=encrypted_payload,
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+                if r.status_code not in (
+                    requests.codes.ok,
+                    requests.codes.no_content,
+                ):
+                    # We had a problem
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
+
+                    self.logger.warning(
+                        "Failed to send {} Vapid notification: "
+                        "{}{}error={}.".format(
+                            self.mode,
+                            status_str,
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
+
+                    self.logger.debug(
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
+
+                    has_error = True
+
+                else:
+                    self.logger.info("Sent %s Vapid notification.", self.mode)
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occurred sending Vapid notification."
+                )
+                self.logger.debug("Socket Exception: %s", e)
+
+                has_error = True
+
+        return not has_error
+
+    @property
+    def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol, self.mode, self.subscriber)
+
+    def url(self, privacy=False, *args, **kwargs):
+        """Returns the URL built dynamically based on specified arguments."""
+
+        # Define any URL parameters
+        params = {
+            "mode": self.mode,
+            "ttl": str(self.ttl),
+        }
+
+        if self.keyfile:
+            # Include our keyfile if specified
+            params["keyfile"] = self.keyfile
+
+        if self.subfile:
+            # Include our subfile if specified
+            params["subfile"] = self.subfile
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        targets = (
+            self.targets
+            if not (
+                self.targets == 1
+                and self.targets[0].lower() == self.subscriber.lower()
+            )
+            else []
+        )
+        return "{schema}://{subscriber}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            subscriber=NotifyVapid.quote(self.subscriber, safe="@"),
+            targets="/".join(
+                chain(
+                    [str(t) for t in targets],
+                    [
+                        NotifyVapid.quote(x, safe="@")
+                        for x in self._invalid_targets
+                    ],
+                )
+            ),
+            params=NotifyVapid.urlencode(params),
+        )
+
+    def __len__(self):
+        """Returns the number of targets associated with this notification."""
+        targets = len(self.targets)
+        return targets if targets else 1
+
+    @staticmethod
+    def parse_url(url):
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Prepare our targets
+        results["targets"] = []
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["subscriber"] = NotifyVapid.unquote(results["qsd"]["from"])
+
+            if results["user"] and results["host"]:
+                # whatever is left on the URL goes
+                results["targets"].append(
+                    "{}@{}".format(
+                        NotifyVapid.unquote(results["user"]),
+                        NotifyVapid.unquote(results["host"]),
+                    )
+                )
+
+            elif results["host"]:
+                results["targets"].append(NotifyVapid.unquote(results["host"]))
+
+        else:
+            # Acquire our subscriber information
+            results["subscriber"] = "{}@{}".format(
+                NotifyVapid.unquote(results["user"]),
+                NotifyVapid.unquote(results["host"]),
+            )
+
+        results["targets"].extend(NotifyVapid.split_path(results["fullpath"]))
+
+        # Get our mode
+        results["mode"] = results["qsd"].get("mode")
+
+        # Get Image Flag
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyVapid.template_args["image"]["default"]
+            )
+        )
+
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyVapid.parse_list(results["qsd"]["to"])
+
+        # Our Private Keyfile (PEM)
+        if "keyfile" in results["qsd"] and results["qsd"]["keyfile"]:
+            results["keyfile"] = NotifyVapid.unquote(results["qsd"]["keyfile"])
+
+        # Our Subscription File (JSON)
+        if "subfile" in results["qsd"] and results["qsd"]["subfile"]:
+            results["subfile"] = NotifyVapid.unquote(results["qsd"]["subfile"])
+
+        # Support the 'ttl' variable
+        if "ttl" in results["qsd"] and len(results["qsd"]["ttl"]):
+            results["ttl"] = NotifyVapid.unquote(results["qsd"]["ttl"])
+
+        return results
+
+    @property
+    def jwt_token(self):
+        """Returns our VAPID Token based on class details."""
+        # JWT header
+        header = {"alg": "ES256", "typ": "JWT"}
+
+        # JWT payload
+        payload = {
+            "aud": VAPID_API_LOOKUP[self.mode],
+            "exp": int(time.time()) + self.vapid_jwt_expiration_sec,
+            "sub": f"mailto:{self.subscriber}",
+        }
+
+        # Base64 URL encode header and payload
+        header_b64 = base64_urlencode(
+            dumps(header, separators=(",", ":")).encode("utf-8")
+        )
+        payload_b64 = base64_urlencode(
+            dumps(payload, separators=(",", ":")).encode("utf-8")
+        )
+        signing_input = f"{header_b64}.{payload_b64}".encode()
+        signature_b64 = base64_urlencode(self.pem.sign(signing_input))
+
+        # Return final token
+        return f"{header_b64}.{payload_b64}.{signature_b64}"
+
+    @property
+    def public_key(self):
+        """Returns our public key representation."""
+        return self.pem.x962_str
diff --git a/libs/apprise/plugins/vapid/subscription.py b/libs/apprise/plugins/vapid/subscription.py
new file mode 100644
index 0000000000..488766c376
--- /dev/null
+++ b/libs/apprise/plugins/vapid/subscription.py
@@ -0,0 +1,413 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+import json
+from typing import Optional, Union
+
+from ...apprise_attachment import AppriseAttachment
+from ...asset import AppriseAsset
+from ...exception import AppriseInvalidData
+from ...utils.base64 import base64_urldecode
+
+try:
+    from cryptography.hazmat.primitives.asymmetric import ec
+
+    # Cryptography Support enabled
+    CRYPTOGRAPHY_SUPPORT = True
+
+except ImportError:
+    # Cryptography Support disabled
+    CRYPTOGRAPHY_SUPPORT = False
+
+
+class WebPushSubscription:
+    """WebPush Subscription."""
+
+    # Format:
+    # {
+    #     "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+    #     "keys": {
+    #         "p256dh": "BNcW4oA7zq5H9TKIrA3XfKclN2fX9P_7NR...",
+    #         "auth": "k9Xzm43nBGo=",
+    #     }
+    # }
+    def __init__(self, content: Union[str, dict, None] = None) -> None:
+        """Prepares a webpush object provided with content Content can be a
+        dictionary, or JSON String."""
+
+        # Our variables
+        self.__endpoint = None
+        self.__p256dh = None
+        self.__auth = None
+        self.__auth_secret = None
+        self.__public_key = None
+
+        if content is not None and not self.load(content):
+            raise AppriseInvalidData("Could not load subscription")
+
+    def load(self, content: Union[str, dict, None] = None) -> bool:
+        """Performs the loading/validation of the object."""
+
+        # Reset our variables
+        self.__endpoint = None
+        self.__p256dh = None
+        self.__auth = None
+        self.__auth_secret = None
+        self.__public_key = None
+
+        if not CRYPTOGRAPHY_SUPPORT:
+            return False
+
+        if isinstance(content, str):
+            try:
+                content = json.loads(content)
+
+            except (json.decoder.JSONDecodeError, TypeError, OSError):
+                # Bad data
+                return False
+
+        if not isinstance(content, dict):
+            # We could not load he result set
+            return False
+
+        # Retreive our contents for validation
+        endpoint = content.get("endpoint")
+        if not isinstance(endpoint, str):
+            return False
+
+        try:
+            p256dh = base64_urldecode(content["keys"]["p256dh"])
+            if not p256dh:
+                return False
+
+            auth_secret = base64_urldecode(content["keys"]["auth"])
+            if not auth_secret:
+                return False
+
+        except KeyError:
+            return False
+
+        try:
+            # Store our data
+            self.__public_key = ec.EllipticCurvePublicKey.from_encoded_point(
+                ec.SECP256R1(),
+                p256dh,
+            )
+
+        except ValueError:
+            # Invalid p256dh key (Can't load Public Key)
+            return False
+
+        self.__endpoint = endpoint
+        self.__p256dh = content["keys"]["p256dh"]
+        self.__auth = content["keys"]["auth"]
+        self.__auth_secret = auth_secret
+
+        return True
+
+    def write(self, path: str, indent: int = 2) -> bool:
+        """Writes content to disk based on path specified.
+
+        Content is a JSON file, so ideally you may wish to have `.json' as it's
+        extension for clarity
+        """
+        if not self.__public_key:
+            return False
+
+        try:
+            with open(path, "w", encoding="utf-8") as f:
+                json.dump(self.dict, f, indent=indent)
+
+        except (TypeError, OSError):
+            # Could not write content
+            return False
+
+        return True
+
+    @property
+    def auth(self) -> Optional[str]:
+        return self.__auth if self.__public_key else None
+
+    @property
+    def endpoint(self) -> Optional[str]:
+        return self.__endpoint if self.__public_key else None
+
+    @property
+    def p256dh(self) -> Optional[str]:
+        return self.__p256dh if self.__public_key else None
+
+    @property
+    def auth_secret(self) -> Optional[bytes]:
+        return self.__auth_secret if self.__public_key else None
+
+    @property
+    def public_key(self) -> Optional["ec.EllipticCurvePublicKey"]:
+        return self.__public_key
+
+    @property
+    def dict(self) -> dict:
+        return (
+            {
+                "endpoint": self.__endpoint,
+                "keys": {
+                    "p256dh": self.__p256dh,
+                    "auth": self.__auth,
+                },
+            }
+            if self.__public_key
+            else {
+                "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+                "keys": {
+                    "p256dh": "<place public key in base64 here>",
+                    "auth": "<place auth in base64 here>",
+                },
+            }
+        )
+
+    def json(self, indent: int = 2) -> str:
+        """Returns JSON representation of the object."""
+        return json.dumps(self.dict, indent=indent)
+
+    def __bool__(self) -> bool:
+        """Handle 'if' statement."""
+        return bool(self.__public_key)
+
+    def __str__(self) -> str:
+        """Returns our JSON entry as a string."""
+        # Return the first 16 characters of the detected endpoint subscription
+        # id
+        return (
+            "" if not self.__endpoint else self.__endpoint.split("/")[-1][:16]
+        )
+
+
+class WebPushSubscriptionManager:
+    """WebPush Subscription Manager."""
+
+    # Format:
+    # {
+    #     "name1": {
+    #         "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+    #         "keys": {
+    #             "p256dh": "BNcW4oA7zq5H9TKIrA3XfKclN2fX9P_7NR...",
+    #             "auth": "k9Xzm43nBGo=",
+    #         }
+    #     },
+    #     "name2": {
+    #         "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+    #         "keys": {
+    #             "p256dh": "BNcW4oA7zq5H9TKIrA3XfKclN2fX9P_7NR...",
+    #             "auth": "k9Xzm43nBGo=",
+    #         }
+    #     },
+
+    # Defines the number of failures we can accept before we abort and assume
+    # the file is bad
+    max_load_failure_count = 3
+
+    def __init__(self, asset: Optional["AppriseAsset"] = None) -> None:
+        """Webpush Subscription Manager."""
+
+        # Our subscriptions
+        self.__subscriptions = {}
+
+        # Prepare our Asset Object
+        self.asset = (
+            asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
+
+    def __getitem__(self, key: str) -> WebPushSubscription:
+        """Returns our indexed value if it exists."""
+        return self.__subscriptions[key.lower()]
+
+    def __setitem__(
+        self, name: str, subscription: Union[WebPushSubscription, str, dict]
+    ) -> None:
+        """Set's our object if possible."""
+
+        if not self.add(subscription, name=name.lower()):
+            raise AppriseInvalidData("Invalid subscription provided")
+
+    def add(
+        self,
+        subscription: Union[WebPushSubscription, str, dict],
+        name: Optional[str] = None,
+    ) -> bool:
+        """Add a subscription into our manager."""
+
+        if not isinstance(subscription, WebPushSubscription):
+            try:
+                # Support loading our object
+                subscription = WebPushSubscription(subscription)
+
+            except AppriseInvalidData:
+                return False
+
+        if name is None:
+            name = str(subscription)
+
+        self.__subscriptions[name.lower()] = subscription
+        return True
+
+    def __bool__(self) -> bool:
+        """True is returned if at least one subscription has been loaded."""
+        return bool(self.__subscriptions)
+
+    def __len__(self) -> int:
+        """Returns the number of servers loaded; this includes those found
+        within loaded configuration.
+
+        This funtion nnever actually counts the Config entry themselves (if
+        they exist), only what they contain.
+        """
+        return len(self.__subscriptions)
+
+    def __iadd__(
+        self, subscription: Union[WebPushSubscription, str, dict]
+    ) -> "WebPushSubscriptionManager":
+
+        if not self.add(subscription):
+            raise AppriseInvalidData("Invalid subscription provided")
+
+        return self
+
+    def __contains__(self, key: str) -> bool:
+        """Checks if the key exists."""
+        return key.lower() in self.__subscriptions
+
+    def clear(self) -> None:
+        """Empties our server list."""
+        self.__subscriptions.clear()
+
+    @property
+    def dict(self) -> dict:
+        """Returns a dictionary of all entries."""
+        return (
+            {k: v.dict for k, v in self.__subscriptions.items()}
+            if self.__subscriptions
+            else {}
+        )
+
+    def load(self, path: str, byte_limit=0) -> bool:
+        """Writes content to disk based on path specified.  Content is a JSON
+        file, so ideally you may wish to have `.json' as it's extension for
+        clarity.
+
+        if byte_limit is zero, then we do not limit our file size, otherwise
+        set this to the bytes you want to restrict yourself by
+        """
+
+        # Reset our object
+        self.clear()
+
+        # Create our attachment object
+        attach = AppriseAttachment(asset=self.asset)
+
+        # Add our path
+        attach.add(path)
+
+        if byte_limit > 0:
+            # Enforce maximum file size
+            attach[0].max_file_size = byte_limit
+
+        if not attach.sync():
+            return False
+
+        try:
+            # Otherwise open our path
+            with open(attach[0].path, encoding="utf-8") as f:
+                content = json.load(f)
+
+        except (json.decoder.JSONDecodeError, TypeError, OSError):
+            # Could not read
+            return False
+
+        if not isinstance(content, dict):
+            # Not a list of dictionaries
+            return False
+
+        # Verify if we're dealing with a single element:
+        # {
+        #     "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+        #     "keys": {
+        #         "p256dh": "BNcW4oA7zq5H9TKIrA3XfKclN2fX9P_7NR...",
+        #         "auth": "k9Xzm43nBGo=",
+        #     }
+        # }
+        #
+        # or if we're dealing with a multiple set
+        #
+        # {
+        #     "name1": {
+        #         "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+        #         "keys": {
+        #             "p256dh": "BNcW4oA7zq5H9TKIrA3XfKclN2fX9P_7NR...",
+        #             "auth": "k9Xzm43nBGo=",
+        #         }
+        #     },
+        #     "name2": {
+        #         "endpoint": "https://fcm.googleapis.com/fcm/send/abc123...",
+        #         "keys": {
+        #             "p256dh": "BNcW4oA7zq5H9TKIrA3XfKclN2fX9P_7NR...",
+        #             "auth": "k9Xzm43nBGo=",
+        #         }
+        #     },
+
+        error_count = 0
+        if "endpoint" in content and "keys" in content:
+            if not self.add(content):
+                return False
+
+        else:
+            for name, subscription in content.items():
+                if not self.add(subscription, name=name.lower()):
+                    error_count += 1
+                    if error_count > self.max_load_failure_count:
+                        self.clear()
+                        return False
+
+        return True
+
+    def write(self, path: str, indent: int = 2) -> bool:
+        """Writes content to disk based on path specified.
+
+        Content is a JSON file, so ideally you may wish to have `.json' as it's
+        extension for clarity
+        """
+        try:
+            with open(path, "w", encoding="utf-8") as f:
+                json.dump(self.dict, f, indent=indent)
+
+        except (TypeError, OSError):
+            # Could not write content
+            return False
+
+        return True
+
+    def json(self, indent: int = 2) -> str:
+        """Returns JSON representation of the object."""
+        return json.dumps(self.dict, indent=indent)
diff --git a/libs/apprise/plugins/viber.py b/libs/apprise/plugins/viber.py
new file mode 100644
index 0000000000..7b3c3801b3
--- /dev/null
+++ b/libs/apprise/plugins/viber.py
@@ -0,0 +1,333 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# API Reference: https://creators.viber.com/docs/bots-api/\
+#       resources/messaging/send-message
+from __future__ import annotations
+
+from collections.abc import Iterable
+from json import dumps, loads
+from typing import Any, Optional
+
+import requests
+
+from ..common import NotifyType
+from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import parse_list, validate_regex
+from .base import NotifyBase
+
+
+class NotifyViber(NotifyBase):
+    """Send a Viber Bot message using the Viber REST Bot API."""
+
+    # The default descriptive name associated with the Notification
+    service_name = _("Viber")
+
+    # The Services URL
+    service_url = "https://www.viber.com/"
+
+    # The default protocol
+    secure_protocol = "viber"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/viber/"
+
+    # Viber notification endpoint
+    notify_url = "https://chatapi.viber.com/pa/send_message"
+
+    # Service limits (documented maximum is 30KB)
+    # Note: this is not exact byte accounting (UTF-8 vs chars), but it keeps
+    # messages in the expected range.
+    body_maxlen = 30000
+
+    # We don't support titles for Viber notifications
+    title_maxlen = 0
+
+    # Maximum characters allowed in sender name
+    viber_sender_name_limit = 28
+
+    # Minimal URL; endpoint is fixed, token is the first path entry.
+    templates = (
+        "{schema}://{token}/{targets}",
+    )
+
+    template_tokens = dict(NotifyBase.template_tokens, **{
+        "token": {
+            "name": _("Authentication Token"),
+            "type": "string",
+            "private": True,
+            "required": True,
+        },
+        "targets": {
+            "name": _("Receiver IDs"),
+            "type": "list:string",
+        },
+    })
+
+    template_args = dict(NotifyBase.template_args, **{
+        # Viber requires sender.name
+        "from": {
+            "name": _("Bot Name"),
+            "type": "string",
+            "map_to": "source",
+        },
+        # Optional sender.avatar URL
+        "avatar": {
+            "name": _("Bot Avatar URL"),
+            "type": "string",
+        },
+        "token": {
+            "alias_of": "token",
+        },
+        # Allow targets to also come from query string
+        "to": {
+            "alias_of": "targets"
+        }
+    })
+
+    def __init__(
+        self,
+        token: str,
+        targets: Optional[Iterable[str]] = None,
+        source: Optional[str] = None,
+        avatar: Optional[str] = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(**kwargs)
+
+        self.token = validate_regex(token)
+        if not self.token:
+            msg = "An invalid Viber authentication token was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg)
+
+        # Sender name is required by the API; provide a safe default
+        sourcev = (source or "").strip()
+        if len(sourcev) > self.viber_sender_name_limit:
+            self.logger.warning(
+                f"Viber sender name exceeds {self.viber_sender_name_limit} "
+                "characters, truncating.")
+            sourcev = sourcev[:self.viber_sender_name_limit]
+        self.source: str = sourcev
+
+        self.avatar: Optional[str] = (avatar or "").strip() or None
+
+        # Store our targets
+        self.targets = parse_list(targets)
+
+    def __len__(self) -> int:
+        """Number of outbound HTTP requests this configuration will perform."""
+        return max(1, len(self.targets))
+
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Rebuild the Apprise URL with secrets redacted."""
+
+        # Define any URL parameters
+        params = self.url_parameters(privacy=privacy, *args, **kwargs)
+
+        if self.source:
+            params["from"] = self.source
+
+        if self.avatar:
+            params["avatar"] = self.avatar
+
+        # Path targets
+        tgt = ""
+        if self.targets:
+            tgt = "/".join(self.quote(t, safe="") for t in self.targets)
+
+        # Token in first path element
+        token = self.pprint(
+            self.token, privacy, mode=PrivacyMode.Secret, safe="")
+
+        query = self.urlencode(params)
+        return (
+            f"{self.secure_protocol}://{token}/"
+            + tgt + (f"?{query}" if query else ""))
+
+    @property
+    def url_identifier(self) -> str:
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
+        """
+        return (self.secure_protocol, self.token)
+
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        **kwargs: Any,
+    ) -> bool:
+        """Send a Viber notification to each configured receiver ID."""
+        if not self.targets:
+            # There were no services to notify
+            self.logger.warning("There were no Viber targets to notify")
+            return False
+
+        # Prepare our headers
+        headers = {
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "X-Viber-Auth-Token": self.token,
+        }
+
+        # Prepare our payload
+        payload: dict[str, Any] = {
+            "type": "text",
+            "text": body,
+            "sender": {
+                "name": self.source if self.source
+                else self.app_desc[:self.viber_sender_name_limit]},
+        }
+
+        if self.avatar:
+            payload["sender"]["avatar"] = self.avatar
+
+        content = None
+        status_str = None
+        has_error = False
+
+        for dest in self.targets:
+            payload["receiver"] = dest
+
+            self.throttle()
+            try:
+                r = requests.post(
+                    self.notify_url,
+                    data=dumps(payload),
+                    headers=headers,
+                    verify=self.verify_certificate,
+                    timeout=self.request_timeout,
+                )
+
+                # Viber returns the following on success:
+                #   {"status":0,"status_message":"ok",...}
+                try:
+                    content = loads(r.content)
+
+                except (AttributeError, TypeError, ValueError, KeyError):
+                    # ValueError = r.content is Unparsable
+                    # TypeError = r.content is None
+                    # AttributeError = r is None
+                    # KeyError = 'result' is not found in result
+                    content = {}
+                    self.logger.warning(
+                        "Invalid JSON response from Viber sending "
+                        f"notification to {dest}")
+                    self.logger.debug("Response Details:\n%s", r.content)
+                    has_error = True
+                    continue
+
+                if r.status_code != requests.codes.ok:
+                    # We had a problem
+                    status_str = (
+                        content.get("status_message")
+                        if content.get("status_message")
+                        else self.http_response_code_lookup(
+                            r.status_code
+                        )
+                    )
+                    self.logger.warning(
+                        f"Failed to send Viber notification to {dest} - "
+                        f"{status_str} error={r.status_code}."
+                    )
+
+                    self.logger.debug("Response Details:\n%s", r.content)
+
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+                if int(content.get("status", -1)) != 0:
+                    self.logger.warning(
+                        f"Failed to send Viber notification to {dest} - "
+                        "Viber Error {%s} (status=%s)",
+                        content.get("status_message", "unknown"),
+                        content.get("status", "unknown"),
+                    )
+                    self.logger.debug("Response Details:\n%s", r.content)
+                    # Mark our failure
+                    has_error = True
+                    continue
+
+            except requests.RequestException as e:
+                self.logger.warning(
+                    "A Connection error occured sending Viber notification "
+                    "to %s",
+                    dest,
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
+                # Mark our failure
+                has_error = True
+                continue
+
+        return not has_error
+
+    @staticmethod
+    def parse_url(url: str) -> dict[str, Any]:
+        """Parse the URL and return arguments to instantiate this object."""
+        results = NotifyBase.parse_url(url, verify_host=False)
+        if not results:
+            # We're done early as we couldn't load the results
+            return results
+
+        # Prepare a Full path to work with
+        results["targets"] = [
+            NotifyViber.unquote(results["host"]),
+            *NotifyViber.split_path(results["fullpath"])]
+
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = NotifyViber.unquote(
+                results["qsd"]["token"]
+            )
+
+        else:
+            results["token"] = results["targets"][0]
+            results["targets"] = results["targets"][1:]
+
+        # Support the 'to' variable so that we can support targets this way too
+        # The 'to' makes it easier to use yaml configuration
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += results["qsd"]["to"]
+
+        # Map 'from' -> source
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyViber.unquote(
+                results["qsd"]["from"]
+            )
+
+        # Map avatar
+        if "avatar" in results["qsd"] and len(results["qsd"]["avatar"]):
+            results["avatar"] = NotifyViber.unquote(
+                results["qsd"]["avatar"]
+            )
+
+        return results
diff --git a/libs/apprise/plugins/voipms.py b/libs/apprise/plugins/voipms.py
index bf3ce83192..6329754179 100644
--- a/libs/apprise/plugins/voipms.py
+++ b/libs/apprise/plugins/voipms.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,136 +33,140 @@
 # Read more about VoIP.ms API here:
 #   - https://voip.ms/m/apidocs.php
 
-import requests
+import contextlib
 from json import loads
 
-from .base import NotifyBase
+import requests
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, is_email, parse_phone_no
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, is_phone_no, parse_phone_no
+from .base import NotifyBase
 
 
 class NotifyVoipms(NotifyBase):
-    """
-    A wrapper for VoIPms Notifications
-    """
+    """A wrapper for VoIPms Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'VoIPms'
+    service_name = "VoIPms"
 
     # The services URL
-    service_url = 'https://voip.ms'
+    service_url = "https://voip.ms"
 
     # The default protocol
-    secure_protocol = 'voipms'
+    secure_protocol = "voipms"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_voipms'
+    setup_url = "https://appriseit.com/services/voipms/"
 
     # VoIPms uses the http protocol with JSON requests
-    notify_url = 'https://voip.ms/api/v1/rest.php'
+    notify_url = "https://voip.ms/api/v1/rest.php"
 
     # The maximum length of the body
     body_maxlen = 160
 
     # The supported country code by VoIP.ms
-    voip_ms_country_code = '1'
+    voip_ms_country_code = "1"
 
     # A title can not be used for SMS Messages.  Setting this to zero will
     # cause any title (if defined) to get placed into the message body.
     title_maxlen = 0
 
     # Define object templates
-    templates = (
-        '{schema}://{password}:{email}/{from_phone}/{targets}',
-    )
+    templates = ("{schema}://{password}:{email}/{from_phone}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'email': {
-            'name': _('User Email'),
-            'type': 'string',
-            'required': True,
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-        },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "email": {
+                "name": _("User Email"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+                "required": True,
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-            'required': True,
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'from_phone',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone",
+            },
         },
-    })
+    )
 
     def __init__(self, email, source=None, targets=None, **kwargs):
-        """
-        Initialize VoIPms Object
-        """
+        """Initialize VoIPms Object."""
         super().__init__(**kwargs)
 
         # Validate our params here.
         if self.password is None:
-            msg = 'Password has to be specified.'
+            msg = "Password has to be specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # User is the email associated with the account
         result = is_email(email)
         if not result:
-            msg = 'An invalid VoIPms user email: ' \
-                '({}) was specified.'.format(email)
+            msg = f"An invalid VoIPms user email: ({email}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
-        self.email = result['full_email']
+        self.email = result["full_email"]
 
         # Validate our source Phone #
         result = is_phone_no(source)
         if not result:
-            msg = 'An invalid VoIPms source phone # ' \
-                  '({}) was specified.'.format(source)
+            msg = f"An invalid VoIPms source phone # ({source}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Source Phone # only supports +1 country code
         # Allow 7 digit phones (presume they're local with +1 country code)
-        if result['country'] \
-                and result['country'] != self.voip_ms_country_code:
-            msg = 'VoIPms only supports +1 country code ' \
-                  '({}) was specified.'.format(source)
+        if (
+            result["country"]
+            and result["country"] != self.voip_ms_country_code
+        ):
+            msg = (
+                "VoIPms only supports +1 country code "
+                f"({source}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our source phone number (without country code)
-        self.source = result['area'] + result['line']
+        self.source = result["area"] + result["line"]
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         if targets:
             for target in parse_phone_no(targets):
@@ -171,16 +174,17 @@ def __init__(self, email, source=None, targets=None, **kwargs):
                 result = is_phone_no(target)
 
                 # Target Phone # only supports +1 country code
-                if result['country'] \
-                        and result['country'] != self.voip_ms_country_code:
+                if (
+                    result["country"]
+                    and result["country"] != self.voip_ms_country_code
+                ):
                     self.logger.warning(
-                        'Ignoring invalid phone # '
-                        '({}) specified.'.format(target),
+                        f"Ignoring invalid phone # ({target}) specified.",
                     )
                     continue
 
                 # store valid phone number
-                self.targets.append(result['area'] + result['line'])
+                self.targets.append(result["area"] + result["line"])
 
         else:
             # Send a message to ourselves
@@ -188,14 +192,12 @@ def __init__(self, email, source=None, targets=None, **kwargs):
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform VoIPms Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform VoIPms Notification."""
 
         if len(self.targets) == 0:
             # There were no services to notify
-            self.logger.warning('There were no VoIPms targets to notify.')
+            self.logger.warning("There were no VoIPms targets to notify.")
             return False
 
         # error tracking (used for function return)
@@ -203,20 +205,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
         }
 
         # Prepare our payload
         payload = {
-            'api_username': self.email,
-            'api_password': self.password,
-            'did': self.source,
-            'message': body,
-            'method': 'sendSMS',
-
+            "api_username": self.email,
+            "api_password": self.password,
+            "did": self.source,
+            "message": body,
+            "method": "sendSMS",
             # Gets filled in the loop below
-            'dst': None
+            "dst": None,
         }
 
         # Create a copy of the targets list
@@ -227,17 +228,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Add target Phone #
-            payload['dst'] = target
+            payload["dst"] = target
 
             # Some Debug Logging
-            self.logger.debug('VoIPms GET URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('VoIPms Payload: {}' .format(payload))
+            self.logger.debug(
+                "VoIPms GET URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"VoIPms Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
 
-            response = {'status': 'unknown', 'message': ''}
+            response = {"status": "unknown", "message": ""}
 
             try:
                 r = requests.get(
@@ -248,31 +251,32 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     timeout=self.request_timeout,
                 )
 
-                try:
-                    response = loads(r.content)
-
-                except (AttributeError, TypeError, ValueError):
+                with contextlib.suppress(
+                        AttributeError, TypeError, ValueError):
+                    # Load our JSON object if valid
                     # ValueError = r.content is Unparsable
                     # TypeError = r.content is None
                     # AttributeError = r is None
-                    pass
+                    response = loads(r.content)
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyVoipms.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyVoipms.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send VoIPms SMS notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send VoIPms SMS notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -281,11 +285,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 # VoIPms sends 200 OK even if there is an error
                 # check if status in response and if it is not success
 
-                if response is not None and response['status'] != 'success':
+                if response is not None and response["status"] != "success":
                     self.logger.warning(
-                        'Failed to send VoIPms SMS notification to {}: '
-                        'status: {}, message: {}'.format(
-                            target, response['status'], response['message'])
+                        "Failed to send VoIPms SMS notification to {}: "
+                        "status: {}, message: {}".format(
+                            target, response["status"], response["message"]
+                        )
                     )
 
                     # Mark our failure
@@ -293,14 +298,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     continue
                 else:
                     self.logger.info(
-                        'Sent VoIPms SMS notification to %s' % target)
+                        f"Sent VoIPms SMS notification to {target}"
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending VoIPms:%s '
-                    'SMS notification.' % target
+                    f"A Connection error occurred sending VoIPms:{target} "
+                    "SMS notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -310,81 +316,79 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.email, self.password, self.source,
+            self.secure_protocol,
+            self.email,
+            self.password,
+            self.source,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        schemaStr =  \
-            '{schema}://{password}:{email}/{from_phone}/{targets}/?{params}'
+        schemaStr = (
+            "{schema}://{password}:{email}/{from_phone}/{targets}/?{params}"
+        )
         return schemaStr.format(
             schema=self.secure_protocol,
             email=self.email,
-            password=self.pprint(self.password, privacy, safe=''),
-            from_phone=self.voip_ms_country_code +
-            self.pprint(self.source, privacy, safe=''),
-            targets='/'.join(
-                [self.voip_ms_country_code + NotifyVoipms.quote(x, safe='')
-                 for x in self.targets]),
-            params=NotifyVoipms.urlencode(params))
+            password=self.pprint(self.password, privacy, safe=""),
+            from_phone=self.voip_ms_country_code
+            + self.pprint(self.source, privacy, safe=""),
+            targets="/".join([
+                self.voip_ms_country_code + NotifyVoipms.quote(x, safe="")
+                for x in self.targets
+            ]),
+            params=NotifyVoipms.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        results['targets'] = \
-            NotifyVoipms.split_path(results['fullpath'])
+        results["targets"] = NotifyVoipms.split_path(results["fullpath"])
 
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyVoipms.unquote(results['qsd']['from'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyVoipms.unquote(results["qsd"]["from"])
 
-        elif results['targets']:
+        elif results["targets"]:
             # The from phone no is the first entry in the list otherwise
-            results['source'] = results['targets'].pop(0)
+            results["source"] = results["targets"].pop(0)
 
         # Swap user for pass since our input is: password:email
         #   where email is user@hostname (or user@domain)
-        user = results['password']
-        password = results['user']
-        results['password'] = password
-        results['user'] = user
+        user = results["password"]
+        password = results["user"]
+        results["password"] = password
+        results["user"] = user
 
-        results['email'] = '{}@{}'.format(
+        results["email"] = "{}@{}".format(
             NotifyVoipms.unquote(user),
-            NotifyVoipms.unquote(results['host']),
+            NotifyVoipms.unquote(results["host"]),
         )
 
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyVoipms.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyVoipms.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/vonage.py b/libs/apprise/plugins/vonage.py
index 58989280c5..70907236fd 100644
--- a/libs/apprise/plugins/vonage.py
+++ b/libs/apprise/plugins/vonage.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -31,34 +30,34 @@
 # Get your (api) key and secret here:
 #   - https://dashboard.nexmo.com/getting-started-guide
 #
+import contextlib
+
 import requests
 
-from .base import NotifyBase
-from ..url import PrivacyMode
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
+from ..url import PrivacyMode
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 
 class NotifyVonage(NotifyBase):
-    """
-    A wrapper for Vonage Notifications
-    """
+    """A wrapper for Vonage Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Vonage'
+    service_name = "Vonage"
 
     # The services URL
-    service_url = 'https://dashboard.nexmo.com/'
+    service_url = "https://dashboard.nexmo.com/"
 
     # The default protocol (nexmo kept for backwards compatibility)
-    secure_protocol = ('vonage', 'nexmo')
+    secure_protocol = ("vonage", "nexmo")
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_nexmo'
+    setup_url = "https://appriseit.com/services/vonage/"
 
     # Vonage uses the http protocol with JSON requests
-    notify_url = 'https://rest.nexmo.com/sms/json'
+    notify_url = "https://rest.nexmo.com/sms/json"
 
     # The maximum length of the body
     body_maxlen = 160
@@ -69,113 +68,115 @@ class NotifyVonage(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{apikey}:{secret}@{from_phone}',
-        '{schema}://{apikey}:{secret}@{from_phone}/{targets}',
+        "{schema}://{apikey}:{secret}@{from_phone}",
+        "{schema}://{apikey}:{secret}@{from_phone}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'apikey': {
-            'name': _('API Key'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-            'private': True,
-        },
-        'secret': {
-            'name': _('API Secret'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-        'from_phone': {
-            'name': _('From Phone No'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^\+?[0-9\s)(+-]+$', 'i'),
-            'map_to': 'source',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "apikey": {
+                "name": _("API Key"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+                "private": True,
+            },
+            "secret": {
+                "name": _("API Secret"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "from_phone": {
+                "name": _("From Phone No"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^\+?[0-9\s)(+-]+$", "i"),
+                "map_to": "source",
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'from_phone',
-        },
-        'key': {
-            'alias_of': 'apikey',
-        },
-        'secret': {
-            'alias_of': 'secret',
-        },
-
-        # Default Time To Live
-        # By default Vonage attempt delivery for 72 hours, however the maximum
-        # effective value depends on the operator and is typically 24 - 48
-        # hours. We recommend this value should be kept at its default or at
-        # least 30 minutes.
-        'ttl': {
-            'name': _('ttl'),
-            'type': 'int',
-            'default': 900000,
-            'min': 20000,
-            'max': 604800000,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone",
+            },
+            "key": {
+                "alias_of": "apikey",
+            },
+            "secret": {
+                "alias_of": "secret",
+            },
+            # Default Time To Live
+            # By default Vonage attempt delivery for 72 hours, however the
+            # maximum effective value depends on the operator and is typically
+            # 24 - 48 hours. We recommend this value should be kept at its
+            # default or at least 30 minutes.
+            "ttl": {
+                "name": _("ttl"),
+                "type": "int",
+                "default": 900000,
+                "min": 20000,
+                "max": 604800000,
+            },
         },
-    })
+    )
 
-    def __init__(self, apikey, secret, source, targets=None, ttl=None,
-                 **kwargs):
-        """
-        Initialize Vonage Object
-        """
+    def __init__(
+        self, apikey, secret, source, targets=None, ttl=None, **kwargs
+    ):
+        """Initialize Vonage Object."""
         super().__init__(**kwargs)
 
         # API Key (associated with project)
         self.apikey = validate_regex(
-            apikey, *self.template_tokens['apikey']['regex'])
+            apikey, *self.template_tokens["apikey"]["regex"]
+        )
         if not self.apikey:
-            msg = 'An invalid Vonage API Key ' \
-                  '({}) was specified.'.format(apikey)
+            msg = f"An invalid Vonage API Key ({apikey}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # API Secret (associated with project)
         self.secret = validate_regex(
-            secret, *self.template_tokens['secret']['regex'])
+            secret, *self.template_tokens["secret"]["regex"]
+        )
         if not self.secret:
-            msg = 'An invalid Vonage API Secret ' \
-                  '({}) was specified.'.format(secret)
+            msg = f"An invalid Vonage API Secret ({secret}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Set our Time to Live Flag
-        self.ttl = self.template_args['ttl']['default']
-        try:
+        self.ttl = self.template_args["ttl"]["default"]
+        with contextlib.suppress(ValueError, TypeError):
+            # update our ttl if we're dealing with an integer
             self.ttl = int(ttl)
 
-        except (ValueError, TypeError):
-            # Do nothing
-            pass
-
-        if self.ttl < self.template_args['ttl']['min'] or \
-                self.ttl > self.template_args['ttl']['max']:
-            msg = 'The Vonage TTL specified ({}) is out of range.'\
-                .format(self.ttl)
+        if (
+            self.ttl < self.template_args["ttl"]["min"]
+            or self.ttl > self.template_args["ttl"]["max"]
+        ):
+            msg = f"The Vonage TTL specified ({self.ttl}) is out of range."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -184,56 +185,53 @@ def __init__(self, apikey, secret, source, targets=None, ttl=None,
 
         result = is_phone_no(source)
         if not result:
-            msg = 'The Account (From) Phone # specified ' \
-                  '({}) is invalid.'.format(source)
+            msg = (
+                f"The Account (From) Phone # specified ({source}) is invalid."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Store our parsed value
-        self.source = result['full']
+        self.source = result["full"]
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append(result['full'])
+            self.targets.append(result["full"])
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Vonage Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Vonage Notification."""
 
         # error tracking (used for function return)
         has_error = False
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded",
         }
 
         # Prepare our payload
         payload = {
-            'api_key': self.apikey,
-            'api_secret': self.secret,
-            'ttl': self.ttl,
-            'from': self.source,
-            'text': body,
-
+            "api_key": self.apikey,
+            "api_secret": self.secret,
+            "ttl": self.ttl,
+            "from": self.source,
+            "text": body,
             # The to gets populated in the loop below
-            'to': None,
+            "to": None,
         }
 
         # Create a copy of the targets list
@@ -248,12 +246,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our user
-            payload['to'] = target
+            payload["to"] = target
 
             # Some Debug Logging
-            self.logger.debug('Vonage POST URL: {} (cert_verify={})'.format(
-                self.notify_url, self.verify_certificate))
-            self.logger.debug('Vonage Payload: {}' .format(payload))
+            self.logger.debug(
+                "Vonage POST URL:"
+                f" {self.notify_url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"Vonage Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -269,35 +269,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyVonage.http_response_code_lookup(
-                            r.status_code)
+                    status_str = NotifyVonage.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     self.logger.warning(
-                        'Failed to send Vonage notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Vonage notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Vonage notification to %s.' % target)
+                    self.logger.info(f"Sent Vonage notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Vonage:%s '
-                    'notification.' % target
+                    f"A Connection error occurred sending Vonage:{target} "
+                    "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -307,50 +308,46 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol[0], self.apikey, self.secret)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'ttl': str(self.ttl),
+            "ttl": str(self.ttl),
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://{key}:{secret}@{source}/{targets}/?{params}'.format(
+        return "{schema}://{key}:{secret}@{source}/{targets}/?{params}".format(
             schema=self.secure_protocol[0],
-            key=self.pprint(self.apikey, privacy, safe=''),
+            key=self.pprint(self.apikey, privacy, safe=""),
             secret=self.pprint(
-                self.secret, privacy, mode=PrivacyMode.Secret, safe=''),
-            source=NotifyVonage.quote(self.source, safe=''),
-            targets='/'.join(
-                [NotifyVonage.quote(x, safe='') for x in self.targets]),
-            params=NotifyVonage.urlencode(params))
+                self.secret, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            source=NotifyVonage.quote(self.source, safe=""),
+            targets="/".join(
+                [NotifyVonage.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyVonage.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -358,46 +355,42 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyVonage.split_path(results['fullpath'])
+        results["targets"] = NotifyVonage.split_path(results["fullpath"])
 
         # The hostname is our source number
-        results['source'] = NotifyVonage.unquote(results['host'])
+        results["source"] = NotifyVonage.unquote(results["host"])
 
         # Get our account_side and auth_token from the user/pass config
-        results['apikey'] = NotifyVonage.unquote(results['user'])
-        results['secret'] = NotifyVonage.unquote(results['password'])
+        results["apikey"] = NotifyVonage.unquote(results["user"])
+        results["secret"] = NotifyVonage.unquote(results["password"])
 
         # API Key
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
             # Extract the API Key from an argument
-            results['apikey'] = \
-                NotifyVonage.unquote(results['qsd']['key'])
+            results["apikey"] = NotifyVonage.unquote(results["qsd"]["key"])
 
         # API Secret
-        if 'secret' in results['qsd'] and len(results['qsd']['secret']):
+        if "secret" in results["qsd"] and len(results["qsd"]["secret"]):
             # Extract the API Secret from an argument
-            results['secret'] = \
-                NotifyVonage.unquote(results['qsd']['secret'])
+            results["secret"] = NotifyVonage.unquote(results["qsd"]["secret"])
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['source'] = \
-                NotifyVonage.unquote(results['qsd']['from'])
-        if 'source' in results['qsd'] and len(results['qsd']['source']):
-            results['source'] = \
-                NotifyVonage.unquote(results['qsd']['source'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["source"] = NotifyVonage.unquote(results["qsd"]["from"])
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["source"] = NotifyVonage.unquote(results["qsd"]["source"])
 
         # Support the 'ttl' variable
-        if 'ttl' in results['qsd'] and len(results['qsd']['ttl']):
-            results['ttl'] = \
-                NotifyVonage.unquote(results['qsd']['ttl'])
+        if "ttl" in results["qsd"] and len(results["qsd"]["ttl"]):
+            results["ttl"] = NotifyVonage.unquote(results["qsd"]["ttl"])
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyVonage.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyVonage.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/webexteams.py b/libs/apprise/plugins/webexteams.py
index 39d40262c6..690e6ec84a 100644
--- a/libs/apprise/plugins/webexteams.py
+++ b/libs/apprise/plugins/webexteams.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -59,45 +58,43 @@
 # - https://developer.cisco.com/ecosystem/webex/apps/\
 #       incoming-webhooks-cisco-systems/ - Simple webhook example
 
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import validate_regex
+from ..common import NotifyFormat, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 # Extend HTTP Error Messages
 # Based on: https://developer.webex.com/docs/api/basics/rate-limiting
 WEBEX_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
-    415: 'Unsuported media specified',
-    429: 'To many consecutive requests were made.',
-    503: 'Service is overloaded, try again later',
+    401: "Unauthorized - Invalid Token.",
+    415: "Unsuported media specified",
+    429: "To many consecutive requests were made.",
+    503: "Service is overloaded, try again later",
 }
 
 
 class NotifyWebexTeams(NotifyBase):
-    """
-    A wrapper for Webex Teams Notifications
-    """
+    """A wrapper for Webex Teams Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Cisco Webex Teams'
+    service_name = "Cisco Webex Teams"
 
     # The services URL
-    service_url = 'https://webex.teams.com/'
+    service_url = "https://webex.teams.com/"
 
     # The default secure protocol
-    secure_protocol = ('wxteams', 'webex')
+    secure_protocol = ("wxteams", "webex")
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_wxteams'
+    setup_url = "https://appriseit.com/services/wxteams/"
 
     # Webex Teams uses the http protocol with JSON requests
-    notify_url = 'https://api.ciscospark.com/v1/webhooks/incoming/'
+    notify_url = "https://api.ciscospark.com/v1/webhooks/incoming/"
 
     # The maximum allowable characters allowed in the body per message
     body_maxlen = 1000
@@ -109,59 +106,69 @@ class NotifyWebexTeams(NotifyBase):
     notify_format = NotifyFormat.MARKDOWN
 
     # Define object templates
-    templates = (
-        '{schema}://{token}',
-    )
+    templates = ("{schema}://{token}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]{80,160}$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]{80,160}$", "i"),
+            },
         },
-    })
+    )
+
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "token": {
+                "alias_of": "token",
+            },
+        },
+    )
 
     def __init__(self, token, **kwargs):
-        """
-        Initialize Webex Teams Object
-        """
+        """Initialize Webex Teams Object."""
         super().__init__(**kwargs)
 
         # The token associated with the account
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'The Webex Teams token specified ({}) is invalid.'\
-                .format(token)
+            msg = f"The Webex Teams token specified ({token}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Webex Teams Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Webex Teams Notification."""
 
         # Setup our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Prepare our URL
-        url = '{}/{}'.format(self.notify_url, self.token)
+        url = f"{self.notify_url}/{self.token}"
 
         payload = {
-            'markdown' if (self.notify_format == NotifyFormat.MARKDOWN)
-            else 'text': body,
+            (
+                "markdown"
+                if (self.notify_format == NotifyFormat.MARKDOWN)
+                else "text"
+            ): body,
         }
 
-        self.logger.debug('Webex Teams POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('Webex Teams Payload: %s' % str(payload))
+        self.logger.debug(
+            "Webex Teams POST URL:"
+            f" {url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Webex Teams Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -174,34 +181,34 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 timeout=self.request_timeout,
             )
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.no_content):
+                requests.codes.ok,
+                requests.codes.no_content,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyWebexTeams.http_response_code_lookup(
-                        r.status_code)
+                status_str = NotifyWebexTeams.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Webex Teams notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Webex Teams notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 return False
 
             else:
-                self.logger.info(
-                    'Sent Webex Teams notification.')
+                self.logger.info("Sent Webex Teams notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Webex Teams '
-                'notification.'
+                "A Connection error occurred sending Webex Teams notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False
 
@@ -209,41 +216,42 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol[0], self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{token}/?{params}'.format(
+        return "{schema}://{token}/?{params}".format(
             schema=self.secure_protocol[0],
-            token=self.pprint(self.token, privacy, safe=''),
+            token=self.pprint(self.token, privacy, safe=""),
             params=NotifyWebexTeams.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
-        # The first token is stored in the hostname
-        results['token'] = NotifyWebexTeams.unquote(results['host'])
+        # Set our token if found as an argument
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
+            results["token"] = \
+                NotifyWebexTeams.unquote(results["qsd"]["token"])
+
+        else:
+            # The first token is stored in the hostname
+            results["token"] = NotifyWebexTeams.unquote(results["host"])
 
         return results
 
@@ -254,17 +262,25 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://(api\.ciscospark\.com|webexapis\.com)'
-            r'/v[1-9][0-9]*/webhooks/incoming/'
-            r'(?P<webhook_token>[A-Z0-9_-]+)/?'
-            r'(?P<params>\?.+)?$', url, re.I)
+            r"^https?://(api\.ciscospark\.com|webexapis\.com)"
+            r"/v[1-9][0-9]*/webhooks/incoming/"
+            r"(?P<webhook_token>[A-Z0-9_-]+)/?"
+            r"(?P<params>\?.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyWebexTeams.parse_url(
-                '{schema}://{webhook_token}/{params}'.format(
+                "{schema}://{webhook_token}/{params}".format(
                     schema=NotifyWebexTeams.secure_protocol[0],
-                    webhook_token=result.group('webhook_token'),
-                    params='' if not result.group('params')
-                    else result.group('params')))
+                    webhook_token=result.group("webhook_token"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/wecombot.py b/libs/apprise/plugins/wecombot.py
index 957cad1559..f94b3e616a 100644
--- a/libs/apprise/plugins/wecombot.py
+++ b/libs/apprise/plugins/wecombot.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -55,76 +54,76 @@
 # This plugin also supports taking the URL (as identified above) directly
 # as well.
 
+from json import dumps
 import re
+
 import requests
-from json import dumps
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import validate_regex
+from .base import NotifyBase
 
 
 class NotifyWeComBot(NotifyBase):
-    """
-    A wrapper for WeCom Bot Notifications
-    """
+    """A wrapper for WeCom Bot Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'WeCom Bot'
+    service_name = "WeCom Bot"
 
     # The services URL
-    service_url = 'https://weixin.qq.com/'
+    service_url = "https://weixin.qq.com/"
 
     # The default secure protocol
-    secure_protocol = 'wecombot'
+    secure_protocol = "wecombot"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_wecombot'
+    setup_url = "https://appriseit.com/services/wecombot/"
 
     # Plain Text Notification URL
-    notify_url = 'https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={key}'
+    notify_url = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key={key}"
 
     # Define object templates
-    templates = (
-        '{schema}://{key}',
-    )
+    templates = ("{schema}://{key}",)
 
     # The title is not used
     title_maxlen = 0
 
     # Define our template arguments
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        # The Bot Key can be found at the end of the webhook provided (?key=)
-        'key': {
-            'name': _('Bot Webhook Key'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            # The Bot Key can be found at the end of the webhook provided
+            # (?key=)
+            "key": {
+                "name": _("Bot Webhook Key"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        # You can optionally pass IRC colors into
-        'key': {
-            'alias_of': 'key',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            # You can optionally pass IRC colors into
+            "key": {
+                "alias_of": "key",
+            },
         },
-    })
+    )
 
     def __init__(self, key, **kwargs):
-        """
-        Initialize WeCom Bot Object
-        """
+        """Initialize WeCom Bot Object."""
         super().__init__(**kwargs)
 
         # Assign our bot webhook
-        self.key = validate_regex(
-            key, *self.template_tokens['key']['regex'])
+        self.key = validate_regex(key, *self.template_tokens["key"]["regex"])
         if not self.key:
-            msg = 'An invalid WeCom Bot Webhook Key ' \
-                  '({}) was specified.'.format(key)
+            msg = f"An invalid WeCom Bot Webhook Key ({key}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -136,49 +135,47 @@ def __init__(self, key, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.key)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Prepare our parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{key}/?{params}'.format(
+        return "{schema}://{key}/?{params}".format(
             schema=self.secure_protocol,
-            key=self.pprint(self.key, privacy, safe=''),
+            key=self.pprint(self.key, privacy, safe=""),
             params=NotifyWeComBot.urlencode(params),
         )
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        wrapper to _send since we can alert more then one channel
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Wrapper to _send since we can alert more then one channel."""
 
         # prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json; charset=utf-8",
         }
 
         # Prepare our payload
         payload = {
-            'msgtype': "text",
-            'text': {
-                'content': body,
-            }
+            "msgtype": "text",
+            "text": {
+                "content": body,
+            },
         }
 
-        self.logger.debug('WeCom Bot GET URL: %s (cert_verify=%r)' % (
-            self.api_url, self.verify_certificate))
-        self.logger.debug('WeCom Bot Payload: %s' % str(payload))
+        self.logger.debug(
+            "WeCom Bot GET URL:"
+            f" {self.api_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"WeCom Bot Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -186,36 +183,38 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         try:
             r = requests.post(
                 self.api_url,
-                data=dumps(payload).encode('utf-8'),
+                data=dumps(payload).encode("utf-8"),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyWeComBot.http_response_code_lookup(r.status_code)
+                status_str = NotifyWeComBot.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send WeCom Bot notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send WeCom Bot notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent WeCom Bot notification.')
+                self.logger.info("Sent WeCom Bot notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending WeCom Bot '
-                'notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending WeCom Bot notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -224,11 +223,8 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
@@ -236,12 +232,11 @@ def parse_url(url):
             return results
 
         # The first token is stored in the hostname
-        results['key'] = NotifyWeComBot.unquote(results['host'])
+        results["key"] = NotifyWeComBot.unquote(results["host"])
 
         # The 'key' makes it easier to use yaml configuration
-        if 'key' in results['qsd'] and len(results['qsd']['key']):
-            results['key'] = \
-                NotifyWeComBot.unquote(results['qsd']['key'])
+        if "key" in results["qsd"] and len(results["qsd"]["key"]):
+            results["key"] = NotifyWeComBot.unquote(results["qsd"]["key"])
 
         return results
 
@@ -252,16 +247,24 @@ def parse_native_url(url):
         """
 
         result = re.match(
-            r'^https?://qyapi\.weixin\.qq\.com/cgi-bin/webhook/send/?\?key='
-            r'(?P<key>[A-Z0-9_-]+)/?'
-            r'&?(?P<params>.+)?$', url, re.I)
+            r"^https?://qyapi\.weixin\.qq\.com/cgi-bin/webhook/send/?\?key="
+            r"(?P<key>[A-Z0-9_-]+)/?"
+            r"&?(?P<params>.+)?$",
+            url,
+            re.I,
+        )
 
         if result:
             return NotifyWeComBot.parse_url(
-                '{schema}://{key}{params}'.format(
+                "{schema}://{key}{params}".format(
                     schema=NotifyWeComBot.secure_protocol,
-                    key=result.group('key'),
-                    params='' if not result.group('params')
-                    else '?' + result.group('params')))
+                    key=result.group("key"),
+                    params=(
+                        ""
+                        if not result.group("params")
+                        else "?" + result.group("params")
+                    ),
+                )
+            )
 
         return None
diff --git a/libs/apprise/plugins/whatsapp.py b/libs/apprise/plugins/whatsapp.py
index 851ccb7d85..025dc4d061 100644
--- a/libs/apprise/plugins/whatsapp.py
+++ b/libs/apprise/plugins/whatsapp.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -41,42 +40,43 @@
 #  from phone number itself, but it's ID.  It's displayed below and contains
 #  way more numbers then your typical phone number
 
+from json import dumps, loads
 import re
+
 import requests
-from json import loads, dumps
-from .base import NotifyBase
+
 from ..common import NotifyType
-from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_phone_no, parse_phone_no, validate_regex
+from .base import NotifyBase
 
 
 class NotifyWhatsApp(NotifyBase):
-    """
-    A wrapper for WhatsApp Notifications
-    """
+    """A wrapper for WhatsApp Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'WhatsApp'
+    service_name = "WhatsApp"
 
     # The services URL
-    service_url = \
-        'https://developers.facebook.com/docs/whatsapp/cloud-api/get-started'
+    service_url = (
+        "https://developers.facebook.com/docs/whatsapp/cloud-api/get-started"
+    )
 
     # All notification requests are secure
-    secure_protocol = 'whatsapp'
+    secure_protocol = "whatsapp"
 
     # Allow 300 requests per minute.
     # 60/300 = 0.2
     request_rate_per_sec = 0.20
 
     # Facebook Graph version
-    fb_graph_version = 'v17.0'
+    fb_graph_version = "v17.0"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_whatsapp'
+    setup_url = "https://appriseit.com/services/whatsapp/"
 
     # WhatsApp Message Notification URL
-    notify_url = 'https://graph.facebook.com/{fb_ver}/{phone_id}/messages'
+    notify_url = "https://graph.facebook.com/{fb_ver}/{phone_id}/messages"
 
     # The maximum length of the body
     body_maxlen = 1024
@@ -87,128 +87,150 @@ class NotifyWhatsApp(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{token}@{from_phone_id}/{targets}',
-        '{schema}://{template}:{token}@{from_phone_id}/{targets}',
+        "{schema}://{token}@{from_phone_id}/{targets}",
+        "{schema}://{template}:{token}@{from_phone_id}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('Access Token'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9]+$', 'i'),
-        },
-        'template': {
-            'name': _('Template Name'),
-            'type': 'string',
-            'required': False,
-            'regex': (r'^[^\s]+$', 'i'),
-        },
-        'from_phone_id': {
-            'name': _('From Phone ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[0-9]+$', 'i'),
-        },
-        'target_phone': {
-            'name': _('Target Phone No'),
-            'type': 'string',
-            'prefix': '+',
-            'regex': (r'^[0-9\s)(+-]+$', 'i'),
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("Access Token"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9]+$", "i"),
+            },
+            "template": {
+                "name": _("Template Name"),
+                "type": "string",
+                "required": False,
+                "regex": (r"^[^\s]+$", "i"),
+            },
+            "from_phone_id": {
+                "name": _("From Phone ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[0-9]+$", "i"),
+            },
+            "target_phone": {
+                "name": _("Target Phone No"),
+                "type": "string",
+                "prefix": "+",
+                "regex": (r"^[0-9\s)(+-]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+            "language": {
+                "name": _("Language"),
+                "type": "string",
+                "default": "en_US",
+                "regex": (r"^[^0-9\s]+$", "i"),
+            },
         },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-        'language': {
-            'name': _('Language'),
-            'type': 'string',
-            'default': 'en_US',
-            'regex': (r'^[^0-9\s]+$', 'i'),
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
-        },
-        'from': {
-            'alias_of': 'from_phone_id',
-        },
-        'token': {
-            'alias_of': 'token',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "from": {
+                "alias_of": "from_phone_id",
+            },
+            "token": {
+                "alias_of": "token",
+            },
+            "template": {
+                "alias_of": "template",
+            },
+            "lang": {
+                "alias_of": "language",
+            },
         },
-        'template': {
-            'alias_of': 'template',
-        },
-        'lang': {
-            'alias_of': 'language',
-        },
-    })
+    )
 
     # Our supported mappings and component keys
     component_key_re = re.compile(
-        r'(?P<key>((?P<id>[1-9][0-9]*)|(?P<map>body|type)))', re.IGNORECASE)
+        r"(?P<key>((?P<id>[1-9][0-9]*)|(?P<map>body|type)))", re.IGNORECASE
+    )
 
     # Define any kwargs we're using
     template_kwargs = {
-        'template_mapping': {
-            'name': _('Template Mapping'),
-            'prefix': ':',
+        "template_mapping": {
+            "name": _("Template Mapping"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, token, from_phone_id, template=None, targets=None,
-                 language=None, template_mapping=None, **kwargs):
-        """
-        Initialize WhatsApp Object
-        """
+    def __init__(
+        self,
+        token,
+        from_phone_id,
+        template=None,
+        targets=None,
+        language=None,
+        template_mapping=None,
+        **kwargs,
+    ):
+        """Initialize WhatsApp Object."""
         super().__init__(**kwargs)
 
         # The Access Token associated with the account
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'An invalid WhatsApp Access Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid WhatsApp Access Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The From Phone ID associated with the account
         self.from_phone_id = validate_regex(
-            from_phone_id, *self.template_tokens['from_phone_id']['regex'])
+            from_phone_id, *self.template_tokens["from_phone_id"]["regex"]
+        )
         if not self.from_phone_id:
-            msg = 'An invalid WhatsApp From Phone ID ' \
-                  '({}) was specified.'.format(from_phone_id)
+            msg = (
+                "An invalid WhatsApp From Phone ID "
+                f"({from_phone_id}) was specified."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # The template to associate with the message
         if template:
             self.template = validate_regex(
-                template, *self.template_tokens['template']['regex'])
+                template, *self.template_tokens["template"]["regex"]
+            )
             if not self.template:
-                msg = 'An invalid WhatsApp Template Name ' \
-                      '({}) was specified.'.format(template)
+                msg = (
+                    "An invalid WhatsApp Template Name "
+                    f"({template}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
             # The Template language Code to use
             if language:
                 self.language = validate_regex(
-                    language, *self.template_tokens['language']['regex'])
+                    language, *self.template_tokens["language"]["regex"]
+                )
                 if not self.language:
-                    msg = 'An invalid WhatsApp Template Language Code ' \
-                          '({}) was specified.'.format(language)
+                    msg = (
+                        "An invalid WhatsApp Template Language Code "
+                        f"({language}) was specified."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
             else:
-                self.language = self.template_tokens['language']['default']
+                self.language = self.template_tokens["language"]["default"]
         else:
             #
             # Message Mode
@@ -216,20 +238,19 @@ def __init__(self, token, from_phone_id, template=None, targets=None,
             self.template = None
 
         # Parse our targets
-        self.targets = list()
+        self.targets = []
 
         for target in parse_phone_no(targets):
             # Validate targets and drop bad ones:
             result = is_phone_no(target)
             if not result:
                 self.logger.warning(
-                    'Dropped invalid phone # '
-                    '({}) specified.'.format(target),
+                    f"Dropped invalid phone # ({target}) specified.",
                 )
                 continue
 
             # store valid phone number
-            self.targets.append('+{}'.format(result['full']))
+            self.targets.append("+{}".format(result["full"]))
 
         self.template_mapping = {}
         if template_mapping:
@@ -237,39 +258,44 @@ def __init__(self, token, from_phone_id, template=None, targets=None,
             self.template_mapping.update(template_mapping)
 
         # Validate Mapping and prepare Components
-        self.components = dict()
-        self.component_keys = list()
+        self.components = {}
+        self.component_keys = []
         for key, val in self.template_mapping.items():
             matched = self.component_key_re.match(key)
             if not matched:
-                msg = 'An invalid Template Component ID ' \
-                      '({}) was specified.'.format(key)
+                msg = (
+                    f"An invalid Template Component ID ({key}) was specified."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
-            if matched.group('id'):
+            if matched.group("id"):
                 #
                 # Manual Component Assigment (by id)
                 #
-                index = matched.group('id')
+                index = matched.group("id")
                 map_to = {
                     "type": "text",
                     "text": val,
                 }
 
             else:  # matched.group('map')
-                map_to = matched.group('map').lower()
+                map_to = matched.group("map").lower()
                 matched = self.component_key_re.match(val)
-                if not (matched and matched.group('id')):
-                    msg = 'An invalid Template Component Mapping ' \
-                        '(:{}={}) was specified.'.format(key, val)
+                if not (matched and matched.group("id")):
+                    msg = (
+                        "An invalid Template Component Mapping "
+                        f"(:{key}={val}) was specified."
+                    )
                     self.logger.warning(msg)
                     raise TypeError(msg)
-                index = matched.group('id')
+                index = matched.group("id")
 
             if index in self.components:
-                msg = 'The Template Component index ' \
-                      '({}) was already assigned.'.format(key)
+                msg = (
+                    "The Template Component index "
+                    f"({key}) was already assigned."
+                )
                 self.logger.warning(msg)
                 raise TypeError(msg)
 
@@ -282,14 +308,13 @@ def __init__(self, token, from_phone_id, template=None, targets=None,
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform WhatsApp Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform WhatsApp Notification."""
 
         if not self.targets:
             self.logger.warning(
-                'There are no valid WhatsApp targets to notify.')
+                "There are no valid WhatsApp targets to notify."
+            )
             return False
 
         # error tracking (used for function return)
@@ -303,16 +328,16 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'Authorization': f'Bearer {self.token}',
+            "User-Agent": self.app_id,
+            "Accept": "application/json",
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.token}",
         }
 
         payload = {
-            'messaging_product': 'whatsapp',
+            "messaging_product": "whatsapp",
             # The To gets populated in the loop below
-            'to': None,
+            "to": None,
         }
 
         if not self.template:
@@ -320,9 +345,9 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Send Message
             #
             payload.update({
-                'recipient_type': "individual",
-                'type': 'text',
-                'text': {"body": body},
+                "recipient_type": "individual",
+                "type": "text",
+                "text": {"body": body},
             })
 
         else:
@@ -330,7 +355,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             # Send Template
             #
             payload.update({
-                'type': 'template',
+                "type": "template",
                 "template": {
                     "name": self.template,
                     "language": {"code": self.language},
@@ -338,24 +363,26 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             })
 
             if self.components:
-                payload['template']['components'] = [
-                    {
-                        "type": "body",
-                        "parameters": [],
-                    }
-                ]
+                payload["template"]["components"] = [{
+                    "type": "body",
+                    "parameters": [],
+                }]
                 for key in self.component_keys:
                     if isinstance(self.components[key], dict):
                         # Manual Assignment
-                        payload['template']['components'][0]["parameters"]\
-                            .append(self.components[key])
+                        payload["template"]["components"][0][
+                            "parameters"
+                        ].append(self.components[key])
                         continue
 
                     # Mapping of body and/or notify type
-                    payload['template']['components'][0]["parameters"].append({
+                    payload["template"]["components"][0]["parameters"].append({
                         "type": "text",
-                        "text": body if self.components[key] == 'body'
-                        else notify_type,
+                        "text": (
+                            body
+                            if self.components[key] == "body"
+                            else notify_type.value
+                        ),
                     })
 
         # Create a copy of the targets list
@@ -366,12 +393,14 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             target = targets.pop(0)
 
             # Prepare our user
-            payload['to'] = target
+            payload["to"] = target
 
             # Some Debug Logging
-            self.logger.debug('WhatsApp POST URL: {} (cert_verify={})'.format(
-                url, self.verify_certificate))
-            self.logger.debug('WhatsApp Payload: {}' .format(payload))
+            self.logger.debug(
+                "WhatsApp POST URL:"
+                f" {url} (cert_verify={self.verify_certificate})"
+            )
+            self.logger.debug(f"WhatsApp Payload: {payload}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -385,10 +414,13 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
 
                 if r.status_code not in (
-                        requests.codes.created, requests.codes.ok):
+                    requests.codes.created,
+                    requests.codes.ok,
+                ):
                     # We had a problem
-                    status_str = \
-                        NotifyBase.http_response_code_lookup(r.status_code)
+                    status_str = NotifyBase.http_response_code_lookup(
+                        r.status_code
+                    )
 
                     # set up our status code to use
                     status_code = r.status_code
@@ -396,10 +428,12 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                     try:
                         # Update our status response if we can
                         json_response = loads(r.content)
-                        status_code = \
-                            json_response['error'].get('code', status_code)
-                        status_str = \
-                            json_response['error'].get('message', status_str)
+                        status_code = json_response["error"].get(
+                            "code", status_code
+                        )
+                        status_str = json_response["error"].get(
+                            "message", status_str
+                        )
 
                     except (AttributeError, TypeError, ValueError, KeyError):
                         # KeyError = r.content is parseable but does not
@@ -413,15 +447,17 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                         pass
 
                     self.logger.warning(
-                        'Failed to send WhatsApp notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send WhatsApp notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            status_code))
+                            ", " if status_str else "",
+                            status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
@@ -429,14 +465,15 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
                 else:
                     self.logger.info(
-                        'Sent WhatsApp notification to {}.'.format(target))
+                        f"Sent WhatsApp notification to {target}."
+                    )
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending WhatsApp:%s ' % (
-                        target) + 'notification.'
+                    f"A Connection error occurred sending WhatsApp:{target} "
+                    + "notification."
                 )
-                self.logger.debug('Socket Exception: %s' % str(e))
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -446,59 +483,58 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.from_phone_id, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {}
         if self.template:
             # Add language to our URL
-            params['lang'] = self.language
+            params["lang"] = self.language
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Payload body extras prefixed with a ':' sign
         # Append our payload extras into our parameters
-        params.update(
-            {':{}'.format(k): v for k, v in self.template_mapping.items()})
+        params.update({f":{k}": v for k, v in self.template_mapping.items()})
 
-        return '{schema}://{template}{token}@{from_id}/{targets}/?{params}'\
+        return (
+            "{schema}://{template}{token}@{from_id}/{targets}/?{params}"
             .format(
                 schema=self.secure_protocol,
-                from_id=self.pprint(
-                    self.from_phone_id, privacy, safe=''),
-                token=self.pprint(self.token, privacy, safe=''),
-                template='' if not self.template
-                else '{}:'.format(
-                    NotifyWhatsApp.quote(self.template, safe='')),
-                targets='/'.join(
-                    [NotifyWhatsApp.quote(x, safe='') for x in self.targets]),
-                params=NotifyWhatsApp.urlencode(params))
+                from_id=self.pprint(self.from_phone_id, privacy, safe=""),
+                token=self.pprint(self.token, privacy, safe=""),
+                template=(
+                    ""
+                    if not self.template
+                    else "{}:".format(
+                        NotifyWhatsApp.quote(self.template, safe="")
+                    )
+                ),
+                targets="/".join(
+                    [NotifyWhatsApp.quote(x, safe="") for x in self.targets]
+                ),
+                params=NotifyWhatsApp.urlencode(params),
+            )
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         targets = len(self.targets)
         return targets if targets > 0 else 1
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
 
         if not results:
@@ -507,60 +543,61 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyWhatsApp.split_path(results['fullpath'])
+        results["targets"] = NotifyWhatsApp.split_path(results["fullpath"])
 
         # The hostname is our From Phone ID
-        results['from_phone_id'] = NotifyWhatsApp.unquote(results['host'])
+        results["from_phone_id"] = NotifyWhatsApp.unquote(results["host"])
 
         # Determine if we have a Template, otherwise load our token
-        if results['password']:
+        if results["password"]:
             #
             # Template Mode
             #
-            results['template'] = NotifyWhatsApp.unquote(results['user'])
-            results['token'] = NotifyWhatsApp.unquote(results['password'])
+            results["template"] = NotifyWhatsApp.unquote(results["user"])
+            results["token"] = NotifyWhatsApp.unquote(results["password"])
 
         else:
             #
             # Message Mode
             #
-            results['token'] = NotifyWhatsApp.unquote(results['user'])
+            results["token"] = NotifyWhatsApp.unquote(results["user"])
 
         # Access token
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Extract the account sid from an argument
-            results['token'] = \
-                NotifyWhatsApp.unquote(results['qsd']['token'])
+            results["token"] = NotifyWhatsApp.unquote(results["qsd"]["token"])
 
         # Template
-        if 'template' in results['qsd'] and len(results['qsd']['template']):
-            results['template'] = results['qsd']['template']
+        if "template" in results["qsd"] and len(results["qsd"]["template"]):
+            results["template"] = results["qsd"]["template"]
 
         # Template Language
-        if 'lang' in results['qsd'] and len(results['qsd']['lang']):
-            results['language'] = results['qsd']['lang']
+        if "lang" in results["qsd"] and len(results["qsd"]["lang"]):
+            results["language"] = results["qsd"]["lang"]
 
         # Support the 'from'  and 'source' variable so that we can support
         # targets this way too.
         # The 'from' makes it easier to use yaml configuration
-        if 'from' in results['qsd'] and len(results['qsd']['from']):
-            results['from_phone_id'] = \
-                NotifyWhatsApp.unquote(results['qsd']['from'])
-        if 'source' in results['qsd'] and \
-                len(results['qsd']['source']):
-            results['from_phone_id'] = \
-                NotifyWhatsApp.unquote(results['qsd']['source'])
+        if "from" in results["qsd"] and len(results["qsd"]["from"]):
+            results["from_phone_id"] = NotifyWhatsApp.unquote(
+                results["qsd"]["from"]
+            )
+        if "source" in results["qsd"] and len(results["qsd"]["source"]):
+            results["from_phone_id"] = NotifyWhatsApp.unquote(
+                results["qsd"]["source"]
+            )
 
         # Support the 'to' variable so that we can support targets this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyWhatsApp.parse_phone_no(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyWhatsApp.parse_phone_no(
+                results["qsd"]["to"]
+            )
 
         # store any additional payload extra's defined
-        results['template_mapping'] = {
+        results["template_mapping"] = {
             NotifyWhatsApp.unquote(x): NotifyWhatsApp.unquote(y)
-            for x, y in results['qsd:'].items()
+            for x, y in results["qsd:"].items()
         }
 
         return results
diff --git a/libs/apprise/plugins/windows.py b/libs/apprise/plugins/windows.py
index dae1a7d2fe..996c7dc5e6 100644
--- a/libs/apprise/plugins/windows.py
+++ b/libs/apprise/plugins/windows.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,13 +25,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+import contextlib
 from time import sleep
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..utils.parse import parse_bool
+from ..common import NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool
+from .base import NotifyBase
 
 # Default our global support flag
 NOTIFY_WINDOWS_SUPPORT_ENABLED = False
@@ -53,25 +52,24 @@
 
 
 class NotifyWindows(NotifyBase):
-    """
-    A wrapper for local Windows Notifications
-    """
+    """A wrapper for local Windows Notifications."""
+
     # Set our global enabled flag
     enabled = NOTIFY_WINDOWS_SUPPORT_ENABLED
 
     requirements = {
         # Define our required packaging in order to work
-        'details': _('A local Microsoft Windows environment is required.')
+        "details": _("A local Microsoft Windows environment is required.")
     }
 
     # The default descriptive name associated with the Notification
-    service_name = 'Windows Notification'
+    service_name = "Windows Notification"
 
     # The default protocol
-    protocol = 'windows'
+    protocol = "windows"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_windows'
+    setup_url = "https://appriseit.com/services/windows/"
 
     # Disable throttle rate for Windows requests since they are normally
     # local anyway
@@ -92,36 +90,38 @@ class NotifyWindows(NotifyBase):
     url_identifier = False
 
     # Define object templates
-    templates = (
-        '{schema}://',
-    )
+    templates = ("{schema}://",)
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'duration': {
-            'name': _('Duration'),
-            'type': 'int',
-            'min': 1,
-            'default': 12,
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "duration": {
+                "name": _("Duration"),
+                "type": "int",
+                "min": 1,
+                "default": 12,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-    })
+    )
 
     def __init__(self, include_image=True, duration=None, **kwargs):
-        """
-        Initialize Windows Object
-        """
+        """Initialize Windows Object."""
 
         super().__init__(**kwargs)
 
         # Number of seconds to display notification for
-        self.duration = self.default_popup_duration_sec \
-            if not (isinstance(duration, int) and duration > 0) else duration
+        self.duration = (
+            self.default_popup_duration_sec
+            if not (isinstance(duration, int) and duration > 0)
+            else duration
+        )
 
         # Define our handler
         self.hwnd = None
@@ -131,9 +131,7 @@ def __init__(self, include_image=True, duration=None, **kwargs):
         self.include_image = include_image
 
     def _on_destroy(self, hwnd, msg, wparam, lparam):
-        """
-        Destroy callback function
-        """
+        """Destroy callback function."""
 
         nid = (self.hwnd, 0)
         win32gui.Shell_NotifyIcon(win32gui.NIM_DELETE, nid)
@@ -141,49 +139,67 @@ def _on_destroy(self, hwnd, msg, wparam, lparam):
 
         return 0
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Windows Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Windows Notification."""
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
 
         try:
             # Register destruction callback
-            message_map = {win32con.WM_DESTROY: self._on_destroy, }
+            message_map = {
+                win32con.WM_DESTROY: self._on_destroy,
+            }
 
             # Register the window class.
             self.wc = win32gui.WNDCLASS()
             self.hinst = self.wc.hInstance = win32api.GetModuleHandle(None)
-            self.wc.lpszClassName = str("PythonTaskbar")
+            self.wc.lpszClassName = "PythonTaskbar"
             self.wc.lpfnWndProc = message_map
             self.classAtom = win32gui.RegisterClass(self.wc)
 
             # Styling and window type
             style = win32con.WS_OVERLAPPED | win32con.WS_SYSMENU
             self.hwnd = win32gui.CreateWindow(
-                self.classAtom, "Taskbar", style, 0, 0,
-                win32con.CW_USEDEFAULT, win32con.CW_USEDEFAULT, 0, 0,
-                self.hinst, None)
+                self.classAtom,
+                "Taskbar",
+                style,
+                0,
+                0,
+                win32con.CW_USEDEFAULT,
+                win32con.CW_USEDEFAULT,
+                0,
+                0,
+                self.hinst,
+                None,
+            )
             win32gui.UpdateWindow(self.hwnd)
 
             # image path (if configured to acquire)
-            icon_path = None if not self.include_image \
-                else self.image_path(notify_type, extension='.ico')
+            icon_path = (
+                None
+                if not self.include_image
+                else self.image_path(notify_type, extension=".ico")
+            )
 
             if icon_path:
                 icon_flags = win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE
 
                 try:
                     hicon = win32gui.LoadImage(
-                        self.hinst, icon_path, win32con.IMAGE_ICON, 0, 0,
-                        icon_flags)
+                        self.hinst,
+                        icon_path,
+                        win32con.IMAGE_ICON,
+                        0,
+                        0,
+                        icon_flags,
+                    )
 
                 except Exception as e:
                     self.logger.warning(
-                        "Could not load windows notification icon ({}): {}"
-                        .format(icon_path, e))
+                        "Could not load windows notification icon"
+                        f" ({icon_path}): {e}"
+                    )
 
                     # disable icon
                     hicon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
@@ -193,68 +209,77 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
             # Taskbar icon
             flags = win32gui.NIF_ICON | win32gui.NIF_MESSAGE | win32gui.NIF_TIP
-            nid = (self.hwnd, 0, flags, win32con.WM_USER + 20, hicon,
-                   "Tooltip")
+            nid = (
+                self.hwnd,
+                0,
+                flags,
+                win32con.WM_USER + 20,
+                hicon,
+                "Tooltip",
+            )
             win32gui.Shell_NotifyIcon(win32gui.NIM_ADD, nid)
-            win32gui.Shell_NotifyIcon(win32gui.NIM_MODIFY, (
-                self.hwnd, 0, win32gui.NIF_INFO, win32con.WM_USER + 20, hicon,
-                "Balloon Tooltip", body, 200, title))
+            win32gui.Shell_NotifyIcon(
+                win32gui.NIM_MODIFY,
+                (
+                    self.hwnd,
+                    0,
+                    win32gui.NIF_INFO,
+                    win32con.WM_USER + 20,
+                    hicon,
+                    "Balloon Tooltip",
+                    body,
+                    200,
+                    title,
+                ),
+            )
 
             # take a rest then destroy
             sleep(self.duration)
             win32gui.DestroyWindow(self.hwnd)
             win32gui.UnregisterClass(self.wc.lpszClassName, None)
 
-            self.logger.info('Sent Windows notification.')
+            self.logger.info("Sent Windows notification.")
 
         except Exception as e:
-            self.logger.warning('Failed to send Windows notification.')
-            self.logger.debug('Windows Exception: {}', str(e))
+            self.logger.warning("Failed to send Windows notification.")
+            self.logger.debug("Windows Exception: {}", str(e))
             return False
 
         return True
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'duration': str(self.duration),
+            "image": "yes" if self.include_image else "no",
+            "duration": str(self.duration),
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
-        return '{schema}://?{params}'.format(
-            schema=self.protocol,
-            params=NotifyWindows.urlencode(params),
-        )
+        return f"{self.protocol}://?{NotifyWindows.urlencode(params)}"
 
     @staticmethod
     def parse_url(url):
-        """
-        There are no parameters nessisary for this protocol; simply having
-        windows:// is all you need.  This function just makes sure that
-        is in place.
+        """There are no parameters nessisary for this protocol; simply having
+        windows:// is all you need.
 
+        This function just makes sure that is in place.
         """
 
         results = NotifyBase.parse_url(url, verify_host=False)
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
         # Set duration
-        try:
-            results['duration'] = int(results['qsd'].get('duration'))
-
-        except (TypeError, ValueError):
-            # Not a valid integer; ignore entry
-            pass
+        with contextlib.suppress(TypeError, ValueError):
+            # Update our duration if we're dealing with an integer
+            results["duration"] = int(results["qsd"].get("duration"))
 
         # return results
         return results
diff --git a/libs/apprise/plugins/workflows.py b/libs/apprise/plugins/workflows.py
index 2ddc50e3bf..84e5ff33ae 100644
--- a/libs/apprise/plugins/workflows.py
+++ b/libs/apprise/plugins/workflows.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -30,12 +29,19 @@
 #  https://support.microsoft.com/en-us/office/browse-and-add-workflows-\
 #       in-microsoft-teams-4998095c-8b72-4b0e-984c-f2ad39e6ba9a
 
-# Your webhook will look somthing like this:
+# Your webhook will look somthing like this (legacy):
 # https://prod-161.westeurope.logic.azure.com:443/\
 #       workflows/643e69f83c8944438d68119179a10a64/triggers/manual/\
 #       paths/invoke?api-version=2016-06-01&sp=%2Ftriggers%2Fmanual%2Frun&\
 #       sv=1.0&sig=KODuebWbDGYFr0z0eu-6Rj8aUKz7108W3wrNJZxFE5A
 #
+# Or it may now look something like this:
+# https://prod-161.westeurope.logic.azure.com:443/\
+#       powerautomate/automations/direct/\
+#       workflows/643e69f83c8944438d68119179a10a64/triggers/manual/\
+#       paths/invoke?api-version=2022-03-01-preview&sp=%2Ftriggers%2Fmanual%2F\
+#       run&sv=1.0&sig=KODuebWbDGYFr0z0eu-6Rj8aUKz7108W3wrNJZxFE5A
+#
 # Yes... The URL is that big... But it looks like this (greatly simplified):
 # https://HOST:PORT/workflows/ABCD/triggers/manual/path/...sig=DEFG
 #          ^    ^                ^                              ^
@@ -50,38 +56,44 @@
 #   workflows://HOST:PORT/ABCD/DEFG/
 #
 
-import re
-import requests
 import json
 from json.decoder import JSONDecodeError
+import re
+
+import requests
 
-from .base import NotifyBase
-from ..common import NotifyImageSize
-from ..common import NotifyType
-from ..common import NotifyFormat
-from ..utils.parse import parse_bool, validate_regex
-from ..utils.templates import apply_template, TemplateType
 from ..apprise_attachment import AppriseAttachment
+from ..common import NotifyFormat, NotifyImageSize, NotifyType
 from ..locale import gettext_lazy as _
+from ..utils.parse import parse_bool, validate_regex
+from ..utils.templates import TemplateType, apply_template
+from .base import NotifyBase
 
 
-class NotifyWorkflows(NotifyBase):
+class APIVersion:
     """
-    A wrapper for Microsoft Workflows (MS Teams) Notifications
+    Define API Versions
     """
+    WORKFLOW = "2016-06-01"
+    POWER_AUTOMATE = "2022-03-01-preview"
+
+
+class NotifyWorkflows(NotifyBase):
+    """A wrapper for Microsoft Workflows (MS Teams) Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Power Automate / Workflows (for MSTeams)'
+    service_name = "Power Automate / Workflows (for MSTeams)"
 
     # The services URL
-    service_url = 'https://www.microsoft.com/power-platform/' \
-        'products/power-automate'
+    service_url = (
+        "https://www.microsoft.com/power-platform/products/power-automate"
+    )
 
     # The default secure protocol
-    secure_protocol = ('workflow', 'workflows')
+    secure_protocol = ("workflow", "workflows")
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_workflows'
+    setup_url = "https://appriseit.com/services/workflows/"
 
     # Allows the user to specify the NotifyImageSize object
     image_size = NotifyImageSize.XY_32
@@ -97,125 +109,149 @@ class NotifyWorkflows(NotifyBase):
     max_workflows_template_size = 35000
 
     # Adaptive Card Version
-    adaptive_card_version = '1.4'
+    adaptive_card_version = "1.4"
 
     # Define object templates
     templates = (
-        '{schema}://{host}/{workflow}/{signature}',
-        '{schema}://{host}:{port}/{workflow}/{signature}',
+        "{schema}://{host}/{workflow}/{signature}",
+        "{schema}://{host}:{port}/{workflow}/{signature}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        # workflow identifier
-        'workflow': {
-            'name': _('Workflow ID'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]+$', 'i'),
-        },
-        # Signature
-        'signature': {
-            'name': _('Signature'),
-            'type': 'string',
-            'private': True,
-            'required': True,
-            'regex': (r'^[a-z0-9_-]+$', 'i'),
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            # workflow identifier
+            "workflow": {
+                "name": _("Workflow ID"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]+$", "i"),
+            },
+            # Signature
+            "signature": {
+                "name": _("Signature"),
+                "type": "string",
+                "private": True,
+                "required": True,
+                "regex": (r"^[a-z0-9_-]+$", "i"),
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'id': {
-            'alias_of': 'workflow',
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
-        },
-        'wrap': {
-            'name': _('Wrap Text'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'wrap',
-        },
-        'template': {
-            'name': _('Template Path'),
-            'type': 'string',
-            'private': True,
-        },
-        # Below variable shortforms are taken from the Workflows webhook
-        # for consistency
-        'sig': {
-            'alias_of': 'signature',
-        },
-        'ver': {
-            'name': _('API Version'),
-            'type': 'string',
-            'default': '2016-06-01',
-            'map_to': 'version',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "id": {
+                "alias_of": "workflow",
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
+            "pa": {
+                "name": _("Use Power Automate URL"),
+                "type": "bool",
+                "default": False,
+                "map_to": "power_automate",
+            },
+            "powerautomate": {"alias_of": "pa"},
+            "wrap": {
+                "name": _("Wrap Text"),
+                "type": "bool",
+                "default": True,
+            },
+            "template": {
+                "name": _("Template Path"),
+                "type": "string",
+                "private": True,
+            },
+            # Below variable shortforms are taken from the Workflows webhook
+            # for consistency
+            "sig": {
+                "alias_of": "signature",
+            },
+            "ver": {
+                "name": _("API Version"),
+                "type": "string",
+                "map_to": "version",
+            },
+            "api-version": {"alias_of": "ver"},
         },
-        'api-version': {
-            'alias_of': 'ver'
-        },
-    })
+    )
 
     # Define our token control
     template_kwargs = {
-        'tokens': {
-            'name': _('Template Tokens'),
-            'prefix': ':',
+        "tokens": {
+            "name": _("Template Tokens"),
+            "prefix": ":",
         },
     }
 
-    def __init__(self, workflow, signature, include_image=None,
-                 version=None, template=None, tokens=None, wrap=None,
-                 **kwargs):
-        """
-        Initialize Microsoft Workflows Object
-
-        """
+    def __init__(
+        self,
+        workflow,
+        signature,
+        include_image=None,
+        power_automate=None,
+        version=None,
+        template=None,
+        tokens=None,
+        wrap=None,
+        **kwargs,
+    ):
+        """Initialize Microsoft Workflows Object."""
         super().__init__(**kwargs)
 
         self.workflow = validate_regex(
-            workflow, *self.template_tokens['workflow']['regex'])
+            workflow, *self.template_tokens["workflow"]["regex"]
+        )
         if not self.workflow:
-            msg = 'An invalid Workflows ID ' \
-                  '({}) was specified.'.format(workflow)
+            msg = f"An invalid Workflows ID ({workflow}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         self.signature = validate_regex(
-            signature, *self.template_tokens['signature']['regex'])
+            signature, *self.template_tokens["signature"]["regex"]
+        )
         if not self.signature:
-            msg = 'An invalid Signature ' \
-                  '({}) was specified.'.format(signature)
+            msg = f"An invalid Signature ({signature}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Place a thumbnail image inline with the message body
-        self.include_image = True if (
-            include_image if include_image is not None else
-            self.template_args['image']['default']) else False
+        self.include_image = bool(
+            include_image
+            if include_image is not None
+            else self.template_args["image"]["default"]
+        )
+
+        # Power Automate status
+        self.power_automate = bool(
+            power_automate
+            if power_automate is not None
+            else self.template_args["pa"]["default"]
+        )
 
         # Wrap Text
-        self.wrap = True if (
-            wrap if wrap is not None else
-            self.template_args['wrap']['default']) else False
+        self.wrap = bool(
+            wrap if wrap is not None else self.template_args["wrap"]["default"]
+        )
 
         # Our template object is just an AppriseAttachment object
         self.template = AppriseAttachment(asset=self.asset)
@@ -226,8 +262,17 @@ def __init__(self, workflow, signature, include_image=None,
             self.template[0].max_file_size = self.max_workflows_template_size
 
         # Prepare Version
-        self.api_version = version if version is not None \
-            else self.template_args['ver']['default']
+        # The default is taken from the template_args
+        # - If using power_automate, the API version required is different.
+        default_api_version = (
+            APIVersion.POWER_AUTOMATE
+            if self.power_automate else APIVersion.WORKFLOW)
+
+        self.api_version = (
+            version
+            if version is not None
+            else default_api_version
+        )
 
         # Template functionality
         self.tokens = {}
@@ -235,25 +280,27 @@ def __init__(self, workflow, signature, include_image=None,
             self.tokens.update(tokens)
 
         elif tokens:
-            msg = 'The specified Workflows Template Tokens ' \
-                  '({}) are not identified as a dictionary.'.format(tokens)
+            msg = (
+                "The specified Workflows Template Tokens "
+                f"({tokens}) are not identified as a dictionary."
+            )
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # else:  NoneType - this is okay
         return
 
-    def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
-                    **kwargs):
-        """
-        This function generates our payload whether it be the generic one
-        Apprise generates by default, or one provided by a specified
-        external template.
-        """
+    def gen_payload(
+        self, body, title="", notify_type=NotifyType.INFO, **kwargs
+    ):
+        """This function generates our payload whether it be the generic one
+        Apprise generates by default, or one provided by a specified external
+        template."""
 
         # Acquire our to-be footer icon if configured to do so
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         body_content = []
         if image_url:
@@ -261,13 +308,13 @@ def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
                 "type": "Image",
                 "url": image_url,
                 "height": "32px",
-                "altText": notify_type,
+                "altText": notify_type.value,
             })
 
         if title:
             body_content.append({
                 "type": "TextBlock",
-                "text": f'{title}',
+                "text": f"{title}",
                 "style": "heading",
                 "weight": "Bolder",
                 "size": "Large",
@@ -288,21 +335,18 @@ def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
             schema = "http://adaptivecards.io/schemas/adaptive-card.json"
             payload = {
                 "type": "message",
-                "attachments": [
-                    {
-                        "contentType":
-                        "application/vnd.microsoft.card.adaptive",
-                        "contentUrl": None,
-                        "content": {
-                            "$schema": schema,
-                            "type": "AdaptiveCard",
-                            "version": self.adaptive_card_version,
-                            "body": body_content,
-                            # Additionally
-                            "msteams": {"width": "full"},
-                        }
-                    }
-                ]
+                "attachments": [{
+                    "contentType": "application/vnd.microsoft.card.adaptive",
+                    "contentUrl": None,
+                    "content": {
+                        "$schema": schema,
+                        "type": "AdaptiveCard",
+                        "version": self.adaptive_card_version,
+                        "body": body_content,
+                        # Additionally
+                        "msteams": {"width": "full"},
+                    },
+                }],
             }
 
             return payload
@@ -312,80 +356,95 @@ def gen_payload(self, body, title='', notify_type=NotifyType.INFO,
         if not template:
             # We could not access the attachment
             self.logger.error(
-                'Could not access Workflow template {}.'.format(
-                    template.url(privacy=True)))
+                "Could not access Workflow template"
+                f" {template.url(privacy=True)}."
+            )
             return False
 
         # Take a copy of our token dictionary
         tokens = self.tokens.copy()
 
         # Apply some defaults template values
-        tokens['app_body'] = body
-        tokens['app_title'] = title
-        tokens['app_type'] = notify_type
-        tokens['app_id'] = self.app_id
-        tokens['app_desc'] = self.app_desc
-        tokens['app_color'] = self.color(notify_type)
-        tokens['app_image_url'] = image_url
-        tokens['app_url'] = self.app_url
+        tokens["app_body"] = body
+        tokens["app_title"] = title
+        tokens["app_type"] = notify_type.value
+        tokens["app_id"] = self.app_id
+        tokens["app_desc"] = self.app_desc
+        tokens["app_color"] = self.color(notify_type)
+        tokens["app_image_url"] = image_url
+        tokens["app_url"] = self.app_url
 
         # Enforce Application mode
-        tokens['app_mode'] = TemplateType.JSON
+        tokens["app_mode"] = TemplateType.JSON
 
         try:
-            with open(template.path, 'r') as fp:
+            with open(template.path) as fp:
                 content = json.loads(apply_template(fp.read(), **tokens))
 
-        except (OSError, IOError):
+        except OSError:
             self.logger.error(
-                'MSTeam template {} could not be read.'.format(
-                    template.url(privacy=True)))
+                f"MSTeam template {template.url(privacy=True)} could not be"
+                " read."
+            )
             return None
 
         except JSONDecodeError as e:
             self.logger.error(
-                'MSTeam template {} contains invalid JSON.'.format(
-                    template.url(privacy=True)))
-            self.logger.debug('JSONDecodeError: {}'.format(e))
+                f"MSTeam template {template.url(privacy=True)} contains"
+                " invalid JSON."
+            )
+            self.logger.debug(f"JSONDecodeError: {e}")
             return None
 
         return content
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Microsoft Teams Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Microsoft Teams Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         params = {
-            'api-version': self.api_version,
-            'sp': '/triggers/manual/run',
-            'sv': '1.0',
-            'sig': self.signature,
+            "api-version": self.api_version,
+            "sp": "/triggers/manual/run",
+            "sv": "1.0",
+            "sig": self.signature,
         }
 
-        notify_url = 'https://{host}{port}/workflows/{workflow}/' \
-            'triggers/manual/paths/invoke'.format(
+        # The URL changes depending on whether we're using power automate or
+        # not
+        path = (
+            "/powerautomate/automations/direct"
+            if self.power_automate
+            else ""
+        )
+
+        notify_url = (
+            "https://{host}{port}{path}/workflows/{workflow}/"
+            "triggers/manual/paths/invoke".format(
                 host=self.host,
-                port='' if not self.port else f':{self.port}',
-                workflow=self.workflow)
+                port="" if not self.port else f":{self.port}",
+                path=path,
+                workflow=self.workflow,
+            )
+        )
 
         # Generate our payload if it's possible
         payload = self.gen_payload(
-            body=body, title=title, notify_type=notify_type, **kwargs)
+            body=body, title=title, notify_type=notify_type, **kwargs
+        )
         if not payload:
             # No need to present a reason; that will come from the
             # gen_payload() function itself
             return False
 
-        self.logger.debug('Workflows POST URL: %s (cert_verify=%r)' % (
-            notify_url, self.verify_certificate,
-        ))
-        self.logger.debug('Workflows Payload: %s' % str(payload))
+        self.logger.debug(
+            "Workflows POST URL:"
+            f" {notify_url} (cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"Workflows Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -399,31 +458,35 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 timeout=self.request_timeout,
             )
             if r.status_code not in (
-                    requests.codes.ok, requests.codes.accepted):
+                requests.codes.ok,
+                requests.codes.accepted,
+            ):
                 # We had a problem
-                status_str = \
-                    NotifyWorkflows.http_response_code_lookup(r.status_code)
+                status_str = NotifyWorkflows.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send Workflows notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send Workflows notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(r.content))
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # We failed
                 return False
 
             else:
-                self.logger.info('Sent Workflows notification.')
+                self.logger.info("Sent Workflows notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending Workflows notification.')
-            self.logger.debug('Socket Exception: %s' % str(e))
+                "A Connection error occurred sending Workflows notification."
+            )
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # We failed
             return False
@@ -432,57 +495,63 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol[0], self.host, self.port, self.workflow,
+            self.secure_protocol[0],
+            self.host,
+            self.port,
+            self.workflow,
             self.signature,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'wrap': 'yes' if self.wrap else 'no',
+            "image": "yes" if self.include_image else "no",
+            "wrap": "yes" if self.wrap else "no",
+            "pa": "yes" if self.power_automate else "no",
         }
 
         if self.template:
-            params['template'] = NotifyWorkflows.quote(
-                self.template[0].url(), safe='')
+            params["template"] = NotifyWorkflows.quote(
+                self.template[0].url(), safe=""
+            )
 
         # Store our version if it differs from default
-        if self.api_version != self.template_args['ver']['default']:
-            params['ver'] = self.api_version
+        if (self.api_version != APIVersion.WORKFLOW
+            and not self.power_automate) or (
+                self.api_version != APIVersion.POWER_AUTOMATE
+                and self.power_automate):
+            # But only do so if we're not using power automate with the
+            # default version for that.
+            params["ver"] = self.api_version
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
         # Store any template entries if specified
-        params.update({':{}'.format(k): v for k, v in self.tokens.items()})
+        params.update({f":{k}": v for k, v in self.tokens.items()})
 
-        return '{schema}://{host}{port}/{workflow}/{signature}/' \
-            '?{params}'.format(
+        return (
+            "{schema}://{host}{port}/{workflow}/{signature}/?{params}".format(
                 schema=self.secure_protocol[0],
                 host=self.host,
-                port='' if not self.port else f':{self.port}',
-                workflow=self.pprint(self.workflow, privacy, safe=''),
-                signature=self.pprint(self.signature, privacy, safe=''),
+                port="" if not self.port else f":{self.port}",
+                workflow=self.pprint(self.workflow, privacy, safe=""),
+                signature=self.pprint(self.signature, privacy, safe=""),
                 params=NotifyWorkflows.urlencode(params),
             )
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
 
         results = NotifyBase.parse_url(url)
         if not results:
@@ -490,58 +559,84 @@ def parse_url(url):
             return results
 
         # store values if provided
-        entries = NotifyWorkflows.split_path(results['fullpath'])
+        entries = NotifyWorkflows.split_path(results["fullpath"])
 
         # Display image?
-        results['include_image'] = parse_bool(results['qsd'].get(
-            'image', NotifyWorkflows.template_args['image']['default']))
+        results["include_image"] = parse_bool(
+            results["qsd"].get(
+                "image", NotifyWorkflows.template_args["image"]["default"]
+            )
+        )
+
+        # Support Power Automate URL
+        results["power_automate"] = parse_bool(
+            results["qsd"].get(
+                "powerautomate",
+                results["qsd"].get(
+                    "pa",
+                    NotifyWorkflows.template_args["pa"]["default"]
+                )
+            )
+        )
 
         # Wrap Text?
-        results['wrap'] = parse_bool(results['qsd'].get(
-            'wrap', NotifyWorkflows.template_args['wrap']['default']))
+        results["wrap"] = parse_bool(
+            results["qsd"].get(
+                "wrap", NotifyWorkflows.template_args["wrap"]["default"]
+            )
+        )
 
         # Template Handling
-        if 'template' in results['qsd'] and results['qsd']['template']:
-            results['template'] = \
-                NotifyWorkflows.unquote(results['qsd']['template'])
+        if "template" in results["qsd"] and results["qsd"]["template"]:
+            results["template"] = NotifyWorkflows.unquote(
+                results["qsd"]["template"]
+            )
 
-        if 'workflow' in results['qsd'] and results['qsd']['workflow']:
-            results['workflow'] = \
-                NotifyWorkflows.unquote(results['qsd']['workflow'])
+        if "workflow" in results["qsd"] and results["qsd"]["workflow"]:
+            results["workflow"] = NotifyWorkflows.unquote(
+                results["qsd"]["workflow"]
+            )
 
-        elif 'id' in results['qsd'] and results['qsd']['id']:
-            results['workflow'] = \
-                NotifyWorkflows.unquote(results['qsd']['id'])
+        elif "id" in results["qsd"] and results["qsd"]["id"]:
+            results["workflow"] = NotifyWorkflows.unquote(results["qsd"]["id"])
 
         else:
-            results['workflow'] = None if not entries \
+            results["workflow"] = (
+                None
+                if not entries
                 else NotifyWorkflows.unquote(entries.pop(0))
+            )
 
         # Signature
-        if 'signature' in results['qsd'] and results['qsd']['signature']:
-            results['signature'] = \
-                NotifyWorkflows.unquote(results['qsd']['signature'])
+        if "signature" in results["qsd"] and results["qsd"]["signature"]:
+            results["signature"] = NotifyWorkflows.unquote(
+                results["qsd"]["signature"]
+            )
 
-        elif 'sig' in results['qsd'] and results['qsd']['sig']:
-            results['signature'] = \
-                NotifyWorkflows.unquote(results['qsd']['sig'])
+        elif "sig" in results["qsd"] and results["qsd"]["sig"]:
+            results["signature"] = NotifyWorkflows.unquote(
+                results["qsd"]["sig"]
+            )
 
         else:
             # Read information from path
-            results['signature'] = None if not entries \
+            results["signature"] = (
+                None
+                if not entries
                 else NotifyWorkflows.unquote(entries.pop(0))
+            )
 
         # Version
-        if 'api-version' in results['qsd'] and results['qsd']['api-version']:
-            results['version'] = \
-                NotifyWorkflows.unquote(results['qsd']['api-version'])
+        if "api-version" in results["qsd"] and results["qsd"]["api-version"]:
+            results["version"] = NotifyWorkflows.unquote(
+                results["qsd"]["api-version"]
+            )
 
-        elif 'ver' in results['qsd'] and results['qsd']['ver']:
-            results['version'] = \
-                NotifyWorkflows.unquote(results['qsd']['ver'])
+        elif "ver" in results["qsd"] and results["qsd"]["ver"]:
+            results["version"] = NotifyWorkflows.unquote(results["qsd"]["ver"])
 
         # Store our tokens
-        results['tokens'] = results['qsd:']
+        results["tokens"] = results["qsd:"]
 
         return results
 
@@ -550,26 +645,47 @@ def parse_native_url(url):
         """
         Support parsing the webhook straight out of workflows
             https://HOST:443/workflows/WORKFLOWID/triggers/manual/paths/invoke
+            or
+            https://HOST:443/powerautomate/automations/direct/workflows
+            /WORKFLOWID/triggers/manual/paths/invoke
         """
 
         # Match our workflows webhook URL and re-assemble
         result = re.match(
-            r'^https?://(?P<host>[A-Z0-9_.-]+)'
-            r'(?P<port>:[1-9][0-9]{0,5})?'
-            r'/workflows/'
-            r'(?P<workflow>[A-Z0-9_-]+)'
-            r'/triggers/manual/paths/invoke/?'
-            r'(?P<params>\?.+)$', url, re.I)
+            r"^https?://(?P<host>[A-Z0-9_.-]+)"
+            r"(?P<port>:[1-9][0-9]{0,5})?"
+            # The new URL structure includes /powerautomate/automations/direct
+            r"(?P<power_automate>/powerautomate/automations/direct)?"
+            r"/workflows/"
+            r"(?P<workflow>[A-Z0-9_-]+)"
+            r"/triggers/manual/paths/invoke/?"
+            r"(?P<params>\?.+)$",
+            url,
+            re.I,
+        )
 
         if result:
+            # Determine if we're using power automate or not
+            power_automate = (
+                "&pa=yes"
+                if result.group("power_automate")
+                else ""
+            )
+
             # Construct our URL
             return NotifyWorkflows.parse_url(
-                '{schema}://{host}{port}/{workflow}'
-                '/{params}'.format(
+                "{schema}://{host}{port}/{workflow}/{params}{pa}"
+                .format(
                     schema=NotifyWorkflows.secure_protocol[0],
-                    host=result.group('host'),
-                    port='' if not result.group('port')
-                    else result.group('port'),
-                    workflow=result.group('workflow'),
-                    params=result.group('params')))
+                    host=result.group("host"),
+                    port=(
+                        ""
+                        if not result.group("port")
+                        else result.group("port")
+                    ),
+                    workflow=result.group("workflow"),
+                    params=result.group("params"),
+                    pa=power_automate,
+                )
+            )
         return None
diff --git a/libs/apprise/plugins/wxpusher.py b/libs/apprise/plugins/wxpusher.py
index aca528f7e7..aa36476a5b 100644
--- a/libs/apprise/plugins/wxpusher.py
+++ b/libs/apprise/plugins/wxpusher.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,24 +33,25 @@
 #   - Find the appToken menu from the left menu bar, here you can reset the
 #     appToken, please note that after resetting, the old appToken will be
 #     invalid immediately and the call interface will fail.
-import re
+from itertools import chain
 import json
+import re
+
 import requests
-from itertools import chain
-from .base import NotifyBase
+
+from ..common import NotifyFormat, NotifyType
+from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyType
-from ..common import NotifyFormat
 from ..utils.parse import parse_list, validate_regex
-from ..locale import gettext_lazy as _
-
+from .base import NotifyBase
 
 # Topics are always numerical
-IS_TOPIC = re.compile(r'^\s*(?P<topic>[1-9][0-9]{0,20})\s*$')
+IS_TOPIC = re.compile(r"^\s*(?P<topic>[1-9][0-9]{0,20})\s*$")
 
 # users always start with UID_
 IS_USER = re.compile(
-    r'^\s*(?P<full>(?P<prefix>UID_)(?P<user>[^\s]+))\s*$', re.I)
+    r"^\s*(?P<full>(?P<prefix>UID_)(?P<user>[^\s]+))\s*$", re.I
+)
 
 
 WXPUSHER_RESPONSE_CODES = {
@@ -59,23 +59,27 @@
     1001: "The token provided in the request is missing.",
     1002: "The token provided in the request is incorrect or expired.",
     1003: "The body of the message was not provided.",
-    1004: "The user or topic you're trying to send the message to does not "
-    "exist",
+    1004: (
+        "The user or topic you're trying to send the message to does not exist"
+    ),
     1005: "The app or topic binding process failed.",
     1006: "There was an error in sending the message.",
     1007: "The message content exceeds the allowed length.",
-    1008: "The API call frequency is too high and the server rejected the "
-    "request.",
-    1009: "There might be other issues that are not explicitly covered by "
-    "the above codes",
+    1008: (
+        "The API call frequency is too high and the server rejected the "
+        "request."
+    ),
+    1009: (
+        "There might be other issues that are not explicitly covered by "
+        "the above codes"
+    ),
     1010: "The IP address making the request is not whitelisted.",
 }
 
 
 class WxPusherContentType:
-    """
-    Defines the different supported content types
-    """
+    """Defines the different supported content types."""
+
     TEXT = 1
     HTML = 2
     MARKDOWN = 3
@@ -89,65 +93,67 @@ class SubscriptionType:
 
 
 class NotifyWxPusher(NotifyBase):
-    """
-    A wrapper for WxPusher Notifications
-    """
+    """A wrapper for WxPusher Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'WxPusher'
+    service_name = "WxPusher"
 
     # The services URL
-    service_url = 'https://wxpusher.zjiecode.com/'
+    service_url = "https://wxpusher.zjiecode.com/"
 
     # The default protocol
-    secure_protocol = 'wxpusher'
+    secure_protocol = "wxpusher"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_wxpusher'
+    setup_url = "https://appriseit.com/services/wxpusher/"
 
     # WxPusher notification endpoint
-    notify_url = 'https://wxpusher.zjiecode.com/api/send/message'
+    notify_url = "https://wxpusher.zjiecode.com/api/send/message"
 
     # Define object templates
-    templates = (
-        '{schema}://{token}/{targets}',
-    )
+    templates = ("{schema}://{token}/{targets}",)
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'token': {
-            'name': _('App Token'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^AT_[^\s]+$', 'i'),
-            'private': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "token": {
+                "name": _("App Token"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^AT_[^\s]+$", "i"),
+                "private": True,
+            },
+            "target_topic": {
+                "name": _("Target Topic"),
+                "type": "int",
+                "map_to": "targets",
+            },
+            "target_user": {
+                "name": _("Target User ID"),
+                "type": "string",
+                "regex": (r"^UID_[^\s]+$", "i"),
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_topic': {
-            'name': _('Target Topic'),
-            'type': 'int',
-            'map_to': 'targets',
-        },
-        'target_user': {
-            'name': _('Target User ID'),
-            'type': 'string',
-            'regex': (r'^UID_[^\s]+$', 'i'),
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "token": {
+                "alias_of": "token",
+            },
         },
-        'token': {
-            'alias_of': 'token',
-        },
-    })
+    )
 
     # Used for mapping the content type to our output since Apprise supports
     # The same formats that WxPusher does.
@@ -158,26 +164,24 @@ class NotifyWxPusher(NotifyBase):
     }
 
     def __init__(self, token, targets=None, **kwargs):
-        """
-        Initialize WxPusher Object
-        """
+        """Initialize WxPusher Object."""
         super().__init__(**kwargs)
 
         # App Token (associated with WxPusher account)
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'An invalid WxPusher App Token ' \
-                  '({}) was specified.'.format(token)
+            msg = f"An invalid WxPusher App Token ({token}) was specified."
             self.logger.warning(msg)
             raise TypeError(msg)
 
         # Used for URL generation afterwards only
-        self._invalid_targets = list()
+        self._invalid_targets = []
 
         # For storing what is detected
-        self._users = list()
-        self._topics = list()
+        self._users = []
+        self._topics = []
 
         # Parse our targets
         for target in parse_list(targets):
@@ -185,60 +189,57 @@ def __init__(self, token, targets=None, **kwargs):
             result = IS_USER.match(target)
             if result:
                 # store valid user
-                self._users.append(result['full'])
+                self._users.append(result["full"])
                 continue
 
             result = IS_TOPIC.match(target)
             if result:
                 # store valid topic
-                self._topics.append(int(result['topic']))
+                self._topics.append(int(result["topic"]))
                 continue
 
             self.logger.warning(
-                'Dropped invalid WxPusher user/topic '
-                '(%s) specified.' % target,
+                f"Dropped invalid WxPusher user/topic ({target}) specified.",
             )
             self._invalid_targets.append(target)
 
         return
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform WxPusher Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform WxPusher Notification."""
 
         if not self._users and not self._topics:
             # There were no services to notify
-            self.logger.warning(
-                'There were no WxPusher targets to notify')
+            self.logger.warning("There were no WxPusher targets to notify")
             return False
 
         # Prepare our headers
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
         }
 
         # Prepare our payload
         payload = {
-            'appToken': self.token,
-            'content': body,
-            'summary': title,
-            'contentType': self.__content_type_map[self.notify_format],
-            'topicIds': self._topics,
-            'uids': self._users,
-
+            "appToken": self.token,
+            "content": body,
+            "summary": title,
+            "contentType": self.__content_type_map[self.notify_format],
+            "topicIds": self._topics,
+            "uids": self._users,
             # unsupported at this time
             # 'verifyPay': False,
             # 'verifyPayType': 0,
-            'url': None,
+            "url": None,
         }
 
         # Some Debug Logging
-        self.logger.debug('WxPusher POST URL: {} (cert_verify={})'.format(
-            self.notify_url, self.verify_certificate))
-        self.logger.debug('WxPusher Payload: {}' .format(payload))
+        self.logger.debug(
+            f"WxPusher POST URL: {self.notify_url} "
+            f"(cert_verify={self.verify_certificate})"
+        )
+        self.logger.debug(f"WxPusher Payload: {payload}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -246,7 +247,7 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
         try:
             r = requests.post(
                 self.notify_url,
-                data=json.dumps(payload).encode('utf-8'),
+                data=json.dumps(payload).encode("utf-8"),
                 headers=headers,
                 verify=self.verify_certificate,
                 timeout=self.request_timeout,
@@ -262,45 +263,60 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 content = {}
 
             # 1000 is the expected return code for a successful query
-            if r.status_code == requests.codes.ok and \
-                    content and content.get("code") == 1000:
+            if (
+                r.status_code == requests.codes.ok
+                and content
+                and content.get("code") == 1000
+            ):
 
                 # We're good!
                 self.logger.info(
-                    'Sent WxPusher notification to %d targets.' % (
-                        len(self._users) + len(self._topics)))
+                    "Sent WxPusher notification to %d targets.",
+                    len(self._users) + len(self._topics),
+                )
 
             else:
-                error_str = content.get('msg') if content else (
-                    WXPUSHER_RESPONSE_CODES.get(
-                        content.get("code") if content else None,
-                        "An unknown error occured."))
+                error_str = (
+                    content.get("msg")
+                    if content
+                    else (
+                        WXPUSHER_RESPONSE_CODES.get(
+                            content.get("code") if content else None,
+                            "An unknown error occured.",
+                        )
+                    )
+                )
 
                 # We had a problem
-                status_str = \
-                    NotifyWxPusher.http_response_code_lookup(
-                        r.status_code) if not error_str else error_str
+                status_str = (
+                    error_str
+                    if error_str
+                    else NotifyWxPusher.http_response_code_lookup(
+                        r.status_code
+                    )
+                )
 
                 self.logger.warning(
-                    'Failed to send WxPusher notification, '
-                    'code={}/{}: {}'.format(
+                    "Failed to send WxPusher notification, "
+                    "code={}/{}: {}".format(
                         r.status_code,
-                        'unk' if not content else content.get("code"),
-                        status_str))
+                        "unk" if not content else content.get("code"),
+                        status_str,
+                    )
+                )
 
                 self.logger.debug(
-                    'Response Details:\r\n{}'.format(
-                        content if content else r.content))
+                    "Response Details:\r\n%r",
+                    content if content else (r.content or b"")[:2000])
 
                 # Mark our failure
                 return False
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending WxPusher '
-                'notification.'
+                "A Connection error occurred sending WxPusher notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             return False
 
@@ -308,38 +324,41 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (self.secure_protocol, self.token)
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
-        return '{schema}://{token}/{targets}/?{params}'.format(
+        return "{schema}://{token}/{targets}/?{params}".format(
             schema=self.secure_protocol,
             token=self.pprint(
-                self.token, privacy, mode=PrivacyMode.Secret, safe=''),
-            targets='/'.join(chain(
-                [str(t) for t in self._topics], self._users,
-                [NotifyWxPusher.quote(x, safe='')
-                 for x in self._invalid_targets])),
-            params=NotifyWxPusher.urlencode(params))
+                self.token, privacy, mode=PrivacyMode.Secret, safe=""
+            ),
+            targets="/".join(
+                chain(
+                    [str(t) for t in self._topics],
+                    self._users,
+                    [
+                        NotifyWxPusher.quote(x, safe="")
+                        for x in self._invalid_targets
+                    ],
+                )
+            ),
+            params=NotifyWxPusher.urlencode(params),
+        )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
@@ -347,27 +366,28 @@ def parse_url(url):
 
         # Get our entries; split_path() looks after unquoting content for us
         # by default
-        results['targets'] = NotifyWxPusher.split_path(results['fullpath'])
+        results["targets"] = NotifyWxPusher.split_path(results["fullpath"])
 
         # App Token
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Extract the App token from an argument
-            results['token'] = \
-                NotifyWxPusher.unquote(results['qsd']['token'])
+            results["token"] = NotifyWxPusher.unquote(results["qsd"]["token"])
             # Any host entry defined is actually part of the path
             # store it's element (if defined)
-            if results['host']:
-                results['targets'].append(
-                    NotifyWxPusher.split_path(results['host']))
+            if results["host"]:
+                results["targets"].append(
+                    NotifyWxPusher.split_path(results["host"])
+                )
 
         else:
             # The hostname is our source number
-            results['token'] = NotifyWxPusher.unquote(results['host'])
+            results["token"] = NotifyWxPusher.unquote(results["host"])
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += \
-                NotifyWxPusher.parse_list(results['qsd']['to'])
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += NotifyWxPusher.parse_list(
+                results["qsd"]["to"]
+            )
 
         return results
diff --git a/libs/apprise/plugins/xbmc.py b/libs/apprise/plugins/xbmc.py
index 8325cccd15..20a9a7203a 100644
--- a/libs/apprise/plugins/xbmc.py
+++ b/libs/apprise/plugins/xbmc.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,32 +25,31 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import requests
+import contextlib
 from json import dumps
 
-from .base import NotifyBase
+import requests
+
+from ..common import NotifyImageSize, NotifyType
+from ..locale import gettext_lazy as _
 from ..url import PrivacyMode
-from ..common import NotifyType
-from ..common import NotifyImageSize
 from ..utils.parse import parse_bool
-from ..locale import gettext_lazy as _
+from .base import NotifyBase
 
 
 class NotifyXBMC(NotifyBase):
-    """
-    A wrapper for XBMC/KODI Notifications
-    """
+    """A wrapper for XBMC/KODI Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Kodi/XBMC'
+    service_name = "Kodi/XBMC"
 
     # The services URL
-    service_url = 'http://kodi.tv/'
+    service_url = "http://kodi.tv/"
 
-    xbmc_protocol = 'xbmc'
-    xbmc_secure_protocol = 'xbmcs'
-    kodi_protocol = 'kodi'
-    kodi_secure_protocol = 'kodis'
+    xbmc_protocol = "xbmc"
+    xbmc_secure_protocol = "xbmcs"
+    kodi_protocol = "kodi"
+    kodi_secure_protocol = "kodis"
 
     # The default protocols
     protocol = (xbmc_protocol, kodi_protocol)
@@ -60,7 +58,7 @@ class NotifyXBMC(NotifyBase):
     secure_protocol = (xbmc_secure_protocol, kodi_secure_protocol)
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_kodi'
+    setup_url = "https://appriseit.com/services/kodi/"
 
     # Disable throttle rate for XBMC/KODI requests since they are normally
     # local anyway
@@ -84,176 +82,186 @@ class NotifyXBMC(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{host}',
-        '{schema}://{host}:{port}',
-        '{schema}://{user}:{password}@{host}',
-        '{schema}://{user}:{password}@{host}:{port}',
+        "{schema}://{host}",
+        "{schema}://{host}:{port}",
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
     )
 
     # Define our tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'host': {
-            'name': _('Hostname'),
-            'type': 'string',
-            'required': True,
-        },
-        'port': {
-            'name': _('Port'),
-            'type': 'int',
-            'min': 1,
-            'max': 65535,
-        },
-        'user': {
-            'name': _('Username'),
-            'type': 'string',
-        },
-        'password': {
-            'name': _('Password'),
-            'type': 'string',
-            'private': True,
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("Username"),
+                "type": "string",
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+            },
         },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'duration': {
-            'name': _('Duration'),
-            'type': 'int',
-            'min': 1,
-            'default': 12,
-        },
-        'image': {
-            'name': _('Include Image'),
-            'type': 'bool',
-            'default': True,
-            'map_to': 'include_image',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "duration": {
+                "name": _("Duration"),
+                "type": "int",
+                "min": 1,
+                "default": 12,
+            },
+            "image": {
+                "name": _("Include Image"),
+                "type": "bool",
+                "default": True,
+                "map_to": "include_image",
+            },
         },
-    })
+    )
 
     def __init__(self, include_image=True, duration=None, **kwargs):
-        """
-        Initialize XBMC/KODI Object
-        """
+        """Initialize XBMC/KODI Object."""
         super().__init__(**kwargs)
 
         # Number of seconds to display notification for
-        self.duration = self.template_args['duration']['default'] \
-            if not (isinstance(duration, int) and
-                    self.template_args['duration']['min'] > 0) else duration
+        self.duration = (
+            self.template_args["duration"]["default"]
+            if not (
+                isinstance(duration, int)
+                and self.template_args["duration"]["min"] > 0
+            )
+            else duration
+        )
 
         # Build our schema
-        self.schema = 'https' if self.secure else 'http'
+        self.schema = "https" if self.secure else "http"
 
         # Prepare the default header
         self.headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/json'
+            "User-Agent": self.app_id,
+            "Content-Type": "application/json",
         }
 
         # Default protocol
-        self.protocol = kwargs.get('protocol', self.xbmc_remote_protocol)
+        self.protocol = kwargs.get("protocol", self.xbmc_remote_protocol)
 
         # Track whether or not we want to send an image with our notification
         # or not.
         self.include_image = include_image
 
     def _payload_60(self, title, body, notify_type, **kwargs):
-        """
-        Builds payload for KODI API v6.0
+        """Builds payload for KODI API v6.0.
 
         Returns (headers, payload)
         """
 
         # prepare JSON Object
         payload = {
-            'jsonrpc': '2.0',
-            'method': 'GUI.ShowNotification',
-            'params': {
-                'title': title,
-                'message': body,
+            "jsonrpc": "2.0",
+            "method": "GUI.ShowNotification",
+            "params": {
+                "title": title,
+                "message": body,
                 # displaytime is defined in microseconds so we need to just
                 # do some simple math
-                'displaytime': int(self.duration * 1000),
+                "displaytime": int(self.duration * 1000),
             },
-            'id': 1,
+            "id": 1,
         }
 
         # Acquire our image url if configured to do so
-        image_url = None if not self.include_image else \
-            self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if image_url:
-            payload['params']['image'] = image_url
+            payload["params"]["image"] = image_url
             if notify_type is NotifyType.FAILURE:
-                payload['type'] = 'error'
+                payload["type"] = "error"
 
             elif notify_type is NotifyType.WARNING:
-                payload['type'] = 'warning'
+                payload["type"] = "warning"
 
             else:
-                payload['type'] = 'info'
+                payload["type"] = "info"
 
         return (self.headers, dumps(payload))
 
     def _payload_20(self, title, body, notify_type, **kwargs):
-        """
-        Builds payload for XBMC API v2.0
+        """Builds payload for XBMC API v2.0.
 
         Returns (headers, payload)
         """
 
         # prepare JSON Object
         payload = {
-            'jsonrpc': '2.0',
-            'method': 'GUI.ShowNotification',
-            'params': {
-                'title': title,
-                'message': body,
+            "jsonrpc": "2.0",
+            "method": "GUI.ShowNotification",
+            "params": {
+                "title": title,
+                "message": body,
                 # displaytime is defined in microseconds so we need to just
                 # do some simple math
-                'displaytime': int(self.duration * 1000),
+                "displaytime": int(self.duration * 1000),
             },
-            'id': 1,
+            "id": 1,
         }
 
         # Include our logo if configured to do so
-        image_url = None if not self.include_image \
-            else self.image_url(notify_type)
+        image_url = (
+            None if not self.include_image else self.image_url(notify_type)
+        )
 
         if image_url:
-            payload['params']['image'] = image_url
+            payload["params"]["image"] = image_url
 
         return (self.headers, dumps(payload))
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform XBMC/KODI Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform XBMC/KODI Notification."""
 
         if self.protocol == self.xbmc_remote_protocol:
             # XBMC v2.0
             (headers, payload) = self._payload_20(
-                title, body, notify_type, **kwargs)
+                title, body, notify_type, **kwargs
+            )
 
         else:
             # KODI v6.0
             (headers, payload) = self._payload_60(
-                title, body, notify_type, **kwargs)
+                title, body, notify_type, **kwargs
+            )
 
         auth = None
         if self.user:
             auth = (self.user, self.password)
 
-        url = '%s://%s' % (self.schema, self.host)
+        url = f"{self.schema}://{self.host}"
         if self.port:
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
-        url += '/jsonrpc'
+        url += "/jsonrpc"
 
-        self.logger.debug('XBMC/KODI POST URL: %s (cert_verify=%r)' % (
-            url, self.verify_certificate,
-        ))
-        self.logger.debug('XBMC/KODI Payload: %s' % str(payload))
+        self.logger.debug(
+            f"XBMC/KODI POST URL: {url} "
+            f"(cert_verify={self.verify_certificate!r})"
+        )
+        self.logger.debug(f"XBMC/KODI Payload: {payload!s}")
 
         # Always call throttle before any remote server i/o is made
         self.throttle()
@@ -269,30 +277,31 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             )
             if r.status_code != requests.codes.ok:
                 # We had a problem
-                status_str = \
-                    NotifyXBMC.http_response_code_lookup(r.status_code)
+                status_str = NotifyXBMC.http_response_code_lookup(
+                    r.status_code
+                )
 
                 self.logger.warning(
-                    'Failed to send XBMC/KODI notification: '
-                    '{}{}error={}.'.format(
-                        status_str,
-                        ', ' if status_str else '',
-                        r.status_code))
+                    "Failed to send XBMC/KODI notification: "
+                    "{}{}error={}.".format(
+                        status_str, ", " if status_str else "", r.status_code
+                    )
+                )
 
-                self.logger.debug('Response Details:\r\n{}'.format(r.content))
+                self.logger.debug(
+                    "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                 # Return; we're done
                 return False
 
             else:
-                self.logger.info('Sent XBMC/KODI notification.')
+                self.logger.info("Sent XBMC/KODI notification.")
 
         except requests.RequestException as e:
             self.logger.warning(
-                'A Connection error occurred sending XBMC/KODI '
-                'notification.'
+                "A Connection error occurred sending XBMC/KODI notification."
             )
-            self.logger.debug('Socket Exception: %s' % str(e))
+            self.logger.debug(f"Socket Exception: {e!s}")
 
             # Return; we're done
             return False
@@ -301,74 +310,86 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
-        """
-        default_schema = self.xbmc_protocol if (
-            self.protocol <= self.xbmc_remote_protocol) else self.kodi_protocol
+        default_schema = (
+            self.xbmc_protocol
+            if (self.protocol <= self.xbmc_remote_protocol)
+            else self.kodi_protocol
+        )
         if self.secure:
             # Append 's' to schema
-            default_schema += 's'
+            default_schema += "s"
 
-        port = self.port if self.port else (
-            443 if self.secure else self.xbmc_default_port)
+        port = (
+            self.port
+            if self.port
+            else (443 if self.secure else self.xbmc_default_port)
+        )
         return (
-            default_schema, self.user, self.password, self.host, port,
+            default_schema,
+            self.user,
+            self.password,
+            self.host,
+            port,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Define any URL parameters
         params = {
-            'image': 'yes' if self.include_image else 'no',
-            'duration': str(self.duration),
+            "image": "yes" if self.include_image else "no",
+            "duration": str(self.duration),
         }
 
         # Extend our parameters
         params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=NotifyXBMC.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=NotifyXBMC.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=NotifyXBMC.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=NotifyXBMC.quote(self.user, safe=""),
             )
 
-        default_schema = self.xbmc_protocol if (
-            self.protocol <= self.xbmc_remote_protocol) else self.kodi_protocol
+        default_schema = (
+            self.xbmc_protocol
+            if (self.protocol <= self.xbmc_remote_protocol)
+            else self.kodi_protocol
+        )
         default_port = 443 if self.secure else self.xbmc_default_port
         if self.secure:
             # Append 's' to schema
-            default_schema += 's'
+            default_schema += "s"
 
-        return '{schema}://{auth}{hostname}{port}/?{params}'.format(
+        return "{schema}://{auth}{hostname}{port}/?{params}".format(
             schema=default_schema,
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if not self.port or self.port == default_port
-                 else ':{}'.format(self.port),
+            port=(
+                ""
+                if not self.port or self.port == default_port
+                else f":{self.port}"
+            ),
             params=NotifyXBMC.urlencode(params),
         )
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url)
         if not results:
             # We're done early
@@ -376,28 +397,25 @@ def parse_url(url):
 
         # We want to set our protocol depending on whether we're using XBMC
         # or KODI
-        if results.get('schema', '').startswith('xbmc'):
+        if results.get("schema", "").startswith("xbmc"):
             # XBMC Support
-            results['protocol'] = NotifyXBMC.xbmc_remote_protocol
+            results["protocol"] = NotifyXBMC.xbmc_remote_protocol
 
             # Assign Default XBMC Port
-            if not results['port']:
-                results['port'] = NotifyXBMC.xbmc_default_port
+            if not results["port"]:
+                results["port"] = NotifyXBMC.xbmc_default_port
 
         else:
             # KODI Support
-            results['protocol'] = NotifyXBMC.kodi_remote_protocol
+            results["protocol"] = NotifyXBMC.kodi_remote_protocol
 
         # Include images with our message
-        results['include_image'] = \
-            parse_bool(results['qsd'].get('image', True))
-
-        # Set duration
-        try:
-            results['duration'] = abs(int(results['qsd'].get('duration')))
+        results["include_image"] = parse_bool(
+            results["qsd"].get("image", True)
+        )
 
-        except (TypeError, ValueError):
-            # Not a valid integer; ignore entry
-            pass
+        # Set duration if data is valid
+        with contextlib.suppress(TypeError, ValueError):
+            results["duration"] = abs(int(results["qsd"].get("duration")))
 
         return results
diff --git a/libs/apprise/plugins/xmpp/__init__.py b/libs/apprise/plugins/xmpp/__init__.py
new file mode 100644
index 0000000000..76c1813af5
--- /dev/null
+++ b/libs/apprise/plugins/xmpp/__init__.py
@@ -0,0 +1,34 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""XMPP Notifications."""
+
+from .base import NotifyXMPP
+
+__all__ = [
+    "NotifyXMPP",
+]
diff --git a/libs/apprise/plugins/xmpp/adapter.py b/libs/apprise/plugins/xmpp/adapter.py
new file mode 100644
index 0000000000..b1e0ebf926
--- /dev/null
+++ b/libs/apprise/plugins/xmpp/adapter.py
@@ -0,0 +1,927 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""A minimal, self-contained Slixmpp adapter.
+
+This module provides a wrapper to Slixmpp for Apprise.
+"""
+
+from __future__ import annotations
+
+import contextlib
+import logging
+import re
+import ssl
+import threading
+import time
+from typing import Any, Callable, Optional
+
+import certifi
+
+from ...compat import dataclass_compat as dataclass
+from .common import SECURE_MODES, SecureXMPPMode
+
+# Default our global support flag
+SLIXMPP_SUPPORT_AVAILABLE = False
+
+try:
+    import asyncio
+    from concurrent.futures import TimeoutError as FuturesTimeoutError
+
+    import slixmpp
+
+    SLIXMPP_SUPPORT_AVAILABLE = True
+
+except ImportError:
+    # Slixmpp is not available if code reaches here
+    slixmpp = None  # type: ignore[assignment]
+    asyncio = None  # type: ignore[assignment]
+    FuturesTimeoutError = Exception  # type: ignore[misc]
+
+
+@dataclass(frozen=True, slots=True)
+class XMPPConfig:
+    """Connection configuration."""
+
+    host: str
+    port: int
+    jid: str
+    password: str
+    secure: str = SecureXMPPMode.STARTTLS
+    verify_certificate: bool = True
+
+
+# ---------------------------------------------------------------------------
+# Logging Bridge
+# ---------------------------------------------------------------------------
+LOGGING_ID = "apprise.xmpp"
+_LOG_BRIDGE_LOCK = threading.Lock()
+_LOG_BRIDGED = False
+
+
+def bridge_slixmpp_logging() -> None:
+    """Bridge Slixmpp logging into Apprise logging handlers.
+
+    This is intentionally idempotent to prevent handler duplication when many
+    notifications are sent within the same process.
+    """
+    global _LOG_BRIDGED
+
+    if _LOG_BRIDGED:
+        return
+
+    with _LOG_BRIDGE_LOCK:
+        if _LOG_BRIDGED:
+            return
+
+        apprise_logger = logging.getLogger("apprise")
+        slix_logger = logging.getLogger("slixmpp")
+
+        existing = {id(h) for h in slix_logger.handlers}
+        for handler in apprise_logger.handlers:
+            if id(handler) not in existing:
+                slix_logger.addHandler(handler)
+                existing.add(id(handler))
+
+        slix_logger.setLevel(apprise_logger.getEffectiveLevel())
+
+        # Prevent duplicates via propagation chains.
+        slix_logger.propagate = False
+
+        _LOG_BRIDGED = True
+
+
+def _close_awaitable(obj: Any) -> None:
+    """Best-effort close for coroutine-like objects.
+
+    Some test patches raise before awaiting, leaving coroutines to be
+    garbage collected and triggering runtime warnings.
+    """
+    close = getattr(obj, "close", None)
+    if callable(close):
+        with contextlib.suppress(Exception):
+            close()
+
+
+# ---------------------------------------------------------------------------
+# Internal Slixmpp Client Factory
+# ---------------------------------------------------------------------------
+
+
+_CLIENT_SUBCLASS_CACHE: dict[int, type[Any]] = {}
+
+
+def _get_client_subclass(base_cls: type[Any]) -> type[Any]:
+    """Return (and cache) the internal client subclass for a given base class.
+
+    The tests monkeypatch `xmpp_adapter.slixmpp.ClientXMPP`, so we must resolve
+    the base class dynamically at runtime, not at import time. We still cache
+    the derived subclass per base class identity to avoid repeated class
+    creation overhead in production.
+    """
+    key = id(base_cls)
+    cached = _CLIENT_SUBCLASS_CACHE.get(key)
+    if cached is not None:
+        return cached
+
+    class _Client(base_cls):  # type: ignore[misc]
+        """Internal Slixmpp client for both one-shot and keepalive flows."""
+
+        def __init__(
+            self,
+            jid: str,
+            password: str,
+            *,
+            oneshot: bool,
+            targets: Optional[list[str]] = None,
+            subject: str = "",
+            body: str = "",
+            before_message: Optional[Callable[[], None]] = None,
+            want_roster: bool = False,
+            roster_timeout: float = 0.0,
+            session_started_evt: Optional[asyncio.Event] = None,
+            # type: ignore[name-defined]
+        ) -> None:
+            super().__init__(jid, password)
+
+            # Behaviour
+            self._oneshot = bool(oneshot)
+
+            # Send payload (only used in oneshot mode)
+            self._targets = list(targets or [])
+            self._subject = subject
+            self._body = body
+            self._before_message = before_message
+
+            # Roster behaviour (both modes)
+            self._want_roster = bool(want_roster)
+            self._roster_timeout = float(roster_timeout)
+
+            # Keepalive coordination (keepalive mode only)
+            self._session_started_evt = session_started_evt
+
+            # State
+            self._auth_failed = False
+
+            self.add_event_handler("session_start", self._on_session_start)
+            self.add_event_handler("failed_auth", self._failed_auth)
+            self.add_event_handler("disconnected", self._disconnected)
+
+            # Keep behaviour predictable and close quickly.
+            self.auto_reconnect = False
+
+        async def _session_start(
+            self, *args: object, **kwargs: object
+        ) -> None:
+            try:
+                with contextlib.suppress(Exception):
+                    self.send_presence()
+
+                if self._want_roster and self._roster_timeout > 0:
+                    roster_coro = self.get_roster()
+                    try:
+                        await asyncio.wait_for(
+                            roster_coro,
+                            timeout=self._roster_timeout,
+                        )
+                    except Exception:
+                        _close_awaitable(roster_coro)
+
+                # One-shot mode sends messages immediately on session_start and
+                # then disconnects. Keepalive mode just signals readiness.
+                if self._oneshot:
+                    for target in self._targets:
+                        if self._before_message:
+                            self._before_message()
+
+                        self.send_message(
+                            mto=target,
+                            msubject=self._subject,
+                            mbody=self._body,
+                            mtype="chat",
+                        )
+
+            finally:
+                if self._oneshot:
+                    self.disconnect()
+
+                elif self._session_started_evt is not None:
+                    self._session_started_evt.set()
+
+        def _failed_auth(self, *args: object, **kwargs: object) -> None:
+            # Authentication failure is always a hard failure.
+            self._auth_failed = True
+            if self._session_started_evt is not None:
+                self._session_started_evt.clear()
+            self.disconnect()
+
+        def _on_session_start(self, *args: object, **kwargs: object) -> Any:
+            """Slixmpp event handler entrypoint.
+
+            Must be synchronous. Also, we must never fall back to
+            asyncio.create_task() because that can bind to the wrong
+            loop, or no loop, and leak coroutines.
+            """
+            coro = self._session_start(*args, **kwargs)
+
+            # One-shot mode: let Slixmpp schedule the coroutine itself.
+            if self._oneshot:
+                return coro
+
+            # Keepalive mode: schedule on the assigned loop.
+            loop = getattr(self, "loop", None)
+
+            # If the loop is missing or already closing, we MUST close the
+            # coroutine immediately to prevent "never awaited" warnings.
+            if loop is None or not loop.is_running():
+                with contextlib.suppress(Exception):
+                    coro.close()
+                return None
+
+            try:
+                task = loop.create_task(coro)
+
+                def _log_task(t: asyncio.Task[Any]) -> None:
+                    if t.cancelled():
+                        return
+
+                    exc = t.exception()
+                    if exc is not None:
+                        self.logger.error("XMPP task failed: %s", exc)
+
+                task.add_done_callback(_log_task)
+
+            except Exception:
+                # Fallback closure if loop.create_task fails
+                with contextlib.suppress(Exception):
+                    coro.close()
+
+            return None
+
+        def _disconnected(self, *args: object, **kwargs: object) -> None:
+            if self._session_started_evt is not None:
+                self._session_started_evt.clear()
+
+    _CLIENT_SUBCLASS_CACHE[key] = _Client
+    return _Client
+
+
+def _build_client(*args: Any, **kwargs: Any) -> Any:
+    return _get_client_subclass(slixmpp.ClientXMPP)(*args, **kwargs)
+
+# ---------------------------------------------------------------------------
+# Adapter
+# ---------------------------------------------------------------------------
+
+
+class SlixmppAdapter:
+    """Send a message to one or more targets.
+
+    When keepalive is False, process() performs a one-shot connect, send,
+    disconnect.
+
+    When keepalive is True, send_message() keeps a session alive across calls.
+    The connection is closed only when close() is called or the instance is
+    garbage collected.
+    """
+
+    # Define a Slixmpp reference version to prevent this tool from working
+    # under non-supported versions
+    _supported_version = (1, 10, 0)
+
+    # Flag to control if we are enabled or not
+    # effectively.. .is the dependent slixmpp library available to us
+    # or not
+    _enabled = SLIXMPP_SUPPORT_AVAILABLE
+
+    def __init__(
+        self,
+        config: XMPPConfig,
+        targets: list[str],
+        subject: str,
+        body: str,
+        timeout: float = 30.0,
+        roster: bool = False,
+        before_message: Optional[Callable[[], None]] = None,
+        keepalive: bool = False,
+    ) -> None:
+        self.config, self.targets, self.subject, self.body = \
+            config, targets, subject, body
+
+        self.timeout = max(5.0, float(timeout))
+        self.roster, self.before_message, self.keepalive = \
+            roster, before_message, keepalive
+
+        global LOGGING_ID
+        self.logger = logging.getLogger(LOGGING_ID)
+
+        bridge_slixmpp_logging()
+
+        # Keepalive internals (only used when keepalive=True)
+        self._state_lock = threading.RLock()
+        self._closing = False
+        self._thread: Optional[threading.Thread] = None
+        self._loop: Optional[asyncio.AbstractEventLoop] = None
+        # type: ignore[name-defined]
+        self._client: Optional[slixmpp.ClientXMPP] = None
+        # type: ignore[name-defined]
+        self._loop_ready = threading.Event()
+
+        # asyncio primitives created inside the loop thread
+        self._connect_lock: Optional[asyncio.Lock] = None
+        # type: ignore[name-defined]
+        self._session_started: Optional[asyncio.Event] = None
+        # type: ignore[name-defined]
+
+    def __del__(self) -> None:
+        """Best effort close for keepalive sessions."""
+        with contextlib.suppress(Exception):
+            self.close()
+
+    @staticmethod
+    def _ssl_context(verify: bool) -> ssl.SSLContext:
+        ctx = ssl.create_default_context(cafile=certifi.where())
+        if not verify:
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+        return ctx
+
+    @staticmethod
+    def _loop_tick(loop: asyncio.AbstractEventLoop) -> None:
+        """Run one final loop tick, closing the coroutine on error."""
+        tick = asyncio.sleep(0)
+        try:
+            loop.run_until_complete(tick)
+
+        except Exception:
+            _close_awaitable(tick)
+
+    @staticmethod
+    def _finalize_loop(loop: asyncio.AbstractEventLoop) -> None:
+        """Best-effort loop shutdown to avoid resource warnings."""
+
+        with contextlib.suppress(Exception):
+            # Cancel any pending tasks
+            tasks = asyncio.all_tasks(loop)
+            for task in tasks:
+                task.cancel()
+
+            if tasks:
+                loop.run_until_complete(
+                    asyncio.gather(*tasks, return_exceptions=True)
+                )
+
+        # Give the loop one final tick to process cancellations
+        SlixmppAdapter._loop_tick(loop)
+
+        with contextlib.suppress(Exception):
+            loop.stop()
+
+        # Only attempt to shutdown generators if the loop is still open.
+        # Otherwise, creating the coroutine without running it triggers a
+        # RuntimeWarning.
+        if not loop.is_closed():
+            with contextlib.suppress(Exception):
+                ag_coro = loop.shutdown_asyncgens()
+                try:
+                    loop.run_until_complete(ag_coro)
+                except Exception:
+                    _close_awaitable(ag_coro)
+
+        # Detach loop from thread policy
+        with contextlib.suppress(Exception):
+            asyncio.set_event_loop(None)
+
+        if not loop.is_closed():
+            with contextlib.suppress(Exception):
+                loop.close()
+
+    def close(self) -> None:
+        """Close any persistent connection and stop the keepalive worker."""
+        with self._state_lock:
+            self._closing = True
+
+        loop, client, thread = self._loop, self._client, self._thread
+        if loop is None or thread is None:
+            return
+
+        def _shutdown() -> None:
+            try:
+                if client is not None:
+                    client.disconnect()
+            finally:
+                with contextlib.suppress(Exception):
+                    loop.stop()
+
+        with contextlib.suppress(Exception):
+            loop.call_soon_threadsafe(_shutdown)
+
+        # Give a moment to exit gracefully.
+        thread.join(max(1.0, min(5.0, self.timeout / 2.0)))
+
+        # If the worker is still alive, do not clear state.
+        alive = getattr(thread, "is_alive", None)
+        if callable(alive) and alive():
+            return
+
+        with self._state_lock:
+            # Detach from any thread-local loop to avoid creating a new
+            # loop implicitly (Python 3.12+ may warn about it).
+            with contextlib.suppress(Exception):
+                asyncio.set_event_loop(None)
+
+            self._thread = None
+            self._loop = None
+            self._client = None
+            self._connect_lock = None
+            self._session_started = None
+
+    # -----------------------------------------------------------------------
+    # One-shot behaviour (no keepalive)
+    # -----------------------------------------------------------------------
+
+    def process(self) -> bool:
+        """Send the message, always returning within timeout."""
+        done = threading.Event()
+        result: list[Optional[bool]] = [None]
+
+        if not self._enabled:
+            # We are not turned on
+            return False
+
+        shared: dict[str, Any] = {"loop": None, "client": None}
+
+        def runner() -> None:
+            loop: Optional[asyncio.AbstractEventLoop] = None
+            # type: ignore[name-defined]
+            start = time.monotonic()
+
+            try:
+                loop = asyncio.new_event_loop()  # type: ignore[union-attr]
+                asyncio.set_event_loop(loop)  # type: ignore[union-attr]
+                shared["loop"] = loop
+
+                targets = (
+                    list(self.targets) if self.targets else [self.config.jid])
+
+                roster_timeout = (
+                    max(2.0, min(10.0, self.timeout / 3.0))
+                    if self.roster else 0.0
+                )
+
+                client = _build_client(
+                    jid=self.config.jid,
+                    password=self.config.password,
+                    oneshot=True,
+                    targets=targets,
+                    subject=self.subject,
+                    body=self.body,
+                    before_message=self.before_message,
+                    want_roster=self.roster,
+                    roster_timeout=roster_timeout,
+                    session_started_evt=None,
+                )
+
+                shared["client"] = client
+
+                # Prevent Slixmpp from owning loop lifecycle
+                with contextlib.suppress(Exception):
+                    client.loop = loop  # type: ignore[assignment]
+
+                # Resolve connection behaviour from secure mode
+                mode_cfg = SECURE_MODES.get(self.config.secure)
+                if not mode_cfg:
+                    raise ValueError(
+                        f"Unsupported XMPP secure mode: {self.config.secure}"
+                    )
+
+                client.enable_plaintext = bool(mode_cfg["enable_plaintext"])
+                client.enable_starttls = bool(mode_cfg["enable_starttls"])
+                client.enable_direct_tls = bool(mode_cfg["enable_direct_tls"])
+
+                # Only attach an SSL context when TLS may be used
+                if not client.enable_plaintext:
+                    client.ssl_context = self._ssl_context(
+                        self.config.verify_certificate
+                    )
+
+                # Slixmpp >= 1.10.0 connect() returns a Future.
+                connect_timeout = max(3.0, min(15.0, self.timeout / 3.0))
+                connect_fut = client.connect(
+                    host=self.config.host,
+                    port=self.config.port,
+                )
+
+                try:
+                    ok = loop.run_until_complete(
+                        asyncio.wait_for(
+                            connect_fut,
+                            timeout=connect_timeout,
+                        )
+                    )
+                    if not ok:
+                        self.logger.warning("XMPP connect failed.")
+                        with contextlib.suppress(Exception):
+                            client.disconnect()
+                        result[0] = False
+                        return
+
+                except asyncio.TimeoutError:
+                    self.logger.warning(
+                        "XMPP connect timed out after %.2fs", connect_timeout
+                    )
+                    result[0] = False
+                    return
+
+                except Exception as e:
+                    self.logger.debug("XMPP connect failed: %s", e)
+                    result[0] = False
+                    return
+
+                # Run until disconnected, but still respect our overall
+                # timeout.
+                elapsed = time.monotonic() - start
+                remaining = max(0.0, self.timeout - elapsed)
+                run_timeout = max(1.0, remaining)
+
+                try:
+                    loop.run_until_complete(
+                        asyncio.wait_for(  # type: ignore[arg-type]
+                            client.disconnected, timeout=run_timeout
+                        )
+                    )
+                except asyncio.TimeoutError:  # type: ignore[attr-defined]
+                    self.logger.warning(
+                        "XMPP session timed out after %.2fs", run_timeout
+                    )
+                    with contextlib.suppress(Exception):
+                        client.disconnect()
+                    result[0] = False
+                    return
+
+                # Disconnect happened, success depends on auth state
+                result[0] = not bool(getattr(client, "_auth_failed", False))
+
+            except Exception as e:  # pragma: no cover
+                self.logger.warning("XMPP send failed.")
+                self.logger.debug("XMPP Exception: %s", e)
+                result[0] = False
+
+            finally:
+                loop = shared.get("loop")
+                if loop is not None:
+                    self._finalize_loop(loop)
+                done.set()
+
+        t = threading.Thread(target=runner, name="apprise-xmpp", daemon=True)
+        t.start()
+
+        if not done.wait(timeout=self.timeout):
+            self.logger.warning(
+                "XMPP send timed out after %.2fs.", self.timeout)
+            result[0] = False
+
+            loop_obj = shared.get("loop")
+            client_obj = shared.get("client")
+
+            if loop_obj is not None:
+                loop = loop_obj  # type: ignore[assignment]
+                try:
+                    if client_obj is not None:
+                        client = client_obj  # type: ignore[assignment]
+                        loop.call_soon_threadsafe(client.disconnect)
+                except Exception:
+                    pass
+
+                with contextlib.suppress(Exception):
+                    loop.call_soon_threadsafe(loop.stop)
+
+            t.join(timeout=0.25)
+
+        return bool(result[0])
+
+    # -----------------------------------------------------------------------
+    # Keepalive Behaviour
+    # -----------------------------------------------------------------------
+
+    def _ensure_keepalive_worker(self) -> bool:
+        """Ensure the background loop and client exist."""
+        if not self.keepalive:
+            return False
+
+        with self._state_lock:
+            if self._closing:
+                return False
+
+            if self._thread is not None and self._thread.is_alive():
+                return True
+
+            if not self._enabled:
+                return False
+
+            self._loop_ready.clear()
+
+            self._thread = threading.Thread(
+                target=self._keepalive_runner,
+                name="apprise-xmpp-keepalive",
+                daemon=True,
+            )
+            self._thread.start()
+
+        if not self._loop_ready.wait(timeout=self.timeout):
+            self.logger.warning(
+                "XMPP keepalive worker failed to start within %.2fs",
+                self.timeout,
+            )
+            return False
+
+        return True
+
+    def _keepalive_runner(self) -> None:
+        loop: Optional[asyncio.AbstractEventLoop] = None
+        # type: ignore[name-defined]
+        published = False
+
+        try:
+            loop = asyncio.new_event_loop()  # type: ignore[union-attr]
+            asyncio.set_event_loop(loop)  # type: ignore[union-attr]
+
+            session_started = asyncio.Event()  # type: ignore[union-attr]
+            connect_lock = asyncio.Lock()  # type: ignore[union-attr]
+
+            roster_timeout = (
+                max(2.0, min(10.0, self.timeout / 3.0))
+                if self.roster else 0.0
+            )
+
+            client = _build_client(
+                jid=self.config.jid,
+                password=self.config.password,
+                oneshot=False,
+                want_roster=self.roster,
+                roster_timeout=roster_timeout,
+                session_started_evt=session_started,
+            )
+
+            with contextlib.suppress(Exception):
+                client.loop = loop  # type: ignore[assignment]
+
+            mode_cfg = SECURE_MODES.get(self.config.secure)
+            if not mode_cfg:
+                raise ValueError(
+                    f"Unsupported XMPP secure mode: {self.config.secure}"
+                )
+
+            client.enable_plaintext = bool(mode_cfg["enable_plaintext"])
+            client.enable_starttls = bool(mode_cfg["enable_starttls"])
+            client.enable_direct_tls = bool(mode_cfg["enable_direct_tls"])
+
+            if not client.enable_plaintext:
+                client.ssl_context = self._ssl_context(
+                    self.config.verify_certificate
+                )
+
+            # keepalive=yes implies enabling XEP-0199 keepalive pings
+            with contextlib.suppress(Exception):
+                client.register_plugin("xep_0199", {"keepalive": True})
+
+            with self._state_lock:
+                if self._closing:
+                    return
+
+                self._loop = loop
+                self._client = client
+                self._connect_lock = connect_lock
+                self._session_started = session_started
+                published = True
+
+            self._loop_ready.set()
+
+            loop.run_forever()
+
+        except Exception as e:  # pragma: no cover
+            self.logger.warning("XMPP keepalive worker failed.")
+            self.logger.debug("XMPP keepalive exception: %s", e)
+
+        finally:
+            if published:
+                with self._state_lock:
+                    if self._closing and self._loop is loop:
+                        # Clear internal references if we are exiting the
+                        # worker.
+                        self._loop = None
+                        self._client = None
+                        self._connect_lock = None
+                        self._session_started = None
+                        self._thread = None
+
+            if loop is not None:
+                self._finalize_loop(loop)
+
+    async def _connect_if_required(self) -> bool:
+        if self._loop is None or self._client is None:
+            return False
+        if self._connect_lock is None or self._session_started is None:
+            return False
+
+        # If auth already failed, do not pretend a connection is ready.
+        if bool(getattr(self._client, "_auth_failed", False)):
+            return False
+
+        async with self._connect_lock:
+            if self._session_started.is_set():
+                return True
+
+            connect_timeout = max(3.0, min(15.0, self.timeout / 3.0))
+
+            try:
+                fut = self._client.connect(
+                    host=self.config.host,
+                    port=self.config.port,
+                )
+                connect_ok = await asyncio.wait_for(  # type: ignore[arg-type]
+                    fut, timeout=connect_timeout
+                )
+
+                # honour boolean connect() result in keepalive.
+                if not connect_ok:
+                    self.logger.warning("XMPP connect failed.")
+                    with contextlib.suppress(Exception):
+                        self._client.disconnect()
+                    return False
+
+            except asyncio.TimeoutError:  # type: ignore[attr-defined]
+                self.logger.warning(
+                    "XMPP connect timed out after %.2fs", connect_timeout
+                )
+                return False
+
+            except Exception as e:
+                self.logger.debug("XMPP connect failed: %s", e)
+                return False
+
+            try:
+                session_wait = self._session_started.wait()
+                await asyncio.wait_for(
+                    session_wait,
+                    timeout=connect_timeout,
+                )
+            except asyncio.TimeoutError:  # type: ignore[attr-defined]
+                _close_awaitable(session_wait)
+                self.logger.warning(
+                    "XMPP session did not start within %.2fs",
+                    connect_timeout,
+                )
+                return False
+
+            except Exception:
+                _close_awaitable(session_wait)
+
+                return False
+
+            # If auth failed during startup, treat as failure.
+            return not bool(getattr(self._client, "_auth_failed", False))
+
+    async def _send_keepalive_async(
+        self,
+        targets: list[str],
+        subject: str,
+        body: str,
+    ) -> bool:
+        if self._client is None:
+            return False
+
+        ok = await self._connect_if_required()
+        if not ok:
+            return False
+
+        # Auth failed after connect, do not send.
+        if bool(getattr(self._client, "_auth_failed", False)):
+            return False
+
+        send_targets = targets if targets else [self.config.jid]
+
+        try:
+            for target in send_targets:
+                self._client.send_message(
+                    mto=target,
+                    msubject=subject,
+                    mbody=body,
+                    mtype="chat",
+                )
+            return True
+
+        except Exception as e:
+            self.logger.debug("XMPP send failed: %s", e)
+            if self._session_started is not None:
+                self._session_started.clear()
+            return False
+
+    def send_message(
+        self,
+        targets: Optional[list[str]] = None,
+        subject: Optional[str] = None,
+        body: Optional[str] = None,
+    ) -> bool:
+        """Send a message, keeping the session alive if keepalive=True."""
+
+        if not self.keepalive:
+            # Fallback to one-shot behaviour using current stored attributes
+            if targets is not None:
+                self.targets = targets
+            if subject is not None:
+                self.subject = subject
+            if body is not None:
+                self.body = body
+            return self.process()
+
+        if not self._ensure_keepalive_worker():
+            return False
+
+        loop = self._loop
+        if loop is None:
+            return False
+
+        targets = self.targets if targets is None else targets
+        subject = self.subject if subject is None else subject
+        body = self.body if body is None else body
+
+        coro = self._send_keepalive_async(
+            targets=targets,
+            subject=subject,
+            body=body,
+        )
+
+        try:
+            fut = asyncio.run_coroutine_threadsafe(  # type: ignore[union-attr]
+                coro,
+                loop,
+            )
+            return bool(fut.result(timeout=self.timeout))
+
+        except FuturesTimeoutError:
+            self.logger.warning(
+                "XMPP keepalive send timed out after %.2fs", self.timeout
+            )
+            if self._session_started is not None:
+                with contextlib.suppress(Exception):
+                    loop.call_soon_threadsafe(self._session_started.clear)
+            return False
+
+        except Exception as e:
+            with contextlib.suppress(Exception):
+                coro.close()
+            self.logger.debug("XMPP keepalive send exception: %s", e)
+            return False
+
+    @staticmethod
+    def package_dependency() -> str:
+        """Defines our static dependency for this adapter to work."""
+        version = ".".join([str(v) for v in SlixmppAdapter._supported_version])
+        return f"slixmpp >= {version}"
+
+    @staticmethod
+    def supported_version(version: Optional[str] = None) -> bool:
+        """Returns true if we currently have a version of Slixmpp supported.
+
+        Provided string describes a version in format of major.minor.patch.
+        """
+        if SLIXMPP_SUPPORT_AVAILABLE:
+            m = re.match(
+                r"^(?P<major>\d+)(\.(?P<minor>\d+)(\.(?P<patch>\d+))?)?",
+                version or getattr(slixmpp, "__version__", "") or "",
+            )
+            if not m:
+                return False
+
+            return (
+                int(m.group("major")),
+                int(m.group("minor") or 0),
+                int(m.group("patch") or 0),
+            ) >= SlixmppAdapter._supported_version
+
+        return False
diff --git a/libs/apprise/plugins/xmpp/base.py b/libs/apprise/plugins/xmpp/base.py
new file mode 100644
index 0000000000..e0f796acbb
--- /dev/null
+++ b/libs/apprise/plugins/xmpp/base.py
@@ -0,0 +1,438 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""XMPP Notifications"""
+
+from __future__ import annotations
+
+import re
+from typing import Any, Optional
+
+from ...common import NotifyType
+from ...locale import gettext_lazy as _
+from ...url import PrivacyMode
+from ...utils.parse import parse_bool, parse_list
+from ..base import NotifyBase
+from .adapter import SLIXMPP_SUPPORT_AVAILABLE, SlixmppAdapter, XMPPConfig
+from .common import SECURE_MODES, SecureXMPPMode
+
+# A pragmatic, "hardened" JID validator intended for Apprise URLs.
+#
+# - Supports: local@domain and local@domain/resource
+# - Rejects whitespace anywhere
+# - Rejects missing local or domain
+# - Rejects '@' in the domain component
+#
+# This does not try to fully implement RFC 7622. The goal is to catch bad
+# inputs early and reliably while still supporting common JID patterns.
+IS_JID = re.compile(
+    r"^\s*(?P<local>[^@\s/]+)((@|%40)"
+    r"(?P<domain>[^@\s/]+))?(?:(/|%2F)(?P<resource>[^%/\s]+)"
+    r"((/|%2F).*)?)?\s*$"
+)
+
+
+class NotifyXMPP(NotifyBase):
+    """Send notifications via XMPP using Slixmpp."""
+
+    # Set our global enabled flag
+    enabled = SLIXMPP_SUPPORT_AVAILABLE and SlixmppAdapter._enabled
+
+    requirements = {
+        # Define our required packaging in order to work
+        "packages_required": SlixmppAdapter.package_dependency(),
+    }
+
+    # The default descriptive name associated with the Notification
+    service_name = "XMPP"
+
+    # The services URL
+    service_url = "https://xmpp.org/"
+
+    # The default insecure protocol
+    protocol = "xmpp"
+
+    # The default secure protocol
+    secure_protocol = "xmpps"
+
+    # A URL that takes you to the setup/help of the specific protocol
+    setup_url = "https://appriseit.com/services/xmpp/"
+
+    templates = (
+        "{schema}://{user}:{password}@{host}",
+        "{schema}://{user}:{password}@{host}:{port}",
+        "{schema}://{user}:{password}@{host}/{targets}",
+        "{schema}://{user}:{password}@{host}:{port}/{targets}",
+    )
+
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "host": {
+                "name": _("Hostname"),
+                "type": "string",
+                "required": True,
+            },
+            "port": {
+                "name": _("Port"),
+                "type": "int",
+                "min": 1,
+                "max": 65535,
+            },
+            "user": {
+                "name": _("User"),
+                "type": "string",
+                "required": True,
+            },
+            "password": {
+                "name": _("Password"),
+                "type": "string",
+                "private": True,
+                "required": True,
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
+        },
+    )
+
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {"alias_of": "targets"},
+            "mode": {
+                "name": _("Secure Mode"),
+                "type": "choice:string",
+                "values": SECURE_MODES,
+                "default": SecureXMPPMode.STARTTLS,
+                "map_to": "secure_mode",
+            },
+            "roster": {
+                "name": _("Get Roster"),
+                "type": "bool",
+                "default": False,
+            },
+            "subject": {
+                "name": _("Use Subject"),
+                "type": "bool",
+                "default": False,
+            },
+            "keepalive": {
+                "name": _("Keep Connection Alive"),
+                "type": "bool",
+                "default": False,
+            },
+        },
+    )
+
+    def __init__(
+        self,
+        targets: Optional[list[str]] = None,
+        secure_mode: Optional[str] = None,
+        roster: Optional[bool] = None,
+        subject: Optional[bool] = None,
+        keepalive: Optional[bool] = None,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(**kwargs)
+
+        try:
+            self.jid = self.normalize_jid(self.user or "", self.host)
+
+        except ValueError:
+            msg = f"An invalid XMPP JID ({self.user}) was specified."
+            self.logger.warning(msg)
+            raise TypeError(msg) from None
+
+        self.targets: list[str] = []
+        for target in parse_list(targets):
+            try:
+                jid = self.normalize_jid(target or "", self.host)
+
+            except ValueError:
+                self.logger.warning(
+                    "Dropped invalid XMPP target (%s).", target)
+                continue
+            self.targets.append(jid)
+
+        if isinstance(secure_mode, str) and secure_mode.strip():
+            self.secure_mode = secure_mode.strip().lower()
+            self.secure_mode = next(
+                (k for k in SECURE_MODES
+                 if k.startswith(self.secure_mode)), None
+            )
+            if self.secure_mode not in SECURE_MODES:
+                msg = (
+                    "The XMPP secure mode specified "
+                    f"({secure_mode}) is invalid.")
+                self.logger.warning(msg)
+                raise TypeError(msg)
+
+        else:
+            self.secure_mode = (
+                SecureXMPPMode.NONE
+                if not self.secure
+                else self.template_args["mode"]["default"]
+            )
+
+        # Prepare our roster check
+        self.roster = (
+            self.template_args["roster"]["default"]
+            if roster is None else bool(roster)
+        )
+
+        self.subject = (
+            self.template_args["subject"]["default"]
+            if subject is None else bool(subject)
+        )
+
+        self.keepalive = (
+            self.template_args["keepalive"]["default"]
+            if keepalive is None
+            else bool(keepalive)
+        )
+
+        if self.secure and self.secure_mode == SecureXMPPMode.NONE:
+            self.secure_mode = self.template_args["mode"]["default"]
+            self.logger.warning(
+                "Ambiguous XMPP configuration: secure=True and mode=None; "
+                "secure setting prevails; setting mode=%s",
+                self.secure_mode,
+            )
+
+        elif not self.secure and self.secure_mode != SecureXMPPMode.NONE:
+            self.logger.warning(
+                "Ambiguous XMPP configuration: secure=False and mode=%s; "
+                "mode setting prevails; setting secure=True",
+                self.secure_mode,
+            )
+            self.secure = True
+
+        # Keepalive adapter (created lazily)
+        self._adapter: Optional[SlixmppAdapter] = None
+
+    def __del__(self) -> None:
+        """Best-effort close for keepalive sessions."""
+        try:
+            if self._adapter is not None:
+                self._adapter.close()
+
+        except Exception:
+            # Never raise from __del__
+            pass
+
+    @property
+    def url_identifier(self) -> tuple[str, str, str, str, Optional[int]]:
+        """Return the pieces that uniquely identify this configuration."""
+        return (
+            self.secure_protocol if self.secure else self.protocol,
+            self.host, self.user, self.password, self.port,
+        )
+
+    def url(self, privacy: bool = False, *args: Any, **kwargs: Any) -> str:
+        """Return the URL representation of this notification."""
+
+        # Initialize our parameters
+        params = {
+            "mode": self.secure_mode,
+            "roster": "yes" if self.roster else "no",
+            "subject": "yes" if self.subject else "no",
+            "keepalive": "yes" if self.keepalive else "no",
+        }
+
+        # Extend our parameters
+        params.update(self.url_parameters(privacy=privacy, *args, **kwargs))
+
+        auth = "{user}:{password}@".format(
+            user=self.quote(self.jid, safe=""),
+            password=self.pprint(
+                self.password,
+                privacy,
+                mode=PrivacyMode.Secret,
+                safe="",
+            ),
+        )
+
+        default_port = SECURE_MODES[self.secure_mode]["default_port"]
+        port = self.port if isinstance(self.port, int) else default_port
+        port_str = "" if port == default_port else f":{port}"
+
+        schema = self.secure_protocol if self.secure else self.protocol
+
+        # Targets can contain '/' as a resource separator, so ensure it is
+        # always percent-encoded in the path (otherwise Apprise will split it).
+        targets = "/".join(self.quote(t, safe="") for t in self.targets)
+
+        return "{schema}://{auth}{host}{port}/{targets}?{params}".format(
+            schema=schema,
+            auth=auth,
+            host=self.host,
+            port=port_str,
+            targets=targets,
+            params=self.urlencode(params),
+        )
+
+    def send(
+        self,
+        body: str,
+        title: str = "",
+        notify_type: NotifyType = NotifyType.INFO,
+        **kwargs: Any,
+    ) -> bool:
+        """Send a notification to one or more XMPP targets."""
+
+        default_port = SECURE_MODES[self.secure_mode]["default_port"]
+
+        self.throttle()
+
+        config = XMPPConfig(
+            jid=self.jid,
+            password=self.password or "",
+            host=self.host,
+            port=self.port if self.port else default_port,
+            secure=self.secure_mode,
+            verify_certificate=self.verify_certificate,
+        )
+
+        self.logger.debug(
+            "XMPP init: jid=%s host=%s port=%d mode=%s "
+            "verify_certificate=%s subject=%s roster=%s keepalive=%s "
+            "targets=%s",
+            self.jid,
+            config.host,
+            config.port,
+            config.secure,
+            config.verify_certificate,
+            "yes" if self.subject else "no",
+            "yes" if self.roster else "no",
+            "yes" if self.keepalive else "no",
+            self.targets,
+        )
+
+        subject = title if self.subject else ""
+
+        if self.keepalive and self._adapter:
+            # Reuse existing adapter
+            return self._adapter.send_message(
+                targets=self.targets,
+                subject=subject,
+                body=body,
+            )
+
+        adapter_kwargs = {
+            "config": config,
+            "targets": self.targets,
+            "subject": subject,
+            "body": body,
+            "timeout": self.socket_connect_timeout,
+            "roster": self.roster,
+            "keepalive": self.keepalive,
+        }
+        if not self.keepalive:
+            # One-shot mode: Create, process, and discard
+            return SlixmppAdapter(**adapter_kwargs).process()
+
+        # Keepalive mode, reuse a single adapter instance
+        self._adapter = SlixmppAdapter(**adapter_kwargs)
+        return self._adapter.send_message()
+
+    @property
+    def title_maxlen(self) -> Optional[int]:
+        """
+        Depending on if the subject field is set, we can control
+        how the message is constructed.
+        """
+
+        return 0 if not self.subject else super().title_maxlen
+
+        # We don't support titles for SMSEagle notifications
+    @staticmethod
+    def normalize_jid(value: str, default_host: str) -> str:
+        """Normalize and validate a JID.
+
+        Behaviour:
+        - If value is 'user' then it becomes 'user@default_host'.
+        - If value is 'user@host' then it becomes 'user@host'.
+        - If value is 'user@host/resource' then it becomes
+           'user@host/resource'.
+        - If value is 'user/resource' then it becomes
+           'user@default_host/resource'.
+        - If value already contains '@', it is used as-is, including an
+           optional '/resource' suffix.
+        """
+        raw = (value or "").strip()
+        if not raw:
+            raise ValueError("Empty JID")
+
+        results = IS_JID.match(raw)
+        if not results:
+            raise ValueError("Invalid JID")
+
+        host = default_host \
+            if not results.group("domain") else results.group("domain")
+
+        jid = f"{results.group('local')}@{host}"
+        if results.group("resource"):
+            jid = f"{jid}/{results.group('resource')}"
+
+        return jid
+
+    @staticmethod
+    def parse_url(url: str) -> Optional[dict[str, Any]]:
+        """Parse an XMPP URL into constructor arguments."""
+        results = NotifyBase.parse_url(url)
+        if not results:
+            return None
+
+        # Targets from path
+        results["targets"] = [
+            NotifyXMPP.unquote(t)
+            for t in NotifyXMPP.split_path(results.get("fullpath"))]
+
+        qd = results.get("qsd", {})
+
+        # Support to= alias
+        if "to" in qd and qd.get("to"):
+            results["targets"] += NotifyXMPP.parse_list(
+                NotifyXMPP.unquote(qd.get("to"))
+            )
+
+        if "mode" in results["qsd"] and len(results["qsd"]["mode"]):
+            # Extract the secure mode to over-ride the default
+            results["secure_mode"] = results["qsd"]["mode"].lower()
+
+        if "roster" in results["qsd"] and len(results["qsd"]["roster"]):
+            results["roster"] = parse_bool(results["qsd"]["roster"])
+
+        if "subject" in results["qsd"] and len(results["qsd"]["subject"]):
+            results["subject"] = parse_bool(results["qsd"]["subject"])
+
+        if "keepalive" in results["qsd"] and len(results["qsd"]["keepalive"]):
+            results["keepalive"] = parse_bool(results["qsd"]["keepalive"])
+
+        return results
diff --git a/libs/apprise/plugins/xmpp/common.py b/libs/apprise/plugins/xmpp/common.py
new file mode 100644
index 0000000000..b37bcb220a
--- /dev/null
+++ b/libs/apprise/plugins/xmpp/common.py
@@ -0,0 +1,59 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""XMPP General/Shared Configuration"""
+
+
+class SecureXMPPMode:
+    """
+    Defines our modes
+    """
+    NONE = "none"
+    TLS = "tls"
+    STARTTLS = "starttls"
+
+
+SECURE_MODES = {
+    SecureXMPPMode.STARTTLS: {
+        "default_port": 5222,
+         "enable_plaintext": False,
+         "enable_starttls": True,
+         "enable_direct_tls": False,
+    },
+    SecureXMPPMode.TLS: {
+        "default_port": 5223,
+         "enable_plaintext": False,
+         "enable_starttls": False,
+         "enable_direct_tls": True,
+    },
+    SecureXMPPMode.NONE: {
+        "default_port": 5222,
+         "enable_plaintext": True,
+         "enable_starttls": False,
+         "enable_direct_tls": False,
+    },
+}
diff --git a/libs/apprise/plugins/zulip.py b/libs/apprise/plugins/zulip.py
index cff2886a19..e392b3264f 100644
--- a/libs/apprise/plugins/zulip.py
+++ b/libs/apprise/plugins/zulip.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -59,52 +58,51 @@
 #  https://zulipchat.com/api/send-message
 #
 import re
+
 import requests
 
-from .base import NotifyBase
 from ..common import NotifyType
-from ..utils.parse import (parse_list, validate_regex, is_email)
 from ..locale import gettext_lazy as _
+from ..utils.parse import is_email, parse_list, validate_regex
+from .base import NotifyBase
 
 # A Valid Bot Name
-VALIDATE_BOTNAME = re.compile(r'(?P<name>[A-Z0-9_-]{1,32})', re.I)
+VALIDATE_BOTNAME = re.compile(r"(?P<name>[A-Z0-9_-]{1,32})", re.I)
 
 # Organization required as part of the API request
 VALIDATE_ORG = re.compile(
-    r'(?P<org>[A-Z0-9_-]{1,32})(\.(?P<hostname>[^\s]+))?', re.I)
+    r"(?P<org>[A-Z0-9_-]{1,32})(\.(?P<hostname>[^\s]+))?", re.I
+)
 
 # Extend HTTP Error Messages
 ZULIP_HTTP_ERROR_MAP = {
-    401: 'Unauthorized - Invalid Token.',
+    401: "Unauthorized - Invalid Token.",
 }
 
 # Used to break path apart into list of streams
-TARGET_LIST_DELIM = re.compile(r'[ \t\r\n,#\\/]+')
+TARGET_LIST_DELIM = re.compile(r"[ \t\r\n,#\\/]+")
 
 # Used to detect a streams
-IS_VALID_TARGET_RE = re.compile(
-    r'#?(?P<stream>[A-Z0-9_]{1,32})', re.I)
+IS_VALID_TARGET_RE = re.compile(r"#?(?P<stream>[A-Z0-9_]{1,32})", re.I)
 
 
 class NotifyZulip(NotifyBase):
-    """
-    A wrapper for Zulip Notifications
-    """
+    """A wrapper for Zulip Notifications."""
 
     # The default descriptive name associated with the Notification
-    service_name = 'Zulip'
+    service_name = "Zulip"
 
     # The services URL
-    service_url = 'https://zulipchat.com/'
+    service_url = "https://zulipchat.com/"
 
     # The default secure protocol
-    secure_protocol = 'zulip'
+    secure_protocol = "zulip"
 
     # A URL that takes you to the setup/help of the specific protocol
-    setup_url = 'https://github.com/caronc/apprise/wiki/Notify_zulip'
+    setup_url = "https://appriseit.com/services/zulip/"
 
     # Zulip uses the http protocol with JSON requests
-    notify_url = 'https://{org}.{hostname}/api/v1/messages'
+    notify_url = "https://{org}.{hostname}/api/v1/messages"
 
     # The maximum allowable characters allowed in the title per message
     title_maxlen = 60
@@ -114,68 +112,72 @@ class NotifyZulip(NotifyBase):
 
     # Define object templates
     templates = (
-        '{schema}://{botname}@{organization}/{token}',
-        '{schema}://{botname}@{organization}/{token}/{targets}',
+        "{schema}://{botname}@{organization}/{token}",
+        "{schema}://{botname}@{organization}/{token}/{targets}",
     )
 
     # Define our template tokens
-    template_tokens = dict(NotifyBase.template_tokens, **{
-        'botname': {
-            'name': _('Bot Name'),
-            'type': 'string',
-            'regex': (r'^[A-Z0-9_-]{1,32}$', 'i'),
-            'required': True,
-        },
-        'organization': {
-            'name': _('Organization'),
-            'type': 'string',
-            'required': True,
-            'regex': (r'^[A-Z0-9_-]{1,32})$', 'i')
-        },
-        'token': {
-            'name': _('Token'),
-            'type': 'string',
-            'required': True,
-            'private': True,
-            'regex': (r'^[A-Z0-9]{32}$', 'i'),
-        },
-        'target_user': {
-            'name': _('Target User'),
-            'type': 'string',
-            'map_to': 'targets',
+    template_tokens = dict(
+        NotifyBase.template_tokens,
+        **{
+            "botname": {
+                "name": _("Bot Name"),
+                "type": "string",
+                "regex": (r"^[A-Z0-9_-]{1,32}$", "i"),
+                "required": True,
+            },
+            "organization": {
+                "name": _("Organization"),
+                "type": "string",
+                "required": True,
+                "regex": (r"^[A-Z0-9_-]{1,32})$", "i"),
+            },
+            "token": {
+                "name": _("Token"),
+                "type": "string",
+                "required": True,
+                "private": True,
+                "regex": (r"^[A-Z0-9]{32}$", "i"),
+            },
+            "target_user": {
+                "name": _("Target User"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "target_stream": {
+                "name": _("Target Stream"),
+                "type": "string",
+                "map_to": "targets",
+            },
+            "targets": {
+                "name": _("Targets"),
+                "type": "list:string",
+            },
         },
-        'target_stream': {
-            'name': _('Target Stream'),
-            'type': 'string',
-            'map_to': 'targets',
-        },
-        'targets': {
-            'name': _('Targets'),
-            'type': 'list:string',
-        },
-    })
+    )
 
     # Define our template arguments
-    template_args = dict(NotifyBase.template_args, **{
-        'to': {
-            'alias_of': 'targets',
+    template_args = dict(
+        NotifyBase.template_args,
+        **{
+            "to": {
+                "alias_of": "targets",
+            },
+            "token": {
+                "alias_of": "token",
+            },
         },
-        'token': {
-            'alias_of': 'token',
-        },
-    })
+    )
 
     # The default hostname to append to a defined organization
     # if one isn't defined in the apprise url
-    default_hostname = 'zulipchat.com'
+    default_hostname = "zulipchat.com"
 
     # The default stream to notify if no targets are specified
-    default_notification_stream = 'general'
+    default_notification_stream = "general"
 
     def __init__(self, botname, organization, token, targets=None, **kwargs):
-        """
-        Initialize Zulip Object
-        """
+        """Initialize Zulip Object."""
         super().__init__(**kwargs)
 
         # our default hostname
@@ -188,18 +190,20 @@ def __init__(self, botname, organization, token, targets=None, **kwargs):
                 raise TypeError
 
             # The botname
-            botname = match.group('name')
-            suffix = '-bot'
+            botname = match.group("name")
+            suffix = "-bot"
             # Eliminate suffix if found
-            botname = \
-                botname[:-len(suffix)] if botname.endswith(suffix) else botname
+            botname = (
+                botname[: -len(suffix)]
+                if botname.endswith(suffix)
+                else botname
+            )
             self.botname = botname
 
-        except (TypeError, AttributeError):
-            msg = 'The Zulip botname specified ({}) is invalid.'\
-                .format(botname)
+        except (TypeError, AttributeError) as err:
+            msg = f"The Zulip botname specified ({botname}) is invalid."
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from err
 
         try:
             match = VALIDATE_ORG.match(organization.strip())
@@ -208,21 +212,23 @@ def __init__(self, botname, organization, token, targets=None, **kwargs):
                 raise TypeError
 
             # The organization
-            self.organization = match.group('org')
-            if match.group('hostname'):
-                self.hostname = match.group('hostname')
-
-        except (TypeError, AttributeError):
-            msg = 'The Zulip organization specified ({}) is invalid.'\
-                .format(organization)
+            self.organization = match.group("org")
+            if match.group("hostname"):
+                self.hostname = match.group("hostname")
+
+        except (TypeError, AttributeError) as err:
+            msg = (
+                "The Zulip organization specified "
+                f"({organization}) is invalid."
+            )
             self.logger.warning(msg)
-            raise TypeError(msg)
+            raise TypeError(msg) from err
 
         self.token = validate_regex(
-            token, *self.template_tokens['token']['regex'])
+            token, *self.template_tokens["token"]["regex"]
+        )
         if not self.token:
-            msg = 'The Zulip token specified ({}) is invalid.'\
-                .format(token)
+            msg = f"The Zulip token specified ({token}) is invalid."
             self.logger.warning(msg)
             raise TypeError(msg)
 
@@ -231,14 +237,12 @@ def __init__(self, botname, organization, token, targets=None, **kwargs):
             # No streams identified, use default
             self.targets.append(self.default_notification_stream)
 
-    def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
-        """
-        Perform Zulip Notification
-        """
+    def send(self, body, title="", notify_type=NotifyType.INFO, **kwargs):
+        """Perform Zulip Notification."""
 
         headers = {
-            'User-Agent': self.app_id,
-            'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8',
+            "User-Agent": self.app_id,
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
         }
 
         # error tracking (used for function return)
@@ -252,17 +256,13 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
         # prepare JSON Object
         payload = {
-            'subject': title,
-            'content': body,
+            "subject": title,
+            "content": body,
         }
 
         # Determine Authentication
         auth = (
-            '{botname}-bot@{org}.{hostname}'.format(
-                botname=self.botname,
-                org=self.organization,
-                hostname=self.hostname,
-            ),
+            f"{self.botname}-bot@{self.organization}.{self.hostname}",
             self.token,
         )
 
@@ -273,18 +273,19 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
             result = is_email(target)
             if result:
                 # Send a private message
-                payload['type'] = 'private'
+                payload["type"] = "private"
             else:
                 # Send a stream message
-                payload['type'] = 'stream'
+                payload["type"] = "stream"
 
             # Set our target
-            payload['to'] = target if not result else result['full_email']
+            payload["to"] = target if not result else result["full_email"]
 
-            self.logger.debug('Zulip POST URL: %s (cert_verify=%r)' % (
-                url, self.verify_certificate,
-            ))
-            self.logger.debug('Zulip Payload: %s' % str(payload))
+            self.logger.debug(
+                f"Zulip POST URL: {url} "
+                f"(cert_verify={self.verify_certificate!r})"
+            )
+            self.logger.debug(f"Zulip Payload: {payload!s}")
 
             # Always call throttle before any remote server i/o is made
             self.throttle()
@@ -299,34 +300,36 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
                 )
                 if r.status_code != requests.codes.ok:
                     # We had a problem
-                    status_str = \
-                        NotifyZulip.http_response_code_lookup(
-                            r.status_code, ZULIP_HTTP_ERROR_MAP)
+                    status_str = NotifyZulip.http_response_code_lookup(
+                        r.status_code, ZULIP_HTTP_ERROR_MAP
+                    )
 
                     self.logger.warning(
-                        'Failed to send Zulip notification to {}: '
-                        '{}{}error={}.'.format(
+                        "Failed to send Zulip notification to {}: "
+                        "{}{}error={}.".format(
                             target,
                             status_str,
-                            ', ' if status_str else '',
-                            r.status_code))
+                            ", " if status_str else "",
+                            r.status_code,
+                        )
+                    )
 
                     self.logger.debug(
-                        'Response Details:\r\n{}'.format(r.content))
+                        "Response Details:\r\n%r", (r.content or b"")[:2000])
 
                     # Mark our failure
                     has_error = True
                     continue
 
                 else:
-                    self.logger.info(
-                        'Sent Zulip notification to {}.'.format(target))
+                    self.logger.info(f"Sent Zulip notification to {target}.")
 
             except requests.RequestException as e:
                 self.logger.warning(
-                    'A Connection error occurred sending Zulip '
-                    'notification to {}.'.format(target))
-                self.logger.debug('Socket Exception: %s' % str(e))
+                    "A Connection error occurred sending Zulip "
+                    f"notification to {target}."
+                )
+                self.logger.debug(f"Socket Exception: {e!s}")
 
                 # Mark our failure
                 has_error = True
@@ -336,85 +339,89 @@ def send(self, body, title='', notify_type=NotifyType.INFO, **kwargs):
 
     @property
     def url_identifier(self):
-        """
-        Returns all of the identifiers that make this URL unique from
-        another simliar one. Targets or end points should never be identified
-        here.
+        """Returns all of the identifiers that make this URL unique from
+        another simliar one.
+
+        Targets or end points should never be identified here.
         """
         return (
-            self.secure_protocol, self.organization, self.hostname,
+            self.secure_protocol,
+            self.organization,
+            self.hostname,
             self.token,
         )
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Returns the URL built dynamically based on specified arguments.
-        """
+        """Returns the URL built dynamically based on specified arguments."""
 
         # Our URL parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         # simplify our organization in our URL if we can
-        organization = '{}{}'.format(
+        organization = "{}{}".format(
             self.organization,
-            '.{}'.format(self.hostname)
-            if self.hostname != self.default_hostname else '')
-
-        return '{schema}://{botname}@{org}/{token}/' \
-            '{targets}?{params}'.format(
-                schema=self.secure_protocol,
-                botname=NotifyZulip.quote(self.botname, safe=''),
-                org=NotifyZulip.quote(organization, safe=''),
-                token=self.pprint(self.token, privacy, safe=''),
-                targets='/'.join(
-                    [NotifyZulip.quote(x, safe='') for x in self.targets]),
-                params=NotifyZulip.urlencode(params),
-            )
+            (
+                f".{self.hostname}"
+                if self.hostname != self.default_hostname
+                else ""
+            ),
+        )
+
+        return "{schema}://{botname}@{org}/{token}/{targets}?{params}".format(
+            schema=self.secure_protocol,
+            botname=NotifyZulip.quote(self.botname, safe=""),
+            org=NotifyZulip.quote(organization, safe=""),
+            token=self.pprint(self.token, privacy, safe=""),
+            targets="/".join(
+                [NotifyZulip.quote(x, safe="") for x in self.targets]
+            ),
+            params=NotifyZulip.urlencode(params),
+        )
 
     def __len__(self):
-        """
-        Returns the number of targets associated with this notification
-        """
+        """Returns the number of targets associated with this notification."""
         return len(self.targets)
 
     @staticmethod
     def parse_url(url):
-        """
-        Parses the URL and returns enough arguments that can allow
-        us to re-instantiate this object.
-
-        """
+        """Parses the URL and returns enough arguments that can allow us to re-
+        instantiate this object."""
         results = NotifyBase.parse_url(url, verify_host=False)
         if not results:
             # We're done early as we couldn't load the results
             return results
 
         # The botname
-        results['botname'] = NotifyZulip.unquote(results['user'])
+        results["botname"] = NotifyZulip.unquote(results["user"])
 
         # The organization is stored in the hostname
-        results['organization'] = NotifyZulip.unquote(results['host'])
+        results["organization"] = NotifyZulip.unquote(results["host"])
 
         # Store our targets
-        results['targets'] = NotifyZulip.split_path(results['fullpath'])
+        results["targets"] = NotifyZulip.split_path(results["fullpath"])
 
-        if 'token' in results['qsd'] and len(results['qsd']['token']):
+        if "token" in results["qsd"] and len(results["qsd"]["token"]):
             # Store our token if specified
-            results['token'] = NotifyZulip.unquote(results['qsd']['token'])
+            results["token"] = NotifyZulip.unquote(results["qsd"]["token"])
 
-        elif results['targets']:
+        elif results["targets"]:
             # First item is the token
-            results['token'] = results['targets'].pop(0)
+            results["token"] = results["targets"].pop(0)
 
         else:
             # no token
-            results['token'] = None
+            results["token"] = None
 
         # Support the 'to' variable so that we can support rooms this way too
         # The 'to' makes it easier to use yaml configuration
-        if 'to' in results['qsd'] and len(results['qsd']['to']):
-            results['targets'] += [x for x in filter(
-                bool, TARGET_LIST_DELIM.split(
-                    NotifyZulip.unquote(results['qsd']['to'])))]
+        if "to" in results["qsd"] and len(results["qsd"]["to"]):
+            results["targets"] += list(
+                filter(
+                    bool,
+                    TARGET_LIST_DELIM.split(
+                        NotifyZulip.unquote(results["qsd"]["to"])
+                    ),
+                )
+            )
 
         return results
diff --git a/libs/apprise/url.py b/libs/apprise/url.py
index f67af013e1..d597682ac3 100644
--- a/libs/apprise/url.py
+++ b/libs/apprise/url.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,55 +25,56 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import sys
+from datetime import datetime
+import hashlib
 import re
-from .logger import logger
+import sys
 import time
-import hashlib
-from datetime import datetime
+from urllib.parse import quote as _quote, unquote as _unquote
 from xml.sax.saxutils import escape as sax_escape
 
-from urllib.parse import unquote as _unquote
-from urllib.parse import quote as _quote
-
-from .locale import gettext_lazy as _
 from .asset import AppriseAsset
+from .locale import gettext_lazy as _
+from .logger import logger
 from .utils.parse import (
-    urlencode, parse_url, parse_bool, parse_list, parse_phone_no)
+    parse_bool,
+    parse_list,
+    parse_phone_no,
+    parse_url,
+    urlencode,
+)
 
 # Used to break a path list into parts
-PATHSPLIT_LIST_DELIM = re.compile(r'[ \t\r\n,\\/]+')
+PATHSPLIT_LIST_DELIM = re.compile(r"[ \t\r\n,\\/]+")
 
 
 class PrivacyMode:
     # Defines different privacy modes strings can be printed as
     # Astrisk sets 4 of them: e.g. ****
     # This is used for passwords
-    Secret = '*'
+    Secret = "*"
 
     # Outer takes the first and last character displaying them with
     # 3 dots between.  Hence, 'i-am-a-token' would become 'i...n'
-    Outer = 'o'
+    Outer = "o"
 
     # Displays the last four characters
-    Tail = 't'
+    Tail = "t"
 
 
 # Define the HTML Lookup Table
 HTML_LOOKUP = {
-    400: 'Bad Request - Unsupported Parameters.',
-    401: 'Verification Failed.',
-    404: 'Page not found.',
-    405: 'Method not allowed.',
-    500: 'Internal server error.',
-    503: 'Servers are overloaded.',
+    400: "Bad Request - Unsupported Parameters.",
+    401: "Verification Failed.",
+    404: "Page not found.",
+    405: "Method not allowed.",
+    500: "Internal server error.",
+    503: "Servers are overloaded.",
 }
 
 
 class URLBase:
-    """
-    This is the base class for all URL Manipulation
-    """
+    """This is the base class for all URL Manipulation."""
 
     # The default descriptive name associated with the URL
     service_name = None
@@ -137,21 +137,21 @@ class URLBase:
     # These act the same way as tokens except they are optional and/or
     # have default values set if mandatory. This rule must be followed
     template_args = {
-        'verify': {
-            'name': _('Verify SSL'),
+        "verify": {
+            "name": _("Verify SSL"),
             # SSL Certificate Authority Verification
-            'type': 'bool',
+            "type": "bool",
             # Provide a default
-            'default': verify_certificate,
+            "default": verify_certificate,
             # look up default using the following parent class value at
             # runtime.
-            '_lookup_default': 'verify_certificate',
+            "_lookup_default": "verify_certificate",
         },
-        'rto': {
-            'name': _('Socket Read Timeout'),
-            'type': 'float',
+        "rto": {
+            "name": _("Socket Read Timeout"),
+            "type": "float",
             # Provide a default
-            'default': socket_read_timeout,
+            "default": socket_read_timeout,
             # look up default using the following parent class value at
             # runtime. The variable name identified here (in this case
             # socket_read_timeout) is checked and it's result is placed
@@ -159,13 +159,13 @@ class URLBase:
             # class inherits this one, the overflow_mode already set as a
             # default 'could' be potentially over-ridden and changed to a
             # different value.
-            '_lookup_default': 'socket_read_timeout',
+            "_lookup_default": "socket_read_timeout",
         },
-        'cto': {
-            'name': _('Socket Connect Timeout'),
-            'type': 'float',
+        "cto": {
+            "name": _("Socket Connect Timeout"),
+            "type": "float",
             # Provide a default
-            'default': socket_connect_timeout,
+            "default": socket_connect_timeout,
             # look up default using the following parent class value at
             # runtime. The variable name identified here (in this case
             # socket_connect_timeout) is checked and it's result is placed
@@ -173,7 +173,7 @@ class URLBase:
             # class inherits this one, the overflow_mode already set as a
             # default 'could' be potentially over-ridden and changed to a
             # different value.
-            '_lookup_default': 'socket_connect_timeout',
+            "_lookup_default": "socket_connect_timeout",
         },
     }
 
@@ -197,91 +197,90 @@ class URLBase:
     # Internal Values
 
     def __init__(self, asset=None, **kwargs):
-        """
-        Initialize some general logging and common server arguments that will
-        keep things consistent when working with the children that
-        inherit this class.
-
-        """
+        """Initialize some general logging and common server arguments that
+        will keep things consistent when working with the children that inherit
+        this class."""
         # Prepare our Asset Object
-        self.asset = \
+        self.asset = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         # Certificate Verification (for SSL calls); default to being enabled
         self.verify_certificate = parse_bool(
-            kwargs.get('verify', URLBase.verify_certificate))
+            kwargs.get("verify", URLBase.verify_certificate)
+        )
 
         # Schema
-        self.schema = kwargs.get('schema', 'unknown').lower()
+        self.schema = kwargs.get("schema", "unknown").lower()
 
         # Secure Mode
-        self.secure = kwargs.get('secure', None)
+        self.secure = kwargs.get("secure")
         if not isinstance(self.secure, bool):
             # Attempt to detect
-            self.secure = self.schema[-1:] == 's'
+            self.secure = self.schema[-1:] == "s"
 
-        self.host = URLBase.unquote(kwargs.get('host'))
-        self.port = kwargs.get('port')
+        self.host = URLBase.unquote(kwargs.get("host"))
+        self.port = kwargs.get("port")
         if self.port:
             try:
                 self.port = int(self.port)
 
             except (TypeError, ValueError):
                 self.logger.warning(
-                    'Invalid port number specified {}'
-                    .format(self.port))
+                    f"Invalid port number specified {self.port}"
+                )
                 self.port = None
 
-        self.user = kwargs.get('user')
+        self.user = kwargs.get("user")
         if self.user:
             # Always unquote user if it exists
             self.user = URLBase.unquote(self.user)
 
-        self.password = kwargs.get('password')
+        self.password = kwargs.get("password")
         if self.password:
             # Always unquote the password if it exists
             self.password = URLBase.unquote(self.password)
 
         # Store our full path consistently ensuring it ends with a `/'
-        self.fullpath = URLBase.unquote(kwargs.get('fullpath'))
+        self.fullpath = URLBase.unquote(kwargs.get("fullpath"))
         if not isinstance(self.fullpath, str) or not self.fullpath:
-            self.fullpath = '/'
+            self.fullpath = "/"
 
         # Store our Timeout Variables
-        if 'rto' in kwargs:
+        if "rto" in kwargs:
             try:
-                self.socket_read_timeout = float(kwargs.get('rto'))
+                self.socket_read_timeout = float(kwargs.get("rto"))
             except (TypeError, ValueError):
                 self.logger.warning(
-                    'Invalid socket read timeout (rto) was specified {}'
-                    .format(kwargs.get('rto')))
+                    "Invalid socket read timeout (rto) was specified {}"
+                    .format(kwargs.get("rto"))
+                )
 
-        if 'cto' in kwargs:
+        if "cto" in kwargs:
             try:
-                self.socket_connect_timeout = float(kwargs.get('cto'))
+                self.socket_connect_timeout = float(kwargs.get("cto"))
 
             except (TypeError, ValueError):
                 self.logger.warning(
-                    'Invalid socket connect timeout (cto) was specified {}'
-                    .format(kwargs.get('cto')))
+                    "Invalid socket connect timeout (cto) was specified {}"
+                    .format(kwargs.get("cto"))
+                )
 
-        if 'tag' in kwargs:
+        if "tag" in kwargs:
             # We want to associate some tags with our notification service.
             # the code below gets the 'tag' argument if defined, otherwise
             # it just falls back to whatever was already defined globally
-            self.tags = set(parse_list(kwargs.get('tag'), self.tags))
+            self.tags = set(parse_list(kwargs.get("tag"), self.tags))
 
         # Tracks the time any i/o was made to the remote server.  This value
         # is automatically set and controlled through the throttle() call.
         self._last_io_datetime = None
 
     def throttle(self, last_io=None, wait=None):
-        """
-        A common throttle control
+        """A common throttle control.
 
-        if a wait is specified, then it will force a sleep of the
-        specified time if it is larger then the calculated throttle
-        time.
+        if a wait is specified, then it will force a sleep of the specified
+        time if it is larger then the calculated throttle time.
         """
 
         if last_io is not None:
@@ -308,12 +307,13 @@ def throttle(self, last_io=None, wait=None):
         elapsed = (reference - self._last_io_datetime).total_seconds()
 
         if wait is not None:
-            self.logger.debug('Throttling forced for {}s...'.format(wait))
+            self.logger.debug(f"Throttling forced for {wait}s...")
             time.sleep(wait)
 
         elif elapsed < self.request_rate_per_sec:
-            self.logger.debug('Throttling for {}s...'.format(
-                self.request_rate_per_sec - elapsed))
+            self.logger.debug(
+                f"Throttling for {self.request_rate_per_sec - elapsed}s..."
+            )
             time.sleep(self.request_rate_per_sec - elapsed)
 
         # Update our timestamp before we leave
@@ -321,47 +321,49 @@ def throttle(self, last_io=None, wait=None):
         return
 
     def url(self, privacy=False, *args, **kwargs):
-        """
-        Assembles the URL associated with the notification based on the
-        arguments provied.
-
-        """
+        """Assembles the URL associated with the notification based on the
+        arguments provied."""
 
         # Our default parameters
         params = self.url_parameters(privacy=privacy, *args, **kwargs)
 
         # Determine Authentication
-        auth = ''
+        auth = ""
         if self.user and self.password:
-            auth = '{user}:{password}@'.format(
-                user=URLBase.quote(self.user, safe=''),
+            auth = "{user}:{password}@".format(
+                user=URLBase.quote(self.user, safe=""),
                 password=self.pprint(
-                    self.password, privacy, mode=PrivacyMode.Secret, safe=''),
+                    self.password, privacy, mode=PrivacyMode.Secret, safe=""
+                ),
             )
         elif self.user:
-            auth = '{user}@'.format(
-                user=URLBase.quote(self.user, safe=''),
+            auth = "{user}@".format(
+                user=URLBase.quote(self.user, safe=""),
             )
 
         default_port = 443 if self.secure else 80
-
-        return '{schema}://{auth}{hostname}{port}{fullpath}{params}'.format(
-            schema='https' if self.secure else 'http',
+        return "{schema}://{auth}{hostname}{port}{fullpath}{params}".format(
+            schema="https" if self.secure else "http",
             auth=auth,
             # never encode hostname since we're expecting it to be a valid one
             hostname=self.host,
-            port='' if self.port is None or self.port == default_port
-                 else ':{}'.format(self.port),
-            fullpath=URLBase.quote(self.fullpath, safe='/')
-            if self.fullpath else '/',
-            params=('?' + URLBase.urlencode(params) if params else ''),
+            port=(
+                ""
+                if self.port is None or self.port == default_port
+                else f":{self.port}"
+            ),
+            fullpath=(
+                URLBase.quote(self.fullpath, safe="/")
+                if self.fullpath
+                else "/"
+            ),
+            params=("?" + URLBase.urlencode(params) if params else ""),
         )
 
     def url_id(self, lazy=True, hash_engine=hashlib.sha256):
-        """
-        Returns a unique URL identifier that representing the Apprise URL
-        itself. The url_id is always a hash string or None if it can't
-        be generated.
+        """Returns a unique URL identifier that representing the Apprise URL
+        itself. The url_id is always a hash string or None if it can't be
+        generated.
 
         The idea is to only build the ID based on the credentials or specific
         elements relative to the URL itself. The URL ID should never factor in
@@ -385,18 +387,21 @@ def url_id(self, lazy=True, hash_engine=hashlib.sha256):
         Hence the following would all return the same URL Identifier:
              json://abc/def/ghi?image=no
              json://abc/def/ghi/?test=yes&image=yes
-
         """
 
         if lazy and self.__cached_url_identifier is not False:
-            return self.__cached_url_identifier \
-                if not (self.__cached_url_identifier
-                        and self.asset.storage_idlen) \
-                else self.__cached_url_identifier[:self.asset.storage_idlen]
+            return (
+                self.__cached_url_identifier
+                if not (
+                    self.__cached_url_identifier and self.asset.storage_idlen
+                )
+                else self.__cached_url_identifier[: self.asset.storage_idlen]
+            )
 
         # Python v3.9 introduces usedforsecurity argument
-        kwargs = {'usedforsecurity': False} \
-            if sys.version_info >= (3, 9) else {}
+        kwargs = (
+            {"usedforsecurity": False} if sys.version_info >= (3, 9) else {}
+        )
 
         if self.url_identifier is False:
             # Disabled
@@ -406,71 +411,98 @@ def url_id(self, lazy=True, hash_engine=hashlib.sha256):
 
             # Prepare our object
             engine = hash_engine(
-                self.asset.storage_salt + self.schema.encode(
-                    self.asset.encoding), **kwargs)
+                self.asset.storage_salt
+                + self.schema.encode(self.asset.encoding),
+                **kwargs,
+            )
 
             # We want to treat `None` differently then a blank entry
             engine.update(
-                b'\0' if self.password is None
-                else self.password.encode(self.asset.encoding))
+                b"\0"
+                if self.password is None
+                else self.password.encode(self.asset.encoding)
+            )
             engine.update(
-                b'\0' if self.user is None
-                else self.user.encode(self.asset.encoding))
+                b"\0"
+                if self.user is None
+                else self.user.encode(self.asset.encoding)
+            )
             engine.update(
-                b'\0' if not self.host
-                else self.host.encode(self.asset.encoding))
+                b"\0"
+                if not self.host
+                else self.host.encode(self.asset.encoding)
+            )
             engine.update(
-                b'\0' if self.port is None
-                else f'{self.port}'.encode(self.asset.encoding))
+                b"\0"
+                if self.port is None
+                else f"{self.port}".encode(self.asset.encoding)
+            )
             engine.update(
-                self.fullpath.rstrip('/').encode(self.asset.encoding))
-            engine.update(b's' if self.secure else b'i')
+                self.fullpath.rstrip("/").encode(self.asset.encoding)
+            )
+            engine.update(b"s" if self.secure else b"i")
 
             # Save our generated content
             self.__cached_url_identifier = engine.hexdigest()
 
         elif isinstance(self.url_identifier, str):
             self.__cached_url_identifier = hash_engine(
-                self.asset.storage_salt + self.url_identifier.encode(
-                    self.asset.encoding), **kwargs).hexdigest()
+                self.asset.storage_salt
+                + self.url_identifier.encode(self.asset.encoding),
+                **kwargs,
+            ).hexdigest()
 
         elif isinstance(self.url_identifier, bytes):
             self.__cached_url_identifier = hash_engine(
-                self.asset.storage_salt + self.url_identifier,
-                **kwargs).hexdigest()
+                self.asset.storage_salt + self.url_identifier, **kwargs
+            ).hexdigest()
 
         elif isinstance(self.url_identifier, (list, tuple, set)):
             self.__cached_url_identifier = hash_engine(
-                self.asset.storage_salt + b''.join([
-                    (x if isinstance(x, bytes)
-                     else str(x).encode(self.asset.encoding))
-                    for x in self.url_identifier]), **kwargs).hexdigest()
+                self.asset.storage_salt
+                + b"".join([
+                    (
+                        x
+                        if isinstance(x, bytes)
+                        else str(x).encode(self.asset.encoding)
+                    )
+                    for x in self.url_identifier
+                ]),
+                **kwargs,
+            ).hexdigest()
 
         elif isinstance(self.url_identifier, dict):
             self.__cached_url_identifier = hash_engine(
-                self.asset.storage_salt + b''.join([
-                    (x if isinstance(x, bytes)
-                     else str(x).encode(self.asset.encoding))
-                    for x in self.url_identifier.values()]),
-                **kwargs).hexdigest()
+                self.asset.storage_salt
+                + b"".join([
+                    (
+                        x
+                        if isinstance(x, bytes)
+                        else str(x).encode(self.asset.encoding)
+                    )
+                    for x in self.url_identifier.values()
+                ]),
+                **kwargs,
+            ).hexdigest()
 
         else:
             self.__cached_url_identifier = hash_engine(
-                self.asset.storage_salt + str(
-                    self.url_identifier).encode(self.asset.encoding),
-                **kwargs).hexdigest()
-
-        return self.__cached_url_identifier \
-            if not (self.__cached_url_identifier
-                    and self.asset.storage_idlen) \
-            else self.__cached_url_identifier[:self.asset.storage_idlen]
+                self.asset.storage_salt
+                + str(self.url_identifier).encode(self.asset.encoding),
+                **kwargs,
+            ).hexdigest()
+
+        return (
+            self.__cached_url_identifier
+            if not (self.__cached_url_identifier and self.asset.storage_idlen)
+            else self.__cached_url_identifier[: self.asset.storage_idlen]
+        )
 
     def __contains__(self, tags):
-        """
-        Returns true if the tag specified is associated with this notification.
+        """Returns true if the tag specified is associated with this
+        notification.
 
         tag can also be a tuple, set, and/or list
-
         """
         if isinstance(tags, (tuple, set, list)):
             return bool(set(tags) & self.tags)
@@ -479,16 +511,13 @@ def __contains__(self, tags):
         return tags in self.tags
 
     def __str__(self):
-        """
-        Returns the url path
-        """
+        """Returns the url path."""
         return self.url(privacy=True)
 
     @staticmethod
     def escape_html(html, convert_new_lines=False, whitespace=True):
-        """
-        Takes html text as input and escapes it so that it won't
-        conflict with any xml/html wrapping characters.
+        """Takes html text as input and escapes it so that it won't conflict
+        with any xml/html wrapping characters.
 
         Args:
             html (str): The HTML code to escape
@@ -499,28 +528,25 @@ def escape_html(html, convert_new_lines=False, whitespace=True):
             str: The escaped html
         """
         if not isinstance(html, str) or not html:
-            return ''
+            return ""
 
         # Escape HTML
-        escaped = sax_escape(html, {"'": "&apos;", "\"": "&quot;"})
+        escaped = sax_escape(html, {"'": "&apos;", '"': "&quot;"})
 
         if whitespace:
             # Tidy up whitespace too
-            escaped = escaped\
-                .replace(u'\t', u'&emsp;')\
-                .replace(u' ', u'&nbsp;')
+            escaped = escaped.replace("\t", "&emsp;").replace(" ", "&nbsp;")
 
         if convert_new_lines:
-            return escaped.replace(u'\n', u'<br/>')
+            return escaped.replace("\n", "<br/>")
 
         return escaped
 
     @staticmethod
-    def unquote(content, encoding='utf-8', errors='replace'):
-        """
-        Replace %xx escapes by their single-character equivalent. The optional
-        encoding and errors parameters specify how to decode percent-encoded
-        sequences.
+    def unquote(content, encoding="utf-8", errors="replace"):
+        """Replace %xx escapes by their single-character equivalent. The
+        optional encoding and errors parameters specify how to decode percent-
+        encoded sequences.
 
         Wrapper to Python's `unquote` while remaining compatible with both
         Python 2 & 3 since the reference to this function changed between
@@ -539,14 +565,14 @@ def unquote(content, encoding='utf-8', errors='replace'):
             str: The unquoted URI string
         """
         if not content:
-            return ''
+            return ""
 
         return _unquote(content, encoding=encoding, errors=errors)
 
     @staticmethod
-    def quote(content, safe='/', encoding=None, errors=None):
-        """ Replaces single character non-ascii characters and URI specific
-        ones by their %xx code.
+    def quote(content, safe="/", encoding=None, errors=None):
+        """Replaces single character non-ascii characters and URI specific ones
+        by their %xx code.
 
         Wrapper to Python's `quote` while remaining compatible with both
         Python 2 & 3 since the reference to this function changed between
@@ -566,17 +592,23 @@ def quote(content, safe='/', encoding=None, errors=None):
             str: The quoted URI string
         """
         if not content:
-            return ''
+            return ""
 
         return _quote(content, safe=safe, encoding=encoding, errors=errors)
 
     @staticmethod
-    def pprint(content, privacy=True, mode=PrivacyMode.Outer,
-               # privacy print; quoting is ignored when privacy is set to True
-               quote=True, safe='/', encoding=None, errors=None):
-        """
-        Privacy Print is used to mainpulate the string before passing it into
-        part of the URL.  It is used to mask/hide private details such as
+    def pprint(
+        content,
+        privacy=True,
+        mode=PrivacyMode.Outer,
+        # privacy print; quoting is ignored when privacy is set to True
+        quote=True,
+        safe="/",
+        encoding=None,
+        errors=None,
+    ):
+        """Privacy Print is used to mainpulate the string before passing it
+        into part of the URL.  It is used to mask/hide private details such as
         tokens, passwords, apikeys, etc from on-lookers.  If the privacy=False
         is set, then the quote variable is the next flag checked.
 
@@ -588,29 +620,30 @@ def pprint(content, privacy=True, mode=PrivacyMode.Outer,
             if quote:
                 # Return quoted string if specified to do so
                 return URLBase.quote(
-                    content, safe=safe, encoding=encoding, errors=errors)
+                    content, safe=safe, encoding=encoding, errors=errors
+                )
 
                 # Return content 'as-is'
             return content
 
         if mode is PrivacyMode.Secret:
             # Return 4 Asterisks
-            return '****'
+            return "****"
 
         if not isinstance(content, str) or not content:
             # Nothing more to do
-            return ''
+            return ""
 
         if mode is PrivacyMode.Tail:
             # Return the trailing 4 characters
-            return '...{}'.format(content[-4:])
+            return f"...{content[-4:]}"
 
         # Default mode is Outer Mode
-        return '{}...{}'.format(content[0:1], content[-1:])
+        return f"{content[0:1]}...{content[-1:]}"
 
     @staticmethod
-    def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
-        """Convert a mapping object or a sequence of two-element tuples
+    def urlencode(query, doseq=False, safe="", encoding=None, errors=None):
+        """Convert a mapping object or a sequence of two-element tuples.
 
         Wrapper to Python's `urlencode` while remaining compatible with both
         Python 2 & 3 since the reference to this function changed between
@@ -638,7 +671,8 @@ def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
             str: The escaped parameters returned as a string
         """
         return urlencode(
-            query, doseq=doseq, safe=safe, encoding=encoding, errors=errors)
+            query, doseq=doseq, safe=safe, encoding=encoding, errors=errors
+        )
 
     @staticmethod
     def split_path(path, unquote=True):
@@ -656,10 +690,9 @@ def split_path(path, unquote=True):
         """
 
         try:
-            paths = PATHSPLIT_LIST_DELIM.split(path.lstrip('/'))
+            paths = PATHSPLIT_LIST_DELIM.split(path.lstrip("/"))
             if unquote:
-                paths = \
-                    [URLBase.unquote(x) for x in filter(bool, paths)]
+                paths = [URLBase.unquote(x) for x in filter(bool, paths)]
 
         except AttributeError:
             # path is not useable, we still want to gracefully return an
@@ -670,7 +703,7 @@ def split_path(path, unquote=True):
 
     @staticmethod
     def parse_list(content, allow_whitespace=True, unquote=True):
-        """A wrapper to utils.parse_list() with unquoting support
+        """A wrapper to utils.parse_list() with unquoting support.
 
         Parses a specified set of data and breaks it into a list.
 
@@ -690,14 +723,13 @@ def parse_list(content, allow_whitespace=True, unquote=True):
 
         content = parse_list(content, allow_whitespace=allow_whitespace)
         if unquote:
-            content = \
-                [URLBase.unquote(x) for x in filter(bool, content)]
+            content = [URLBase.unquote(x) for x in filter(bool, content)]
 
         return content
 
     @staticmethod
     def parse_phone_no(content, unquote=True, prefix=False):
-        """A wrapper to utils.parse_phone_no() with unquoting support
+        """A wrapper to utils.parse_phone_no() with unquoting support.
 
         Parses a specified set of data and breaks it into a list.
 
@@ -725,58 +757,52 @@ def parse_phone_no(content, unquote=True, prefix=False):
 
     @property
     def app_id(self):
-        return self.asset.app_id if self.asset.app_id else ''
+        return self.asset.app_id if self.asset.app_id else ""
 
     @property
     def app_desc(self):
-        return self.asset.app_desc if self.asset.app_desc else ''
+        return self.asset.app_desc if self.asset.app_desc else ""
 
     @property
     def app_url(self):
-        return self.asset.app_url if self.asset.app_url else ''
+        return self.asset.app_url if self.asset.app_url else ""
 
     @property
     def request_timeout(self):
         """This is primarily used to fullfill the `timeout` keyword argument
-        that is used by requests.get() and requests.put() calls.
-        """
+        that is used by requests.get() and requests.put() calls."""
         return (self.socket_connect_timeout, self.socket_read_timeout)
 
     @property
     def request_auth(self):
-        """This is primarily used to fullfill the `auth` keyword argument
-        that is used by requests.get() and requests.put() calls.
-        """
+        """This is primarily used to fullfill the `auth` keyword argument that
+        is used by requests.get() and requests.put() calls."""
         return (self.user, self.password) if self.user else None
 
     @property
     def request_url(self):
-        """
-        Assemble a simple URL that can be used by the requests library
-
-        """
+        """Assemble a simple URL that can be used by the requests library."""
 
         # Acquire our schema
-        schema = 'https' if self.secure else 'http'
+        schema = "https" if self.secure else "http"
 
         # Prepare our URL
-        url = '%s://%s' % (schema, self.host)
+        url = f"{schema}://{self.host}"
 
         # Apply Port information if present
         if isinstance(self.port, int):
-            url += ':%d' % self.port
+            url += f":{self.port}"
 
         # Append our full path
         return url + self.fullpath
 
     def url_parameters(self, *args, **kwargs):
-        """
-        Provides a default set of args to work with. This can greatly
+        """Provides a default set of args to work with. This can greatly
         simplify URL construction in the acommpanied url() function.
 
-        The following property returns a dictionary (of strings) containing
-        all of the parameters that can be set on a URL and managed through
-        this class.
+        The following property returns a dictionary (of strings) containing all
+        of the parameters that can be set on a URL and managed through this
+        class.
         """
 
         # parameters are only provided on demand to keep the URL short
@@ -784,94 +810,97 @@ def url_parameters(self, *args, **kwargs):
 
         # The socket read timeout
         if self.socket_read_timeout != URLBase.socket_read_timeout:
-            params['rto'] = str(self.socket_read_timeout)
+            params["rto"] = str(self.socket_read_timeout)
 
         # The request/socket connect timeout
         if self.socket_connect_timeout != URLBase.socket_connect_timeout:
-            params['cto'] = str(self.socket_connect_timeout)
+            params["cto"] = str(self.socket_connect_timeout)
 
         # Certificate verification
         if self.verify_certificate != URLBase.verify_certificate:
-            params['verify'] = 'yes' if self.verify_certificate else 'no'
+            params["verify"] = "yes" if self.verify_certificate else "no"
 
         return params
 
     @staticmethod
     def post_process_parse_url_results(results):
-        """
-        After parsing the URL, this function applies a bit of extra logic to
-        support extra entries like `pass` becoming `password`, etc
+        """After parsing the URL, this function applies a bit of extra logic to
+        support extra entries like `pass` becoming `password`, etc.
 
-        This function assumes that parse_url() was called previously setting
-        up the basics to be checked
+        This function assumes that parse_url() was called previously setting up
+        the basics to be checked
         """
 
         # if our URL ends with an 's', then assume our secure flag is set.
-        results['secure'] = (results['schema'][-1] == 's')
+        results["secure"] = results["schema"][-1] == "s"
 
         # QSD Checking (over-rides all)
-        qsd_exists = True if isinstance(results.get('qsd'), dict) else False
+        qsd_exists = bool(isinstance(results.get("qsd"), dict))
 
-        if qsd_exists and 'verify' in results['qsd']:
+        if qsd_exists and "verify" in results["qsd"]:
             # Pulled from URL String
-            results['verify'] = parse_bool(
-                results['qsd'].get('verify', True))
+            results["verify"] = parse_bool(results["qsd"].get("verify", True))
 
-        elif 'verify' in results:
+        elif "verify" in results:
             # Pulled from YAML Configuratoin
-            results['verify'] = parse_bool(results.get('verify', True))
+            results["verify"] = parse_bool(results.get("verify", True))
 
         else:
             # Support SSL Certificate 'verify' keyword. Default to being
             # enabled
-            results['verify'] = True
+            results["verify"] = True
 
         # Password overrides
-        if 'pass' in results:
-            results['password'] = results['pass']
-            del results['pass']
+        if "pass" in results:
+            results["password"] = results["pass"]
+            del results["pass"]
 
         if qsd_exists:
-            if 'password' in results['qsd']:
-                results['password'] = results['qsd']['password']
-            if 'pass' in results['qsd']:
-                results['password'] = results['qsd']['pass']
+            if "password" in results["qsd"]:
+                results["password"] = results["qsd"]["password"]
+            if "pass" in results["qsd"]:
+                results["password"] = results["qsd"]["pass"]
 
             # User overrides
-            if 'user' in results['qsd']:
-                results['user'] = results['qsd']['user']
+            if "user" in results["qsd"]:
+                results["user"] = results["qsd"]["user"]
 
             # parse_url() always creates a 'password' and 'user' entry in the
             # results returned.  Entries are set to None if they weren't
             # specified
-            if results['password'] is None and 'user' in results['qsd']:
+            if results["password"] is None and "user" in results["qsd"]:
                 # Handle cases where the user= provided in 2 locations, we want
                 # the original to fall back as a being a password (if one
                 # wasn't otherwise defined) e.g.
                 #    mailtos://PASSWORD@hostname?user=admin@mail-domain.com
                 # - in the above, the PASSWORD gets lost in the parse url()
                 #   since a user= over-ride is specified.
-                presults = parse_url(results['url'])
+                presults = parse_url(results["url"])
                 if presults:
                     # Store our Password
-                    results['password'] = presults['user']
+                    results["password"] = presults["user"]
 
             # Store our socket read timeout if specified
-            if 'rto' in results['qsd']:
-                results['rto'] = results['qsd']['rto']
+            if "rto" in results["qsd"]:
+                results["rto"] = results["qsd"]["rto"]
 
             # Store our socket connect timeout if specified
-            if 'cto' in results['qsd']:
-                results['cto'] = results['qsd']['cto']
+            if "cto" in results["qsd"]:
+                results["cto"] = results["qsd"]["cto"]
 
-            if 'port' in results['qsd']:
-                results['port'] = results['qsd']['port']
+            if "port" in results["qsd"]:
+                results["port"] = results["qsd"]["port"]
 
         return results
 
     @staticmethod
-    def parse_url(url, verify_host=True, plus_to_space=False,
-                  strict_port=False, sanitize=True):
+    def parse_url(
+        url,
+        verify_host=True,
+        plus_to_space=False,
+        strict_port=False,
+        sanitize=True,
+    ):
         """Parses the URL and returns it broken apart into a dictionary.
 
         This is very specific and customized for Apprise.
@@ -891,9 +920,13 @@ def parse_url(url, verify_host=True, plus_to_space=False,
         """
 
         results = parse_url(
-            url, default_schema='unknown', verify_host=verify_host,
-            plus_to_space=plus_to_space, strict_port=strict_port,
-            sanitize=sanitize)
+            url,
+            default_schema="unknown",
+            verify_host=verify_host,
+            plus_to_space=plus_to_space,
+            strict_port=strict_port,
+            sanitize=sanitize,
+        )
 
         if not results:
             # We're done; we failed to parse our url
@@ -903,8 +936,8 @@ def parse_url(url, verify_host=True, plus_to_space=False,
 
     @staticmethod
     def http_response_code_lookup(code, response_mask=None):
-        """Parses the interger response code returned by a remote call from
-        a web request into it's human readable string version.
+        """Parses the interger response code returned by a remote call from a
+        web request into it's human readable string version.
 
         You can over-ride codes or add new ones by providing your own
         response_mask that contains a dictionary of integer -> string mapped
@@ -919,13 +952,12 @@ def http_response_code_lookup(code, response_mask=None):
             response = HTML_LOOKUP[code]
 
         except KeyError:
-            response = ''
+            response = ""
 
         return response
 
     def __len__(self):
-        """
-        Should be over-ridden and allows the tracking of how many targets
+        """Should be over-ridden and allows the tracking of how many targets
         are associated with each URLBase object.
 
         Default is always 1
@@ -933,14 +965,12 @@ def __len__(self):
         return 1
 
     def schemas(self):
-        """A simple function that returns a set of all schemas associated
-        with this object based on the object.protocol and
-        object.secure_protocol
-        """
+        """A simple function that returns a set of all schemas associated with
+        this object based on the object.protocol and object.secure_protocol."""
 
-        schemas = set([])
+        schemas = set()
 
-        for key in ('protocol', 'secure_protocol'):
+        for key in ("protocol", "secure_protocol"):
             schema = getattr(self, key, None)
             if isinstance(schema, str):
                 schemas.add(schema)
diff --git a/libs/apprise/url.pyi b/libs/apprise/url.pyi
deleted file mode 100644
index 915885745f..0000000000
--- a/libs/apprise/url.pyi
+++ /dev/null
@@ -1,16 +0,0 @@
-from logging import logger
-from typing import Any, Iterable, Set, Optional
-
-class URLBase:
-    service_name: Optional[str]
-    protocol: Optional[str]
-    secure_protocol: Optional[str]
-    request_rate_per_sec: int
-    socket_connect_timeout: float
-    socket_read_timeout: float
-    tags: Set[str]
-    verify_certificate: bool
-    logger: logger
-    def url(self, privacy: bool = ..., *args: Any, **kwargs: Any) -> str: ...
-    def __contains__(self, tags: Iterable[str]) -> bool: ...
-    def __str__(self) -> str: ...
\ No newline at end of file
diff --git a/libs/apprise/utils/__init__.py b/libs/apprise/utils/__init__.py
index f176cbccc4..5247b2439c 100644
--- a/libs/apprise/utils/__init__.py
+++ b/libs/apprise/utils/__init__.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
diff --git a/libs/apprise/utils/base64.py b/libs/apprise/utils/base64.py
index e5a8a568a5..98141fa067 100644
--- a/libs/apprise/utils/base64.py
+++ b/libs/apprise/utils/base64.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,16 +24,37 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+import base64
+import binascii
 import copy
 import json
-import binascii
-import typing
-import base64
+
+
+def base64_urlencode(data: bytes) -> str:
+    """URL Safe Base64 Encoding."""
+    try:
+        return base64.urlsafe_b64encode(data).rstrip(b"=").decode("utf-8")
+
+    except TypeError:
+        # data is not supported; avoid raising exception
+        return None
+
+
+def base64_urldecode(data: str) -> bytes:
+    """URL Safe Base64 Encoding."""
+
+    try:
+        # Normalize base64url string (remove padding, add it back)
+        padding = "=" * (-len(data) % 4)
+        return base64.urlsafe_b64decode(data + padding)
+
+    except TypeError:
+        # data is not supported; avoid raising exception
+        return None
 
 
 def decode_b64_dict(di: dict) -> dict:
-    """
-    decodes base64 dictionary previously encoded
+    """Decodes base64 dictionary previously encoded.
 
     string entries prefixed with `b64:` are targeted
     """
@@ -47,8 +67,12 @@ def decode_b64_dict(di: dict) -> dict:
             parsed_v = base64.b64decode(v[4:])
             parsed_v = json.loads(parsed_v)
 
-        except (ValueError, TypeError, binascii.Error,
-                json.decoder.JSONDecodeError):
+        except (
+            ValueError,
+            TypeError,
+            binascii.Error,
+            json.decoder.JSONDecodeError,
+        ):
             # ValueError: the length of altchars is not 2.
             # TypeError: invalid input
             # binascii.Error: not base64 (bad padding)
@@ -59,9 +83,9 @@ def decode_b64_dict(di: dict) -> dict:
     return di
 
 
-def encode_b64_dict(di: dict, encoding='utf-8') -> typing.Tuple[dict, bool]:
-    """
-    Encodes dictionary entries containing binary types (int, float) into base64
+def encode_b64_dict(di: dict, encoding="utf-8") -> tuple[dict, bool]:
+    """Encodes dictionary entries containing binary types (int, float) into
+    base64.
 
     Final product is always string based values
     """
@@ -73,7 +97,7 @@ def encode_b64_dict(di: dict, encoding='utf-8') -> typing.Tuple[dict, bool]:
 
         try:
             encoded = base64.urlsafe_b64encode(json.dumps(v).encode(encoding))
-            encoded = "b64:{}".format(encoded.decode(encoding))
+            encoded = f"b64:{encoded.decode(encoding)}"
             needs_decoding = True
 
         except (ValueError, TypeError):
diff --git a/libs/apprise/utils/cwe312.py b/libs/apprise/utils/cwe312.py
index 25eb4b1b07..f65cd6d9e9 100644
--- a/libs/apprise/utils/cwe312.py
+++ b/libs/apprise/utils/cwe312.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,15 +25,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 import re
-from .parse import (parse_url, is_hostname)
+
+from .parse import is_hostname, parse_url
 
 
 def cwe312_word(word, force=False, advanced=True, threshold=5):
-    """
-    This function was written to help mask secure/private information that may
-    or may not be found within Apprise. The idea is to provide a presentable
-    word response that the user who prepared it would understand, yet not
-    reveal any private information for any potential intruder
+    """This function was written to help mask secure/private information that
+    may or may not be found within Apprise. The idea is to provide a
+    presentable word response that the user who prepared it would understand,
+    yet not reveal any private information for any potential intruder.
 
     For more detail see CWE-312 @
        https://cwe.mitre.org/data/definitions/312.html
@@ -49,17 +48,16 @@ def cwe312_word(word, force=False, advanced=True, threshold=5):
     """
 
     class Variance:
-        """
-        A Simple List of Possible Character Variances
-        """
+        """A Simple List of Possible Character Variances."""
+
         # An Upper Case Character (ABCDEF... etc)
-        ALPHA_UPPER = '+'
+        ALPHA_UPPER = "+"
         # An Lower Case Character (abcdef... etc)
-        ALPHA_LOWER = '-'
+        ALPHA_LOWER = "-"
         # A Special Character ($%^;... etc)
-        SPECIAL = 's'
+        SPECIAL = "s"
         # A Numerical Character (1234... etc)
-        NUMERIC = 'n'
+        NUMERIC = "n"
 
     if not (isinstance(word, str) and word.strip()):
         # not a password if it's not something we even support
@@ -70,18 +68,19 @@ class Variance:
     if force:
         # We're forcing the representation to be a secret
         # We do this for consistency
-        return '{}...{}'.format(word[0:1], word[-1:])
+        return f"{word[0:1]}...{word[-1:]}"
 
-    elif len(word) > 1 and \
-            not is_hostname(word, ipv4=True, ipv6=True, underscore=False):
+    elif len(word) > 1 and not is_hostname(
+        word, ipv4=True, ipv6=True, underscore=False
+    ):
         # Verify if it is a hostname or not
-        return '{}...{}'.format(word[0:1], word[-1:])
+        return f"{word[0:1]}...{word[-1:]}"
 
     elif len(word) >= 16:
         # an IP will be 15 characters so we don't want to use a smaller
         # value then 16 (e.g 101.102.103.104)
         # we can assume very long words are passwords otherwise
-        return '{}...{}'.format(word[0:1], word[-1:])
+        return f"{word[0:1]}...{word[-1:]}"
 
     if advanced:
         #
@@ -107,7 +106,7 @@ class Variance:
                 obscurity += 1
 
                 if obscurity >= threshold:
-                    return '{}...{}'.format(word[0:1], word[-1:])
+                    return f"{word[0:1]}...{word[-1:]}"
 
             last_variance = variance
 
@@ -116,19 +115,18 @@ class Variance:
 
 
 def cwe312_url(url):
-    """
-    This function was written to help mask secure/private information that may
-    or may not be found on an Apprise URL. The idea is to not disrupt the
-    structure of the previous URL too much, yet still protect the users
-    private information from being logged directly to screen.
+    """This function was written to help mask secure/private information that
+    may or may not be found on an Apprise URL. The idea is to not disrupt the
+    structure of the previous URL too much, yet still protect the users private
+    information from being logged directly to screen.
 
     For more detail see CWE-312 @
-       https://cwe.mitre.org/data/definitions/312.html
+    https://cwe.mitre.org/data/definitions/312.html
 
     For example, consider the URL: http://user:password@localhost/
 
     When passed into this function, the return value would be:
-      http://user:****@localhost/
+    http://user:****@localhost/
 
     Since apprise allows you to put private information everywhere in it's
     custom URLs, it uses this function to manipulate the content before
@@ -145,53 +143,75 @@ def cwe312_url(url):
         return url
 
     # Update our URL with values
-    results['password'] = cwe312_word(results['password'], force=True)
-    if not results['schema'].startswith('http'):
-        results['user'] = cwe312_word(results['user'])
-        results['host'] = cwe312_word(results['host'])
+    results["password"] = cwe312_word(results["password"], force=True)
+    if not results["schema"].startswith("http"):
+        results["user"] = cwe312_word(results["user"])
+        results["host"] = cwe312_word(results["host"])
 
     else:
-        results['host'] = cwe312_word(results['host'], advanced=False)
-        results['user'] = cwe312_word(results['user'], advanced=False)
+        results["host"] = cwe312_word(results["host"], advanced=False)
+        results["user"] = cwe312_word(results["user"], advanced=False)
 
     # Apply our full path scan in all cases
-    results['fullpath'] = '/' + \
-        '/'.join([cwe312_word(x)
-                 for x in re.split(
-                     r'[\\/]+',
-                     results['fullpath'].lstrip('/'))]) \
-        if results['fullpath'] else ''
+    results["fullpath"] = (
+        "/"
+        + "/".join([
+            cwe312_word(x)
+            for x in re.split(r"[\\/]+", results["fullpath"].lstrip("/"))
+        ])
+        if results["fullpath"]
+        else ""
+    )
 
     #
     # Now re-assemble our URL for display purposes
     #
 
     # Determine Authentication
-    auth = ''
-    if results['user'] and results['password']:
-        auth = '{user}:{password}@'.format(
-            user=results['user'],
-            password=results['password'],
+    auth = ""
+    if results["user"] and results["password"]:
+        auth = "{user}:{password}@".format(
+            user=results["user"],
+            password=results["password"],
         )
-    elif results['user']:
-        auth = '{user}@'.format(
-            user=results['user'],
+    elif results["user"]:
+        auth = "{user}@".format(
+            user=results["user"],
         )
 
-    params = ''
-    if results['qsd']:
-        params = '?{}'.format(
-            "&".join(["{}={}".format(k, cwe312_word(v, force=(
-                k in ('password', 'secret', 'pass', 'token', 'key',
-                      'id', 'apikey', 'to'))))
-                      for k, v in results['qsd'].items()]))
+    params = ""
+    if results["qsd"]:
+        params = "?{}".format(
+            "&".join([
+                "{}={}".format(
+                    k,
+                    cwe312_word(
+                        v,
+                        force=(
+                            k
+                            in (
+                                "password",
+                                "secret",
+                                "pass",
+                                "token",
+                                "key",
+                                "id",
+                                "apikey",
+                                "to",
+                            )
+                        ),
+                    ),
+                )
+                for k, v in results["qsd"].items()
+            ])
+        )
 
-    return '{schema}://{auth}{hostname}{port}{fullpath}{params}'.format(
-        schema=results['schema'],
+    return "{schema}://{auth}{hostname}{port}{fullpath}{params}".format(
+        schema=results["schema"],
         auth=auth,
         # never encode hostname since we're expecting it to be a valid one
-        hostname=results['host'],
-        port='' if not results['port'] else ':{}'.format(results['port']),
-        fullpath=results['fullpath'] if results['fullpath'] else '',
+        hostname=results["host"],
+        port="" if not results["port"] else ":{}".format(results["port"]),
+        fullpath=results["fullpath"] if results["fullpath"] else "",
         params=params,
     )
diff --git a/libs/apprise/utils/disk.py b/libs/apprise/utils/disk.py
index fd88558112..61da7d4736 100644
--- a/libs/apprise/utils/disk.py
+++ b/libs/apprise/utils/disk.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,76 +24,64 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-import re
 import os
-import platform
 from os.path import expanduser
+import platform
+import re
+
 from ..logger import logger
 
 # Pre-Escape content since we reference it so much
-ESCAPED_PATH_SEPARATOR = re.escape('\\/')
-ESCAPED_WIN_PATH_SEPARATOR = re.escape('\\')
-ESCAPED_NUX_PATH_SEPARATOR = re.escape('/')
+ESCAPED_PATH_SEPARATOR = re.escape("\\/")
+ESCAPED_WIN_PATH_SEPARATOR = re.escape("\\")
+ESCAPED_NUX_PATH_SEPARATOR = re.escape("/")
 
 TIDY_WIN_PATH_RE = re.compile(
-    r'(^[%s]{2}|[^%s\s][%s]|[\s][%s]{2}])([%s]+)' % (
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-    ),
+    rf"(^[{ESCAPED_WIN_PATH_SEPARATOR}]{{2}}|[^{ESCAPED_WIN_PATH_SEPARATOR}\s][{ESCAPED_WIN_PATH_SEPARATOR}]|[\s][{ESCAPED_WIN_PATH_SEPARATOR}]{{2}}])([{ESCAPED_WIN_PATH_SEPARATOR}]+)",
 )
 TIDY_WIN_TRIM_RE = re.compile(
-    r'^(.+[^:][^%s])[\s%s]*$' % (
-        ESCAPED_WIN_PATH_SEPARATOR,
-        ESCAPED_WIN_PATH_SEPARATOR,
-    ),
+    rf"^(.+[^:][^{ESCAPED_WIN_PATH_SEPARATOR}])[\s{ESCAPED_WIN_PATH_SEPARATOR}]*$",
 )
 
 TIDY_NUX_PATH_RE = re.compile(
-    r'([%s])([%s]+)' % (
-        ESCAPED_NUX_PATH_SEPARATOR,
-        ESCAPED_NUX_PATH_SEPARATOR,
-    ),
+    rf"([{ESCAPED_NUX_PATH_SEPARATOR}])([{ESCAPED_NUX_PATH_SEPARATOR}]+)",
 )
 
 # A simple path decoder we can re-use which looks after
 # ensuring our file info is expanded correctly when provided
 # a path.
-__PATH_DECODER = os.path.expandvars if \
-    platform.system() == 'Windows' else os.path.expanduser
+__PATH_DECODER = (
+    os.path.expandvars
+    if platform.system() == "Windows"
+    else os.path.expanduser
+)
 
 
 def path_decode(path):
-    """
-    Returns the fully decoded path based on the operating system
-    """
+    """Returns the fully decoded path based on the operating system."""
     return os.path.abspath(__PATH_DECODER(path))
 
 
 def tidy_path(path):
-    """take a filename and or directory and attempts to tidy it up by removing
+    """Take a filename and or directory and attempts to tidy it up by removing
     trailing slashes and correcting any formatting issues.
 
     For example: ////absolute//path// becomes:
         /absolute/path
-
     """
     # Windows
-    path = TIDY_WIN_PATH_RE.sub('\\1', path.strip())
+    path = TIDY_WIN_PATH_RE.sub("\\1", path.strip())
     # Linux
-    path = TIDY_NUX_PATH_RE.sub('\\1', path)
+    path = TIDY_NUX_PATH_RE.sub("\\1", path)
 
     # Windows Based (final) Trim
-    path = expanduser(TIDY_WIN_TRIM_RE.sub('\\1', path))
+    path = expanduser(TIDY_WIN_TRIM_RE.sub("\\1", path))
     return path
 
 
 def dir_size(path, max_depth=3, missing_okay=True, _depth=0, _errors=None):
-    """
-    Scans a provided path an returns it's size (in bytes) of path provided
-    """
+    """Scans a provided path an returns it's size (in bytes) of path
+    provided."""
 
     if _errors is None:
         _errors = set()
@@ -116,21 +103,23 @@ def dir_size(path, max_depth=3, missing_okay=True, _depth=0, _errors=None):
                             entry.path,
                             max_depth=max_depth,
                             _depth=_depth + 1,
-                            _errors=_errors)
+                            _errors=_errors,
+                        )
                         total += totals
 
                 except FileNotFoundError:
                     # no worries; Nothing to do
                     continue
 
-                except (OSError, IOError) as e:
+                except OSError as e:
                     # Permission error of some kind or disk problem...
                     # There is nothing we can do at this point
                     _errors.add(entry.path)
                     logger.warning(
-                        'dir_size detetcted inaccessible path: %s',
-                        os.fsdecode(entry.path))
-                    logger.debug('dir_size Exception: %s' % str(e))
+                        "dir_size detetcted inaccessible path: %s",
+                        os.fsdecode(entry.path),
+                    )
+                    logger.debug(f"dir_size Exception: {e!s}")
                     continue
 
     except FileNotFoundError:
@@ -138,24 +127,22 @@ def dir_size(path, max_depth=3, missing_okay=True, _depth=0, _errors=None):
             # Conditional error situation
             _errors.add(path)
 
-    except (OSError, IOError) as e:
+    except OSError as e:
         # Permission error of some kind or disk problem...
         # There is nothing we can do at this point
         _errors.add(path)
         logger.warning(
-            'dir_size detetcted inaccessible path: %s',
-            os.fsdecode(path))
-        logger.debug('dir_size Exception: %s' % str(e))
+            "dir_size detetcted inaccessible path: %s", os.fsdecode(path)
+        )
+        logger.debug(f"dir_size Exception: {e!s}")
 
     return (total, _errors)
 
 
 def bytes_to_str(value):
-    """
-    Covert an integer (in bytes) into it's string representation with
-    acompanied unit value (such as B, KB, MB, GB, TB, etc)
-    """
-    unit = 'B'
+    """Covert an integer (in bytes) into it's string representation with
+    acompanied unit value (such as B, KB, MB, GB, TB, etc)"""
+    unit = "B"
     try:
         value = float(value)
 
@@ -164,15 +151,15 @@ def bytes_to_str(value):
 
     if value >= 1024.0:
         value = value / 1024.0
-        unit = 'KB'
+        unit = "KB"
         if value >= 1024.0:
             value = value / 1024.0
-            unit = 'MB'
+            unit = "MB"
             if value >= 1024.0:
                 value = value / 1024.0
-                unit = 'GB'
+                unit = "GB"
                 if value >= 1024.0:
                     value = value / 1024.0
-                    unit = 'TB'
+                    unit = "TB"
 
-    return '%.2f%s' % (round(value, 2), unit)
+    return f"{round(value, 2):.2f}{unit}"
diff --git a/libs/apprise/utils/format.py b/libs/apprise/utils/format.py
new file mode 100644
index 0000000000..945d2ec851
--- /dev/null
+++ b/libs/apprise/utils/format.py
@@ -0,0 +1,218 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+from __future__ import annotations
+
+import re
+
+from apprise.common import NotifyFormat
+
+# Characters we can apply a new line to if found
+PUNCTUATION_CHARS = ".!?:;"
+PUNCT_SPLIT_PATTERN = re.compile(
+    f"[{re.escape(PUNCTUATION_CHARS)}][ \t\r\n\x0b\x0c]+"
+)
+
+# Support HTML entities (&...;)
+HTML_ENTITY_LOOKBACK = 16
+HTML_ENTITY_LOOKAHEAD = 16
+
+# Support Markdown constructs (e.g., links, formatting)
+# Longer lookback for links [text](url)
+MARKDOWN_CONSTRUCT_LOOKBACK = 32
+
+
+def html_adjust(
+    text: str,
+    window_start: int,
+    split_at: int,
+) -> int:
+    """
+    Adjust the split point to avoid splitting inside short HTML entities
+    such as '&nbsp;'.
+
+    If the split falls inside '&...;' within a small window around the
+    boundary, move the split back to '&' so the entire entity is kept
+    in the next chunk.
+    """
+    if split_at <= window_start or split_at > len(text):
+        return split_at
+
+    search_start = max(window_start, split_at - HTML_ENTITY_LOOKBACK)
+    search_end = split_at
+
+    amp_index = text.rfind("&", search_start, search_end)
+    if amp_index == -1:
+        return split_at
+
+    forward_end = min(len(text), split_at + HTML_ENTITY_LOOKAHEAD)
+    semi_index = text.find(";", amp_index, forward_end)
+
+    if (
+        semi_index != -1
+        and amp_index > window_start
+        and amp_index < split_at <= semi_index
+    ):
+        return amp_index
+
+    return split_at
+
+
+def markdown_adjust(
+    text: str,
+    window_start: int,
+    split_at: int,
+) -> int:
+    """
+    Adjust the split point to avoid splitting inside simple Markdown
+    link / image constructs like [Text](URL) or ![Alt](URL).
+
+    This is a best-effort heuristic and does not attempt full Markdown
+    parsing. If the boundary falls between '['/'!' and the closing ')'
+    of a nearby link/image, move the split back to that start.
+    """
+    if split_at <= window_start or split_at > len(text):
+        return split_at
+
+    search_start = max(window_start, split_at - MARKDOWN_CONSTRUCT_LOOKBACK)
+
+    # Prefer '[' as the starting marker for links/images.
+    link_start_idx = text.rfind("[", search_start, split_at)
+    if link_start_idx == -1:
+        # As a fallback, consider '!' as a possible start, e.g. '![Alt](...)'.
+        link_start_idx = text.rfind("!", search_start, split_at)
+
+    if link_start_idx == -1:
+        return split_at
+
+    # Look ahead for a closing ')' to bound the construct.
+    forward_end = min(len(text), split_at + MARKDOWN_CONSTRUCT_LOOKBACK)
+    link_end_idx = text.find(")", link_start_idx, forward_end)
+
+    if link_end_idx != -1 and link_start_idx < split_at < link_end_idx:
+        return link_start_idx
+
+    return split_at
+
+
+def smart_split(
+    text: str,
+    limit: int,
+    body_format: NotifyFormat,
+) -> list[str]:
+    """
+    Split `text` into chunks of at most `limit` characters.
+
+    Soft split priority:
+      1. Last newline before `limit` (\\n or \\r)
+      2. Last space or tab before `limit`
+      3. Last punctuation+whitespace (.,!?:; followed by space/tab/newline)
+      4. Hard split at `limit`
+
+    `body_format` controls additional safety rules:
+      - NotifyFormat.TEXT: generic splitting only
+      - NotifyFormat.HTML: avoid splitting inside '&...;' entities
+      - NotifyFormat.MARKDOWN: same as HTML, plus a best-effort check to
+        avoid splitting inside [Text](URL) / ![Alt](URL) patterns.
+    """
+
+    if not text or limit <= 0:
+        return [""]
+
+    result: list[str] = []
+    start = 0
+    length = len(text)
+
+    while start < length:   # pragma: no branch
+        remaining = length - start
+        if remaining <= limit:
+            result.append(text[start:])
+            break
+
+        window_end = min(start + limit, length)
+        #
+        # Priority 1: Search for newline
+        #
+        last_nl_idx = max(
+            text.rfind("\n", start, window_end),
+            text.rfind("\r", start, window_end),
+        )
+        split_nl = last_nl_idx + 1 if last_nl_idx != -1 else -1
+
+        #
+        # Priority 2: Search for ending Space and/or Tab
+        #
+        last_space_tab_idx = max(
+            text.rfind(" ", start, window_end),
+            text.rfind("\t", start, window_end),
+        )
+        split_space_tab = (
+            last_space_tab_idx + 1 if last_space_tab_idx != -1 else -1
+        )
+
+        #
+        # Priority 3: Last punctuation + whitespace
+        #
+        split_punct = -1
+        for match in PUNCT_SPLIT_PATTERN.finditer(text, start, window_end):
+            split_punct = match.end()
+
+        # Determine the best soft split point
+        if split_nl != -1:
+            split_at = split_nl
+
+        elif split_space_tab != -1:
+            split_at = split_space_tab
+
+        elif split_punct != -1:
+            split_at = split_punct
+
+        else:
+            #
+            # Priority 4: Hard split (old way of doing things)
+            #
+            split_at = window_end
+
+        #
+        # Conditional Content-specific adjustments
+        #
+        orig_split = split_at
+        if body_format is NotifyFormat.HTML:
+            split_at = html_adjust(text, start, split_at)
+
+        elif body_format is NotifyFormat.MARKDOWN:
+            # Markdown may also contain HTML entities.
+            split_at = html_adjust(text, start, split_at)
+            split_at = markdown_adjust(text, start, split_at)
+
+        if split_at <= start:
+            split_at = orig_split
+
+        result.append(text[start:split_at])
+        start = split_at
+
+    return result
diff --git a/libs/apprise/utils/logic.py b/libs/apprise/utils/logic.py
index 0070cd3c2a..6defcd0a4a 100644
--- a/libs/apprise/utils/logic.py
+++ b/libs/apprise/utils/logic.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,16 +25,19 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 from itertools import chain
+
 from .. import common
 from .parse import parse_list
 
 
-def is_exclusive_match(logic, data, match_all=common.MATCH_ALL_TAG,
-                       match_always=common.MATCH_ALWAYS_TAG):
-    """
-
-    The data variable should always be a set of strings that the logic can be
-    compared against. It should be a set.  If it isn't already, then it will
+def is_exclusive_match(
+    logic,
+    data,
+    match_all=common.MATCH_ALL_TAG,
+    match_always=common.MATCH_ALWAYS_TAG,
+):
+    """The data variable should always be a set of strings that the logic can
+    be compared against. It should be a set.  If it isn't already, then it will
     be converted as such. These identify the tags themselves.
 
     Our logic should be a list as well:
@@ -102,17 +104,20 @@ def is_exclusive_match(logic, data, match_all=common.MATCH_ALL_TAG,
 
 
 def dict_full_update(dict1, dict2):
-    """
-    Takes 2 dictionaries (dict1 and dict2) that contain sub-dictionaries and
+    """Takes 2 dictionaries (dict1 and dict2) that contain sub-dictionaries and
     gracefully merges them into dict1.
 
     This is similar to: dict1.update(dict2) except that internal dictionaries
     are also recursively applied.
     """
+
     def _merge(dict1, dict2):
         for k in dict2:
-            if k in dict1 and isinstance(dict1[k], dict) \
-                    and isinstance(dict2[k], dict):
+            if (
+                k in dict1
+                and isinstance(dict1[k], dict)
+                and isinstance(dict2[k], dict)
+            ):
                 _merge(dict1[k], dict2[k])
             else:
                 dict1[k] = dict2[k]
diff --git a/libs/apprise/utils/module.py b/libs/apprise/utils/module.py
index a09756becc..cb54914298 100644
--- a/libs/apprise/utils/module.py
+++ b/libs/apprise/utils/module.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,15 +24,15 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-import sys
+import contextlib
 import importlib.util
+import sys
+
 from ..logger import logger
 
 
 def import_module(path, name):
-    """
-    Load our module based on path
-    """
+    """Load our module based on path."""
     spec = importlib.util.spec_from_file_location(name, path)
     try:
         module = importlib.util.module_from_spec(spec)
@@ -43,17 +42,13 @@ def import_module(path, name):
 
     except Exception as e:
         # module isn't loadable
-        try:
+        with contextlib.suppress(KeyError):
             del sys.modules[name]
 
-        except KeyError:
-            # nothing to clean up
-            pass
-
         module = None
 
         logger.debug(
-            'Module exception raised from %s (name=%s) %s',
-            path, name, str(e))
+            "Module exception raised from %s (name=%s) %s", path, name, str(e)
+        )
 
     return module
diff --git a/libs/apprise/utils/parse.py b/libs/apprise/utils/parse.py
index c1e612d66e..2dd6304d65 100644
--- a/libs/apprise/utils/parse.py
+++ b/libs/apprise/utils/parse.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,17 +24,13 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-import re
+import contextlib
 from functools import reduce
-from urllib.parse import unquote
-from urllib.parse import quote
-from urllib.parse import urlparse
-from urllib.parse import urlencode as _urlencode
-
+import re
+from urllib.parse import quote, unquote, urlencode as _urlencode, urlparse
 
 from .disk import tidy_path
 
-
 # URL Indexing Table for returns via parse_url()
 # The below accepts and scans for:
 #  - schema://
@@ -43,34 +38,35 @@
 #  - schema://path?kwargs
 #
 VALID_URL_RE = re.compile(
-    r'^[\s]*((?P<schema>[^:\s]+):[/\\]+)?((?P<path>[^?]+)'
-    r'(\?(?P<kwargs>.+))?)?[\s]*$',
+    r"^[\s]*((?P<schema>[^:\s]+):[/\\]+)?((?P<path>[^?]+)"
+    r"(\?(?P<kwargs>.+))?)?[\s]*$",
 )
-VALID_QUERY_RE = re.compile(r'^(?P<path>.*[/\\])(?P<query>[^/\\]+)?$')
+VALID_QUERY_RE = re.compile(r"^(?P<path>.*[/\\])(?P<query>[^/\\]+)?$")
 
 # delimiters used to separate values when content is passed in by string.
 # This is useful when turning a string into a list
-STRING_DELIMITERS = r'[\[\]\;,\s]+'
+STRING_DELIMITERS = r"[\[\]\;,\s]+"
 
 # String Delimiters without the whitespace
-STRING_DELIMITERS_NO_WS = r'[\[\]\;,]+'
+STRING_DELIMITERS_NO_WS = r"[\[\]\;,]+"
 
 # The handling of custom arguments passed in the URL; we treat any
 # argument (which would otherwise appear in the qsd area of our parse_url()
 # function differently if they start with a +, - or : value
-NOTIFY_CUSTOM_ADD_TOKENS = re.compile(r'^( |\+)(?P<key>.*)\s*')
-NOTIFY_CUSTOM_DEL_TOKENS = re.compile(r'^-(?P<key>.*)\s*')
-NOTIFY_CUSTOM_COLON_TOKENS = re.compile(r'^:(?P<key>.*)\s*')
+NOTIFY_CUSTOM_ADD_TOKENS = re.compile(r"^( |\+)(?P<key>.*)\s*")
+NOTIFY_CUSTOM_DEL_TOKENS = re.compile(r"^-(?P<key>.*)\s*")
+NOTIFY_CUSTOM_COLON_TOKENS = re.compile(r"^:(?P<key>.*)\s*")
 
 # Used for attempting to acquire the schema if the URL can't be parsed.
-GET_SCHEMA_RE = re.compile(r'\s*(?P<schema>[a-z0-9]{1,12})://.*$', re.I)
+GET_SCHEMA_RE = re.compile(r"\s*(?P<schema>[a-z0-9]{1,32})://.*$", re.I)
 
 # Used for validating that a provided entry is indeed a schema
 # this is slightly different then the GET_SCHEMA_RE above which
 # insists the schema is only valid with a :// entry.  this one
 # extrapolates the individual entries
 URL_DETAILS_RE = re.compile(
-    r'\s*(?P<schema>[a-z0-9]{1,12})(://(?P<base>.*))?$', re.I)
+    r"\s*(?P<schema>[a-z0-9]{1,32})(://(?P<base>.*))?$", re.I
+)
 
 # Regular expression based and expanded from:
 # http://www.regular-expressions.info/email.html
@@ -84,56 +80,68 @@
 #   - label+user@example.com
 GET_EMAIL_RE = re.compile(
     r'(([\s"\']+)?(?P<name>[^:<\'"]+)?[:<\s\'"]+)?'
-    r'(?P<full_email>((?P<label>[^+]+)\+)?'
-    r'(?P<email>(?P<userid>[a-z0-9_!#$%&*/=?%`{|}~^-]+'
-    r'(?:\.[a-z0-9_!#$%&\'*/=?%`{|}~^-]+)'
-    r'*)@(?P<domain>('
-    r'(?:[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?\.)+'
-    r'[a-z0-9](?:[a-z0-9_-]*[a-z0-9]))|'
-    r'[a-z0-9][a-z0-9_-]{5,})))'
-    r'\s*>?', re.IGNORECASE)
+    r"(?P<full_email>((?P<label>[^+]+)\+)?"
+    r"(?P<email>(?P<userid>[a-z0-9_!#$%&*/=?%`{|}~^-]+"
+    r"(?:\.[a-z0-9_!#$%&\'*/=?%`{|}~^-]+)"
+    r"*)@(?P<domain>("
+    r"(?:[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?\.)+"
+    r"[a-z0-9](?:[a-z0-9_-]*[a-z0-9]))|"
+    r"[a-z0-9][a-z0-9_-]{5,})))"
+    r"\s*>?",
+    re.IGNORECASE,
+)
 
 # A simple verification check to make sure the content specified
 # rougly conforms to a phone number before we parse it further
-IS_PHONE_NO = re.compile(r'^\+?(?P<phone>[0-9\s)(+-]+)\s*$')
+IS_PHONE_NO = re.compile(r"^\+?(?P<phone>[0-9\s)(+-]+)\s*$")
 
 # Regular expression used to destinguish between multiple phone numbers
 PHONE_NO_DETECTION_RE = re.compile(
-    r'\s*([+(\s]*[0-9][0-9()\s-]+[0-9])(?=$|[\s,+(]+[0-9])', re.I)
+    r"\s*([+(\s]*[0-9][0-9()\s-]+[0-9])(?=$|[\s,+(]+[0-9])", re.I
+)
 
 # Support for prefix: (string followed by colon) infront of phone no
 PHONE_NO_WPREFIX_DETECTION_RE = re.compile(
-    r'\s*((?:[a-z]+:)?[+(\s]*[0-9][0-9()\s-]+[0-9])'
-    r'(?=$|(?:[a-z]+:)?[\s,+(]+[0-9])', re.I)
+    r"\s*((?:[a-z]+:)?[+(\s]*[0-9][0-9()\s-]+[0-9])"
+    r"(?=$|(?:[a-z]+:)?[\s,+(]+[0-9])",
+    re.I,
+)
 
-# A simple verification check to make sure the content specified
-# rougly conforms to a ham radio call sign before we parse it further
+# Quick sanity check - does this look like a valid callsign before we
+# bother parsing it
 IS_CALL_SIGN = re.compile(
-    r'^(?P<callsign>[a-z0-9]{2,3}[0-9][a-z0-9]{3})'
-    r'(?P<ssid>-[a-z0-9]{1,2})?\s*$', re.I)
+    r"^(?P<callsign>[0-9a-z]{1,2}[0-9][a-z0-9]{1,3})"
+    r"(-(?P<ssid>[0-9]{1,2}))?\s*$",
+    re.I,
+)
 
-# Regular expression used to destinguish between multiple ham radio call signs
+# Regex to split multiple callsigns from a single string
 CALL_SIGN_DETECTION_RE = re.compile(
-    r'\s*([a-z0-9]{2,3}[0-9][a-z0-9]{3}(?:-[a-z0-9]{1,2})?)'
-    r'(?=$|[\s,]+[a-z0-9]{4,6})', re.I)
+    r"\s*([0-9a-z]{1,2}[0-9][a-z0-9]{1,3}(?:-(?:[0-9]{1,2}))?)"
+    r"(?=\s*$|\s*[,;\s]+)",
+    re.I,
+)
 
 # Regular expression used to destinguish between multiple URLs
 URL_DETECTION_RE = re.compile(
-    r'([a-z0-9]+?:\/\/.*?)(?=$|[\s,]+[a-z0-9]{1,12}?:\/\/)', re.I)
+    r"([a-z0-9]+?:\/\/.*?)(?=$|[\s,]+[a-z0-9]{1,32}?:\/\/)", re.I
+)
 
 EMAIL_DETECTION_RE = re.compile(
-    r'[\s,]*([^@]+@.*?)(?=$|[\s,]+'
-    r'(?:[^:<]+?[:<\s]+?)?'
-    r'[^@\s,]+@[^\s,]+)',
-    re.IGNORECASE)
+    r"[\s,]*([^@]+@.*?)(?=$|[\s,]+"
+    r"(?:[^:<]+?[:<\s]+?)?"
+    r"[^@\s,]+@[^\s,]+)",
+    re.IGNORECASE,
+)
 
 # Used to prepare our UUID regex matching
 UUID4_RE = re.compile(
-    r'[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}',
-    re.IGNORECASE)
+    r"[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}",
+    re.IGNORECASE,
+)
 
 # Validate if we're a loadable Python file or not
-VALID_PYTHON_FILE_RE = re.compile(r'.+\.py(o|c)?$', re.IGNORECASE)
+VALID_PYTHON_FILE_RE = re.compile(r".+\.py(o|c)?$", re.IGNORECASE)
 
 # validate_regex() utilizes this mapping to track and re-use pre-complied
 # regular expressions
@@ -141,21 +149,19 @@
 
 
 def is_ipaddr(addr, ipv4=True, ipv6=True):
-    """
-    Validates against IPV4 and IPV6 IP Addresses
-    """
+    """Validates against IPV4 and IPV6 IP Addresses."""
 
     if ipv4:
         # Based on https://stackoverflow.com/questions/5284147/\
         #       validating-ipv4-addresses-with-regexp
         re_ipv4 = re.compile(
-            r'^(?P<ip>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}'
-            r'(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$'
+            r"^(?P<ip>((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}"
+            r"(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$"
         )
         match = re_ipv4.match(addr)
         if match is not None:
             # Return our matched IP
-            return match.group('ip')
+            return match.group("ip")
 
     if ipv6:
         # Based on https://stackoverflow.com/questions/53497/\
@@ -165,35 +171,34 @@ def is_ipaddr(addr, ipv4=True, ipv6=True):
         #   Source: https://tools.ietf.org/html/rfc2732
         #   - For this reason, they are additionally checked for existance
         re_ipv6 = re.compile(
-            r'\[?(?P<ip>(([0-9a-f]{1,4}:){7,7}[0-9a-f]{1,4}|([0-9a-f]{1,4}:)'
-            r'{1,7}:|([0-9a-f]{1,4}:){1,6}:[0-9a-f]{1,4}|([0-9a-f]{1,4}:){1,5}'
-            r'(:[0-9a-f]{1,4}){1,2}|([0-9a-f]{1,4}:){1,4}'
-            r'(:[0-9a-f]{1,4}){1,3}|([0-9a-f]{1,4}:){1,3}'
-            r'(:[0-9a-f]{1,4}){1,4}|([0-9a-f]{1,4}:){1,2}'
-            r'(:[0-9a-f]{1,4}){1,5}|[0-9a-f]{1,4}:'
-            r'((:[0-9a-f]{1,4}){1,6})|:((:[0-9a-f]{1,4}){1,7}|:)|'
-            r'fe80:(:[0-9a-f]{0,4}){0,4}%[0-9a-z]{1,}|::'
-            r'(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]'
-            r'|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|'
-            r'1{0,1}[0-9]){0,1}[0-9])|([0-9a-f]{1,4}:){1,4}:((25[0-5]|'
-            r'(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|'
-            r'1{0,1}[0-9]){0,1}[0-9])))\]?', re.I,
+            r"\[?(?P<ip>(([0-9a-f]{1,4}:){7,7}[0-9a-f]{1,4}|([0-9a-f]{1,4}:)"
+            r"{1,7}:|([0-9a-f]{1,4}:){1,6}:[0-9a-f]{1,4}|([0-9a-f]{1,4}:){1,5}"
+            r"(:[0-9a-f]{1,4}){1,2}|([0-9a-f]{1,4}:){1,4}"
+            r"(:[0-9a-f]{1,4}){1,3}|([0-9a-f]{1,4}:){1,3}"
+            r"(:[0-9a-f]{1,4}){1,4}|([0-9a-f]{1,4}:){1,2}"
+            r"(:[0-9a-f]{1,4}){1,5}|[0-9a-f]{1,4}:"
+            r"((:[0-9a-f]{1,4}){1,6})|:((:[0-9a-f]{1,4}){1,7}|:)|"
+            r"fe80:(:[0-9a-f]{0,4}){0,4}%[0-9a-z]{1,}|::"
+            r"(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]"
+            r"|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|"
+            r"1{0,1}[0-9]){0,1}[0-9])|([0-9a-f]{1,4}:){1,4}:((25[0-5]|"
+            r"(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|"
+            r"1{0,1}[0-9]){0,1}[0-9])))\]?",
+            re.I,
         )
 
         match = re_ipv6.match(addr)
         if match is not None:
             # Return our matched IP between square brackets since that is
             # required for URL formatting as per RFC 2732.
-            return '[{}]'.format(match.group('ip'))
+            return "[{}]".format(match.group("ip"))
 
     # There was no match
     return False
 
 
 def is_hostname(hostname, ipv4=True, ipv6=True, underscore=True):
-    """
-    Validate hostname
-    """
+    """Validate hostname."""
     # The entire hostname, including the delimiting dots, has a maximum of 253
     # ASCII characters.
     if len(hostname) > 253 or len(hostname) == 0:
@@ -207,7 +212,7 @@ def is_hostname(hostname, ipv4=True, ipv6=True, underscore=True):
     labels = hostname.split(".")
 
     # ipv4 check
-    if len(labels) == 4 and re.match(r'^[0-9.]+$', hostname):
+    if len(labels) == 4 and re.match(r"^[0-9.]+$", hostname):
         return is_ipaddr(hostname, ipv4=ipv4, ipv6=False)
 
     # - RFC 1123 permits hostname labels to start with digits
@@ -222,8 +227,11 @@ def is_hostname(hostname, ipv4=True, ipv6=True, underscore=True):
     # - labels can not exceed 63 characters
     # - allow single character alpha characters
     allowed = re.compile(
-        r'^([a-z0-9][a-z0-9_-]{1,62}|[a-z_-])(?<![_-])$' if underscore else
-        r'^([a-z0-9][a-z0-9-]{1,62}|[a-z-])(?<!-)$',
+        (
+            r"^([a-z0-9][a-z0-9_-]{1,62}|[a-z_-])(?<![_-])$"
+            if underscore
+            else r"^([a-z0-9][a-z0-9-]{1,62}|[a-z-])(?<!-)$"
+        ),
         re.IGNORECASE,
     )
 
@@ -234,7 +242,7 @@ def is_hostname(hostname, ipv4=True, ipv6=True, underscore=True):
 
 
 def is_uuid(uuid):
-    """Determine if the specified entry is uuid v4 string
+    """Determine if the specified entry is uuid v4 string.
 
     Args:
         address (str): The string you want to check.
@@ -251,11 +259,11 @@ def is_uuid(uuid):
         # not parseable content
         return False
 
-    return True if match else False
+    return bool(match)
 
 
 def is_phone_no(phone, min_len=10):
-    """Determine if the specified entry is a phone number
+    """Determine if the specified entry is a phone number.
 
     Args:
         phone (str): The string you want to check.
@@ -283,7 +291,6 @@ def is_phone_no(phone, min_len=10):
                     'full': '411',
                     'pretty': '411',
                 }
-
     """
 
     try:
@@ -296,7 +303,7 @@ def is_phone_no(phone, min_len=10):
         return False
 
     # Tidy phone number up first
-    phone = re.sub(r'[^\d]+', '', phone)
+    phone = re.sub(r"[^\d]+", "", phone)
     if len(phone) > 14 or len(phone) < min_len:
         # Invalid phone number
         return False
@@ -306,48 +313,46 @@ def is_phone_no(phone, min_len=10):
 
     # Break apart our phone number
     line = phone[-7:]
-    phone = phone[:len(phone) - 7] if len(phone) > 7 else ''
+    phone = phone[: len(phone) - 7] if len(phone) > 7 else ""
 
     # the area code (if present)
-    area = phone[-3:] if phone else ''
+    area = phone[-3:] if phone else ""
 
     # The country code is the leftovers
-    country = phone[:len(phone) - 3] if len(phone) > 3 else ''
+    country = phone[: len(phone) - 3] if len(phone) > 3 else ""
 
     # Prepare a nicely (consistently) formatted phone number
-    pretty = ''
+    pretty = ""
 
     if country:
         # The leftover is the country code
-        pretty += '+{} '.format(country)
+        pretty += f"+{country} "
 
     if area:
-        pretty += '{}-'.format(area)
+        pretty += f"{area}-"
 
     if len(line) >= 7:
-        pretty += '{}-{}'.format(line[:3], line[3:])
+        pretty += f"{line[:3]}-{line[3:]}"
 
     else:
         pretty += line
 
     return {
         # The line code (last 7 digits)
-        'line': line,
+        "line": line,
         # Area code
-        'area': area,
+        "area": area,
         # The country code (if identified)
-        'country': country,
-
+        "country": country,
         # A nicely formatted phone no
-        'pretty': pretty,
-
+        "pretty": pretty,
         # All digits in-line
-        'full': full,
+        "full": full,
     }
 
 
 def is_call_sign(callsign):
-    """Determine if the specified entry is a ham radio call sign
+    """Determine if the specified entry is a ham radio call sign.
 
     Args:
         callsign (str): The string you want to check.
@@ -367,18 +372,18 @@ def is_call_sign(callsign):
         # not parseable content
         return False
 
-    ssid = result.group('ssid')
+    ssid = result.group("ssid")
     return {
         # always treat call signs as uppercase content
-        'callsign': result.group('callsign').upper(),
+        "callsign": result.group("callsign").upper(),
         # Prevent the storing of the None keyword in the event the SSID was
         # not detected
-        'ssid': ssid if ssid else '',
+        "ssid": ssid if ssid else "",
     }
 
 
 def is_email(address):
-    """Determine if the specified entry is an email address
+    """Determine if the specified entry is an email address.
 
     Args:
         address (str): The string you want to check.
@@ -394,7 +399,6 @@ def is_email(address):
                     'user': 'user',
                     'domain': 'domain.com'
                 }
-
     """
 
     try:
@@ -407,95 +411,101 @@ def is_email(address):
     if match:
         return {
             # The name parsed from the URL (if one exists)
-            'name': '' if match.group('name') is None
-            else match.group('name').strip(),
+            "name": (
+                ""
+                if match.group("name") is None
+                else match.group("name").rstrip(" \t\r\n\x0b\x0c+")
+            ),
             # The email address
-            'email': match.group('email'),
+            "email": match.group("email"),
             # The full email address (includes label if specified)
-            'full_email': match.group('full_email'),
+            "full_email": match.group("full_email"),
             # The label (if specified) e.g: label+user@example.com
-            'label': '' if match.group('label') is None
-            else match.group('label').strip(),
+            "label": (
+                ""
+                if match.group("label") is None
+                else match.group("label").strip(" \t\r\n\x0b\x0c+")
+            ),
             # The user (which does not include the label) from the email
             # parsed.
-            'user': match.group('userid'),
+            "user": match.group("userid"),
             # The domain associated with the email address
-            'domain': match.group('domain'),
+            "domain": match.group("domain"),
         }
 
     return False
 
 
 def parse_qsd(qs, simple=False, plus_to_space=False, sanitize=True):
-    """
-    Query String Dictionary Builder
+    """Query String Dictionary Builder.
 
-    A custom implimentation of the parse_qsl() function already provided
-    by Python.  This function is slightly more light weight and gives us
-    more control over parsing out arguments such as the plus/+ symbol
-    at the head of a key/value pair.
+    A custom implimentation of the parse_qsl() function already provided by
+    Python.  This function is slightly more light weight and gives us more
+    control over parsing out arguments such as the plus/+ symbol at the head of
+    a key/value pair.
 
     qs should be a query string part made up as part of the URL such as
-       a=1&c=2&d=
-
-        a=1 gets interpreted as { 'a': '1' }
-        a=  gets interpreted as { 'a': '' }
-        a   gets interpreted as { 'a': '' }
+    a=1&c=2&d=
 
+    a=1 gets interpreted as { 'a': '1' } a=  gets interpreted as { 'a': '' } a
+    gets interpreted as { 'a': '' }
 
-    This function returns a result object that fits with the apprise
-    expected parameters (populating the 'qsd' portion of the dictionary
+     This function returns a result object that fits with the apprise expected
+    parameters (populating the 'qsd' portion of the dictionary
 
-    if simple is set to true, then a ONE dictionary is returned and is not
-    sub-parsed for additional elements
+    if simple is set to true, then a ONE dictionary is returned and is not sub-
+    parsed for additional elements
 
-    plus_to_space will cause all `+` references to become a space as
-    per normal URL Encoded defininition. Normal URL parsing applies
-    this, but `+` is very actively used character with passwords,
-    api keys, tokens, etc.  So Apprise does not do this by default.
+    plus_to_space will cause all `+` references to become a space as per normal
+    URL Encoded defininition. Normal URL parsing applies this, but `+` is very
+    actively used character with passwords, api keys, tokens, etc.  So Apprise
+    does not do this by default.
 
     if sanitize is set to False, then kwargs are not placed into lowercase
     """
 
     # Our return result set:
-    result = {
-        # The arguments passed in (the parsed query). This is in a dictionary
-        # of {'key': 'val', etc }.  Keys are all made lowercase before storing
-        # to simplify access to them.
-        'qsd': {},
-
-        # Detected Entries that start with + or - are additionally stored in
-        # these values (un-touched).  The :,+,- however are stripped from their
-        # name before they are stored here.
-        'qsd+': {},
-        'qsd-': {},
-        'qsd:': {},
-    } if not simple else {'qsd': {}}
-
-    pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
+    result = (
+        {
+            # The arguments passed in (the parsed query). This is in a
+            # dictionary of {'key': 'val', etc }.  Keys are all made lowercase
+            # before storing to simplify access to them.
+            "qsd": {},
+            # Detected Entries that start with + or - are additionally stored
+            # in these values (un-touched).  The :,+,- however are stripped
+            # from their name before they are stored here.
+            "qsd+": {},
+            "qsd-": {},
+            "qsd:": {},
+        }
+        if not simple
+        else {"qsd": {}}
+    )
+
+    pairs = [s2 for s1 in qs.split("&") for s2 in s1.split(";")]
     for name_value in pairs:
-        nv = name_value.split('=', 1)
+        nv = name_value.split("=", 1)
         # Handle case of a control-name with no equal sign
         if len(nv) != 2:
-            nv.append('')
+            nv.append("")
 
         # Apprise keys can start with a + symbol; so we need to skip over
         # the very first entry
-        key = '{}{}'.format(
-            '' if len(nv[0]) == 0 else nv[0][0],
-            '' if len(nv[0]) <= 1 else nv[0][1:].replace('+', ' '),
+        key = "{}{}".format(
+            "" if len(nv[0]) == 0 else nv[0][0],
+            "" if len(nv[0]) <= 1 else nv[0][1:].replace("+", " "),
         )
 
         key = unquote(key)
-        key = '' if not key else key
+        key = key if key else ""
 
-        val = nv[1].replace('+', ' ') if plus_to_space else nv[1]
+        val = nv[1].replace("+", " ") if plus_to_space else nv[1]
         val = unquote(val)
-        val = '' if not val else val.strip()
+        val = "" if not val else val.strip()
 
         # Always Query String Dictionary (qsd) for every entry we have
         # content is always made lowercase for easy indexing
-        result['qsd'][key.lower().strip() if sanitize else key] = val
+        result["qsd"][key.lower().strip() if sanitize else key] = val
 
         if simple:
             # move along
@@ -505,81 +515,88 @@ def parse_qsd(qs, simple=False, plus_to_space=False, sanitize=True):
         k = NOTIFY_CUSTOM_ADD_TOKENS.match(key)
         if k is not None:
             # Store content 'as-is'
-            result['qsd+'][k.group('key')] = val
+            result["qsd+"][k.group("key")] = val
 
         # Check for tokens that start with a subtraction/hyphen symbol (-)
         k = NOTIFY_CUSTOM_DEL_TOKENS.match(key)
         if k is not None:
             # Store content 'as-is'
-            result['qsd-'][k.group('key')] = val
+            result["qsd-"][k.group("key")] = val
 
         # Check for tokens that start with a colon symbol (:)
         k = NOTIFY_CUSTOM_COLON_TOKENS.match(key)
         if k is not None:
             # Store content 'as-is'
-            result['qsd:'][k.group('key')] = val
+            result["qsd:"][k.group("key")] = val
 
     return result
 
 
-def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
-              simple=False, plus_to_space=False, sanitize=True):
-    """A function that greatly simplifies the parsing of a url
-    specified by the end user.
-
-     Valid syntaxes are:
-        <schema>://<user>@<host>:<port>/<path>
-        <schema>://<user>:<passwd>@<host>:<port>/<path>
-        <schema>://<host>:<port>/<path>
-        <schema>://<host>/<path>
-        <schema>://<host>
-        <host>
-
-     Argument parsing is also supported:
-        <schema>://<user>@<host>:<port>/<path>?key1=val&key2=val2
-        <schema>://<user>:<passwd>@<host>:<port>/<path>?key1=val&key2=val2
-        <schema>://<host>:<port>/<path>?key1=val&key2=val2
-        <schema>://<host>/<path>?key1=val&key2=val2
-        <schema>://<host>?key1=val&key2=val2
-
-     The function returns a simple dictionary with all of
-     the parsed content within it and returns 'None' if the
-     content could not be extracted.
-
-     The output of 'http://hostname' would look like:
-        {
-          'schema': 'http',
-          'url': 'http://hostname',
-          'host': 'hostname',
-
-          'user': None,
-          'password': None,
-          'port': None,
-          'fullpath': None,
-          'path': None,
-          'query': None,
-
-          'qsd': {},
-
-          'qsd+': {},
-          'qsd-': {},
-          'qsd:': {}
-        }
-
-     The simple switch cleans the dictionary response to only include the
-     fields that were detected.
-
-     The output of 'http://hostname' with the simple flag set would look like:
-        {
-          'schema': 'http',
-          'url': 'http://hostname',
-          'host': 'hostname',
-        }
-
-     If the URL can't be parsed then None is returned
-
-     If sanitize is set to False, then kwargs are not placed in lowercase
-     and wrapping whitespace is not removed
+def parse_url(
+    url,
+    default_schema="http",
+    verify_host=True,
+    strict_port=False,
+    simple=False,
+    plus_to_space=False,
+    sanitize=True,
+):
+    """A function that greatly simplifies the parsing of a url specified by the
+    end user.
+
+    Valid syntaxes are:
+       <schema>://<user>@<host>:<port>/<path>
+       <schema>://<user>:<passwd>@<host>:<port>/<path>
+       <schema>://<host>:<port>/<path>
+       <schema>://<host>/<path>
+       <schema>://<host>
+       <host>
+
+    Argument parsing is also supported:
+       <schema>://<user>@<host>:<port>/<path>?key1=val&key2=val2
+       <schema>://<user>:<passwd>@<host>:<port>/<path>?key1=val&key2=val2
+       <schema>://<host>:<port>/<path>?key1=val&key2=val2
+       <schema>://<host>/<path>?key1=val&key2=val2
+       <schema>://<host>?key1=val&key2=val2
+
+    The function returns a simple dictionary with all of
+    the parsed content within it and returns 'None' if the
+    content could not be extracted.
+
+    The output of 'http://hostname' would look like:
+       {
+         'schema': 'http',
+         'url': 'http://hostname',
+         'host': 'hostname',
+
+         'user': None,
+         'password': None,
+         'port': None,
+         'fullpath': None,
+         'path': None,
+         'query': None,
+
+         'qsd': {},
+
+         'qsd+': {},
+         'qsd-': {},
+         'qsd:': {}
+       }
+
+    The simple switch cleans the dictionary response to only include the
+    fields that were detected.
+
+    The output of 'http://hostname' with the simple flag set would look like:
+       {
+         'schema': 'http',
+         'url': 'http://hostname',
+         'host': 'hostname',
+       }
+
+    If the URL can't be parsed then None is returned
+
+    If sanitize is set to False, then kwargs are not placed in lowercase
+    and wrapping whitespace is not removed
     """
 
     if not isinstance(url, str):
@@ -587,49 +604,55 @@ def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
         return None
 
     # Default Results
-    result = {
-        # The username (if specified)
-        'user': None,
-        # The password (if specified)
-        'password': None,
-        # The port (if specified)
-        'port': None,
-        # The hostname
-        'host': '',
-        # The full path (query + path)
-        'fullpath': None,
-        # The path
-        'path': None,
-        # The query
-        'query': None,
-        # The schema
-        'schema': None,
-        # The schema
-        'url': None,
-        # The arguments passed in (the parsed query). This is in a dictionary
-        # of {'key': 'val', etc }.  Keys are all made lowercase before storing
-        # to simplify access to them.
-        # qsd = Query String Dictionary
-        'qsd': {},
-
-        # Detected Entries that start with +, - or : are additionally stored in
-        # these values (un-touched).  The +, -, and : however are stripped
-        # from their name before they are stored here.
-        'qsd+': {},
-        'qsd-': {},
-        'qsd:': {},
-    } if not simple else {}
-
-    qsdata = ''
+    result = (
+        {
+            # The username (if specified)
+            "user": None,
+            # The password (if specified)
+            "password": None,
+            # The port (if specified)
+            "port": None,
+            # The hostname
+            "host": "",
+            # The full path (query + path)
+            "fullpath": None,
+            # The path
+            "path": None,
+            # The query
+            "query": None,
+            # The schema
+            "schema": None,
+            # The schema
+            "url": None,
+            # The arguments passed in (the parsed query). This is in a
+            # dictionary of {'key': 'val', etc }.  Keys are all made lowercase
+            # before storing to simplify access to them.
+            # qsd = Query String Dictionary
+            "qsd": {},
+            # Detected Entries that start with +, - or : are additionally
+            # stored in these values (un-touched).  The +, -, and : however
+            # are stripped from their name before they are stored here.
+            "qsd+": {},
+            "qsd-": {},
+            "qsd:": {},
+        }
+        if not simple
+        else {}
+    )
+
+    qsdata = ""
     match = VALID_URL_RE.search(url)
     if match:
         # Extract basic results (with schema present)
-        result['schema'] = match.group('schema').lower().strip() \
-            if match.group('schema') else default_schema
-        host = match.group('path').strip() \
-            if match.group('path') else ''
-        qsdata = match.group('kwargs').strip() \
-            if match.group('kwargs') else None
+        result["schema"] = (
+            match.group("schema").lower().strip()
+            if match.group("schema")
+            else default_schema
+        )
+        host = match.group("path").strip() if match.group("path") else ""
+        qsdata = (
+            match.group("kwargs").strip() if match.group("kwargs") else None
+        )
 
     else:
         # Could not extract basic content from the URL
@@ -638,76 +661,75 @@ def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
     # Parse Query Arugments ?val=key&key=val
     # while ensuring that all keys are lowercase
     if qsdata:
-        result.update(parse_qsd(
-            qsdata, simple=simple, plus_to_space=plus_to_space,
-            sanitize=sanitize))
+        result.update(
+            parse_qsd(
+                qsdata,
+                simple=simple,
+                plus_to_space=plus_to_space,
+                sanitize=sanitize,
+            )
+        )
 
     # Now do a proper extraction of data; http:// is just substitued in place
     # to allow urlparse() to function as expected, we'll swap this back to the
     # expected schema after.
-    parsed = urlparse('http://%s' % host)
+    parsed = urlparse(f"http://{host}")
 
     # Parse results
-    result['host'] = parsed[1].strip()
-    result['fullpath'] = quote(unquote(tidy_path(parsed[2].strip())))
+    result["host"] = parsed[1].strip()
+    result["fullpath"] = quote(unquote(tidy_path(parsed[2].strip())))
 
     try:
         # Handle trailing slashes removed by tidy_path
-        if result['fullpath'][-1] not in ('/', '\\') and \
-           url[-1] in ('/', '\\'):
-            result['fullpath'] += url.strip()[-1]
+        if result["fullpath"][-1] not in ("/", "\\") and url[-1] in (
+            "/",
+            "\\",
+        ):
+            result["fullpath"] += url.strip()[-1]
 
     except IndexError:
         # No problem, there simply isn't any returned results
         # and therefore, no trailing slash
         pass
 
-    if not result['fullpath']:
+    if not result["fullpath"]:
         if not simple:
             # Default
-            result['fullpath'] = None
+            result["fullpath"] = None
         else:
             # Remove entry
-            del result['fullpath']
+            del result["fullpath"]
 
     else:
         # Using full path, extract query from path
-        match = VALID_QUERY_RE.search(result['fullpath'])
-        result['path'] = match.group('path')
-        result['query'] = match.group('query')
-        if not result['query']:
+        match = VALID_QUERY_RE.search(result["fullpath"])
+        result["path"] = match.group("path")
+        result["query"] = match.group("query")
+        if not result["query"]:
             if not simple:
-                result['query'] = None
+                result["query"] = None
             else:
-                del result['query']
+                del result["query"]
 
-    try:
-        (result['user'], result['host']) = \
-            re.split(r'[@]+', result['host'])[:2]
+    with contextlib.suppress(ValueError):
+        (result["user"], result["host"]) = re.split(r"[@]+", result["host"])[
+            :2
+        ]
 
-    except ValueError:
-        # no problem then, host only exists
-        # and it's already assigned
-        pass
-
-    if result.get('user') is not None:
-        try:
-            (result['user'], result['password']) = \
-                re.split(r'[:]+', result['user'])[:2]
-
-        except ValueError:
-            # no problem then, user only exists
-            # and it's already assigned
-            pass
+    if result.get("user") is not None:
+        with contextlib.suppress(ValueError):
+            (result["user"], result["password"]) = re.split(
+                r"[:]+", result["user"]
+            )[:2]
 
     # Port Parsing
     pmatch = re.search(
-        r'^(?P<host>(\[[0-9a-f:]+\]|[^:]+)):(?P<port>[^:]*)$',
-        result['host'])
+        r"^(?P<host>(\[[0-9a-f:]+\]|[^:]+)):(?P<port>[^:]*)$", result["host"]
+    )
 
     if pmatch:
         # Separate our port from our hostname (if port is detected)
-        result['host'] = pmatch.group('host')
+        result["host"] = pmatch.group("host")
         try:
             # If we're dealing with an integer, go ahead and convert it
             # otherwise return an 'x' which will raise a ValueError
@@ -715,9 +737,11 @@ def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
             # This small extra check allows us to treat floats/doubles
             # as strings. Hence a value like '4.2' won't be converted to a 4
             # (and the .2 lost)
-            result['port'] = int(
-                pmatch.group('port')
-                if re.search(r'[0-9]', pmatch.group('port')) else 'x')
+            result["port"] = int(
+                pmatch.group("port")
+                if re.search(r"[0-9]", pmatch.group("port"))
+                else "x"
+            )
 
         except ValueError:
             if verify_host:
@@ -725,71 +749,65 @@ def parse_url(url, default_schema='http', verify_host=True, strict_port=False,
                 return None
 
     # Acquire our port (if defined)
-    _port = result.get('port')
+    port = result.get("port")
 
     if verify_host:
         # Verify and Validate our hostname
-        result['host'] = is_hostname(result['host'])
-        if not result['host']:
+        result["host"] = is_hostname(result["host"])
+        if not result["host"]:
             # Nothing more we can do without a hostname; give the user
             # some indication as to what went wrong
             return None
 
         # Max port is 65535 and min is 1
-        if isinstance(_port, int) and not ((
-            not strict_port or (
-                strict_port and _port > 0 and _port <= 65535))):
+        if isinstance(port, int) and not (
+            not strict_port or (strict_port and port > 0 and port <= 65535)
+        ):
 
             # An invalid port was specified
             return None
 
-    elif pmatch and not isinstance(_port, int):
+    elif pmatch and not isinstance(port, int):
         if strict_port:
             # Store port
-            result['port'] = pmatch.group('port').strip()
+            result["port"] = pmatch.group("port").strip()
 
         else:
             # Fall back
-            result['port'] = None
-            result['host'] = '{}:{}'.format(
-                pmatch.group('host'), pmatch.group('port'))
+            result["port"] = None
+            result["host"] = f"{pmatch.group('host')}:{pmatch.group('port')}"
 
     # Re-assemble cleaned up version of the url
-    result['url'] = '%s://' % result['schema']
-    if isinstance(result.get('user'), str):
-        result['url'] += result['user']
+    result["url"] = f"{result['schema']}://"
+    if isinstance(result.get("user"), str):
+        result["url"] += result["user"]
 
-        if isinstance(result.get('password'), str):
-            result['url'] += ':%s@' % result['password']
+        if isinstance(result.get("password"), str):
+            result["url"] += f":{result['password']}@"
 
         else:
-            result['url'] += '@'
-    result['url'] += result['host']
-
-    if result.get('port') is not None:
-        try:
-            result['url'] += ':%d' % result['port']
+            result["url"] += "@"
+    result["url"] += result["host"]
 
-        except TypeError:
-            result['url'] += ':%s' % result['port']
+    if result.get("port") is not None:
+        result["url"] += f":{result['port']}"
 
-    elif 'port' in result and simple:
+    elif "port" in result and simple:
         # Eliminate empty fields
-        del result['port']
+        del result["port"]
 
-    if result.get('fullpath'):
-        result['url'] += result['fullpath']
+    if result.get("fullpath"):
+        result["url"] += result["fullpath"]
 
-    if simple and not result['host']:
+    if simple and not result["host"]:
         # simple mode does not carry over empty host names
-        del result['host']
+        del result["host"]
 
     return result
 
 
 def parse_bool(arg, default=False):
-    """
-    Support string based boolean settings.
+    """Support string based boolean settings.
 
     If the content could not be parsed, then the default is returned.
     """
@@ -805,7 +823,16 @@ def parse_bool(arg, default=False):
         # di  = short for Disable(d) - False
         # de  = short for Deny - False
         if arg.lower()[0:2] in (
-                'de', 'di', 'ne', 'f', 'n', 'no', 'of', '0', 'fa'):
+            "de",
+            "di",
+            "ne",
+            "f",
+            "n",
+            "no",
+            "of",
+            "0",
+            "fa",
+        ):
             return False
         # ye = yes - True
         # on = short for off - True
@@ -814,8 +841,7 @@ def parse_bool(arg, default=False):
         # t  = short for True - True
         # al = short for Always (and Allow) - True
         # en  = short for Enable(d) - True
-        elif arg.lower()[0:2] in (
-                'en', 'al', 't', 'y', 'ye', 'on', '1', 'tr'):
+        elif arg.lower()[0:2] in ("en", "al", "t", "y", "ye", "on", "1", "tr"):
             return True
         # otherwise
         return default
@@ -825,20 +851,21 @@ def parse_bool(arg, default=False):
 
 
 def parse_phone_no(*args, store_unparseable=True, prefix=False, **kwargs):
-    """
-    Takes a string containing phone numbers separated by comma's and/or spaces
-    and returns a list.
-    """
+    """Takes a string containing phone numbers separated by comma's and/or
+    spaces and returns a list."""
 
     result = []
     for arg in args:
         if isinstance(arg, str) and arg:
-            _result = (PHONE_NO_DETECTION_RE if not prefix
-                       else PHONE_NO_WPREFIX_DETECTION_RE).findall(arg)
-            if _result:
-                result += _result
-
-            elif not _result and store_unparseable:
+            result_ = (
+                PHONE_NO_DETECTION_RE
+                if not prefix
+                else PHONE_NO_WPREFIX_DETECTION_RE
+            ).findall(arg)
+            if result_:
+                result += result_
+
+            elif not result_ and store_unparseable:
                 # we had content passed into us that was lost because it was
                 # so poorly formatted that it didn't even come close to
                 # meeting the regular expression we defined. We intentially
@@ -846,31 +873,29 @@ def parse_phone_no(*args, store_unparseable=True, prefix=False, **kwargs):
                 # at a higher level can at least report this to the end user
                 # and hopefully give them some indication as to what they
                 # may have done wrong.
-                result += \
-                    [x for x in filter(bool, re.split(STRING_DELIMITERS, arg))]
+                result += list(filter(bool, re.split(STRING_DELIMITERS, arg)))
 
         elif isinstance(arg, (set, list, tuple)):
             # Use recursion to handle the list of phone numbers
             result += parse_phone_no(
-                *arg, store_unparseable=store_unparseable, prefix=prefix)
+                *arg, store_unparseable=store_unparseable, prefix=prefix
+            )
 
     return result
 
 
 def parse_call_sign(*args, store_unparseable=True, **kwargs):
-    """
-    Takes a string containing ham radio call signs separated by
-    comma and/or spacesand returns a list.
-    """
+    """Takes a string containing ham radio call signs separated by comma and/or
+    spacesand returns a list."""
 
     result = []
     for arg in args:
         if isinstance(arg, str) and arg:
-            _result = CALL_SIGN_DETECTION_RE.findall(arg)
-            if _result:
-                result += _result
+            result_ = CALL_SIGN_DETECTION_RE.findall(arg)
+            if result_:
+                result += result_
 
-            elif not _result and store_unparseable:
+            elif not result_ and store_unparseable:
                 # we had content passed into us that was lost because it was
                 # so poorly formatted that it didn't even come close to
                 # meeting the regular expression we defined. We intentially
@@ -878,31 +903,29 @@ def parse_call_sign(*args, store_unparseable=True, **kwargs):
                 # at a higher level can at least report this to the end user
                 # and hopefully give them some indication as to what they
                 # may have done wrong.
-                result += \
-                    [x for x in filter(bool, re.split(STRING_DELIMITERS, arg))]
+                result += list(filter(bool, re.split(STRING_DELIMITERS, arg)))
 
         elif isinstance(arg, (set, list, tuple)):
             # Use recursion to handle the list of call signs
             result += parse_call_sign(
-                *arg, store_unparseable=store_unparseable)
+                *arg, store_unparseable=store_unparseable
+            )
 
     return result
 
 
 def parse_emails(*args, store_unparseable=True, **kwargs):
-    """
-    Takes a string containing emails separated by comma's and/or spaces and
-    returns a list.
-    """
+    """Takes a string containing emails separated by comma's and/or spaces and
+    returns a list."""
 
     result = []
     for arg in args:
         if isinstance(arg, str) and arg:
-            _result = EMAIL_DETECTION_RE.findall(arg)
-            if _result:
-                result += _result
+            result_ = EMAIL_DETECTION_RE.findall(arg)
+            if result_:
+                result += result_
 
-            elif not _result and store_unparseable:
+            elif not result_ and store_unparseable:
                 # we had content passed into us that was lost because it was
                 # so poorly formatted that it didn't even come close to
                 # meeting the regular expression we defined. We intentially
@@ -910,8 +933,7 @@ def parse_emails(*args, store_unparseable=True, **kwargs):
                 # at a higher level can at least report this to the end user
                 # and hopefully give them some indication as to what they
                 # may have done wrong.
-                result += \
-                    [x for x in filter(bool, re.split(STRING_DELIMITERS, arg))]
+                result += list(filter(bool, re.split(STRING_DELIMITERS, arg)))
 
         elif isinstance(arg, (set, list, tuple)):
             # Use recursion to handle the list of Emails
@@ -921,47 +943,48 @@ def parse_emails(*args, store_unparseable=True, **kwargs):
 
 
 def url_assembly(encode=False, **kwargs):
-    """
-    This function reverses the parse_url() function by taking in the provided
-    result set and re-assembling a URL
+    """This function reverses the parse_url() function by taking in the
+    provided result set and re-assembling a URL."""
 
-    """
     def _no_encode(content, *args, **kwargs):
         # dummy function that does nothing to content
         return content
 
-    _quote = quote if encode else _no_encode
+    quote_ = quote if encode else _no_encode
 
     # Determine Authentication
-    auth = ''
-    if kwargs.get('user') is not None and \
-            kwargs.get('password') is not None:
+    auth = ""
+    if kwargs.get("user") is not None and kwargs.get("password") is not None:
 
-        auth = '{user}:{password}@'.format(
-            user=_quote(kwargs.get('user'), safe=''),
-            password=_quote(kwargs.get('password'), safe=''),
+        auth = "{user}:{password}@".format(
+            user=quote_(kwargs.get("user"), safe=""),
+            password=quote_(kwargs.get("password"), safe=""),
         )
 
-    elif kwargs.get('user') is not None:
-        auth = '{user}@'.format(
-            user=_quote(kwargs.get('user'), safe=''),
+    elif kwargs.get("user") is not None:
+        auth = "{user}@".format(
+            user=quote_(kwargs.get("user"), safe=""),
         )
 
-    return '{schema}://{auth}{hostname}{port}{fullpath}{params}'.format(
-        schema='' if not kwargs.get('schema') else kwargs.get('schema'),
+    return "{schema}://{auth}{hostname}{port}{fullpath}{params}".format(
+        schema="" if not kwargs.get("schema") else kwargs.get("schema"),
         auth=auth,
         # never encode hostname since we're expecting it to be a valid one
-        hostname='' if not kwargs.get('host') else kwargs.get('host', ''),
-        port='' if not kwargs.get('port')
-        else ':{}'.format(kwargs.get('port')),
-        fullpath=_quote(kwargs.get('fullpath', ''), safe='/'),
-        params='' if not kwargs.get('qsd')
-        else '?{}'.format(urlencode(kwargs.get('qsd'))),
+        hostname="" if not kwargs.get("host") else kwargs.get("host", ""),
+        port=(
+            "" if not kwargs.get("port") else ":{}".format(kwargs.get("port"))
+        ),
+        fullpath=quote_(kwargs.get("fullpath", ""), safe="/"),
+        params=(
+            ""
+            if not kwargs.get("qsd")
+            else "?{}".format(urlencode(kwargs.get("qsd")))
+        ),
     )
 
 
-def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
-    """Convert a mapping object or a sequence of two-element tuples
+def urlencode(query, doseq=False, safe="", encoding=None, errors=None):
+    """Convert a mapping object or a sequence of two-element tuples.
 
     Wrapper to Python's unquote while remaining compatible with both
     Python 2 & 3 since the reference to this function changed between
@@ -989,26 +1012,24 @@ def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
         str: The escaped parameters returned as a string
     """
     # Tidy query by eliminating any records set to None
-    _query = {k: v for (k, v) in query.items() if v is not None}
+    query_ = {k: v for (k, v) in query.items() if v is not None}
     return _urlencode(
-        _query, doseq=doseq, safe=safe, encoding=encoding,
-        errors=errors)
+        query_, doseq=doseq, safe=safe, encoding=encoding, errors=errors
+    )
 
 
 def parse_urls(*args, store_unparseable=True, **kwargs):
-    """
-    Takes a string containing URLs separated by comma's and/or spaces and
-    returns a list.
-    """
+    """Takes a string containing URLs separated by comma's and/or spaces and
+    returns a list."""
 
     result = []
     for arg in args:
         if isinstance(arg, str) and arg:
-            _result = URL_DETECTION_RE.findall(arg)
-            if _result:
-                result += _result
+            result_ = URL_DETECTION_RE.findall(arg)
+            if result_:
+                result += result_
 
-            elif not _result and store_unparseable:
+            elif not result_ and store_unparseable:
                 # we had content passed into us that was lost because it was
                 # so poorly formatted that it didn't even come close to
                 # meeting the regular expression we defined. We intentially
@@ -1016,8 +1037,7 @@ def parse_urls(*args, store_unparseable=True, **kwargs):
                 # at a higher level can at least report this to the end user
                 # and hopefully give them some indication as to what they
                 # may have done wrong.
-                result += \
-                    [x for x in filter(bool, re.split(STRING_DELIMITERS, arg))]
+                result += list(filter(bool, re.split(STRING_DELIMITERS, arg)))
 
         elif isinstance(arg, (set, list, tuple)):
             # Use recursion to handle the list of URLs
@@ -1026,13 +1046,11 @@ def parse_urls(*args, store_unparseable=True, **kwargs):
     return result
 
 
-def parse_list(*args, cast=None, allow_whitespace=True):
-    """
-    Take a string list and break it into a delimited
-    list of arguments. This funciton also supports
-    the processing of a list of delmited strings and will
-    always return a unique set of arguments. Duplicates are
-    always combined in the final results.
+def parse_list(*args, cast=None, allow_whitespace=True, sort=True):
+    """Take a string list and break it into a delimited list of arguments. This
+    funciton also supports the processing of a list of delmited strings and
+    will always return a unique set of arguments. Duplicates are always
+    combined in the final results.
 
     You can append as many items to the argument listing for
     parsing.
@@ -1054,11 +1072,17 @@ def parse_list(*args, cast=None, allow_whitespace=True):
 
         if isinstance(arg, str):
             result += re.split(
-                STRING_DELIMITERS if allow_whitespace
-                else STRING_DELIMITERS_NO_WS, arg)
+                (
+                    STRING_DELIMITERS
+                    if allow_whitespace
+                    else STRING_DELIMITERS_NO_WS
+                ),
+                arg,
+            )
 
         elif isinstance(arg, (set, list, tuple)):
-            result += parse_list(*arg, allow_whitespace=allow_whitespace)
+            result += parse_list(
+                *arg, allow_whitespace=allow_whitespace, sort=sort)
 
     #
     # filter() eliminates any empty entries
@@ -1066,49 +1090,57 @@ def parse_list(*args, cast=None, allow_whitespace=True):
     # Since Python v3 returns a filter (iterator) whereas Python v2 returned
     # a list, we need to change it into a list object to remain compatible with
     # both distribution types.
-    return sorted([x for x in filter(bool, list(set(result)))]) \
-        if allow_whitespace else sorted(
-            [x.strip() for x in filter(bool, list(set(result))) if x.strip()])
+    if sort:
+        return (
+            sorted(filter(bool, list(set(result))))
+            if allow_whitespace
+            else sorted(
+                [x.strip() for x in filter(
+                    bool, list(set(result))) if x.strip()]
+            )
+        )
+    return (
+        list(filter(bool, list(result)))
+        if allow_whitespace
+        else [x.strip() for x in filter(bool, list(result)) if x.strip()]
+    )
 
 
-def validate_regex(value, regex=r'[^\s]+', flags=re.I, strip=True, fmt=None):
-    """
-    A lot of the tokens, secrets, api keys, etc all have some regular
+def validate_regex(value, regex=r"[^\s]+", flags=re.I, strip=True, fmt=None):
+    """A lot of the tokens, secrets, api keys, etc all have some regular
     expression validation they support.  This hashes the regex after it's
     compiled and returns it's content if matched, otherwise it returns None.
 
     This function greatly increases performance as it prevents apprise modules
     from having to pre-compile all of their regular expressions.
 
-        value is the element being tested
-        regex is the regular expression to be compiled and tested. By default
-         we extract the first chunk of code while eliminating surrounding
-         whitespace (if present)
-
-        flags is the regular expression flags that should be applied
-        format is used to alter the response format if the regular
-         expression matches. You identify your format using {tags}.
-         Effectively nesting your ID's between {}. Consider a regex of:
-          '(?P<year>[0-9]{2})[0-9]+(?P<value>[A-Z])'
-        to which you could set your format up as '{value}-{year}'. This
-        would substitute the matched groups and format a response.
+    value is the element being tested regex is the regular expression to be
+    compiled and tested. By default  we extract the first chunk of code while
+    eliminating surrounding  whitespace (if present)
+
+    flags is the regular expression flags that should be applied format is used
+    to alter the response format if the regular  expression matches. You
+    identify your format using {tags}.  Effectively nesting your ID's between
+    {}. Consider a regex of:   '(?P<year>[0-9]{2})[0-9]+(?P<value>[A-Z])' to
+    which you could set your format up as '{value}-{year}'. This would
+    substitute the matched groups and format a response.
     """
 
     if flags:
         # Regex String -> Flag Lookup Map
-        _map = {
+        map_ = {
             # Ignore Case
-            'i': re.I,
+            "i": re.I,
             # Multi Line
-            'm': re.M,
+            "m": re.M,
             # Dot Matches All
-            's': re.S,
+            "s": re.S,
             # Locale Dependant
-            'L': re.L,
+            "L": re.L,
             # Unicode Matching
-            'u': re.U,
+            "u": re.U,
             # Verbose
-            'x': re.X,
+            "x": re.X,
         }
 
         if isinstance(flags, str):
@@ -1116,15 +1148,15 @@ def validate_regex(value, regex=r'[^\s]+', flags=re.I, strip=True, fmt=None):
             # respected integer (expected) Python values and perform
             # a bit-wise or on each match found:
             flags = reduce(
-                lambda x, y: x | y,
-                [0] + [_map[f] for f in flags if f in _map])
+                lambda x, y: x | y, [0] + [map_[f] for f in flags if f in map_]
+            )
 
     else:
         # Handles None/False/'' cases
         flags = 0
 
     # A key is used to store our compiled regular expression
-    key = '{}{}'.format(regex, flags)
+    key = f"{regex}{flags}"
 
     if key not in REGEX_VALIDATE_LOOKUP:
         REGEX_VALIDATE_LOOKUP[key] = re.compile(regex, flags)
diff --git a/libs/apprise/utils/pem.py b/libs/apprise/utils/pem.py
new file mode 100644
index 0000000000..e744fc822a
--- /dev/null
+++ b/libs/apprise/utils/pem.py
@@ -0,0 +1,869 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+import base64
+import binascii
+import json
+import os
+import struct
+from typing import Optional, Union
+
+from ..apprise_attachment import AppriseAttachment
+from ..asset import AppriseAsset
+from ..exception import ApprisePluginException
+from ..logger import logger
+from ..utils.base64 import base64_urldecode, base64_urlencode
+
+try:
+    from cryptography.exceptions import InvalidTag
+    from cryptography.hazmat.backends import default_backend
+    from cryptography.hazmat.primitives import hashes, serialization
+    from cryptography.hazmat.primitives.asymmetric import ec
+    from cryptography.hazmat.primitives.asymmetric.utils import (
+        decode_dss_signature,
+    )
+    from cryptography.hazmat.primitives.ciphers import (
+        Cipher,
+        algorithms,
+        modes,
+    )
+    from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+    from cryptography.hazmat.primitives.kdf.hkdf import HKDF
+    from cryptography.hazmat.primitives.serialization import (
+        Encoding,
+        NoEncryption,
+        PrivateFormat,
+        PublicFormat,
+    )
+
+    # PEM Support enabled
+    PEM_SUPPORT = True
+
+except ImportError:
+    # PEM Support disabled
+    PEM_SUPPORT = False
+
+
+class ApprisePEMException(ApprisePluginException):
+    """Thrown when there is an error with the PEM Controller."""
+
+    def __init__(self, message, error_code=612):
+        super().__init__(message, error_code=error_code)
+
+
+class ApprisePEMController:
+    """PEM Controller Tool for the Apprise Library."""
+
+    # There is no reason a PEM Public Key should exceed 8K in size
+    # If it is more than this, then it is not accepted
+    max_pem_public_key_size = 8000
+
+    # There is no reason a PEM Private Key should exceed 8K in size
+    # If it is more than this, then it is not accepted
+    max_pem_private_key_size = 8000
+
+    # Maximum Vapid Message Size
+    max_webpush_record_size = 4096
+
+    def __init__(
+        self,
+        path: str,
+        pub_keyfile: Optional[str] = None,
+        prv_keyfile: Optional[str] = None,
+        name: Optional[str] = None,
+        asset: Optional[AppriseAsset] = None,
+        **kwargs,
+    ) -> None:
+        """Path should be the directory keys can be written and read from such
+        as <notifyobject>.store.path.
+
+        Optionally additionally specify a keyfile to explicitly open
+        """
+
+        # Directory we can work with
+        self.path = path
+
+        # Prepare our Key Placeholders
+        self.__private_key = None
+        self.__public_key = None
+
+        # Our name (id)
+        self.name = (
+            name.strip(" \t/-+!$@#*").lower() if isinstance(name, str) else ""
+        )
+
+        # Prepare our Asset Object
+        self.asset = (
+            asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
+
+        # Our temporary reference points
+        self._prv_keyfile = AppriseAttachment(asset=self.asset)
+        self._pub_keyfile = AppriseAttachment(asset=self.asset)
+
+        if prv_keyfile:
+            self.load_private_key(prv_keyfile)
+
+        elif pub_keyfile:
+            self.load_public_key(pub_keyfile)
+
+        else:
+            self._pub_keyfile = None
+
+    def load_private_key(
+        self, path: Optional[str] = None, *names: str
+    ) -> bool:
+        """Load Private key and from that we can prepare our public key."""
+
+        if path is None:
+            # Auto-load our content
+            return bool(self.private_keyfile(*names))
+
+        # Create ourselves an Attachment to work with; this grants us the
+        # ability to pull this key from a remote site or anything else
+        # supported by the Attachment object
+        self._prv_keyfile = AppriseAttachment(asset=self.asset)
+
+        # Add our definition to our pem_key reference
+        self._prv_keyfile.add(path)
+
+        # Enforce maximum file size
+        self._prv_keyfile[0].max_file_size = self.max_pem_private_key_size
+
+        #
+        # Reset Public key
+        #
+        self._pub_keyfile = AppriseAttachment(asset=self.asset)
+
+        #
+        # Reset our internal keys
+        #
+        self.__private_key = None
+        self.__public_key = None
+
+        if not self._prv_keyfile.sync():
+            # Early exit
+            logger.error(f"Could not access PEM Private Key {path}.")
+            return False
+
+        try:
+            with open(self._prv_keyfile[0].path, "rb") as f:
+                self.__private_key = serialization.load_pem_private_key(
+                    f.read(),
+                    password=None,  # or provide the password if encrypted
+                    backend=default_backend(),
+                )
+
+        except (ValueError, TypeError):
+            logger.debug(
+                "PEM Private Key file specified is not supported (%s)",
+                type(path),
+            )
+            return False
+
+        except FileNotFoundError:
+            logger.debug("PEM Private Key file not found: %s", path)
+            return False
+
+        except OSError as e:
+            logger.warning("Error accessing PEM Private Key file %s", path)
+            logger.debug(f"I/O Exception: {e}")
+            return False
+
+        #
+        # Generate our public key
+        #
+        self.__public_key = self.__private_key.public_key()
+
+        # Load our private key
+        return bool(self.__private_key)
+
+    def load_public_key(self, path: Optional[str] = None, *names: str) -> bool:
+        """Load Public key only.
+
+        Note: with just a public key you can only decrypt, encryption is not
+              possible.
+        """
+
+        if path is None:
+            # Auto-load our content
+            return bool(self.public_keyfile(*names))
+
+        # Create ourselves an Attachment to work with; this grants us the
+        # ability to pull this key from a remote site or anything else
+        # supported by the Attachment object
+        self._pub_keyfile = AppriseAttachment(asset=self.asset)
+
+        # Add our definition to our pem_key reference
+        self._pub_keyfile.add(path)
+
+        # Enforce maximum file size
+        self._pub_keyfile[0].max_file_size = self.max_pem_public_key_size
+
+        #
+        # Reset Private key
+        #
+        self._prv_keyfile = AppriseAttachment(asset=self.asset)
+
+        #
+        # Reset our internal keys
+        #
+        self.__private_key = None
+        self.__public_key = None
+
+        if not self._pub_keyfile.sync():
+            # Early exit
+            logger.error(f"Could not access PEM Public Key {path}.")
+            return False
+
+        try:
+            with open(path, "rb") as key_file:
+                self.__public_key = serialization.load_pem_public_key(
+                    key_file.read(), backend=default_backend()
+                )
+
+        except (ValueError, TypeError):
+            logger.debug(
+                "PEM Public Key file specified is not supported (%s)",
+                type(path),
+            )
+            return False
+
+        except FileNotFoundError:
+            # Generate keys
+            logger.debug("PEM Public Key file not found: %s", path)
+            return False
+
+        except OSError as e:
+            logger.warning("Error accessing PEM Public Key file %s", path)
+            logger.debug(f"I/O Exception: {e}")
+            return False
+
+        # Load our private key
+        return bool(self.__public_key)
+
+    def keygen(self, name: "Optional[str]" = None, force: bool = False):
+        """Generates a set of keys based on name configured."""
+
+        if not PEM_SUPPORT:
+            msg = "PEM Support unavailable; install cryptography library"
+            logger.warning(msg)
+            raise ApprisePEMException(msg)
+
+        # Detect if a key has been loaded or not
+        has_key = bool(
+            self.private_key(autogen=False) or self.public_key(autogen=False)
+        )
+
+        if (has_key and not (name or force)) or not self.path:
+            logger.trace(
+                "PEM keygen disabled, reason=%s",
+                "keyfile-defined" if not has_key else "no-write-path",
+            )
+            return False
+
+        # Create a new private/public key pair
+        self.__private_key = ec.generate_private_key(
+            ec.SECP256R1(), default_backend()
+        )
+        self.__public_key = self.__private_key.public_key()
+
+        #
+        # Prepare our PEM formatted output files
+        #
+        private_key = self.__private_key.private_bytes(
+            Encoding.PEM,
+            PrivateFormat.PKCS8,
+            encryption_algorithm=NoEncryption(),
+        )
+
+        public_key = self.__public_key.public_bytes(
+            encoding=Encoding.PEM,
+            format=PublicFormat.SubjectPublicKeyInfo,
+        )
+
+        if not name:
+            name = self.name
+
+        file_prefix = "" if not name else f"{name}-"
+        pub_path = os.path.join(self.path, f"{file_prefix}public_key.pem")
+        prv_path = os.path.join(self.path, f"{file_prefix}private_key.pem")
+
+        if not force:
+            if os.path.isfile(pub_path):
+                logger.debug(
+                    "PEM generation skipped; Public Key already exists: %s/%s",
+                    os.path.dirname(pub_path),
+                    os.path.basename(pub_path),
+                )
+                return False
+
+            if os.path.isfile(prv_path):
+                logger.debug(
+                    "PEM generation skipped; Private Key already exists: %s%s",
+                    os.path.dirname(prv_path),
+                    os.path.basename(prv_path),
+                )
+                return False
+
+        try:
+            # Write our keys to disk
+            with open(pub_path, "wb") as f:
+                f.write(public_key)
+
+        except OSError as e:
+            logger.warning("Error writing Public PEM file %s", pub_path)
+            logger.debug(f"I/O Exception: {e}")
+
+            # Cleanup
+            try:
+                os.unlink(pub_path)
+                logger.trace("Removed %s", pub_path)
+
+            except OSError:
+                pass
+
+            return False
+
+        try:
+            with open(prv_path, "wb") as f:
+                f.write(private_key)
+
+        except OSError as e:
+            logger.warning("Error writing Private PEM file %s", prv_path)
+            logger.debug(f"I/O Exception: {e}")
+
+            try:
+                os.unlink(pub_path)
+                logger.trace("Removed %s", pub_path)
+
+            except OSError:
+                pass
+
+            try:
+                os.unlink(prv_path)
+                logger.trace("Removed %s", prv_path)
+
+            except OSError:
+                pass
+
+            return False
+
+        # Update our local file references
+        self._prv_keyfile = AppriseAttachment(asset=self.asset)
+        self._prv_keyfile.add(prv_path)
+
+        self._pub_keyfile = AppriseAttachment(asset=self.asset)
+        self._pub_keyfile.add(pub_path)
+
+        logger.info(
+            "Wrote Public/Private PEM key pair for %s/%s",
+            os.path.dirname(pub_path),
+            os.path.basename(pub_path),
+        )
+        return True
+
+    def public_keyfile(self, *names: str) -> Optional[str]:
+        """Returns the first match of a useable public key based names
+        provided."""
+
+        if not PEM_SUPPORT:
+            msg = "PEM Support unavailable; install cryptography library"
+            logger.warning(msg)
+            raise ApprisePEMException(msg)
+
+        if self._pub_keyfile:
+            # If our code reaches here, then we fetch our public key
+            pem_key = self._pub_keyfile[0]
+            if not pem_key:
+                # We could not access the attachment
+                logger.error(
+                    "Could not access PEM Public Key"
+                    f" {pem_key.url(privacy=True)}."
+                )
+                return False
+
+            return pem_key.path
+
+        elif not self.path:
+            # No path
+            return None
+
+        fnames = [
+            "public_key.pem",
+            "public.pem",
+            "pub.pem",
+        ]
+
+        if self.name:
+            # Include our name in the list
+            fnames = [self.name, *names]
+
+        for name in names:
+            fnames.insert(0, f"{name}-public_key.pem")
+
+            entry = name.lower()
+            fnames.insert(0, f"{entry}-public_key.pem")
+
+        return next(
+            (
+                os.path.join(self.path, fname)
+                for fname in fnames
+                if os.path.isfile(os.path.join(self.path, fname))
+            ),
+            None,
+        )
+
+    def private_keyfile(self, *names: str) -> Optional[str]:
+        """Returns the first match of a useable private key based names
+        provided."""
+
+        if not PEM_SUPPORT:
+            msg = "PEM Support unavailable; install cryptography library"
+            logger.warning(msg)
+            raise ApprisePEMException(msg)
+
+        if self._prv_keyfile:
+            # If our code reaches here, then we fetch our private key
+            pem_key = self._prv_keyfile[0]
+            if not pem_key:
+                # We could not access the attachment
+                logger.error(
+                    "Could not access PEM Private Key"
+                    f" {pem_key.url(privacy=True)}."
+                )
+                return False
+
+            return pem_key.path
+
+        elif not self.path:
+            # No path
+            return None
+
+        fnames = [
+            "private_key.pem",
+            "private.pem",
+            "prv.pem",
+        ]
+
+        if self.name:
+            # Include our name in the list
+            fnames = [self.name, *names]
+
+        for name in names:
+            fnames.insert(0, f"{name}-private_key.pem")
+
+            entry = name.lower()
+            fnames.insert(0, f"{entry}-private_key.pem")
+
+        return next(
+            (
+                os.path.join(self.path, fname)
+                for fname in fnames
+                if os.path.isfile(os.path.join(self.path, fname))
+            ),
+            None,
+        )
+
+    def public_key(
+        self,
+        *names: str,
+        autogen: Optional[bool] = None,
+        autodetect: bool = True,
+    ) -> Optional["ec.EllipticCurvePublicKey"]:
+        """Opens a spcified pem public file and returns the key from it which
+        is used to decrypt the message."""
+        if self.__public_key or not autodetect:
+            return self.__public_key
+
+        path = self.public_keyfile(*names)
+        if not path:
+            if (
+                autogen if autogen is not None else self.asset.pem_autogen
+            ) and self.keygen(*names):
+                path = self.public_keyfile(*names)
+                if path:
+                    # We should get a hit now
+                    return self.public_key(autogen=False)
+
+            logger.warning("No PEM Public Key could be loaded")
+            return None
+
+        return (
+            self.__public_key
+            if (
+                self.load_public_key(path)
+                or
+                # Try to see if we can load a private key (which we ca
+                # generate a public from)
+                self.private_key(*names, autogen=autogen)
+            )
+            else None
+        )
+
+    def private_key(
+        self,
+        *names: str,
+        autogen: Optional[bool] = None,
+        autodetect: bool = True,
+    ) -> Optional["ec.EllipticCurvePrivateKey"]:
+        """Opens a spcified pem private file and returns the key from it which
+        is used to encrypt the message."""
+        if self.__private_key or not autodetect:
+            return self.__private_key
+
+        path = self.private_keyfile(*names)
+        if not path:
+            if (
+                autogen if autogen is not None else self.asset.pem_autogen
+            ) and self.keygen(*names):
+                path = self.private_keyfile(*names)
+                if path:
+                    # We should get a hit now
+                    return self.private_key(autogen=False)
+
+            logger.warning("No PEM Private Key could be loaded")
+            return None
+
+        return self.__private_key if self.load_private_key(path) else None
+
+    def encrypt_webpush(
+        self,
+        message: Union[str, bytes],
+        public_key: "ec.EllipticCurvePublicKey",
+        auth_secret: bytes,
+    ) -> bytes:
+        """Encrypt a WebPush message using the recipient's public key and auth
+        secret.
+
+        Accepts input message as str or bytes.
+        """
+        if isinstance(message, str):
+            message = message.encode("utf-8")
+
+        # 1. Generate ephemeral EC private/Public key
+        ephemeral_private_key = ec.generate_private_key(
+            ec.SECP256R1(), default_backend()
+        )
+        ephemeral_public_key = ephemeral_private_key.public_key().public_bytes(
+            encoding=Encoding.X962, format=PublicFormat.UncompressedPoint
+        )
+
+        # 2. Random salt
+        salt = os.urandom(16)
+
+        # 3. Generate shared secret via ECDH
+        shared_secret = ephemeral_private_key.exchange(ec.ECDH(), public_key)
+
+        # 4. Derive PRK using HKDF (first phase)
+        recipient_public_key_bytes = public_key.public_bytes(
+            encoding=Encoding.X962,
+            format=PublicFormat.UncompressedPoint,
+        )
+
+        # 5. Derive Encryption key
+        hkdf_secret = HKDF(
+            algorithm=hashes.SHA256(),
+            length=32,
+            salt=auth_secret,
+            info=b"WebPush: info\x00"
+            + recipient_public_key_bytes
+            + ephemeral_public_key,
+            backend=default_backend(),
+        ).derive(shared_secret)
+
+        # 6. Derive Content Encryption Key
+        hkdf_key = HKDF(
+            algorithm=hashes.SHA256(),
+            length=16,
+            salt=salt,
+            info=b"Content-Encoding: aes128gcm\x00",
+            backend=default_backend(),
+        ).derive(hkdf_secret)
+
+        # 7. Derive Nonce
+        hkdf_nonce = HKDF(
+            algorithm=hashes.SHA256(),
+            length=12,
+            salt=salt,
+            info=b"Content-Encoding: nonce\x00",
+            backend=default_backend(),
+        ).derive(hkdf_secret)
+
+        # 8. Encrypt the message
+        aesgcm = AESGCM(hkdf_key)
+        # RFC8291 requires us to add '\0x02' byte to end of message
+        ciphertext = aesgcm.encrypt(
+            hkdf_nonce, message + b"\x02", associated_data=None
+        )
+
+        # 9. Build WebPush header + payload
+        header = salt
+        header += struct.pack("!L", self.max_webpush_record_size)
+        header += struct.pack("!B", len(ephemeral_public_key))
+        header += ephemeral_public_key
+        header += ciphertext
+
+        return header
+
+    def encrypt(
+        self,
+        message: Union[str, bytes],
+        public_key: "Optional[ec.EllipticCurvePublicKey]" = None,
+        salt: Optional[bytes] = None,
+    ) -> Optional[str]:
+        """Encrypts a message using the recipient's public key (or self public
+        key if none provided).
+
+        Message can be str or bytes.
+        """
+
+        if not PEM_SUPPORT:
+            msg = "PEM Support unavailable; install cryptography library"
+            logger.warning(msg)
+            raise ApprisePEMException(msg)
+
+        # 1. Handle string vs bytes input
+        if isinstance(message, str):
+            message = message.encode("utf-8")
+
+        # 2. Select public key
+        if public_key is None:
+            public_key = self.public_key()
+            if public_key is None:
+                logger.debug("No public key available for encryption.")
+                return None
+
+        # 3. Generate ephemeral EC private key
+        ephemeral_private_key = ec.generate_private_key(
+            ec.SECP256R1(), default_backend()
+        )
+
+        # 4. Derive shared secret
+        shared_secret = ephemeral_private_key.exchange(ec.ECDH(), public_key)
+
+        # 5. Derive symmetric AES key using HKDF
+        derived_key = HKDF(
+            algorithm=hashes.SHA256(),
+            length=32,
+            salt=salt,  # Allow salt=None if not provided
+            info=b"ecies-encryption",
+            backend=default_backend(),
+        ).derive(shared_secret)
+
+        # 6. Encrypt the message using AES-GCM
+        iv = os.urandom(12)  # 96-bit random IV for GCM
+        encryptor = Cipher(
+            algorithms.AES(derived_key),
+            modes.GCM(iv),
+            backend=default_backend(),
+        ).encryptor()
+
+        ciphertext = encryptor.update(message) + encryptor.finalize()
+        tag = encryptor.tag
+
+        # 7. Serialize ephemeral public key as X9.62 Uncompressed Point
+        ephemeral_public_key_bytes = (
+            ephemeral_private_key.public_key().public_bytes(
+                encoding=serialization.Encoding.X962,
+                format=serialization.PublicFormat.UncompressedPoint,
+            )
+        )
+
+        # 8. Combine everything cleanly
+        full_payload = {
+            "ephemeral_pubkey": base64_urlencode(ephemeral_public_key_bytes),
+            "iv": base64_urlencode(iv),
+            "tag": base64_urlencode(tag),
+            "ciphertext": base64_urlencode(ciphertext),
+        }
+
+        return base64.b64encode(
+            json.dumps(full_payload).encode("utf-8")
+        ).decode("utf-8")
+
+    def decrypt(
+        self,
+        encrypted_payload: Union[str, bytes],
+        private_key: "Optional[ec.EllipticCurvePrivateKey]" = None,
+        salt: Optional[bytes] = None,
+    ) -> Optional[str]:
+        """Decrypts a message using the provided private key or fallback to
+        self's private key.
+
+        Payload is the base64-encoded JSON from encrypt().
+        """
+
+        if not PEM_SUPPORT:
+            msg = "PEM Support unavailable; install cryptography library"
+            logger.warning(msg)
+            raise ApprisePEMException(msg)
+
+        # 1. Parse input
+        try:
+            if isinstance(encrypted_payload, str):
+                payload_bytes = base64.b64decode(
+                    encrypted_payload.encode("utf-8")
+                )
+
+            else:
+                payload_bytes = base64.b64decode(encrypted_payload)
+
+        except binascii.Error:
+            # Bad Padding
+            logger.debug("Unparseable encrypted content provided")
+            return None
+
+        try:
+            payload = json.loads(payload_bytes.decode("utf-8"))
+
+        except UnicodeDecodeError:
+            logger.debug("Unparseable encrypted content provided")
+            return None
+
+        ephemeral_pubkey_bytes = base64_urldecode(payload["ephemeral_pubkey"])
+        iv = base64_urldecode(payload["iv"])
+        tag = base64_urldecode(payload["tag"])
+        ciphertext = base64_urldecode(payload["ciphertext"])
+
+        # 2. Select private key
+        if private_key is None:
+            private_key = self.private_key()
+            if private_key is None:
+                logger.debug("No private key available for decryption.")
+                return None
+
+        # 3. Load ephemeral public key from sender
+        ephemeral_pubkey = ec.EllipticCurvePublicKey.from_encoded_point(
+            ec.SECP256R1(), ephemeral_pubkey_bytes
+        )
+
+        # 4. ECDH shared secret
+        shared_secret = private_key.exchange(ec.ECDH(), ephemeral_pubkey)
+
+        # 5. Derive symmetric AES key with HKDF
+        derived_key = HKDF(
+            algorithm=hashes.SHA256(),
+            length=32,
+            salt=salt,
+            info=b"ecies-encryption",
+            backend=default_backend(),
+        ).derive(shared_secret)
+
+        # 6. Decrypt using AES-GCM
+        decryptor = Cipher(
+            algorithms.AES(derived_key),
+            modes.GCM(iv, tag),
+            backend=default_backend(),
+        ).decryptor()
+
+        try:
+            plaintext = decryptor.update(ciphertext) + decryptor.finalize()
+
+        except InvalidTag:
+            logger.debug("Decryption failed - Authentication Mismatch")
+            # Reason for Error:
+            #   - Mismatched or missing salt
+            #   - Mismatched iv, tag, or ciphertext
+            #   - Incorrect or corrupted ephemeral_pubkey
+            #   - Wrong or incomplete key derivation
+            #   - Data being altered between encryption and decryption
+            #     (truncated/corrupted)
+
+            # Basically if we get here, we tried to decrypt encrypted content
+            # using the wrong key.
+            return None
+
+        # 7. Return decoded message
+        return plaintext.decode("utf-8")
+
+    def sign(self, content: bytes) -> Optional[bytes]:
+        """Sign the message using ES256 (ECDSA w/ SHA256) via private key."""
+
+        try:
+            # Sign the message using ES256 (ECDSA w/ SHA256)
+            der_sig = self.private_key().sign(
+                content, ec.ECDSA(hashes.SHA256())
+            )
+
+        except AttributeError:
+            # NoneType; could not load key
+            return None
+
+        # Convert DER to raw R||S
+        r, s = decode_dss_signature(der_sig)
+        return r.to_bytes(32, byteorder="big") + s.to_bytes(
+            32, byteorder="big"
+        )
+
+    @property
+    def pub_keyfile(self) -> Optional[Union[str, bool]]:
+        """Returns the Public Keyfile Path if set otherwise it returns None
+        This property returns False if a keyfile was provided, but was
+        invalid."""
+        return (
+            None
+            if not self._pub_keyfile
+            else (
+                False
+                if not self._pub_keyfile[0]
+                else self._pub_keyfile[0].path
+            )
+        )
+
+    @property
+    def prv_keyfile(self) -> Optional[Union[str, bool]]:
+        """Returns the Private Keyfile Path if set otherwise it returns None
+        This property returns False if a keyfile was provided, but was
+        invalid."""
+        return (
+            None
+            if not self._prv_keyfile
+            else (
+                False
+                if not self._prv_keyfile[0]
+                else self._prv_keyfile[0].path
+            )
+        )
+
+    @property
+    def x962_str(self) -> str:
+        """X962 serialization based on public key."""
+        try:
+            return base64_urlencode(
+                self.public_key().public_bytes(
+                    encoding=serialization.Encoding.X962,
+                    format=serialization.PublicFormat.UncompressedPoint,
+                )
+            )
+        except AttributeError:
+            # Public Key could not be generated (public_key() returned None)
+            return ""
+
+    def __bool__(self) -> bool:
+        """Returns True if at least 1 key was loaded."""
+        return bool(self.private_key() or self.public_key())
diff --git a/libs/apprise/utils/pgp.py b/libs/apprise/utils/pgp.py
index 5a20881721..8ca21a4233 100644
--- a/libs/apprise/utils/pgp.py
+++ b/libs/apprise/utils/pgp.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,19 +25,18 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-import os
+from datetime import datetime, timedelta, timezone
 import hashlib
-from datetime import datetime
-from datetime import timedelta
-from datetime import timezone
+import os
 
 from ..apprise_attachment import AppriseAttachment
 from ..asset import AppriseAsset
-from ..logger import logger
 from ..exception import ApprisePluginException
+from ..logger import logger
 
 try:
     import pgpy
+
     # Pretty Good Privacy (PGP) Support enabled
     PGP_SUPPORT = True
 
@@ -48,29 +46,27 @@
 
 
 class ApprisePGPException(ApprisePluginException):
-    """
-    Thrown when there is an error with the Pretty Good Privacy Controller
-    """
+    """Thrown when there is an error with the Pretty Good Privacy
+    Controller."""
+
     def __init__(self, message, error_code=602):
         super().__init__(message, error_code=error_code)
 
 
 class ApprisePGPController:
-    """
-    Pretty Good Privacy Controller Tool for the Apprise Library
-    """
+    """Pretty Good Privacy Controller Tool for the Apprise Library."""
 
     # There is no reason a PGP Public Key should exceed 8K in size
     # If it is more than this, then it is not accepted
     max_pgp_public_key_size = 8000
 
-    def __init__(self, path, pub_keyfile=None, email=None, asset=None,
-                 **kwargs):
-        """
-        Path should be the directory keys can be written and read from such as
-            <notifyobject>.store.path
+    def __init__(
+        self, path, pub_keyfile=None, email=None, asset=None, **kwargs
+    ):
+        """Path should be the directory keys can be written and read from such
+        as <notifyobject>.store.path.
 
-            Optionally additionally specify a keyfile to explicitly open
+        Optionally additionally specify a keyfile to explicitly open
         """
 
         # PGP hash
@@ -83,8 +79,9 @@ def __init__(self, path, pub_keyfile=None, email=None, asset=None,
         self.email = email
 
         # Prepare our Asset Object
-        self.asset = \
+        self.asset = (
             asset if isinstance(asset, AppriseAsset) else AppriseAsset()
+        )
 
         if pub_keyfile:
             # Create ourselves an Attachment to work with; this grants us the
@@ -102,25 +99,28 @@ def __init__(self, path, pub_keyfile=None, email=None, asset=None,
             self._pub_keyfile = None
 
     def keygen(self, email=None, name=None, force=False):
-        """
-        Generates a set of keys based on email configured.
-        """
+        """Generates a set of keys based on email configured."""
 
         try:
             # Create a new RSA key pair with 2048-bit strength
             key = pgpy.PGPKey.new(
-                pgpy.constants.PubKeyAlgorithm.RSAEncryptOrSign, 2048)
+                pgpy.constants.PubKeyAlgorithm.RSAEncryptOrSign, 2048
+            )
 
         except NameError:
             # PGPy not installed
-            logger.debug('PGPy not installed; keygen disabled')
+            logger.debug("PGPy not installed; keygen disabled")
             return False
 
         if self._pub_keyfile is not None or not self.path:
             logger.trace(
-                'PGP keygen disabled, reason=%s',
-                'keyfile-defined' if self._pub_keyfile is not None
-                else 'no-write-path')
+                "PGP keygen disabled, reason=%s",
+                (
+                    "keyfile-defined"
+                    if self._pub_keyfile is not None
+                    else "no-write-path"
+                ),
+            )
             return False
 
         if not name:
@@ -133,67 +133,73 @@ def keygen(self, email=None, name=None, force=False):
         uid = pgpy.PGPUID.new(name, email=email)
 
         # Filenames
-        file_prefix = email.split('@')[0].lower()
+        file_prefix = email.split("@")[0].lower()
 
-        pub_path = os.path.join(self.path, f'{file_prefix}-pub.asc')
-        prv_path = os.path.join(self.path, f'{file_prefix}-prv.asc')
+        pub_path = os.path.join(self.path, f"{file_prefix}-pub.asc")
+        prv_path = os.path.join(self.path, f"{file_prefix}-prv.asc")
 
         if os.path.isfile(pub_path) and not force:
             logger.debug(
-                'PGP generation skipped; Public Key already exists: %s',
-                pub_path)
+                "PGP generation skipped; Public Key already exists: %s",
+                pub_path,
+            )
             return True
 
         # Persistent Storage Key
         lookup_key = hashlib.sha1(
-            os.path.abspath(pub_path).encode('utf-8')).hexdigest()
+            os.path.abspath(pub_path).encode("utf-8")
+        ).hexdigest()
         if lookup_key in self.__key_lookup:
             # Ensure our key no longer exists
             del self.__key_lookup[lookup_key]
 
         # Add the user ID to the key
-        key.add_uid(uid, usage={
-            pgpy.constants.KeyFlags.Sign,
-            pgpy.constants.KeyFlags.EncryptCommunications},
+        key.add_uid(
+            uid,
+            usage={
+                pgpy.constants.KeyFlags.Sign,
+                pgpy.constants.KeyFlags.EncryptCommunications,
+            },
             hashes=[pgpy.constants.HashAlgorithm.SHA256],
             ciphers=[pgpy.constants.SymmetricKeyAlgorithm.AES256],
-            compression=[pgpy.constants.CompressionAlgorithm.ZLIB])
+            compression=[pgpy.constants.CompressionAlgorithm.ZLIB],
+        )
 
         try:
             # Write our keys to disk
-            with open(pub_path, 'w') as f:
+            with open(pub_path, "w") as f:
                 f.write(str(key.pubkey))
 
         except OSError as e:
-            logger.warning('Error writing PGP file %s', pub_path)
-            logger.debug(f'I/O Exception: {e}')
+            logger.warning("Error writing PGP file %s", pub_path)
+            logger.debug(f"I/O Exception: {e}")
 
             # Cleanup
             try:
                 os.unlink(pub_path)
-                logger.trace('Removed %s', pub_path)
+                logger.trace("Removed %s", pub_path)
 
             except OSError:
                 pass
 
         try:
-            with open(prv_path, 'w') as f:
+            with open(prv_path, "w") as f:
                 f.write(str(key))
 
         except OSError as e:
-            logger.warning('Error writing PGP file %s', prv_path)
-            logger.debug(f'I/O Exception: {e}')
+            logger.warning("Error writing PGP file %s", prv_path)
+            logger.debug(f"I/O Exception: {e}")
 
             try:
                 os.unlink(pub_path)
-                logger.trace('Removed %s', pub_path)
+                logger.trace("Removed %s", pub_path)
 
             except OSError:
                 pass
 
             try:
                 os.unlink(prv_path)
-                logger.trace('Removed %s', prv_path)
+                logger.trace("Removed %s", prv_path)
 
             except OSError:
                 pass
@@ -201,18 +207,18 @@ def keygen(self, email=None, name=None, force=False):
             return False
 
         logger.info(
-            'Wrote PGP Keys for %s/%s',
+            "Wrote PGP Keys for %s/%s",
             os.path.dirname(pub_path),
-            os.path.basename(pub_path))
+            os.path.basename(pub_path),
+        )
         return True
 
     def public_keyfile(self, *emails):
-        """
-        Returns the first match of a useable public key based emails provided
-        """
+        """Returns the first match of a useable public key based emails
+        provided."""
 
         if not PGP_SUPPORT:
-            msg = 'PGP Support unavailable; install PGPy library'
+            msg = "PGP Support unavailable; install PGPy library"
             logger.warning(msg)
             raise ApprisePGPException(msg)
 
@@ -222,8 +228,9 @@ def public_keyfile(self, *emails):
             if not pgp_key:
                 # We could not access the attachment
                 logger.error(
-                    'Could not access PGP Public Key {}.'.format(
-                        pgp_key.url(privacy=True)))
+                    "Could not access PGP Public Key"
+                    f" {pgp_key.url(privacy=True)}."
+                )
                 return False
 
             return pgp_key.path
@@ -233,86 +240,83 @@ def public_keyfile(self, *emails):
             return None
 
         fnames = [
-            'pgp-public.asc',
-            'pgp-pub.asc',
-            'public.asc',
-            'pub.asc',
+            "pgp-public.asc",
+            "pgp-pub.asc",
+            "public.asc",
+            "pub.asc",
         ]
 
         if self.email:
             # Include our email in the list
-            emails = [self.email] + [*emails]
+            emails = [self.email, *emails]
 
         for email in emails:
-            _entry = email.split('@')[0].lower()
-            fnames.insert(0, f'{_entry}-pub.asc')
+            entry = email.split("@")[0].lower()
+            fnames.insert(0, f"{entry}-pub.asc")
 
             # Lowercase email (Highest Priority)
-            _entry = email.lower()
-            fnames.insert(0, f'{_entry}-pub.asc')
+            entry = email.lower()
+            fnames.insert(0, f"{entry}-pub.asc")
 
         return next(
-            (os.path.join(self.path, fname)
-             for fname in fnames
-             if os.path.isfile(os.path.join(self.path, fname))),
-            None)
+            (
+                os.path.join(self.path, fname)
+                for fname in fnames
+                if os.path.isfile(os.path.join(self.path, fname))
+            ),
+            None,
+        )
 
     def public_key(self, *emails, autogen=None):
-        """
-        Opens a spcified pgp public file and returns the key from it which
-        is used to encrypt the message
-        """
+        """Opens a spcified pgp public file and returns the key from it which
+        is used to encrypt the message."""
         path = self.public_keyfile(*emails)
         if not path:
-            if (autogen if autogen is not None else self.asset.pgp_autogen) \
-                    and self.keygen(*emails):
+            if (
+                autogen if autogen is not None else self.asset.pgp_autogen
+            ) and self.keygen(*emails):
                 path = self.public_keyfile(*emails)
                 if path:
                     # We should get a hit now
                     return self.public_key(*emails)
 
-            logger.warning('No PGP Public Key could be loaded')
+            logger.warning("No PGP Public Key could be loaded")
             return None
 
         # Persistent Storage Key
-        key = hashlib.sha1(
-            os.path.abspath(path).encode('utf-8')).hexdigest()
+        key = hashlib.sha1(os.path.abspath(path).encode("utf-8")).hexdigest()
         if key in self.__key_lookup:
             # Take an early exit
-            return self.__key_lookup[key]['public_key']
+            return self.__key_lookup[key]["public_key"]
 
         try:
-            with open(path, 'r') as key_file:
+            with open(path) as key_file:
                 public_key, _ = pgpy.PGPKey.from_blob(key_file.read())
 
         except NameError:
             # PGPy not installed
-            logger.debug(
-                'PGPy not installed; skipping PGP support: %s', path)
+            logger.debug("PGPy not installed; skipping PGP support: %s", path)
             return None
 
         except FileNotFoundError:
             # Generate keys
-            logger.debug('PGP Public Key file not found: %s', path)
+            logger.debug("PGP Public Key file not found: %s", path)
             return None
 
         except OSError as e:
-            logger.warning('Error accessing PGP Public Key file %s', path)
-            logger.debug(f'I/O Exception: {e}')
+            logger.warning("Error accessing PGP Public Key file %s", path)
+            logger.debug(f"I/O Exception: {e}")
             return None
 
         self.__key_lookup[key] = {
-            'public_key': public_key,
-            'expires':
-            datetime.now(timezone.utc) + timedelta(seconds=86400)
+            "public_key": public_key,
+            "expires": datetime.now(timezone.utc) + timedelta(seconds=86400),
         }
         return public_key
 
     # Encrypt message using the recipient's public key
     def encrypt(self, message, *emails):
-        """
-        If provided a path to a pgp-key, content is encrypted
-        """
+        """If provided a path to a pgp-key, content is encrypted."""
 
         # Acquire our key
         public_key = self.public_key(*emails)
@@ -327,28 +331,33 @@ def encrypt(self, message, *emails):
 
         except pgpy.errors.PGPError:
             # Encryption not Possible
-            logger.debug(
-                'PGP Public Key Corruption; encryption not possible')
+            logger.debug("PGP Public Key Corruption; encryption not possible")
 
         except NameError:
             # PGPy not installed
-            logger.debug('PGPy not installed; Skipping PGP encryption')
+            logger.debug("PGPy not installed; Skipping PGP encryption")
 
         return None
 
     def prune(self):
-        """
-        Prunes old entries from the public_key index
-        """
+        """Prunes old entries from the public_key index."""
         self.__key_lookup = {
-            key: value for key, value in self.__key_lookup.items()
-            if value['expires'] > datetime.now(timezone.utc)}
+            key: value
+            for key, value in self.__key_lookup.items()
+            if value["expires"] > datetime.now(timezone.utc)
+        }
 
     @property
     def pub_keyfile(self):
-        """
-        Returns the Public Keyfile Path if set otherwise it returns None
-        This property returns False if a keyfile was provided, but was invalid
-        """
-        return None if self._pub_keyfile is None else (
-            False if not self._pub_keyfile[0] else self._pub_keyfile[0].path)
+        """Returns the Public Keyfile Path if set otherwise it returns None
+        This property returns False if a keyfile was provided, but was
+        invalid."""
+        return (
+            None
+            if self._pub_keyfile is None
+            else (
+                False
+                if not self._pub_keyfile[0]
+                else self._pub_keyfile[0].path
+            )
+        )
diff --git a/libs/apprise/utils/sanitize.py b/libs/apprise/utils/sanitize.py
new file mode 100644
index 0000000000..4627c0269d
--- /dev/null
+++ b/libs/apprise/utils/sanitize.py
@@ -0,0 +1,256 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+"""Utilities that make payloads safe to *print* in debug and trace logs.
+
+This module is intentionally scoped to log presentation only.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from hashlib import sha256
+from typing import Any, Optional
+
+# Keys that commonly contain large binary-like values.
+#
+# This list is used as a *hint* to enable a more aggressive summarization mode
+# for values underneath matching keys. The structure is still walked, only the
+# leaf string/bytes values are summarized more aggressively.
+#
+# Keep this list conservative. Very generic tokens may cause false positives.
+_BLOB_KEYWORDS = (
+    "base64",
+    "attachment",
+    "attachments",
+    "base64_attachments",
+    "contentbytes",
+    "blob",
+    "file",
+    "data",
+    "image",
+    "media",
+    "document",
+)
+
+
+@dataclass(frozen=True)
+class SanitizeOptions:
+    """Options controlling payload sanitization for debug logging.
+
+    The defaults are deliberately conservative and tuned for logging, not for
+    data processing. When in doubt, prefer smaller values to keep logging
+    cheap.
+
+    Attributes:
+        max_depth: Maximum recursion depth before truncation markers appear.
+        max_items: Global upper bound on visited items, across the whole walk.
+        max_str_len: Strings longer than this are summarized with a preview.
+        preview: Number of characters to show at the start and end of
+                 summaries.
+        hash_sample_size: Maximum bytes hashed when generating a sha256
+                          preview.
+        aggressive_blob_keys: If True, summarize values under blob-like keys
+            even when they are not huge, because these values are often encoded
+            attachments (for example, base64).
+    """
+
+    # How many recursive lists/sets/tuples/dicts to delve into before
+    # aborting
+    max_depth: int = 10
+
+    # The max amount of fields to process before we just abort (too many)
+    max_items: int = 100
+
+    # Strings longer than this are summarized
+    max_str_len: int = 512
+
+    # Preview size for summarized strings
+    preview: int = 32
+
+    # Bound hashing work
+    # Strings longer than this (usually large attachments) include
+    # sha256 hash value of it in response
+    hash_sample_size: int = 8192
+
+    # If True, summarize values under blob-like keys even if they are smaller
+    # than the defined max_str_len.
+    aggressive_blob_keys: bool = True
+
+
+def sanitize_payload(
+        value: Any, *, options: Optional[SanitizeOptions] = None) -> Any:
+    """
+    This function is intended for DEBUG and TRACE logging only.
+
+    can add i/o to generate the printed copy, but the output is much
+    better then just printing what could be a massive payload (with
+    attachments).
+
+    The ideal setup for this function is when you need to print what
+    could be a very large object such as in the send() of a Apprise
+    service, you would structure it like this:
+
+        # check for at least the DEBUG level... you can also set
+        # logging.TRACE if you wanted as well:
+        if self.logger.isEnabledFor(logging.DEBUG):
+
+            # Then safely wrap the output using this function:
+            self.logger.debug(
+                "Service Payload: %s", sanitize_payload(payload))
+    """
+    opts = options or SanitizeOptions()
+
+    # Track already-seen objects to prevent infinite loops on recursive graphs.
+    seen_ids: set[int] = set()
+
+    # Global counter that enforces opts.max_items across the entire traversal.
+    items_seen = 0
+
+    def _hash_bytes(b: bytes) -> str:
+        """Return a short sha256 prefix for bytes, bounded by
+        hash_sample_size."""
+        if len(b) > opts.hash_sample_size:
+            b = b[: opts.hash_sample_size]
+        return sha256(b).hexdigest()[:12]
+
+    def _summarize_str(s: str) -> str:
+        """Summarize strings longer than opts.max_str_len with a preview."""
+        nonlocal items_seen
+        items_seen += 1
+
+        length = len(s)
+        if length <= opts.max_str_len:
+            return s
+
+        head = s[: opts.preview]
+        tail = s[-opts.preview :] if length >= opts.preview else s
+        return f"<string len={length} head={head!r} tail={tail!r}>"
+
+    def _summarize_bytes(b: bytes) -> str:
+        """Summarize bytes with length and a short bounded sha256 prefix."""
+        nonlocal items_seen
+        items_seen += 1
+        return f"<bytes len={len(b)} sha256={_hash_bytes(b)}>"
+
+    def _is_blob_key(k: str) -> bool:
+        """Return True if a key name indicates blob-like content.
+
+        This keeps behaviour predictable while avoiding heavy scanning of
+        values. Add items to _BLOB_KEYWORDS (not case sensitive) if required
+        to optimize speed of parsing.
+        """
+        lk = k.lower()
+        return lk in _BLOB_KEYWORDS
+
+    def _summarize_key(k: Any) -> Any:
+        """Summarize keys where needed, preserving readability in logs."""
+        if isinstance(k, str):
+            # Keys are usually short. Only summarize if they are unexpectedly
+            # large to avoid log pollution.
+            return _summarize_str(k)
+        if isinstance(k, bytes):
+            return _summarize_bytes(k)
+        return k
+
+    def _walk(obj: Any, depth: int, *, blob_mode: bool = False) -> Any:
+        """Recursively walk payload structures and summarize leaf values."""
+        nonlocal items_seen
+
+        # Global safety limits first, so we can exit cheaply.
+        if items_seen >= opts.max_items:
+            return "<truncated: global item limit reached>"
+        if depth > opts.max_depth:
+            return "<truncated: max depth reached>"
+
+        # Pass-through primitives.
+        if obj is None or isinstance(obj, (bool, int, float)):
+            items_seen += 1
+            return obj
+
+        # Strings: optionally apply blob-mode summaries.
+        if isinstance(obj, str):
+            if blob_mode and opts.aggressive_blob_keys:
+                # Always summarize blob fields, even if not huge
+                length = len(obj)
+                head = obj[: opts.preview]
+                tail = obj[-opts.preview :] if length >= opts.preview else obj
+                items_seen += 1
+                return (
+                    f"<string len={length} blob "
+                    f"head={head!r} tail={tail!r}>")
+            return _summarize_str(obj)
+
+        # Bytes: always summarize.
+        if isinstance(obj, bytes):
+            return _summarize_bytes(obj)
+
+        # Prevent recursion loops on self-referential objects.
+        obj_id = id(obj)
+        if obj_id in seen_ids:
+            return "<recursive>"
+        seen_ids.add(obj_id)
+
+        # Dict: walk values. Keys may be summarized for readability.
+        if isinstance(obj, dict):
+            out: dict[Any, Any] = {}
+            for k, v in obj.items():
+                if items_seen >= opts.max_items:
+                    out["<truncated>"] = "..."
+                    break
+
+                sk = _summarize_key(k)
+
+                # Enable blob mode for suspicious keys. We still walk the
+                # structure, but leaf values are summarized aggressively.
+                child_blob_mode = blob_mode
+                if isinstance(k, str) and _is_blob_key(k):
+                    child_blob_mode = True
+
+                out[sk] = _walk(v, depth + 1, blob_mode=child_blob_mode)
+            return out
+
+        # Sequences: walk each entry. Sets are returned as lists for
+        #            readability.
+        if isinstance(obj, (list, tuple, set, frozenset)):
+            out_list: list[Any] = []
+            for entry in obj:
+                if items_seen >= opts.max_items:
+                    out_list.append("<truncated: limit reached>")
+                    break
+                out_list.append(_walk(entry, depth + 1, blob_mode=blob_mode))
+
+            if isinstance(obj, tuple):
+                return tuple(out_list)
+            return out_list
+
+        # Unknown objects: fall back to repr().
+        items_seen += 1
+        return repr(obj)
+
+    # Recursively walk all elements of the object passed
+    return _walk(value, 0)
diff --git a/libs/apprise/utils/singleton.py b/libs/apprise/utils/singleton.py
index d3d6ee26bc..f951ac4075 100644
--- a/libs/apprise/utils/singleton.py
+++ b/libs/apprise/utils/singleton.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -28,15 +27,12 @@
 
 
 class Singleton(type):
-    """
-    Our Singleton MetaClass
-    """
+    """Our Singleton MetaClass."""
+
     _instances = {}
 
     def __call__(cls, *args, **kwargs):
-        """
-        instantiate our singleton meta entry
-        """
+        """Instantiate our singleton meta entry."""
         if cls not in cls._instances:
             # we have not every built an instance before.  Build one now.
             cls._instances[cls] = super().__call__(*args, **kwargs)
diff --git a/libs/apprise/utils/socket.py b/libs/apprise/utils/socket.py
new file mode 100644
index 0000000000..326a0b8c45
--- /dev/null
+++ b/libs/apprise/utils/socket.py
@@ -0,0 +1,646 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+from __future__ import annotations
+
+import contextlib
+import ipaddress
+import select
+import socket
+import ssl
+import time
+from typing import Optional, Union
+
+from ..exception import AppriseException, AppriseInvalidData
+from ..logger import logger
+
+TimeoutType = Optional[
+    Union[float, tuple[Optional[float], Optional[float]]]
+]
+
+
+class AppriseSocketError(AppriseException):
+    """Raised for socket or TLS related failures."""
+
+
+class SocketTransport:
+    """
+    TCP client transport with optional TLS upgrade.
+
+    Behaviour:
+      - secure=False (default): plain TCP
+      - secure=True: upgrade to TLS (immediately in connect(), or manually via
+        start_tls())
+      - verify=True (default): validate certificate chain and hostname using a
+        certifi CA bundle
+      - verify=False: accept invalid or self-signed certs
+
+    Timeout behaviour (requests-compatible):
+      - timeout=float => (connect, read) both set to float
+      - timeout=(connect, read) => tuple form
+      - None => no defaults (connect/read can block indefinitely)
+    """
+
+    def __init__(
+        self,
+        host: str,
+        port: int,
+        bind_addr: Optional[str] = None,
+        bind_port: Optional[int] = None,
+        secure: bool = False,
+        verify: bool = True,
+        timeout: TimeoutType = 10.0,
+        retries: int = 0,
+    ) -> None:
+        self.host = host
+        self.port = int(port)
+        self.bind_addr = bind_addr
+        self.bind_port = bind_port
+
+        self.secure = bool(secure)
+        self.verify = bool(verify)
+        self.retries = retries
+
+        self._connect_timeout, self._read_timeout = \
+            self._coerce_timeout(timeout)
+
+        self._sock: Optional[socket.socket] = None
+        self._rfile = None
+        self._wfile = None
+        self._is_tls: bool = False
+
+        # True once we have successfully read or written data since the last
+        # connect(). Used to decide whether reconnect attempts are allowed.
+        self._had_io: bool = False
+
+        self.local_addr: Optional[tuple[str, int]] = None
+        self.remote_addr: Optional[tuple[str, int]] = None
+
+    @staticmethod
+    def _coerce_timeout(
+            timeout: TimeoutType) -> tuple[Optional[float], Optional[float]]:
+        """
+        Coerce requests-style timeout into (connect_timeout, read_timeout).
+        """
+        if timeout is None:
+            return None, None
+
+        if isinstance(timeout, (int, float)):
+            t = float(timeout)
+            if t < 0:
+                raise AppriseInvalidData("timeout must be >= 0")
+            return t, t
+
+        if isinstance(timeout, tuple) and len(timeout) == 2:
+            connect_t, read_t = timeout
+            if connect_t is not None:
+                connect_t = float(connect_t)
+                if connect_t < 0:
+                    raise AppriseInvalidData("connect timeout must be >= 0")
+            if read_t is not None:
+                read_t = float(read_t)
+                if read_t < 0:
+                    raise AppriseInvalidData("read timeout must be >= 0")
+            return connect_t, read_t
+
+        raise AppriseInvalidData(
+            "timeout must be None, a float, or a (connect, read) tuple"
+        )
+
+    @property
+    def connected(self) -> bool:
+        return self._sock is not None
+
+    @property
+    def is_tls(self) -> bool:
+        return self._is_tls
+
+    def close(self) -> None:
+        """Close the socket and associated file wrappers."""
+        try:
+            if self._wfile is not None:
+                with contextlib.suppress(Exception):
+                    self._wfile.flush()
+                with contextlib.suppress(Exception):
+                    self._wfile.close()
+        finally:
+            self._wfile = None
+
+        try:
+            if self._rfile is not None:
+                with contextlib.suppress(Exception):
+                    self._rfile.close()
+        finally:
+            self._rfile = None
+
+        if self._sock is not None:
+            try:
+                with contextlib.suppress(Exception):
+                    self._sock.shutdown(socket.SHUT_RDWR)
+
+                self._sock.close()
+            finally:
+                self._sock = None
+
+        self._is_tls = False
+        self._had_io = False
+        self.local_addr = None
+        self.remote_addr = None
+
+    def _refresh_wrappers(self) -> None:
+        """Rebuild file wrappers, required after TLS upgrade."""
+
+        if self._sock is None:
+            self._rfile = None
+            self._wfile = None
+            return
+
+        self._rfile = self._sock.makefile("rb", buffering=0)
+        self._wfile = self._sock.makefile("wb", buffering=0)
+
+    def can_read(self, timeout: float = 0.0) -> Optional[bool]:
+        """Return True if readable, False if not, None if closed or error."""
+        if self._sock is None:
+            return None
+        try:
+            r, _, x = select.select(
+                [self._sock], [], [self._sock], float(timeout))
+
+        except OSError:
+            self.close()
+            return None
+
+        if x:
+            self.close()
+            return None
+
+        return bool(r)
+
+    def can_write(self, timeout: float = 0.0) -> Optional[bool]:
+        """Return True if writable, False if not, None if closed or error."""
+        if self._sock is None:
+            return None
+        try:
+            _, w, x = \
+                select.select([], [self._sock], [self._sock], float(timeout))
+        except OSError:
+            self.close()
+            return None
+        if x:
+            self.close()
+            return None
+        return bool(w)
+
+    def connect(self) -> None:
+        """
+        Establish TCP connection, optionally upgrade to TLS immediately if
+        secure=True.
+        """
+        logger.trace(
+            "Socket connect IN: host=%s port=%d secure=%s verify=%s",
+            self.host,
+            self.port,
+            self.secure,
+            self.verify,
+        )
+        self.close()
+
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        try:
+            sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
+
+            if self.bind_addr is not None or self.bind_port is not None:
+                sock.bind(
+                    (self.bind_addr or "127.0.0.1", int(self.bind_port or 0)))
+
+            if self._connect_timeout is not None:
+                sock.settimeout(self._connect_timeout)
+
+            # Establish our connection
+            sock.connect((self.host, self.port))
+
+            # We control I/O blocking explicitly with select()
+            sock.settimeout(None)
+
+            self._sock = sock
+            self._is_tls = False
+            self._had_io = False
+
+            if self.secure:
+                self.start_tls()
+
+            self.local_addr = self._sock.getsockname()
+            self.remote_addr = self._sock.getpeername()
+            self._refresh_wrappers()
+
+            logger.debug(
+                "Socket connected: local=%s remote=%s tls=%s",
+                self.local_addr,
+                self.remote_addr,
+                self._is_tls,
+            )
+
+        except Exception as e:
+            with contextlib.suppress(Exception):
+                sock.close()
+
+            self._sock = None
+            self._had_io = False
+            logger.debug("Socket connect exception: %s", e)
+            raise AppriseSocketError(str(e)) from e
+
+    def _server_hostname_for_tls(self) -> str:
+        """
+        Determine hostname used for SNI and hostname verification.
+
+        If verify=True and host is an IP address, attempt reverse DNS lookup.
+        """
+        host = self.host
+
+        if not self.verify:
+            return host
+
+        try:
+            ipaddress.ip_address(host)
+        except ValueError:
+            return host
+
+        try:
+            name, _, _ = socket.gethostbyaddr(host)
+            return name.rstrip(".") if name else host
+        except Exception:
+            return host
+
+    def _build_ssl_context(self) -> ssl.SSLContext:
+        """Build SSL context using certifi bundle when verify=True."""
+        # Enforce TLS 1.2+ to avoid TLSv1/TLSv1.1 negotiation.
+        # We explicitly enforce TLS >= 1.2 for Python 3.9+ compatibility.
+        if self.verify:
+            import certifi
+
+            ctx = ssl.create_default_context(cafile=certifi.where())
+            ctx.check_hostname = True
+            ctx.verify_mode = ssl.CERT_REQUIRED
+        else:
+            # Still enforce modern TLS even when certificate verification is
+            # disabled, since protocol downgrade is independent of trust.
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+
+        # Enforce TLS 1.2+ to avoid TLSv1/TLSv1.1 negotiation.
+        try:
+            ctx.minimum_version = ssl.TLSVersion.TLSv1_2
+        except Exception:
+            # Fallback for very old Python/OpenSSL combinations
+            with contextlib.suppress(Exception):
+                ctx.options |= ssl.OP_NO_TLSv1
+            with contextlib.suppress(Exception):
+                ctx.options |= ssl.OP_NO_TLSv1_1
+
+        # Disable TLS-level compression (mitigates CRIME-style attacks).
+        with contextlib.suppress(Exception):
+            ctx.options |= ssl.OP_NO_COMPRESSION
+
+        return ctx
+
+    def start_tls(self) -> None:
+        """Upgrade an existing TCP connection to TLS."""
+        if self._sock is None:
+            raise AppriseSocketError("No active connection to upgrade")
+
+        if self._is_tls:
+            return
+
+        server_hostname = self._server_hostname_for_tls()
+        logger.trace("Starting TLS upgrade: sni=%s", server_hostname)
+
+        try:
+            ctx = self._build_ssl_context()
+            tls_sock = ctx.wrap_socket(
+                self._sock,
+                server_hostname=server_hostname,
+            )
+
+            tls_sock.setblocking(False)
+            self._sock = tls_sock
+            self._is_tls = True
+
+            self.local_addr = self._sock.getsockname()
+            self.remote_addr = self._sock.getpeername()
+            self._refresh_wrappers()
+
+            logger.trace(
+                "TLS upgrade complete: local=%s remote=%s",
+                self.local_addr,
+                self.remote_addr,
+            )
+
+        except ssl.SSLError as e:
+            self.close()
+            logger.debug("TLS negotiation exception: %s", e)
+            raise AppriseSocketError(f"TLS negotiation failed: {e}") from e
+        except OSError as e:
+            self.close()
+            logger.debug("TLS negotiation exception: %s", e)
+            raise AppriseSocketError(str(e)) from e
+
+    def _attempt_reconnect(
+        self,
+        retries: int,
+        action: str,
+        exc: Exception,
+    ) -> bool:
+        """
+        Attempt to reconnect and allow the caller to retry.
+
+        Args:
+            retries: Remaining reconnect attempts permitted (<= 0 disables).
+            action: A short label (e.g. "read" or "write") for logging.
+            exc: The exception that triggered the reconnect attempt.
+
+        Returns:
+            True if a reconnect was performed and the caller should retry.
+        """
+        # Respect the caller's retry budget
+        if int(retries) <= 0:
+            return False
+
+        # Only retry if we have previously completed useful I/O since the last
+        # connect(). This prevents retrying the first failed read/write after
+        # connect.
+        if not self._had_io:
+            return False
+
+        logger.warning(
+            "Socket %s failed, reconnecting and retrying", action
+        )
+        logger.debug("Socket %s exception: %s", action, exc)
+
+        try:
+            self.close()
+            self.connect()
+
+        except Exception as e:
+            logger.debug("Socket reconnect exception: %s", e)
+            return False
+
+        return True
+
+    def read(
+        self,
+        max_bytes: int = 32768,
+        blocking: bool = False,
+        timeout: Optional[float] = None,
+        retries: Optional[int] = None,
+    ) -> bytes:
+        """
+        Read up to max_bytes bytes.
+
+        blocking=False:
+          - returns immediately with available data, or b"" if none
+
+        blocking=True:
+          - waits up to timeout seconds (or instance read timeout if timeout is
+            None), then reads once
+          - if both are None, waits indefinitely
+
+        retries:
+          - number of reconnect attempts permitted if the socket goes stale
+            after prior successful I/O. Defaults to None (which takes value
+            globally passed into the class)
+        """
+        if self._sock is None:
+            return b""
+
+        # Compute retry attempts; treat retries=0 as explicit 0
+        retry_count = self.retries if retries is None else int(retries)
+        attempts = max(0, retry_count) + 1
+
+        # Derive wait timeout (None means wait indefinitely)
+        wait_timeout = \
+            self._read_timeout if timeout is None else float(timeout)
+
+        # We manage readiness via select, socket stays non-blocking
+        self._sock.setblocking(False)
+
+        while attempts:
+            attempts -= 1
+
+            try:
+                if not blocking:
+                    try:
+                        data = self._sock.recv(int(max_bytes))
+                        if data == b"":
+                            raise AppriseSocketError(
+                                "Connection lost during read")
+                        self._had_io = True
+                        return data
+                    except (BlockingIOError, ssl.SSLWantReadError,
+                            ssl.SSLWantWriteError):
+                        return b""
+
+                # blocking=True path: wait for readability, then recv
+                if wait_timeout is None:
+                    # Wait indefinitely but periodically confirm socket health
+                    while True:
+                        ready = self.can_read(0.5)
+                        if ready is None:
+                            raise AppriseSocketError("Socket closed")
+
+                        if ready:
+                            break
+                else:
+                    ready = self.can_read(wait_timeout)
+                    if not ready:
+                        return b""
+
+                # Even after select says readable, TLS may still raise
+                # WANT_READ/WRITE. Loop until we either receive data, timeout,
+                # or the socket closes.
+                while True:
+                    try:
+                        data = self._sock.recv(int(max_bytes))
+                        if data == b"":
+                            raise AppriseSocketError(
+                                "Connection lost during read")
+                        self._had_io = True
+                        return data
+
+                    except (ssl.SSLWantReadError, ssl.SSLWantWriteError,
+                            BlockingIOError):
+
+                        if wait_timeout is None:
+                            continue
+
+                        # Avoid busy loop
+                        if not self.can_read(min(0.25, wait_timeout)):
+                            return b""
+
+            except (AppriseSocketError, OSError, ssl.SSLError) as e:
+                # Normalise and log
+                logger.warning("Socket read failed")
+                logger.debug("Socket read exception: %s", e)
+
+                # Only close on hard errors; WANT_READ/WRITE handled above
+                if isinstance(e, OSError) \
+                        and not isinstance(e, ssl.SSLWantReadError) \
+                        and not isinstance(e, ssl.SSLWantWriteError):
+                    self.close()
+
+                err: Exception = e
+
+                # Reconnect only if we've had prior useful I/O
+                if self._attempt_reconnect(
+                        retries=attempts,
+                        action="read",
+                        exc=err,
+                ):
+                    # In blocking mode with no timeout (wait indefinitely),
+                    # perform an immediate read attempt after reconnect.
+                    # This avoids relying solely on can_read(), and it keeps
+                    # edge cases (like stale sockets) recoverable.
+                    if blocking and wait_timeout is None \
+                            and self._sock is not None:
+                        try:
+                            data = self._sock.recv(int(max_bytes))
+
+                            if data == b"":
+                                raise AppriseSocketError(
+                                    "Connection lost during read")
+
+                            self._had_io = True
+                            return data
+
+                        except (BlockingIOError, ssl.SSLWantReadError,
+                                ssl.SSLWantWriteError):
+                            # No data yet; fall back to retry loop
+                            pass
+
+                    continue
+
+                if isinstance(err, AppriseSocketError):
+                    raise err from None
+                raise AppriseSocketError(str(err)) from err
+
+        raise AppriseSocketError("Socket read failed")
+
+    def write(
+        self,
+        data: bytes,
+        flush: bool = True,
+        timeout: Optional[float] = None,
+        retries: Optional[int] = None,
+    ) -> int:
+        """
+        Write bytes to the socket.
+
+        timeout:
+          - if None, uses instance read timeout
+          - if both are None, blocks until complete
+
+        retries:
+          - number of reconnect attempts permitted if the socket goes stale
+            after prior successful I/O. Defaults to None (which takes value
+            globally passed into the class)
+        """
+        if self._sock is None:
+            raise AppriseSocketError("No active connection")
+
+        if not isinstance(data, (bytes, bytearray, memoryview)):
+            raise AppriseInvalidData("write() expects bytes-like data")
+
+        # Loop-based retry avoids recursion and keeps state obvious
+        retry_count = self.retries if retries is None else int(retries)
+        attempts = max(0, retry_count) + 1
+
+        while attempts:
+            attempts -= 1
+
+            view = memoryview(data)
+            total_sent = 0
+
+            op_timeout = (
+                self._read_timeout if timeout is None else float(timeout)
+            )
+            deadline = (
+                None
+                if op_timeout is None
+                else (time.monotonic() + op_timeout)
+            )
+
+            try:
+                self._sock.setblocking(deadline is None)
+
+                while total_sent < len(view):
+                    if deadline is not None:
+                        remaining = deadline - time.monotonic()
+                        if remaining <= 0:
+                            raise AppriseSocketError(
+                                "Timed out during write"
+                            )
+                        writable = self.can_write(remaining)
+                        if not writable:
+                            raise AppriseSocketError(
+                                "Timed out waiting for writable socket"
+                            )
+
+                    sent = self._sock.send(view[total_sent:])
+                    if sent <= 0:
+                        raise AppriseSocketError(
+                            "Connection lost during write"
+                        )
+                    total_sent += sent
+
+                if flush and self._wfile is not None:
+                    self._wfile.flush()
+
+                if total_sent > 0:
+                    self._had_io = True
+
+                return total_sent
+
+            except (AppriseSocketError, OSError) as e:
+                logger.warning("Socket write failed")
+                logger.debug("Socket write exception: %s", e)
+
+                # Normalise: any OSError implies the socket is toast
+                if isinstance(e, OSError):
+                    self.close()
+
+                if self._attempt_reconnect(
+                    retries=attempts,
+                    action="write",
+                    exc=e,
+                ):
+                    continue
+
+                if isinstance(e, AppriseSocketError):
+                    raise
+                raise AppriseSocketError(str(e)) from e
+
+        raise AppriseSocketError("Socket write failed")
diff --git a/libs/apprise/utils/templates.py b/libs/apprise/utils/templates.py
index 8a630f491e..7abf9ba92b 100644
--- a/libs/apprise/utils/templates.py
+++ b/libs/apprise/utils/templates.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 # BSD 2-Clause License
 #
 # Apprise - Push Notification Library.
-# Copyright (c) 2025, Chris Caron <lead2gold@gmail.com>
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,39 +24,36 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-import re
 import json
+import re
 
 
 class TemplateType:
-    """
-    Defines the different template types we can perform parsing on
-    """
+    """Defines the different template types we can perform parsing on."""
+
     # RAW does nothing at all to the content being parsed
     # data is taken at it's absolute value
-    RAW = 'raw'
+    RAW = "raw"
 
     # Data is presumed to be of type JSON and is therefore escaped
     # if required to do so (such as single quotes)
-    JSON = 'json'
+    JSON = "json"
 
 
 def apply_template(template, app_mode=TemplateType.RAW, **kwargs):
-    """
-    Takes a template in a str format and applies all of the keywords
-    and their values to it.
+    """Takes a template in a str format and applies all of the keywords and
+    their values to it.
 
     The app$mode is used to dictact any pre-processing that needs to take place
     to the escaped string prior to it being placed.  The idea here is for
     elements to be placed in a JSON response for example should be escaped
     early in their string format.
 
-    The template must contain keywords wrapped in in double
-    squirly braces like {{keyword}}.  These are matched to the respected
-    kwargs passed into this function.
+    The template must contain keywords wrapped in in double squirly braces like
+    {{keyword}}.  These are matched to the respected kwargs passed into this
+    function.
 
     If there is no match found, content is not swapped.
-
     """
 
     def _escape_raw(content):
@@ -71,12 +67,17 @@ def _escape_json(content):
     # Our escape function
     fn = _escape_json if app_mode == TemplateType.JSON else _escape_raw
 
-    lookup = [re.escape(x) for x in kwargs.keys()]
+    lookup = [re.escape(x) for x in kwargs]
 
     # Compile this into a list
     mask_r = re.compile(
-        re.escape('{{') + r'\s*(' + '|'.join(lookup) + r')\s*'
-        + re.escape('}}'), re.IGNORECASE)
+        re.escape("{{")
+        + r"\s*("
+        + "|".join(lookup)
+        + r")\s*"
+        + re.escape("}}"),
+        re.IGNORECASE,
+    )
 
     # we index 2 characters off the head and 2 characters from the tail
     # to drop the '{{' and '}}' surrounding our match so that we can
diff --git a/libs/apprise/utils/time.py b/libs/apprise/utils/time.py
new file mode 100644
index 0000000000..a1231f8c6e
--- /dev/null
+++ b/libs/apprise/utils/time.py
@@ -0,0 +1,79 @@
+# BSD 2-Clause License
+#
+# Apprise - Push Notification Library.
+# Copyright (c) 2026, Chris Caron <lead2gold@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+import contextlib
+from datetime import timezone as _tz
+from typing import Optional
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
+
+from ..logger import logger
+
+
+def zoneinfo(name: str) -> Optional[ZoneInfo]:
+    """
+    More forgiving ZoneInfo instantiation
+    - Accepts lower/upper case
+    - Normalises common UTC variants
+    """
+    if not isinstance(name, str):
+        return None
+
+    raw = name.strip()
+    if not raw:
+        return None
+
+    # Windows-safe: accept UTC family even without tzdata
+    if raw.lower() in {
+            "utc", "z", "gmt", "etc/utc", "etc/gmt", "gmt0", "utc0"}:
+        return _tz.utc
+
+    # Try exact match first
+    try:
+        return ZoneInfo(name)
+
+    except ZoneInfoNotFoundError:
+        pass
+
+    # Try case-insensitive match across available keys
+    from zoneinfo import available_timezones
+    lowered = name.lower().strip()
+    for zone in available_timezones():
+        full_zone = zone.lower()
+        if full_zone == lowered:
+            return ZoneInfo(zone)
+
+        with contextlib.suppress(IndexError):
+
+            # Break our zones and enforce limit
+            zones = full_zone.split("/")[1:3]
+
+            # Possible we'll throw an index error here and that's okay
+            location = zones[-1] if len(zones) == 1 else "/".join(zones)
+            if location and location == lowered:
+                return ZoneInfo(zone)
+
+    logger.warning("Unknown timezone specified: %s", name)
+    return None
diff --git a/libs/Markdown-3.7.dist-info/INSTALLER b/libs/apscheduler-3.11.2.dist-info/INSTALLER
similarity index 100%
rename from libs/Markdown-3.7.dist-info/INSTALLER
rename to libs/apscheduler-3.11.2.dist-info/INSTALLER
diff --git a/libs/apscheduler-3.11.2.dist-info/METADATA b/libs/apscheduler-3.11.2.dist-info/METADATA
new file mode 100644
index 0000000000..a7e0cce2e7
--- /dev/null
+++ b/libs/apscheduler-3.11.2.dist-info/METADATA
@@ -0,0 +1,149 @@
+Metadata-Version: 2.4
+Name: APScheduler
+Version: 3.11.2
+Summary: In-process task scheduler with Cron-like capabilities
+Author-email: Alex Grรถnholm <alex.gronholm@nextday.fi>
+License: MIT
+Project-URL: Documentation, https://apscheduler.readthedocs.io/en/3.x/
+Project-URL: Changelog, https://apscheduler.readthedocs.io/en/3.x/versionhistory.html
+Project-URL: Source code, https://github.com/agronholm/apscheduler
+Project-URL: Issue tracker, https://github.com/agronholm/apscheduler/issues
+Keywords: scheduling,cron
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Requires-Dist: tzlocal>=3.0
+Requires-Dist: backports.zoneinfo; python_version < "3.9"
+Provides-Extra: etcd
+Requires-Dist: etcd3; extra == "etcd"
+Requires-Dist: protobuf<=3.21.0; extra == "etcd"
+Provides-Extra: gevent
+Requires-Dist: gevent; extra == "gevent"
+Provides-Extra: mongodb
+Requires-Dist: pymongo>=3.0; extra == "mongodb"
+Provides-Extra: redis
+Requires-Dist: redis>=3.0; extra == "redis"
+Provides-Extra: rethinkdb
+Requires-Dist: rethinkdb>=2.4.0; extra == "rethinkdb"
+Provides-Extra: sqlalchemy
+Requires-Dist: sqlalchemy>=1.4; extra == "sqlalchemy"
+Provides-Extra: tornado
+Requires-Dist: tornado>=4.3; extra == "tornado"
+Provides-Extra: twisted
+Requires-Dist: twisted; extra == "twisted"
+Provides-Extra: zookeeper
+Requires-Dist: kazoo; extra == "zookeeper"
+Provides-Extra: test
+Requires-Dist: APScheduler[etcd,mongodb,redis,rethinkdb,sqlalchemy,tornado,zookeeper]; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-timeout; extra == "test"
+Requires-Dist: anyio>=4.5.2; extra == "test"
+Requires-Dist: PySide6; (platform_python_implementation == "CPython" and python_version < "3.14") and extra == "test"
+Requires-Dist: gevent; python_version < "3.14" and extra == "test"
+Requires-Dist: pytz; extra == "test"
+Requires-Dist: twisted; python_version < "3.14" and extra == "test"
+Provides-Extra: doc
+Requires-Dist: packaging; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: sphinx-rtd-theme>=1.3.0; extra == "doc"
+Dynamic: license-file
+
+.. image:: https://github.com/agronholm/apscheduler/workflows/Python%20codeqa/test/badge.svg?branch=3.x
+  :target: https://github.com/agronholm/apscheduler/actions?query=workflow%3A%22Python+codeqa%2Ftest%22+branch%3A3.x
+  :alt: Build Status
+.. image:: https://coveralls.io/repos/github/agronholm/apscheduler/badge.svg?branch=3.x
+  :target: https://coveralls.io/github/agronholm/apscheduler?branch=3.x
+  :alt: Code Coverage
+.. image:: https://readthedocs.org/projects/apscheduler/badge/?version=3.x
+  :target: https://apscheduler.readthedocs.io/en/master/?badge=3.x
+  :alt: Documentation
+
+Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code
+to be executed later, either just once or periodically. You can add new jobs or remove old ones on
+the fly as you please. If you store your jobs in a database, they will also survive scheduler
+restarts and maintain their state. When the scheduler is restarted, it will then run all the jobs
+it should have run while it was offline [#f1]_.
+
+Among other things, APScheduler can be used as a cross-platform, application specific replacement
+to platform specific schedulers, such as the cron daemon or the Windows task scheduler. Please
+note, however, that APScheduler is **not** a daemon or service itself, nor does it come with any
+command line tools. It is primarily meant to be run inside existing applications. That said,
+APScheduler does provide some building blocks for you to build a scheduler service or to run a
+dedicated scheduler process.
+
+APScheduler has three built-in scheduling systems you can use:
+
+* Cron-style scheduling (with optional start/end times)
+* Interval-based execution (runs jobs on even intervals, with optional start/end times)
+* One-off delayed execution (runs jobs once, on a set date/time)
+
+You can mix and match scheduling systems and the backends where the jobs are stored any way you
+like. Supported backends for storing jobs include:
+
+* Memory
+* `SQLAlchemy <http://www.sqlalchemy.org/>`_ (any RDBMS supported by SQLAlchemy works)
+* `MongoDB <http://www.mongodb.org/>`_
+* `Redis <http://redis.io/>`_
+* `RethinkDB <https://www.rethinkdb.com/>`_
+* `ZooKeeper <https://zookeeper.apache.org/>`_
+* `Etcd <https://etcd.io/>`_
+
+APScheduler also integrates with several common Python frameworks, like:
+
+* `asyncio <http://docs.python.org/3.4/library/asyncio.html>`_ (:pep:`3156`)
+* `gevent <http://www.gevent.org/>`_
+* `Tornado <http://www.tornadoweb.org/>`_
+* `Twisted <http://twistedmatrix.com/>`_
+* `Qt <http://qt-project.org/>`_ (using either
+  `PyQt <http://www.riverbankcomputing.com/software/pyqt/intro>`_ ,
+  `PySide6 <https://wiki.qt.io/Qt_for_Python>`_ ,
+  `PySide2 <https://wiki.qt.io/Qt_for_Python>`_ or
+  `PySide <http://qt-project.org/wiki/PySide>`_)
+
+There are third party solutions for integrating APScheduler with other frameworks:
+
+* `Django <https://github.com/jarekwg/django-apscheduler>`_
+* `Flask <https://github.com/viniciuschiele/flask-apscheduler>`_
+
+
+.. [#f1] The cutoff period for this is also configurable.
+
+
+Documentation
+-------------
+
+Documentation can be found `here <https://apscheduler.readthedocs.io/>`_.
+
+
+Source
+------
+
+The source can be browsed at `Github <https://github.com/agronholm/apscheduler/tree/3.x>`_.
+
+
+Reporting bugs
+--------------
+
+A `bug tracker <https://github.com/agronholm/apscheduler/issues>`_ is provided by Github.
+
+
+Getting help
+------------
+
+If you have problems or other questions, you can either:
+
+* Ask in the `apscheduler <https://gitter.im/apscheduler/Lobby>`_ room on Gitter
+* Ask on the `APScheduler GitHub discussion forum <https://github.com/agronholm/apscheduler/discussions>`_, or
+* Ask on `StackOverflow <http://stackoverflow.com/questions/tagged/apscheduler>`_ and tag your
+  question with the ``apscheduler`` tag
diff --git a/libs/apscheduler-3.11.2.dist-info/RECORD b/libs/apscheduler-3.11.2.dist-info/RECORD
new file mode 100644
index 0000000000..3304c8dfd9
--- /dev/null
+++ b/libs/apscheduler-3.11.2.dist-info/RECORD
@@ -0,0 +1,47 @@
+apscheduler-3.11.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+apscheduler-3.11.2.dist-info/METADATA,sha256=isrjIgfQXa2C9Ky7hBjOtp21BjnfMw4nIUkd6JeXbgA,6443
+apscheduler-3.11.2.dist-info/RECORD,,
+apscheduler-3.11.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apscheduler-3.11.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+apscheduler-3.11.2.dist-info/entry_points.txt,sha256=HSDTxgulLTgymfXK2UNCPP1ib5rlQSFgZJEg72vto3s,1181
+apscheduler-3.11.2.dist-info/licenses/LICENSE.txt,sha256=YWP3mH37ONa8MgzitwsvArhivEESZRbVUu8c1DJH51g,1130
+apscheduler-3.11.2.dist-info/top_level.txt,sha256=O3oMCWxG-AHkecUoO6Ze7-yYjWrttL95uHO8-RFdYvE,12
+apscheduler/__init__.py,sha256=hOpI9oJuk5l5I_VtdsHPous2Qr-ZDX573e7NaYRWFUs,380
+apscheduler/events.py,sha256=a6bVF-idiP_sCwkhXad421ChE0B8tV7zJEOolV3r7j4,3583
+apscheduler/executors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apscheduler/executors/asyncio.py,sha256=g0ArcxefoTnEqtyr_IRc-M3dcj0bhuvHcxwRp2s3nDE,1768
+apscheduler/executors/base.py,sha256=Cug2WKRhcJIGJP90EfsjrKUIXlox_azq0fn_SzmcLtE,7114
+apscheduler/executors/debug.py,sha256=15_ogSBzl8RRCfBYDnkIV2uMH8cLk1KImYmBa_NVGpc,573
+apscheduler/executors/gevent.py,sha256=_ZFpbn7-tH5_lAeL4sxEyPhxyUTtUUSrH8s42EHGQ2w,761
+apscheduler/executors/pool.py,sha256=q_shxnvXLjdcwhtKyPvQSYngOjAeKQO8KCvZeb19RSQ,2683
+apscheduler/executors/tornado.py,sha256=lb6mshRj7GMLz3d8StwESnlZsAfrNmW78Wokcg__Lk8,1581
+apscheduler/executors/twisted.py,sha256=YUEDnaPbP_M0lXCmNAW_yPiLKwbO9vD3KMiBFQ2D4h0,726
+apscheduler/job.py,sha256=tudKpRxBn9BBFCIEHWrHJPK2WctGDmFawvt1imd0wmA,11235
+apscheduler/jobstores/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apscheduler/jobstores/base.py,sha256=ZDOgMtHLaF3TPUOQwmkBIDcpnHU0aUhtzZOGmMGaJn8,4416
+apscheduler/jobstores/etcd.py,sha256=O7C40CGlnn3cPinchJEs2sWcqnzEZQt3c6WnhgPRSdQ,5703
+apscheduler/jobstores/memory.py,sha256=HmOs7FbrOoQNywz-yfq2v5esGDHeKE_mvMNFDeGZ31E,3595
+apscheduler/jobstores/mongodb.py,sha256=mCIwcKiWcicM2qdAQn51QBEkGlNfbk_73Oi6soShNcM,5319
+apscheduler/jobstores/redis.py,sha256=El-H2eUfZjPZca7vwy10B9gZv5RzRucbkDu7Ti07vyM,5482
+apscheduler/jobstores/rethinkdb.py,sha256=SdT3jPrhxnmBoL4IClDfHsez4DpREnYEsHndIP8idHA,5922
+apscheduler/jobstores/sqlalchemy.py,sha256=2jaq3ZcoXEyIqqvYf3eloaP-_ZAqojt0EuWWvQ2LMRg,6799
+apscheduler/jobstores/zookeeper.py,sha256=32bEZNJNniPwmYXBITZ3eSRBq6hipqPKDqh4q4NiZvc,6439
+apscheduler/schedulers/__init__.py,sha256=POEy7n3BZgccZ44atMvxj0w5PejN55g-55NduZUZFqQ,406
+apscheduler/schedulers/asyncio.py,sha256=JZYgLBCgTn6EGgdV8vDzjvqKrizCoqM3shjNivIEs_M,2154
+apscheduler/schedulers/background.py,sha256=sRNrikUhpyblvA5RCpKC5Djvf3-b6NHvnXTblxlqIaM,1476
+apscheduler/schedulers/base.py,sha256=hvnvcI1DOC9bmvrFk8UiLlGxsXKHtMpEHLDEe63mQ_s,48342
+apscheduler/schedulers/blocking.py,sha256=138rf9X1C-ZxWVTVAO_pyfYMBKhkqO2qZqJoyGInv5c,872
+apscheduler/schedulers/gevent.py,sha256=zS5nHQUkQMrn0zKOaFnUyiG0fXTE01yE9GXVNCdrd90,987
+apscheduler/schedulers/qt.py,sha256=6BHOCi8e6L3wXTWwQDjNl8w_GJF_dY6iiO3gEtCJgmI,1241
+apscheduler/schedulers/tornado.py,sha256=uD5el752Qpbnn6KbImn65600nSUYQwGAPKjJ-L4Qzow,2166
+apscheduler/schedulers/twisted.py,sha256=qzFnW36Qow8dK4rp1-iPZQD4jDG9EN7bvXIIWbp3vm4,1977
+apscheduler/triggers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+apscheduler/triggers/base.py,sha256=8iKllubaexF456IK9jfi56QTrVIfDDPLavUc8wTlnL0,1333
+apscheduler/triggers/calendarinterval.py,sha256=tuyAhOvxbQUaPCycFK4s24kLIaH2woaC1SSmq7TZHLY,7411
+apscheduler/triggers/combining.py,sha256=OVUUVJb_PYnJQZP9Ij-9FtmX5vRo_FYIirCHkBNzCL0,4044
+apscheduler/triggers/cron/__init__.py,sha256=MCYF0Xdx7l3HImBM3eBS1y75snzkOHdh0gurISz_Qcw,10082
+apscheduler/triggers/cron/expressions.py,sha256=fN3heBgp6SEeFnwr1bfc6BfBO0sbwzxwaxvKv3KEuSo,9044
+apscheduler/triggers/cron/fields.py,sha256=itUk3ZQ57a_2BQtssXNjjC3ogCoCrtxjQNFWjCT3ROs,3618
+apscheduler/triggers/date.py,sha256=ZS_TMjUCSldqlZsUUjlwvuWeMKeDXqqAMcZVFGYpam4,1698
+apscheduler/triggers/interval.py,sha256=R0rAtygqUX3omGpKV6DxEQB5BGQrDNBllN4tAnHFRSQ,4674
+apscheduler/util.py,sha256=-X3qCy9dqdb_y7wY6_p8ANz29qRcA__-60KsS7aBPJo,14223
diff --git a/libs/Markdown-3.7.dist-info/REQUESTED b/libs/apscheduler-3.11.2.dist-info/REQUESTED
similarity index 100%
rename from libs/Markdown-3.7.dist-info/REQUESTED
rename to libs/apscheduler-3.11.2.dist-info/REQUESTED
diff --git a/libs/apscheduler-3.11.2.dist-info/WHEEL b/libs/apscheduler-3.11.2.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/apscheduler-3.11.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/apscheduler-3.11.2.dist-info/entry_points.txt b/libs/apscheduler-3.11.2.dist-info/entry_points.txt
new file mode 100644
index 0000000000..5890251ac8
--- /dev/null
+++ b/libs/apscheduler-3.11.2.dist-info/entry_points.txt
@@ -0,0 +1,25 @@
+[apscheduler.executors]
+asyncio = apscheduler.executors.asyncio:AsyncIOExecutor
+debug = apscheduler.executors.debug:DebugExecutor
+gevent = apscheduler.executors.gevent:GeventExecutor
+processpool = apscheduler.executors.pool:ProcessPoolExecutor
+threadpool = apscheduler.executors.pool:ThreadPoolExecutor
+tornado = apscheduler.executors.tornado:TornadoExecutor
+twisted = apscheduler.executors.twisted:TwistedExecutor
+
+[apscheduler.jobstores]
+etcd = apscheduler.jobstores.etcd:EtcdJobStore
+memory = apscheduler.jobstores.memory:MemoryJobStore
+mongodb = apscheduler.jobstores.mongodb:MongoDBJobStore
+redis = apscheduler.jobstores.redis:RedisJobStore
+rethinkdb = apscheduler.jobstores.rethinkdb:RethinkDBJobStore
+sqlalchemy = apscheduler.jobstores.sqlalchemy:SQLAlchemyJobStore
+zookeeper = apscheduler.jobstores.zookeeper:ZooKeeperJobStore
+
+[apscheduler.triggers]
+and = apscheduler.triggers.combining:AndTrigger
+calendarinterval = apscheduler.triggers.calendarinterval:CalendarIntervalTrigger
+cron = apscheduler.triggers.cron:CronTrigger
+date = apscheduler.triggers.date:DateTrigger
+interval = apscheduler.triggers.interval:IntervalTrigger
+or = apscheduler.triggers.combining:OrTrigger
diff --git a/libs/APScheduler-3.10.4.dist-info/LICENSE.txt b/libs/apscheduler-3.11.2.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/APScheduler-3.10.4.dist-info/LICENSE.txt
rename to libs/apscheduler-3.11.2.dist-info/licenses/LICENSE.txt
diff --git a/libs/APScheduler-3.10.4.dist-info/top_level.txt b/libs/apscheduler-3.11.2.dist-info/top_level.txt
similarity index 100%
rename from libs/APScheduler-3.10.4.dist-info/top_level.txt
rename to libs/apscheduler-3.11.2.dist-info/top_level.txt
diff --git a/libs/apscheduler/__init__.py b/libs/apscheduler/__init__.py
index 651aba4995..475135fe2b 100644
--- a/libs/apscheduler/__init__.py
+++ b/libs/apscheduler/__init__.py
@@ -1,15 +1,11 @@
+import importlib.metadata as importlib_metadata
 import sys
-if sys.version_info >= (3, 8):
-    import importlib.metadata as importlib_metadata
-else:
-    import importlib_metadata
-
 
 try:
-    release = importlib_metadata.version('APScheduler').split('-')[0]
+    release = importlib_metadata.version("APScheduler").split("-")[0]
 except importlib_metadata.PackageNotFoundError:
-    release = '3.5.0'
+    release = "3.5.0"
 
-version_info = tuple(int(x) if x.isdigit() else x for x in release.split('.'))
-version = __version__ = '.'.join(str(x) for x in version_info[:3])
+version_info = tuple(int(x) if x.isdigit() else x for x in release.split("."))
+version = __version__ = ".".join(str(x) for x in version_info[:3])
 del sys, importlib_metadata
diff --git a/libs/apscheduler/events.py b/libs/apscheduler/events.py
index 016da03c5e..a4c11aa0ce 100644
--- a/libs/apscheduler/events.py
+++ b/libs/apscheduler/events.py
@@ -1,36 +1,68 @@
-__all__ = ('EVENT_SCHEDULER_STARTED', 'EVENT_SCHEDULER_SHUTDOWN', 'EVENT_SCHEDULER_PAUSED',
-           'EVENT_SCHEDULER_RESUMED', 'EVENT_EXECUTOR_ADDED', 'EVENT_EXECUTOR_REMOVED',
-           'EVENT_JOBSTORE_ADDED', 'EVENT_JOBSTORE_REMOVED', 'EVENT_ALL_JOBS_REMOVED',
-           'EVENT_JOB_ADDED', 'EVENT_JOB_REMOVED', 'EVENT_JOB_MODIFIED', 'EVENT_JOB_EXECUTED',
-           'EVENT_JOB_ERROR', 'EVENT_JOB_MISSED', 'EVENT_JOB_SUBMITTED', 'EVENT_JOB_MAX_INSTANCES',
-           'SchedulerEvent', 'JobEvent', 'JobExecutionEvent', 'JobSubmissionEvent')
-
-
-EVENT_SCHEDULER_STARTED = EVENT_SCHEDULER_START = 2 ** 0
-EVENT_SCHEDULER_SHUTDOWN = 2 ** 1
-EVENT_SCHEDULER_PAUSED = 2 ** 2
-EVENT_SCHEDULER_RESUMED = 2 ** 3
-EVENT_EXECUTOR_ADDED = 2 ** 4
-EVENT_EXECUTOR_REMOVED = 2 ** 5
-EVENT_JOBSTORE_ADDED = 2 ** 6
-EVENT_JOBSTORE_REMOVED = 2 ** 7
-EVENT_ALL_JOBS_REMOVED = 2 ** 8
-EVENT_JOB_ADDED = 2 ** 9
-EVENT_JOB_REMOVED = 2 ** 10
-EVENT_JOB_MODIFIED = 2 ** 11
-EVENT_JOB_EXECUTED = 2 ** 12
-EVENT_JOB_ERROR = 2 ** 13
-EVENT_JOB_MISSED = 2 ** 14
-EVENT_JOB_SUBMITTED = 2 ** 15
-EVENT_JOB_MAX_INSTANCES = 2 ** 16
-EVENT_ALL = (EVENT_SCHEDULER_STARTED | EVENT_SCHEDULER_SHUTDOWN | EVENT_SCHEDULER_PAUSED |
-             EVENT_SCHEDULER_RESUMED | EVENT_EXECUTOR_ADDED | EVENT_EXECUTOR_REMOVED |
-             EVENT_JOBSTORE_ADDED | EVENT_JOBSTORE_REMOVED | EVENT_ALL_JOBS_REMOVED |
-             EVENT_JOB_ADDED | EVENT_JOB_REMOVED | EVENT_JOB_MODIFIED | EVENT_JOB_EXECUTED |
-             EVENT_JOB_ERROR | EVENT_JOB_MISSED | EVENT_JOB_SUBMITTED | EVENT_JOB_MAX_INSTANCES)
-
-
-class SchedulerEvent(object):
+__all__ = (
+    "EVENT_ALL",
+    "EVENT_ALL_JOBS_REMOVED",
+    "EVENT_EXECUTOR_ADDED",
+    "EVENT_EXECUTOR_REMOVED",
+    "EVENT_JOBSTORE_ADDED",
+    "EVENT_JOBSTORE_REMOVED",
+    "EVENT_JOB_ADDED",
+    "EVENT_JOB_ERROR",
+    "EVENT_JOB_EXECUTED",
+    "EVENT_JOB_MAX_INSTANCES",
+    "EVENT_JOB_MISSED",
+    "EVENT_JOB_MODIFIED",
+    "EVENT_JOB_REMOVED",
+    "EVENT_JOB_SUBMITTED",
+    "EVENT_SCHEDULER_PAUSED",
+    "EVENT_SCHEDULER_RESUMED",
+    "EVENT_SCHEDULER_SHUTDOWN",
+    "EVENT_SCHEDULER_STARTED",
+    "JobEvent",
+    "JobExecutionEvent",
+    "JobSubmissionEvent",
+    "SchedulerEvent",
+)
+
+
+EVENT_SCHEDULER_STARTED = EVENT_SCHEDULER_START = 2**0
+EVENT_SCHEDULER_SHUTDOWN = 2**1
+EVENT_SCHEDULER_PAUSED = 2**2
+EVENT_SCHEDULER_RESUMED = 2**3
+EVENT_EXECUTOR_ADDED = 2**4
+EVENT_EXECUTOR_REMOVED = 2**5
+EVENT_JOBSTORE_ADDED = 2**6
+EVENT_JOBSTORE_REMOVED = 2**7
+EVENT_ALL_JOBS_REMOVED = 2**8
+EVENT_JOB_ADDED = 2**9
+EVENT_JOB_REMOVED = 2**10
+EVENT_JOB_MODIFIED = 2**11
+EVENT_JOB_EXECUTED = 2**12
+EVENT_JOB_ERROR = 2**13
+EVENT_JOB_MISSED = 2**14
+EVENT_JOB_SUBMITTED = 2**15
+EVENT_JOB_MAX_INSTANCES = 2**16
+EVENT_ALL = (
+    EVENT_SCHEDULER_STARTED
+    | EVENT_SCHEDULER_SHUTDOWN
+    | EVENT_SCHEDULER_PAUSED
+    | EVENT_SCHEDULER_RESUMED
+    | EVENT_EXECUTOR_ADDED
+    | EVENT_EXECUTOR_REMOVED
+    | EVENT_JOBSTORE_ADDED
+    | EVENT_JOBSTORE_REMOVED
+    | EVENT_ALL_JOBS_REMOVED
+    | EVENT_JOB_ADDED
+    | EVENT_JOB_REMOVED
+    | EVENT_JOB_MODIFIED
+    | EVENT_JOB_EXECUTED
+    | EVENT_JOB_ERROR
+    | EVENT_JOB_MISSED
+    | EVENT_JOB_SUBMITTED
+    | EVENT_JOB_MAX_INSTANCES
+)
+
+
+class SchedulerEvent:
     """
     An event that concerns the scheduler itself.
 
@@ -39,12 +71,12 @@ class SchedulerEvent(object):
     """
 
     def __init__(self, code, alias=None):
-        super(SchedulerEvent, self).__init__()
+        super().__init__()
         self.code = code
         self.alias = alias
 
     def __repr__(self):
-        return '<%s (code=%d)>' % (self.__class__.__name__, self.code)
+        return f"<self.__class__.__name__ (code={self.code})>"
 
 
 class JobEvent(SchedulerEvent):
@@ -57,7 +89,7 @@ class JobEvent(SchedulerEvent):
     """
 
     def __init__(self, code, job_id, jobstore):
-        super(JobEvent, self).__init__(code)
+        super().__init__(code)
         self.code = code
         self.job_id = job_id
         self.jobstore = jobstore
@@ -71,7 +103,7 @@ class JobSubmissionEvent(JobEvent):
     """
 
     def __init__(self, code, job_id, jobstore, scheduled_run_times):
-        super(JobSubmissionEvent, self).__init__(code, job_id, jobstore)
+        super().__init__(code, job_id, jobstore)
         self.scheduled_run_times = scheduled_run_times
 
 
@@ -85,9 +117,17 @@ class JobExecutionEvent(JobEvent):
     :ivar traceback: a formatted traceback for the exception
     """
 
-    def __init__(self, code, job_id, jobstore, scheduled_run_time, retval=None, exception=None,
-                 traceback=None):
-        super(JobExecutionEvent, self).__init__(code, job_id, jobstore)
+    def __init__(
+        self,
+        code,
+        job_id,
+        jobstore,
+        scheduled_run_time,
+        retval=None,
+        exception=None,
+        traceback=None,
+    ):
+        super().__init__(code, job_id, jobstore)
         self.scheduled_run_time = scheduled_run_time
         self.retval = retval
         self.exception = exception
diff --git a/libs/apscheduler/executors/asyncio.py b/libs/apscheduler/executors/asyncio.py
index 7d45d6c14a..cc7eb651fc 100644
--- a/libs/apscheduler/executors/asyncio.py
+++ b/libs/apscheduler/executors/asyncio.py
@@ -1,9 +1,6 @@
-from __future__ import absolute_import
-
 import sys
 
-from apscheduler.executors.base import BaseExecutor, run_job
-from apscheduler.executors.base_py3 import run_coroutine_job
+from apscheduler.executors.base import BaseExecutor, run_coroutine_job, run_job
 from apscheduler.util import iscoroutinefunction_partial
 
 
@@ -19,7 +16,7 @@ class AsyncIOExecutor(BaseExecutor):
     """
 
     def start(self, scheduler, alias):
-        super(AsyncIOExecutor, self).start(scheduler, alias)
+        super().start(scheduler, alias)
         self._eventloop = scheduler._eventloop
         self._pending_futures = set()
 
@@ -42,11 +39,14 @@ def callback(f):
                 self._run_job_success(job.id, events)
 
         if iscoroutinefunction_partial(job.func):
-            coro = run_coroutine_job(job, job._jobstore_alias, run_times, self._logger.name)
+            coro = run_coroutine_job(
+                job, job._jobstore_alias, run_times, self._logger.name
+            )
             f = self._eventloop.create_task(coro)
         else:
-            f = self._eventloop.run_in_executor(None, run_job, job, job._jobstore_alias, run_times,
-                                                self._logger.name)
+            f = self._eventloop.run_in_executor(
+                None, run_job, job, job._jobstore_alias, run_times, self._logger.name
+            )
 
         f.add_done_callback(callback)
         self._pending_futures.add(f)
diff --git a/libs/apscheduler/executors/base.py b/libs/apscheduler/executors/base.py
index 4c09fc1127..6decbb56c3 100644
--- a/libs/apscheduler/executors/base.py
+++ b/libs/apscheduler/executors/base.py
@@ -1,33 +1,36 @@
+import logging
+import sys
+import traceback
 from abc import ABCMeta, abstractmethod
 from collections import defaultdict
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from traceback import format_tb
-import logging
-import sys
-
-from pytz import utc
-import six
 
 from apscheduler.events import (
-    JobExecutionEvent, EVENT_JOB_MISSED, EVENT_JOB_ERROR, EVENT_JOB_EXECUTED)
+    EVENT_JOB_ERROR,
+    EVENT_JOB_EXECUTED,
+    EVENT_JOB_MISSED,
+    JobExecutionEvent,
+)
 
 
 class MaxInstancesReachedError(Exception):
     def __init__(self, job):
-        super(MaxInstancesReachedError, self).__init__(
-            'Job "%s" has already reached its maximum number of instances (%d)' %
-            (job.id, job.max_instances))
+        super().__init__(
+            f'Job "{job.id}" has already reached its maximum number of instances '
+            f"({job.max_instances})"
+        )
 
 
-class BaseExecutor(six.with_metaclass(ABCMeta, object)):
+class BaseExecutor(metaclass=ABCMeta):
     """Abstract base class that defines the interface that every executor must implement."""
 
     _scheduler = None
     _lock = None
-    _logger = logging.getLogger('apscheduler.executors')
+    _logger = logging.getLogger("apscheduler.executors")
 
     def __init__(self):
-        super(BaseExecutor, self).__init__()
+        super().__init__()
         self._instances = defaultdict(lambda: 0)
 
     def start(self, scheduler, alias):
@@ -42,7 +45,7 @@ def start(self, scheduler, alias):
         """
         self._scheduler = scheduler
         self._lock = scheduler._create_lock()
-        self._logger = logging.getLogger('apscheduler.executors.%s' % alias)
+        self._logger = logging.getLogger(f"apscheduler.executors.{alias}")
 
     def shutdown(self, wait=True):
         """
@@ -63,7 +66,7 @@ def submit_job(self, job, run_times):
             allowed instances for this job has been reached
 
         """
-        assert self._lock is not None, 'This executor has not been started yet'
+        assert self._lock is not None, "This executor has not been started yet"
         with self._lock:
             if self._instances[job.id] >= job.max_instances:
                 raise MaxInstancesReachedError(job)
@@ -97,7 +100,7 @@ def _run_job_error(self, job_id, exc, traceback=None):
                 del self._instances[job_id]
 
         exc_info = (exc.__class__, exc, traceback)
-        self._logger.error('Error running job %s', job_id, exc_info=exc_info)
+        self._logger.error("Error running job %s", job_id, exc_info=exc_info)
 
 
 def run_job(job, jobstore_alias, run_times, logger_name):
@@ -112,11 +115,14 @@ def run_job(job, jobstore_alias, run_times, logger_name):
         # See if the job missed its run time window, and handle
         # possible misfires accordingly
         if job.misfire_grace_time is not None:
-            difference = datetime.now(utc) - run_time
+            difference = datetime.now(timezone.utc) - run_time
             grace_time = timedelta(seconds=job.misfire_grace_time)
             if difference > grace_time:
-                events.append(JobExecutionEvent(EVENT_JOB_MISSED, job.id, jobstore_alias,
-                                                run_time))
+                events.append(
+                    JobExecutionEvent(
+                        EVENT_JOB_MISSED, job.id, jobstore_alias, run_time
+                    )
+                )
                 logger.warning('Run time of job "%s" was missed by %s', job, difference)
                 continue
 
@@ -125,22 +131,75 @@ def run_job(job, jobstore_alias, run_times, logger_name):
             retval = job.func(*job.args, **job.kwargs)
         except BaseException:
             exc, tb = sys.exc_info()[1:]
-            formatted_tb = ''.join(format_tb(tb))
-            events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time,
-                                            exception=exc, traceback=formatted_tb))
+            formatted_tb = "".join(format_tb(tb))
+            events.append(
+                JobExecutionEvent(
+                    EVENT_JOB_ERROR,
+                    job.id,
+                    jobstore_alias,
+                    run_time,
+                    exception=exc,
+                    traceback=formatted_tb,
+                )
+            )
             logger.exception('Job "%s" raised an exception', job)
 
             # This is to prevent cyclic references that would lead to memory leaks
-            if six.PY2:
-                sys.exc_clear()
-                del tb
-            else:
-                import traceback
-                traceback.clear_frames(tb)
-                del tb
+            traceback.clear_frames(tb)
+            del tb
+        else:
+            events.append(
+                JobExecutionEvent(
+                    EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time, retval=retval
+                )
+            )
+            logger.info('Job "%s" executed successfully', job)
+
+    return events
+
+
+async def run_coroutine_job(job, jobstore_alias, run_times, logger_name):
+    """Coroutine version of run_job()."""
+    events = []
+    logger = logging.getLogger(logger_name)
+    for run_time in run_times:
+        # See if the job missed its run time window, and handle possible misfires accordingly
+        if job.misfire_grace_time is not None:
+            difference = datetime.now(timezone.utc) - run_time
+            grace_time = timedelta(seconds=job.misfire_grace_time)
+            if difference > grace_time:
+                events.append(
+                    JobExecutionEvent(
+                        EVENT_JOB_MISSED, job.id, jobstore_alias, run_time
+                    )
+                )
+                logger.warning('Run time of job "%s" was missed by %s', job, difference)
+                continue
+
+        logger.info('Running job "%s" (scheduled at %s)', job, run_time)
+        try:
+            retval = await job.func(*job.args, **job.kwargs)
+        except BaseException:
+            exc, tb = sys.exc_info()[1:]
+            formatted_tb = "".join(format_tb(tb))
+            events.append(
+                JobExecutionEvent(
+                    EVENT_JOB_ERROR,
+                    job.id,
+                    jobstore_alias,
+                    run_time,
+                    exception=exc,
+                    traceback=formatted_tb,
+                )
+            )
+            logger.exception('Job "%s" raised an exception', job)
+            traceback.clear_frames(tb)
         else:
-            events.append(JobExecutionEvent(EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time,
-                                            retval=retval))
+            events.append(
+                JobExecutionEvent(
+                    EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time, retval=retval
+                )
+            )
             logger.info('Job "%s" executed successfully', job)
 
     return events
diff --git a/libs/apscheduler/executors/base_py3.py b/libs/apscheduler/executors/base_py3.py
deleted file mode 100644
index 7111d2aec5..0000000000
--- a/libs/apscheduler/executors/base_py3.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import logging
-import sys
-import traceback
-from datetime import datetime, timedelta
-from traceback import format_tb
-
-from pytz import utc
-
-from apscheduler.events import (
-    JobExecutionEvent, EVENT_JOB_MISSED, EVENT_JOB_ERROR, EVENT_JOB_EXECUTED)
-
-
-async def run_coroutine_job(job, jobstore_alias, run_times, logger_name):
-    """Coroutine version of run_job()."""
-    events = []
-    logger = logging.getLogger(logger_name)
-    for run_time in run_times:
-        # See if the job missed its run time window, and handle possible misfires accordingly
-        if job.misfire_grace_time is not None:
-            difference = datetime.now(utc) - run_time
-            grace_time = timedelta(seconds=job.misfire_grace_time)
-            if difference > grace_time:
-                events.append(JobExecutionEvent(EVENT_JOB_MISSED, job.id, jobstore_alias,
-                                                run_time))
-                logger.warning('Run time of job "%s" was missed by %s', job, difference)
-                continue
-
-        logger.info('Running job "%s" (scheduled at %s)', job, run_time)
-        try:
-            retval = await job.func(*job.args, **job.kwargs)
-        except BaseException:
-            exc, tb = sys.exc_info()[1:]
-            formatted_tb = ''.join(format_tb(tb))
-            events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time,
-                                            exception=exc, traceback=formatted_tb))
-            logger.exception('Job "%s" raised an exception', job)
-            traceback.clear_frames(tb)
-        else:
-            events.append(JobExecutionEvent(EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time,
-                                            retval=retval))
-            logger.info('Job "%s" executed successfully', job)
-
-    return events
diff --git a/libs/apscheduler/executors/gevent.py b/libs/apscheduler/executors/gevent.py
index 1235bb6e4f..385be40c78 100644
--- a/libs/apscheduler/executors/gevent.py
+++ b/libs/apscheduler/executors/gevent.py
@@ -1,13 +1,11 @@
-from __future__ import absolute_import
 import sys
 
 from apscheduler.executors.base import BaseExecutor, run_job
 
-
 try:
     import gevent
-except ImportError:  # pragma: nocover
-    raise ImportError('GeventExecutor requires gevent installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("GeventExecutor requires gevent installed") from exc
 
 
 class GeventExecutor(BaseExecutor):
@@ -26,5 +24,6 @@ def callback(greenlet):
             else:
                 self._run_job_success(job.id, events)
 
-        gevent.spawn(run_job, job, job._jobstore_alias, run_times, self._logger.name).\
-            link(callback)
+        gevent.spawn(
+            run_job, job, job._jobstore_alias, run_times, self._logger.name
+        ).link(callback)
diff --git a/libs/apscheduler/executors/pool.py b/libs/apscheduler/executors/pool.py
index c85896ec26..166de7c7dd 100644
--- a/libs/apscheduler/executors/pool.py
+++ b/libs/apscheduler/executors/pool.py
@@ -1,36 +1,32 @@
-from abc import abstractmethod
 import concurrent.futures
+import multiprocessing
+from abc import abstractmethod
+from concurrent.futures.process import BrokenProcessPool
 
 from apscheduler.executors.base import BaseExecutor, run_job
 
-try:
-    from concurrent.futures.process import BrokenProcessPool
-except ImportError:
-    BrokenProcessPool = None
-
 
 class BasePoolExecutor(BaseExecutor):
     @abstractmethod
     def __init__(self, pool):
-        super(BasePoolExecutor, self).__init__()
+        super().__init__()
         self._pool = pool
 
     def _do_submit_job(self, job, run_times):
         def callback(f):
-            exc, tb = (f.exception_info() if hasattr(f, 'exception_info') else
-                       (f.exception(), getattr(f.exception(), '__traceback__', None)))
+            exc, tb = (
+                f.exception_info()
+                if hasattr(f, "exception_info")
+                else (f.exception(), getattr(f.exception(), "__traceback__", None))
+            )
             if exc:
                 self._run_job_error(job.id, exc, tb)
             else:
                 self._run_job_success(job.id, f.result())
 
-        try:
-            f = self._pool.submit(run_job, job, job._jobstore_alias, run_times, self._logger.name)
-        except BrokenProcessPool:
-            self._logger.warning('Process pool is broken; replacing pool with a fresh instance')
-            self._pool = self._pool.__class__(self._pool._max_workers)
-            f = self._pool.submit(run_job, job, job._jobstore_alias, run_times, self._logger.name)
-
+        f = self._pool.submit(
+            run_job, job, job._jobstore_alias, run_times, self._logger.name
+        )
         f.add_done_callback(callback)
 
     def shutdown(self, wait=True):
@@ -51,7 +47,7 @@ class ThreadPoolExecutor(BasePoolExecutor):
     def __init__(self, max_workers=10, pool_kwargs=None):
         pool_kwargs = pool_kwargs or {}
         pool = concurrent.futures.ThreadPoolExecutor(int(max_workers), **pool_kwargs)
-        super(ThreadPoolExecutor, self).__init__(pool)
+        super().__init__(pool)
 
 
 class ProcessPoolExecutor(BasePoolExecutor):
@@ -66,6 +62,21 @@ class ProcessPoolExecutor(BasePoolExecutor):
     """
 
     def __init__(self, max_workers=10, pool_kwargs=None):
-        pool_kwargs = pool_kwargs or {}
-        pool = concurrent.futures.ProcessPoolExecutor(int(max_workers), **pool_kwargs)
-        super(ProcessPoolExecutor, self).__init__(pool)
+        self.pool_kwargs = pool_kwargs or {}
+        self.pool_kwargs.setdefault("mp_context", multiprocessing.get_context("spawn"))
+        pool = concurrent.futures.ProcessPoolExecutor(
+            int(max_workers), **self.pool_kwargs
+        )
+        super().__init__(pool)
+
+    def _do_submit_job(self, job, run_times):
+        try:
+            super()._do_submit_job(job, run_times)
+        except BrokenProcessPool:
+            self._logger.warning(
+                "Process pool is broken; replacing pool with a fresh instance"
+            )
+            self._pool = self._pool.__class__(
+                self._pool._max_workers, **self.pool_kwargs
+            )
+            super()._do_submit_job(job, run_times)
diff --git a/libs/apscheduler/executors/tornado.py b/libs/apscheduler/executors/tornado.py
index 3b97eec92a..46789bd94a 100644
--- a/libs/apscheduler/executors/tornado.py
+++ b/libs/apscheduler/executors/tornado.py
@@ -1,18 +1,10 @@
-from __future__ import absolute_import
-
 import sys
 from concurrent.futures import ThreadPoolExecutor
 
 from tornado.gen import convert_yielded
 
-from apscheduler.executors.base import BaseExecutor, run_job
-
-try:
-    from apscheduler.executors.base_py3 import run_coroutine_job
-    from apscheduler.util import iscoroutinefunction_partial
-except ImportError:
-    def iscoroutinefunction_partial(func):
-        return False
+from apscheduler.executors.base import BaseExecutor, run_coroutine_job, run_job
+from apscheduler.util import iscoroutinefunction_partial
 
 
 class TornadoExecutor(BaseExecutor):
@@ -28,11 +20,11 @@ class TornadoExecutor(BaseExecutor):
     """
 
     def __init__(self, max_workers=10):
-        super(TornadoExecutor, self).__init__()
+        super().__init__()
         self.executor = ThreadPoolExecutor(max_workers)
 
     def start(self, scheduler, alias):
-        super(TornadoExecutor, self).start(scheduler, alias)
+        super().start(scheduler, alias)
         self._ioloop = scheduler._ioloop
 
     def _do_submit_job(self, job, run_times):
@@ -45,10 +37,13 @@ def callback(f):
                 self._run_job_success(job.id, events)
 
         if iscoroutinefunction_partial(job.func):
-            f = run_coroutine_job(job, job._jobstore_alias, run_times, self._logger.name)
+            f = run_coroutine_job(
+                job, job._jobstore_alias, run_times, self._logger.name
+            )
         else:
-            f = self.executor.submit(run_job, job, job._jobstore_alias, run_times,
-                                     self._logger.name)
+            f = self.executor.submit(
+                run_job, job, job._jobstore_alias, run_times, self._logger.name
+            )
 
         f = convert_yielded(f)
         f.add_done_callback(callback)
diff --git a/libs/apscheduler/executors/twisted.py b/libs/apscheduler/executors/twisted.py
index c7bcf647ac..710b20ae39 100644
--- a/libs/apscheduler/executors/twisted.py
+++ b/libs/apscheduler/executors/twisted.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from apscheduler.executors.base import BaseExecutor, run_job
 
 
@@ -11,7 +9,7 @@ class TwistedExecutor(BaseExecutor):
     """
 
     def start(self, scheduler, alias):
-        super(TwistedExecutor, self).start(scheduler, alias)
+        super().start(scheduler, alias)
         self._reactor = scheduler._reactor
 
     def _do_submit_job(self, job, run_times):
@@ -22,4 +20,5 @@ def callback(success, result):
                 self._run_job_error(job.id, result.value, result.tb)
 
         self._reactor.getThreadPool().callInThreadWithCallback(
-            callback, run_job, job, job._jobstore_alias, run_times, self._logger.name)
+            callback, run_job, job, job._jobstore_alias, run_times, self._logger.name
+        )
diff --git a/libs/apscheduler/job.py b/libs/apscheduler/job.py
index 445d9a868e..38ac305b98 100644
--- a/libs/apscheduler/job.py
+++ b/libs/apscheduler/job.py
@@ -1,20 +1,22 @@
-from inspect import ismethod, isclass
+from collections.abc import Iterable, Mapping
+from datetime import timezone
+from inspect import isclass, ismethod
 from uuid import uuid4
 
-import six
-
 from apscheduler.triggers.base import BaseTrigger
 from apscheduler.util import (
-    ref_to_obj, obj_to_ref, datetime_repr, repr_escape, get_callable_name, check_callable_args,
-    convert_to_datetime)
+    check_callable_args,
+    convert_to_datetime,
+    datetime_repr,
+    get_callable_name,
+    obj_to_ref,
+    ref_to_obj,
+)
 
-try:
-    from collections.abc import Iterable, Mapping
-except ImportError:
-    from collections import Iterable, Mapping
+UTC = timezone.utc
 
 
-class Job(object):
+class Job:
     """
     Contains the options given when scheduling callables and its current schedule and other state.
     This class should never be instantiated by the user.
@@ -38,12 +40,26 @@ class Job(object):
         :ref:`missed-job-executions` section in the documentation for an in-depth explanation.
     """
 
-    __slots__ = ('_scheduler', '_jobstore_alias', 'id', 'trigger', 'executor', 'func', 'func_ref',
-                 'args', 'kwargs', 'name', 'misfire_grace_time', 'coalesce', 'max_instances',
-                 'next_run_time', '__weakref__')
+    __slots__ = (
+        "__weakref__",
+        "_jobstore_alias",
+        "_scheduler",
+        "args",
+        "coalesce",
+        "executor",
+        "func",
+        "func_ref",
+        "id",
+        "kwargs",
+        "max_instances",
+        "misfire_grace_time",
+        "name",
+        "next_run_time",
+        "trigger",
+    )
 
     def __init__(self, scheduler, id=None, **kwargs):
-        super(Job, self).__init__()
+        super().__init__()
         self._scheduler = scheduler
         self._jobstore_alias = None
         self._modify(id=id or uuid4().hex, **kwargs)
@@ -71,7 +87,9 @@ def reschedule(self, trigger, **trigger_args):
         :return Job: this job instance
 
         """
-        self._scheduler.reschedule_job(self.id, self._jobstore_alias, trigger, **trigger_args)
+        self._scheduler.reschedule_job(
+            self.id, self._jobstore_alias, trigger, **trigger_args
+        )
         return self
 
     def pause(self):
@@ -130,7 +148,7 @@ def _get_run_times(self, now):
         """
         run_times = []
         next_run_time = self.next_run_time
-        while next_run_time and next_run_time <= now:
+        while next_run_time and next_run_time.astimezone(UTC) <= now.astimezone(UTC):
             run_times.append(next_run_time)
             next_run_time = self.trigger.get_next_fire_time(next_run_time, now)
 
@@ -144,20 +162,20 @@ def _modify(self, **changes):
         """
         approved = {}
 
-        if 'id' in changes:
-            value = changes.pop('id')
-            if not isinstance(value, six.string_types):
+        if "id" in changes:
+            value = changes.pop("id")
+            if not isinstance(value, str):
                 raise TypeError("id must be a nonempty string")
-            if hasattr(self, 'id'):
-                raise ValueError('The job ID may not be changed')
-            approved['id'] = value
+            if hasattr(self, "id"):
+                raise ValueError("The job ID may not be changed")
+            approved["id"] = value
 
-        if 'func' in changes or 'args' in changes or 'kwargs' in changes:
-            func = changes.pop('func') if 'func' in changes else self.func
-            args = changes.pop('args') if 'args' in changes else self.args
-            kwargs = changes.pop('kwargs') if 'kwargs' in changes else self.kwargs
+        if "func" in changes or "args" in changes or "kwargs" in changes:
+            func = changes.pop("func") if "func" in changes else self.func
+            args = changes.pop("args") if "args" in changes else self.args
+            kwargs = changes.pop("kwargs") if "kwargs" in changes else self.kwargs
 
-            if isinstance(func, six.string_types):
+            if isinstance(func, str):
                 func_ref = func
                 func = ref_to_obj(func)
             elif callable(func):
@@ -167,119 +185,132 @@ def _modify(self, **changes):
                     # If this happens, this Job won't be serializable
                     func_ref = None
             else:
-                raise TypeError('func must be a callable or a textual reference to one')
+                raise TypeError("func must be a callable or a textual reference to one")
 
-            if not hasattr(self, 'name') and changes.get('name', None) is None:
-                changes['name'] = get_callable_name(func)
+            if not hasattr(self, "name") and changes.get("name", None) is None:
+                changes["name"] = get_callable_name(func)
 
-            if isinstance(args, six.string_types) or not isinstance(args, Iterable):
-                raise TypeError('args must be a non-string iterable')
-            if isinstance(kwargs, six.string_types) or not isinstance(kwargs, Mapping):
-                raise TypeError('kwargs must be a dict-like object')
+            if isinstance(args, str) or not isinstance(args, Iterable):
+                raise TypeError("args must be a non-string iterable")
+            if isinstance(kwargs, str) or not isinstance(kwargs, Mapping):
+                raise TypeError("kwargs must be a dict-like object")
 
             check_callable_args(func, args, kwargs)
 
-            approved['func'] = func
-            approved['func_ref'] = func_ref
-            approved['args'] = args
-            approved['kwargs'] = kwargs
+            approved["func"] = func
+            approved["func_ref"] = func_ref
+            approved["args"] = args
+            approved["kwargs"] = kwargs
 
-        if 'name' in changes:
-            value = changes.pop('name')
-            if not value or not isinstance(value, six.string_types):
+        if "name" in changes:
+            value = changes.pop("name")
+            if not value or not isinstance(value, str):
                 raise TypeError("name must be a nonempty string")
-            approved['name'] = value
-
-        if 'misfire_grace_time' in changes:
-            value = changes.pop('misfire_grace_time')
-            if value is not None and (not isinstance(value, six.integer_types) or value <= 0):
-                raise TypeError('misfire_grace_time must be either None or a positive integer')
-            approved['misfire_grace_time'] = value
-
-        if 'coalesce' in changes:
-            value = bool(changes.pop('coalesce'))
-            approved['coalesce'] = value
-
-        if 'max_instances' in changes:
-            value = changes.pop('max_instances')
-            if not isinstance(value, six.integer_types) or value <= 0:
-                raise TypeError('max_instances must be a positive integer')
-            approved['max_instances'] = value
-
-        if 'trigger' in changes:
-            trigger = changes.pop('trigger')
+            approved["name"] = value
+
+        if "misfire_grace_time" in changes:
+            value = changes.pop("misfire_grace_time")
+            if value is not None and (not isinstance(value, int) or value <= 0):
+                raise TypeError(
+                    "misfire_grace_time must be either None or a positive integer"
+                )
+            approved["misfire_grace_time"] = value
+
+        if "coalesce" in changes:
+            value = bool(changes.pop("coalesce"))
+            approved["coalesce"] = value
+
+        if "max_instances" in changes:
+            value = changes.pop("max_instances")
+            if not isinstance(value, int) or value <= 0:
+                raise TypeError("max_instances must be a positive integer")
+            approved["max_instances"] = value
+
+        if "trigger" in changes:
+            trigger = changes.pop("trigger")
             if not isinstance(trigger, BaseTrigger):
-                raise TypeError('Expected a trigger instance, got %s instead' %
-                                trigger.__class__.__name__)
+                raise TypeError(
+                    f"Expected a trigger instance, got {trigger.__class__.__name__} instead"
+                )
 
-            approved['trigger'] = trigger
+            approved["trigger"] = trigger
 
-        if 'executor' in changes:
-            value = changes.pop('executor')
-            if not isinstance(value, six.string_types):
-                raise TypeError('executor must be a string')
-            approved['executor'] = value
+        if "executor" in changes:
+            value = changes.pop("executor")
+            if not isinstance(value, str):
+                raise TypeError("executor must be a string")
+            approved["executor"] = value
 
-        if 'next_run_time' in changes:
-            value = changes.pop('next_run_time')
-            approved['next_run_time'] = convert_to_datetime(value, self._scheduler.timezone,
-                                                            'next_run_time')
+        if "next_run_time" in changes:
+            value = changes.pop("next_run_time")
+            approved["next_run_time"] = convert_to_datetime(
+                value, self._scheduler.timezone, "next_run_time"
+            )
 
         if changes:
-            raise AttributeError('The following are not modifiable attributes of Job: %s' %
-                                 ', '.join(changes))
+            raise AttributeError(
+                "The following are not modifiable attributes of Job: {}".format(
+                    ", ".join(changes)
+                )
+            )
 
-        for key, value in six.iteritems(approved):
+        for key, value in approved.items():
             setattr(self, key, value)
 
     def __getstate__(self):
         # Don't allow this Job to be serialized if the function reference could not be determined
         if not self.func_ref:
             raise ValueError(
-                'This Job cannot be serialized since the reference to its callable (%r) could not '
-                'be determined. Consider giving a textual reference (module:function name) '
-                'instead.' % (self.func,))
+                f"This Job cannot be serialized since the reference to its callable ({self.func!r}) could not "
+                "be determined. Consider giving a textual reference (module:function name) "
+                "instead."
+            )
 
         # Instance methods cannot survive serialization as-is, so store the "self" argument
         # explicitly
         func = self.func
-        if ismethod(func) and not isclass(func.__self__) and obj_to_ref(func) == self.func_ref:
+        if (
+            ismethod(func)
+            and not isclass(func.__self__)
+            and obj_to_ref(func) == self.func_ref
+        ):
             args = (func.__self__,) + tuple(self.args)
         else:
             args = self.args
 
         return {
-            'version': 1,
-            'id': self.id,
-            'func': self.func_ref,
-            'trigger': self.trigger,
-            'executor': self.executor,
-            'args': args,
-            'kwargs': self.kwargs,
-            'name': self.name,
-            'misfire_grace_time': self.misfire_grace_time,
-            'coalesce': self.coalesce,
-            'max_instances': self.max_instances,
-            'next_run_time': self.next_run_time
+            "version": 1,
+            "id": self.id,
+            "func": self.func_ref,
+            "trigger": self.trigger,
+            "executor": self.executor,
+            "args": args,
+            "kwargs": self.kwargs,
+            "name": self.name,
+            "misfire_grace_time": self.misfire_grace_time,
+            "coalesce": self.coalesce,
+            "max_instances": self.max_instances,
+            "next_run_time": self.next_run_time,
         }
 
     def __setstate__(self, state):
-        if state.get('version', 1) > 1:
-            raise ValueError('Job has version %s, but only version 1 can be handled' %
-                             state['version'])
+        if state.get("version", 1) > 1:
+            raise ValueError(
+                f"Job has version {state['version']}, but only version 1 can be handled"
+            )
 
-        self.id = state['id']
-        self.func_ref = state['func']
+        self.id = state["id"]
+        self.func_ref = state["func"]
         self.func = ref_to_obj(self.func_ref)
-        self.trigger = state['trigger']
-        self.executor = state['executor']
-        self.args = state['args']
-        self.kwargs = state['kwargs']
-        self.name = state['name']
-        self.misfire_grace_time = state['misfire_grace_time']
-        self.coalesce = state['coalesce']
-        self.max_instances = state['max_instances']
-        self.next_run_time = state['next_run_time']
+        self.trigger = state["trigger"]
+        self.executor = state["executor"]
+        self.args = state["args"]
+        self.kwargs = state["kwargs"]
+        self.name = state["name"]
+        self.misfire_grace_time = state["misfire_grace_time"]
+        self.coalesce = state["coalesce"]
+        self.max_instances = state["max_instances"]
+        self.next_run_time = state["next_run_time"]
 
     def __eq__(self, other):
         if isinstance(other, Job):
@@ -287,16 +318,16 @@ def __eq__(self, other):
         return NotImplemented
 
     def __repr__(self):
-        return '<Job (id=%s name=%s)>' % (repr_escape(self.id), repr_escape(self.name))
+        return f"<Job (id={self.id} name={self.name})>"
 
     def __str__(self):
-        return repr_escape(self.__unicode__())
-
-    def __unicode__(self):
-        if hasattr(self, 'next_run_time'):
-            status = ('next run at: ' + datetime_repr(self.next_run_time) if
-                      self.next_run_time else 'paused')
+        if hasattr(self, "next_run_time"):
+            status = (
+                "next run at: " + datetime_repr(self.next_run_time)
+                if self.next_run_time
+                else "paused"
+            )
         else:
-            status = 'pending'
+            status = "pending"
 
-        return u'%s (trigger: %s, %s)' % (self.name, self.trigger, status)
+        return f"{self.name} (trigger: {self.trigger}, {status})"
diff --git a/libs/apscheduler/jobstores/base.py b/libs/apscheduler/jobstores/base.py
index 9cff66c455..01cabd1ec9 100644
--- a/libs/apscheduler/jobstores/base.py
+++ b/libs/apscheduler/jobstores/base.py
@@ -1,22 +1,19 @@
-from abc import ABCMeta, abstractmethod
 import logging
-
-import six
+from abc import ABCMeta, abstractmethod
 
 
 class JobLookupError(KeyError):
     """Raised when the job store cannot find a job for update or removal."""
 
     def __init__(self, job_id):
-        super(JobLookupError, self).__init__(u'No job by the id of %s was found' % job_id)
+        super().__init__(f"No job by the id of {job_id} was found")
 
 
 class ConflictingIdError(KeyError):
     """Raised when the uniqueness of job IDs is being violated."""
 
     def __init__(self, job_id):
-        super(ConflictingIdError, self).__init__(
-            u'Job identifier (%s) conflicts with an existing job' % job_id)
+        super().__init__(f"Job identifier ({job_id}) conflicts with an existing job")
 
 
 class TransientJobError(ValueError):
@@ -26,17 +23,18 @@ class TransientJobError(ValueError):
     """
 
     def __init__(self, job_id):
-        super(TransientJobError, self).__init__(
-            u'Job (%s) cannot be added to this job store because a reference to the callable '
-            u'could not be determined.' % job_id)
+        super().__init__(
+            f"Job ({job_id}) cannot be added to this job store because a reference to the callable "
+            "could not be determined."
+        )
 
 
-class BaseJobStore(six.with_metaclass(ABCMeta)):
+class BaseJobStore(metaclass=ABCMeta):
     """Abstract base class that defines the interface that every job store must implement."""
 
     _scheduler = None
     _alias = None
-    _logger = logging.getLogger('apscheduler.jobstores')
+    _logger = logging.getLogger("apscheduler.jobstores")
 
     def start(self, scheduler, alias):
         """
@@ -50,7 +48,7 @@ def start(self, scheduler, alias):
 
         self._scheduler = scheduler
         self._alias = alias
-        self._logger = logging.getLogger('apscheduler.jobstores.%s' % alias)
+        self._logger = logging.getLogger(f"apscheduler.jobstores.{alias}")
 
     def shutdown(self):
         """Frees any resources still bound to this job store."""
@@ -140,4 +138,4 @@ def remove_all_jobs(self):
         """Removes all jobs from this store."""
 
     def __repr__(self):
-        return '<%s>' % self.__class__.__name__
+        return f"<{self.__class__.__name__}>"
diff --git a/libs/apscheduler/jobstores/etcd.py b/libs/apscheduler/jobstores/etcd.py
new file mode 100644
index 0000000000..3fe74ff168
--- /dev/null
+++ b/libs/apscheduler/jobstores/etcd.py
@@ -0,0 +1,170 @@
+import pickle
+from datetime import datetime, timezone
+
+from apscheduler.job import Job
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.util import (
+    datetime_to_utc_timestamp,
+    maybe_ref,
+    utc_timestamp_to_datetime,
+)
+
+try:
+    from etcd3 import Etcd3Client
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("EtcdJobStore requires etcd3 be installed") from exc
+
+
+class EtcdJobStore(BaseJobStore):
+    """
+    Stores jobs in a etcd. Any leftover keyword arguments are directly passed to
+    etcd3's `etcd3.client
+    <https://python-etcd3.readthedocs.io/en/latest/readme.html>`_.
+
+    Plugin alias: ``etcd``
+
+    :param str path: path to store jobs in
+    :param client: a :class:`~etcd3.client.etcd3` instance to use instead of
+        providing connection arguments
+    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the
+        highest available
+    """
+
+    def __init__(
+        self,
+        path="/apscheduler",
+        client=None,
+        close_connection_on_exit=False,
+        pickle_protocol=pickle.DEFAULT_PROTOCOL,
+        **connect_args,
+    ):
+        super().__init__()
+        self.pickle_protocol = pickle_protocol
+        self.close_connection_on_exit = close_connection_on_exit
+
+        if not path:
+            raise ValueError('The "path" parameter must not be empty')
+
+        self.path = path
+
+        if client:
+            self.client = maybe_ref(client)
+        else:
+            self.client = Etcd3Client(**connect_args)
+
+    def lookup_job(self, job_id):
+        node_path = self.path + "/" + str(job_id)
+        try:
+            content, _ = self.client.get(node_path)
+            content = pickle.loads(content)
+            job = self._reconstitute_job(content["job_state"])
+            return job
+        except BaseException:
+            return None
+
+    def get_due_jobs(self, now):
+        timestamp = datetime_to_utc_timestamp(now)
+        jobs = [
+            job_record["job"]
+            for job_record in self._get_jobs()
+            if job_record["next_run_time"] is not None
+            and job_record["next_run_time"] <= timestamp
+        ]
+        return jobs
+
+    def get_next_run_time(self):
+        next_runs = [
+            job_record["next_run_time"]
+            for job_record in self._get_jobs()
+            if job_record["next_run_time"] is not None
+        ]
+        return utc_timestamp_to_datetime(min(next_runs)) if len(next_runs) > 0 else None
+
+    def get_all_jobs(self):
+        jobs = [job_record["job"] for job_record in self._get_jobs()]
+        self._fix_paused_jobs_sorting(jobs)
+        return jobs
+
+    def add_job(self, job):
+        node_path = self.path + "/" + str(job.id)
+        value = {
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": job.__getstate__(),
+        }
+        data = pickle.dumps(value, self.pickle_protocol)
+        status = self.client.put_if_not_exists(node_path, value=data)
+        if not status:
+            raise ConflictingIdError(job.id)
+
+    def update_job(self, job):
+        node_path = self.path + "/" + str(job.id)
+        changes = {
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": job.__getstate__(),
+        }
+        data = pickle.dumps(changes, self.pickle_protocol)
+        status, _ = self.client.transaction(
+            compare=[self.client.transactions.version(node_path) > 0],
+            success=[self.client.transactions.put(node_path, value=data)],
+            failure=[],
+        )
+        if not status:
+            raise JobLookupError(job.id)
+
+    def remove_job(self, job_id):
+        node_path = self.path + "/" + str(job_id)
+        status, _ = self.client.transaction(
+            compare=[self.client.transactions.version(node_path) > 0],
+            success=[self.client.transactions.delete(node_path)],
+            failure=[],
+        )
+        if not status:
+            raise JobLookupError(job_id)
+
+    def remove_all_jobs(self):
+        self.client.delete_prefix(self.path)
+
+    def shutdown(self):
+        self.client.close()
+
+    def _reconstitute_job(self, job_state):
+        job_state = job_state
+        job = Job.__new__(Job)
+        job.__setstate__(job_state)
+        job._scheduler = self._scheduler
+        job._jobstore_alias = self._alias
+        return job
+
+    def _get_jobs(self):
+        jobs = []
+        failed_job_ids = []
+        all_ids = list(self.client.get_prefix(self.path))
+
+        for doc, _ in all_ids:
+            try:
+                content = pickle.loads(doc)
+                job_record = {
+                    "next_run_time": content["next_run_time"],
+                    "job": self._reconstitute_job(content["job_state"]),
+                }
+                jobs.append(job_record)
+            except BaseException:
+                content = pickle.loads(doc)
+                failed_id = content["job_state"]["id"]
+                failed_job_ids.append(failed_id)
+                self._logger.exception(
+                    'Unable to restore job "%s" -- removing it', failed_id
+                )
+
+        if failed_job_ids:
+            for failed_id in failed_job_ids:
+                self.remove_job(failed_id)
+        paused_sort_key = datetime(9999, 12, 31, tzinfo=timezone.utc)
+        return sorted(
+            jobs,
+            key=lambda job_record: job_record["job"].next_run_time or paused_sort_key,
+        )
+
+    def __repr__(self):
+        self._logger.exception("<%s (client=%s)>", self.__class__.__name__, self.client)
+        return f"<{self.__class__.__name__} (client={self.client})>"
diff --git a/libs/apscheduler/jobstores/memory.py b/libs/apscheduler/jobstores/memory.py
index abfe7c6c8f..8103cfdc3a 100644
--- a/libs/apscheduler/jobstores/memory.py
+++ b/libs/apscheduler/jobstores/memory.py
@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
 from apscheduler.util import datetime_to_utc_timestamp
 
 
@@ -12,7 +10,7 @@ class MemoryJobStore(BaseJobStore):
     """
 
     def __init__(self):
-        super(MemoryJobStore, self).__init__()
+        super().__init__()
         # list of (job, timestamp), sorted by next_run_time and job id (ascending)
         self._jobs = []
         self._jobs_index = {}  # id -> (job, timestamp) lookup table
@@ -89,11 +87,11 @@ def _get_job_index(self, timestamp, job_id):
 
         """
         lo, hi = 0, len(self._jobs)
-        timestamp = float('inf') if timestamp is None else timestamp
+        timestamp = float("inf") if timestamp is None else timestamp
         while lo < hi:
             mid = (lo + hi) // 2
             mid_job, mid_timestamp = self._jobs[mid]
-            mid_timestamp = float('inf') if mid_timestamp is None else mid_timestamp
+            mid_timestamp = float("inf") if mid_timestamp is None else mid_timestamp
             if mid_timestamp > timestamp:
                 hi = mid
             elif mid_timestamp < timestamp:
diff --git a/libs/apscheduler/jobstores/mongodb.py b/libs/apscheduler/jobstores/mongodb.py
index 5a00f94156..102c0bd080 100644
--- a/libs/apscheduler/jobstores/mongodb.py
+++ b/libs/apscheduler/jobstores/mongodb.py
@@ -1,21 +1,20 @@
-from __future__ import absolute_import
+import pickle
 import warnings
 
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
 from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.util import (
+    datetime_to_utc_timestamp,
+    maybe_ref,
+    utc_timestamp_to_datetime,
+)
 
 try:
     from bson.binary import Binary
+    from pymongo import ASCENDING, MongoClient
     from pymongo.errors import DuplicateKeyError
-    from pymongo import MongoClient, ASCENDING
-except ImportError:  # pragma: nocover
-    raise ImportError('MongoDBJobStore requires PyMongo installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("MongoDBJobStore requires PyMongo installed") from exc
 
 
 class MongoDBJobStore(BaseJobStore):
@@ -34,9 +33,15 @@ class MongoDBJobStore(BaseJobStore):
         highest available
     """
 
-    def __init__(self, database='apscheduler', collection='jobs', client=None,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, **connect_args):
-        super(MongoDBJobStore, self).__init__()
+    def __init__(
+        self,
+        database="apscheduler",
+        collection="jobs",
+        client=None,
+        pickle_protocol=pickle.HIGHEST_PROTOCOL,
+        **connect_args,
+    ):
+        super().__init__()
         self.pickle_protocol = pickle_protocol
 
         if not database:
@@ -47,34 +52,40 @@ def __init__(self, database='apscheduler', collection='jobs', client=None,
         if client:
             self.client = maybe_ref(client)
         else:
-            connect_args.setdefault('w', 1)
+            connect_args.setdefault("w", 1)
             self.client = MongoClient(**connect_args)
 
         self.collection = self.client[database][collection]
 
     def start(self, scheduler, alias):
-        super(MongoDBJobStore, self).start(scheduler, alias)
-        self.collection.create_index('next_run_time', sparse=True)
+        super().start(scheduler, alias)
+        self.collection.create_index("next_run_time", sparse=True)
 
     @property
     def connection(self):
-        warnings.warn('The "connection" member is deprecated -- use "client" instead',
-                      DeprecationWarning)
+        warnings.warn(
+            'The "connection" member is deprecated -- use "client" instead',
+            DeprecationWarning,
+        )
         return self.client
 
     def lookup_job(self, job_id):
-        document = self.collection.find_one(job_id, ['job_state'])
-        return self._reconstitute_job(document['job_state']) if document else None
+        document = self.collection.find_one(job_id, ["job_state"])
+        return self._reconstitute_job(document["job_state"]) if document else None
 
     def get_due_jobs(self, now):
         timestamp = datetime_to_utc_timestamp(now)
-        return self._get_jobs({'next_run_time': {'$lte': timestamp}})
+        return self._get_jobs({"next_run_time": {"$lte": timestamp}})
 
     def get_next_run_time(self):
-        document = self.collection.find_one({'next_run_time': {'$ne': None}},
-                                            projection=['next_run_time'],
-                                            sort=[('next_run_time', ASCENDING)])
-        return utc_timestamp_to_datetime(document['next_run_time']) if document else None
+        document = self.collection.find_one(
+            {"next_run_time": {"$ne": None}},
+            projection=["next_run_time"],
+            sort=[("next_run_time", ASCENDING)],
+        )
+        return (
+            utc_timestamp_to_datetime(document["next_run_time"]) if document else None
+        )
 
     def get_all_jobs(self):
         jobs = self._get_jobs({})
@@ -83,25 +94,29 @@ def get_all_jobs(self):
 
     def add_job(self, job):
         try:
-            self.collection.insert_one({
-                '_id': job.id,
-                'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-                'job_state': Binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
-            })
+            self.collection.insert_one(
+                {
+                    "_id": job.id,
+                    "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+                    "job_state": Binary(
+                        pickle.dumps(job.__getstate__(), self.pickle_protocol)
+                    ),
+                }
+            )
         except DuplicateKeyError:
             raise ConflictingIdError(job.id)
 
     def update_job(self, job):
         changes = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': Binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": Binary(pickle.dumps(job.__getstate__(), self.pickle_protocol)),
         }
-        result = self.collection.update_one({'_id': job.id}, {'$set': changes})
+        result = self.collection.update_one({"_id": job.id}, {"$set": changes})
         if result and result.matched_count == 0:
             raise JobLookupError(job.id)
 
     def remove_job(self, job_id):
-        result = self.collection.delete_one({'_id': job_id})
+        result = self.collection.delete_one({"_id": job_id})
         if result and result.deleted_count == 0:
             raise JobLookupError(job_id)
 
@@ -122,20 +137,22 @@ def _reconstitute_job(self, job_state):
     def _get_jobs(self, conditions):
         jobs = []
         failed_job_ids = []
-        for document in self.collection.find(conditions, ['_id', 'job_state'],
-                                             sort=[('next_run_time', ASCENDING)]):
+        for document in self.collection.find(
+            conditions, ["_id", "job_state"], sort=[("next_run_time", ASCENDING)]
+        ):
             try:
-                jobs.append(self._reconstitute_job(document['job_state']))
+                jobs.append(self._reconstitute_job(document["job_state"]))
             except BaseException:
-                self._logger.exception('Unable to restore job "%s" -- removing it',
-                                       document['_id'])
-                failed_job_ids.append(document['_id'])
+                self._logger.exception(
+                    'Unable to restore job "%s" -- removing it', document["_id"]
+                )
+                failed_job_ids.append(document["_id"])
 
         # Remove all the jobs we failed to restore
         if failed_job_ids:
-            self.collection.delete_many({'_id': {'$in': failed_job_ids}})
+            self.collection.delete_many({"_id": {"$in": failed_job_ids}})
 
         return jobs
 
     def __repr__(self):
-        return '<%s (client=%s)>' % (self.__class__.__name__, self.client)
+        return f"<{self.__class__.__name__} (client={self.client})>"
diff --git a/libs/apscheduler/jobstores/redis.py b/libs/apscheduler/jobstores/redis.py
index 5bb69d635f..528285fb98 100644
--- a/libs/apscheduler/jobstores/redis.py
+++ b/libs/apscheduler/jobstores/redis.py
@@ -1,22 +1,14 @@
-from __future__ import absolute_import
-from datetime import datetime
+import pickle
+from datetime import datetime, timezone
 
-from pytz import utc
-import six
-
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import datetime_to_utc_timestamp, utc_timestamp_to_datetime
 from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.util import datetime_to_utc_timestamp, utc_timestamp_to_datetime
 
 try:
     from redis import Redis
-except ImportError:  # pragma: nocover
-    raise ImportError('RedisJobStore requires redis installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("RedisJobStore requires redis installed") from exc
 
 
 class RedisJobStore(BaseJobStore):
@@ -33,9 +25,15 @@ class RedisJobStore(BaseJobStore):
         highest available
     """
 
-    def __init__(self, db=0, jobs_key='apscheduler.jobs', run_times_key='apscheduler.run_times',
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, **connect_args):
-        super(RedisJobStore, self).__init__()
+    def __init__(
+        self,
+        db=0,
+        jobs_key="apscheduler.jobs",
+        run_times_key="apscheduler.run_times",
+        pickle_protocol=pickle.HIGHEST_PROTOCOL,
+        **connect_args,
+    ):
+        super().__init__()
 
         if db is None:
             raise ValueError('The "db" parameter must not be empty')
@@ -58,7 +56,7 @@ def get_due_jobs(self, now):
         job_ids = self.redis.zrangebyscore(self.run_times_key, 0, timestamp)
         if job_ids:
             job_states = self.redis.hmget(self.jobs_key, *job_ids)
-            return self._reconstitute_jobs(six.moves.zip(job_ids, job_states))
+            return self._reconstitute_jobs(zip(job_ids, job_states))
         return []
 
     def get_next_run_time(self):
@@ -68,8 +66,8 @@ def get_next_run_time(self):
 
     def get_all_jobs(self):
         job_states = self.redis.hgetall(self.jobs_key)
-        jobs = self._reconstitute_jobs(six.iteritems(job_states))
-        paused_sort_key = datetime(9999, 12, 31, tzinfo=utc)
+        jobs = self._reconstitute_jobs(job_states.items())
+        paused_sort_key = datetime(9999, 12, 31, tzinfo=timezone.utc)
         return sorted(jobs, key=lambda job: job.next_run_time or paused_sort_key)
 
     def add_job(self, job):
@@ -78,11 +76,16 @@ def add_job(self, job):
 
         with self.redis.pipeline() as pipe:
             pipe.multi()
-            pipe.hset(self.jobs_key, job.id, pickle.dumps(job.__getstate__(),
-                                                          self.pickle_protocol))
+            pipe.hset(
+                self.jobs_key,
+                job.id,
+                pickle.dumps(job.__getstate__(), self.pickle_protocol),
+            )
             if job.next_run_time:
-                pipe.zadd(self.run_times_key,
-                          {job.id: datetime_to_utc_timestamp(job.next_run_time)})
+                pipe.zadd(
+                    self.run_times_key,
+                    {job.id: datetime_to_utc_timestamp(job.next_run_time)},
+                )
 
             pipe.execute()
 
@@ -91,11 +94,16 @@ def update_job(self, job):
             raise JobLookupError(job.id)
 
         with self.redis.pipeline() as pipe:
-            pipe.hset(self.jobs_key, job.id, pickle.dumps(job.__getstate__(),
-                                                          self.pickle_protocol))
+            pipe.hset(
+                self.jobs_key,
+                job.id,
+                pickle.dumps(job.__getstate__(), self.pickle_protocol),
+            )
             if job.next_run_time:
-                pipe.zadd(self.run_times_key,
-                          {job.id: datetime_to_utc_timestamp(job.next_run_time)})
+                pipe.zadd(
+                    self.run_times_key,
+                    {job.id: datetime_to_utc_timestamp(job.next_run_time)},
+                )
             else:
                 pipe.zrem(self.run_times_key, job.id)
 
@@ -134,7 +142,9 @@ def _reconstitute_jobs(self, job_states):
             try:
                 jobs.append(self._reconstitute_job(job_state))
             except BaseException:
-                self._logger.exception('Unable to restore job "%s" -- removing it', job_id)
+                self._logger.exception(
+                    'Unable to restore job "%s" -- removing it', job_id
+                )
                 failed_job_ids.append(job_id)
 
         # Remove all the jobs we failed to restore
@@ -147,4 +157,4 @@ def _reconstitute_jobs(self, job_states):
         return jobs
 
     def __repr__(self):
-        return '<%s>' % self.__class__.__name__
+        return f"<{self.__class__.__name__}>"
diff --git a/libs/apscheduler/jobstores/rethinkdb.py b/libs/apscheduler/jobstores/rethinkdb.py
index d8a78cde3c..d78290b1fd 100644
--- a/libs/apscheduler/jobstores/rethinkdb.py
+++ b/libs/apscheduler/jobstores/rethinkdb.py
@@ -1,18 +1,17 @@
-from __future__ import absolute_import
+import pickle
 
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
 from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.util import (
+    datetime_to_utc_timestamp,
+    maybe_ref,
+    utc_timestamp_to_datetime,
+)
 
 try:
     from rethinkdb import RethinkDB
-except ImportError:  # pragma: nocover
-    raise ImportError('RethinkDBJobStore requires rethinkdb installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("RethinkDBJobStore requires rethinkdb installed") from exc
 
 
 class RethinkDBJobStore(BaseJobStore):
@@ -30,9 +29,15 @@ class RethinkDBJobStore(BaseJobStore):
         highest available
     """
 
-    def __init__(self, database='apscheduler', table='jobs', client=None,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, **connect_args):
-        super(RethinkDBJobStore, self).__init__()
+    def __init__(
+        self,
+        database="apscheduler",
+        table="jobs",
+        client=None,
+        pickle_protocol=pickle.HIGHEST_PROTOCOL,
+        **connect_args,
+    ):
+        super().__init__()
 
         if not database:
             raise ValueError('The "database" parameter must not be empty')
@@ -49,7 +54,7 @@ def __init__(self, database='apscheduler', table='jobs', client=None,
         self.conn = None
 
     def start(self, scheduler, alias):
-        super(RethinkDBJobStore, self).start(scheduler, alias)
+        super().start(scheduler, alias)
 
         if self.client:
             self.conn = maybe_ref(self.client)
@@ -62,24 +67,27 @@ def start(self, scheduler, alias):
         if self.table_name not in self.r.table_list().run(self.conn):
             self.r.table_create(self.table_name).run(self.conn)
 
-        if 'next_run_time' not in self.r.table(self.table_name).index_list().run(self.conn):
-            self.r.table(self.table_name).index_create('next_run_time').run(self.conn)
+        if "next_run_time" not in self.r.table(self.table_name).index_list().run(
+            self.conn
+        ):
+            self.r.table(self.table_name).index_create("next_run_time").run(self.conn)
 
         self.table = self.r.db(self.database).table(self.table_name)
 
     def lookup_job(self, job_id):
-        results = list(self.table.get_all(job_id).pluck('job_state').run(self.conn))
-        return self._reconstitute_job(results[0]['job_state']) if results else None
+        results = list(self.table.get_all(job_id).pluck("job_state").run(self.conn))
+        return self._reconstitute_job(results[0]["job_state"]) if results else None
 
     def get_due_jobs(self, now):
-        return self._get_jobs(self.r.row['next_run_time'] <= datetime_to_utc_timestamp(now))
+        return self._get_jobs(
+            self.r.row["next_run_time"] <= datetime_to_utc_timestamp(now)
+        )
 
     def get_next_run_time(self):
         results = list(
-            self.table
-            .filter(self.r.row['next_run_time'] != None)  # noqa
-            .order_by(self.r.asc('next_run_time'))
-            .map(lambda x: x['next_run_time'])
+            self.table.filter(self.r.row["next_run_time"] != None)
+            .order_by(self.r.asc("next_run_time"))
+            .map(lambda x: x["next_run_time"])
             .limit(1)
             .run(self.conn)
         )
@@ -92,27 +100,31 @@ def get_all_jobs(self):
 
     def add_job(self, job):
         job_dict = {
-            'id': job.id,
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': self.r.binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
+            "id": job.id,
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": self.r.binary(
+                pickle.dumps(job.__getstate__(), self.pickle_protocol)
+            ),
         }
         results = self.table.insert(job_dict).run(self.conn)
-        if results['errors'] > 0:
+        if results["errors"] > 0:
             raise ConflictingIdError(job.id)
 
     def update_job(self, job):
         changes = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': self.r.binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": self.r.binary(
+                pickle.dumps(job.__getstate__(), self.pickle_protocol)
+            ),
         }
         results = self.table.get_all(job.id).update(changes).run(self.conn)
         skipped = False in map(lambda x: results[x] == 0, results.keys())
-        if results['skipped'] > 0 or results['errors'] > 0 or not skipped:
+        if results["skipped"] > 0 or results["errors"] > 0 or not skipped:
             raise JobLookupError(job.id)
 
     def remove_job(self, job_id):
         results = self.table.get_all(job_id).delete().run(self.conn)
-        if results['deleted'] + results['skipped'] != 1:
+        if results["deleted"] + results["skipped"] != 1:
             raise JobLookupError(job_id)
 
     def remove_all_jobs(self):
@@ -132,24 +144,30 @@ def _reconstitute_job(self, job_state):
     def _get_jobs(self, predicate=None):
         jobs = []
         failed_job_ids = []
-        query = (self.table.filter(self.r.row['next_run_time'] != None).filter(predicate)  # noqa
-                 if predicate else self.table)
-        query = query.order_by('next_run_time', 'id').pluck('id', 'job_state')
+        query = (
+            self.table.filter(self.r.row["next_run_time"] != None).filter(predicate)
+            if predicate
+            else self.table
+        )
+        query = query.order_by("next_run_time", "id").pluck("id", "job_state")
 
         for document in query.run(self.conn):
             try:
-                jobs.append(self._reconstitute_job(document['job_state']))
+                jobs.append(self._reconstitute_job(document["job_state"]))
             except Exception:
-                self._logger.exception('Unable to restore job "%s" -- removing it', document['id'])
-                failed_job_ids.append(document['id'])
+                self._logger.exception(
+                    'Unable to restore job "%s" -- removing it', document["id"]
+                )
+                failed_job_ids.append(document["id"])
 
         # Remove all the jobs we failed to restore
         if failed_job_ids:
             self.r.expr(failed_job_ids).for_each(
-                lambda job_id: self.table.get_all(job_id).delete()).run(self.conn)
+                lambda job_id: self.table.get_all(job_id).delete()
+            ).run(self.conn)
 
         return jobs
 
     def __repr__(self):
         connection = self.conn
-        return '<%s (connection=%s)>' % (self.__class__.__name__, connection)
+        return f"<{self.__class__.__name__} (connection={connection})>"
diff --git a/libs/apscheduler/jobstores/sqlalchemy.py b/libs/apscheduler/jobstores/sqlalchemy.py
index 716549bc84..9866acf569 100644
--- a/libs/apscheduler/jobstores/sqlalchemy.py
+++ b/libs/apscheduler/jobstores/sqlalchemy.py
@@ -1,21 +1,29 @@
-from __future__ import absolute_import
+import pickle
 
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
 from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.util import (
+    datetime_to_utc_timestamp,
+    maybe_ref,
+    utc_timestamp_to_datetime,
+)
 
 try:
     from sqlalchemy import (
-        create_engine, Table, Column, MetaData, Unicode, Float, LargeBinary, select, and_)
+        Column,
+        Float,
+        LargeBinary,
+        MetaData,
+        Table,
+        Unicode,
+        and_,
+        create_engine,
+        select,
+    )
     from sqlalchemy.exc import IntegrityError
     from sqlalchemy.sql.expression import null
-except ImportError:  # pragma: nocover
-    raise ImportError('SQLAlchemyJobStore requires SQLAlchemy installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("SQLAlchemyJobStore requires SQLAlchemy installed") from exc
 
 
 class SQLAlchemyJobStore(BaseJobStore):
@@ -40,9 +48,17 @@ class SQLAlchemyJobStore(BaseJobStore):
         (ignored if ``engine`` is given)
     """
 
-    def __init__(self, url=None, engine=None, tablename='apscheduler_jobs', metadata=None,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, tableschema=None, engine_options=None):
-        super(SQLAlchemyJobStore, self).__init__()
+    def __init__(
+        self,
+        url=None,
+        engine=None,
+        tablename="apscheduler_jobs",
+        metadata=None,
+        pickle_protocol=pickle.HIGHEST_PROTOCOL,
+        tableschema=None,
+        engine_options=None,
+    ):
+        super().__init__()
         self.pickle_protocol = pickle_protocol
         metadata = maybe_ref(metadata) or MetaData()
 
@@ -56,15 +72,16 @@ def __init__(self, url=None, engine=None, tablename='apscheduler_jobs', metadata
         # 191 = max key length in MySQL for InnoDB/utf8mb4 tables,
         # 25 = precision that translates to an 8-byte float
         self.jobs_t = Table(
-            tablename, metadata,
-            Column('id', Unicode(191), primary_key=True),
-            Column('next_run_time', Float(25), index=True),
-            Column('job_state', LargeBinary, nullable=False),
-            schema=tableschema
+            tablename,
+            metadata,
+            Column("id", Unicode(191), primary_key=True),
+            Column("next_run_time", Float(25), index=True),
+            Column("job_state", LargeBinary, nullable=False),
+            schema=tableschema,
         )
 
     def start(self, scheduler, alias):
-        super(SQLAlchemyJobStore, self).start(scheduler, alias)
+        super().start(scheduler, alias)
         self.jobs_t.create(self.engine, True)
 
     def lookup_job(self, job_id):
@@ -78,9 +95,12 @@ def get_due_jobs(self, now):
         return self._get_jobs(self.jobs_t.c.next_run_time <= timestamp)
 
     def get_next_run_time(self):
-        selectable = select(self.jobs_t.c.next_run_time).\
-            where(self.jobs_t.c.next_run_time != null()).\
-            order_by(self.jobs_t.c.next_run_time).limit(1)
+        selectable = (
+            select(self.jobs_t.c.next_run_time)
+            .where(self.jobs_t.c.next_run_time != null())
+            .order_by(self.jobs_t.c.next_run_time)
+            .limit(1)
+        )
         with self.engine.begin() as connection:
             next_run_time = connection.execute(selectable).scalar()
             return utc_timestamp_to_datetime(next_run_time)
@@ -91,11 +111,13 @@ def get_all_jobs(self):
         return jobs
 
     def add_job(self, job):
-        insert = self.jobs_t.insert().values(**{
-            'id': job.id,
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': pickle.dumps(job.__getstate__(), self.pickle_protocol)
-        })
+        insert = self.jobs_t.insert().values(
+            **{
+                "id": job.id,
+                "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+                "job_state": pickle.dumps(job.__getstate__(), self.pickle_protocol),
+            }
+        )
         with self.engine.begin() as connection:
             try:
                 connection.execute(insert)
@@ -103,10 +125,16 @@ def add_job(self, job):
                 raise ConflictingIdError(job.id)
 
     def update_job(self, job):
-        update = self.jobs_t.update().values(**{
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': pickle.dumps(job.__getstate__(), self.pickle_protocol)
-        }).where(self.jobs_t.c.id == job.id)
+        update = (
+            self.jobs_t.update()
+            .values(
+                **{
+                    "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+                    "job_state": pickle.dumps(job.__getstate__(), self.pickle_protocol),
+                }
+            )
+            .where(self.jobs_t.c.id == job.id)
+        )
         with self.engine.begin() as connection:
             result = connection.execute(update)
             if result.rowcount == 0:
@@ -129,7 +157,7 @@ def shutdown(self):
 
     def _reconstitute_job(self, job_state):
         job_state = pickle.loads(job_state)
-        job_state['jobstore'] = self
+        job_state["jobstore"] = self
         job = Job.__new__(Job)
         job.__setstate__(job_state)
         job._scheduler = self._scheduler
@@ -138,8 +166,9 @@ def _reconstitute_job(self, job_state):
 
     def _get_jobs(self, *conditions):
         jobs = []
-        selectable = select(self.jobs_t.c.id, self.jobs_t.c.job_state).\
-            order_by(self.jobs_t.c.next_run_time)
+        selectable = select(self.jobs_t.c.id, self.jobs_t.c.job_state).order_by(
+            self.jobs_t.c.next_run_time
+        )
         selectable = selectable.where(and_(*conditions)) if conditions else selectable
         failed_job_ids = set()
         with self.engine.begin() as connection:
@@ -147,15 +176,19 @@ def _get_jobs(self, *conditions):
                 try:
                     jobs.append(self._reconstitute_job(row.job_state))
                 except BaseException:
-                    self._logger.exception('Unable to restore job "%s" -- removing it', row.id)
+                    self._logger.exception(
+                        'Unable to restore job "%s" -- removing it', row.id
+                    )
                     failed_job_ids.add(row.id)
 
             # Remove all the jobs we failed to restore
             if failed_job_ids:
-                delete = self.jobs_t.delete().where(self.jobs_t.c.id.in_(failed_job_ids))
+                delete = self.jobs_t.delete().where(
+                    self.jobs_t.c.id.in_(failed_job_ids)
+                )
                 connection.execute(delete)
 
         return jobs
 
     def __repr__(self):
-        return '<%s (url=%s)>' % (self.__class__.__name__, self.engine.url)
+        return f"<{self.__class__.__name__} (url={self.engine.url})>"
diff --git a/libs/apscheduler/jobstores/zookeeper.py b/libs/apscheduler/jobstores/zookeeper.py
index 525306936e..687fbc2a5e 100644
--- a/libs/apscheduler/jobstores/zookeeper.py
+++ b/libs/apscheduler/jobstores/zookeeper.py
@@ -1,23 +1,20 @@
-from __future__ import absolute_import
+import pickle
+from datetime import datetime, timezone
 
-from datetime import datetime
+from kazoo.exceptions import NodeExistsError, NoNodeError
 
-from pytz import utc
-from kazoo.exceptions import NoNodeError, NodeExistsError
-
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
 from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.util import (
+    datetime_to_utc_timestamp,
+    maybe_ref,
+    utc_timestamp_to_datetime,
+)
 
 try:
     from kazoo.client import KazooClient
-except ImportError:  # pragma: nocover
-    raise ImportError('ZooKeeperJobStore requires Kazoo installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("ZooKeeperJobStore requires Kazoo installed") from exc
 
 
 class ZooKeeperJobStore(BaseJobStore):
@@ -35,9 +32,15 @@ class ZooKeeperJobStore(BaseJobStore):
         highest available
     """
 
-    def __init__(self, path='/apscheduler', client=None, close_connection_on_exit=False,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, **connect_args):
-        super(ZooKeeperJobStore, self).__init__()
+    def __init__(
+        self,
+        path="/apscheduler",
+        client=None,
+        close_connection_on_exit=False,
+        pickle_protocol=pickle.HIGHEST_PROTOCOL,
+        **connect_args,
+    ):
+        super().__init__()
         self.pickle_protocol = pickle_protocol
         self.close_connection_on_exit = close_connection_on_exit
 
@@ -58,7 +61,7 @@ def _ensure_paths(self):
         self._ensured_path = True
 
     def start(self, scheduler, alias):
-        super(ZooKeeperJobStore, self).start(scheduler, alias)
+        super().start(scheduler, alias)
         if not self.client.connected:
             self.client.start()
 
@@ -68,24 +71,31 @@ def lookup_job(self, job_id):
         try:
             content, _ = self.client.get(node_path)
             doc = pickle.loads(content)
-            job = self._reconstitute_job(doc['job_state'])
+            job = self._reconstitute_job(doc["job_state"])
             return job
         except BaseException:
             return None
 
     def get_due_jobs(self, now):
         timestamp = datetime_to_utc_timestamp(now)
-        jobs = [job_def['job'] for job_def in self._get_jobs()
-                if job_def['next_run_time'] is not None and job_def['next_run_time'] <= timestamp]
+        jobs = [
+            job_def["job"]
+            for job_def in self._get_jobs()
+            if job_def["next_run_time"] is not None
+            and job_def["next_run_time"] <= timestamp
+        ]
         return jobs
 
     def get_next_run_time(self):
-        next_runs = [job_def['next_run_time'] for job_def in self._get_jobs()
-                     if job_def['next_run_time'] is not None]
+        next_runs = [
+            job_def["next_run_time"]
+            for job_def in self._get_jobs()
+            if job_def["next_run_time"] is not None
+        ]
         return utc_timestamp_to_datetime(min(next_runs)) if len(next_runs) > 0 else None
 
     def get_all_jobs(self):
-        jobs = [job_def['job'] for job_def in self._get_jobs()]
+        jobs = [job_def["job"] for job_def in self._get_jobs()]
         self._fix_paused_jobs_sorting(jobs)
         return jobs
 
@@ -93,8 +103,8 @@ def add_job(self, job):
         self._ensure_paths()
         node_path = self.path + "/" + str(job.id)
         value = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': job.__getstate__()
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": job.__getstate__(),
         }
         data = pickle.dumps(value, self.pickle_protocol)
         try:
@@ -106,8 +116,8 @@ def update_job(self, job):
         self._ensure_paths()
         node_path = self.path + "/" + str(job.id)
         changes = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': job.__getstate__()
+            "next_run_time": datetime_to_utc_timestamp(job.next_run_time),
+            "job_state": job.__getstate__(),
         }
         data = pickle.dumps(changes, self.pickle_protocol)
         try:
@@ -154,25 +164,34 @@ def _get_jobs(self):
                 content, _ = self.client.get(node_path)
                 doc = pickle.loads(content)
                 job_def = {
-                    'job_id': node_name,
-                    'next_run_time': doc['next_run_time'] if doc['next_run_time'] else None,
-                    'job_state': doc['job_state'],
-                    'job': self._reconstitute_job(doc['job_state']),
-                    'creation_time': _.ctime
+                    "job_id": node_name,
+                    "next_run_time": doc["next_run_time"]
+                    if doc["next_run_time"]
+                    else None,
+                    "job_state": doc["job_state"],
+                    "job": self._reconstitute_job(doc["job_state"]),
+                    "creation_time": _.ctime,
                 }
                 jobs.append(job_def)
             except BaseException:
-                self._logger.exception('Unable to restore job "%s" -- removing it' % node_name)
+                self._logger.exception(
+                    'Unable to restore job "%s" -- removing it', node_name
+                )
                 failed_job_ids.append(node_name)
 
         # Remove all the jobs we failed to restore
         if failed_job_ids:
             for failed_id in failed_job_ids:
                 self.remove_job(failed_id)
-        paused_sort_key = datetime(9999, 12, 31, tzinfo=utc)
-        return sorted(jobs, key=lambda job_def: (job_def['job'].next_run_time or paused_sort_key,
-                                                 job_def['creation_time']))
+        paused_sort_key = datetime(9999, 12, 31, tzinfo=timezone.utc)
+        return sorted(
+            jobs,
+            key=lambda job_def: (
+                job_def["job"].next_run_time or paused_sort_key,
+                job_def["creation_time"],
+            ),
+        )
 
     def __repr__(self):
-        self._logger.exception('<%s (client=%s)>' % (self.__class__.__name__, self.client))
-        return '<%s (client=%s)>' % (self.__class__.__name__, self.client)
+        self._logger.exception("<%s (client=%s)>", self.__class__.__name__, self.client)
+        return f"<{self.__class__.__name__} (client={self.client})>"
diff --git a/libs/apscheduler/schedulers/__init__.py b/libs/apscheduler/schedulers/__init__.py
index bd8a790067..c17cc29890 100644
--- a/libs/apscheduler/schedulers/__init__.py
+++ b/libs/apscheduler/schedulers/__init__.py
@@ -2,11 +2,11 @@ class SchedulerAlreadyRunningError(Exception):
     """Raised when attempting to start or configure the scheduler when it's already running."""
 
     def __str__(self):
-        return 'Scheduler is already running'
+        return "Scheduler is already running"
 
 
 class SchedulerNotRunningError(Exception):
     """Raised when attempting to shutdown the scheduler when it's not running."""
 
     def __str__(self):
-        return 'Scheduler is not running'
+        return "Scheduler is not running"
diff --git a/libs/apscheduler/schedulers/asyncio.py b/libs/apscheduler/schedulers/asyncio.py
index 8bcdfdafaa..7fb3fa60b0 100644
--- a/libs/apscheduler/schedulers/asyncio.py
+++ b/libs/apscheduler/schedulers/asyncio.py
@@ -1,7 +1,7 @@
-from __future__ import absolute_import
 import asyncio
-from functools import wraps, partial
+from functools import partial, wraps
 
+from apscheduler.schedulers import SchedulerNotRunningError
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.util import maybe_ref
 
@@ -11,6 +11,7 @@ def run_in_event_loop(func):
     def wrapper(self, *args, **kwargs):
         wrapped = partial(func, self, *args, **kwargs)
         self._eventloop.call_soon_threadsafe(wrapped)
+
     return wrapper
 
 
@@ -31,19 +32,26 @@ class AsyncIOScheduler(BaseScheduler):
     _timeout = None
 
     def start(self, paused=False):
-        if not self._eventloop:
-            self._eventloop = asyncio.get_event_loop()
+        if not self._eventloop or self._eventloop.is_closed():
+            self._eventloop = asyncio.get_running_loop()
 
-        super(AsyncIOScheduler, self).start(paused)
+        super().start(paused)
 
     @run_in_event_loop
-    def shutdown(self, wait=True):
-        super(AsyncIOScheduler, self).shutdown(wait)
+    def _shutdown(self, wait=True):
+        super().shutdown(wait)
         self._stop_timer()
+        self._eventloop = None
+
+    def shutdown(self, wait=True):
+        if not self.running:
+            raise SchedulerNotRunningError
+
+        self._shutdown(wait)
 
     def _configure(self, config):
-        self._eventloop = maybe_ref(config.pop('event_loop', None))
-        super(AsyncIOScheduler, self)._configure(config)
+        self._eventloop = maybe_ref(config.pop("event_loop", None))
+        super()._configure(config)
 
     def _start_timer(self, wait_seconds):
         self._stop_timer()
@@ -63,4 +71,5 @@ def wakeup(self):
 
     def _create_default_executor(self):
         from apscheduler.executors.asyncio import AsyncIOExecutor
+
         return AsyncIOExecutor()
diff --git a/libs/apscheduler/schedulers/background.py b/libs/apscheduler/schedulers/background.py
index bb8f77da22..7d8d1bc70a 100644
--- a/libs/apscheduler/schedulers/background.py
+++ b/libs/apscheduler/schedulers/background.py
@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-
-from threading import Thread, Event
+from threading import Event, Thread
 
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.schedulers.blocking import BlockingScheduler
@@ -25,19 +23,20 @@ class BackgroundScheduler(BlockingScheduler):
     _thread = None
 
     def _configure(self, config):
-        self._daemon = asbool(config.pop('daemon', True))
-        super(BackgroundScheduler, self)._configure(config)
+        self._daemon = asbool(config.pop("daemon", True))
+        super()._configure(config)
 
     def start(self, *args, **kwargs):
         if self._event is None or self._event.is_set():
             self._event = Event()
 
         BaseScheduler.start(self, *args, **kwargs)
-        self._thread = Thread(target=self._main_loop, name='APScheduler')
-        self._thread.daemon = self._daemon
+        self._thread = Thread(
+            target=self._main_loop, name="APScheduler", daemon=self._daemon
+        )
         self._thread.start()
 
     def shutdown(self, *args, **kwargs):
-        super(BackgroundScheduler, self).shutdown(*args, **kwargs)
+        super().shutdown(*args, **kwargs)
         self._thread.join()
         del self._thread
diff --git a/libs/apscheduler/schedulers/base.py b/libs/apscheduler/schedulers/base.py
index f751c95513..7d713c7562 100644
--- a/libs/apscheduler/schedulers/base.py
+++ b/libs/apscheduler/schedulers/base.py
@@ -1,39 +1,54 @@
-from __future__ import print_function
-
+import sys
+import warnings
 from abc import ABCMeta, abstractmethod
-from threading import RLock
+from collections.abc import Mapping, MutableMapping
+from contextlib import ExitStack
 from datetime import datetime, timedelta
+from importlib.metadata import entry_points
 from logging import getLogger
-import warnings
-import sys
+from threading import TIMEOUT_MAX, RLock
 
 from tzlocal import get_localzone
-import six
 
-from apscheduler.schedulers import SchedulerAlreadyRunningError, SchedulerNotRunningError
-from apscheduler.executors.base import MaxInstancesReachedError, BaseExecutor
+from apscheduler.events import (
+    EVENT_ALL,
+    EVENT_ALL_JOBS_REMOVED,
+    EVENT_EXECUTOR_ADDED,
+    EVENT_EXECUTOR_REMOVED,
+    EVENT_JOB_ADDED,
+    EVENT_JOB_MAX_INSTANCES,
+    EVENT_JOB_MODIFIED,
+    EVENT_JOB_REMOVED,
+    EVENT_JOB_SUBMITTED,
+    EVENT_JOBSTORE_ADDED,
+    EVENT_JOBSTORE_REMOVED,
+    EVENT_SCHEDULER_PAUSED,
+    EVENT_SCHEDULER_RESUMED,
+    EVENT_SCHEDULER_SHUTDOWN,
+    EVENT_SCHEDULER_STARTED,
+    JobEvent,
+    JobSubmissionEvent,
+    SchedulerEvent,
+)
+from apscheduler.executors.base import BaseExecutor, MaxInstancesReachedError
 from apscheduler.executors.pool import ThreadPoolExecutor
-from apscheduler.jobstores.base import ConflictingIdError, JobLookupError, BaseJobStore
-from apscheduler.jobstores.memory import MemoryJobStore
 from apscheduler.job import Job
+from apscheduler.jobstores.base import BaseJobStore, ConflictingIdError, JobLookupError
+from apscheduler.jobstores.memory import MemoryJobStore
+from apscheduler.schedulers import (
+    SchedulerAlreadyRunningError,
+    SchedulerNotRunningError,
+)
 from apscheduler.triggers.base import BaseTrigger
 from apscheduler.util import (
-    asbool, asint, astimezone, maybe_ref, timedelta_seconds, undefined, TIMEOUT_MAX)
-from apscheduler.events import (
-    SchedulerEvent, JobEvent, JobSubmissionEvent, EVENT_SCHEDULER_START, EVENT_SCHEDULER_SHUTDOWN,
-    EVENT_JOBSTORE_ADDED, EVENT_JOBSTORE_REMOVED, EVENT_ALL, EVENT_JOB_MODIFIED, EVENT_JOB_REMOVED,
-    EVENT_JOB_ADDED, EVENT_EXECUTOR_ADDED, EVENT_EXECUTOR_REMOVED, EVENT_ALL_JOBS_REMOVED,
-    EVENT_JOB_SUBMITTED, EVENT_JOB_MAX_INSTANCES, EVENT_SCHEDULER_RESUMED, EVENT_SCHEDULER_PAUSED)
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
-
-try:
-    from importlib.metadata import entry_points
-except ModuleNotFoundError:
-    from importlib_metadata import entry_points
+    asbool,
+    asint,
+    astimezone,
+    maybe_ref,
+    obj_to_ref,
+    ref_to_obj,
+    undefined,
+)
 
 #: constant indicating a scheduler's stopped state
 STATE_STOPPED = 0
@@ -43,7 +58,7 @@
 STATE_PAUSED = 2
 
 
-class BaseScheduler(six.with_metaclass(ABCMeta)):
+class BaseScheduler(metaclass=ABCMeta):
     """
     Abstract base class for all schedulers.
 
@@ -66,15 +81,28 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
     .. seealso:: :ref:`scheduler-config`
     """
+
     # The `group=...` API is only available in the backport, used in <=3.7, and in std>=3.10.
     if (3, 8) <= sys.version_info < (3, 10):
-        _trigger_plugins = {ep.name: ep for ep in entry_points()['apscheduler.triggers']}
-        _executor_plugins = {ep.name: ep for ep in entry_points()['apscheduler.executors']}
-        _jobstore_plugins = {ep.name: ep for ep in entry_points()['apscheduler.jobstores']}
+        _trigger_plugins = {
+            ep.name: ep for ep in entry_points()["apscheduler.triggers"]
+        }
+        _executor_plugins = {
+            ep.name: ep for ep in entry_points()["apscheduler.executors"]
+        }
+        _jobstore_plugins = {
+            ep.name: ep for ep in entry_points()["apscheduler.jobstores"]
+        }
     else:
-        _trigger_plugins = {ep.name: ep for ep in entry_points(group='apscheduler.triggers')}
-        _executor_plugins = {ep.name: ep for ep in entry_points(group='apscheduler.executors')}
-        _jobstore_plugins = {ep.name: ep for ep in entry_points(group='apscheduler.jobstores')}
+        _trigger_plugins = {
+            ep.name: ep for ep in entry_points(group="apscheduler.triggers")
+        }
+        _executor_plugins = {
+            ep.name: ep for ep in entry_points(group="apscheduler.executors")
+        }
+        _jobstore_plugins = {
+            ep.name: ep for ep in entry_points(group="apscheduler.jobstores")
+        }
 
     _trigger_classes = {}
     _executor_classes = {}
@@ -85,7 +113,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
     #
 
     def __init__(self, gconfig={}, **options):
-        super(BaseScheduler, self).__init__()
+        super().__init__()
         self._executors = {}
         self._executors_lock = self._create_lock()
         self._jobstores = {}
@@ -97,11 +125,13 @@ def __init__(self, gconfig={}, **options):
         self.configure(gconfig, **options)
 
     def __getstate__(self):
-        raise TypeError("Schedulers cannot be serialized. Ensure that you are not passing a "
-                        "scheduler instance as an argument to a job, or scheduling an instance "
-                        "method where the instance contains a scheduler as an attribute.")
+        raise TypeError(
+            "Schedulers cannot be serialized. Ensure that you are not passing a "
+            "scheduler instance as an argument to a job, or scheduling an instance "
+            "method where the instance contains a scheduler as an attribute."
+        )
 
-    def configure(self, gconfig={}, prefix='apscheduler.', **options):
+    def configure(self, gconfig={}, prefix="apscheduler.", **options):
         """
         Reconfigures the scheduler with the given options.
 
@@ -121,14 +151,17 @@ def configure(self, gconfig={}, prefix='apscheduler.', **options):
         # global configuration dict
         if prefix:
             prefixlen = len(prefix)
-            gconfig = dict((key[prefixlen:], value) for key, value in six.iteritems(gconfig)
-                           if key.startswith(prefix))
+            gconfig = dict(
+                (key[prefixlen:], value)
+                for key, value in gconfig.items()
+                if key.startswith(prefix)
+            )
 
         # Create a structure from the dotted options
         # (e.g. "a.b.c = d" -> {'a': {'b': {'c': 'd'}}})
         config = {}
-        for key, value in six.iteritems(gconfig):
-            parts = key.split('.')
+        for key, value in gconfig.items():
+            parts = key.split(".")
             parent = config
             key = parts.pop(0)
             while parts:
@@ -156,20 +189,20 @@ def start(self, paused=False):
 
         with self._executors_lock:
             # Create a default executor if nothing else is configured
-            if 'default' not in self._executors:
-                self.add_executor(self._create_default_executor(), 'default')
+            if "default" not in self._executors:
+                self.add_executor(self._create_default_executor(), "default")
 
             # Start all the executors
-            for alias, executor in six.iteritems(self._executors):
+            for alias, executor in self._executors.items():
                 executor.start(self, alias)
 
         with self._jobstores_lock:
             # Create a default job store if nothing else is configured
-            if 'default' not in self._jobstores:
-                self.add_jobstore(self._create_default_jobstore(), 'default')
+            if "default" not in self._jobstores:
+                self.add_jobstore(self._create_default_jobstore(), "default")
 
             # Start all the job stores
-            for alias, store in six.iteritems(self._jobstores):
+            for alias, store in self._jobstores.items():
                 store.start(self, alias)
 
             # Schedule all pending jobs
@@ -178,8 +211,8 @@ def start(self, paused=False):
             del self._pending_jobs[:]
 
         self.state = STATE_PAUSED if paused else STATE_RUNNING
-        self._logger.info('Scheduler started')
-        self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_START))
+        self._logger.info("Scheduler started")
+        self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_STARTED))
 
         if not paused:
             self.wakeup()
@@ -202,14 +235,14 @@ def shutdown(self, wait=True):
 
         # Shut down all executors
         with self._executors_lock, self._jobstores_lock:
-            for executor in six.itervalues(self._executors):
+            for executor in self._executors.values():
                 executor.shutdown(wait)
 
             # Shut down all job stores
-            for jobstore in six.itervalues(self._jobstores):
+            for jobstore in self._jobstores.values():
                 jobstore.shutdown()
 
-        self._logger.info('Scheduler has been shut down')
+        self._logger.info("Scheduler has been shut down")
         self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_SHUTDOWN))
 
     def pause(self):
@@ -224,7 +257,7 @@ def pause(self):
             raise SchedulerNotRunningError
         elif self.state == STATE_RUNNING:
             self.state = STATE_PAUSED
-            self._logger.info('Paused scheduler job processing')
+            self._logger.info("Paused scheduler job processing")
             self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_PAUSED))
 
     def resume(self):
@@ -233,7 +266,7 @@ def resume(self):
             raise SchedulerNotRunningError
         elif self.state == STATE_PAUSED:
             self.state = STATE_RUNNING
-            self._logger.info('Resumed scheduler job processing')
+            self._logger.info("Resumed scheduler job processing")
             self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_RESUMED))
             self.wakeup()
 
@@ -247,7 +280,7 @@ def running(self):
         """
         return self.state != STATE_STOPPED
 
-    def add_executor(self, executor, alias='default', **executor_opts):
+    def add_executor(self, executor, alias="default", **executor_opts):
         """
         Adds an executor to this scheduler.
 
@@ -262,17 +295,20 @@ def add_executor(self, executor, alias='default', **executor_opts):
         """
         with self._executors_lock:
             if alias in self._executors:
-                raise ValueError('This scheduler already has an executor by the alias of "%s"' %
-                                 alias)
+                raise ValueError(
+                    f'This scheduler already has an executor by the alias of "{alias}"'
+                )
 
             if isinstance(executor, BaseExecutor):
                 self._executors[alias] = executor
-            elif isinstance(executor, six.string_types):
+            elif isinstance(executor, str):
                 self._executors[alias] = executor = self._create_plugin_instance(
-                    'executor', executor, executor_opts)
+                    "executor", executor, executor_opts
+                )
             else:
-                raise TypeError('Expected an executor instance or a string, got %s instead' %
-                                executor.__class__.__name__)
+                raise TypeError(
+                    f"Expected an executor instance or a string, got {executor.__class__.__name__} instead"
+                )
 
             # Start the executor right away if the scheduler is running
             if self.state != STATE_STOPPED:
@@ -298,7 +334,7 @@ def remove_executor(self, alias, shutdown=True):
 
         self._dispatch_event(SchedulerEvent(EVENT_EXECUTOR_REMOVED, alias))
 
-    def add_jobstore(self, jobstore, alias='default', **jobstore_opts):
+    def add_jobstore(self, jobstore, alias="default", **jobstore_opts):
         """
         Adds a job store to this scheduler.
 
@@ -312,17 +348,20 @@ def add_jobstore(self, jobstore, alias='default', **jobstore_opts):
         """
         with self._jobstores_lock:
             if alias in self._jobstores:
-                raise ValueError('This scheduler already has a job store by the alias of "%s"' %
-                                 alias)
+                raise ValueError(
+                    f'This scheduler already has a job store by the alias of "{alias}"'
+                )
 
             if isinstance(jobstore, BaseJobStore):
                 self._jobstores[alias] = jobstore
-            elif isinstance(jobstore, six.string_types):
+            elif isinstance(jobstore, str):
                 self._jobstores[alias] = jobstore = self._create_plugin_instance(
-                    'jobstore', jobstore, jobstore_opts)
+                    "jobstore", jobstore, jobstore_opts
+                )
             else:
-                raise TypeError('Expected a job store instance or a string, got %s instead' %
-                                jobstore.__class__.__name__)
+                raise TypeError(
+                    f"Expected a job store instance or a string, got {jobstore.__class__.__name__} instead"
+                )
 
             # Start the job store right away if the scheduler isn't stopped
             if self.state != STATE_STOPPED:
@@ -381,10 +420,23 @@ def remove_listener(self, callback):
                 if callback == cb:
                     del self._listeners[i]
 
-    def add_job(self, func, trigger=None, args=None, kwargs=None, id=None, name=None,
-                misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
-                next_run_time=undefined, jobstore='default', executor='default',
-                replace_existing=False, **trigger_args):
+    def add_job(
+        self,
+        func,
+        trigger=None,
+        args=None,
+        kwargs=None,
+        id=None,
+        name=None,
+        misfire_grace_time=undefined,
+        coalesce=undefined,
+        max_instances=undefined,
+        next_run_time=undefined,
+        jobstore="default",
+        executor="default",
+        replace_existing=False,
+        **trigger_args,
+    ):
         """
         add_job(func, trigger=None, args=None, kwargs=None, id=None, \
             name=None, misfire_grace_time=undefined, coalesce=undefined, \
@@ -431,37 +483,51 @@ def add_job(self, func, trigger=None, args=None, kwargs=None, id=None, name=None
 
         """
         job_kwargs = {
-            'trigger': self._create_trigger(trigger, trigger_args),
-            'executor': executor,
-            'func': func,
-            'args': tuple(args) if args is not None else (),
-            'kwargs': dict(kwargs) if kwargs is not None else {},
-            'id': id,
-            'name': name,
-            'misfire_grace_time': misfire_grace_time,
-            'coalesce': coalesce,
-            'max_instances': max_instances,
-            'next_run_time': next_run_time
+            "trigger": self._create_trigger(trigger, trigger_args),
+            "executor": executor,
+            "func": func,
+            "args": tuple(args) if args is not None else (),
+            "kwargs": dict(kwargs) if kwargs is not None else {},
+            "id": id,
+            "name": name,
+            "misfire_grace_time": misfire_grace_time,
+            "coalesce": coalesce,
+            "max_instances": max_instances,
+            "next_run_time": next_run_time,
         }
-        job_kwargs = dict((key, value) for key, value in six.iteritems(job_kwargs) if
-                          value is not undefined)
+        job_kwargs = dict(
+            (key, value) for key, value in job_kwargs.items() if value is not undefined
+        )
         job = Job(self, **job_kwargs)
 
         # Don't really add jobs to job stores before the scheduler is up and running
         with self._jobstores_lock:
             if self.state == STATE_STOPPED:
                 self._pending_jobs.append((job, jobstore, replace_existing))
-                self._logger.info('Adding job tentatively -- it will be properly scheduled when '
-                                  'the scheduler starts')
+                self._logger.info(
+                    "Adding job tentatively -- it will be properly scheduled when "
+                    "the scheduler starts"
+                )
             else:
                 self._real_add_job(job, jobstore, replace_existing)
 
         return job
 
-    def scheduled_job(self, trigger, args=None, kwargs=None, id=None, name=None,
-                      misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
-                      next_run_time=undefined, jobstore='default', executor='default',
-                      **trigger_args):
+    def scheduled_job(
+        self,
+        trigger,
+        args=None,
+        kwargs=None,
+        id=None,
+        name=None,
+        misfire_grace_time=undefined,
+        coalesce=undefined,
+        max_instances=undefined,
+        next_run_time=undefined,
+        jobstore="default",
+        executor="default",
+        **trigger_args,
+    ):
         """
         scheduled_job(trigger, args=None, kwargs=None, id=None, \
             name=None, misfire_grace_time=undefined, \
@@ -476,10 +542,26 @@ def scheduled_job(self, trigger, args=None, kwargs=None, id=None, name=None,
         store. The scheduler cannot, however, enforce this requirement.
 
         """
+
         def inner(func):
-            self.add_job(func, trigger, args, kwargs, id, name, misfire_grace_time, coalesce,
-                         max_instances, next_run_time, jobstore, executor, True, **trigger_args)
+            self.add_job(
+                func,
+                trigger,
+                args,
+                kwargs,
+                id,
+                name,
+                misfire_grace_time,
+                coalesce,
+                max_instances,
+                next_run_time,
+                jobstore,
+                executor,
+                True,
+                **trigger_args,
+            )
             return func
+
         return inner
 
     def modify_job(self, job_id, jobstore=None, **changes):
@@ -522,7 +604,9 @@ def reschedule_job(self, job_id, jobstore=None, trigger=None, **trigger_args):
         trigger = self._create_trigger(trigger, trigger_args)
         now = datetime.now(self.timezone)
         next_run_time = trigger.get_next_fire_time(None, now)
-        return self.modify_job(job_id, jobstore, trigger=trigger, next_run_time=next_run_time)
+        return self.modify_job(
+            job_id, jobstore, trigger=trigger, next_run_time=next_run_time
+        )
 
     def pause_job(self, job_id, jobstore=None):
         """
@@ -568,9 +652,12 @@ def get_jobs(self, jobstore=None, pending=None):
 
         """
         if pending is not None:
-            warnings.warn('The "pending" option is deprecated -- get_jobs() always returns '
-                          'scheduled jobs if the scheduler has been started and pending jobs '
-                          'otherwise', DeprecationWarning)
+            warnings.warn(
+                'The "pending" option is deprecated -- get_jobs() always returns '
+                "scheduled jobs if the scheduler has been started and pending jobs "
+                "otherwise",
+                DeprecationWarning,
+            )
 
         with self._jobstores_lock:
             jobs = []
@@ -579,7 +666,7 @@ def get_jobs(self, jobstore=None, pending=None):
                     if jobstore is None or alias == jobstore:
                         jobs.append(job)
             else:
-                for alias, store in six.iteritems(self._jobstores):
+                for alias, store in self._jobstores.items():
                     if jobstore is None or alias == jobstore:
                         jobs.extend(store.get_all_jobs())
 
@@ -622,7 +709,7 @@ def remove_job(self, job_id, jobstore=None):
             else:
                 # Otherwise, try to remove it from each store until it succeeds or we run out of
                 # stores to check
-                for alias, store in six.iteritems(self._jobstores):
+                for alias, store in self._jobstores.items():
                     if jobstore in (None, alias):
                         try:
                             store.remove_job(job_id)
@@ -638,7 +725,7 @@ def remove_job(self, job_id, jobstore=None):
         event = JobEvent(EVENT_JOB_REMOVED, job_id, jobstore_alias)
         self._dispatch_event(event)
 
-        self._logger.info('Removed job %s', job_id)
+        self._logger.info("Removed job %s", job_id)
 
     def remove_all_jobs(self, jobstore=None):
         """
@@ -650,12 +737,15 @@ def remove_all_jobs(self, jobstore=None):
         with self._jobstores_lock:
             if self.state == STATE_STOPPED:
                 if jobstore:
-                    self._pending_jobs = [pending for pending in self._pending_jobs if
-                                          pending[1] != jobstore]
+                    self._pending_jobs = [
+                        pending
+                        for pending in self._pending_jobs
+                        if pending[1] != jobstore
+                    ]
                 else:
                     self._pending_jobs = []
             else:
-                for alias, store in six.iteritems(self._jobstores):
+                for alias, store in self._jobstores.items():
                     if jobstore in (None, alias):
                         store.remove_all_jobs()
 
@@ -676,23 +766,123 @@ def print_jobs(self, jobstore=None, out=None):
         out = out or sys.stdout
         with self._jobstores_lock:
             if self.state == STATE_STOPPED:
-                print(u'Pending jobs:', file=out)
+                print("Pending jobs:", file=out)
                 if self._pending_jobs:
                     for job, jobstore_alias, replace_existing in self._pending_jobs:
                         if jobstore in (None, jobstore_alias):
-                            print(u'    %s' % job, file=out)
+                            print(f"    {job}", file=out)
                 else:
-                    print(u'    No pending jobs', file=out)
+                    print("    No pending jobs", file=out)
             else:
-                for alias, store in sorted(six.iteritems(self._jobstores)):
+                for alias, store in sorted(self._jobstores.items()):
                     if jobstore in (None, alias):
-                        print(u'Jobstore %s:' % alias, file=out)
+                        print(f"Jobstore {alias}:", file=out)
                         jobs = store.get_all_jobs()
                         if jobs:
                             for job in jobs:
-                                print(u'    %s' % job, file=out)
+                                print(f"    {job}", file=out)
                         else:
-                            print(u'    No scheduled jobs', file=out)
+                            print("    No scheduled jobs", file=out)
+
+    def export_jobs(self, outfile, jobstore=None):
+        """
+        Export stored jobs as JSON.
+
+        :param outfile: either a file object opened in text write mode ("w"), or a path
+            to the target file
+        :param jobstore: alias of the job store to export jobs from (if omitted, export
+            from all configured job stores)
+
+        """
+        import json
+        import pickle
+        from base64 import b64encode
+
+        from apscheduler import version
+
+        if self.state == STATE_STOPPED:
+            raise RuntimeError(
+                "the scheduler must have been started for job export to work"
+            )
+
+        def encode_with_pickle(obj):
+            return b64encode(pickle.dumps(obj, pickle.HIGHEST_PROTOCOL)).decode("ascii")
+
+        def json_default(obj):
+            if hasattr(obj, "__getstate__") and hasattr(obj, "__setstate__"):
+                state = obj.__getstate__()
+                if isinstance(state, Mapping):
+                    return {
+                        "__apscheduler_class__": obj_to_ref(obj.__class__),
+                        "__apscheduler_state__": state,
+                    }
+
+            return {"__apscheduler_pickle__": encode_with_pickle(obj)}
+
+        with self._jobstores_lock:
+            all_jobs = [
+                job
+                for alias, store in self._jobstores.items()
+                for job in store.get_all_jobs()
+                if jobstore in (None, alias)
+            ]
+
+        with ExitStack() as stack:
+            if not hasattr(outfile, "write"):
+                outfile = stack.enter_context(open(outfile, "w"))
+
+            json.dump(
+                {
+                    "version": 1,
+                    "scheduler_version": version,
+                    "jobs": [job.__getstate__() for job in all_jobs],
+                },
+                outfile,
+                default=json_default,
+            )
+
+    def import_jobs(self, infile, jobstore="default"):
+        """
+        Import jobs previously exported via :meth:`export_jobs.
+
+        :param infile: either a file object opened in text read mode ("r") or a path to
+            a JSON file containing previously exported jobs
+        :param jobstore: the alias of the job store to import the jobs to
+
+        """
+        import json
+        import pickle
+        from base64 import b64decode
+
+        def json_object_hook(dct):
+            if pickle_data := dct.get("__apscheduler_pickle__"):
+                return pickle.loads(b64decode(pickle_data))
+
+            if obj_class := dct.get("__apscheduler_class__"):
+                if obj_state := dct.get("__apscheduler_state__"):
+                    obj_class = ref_to_obj(obj_class)
+                    obj = object.__new__(obj_class)
+                    obj.__setstate__(obj_state)
+                    return obj
+
+            return dct
+
+        jobstore = self._jobstores[jobstore]
+        with ExitStack() as stack:
+            if not hasattr(infile, "read"):
+                infile = stack.enter_context(open(infile))
+
+            data = json.load(infile, object_hook=json_object_hook)
+            if not isinstance(data, dict):
+                raise ValueError()
+
+            if (version := data.get("version", None)) != 1:
+                raise ValueError(f"unrecognized version: {version}")
+
+            for job_state in data["jobs"]:
+                job = object.__new__(Job)
+                job.__setstate__(job_state)
+                jobstore.add_job(job)
 
     @abstractmethod
     def wakeup(self):
@@ -707,65 +897,68 @@ def wakeup(self):
 
     def _configure(self, config):
         # Set general options
-        self._logger = maybe_ref(config.pop('logger', None)) or getLogger('apscheduler.scheduler')
-        self.timezone = astimezone(config.pop('timezone', None)) or get_localzone()
-        self.jobstore_retry_interval = float(config.pop('jobstore_retry_interval', 10))
+        self._logger = maybe_ref(config.pop("logger", None)) or getLogger(
+            "apscheduler.scheduler"
+        )
+        self.timezone = astimezone(config.pop("timezone", None)) or get_localzone()
+        self.jobstore_retry_interval = float(config.pop("jobstore_retry_interval", 10))
 
         # Set the job defaults
-        job_defaults = config.get('job_defaults', {})
+        job_defaults = config.get("job_defaults", {})
         self._job_defaults = {
-            'misfire_grace_time': asint(job_defaults.get('misfire_grace_time', 1)),
-            'coalesce': asbool(job_defaults.get('coalesce', True)),
-            'max_instances': asint(job_defaults.get('max_instances', 1))
+            "misfire_grace_time": asint(job_defaults.get("misfire_grace_time", 1)),
+            "coalesce": asbool(job_defaults.get("coalesce", True)),
+            "max_instances": asint(job_defaults.get("max_instances", 1)),
         }
 
         # Configure executors
         self._executors.clear()
-        for alias, value in six.iteritems(config.get('executors', {})):
+        for alias, value in config.get("executors", {}).items():
             if isinstance(value, BaseExecutor):
                 self.add_executor(value, alias)
             elif isinstance(value, MutableMapping):
-                executor_class = value.pop('class', None)
-                plugin = value.pop('type', None)
+                executor_class = value.pop("class", None)
+                plugin = value.pop("type", None)
                 if plugin:
-                    executor = self._create_plugin_instance('executor', plugin, value)
+                    executor = self._create_plugin_instance("executor", plugin, value)
                 elif executor_class:
                     cls = maybe_ref(executor_class)
                     executor = cls(**value)
                 else:
                     raise ValueError(
-                        'Cannot create executor "%s" -- either "type" or "class" must be defined' %
-                        alias)
+                        f'Cannot create executor "{alias}" -- either "type" or "class" must be defined'
+                    )
 
                 self.add_executor(executor, alias)
             else:
                 raise TypeError(
-                    "Expected executor instance or dict for executors['%s'], got %s instead" %
-                    (alias, value.__class__.__name__))
+                    f"Expected executor instance or dict for executors['{alias}'], got {value.__class__.__name__} instead"
+                )
 
         # Configure job stores
         self._jobstores.clear()
-        for alias, value in six.iteritems(config.get('jobstores', {})):
+        for alias, value in config.get("jobstores", {}).items():
             if isinstance(value, BaseJobStore):
                 self.add_jobstore(value, alias)
             elif isinstance(value, MutableMapping):
-                jobstore_class = value.pop('class', None)
-                plugin = value.pop('type', None)
+                jobstore_class = value.pop("class", None)
+                plugin = value.pop("type", None)
                 if plugin:
-                    jobstore = self._create_plugin_instance('jobstore', plugin, value)
+                    jobstore = self._create_plugin_instance("jobstore", plugin, value)
                 elif jobstore_class:
                     cls = maybe_ref(jobstore_class)
                     jobstore = cls(**value)
                 else:
                     raise ValueError(
-                        'Cannot create job store "%s" -- either "type" or "class" must be '
-                        'defined' % alias)
+                        f'Cannot create job store "{alias}" -- either "type" or "class" must be '
+                        "defined"
+                    )
 
                 self.add_jobstore(jobstore, alias)
             else:
                 raise TypeError(
-                    "Expected job store instance or dict for jobstores['%s'], got %s instead" %
-                    (alias, value.__class__.__name__))
+                    f"Expected job store instance or dict for jobstores['{alias}'], got {value.__class__.__name__} instead"
+                )
 
     def _create_default_executor(self):
         """Creates a default executor store, specific to the particular scheduler type."""
@@ -787,7 +980,7 @@ def _lookup_executor(self, alias):
         try:
             return self._executors[alias]
         except KeyError:
-            raise KeyError('No such executor: %s' % alias)
+            raise KeyError(f"No such executor: {alias}")
 
     def _lookup_jobstore(self, alias):
         """
@@ -801,7 +994,7 @@ def _lookup_jobstore(self, alias):
         try:
             return self._jobstores[alias]
         except KeyError:
-            raise KeyError('No such job store: %s' % alias)
+            raise KeyError(f"No such job store: {alias}")
 
     def _lookup_job(self, job_id, jobstore_alias):
         """
@@ -821,7 +1014,7 @@ def _lookup_job(self, job_id, jobstore_alias):
                     return job, None
         else:
             # Look in all job stores
-            for alias, store in six.iteritems(self._jobstores):
+            for alias, store in self._jobstores.items():
                 if jobstore_alias in (None, alias):
                     job = store.lookup_job(job_id)
                     if job is not None:
@@ -844,15 +1037,17 @@ def _dispatch_event(self, event):
                 try:
                     cb(event)
                 except BaseException:
-                    self._logger.exception('Error notifying listener')
+                    self._logger.exception("Error notifying listener")
 
     def _check_uwsgi(self):
         """Check if we're running under uWSGI with threads disabled."""
-        uwsgi_module = sys.modules.get('uwsgi')
-        if not getattr(uwsgi_module, 'has_threads', True):
-            raise RuntimeError('The scheduler seems to be running under uWSGI, but threads have '
-                               'been disabled. You must run uWSGI with the --enable-threads '
-                               'option for the scheduler to work.')
+        uwsgi_module = sys.modules.get("uwsgi")
+        if not getattr(uwsgi_module, "has_threads", True):
+            raise RuntimeError(
+                "The scheduler seems to be running under uWSGI, but threads have "
+                "been disabled. You must run uWSGI with the --enable-threads "
+                "option for the scheduler to work."
+            )
 
     def _real_add_job(self, job, jobstore_alias, replace_existing):
         """
@@ -863,14 +1058,14 @@ def _real_add_job(self, job, jobstore_alias, replace_existing):
         """
         # Fill in undefined values with defaults
         replacements = {}
-        for key, value in six.iteritems(self._job_defaults):
+        for key, value in self._job_defaults.items():
             if not hasattr(job, key):
                 replacements[key] = value
 
         # Calculate the next run time if there is none defined
-        if not hasattr(job, 'next_run_time'):
+        if not hasattr(job, "next_run_time"):
             now = datetime.now(self.timezone)
-            replacements['next_run_time'] = job.trigger.get_next_fire_time(None, now)
+            replacements["next_run_time"] = job.trigger.get_next_fire_time(None, now)
 
         # Apply any replacements
         job._modify(**replacements)
@@ -901,9 +1096,9 @@ def _real_add_job(self, job, jobstore_alias, replace_existing):
     def _create_plugin_instance(self, type_, alias, constructor_kwargs):
         """Creates an instance of the given plugin type, loading the plugin first if necessary."""
         plugin_container, class_container, base_class = {
-            'trigger': (self._trigger_plugins, self._trigger_classes, BaseTrigger),
-            'jobstore': (self._jobstore_plugins, self._jobstore_classes, BaseJobStore),
-            'executor': (self._executor_plugins, self._executor_classes, BaseExecutor)
+            "trigger": (self._trigger_plugins, self._trigger_classes, BaseTrigger),
+            "jobstore": (self._jobstore_plugins, self._jobstore_classes, BaseJobStore),
+            "executor": (self._executor_plugins, self._executor_classes, BaseExecutor),
         }[type_]
 
         try:
@@ -912,10 +1107,11 @@ def _create_plugin_instance(self, type_, alias, constructor_kwargs):
             if alias in plugin_container:
                 plugin_cls = class_container[alias] = plugin_container[alias].load()
                 if not issubclass(plugin_cls, base_class):
-                    raise TypeError('The {0} entry point does not point to a {0} class'.
-                                    format(type_))
+                    raise TypeError(
+                        f"The {type_} entry point does not point to a {type_} class"
+                    )
             else:
-                raise LookupError('No {0} by the name "{1}" was found'.format(type_, alias))
+                raise LookupError(f'No {type_} by the name "{alias}" was found')
 
         return plugin_cls(**constructor_kwargs)
 
@@ -923,16 +1119,17 @@ def _create_trigger(self, trigger, trigger_args):
         if isinstance(trigger, BaseTrigger):
             return trigger
         elif trigger is None:
-            trigger = 'date'
-        elif not isinstance(trigger, six.string_types):
-            raise TypeError('Expected a trigger instance or string, got %s instead' %
-                            trigger.__class__.__name__)
+            trigger = "date"
+        elif not isinstance(trigger, str):
+            raise TypeError(
+                f"Expected a trigger instance or string, got {trigger.__class__.__name__} instead"
+            )
 
         # Use the scheduler's time zone if nothing else is specified
-        trigger_args.setdefault('timezone', self.timezone)
+        trigger_args.setdefault("timezone", self.timezone)
 
         # Instantiate the trigger class
-        return self._create_plugin_instance('trigger', trigger, trigger_args)
+        return self._create_plugin_instance("trigger", trigger, trigger_args)
 
     def _create_lock(self):
         """Creates a reentrant lock object."""
@@ -948,23 +1145,28 @@ def _process_jobs(self):
 
         """
         if self.state == STATE_PAUSED:
-            self._logger.debug('Scheduler is paused -- not processing jobs')
+            self._logger.debug("Scheduler is paused -- not processing jobs")
             return None
 
-        self._logger.debug('Looking for jobs to run')
+        self._logger.debug("Looking for jobs to run")
         now = datetime.now(self.timezone)
         next_wakeup_time = None
         events = []
 
         with self._jobstores_lock:
-            for jobstore_alias, jobstore in six.iteritems(self._jobstores):
+            for jobstore_alias, jobstore in self._jobstores.items():
                 try:
                     due_jobs = jobstore.get_due_jobs(now)
                 except Exception as e:
                     # Schedule a wakeup at least in jobstore_retry_interval seconds
-                    self._logger.warning('Error getting due jobs from job store %r: %s',
-                                         jobstore_alias, e)
-                    retry_wakeup_time = now + timedelta(seconds=self.jobstore_retry_interval)
+                    self._logger.warning(
+                        "Error getting due jobs from job store %r: %s",
+                        jobstore_alias,
+                        e,
+                    )
+                    retry_wakeup_time = now + timedelta(
+                        seconds=self.jobstore_retry_interval
+                    )
                     if not next_wakeup_time or next_wakeup_time > retry_wakeup_time:
                         next_wakeup_time = retry_wakeup_time
 
@@ -977,33 +1179,51 @@ def _process_jobs(self):
                     except BaseException:
                         self._logger.error(
                             'Executor lookup ("%s") failed for job "%s" -- removing it from the '
-                            'job store', job.executor, job)
+                            "job store",
+                            job.executor,
+                            job,
+                        )
                         self.remove_job(job.id, jobstore_alias)
                         continue
 
                     run_times = job._get_run_times(now)
-                    run_times = run_times[-1:] if run_times and job.coalesce else run_times
+                    run_times = (
+                        run_times[-1:] if run_times and job.coalesce else run_times
+                    )
                     if run_times:
                         try:
                             executor.submit_job(job, run_times)
                         except MaxInstancesReachedError:
                             self._logger.warning(
                                 'Execution of job "%s" skipped: maximum number of running '
-                                'instances reached (%d)', job, job.max_instances)
-                            event = JobSubmissionEvent(EVENT_JOB_MAX_INSTANCES, job.id,
-                                                       jobstore_alias, run_times)
+                                "instances reached (%d)",
+                                job,
+                                job.max_instances,
+                            )
+                            event = JobSubmissionEvent(
+                                EVENT_JOB_MAX_INSTANCES,
+                                job.id,
+                                jobstore_alias,
+                                run_times,
+                            )
                             events.append(event)
                         except BaseException:
-                            self._logger.exception('Error submitting job "%s" to executor "%s"',
-                                                   job, job.executor)
+                            self._logger.exception(
+                                'Error submitting job "%s" to executor "%s"',
+                                job,
+                                job.executor,
+                            )
                         else:
-                            event = JobSubmissionEvent(EVENT_JOB_SUBMITTED, job.id, jobstore_alias,
-                                                       run_times)
+                            event = JobSubmissionEvent(
+                                EVENT_JOB_SUBMITTED, job.id, jobstore_alias, run_times
+                            )
                             events.append(event)
 
                         # Update the job if it has a next execution time.
                         # Otherwise remove it from the job store.
-                        job_next_run = job.trigger.get_next_fire_time(run_times[-1], now)
+                        job_next_run = job.trigger.get_next_fire_time(
+                            run_times[-1], now
+                        )
                         if job_next_run:
                             job._modify(next_run_time=job_next_run)
                             jobstore.update_job(job)
@@ -1013,8 +1233,10 @@ def _process_jobs(self):
                 # Set a new next wakeup time if there isn't one yet or
                 # the jobstore has an even earlier one
                 jobstore_next_run_time = jobstore.get_next_run_time()
-                if jobstore_next_run_time and (next_wakeup_time is None or
-                                               jobstore_next_run_time < next_wakeup_time):
+                if jobstore_next_run_time and (
+                    next_wakeup_time is None
+                    or jobstore_next_run_time < next_wakeup_time
+                ):
                     next_wakeup_time = jobstore_next_run_time.astimezone(self.timezone)
 
         # Dispatch collected events
@@ -1024,14 +1246,19 @@ def _process_jobs(self):
         # Determine the delay until this method should be called again
         if self.state == STATE_PAUSED:
             wait_seconds = None
-            self._logger.debug('Scheduler is paused; waiting until resume() is called')
+            self._logger.debug("Scheduler is paused; waiting until resume() is called")
         elif next_wakeup_time is None:
             wait_seconds = None
-            self._logger.debug('No jobs; waiting until a job is added')
+            self._logger.debug("No jobs; waiting until a job is added")
         else:
             now = datetime.now(self.timezone)
-            wait_seconds = min(max(timedelta_seconds(next_wakeup_time - now), 0), TIMEOUT_MAX)
-            self._logger.debug('Next wakeup is due at %s (in %f seconds)', next_wakeup_time,
-                               wait_seconds)
+            wait_seconds = min(
+                max((next_wakeup_time - now).total_seconds(), 0), TIMEOUT_MAX
+            )
+            self._logger.debug(
+                "Next wakeup is due at %s (in %f seconds)",
+                next_wakeup_time,
+                wait_seconds,
+            )
 
         return wait_seconds
diff --git a/libs/apscheduler/schedulers/blocking.py b/libs/apscheduler/schedulers/blocking.py
index 4ecc9f6f1e..0330885d98 100644
--- a/libs/apscheduler/schedulers/blocking.py
+++ b/libs/apscheduler/schedulers/blocking.py
@@ -1,9 +1,6 @@
-from __future__ import absolute_import
+from threading import TIMEOUT_MAX, Event
 
-from threading import Event
-
-from apscheduler.schedulers.base import BaseScheduler, STATE_STOPPED
-from apscheduler.util import TIMEOUT_MAX
+from apscheduler.schedulers.base import STATE_STOPPED, BaseScheduler
 
 
 class BlockingScheduler(BaseScheduler):
@@ -11,17 +8,18 @@ class BlockingScheduler(BaseScheduler):
     A scheduler that runs in the foreground
     (:meth:`~apscheduler.schedulers.base.BaseScheduler.start` will block).
     """
+
     _event = None
 
     def start(self, *args, **kwargs):
         if self._event is None or self._event.is_set():
             self._event = Event()
 
-        super(BlockingScheduler, self).start(*args, **kwargs)
+        super().start(*args, **kwargs)
         self._main_loop()
 
     def shutdown(self, wait=True):
-        super(BlockingScheduler, self).shutdown(wait)
+        super().shutdown(wait)
         self._event.set()
 
     def _main_loop(self):
diff --git a/libs/apscheduler/schedulers/gevent.py b/libs/apscheduler/schedulers/gevent.py
index d48ed74af2..e32ad643b4 100644
--- a/libs/apscheduler/schedulers/gevent.py
+++ b/libs/apscheduler/schedulers/gevent.py
@@ -1,14 +1,12 @@
-from __future__ import absolute_import
-
-from apscheduler.schedulers.blocking import BlockingScheduler
 from apscheduler.schedulers.base import BaseScheduler
+from apscheduler.schedulers.blocking import BlockingScheduler
 
 try:
+    import gevent
     from gevent.event import Event
     from gevent.lock import RLock
-    import gevent
-except ImportError:  # pragma: nocover
-    raise ImportError('GeventScheduler requires gevent installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("GeventScheduler requires gevent installed") from exc
 
 
 class GeventScheduler(BlockingScheduler):
@@ -23,7 +21,7 @@ def start(self, *args, **kwargs):
         return self._greenlet
 
     def shutdown(self, *args, **kwargs):
-        super(GeventScheduler, self).shutdown(*args, **kwargs)
+        super().shutdown(*args, **kwargs)
         self._greenlet.join()
         del self._greenlet
 
@@ -32,4 +30,5 @@ def _create_lock(self):
 
     def _create_default_executor(self):
         from apscheduler.executors.gevent import GeventExecutor
+
         return GeventExecutor()
diff --git a/libs/apscheduler/schedulers/qt.py b/libs/apscheduler/schedulers/qt.py
index 6762c5c395..457b5395ed 100644
--- a/libs/apscheduler/schedulers/qt.py
+++ b/libs/apscheduler/schedulers/qt.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from importlib import import_module
 from itertools import product
 
@@ -14,9 +12,7 @@
         QTimer = qtcore.QTimer
         break
 else:
-    raise ImportError(
-        "QtScheduler requires either PySide/PyQt (v6 to v2) installed"
-    )
+    raise ImportError("QtScheduler requires either PySide/PyQt (v6 to v2) installed")
 
 
 class QtScheduler(BaseScheduler):
@@ -25,7 +21,7 @@ class QtScheduler(BaseScheduler):
     _timer = None
 
     def shutdown(self, *args, **kwargs):
-        super(QtScheduler, self).shutdown(*args, **kwargs)
+        super().shutdown(*args, **kwargs)
         self._stop_timer()
 
     def _start_timer(self, wait_seconds):
@@ -44,5 +40,5 @@ def wakeup(self):
         self._start_timer(0)
 
     def _process_jobs(self):
-        wait_seconds = super(QtScheduler, self)._process_jobs()
+        wait_seconds = super()._process_jobs()
         self._start_timer(wait_seconds)
diff --git a/libs/apscheduler/schedulers/tornado.py b/libs/apscheduler/schedulers/tornado.py
index 0a9171f285..a25764d245 100644
--- a/libs/apscheduler/schedulers/tornado.py
+++ b/libs/apscheduler/schedulers/tornado.py
@@ -1,21 +1,24 @@
-from __future__ import absolute_import
-
 from datetime import timedelta
 from functools import wraps
 
+from apscheduler.schedulers import SchedulerNotRunningError
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.util import maybe_ref
 
 try:
     from tornado.ioloop import IOLoop
-except ImportError:  # pragma: nocover
-    raise ImportError('TornadoScheduler requires tornado installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("TornadoScheduler requires tornado installed") from exc
 
 
 def run_in_ioloop(func):
     @wraps(func)
     def wrapper(self, *args, **kwargs):
+        if self._ioloop is None:
+            raise SchedulerNotRunningError
+
         self._ioloop.add_callback(func, self, *args, **kwargs)
+
     return wrapper
 
 
@@ -34,18 +37,26 @@ class TornadoScheduler(BaseScheduler):
     _timeout = None
 
     @run_in_ioloop
-    def shutdown(self, wait=True):
-        super(TornadoScheduler, self).shutdown(wait)
+    def _shutdown(self, wait=True):
+        super().shutdown(wait)
         self._stop_timer()
 
+    def shutdown(self, wait=True):
+        if not self.running:
+            raise SchedulerNotRunningError
+
+        self._shutdown(wait)
+
     def _configure(self, config):
-        self._ioloop = maybe_ref(config.pop('io_loop', None)) or IOLoop.current()
-        super(TornadoScheduler, self)._configure(config)
+        self._ioloop = maybe_ref(config.pop("io_loop", None)) or IOLoop.current()
+        super()._configure(config)
 
     def _start_timer(self, wait_seconds):
         self._stop_timer()
         if wait_seconds is not None:
-            self._timeout = self._ioloop.add_timeout(timedelta(seconds=wait_seconds), self.wakeup)
+            self._timeout = self._ioloop.add_timeout(
+                timedelta(seconds=wait_seconds), self.wakeup
+            )
 
     def _stop_timer(self):
         if self._timeout:
@@ -54,6 +65,7 @@ def _stop_timer(self):
 
     def _create_default_executor(self):
         from apscheduler.executors.tornado import TornadoExecutor
+
         return TornadoExecutor()
 
     @run_in_ioloop
diff --git a/libs/apscheduler/schedulers/twisted.py b/libs/apscheduler/schedulers/twisted.py
index 6b43a84b4a..8a9183144c 100644
--- a/libs/apscheduler/schedulers/twisted.py
+++ b/libs/apscheduler/schedulers/twisted.py
@@ -1,20 +1,20 @@
-from __future__ import absolute_import
-
 from functools import wraps
 
+from apscheduler.schedulers import SchedulerNotRunningError
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.util import maybe_ref
 
 try:
     from twisted.internet import reactor as default_reactor
-except ImportError:  # pragma: nocover
-    raise ImportError('TwistedScheduler requires Twisted installed')
+except ImportError as exc:  # pragma: nocover
+    raise ImportError("TwistedScheduler requires Twisted installed") from exc
 
 
 def run_in_reactor(func):
     @wraps(func)
     def wrapper(self, *args, **kwargs):
         self._reactor.callFromThread(func, self, *args, **kwargs)
+
     return wrapper
 
 
@@ -33,14 +33,20 @@ class TwistedScheduler(BaseScheduler):
     _delayedcall = None
 
     def _configure(self, config):
-        self._reactor = maybe_ref(config.pop('reactor', default_reactor))
-        super(TwistedScheduler, self)._configure(config)
+        self._reactor = maybe_ref(config.pop("reactor", default_reactor))
+        super()._configure(config)
 
     @run_in_reactor
-    def shutdown(self, wait=True):
-        super(TwistedScheduler, self).shutdown(wait)
+    def _shutdown(self, wait=True):
+        super().shutdown(wait)
         self._stop_timer()
 
+    def shutdown(self, wait=True):
+        if not self.running:
+            raise SchedulerNotRunningError
+
+        self._shutdown(wait)
+
     def _start_timer(self, wait_seconds):
         self._stop_timer()
         if wait_seconds is not None:
@@ -59,4 +65,5 @@ def wakeup(self):
 
     def _create_default_executor(self):
         from apscheduler.executors.twisted import TwistedExecutor
+
         return TwistedExecutor()
diff --git a/libs/apscheduler/triggers/base.py b/libs/apscheduler/triggers/base.py
index 55d010dbad..917af8ca67 100644
--- a/libs/apscheduler/triggers/base.py
+++ b/libs/apscheduler/triggers/base.py
@@ -1,11 +1,9 @@
+import random
 from abc import ABCMeta, abstractmethod
 from datetime import timedelta
-import random
-
-import six
 
 
-class BaseTrigger(six.with_metaclass(ABCMeta)):
+class BaseTrigger(metaclass=ABCMeta):
     """Abstract base class that defines the interface that every trigger must implement."""
 
     __slots__ = ()
diff --git a/libs/apscheduler/triggers/calendarinterval.py b/libs/apscheduler/triggers/calendarinterval.py
new file mode 100644
index 0000000000..114e9ea284
--- /dev/null
+++ b/libs/apscheduler/triggers/calendarinterval.py
@@ -0,0 +1,186 @@
+from __future__ import annotations
+
+from datetime import date, datetime, time, timedelta, tzinfo
+from typing import Any
+
+from tzlocal import get_localzone
+
+from apscheduler.triggers.base import BaseTrigger
+from apscheduler.util import (
+    asdate,
+    astimezone,
+    timezone_repr,
+)
+
+
+class CalendarIntervalTrigger(BaseTrigger):
+    """
+    Runs the task on specified calendar-based intervals always at the same exact time of
+    day.
+
+    When calculating the next date, the ``years`` and ``months`` parameters are first
+    added to the previous date while keeping the day of the month constant. This is
+    repeated until the resulting date is valid. After that, the ``weeks`` and ``days``
+    parameters are added to that date. Finally, the date is combined with the given time
+    (hour, minute, second) to form the final datetime.
+
+    This means that if the ``days`` or ``weeks`` parameters are not used, the task will
+    always be executed on the same day of the month at the same wall clock time,
+    assuming the date and time are valid.
+
+    If the resulting datetime is invalid due to a daylight saving forward shift, the
+    date is discarded and the process moves on to the next date. If instead the datetime
+    is ambiguous due to a backward DST shift, the earlier of the two resulting datetimes
+    is used.
+
+    If no previous run time is specified when requesting a new run time (like when
+    starting for the first time or resuming after being paused), ``start_date`` is used
+    as a reference and the next valid datetime equal to or later than the current time
+    will be returned. Otherwise, the next valid datetime starting from the previous run
+    time is returned, even if it's in the past.
+
+    .. warning:: Be wary of setting a start date near the end of the month (29. โ€“ 31.)
+        if you have ``months`` specified in your interval, as this will skip the months
+        when those days do not exist. Likewise, setting the start date on the leap day
+        (February 29th) and having ``years`` defined may cause some years to be skipped.
+
+        Users are also discouraged from  using a time inside the target timezone's DST
+        switching period (typically around 2 am) since a date could either be skipped or
+        repeated due to the specified wall clock time either occurring twice or not at
+        all.
+
+    :param years: number of years to wait
+    :param months: number of months to wait
+    :param weeks: number of weeks to wait
+    :param days: number of days to wait
+    :param hour: hour to run the task at
+    :param minute: minute to run the task at
+    :param second: second to run the task at
+    :param start_date: first date to trigger on (defaults to current date if omitted)
+    :param end_date: latest possible date to trigger on
+    :param timezone: time zone to use for calculating the next fire time (defaults
+        to scheduler timezone if created via the scheduler, otherwise the local time
+        zone)
+    :param jitter: delay the job execution by ``jitter`` seconds at most
+    """
+
+    __slots__ = (
+        "_time",
+        "days",
+        "end_date",
+        "jitter",
+        "months",
+        "start_date",
+        "timezone",
+        "weeks",
+        "years",
+    )
+
+    def __init__(
+        self,
+        *,
+        years: int = 0,
+        months: int = 0,
+        weeks: int = 0,
+        days: int = 0,
+        hour: int = 0,
+        minute: int = 0,
+        second: int = 0,
+        start_date: date | str | None = None,
+        end_date: date | str | None = None,
+        timezone: str | tzinfo | None = None,
+        jitter: int | None = None,
+    ):
+        if timezone:
+            self.timezone = astimezone(timezone)
+        else:
+            self.timezone = astimezone(get_localzone())
+
+        self.years = years
+        self.months = months
+        self.weeks = weeks
+        self.days = days
+        self.start_date = asdate(start_date) or date.today()
+        self.end_date = asdate(end_date)
+        self.jitter = jitter
+        self._time = time(hour, minute, second, tzinfo=self.timezone)
+
+        if self.years == self.months == self.weeks == self.days == 0:
+            raise ValueError("interval must be at least 1 day long")
+
+        if self.end_date and self.start_date > self.end_date:
+            raise ValueError("end_date cannot be earlier than start_date")
+
+    def get_next_fire_time(
+        self, previous_fire_time: datetime | None, now: datetime
+    ) -> datetime | None:
+        while True:
+            if previous_fire_time:
+                year, month = previous_fire_time.year, previous_fire_time.month
+                while True:
+                    month += self.months
+                    year += self.years + (month - 1) // 12
+                    month = (month - 1) % 12 + 1
+                    try:
+                        next_date = date(year, month, previous_fire_time.day)
+                    except ValueError:
+                        pass  # Nonexistent date
+                    else:
+                        next_date += timedelta(self.days + self.weeks * 7)
+                        break
+            else:
+                next_date = self.start_date
+
+            # Don't return any date past end_date
+            if self.end_date and next_date > self.end_date:
+                return None
+
+            # Combine the date with the designated time and normalize the result
+            timestamp = datetime.combine(next_date, self._time).timestamp()
+            next_time = datetime.fromtimestamp(timestamp, self.timezone)
+
+            # Check if the time is off due to normalization and a forward DST shift
+            if next_time.timetz() != self._time:
+                previous_fire_time = next_time.date()
+            else:
+                return self._apply_jitter(next_time, self.jitter, now)
+
+    def __getstate__(self) -> dict[str, Any]:
+        return {
+            "version": 1,
+            "interval": [self.years, self.months, self.weeks, self.days],
+            "time": [self._time.hour, self._time.minute, self._time.second],
+            "start_date": self.start_date,
+            "end_date": self.end_date,
+            "timezone": self.timezone,
+            "jitter": self.jitter,
+        }
+
+    def __setstate__(self, state: dict[str, Any]) -> None:
+        if state.get("version", 1) > 1:
+            raise ValueError(
+                f"Got serialized data for version {state['version']} of "
+                f"{self.__class__.__name__}, but only versions up to 1 can be handled"
+            )
+
+        self.years, self.months, self.weeks, self.days = state["interval"]
+        self.start_date = state["start_date"]
+        self.end_date = state["end_date"]
+        self.timezone = state["timezone"]
+        self.jitter = state["jitter"]
+        self._time = time(*state["time"], tzinfo=self.timezone)
+
+    def __repr__(self) -> str:
+        fields = []
+        for field in "years", "months", "weeks", "days":
+            value = getattr(self, field)
+            if value > 0:
+                fields.append(f"{field}={value}")
+
+        fields.append(f"time={self._time.isoformat()!r}")
+        fields.append(f"start_date='{self.start_date}'")
+        if self.end_date:
+            fields.append(f"end_date='{self.end_date}'")
+
+        fields.append(f"timezone={timezone_repr(self.timezone)!r}")
+        return f"{self.__class__.__name__}({', '.join(fields)})"
diff --git a/libs/apscheduler/triggers/combining.py b/libs/apscheduler/triggers/combining.py
index bb90006185..7d526e9bdf 100644
--- a/libs/apscheduler/triggers/combining.py
+++ b/libs/apscheduler/triggers/combining.py
@@ -3,7 +3,7 @@
 
 
 class BaseCombiningTrigger(BaseTrigger):
-    __slots__ = ('triggers', 'jitter')
+    __slots__ = ("jitter", "triggers")
 
     def __init__(self, triggers, jitter=None):
         self.triggers = triggers
@@ -11,29 +11,35 @@ def __init__(self, triggers, jitter=None):
 
     def __getstate__(self):
         return {
-            'version': 1,
-            'triggers': [(obj_to_ref(trigger.__class__), trigger.__getstate__())
-                         for trigger in self.triggers],
-            'jitter': self.jitter
+            "version": 1,
+            "triggers": [
+                (obj_to_ref(trigger.__class__), trigger.__getstate__())
+                for trigger in self.triggers
+            ],
+            "jitter": self.jitter,
         }
 
     def __setstate__(self, state):
-        if state.get('version', 1) > 1:
+        if state.get("version", 1) > 1:
             raise ValueError(
-                'Got serialized data for version %s of %s, but only versions up to 1 can be '
-                'handled' % (state['version'], self.__class__.__name__))
+                f"Got serialized data for version {state['version']} of "
+                f"{self.__class__.__name__}, but only versions up to 1 can be handled"
+            )
 
-        self.jitter = state['jitter']
+        self.jitter = state["jitter"]
         self.triggers = []
-        for clsref, state in state['triggers']:
+        for clsref, state in state["triggers"]:
             cls = ref_to_obj(clsref)
             trigger = cls.__new__(cls)
             trigger.__setstate__(state)
             self.triggers.append(trigger)
 
     def __repr__(self):
-        return '<{}({}{})>'.format(self.__class__.__name__, self.triggers,
-                                   ', jitter={}'.format(self.jitter) if self.jitter else '')
+        return "<{}({}{})>".format(
+            self.__class__.__name__,
+            self.triggers,
+            f", jitter={self.jitter}" if self.jitter else "",
+        )
 
 
 class AndTrigger(BaseCombiningTrigger):
@@ -44,6 +50,15 @@ class AndTrigger(BaseCombiningTrigger):
 
     Trigger alias: ``and``
 
+    .. warning:: This trigger should only be used to combine triggers that fire on
+        specific times of day, such as
+        :class:`~apscheduler.triggers.cron.CronTrigger` and
+        class:`~apscheduler.triggers.calendarinterval.CalendarIntervalTrigger`.
+        Attempting to use it with
+        :class:`~apscheduler.triggers.interval.IntervalTrigger` will likely result in
+        the scheduler hanging as it tries to find a fire time that matches exactly
+        between fire times produced by all the given triggers.
+
     :param list triggers: triggers to combine
     :param int|None jitter: delay the job execution by ``jitter`` seconds at most
     """
@@ -52,8 +67,10 @@ class AndTrigger(BaseCombiningTrigger):
 
     def get_next_fire_time(self, previous_fire_time, now):
         while True:
-            fire_times = [trigger.get_next_fire_time(previous_fire_time, now)
-                          for trigger in self.triggers]
+            fire_times = [
+                trigger.get_next_fire_time(previous_fire_time, now)
+                for trigger in self.triggers
+            ]
             if None in fire_times:
                 return None
             elif min(fire_times) == max(fire_times):
@@ -62,7 +79,7 @@ def get_next_fire_time(self, previous_fire_time, now):
                 now = max(fire_times)
 
     def __str__(self):
-        return 'and[{}]'.format(', '.join(str(trigger) for trigger in self.triggers))
+        return "and[{}]".format(", ".join(str(trigger) for trigger in self.triggers))
 
 
 class OrTrigger(BaseCombiningTrigger):
@@ -83,8 +100,10 @@ class OrTrigger(BaseCombiningTrigger):
     __slots__ = ()
 
     def get_next_fire_time(self, previous_fire_time, now):
-        fire_times = [trigger.get_next_fire_time(previous_fire_time, now)
-                      for trigger in self.triggers]
+        fire_times = [
+            trigger.get_next_fire_time(previous_fire_time, now)
+            for trigger in self.triggers
+        ]
         fire_times = [fire_time for fire_time in fire_times if fire_time is not None]
         if fire_times:
             return self._apply_jitter(min(fire_times), self.jitter, now)
@@ -92,4 +111,4 @@ def get_next_fire_time(self, previous_fire_time, now):
             return None
 
     def __str__(self):
-        return 'or[{}]'.format(', '.join(str(trigger) for trigger in self.triggers))
+        return "or[{}]".format(", ".join(str(trigger) for trigger in self.triggers))
diff --git a/libs/apscheduler/triggers/cron/__init__.py b/libs/apscheduler/triggers/cron/__init__.py
index b5389dd22e..19219b8da0 100644
--- a/libs/apscheduler/triggers/cron/__init__.py
+++ b/libs/apscheduler/triggers/cron/__init__.py
@@ -1,13 +1,25 @@
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from tzlocal import get_localzone
-import six
 
 from apscheduler.triggers.base import BaseTrigger
 from apscheduler.triggers.cron.fields import (
-    BaseField, MonthField, WeekField, DayOfMonthField, DayOfWeekField, DEFAULT_VALUES)
+    DEFAULT_VALUES,
+    BaseField,
+    DayOfMonthField,
+    DayOfWeekField,
+    MonthField,
+    WeekField,
+)
 from apscheduler.util import (
-    datetime_ceil, convert_to_datetime, datetime_repr, astimezone, localize, normalize)
+    astimezone,
+    convert_to_datetime,
+    datetime_ceil,
+    datetime_repr,
+    datetime_utc_add,
+)
+
+UTC = timezone.utc
 
 
 class CronTrigger(BaseTrigger):
@@ -32,39 +44,63 @@ class CronTrigger(BaseTrigger):
     .. note:: The first weekday is always **monday**.
     """
 
-    FIELD_NAMES = ('year', 'month', 'day', 'week', 'day_of_week', 'hour', 'minute', 'second')
+    FIELD_NAMES = (
+        "year",
+        "month",
+        "day",
+        "week",
+        "day_of_week",
+        "hour",
+        "minute",
+        "second",
+    )
     FIELDS_MAP = {
-        'year': BaseField,
-        'month': MonthField,
-        'week': WeekField,
-        'day': DayOfMonthField,
-        'day_of_week': DayOfWeekField,
-        'hour': BaseField,
-        'minute': BaseField,
-        'second': BaseField
+        "year": BaseField,
+        "month": MonthField,
+        "week": WeekField,
+        "day": DayOfMonthField,
+        "day_of_week": DayOfWeekField,
+        "hour": BaseField,
+        "minute": BaseField,
+        "second": BaseField,
     }
 
-    __slots__ = 'timezone', 'start_date', 'end_date', 'fields', 'jitter'
-
-    def __init__(self, year=None, month=None, day=None, week=None, day_of_week=None, hour=None,
-                 minute=None, second=None, start_date=None, end_date=None, timezone=None,
-                 jitter=None):
+    __slots__ = "end_date", "fields", "jitter", "start_date", "timezone"
+
+    def __init__(
+        self,
+        year=None,
+        month=None,
+        day=None,
+        week=None,
+        day_of_week=None,
+        hour=None,
+        minute=None,
+        second=None,
+        start_date=None,
+        end_date=None,
+        timezone=None,
+        jitter=None,
+    ):
         if timezone:
             self.timezone = astimezone(timezone)
         elif isinstance(start_date, datetime) and start_date.tzinfo:
-            self.timezone = start_date.tzinfo
+            self.timezone = astimezone(start_date.tzinfo)
         elif isinstance(end_date, datetime) and end_date.tzinfo:
-            self.timezone = end_date.tzinfo
+            self.timezone = astimezone(end_date.tzinfo)
         else:
             self.timezone = get_localzone()
 
-        self.start_date = convert_to_datetime(start_date, self.timezone, 'start_date')
-        self.end_date = convert_to_datetime(end_date, self.timezone, 'end_date')
+        self.start_date = convert_to_datetime(start_date, self.timezone, "start_date")
+        self.end_date = convert_to_datetime(end_date, self.timezone, "end_date")
 
         self.jitter = jitter
 
-        values = dict((key, value) for (key, value) in six.iteritems(locals())
-                      if key in self.FIELD_NAMES and value is not None)
+        values = dict(
+            (key, value)
+            for (key, value) in locals().items()
+            if key in self.FIELD_NAMES and value is not None
+        )
         self.fields = []
         assign_defaults = False
         for field_name in self.FIELD_NAMES:
@@ -76,7 +112,7 @@ def __init__(self, year=None, month=None, day=None, week=None, day_of_week=None,
                 exprs = DEFAULT_VALUES[field_name]
                 is_default = True
             else:
-                exprs = '*'
+                exprs = "*"
                 is_default = True
 
             field_class = self.FIELDS_MAP[field_name]
@@ -98,10 +134,16 @@ def from_crontab(cls, expr, timezone=None):
         """
         values = expr.split()
         if len(values) != 5:
-            raise ValueError('Wrong number of fields; got {}, expected 5'.format(len(values)))
+            raise ValueError(f"Wrong number of fields; got {len(values)}, expected 5")
 
-        return cls(minute=values[0], hour=values[1], day=values[2], month=values[3],
-                   day_of_week=values[4], timezone=timezone)
+        return cls(
+            minute=values[0],
+            hour=values[1],
+            day=values[2],
+            month=values[3],
+            day_of_week=values[4],
+            timezone=timezone,
+        )
 
     def _increment_field_value(self, dateval, fieldnum):
         """
@@ -144,7 +186,8 @@ def _increment_field_value(self, dateval, fieldnum):
                     i += 1
 
         difference = datetime(**values) - dateval.replace(tzinfo=None)
-        return normalize(dateval + difference), fieldnum
+        dateval = datetime_utc_add(dateval, difference)
+        return dateval, fieldnum
 
     def _set_field_value(self, dateval, fieldnum, new_value):
         values = {}
@@ -157,15 +200,26 @@ def _set_field_value(self, dateval, fieldnum, new_value):
                 else:
                     values[field.name] = new_value
 
-        return localize(datetime(**values), self.timezone)
+        return datetime(**values, tzinfo=self.timezone, fold=dateval.fold)
 
     def get_next_fire_time(self, previous_fire_time, now):
         if previous_fire_time:
-            start_date = min(now, previous_fire_time + timedelta(microseconds=1))
+            start_date = min(
+                now.astimezone(UTC),
+                datetime_utc_add(
+                    previous_fire_time, timedelta(microseconds=1)
+                ).astimezone(UTC),
+            ).astimezone(self.timezone)
             if start_date == previous_fire_time:
-                start_date += timedelta(microseconds=1)
+                start_date = datetime_utc_add(start_date, timedelta(microseconds=1))
         else:
-            start_date = max(now, self.start_date) if self.start_date else now
+            start_date = (
+                max(now.astimezone(UTC), self.start_date.astimezone(UTC)).astimezone(
+                    self.timezone
+                )
+                if self.start_date
+                else now
+            )
 
         fieldnum = 0
         next_date = datetime_ceil(start_date).astimezone(self.timezone)
@@ -176,14 +230,18 @@ def get_next_fire_time(self, previous_fire_time, now):
 
             if next_value is None:
                 # No valid value was found
-                next_date, fieldnum = self._increment_field_value(next_date, fieldnum - 1)
+                next_date, fieldnum = self._increment_field_value(
+                    next_date, fieldnum - 1
+                )
             elif next_value > curr_value:
                 # A valid, but higher than the starting value, was found
                 if field.REAL:
                     next_date = self._set_field_value(next_date, fieldnum, next_value)
                     fieldnum += 1
                 else:
-                    next_date, fieldnum = self._increment_field_value(next_date, fieldnum)
+                    next_date, fieldnum = self._increment_field_value(
+                        next_date, fieldnum
+                    )
             else:
                 # A valid value was found, no changes necessary
                 fieldnum += 1
@@ -198,12 +256,12 @@ def get_next_fire_time(self, previous_fire_time, now):
 
     def __getstate__(self):
         return {
-            'version': 2,
-            'timezone': self.timezone,
-            'start_date': self.start_date,
-            'end_date': self.end_date,
-            'fields': self.fields,
-            'jitter': self.jitter,
+            "version": 2,
+            "timezone": self.timezone,
+            "start_date": self.start_date,
+            "end_date": self.end_date,
+            "fields": self.fields,
+            "jitter": self.jitter,
         }
 
     def __setstate__(self, state):
@@ -211,29 +269,33 @@ def __setstate__(self, state):
         if isinstance(state, tuple):
             state = state[1]
 
-        if state.get('version', 1) > 2:
+        if state.get("version", 1) > 2:
             raise ValueError(
-                'Got serialized data for version %s of %s, but only versions up to 2 can be '
-                'handled' % (state['version'], self.__class__.__name__))
+                f"Got serialized data for version {state['version']} of "
+                f"{self.__class__.__name__}, but only versions up to 2 can be handled"
+            )
 
-        self.timezone = state['timezone']
-        self.start_date = state['start_date']
-        self.end_date = state['end_date']
-        self.fields = state['fields']
-        self.jitter = state.get('jitter')
+        self.timezone = astimezone(state["timezone"])
+        self.start_date = state["start_date"]
+        self.end_date = state["end_date"]
+        self.fields = state["fields"]
+        self.jitter = state.get("jitter")
 
     def __str__(self):
-        options = ["%s='%s'" % (f.name, f) for f in self.fields if not f.is_default]
-        return 'cron[%s]' % (', '.join(options))
+        options = [f"{f.name}='{f}'" for f in self.fields if not f.is_default]
+        return "cron[{}]".format(", ".join(options))
 
     def __repr__(self):
-        options = ["%s='%s'" % (f.name, f) for f in self.fields if not f.is_default]
+        options = [f"{f.name}='{f}'" for f in self.fields if not f.is_default]
         if self.start_date:
-            options.append("start_date=%r" % datetime_repr(self.start_date))
+            options.append(f"start_date={datetime_repr(self.start_date)!r}")
         if self.end_date:
-            options.append("end_date=%r" % datetime_repr(self.end_date))
+            options.append(f"end_date={datetime_repr(self.end_date)!r}")
         if self.jitter:
-            options.append('jitter=%s' % self.jitter)
+            options.append(f"jitter={self.jitter}")
 
-        return "<%s (%s, timezone='%s')>" % (
-            self.__class__.__name__, ', '.join(options), self.timezone)
+        return "<{} ({}, timezone='{}')>".format(
+            self.__class__.__name__,
+            ", ".join(options),
+            self.timezone,
+        )
diff --git a/libs/apscheduler/triggers/cron/expressions.py b/libs/apscheduler/triggers/cron/expressions.py
index 55a3716704..74044da1f5 100644
--- a/libs/apscheduler/triggers/cron/expressions.py
+++ b/libs/apscheduler/triggers/cron/expressions.py
@@ -1,33 +1,52 @@
 """This module contains the expressions applicable for CronTrigger's fields."""
 
-from calendar import monthrange
+__all__ = (
+    "AllExpression",
+    "LastDayOfMonthExpression",
+    "RangeExpression",
+    "WeekdayPositionExpression",
+    "WeekdayRangeExpression",
+)
+
 import re
+from calendar import monthrange
 
 from apscheduler.util import asint
 
-__all__ = ('AllExpression', 'RangeExpression', 'WeekdayRangeExpression',
-           'WeekdayPositionExpression', 'LastDayOfMonthExpression')
-
-
-WEEKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
-MONTHS = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec']
-
-
-class AllExpression(object):
-    value_re = re.compile(r'\*(?:/(?P<step>\d+))?$')
+WEEKDAYS = ["mon", "tue", "wed", "thu", "fri", "sat", "sun"]
+MONTHS = [
+    "jan",
+    "feb",
+    "mar",
+    "apr",
+    "may",
+    "jun",
+    "jul",
+    "aug",
+    "sep",
+    "oct",
+    "nov",
+    "dec",
+]
+
+
+class AllExpression:
+    value_re = re.compile(r"\*(?:/(?P<step>\d+))?$")
 
     def __init__(self, step=None):
         self.step = asint(step)
         if self.step == 0:
-            raise ValueError('Increment must be higher than 0')
+            raise ValueError("Increment must be higher than 0")
 
     def validate_range(self, field_name):
-        from apscheduler.triggers.cron.fields import MIN_VALUES, MAX_VALUES
+        from apscheduler.triggers.cron.fields import MAX_VALUES, MIN_VALUES
 
         value_range = MAX_VALUES[field_name] - MIN_VALUES[field_name]
         if self.step and self.step > value_range:
-            raise ValueError('the step value ({}) is higher than the total range of the '
-                             'expression ({})'.format(self.step, value_range))
+            raise ValueError(
+                f"the step value ({self.step}) is higher than the total range of the "
+                f"expression ({value_range})"
+            )
 
     def get_next_value(self, date, field):
         start = field.get_value(date)
@@ -49,42 +68,47 @@ def __eq__(self, other):
 
     def __str__(self):
         if self.step:
-            return '*/%d' % self.step
-        return '*'
+            return f"*/{self.step}"
+        return "*"
 
     def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, self.step)
+        return f"{self.__class__.__name__}({self.step})"
 
 
 class RangeExpression(AllExpression):
-    value_re = re.compile(
-        r'(?P<first>\d+)(?:-(?P<last>\d+))?(?:/(?P<step>\d+))?$')
+    value_re = re.compile(r"(?P<first>\d+)(?:-(?P<last>\d+))?(?:/(?P<step>\d+))?$")
 
     def __init__(self, first, last=None, step=None):
-        super(RangeExpression, self).__init__(step)
+        super().__init__(step)
         first = asint(first)
         last = asint(last)
         if last is None and step is None:
             last = first
         if last is not None and first > last:
-            raise ValueError('The minimum value in a range must not be higher than the maximum')
+            raise ValueError(
+                "The minimum value in a range must not be higher than the maximum"
+            )
         self.first = first
         self.last = last
 
     def validate_range(self, field_name):
-        from apscheduler.triggers.cron.fields import MIN_VALUES, MAX_VALUES
+        from apscheduler.triggers.cron.fields import MAX_VALUES, MIN_VALUES
 
-        super(RangeExpression, self).validate_range(field_name)
+        super().validate_range(field_name)
         if self.first < MIN_VALUES[field_name]:
-            raise ValueError('the first value ({}) is lower than the minimum value ({})'
-                             .format(self.first, MIN_VALUES[field_name]))
+            raise ValueError(
+                f"the first value ({self.first}) is lower than the minimum value ({MIN_VALUES[field_name]})"
+            )
         if self.last is not None and self.last > MAX_VALUES[field_name]:
-            raise ValueError('the last value ({}) is higher than the maximum value ({})'
-                             .format(self.last, MAX_VALUES[field_name]))
+            raise ValueError(
+                f"the last value ({self.last}) is higher than the maximum value ({MAX_VALUES[field_name]})"
+            )
         value_range = (self.last or MAX_VALUES[field_name]) - self.first
         if self.step and self.step > value_range:
-            raise ValueError('the step value ({}) is higher than the total range of the '
-                             'expression ({})'.format(self.step, value_range))
+            raise ValueError(
+                f"the step value ({self.step}) is higher than the total range of the "
+                f"expression ({value_range})"
+            )
 
     def get_next_value(self, date, field):
         startval = field.get_value(date)
@@ -104,106 +128,114 @@ def get_next_value(self, date, field):
         return nextval if nextval <= maxval else None
 
     def __eq__(self, other):
-        return (isinstance(other, self.__class__) and self.first == other.first and
-                self.last == other.last)
+        return (
+            isinstance(other, self.__class__)
+            and self.first == other.first
+            and self.last == other.last
+        )
 
     def __str__(self):
         if self.last != self.first and self.last is not None:
-            range = '%d-%d' % (self.first, self.last)
+            range = f"{self.first}-{self.last}"
         else:
             range = str(self.first)
 
         if self.step:
-            return '%s/%d' % (range, self.step)
+            return f"{range}/{self.step}"
+
         return range
 
     def __repr__(self):
         args = [str(self.first)]
-        if self.last != self.first and self.last is not None or self.step:
+        if (self.last != self.first and self.last is not None) or self.step:
             args.append(str(self.last))
+
         if self.step:
             args.append(str(self.step))
-        return "%s(%s)" % (self.__class__.__name__, ', '.join(args))
+
+        return "{}({})".format(self.__class__.__name__, ", ".join(args))
 
 
 class MonthRangeExpression(RangeExpression):
-    value_re = re.compile(r'(?P<first>[a-z]+)(?:-(?P<last>[a-z]+))?', re.IGNORECASE)
+    value_re = re.compile(r"(?P<first>[a-z]+)(?:-(?P<last>[a-z]+))?", re.IGNORECASE)
 
     def __init__(self, first, last=None):
         try:
             first_num = MONTHS.index(first.lower()) + 1
         except ValueError:
-            raise ValueError('Invalid month name "%s"' % first)
+            raise ValueError(f'Invalid month name "{first}"')
 
         if last:
             try:
                 last_num = MONTHS.index(last.lower()) + 1
             except ValueError:
-                raise ValueError('Invalid month name "%s"' % last)
+                raise ValueError(f'Invalid month name "{last}"')
         else:
             last_num = None
 
-        super(MonthRangeExpression, self).__init__(first_num, last_num)
+        super().__init__(first_num, last_num)
 
     def __str__(self):
         if self.last != self.first and self.last is not None:
-            return '%s-%s' % (MONTHS[self.first - 1], MONTHS[self.last - 1])
+            return f"{MONTHS[self.first - 1]}-{MONTHS[self.last - 1]}"
         return MONTHS[self.first - 1]
 
     def __repr__(self):
-        args = ["'%s'" % MONTHS[self.first]]
+        args = [f"'{MONTHS[self.first]}'"]
         if self.last != self.first and self.last is not None:
-            args.append("'%s'" % MONTHS[self.last - 1])
-        return "%s(%s)" % (self.__class__.__name__, ', '.join(args))
+            args.append(f"'{MONTHS[self.last - 1]}'")
+        return "{}({})".format(self.__class__.__name__, ", ".join(args))
 
 
 class WeekdayRangeExpression(RangeExpression):
-    value_re = re.compile(r'(?P<first>[a-z]+)(?:-(?P<last>[a-z]+))?', re.IGNORECASE)
+    value_re = re.compile(r"(?P<first>[a-z]+)(?:-(?P<last>[a-z]+))?", re.IGNORECASE)
 
     def __init__(self, first, last=None):
         try:
             first_num = WEEKDAYS.index(first.lower())
         except ValueError:
-            raise ValueError('Invalid weekday name "%s"' % first)
+            raise ValueError(f'Invalid weekday name "{first}"')
 
         if last:
             try:
                 last_num = WEEKDAYS.index(last.lower())
             except ValueError:
-                raise ValueError('Invalid weekday name "%s"' % last)
+                raise ValueError(f'Invalid weekday name "{last}"')
         else:
             last_num = None
 
-        super(WeekdayRangeExpression, self).__init__(first_num, last_num)
+        super().__init__(first_num, last_num)
 
     def __str__(self):
         if self.last != self.first and self.last is not None:
-            return '%s-%s' % (WEEKDAYS[self.first], WEEKDAYS[self.last])
+            return f"{WEEKDAYS[self.first]}-{WEEKDAYS[self.last]}"
         return WEEKDAYS[self.first]
 
     def __repr__(self):
-        args = ["'%s'" % WEEKDAYS[self.first]]
+        args = [f"'{WEEKDAYS[self.first]}'"]
         if self.last != self.first and self.last is not None:
-            args.append("'%s'" % WEEKDAYS[self.last])
-        return "%s(%s)" % (self.__class__.__name__, ', '.join(args))
+            args.append(f"'{WEEKDAYS[self.last]}'")
+        return "{}({})".format(self.__class__.__name__, ", ".join(args))
 
 
 class WeekdayPositionExpression(AllExpression):
-    options = ['1st', '2nd', '3rd', '4th', '5th', 'last']
-    value_re = re.compile(r'(?P<option_name>%s) +(?P<weekday_name>(?:\d+|\w+))' %
-                          '|'.join(options), re.IGNORECASE)
+    options = ["1st", "2nd", "3rd", "4th", "5th", "last"]
+    value_re = re.compile(
+        r"(?P<option_name>{}) +(?P<weekday_name>(?:\d+|\w+))".format("|".join(options)),
+        re.IGNORECASE,
+    )
 
     def __init__(self, option_name, weekday_name):
-        super(WeekdayPositionExpression, self).__init__(None)
+        super().__init__(None)
         try:
             self.option_num = self.options.index(option_name.lower())
         except ValueError:
-            raise ValueError('Invalid weekday position "%s"' % option_name)
+            raise ValueError(f'Invalid weekday position "{option_name}"')
 
         try:
             self.weekday = WEEKDAYS.index(weekday_name.lower())
         except ValueError:
-            raise ValueError('Invalid weekday name "%s"' % weekday_name)
+            raise ValueError(f'Invalid weekday name "{weekday_name}"')
 
     def get_next_value(self, date, field):
         # Figure out the weekday of the month's first day and the number of days in that month
@@ -224,28 +256,30 @@ def get_next_value(self, date, field):
             return target_day
 
     def __eq__(self, other):
-        return (super(WeekdayPositionExpression, self).__eq__(other) and
-                self.option_num == other.option_num and self.weekday == other.weekday)
+        return (
+            super().__eq__(other)
+            and self.option_num == other.option_num
+            and self.weekday == other.weekday
+        )
 
     def __str__(self):
-        return '%s %s' % (self.options[self.option_num], WEEKDAYS[self.weekday])
+        return f"{self.options[self.option_num]} {WEEKDAYS[self.weekday]}"
 
     def __repr__(self):
-        return "%s('%s', '%s')" % (self.__class__.__name__, self.options[self.option_num],
-                                   WEEKDAYS[self.weekday])
+        return f"{self.__class__.__name__}('{self.options[self.option_num]}', '{WEEKDAYS[self.weekday]}')"
 
 
 class LastDayOfMonthExpression(AllExpression):
-    value_re = re.compile(r'last', re.IGNORECASE)
+    value_re = re.compile(r"last", re.IGNORECASE)
 
     def __init__(self):
-        super(LastDayOfMonthExpression, self).__init__(None)
+        super().__init__(None)
 
     def get_next_value(self, date, field):
         return monthrange(date.year, date.month)[1]
 
     def __str__(self):
-        return 'last'
+        return "last"
 
     def __repr__(self):
-        return "%s()" % self.__class__.__name__
+        return f"{self.__class__.__name__}()"
diff --git a/libs/apscheduler/triggers/cron/fields.py b/libs/apscheduler/triggers/cron/fields.py
index 86d620c433..2133fdb767 100644
--- a/libs/apscheduler/triggers/cron/fields.py
+++ b/libs/apscheduler/triggers/cron/fields.py
@@ -1,29 +1,61 @@
 """Fields represent CronTrigger options which map to :class:`~datetime.datetime` fields."""
 
-from calendar import monthrange
-import re
+__all__ = (
+    "DEFAULT_VALUES",
+    "MAX_VALUES",
+    "MIN_VALUES",
+    "BaseField",
+    "DayOfMonthField",
+    "DayOfWeekField",
+    "WeekField",
+)
 
-import six
+import re
+from calendar import monthrange
 
 from apscheduler.triggers.cron.expressions import (
-    AllExpression, RangeExpression, WeekdayPositionExpression, LastDayOfMonthExpression,
-    WeekdayRangeExpression, MonthRangeExpression)
-
-
-__all__ = ('MIN_VALUES', 'MAX_VALUES', 'DEFAULT_VALUES', 'BaseField', 'WeekField',
-           'DayOfMonthField', 'DayOfWeekField')
-
-
-MIN_VALUES = {'year': 1970, 'month': 1, 'day': 1, 'week': 1, 'day_of_week': 0, 'hour': 0,
-              'minute': 0, 'second': 0}
-MAX_VALUES = {'year': 9999, 'month': 12, 'day': 31, 'week': 53, 'day_of_week': 6, 'hour': 23,
-              'minute': 59, 'second': 59}
-DEFAULT_VALUES = {'year': '*', 'month': 1, 'day': 1, 'week': '*', 'day_of_week': '*', 'hour': 0,
-                  'minute': 0, 'second': 0}
-SEPARATOR = re.compile(' *, *')
-
-
-class BaseField(object):
+    AllExpression,
+    LastDayOfMonthExpression,
+    MonthRangeExpression,
+    RangeExpression,
+    WeekdayPositionExpression,
+    WeekdayRangeExpression,
+)
+
+MIN_VALUES = {
+    "year": 1970,
+    "month": 1,
+    "day": 1,
+    "week": 1,
+    "day_of_week": 0,
+    "hour": 0,
+    "minute": 0,
+    "second": 0,
+}
+MAX_VALUES = {
+    "year": 9999,
+    "month": 12,
+    "day": 31,
+    "week": 53,
+    "day_of_week": 6,
+    "hour": 23,
+    "minute": 59,
+    "second": 59,
+}
+DEFAULT_VALUES = {
+    "year": "*",
+    "month": 1,
+    "day": 1,
+    "week": "*",
+    "day_of_week": "*",
+    "hour": 0,
+    "minute": 0,
+    "second": 0,
+}
+SEPARATOR = re.compile(" *, *")
+
+
+class BaseField:
     REAL = True
     COMPILERS = [AllExpression, RangeExpression]
 
@@ -66,23 +98,26 @@ def compile_expression(self, expr):
                 try:
                     compiled_expr.validate_range(self.name)
                 except ValueError as e:
-                    exc = ValueError('Error validating expression {!r}: {}'.format(expr, e))
-                    six.raise_from(exc, None)
+                    raise ValueError(
+                        f"Error validating expression {expr!r}: {e}"
+                    ) from None
 
                 self.expressions.append(compiled_expr)
                 return
 
-        raise ValueError('Unrecognized expression "%s" for field "%s"' % (expr, self.name))
+        raise ValueError(f'Unrecognized expression "{expr}" for field "{self.name}"')
 
     def __eq__(self, other):
-        return isinstance(self, self.__class__) and self.expressions == other.expressions
+        return (
+            isinstance(self, self.__class__) and self.expressions == other.expressions
+        )
 
     def __str__(self):
         expr_strings = (str(e) for e in self.expressions)
-        return ','.join(expr_strings)
+        return ",".join(expr_strings)
 
     def __repr__(self):
-        return "%s('%s', '%s')" % (self.__class__.__name__, self.name, self)
+        return f"{self.__class__.__name__}('{self.name}', '{self}')"
 
 
 class WeekField(BaseField):
@@ -93,7 +128,10 @@ def get_value(self, dateval):
 
 
 class DayOfMonthField(BaseField):
-    COMPILERS = BaseField.COMPILERS + [WeekdayPositionExpression, LastDayOfMonthExpression]
+    COMPILERS = BaseField.COMPILERS + [
+        WeekdayPositionExpression,
+        LastDayOfMonthExpression,
+    ]
 
     def get_max(self, dateval):
         return monthrange(dateval.year, dateval.month)[1]
diff --git a/libs/apscheduler/triggers/date.py b/libs/apscheduler/triggers/date.py
index 0768100859..a9302da5db 100644
--- a/libs/apscheduler/triggers/date.py
+++ b/libs/apscheduler/triggers/date.py
@@ -3,7 +3,7 @@
 from tzlocal import get_localzone
 
 from apscheduler.triggers.base import BaseTrigger
-from apscheduler.util import convert_to_datetime, datetime_repr, astimezone
+from apscheduler.util import astimezone, convert_to_datetime, datetime_repr
 
 
 class DateTrigger(BaseTrigger):
@@ -14,12 +14,12 @@ class DateTrigger(BaseTrigger):
     :param datetime.tzinfo|str timezone: time zone for ``run_date`` if it doesn't have one already
     """
 
-    __slots__ = 'run_date'
+    __slots__ = "run_date"
 
     def __init__(self, run_date=None, timezone=None):
         timezone = astimezone(timezone) or get_localzone()
         if run_date is not None:
-            self.run_date = convert_to_datetime(run_date, timezone, 'run_date')
+            self.run_date = convert_to_datetime(run_date, timezone, "run_date")
         else:
             self.run_date = datetime.now(timezone)
 
@@ -27,25 +27,25 @@ def get_next_fire_time(self, previous_fire_time, now):
         return self.run_date if previous_fire_time is None else None
 
     def __getstate__(self):
-        return {
-            'version': 1,
-            'run_date': self.run_date
-        }
+        return {"version": 1, "run_date": self.run_date}
 
     def __setstate__(self, state):
         # This is for compatibility with APScheduler 3.0.x
         if isinstance(state, tuple):
             state = state[1]
 
-        if state.get('version', 1) > 1:
+        if state.get("version", 1) > 1:
             raise ValueError(
-                'Got serialized data for version %s of %s, but only version 1 can be handled' %
-                (state['version'], self.__class__.__name__))
+                f"Got serialized data for version {state['version']} of "
+                f"{self.__class__.__name__}, but only version 1 can be handled"
+            )
 
-        self.run_date = state['run_date']
+        self.run_date = state["run_date"]
 
     def __str__(self):
-        return 'date[%s]' % datetime_repr(self.run_date)
+        return f"date[{datetime_repr(self.run_date)}]"
 
     def __repr__(self):
-        return "<%s (run_date='%s')>" % (self.__class__.__name__, datetime_repr(self.run_date))
+        return (
+            f"<{self.__class__.__name__} (run_date='{datetime_repr(self.run_date)}')>"
+        )
diff --git a/libs/apscheduler/triggers/interval.py b/libs/apscheduler/triggers/interval.py
index b0e2dbddb4..0e4b24acf1 100644
--- a/libs/apscheduler/triggers/interval.py
+++ b/libs/apscheduler/triggers/interval.py
@@ -1,12 +1,15 @@
-from datetime import timedelta, datetime
+import random
+from datetime import datetime, timedelta
 from math import ceil
 
 from tzlocal import get_localzone
 
 from apscheduler.triggers.base import BaseTrigger
 from apscheduler.util import (
-    convert_to_datetime, normalize, timedelta_seconds, datetime_repr,
-    astimezone)
+    astimezone,
+    convert_to_datetime,
+    datetime_repr,
+)
 
 
 class IntervalTrigger(BaseTrigger):
@@ -25,13 +28,31 @@ class IntervalTrigger(BaseTrigger):
     :param int|None jitter: delay the job execution by ``jitter`` seconds at most
     """
 
-    __slots__ = 'timezone', 'start_date', 'end_date', 'interval', 'interval_length', 'jitter'
-
-    def __init__(self, weeks=0, days=0, hours=0, minutes=0, seconds=0, start_date=None,
-                 end_date=None, timezone=None, jitter=None):
-        self.interval = timedelta(weeks=weeks, days=days, hours=hours, minutes=minutes,
-                                  seconds=seconds)
-        self.interval_length = timedelta_seconds(self.interval)
+    __slots__ = (
+        "end_date",
+        "interval",
+        "interval_length",
+        "jitter",
+        "start_date",
+        "timezone",
+    )
+
+    def __init__(
+        self,
+        weeks=0,
+        days=0,
+        hours=0,
+        minutes=0,
+        seconds=0,
+        start_date=None,
+        end_date=None,
+        timezone=None,
+        jitter=None,
+    ):
+        self.interval = timedelta(
+            weeks=weeks, days=days, hours=hours, minutes=minutes, seconds=seconds
+        )
+        self.interval_length = self.interval.total_seconds()
         if self.interval_length == 0:
             self.interval = timedelta(seconds=1)
             self.interval_length = 1
@@ -39,42 +60,44 @@ def __init__(self, weeks=0, days=0, hours=0, minutes=0, seconds=0, start_date=No
         if timezone:
             self.timezone = astimezone(timezone)
         elif isinstance(start_date, datetime) and start_date.tzinfo:
-            self.timezone = start_date.tzinfo
+            self.timezone = astimezone(start_date.tzinfo)
         elif isinstance(end_date, datetime) and end_date.tzinfo:
-            self.timezone = end_date.tzinfo
+            self.timezone = astimezone(end_date.tzinfo)
         else:
             self.timezone = get_localzone()
 
         start_date = start_date or (datetime.now(self.timezone) + self.interval)
-        self.start_date = convert_to_datetime(start_date, self.timezone, 'start_date')
-        self.end_date = convert_to_datetime(end_date, self.timezone, 'end_date')
+        self.start_date = convert_to_datetime(start_date, self.timezone, "start_date")
+        self.end_date = convert_to_datetime(end_date, self.timezone, "end_date")
 
         self.jitter = jitter
 
     def get_next_fire_time(self, previous_fire_time, now):
         if previous_fire_time:
-            next_fire_time = previous_fire_time + self.interval
+            next_fire_time = previous_fire_time.timestamp() + self.interval_length
         elif self.start_date > now:
-            next_fire_time = self.start_date
+            next_fire_time = self.start_date.timestamp()
         else:
-            timediff_seconds = timedelta_seconds(now - self.start_date)
-            next_interval_num = int(ceil(timediff_seconds / self.interval_length))
-            next_fire_time = self.start_date + self.interval * next_interval_num
+            timediff = now.timestamp() - self.start_date.timestamp()
+            next_interval_num = ceil(timediff / self.interval_length)
+            next_fire_time = (
+                self.start_date.timestamp() + self.interval_length * next_interval_num
+            )
 
         if self.jitter is not None:
-            next_fire_time = self._apply_jitter(next_fire_time, self.jitter, now)
+            next_fire_time += random.uniform(0, self.jitter)
 
-        if not self.end_date or next_fire_time <= self.end_date:
-            return normalize(next_fire_time)
+        if not self.end_date or next_fire_time <= self.end_date.timestamp():
+            return datetime.fromtimestamp(next_fire_time, tz=self.timezone)
 
     def __getstate__(self):
         return {
-            'version': 2,
-            'timezone': self.timezone,
-            'start_date': self.start_date,
-            'end_date': self.end_date,
-            'interval': self.interval,
-            'jitter': self.jitter,
+            "version": 2,
+            "timezone": astimezone(self.timezone),
+            "start_date": self.start_date,
+            "end_date": self.end_date,
+            "interval": self.interval,
+            "jitter": self.jitter,
         }
 
     def __setstate__(self, state):
@@ -82,27 +105,34 @@ def __setstate__(self, state):
         if isinstance(state, tuple):
             state = state[1]
 
-        if state.get('version', 1) > 2:
+        if state.get("version", 1) > 2:
             raise ValueError(
-                'Got serialized data for version %s of %s, but only versions up to 2 can be '
-                'handled' % (state['version'], self.__class__.__name__))
+                f"Got serialized data for version {state['version']} of "
+                f"{self.__class__.__name__}, but only versions up to 2 can be handled"
+            )
 
-        self.timezone = state['timezone']
-        self.start_date = state['start_date']
-        self.end_date = state['end_date']
-        self.interval = state['interval']
-        self.interval_length = timedelta_seconds(self.interval)
-        self.jitter = state.get('jitter')
+        self.timezone = state["timezone"]
+        self.start_date = state["start_date"]
+        self.end_date = state["end_date"]
+        self.interval = state["interval"]
+        self.interval_length = self.interval.total_seconds()
+        self.jitter = state.get("jitter")
 
     def __str__(self):
-        return 'interval[%s]' % str(self.interval)
+        return f"interval[{self.interval!s}]"
 
     def __repr__(self):
-        options = ['interval=%r' % self.interval, 'start_date=%r' % datetime_repr(self.start_date)]
+        options = [
+            f"interval={self.interval!r}",
+            f"start_date={datetime_repr(self.start_date)!r}",
+        ]
         if self.end_date:
-            options.append("end_date=%r" % datetime_repr(self.end_date))
+            options.append(f"end_date={datetime_repr(self.end_date)!r}")
         if self.jitter:
-            options.append('jitter=%s' % self.jitter)
+            options.append(f"jitter={self.jitter}")
 
-        return "<%s (%s, timezone='%s')>" % (
-            self.__class__.__name__, ', '.join(options), self.timezone)
+        return "<{} ({}, timezone='{}')>".format(
+            self.__class__.__name__,
+            ", ".join(options),
+            self.timezone,
+        )
diff --git a/libs/apscheduler/util.py b/libs/apscheduler/util.py
index 003b30f5a3..caf56b87fc 100644
--- a/libs/apscheduler/util.py
+++ b/libs/apscheduler/util.py
@@ -1,35 +1,44 @@
 """This module contains several handy functions primarily meant for internal use."""
 
-from __future__ import division
+__all__ = (
+    "asbool",
+    "asint",
+    "astimezone",
+    "check_callable_args",
+    "convert_to_datetime",
+    "datetime_ceil",
+    "datetime_to_utc_timestamp",
+    "get_callable_name",
+    "localize",
+    "maybe_ref",
+    "normalize",
+    "obj_to_ref",
+    "ref_to_obj",
+    "undefined",
+    "utc_timestamp_to_datetime",
+)
 
-from asyncio import iscoroutinefunction
-from datetime import date, datetime, time, timedelta, tzinfo
-from calendar import timegm
-from functools import partial
-from inspect import isbuiltin, isclass, isfunction, ismethod
 import re
 import sys
+from calendar import timegm
+from datetime import date, datetime, time, timedelta, timezone, tzinfo
+from functools import partial
+from inspect import isbuiltin, isclass, isfunction, ismethod, signature
 
-from pytz import timezone, utc, FixedOffset
-import six
-
-try:
-    from inspect import signature
-except ImportError:  # pragma: nocover
-    from funcsigs import signature
+if sys.version_info < (3, 14):
+    from asyncio import iscoroutinefunction
+else:
+    from inspect import iscoroutinefunction
 
-try:
-    from threading import TIMEOUT_MAX
-except ImportError:
-    TIMEOUT_MAX = 4294967  # Maximum value accepted by Event.wait() on Windows
+if sys.version_info < (3, 9):
+    from backports.zoneinfo import ZoneInfo
+else:
+    from zoneinfo import ZoneInfo
 
-__all__ = ('asint', 'asbool', 'astimezone', 'convert_to_datetime', 'datetime_to_utc_timestamp',
-           'utc_timestamp_to_datetime', 'timedelta_seconds', 'datetime_ceil', 'get_callable_name',
-           'obj_to_ref', 'ref_to_obj', 'maybe_ref', 'repr_escape', 'check_callable_args',
-           'normalize', 'localize', 'TIMEOUT_MAX')
+UTC = timezone.utc
 
 
-class _Undefined(object):
+class _Undefined:
     def __nonzero__(self):
         return False
 
@@ -37,10 +46,12 @@ def __bool__(self):
         return False
 
     def __repr__(self):
-        return '<undefined>'
+        return "<undefined>"
 
 
-undefined = _Undefined()  #: a unique object that only signifies that no value is defined
+undefined = (
+    _Undefined()
+)  #: a unique object that only signifies that no value is defined
 
 
 def asint(text):
@@ -64,11 +75,14 @@ def asbool(obj):
     """
     if isinstance(obj, str):
         obj = obj.strip().lower()
-        if obj in ('true', 'yes', 'on', 'y', 't', '1'):
+        if obj in ("true", "yes", "on", "y", "t", "1"):
             return True
-        if obj in ('false', 'no', 'off', 'n', 'f', '0'):
+
+        if obj in ("false", "no", "off", "n", "f", "0"):
             return False
-        raise ValueError('Unable to interpret value "%s" as boolean' % obj)
+
+        raise ValueError(f'Unable to interpret value "{obj}" as boolean')
+
     return bool(obj)
 
 
@@ -79,25 +93,49 @@ def astimezone(obj):
     :rtype: tzinfo
 
     """
-    if isinstance(obj, six.string_types):
-        return timezone(obj)
+    if isinstance(obj, str):
+        if obj == "UTC":
+            return timezone.utc
+
+        return ZoneInfo(obj)
+
     if isinstance(obj, tzinfo):
-        if obj.tzname(None) == 'local':
+        if obj.tzname(None) == "local":
             raise ValueError(
-                'Unable to determine the name of the local timezone -- you must explicitly '
-                'specify the name of the local timezone. Please refrain from using timezones like '
-                'EST to prevent problems with daylight saving time. Instead, use a locale based '
-                'timezone name (such as Europe/Helsinki).')
+                "Unable to determine the name of the local timezone -- you must "
+                "explicitly specify the name of the local timezone. Please refrain "
+                "from using timezones like EST to prevent problems with daylight "
+                "saving time. Instead, use a locale based timezone name (such as "
+                "Europe/Helsinki)."
+            )
+        elif isinstance(obj, ZoneInfo):
+            return obj
+        elif hasattr(obj, "zone"):
+            # pytz timezones
+            if obj.zone:
+                return ZoneInfo(obj.zone)
+
+            return timezone(obj._offset)
+
         return obj
+
     if obj is not None:
-        raise TypeError('Expected tzinfo, got %s instead' % obj.__class__.__name__)
+        raise TypeError(f"Expected tzinfo, got {obj.__class__.__name__} instead")
+
+
+def asdate(obj):
+    if isinstance(obj, str):
+        return date.fromisoformat(obj)
+
+    return obj
 
 
 _DATE_REGEX = re.compile(
-    r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
-    r'(?:[ T](?P<hour>\d{1,2}):(?P<minute>\d{1,2}):(?P<second>\d{1,2})'
-    r'(?:\.(?P<microsecond>\d{1,6}))?'
-    r'(?P<timezone>Z|[+-]\d\d:\d\d)?)?$')
+    r"(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})"
+    r"(?:[ T](?P<hour>\d{1,2}):(?P<minute>\d{1,2}):(?P<second>\d{1,2})"
+    r"(?:\.(?P<microsecond>\d{1,6}))?"
+    r"(?P<timezone>Z|[+-]\d\d:\d\d)?)?$"
+)
 
 
 def convert_to_datetime(input, tz, arg_name):
@@ -108,12 +146,13 @@ def convert_to_datetime(input, tz, arg_name):
     If a native datetime object is passed, it is given the specified timezone.
     If the input is a string, it is parsed as a datetime with the given timezone.
 
-    Date strings are accepted in three different forms: date only (Y-m-d), date with time
-    (Y-m-d H:M:S) or with date+time with microseconds (Y-m-d H:M:S.micro). Additionally you can
-    override the time zone by giving a specific offset in the format specified by ISO 8601:
-    Z (UTC), +HH:MM or -HH:MM.
+    Date strings are accepted in three different forms: date only (Y-m-d), date with
+    time (Y-m-d H:M:S) or with date+time with microseconds (Y-m-d H:M:S.micro).
+    Additionally you can override the time zone by giving a specific offset in the
+    format specified by ISO 8601: Z (UTC), +HH:MM or -HH:MM.
 
-    :param str|datetime input: the datetime or string to convert to a timezone aware datetime
+    :param str|datetime input: the datetime or string to convert to a timezone aware
+        datetime
     :param datetime.tzinfo tz: timezone to interpret ``input`` in
     :param str arg_name: the name of the argument (used in an error message)
     :rtype: datetime
@@ -125,32 +164,33 @@ def convert_to_datetime(input, tz, arg_name):
         datetime_ = input
     elif isinstance(input, date):
         datetime_ = datetime.combine(input, time())
-    elif isinstance(input, six.string_types):
+    elif isinstance(input, str):
         m = _DATE_REGEX.match(input)
         if not m:
-            raise ValueError('Invalid date string')
+            raise ValueError("Invalid date string")
 
         values = m.groupdict()
-        tzname = values.pop('timezone')
-        if tzname == 'Z':
-            tz = utc
+        tzname = values.pop("timezone")
+        if tzname == "Z":
+            tz = timezone.utc
         elif tzname:
-            hours, minutes = (int(x) for x in tzname[1:].split(':'))
-            sign = 1 if tzname[0] == '+' else -1
-            tz = FixedOffset(sign * (hours * 60 + minutes))
+            hours, minutes = (int(x) for x in tzname[1:].split(":"))
+            sign = 1 if tzname[0] == "+" else -1
+            tz = timezone(sign * timedelta(hours=hours, minutes=minutes))
 
         values = {k: int(v or 0) for k, v in values.items()}
         datetime_ = datetime(**values)
     else:
-        raise TypeError('Unsupported type for %s: %s' % (arg_name, input.__class__.__name__))
+        raise TypeError(f"Unsupported type for {arg_name}: {input.__class__.__name__}")
 
     if datetime_.tzinfo is not None:
         return datetime_
     if tz is None:
         raise ValueError(
-            'The "tz" argument must be specified if %s has no timezone information' % arg_name)
-    if isinstance(tz, six.string_types):
-        tz = timezone(tz)
+            f'The "tz" argument must be specified if {arg_name} has no timezone information'
+        )
+    if isinstance(tz, str):
+        tz = astimezone(tz)
 
     return localize(datetime_, tz)
 
@@ -176,7 +216,7 @@ def utc_timestamp_to_datetime(timestamp):
 
     """
     if timestamp is not None:
-        return datetime.fromtimestamp(timestamp, utc)
+        return datetime.fromtimestamp(timestamp, timezone.utc)
 
 
 def timedelta_seconds(delta):
@@ -187,8 +227,7 @@ def timedelta_seconds(delta):
     :rtype: float
 
     """
-    return delta.days * 24 * 60 * 60 + delta.seconds + \
-        delta.microseconds / 1000000.0
+    return delta.days * 24 * 60 * 60 + delta.seconds + delta.microseconds / 1000000.0
 
 
 def datetime_ceil(dateval):
@@ -199,12 +238,41 @@ def datetime_ceil(dateval):
 
     """
     if dateval.microsecond > 0:
-        return dateval + timedelta(seconds=1, microseconds=-dateval.microsecond)
+        return datetime_utc_add(
+            dateval, timedelta(seconds=1, microseconds=-dateval.microsecond)
+        )
+
     return dateval
 
 
+def datetime_utc_add(dateval: datetime, tdelta: timedelta) -> datetime:
+    """
+    Adds an timedelta to a datetime in UTC for correct datetime arithmetic across
+    Daylight Saving Time changes
+
+    :param dateval: The date to add to
+    :type dateval: datetime
+    :param operand: The timedelta to add to the datetime
+    :type operand: timedelta
+    :return: The sum of the datetime and the timedelta
+    :rtype: datetime
+    """
+    original_tz = dateval.tzinfo
+    if original_tz is None:
+        return dateval + tdelta
+
+    return (dateval.astimezone(UTC) + tdelta).astimezone(original_tz)
+
+
 def datetime_repr(dateval):
-    return dateval.strftime('%Y-%m-%d %H:%M:%S %Z') if dateval else 'None'
+    return dateval.strftime("%Y-%m-%d %H:%M:%S %Z") if dateval else "None"
+
+
+def timezone_repr(timezone: tzinfo) -> str:
+    if isinstance(timezone, ZoneInfo):
+        return timezone.key
+
+    return repr(timezone)
 
 
 def get_callable_name(func):
@@ -220,11 +288,13 @@ def get_callable_name(func):
         return f"{cls.__qualname__}.{func.__name__}"
     elif isclass(func) or isfunction(func) or isbuiltin(func):
         return func.__qualname__
-    elif hasattr(func, '__call__') and callable(func.__call__):
+    elif hasattr(func, "__call__") and callable(func.__call__):
         # instance of a class with a __call__ method
         return type(func).__qualname__
 
-    raise TypeError('Unable to determine a name for %r -- maybe it is not a callable?' % func)
+    raise TypeError(
+        f"Unable to determine a name for {func!r} -- maybe it is not a callable?"
+    )
 
 
 def obj_to_ref(obj):
@@ -238,20 +308,20 @@ def obj_to_ref(obj):
 
     """
     if isinstance(obj, partial):
-        raise ValueError('Cannot create a reference to a partial()')
+        raise ValueError("Cannot create a reference to a partial()")
 
     name = get_callable_name(obj)
-    if '<lambda>' in name:
-        raise ValueError('Cannot create a reference to a lambda')
-    if '<locals>' in name:
-        raise ValueError('Cannot create a reference to a nested function')
+    if "<lambda>" in name:
+        raise ValueError("Cannot create a reference to a lambda")
+    if "<locals>" in name:
+        raise ValueError("Cannot create a reference to a nested function")
 
     if ismethod(obj):
         module = obj.__self__.__module__
     else:
         module = obj.__module__
 
-    return '%s:%s' % (module, name)
+    return f"{module}:{name}"
 
 
 def ref_to_obj(ref):
@@ -261,23 +331,25 @@ def ref_to_obj(ref):
     :type ref: str
 
     """
-    if not isinstance(ref, six.string_types):
-        raise TypeError('References must be strings')
-    if ':' not in ref:
-        raise ValueError('Invalid reference')
+    if not isinstance(ref, str):
+        raise TypeError("References must be strings")
+    if ":" not in ref:
+        raise ValueError("Invalid reference")
 
-    modulename, rest = ref.split(':', 1)
+    modulename, rest = ref.split(":", 1)
     try:
         obj = __import__(modulename, fromlist=[rest])
-    except ImportError:
-        raise LookupError('Error resolving reference %s: could not import module' % ref)
+    except ImportError as exc:
+        raise LookupError(
+            f"Error resolving reference {ref}: could not import module"
+        ) from exc
 
     try:
-        for name in rest.split('.'):
+        for name in rest.split("."):
             obj = getattr(obj, name)
         return obj
     except Exception:
-        raise LookupError('Error resolving reference %s: error looking up object' % ref)
+        raise LookupError(f"Error resolving reference {ref}: error looking up object")
 
 
 def maybe_ref(ref):
@@ -291,16 +363,6 @@ def maybe_ref(ref):
     return ref_to_obj(ref)
 
 
-if six.PY2:
-    def repr_escape(string):
-        if isinstance(string, six.text_type):
-            return string.encode('ascii', 'backslashreplace')
-        return string
-else:
-    def repr_escape(string):
-        return string
-
-
 def check_callable_args(func, args, kwargs):
     """
     Ensures that the given callable can be called with the given arguments.
@@ -313,22 +375,21 @@ def check_callable_args(func, args, kwargs):
     positional_only_kwargs = []  # positional-only parameters that have a match in kwargs
     unsatisfied_args = []  # parameters in signature that don't have a match in args or kwargs
     unsatisfied_kwargs = []  # keyword-only arguments that don't have a match in kwargs
-    unmatched_args = list(args)  # args that didn't match any of the parameters in the signature
+    unmatched_args = list(
+        args
+    )  # args that didn't match any of the parameters in the signature
     # kwargs that didn't match any of the parameters in the signature
     unmatched_kwargs = list(kwargs)
     # indicates if the signature defines *args and **kwargs respectively
     has_varargs = has_var_kwargs = False
 
     try:
-        if sys.version_info >= (3, 5):
-            sig = signature(func, follow_wrapped=False)
-        else:
-            sig = signature(func)
+        sig = signature(func, follow_wrapped=False)
     except ValueError:
         # signature() doesn't work against every kind of callable
         return
 
-    for param in six.itervalues(sig.parameters):
+    for param in sig.parameters.values():
         if param.kind == param.POSITIONAL_OR_KEYWORD:
             if param.name in unmatched_kwargs and unmatched_args:
                 pos_kwargs_conflicts.append(param.name)
@@ -358,37 +419,50 @@ def check_callable_args(func, args, kwargs):
 
     # Make sure there are no conflicts between args and kwargs
     if pos_kwargs_conflicts:
-        raise ValueError('The following arguments are supplied in both args and kwargs: %s' %
-                         ', '.join(pos_kwargs_conflicts))
+        raise ValueError(
+            "The following arguments are supplied in both args and kwargs: {}".format(
+                ", ".join(pos_kwargs_conflicts)
+            )
+        )
 
     # Check if keyword arguments are being fed to positional-only parameters
     if positional_only_kwargs:
-        raise ValueError('The following arguments cannot be given as keyword arguments: %s' %
-                         ', '.join(positional_only_kwargs))
+        raise ValueError(
+            "The following arguments cannot be given as keyword arguments: {}".format(
+                ", ".join(positional_only_kwargs)
+            )
+        )
 
-    # Check that the number of positional arguments minus the number of matched kwargs matches the
-    # argspec
+    # Check that the number of positional arguments minus the number of matched kwargs
+    # matches the argspec
     if unsatisfied_args:
-        raise ValueError('The following arguments have not been supplied: %s' %
-                         ', '.join(unsatisfied_args))
+        raise ValueError(
+            "The following arguments have not been supplied: {}".format(
+                ", ".join(unsatisfied_args)
+            )
+        )
 
     # Check that all keyword-only arguments have been supplied
     if unsatisfied_kwargs:
         raise ValueError(
-            'The following keyword-only arguments have not been supplied in kwargs: %s' %
-            ', '.join(unsatisfied_kwargs))
+            "The following keyword-only arguments have not been supplied in kwargs: "
+            "{}".format(", ".join(unsatisfied_kwargs))
+        )
 
     # Check that the callable can accept the given number of positional arguments
     if not has_varargs and unmatched_args:
         raise ValueError(
-            'The list of positional arguments is longer than the target callable can handle '
-            '(allowed: %d, given in args: %d)' % (len(args) - len(unmatched_args), len(args)))
+            f"The list of positional arguments is longer than the target callable can "
+            f"handle (allowed: {len(args) - len(unmatched_args)}, given in args: "
+            f"{len(args)})"
+        )
 
     # Check that the callable can accept the given keyword arguments
     if not has_var_kwargs and unmatched_kwargs:
         raise ValueError(
-            'The target callable does not accept the following keyword arguments: %s' %
-            ', '.join(unmatched_kwargs))
+            "The target callable does not accept the following keyword arguments: "
+            "{}".format(", ".join(unmatched_kwargs))
+        )
 
 
 def iscoroutinefunction_partial(f):
@@ -405,7 +479,7 @@ def normalize(dt):
 
 
 def localize(dt, tzinfo):
-    if hasattr(tzinfo, 'localize'):
+    if hasattr(tzinfo, "localize"):
         return tzinfo.localize(dt)
 
     return normalize(dt.replace(tzinfo=tzinfo))
diff --git a/libs/attr/__init__.pyi b/libs/attr/__init__.pyi
index 133e50105d..8d78fa19ab 100644
--- a/libs/attr/__init__.pyi
+++ b/libs/attr/__init__.pyi
@@ -176,7 +176,7 @@ def attrib(
     type: None = ...,
     converter: None = ...,
     factory: None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -200,7 +200,7 @@ def attrib(
     | tuple[_ConverterType]
     | None = ...,
     factory: Callable[[], _T] | None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -223,7 +223,7 @@ def attrib(
     | tuple[_ConverterType]
     | None = ...,
     factory: Callable[[], _T] | None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -246,7 +246,7 @@ def attrib(
     | tuple[_ConverterType]
     | None = ...,
     factory: Callable[[], _T] | None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
diff --git a/libs/attr/_cmp.py b/libs/attr/_cmp.py
index f367bb3a78..09bab491f8 100644
--- a/libs/attr/_cmp.py
+++ b/libs/attr/_cmp.py
@@ -4,7 +4,7 @@
 import functools
 import types
 
-from ._make import _make_ne
+from ._make import __ne__
 
 
 _operation_names = {"eq": "==", "lt": "<", "le": "<=", "gt": ">", "ge": ">="}
@@ -71,7 +71,7 @@ def cmp_using(
     if eq is not None:
         has_eq_function = True
         body["__eq__"] = _make_operator("eq", eq)
-        body["__ne__"] = _make_ne()
+        body["__ne__"] = __ne__
 
     if lt is not None:
         num_order_functions += 1
diff --git a/libs/attr/_compat.py b/libs/attr/_compat.py
index 22fcd78387..bc68ed9eaf 100644
--- a/libs/attr/_compat.py
+++ b/libs/attr/_compat.py
@@ -10,7 +10,6 @@
 
 
 PYPY = platform.python_implementation() == "PyPy"
-PY_3_9_PLUS = sys.version_info[:2] >= (3, 9)
 PY_3_10_PLUS = sys.version_info[:2] >= (3, 10)
 PY_3_11_PLUS = sys.version_info[:2] >= (3, 11)
 PY_3_12_PLUS = sys.version_info[:2] >= (3, 12)
@@ -18,10 +17,16 @@
 PY_3_14_PLUS = sys.version_info[:2] >= (3, 14)
 
 
-if PY_3_14_PLUS:  # pragma: no cover
+if PY_3_14_PLUS:
     import annotationlib
 
-    _get_annotations = annotationlib.get_annotations
+    # We request forward-ref annotations to not break in the presence of
+    # forward references.
+
+    def _get_annotations(cls):
+        return annotationlib.get_annotations(
+            cls, format=annotationlib.Format.FORWARDREF
+        )
 
 else:
 
diff --git a/libs/attr/_funcs.py b/libs/attr/_funcs.py
index c39fb8aa5a..1adb500213 100644
--- a/libs/attr/_funcs.py
+++ b/libs/attr/_funcs.py
@@ -3,11 +3,28 @@
 
 import copy
 
-from ._compat import PY_3_9_PLUS, get_generic_base
+from ._compat import get_generic_base
 from ._make import _OBJ_SETATTR, NOTHING, fields
 from .exceptions import AttrsAttributeNotFoundError
 
 
+_ATOMIC_TYPES = frozenset(
+    {
+        type(None),
+        bool,
+        int,
+        float,
+        str,
+        complex,
+        bytes,
+        type(...),
+        type,
+        range,
+        property,
+    }
+)
+
+
 def asdict(
     inst,
     recurse=True,
@@ -71,7 +88,10 @@ def asdict(
             v = value_serializer(inst, a, v)
 
         if recurse is True:
-            if has(v.__class__):
+            value_type = type(v)
+            if value_type in _ATOMIC_TYPES:
+                rv[a.name] = v
+            elif has(value_type):
                 rv[a.name] = asdict(
                     v,
                     recurse=True,
@@ -80,8 +100,8 @@ def asdict(
                     retain_collection_types=retain_collection_types,
                     value_serializer=value_serializer,
                 )
-            elif isinstance(v, (tuple, list, set, frozenset)):
-                cf = v.__class__ if retain_collection_types is True else list
+            elif issubclass(value_type, (tuple, list, set, frozenset)):
+                cf = value_type if retain_collection_types is True else list
                 items = [
                     _asdict_anything(
                         i,
@@ -101,7 +121,7 @@ def asdict(
                     # Workaround for TypeError: cf.__new__() missing 1 required
                     # positional argument (which appears, for a namedturle)
                     rv[a.name] = cf(*items)
-            elif isinstance(v, dict):
+            elif issubclass(value_type, dict):
                 df = dict_factory
                 rv[a.name] = df(
                     (
@@ -142,7 +162,12 @@ def _asdict_anything(
     """
     ``asdict`` only works on attrs instances, this works on anything.
     """
-    if getattr(val.__class__, "__attrs_attrs__", None) is not None:
+    val_type = type(val)
+    if val_type in _ATOMIC_TYPES:
+        rv = val
+        if value_serializer is not None:
+            rv = value_serializer(None, None, rv)
+    elif getattr(val_type, "__attrs_attrs__", None) is not None:
         # Attrs class.
         rv = asdict(
             val,
@@ -152,7 +177,7 @@ def _asdict_anything(
             retain_collection_types=retain_collection_types,
             value_serializer=value_serializer,
         )
-    elif isinstance(val, (tuple, list, set, frozenset)):
+    elif issubclass(val_type, (tuple, list, set, frozenset)):
         if retain_collection_types is True:
             cf = val.__class__
         elif is_key:
@@ -173,7 +198,7 @@ def _asdict_anything(
                 for i in val
             ]
         )
-    elif isinstance(val, dict):
+    elif issubclass(val_type, dict):
         df = dict_factory
         rv = df(
             (
@@ -253,8 +278,11 @@ def astuple(
         v = getattr(inst, a.name)
         if filter is not None and not filter(a, v):
             continue
+        value_type = type(v)
         if recurse is True:
-            if has(v.__class__):
+            if value_type in _ATOMIC_TYPES:
+                rv.append(v)
+            elif has(value_type):
                 rv.append(
                     astuple(
                         v,
@@ -264,7 +292,7 @@ def astuple(
                         retain_collection_types=retain,
                     )
                 )
-            elif isinstance(v, (tuple, list, set, frozenset)):
+            elif issubclass(value_type, (tuple, list, set, frozenset)):
                 cf = v.__class__ if retain is True else list
                 items = [
                     (
@@ -288,8 +316,8 @@ def astuple(
                     # Workaround for TypeError: cf.__new__() missing 1 required
                     # positional argument (which appears, for a namedturle)
                     rv.append(cf(*items))
-            elif isinstance(v, dict):
-                df = v.__class__ if retain is True else dict
+            elif issubclass(value_type, dict):
+                df = value_type if retain is True else dict
                 rv.append(
                     df(
                         (
@@ -450,10 +478,11 @@ class yet.
     if getattr(cls, "__attrs_types_resolved__", None) != cls:
         import typing
 
-        kwargs = {"globalns": globalns, "localns": localns}
-
-        if PY_3_9_PLUS:
-            kwargs["include_extras"] = include_extras
+        kwargs = {
+            "globalns": globalns,
+            "localns": localns,
+            "include_extras": include_extras,
+        }
 
         hints = typing.get_type_hints(cls, **kwargs)
         for field in fields(cls) if attribs is None else attribs:
diff --git a/libs/attr/_make.py b/libs/attr/_make.py
index f00fec48cc..d24d9ba985 100644
--- a/libs/attr/_make.py
+++ b/libs/attr/_make.py
@@ -6,15 +6,17 @@
 import contextlib
 import copy
 import enum
-import functools
 import inspect
 import itertools
 import linecache
 import sys
 import types
-import typing
+import unicodedata
+import weakref
 
-from operator import itemgetter
+from collections.abc import Callable, Mapping
+from functools import cached_property
+from typing import Any, NamedTuple, TypeVar
 
 # We need to import _compat itself in addition to the _compat members to avoid
 # having the thread-local in the globals here.
@@ -112,7 +114,7 @@ def attrib(
     type=None,
     converter=None,
     factory=None,
-    kw_only=False,
+    kw_only=None,
     eq=None,
     order=None,
     on_setattr=None,
@@ -155,6 +157,9 @@ def attrib(
        *eq*, *order*, and *cmp* also accept a custom callable
     .. versionchanged:: 21.1.0 *cmp* undeprecated
     .. versionadded:: 22.2.0 *alias*
+    .. versionchanged:: 25.4.0
+       *kw_only* can now be None, and its default is also changed from False to
+       None.
     """
     eq, eq_key, order, order_key = _determine_attrib_eq_order(
         cmp, eq, order, True
@@ -208,7 +213,12 @@ def attrib(
     )
 
 
-def _compile_and_eval(script, globs, locs=None, filename=""):
+def _compile_and_eval(
+    script: str,
+    globs: dict[str, Any] | None,
+    locs: Mapping[str, object] | None = None,
+    filename: str = "",
+) -> None:
     """
     Evaluate the script with the given global (globs) and local (locs)
     variables.
@@ -217,10 +227,16 @@ def _compile_and_eval(script, globs, locs=None, filename=""):
     eval(bytecode, globs, locs)
 
 
-def _make_method(name, script, filename, globs, locals=None):
+def _linecache_and_compile(
+    script: str,
+    filename: str,
+    globs: dict[str, Any] | None,
+    locals: Mapping[str, object] | None = None,
+) -> dict[str, Any]:
     """
-    Create the method with the script given and return the method object.
+    Cache the script with _linecache_, compile it and return the _locals_.
     """
+
     locs = {} if locals is None else locals
 
     # In order of debuggers like PDB being able to step through the code,
@@ -243,10 +259,10 @@ def _make_method(name, script, filename, globs, locals=None):
 
     _compile_and_eval(script, globs, locs, filename)
 
-    return locs[name]
+    return locs
 
 
-def _make_attr_tuple_class(cls_name, attr_names):
+def _make_attr_tuple_class(cls_name: str, attr_names: list[str]) -> type:
     """
     Create a tuple subclass to hold `Attribute`s for an `attrs` class.
 
@@ -257,35 +273,22 @@ class MyClassAttributes(tuple):
         x = property(itemgetter(0))
     """
     attr_class_name = f"{cls_name}Attributes"
-    attr_class_template = [
-        f"class {attr_class_name}(tuple):",
-        "    __slots__ = ()",
-    ]
-    if attr_names:
-        for i, attr_name in enumerate(attr_names):
-            attr_class_template.append(
-                f"    {attr_name} = _attrs_property(_attrs_itemgetter({i}))"
-            )
-    else:
-        attr_class_template.append("    pass")
-    globs = {"_attrs_itemgetter": itemgetter, "_attrs_property": property}
-    _compile_and_eval("\n".join(attr_class_template), globs)
-    return globs[attr_class_name]
+    body = {}
+    for i, attr_name in enumerate(attr_names):
+
+        def getter(self, i=i):
+            return self[i]
+
+        body[attr_name] = property(getter)
+    return type(attr_class_name, (tuple,), body)
 
 
 # Tuple class for extracted attributes from a class definition.
 # `base_attrs` is a subset of `attrs`.
-_Attributes = _make_attr_tuple_class(
-    "_Attributes",
-    [
-        # all attributes to build dunder methods for
-        "attrs",
-        # attributes that have been inherited
-        "base_attrs",
-        # map inherited attributes to their originating classes
-        "base_attrs_map",
-    ],
-)
+class _Attributes(NamedTuple):
+    attrs: type
+    base_attrs: list[Attribute]
+    base_attrs_map: dict[str, type]
 
 
 def _is_class_var(annot):
@@ -312,7 +315,9 @@ def _has_own_attribute(cls, attrib_name):
     return attrib_name in cls.__dict__
 
 
-def _collect_base_attrs(cls, taken_attr_names):
+def _collect_base_attrs(
+    cls, taken_attr_names
+) -> tuple[list[Attribute], dict[str, type]]:
     """
     Collect attr.ibs from base classes of *cls*, except *taken_attr_names*.
     """
@@ -372,8 +377,13 @@ def _collect_base_attrs_broken(cls, taken_attr_names):
 
 
 def _transform_attrs(
-    cls, these, auto_attribs, kw_only, collect_by_mro, field_transformer
-):
+    cls,
+    these,
+    auto_attribs,
+    kw_only,
+    collect_by_mro,
+    field_transformer,
+) -> _Attributes:
     """
     Transform all `_CountingAttr`s on a class into `Attribute`s.
 
@@ -393,7 +403,7 @@ def _transform_attrs(
         ca_names = {
             name
             for name, attr in cd.items()
-            if isinstance(attr, _CountingAttr)
+            if attr.__class__ is _CountingAttr
         }
         ca_list = []
         annot_names = set()
@@ -403,12 +413,12 @@ def _transform_attrs(
             annot_names.add(attr_name)
             a = cd.get(attr_name, NOTHING)
 
-            if not isinstance(a, _CountingAttr):
-                a = attrib() if a is NOTHING else attrib(default=a)
+            if a.__class__ is not _CountingAttr:
+                a = attrib(a)
             ca_list.append((attr_name, a))
 
         unannotated = ca_names - annot_names
-        if len(unannotated) > 0:
+        if unannotated:
             raise UnannotatedAttributeError(
                 "The following `attr.ib`s lack a type annotation: "
                 + ", ".join(
@@ -421,14 +431,19 @@ def _transform_attrs(
             (
                 (name, attr)
                 for name, attr in cd.items()
-                if isinstance(attr, _CountingAttr)
+                if attr.__class__ is _CountingAttr
             ),
             key=lambda e: e[1].counter,
         )
 
+    fca = Attribute.from_counting_attr
+    no = ClassProps.KeywordOnly.NO
     own_attrs = [
-        Attribute.from_counting_attr(
-            name=attr_name, ca=ca, type=anns.get(attr_name)
+        fca(
+            attr_name,
+            ca,
+            kw_only is not no,
+            anns.get(attr_name),
         )
         for attr_name, ca in ca_list
     ]
@@ -442,12 +457,16 @@ def _transform_attrs(
             cls, {a.name for a in own_attrs}
         )
 
-    if kw_only:
+    if kw_only is ClassProps.KeywordOnly.FORCE:
         own_attrs = [a.evolve(kw_only=True) for a in own_attrs]
         base_attrs = [a.evolve(kw_only=True) for a in base_attrs]
 
     attrs = base_attrs + own_attrs
 
+    if field_transformer is not None:
+        attrs = tuple(field_transformer(cls, attrs))
+
+    # Check attr order after executing the field_transformer.
     # Mandatory vs non-mandatory attr order only matters when they are part of
     # the __init__ signature and when they aren't kw_only (which are moved to
     # the end and can be mandatory or non-mandatory in any order, as they will
@@ -461,23 +480,20 @@ def _transform_attrs(
         if had_default is False and a.default is not NOTHING:
             had_default = True
 
-    if field_transformer is not None:
-        attrs = field_transformer(cls, attrs)
-
     # Resolve default field alias after executing field_transformer.
     # This allows field_transformer to differentiate between explicit vs
     # default aliases and supply their own defaults.
-    attrs = [
-        a.evolve(alias=_default_init_alias_for(a.name)) if not a.alias else a
-        for a in attrs
-    ]
+    for a in attrs:
+        if not a.alias:
+            # Evolve is very slow, so we hold our nose and do it dirty.
+            _OBJ_SETATTR.__get__(a)("alias", _default_init_alias_for(a.name))
 
     # Create AttrsClass *after* applying the field_transformer since it may
     # add or remove attributes!
     attr_names = [a.name for a in attrs]
     AttrsClass = _make_attr_tuple_class(cls.__name__, attr_names)
 
-    return _Attributes((AttrsClass(attrs), base_attrs, base_attr_map))
+    return _Attributes(AttrsClass(attrs), base_attrs, base_attr_map)
 
 
 def _make_cached_property_getattr(cached_properties, original_getattr, cls):
@@ -527,15 +543,9 @@ def _make_cached_property_getattr(cached_properties, original_getattr, cls):
         "original_getattr": original_getattr,
     }
 
-    return _make_method(
-        "__getattr__",
-        "\n".join(lines),
-        unique_filename,
-        glob,
-        locals={
-            "_cls": cls,
-        },
-    )
+    return _linecache_and_compile(
+        "\n".join(lines), unique_filename, glob, locals={"_cls": cls}
+    )["__getattr__"]
 
 
 def _frozen_setattrs(self, name, value):
@@ -630,6 +640,7 @@ class _ClassBuilder:
     """
 
     __slots__ = (
+        "_add_method_dunders",
         "_attr_names",
         "_attrs",
         "_base_attr_map",
@@ -645,6 +656,8 @@ class _ClassBuilder:
         "_is_exc",
         "_on_setattr",
         "_pre_init_has_args",
+        "_repr_added",
+        "_script_snippets",
         "_slots",
         "_weakref_slot",
         "_wrote_own_setattr",
@@ -652,40 +665,33 @@ class _ClassBuilder:
 
     def __init__(
         self,
-        cls,
+        cls: type,
         these,
-        slots,
-        frozen,
-        weakref_slot,
-        getstate_setstate,
-        auto_attribs,
-        kw_only,
-        cache_hash,
-        is_exc,
-        collect_by_mro,
-        on_setattr,
-        has_custom_setattr,
-        field_transformer,
+        auto_attribs: bool,
+        props: ClassProps,
+        has_custom_setattr: bool,
     ):
         attrs, base_attrs, base_map = _transform_attrs(
             cls,
             these,
             auto_attribs,
-            kw_only,
-            collect_by_mro,
-            field_transformer,
+            props.kw_only,
+            props.collected_fields_by_mro,
+            props.field_transformer,
         )
 
         self._cls = cls
-        self._cls_dict = dict(cls.__dict__) if slots else {}
+        self._cls_dict = dict(cls.__dict__) if props.is_slotted else {}
         self._attrs = attrs
         self._base_names = {a.name for a in base_attrs}
         self._base_attr_map = base_map
         self._attr_names = tuple(a.name for a in attrs)
-        self._slots = slots
-        self._frozen = frozen
-        self._weakref_slot = weakref_slot
-        self._cache_hash = cache_hash
+        self._slots = props.is_slotted
+        self._frozen = props.is_frozen
+        self._weakref_slot = props.has_weakref_slot
+        self._cache_hash = (
+            props.hashability is ClassProps.Hashability.HASHABLE_CACHED
+        )
         self._has_pre_init = bool(getattr(cls, "__attrs_pre_init__", False))
         self._pre_init_has_args = False
         if self._has_pre_init:
@@ -696,20 +702,21 @@ def __init__(
             self._pre_init_has_args = len(pre_init_signature.parameters) > 1
         self._has_post_init = bool(getattr(cls, "__attrs_post_init__", False))
         self._delete_attribs = not bool(these)
-        self._is_exc = is_exc
-        self._on_setattr = on_setattr
+        self._is_exc = props.is_exception
+        self._on_setattr = props.on_setattr_hook
 
         self._has_custom_setattr = has_custom_setattr
         self._wrote_own_setattr = False
 
         self._cls_dict["__attrs_attrs__"] = self._attrs
+        self._cls_dict["__attrs_props__"] = props
 
-        if frozen:
+        if props.is_frozen:
             self._cls_dict["__setattr__"] = _frozen_setattrs
             self._cls_dict["__delattr__"] = _frozen_delattrs
 
             self._wrote_own_setattr = True
-        elif on_setattr in (
+        elif self._on_setattr in (
             _DEFAULT_ON_SETATTR,
             setters.validate,
             setters.convert,
@@ -725,34 +732,69 @@ def __init__(
                     break
             if (
                 (
-                    on_setattr == _DEFAULT_ON_SETATTR
+                    self._on_setattr == _DEFAULT_ON_SETATTR
                     and not (has_validator or has_converter)
                 )
-                or (on_setattr == setters.validate and not has_validator)
-                or (on_setattr == setters.convert and not has_converter)
+                or (self._on_setattr == setters.validate and not has_validator)
+                or (self._on_setattr == setters.convert and not has_converter)
             ):
                 # If class-level on_setattr is set to convert + validate, but
                 # there's no field to convert or validate, pretend like there's
                 # no on_setattr.
                 self._on_setattr = None
 
-        if getstate_setstate:
+        if props.added_pickling:
             (
                 self._cls_dict["__getstate__"],
                 self._cls_dict["__setstate__"],
             ) = self._make_getstate_setstate()
 
+        # tuples of script, globs, hook
+        self._script_snippets: list[
+            tuple[str, dict, Callable[[dict, dict], Any]]
+        ] = []
+        self._repr_added = False
+
+        # We want to only do this check once; in 99.9% of cases these
+        # exist.
+        if not hasattr(self._cls, "__module__") or not hasattr(
+            self._cls, "__qualname__"
+        ):
+            self._add_method_dunders = self._add_method_dunders_safe
+        else:
+            self._add_method_dunders = self._add_method_dunders_unsafe
+
     def __repr__(self):
         return f"<_ClassBuilder(cls={self._cls.__name__})>"
 
+    def _eval_snippets(self) -> None:
+        """
+        Evaluate any registered snippets in one go.
+        """
+        script = "\n".join([snippet[0] for snippet in self._script_snippets])
+        globs = {}
+        for _, snippet_globs, _ in self._script_snippets:
+            globs.update(snippet_globs)
+
+        locs = _linecache_and_compile(
+            script,
+            _generate_unique_filename(self._cls, "methods"),
+            globs,
+        )
+
+        for _, _, hook in self._script_snippets:
+            hook(self._cls_dict, locs)
+
     def build_class(self):
         """
         Finalize class based on the accumulated configuration.
 
         Builder cannot be used after calling this method.
         """
+        self._eval_snippets()
         if self._slots is True:
             cls = self._create_slots_class()
+            self._cls.__attrs_base_of_slotted__ = weakref.ref(cls)
         else:
             cls = self._patch_original_class()
             if PY_3_10_PLUS:
@@ -814,6 +856,10 @@ def _create_slots_class(self):
             if k not in (*tuple(self._attr_names), "__dict__", "__weakref__")
         }
 
+        # 3.14.0rc2+
+        if hasattr(sys, "_clear_type_descriptors"):
+            sys._clear_type_descriptors(self._cls)
+
         # If our class doesn't have its own implementation of __setattr__
         # (either from the user or by us), check the bases, if one of them has
         # an attrs-made __setattr__, that needs to be reset. We don't walk the
@@ -857,9 +903,9 @@ def _create_slots_class(self):
             names += ("__weakref__",)
 
         cached_properties = {
-            name: cached_property.func
-            for name, cached_property in cd.items()
-            if isinstance(cached_property, functools.cached_property)
+            name: cached_prop.func
+            for name, cached_prop in cd.items()
+            if isinstance(cached_prop, cached_property)
         }
 
         # Collect methods with a `__class__` reference that are shadowed in the new class.
@@ -944,14 +990,17 @@ def _create_slots_class(self):
         return cls
 
     def add_repr(self, ns):
-        self._cls_dict["__repr__"] = self._add_method_dunders(
-            _make_repr(self._attrs, ns, self._cls)
-        )
+        script, globs = _make_repr_script(self._attrs, ns)
+
+        def _attach_repr(cls_dict, globs):
+            cls_dict["__repr__"] = self._add_method_dunders(globs["__repr__"])
+
+        self._script_snippets.append((script, globs, _attach_repr))
+        self._repr_added = True
         return self
 
     def add_str(self):
-        repr = self._cls_dict.get("__repr__")
-        if repr is None:
+        if not self._repr_added:
             msg = "__str__ can only be generated if a __repr__ exists."
             raise ValueError(msg)
 
@@ -1007,35 +1056,43 @@ def make_unhashable(self):
         return self
 
     def add_hash(self):
-        self._cls_dict["__hash__"] = self._add_method_dunders(
-            _make_hash(
-                self._cls,
-                self._attrs,
-                frozen=self._frozen,
-                cache_hash=self._cache_hash,
-            )
+        script, globs = _make_hash_script(
+            self._cls,
+            self._attrs,
+            frozen=self._frozen,
+            cache_hash=self._cache_hash,
         )
 
+        def attach_hash(cls_dict: dict, locs: dict) -> None:
+            cls_dict["__hash__"] = self._add_method_dunders(locs["__hash__"])
+
+        self._script_snippets.append((script, globs, attach_hash))
+
         return self
 
     def add_init(self):
-        self._cls_dict["__init__"] = self._add_method_dunders(
-            _make_init(
-                self._cls,
-                self._attrs,
-                self._has_pre_init,
-                self._pre_init_has_args,
-                self._has_post_init,
-                self._frozen,
-                self._slots,
-                self._cache_hash,
-                self._base_attr_map,
-                self._is_exc,
-                self._on_setattr,
-                attrs_init=False,
-            )
+        script, globs, annotations = _make_init_script(
+            self._cls,
+            self._attrs,
+            self._has_pre_init,
+            self._pre_init_has_args,
+            self._has_post_init,
+            self._frozen,
+            self._slots,
+            self._cache_hash,
+            self._base_attr_map,
+            self._is_exc,
+            self._on_setattr,
+            attrs_init=False,
         )
 
+        def _attach_init(cls_dict, globs):
+            init = globs["__init__"]
+            init.__annotations__ = annotations
+            cls_dict["__init__"] = self._add_method_dunders(init)
+
+        self._script_snippets.append((script, globs, _attach_init))
+
         return self
 
     def add_replace(self):
@@ -1052,32 +1109,41 @@ def add_match_args(self):
         )
 
     def add_attrs_init(self):
-        self._cls_dict["__attrs_init__"] = self._add_method_dunders(
-            _make_init(
-                self._cls,
-                self._attrs,
-                self._has_pre_init,
-                self._pre_init_has_args,
-                self._has_post_init,
-                self._frozen,
-                self._slots,
-                self._cache_hash,
-                self._base_attr_map,
-                self._is_exc,
-                self._on_setattr,
-                attrs_init=True,
-            )
+        script, globs, annotations = _make_init_script(
+            self._cls,
+            self._attrs,
+            self._has_pre_init,
+            self._pre_init_has_args,
+            self._has_post_init,
+            self._frozen,
+            self._slots,
+            self._cache_hash,
+            self._base_attr_map,
+            self._is_exc,
+            self._on_setattr,
+            attrs_init=True,
         )
 
+        def _attach_attrs_init(cls_dict, globs):
+            init = globs["__attrs_init__"]
+            init.__annotations__ = annotations
+            cls_dict["__attrs_init__"] = self._add_method_dunders(init)
+
+        self._script_snippets.append((script, globs, _attach_attrs_init))
+
         return self
 
     def add_eq(self):
         cd = self._cls_dict
 
-        cd["__eq__"] = self._add_method_dunders(
-            _make_eq(self._cls, self._attrs)
-        )
-        cd["__ne__"] = self._add_method_dunders(_make_ne())
+        script, globs = _make_eq_script(self._attrs)
+
+        def _attach_eq(cls_dict, globs):
+            cls_dict["__eq__"] = self._add_method_dunders(globs["__eq__"])
+
+        self._script_snippets.append((script, globs, _attach_eq))
+
+        cd["__ne__"] = __ne__
 
         return self
 
@@ -1092,9 +1158,6 @@ def add_order(self):
         return self
 
     def add_setattr(self):
-        if self._frozen:
-            return self
-
         sa_attrs = {}
         for a in self._attrs:
             on_setattr = a.on_setattr or self._on_setattr
@@ -1126,7 +1189,21 @@ def __setattr__(self, name, val):
 
         return self
 
-    def _add_method_dunders(self, method):
+    def _add_method_dunders_unsafe(self, method: Callable) -> Callable:
+        """
+        Add __module__ and __qualname__ to a *method*.
+        """
+        method.__module__ = self._cls.__module__
+
+        method.__qualname__ = f"{self._cls.__qualname__}.{method.__name__}"
+
+        method.__doc__ = (
+            f"Method generated by attrs for class {self._cls.__qualname__}."
+        )
+
+        return method
+
+    def _add_method_dunders_safe(self, method: Callable) -> Callable:
         """
         Add __module__ and __qualname__ to a *method* if possible.
         """
@@ -1137,10 +1214,7 @@ def _add_method_dunders(self, method):
             method.__qualname__ = f"{self._cls.__qualname__}.{method.__name__}"
 
         with contextlib.suppress(AttributeError):
-            method.__doc__ = (
-                "Method generated by attrs for class "
-                f"{self._cls.__qualname__}."
-            )
+            method.__doc__ = f"Method generated by attrs for class {self._cls.__qualname__}."
 
         return method
 
@@ -1267,6 +1341,7 @@ def attrs(
     field_transformer=None,
     match_args=True,
     unsafe_hash=None,
+    force_kw_only=True,
 ):
     r"""
     A class decorator that adds :term:`dunder methods` according to the
@@ -1333,6 +1408,10 @@ def attrs(
        If a class has an *inherited* classmethod called
        ``__attrs_init_subclass__``, it is executed after the class is created.
     .. deprecated:: 24.1.0 *hash* is deprecated in favor of *unsafe_hash*.
+    .. versionchanged:: 25.4.0
+       *kw_only* now only applies to attributes defined in the current class,
+       and respects attribute-level ``kw_only=False`` settings.
+    .. versionadded:: 25.4.0 *force_kw_only*
     """
     if repr_ns is not None:
         import warnings
@@ -1354,6 +1433,7 @@ def attrs(
         on_setattr = setters.pipe(*on_setattr)
 
     def wrap(cls):
+        nonlocal hash
         is_frozen = frozen or _has_frozen_base_class(cls)
         is_exc = auto_exc is True and issubclass(cls, BaseException)
         has_own_setattr = auto_detect and _has_own_attribute(
@@ -1364,81 +1444,112 @@ def wrap(cls):
             msg = "Can't freeze a class with a custom __setattr__."
             raise ValueError(msg)
 
-        builder = _ClassBuilder(
-            cls,
-            these,
-            slots,
-            is_frozen,
-            weakref_slot,
-            _determine_whether_to_implement(
+        eq = not is_exc and _determine_whether_to_implement(
+            cls, eq_, auto_detect, ("__eq__", "__ne__")
+        )
+
+        Hashability = ClassProps.Hashability
+
+        if is_exc:
+            hashability = Hashability.LEAVE_ALONE
+        elif hash is True:
+            hashability = (
+                Hashability.HASHABLE_CACHED
+                if cache_hash
+                else Hashability.HASHABLE
+            )
+        elif hash is False:
+            hashability = Hashability.LEAVE_ALONE
+        elif hash is None:
+            if auto_detect is True and _has_own_attribute(cls, "__hash__"):
+                hashability = Hashability.LEAVE_ALONE
+            elif eq is True and is_frozen is True:
+                hashability = (
+                    Hashability.HASHABLE_CACHED
+                    if cache_hash
+                    else Hashability.HASHABLE
+                )
+            elif eq is False:
+                hashability = Hashability.LEAVE_ALONE
+            else:
+                hashability = Hashability.UNHASHABLE
+        else:
+            msg = "Invalid value for hash.  Must be True, False, or None."
+            raise TypeError(msg)
+
+        KeywordOnly = ClassProps.KeywordOnly
+        if kw_only:
+            kwo = KeywordOnly.FORCE if force_kw_only else KeywordOnly.YES
+        else:
+            kwo = KeywordOnly.NO
+
+        props = ClassProps(
+            is_exception=is_exc,
+            is_frozen=is_frozen,
+            is_slotted=slots,
+            collected_fields_by_mro=collect_by_mro,
+            added_init=_determine_whether_to_implement(
+                cls, init, auto_detect, ("__init__",)
+            ),
+            added_repr=_determine_whether_to_implement(
+                cls, repr, auto_detect, ("__repr__",)
+            ),
+            added_eq=eq,
+            added_ordering=not is_exc
+            and _determine_whether_to_implement(
+                cls,
+                order_,
+                auto_detect,
+                ("__lt__", "__le__", "__gt__", "__ge__"),
+            ),
+            hashability=hashability,
+            added_match_args=match_args,
+            kw_only=kwo,
+            has_weakref_slot=weakref_slot,
+            added_str=str,
+            added_pickling=_determine_whether_to_implement(
                 cls,
                 getstate_setstate,
                 auto_detect,
                 ("__getstate__", "__setstate__"),
                 default=slots,
             ),
-            auto_attribs,
-            kw_only,
-            cache_hash,
-            is_exc,
-            collect_by_mro,
-            on_setattr,
-            has_own_setattr,
-            field_transformer,
+            on_setattr_hook=on_setattr,
+            field_transformer=field_transformer,
         )
-        if _determine_whether_to_implement(
-            cls, repr, auto_detect, ("__repr__",)
-        ):
+
+        if not props.is_hashable and cache_hash:
+            msg = "Invalid value for cache_hash.  To use hash caching, hashing must be either explicitly or implicitly enabled."
+            raise TypeError(msg)
+
+        builder = _ClassBuilder(
+            cls,
+            these,
+            auto_attribs=auto_attribs,
+            props=props,
+            has_custom_setattr=has_own_setattr,
+        )
+
+        if props.added_repr:
             builder.add_repr(repr_ns)
-        if str is True:
+
+        if props.added_str:
             builder.add_str()
 
-        eq = _determine_whether_to_implement(
-            cls, eq_, auto_detect, ("__eq__", "__ne__")
-        )
-        if not is_exc and eq is True:
+        if props.added_eq:
             builder.add_eq()
-        if not is_exc and _determine_whether_to_implement(
-            cls, order_, auto_detect, ("__lt__", "__le__", "__gt__", "__ge__")
-        ):
+        if props.added_ordering:
             builder.add_order()
 
-        builder.add_setattr()
-
-        nonlocal hash
-        if (
-            hash is None
-            and auto_detect is True
-            and _has_own_attribute(cls, "__hash__")
-        ):
-            hash = False
-
-        if hash is not True and hash is not False and hash is not None:
-            # Can't use `hash in` because 1 == True for example.
-            msg = "Invalid value for hash.  Must be True, False, or None."
-            raise TypeError(msg)
+        if not frozen:
+            builder.add_setattr()
 
-        if hash is False or (hash is None and eq is False) or is_exc:
-            # Don't do anything. Should fall back to __object__'s __hash__
-            # which is by id.
-            if cache_hash:
-                msg = "Invalid value for cache_hash.  To use hash caching, hashing must be either explicitly or implicitly enabled."
-                raise TypeError(msg)
-        elif hash is True or (
-            hash is None and eq is True and is_frozen is True
-        ):
-            # Build a __hash__ if told so, or if it's safe.
+        if props.is_hashable:
             builder.add_hash()
-        else:
-            # Raise TypeError on attempts to hash.
-            if cache_hash:
-                msg = "Invalid value for cache_hash.  To use hash caching, hashing must be either explicitly or implicitly enabled."
-                raise TypeError(msg)
+        elif props.hashability is Hashability.UNHASHABLE:
             builder.make_unhashable()
 
-        if _determine_whether_to_implement(
-            cls, init, auto_detect, ("__init__",)
-        ):
+        if props.added_init:
             builder.add_init()
         else:
             builder.add_attrs_init()
@@ -1481,7 +1592,7 @@ def _has_frozen_base_class(cls):
     return cls.__setattr__ is _frozen_setattrs
 
 
-def _generate_unique_filename(cls, func_name):
+def _generate_unique_filename(cls: type, func_name: str) -> str:
     """
     Create a "filename" suitable for a function being generated.
     """
@@ -1491,15 +1602,16 @@ def _generate_unique_filename(cls, func_name):
     )
 
 
-def _make_hash(cls, attrs, frozen, cache_hash):
+def _make_hash_script(
+    cls: type, attrs: list[Attribute], frozen: bool, cache_hash: bool
+) -> tuple[str, dict]:
     attrs = tuple(
         a for a in attrs if a.hash is True or (a.hash is None and a.eq is True)
     )
 
     tab = "        "
 
-    unique_filename = _generate_unique_filename(cls, "hash")
-    type_hash = hash(unique_filename)
+    type_hash = hash(_generate_unique_filename(cls, "hash"))
     # If eq is custom generated, we need to include the functions in globs
     globs = {}
 
@@ -1559,43 +1671,41 @@ def append_hash_computation_lines(prefix, indent):
         append_hash_computation_lines("return ", tab)
 
     script = "\n".join(method_lines)
-    return _make_method("__hash__", script, unique_filename, globs)
+    return script, globs
 
 
-def _add_hash(cls, attrs):
+def _add_hash(cls: type, attrs: list[Attribute]):
     """
     Add a hash method to *cls*.
     """
-    cls.__hash__ = _make_hash(cls, attrs, frozen=False, cache_hash=False)
+    script, globs = _make_hash_script(
+        cls, attrs, frozen=False, cache_hash=False
+    )
+    _compile_and_eval(
+        script, globs, filename=_generate_unique_filename(cls, "__hash__")
+    )
+    cls.__hash__ = globs["__hash__"]
     return cls
 
 
-def _make_ne():
+def __ne__(self, other):
     """
-    Create __ne__ method.
+    Check equality and either forward a NotImplemented or
+    return the result negated.
     """
+    result = self.__eq__(other)
+    if result is NotImplemented:
+        return NotImplemented
 
-    def __ne__(self, other):
-        """
-        Check equality and either forward a NotImplemented or
-        return the result negated.
-        """
-        result = self.__eq__(other)
-        if result is NotImplemented:
-            return NotImplemented
-
-        return not result
-
-    return __ne__
+    return not result
 
 
-def _make_eq(cls, attrs):
+def _make_eq_script(attrs: list) -> tuple[str, dict]:
     """
     Create __eq__ method for *cls* with *attrs*.
     """
     attrs = [a for a in attrs if a.eq]
 
-    unique_filename = _generate_unique_filename(cls, "eq")
     lines = [
         "def __eq__(self, other):",
         "    if other.__class__ is not self.__class__:",
@@ -1624,7 +1734,7 @@ def _make_eq(cls, attrs):
 
     script = "\n".join(lines)
 
-    return _make_method("__eq__", script, unique_filename, globs)
+    return script, globs
 
 
 def _make_order(cls, attrs):
@@ -1690,14 +1800,20 @@ def _add_eq(cls, attrs=None):
     if attrs is None:
         attrs = cls.__attrs_attrs__
 
-    cls.__eq__ = _make_eq(cls, attrs)
-    cls.__ne__ = _make_ne()
+    script, globs = _make_eq_script(attrs)
+    _compile_and_eval(
+        script, globs, filename=_generate_unique_filename(cls, "__eq__")
+    )
+    cls.__eq__ = globs["__eq__"]
+    cls.__ne__ = __ne__
 
     return cls
 
 
-def _make_repr(attrs, ns, cls):
-    unique_filename = _generate_unique_filename(cls, "repr")
+def _make_repr_script(attrs, ns) -> tuple[str, dict]:
+    """
+    Create the source and globs for a __repr__ and return it.
+    """
     # Figure out which attributes to include, and which function to use to
     # format them. The a.repr value can be either bool or a custom
     # callable.
@@ -1748,9 +1864,7 @@ def _make_repr(attrs, ns, cls):
         "    already_repring.remove(id(self))",
     ]
 
-    return _make_method(
-        "__repr__", "\n".join(lines), unique_filename, globs=globs
-    )
+    return "\n".join(lines), globs
 
 
 def _add_repr(cls, ns=None, attrs=None):
@@ -1760,7 +1874,11 @@ def _add_repr(cls, ns=None, attrs=None):
     if attrs is None:
         attrs = cls.__attrs_attrs__
 
-    cls.__repr__ = _make_repr(attrs, ns, cls)
+    script, globs = _make_repr_script(attrs, ns)
+    _compile_and_eval(
+        script, globs, filename=_generate_unique_filename(cls, "__repr__")
+    )
+    cls.__repr__ = globs["__repr__"]
     return cls
 
 
@@ -1865,7 +1983,7 @@ def _is_slot_attr(a_name, base_attr_map):
     return cls and "__slots__" in cls.__dict__
 
 
-def _make_init(
+def _make_init_script(
     cls,
     attrs,
     pre_init,
@@ -1878,7 +1996,7 @@ def _make_init(
     is_exc,
     cls_on_setattr,
     attrs_init,
-):
+) -> tuple[str, dict, dict]:
     has_cls_on_setattr = (
         cls_on_setattr is not None and cls_on_setattr is not setters.NO_OP
     )
@@ -1906,8 +2024,6 @@ def _make_init(
         elif has_cls_on_setattr and a.on_setattr is not setters.NO_OP:
             needs_cached_setattr = True
 
-    unique_filename = _generate_unique_filename(cls, "init")
-
     script, globs, annotations = _attrs_to_init_script(
         filtered_attrs,
         frozen,
@@ -1933,15 +2049,7 @@ def _make_init(
         # setattr hooks.
         globs["_cached_setattr_get"] = _OBJ_SETATTR.__get__
 
-    init = _make_method(
-        "__attrs_init__" if attrs_init else "__init__",
-        script,
-        unique_filename,
-        globs,
-    )
-    init.__annotations__ = annotations
-
-    return init
+    return script, globs, annotations
 
 
 def _setattr(attr_name: str, value_var: str, has_on_setattr: bool) -> str:
@@ -2067,8 +2175,9 @@ def _attrs_to_init_script(
     )
     lines.extend(extra_lines)
 
-    args = []
-    kw_only_args = []
+    args = []  # Parameters in the definition of __init__
+    pre_init_args = []  # Parameters in the call to __attrs_pre_init__
+    kw_only_args = []  # Used for both 'args' and 'pre_init_args' above
     attrs_to_validate = []
 
     # This is a dictionary of names to validator and converter callables.
@@ -2146,6 +2255,7 @@ def _attrs_to_init_script(
                 kw_only_args.append(arg)
             else:
                 args.append(arg)
+                pre_init_args.append(arg_name)
 
             if converter is not None:
                 lines.append(
@@ -2165,6 +2275,7 @@ def _attrs_to_init_script(
                 kw_only_args.append(arg)
             else:
                 args.append(arg)
+                pre_init_args.append(arg_name)
             lines.append(f"if {arg_name} is not NOTHING:")
 
             init_factory_name = _INIT_FACTORY_PAT % (a.name,)
@@ -2207,6 +2318,7 @@ def _attrs_to_init_script(
                 kw_only_args.append(arg_name)
             else:
                 args.append(arg_name)
+                pre_init_args.append(arg_name)
 
             if converter is not None:
                 lines.append(
@@ -2263,7 +2375,7 @@ def _attrs_to_init_script(
         lines.append(f"BaseException.__init__(self, {vals})")
 
     args = ", ".join(args)
-    pre_init_args = args
+    pre_init_args = ", ".join(pre_init_args)
     if kw_only_args:
         # leading comma & kw_only args
         args += f"{', ' if args else ''}*, {', '.join(kw_only_args)}"
@@ -2278,14 +2390,14 @@ def _attrs_to_init_script(
         pre_init_args += pre_init_kw_only_args
 
     if call_pre_init and pre_init_has_args:
-        # If pre init method has arguments, pass same arguments as `__init__`.
+        # If pre init method has arguments, pass the values given to __init__.
         lines[0] = f"self.__attrs_pre_init__({pre_init_args})"
 
     # Python <3.12 doesn't allow backslashes in f-strings.
     NL = "\n    "
     return (
         f"""def {method_name}(self, {args}):
-    {NL.join(lines) if lines else 'pass'}
+    {NL.join(lines) if lines else "pass"}
 """,
         names_for_globals,
         annotations,
@@ -2427,33 +2539,36 @@ def __setattr__(self, name, value):
         raise FrozenInstanceError
 
     @classmethod
-    def from_counting_attr(cls, name, ca, type=None):
+    def from_counting_attr(
+        cls, name: str, ca: _CountingAttr, kw_only: bool, type=None
+    ):
+        # The 'kw_only' argument is the class-level setting, and is used if the
+        # attribute itself does not explicitly set 'kw_only'.
         # type holds the annotated value. deal with conflicts:
         if type is None:
             type = ca.type
         elif ca.type is not None:
-            msg = "Type annotation and type argument cannot both be present"
+            msg = f"Type annotation and type argument cannot both be present for '{name}'."
             raise ValueError(msg)
-        inst_dict = {
-            k: getattr(ca, k)
-            for k in Attribute.__slots__
-            if k
-            not in (
-                "name",
-                "validator",
-                "default",
-                "type",
-                "inherited",
-            )  # exclude methods and deprecated alias
-        }
         return cls(
-            name=name,
-            validator=ca._validator,
-            default=ca._default,
-            type=type,
-            cmp=None,
-            inherited=False,
-            **inst_dict,
+            name,
+            ca._default,
+            ca._validator,
+            ca.repr,
+            None,
+            ca.hash,
+            ca.init,
+            False,
+            ca.metadata,
+            type,
+            ca.converter,
+            kw_only if ca.kw_only is None else ca.kw_only,
+            ca.eq,
+            ca.eq_key,
+            ca.order,
+            ca.order_key,
+            ca.on_setattr,
+            ca.alias,
         )
 
     # Don't use attrs.evolve since fields(Attribute) doesn't work
@@ -2683,6 +2798,188 @@ def default(self, meth):
 _CountingAttr = _add_eq(_add_repr(_CountingAttr))
 
 
+class ClassProps:
+    """
+    Effective class properties as derived from parameters to `attr.s()` or
+    `define()` decorators.
+
+    This is the same data structure that *attrs* uses internally to decide how
+    to construct the final class.
+
+    Warning:
+
+        This feature is currently **experimental** and is not covered by our
+        strict backwards-compatibility guarantees.
+
+
+    Attributes:
+        is_exception (bool):
+            Whether the class is treated as an exception class.
+
+        is_slotted (bool):
+            Whether the class is `slotted <slotted classes>`.
+
+        has_weakref_slot (bool):
+            Whether the class has a slot for weak references.
+
+        is_frozen (bool):
+            Whether the class is frozen.
+
+        kw_only (KeywordOnly):
+            Whether / how the class enforces keyword-only arguments on the
+            ``__init__`` method.
+
+        collected_fields_by_mro (bool):
+            Whether the class fields were collected by method resolution order.
+            That is, correctly but unlike `dataclasses`.
+
+        added_init (bool):
+            Whether the class has an *attrs*-generated ``__init__`` method.
+
+        added_repr (bool):
+            Whether the class has an *attrs*-generated ``__repr__`` method.
+
+        added_eq (bool):
+            Whether the class has *attrs*-generated equality methods.
+
+        added_ordering (bool):
+            Whether the class has *attrs*-generated ordering methods.
+
+        hashability (Hashability): How `hashable <hashing>` the class is.
+
+        added_match_args (bool):
+            Whether the class supports positional `match <match>` over its
+            fields.
+
+        added_str (bool):
+            Whether the class has an *attrs*-generated ``__str__`` method.
+
+        added_pickling (bool):
+            Whether the class has *attrs*-generated ``__getstate__`` and
+            ``__setstate__`` methods for `pickle`.
+
+        on_setattr_hook (Callable[[Any, Attribute[Any], Any], Any] | None):
+            The class's ``__setattr__`` hook.
+
+        field_transformer (Callable[[Attribute[Any]], Attribute[Any]] | None):
+            The class's `field transformers <transform-fields>`.
+
+    .. versionadded:: 25.4.0
+    """
+
+    class Hashability(enum.Enum):
+        """
+        The hashability of a class.
+
+        .. versionadded:: 25.4.0
+        """
+
+        HASHABLE = "hashable"
+        """Write a ``__hash__``."""
+        HASHABLE_CACHED = "hashable_cache"
+        """Write a ``__hash__`` and cache the hash."""
+        UNHASHABLE = "unhashable"
+        """Set ``__hash__`` to ``None``."""
+        LEAVE_ALONE = "leave_alone"
+        """Don't touch ``__hash__``."""
+
+    class KeywordOnly(enum.Enum):
+        """
+        How attributes should be treated regarding keyword-only parameters.
+
+        .. versionadded:: 25.4.0
+        """
+
+        NO = "no"
+        """Attributes are not keyword-only."""
+        YES = "yes"
+        """Attributes in current class without kw_only=False are keyword-only."""
+        FORCE = "force"
+        """All attributes are keyword-only."""
+
+    __slots__ = (  # noqa: RUF023 -- order matters for __init__
+        "is_exception",
+        "is_slotted",
+        "has_weakref_slot",
+        "is_frozen",
+        "kw_only",
+        "collected_fields_by_mro",
+        "added_init",
+        "added_repr",
+        "added_eq",
+        "added_ordering",
+        "hashability",
+        "added_match_args",
+        "added_str",
+        "added_pickling",
+        "on_setattr_hook",
+        "field_transformer",
+    )
+
+    def __init__(
+        self,
+        is_exception,
+        is_slotted,
+        has_weakref_slot,
+        is_frozen,
+        kw_only,
+        collected_fields_by_mro,
+        added_init,
+        added_repr,
+        added_eq,
+        added_ordering,
+        hashability,
+        added_match_args,
+        added_str,
+        added_pickling,
+        on_setattr_hook,
+        field_transformer,
+    ):
+        self.is_exception = is_exception
+        self.is_slotted = is_slotted
+        self.has_weakref_slot = has_weakref_slot
+        self.is_frozen = is_frozen
+        self.kw_only = kw_only
+        self.collected_fields_by_mro = collected_fields_by_mro
+        self.added_init = added_init
+        self.added_repr = added_repr
+        self.added_eq = added_eq
+        self.added_ordering = added_ordering
+        self.hashability = hashability
+        self.added_match_args = added_match_args
+        self.added_str = added_str
+        self.added_pickling = added_pickling
+        self.on_setattr_hook = on_setattr_hook
+        self.field_transformer = field_transformer
+
+    @property
+    def is_hashable(self):
+        return (
+            self.hashability is ClassProps.Hashability.HASHABLE
+            or self.hashability is ClassProps.Hashability.HASHABLE_CACHED
+        )
+
+
+_cas = [
+    Attribute(
+        name=name,
+        default=NOTHING,
+        validator=None,
+        repr=True,
+        cmp=None,
+        eq=True,
+        order=False,
+        hash=True,
+        init=True,
+        inherited=False,
+        alias=_default_init_alias_for(name),
+    )
+    for name in ClassProps.__slots__
+]
+
+ClassProps = _add_eq(_add_repr(ClassProps, attrs=_cas), attrs=_cas)
+
+
 class Factory:
     """
     Stores a factory callable.
@@ -2877,6 +3174,12 @@ def make_class(
         `attrs.define`, you have to pass the hooks yourself: ``make_class(...,
         on_setattr=setters.pipe(setters.convert, setters.validate)``
 
+    .. warning::
+
+        It is *your* duty to ensure that the class name and the attribute names
+        are valid identifiers. ``make_class()`` will *not* validate them for
+        you.
+
     Args:
         name (str): The name for the new class.
 
@@ -2901,7 +3204,11 @@ def make_class(
     .. versionadded:: 17.1.0 *bases*
     .. versionchanged:: 18.1.0 If *attrs* is ordered, the order is retained.
     .. versionchanged:: 23.2.0 *class_body*
+    .. versionchanged:: 25.2.0 Class names can now be unicode.
     """
+    # Class identifiers are converted into the normal form NFKC while parsing
+    name = unicodedata.normalize("NFKC", name)
+
     if isinstance(attrs, dict):
         cls_dict = attrs
     elif isinstance(attrs, (list, tuple)):
@@ -3033,7 +3340,7 @@ def pipe_converter(val):
 
     if not converters:
         # If the converter list is empty, pipe_converter is the identity.
-        A = typing.TypeVar("A")
+        A = TypeVar("A")
         pipe_converter.__annotations__.update({"val": A, "return": A})
     else:
         # Get parameter type from first converter.
diff --git a/libs/attr/_next_gen.py b/libs/attr/_next_gen.py
index 9290664b2d..4ccd0da244 100644
--- a/libs/attr/_next_gen.py
+++ b/libs/attr/_next_gen.py
@@ -17,7 +17,7 @@
     attrib,
     attrs,
 )
-from .exceptions import UnannotatedAttributeError
+from .exceptions import NotAnAttrsClassError, UnannotatedAttributeError
 
 
 def define(
@@ -43,6 +43,7 @@ def define(
     on_setattr=None,
     field_transformer=None,
     match_args=True,
+    force_kw_only=False,
 ):
     r"""
     A class decorator that adds :term:`dunder methods` according to
@@ -76,7 +77,7 @@ def define(
             sensible ``__ne__`` by default, so it *should* be enough to only
             implement ``__eq__`` in most cases).
 
-            Passing True or False` to *init*, *repr*, *eq*, or *hash*
+            Passing :data:`True` or :data:`False` to *init*, *repr*, *eq*, or *hash*
             overrides whatever *auto_detect* would determine.
 
         auto_exc (bool):
@@ -214,8 +215,12 @@ def define(
                 5. Subclasses of a frozen class are frozen too.
 
         kw_only (bool):
-            Make all attributes keyword-only in the generated ``__init__`` (if
-            *init* is False, this parameter is ignored).
+            Make attributes keyword-only in the generated ``__init__`` (if
+            *init* is False, this parameter is ignored).  Attributes that
+            explicitly set ``kw_only=False`` are not affected; base class
+            attributes are also not affected.
+
+            Also see *force_kw_only*.
 
         weakref_slot (bool):
             Make instances weak-referenceable.  This has no effect unless
@@ -244,6 +249,15 @@ def define(
             See also `issue #428
             <https://github.com/python-attrs/attrs/issues/428>`_.
 
+        force_kw_only (bool):
+            A back-compat flag for restoring pre-25.4.0 behavior.  If True and
+            ``kw_only=True``, all attributes are made keyword-only, including
+            base class attributes, and those set to ``kw_only=False`` at the
+            attribute level.  Defaults to False.
+
+            See also `issue #980
+            <https://github.com/python-attrs/attrs/issues/980>`_.
+
         getstate_setstate (bool | None):
             .. note::
 
@@ -319,6 +333,11 @@ def define(
     .. versionadded:: 24.3.0
        Unless already present, a ``__replace__`` method is automatically
        created for `copy.replace` (Python 3.13+ only).
+    .. versionchanged:: 25.4.0
+       *kw_only* now only applies to attributes defined in the current class,
+       and respects attribute-level ``kw_only=False`` settings.
+    .. versionadded:: 25.4.0
+       Added *force_kw_only* to go back to the previous *kw_only* behavior.
 
     .. note::
 
@@ -337,6 +356,7 @@ def define(
         - *auto_exc=True*
         - *auto_detect=True*
         - *order=False*
+        - *force_kw_only=False*
         - Some options that were only relevant on Python 2 or were kept around
           for backwards-compatibility have been removed.
 
@@ -366,6 +386,7 @@ def do_it(cls, auto_attribs):
             on_setattr=on_setattr,
             field_transformer=field_transformer,
             match_args=match_args,
+            force_kw_only=force_kw_only,
         )
 
     def wrap(cls):
@@ -424,7 +445,7 @@ def field(
     type=None,
     converter=None,
     factory=None,
-    kw_only=False,
+    kw_only=None,
     eq=None,
     order=None,
     on_setattr=None,
@@ -550,9 +571,10 @@ def field(
             itself. You can use it as part of your own code or for `static type
             checking <types>`.
 
-        kw_only (bool):
+        kw_only (bool | None):
             Make this attribute keyword-only in the generated ``__init__`` (if
-            ``init`` is False, this parameter is ignored).
+            *init* is False, this parameter is ignored).  If None (default),
+            mirror the setting from `attrs.define`.
 
         on_setattr (~typing.Callable | list[~typing.Callable] | None | ~typing.Literal[attrs.setters.NO_OP]):
             Allows to overwrite the *on_setattr* setting from `attr.s`. If left
@@ -572,6 +594,9 @@ def field(
     .. versionadded:: 23.1.0
        The *type* parameter has been re-added; mostly for `attrs.make_class`.
        Please note that type checkers ignore this metadata.
+    .. versionchanged:: 25.4.0
+       *kw_only* can now be None, and its default is also changed from False to
+       None.
 
     .. seealso::
 
@@ -621,3 +646,29 @@ def astuple(inst, *, recurse=True, filter=None):
     return _astuple(
         inst=inst, recurse=recurse, filter=filter, retain_collection_types=True
     )
+
+
+def inspect(cls):
+    """
+    Inspect the class and return its effective build parameters.
+
+    Warning:
+        This feature is currently **experimental** and is not covered by our
+        strict backwards-compatibility guarantees.
+
+    Args:
+        cls: The *attrs*-decorated class to inspect.
+
+    Returns:
+        The effective build parameters of the class.
+
+    Raises:
+        NotAnAttrsClassError: If the class is not an *attrs*-decorated class.
+
+    .. versionadded:: 25.4.0
+    """
+    try:
+        return cls.__dict__["__attrs_props__"]
+    except KeyError:
+        msg = f"{cls!r} is not an attrs-decorated class."
+        raise NotAnAttrsClassError(msg) from None
diff --git a/libs/attr/_version_info.py b/libs/attr/_version_info.py
index 51a1312f97..27f18884ad 100644
--- a/libs/attr/_version_info.py
+++ b/libs/attr/_version_info.py
@@ -84,3 +84,6 @@ def __lt__(self, other):
         # Since alphabetically "dev0" < "final" < "post1" < "post2", we don't
         # have to do anything special with releaselevel for now.
         return us < them
+
+    def __hash__(self):
+        return hash((self.year, self.minor, self.micro, self.releaselevel))
diff --git a/libs/attr/validators.py b/libs/attr/validators.py
index e7b7552502..837e003b6c 100644
--- a/libs/attr/validators.py
+++ b/libs/attr/validators.py
@@ -361,26 +361,32 @@ def deep_iterable(member_validator, iterable_validator=None):
     A validator that performs deep validation of an iterable.
 
     Args:
-        member_validator: Validator to apply to iterable members.
+        member_validator: Validator(s) to apply to iterable members.
 
         iterable_validator:
-            Validator to apply to iterable itself (optional).
+            Validator(s) to apply to iterable itself (optional).
 
     Raises
         TypeError: if any sub-validators fail
 
     .. versionadded:: 19.1.0
+
+    .. versionchanged:: 25.4.0
+       *member_validator* and *iterable_validator* can now be a list or tuple
+       of validators.
     """
     if isinstance(member_validator, (list, tuple)):
         member_validator = and_(*member_validator)
+    if isinstance(iterable_validator, (list, tuple)):
+        iterable_validator = and_(*iterable_validator)
     return _DeepIterable(member_validator, iterable_validator)
 
 
 @attrs(repr=False, slots=True, unsafe_hash=True)
 class _DeepMapping:
-    key_validator = attrib(validator=is_callable())
-    value_validator = attrib(validator=is_callable())
-    mapping_validator = attrib(default=None, validator=optional(is_callable()))
+    key_validator = attrib(validator=optional(is_callable()))
+    value_validator = attrib(validator=optional(is_callable()))
+    mapping_validator = attrib(validator=optional(is_callable()))
 
     def __call__(self, inst, attr, value):
         """
@@ -390,30 +396,62 @@ def __call__(self, inst, attr, value):
             self.mapping_validator(inst, attr, value)
 
         for key in value:
-            self.key_validator(inst, attr, key)
-            self.value_validator(inst, attr, value[key])
+            if self.key_validator is not None:
+                self.key_validator(inst, attr, key)
+            if self.value_validator is not None:
+                self.value_validator(inst, attr, value[key])
 
     def __repr__(self):
         return f"<deep_mapping validator for objects mapping {self.key_validator!r} to {self.value_validator!r}>"
 
 
-def deep_mapping(key_validator, value_validator, mapping_validator=None):
+def deep_mapping(
+    key_validator=None, value_validator=None, mapping_validator=None
+):
     """
     A validator that performs deep validation of a dictionary.
 
+    All validators are optional, but at least one of *key_validator* or
+    *value_validator* must be provided.
+
     Args:
-        key_validator: Validator to apply to dictionary keys.
+        key_validator: Validator(s) to apply to dictionary keys.
 
-        value_validator: Validator to apply to dictionary values.
+        value_validator: Validator(s) to apply to dictionary values.
 
         mapping_validator:
-            Validator to apply to top-level mapping attribute (optional).
+            Validator(s) to apply to top-level mapping attribute.
 
     .. versionadded:: 19.1.0
 
+    .. versionchanged:: 25.4.0
+       *key_validator* and *value_validator* are now optional, but at least one
+       of them must be provided.
+
+    .. versionchanged:: 25.4.0
+       *key_validator*, *value_validator*, and *mapping_validator* can now be a
+       list or tuple of validators.
+
     Raises:
-        TypeError: if any sub-validators fail
+        TypeError: If any sub-validator fails on validation.
+
+        ValueError:
+            If neither *key_validator* nor *value_validator* is provided on
+            instantiation.
     """
+    if key_validator is None and value_validator is None:
+        msg = (
+            "At least one of key_validator or value_validator must be provided"
+        )
+        raise ValueError(msg)
+
+    if isinstance(key_validator, (list, tuple)):
+        key_validator = and_(*key_validator)
+    if isinstance(value_validator, (list, tuple)):
+        value_validator = and_(*value_validator)
+    if isinstance(mapping_validator, (list, tuple)):
+        mapping_validator = and_(*mapping_validator)
+
     return _DeepMapping(key_validator, value_validator, mapping_validator)
 
 
@@ -485,7 +523,7 @@ def gt(val):
     A validator that raises `ValueError` if the initializer is called with a
     number smaller or equal to *val*.
 
-    The validator uses `operator.ge` to compare the values.
+    The validator uses `operator.gt` to compare the values.
 
     Args:
        val: Exclusive lower bound for values
diff --git a/libs/attr/validators.pyi b/libs/attr/validators.pyi
index a0fdda7c87..36a7e800c2 100644
--- a/libs/attr/validators.pyi
+++ b/libs/attr/validators.pyi
@@ -20,6 +20,9 @@ _T = TypeVar("_T")
 _T1 = TypeVar("_T1")
 _T2 = TypeVar("_T2")
 _T3 = TypeVar("_T3")
+_T4 = TypeVar("_T4")
+_T5 = TypeVar("_T5")
+_T6 = TypeVar("_T6")
 _I = TypeVar("_I", bound=Iterable)
 _K = TypeVar("_K")
 _V = TypeVar("_V")
@@ -63,12 +66,19 @@ def matches_re(
 ) -> _ValidatorType[AnyStr]: ...
 def deep_iterable(
     member_validator: _ValidatorArgType[_T],
-    iterable_validator: _ValidatorType[_I] | None = ...,
+    iterable_validator: _ValidatorArgType[_I] | None = ...,
 ) -> _ValidatorType[_I]: ...
+@overload
+def deep_mapping(
+    key_validator: _ValidatorArgType[_K],
+    value_validator: _ValidatorArgType[_V] | None = ...,
+    mapping_validator: _ValidatorArgType[_M] | None = ...,
+) -> _ValidatorType[_M]: ...
+@overload
 def deep_mapping(
-    key_validator: _ValidatorType[_K],
-    value_validator: _ValidatorType[_V],
-    mapping_validator: _ValidatorType[_M] | None = ...,
+    key_validator: _ValidatorArgType[_K] | None = ...,
+    value_validator: _ValidatorArgType[_V] = ...,
+    mapping_validator: _ValidatorArgType[_M] | None = ...,
 ) -> _ValidatorType[_M]: ...
 def is_callable() -> _ValidatorType[_T]: ...
 def lt(val: _T) -> _ValidatorType[_T]: ...
@@ -83,4 +93,48 @@ def not_(
     msg: str | None = None,
     exc_types: type[Exception] | Iterable[type[Exception]] = ...,
 ) -> _ValidatorType[_T]: ...
-def or_(*validators: _ValidatorType[_T]) -> _ValidatorType[_T]: ...
+@overload
+def or_(
+    __v1: _ValidatorType[_T1],
+    __v2: _ValidatorType[_T2],
+) -> _ValidatorType[_T1 | _T2]: ...
+@overload
+def or_(
+    __v1: _ValidatorType[_T1],
+    __v2: _ValidatorType[_T2],
+    __v3: _ValidatorType[_T3],
+) -> _ValidatorType[_T1 | _T2 | _T3]: ...
+@overload
+def or_(
+    __v1: _ValidatorType[_T1],
+    __v2: _ValidatorType[_T2],
+    __v3: _ValidatorType[_T3],
+    __v4: _ValidatorType[_T4],
+) -> _ValidatorType[_T1 | _T2 | _T3 | _T4]: ...
+@overload
+def or_(
+    __v1: _ValidatorType[_T1],
+    __v2: _ValidatorType[_T2],
+    __v3: _ValidatorType[_T3],
+    __v4: _ValidatorType[_T4],
+    __v5: _ValidatorType[_T5],
+) -> _ValidatorType[_T1 | _T2 | _T3 | _T4 | _T5]: ...
+@overload
+def or_(
+    __v1: _ValidatorType[_T1],
+    __v2: _ValidatorType[_T2],
+    __v3: _ValidatorType[_T3],
+    __v4: _ValidatorType[_T4],
+    __v5: _ValidatorType[_T5],
+    __v6: _ValidatorType[_T6],
+) -> _ValidatorType[_T1 | _T2 | _T3 | _T4 | _T5 | _T6]: ...
+@overload
+def or_(
+    __v1: _ValidatorType[Any],
+    __v2: _ValidatorType[Any],
+    __v3: _ValidatorType[Any],
+    __v4: _ValidatorType[Any],
+    __v5: _ValidatorType[Any],
+    __v6: _ValidatorType[Any],
+    *validators: _ValidatorType[Any],
+) -> _ValidatorType[Any]: ...
diff --git a/libs/attrs-24.3.0.dist-info/METADATA b/libs/attrs-24.3.0.dist-info/METADATA
deleted file mode 100644
index e994a6cae1..0000000000
--- a/libs/attrs-24.3.0.dist-info/METADATA
+++ /dev/null
@@ -1,246 +0,0 @@
-Metadata-Version: 2.4
-Name: attrs
-Version: 24.3.0
-Summary: Classes Without Boilerplate
-Project-URL: Documentation, https://www.attrs.org/
-Project-URL: Changelog, https://www.attrs.org/en/stable/changelog.html
-Project-URL: GitHub, https://github.com/python-attrs/attrs
-Project-URL: Funding, https://github.com/sponsors/hynek
-Project-URL: Tidelift, https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi
-Author-email: Hynek Schlawack <hs@ox.cx>
-License-Expression: MIT
-License-File: LICENSE
-Keywords: attribute,boilerplate,class
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Typing :: Typed
-Requires-Python: >=3.8
-Provides-Extra: benchmark
-Requires-Dist: cloudpickle; (platform_python_implementation == 'CPython') and extra == 'benchmark'
-Requires-Dist: hypothesis; extra == 'benchmark'
-Requires-Dist: mypy>=1.11.1; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'benchmark'
-Requires-Dist: pympler; extra == 'benchmark'
-Requires-Dist: pytest-codspeed; extra == 'benchmark'
-Requires-Dist: pytest-mypy-plugins; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'benchmark'
-Requires-Dist: pytest-xdist[psutil]; extra == 'benchmark'
-Requires-Dist: pytest>=4.3.0; extra == 'benchmark'
-Provides-Extra: cov
-Requires-Dist: cloudpickle; (platform_python_implementation == 'CPython') and extra == 'cov'
-Requires-Dist: coverage[toml]>=5.3; extra == 'cov'
-Requires-Dist: hypothesis; extra == 'cov'
-Requires-Dist: mypy>=1.11.1; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'cov'
-Requires-Dist: pympler; extra == 'cov'
-Requires-Dist: pytest-mypy-plugins; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'cov'
-Requires-Dist: pytest-xdist[psutil]; extra == 'cov'
-Requires-Dist: pytest>=4.3.0; extra == 'cov'
-Provides-Extra: dev
-Requires-Dist: cloudpickle; (platform_python_implementation == 'CPython') and extra == 'dev'
-Requires-Dist: hypothesis; extra == 'dev'
-Requires-Dist: mypy>=1.11.1; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'dev'
-Requires-Dist: pre-commit-uv; extra == 'dev'
-Requires-Dist: pympler; extra == 'dev'
-Requires-Dist: pytest-mypy-plugins; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'dev'
-Requires-Dist: pytest-xdist[psutil]; extra == 'dev'
-Requires-Dist: pytest>=4.3.0; extra == 'dev'
-Provides-Extra: docs
-Requires-Dist: cogapp; extra == 'docs'
-Requires-Dist: furo; extra == 'docs'
-Requires-Dist: myst-parser; extra == 'docs'
-Requires-Dist: sphinx; extra == 'docs'
-Requires-Dist: sphinx-notfound-page; extra == 'docs'
-Requires-Dist: sphinxcontrib-towncrier; extra == 'docs'
-Requires-Dist: towncrier<24.7; extra == 'docs'
-Provides-Extra: tests
-Requires-Dist: cloudpickle; (platform_python_implementation == 'CPython') and extra == 'tests'
-Requires-Dist: hypothesis; extra == 'tests'
-Requires-Dist: mypy>=1.11.1; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'tests'
-Requires-Dist: pympler; extra == 'tests'
-Requires-Dist: pytest-mypy-plugins; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'tests'
-Requires-Dist: pytest-xdist[psutil]; extra == 'tests'
-Requires-Dist: pytest>=4.3.0; extra == 'tests'
-Provides-Extra: tests-mypy
-Requires-Dist: mypy>=1.11.1; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'tests-mypy'
-Requires-Dist: pytest-mypy-plugins; (platform_python_implementation == 'CPython' and python_version >= '3.10') and extra == 'tests-mypy'
-Description-Content-Type: text/markdown
-
-<p align="center">
-  <a href="https://www.attrs.org/">
-    <img src="https://raw.githubusercontent.com/python-attrs/attrs/main/docs/_static/attrs_logo.svg" width="35%" alt="attrs" />
-  </a>
-</p>
-
-
-*attrs* is the Python package that will bring back the **joy** of **writing classes** by relieving you from the drudgery of implementing object protocols (aka [dunder methods](https://www.attrs.org/en/latest/glossary.html#term-dunder-methods)).
-[Trusted by NASA](https://docs.github.com/en/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile#list-of-qualifying-repositories-for-mars-2020-helicopter-contributor-achievement) for Mars missions since 2020!
-
-Its main goal is to help you to write **concise** and **correct** software without slowing down your code.
-
-
-## Sponsors
-
-*attrs* would not be possible without our [amazing sponsors](https://github.com/sponsors/hynek).
-Especially those generously supporting us at the *The Organization* tier and higher:
-
-<!-- sponsor-break-begin -->
-
-<p align="center">
-
-<!-- [[[cog
-import pathlib, tomllib
-
-for sponsor in tomllib.loads(pathlib.Path("pyproject.toml").read_text())["tool"]["sponcon"]["sponsors"]:
-      print(f'<a href="{sponsor["url"]}"><img title="{sponsor["title"]}" src="https://www.attrs.org/en/24.3.0/_static/sponsors/{sponsor["img"]}" width="190" /></a>')
-]]] -->
-<a href="https://www.variomedia.de/"><img title="Variomedia AG" src="https://www.attrs.org/en/24.3.0/_static/sponsors/Variomedia.svg" width="190" /></a>
-<a href="https://tidelift.com/?utm_source=lifter&utm_medium=referral&utm_campaign=hynek"><img title="Tidelift" src="https://www.attrs.org/en/24.3.0/_static/sponsors/Tidelift.svg" width="190" /></a>
-<a href="https://klaviyo.com/"><img title="Klaviyo" src="https://www.attrs.org/en/24.3.0/_static/sponsors/Klaviyo.svg" width="190" /></a>
-<a href="https://www.emsys-renewables.com/"><img title="emsys renewables" src="https://www.attrs.org/en/24.3.0/_static/sponsors/emsys-renewables.svg" width="190" /></a>
-<a href="https://filepreviews.io/"><img title="FilePreviews" src="https://www.attrs.org/en/24.3.0/_static/sponsors/FilePreviews.svg" width="190" /></a>
-<a href="https://polar.sh/"><img title="Polar" src="https://www.attrs.org/en/24.3.0/_static/sponsors/Polar.svg" width="190" /></a>
-<!-- [[[end]]] -->
-
-</p>
-
-<!-- sponsor-break-end -->
-
-<p align="center">
-   <strong>Please consider <a href="https://github.com/sponsors/hynek">joining them</a> to help make <em>attrs</em>โ€™s maintenance more sustainable!</strong>
-</p>
-
-<!-- teaser-end -->
-
-## Example
-
-*attrs* gives you a class decorator and a way to declaratively define the attributes on that class:
-
-<!-- code-begin -->
-
-```pycon
->>> from attrs import asdict, define, make_class, Factory
-
->>> @define
-... class SomeClass:
-...     a_number: int = 42
-...     list_of_numbers: list[int] = Factory(list)
-...
-...     def hard_math(self, another_number):
-...         return self.a_number + sum(self.list_of_numbers) * another_number
-
-
->>> sc = SomeClass(1, [1, 2, 3])
->>> sc
-SomeClass(a_number=1, list_of_numbers=[1, 2, 3])
-
->>> sc.hard_math(3)
-19
->>> sc == SomeClass(1, [1, 2, 3])
-True
->>> sc != SomeClass(2, [3, 2, 1])
-True
-
->>> asdict(sc)
-{'a_number': 1, 'list_of_numbers': [1, 2, 3]}
-
->>> SomeClass()
-SomeClass(a_number=42, list_of_numbers=[])
-
->>> C = make_class("C", ["a", "b"])
->>> C("foo", "bar")
-C(a='foo', b='bar')
-```
-
-After *declaring* your attributes, *attrs* gives you:
-
-- a concise and explicit overview of the class's attributes,
-- a nice human-readable `__repr__`,
-- equality-checking methods,
-- an initializer,
-- and much more,
-
-*without* writing dull boilerplate code again and again and *without* runtime performance penalties.
-
----
-
-This example uses *attrs*'s modern APIs that have been introduced in version 20.1.0, and the *attrs* package import name that has been added in version 21.3.0.
-The classic APIs (`@attr.s`, `attr.ib`, plus their serious-business aliases) and the `attr` package import name will remain **indefinitely**.
-
-Check out [*On The Core API Names*](https://www.attrs.org/en/latest/names.html) for an in-depth explanation!
-
-
-### Hate Type Annotations!?
-
-No problem!
-Types are entirely **optional** with *attrs*.
-Simply assign `attrs.field()` to the attributes instead of annotating them with types:
-
-```python
-from attrs import define, field
-
-@define
-class SomeClass:
-    a_number = field(default=42)
-    list_of_numbers = field(factory=list)
-```
-
-
-## Data Classes
-
-On the tin, *attrs* might remind you of `dataclasses` (and indeed, `dataclasses` [are a descendant](https://hynek.me/articles/import-attrs/) of *attrs*).
-In practice it does a lot more and is more flexible.
-For instance, it allows you to define [special handling of NumPy arrays for equality checks](https://www.attrs.org/en/stable/comparison.html#customization), allows more ways to [plug into the initialization process](https://www.attrs.org/en/stable/init.html#hooking-yourself-into-initialization), has a replacement for `__init_subclass__`, and allows for stepping through the generated methods using a debugger.
-
-For more details, please refer to our [comparison page](https://www.attrs.org/en/stable/why.html#data-classes), but generally speaking, we are more likely to commit crimes against nature to make things work that one would expect to work, but that are quite complicated in practice.
-
-
-## Project Information
-
-- [**Changelog**](https://www.attrs.org/en/stable/changelog.html)
-- [**Documentation**](https://www.attrs.org/)
-- [**PyPI**](https://pypi.org/project/attrs/)
-- [**Source Code**](https://github.com/python-attrs/attrs)
-- [**Contributing**](https://github.com/python-attrs/attrs/blob/main/.github/CONTRIBUTING.md)
-- [**Third-party Extensions**](https://github.com/python-attrs/attrs/wiki/Extensions-to-attrs)
-- **Get Help**: use the `python-attrs` tag on [Stack Overflow](https://stackoverflow.com/questions/tagged/python-attrs)
-
-
-### *attrs* for Enterprise
-
-Available as part of the [Tidelift Subscription](https://tidelift.com/?utm_source=lifter&utm_medium=referral&utm_campaign=hynek).
-
-The maintainers of *attrs* and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source packages you use to build your applications.
-Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you use.
-
-## Release Information
-
-### Backwards-incompatible Changes
-
-- Python 3.7 has been dropped.
-  [#1340](https://github.com/python-attrs/attrs/issues/1340)
-
-
-### Changes
-
-- Introduce `attrs.NothingType`, for annotating types consistent with `attrs.NOTHING`.
-  [#1358](https://github.com/python-attrs/attrs/issues/1358)
-- Allow mutating `__suppress_context__` and `__notes__` on frozen exceptions.
-  [#1365](https://github.com/python-attrs/attrs/issues/1365)
-- `attrs.converters.optional()` works again when taking `attrs.converters.pipe()` or another Converter as its argument.
-  [#1372](https://github.com/python-attrs/attrs/issues/1372)
-- *attrs* instances now support [`copy.replace()`](https://docs.python.org/3/library/copy.html#copy.replace).
-  [#1383](https://github.com/python-attrs/attrs/issues/1383)
-- `attrs.validators.instance_of()`'s type hints now allow for union types.
-  For example: `instance_of(str | int)`
-  [#1385](https://github.com/python-attrs/attrs/issues/1385)
-
-
-
----
-
-[Full changelog โ†’](https://www.attrs.org/en/stable/changelog.html)
diff --git a/libs/attrs-24.3.0.dist-info/RECORD b/libs/attrs-24.3.0.dist-info/RECORD
deleted file mode 100644
index 6d302303f9..0000000000
--- a/libs/attrs-24.3.0.dist-info/RECORD
+++ /dev/null
@@ -1,37 +0,0 @@
-attr/__init__.py,sha256=fOYIvt1eGSqQre4uCS3sJWKZ0mwAuC8UD6qba5OS9_U,2057
-attr/__init__.pyi,sha256=QIXnnHPoucmDWkbpNsWTP-cgJ1bn8le7DjyRa_wYdew,11281
-attr/_cmp.py,sha256=3umHiBtgsEYtvNP_8XrQwTCdFoZIX4DEur76N-2a3X8,4123
-attr/_cmp.pyi,sha256=U-_RU_UZOyPUEQzXE6RMYQQcjkZRY25wTH99sN0s7MM,368
-attr/_compat.py,sha256=4hlXbWhdDjQCDK6FKF1EgnZ3POiHgtpp54qE0nxaGHg,2704
-attr/_config.py,sha256=dGq3xR6fgZEF6UBt_L0T-eUHIB4i43kRmH0P28sJVw8,843
-attr/_funcs.py,sha256=5-tUKJtp3h5El55EcDl6GWXFp68fT8D8U7uCRN6497I,15854
-attr/_make.py,sha256=orKSf6C-B1eZfpat4lbAtxvmSyE_yxlG8zY9115ufWk,94157
-attr/_next_gen.py,sha256=7FRkbtl_N017SuBhf_Vw3mw2c2pGZhtCGOzadgz7tp4,24395
-attr/_typing_compat.pyi,sha256=XDP54TUn-ZKhD62TOQebmzrwFyomhUCoGRpclb6alRA,469
-attr/_version_info.py,sha256=exSqb3b5E-fMSsgZAlEw9XcLpEgobPORCZpcaEglAM4,2121
-attr/_version_info.pyi,sha256=x_M3L3WuB7r_ULXAWjx959udKQ4HLB8l-hsc1FDGNvk,209
-attr/converters.py,sha256=GlDeOzPeTFgeBBLbj9G57Ez5lAk68uhSALRYJ_exe84,3861
-attr/converters.pyi,sha256=orU2bff-VjQa2kMDyvnMQV73oJT2WRyQuw4ZR1ym1bE,643
-attr/exceptions.py,sha256=HRFq4iybmv7-DcZwyjl6M1euM2YeJVK_hFxuaBGAngI,1977
-attr/exceptions.pyi,sha256=zZq8bCUnKAy9mDtBEw42ZhPhAUIHoTKedDQInJD883M,539
-attr/filters.py,sha256=ZBiKWLp3R0LfCZsq7X11pn9WX8NslS2wXM4jsnLOGc8,1795
-attr/filters.pyi,sha256=3J5BG-dTxltBk1_-RuNRUHrv2qu1v8v4aDNAQ7_mifA,208
-attr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-attr/setters.py,sha256=5-dcT63GQK35ONEzSgfXCkbB7pPkaR-qv15mm4PVSzQ,1617
-attr/setters.pyi,sha256=NnVkaFU1BB4JB8E4JuXyrzTUgvtMpj8p3wBdJY7uix4,584
-attr/validators.py,sha256=WaB1HLAHHqRHWsrv_K9H-sJ7ESil3H3Cmv2d8TtVZx4,20046
-attr/validators.pyi,sha256=s2WhKPqskxbsckJfKk8zOuuB088GfgpyxcCYSNFLqNU,2603
-attrs-24.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-attrs-24.3.0.dist-info/METADATA,sha256=f9hhECeAUyS7iewHPRuMLDy1tpJ6vyy8R_TKUnCmiA8,11654
-attrs-24.3.0.dist-info/RECORD,,
-attrs-24.3.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-attrs-24.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-attrs-24.3.0.dist-info/licenses/LICENSE,sha256=iCEVyV38KvHutnFPjsbVy8q_Znyv-HKfQkINpj9xTp8,1109
-attrs/__init__.py,sha256=qeQJZ4O08yczSn840v9bYOaZyRE81WsVi-QCrY3krCU,1107
-attrs/__init__.pyi,sha256=nZmInocjM7tHV4AQw0vxO_fo6oJjL_PonlV9zKKW8DY,7931
-attrs/converters.py,sha256=8kQljrVwfSTRu8INwEk8SI0eGrzmWftsT7rM0EqyohM,76
-attrs/exceptions.py,sha256=ACCCmg19-vDFaDPY9vFl199SPXCQMN_bENs4DALjzms,76
-attrs/filters.py,sha256=VOUMZug9uEU6dUuA0dF1jInUK0PL3fLgP0VBS5d-CDE,73
-attrs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-attrs/setters.py,sha256=eL1YidYQV3T2h9_SYIZSZR1FAcHGb1TuCTy0E0Lv2SU,73
-attrs/validators.py,sha256=xcy6wD5TtTkdCG1f4XWbocPSO0faBjk5IfVJfP6SUj0,76
diff --git a/libs/attrs-24.3.0.dist-info/WHEEL b/libs/attrs-24.3.0.dist-info/WHEEL
deleted file mode 100644
index 12228d414b..0000000000
--- a/libs/attrs-24.3.0.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.27.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/MarkupSafe-2.1.5.dist-info/INSTALLER b/libs/attrs-25.4.0.dist-info/INSTALLER
similarity index 100%
rename from libs/MarkupSafe-2.1.5.dist-info/INSTALLER
rename to libs/attrs-25.4.0.dist-info/INSTALLER
diff --git a/libs/attrs-25.4.0.dist-info/METADATA b/libs/attrs-25.4.0.dist-info/METADATA
new file mode 100644
index 0000000000..51128bb96f
--- /dev/null
+++ b/libs/attrs-25.4.0.dist-info/METADATA
@@ -0,0 +1,235 @@
+Metadata-Version: 2.4
+Name: attrs
+Version: 25.4.0
+Summary: Classes Without Boilerplate
+Project-URL: Documentation, https://www.attrs.org/
+Project-URL: Changelog, https://www.attrs.org/en/stable/changelog.html
+Project-URL: GitHub, https://github.com/python-attrs/attrs
+Project-URL: Funding, https://github.com/sponsors/hynek
+Project-URL: Tidelift, https://tidelift.com/subscription/pkg/pypi-attrs?utm_source=pypi-attrs&utm_medium=pypi
+Author-email: Hynek Schlawack <hs@ox.cx>
+License-Expression: MIT
+License-File: LICENSE
+Keywords: attribute,boilerplate,class
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Typing :: Typed
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+
+<p align="center">
+  <a href="https://www.attrs.org/">
+    <img src="https://raw.githubusercontent.com/python-attrs/attrs/main/docs/_static/attrs_logo.svg" width="35%" alt="attrs" />
+  </a>
+</p>
+
+
+*attrs* is the Python package that will bring back the **joy** of **writing classes** by relieving you from the drudgery of implementing object protocols (aka [dunder methods](https://www.attrs.org/en/latest/glossary.html#term-dunder-methods)).
+Trusted by NASA for [Mars missions since 2020](https://github.com/readme/featured/nasa-ingenuity-helicopter)!
+
+Its main goal is to help you to write **concise** and **correct** software without slowing down your code.
+
+
+## Sponsors
+
+*attrs* would not be possible without our [amazing sponsors](https://github.com/sponsors/hynek).
+Especially those generously supporting us at the *The Organization* tier and higher:
+
+<!-- sponsor-break-begin -->
+
+<p align="center">
+
+<!-- [[[cog
+import pathlib, tomllib
+
+for sponsor in tomllib.loads(pathlib.Path("pyproject.toml").read_text())["tool"]["sponcon"]["sponsors"]:
+      print(f'<a href="{sponsor["url"]}"><img title="{sponsor["title"]}" src="https://www.attrs.org/en/25.4.0/_static/sponsors/{sponsor["img"]}" width="190" /></a>')
+]]] -->
+<a href="https://www.variomedia.de/"><img title="Variomedia AG" src="https://www.attrs.org/en/25.4.0/_static/sponsors/Variomedia.svg" width="190" /></a>
+<a href="https://tidelift.com/?utm_source=lifter&utm_medium=referral&utm_campaign=hynek"><img title="Tidelift" src="https://www.attrs.org/en/25.4.0/_static/sponsors/Tidelift.svg" width="190" /></a>
+<a href="https://privacy-solutions.org/"><img title="Privacy Solutions" src="https://www.attrs.org/en/25.4.0/_static/sponsors/Privacy-Solutions.svg" width="190" /></a>
+<a href="https://filepreviews.io/"><img title="FilePreviews" src="https://www.attrs.org/en/25.4.0/_static/sponsors/FilePreviews.svg" width="190" /></a>
+<a href="https://polar.sh/"><img title="Polar" src="https://www.attrs.org/en/25.4.0/_static/sponsors/Polar.svg" width="190" /></a>
+<!-- [[[end]]] -->
+
+</p>
+
+<!-- sponsor-break-end -->
+
+<p align="center">
+   <strong>Please consider <a href="https://github.com/sponsors/hynek">joining them</a> to help make <em>attrs</em>โ€™s maintenance more sustainable!</strong>
+</p>
+
+<!-- teaser-end -->
+
+## Example
+
+*attrs* gives you a class decorator and a way to declaratively define the attributes on that class:
+
+<!-- code-begin -->
+
+```pycon
+>>> from attrs import asdict, define, make_class, Factory
+
+>>> @define
+... class SomeClass:
+...     a_number: int = 42
+...     list_of_numbers: list[int] = Factory(list)
+...
+...     def hard_math(self, another_number):
+...         return self.a_number + sum(self.list_of_numbers) * another_number
+
+
+>>> sc = SomeClass(1, [1, 2, 3])
+>>> sc
+SomeClass(a_number=1, list_of_numbers=[1, 2, 3])
+
+>>> sc.hard_math(3)
+19
+>>> sc == SomeClass(1, [1, 2, 3])
+True
+>>> sc != SomeClass(2, [3, 2, 1])
+True
+
+>>> asdict(sc)
+{'a_number': 1, 'list_of_numbers': [1, 2, 3]}
+
+>>> SomeClass()
+SomeClass(a_number=42, list_of_numbers=[])
+
+>>> C = make_class("C", ["a", "b"])
+>>> C("foo", "bar")
+C(a='foo', b='bar')
+```
+
+After *declaring* your attributes, *attrs* gives you:
+
+- a concise and explicit overview of the class's attributes,
+- a nice human-readable `__repr__`,
+- equality-checking methods,
+- an initializer,
+- and much more,
+
+*without* writing dull boilerplate code again and again and *without* runtime performance penalties.
+
+---
+
+This example uses *attrs*'s modern APIs that have been introduced in version 20.1.0, and the *attrs* package import name that has been added in version 21.3.0.
+The classic APIs (`@attr.s`, `attr.ib`, plus their serious-business aliases) and the `attr` package import name will remain **indefinitely**.
+
+Check out [*On The Core API Names*](https://www.attrs.org/en/latest/names.html) for an in-depth explanation!
+
+
+### Hate Type Annotations!?
+
+No problem!
+Types are entirely **optional** with *attrs*.
+Simply assign `attrs.field()` to the attributes instead of annotating them with types:
+
+```python
+from attrs import define, field
+
+@define
+class SomeClass:
+    a_number = field(default=42)
+    list_of_numbers = field(factory=list)
+```
+
+
+## Data Classes
+
+On the tin, *attrs* might remind you of `dataclasses` (and indeed, `dataclasses` [are a descendant](https://hynek.me/articles/import-attrs/) of *attrs*).
+In practice it does a lot more and is more flexible.
+For instance, it allows you to define [special handling of NumPy arrays for equality checks](https://www.attrs.org/en/stable/comparison.html#customization), allows more ways to [plug into the initialization process](https://www.attrs.org/en/stable/init.html#hooking-yourself-into-initialization), has a replacement for `__init_subclass__`, and allows for stepping through the generated methods using a debugger.
+
+For more details, please refer to our [comparison page](https://www.attrs.org/en/stable/why.html#data-classes), but generally speaking, we are more likely to commit crimes against nature to make things work that one would expect to work, but that are quite complicated in practice.
+
+
+## Project Information
+
+- [**Changelog**](https://www.attrs.org/en/stable/changelog.html)
+- [**Documentation**](https://www.attrs.org/)
+- [**PyPI**](https://pypi.org/project/attrs/)
+- [**Source Code**](https://github.com/python-attrs/attrs)
+- [**Contributing**](https://github.com/python-attrs/attrs/blob/main/.github/CONTRIBUTING.md)
+- [**Third-party Extensions**](https://github.com/python-attrs/attrs/wiki/Extensions-to-attrs)
+- **Get Help**: use the `python-attrs` tag on [Stack Overflow](https://stackoverflow.com/questions/tagged/python-attrs)
+
+
+### *attrs* for Enterprise
+
+Available as part of the [Tidelift Subscription](https://tidelift.com/?utm_source=lifter&utm_medium=referral&utm_campaign=hynek).
+
+The maintainers of *attrs* and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source packages you use to build your applications.
+Save time, reduce risk, and improve code health, while paying the maintainers of the exact packages you use.
+
+## Release Information
+
+### Backwards-incompatible Changes
+
+- Class-level `kw_only=True` behavior is now consistent with `dataclasses`.
+
+  Previously, a class that sets `kw_only=True` makes all attributes keyword-only, including those from base classes.
+  If an attribute sets `kw_only=False`, that setting is ignored, and it is still made keyword-only.
+
+  Now, only the attributes defined in that class that doesn't explicitly set `kw_only=False` are made keyword-only.
+
+  This shouldn't be a problem for most users, unless you have a pattern like this:
+
+  ```python
+  @attrs.define(kw_only=True)
+  class Base:
+      a: int
+      b: int = attrs.field(default=1, kw_only=False)
+
+  @attrs.define
+  class Subclass(Base):
+      c: int
+  ```
+
+  Here, we have a `kw_only=True` *attrs* class (`Base`) with an attribute that sets `kw_only=False` and has a default (`Base.b`), and then create a subclass (`Subclass`) with required arguments (`Subclass.c`).
+  Previously this would work, since it would make `Base.b` keyword-only, but now this fails since `Base.b` is positional, and we have a required positional argument (`Subclass.c`) following another argument with defaults.
+  [#1457](https://github.com/python-attrs/attrs/issues/1457)
+
+
+### Changes
+
+- Values passed to the `__init__()` method of `attrs` classes are now correctly passed to `__attrs_pre_init__()` instead of their default values (in cases where *kw_only* was not specified).
+  [#1427](https://github.com/python-attrs/attrs/issues/1427)
+- Added support for Python 3.14 and [PEP 749](https://peps.python.org/pep-0749/).
+  [#1446](https://github.com/python-attrs/attrs/issues/1446),
+  [#1451](https://github.com/python-attrs/attrs/issues/1451)
+- `attrs.validators.deep_mapping()` now allows to leave out either *key_validator* xor *value_validator*.
+  [#1448](https://github.com/python-attrs/attrs/issues/1448)
+- `attrs.validators.deep_iterator()` and `attrs.validators.deep_mapping()` now accept lists and tuples for all validators and wrap them into a `attrs.validators.and_()`.
+  [#1449](https://github.com/python-attrs/attrs/issues/1449)
+- Added a new **experimental** way to inspect classes:
+
+  `attrs.inspect(cls)` returns the _effective_ class-wide parameters that were used by *attrs* to construct the class.
+
+  The returned class is the same data structure that *attrs* uses internally to decide how to construct the final class.
+  [#1454](https://github.com/python-attrs/attrs/issues/1454)
+- Fixed annotations for `attrs.field(converter=...)`.
+  Previously, a `tuple` of converters was only accepted if it had exactly one element.
+  [#1461](https://github.com/python-attrs/attrs/issues/1461)
+- The performance of `attrs.asdict()` has been improved by 45โ€“260%.
+  [#1463](https://github.com/python-attrs/attrs/issues/1463)
+- The performance of `attrs.astuple()` has been improved by 49โ€“270%.
+  [#1469](https://github.com/python-attrs/attrs/issues/1469)
+- The type annotation for `attrs.validators.or_()` now allows for different types of validators.
+
+  This was only an issue on Pyright.
+  [#1474](https://github.com/python-attrs/attrs/issues/1474)
+
+
+
+---
+
+[Full changelog โ†’](https://www.attrs.org/en/stable/changelog.html)
diff --git a/libs/attrs-25.4.0.dist-info/RECORD b/libs/attrs-25.4.0.dist-info/RECORD
new file mode 100644
index 0000000000..e902531fa8
--- /dev/null
+++ b/libs/attrs-25.4.0.dist-info/RECORD
@@ -0,0 +1,37 @@
+attr/__init__.py,sha256=fOYIvt1eGSqQre4uCS3sJWKZ0mwAuC8UD6qba5OS9_U,2057
+attr/__init__.pyi,sha256=IZkzIjvtbRqDWGkDBIF9dd12FgDa379JYq3GHnVOvFQ,11309
+attr/_cmp.py,sha256=3Nn1TjxllUYiX_nJoVnEkXoDk0hM1DYKj5DE7GZe4i0,4117
+attr/_cmp.pyi,sha256=U-_RU_UZOyPUEQzXE6RMYQQcjkZRY25wTH99sN0s7MM,368
+attr/_compat.py,sha256=x0g7iEUOnBVJC72zyFCgb1eKqyxS-7f2LGnNyZ_r95s,2829
+attr/_config.py,sha256=dGq3xR6fgZEF6UBt_L0T-eUHIB4i43kRmH0P28sJVw8,843
+attr/_funcs.py,sha256=Ix5IETTfz5F01F-12MF_CSFomIn2h8b67EVVz2gCtBE,16479
+attr/_make.py,sha256=NRJDGS8syg2h3YNflVNoK2FwR3CpdSZxx8M6lacwljA,104141
+attr/_next_gen.py,sha256=BQtCUlzwg2gWHTYXBQvrEYBnzBUrDvO57u0Py6UCPhc,26274
+attr/_typing_compat.pyi,sha256=XDP54TUn-ZKhD62TOQebmzrwFyomhUCoGRpclb6alRA,469
+attr/_version_info.py,sha256=w4R-FYC3NK_kMkGUWJlYP4cVAlH9HRaC-um3fcjYkHM,2222
+attr/_version_info.pyi,sha256=x_M3L3WuB7r_ULXAWjx959udKQ4HLB8l-hsc1FDGNvk,209
+attr/converters.py,sha256=GlDeOzPeTFgeBBLbj9G57Ez5lAk68uhSALRYJ_exe84,3861
+attr/converters.pyi,sha256=orU2bff-VjQa2kMDyvnMQV73oJT2WRyQuw4ZR1ym1bE,643
+attr/exceptions.py,sha256=HRFq4iybmv7-DcZwyjl6M1euM2YeJVK_hFxuaBGAngI,1977
+attr/exceptions.pyi,sha256=zZq8bCUnKAy9mDtBEw42ZhPhAUIHoTKedDQInJD883M,539
+attr/filters.py,sha256=ZBiKWLp3R0LfCZsq7X11pn9WX8NslS2wXM4jsnLOGc8,1795
+attr/filters.pyi,sha256=3J5BG-dTxltBk1_-RuNRUHrv2qu1v8v4aDNAQ7_mifA,208
+attr/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+attr/setters.py,sha256=5-dcT63GQK35ONEzSgfXCkbB7pPkaR-qv15mm4PVSzQ,1617
+attr/setters.pyi,sha256=NnVkaFU1BB4JB8E4JuXyrzTUgvtMpj8p3wBdJY7uix4,584
+attr/validators.py,sha256=1BnYGTuYvSucGEI4ju-RPNJteVzG0ZlfWpJiWoSFHQ8,21458
+attr/validators.pyi,sha256=ftmW3m4KJ3pQcIXAj-BejT7BY4ZfqrC1G-5W7XvoPds,4082
+attrs-25.4.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+attrs-25.4.0.dist-info/METADATA,sha256=2Rerxj7agcMRxiwdkt6lC2guqHAmkGKCH13nWWK7ZoQ,10473
+attrs-25.4.0.dist-info/RECORD,,
+attrs-25.4.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+attrs-25.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+attrs-25.4.0.dist-info/licenses/LICENSE,sha256=iCEVyV38KvHutnFPjsbVy8q_Znyv-HKfQkINpj9xTp8,1109
+attrs/__init__.py,sha256=RxaAZNwYiEh-fcvHLZNpQ_DWKni73M_jxEPEftiq1Zc,1183
+attrs/__init__.pyi,sha256=2gV79g9UxJppGSM48hAZJ6h_MHb70dZoJL31ZNJeZYI,9416
+attrs/converters.py,sha256=8kQljrVwfSTRu8INwEk8SI0eGrzmWftsT7rM0EqyohM,76
+attrs/exceptions.py,sha256=ACCCmg19-vDFaDPY9vFl199SPXCQMN_bENs4DALjzms,76
+attrs/filters.py,sha256=VOUMZug9uEU6dUuA0dF1jInUK0PL3fLgP0VBS5d-CDE,73
+attrs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+attrs/setters.py,sha256=eL1YidYQV3T2h9_SYIZSZR1FAcHGb1TuCTy0E0Lv2SU,73
+attrs/validators.py,sha256=xcy6wD5TtTkdCG1f4XWbocPSO0faBjk5IfVJfP6SUj0,76
diff --git a/libs/MarkupSafe-2.1.5.dist-info/REQUESTED b/libs/attrs-25.4.0.dist-info/REQUESTED
similarity index 100%
rename from libs/MarkupSafe-2.1.5.dist-info/REQUESTED
rename to libs/attrs-25.4.0.dist-info/REQUESTED
diff --git a/libs/attrs-25.4.0.dist-info/WHEEL b/libs/attrs-25.4.0.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/attrs-25.4.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/attrs-24.3.0.dist-info/licenses/LICENSE b/libs/attrs-25.4.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/attrs-24.3.0.dist-info/licenses/LICENSE
rename to libs/attrs-25.4.0.dist-info/licenses/LICENSE
diff --git a/libs/attrs/__init__.py b/libs/attrs/__init__.py
index e8023ff6c5..dc1ce4b974 100644
--- a/libs/attrs/__init__.py
+++ b/libs/attrs/__init__.py
@@ -22,7 +22,8 @@
     resolve_types,
     validate,
 )
-from attr._next_gen import asdict, astuple
+from attr._make import ClassProps
+from attr._next_gen import asdict, astuple, inspect
 
 from . import converters, exceptions, filters, setters, validators
 
@@ -31,6 +32,7 @@
     "NOTHING",
     "Attribute",
     "AttrsInstance",
+    "ClassProps",
     "Converter",
     "Factory",
     "NothingType",
@@ -58,6 +60,7 @@
     "filters",
     "frozen",
     "has",
+    "inspect",
     "make_class",
     "mutable",
     "resolve_types",
diff --git a/libs/attrs/__init__.pyi b/libs/attrs/__init__.pyi
index 648fa7a344..6364bac4ea 100644
--- a/libs/attrs/__init__.pyi
+++ b/libs/attrs/__init__.pyi
@@ -77,7 +77,7 @@ def field(
     metadata: Mapping[Any, Any] | None = ...,
     converter: None = ...,
     factory: None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: bool | None = ...,
     order: bool | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -98,10 +98,10 @@ def field(
     metadata: Mapping[Any, Any] | None = ...,
     converter: _ConverterType
     | list[_ConverterType]
-    | tuple[_ConverterType]
+    | tuple[_ConverterType, ...]
     | None = ...,
     factory: Callable[[], _T] | None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -121,10 +121,10 @@ def field(
     metadata: Mapping[Any, Any] | None = ...,
     converter: _ConverterType
     | list[_ConverterType]
-    | tuple[_ConverterType]
+    | tuple[_ConverterType, ...]
     | None = ...,
     factory: Callable[[], _T] | None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -144,10 +144,10 @@ def field(
     metadata: Mapping[Any, Any] | None = ...,
     converter: _ConverterType
     | list[_ConverterType]
-    | tuple[_ConverterType]
+    | tuple[_ConverterType, ...]
     | None = ...,
     factory: Callable[[], _T] | None = ...,
-    kw_only: bool = ...,
+    kw_only: bool | None = ...,
     eq: _EqOrderType | None = ...,
     order: _EqOrderType | None = ...,
     on_setattr: _OnSetAttrArgType | None = ...,
@@ -261,3 +261,54 @@ def frozen(
     field_transformer: _FieldTransformer | None = ...,
     match_args: bool = ...,
 ) -> Callable[[_C], _C]: ...
+
+class ClassProps:
+    # XXX: somehow when defining/using enums Mypy starts looking at our own
+    # (untyped) code and causes tons of errors.
+    Hashability: Any
+    KeywordOnly: Any
+
+    is_exception: bool
+    is_slotted: bool
+    has_weakref_slot: bool
+    is_frozen: bool
+    # kw_only: ClassProps.KeywordOnly
+    kw_only: Any
+    collected_fields_by_mro: bool
+    added_init: bool
+    added_repr: bool
+    added_eq: bool
+    added_ordering: bool
+    # hashability: ClassProps.Hashability
+    hashability: Any
+    added_match_args: bool
+    added_str: bool
+    added_pickling: bool
+    on_setattr_hook: _OnSetAttrType | None
+    field_transformer: Callable[[Attribute[Any]], Attribute[Any]] | None
+
+    def __init__(
+        self,
+        is_exception: bool,
+        is_slotted: bool,
+        has_weakref_slot: bool,
+        is_frozen: bool,
+        # kw_only: ClassProps.KeywordOnly
+        kw_only: Any,
+        collected_fields_by_mro: bool,
+        added_init: bool,
+        added_repr: bool,
+        added_eq: bool,
+        added_ordering: bool,
+        # hashability: ClassProps.Hashability
+        hashability: Any,
+        added_match_args: bool,
+        added_str: bool,
+        added_pickling: bool,
+        on_setattr_hook: _OnSetAttrType,
+        field_transformer: Callable[[Attribute[Any]], Attribute[Any]],
+    ) -> None: ...
+    @property
+    def is_hashable(self) -> bool: ...
+
+def inspect(cls: type) -> ClassProps: ...
diff --git a/libs/auditok-0.1.5.dist-info/METADATA b/libs/auditok-0.1.5.dist-info/METADATA
index 4192449d49..37c450eddf 100644
--- a/libs/auditok-0.1.5.dist-info/METADATA
+++ b/libs/auditok-0.1.5.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: auditok
 Version: 0.1.5
 Summary: A module for Audio/Acoustic Activity Detection
@@ -26,6 +26,17 @@ Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Requires: PyAudio
 Provides: auditok
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: provides
+Dynamic: requires
+Dynamic: summary
 
 auditok, an AUDIo TOKenization tool
 ===================================
diff --git a/libs/auditok-0.1.5.dist-info/RECORD b/libs/auditok-0.1.5.dist-info/RECORD
index b81262c5f3..0630702315 100644
--- a/libs/auditok-0.1.5.dist-info/RECORD
+++ b/libs/auditok-0.1.5.dist-info/RECORD
@@ -1,11 +1,11 @@
-../../bin/auditok,sha256=san8L0JClGVSOLMSy84omHkcdNSCaX1CMO2_VYwB1Lw,237
+../../bin/auditok,sha256=X1NSOvT-75y-cw9j044IIU_zMn86XcSHkGkgS24_5PU,190
 auditok-0.1.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-auditok-0.1.5.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-auditok-0.1.5.dist-info/METADATA,sha256=oU-1iYSzrQRSGOLnfzleHhDfwewUpMk5VsMMh6Bv4YA,3321
+auditok-0.1.5.dist-info/METADATA,sha256=bF9GPAsuOi0zBHLJa7q_MLfzRqFz6gxQ3LJGVqRJWgs,3529
 auditok-0.1.5.dist-info/RECORD,,
 auditok-0.1.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auditok-0.1.5.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+auditok-0.1.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 auditok-0.1.5.dist-info/entry_points.txt,sha256=jt34cdMDAqfsonQBYK0N9L7Kv4B7ypATasunykrWLaA,49
+auditok-0.1.5.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
 auditok-0.1.5.dist-info/top_level.txt,sha256=LORjvmbbVaDSnZc-kJOP6jEludE4SoiY2rLmCJ-fFDg,8
 auditok/__init__.py,sha256=C8Umr2R2L5AogNuOaYyZsjg10NX8beuTReaB1aPf1RU,300
 auditok/cmdline.py,sha256=bYrGbnZyVPr5rVCGXKiUAq4Zw3rYgP8_6q-BnJs9rUU,32948
diff --git a/libs/auditok-0.1.5.dist-info/WHEEL b/libs/auditok-0.1.5.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/auditok-0.1.5.dist-info/WHEEL
+++ b/libs/auditok-0.1.5.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/auditok-0.1.5.dist-info/LICENSE b/libs/auditok-0.1.5.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/auditok-0.1.5.dist-info/LICENSE
rename to libs/auditok-0.1.5.dist-info/licenses/LICENSE
diff --git a/libs/babelfish-0.6.1.dist-info/METADATA b/libs/babelfish-0.6.1.dist-info/METADATA
index ef3d36c55b..0426ac5a14 100644
--- a/libs/babelfish-0.6.1.dist-info/METADATA
+++ b/libs/babelfish-0.6.1.dist-info/METADATA
@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: babelfish
 Version: 0.6.1
 Summary: A module to work with countries and languages
-Home-page: https://github.com/Diaoul/babelfish
 License: BSD-3-Clause
+License-File: LICENSE
 Keywords: language,country,locale
 Author: Antoine Bertin
 Author-email: ant.bertin@gmail.com
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Internationalization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
diff --git a/libs/babelfish-0.6.1.dist-info/RECORD b/libs/babelfish-0.6.1.dist-info/RECORD
index 24e923f694..56d801565f 100644
--- a/libs/babelfish-0.6.1.dist-info/RECORD
+++ b/libs/babelfish-0.6.1.dist-info/RECORD
@@ -1,9 +1,9 @@
 babelfish-0.6.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-babelfish-0.6.1.dist-info/LICENSE,sha256=Oks1Oz6Ct0po2CM5dQD3S8oXrnJOJ1jMNj28Y5yXpao,1529
-babelfish-0.6.1.dist-info/METADATA,sha256=NrLR07hncTt09YG_BwYLy5FFw-UR_H7EPsTHgjd5gRk,3152
+babelfish-0.6.1.dist-info/METADATA,sha256=oeHMnqErUx_OEqyPZIX30k2OCUG_KA8S8BlJ5z8rMIk,3178
 babelfish-0.6.1.dist-info/RECORD,,
 babelfish-0.6.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-babelfish-0.6.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+babelfish-0.6.1.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+babelfish-0.6.1.dist-info/licenses/LICENSE,sha256=Oks1Oz6Ct0po2CM5dQD3S8oXrnJOJ1jMNj28Y5yXpao,1529
 babelfish/__init__.py,sha256=acwjM_qKby8EzOkPVT-R1Usakhba0s7mO-Q4QXFPZgs,761
 babelfish/compat.py,sha256=nobpsm7Iv2QLBBg1af4OxgzcNAwRJP642Juyai_6UMg,976
 babelfish/converters/__init__.py,sha256=N2z65eoHo0_9ZHgipi-9cVpd2lMX3Dk8ro2YEStbETA,9361
diff --git a/libs/babelfish-0.6.1.dist-info/WHEEL b/libs/babelfish-0.6.1.dist-info/WHEEL
index 8b9b3a1bf3..7894e88612 100644
--- a/libs/babelfish-0.6.1.dist-info/WHEEL
+++ b/libs/babelfish-0.6.1.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/babelfish-0.6.1.dist-info/LICENSE b/libs/babelfish-0.6.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/babelfish-0.6.1.dist-info/LICENSE
rename to libs/babelfish-0.6.1.dist-info/licenses/LICENSE
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/METADATA b/libs/backports.functools_lru_cache-2.0.0.dist-info/METADATA
deleted file mode 100644
index cc4c853ac5..0000000000
--- a/libs/backports.functools_lru_cache-2.0.0.dist-info/METADATA
+++ /dev/null
@@ -1,80 +0,0 @@
-Metadata-Version: 2.1
-Name: backports.functools_lru_cache
-Version: 2.0.0
-Summary: Backport of functools.lru_cache
-Home-page: https://github.com/jaraco/backports.functools_lru_cache
-Author: Raymond Hettinger
-Author-email: raymond.hettinger@gmail.com
-Maintainer: Jason R. Coombs
-Maintainer-email: jaraco@jaraco.com
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
-License-File: LICENSE
-Provides-Extra: docs
-Requires-Dist: sphinx >=3.5 ; extra == 'docs'
-Requires-Dist: sphinx <7.2.5 ; extra == 'docs'
-Requires-Dist: jaraco.packaging >=9.3 ; extra == 'docs'
-Requires-Dist: rst.linker >=1.9 ; extra == 'docs'
-Requires-Dist: furo ; extra == 'docs'
-Requires-Dist: sphinx-lint ; extra == 'docs'
-Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'docs'
-Provides-Extra: testing
-Requires-Dist: pytest >=6 ; extra == 'testing'
-Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'testing'
-Requires-Dist: pytest-cov ; extra == 'testing'
-Requires-Dist: pytest-enabler >=2.2 ; extra == 'testing'
-Requires-Dist: pytest-ruff ; extra == 'testing'
-Requires-Dist: pytest-black >=0.3.7 ; (platform_python_implementation != "PyPy") and extra == 'testing'
-Requires-Dist: pytest-mypy >=0.9.1 ; (platform_python_implementation != "PyPy") and extra == 'testing'
-
-.. image:: https://img.shields.io/pypi/v/backports.functools_lru_cache.svg
-   :target: https://pypi.org/project/backports.functools_lru_cache
-
-.. image:: https://img.shields.io/pypi/pyversions/backports.functools_lru_cache.svg
-
-.. image:: https://github.com/jaraco/backports.functools_lru_cache/actions/workflows/main.yml/badge.svg
-   :target: https://github.com/jaraco/backports.functools_lru_cache/actions?query=workflow%3A%22tests%22
-   :alt: tests
-
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
-    :target: https://github.com/astral-sh/ruff
-    :alt: Ruff
-
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-   :target: https://github.com/psf/black
-   :alt: Code style: Black
-
-.. image:: https://readthedocs.org/projects/backportsfunctools_lru_cache/badge/?version=latest
-   :target: https://backportsfunctools_lru_cache.readthedocs.io/en/latest/?badge=latest
-
-.. image:: https://img.shields.io/badge/skeleton-2023-informational
-   :target: https://blog.jaraco.com/skeleton
-
-.. image:: https://tidelift.com/badges/package/pypi/backports.functools_lru_cache
-   :target: https://tidelift.com/subscription/pkg/pypi-backports.functools_lru_cache?utm_source=pypi-backports.functools_lru_cache&utm_medium=readme
-
-Backport of functools.lru_cache from Python 3.3 as published at `ActiveState
-<http://code.activestate.com/recipes/578078/>`_.
-
-Usage
-=====
-
-Consider using this technique for importing the 'lru_cache' function::
-
-    try:
-        from functools import lru_cache
-    except ImportError:
-        from backports.functools_lru_cache import lru_cache
-
-
-For Enterprise
-==============
-
-Available as part of the Tidelift Subscription.
-
-This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
-
-`Learn more <https://tidelift.com/subscription/pkg/pypi-backports.functools_lru_cache?utm_source=pypi-backports.functools_lru_cache&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/RECORD b/libs/backports.functools_lru_cache-2.0.0.dist-info/RECORD
deleted file mode 100644
index 23cc977d3c..0000000000
--- a/libs/backports.functools_lru_cache-2.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,9 +0,0 @@
-backports.functools_lru_cache-2.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-backports.functools_lru_cache-2.0.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-backports.functools_lru_cache-2.0.0.dist-info/METADATA,sha256=XKyoE2hDkAbEjNN1N5v9864HhFRWfeWarZglz_-o9bY,3493
-backports.functools_lru_cache-2.0.0.dist-info/RECORD,,
-backports.functools_lru_cache-2.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-backports.functools_lru_cache-2.0.0.dist-info/WHEEL,sha256=TJ49d73sNs10F0aze1W_bTW2P_X7-F4YXOlBqoqA-jY,109
-backports.functools_lru_cache-2.0.0.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10
-backports/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81
-backports/functools_lru_cache.py,sha256=IwQSQZ26u76HImCyxb5sHso1n9md1K82DP28KLvw31I,9152
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/WHEEL b/libs/backports.functools_lru_cache-2.0.0.dist-info/WHEEL
deleted file mode 100644
index 17c0299e49..0000000000
--- a/libs/backports.functools_lru_cache-2.0.0.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/METADATA b/libs/backports.zoneinfo-0.2.1.dist-info/METADATA
deleted file mode 100644
index d8835ccf61..0000000000
--- a/libs/backports.zoneinfo-0.2.1.dist-info/METADATA
+++ /dev/null
@@ -1,113 +0,0 @@
-Metadata-Version: 2.1
-Name: backports.zoneinfo
-Version: 0.2.1
-Summary: Backport of the standard library zoneinfo module
-Home-page: https://github.com/pganssle/zoneinfo
-Author: Python Software Foundation
-Author-email: datetime-sig@python.org
-License: Apache-2.0
-Project-URL: Source, https://github.com/pganssle/zoneinfo
-Project-URL: Documentation, https://zoneinfo.readthedocs.io/en/latest/
-Project-URL: Bug Reports, https://github.com/pganssle/zoneinfo/issues
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-License-File: licenses/LICENSE_APACHE
-Requires-Dist: importlib-resources; python_version < "3.7"
-Provides-Extra: tzdata
-Requires-Dist: tzdata; extra == "tzdata"
-
-# `backports.zoneinfo`: Backport of the standard library module `zoneinfo`
-
-This package was originally the reference implementation for [PEP 615](https://www.python.org/dev/peps/pep-0615/), which proposes support for the IANA time zone database in the standard library, and now serves as a backport to Python 3.6+ (including PyPy).
-
-This exposes the `backports.zoneinfo` module, which is a backport of the [`zoneinfo`](https://docs.python.org/3.9/library/zoneinfo.html#module-zoneinfo) module. The backport's documentation can be found [on readthedocs](https://zoneinfo.readthedocs.io/en/latest/).
-
-The module uses the system time zone data if available, and falls back to the [`tzdata`](https://tzdata.readthedocs.io/en/latest/) package (available [on PyPI](https://pypi.org/project/tzdata/)) if installed.
-
-## Installation and depending on this library
-
-This module is called [`backports.zoneinfo`](https://pypi.org/project/backports.zoneinfo) on PyPI. To install it in your local environment, use:
-
-```
-pip install backports.zoneinfo
-```
-
-Or (particularly on Windows), you can also use the `tzdata` extra (which basically just declares a dependency on `tzdata`, so this doesn't actually save you any typing ๐Ÿ˜…):
-
-```
-pip install backports.zoneinfo[tzdata]
-```
-
-If you want to use this in your application, it is best to use [PEP 508 environment markers](https://www.python.org/dev/peps/pep-0508/#environment-markers) to declare a dependency *conditional on the Python version*:
-
-```
-backports.zoneinfo;python_version<"3.9"
-```
-
-Support for `backports.zoneinfo` in Python 3.9+ is currently minimal, since it is expected that you would use the standard library `zoneinfo` module instead.
-
-## Use
-
-The `backports.zoneinfo` module should be a drop-in replacement for the Python 3.9 standard library module `zoneinfo`. If you do not support anything earlier than Python 3.9, **you do not need this library**; if you are supporting Python 3.6+, you may want to use this idiom to "fall back" to ``backports.zoneinfo``:
-
-```python
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-```
-
-To get access to time zones with this module, construct a `ZoneInfo` object and attach it to your datetime:
-
-```python
->>> from backports.zoneinfo import ZoneInfo
->>> from datetime import datetime, timedelta, timezone
->>> dt = datetime(1992, 3, 1, tzinfo=ZoneInfo("Europe/Minsk"))
->>> print(dt)
-1992-03-01 00:00:00+02:00
->>> print(dt.utcoffset())
-2:00:00
->>> print(dt.tzname())
-EET
-```
-
-Arithmetic works as expected without the need for a "normalization" step:
-
-```python
->>> dt += timedelta(days=90)
->>> print(dt)
-1992-05-30 00:00:00+03:00
->>> dt.utcoffset()
-datetime.timedelta(seconds=10800)
->>> dt.tzname()
-'EEST'
-```
-
-Ambiguous and imaginary times are handled using the `fold` attribute added in [PEP 495](https://www.python.org/dev/peps/pep-0495/):
-
-```python
->>> dt = datetime(2020, 11, 1, 1, tzinfo=ZoneInfo("America/Chicago"))
->>> print(dt)
-2020-11-01 01:00:00-05:00
->>> print(dt.replace(fold=1))
-2020-11-01 01:00:00-06:00
-
->>> UTC = timezone.utc
->>> print(dt.astimezone(UTC))
-2020-11-01 06:00:00+00:00
->>> print(dt.replace(fold=1).astimezone(UTC))
-2020-11-01 07:00:00+00:00
-```
-
-# Contributing
-
-Currently we are not accepting contributions to this repository because we have not put the CLA in place and we would like to avoid complicating the process of adoption into the standard library. Contributions to [CPython](https://github.com/python/cpython) will eventually be backported to this repository โ€” see [the Python developer's guide](https://devguide.python.org/) for more information on how to contribute to CPython.
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/RECORD b/libs/backports.zoneinfo-0.2.1.dist-info/RECORD
deleted file mode 100644
index f470c9c96c..0000000000
--- a/libs/backports.zoneinfo-0.2.1.dist-info/RECORD
+++ /dev/null
@@ -1,17 +0,0 @@
-backports.zoneinfo-0.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-backports.zoneinfo-0.2.1.dist-info/LICENSE,sha256=M-jlAC01EtP8wigrmV5rrZ0zR4G5xawxhD9ASQDh87Q,592
-backports.zoneinfo-0.2.1.dist-info/LICENSE_APACHE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-backports.zoneinfo-0.2.1.dist-info/METADATA,sha256=kTzmkvHH1uwhH6KqhiCqH2q1Ffb_y2-PkG92E_-Yu08,4759
-backports.zoneinfo-0.2.1.dist-info/RECORD,,
-backports.zoneinfo-0.2.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-backports.zoneinfo-0.2.1.dist-info/WHEEL,sha256=8MbRJsGMYV6Ym1_SoG8YuJPvArpN2Z2wVWusEpp3feg,108
-backports.zoneinfo-0.2.1.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10
-backports/__init__.py,sha256=KNscjLyptBUeU07KtwwRFdTJqAVURMf4GjM9CqXnxMI,227
-backports/zoneinfo/__init__.py,sha256=atCU_fMgkQIE-DCjSJOist9GAqaWQAGhrDA5bCXPQxU,1235
-backports/zoneinfo/__init__.pyi,sha256=1_T7dB1-Fh1s7f2zNa1QrP9pO_aBHemeaIiJBPQz3Fs,1234
-backports/zoneinfo/_common.py,sha256=gKuY_V-YKbaabT5VRw1MWYJxfuiDDLCg7UolYYI42rw,5469
-backports/zoneinfo/_czoneinfo.cpython-38-darwin.so,sha256=B5Dfalnebg4-d6RHxgViObqUi8YRy_dLNl8EyYSlevI,37616
-backports/zoneinfo/_tzpath.py,sha256=yFkwr6qKvcC6wtuhrJRh487x57L39up8bpl9w-gOGX8,5860
-backports/zoneinfo/_version.py,sha256=HfjVOrpTnmZ-xVFCYSVmX50EXaBQeJteUHG-PD6iQs8,22
-backports/zoneinfo/_zoneinfo.py,sha256=B1W3KlPeUHjk1qpBybGHorPMvfcLwGF7dtYj-IFAxY4,24353
-backports/zoneinfo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL b/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL
deleted file mode 100644
index be75fa70de..0000000000
--- a/libs/backports.zoneinfo-0.2.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: false
-Tag: cp38-cp38-macosx_12_0_x86_64
-
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/top_level.txt b/libs/backports.zoneinfo-0.2.1.dist-info/top_level.txt
deleted file mode 100644
index 99d2be5b64..0000000000
--- a/libs/backports.zoneinfo-0.2.1.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-backports
diff --git a/libs/backports/zoneinfo/__init__.py b/libs/backports/zoneinfo/__init__.py
deleted file mode 100644
index 861fc48e50..0000000000
--- a/libs/backports/zoneinfo/__init__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-__all__ = [
-    "ZoneInfo",
-    "reset_tzpath",
-    "available_timezones",
-    "TZPATH",
-    "ZoneInfoNotFoundError",
-    "InvalidTZPathWarning",
-]
-import sys
-
-from . import _tzpath
-from ._common import ZoneInfoNotFoundError
-from ._version import __version__
-
-try:
-    from ._czoneinfo import ZoneInfo
-except ImportError:  # pragma: nocover
-    from ._zoneinfo import ZoneInfo
-
-reset_tzpath = _tzpath.reset_tzpath
-available_timezones = _tzpath.available_timezones
-InvalidTZPathWarning = _tzpath.InvalidTZPathWarning
-
-if sys.version_info < (3, 7):
-    # Module-level __getattr__ was added in Python 3.7, so instead of lazily
-    # populating TZPATH on every access, we will register a callback with
-    # reset_tzpath to update the top-level tuple.
-    TZPATH = _tzpath.TZPATH
-
-    def _tzpath_callback(new_tzpath):
-        global TZPATH
-        TZPATH = new_tzpath
-
-    _tzpath.TZPATH_CALLBACKS.append(_tzpath_callback)
-    del _tzpath_callback
-
-else:
-
-    def __getattr__(name):
-        if name == "TZPATH":
-            return _tzpath.TZPATH
-        else:
-            raise AttributeError(
-                f"module {__name__!r} has no attribute {name!r}"
-            )
-
-
-def __dir__():
-    return sorted(list(globals()) + ["TZPATH"])
diff --git a/libs/backports/zoneinfo/__init__.pyi b/libs/backports/zoneinfo/__init__.pyi
deleted file mode 100644
index 6e56abf2cd..0000000000
--- a/libs/backports/zoneinfo/__init__.pyi
+++ /dev/null
@@ -1,45 +0,0 @@
-import os
-import typing
-from datetime import datetime, tzinfo
-from typing import (
-    Any,
-    Iterable,
-    Optional,
-    Protocol,
-    Sequence,
-    Set,
-    Type,
-    Union,
-)
-
-_T = typing.TypeVar("_T", bound="ZoneInfo")
-
-class _IOBytes(Protocol):
-    def read(self, __size: int) -> bytes: ...
-    def seek(self, __size: int, __whence: int = ...) -> Any: ...
-
-class ZoneInfo(tzinfo):
-    @property
-    def key(self) -> str: ...
-    def __init__(self, key: str) -> None: ...
-    @classmethod
-    def no_cache(cls: Type[_T], key: str) -> _T: ...
-    @classmethod
-    def from_file(
-        cls: Type[_T], __fobj: _IOBytes, key: Optional[str] = ...
-    ) -> _T: ...
-    @classmethod
-    def clear_cache(cls, *, only_keys: Iterable[str] = ...) -> None: ...
-
-# Note: Both here and in clear_cache, the types allow the use of `str` where
-# a sequence of strings is required. This should be remedied if a solution
-# to this typing bug is found: https://github.com/python/typing/issues/256
-def reset_tzpath(
-    to: Optional[Sequence[Union[os.PathLike, str]]] = ...
-) -> None: ...
-def available_timezones() -> Set[str]: ...
-
-TZPATH: Sequence[str]
-
-class ZoneInfoNotFoundError(KeyError): ...
-class InvalidTZPathWarning(RuntimeWarning): ...
diff --git a/libs/backports/zoneinfo/_common.py b/libs/backports/zoneinfo/_common.py
deleted file mode 100644
index 27a6ab026e..0000000000
--- a/libs/backports/zoneinfo/_common.py
+++ /dev/null
@@ -1,171 +0,0 @@
-import struct
-
-
-def load_tzdata(key):
-    try:
-        import importlib.resources as importlib_resources
-    except ImportError:
-        import importlib_resources
-
-    components = key.split("/")
-    package_name = ".".join(["tzdata.zoneinfo"] + components[:-1])
-    resource_name = components[-1]
-
-    try:
-        return importlib_resources.open_binary(package_name, resource_name)
-    except (ImportError, FileNotFoundError, UnicodeEncodeError):
-        # There are three types of exception that can be raised that all amount
-        # to "we cannot find this key":
-        #
-        # ImportError: If package_name doesn't exist (e.g. if tzdata is not
-        #   installed, or if there's an error in the folder name like
-        #   Amrica/New_York)
-        # FileNotFoundError: If resource_name doesn't exist in the package
-        #   (e.g. Europe/Krasnoy)
-        # UnicodeEncodeError: If package_name or resource_name are not UTF-8,
-        #   such as keys containing a surrogate character.
-        raise ZoneInfoNotFoundError(f"No time zone found with key {key}")
-
-
-def load_data(fobj):
-    header = _TZifHeader.from_file(fobj)
-
-    if header.version == 1:
-        time_size = 4
-        time_type = "l"
-    else:
-        # Version 2+ has 64-bit integer transition times
-        time_size = 8
-        time_type = "q"
-
-        # Version 2+ also starts with a Version 1 header and data, which
-        # we need to skip now
-        skip_bytes = (
-            header.timecnt * 5  # Transition times and types
-            + header.typecnt * 6  # Local time type records
-            + header.charcnt  # Time zone designations
-            + header.leapcnt * 8  # Leap second records
-            + header.isstdcnt  # Standard/wall indicators
-            + header.isutcnt  # UT/local indicators
-        )
-
-        fobj.seek(skip_bytes, 1)
-
-        # Now we need to read the second header, which is not the same
-        # as the first
-        header = _TZifHeader.from_file(fobj)
-
-    typecnt = header.typecnt
-    timecnt = header.timecnt
-    charcnt = header.charcnt
-
-    # The data portion starts with timecnt transitions and indices
-    if timecnt:
-        trans_list_utc = struct.unpack(
-            f">{timecnt}{time_type}", fobj.read(timecnt * time_size)
-        )
-        trans_idx = struct.unpack(f">{timecnt}B", fobj.read(timecnt))
-    else:
-        trans_list_utc = ()
-        trans_idx = ()
-
-    # Read the ttinfo struct, (utoff, isdst, abbrind)
-    if typecnt:
-        utcoff, isdst, abbrind = zip(
-            *(struct.unpack(">lbb", fobj.read(6)) for i in range(typecnt))
-        )
-    else:
-        utcoff = ()
-        isdst = ()
-        abbrind = ()
-
-    # Now read the abbreviations. They are null-terminated strings, indexed
-    # not by position in the array but by position in the unsplit
-    # abbreviation string. I suppose this makes more sense in C, which uses
-    # null to terminate the strings, but it's inconvenient here...
-    abbr_vals = {}
-    abbr_chars = fobj.read(charcnt)
-
-    def get_abbr(idx):
-        # Gets a string starting at idx and running until the next \x00
-        #
-        # We cannot pre-populate abbr_vals by splitting on \x00 because there
-        # are some zones that use subsets of longer abbreviations, like so:
-        #
-        #  LMT\x00AHST\x00HDT\x00
-        #
-        # Where the idx to abbr mapping should be:
-        #
-        # {0: "LMT", 4: "AHST", 5: "HST", 9: "HDT"}
-        if idx not in abbr_vals:
-            span_end = abbr_chars.find(b"\x00", idx)
-            abbr_vals[idx] = abbr_chars[idx:span_end].decode()
-
-        return abbr_vals[idx]
-
-    abbr = tuple(get_abbr(idx) for idx in abbrind)
-
-    # The remainder of the file consists of leap seconds (currently unused) and
-    # the standard/wall and ut/local indicators, which are metadata we don't need.
-    # In version 2 files, we need to skip the unnecessary data to get at the TZ string:
-    if header.version >= 2:
-        # Each leap second record has size (time_size + 4)
-        skip_bytes = header.isutcnt + header.isstdcnt + header.leapcnt * 12
-        fobj.seek(skip_bytes, 1)
-
-        c = fobj.read(1)  # Should be \n
-        assert c == b"\n", c
-
-        tz_bytes = b""
-        while True:
-            c = fobj.read(1)
-            if c == b"\n":
-                break
-            tz_bytes += c
-
-        tz_str = tz_bytes
-    else:
-        tz_str = None
-
-    return trans_idx, trans_list_utc, utcoff, isdst, abbr, tz_str
-
-
-class _TZifHeader:
-    __slots__ = [
-        "version",
-        "isutcnt",
-        "isstdcnt",
-        "leapcnt",
-        "timecnt",
-        "typecnt",
-        "charcnt",
-    ]
-
-    def __init__(self, *args):
-        assert len(self.__slots__) == len(args)
-        for attr, val in zip(self.__slots__, args):
-            setattr(self, attr, val)
-
-    @classmethod
-    def from_file(cls, stream):
-        # The header starts with a 4-byte "magic" value
-        if stream.read(4) != b"TZif":
-            raise ValueError("Invalid TZif file: magic not found")
-
-        _version = stream.read(1)
-        if _version == b"\x00":
-            version = 1
-        else:
-            version = int(_version)
-        stream.read(15)
-
-        args = (version,)
-
-        # Slots are defined in the order that the bytes are arranged
-        args = args + struct.unpack(">6l", stream.read(24))
-
-        return cls(*args)
-
-
-class ZoneInfoNotFoundError(KeyError):
-    """Exception raised when a ZoneInfo key is not found."""
diff --git a/libs/backports/zoneinfo/_tzpath.py b/libs/backports/zoneinfo/_tzpath.py
deleted file mode 100644
index 9baaf6bce5..0000000000
--- a/libs/backports/zoneinfo/_tzpath.py
+++ /dev/null
@@ -1,207 +0,0 @@
-import os
-import sys
-
-PY36 = sys.version_info < (3, 7)
-
-
-def reset_tzpath(to=None):
-    global TZPATH
-
-    tzpaths = to
-    if tzpaths is not None:
-        if isinstance(tzpaths, (str, bytes)):
-            raise TypeError(
-                f"tzpaths must be a list or tuple, "
-                + f"not {type(tzpaths)}: {tzpaths!r}"
-            )
-
-        if not all(map(os.path.isabs, tzpaths)):
-            raise ValueError(_get_invalid_paths_message(tzpaths))
-        base_tzpath = tzpaths
-    else:
-        env_var = os.environ.get("PYTHONTZPATH", None)
-        if env_var is not None:
-            base_tzpath = _parse_python_tzpath(env_var)
-        elif sys.platform != "win32":
-            base_tzpath = [
-                "/usr/share/zoneinfo",
-                "/usr/lib/zoneinfo",
-                "/usr/share/lib/zoneinfo",
-                "/etc/zoneinfo",
-            ]
-
-            base_tzpath.sort(key=lambda x: not os.path.exists(x))
-        else:
-            base_tzpath = ()
-
-    TZPATH = tuple(base_tzpath)
-
-    if TZPATH_CALLBACKS:
-        for callback in TZPATH_CALLBACKS:
-            callback(TZPATH)
-
-
-def _parse_python_tzpath(env_var):
-    if not env_var:
-        return ()
-
-    raw_tzpath = env_var.split(os.pathsep)
-    new_tzpath = tuple(filter(os.path.isabs, raw_tzpath))
-
-    # If anything has been filtered out, we will warn about it
-    if len(new_tzpath) != len(raw_tzpath):
-        import warnings
-
-        msg = _get_invalid_paths_message(raw_tzpath)
-
-        warnings.warn(
-            "Invalid paths specified in PYTHONTZPATH environment variable."
-            + msg,
-            InvalidTZPathWarning,
-        )
-
-    return new_tzpath
-
-
-def _get_invalid_paths_message(tzpaths):
-    invalid_paths = (path for path in tzpaths if not os.path.isabs(path))
-
-    prefix = "\n    "
-    indented_str = prefix + prefix.join(invalid_paths)
-
-    return (
-        "Paths should be absolute but found the following relative paths:"
-        + indented_str
-    )
-
-
-if sys.version_info < (3, 8):
-
-    def _isfile(path):
-        # bpo-33721: In Python 3.8 non-UTF8 paths return False rather than
-        # raising an error. See https://bugs.python.org/issue33721
-        try:
-            return os.path.isfile(path)
-        except ValueError:
-            return False
-
-
-else:
-    _isfile = os.path.isfile
-
-
-def find_tzfile(key):
-    """Retrieve the path to a TZif file from a key."""
-    _validate_tzfile_path(key)
-    for search_path in TZPATH:
-        filepath = os.path.join(search_path, key)
-        if _isfile(filepath):
-            return filepath
-
-    return None
-
-
-_TEST_PATH = os.path.normpath(os.path.join("_", "_"))[:-1]
-
-
-def _validate_tzfile_path(path, _base=_TEST_PATH):
-    if os.path.isabs(path):
-        raise ValueError(
-            f"ZoneInfo keys may not be absolute paths, got: {path}"
-        )
-
-    # We only care about the kinds of path normalizations that would change the
-    # length of the key - e.g. a/../b -> a/b, or a/b/ -> a/b. On Windows,
-    # normpath will also change from a/b to a\b, but that would still preserve
-    # the length.
-    new_path = os.path.normpath(path)
-    if len(new_path) != len(path):
-        raise ValueError(
-            f"ZoneInfo keys must be normalized relative paths, got: {path}"
-        )
-
-    resolved = os.path.normpath(os.path.join(_base, new_path))
-    if not resolved.startswith(_base):
-        raise ValueError(
-            f"ZoneInfo keys must refer to subdirectories of TZPATH, got: {path}"
-        )
-
-
-del _TEST_PATH
-
-
-def available_timezones():
-    """Returns a set containing all available time zones.
-
-    .. caution::
-
-        This may attempt to open a large number of files, since the best way to
-        determine if a given file on the time zone search path is to open it
-        and check for the "magic string" at the beginning.
-    """
-    try:
-        from importlib import resources
-    except ImportError:
-        import importlib_resources as resources
-
-    valid_zones = set()
-
-    # Start with loading from the tzdata package if it exists: this has a
-    # pre-assembled list of zones that only requires opening one file.
-    try:
-        with resources.open_text("tzdata", "zones") as f:
-            for zone in f:
-                zone = zone.strip()
-                if zone:
-                    valid_zones.add(zone)
-    except (ImportError, FileNotFoundError):
-        pass
-
-    def valid_key(fpath):
-        try:
-            with open(fpath, "rb") as f:
-                return f.read(4) == b"TZif"
-        except Exception:  # pragma: nocover
-            return False
-
-    for tz_root in TZPATH:
-        if not os.path.exists(tz_root):
-            continue
-
-        for root, dirnames, files in os.walk(tz_root):
-            if root == tz_root:
-                # right/ and posix/ are special directories and shouldn't be
-                # included in the output of available zones
-                if "right" in dirnames:
-                    dirnames.remove("right")
-                if "posix" in dirnames:
-                    dirnames.remove("posix")
-
-            for file in files:
-                fpath = os.path.join(root, file)
-
-                key = os.path.relpath(fpath, start=tz_root)
-                if os.sep != "/":  # pragma: nocover
-                    key = key.replace(os.sep, "/")
-
-                if not key or key in valid_zones:
-                    continue
-
-                if valid_key(fpath):
-                    valid_zones.add(key)
-
-    if "posixrules" in valid_zones:
-        # posixrules is a special symlink-only time zone where it exists, it
-        # should not be included in the output
-        valid_zones.remove("posixrules")
-
-    return valid_zones
-
-
-class InvalidTZPathWarning(RuntimeWarning):
-    """Warning raised if an invalid path is specified in PYTHONTZPATH."""
-
-
-TZPATH = ()
-TZPATH_CALLBACKS = []
-reset_tzpath()
diff --git a/libs/backports/zoneinfo/_version.py b/libs/backports/zoneinfo/_version.py
deleted file mode 100644
index 3ced3581bb..0000000000
--- a/libs/backports/zoneinfo/_version.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "0.2.1"
diff --git a/libs/backports/zoneinfo/_zoneinfo.py b/libs/backports/zoneinfo/_zoneinfo.py
deleted file mode 100644
index c15a553491..0000000000
--- a/libs/backports/zoneinfo/_zoneinfo.py
+++ /dev/null
@@ -1,754 +0,0 @@
-import bisect
-import calendar
-import collections
-import functools
-import re
-import weakref
-from datetime import datetime, timedelta, tzinfo
-
-from . import _common, _tzpath
-
-EPOCH = datetime(1970, 1, 1)
-EPOCHORDINAL = datetime(1970, 1, 1).toordinal()
-
-# It is relatively expensive to construct new timedelta objects, and in most
-# cases we're looking at the same deltas, like integer numbers of hours, etc.
-# To improve speed and memory use, we'll keep a dictionary with references
-# to the ones we've already used so far.
-#
-# Loading every time zone in the 2020a version of the time zone database
-# requires 447 timedeltas, which requires approximately the amount of space
-# that ZoneInfo("America/New_York") with 236 transitions takes up, so we will
-# set the cache size to 512 so that in the common case we always get cache
-# hits, but specifically crafted ZoneInfo objects don't leak arbitrary amounts
-# of memory.
-@functools.lru_cache(maxsize=512)
-def _load_timedelta(seconds):
-    return timedelta(seconds=seconds)
-
-
-class ZoneInfo(tzinfo):
-    _strong_cache_size = 8
-    _strong_cache = collections.OrderedDict()
-    _weak_cache = weakref.WeakValueDictionary()
-    __module__ = "backports.zoneinfo"
-
-    def __init_subclass__(cls):
-        cls._strong_cache = collections.OrderedDict()
-        cls._weak_cache = weakref.WeakValueDictionary()
-
-    def __new__(cls, key):
-        instance = cls._weak_cache.get(key, None)
-        if instance is None:
-            instance = cls._weak_cache.setdefault(key, cls._new_instance(key))
-            instance._from_cache = True
-
-        # Update the "strong" cache
-        cls._strong_cache[key] = cls._strong_cache.pop(key, instance)
-
-        if len(cls._strong_cache) > cls._strong_cache_size:
-            cls._strong_cache.popitem(last=False)
-
-        return instance
-
-    @classmethod
-    def no_cache(cls, key):
-        obj = cls._new_instance(key)
-        obj._from_cache = False
-
-        return obj
-
-    @classmethod
-    def _new_instance(cls, key):
-        obj = super().__new__(cls)
-        obj._key = key
-        obj._file_path = obj._find_tzfile(key)
-
-        if obj._file_path is not None:
-            file_obj = open(obj._file_path, "rb")
-        else:
-            file_obj = _common.load_tzdata(key)
-
-        with file_obj as f:
-            obj._load_file(f)
-
-        return obj
-
-    @classmethod
-    def from_file(cls, fobj, key=None):
-        obj = super().__new__(cls)
-        obj._key = key
-        obj._file_path = None
-        obj._load_file(fobj)
-        obj._file_repr = repr(fobj)
-
-        # Disable pickling for objects created from files
-        obj.__reduce__ = obj._file_reduce
-
-        return obj
-
-    @classmethod
-    def clear_cache(cls, *, only_keys=None):
-        if only_keys is not None:
-            for key in only_keys:
-                cls._weak_cache.pop(key, None)
-                cls._strong_cache.pop(key, None)
-
-        else:
-            cls._weak_cache.clear()
-            cls._strong_cache.clear()
-
-    @property
-    def key(self):
-        return self._key
-
-    def utcoffset(self, dt):
-        return self._find_trans(dt).utcoff
-
-    def dst(self, dt):
-        return self._find_trans(dt).dstoff
-
-    def tzname(self, dt):
-        return self._find_trans(dt).tzname
-
-    def fromutc(self, dt):
-        """Convert from datetime in UTC to datetime in local time"""
-
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        timestamp = self._get_local_timestamp(dt)
-        num_trans = len(self._trans_utc)
-
-        if num_trans >= 1 and timestamp < self._trans_utc[0]:
-            tti = self._tti_before
-            fold = 0
-        elif (
-            num_trans == 0 or timestamp > self._trans_utc[-1]
-        ) and not isinstance(self._tz_after, _ttinfo):
-            tti, fold = self._tz_after.get_trans_info_fromutc(
-                timestamp, dt.year
-            )
-        elif num_trans == 0:
-            tti = self._tz_after
-            fold = 0
-        else:
-            idx = bisect.bisect_right(self._trans_utc, timestamp)
-
-            if num_trans > 1 and timestamp >= self._trans_utc[1]:
-                tti_prev, tti = self._ttinfos[idx - 2 : idx]
-            elif timestamp > self._trans_utc[-1]:
-                tti_prev = self._ttinfos[-1]
-                tti = self._tz_after
-            else:
-                tti_prev = self._tti_before
-                tti = self._ttinfos[0]
-
-            # Detect fold
-            shift = tti_prev.utcoff - tti.utcoff
-            fold = shift.total_seconds() > timestamp - self._trans_utc[idx - 1]
-        dt += tti.utcoff
-        if fold:
-            return dt.replace(fold=1)
-        else:
-            return dt
-
-    def _find_trans(self, dt):
-        if dt is None:
-            if self._fixed_offset:
-                return self._tz_after
-            else:
-                return _NO_TTINFO
-
-        ts = self._get_local_timestamp(dt)
-
-        lt = self._trans_local[dt.fold]
-
-        num_trans = len(lt)
-
-        if num_trans and ts < lt[0]:
-            return self._tti_before
-        elif not num_trans or ts > lt[-1]:
-            if isinstance(self._tz_after, _TZStr):
-                return self._tz_after.get_trans_info(ts, dt.year, dt.fold)
-            else:
-                return self._tz_after
-        else:
-            # idx is the transition that occurs after this timestamp, so we
-            # subtract off 1 to get the current ttinfo
-            idx = bisect.bisect_right(lt, ts) - 1
-            assert idx >= 0
-            return self._ttinfos[idx]
-
-    def _get_local_timestamp(self, dt):
-        return (
-            (dt.toordinal() - EPOCHORDINAL) * 86400
-            + dt.hour * 3600
-            + dt.minute * 60
-            + dt.second
-        )
-
-    def __str__(self):
-        if self._key is not None:
-            return f"{self._key}"
-        else:
-            return repr(self)
-
-    def __repr__(self):
-        if self._key is not None:
-            return f"{self.__class__.__name__}(key={self._key!r})"
-        else:
-            return f"{self.__class__.__name__}.from_file({self._file_repr})"
-
-    def __reduce__(self):
-        return (self.__class__._unpickle, (self._key, self._from_cache))
-
-    def _file_reduce(self):
-        import pickle
-
-        raise pickle.PicklingError(
-            "Cannot pickle a ZoneInfo file created from a file stream."
-        )
-
-    @classmethod
-    def _unpickle(cls, key, from_cache):
-        if from_cache:
-            return cls(key)
-        else:
-            return cls.no_cache(key)
-
-    def _find_tzfile(self, key):
-        return _tzpath.find_tzfile(key)
-
-    def _load_file(self, fobj):
-        # Retrieve all the data as it exists in the zoneinfo file
-        trans_idx, trans_utc, utcoff, isdst, abbr, tz_str = _common.load_data(
-            fobj
-        )
-
-        # Infer the DST offsets (needed for .dst()) from the data
-        dstoff = self._utcoff_to_dstoff(trans_idx, utcoff, isdst)
-
-        # Convert all the transition times (UTC) into "seconds since 1970-01-01 local time"
-        trans_local = self._ts_to_local(trans_idx, trans_utc, utcoff)
-
-        # Construct `_ttinfo` objects for each transition in the file
-        _ttinfo_list = [
-            _ttinfo(
-                _load_timedelta(utcoffset), _load_timedelta(dstoffset), tzname
-            )
-            for utcoffset, dstoffset, tzname in zip(utcoff, dstoff, abbr)
-        ]
-
-        self._trans_utc = trans_utc
-        self._trans_local = trans_local
-        self._ttinfos = [_ttinfo_list[idx] for idx in trans_idx]
-
-        # Find the first non-DST transition
-        for i in range(len(isdst)):
-            if not isdst[i]:
-                self._tti_before = _ttinfo_list[i]
-                break
-        else:
-            if self._ttinfos:
-                self._tti_before = self._ttinfos[0]
-            else:
-                self._tti_before = None
-
-        # Set the "fallback" time zone
-        if tz_str is not None and tz_str != b"":
-            self._tz_after = _parse_tz_str(tz_str.decode())
-        else:
-            if not self._ttinfos and not _ttinfo_list:
-                raise ValueError("No time zone information found.")
-
-            if self._ttinfos:
-                self._tz_after = self._ttinfos[-1]
-            else:
-                self._tz_after = _ttinfo_list[-1]
-
-        # Determine if this is a "fixed offset" zone, meaning that the output
-        # of the utcoffset, dst and tzname functions does not depend on the
-        # specific datetime passed.
-        #
-        # We make three simplifying assumptions here:
-        #
-        # 1. If _tz_after is not a _ttinfo, it has transitions that might
-        #    actually occur (it is possible to construct TZ strings that
-        #    specify STD and DST but no transitions ever occur, such as
-        #    AAA0BBB,0/0,J365/25).
-        # 2. If _ttinfo_list contains more than one _ttinfo object, the objects
-        #    represent different offsets.
-        # 3. _ttinfo_list contains no unused _ttinfos (in which case an
-        #    otherwise fixed-offset zone with extra _ttinfos defined may
-        #    appear to *not* be a fixed offset zone).
-        #
-        # Violations to these assumptions would be fairly exotic, and exotic
-        # zones should almost certainly not be used with datetime.time (the
-        # only thing that would be affected by this).
-        if len(_ttinfo_list) > 1 or not isinstance(self._tz_after, _ttinfo):
-            self._fixed_offset = False
-        elif not _ttinfo_list:
-            self._fixed_offset = True
-        else:
-            self._fixed_offset = _ttinfo_list[0] == self._tz_after
-
-    @staticmethod
-    def _utcoff_to_dstoff(trans_idx, utcoffsets, isdsts):
-        # Now we must transform our ttis and abbrs into `_ttinfo` objects,
-        # but there is an issue: .dst() must return a timedelta with the
-        # difference between utcoffset() and the "standard" offset, but
-        # the "base offset" and "DST offset" are not encoded in the file;
-        # we can infer what they are from the isdst flag, but it is not
-        # sufficient to to just look at the last standard offset, because
-        # occasionally countries will shift both DST offset and base offset.
-
-        typecnt = len(isdsts)
-        dstoffs = [0] * typecnt  # Provisionally assign all to 0.
-        dst_cnt = sum(isdsts)
-        dst_found = 0
-
-        for i in range(1, len(trans_idx)):
-            if dst_cnt == dst_found:
-                break
-
-            idx = trans_idx[i]
-
-            dst = isdsts[idx]
-
-            # We're only going to look at daylight saving time
-            if not dst:
-                continue
-
-            # Skip any offsets that have already been assigned
-            if dstoffs[idx] != 0:
-                continue
-
-            dstoff = 0
-            utcoff = utcoffsets[idx]
-
-            comp_idx = trans_idx[i - 1]
-
-            if not isdsts[comp_idx]:
-                dstoff = utcoff - utcoffsets[comp_idx]
-
-            if not dstoff and idx < (typecnt - 1):
-                comp_idx = trans_idx[i + 1]
-
-                # If the following transition is also DST and we couldn't
-                # find the DST offset by this point, we're going ot have to
-                # skip it and hope this transition gets assigned later
-                if isdsts[comp_idx]:
-                    continue
-
-                dstoff = utcoff - utcoffsets[comp_idx]
-
-            if dstoff:
-                dst_found += 1
-                dstoffs[idx] = dstoff
-        else:
-            # If we didn't find a valid value for a given index, we'll end up
-            # with dstoff = 0 for something where `isdst=1`. This is obviously
-            # wrong - one hour will be a much better guess than 0
-            for idx in range(typecnt):
-                if not dstoffs[idx] and isdsts[idx]:
-                    dstoffs[idx] = 3600
-
-        return dstoffs
-
-    @staticmethod
-    def _ts_to_local(trans_idx, trans_list_utc, utcoffsets):
-        """Generate number of seconds since 1970 *in the local time*.
-
-        This is necessary to easily find the transition times in local time"""
-        if not trans_list_utc:
-            return [[], []]
-
-        # Start with the timestamps and modify in-place
-        trans_list_wall = [list(trans_list_utc), list(trans_list_utc)]
-
-        if len(utcoffsets) > 1:
-            offset_0 = utcoffsets[0]
-            offset_1 = utcoffsets[trans_idx[0]]
-            if offset_1 > offset_0:
-                offset_1, offset_0 = offset_0, offset_1
-        else:
-            offset_0 = offset_1 = utcoffsets[0]
-
-        trans_list_wall[0][0] += offset_0
-        trans_list_wall[1][0] += offset_1
-
-        for i in range(1, len(trans_idx)):
-            offset_0 = utcoffsets[trans_idx[i - 1]]
-            offset_1 = utcoffsets[trans_idx[i]]
-
-            if offset_1 > offset_0:
-                offset_1, offset_0 = offset_0, offset_1
-
-            trans_list_wall[0][i] += offset_0
-            trans_list_wall[1][i] += offset_1
-
-        return trans_list_wall
-
-
-class _ttinfo:
-    __slots__ = ["utcoff", "dstoff", "tzname"]
-
-    def __init__(self, utcoff, dstoff, tzname):
-        self.utcoff = utcoff
-        self.dstoff = dstoff
-        self.tzname = tzname
-
-    def __eq__(self, other):
-        return (
-            self.utcoff == other.utcoff
-            and self.dstoff == other.dstoff
-            and self.tzname == other.tzname
-        )
-
-    def __repr__(self):  # pragma: nocover
-        return (
-            f"{self.__class__.__name__}"
-            + f"({self.utcoff}, {self.dstoff}, {self.tzname})"
-        )
-
-
-_NO_TTINFO = _ttinfo(None, None, None)
-
-
-class _TZStr:
-    __slots__ = (
-        "std",
-        "dst",
-        "start",
-        "end",
-        "get_trans_info",
-        "get_trans_info_fromutc",
-        "dst_diff",
-    )
-
-    def __init__(
-        self, std_abbr, std_offset, dst_abbr, dst_offset, start=None, end=None
-    ):
-        self.dst_diff = dst_offset - std_offset
-        std_offset = _load_timedelta(std_offset)
-        self.std = _ttinfo(
-            utcoff=std_offset, dstoff=_load_timedelta(0), tzname=std_abbr
-        )
-
-        self.start = start
-        self.end = end
-
-        dst_offset = _load_timedelta(dst_offset)
-        delta = _load_timedelta(self.dst_diff)
-        self.dst = _ttinfo(utcoff=dst_offset, dstoff=delta, tzname=dst_abbr)
-
-        # These are assertions because the constructor should only be called
-        # by functions that would fail before passing start or end
-        assert start is not None, "No transition start specified"
-        assert end is not None, "No transition end specified"
-
-        self.get_trans_info = self._get_trans_info
-        self.get_trans_info_fromutc = self._get_trans_info_fromutc
-
-    def transitions(self, year):
-        start = self.start.year_to_epoch(year)
-        end = self.end.year_to_epoch(year)
-        return start, end
-
-    def _get_trans_info(self, ts, year, fold):
-        """Get the information about the current transition - tti"""
-        start, end = self.transitions(year)
-
-        # With fold = 0, the period (denominated in local time) with the
-        # smaller offset starts at the end of the gap and ends at the end of
-        # the fold; with fold = 1, it runs from the start of the gap to the
-        # beginning of the fold.
-        #
-        # So in order to determine the DST boundaries we need to know both
-        # the fold and whether DST is positive or negative (rare), and it
-        # turns out that this boils down to fold XOR is_positive.
-        if fold == (self.dst_diff >= 0):
-            end -= self.dst_diff
-        else:
-            start += self.dst_diff
-
-        if start < end:
-            isdst = start <= ts < end
-        else:
-            isdst = not (end <= ts < start)
-
-        return self.dst if isdst else self.std
-
-    def _get_trans_info_fromutc(self, ts, year):
-        start, end = self.transitions(year)
-        start -= self.std.utcoff.total_seconds()
-        end -= self.dst.utcoff.total_seconds()
-
-        if start < end:
-            isdst = start <= ts < end
-        else:
-            isdst = not (end <= ts < start)
-
-        # For positive DST, the ambiguous period is one dst_diff after the end
-        # of DST; for negative DST, the ambiguous period is one dst_diff before
-        # the start of DST.
-        if self.dst_diff > 0:
-            ambig_start = end
-            ambig_end = end + self.dst_diff
-        else:
-            ambig_start = start
-            ambig_end = start - self.dst_diff
-
-        fold = ambig_start <= ts < ambig_end
-
-        return (self.dst if isdst else self.std, fold)
-
-
-def _post_epoch_days_before_year(year):
-    """Get the number of days between 1970-01-01 and YEAR-01-01"""
-    y = year - 1
-    return y * 365 + y // 4 - y // 100 + y // 400 - EPOCHORDINAL
-
-
-class _DayOffset:
-    __slots__ = ["d", "julian", "hour", "minute", "second"]
-
-    def __init__(self, d, julian, hour=2, minute=0, second=0):
-        if not (0 + julian) <= d <= 365:
-            min_day = 0 + julian
-            raise ValueError(f"d must be in [{min_day}, 365], not: {d}")
-
-        self.d = d
-        self.julian = julian
-        self.hour = hour
-        self.minute = minute
-        self.second = second
-
-    def year_to_epoch(self, year):
-        days_before_year = _post_epoch_days_before_year(year)
-
-        d = self.d
-        if self.julian and d >= 59 and calendar.isleap(year):
-            d += 1
-
-        epoch = (days_before_year + d) * 86400
-        epoch += self.hour * 3600 + self.minute * 60 + self.second
-
-        return epoch
-
-
-class _CalendarOffset:
-    __slots__ = ["m", "w", "d", "hour", "minute", "second"]
-
-    _DAYS_BEFORE_MONTH = (
-        -1,
-        0,
-        31,
-        59,
-        90,
-        120,
-        151,
-        181,
-        212,
-        243,
-        273,
-        304,
-        334,
-    )
-
-    def __init__(self, m, w, d, hour=2, minute=0, second=0):
-        if not 0 < m <= 12:
-            raise ValueError("m must be in (0, 12]")
-
-        if not 0 < w <= 5:
-            raise ValueError("w must be in (0, 5]")
-
-        if not 0 <= d <= 6:
-            raise ValueError("d must be in [0, 6]")
-
-        self.m = m
-        self.w = w
-        self.d = d
-        self.hour = hour
-        self.minute = minute
-        self.second = second
-
-    @classmethod
-    def _ymd2ord(cls, year, month, day):
-        return (
-            _post_epoch_days_before_year(year)
-            + cls._DAYS_BEFORE_MONTH[month]
-            + (month > 2 and calendar.isleap(year))
-            + day
-        )
-
-    # TODO: These are not actually epoch dates as they are expressed in local time
-    def year_to_epoch(self, year):
-        """Calculates the datetime of the occurrence from the year"""
-        # We know year and month, we need to convert w, d into day of month
-        #
-        # Week 1 is the first week in which day `d` (where 0 = Sunday) appears.
-        # Week 5 represents the last occurrence of day `d`, so we need to know
-        # the range of the month.
-        first_day, days_in_month = calendar.monthrange(year, self.m)
-
-        # This equation seems magical, so I'll break it down:
-        # 1. calendar says 0 = Monday, POSIX says 0 = Sunday
-        #    so we need first_day + 1 to get 1 = Monday -> 7 = Sunday,
-        #    which is still equivalent because this math is mod 7
-        # 2. Get first day - desired day mod 7: -1 % 7 = 6, so we don't need
-        #    to do anything to adjust negative numbers.
-        # 3. Add 1 because month days are a 1-based index.
-        month_day = (self.d - (first_day + 1)) % 7 + 1
-
-        # Now use a 0-based index version of `w` to calculate the w-th
-        # occurrence of `d`
-        month_day += (self.w - 1) * 7
-
-        # month_day will only be > days_in_month if w was 5, and `w` means
-        # "last occurrence of `d`", so now we just check if we over-shot the
-        # end of the month and if so knock off 1 week.
-        if month_day > days_in_month:
-            month_day -= 7
-
-        ordinal = self._ymd2ord(year, self.m, month_day)
-        epoch = ordinal * 86400
-        epoch += self.hour * 3600 + self.minute * 60 + self.second
-        return epoch
-
-
-def _parse_tz_str(tz_str):
-    # The tz string has the format:
-    #
-    # std[offset[dst[offset],start[/time],end[/time]]]
-    #
-    # std and dst must be 3 or more characters long and must not contain
-    # a leading colon, embedded digits, commas, nor a plus or minus signs;
-    # The spaces between "std" and "offset" are only for display and are
-    # not actually present in the string.
-    #
-    # The format of the offset is ``[+|-]hh[:mm[:ss]]``
-
-    offset_str, *start_end_str = tz_str.split(",", 1)
-
-    # fmt: off
-    parser_re = re.compile(
-        r"(?P<std>[^<0-9:.+-]+|<[a-zA-Z0-9+\-]+>)" +
-        r"((?P<stdoff>[+-]?\d{1,2}(:\d{2}(:\d{2})?)?)" +
-            r"((?P<dst>[^0-9:.+-]+|<[a-zA-Z0-9+\-]+>)" +
-                r"((?P<dstoff>[+-]?\d{1,2}(:\d{2}(:\d{2})?)?))?" +
-            r")?" + # dst
-        r")?$" # stdoff
-    )
-    # fmt: on
-
-    m = parser_re.match(offset_str)
-
-    if m is None:
-        raise ValueError(f"{tz_str} is not a valid TZ string")
-
-    std_abbr = m.group("std")
-    dst_abbr = m.group("dst")
-    dst_offset = None
-
-    std_abbr = std_abbr.strip("<>")
-
-    if dst_abbr:
-        dst_abbr = dst_abbr.strip("<>")
-
-    std_offset = m.group("stdoff")
-    if std_offset:
-        try:
-            std_offset = _parse_tz_delta(std_offset)
-        except ValueError as e:
-            raise ValueError(f"Invalid STD offset in {tz_str}") from e
-    else:
-        std_offset = 0
-
-    if dst_abbr is not None:
-        dst_offset = m.group("dstoff")
-        if dst_offset:
-            try:
-                dst_offset = _parse_tz_delta(dst_offset)
-            except ValueError as e:
-                raise ValueError(f"Invalid DST offset in {tz_str}") from e
-        else:
-            dst_offset = std_offset + 3600
-
-        if not start_end_str:
-            raise ValueError(f"Missing transition rules: {tz_str}")
-
-        start_end_strs = start_end_str[0].split(",", 1)
-        try:
-            start, end = (_parse_dst_start_end(x) for x in start_end_strs)
-        except ValueError as e:
-            raise ValueError(f"Invalid TZ string: {tz_str}") from e
-
-        return _TZStr(std_abbr, std_offset, dst_abbr, dst_offset, start, end)
-    elif start_end_str:
-        raise ValueError(f"Transition rule present without DST: {tz_str}")
-    else:
-        # This is a static ttinfo, don't return _TZStr
-        return _ttinfo(
-            _load_timedelta(std_offset), _load_timedelta(0), std_abbr
-        )
-
-
-def _parse_dst_start_end(dststr):
-    date, *time = dststr.split("/")
-    if date[0] == "M":
-        n_is_julian = False
-        m = re.match(r"M(\d{1,2})\.(\d).(\d)$", date)
-        if m is None:
-            raise ValueError(f"Invalid dst start/end date: {dststr}")
-        date_offset = tuple(map(int, m.groups()))
-        offset = _CalendarOffset(*date_offset)
-    else:
-        if date[0] == "J":
-            n_is_julian = True
-            date = date[1:]
-        else:
-            n_is_julian = False
-
-        doy = int(date)
-        offset = _DayOffset(doy, n_is_julian)
-
-    if time:
-        time_components = list(map(int, time[0].split(":")))
-        n_components = len(time_components)
-        if n_components < 3:
-            time_components.extend([0] * (3 - n_components))
-        offset.hour, offset.minute, offset.second = time_components
-
-    return offset
-
-
-def _parse_tz_delta(tz_delta):
-    match = re.match(
-        r"(?P<sign>[+-])?(?P<h>\d{1,2})(:(?P<m>\d{2})(:(?P<s>\d{2}))?)?",
-        tz_delta,
-    )
-    # Anything passed to this function should already have hit an equivalent
-    # regular expression to find the section to parse.
-    assert match is not None, tz_delta
-
-    h, m, s = (
-        int(v) if v is not None else 0
-        for v in map(match.group, ("h", "m", "s"))
-    )
-
-    total = h * 3600 + m * 60 + s
-
-    if not -86400 < total < 86400:
-        raise ValueError(
-            "Offset must be strictly between -24h and +24h:" + tz_delta
-        )
-
-    # Yes, +5 maps to an offset of -5h
-    if match.group("sign") != "-":
-        total *= -1
-
-    return total
diff --git a/libs/PlexAPI-4.16.1.dist-info/INSTALLER b/libs/backports_functools_lru_cache-2.0.0.dist-info/INSTALLER
similarity index 100%
rename from libs/PlexAPI-4.16.1.dist-info/INSTALLER
rename to libs/backports_functools_lru_cache-2.0.0.dist-info/INSTALLER
diff --git a/libs/backports_functools_lru_cache-2.0.0.dist-info/METADATA b/libs/backports_functools_lru_cache-2.0.0.dist-info/METADATA
new file mode 100644
index 0000000000..2f022061f2
--- /dev/null
+++ b/libs/backports_functools_lru_cache-2.0.0.dist-info/METADATA
@@ -0,0 +1,81 @@
+Metadata-Version: 2.4
+Name: backports.functools_lru_cache
+Version: 2.0.0
+Summary: Backport of functools.lru_cache
+Home-page: https://github.com/jaraco/backports.functools_lru_cache
+Author: Raymond Hettinger
+Author-email: raymond.hettinger@gmail.com
+Maintainer: Jason R. Coombs
+Maintainer-email: jaraco@jaraco.com
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.8
+License-File: LICENSE
+Provides-Extra: testing
+Requires-Dist: pytest>=6; extra == "testing"
+Requires-Dist: pytest-checkdocs>=2.4; extra == "testing"
+Requires-Dist: pytest-black>=0.3.7; platform_python_implementation != "PyPy" and extra == "testing"
+Requires-Dist: pytest-cov; extra == "testing"
+Requires-Dist: pytest-mypy>=0.9.1; platform_python_implementation != "PyPy" and extra == "testing"
+Requires-Dist: pytest-enabler>=2.2; extra == "testing"
+Requires-Dist: pytest-ruff; extra == "testing"
+Provides-Extra: docs
+Requires-Dist: sphinx>=3.5; extra == "docs"
+Requires-Dist: sphinx<7.2.5; extra == "docs"
+Requires-Dist: jaraco.packaging>=9.3; extra == "docs"
+Requires-Dist: rst.linker>=1.9; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Requires-Dist: sphinx-lint; extra == "docs"
+Requires-Dist: jaraco.tidelift>=1.4; extra == "docs"
+Dynamic: license-file
+
+.. image:: https://img.shields.io/pypi/v/backports.functools_lru_cache.svg
+   :target: https://pypi.org/project/backports.functools_lru_cache
+
+.. image:: https://img.shields.io/pypi/pyversions/backports.functools_lru_cache.svg
+
+.. image:: https://github.com/jaraco/backports.functools_lru_cache/actions/workflows/main.yml/badge.svg
+   :target: https://github.com/jaraco/backports.functools_lru_cache/actions?query=workflow%3A%22tests%22
+   :alt: tests
+
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+   :target: https://github.com/psf/black
+   :alt: Code style: Black
+
+.. image:: https://readthedocs.org/projects/backportsfunctools_lru_cache/badge/?version=latest
+   :target: https://backportsfunctools_lru_cache.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://img.shields.io/badge/skeleton-2023-informational
+   :target: https://blog.jaraco.com/skeleton
+
+.. image:: https://tidelift.com/badges/package/pypi/backports.functools_lru_cache
+   :target: https://tidelift.com/subscription/pkg/pypi-backports.functools_lru_cache?utm_source=pypi-backports.functools_lru_cache&utm_medium=readme
+
+Backport of functools.lru_cache from Python 3.3 as published at `ActiveState
+<http://code.activestate.com/recipes/578078/>`_.
+
+Usage
+=====
+
+Consider using this technique for importing the 'lru_cache' function::
+
+    try:
+        from functools import lru_cache
+    except ImportError:
+        from backports.functools_lru_cache import lru_cache
+
+
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-backports.functools_lru_cache?utm_source=pypi-backports.functools_lru_cache&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/backports_functools_lru_cache-2.0.0.dist-info/RECORD b/libs/backports_functools_lru_cache-2.0.0.dist-info/RECORD
new file mode 100644
index 0000000000..8cc8e3c995
--- /dev/null
+++ b/libs/backports_functools_lru_cache-2.0.0.dist-info/RECORD
@@ -0,0 +1,9 @@
+backports/__init__.py,sha256=iOEMwnlORWezdO8-2vxBIPSR37D7JGjluZ8f55vzxls,81
+backports/functools_lru_cache.py,sha256=IwQSQZ26u76HImCyxb5sHso1n9md1K82DP28KLvw31I,9152
+backports_functools_lru_cache-2.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+backports_functools_lru_cache-2.0.0.dist-info/METADATA,sha256=oOv9genoucykMrG8tw0YOD8snfFR09zQA4_b8oyfE0o,3487
+backports_functools_lru_cache-2.0.0.dist-info/RECORD,,
+backports_functools_lru_cache-2.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+backports_functools_lru_cache-2.0.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+backports_functools_lru_cache-2.0.0.dist-info/licenses/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
+backports_functools_lru_cache-2.0.0.dist-info/top_level.txt,sha256=cGjaLMOoBR1FK0ApojtzWVmViTtJ7JGIK_HwXiEsvtU,10
diff --git a/libs/PlexAPI-4.16.1.dist-info/REQUESTED b/libs/backports_functools_lru_cache-2.0.0.dist-info/REQUESTED
similarity index 100%
rename from libs/PlexAPI-4.16.1.dist-info/REQUESTED
rename to libs/backports_functools_lru_cache-2.0.0.dist-info/REQUESTED
diff --git a/libs/backports_functools_lru_cache-2.0.0.dist-info/WHEEL b/libs/backports_functools_lru_cache-2.0.0.dist-info/WHEEL
new file mode 100644
index 0000000000..798dd6195b
--- /dev/null
+++ b/libs/backports_functools_lru_cache-2.0.0.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/LICENSE b/libs/backports_functools_lru_cache-2.0.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/backports.functools_lru_cache-2.0.0.dist-info/LICENSE
rename to libs/backports_functools_lru_cache-2.0.0.dist-info/licenses/LICENSE
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/top_level.txt b/libs/backports_functools_lru_cache-2.0.0.dist-info/top_level.txt
similarity index 100%
rename from libs/backports.functools_lru_cache-2.0.0.dist-info/top_level.txt
rename to libs/backports_functools_lru_cache-2.0.0.dist-info/top_level.txt
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/METADATA b/libs/beautifulsoup4-4.12.3.dist-info/METADATA
deleted file mode 100644
index 13acac3832..0000000000
--- a/libs/beautifulsoup4-4.12.3.dist-info/METADATA
+++ /dev/null
@@ -1,122 +0,0 @@
-Metadata-Version: 2.3
-Name: beautifulsoup4
-Version: 4.12.3
-Summary: Screen-scraping library
-Project-URL: Download, https://www.crummy.com/software/BeautifulSoup/bs4/download/
-Project-URL: Homepage, https://www.crummy.com/software/BeautifulSoup/bs4/
-Author-email: Leonard Richardson <leonardr@segfault.org>
-License: MIT License
-License-File: AUTHORS
-License-File: LICENSE
-Keywords: HTML,XML,parse,soup
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Text Processing :: Markup :: HTML
-Classifier: Topic :: Text Processing :: Markup :: SGML
-Classifier: Topic :: Text Processing :: Markup :: XML
-Requires-Python: >=3.6.0
-Requires-Dist: soupsieve>1.2
-Provides-Extra: cchardet
-Requires-Dist: cchardet; extra == 'cchardet'
-Provides-Extra: chardet
-Requires-Dist: chardet; extra == 'chardet'
-Provides-Extra: charset-normalizer
-Requires-Dist: charset-normalizer; extra == 'charset-normalizer'
-Provides-Extra: html5lib
-Requires-Dist: html5lib; extra == 'html5lib'
-Provides-Extra: lxml
-Requires-Dist: lxml; extra == 'lxml'
-Description-Content-Type: text/markdown
-
-Beautiful Soup is a library that makes it easy to scrape information
-from web pages. It sits atop an HTML or XML parser, providing Pythonic
-idioms for iterating, searching, and modifying the parse tree.
-
-# Quick start
-
-```
->>> from bs4 import BeautifulSoup
->>> soup = BeautifulSoup("<p>Some<b>bad<i>HTML")
->>> print(soup.prettify())
-<html>
- <body>
-  <p>
-   Some
-   <b>
-    bad
-    <i>
-     HTML
-    </i>
-   </b>
-  </p>
- </body>
-</html>
->>> soup.find(text="bad")
-'bad'
->>> soup.i
-<i>HTML</i>
-#
->>> soup = BeautifulSoup("<tag1>Some<tag2/>bad<tag3>XML", "xml")
-#
->>> print(soup.prettify())
-<?xml version="1.0" encoding="utf-8"?>
-<tag1>
- Some
- <tag2/>
- bad
- <tag3>
-  XML
- </tag3>
-</tag1>
-```
-
-To go beyond the basics, [comprehensive documentation is available](https://www.crummy.com/software/BeautifulSoup/bs4/doc/).
-
-# Links
-
-* [Homepage](https://www.crummy.com/software/BeautifulSoup/bs4/)
-* [Documentation](https://www.crummy.com/software/BeautifulSoup/bs4/doc/)
-* [Discussion group](https://groups.google.com/group/beautifulsoup/)
-* [Development](https://code.launchpad.net/beautifulsoup/)
-* [Bug tracker](https://bugs.launchpad.net/beautifulsoup/)
-* [Complete changelog](https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/CHANGELOG)
-
-# Note on Python 2 sunsetting
-
-Beautiful Soup's support for Python 2 was discontinued on December 31,
-2020: one year after the sunset date for Python 2 itself. From this
-point onward, new Beautiful Soup development will exclusively target
-Python 3. The final release of Beautiful Soup 4 to support Python 2
-was 4.9.3.
-
-# Supporting the project
-
-If you use Beautiful Soup as part of your professional work, please consider a
-[Tidelift subscription](https://tidelift.com/subscription/pkg/pypi-beautifulsoup4?utm_source=pypi-beautifulsoup4&utm_medium=referral&utm_campaign=readme).
-This will support many of the free software projects your organization
-depends on, not just Beautiful Soup.
-
-If you use Beautiful Soup for personal projects, the best way to say
-thank you is to read
-[Tool Safety](https://www.crummy.com/software/BeautifulSoup/zine/), a zine I
-wrote about what Beautiful Soup has taught me about software
-development.
-
-# Building the documentation
-
-The bs4/doc/ directory contains full documentation in Sphinx
-format. Run `make html` in that directory to create HTML
-documentation.
-
-# Running the unit tests
-
-Beautiful Soup supports unit test discovery using Pytest:
-
-```
-$ pytest
-```
-
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/RECORD b/libs/beautifulsoup4-4.12.3.dist-info/RECORD
deleted file mode 100644
index 78a653b9fc..0000000000
--- a/libs/beautifulsoup4-4.12.3.dist-info/RECORD
+++ /dev/null
@@ -1,52 +0,0 @@
-beautifulsoup4-4.12.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-beautifulsoup4-4.12.3.dist-info/METADATA,sha256=I6QhXDveDrSac0vyCKxsPJZJLZS6FW5jCCKKeBm5u2A,3790
-beautifulsoup4-4.12.3.dist-info/RECORD,,
-beautifulsoup4-4.12.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-beautifulsoup4-4.12.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-beautifulsoup4-4.12.3.dist-info/licenses/AUTHORS,sha256=uSIdbrBb1sobdXl7VrlUvuvim2dN9kF3MH4Edn0WKGE,2176
-beautifulsoup4-4.12.3.dist-info/licenses/LICENSE,sha256=VbTY1LHlvIbRDvrJG3TIe8t3UmsPW57a-LnNKtxzl7I,1441
-bs4/__init__.py,sha256=kq32cCtQiNjjU9XwjD0b1jdXN5WEC87nJqSSW3PhVkM,33822
-bs4/builder/__init__.py,sha256=nwb35ftjcwzOs2WkjVm1zvfi7FxSyJP-nN1YheIVT14,24566
-bs4/builder/_html5lib.py,sha256=0w-hmPM5wWR2iDuRCR6MvY6ZPXbg_hgddym-YWqj03s,19114
-bs4/builder/_htmlparser.py,sha256=_VD5Z08j6A9YYMR4y7ZTfdMzwiCBsSUQAPuHiYB-WZI,14923
-bs4/builder/_lxml.py,sha256=yKdMx1kdX7H2CopwSWEYm4Sgrfkd-WDj8HbskcaLauU,14948
-bs4/css.py,sha256=gqGaHRrKeCRF3gDqxzeU0uclOCeSsTpuW9gUaSnJeWc,10077
-bs4/dammit.py,sha256=G0cQfsEqfwJ-FIQMkXgCJwSHMn7t9vPepCrud6fZEKk,41158
-bs4/diagnose.py,sha256=uAwdDugL_67tB-BIwDIFLFbiuzGxP2wQzJJ4_bGYUrA,7195
-bs4/element.py,sha256=Dsol2iehkSjk10GzYgwFyjUEgpqmYZpyaAmbL0rWM2w,92845
-bs4/formatter.py,sha256=Bu4utAQYT9XDJaPPpTRM-dyxJDVLdxf_as-IU5gSY8A,7188
-bs4/tests/__init__.py,sha256=NydTegds_r7MoOEuQLS6TFmTA9TwK3KxJhwEkqjCGTQ,48392
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase,sha256=yUdXkbpNK7LVOQ0LBHMoqZ1rWaBfSXWytoO_xdSm7Ho,15
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase,sha256=Uv_dx4a43TSfoNkjU-jHW2nSXkqHFg4XdAw7SWVObUk,23
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase,sha256=OEyVA0Ej4FxswOElrUNt0In4s4YhrmtaxE_NHGZvGtg,30
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase,sha256=G4vpNBOz-RwMpi6ewEgNEa13zX0sXhmL7VHOyIcdKVQ,15347
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase,sha256=3d8z65o4p7Rur-RmCHoOjzqaYQ8EAtjmiBYTHNyAdl4,19469
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase,sha256=NfGIlit1k40Ip3mlnBkYOkIDJX6gHtjlErwl7gsBjAQ,12
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase,sha256=xy4i1U0nhFHcnyc5pRKS6JRMvuoCNUur-Scor6UxIGw,4317
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase,sha256=Q-UTYpQBUsWoMgIUspUlzveSI-41s4ABC3jajRb-K0o,11502
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase,sha256=2bq3S8KxZgk8EajLReHD8m4_0Lj_nrkyJAxB_z_U0D0,5
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase,sha256=MZDu31LPLfgu6jP9IZkrlwNes3f_sL8WFP5BChkUKdY,35
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase,sha256=w58r-s6besG5JwPXpnz37W2YTj9-_qxFbk6hiEnKeIQ,51495
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase,sha256=q8rkdMECEXKcqVhOf5zWHkSBTQeOPt0JiLg2TZiPCuk,10380
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase,sha256=QfzoOxKwNuqG-4xIrea6MOQLXhfAAOQJ0r9u-J6kSNs,19
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase,sha256=MJ2pHFuuCQUiQz1Kor2sof7LWeRERQ6QK43YNqQHg9o,47
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase,sha256=EItOpSdeD4ewK-qgJ9vtxennwn_huguzXgctrUT7fqE,3546
-bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase,sha256=a2aJTG4FceGSJXsjtxoS8S4jk_8rZsS3aznLkeO2_dY,124
-bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase,sha256=jRFRtCKlP3-3EDLc_iVRTcE6JNymv0rYcVM6qRaPrxI,2607
-bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase,sha256=7NsdCiXWAhNkmoW1pvF7rbZExyLAQIWtDtSHXIsH6YU,103
-bs4/tests/test_builder.py,sha256=nc2JE5EMrEf-p24qhf2R8qAV5PpFiOuNpYCmtmCjlTI,1115
-bs4/tests/test_builder_registry.py,sha256=7WLj2prjSHGphebnrjQuI6JYr03Uy_c9_CkaFSQ9HRo,5114
-bs4/tests/test_css.py,sha256=jCcgIWem3lyPa5AjhAk9S6fWI07hk1rg0v8coD7bEtI,17279
-bs4/tests/test_dammit.py,sha256=MbSmRN6VEP0Rm56-w6Ja0TW8eC-8ZxOJ-wXWVf_hRi8,15451
-bs4/tests/test_docs.py,sha256=xoAxnUfoQ7aRqGImwW_9BJDU8WNMZHIuvWqVepvWXt8,1127
-bs4/tests/test_element.py,sha256=92oRSRoGk8gIXAbAGHErKzocx2MK32TqcQdUJ-dGQMo,2377
-bs4/tests/test_formatter.py,sha256=eTzj91Lmhv90z-WiHjK3sBJZm0hRk0crFY1TZaXstCY,4148
-bs4/tests/test_fuzz.py,sha256=_K2utiYVkZ22mvh03g8CBioFU1QDJaff1vTaDyXhxNk,6972
-bs4/tests/test_html5lib.py,sha256=2-ipm-_MaPt37WTxEd5DodUTNhS4EbLFKPRaO6XSCW4,8322
-bs4/tests/test_htmlparser.py,sha256=wnngcIlzjEwH21JFfu_mgt6JdpLt0ncJfLcGT7HeGw0,6256
-bs4/tests/test_lxml.py,sha256=nQCmLt7bWk0id7xMumZw--PzEe1xF9PTQn3lvHyNC6I,7635
-bs4/tests/test_navigablestring.py,sha256=RGSgziNf7cZnYdEPsoqL1B2I68TUJp1JmEQVxbh_ryA,5081
-bs4/tests/test_pageelement.py,sha256=VdGjUxx3RhjqmNsJ92ao6VZC_YD7T8mdLkDZjosOYeE,14274
-bs4/tests/test_soup.py,sha256=JmnAPLE1_GXm0wmwEUN7icdvBz9HDch-qoU2mT_TDrs,19877
-bs4/tests/test_tag.py,sha256=FBPDUisDCbFmvl5HmTtN49CGo3YoUXh5Wiuw5FMLS5E,9616
-bs4/tests/test_tree.py,sha256=n9nTQOzJb3-ZnZ6AkmMdZQ5TYcTUPnqHoVgal0mYXfg,48129
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/WHEEL b/libs/beautifulsoup4-4.12.3.dist-info/WHEEL
deleted file mode 100644
index cdd68a497c..0000000000
--- a/libs/beautifulsoup4-4.12.3.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.25.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/licenses/AUTHORS b/libs/beautifulsoup4-4.12.3.dist-info/licenses/AUTHORS
deleted file mode 100644
index 1f14fe07de..0000000000
--- a/libs/beautifulsoup4-4.12.3.dist-info/licenses/AUTHORS
+++ /dev/null
@@ -1,49 +0,0 @@
-Behold, mortal, the origins of Beautiful Soup...
-================================================
-
-Leonard Richardson is the primary maintainer.
-
-Aaron DeVore and Isaac Muse have made significant contributions to the
-code base.
-
-Mark Pilgrim provided the encoding detection code that forms the base
-of UnicodeDammit.
-
-Thomas Kluyver and Ezio Melotti finished the work of getting Beautiful
-Soup 4 working under Python 3.
-
-Simon Willison wrote soupselect, which was used to make Beautiful Soup
-support CSS selectors. Isaac Muse wrote SoupSieve, which made it
-possible to _remove_ the CSS selector code from Beautiful Soup.
-
-Sam Ruby helped with a lot of edge cases.
-
-Jonathan Ellis was awarded the prestigious Beau Potage D'Or for his
-work in solving the nestable tags conundrum.
-
-An incomplete list of people have contributed patches to Beautiful
-Soup:
-
- Istvan Albert, Andrew Lin, Anthony Baxter, Oliver Beattie, Andrew
-Boyko, Tony Chang, Francisco Canas, "Delong", Zephyr Fang, Fuzzy,
-Roman Gaufman, Yoni Gilad, Richie Hindle, Toshihiro Kamiya, Peteris
-Krumins, Kent Johnson, Marek Kapolka, Andreas Kostyrka, Roel Kramer,
-Ben Last, Robert Leftwich, Stefaan Lippens, "liquider", Staffan
-Malmgren, Ksenia Marasanova, JP Moins, Adam Monsen, John Nagle, "Jon",
-Ed Oskiewicz, Martijn Peters, Greg Phillips, Giles Radford, Stefano
-Revera, Arthur Rudolph, Marko Samastur, James Salter, Jouni Seppไnen,
-Alexander Schmolck, Tim Shirley, Geoffrey Sneddon, Ville Skyttไ,
-"Vikas", Jens Svalgaard, Andy Theyers, Eric Weiser, Glyn Webster, John
-Wiseman, Paul Wright, Danny Yoo
-
-An incomplete list of people who made suggestions or found bugs or
-found ways to break Beautiful Soup:
-
- Hanno B๖ck, Matteo Bertini, Chris Curvey, Simon Cusack, Bruce Eckel,
- Matt Ernst, Michael Foord, Tom Harris, Bill de hOra, Donald Howes,
- Matt Patterson, Scott Roberts, Steve Strassmann, Mike Williams,
- warchild at redho dot com, Sami Kuisma, Carlos Rocha, Bob Hutchison,
- Joren Mc, Michal Migurski, John Kleven, Tim Heaney, Tripp Lilley, Ed
- Summers, Dennis Sutch, Chris Smith, Aaron Swartz, Stuart
- Turner, Greg Edwards, Kevin J Kalupson, Nikos Kouremenos, Artur de
- Sousa Rocha, Yichun Wei, Per Vognsen
diff --git a/libs/PyYAML-6.0.2.dist-info/INSTALLER b/libs/beautifulsoup4-4.14.3.dist-info/INSTALLER
similarity index 100%
rename from libs/PyYAML-6.0.2.dist-info/INSTALLER
rename to libs/beautifulsoup4-4.14.3.dist-info/INSTALLER
diff --git a/libs/beautifulsoup4-4.14.3.dist-info/METADATA b/libs/beautifulsoup4-4.14.3.dist-info/METADATA
new file mode 100644
index 0000000000..7fd97b7693
--- /dev/null
+++ b/libs/beautifulsoup4-4.14.3.dist-info/METADATA
@@ -0,0 +1,123 @@
+Metadata-Version: 2.4
+Name: beautifulsoup4
+Version: 4.14.3
+Summary: Screen-scraping library
+Project-URL: Download, https://www.crummy.com/software/BeautifulSoup/bs4/download/
+Project-URL: Homepage, https://www.crummy.com/software/BeautifulSoup/bs4/
+Author-email: Leonard Richardson <leonardr@segfault.org>
+License: MIT License
+License-File: AUTHORS
+License-File: LICENSE
+Keywords: HTML,XML,parse,soup
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Markup :: HTML
+Classifier: Topic :: Text Processing :: Markup :: SGML
+Classifier: Topic :: Text Processing :: Markup :: XML
+Requires-Python: >=3.7.0
+Requires-Dist: soupsieve>=1.6.1
+Requires-Dist: typing-extensions>=4.0.0
+Provides-Extra: cchardet
+Requires-Dist: cchardet; extra == 'cchardet'
+Provides-Extra: chardet
+Requires-Dist: chardet; extra == 'chardet'
+Provides-Extra: charset-normalizer
+Requires-Dist: charset-normalizer; extra == 'charset-normalizer'
+Provides-Extra: html5lib
+Requires-Dist: html5lib; extra == 'html5lib'
+Provides-Extra: lxml
+Requires-Dist: lxml; extra == 'lxml'
+Description-Content-Type: text/markdown
+
+Beautiful Soup is a library that makes it easy to scrape information
+from web pages. It sits atop an HTML or XML parser, providing Pythonic
+idioms for iterating, searching, and modifying the parse tree.
+
+# Quick start
+
+```
+>>> from bs4 import BeautifulSoup
+>>> soup = BeautifulSoup("<p>Some<b>bad<i>HTML")
+>>> print(soup.prettify())
+<html>
+ <body>
+  <p>
+   Some
+   <b>
+    bad
+    <i>
+     HTML
+    </i>
+   </b>
+  </p>
+ </body>
+</html>
+>>> soup.find(string="bad")
+'bad'
+>>> soup.i
+<i>HTML</i>
+#
+>>> soup = BeautifulSoup("<tag1>Some<tag2/>bad<tag3>XML", "xml")
+#
+>>> print(soup.prettify())
+<?xml version="1.0" encoding="utf-8"?>
+<tag1>
+ Some
+ <tag2/>
+ bad
+ <tag3>
+  XML
+ </tag3>
+</tag1>
+```
+
+To go beyond the basics, [comprehensive documentation is available](https://www.crummy.com/software/BeautifulSoup/bs4/doc/).
+
+# Links
+
+* [Homepage](https://www.crummy.com/software/BeautifulSoup/bs4/)
+* [Documentation](https://www.crummy.com/software/BeautifulSoup/bs4/doc/)
+* [Discussion group](https://groups.google.com/group/beautifulsoup/)
+* [Development](https://code.launchpad.net/beautifulsoup/)
+* [Bug tracker](https://bugs.launchpad.net/beautifulsoup/)
+* [Complete changelog](https://git.launchpad.net/beautifulsoup/tree/CHANGELOG)
+
+# Note on Python 2 sunsetting
+
+Beautiful Soup's support for Python 2 was discontinued on December 31,
+2020: one year after the sunset date for Python 2 itself. From this
+point onward, new Beautiful Soup development will exclusively target
+Python 3. The final release of Beautiful Soup 4 to support Python 2
+was 4.9.3.
+
+# Supporting the project
+
+If you use Beautiful Soup as part of your professional work, please consider a
+[Tidelift subscription](https://tidelift.com/subscription/pkg/pypi-beautifulsoup4?utm_source=pypi-beautifulsoup4&utm_medium=referral&utm_campaign=readme).
+This will support many of the free software projects your organization
+depends on, not just Beautiful Soup.
+
+If you use Beautiful Soup for personal projects, the best way to say
+thank you is to read
+[Tool Safety](https://www.crummy.com/software/BeautifulSoup/zine/), a zine I
+wrote about what Beautiful Soup has taught me about software
+development.
+
+# Building the documentation
+
+The bs4/doc/ directory contains full documentation in Sphinx
+format. Run `make html` in that directory to create HTML
+documentation.
+
+# Running the unit tests
+
+Beautiful Soup supports unit test discovery using Pytest:
+
+```
+$ pytest
+```
+
diff --git a/libs/beautifulsoup4-4.14.3.dist-info/RECORD b/libs/beautifulsoup4-4.14.3.dist-info/RECORD
new file mode 100644
index 0000000000..6d84e6774a
--- /dev/null
+++ b/libs/beautifulsoup4-4.14.3.dist-info/RECORD
@@ -0,0 +1,23 @@
+beautifulsoup4-4.14.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+beautifulsoup4-4.14.3.dist-info/METADATA,sha256=Ac93vA8Xp9FtgOcKXFM8ESfVdztimUfJ3WUpVlhKtsY,3812
+beautifulsoup4-4.14.3.dist-info/RECORD,,
+beautifulsoup4-4.14.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+beautifulsoup4-4.14.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+beautifulsoup4-4.14.3.dist-info/licenses/AUTHORS,sha256=uYkjiRjh_aweRnF8tAW2PpJJeickE68NmJwd9siry28,2201
+beautifulsoup4-4.14.3.dist-info/licenses/LICENSE,sha256=VbTY1LHlvIbRDvrJG3TIe8t3UmsPW57a-LnNKtxzl7I,1441
+bs4/__init__.py,sha256=E7wiVp7oQK0JhdAYxpehZa8drv3W_sJv5oeTFiBfR5o,44386
+bs4/_deprecation.py,sha256=niHJCk37APg8KEuFOa57ZXaxLdBmc_2V6uuaJqu7r30,2408
+bs4/_typing.py,sha256=zNcx7R1yCTK8WwtumP28hc7CJ3pMyZXj_VAeYaNXMZA,7549
+bs4/_warnings.py,sha256=ZuOETgcnEbZgw2N0nnNXn6wvtrn2ut7AF0d98bvkMFc,4711
+bs4/builder/__init__.py,sha256=Rl4qjOXvdyyyjayOFqbkgoUoo81IgoyKD-RwWeVK59g,31194
+bs4/builder/_html5lib.py,sha256=hL6xUk4_I2i5CMguFoYFlrI26cY4Dut7fOEQrUctHIM,23607
+bs4/builder/_htmlparser.py,sha256=CnULPQV2rm4vLojJABpQ7Xm9diddnEZx2Wcz_VTC1Mg,17445
+bs4/builder/_lxml.py,sha256=ks1e8boA_nOA2oomAhxeudccR6ThbEE-EllFqHRoPLA,18969
+bs4/css.py,sha256=_m_l_4SGWHnY620VJ21j_qQH1RX3p91sYVemgKxaLsM,12713
+bs4/dammit.py,sha256=ZJWa9K32X6N2imFHleqUq0ekf592weU1lvULN_WYWYk,57024
+bs4/diagnose.py,sha256=at98iuxyOrqec4V8iwkTIbNUqBCsq9Lr3fDAQx2129Y,7846
+bs4/element.py,sha256=oXmj7LG_2NpsDK90mq73q0PMK0FjFBIGSeTTJLVwwTc,120237
+bs4/exceptions.py,sha256=Q9FOadNe8QRvzDMaKSXe2Wtl8JK_oAZW7mbFZBVP_GE,951
+bs4/filter.py,sha256=rw8ZNhTDLEJVCEiSifou5tZR_3zBLeuvAyouY82qU_E,29201
+bs4/formatter.py,sha256=uBT0k6W8O5kJ9PCuJYjra97yoUqC-dlM9D_v-oRM0r8,10478
+bs4/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/PyYAML-6.0.2.dist-info/REQUESTED b/libs/beautifulsoup4-4.14.3.dist-info/REQUESTED
similarity index 100%
rename from libs/PyYAML-6.0.2.dist-info/REQUESTED
rename to libs/beautifulsoup4-4.14.3.dist-info/REQUESTED
diff --git a/libs/beautifulsoup4-4.14.3.dist-info/WHEEL b/libs/beautifulsoup4-4.14.3.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/beautifulsoup4-4.14.3.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/beautifulsoup4-4.14.3.dist-info/licenses/AUTHORS b/libs/beautifulsoup4-4.14.3.dist-info/licenses/AUTHORS
new file mode 100644
index 0000000000..18926c29de
--- /dev/null
+++ b/libs/beautifulsoup4-4.14.3.dist-info/licenses/AUTHORS
@@ -0,0 +1,49 @@
+Behold, mortal, the origins of Beautiful Soup...
+================================================
+
+Leonard Richardson is the primary maintainer.
+
+Aaron DeVore, Isaac Muse and Chris Papademetrious have made
+significant contributions to the code base.
+
+Mark Pilgrim provided the encoding detection code that forms the base
+of UnicodeDammit.
+
+Thomas Kluyver and Ezio Melotti finished the work of getting Beautiful
+Soup 4 working under Python 3.
+
+Simon Willison wrote soupselect, which was used to make Beautiful Soup
+support CSS selectors. Isaac Muse wrote SoupSieve, which made it
+possible to _remove_ the CSS selector code from Beautiful Soup.
+
+Sam Ruby helped with a lot of edge cases.
+
+Jonathan Ellis was awarded the prestigious Beau Potage D'Or for his
+work in solving the nestable tags conundrum.
+
+An incomplete list of people have contributed patches to Beautiful
+Soup:
+
+ Istvan Albert, Andrew Lin, Anthony Baxter, Oliver Beattie, Andrew
+Boyko, Tony Chang, Francisco Canas, "Delong", Zephyr Fang, Fuzzy,
+Roman Gaufman, Yoni Gilad, Richie Hindle, Toshihiro Kamiya, Peteris
+Krumins, Kent Johnson, Marek Kapolka, Andreas Kostyrka, Roel Kramer,
+Ben Last, Robert Leftwich, Stefaan Lippens, "liquider", Staffan
+Malmgren, Ksenia Marasanova, JP Moins, Adam Monsen, John Nagle, "Jon",
+Ed Oskiewicz, Martijn Peters, Greg Phillips, Giles Radford, Stefano
+Revera, Arthur Rudolph, Marko Samastur, James Salter, Jouni Seppรคnen,
+Alexander Schmolck, Tim Shirley, Geoffrey Sneddon, Ville Skyttรค,
+"Vikas", Jens Svalgaard, Andy Theyers, Eric Weiser, Glyn Webster, John
+Wiseman, Paul Wright, Danny Yoo
+
+An incomplete list of people who made suggestions or found bugs or
+found ways to break Beautiful Soup:
+
+ Hanno Bรถck, Matteo Bertini, Chris Curvey, Simon Cusack, Bruce Eckel,
+ Matt Ernst, Michael Foord, Tom Harris, Bill de hOra, Donald Howes,
+ Matt Patterson, Scott Roberts, Steve Strassmann, Mike Williams,
+ warchild at redho dot com, Sami Kuisma, Carlos Rocha, Bob Hutchison,
+ Joren Mc, Michal Migurski, John Kleven, Tim Heaney, Tripp Lilley, Ed
+ Summers, Dennis Sutch, Chris Smith, Aaron Swartz, Stuart
+ Turner, Greg Edwards, Kevin J Kalupson, Nikos Kouremenos, Artur de
+ Sousa Rocha, Yichun Wei, Per Vognsen
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/licenses/LICENSE b/libs/beautifulsoup4-4.14.3.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/beautifulsoup4-4.12.3.dist-info/licenses/LICENSE
rename to libs/beautifulsoup4-4.14.3.dist-info/licenses/LICENSE
diff --git a/libs/bidict-0.23.1.dist-info/METADATA b/libs/bidict-0.23.1.dist-info/METADATA
index 5356d231e4..9fc0309f16 100644
--- a/libs/bidict-0.23.1.dist-info/METADATA
+++ b/libs/bidict-0.23.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: bidict
 Version: 0.23.1
 Summary: The bidirectional mapping library for Python.
@@ -17,6 +17,7 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
+Dynamic: license-file
 
 .. role:: doc
 .. (Forward declaration for the "doc" role that Sphinx defines for interop with renderers that
diff --git a/libs/bidict-0.23.1.dist-info/RECORD b/libs/bidict-0.23.1.dist-info/RECORD
index 4f4482ad27..60fd864560 100644
--- a/libs/bidict-0.23.1.dist-info/RECORD
+++ b/libs/bidict-0.23.1.dist-info/RECORD
@@ -1,9 +1,9 @@
 bidict-0.23.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-bidict-0.23.1.dist-info/LICENSE,sha256=8_U63OyqSNc6ZuI4-lupBstBh2eDtF0ooTRrMULuvZo,16784
-bidict-0.23.1.dist-info/METADATA,sha256=2ovIRm6Df8gdwAMekGqkeBSF5TWj2mv1jpmh4W4ks7o,8704
+bidict-0.23.1.dist-info/METADATA,sha256=cmmbczBTsqM7jOSSaFb-q4Z01dX535OCZ0CLruJxf2g,8726
 bidict-0.23.1.dist-info/RECORD,,
 bidict-0.23.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bidict-0.23.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+bidict-0.23.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+bidict-0.23.1.dist-info/licenses/LICENSE,sha256=8_U63OyqSNc6ZuI4-lupBstBh2eDtF0ooTRrMULuvZo,16784
 bidict-0.23.1.dist-info/top_level.txt,sha256=WuQO02jp0ODioS7sJoaHg3JJ5_3h6Sxo9RITvNGPYmc,7
 bidict/__init__.py,sha256=pL87KsrDpBsl3AG09LQk1t1TSFt0hIJVYa2POMdErN8,4398
 bidict/_abc.py,sha256=SMCNdCsmqSWg0OGnMZtnnXY8edjXcyZup5tva4HBm_c,3172
diff --git a/libs/bidict-0.23.1.dist-info/WHEEL b/libs/bidict-0.23.1.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/bidict-0.23.1.dist-info/WHEEL
+++ b/libs/bidict-0.23.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/bidict-0.23.1.dist-info/LICENSE b/libs/bidict-0.23.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/bidict-0.23.1.dist-info/LICENSE
rename to libs/bidict-0.23.1.dist-info/licenses/LICENSE
diff --git a/libs/blinker-1.8.2.dist-info/METADATA b/libs/blinker-1.8.2.dist-info/METADATA
deleted file mode 100644
index 265a62023d..0000000000
--- a/libs/blinker-1.8.2.dist-info/METADATA
+++ /dev/null
@@ -1,60 +0,0 @@
-Metadata-Version: 2.3
-Name: blinker
-Version: 1.8.2
-Summary: Fast, simple object-to-object and broadcast signaling
-Author: Jason Kirtland
-Maintainer-email: Pallets Ecosystem <contact@palletsprojects.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Typing :: Typed
-Project-URL: Chat, https://discord.gg/pallets
-Project-URL: Documentation, https://blinker.readthedocs.io
-Project-URL: Source, https://github.com/pallets-eco/blinker/
-
-# Blinker
-
-Blinker provides a fast dispatching system that allows any number of
-interested parties to subscribe to events, or "signals".
-
-
-## Pallets Community Ecosystem
-
-> [!IMPORTANT]\
-> This project is part of the Pallets Community Ecosystem. Pallets is the open
-> source organization that maintains Flask; Pallets-Eco enables community
-> maintenance of related projects. If you are interested in helping maintain
-> this project, please reach out on [the Pallets Discord server][discord].
->
-> [discord]: https://discord.gg/pallets
-
-
-## Example
-
-Signal receivers can subscribe to specific senders or receive signals
-sent by any sender.
-
-```pycon
->>> from blinker import signal
->>> started = signal('round-started')
->>> def each(round):
-...     print(f"Round {round}")
-...
->>> started.connect(each)
-
->>> def round_two(round):
-...     print("This is round two.")
-...
->>> started.connect(round_two, sender=2)
-
->>> for round in range(1, 4):
-...     started.send(round)
-...
-Round 1!
-Round 2!
-This is round two.
-Round 3!
-```
-
diff --git a/libs/blinker-1.8.2.dist-info/RECORD b/libs/blinker-1.8.2.dist-info/RECORD
deleted file mode 100644
index d847313ba5..0000000000
--- a/libs/blinker-1.8.2.dist-info/RECORD
+++ /dev/null
@@ -1,10 +0,0 @@
-blinker-1.8.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-blinker-1.8.2.dist-info/LICENSE.txt,sha256=nrc6HzhZekqhcCXSrhvjg5Ykx5XphdTw6Xac4p-spGc,1054
-blinker-1.8.2.dist-info/METADATA,sha256=85eZNsH1XXOq69piDlG96OppJLB4BvbSv-FwtkUx1Hw,1633
-blinker-1.8.2.dist-info/RECORD,,
-blinker-1.8.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-blinker-1.8.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-blinker/__init__.py,sha256=ymyJY_PoTgBzaPgdr4dq-RRsGh7D-sYQIGMNp8Rx4qc,1577
-blinker/_utilities.py,sha256=0J7eeXXTUx0Ivf8asfpx0ycVkp0Eqfqnj117x2mYX9E,1675
-blinker/base.py,sha256=nIZJEtXQ8LLZZJrwVp2wQcdfCzDixvAHR9VpSWiyVcQ,22574
-blinker/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/blinker-1.8.2.dist-info/WHEEL b/libs/blinker-1.8.2.dist-info/WHEEL
deleted file mode 100644
index e3c6feefa2..0000000000
--- a/libs/blinker-1.8.2.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.10.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/INSTALLER b/libs/blinker-1.9.0.dist-info/INSTALLER
similarity index 100%
rename from libs/SQLAlchemy-2.0.37.dist-info/INSTALLER
rename to libs/blinker-1.9.0.dist-info/INSTALLER
diff --git a/libs/blinker-1.9.0.dist-info/METADATA b/libs/blinker-1.9.0.dist-info/METADATA
new file mode 100644
index 0000000000..56802fac40
--- /dev/null
+++ b/libs/blinker-1.9.0.dist-info/METADATA
@@ -0,0 +1,61 @@
+Metadata-Version: 2.4
+Name: blinker
+Version: 1.9.0
+Summary: Fast, simple object-to-object and broadcast signaling
+Author: Jason Kirtland
+Maintainer-email: Pallets Ecosystem <contact@palletsprojects.com>
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Typing :: Typed
+License-File: LICENSE.txt
+Project-URL: Chat, https://discord.gg/pallets
+Project-URL: Documentation, https://blinker.readthedocs.io
+Project-URL: Source, https://github.com/pallets-eco/blinker/
+
+# Blinker
+
+Blinker provides a fast dispatching system that allows any number of
+interested parties to subscribe to events, or "signals".
+
+
+## Pallets Community Ecosystem
+
+> [!IMPORTANT]\
+> This project is part of the Pallets Community Ecosystem. Pallets is the open
+> source organization that maintains Flask; Pallets-Eco enables community
+> maintenance of related projects. If you are interested in helping maintain
+> this project, please reach out on [the Pallets Discord server][discord].
+>
+> [discord]: https://discord.gg/pallets
+
+
+## Example
+
+Signal receivers can subscribe to specific senders or receive signals
+sent by any sender.
+
+```pycon
+>>> from blinker import signal
+>>> started = signal('round-started')
+>>> def each(round):
+...     print(f"Round {round}")
+...
+>>> started.connect(each)
+
+>>> def round_two(round):
+...     print("This is round two.")
+...
+>>> started.connect(round_two, sender=2)
+
+>>> for round in range(1, 4):
+...     started.send(round)
+...
+Round 1!
+Round 2!
+This is round two.
+Round 3!
+```
+
diff --git a/libs/blinker-1.9.0.dist-info/RECORD b/libs/blinker-1.9.0.dist-info/RECORD
new file mode 100644
index 0000000000..c6335bbe0a
--- /dev/null
+++ b/libs/blinker-1.9.0.dist-info/RECORD
@@ -0,0 +1,10 @@
+blinker-1.9.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+blinker-1.9.0.dist-info/METADATA,sha256=Hm3ML4yc6CZezNGpUtlvXKx1rmrsvXD4bcPrQ9B5AeI,1659
+blinker-1.9.0.dist-info/RECORD,,
+blinker-1.9.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+blinker-1.9.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+blinker-1.9.0.dist-info/licenses/LICENSE.txt,sha256=nrc6HzhZekqhcCXSrhvjg5Ykx5XphdTw6Xac4p-spGc,1054
+blinker/__init__.py,sha256=I2EdZqpy4LyjX17Hn1yzJGWCjeLaVaPzsMgHkLfj_cQ,317
+blinker/_utilities.py,sha256=0J7eeXXTUx0Ivf8asfpx0ycVkp0Eqfqnj117x2mYX9E,1675
+blinker/base.py,sha256=QpDuvXXcwJF49lUBcH5BiST46Rz9wSG7VW_p7N_027M,19132
+blinker/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/REQUESTED b/libs/blinker-1.9.0.dist-info/REQUESTED
similarity index 100%
rename from libs/SQLAlchemy-2.0.37.dist-info/REQUESTED
rename to libs/blinker-1.9.0.dist-info/REQUESTED
diff --git a/libs/blinker-1.9.0.dist-info/WHEEL b/libs/blinker-1.9.0.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/blinker-1.9.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/blinker-1.8.2.dist-info/LICENSE.txt b/libs/blinker-1.9.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/blinker-1.8.2.dist-info/LICENSE.txt
rename to libs/blinker-1.9.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/blinker/__init__.py b/libs/blinker/__init__.py
index c93527eca8..1772fa4a54 100644
--- a/libs/blinker/__init__.py
+++ b/libs/blinker/__init__.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import typing as t
-
 from .base import ANY
 from .base import default_namespace
 from .base import NamedSignal
@@ -17,44 +15,3 @@
     "Signal",
     "signal",
 ]
-
-
-def __getattr__(name: str) -> t.Any:
-    import warnings
-
-    if name == "__version__":
-        import importlib.metadata
-
-        warnings.warn(
-            "The '__version__' attribute is deprecated and will be removed in"
-            " Blinker 1.9.0. Use feature detection or"
-            " 'importlib.metadata.version(\"blinker\")' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return importlib.metadata.version("blinker")
-
-    if name == "receiver_connected":
-        from .base import _receiver_connected
-
-        warnings.warn(
-            "The global 'receiver_connected' signal is deprecated and will be"
-            " removed in Blinker 1.9. Use 'Signal.receiver_connected' and"
-            " 'Signal.receiver_disconnected' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return _receiver_connected
-
-    if name == "WeakNamespace":
-        from .base import _WeakNamespace
-
-        warnings.warn(
-            "'WeakNamespace' is deprecated and will be removed in Blinker 1.9."
-            " Use 'Namespace' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return _WeakNamespace
-
-    raise AttributeError(name)
diff --git a/libs/blinker/base.py b/libs/blinker/base.py
index ec494b1415..d051b94a32 100644
--- a/libs/blinker/base.py
+++ b/libs/blinker/base.py
@@ -1,22 +1,19 @@
 from __future__ import annotations
 
 import collections.abc as c
+import sys
 import typing as t
-import warnings
 import weakref
 from collections import defaultdict
-from contextlib import AbstractContextManager
 from contextlib import contextmanager
 from functools import cached_property
 from inspect import iscoroutinefunction
-from weakref import WeakValueDictionary
 
 from ._utilities import make_id
 from ._utilities import make_ref
 from ._utilities import Symbol
 
-if t.TYPE_CHECKING:
-    F = t.TypeVar("F", bound=c.Callable[..., t.Any])
+F = t.TypeVar("F", bound=c.Callable[..., t.Any])
 
 ANY = Symbol("ANY")
 """Symbol for "any sender"."""
@@ -139,15 +136,6 @@ def connect(self, receiver: F, sender: t.Any = ANY, weak: bool = True) -> F:
                 self.disconnect(receiver, sender)
                 raise
 
-        if _receiver_connected.receivers and self is not _receiver_connected:
-            try:
-                _receiver_connected.send(
-                    self, receiver_arg=receiver, sender_arg=sender, weak_arg=weak
-                )
-            except TypeError:
-                self.disconnect(receiver, sender)
-                raise
-
         return receiver
 
     def connect_via(self, sender: t.Any, weak: bool = False) -> c.Callable[[F], F]:
@@ -213,24 +201,6 @@ def muted(self) -> c.Generator[None, None, None]:
         finally:
             self.is_muted = False
 
-    def temporarily_connected_to(
-        self, receiver: c.Callable[..., t.Any], sender: t.Any = ANY
-    ) -> AbstractContextManager[None]:
-        """Deprecated alias for :meth:`connected_to`.
-
-        .. deprecated:: 1.1
-            Renamed to ``connected_to``. Will be removed in Blinker 1.9.
-
-        .. versionadded:: 0.9
-        """
-        warnings.warn(
-            "'temporarily_connected_to' is renamed to 'connected_to'. The old name is"
-            " deprecated and will be removed in Blinker 1.9.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.connected_to(receiver, sender)
-
     def send(
         self,
         sender: t.Any | None = None,
@@ -434,7 +404,10 @@ def _make_cleanup_receiver(
         """
 
         def cleanup(ref: weakref.ref[c.Callable[..., t.Any]]) -> None:
-            self._disconnect(receiver_id, ANY_ID)
+            # If the interpreter is shutting down, disconnecting can result in a
+            # weird ignored exception. Don't call it in that case.
+            if not sys.is_finalizing():
+                self._disconnect(receiver_id, ANY_ID)
 
         return cleanup
 
@@ -488,23 +461,6 @@ def _clear_state(self) -> None:
         self._by_receiver.clear()
 
 
-_receiver_connected = Signal(
-    """\
-Sent by a :class:`Signal` after a receiver connects.
-
-:argument: the Signal that was connected to
-:keyword receiver_arg: the connected receiver
-:keyword sender_arg: the sender to connect to
-:keyword weak_arg: true if the connection to receiver_arg is a weak reference
-
-.. deprecated:: 1.2
-    Individual signals have their own :attr:`~Signal.receiver_connected` and
-    :attr:`~Signal.receiver_disconnected` signals with a slightly simplified
-    call signature. This global signal will be removed in Blinker 1.9.
-"""
-)
-
-
 class NamedSignal(Signal):
     """A named generic notification emitter. The name is not used by the signal
     itself, but matches the key in the :class:`Namespace` that it belongs to.
@@ -524,18 +480,7 @@ def __repr__(self) -> str:
         return f"{base[:-1]}; {self.name!r}>"  # noqa: E702
 
 
-if t.TYPE_CHECKING:
-
-    class PNamespaceSignal(t.Protocol):
-        def __call__(self, name: str, doc: str | None = None) -> NamedSignal: ...
-
-    # Python < 3.9
-    _NamespaceBase = dict[str, NamedSignal]  # type: ignore[misc]
-else:
-    _NamespaceBase = dict
-
-
-class Namespace(_NamespaceBase):
+class Namespace(dict[str, NamedSignal]):
     """A dict mapping names to signals."""
 
     def signal(self, name: str, doc: str | None = None) -> NamedSignal:
@@ -551,39 +496,8 @@ def signal(self, name: str, doc: str | None = None) -> NamedSignal:
         return self[name]
 
 
-class _WeakNamespace(WeakValueDictionary):  # type: ignore[type-arg]
-    """A weak mapping of names to signals.
-
-    Automatically cleans up unused signals when the last reference goes out
-    of scope. This namespace implementation provides similar behavior to Blinker
-    <= 1.2.
-
-    .. deprecated:: 1.3
-        Will be removed in Blinker 1.9.
-
-    .. versionadded:: 1.3
-    """
-
-    def __init__(self) -> None:
-        warnings.warn(
-            "'WeakNamespace' is deprecated and will be removed in Blinker 1.9."
-            " Use 'Namespace' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        super().__init__()
-
-    def signal(self, name: str, doc: str | None = None) -> NamedSignal:
-        """Return the :class:`NamedSignal` for the given ``name``, creating it
-        if required. Repeated calls with the same name return the same signal.
-
-        :param name: The name of the signal.
-        :param doc: The docstring of the signal.
-        """
-        if name not in self:
-            self[name] = NamedSignal(name, doc)
-
-        return self[name]  # type: ignore[no-any-return]
+class _PNamespaceSignal(t.Protocol):
+    def __call__(self, name: str, doc: str | None = None) -> NamedSignal: ...
 
 
 default_namespace: Namespace = Namespace()
@@ -591,31 +505,8 @@ def signal(self, name: str, doc: str | None = None) -> NamedSignal:
 creates a :class:`NamedSignal` in this namespace.
 """
 
-signal: PNamespaceSignal = default_namespace.signal
+signal: _PNamespaceSignal = default_namespace.signal
 """Return a :class:`NamedSignal` in :data:`default_namespace` with the given
 ``name``, creating it if required. Repeated calls with the same name return the
 same signal.
 """
-
-
-def __getattr__(name: str) -> t.Any:
-    if name == "receiver_connected":
-        warnings.warn(
-            "The global 'receiver_connected' signal is deprecated and will be"
-            " removed in Blinker 1.9. Use 'Signal.receiver_connected' and"
-            " 'Signal.receiver_disconnected' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return _receiver_connected
-
-    if name == "WeakNamespace":
-        warnings.warn(
-            "'WeakNamespace' is deprecated and will be removed in Blinker 1.9."
-            " Use 'Namespace' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return _WeakNamespace
-
-    raise AttributeError(name)
diff --git a/libs/bs4/__init__.py b/libs/bs4/__init__.py
index d8ad5e1dc1..19b7c0ed05 100644
--- a/libs/bs4/__init__.py
+++ b/libs/bs4/__init__.py
@@ -7,44 +7,74 @@
 provides methods and Pythonic idioms that make it easy to navigate,
 search, and modify the parse tree.
 
-Beautiful Soup works with Python 3.6 and up. It works better if lxml
-and/or html5lib is installed.
+Beautiful Soup works with Python 3.7 and up. It works better if lxml
+and/or html5lib is installed, but they are not required.
 
 For more than you ever wanted to know about Beautiful Soup, see the
 documentation: http://www.crummy.com/software/BeautifulSoup/bs4/doc/
 """
 
 __author__ = "Leonard Richardson (leonardr@segfault.org)"
-__version__ = "4.12.3"
-__copyright__ = "Copyright (c) 2004-2024 Leonard Richardson"
+__version__ = "4.14.3"
+__copyright__ = "Copyright (c) 2004-2025 Leonard Richardson"
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
-__all__ = ['BeautifulSoup']
+__all__ = [
+    "AttributeResemblesVariableWarning",
+    "BeautifulSoup",
+    "Comment",
+    "Declaration",
+    "ProcessingInstruction",
+    "ResultSet",
+    "CSS",
+    "Script",
+    "Stylesheet",
+    "Tag",
+    "TemplateString",
+    "ElementFilter",
+    "UnicodeDammit",
+    "CData",
+    "Doctype",
+
+    # Exceptions
+    "FeatureNotFound",
+    "ParserRejectedMarkup",
+    "StopParsing",
+
+    # Warnings
+    "AttributeResemblesVariableWarning",
+    "GuessedAtParserWarning",
+    "MarkupResemblesLocatorWarning",
+    "UnusualUsageWarning",
+    "XMLParsedAsHTMLWarning",
+]
 
 from collections import Counter
-import os
-import re
+import io
 import sys
-import traceback
 import warnings
 
 # The very first thing we do is give a useful error if someone is
 # running this code under Python 2.
 if sys.version_info.major < 3:
-    raise ImportError('You are trying to use a Python 3-specific version of Beautiful Soup under Python 2. This will not work. The final version of Beautiful Soup to support Python 2 was 4.9.3.')
+    raise ImportError(
+        "You are trying to use a Python 3-specific version of Beautiful Soup under Python 2. This will not work. The final version of Beautiful Soup to support Python 2 was 4.9.3."
+    )
 
 from .builder import (
     builder_registry,
-    ParserRejectedMarkup,
-    XMLParsedAsHTMLWarning,
-    HTMLParserTreeBuilder
+    TreeBuilder,
 )
+from .builder._htmlparser import HTMLParserTreeBuilder
 from .dammit import UnicodeDammit
+from .css import CSS
+from ._deprecation import (
+    _deprecated,
+)
 from .element import (
     CData,
     Comment,
-    CSS,
     DEFAULT_OUTPUT_ENCODING,
     Declaration,
     Doctype,
@@ -55,24 +85,53 @@
     ResultSet,
     Script,
     Stylesheet,
-    SoupStrainer,
     Tag,
     TemplateString,
-    )
+)
+from .formatter import Formatter
+from .filter import (
+    ElementFilter,
+    SoupStrainer,
+)
+from typing import (
+    Any,
+    cast,
+    Counter as CounterType,
+    Dict,
+    Iterator,
+    List,
+    Sequence,
+    Sized,
+    Optional,
+    Type,
+    Union,
+)
 
-# Define some custom warnings.
-class GuessedAtParserWarning(UserWarning):
-    """The warning issued when BeautifulSoup has to guess what parser to
-    use -- probably because no parser was specified in the constructor.
-    """
+from bs4._typing import (
+    _Encoding,
+    _Encodings,
+    _IncomingMarkup,
+    _InsertableElement,
+    _RawAttributeValue,
+    _RawAttributeValues,
+    _RawMarkup,
+)
+
+# Import all warnings and exceptions into the main package.
+from bs4.exceptions import (
+    FeatureNotFound,
+    ParserRejectedMarkup,
+    StopParsing,
+)
+from bs4._warnings import (
+    AttributeResemblesVariableWarning,
+    GuessedAtParserWarning,
+    MarkupResemblesLocatorWarning,
+    UnusualUsageWarning,
+    XMLParsedAsHTMLWarning,
+)
 
-class MarkupResemblesLocatorWarning(UserWarning):
-    """The warning issued when BeautifulSoup is given 'markup' that
-    actually looks like a resource locator -- a URL or a path to a file
-    on disk.
-    """
 
-   
 class BeautifulSoup(Tag):
     """A data structure representing a parsed HTML or XML document.
 
@@ -104,24 +163,62 @@ class BeautifulSoup(Tag):
     handle_endtag.
     """
 
-    # Since BeautifulSoup subclasses Tag, it's possible to treat it as
-    # a Tag with a .name. This name makes it clear the BeautifulSoup
-    # object isn't a real markup tag.
-    ROOT_TAG_NAME = '[document]'
-
-    # If the end-user gives no indication which tree builder they
-    # want, look for one with these features.
-    DEFAULT_BUILDER_FEATURES = ['html', 'fast']
-
-    # A string containing all ASCII whitespace characters, used in
-    # endData() to detect data chunks that seem 'empty'.
-    ASCII_SPACES = '\x20\x0a\x09\x0c\x0d'
-
-    NO_PARSER_SPECIFIED_WARNING = "No parser was explicitly specified, so I'm using the best available %(markup_type)s parser for this system (\"%(parser)s\"). This usually isn't a problem, but if you run this code on another system, or in a different virtual environment, it may use a different parser and behave differently.\n\nThe code that caused this warning is on line %(line_number)s of the file %(filename)s. To get rid of this warning, pass the additional argument 'features=\"%(parser)s\"' to the BeautifulSoup constructor.\n"
-   
-    def __init__(self, markup="", features=None, builder=None,
-                 parse_only=None, from_encoding=None, exclude_encodings=None,
-                 element_classes=None, **kwargs):
+    #: Since `BeautifulSoup` subclasses `Tag`, it's possible to treat it as
+    #: a `Tag` with a `Tag.name`. Hoever, this name makes it clear the
+    #: `BeautifulSoup` object isn't a real markup tag.
+    ROOT_TAG_NAME: str = "[document]"
+
+    #: If the end-user gives no indication which tree builder they
+    #: want, look for one with these features.
+    DEFAULT_BUILDER_FEATURES: Sequence[str] = ["html", "fast"]
+
+    #: A string containing all ASCII whitespace characters, used in
+    #: during parsing to detect data chunks that seem 'empty'.
+    ASCII_SPACES: str = "\x20\x0a\x09\x0c\x0d"
+
+    # FUTURE PYTHON:
+    element_classes: Dict[Type[PageElement], Type[PageElement]]  #: :meta private:
+    builder: TreeBuilder  #: :meta private:
+    is_xml: bool
+    known_xml: Optional[bool]
+    parse_only: Optional[SoupStrainer]  #: :meta private:
+
+    # These members are only used while parsing markup.
+    markup: Optional[_RawMarkup]  #: :meta private:
+    current_data: List[str]  #: :meta private:
+    currentTag: Optional[Tag]  #: :meta private:
+    tagStack: List[Tag]  #: :meta private:
+    open_tag_counter: CounterType[str]  #: :meta private:
+    preserve_whitespace_tag_stack: List[Tag]  #: :meta private:
+    string_container_stack: List[Tag]  #: :meta private:
+    _most_recent_element: Optional[PageElement]  #: :meta private:
+
+    #: Beautiful Soup's best guess as to the character encoding of the
+    #: original document.
+    original_encoding: Optional[_Encoding]
+
+    #: The character encoding, if any, that was explicitly defined
+    #: in the original document. This may or may not match
+    #: `BeautifulSoup.original_encoding`.
+    declared_html_encoding: Optional[_Encoding]
+
+    #: This is True if the markup that was parsed contains
+    #: U+FFFD REPLACEMENT_CHARACTER characters which were not present
+    #: in the original markup. These mark character sequences that
+    #: could not be represented in Unicode.
+    contains_replacement_characters: bool
+
+    def __init__(
+        self,
+        markup: _IncomingMarkup = "",
+        features: Optional[Union[str, Sequence[str]]] = None,
+        builder: Optional[Union[TreeBuilder, Type[TreeBuilder]]] = None,
+        parse_only: Optional[SoupStrainer] = None,
+        from_encoding: Optional[_Encoding] = None,
+        exclude_encodings: Optional[_Encodings] = None,
+        element_classes: Optional[Dict[Type[PageElement], Type[PageElement]]] = None,
+        **kwargs: Any,
+    ):
         """Constructor.
 
         :param markup: A string or a file-like object representing
@@ -165,67 +262,85 @@ def __init__(self, markup="", features=None, builder=None,
          Beautiful Soup 3. None of these arguments do anything in
          Beautiful Soup 4; they will result in a warning and then be
          ignored.
-         
+
          Apart from this, any keyword arguments passed into the
          BeautifulSoup constructor are propagated to the TreeBuilder
          constructor. This makes it possible to configure a
          TreeBuilder by passing in arguments, not just by saying which
          one to use.
         """
-        if 'convertEntities' in kwargs:
-            del kwargs['convertEntities']
+        if "convertEntities" in kwargs:
+            del kwargs["convertEntities"]
             warnings.warn(
                 "BS4 does not respect the convertEntities argument to the "
                 "BeautifulSoup constructor. Entities are always converted "
-                "to Unicode characters.")
+                "to Unicode characters."
+            )
 
-        if 'markupMassage' in kwargs:
-            del kwargs['markupMassage']
+        if "markupMassage" in kwargs:
+            del kwargs["markupMassage"]
             warnings.warn(
                 "BS4 does not respect the markupMassage argument to the "
                 "BeautifulSoup constructor. The tree builder is responsible "
-                "for any necessary markup massage.")
+                "for any necessary markup massage."
+            )
 
-        if 'smartQuotesTo' in kwargs:
-            del kwargs['smartQuotesTo']
+        if "smartQuotesTo" in kwargs:
+            del kwargs["smartQuotesTo"]
             warnings.warn(
                 "BS4 does not respect the smartQuotesTo argument to the "
                 "BeautifulSoup constructor. Smart quotes are always converted "
-                "to Unicode characters.")
+                "to Unicode characters."
+            )
 
-        if 'selfClosingTags' in kwargs:
-            del kwargs['selfClosingTags']
+        if "selfClosingTags" in kwargs:
+            del kwargs["selfClosingTags"]
             warnings.warn(
-                "BS4 does not respect the selfClosingTags argument to the "
+                "Beautiful Soup 4 does not respect the selfClosingTags argument to the "
                 "BeautifulSoup constructor. The tree builder is responsible "
-                "for understanding self-closing tags.")
+                "for understanding self-closing tags."
+            )
 
-        if 'isHTML' in kwargs:
-            del kwargs['isHTML']
+        if "isHTML" in kwargs:
+            del kwargs["isHTML"]
             warnings.warn(
-                "BS4 does not respect the isHTML argument to the "
+                "Beautiful Soup 4 does not respect the isHTML argument to the "
                 "BeautifulSoup constructor. Suggest you use "
                 "features='lxml' for HTML and features='lxml-xml' for "
-                "XML.")
+                "XML."
+            )
 
-        def deprecated_argument(old_name, new_name):
+        def deprecated_argument(old_name: str, new_name: str) -> Optional[Any]:
             if old_name in kwargs:
                 warnings.warn(
                     'The "%s" argument to the BeautifulSoup constructor '
-                    'has been renamed to "%s."' % (old_name, new_name),
-                    DeprecationWarning, stacklevel=3
+                    'was renamed to "%s" in Beautiful Soup 4.0.0'
+                    % (old_name, new_name),
+                    DeprecationWarning,
+                    stacklevel=3,
                 )
                 return kwargs.pop(old_name)
             return None
 
-        parse_only = parse_only or deprecated_argument(
-            "parseOnlyThese", "parse_only")
+        parse_only = parse_only or deprecated_argument("parseOnlyThese", "parse_only")
+        if parse_only is not None:
+            # Issue a warning if we can tell in advance that
+            # parse_only will exclude the entire tree.
+            if parse_only.excludes_everything:
+                warnings.warn(
+                    f"The given value for parse_only will exclude everything: {parse_only}",
+                    UserWarning,
+                    stacklevel=3,
+                )
 
         from_encoding = from_encoding or deprecated_argument(
-            "fromEncoding", "from_encoding")
+            "fromEncoding", "from_encoding"
+        )
 
         if from_encoding and isinstance(markup, str):
-            warnings.warn("You provided Unicode markup but also provided a value for from_encoding. Your from_encoding will be ignored.")
+            warnings.warn(
+                "You provided Unicode markup but also provided a value for from_encoding. Your from_encoding will be ignored."
+            )
             from_encoding = None
 
         self.element_classes = element_classes or dict()
@@ -235,7 +350,8 @@ def deprecated_argument(old_name, new_name):
         # specify a parser' warning.
         original_builder = builder
         original_features = features
-            
+
+        builder_class: Optional[Type[TreeBuilder]] = None
         if isinstance(builder, type):
             # A builder class was passed in; it needs to be instantiated.
             builder_class = builder
@@ -245,22 +361,32 @@ def deprecated_argument(old_name, new_name):
                 features = [features]
             if features is None or len(features) == 0:
                 features = self.DEFAULT_BUILDER_FEATURES
-            builder_class = builder_registry.lookup(*features)
-            if builder_class is None:
+            possible_builder_class = builder_registry.lookup(*features)
+            if possible_builder_class is None:
                 raise FeatureNotFound(
                     "Couldn't find a tree builder with the features you "
                     "requested: %s. Do you need to install a parser library?"
-                    % ",".join(features))
+                    % ",".join(features)
+                )
+            builder_class = possible_builder_class
 
         # At this point either we have a TreeBuilder instance in
         # builder, or we have a builder_class that we can instantiate
         # with the remaining **kwargs.
         if builder is None:
+            assert builder_class is not None
             builder = builder_class(**kwargs)
-            if not original_builder and not (
-                    original_features == builder.NAME or
-                    original_features in builder.ALTERNATE_NAMES
-            ) and markup:
+            if (
+                not original_builder
+                and not (
+                    original_features == builder.NAME
+                    or (
+                        isinstance(original_features, str)
+                        and original_features in builder.ALTERNATE_NAMES
+                    )
+                )
+                and markup
+            ):
                 # The user did not tell us which TreeBuilder to use,
                 # and we had to guess. Issue a warning.
                 if builder.is_xml:
@@ -281,8 +407,8 @@ def deprecated_argument(old_name, new_name):
                     line_number = caller.f_lineno
                 else:
                     globals = sys.__dict__
-                    line_number= 1                    
-                filename = globals.get('__file__')
+                    line_number = 1
+                filename = globals.get("__file__")
                 if filename:
                     fnl = filename.lower()
                     if fnl.endswith((".pyc", ".pyo")):
@@ -294,41 +420,56 @@ def deprecated_argument(old_name, new_name):
                         filename=filename,
                         line_number=line_number,
                         parser=builder.NAME,
-                        markup_type=markup_type
+                        markup_type=markup_type,
                     )
                     warnings.warn(
-                        self.NO_PARSER_SPECIFIED_WARNING % values,
-                        GuessedAtParserWarning, stacklevel=2
+                        GuessedAtParserWarning.MESSAGE % values,
+                        GuessedAtParserWarning,
+                        stacklevel=2,
                     )
         else:
             if kwargs:
-                warnings.warn("Keyword arguments to the BeautifulSoup constructor will be ignored. These would normally be passed into the TreeBuilder constructor, but a TreeBuilder instance was passed in as `builder`.")
-                    
+                warnings.warn(
+                    "Keyword arguments to the BeautifulSoup constructor will be ignored. These would normally be passed into the TreeBuilder constructor, but a TreeBuilder instance was passed in as `builder`."
+                )
+
         self.builder = builder
         self.is_xml = builder.is_xml
         self.known_xml = self.is_xml
         self._namespaces = dict()
         self.parse_only = parse_only
 
-        if hasattr(markup, 'read'):        # It's a file-type object.
-            markup = markup.read()
-        elif len(markup) <= 256 and (
-                (isinstance(markup, bytes) and not b'<' in markup)
-                or (isinstance(markup, str) and not '<' in markup)
+        if hasattr(markup, "read"):  # It's a file-type object.
+            markup = cast(io.IOBase, markup).read()
+        elif not isinstance(markup, (bytes, str)) and not hasattr(markup, "__len__"):
+            raise TypeError(
+                f"Incoming markup is of an invalid type: {markup!r}. Markup must be a string, a bytestring, or an open filehandle."
+            )
+        elif isinstance(markup, Sized) and len(markup) <= 256 and (
+            (isinstance(markup, bytes) and b"<" not in markup and b"\n" not in markup)
+            or (isinstance(markup, str) and "<" not in markup and "\n" not in markup)
         ):
             # Issue warnings for a couple beginner problems
             # involving passing non-markup to Beautiful Soup.
             # Beautiful Soup will still parse the input as markup,
             # since that is sometimes the intended behavior.
             if not self._markup_is_url(markup):
-                self._markup_resembles_filename(markup)                
+                self._markup_resembles_filename(markup)
+
+        # At this point we know markup is a string or bytestring.  If
+        # it was a file-type object, we've read from it.
+        markup = cast(_RawMarkup, markup)
 
         rejections = []
         success = False
-        for (self.markup, self.original_encoding, self.declared_html_encoding,
-         self.contains_replacement_characters) in (
-             self.builder.prepare_markup(
-                 markup, from_encoding, exclude_encodings=exclude_encodings)):
+        for (
+            self.markup,
+            self.original_encoding,
+            self.declared_html_encoding,
+            self.contains_replacement_characters,
+        ) in self.builder.prepare_markup(
+            markup, from_encoding, exclude_encodings=exclude_encodings
+        ):
             self.reset()
             self.builder.initialize_soup(self)
             try:
@@ -342,7 +483,8 @@ def deprecated_argument(old_name, new_name):
         if not success:
             other_exceptions = [str(e) for e in rejections]
             raise ParserRejectedMarkup(
-                "The markup you provided was rejected by the parser. Trying a different parser or a different encoding may help.\n\nOriginal exception(s) from parser:\n " + "\n ".join(other_exceptions)
+                "The markup you provided was rejected by the parser. Trying a different parser or a different encoding may help.\n\nOriginal exception(s) from parser:\n "
+                + "\n ".join(other_exceptions)
             )
 
         # Clear out the markup and remove the builder's circular
@@ -350,7 +492,7 @@ def deprecated_argument(old_name, new_name):
         self.markup = None
         self.builder.soup = None
 
-    def _clone(self):
+    def copy_self(self) -> "BeautifulSoup":
         """Create a new BeautifulSoup object with the same TreeBuilder,
         but not associated with any markup.
 
@@ -362,24 +504,24 @@ def _clone(self):
         # since we won't be parsing it again.
         clone.original_encoding = self.original_encoding
         return clone
-        
-    def __getstate__(self):
+
+    def __getstate__(self) -> Dict[str, Any]:
         # Frequently a tree builder can't be pickled.
         d = dict(self.__dict__)
-        if 'builder' in d and d['builder'] is not None and not self.builder.picklable:
-            d['builder'] = type(self.builder)
+        if "builder" in d and d["builder"] is not None and not self.builder.picklable:
+            d["builder"] = type(self.builder)
         # Store the contents as a Unicode string.
-        d['contents'] = []
-        d['markup'] = self.decode()
+        d["contents"] = []
+        d["markup"] = self.decode()
 
         # If _most_recent_element is present, it's a Tag object left
         # over from initial parse. It might not be picklable and we
         # don't need it.
-        if '_most_recent_element' in d:
-            del d['_most_recent_element']
+        if "_most_recent_element" in d:
+            del d["_most_recent_element"]
         return d
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: Dict[str, Any]) -> None:
         # If necessary, restore the TreeBuilder by looking it up.
         self.__dict__ = state
         if isinstance(self.builder, type):
@@ -391,102 +533,145 @@ def __setstate__(self, state):
         self.builder.soup = self
         self.reset()
         self._feed()
-        return state
 
-    
     @classmethod
-    def _decode_markup(cls, markup):
-        """Ensure `markup` is bytes so it's safe to send into warnings.warn.
+    @_deprecated(
+        replaced_by="nothing (private method, will be removed)", version="4.13.0"
+    )
+    def _decode_markup(cls, markup: _RawMarkup) -> str:
+        """Ensure `markup` is Unicode so it's safe to send into warnings.warn.
 
-        TODO: warnings.warn had this problem back in 2010 but it might not
-        anymore.
+        warnings.warn had this problem back in 2010 but fortunately
+        not anymore. This has not been used for a long time; I just
+        noticed that fact while working on 4.13.0.
         """
         if isinstance(markup, bytes):
-            decoded = markup.decode('utf-8', 'replace')
+            decoded = markup.decode("utf-8", "replace")
         else:
             decoded = markup
         return decoded
 
     @classmethod
-    def _markup_is_url(cls, markup):
+    def _markup_is_url(cls, markup: _RawMarkup) -> bool:
         """Error-handling method to raise a warning if incoming markup looks
         like a URL.
 
-        :param markup: A string.
-        :return: Whether or not the markup resembles a URL
-            closely enough to justify a warning.
+        :param markup: A string of markup.
+        :return: Whether or not the markup resembled a URL
+            closely enough to justify issuing a warning.
         """
+        problem: bool = False
         if isinstance(markup, bytes):
-            space = b' '
-            cant_start_with = (b"http:", b"https:")
+            problem = (
+                any(markup.startswith(prefix) for prefix in (b"http:", b"https:"))
+                and b" " not in markup
+            )
         elif isinstance(markup, str):
-            space = ' '
-            cant_start_with = ("http:", "https:")
+            problem = (
+                any(markup.startswith(prefix) for prefix in ("http:", "https:"))
+                and " " not in markup
+            )
         else:
             return False
 
-        if any(markup.startswith(prefix) for prefix in cant_start_with):
-            if not space in markup:
-                warnings.warn(
-                    'The input looks more like a URL than markup. You may want to use'
-                    ' an HTTP client like requests to get the document behind'
-                    ' the URL, and feed that document to Beautiful Soup.',
-                    MarkupResemblesLocatorWarning,
-                    stacklevel=3
-                )
-                return True
-        return False
+        if not problem:
+            return False
+        warnings.warn(
+            MarkupResemblesLocatorWarning.URL_MESSAGE % dict(what="URL"),
+            MarkupResemblesLocatorWarning,
+            stacklevel=3,
+        )
+        return True
 
     @classmethod
-    def _markup_resembles_filename(cls, markup):
-        """Error-handling method to raise a warning if incoming markup
+    def _markup_resembles_filename(cls, markup: _RawMarkup) -> bool:
+        """Error-handling method to issue a warning if incoming markup
         resembles a filename.
 
-        :param markup: A bytestring or string.
-        :return: Whether or not the markup resembles a filename
-            closely enough to justify a warning.
+        :param markup: A string of markup.
+        :return: Whether or not the markup resembled a filename
+            closely enough to justify issuing a warning.
         """
-        path_characters = '/\\'
-        extensions = ['.html', '.htm', '.xml', '.xhtml', '.txt']
-        if isinstance(markup, bytes):
-            path_characters = path_characters.encode("utf8")
-            extensions = [x.encode('utf8') for x in extensions]
+        markup_b: bytes
+
+        # We're only checking ASCII characters, so rather than write
+        # the same tests twice, convert Unicode to a bytestring and
+        # operate on the bytestring.
+        if isinstance(markup, str):
+            markup_b = markup.encode("utf8")
+        else:
+            markup_b = markup
+
+        # Step 1: does it end with a common textual file extension?
         filelike = False
-        if any(x in markup for x in path_characters):
+        lower = markup_b.lower()
+        extensions = [b".html", b".htm", b".xml", b".xhtml", b".txt"]
+        if any(lower.endswith(ext) for ext in extensions):
             filelike = True
-        else:
-            lower = markup.lower()
-            if any(lower.endswith(ext) for ext in extensions):
-                filelike = True
-        if filelike:
-            warnings.warn(
-                'The input looks more like a filename than markup. You may'
-                ' want to open this file and pass the filehandle into'
-                ' Beautiful Soup.',
-                MarkupResemblesLocatorWarning, stacklevel=3
-            )
-            return True
-        return False
-    
-    def _feed(self):
+        if not filelike:
+            return False
+
+        # Step 2: it _might_ be a file, but there are a few things
+        # we can look for that aren't very common in filenames.
+
+        # Characters that have special meaning to Unix shells. (< was
+        # excluded before this method was called.)
+        #
+        # Many of these are also reserved characters that cannot
+        # appear in Windows filenames.
+        for byte in markup_b:
+            if byte in b"?*#&;>$|":
+                return False
+
+        # Two consecutive forward slashes (as seen in a URL) or two
+        # consecutive spaces (as seen in fixed-width data).
+        #
+        # (Paths to Windows network shares contain consecutive
+        #  backslashes, so checking that doesn't seem as helpful.)
+        if b"//" in markup_b:
+            return False
+        if b"  " in markup_b:
+            return False
+
+        # A colon in any position other than position 1 (e.g. after a
+        # Windows drive letter).
+        if markup_b.startswith(b":"):
+            return False
+        colon_i = markup_b.rfind(b":")
+        if colon_i not in (-1, 1):
+            return False
+
+        # Step 3: If it survived all of those checks, it's similar
+        # enough to a file to justify issuing a warning.
+        warnings.warn(
+            MarkupResemblesLocatorWarning.FILENAME_MESSAGE % dict(what="filename"),
+            MarkupResemblesLocatorWarning,
+            stacklevel=3,
+        )
+        return True
+
+    def _feed(self) -> None:
         """Internal method that parses previously set markup, creating a large
         number of Tag and NavigableString objects.
         """
         # Convert the document to Unicode.
         self.builder.reset()
 
-        self.builder.feed(self.markup)
+        if self.markup is not None:
+            self.builder.feed(self.markup)
         # Close out any unfinished strings and close all the open tags.
         self.endData()
-        while self.currentTag.name != self.ROOT_TAG_NAME:
+        while (
+            self.currentTag is not None and self.currentTag.name != self.ROOT_TAG_NAME
+        ):
             self.popTag()
 
-    def reset(self):
+    def reset(self) -> None:
         """Reset this object to a state as though it had never parsed any
         markup.
         """
         Tag.__init__(self, self, self.builder, self.ROOT_TAG_NAME)
-        self.hidden = 1
+        self.hidden = True
         self.builder.reset()
         self.current_data = []
         self.currentTag = None
@@ -497,35 +682,71 @@ def reset(self):
         self._most_recent_element = None
         self.pushTag(self)
 
-    def new_tag(self, name, namespace=None, nsprefix=None, attrs={},
-                sourceline=None, sourcepos=None, **kwattrs):
+    def new_tag(
+        self,
+        name: str,
+        namespace: Optional[str] = None,
+        nsprefix: Optional[str] = None,
+        attrs: Optional[_RawAttributeValues] = None,
+        sourceline: Optional[int] = None,
+        sourcepos: Optional[int] = None,
+        string: Optional[str] = None,
+        **kwattrs: _RawAttributeValue,
+    ) -> Tag:
         """Create a new Tag associated with this BeautifulSoup object.
 
         :param name: The name of the new Tag.
         :param namespace: The URI of the new Tag's XML namespace, if any.
         :param prefix: The prefix for the new Tag's XML namespace, if any.
         :param attrs: A dictionary of this Tag's attribute values; can
-            be used instead of `kwattrs` for attributes like 'class'
+            be used instead of ``kwattrs`` for attributes like 'class'
             that are reserved words in Python.
         :param sourceline: The line number where this tag was
             (purportedly) found in its source document.
-        :param sourcepos: The character position within `sourceline` where this
+        :param sourcepos: The character position within ``sourceline`` where this
             tag was (purportedly) found.
+        :param string: String content for the new Tag, if any.
         :param kwattrs: Keyword arguments for the new Tag's attribute values.
 
         """
-        kwattrs.update(attrs)
-        return self.element_classes.get(Tag, Tag)(
-            None, self.builder, name, namespace, nsprefix, kwattrs,
-            sourceline=sourceline, sourcepos=sourcepos
+        attr_container = self.builder.attribute_dict_class(**kwattrs)
+        if attrs is not None:
+            attr_container.update(attrs)
+        tag_class = self.element_classes.get(Tag, Tag)
+
+        # Assume that this is either Tag or a subclass of Tag. If not,
+        # the user brought type-unsafety upon themselves.
+        tag_class = cast(Type[Tag], tag_class)
+        tag = tag_class(
+            None,
+            self.builder,
+            name,
+            namespace,
+            nsprefix,
+            attr_container,
+            sourceline=sourceline,
+            sourcepos=sourcepos,
         )
 
-    def string_container(self, base_class=None):
+        if string is not None:
+            tag.string = string
+        return tag
+
+    def string_container(
+        self, base_class: Optional[Type[NavigableString]] = None
+    ) -> Type[NavigableString]:
+        """Find the class that should be instantiated to hold a given kind of
+        string.
+
+        This may be a built-in Beautiful Soup class or a custom class passed
+        in to the BeautifulSoup constructor.
+        """
         container = base_class or NavigableString
-        
-        # There may be a general override of NavigableString.
-        container = self.element_classes.get(
-            container, container
+
+        # The user may want us to use some other class (hopefully a
+        # custom subclass) instead of the one we'd use normally.
+        container = cast(
+            Type[NavigableString], self.element_classes.get(container, container)
         )
 
         # On top of that, we may be inside a tag that needs a special
@@ -535,43 +756,65 @@ def string_container(self, base_class=None):
                 self.string_container_stack[-1].name, container
             )
         return container
-        
-    def new_string(self, s, subclass=None):
-        """Create a new NavigableString associated with this BeautifulSoup
+
+    def new_string(
+        self, s: str, subclass: Optional[Type[NavigableString]] = None
+    ) -> NavigableString:
+        """Create a new `NavigableString` associated with this `BeautifulSoup`
         object.
+
+        :param s: The string content of the `NavigableString`
+        :param subclass: The subclass of `NavigableString`, if any, to
+               use. If a document is being processed, an appropriate
+               subclass for the current location in the document will
+               be determined automatically.
         """
         container = self.string_container(subclass)
         return container(s)
 
-    def insert_before(self, *args):
+    def insert_before(self, *args: _InsertableElement) -> List[PageElement]:
         """This method is part of the PageElement API, but `BeautifulSoup` doesn't implement
         it because there is nothing before or after it in the parse tree.
         """
-        raise NotImplementedError("BeautifulSoup objects don't support insert_before().")
+        raise NotImplementedError(
+            "BeautifulSoup objects don't support insert_before()."
+        )
 
-    def insert_after(self, *args):
+    def insert_after(self, *args: _InsertableElement) -> List[PageElement]:
         """This method is part of the PageElement API, but `BeautifulSoup` doesn't implement
         it because there is nothing before or after it in the parse tree.
         """
         raise NotImplementedError("BeautifulSoup objects don't support insert_after().")
 
-    def popTag(self):
-        """Internal method called by _popToTag when a tag is closed."""
+    def popTag(self) -> Optional[Tag]:
+        """Internal method called by _popToTag when a tag is closed.
+
+        :meta private:
+        """
+        if not self.tagStack:
+            # Nothing to pop. This shouldn't happen.
+            return None
         tag = self.tagStack.pop()
         if tag.name in self.open_tag_counter:
             self.open_tag_counter[tag.name] -= 1
-        if self.preserve_whitespace_tag_stack and tag == self.preserve_whitespace_tag_stack[-1]:
+        if (
+            self.preserve_whitespace_tag_stack
+            and tag == self.preserve_whitespace_tag_stack[-1]
+        ):
             self.preserve_whitespace_tag_stack.pop()
         if self.string_container_stack and tag == self.string_container_stack[-1]:
             self.string_container_stack.pop()
-        #print("Pop", tag.name)
+        # print("Pop", tag.name)
         if self.tagStack:
             self.currentTag = self.tagStack[-1]
         return self.currentTag
 
-    def pushTag(self, tag):
-        """Internal method called by handle_starttag when a tag is opened."""
-        #print("Push", tag.name)
+    def pushTag(self, tag: Tag) -> None:
+        """Internal method called by handle_starttag when a tag is opened.
+
+        :meta private:
+        """
+        # print("Push", tag.name)
         if self.currentTag is not None:
             self.currentTag.contents.append(tag)
         self.tagStack.append(tag)
@@ -583,12 +826,17 @@ def pushTag(self, tag):
         if tag.name in self.builder.string_containers:
             self.string_container_stack.append(tag)
 
-    def endData(self, containerClass=None):
+    def endData(self, containerClass: Optional[Type[NavigableString]] = None) -> None:
         """Method called by the TreeBuilder when the end of a data segment
         occurs.
-        """       
+
+        :param containerClass: The class to use when incorporating the
+        data segment into the parse tree.
+
+        :meta private:
+        """
         if self.current_data:
-            current_data = ''.join(self.current_data)
+            current_data = "".join(self.current_data)
             # If whitespace is not preserved, and this string contains
             # nothing but ASCII spaces, replace it with a single space
             # or newline.
@@ -599,28 +847,41 @@ def endData(self, containerClass=None):
                         strippable = False
                         break
                 if strippable:
-                    if '\n' in current_data:
-                        current_data = '\n'
+                    if "\n" in current_data:
+                        current_data = "\n"
                     else:
-                        current_data = ' '
+                        current_data = " "
 
             # Reset the data collector.
             self.current_data = []
 
             # Should we add this string to the tree at all?
-            if self.parse_only and len(self.tagStack) <= 1 and \
-                   (not self.parse_only.text or \
-                    not self.parse_only.search(current_data)):
+            if (
+                self.parse_only
+                and len(self.tagStack) <= 1
+                and (not self.parse_only.allow_string_creation(current_data))
+            ):
                 return
 
             containerClass = self.string_container(containerClass)
             o = containerClass(current_data)
             self.object_was_parsed(o)
 
-    def object_was_parsed(self, o, parent=None, most_recent_element=None):
-        """Method called by the TreeBuilder to integrate an object into the parse tree."""
+    def object_was_parsed(
+        self,
+        o: PageElement,
+        parent: Optional[Tag] = None,
+        most_recent_element: Optional[PageElement] = None,
+    ) -> None:
+        """Method called by the TreeBuilder to integrate an object into the
+        parse tree.
+
+        :meta private:
+        """
         if parent is None:
             parent = self.currentTag
+        assert parent is not None
+        previous_element: Optional[PageElement]
         if most_recent_element is not None:
             previous_element = most_recent_element
         else:
@@ -645,12 +906,12 @@ def object_was_parsed(self, o, parent=None, most_recent_element=None):
         if fix:
             self._linkage_fixer(parent)
 
-    def _linkage_fixer(self, el):
+    def _linkage_fixer(self, el: Tag) -> None:
         """Make sure linkage of this fragment is sound."""
 
         first = el.contents[0]
         child = el.contents[-1]
-        descendant = child
+        descendant: PageElement = child
 
         if child is first and el.parent is not None:
             # Parent should be linked to first child
@@ -668,14 +929,18 @@ def _linkage_fixer(self, el):
 
         # This index is a tag, dig deeper for a "last descendant"
         if isinstance(child, Tag) and child.contents:
-            descendant = child._last_descendant(False)
+            # _last_decendant is typed as returning Optional[PageElement],
+            # but the value can't be None here, because el is a Tag
+            # which we know has contents.
+            descendant = cast(PageElement, child._last_descendant(False))
 
         # As the final step, link last descendant. It should be linked
         # to the parent's next sibling (if found), else walk up the chain
         # and find a parent with a sibling. It should have no next sibling.
         descendant.next_element = None
         descendant.next_sibling = None
-        target = el
+
+        target: Optional[Tag] = el
         while True:
             if target is None:
                 break
@@ -685,7 +950,9 @@ def _linkage_fixer(self, el):
                 break
             target = target.parent
 
-    def _popToTag(self, name, nsprefix=None, inclusivePop=True):
+    def _popToTag(
+        self, name: str, nsprefix: Optional[str] = None, inclusivePop: bool = True
+    ) -> Optional[Tag]:
         """Pops the tag stack up to and including the most recent
         instance of the given tag.
 
@@ -698,11 +965,12 @@ def _popToTag(self, name, nsprefix=None, inclusivePop=True):
           to but *not* including the most recent instqance of the
           given tag.
 
+        :meta private:
         """
-        #print("Popping to %s" % name)
+        # print("Popping to %s" % name)
         if name == self.ROOT_TAG_NAME:
             # The BeautifulSoup object itself can never be popped.
-            return
+            return None
 
         most_recently_popped = None
 
@@ -711,7 +979,7 @@ def _popToTag(self, name, nsprefix=None, inclusivePop=True):
             if not self.open_tag_counter.get(name):
                 break
             t = self.tagStack[i]
-            if (name == t.name and nsprefix == t.prefix):
+            if name == t.name and nsprefix == t.prefix:
                 if inclusivePop:
                     most_recently_popped = self.popTag()
                 break
@@ -719,38 +987,63 @@ def _popToTag(self, name, nsprefix=None, inclusivePop=True):
 
         return most_recently_popped
 
-    def handle_starttag(self, name, namespace, nsprefix, attrs, sourceline=None,
-                        sourcepos=None, namespaces=None):
+    def handle_starttag(
+        self,
+        name: str,
+        namespace: Optional[str],
+        nsprefix: Optional[str],
+        attrs: _RawAttributeValues,
+        sourceline: Optional[int] = None,
+        sourcepos: Optional[int] = None,
+        namespaces: Optional[Dict[str, str]] = None,
+    ) -> Optional[Tag]:
         """Called by the tree builder when a new tag is encountered.
 
         :param name: Name of the tag.
         :param nsprefix: Namespace prefix for the tag.
-        :param attrs: A dictionary of attribute values.
+        :param attrs: A dictionary of attribute values. Note that
+           attribute values are expected to be simple strings; processing
+           of multi-valued attributes such as "class" comes later.
         :param sourceline: The line number where this tag was found in its
             source document.
         :param sourcepos: The character position within `sourceline` where this
             tag was found.
-        :param namespaces: A dictionary of all namespace prefix mappings 
+        :param namespaces: A dictionary of all namespace prefix mappings
             currently in scope in the document.
 
         If this method returns None, the tag was rejected by an active
-        SoupStrainer. You should proceed as if the tag had not occurred
+        `ElementFilter`. You should proceed as if the tag had not occurred
         in the document. For instance, if this was a self-closing tag,
         don't call handle_endtag.
+
+        :meta private:
         """
         # print("Start tag %s: %s" % (name, attrs))
         self.endData()
 
-        if (self.parse_only and len(self.tagStack) <= 1
-            and (self.parse_only.text
-                 or not self.parse_only.search_tag(name, attrs))):
+        if (
+            self.parse_only
+            and len(self.tagStack) <= 1
+            and not self.parse_only.allow_tag_creation(nsprefix, name, attrs)
+        ):
             return None
 
-        tag = self.element_classes.get(Tag, Tag)(
-            self, self.builder, name, namespace, nsprefix, attrs,
-            self.currentTag, self._most_recent_element,
-            sourceline=sourceline, sourcepos=sourcepos,
-            namespaces=namespaces
+        tag_class = self.element_classes.get(Tag, Tag)
+        # Assume that this is either Tag or a subclass of Tag. If not,
+        # the user brought type-unsafety upon themselves.
+        tag_class = cast(Type[Tag], tag_class)
+        tag = tag_class(
+            self,
+            self.builder,
+            name,
+            namespace,
+            nsprefix,
+            attrs,
+            self.currentTag,
+            self._most_recent_element,
+            sourceline=sourceline,
+            sourcepos=sourcepos,
+            namespaces=namespaces,
         )
         if tag is None:
             return tag
@@ -760,81 +1053,122 @@ def handle_starttag(self, name, namespace, nsprefix, attrs, sourceline=None,
         self.pushTag(tag)
         return tag
 
-    def handle_endtag(self, name, nsprefix=None):
+    def handle_endtag(self, name: str, nsprefix: Optional[str] = None) -> None:
         """Called by the tree builder when an ending tag is encountered.
 
         :param name: Name of the tag.
         :param nsprefix: Namespace prefix for the tag.
+
+        :meta private:
         """
-        #print("End tag: " + name)
+        # print("End tag: " + name)
         self.endData()
         self._popToTag(name, nsprefix)
-        
-    def handle_data(self, data):
-        """Called by the tree builder when a chunk of textual data is encountered."""
+
+    def handle_data(self, data: str) -> None:
+        """Called by the tree builder when a chunk of textual data is
+        encountered.
+
+        :meta private:
+        """
         self.current_data.append(data)
-       
-    def decode(self, pretty_print=False,
-               eventual_encoding=DEFAULT_OUTPUT_ENCODING,
-               formatter="minimal", iterator=None):
-        """Returns a string or Unicode representation of the parse tree
-            as an HTML or XML document.
-
-        :param pretty_print: If this is True, indentation will be used to
-            make the document more readable.
+
+    def decode(
+        self,
+        indent_level: Optional[int] = None,
+        eventual_encoding: _Encoding = DEFAULT_OUTPUT_ENCODING,
+        formatter: Union[Formatter, str] = "minimal",
+        iterator: Optional[Iterator[PageElement]] = None,
+        **kwargs: Any,
+    ) -> str:
+        """Returns a string representation of the parse tree
+            as a full HTML or XML document.
+
+        :param indent_level: Each line of the rendering will be
+           indented this many levels. (The ``formatter`` decides what a
+           'level' means, in terms of spaces or other characters
+           output.) This is used internally in recursive calls while
+           pretty-printing.
         :param eventual_encoding: The encoding of the final document.
             If this is None, the document will be a Unicode string.
+        :param formatter: Either a `Formatter` object, or a string naming one of
+            the standard formatters.
+        :param iterator: The iterator to use when navigating over the
+            parse tree. This is only used by `Tag.decode_contents` and
+            you probably won't need to use it.
         """
         if self.is_xml:
             # Print the XML declaration
-            encoding_part = ''
+            encoding_part = ""
+            declared_encoding: Optional[str] = eventual_encoding
             if eventual_encoding in PYTHON_SPECIFIC_ENCODINGS:
                 # This is a special Python encoding; it can't actually
                 # go into an XML document because it means nothing
                 # outside of Python.
-                eventual_encoding = None
-            if eventual_encoding != None:
-                encoding_part = ' encoding="%s"' % eventual_encoding
+                declared_encoding = None
+            if declared_encoding is not None:
+                encoding_part = ' encoding="%s"' % declared_encoding
             prefix = '<?xml version="1.0"%s?>\n' % encoding_part
         else:
-            prefix = ''
-        if not pretty_print:
-            indent_level = None
+            prefix = ""
+
+        # Prior to 4.13.0, the first argument to this method was a
+        # bool called pretty_print, which gave the method a different
+        # signature from its superclass implementation, Tag.decode.
+        #
+        # The signatures of the two methods now match, but just in
+        # case someone is still passing a boolean in as the first
+        # argument to this method (or a keyword argument with the old
+        # name), we can handle it and put out a DeprecationWarning.
+        warning: Optional[str] = None
+        pretty_print: Optional[bool] = None
+        if isinstance(indent_level, bool):
+            if indent_level is True:
+                indent_level = 0
+            elif indent_level is False:
+                indent_level = None
+            warning = f"As of 4.13.0, the first argument to BeautifulSoup.decode has been changed from bool to int, to match Tag.decode. Pass in a value of {indent_level} instead."
         else:
-            indent_level = 0
+            pretty_print = kwargs.pop("pretty_print", None)
+            assert not kwargs
+            if pretty_print is not None:
+                if pretty_print is True:
+                    indent_level = 0
+                elif pretty_print is False:
+                    indent_level = None
+                warning = f"As of 4.13.0, the pretty_print argument to BeautifulSoup.decode has been removed, to match Tag.decode. Pass in a value of indent_level={indent_level} instead."
+
+        if warning:
+            warnings.warn(warning, DeprecationWarning, stacklevel=2)
+        elif indent_level is False or pretty_print is False:
+            indent_level = None
         return prefix + super(BeautifulSoup, self).decode(
-            indent_level, eventual_encoding, formatter, iterator)
+            indent_level, eventual_encoding, formatter, iterator
+        )
+
 
 # Aliases to make it easier to get started quickly, e.g. 'from bs4 import _soup'
 _s = BeautifulSoup
 _soup = BeautifulSoup
 
+
 class BeautifulStoneSoup(BeautifulSoup):
     """Deprecated interface to an XML parser."""
 
-    def __init__(self, *args, **kwargs):
-        kwargs['features'] = 'xml'
+    def __init__(self, *args: Any, **kwargs: Any):
+        kwargs["features"] = "xml"
         warnings.warn(
-            'The BeautifulStoneSoup class is deprecated. Instead of using '
+            "The BeautifulStoneSoup class was deprecated in version 4.0.0. Instead of using "
             'it, pass features="xml" into the BeautifulSoup constructor.',
-            DeprecationWarning, stacklevel=2
+            DeprecationWarning,
+            stacklevel=2,
         )
         super(BeautifulStoneSoup, self).__init__(*args, **kwargs)
 
 
-class StopParsing(Exception):
-    """Exception raised by a TreeBuilder if it's unable to continue parsing."""
-    pass
-
-class FeatureNotFound(ValueError):
-    """Exception raised by the BeautifulSoup constructor if no parser with the
-    requested features is found.
-    """
-    pass
-
-
-#If this file is run as a script, act as an HTML pretty-printer.
-if __name__ == '__main__':
+# If this file is run as a script, act as an HTML pretty-printer.
+if __name__ == "__main__":
     import sys
+
     soup = BeautifulSoup(sys.stdin)
     print((soup.prettify()))
diff --git a/libs/bs4/_deprecation.py b/libs/bs4/_deprecation.py
new file mode 100644
index 0000000000..a7b5685b8a
--- /dev/null
+++ b/libs/bs4/_deprecation.py
@@ -0,0 +1,80 @@
+"""Helper functions for deprecation.
+
+This interface is itself unstable and may change without warning. Do
+not use these functions yourself, even as a joke. The underscores are
+there for a reason. No support will be given.
+
+In particular, most of this will go away without warning once
+Beautiful Soup drops support for Python 3.11, since Python 3.12
+defines a `@typing.deprecated()
+decorator. <https://peps.python.org/pep-0702/>`_
+"""
+
+import functools
+import warnings
+
+from typing import (
+    Any,
+    Callable,
+)
+
+
+def _deprecated_alias(old_name: str, new_name: str, version: str):
+    """Alias one attribute name to another for backward compatibility
+
+    :meta private:
+    """
+
+    @property # type:ignore
+    def alias(self) -> Any:
+        ":meta private:"
+        warnings.warn(
+            f"Access to deprecated property {old_name}. (Replaced by {new_name}) -- Deprecated since version {version}.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return getattr(self, new_name)
+
+    @alias.setter
+    def alias(self, value: str) -> None:
+        ":meta private:"
+        warnings.warn(
+            f"Write to deprecated property {old_name}. (Replaced by {new_name}) -- Deprecated since version {version}.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return setattr(self, new_name, value)
+
+    return alias
+
+
+def _deprecated_function_alias(
+    old_name: str, new_name: str, version: str
+) -> Callable[[Any], Any]:
+    def alias(self, *args: Any, **kwargs: Any) -> Any:
+        ":meta private:"
+        warnings.warn(
+            f"Call to deprecated method {old_name}. (Replaced by {new_name}) -- Deprecated since version {version}.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return getattr(self, new_name)(*args, **kwargs)
+
+    return alias
+
+
+def _deprecated(replaced_by: str, version: str) -> Callable:
+    def deprecate(func: Callable) -> Callable:
+        @functools.wraps(func)
+        def with_warning(*args: Any, **kwargs: Any) -> Any:
+            ":meta private:"
+            warnings.warn(
+                f"Call to deprecated method {func.__name__}. (Replaced by {replaced_by}) -- Deprecated since version {version}.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            return func(*args, **kwargs)
+
+        return with_warning
+
+    return deprecate
diff --git a/libs/bs4/_typing.py b/libs/bs4/_typing.py
new file mode 100644
index 0000000000..0ab69df143
--- /dev/null
+++ b/libs/bs4/_typing.py
@@ -0,0 +1,205 @@
+# Custom type aliases used throughout Beautiful Soup to improve readability.
+
+# Notes on improvements to the type system in newer versions of Python
+# that can be used once Beautiful Soup drops support for older
+# versions:
+#
+# * ClassVar can be put on class variables now.
+# * In 3.10, x|y is an accepted shorthand for Union[x,y].
+# * In 3.10, TypeAlias gains capabilities that can be used to
+#   improve the tree matching types (I don't remember what, exactly).
+# * In 3.9 it's possible to specialize the re.Match type,
+#   e.g. re.Match[str]. In 3.8 there's a typing.re namespace for this,
+#   but it's removed in 3.12, so to support the widest possible set of
+#   versions I'm not using it.
+
+from typing_extensions import (
+    runtime_checkable,
+    Protocol,
+    TypeAlias,
+)
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    IO,
+    Iterable,
+    Mapping,
+    Optional,
+    Pattern,
+    TYPE_CHECKING,
+    Union,
+)
+
+if TYPE_CHECKING:
+    from bs4.element import (
+        AttributeValueList,
+        NamespacedAttribute,
+        NavigableString,
+        PageElement,
+        ResultSet,
+        Tag,
+    )
+
+
+@runtime_checkable
+class _RegularExpressionProtocol(Protocol):
+    """A protocol object which can accept either Python's built-in
+    `re.Pattern` objects, or the similar ``Regex`` objects defined by the
+    third-party ``regex`` package.
+    """
+
+    def search(
+        self, string: str, pos: int = ..., endpos: int = ...
+    ) -> Optional[Any]: ...
+
+    @property
+    def pattern(self) -> str: ...
+
+
+# Aliases for markup in various stages of processing.
+#
+#: The rawest form of markup: either a string, bytestring, or an open filehandle.
+_IncomingMarkup: TypeAlias = Union[str, bytes, IO[str], IO[bytes]]
+
+#: Markup that is in memory but has (potentially) yet to be converted
+#: to Unicode.
+_RawMarkup: TypeAlias = Union[str, bytes]
+
+# Aliases for character encodings
+#
+
+#: A data encoding.
+_Encoding: TypeAlias = str
+
+#: One or more data encodings.
+_Encodings: TypeAlias = Iterable[_Encoding]
+
+# Aliases for XML namespaces
+#
+
+#: The prefix for an XML namespace.
+_NamespacePrefix: TypeAlias = str
+
+#: The URL of an XML namespace
+_NamespaceURL: TypeAlias = str
+
+#: A mapping of prefixes to namespace URLs.
+_NamespaceMapping: TypeAlias = Dict[_NamespacePrefix, _NamespaceURL]
+
+#: A mapping of namespace URLs to prefixes
+_InvertedNamespaceMapping: TypeAlias = Dict[_NamespaceURL, _NamespacePrefix]
+
+# Aliases for the attribute values associated with HTML/XML tags.
+#
+
+#: The value associated with an HTML or XML attribute. This is the
+#: relatively unprocessed value Beautiful Soup expects to come from a
+#: `TreeBuilder`.
+_RawAttributeValue: TypeAlias = str
+
+#: A dictionary of names to `_RawAttributeValue` objects. This is how
+#: Beautiful Soup expects a `TreeBuilder` to represent a tag's
+#: attribute values.
+_RawAttributeValues: TypeAlias = (
+    "Mapping[Union[str, NamespacedAttribute], _RawAttributeValue]"
+)
+
+#: An attribute value in its final form, as stored in the
+# `Tag` class, after it has been processed and (in some cases)
+# split into a list of strings.
+_AttributeValue: TypeAlias = Union[str, "AttributeValueList"]
+
+#: A dictionary of names to :py:data:`_AttributeValue` objects. This is what
+#: a tag's attributes look like after processing.
+_AttributeValues: TypeAlias = Dict[str, _AttributeValue]
+
+#: The methods that deal with turning :py:data:`_RawAttributeValue` into
+#: :py:data:`_AttributeValue` may be called several times, even after the values
+#: are already processed (e.g. when cloning a tag), so they need to
+#: be able to acommodate both possibilities.
+_RawOrProcessedAttributeValues: TypeAlias = Union[_RawAttributeValues, _AttributeValues]
+
+#: A number of tree manipulation methods can take either a `PageElement` or a
+#: normal Python string (which will be converted to a `NavigableString`).
+_InsertableElement: TypeAlias = Union["PageElement", str]
+
+# Aliases to represent the many possibilities for matching bits of a
+# parse tree.
+#
+# This is very complicated because we're applying a formal type system
+# to some very DWIM code. The types we end up with will be the types
+# of the arguments to the SoupStrainer constructor and (more
+# familiarly to Beautiful Soup users) the find* methods.
+
+#: A function that takes a PageElement and returns a yes-or-no answer.
+_PageElementMatchFunction: TypeAlias = Callable[["PageElement"], bool]
+
+#: A function that takes the raw parsed ingredients of a markup tag
+#: and returns a yes-or-no answer.
+#  Not necessary at the moment.
+# _AllowTagCreationFunction:TypeAlias = Callable[[Optional[str], str, Optional[_RawAttributeValues]], bool]
+
+#: A function that takes the raw parsed ingredients of a markup string node
+#: and returns a yes-or-no answer.
+#  Not necessary at the moment.
+# _AllowStringCreationFunction:TypeAlias = Callable[[Optional[str]], bool]
+
+#: A function that takes a `Tag` and returns a yes-or-no answer.
+#: A `TagNameMatchRule` expects this kind of function, if you're
+#: going to pass it a function.
+_TagMatchFunction: TypeAlias = Callable[["Tag"], bool]
+
+#: A function that takes a string (or None) and returns a yes-or-no
+#: answer. An `AttributeValueMatchRule` expects this kind of function, if
+#: you're going to pass it a function.
+_NullableStringMatchFunction: TypeAlias = Callable[[Optional[str]], bool]
+
+#: A function that takes a string and returns a yes-or-no answer.  A
+# `StringMatchRule` expects this kind of function, if you're going to
+# pass it a function.
+_StringMatchFunction: TypeAlias = Callable[[str], bool]
+
+#: Either a tag name, an attribute value or a string can be matched
+#: against a string, bytestring, regular expression, or a boolean.
+_BaseStrainable: TypeAlias = Union[str, bytes, Pattern[str], bool]
+
+#: A tag can be matched either with the `_BaseStrainable` options, or
+#: using a function that takes the `Tag` as its sole argument.
+_BaseStrainableElement: TypeAlias = Union[_BaseStrainable, _TagMatchFunction]
+
+#: A tag's attribute value can be matched either with the
+#: `_BaseStrainable` options, or using a function that takes that
+#: value as its sole argument.
+_BaseStrainableAttribute: TypeAlias = Union[_BaseStrainable, _NullableStringMatchFunction]
+
+#: A tag can be matched using either a single criterion or a list of
+#: criteria.
+_StrainableElement: TypeAlias = Union[
+    _BaseStrainableElement, Iterable[_BaseStrainableElement]
+]
+
+#: An attribute value can be matched using either a single criterion
+#: or a list of criteria.
+_StrainableAttribute: TypeAlias = Union[
+    _BaseStrainableAttribute, Iterable[_BaseStrainableAttribute]
+]
+
+#: An string can be matched using the same techniques as
+#: an attribute value.
+_StrainableString: TypeAlias = _StrainableAttribute
+
+#: A dictionary may be used to match against multiple attribute vlaues at once.
+_StrainableAttributes: TypeAlias = Dict[str, _StrainableAttribute]
+
+#: Many Beautiful soup methods return a PageElement or an ResultSet of
+#: PageElements. A PageElement is either a Tag or a NavigableString.
+#: These convenience aliases make it easier for IDE users to see which methods
+#: are available on the objects they're dealing with.
+_OneElement: TypeAlias = Union["PageElement", "Tag", "NavigableString"]
+_AtMostOneElement: TypeAlias = Optional[_OneElement]
+_AtMostOneTag: TypeAlias = Optional["Tag"]
+_AtMostOneNavigableString: TypeAlias = Optional["NavigableString"]
+_QueryResults: TypeAlias = "ResultSet[_OneElement]"
+_SomeTags: TypeAlias = "ResultSet[Tag]"
+_SomeNavigableStrings: TypeAlias = "ResultSet[NavigableString]"
diff --git a/libs/bs4/_warnings.py b/libs/bs4/_warnings.py
new file mode 100644
index 0000000000..4309473045
--- /dev/null
+++ b/libs/bs4/_warnings.py
@@ -0,0 +1,98 @@
+"""Define some custom warnings."""
+
+
+class GuessedAtParserWarning(UserWarning):
+    """The warning issued when BeautifulSoup has to guess what parser to
+    use -- probably because no parser was specified in the constructor.
+    """
+
+    MESSAGE: str = """No parser was explicitly specified, so I'm using the best available %(markup_type)s parser for this system ("%(parser)s"). This usually isn't a problem, but if you run this code on another system, or in a different virtual environment, it may use a different parser and behave differently.
+
+The code that caused this warning is on line %(line_number)s of the file %(filename)s. To get rid of this warning, pass the additional argument 'features="%(parser)s"' to the BeautifulSoup constructor.
+"""
+
+
+class UnusualUsageWarning(UserWarning):
+    """A superclass for warnings issued when Beautiful Soup sees
+    something that is typically the result of a mistake in the calling
+    code, but might be intentional on the part of the user. If it is
+    in fact intentional, you can filter the individual warning class
+    to get rid of the warning. If you don't like Beautiful Soup
+    second-guessing what you are doing, you can filter the
+    UnusualUsageWarningclass itself and get rid of these entirely.
+    """
+
+
+class MarkupResemblesLocatorWarning(UnusualUsageWarning):
+    """The warning issued when BeautifulSoup is given 'markup' that
+    actually looks like a resource locator -- a URL or a path to a file
+    on disk.
+    """
+
+    #: :meta private:
+    GENERIC_MESSAGE: str = """
+
+However, if you want to parse some data that happens to look like a %(what)s, then nothing has gone wrong: you are using Beautiful Soup correctly, and this warning is spurious and can be filtered. To make this warning go away, run this code before calling the BeautifulSoup constructor:
+
+    from bs4 import MarkupResemblesLocatorWarning
+    import warnings
+
+    warnings.filterwarnings("ignore", category=MarkupResemblesLocatorWarning)
+    """
+
+    URL_MESSAGE: str = (
+        """The input passed in on this line looks more like a URL than HTML or XML.
+
+If you meant to use Beautiful Soup to parse the web page found at a certain URL, then something has gone wrong. You should use an Python package like 'requests' to fetch the content behind the URL. Once you have the content as a string, you can feed that string into Beautiful Soup."""
+        + GENERIC_MESSAGE
+    )
+
+    FILENAME_MESSAGE: str = (
+        """The input passed in on this line looks more like a filename than HTML or XML.
+
+If you meant to use Beautiful Soup to parse the contents of a file on disk, then something has gone wrong. You should open the file first, using code like this:
+
+    filehandle = open(your filename)
+
+You can then feed the open filehandle into Beautiful Soup instead of using the filename."""
+        + GENERIC_MESSAGE
+    )
+
+
+class AttributeResemblesVariableWarning(UnusualUsageWarning, SyntaxWarning):
+    """The warning issued when Beautiful Soup suspects a provided
+    attribute name may actually be the misspelled name of a Beautiful
+    Soup variable. Generally speaking, this is only used in cases like
+    "_class" where it's very unlikely the user would be referencing an
+    XML attribute with that name.
+    """
+
+    MESSAGE: str = """%(original)r is an unusual attribute name and is a common misspelling for %(autocorrect)r.
+
+If you meant %(autocorrect)r, change your code to use it, and this warning will go away.
+
+If you really did mean to check the %(original)r attribute, this warning is spurious and can be filtered. To make it go away, run this code before creating your BeautifulSoup object:
+
+    from bs4 import AttributeResemblesVariableWarning
+    import warnings
+
+    warnings.filterwarnings("ignore", category=AttributeResemblesVariableWarning)
+"""
+
+
+class XMLParsedAsHTMLWarning(UnusualUsageWarning):
+    """The warning issued when an HTML parser is used to parse
+    XML that is not (as far as we can tell) XHTML.
+    """
+
+    MESSAGE: str = """It looks like you're using an HTML parser to parse an XML document.
+
+Assuming this really is an XML document, what you're doing might work, but you should know that using an XML parser will be more reliable. To parse this document as XML, make sure you have the Python package 'lxml' installed, and pass the keyword argument `features="xml"` into the BeautifulSoup constructor.
+
+If you want or need to use an HTML parser on this document, you can make this warning go away by filtering it. To do that, run this code before calling the BeautifulSoup constructor:
+
+    from bs4 import XMLParsedAsHTMLWarning
+    import warnings
+
+    warnings.filterwarnings("ignore", category=XMLParsedAsHTMLWarning)
+"""
diff --git a/libs/bs4/builder/__init__.py b/libs/bs4/builder/__init__.py
index ffb31fc25e..4aae4d3307 100644
--- a/libs/bs4/builder/__init__.py
+++ b/libs/bs4/builder/__init__.py
@@ -1,12 +1,29 @@
+from __future__ import annotations
+
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 from collections import defaultdict
-import itertools
 import re
+from types import ModuleType
+from typing import (
+    Any,
+    cast,
+    Dict,
+    Iterable,
+    List,
+    Optional,
+    Pattern,
+    Set,
+    Tuple,
+    Type,
+    TYPE_CHECKING,
+)
 import warnings
 import sys
 from bs4.element import (
+    AttributeDict,
+    AttributeValueList,
     CharsetMetaAttributeValue,
     ContentMetaAttributeValue,
     RubyParenthesisString,
@@ -14,51 +31,81 @@
     Stylesheet,
     Script,
     TemplateString,
-    nonwhitespace_re
+    nonwhitespace_re,
+)
+
+# Exceptions were moved to their own module in 4.13. Import here for
+# backwards compatibility.
+from bs4.exceptions import ParserRejectedMarkup
+
+from bs4._typing import (
+    _AttributeValues,
+    _RawAttributeValue,
 )
 
+from bs4._warnings import XMLParsedAsHTMLWarning
+
+if TYPE_CHECKING:
+    from bs4 import BeautifulSoup
+    from bs4.element import (
+        NavigableString,
+        Tag,
+    )
+    from bs4._typing import (
+        _AttributeValue,
+        _Encoding,
+        _Encodings,
+        _RawOrProcessedAttributeValues,
+        _RawMarkup,
+    )
+
 __all__ = [
-    'HTMLTreeBuilder',
-    'SAXTreeBuilder',
-    'TreeBuilder',
-    'TreeBuilderRegistry',
-    ]
+    "HTMLTreeBuilder",
+    "SAXTreeBuilder",
+    "TreeBuilder",
+    "TreeBuilderRegistry",
+]
 
 # Some useful features for a TreeBuilder to have.
-FAST = 'fast'
-PERMISSIVE = 'permissive'
-STRICT = 'strict'
-XML = 'xml'
-HTML = 'html'
-HTML_5 = 'html5'
-
-class XMLParsedAsHTMLWarning(UserWarning):
-    """The warning issued when an HTML parser is used to parse
-    XML that is not XHTML.
-    """
-    MESSAGE = """It looks like you're parsing an XML document using an HTML parser. If this really is an HTML document (maybe it's XHTML?), you can ignore or filter this warning. If it's XML, you should know that using an XML parser will be more reliable. To parse this document as XML, make sure you have the lxml package installed, and pass the keyword argument `features="xml"` into the BeautifulSoup constructor."""
+FAST = "fast"
+PERMISSIVE = "permissive"
+STRICT = "strict"
+XML = "xml"
+HTML = "html"
+HTML_5 = "html5"
+
+__all__ = [
+    "TreeBuilderRegistry",
+    "TreeBuilder",
+    "HTMLTreeBuilder",
+    "DetectsXMLParsedAsHTML",
 
+    "ParserRejectedMarkup", # backwards compatibility only as of 4.13.0
+]
 
 class TreeBuilderRegistry(object):
     """A way of looking up TreeBuilder subclasses by their name or by desired
     features.
     """
-    
-    def __init__(self):
+
+    builders_for_feature: Dict[str, List[Type[TreeBuilder]]]
+    builders: List[Type[TreeBuilder]]
+
+    def __init__(self) -> None:
         self.builders_for_feature = defaultdict(list)
         self.builders = []
 
-    def register(self, treebuilder_class):
+    def register(self, treebuilder_class: type[TreeBuilder]) -> None:
         """Register a treebuilder based on its advertised features.
 
-        :param treebuilder_class: A subclass of Treebuilder. its .features
-           attribute should list its features.
+        :param treebuilder_class: A subclass of `TreeBuilder`. its
+           `TreeBuilder.features` attribute should list its features.
         """
         for feature in treebuilder_class.features:
             self.builders_for_feature[feature].insert(0, treebuilder_class)
         self.builders.insert(0, treebuilder_class)
 
-    def lookup(self, *features):
+    def lookup(self, *features: str) -> Optional[Type[TreeBuilder]]:
         """Look up a TreeBuilder subclass with the desired features.
 
         :param features: A list of features to look for. If none are
@@ -78,100 +125,92 @@ def lookup(self, *features):
 
         # Go down the list of features in order, and eliminate any builders
         # that don't match every feature.
-        features = list(features)
-        features.reverse()
+        feature_list = list(features)
+        feature_list.reverse()
         candidates = None
         candidate_set = None
-        while len(features) > 0:
-            feature = features.pop()
+        while len(feature_list) > 0:
+            feature = feature_list.pop()
             we_have_the_feature = self.builders_for_feature.get(feature, [])
             if len(we_have_the_feature) > 0:
                 if candidates is None:
                     candidates = we_have_the_feature
                     candidate_set = set(candidates)
-                else:
+                elif candidate_set is not None:
                     # Eliminate any candidates that don't have this feature.
-                    candidate_set = candidate_set.intersection(
-                        set(we_have_the_feature))
+                    candidate_set = candidate_set.intersection(set(we_have_the_feature))
 
         # The only valid candidates are the ones in candidate_set.
         # Go through the original list of candidates and pick the first one
         # that's in candidate_set.
-        if candidate_set is None:
+        if candidate_set is None or candidates is None:
             return None
         for candidate in candidates:
             if candidate in candidate_set:
                 return candidate
         return None
 
-# The BeautifulSoup class will take feature lists from developers and use them
-# to look up builders in this registry.
-builder_registry = TreeBuilderRegistry()
+
+#: The `BeautifulSoup` constructor will take a list of features
+#: and use it to look up `TreeBuilder` classes in this registry.
+builder_registry: TreeBuilderRegistry = TreeBuilderRegistry()
+
 
 class TreeBuilder(object):
-    """Turn a textual document into a Beautiful Soup object tree."""
-
-    NAME = "[Unknown tree builder]"
-    ALTERNATE_NAMES = []
-    features = []
-
-    is_xml = False
-    picklable = False
-    empty_element_tags = None # A tag will be considered an empty-element
-                              # tag when and only when it has no contents.
-    
-    # A value for these tag/attribute combinations is a space- or
-    # comma-separated list of CDATA, rather than a single CDATA.
-    DEFAULT_CDATA_LIST_ATTRIBUTES = defaultdict(list)
-
-    # Whitespace should be preserved inside these tags.
-    DEFAULT_PRESERVE_WHITESPACE_TAGS = set()
-
-    # The textual contents of tags with these names should be
-    # instantiated with some class other than NavigableString.
-    DEFAULT_STRING_CONTAINERS = {}
-    
-    USE_DEFAULT = object()
-
-    # Most parsers don't keep track of line numbers.
-    TRACKS_LINE_NUMBERS = False
-    
-    def __init__(self, multi_valued_attributes=USE_DEFAULT,
-                 preserve_whitespace_tags=USE_DEFAULT,
-                 store_line_numbers=USE_DEFAULT,
-                 string_containers=USE_DEFAULT,
+    """Turn a textual document into a Beautiful Soup object tree.
+
+    This is an abstract superclass which smooths out the behavior of
+    different parser libraries into a single, unified interface.
+
+    :param multi_valued_attributes: If this is set to None, the
+     TreeBuilder will not turn any values for attributes like
+     'class' into lists. Setting this to a dictionary will
+     customize this behavior; look at :py:attr:`bs4.builder.HTMLTreeBuilder.DEFAULT_CDATA_LIST_ATTRIBUTES`
+     for an example.
+
+     Internally, these are called "CDATA list attributes", but that
+     probably doesn't make sense to an end-user, so the argument name
+     is ``multi_valued_attributes``.
+
+    :param preserve_whitespace_tags: A set of tags to treat
+     the way <pre> tags are treated in HTML. Tags in this set
+     are immune from pretty-printing; their contents will always be
+     output as-is.
+
+    :param string_containers: A dictionary mapping tag names to
+     the classes that should be instantiated to contain the textual
+     contents of those tags. The default is to use NavigableString
+     for every tag, no matter what the name. You can override the
+     default by changing :py:attr:`DEFAULT_STRING_CONTAINERS`.
+
+    :param store_line_numbers: If the parser keeps track of the line
+     numbers and positions of the original markup, that information
+     will, by default, be stored in each corresponding
+     :py:class:`bs4.element.Tag` object. You can turn this off by
+     passing store_line_numbers=False; then Tag.sourcepos and
+     Tag.sourceline will always be None. If the parser you're using
+     doesn't keep track of this information, then store_line_numbers
+     is irrelevant.
+
+    :param attribute_dict_class: The value of a multi-valued attribute
+      (such as HTML's 'class') willl be stored in an instance of this
+      class.  The default is Beautiful Soup's built-in
+      `AttributeValueList`, which is a normal Python list, and you
+      will probably never need to change it.
+    """
+
+    USE_DEFAULT: Any = object()  #: :meta private:
+
+    def __init__(
+        self,
+        multi_valued_attributes: Dict[str, Set[str]] = USE_DEFAULT,
+        preserve_whitespace_tags: Set[str] = USE_DEFAULT,
+        store_line_numbers: bool = USE_DEFAULT,
+        string_containers: Dict[str, Type[NavigableString]] = USE_DEFAULT,
+        empty_element_tags: Set[str] = USE_DEFAULT,
+        attribute_dict_class: Type[AttributeDict] = AttributeDict,
+        attribute_value_list_class: Type[AttributeValueList] = AttributeValueList,
     ):
-        """Constructor.
-
-        :param multi_valued_attributes: If this is set to None, the
-         TreeBuilder will not turn any values for attributes like
-         'class' into lists. Setting this to a dictionary will
-         customize this behavior; look at DEFAULT_CDATA_LIST_ATTRIBUTES
-         for an example.
-
-         Internally, these are called "CDATA list attributes", but that
-         probably doesn't make sense to an end-user, so the argument name
-         is `multi_valued_attributes`.
-
-        :param preserve_whitespace_tags: A list of tags to treat
-         the way <pre> tags are treated in HTML. Tags in this list
-         are immune from pretty-printing; their contents will always be
-         output as-is.
-
-        :param string_containers: A dictionary mapping tag names to
-        the classes that should be instantiated to contain the textual
-        contents of those tags. The default is to use NavigableString
-        for every tag, no matter what the name. You can override the
-        default by changing DEFAULT_STRING_CONTAINERS.
-
-        :param store_line_numbers: If the parser keeps track of the
-         line numbers and positions of the original markup, that
-         information will, by default, be stored in each corresponding
-         `Tag` object. You can turn this off by passing
-         store_line_numbers=False. If the parser you're using doesn't 
-         keep track of this information, then setting store_line_numbers=True
-         will do nothing.
-        """
         self.soup = None
         if multi_valued_attributes is self.USE_DEFAULT:
             multi_valued_attributes = self.DEFAULT_CDATA_LIST_ATTRIBUTES
@@ -179,22 +218,68 @@ def __init__(self, multi_valued_attributes=USE_DEFAULT,
         if preserve_whitespace_tags is self.USE_DEFAULT:
             preserve_whitespace_tags = self.DEFAULT_PRESERVE_WHITESPACE_TAGS
         self.preserve_whitespace_tags = preserve_whitespace_tags
+        if empty_element_tags is self.USE_DEFAULT:
+            self.empty_element_tags = self.DEFAULT_EMPTY_ELEMENT_TAGS
+        else:
+            self.empty_element_tags = empty_element_tags
+        # TODO: store_line_numbers is probably irrelevant now that
+        # the behavior of sourceline and sourcepos has been made consistent
+        # everywhere.
         if store_line_numbers == self.USE_DEFAULT:
             store_line_numbers = self.TRACKS_LINE_NUMBERS
-        self.store_line_numbers = store_line_numbers 
+        self.store_line_numbers = store_line_numbers
         if string_containers == self.USE_DEFAULT:
             string_containers = self.DEFAULT_STRING_CONTAINERS
         self.string_containers = string_containers
-        
-    def initialize_soup(self, soup):
+        self.attribute_dict_class = attribute_dict_class
+        self.attribute_value_list_class = attribute_value_list_class
+
+    NAME: str = "[Unknown tree builder]"
+    ALTERNATE_NAMES: Iterable[str] = []
+    features: Iterable[str] = []
+
+    is_xml: bool = False
+    picklable: bool = False
+
+    soup: Optional[BeautifulSoup]  #: :meta private:
+
+    #: A tag will be considered an empty-element
+    #: tag when and only when it has no contents.
+    empty_element_tags: Optional[Set[str]] = None  #: :meta private:
+    cdata_list_attributes: Dict[str, Set[str]]  #: :meta private:
+    preserve_whitespace_tags: Set[str]  #: :meta private:
+    string_containers: Dict[str, Type[NavigableString]]  #: :meta private:
+    tracks_line_numbers: bool  #: :meta private:
+
+    #: A value for these tag/attribute combinations is a space- or
+    #: comma-separated list of CDATA, rather than a single CDATA.
+    DEFAULT_CDATA_LIST_ATTRIBUTES: Dict[str, Set[str]] = defaultdict(set)
+
+    #: Whitespace should be preserved inside these tags.
+    DEFAULT_PRESERVE_WHITESPACE_TAGS: Set[str] = set()
+
+    #: The textual contents of tags with these names should be
+    #: instantiated with some class other than `bs4.element.NavigableString`.
+    DEFAULT_STRING_CONTAINERS: Dict[str, Type[bs4.element.NavigableString]] = {} # type:ignore
+
+    #: By default, tags are treated as empty-element tags if they have
+    #: no contents--that is, using XML rules. HTMLTreeBuilder
+    #: defines a different set of DEFAULT_EMPTY_ELEMENT_TAGS based on the
+    #: HTML 4 and HTML5 standards.
+    DEFAULT_EMPTY_ELEMENT_TAGS: Optional[Set[str]] = None
+
+    #: Most parsers don't keep track of line numbers.
+    TRACKS_LINE_NUMBERS: bool = False
+
+    def initialize_soup(self, soup: BeautifulSoup) -> None:
         """The BeautifulSoup object has been initialized and is now
         being associated with the TreeBuilder.
 
         :param soup: A BeautifulSoup object.
         """
         self.soup = soup
-        
-    def reset(self):
+
+    def reset(self) -> None:
         """Do any work necessary to reset the underlying parser
         for a new document.
 
@@ -202,7 +287,7 @@ def reset(self):
         """
         pass
 
-    def can_be_empty_element(self, tag_name):
+    def can_be_empty_element(self, tag_name: str) -> bool:
         """Might a tag with this name be an empty-element tag?
 
         The final markup may or may not actually present this tag as
@@ -224,47 +309,48 @@ def can_be_empty_element(self, tag_name):
         if self.empty_element_tags is None:
             return True
         return tag_name in self.empty_element_tags
-    
-    def feed(self, markup):
-        """Run some incoming markup through some parsing process,
-        populating the `BeautifulSoup` object in self.soup.
-
-        This method is not implemented in TreeBuilder; it must be
-        implemented in subclasses.
 
-        :return: None.
-        """
+    def feed(self, markup: _RawMarkup) -> None:
+        """Run incoming markup through some parsing process."""
         raise NotImplementedError()
 
-    def prepare_markup(self, markup, user_specified_encoding=None,
-                       document_declared_encoding=None, exclude_encodings=None):
+    def prepare_markup(
+        self,
+        markup: _RawMarkup,
+        user_specified_encoding: Optional[_Encoding] = None,
+        document_declared_encoding: Optional[_Encoding] = None,
+        exclude_encodings: Optional[_Encodings] = None,
+    ) -> Iterable[Tuple[_RawMarkup, Optional[_Encoding], Optional[_Encoding], bool]]:
         """Run any preliminary steps necessary to make incoming markup
         acceptable to the parser.
 
-        :param markup: Some markup -- probably a bytestring.
-        :param user_specified_encoding: The user asked to try this encoding.
+        :param markup: The markup that's about to be parsed.
+        :param user_specified_encoding: The user asked to try this encoding
+           to convert the markup into a Unicode string.
         :param document_declared_encoding: The markup itself claims to be
             in this encoding. NOTE: This argument is not used by the
             calling code and can probably be removed.
-        :param exclude_encodings: The user asked _not_ to try any of
+        :param exclude_encodings: The user asked *not* to try any of
             these encodings.
 
-        :yield: A series of 4-tuples:
-         (markup, encoding, declared encoding,
-          has undergone character replacement)
+        :yield: A series of 4-tuples: (markup, encoding, declared encoding,
+            has undergone character replacement)
 
-         Each 4-tuple represents a strategy for converting the
-         document to Unicode and parsing it. Each strategy will be tried 
-         in turn.
+            Each 4-tuple represents a strategy that the parser can try
+            to convert the document to Unicode and parse it. Each
+            strategy will be tried in turn.
 
          By default, the only strategy is to parse the markup
          as-is. See `LXMLTreeBuilderForXML` and
          `HTMLParserTreeBuilder` for implementations that take into
          account the quirks of particular parsers.
+
+        :meta private:
+
         """
         yield markup, None, None, False
 
-    def test_fragment_to_document(self, fragment):
+    def test_fragment_to_document(self, fragment: str) -> str:
         """Wrap an HTML fragment to make it look like a document.
 
         Different parsers do this differently. For instance, lxml
@@ -273,26 +359,29 @@ def test_fragment_to_document(self, fragment):
         which run HTML fragments through the parser and compare the
         results against other HTML fragments.
 
-        This method should not be used outside of tests.
+        This method should not be used outside of unit tests.
 
-        :param fragment: A string -- fragment of HTML.
-        :return: A string -- a full HTML document.
+        :param fragment: A fragment of HTML.
+        :return: A full HTML document.
+        :meta private:
         """
         return fragment
 
-    def set_up_substitutions(self, tag):
-        """Set up any substitutions that will need to be performed on 
+    def set_up_substitutions(self, tag: Tag) -> bool:
+        """Set up any substitutions that will need to be performed on
         a `Tag` when it's output as a string.
 
         By default, this does nothing. See `HTMLTreeBuilder` for a
         case where this is used.
 
-        :param tag: A `Tag`
         :return: Whether or not a substitution was performed.
+        :meta private:
         """
         return False
 
-    def _replace_cdata_list_attribute_values(self, tag_name, attrs):
+    def _replace_cdata_list_attribute_values(
+        self, tag_name: str, attrs: _RawOrProcessedAttributeValues
+    ) -> _AttributeValues:
         """When an attribute value is associated with a tag that can
         have multiple values for that attribute, convert the string
         value to a list of strings.
@@ -304,153 +393,247 @@ def _replace_cdata_list_attribute_values(self, tag_name, attrs):
         :param tag_name: The name of a tag.
         :param attrs: A dictionary containing the tag's attributes.
            Any appropriate attribute values will be modified in place.
+        :return: The modified dictionary that was originally passed in.
         """
-        if not attrs:
-            return attrs
-        if self.cdata_list_attributes:
-            universal = self.cdata_list_attributes.get('*', [])
-            tag_specific = self.cdata_list_attributes.get(
-                tag_name.lower(), None)
-            for attr in list(attrs.keys()):
-                if attr in universal or (tag_specific and attr in tag_specific):
-                    # We have a "class"-type attribute whose string
-                    # value is a whitespace-separated list of
-                    # values. Split it into a list.
-                    value = attrs[attr]
-                    if isinstance(value, str):
-                        values = nonwhitespace_re.findall(value)
-                    else:
-                        # html5lib sometimes calls setAttributes twice
-                        # for the same tag when rearranging the parse
-                        # tree. On the second call the attribute value
-                        # here is already a list.  If this happens,
-                        # leave the value alone rather than trying to
-                        # split it again.
-                        values = value
-                    attrs[attr] = values
-        return attrs
-    
+
+        # First, cast the attrs dict to _AttributeValues. This might
+        # not be accurate yet, but it will be by the time this method
+        # returns.
+        modified_attrs = cast(_AttributeValues, attrs)
+        if not modified_attrs or not self.cdata_list_attributes:
+            # Nothing to do.
+            return modified_attrs
+
+        # There is at least a possibility that we need to modify one of
+        # the attribute values.
+        universal: Set[str] = self.cdata_list_attributes.get("*", set())
+        tag_specific = self.cdata_list_attributes.get(tag_name.lower(), None)
+        for attr in list(modified_attrs.keys()):
+            modified_value: _AttributeValue
+            if attr in universal or (tag_specific and attr in tag_specific):
+                # We have a "class"-type attribute whose string
+                # value is a whitespace-separated list of
+                # values. Split it into a list.
+                original_value: _AttributeValue = modified_attrs[attr]
+                if isinstance(original_value, _RawAttributeValue):
+                    # This is a _RawAttributeValue (a string) that
+                    # needs to be split and converted to a
+                    # AttributeValueList so it can be an
+                    # _AttributeValue.
+                    modified_value = self.attribute_value_list_class(
+                        nonwhitespace_re.findall(original_value)
+                    )
+                else:
+                    # html5lib calls setAttributes twice for the
+                    # same tag when rearranging the parse tree. On
+                    # the second call the attribute value here is
+                    # already a list. This can also happen when a
+                    # Tag object is cloned. If this happens, leave
+                    # the value alone rather than trying to split
+                    # it again.
+                    modified_value = original_value
+                modified_attrs[attr] = modified_value
+        return modified_attrs
+
+
 class SAXTreeBuilder(TreeBuilder):
     """A Beautiful Soup treebuilder that listens for SAX events.
 
-    This is not currently used for anything, but it demonstrates
-    how a simple TreeBuilder would work.
+    This is not currently used for anything, and it will be removed
+    soon. It was a good idea, but it wasn't properly integrated into the
+    rest of Beautiful Soup, so there have been long stretches where it
+    hasn't worked properly.
     """
 
-    def feed(self, markup):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        warnings.warn(
+            "The SAXTreeBuilder class was deprecated in 4.13.0 and will be removed soon thereafter. It is completely untested and probably doesn't work; do not use it.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        super(SAXTreeBuilder, self).__init__(*args, **kwargs)
+
+    def feed(self, markup: _RawMarkup) -> None:
         raise NotImplementedError()
 
-    def close(self):
+    def close(self) -> None:
         pass
 
-    def startElement(self, name, attrs):
-        attrs = dict((key[1], value) for key, value in list(attrs.items()))
-        #print("Start %s, %r" % (name, attrs))
-        self.soup.handle_starttag(name, attrs)
+    def startElement(self, name: str, attrs: Dict[str, str]) -> None:
+        attrs = AttributeDict((key[1], value) for key, value in list(attrs.items()))
+        # print("Start %s, %r" % (name, attrs))
+        assert self.soup is not None
+        self.soup.handle_starttag(name, None, None, attrs)
 
-    def endElement(self, name):
-        #print("End %s" % name)
+    def endElement(self, name: str) -> None:
+        # print("End %s" % name)
+        assert self.soup is not None
         self.soup.handle_endtag(name)
 
-    def startElementNS(self, nsTuple, nodeName, attrs):
+    def startElementNS(
+        self, nsTuple: Tuple[str, str], nodeName: str, attrs: Dict[str, str]
+    ) -> None:
         # Throw away (ns, nodeName) for now.
         self.startElement(nodeName, attrs)
 
-    def endElementNS(self, nsTuple, nodeName):
+    def endElementNS(self, nsTuple: Tuple[str, str], nodeName: str) -> None:
         # Throw away (ns, nodeName) for now.
         self.endElement(nodeName)
-        #handler.endElementNS((ns, node.nodeName), node.nodeName)
+        # handler.endElementNS((ns, node.nodeName), node.nodeName)
 
-    def startPrefixMapping(self, prefix, nodeValue):
+    def startPrefixMapping(self, prefix: str, nodeValue: str) -> None:
         # Ignore the prefix for now.
         pass
 
-    def endPrefixMapping(self, prefix):
+    def endPrefixMapping(self, prefix: str) -> None:
         # Ignore the prefix for now.
         # handler.endPrefixMapping(prefix)
         pass
 
-    def characters(self, content):
+    def characters(self, content: str) -> None:
+        assert self.soup is not None
         self.soup.handle_data(content)
 
-    def startDocument(self):
+    def startDocument(self) -> None:
         pass
 
-    def endDocument(self):
+    def endDocument(self) -> None:
         pass
 
 
 class HTMLTreeBuilder(TreeBuilder):
-    """This TreeBuilder knows facts about HTML.
-
-    Such as which tags are empty-element tags.
+    """This TreeBuilder knows facts about HTML, such as which tags are treated
+    specially by the HTML standard.
     """
 
-    empty_element_tags = set([
-        # These are from HTML5.
-        'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr',
-        
-        # These are from earlier versions of HTML and are removed in HTML5.
-        'basefont', 'bgsound', 'command', 'frame', 'image', 'isindex', 'nextid', 'spacer'
-    ])
-
-    # The HTML standard defines these as block-level elements. Beautiful
-    # Soup does not treat these elements differently from other elements,
-    # but it may do so eventually, and this information is available if
-    # you need to use it.
-    block_elements = set(["address", "article", "aside", "blockquote", "canvas", "dd", "div", "dl", "dt", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "header", "hr", "li", "main", "nav", "noscript", "ol", "output", "p", "pre", "section", "table", "tfoot", "ul", "video"])
-
-    # These HTML tags need special treatment so they can be
-    # represented by a string class other than NavigableString.
-    #
-    # For some of these tags, it's because the HTML standard defines
-    # an unusual content model for them. I made this list by going
-    # through the HTML spec
-    # (https://html.spec.whatwg.org/#metadata-content) and looking for
-    # "metadata content" elements that can contain strings.
-    #
-    # The Ruby tags (<rt> and <rp>) are here despite being normal
-    # "phrasing content" tags, because the content they contain is
-    # qualitatively different from other text in the document, and it
-    # can be useful to be able to distinguish it.
-    #
-    # TODO: Arguably <noscript> could go here but it seems
-    # qualitatively different from the other tags.
-    DEFAULT_STRING_CONTAINERS = {
-        'rt' : RubyTextString,
-        'rp' : RubyParenthesisString,
-        'style': Stylesheet,
-        'script': Script,
-        'template': TemplateString,
-    }    
-    
-    # The HTML standard defines these attributes as containing a
-    # space-separated list of values, not a single value. That is,
-    # class="foo bar" means that the 'class' attribute has two values,
-    # 'foo' and 'bar', not the single value 'foo bar'.  When we
-    # encounter one of these attributes, we will parse its value into
-    # a list of values if possible. Upon output, the list will be
-    # converted back into a string.
-    DEFAULT_CDATA_LIST_ATTRIBUTES = {
-        "*" : ['class', 'accesskey', 'dropzone'],
-        "a" : ['rel', 'rev'],
-        "link" :  ['rel', 'rev'],
-        "td" : ["headers"],
-        "th" : ["headers"],
-        "td" : ["headers"],
-        "form" : ["accept-charset"],
-        "object" : ["archive"],
-
+    #: Some HTML tags are defined as having no contents. Beautiful Soup
+    #: treats these specially.
+    DEFAULT_EMPTY_ELEMENT_TAGS: Optional[Set[str]] = set(
+        [
+            # These are from HTML5.
+            "area",
+            "base",
+            "br",
+            "col",
+            "embed",
+            "hr",
+            "img",
+            "input",
+            "keygen",
+            "link",
+            "menuitem",
+            "meta",
+            "param",
+            "source",
+            "track",
+            "wbr",
+            # These are from earlier versions of HTML and are removed in HTML5.
+            "basefont",
+            "bgsound",
+            "command",
+            "frame",
+            "image",
+            "isindex",
+            "nextid",
+            "spacer",
+        ]
+    )
+
+    #: The HTML standard defines these tags as block-level elements. Beautiful
+    #: Soup does not treat these elements differently from other elements,
+    #: but it may do so eventually, and this information is available if
+    #: you need to use it.
+    DEFAULT_BLOCK_ELEMENTS: Set[str] = set(
+        [
+            "address",
+            "article",
+            "aside",
+            "blockquote",
+            "canvas",
+            "dd",
+            "div",
+            "dl",
+            "dt",
+            "fieldset",
+            "figcaption",
+            "figure",
+            "footer",
+            "form",
+            "h1",
+            "h2",
+            "h3",
+            "h4",
+            "h5",
+            "h6",
+            "header",
+            "hr",
+            "li",
+            "main",
+            "nav",
+            "noscript",
+            "ol",
+            "output",
+            "p",
+            "pre",
+            "section",
+            "table",
+            "tfoot",
+            "ul",
+            "video",
+        ]
+    )
+
+    #: These HTML tags need special treatment so they can be
+    #: represented by a string class other than `bs4.element.NavigableString`.
+    #:
+    #: For some of these tags, it's because the HTML standard defines
+    #: an unusual content model for them. I made this list by going
+    #: through the HTML spec
+    #: (https://html.spec.whatwg.org/#metadata-content) and looking for
+    #: "metadata content" elements that can contain strings.
+    #:
+    #: The Ruby tags (<rt> and <rp>) are here despite being normal
+    #: "phrasing content" tags, because the content they contain is
+    #: qualitatively different from other text in the document, and it
+    #: can be useful to be able to distinguish it.
+    #:
+    #: TODO: Arguably <noscript> could go here but it seems
+    #: qualitatively different from the other tags.
+    DEFAULT_STRING_CONTAINERS: Dict[str, Type[bs4.element.NavigableString]] = { # type:ignore
+        "rt": RubyTextString,
+        "rp": RubyParenthesisString,
+        "style": Stylesheet,
+        "script": Script,
+        "template": TemplateString,
+    }
+
+    #: The HTML standard defines these attributes as containing a
+    #: space-separated list of values, not a single value. That is,
+    #: class="foo bar" means that the 'class' attribute has two values,
+    #: 'foo' and 'bar', not the single value 'foo bar'.  When we
+    #: encounter one of these attributes, we will parse its value into
+    #: a list of values if possible. Upon output, the list will be
+    #: converted back into a string.
+    DEFAULT_CDATA_LIST_ATTRIBUTES: Dict[str, Set[str]] = {
+        "*": {"class", "accesskey", "dropzone"},
+        "a": {"rel", "rev"},
+        "link": {"rel", "rev"},
+        "td": {"headers"},
+        "th": {"headers"},
+        "form": {"accept-charset"},
+        "object": {"archive"},
         # These are HTML5 specific, as are *.accesskey and *.dropzone above.
-        "area" : ["rel"],
-        "icon" : ["sizes"],
-        "iframe" : ["sandbox"],
-        "output" : ["for"],
-        }
+        "area": {"rel"},
+        "icon": {"sizes"},
+        "iframe": {"sandbox"},
+        "output": {"for"},
+    }
 
-    DEFAULT_PRESERVE_WHITESPACE_TAGS = set(['pre', 'textarea'])
+    #: By default, whitespace inside these HTML tags will be
+    #: preserved rather than being collapsed.
+    DEFAULT_PRESERVE_WHITESPACE_TAGS: set[str] = set(["pre", "textarea"])
 
-    def set_up_substitutions(self, tag):
+    def set_up_substitutions(self, tag: Tag) -> bool:
         """Replace the declared encoding in a <meta> tag with a placeholder,
         to be substituted when the tag is output to a string.
 
@@ -458,16 +641,25 @@ def set_up_substitutions(self, tag):
         encoding, but exit in a different encoding, and the <meta> tag
         needs to be changed to reflect this.
 
-        :param tag: A `Tag`
         :return: Whether or not a substitution was performed.
+
+        :meta private:
         """
         # We are only interested in <meta> tags
-        if tag.name != 'meta':
+        if tag.name != "meta":
             return False
 
-        http_equiv = tag.get('http-equiv')
-        content = tag.get('content')
-        charset = tag.get('charset')
+        # TODO: This cast will fail in the (very unlikely) scenario
+        # that the programmer who instantiates the TreeBuilder
+        # specifies meta['content'] or meta['charset'] as
+        # cdata_list_attributes.
+        content: Optional[str] = cast(Optional[str], tag.get("content"))
+        charset: Optional[str] = cast(Optional[str], tag.get("charset"))
+
+        # But we can accommodate meta['http-equiv'] being made a
+        # cdata_list_attribute (again, very unlikely) without much
+        # trouble.
+        http_equiv: List[str] = tag.get_attribute_list("http-equiv")
 
         # We are interested in <meta> tags that say what encoding the
         # document was originally in. This means HTML 5-style <meta>
@@ -478,20 +670,23 @@ def set_up_substitutions(self, tag):
         # In both cases we will replace the value of the appropriate
         # attribute with a standin object that can take on any
         # encoding.
-        meta_encoding = None
+        substituted = False
         if charset is not None:
             # HTML 5 style:
             # <meta charset="utf8">
-            meta_encoding = charset
-            tag['charset'] = CharsetMetaAttributeValue(charset)
+            tag["charset"] = CharsetMetaAttributeValue(charset)
+            substituted = True
 
-        elif (content is not None and http_equiv is not None
-              and http_equiv.lower() == 'content-type'):
+        elif content is not None and any(
+            x.lower() == "content-type" for x in http_equiv
+        ):
             # HTML 4 style:
             # <meta http-equiv="content-type" content="text/html; charset=utf8">
-            tag['content'] = ContentMetaAttributeValue(content)
+            tag["content"] = ContentMetaAttributeValue(content)
+            substituted = True
+
+        return substituted
 
-        return (meta_encoding is not None)
 
 class DetectsXMLParsedAsHTML(object):
     """A mixin class for any class (a TreeBuilder, or some class used by a
@@ -502,66 +697,88 @@ class DetectsXMLParsedAsHTML(object):
     This requires being able to observe an incoming processing
     instruction that might be an XML declaration, and also able to
     observe tags as they're opened. If you can't do that for a given
-    TreeBuilder, there's a less reliable implementation based on
+    `TreeBuilder`, there's a less reliable implementation based on
     examining the raw markup.
     """
 
-    # Regular expression for seeing if markup has an <html> tag.
-    LOOKS_LIKE_HTML = re.compile("<[^ +]html", re.I)
-    LOOKS_LIKE_HTML_B = re.compile(b"<[^ +]html", re.I)
+    #: Regular expression for seeing if string markup has an <html> tag.
+    LOOKS_LIKE_HTML: Pattern[str] = re.compile("<[^ +]html", re.I)
+
+    #: Regular expression for seeing if byte markup has an <html> tag.
+    LOOKS_LIKE_HTML_B: Pattern[bytes] = re.compile(b"<[^ +]html", re.I)
+
+    #: The start of an XML document string.
+    XML_PREFIX: str = "<?xml"
+
+    #: The start of an XML document bytestring.
+    XML_PREFIX_B: bytes = b"<?xml"
+
+    # This is typed as str, not `ProcessingInstruction`, because this
+    # check may be run before any Beautiful Soup objects are created.
+    _first_processing_instruction: Optional[str]  #: :meta private:
+    _root_tag_name: Optional[str]  #: :meta private:
 
-    XML_PREFIX = '<?xml'
-    XML_PREFIX_B = b'<?xml'
-    
     @classmethod
-    def warn_if_markup_looks_like_xml(cls, markup, stacklevel=3):
+    def warn_if_markup_looks_like_xml(
+        cls, markup: Optional[_RawMarkup], stacklevel: int = 3
+    ) -> bool:
         """Perform a check on some markup to see if it looks like XML
         that's not XHTML. If so, issue a warning.
 
         This is much less reliable than doing the check while parsing,
         but some of the tree builders can't do that.
 
-        :param stacklevel: The stacklevel of the code calling this
-        function.
+        :param stacklevel: The stacklevel of the code calling this\
+         function.
 
         :return: True if the markup looks like non-XHTML XML, False
-        otherwise.
-
+         otherwise.
         """
+        if markup is None:
+            return False
+        markup = markup[:500]
         if isinstance(markup, bytes):
-            prefix = cls.XML_PREFIX_B
-            looks_like_html = cls.LOOKS_LIKE_HTML_B
+            markup_b: bytes = markup
+            looks_like_xml = markup_b.startswith(
+                cls.XML_PREFIX_B
+            ) and not cls.LOOKS_LIKE_HTML_B.search(markup)
         else:
-            prefix = cls.XML_PREFIX
-            looks_like_html = cls.LOOKS_LIKE_HTML
-        
-        if (markup is not None
-            and markup.startswith(prefix)
-            and not looks_like_html.search(markup[:500])
-        ):
-            cls._warn(stacklevel=stacklevel+2)
+            markup_s: str = markup
+            looks_like_xml = markup_s.startswith(
+                cls.XML_PREFIX
+            ) and not cls.LOOKS_LIKE_HTML.search(markup)
+
+        if looks_like_xml:
+            cls._warn(stacklevel=stacklevel + 2)
             return True
         return False
 
     @classmethod
-    def _warn(cls, stacklevel=5):
+    def _warn(cls, stacklevel: int = 5) -> None:
         """Issue a warning about XML being parsed as HTML."""
         warnings.warn(
-            XMLParsedAsHTMLWarning.MESSAGE, XMLParsedAsHTMLWarning,
-            stacklevel=stacklevel
+            XMLParsedAsHTMLWarning.MESSAGE,
+            XMLParsedAsHTMLWarning,
+            stacklevel=stacklevel,
         )
-        
-    def _initialize_xml_detector(self):
+
+    def _initialize_xml_detector(self) -> None:
         """Call this method before parsing a document."""
         self._first_processing_instruction = None
-        self._root_tag = None
-       
-    def _document_might_be_xml(self, processing_instruction):
+        self._root_tag_name = None
+
+    def _document_might_be_xml(self, processing_instruction: str) -> None:
         """Call this method when encountering an XML declaration, or a
         "processing instruction" that might be an XML declaration.
+
+        This helps Beautiful Soup detect potential issues later, if
+        the XML document turns out to be a non-XHTML document that's
+        being parsed as XML.
         """
-        if (self._first_processing_instruction is not None
-            or self._root_tag is not None):
+        if (
+            self._first_processing_instruction is not None
+            or self._root_tag_name is not None
+        ):
             # The document has already started. Don't bother checking
             # anymore.
             return
@@ -570,28 +787,32 @@ def _document_might_be_xml(self, processing_instruction):
 
         # We won't know until we encounter the first tag whether or
         # not this is actually a problem.
-        
-    def _root_tag_encountered(self, name):
+
+    def _root_tag_encountered(self, name: str) -> None:
         """Call this when you encounter the document's root tag.
 
         This is where we actually check whether an XML document is
         being incorrectly parsed as HTML, and issue the warning.
         """
-        if self._root_tag is not None:
+        if self._root_tag_name is not None:
             # This method was incorrectly called multiple times. Do
             # nothing.
             return
 
-        self._root_tag = name
-        if (name != 'html' and self._first_processing_instruction is not None
-            and self._first_processing_instruction.lower().startswith('xml ')):
+        self._root_tag_name = name
+
+        if (
+            name != "html"
+            and self._first_processing_instruction is not None
+            and self._first_processing_instruction.lower().startswith("xml ")
+        ):
             # We encountered an XML declaration and then a tag other
             # than 'html'. This is a reliable indicator that a
             # non-XHTML document is being parsed as XML.
-            self._warn()
+            self._warn(stacklevel=10)
+
 
-    
-def register_treebuilders_from(module):
+def register_treebuilders_from(module: ModuleType) -> None:
     """Copy TreeBuilders from the given module into this module."""
     this_module = sys.modules[__name__]
     for name in module.__all__:
@@ -603,33 +824,24 @@ def register_treebuilders_from(module):
             # Register the builder while we're at it.
             this_module.builder_registry.register(obj)
 
-class ParserRejectedMarkup(Exception):
-    """An Exception to be raised when the underlying parser simply
-    refuses to parse the given markup.
-    """
-    def __init__(self, message_or_exception):
-        """Explain why the parser rejected the given markup, either
-        with a textual explanation or another exception.
-        """
-        if isinstance(message_or_exception, Exception):
-            e = message_or_exception
-            message_or_exception = "%s: %s" % (e.__class__.__name__, str(e))
-        super(ParserRejectedMarkup, self).__init__(message_or_exception)
-            
+
 # Builders are registered in reverse order of priority, so that custom
 # builder registrations will take precedence. In general, we want lxml
 # to take precedence over html5lib, because it's faster. And we only
 # want to use HTMLParser as a last resort.
-from . import _htmlparser
+from . import _htmlparser # noqa: E402
+
 register_treebuilders_from(_htmlparser)
 try:
     from . import _html5lib
+
     register_treebuilders_from(_html5lib)
 except ImportError:
     # They don't have html5lib installed.
     pass
 try:
     from . import _lxml
+
     register_treebuilders_from(_lxml)
 except ImportError:
     # They don't have lxml installed.
diff --git a/libs/bs4/builder/_html5lib.py b/libs/bs4/builder/_html5lib.py
index 7c46a85118..c90231f6c2 100644
--- a/libs/bs4/builder/_html5lib.py
+++ b/libs/bs4/builder/_html5lib.py
@@ -2,316 +2,395 @@
 __license__ = "MIT"
 
 __all__ = [
-    'HTML5TreeBuilder',
-    ]
+    "HTML5TreeBuilder",
+]
+
+from typing import (
+    Any,
+    cast,
+    Dict,
+    Iterable,
+    Optional,
+    Sequence,
+    TYPE_CHECKING,
+    Tuple,
+    Union,
+)
+from typing_extensions import TypeAlias
+from bs4._typing import (
+    _AttributeValue,
+    _AttributeValues,
+    _Encoding,
+    _Encodings,
+    _NamespaceURL,
+    _RawMarkup,
+)
 
 import warnings
-import re
 from bs4.builder import (
     DetectsXMLParsedAsHTML,
     PERMISSIVE,
     HTML,
     HTML_5,
     HTMLTreeBuilder,
-    )
+)
 from bs4.element import (
     NamespacedAttribute,
+    PageElement,
     nonwhitespace_re,
 )
 import html5lib
 from html5lib.constants import (
     namespaces,
-    prefixes,
-    )
+)
 from bs4.element import (
     Comment,
     Doctype,
     NavigableString,
     Tag,
-    )
+)
+
+if TYPE_CHECKING:
+    from bs4 import BeautifulSoup
+
+from html5lib.treebuilders import base as treebuilder_base
 
-try:
-    # Pre-0.99999999
-    from html5lib.treebuilders import _base as treebuilder_base
-    new_html5lib = False
-except ImportError as e:
-    # 0.99999999 and up
-    from html5lib.treebuilders import base as treebuilder_base
-    new_html5lib = True
 
 class HTML5TreeBuilder(HTMLTreeBuilder):
-    """Use html5lib to build a tree.
+    """Use `html5lib <https://github.com/html5lib/html5lib-python>`_ to
+    build a tree.
 
-    Note that this TreeBuilder does not support some features common
-    to HTML TreeBuilders. Some of these features could theoretically
+    Note that `HTML5TreeBuilder` does not support some common HTML
+    `TreeBuilder` features. Some of these features could theoretically
     be implemented, but at the very least it's quite difficult,
     because html5lib moves the parse tree around as it's being built.
 
-    * This TreeBuilder doesn't use different subclasses of NavigableString
-      based on the name of the tag in which the string was found.
+    Specifically:
 
-    * You can't use a SoupStrainer to parse only part of a document.
+    * This `TreeBuilder` doesn't use different subclasses of
+      `NavigableString` (e.g. `Script`) based on the name of the tag
+      in which the string was found.
+    * You can't use a `SoupStrainer` to parse only part of a document.
     """
 
-    NAME = "html5lib"
+    NAME: str = "html5lib"
+
+    features: Iterable[str] = [NAME, PERMISSIVE, HTML_5, HTML]
+
+    #: html5lib can tell us which line number and position in the
+    #: original file is the source of an element.
+    TRACKS_LINE_NUMBERS: bool = True
 
-    features = [NAME, PERMISSIVE, HTML_5, HTML]
+    underlying_builder: "TreeBuilderForHtml5lib"  #: :meta private:
+    user_specified_encoding: Optional[_Encoding]
 
-    # html5lib can tell us which line number and position in the
-    # original file is the source of an element.
-    TRACKS_LINE_NUMBERS = True
-    
-    def prepare_markup(self, markup, user_specified_encoding,
-                       document_declared_encoding=None, exclude_encodings=None):
+    def prepare_markup(
+        self,
+        markup: _RawMarkup,
+        user_specified_encoding: Optional[_Encoding] = None,
+        document_declared_encoding: Optional[_Encoding] = None,
+        exclude_encodings: Optional[_Encodings] = None,
+    ) -> Iterable[Tuple[_RawMarkup, Optional[_Encoding], Optional[_Encoding], bool]]:
         # Store the user-specified encoding for use later on.
         self.user_specified_encoding = user_specified_encoding
 
         # document_declared_encoding and exclude_encodings aren't used
         # ATM because the html5lib TreeBuilder doesn't use
         # UnicodeDammit.
-        if exclude_encodings:
-            warnings.warn(
-                "You provided a value for exclude_encoding, but the html5lib tree builder doesn't support exclude_encoding.",
-                stacklevel=3
-            )
+        for variable, name in (
+            (document_declared_encoding, "document_declared_encoding"),
+            (exclude_encodings, "exclude_encodings"),
+        ):
+            if variable:
+                warnings.warn(
+                    f"You provided a value for {name}, but the html5lib tree builder doesn't support {name}.",
+                    stacklevel=3,
+                )
 
         # html5lib only parses HTML, so if it's given XML that's worth
         # noting.
-        DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(
-            markup, stacklevel=3
-        )
+        DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(markup, stacklevel=3)
 
         yield (markup, None, None, False)
 
     # These methods are defined by Beautiful Soup.
-    def feed(self, markup):
-        if self.soup.parse_only is not None:
+    def feed(self, markup: _RawMarkup) -> None:
+        """Run some incoming markup through some parsing process,
+        populating the `BeautifulSoup` object in `HTML5TreeBuilder.soup`.
+        """
+        if self.soup is not None and self.soup.parse_only is not None:
             warnings.warn(
                 "You provided a value for parse_only, but the html5lib tree builder doesn't support parse_only. The entire document will be parsed.",
-                stacklevel=4
+                stacklevel=4,
             )
+
+        # self.underlying_builder is probably None now, but it'll be set
+        # when html5lib calls self.create_treebuilder().
         parser = html5lib.HTMLParser(tree=self.create_treebuilder)
+        assert self.underlying_builder is not None
         self.underlying_builder.parser = parser
         extra_kwargs = dict()
         if not isinstance(markup, str):
-            if new_html5lib:
-                extra_kwargs['override_encoding'] = self.user_specified_encoding
-            else:
-                extra_kwargs['encoding'] = self.user_specified_encoding
-        doc = parser.parse(markup, **extra_kwargs)
-        
+            # kwargs, specifically override_encoding, will eventually
+            # be passed in to html5lib's
+            # HTMLBinaryInputStream.__init__.
+            extra_kwargs["override_encoding"] = self.user_specified_encoding
+
+        doc = parser.parse(markup, **extra_kwargs) # type:ignore
+
         # Set the character encoding detected by the tokenizer.
         if isinstance(markup, str):
             # We need to special-case this because html5lib sets
             # charEncoding to UTF-8 if it gets Unicode input.
             doc.original_encoding = None
         else:
-            original_encoding = parser.tokenizer.stream.charEncoding[0]
-            if not isinstance(original_encoding, str):
-                # In 0.99999999 and up, the encoding is an html5lib
-                # Encoding object. We want to use a string for compatibility
-                # with other tree builders.
-                original_encoding = original_encoding.name
+            original_encoding = parser.tokenizer.stream.charEncoding[0] # type:ignore
+            # The encoding is an html5lib Encoding object. We want to
+            # use a string for compatibility with other tree builders.
+            original_encoding = original_encoding.name
             doc.original_encoding = original_encoding
         self.underlying_builder.parser = None
-            
-    def create_treebuilder(self, namespaceHTMLElements):
+
+    def create_treebuilder(
+        self, namespaceHTMLElements: bool
+    ) -> "TreeBuilderForHtml5lib":
+        """Called by html5lib to instantiate the kind of class it
+        calls a 'TreeBuilder'.
+
+        :param namespaceHTMLElements: Whether or not to namespace HTML elements.
+
+        :meta private:
+        """
         self.underlying_builder = TreeBuilderForHtml5lib(
-            namespaceHTMLElements, self.soup,
-            store_line_numbers=self.store_line_numbers
+            namespaceHTMLElements, self.soup, store_line_numbers=self.store_line_numbers
         )
         return self.underlying_builder
 
-    def test_fragment_to_document(self, fragment):
+    def test_fragment_to_document(self, fragment: str) -> str:
         """See `TreeBuilder`."""
-        return '<html><head></head><body>%s</body></html>' % fragment
+        return "<html><head></head><body>%s</body></html>" % fragment
 
 
 class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
-    
-    def __init__(self, namespaceHTMLElements, soup=None,
-                 store_line_numbers=True, **kwargs):
+    soup: "BeautifulSoup"  #: :meta private:
+    parser: Optional[html5lib.HTMLParser]  #: :meta private:
+
+    def __init__(
+        self,
+        namespaceHTMLElements: bool,
+        soup: Optional["BeautifulSoup"] = None,
+        store_line_numbers: bool = True,
+        **kwargs: Any,
+    ):
         if soup:
             self.soup = soup
         else:
+            warnings.warn(
+                "The optionality of the 'soup' argument to the TreeBuilderForHtml5lib constructor is deprecated as of Beautiful Soup 4.13.0: 'soup' is now required. If you can't pass in a BeautifulSoup object here, or you get this warning and it seems mysterious to you, please contact the Beautiful Soup developer team for possible un-deprecation.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
             from bs4 import BeautifulSoup
-            # TODO: Why is the parser 'html.parser' here? To avoid an
-            # infinite loop?
+
+            # TODO: Why is the parser 'html.parser' here? Using
+            # html5lib doesn't cause an infinite loop and is more
+            # accurate. Best to get rid of this entire section, I think.
             self.soup = BeautifulSoup(
-                "", "html.parser", store_line_numbers=store_line_numbers,
-                **kwargs
+                "", "html.parser", store_line_numbers=store_line_numbers, **kwargs
             )
         # TODO: What are **kwargs exactly? Should they be passed in
         # here in addition to/instead of being passed to the BeautifulSoup
         # constructor?
         super(TreeBuilderForHtml5lib, self).__init__(namespaceHTMLElements)
 
-        # This will be set later to an html5lib.html5parser.HTMLParser
-        # object, which we can use to track the current line number.
+        # This will be set later to a real html5lib HTMLParser object,
+        # which we can use to track the current line number.
         self.parser = None
         self.store_line_numbers = store_line_numbers
-        
-    def documentClass(self):
+
+    def documentClass(self) -> "Element":
         self.soup.reset()
         return Element(self.soup, self.soup, None)
 
-    def insertDoctype(self, token):
-        name = token["name"]
-        publicId = token["publicId"]
-        systemId = token["systemId"]
+    def insertDoctype(self, token: Dict[str, Any]) -> None:
+        name: str = cast(str, token["name"])
+        publicId: Optional[str] = cast(Optional[str], token["publicId"])
+        systemId: Optional[str] = cast(Optional[str], token["systemId"])
 
         doctype = Doctype.for_name_and_ids(name, publicId, systemId)
         self.soup.object_was_parsed(doctype)
 
-    def elementClass(self, name, namespace):
-        kwargs = {}
-        if self.parser and self.store_line_numbers:
+    def elementClass(self, name: str, namespace: str) -> "Element":
+        sourceline: Optional[int] = None
+        sourcepos: Optional[int] = None
+        if self.parser is not None and self.store_line_numbers:
             # This represents the point immediately after the end of the
             # tag. We don't know when the tag started, but we do know
             # where it ended -- the character just before this one.
-            sourceline, sourcepos = self.parser.tokenizer.stream.position()
-            kwargs['sourceline'] = sourceline
-            kwargs['sourcepos'] = sourcepos-1
-        tag = self.soup.new_tag(name, namespace, **kwargs)
+            sourceline, sourcepos = self.parser.tokenizer.stream.position() # type:ignore
+            assert sourcepos is not None
+            sourcepos = sourcepos - 1
+        tag = self.soup.new_tag(
+            name, namespace, sourceline=sourceline, sourcepos=sourcepos
+        )
 
         return Element(tag, self.soup, namespace)
 
-    def commentClass(self, data):
+    def commentClass(self, data: str) -> "TextNode":
         return TextNode(Comment(data), self.soup)
 
-    def fragmentClass(self):
-        from bs4 import BeautifulSoup
-        # TODO: Why is the parser 'html.parser' here? To avoid an
-        # infinite loop?
-        self.soup = BeautifulSoup("", "html.parser")
-        self.soup.name = "[document_fragment]"
-        return Element(self.soup, self.soup, None)
-
-    def appendChild(self, node):
-        # XXX This code is not covered by the BS4 tests.
+    def fragmentClass(self) -> "Element":
+        """This is only used by html5lib HTMLParser.parseFragment(),
+        which is never used by Beautiful Soup, only by the html5lib
+        unit tests. Since we don't currently hook into those tests,
+        the implementation is left blank.
+        """
+        raise NotImplementedError()
+
+    def getFragment(self) -> "Element":
+        """This is only used by the html5lib unit tests. Since we
+        don't currently hook into those tests, the implementation is
+        left blank.
+        """
+        raise NotImplementedError()
+
+    def appendChild(self, node: "Element") -> None:
+        # TODO: This code is not covered by the BS4 tests, and
+        # apparently not triggered by the html5lib test suite either.
+        # But it doesn't seem test-specific and there are calls to it
+        # (or a method with the same name) all over html5lib, so I'm
+        # leaving the implementation in place rather than replacing it
+        # with NotImplementedError()
         self.soup.append(node.element)
 
-    def getDocument(self):
+    def getDocument(self) -> "BeautifulSoup":
         return self.soup
 
-    def getFragment(self):
-        return treebuilder_base.TreeBuilder.getFragment(self).element
-
-    def testSerializer(self, element):
-        from bs4 import BeautifulSoup
-        rv = []
-        doctype_re = re.compile(r'^(.*?)(?: PUBLIC "(.*?)"(?: "(.*?)")?| SYSTEM "(.*?)")?$')
-
-        def serializeElement(element, indent=0):
-            if isinstance(element, BeautifulSoup):
-                pass
-            if isinstance(element, Doctype):
-                m = doctype_re.match(element)
-                if m:
-                    name = m.group(1)
-                    if m.lastindex > 1:
-                        publicId = m.group(2) or ""
-                        systemId = m.group(3) or m.group(4) or ""
-                        rv.append("""|%s<!DOCTYPE %s "%s" "%s">""" %
-                                  (' ' * indent, name, publicId, systemId))
-                    else:
-                        rv.append("|%s<!DOCTYPE %s>" % (' ' * indent, name))
-                else:
-                    rv.append("|%s<!DOCTYPE >" % (' ' * indent,))
-            elif isinstance(element, Comment):
-                rv.append("|%s<!-- %s -->" % (' ' * indent, element))
-            elif isinstance(element, NavigableString):
-                rv.append("|%s\"%s\"" % (' ' * indent, element))
-            else:
-                if element.namespace:
-                    name = "%s %s" % (prefixes[element.namespace],
-                                      element.name)
-                else:
-                    name = element.name
-                rv.append("|%s<%s>" % (' ' * indent, name))
-                if element.attrs:
-                    attributes = []
-                    for name, value in list(element.attrs.items()):
-                        if isinstance(name, NamespacedAttribute):
-                            name = "%s %s" % (prefixes[name.namespace], name.name)
-                        if isinstance(value, list):
-                            value = " ".join(value)
-                        attributes.append((name, value))
-
-                    for name, value in sorted(attributes):
-                        rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
-                indent += 2
-                for child in element.children:
-                    serializeElement(child, indent)
-        serializeElement(element, 0)
-
-        return "\n".join(rv)
+    def testSerializer(self, node: "Element") -> None:
+        """This is only used by the html5lib unit tests. Since we
+        don't currently hook into those tests, the implementation is
+        left blank.
+        """
+        raise NotImplementedError()
+
 
 class AttrList(object):
-    def __init__(self, element):
+    """Represents a Tag's attributes in a way compatible with html5lib."""
+
+    element: Tag
+    attrs: _AttributeValues
+
+    def __init__(self, element: Tag):
         self.element = element
         self.attrs = dict(self.element.attrs)
-    def __iter__(self):
+
+    def __iter__(self) -> Iterable[Tuple[str, _AttributeValue]]:
         return list(self.attrs.items()).__iter__()
-    def __setitem__(self, name, value):
+
+    def __setitem__(self, name: str, value: _AttributeValue) -> None:
         # If this attribute is a multi-valued attribute for this element,
         # turn its value into a list.
         list_attr = self.element.cdata_list_attributes or {}
-        if (name in list_attr.get('*', [])
-            or (self.element.name in list_attr
-                and name in list_attr.get(self.element.name, []))):
+        if name in list_attr.get("*", []) or (
+            self.element.name in list_attr
+            and name in list_attr.get(self.element.name, [])
+        ):
             # A node that is being cloned may have already undergone
-            # this procedure.
+            # this procedure. Check for this and skip it.
             if not isinstance(value, list):
-                value = nonwhitespace_re.findall(value)
+                assert isinstance(value, str)
+                value = self.element.attribute_value_list_class(
+                    nonwhitespace_re.findall(value)
+                )
         self.element[name] = value
-    def items(self):
+
+    def items(self) -> Iterable[Tuple[str, _AttributeValue]]:
         return list(self.attrs.items())
-    def keys(self):
+
+    def keys(self) -> Iterable[str]:
         return list(self.attrs.keys())
-    def __len__(self):
+
+    def __len__(self) -> int:
         return len(self.attrs)
-    def __getitem__(self, name):
+
+    def __getitem__(self, name: str) -> _AttributeValue:
         return self.attrs[name]
-    def __contains__(self, name):
+
+    def __contains__(self, name: str) -> bool:
         return name in list(self.attrs.keys())
 
 
-class Element(treebuilder_base.Node):
-    def __init__(self, element, soup, namespace):
-        treebuilder_base.Node.__init__(self, element.name)
-        self.element = element
+class BeautifulSoupNode(treebuilder_base.Node):
+    # A node can correspond to _either_ a Tag _or_ a NavigableString.
+    tag: Optional[Tag]
+    string: Optional[NavigableString]
+    soup: "BeautifulSoup"
+    namespace: Optional[_NamespaceURL]
+
+    @property
+    def element(self) -> PageElement:
+        assert self.tag is not None or self.string is not None
+        if self.tag is not None:
+            return self.tag
+        else:
+            assert self.string is not None
+            return self.string
+
+    @property
+    def nodeType(self) -> int:
+        """Return the html5lib constant corresponding to the type of
+        the underlying DOM object.
+
+        NOTE: This property is only accessed by the html5lib test
+        suite, not by Beautiful Soup proper.
+        """
+        raise NotImplementedError()
+
+    # TODO-TYPING: typeshed stubs are incorrect about this;
+    # cloneNode returns a new Node, not None.
+    def cloneNode(self) -> treebuilder_base.Node: # type:ignore
+        raise NotImplementedError()
+
+
+class Element(BeautifulSoupNode):
+    namespace: Optional[_NamespaceURL]
+
+    def __init__(
+        self, element: Tag, soup: "BeautifulSoup", namespace: Optional[_NamespaceURL]
+    ):
+        self.tag = element
+        self.string = None
         self.soup = soup
         self.namespace = namespace
+        treebuilder_base.Node.__init__(self, element.name)
 
-    def appendChild(self, node):
-        string_child = child = None
-        if isinstance(node, str):
-            # Some other piece of code decided to pass in a string
-            # instead of creating a TextElement object to contain the
-            # string.
-            string_child = child = node
-        elif isinstance(node, Tag):
-            # Some other piece of code decided to pass in a Tag
-            # instead of creating an Element object to contain the
-            # Tag.
-            child = node
-        elif node.element.__class__ == NavigableString:
-            string_child = child = node.element
-            node.parent = self
+    def appendChild(self, node: "BeautifulSoupNode") -> None:
+        string_child: Optional[NavigableString] = None
+        child: PageElement
+        if type(node.string) is NavigableString:
+            # We check for NavigableString *only* because we want to avoid
+            # joining PreformattedStrings, such as Comments, with nearby strings.
+            string_child = child = node.string
         else:
             child = node.element
-            node.parent = self
+        node.parent = self
 
-        if not isinstance(child, str) and child.parent is not None:
+        if (
+            child is not None
+            and child.parent is not None
+            and not isinstance(child, str)
+        ):
             node.element.extract()
 
-        if (string_child is not None and self.element.contents
-            and self.element.contents[-1].__class__ == NavigableString):
+        if (
+            string_child is not None
+            and self.tag is not None and self.tag.contents
+            and type(self.tag.contents[-1]) is NavigableString
+        ):
             # We are appending a string onto another string.
             # TODO This has O(n^2) performance, for input like
             # "a</a>a</a>a</a>..."
-            old_element = self.element.contents[-1]
+            old_element = self.tag.contents[-1]
             new_element = self.soup.new_string(old_element + string_child)
             old_element.replace_with(new_element)
             self.soup._most_recent_element = new_element
@@ -323,8 +402,8 @@ def appendChild(self, node):
             # Tell Beautiful Soup to act as if it parsed this element
             # immediately after the parent's last descendant. (Or
             # immediately after the parent, if it has no children.)
-            if self.element.contents:
-                most_recent_element = self.element._last_descendant(False)
+            if self.tag is not None and self.tag.contents:
+                most_recent_element = self.tag._last_descendant(False)
             elif self.element.next_element is not None:
                 # Something from further ahead in the parse tree is
                 # being inserted into this earlier element. This is
@@ -335,66 +414,96 @@ def appendChild(self, node):
                 most_recent_element = self.element
 
             self.soup.object_was_parsed(
-                child, parent=self.element,
-                most_recent_element=most_recent_element)
+                child, parent=self.tag, most_recent_element=most_recent_element
+            )
 
-    def getAttributes(self):
-        if isinstance(self.element, Comment):
-            return {}
-        return AttrList(self.element)
+    def getAttributes(self) -> AttrList:
+        assert self.tag is not None
+        return AttrList(self.tag)
 
-    def setAttributes(self, attributes):
+    # An HTML5lib attribute name may either be a single string,
+    # or a tuple (namespace, name).
+    _Html5libAttributeName: TypeAlias = Union[str, Tuple[str, str]]
+    # Now we can define the type this method accepts as a dictionary
+    # mapping those attribute names to single string values.
+    _Html5libAttributes: TypeAlias = Dict[_Html5libAttributeName, str]
+
+    def setAttributes(self, attributes: Optional[_Html5libAttributes]) -> None:
+        assert self.tag is not None
         if attributes is not None and len(attributes) > 0:
-            converted_attributes = []
+            # Replace any namespaced attributes with
+            # NamespacedAttribute objects.
             for name, value in list(attributes.items()):
                 if isinstance(name, tuple):
                     new_name = NamespacedAttribute(*name)
                     del attributes[name]
                     attributes[new_name] = value
 
+            # We can now cast attributes to the type of Dict
+            # used by Beautiful Soup.
+            normalized_attributes = cast(_AttributeValues, attributes)
+
+            # Values for tags like 'class' came in as single strings;
+            # replace them with lists of strings as appropriate.
             self.soup.builder._replace_cdata_list_attribute_values(
-                self.name, attributes)
-            for name, value in list(attributes.items()):
-                self.element[name] = value
+                self.name, normalized_attributes
+            )
+
+            # Then set the attributes on the Tag associated with this
+            # BeautifulSoupNode.
+            for name, value_or_values in list(normalized_attributes.items()):
+                self.tag[name] = value_or_values
 
             # The attributes may contain variables that need substitution.
             # Call set_up_substitutions manually.
             #
             # The Tag constructor called this method when the Tag was created,
             # but we just set/changed the attributes, so call it again.
-            self.soup.builder.set_up_substitutions(self.element)
+            self.soup.builder.set_up_substitutions(self.tag)
+
     attributes = property(getAttributes, setAttributes)
 
-    def insertText(self, data, insertBefore=None):
+    def insertText(
+        self, data: str, insertBefore: Optional["BeautifulSoupNode"] = None
+    ) -> None:
         text = TextNode(self.soup.new_string(data), self.soup)
         if insertBefore:
             self.insertBefore(text, insertBefore)
         else:
             self.appendChild(text)
 
-    def insertBefore(self, node, refNode):
-        index = self.element.index(refNode.element)
-        if (node.element.__class__ == NavigableString and self.element.contents
-            and self.element.contents[index-1].__class__ == NavigableString):
+    def insertBefore(
+        self, node: "BeautifulSoupNode", refNode: "BeautifulSoupNode"
+    ) -> None:
+        assert self.tag is not None
+        index = self.tag.index(refNode.element)
+        if (
+            type(node.element) is NavigableString
+            and self.tag.contents
+            and type(self.tag.contents[index - 1]) is NavigableString
+        ):
             # (See comments in appendChild)
-            old_node = self.element.contents[index-1]
+            old_node = self.tag.contents[index - 1]
+            assert type(old_node) is NavigableString
             new_str = self.soup.new_string(old_node + node.element)
             old_node.replace_with(new_str)
         else:
-            self.element.insert(index, node.element)
+            self.tag.insert(index, node.element)
             node.parent = self
 
-    def removeChild(self, node):
+    def removeChild(self, node: "Element") -> None:
         node.element.extract()
 
-    def reparentChildren(self, new_parent):
+    def reparentChildren(self, newParent: "Element") -> None:
         """Move all of this tag's children into another tag."""
         # print("MOVE", self.element.contents)
         # print("FROM", self.element)
         # print("TO", new_parent.element)
 
-        element = self.element
-        new_parent_element = new_parent.element
+        element = self.tag
+        assert element is not None
+        new_parent_element = newParent.tag
+        assert new_parent_element is not None
         # Determine what this tag's next_element will be once all the children
         # are removed.
         final_next_element = element.next_sibling
@@ -403,8 +512,14 @@ def reparentChildren(self, new_parent):
         if len(new_parent_element.contents) > 0:
             # The new parent already contains children. We will be
             # appending this tag's children to the end.
+
+            # We can make this assertion since we know new_parent has
+            # children.
+            assert new_parents_last_descendant is not None
             new_parents_last_child = new_parent_element.contents[-1]
-            new_parents_last_descendant_next_element = new_parents_last_descendant.next_element
+            new_parents_last_descendant_next_element = (
+                new_parents_last_descendant.next_element
+            )
         else:
             # The new parent contains no children.
             new_parents_last_child = None
@@ -431,14 +546,24 @@ def reparentChildren(self, new_parent):
             # parent's last descendant. It has no .next_sibling and
             # its .next_element is whatever the previous last
             # descendant had.
-            last_childs_last_descendant = to_append[-1]._last_descendant(False, True)
+            last_childs_last_descendant = to_append[-1]._last_descendant(
+                is_initialized=False, accept_self=True
+            )
 
-            last_childs_last_descendant.next_element = new_parents_last_descendant_next_element
+            # Since we passed accept_self=True into _last_descendant,
+            # there's no possibility that the result is None.
+            assert last_childs_last_descendant is not None
+            last_childs_last_descendant.next_element = (
+                new_parents_last_descendant_next_element
+            )
             if new_parents_last_descendant_next_element is not None:
-                # TODO: This code has no test coverage and I'm not sure
-                # how to get html5lib to go through this path, but it's
-                # just the other side of the previous line.
-                new_parents_last_descendant_next_element.previous_element = last_childs_last_descendant
+                # TODO-COVERAGE: This code has no test coverage and
+                # I'm not sure how to get html5lib to go through this
+                # path, but it's just the other side of the previous
+                # line.
+                new_parents_last_descendant_next_element.previous_element = (
+                    last_childs_last_descendant
+                )
             last_childs_last_descendant.next_sibling = None
 
         for child in to_append:
@@ -453,29 +578,34 @@ def reparentChildren(self, new_parent):
         # print("FROM", self.element)
         # print("TO", new_parent_element)
 
-    def cloneNode(self):
-        tag = self.soup.new_tag(self.element.name, self.namespace)
+    # TODO-TYPING: typeshed stubs are incorrect about this;
+    # hasContent returns a boolean, not None.
+    def hasContent(self) -> bool: # type:ignore
+        return self.tag is None or len(self.tag.contents) > 0
+
+    # TODO-TYPING: typeshed stubs are incorrect about this;
+    # cloneNode returns a new Node, not None.
+    def cloneNode(self) -> treebuilder_base.Node: # type:ignore
+        assert self.tag is not None
+        tag = self.soup.new_tag(self.tag.name, self.namespace)
         node = Element(tag, self.soup, self.namespace)
-        for key,value in self.attributes:
+        for key, value in self.attributes:
             node.attributes[key] = value
         return node
 
-    def hasContent(self):
-        return self.element.contents
-
-    def getNameTuple(self):
-        if self.namespace == None:
+    def getNameTuple(self) -> Tuple[Optional[_NamespaceURL], str]:
+        if self.namespace is None:
             return namespaces["html"], self.name
         else:
             return self.namespace, self.name
 
     nameTuple = property(getNameTuple)
 
-class TextNode(Element):
-    def __init__(self, element, soup):
+
+class TextNode(BeautifulSoupNode):
+
+    def __init__(self, element: NavigableString, soup: "BeautifulSoup"):
         treebuilder_base.Node.__init__(self, None)
-        self.element = element
+        self.tag = None
+        self.string = element
         self.soup = soup
-
-    def cloneNode(self):
-        raise NotImplementedError
diff --git a/libs/bs4/builder/_htmlparser.py b/libs/bs4/builder/_htmlparser.py
index 3cc187f892..165a3d89cf 100644
--- a/libs/bs4/builder/_htmlparser.py
+++ b/libs/bs4/builder/_htmlparser.py
@@ -1,50 +1,75 @@
 # encoding: utf-8
 """Use the HTMLParser library to parse HTML files that aren't too bad."""
+from __future__ import annotations
 
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 __all__ = [
-    'HTMLParserTreeBuilder',
-    ]
+    "HTMLParserTreeBuilder",
+]
 
 from html.parser import HTMLParser
 
-import sys
-import warnings
+from typing import (
+    Any,
+    Callable,
+    cast,
+    Dict,
+    Iterable,
+    List,
+    Optional,
+    TYPE_CHECKING,
+    Tuple,
+    Type,
+    Union,
+)
 
 from bs4.element import (
+    AttributeDict,
     CData,
     Comment,
     Declaration,
     Doctype,
     ProcessingInstruction,
-    )
+)
 from bs4.dammit import EntitySubstitution, UnicodeDammit
 
 from bs4.builder import (
     DetectsXMLParsedAsHTML,
-    ParserRejectedMarkup,
     HTML,
     HTMLTreeBuilder,
     STRICT,
+)
+
+from bs4.exceptions import ParserRejectedMarkup
+
+if TYPE_CHECKING:
+    from bs4 import BeautifulSoup
+    from bs4.element import NavigableString
+    from bs4._typing import (
+        _Encoding,
+        _Encodings,
+        _RawMarkup,
     )
 
+HTMLPARSER = "html.parser"
+
+_DuplicateAttributeHandler = Callable[[Dict[str, str], str, str], None]
 
-HTMLPARSER = 'html.parser'
 
 class BeautifulSoupHTMLParser(HTMLParser, DetectsXMLParsedAsHTML):
+    #: Constant to handle duplicate attributes by ignoring later values
+    #: and keeping the earlier ones.
+    REPLACE: str = "replace"
+
+    #: Constant to handle duplicate attributes by replacing earlier values
+    #: with later ones.
+    IGNORE: str = "ignore"
+
     """A subclass of the Python standard library's HTMLParser class, which
     listens for HTMLParser events and translates them into calls
     to Beautiful Soup's tree construction API.
-    """
-
-    # Strategies for handling duplicate attributes
-    IGNORE = 'ignore'
-    REPLACE = 'replace'
-    
-    def __init__(self, *args, **kwargs):
-        """Constructor.
 
         :param on_duplicate_attribute: A strategy for what to do if a
             tag includes the same attribute more than once. Accepted
@@ -53,11 +78,19 @@ def __init__(self, *args, **kwargs):
             encountered), or a callable. A callable must take three
             arguments: the dictionary of attributes already processed,
             the name of the duplicate attribute, and the most recent value
-            encountered.           
-        """
-        self.on_duplicate_attribute = kwargs.pop(
-            'on_duplicate_attribute', self.REPLACE
-        )
+            encountered.
+    """
+
+    def __init__(
+        self,
+        soup: BeautifulSoup,
+        *args: Any,
+        on_duplicate_attribute: Union[str, _DuplicateAttributeHandler] = REPLACE,
+        **kwargs: Any,
+    ):
+        self.soup = soup
+        self.on_duplicate_attribute = on_duplicate_attribute
+        self.attribute_dict_class = soup.builder.attribute_dict_class
         HTMLParser.__init__(self, *args, **kwargs)
 
         # Keep a list of empty-element tags that were encountered
@@ -71,7 +104,11 @@ def __init__(self, *args, **kwargs):
 
         self._initialize_xml_detector()
 
-    def error(self, message):
+    on_duplicate_attribute: Union[str, _DuplicateAttributeHandler]
+    already_closed_empty_element: List[str]
+    soup: BeautifulSoup
+
+    def error(self, message: str) -> None:
         # NOTE: This method is required so long as Python 3.9 is
         # supported. The corresponding code is removed from HTMLParser
         # in 3.5, but not removed from ParserBase until 3.10.
@@ -87,37 +124,40 @@ def error(self, message):
         # catch this error and wrap it in a ParserRejectedMarkup.)
         raise ParserRejectedMarkup(message)
 
-    def handle_startendtag(self, name, attrs):
+    def handle_startendtag(
+        self, tag: str, attrs: List[Tuple[str, Optional[str]]]
+    ) -> None:
         """Handle an incoming empty-element tag.
 
-        This is only called when the markup looks like <tag/>.
-
-        :param name: Name of the tag.
-        :param attrs: Dictionary of the tag's attributes.
+        html.parser only calls this method when the markup looks like
+        <tag/>.
         """
-        # is_startend() tells handle_starttag not to close the tag
+        # `handle_empty_element` tells handle_starttag not to close the tag
         # just because its name matches a known empty-element tag. We
-        # know that this is an empty-element tag and we want to call
+        # know that this is an empty-element tag, and we want to call
         # handle_endtag ourselves.
-        tag = self.handle_starttag(name, attrs, handle_empty_element=False)
-        self.handle_endtag(name)
-        
-    def handle_starttag(self, name, attrs, handle_empty_element=True):
+        self.handle_starttag(tag, attrs, handle_empty_element=False)
+        self.handle_endtag(tag)
+
+    def handle_starttag(
+        self,
+        tag: str,
+        attrs: List[Tuple[str, Optional[str]]],
+        handle_empty_element: bool = True,
+    ) -> None:
         """Handle an opening tag, e.g. '<tag>'
 
-        :param name: Name of the tag.
-        :param attrs: Dictionary of the tag's attributes.
         :param handle_empty_element: True if this tag is known to be
             an empty-element tag (i.e. there is not expected to be any
             closing tag).
         """
-        # XXX namespace
-        attr_dict = {}
+        # TODO: handle namespaces here?
+        attr_dict: AttributeDict = self.attribute_dict_class()
         for key, value in attrs:
             # Change None attribute values to the empty string
             # for consistency with the other tree builders.
             if value is None:
-                value = ''
+                value = ""
             if key in attr_dict:
                 # A single attribute shows up multiple times in this
                 # tag. How to handle it depends on the
@@ -128,17 +168,21 @@ def handle_starttag(self, name, attrs, handle_empty_element=True):
                 elif on_dupe in (None, self.REPLACE):
                     attr_dict[key] = value
                 else:
+                    on_dupe = cast(_DuplicateAttributeHandler, on_dupe)
                     on_dupe(attr_dict, key, value)
             else:
                 attr_dict[key] = value
-            attrvalue = '""'
-        #print("START", name)
-        sourceline, sourcepos = self.getpos()
-        tag = self.soup.handle_starttag(
-            name, None, None, attr_dict, sourceline=sourceline,
-            sourcepos=sourcepos
+        # print("START", tag)
+        sourceline: Optional[int]
+        sourcepos: Optional[int]
+        if self.soup.builder.store_line_numbers:
+            sourceline, sourcepos = self.getpos()
+        else:
+            sourceline = sourcepos = None
+        tagObj = self.soup.handle_starttag(
+            tag, None, None, attr_dict, sourceline=sourceline, sourcepos=sourcepos
         )
-        if tag and tag.is_empty_element and handle_empty_element:
+        if tagObj is not None and tagObj.is_empty_element and handle_empty_element:
             # Unlike other parsers, html.parser doesn't send separate end tag
             # events for empty-element tags. (It's handled in
             # handle_startendtag, but only if the original markup looked like
@@ -148,38 +192,38 @@ def handle_starttag(self, name, attrs, handle_empty_element=True):
             # know the start event is identical to the end event, we
             # don't want handle_endtag() to cross off any previous end
             # events for tags of this name.
-            self.handle_endtag(name, check_already_closed=False)
+            self.handle_endtag(tag, check_already_closed=False)
 
             # But we might encounter an explicit closing tag for this tag
             # later on. If so, we want to ignore it.
-            self.already_closed_empty_element.append(name)
+            self.already_closed_empty_element.append(tag)
 
-        if self._root_tag is None:
-            self._root_tag_encountered(name)
-            
-    def handle_endtag(self, name, check_already_closed=True):
+        if self._root_tag_name is None:
+            self._root_tag_encountered(tag)
+
+    def handle_endtag(self, tag: str, check_already_closed: bool = True) -> None:
         """Handle a closing tag, e.g. '</tag>'
-        
-        :param name: A tag name.
+
+        :param tag: A tag name.
         :param check_already_closed: True if this tag is expected to
            be the closing portion of an empty-element tag,
            e.g. '<tag></tag>'.
         """
-        #print("END", name)
-        if check_already_closed and name in self.already_closed_empty_element:
+        # print("END", tag)
+        if check_already_closed and tag in self.already_closed_empty_element:
             # This is a redundant end tag for an empty-element tag.
             # We've already called handle_endtag() for it, so just
             # check it off the list.
-            #print("ALREADY CLOSED", name)
-            self.already_closed_empty_element.remove(name)
+            # print("ALREADY CLOSED", tag)
+            self.already_closed_empty_element.remove(tag)
         else:
-            self.soup.handle_endtag(name)
-            
-    def handle_data(self, data):
+            self.soup.handle_endtag(tag)
+
+    def handle_data(self, data: str) -> None:
         """Handle some textual data that shows up between tags."""
         self.soup.handle_data(data)
 
-    def handle_charref(self, name):
+    def handle_charref(self, name: str) -> None:
         """Handle a numeric character reference by converting it to the
         corresponding Unicode character and treating it as textual
         data.
@@ -190,36 +234,20 @@ def handle_charref(self, name):
         # HTMLParser. (http://bugs.python.org/issue13633) The bug has
         # been fixed, but removing this code still makes some
         # Beautiful Soup tests fail. This needs investigation.
-        if name.startswith('x'):
-            real_name = int(name.lstrip('x'), 16)
-        elif name.startswith('X'):
-            real_name = int(name.lstrip('X'), 16)
+        real_name:int
+        if name.startswith("x"):
+            real_name = int(name.lstrip("x"), 16)
+        elif name.startswith("X"):
+            real_name = int(name.lstrip("X"), 16)
         else:
             real_name = int(name)
 
-        data = None
-        if real_name < 256:
-            # HTML numeric entities are supposed to reference Unicode
-            # code points, but sometimes they reference code points in
-            # some other encoding (ahem, Windows-1252). E.g. &#147;
-            # instead of &#201; for LEFT DOUBLE QUOTATION MARK. This
-            # code tries to detect this situation and compensate.
-            for encoding in (self.soup.original_encoding, 'windows-1252'):
-                if not encoding:
-                    continue
-                try:
-                    data = bytearray([real_name]).decode(encoding)
-                except UnicodeDecodeError as e:
-                    pass
-        if not data:
-            try:
-                data = chr(real_name)
-            except (ValueError, OverflowError) as e:
-                pass
-        data = data or "\N{REPLACEMENT CHARACTER}"
+        data, replacement_added = UnicodeDammit.numeric_character_reference(real_name)
+        if replacement_added:
+            self.soup.contains_replacement_characters = True
         self.handle_data(data)
 
-    def handle_entityref(self, name):
+    def handle_entityref(self, name: str) -> None:
         """Handle a named entity reference by converting it to the
         corresponding Unicode character(s) and treating it as textual
         data.
@@ -238,7 +266,7 @@ def handle_entityref(self, name):
             data = "&%s" % name
         self.handle_data(data)
 
-    def handle_comment(self, data):
+    def handle_comment(self, data: str) -> None:
         """Handle an HTML comment.
 
         :param data: The text of the comment.
@@ -247,31 +275,32 @@ def handle_comment(self, data):
         self.soup.handle_data(data)
         self.soup.endData(Comment)
 
-    def handle_decl(self, data):
+    def handle_decl(self, decl: str) -> None:
         """Handle a DOCTYPE declaration.
 
         :param data: The text of the declaration.
         """
         self.soup.endData()
-        data = data[len("DOCTYPE "):]
-        self.soup.handle_data(data)
+        decl = decl[len("DOCTYPE ") :]
+        self.soup.handle_data(decl)
         self.soup.endData(Doctype)
 
-    def unknown_decl(self, data):
+    def unknown_decl(self, data: str) -> None:
         """Handle a declaration of unknown type -- probably a CDATA block.
 
         :param data: The text of the declaration.
         """
-        if data.upper().startswith('CDATA['):
+        cls: Type[NavigableString]
+        if data.upper().startswith("CDATA["):
             cls = CData
-            data = data[len('CDATA['):]
+            data = data[len("CDATA[") :]
         else:
             cls = Declaration
         self.soup.endData()
         self.soup.handle_data(data)
         self.soup.endData(cls)
 
-    def handle_pi(self, data):
+    def handle_pi(self, data: str) -> None:
         """Handle a processing instruction.
 
         :param data: The text of the instruction.
@@ -283,25 +312,34 @@ def handle_pi(self, data):
 
 
 class HTMLParserTreeBuilder(HTMLTreeBuilder):
-    """A Beautiful soup `TreeBuilder` that uses the `HTMLParser` parser,
-    found in the Python standard library.
-    """
-    is_xml = False
-    picklable = True
-    NAME = HTMLPARSER
-    features = [NAME, HTML, STRICT]
+    """A Beautiful soup `bs4.builder.TreeBuilder` that uses the
+    :py:class:`html.parser.HTMLParser` parser, found in the Python
+    standard library.
 
-    # The html.parser knows which line number and position in the
-    # original file is the source of an element.
-    TRACKS_LINE_NUMBERS = True
+    """
 
-    def __init__(self, parser_args=None, parser_kwargs=None, **kwargs):
+    is_xml: bool = False
+    picklable: bool = True
+    NAME: str = HTMLPARSER
+    features: Iterable[str] = [NAME, HTML, STRICT]
+    parser_args: Tuple[Iterable[Any], Dict[str, Any]]
+
+    #: The html.parser knows which line number and position in the
+    #: original file is the source of an element.
+    TRACKS_LINE_NUMBERS: bool = True
+
+    def __init__(
+        self,
+        parser_args: Optional[Iterable[Any]] = None,
+        parser_kwargs: Optional[Dict[str, Any]] = None,
+        **kwargs: Any,
+    ):
         """Constructor.
 
-        :param parser_args: Positional arguments to pass into 
+        :param parser_args: Positional arguments to pass into
             the BeautifulSoupHTMLParser constructor, once it's
             invoked.
-        :param parser_kwargs: Keyword arguments to pass into 
+        :param parser_kwargs: Keyword arguments to pass into
             the BeautifulSoupHTMLParser constructor, once it's
             invoked.
         :param kwargs: Keyword arguments for the superclass constructor.
@@ -309,7 +347,7 @@ def __init__(self, parser_args=None, parser_kwargs=None, **kwargs):
         # Some keyword arguments will be pulled out of kwargs and placed
         # into parser_kwargs.
         extra_parser_kwargs = dict()
-        for arg in ('on_duplicate_attribute',):
+        for arg in ("on_duplicate_attribute",):
             if arg in kwargs:
                 value = kwargs.pop(arg)
                 extra_parser_kwargs[arg] = value
@@ -317,12 +355,16 @@ def __init__(self, parser_args=None, parser_kwargs=None, **kwargs):
         parser_args = parser_args or []
         parser_kwargs = parser_kwargs or {}
         parser_kwargs.update(extra_parser_kwargs)
-        parser_kwargs['convert_charrefs'] = False
+        parser_kwargs["convert_charrefs"] = False
         self.parser_args = (parser_args, parser_kwargs)
-        
-    def prepare_markup(self, markup, user_specified_encoding=None,
-                       document_declared_encoding=None, exclude_encodings=None):
 
+    def prepare_markup(
+        self,
+        markup: _RawMarkup,
+        user_specified_encoding: Optional[_Encoding] = None,
+        document_declared_encoding: Optional[_Encoding] = None,
+        exclude_encodings: Optional[_Encodings] = None,
+    ) -> Iterable[Tuple[str, Optional[_Encoding], Optional[_Encoding], bool]]:
         """Run any preliminary steps necessary to make incoming markup
         acceptable to the parser.
 
@@ -333,13 +375,13 @@ def prepare_markup(self, markup, user_specified_encoding=None,
         :param exclude_encodings: The user asked _not_ to try any of
             these encodings.
 
-        :yield: A series of 4-tuples:
-         (markup, encoding, declared encoding,
-          has undergone character replacement)
+        :yield: A series of 4-tuples: (markup, encoding, declared encoding,
+             has undergone character replacement)
 
-         Each 4-tuple represents a strategy for converting the
-         document to Unicode and parsing it. Each strategy will be tried 
-         in turn.
+            Each 4-tuple represents a strategy for parsing the document.
+            This TreeBuilder uses Unicode, Dammit to convert the markup
+            into Unicode, so the ``markup`` element of the tuple will
+            always be a string.
         """
         if isinstance(markup, str):
             # Parse Unicode as-is.
@@ -348,34 +390,67 @@ def prepare_markup(self, markup, user_specified_encoding=None,
 
         # Ask UnicodeDammit to sniff the most likely encoding.
 
-        # This was provided by the end-user; treat it as a known
-        # definite encoding per the algorithm laid out in the HTML5
-        # spec.  (See the EncodingDetector class for details.)
-        known_definite_encodings = [user_specified_encoding]
+        known_definite_encodings: List[_Encoding] = []
+        if user_specified_encoding:
+            # This was provided by the end-user; treat it as a known
+            # definite encoding per the algorithm laid out in the
+            # HTML5 spec. (See the EncodingDetector class for
+            # details.)
+            known_definite_encodings.append(user_specified_encoding)
 
-        # This was found in the document; treat it as a slightly lower-priority
-        # user encoding.
-        user_encodings = [document_declared_encoding]
+        user_encodings: List[_Encoding] = []
+        if document_declared_encoding:
+            # This was found in the document; treat it as a slightly
+            # lower-priority user encoding.
+            user_encodings.append(document_declared_encoding)
 
-        try_encodings = [user_specified_encoding, document_declared_encoding]
         dammit = UnicodeDammit(
             markup,
             known_definite_encodings=known_definite_encodings,
             user_encodings=user_encodings,
             is_html=True,
-            exclude_encodings=exclude_encodings
+            exclude_encodings=exclude_encodings,
         )
-        yield (dammit.markup, dammit.original_encoding,
-               dammit.declared_html_encoding,
-               dammit.contains_replacement_characters)
 
-    def feed(self, markup):
-        """Run some incoming markup through some parsing process,
-        populating the `BeautifulSoup` object in self.soup.
+        if dammit.unicode_markup is None:
+            # In every case I've seen, Unicode, Dammit is able to
+            # convert the markup into Unicode, even if it needs to use
+            # REPLACEMENT CHARACTER. But there is a code path that
+            # could result in unicode_markup being None, and
+            # HTMLParser can only parse Unicode, so here we handle
+            # that code path.
+            raise ParserRejectedMarkup(
+                "Could not convert input to Unicode, and html.parser will not accept bytestrings."
+            )
+        else:
+            yield (
+                dammit.unicode_markup,
+                dammit.original_encoding,
+                dammit.declared_html_encoding,
+                dammit.contains_replacement_characters,
+            )
+
+    def feed(self, markup: _RawMarkup, _parser_class:type[BeautifulSoupHTMLParser] =BeautifulSoupHTMLParser) -> None:
+        """
+        :param markup: The markup to feed into the parser.
+        :param _parser_class: An HTMLParser subclass to use. This is only intended for use in unit tests.
         """
         args, kwargs = self.parser_args
-        parser = BeautifulSoupHTMLParser(*args, **kwargs)
-        parser.soup = self.soup
+
+        # HTMLParser.feed will only handle str, but
+        # BeautifulSoup.markup is allowed to be _RawMarkup, because
+        # it's set by the yield value of
+        # TreeBuilder.prepare_markup. Fortunately,
+        # HTMLParserTreeBuilder.prepare_markup always yields a str
+        # (UnicodeDammit.unicode_markup).
+        assert isinstance(markup, str)
+
+        # We know BeautifulSoup calls TreeBuilder.initialize_soup
+        # before calling feed(), so we can assume self.soup
+        # is set.
+        assert self.soup is not None
+        parser = _parser_class(self.soup, *args, **kwargs)
+
         try:
             parser.feed(markup)
             parser.close()
diff --git a/libs/bs4/builder/_lxml.py b/libs/bs4/builder/_lxml.py
index 4f7cf74681..264d861478 100644
--- a/libs/bs4/builder/_lxml.py
+++ b/libs/bs4/builder/_lxml.py
@@ -1,20 +1,37 @@
+# encoding: utf-8
+from __future__ import annotations
+
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 __all__ = [
-    'LXMLTreeBuilderForXML',
-    'LXMLTreeBuilder',
-    ]
-
-try:
-    from collections.abc import Callable # Python 3.6
-except ImportError as e:
-    from collections import Callable
+    "LXMLTreeBuilderForXML",
+    "LXMLTreeBuilder",
+]
+
+
+from typing import (
+    Any,
+    Dict,
+    Iterable,
+    List,
+    Optional,
+    Set,
+    Tuple,
+    Type,
+    TYPE_CHECKING,
+    Union,
+)
 
 from io import BytesIO
 from io import StringIO
-from lxml import etree
+
+from typing_extensions import TypeAlias
+
+from lxml import etree # type:ignore
 from bs4.element import (
+    AttributeDict,
+    XMLAttributeDict,
     Comment,
     Doctype,
     NamespacedAttribute,
@@ -27,36 +44,69 @@
     HTML,
     HTMLTreeBuilder,
     PERMISSIVE,
-    ParserRejectedMarkup,
     TreeBuilder,
-    XML)
+    XML,
+)
 from bs4.dammit import EncodingDetector
+from bs4.exceptions import ParserRejectedMarkup
+
+if TYPE_CHECKING:
+    from bs4._typing import (
+        _Encoding,
+        _Encodings,
+        _NamespacePrefix,
+        _NamespaceURL,
+        _NamespaceMapping,
+        _InvertedNamespaceMapping,
+        _RawMarkup,
+    )
+    from bs4 import BeautifulSoup
+
+LXML: str = "lxml"
 
-LXML = 'lxml'
 
-def _invert(d):
+def _invert(d: dict[Any, Any]) -> dict[Any, Any]:
     "Invert a dictionary."
-    return dict((v,k) for k, v in list(d.items()))
+    return dict((v, k) for k, v in list(d.items()))
+
+
+_LXMLParser: TypeAlias = Union[etree.XMLParser, etree.HTMLParser]
+_ParserOrParserClass: TypeAlias = Union[
+    _LXMLParser, Type[etree.XMLParser], Type[etree.HTMLParser]
+]
+
 
 class LXMLTreeBuilderForXML(TreeBuilder):
-    DEFAULT_PARSER_CLASS = etree.XMLParser
+    DEFAULT_PARSER_CLASS: Type[etree.XMLParser] = etree.XMLParser
+
+    is_xml: bool = True
+
+    #: Set this to true (probably by passing huge_tree=True into the :
+    #: BeautifulSoup constructor) to enable the lxml feature "disable security
+    #: restrictions and support very deep trees and very long text
+    #: content".
+    huge_tree: bool
 
-    is_xml = True
-    processing_instruction_class = XMLProcessingInstruction
+    processing_instruction_class: Type[ProcessingInstruction]
 
-    NAME = "lxml-xml"
-    ALTERNATE_NAMES = ["xml"]
+    NAME: str = "lxml-xml"
+    ALTERNATE_NAMES: Iterable[str] = ["xml"]
 
     # Well, it's permissive by XML parser standards.
-    features = [NAME, LXML, XML, FAST, PERMISSIVE]
+    features: Iterable[str] = [NAME, LXML, XML, FAST, PERMISSIVE]
 
-    CHUNK_SIZE = 512
+    CHUNK_SIZE: int = 512
 
     # This namespace mapping is specified in the XML Namespace
     # standard.
-    DEFAULT_NSMAPS = dict(xml='http://www.w3.org/XML/1998/namespace')
+    DEFAULT_NSMAPS: _NamespaceMapping = dict(xml="http://www.w3.org/XML/1998/namespace")
 
-    DEFAULT_NSMAPS_INVERTED = _invert(DEFAULT_NSMAPS)
+    DEFAULT_NSMAPS_INVERTED: _InvertedNamespaceMapping = _invert(DEFAULT_NSMAPS)
+
+    nsmaps: List[Optional[_InvertedNamespaceMapping]]
+    empty_element_tags: Optional[Set[str]]
+    parser: Any
+    _default_parser: Optional[etree.XMLParser]
 
     # NOTE: If we parsed Element objects and looked at .sourceline,
     # we'd be able to see the line numbers from the original document.
@@ -64,17 +114,19 @@ class LXMLTreeBuilderForXML(TreeBuilder):
     # as the target of parse messages, and those messages don't include
     # line numbers.
     # See: https://bugs.launchpad.net/lxml/+bug/1846906
-    
-    def initialize_soup(self, soup):
+
+    def initialize_soup(self, soup: BeautifulSoup) -> None:
         """Let the BeautifulSoup object know about the standard namespace
         mapping.
 
         :param soup: A `BeautifulSoup`.
         """
+        # Beyond this point, self.soup is set, so we can assume (and
+        # assert) it's not None whenever necessary.
         super(LXMLTreeBuilderForXML, self).initialize_soup(soup)
         self._register_namespaces(self.DEFAULT_NSMAPS)
 
-    def _register_namespaces(self, mapping):
+    def _register_namespaces(self, mapping: Dict[str, str]) -> None:
         """Let the BeautifulSoup object know about namespaces encountered
         while parsing the document.
 
@@ -87,6 +139,7 @@ def _register_namespaces(self, mapping):
 
         :param mapping: A dictionary mapping namespace prefixes to URIs.
         """
+        assert self.soup is not None
         for key, value in list(mapping.items()):
             # This is 'if key' and not 'if key is not None' because we
             # don't track un-prefixed namespaces. Soupselect will
@@ -97,20 +150,18 @@ def _register_namespaces(self, mapping):
                 # If there are multiple namespaces defined with the same
                 # prefix, the first one in the document takes precedence.
                 self.soup._namespaces[key] = value
-                
-    def default_parser(self, encoding):
+
+    def default_parser(self, encoding: Optional[_Encoding]) -> _ParserOrParserClass:
         """Find the default parser for the given encoding.
 
-        :param encoding: A string.
         :return: Either a parser object or a class, which
           will be instantiated with default arguments.
         """
         if self._default_parser is not None:
             return self._default_parser
-        return etree.XMLParser(
-            target=self, strip_cdata=False, recover=True, encoding=encoding)
+        return self.DEFAULT_PARSER_CLASS(target=self, recover=True, huge_tree=self.huge_tree, encoding=encoding)
 
-    def parser_for(self, encoding):
+    def parser_for(self, encoding: Optional[_Encoding]) -> _LXMLParser:
         """Instantiate an appropriate parser for the given encoding.
 
         :param encoding: A string.
@@ -119,36 +170,53 @@ def parser_for(self, encoding):
         # Use the default parser.
         parser = self.default_parser(encoding)
 
-        if isinstance(parser, Callable):
+        if callable(parser):
             # Instantiate the parser with default arguments
-            parser = parser(
-                target=self, strip_cdata=False, recover=True, encoding=encoding
-            )
+            parser = parser(target=self, recover=True, huge_tree=self.huge_tree, encoding=encoding)
         return parser
 
-    def __init__(self, parser=None, empty_element_tags=None, **kwargs):
+    def __init__(
+            self,
+            parser: Optional[etree.XMLParser] = None,
+            empty_element_tags: Optional[Set[str]] = None,
+            huge_tree: bool = False,
+            **kwargs: Any,
+    ):
         # TODO: Issue a warning if parser is present but not a
         # callable, since that means there's no way to create new
         # parsers for different encodings.
         self._default_parser = parser
-        if empty_element_tags is not None:
-            self.empty_element_tags = set(empty_element_tags)
         self.soup = None
         self.nsmaps = [self.DEFAULT_NSMAPS_INVERTED]
         self.active_namespace_prefixes = [dict(self.DEFAULT_NSMAPS)]
+        if self.is_xml:
+            self.processing_instruction_class = XMLProcessingInstruction
+        else:
+            self.processing_instruction_class = ProcessingInstruction
+
+        if "attribute_dict_class" not in kwargs:
+            kwargs["attribute_dict_class"] = XMLAttributeDict
+        self.huge_tree = huge_tree
+
         super(LXMLTreeBuilderForXML, self).__init__(**kwargs)
-        
-    def _getNsTag(self, tag):
+
+    def _getNsTag(self, tag: str) -> Tuple[Optional[str], str]:
         # Split the namespace URL out of a fully-qualified lxml tag
         # name. Copied from lxml's src/lxml/sax.py.
-        if tag[0] == '{':
-            return tuple(tag[1:].split('}', 1))
-        else:
-            return (None, tag)
-
-    def prepare_markup(self, markup, user_specified_encoding=None,
-                       exclude_encodings=None,
-                       document_declared_encoding=None):
+        if tag[0] == "{" and "}" in tag:
+            namespace, name = tag[1:].split("}", 1)
+            return (namespace, name)
+        return (None, tag)
+
+    def prepare_markup(
+        self,
+        markup: _RawMarkup,
+        user_specified_encoding: Optional[_Encoding] = None,
+        document_declared_encoding: Optional[_Encoding] = None,
+        exclude_encodings: Optional[_Encodings] = None,
+    ) -> Iterable[
+        Tuple[Union[str, bytes], Optional[_Encoding], Optional[_Encoding], bool]
+    ]:
         """Run any preliminary steps necessary to make incoming markup
         acceptable to the parser.
 
@@ -166,24 +234,17 @@ def prepare_markup(self, markup, user_specified_encoding=None,
         :param exclude_encodings: The user asked _not_ to try any of
             these encodings.
 
-        :yield: A series of 4-tuples:
-         (markup, encoding, declared encoding,
-          has undergone character replacement)
+        :yield: A series of 4-tuples: (markup, encoding, declared encoding,
+            has undergone character replacement)
 
-         Each 4-tuple represents a strategy for converting the
-         document to Unicode and parsing it. Each strategy will be tried 
-         in turn.
+            Each 4-tuple represents a strategy for converting the
+            document to Unicode and parsing it. Each strategy will be tried
+            in turn.
         """
-        is_html = not self.is_xml
-        if is_html:
-            self.processing_instruction_class = ProcessingInstruction
+        if not self.is_xml:
             # We're in HTML mode, so if we're given XML, that's worth
             # noting.
-            DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(
-                markup, stacklevel=3
-            )
-        else:
-            self.processing_instruction_class = XMLProcessingInstruction
+            DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(markup, stacklevel=3)
 
         if isinstance(markup, str):
             # We were given Unicode. Maybe lxml can parse Unicode on
@@ -192,66 +253,107 @@ def prepare_markup(self, markup, user_specified_encoding=None,
             # TODO: This is a workaround for
             # https://bugs.launchpad.net/lxml/+bug/1948551.
             # We can remove it once the upstream issue is fixed.
-            if len(markup) > 0 and markup[0] == u'\N{BYTE ORDER MARK}':
+            if len(markup) > 0 and markup[0] == "\N{BYTE ORDER MARK}":
                 markup = markup[1:]
             yield markup, None, document_declared_encoding, False
 
         if isinstance(markup, str):
             # No, apparently not. Convert the Unicode to UTF-8 and
             # tell lxml to parse it as UTF-8.
-            yield (markup.encode("utf8"), "utf8",
-                   document_declared_encoding, False)
+            yield (markup.encode("utf8"), "utf8", document_declared_encoding, False)
+
+            # Since the document was Unicode in the first place, there
+            # is no need to try any more strategies; we know this will
+            # work.
+            return
+
+        known_definite_encodings: List[_Encoding] = []
+        if user_specified_encoding:
+            # This was provided by the end-user; treat it as a known
+            # definite encoding per the algorithm laid out in the
+            # HTML5 spec. (See the EncodingDetector class for
+            # details.)
+            known_definite_encodings.append(user_specified_encoding)
+
+        user_encodings: List[_Encoding] = []
+        if document_declared_encoding:
+            # This was found in the document; treat it as a slightly
+            # lower-priority user encoding.
+            user_encodings.append(document_declared_encoding)
 
-        # This was provided by the end-user; treat it as a known
-        # definite encoding per the algorithm laid out in the HTML5
-        # spec.  (See the EncodingDetector class for details.)
-        known_definite_encodings = [user_specified_encoding]
-
-        # This was found in the document; treat it as a slightly lower-priority
-        # user encoding.
-        user_encodings = [document_declared_encoding]
         detector = EncodingDetector(
-            markup, known_definite_encodings=known_definite_encodings,
-            user_encodings=user_encodings, is_html=is_html,
-            exclude_encodings=exclude_encodings
+            markup,
+            known_definite_encodings=known_definite_encodings,
+            user_encodings=user_encodings,
+            is_html=not self.is_xml,
+            exclude_encodings=exclude_encodings,
         )
         for encoding in detector.encodings:
             yield (detector.markup, encoding, document_declared_encoding, False)
 
-    def feed(self, markup):
+    def feed(self, markup: _RawMarkup) -> None:
+        io: Union[BytesIO, StringIO]
         if isinstance(markup, bytes):
-            markup = BytesIO(markup)
+            io = BytesIO(markup)
         elif isinstance(markup, str):
-            markup = StringIO(markup)
+            io = StringIO(markup)
+
+        # initialize_soup is called before feed, so we know this
+        # is not None.
+        assert self.soup is not None
 
         # Call feed() at least once, even if the markup is empty,
         # or the parser won't be initialized.
-        data = markup.read(self.CHUNK_SIZE)
+        data = io.read(self.CHUNK_SIZE)
         try:
             self.parser = self.parser_for(self.soup.original_encoding)
             self.parser.feed(data)
             while len(data) != 0:
                 # Now call feed() on the rest of the data, chunk by chunk.
-                data = markup.read(self.CHUNK_SIZE)
+                data = io.read(self.CHUNK_SIZE)
                 if len(data) != 0:
                     self.parser.feed(data)
             self.parser.close()
         except (UnicodeDecodeError, LookupError, etree.ParserError) as e:
             raise ParserRejectedMarkup(e)
 
-    def close(self):
+    def close(self) -> None:
         self.nsmaps = [self.DEFAULT_NSMAPS_INVERTED]
 
-    def start(self, name, attrs, nsmap={}):
-        # Make sure attrs is a mutable dict--lxml may send an immutable dictproxy.
-        attrs = dict(attrs)
-        nsprefix = None
+    def start(
+        self,
+        tag: str | bytes,
+        attrib: Dict[str | bytes, str | bytes],
+        nsmap: _NamespaceMapping = {},
+    ) -> None:
+        # This is called by lxml code as a result of calling
+        # BeautifulSoup.feed(), and we know self.soup is set by the time feed()
+        # is called.
+        assert self.soup is not None
+        assert isinstance(tag, str)
+
+        # We need to recreate the attribute dict for three
+        # reasons. First, for type checking, so we can assert there
+        # are no bytestrings in the keys or values. Second, because we
+        # need a mutable dict--lxml might send us an immutable
+        # dictproxy. Third, so we can handle namespaced attribute
+        # names by converting the keys to NamespacedAttributes.
+        new_attrib: Dict[Union[str, NamespacedAttribute], str] = (
+            self.attribute_dict_class()
+        )
+        for k, v in attrib.items():
+            assert isinstance(k, str)
+            assert isinstance(v, str)
+            new_attrib[k] = v
+
+        nsprefix: Optional[_NamespacePrefix] = None
+        namespace: Optional[_NamespaceURL] = None
         # Invert each namespace map as it comes in.
         if len(nsmap) == 0 and len(self.nsmaps) > 1:
-                # There are no new namespaces for this tag, but
-                # non-default namespaces are in play, so we need a
-                # separate tag stack to know when they end.
-                self.nsmaps.append(None)
+            # There are no new namespaces for this tag, but
+            # non-default namespaces are in play, so we need a
+            # separate tag stack to know when they end.
+            self.nsmaps.append(None)
         elif len(nsmap) > 0:
             # A new namespace mapping has come into play.
 
@@ -272,40 +374,44 @@ def start(self, name, attrs, nsmap={}):
             # We should not track un-prefixed namespaces as we can only hold one
             # and it will be recognized as the default namespace by soupsieve,
             # which may be confusing in some situations.
-            if '' in current_mapping:
-                del current_mapping['']
+            if "" in current_mapping:
+                del current_mapping[""]
             self.active_namespace_prefixes.append(current_mapping)
-            
+
             # Also treat the namespace mapping as a set of attributes on the
             # tag, so we can recreate it later.
-            attrs = attrs.copy()
             for prefix, namespace in list(nsmap.items()):
                 attribute = NamespacedAttribute(
-                    "xmlns", prefix, "http://www.w3.org/2000/xmlns/")
-                attrs[attribute] = namespace
+                    "xmlns", prefix, "http://www.w3.org/2000/xmlns/"
+                )
+                new_attrib[attribute] = namespace
 
         # Namespaces are in play. Find any attributes that came in
         # from lxml with namespaces attached to their names, and
         # turn then into NamespacedAttribute objects.
-        new_attrs = {}
-        for attr, value in list(attrs.items()):
+        final_attrib: AttributeDict = self.attribute_dict_class()
+        for attr, value in list(new_attrib.items()):
             namespace, attr = self._getNsTag(attr)
             if namespace is None:
-                new_attrs[attr] = value
+                final_attrib[attr] = value
             else:
                 nsprefix = self._prefix_for_namespace(namespace)
                 attr = NamespacedAttribute(nsprefix, attr, namespace)
-                new_attrs[attr] = value
-        attrs = new_attrs
+                final_attrib[attr] = value
 
-        namespace, name = self._getNsTag(name)
+        namespace, tag = self._getNsTag(tag)
         nsprefix = self._prefix_for_namespace(namespace)
         self.soup.handle_starttag(
-            name, namespace, nsprefix, attrs,
-            namespaces=self.active_namespace_prefixes[-1]
+            tag,
+            namespace,
+            nsprefix,
+            final_attrib,
+            namespaces=self.active_namespace_prefixes[-1],
         )
-        
-    def _prefix_for_namespace(self, namespace):
+
+    def _prefix_for_namespace(
+        self, namespace: Optional[_NamespaceURL]
+    ) -> Optional[_NamespacePrefix]:
         """Find the currently active prefix for the given namespace."""
         if namespace is None:
             return None
@@ -314,17 +420,18 @@ def _prefix_for_namespace(self, namespace):
                 return inverted_nsmap[namespace]
         return None
 
-    def end(self, name):
+    def end(self, tag: str | bytes) -> None:
+        assert self.soup is not None
+        assert isinstance(tag, str)
         self.soup.endData()
-        completed_tag = self.soup.tagStack[-1]
-        namespace, name = self._getNsTag(name)
+        namespace, tag = self._getNsTag(tag)
         nsprefix = None
         if namespace is not None:
             for inverted_nsmap in reversed(self.nsmaps):
                 if inverted_nsmap is not None and namespace in inverted_nsmap:
                     nsprefix = inverted_nsmap[namespace]
                     break
-        self.soup.handle_endtag(name, nsprefix)
+        self.soup.handle_endtag(tag, nsprefix)
         if len(self.nsmaps) > 1:
             # This tag, or one of its parents, introduced a namespace
             # mapping, so pop it off the stack.
@@ -335,45 +442,52 @@ def end(self, name):
                 # longer in scope. Recalculate the currently active
                 # namespace prefixes.
                 self.active_namespace_prefixes.pop()
-            
-    def pi(self, target, data):
+
+    def pi(self, target: str, data: str) -> None:
+        assert self.soup is not None
         self.soup.endData()
-        data = target + ' ' + data
+        data = target + " " + data
         self.soup.handle_data(data)
         self.soup.endData(self.processing_instruction_class)
-        
-    def data(self, content):
-        self.soup.handle_data(content)
 
-    def doctype(self, name, pubid, system):
+    def data(self, data: str | bytes) -> None:
+        assert self.soup is not None
+        assert isinstance(data, str)
+        self.soup.handle_data(data)
+
+    def doctype(self, name: str, pubid: str, system: str) -> None:
+        assert self.soup is not None
         self.soup.endData()
-        doctype = Doctype.for_name_and_ids(name, pubid, system)
-        self.soup.object_was_parsed(doctype)
+        doctype_string = Doctype._string_for_name_and_ids(name, pubid, system)
+        self.soup.handle_data(doctype_string)
+        self.soup.endData(containerClass=Doctype)
 
-    def comment(self, content):
+    def comment(self, text: str | bytes) -> None:
         "Handle comments as Comment objects."
+        assert self.soup is not None
+        assert isinstance(text, str)
         self.soup.endData()
-        self.soup.handle_data(content)
+        self.soup.handle_data(text)
         self.soup.endData(Comment)
 
-    def test_fragment_to_document(self, fragment):
+    def test_fragment_to_document(self, fragment: str) -> str:
         """See `TreeBuilder`."""
         return '<?xml version="1.0" encoding="utf-8"?>\n%s' % fragment
 
 
 class LXMLTreeBuilder(HTMLTreeBuilder, LXMLTreeBuilderForXML):
+    NAME: str = LXML
+    ALTERNATE_NAMES: Iterable[str] = ["lxml-html"]
 
-    NAME = LXML
-    ALTERNATE_NAMES = ["lxml-html"]
+    features: Iterable[str] = list(ALTERNATE_NAMES) + [NAME, HTML, FAST, PERMISSIVE]
+    is_xml: bool = False
 
-    features = ALTERNATE_NAMES + [NAME, HTML, FAST, PERMISSIVE]
-    is_xml = False
-    processing_instruction_class = ProcessingInstruction
-
-    def default_parser(self, encoding):
+    def default_parser(self, encoding: Optional[_Encoding]) -> _ParserOrParserClass:
         return etree.HTMLParser
 
-    def feed(self, markup):
+    def feed(self, markup: _RawMarkup) -> None:
+        # We know self.soup is set by the time feed() is called.
+        assert self.soup is not None
         encoding = self.soup.original_encoding
         try:
             self.parser = self.parser_for(encoding)
@@ -382,7 +496,6 @@ def feed(self, markup):
         except (UnicodeDecodeError, LookupError, etree.ParserError) as e:
             raise ParserRejectedMarkup(e)
 
-
-    def test_fragment_to_document(self, fragment):
+    def test_fragment_to_document(self, fragment: str) -> str:
         """See `TreeBuilder`."""
-        return '<html><body>%s</body></html>' % fragment
+        return "<html><body>%s</body></html>" % fragment
diff --git a/libs/bs4/css.py b/libs/bs4/css.py
index 245ac6010a..75ad998349 100644
--- a/libs/bs4/css.py
+++ b/libs/bs4/css.py
@@ -1,42 +1,64 @@
-"""Integration code for CSS selectors using Soup Sieve (pypi: soupsieve)."""
-
+"""Integration code for CSS selectors using `Soup Sieve <https://facelessuser.github.io/soupsieve/>`_ (pypi: ``soupsieve``).
+
+Acquire a `CSS` object through the `element.Tag.css` attribute of
+the starting point of your CSS selector, or (if you want to run a
+selector against the entire document) of the `BeautifulSoup` object
+itself.
+
+The main advantage of doing this instead of using ``soupsieve``
+functions is that you don't need to keep passing the `element.Tag` to be
+selected against, since the `CSS` object is permanently scoped to that
+`element.Tag`.
+
+"""
+
+from __future__ import annotations
+
+from types import ModuleType
+from typing import (
+    Any,
+    cast,
+    Iterable,
+    Iterator,
+    MutableSequence,
+    Optional,
+    TYPE_CHECKING,
+)
 import warnings
+from bs4._typing import _NamespaceMapping
+
+if TYPE_CHECKING:
+    from soupsieve import SoupSieve
+    from bs4 import element
+    from bs4.element import ResultSet, Tag
+
+soupsieve: Optional[ModuleType]
 try:
     import soupsieve
-except ImportError as e:
+except ImportError:
     soupsieve = None
     warnings.warn(
-        'The soupsieve package is not installed. CSS selectors cannot be used.'
+        "The soupsieve package is not installed. CSS selectors cannot be used."
     )
 
 
 class CSS(object):
-    """A proxy object against the soupsieve library, to simplify its
+    """A proxy object against the ``soupsieve`` library, to simplify its
     CSS selector API.
 
-    Acquire this object through the .css attribute on the
-    BeautifulSoup object, or on the Tag you want to use as the
-    starting point for a CSS selector.
-
-    The main advantage of doing this is that the tag to be selected
-    against doesn't need to be explicitly specified in the function
-    calls, since it's already scoped to a tag.
-    """
-
-    def __init__(self, tag, api=soupsieve):
-        """Constructor.
+    You don't need to instantiate this class yourself; instead, use
+    `element.Tag.css`.
 
-        You don't need to instantiate this class yourself; instead,
-        access the .css attribute on the BeautifulSoup object, or on
-        the Tag you want to use as the starting point for your CSS
-        selector.
+    :param tag: All CSS selectors run by this object will use this as
+        their starting point.
 
-        :param tag: All CSS selectors will use this as their starting
-        point.
+    :param api: An optional drop-in replacement for the ``soupsieve`` module,
+        intended for use in unit tests.
+    """
 
-        :param api: A plug-in replacement for the soupsieve module,
-        designed mainly for use in tests.
-        """
+    def __init__(self, tag: element.Tag, api: Optional[ModuleType] = None):
+        if api is None:
+            api = soupsieve
         if api is None:
             raise NotImplementedError(
                 "Cannot execute CSS selectors because the soupsieve package is not installed."
@@ -44,19 +66,21 @@ def __init__(self, tag, api=soupsieve):
         self.api = api
         self.tag = tag
 
-    def escape(self, ident):
+    def escape(self, ident: str) -> str:
         """Escape a CSS identifier.
 
-        This is a simple wrapper around soupselect.escape(). See the
+        This is a simple wrapper around `soupsieve.escape() <https://facelessuser.github.io/soupsieve/api/#soupsieveescape>`_. See the
         documentation for that function for more information.
         """
         if soupsieve is None:
             raise NotImplementedError(
                 "Cannot escape CSS identifiers because the soupsieve package is not installed."
             )
-        return self.api.escape(ident)
+        return cast(str, self.api.escape(ident))
 
-    def _ns(self, ns, select):
+    def _ns(
+        self, ns: Optional[_NamespaceMapping], select: str
+    ) -> Optional[_NamespaceMapping]:
         """Normalize a dictionary of namespaces."""
         if not isinstance(select, self.api.SoupSieve) and ns is None:
             # If the selector is a precompiled pattern, it already has
@@ -65,19 +89,26 @@ def _ns(self, ns, select):
             ns = self.tag._namespaces
         return ns
 
-    def _rs(self, results):
-        """Normalize a list of results to a Resultset.
+    def _rs(self, results: MutableSequence[Tag]) -> ResultSet[Tag]:
+        """Normalize a list of results to a py:class:`ResultSet`.
 
-        A ResultSet is more consistent with the rest of Beautiful
-        Soup's API, and ResultSet.__getattr__ has a helpful error
-        message if you try to treat a list of results as a single
-        result (a common mistake).
+        A py:class:`ResultSet` is more consistent with the rest of
+        Beautiful Soup's API, and :py:meth:`ResultSet.__getattr__` has
+        a helpful error message if you try to treat a list of results
+        as a single result (a common mistake).
         """
         # Import here to avoid circular import
-        from bs4.element import ResultSet
+        from bs4 import ResultSet
+
         return ResultSet(None, results)
 
-    def compile(self, select, namespaces=None, flags=0, **kwargs):
+    def compile(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> SoupSieve:
         """Pre-compile a selector and return the compiled object.
 
         :param selector: A CSS selector.
@@ -88,25 +119,28 @@ def compile(self, select, namespaces=None, flags=0, **kwargs):
            parsing the document.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.compile() method.
+            `soupsieve.compile() <https://facelessuser.github.io/soupsieve/api/#soupsievecompile>`_ method.
 
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-           soupsieve.compile() method.
+        :param kwargs: Keyword arguments to be passed into Soup Sieve's
+           `soupsieve.compile() <https://facelessuser.github.io/soupsieve/api/#soupsievecompile>`_ method.
 
         :return: A precompiled selector object.
         :rtype: soupsieve.SoupSieve
         """
-        return self.api.compile(
-            select, self._ns(namespaces, select), flags, **kwargs
-        )
-
-    def select_one(self, select, namespaces=None, flags=0, **kwargs):
+        return self.api.compile(select, self._ns(namespaces, select), flags, **kwargs)
+
+    def select_one(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> element.Tag | None:
         """Perform a CSS selection operation on the current Tag and return the
-        first result.
+        first result, if any.
 
         This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.select_one()
-        method.
+        that library's documentation for the `soupsieve.select_one() <https://facelessuser.github.io/soupsieve/api/#soupsieveselect_one>`_ method.
 
         :param selector: A CSS selector.
 
@@ -116,27 +150,29 @@ def select_one(self, select, namespaces=None, flags=0, **kwargs):
            parsing the document.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.select_one() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-           soupsieve.select_one() method.
-
-        :return: A Tag, or None if the selector has no match.
-        :rtype: bs4.element.Tag
+            `soupsieve.select_one() <https://facelessuser.github.io/soupsieve/api/#soupsieveselect_one>`_ method.
 
+        :param kwargs: Keyword arguments to be passed into Soup Sieve's
+           `soupsieve.select_one() <https://facelessuser.github.io/soupsieve/api/#soupsieveselect_one>`_ method.
         """
         return self.api.select_one(
             select, self.tag, self._ns(namespaces, select), flags, **kwargs
         )
 
-    def select(self, select, namespaces=None, limit=0, flags=0, **kwargs):
-        """Perform a CSS selection operation on the current Tag.
+    def select(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        limit: int = 0,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> ResultSet[element.Tag]:
+        """Perform a CSS selection operation on the current `element.Tag`.
 
         This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.select()
-        method.
+        that library's documentation for the `soupsieve.select() <https://facelessuser.github.io/soupsieve/api/#soupsieveselect>`_ method.
 
-        :param selector: A string containing a CSS selector.
+        :param selector: A CSS selector.
 
         :param namespaces: A dictionary mapping namespace prefixes
             used in the CSS selector to namespace URIs. By default,
@@ -146,30 +182,33 @@ def select(self, select, namespaces=None, limit=0, flags=0, **kwargs):
         :param limit: After finding this number of results, stop looking.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.select() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.select() method.
-
-        :return: A ResultSet of Tag objects.
-        :rtype: bs4.element.ResultSet
+            `soupsieve.select() <https://facelessuser.github.io/soupsieve/api/#soupsieveselect>`_ method.
 
+        :param kwargs: Keyword arguments to be passed into Soup Sieve's
+           `soupsieve.select() <https://facelessuser.github.io/soupsieve/api/#soupsieveselect>`_ method.
         """
         if limit is None:
             limit = 0
 
         return self._rs(
             self.api.select(
-                select, self.tag, self._ns(namespaces, select), limit, flags,
-                **kwargs
+                select, self.tag, self._ns(namespaces, select), limit, flags, **kwargs
             )
         )
 
-    def iselect(self, select, namespaces=None, limit=0, flags=0, **kwargs):
-        """Perform a CSS selection operation on the current Tag.
+    def iselect(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        limit: int = 0,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> Iterator[element.Tag]:
+        """Perform a CSS selection operation on the current `element.Tag`.
 
         This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.iselect()
+        that library's documentation for the `soupsieve.iselect()
+        <https://facelessuser.github.io/soupsieve/api/#soupsieveiselect>`_
         method. It is the same as select(), but it returns a generator
         instead of a list.
 
@@ -183,23 +222,27 @@ def iselect(self, select, namespaces=None, limit=0, flags=0, **kwargs):
         :param limit: After finding this number of results, stop looking.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.iselect() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.iselect() method.
+            `soupsieve.iselect() <https://facelessuser.github.io/soupsieve/api/#soupsieveiselect>`_ method.
 
-        :return: A generator
-        :rtype: types.GeneratorType
+        :param kwargs: Keyword arguments to be passed into Soup Sieve's
+           `soupsieve.iselect() <https://facelessuser.github.io/soupsieve/api/#soupsieveiselect>`_ method.
         """
         return self.api.iselect(
             select, self.tag, self._ns(namespaces, select), limit, flags, **kwargs
         )
 
-    def closest(self, select, namespaces=None, flags=0, **kwargs):
-        """Find the Tag closest to this one that matches the given selector.
+    def closest(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> Optional[element.Tag]:
+        """Find the `element.Tag` closest to this one that matches the given selector.
 
         This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.closest()
+        that library's documentation for the `soupsieve.closest()
+        <https://facelessuser.github.io/soupsieve/api/#soupsieveclosest>`_
         method.
 
         :param selector: A string containing a CSS selector.
@@ -210,24 +253,28 @@ def closest(self, select, namespaces=None, flags=0, **kwargs):
             parsing the document.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.closest() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.closest() method.
+            `soupsieve.closest() <https://facelessuser.github.io/soupsieve/api/#soupsieveclosest>`_ method.
 
-        :return: A Tag, or None if there is no match.
-        :rtype: bs4.Tag
+        :param kwargs: Keyword arguments to be passed into Soup Sieve's
+           `soupsieve.closest() <https://facelessuser.github.io/soupsieve/api/#soupsieveclosest>`_ method.
 
         """
         return self.api.closest(
             select, self.tag, self._ns(namespaces, select), flags, **kwargs
         )
 
-    def match(self, select, namespaces=None, flags=0, **kwargs):
-        """Check whether this Tag matches the given CSS selector.
+    def match(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> bool:
+        """Check whether or not this `element.Tag` matches the given CSS selector.
 
         This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.match()
+        that library's documentation for the `soupsieve.match()
+        <https://facelessuser.github.io/soupsieve/api/#soupsievematch>`_
         method.
 
         :param: a CSS selector.
@@ -238,25 +285,37 @@ def match(self, select, namespaces=None, flags=0, **kwargs):
             parsing the document.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.match() method.
+            `soupsieve.match()
+            <https://facelessuser.github.io/soupsieve/api/#soupsievematch>`_
+            method.
 
         :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.match() method.
-
-        :return: True if this Tag matches the selector; False otherwise.
-        :rtype: bool
+            `soupsieve.match()
+            <https://facelessuser.github.io/soupsieve/api/#soupsievematch>`_
+            method.
         """
-        return self.api.match(
-            select, self.tag, self._ns(namespaces, select), flags, **kwargs
+        return cast(
+            bool,
+            self.api.match(
+                select, self.tag, self._ns(namespaces, select), flags, **kwargs
+            ),
         )
 
-    def filter(self, select, namespaces=None, flags=0, **kwargs):
-        """Filter this Tag's direct children based on the given CSS selector.
+    def filter(
+        self,
+        select: str,
+        namespaces: Optional[_NamespaceMapping] = None,
+        flags: int = 0,
+        **kwargs: Any,
+    ) -> ResultSet[element.Tag]:
+        """Filter this `element.Tag`'s direct children based on the given CSS selector.
 
         This uses the Soup Sieve library. It works the same way as
-        passing this Tag into that library's soupsieve.filter()
-        method. More information, for more information see the
-        documentation for soupsieve.filter().
+        passing a `element.Tag` into that library's `soupsieve.filter()
+        <https://facelessuser.github.io/soupsieve/api/#soupsievefilter>`_
+        method. For more information, see the documentation for
+        `soupsieve.filter()
+        <https://facelessuser.github.io/soupsieve/api/#soupsievefilter>`_.
 
         :param namespaces: A dictionary mapping namespace prefixes
             used in the CSS selector to namespace URIs. By default,
@@ -264,14 +323,14 @@ def filter(self, select, namespaces=None, flags=0, **kwargs):
             parsing the document.
 
         :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.filter() method.
+            `soupsieve.filter()
+            <https://facelessuser.github.io/soupsieve/api/#soupsievefilter>`_
+            method.
 
         :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.filter() method.
-
-        :return: A ResultSet of Tag objects.
-        :rtype: bs4.element.ResultSet
-
+            `soupsieve.filter()
+            <https://facelessuser.github.io/soupsieve/api/#soupsievefilter>`_
+            method.
         """
         return self._rs(
             self.api.filter(
diff --git a/libs/bs4/dammit.py b/libs/bs4/dammit.py
index 692433c57a..52f0babd3f 100644
--- a/libs/bs4/dammit.py
+++ b/libs/bs4/dammit.py
@@ -2,19 +2,41 @@
 """Beautiful Soup bonus library: Unicode, Dammit
 
 This library converts a bytestream to Unicode through any means
-necessary. It is heavily based on code from Mark Pilgrim's Universal
-Feed Parser. It works best on XML and HTML, but it does not rewrite the
-XML or HTML to reflect a new encoding; that's the tree builder's job.
+necessary. It is heavily based on code from Mark Pilgrim's `Universal
+Feed Parser <https://pypi.org/project/feedparser/>`_, now maintained
+by Kurt McKee. It does not rewrite the body of an XML or HTML document
+to reflect a new encoding; that's the job of `TreeBuilder`.
+
 """
+
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
 from html.entities import codepoint2name
 from collections import defaultdict
 import codecs
+from html.entities import html5
 import re
-import logging
-import string
+from logging import Logger, getLogger
+from types import ModuleType
+from typing import (
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    Pattern,
+    Set,
+    Tuple,
+    Type,
+    Union,
+    cast,
+)
+from typing_extensions import Literal
+from bs4._typing import (
+    _Encoding,
+    _Encodings,
+)
+import warnings
 
 # Import a library to autodetect character encodings. We'll support
 # any of a number of libraries that all support the same API:
@@ -22,75 +44,117 @@
 # * cchardet
 # * chardet
 # * charset-normalizer
-chardet_module = None
+chardet_module: Optional[ModuleType] = None
 try:
     #  PyPI package: cchardet
-    import cchardet as chardet_module
+    import cchardet # type:ignore
+
+    chardet_module = cchardet
 except ImportError:
     try:
         #  Debian package: python-chardet
         #  PyPI package: chardet
-        import chardet as chardet_module
+        import chardet
+
+        chardet_module = chardet
     except ImportError:
         try:
             # PyPI package: charset-normalizer
-            import charset_normalizer as chardet_module
+            import charset_normalizer # type:ignore
+
+            chardet_module = charset_normalizer
         except ImportError:
             # No chardet available.
-            chardet_module = None
+            pass
 
-if chardet_module:
-    def chardet_dammit(s):
-        if isinstance(s, str):
-            return None
-        return chardet_module.detect(s)['encoding']
-else:
-    def chardet_dammit(s):
+
+def _chardet_dammit(s: bytes) -> Optional[str]:
+    """Try as hard as possible to detect the encoding of a bytestring."""
+    if chardet_module is None or isinstance(s, str):
         return None
+    module = chardet_module
+    return module.detect(s)["encoding"]
+
 
 # Build bytestring and Unicode versions of regular expressions for finding
 # a declared encoding inside an XML or HTML document.
-xml_encoding = '^\\s*<\\?.*encoding=[\'"](.*?)[\'"].*\\?>'
-html_meta = '<\\s*meta[^>]+charset\\s*=\\s*["\']?([^>]*?)[ /;\'">]'
-encoding_res = dict()
+xml_encoding: str = "^\\s*<\\?.*encoding=['\"](.*?)['\"].*\\?>"  #: :meta private:
+html_meta: str = (
+    "<\\s*meta[^>]+charset\\s*=\\s*[\"']?([^>]*?)[ /;'\">]"  #: :meta private:
+)
+
+# TODO-TYPING: The Pattern type here could use more refinement, but it's tricky.
+encoding_res: Dict[Type, Dict[str, Pattern]] = dict()
 encoding_res[bytes] = {
-    'html' : re.compile(html_meta.encode("ascii"), re.I),
-    'xml' : re.compile(xml_encoding.encode("ascii"), re.I),
+    "html": re.compile(html_meta.encode("ascii"), re.I),
+    "xml": re.compile(xml_encoding.encode("ascii"), re.I),
 }
 encoding_res[str] = {
-    'html' : re.compile(html_meta, re.I),
-    'xml' : re.compile(xml_encoding, re.I)
+    "html": re.compile(html_meta, re.I),
+    "xml": re.compile(xml_encoding, re.I),
 }
 
-from html.entities import html5
 
 class EntitySubstitution(object):
     """The ability to substitute XML or HTML entities for certain characters."""
 
-    def _populate_class_variables():
+    #: A map of named HTML entities to the corresponding Unicode string.
+    #:
+    #: :meta hide-value:
+    HTML_ENTITY_TO_CHARACTER: Dict[str, str]
+
+    #: A map of Unicode strings to the corresponding named HTML entities;
+    #: the inverse of HTML_ENTITY_TO_CHARACTER.
+    #:
+    #: :meta hide-value:
+    CHARACTER_TO_HTML_ENTITY: Dict[str, str]
+
+    #: A regular expression that matches any character (or, in rare
+    #: cases, pair of characters) that can be replaced with a named
+    #: HTML entity.
+    #:
+    #: :meta hide-value:
+    CHARACTER_TO_HTML_ENTITY_RE: Pattern[str]
+
+    #: A very similar regular expression to
+    #: CHARACTER_TO_HTML_ENTITY_RE, but which also matches unescaped
+    #: ampersands. This is used by the 'html' formatted to provide
+    #: backwards-compatibility, even though the HTML5 spec allows most
+    #: ampersands to go unescaped.
+    #:
+    #: :meta hide-value:
+    CHARACTER_TO_HTML_ENTITY_WITH_AMPERSAND_RE: Pattern[str]
+
+    @classmethod
+    def _populate_class_variables(cls) -> None:
         """Initialize variables used by this class to manage the plethora of
         HTML5 named entities.
 
-        This function returns a 3-tuple containing two dictionaries
-        and a regular expression:
+        This function sets the following class variables:
 
-        unicode_to_name - A mapping of Unicode strings like "โฆจ" to
+        CHARACTER_TO_HTML_ENTITY - A mapping of Unicode strings like "โฆจ" to
         entity names like "angmsdaa". When a single Unicode string has
         multiple entity names, we try to choose the most commonly-used
         name.
 
-        name_to_unicode: A mapping of entity names like "angmsdaa" to 
+        HTML_ENTITY_TO_CHARACTER: A mapping of entity names like "angmsdaa" to
         Unicode strings like "โฆจ".
 
-        named_entity_re: A regular expression matching (almost) any
+        CHARACTER_TO_HTML_ENTITY_RE: A regular expression matching (almost) any
         Unicode string that corresponds to an HTML5 named entity.
+
+        CHARACTER_TO_HTML_ENTITY_WITH_AMPERSAND_RE: A very similar
+        regular expression to CHARACTER_TO_HTML_ENTITY_RE, but which
+        also matches unescaped ampersands. This is used by the 'html'
+        formatted to provide backwards-compatibility, even though the HTML5
+        spec allows most ampersands to go unescaped.
         """
         unicode_to_name = {}
         name_to_unicode = {}
 
         short_entities = set()
         long_entities_by_first_character = defaultdict(set)
-        
+
         for name_with_semicolon, character in sorted(html5.items()):
             # "It is intentional, for legacy compatibility, that many
             # code points have multiple character reference names. For
@@ -101,7 +165,7 @@ def _populate_class_variables():
             # The parsers are in charge of handling (or not) character
             # references with no trailing semicolon, so we remove the
             # semicolon whenever it appears.
-            if name_with_semicolon.endswith(';'):
+            if name_with_semicolon.endswith(";"):
                 name = name_with_semicolon[:-1]
             else:
                 name = name_with_semicolon
@@ -123,11 +187,10 @@ def _populate_class_variables():
             #
             # This is tricky, for two reasons.
 
-            if (len(character) == 1 and ord(character) < 128
-                and character not in '<>&'):
+            if len(character) == 1 and ord(character) < 128 and character not in "<>":
                 # First, it would be annoying to turn single ASCII
                 # characters like | into named entities like
-                # &verbar;. The exceptions are <>&, which we _must_
+                # &verbar;. The exceptions are <>, which we _must_
                 # turn into named entities to produce valid HTML.
                 continue
 
@@ -150,7 +213,7 @@ def _populate_class_variables():
             # we won't know exactly what the regular expression needs
             # to look like until we've gone through the entire list of
             # named entities.
-            if len(character) == 1:
+            if len(character) == 1 and character != "&":
                 short_entities.add(character)
             else:
                 long_entities_by_first_character[character[0]].add(character)
@@ -167,13 +230,16 @@ def _populate_class_variables():
                 # This finds, e.g. \u2267 but only if it is _not_
                 # followed by \u0338.
                 particles.add("%s(?![%s])" % (short, ignore))
-        
+
         for long_entities in list(long_entities_by_first_character.values()):
             for long_entity in long_entities:
                 particles.add(long_entity)
 
         re_definition = "(%s)" % "|".join(particles)
-                
+
+        particles.add("&")
+        re_definition_with_ampersand = "(%s)" % "|".join(particles)
+
         # If an entity shows up in both html5 and codepoint2name, it's
         # likely that HTML5 gives it several different names, such as
         # 'rsquo' and 'rsquor'. When converting Unicode characters to
@@ -184,40 +250,70 @@ def _populate_class_variables():
             character = chr(codepoint)
             unicode_to_name[character] = name
 
-        return unicode_to_name, name_to_unicode, re.compile(re_definition)
-    (CHARACTER_TO_HTML_ENTITY, HTML_ENTITY_TO_CHARACTER,
-     CHARACTER_TO_HTML_ENTITY_RE) = _populate_class_variables()
+        cls.CHARACTER_TO_HTML_ENTITY = unicode_to_name
+        cls.HTML_ENTITY_TO_CHARACTER = name_to_unicode
+        cls.CHARACTER_TO_HTML_ENTITY_RE = re.compile(re_definition)
+        cls.CHARACTER_TO_HTML_ENTITY_WITH_AMPERSAND_RE = re.compile(
+            re_definition_with_ampersand
+        )
 
-    CHARACTER_TO_XML_ENTITY = {
+    #: A map of Unicode strings to the corresponding named XML entities.
+    #:
+    #: :meta hide-value:
+    CHARACTER_TO_XML_ENTITY: Dict[str, str] = {
         "'": "apos",
         '"': "quot",
         "&": "amp",
         "<": "lt",
         ">": "gt",
-        }
+    }
+
+    # Matches any named or numeric HTML entity.
+    ANY_ENTITY_RE = re.compile("&(#\\d+|#x[0-9a-fA-F]+|\\w+);", re.I)
 
-    BARE_AMPERSAND_OR_BRACKET = re.compile("([<>]|"
-                                           "&(?!#\\d+;|#x[0-9a-fA-F]+;|\\w+;)"
-                                           ")")
+    #: A regular expression matching an angle bracket or an ampersand that
+    #: is not part of an XML or HTML entity.
+    #:
+    #: :meta hide-value:
+    BARE_AMPERSAND_OR_BRACKET: Pattern[str] = re.compile(
+        "([<>]|" "&(?!#\\d+;|#x[0-9a-fA-F]+;|\\w+;)" ")"
+    )
 
-    AMPERSAND_OR_BRACKET = re.compile("([<>&])")
+    #: A regular expression matching an angle bracket or an ampersand.
+    #:
+    #: :meta hide-value:
+    AMPERSAND_OR_BRACKET: Pattern[str] = re.compile("([<>&])")
 
     @classmethod
-    def _substitute_html_entity(cls, matchobj):
+    def _substitute_html_entity(cls, matchobj: re.Match) -> str:
         """Used with a regular expression to substitute the
         appropriate HTML entity for a special character string."""
-        entity = cls.CHARACTER_TO_HTML_ENTITY.get(matchobj.group(0))
+        original_entity = matchobj.group(0)
+        entity = cls.CHARACTER_TO_HTML_ENTITY.get(original_entity)
+        if entity is None:
+            return "&amp;%s;" % original_entity
         return "&%s;" % entity
 
     @classmethod
-    def _substitute_xml_entity(cls, matchobj):
+    def _substitute_xml_entity(cls, matchobj: re.Match) -> str:
         """Used with a regular expression to substitute the
         appropriate XML entity for a special character string."""
         entity = cls.CHARACTER_TO_XML_ENTITY[matchobj.group(0)]
         return "&%s;" % entity
 
     @classmethod
-    def quoted_attribute_value(self, value):
+    def _escape_entity_name(cls, matchobj: re.Match) -> str:
+        return "&amp;%s;" % matchobj.group(1)
+
+    @classmethod
+    def _escape_unrecognized_entity_name(cls, matchobj: re.Match) -> str:
+        possible_entity = matchobj.group(1)
+        if possible_entity in cls.HTML_ENTITY_TO_CHARACTER:
+            return "&%s;" % possible_entity
+        return "&amp;%s;" % possible_entity
+
+    @classmethod
+    def quoted_attribute_value(cls, value: str) -> str:
         """Make a value into a quoted XML attribute, possibly escaping it.
 
          Most strings will be quoted using double quotes.
@@ -233,7 +329,10 @@ def quoted_attribute_value(self, value):
          double quotes will be escaped, and the string will be quoted
          using double quotes.
 
-          Welcome to "Bob's Bar" -> "Welcome to &quot;Bob's bar&quot;
+          Welcome to "Bob's Bar" -> Welcome to &quot;Bob's bar&quot;
+
+        :param value: The XML attribute value to quote
+        :return: The quoted value
         """
         quote_with = '"'
         if '"' in value:
@@ -254,21 +353,25 @@ def quoted_attribute_value(self, value):
         return quote_with + value + quote_with
 
     @classmethod
-    def substitute_xml(cls, value, make_quoted_attribute=False):
-        """Substitute XML entities for special XML characters.
+    def substitute_xml(cls, value: str, make_quoted_attribute: bool = False) -> str:
+        """Replace special XML characters with named XML entities.
 
-        :param value: A string to be substituted. The less-than sign
-          will become &lt;, the greater-than sign will become &gt;,
-          and any ampersands will become &amp;. If you want ampersands
-          that appear to be part of an entity definition to be left
-          alone, use substitute_xml_containing_entities() instead.
+        The less-than sign will become &lt;, the greater-than sign
+        will become &gt;, and any ampersands will become &amp;. If you
+        want ampersands that seem to be part of an entity definition
+        to be left alone, use `substitute_xml_containing_entities`
+        instead.
+
+        :param value: A string to be substituted.
 
         :param make_quoted_attribute: If True, then the string will be
          quoted, as befits an attribute value.
+
+        :return: A version of ``value`` with special characters replaced
+         with named entities.
         """
         # Escape angle brackets and ampersands.
-        value = cls.AMPERSAND_OR_BRACKET.sub(
-            cls._substitute_xml_entity, value)
+        value = cls.AMPERSAND_OR_BRACKET.sub(cls._substitute_xml_entity, value)
 
         if make_quoted_attribute:
             value = cls.quoted_attribute_value(value)
@@ -276,7 +379,8 @@ def substitute_xml(cls, value, make_quoted_attribute=False):
 
     @classmethod
     def substitute_xml_containing_entities(
-        cls, value, make_quoted_attribute=False):
+        cls, value: str, make_quoted_attribute: bool = False
+    ) -> str:
         """Substitute XML entities for special XML characters.
 
         :param value: A string to be substituted. The less-than sign will
@@ -289,18 +393,17 @@ def substitute_xml_containing_entities(
         """
         # Escape angle brackets, and ampersands that aren't part of
         # entities.
-        value = cls.BARE_AMPERSAND_OR_BRACKET.sub(
-            cls._substitute_xml_entity, value)
+        value = cls.BARE_AMPERSAND_OR_BRACKET.sub(cls._substitute_xml_entity, value)
 
         if make_quoted_attribute:
             value = cls.quoted_attribute_value(value)
         return value
 
     @classmethod
-    def substitute_html(cls, s):
+    def substitute_html(cls, s: str) -> str:
         """Replace certain Unicode characters with named HTML entities.
 
-        This differs from data.encode(encoding, 'xmlcharrefreplace')
+        This differs from ``data.encode(encoding, 'xmlcharrefreplace')``
         in that the goal is to make the result more readable (to those
         with ASCII displays) rather than to recover from
         errors. There's absolutely nothing wrong with a UTF-8 string
@@ -308,109 +411,193 @@ def substitute_html(cls, s):
         character with "&eacute;" will make it more readable to some
         people.
 
-        :param s: A Unicode string.
+        :param s: The string to be modified.
+        :return: The string with some Unicode characters replaced with
+           HTML entities.
+        """
+        # Convert any appropriate characters to HTML entities.
+        return cls.CHARACTER_TO_HTML_ENTITY_WITH_AMPERSAND_RE.sub(
+            cls._substitute_html_entity, s
+        )
+
+    @classmethod
+    def substitute_html5(cls, s: str) -> str:
+        """Replace certain Unicode characters with named HTML entities
+        using HTML5 rules.
+
+        Specifically, this method is much less aggressive about
+        escaping ampersands than substitute_html. Only ambiguous
+        ampersands are escaped, per the HTML5 standard:
+
+        "An ambiguous ampersand is a U+0026 AMPERSAND character (&)
+        that is followed by one or more ASCII alphanumerics, followed
+        by a U+003B SEMICOLON character (;), where these characters do
+        not match any of the names given in the named character
+        references section."
+
+        Unlike substitute_html5_raw, this method assumes HTML entities
+        were converted to Unicode characters on the way in, as
+        Beautiful Soup does. By the time Beautiful Soup does its work,
+        the only ambiguous ampersands that need to be escaped are the
+        ones that were escaped in the original markup when mentioning
+        HTML entities.
+
+        :param s: The string to be modified.
+        :return: The string with some Unicode characters replaced with
+           HTML entities.
         """
-        return cls.CHARACTER_TO_HTML_ENTITY_RE.sub(
-            cls._substitute_html_entity, s)
+        # First, escape any HTML entities found in the markup.
+        s = cls.ANY_ENTITY_RE.sub(cls._escape_entity_name, s)
+
+        # Next, convert any appropriate characters to unescaped HTML entities.
+        s = cls.CHARACTER_TO_HTML_ENTITY_RE.sub(cls._substitute_html_entity, s)
+
+        return s
+
+    @classmethod
+    def substitute_html5_raw(cls, s: str) -> str:
+        """Replace certain Unicode characters with named HTML entities
+        using HTML5 rules.
+
+        substitute_html5_raw is similar to substitute_html5 but it is
+        designed for standalone use (whereas substitute_html5 is
+        designed for use with Beautiful Soup).
+
+        :param s: The string to be modified.
+        :return: The string with some Unicode characters replaced with
+           HTML entities.
+        """
+        # First, escape the ampersand for anything that looks like an
+        # entity but isn't in the list of recognized entities. All other
+        # ampersands can be left alone.
+        s = cls.ANY_ENTITY_RE.sub(cls._escape_unrecognized_entity_name, s)
+
+        # Then, convert a range of Unicode characters to unescaped
+        # HTML entities.
+        s = cls.CHARACTER_TO_HTML_ENTITY_RE.sub(cls._substitute_html_entity, s)
+
+        return s
+
+
+EntitySubstitution._populate_class_variables()
 
 
 class EncodingDetector:
-    """Suggests a number of possible encodings for a bytestring.
+    """This class is capable of guessing a number of possible encodings
+    for a bytestring.
 
     Order of precedence:
 
     1. Encodings you specifically tell EncodingDetector to try first
-    (the known_definite_encodings argument to the constructor).
+       (the ``known_definite_encodings`` argument to the constructor).
 
     2. An encoding determined by sniffing the document's byte-order mark.
 
     3. Encodings you specifically tell EncodingDetector to try if
-    byte-order mark sniffing fails (the user_encodings argument to the
-    constructor).
+       byte-order mark sniffing fails (the ``user_encodings`` argument to the
+       constructor).
 
     4. An encoding declared within the bytestring itself, either in an
-    XML declaration (if the bytestring is to be interpreted as an XML
-    document), or in a <meta> tag (if the bytestring is to be
-    interpreted as an HTML document.)
+       XML declaration (if the bytestring is to be interpreted as an XML
+       document), or in a <meta> tag (if the bytestring is to be
+       interpreted as an HTML document.)
 
     5. An encoding detected through textual analysis by chardet,
-    cchardet, or a similar external library.
+       cchardet, or a similar external library.
+
+    6. UTF-8.
+
+    7. Windows-1252.
+
+    :param markup: Some markup in an unknown encoding.
 
-    4. UTF-8.
+    :param known_definite_encodings: When determining the encoding
+        of ``markup``, these encodings will be tried first, in
+        order. In HTML terms, this corresponds to the "known
+        definite encoding" step defined in `section 13.2.3.1 of the HTML standard <https://html.spec.whatwg.org/multipage/parsing.html#parsing-with-a-known-character-encoding>`_.
 
-    5. Windows-1252.
+    :param user_encodings: These encodings will be tried after the
+        ``known_definite_encodings`` have been tried and failed, and
+        after an attempt to sniff the encoding by looking at a
+        byte order mark has failed. In HTML terms, this
+        corresponds to the step "user has explicitly instructed
+        the user agent to override the document's character
+        encoding", defined in `section 13.2.3.2 of the HTML standard <https://html.spec.whatwg.org/multipage/parsing.html#determining-the-character-encoding>`_.
+
+    :param override_encodings: A **deprecated** alias for
+        ``known_definite_encodings``. Any encodings here will be tried
+        immediately after the encodings in
+        ``known_definite_encodings``.
+
+    :param is_html: If True, this markup is considered to be
+        HTML. Otherwise it's assumed to be XML.
+
+    :param exclude_encodings: These encodings will not be tried,
+        even if they otherwise would be.
 
     """
-    def __init__(self, markup, known_definite_encodings=None,
-                 is_html=False, exclude_encodings=None,
-                 user_encodings=None, override_encodings=None):
-        """Constructor.
-
-        :param markup: Some markup in an unknown encoding.
-
-        :param known_definite_encodings: When determining the encoding
-            of `markup`, these encodings will be tried first, in
-            order. In HTML terms, this corresponds to the "known
-            definite encoding" step defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#parsing-with-a-known-character-encoding
-
-        :param user_encodings: These encodings will be tried after the
-            `known_definite_encodings` have been tried and failed, and
-            after an attempt to sniff the encoding by looking at a
-            byte order mark has failed. In HTML terms, this
-            corresponds to the step "user has explicitly instructed
-            the user agent to override the document's character
-            encoding", defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#determining-the-character-encoding
-
-        :param override_encodings: A deprecated alias for
-            known_definite_encodings. Any encodings here will be tried
-            immediately after the encodings in
-            known_definite_encodings.
-
-        :param is_html: If True, this markup is considered to be
-            HTML. Otherwise it's assumed to be XML.
-
-        :param exclude_encodings: These encodings will not be tried,
-            even if they otherwise would be.
 
-        """
+    def __init__(
+        self,
+        markup: bytes,
+        known_definite_encodings: Optional[_Encodings] = None,
+        is_html: Optional[bool] = False,
+        exclude_encodings: Optional[_Encodings] = None,
+        user_encodings: Optional[_Encodings] = None,
+        override_encodings: Optional[_Encodings] = None,
+    ):
         self.known_definite_encodings = list(known_definite_encodings or [])
         if override_encodings:
+            warnings.warn(
+                "The 'override_encodings' argument was deprecated in 4.10.0. Use 'known_definite_encodings' instead.",
+                DeprecationWarning,
+                stacklevel=3,
+            )
             self.known_definite_encodings += override_encodings
         self.user_encodings = user_encodings or []
         exclude_encodings = exclude_encodings or []
         self.exclude_encodings = set([x.lower() for x in exclude_encodings])
         self.chardet_encoding = None
-        self.is_html = is_html
-        self.declared_encoding = None
+        self.is_html = False if is_html is None else is_html
+        self.declared_encoding: Optional[str] = None
 
         # First order of business: strip a byte-order mark.
         self.markup, self.sniffed_encoding = self.strip_byte_order_mark(markup)
 
-    def _usable(self, encoding, tried):
+    known_definite_encodings: _Encodings
+    user_encodings: _Encodings
+    exclude_encodings: _Encodings
+    chardet_encoding: Optional[_Encoding]
+    is_html: bool
+    declared_encoding: Optional[_Encoding]
+    markup: bytes
+    sniffed_encoding: Optional[_Encoding]
+
+    def _usable(self, encoding: Optional[_Encoding], tried: Set[_Encoding]) -> bool:
         """Should we even bother to try this encoding?
 
         :param encoding: Name of an encoding.
-        :param tried: Encodings that have already been tried. This will be modified
-            as a side effect.
+        :param tried: Encodings that have already been tried. This
+            will be modified as a side effect.
         """
-        if encoding is not None:
-            encoding = encoding.lower()
-            if encoding in self.exclude_encodings:
-                return False
-            if encoding not in tried:
-                tried.add(encoding)
-                return True
+        if encoding is None:
+            return False
+        encoding = encoding.lower()
+        if encoding in self.exclude_encodings:
+            return False
+        if encoding not in tried:
+            tried.add(encoding)
+            return True
         return False
 
     @property
-    def encodings(self):
+    def encodings(self) -> Iterator[_Encoding]:
         """Yield a number of encodings that might work for this markup.
 
-        :yield: A sequence of strings.
+        :yield: A sequence of strings. Each is the name of an encoding
+           that *might* work to convert a bytestring into Unicode.
         """
-        tried = set()
+        tried: Set[_Encoding] = set()
 
         # First, try the known definite encodings
         for e in self.known_definite_encodings:
@@ -419,7 +606,9 @@ def encodings(self):
 
         # Did the document originally start with a byte-order mark
         # that indicated its encoding?
-        if self._usable(self.sniffed_encoding, tried):
+        if self.sniffed_encoding is not None and self._usable(
+            self.sniffed_encoding, tried
+        ):
             yield self.sniffed_encoding
 
         # Sniffing the byte-order mark did nothing; try the user
@@ -427,60 +616,79 @@ def encodings(self):
         for e in self.user_encodings:
             if self._usable(e, tried):
                 yield e
-            
+
         # Look within the document for an XML or HTML encoding
         # declaration.
         if self.declared_encoding is None:
             self.declared_encoding = self.find_declared_encoding(
-                self.markup, self.is_html)
-        if self._usable(self.declared_encoding, tried):
+                self.markup, self.is_html
+            )
+        if self.declared_encoding is not None and self._usable(
+            self.declared_encoding, tried
+        ):
             yield self.declared_encoding
 
         # Use third-party character set detection to guess at the
         # encoding.
         if self.chardet_encoding is None:
-            self.chardet_encoding = chardet_dammit(self.markup)
-        if self._usable(self.chardet_encoding, tried):
+            self.chardet_encoding = _chardet_dammit(self.markup)
+        if self.chardet_encoding is not None and self._usable(
+            self.chardet_encoding, tried
+        ):
             yield self.chardet_encoding
 
         # As a last-ditch effort, try utf-8 and windows-1252.
-        for e in ('utf-8', 'windows-1252'):
+        for e in ("utf-8", "windows-1252"):
             if self._usable(e, tried):
                 yield e
 
     @classmethod
-    def strip_byte_order_mark(cls, data):
+    def strip_byte_order_mark(cls, data: bytes) -> Tuple[bytes, Optional[_Encoding]]:
         """If a byte-order mark is present, strip it and return the encoding it implies.
 
-        :param data: Some markup.
-        :return: A 2-tuple (modified data, implied encoding)
+        :param data: A bytestring that may or may not begin with a
+           byte-order mark.
+
+        :return: A 2-tuple (data stripped of byte-order mark, encoding implied by byte-order mark)
         """
         encoding = None
         if isinstance(data, str):
             # Unicode data cannot have a byte-order mark.
             return data, encoding
-        if (len(data) >= 4) and (data[:2] == b'\xfe\xff') \
-               and (data[2:4] != '\x00\x00'):
-            encoding = 'utf-16be'
+        if (
+            (len(data) >= 4)
+            and (data[:2] == b"\xfe\xff")
+            and (data[2:4] != b"\x00\x00")
+        ):
+            encoding = "utf-16be"
             data = data[2:]
-        elif (len(data) >= 4) and (data[:2] == b'\xff\xfe') \
-                 and (data[2:4] != '\x00\x00'):
-            encoding = 'utf-16le'
+        elif (
+            (len(data) >= 4)
+            and (data[:2] == b"\xff\xfe")
+            and (data[2:4] != b"\x00\x00")
+        ):
+            encoding = "utf-16le"
             data = data[2:]
-        elif data[:3] == b'\xef\xbb\xbf':
-            encoding = 'utf-8'
+        elif data[:3] == b"\xef\xbb\xbf":
+            encoding = "utf-8"
             data = data[3:]
-        elif data[:4] == b'\x00\x00\xfe\xff':
-            encoding = 'utf-32be'
+        elif data[:4] == b"\x00\x00\xfe\xff":
+            encoding = "utf-32be"
             data = data[4:]
-        elif data[:4] == b'\xff\xfe\x00\x00':
-            encoding = 'utf-32le'
+        elif data[:4] == b"\xff\xfe\x00\x00":
+            encoding = "utf-32le"
             data = data[4:]
         return data, encoding
 
     @classmethod
-    def find_declared_encoding(cls, markup, is_html=False, search_entire_document=False):
-        """Given a document, tries to find its declared encoding.
+    def find_declared_encoding(
+        cls,
+        markup: Union[bytes, str],
+        is_html: bool = False,
+        search_entire_document: bool = False,
+    ) -> Optional[_Encoding]:
+        """Given a document, tries to find an encoding declared within the
+        text of the document itself.
 
         An XML encoding is declared at the beginning of the document.
 
@@ -490,9 +698,12 @@ def find_declared_encoding(cls, markup, is_html=False, search_entire_document=Fa
         :param markup: Some markup.
         :param is_html: If True, this markup is considered to be HTML. Otherwise
             it's assumed to be XML.
-        :param search_entire_document: Since an encoding is supposed to declared near the beginning
-            of the document, most of the time it's only necessary to search a few kilobytes of data.
-            Set this to True to force this method to search the entire document.
+        :param search_entire_document: Since an encoding is supposed
+            to declared near the beginning of the document, most of
+            the time it's only necessary to search a few kilobytes of
+            data.  Set this to True to force this method to search the
+            entire document.
+        :return: The declared encoding, if one is found.
         """
         if search_entire_document:
             xml_endpos = html_endpos = len(markup)
@@ -505,9 +716,9 @@ def find_declared_encoding(cls, markup, is_html=False, search_entire_document=Fa
         else:
             res = encoding_res[str]
 
-        xml_re = res['xml']
-        html_re = res['html']
-        declared_encoding = None
+        xml_re = res["xml"]
+        html_re = res["html"]
+        declared_encoding: Optional[_Encoding] = None
         declared_encoding_match = xml_re.search(markup, endpos=xml_endpos)
         if not declared_encoding_match and is_html:
             declared_encoding_match = html_re.search(markup, endpos=html_endpos)
@@ -515,81 +726,80 @@ def find_declared_encoding(cls, markup, is_html=False, search_entire_document=Fa
             declared_encoding = declared_encoding_match.groups()[0]
         if declared_encoding:
             if isinstance(declared_encoding, bytes):
-                declared_encoding = declared_encoding.decode('ascii', 'replace')
+                declared_encoding = declared_encoding.decode("ascii", "replace")
             return declared_encoding.lower()
         return None
 
+
 class UnicodeDammit:
-    """A class for detecting the encoding of a *ML document and
-    converting it to a Unicode string. If the source encoding is
-    windows-1252, can replace MS smart quotes with their HTML or XML
-    equivalents."""
-
-    # This dictionary maps commonly seen values for "charset" in HTML
-    # meta tags to the corresponding Python codec names. It only covers
-    # values that aren't in Python's aliases and can't be determined
-    # by the heuristics in find_codec.
-    CHARSET_ALIASES = {"macintosh": "mac-roman",
-                       "x-sjis": "shift-jis"}
-
-    ENCODINGS_WITH_SMART_QUOTES = [
-        "windows-1252",
-        "iso-8859-1",
-        "iso-8859-2",
-        ]
+    """A class for detecting the encoding of a bytestring containing an
+    HTML or XML document, and decoding it to Unicode. If the source
+    encoding is windows-1252, `UnicodeDammit` can also replace
+    Microsoft smart quotes with their HTML or XML equivalents.
+
+    :param markup: HTML or XML markup in an unknown encoding.
+
+    :param known_definite_encodings: When determining the encoding
+        of ``markup``, these encodings will be tried first, in
+        order. In HTML terms, this corresponds to the "known
+        definite encoding" step defined in `section 13.2.3.1 of the HTML standard <https://html.spec.whatwg.org/multipage/parsing.html#parsing-with-a-known-character-encoding>`_.
+
+    :param user_encodings: These encodings will be tried after the
+        ``known_definite_encodings`` have been tried and failed, and
+        after an attempt to sniff the encoding by looking at a
+        byte order mark has failed. In HTML terms, this
+        corresponds to the step "user has explicitly instructed
+        the user agent to override the document's character
+        encoding", defined in `section 13.2.3.2 of the HTML standard <https://html.spec.whatwg.org/multipage/parsing.html#determining-the-character-encoding>`_.
+
+    :param override_encodings: A **deprecated** alias for
+        ``known_definite_encodings``. Any encodings here will be tried
+        immediately after the encodings in
+        ``known_definite_encodings``.
+
+    :param smart_quotes_to: By default, Microsoft smart quotes will,
+       like all other characters, be converted to Unicode
+       characters. Setting this to ``ascii`` will convert them to ASCII
+       quotes instead.  Setting it to ``xml`` will convert them to XML
+       entity references, and setting it to ``html`` will convert them
+       to HTML entity references.
+
+    :param is_html: If True, ``markup`` is treated as an HTML
+       document. Otherwise it's treated as an XML document.
+
+    :param exclude_encodings: These encodings will not be considered,
+       even if the sniffing code thinks they might make sense.
 
-    def __init__(self, markup, known_definite_encodings=[],
-                 smart_quotes_to=None, is_html=False, exclude_encodings=[],
-                 user_encodings=None, override_encodings=None
-    ):
-        """Constructor.
-
-        :param markup: A bytestring representing markup in an unknown encoding.
-
-        :param known_definite_encodings: When determining the encoding
-            of `markup`, these encodings will be tried first, in
-            order. In HTML terms, this corresponds to the "known
-            definite encoding" step defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#parsing-with-a-known-character-encoding
-
-        :param user_encodings: These encodings will be tried after the
-            `known_definite_encodings` have been tried and failed, and
-            after an attempt to sniff the encoding by looking at a
-            byte order mark has failed. In HTML terms, this
-            corresponds to the step "user has explicitly instructed
-            the user agent to override the document's character
-            encoding", defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#determining-the-character-encoding
-
-        :param override_encodings: A deprecated alias for
-            known_definite_encodings. Any encodings here will be tried
-            immediately after the encodings in
-            known_definite_encodings.
-
-        :param smart_quotes_to: By default, Microsoft smart quotes will, like all other characters, be converted
-           to Unicode characters. Setting this to 'ascii' will convert them to ASCII quotes instead.
-           Setting it to 'xml' will convert them to XML entity references, and setting it to 'html'
-           will convert them to HTML entity references.
-        :param is_html: If True, this markup is considered to be HTML. Otherwise
-            it's assumed to be XML.
-        :param exclude_encodings: These encodings will not be considered, even
-            if the sniffing code thinks they might make sense.
+    """
 
-        """
+    def __init__(
+        self,
+        markup: bytes,
+        known_definite_encodings: Optional[_Encodings] = [],
+        smart_quotes_to: Optional[Literal["ascii", "xml", "html"]] = None,
+        is_html: bool = False,
+        exclude_encodings: Optional[_Encodings] = [],
+        user_encodings: Optional[_Encodings] = None,
+        override_encodings: Optional[_Encodings] = None,
+    ):
         self.smart_quotes_to = smart_quotes_to
         self.tried_encodings = []
         self.contains_replacement_characters = False
         self.is_html = is_html
-        self.log = logging.getLogger(__name__)
+        self.log = getLogger(__name__)
         self.detector = EncodingDetector(
-            markup, known_definite_encodings, is_html, exclude_encodings,
-            user_encodings, override_encodings
+            markup,
+            known_definite_encodings,
+            is_html,
+            exclude_encodings,
+            user_encodings,
+            override_encodings,
         )
 
         # Short-circuit if the data is in Unicode to begin with.
-        if isinstance(markup, str) or markup == '':
-            self.markup = markup
-            self.unicode_markup = str(markup)
+        if isinstance(markup, str):
+            self.markup = markup.encode("utf8")
+            self.unicode_markup = markup
             self.original_encoding = None
             return
 
@@ -613,100 +823,186 @@ def __init__(self, markup, known_definite_encodings=[],
                     u = self._convert_from(encoding, "replace")
                 if u is not None:
                     self.log.warning(
-                            "Some characters could not be decoded, and were "
-                            "replaced with REPLACEMENT CHARACTER."
+                        "Some characters could not be decoded, and were "
+                        "replaced with REPLACEMENT CHARACTER."
                     )
+
                     self.contains_replacement_characters = True
                     break
 
         # If none of that worked, we could at this point force it to
         # ASCII, but that would destroy so much data that I think
         # giving up is better.
-        self.unicode_markup = u
-        if not u:
+        #
+        # Note that this is extremely unlikely, probably impossible,
+        # because the "replace" strategy is so powerful. Even running
+        # the Python binary through Unicode, Dammit gives you Unicode,
+        # albeit Unicode riddled with REPLACEMENT CHARACTER.
+        if u is None:
             self.original_encoding = None
+            self.unicode_markup = None
+        else:
+            self.unicode_markup = u
+
+    #: The original markup, before it was converted to Unicode.
+    #: This is not necessarily the same as what was passed in to the
+    #: constructor, since any byte-order mark will be stripped.
+    markup: bytes
+
+    #: The Unicode version of the markup, following conversion. This
+    #: is set to None if there was simply no way to convert the
+    #: bytestring to Unicode (as with binary data).
+    unicode_markup: Optional[str]
 
-    def _sub_ms_char(self, match):
+    #: This is True if `UnicodeDammit.unicode_markup` contains
+    #: U+FFFD REPLACEMENT_CHARACTER characters which were not present
+    #: in `UnicodeDammit.markup`. These mark character sequences that
+    #: could not be represented in Unicode.
+    contains_replacement_characters: bool
+
+    #: Unicode, Dammit's best guess as to the original character
+    #: encoding of `UnicodeDammit.markup`.
+    original_encoding: Optional[_Encoding]
+
+    #: The strategy used to handle Microsoft smart quotes.
+    smart_quotes_to: Optional[str]
+
+    #: The (encoding, error handling strategy) 2-tuples that were used to
+    #: try and convert the markup to Unicode.
+    tried_encodings: List[Tuple[_Encoding, str]]
+
+    log: Logger  #: :meta private:
+
+    def _sub_ms_char(self, match: re.Match) -> bytes:
         """Changes a MS smart quote character to an XML or HTML
-        entity, or an ASCII character."""
-        orig = match.group(1)
-        if self.smart_quotes_to == 'ascii':
-            sub = self.MS_CHARS_TO_ASCII.get(orig).encode()
+        entity, or an ASCII character.
+
+        TODO: Since this is only used to convert smart quotes, it
+        could be simplified, and MS_CHARS_TO_ASCII made much less
+        parochial.
+        """
+        orig: bytes = match.group(1)
+        sub: bytes
+        if self.smart_quotes_to == "ascii":
+            if orig in self.MS_CHARS_TO_ASCII:
+                sub = self.MS_CHARS_TO_ASCII[orig].encode()
+            else:
+                # Shouldn't happen; substitute the character
+                # with itself.
+                sub = orig
         else:
-            sub = self.MS_CHARS.get(orig)
-            if type(sub) == tuple:
-                if self.smart_quotes_to == 'xml':
-                    sub = '&#x'.encode() + sub[1].encode() + ';'.encode()
+            if orig in self.MS_CHARS:
+                substitutions = self.MS_CHARS[orig]
+                if type(substitutions) is tuple:
+                    if self.smart_quotes_to == "xml":
+                        sub = b"&#x" + substitutions[1].encode() + b";"
+                    else:
+                        sub = b"&" + substitutions[0].encode() + b";"
                 else:
-                    sub = '&'.encode() + sub[0].encode() + ';'.encode()
+                    substitutions = cast(str, substitutions)
+                    sub = substitutions.encode()
             else:
-                sub = sub.encode()
+                # Shouldn't happen; substitute the character
+                # for itself.
+                sub = orig
         return sub
 
-    def _convert_from(self, proposed, errors="strict"):
+    #: This dictionary maps commonly seen values for "charset" in HTML
+    #: meta tags to the corresponding Python codec names. It only covers
+    #: values that aren't in Python's aliases and can't be determined
+    #: by the heuristics in `find_codec`.
+    #:
+    #: :meta hide-value:
+    CHARSET_ALIASES: Dict[str, _Encoding] = {
+        "macintosh": "mac-roman",
+        "x-sjis": "shift-jis",
+    }
+
+    #: A list of encodings that tend to contain Microsoft smart quotes.
+    #:
+    #: :meta hide-value:
+    ENCODINGS_WITH_SMART_QUOTES: _Encodings = [
+        "windows-1252",
+        "iso-8859-1",
+        "iso-8859-2",
+    ]
+
+    def _convert_from(
+        self, proposed: _Encoding, errors: str = "strict"
+    ) -> Optional[str]:
         """Attempt to convert the markup to the proposed encoding.
 
         :param proposed: The name of a character encoding.
+        :param errors: An error handling strategy, used when calling `str`.
+        :return: The converted markup, or `None` if the proposed
+           encoding/error handling strategy didn't work.
         """
-        proposed = self.find_codec(proposed)
-        if not proposed or (proposed, errors) in self.tried_encodings:
+        lookup_result = self.find_codec(proposed)
+        if lookup_result is None or (lookup_result, errors) in self.tried_encodings:
             return None
+        proposed = lookup_result
         self.tried_encodings.append((proposed, errors))
         markup = self.markup
         # Convert smart quotes to HTML if coming from an encoding
         # that might have them.
-        if (self.smart_quotes_to is not None
-            and proposed in self.ENCODINGS_WITH_SMART_QUOTES):
+        if (
+            self.smart_quotes_to is not None
+            and proposed in self.ENCODINGS_WITH_SMART_QUOTES
+        ):
             smart_quotes_re = b"([\x80-\x9f])"
             smart_quotes_compiled = re.compile(smart_quotes_re)
             markup = smart_quotes_compiled.sub(self._sub_ms_char, markup)
 
         try:
-            #print("Trying to convert document to %s (errors=%s)" % (
+            # print("Trying to convert document to %s (errors=%s)" % (
             #    proposed, errors))
             u = self._to_unicode(markup, proposed, errors)
-            self.markup = u
+            self.unicode_markup = u
             self.original_encoding = proposed
-        except Exception as e:
-            #print("That didn't work!")
-            #print(e)
+        except Exception:
+            # print("That didn't work!")
+            # print(e)
             return None
-        #print("Correct encoding: %s" % proposed)
-        return self.markup
+        # print("Correct encoding: %s" % proposed)
+        return self.unicode_markup
 
-    def _to_unicode(self, data, encoding, errors="strict"):
-        """Given a string and its encoding, decodes the string into Unicode.
+    def _to_unicode(
+        self, data: bytes, encoding: _Encoding, errors: str = "strict"
+    ) -> str:
+        """Given a bytestring and its encoding, decodes the string into Unicode.
 
         :param encoding: The name of an encoding.
+        :param errors: An error handling strategy, used when calling `str`.
         """
         return str(data, encoding, errors)
 
     @property
-    def declared_html_encoding(self):
-        """If the markup is an HTML document, returns the encoding declared _within_
-        the document.
+    def declared_html_encoding(self) -> Optional[_Encoding]:
+        """If the markup is an HTML document, returns the encoding, if any,
+        declared *inside* the document.
         """
         if not self.is_html:
             return None
         return self.detector.declared_encoding
 
-    def find_codec(self, charset):
-        """Convert the name of a character set to a codec name.
+    def find_codec(self, charset: _Encoding) -> Optional[str]:
+        """Look up the Python codec corresponding to a given character set.
 
         :param charset: The name of a character set.
-        :return: The name of a codec.
+        :return: The name of a Python codec.
         """
-        value = (self._codec(self.CHARSET_ALIASES.get(charset, charset))
-               or (charset and self._codec(charset.replace("-", "")))
-               or (charset and self._codec(charset.replace("-", "_")))
-               or (charset and charset.lower())
-               or charset
-                )
+        value = (
+            self._codec(self.CHARSET_ALIASES.get(charset, charset))
+            or (charset and self._codec(charset.replace("-", "")))
+            or (charset and self._codec(charset.replace("-", "_")))
+            or (charset and charset.lower())
+            or charset
+        )
         if value:
             return value.lower()
         return None
 
-    def _codec(self, charset):
+    def _codec(self, charset: _Encoding) -> Optional[str]:
         if not charset:
             return charset
         codec = None
@@ -717,343 +1013,473 @@ def _codec(self, charset):
             pass
         return codec
 
-
-    # A partial mapping of ISO-Latin-1 to HTML entities/XML numeric entities.
-    MS_CHARS = {b'\x80': ('euro', '20AC'),
-                b'\x81': ' ',
-                b'\x82': ('sbquo', '201A'),
-                b'\x83': ('fnof', '192'),
-                b'\x84': ('bdquo', '201E'),
-                b'\x85': ('hellip', '2026'),
-                b'\x86': ('dagger', '2020'),
-                b'\x87': ('Dagger', '2021'),
-                b'\x88': ('circ', '2C6'),
-                b'\x89': ('permil', '2030'),
-                b'\x8A': ('Scaron', '160'),
-                b'\x8B': ('lsaquo', '2039'),
-                b'\x8C': ('OElig', '152'),
-                b'\x8D': '?',
-                b'\x8E': ('#x17D', '17D'),
-                b'\x8F': '?',
-                b'\x90': '?',
-                b'\x91': ('lsquo', '2018'),
-                b'\x92': ('rsquo', '2019'),
-                b'\x93': ('ldquo', '201C'),
-                b'\x94': ('rdquo', '201D'),
-                b'\x95': ('bull', '2022'),
-                b'\x96': ('ndash', '2013'),
-                b'\x97': ('mdash', '2014'),
-                b'\x98': ('tilde', '2DC'),
-                b'\x99': ('trade', '2122'),
-                b'\x9a': ('scaron', '161'),
-                b'\x9b': ('rsaquo', '203A'),
-                b'\x9c': ('oelig', '153'),
-                b'\x9d': '?',
-                b'\x9e': ('#x17E', '17E'),
-                b'\x9f': ('Yuml', ''),}
-
-    # A parochial partial mapping of ISO-Latin-1 to ASCII. Contains
-    # horrors like stripping diacritical marks to turn รก into a, but also
-    # contains non-horrors like turning โ€œ into ".
-    MS_CHARS_TO_ASCII = {
-        b'\x80' : 'EUR',
-        b'\x81' : ' ',
-        b'\x82' : ',',
-        b'\x83' : 'f',
-        b'\x84' : ',,',
-        b'\x85' : '...',
-        b'\x86' : '+',
-        b'\x87' : '++',
-        b'\x88' : '^',
-        b'\x89' : '%',
-        b'\x8a' : 'S',
-        b'\x8b' : '<',
-        b'\x8c' : 'OE',
-        b'\x8d' : '?',
-        b'\x8e' : 'Z',
-        b'\x8f' : '?',
-        b'\x90' : '?',
-        b'\x91' : "'",
-        b'\x92' : "'",
-        b'\x93' : '"',
-        b'\x94' : '"',
-        b'\x95' : '*',
-        b'\x96' : '-',
-        b'\x97' : '--',
-        b'\x98' : '~',
-        b'\x99' : '(TM)',
-        b'\x9a' : 's',
-        b'\x9b' : '>',
-        b'\x9c' : 'oe',
-        b'\x9d' : '?',
-        b'\x9e' : 'z',
-        b'\x9f' : 'Y',
-        b'\xa0' : ' ',
-        b'\xa1' : '!',
-        b'\xa2' : 'c',
-        b'\xa3' : 'GBP',
-        b'\xa4' : '$', #This approximation is especially parochial--this is the
-                       #generic currency symbol.
-        b'\xa5' : 'YEN',
-        b'\xa6' : '|',
-        b'\xa7' : 'S',
-        b'\xa8' : '..',
-        b'\xa9' : '',
-        b'\xaa' : '(th)',
-        b'\xab' : '<<',
-        b'\xac' : '!',
-        b'\xad' : ' ',
-        b'\xae' : '(R)',
-        b'\xaf' : '-',
-        b'\xb0' : 'o',
-        b'\xb1' : '+-',
-        b'\xb2' : '2',
-        b'\xb3' : '3',
-        b'\xb4' : ("'", 'acute'),
-        b'\xb5' : 'u',
-        b'\xb6' : 'P',
-        b'\xb7' : '*',
-        b'\xb8' : ',',
-        b'\xb9' : '1',
-        b'\xba' : '(th)',
-        b'\xbb' : '>>',
-        b'\xbc' : '1/4',
-        b'\xbd' : '1/2',
-        b'\xbe' : '3/4',
-        b'\xbf' : '?',
-        b'\xc0' : 'A',
-        b'\xc1' : 'A',
-        b'\xc2' : 'A',
-        b'\xc3' : 'A',
-        b'\xc4' : 'A',
-        b'\xc5' : 'A',
-        b'\xc6' : 'AE',
-        b'\xc7' : 'C',
-        b'\xc8' : 'E',
-        b'\xc9' : 'E',
-        b'\xca' : 'E',
-        b'\xcb' : 'E',
-        b'\xcc' : 'I',
-        b'\xcd' : 'I',
-        b'\xce' : 'I',
-        b'\xcf' : 'I',
-        b'\xd0' : 'D',
-        b'\xd1' : 'N',
-        b'\xd2' : 'O',
-        b'\xd3' : 'O',
-        b'\xd4' : 'O',
-        b'\xd5' : 'O',
-        b'\xd6' : 'O',
-        b'\xd7' : '*',
-        b'\xd8' : 'O',
-        b'\xd9' : 'U',
-        b'\xda' : 'U',
-        b'\xdb' : 'U',
-        b'\xdc' : 'U',
-        b'\xdd' : 'Y',
-        b'\xde' : 'b',
-        b'\xdf' : 'B',
-        b'\xe0' : 'a',
-        b'\xe1' : 'a',
-        b'\xe2' : 'a',
-        b'\xe3' : 'a',
-        b'\xe4' : 'a',
-        b'\xe5' : 'a',
-        b'\xe6' : 'ae',
-        b'\xe7' : 'c',
-        b'\xe8' : 'e',
-        b'\xe9' : 'e',
-        b'\xea' : 'e',
-        b'\xeb' : 'e',
-        b'\xec' : 'i',
-        b'\xed' : 'i',
-        b'\xee' : 'i',
-        b'\xef' : 'i',
-        b'\xf0' : 'o',
-        b'\xf1' : 'n',
-        b'\xf2' : 'o',
-        b'\xf3' : 'o',
-        b'\xf4' : 'o',
-        b'\xf5' : 'o',
-        b'\xf6' : 'o',
-        b'\xf7' : '/',
-        b'\xf8' : 'o',
-        b'\xf9' : 'u',
-        b'\xfa' : 'u',
-        b'\xfb' : 'u',
-        b'\xfc' : 'u',
-        b'\xfd' : 'y',
-        b'\xfe' : 'b',
-        b'\xff' : 'y',
-        }
-
-    # A map used when removing rogue Windows-1252/ISO-8859-1
-    # characters in otherwise UTF-8 documents.
+    #: A partial mapping of ISO-Latin-1 to HTML entities/XML numeric entities.
+    #:
+    #: :meta hide-value:
+    MS_CHARS: Dict[bytes, Union[str, Tuple[str, str]]] = {
+        b"\x80": ("euro", "20AC"),
+        b"\x81": " ",
+        b"\x82": ("sbquo", "201A"),
+        b"\x83": ("fnof", "192"),
+        b"\x84": ("bdquo", "201E"),
+        b"\x85": ("hellip", "2026"),
+        b"\x86": ("dagger", "2020"),
+        b"\x87": ("Dagger", "2021"),
+        b"\x88": ("circ", "2C6"),
+        b"\x89": ("permil", "2030"),
+        b"\x8a": ("Scaron", "160"),
+        b"\x8b": ("lsaquo", "2039"),
+        b"\x8c": ("OElig", "152"),
+        b"\x8d": "?",
+        b"\x8e": ("#x17D", "17D"),
+        b"\x8f": "?",
+        b"\x90": "?",
+        b"\x91": ("lsquo", "2018"),
+        b"\x92": ("rsquo", "2019"),
+        b"\x93": ("ldquo", "201C"),
+        b"\x94": ("rdquo", "201D"),
+        b"\x95": ("bull", "2022"),
+        b"\x96": ("ndash", "2013"),
+        b"\x97": ("mdash", "2014"),
+        b"\x98": ("tilde", "2DC"),
+        b"\x99": ("trade", "2122"),
+        b"\x9a": ("scaron", "161"),
+        b"\x9b": ("rsaquo", "203A"),
+        b"\x9c": ("oelig", "153"),
+        b"\x9d": "?",
+        b"\x9e": ("#x17E", "17E"),
+        b"\x9f": ("Yuml", ""),
+    }
+
+    #: A parochial partial mapping of ISO-Latin-1 to ASCII. Contains
+    #: horrors like stripping diacritical marks to turn รก into a, but also
+    #: contains non-horrors like turning โ€œ into ".
+    #:
+    #: Seriously, don't use this for anything other than removing smart
+    #: quotes.
+    #:
+    #: :meta private:
+    MS_CHARS_TO_ASCII: Dict[bytes, str] = {
+        b"\x80": "EUR",
+        b"\x81": " ",
+        b"\x82": ",",
+        b"\x83": "f",
+        b"\x84": ",,",
+        b"\x85": "...",
+        b"\x86": "+",
+        b"\x87": "++",
+        b"\x88": "^",
+        b"\x89": "%",
+        b"\x8a": "S",
+        b"\x8b": "<",
+        b"\x8c": "OE",
+        b"\x8d": "?",
+        b"\x8e": "Z",
+        b"\x8f": "?",
+        b"\x90": "?",
+        b"\x91": "'",
+        b"\x92": "'",
+        b"\x93": '"',
+        b"\x94": '"',
+        b"\x95": "*",
+        b"\x96": "-",
+        b"\x97": "--",
+        b"\x98": "~",
+        b"\x99": "(TM)",
+        b"\x9a": "s",
+        b"\x9b": ">",
+        b"\x9c": "oe",
+        b"\x9d": "?",
+        b"\x9e": "z",
+        b"\x9f": "Y",
+        b"\xa0": " ",
+        b"\xa1": "!",
+        b"\xa2": "c",
+        b"\xa3": "GBP",
+        b"\xa4": "$",  # This approximation is especially parochial--this is the
+        # generic currency symbol.
+        b"\xa5": "YEN",
+        b"\xa6": "|",
+        b"\xa7": "S",
+        b"\xa8": "..",
+        b"\xa9": "",
+        b"\xaa": "(th)",
+        b"\xab": "<<",
+        b"\xac": "!",
+        b"\xad": " ",
+        b"\xae": "(R)",
+        b"\xaf": "-",
+        b"\xb0": "o",
+        b"\xb1": "+-",
+        b"\xb2": "2",
+        b"\xb3": "3",
+        b"\xb4": "'",
+        b"\xb5": "u",
+        b"\xb6": "P",
+        b"\xb7": "*",
+        b"\xb8": ",",
+        b"\xb9": "1",
+        b"\xba": "(th)",
+        b"\xbb": ">>",
+        b"\xbc": "1/4",
+        b"\xbd": "1/2",
+        b"\xbe": "3/4",
+        b"\xbf": "?",
+        b"\xc0": "A",
+        b"\xc1": "A",
+        b"\xc2": "A",
+        b"\xc3": "A",
+        b"\xc4": "A",
+        b"\xc5": "A",
+        b"\xc6": "AE",
+        b"\xc7": "C",
+        b"\xc8": "E",
+        b"\xc9": "E",
+        b"\xca": "E",
+        b"\xcb": "E",
+        b"\xcc": "I",
+        b"\xcd": "I",
+        b"\xce": "I",
+        b"\xcf": "I",
+        b"\xd0": "D",
+        b"\xd1": "N",
+        b"\xd2": "O",
+        b"\xd3": "O",
+        b"\xd4": "O",
+        b"\xd5": "O",
+        b"\xd6": "O",
+        b"\xd7": "*",
+        b"\xd8": "O",
+        b"\xd9": "U",
+        b"\xda": "U",
+        b"\xdb": "U",
+        b"\xdc": "U",
+        b"\xdd": "Y",
+        b"\xde": "b",
+        b"\xdf": "B",
+        b"\xe0": "a",
+        b"\xe1": "a",
+        b"\xe2": "a",
+        b"\xe3": "a",
+        b"\xe4": "a",
+        b"\xe5": "a",
+        b"\xe6": "ae",
+        b"\xe7": "c",
+        b"\xe8": "e",
+        b"\xe9": "e",
+        b"\xea": "e",
+        b"\xeb": "e",
+        b"\xec": "i",
+        b"\xed": "i",
+        b"\xee": "i",
+        b"\xef": "i",
+        b"\xf0": "o",
+        b"\xf1": "n",
+        b"\xf2": "o",
+        b"\xf3": "o",
+        b"\xf4": "o",
+        b"\xf5": "o",
+        b"\xf6": "o",
+        b"\xf7": "/",
+        b"\xf8": "o",
+        b"\xf9": "u",
+        b"\xfa": "u",
+        b"\xfb": "u",
+        b"\xfc": "u",
+        b"\xfd": "y",
+        b"\xfe": "b",
+        b"\xff": "y",
+    }
+
+    #: A map used when removing rogue Windows-1252/ISO-8859-1
+    #: characters in otherwise UTF-8 documents. Also used when a
+    #: numeric character entity has been incorrectly encoded using the
+    #: character's Windows-1252 encoding.
+    #:
+    #: Note that \\x81, \\x8d, \\x8f, \\x90, and \\x9d are undefined in
+    #: Windows-1252.
+    #:
+    #: :meta hide-value:
+    WINDOWS_1252_TO_UTF8: Dict[int, bytes] = {
+        0x80: b"\xe2\x82\xac",  # โ‚ฌ
+        0x82: b"\xe2\x80\x9a",  # โ€š
+        0x83: b"\xc6\x92",  # ฦ’
+        0x84: b"\xe2\x80\x9e",  # โ€ž
+        0x85: b"\xe2\x80\xa6",  # โ€ฆ
+        0x86: b"\xe2\x80\xa0",  # โ€ 
+        0x87: b"\xe2\x80\xa1",  # โ€ก
+        0x88: b"\xcb\x86",  # ห†
+        0x89: b"\xe2\x80\xb0",  # โ€ฐ
+        0x8A: b"\xc5\xa0",  # ล 
+        0x8B: b"\xe2\x80\xb9",  # โ€น
+        0x8C: b"\xc5\x92",  # ล’
+        0x8E: b"\xc5\xbd",  # ลฝ
+        0x91: b"\xe2\x80\x98",  # โ€˜
+        0x92: b"\xe2\x80\x99",  # โ€™
+        0x93: b"\xe2\x80\x9c",  # โ€œ
+        0x94: b"\xe2\x80\x9d",  # โ€
+        0x95: b"\xe2\x80\xa2",  # โ€ข
+        0x96: b"\xe2\x80\x93",  # โ€“
+        0x97: b"\xe2\x80\x94",  # โ€”
+        0x98: b"\xcb\x9c",  # หœ
+        0x99: b"\xe2\x84\xa2",  # โ„ข
+        0x9A: b"\xc5\xa1",  # ลก
+        0x9B: b"\xe2\x80\xba",  # โ€บ
+        0x9C: b"\xc5\x93",  # ล“
+        0x9E: b"\xc5\xbe",  # ลพ
+        0x9F: b"\xc5\xb8",  # ลธ
+        0xA0: b"\xc2\xa0",  #
+        0xA1: b"\xc2\xa1",  # ยก
+        0xA2: b"\xc2\xa2",  # ยข
+        0xA3: b"\xc2\xa3",  # ยฃ
+        0xA4: b"\xc2\xa4",  # ยค
+        0xA5: b"\xc2\xa5",  # ยฅ
+        0xA6: b"\xc2\xa6",  # ยฆ
+        0xA7: b"\xc2\xa7",  # ยง
+        0xA8: b"\xc2\xa8",  # ยจ
+        0xA9: b"\xc2\xa9",  # ยฉ
+        0xAA: b"\xc2\xaa",  # ยช
+        0xAB: b"\xc2\xab",  # ยซ
+        0xAC: b"\xc2\xac",  # ยฌ
+        0xAD: b"\xc2\xad",  # ยญ
+        0xAE: b"\xc2\xae",  # ยฎ
+        0xAF: b"\xc2\xaf",  # ยฏ
+        0xB0: b"\xc2\xb0",  # ยฐ
+        0xB1: b"\xc2\xb1",  # ยฑ
+        0xB2: b"\xc2\xb2",  # ยฒ
+        0xB3: b"\xc2\xb3",  # ยณ
+        0xB4: b"\xc2\xb4",  # ยด
+        0xB5: b"\xc2\xb5",  # ยต
+        0xB6: b"\xc2\xb6",  # ยถ
+        0xB7: b"\xc2\xb7",  # ยท
+        0xB8: b"\xc2\xb8",  # ยธ
+        0xB9: b"\xc2\xb9",  # ยน
+        0xBA: b"\xc2\xba",  # ยบ
+        0xBB: b"\xc2\xbb",  # ยป
+        0xBC: b"\xc2\xbc",  # ยผ
+        0xBD: b"\xc2\xbd",  # ยฝ
+        0xBE: b"\xc2\xbe",  # ยพ
+        0xBF: b"\xc2\xbf",  # ยฟ
+        0xC0: b"\xc3\x80",  # ร€
+        0xC1: b"\xc3\x81",  # ร
+        0xC2: b"\xc3\x82",  # ร‚
+        0xC3: b"\xc3\x83",  # รƒ
+        0xC4: b"\xc3\x84",  # ร„
+        0xC5: b"\xc3\x85",  # ร…
+        0xC6: b"\xc3\x86",  # ร†
+        0xC7: b"\xc3\x87",  # ร‡
+        0xC8: b"\xc3\x88",  # รˆ
+        0xC9: b"\xc3\x89",  # ร‰
+        0xCA: b"\xc3\x8a",  # รŠ
+        0xCB: b"\xc3\x8b",  # ร‹
+        0xCC: b"\xc3\x8c",  # รŒ
+        0xCD: b"\xc3\x8d",  # ร
+        0xCE: b"\xc3\x8e",  # รŽ
+        0xCF: b"\xc3\x8f",  # ร
+        0xD0: b"\xc3\x90",  # ร
+        0xD1: b"\xc3\x91",  # ร‘
+        0xD2: b"\xc3\x92",  # ร’
+        0xD3: b"\xc3\x93",  # ร“
+        0xD4: b"\xc3\x94",  # ร”
+        0xD5: b"\xc3\x95",  # ร•
+        0xD6: b"\xc3\x96",  # ร–
+        0xD7: b"\xc3\x97",  # ร—
+        0xD8: b"\xc3\x98",  # ร˜
+        0xD9: b"\xc3\x99",  # ร™
+        0xDA: b"\xc3\x9a",  # รš
+        0xDB: b"\xc3\x9b",  # ร›
+        0xDC: b"\xc3\x9c",  # รœ
+        0xDD: b"\xc3\x9d",  # ร
+        0xDE: b"\xc3\x9e",  # รž
+        0xDF: b"\xc3\x9f",  # รŸ
+        0xE0: b"\xc3\xa0",  # ร 
+        0xE1: b"\xa1",  # รก
+        0xE2: b"\xc3\xa2",  # รข
+        0xE3: b"\xc3\xa3",  # รฃ
+        0xE4: b"\xc3\xa4",  # รค
+        0xE5: b"\xc3\xa5",  # รฅ
+        0xE6: b"\xc3\xa6",  # รฆ
+        0xE7: b"\xc3\xa7",  # รง
+        0xE8: b"\xc3\xa8",  # รจ
+        0xE9: b"\xc3\xa9",  # รฉ
+        0xEA: b"\xc3\xaa",  # รช
+        0xEB: b"\xc3\xab",  # รซ
+        0xEC: b"\xc3\xac",  # รฌ
+        0xED: b"\xc3\xad",  # รญ
+        0xEE: b"\xc3\xae",  # รฎ
+        0xEF: b"\xc3\xaf",  # รฏ
+        0xF0: b"\xc3\xb0",  # รฐ
+        0xF1: b"\xc3\xb1",  # รฑ
+        0xF2: b"\xc3\xb2",  # รฒ
+        0xF3: b"\xc3\xb3",  # รณ
+        0xF4: b"\xc3\xb4",  # รด
+        0xF5: b"\xc3\xb5",  # รต
+        0xF6: b"\xc3\xb6",  # รถ
+        0xF7: b"\xc3\xb7",  # รท
+        0xF8: b"\xc3\xb8",  # รธ
+        0xF9: b"\xc3\xb9",  # รน
+        0xFA: b"\xc3\xba",  # รบ
+        0xFB: b"\xc3\xbb",  # รป
+        0xFC: b"\xc3\xbc",  # รผ
+        0xFD: b"\xc3\xbd",  # รฝ
+        0xFE: b"\xc3\xbe",  # รพ
+        0xFF: b"\xc3\xbf",  # รฟ
+    }
+
+    #: :meta private
+    # Note that this isn't all Unicode noncharacters, just the noncontiguous ones that need to be listed.
     #
-    # Note that \x81, \x8d, \x8f, \x90, and \x9d are undefined in
-    # Windows-1252.
-    WINDOWS_1252_TO_UTF8 = {
-        0x80 : b'\xe2\x82\xac', # โ‚ฌ
-        0x82 : b'\xe2\x80\x9a', # โ€š
-        0x83 : b'\xc6\x92',     # ฦ’
-        0x84 : b'\xe2\x80\x9e', # โ€ž
-        0x85 : b'\xe2\x80\xa6', # โ€ฆ
-        0x86 : b'\xe2\x80\xa0', # โ€ 
-        0x87 : b'\xe2\x80\xa1', # โ€ก
-        0x88 : b'\xcb\x86',     # ห†
-        0x89 : b'\xe2\x80\xb0', # โ€ฐ
-        0x8a : b'\xc5\xa0',     # ล 
-        0x8b : b'\xe2\x80\xb9', # โ€น
-        0x8c : b'\xc5\x92',     # ล’
-        0x8e : b'\xc5\xbd',     # ลฝ
-        0x91 : b'\xe2\x80\x98', # โ€˜
-        0x92 : b'\xe2\x80\x99', # โ€™
-        0x93 : b'\xe2\x80\x9c', # โ€œ
-        0x94 : b'\xe2\x80\x9d', # โ€
-        0x95 : b'\xe2\x80\xa2', # โ€ข
-        0x96 : b'\xe2\x80\x93', # โ€“
-        0x97 : b'\xe2\x80\x94', # โ€”
-        0x98 : b'\xcb\x9c',     # หœ
-        0x99 : b'\xe2\x84\xa2', # โ„ข
-        0x9a : b'\xc5\xa1',     # ลก
-        0x9b : b'\xe2\x80\xba', # โ€บ
-        0x9c : b'\xc5\x93',     # ล“
-        0x9e : b'\xc5\xbe',     # ลพ
-        0x9f : b'\xc5\xb8',     # ลธ
-        0xa0 : b'\xc2\xa0',     # ย 
-        0xa1 : b'\xc2\xa1',     # ยก
-        0xa2 : b'\xc2\xa2',     # ยข
-        0xa3 : b'\xc2\xa3',     # ยฃ
-        0xa4 : b'\xc2\xa4',     # ยค
-        0xa5 : b'\xc2\xa5',     # ยฅ
-        0xa6 : b'\xc2\xa6',     # ยฆ
-        0xa7 : b'\xc2\xa7',     # ยง
-        0xa8 : b'\xc2\xa8',     # ยจ
-        0xa9 : b'\xc2\xa9',     # ยฉ
-        0xaa : b'\xc2\xaa',     # ยช
-        0xab : b'\xc2\xab',     # ยซ
-        0xac : b'\xc2\xac',     # ยฌ
-        0xad : b'\xc2\xad',     # ยญ
-        0xae : b'\xc2\xae',     # ยฎ
-        0xaf : b'\xc2\xaf',     # ยฏ
-        0xb0 : b'\xc2\xb0',     # ยฐ
-        0xb1 : b'\xc2\xb1',     # ยฑ
-        0xb2 : b'\xc2\xb2',     # ยฒ
-        0xb3 : b'\xc2\xb3',     # ยณ
-        0xb4 : b'\xc2\xb4',     # ยด
-        0xb5 : b'\xc2\xb5',     # ยต
-        0xb6 : b'\xc2\xb6',     # ยถ
-        0xb7 : b'\xc2\xb7',     # ยท
-        0xb8 : b'\xc2\xb8',     # ยธ
-        0xb9 : b'\xc2\xb9',     # ยน
-        0xba : b'\xc2\xba',     # ยบ
-        0xbb : b'\xc2\xbb',     # ยป
-        0xbc : b'\xc2\xbc',     # ยผ
-        0xbd : b'\xc2\xbd',     # ยฝ
-        0xbe : b'\xc2\xbe',     # ยพ
-        0xbf : b'\xc2\xbf',     # ยฟ
-        0xc0 : b'\xc3\x80',     # ร€
-        0xc1 : b'\xc3\x81',     # ร
-        0xc2 : b'\xc3\x82',     # ร‚
-        0xc3 : b'\xc3\x83',     # รƒ
-        0xc4 : b'\xc3\x84',     # ร„
-        0xc5 : b'\xc3\x85',     # ร…
-        0xc6 : b'\xc3\x86',     # ร†
-        0xc7 : b'\xc3\x87',     # ร‡
-        0xc8 : b'\xc3\x88',     # รˆ
-        0xc9 : b'\xc3\x89',     # ร‰
-        0xca : b'\xc3\x8a',     # รŠ
-        0xcb : b'\xc3\x8b',     # ร‹
-        0xcc : b'\xc3\x8c',     # รŒ
-        0xcd : b'\xc3\x8d',     # ร
-        0xce : b'\xc3\x8e',     # รŽ
-        0xcf : b'\xc3\x8f',     # ร
-        0xd0 : b'\xc3\x90',     # ร
-        0xd1 : b'\xc3\x91',     # ร‘
-        0xd2 : b'\xc3\x92',     # ร’
-        0xd3 : b'\xc3\x93',     # ร“
-        0xd4 : b'\xc3\x94',     # ร”
-        0xd5 : b'\xc3\x95',     # ร•
-        0xd6 : b'\xc3\x96',     # ร–
-        0xd7 : b'\xc3\x97',     # ร—
-        0xd8 : b'\xc3\x98',     # ร˜
-        0xd9 : b'\xc3\x99',     # ร™
-        0xda : b'\xc3\x9a',     # รš
-        0xdb : b'\xc3\x9b',     # ร›
-        0xdc : b'\xc3\x9c',     # รœ
-        0xdd : b'\xc3\x9d',     # ร
-        0xde : b'\xc3\x9e',     # รž
-        0xdf : b'\xc3\x9f',     # รŸ
-        0xe0 : b'\xc3\xa0',     # ร 
-        0xe1 : b'\xa1',         # รก
-        0xe2 : b'\xc3\xa2',     # รข
-        0xe3 : b'\xc3\xa3',     # รฃ
-        0xe4 : b'\xc3\xa4',     # รค
-        0xe5 : b'\xc3\xa5',     # รฅ
-        0xe6 : b'\xc3\xa6',     # รฆ
-        0xe7 : b'\xc3\xa7',     # รง
-        0xe8 : b'\xc3\xa8',     # รจ
-        0xe9 : b'\xc3\xa9',     # รฉ
-        0xea : b'\xc3\xaa',     # รช
-        0xeb : b'\xc3\xab',     # รซ
-        0xec : b'\xc3\xac',     # รฌ
-        0xed : b'\xc3\xad',     # รญ
-        0xee : b'\xc3\xae',     # รฎ
-        0xef : b'\xc3\xaf',     # รฏ
-        0xf0 : b'\xc3\xb0',     # รฐ
-        0xf1 : b'\xc3\xb1',     # รฑ
-        0xf2 : b'\xc3\xb2',     # รฒ
-        0xf3 : b'\xc3\xb3',     # รณ
-        0xf4 : b'\xc3\xb4',     # รด
-        0xf5 : b'\xc3\xb5',     # รต
-        0xf6 : b'\xc3\xb6',     # รถ
-        0xf7 : b'\xc3\xb7',     # รท
-        0xf8 : b'\xc3\xb8',     # รธ
-        0xf9 : b'\xc3\xb9',     # รน
-        0xfa : b'\xc3\xba',     # รบ
-        0xfb : b'\xc3\xbb',     # รป
-        0xfc : b'\xc3\xbc',     # รผ
-        0xfd : b'\xc3\xbd',     # รฝ
-        0xfe : b'\xc3\xbe',     # รพ
-        }
-
-    MULTIBYTE_MARKERS_AND_SIZES = [
-        (0xc2, 0xdf, 2), # 2-byte characters start with a byte C2-DF
-        (0xe0, 0xef, 3), # 3-byte characters start with E0-EF
-        (0xf0, 0xf4, 4), # 4-byte characters start with F0-F4
-        ]
-
-    FIRST_MULTIBYTE_MARKER = MULTIBYTE_MARKERS_AND_SIZES[0][0]
-    LAST_MULTIBYTE_MARKER = MULTIBYTE_MARKERS_AND_SIZES[-1][1]
+    # "A noncharacter is a code point that is in the range
+    # U+FDD0 to U+FDEF, inclusive, or U+FFFE, U+FFFF, U+1FFFE,
+    # U+1FFFF, U+2FFFE, U+2FFFF, U+3FFFE, U+3FFFF, U+4FFFE,
+    # U+4FFFF, U+5FFFE, U+5FFFF, U+6FFFE, U+6FFFF, U+7FFFE,
+    # U+7FFFF, U+8FFFE, U+8FFFF, U+9FFFE, U+9FFFF, U+AFFFE,
+    # U+AFFFF, U+BFFFE, U+BFFFF, U+CFFFE, U+CFFFF, U+DFFFE,
+    # U+DFFFF, U+EFFFE, U+EFFFF, U+FFFFE, U+FFFFF, U+10FFFE,
+    # or U+10FFFF."
+    ENUMERATED_NONCHARACTERS: Set[int] = set([0xfffe, 0xffff,
+                                              0x1fffe, 0x1ffff,
+                                              0x2fffe, 0x2ffff,
+                                              0x3fffe, 0x3ffff,
+                                              0x4fffe, 0x4ffff,
+                                              0x5fffe, 0x5ffff,
+                                              0x6fffe, 0x6ffff,
+                                              0x7fffe, 0x7ffff,
+                                              0x8fffe, 0x8ffff,
+                                              0x9fffe, 0x9ffff,
+                                              0xafffe, 0xaffff,
+                                              0xbfffe, 0xbffff,
+                                              0xcfffe, 0xcffff,
+                                              0xdfffe, 0xdffff,
+                                              0xefffe, 0xeffff,
+                                              0xffffe, 0xfffff,
+                                              0x10fffe, 0x10ffff])
+
+    #: :meta private:
+    MULTIBYTE_MARKERS_AND_SIZES: List[Tuple[int, int, int]] = [
+        (0xC2, 0xDF, 2),  # 2-byte characters start with a byte C2-DF
+        (0xE0, 0xEF, 3),  # 3-byte characters start with E0-EF
+        (0xF0, 0xF4, 4),  # 4-byte characters start with F0-F4
+    ]
+
+    #: :meta private:
+    FIRST_MULTIBYTE_MARKER: int = MULTIBYTE_MARKERS_AND_SIZES[0][0]
+
+    #: :meta private:
+    LAST_MULTIBYTE_MARKER: int = MULTIBYTE_MARKERS_AND_SIZES[-1][1]
 
     @classmethod
-    def detwingle(cls, in_bytes, main_encoding="utf8",
-                  embedded_encoding="windows-1252"):
+    def numeric_character_reference(cls, numeric:int) -> Tuple[str, bool]:
+        """This (mostly) implements the algorithm described in "Numeric character
+        reference end state" from the HTML spec:
+        https://html.spec.whatwg.org/multipage/parsing.html#numeric-character-reference-end-state
+
+        The algorithm is designed to convert numeric character references like "&#9731;"
+        to Unicode characters like "โ˜ƒ".
+
+        :return: A 2-tuple (character, replaced). `character` is the Unicode
+        character corresponding to the numeric reference and `replaced` is
+        whether or not an unresolvable character was replaced with REPLACEMENT
+        CHARACTER.
+        """
+        replacement = "\ufffd"
+
+        if numeric == 0x00:
+            # "If the number is 0x00, then this is a
+            # null-character-reference parse error. Set the character
+            # reference code to 0xFFFD."
+            return replacement, True
+
+        if numeric > 0x10ffff:
+            # "If the number is greater than 0x10FFFF, then this is a
+            # character-reference-outside-unicode-range parse
+            # error. Set the character reference code to 0xFFFD."
+            return replacement, True
+
+        if numeric >= 0xd800 and numeric <= 0xdfff:
+            # "If the number is a surrogate, then this is a
+            # surrogate-character-reference parse error. Set the
+            # character reference code to 0xFFFD."
+            return replacement, True
+
+        if (numeric >= 0xfdd0 and numeric <= 0xfdef) or numeric in cls.ENUMERATED_NONCHARACTERS:
+            # "If the number is a noncharacter, then this is a
+            # noncharacter-character-reference parse error."
+            #
+            # "The parser resolves such character references as-is."
+            #
+            # I'm not sure what "as-is" means but I think it means that we act
+            # like there was no error condition.
+            return chr(numeric), False
+
+        # "If the number is 0x0D, or a control that's not ASCII whitespace,
+        # then this is a control-character-reference parse error."
+        #
+        # "A control is a C0 control or a code point in the range
+        # U+007F DELETE to U+009F APPLICATION PROGRAM COMMAND,
+        # inclusive."
+        #
+        # "A C0 control is a code point in the range U+0000 NULL to U+001F INFORMATION SEPARATOR ONE, inclusive."
+        #
+        # "The parser resolves such character references as-is except C1 control references that are replaced."
+
+        # First, let's replace the control references that can be replaced.
+        if numeric >= 0x80 and numeric <= 0x9f and numeric in cls.WINDOWS_1252_TO_UTF8:
+            # "If the number is one of the numbers in the first column of the
+            # following table, then find the row with that number in the first
+            # column, and set the character reference code to the number in the
+            # second column of that row."
+            #
+            # This is an attempt to catch characters that were encoded to numeric
+            # entities using their Windows-1252 encodings rather than their UTF-8
+            # encodings.
+            return cls.WINDOWS_1252_TO_UTF8[numeric].decode("utf8"), False
+
+        # Now all that's left are references that should be resolved as-is. This
+        # is also the default path for non-weird character references.
+        try:
+            return chr(numeric), False
+        except (ValueError, OverflowError):
+            # This shouldn't happen, since these cases should have been handled
+            # above, but if it does, return REPLACEMENT CHARACTER
+            return replacement, True
+
+    @classmethod
+    def detwingle(
+        cls,
+        in_bytes: bytes,
+        main_encoding: _Encoding = "utf8",
+        embedded_encoding: _Encoding = "windows-1252",
+    ) -> bytes:
         """Fix characters from one encoding embedded in some other encoding.
 
         Currently the only situation supported is Windows-1252 (or its
         subset ISO-8859-1), embedded in UTF-8.
 
         :param in_bytes: A bytestring that you suspect contains
-            characters from multiple encodings. Note that this _must_
+            characters from multiple encodings. Note that this *must*
             be a bytestring. If you've already converted the document
             to Unicode, you're too late.
-        :param main_encoding: The primary encoding of `in_bytes`.
+        :param main_encoding: The primary encoding of ``in_bytes``.
         :param embedded_encoding: The encoding that was used to embed characters
             in the main document.
-        :return: A bytestring in which `embedded_encoding`
-          characters have been converted to their `main_encoding`
-          equivalents.
+        :return: A bytestring similar to ``in_bytes``, in which
+          ``embedded_encoding`` characters have been converted to
+          their ``main_encoding`` equivalents.
         """
-        if embedded_encoding.replace('_', '-').lower() not in (
-            'windows-1252', 'windows_1252'):
+        if embedded_encoding.replace("_", "-").lower() not in (
+            "windows-1252",
+            "windows_1252",
+        ):
             raise NotImplementedError(
                 "Windows-1252 and ISO-8859-1 are the only currently supported "
-                "embedded encodings.")
+                "embedded encodings."
+            )
 
-        if main_encoding.lower() not in ('utf8', 'utf-8'):
+        if main_encoding.lower() not in ("utf8", "utf-8"):
             raise NotImplementedError(
-                "UTF-8 is the only currently supported main encoding.")
+                "UTF-8 is the only currently supported main encoding."
+            )
 
         byte_chunks = []
 
@@ -1061,11 +1487,7 @@ def detwingle(cls, in_bytes, main_encoding="utf8",
         pos = 0
         while pos < len(in_bytes):
             byte = in_bytes[pos]
-            if not isinstance(byte, int):
-                # Python 2.x
-                byte = ord(byte)
-            if (byte >= cls.FIRST_MULTIBYTE_MARKER
-                and byte <= cls.LAST_MULTIBYTE_MARKER):
+            if byte >= cls.FIRST_MULTIBYTE_MARKER and byte <= cls.LAST_MULTIBYTE_MARKER:
                 # This is the start of a UTF-8 multibyte character. Skip
                 # to the end.
                 for start, end, size in cls.MULTIBYTE_MARKERS_AND_SIZES:
@@ -1091,5 +1513,4 @@ def detwingle(cls, in_bytes, main_encoding="utf8",
         else:
             # Store the final chunk.
             byte_chunks.append(in_bytes[chunk_start:])
-        return b''.join(byte_chunks)
-
+        return b"".join(byte_chunks)
diff --git a/libs/bs4/diagnose.py b/libs/bs4/diagnose.py
index e079772e69..4d11239c47 100644
--- a/libs/bs4/diagnose.py
+++ b/libs/bs4/diagnose.py
@@ -9,20 +9,30 @@
 import bs4
 from bs4 import BeautifulSoup, __version__
 from bs4.builder import builder_registry
+from typing import (
+    Any,
+    IO,
+    List,
+    Optional,
+    Tuple,
+    TYPE_CHECKING,
+)
+
+if TYPE_CHECKING:
+    from bs4._typing import _IncomingMarkup
 
-import os
 import pstats
 import random
 import tempfile
 import time
 import traceback
 import sys
-import cProfile
 
-def diagnose(data):
+
+def diagnose(data: "_IncomingMarkup") -> None:
     """Diagnostic suite for isolating common problems.
 
-    :param data: A string containing markup that needs to be explained.
+    :param data: Some markup that needs to be explained.
     :return: None; diagnostics are printed to standard output.
     """
     print(("Diagnostic running on Beautiful Soup %s" % __version__))
@@ -35,29 +45,28 @@ def diagnose(data):
                 break
         else:
             basic_parsers.remove(name)
-            print((
-                "I noticed that %s is not installed. Installing it may help." %
-                name))
+            print(
+                ("I noticed that %s is not installed. Installing it may help." % name)
+            )
 
-    if 'lxml' in basic_parsers:
+    if "lxml" in basic_parsers:
         basic_parsers.append("lxml-xml")
         try:
-            from lxml import etree
-            print(("Found lxml version %s" % ".".join(map(str,etree.LXML_VERSION))))
-        except ImportError as e:
-            print(
-                "lxml is not installed or couldn't be imported.")
+            from lxml import etree # type:ignore
 
+            print(("Found lxml version %s" % ".".join(map(str, etree.LXML_VERSION))))
+        except ImportError:
+            print("lxml is not installed or couldn't be imported.")
 
-    if 'html5lib' in basic_parsers:
+    if "html5lib" in basic_parsers:
         try:
             import html5lib
+
             print(("Found html5lib version %s" % html5lib.__version__))
-        except ImportError as e:
-            print(
-                "html5lib is not installed or couldn't be imported.")
+        except ImportError:
+            print("html5lib is not installed or couldn't be imported.")
 
-    if hasattr(data, 'read'):
+    if hasattr(data, "read"):
         data = data.read()
 
     for parser in basic_parsers:
@@ -66,7 +75,7 @@ def diagnose(data):
         try:
             soup = BeautifulSoup(data, features=parser)
             success = True
-        except Exception as e:
+        except Exception:
             print(("%s could not parse the markup." % parser))
             traceback.print_exc()
         if success:
@@ -75,7 +84,8 @@ def diagnose(data):
 
         print(("-" * 80))
 
-def lxml_trace(data, html=True, **kwargs):
+
+def lxml_trace(data: "_IncomingMarkup", html: bool = True, **kwargs: Any) -> None:
     """Print out the lxml events that occur during parsing.
 
     This lets you see how lxml parses a document when no Beautiful
@@ -88,15 +98,16 @@ def lxml_trace(data, html=True, **kwargs):
        if False, lxml's XML parser will be used.
     """
     from lxml import etree
-    recover = kwargs.pop('recover', True)
+
+    recover = kwargs.pop("recover", True)
     if isinstance(data, str):
         data = data.encode("utf8")
-    reader = BytesIO(data)
-    for event, element in etree.iterparse(
-        reader, html=html, recover=recover, **kwargs
-    ):
+    if not isinstance(data, IO):
+        reader = BytesIO(data)
+    for event, element in etree.iterparse(reader, html=html, recover=recover, **kwargs):
         print(("%s, %4s, %s" % (event, element.tag, element.text)))
 
+
 class AnnouncingParser(HTMLParser):
     """Subclass of HTMLParser that announces parse events, without doing
     anything else.
@@ -105,37 +116,43 @@ class AnnouncingParser(HTMLParser):
     document. The easiest way to do this is to call `htmlparser_trace`.
     """
 
-    def _p(self, s):
+    def _p(self, s: str) -> None:
         print(s)
 
-    def handle_starttag(self, name, attrs):
-        self._p("%s START" % name)
+    def handle_starttag(
+        self,
+        name: str,
+        attrs: List[Tuple[str, Optional[str]]],
+        handle_empty_element: bool = True,
+    ) -> None:
+        self._p(f"{name} {attrs} START")
 
-    def handle_endtag(self, name):
+    def handle_endtag(self, name: str, check_already_closed: bool = True) -> None:
         self._p("%s END" % name)
 
-    def handle_data(self, data):
+    def handle_data(self, data: str) -> None:
         self._p("%s DATA" % data)
 
-    def handle_charref(self, name):
+    def handle_charref(self, name: str) -> None:
         self._p("%s CHARREF" % name)
 
-    def handle_entityref(self, name):
+    def handle_entityref(self, name: str) -> None:
         self._p("%s ENTITYREF" % name)
 
-    def handle_comment(self, data):
+    def handle_comment(self, data: str) -> None:
         self._p("%s COMMENT" % data)
 
-    def handle_decl(self, data):
+    def handle_decl(self, data: str) -> None:
         self._p("%s DECL" % data)
 
-    def unknown_decl(self, data):
+    def unknown_decl(self, data: str) -> None:
         self._p("%s UNKNOWN-DECL" % data)
 
-    def handle_pi(self, data):
+    def handle_pi(self, data: str) -> None:
         self._p("%s PI" % data)
 
-def htmlparser_trace(data):
+
+def htmlparser_trace(data: str) -> None:
     """Print out the HTMLParser events that occur during parsing.
 
     This lets you see how HTMLParser parses a document when no
@@ -146,12 +163,17 @@ def htmlparser_trace(data):
     parser = AnnouncingParser()
     parser.feed(data)
 
-_vowels = "aeiou"
-_consonants = "bcdfghjklmnpqrstvwxyz"
 
-def rword(length=5):
-    "Generate a random word-like string."
-    s = ''
+_vowels: str = "aeiou"
+_consonants: str = "bcdfghjklmnpqrstvwxyz"
+
+
+def rword(length: int = 5) -> str:
+    """Generate a random word-like string.
+
+    :meta private:
+    """
+    s = ""
     for i in range(length):
         if i % 2 == 0:
             t = _consonants
@@ -160,74 +182,87 @@ def rword(length=5):
         s += random.choice(t)
     return s
 
-def rsentence(length=4):
-    "Generate a random sentence-like string."
-    return " ".join(rword(random.randint(4,9)) for i in range(length))
-        
-def rdoc(num_elements=1000):
-    """Randomly generate an invalid HTML document."""
-    tag_names = ['p', 'div', 'span', 'i', 'b', 'script', 'table']
+
+def rsentence(length: int = 4) -> str:
+    """Generate a random sentence-like string.
+
+    :meta private:
+    """
+    return " ".join(rword(random.randint(4, 9)) for i in range(length))
+
+
+def rdoc(num_elements: int = 1000) -> str:
+    """Randomly generate an invalid HTML document.
+
+    :meta private:
+    """
+    tag_names = ["p", "div", "span", "i", "b", "script", "table"]
     elements = []
     for i in range(num_elements):
-        choice = random.randint(0,3)
+        choice = random.randint(0, 3)
         if choice == 0:
             # New tag.
             tag_name = random.choice(tag_names)
             elements.append("<%s>" % tag_name)
         elif choice == 1:
-            elements.append(rsentence(random.randint(1,4)))
+            elements.append(rsentence(random.randint(1, 4)))
         elif choice == 2:
             # Close a tag.
             tag_name = random.choice(tag_names)
             elements.append("</%s>" % tag_name)
     return "<html>" + "\n".join(elements) + "</html>"
 
-def benchmark_parsers(num_elements=100000):
+
+def benchmark_parsers(num_elements: int = 100000) -> None:
     """Very basic head-to-head performance benchmark."""
     print(("Comparative parser benchmark on Beautiful Soup %s" % __version__))
     data = rdoc(num_elements)
     print(("Generated a large invalid HTML document (%d bytes)." % len(data)))
-    
-    for parser in ["lxml", ["lxml", "html"], "html5lib", "html.parser"]:
+
+    for parser_name in ["lxml", ["lxml", "html"], "html5lib", "html.parser"]:
         success = False
         try:
             a = time.time()
-            soup = BeautifulSoup(data, parser)
+            BeautifulSoup(data, parser_name)
             b = time.time()
             success = True
-        except Exception as e:
-            print(("%s could not parse the markup." % parser))
+        except Exception:
+            print(("%s could not parse the markup." % parser_name))
             traceback.print_exc()
         if success:
-            print(("BS4+%s parsed the markup in %.2fs." % (parser, b-a)))
+            print(("BS4+%s parsed the markup in %.2fs." % (parser_name, b - a)))
 
     from lxml import etree
+
     a = time.time()
     etree.HTML(data)
     b = time.time()
-    print(("Raw lxml parsed the markup in %.2fs." % (b-a)))
+    print(("Raw lxml parsed the markup in %.2fs." % (b - a)))
 
     import html5lib
+
     parser = html5lib.HTMLParser()
     a = time.time()
     parser.parse(data)
     b = time.time()
-    print(("Raw html5lib parsed the markup in %.2fs." % (b-a)))
+    print(("Raw html5lib parsed the markup in %.2fs." % (b - a)))
+
 
-def profile(num_elements=100000, parser="lxml"):
+def profile(num_elements: int = 100000, parser: str = "lxml") -> None:
     """Use Python's profiler on a randomly generated document."""
     filehandle = tempfile.NamedTemporaryFile()
     filename = filehandle.name
 
     data = rdoc(num_elements)
     vars = dict(bs4=bs4, data=data, parser=parser)
-    cProfile.runctx('bs4.BeautifulSoup(data, parser)' , vars, vars, filename)
+    cProfile.runctx("bs4.BeautifulSoup(data, parser)", vars, vars, filename)
 
     stats = pstats.Stats(filename)
     # stats.strip_dirs()
     stats.sort_stats("cumulative")
-    stats.print_stats('_html5lib|bs4', 50)
+    stats.print_stats("_html5lib|bs4", 50)
+
 
 # If this file is run as a script, standard input is diagnosed.
-if __name__ == '__main__':
+if __name__ == "__main__":
     diagnose(sys.stdin.read())
diff --git a/libs/bs4/element.py b/libs/bs4/element.py
index 0aefe734b2..dd07d8ebca 100644
--- a/libs/bs4/element.py
+++ b/libs/bs4/element.py
@@ -1,76 +1,155 @@
+from __future__ import annotations
+
 # Use of this source code is governed by the MIT license.
 __license__ = "MIT"
 
-try:
-    from collections.abc import Callable # Python 3.6
-except ImportError as e:
-    from collections import Callable
 import re
-import sys
 import warnings
 
 from bs4.css import CSS
+from bs4._deprecation import (
+    _deprecated,
+    _deprecated_alias,
+    _deprecated_function_alias,
+)
 from bs4.formatter import (
     Formatter,
     HTMLFormatter,
     XMLFormatter,
 )
+from bs4._warnings import AttributeResemblesVariableWarning
+
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Generic,
+    Iterable,
+    Iterator,
+    List,
+    Mapping,
+    MutableSequence,
+    Optional,
+    Pattern,
+    Set,
+    TYPE_CHECKING,
+    Tuple,
+    Type,
+    TypeVar,
+    Union,
+    cast,
+    overload,
+)
+from typing_extensions import (
+    Self,
+    TypeAlias,
+)
 
-DEFAULT_OUTPUT_ENCODING = "utf-8"
-
-nonwhitespace_re = re.compile(r"\S+")
-
-# NOTE: This isn't used as of 4.7.0. I'm leaving it for a little bit on
-# the off chance someone imported it for their own use.
-whitespace_re = re.compile(r"\s+")
-
-def _alias(attr):
-    """Alias one attribute name to another for backward compatibility"""
-    @property
-    def alias(self):
-        return getattr(self, attr)
-
-    @alias.setter
-    def alias(self):
-        return setattr(self, attr)
-    return alias
-
-
-# These encodings are recognized by Python (so PageElement.encode
-# could theoretically support them) but XML and HTML don't recognize
-# them (so they should not show up in an XML or HTML document as that
-# document's encoding).
-#
-# If an XML document is encoded in one of these encodings, no encoding
-# will be mentioned in the XML declaration. If an HTML document is
-# encoded in one of these encodings, and the HTML document has a
-# <meta> tag that mentions an encoding, the encoding will be given as
-# the empty string.
-#
-# Source:
-# https://docs.python.org/3/library/codecs.html#python-specific-encodings
-PYTHON_SPECIFIC_ENCODINGS = set([
-    "idna",
-    "mbcs",
-    "oem",
-    "palmos",
-    "punycode",
-    "raw_unicode_escape",
-    "undefined",
-    "unicode_escape",
-    "raw-unicode-escape",
-    "unicode-escape",
-    "string-escape",
-    "string_escape",
-])
+if TYPE_CHECKING:
+    from bs4 import BeautifulSoup
+    from bs4.builder import TreeBuilder
+    from bs4.filter import ElementFilter
+    from bs4.formatter import (
+        _EntitySubstitutionFunction,
+        _FormatterOrName,
+    )
+    from bs4._typing import (
+        _AtMostOneElement,
+        _AtMostOneTag,
+        _AtMostOneNavigableString,
+        _AttributeValue,
+        _AttributeValues,
+        _Encoding,
+        _InsertableElement,
+        _OneElement,
+        _QueryResults,
+        _RawOrProcessedAttributeValues,
+        _StrainableElement,
+        _StrainableAttribute,
+        _StrainableAttributes,
+        _StrainableString,
+        _SomeNavigableStrings,
+        _SomeTags,
+    )
+
+_OneOrMoreStringTypes: TypeAlias = Union[
+    Type["NavigableString"], Iterable[Type["NavigableString"]]
+]
+
+_FindMethodName: TypeAlias = Optional[Union["_StrainableElement", "ElementFilter"]]
+
+# Deprecated module-level attributes.
+# See https://peps.python.org/pep-0562/
+_deprecated_names = dict(
+    whitespace_re="The {name} attribute was deprecated in version 4.7.0. If you need it, make your own copy."
+)
+#: :meta private:
+_deprecated_whitespace_re: Pattern[str] = re.compile(r"\s+")
+
+
+def __getattr__(name: str) -> Any:
+    if name in _deprecated_names:
+        message = _deprecated_names[name]
+        warnings.warn(message.format(name=name), DeprecationWarning, stacklevel=2)
+
+        return globals()[f"_deprecated_{name}"]
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+#: Documents output by Beautiful Soup will be encoded with
+#: this encoding unless you specify otherwise.
+DEFAULT_OUTPUT_ENCODING: str = "utf-8"
+
+#: A regular expression that can be used to split on whitespace.
+nonwhitespace_re: Pattern[str] = re.compile(r"\S+")
+
+#: These encodings are recognized by Python (so `Tag.encode`
+#: could theoretically support them) but XML and HTML don't recognize
+#: them (so they should not show up in an XML or HTML document as that
+#: document's encoding).
+#:
+#: If an XML document is encoded in one of these encodings, no encoding
+#: will be mentioned in the XML declaration. If an HTML document is
+#: encoded in one of these encodings, and the HTML document has a
+#: <meta> tag that mentions an encoding, the encoding will be given as
+#: the empty string.
+#:
+#: Source:
+#: Python documentation, `Python Specific Encodings <https://docs.python.org/3/library/codecs.html#python-specific-encodings>`_
+PYTHON_SPECIFIC_ENCODINGS: Set[_Encoding] = set(
+    [
+        "idna",
+        "mbcs",
+        "oem",
+        "palmos",
+        "punycode",
+        "raw_unicode_escape",
+        "undefined",
+        "unicode_escape",
+        "raw-unicode-escape",
+        "unicode-escape",
+        "string-escape",
+        "string_escape",
+    ]
+)
 
 
 class NamespacedAttribute(str):
-    """A namespaced string (e.g. 'xml:lang') that remembers the namespace
-    ('xml') and the name ('lang') that were used to create it.
+    """A namespaced attribute (e.g. the 'xml:lang' in 'xml:lang="en"')
+    which remembers the namespace prefix ('xml') and the name ('lang')
+    that were used to create it.
     """
 
-    def __new__(cls, prefix, name=None, namespace=None):
+    prefix: Optional[str]
+    name: Optional[str]
+    namespace: Optional[str]
+
+    def __new__(
+        cls,
+        prefix: Optional[str],
+        name: Optional[str] = None,
+        namespace: Optional[str] = None,
+    ) -> Self:
         if not name:
             # This is the default namespace. Its name "has no value"
             # per https://www.w3.org/TR/xml-names/#defaulting
@@ -88,73 +167,226 @@ def __new__(cls, prefix, name=None, namespace=None):
         obj.namespace = namespace
         return obj
 
+
 class AttributeValueWithCharsetSubstitution(str):
-    """A stand-in object for a character encoding specified in HTML."""
+    """An abstract class standing in for a character encoding specified
+    inside an HTML ``<meta>`` tag.
+
+    Subclasses exist for each place such a character encoding might be
+    found: either inside the ``charset`` attribute
+    (`CharsetMetaAttributeValue`) or inside the ``content`` attribute
+    (`ContentMetaAttributeValue`)
+
+    This allows Beautiful Soup to replace that part of the HTML file
+    with a different encoding when ouputting a tree as a string.
+    """
+
+    # The original, un-encoded value of the ``content`` attribute.
+    #: :meta private:
+    original_value: str
+
+    def substitute_encoding(self, eventual_encoding: str) -> str:
+        """Do whatever's necessary in this implementation-specific
+        portion an HTML document to substitute in a specific encoding.
+        """
+        raise NotImplementedError()
+
 
 class CharsetMetaAttributeValue(AttributeValueWithCharsetSubstitution):
-    """A generic stand-in for the value of a meta tag's 'charset' attribute.
+    """A generic stand-in for the value of a ``<meta>`` tag's ``charset``
+    attribute.
 
-    When Beautiful Soup parses the markup '<meta charset="utf8">', the
-    value of the 'charset' attribute will be one of these objects.
+    When Beautiful Soup parses the markup ``<meta charset="utf8">``, the
+    value of the ``charset`` attribute will become one of these objects.
+
+    If the document is later encoded to an encoding other than UTF-8, its
+    ``<meta>`` tag will mention the new encoding instead of ``utf8``.
     """
 
-    def __new__(cls, original_value):
+    def __new__(cls, original_value: str) -> Self:
+        # We don't need to use the original value for anything, but
+        # it might be useful for the user to know.
         obj = str.__new__(cls, original_value)
         obj.original_value = original_value
         return obj
 
-    def encode(self, encoding):
+    def substitute_encoding(self, eventual_encoding: _Encoding = "utf-8") -> str:
         """When an HTML document is being encoded to a given encoding, the
-        value of a meta tag's 'charset' is the name of the encoding.
+        value of a ``<meta>`` tag's ``charset`` becomes the name of
+        the encoding.
+        """
+        if eventual_encoding in PYTHON_SPECIFIC_ENCODINGS:
+            return ""
+        return eventual_encoding
+
+
+class AttributeValueList(List[str]):
+    """Class for the list used to hold the values of attributes which
+    have multiple values (such as HTML's 'class'). It's just a regular
+    list, but you can subclass it and pass it in to the TreeBuilder
+    constructor as attribute_value_list_class, to have your subclass
+    instantiated instead.
+    """
+
+
+class AttributeDict(Dict[Any,Any]):
+    """Superclass for the dictionary used to hold a tag's
+    attributes. You can use this, but it's just a regular dict with no
+    special logic.
+    """
+
+
+class XMLAttributeDict(AttributeDict):
+    """A dictionary for holding a Tag's attributes, which processes
+    incoming values for consistency with the HTML spec.
+    """
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        """Set an attribute value, possibly modifying it to comply with
+        the XML spec.
+
+        This just means converting common non-string values to
+        strings: XML attributes may have "any literal string as a
+        value."
+        """
+        if value is None:
+            value = ""
+        if isinstance(value, bool):
+            # XML does not define any rules for boolean attributes.
+            # Preserve the old Beautiful Soup behavior (a bool that
+            # gets converted to a string on output) rather than
+            # guessing what the value should be.
+            pass
+        elif isinstance(value, (int, float)):
+            # It's dangerous to convert _every_ attribute value into a
+            # plain string, since an attribute value may be a more
+            # sophisticated string-like object
+            # (e.g. CharsetMetaAttributeValue). But we can definitely
+            # convert numeric values and booleans, which are the most common.
+            value = str(value)
+
+        super().__setitem__(key, value)
+
+
+class HTMLAttributeDict(AttributeDict):
+    """A dictionary for holding a Tag's attributes, which processes
+    incoming values for consistency with the HTML spec, which says
+    'Attribute values are a mixture of text and character
+    references...'
+
+    Basically, this means converting common non-string values into
+    strings, like XMLAttributeDict, though HTML also has some rules
+    around boolean attributes that XML doesn't have.
+    """
+
+    def __setitem__(self, key: str, value: Any) -> None:
+        """Set an attribute value, possibly modifying it to comply
+        with the HTML spec,
         """
-        if encoding in PYTHON_SPECIFIC_ENCODINGS:
-            return ''
-        return encoding
+        if value in (False, None):
+            # 'The values "true" and "false" are not allowed on
+            # boolean attributes. To represent a false value, the
+            # attribute has to be omitted altogether.'
+            if key in self:
+                del self[key]
+            return
+        if isinstance(value, bool):
+            # 'If the [boolean] attribute is present, its value must
+            # either be the empty string or a value that is an ASCII
+            # case-insensitive match for the attribute's canonical
+            # name, with no leading or trailing whitespace.'
+            #
+            # [fixme] It's not clear to me whether "canonical name"
+            # means fully-qualified name, unqualified name, or
+            # (probably not) name with namespace prefix. For now I'm
+            # going with unqualified name.
+            if isinstance(key, NamespacedAttribute):
+                value = key.name
+            else:
+                value = key
+        elif isinstance(value, (int, float)):
+            # See note in XMLAttributeDict for the reasoning why we
+            # only do this to numbers.
+            value = str(value)
+        super().__setitem__(key, value)
 
 
 class ContentMetaAttributeValue(AttributeValueWithCharsetSubstitution):
-    """A generic stand-in for the value of a meta tag's 'content' attribute.
+    """A generic stand-in for the value of a ``<meta>`` tag's ``content``
+    attribute.
 
     When Beautiful Soup parses the markup:
-     <meta http-equiv="content-type" content="text/html; charset=utf8">
+     ``<meta http-equiv="content-type" content="text/html; charset=utf8">``
 
-    The value of the 'content' attribute will be one of these objects.
-    """
+    The value of the ``content`` attribute will become one of these objects.
 
-    CHARSET_RE = re.compile(r"((^|;)\s*charset=)([^;]*)", re.M)
+    If the document is later encoded to an encoding other than UTF-8, its
+    ``<meta>`` tag will mention the new encoding instead of ``utf8``.
+    """
 
-    def __new__(cls, original_value):
-        match = cls.CHARSET_RE.search(original_value)
-        if match is None:
-            # No substitution necessary.
-            return str.__new__(str, original_value)
+    #: Match the 'charset' argument inside the 'content' attribute
+    #: of a <meta> tag.
+    #: :meta private:
+    CHARSET_RE: Pattern[str] = re.compile(r"((^|;)\s*charset=)([^;]*)", re.M)
 
+    def __new__(cls, original_value: str) -> Self:
+        cls.CHARSET_RE.search(original_value)
         obj = str.__new__(cls, original_value)
         obj.original_value = original_value
         return obj
 
-    def encode(self, encoding):
-        if encoding in PYTHON_SPECIFIC_ENCODINGS:
-            return ''
-        def rewrite(match):
-            return match.group(1) + encoding
+    def substitute_encoding(self, eventual_encoding: _Encoding = "utf-8") -> str:
+        """When an HTML document is being encoded to a given encoding, the
+        value of the ``charset=`` in a ``<meta>`` tag's ``content`` becomes
+        the name of the encoding.
+        """
+        if eventual_encoding in PYTHON_SPECIFIC_ENCODINGS:
+            return self.CHARSET_RE.sub("", self.original_value)
+
+        def rewrite(match: re.Match[str]) -> str:
+            return match.group(1) + eventual_encoding
+
         return self.CHARSET_RE.sub(rewrite, self.original_value)
 
 
 class PageElement(object):
-    """Contains the navigational information for some part of the page:
-    that is, its current location in the parse tree.
+    """An abstract class representing a single element in the parse tree.
 
-    NavigableString, Tag, etc. are all subclasses of PageElement.
+    `NavigableString`, `Tag`, etc. are all subclasses of
+    `PageElement`. For this reason you'll see a lot of methods that
+    return `PageElement`, but you'll never see an actual `PageElement`
+    object. For the most part you can think of `PageElement` as
+    meaning "a `Tag` or a `NavigableString`."
     """
 
-    # In general, we can't tell just by looking at an element whether
-    # it's contained in an XML document or an HTML document. But for
-    # Tags (q.v.) we can store this information at parse time.
-    known_xml = None
-
-    def setup(self, parent=None, previous_element=None, next_element=None,
-              previous_sibling=None, next_sibling=None):
+    #: In general, we can't tell just by looking at an element whether
+    #: it's contained in an XML document or an HTML document. But for
+    #: `Tag` objects (q.v.) we can store this information at parse time.
+    #: :meta private:
+    known_xml: Optional[bool] = None
+
+    #: Whether or not this element has been decomposed from the tree
+    #: it was created in.
+    _decomposed: bool
+
+    parent: Optional[Tag]
+    next_element: _AtMostOneElement
+    previous_element: _AtMostOneElement
+    next_sibling: _AtMostOneElement
+    previous_sibling: _AtMostOneElement
+
+    #: Whether or not this element is hidden from generated output.
+    #: Only the `BeautifulSoup` object itself is hidden.
+    hidden: bool = False
+
+    def setup(
+        self,
+        parent: Optional[Tag] = None,
+        previous_element: _AtMostOneElement = None,
+        next_element: _AtMostOneElement = None,
+        previous_sibling: _AtMostOneElement = None,
+        next_sibling: _AtMostOneElement = None,
+    ) -> None:
         """Sets up the initial relations between this element and
         other elements.
 
@@ -163,7 +395,7 @@ def setup(self, parent=None, previous_element=None, next_element=None,
         :param previous_element: The element parsed immediately before
             this one.
 
-        :param next_element: The element parsed immediately before
+        :param next_element: The element parsed immediately after
             this one.
 
         :param previous_sibling: The most recently encountered element
@@ -175,7 +407,7 @@ def setup(self, parent=None, previous_element=None, next_element=None,
         self.parent = parent
 
         self.previous_element = previous_element
-        if previous_element is not None:
+        if self.previous_element is not None:
             self.previous_element.next_element = self
 
         self.next_element = next_element
@@ -186,15 +418,18 @@ def setup(self, parent=None, previous_element=None, next_element=None,
         if self.next_sibling is not None:
             self.next_sibling.previous_sibling = self
 
-        if (previous_sibling is None
-            and self.parent is not None and self.parent.contents):
+        if (
+            previous_sibling is None
+            and self.parent is not None
+            and self.parent.contents
+        ):
             previous_sibling = self.parent.contents[-1]
 
         self.previous_sibling = previous_sibling
-        if previous_sibling is not None:
+        if self.previous_sibling is not None:
             self.previous_sibling.next_sibling = self
 
-    def format_string(self, s, formatter):
+    def format_string(self, s: str, formatter: Optional[_FormatterOrName]) -> str:
         """Format the given string using the given formatter.
 
         :param s: A string.
@@ -207,28 +442,36 @@ def format_string(self, s, formatter):
         output = formatter.substitute(s)
         return output
 
-    def formatter_for_name(self, formatter):
+    def formatter_for_name(
+        self, formatter_name: Union[_FormatterOrName, _EntitySubstitutionFunction]
+    ) -> Formatter:
         """Look up or create a Formatter for the given identifier,
         if necessary.
 
-        :param formatter: Can be a Formatter object (used as-is), a
+        :param formatter: Can be a `Formatter` object (used as-is), a
             function (used as the entity substitution hook for an
-            XMLFormatter or HTMLFormatter), or a string (used to look
-            up an XMLFormatter or HTMLFormatter in the appropriate
-            registry.
+            `bs4.formatter.XMLFormatter` or
+            `bs4.formatter.HTMLFormatter`), or a string (used to look
+            up an `bs4.formatter.XMLFormatter` or
+            `bs4.formatter.HTMLFormatter` in the appropriate registry.
+
         """
-        if isinstance(formatter, Formatter):
-            return formatter
+        if isinstance(formatter_name, Formatter):
+            return formatter_name
+        c: type[Formatter]
+        registry: Mapping[Optional[str], Formatter]
         if self._is_xml:
             c = XMLFormatter
+            registry = XMLFormatter.REGISTRY
         else:
             c = HTMLFormatter
-        if isinstance(formatter, Callable):
-            return c(entity_substitution=formatter)
-        return c.REGISTRY[formatter]
+            registry = HTMLFormatter.REGISTRY
+        if callable(formatter_name):
+            return c(entity_substitution=formatter_name)
+        return registry[formatter_name]
 
     @property
-    def _is_xml(self):
+    def _is_xml(self) -> bool:
         """Is this element part of an XML tree or an HTML tree?
 
         This is used in formatter_for_name, when deciding whether an
@@ -247,31 +490,49 @@ def _is_xml(self):
             # This is the top-level object. It should have .known_xml set
             # from tree creation. If not, take a guess--BS is usually
             # used on HTML markup.
-            return getattr(self, 'is_xml', False)
+            return getattr(self, "is_xml", False)
         return self.parent._is_xml
 
-    nextSibling = _alias("next_sibling")  # BS3
-    previousSibling = _alias("previous_sibling")  # BS3
+    nextSibling = _deprecated_alias("nextSibling", "next_sibling", "4.0.0")
+    previousSibling = _deprecated_alias("previousSibling", "previous_sibling", "4.0.0")
+
+    def __deepcopy__(self, memo: Dict[Any, Any], recursive: bool = False) -> Self:
+        raise NotImplementedError()
+
+    def __copy__(self) -> Self:
+        """A copy of a PageElement can only be a deep copy, because
+        only one PageElement can occupy a given place in a parse tree.
+        """
+        return self.__deepcopy__({})
+
+    default: Iterable[type[NavigableString]] = tuple()  #: :meta private:
 
-    default = object()
-    def _all_strings(self, strip=False, types=default):
+    def _all_strings(
+        self, strip: bool = False, types: Iterable[type[NavigableString]] = default
+    ) -> Iterator[str]:
         """Yield all strings of certain classes, possibly stripping them.
 
-        This is implemented differently in Tag and NavigableString.
+        This is implemented differently in `Tag` and `NavigableString`.
         """
         raise NotImplementedError()
 
     @property
-    def stripped_strings(self):
-        """Yield all strings in this PageElement, stripping them first.
+    def stripped_strings(self) -> Iterator[str]:
+        """Yield all interesting strings in this PageElement, stripping them
+        first.
 
-        :yield: A sequence of stripped strings.
+        See `Tag` for information on which strings are considered
+        interesting in a given context.
         """
         for string in self._all_strings(True):
             yield string
 
-    def get_text(self, separator="", strip=False,
-                 types=default):
+    def get_text(
+        self,
+        separator: str = "",
+        strip: bool = False,
+        types: Iterable[Type[NavigableString]] = default,
+    ) -> str:
         """Get all child strings of this PageElement, concatenated using the
         given separator.
 
@@ -289,24 +550,25 @@ def get_text(self, separator="", strip=False,
 
         :return: A string.
         """
-        return separator.join([s for s in self._all_strings(
-                    strip, types=types)])
+        return separator.join([s for s in self._all_strings(strip, types=types)])
+
     getText = get_text
     text = property(get_text)
 
-    def replace_with(self, *args):
-        """Replace this PageElement with one or more PageElements, keeping the
-        rest of the tree the same.
+    def replace_with(self, *args: _InsertableElement) -> Self:
+        """Replace this `PageElement` with one or more other elements,
+        objects, keeping the rest of the tree the same.
 
-        :param args: One or more PageElements.
-        :return: `self`, no longer part of the tree.
+        :return: This `PageElement`, no longer part of the tree.
         """
         if self.parent is None:
             raise ValueError(
                 "Cannot replace one element with another when the "
-                "element to be replaced is not part of a tree.")
+                "element to be replaced is not part of a tree."
+            )
         if len(args) == 1 and args[0] is self:
-            return
+            # Replacing an element with itself is a no-op.
+            return self
         if any(x is self.parent for x in args):
             raise ValueError("Cannot replace a Tag with its parent.")
         old_parent = self.parent
@@ -315,81 +577,107 @@ def replace_with(self, *args):
         for idx, replace_with in enumerate(args, start=my_index):
             old_parent.insert(idx, replace_with)
         return self
-    replaceWith = replace_with  # BS3
-
-    def unwrap(self):
-        """Replace this PageElement with its contents.
 
-        :return: `self`, no longer part of the tree.
-        """
-        my_parent = self.parent
-        if self.parent is None:
-            raise ValueError(
-                "Cannot replace an element with its contents when that"
-                "element is not part of a tree.")
-        my_index = self.parent.index(self)
-        self.extract(_self_index=my_index)
-        for child in reversed(self.contents[:]):
-            my_parent.insert(my_index, child)
-        return self
-    replace_with_children = unwrap
-    replaceWithChildren = unwrap  # BS3
+    replaceWith = _deprecated_function_alias("replaceWith", "replace_with", "4.0.0")
 
-    def wrap(self, wrap_inside):
-        """Wrap this PageElement inside another one.
+    def wrap(self, wrap_inside: Tag) -> Tag:
+        """Wrap this `PageElement` inside a `Tag`.
 
-        :param wrap_inside: A PageElement.
-        :return: `wrap_inside`, occupying the position in the tree that used
-           to be occupied by `self`, and with `self` inside it.
+        :return: ``wrap_inside``, occupying the position in the tree that used
+           to be occupied by this object, and with this object now inside it.
         """
         me = self.replace_with(wrap_inside)
         wrap_inside.append(me)
         return wrap_inside
 
-    def extract(self, _self_index=None):
+    def extract(self, _self_index: Optional[int] = None) -> Self:
         """Destructively rips this element out of the tree.
 
         :param _self_index: The location of this element in its parent's
            .contents, if known. Passing this in allows for a performance
            optimization.
 
-        :return: `self`, no longer part of the tree.
+        :return: this `PageElement`, no longer part of the tree.
         """
         if self.parent is not None:
             if _self_index is None:
                 _self_index = self.parent.index(self)
             del self.parent.contents[_self_index]
 
-        #Find the two elements that would be next to each other if
-        #this element (and any children) hadn't been parsed. Connect
-        #the two.
+        # Find the two elements that would be next to each other if
+        # this element (and any children) hadn't been parsed. Connect
+        # the two.
         last_child = self._last_descendant()
+
+        # last_child can't be None because we passed accept_self=True
+        # into _last_descendant. Worst case, last_child will be
+        # self. Making this cast removes several mypy complaints later
+        # on as we manipulate last_child.
+        last_child = cast(PageElement, last_child)
         next_element = last_child.next_element
 
-        if (self.previous_element is not None and
-            self.previous_element is not next_element):
-            self.previous_element.next_element = next_element
+        if self.previous_element is not None:
+            if self.previous_element is not next_element:
+                self.previous_element.next_element = next_element
         if next_element is not None and next_element is not self.previous_element:
             next_element.previous_element = self.previous_element
         self.previous_element = None
         last_child.next_element = None
 
         self.parent = None
-        if (self.previous_sibling is not None
-            and self.previous_sibling is not self.next_sibling):
+        if (
+            self.previous_sibling is not None
+            and self.previous_sibling is not self.next_sibling
+        ):
             self.previous_sibling.next_sibling = self.next_sibling
-        if (self.next_sibling is not None
-            and self.next_sibling is not self.previous_sibling):
+        if (
+            self.next_sibling is not None
+            and self.next_sibling is not self.previous_sibling
+        ):
             self.next_sibling.previous_sibling = self.previous_sibling
         self.previous_sibling = self.next_sibling = None
         return self
 
-    def _last_descendant(self, is_initialized=True, accept_self=True):
+    def decompose(self) -> None:
+        """Recursively destroys this `PageElement` and its children.
+
+        The element will be removed from the tree and wiped out; so
+        will everything beneath it.
+
+        The behavior of a decomposed `PageElement` is undefined and you
+        should never use one for anything, but if you need to *check*
+        whether an element has been decomposed, you can use the
+        `PageElement.decomposed` property.
+        """
+        self.extract()
+        e: _AtMostOneElement = self
+        next_up: _AtMostOneElement = None
+        while e is not None:
+            next_up = e.next_element
+            e.__dict__.clear()
+            if isinstance(e, Tag):
+                e.name = ""
+                e.contents = []
+            e._decomposed = True
+            e = next_up
+
+    def _last_descendant(
+        self, is_initialized: bool = True, accept_self: bool = True
+    ) -> _AtMostOneElement:
         """Finds the last element beneath this object to be parsed.
 
-        :param is_initialized: Has `setup` been called on this PageElement
-            yet?
-        :param accept_self: Is `self` an acceptable answer to the question?
+        Special note to help you figure things out if your type
+        checking is tripped up by the fact that this method returns
+        _AtMostOneElement instead of PageElement: the only time
+        this method returns None is if `accept_self` is False and the
+        `PageElement` has no children--either it's a NavigableString
+        or an empty Tag.
+
+        :param is_initialized: Has `PageElement.setup` been called on
+            this `PageElement` yet?
+
+        :param accept_self: Is ``self`` an acceptable answer to the
+            question?
         """
         if is_initialized and self.next_sibling is not None:
             last_child = self.next_sibling.previous_element
@@ -400,163 +688,98 @@ def _last_descendant(self, is_initialized=True, accept_self=True):
         if not accept_self and last_child is self:
             last_child = None
         return last_child
-    # BS3: Not part of the API!
-    _lastRecursiveChild = _last_descendant
-
-    def insert(self, position, new_child):
-        """Insert a new PageElement in the list of this PageElement's children.
-
-        This works the same way as `list.insert`.
-
-        :param position: The numeric position that should be occupied
-           in `self.children` by the new PageElement.
-        :param new_child: A PageElement.
-        """
-        if new_child is None:
-            raise ValueError("Cannot insert None into a tag.")
-        if new_child is self:
-            raise ValueError("Cannot insert a tag into itself.")
-        if (isinstance(new_child, str)
-            and not isinstance(new_child, NavigableString)):
-            new_child = NavigableString(new_child)
-
-        from bs4 import BeautifulSoup
-        if isinstance(new_child, BeautifulSoup):
-            # We don't want to end up with a situation where one BeautifulSoup
-            # object contains another. Insert the children one at a time.
-            for subchild in list(new_child.contents):
-                self.insert(position, subchild)
-                position += 1
-            return
-        position = min(position, len(self.contents))
-        if hasattr(new_child, 'parent') and new_child.parent is not None:
-            # We're 'inserting' an element that's already one
-            # of this object's children.
-            if new_child.parent is self:
-                current_index = self.index(new_child)
-                if current_index < position:
-                    # We're moving this element further down the list
-                    # of this object's children. That means that when
-                    # we extract this element, our target index will
-                    # jump down one.
-                    position -= 1
-            new_child.extract()
-
-        new_child.parent = self
-        previous_child = None
-        if position == 0:
-            new_child.previous_sibling = None
-            new_child.previous_element = self
-        else:
-            previous_child = self.contents[position - 1]
-            new_child.previous_sibling = previous_child
-            new_child.previous_sibling.next_sibling = new_child
-            new_child.previous_element = previous_child._last_descendant(False)
-        if new_child.previous_element is not None:
-            new_child.previous_element.next_element = new_child
-
-        new_childs_last_element = new_child._last_descendant(False)
-
-        if position >= len(self.contents):
-            new_child.next_sibling = None
-
-            parent = self
-            parents_next_sibling = None
-            while parents_next_sibling is None and parent is not None:
-                parents_next_sibling = parent.next_sibling
-                parent = parent.parent
-                if parents_next_sibling is not None:
-                    # We found the element that comes next in the document.
-                    break
-            if parents_next_sibling is not None:
-                new_childs_last_element.next_element = parents_next_sibling
-            else:
-                # The last element of this tag is the last element in
-                # the document.
-                new_childs_last_element.next_element = None
-        else:
-            next_child = self.contents[position]
-            new_child.next_sibling = next_child
-            if new_child.next_sibling is not None:
-                new_child.next_sibling.previous_sibling = new_child
-            new_childs_last_element.next_element = next_child
-
-        if new_childs_last_element.next_element is not None:
-            new_childs_last_element.next_element.previous_element = new_childs_last_element
-        self.contents.insert(position, new_child)
 
-    def append(self, tag):
-        """Appends the given PageElement to the contents of this one.
+    _lastRecursiveChild = _deprecated_alias(
+        "_lastRecursiveChild", "_last_descendant", "4.0.0"
+    )
 
-        :param tag: A PageElement.
-        """
-        self.insert(len(self.contents), tag)
-
-    def extend(self, tags):
-        """Appends the given PageElements to this one's contents.
-
-        :param tags: A list of PageElements. If a single Tag is
-            provided instead, this PageElement's contents will be extended
-            with that Tag's contents.
-        """
-        if isinstance(tags, Tag):
-            tags = tags.contents
-        if isinstance(tags, list):
-            # Moving items around the tree may change their position in
-            # the original list. Make a list that won't change.
-            tags = list(tags)
-        for tag in tags:
-            self.append(tag)
-
-    def insert_before(self, *args):
+    def insert_before(self, *args: _InsertableElement) -> List[PageElement]:
         """Makes the given element(s) the immediate predecessor of this one.
 
-        All the elements will have the same parent, and the given elements
-        will be immediately before this one.
+        All the elements will have the same `PageElement.parent` as
+        this one, and the given elements will occur immediately before
+        this one.
 
         :param args: One or more PageElements.
+
+        :return The list of PageElements that were inserted.
         """
         parent = self.parent
         if parent is None:
-            raise ValueError(
-                "Element has no parent, so 'before' has no meaning.")
+            raise ValueError("Element has no parent, so 'before' has no meaning.")
         if any(x is self for x in args):
-                raise ValueError("Can't insert an element before itself.")
+            raise ValueError("Can't insert an element before itself.")
+        results: List[PageElement] = []
         for predecessor in args:
             # Extract first so that the index won't be screwed up if they
             # are siblings.
             if isinstance(predecessor, PageElement):
                 predecessor.extract()
             index = parent.index(self)
-            parent.insert(index, predecessor)
+            results.extend(parent.insert(index, predecessor))
+
+        return results
 
-    def insert_after(self, *args):
+    def insert_after(self, *args: _InsertableElement) -> List[PageElement]:
         """Makes the given element(s) the immediate successor of this one.
 
-        The elements will have the same parent, and the given elements
-        will be immediately after this one.
+        The elements will have the same `PageElement.parent` as this
+        one, and the given elements will occur immediately after this
+        one.
 
         :param args: One or more PageElements.
+
+        :return The list of PageElements that were inserted.
         """
         # Do all error checking before modifying the tree.
         parent = self.parent
         if parent is None:
-            raise ValueError(
-                "Element has no parent, so 'after' has no meaning.")
+            raise ValueError("Element has no parent, so 'after' has no meaning.")
         if any(x is self for x in args):
             raise ValueError("Can't insert an element after itself.")
 
         offset = 0
+        results: List[PageElement] = []
         for successor in args:
             # Extract first so that the index won't be screwed up if they
             # are siblings.
             if isinstance(successor, PageElement):
                 successor.extract()
             index = parent.index(self)
-            parent.insert(index+1+offset, successor)
+            results.extend(parent.insert(index + 1 + offset, successor))
             offset += 1
 
-    def find_next(self, name=None, attrs={}, string=None, **kwargs):
+        return results
+
+    # For the suppression of this pyright warning, see discussion here:
+    # https://github.com/microsoft/pyright/issues/10929
+    @overload
+    def find_next( # pyright: ignore [reportOverlappingOverload]
+            self,
+            name: _FindMethodName = None,
+            attrs: Optional[_StrainableAttributes] = None,
+            string: None=None,
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneTag:
+        ...
+
+    @overload
+    def find_next(
+            self,
+            name: None=None,
+            attrs: None=None,
+            string: _StrainableString="",
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneNavigableString:
+        ...
+
+    def find_next(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_AtMostOneTag,_AtMostOneNavigableString,_AtMostOneElement]:
         """Find the first PageElement that matches the given criteria and
         appears later in the document than this PageElement.
 
@@ -564,36 +787,99 @@ def find_next(self, name=None, attrs={}, string=None, **kwargs):
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
+        :param attrs: Additional filters on attribute values.
         :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
+        :kwargs: Additional filters on attribute values.
         """
         return self._find_one(self.find_all_next, name, attrs, string, **kwargs)
-    findNext = find_next  # BS3
 
-    def find_all_next(self, name=None, attrs={}, string=None, limit=None,
-                    **kwargs):
-        """Find all PageElements that match the given criteria and appear
-        later in the document than this PageElement.
+    findNext = _deprecated_function_alias("findNext", "find_next", "4.0.0")
+
+    @overload
+    def find_all_next( # pyright: ignore [reportOverlappingOverload]
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: None = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        ...
+
+    @overload
+    def find_all_next(
+        self,
+        name: None = None,
+        attrs: None = None,
+        string: _StrainableString = "",
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeNavigableStrings:
+        ...
+
+    def find_all_next(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_SomeTags,_SomeNavigableStrings,_QueryResults]:
+        """Find all `PageElement` objects that match the given criteria and
+        appear later in the document than this `PageElement`.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
+        :param attrs: Additional filters on attribute values.
         :param string: A filter for a NavigableString with specific text.
         :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet containing PageElements.
+        :param _stacklevel: Used internally to improve warning messages.
+        :kwargs: Additional filters on attribute values.
         """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(name, attrs, string, limit, self.next_elements,
-                              _stacklevel=_stacklevel+1, **kwargs)
-    findAllNext = find_all_next  # BS3
+        return self._find_all(
+            name,
+            attrs,
+            string,
+            limit,
+            self.next_elements,
+            _stacklevel=_stacklevel + 1,
+            **kwargs,
+        )
 
-    def find_next_sibling(self, name=None, attrs={}, string=None, **kwargs):
+    findAllNext = _deprecated_function_alias("findAllNext", "find_all_next", "4.0.0")
+
+    @overload
+    def find_next_sibling( # pyright: ignore [reportOverlappingOverload]
+            self,
+            name: _FindMethodName = None,
+            attrs: Optional[_StrainableAttributes] = None,
+            string: None=None,
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneTag:
+        ...
+
+    @overload
+    def find_next_sibling(
+            self,
+            name: None=None,
+            attrs: None=None,
+            string: _StrainableString="",
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneNavigableString:
+        ...
+
+    def find_next_sibling(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_AtMostOneTag,_AtMostOneNavigableString,_AtMostOneElement]:
         """Find the closest sibling to this PageElement that matches the
         given criteria and appears later in the document.
 
@@ -601,102 +887,263 @@ def find_next_sibling(self, name=None, attrs={}, string=None, **kwargs):
         online documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        return self._find_one(self.find_next_siblings, name, attrs, string,
-                             **kwargs)
-    findNextSibling = find_next_sibling  # BS3
-
-    def find_next_siblings(self, name=None, attrs={}, string=None, limit=None,
-                           **kwargs):
-        """Find all siblings of this PageElement that match the given criteria
+        :param attrs: Additional filters on attribute values.
+        :param string: A filter for a `NavigableString` with specific text.
+        :kwargs: Additional filters on attribute values.
+        """
+        return self._find_one(self.find_next_siblings, name, attrs, string, **kwargs)
+
+    findNextSibling = _deprecated_function_alias(
+        "findNextSibling", "find_next_sibling", "4.0.0"
+    )
+
+    @overload
+    def find_next_siblings( # pyright: ignore [reportOverlappingOverload]
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: None = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        ...
+
+    @overload
+    def find_next_siblings(
+        self,
+        name: None = None,
+        attrs: None = None,
+        string: _StrainableString = "",
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeNavigableStrings:
+        ...
+
+    def find_next_siblings(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_SomeTags,_SomeNavigableStrings,_QueryResults]:
+        """Find all siblings of this `PageElement` that match the given criteria
         and appear later in the document.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
+        :param attrs: Additional filters on attribute values.
+        :param string: A filter for a `NavigableString` with specific text.
         :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
+        :param _stacklevel: Used internally to improve warning messages.
+        :kwargs: Additional filters on attribute values.
         """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
         return self._find_all(
-            name, attrs, string, limit,
-            self.next_siblings, _stacklevel=_stacklevel+1, **kwargs
+            name,
+            attrs,
+            string,
+            limit,
+            self.next_siblings,
+            _stacklevel=_stacklevel + 1,
+            **kwargs,
         )
-    findNextSiblings = find_next_siblings   # BS3
-    fetchNextSiblings = find_next_siblings  # BS2
 
-    def find_previous(self, name=None, attrs={}, string=None, **kwargs):
-        """Look backwards in the document from this PageElement and find the
-        first PageElement that matches the given criteria.
+    findNextSiblings = _deprecated_function_alias(
+        "findNextSiblings", "find_next_siblings", "4.0.0"
+    )
+    fetchNextSiblings = _deprecated_function_alias(
+        "fetchNextSiblings", "find_next_siblings", "3.0.0"
+    )
+
+    @overload
+    def find_previous( # pyright: ignore [reportOverlappingOverload]
+            self,
+            name: _FindMethodName = None,
+            attrs: Optional[_StrainableAttributes] = None,
+            string: None=None,
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneTag:
+        ...
+
+    @overload
+    def find_previous(
+            self,
+            name: None=None,
+            attrs: None=None,
+            string: _StrainableString="",
+           **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneNavigableString:
+        ...
+
+    def find_previous(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_AtMostOneTag,_AtMostOneNavigableString,_AtMostOneElement]:
+        """Look backwards in the document from this `PageElement` and find the
+        first `PageElement` that matches the given criteria.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        return self._find_one(
-            self.find_all_previous, name, attrs, string, **kwargs)
-    findPrevious = find_previous  # BS3
-
-    def find_all_previous(self, name=None, attrs={}, string=None, limit=None,
-                        **kwargs):
-        """Look backwards in the document from this PageElement and find all
-        PageElements that match the given criteria.
+        :param attrs: Additional filters on attribute values.
+        :param string: A filter for a `NavigableString` with specific text.
+        :kwargs: Additional filters on attribute values.
+        """
+        return self._find_one(self.find_all_previous, name, attrs, string, **kwargs)
+
+    findPrevious = _deprecated_function_alias("findPrevious", "find_previous", "3.0.0")
+
+    @overload
+    def find_all_previous( # pyright: ignore [reportOverlappingOverload]
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: None = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        ...
+
+    @overload
+    def find_all_previous(
+        self,
+        name: None = None,
+        attrs: None = None,
+        string: _StrainableString = "",
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeNavigableStrings:
+        ...
+
+    def find_all_previous(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_SomeTags,_SomeNavigableStrings,_QueryResults]:
+        """Look backwards in the document from this `PageElement` and find all
+        `PageElement` that match the given criteria.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
+        :param attrs: Additional filters on attribute values.
+        :param string: A filter for a `NavigableString` with specific text.
         :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
+        :param _stacklevel: Used internally to improve warning messages.
+        :kwargs: Additional filters on attribute values.
         """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
         return self._find_all(
-            name, attrs, string, limit, self.previous_elements,
-            _stacklevel=_stacklevel+1, **kwargs
+            name,
+            attrs,
+            string,
+            limit,
+            self.previous_elements,
+            _stacklevel=_stacklevel + 1,
+            **kwargs,
         )
-    findAllPrevious = find_all_previous  # BS3
-    fetchPrevious = find_all_previous    # BS2
 
-    def find_previous_sibling(self, name=None, attrs={}, string=None, **kwargs):
-        """Returns the closest sibling to this PageElement that matches the
+    findAllPrevious = _deprecated_function_alias(
+        "findAllPrevious", "find_all_previous", "4.0.0"
+    )
+    fetchAllPrevious = _deprecated_function_alias(
+        "fetchAllPrevious", "find_all_previous", "3.0.0"
+    )
+
+    @overload
+    def find_previous_sibling( # pyright: ignore [reportOverlappingOverload]
+            self,
+            name: _FindMethodName = None,
+            attrs: Optional[_StrainableAttributes] = None,
+            string: None=None,
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneTag:
+        ...
+
+    @overload
+    def find_previous_sibling(
+            self,
+            name: None=None,
+            attrs: None=None,
+            string: _StrainableString="",
+           **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneNavigableString:
+        ...
+
+    def find_previous_sibling(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_AtMostOneTag,_AtMostOneNavigableString,_AtMostOneElement]:
+        """Returns the closest sibling to this `PageElement` that matches the
         given criteria and appears earlier in the document.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
+        :param attrs: Additional filters on attribute values.
+        :param string: A filter for a `NavigableString` with specific text.
+        :kwargs: Additional filters on attribute values.
         """
-        return self._find_one(self.find_previous_siblings, name, attrs, string,
-                             **kwargs)
-    findPreviousSibling = find_previous_sibling  # BS3
+        return self._find_one(
+            self.find_previous_siblings, name, attrs, string, **kwargs
+        )
 
-    def find_previous_siblings(self, name=None, attrs={}, string=None,
-                               limit=None, **kwargs):
+    findPreviousSibling = _deprecated_function_alias(
+        "findPreviousSibling", "find_previous_sibling", "4.0.0"
+    )
+
+    @overload
+    def find_previous_siblings( # pyright: ignore [reportOverlappingOverload]
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: None = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        ...
+
+    @overload
+    def find_previous_siblings(
+        self,
+        name: None = None,
+        attrs: None = None,
+        string: _StrainableString = "",
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeNavigableStrings:
+        ...
+
+    def find_previous_siblings(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        string: Optional[_StrainableString] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_SomeTags,_SomeNavigableStrings,_QueryResults]:
         """Returns all siblings to this PageElement that match the
         given criteria and appear earlier in the document.
 
@@ -704,22 +1151,35 @@ def find_previous_siblings(self, name=None, attrs={}, string=None,
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
+        :param attrs: Additional filters on attribute values.
         :param string: A filter for a NavigableString with specific text.
         :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
+        :param _stacklevel: Used internally to improve warning messages.
+        :kwargs: Additional filters on attribute values.
         """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
         return self._find_all(
-            name, attrs, string, limit,
-            self.previous_siblings, _stacklevel=_stacklevel+1, **kwargs
+            name,
+            attrs,
+            string,
+            limit,
+            self.previous_siblings,
+            _stacklevel=_stacklevel + 1,
+            **kwargs,
         )
-    findPreviousSiblings = find_previous_siblings   # BS3
-    fetchPreviousSiblings = find_previous_siblings  # BS2
 
-    def find_parent(self, name=None, attrs={}, **kwargs):
+    findPreviousSiblings = _deprecated_function_alias(
+        "findPreviousSiblings", "find_previous_siblings", "4.0.0"
+    )
+    fetchPreviousSiblings = _deprecated_function_alias(
+        "fetchPreviousSiblings", "find_previous_siblings", "3.0.0"
+    )
+
+    def find_parent(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneTag:
         """Find the closest parent of this PageElement that matches the given
         criteria.
 
@@ -727,162 +1187,200 @@ def find_parent(self, name=None, attrs={}, **kwargs):
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :kwargs: A dictionary of filters on attribute values.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
+        :param attrs: Additional filters on attribute values.
+        :param self: Whether the PageElement itself should be considered
+           as one of its 'parents'.
+        :kwargs: Additional filters on attribute values.
         """
         # NOTE: We can't use _find_one because findParents takes a different
         # set of arguments.
         r = None
-        l = self.find_parents(name, attrs, 1, _stacklevel=3, **kwargs)
-        if l:
-            r = l[0]
+        results = self.find_parents(
+            name, attrs, 1, _stacklevel=3, **kwargs
+        )
+        if results:
+            r = results[0]
         return r
-    findParent = find_parent  # BS3
 
-    def find_parents(self, name=None, attrs={}, limit=None, **kwargs):
-        """Find all parents of this PageElement that match the given criteria.
+    findParent = _deprecated_function_alias("findParent", "find_parent", "4.0.0")
+
+    def find_parents(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        """Find all parents of this `PageElement` that match the given criteria.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
+        :param attrs: Additional filters on attribute values.
         :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
+        :param _stacklevel: Used internally to improve warning messages.
+        :kwargs: Additional filters on attribute values.
         """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(name, attrs, None, limit, self.parents,
-                              _stacklevel=_stacklevel+1, **kwargs)
-    findParents = find_parents   # BS3
-    fetchParents = find_parents  # BS2
+        iterator = self.parents
+        # Only Tags can have children, so this ResultSet will contain
+        # nothing but Tags.
+        return cast(ResultSet[Tag], self._find_all(
+            name, attrs, None, limit, iterator, _stacklevel=_stacklevel + 1, **kwargs
+        ))
 
-    @property
-    def next(self):
-        """The PageElement, if any, that was parsed just after this one.
+    findParents = _deprecated_function_alias("findParents", "find_parents", "4.0.0")
+    fetchParents = _deprecated_function_alias("fetchParents", "find_parents", "3.0.0")
 
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
+    @property
+    def next(self) -> _AtMostOneElement:
+        """The `PageElement`, if any, that was parsed just after this one."""
         return self.next_element
 
     @property
-    def previous(self):
-        """The PageElement, if any, that was parsed just before this one.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
+    def previous(self) -> _AtMostOneElement:
+        """The `PageElement`, if any, that was parsed just before this one."""
         return self.previous_element
 
-    #These methods do the real heavy lifting.
-
-    def _find_one(self, method, name, attrs, string, **kwargs):
-        r = None
-        l = method(name, attrs, string, 1, _stacklevel=4, **kwargs)
-        if l:
-            r = l[0]
+    # These methods do the real heavy lifting.
+
+    def _find_one(
+        self,
+        # TODO-TYPING: "There is no syntax to indicate optional or
+        # keyword arguments; such function types are rarely used
+        # as callback types." - So, not sure how to get more
+        # specific here.
+        method: Callable,
+        name: _FindMethodName,
+        attrs: Optional[_StrainableAttributes],
+        string: Optional[_StrainableString],
+        **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneElement:
+        r: _AtMostOneElement = None
+        results: _QueryResults = method(name, attrs, string, 1, _stacklevel=4, **kwargs)
+        if results:
+            r = results[0]
         return r
 
-    def _find_all(self, name, attrs, string, limit, generator, **kwargs):
-        "Iterates over a generator looking for things that match."
-        _stacklevel = kwargs.pop('_stacklevel', 3)
-
-        if string is None and 'text' in kwargs:
-            string = kwargs.pop('text')
+    def _find_all(
+        self,
+        name: _FindMethodName,
+        attrs: Optional[_StrainableAttributes],
+        string: Optional[_StrainableString],
+        limit: Optional[int],
+        generator: Iterator[PageElement],
+        _stacklevel: int = 3,
+        **kwargs: _StrainableAttribute,
+    ) -> _QueryResults:
+        """Iterates over a generator looking for things that match."""
+
+        if string is None and "text" in kwargs:
+            string = kwargs.pop("text")
             warnings.warn(
                 "The 'text' argument to find()-type methods is deprecated. Use 'string' instead.",
-                DeprecationWarning, stacklevel=_stacklevel
+                DeprecationWarning,
+                stacklevel=_stacklevel,
+            )
+
+        if "_class" in kwargs:
+            warnings.warn(
+                AttributeResemblesVariableWarning.MESSAGE
+                % dict(
+                    original="_class",
+                    autocorrect="class_",
+                ),
+                AttributeResemblesVariableWarning,
+                stacklevel=_stacklevel,
             )
 
-        if isinstance(name, SoupStrainer):
-            strainer = name
+        from bs4.filter import ElementFilter
+
+        if isinstance(name, ElementFilter):
+            matcher = name
         else:
-            strainer = SoupStrainer(name, attrs, string, **kwargs)
+            matcher = SoupStrainer(name, attrs, string, **kwargs)
 
+        result: MutableSequence[_OneElement]
         if string is None and not limit and not attrs and not kwargs:
             if name is True or name is None:
                 # Optimization to find all tags.
-                result = (element for element in generator
-                          if isinstance(element, Tag))
-                return ResultSet(strainer, result)
+                result = [element for element in generator if isinstance(element, Tag)]
+                return ResultSet(matcher, result)
             elif isinstance(name, str):
                 # Optimization to find all tags with a given name.
-                if name.count(':') == 1:
+                if name.count(":") == 1:
                     # This is a name with a prefix. If this is a namespace-aware document,
                     # we need to match the local name against tag.name. If not,
                     # we need to match the fully-qualified name against tag.name.
-                    prefix, local_name = name.split(':', 1)
+                    prefix, local_name = name.split(":", 1)
                 else:
                     prefix = None
                     local_name = name
-                result = (element for element in generator
-                          if isinstance(element, Tag)
-                          and (
-                              element.name == name
-                          ) or (
-                              element.name == local_name
-                              and (prefix is None or element.prefix == prefix)
-                          )
-                )
-                return ResultSet(strainer, result)
-        results = ResultSet(strainer)
-        while True:
-            try:
-                i = next(generator)
-            except StopIteration:
-                break
-            if i:
-                found = strainer.search(i)
-                if found:
-                    results.append(found)
-                    if limit and len(results) >= limit:
-                        break
-        return results
+                result = []
+                for element in generator:
+                    if not isinstance(element, Tag):
+                        continue
+                    if element.name == name or (
+                        element.name == local_name
+                        and (prefix is None or element.prefix == prefix)
+                    ):
+                        result.append(element)
+                return ResultSet(matcher, result)
+        return matcher.find_all(generator, limit)
 
-    #These generators can be used to navigate starting from both
-    #NavigableStrings and Tags.
+    # These generators can be used to navigate starting from both
+    # NavigableStrings and Tags.
     @property
-    def next_elements(self):
-        """All PageElements that were parsed after this one.
-
-        :yield: A sequence of PageElements.
-        """
+    def next_elements(self) -> Iterator[PageElement]:
+        """All PageElements that were parsed after this one."""
         i = self.next_element
         while i is not None:
+            successor = i.next_element
             yield i
-            i = i.next_element
+            i = successor
+
+    @property
+    def self_and_next_elements(self) -> Iterator[PageElement]:
+        """This PageElement, then all PageElements that were parsed after it."""
+        return self._self_and(self.next_elements)
 
     @property
-    def next_siblings(self):
+    def next_siblings(self) -> Iterator[PageElement]:
         """All PageElements that are siblings of this one but were parsed
         later.
-
-        :yield: A sequence of PageElements.
         """
         i = self.next_sibling
         while i is not None:
+            successor = i.next_sibling
             yield i
-            i = i.next_sibling
+            i = successor
+
+    @property
+    def self_and_next_siblings(self) -> Iterator[PageElement]:
+        """This PageElement, then all of its siblings."""
+        return self._self_and(self.next_siblings)
 
     @property
-    def previous_elements(self):
+    def previous_elements(self) -> Iterator[PageElement]:
         """All PageElements that were parsed before this one.
 
         :yield: A sequence of PageElements.
         """
         i = self.previous_element
         while i is not None:
+            successor = i.previous_element
             yield i
-            i = i.previous_element
+            i = successor
 
     @property
-    def previous_siblings(self):
+    def self_and_previous_elements(self) -> Iterator[PageElement]:
+        """This PageElement, then all elements that were parsed
+        earlier."""
+        return self._self_and(self.previous_elements)
+
+    @property
+    def previous_siblings(self) -> Iterator[PageElement]:
         """All PageElements that are siblings of this one but were parsed
         earlier.
 
@@ -890,57 +1388,94 @@ def previous_siblings(self):
         """
         i = self.previous_sibling
         while i is not None:
+            successor = i.previous_sibling
             yield i
-            i = i.previous_sibling
+            i = successor
 
     @property
-    def parents(self):
-        """All PageElements that are parents of this PageElement.
+    def self_and_previous_siblings(self) -> Iterator[PageElement]:
+        """This PageElement, then all of its siblings that were parsed
+        earlier."""
+        return self._self_and(self.previous_siblings)
 
-        :yield: A sequence of PageElements.
+    @property
+    def parents(self) -> Iterator[Tag]:
+        """All elements that are parents of this PageElement.
+
+        :yield: A sequence of Tags, ending with a BeautifulSoup object.
         """
         i = self.parent
         while i is not None:
+            successor = i.parent
             yield i
-            i = i.parent
+            i = successor
 
     @property
-    def decomposed(self):
-        """Check whether a PageElement has been decomposed.
+    def self_and_parents(self) -> Iterator[PageElement]:
+        """This element, then all of its parents.
+
+        :yield: A sequence of PageElements, ending with a BeautifulSoup object.
+        """
+        return self._self_and(self.parents)
 
-        :rtype: bool
+    def _self_and(self, other_generator:Iterator[PageElement]) -> Iterator[PageElement]:
+        """Modify a generator by yielding this element, then everything
+        yielded by the other generator.
         """
-        return getattr(self, '_decomposed', False) or False
-   
-    # Old non-property versions of the generators, for backwards
-    # compatibility with BS3.
-    def nextGenerator(self):
+        if not self.hidden:
+            yield self
+        for i in other_generator:
+            yield i
+
+    @property
+    def decomposed(self) -> bool:
+        """Check whether a PageElement has been decomposed."""
+        return getattr(self, "_decomposed", False) or False
+
+    @_deprecated("next_elements", "4.0.0")
+    def nextGenerator(self) -> Iterator[PageElement]:
+        ":meta private:"
         return self.next_elements
 
-    def nextSiblingGenerator(self):
+    @_deprecated("next_siblings", "4.0.0")
+    def nextSiblingGenerator(self) -> Iterator[PageElement]:
+        ":meta private:"
         return self.next_siblings
 
-    def previousGenerator(self):
+    @_deprecated("previous_elements", "4.0.0")
+    def previousGenerator(self) -> Iterator[PageElement]:
+        ":meta private:"
         return self.previous_elements
 
-    def previousSiblingGenerator(self):
+    @_deprecated("previous_siblings", "4.0.0")
+    def previousSiblingGenerator(self) -> Iterator[PageElement]:
+        ":meta private:"
         return self.previous_siblings
 
-    def parentGenerator(self):
+    @_deprecated("parents", "4.0.0")
+    def parentGenerator(self) -> Iterator[PageElement]:
+        ":meta private:"
         return self.parents
 
 
 class NavigableString(str, PageElement):
-    """A Python Unicode string that is part of a parse tree.
+    """A Python string that is part of a parse tree.
 
-    When Beautiful Soup parses the markup <b>penguin</b>, it will
-    create a NavigableString for the string "penguin".
+    When Beautiful Soup parses the markup ``<b>penguin</b>``, it will
+    create a `NavigableString` for the string "penguin".
     """
 
-    PREFIX = ''
-    SUFFIX = ''
+    #: A string prepended to the body of the 'real' string
+    #: when formatting it as part of a document, such as the '<!--'
+    #: in an HTML comment.
+    PREFIX: str = ""
+
+    #: A string appended to the body of the 'real' string
+    #: when formatting it as part of a document, such as the '-->'
+    #: in an HTML comment.
+    SUFFIX: str = ""
 
-    def __new__(cls, value):
+    def __new__(cls, value: Union[str, bytes]) -> Self:
         """Create a new NavigableString.
 
         When unpickling a NavigableString, this method is called with
@@ -952,10 +1487,11 @@ def __new__(cls, value):
             u = str.__new__(cls, value)
         else:
             u = str.__new__(cls, value, DEFAULT_OUTPUT_ENCODING)
+        u.hidden = False
         u.setup()
         return u
 
-    def __deepcopy__(self, memo, recursive=False):
+    def __deepcopy__(self, memo: Dict[Any, Any], recursive: bool = False) -> Self:
         """A copy of a NavigableString has the same contents and class
         as the original, but it is not connected to the parse tree.
 
@@ -965,50 +1501,61 @@ def __deepcopy__(self, memo, recursive=False):
         """
         return type(self)(self)
 
-    def __copy__(self):
-        """A copy of a NavigableString can only be a deep copy, because
-        only one PageElement can occupy a given place in a parse tree.
-        """
-        return self.__deepcopy__({})
-
-    def __getnewargs__(self):
+    def __getnewargs__(self) -> Tuple[str]:
         return (str(self),)
 
-    def __getattr__(self, attr):
-        """text.string gives you text. This is for backwards
-        compatibility for Navigable*String, but for CData* it lets you
-        get the string without the CData wrapper."""
-        if attr == 'string':
-            return self
-        else:
-            raise AttributeError(
-                "'%s' object has no attribute '%s'" % (
-                    self.__class__.__name__, attr))
+    # TODO-TYPING This should be SupportsIndex|slice but SupportsIndex
+    # is introduced in 3.8. This can be changed once 3.7 support is dropped.
+    def __getitem__(self, key: Union[int|slice]) -> str: # type:ignore
+        """Raise an exception """
+        if isinstance(key, str):
+            raise TypeError("string indices must be integers, not '{0}'. Are you treating a NavigableString like a Tag?".format(key.__class__.__name__))
+        return super(NavigableString, self).__getitem__(key)
+
+    @property
+    def string(self) -> str:
+        """Convenience property defined to match `Tag.string`.
 
-    def output_ready(self, formatter="minimal"):
-        """Run the string through the provided formatter.
+        :return: This property always returns the `NavigableString` it was
+           called on.
 
-        :param formatter: A Formatter object, or a string naming one of the standard formatters.
+        :meta private:
+        """
+        return self
+
+    def output_ready(self, formatter: _FormatterOrName = "minimal") -> str:
+        """Run the string through the provided formatter, making it
+        ready for output as part of an HTML or XML document.
+
+        :param formatter: A `Formatter` object, or a string naming one
+            of the standard formatters.
         """
         output = self.format_string(self, formatter)
         return self.PREFIX + output + self.SUFFIX
 
     @property
-    def name(self):
+    def name(self) -> None:
         """Since a NavigableString is not a Tag, it has no .name.
 
         This property is implemented so that code like this doesn't crash
         when run on a mixture of Tag and NavigableString objects:
             [x.name for x in tag.children]
+
+        :meta private:
         """
         return None
 
     @name.setter
-    def name(self, name):
-        """Prevent NavigableString.name from ever being set."""
+    def name(self, name: str) -> None:
+        """Prevent NavigableString.name from ever being set.
+
+        :meta private:
+        """
         raise AttributeError("A NavigableString cannot be given a name.")
 
-    def _all_strings(self, strip=False, types=PageElement.default):
+    def _all_strings(
+        self, strip: bool = False, types: _OneOrMoreStringTypes = PageElement.default
+    ) -> Iterator[str]:
         """Yield all strings of certain classes, possibly stripping them.
 
         This makes it easy for NavigableString to implement methods
@@ -1025,12 +1572,11 @@ def _all_strings(self, strip=False, types=PageElement.default):
             means no comments, processing instructions, etc.
 
         :yield: A sequence that either contains this string, or is empty.
-
         """
         if types is self.default:
             # This is kept in Tag because it's full of subclasses of
             # this class, which aren't defined until later in the file.
-            types = Tag.DEFAULT_INTERESTING_STRING_TYPES
+            types = Tag.MAIN_CONTENT_STRING_TYPES
 
         # Do nothing if the caller is looking for specific types of
         # string, and we're of a different type.
@@ -1051,70 +1597,94 @@ def _all_strings(self, strip=False, types=PageElement.default):
 
         value = self
         if strip:
-            value = value.strip()
-        if len(value) > 0:
-            yield value
-    strings = property(_all_strings)
+            final_value = value.strip()
+        else:
+            final_value = self
+        if len(final_value) > 0:
+            yield final_value
+
+    @property
+    def strings(self) -> Iterator[str]:
+        """Yield this string, but only if it is interesting.
+
+        This is defined the way it is for compatibility with
+        `Tag.strings`. See `Tag` for information on which strings are
+        interesting in a given context.
+
+        :yield: A sequence that either contains this string, or is empty.
+        """
+        return self._all_strings()
+
 
 class PreformattedString(NavigableString):
-    """A NavigableString not subject to the normal formatting rules.
+    """A `NavigableString` not subject to the normal formatting rules.
 
     This is an abstract class used for special kinds of strings such
-    as comments (the Comment class) and CDATA blocks (the CData
-    class).
+    as comments (`Comment`) and CDATA blocks (`CData`).
     """
 
-    PREFIX = ''
-    SUFFIX = ''
+    PREFIX: str = ""
+    SUFFIX: str = ""
 
-    def output_ready(self, formatter=None):
+    def output_ready(self, formatter: Optional[_FormatterOrName] = None) -> str:
         """Make this string ready for output by adding any subclass-specific
             prefix or suffix.
 
-        :param formatter: A Formatter object, or a string naming one
+        :param formatter: A `Formatter` object, or a string naming one
             of the standard formatters. The string will be passed into the
-            Formatter, but only to trigger any side effects: the return
+            `Formatter`, but only to trigger any side effects: the return
             value is ignored.
 
         :return: The string, with any subclass-specific prefix and
            suffix added on.
         """
         if formatter is not None:
-            ignore = self.format_string(self, formatter)
+            self.format_string(self, formatter)
         return self.PREFIX + self + self.SUFFIX
 
+
 class CData(PreformattedString):
-    """A CDATA block."""
-    PREFIX = '<![CDATA['
-    SUFFIX = ']]>'
+    """A `CDATA section <https://dev.w3.org/html5/spec-LC/syntax.html#cdata-sections>`_."""
+
+    PREFIX: str = "<![CDATA["
+    SUFFIX: str = "]]>"
+
 
 class ProcessingInstruction(PreformattedString):
     """A SGML processing instruction."""
 
-    PREFIX = '<?'
-    SUFFIX = '>'
+    PREFIX: str = "<?"
+    SUFFIX: str = ">"
+
 
 class XMLProcessingInstruction(ProcessingInstruction):
-    """An XML processing instruction."""
-    PREFIX = '<?'
-    SUFFIX = '?>'
+    """An `XML processing instruction <https://www.w3.org/TR/REC-xml/#sec-pi>`_."""
+
+    PREFIX: str = "<?"
+    SUFFIX: str = "?>"
+
 
 class Comment(PreformattedString):
-    """An HTML or XML comment."""
-    PREFIX = '<!--'
-    SUFFIX = '-->'
+    """An `HTML comment <https://dev.w3.org/html5/spec-LC/syntax.html#comments>`_ or `XML comment <https://www.w3.org/TR/REC-xml/#sec-comments>`_."""
+
+    PREFIX: str = "<!--"
+    SUFFIX: str = "-->"
 
 
 class Declaration(PreformattedString):
-    """An XML declaration."""
-    PREFIX = '<?'
-    SUFFIX = '?>'
+    """An `XML declaration <https://www.w3.org/TR/REC-xml/#sec-prolog-dtd>`_."""
+
+    PREFIX: str = "<?"
+    SUFFIX: str = "?>"
 
 
 class Doctype(PreformattedString):
-    """A document type declaration."""
+    """A `document type declaration <https://www.w3.org/TR/REC-xml/#dt-doctype>`_."""
+
     @classmethod
-    def for_name_and_ids(cls, name, pub_id, system_id):
+    def for_name_and_ids(
+        cls, name: str, pub_id: Optional[str], system_id: Optional[str]
+    ) -> Doctype:
         """Generate an appropriate document type declaration for a given
         public ID and system ID.
 
@@ -1123,122 +1693,145 @@ def for_name_and_ids(cls, name, pub_id, system_id):
             e.g. '-//W3C//DTD XHTML 1.1//EN'
         :param system_id: The system identifier for this document type,
             e.g. 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
-
-        :return: A Doctype.
         """
-        value = name or ''
-        if pub_id is not None:
+        return Doctype(cls._string_for_name_and_ids(name, pub_id, system_id))
+
+    @classmethod
+    def _string_for_name_and_ids(
+        cls, name: str, pub_id: Optional[str], system_id: Optional[str]
+    ) -> str:
+        """Generate a string to be used as the basis of a Doctype object.
+
+        This is a separate method from for_name_and_ids() because the lxml
+        TreeBuilder needs to call it.
+        """
+        value = name or ""
+        if pub_id is not None:
             value += ' PUBLIC "%s"' % pub_id
             if system_id is not None:
                 value += ' "%s"' % system_id
         elif system_id is not None:
             value += ' SYSTEM "%s"' % system_id
+        return value
 
-        return Doctype(value)
-
-    PREFIX = '<!DOCTYPE '
-    SUFFIX = '>\n'
+    PREFIX: str = "<!DOCTYPE "
+    SUFFIX: str = ">\n"
 
 
 class Stylesheet(NavigableString):
-    """A NavigableString representing an stylesheet (probably
-    CSS).
+    """A `NavigableString` representing the contents of a `<style> HTML
+    tag <https://dev.w3.org/html5/spec-LC/Overview.html#the-style-element>`_
+    (probably CSS).
 
     Used to distinguish embedded stylesheets from textual content.
     """
-    pass
 
 
 class Script(NavigableString):
-    """A NavigableString representing an executable script (probably
-    Javascript).
+    """A `NavigableString` representing the contents of a `<script>
+    HTML tag
+    <https://dev.w3.org/html5/spec-LC/Overview.html#the-script-element>`_
+    (probably Javascript).
 
     Used to distinguish executable code from textual content.
     """
-    pass
 
 
 class TemplateString(NavigableString):
-    """A NavigableString representing a string found inside an HTML
-    template embedded in a larger document.
+    """A `NavigableString` representing a string found inside an `HTML
+    <template> tag <https://html.spec.whatwg.org/multipage/scripting.html#the-template-element>`_
+    embedded in a larger document.
 
     Used to distinguish such strings from the main body of the document.
     """
-    pass
 
 
 class RubyTextString(NavigableString):
-    """A NavigableString representing the contents of the <rt> HTML
-    element.
-
-    https://dev.w3.org/html5/spec-LC/text-level-semantics.html#the-rt-element
+    """A NavigableString representing the contents of an `<rt> HTML
+    tag <https://dev.w3.org/html5/spec-LC/text-level-semantics.html#the-rt-element>`_.
 
     Can be used to distinguish such strings from the strings they're
     annotating.
     """
-    pass
 
 
 class RubyParenthesisString(NavigableString):
-    """A NavigableString representing the contents of the <rp> HTML
-    element.
-
-    https://dev.w3.org/html5/spec-LC/text-level-semantics.html#the-rp-element
+    """A NavigableString representing the contents of an `<rp> HTML
+    tag <https://dev.w3.org/html5/spec-LC/text-level-semantics.html#the-rp-element>`_.
     """
-    pass
 
 
 class Tag(PageElement):
-    """Represents an HTML or XML tag that is part of a parse tree, along
-    with its attributes and contents.
+    """An HTML or XML tag that is part of a parse tree, along with its
+    attributes, contents, and relationships to other parts of the tree.
+
+    When Beautiful Soup parses the markup ``<b>penguin</b>``, it will
+    create a `Tag` object representing the ``<b>`` tag. You can
+    instantiate `Tag` objects directly, but it's not necessary unless
+    you're adding entirely new markup to a parsed document. Most of
+    the constructor arguments are intended for use by the `TreeBuilder`
+    that's parsing a document.
+
+    :param parser: A `BeautifulSoup` object representing the parse tree this
+        `Tag` will be part of.
+    :param builder: The `TreeBuilder` being used to build the tree.
+    :param name: The name of the tag.
+    :param namespace: The URI of this tag's XML namespace, if any.
+    :param prefix: The prefix for this tag's XML namespace, if any.
+    :param attrs: A dictionary of attribute values.
+    :param parent: The `Tag` to use as the parent of this `Tag`. May be
+       the `BeautifulSoup` object itself.
+    :param previous: The `PageElement` that was parsed immediately before
+        parsing this tag.
+    :param is_xml: If True, this is an XML tag. Otherwise, this is an
+        HTML tag.
+    :param sourceline: The line number where this tag was found in its
+        source document.
+    :param sourcepos: The character position within ``sourceline`` where this
+        tag was found.
+    :param can_be_empty_element: If True, this tag should be
+        represented as <tag/>. If False, this tag should be represented
+        as <tag></tag>.
+    :param cdata_list_attributes: A dictionary of attributes whose values should
+        be parsed as lists of strings if they ever show up on this tag.
+    :param preserve_whitespace_tags: Names of tags whose contents
+        should have their whitespace preserved if they are encountered inside
+        this tag.
+    :param interesting_string_types: When iterating over this tag's
+        string contents in methods like `Tag.strings` or
+        `PageElement.get_text`, these are the types of strings that are
+        interesting enough to be considered. By default,
+        `NavigableString` (normal strings) and `CData` (CDATA
+        sections) are the only interesting string subtypes.
+    :param namespaces: A dictionary mapping currently active
+        namespace prefixes to URIs, as of the point in the parsing process when
+        this tag was encountered. This can be used later to
+        construct CSS selectors.
 
-    When Beautiful Soup parses the markup <b>penguin</b>, it will
-    create a Tag object representing the <b> tag.
     """
 
-    def __init__(self, parser=None, builder=None, name=None, namespace=None,
-                 prefix=None, attrs=None, parent=None, previous=None,
-                 is_xml=None, sourceline=None, sourcepos=None,
-                 can_be_empty_element=None, cdata_list_attributes=None,
-                 preserve_whitespace_tags=None,
-                 interesting_string_types=None,
-                 namespaces=None
+    def __init__(
+        self,
+        parser: Optional[BeautifulSoup] = None,
+        builder: Optional[TreeBuilder] = None,
+        name: Optional[str] = None,
+        namespace: Optional[str] = None,
+        prefix: Optional[str] = None,
+        attrs: Optional[_RawOrProcessedAttributeValues] = None,
+        parent: Optional[Union[BeautifulSoup, Tag]] = None,
+        previous: _AtMostOneElement = None,
+        is_xml: Optional[bool] = None,
+        sourceline: Optional[int] = None,
+        sourcepos: Optional[int] = None,
+        can_be_empty_element: Optional[bool] = None,
+        cdata_list_attributes: Optional[Dict[str, Set[str]]] = None,
+        preserve_whitespace_tags: Optional[Set[str]] = None,
+        interesting_string_types: Optional[Set[Type[NavigableString]]] = None,
+        namespaces: Optional[Dict[str, str]] = None,
+        # NOTE: Any new arguments here need to be mirrored in
+        # Tag.copy_self, and potentially BeautifulSoup.new_tag
+        # as well.
     ):
-        """Basic constructor.
-
-        :param parser: A BeautifulSoup object.
-        :param builder: A TreeBuilder.
-        :param name: The name of the tag.
-        :param namespace: The URI of this Tag's XML namespace, if any.
-        :param prefix: The prefix for this Tag's XML namespace, if any.
-        :param attrs: A dictionary of this Tag's attribute values.
-        :param parent: The PageElement to use as this Tag's parent.
-        :param previous: The PageElement that was parsed immediately before
-            this tag.
-        :param is_xml: If True, this is an XML tag. Otherwise, this is an
-            HTML tag.
-        :param sourceline: The line number where this tag was found in its
-            source document.
-        :param sourcepos: The character position within `sourceline` where this
-            tag was found.
-        :param can_be_empty_element: If True, this tag should be
-            represented as <tag/>. If False, this tag should be represented
-            as <tag></tag>.
-        :param cdata_list_attributes: A list of attributes whose values should
-            be treated as CDATA if they ever show up on this tag.
-        :param preserve_whitespace_tags: A list of tag names whose contents
-            should have their whitespace preserved.
-        :param interesting_string_types: This is a NavigableString
-            subclass or a tuple of them. When iterating over this
-            Tag's strings in methods like Tag.strings or Tag.get_text,
-            these are the types of strings that are interesting enough
-            to be considered. The default is to consider
-            NavigableString and CData the only interesting string
-            subtypes.
-        :param namespaces: A dictionary mapping currently active
-            namespace prefixes to URIs. This can be used later to
-            construct CSS selectors.
-        """
         if parser is None:
             self.parser_class = None
         else:
@@ -1251,20 +1844,44 @@ def __init__(self, parser=None, builder=None, name=None, namespace=None,
         self.namespace = namespace
         self._namespaces = namespaces or {}
         self.prefix = prefix
-        if ((not builder or builder.store_line_numbers)
-            and (sourceline is not None or sourcepos is not None)):
+        if (not builder or builder.store_line_numbers) and (
+            sourceline is not None or sourcepos is not None
+        ):
             self.sourceline = sourceline
             self.sourcepos = sourcepos
+        else:
+            self.sourceline = sourceline
+            self.sourcepos = sourcepos
+
+        attr_dict_class: type[AttributeDict]
+        attribute_value_list_class: type[AttributeValueList]
+        if builder is None:
+            if is_xml:
+                attr_dict_class = XMLAttributeDict
+            else:
+                attr_dict_class = HTMLAttributeDict
+            attribute_value_list_class = AttributeValueList
+        else:
+            attr_dict_class = builder.attribute_dict_class
+            attribute_value_list_class = builder.attribute_value_list_class
+        self.attribute_value_list_class = attribute_value_list_class
+
         if attrs is None:
-            attrs = {}
-        elif attrs:
+            self.attrs = attr_dict_class()
+        else:
             if builder is not None and builder.cdata_list_attributes:
-                attrs = builder._replace_cdata_list_attribute_values(
-                    self.name, attrs)
+                self.attrs = builder._replace_cdata_list_attribute_values(
+                    self.name, attrs
+                )
             else:
-                attrs = dict(attrs)
-        else:
-            attrs = dict(attrs)
+                self.attrs = attr_dict_class()
+                # Make sure that the values of any multi-valued
+                # attributes (e.g. when a Tag is copied) are stored in
+                # new lists.
+                for k, v in attrs.items():
+                    if isinstance(v, list):
+                        v = v.__class__(v)
+                    self.attrs[k] = v
 
         # If possible, determine ahead of time whether this tag is an
         # XML tag.
@@ -1272,8 +1889,7 @@ def __init__(self, parser=None, builder=None, name=None, namespace=None,
             self.known_xml = builder.is_xml
         else:
             self.known_xml = is_xml
-        self.attrs = attrs
-        self.contents = []
+        self.contents: List[PageElement] = []
         self.setup(parent, previous)
         self.hidden = False
 
@@ -1287,6 +1903,7 @@ def __init__(self, parser=None, builder=None, name=None, namespace=None,
             self.interesting_string_types = interesting_string_types
         else:
             # Set up any substitutions for this tag, such as the charset in a META tag.
+            self.attribute_value_list_class = builder.attribute_value_list_class
             builder.set_up_substitutions(self)
 
             # Ask the TreeBuilder whether this tag might be an empty-element tag.
@@ -1308,113 +1925,149 @@ def __init__(self, parser=None, builder=None, name=None, namespace=None,
 
             if self.name in builder.string_containers:
                 # This sort of tag uses a special string container
-                # subclass for most of its strings. When we ask the
-                self.interesting_string_types = builder.string_containers[self.name]
+                # subclass for most of its strings. We need to be able
+                # to look up the proper container subclass.
+                self.interesting_string_types = {builder.string_containers[self.name]}
             else:
-                self.interesting_string_types = self.DEFAULT_INTERESTING_STRING_TYPES
-
-    parserClass = _alias("parser_class")  # BS3
-
-    def __deepcopy__(self, memo, recursive=True):
+                self.interesting_string_types = self.MAIN_CONTENT_STRING_TYPES
+
+    parser_class: Optional[type[BeautifulSoup]]
+    name: str
+    namespace: Optional[str]
+    prefix: Optional[str]
+    attrs: _AttributeValues
+    sourceline: Optional[int]
+    sourcepos: Optional[int]
+    known_xml: Optional[bool]
+    contents: List[PageElement]
+    hidden: bool
+    interesting_string_types: Optional[Set[Type[NavigableString]]]
+
+    can_be_empty_element: Optional[bool]
+    cdata_list_attributes: Optional[Dict[str, Set[str]]]
+    preserve_whitespace_tags: Optional[Set[str]]
+
+    #: :meta private:
+    parserClass = _deprecated_alias("parserClass", "parser_class", "4.0.0")
+
+    def __deepcopy__(self, memo: Dict[Any, Any], recursive: bool = True) -> Self:
         """A deepcopy of a Tag is a new Tag, unconnected to the parse tree.
         Its contents are a copy of the old Tag's contents.
         """
-        clone = self._clone()
+        clone = self.copy_self()
 
         if recursive:
             # Clone this tag's descendants recursively, but without
             # making any recursive function calls.
-            tag_stack = [clone]
+            tag_stack: List[Tag] = [clone]
             for event, element in self._event_stream(self.descendants):
                 if event is Tag.END_ELEMENT_EVENT:
                     # Stop appending incoming Tags to the Tag that was
                     # just closed.
                     tag_stack.pop()
                 else:
-                    descendant_clone = element.__deepcopy__(
-                        memo, recursive=False
-                    )
+                    descendant_clone = element.__deepcopy__(memo, recursive=False)
                     # Add to its parent's .contents
                     tag_stack[-1].append(descendant_clone)
 
                     if event is Tag.START_ELEMENT_EVENT:
                         # Add the Tag itself to the stack so that its
                         # children will be .appended to it.
-                        tag_stack.append(descendant_clone)
+                        tag_stack.append(cast(Tag, descendant_clone))
         return clone
 
-    def __copy__(self):
-        """A copy of a Tag must always be a deep copy, because a Tag's
-        children can only have one parent at a time.
-        """
-        return self.__deepcopy__({})
-
-    def _clone(self):
+    def copy_self(self) -> Self:
         """Create a new Tag just like this one, but with no
         contents and unattached to any parse tree.
 
-        This is the first step in the deepcopy process.
+        This is the first step in the deepcopy process, but you can
+        call it on its own to create a copy of a Tag without copying its
+        contents.
         """
         clone = type(self)(
-            None, None, self.name, self.namespace,
-            self.prefix, self.attrs, is_xml=self._is_xml,
-            sourceline=self.sourceline, sourcepos=self.sourcepos,
+            None,
+            None,
+            self.name,
+            self.namespace,
+            self.prefix,
+            self.attrs,
+            is_xml=self._is_xml,
+            sourceline=self.sourceline,
+            sourcepos=self.sourcepos,
             can_be_empty_element=self.can_be_empty_element,
             cdata_list_attributes=self.cdata_list_attributes,
             preserve_whitespace_tags=self.preserve_whitespace_tags,
-            interesting_string_types=self.interesting_string_types
+            interesting_string_types=self.interesting_string_types,
+            namespaces=self._namespaces,
         )
-        for attr in ('can_be_empty_element', 'hidden'):
+        for attr in ("can_be_empty_element", "hidden"):
             setattr(clone, attr, getattr(self, attr))
         return clone
-    
+
     @property
-    def is_empty_element(self):
+    def is_empty_element(self) -> bool:
         """Is this tag an empty-element tag? (aka a self-closing tag)
 
         A tag that has contents is never an empty-element tag.
 
         A tag that has no contents may or may not be an empty-element
-        tag. It depends on the builder used to create the tag. If the
-        builder has a designated list of empty-element tags, then only
-        a tag whose name shows up in that list is considered an
-        empty-element tag.
+        tag. It depends on the `TreeBuilder` used to create the
+        tag. If the builder has a designated list of empty-element
+        tags, then only a tag whose name shows up in that list is
+        considered an empty-element tag. This is usually the case
+        for HTML documents.
 
-        If the builder has no designated list of empty-element tags,
-        then any tag with no contents is an empty-element tag.
+        If the builder has no designated list of empty-element, then
+        any tag with no contents is an empty-element tag. This is usually
+        the case for XML documents.
         """
-        return len(self.contents) == 0 and self.can_be_empty_element
-    isSelfClosing = is_empty_element  # BS3
+        return len(self.contents) == 0 and self.can_be_empty_element is True
+
+    @_deprecated("is_empty_element", "4.0.0")
+    def isSelfClosing(self) -> bool:
+        ": :meta private:"
+        return self.is_empty_element
 
     @property
-    def string(self):
+    def string(self) -> Optional[str]:
         """Convenience property to get the single string within this
-        PageElement.
+        `Tag`, assuming there is just one.
 
-        TODO It might make sense to have NavigableString.string return
-        itself.
+        :return: If this `Tag` has a single child that's a
+         `NavigableString`, the return value is that string. If this
+         element has one child `Tag`, the return value is that child's
+         `Tag.string`, recursively. If this `Tag` has no children,
+         or has more than one child, the return value is ``None``.
 
-        :return: If this element has a single string child, return
-         value is that string. If this element has one child tag,
-         return value is the 'string' attribute of the child tag,
-         recursively. If this element is itself a string, has no
-         children, or has more than one child, return value is None.
+         If this property is unexpectedly returning ``None`` for you,
+         it's probably because your `Tag` has more than one thing
+         inside it.
         """
         if len(self.contents) != 1:
             return None
         child = self.contents[0]
         if isinstance(child, NavigableString):
             return child
-        return child.string
+        elif isinstance(child, Tag):
+            return child.string
+        return None
 
     @string.setter
-    def string(self, string):
-        """Replace this PageElement's contents with `string`."""
+    def string(self, string: str) -> None:
+        """Replace the `Tag.contents` of this `Tag` with a single string."""
         self.clear()
-        self.append(string.__class__(string))
+        if isinstance(string, NavigableString):
+            new_class = string.__class__
+        else:
+            new_class = NavigableString
+        self.append(new_class(string))
 
-    DEFAULT_INTERESTING_STRING_TYPES = (NavigableString, CData)
-    def _all_strings(self, strip=False, types=PageElement.default):
+    #: :meta private:
+    MAIN_CONTENT_STRING_TYPES = {NavigableString, CData}
+
+    def _all_strings(
+        self, strip: bool = False, types: _OneOrMoreStringTypes = PageElement.default
+    ) -> Iterator[str]:
         """Yield all strings of certain classes, possibly stripping them.
 
         :param strip: If True, all strings will be stripped before being
@@ -1427,15 +2080,15 @@ def _all_strings(self, strip=False, types=PageElement.default):
             only NavigableString and CData objects will be
             considered. That means no comments, processing
             instructions, etc.
-
-        :yield: A sequence of strings.
-
         """
         if types is self.default:
-            types = self.interesting_string_types
+            if self.interesting_string_types is None:
+                types = self.MAIN_CONTENT_STRING_TYPES
+            else:
+                types = self.interesting_string_types
 
         for descendant in self.descendants:
-            if (types is None and not isinstance(descendant, NavigableString)):
+            if not isinstance(descendant, NavigableString):
                 continue
             descendant_type = type(descendant)
             if isinstance(types, type):
@@ -1446,55 +2099,213 @@ def _all_strings(self, strip=False, types=PageElement.default):
                 # We're not interested in strings of this type.
                 continue
             if strip:
-                descendant = descendant.strip()
-                if len(descendant) == 0:
+                stripped = descendant.strip()
+                if len(stripped) == 0:
                     continue
-            yield descendant
+                yield stripped
+            else:
+                yield descendant
+
     strings = property(_all_strings)
 
-    def decompose(self):
-        """Recursively destroys this PageElement and its children.
+    def insert(self, position: int, *new_children: _InsertableElement) -> List[PageElement]:
+        """Insert one or more new PageElements as a child of this `Tag`.
 
-        This element will be removed from the tree and wiped out; so
-        will everything beneath it.
+        This works similarly to :py:meth:`list.insert`, except you can insert
+        multiple elements at once.
 
-        The behavior of a decomposed PageElement is undefined and you
-        should never use one for anything, but if you need to _check_
-        whether an element has been decomposed, you can use the
-        `decomposed` property.
+        :param position: The numeric position that should be occupied
+           in this Tag's `Tag.children` by the first new `PageElement`.
+
+        :param new_children: The PageElements to insert.
+
+        :return The newly inserted PageElements.
         """
-        self.extract()
-        i = self
-        while i is not None:
-            n = i.next_element
-            i.__dict__.clear()
-            i.contents = []
-            i._decomposed = True
-            i = n
-
-    def clear(self, decompose=False):
-        """Wipe out all children of this PageElement by calling extract()
-           on them.
-
-        :param decompose: If this is True, decompose() (a more
-            destructive method) will be called instead of extract().
-        """
-        if decompose:
-            for element in self.contents[:]:
-                if isinstance(element, Tag):
-                    element.decompose()
-                else:
-                    element.extract()
+        inserted: List[PageElement] = []
+        for new_child in new_children:
+            inserted.extend(self._insert(position, new_child))
+            position += 1
+        return inserted
+
+    def _insert(self, position: int, new_child: _InsertableElement) -> List[PageElement]:
+        if new_child is None:
+            raise ValueError("Cannot insert None into a tag.")
+        if new_child is self:
+            raise ValueError("Cannot insert a tag into itself.")
+        if isinstance(new_child, str) and not isinstance(new_child, NavigableString):
+            new_child = NavigableString(new_child)
+
+        from bs4 import BeautifulSoup
+        if isinstance(new_child, BeautifulSoup):
+            # We don't want to end up with a situation where one BeautifulSoup
+            # object contains another. Insert the BeautifulSoup's children and
+            # return them.
+            return self.insert(position, *list(new_child.contents))
+        position = min(position, len(self.contents))
+        if hasattr(new_child, "parent") and new_child.parent is not None:
+            # We're 'inserting' an element that's already one
+            # of this object's children.
+            if new_child.parent is self:
+                current_index = self.index(new_child)
+                if current_index < position:
+                    # We're moving this element further down the list
+                    # of this object's children. That means that when
+                    # we extract this element, our target index will
+                    # jump down one.
+                    position -= 1
+                elif current_index == position:
+                    # We're 'inserting' an element into its current location.
+                    # This is a no-op.
+                    return [new_child]
+            new_child.extract()
+
+        new_child.parent = self
+        previous_child = None
+        if position == 0:
+            new_child.previous_sibling = None
+            new_child.previous_element = self
+        else:
+            previous_child = self.contents[position - 1]
+            new_child.previous_sibling = previous_child
+            new_child.previous_sibling.next_sibling = new_child
+            new_child.previous_element = previous_child._last_descendant(False)
+        if new_child.previous_element is not None:
+            new_child.previous_element.next_element = new_child
+
+        new_childs_last_element = new_child._last_descendant(
+            is_initialized=False, accept_self=True
+        )
+        # new_childs_last_element can't be None because we passed
+        # accept_self=True into _last_descendant. Worst case,
+        # new_childs_last_element will be new_child itself. Making
+        # this cast removes several mypy complaints later on as we
+        # manipulate new_childs_last_element.
+        new_childs_last_element = cast(PageElement, new_childs_last_element)
+
+        if position >= len(self.contents):
+            new_child.next_sibling = None
+
+            parent: Optional[Tag] = self
+            parents_next_sibling = None
+            while parents_next_sibling is None and parent is not None:
+                parents_next_sibling = parent.next_sibling
+                parent = parent.parent
+                if parents_next_sibling is not None:
+                    # We found the element that comes next in the document.
+                    break
+            if parents_next_sibling is not None:
+                new_childs_last_element.next_element = parents_next_sibling
+            else:
+                # The last element of this tag is the last element in
+                # the document.
+                new_childs_last_element.next_element = None
         else:
-            for element in self.contents[:]:
+            next_child = self.contents[position]
+            new_child.next_sibling = next_child
+            if new_child.next_sibling is not None:
+                new_child.next_sibling.previous_sibling = new_child
+            new_childs_last_element.next_element = next_child
+
+        if new_childs_last_element.next_element is not None:
+            new_childs_last_element.next_element.previous_element = (
+                new_childs_last_element
+            )
+        self.contents.insert(position, new_child)
+
+        return [new_child]
+
+    def unwrap(self) -> Self:
+        """Replace this `PageElement` with its contents.
+
+        :return: This object, no longer part of the tree.
+        """
+        my_parent = self.parent
+        if my_parent is None:
+            raise ValueError(
+                "Cannot replace an element with its contents when that "
+                "element is not part of a tree."
+            )
+        my_index = my_parent.index(self)
+        self.extract(_self_index=my_index)
+        for child in reversed(self.contents[:]):
+            my_parent.insert(my_index, child)
+        return self
+
+    replace_with_children = unwrap
+
+    @_deprecated("unwrap", "4.0.0")
+    def replaceWithChildren(self) -> _OneElement:
+        ": :meta private:"
+        return self.unwrap()
+
+    def append(self, tag: _InsertableElement) -> PageElement:
+        """
+        Appends the given `PageElement` to the contents of this `Tag`.
+
+        :param tag: A PageElement.
+
+        :return The newly appended PageElement.
+        """
+        return self.insert(len(self.contents), tag)[0]
+
+    def extend(self, tags: Union[Iterable[_InsertableElement], Tag]) -> List[PageElement]:
+        """Appends one or more objects to the contents of this
+        `Tag`.
+
+        :param tags: If a list of `PageElement` objects is provided,
+            they will be appended to this tag's contents, one at a time.
+            If a single `Tag` is provided, its `Tag.contents` will be
+            used to extend this object's `Tag.contents`.
+
+        :return The list of PageElements that were appended.
+        """
+        tag_list: Iterable[_InsertableElement]
+
+        if isinstance(tags, Tag):
+            tag_list = list(tags.contents)
+        elif isinstance(tags, (PageElement, str)):
+            # The caller should really be using append() instead,
+            # but we can make it work.
+            warnings.warn(
+                "A single non-Tag item was passed into Tag.extend. Use Tag.append instead.",
+                UserWarning,
+                stacklevel=2,
+            )
+            if isinstance(tags, str) and not isinstance(tags, PageElement):
+                tags = NavigableString(tags)
+            tag_list = [tags]
+        elif isinstance(tags, Iterable):
+            # Moving items around the tree may change their position in
+            # the original list. Make a list that won't change.
+            tag_list = list(tags)
+
+        results: List[PageElement] = []
+        for tag in tag_list:
+            results.append(self.append(tag))
+
+        return results
+
+    def clear(self, decompose: bool = False) -> None:
+        """Destroy all children of this `Tag` by calling
+           `PageElement.extract` on them.
+
+        :param decompose: If this is True, `PageElement.decompose` (a
+            more destructive method) will be called instead of
+            `PageElement.extract`.
+        """
+        for element in self.contents[:]:
+            if decompose:
+                element.decompose()
+            else:
                 element.extract()
 
-    def smooth(self):
-        """Smooth out this element's children by consolidating consecutive
+    def smooth(self) -> None:
+        """Smooth out the children of this `Tag` by consolidating consecutive
         strings.
 
-        This makes pretty-printed output look more natural following a
-        lot of operations that modified the tree.
+        If you perform a lot of operations that modify the tree,
+        calling this method afterwards can make pretty-printed output
+        look more natural.
         """
         # Mark the first position of every pair of children that need
         # to be consolidated.  Do this rather than making a copy of
@@ -1505,12 +2316,13 @@ def smooth(self):
             if isinstance(a, Tag):
                 # Recursively smooth children.
                 a.smooth()
-            if i == len(self.contents)-1:
+            if i == len(self.contents) - 1:
                 # This is the last item in .contents, and it's not a
                 # tag. There's no chance it needs any work.
                 continue
-            b = self.contents[i+1]
-            if (isinstance(a, NavigableString)
+            b = self.contents[i + 1]
+            if (
+                isinstance(a, NavigableString)
                 and isinstance(b, NavigableString)
                 and not isinstance(a, PreformattedString)
                 and not isinstance(b, PreformattedString)
@@ -1521,175 +2333,266 @@ def smooth(self):
         # removing items from .contents won't affect the remaining
         # positions.
         for i in reversed(marked):
-            a = self.contents[i]
-            b = self.contents[i+1]
+            a = cast(NavigableString, self.contents[i])
+            b = cast(NavigableString, self.contents[i + 1])
             b.extract()
-            n = NavigableString(a+b)
+            n = NavigableString(a + b)
             a.replace_with(n)
 
-    def index(self, element):
-        """Find the index of a child by identity, not value.
+    def index(self, element: PageElement) -> int:
+        """Find the index of a child of this `Tag` (by identity, not value).
 
-        Avoids issues with tag.contents.index(element) getting the
-        index of equal elements.
+        Doing this by identity avoids issues when a `Tag` contains two
+        children that have string equality.
 
-        :param element: Look for this PageElement in `self.contents`.
+        :param element: Look for this `PageElement` in this object's contents.
         """
         for i, child in enumerate(self.contents):
             if child is element:
                 return i
         raise ValueError("Tag.index: element not in tag")
 
-    def get(self, key, default=None):
+    def get(
+        self, key: str, default: Optional[_AttributeValue] = None
+    ) -> Optional[_AttributeValue]:
         """Returns the value of the 'key' attribute for the tag, or
         the value given for 'default' if it doesn't have that
-        attribute."""
+        attribute.
+
+        :param key: The attribute to look for.
+        :param default: Use this value if the attribute is not present
+            on this `Tag`.
+        """
         return self.attrs.get(key, default)
 
-    def get_attribute_list(self, key, default=None):
-        """The same as get(), but always returns a list.
+    def get_attribute_list(
+        self, key: str, default: Optional[AttributeValueList] = None
+    ) -> AttributeValueList:
+        """The same as get(), but always returns a (possibly empty) list.
 
         :param key: The attribute to look for.
         :param default: Use this value if the attribute is not present
-            on this PageElement.
-        :return: A list of values, probably containing only a single
+            on this `Tag`.
+        :return: A list of strings, usually empty or containing only a single
             value.
         """
+        list_value: AttributeValueList
         value = self.get(key, default)
-        if not isinstance(value, list):
-            value = [value]
-        return value
+        if value is None:
+            list_value = self.attribute_value_list_class()
+        elif isinstance(value, list):
+            list_value = value
+        else:
+            if not isinstance(value, str):
+                value = cast(str, value)
+            list_value = self.attribute_value_list_class([value])
+        return list_value
 
-    def has_attr(self, key):
-        """Does this PageElement have an attribute with the given name?"""
+    def has_attr(self, key: str) -> bool:
+        """Does this `Tag` have an attribute with the given name?"""
         return key in self.attrs
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         return str(self).__hash__()
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str) -> _AttributeValue:
         """tag[key] returns the value of the 'key' attribute for the Tag,
         and throws an exception if it's not there."""
         return self.attrs[key]
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[PageElement]:
         "Iterating over a Tag iterates over its contents."
         return iter(self.contents)
 
-    def __len__(self):
+    def __len__(self) -> int:
         "The length of a Tag is the length of its list of contents."
         return len(self.contents)
 
-    def __contains__(self, x):
+    def __contains__(self, x: Any) -> bool:
         return x in self.contents
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         "A tag is non-None even if it has no contents."
         return True
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: str, value: _AttributeValue) -> None:
         """Setting tag[key] sets the value of the 'key' attribute for the
         tag."""
         self.attrs[key] = value
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: str) -> None:
         "Deleting tag[key] deletes all 'key' attributes for the tag."
         self.attrs.pop(key, None)
 
-    def __call__(self, *args, **kwargs):
+    @overload
+    def __call__( # pyright: ignore [reportOverlappingOverload]
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        recursive: bool = True,
+        string: None = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        ...
+
+    @overload
+    def __call__(
+        self,
+        name: None = None,
+        attrs: None = None,
+        recursive: bool = True,
+        string: _StrainableString = "",
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeNavigableStrings:
+        ...
+
+    def __call__(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        recursive: bool = True,
+        string: Optional[_StrainableString] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_SomeTags,_SomeNavigableStrings,_QueryResults]:
         """Calling a Tag like a function is the same as calling its
         find_all() method. Eg. tag('a') returns a list of all the A tags
         found within this tag."""
-        return self.find_all(*args, **kwargs)
+        if string is not None and (name is not None or attrs is not None or kwargs):
+            # TODO: Using the @overload decorator to express the three ways you
+            # could get into this path is way too much code for a rarely(?) used
+            # feature.
+            return cast(ResultSet[Tag], self.find_all(name, attrs, recursive, string, limit, _stacklevel, **kwargs)) #type: ignore
+
+        if string is None:
+            # If string is None, we're searching for tags.
+            tags:ResultSet[Tag] = self.find_all(
+                name, attrs, recursive, None, limit, _stacklevel, **kwargs
+            )
+            return tags
+
+        # Otherwise, we're searching for strings.
+        strings:ResultSet[NavigableString] = self.find_all(
+            None, None, recursive, string, limit, _stacklevel, **kwargs
+        )
+        return strings
 
-    def __getattr__(self, tag):
+    def __getattr__(self, subtag: str) -> Optional[Tag]:
         """Calling tag.subtag is the same as calling tag.find(name="subtag")"""
-        #print("Getattr %s.%s" % (self.__class__, tag))
-        if len(tag) > 3 and tag.endswith('Tag'):
+        # print("Getattr %s.%s" % (self.__class__, tag))
+        result: _AtMostOneElement
+        if len(subtag) > 3 and subtag.endswith("Tag"):
             # BS3: soup.aTag -> "soup.find("a")
-            tag_name = tag[:-3]
+            tag_name = subtag[:-3]
             warnings.warn(
-                '.%(name)sTag is deprecated, use .find("%(name)s") instead. If you really were looking for a tag called %(name)sTag, use .find("%(name)sTag")' % dict(
-                    name=tag_name
-                ),
-                DeprecationWarning, stacklevel=2
+                '.%(name)sTag is deprecated, use .find("%(name)s") instead. If you really were looking for a tag called %(name)sTag, use .find("%(name)sTag")'
+                % dict(name=tag_name),
+                DeprecationWarning,
+                stacklevel=2,
             )
-            return self.find(tag_name)
+            result = self.find(tag_name)
         # We special case contents to avoid recursion.
-        elif not tag.startswith("__") and not tag == "contents":
-            return self.find(tag)
-        raise AttributeError(
-            "'%s' object has no attribute '%s'" % (self.__class__, tag))
+        elif not subtag.startswith("__") and not subtag == "contents":
+            result = self.find(subtag)
+        else:
+            raise AttributeError(
+                "'%s' object has no attribute '%s'" % (self.__class__, subtag)
+            )
+        return result
 
-    def __eq__(self, other):
+    def __eq__(self, other: Any) -> bool:
         """Returns true iff this Tag has the same name, the same attributes,
         and the same contents (recursively) as `other`."""
         if self is other:
             return True
-        if (not hasattr(other, 'name') or
-            not hasattr(other, 'attrs') or
-            not hasattr(other, 'contents') or
-            self.name != other.name or
-            self.attrs != other.attrs or
-            len(self) != len(other)):
+        if not isinstance(other, Tag):
+            return False
+        if (
+            not hasattr(other, "name")
+            or not hasattr(other, "attrs")
+            or not hasattr(other, "contents")
+            or self.name != other.name
+            or self.attrs != other.attrs
+            or len(self) != len(other)
+        ):
             return False
         for i, my_child in enumerate(self.contents):
             if my_child != other.contents[i]:
                 return False
         return True
 
-    def __ne__(self, other):
+    def __ne__(self, other: Any) -> bool:
         """Returns true iff this Tag is not identical to `other`,
         as defined in __eq__."""
         return not self == other
 
-    def __repr__(self, encoding="unicode-escape"):
-        """Renders this PageElement as a string.
-
-        :param encoding: The encoding to use (Python 2 only).
-            TODO: This is now ignored and a warning should be issued
-            if a value is provided.
-        :return: A (Unicode) string.
-        """
-        # "The return value must be a string object", i.e. Unicode
+    def __repr__(self) -> str:
+        """Renders this `Tag` as a string."""
         return self.decode()
 
-    def __unicode__(self):
-        """Renders this PageElement as a Unicode string."""
-        return self.decode()
+    __str__ = __unicode__ = __repr__
 
-    __str__ = __repr__ = __unicode__
+    def encode(
+        self,
+        encoding: _Encoding = DEFAULT_OUTPUT_ENCODING,
+        indent_level: Optional[int] = None,
+        formatter: _FormatterOrName = "minimal",
+        errors: str = "xmlcharrefreplace",
+    ) -> bytes:
+        """Render this `Tag` and its contents as a bytestring.
 
-    def encode(self, encoding=DEFAULT_OUTPUT_ENCODING,
-               indent_level=None, formatter="minimal",
-               errors="xmlcharrefreplace"):
-        """Render a bytestring representation of this PageElement and its
-        contents.
-
-        :param encoding: The destination encoding.
+        :param encoding: The encoding to use when converting to
+           a bytestring. This may also affect the text of the document,
+           specifically any encoding declarations within the document.
         :param indent_level: Each line of the rendering will be
-           indented this many levels. (The formatter decides what a
-           'level' means in terms of spaces or other characters
-           output.) Used internally in recursive calls while
+           indented this many levels. (The ``formatter`` decides what a
+           'level' means, in terms of spaces or other characters
+           output.) This is used internally in recursive calls while
            pretty-printing.
-        :param formatter: A Formatter object, or a string naming one of
+        :param formatter: Either a `Formatter` object, or a string naming one of
             the standard formatters.
         :param errors: An error handling strategy such as
             'xmlcharrefreplace'. This value is passed along into
-            encode() and its value should be one of the constants
-            defined by Python.
-        :return: A bytestring.
-
+            :py:meth:`str.encode` and its value should be one of the `error
+            handling constants defined by Python's codecs module
+            <https://docs.python.org/3/library/codecs.html#error-handlers>`_.
         """
         # Turn the data structure into Unicode, then encode the
         # Unicode.
         u = self.decode(indent_level, encoding, formatter)
         return u.encode(encoding, errors)
 
-    def decode(self, indent_level=None,
-               eventual_encoding=DEFAULT_OUTPUT_ENCODING,
-               formatter="minimal",
-               iterator=None):
+    def decode(
+        self,
+        indent_level: Optional[int] = None,
+        eventual_encoding: _Encoding = DEFAULT_OUTPUT_ENCODING,
+        formatter: _FormatterOrName = "minimal",
+        iterator: Optional[Iterator[PageElement]] = None,
+    ) -> str:
+        """Render this `Tag` and its contents as a Unicode string.
+
+        :param indent_level: Each line of the rendering will be
+           indented this many levels. (The ``formatter`` decides what a
+           'level' means, in terms of spaces or other characters
+           output.) This is used internally in recursive calls while
+           pretty-printing.
+        :param encoding: The encoding you intend to use when
+           converting the string to a bytestring. decode() is *not*
+           responsible for performing that encoding. This information
+           is needed so that a real encoding can be substituted in if
+           the document contains an encoding declaration (e.g. in a
+           <meta> tag).
+        :param formatter: Either a `Formatter` object, or a string
+            naming one of the standard formatters.
+        :param iterator: The iterator to use when navigating over the
+            parse tree. This is only used by `Tag.decode_contents` and
+            you probably won't need to use it.
+        """
         pieces = []
         # First off, turn a non-Formatter `formatter` into a Formatter
         # object. This will stop the lookup from happening over and
@@ -1710,16 +2613,15 @@ def decode(self, indent_level=None,
 
         for event, element in self._event_stream(iterator):
             if event in (Tag.START_ELEMENT_EVENT, Tag.EMPTY_ELEMENT_EVENT):
-                piece = element._format_tag(
-                    eventual_encoding, formatter, opening=True
-                )
+                element = cast(Tag, element)
+                piece = element._format_tag(eventual_encoding, formatter, opening=True)
             elif event is Tag.END_ELEMENT_EVENT:
-                piece = element._format_tag(
-                    eventual_encoding, formatter, opening=False
-                )
+                element = cast(Tag, element)
+                piece = element._format_tag(eventual_encoding, formatter, opening=False)
                 if indent_level is not None:
                     indent_level -= 1
             else:
+                element = cast(NavigableString, element)
                 piece = element.output_ready(formatter)
 
             # Now we need to apply the 'prettiness' -- extra
@@ -1739,18 +2641,19 @@ def decode(self, indent_level=None,
             # The only time the behavior is more complex than that is
             # when we encounter an opening or closing tag that might
             # put us into or out of string literal mode.
-            if (event is Tag.START_ELEMENT_EVENT
+            if (
+                event is Tag.START_ELEMENT_EVENT
                 and not string_literal_tag
-                and not element._should_pretty_print()):
-                    # We are about to enter string literal mode. Add
-                    # whitespace before this tag, but not after. We
-                    # will stay in string literal mode until this tag
-                    # is closed.
-                    indent_before = True
-                    indent_after = False
-                    string_literal_tag = element
-            elif (event is Tag.END_ELEMENT_EVENT
-                  and element is string_literal_tag):
+                and not cast(Tag, element)._should_pretty_print()
+            ):
+                # We are about to enter string literal mode. Add
+                # whitespace before this tag, but not after. We
+                # will stay in string literal mode until this tag
+                # is closed.
+                indent_before = True
+                indent_after = False
+                string_literal_tag = element
+            elif event is Tag.END_ELEMENT_EVENT and element is string_literal_tag:
                 # We are about to exit string literal mode by closing
                 # the tag that sent us into that mode. Add whitespace
                 # after this tag, but not before.
@@ -1761,26 +2664,34 @@ def decode(self, indent_level=None,
             # Now we know whether to add whitespace before and/or
             # after this element.
             if indent_level is not None:
-                if (indent_before or indent_after):
+                if indent_before or indent_after:
                     if isinstance(element, NavigableString):
                         piece = piece.strip()
                     if piece:
                         piece = self._indent_string(
-                            piece, indent_level, formatter,
-                            indent_before, indent_after
+                            piece, indent_level, formatter, indent_before, indent_after
                         )
                 if event == Tag.START_ELEMENT_EVENT:
                     indent_level += 1
             pieces.append(piece)
         return "".join(pieces)
 
-    # Names for the different events yielded by _event_stream
-    START_ELEMENT_EVENT = object()
-    END_ELEMENT_EVENT = object()
-    EMPTY_ELEMENT_EVENT = object()
-    STRING_ELEMENT_EVENT = object()
+    class _TreeTraversalEvent(object):
+        """An internal class representing an event in the process
+        of traversing a parse tree.
+
+        :meta private:
+        """
+
+    # Stand-ins for the different events yielded by _event_stream
+    START_ELEMENT_EVENT = _TreeTraversalEvent()  #: :meta private:
+    END_ELEMENT_EVENT = _TreeTraversalEvent()  #: :meta private:
+    EMPTY_ELEMENT_EVENT = _TreeTraversalEvent()  #: :meta private:
+    STRING_ELEMENT_EVENT = _TreeTraversalEvent()  #: :meta private:
 
-    def _event_stream(self, iterator=None):
+    def _event_stream(
+        self, iterator: Optional[Iterator[PageElement]] = None
+    ) -> Iterator[Tuple[_TreeTraversalEvent, PageElement]]:
         """Yield a sequence of events that can be used to reconstruct the DOM
         for this element.
 
@@ -1796,7 +2707,7 @@ def _event_stream(self, iterator=None):
         :param iterator: An alternate iterator to use when traversing
          the tree.
         """
-        tag_stack = []
+        tag_stack: List[Tag] = []
 
         iterator = iterator or self.self_and_descendants
 
@@ -1822,8 +2733,14 @@ def _event_stream(self, iterator=None):
             now_closed_tag = tag_stack.pop()
             yield Tag.END_ELEMENT_EVENT, now_closed_tag
 
-    def _indent_string(self, s, indent_level, formatter,
-                       indent_before, indent_after):
+    def _indent_string(
+        self,
+        s: str,
+        indent_level: int,
+        formatter: Formatter,
+        indent_before: bool,
+        indent_after: bool,
+    ) -> str:
         """Add indentation whitespace before and/or after a string.
 
         :param s: The string to amend with whitespace.
@@ -1834,36 +2751,38 @@ def _indent_string(self, s, indent_level, formatter,
         :param indent_after: Whether or not to add whitespace
            (a newline) after the string.
         """
-        space_before = ''
+        space_before = ""
         if indent_before and indent_level:
-            space_before = (formatter.indent * indent_level)
+            space_before = formatter.indent * indent_level
 
-        space_after = ''
+        space_after = ""
         if indent_after:
             space_after = "\n"
 
         return space_before + s + space_after
 
-    def _format_tag(self, eventual_encoding, formatter, opening):
+    def _format_tag(
+        self, eventual_encoding: str, formatter: Formatter, opening: bool
+    ) -> str:
         if self.hidden:
             # A hidden tag is invisible, although its contents
             # are visible.
-            return ''
+            return ""
 
         # A tag starts with the < character (see below).
 
         # Then the / character, if this is a closing tag.
-        closing_slash = ''
+        closing_slash = ""
         if not opening:
-            closing_slash = '/'
+            closing_slash = "/"
 
         # Then an optional namespace prefix.
-        prefix = ''
+        prefix = ""
         if self.prefix:
             prefix = self.prefix + ":"
 
         # Then a list of attribute values, if this is an opening tag.
-        attribute_string = ''
+        attribute_string = ""
         if opening:
             attributes = formatter.attributes(self)
             attrs = []
@@ -1872,64 +2791,89 @@ def _format_tag(self, eventual_encoding, formatter, opening):
                     decoded = key
                 else:
                     if isinstance(val, list) or isinstance(val, tuple):
-                        val = ' '.join(val)
+                        val = " ".join(val)
                     elif not isinstance(val, str):
                         val = str(val)
                     elif (
-                            isinstance(val, AttributeValueWithCharsetSubstitution)
-                            and eventual_encoding is not None
+                        isinstance(val, AttributeValueWithCharsetSubstitution)
+                        and eventual_encoding is not None
                     ):
-                        val = val.encode(eventual_encoding)
+                        val = val.substitute_encoding(eventual_encoding)
 
                     text = formatter.attribute_value(val)
-                    decoded = (
-                        str(key) + '='
-                        + formatter.quoted_attribute_value(text))
+                    decoded = str(key) + "=" + formatter.quoted_attribute_value(text)
                 attrs.append(decoded)
             if attrs:
-                attribute_string = ' ' + ' '.join(attrs)
+                attribute_string = " " + " ".join(attrs)
 
         # Then an optional closing slash (for a void element in an
         # XML document).
-        void_element_closing_slash = ''
+        void_element_closing_slash = ""
         if self.is_empty_element:
-            void_element_closing_slash = formatter.void_element_close_prefix or ''
+            void_element_closing_slash = formatter.void_element_close_prefix or ""
 
         # Put it all together.
-        return '<' + closing_slash + prefix + self.name + attribute_string + void_element_closing_slash + '>'
+        return (
+            "<"
+            + closing_slash
+            + prefix
+            + self.name
+            + attribute_string
+            + void_element_closing_slash
+            + ">"
+        )
 
-    def _should_pretty_print(self, indent_level=1):
+    def _should_pretty_print(self, indent_level: int = 1) -> bool:
         """Should this tag be pretty-printed?
 
         Most of them should, but some (such as <pre> in HTML
         documents) should not.
         """
-        return (
-            indent_level is not None
-            and (
-                not self.preserve_whitespace_tags
-                or self.name not in self.preserve_whitespace_tags
-            )
+        return indent_level is not None and (
+            not self.preserve_whitespace_tags
+            or self.name not in self.preserve_whitespace_tags
         )
 
-    def prettify(self, encoding=None, formatter="minimal"):
-        """Pretty-print this PageElement as a string.
-
-        :param encoding: The eventual encoding of the string. If this is None,
-            a Unicode string will be returned.
+    @overload
+    def prettify(
+        self,
+        encoding: None = None,
+        formatter: _FormatterOrName = "minimal",
+    ) -> str:
+        ...
+
+    @overload
+    def prettify(
+        self,
+        encoding: _Encoding,
+        formatter: _FormatterOrName = "minimal",
+    ) -> bytes:
+        ...
+
+    def prettify(
+        self,
+        encoding: Optional[_Encoding] = None,
+        formatter: _FormatterOrName = "minimal",
+    ) -> Union[str, bytes]:
+        """Pretty-print this `Tag` as a string or bytestring.
+
+        :param encoding: The encoding of the bytestring, or None if you want Unicode.
         :param formatter: A Formatter object, or a string naming one of
             the standard formatters.
-        :return: A Unicode string (if encoding==None) or a bytestring
+        :return: A string (if no ``encoding`` is provided) or a bytestring
             (otherwise).
         """
         if encoding is None:
-            return self.decode(True, formatter=formatter)
+            return self.decode(indent_level=0, formatter=formatter)
         else:
-            return self.encode(encoding, True, formatter=formatter)
-
-    def decode_contents(self, indent_level=None,
-                       eventual_encoding=DEFAULT_OUTPUT_ENCODING,
-                       formatter="minimal"):
+            return self.encode(encoding=encoding, indent_level=0, formatter=formatter)
+
+    def decode_contents(
+        self,
+        indent_level: Optional[int] = None,
+        eventual_encoding: _Encoding = DEFAULT_OUTPUT_ENCODING,
+        formatter: _FormatterOrName = "minimal",
+    ) -> str:
         """Renders the contents of this tag as a Unicode string.
 
         :param indent_level: Each line of the rendering will be
@@ -1939,53 +2883,85 @@ def decode_contents(self, indent_level=None,
            pretty-printing.
 
         :param eventual_encoding: The tag is destined to be
-           encoded into this encoding. decode_contents() is _not_
+           encoded into this encoding. decode_contents() is *not*
            responsible for performing that encoding. This information
-           is passed in so that it can be substituted in if the
-           document contains a <META> tag that mentions the document's
-           encoding.
+           is needed so that a real encoding can be substituted in if
+           the document contains an encoding declaration (e.g. in a
+           <meta> tag).
 
-        :param formatter: A Formatter object, or a string naming one of
+        :param formatter: A `Formatter` object, or a string naming one of
             the standard Formatters.
-
         """
-        return self.decode(indent_level, eventual_encoding, formatter,
-                           iterator=self.descendants)
+        return self.decode(
+            indent_level, eventual_encoding, formatter, iterator=self.descendants
+        )
 
     def encode_contents(
-        self, indent_level=None, encoding=DEFAULT_OUTPUT_ENCODING,
-        formatter="minimal"):
+        self,
+        indent_level: Optional[int] = None,
+        encoding: _Encoding = DEFAULT_OUTPUT_ENCODING,
+        formatter: _FormatterOrName = "minimal",
+    ) -> bytes:
         """Renders the contents of this PageElement as a bytestring.
 
         :param indent_level: Each line of the rendering will be
-           indented this many levels. (The formatter decides what a
-           'level' means in terms of spaces or other characters
-           output.) Used internally in recursive calls while
+           indented this many levels. (The ``formatter`` decides what a
+           'level' means, in terms of spaces or other characters
+           output.) This is used internally in recursive calls while
            pretty-printing.
-
-        :param eventual_encoding: The bytestring will be in this encoding.
-
-        :param formatter: A Formatter object, or a string naming one of
-            the standard Formatters.
-
-        :return: A bytestring.
+        :param formatter: Either a `Formatter` object, or a string naming one of
+            the standard formatters.
+        :param encoding: The bytestring will be in this encoding.
         """
         contents = self.decode_contents(indent_level, encoding, formatter)
         return contents.encode(encoding)
 
-    # Old method for BS3 compatibility
-    def renderContents(self, encoding=DEFAULT_OUTPUT_ENCODING,
-                       prettyPrint=False, indentLevel=0):
-        """Deprecated method for BS3 compatibility."""
+    @_deprecated("encode_contents", "4.0.0")
+    def renderContents(
+        self,
+        encoding: _Encoding = DEFAULT_OUTPUT_ENCODING,
+        prettyPrint: bool = False,
+        indentLevel: Optional[int] = 0,
+    ) -> bytes:
+        """Deprecated method for BS3 compatibility.
+
+        :meta private:
+        """
         if not prettyPrint:
             indentLevel = None
-        return self.encode_contents(
-            indent_level=indentLevel, encoding=encoding)
-
-    #Soup methods
-
-    def find(self, name=None, attrs={}, recursive=True, string=None,
-             **kwargs):
+        return self.encode_contents(indent_level=indentLevel, encoding=encoding)
+
+    # Soup methods
+
+    @overload
+    def find(
+            self,
+            name: _FindMethodName = None,
+            attrs: Optional[_StrainableAttributes] = None,
+            recursive: bool = True,
+            string: None=None,
+            **kwargs: _StrainableAttribute,
+    ) -> _AtMostOneTag:
+        ...
+
+    @overload
+    def find(
+            self,
+            name: None=None,
+            attrs: None=None,
+            recursive: bool = True,
+            string: _StrainableString="",
+    ) -> _AtMostOneNavigableString:
+        ...
+
+    def find(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        recursive: bool = True,
+        string: Optional[_StrainableString] = None,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_AtMostOneTag,_AtMostOneNavigableString,_AtMostOneElement]:
         """Look in the children of this PageElement and find the first
         PageElement that matches the given criteria.
 
@@ -1993,89 +2969,146 @@ def find(self, name=None, attrs={}, recursive=True, string=None,
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
+        :param attrs: Additional filters on attribute values.
         :param recursive: If this is True, find() will perform a
-            recursive search of this PageElement's children. Otherwise,
+            recursive search of this Tag's children. Otherwise,
             only the direct children will be considered.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        r = None
-        l = self.find_all(name, attrs, recursive, string, 1, _stacklevel=3,
-                          **kwargs)
-        if l:
-            r = l[0]
-        return r
-    findChild = find #BS2
+        :param string: A filter on the `Tag.string` attribute.
+        :kwargs: Additional filters on attribute values.
+        """
+        if string is not None and (name is not None or attrs is not None or kwargs):
+            # TODO: Using the @overload decorator to express the three ways you
+            # could get into this path is way too much code for a rarely(?) used
+            # feature.
+            elements = self.find_all(name, attrs, recursive, string, 1, _stacklevel=3, **kwargs) # type:ignore
+            if elements:
+                return cast(Tag, elements[0])
+        elif string is None:
+            tags = self.find_all(name, attrs, recursive, None, 1, _stacklevel=3, **kwargs)
+            if tags:
+                return cast(Tag, tags[0])
+        else:
+            strings = self.find_all(None, None, recursive, string, 1, _stacklevel=3, **kwargs)
+            if strings:
+                return cast(NavigableString, strings[0])
+        return None
 
-    def find_all(self, name=None, attrs={}, recursive=True, string=None,
-                 limit=None, **kwargs):
-        """Look in the children of this PageElement and find all
-        PageElements that match the given criteria.
+    findChild = _deprecated_function_alias("findChild", "find", "3.0.0")
+
+    @overload
+    def find_all( # pyright: ignore [reportOverlappingOverload]
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        recursive: bool = True,
+        string: None = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeTags:
+        ...
+
+    @overload
+    def find_all(
+        self,
+        name: None = None,
+        attrs: None = None,
+        recursive: bool = True,
+        string: _StrainableString = "",
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> _SomeNavigableStrings:
+        ...
+
+    def find_all(
+        self,
+        name: _FindMethodName = None,
+        attrs: Optional[_StrainableAttributes] = None,
+        recursive: bool = True,
+        string: Optional[_StrainableString] = None,
+        limit: Optional[int] = None,
+        _stacklevel: int = 2,
+        **kwargs: _StrainableAttribute,
+    ) -> Union[_SomeTags,_SomeNavigableStrings,_QueryResults]:
+        """Look in the children of this `PageElement` and find all
+        `PageElement` objects that match the given criteria.
 
         All find_* methods take a common set of arguments. See the online
         documentation for detailed explanations.
 
         :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
+        :param attrs: Additional filters on attribute values.
         :param recursive: If this is True, find_all() will perform a
             recursive search of this PageElement's children. Otherwise,
             only the direct children will be considered.
         :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
+        :param _stacklevel: Used internally to improve warning messages.
+        :kwargs: Additional filters on attribute values.
         """
         generator = self.descendants
         if not recursive:
             generator = self.children
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(name, attrs, string, limit, generator,
-                              _stacklevel=_stacklevel+1, **kwargs)
-    findAll = find_all       # BS3
-    findChildren = find_all  # BS2
+        _stacklevel += 1
+
+        if string is not None and (name is not None or attrs is not None or kwargs):
+            # TODO: Using the @overload decorator to express the three ways you
+            # could get into this path is way too much code for a rarely(?) used
+            # feature.
+            return cast(ResultSet[Tag],
+                        self._find_all(name, attrs, string, limit, generator,
+                                       _stacklevel=_stacklevel, **kwargs)
+                        )
 
-    #Generator methods
-    @property
-    def children(self):
-        """Iterate over all direct children of this PageElement.
+        if string is None:
+            # If string is None, we're searching for tags.
+            return cast(ResultSet[Tag], self._find_all(
+                name, attrs, None, limit, generator, _stacklevel=_stacklevel, **kwargs
+            ))
 
-        :yield: A sequence of PageElements.
-        """
-        # return iter() to make the purpose of the method clear
-        return iter(self.contents)  # XXX This seems to be untested.
+        # Otherwise, we're searching for strings.
+        return cast(ResultSet[NavigableString], self._find_all(
+            None, None, string, limit, generator, _stacklevel=_stacklevel, **kwargs
+        ))
+
+    findAll = _deprecated_function_alias("findAll", "find_all", "4.0.0")
+    findChildren = _deprecated_function_alias("findChildren", "find_all", "3.0.0")
 
+    # Generator methods
     @property
-    def self_and_descendants(self):
-        """Iterate over this PageElement and its children in a
-        breadth-first sequence.
+    def children(self) -> Iterator[PageElement]:
+        """Iterate over all direct children of this `PageElement`."""
+        return (x for x in self.contents)
 
-        :yield: A sequence of PageElements.
+    @property
+    def self_and_descendants(self) -> Iterator[PageElement]:
+        """Iterate over this `Tag` and its children in a
+        breadth-first sequence.
         """
-        if not self.hidden:
-            yield self
-        for i in self.descendants:
-            yield i
+        return self._self_and(self.descendants)
 
     @property
-    def descendants(self):
-        """Iterate over all children of this PageElement in a
+    def descendants(self) -> Iterator[PageElement]:
+        """Iterate over all children of this `Tag` in a
         breadth-first sequence.
-
-        :yield: A sequence of PageElements.
         """
         if not len(self.contents):
             return
-        stopNode = self._last_descendant().next_element
-        current = self.contents[0]
-        while current is not stopNode:
+        # _last_descendant() can't return None here because
+        # accept_self is True. Worst case, last_descendant will end up
+        # as self.
+        last_descendant = cast(PageElement, self._last_descendant(accept_self=True))
+        stopNode = last_descendant.next_element
+        current: _AtMostOneElement = self.contents[0]
+        while current is not stopNode and current is not None:
+            successor = current.next_element
             yield current
-            current = current.next_element
+            current = successor
 
     # CSS selector code
-    def select_one(self, selector, namespaces=None, **kwargs):
+    def select_one(
+        self, selector: str, namespaces: Optional[Dict[str, str]] = None, **kwargs: Any
+    ) -> Optional[Tag]:
         """Perform a CSS selection operation on the current element.
 
         :param selector: A CSS selector.
@@ -2087,13 +3120,16 @@ def select_one(self, selector, namespaces=None, **kwargs):
 
         :param kwargs: Keyword arguments to be passed into Soup Sieve's
            soupsieve.select() method.
-
-        :return: A Tag.
-        :rtype: bs4.element.Tag
         """
         return self.css.select_one(selector, namespaces, **kwargs)
 
-    def select(self, selector, namespaces=None, limit=None, **kwargs):
+    def select(
+        self,
+        selector: str,
+        namespaces: Optional[Dict[str, str]] = None,
+        limit: int = 0,
+        **kwargs: Any,
+    ) -> ResultSet[Tag]:
         """Perform a CSS selection operation on the current element.
 
         This uses the SoupSieve library.
@@ -2109,327 +3145,67 @@ def select(self, selector, namespaces=None, limit=None, **kwargs):
 
         :param kwargs: Keyword arguments to be passed into SoupSieve's
            soupsieve.select() method.
-
-        :return: A ResultSet of Tags.
-        :rtype: bs4.element.ResultSet
         """
         return self.css.select(selector, namespaces, limit, **kwargs)
 
     @property
-    def css(self):
+    def css(self) -> CSS:
         """Return an interface to the CSS selector API."""
         return CSS(self)
 
     # Old names for backwards compatibility
-    def childGenerator(self):
-        """Deprecated generator."""
+    @_deprecated("children", "4.0.0")
+    def childGenerator(self) -> Iterator[PageElement]:
+        """Deprecated generator.
+
+        :meta private:
+        """
         return self.children
 
-    def recursiveChildGenerator(self):
-        """Deprecated generator."""
+    @_deprecated("descendants", "4.0.0")
+    def recursiveChildGenerator(self) -> Iterator[PageElement]:
+        """Deprecated generator.
+
+        :meta private:
+        """
         return self.descendants
 
-    def has_key(self, key):
+    @_deprecated("has_attr", "4.0.0")
+    def has_key(self, key: str) -> bool:
         """Deprecated method. This was kind of misleading because has_key()
         (attributes) was different from __in__ (contents).
 
         has_key() is gone in Python 3, anyway.
-        """
-        warnings.warn(
-            'has_key is deprecated. Use has_attr(key) instead.',
-            DeprecationWarning, stacklevel=2
-        )
-        return self.has_attr(key)
-
-# Next, a couple classes to represent queries and their results.
-class SoupStrainer(object):
-    """Encapsulates a number of ways of matching a markup element (tag or
-    string).
-
-    This is primarily used to underpin the find_* methods, but you can
-    create one yourself and pass it in as `parse_only` to the
-    `BeautifulSoup` constructor, to parse a subset of a large
-    document.
-    """
 
-    def __init__(self, name=None, attrs={}, string=None, **kwargs):
-        """Constructor.
-
-        The SoupStrainer constructor takes the same arguments passed
-        into the find_* methods. See the online documentation for
-        detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
+        :meta private:
         """
-        if string is None and 'text' in kwargs:
-            string = kwargs.pop('text')
-            warnings.warn(
-                "The 'text' argument to the SoupStrainer constructor is deprecated. Use 'string' instead.",
-                DeprecationWarning, stacklevel=2
-            )
-
-        self.name = self._normalize_search_value(name)
-        if not isinstance(attrs, dict):
-            # Treat a non-dict value for attrs as a search for the 'class'
-            # attribute.
-            kwargs['class'] = attrs
-            attrs = None
-
-        if 'class_' in kwargs:
-            # Treat class_="foo" as a search for the 'class'
-            # attribute, overriding any non-dict value for attrs.
-            kwargs['class'] = kwargs['class_']
-            del kwargs['class_']
-
-        if kwargs:
-            if attrs:
-                attrs = attrs.copy()
-                attrs.update(kwargs)
-            else:
-                attrs = kwargs
-        normalized_attrs = {}
-        for key, value in list(attrs.items()):
-            normalized_attrs[key] = self._normalize_search_value(value)
-
-        self.attrs = normalized_attrs
-        self.string = self._normalize_search_value(string)
-
-        # DEPRECATED but just in case someone is checking this.
-        self.text = self.string
-
-    def _normalize_search_value(self, value):
-        # Leave it alone if it's a Unicode string, a callable, a
-        # regular expression, a boolean, or None.
-        if (isinstance(value, str) or isinstance(value, Callable) or hasattr(value, 'match')
-            or isinstance(value, bool) or value is None):
-            return value
-
-        # If it's a bytestring, convert it to Unicode, treating it as UTF-8.
-        if isinstance(value, bytes):
-            return value.decode("utf8")
-
-        # If it's listlike, convert it into a list of strings.
-        if hasattr(value, '__iter__'):
-            new_value = []
-            for v in value:
-                if (hasattr(v, '__iter__') and not isinstance(v, bytes)
-                    and not isinstance(v, str)):
-                    # This is almost certainly the user's mistake. In the
-                    # interests of avoiding infinite loops, we'll let
-                    # it through as-is rather than doing a recursive call.
-                    new_value.append(v)
-                else:
-                    new_value.append(self._normalize_search_value(v))
-            return new_value
-
-        # Otherwise, convert it into a Unicode string.
-        # The unicode(str()) thing is so this will do the same thing on Python 2
-        # and Python 3.
-        return str(str(value))
-
-    def __str__(self):
-        """A human-readable representation of this SoupStrainer."""
-        if self.string:
-            return self.string
-        else:
-            return "%s|%s" % (self.name, self.attrs)
-
-    def search_tag(self, markup_name=None, markup_attrs={}):
-        """Check whether a Tag with the given name and attributes would
-        match this SoupStrainer.
-
-        Used prospectively to decide whether to even bother creating a Tag
-        object.
-
-        :param markup_name: A tag name as found in some markup.
-        :param markup_attrs: A dictionary of attributes as found in some markup.
-
-        :return: True if the prospective tag would match this SoupStrainer;
-            False otherwise.
-        """
-        found = None
-        markup = None
-        if isinstance(markup_name, Tag):
-            markup = markup_name
-            markup_attrs = markup
-
-        if isinstance(self.name, str):
-            # Optimization for a very common case where the user is
-            # searching for a tag with one specific name, and we're
-            # looking at a tag with a different name.
-            if markup and not markup.prefix and self.name != markup.name:
-                 return False
-
-        call_function_with_tag_data = (
-            isinstance(self.name, Callable)
-            and not isinstance(markup_name, Tag))
-
-        if ((not self.name)
-            or call_function_with_tag_data
-            or (markup and self._matches(markup, self.name))
-            or (not markup and self._matches(markup_name, self.name))):
-            if call_function_with_tag_data:
-                match = self.name(markup_name, markup_attrs)
-            else:
-                match = True
-                markup_attr_map = None
-                for attr, match_against in list(self.attrs.items()):
-                    if not markup_attr_map:
-                        if hasattr(markup_attrs, 'get'):
-                            markup_attr_map = markup_attrs
-                        else:
-                            markup_attr_map = {}
-                            for k, v in markup_attrs:
-                                markup_attr_map[k] = v
-                    attr_value = markup_attr_map.get(attr)
-                    if not self._matches(attr_value, match_against):
-                        match = False
-                        break
-            if match:
-                if markup:
-                    found = markup
-                else:
-                    found = markup_name
-        if found and self.string and not self._matches(found.string, self.string):
-            found = None
-        return found
-
-    # For BS3 compatibility.
-    searchTag = search_tag
-
-    def search(self, markup):
-        """Find all items in `markup` that match this SoupStrainer.
-
-        Used by the core _find_all() method, which is ultimately
-        called by all find_* methods.
-
-        :param markup: A PageElement or a list of them.
-        """
-        # print('looking for %s in %s' % (self, markup))
-        found = None
-        # If given a list of items, scan it for a text element that
-        # matches.
-        if hasattr(markup, '__iter__') and not isinstance(markup, (Tag, str)):
-            for element in markup:
-                if isinstance(element, NavigableString) \
-                       and self.search(element):
-                    found = element
-                    break
-        # If it's a Tag, make sure its name or attributes match.
-        # Don't bother with Tags if we're searching for text.
-        elif isinstance(markup, Tag):
-            if not self.string or self.name or self.attrs:
-                found = self.search_tag(markup)
-        # If it's text, make sure the text matches.
-        elif isinstance(markup, NavigableString) or \
-                 isinstance(markup, str):
-            if not self.name and not self.attrs and self._matches(markup, self.string):
-                found = markup
-        else:
-            raise Exception(
-                "I don't know how to match against a %s" % markup.__class__)
-        return found
-
-    def _matches(self, markup, match_against, already_tried=None):
-        # print(u"Matching %s against %s" % (markup, match_against))
-        result = False
-        if isinstance(markup, list) or isinstance(markup, tuple):
-            # This should only happen when searching a multi-valued attribute
-            # like 'class'.
-            for item in markup:
-                if self._matches(item, match_against):
-                    return True
-            # We didn't match any particular value of the multivalue
-            # attribute, but maybe we match the attribute value when
-            # considered as a string.
-            if self._matches(' '.join(markup), match_against):
-                return True
-            return False
-
-        if match_against is True:
-            # True matches any non-None value.
-            return markup is not None
-
-        if isinstance(match_against, Callable):
-            return match_against(markup)
-
-        # Custom callables take the tag as an argument, but all
-        # other ways of matching match the tag name as a string.
-        original_markup = markup
-        if isinstance(markup, Tag):
-            markup = markup.name
-
-        # Ensure that `markup` is either a Unicode string, or None.
-        markup = self._normalize_search_value(markup)
-
-        if markup is None:
-            # None matches None, False, an empty string, an empty list, and so on.
-            return not match_against
-
-        if (hasattr(match_against, '__iter__')
-            and not isinstance(match_against, str)):
-            # We're asked to match against an iterable of items.
-            # The markup must be match at least one item in the
-            # iterable. We'll try each one in turn.
-            #
-            # To avoid infinite recursion we need to keep track of
-            # items we've already seen.
-            if not already_tried:
-                already_tried = set()
-            for item in match_against:
-                if item.__hash__:
-                    key = item
-                else:
-                    key = id(item)
-                if key in already_tried:
-                    continue
-                else:
-                    already_tried.add(key)
-                    if self._matches(original_markup, item, already_tried):
-                        return True
-            else:
-                return False
-
-        # Beyond this point we might need to run the test twice: once against
-        # the tag's name and once against its prefixed name.
-        match = False
-
-        if not match and isinstance(match_against, str):
-            # Exact string match
-            match = markup == match_against
-
-        if not match and hasattr(match_against, 'search'):
-            # Regexp match
-            return match_against.search(markup)
+        return self.has_attr(key)
 
-        if (not match
-            and isinstance(original_markup, Tag)
-            and original_markup.prefix):
-            # Try the whole thing again with the prefixed tag name.
-            return self._matches(
-                original_markup.prefix + ':' + original_markup.name, match_against
-            )
 
-        return match
+_PageElementT = TypeVar("_PageElementT", bound=PageElement)
 
+class ResultSet(List[_PageElementT], Generic[_PageElementT]):
+    """A ResultSet is a list of `PageElement` objects, gathered as the result
+    of matching an :py:class:`ElementFilter` against a parse tree. Basically, a list of
+    search results.
+    """
 
-class ResultSet(list):
-    """A ResultSet is just a list that keeps track of the SoupStrainer
-    that created it."""
-    def __init__(self, source, result=()):
-        """Constructor.
+    source: Optional[ElementFilter]
 
-        :param source: A SoupStrainer.
-        :param result: A list of PageElements.
-        """
+    def __init__(
+        self, source: Optional[ElementFilter], result: Iterable[_PageElementT] = ()
+    ) -> None:
         super(ResultSet, self).__init__(result)
         self.source = source
 
-    def __getattr__(self, key):
+    def __getattr__(self, key: str) -> None:
         """Raise a helpful exception to explain a common code fix."""
         raise AttributeError(
-            "ResultSet object has no attribute '%s'. You're probably treating a list of elements like a single element. Did you call find_all() when you meant to call find()?" % key
+            f"""ResultSet object has no attribute "{key}". You're probably treating a list of elements like a single element. Did you call find_all() when you meant to call find()?"""
         )
+
+# Now that all the classes used by SoupStrainer have been defined,
+# import SoupStrainer itself into this module to preserve the
+# backwards compatibility of anyone who imports
+# bs4.element.SoupStrainer.
+from bs4.filter import SoupStrainer # noqa: E402
diff --git a/libs/bs4/exceptions.py b/libs/bs4/exceptions.py
new file mode 100644
index 0000000000..1d1a8fb29c
--- /dev/null
+++ b/libs/bs4/exceptions.py
@@ -0,0 +1,28 @@
+"""Exceptions defined by Beautiful Soup itself."""
+
+from typing import Union
+
+
+class StopParsing(Exception):
+    """Exception raised by a TreeBuilder if it's unable to continue parsing."""
+
+
+class FeatureNotFound(ValueError):
+    """Exception raised by the BeautifulSoup constructor if no parser with the
+    requested features is found.
+    """
+
+
+class ParserRejectedMarkup(Exception):
+    """An Exception to be raised when the underlying parser simply
+    refuses to parse the given markup.
+    """
+
+    def __init__(self, message_or_exception: Union[str, Exception]):
+        """Explain why the parser rejected the given markup, either
+        with a textual explanation or another exception.
+        """
+        if isinstance(message_or_exception, Exception):
+            e = message_or_exception
+            message_or_exception = "%s: %s" % (e.__class__.__name__, str(e))
+        super(ParserRejectedMarkup, self).__init__(message_or_exception)
diff --git a/libs/bs4/filter.py b/libs/bs4/filter.py
new file mode 100644
index 0000000000..8dbfa00343
--- /dev/null
+++ b/libs/bs4/filter.py
@@ -0,0 +1,764 @@
+from __future__ import annotations
+from collections import defaultdict
+import re
+from typing import (
+    Any,
+    Callable,
+    cast,
+    Dict,
+    Iterator,
+    Iterable,
+    List,
+    Optional,
+    Sequence,
+    Type,
+    Union,
+)
+import warnings
+
+from bs4._deprecation import _deprecated
+from bs4.element import (
+    AttributeDict,
+    NavigableString,
+    PageElement,
+    ResultSet,
+    Tag,
+)
+from bs4._typing import (
+    _AtMostOneElement,
+    _AttributeValue,
+    _NullableStringMatchFunction,
+    _OneElement,
+    _PageElementMatchFunction,
+    _QueryResults,
+    _RawAttributeValues,
+    _RegularExpressionProtocol,
+    _StrainableAttribute,
+    _StrainableElement,
+    _StrainableString,
+    _StringMatchFunction,
+    _TagMatchFunction,
+)
+
+
+class ElementFilter(object):
+    """`ElementFilter` encapsulates the logic necessary to decide:
+
+    1. whether a `PageElement` (a `Tag` or a `NavigableString`) matches a
+    user-specified query.
+
+    2. whether a given sequence of markup found during initial parsing
+    should be turned into a `PageElement` at all, or simply discarded.
+
+    The base class is the simplest `ElementFilter`. By default, it
+    matches everything and allows all markup to become `PageElement`
+    objects. You can make it more selective by passing in a
+    user-defined match function, or defining a subclass.
+
+    Most users of Beautiful Soup will never need to use
+    `ElementFilter`, or its more capable subclass
+    `SoupStrainer`. Instead, they will use methods like
+    :py:meth:`Tag.find`, which will convert their arguments into
+    `SoupStrainer` objects and run them against the tree.
+
+    However, if you find yourself wanting to treat the arguments to
+    Beautiful Soup's find_*() methods as first-class objects, those
+    objects will be `SoupStrainer` objects. You can create them
+    yourself and then make use of functions like
+    `ElementFilter.filter()`.
+    """
+
+    match_function: Optional[_PageElementMatchFunction]
+
+    def __init__(self, match_function: Optional[_PageElementMatchFunction] = None):
+        """Pass in a match function to easily customize the behavior of
+        `ElementFilter.match` without needing to subclass.
+
+        :param match_function: A function that takes a `PageElement`
+          and returns `True` if that `PageElement` matches some criteria.
+        """
+        self.match_function = match_function
+
+    @property
+    def includes_everything(self) -> bool:
+        """Does this `ElementFilter` obviously include everything? If so,
+        the filter process can be made much faster.
+
+        The `ElementFilter` might turn out to include everything even
+        if this returns `False`, but it won't include everything in an
+        obvious way.
+
+        The base `ElementFilter` implementation includes things based on
+        the match function, so includes_everything is only true if
+        there is no match function.
+        """
+        return not self.match_function
+
+    @property
+    def excludes_everything(self) -> bool:
+        """Does this `ElementFilter` obviously exclude everything? If
+        so, Beautiful Soup will issue a warning if you try to use it
+        when parsing a document.
+
+        The `ElementFilter` might turn out to exclude everything even
+        if this returns `False`, but it won't exclude everything in an
+        obvious way.
+
+        The base `ElementFilter` implementation excludes things based
+        on a match function we can't inspect, so excludes_everything
+        is always false.
+        """
+        return False
+
+    def match(self, element: PageElement, _known_rules:bool=False) -> bool:
+        """Does the given PageElement match the rules set down by this
+        ElementFilter?
+
+        The base implementation delegates to the function passed in to
+        the constructor.
+
+        :param _known_rules: Defined for compatibility with
+            SoupStrainer._match(). Used more for consistency than because
+            we need the performance optimization.
+        """
+        if not _known_rules and self.includes_everything:
+            return True
+        if not self.match_function:
+            return True
+        return self.match_function(element)
+
+    def filter(self, generator: Iterator[PageElement]) -> Iterator[_OneElement]:
+        """The most generic search method offered by Beautiful Soup.
+
+        Acts like Python's built-in `filter`, using
+        `ElementFilter.match` as the filtering function.
+        """
+        # If there are no rules at all, don't bother filtering. Let
+        # anything through.
+        if self.includes_everything:
+            yield from generator
+        while True:
+            try:
+                i = next(generator)
+            except StopIteration:
+                break
+            if i:
+                if self.match(i, _known_rules=True):
+                    yield cast("_OneElement", i)
+
+    def find(self, generator: Iterator[PageElement]) -> _AtMostOneElement:
+        """A lower-level equivalent of :py:meth:`Tag.find`.
+
+        You can pass in your own generator for iterating over
+        `PageElement` objects. The first one that matches this
+        `ElementFilter` will be returned.
+
+        :param generator: A way of iterating over `PageElement`
+            objects.
+        """
+        for match in self.filter(generator):
+            return match
+        return None
+
+    def find_all(
+        self, generator: Iterator[PageElement], limit: Optional[int] = None
+    ) -> _QueryResults:
+        """A lower-level equivalent of :py:meth:`Tag.find_all`.
+
+        You can pass in your own generator for iterating over
+        `PageElement` objects. Only elements that match this
+        `ElementFilter` will be returned in the :py:class:`ResultSet`.
+
+        :param generator: A way of iterating over `PageElement`
+            objects.
+
+        :param limit: Stop looking after finding this many results.
+        """
+        results = []
+        for match in self.filter(generator):
+            results.append(match)
+            if limit is not None and len(results) >= limit:
+                break
+        return ResultSet(self, results)
+
+    def allow_tag_creation(
+        self, nsprefix: Optional[str], name: str, attrs: Optional[_RawAttributeValues]
+    ) -> bool:
+        """Based on the name and attributes of a tag, see whether this
+        `ElementFilter` will allow a `Tag` object to even be created.
+
+        By default, all tags are parsed. To change this, subclass
+        `ElementFilter`.
+
+        :param name: The name of the prospective tag.
+        :param attrs: The attributes of the prospective tag.
+        """
+        return True
+
+    def allow_string_creation(self, string: str) -> bool:
+        """Based on the content of a string, see whether this
+        `ElementFilter` will allow a `NavigableString` object based on
+        this string to be added to the parse tree.
+
+        By default, all strings are processed into `NavigableString`
+        objects. To change this, subclass `ElementFilter`.
+
+        :param str: The string under consideration.
+        """
+        return True
+
+
+class MatchRule(object):
+    """Each MatchRule encapsulates the logic behind a single argument
+    passed in to one of the Beautiful Soup find* methods.
+    """
+
+    string: Optional[str]
+    pattern: Optional[_RegularExpressionProtocol]
+    present: Optional[bool]
+    exclude_everything: Optional[bool]
+    # TODO-TYPING: All MatchRule objects also have an attribute
+    # ``function``, but the type of the function depends on the
+    # subclass.
+
+    def __init__(
+        self,
+        string: Optional[Union[str, bytes]] = None,
+        pattern: Optional[_RegularExpressionProtocol] = None,
+        function: Optional[Callable] = None,
+        present: Optional[bool] = None,
+        exclude_everything: Optional[bool] = None
+    ):
+        if isinstance(string, bytes):
+            string = string.decode("utf8")
+        self.string = string
+        if isinstance(pattern, bytes):
+            self.pattern = re.compile(pattern.decode("utf8"))
+        elif isinstance(pattern, str):
+            self.pattern = re.compile(pattern)
+        else:
+            self.pattern = pattern
+        self.function = function
+        self.present = present
+        self.exclude_everything = exclude_everything
+
+        values = [
+            x
+            for x in (self.string, self.pattern, self.function, self.present, self.exclude_everything)
+            if x is not None
+        ]
+        if len(values) == 0:
+            raise ValueError(
+                "Either string, pattern, function, present, or exclude_everything must be provided."
+            )
+        if len(values) > 1:
+            raise ValueError(
+                "At most one of string, pattern, function, present, and exclude_everything must be provided."
+            )
+
+    def _base_match(self, string: Optional[str]) -> Optional[bool]:
+        """Run the 'cheap' portion of a match, trying to get an answer without
+        calling a potentially expensive custom function.
+
+        :return: True or False if we have a (positive or negative)
+        match; None if we need to keep trying.
+        """
+        # self.exclude_everything matches nothing.
+        if self.exclude_everything:
+            return False
+
+        # self.present==True matches everything except None.
+        if self.present is True:
+            return string is not None
+
+        # self.present==False matches _only_ None.
+        if self.present is False:
+            return string is None
+
+        # self.string does an exact string match.
+        if self.string is not None:
+            # print(f"{self.string} ?= {string}")
+            return self.string == string
+
+        # self.pattern does a regular expression search.
+        if self.pattern is not None:
+            # print(f"{self.pattern} ?~ {string}")
+            if string is None:
+                return False
+            return self.pattern.search(string) is not None
+
+        return None
+
+    def matches_string(self, string: Optional[str]) -> bool:
+        _base_result = self._base_match(string)
+        if _base_result is not None:
+            # No need to invoke the test function.
+            return _base_result
+        if self.function is not None and not self.function(string):
+            # print(f"{self.function}({string}) == False")
+            return False
+        return True
+
+    def __repr__(self) -> str:
+        cls = type(self).__name__
+        return f"<{cls} string={self.string} pattern={self.pattern} function={self.function} present={self.present}>"
+
+    def __eq__(self, other: Any) -> bool:
+        return (
+            isinstance(other, MatchRule)
+            and self.string == other.string
+            and self.pattern == other.pattern
+            and self.function == other.function
+            and self.present == other.present
+        )
+
+
+class TagNameMatchRule(MatchRule):
+    """A MatchRule implementing the rules for matches against tag name."""
+
+    function: Optional[_TagMatchFunction]
+
+    def matches_tag(self, tag: Tag) -> bool:
+        base_value = self._base_match(tag.name)
+        if base_value is not None:
+            return base_value
+
+        # The only remaining possibility is that the match is determined
+        # by a function call. Call the function.
+        function = cast(_TagMatchFunction, self.function)
+        if function(tag):
+            return True
+        return False
+
+
+class AttributeValueMatchRule(MatchRule):
+    """A MatchRule implementing the rules for matches against attribute value."""
+
+    function: Optional[_NullableStringMatchFunction]
+
+
+class StringMatchRule(MatchRule):
+    """A MatchRule implementing the rules for matches against a NavigableString."""
+
+    function: Optional[_StringMatchFunction]
+
+
+class SoupStrainer(ElementFilter):
+    """The `ElementFilter` subclass used internally by Beautiful Soup.
+
+    A `SoupStrainer` encapsulates the logic necessary to perform the
+    kind of matches supported by methods such as
+    :py:meth:`Tag.find`. `SoupStrainer` objects are primarily created
+    internally, but you can create one yourself and pass it in as
+    ``parse_only`` to the `BeautifulSoup` constructor, to parse a
+    subset of a large document.
+
+    Internally, `SoupStrainer` objects work by converting the
+    constructor arguments into `MatchRule` objects. Incoming
+    tags/markup are matched against those rules.
+
+    :param name: One or more restrictions on the tags found in a document.
+
+    :param attrs: A dictionary that maps attribute names to
+      restrictions on tags that use those attributes.
+
+    :param string: One or more restrictions on the strings found in a
+      document.
+
+    :param kwargs: A dictionary that maps attribute names to restrictions
+      on tags that use those attributes. These restrictions are additive to
+      any specified in ``attrs``.
+
+    """
+
+    name_rules: List[TagNameMatchRule]
+    attribute_rules: Dict[str, List[AttributeValueMatchRule]]
+    string_rules: List[StringMatchRule]
+
+    def __init__(
+        self,
+        name: Optional[_StrainableElement] = None,
+        attrs: Optional[Dict[str, _StrainableAttribute]] = None,
+        string: Optional[_StrainableString] = None,
+        **kwargs: _StrainableAttribute,
+    ):
+        if string is None and "text" in kwargs:
+            string = cast(Optional[_StrainableString], kwargs.pop("text"))
+            warnings.warn(
+                "As of version 4.11.0, the 'text' argument to the SoupStrainer constructor is deprecated. Use 'string' instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
+        if name is None and not attrs and not string and not kwargs:
+            # Special case for backwards compatibility. Instantiating
+            # a SoupStrainer with no arguments whatsoever gets you one
+            # that matches all Tags, and only Tags.
+            self.name_rules = [TagNameMatchRule(present=True)]
+        else:
+            self.name_rules = cast(
+                List[TagNameMatchRule], list(self._make_match_rules(name, TagNameMatchRule))
+            )
+        self.attribute_rules = defaultdict(list)
+
+        if attrs is None:
+            attrs = {}
+        if not isinstance(attrs, dict):
+            # Passing something other than a dictionary as attrs is
+            # sugar for matching that thing against the 'class'
+            # attribute.
+            attrs = {"class": attrs}
+
+        for attrdict in attrs, kwargs:
+            for attr, value in attrdict.items():
+                if attr == "class_" and attrdict is kwargs:
+                    # If you pass in 'class_' as part of kwargs, it's
+                    # because class is a Python reserved word. If you
+                    # pass it in as part of the attrs dict, it's
+                    # because you really are looking for an attribute
+                    # called 'class_'.
+                    attr = "class"
+
+                if value is None:
+                    value = False
+                for rule_obj in self._make_match_rules(value, AttributeValueMatchRule):
+                    self.attribute_rules[attr].append(
+                        cast(AttributeValueMatchRule, rule_obj)
+                    )
+
+        self.string_rules = cast(
+            List[StringMatchRule], list(self._make_match_rules(string, StringMatchRule))
+        )
+
+        #: DEPRECATED 4.13.0: You shouldn't need to check this under
+        #: any name (.string or .text), and if you do, you're probably
+        #: not taking into account all of the types of values this
+        #: variable might have. Look at the .string_rules list instead.
+        self.__string = string
+
+    @property
+    def includes_everything(self) -> bool:
+        """Check whether the provided rules will obviously include
+        everything. (They might include everything even if this returns `False`,
+        but not in an obvious way.)
+        """
+        return not self.name_rules and not self.string_rules and not self.attribute_rules
+
+    @property
+    def excludes_everything(self) -> bool:
+        """Check whether the provided rules will obviously exclude
+        everything. (They might exclude everything even if this returns `False`,
+        but not in an obvious way.)
+        """
+        if (self.string_rules and (self.name_rules or self.attribute_rules)):
+            # This is self-contradictory, so the rules exclude everything.
+            return True
+
+        # If there's a rule that ended up treated as an "exclude everything"
+        # rule due to creating a logical inconsistency, then the rules
+        # exclude everything.
+        if any(x.exclude_everything for x in self.string_rules):
+            return True
+        if any(x.exclude_everything for x in self.name_rules):
+            return True
+        for ruleset in self.attribute_rules.values():
+            if any(x.exclude_everything for x in ruleset):
+                return True
+        return False
+
+    @property
+    def string(self) -> Optional[_StrainableString]:
+        ":meta private:"
+        warnings.warn(
+            "Access to deprecated property string. (Look at .string_rules instead) -- Deprecated since version 4.13.0.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.__string
+
+    @property
+    def text(self) -> Optional[_StrainableString]:
+        ":meta private:"
+        warnings.warn(
+            "Access to deprecated property text. (Look at .string_rules instead) -- Deprecated since version 4.13.0.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.__string
+
+    def __repr__(self) -> str:
+        return f"<{self.__class__.__name__} name={self.name_rules} attrs={self.attribute_rules} string={self.string_rules}>"
+
+    @classmethod
+    def _make_match_rules(
+        cls,
+        obj: Optional[Union[_StrainableElement, _StrainableAttribute]],
+        rule_class: Type[MatchRule],
+    ) -> Iterator[MatchRule]:
+        """Convert a vaguely-specific 'object' into one or more well-defined
+        `MatchRule` objects.
+
+        :param obj: Some kind of object that corresponds to one or more
+           matching rules.
+        :param rule_class: Create instances of this `MatchRule` subclass.
+        """
+        if obj is None:
+            return
+        if isinstance(obj, (str, bytes)):
+            yield rule_class(string=obj)
+        elif isinstance(obj, bool):
+            yield rule_class(present=obj)
+        elif callable(obj):
+            yield rule_class(function=obj)
+        elif isinstance(obj, _RegularExpressionProtocol):
+            yield rule_class(pattern=obj)
+        elif hasattr(obj, "__iter__"):
+            if not obj:
+                # The attribute is being matched against the null set,
+                # which means it should exclude everything.
+                yield rule_class(exclude_everything=True)
+            for o in obj:
+                if not isinstance(o, (bytes, str)) and hasattr(o, "__iter__"):
+                    # This is almost certainly the user's
+                    # mistake. This list contains another list, which
+                    # opens up the possibility of infinite
+                    # self-reference. In the interests of avoiding
+                    # infinite recursion, we'll treat this as an
+                    # impossible match and issue a rule that excludes
+                    # everything, rather than looking inside.
+                    warnings.warn(
+                        f"Ignoring nested list {o} to avoid the possibility of infinite recursion.",
+                        stacklevel=5,
+                    )
+                    yield rule_class(exclude_everything=True)
+                    continue
+                for x in cls._make_match_rules(o, rule_class):
+                    yield x
+        else:
+            yield rule_class(string=str(obj))
+
+    def matches_tag(self, tag: Tag) -> bool:
+        """Do the rules of this `SoupStrainer` trigger a match against the
+        given `Tag`?
+
+        If the `SoupStrainer` has any `TagNameMatchRule`, at least one
+        must match the `Tag` or its `Tag.name`.
+
+        If there are any `AttributeValueMatchRule` for a given
+        attribute, at least one of them must match the attribute
+        value.
+
+        If there are any `StringMatchRule`, at least one must match,
+        but a `SoupStrainer` that *only* contains `StringMatchRule`
+        cannot match a `Tag`, only a `NavigableString`.
+        """
+        # If there are no rules at all, let anything through.
+        #if self.includes_everything:
+        #    return True
+
+        # String rules cannot not match a Tag on their own.
+        if not self.name_rules and not self.attribute_rules:
+            return False
+
+        # Optimization for a very common case where the user is
+        # searching for a tag with one specific name, and we're
+        # looking at a tag with a different name.
+        if (
+            not tag.prefix
+            and len(self.name_rules) == 1
+            and self.name_rules[0].string is not None
+            and tag.name != self.name_rules[0].string
+        ):
+            return False
+
+        # If there are name rules, at least one must match. It can
+        # match either the Tag object itself or the prefixed name of
+        # the tag.
+        prefixed_name = None
+        if tag.prefix:
+            prefixed_name = f"{tag.prefix}:{tag.name}"
+        if self.name_rules:
+            name_matches = False
+            for rule in self.name_rules:
+                # attrs = " ".join(
+                #     [f"{k}={v}" for k, v in sorted(tag.attrs.items())]
+                # )
+                # print(f"Testing <{tag.name} {attrs}>{tag.string}</{tag.name}> against {rule}")
+
+                # If the rule contains a function, the function will be called
+                # with `tag`. It will not be called a second time with
+                # `prefixed_name`.
+                if rule.matches_tag(tag) or (
+                        not rule.function and prefixed_name is not None and rule.matches_string(prefixed_name)
+                ):
+                    name_matches = True
+                    break
+
+            if not name_matches:
+                return False
+
+        # If there are attribute rules for a given attribute, at least
+        # one of them must match. If there are rules for multiple
+        # attributes, each attribute must have at least one match.
+        for attr, rules in self.attribute_rules.items():
+            attr_value = tag.get(attr, None)
+            this_attr_match = self._attribute_match(attr_value, rules)
+            if not this_attr_match:
+                return False
+
+        # If there are string rules, at least one must match.
+        if self.string_rules:
+            _str = tag.string
+            if _str is None:
+                return False
+            if not self.matches_any_string_rule(_str):
+                return False
+        return True
+
+    def _attribute_match(
+        self,
+        attr_value: Optional[_AttributeValue],
+        rules: Iterable[AttributeValueMatchRule],
+    ) -> bool:
+        attr_values: Sequence[Optional[str]]
+        if isinstance(attr_value, list):
+            attr_values = attr_value
+        else:
+            attr_values = [cast(str, attr_value)]
+
+        def _match_attribute_value_helper(attr_values: Sequence[Optional[str]]) -> bool:
+            for rule in rules:
+                for attr_value in attr_values:
+                    if rule.matches_string(attr_value):
+                        return True
+            return False
+
+        this_attr_match = _match_attribute_value_helper(attr_values)
+        if not this_attr_match and len(attr_values) != 1:
+            # Try again but treat the attribute value as a single
+            # string instead of a list. The result can only be
+            # different if the list of values contains more or less
+            # than one item.
+
+            # This cast converts Optional[str] to plain str.
+            #
+            # We know there can't be any None in the list. Beautiful
+            # Soup never uses None as a value of a multi-valued
+            # attribute, and if None is passed in as attr_value, it's
+            # turned into a list with 1 element, which was excluded by
+            # the if statement above.
+            attr_values = cast(Sequence[str], attr_values)
+
+            joined_attr_value = " ".join(attr_values)
+            this_attr_match = _match_attribute_value_helper([joined_attr_value])
+        return this_attr_match
+
+    def allow_tag_creation(
+        self, nsprefix: Optional[str], name: str, attrs: Optional[_RawAttributeValues]
+    ) -> bool:
+        """Based on the name and attributes of a tag, see whether this
+        `SoupStrainer` will allow a `Tag` object to even be created.
+
+        :param name: The name of the prospective tag.
+        :param attrs: The attributes of the prospective tag.
+        """
+        if self.string_rules:
+            # A SoupStrainer that has string rules can't be used to
+            # manage tag creation, because the string rule can't be
+            # evaluated until after the tag and all of its contents
+            # have been parsed.
+            return False
+        prefixed_name = None
+        if nsprefix:
+            prefixed_name = f"{nsprefix}:{name}"
+        if self.name_rules:
+            # At least one name rule must match.
+            name_match = False
+            for rule in self.name_rules:
+                for x in name, prefixed_name:
+                    if x is not None:
+                        if rule.matches_string(x):
+                            name_match = True
+                            break
+            if not name_match:
+                return False
+
+        # For each attribute that has rules, at least one rule must
+        # match.
+        if attrs is None:
+            attrs = AttributeDict()
+        for attr, rules in self.attribute_rules.items():
+            attr_value = attrs.get(attr)
+            if not self._attribute_match(attr_value, rules):
+                return False
+
+        return True
+
+    def allow_string_creation(self, string: str) -> bool:
+        """Based on the content of a markup string, see whether this
+        `SoupStrainer` will allow it to be instantiated as a
+        `NavigableString` object, or whether it should be ignored.
+        """
+        if self.name_rules or self.attribute_rules:
+            # A SoupStrainer that has name or attribute rules won't
+            # match any strings; it's designed to match tags with
+            # certain properties.
+            return False
+        if not self.string_rules:
+            # A SoupStrainer with no string rules will match
+            # all strings.
+            return True
+        if not self.matches_any_string_rule(string):
+            return False
+        return True
+
+    def matches_any_string_rule(self, string: str) -> bool:
+        """See whether the content of a string matches any of
+        this `SoupStrainer`'s string rules.
+        """
+        if not self.string_rules:
+            return True
+        for string_rule in self.string_rules:
+            if string_rule.matches_string(string):
+                return True
+        return False
+
+    def match(self, element: PageElement, _known_rules: bool=False) -> bool:
+        """Does the given `PageElement` match the rules set down by this
+        `SoupStrainer`?
+
+        The find_* methods rely heavily on this method to find matches.
+
+        :param element: A `PageElement`.
+        :param _known_rules: Set to true in the common case where
+           we already checked and found at least one rule in this SoupStrainer
+           that might exclude a PageElement. Without this, we need
+           to check .includes_everything every time, just to be safe.
+        :return: `True` if the element matches this `SoupStrainer`'s rules; `False` otherwise.
+        """
+        # If there are no rules at all, let anything through.
+        if not _known_rules and self.includes_everything:
+            return True
+        if isinstance(element, Tag):
+            return self.matches_tag(element)
+        assert isinstance(element, NavigableString)
+        if not (self.name_rules or self.attribute_rules):
+            # A NavigableString can only match a SoupStrainer that
+            # does not define any name or attribute rules.
+            # Then it comes down to the string rules.
+            return self.matches_any_string_rule(element)
+        return False
+
+    @_deprecated("allow_tag_creation", "4.13.0")
+    def search_tag(self, name: str, attrs: Optional[_RawAttributeValues]) -> bool:
+        """A less elegant version of `allow_tag_creation`. Deprecated as of 4.13.0"""
+        ":meta private:"
+        return self.allow_tag_creation(None, name, attrs)
+
+    @_deprecated("match", "4.13.0")
+    def search(self, element: PageElement) -> Optional[PageElement]:
+        """A less elegant version of match(). Deprecated as of 4.13.0.
+
+        :meta private:
+        """
+        return element if self.match(element) else None
diff --git a/libs/bs4/formatter.py b/libs/bs4/formatter.py
index 9fa1b57cb6..4fdfbf012b 100644
--- a/libs/bs4/formatter.py
+++ b/libs/bs4/formatter.py
@@ -1,5 +1,12 @@
+from __future__ import annotations
+from typing import Callable, Dict, Iterable, Optional, Set, Tuple, TYPE_CHECKING, Union
+from typing_extensions import TypeAlias
 from bs4.dammit import EntitySubstitution
 
+if TYPE_CHECKING:
+    from bs4._typing import _AttributeValue
+
+
 class Formatter(EntitySubstitution):
     """Describes a strategy to use when outputting a parse tree to a string.
 
@@ -7,15 +14,17 @@ class Formatter(EntitySubstitution):
     HTML4, HTML5, and XML. Others are configurable by the user.
 
     Formatters are passed in as the `formatter` argument to methods
-    like `PageElement.encode`. Most people won't need to think about
-    formatters, and most people who need to think about them can pass
-    in one of these predefined strings as `formatter` rather than
-    making a new Formatter object:
+    like `bs4.element.Tag.encode`. Most people won't need to
+    think about formatters, and most people who need to think about
+    them can pass in one of these predefined strings as `formatter`
+    rather than making a new Formatter object:
 
     For HTML documents:
      * 'html' - HTML entity substitution for generic HTML documents. (default)
      * 'html5' - HTML entity substitution for HTML5 documents, as
                  well as some optimizations in the way tags are rendered.
+     * 'html5-4.12.0' - The version of the 'html5' formatter used prior to
+                        Beautiful Soup 4.13.0.
      * 'minimal' - Only make the substitutions necessary to guarantee
                    valid HTML.
      * None - Do not perform any substitution. This will be faster
@@ -27,49 +36,75 @@ class Formatter(EntitySubstitution):
                    valid XML. (default)
      * None - Do not perform any substitution. This will be faster
               but may result in invalid markup.
+
     """
-    # Registries of XML and HTML formatters.
-    XML_FORMATTERS = {}
-    HTML_FORMATTERS = {}
 
-    HTML = 'html'
-    XML = 'xml'
+    #: Constant name denoting HTML markup
+    HTML: str = "html"
 
-    HTML_DEFAULTS = dict(
+    #: Constant name denoting XML markup
+    XML: str = "xml"
+
+    #: Default values for the various constructor options when the
+    #: markup language is HTML.
+    HTML_DEFAULTS: Dict[str, Set[str]] = dict(
         cdata_containing_tags=set(["script", "style"]),
     )
 
-    def _default(self, language, value, kwarg):
+    language: Optional[str]  #: :meta private:
+    entity_substitution: Optional[_EntitySubstitutionFunction]  #: :meta private:
+    void_element_close_prefix: str  #: :meta private:
+    cdata_containing_tags: Set[str]  #: :meta private:
+    indent: str  #: :meta private:
+
+    #: If this is set to true by the constructor, then attributes whose
+    #: values are sent to the empty string will be treated as HTML
+    #: boolean attributes. (Attributes whose value is None are always
+    #: rendered this way.)
+    empty_attributes_are_booleans: bool
+
+    def _default(
+        self, language: str, value: Optional[Set[str]], kwarg: str
+    ) -> Set[str]:
         if value is not None:
             return value
         if language == self.XML:
+            # When XML is the markup language in use, all of the
+            # defaults are the empty list.
             return set()
+
+        # Otherwise, it depends on what's in HTML_DEFAULTS.
         return self.HTML_DEFAULTS[kwarg]
 
     def __init__(
-            self, language=None, entity_substitution=None,
-            void_element_close_prefix='/', cdata_containing_tags=None,
-            empty_attributes_are_booleans=False, indent=1,
+        self,
+        language: Optional[str] = None,
+        entity_substitution: Optional[_EntitySubstitutionFunction] = None,
+        void_element_close_prefix: str = "/",
+        cdata_containing_tags: Optional[Set[str]] = None,
+        empty_attributes_are_booleans: bool = False,
+        indent: Union[int,str] = 1,
     ):
         r"""Constructor.
 
-        :param language: This should be Formatter.XML if you are formatting
-           XML markup and Formatter.HTML if you are formatting HTML markup.
+        :param language: This should be `Formatter.XML` if you are formatting
+           XML markup and `Formatter.HTML` if you are formatting HTML markup.
 
         :param entity_substitution: A function to call to replace special
-           characters with XML/HTML entities. For examples, see 
+           characters with XML/HTML entities. For examples, see
            bs4.dammit.EntitySubstitution.substitute_html and substitute_xml.
         :param void_element_close_prefix: By default, void elements
            are represented as <tag/> (XML rules) rather than <tag>
            (HTML rules). To get <tag>, pass in the empty string.
-        :param cdata_containing_tags: The list of tags that are defined
+        :param cdata_containing_tags: The set of tags that are defined
            as containing CDATA in this dialect. For example, in HTML,
            <script> and <style> tags are defined as containing CDATA,
            and their contents should not be formatted.
-        :param blank_attributes_are_booleans: Render attributes whose value
-            is the empty string as HTML-style boolean attributes.
-            (Attributes whose value is None are always rendered this way.)
-
+        :param empty_attributes_are_booleans: If this is set to true,
+          then attributes whose values are sent to the empty string
+          will be treated as `HTML boolean
+          attributes<https://dev.w3.org/html5/spec-LC/common-microsyntaxes.html#boolean-attributes>`_. (Attributes
+          whose value is None are always rendered this way.)
         :param indent: If indent is a non-negative integer or string,
             then the contents of elements will be indented
             appropriately when pretty-printing. An indent level of 0,
@@ -78,47 +113,52 @@ def __init__(
             level. If indent is a string (such as "\t"), that string
             is used to indent each level. The default behavior is to
             indent one space per level.
+
         """
-        self.language = language
+        self.language = language or self.HTML
         self.entity_substitution = entity_substitution
         self.void_element_close_prefix = void_element_close_prefix
         self.cdata_containing_tags = self._default(
-            language, cdata_containing_tags, 'cdata_containing_tags'
+            self.language, cdata_containing_tags, "cdata_containing_tags"
         )
-        self.empty_attributes_are_booleans=empty_attributes_are_booleans
+        self.empty_attributes_are_booleans = empty_attributes_are_booleans
         if indent is None:
             indent = 0
+        indent_str: str
         if isinstance(indent, int):
             if indent < 0:
                 indent = 0
-            indent = ' ' * indent
+            indent_str = " " * indent
         elif isinstance(indent, str):
-            indent = indent
+            indent_str = indent
         else:
-            indent = ' '
-        self.indent = indent
+            indent_str = " "
+        self.indent = indent_str
 
-    def substitute(self, ns):
+    def substitute(self, ns: str) -> str:
         """Process a string that needs to undergo entity substitution.
         This may be a string encountered in an attribute value or as
         text.
 
         :param ns: A string.
-        :return: A string with certain characters replaced by named
+        :return: The same string but with certain characters replaced by named
            or numeric entities.
         """
         if not self.entity_substitution:
             return ns
         from .element import NavigableString
-        if (isinstance(ns, NavigableString)
+
+        if (
+            isinstance(ns, NavigableString)
             and ns.parent is not None
-            and ns.parent.name in self.cdata_containing_tags):
+            and ns.parent.name in self.cdata_containing_tags
+        ):
             # Do nothing.
             return ns
         # Substitute.
         return self.entity_substitution(ns)
 
-    def attribute_value(self, value):
+    def attribute_value(self, value: str) -> str:
         """Process the value of an attribute.
 
         :param ns: A string.
@@ -126,60 +166,111 @@ def attribute_value(self, value):
            or numeric entities.
         """
         return self.substitute(value)
-    
-    def attributes(self, tag):
+
+    def attributes(
+        self, tag: bs4.element.Tag # type:ignore
+    ) -> Iterable[Tuple[str, Optional[_AttributeValue]]]:
         """Reorder a tag's attributes however you want.
-        
+
         By default, attributes are sorted alphabetically. This makes
         behavior consistent between Python 2 and Python 3, and preserves
         backwards compatibility with older versions of Beautiful Soup.
 
-        If `empty_boolean_attributes` is True, then attributes whose
-        values are set to the empty string will be treated as boolean
-        attributes.
+        If `empty_attributes_are_booleans` is True, then
+        attributes whose values are set to the empty string will be
+        treated as boolean attributes.
         """
         if tag.attrs is None:
             return []
+
+        items: Iterable[Tuple[str, _AttributeValue]] = list(tag.attrs.items())
         return sorted(
-            (k, (None if self.empty_attributes_are_booleans and v == '' else v))
-            for k, v in list(tag.attrs.items())
+            (k, (None if self.empty_attributes_are_booleans and v == "" else v))
+            for k, v in items
         )
-   
+
+
 class HTMLFormatter(Formatter):
     """A generic Formatter for HTML."""
-    REGISTRY = {}
-    def __init__(self, *args, **kwargs):
-        super(HTMLFormatter, self).__init__(self.HTML, *args, **kwargs)
 
-    
+    REGISTRY: Dict[Optional[str], HTMLFormatter] = {}
+
+    def __init__(
+        self,
+        entity_substitution: Optional[_EntitySubstitutionFunction] = None,
+        void_element_close_prefix: str = "/",
+        cdata_containing_tags: Optional[Set[str]] = None,
+        empty_attributes_are_booleans: bool = False,
+        indent: Union[int,str] = 1,
+    ):
+        super(HTMLFormatter, self).__init__(
+            self.HTML,
+            entity_substitution,
+            void_element_close_prefix,
+            cdata_containing_tags,
+            empty_attributes_are_booleans,
+            indent=indent
+        )
+
+
 class XMLFormatter(Formatter):
     """A generic Formatter for XML."""
-    REGISTRY = {}
-    def __init__(self, *args, **kwargs):
-        super(XMLFormatter, self).__init__(self.XML, *args, **kwargs)
+
+    REGISTRY: Dict[Optional[str], XMLFormatter] = {}
+
+    def __init__(
+        self,
+        entity_substitution: Optional[_EntitySubstitutionFunction] = None,
+        void_element_close_prefix: str = "/",
+        cdata_containing_tags: Optional[Set[str]] = None,
+        empty_attributes_are_booleans: bool = False,
+        indent: Union[int,str] = 1,
+    ):
+        super(XMLFormatter, self).__init__(
+            self.XML,
+            entity_substitution,
+            void_element_close_prefix,
+            cdata_containing_tags,
+            empty_attributes_are_booleans,
+            indent=indent,
+        )
 
 
 # Set up aliases for the default formatters.
-HTMLFormatter.REGISTRY['html'] = HTMLFormatter(
+HTMLFormatter.REGISTRY["html"] = HTMLFormatter(
     entity_substitution=EntitySubstitution.substitute_html
 )
+
 HTMLFormatter.REGISTRY["html5"] = HTMLFormatter(
+    entity_substitution=EntitySubstitution.substitute_html5,
+    void_element_close_prefix="",
+    empty_attributes_are_booleans=True,
+)
+HTMLFormatter.REGISTRY["html5-4.12"] = HTMLFormatter(
     entity_substitution=EntitySubstitution.substitute_html,
-    void_element_close_prefix=None,
+    void_element_close_prefix="",
     empty_attributes_are_booleans=True,
 )
 HTMLFormatter.REGISTRY["minimal"] = HTMLFormatter(
     entity_substitution=EntitySubstitution.substitute_xml
 )
-HTMLFormatter.REGISTRY[None] = HTMLFormatter(
-    entity_substitution=None
-)
-XMLFormatter.REGISTRY["html"] =  XMLFormatter(
+HTMLFormatter.REGISTRY[None] = HTMLFormatter(entity_substitution=None)
+XMLFormatter.REGISTRY["html"] = XMLFormatter(
     entity_substitution=EntitySubstitution.substitute_html
 )
 XMLFormatter.REGISTRY["minimal"] = XMLFormatter(
     entity_substitution=EntitySubstitution.substitute_xml
 )
-XMLFormatter.REGISTRY[None] = Formatter(
-    Formatter(Formatter.XML, entity_substitution=None)
-)
+
+XMLFormatter.REGISTRY[None] = XMLFormatter(entity_substitution=None)
+
+# Define type aliases to improve readability.
+#
+
+#: A function to call to replace special characters with XML or HTML
+#: entities.
+_EntitySubstitutionFunction: TypeAlias = Callable[[str], str]
+
+# Many of the output-centered methods take an argument that can either
+# be a Formatter object or the name of a Formatter to be looked up.
+_FormatterOrName = Union[Formatter, str]
diff --git a/libs/backports/zoneinfo/py.typed b/libs/bs4/py.typed
similarity index 100%
rename from libs/backports/zoneinfo/py.typed
rename to libs/bs4/py.typed
diff --git a/libs/bs4/tests/__init__.py b/libs/bs4/tests/__init__.py
deleted file mode 100644
index 325affefcd..0000000000
--- a/libs/bs4/tests/__init__.py
+++ /dev/null
@@ -1,1177 +0,0 @@
-# encoding: utf-8
-"""Helper classes for tests."""
-
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
-import pickle
-import copy
-import functools
-import warnings
-import pytest
-from bs4 import BeautifulSoup
-from bs4.element import (
-    CharsetMetaAttributeValue,
-    Comment,
-    ContentMetaAttributeValue,
-    Doctype,
-    PYTHON_SPECIFIC_ENCODINGS,
-    SoupStrainer,
-    Script,
-    Stylesheet,
-    Tag
-)
-
-from bs4.builder import (
-    DetectsXMLParsedAsHTML,
-    HTMLParserTreeBuilder,
-    XMLParsedAsHTMLWarning,
-)
-default_builder = HTMLParserTreeBuilder
-
-# Some tests depend on specific third-party libraries. We use
-# @pytest.mark.skipIf on the following conditionals to skip them
-# if the libraries are not installed.
-try:
-    from soupsieve import SelectorSyntaxError
-    SOUP_SIEVE_PRESENT = True
-except ImportError:
-    SOUP_SIEVE_PRESENT = False
-
-try:
-    import html5lib
-    HTML5LIB_PRESENT = True
-except ImportError:
-    HTML5LIB_PRESENT = False
-
-try:
-    import lxml.etree
-    LXML_PRESENT = True
-    LXML_VERSION = lxml.etree.LXML_VERSION
-except ImportError:
-    LXML_PRESENT = False
-    LXML_VERSION = (0,)
-
-BAD_DOCUMENT = """A bare string
-<!DOCTYPE xsl:stylesheet SYSTEM "htmlent.dtd">
-<!DOCTYPE xsl:stylesheet PUBLIC "htmlent.dtd">
-<div><![CDATA[A CDATA section where it doesn't belong]]></div>
-<div><svg><![CDATA[HTML5 does allow CDATA sections in SVG]]></svg></div>
-<div>A <meta> tag</div>
-<div>A <br> tag that supposedly has contents.</br></div>
-<div>AT&T</div>
-<div><textarea>Within a textarea, markup like <b> tags and <&<&amp; should be treated as literal</textarea></div>
-<div><script>if (i < 2) { alert("<b>Markup within script tags should be treated as literal.</b>"); }</script></div>
-<div>This numeric entity is missing the final semicolon: <x t="pi&#241ata"></div>
-<div><a href="http://example.com/</a> that attribute value never got closed</div>
-<div><a href="foo</a>, </a><a href="bar">that attribute value was closed by the subsequent tag</a></div>
-<! This document starts with a bogus declaration ><div>a</div>
-<div>This document contains <!an incomplete declaration <div>(do you see it?)</div>
-<div>This document ends with <!an incomplete declaration
-<div><a style={height:21px;}>That attribute value was bogus</a></div>
-<! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">The doctype is invalid because it contains extra whitespace
-<div><table><td nowrap>That boolean attribute had no value</td></table></div>
-<div>Here's a nonexistent entity: &#foo; (do you see it?)</div>
-<div>This document ends before the entity finishes: &gt
-<div><p>Paragraphs shouldn't contain block display elements, but this one does: <dl><dt>you see?</dt></p>
-<b b="20" a="1" b="10" a="2" a="3" a="4">Multiple values for the same attribute.</b>
-<div><table><tr><td>Here's a table</td></tr></table></div>
-<div><table id="1"><tr><td>Here's a nested table:<table id="2"><tr><td>foo</td></tr></table></td></div>
-<div>This tag contains nothing but whitespace: <b>    </b></div>
-<div><blockquote><p><b>This p tag is cut off by</blockquote></p>the end of the blockquote tag</div>
-<div><table><div>This table contains bare markup</div></table></div>
-<div><div id="1">\n <a href="link1">This link is never closed.\n</div>\n<div id="2">\n <div id="3">\n   <a href="link2">This link is closed.</a>\n  </div>\n</div></div>
-<div>This document contains a <!DOCTYPE surprise>surprise doctype</div>
-<div><a><B><Cd><EFG>Mixed case tags are folded to lowercase</efg></CD></b></A></div>
-<div><our\u2603>Tag name contains Unicode characters</our\u2603></div>
-<div><a \u2603="snowman">Attribute name contains Unicode characters</a></div>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-"""
-
-
-class SoupTest(object):
-
-    @property
-    def default_builder(self):
-        return default_builder
-
-    def soup(self, markup, **kwargs):
-        """Build a Beautiful Soup object from markup."""
-        builder = kwargs.pop('builder', self.default_builder)
-        return BeautifulSoup(markup, builder=builder, **kwargs)
-
-    def document_for(self, markup, **kwargs):
-        """Turn an HTML fragment into a document.
-
-        The details depend on the builder.
-        """
-        return self.default_builder(**kwargs).test_fragment_to_document(markup)
-   
-    def assert_soup(self, to_parse, compare_parsed_to=None):
-        """Parse some markup using Beautiful Soup and verify that
-        the output markup is as expected.
-        """
-        builder = self.default_builder
-        obj = BeautifulSoup(to_parse, builder=builder)
-        if compare_parsed_to is None:
-            compare_parsed_to = to_parse
-
-        # Verify that the documents come out the same.
-        assert obj.decode() == self.document_for(compare_parsed_to)
-
-        # Also run some checks on the BeautifulSoup object itself:
-
-        # Verify that every tag that was opened was eventually closed.
-
-        # There are no tags in the open tag counter.
-        assert all(v==0 for v in list(obj.open_tag_counter.values()))
-
-        # The only tag in the tag stack is the one for the root
-        # document.
-        assert [obj.ROOT_TAG_NAME] == [x.name for x in obj.tagStack]
-
-    assertSoupEquals = assert_soup
-        
-    def assertConnectedness(self, element):
-        """Ensure that next_element and previous_element are properly
-        set for all descendants of the given element.
-        """
-        earlier = None
-        for e in element.descendants:
-            if earlier:
-                assert e == earlier.next_element
-                assert earlier == e.previous_element
-            earlier = e
-
-    def linkage_validator(self, el, _recursive_call=False):
-        """Ensure proper linkage throughout the document."""
-        descendant = None
-        # Document element should have no previous element or previous sibling.
-        # It also shouldn't have a next sibling.
-        if el.parent is None:
-            assert el.previous_element is None,\
-                "Bad previous_element\nNODE: {}\nPREV: {}\nEXPECTED: {}".format(
-                    el, el.previous_element, None
-                )
-            assert el.previous_sibling is None,\
-                "Bad previous_sibling\nNODE: {}\nPREV: {}\nEXPECTED: {}".format(
-                    el, el.previous_sibling, None
-                )
-            assert el.next_sibling is None,\
-                "Bad next_sibling\nNODE: {}\nNEXT: {}\nEXPECTED: {}".format(
-                    el, el.next_sibling, None
-                )
-
-        idx = 0
-        child = None
-        last_child = None
-        last_idx = len(el.contents) - 1
-        for child in el.contents:
-            descendant = None
-
-            # Parent should link next element to their first child
-            # That child should have no previous sibling
-            if idx == 0:
-                if el.parent is not None:
-                    assert el.next_element is child,\
-                       "Bad next_element\nNODE: {}\nNEXT: {}\nEXPECTED: {}".format(
-                            el, el.next_element, child
-                        )
-                    assert child.previous_element is el,\
-                       "Bad previous_element\nNODE: {}\nPREV: {}\nEXPECTED: {}".format(
-                            child, child.previous_element, el
-                        )
-                    assert child.previous_sibling is None,\
-                       "Bad previous_sibling\nNODE: {}\nPREV {}\nEXPECTED: {}".format(
-                            child, child.previous_sibling, None
-                        )
-
-            # If not the first child, previous index should link as sibling to this index
-            # Previous element should match the last index or the last bubbled up descendant
-            else:
-                assert child.previous_sibling is el.contents[idx - 1],\
-                    "Bad previous_sibling\nNODE: {}\nPREV {}\nEXPECTED {}".format(
-                        child, child.previous_sibling, el.contents[idx - 1]
-                    )
-                assert el.contents[idx - 1].next_sibling is child,\
-                    "Bad next_sibling\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                        el.contents[idx - 1], el.contents[idx - 1].next_sibling, child
-                    )
-
-                if last_child is not None:
-                    assert child.previous_element is last_child,\
-                        "Bad previous_element\nNODE: {}\nPREV {}\nEXPECTED {}\nCONTENTS {}".format(
-                            child, child.previous_element, last_child, child.parent.contents
-                        )
-                    assert last_child.next_element is child,\
-                        "Bad next_element\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                            last_child, last_child.next_element, child
-                        )
-
-            if isinstance(child, Tag) and child.contents:
-                descendant = self.linkage_validator(child, True)
-                # A bubbled up descendant should have no next siblings
-                assert descendant.next_sibling is None,\
-                    "Bad next_sibling\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                        descendant, descendant.next_sibling, None
-                    )
-
-            # Mark last child as either the bubbled up descendant or the current child
-            if descendant is not None:
-                last_child = descendant
-            else:
-                last_child = child
-
-            # If last child, there are non next siblings
-            if idx == last_idx:
-                assert child.next_sibling is None,\
-                    "Bad next_sibling\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                        child, child.next_sibling, None
-                    )
-            idx += 1
-
-        child = descendant if descendant is not None else child
-        if child is None:
-            child = el
-
-        if not _recursive_call and child is not None:
-            target = el
-            while True:
-                if target is None:
-                    assert child.next_element is None, \
-                        "Bad next_element\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                            child, child.next_element, None
-                        )
-                    break
-                elif target.next_sibling is not None:
-                    assert child.next_element is target.next_sibling, \
-                        "Bad next_element\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                            child, child.next_element, target.next_sibling
-                        )
-                    break
-                target = target.parent
-
-            # We are done, so nothing to return
-            return None
-        else:
-            # Return the child to the recursive caller
-            return child
-
-    def assert_selects(self, tags, should_match):
-        """Make sure that the given tags have the correct text.
-
-        This is used in tests that define a bunch of tags, each
-        containing a single string, and then select certain strings by
-        some mechanism.
-        """
-        assert [tag.string for tag in tags] == should_match
-
-    def assert_selects_ids(self, tags, should_match):
-        """Make sure that the given tags have the correct IDs.
-
-        This is used in tests that define a bunch of tags, each
-        containing a single string, and then select certain strings by
-        some mechanism.
-        """
-        assert [tag['id'] for tag in tags] == should_match
-
-
-class TreeBuilderSmokeTest(object):
-    # Tests that are common to HTML and XML tree builders.
-
-    @pytest.mark.parametrize(
-        "multi_valued_attributes",
-        [None, {}, dict(b=['class']), {'*': ['notclass']}]
-    )
-    def test_attribute_not_multi_valued(self, multi_valued_attributes):
-        markup = '<html xmlns="http://www.w3.org/1999/xhtml"><a class="a b c"></html>'
-        soup = self.soup(markup, multi_valued_attributes=multi_valued_attributes)
-        assert soup.a['class'] == 'a b c'
-
-    @pytest.mark.parametrize(
-        "multi_valued_attributes", [dict(a=['class']), {'*': ['class']}]
-    )
-    def test_attribute_multi_valued(self, multi_valued_attributes):
-        markup = '<a class="a b c">'
-        soup = self.soup(
-            markup, multi_valued_attributes=multi_valued_attributes
-        )
-        assert soup.a['class'] == ['a', 'b', 'c']
-
-    def test_invalid_doctype(self):
-        markup = '<![if word]>content<![endif]>'
-        markup = '<!DOCTYPE html]ff>'
-        soup = self.soup(markup)
-
-class HTMLTreeBuilderSmokeTest(TreeBuilderSmokeTest):
-
-    """A basic test of a treebuilder's competence.
-
-    Any HTML treebuilder, present or future, should be able to pass
-    these tests. With invalid markup, there's room for interpretation,
-    and different parsers can handle it differently. But with the
-    markup in these tests, there's not much room for interpretation.
-    """
-
-    def test_empty_element_tags(self):
-        """Verify that all HTML4 and HTML5 empty element (aka void element) tags
-        are handled correctly.
-        """
-        for name in [
-                'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr',
-                'spacer', 'frame'
-        ]:
-            soup = self.soup("")
-            new_tag = soup.new_tag(name)
-            assert new_tag.is_empty_element == True
-
-    def test_special_string_containers(self):
-        soup = self.soup(
-            "<style>Some CSS</style><script>Some Javascript</script>"
-        )
-        assert isinstance(soup.style.string, Stylesheet)
-        assert isinstance(soup.script.string, Script)
-
-        soup = self.soup(
-            "<style><!--Some CSS--></style>"
-        )
-        assert isinstance(soup.style.string, Stylesheet)
-        # The contents of the style tag resemble an HTML comment, but
-        # it's not treated as a comment.
-        assert soup.style.string == "<!--Some CSS-->"
-        assert isinstance(soup.style.string, Stylesheet)
-        
-    def test_pickle_and_unpickle_identity(self):
-        # Pickling a tree, then unpickling it, yields a tree identical
-        # to the original.
-        tree = self.soup("<a><b>foo</a>")
-        dumped = pickle.dumps(tree, 2)
-        loaded = pickle.loads(dumped)
-        assert loaded.__class__ == BeautifulSoup
-        assert loaded.decode() == tree.decode()
-
-    def assertDoctypeHandled(self, doctype_fragment):
-        """Assert that a given doctype string is handled correctly."""
-        doctype_str, soup = self._document_with_doctype(doctype_fragment)
-
-        # Make sure a Doctype object was created.
-        doctype = soup.contents[0]
-        assert doctype.__class__ == Doctype
-        assert doctype == doctype_fragment
-        assert soup.encode("utf8")[:len(doctype_str)] == doctype_str
-
-        # Make sure that the doctype was correctly associated with the
-        # parse tree and that the rest of the document parsed.
-        assert soup.p.contents[0] == 'foo'
-
-    def _document_with_doctype(self, doctype_fragment, doctype_string="DOCTYPE"):
-        """Generate and parse a document with the given doctype."""
-        doctype = '<!%s %s>' % (doctype_string, doctype_fragment)
-        markup = doctype + '\n<p>foo</p>'
-        soup = self.soup(markup)
-        return doctype.encode("utf8"), soup
-
-    def test_normal_doctypes(self):
-        """Make sure normal, everyday HTML doctypes are handled correctly."""
-        self.assertDoctypeHandled("html")
-        self.assertDoctypeHandled(
-            'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
-
-    def test_empty_doctype(self):
-        soup = self.soup("<!DOCTYPE>")
-        doctype = soup.contents[0]
-        assert "" == doctype.strip()
-
-    def test_mixed_case_doctype(self):
-        # A lowercase or mixed-case doctype becomes a Doctype.
-        for doctype_fragment in ("doctype", "DocType"):
-            doctype_str, soup = self._document_with_doctype(
-                "html", doctype_fragment
-            )
-
-            # Make sure a Doctype object was created and that the DOCTYPE
-            # is uppercase.
-            doctype = soup.contents[0]
-            assert doctype.__class__ == Doctype
-            assert doctype == "html"
-            assert soup.encode("utf8")[:len(doctype_str)] == b"<!DOCTYPE html>"
-
-            # Make sure that the doctype was correctly associated with the
-            # parse tree and that the rest of the document parsed.
-            assert soup.p.contents[0] == 'foo'
-        
-    def test_public_doctype_with_url(self):
-        doctype = 'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"'
-        self.assertDoctypeHandled(doctype)
-
-    def test_system_doctype(self):
-        self.assertDoctypeHandled('foo SYSTEM "http://www.example.com/"')
-
-    def test_namespaced_system_doctype(self):
-        # We can handle a namespaced doctype with a system ID.
-        self.assertDoctypeHandled('xsl:stylesheet SYSTEM "htmlent.dtd"')
-
-    def test_namespaced_public_doctype(self):
-        # Test a namespaced doctype with a public id.
-        self.assertDoctypeHandled('xsl:stylesheet PUBLIC "htmlent.dtd"')
-
-    def test_real_xhtml_document(self):
-        """A real XHTML document should come out more or less the same as it went in."""
-        markup = b"""<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Hello.</title></head>
-<body>Goodbye.</body>
-</html>"""
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup(markup)
-        assert soup.encode("utf-8").replace(b"\n", b"") == markup.replace(b"\n", b"")
-
-        # No warning was issued about parsing an XML document as HTML,
-        # because XHTML is both.
-        assert w == []
-
-
-    def test_namespaced_html(self):
-        # When a namespaced XML document is parsed as HTML it should
-        # be treated as HTML with weird tag names.
-        markup = b"""<ns1:foo>content</ns1:foo><ns1:foo/><ns2:foo/>"""
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup(markup)
-
-        assert 2 == len(soup.find_all("ns1:foo"))
-            
-        # n.b. no "you're parsing XML as HTML" warning was given
-        # because there was no XML declaration.
-        assert [] == w
-
-    def test_detect_xml_parsed_as_html(self):
-        # A warning is issued when parsing an XML document as HTML,
-        # but basic stuff should still work.
-        markup = b"""<?xml version="1.0" encoding="utf-8"?><tag>string</tag>"""
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup(markup)
-            assert soup.tag.string == 'string'
-        [warning] = w
-        assert isinstance(warning.message, XMLParsedAsHTMLWarning)
-        assert str(warning.message) == XMLParsedAsHTMLWarning.MESSAGE
-
-        # NOTE: the warning is not issued if the document appears to
-        # be XHTML (tested with test_real_xhtml_document in the
-        # superclass) or if there is no XML declaration (tested with
-        # test_namespaced_html in the superclass).
-        
-    def test_processing_instruction(self):
-        # We test both Unicode and bytestring to verify that
-        # process_markup correctly sets processing_instruction_class
-        # even when the markup is already Unicode and there is no
-        # need to process anything.
-        markup = """<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert markup == soup.decode()
-
-        markup = b"""<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert markup == soup.encode("utf8")
-
-    def test_deepcopy(self):
-        """Make sure you can copy the tree builder.
-
-        This is important because the builder is part of a
-        BeautifulSoup object, and we want to be able to copy that.
-        """
-        copy.deepcopy(self.default_builder)
-
-    def test_p_tag_is_never_empty_element(self):
-        """A <p> tag is never designated as an empty-element tag.
-
-        Even if the markup shows it as an empty-element tag, it
-        shouldn't be presented that way.
-        """
-        soup = self.soup("<p/>")
-        assert not soup.p.is_empty_element
-        assert str(soup.p) == "<p></p>"
-
-    def test_unclosed_tags_get_closed(self):
-        """A tag that's not closed by the end of the document should be closed.
-
-        This applies to all tags except empty-element tags.
-        """
-        self.assert_soup("<p>", "<p></p>")
-        self.assert_soup("<b>", "<b></b>")
-
-        self.assert_soup("<br>", "<br/>")
-
-    def test_br_is_always_empty_element_tag(self):
-        """A <br> tag is designated as an empty-element tag.
-
-        Some parsers treat <br></br> as one <br/> tag, some parsers as
-        two tags, but it should always be an empty-element tag.
-        """
-        soup = self.soup("<br></br>")
-        assert soup.br.is_empty_element
-        assert str(soup.br) == "<br/>"
-
-    def test_nested_formatting_elements(self):
-        self.assert_soup("<em><em></em></em>")
-
-    def test_double_head(self):
-        html = '''<!DOCTYPE html>
-<html>
-<head>
-<title>Ordinary HEAD element test</title>
-</head>
-<script type="text/javascript">
-alert("Help!");
-</script>
-<body>
-Hello, world!
-</body>
-</html>
-'''
-        soup = self.soup(html)
-        assert "text/javascript" == soup.find('script')['type']
-
-    def test_comment(self):
-        # Comments are represented as Comment objects.
-        markup = "<p>foo<!--foobar-->baz</p>"
-        self.assert_soup(markup)
-
-        soup = self.soup(markup)
-        comment = soup.find(string="foobar")
-        assert comment.__class__ == Comment
-
-        # The comment is properly integrated into the tree.
-        foo = soup.find(string="foo")
-        assert comment == foo.next_element
-        baz = soup.find(string="baz")
-        assert comment == baz.previous_element
-
-    def test_preserved_whitespace_in_pre_and_textarea(self):
-        """Whitespace must be preserved in <pre> and <textarea> tags,
-        even if that would mean not prettifying the markup.
-        """
-        pre_markup = "<pre>a   z</pre>\n"
-        textarea_markup = "<textarea> woo\nwoo  </textarea>\n"
-        self.assert_soup(pre_markup)
-        self.assert_soup(textarea_markup)
-
-        soup = self.soup(pre_markup)
-        assert soup.pre.prettify() == pre_markup
-
-        soup = self.soup(textarea_markup)
-        assert soup.textarea.prettify() == textarea_markup
-
-        soup = self.soup("<textarea></textarea>")
-        assert soup.textarea.prettify() == "<textarea></textarea>\n"
-
-    def test_nested_inline_elements(self):
-        """Inline elements can be nested indefinitely."""
-        b_tag = "<b>Inside a B tag</b>"
-        self.assert_soup(b_tag)
-
-        nested_b_tag = "<p>A <i>nested <b>tag</b></i></p>"
-        self.assert_soup(nested_b_tag)
-
-        double_nested_b_tag = "<p>A <a>doubly <i>nested <b>tag</b></i></a></p>"
-        self.assert_soup(nested_b_tag)
-
-    def test_nested_block_level_elements(self):
-        """Block elements can be nested."""
-        soup = self.soup('<blockquote><p><b>Foo</b></p></blockquote>')
-        blockquote = soup.blockquote
-        assert blockquote.p.b.string == 'Foo'
-        assert blockquote.b.string == 'Foo'
-
-    def test_correctly_nested_tables(self):
-        """One table can go inside another one."""
-        markup = ('<table id="1">'
-                  '<tr>'
-                  "<td>Here's another table:"
-                  '<table id="2">'
-                  '<tr><td>foo</td></tr>'
-                  '</table></td>')
-
-        self.assert_soup(
-            markup,
-            '<table id="1"><tr><td>Here\'s another table:'
-            '<table id="2"><tr><td>foo</td></tr></table>'
-            '</td></tr></table>')
-
-        self.assert_soup(
-            "<table><thead><tr><td>Foo</td></tr></thead>"
-            "<tbody><tr><td>Bar</td></tr></tbody>"
-            "<tfoot><tr><td>Baz</td></tr></tfoot></table>")
-
-    def test_multivalued_attribute_with_whitespace(self):
-        # Whitespace separating the values of a multi-valued attribute
-        # should be ignored.
-
-        markup = '<div class=" foo bar	 "></a>'
-        soup = self.soup(markup)
-        assert ['foo', 'bar'] == soup.div['class']
-
-        # If you search by the literal name of the class it's like the whitespace
-        # wasn't there.
-        assert soup.div == soup.find('div', class_="foo bar")
-        
-    def test_deeply_nested_multivalued_attribute(self):
-        # html5lib can set the attributes of the same tag many times
-        # as it rearranges the tree. This has caused problems with
-        # multivalued attributes.
-        markup = '<table><div><div class="css"></div></div></table>'
-        soup = self.soup(markup)
-        assert ["css"] == soup.div.div['class']
-
-    def test_multivalued_attribute_on_html(self):
-        # html5lib uses a different API to set the attributes ot the
-        # <html> tag. This has caused problems with multivalued
-        # attributes.
-        markup = '<html class="a b"></html>'
-        soup = self.soup(markup)
-        assert ["a", "b"] == soup.html['class']
-
-    def test_angle_brackets_in_attribute_values_are_escaped(self):
-        self.assert_soup('<a b="<a>"></a>', '<a b="&lt;a&gt;"></a>')
-
-    def test_strings_resembling_character_entity_references(self):
-        # "&T" and "&p" look like incomplete character entities, but they are
-        # not.
-        self.assert_soup(
-            "<p>&bull; AT&T is in the s&p 500</p>",
-            "<p>\u2022 AT&amp;T is in the s&amp;p 500</p>"
-        )
-
-    def test_apos_entity(self):
-        self.assert_soup(
-            "<p>Bob&apos;s Bar</p>",
-            "<p>Bob's Bar</p>",
-        )
-        
-    def test_entities_in_foreign_document_encoding(self):
-        # &#147; and &#148; are invalid numeric entities referencing
-        # Windows-1252 characters. &#45; references a character common
-        # to Windows-1252 and Unicode, and &#9731; references a
-        # character only found in Unicode.
-        #
-        # All of these entities should be converted to Unicode
-        # characters.
-        markup = "<p>&#147;Hello&#148; &#45;&#9731;</p>"
-        soup = self.soup(markup)
-        assert "โ€œHelloโ€ -โ˜ƒ" == soup.p.string
-        
-    def test_entities_in_attributes_converted_to_unicode(self):
-        expect = '<p id="pi\N{LATIN SMALL LETTER N WITH TILDE}ata"></p>'
-        self.assert_soup('<p id="pi&#241;ata"></p>', expect)
-        self.assert_soup('<p id="pi&#xf1;ata"></p>', expect)
-        self.assert_soup('<p id="pi&#Xf1;ata"></p>', expect)
-        self.assert_soup('<p id="pi&ntilde;ata"></p>', expect)
-
-    def test_entities_in_text_converted_to_unicode(self):
-        expect = '<p>pi\N{LATIN SMALL LETTER N WITH TILDE}ata</p>'
-        self.assert_soup("<p>pi&#241;ata</p>", expect)
-        self.assert_soup("<p>pi&#xf1;ata</p>", expect)
-        self.assert_soup("<p>pi&#Xf1;ata</p>", expect)
-        self.assert_soup("<p>pi&ntilde;ata</p>", expect)
-
-    def test_quot_entity_converted_to_quotation_mark(self):
-        self.assert_soup("<p>I said &quot;good day!&quot;</p>",
-                              '<p>I said "good day!"</p>')
-
-    def test_out_of_range_entity(self):
-        expect = "\N{REPLACEMENT CHARACTER}"
-        self.assert_soup("&#10000000000000;", expect)
-        self.assert_soup("&#x10000000000000;", expect)
-        self.assert_soup("&#1000000000;", expect)
-       
-    def test_multipart_strings(self):
-        "Mostly to prevent a recurrence of a bug in the html5lib treebuilder."
-        soup = self.soup("<html><h2>\nfoo</h2><p></p></html>")
-        assert "p" == soup.h2.string.next_element.name
-        assert "p" == soup.p.name
-        self.assertConnectedness(soup)
-
-    def test_empty_element_tags(self):
-        """Verify consistent handling of empty-element tags,
-        no matter how they come in through the markup.
-        """
-        self.assert_soup('<br/><br/><br/>', "<br/><br/><br/>")
-        self.assert_soup('<br /><br /><br />', "<br/><br/><br/>")
-        
-    def test_head_tag_between_head_and_body(self):
-        "Prevent recurrence of a bug in the html5lib treebuilder."
-        content = """<html><head></head>
-  <link></link>
-  <body>foo</body>
-</html>
-"""
-        soup = self.soup(content)
-        assert soup.html.body is not None
-        self.assertConnectedness(soup)
-
-    def test_multiple_copies_of_a_tag(self):
-        "Prevent recurrence of a bug in the html5lib treebuilder."
-        content = """<!DOCTYPE html>
-<html>
- <body>
-   <article id="a" >
-   <div><a href="1"></div>
-   <footer>
-     <a href="2"></a>
-   </footer>
-  </article>
-  </body>
-</html>
-"""
-        soup = self.soup(content)
-        self.assertConnectedness(soup.article)
-
-    def test_basic_namespaces(self):
-        """Parsers don't need to *understand* namespaces, but at the
-        very least they should not choke on namespaces or lose
-        data."""
-
-        markup = b'<html xmlns="http://www.w3.org/1999/xhtml" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:svg="http://www.w3.org/2000/svg"><head></head><body><mathml:msqrt>4</mathml:msqrt><b svg:fill="red"></b></body></html>'
-        soup = self.soup(markup)
-        assert markup == soup.encode()
-        html = soup.html
-        assert 'http://www.w3.org/1999/xhtml' == soup.html['xmlns']
-        assert 'http://www.w3.org/1998/Math/MathML' == soup.html['xmlns:mathml']
-        assert 'http://www.w3.org/2000/svg' == soup.html['xmlns:svg']
-
-    def test_multivalued_attribute_value_becomes_list(self):
-        markup = b'<a class="foo bar">'
-        soup = self.soup(markup)
-        assert ['foo', 'bar'] == soup.a['class']
-        
-    #
-    # Generally speaking, tests below this point are more tests of
-    # Beautiful Soup than tests of the tree builders. But parsers are
-    # weird, so we run these tests separately for every tree builder
-    # to detect any differences between them.
-    #
-
-    def test_can_parse_unicode_document(self):
-        # A seemingly innocuous document... but it's in Unicode! And
-        # it contains characters that can't be represented in the
-        # encoding found in the  declaration! The horror!
-        markup = '<html><head><meta encoding="euc-jp"></head><body>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</body>'
-        soup = self.soup(markup)
-        assert 'Sacr\xe9 bleu!' == soup.body.string
-
-    def test_soupstrainer(self):
-        """Parsers should be able to work with SoupStrainers."""
-        strainer = SoupStrainer("b")
-        soup = self.soup("A <b>bold</b> <meta/> <i>statement</i>",
-                         parse_only=strainer)
-        assert soup.decode() == "<b>bold</b>"
-
-    def test_single_quote_attribute_values_become_double_quotes(self):
-        self.assert_soup("<foo attr='bar'></foo>",
-                              '<foo attr="bar"></foo>')
-
-    def test_attribute_values_with_nested_quotes_are_left_alone(self):
-        text = """<foo attr='bar "brawls" happen'>a</foo>"""
-        self.assert_soup(text)
-
-    def test_attribute_values_with_double_nested_quotes_get_quoted(self):
-        text = """<foo attr='bar "brawls" happen'>a</foo>"""
-        soup = self.soup(text)
-        soup.foo['attr'] = 'Brawls happen at "Bob\'s Bar"'
-        self.assert_soup(
-            soup.foo.decode(),
-            """<foo attr="Brawls happen at &quot;Bob\'s Bar&quot;">a</foo>""")
-
-    def test_ampersand_in_attribute_value_gets_escaped(self):
-        self.assert_soup('<this is="really messed up & stuff"></this>',
-                              '<this is="really messed up &amp; stuff"></this>')
-
-        self.assert_soup(
-            '<a href="http://example.org?a=1&b=2;3">foo</a>',
-            '<a href="http://example.org?a=1&amp;b=2;3">foo</a>')
-
-    def test_escaped_ampersand_in_attribute_value_is_left_alone(self):
-        self.assert_soup('<a href="http://example.org?a=1&amp;b=2;3"></a>')
-
-    def test_entities_in_strings_converted_during_parsing(self):
-        # Both XML and HTML entities are converted to Unicode characters
-        # during parsing.
-        text = "<p>&lt;&lt;sacr&eacute;&#32;bleu!&gt;&gt;</p>"
-        expected = "<p>&lt;&lt;sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</p>"
-        self.assert_soup(text, expected)
-
-    def test_smart_quotes_converted_on_the_way_in(self):
-        # Microsoft smart quotes are converted to Unicode characters during
-        # parsing.
-        quote = b"<p>\x91Foo\x92</p>"
-        soup = self.soup(quote)
-        assert soup.p.string == "\N{LEFT SINGLE QUOTATION MARK}Foo\N{RIGHT SINGLE QUOTATION MARK}"
-
-    def test_non_breaking_spaces_converted_on_the_way_in(self):
-        soup = self.soup("<a>&nbsp;&nbsp;</a>")
-        assert soup.a.string == "\N{NO-BREAK SPACE}" * 2
-
-    def test_entities_converted_on_the_way_out(self):
-        text = "<p>&lt;&lt;sacr&eacute;&#32;bleu!&gt;&gt;</p>"
-        expected = "<p>&lt;&lt;sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</p>".encode("utf-8")
-        soup = self.soup(text)
-        assert soup.p.encode("utf-8") == expected
-
-    def test_real_iso_8859_document(self):
-        # Smoke test of interrelated functionality, using an
-        # easy-to-understand document.
-
-        # Here it is in Unicode. Note that it claims to be in ISO-8859-1.
-        unicode_html = '<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="Content-type"/></head><body><p>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</p></body></html>'
-
-        # That's because we're going to encode it into ISO-8859-1,
-        # and use that to test.
-        iso_latin_html = unicode_html.encode("iso-8859-1")
-
-        # Parse the ISO-8859-1 HTML.
-        soup = self.soup(iso_latin_html)
-
-        # Encode it to UTF-8.
-        result = soup.encode("utf-8")
-
-        # What do we expect the result to look like? Well, it would
-        # look like unicode_html, except that the META tag would say
-        # UTF-8 instead of ISO-8859-1.
-        expected = unicode_html.replace("ISO-8859-1", "utf-8")
-
-        # And, of course, it would be in UTF-8, not Unicode.
-        expected = expected.encode("utf-8")
-
-        # Ta-da!
-        assert result == expected
-
-    def test_real_shift_jis_document(self):
-        # Smoke test to make sure the parser can handle a document in
-        # Shift-JIS encoding, without choking.
-        shift_jis_html = (
-            b'<html><head></head><body><pre>'
-            b'\x82\xb1\x82\xea\x82\xcdShift-JIS\x82\xc5\x83R\x81[\x83f'
-            b'\x83B\x83\x93\x83O\x82\xb3\x82\xea\x82\xbd\x93\xfa\x96{\x8c'
-            b'\xea\x82\xcc\x83t\x83@\x83C\x83\x8b\x82\xc5\x82\xb7\x81B'
-            b'</pre></body></html>')
-        unicode_html = shift_jis_html.decode("shift-jis")
-        soup = self.soup(unicode_html)
-
-        # Make sure the parse tree is correctly encoded to various
-        # encodings.
-        assert soup.encode("utf-8") == unicode_html.encode("utf-8")
-        assert soup.encode("euc_jp") == unicode_html.encode("euc_jp")
-
-    def test_real_hebrew_document(self):
-        # A real-world test to make sure we can convert ISO-8859-9 (a
-        # Hebrew encoding) to UTF-8.
-        hebrew_document = b'<html><head><title>Hebrew (ISO 8859-8) in Visual Directionality</title></head><body><h1>Hebrew (ISO 8859-8) in Visual Directionality</h1>\xed\xe5\xec\xf9</body></html>'
-        soup = self.soup(
-            hebrew_document, from_encoding="iso8859-8")
-        # Some tree builders call it iso8859-8, others call it iso-8859-9.
-        # That's not a difference we really care about.
-        assert soup.original_encoding in ('iso8859-8', 'iso-8859-8')
-        assert soup.encode('utf-8') == (
-            hebrew_document.decode("iso8859-8").encode("utf-8")
-        )
-
-    def test_meta_tag_reflects_current_encoding(self):
-        # Here's the <meta> tag saying that a document is
-        # encoded in Shift-JIS.
-        meta_tag = ('<meta content="text/html; charset=x-sjis" '
-                    'http-equiv="Content-type"/>')
-
-        # Here's a document incorporating that meta tag.
-        shift_jis_html = (
-            '<html><head>\n%s\n'
-            '<meta http-equiv="Content-language" content="ja"/>'
-            '</head><body>Shift-JIS markup goes here.') % meta_tag
-        soup = self.soup(shift_jis_html)
-
-        # Parse the document, and the charset is seemingly unaffected.
-        parsed_meta = soup.find('meta', {'http-equiv': 'Content-type'})
-        content = parsed_meta['content']
-        assert 'text/html; charset=x-sjis' == content
-
-        # But that value is actually a ContentMetaAttributeValue object.
-        assert isinstance(content, ContentMetaAttributeValue)
-
-        # And it will take on a value that reflects its current
-        # encoding.
-        assert 'text/html; charset=utf8' == content.encode("utf8")
-
-        # For the rest of the story, see TestSubstitutions in
-        # test_tree.py.
-
-    def test_html5_style_meta_tag_reflects_current_encoding(self):
-        # Here's the <meta> tag saying that a document is
-        # encoded in Shift-JIS.
-        meta_tag = ('<meta id="encoding" charset="x-sjis" />')
-
-        # Here's a document incorporating that meta tag.
-        shift_jis_html = (
-            '<html><head>\n%s\n'
-            '<meta http-equiv="Content-language" content="ja"/>'
-            '</head><body>Shift-JIS markup goes here.') % meta_tag
-        soup = self.soup(shift_jis_html)
-
-        # Parse the document, and the charset is seemingly unaffected.
-        parsed_meta = soup.find('meta', id="encoding")
-        charset = parsed_meta['charset']
-        assert 'x-sjis' == charset
-
-        # But that value is actually a CharsetMetaAttributeValue object.
-        assert isinstance(charset, CharsetMetaAttributeValue)
-
-        # And it will take on a value that reflects its current
-        # encoding.
-        assert 'utf8' == charset.encode("utf8")
-
-    def test_python_specific_encodings_not_used_in_charset(self):
-        # You can encode an HTML document using a Python-specific
-        # encoding, but that encoding won't be mentioned _inside_ the
-        # resulting document. Instead, the document will appear to
-        # have no encoding.
-        for markup in [
-            b'<meta charset="utf8"></head>'
-            b'<meta id="encoding" charset="utf-8" />'
-        ]:
-            soup = self.soup(markup)
-            for encoding in PYTHON_SPECIFIC_ENCODINGS:
-                if encoding in (
-                    'idna', 'mbcs', 'oem', 'undefined',
-                    'string_escape', 'string-escape'
-                ):
-                    # For one reason or another, these will raise an
-                    # exception if we actually try to use them, so don't
-                    # bother.
-                    continue
-                encoded = soup.encode(encoding)
-                assert b'meta charset=""' in encoded
-                assert encoding.encode("ascii") not in encoded
-        
-    def test_tag_with_no_attributes_can_have_attributes_added(self):
-        data = self.soup("<a>text</a>")
-        data.a['foo'] = 'bar'
-        assert '<a foo="bar">text</a>' == data.a.decode()
-
-    def test_closing_tag_with_no_opening_tag(self):
-        # Without BeautifulSoup.open_tag_counter, the </span> tag will
-        # cause _popToTag to be called over and over again as we look
-        # for a <span> tag that wasn't there. The result is that 'text2'
-        # will show up outside the body of the document.
-        soup = self.soup("<body><div><p>text1</p></span>text2</div></body>")
-        assert "<body><div><p>text1</p>text2</div></body>" == soup.body.decode()
-        
-    def test_worst_case(self):
-        """Test the worst case (currently) for linking issues."""
-
-        soup = self.soup(BAD_DOCUMENT)
-        self.linkage_validator(soup)
-
-
-class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest):
-
-    def test_pickle_and_unpickle_identity(self):
-        # Pickling a tree, then unpickling it, yields a tree identical
-        # to the original.
-        tree = self.soup("<a><b>foo</a>")
-        dumped = pickle.dumps(tree, 2)
-        loaded = pickle.loads(dumped)
-        assert loaded.__class__ == BeautifulSoup
-        assert loaded.decode() == tree.decode()
-
-    def test_docstring_generated(self):
-        soup = self.soup("<root/>")
-        assert soup.encode() == b'<?xml version="1.0" encoding="utf-8"?>\n<root/>'
-
-    def test_xml_declaration(self):
-        markup = b"""<?xml version="1.0" encoding="utf8"?>\n<foo/>"""
-        soup = self.soup(markup)
-        assert markup == soup.encode("utf8")
-
-    def test_python_specific_encodings_not_used_in_xml_declaration(self):
-        # You can encode an XML document using a Python-specific
-        # encoding, but that encoding won't be mentioned _inside_ the
-        # resulting document.
-        markup = b"""<?xml version="1.0"?>\n<foo/>"""
-        soup = self.soup(markup)
-        for encoding in PYTHON_SPECIFIC_ENCODINGS:
-            if encoding in (
-                'idna', 'mbcs', 'oem', 'undefined',
-                'string_escape', 'string-escape'
-            ):
-                # For one reason or another, these will raise an
-                # exception if we actually try to use them, so don't
-                # bother.
-                continue
-            encoded = soup.encode(encoding)
-            assert b'<?xml version="1.0"?>' in encoded
-            assert encoding.encode("ascii") not in encoded
-
-    def test_processing_instruction(self):
-        markup = b"""<?xml version="1.0" encoding="utf8"?>\n<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert markup == soup.encode("utf8")
-
-    def test_real_xhtml_document(self):
-        """A real XHTML document should come out *exactly* the same as it went in."""
-        markup = b"""<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Hello.</title></head>
-<body>Goodbye.</body>
-</html>"""
-        soup = self.soup(markup)
-        assert soup.encode("utf-8") == markup
-       
-    def test_nested_namespaces(self):
-        doc = b"""<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<parent xmlns="http://ns1/">
-<child xmlns="http://ns2/" xmlns:ns3="http://ns3/">
-<grandchild ns3:attr="value" xmlns="http://ns4/"/>
-</child>
-</parent>"""
-        soup = self.soup(doc)
-        assert doc == soup.encode()
-        
-    def test_formatter_processes_script_tag_for_xml_documents(self):
-        doc = """
-  <script type="text/javascript">
-  </script>
-"""
-        soup = BeautifulSoup(doc, "lxml-xml")
-        # lxml would have stripped this while parsing, but we can add
-        # it later.
-        soup.script.string = 'console.log("< < hey > > ");'
-        encoded = soup.encode()
-        assert b"&lt; &lt; hey &gt; &gt;" in encoded
-
-    def test_can_parse_unicode_document(self):
-        markup = '<?xml version="1.0" encoding="euc-jp"><root>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</root>'
-        soup = self.soup(markup)
-        assert 'Sacr\xe9 bleu!' == soup.root.string
-
-    def test_can_parse_unicode_document_begining_with_bom(self):
-        markup = '\N{BYTE ORDER MARK}<?xml version="1.0" encoding="euc-jp"><root>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</root>'
-        soup = self.soup(markup)
-        assert 'Sacr\xe9 bleu!' == soup.root.string
-        
-    def test_popping_namespaced_tag(self):
-        markup = '<rss xmlns:dc="foo"><dc:creator>b</dc:creator><dc:date>2012-07-02T20:33:42Z</dc:date><dc:rights>c</dc:rights><image>d</image></rss>'
-        soup = self.soup(markup)
-        assert str(soup.rss) == markup
-
-    def test_docstring_includes_correct_encoding(self):
-        soup = self.soup("<root/>")
-        assert soup.encode("latin1") == b'<?xml version="1.0" encoding="latin1"?>\n<root/>'
-
-    def test_large_xml_document(self):
-        """A large XML document should come out the same as it went in."""
-        markup = (b'<?xml version="1.0" encoding="utf-8"?>\n<root>'
-                  + b'0' * (2**12)
-                  + b'</root>')
-        soup = self.soup(markup)
-        assert soup.encode("utf-8") == markup
-
-    def test_tags_are_empty_element_if_and_only_if_they_are_empty(self):
-        self.assert_soup("<p>", "<p/>")
-        self.assert_soup("<p>foo</p>")
-
-    def test_namespaces_are_preserved(self):
-        markup = '<root xmlns:a="http://example.com/" xmlns:b="http://example.net/"><a:foo>This tag is in the a namespace</a:foo><b:foo>This tag is in the b namespace</b:foo></root>'
-        soup = self.soup(markup)
-        root = soup.root
-        assert "http://example.com/" == root['xmlns:a']
-        assert "http://example.net/" == root['xmlns:b']
-
-    def test_closing_namespaced_tag(self):
-        markup = '<p xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>20010504</dc:date></p>'
-        soup = self.soup(markup)
-        assert str(soup.p) == markup
-
-    def test_namespaced_attributes(self):
-        markup = '<foo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><bar xsi:schemaLocation="http://www.example.com"/></foo>'
-        soup = self.soup(markup)
-        assert str(soup.foo) == markup
-
-    def test_namespaced_attributes_xml_namespace(self):
-        markup = '<foo xml:lang="fr">bar</foo>'
-        soup = self.soup(markup)
-        assert str(soup.foo) == markup
-
-    def test_find_by_prefixed_name(self):
-        doc = """<?xml version="1.0" encoding="utf-8"?>
-<Document xmlns="http://example.com/ns0"
-    xmlns:ns1="http://example.com/ns1"
-    xmlns:ns2="http://example.com/ns2">
-    <ns1:tag>foo</ns1:tag>
-    <ns1:tag>bar</ns1:tag>
-    <ns2:tag key="value">baz</ns2:tag>
-</Document>
-"""
-        soup = self.soup(doc)
-
-        # There are three <tag> tags.
-        assert 3 == len(soup.find_all('tag'))
-
-        # But two of them are ns1:tag and one of them is ns2:tag.
-        assert 2 == len(soup.find_all('ns1:tag'))
-        assert 1 == len(soup.find_all('ns2:tag'))
-        
-        assert 1, len(soup.find_all('ns2:tag', key='value'))
-        assert 3, len(soup.find_all(['ns1:tag', 'ns2:tag']))
-        
-    def test_copy_tag_preserves_namespace(self):
-        xml = """<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:document xmlns:w="http://example.com/ns0"/>"""
-    
-        soup = self.soup(xml)
-        tag = soup.document
-        duplicate = copy.copy(tag)
-
-        # The two tags have the same namespace prefix.
-        assert tag.prefix == duplicate.prefix
-
-    def test_worst_case(self):
-        """Test the worst case (currently) for linking issues."""
-
-        soup = self.soup(BAD_DOCUMENT)
-        self.linkage_validator(soup)
-
-
-class HTML5TreeBuilderSmokeTest(HTMLTreeBuilderSmokeTest):
-    """Smoke test for a tree builder that supports HTML5."""
-
-    def test_real_xhtml_document(self):
-        # Since XHTML is not HTML5, HTML5 parsers are not tested to handle
-        # XHTML documents in any particular way.
-        pass
-
-    def test_html_tags_have_namespace(self):
-        markup = "<a>"
-        soup = self.soup(markup)
-        assert "http://www.w3.org/1999/xhtml" == soup.a.namespace
-
-    def test_svg_tags_have_namespace(self):
-        markup = '<svg><circle/></svg>'
-        soup = self.soup(markup)
-        namespace = "http://www.w3.org/2000/svg"
-        assert namespace == soup.svg.namespace
-        assert namespace == soup.circle.namespace
-
-
-    def test_mathml_tags_have_namespace(self):
-        markup = '<math><msqrt>5</msqrt></math>'
-        soup = self.soup(markup)
-        namespace = 'http://www.w3.org/1998/Math/MathML'
-        assert namespace == soup.math.namespace
-        assert namespace == soup.msqrt.namespace
-
-    def test_xml_declaration_becomes_comment(self):
-        markup = '<?xml version="1.0" encoding="utf-8"?><html></html>'
-        soup = self.soup(markup)
-        assert isinstance(soup.contents[0], Comment)
-        assert soup.contents[0] == '?xml version="1.0" encoding="utf-8"?'
-        assert "html" == soup.contents[0].next_element.name
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase
deleted file mode 100644
index 4828f8a423..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase
+++ /dev/null
@@ -1 +0,0 @@
- ��      � <css
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase
deleted file mode 100644
index b34be8b103..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase
+++ /dev/null
@@ -1 +0,0 @@
-�<!DOCTyPEV PUBLIC'''ะ'
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase
deleted file mode 100644
index dbeed3f57a..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase
+++ /dev/null
@@ -1 +0,0 @@
-)<a><math><TR><a><mI><a><p><a>
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase
deleted file mode 100644
index 8a585ce927..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase
deleted file mode 100644
index 0fe66dd23f..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase
deleted file mode 100644
index fd411427d7..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase
deleted file mode 100644
index 6248b2c54f..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase
+++ /dev/null
@@ -1 +0,0 @@
-�                 ><applet></applet><applet></applet><apple|><applet><applet><appl›„><applet><applet></applet></applet></applet></applet><applet></applet><apple>t<applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet>et><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><azplet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><plet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet></applet></applet></applet></applet></appt></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet><<meta charset=utf-8>
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase
deleted file mode 100644
index 107da539fc..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase
deleted file mode 100644
index 367106c76f..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<![ 
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase
deleted file mode 100644
index b8536ef038..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase
+++ /dev/null
@@ -1 +0,0 @@
--<math><sElect><mi><sElect><sElect>
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase
deleted file mode 100644
index d8b549c55a..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase
deleted file mode 100644
index 123e56d4d0..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase
+++ /dev/null
@@ -1 +0,0 @@
-)<math><math><math><math><math><math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase
deleted file mode 100644
index 2831c484e5..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase
+++ /dev/null
@@ -1 +0,0 @@
-๑<table><svg><html>
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase
deleted file mode 100644
index b60a250cad..0000000000
--- a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase
+++ /dev/null
@@ -1 +0,0 @@
--      ��  <math><select><mi><select><select>t
\ No newline at end of file
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase
deleted file mode 100644
index a823d557b4..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase b/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase
deleted file mode 100644
index 65af44d8c1..0000000000
Binary files a/libs/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase b/libs/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase
deleted file mode 100644
index 5559adbb35..0000000000
Binary files a/libs/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase and /dev/null differ
diff --git a/libs/bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase b/libs/bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase
deleted file mode 100644
index 8857115540..0000000000
Binary files a/libs/bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase and /dev/null differ
diff --git a/libs/bs4/tests/test_builder.py b/libs/bs4/tests/test_builder.py
deleted file mode 100644
index 75370712a8..0000000000
--- a/libs/bs4/tests/test_builder.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import pytest
-from unittest.mock import patch
-from bs4.builder import DetectsXMLParsedAsHTML
-
-class TestDetectsXMLParsedAsHTML(object):
-
-    @pytest.mark.parametrize(
-        "markup,looks_like_xml",
-        [("No xml declaration", False),
-         ("<html>obviously HTML</html", False),
-         ("<?xml ><html>Actually XHTML</html>", False),
-         ("<?xml>            <    html>Tricky XHTML</html>", False),
-         ("<?xml ><no-html-tag>", True),
-        ]
-    )
-    def test_warn_if_markup_looks_like_xml(self, markup, looks_like_xml):
-        # Test of our ability to guess at whether markup looks XML-ish
-        # _and_ not HTML-ish.
-        with patch('bs4.builder.DetectsXMLParsedAsHTML._warn') as mock:
-            for data in markup, markup.encode('utf8'):
-                result = DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(
-                    data
-                )
-                assert result == looks_like_xml
-                if looks_like_xml:
-                    assert mock.called
-                else:
-                    assert not mock.called
-                mock.reset_mock()
diff --git a/libs/bs4/tests/test_builder_registry.py b/libs/bs4/tests/test_builder_registry.py
deleted file mode 100644
index 9327174f37..0000000000
--- a/libs/bs4/tests/test_builder_registry.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""Tests of the builder registry."""
-
-import pytest
-import warnings
-
-from bs4 import BeautifulSoup
-from bs4.builder import (
-    builder_registry as registry,
-    HTMLParserTreeBuilder,
-    TreeBuilderRegistry,
-)
-
-from . import (
-    HTML5LIB_PRESENT,
-    LXML_PRESENT,
-)
-
-if HTML5LIB_PRESENT:
-    from bs4.builder import HTML5TreeBuilder
-
-if LXML_PRESENT:
-    from bs4.builder import (
-        LXMLTreeBuilderForXML,
-        LXMLTreeBuilder,
-        )
-
-
-# TODO: Split out the lxml and html5lib tests into their own classes
-# and gate with pytest.mark.skipIf.
-class TestBuiltInRegistry(object):
-    """Test the built-in registry with the default builders registered."""
-
-    def test_combination(self):
-        assert registry.lookup('strict', 'html') == HTMLParserTreeBuilder
-        if LXML_PRESENT:
-            assert registry.lookup('fast', 'html') == LXMLTreeBuilder
-            assert registry.lookup('permissive', 'xml') == LXMLTreeBuilderForXML
-        if HTML5LIB_PRESENT:
-            assert registry.lookup('html5lib', 'html') == HTML5TreeBuilder
-
-    def test_lookup_by_markup_type(self):
-        if LXML_PRESENT:
-            assert registry.lookup('html') == LXMLTreeBuilder
-            assert registry.lookup('xml') == LXMLTreeBuilderForXML
-        else:
-            assert registry.lookup('xml') == None
-            if HTML5LIB_PRESENT:
-                assert registry.lookup('html') == HTML5TreeBuilder
-            else:
-                assert registry.lookup('html') == HTMLParserTreeBuilder
-
-    def test_named_library(self):
-        if LXML_PRESENT:
-            assert registry.lookup('lxml', 'xml') == LXMLTreeBuilderForXML
-            assert registry.lookup('lxml', 'html') == LXMLTreeBuilder
-        if HTML5LIB_PRESENT:
-            assert registry.lookup('html5lib') == HTML5TreeBuilder
-
-        assert registry.lookup('html.parser') == HTMLParserTreeBuilder
-
-    def test_beautifulsoup_constructor_does_lookup(self):
-
-        with warnings.catch_warnings(record=True) as w:
-            # This will create a warning about not explicitly
-            # specifying a parser, but we'll ignore it.
-
-            # You can pass in a string.
-            BeautifulSoup("", features="html")
-            # Or a list of strings.
-            BeautifulSoup("", features=["html", "fast"])
-            pass
-            
-        # You'll get an exception if BS can't find an appropriate
-        # builder.
-        with pytest.raises(ValueError):
-            BeautifulSoup("", features="no-such-feature")
-
-class TestRegistry(object):
-    """Test the TreeBuilderRegistry class in general."""
-
-    def setup_method(self):
-        self.registry = TreeBuilderRegistry()
-
-    def builder_for_features(self, *feature_list):
-        cls = type('Builder_' + '_'.join(feature_list),
-                   (object,), {'features' : feature_list})
-
-        self.registry.register(cls)
-        return cls
-
-    def test_register_with_no_features(self):
-        builder = self.builder_for_features()
-
-        # Since the builder advertises no features, you can't find it
-        # by looking up features.
-        assert self.registry.lookup('foo') is None
-
-        # But you can find it by doing a lookup with no features, if
-        # this happens to be the only registered builder.
-        assert self.registry.lookup() == builder
-
-    def test_register_with_features_makes_lookup_succeed(self):
-        builder = self.builder_for_features('foo', 'bar')
-        assert self.registry.lookup('foo') is builder
-        assert self.registry.lookup('bar') is builder
-
-    def test_lookup_fails_when_no_builder_implements_feature(self):
-        builder = self.builder_for_features('foo', 'bar')
-        assert self.registry.lookup('baz') is None
-
-    def test_lookup_gets_most_recent_registration_when_no_feature_specified(self):
-        builder1 = self.builder_for_features('foo')
-        builder2 = self.builder_for_features('bar')
-        assert self.registry.lookup() == builder2
-
-    def test_lookup_fails_when_no_tree_builders_registered(self):
-        assert self.registry.lookup() is None
-
-    def test_lookup_gets_most_recent_builder_supporting_all_features(self):
-        has_one = self.builder_for_features('foo')
-        has_the_other = self.builder_for_features('bar')
-        has_both_early = self.builder_for_features('foo', 'bar', 'baz')
-        has_both_late = self.builder_for_features('foo', 'bar', 'quux')
-        lacks_one = self.builder_for_features('bar')
-        has_the_other = self.builder_for_features('foo')
-
-        # There are two builders featuring 'foo' and 'bar', but
-        # the one that also features 'quux' was registered later.
-        assert self.registry.lookup('foo', 'bar') == has_both_late
-
-        # There is only one builder featuring 'foo', 'bar', and 'baz'.
-        assert self.registry.lookup('foo', 'bar', 'baz') == has_both_early
-
-    def test_lookup_fails_when_cannot_reconcile_requested_features(self):
-        builder1 = self.builder_for_features('foo', 'bar')
-        builder2 = self.builder_for_features('foo', 'baz')
-        assert self.registry.lookup('bar', 'baz') is None
diff --git a/libs/bs4/tests/test_css.py b/libs/bs4/tests/test_css.py
deleted file mode 100644
index 359dbcd246..0000000000
--- a/libs/bs4/tests/test_css.py
+++ /dev/null
@@ -1,487 +0,0 @@
-import pytest
-import types
-from unittest.mock import MagicMock
-
-from bs4 import (
-    CSS,
-    BeautifulSoup,
-    ResultSet,
-)
-
-from . import (
-    SoupTest,
-    SOUP_SIEVE_PRESENT,
-)
-
-if SOUP_SIEVE_PRESENT:
-    from soupsieve import SelectorSyntaxError
-
-
-@pytest.mark.skipif(not SOUP_SIEVE_PRESENT, reason="Soup Sieve not installed")
-class TestCSSSelectors(SoupTest):
-    """Test basic CSS selector functionality.
-
-    This functionality is implemented in soupsieve, which has a much
-    more comprehensive test suite, so this is basically an extra check
-    that soupsieve works as expected.
-    """
-
-    HTML = """
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>The title</title>
-<link rel="stylesheet" href="blah.css" type="text/css" id="l1">
-</head>
-<body>
-<custom-dashed-tag class="dashed" id="dash1">Hello there.</custom-dashed-tag>
-<div id="main" class="fancy">
-<div id="inner">
-<h1 id="header1">An H1</h1>
-<p>Some text</p>
-<p class="onep" id="p1">Some more text</p>
-<h2 id="header2">An H2</h2>
-<p class="class1 class2 class3" id="pmulti">Another</p>
-<a href="http://bob.example.org/" rel="friend met" id="bob">Bob</a>
-<h2 id="header3">Another H2</h2>
-<a id="me" href="http://simonwillison.net/" rel="me">me</a>
-<span class="s1">
-<a href="#" id="s1a1">span1a1</a>
-<a href="#" id="s1a2">span1a2 <span id="s1a2s1">test</span></a>
-<span class="span2">
-<a href="#" id="s2a1">span2a1</a>
-</span>
-<span class="span3"></span>
-<custom-dashed-tag class="dashed" id="dash2"/>
-<div data-tag="dashedvalue" id="data1"/>
-</span>
-</div>
-<x id="xid">
-<z id="zida"/>
-<z id="zidab"/>
-<z id="zidac"/>
-</x>
-<y id="yid">
-<z id="zidb"/>
-</y>
-<p lang="en" id="lang-en">English</p>
-<p lang="en-gb" id="lang-en-gb">English UK</p>
-<p lang="en-us" id="lang-en-us">English US</p>
-<p lang="fr" id="lang-fr">French</p>
-</div>
-
-<div id="footer">
-</div>
-"""
-
-    def setup_method(self):
-        self.soup = BeautifulSoup(self.HTML, 'html.parser')
-
-    def assert_selects(self, selector, expected_ids, **kwargs):
-        results = self.soup.select(selector, **kwargs)
-        assert isinstance(results, ResultSet)
-        el_ids = [el['id'] for el in results]
-        el_ids.sort()
-        expected_ids.sort()
-        assert expected_ids == el_ids, "Selector %s, expected [%s], got [%s]" % (
-                selector, ', '.join(expected_ids), ', '.join(el_ids)
-        )
-
-    assertSelect = assert_selects
-
-    def assert_select_multiple(self, *tests):
-        for selector, expected_ids in tests:
-            self.assert_selects(selector, expected_ids)
-
-    def test_precompiled(self):
-        sel = self.soup.css.compile('div')
-
-        els = self.soup.select(sel)
-        assert len(els) == 4
-        for div in els:
-            assert div.name == 'div'
-
-        el = self.soup.select_one(sel)
-        assert 'main' == el['id']
-
-    def test_one_tag_one(self):
-        els = self.soup.select('title')
-        assert len(els) == 1
-        assert els[0].name == 'title'
-        assert els[0].contents == ['The title']
-
-    def test_one_tag_many(self):
-        els = self.soup.select('div')
-        assert len(els) == 4
-        for div in els:
-            assert div.name == 'div'
-
-        el = self.soup.select_one('div')
-        assert 'main' == el['id']
-
-    def test_select_one_returns_none_if_no_match(self):
-        match = self.soup.select_one('nonexistenttag')
-        assert None == match
-
-
-    def test_tag_in_tag_one(self):
-        els = self.soup.select('div div')
-        self.assert_selects('div div', ['inner', 'data1'])
-
-    def test_tag_in_tag_many(self):
-        for selector in ('html div', 'html body div', 'body div'):
-            self.assert_selects(selector, ['data1', 'main', 'inner', 'footer'])
-
-
-    def test_limit(self):
-        self.assert_selects('html div', ['main'], limit=1)
-        self.assert_selects('html body div', ['inner', 'main'], limit=2)
-        self.assert_selects('body div', ['data1', 'main', 'inner', 'footer'],
-                           limit=10)
-
-    def test_tag_no_match(self):
-        assert len(self.soup.select('del')) == 0
-
-    def test_invalid_tag(self):
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select('tag%t')
-
-    def test_select_dashed_tag_ids(self):
-        self.assert_selects('custom-dashed-tag', ['dash1', 'dash2'])
-
-    def test_select_dashed_by_id(self):
-        dashed = self.soup.select('custom-dashed-tag[id=\"dash2\"]')
-        assert dashed[0].name == 'custom-dashed-tag'
-        assert dashed[0]['id'] == 'dash2'
-
-    def test_dashed_tag_text(self):
-        assert self.soup.select('body > custom-dashed-tag')[0].text == 'Hello there.'
-
-    def test_select_dashed_matches_find_all(self):
-        assert self.soup.select('custom-dashed-tag') == self.soup.find_all('custom-dashed-tag')
-
-    def test_header_tags(self):
-        self.assert_select_multiple(
-            ('h1', ['header1']),
-            ('h2', ['header2', 'header3']),
-        )
-
-    def test_class_one(self):
-        for selector in ('.onep', 'p.onep', 'html p.onep'):
-            els = self.soup.select(selector)
-            assert len(els) == 1
-            assert els[0].name == 'p'
-            assert els[0]['class'] == ['onep']
-
-    def test_class_mismatched_tag(self):
-        els = self.soup.select('div.onep')
-        assert len(els) == 0
-
-    def test_one_id(self):
-        for selector in ('div#inner', '#inner', 'div div#inner'):
-            self.assert_selects(selector, ['inner'])
-
-    def test_bad_id(self):
-        els = self.soup.select('#doesnotexist')
-        assert len(els) == 0
-
-    def test_items_in_id(self):
-        els = self.soup.select('div#inner p')
-        assert len(els) == 3
-        for el in els:
-            assert el.name == 'p'
-        assert els[1]['class'] == ['onep']
-        assert not els[0].has_attr('class')
-
-    def test_a_bunch_of_emptys(self):
-        for selector in ('div#main del', 'div#main div.oops', 'div div#main'):
-            assert len(self.soup.select(selector)) == 0
-
-    def test_multi_class_support(self):
-        for selector in ('.class1', 'p.class1', '.class2', 'p.class2',
-            '.class3', 'p.class3', 'html p.class2', 'div#inner .class2'):
-            self.assert_selects(selector, ['pmulti'])
-
-    def test_multi_class_selection(self):
-        for selector in ('.class1.class3', '.class3.class2',
-                         '.class1.class2.class3'):
-            self.assert_selects(selector, ['pmulti'])
-
-    def test_child_selector(self):
-        self.assert_selects('.s1 > a', ['s1a1', 's1a2'])
-        self.assert_selects('.s1 > a span', ['s1a2s1'])
-
-    def test_child_selector_id(self):
-        self.assert_selects('.s1 > a#s1a2 span', ['s1a2s1'])
-
-    def test_attribute_equals(self):
-        self.assert_select_multiple(
-            ('p[class="onep"]', ['p1']),
-            ('p[id="p1"]', ['p1']),
-            ('[class="onep"]', ['p1']),
-            ('[id="p1"]', ['p1']),
-            ('link[rel="stylesheet"]', ['l1']),
-            ('link[type="text/css"]', ['l1']),
-            ('link[href="blah.css"]', ['l1']),
-            ('link[href="no-blah.css"]', []),
-            ('[rel="stylesheet"]', ['l1']),
-            ('[type="text/css"]', ['l1']),
-            ('[href="blah.css"]', ['l1']),
-            ('[href="no-blah.css"]', []),
-            ('p[href="no-blah.css"]', []),
-            ('[href="no-blah.css"]', []),
-        )
-
-    def test_attribute_tilde(self):
-        self.assert_select_multiple(
-            ('p[class~="class1"]', ['pmulti']),
-            ('p[class~="class2"]', ['pmulti']),
-            ('p[class~="class3"]', ['pmulti']),
-            ('[class~="class1"]', ['pmulti']),
-            ('[class~="class2"]', ['pmulti']),
-            ('[class~="class3"]', ['pmulti']),
-            ('a[rel~="friend"]', ['bob']),
-            ('a[rel~="met"]', ['bob']),
-            ('[rel~="friend"]', ['bob']),
-            ('[rel~="met"]', ['bob']),
-        )
-
-    def test_attribute_startswith(self):
-        self.assert_select_multiple(
-            ('[rel^="style"]', ['l1']),
-            ('link[rel^="style"]', ['l1']),
-            ('notlink[rel^="notstyle"]', []),
-            ('[rel^="notstyle"]', []),
-            ('link[rel^="notstyle"]', []),
-            ('link[href^="bla"]', ['l1']),
-            ('a[href^="http://"]', ['bob', 'me']),
-            ('[href^="http://"]', ['bob', 'me']),
-            ('[id^="p"]', ['pmulti', 'p1']),
-            ('[id^="m"]', ['me', 'main']),
-            ('div[id^="m"]', ['main']),
-            ('a[id^="m"]', ['me']),
-            ('div[data-tag^="dashed"]', ['data1'])
-        )
-
-    def test_attribute_endswith(self):
-        self.assert_select_multiple(
-            ('[href$=".css"]', ['l1']),
-            ('link[href$=".css"]', ['l1']),
-            ('link[id$="1"]', ['l1']),
-            ('[id$="1"]', ['data1', 'l1', 'p1', 'header1', 's1a1', 's2a1', 's1a2s1', 'dash1']),
-            ('div[id$="1"]', ['data1']),
-            ('[id$="noending"]', []),
-        )
-
-    def test_attribute_contains(self):
-        self.assert_select_multiple(
-            # From test_attribute_startswith
-            ('[rel*="style"]', ['l1']),
-            ('link[rel*="style"]', ['l1']),
-            ('notlink[rel*="notstyle"]', []),
-            ('[rel*="notstyle"]', []),
-            ('link[rel*="notstyle"]', []),
-            ('link[href*="bla"]', ['l1']),
-            ('[href*="http://"]', ['bob', 'me']),
-            ('[id*="p"]', ['pmulti', 'p1']),
-            ('div[id*="m"]', ['main']),
-            ('a[id*="m"]', ['me']),
-            # From test_attribute_endswith
-            ('[href*=".css"]', ['l1']),
-            ('link[href*=".css"]', ['l1']),
-            ('link[id*="1"]', ['l1']),
-            ('[id*="1"]', ['data1', 'l1', 'p1', 'header1', 's1a1', 's1a2', 's2a1', 's1a2s1', 'dash1']),
-            ('div[id*="1"]', ['data1']),
-            ('[id*="noending"]', []),
-            # New for this test
-            ('[href*="."]', ['bob', 'me', 'l1']),
-            ('a[href*="."]', ['bob', 'me']),
-            ('link[href*="."]', ['l1']),
-            ('div[id*="n"]', ['main', 'inner']),
-            ('div[id*="nn"]', ['inner']),
-            ('div[data-tag*="edval"]', ['data1'])
-        )
-
-    def test_attribute_exact_or_hypen(self):
-        self.assert_select_multiple(
-            ('p[lang|="en"]', ['lang-en', 'lang-en-gb', 'lang-en-us']),
-            ('[lang|="en"]', ['lang-en', 'lang-en-gb', 'lang-en-us']),
-            ('p[lang|="fr"]', ['lang-fr']),
-            ('p[lang|="gb"]', []),
-        )
-
-    def test_attribute_exists(self):
-        self.assert_select_multiple(
-            ('[rel]', ['l1', 'bob', 'me']),
-            ('link[rel]', ['l1']),
-            ('a[rel]', ['bob', 'me']),
-            ('[lang]', ['lang-en', 'lang-en-gb', 'lang-en-us', 'lang-fr']),
-            ('p[class]', ['p1', 'pmulti']),
-            ('[blah]', []),
-            ('p[blah]', []),
-            ('div[data-tag]', ['data1'])
-        )
-
-    def test_quoted_space_in_selector_name(self):
-        html = """<div style="display: wrong">nope</div>
-        <div style="display: right">yes</div>
-        """
-        soup = BeautifulSoup(html, 'html.parser')
-        [chosen] = soup.select('div[style="display: right"]')
-        assert "yes" == chosen.string
-
-    def test_unsupported_pseudoclass(self):
-        with pytest.raises(NotImplementedError):
-            self.soup.select("a:no-such-pseudoclass")
-
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select("a:nth-of-type(a)")
-
-    def test_nth_of_type(self):
-        # Try to select first paragraph
-        els = self.soup.select('div#inner p:nth-of-type(1)')
-        assert len(els) == 1
-        assert els[0].string == 'Some text'
-
-        # Try to select third paragraph
-        els = self.soup.select('div#inner p:nth-of-type(3)')
-        assert len(els) == 1
-        assert els[0].string == 'Another'
-
-        # Try to select (non-existent!) fourth paragraph
-        els = self.soup.select('div#inner p:nth-of-type(4)')
-        assert len(els) == 0
-
-        # Zero will select no tags.
-        els = self.soup.select('div p:nth-of-type(0)')
-        assert len(els) == 0
-
-    def test_nth_of_type_direct_descendant(self):
-        els = self.soup.select('div#inner > p:nth-of-type(1)')
-        assert len(els) == 1
-        assert els[0].string == 'Some text'
-
-    def test_id_child_selector_nth_of_type(self):
-        self.assert_selects('#inner > p:nth-of-type(2)', ['p1'])
-
-    def test_select_on_element(self):
-        # Other tests operate on the tree; this operates on an element
-        # within the tree.
-        inner = self.soup.find("div", id="main")
-        selected = inner.select("div")
-        # The <div id="inner"> tag was selected. The <div id="footer">
-        # tag was not.
-        self.assert_selects_ids(selected, ['inner', 'data1'])
-
-    def test_overspecified_child_id(self):
-        self.assert_selects(".fancy #inner", ['inner'])
-        self.assert_selects(".normal #inner", [])
-
-    def test_adjacent_sibling_selector(self):
-        self.assert_selects('#p1 + h2', ['header2'])
-        self.assert_selects('#p1 + h2 + p', ['pmulti'])
-        self.assert_selects('#p1 + #header2 + .class1', ['pmulti'])
-        assert [] == self.soup.select('#p1 + p')
-
-    def test_general_sibling_selector(self):
-        self.assert_selects('#p1 ~ h2', ['header2', 'header3'])
-        self.assert_selects('#p1 ~ #header2', ['header2'])
-        self.assert_selects('#p1 ~ h2 + a', ['me'])
-        self.assert_selects('#p1 ~ h2 + [rel="me"]', ['me'])
-        assert [] == self.soup.select('#inner ~ h2')
-
-    def test_dangling_combinator(self):
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select('h1 >')
-
-    def test_sibling_combinator_wont_select_same_tag_twice(self):
-        self.assert_selects('p[lang] ~ p', ['lang-en-gb', 'lang-en-us', 'lang-fr'])
-
-    # Test the selector grouping operator (the comma)
-    def test_multiple_select(self):
-        self.assert_selects('x, y', ['xid', 'yid'])
-
-    def test_multiple_select_with_no_space(self):
-        self.assert_selects('x,y', ['xid', 'yid'])
-
-    def test_multiple_select_with_more_space(self):
-        self.assert_selects('x,    y', ['xid', 'yid'])
-
-    def test_multiple_select_duplicated(self):
-        self.assert_selects('x, x', ['xid'])
-
-    def test_multiple_select_sibling(self):
-        self.assert_selects('x, y ~ p[lang=fr]', ['xid', 'lang-fr'])
-
-    def test_multiple_select_tag_and_direct_descendant(self):
-        self.assert_selects('x, y > z', ['xid', 'zidb'])
-
-    def test_multiple_select_direct_descendant_and_tags(self):
-        self.assert_selects('div > x, y, z', ['xid', 'yid', 'zida', 'zidb', 'zidab', 'zidac'])
-
-    def test_multiple_select_indirect_descendant(self):
-        self.assert_selects('div x,y,  z', ['xid', 'yid', 'zida', 'zidb', 'zidab', 'zidac'])
-
-    def test_invalid_multiple_select(self):
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select(',x, y')
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select('x,,y')
-
-    def test_multiple_select_attrs(self):
-        self.assert_selects('p[lang=en], p[lang=en-gb]', ['lang-en', 'lang-en-gb'])
-
-    def test_multiple_select_ids(self):
-        self.assert_selects('x, y > z[id=zida], z[id=zidab], z[id=zidb]', ['xid', 'zidb', 'zidab'])
-
-    def test_multiple_select_nested(self):
-        self.assert_selects('body > div > x, y > z', ['xid', 'zidb'])
-
-    def test_select_duplicate_elements(self):
-        # When markup contains duplicate elements, a multiple select
-        # will find all of them.
-        markup = '<div class="c1"/><div class="c2"/><div class="c1"/>'
-        soup = BeautifulSoup(markup, 'html.parser')
-        selected = soup.select(".c1, .c2")
-        assert 3 == len(selected)
-
-        # Verify that find_all finds the same elements, though because
-        # of an implementation detail it finds them in a different
-        # order.
-        for element in soup.find_all(class_=['c1', 'c2']):
-            assert element in selected
-
-    def test_closest(self):
-        inner = self.soup.find("div", id="inner")
-        closest = inner.css.closest("div[id=main]")
-        assert closest == self.soup.find("div", id="main")
-
-    def test_match(self):
-        inner = self.soup.find("div", id="inner")
-        main = self.soup.find("div", id="main")
-        assert inner.css.match("div[id=main]") == False
-        assert main.css.match("div[id=main]") == True
-
-    def test_iselect(self):
-        gen = self.soup.css.iselect("h2")
-        assert isinstance(gen, types.GeneratorType)
-        [header2, header3] = gen
-        assert header2['id'] == 'header2'
-        assert header3['id'] == 'header3'
-
-    def test_filter(self):
-        inner = self.soup.find("div", id="inner")
-        results = inner.css.filter("h2")
-        assert len(inner.css.filter("h2")) == 2
-
-        results = inner.css.filter("h2[id=header3]")
-        assert isinstance(results, ResultSet)
-        [result] = results
-        assert result['id'] == 'header3'
-
-    def test_escape(self):
-        m = self.soup.css.escape
-        assert m(".foo#bar") == '\\.foo\\#bar'
-        assert m("()[]{}") == '\\(\\)\\[\\]\\{\\}'
-        assert m(".foo") == self.soup.css.escape(".foo")
diff --git a/libs/bs4/tests/test_dammit.py b/libs/bs4/tests/test_dammit.py
deleted file mode 100644
index 9aad0ac695..0000000000
--- a/libs/bs4/tests/test_dammit.py
+++ /dev/null
@@ -1,370 +0,0 @@
-# encoding: utf-8
-import pytest
-import logging
-import bs4
-from bs4 import BeautifulSoup
-from bs4.dammit import (
-    EntitySubstitution,
-    EncodingDetector,
-    UnicodeDammit,
-)
-
-class TestUnicodeDammit(object):
-    """Standalone tests of UnicodeDammit."""
-
-    def test_unicode_input(self):
-        markup = "I'm already Unicode! \N{SNOWMAN}"
-        dammit = UnicodeDammit(markup)
-        assert dammit.unicode_markup == markup
-
-    @pytest.mark.parametrize(
-        "smart_quotes_to,expect_converted",
-        [(None, "\u2018\u2019\u201c\u201d"),
-         ("xml", "&#x2018;&#x2019;&#x201C;&#x201D;"),
-         ("html", "&lsquo;&rsquo;&ldquo;&rdquo;"),
-         ("ascii", "''" + '""'),
-        ]
-    )
-    def test_smart_quotes_to(self, smart_quotes_to, expect_converted):
-        """Verify the functionality of the smart_quotes_to argument
-        to the UnicodeDammit constructor."""
-        markup = b"<foo>\x91\x92\x93\x94</foo>"
-        converted = UnicodeDammit(
-            markup, known_definite_encodings=["windows-1252"],
-            smart_quotes_to=smart_quotes_to
-        ).unicode_markup
-        assert converted == "<foo>{}</foo>".format(expect_converted)
-        
-    def test_detect_utf8(self):
-        utf8 = b"Sacr\xc3\xa9 bleu! \xe2\x98\x83"
-        dammit = UnicodeDammit(utf8)
-        assert dammit.original_encoding.lower() == 'utf-8'
-        assert dammit.unicode_markup == 'Sacr\xe9 bleu! \N{SNOWMAN}'
-
-    def test_convert_hebrew(self):
-        hebrew = b"\xed\xe5\xec\xf9"
-        dammit = UnicodeDammit(hebrew, ["iso-8859-8"])
-        assert dammit.original_encoding.lower() == 'iso-8859-8'
-        assert dammit.unicode_markup == '\u05dd\u05d5\u05dc\u05e9'
-
-    def test_dont_see_smart_quotes_where_there_are_none(self):
-        utf_8 = b"\343\202\261\343\203\274\343\202\277\343\202\244 Watch"
-        dammit = UnicodeDammit(utf_8)
-        assert dammit.original_encoding.lower() == 'utf-8'
-        assert dammit.unicode_markup.encode("utf-8") == utf_8
-
-    def test_ignore_inappropriate_codecs(self):
-        utf8_data = "Rรคksmรถrgรฅs".encode("utf-8")
-        dammit = UnicodeDammit(utf8_data, ["iso-8859-8"])
-        assert dammit.original_encoding.lower() == 'utf-8'
-
-    def test_ignore_invalid_codecs(self):
-        utf8_data = "Rรคksmรถrgรฅs".encode("utf-8")
-        for bad_encoding in ['.utf8', '...', 'utF---16.!']:
-            dammit = UnicodeDammit(utf8_data, [bad_encoding])
-            assert dammit.original_encoding.lower() == 'utf-8'
-
-    def test_exclude_encodings(self):
-        # This is UTF-8.
-        utf8_data = "Rรคksmรถrgรฅs".encode("utf-8")
-
-        # But if we exclude UTF-8 from consideration, the guess is
-        # Windows-1252.
-        dammit = UnicodeDammit(utf8_data, exclude_encodings=["utf-8"])
-        assert dammit.original_encoding.lower() == 'windows-1252'
-
-        # And if we exclude that, there is no valid guess at all.
-        dammit = UnicodeDammit(
-            utf8_data, exclude_encodings=["utf-8", "windows-1252"])
-        assert dammit.original_encoding == None
-
-class TestEncodingDetector(object):
-        
-    def test_encoding_detector_replaces_junk_in_encoding_name_with_replacement_character(self):
-        detected = EncodingDetector(
-            b'<?xml version="1.0" encoding="UTF-\xdb" ?>')
-        encodings = list(detected.encodings)
-        assert 'utf-\N{REPLACEMENT CHARACTER}' in encodings
-
-    def test_detect_html5_style_meta_tag(self):
-
-        for data in (
-            b'<html><meta charset="euc-jp" /></html>',
-            b"<html><meta charset='euc-jp' /></html>",
-            b"<html><meta charset=euc-jp /></html>",
-            b"<html><meta charset=euc-jp/></html>"):
-            dammit = UnicodeDammit(data, is_html=True)
-            assert "euc-jp" == dammit.original_encoding
-
-    def test_last_ditch_entity_replacement(self):
-        # This is a UTF-8 document that contains bytestrings
-        # completely incompatible with UTF-8 (ie. encoded with some other
-        # encoding).
-        #
-        # Since there is no consistent encoding for the document,
-        # Unicode, Dammit will eventually encode the document as UTF-8
-        # and encode the incompatible characters as REPLACEMENT
-        # CHARACTER.
-        #
-        # If chardet is installed, it will detect that the document
-        # can be converted into ISO-8859-1 without errors. This happens
-        # to be the wrong encoding, but it is a consistent encoding, so the
-        # code we're testing here won't run.
-        #
-        # So we temporarily disable chardet if it's present.
-        doc = b"""\357\273\277<?xml version="1.0" encoding="UTF-8"?>
-<html><b>\330\250\330\252\330\261</b>
-<i>\310\322\321\220\312\321\355\344</i></html>"""
-        chardet = bs4.dammit.chardet_dammit
-        logging.disable(logging.WARNING)
-        try:
-            def noop(str):
-                return None
-            bs4.dammit.chardet_dammit = noop
-            dammit = UnicodeDammit(doc)
-            assert True == dammit.contains_replacement_characters
-            assert "\ufffd" in dammit.unicode_markup
-
-            soup = BeautifulSoup(doc, "html.parser")
-            assert soup.contains_replacement_characters
-        finally:
-            logging.disable(logging.NOTSET)
-            bs4.dammit.chardet_dammit = chardet
-
-    def test_byte_order_mark_removed(self):
-        # A document written in UTF-16LE will have its byte order marker stripped.
-        data = b'\xff\xfe<\x00a\x00>\x00\xe1\x00\xe9\x00<\x00/\x00a\x00>\x00'
-        dammit = UnicodeDammit(data)
-        assert "<a>รกรฉ</a>" == dammit.unicode_markup
-        assert "utf-16le" == dammit.original_encoding
-       
-    def test_known_definite_versus_user_encodings(self):
-        # The known_definite_encodings are used before sniffing the
-        # byte-order mark; the user_encodings are used afterwards.
-
-        # Here's a document in UTF-16LE.
-        data = b'\xff\xfe<\x00a\x00>\x00\xe1\x00\xe9\x00<\x00/\x00a\x00>\x00'
-        dammit = UnicodeDammit(data)
-
-        # We can process it as UTF-16 by passing it in as a known
-        # definite encoding.
-        before = UnicodeDammit(data, known_definite_encodings=["utf-16"])
-        assert "utf-16" == before.original_encoding
-        
-        # If we pass UTF-18 as a user encoding, it's not even
-        # tried--the encoding sniffed from the byte-order mark takes
-        # precedence.
-        after = UnicodeDammit(data, user_encodings=["utf-8"])
-        assert "utf-16le" == after.original_encoding
-        assert ["utf-16le"] == [x[0] for x in dammit.tried_encodings]
-        
-        # Here's a document in ISO-8859-8.
-        hebrew = b"\xed\xe5\xec\xf9"
-        dammit = UnicodeDammit(hebrew, known_definite_encodings=["utf-8"],
-                               user_encodings=["iso-8859-8"])
-        
-        # The known_definite_encodings don't work, BOM sniffing does
-        # nothing (it only works for a few UTF encodings), but one of
-        # the user_encodings does work.
-        assert "iso-8859-8" == dammit.original_encoding
-        assert ["utf-8", "iso-8859-8"] == [x[0] for x in dammit.tried_encodings]
-        
-    def test_deprecated_override_encodings(self):
-        # override_encodings is a deprecated alias for
-        # known_definite_encodings.
-        hebrew = b"\xed\xe5\xec\xf9"
-        dammit = UnicodeDammit(
-            hebrew,
-            known_definite_encodings=["shift-jis"],
-            override_encodings=["utf-8"],
-            user_encodings=["iso-8859-8"],
-        )
-        assert "iso-8859-8" == dammit.original_encoding
-
-        # known_definite_encodings and override_encodings were tried
-        # before user_encodings.
-        assert ["shift-jis", "utf-8", "iso-8859-8"] == (
-            [x[0] for x in dammit.tried_encodings]
-        )
-
-    def test_detwingle(self):
-        # Here's a UTF8 document.
-        utf8 = ("\N{SNOWMAN}" * 3).encode("utf8")
-
-        # Here's a Windows-1252 document.
-        windows_1252 = (
-            "\N{LEFT DOUBLE QUOTATION MARK}Hi, I like Windows!"
-            "\N{RIGHT DOUBLE QUOTATION MARK}").encode("windows_1252")
-
-        # Through some unholy alchemy, they've been stuck together.
-        doc = utf8 + windows_1252 + utf8
-
-        # The document can't be turned into UTF-8:
-        with pytest.raises(UnicodeDecodeError):
-            doc.decode("utf8")
-
-        # Unicode, Dammit thinks the whole document is Windows-1252,
-        # and decodes it into "รขหœฦ’รขหœฦ’รขหœฦ’โ€œHi, I like Windows!โ€รขหœฦ’รขหœฦ’รขหœฦ’"
-
-        # But if we run it through fix_embedded_windows_1252, it's fixed:
-        fixed = UnicodeDammit.detwingle(doc)
-        assert "โ˜ƒโ˜ƒโ˜ƒโ€œHi, I like Windows!โ€โ˜ƒโ˜ƒโ˜ƒ" == fixed.decode("utf8")
-
-    def test_detwingle_ignores_multibyte_characters(self):
-        # Each of these characters has a UTF-8 representation ending
-        # in \x93. \x93 is a smart quote if interpreted as
-        # Windows-1252. But our code knows to skip over multibyte
-        # UTF-8 characters, so they'll survive the process unscathed.
-        for tricky_unicode_char in (
-            "\N{LATIN SMALL LIGATURE OE}", # 2-byte char '\xc5\x93'
-            "\N{LATIN SUBSCRIPT SMALL LETTER X}", # 3-byte char '\xe2\x82\x93'
-            "\xf0\x90\x90\x93", # This is a CJK character, not sure which one.
-            ):
-            input = tricky_unicode_char.encode("utf8")
-            assert input.endswith(b'\x93')
-            output = UnicodeDammit.detwingle(input)
-            assert output == input
-
-    def test_find_declared_encoding(self):
-        # Test our ability to find a declared encoding inside an
-        # XML or HTML document.
-        #
-        # Even if the document comes in as Unicode, it may be
-        # interesting to know what encoding was claimed
-        # originally.
-
-        html_unicode = '<html><head><meta charset="utf-8"></head></html>'
-        html_bytes = html_unicode.encode("ascii")
-
-        xml_unicode= '<?xml version="1.0" encoding="ISO-8859-1" ?>'
-        xml_bytes = xml_unicode.encode("ascii")
-
-        m = EncodingDetector.find_declared_encoding
-        assert m(html_unicode, is_html=False) is None
-        assert "utf-8" == m(html_unicode, is_html=True)
-        assert "utf-8" == m(html_bytes, is_html=True)
-
-        assert "iso-8859-1" == m(xml_unicode)
-        assert "iso-8859-1" == m(xml_bytes)
-
-        # Normally, only the first few kilobytes of a document are checked for
-        # an encoding.
-        spacer = b' ' * 5000
-        assert m(spacer + html_bytes) is None
-        assert m(spacer + xml_bytes) is None
-
-        # But you can tell find_declared_encoding to search an entire
-        # HTML document.
-        assert (
-            m(spacer + html_bytes, is_html=True, search_entire_document=True)
-            == "utf-8"
-        )
-
-        # The XML encoding declaration has to be the very first thing
-        # in the document. We'll allow whitespace before the document
-        # starts, but nothing else.
-        assert m(xml_bytes, search_entire_document=True) == "iso-8859-1"
-        assert m(b' ' + xml_bytes, search_entire_document=True) == "iso-8859-1"
-        assert m(b'a' + xml_bytes, search_entire_document=True) is None
-
-
-class TestEntitySubstitution(object):
-    """Standalone tests of the EntitySubstitution class."""
-    def setup_method(self):
-        self.sub = EntitySubstitution
-
-
-    @pytest.mark.parametrize(
-        "original,substituted",
-        [
-            # Basic case. Unicode characters corresponding to named
-            # HTML entites are substituted; others are not.
-            ("foo\u2200\N{SNOWMAN}\u00f5bar",
-             "foo&forall;\N{SNOWMAN}&otilde;bar"),
-
-            # MS smart quotes are a common source of frustration, so we
-            # give them a special test.
-            ('โ€˜โ€™fooโ€œโ€', "&lsquo;&rsquo;foo&ldquo;&rdquo;"),           
-        ]
-    )
-    def test_substitute_html(self, original, substituted):
-        assert self.sub.substitute_html(original) == substituted
-        
-    def test_html5_entity(self):
-        for entity, u in (
-            # A few spot checks of our ability to recognize
-            # special character sequences and convert them
-            # to named entities.
-            ('&models;', '\u22a7'),
-            ('&Nfr;', '\U0001d511'),
-            ('&ngeqq;', '\u2267\u0338'),
-            ('&not;', '\xac'),
-            ('&Not;', '\u2aec'),
-                
-            # We _could_ convert | to &verbarr;, but we don't, because
-            # | is an ASCII character.
-            ('|' '|'),
-
-            # Similarly for the fj ligature, which we could convert to
-            # &fjlig;, but we don't.
-            ("fj", "fj"),
-
-            # We do convert _these_ ASCII characters to HTML entities,
-            # because that's required to generate valid HTML.
-            ('&gt;', '>'),
-            ('&lt;', '<'),
-            ('&amp;', '&'),
-        ):
-            template = '3 %s 4'
-            raw = template % u
-            with_entities = template % entity
-            assert self.sub.substitute_html(raw) == with_entities
-            
-    def test_html5_entity_with_variation_selector(self):
-        # Some HTML5 entities correspond either to a single-character
-        # Unicode sequence _or_ to the same character plus U+FE00,
-        # VARIATION SELECTOR 1. We can handle this.
-        data = "fjords \u2294 penguins"
-        markup = "fjords &sqcup; penguins"
-        assert self.sub.substitute_html(data) == markup
-
-        data = "fjords \u2294\ufe00 penguins"
-        markup = "fjords &sqcups; penguins"
-        assert self.sub.substitute_html(data) == markup
-        
-    def test_xml_converstion_includes_no_quotes_if_make_quoted_attribute_is_false(self):
-        s = 'Welcome to "my bar"'
-        assert self.sub.substitute_xml(s, False) == s
-
-    def test_xml_attribute_quoting_normally_uses_double_quotes(self):
-        assert self.sub.substitute_xml("Welcome", True) == '"Welcome"'
-        assert self.sub.substitute_xml("Bob's Bar", True) == '"Bob\'s Bar"'
-
-    def test_xml_attribute_quoting_uses_single_quotes_when_value_contains_double_quotes(self):
-        s = 'Welcome to "my bar"'
-        assert self.sub.substitute_xml(s, True) == "'Welcome to \"my bar\"'"
-
-    def test_xml_attribute_quoting_escapes_single_quotes_when_value_contains_both_single_and_double_quotes(self):
-        s = 'Welcome to "Bob\'s Bar"'
-        assert self.sub.substitute_xml(s, True) == '"Welcome to &quot;Bob\'s Bar&quot;"'
-
-    def test_xml_quotes_arent_escaped_when_value_is_not_being_quoted(self):
-        quoted = 'Welcome to "Bob\'s Bar"'
-        assert self.sub.substitute_xml(quoted) == quoted
-
-    def test_xml_quoting_handles_angle_brackets(self):
-        assert self.sub.substitute_xml("foo<bar>") == "foo&lt;bar&gt;"
-
-    def test_xml_quoting_handles_ampersands(self):
-        assert self.sub.substitute_xml("AT&T") == "AT&amp;T"
-
-    def test_xml_quoting_including_ampersands_when_they_are_part_of_an_entity(self):
-        assert self.sub.substitute_xml("&Aacute;T&T") == "&amp;Aacute;T&amp;T"
-
-    def test_xml_quoting_ignoring_ampersands_when_they_are_part_of_an_entity(self):
-        assert self.sub.substitute_xml_containing_entities("&Aacute;T&T") == "&Aacute;T&amp;T"
-       
-    def test_quotes_not_html_substituted(self):
-        """There's no need to do this except inside attribute values."""
-        text = 'Bob\'s "bar"'
-        assert self.sub.substitute_html(text) == text
diff --git a/libs/bs4/tests/test_docs.py b/libs/bs4/tests/test_docs.py
deleted file mode 100644
index 0194d69736..0000000000
--- a/libs/bs4/tests/test_docs.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"Test harness for doctests."
-
-# TODO: Pretty sure this isn't used and should be deleted.
-
-# pylint: disable-msg=E0611,W0142
-
-__metaclass__ = type
-__all__ = [
-    'additional_tests',
-    ]
-
-import atexit
-import doctest
-import os
-#from pkg_resources import (
-#    resource_filename, resource_exists, resource_listdir, cleanup_resources)
-import unittest
-
-DOCTEST_FLAGS = (
-    doctest.ELLIPSIS |
-    doctest.NORMALIZE_WHITESPACE |
-    doctest.REPORT_NDIFF)
-
-
-# def additional_tests():
-#     "Run the doc tests (README.txt and docs/*, if any exist)"
-#     doctest_files = [
-#         os.path.abspath(resource_filename('bs4', 'README.txt'))]
-#     if resource_exists('bs4', 'docs'):
-#         for name in resource_listdir('bs4', 'docs'):
-#             if name.endswith('.txt'):
-#                 doctest_files.append(
-#                     os.path.abspath(
-#                         resource_filename('bs4', 'docs/%s' % name)))
-#     kwargs = dict(module_relative=False, optionflags=DOCTEST_FLAGS)
-#     atexit.register(cleanup_resources)
-#     return unittest.TestSuite((
-#         doctest.DocFileSuite(*doctest_files, **kwargs)))
diff --git a/libs/bs4/tests/test_element.py b/libs/bs4/tests/test_element.py
deleted file mode 100644
index 6d08ab5d06..0000000000
--- a/libs/bs4/tests/test_element.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Tests of classes in element.py.
-
-The really big classes -- Tag, PageElement, and NavigableString --
-are tested in separate files.
-"""
-
-from bs4.element import (
-    CharsetMetaAttributeValue,
-    ContentMetaAttributeValue,
-    NamespacedAttribute,
-)
-from . import SoupTest
-
-
-class TestNamedspacedAttribute(object):
-
-    def test_name_may_be_none_or_missing(self):
-        a = NamespacedAttribute("xmlns", None)
-        assert a == "xmlns"
-
-        a = NamespacedAttribute("xmlns", "")
-        assert a == "xmlns"
-
-        a = NamespacedAttribute("xmlns")
-        assert a == "xmlns"
-        
-    def test_namespace_may_be_none_or_missing(self):
-        a = NamespacedAttribute(None, "tag")
-        assert a == "tag"
-        
-        a = NamespacedAttribute("", "tag")
-        assert a == "tag"
-        
-    def test_attribute_is_equivalent_to_colon_separated_string(self):
-        a = NamespacedAttribute("a", "b")
-        assert "a:b" == a
-
-    def test_attributes_are_equivalent_if_prefix_and_name_identical(self):
-        a = NamespacedAttribute("a", "b", "c")
-        b = NamespacedAttribute("a", "b", "c")
-        assert a == b
-
-        # The actual namespace is not considered.
-        c = NamespacedAttribute("a", "b", None)
-        assert a == c
-
-        # But name and prefix are important.
-        d = NamespacedAttribute("a", "z", "c")
-        assert a != d
-
-        e = NamespacedAttribute("z", "b", "c")
-        assert a != e
-
-
-class TestAttributeValueWithCharsetSubstitution(object):
-    """Certain attributes are designed to have the charset of the
-    final document substituted into their value.
-    """
-    
-    def test_content_meta_attribute_value(self):
-        # The value of a CharsetMetaAttributeValue is whatever
-        # encoding the string is in.
-        value = CharsetMetaAttributeValue("euc-jp")
-        assert "euc-jp" == value
-        assert "euc-jp" == value.original_value
-        assert "utf8" == value.encode("utf8")
-        assert "ascii" == value.encode("ascii")
-
-    def test_content_meta_attribute_value(self):
-        value = ContentMetaAttributeValue("text/html; charset=euc-jp")
-        assert "text/html; charset=euc-jp" == value
-        assert "text/html; charset=euc-jp" == value.original_value
-        assert "text/html; charset=utf8" == value.encode("utf8")
-        assert "text/html; charset=ascii" == value.encode("ascii")
diff --git a/libs/bs4/tests/test_formatter.py b/libs/bs4/tests/test_formatter.py
deleted file mode 100644
index 528b16d5b5..0000000000
--- a/libs/bs4/tests/test_formatter.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import pytest
-
-from bs4.element import Tag
-from bs4.formatter import (
-    Formatter,
-    HTMLFormatter,
-    XMLFormatter,
-)
-from . import SoupTest
-
-class TestFormatter(SoupTest):
-
-    def test_default_attributes(self):
-        # Test the default behavior of Formatter.attributes().
-        formatter = Formatter()
-        tag = Tag(name="tag")
-        tag['b'] = 1
-        tag['a'] = 2
-
-        # Attributes come out sorted by name. In Python 3, attributes
-        # normally come out of a dictionary in the order they were
-        # added.
-        assert [('a', 2), ('b', 1)] == formatter.attributes(tag)
-
-        # This works even if Tag.attrs is None, though this shouldn't
-        # normally happen.
-        tag.attrs = None
-        assert [] == formatter.attributes(tag)
-
-        assert ' ' == formatter.indent
-        
-    def test_sort_attributes(self):
-        # Test the ability to override Formatter.attributes() to,
-        # e.g., disable the normal sorting of attributes.
-        class UnsortedFormatter(Formatter):
-            def attributes(self, tag):
-                self.called_with = tag
-                for k, v in sorted(tag.attrs.items()):
-                    if k == 'ignore':
-                        continue
-                    yield k,v
-
-        soup = self.soup('<p cval="1" aval="2" ignore="ignored"></p>')
-        formatter = UnsortedFormatter()
-        decoded = soup.decode(formatter=formatter)
-
-        # attributes() was called on the <p> tag. It filtered out one
-        # attribute and sorted the other two.
-        assert formatter.called_with == soup.p
-        assert '<p aval="2" cval="1"></p>' == decoded
-
-    def test_empty_attributes_are_booleans(self):
-        # Test the behavior of empty_attributes_are_booleans as well
-        # as which Formatters have it enabled.
-        
-        for name in ('html', 'minimal', None):
-            formatter = HTMLFormatter.REGISTRY[name]
-            assert False == formatter.empty_attributes_are_booleans
-
-        formatter = XMLFormatter.REGISTRY[None]
-        assert False == formatter.empty_attributes_are_booleans
-
-        formatter = HTMLFormatter.REGISTRY['html5']
-        assert True == formatter.empty_attributes_are_booleans
-
-        # Verify that the constructor sets the value.
-        formatter = Formatter(empty_attributes_are_booleans=True)
-        assert True == formatter.empty_attributes_are_booleans
-
-        # Now demonstrate what it does to markup.
-        for markup in (
-                "<option selected></option>",
-                '<option selected=""></option>'
-        ):
-            soup = self.soup(markup)
-            for formatter in ('html', 'minimal', 'xml', None):
-                assert b'<option selected=""></option>' == soup.option.encode(formatter='html')
-                assert b'<option selected></option>' == soup.option.encode(formatter='html5')
-
-    @pytest.mark.parametrize(
-        "indent,expect",
-        [
-            (None, '<a>\n<b>\ntext\n</b>\n</a>\n'),
-            (-1, '<a>\n<b>\ntext\n</b>\n</a>\n'),
-            (0, '<a>\n<b>\ntext\n</b>\n</a>\n'),
-            ("", '<a>\n<b>\ntext\n</b>\n</a>\n'),
-
-            (1, '<a>\n <b>\n  text\n </b>\n</a>\n'),
-            (2, '<a>\n  <b>\n    text\n  </b>\n</a>\n'),
-
-            ("\t", '<a>\n\t<b>\n\t\ttext\n\t</b>\n</a>\n'),
-            ('abc', '<a>\nabc<b>\nabcabctext\nabc</b>\n</a>\n'),
-
-            # Some invalid inputs -- the default behavior is used.
-            (object(), '<a>\n <b>\n  text\n </b>\n</a>\n'),
-            (b'bytes', '<a>\n <b>\n  text\n </b>\n</a>\n'),
-        ]
-    )
-    def test_indent(self, indent, expect):
-        # Pretty-print a tree with a Formatter set to
-        # indent in a certain way and verify the results.
-        soup = self.soup("<a><b>text</b></a>")
-        formatter = Formatter(indent=indent)
-        assert soup.prettify(formatter=formatter) == expect
-
-        # Pretty-printing only happens with prettify(), not
-        # encode().
-        assert soup.encode(formatter=formatter) != expect
-        
-    def test_default_indent_value(self):
-        formatter = Formatter()
-        assert formatter.indent == ' '
-
diff --git a/libs/bs4/tests/test_fuzz.py b/libs/bs4/tests/test_fuzz.py
deleted file mode 100644
index f29802d420..0000000000
--- a/libs/bs4/tests/test_fuzz.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""This file contains test cases reported by third parties using
-fuzzing tools, primarily from Google's oss-fuzz project. Some of these
-represent real problems with Beautiful Soup, but many are problems in
-libraries that Beautiful Soup depends on, and many of the test cases
-represent different ways of triggering the same problem.
-
-Grouping these test cases together makes it easy to see which test
-cases represent the same problem, and puts the test cases in close
-proximity to code that can trigger the problems.
-"""
-import os
-import pytest
-from bs4 import (
-    BeautifulSoup,
-    ParserRejectedMarkup,
-)
-try:
-    from soupsieve.util import SelectorSyntaxError
-    import lxml
-    import html5lib
-    fully_fuzzable = True
-except ImportError:
-    fully_fuzzable = False
-    
-
-@pytest.mark.skipif(not fully_fuzzable, reason="Prerequisites for fuzz tests are not installed.")
-class TestFuzz(object):
-
-    # Test case markup files from fuzzers are given this extension so
-    # they can be included in builds.
-    TESTCASE_SUFFIX = ".testcase"
-
-    # Copied 20230512 from
-    # https://github.com/google/oss-fuzz/blob/4ac6a645a197a695fe76532251feb5067076b3f3/projects/bs4/bs4_fuzzer.py
-    #
-    # Copying the code lets us precisely duplicate the behavior of
-    # oss-fuzz.  The downside is that this code changes over time, so
-    # multiple copies of the code must be kept around to run against
-    # older tests. I'm not sure what to do about this, but I may
-    # retire old tests after a time.
-    def fuzz_test_with_css(self, filename):
-        data = self.__markup(filename)
-        parsers = ['lxml-xml', 'html5lib', 'html.parser', 'lxml']
-        try:
-            idx = int(data[0]) % len(parsers)
-        except ValueError:
-            return
-
-        css_selector, data = data[1:10], data[10:]
-
-        try:
-            soup = BeautifulSoup(data[1:], features=parsers[idx])
-        except ParserRejectedMarkup:
-            return
-        except ValueError:
-            return
-
-        list(soup.find_all(True))
-        try:
-            soup.css.select(css_selector.decode('utf-8', 'replace'))
-        except SelectorSyntaxError:
-            return
-        soup.prettify()
-    
-    # This class of error has been fixed by catching a less helpful
-    # exception from html.parser and raising ParserRejectedMarkup
-    # instead.
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912",
-            "crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a",
-        ]
-    )
-    def test_rejected_markup(self, filename):
-        markup = self.__markup(filename)
-        with pytest.raises(ParserRejectedMarkup):
-            BeautifulSoup(markup, 'html.parser')
-            
-    # This class of error has to do with very deeply nested documents
-    # which overflow the Python call stack when the tree is converted
-    # to a string. This is an issue with Beautiful Soup which was fixed
-    # as part of [bug=1471755].
-    #
-    # These test cases are in the older format that doesn't specify
-    # which parser to use or give a CSS selector.
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400",
-        ]
-    )
-    def test_deeply_nested_document_without_css(self, filename):
-        # Parsing the document and encoding it back to a string is
-        # sufficient to demonstrate that the overflow problem has
-        # been fixed.
-        markup = self.__markup(filename)
-        BeautifulSoup(markup, 'html.parser').encode()
-
-    # This class of error has to do with very deeply nested documents
-    # which overflow the Python call stack when the tree is converted
-    # to a string. This is an issue with Beautiful Soup which was fixed
-    # as part of [bug=1471755].
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624",
-        ]
-    )
-    def test_deeply_nested_document(self, filename): 
-       self.fuzz_test_with_css(filename)
-        
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824",
-        ]
-    )
-    def test_soupsieve_errors(self, filename):
-        self.fuzz_test_with_css(filename)
-        
-    # This class of error represents problems with html5lib's parser,
-    # not Beautiful Soup. I use
-    # https://github.com/html5lib/html5lib-python/issues/568 to notify
-    # the html5lib developers of these issues.
-    #
-    # These test cases are in the older format that doesn't specify
-    # which parser to use or give a CSS selector.
-    @pytest.mark.skip(reason="html5lib-specific problems")
-    @pytest.mark.parametrize(
-        "filename", [
-            # b"""รฟ<!DOCTyPEV PUBLIC'''ร'"""
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320",
-
-            # b')<a><math><TR><a><mI><a><p><a>'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456",
-
-            # b'-<math><sElect><mi><sElect><sElect>'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896",
-           
-            # b'รฑ<table><svg><html>'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224",
-
-            # <TABLE>, some ^@ characters, some <math> tags.
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744",
-
-            # Nested table
-            "crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08"
-        ]
-    )
-    def test_html5lib_parse_errors_without_css(self, filename):
-        markup = self.__markup(filename)
-        print(BeautifulSoup(markup, 'html5lib').encode())
-
-    # This class of error represents problems with html5lib's parser,
-    # not Beautiful Soup. I use
-    # https://github.com/html5lib/html5lib-python/issues/568 to notify
-    # the html5lib developers of these issues.
-    @pytest.mark.skip(reason="html5lib-specific problems")
-    @pytest.mark.parametrize(
-        "filename", [
-            # b'-      \xff\xff  <math>\x10<select><mi><select><select>t'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640",
-        ]
-    )
-    def test_html5lib_parse_errors(self, filename):
-        self.fuzz_test_with_css(filename)
-        
-    def __markup(self, filename):
-        if not filename.endswith(self.TESTCASE_SUFFIX):
-            filename += self.TESTCASE_SUFFIX
-        this_dir = os.path.split(__file__)[0]
-        path = os.path.join(this_dir, 'fuzz', filename)
-        return open(path, 'rb').read()
diff --git a/libs/bs4/tests/test_html5lib.py b/libs/bs4/tests/test_html5lib.py
deleted file mode 100644
index 4197720f3b..0000000000
--- a/libs/bs4/tests/test_html5lib.py
+++ /dev/null
@@ -1,224 +0,0 @@
-"""Tests to ensure that the html5lib tree builder generates good trees."""
-
-import pytest
-import warnings
-
-from bs4 import BeautifulSoup
-from bs4.element import SoupStrainer
-from . import (
-    HTML5LIB_PRESENT,
-    HTML5TreeBuilderSmokeTest,
-    SoupTest,
-)
-
-@pytest.mark.skipif(
-    not HTML5LIB_PRESENT,
-    reason="html5lib seems not to be present, not testing its tree builder."
-)
-class TestHTML5LibBuilder(SoupTest, HTML5TreeBuilderSmokeTest):
-    """See ``HTML5TreeBuilderSmokeTest``."""
-
-    @property
-    def default_builder(self):
-        from bs4.builder import HTML5TreeBuilder
-        return HTML5TreeBuilder
-
-    def test_soupstrainer(self):
-        # The html5lib tree builder does not support SoupStrainers.
-        strainer = SoupStrainer("b")
-        markup = "<p>A <b>bold</b> statement.</p>"
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup(markup, "html5lib", parse_only=strainer)
-        assert soup.decode() == self.document_for(markup)
-
-        [warning] = w
-        assert warning.filename == __file__
-        assert "the html5lib tree builder doesn't support parse_only" in str(warning.message)
-
-    def test_correctly_nested_tables(self):
-        """html5lib inserts <tbody> tags where other parsers don't."""
-        markup = ('<table id="1">'
-                  '<tr>'
-                  "<td>Here's another table:"
-                  '<table id="2">'
-                  '<tr><td>foo</td></tr>'
-                  '</table></td>')
-
-        self.assert_soup(
-            markup,
-            '<table id="1"><tbody><tr><td>Here\'s another table:'
-            '<table id="2"><tbody><tr><td>foo</td></tr></tbody></table>'
-            '</td></tr></tbody></table>')
-
-        self.assert_soup(
-            "<table><thead><tr><td>Foo</td></tr></thead>"
-            "<tbody><tr><td>Bar</td></tr></tbody>"
-            "<tfoot><tr><td>Baz</td></tr></tfoot></table>")
-
-    def test_xml_declaration_followed_by_doctype(self):
-        markup = '''<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-  <body>
-   <p>foo</p>
-  </body>
-</html>'''
-        soup = self.soup(markup)
-        # Verify that we can reach the <p> tag; this means the tree is connected.
-        assert b"<p>foo</p>" == soup.p.encode()
-
-    def test_reparented_markup(self):
-        markup = '<p><em>foo</p>\n<p>bar<a></a></em></p>'
-        soup = self.soup(markup)
-        assert "<body><p><em>foo</em></p><em>\n</em><p><em>bar<a></a></em></p></body>" == soup.body.decode()
-        assert 2 == len(soup.find_all('p'))
-
-
-    def test_reparented_markup_ends_with_whitespace(self):
-        markup = '<p><em>foo</p>\n<p>bar<a></a></em></p>\n'
-        soup = self.soup(markup)
-        assert "<body><p><em>foo</em></p><em>\n</em><p><em>bar<a></a></em></p>\n</body>" == soup.body.decode()
-        assert 2 == len(soup.find_all('p'))
-
-    def test_reparented_markup_containing_identical_whitespace_nodes(self):
-        """Verify that we keep the two whitespace nodes in this
-        document distinct when reparenting the adjacent <tbody> tags.
-        """
-        markup = '<table> <tbody><tbody><ims></tbody> </table>'
-        soup = self.soup(markup)
-        space1, space2 = soup.find_all(string=' ')
-        tbody1, tbody2 = soup.find_all('tbody')
-        assert space1.next_element is tbody1
-        assert tbody2.next_element is space2
-
-    def test_reparented_markup_containing_children(self):
-        markup = '<div><a>aftermath<p><noscript>target</noscript>aftermath</a></p></div>'
-        soup = self.soup(markup)
-        noscript = soup.noscript
-        assert "target" == noscript.next_element
-        target = soup.find(string='target')
-
-        # The 'aftermath' string was duplicated; we want the second one.
-        final_aftermath = soup.find_all(string='aftermath')[-1]
-
-        # The <noscript> tag was moved beneath a copy of the <a> tag,
-        # but the 'target' string within is still connected to the
-        # (second) 'aftermath' string.
-        assert final_aftermath == target.next_element
-        assert target == final_aftermath.previous_element
-        
-    def test_processing_instruction(self):
-        """Processing instructions become comments."""
-        markup = b"""<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert str(soup).startswith("<!--?PITarget PIContent?-->")
-
-    def test_cloned_multivalue_node(self):
-        markup = b"""<a class="my_class"><p></a>"""
-        soup = self.soup(markup)
-        a1, a2 = soup.find_all('a')
-        assert a1 == a2
-        assert a1 is not a2
-
-    def test_foster_parenting(self):
-        markup = b"""<table><td></tbody>A"""
-        soup = self.soup(markup)
-        assert "<body>A<table><tbody><tr><td></td></tr></tbody></table></body>" == soup.body.decode()
-
-    def test_extraction(self):
-        """
-        Test that extraction does not destroy the tree.
-
-        https://bugs.launchpad.net/beautifulsoup/+bug/1782928
-        """
-
-        markup = """
-<html><head></head>
-<style>
-</style><script></script><body><p>hello</p></body></html>
-"""
-        soup = self.soup(markup)
-        [s.extract() for s in soup('script')]
-        [s.extract() for s in soup('style')]
-
-        assert len(soup.find_all("p")) == 1
-
-    def test_empty_comment(self):
-        """
-        Test that empty comment does not break structure.
-
-        https://bugs.launchpad.net/beautifulsoup/+bug/1806598
-        """
-
-        markup = """
-<html>
-<body>
-<form>
-<!----><input type="text">
-</form>
-</body>
-</html>
-"""
-        soup = self.soup(markup)
-        inputs = []
-        for form in soup.find_all('form'):
-            inputs.extend(form.find_all('input'))
-        assert len(inputs) == 1
-
-    def test_tracking_line_numbers(self):
-        # The html.parser TreeBuilder keeps track of line number and
-        # position of each element.
-        markup = "\n   <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>"
-        soup = self.soup(markup)
-        assert 2 == soup.p.sourceline
-        assert 5 == soup.p.sourcepos
-        assert "sourceline" == soup.p.find('sourceline').name
-
-        # You can deactivate this behavior.
-        soup = self.soup(markup, store_line_numbers=False)
-        assert "sourceline" == soup.p.sourceline.name
-        assert "sourcepos" == soup.p.sourcepos.name
-
-    def test_special_string_containers(self):
-        # The html5lib tree builder doesn't support this standard feature,
-        # because there's no way of knowing, when a string is created,
-        # where in the tree it will eventually end up.
-        pass
-
-    def test_html5_attributes(self):
-        # The html5lib TreeBuilder can convert any entity named in
-        # the HTML5 spec to a sequence of Unicode characters, and
-        # convert those Unicode characters to a (potentially
-        # different) named entity on the way out.
-        #
-        # This is a copy of the same test from
-        # HTMLParserTreeBuilderSmokeTest.  It's not in the superclass
-        # because the lxml HTML TreeBuilder _doesn't_ work this way.
-        for input_element, output_unicode, output_element in (
-                ("&RightArrowLeftArrow;", '\u21c4', b'&rlarr;'),
-                ('&models;', '\u22a7', b'&models;'),
-                ('&Nfr;', '\U0001d511', b'&Nfr;'),
-                ('&ngeqq;', '\u2267\u0338', b'&ngeqq;'),
-                ('&not;', '\xac', b'&not;'),
-                ('&Not;', '\u2aec', b'&Not;'),
-                ('&quot;', '"', b'"'),
-                ('&there4;', '\u2234', b'&there4;'),
-                ('&Therefore;', '\u2234', b'&there4;'),
-                ('&therefore;', '\u2234', b'&there4;'),
-                ("&fjlig;", 'fj', b'fj'),                
-                ("&sqcup;", '\u2294', b'&sqcup;'),
-                ("&sqcups;", '\u2294\ufe00', b'&sqcups;'),
-                ("&apos;", "'", b"'"),
-                ("&verbar;", "|", b"|"),
-        ):
-            markup = '<div>%s</div>' % input_element
-            div = self.soup(markup).div
-            without_element = div.encode()
-            expect = b"<div>%s</div>" % output_unicode.encode("utf8")
-            assert without_element == expect
-
-            with_element = div.encode(formatter="html")
-            expect = b"<div>%s</div>" % output_element
-            assert with_element == expect
diff --git a/libs/bs4/tests/test_htmlparser.py b/libs/bs4/tests/test_htmlparser.py
deleted file mode 100644
index a1195d815f..0000000000
--- a/libs/bs4/tests/test_htmlparser.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Tests to ensure that the html.parser tree builder generates good
-trees."""
-
-from pdb import set_trace
-import pickle
-import pytest
-import warnings
-from bs4.builder import (
-    HTMLParserTreeBuilder,
-    ParserRejectedMarkup,
-    XMLParsedAsHTMLWarning,
-)
-from bs4.builder._htmlparser import BeautifulSoupHTMLParser
-from . import SoupTest, HTMLTreeBuilderSmokeTest
-
-class TestHTMLParserTreeBuilder(SoupTest, HTMLTreeBuilderSmokeTest):
-
-    default_builder = HTMLParserTreeBuilder
-
-    def test_rejected_input(self):
-        # Python's html.parser will occasionally reject markup,
-        # especially when there is a problem with the initial DOCTYPE
-        # declaration. Different versions of Python sound the alarm in
-        # different ways, but Beautiful Soup consistently raises
-        # errors as ParserRejectedMarkup exceptions.
-        bad_markup = [
-            # https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28873
-            # https://github.com/guidovranken/python-library-fuzzers/blob/master/corp-html/519e5b4269a01185a0d5e76295251921da2f0700
-            # https://github.com/python/cpython/issues/81928
-            b'\n<![\xff\xfe\xfe\xcd\x00',
-
-            #https://github.com/guidovranken/python-library-fuzzers/blob/master/corp-html/de32aa55785be29bbc72a1a8e06b00611fb3d9f8
-            # https://github.com/python/cpython/issues/78661
-            #
-            b'<![n\x00',
-            b"<![UNKNOWN[]]>",
-        ]
-        for markup in bad_markup:
-            with pytest.raises(ParserRejectedMarkup):
-                soup = self.soup(markup)
-    
-    def test_namespaced_system_doctype(self):
-        # html.parser can't handle namespaced doctypes, so skip this one.
-        pass
-
-    def test_namespaced_public_doctype(self):
-        # html.parser can't handle namespaced doctypes, so skip this one.
-        pass
-
-    def test_builder_is_pickled(self):
-        """Unlike most tree builders, HTMLParserTreeBuilder and will
-        be restored after pickling.
-        """
-        tree = self.soup("<a><b>foo</a>")
-        dumped = pickle.dumps(tree, 2)
-        loaded = pickle.loads(dumped)
-        assert isinstance(loaded.builder, type(tree.builder))
-
-    def test_redundant_empty_element_closing_tags(self):
-        self.assert_soup('<br></br><br></br><br></br>', "<br/><br/><br/>")
-        self.assert_soup('</br></br></br>', "")
-
-    def test_empty_element(self):
-        # This verifies that any buffered data present when the parser
-        # finishes working is handled.
-        self.assert_soup("foo &# bar", "foo &amp;# bar")
-
-    def test_tracking_line_numbers(self):
-        # The html.parser TreeBuilder keeps track of line number and
-        # position of each element.
-        markup = "\n   <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>"
-        soup = self.soup(markup)
-        assert 2 == soup.p.sourceline
-        assert 3 == soup.p.sourcepos
-        assert "sourceline" == soup.p.find('sourceline').name
-
-        # You can deactivate this behavior.
-        soup = self.soup(markup, store_line_numbers=False)
-        assert "sourceline" == soup.p.sourceline.name
-        assert "sourcepos" == soup.p.sourcepos.name
-
-    def test_on_duplicate_attribute(self):
-        # The html.parser tree builder has a variety of ways of
-        # handling a tag that contains the same attribute multiple times.
-
-        markup = '<a class="cls" href="url1" href="url2" href="url3" id="id">'
-
-        # If you don't provide any particular value for
-        # on_duplicate_attribute, later values replace earlier values.
-        soup = self.soup(markup)
-        assert "url3" == soup.a['href']
-        assert ["cls"] == soup.a['class']
-        assert "id" == soup.a['id']
-        
-        # You can also get this behavior explicitly.
-        def assert_attribute(on_duplicate_attribute, expected):
-            soup = self.soup(
-                markup, on_duplicate_attribute=on_duplicate_attribute
-            )
-            assert expected == soup.a['href']
-
-            # Verify that non-duplicate attributes are treated normally.
-            assert ["cls"] == soup.a['class']
-            assert "id" == soup.a['id']
-        assert_attribute(None, "url3")
-        assert_attribute(BeautifulSoupHTMLParser.REPLACE, "url3")
-
-        # You can ignore subsequent values in favor of the first.
-        assert_attribute(BeautifulSoupHTMLParser.IGNORE, "url1")
-
-        # And you can pass in a callable that does whatever you want.
-        def accumulate(attrs, key, value):
-            if not isinstance(attrs[key], list):
-                attrs[key] = [attrs[key]]
-            attrs[key].append(value)
-        assert_attribute(accumulate, ["url1", "url2", "url3"])            
-
-    def test_html5_attributes(self):
-        # The html.parser TreeBuilder can convert any entity named in
-        # the HTML5 spec to a sequence of Unicode characters, and
-        # convert those Unicode characters to a (potentially
-        # different) named entity on the way out.
-        for input_element, output_unicode, output_element in (
-                ("&RightArrowLeftArrow;", '\u21c4', b'&rlarr;'),
-                ('&models;', '\u22a7', b'&models;'),
-                ('&Nfr;', '\U0001d511', b'&Nfr;'),
-                ('&ngeqq;', '\u2267\u0338', b'&ngeqq;'),
-                ('&not;', '\xac', b'&not;'),
-                ('&Not;', '\u2aec', b'&Not;'),
-                ('&quot;', '"', b'"'),
-                ('&there4;', '\u2234', b'&there4;'),
-                ('&Therefore;', '\u2234', b'&there4;'),
-                ('&therefore;', '\u2234', b'&there4;'),
-                ("&fjlig;", 'fj', b'fj'),                
-                ("&sqcup;", '\u2294', b'&sqcup;'),
-                ("&sqcups;", '\u2294\ufe00', b'&sqcups;'),
-                ("&apos;", "'", b"'"),
-                ("&verbar;", "|", b"|"),
-        ):
-            markup = '<div>%s</div>' % input_element
-            div = self.soup(markup).div
-            without_element = div.encode()
-            expect = b"<div>%s</div>" % output_unicode.encode("utf8")
-            assert without_element == expect
-
-            with_element = div.encode(formatter="html")
-            expect = b"<div>%s</div>" % output_element
-            assert with_element == expect
diff --git a/libs/bs4/tests/test_lxml.py b/libs/bs4/tests/test_lxml.py
deleted file mode 100644
index 5065b6fc83..0000000000
--- a/libs/bs4/tests/test_lxml.py
+++ /dev/null
@@ -1,203 +0,0 @@
-"""Tests to ensure that the lxml tree builder generates good trees."""
-
-import pickle
-import pytest
-import re
-import warnings
-from . import LXML_PRESENT, LXML_VERSION
-
-if LXML_PRESENT:
-    from bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
-
-from bs4 import (
-    BeautifulSoup,
-    BeautifulStoneSoup,
-    )
-from bs4.element import Comment, Doctype, SoupStrainer
-from . import (
-    HTMLTreeBuilderSmokeTest,
-    XMLTreeBuilderSmokeTest,
-    SOUP_SIEVE_PRESENT,
-    SoupTest,
-)
-
-@pytest.mark.skipif(
-    not LXML_PRESENT,
-    reason="lxml seems not to be present, not testing its tree builder."
-)
-class TestLXMLTreeBuilder(SoupTest, HTMLTreeBuilderSmokeTest):
-    """See ``HTMLTreeBuilderSmokeTest``."""
-
-    @property
-    def default_builder(self):
-        return LXMLTreeBuilder
-
-    def test_out_of_range_entity(self):
-        self.assert_soup(
-            "<p>foo&#10000000000000;bar</p>", "<p>foobar</p>")
-        self.assert_soup(
-            "<p>foo&#x10000000000000;bar</p>", "<p>foobar</p>")
-        self.assert_soup(
-            "<p>foo&#1000000000;bar</p>", "<p>foobar</p>")
-        
-    def test_entities_in_foreign_document_encoding(self):
-        # We can't implement this case correctly because by the time we
-        # hear about markup like "&#147;", it's been (incorrectly) converted into
-        # a string like u'\x93'
-        pass
-        
-    # In lxml < 2.3.5, an empty doctype causes a segfault. Skip this
-    # test if an old version of lxml is installed.
-
-    @pytest.mark.skipif(
-        not LXML_PRESENT or LXML_VERSION < (2,3,5,0),
-        reason="Skipping doctype test for old version of lxml to avoid segfault."
-    )
-    def test_empty_doctype(self):
-        soup = self.soup("<!DOCTYPE>")
-        doctype = soup.contents[0]
-        assert "" == doctype.strip()
-
-    def test_beautifulstonesoup_is_xml_parser(self):
-        # Make sure that the deprecated BSS class uses an xml builder
-        # if one is installed.
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulStoneSoup("<b />")
-        assert "<b/>" == str(soup.b)
-        [warning] = w
-        assert warning.filename == __file__
-        assert "BeautifulStoneSoup class is deprecated" in str(warning.message)
-
-    def test_tracking_line_numbers(self):
-        # The lxml TreeBuilder cannot keep track of line numbers from
-        # the original markup. Even if you ask for line numbers, we
-        # don't have 'em.
-        #
-        # This means that if you have a tag like <sourceline> or
-        # <sourcepos>, attribute access will find it rather than
-        # giving you a numeric answer.
-        soup = self.soup(
-            "\n   <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>",
-            store_line_numbers=True
-        )
-        assert "sourceline" == soup.p.sourceline.name
-        assert "sourcepos" == soup.p.sourcepos.name
-        
-@pytest.mark.skipif(
-    not LXML_PRESENT,
-    reason="lxml seems not to be present, not testing its XML tree builder."
-)
-class TestLXMLXMLTreeBuilder(SoupTest, XMLTreeBuilderSmokeTest):
-    """See ``HTMLTreeBuilderSmokeTest``."""
-
-    @property
-    def default_builder(self):
-        return LXMLTreeBuilderForXML
-
-    def test_namespace_indexing(self):
-        soup = self.soup(
-            '<?xml version="1.1"?>\n'
-            '<root>'
-            '<tag xmlns="http://unprefixed-namespace.com">content</tag>'
-            '<prefix:tag2 xmlns:prefix="http://prefixed-namespace.com">content</prefix:tag2>'
-            '<prefix2:tag3 xmlns:prefix2="http://another-namespace.com">'
-            '<subtag xmlns="http://another-unprefixed-namespace.com">'
-            '<subsubtag xmlns="http://yet-another-unprefixed-namespace.com">'
-            '</prefix2:tag3>'
-            '</root>'
-        )
-
-        # The BeautifulSoup object includes every namespace prefix
-        # defined in the entire document. This is the default set of
-        # namespaces used by soupsieve.
-        #
-        # Un-prefixed namespaces are not included, and if a given
-        # prefix is defined twice, only the first prefix encountered
-        # in the document shows up here.
-        assert soup._namespaces == {
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-            'prefix': 'http://prefixed-namespace.com',
-            'prefix2': 'http://another-namespace.com'
-        }
-
-        # A Tag object includes only the namespace prefixes
-        # that were in scope when it was parsed.
-
-        # We do not track un-prefixed namespaces as we can only hold
-        # one (the first one), and it will be recognized as the
-        # default namespace by soupsieve, even when operating from a
-        # tag with a different un-prefixed namespace.
-        assert soup.tag._namespaces == {
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-        assert soup.tag2._namespaces == {
-            'prefix': 'http://prefixed-namespace.com',
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-        assert soup.subtag._namespaces == {
-            'prefix2': 'http://another-namespace.com',
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-        assert soup.subsubtag._namespaces == {
-            'prefix2': 'http://another-namespace.com',
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-
-    @pytest.mark.skipif(
-        not SOUP_SIEVE_PRESENT, reason="Soup Sieve not installed"
-    )
-    def test_namespace_interaction_with_select_and_find(self):
-        # Demonstrate how namespaces interact with select* and
-        # find* methods.
-        
-        soup = self.soup(
-            '<?xml version="1.1"?>\n'
-            '<root>'
-            '<tag xmlns="http://unprefixed-namespace.com">content</tag>'
-            '<prefix:tag2 xmlns:prefix="http://prefixed-namespace.com">content</tag>'
-            '<subtag xmlns:prefix="http://another-namespace-same-prefix.com">'
-             '<prefix:tag3>'
-            '</subtag>'
-            '</root>'
-        )
-
-        # soupselect uses namespace URIs.
-        assert soup.select_one('tag').name == 'tag'
-        assert soup.select_one('prefix|tag2').name == 'tag2'
-
-        # If a prefix is declared more than once, only the first usage
-        # is registered with the BeautifulSoup object.
-        assert soup.select_one('prefix|tag3') is None
-
-        # But you can always explicitly specify a namespace dictionary.
-        assert soup.select_one(
-            'prefix|tag3', namespaces=soup.subtag._namespaces
-        ).name == 'tag3'
-
-        # And a Tag (as opposed to the BeautifulSoup object) will
-        # have a set of default namespaces scoped to that Tag.
-        assert soup.subtag.select_one('prefix|tag3').name=='tag3'
-
-        # the find() methods aren't fully namespace-aware; they just
-        # look at prefixes.
-        assert soup.find('tag').name == 'tag'
-        assert soup.find('prefix:tag2').name == 'tag2'
-        assert soup.find('prefix:tag3').name == 'tag3'
-        assert soup.subtag.find('prefix:tag3').name == 'tag3'
-
-    def test_pickle_restores_builder(self):
-        # The lxml TreeBuilder is not picklable, so when unpickling
-        # a document created with it, a new TreeBuilder of the
-        # appropriate class is created.
-        soup = self.soup("<a>some markup</a>")
-        assert isinstance(soup.builder, self.default_builder)
-        pickled = pickle.dumps(soup)
-        unpickled = pickle.loads(pickled)
-
-        assert "some markup" == unpickled.a.string
-        assert unpickled.builder != soup.builder
-        assert isinstance(unpickled.builder, self.default_builder)
diff --git a/libs/bs4/tests/test_navigablestring.py b/libs/bs4/tests/test_navigablestring.py
deleted file mode 100644
index e4c179e9d8..0000000000
--- a/libs/bs4/tests/test_navigablestring.py
+++ /dev/null
@@ -1,144 +0,0 @@
-import pytest
-
-from bs4.element import (
-    CData,
-    Comment,
-    Declaration,
-    Doctype,
-    NavigableString,
-    RubyParenthesisString,
-    RubyTextString,
-    Script,
-    Stylesheet,
-    TemplateString,
-)
-
-from . import SoupTest
-
-class TestNavigableString(SoupTest):
-
-    def test_text_acquisition_methods(self):
-        # These methods are intended for use against Tag, but they
-        # work on NavigableString as well,
-        
-        s = NavigableString("fee ")
-        cdata = CData("fie ")
-        comment = Comment("foe ")
-
-        assert "fee " == s.get_text()
-        assert "fee" == s.get_text(strip=True)
-        assert ["fee "] == list(s.strings)
-        assert ["fee"] == list(s.stripped_strings)
-        assert ["fee "] == list(s._all_strings())
-
-        assert "fie " == cdata.get_text()
-        assert "fie" == cdata.get_text(strip=True)
-        assert ["fie "] == list(cdata.strings)
-        assert ["fie"] == list(cdata.stripped_strings)
-        assert ["fie "] == list(cdata._all_strings())
-        
-        # Since a Comment isn't normally considered 'text',
-        # these methods generally do nothing.
-        assert "" == comment.get_text()
-        assert [] == list(comment.strings)
-        assert [] == list(comment.stripped_strings)
-        assert [] == list(comment._all_strings())
-
-        # Unless you specifically say that comments are okay.
-        assert "foe" == comment.get_text(strip=True, types=Comment)
-        assert "foe " == comment.get_text(types=(Comment, NavigableString))
-
-    def test_string_has_immutable_name_property(self):
-        # string.name is defined as None and can't be modified
-        string = self.soup("s").string
-        assert None == string.name
-        with pytest.raises(AttributeError):
-            string.name = 'foo'
-
-class TestNavigableStringSubclasses(SoupTest):
-
-    def test_cdata(self):
-        # None of the current builders turn CDATA sections into CData
-        # objects, but you can create them manually.
-        soup = self.soup("")
-        cdata = CData("foo")
-        soup.insert(1, cdata)
-        assert str(soup) == "<![CDATA[foo]]>"
-        assert soup.find(string="foo") == "foo"
-        assert soup.contents[0] == "foo"
-
-    def test_cdata_is_never_formatted(self):
-        """Text inside a CData object is passed into the formatter.
-
-        But the return value is ignored.
-        """
-
-        self.count = 0
-        def increment(*args):
-            self.count += 1
-            return "BITTER FAILURE"
-
-        soup = self.soup("")
-        cdata = CData("<><><>")
-        soup.insert(1, cdata)
-        assert b"<![CDATA[<><><>]]>" == soup.encode(formatter=increment)
-        assert 1 == self.count
-
-    def test_doctype_ends_in_newline(self):
-        # Unlike other NavigableString subclasses, a DOCTYPE always ends
-        # in a newline.
-        doctype = Doctype("foo")
-        soup = self.soup("")
-        soup.insert(1, doctype)
-        assert soup.encode() == b"<!DOCTYPE foo>\n"
-
-    def test_declaration(self):
-        d = Declaration("foo")
-        assert "<?foo?>" == d.output_ready()
-
-    def test_default_string_containers(self):
-        # In some cases, we use different NavigableString subclasses for
-        # the same text in different tags.
-        soup = self.soup(
-            "<div>text</div><script>text</script><style>text</style>"
-        )
-        assert [NavigableString, Script, Stylesheet] == [
-            x.__class__ for x in soup.find_all(string=True)
-        ]
-
-        # The TemplateString is a little unusual because it's generally found
-        # _inside_ children of a <template> element, not a direct child of the
-        # <template> element.
-        soup = self.soup(
-            "<template>Some text<p>In a tag</p></template>Some text outside"
-        )
-        assert all(
-            isinstance(x, TemplateString)
-            for x in soup.template._all_strings(types=None)
-        )
-        
-        # Once the <template> tag closed, we went back to using
-        # NavigableString.
-        outside = soup.template.next_sibling
-        assert isinstance(outside, NavigableString)
-        assert not isinstance(outside, TemplateString)
-
-        # The TemplateString is also unusual because it can contain
-        # NavigableString subclasses of _other_ types, such as
-        # Comment.
-        markup = b"<template>Some text<p>In a tag</p><!--with a comment--></template>"
-        soup = self.soup(markup)
-        assert markup == soup.template.encode("utf8")
-
-    def test_ruby_strings(self):
-        markup = "<ruby>ๆผข <rp>(</rp><rt>kan</rt><rp>)</rp> ๅญ— <rp>(</rp><rt>ji</rt><rp>)</rp></ruby>"
-        soup = self.soup(markup)
-        assert isinstance(soup.rp.string, RubyParenthesisString)
-        assert isinstance(soup.rt.string, RubyTextString)
-
-        # Just as a demo, here's what this means for get_text usage.
-        assert "ๆผขๅญ—" == soup.get_text(strip=True)
-        assert "ๆผข(kan)ๅญ—(ji)" == soup.get_text(
-            strip=True,
-            types=(NavigableString, RubyTextString, RubyParenthesisString)
-        )
diff --git a/libs/bs4/tests/test_pageelement.py b/libs/bs4/tests/test_pageelement.py
deleted file mode 100644
index 24f9385de2..0000000000
--- a/libs/bs4/tests/test_pageelement.py
+++ /dev/null
@@ -1,378 +0,0 @@
-"""Tests of the bs4.element.PageElement class"""
-import copy
-import pickle
-import pytest
-import sys
-
-from bs4 import BeautifulSoup
-from bs4.element import (
-    Comment,
-    ResultSet,
-    SoupStrainer,
-)
-from . import (
-    SoupTest,
-)
-
-class TestEncoding(SoupTest):
-    """Test the ability to encode objects into strings."""
-
-    def test_unicode_string_can_be_encoded(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert soup.b.string.encode("utf-8") == "\N{SNOWMAN}".encode("utf-8")
-
-    def test_tag_containing_unicode_string_can_be_encoded(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert soup.b.encode("utf-8") == html.encode("utf-8")
-
-    def test_encoding_substitutes_unrecognized_characters_by_default(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert soup.b.encode("ascii") == b"<b>&#9731;</b>"
-
-    def test_encoding_can_be_made_strict(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        with pytest.raises(UnicodeEncodeError):
-            soup.encode("ascii", errors="strict")
-
-    def test_decode_contents(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert "\N{SNOWMAN}" == soup.b.decode_contents()
-
-    def test_encode_contents(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert "\N{SNOWMAN}".encode("utf8") == soup.b.encode_contents(
-            encoding="utf8"
-        )
-        
-    def test_encode_deeply_nested_document(self):
-        # This test verifies that encoding a string doesn't involve
-        # any recursive function calls. If it did, this test would
-        # overflow the Python interpreter stack.
-        limit = sys.getrecursionlimit() + 1
-        markup = "<span>" * limit
-        soup = self.soup(markup)
-        encoded = soup.encode()
-        assert limit == encoded.count(b"<span>")
-
-    def test_deprecated_renderContents(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        soup.renderContents()
-        assert "\N{SNOWMAN}".encode("utf8") == soup.b.renderContents()
-
-    def test_repr(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert html == repr(soup)
-
-        
-class TestFormatters(SoupTest):
-    """Test the formatting feature, used by methods like decode() and
-    prettify(), and the formatters themselves.
-    """
-    
-    def test_default_formatter_is_minimal(self):
-        markup = "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="minimal")
-        # The < is converted back into &lt; but the e-with-acute is left alone.
-        assert decoded == self.document_for(
-                "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        )
-
-    def test_formatter_html(self):
-        markup = "<br><b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="html")
-        assert decoded == self.document_for(
-            "<br/><b>&lt;&lt;Sacr&eacute; bleu!&gt;&gt;</b>"
-        )
-
-    def test_formatter_html5(self):
-        markup = "<br><b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="html5")
-        assert decoded == self.document_for(
-            "<br><b>&lt;&lt;Sacr&eacute; bleu!&gt;&gt;</b>"
-        )
-        
-    def test_formatter_minimal(self):
-        markup = "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="minimal")
-        # The < is converted back into &lt; but the e-with-acute is left alone.
-        assert decoded == self.document_for(
-                "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        )
-
-    def test_formatter_null(self):
-        markup = "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter=None)
-        # Neither the angle brackets nor the e-with-acute are converted.
-        # This is not valid HTML, but it's what the user wanted.
-        assert decoded == self.document_for(
-            "<b><<Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!>></b>"
-        )
-
-    def test_formatter_custom(self):
-        markup = "<b>&lt;foo&gt;</b><b>bar</b><br/>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter = lambda x: x.upper())
-        # Instead of normal entity conversion code, the custom
-        # callable is called on every string.
-        assert decoded == self.document_for("<b><FOO></b><b>BAR</b><br/>")
-
-    def test_formatter_is_run_on_attribute_values(self):
-        markup = '<a href="http://a.com?a=b&c=รฉ">e</a>'
-        soup = self.soup(markup)
-        a = soup.a
-
-        expect_minimal = '<a href="http://a.com?a=b&amp;c=รฉ">e</a>'
-
-        assert expect_minimal == a.decode()
-        assert expect_minimal == a.decode(formatter="minimal")
-
-        expect_html = '<a href="http://a.com?a=b&amp;c=&eacute;">e</a>'
-        assert expect_html == a.decode(formatter="html")
-
-        assert markup == a.decode(formatter=None)
-        expect_upper = '<a href="HTTP://A.COM?A=B&C=ร‰">E</a>'
-        assert expect_upper == a.decode(formatter=lambda x: x.upper())
-
-    def test_formatter_skips_script_tag_for_html_documents(self):
-        doc = """
-  <script type="text/javascript">
-   console.log("< < hey > > ");
-  </script>
-"""
-        encoded = BeautifulSoup(doc, 'html.parser').encode()
-        assert b"< < hey > >" in encoded
-
-    def test_formatter_skips_style_tag_for_html_documents(self):
-        doc = """
-  <style type="text/css">
-   console.log("< < hey > > ");
-  </style>
-"""
-        encoded = BeautifulSoup(doc, 'html.parser').encode()
-        assert b"< < hey > >" in encoded
-
-    def test_prettify_leaves_preformatted_text_alone(self):
-        soup = self.soup("<div>  foo  <pre>  \tbar\n  \n  </pre>  baz  <textarea> eee\nfff\t</textarea></div>")
-        # Everything outside the <pre> tag is reformatted, but everything
-        # inside is left alone.
-        assert '<div>\n foo\n <pre>  \tbar\n  \n  </pre>\n baz\n <textarea> eee\nfff\t</textarea>\n</div>\n' == soup.div.prettify()
-
-    def test_prettify_handles_nested_string_literal_tags(self):
-        # Most of this markup is inside a <pre> tag, so prettify()
-        # only does three things to it:
-        # 1. Add a newline and a space between the <div> and the <pre>
-        # 2. Add a newline after the </pre>
-        # 3. Add a newline at the end.
-        #
-        # The contents of the <pre> tag are left completely alone.  In
-        # particular, we don't start adding whitespace again once we
-        # encounter the first </pre> tag, because we know it's not
-        # the one that put us into string literal mode.
-        markup = """<div><pre><code>some
-<script><pre>code</pre></script> for you 
-</code></pre></div>"""
-
-        expect = """<div>
- <pre><code>some
-<script><pre>code</pre></script> for you 
-</code></pre>
-</div>
-"""
-        soup = self.soup(markup)
-        assert expect == soup.div.prettify()
-
-    def test_prettify_accepts_formatter_function(self):
-        soup = BeautifulSoup("<html><body>foo</body></html>", 'html.parser')
-        pretty = soup.prettify(formatter = lambda x: x.upper())
-        assert "FOO" in pretty
-
-    def test_prettify_outputs_unicode_by_default(self):
-        soup = self.soup("<a></a>")
-        assert str == type(soup.prettify())
-
-    def test_prettify_can_encode_data(self):
-        soup = self.soup("<a></a>")
-        assert bytes == type(soup.prettify("utf-8"))
-
-    def test_html_entity_substitution_off_by_default(self):
-        markup = "<b>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</b>"
-        soup = self.soup(markup)
-        encoded = soup.b.encode("utf-8")
-        assert encoded == markup.encode('utf-8')
-
-    def test_encoding_substitution(self):
-        # Here's the <meta> tag saying that a document is
-        # encoded in Shift-JIS.
-        meta_tag = ('<meta content="text/html; charset=x-sjis" '
-                    'http-equiv="Content-type"/>')
-        soup = self.soup(meta_tag)
-
-        # Parse the document, and the charset apprears unchanged.
-        assert soup.meta['content'] == 'text/html; charset=x-sjis'
-
-        # Encode the document into some encoding, and the encoding is
-        # substituted into the meta tag.
-        utf_8 = soup.encode("utf-8")
-        assert b"charset=utf-8" in utf_8
-
-        euc_jp = soup.encode("euc_jp")
-        assert b"charset=euc_jp" in euc_jp
-
-        shift_jis = soup.encode("shift-jis")
-        assert b"charset=shift-jis" in shift_jis
-
-        utf_16_u = soup.encode("utf-16").decode("utf-16")
-        assert "charset=utf-16" in utf_16_u
-
-    def test_encoding_substitution_doesnt_happen_if_tag_is_strained(self):
-        markup = ('<head><meta content="text/html; charset=x-sjis" '
-                    'http-equiv="Content-type"/></head><pre>foo</pre>')
-
-        # Beautiful Soup used to try to rewrite the meta tag even if the
-        # meta tag got filtered out by the strainer. This test makes
-        # sure that doesn't happen.
-        strainer = SoupStrainer('pre')
-        soup = self.soup(markup, parse_only=strainer)
-        assert soup.contents[0].name == 'pre'
-
-
-class TestPersistence(SoupTest):
-    "Testing features like pickle and deepcopy."
-
-    def setup_method(self):
-        self.page = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Beautiful Soup: We called him Tortoise because he taught us.</title>
-<link rev="made" href="mailto:leonardr@segfault.org">
-<meta name="Description" content="Beautiful Soup: an HTML parser optimized for screen-scraping.">
-<meta name="generator" content="Markov Approximation 1.4 (module: leonardr)">
-<meta name="author" content="Leonard Richardson">
-</head>
-<body>
-<a href="foo">foo</a>
-<a href="foo"><b>bar</b></a>
-</body>
-</html>"""
-        self.tree = self.soup(self.page)
-
-    def test_pickle_and_unpickle_identity(self):
-        # Pickling a tree, then unpickling it, yields a tree identical
-        # to the original.
-        dumped = pickle.dumps(self.tree, 2)
-        loaded = pickle.loads(dumped)
-        assert loaded.__class__ == BeautifulSoup
-        assert loaded.decode() == self.tree.decode()
-        
-    def test_deepcopy_identity(self):
-        # Making a deepcopy of a tree yields an identical tree.
-        copied = copy.deepcopy(self.tree)
-        assert copied.decode() == self.tree.decode()
-
-    def test_copy_deeply_nested_document(self):
-        # This test verifies that copy and deepcopy don't involve any
-        # recursive function calls. If they did, this test would
-        # overflow the Python interpreter stack.
-        limit = sys.getrecursionlimit() + 1
-        markup = "<span>" * limit
-
-        soup = self.soup(markup)
-        
-        copied = copy.copy(soup)
-        copied = copy.deepcopy(soup)
-
-    def test_copy_preserves_encoding(self):
-        soup = BeautifulSoup(b'<p>&nbsp;</p>', 'html.parser')
-        encoding = soup.original_encoding
-        copy = soup.__copy__()
-        assert "<p>ย </p>" == str(copy)
-        assert encoding == copy.original_encoding
-
-    def test_copy_preserves_builder_information(self):
-
-        tag = self.soup('<p></p>').p
-
-        # Simulate a tag obtained from a source file.
-        tag.sourceline = 10
-        tag.sourcepos = 33
-        
-        copied = tag.__copy__()
-
-        # The TreeBuilder object is no longer availble, but information
-        # obtained from it gets copied over to the new Tag object.
-        assert tag.sourceline == copied.sourceline
-        assert tag.sourcepos == copied.sourcepos
-        assert tag.can_be_empty_element == copied.can_be_empty_element
-        assert tag.cdata_list_attributes == copied.cdata_list_attributes
-        assert tag.preserve_whitespace_tags == copied.preserve_whitespace_tags
-        assert tag.interesting_string_types == copied.interesting_string_types
-        
-    def test_unicode_pickle(self):
-        # A tree containing Unicode characters can be pickled.
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        dumped = pickle.dumps(soup, pickle.HIGHEST_PROTOCOL)
-        loaded = pickle.loads(dumped)
-        assert loaded.decode() == soup.decode()
-
-    def test_copy_navigablestring_is_not_attached_to_tree(self):
-        html = "<b>Foo<a></a></b><b>Bar</b>"
-        soup = self.soup(html)
-        s1 = soup.find(string="Foo")
-        s2 = copy.copy(s1)
-        assert s1 == s2
-        assert None == s2.parent
-        assert None == s2.next_element
-        assert None != s1.next_sibling
-        assert None == s2.next_sibling
-        assert None == s2.previous_element
-
-    def test_copy_navigablestring_subclass_has_same_type(self):
-        html = "<b><!--Foo--></b>"
-        soup = self.soup(html)
-        s1 = soup.string
-        s2 = copy.copy(s1)
-        assert s1 == s2
-        assert isinstance(s2, Comment)
-
-    def test_copy_entire_soup(self):
-        html = "<div><b>Foo<a></a></b><b>Bar</b></div>end"
-        soup = self.soup(html)
-        soup_copy = copy.copy(soup)
-        assert soup == soup_copy
-
-    def test_copy_tag_copies_contents(self):
-        html = "<div><b>Foo<a></a></b><b>Bar</b></div>end"
-        soup = self.soup(html)
-        div = soup.div
-        div_copy = copy.copy(div)
-
-        # The two tags look the same, and evaluate to equal.
-        assert str(div) == str(div_copy)
-        assert div == div_copy
-
-        # But they're not the same object.
-        assert div is not div_copy
-
-        # And they don't have the same relation to the parse tree. The
-        # copy is not associated with a parse tree at all.
-        assert None == div_copy.parent
-        assert None == div_copy.previous_element
-        assert None == div_copy.find(string='Bar').next_element
-        assert None != div.find(string='Bar').next_element
-
diff --git a/libs/bs4/tests/test_soup.py b/libs/bs4/tests/test_soup.py
deleted file mode 100644
index 28013b87bb..0000000000
--- a/libs/bs4/tests/test_soup.py
+++ /dev/null
@@ -1,504 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Tests of Beautiful Soup as a whole."""
-
-from pdb import set_trace
-import logging
-import os
-import pickle
-import pytest
-import sys
-import tempfile
-
-from bs4 import (
-    BeautifulSoup,
-    BeautifulStoneSoup,
-    GuessedAtParserWarning,
-    MarkupResemblesLocatorWarning,
-    dammit,
-)
-from bs4.builder import (
-    builder_registry,
-    TreeBuilder,
-    ParserRejectedMarkup,
-)
-from bs4.element import (
-    Comment,
-    SoupStrainer,
-    PYTHON_SPECIFIC_ENCODINGS,
-    Tag,
-    NavigableString,
-)
-
-from . import (
-    default_builder,
-    LXML_PRESENT,
-    SoupTest,
-)
-import warnings
-    
-class TestConstructor(SoupTest):
-
-    def test_short_unicode_input(self):
-        data = "<h1>รฉรฉ</h1>"
-        soup = self.soup(data)
-        assert "รฉรฉ" == soup.h1.string
-
-    def test_embedded_null(self):
-        data = "<h1>foo\0bar</h1>"
-        soup = self.soup(data)
-        assert "foo\0bar" == soup.h1.string
-
-    def test_exclude_encodings(self):
-        utf8_data = "Rรคksmรถrgรฅs".encode("utf-8")
-        soup = self.soup(utf8_data, exclude_encodings=["utf-8"])
-        assert "windows-1252" == soup.original_encoding
-
-    def test_custom_builder_class(self):
-        # Verify that you can pass in a custom Builder class and
-        # it'll be instantiated with the appropriate keyword arguments.
-        class Mock(object):
-            def __init__(self, **kwargs):
-                self.called_with = kwargs
-                self.is_xml = True
-                self.store_line_numbers = False
-                self.cdata_list_attributes = []
-                self.preserve_whitespace_tags = []
-                self.string_containers = {}
-            def initialize_soup(self, soup):
-                pass
-            def feed(self, markup):
-                self.fed = markup
-            def reset(self):
-                pass
-            def ignore(self, ignore):
-                pass
-            set_up_substitutions = can_be_empty_element = ignore
-            def prepare_markup(self, *args, **kwargs):
-                yield "prepared markup", "original encoding", "declared encoding", "contains replacement characters"
-                
-        kwargs = dict(
-            var="value",
-            # This is a deprecated BS3-era keyword argument, which
-            # will be stripped out.
-            convertEntities=True,
-        )
-        with warnings.catch_warnings(record=True):
-            soup = BeautifulSoup('', builder=Mock, **kwargs)
-        assert isinstance(soup.builder, Mock)
-        assert dict(var="value") == soup.builder.called_with
-        assert "prepared markup" == soup.builder.fed
-        
-        # You can also instantiate the TreeBuilder yourself. In this
-        # case, that specific object is used and any keyword arguments
-        # to the BeautifulSoup constructor are ignored.
-        builder = Mock(**kwargs)
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup(
-                '', builder=builder, ignored_value=True,
-            )
-        msg = str(w[0].message)
-        assert msg.startswith("Keyword arguments to the BeautifulSoup constructor will be ignored.")
-        assert builder == soup.builder
-        assert kwargs == builder.called_with
-
-    def test_parser_markup_rejection(self):
-        # If markup is completely rejected by the parser, an
-        # explanatory ParserRejectedMarkup exception is raised.
-        class Mock(TreeBuilder):
-            def feed(self, *args, **kwargs):
-                raise ParserRejectedMarkup("Nope.")
-
-        def prepare_markup(self, *args, **kwargs):
-            # We're going to try two different ways of preparing this markup,
-            # but feed() will reject both of them.
-            yield markup, None, None, False
-            yield markup, None, None, False
-            
-
-        import re
-        with pytest.raises(ParserRejectedMarkup) as exc_info:
-            BeautifulSoup('', builder=Mock)
-        assert "The markup you provided was rejected by the parser. Trying a different parser or a different encoding may help." in str(exc_info.value)
-        
-    def test_cdata_list_attributes(self):
-        # Most attribute values are represented as scalars, but the
-        # HTML standard says that some attributes, like 'class' have
-        # space-separated lists as values.
-        markup = '<a id=" an id " class=" a class "></a>'
-        soup = self.soup(markup)
-
-        # Note that the spaces are stripped for 'class' but not for 'id'.
-        a = soup.a
-        assert " an id " == a['id']
-        assert ["a", "class"] == a['class']
-
-        # TreeBuilder takes an argument called 'multi_valued_attributes'  which lets
-        # you customize or disable this. As always, you can customize the TreeBuilder
-        # by passing in a keyword argument to the BeautifulSoup constructor.
-        soup = self.soup(markup, builder=default_builder, multi_valued_attributes=None)
-        assert " a class " == soup.a['class']
-
-        # Here are two ways of saying that `id` is a multi-valued
-        # attribute in this context, but 'class' is not.
-        for switcheroo in ({'*': 'id'}, {'a': 'id'}):
-            with warnings.catch_warnings(record=True) as w:
-                # This will create a warning about not explicitly
-                # specifying a parser, but we'll ignore it.
-                soup = self.soup(markup, builder=None, multi_valued_attributes=switcheroo)
-            a = soup.a
-            assert ["an", "id"] == a['id']
-            assert " a class " == a['class']
-
-    def test_replacement_classes(self):
-        # Test the ability to pass in replacements for element classes
-        # which will be used when building the tree.
-        class TagPlus(Tag):
-            pass
-
-        class StringPlus(NavigableString):
-            pass
-
-        class CommentPlus(Comment):
-            pass
-        
-        soup = self.soup(
-            "<a><b>foo</b>bar</a><!--whee-->",
-            element_classes = {
-                Tag: TagPlus,
-                NavigableString: StringPlus,
-                Comment: CommentPlus,
-            }
-        )
-
-        # The tree was built with TagPlus, StringPlus, and CommentPlus objects,
-        # rather than Tag, String, and Comment objects.
-        assert all(
-            isinstance(x, (TagPlus, StringPlus, CommentPlus))
-            for x in soup.recursiveChildGenerator()
-        )
-
-    def test_alternate_string_containers(self):
-        # Test the ability to customize the string containers for
-        # different types of tags.
-        class PString(NavigableString):
-            pass
-
-        class BString(NavigableString):
-            pass
-
-        soup = self.soup(
-            "<div>Hello.<p>Here is <b>some <i>bolded</i></b> text",
-            string_containers = {
-                'b': BString,
-                'p': PString,
-            }
-        )
-
-        # The string before the <p> tag is a regular NavigableString.
-        assert isinstance(soup.div.contents[0], NavigableString)
-        
-        # The string inside the <p> tag, but not inside the <i> tag,
-        # is a PString.
-        assert isinstance(soup.p.contents[0], PString)
-
-        # Every string inside the <b> tag is a BString, even the one that
-        # was also inside an <i> tag.
-        for s in soup.b.strings:
-            assert isinstance(s, BString)
-
-        # Now that parsing was complete, the string_container_stack
-        # (where this information was kept) has been cleared out.
-        assert [] == soup.string_container_stack
-
-
-class TestOutput(SoupTest):
-
-    @pytest.mark.parametrize(
-        "eventual_encoding,actual_encoding", [
-            ("utf-8", "utf-8"),
-            ("utf-16", "utf-16"),
-        ]
-    )
-    def test_decode_xml_declaration(self, eventual_encoding, actual_encoding):
-        # Most of the time, calling decode() on an XML document will
-        # give you a document declaration that mentions the encoding
-        # you intend to use when encoding the document as a
-        # bytestring.
-        soup = self.soup("<tag></tag>")
-        soup.is_xml = True
-        assert (f'<?xml version="1.0" encoding="{actual_encoding}"?>\n<tag></tag>'
-                == soup.decode(eventual_encoding=eventual_encoding))
-
-    @pytest.mark.parametrize(
-        "eventual_encoding", [x for x in PYTHON_SPECIFIC_ENCODINGS] + [None]
-    )
-    def test_decode_xml_declaration_with_missing_or_python_internal_eventual_encoding(self, eventual_encoding):
-        # But if you pass a Python internal encoding into decode(), or
-        # omit the eventual_encoding altogether, the document
-        # declaration won't mention any particular encoding.
-        soup = BeautifulSoup("<tag></tag>", "html.parser")
-        soup.is_xml = True
-        assert (f'<?xml version="1.0"?>\n<tag></tag>'
-                == soup.decode(eventual_encoding=eventual_encoding))
-
-    def test(self):
-        # BeautifulSoup subclasses Tag and extends the decode() method.
-        # Make sure the other Tag methods which call decode() call
-        # it correctly.
-        soup = self.soup("<tag></tag>")
-        assert b"<tag></tag>" == soup.encode(encoding="utf-8")
-        assert b"<tag></tag>" == soup.encode_contents(encoding="utf-8")
-        assert "<tag></tag>" == soup.decode_contents()
-        assert "<tag>\n</tag>\n" == soup.prettify()
-
-        
-class TestWarnings(SoupTest):
-    # Note that some of the tests in this class create BeautifulSoup
-    # objects directly rather than using self.soup(). That's
-    # because SoupTest.soup is defined in a different file,
-    # which will throw off the assertion in _assert_warning
-    # that the code that triggered the warning is in the same
-    # file as the test.
-
-    def _assert_warning(self, warnings, cls):
-        for w in warnings:
-            if isinstance(w.message, cls):
-                assert w.filename == __file__
-                return w
-        raise Exception("%s warning not found in %r" % (cls, warnings))
-    
-    def _assert_no_parser_specified(self, w):
-        warning = self._assert_warning(w, GuessedAtParserWarning)
-        message = str(warning.message)
-        assert message.startswith(BeautifulSoup.NO_PARSER_SPECIFIED_WARNING[:60])
-
-    def test_warning_if_no_parser_specified(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup("<a><b></b></a>")
-        self._assert_no_parser_specified(w)
-
-    def test_warning_if_parser_specified_too_vague(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup("<a><b></b></a>", "html")
-        self._assert_no_parser_specified(w)
-
-    def test_no_warning_if_explicit_parser_specified(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup("<a><b></b></a>")
-        assert [] == w
-
-    def test_parseOnlyThese_renamed_to_parse_only(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup(
-                "<a><b></b></a>", "html.parser",
-                parseOnlyThese=SoupStrainer("b"),
-            )
-        warning = self._assert_warning(w, DeprecationWarning)
-        msg = str(warning.message)
-        assert "parseOnlyThese" in msg
-        assert "parse_only" in msg
-        assert b"<b></b>" == soup.encode()
-
-    def test_fromEncoding_renamed_to_from_encoding(self):
-        with warnings.catch_warnings(record=True) as w:
-            utf8 = b"\xc3\xa9"
-            soup = BeautifulSoup(
-                utf8, "html.parser", fromEncoding="utf8"
-            )
-        warning = self._assert_warning(w, DeprecationWarning)
-        msg = str(warning.message)
-        assert "fromEncoding" in msg
-        assert "from_encoding" in msg
-        assert "utf8" == soup.original_encoding
-
-    def test_unrecognized_keyword_argument(self):
-        with pytest.raises(TypeError):
-            self.soup("<a>", no_such_argument=True)
-
-    @pytest.mark.parametrize(
-        "extension",
-        ['markup.html', 'markup.htm', 'markup.HTML', 'markup.txt',
-         'markup.xhtml', 'markup.xml', "/home/user/file", "c:\\user\file"]
-    )
-    def test_resembles_filename_warning(self, extension):
-        # A warning is issued if the "markup" looks like the name of
-        # an HTML or text file, or a full path to a file on disk.
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup("markup" + extension, "html.parser")
-            warning = self._assert_warning(w, MarkupResemblesLocatorWarning)
-            assert "looks more like a filename" in str(warning.message)
-
-    @pytest.mark.parametrize(
-        "extension",
-        ['markuphtml', 'markup.com', '', 'markup.js']
-    )
-    def test_resembles_filename_no_warning(self, extension):
-        # The 'looks more like a filename' warning is not issued if
-        # the markup looks like a bare string, a domain name, or a
-        # file that's not an HTML file.
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup("markup" + extension)
-        assert [] == w
-
-    def test_url_warning_with_bytes_url(self):
-        url = b"http://www.crummybytes.com/"
-        with warnings.catch_warnings(record=True) as warning_list:
-            soup = BeautifulSoup(url, "html.parser")
-        warning = self._assert_warning(
-            warning_list, MarkupResemblesLocatorWarning
-        )
-        assert "looks more like a URL" in str(warning.message)
-        assert url not in str(warning.message).encode("utf8")
-        
-    def test_url_warning_with_unicode_url(self):
-        url = "http://www.crummyunicode.com/"
-        with warnings.catch_warnings(record=True) as warning_list:
-            # note - this url must differ from the bytes one otherwise
-            # python's warnings system swallows the second warning
-            soup = BeautifulSoup(url, "html.parser")
-        warning = self._assert_warning(
-            warning_list, MarkupResemblesLocatorWarning
-        )
-        assert "looks more like a URL" in str(warning.message)
-        assert url not in str(warning.message)
-
-    def test_url_warning_with_bytes_and_space(self):
-        # Here the markup contains something besides a URL, so no warning
-        # is issued.
-        with warnings.catch_warnings(record=True) as warning_list:
-            soup = self.soup(b"http://www.crummybytes.com/ is great")
-        assert not any("looks more like a URL" in str(w.message) 
-                       for w in warning_list)
-
-    def test_url_warning_with_unicode_and_space(self):
-        with warnings.catch_warnings(record=True) as warning_list:
-            soup = self.soup("http://www.crummyunicode.com/ is great")
-        assert not any("looks more like a URL" in str(w.message) 
-                       for w in warning_list)
-
-
-class TestSelectiveParsing(SoupTest):
-
-    def test_parse_with_soupstrainer(self):
-        markup = "No<b>Yes</b><a>No<b>Yes <c>Yes</c></b>"
-        strainer = SoupStrainer("b")
-        soup = self.soup(markup, parse_only=strainer)
-        assert soup.encode() == b"<b>Yes</b><b>Yes <c>Yes</c></b>"
-
-        
-class TestNewTag(SoupTest):
-    """Test the BeautifulSoup.new_tag() method."""
-    def test_new_tag(self):
-        soup = self.soup("")
-        new_tag = soup.new_tag("foo", bar="baz", attrs={"name": "a name"})
-        assert isinstance(new_tag, Tag)
-        assert "foo" == new_tag.name
-        assert dict(bar="baz", name="a name") == new_tag.attrs
-        assert None == new_tag.parent
-
-    @pytest.mark.skipif(
-        not LXML_PRESENT,
-        reason="lxml not installed, cannot parse XML document"
-    )
-    def test_xml_tag_inherits_self_closing_rules_from_builder(self):
-        xml_soup = BeautifulSoup("", "xml")
-        xml_br = xml_soup.new_tag("br")
-        xml_p = xml_soup.new_tag("p")
-
-        # Both the <br> and <p> tag are empty-element, just because
-        # they have no contents.
-        assert b"<br/>" == xml_br.encode()
-        assert b"<p/>" == xml_p.encode()
-
-    def test_tag_inherits_self_closing_rules_from_builder(self):
-        html_soup = BeautifulSoup("", "html.parser")
-        html_br = html_soup.new_tag("br")
-        html_p = html_soup.new_tag("p")
-
-        # The HTML builder users HTML's rules about which tags are
-        # empty-element tags, and the new tags reflect these rules.
-        assert b"<br/>" == html_br.encode()
-        assert b"<p></p>" == html_p.encode()
-
-class TestNewString(SoupTest):
-    """Test the BeautifulSoup.new_string() method."""
-    def test_new_string_creates_navigablestring(self):
-        soup = self.soup("")
-        s = soup.new_string("foo")
-        assert "foo" == s
-        assert isinstance(s, NavigableString)
-
-    def test_new_string_can_create_navigablestring_subclass(self):
-        soup = self.soup("")
-        s = soup.new_string("foo", Comment)
-        assert "foo" == s
-        assert isinstance(s, Comment)
-
-
-class TestPickle(SoupTest):
-   # Test our ability to pickle the BeautifulSoup object itself.
-
-    def test_normal_pickle(self):
-        soup = self.soup("<a>some markup</a>")
-        pickled = pickle.dumps(soup)
-        unpickled = pickle.loads(pickled)
-        assert "some markup" == unpickled.a.string
-        
-    def test_pickle_with_no_builder(self):
-        # We had a bug that prevented pickling from working if
-        # the builder wasn't set.
-        soup = self.soup("some markup")
-        soup.builder = None
-        pickled = pickle.dumps(soup)
-        unpickled = pickle.loads(pickled)
-        assert "some markup" == unpickled.string
-
-class TestEncodingConversion(SoupTest):
-    # Test Beautiful Soup's ability to decode and encode from various
-    # encodings.
-
-    def setup_method(self):
-        self.unicode_data = '<html><head><meta charset="utf-8"/></head><body><foo>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</foo></body></html>'
-        self.utf8_data = self.unicode_data.encode("utf-8")
-        # Just so you know what it looks like.
-        assert self.utf8_data == b'<html><head><meta charset="utf-8"/></head><body><foo>Sacr\xc3\xa9 bleu!</foo></body></html>'
-
-    def test_ascii_in_unicode_out(self):
-        # ASCII input is converted to Unicode. The original_encoding
-        # attribute is set to 'utf-8', a superset of ASCII.
-        chardet = dammit.chardet_dammit
-        logging.disable(logging.WARNING)
-        try:
-            def noop(str):
-                return None
-            # Disable chardet, which will realize that the ASCII is ASCII.
-            dammit.chardet_dammit = noop
-            ascii = b"<foo>a</foo>"
-            soup_from_ascii = self.soup(ascii)
-            unicode_output = soup_from_ascii.decode()
-            assert isinstance(unicode_output, str)
-            assert unicode_output == self.document_for(ascii.decode())
-            assert soup_from_ascii.original_encoding.lower() == "utf-8"
-        finally:
-            logging.disable(logging.NOTSET)
-            dammit.chardet_dammit = chardet
-
-    def test_unicode_in_unicode_out(self):
-        # Unicode input is left alone. The original_encoding attribute
-        # is not set.
-        soup_from_unicode = self.soup(self.unicode_data)
-        assert soup_from_unicode.decode() == self.unicode_data
-        assert soup_from_unicode.foo.string == 'Sacr\xe9 bleu!'
-        assert soup_from_unicode.original_encoding == None
-
-    def test_utf8_in_unicode_out(self):
-        # UTF-8 input is converted to Unicode. The original_encoding
-        # attribute is set.
-        soup_from_utf8 = self.soup(self.utf8_data)
-        assert soup_from_utf8.decode() == self.unicode_data
-        assert soup_from_utf8.foo.string == 'Sacr\xe9 bleu!'
-
-    def test_utf8_out(self):
-        # The internal data structures can be encoded as UTF-8.
-        soup_from_unicode = self.soup(self.unicode_data)
-        assert soup_from_unicode.encode('utf-8') == self.utf8_data
diff --git a/libs/bs4/tests/test_tag.py b/libs/bs4/tests/test_tag.py
deleted file mode 100644
index c48f334567..0000000000
--- a/libs/bs4/tests/test_tag.py
+++ /dev/null
@@ -1,234 +0,0 @@
-import warnings
-from bs4.element import (
-    Comment,
-    NavigableString,
-)
-from . import SoupTest
-
-class TestTag(SoupTest):
-    """Test various methods of Tag which aren't so complicated they
-    need their own classes.
-    """
-
-    def test__should_pretty_print(self):
-        # Test the rules about when a tag should be pretty-printed.
-        tag = self.soup("").new_tag("a_tag")
-
-        # No list of whitespace-preserving tags -> pretty-print
-        tag._preserve_whitespace_tags = None
-        assert True == tag._should_pretty_print(0)
-
-        # List exists but tag is not on the list -> pretty-print
-        tag.preserve_whitespace_tags = ["some_other_tag"]
-        assert True == tag._should_pretty_print(1)
-
-        # Indent level is None -> don't pretty-print
-        assert False == tag._should_pretty_print(None)
-        
-        # Tag is on the whitespace-preserving list -> don't pretty-print
-        tag.preserve_whitespace_tags = ["some_other_tag", "a_tag"]
-        assert False == tag._should_pretty_print(1)
-    
-    def test_len(self):
-        """The length of a Tag is its number of children."""
-        soup = self.soup("<top>1<b>2</b>3</top>")
-
-        # The BeautifulSoup object itself contains one element: the
-        # <top> tag.
-        assert len(soup.contents) == 1
-        assert len(soup) == 1
-
-        # The <top> tag contains three elements: the text node "1", the
-        # <b> tag, and the text node "3".
-        assert len(soup.top) == 3
-        assert len(soup.top.contents) == 3
-
-    def test_member_access_invokes_find(self):
-        """Accessing a Python member .foo invokes find('foo')"""
-        soup = self.soup('<b><i></i></b>')
-        assert soup.b == soup.find('b')
-        assert soup.b.i == soup.find('b').find('i')
-        assert soup.a == None
-
-    def test_deprecated_member_access(self):
-        soup = self.soup('<b><i></i></b>')
-        with warnings.catch_warnings(record=True) as w:
-            tag = soup.bTag
-        assert soup.b == tag
-        assert '.bTag is deprecated, use .find("b") instead. If you really were looking for a tag called bTag, use .find("bTag")' == str(w[0].message)
-
-    def test_has_attr(self):
-        """has_attr() checks for the presence of an attribute.
-
-        Please note note: has_attr() is different from
-        __in__. has_attr() checks the tag's attributes and __in__
-        checks the tag's chidlren.
-        """
-        soup = self.soup("<foo attr='bar'>")
-        assert soup.foo.has_attr('attr')
-        assert not soup.foo.has_attr('attr2')
-
-    def test_attributes_come_out_in_alphabetical_order(self):
-        markup = '<b a="1" z="5" m="3" f="2" y="4"></b>'
-        self.assertSoupEquals(markup, '<b a="1" f="2" m="3" y="4" z="5"></b>')
-
-    def test_string(self):
-        # A Tag that contains only a text node makes that node
-        # available as .string.
-        soup = self.soup("<b>foo</b>")
-        assert soup.b.string == 'foo'
-
-    def test_empty_tag_has_no_string(self):
-        # A Tag with no children has no .stirng.
-        soup = self.soup("<b></b>")
-        assert soup.b.string == None
-
-    def test_tag_with_multiple_children_has_no_string(self):
-        # A Tag with no children has no .string.
-        soup = self.soup("<a>foo<b></b><b></b></b>")
-        assert soup.b.string == None
-
-        soup = self.soup("<a>foo<b></b>bar</b>")
-        assert soup.b.string == None
-
-        # Even if all the children are strings, due to trickery,
-        # it won't work--but this would be a good optimization.
-        soup = self.soup("<a>foo</b>")
-        soup.a.insert(1, "bar")
-        assert soup.a.string == None
-
-    def test_tag_with_recursive_string_has_string(self):
-        # A Tag with a single child which has a .string inherits that
-        # .string.
-        soup = self.soup("<a><b>foo</b></a>")
-        assert soup.a.string == "foo"
-        assert soup.string == "foo"
-
-    def test_lack_of_string(self):
-        """Only a Tag containing a single text node has a .string."""
-        soup = self.soup("<b>f<i>e</i>o</b>")
-        assert soup.b.string is None
-
-        soup = self.soup("<b></b>")
-        assert soup.b.string is None
-
-    def test_all_text(self):
-        """Tag.text and Tag.get_text(sep=u"") -> all child text, concatenated"""
-        soup = self.soup("<a>a<b>r</b>   <r> t </r></a>")
-        assert soup.a.text == "ar  t "
-        assert soup.a.get_text(strip=True) == "art"
-        assert soup.a.get_text(",") == "a,r, , t "
-        assert soup.a.get_text(",", strip=True) == "a,r,t"
-
-    def test_get_text_ignores_special_string_containers(self):
-        soup = self.soup("foo<!--IGNORE-->bar")
-        assert soup.get_text() == "foobar"
-
-        assert soup.get_text(types=(NavigableString, Comment)) == "fooIGNOREbar"
-        assert soup.get_text(types=None) == "fooIGNOREbar"
-
-        soup = self.soup("foo<style>CSS</style><script>Javascript</script>bar")
-        assert soup.get_text() == "foobar"
-        
-    def test_all_strings_ignores_special_string_containers(self):
-        soup = self.soup("foo<!--IGNORE-->bar")
-        assert ['foo', 'bar'] == list(soup.strings)
-
-        soup = self.soup("foo<style>CSS</style><script>Javascript</script>bar")
-        assert ['foo', 'bar'] == list(soup.strings)
-
-    def test_string_methods_inside_special_string_container_tags(self):
-        # Strings inside tags like <script> are generally ignored by
-        # methods like get_text, because they're not what humans
-        # consider 'text'. But if you call get_text on the <script>
-        # tag itself, those strings _are_ considered to be 'text',
-        # because there's nothing else you might be looking for.
-        
-        style = self.soup("<div>a<style>Some CSS</style></div>")
-        template = self.soup("<div>a<template><p>Templated <b>text</b>.</p><!--With a comment.--></template></div>")
-        script = self.soup("<div>a<script><!--a comment-->Some text</script></div>")
-        
-        assert style.div.get_text() == "a"
-        assert list(style.div.strings) == ["a"]
-        assert style.div.style.get_text() == "Some CSS"
-        assert list(style.div.style.strings) == ['Some CSS']
-        
-        # The comment is not picked up here. That's because it was
-        # parsed into a Comment object, which is not considered
-        # interesting by template.strings.
-        assert template.div.get_text() == "a"
-        assert list(template.div.strings) == ["a"]
-        assert template.div.template.get_text() == "Templated text."
-        assert list(template.div.template.strings) == ["Templated ", "text", "."]
-
-        # The comment is included here, because it didn't get parsed
-        # into a Comment object--it's part of the Script string.
-        assert script.div.get_text() == "a"
-        assert list(script.div.strings) == ["a"]
-        assert script.div.script.get_text() == "<!--a comment-->Some text"
-        assert list(script.div.script.strings) == ['<!--a comment-->Some text']
-
-
-class TestMultiValuedAttributes(SoupTest):
-    """Test the behavior of multi-valued attributes like 'class'.
-
-    The values of such attributes are always presented as lists.
-    """
-
-    def test_single_value_becomes_list(self):
-        soup = self.soup("<a class='foo'>")
-        assert ["foo"] ==soup.a['class']
-
-    def test_multiple_values_becomes_list(self):
-        soup = self.soup("<a class='foo bar'>")
-        assert ["foo", "bar"] == soup.a['class']
-
-    def test_multiple_values_separated_by_weird_whitespace(self):
-        soup = self.soup("<a class='foo\tbar\nbaz'>")
-        assert ["foo", "bar", "baz"] ==soup.a['class']
-
-    def test_attributes_joined_into_string_on_output(self):
-        soup = self.soup("<a class='foo\tbar'>")
-        assert b'<a class="foo bar"></a>' == soup.a.encode()
-
-    def test_get_attribute_list(self):
-        soup = self.soup("<a id='abc def'>")
-        assert ['abc def'] == soup.a.get_attribute_list('id')
-        
-    def test_accept_charset(self):
-        soup = self.soup('<form accept-charset="ISO-8859-1 UTF-8">')
-        assert ['ISO-8859-1', 'UTF-8'] == soup.form['accept-charset']
-
-    def test_cdata_attribute_applying_only_to_one_tag(self):
-        data = '<a accept-charset="ISO-8859-1 UTF-8"></a>'
-        soup = self.soup(data)
-        # We saw in another test that accept-charset is a cdata-list
-        # attribute for the <form> tag. But it's not a cdata-list
-        # attribute for any other tag.
-        assert 'ISO-8859-1 UTF-8' == soup.a['accept-charset']
-
-    def test_customization(self):
-        # It's possible to change which attributes of which tags
-        # are treated as multi-valued attributes.
-        #
-        # Here, 'id' is a multi-valued attribute and 'class' is not.
-        #
-        # TODO: This code is in the builder and should be tested there.
-        soup = self.soup(
-            '<a class="foo" id="bar">', multi_valued_attributes={ '*' : 'id' }
-        )
-        assert soup.a['class'] == 'foo'
-        assert soup.a['id'] == ['bar']
-
-    def test_hidden_tag_is_invisible(self):
-        # Setting .hidden on a tag makes it invisible in output, but
-        # leaves its contents visible.
-        #
-        # This is not a documented or supported feature of Beautiful
-        # Soup (e.g. NavigableString doesn't support .hidden even
-        # though it could), but some people use it and it's not
-        # hurting anything to verify that it keeps working.
-        #
-        soup = self.soup('<div id="1"><span id="2">a string</span></div>')
-        soup.span.hidden = True
-        assert '<div id="1">a string</div>' == str(soup.div)
diff --git a/libs/bs4/tests/test_tree.py b/libs/bs4/tests/test_tree.py
deleted file mode 100644
index 26995f95a2..0000000000
--- a/libs/bs4/tests/test_tree.py
+++ /dev/null
@@ -1,1304 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Tests for Beautiful Soup's tree traversal methods.
-
-The tree traversal methods are the main advantage of using Beautiful
-Soup over just using a parser.
-
-Different parsers will build different Beautiful Soup trees given the
-same markup, but all Beautiful Soup trees can be traversed with the
-methods tested here.
-"""
-
-from pdb import set_trace
-import pytest
-import re
-import warnings
-from bs4 import BeautifulSoup
-from bs4.builder import (
-    builder_registry,
-    HTMLParserTreeBuilder,
-)
-from bs4.element import (
-    CData,
-    Comment,
-    Declaration,
-    Doctype,
-    Formatter,
-    NavigableString,
-    Script,
-    SoupStrainer,
-    Stylesheet,
-    Tag,
-    TemplateString,
-)
-from . import (
-    SoupTest,
-)
-
-class TestFind(SoupTest):
-    """Basic tests of the find() method.
-
-    find() just calls find_all() with limit=1, so it's not tested all
-    that thouroughly here.
-    """
-
-    def test_find_tag(self):
-        soup = self.soup("<a>1</a><b>2</b><a>3</a><b>4</b>")
-        assert soup.find("b").string == "2"
-
-    def test_unicode_text_find(self):
-        soup = self.soup('<h1>Rรคksmรถrgรฅs</h1>')
-        assert soup.find(string='Rรคksmรถrgรฅs') == 'Rรคksmรถrgรฅs'
-
-    def test_unicode_attribute_find(self):
-        soup = self.soup('<h1 id="Rรคksmรถrgรฅs">here it is</h1>')
-        str(soup)
-        assert "here it is" == soup.find(id='Rรคksmรถrgรฅs').text
-
-
-    def test_find_everything(self):
-        """Test an optimization that finds all tags."""
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        assert 2 == len(soup.find_all())
-
-    def test_find_everything_with_name(self):
-        """Test an optimization that finds all tags with a given name."""
-        soup = self.soup("<a>foo</a><b>bar</b><a>baz</a>")
-        assert 2 == len(soup.find_all('a'))
-
-class TestFindAll(SoupTest):
-    """Basic tests of the find_all() method."""
-
-    def test_find_all_text_nodes(self):
-        """You can search the tree for text nodes."""
-        soup = self.soup("<html>Foo<b>bar</b>\xbb</html>")
-        # Exact match.
-        assert soup.find_all(string="bar") == ["bar"]
-
-       
-        # Match any of a number of strings.
-        assert soup.find_all(string=["Foo", "bar"]) == ["Foo", "bar"]
-        # Match a regular expression.
-        assert soup.find_all(string=re.compile('.*')) == ["Foo", "bar", '\xbb']
-        # Match anything.
-        assert soup.find_all(string=True) == ["Foo", "bar", '\xbb']
-
-    def test_find_all_limit(self):
-        """You can limit the number of items returned by find_all."""
-        soup = self.soup("<a>1</a><a>2</a><a>3</a><a>4</a><a>5</a>")
-        self.assert_selects(soup.find_all('a', limit=3), ["1", "2", "3"])
-        self.assert_selects(soup.find_all('a', limit=1), ["1"])
-        self.assert_selects(
-            soup.find_all('a', limit=10), ["1", "2", "3", "4", "5"])
-
-        # A limit of 0 means no limit.
-        self.assert_selects(
-            soup.find_all('a', limit=0), ["1", "2", "3", "4", "5"])
-
-    def test_calling_a_tag_is_calling_findall(self):
-        soup = self.soup("<a>1</a><b>2<a id='foo'>3</a></b>")
-        self.assert_selects(soup('a', limit=1), ["1"])
-        self.assert_selects(soup.b(id="foo"), ["3"])
-
-    def test_find_all_with_self_referential_data_structure_does_not_cause_infinite_recursion(self):
-        soup = self.soup("<a></a>")
-        # Create a self-referential list.
-        l = []
-        l.append(l)
-
-        # Without special code in _normalize_search_value, this would cause infinite
-        # recursion.
-        assert [] == soup.find_all(l)
-
-    def test_find_all_resultset(self):
-        """All find_all calls return a ResultSet"""
-        soup = self.soup("<a></a>")
-        result = soup.find_all("a")
-        assert hasattr(result, "source")
-
-        result = soup.find_all(True)
-        assert hasattr(result, "source")
-
-        result = soup.find_all(string="foo")
-        assert hasattr(result, "source")
-
-
-class TestFindAllBasicNamespaces(SoupTest):
-
-    def test_find_by_namespaced_name(self):
-        soup = self.soup('<mathml:msqrt>4</mathml:msqrt><a svg:fill="red">')
-        assert "4" == soup.find("mathml:msqrt").string
-        assert "a" == soup.find(attrs= { "svg:fill" : "red" }).name
-
-
-class TestFindAllByName(SoupTest):
-    """Test ways of finding tags by tag name."""
-
-    def setup_method(self):
-        self.tree =  self.soup("""<a>First tag.</a>
-                                  <b>Second tag.</b>
-                                  <c>Third <a>Nested tag.</a> tag.</c>""")
-
-    def test_find_all_by_tag_name(self):
-        # Find all the <a> tags.
-        self.assert_selects(
-            self.tree.find_all('a'), ['First tag.', 'Nested tag.'])
-
-    def test_find_all_by_name_and_text(self):
-        self.assert_selects(
-            self.tree.find_all('a', string='First tag.'), ['First tag.'])
-
-        self.assert_selects(
-            self.tree.find_all('a', string=True), ['First tag.', 'Nested tag.'])
-
-        self.assert_selects(
-            self.tree.find_all('a', string=re.compile("tag")),
-            ['First tag.', 'Nested tag.'])
-
-
-    def test_find_all_on_non_root_element(self):
-        # You can call find_all on any node, not just the root.
-        self.assert_selects(self.tree.c.find_all('a'), ['Nested tag.'])
-
-    def test_calling_element_invokes_find_all(self):
-        self.assert_selects(self.tree('a'), ['First tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_strainer(self):
-        self.assert_selects(
-            self.tree.find_all(SoupStrainer('a')),
-            ['First tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_names(self):
-        self.assert_selects(
-            self.tree.find_all(['a', 'b']),
-            ['First tag.', 'Second tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_dict(self):
-        self.assert_selects(
-            self.tree.find_all({'a' : True, 'b' : True}),
-            ['First tag.', 'Second tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_re(self):
-        self.assert_selects(
-            self.tree.find_all(re.compile('^[ab]$')),
-            ['First tag.', 'Second tag.', 'Nested tag.'])
-
-    def test_find_all_with_tags_matching_method(self):
-        # You can define an oracle method that determines whether
-        # a tag matches the search.
-        def id_matches_name(tag):
-            return tag.name == tag.get('id')
-
-        tree = self.soup("""<a id="a">Match 1.</a>
-                            <a id="1">Does not match.</a>
-                            <b id="b">Match 2.</a>""")
-
-        self.assert_selects(
-            tree.find_all(id_matches_name), ["Match 1.", "Match 2."])
-
-    def test_find_with_multi_valued_attribute(self):
-        soup = self.soup(
-            "<div class='a b'>1</div><div class='a c'>2</div><div class='a d'>3</div>"
-        )
-        r1 = soup.find('div', 'a d');
-        r2 = soup.find('div', re.compile(r'a d'));
-        r3, r4 = soup.find_all('div', ['a b', 'a d']);
-        assert '3' == r1.string
-        assert '3' == r2.string
-        assert '1' == r3.string
-        assert '3' == r4.string
-
-        
-class TestFindAllByAttribute(SoupTest):
-
-    def test_find_all_by_attribute_name(self):
-        # You can pass in keyword arguments to find_all to search by
-        # attribute.
-        tree = self.soup("""
-                         <a id="first">Matching a.</a>
-                         <a id="second">
-                          Non-matching <b id="first">Matching b.</b>a.
-                         </a>""")
-        self.assert_selects(tree.find_all(id='first'),
-                           ["Matching a.", "Matching b."])
-
-    def test_find_all_by_utf8_attribute_value(self):
-        peace = "ืื•ืœืฉ".encode("utf8")
-        data = '<a title="ืื•ืœืฉ"></a>'.encode("utf8")
-        soup = self.soup(data)
-        assert [soup.a] == soup.find_all(title=peace)
-        assert [soup.a] == soup.find_all(title=peace.decode("utf8"))
-        assert [soup.a], soup.find_all(title=[peace, "something else"])
-
-    def test_find_all_by_attribute_dict(self):
-        # You can pass in a dictionary as the argument 'attrs'. This
-        # lets you search for attributes like 'name' (a fixed argument
-        # to find_all) and 'class' (a reserved word in Python.)
-        tree = self.soup("""
-                         <a name="name1" class="class1">Name match.</a>
-                         <a name="name2" class="class2">Class match.</a>
-                         <a name="name3" class="class3">Non-match.</a>
-                         <name1>A tag called 'name1'.</name1>
-                         """)
-
-        # This doesn't do what you want.
-        self.assert_selects(tree.find_all(name='name1'),
-                           ["A tag called 'name1'."])
-        # This does what you want.
-        self.assert_selects(tree.find_all(attrs={'name' : 'name1'}),
-                           ["Name match."])
-
-        self.assert_selects(tree.find_all(attrs={'class' : 'class2'}),
-                           ["Class match."])
-
-    def test_find_all_by_class(self):
-        tree = self.soup("""
-                         <a class="1">Class 1.</a>
-                         <a class="2">Class 2.</a>
-                         <b class="1">Class 1.</b>
-                         <c class="3 4">Class 3 and 4.</c>
-                         """)
-
-        # Passing in the class_ keyword argument will search against
-        # the 'class' attribute.
-        self.assert_selects(tree.find_all('a', class_='1'), ['Class 1.'])
-        self.assert_selects(tree.find_all('c', class_='3'), ['Class 3 and 4.'])
-        self.assert_selects(tree.find_all('c', class_='4'), ['Class 3 and 4.'])
-
-        # Passing in a string to 'attrs' will also search the CSS class.
-        self.assert_selects(tree.find_all('a', '1'), ['Class 1.'])
-        self.assert_selects(tree.find_all(attrs='1'), ['Class 1.', 'Class 1.'])
-        self.assert_selects(tree.find_all('c', '3'), ['Class 3 and 4.'])
-        self.assert_selects(tree.find_all('c', '4'), ['Class 3 and 4.'])
-
-    def test_find_by_class_when_multiple_classes_present(self):
-        tree = self.soup("<gar class='foo bar'>Found it</gar>")
-
-        f = tree.find_all("gar", class_=re.compile("o"))
-        self.assert_selects(f, ["Found it"])
-
-        f = tree.find_all("gar", class_=re.compile("a"))
-        self.assert_selects(f, ["Found it"])
-
-        # If the search fails to match the individual strings "foo" and "bar",
-        # it will be tried against the combined string "foo bar".
-        f = tree.find_all("gar", class_=re.compile("o b"))
-        self.assert_selects(f, ["Found it"])
-
-    def test_find_all_with_non_dictionary_for_attrs_finds_by_class(self):
-        soup = self.soup("<a class='bar'>Found it</a>")
-
-        self.assert_selects(soup.find_all("a", re.compile("ba")), ["Found it"])
-
-        def big_attribute_value(value):
-            return len(value) > 3
-
-        self.assert_selects(soup.find_all("a", big_attribute_value), [])
-
-        def small_attribute_value(value):
-            return len(value) <= 3
-
-        self.assert_selects(
-            soup.find_all("a", small_attribute_value), ["Found it"])
-
-    def test_find_all_with_string_for_attrs_finds_multiple_classes(self):
-        soup = self.soup('<a class="foo bar"></a><a class="foo"></a>')
-        a, a2 = soup.find_all("a")
-        assert [a, a2], soup.find_all("a", "foo")
-        assert [a], soup.find_all("a", "bar")
-
-        # If you specify the class as a string that contains a
-        # space, only that specific value will be found.
-        assert [a] == soup.find_all("a", class_="foo bar")
-        assert [a] == soup.find_all("a", "foo bar")
-        assert [] == soup.find_all("a", "bar foo")
-
-    def test_find_all_by_attribute_soupstrainer(self):
-        tree = self.soup("""
-                         <a id="first">Match.</a>
-                         <a id="second">Non-match.</a>""")
-
-        strainer = SoupStrainer(attrs={'id' : 'first'})
-        self.assert_selects(tree.find_all(strainer), ['Match.'])
-
-    def test_find_all_with_missing_attribute(self):
-        # You can pass in None as the value of an attribute to find_all.
-        # This will match tags that do not have that attribute set.
-        tree = self.soup("""<a id="1">ID present.</a>
-                            <a>No ID present.</a>
-                            <a id="">ID is empty.</a>""")
-        self.assert_selects(tree.find_all('a', id=None), ["No ID present."])
-
-    def test_find_all_with_defined_attribute(self):
-        # You can pass in None as the value of an attribute to find_all.
-        # This will match tags that have that attribute set to any value.
-        tree = self.soup("""<a id="1">ID present.</a>
-                            <a>No ID present.</a>
-                            <a id="">ID is empty.</a>""")
-        self.assert_selects(
-            tree.find_all(id=True), ["ID present.", "ID is empty."])
-
-    def test_find_all_with_numeric_attribute(self):
-        # If you search for a number, it's treated as a string.
-        tree = self.soup("""<a id=1>Unquoted attribute.</a>
-                            <a id="1">Quoted attribute.</a>""")
-
-        expected = ["Unquoted attribute.", "Quoted attribute."]
-        self.assert_selects(tree.find_all(id=1), expected)
-        self.assert_selects(tree.find_all(id="1"), expected)
-
-    def test_find_all_with_list_attribute_values(self):
-        # You can pass a list of attribute values instead of just one,
-        # and you'll get tags that match any of the values.
-        tree = self.soup("""<a id="1">1</a>
-                            <a id="2">2</a>
-                            <a id="3">3</a>
-                            <a>No ID.</a>""")
-        self.assert_selects(tree.find_all(id=["1", "3", "4"]),
-                           ["1", "3"])
-
-    def test_find_all_with_regular_expression_attribute_value(self):
-        # You can pass a regular expression as an attribute value, and
-        # you'll get tags whose values for that attribute match the
-        # regular expression.
-        tree = self.soup("""<a id="a">One a.</a>
-                            <a id="aa">Two as.</a>
-                            <a id="ab">Mixed as and bs.</a>
-                            <a id="b">One b.</a>
-                            <a>No ID.</a>""")
-
-        self.assert_selects(tree.find_all(id=re.compile("^a+$")),
-                           ["One a.", "Two as."])
-
-    def test_find_by_name_and_containing_string(self):
-        soup = self.soup("<b>foo</b><b>bar</b><a>foo</a>")
-        a = soup.a
-
-        assert [a] == soup.find_all("a", string="foo")
-        assert [] == soup.find_all("a", string="bar")
-
-    def test_find_by_name_and_containing_string_when_string_is_buried(self):
-        soup = self.soup("<a>foo</a><a><b><c>foo</c></b></a>")
-        assert soup.find_all("a") == soup.find_all("a", string="foo")
-
-    def test_find_by_attribute_and_containing_string(self):
-        soup = self.soup('<b id="1">foo</b><a id="2">foo</a>')
-        a = soup.a
-
-        assert [a] == soup.find_all(id=2, string="foo")
-        assert [] == soup.find_all(id=1, string="bar")
-
-
-class TestSmooth(SoupTest):
-    """Test Tag.smooth."""
-
-    def test_smooth(self):
-        soup = self.soup("<div>a</div>")
-        div = soup.div
-        div.append("b")
-        div.append("c")
-        div.append(Comment("Comment 1"))
-        div.append(Comment("Comment 2"))
-        div.append("d")
-        builder = self.default_builder()
-        span = Tag(soup, builder, 'span')
-        span.append('1')
-        span.append('2')
-        div.append(span)
-
-        # At this point the tree has a bunch of adjacent
-        # NavigableStrings. This is normal, but it has no meaning in
-        # terms of HTML, so we may want to smooth things out for
-        # output.
-
-        # Since the <span> tag has two children, its .string is None.
-        assert None == div.span.string
-
-        assert 7 == len(div.contents)
-        div.smooth()
-        assert 5 == len(div.contents)
-
-        # The three strings at the beginning of div.contents have been
-        # merged into on string.
-        #
-        assert 'abc' == div.contents[0]
-
-        # The call is recursive -- the <span> tag was also smoothed.
-        assert '12' == div.span.string
-
-        # The two comments have _not_ been merged, even though
-        # comments are strings. Merging comments would change the
-        # meaning of the HTML.
-        assert 'Comment 1' == div.contents[1]
-        assert 'Comment 2' == div.contents[2]
-
-
-class TestIndex(SoupTest):
-    """Test Tag.index"""
-    def test_index(self):
-        tree = self.soup("""<div>
-                            <a>Identical</a>
-                            <b>Not identical</b>
-                            <a>Identical</a>
-
-                            <c><d>Identical with child</d></c>
-                            <b>Also not identical</b>
-                            <c><d>Identical with child</d></c>
-                            </div>""")
-        div = tree.div
-        for i, element in enumerate(div.contents):
-            assert i == div.index(element)
-        with pytest.raises(ValueError):
-            tree.index(1)
-
-
-class TestParentOperations(SoupTest):
-    """Test navigation and searching through an element's parents."""
-
-    def setup_method(self):
-        self.tree = self.soup('''<ul id="empty"></ul>
-                                 <ul id="top">
-                                  <ul id="middle">
-                                   <ul id="bottom">
-                                    <b>Start here</b>
-                                   </ul>
-                                  </ul>''')
-        self.start = self.tree.b
-
-
-    def test_parent(self):
-        assert self.start.parent['id'] == 'bottom'
-        assert self.start.parent.parent['id'] == 'middle'
-        assert self.start.parent.parent.parent['id'] == 'top'
-
-    def test_parent_of_top_tag_is_soup_object(self):
-        top_tag = self.tree.contents[0]
-        assert top_tag.parent == self.tree
-
-    def test_soup_object_has_no_parent(self):
-        assert None == self.tree.parent
-
-    def test_find_parents(self):
-        self.assert_selects_ids(
-            self.start.find_parents('ul'), ['bottom', 'middle', 'top'])
-        self.assert_selects_ids(
-            self.start.find_parents('ul', id="middle"), ['middle'])
-
-    def test_find_parent(self):
-        assert self.start.find_parent('ul')['id'] == 'bottom'
-        assert self.start.find_parent('ul', id='top')['id'] == 'top'
-
-    def test_parent_of_text_element(self):
-        text = self.tree.find(string="Start here")
-        assert text.parent.name == 'b'
-
-    def test_text_element_find_parent(self):
-        text = self.tree.find(string="Start here")
-        assert text.find_parent('ul')['id'] == 'bottom'
-
-    def test_parent_generator(self):
-        parents = [parent['id'] for parent in self.start.parents
-                   if parent is not None and 'id' in parent.attrs]
-        assert parents, ['bottom', 'middle' == 'top']
-
-
-class ProximityTest(SoupTest):
-
-    def setup_method(self):
-        self.tree = self.soup(
-            '<html id="start"><head></head><body><b id="1">One</b><b id="2">Two</b><b id="3">Three</b></body></html>')
-
-
-class TestNextOperations(ProximityTest):
-
-    def setup_method(self):
-        super(TestNextOperations, self).setup_method()
-        self.start = self.tree.b
-
-    def test_next(self):
-        assert self.start.next_element == "One"
-        assert self.start.next_element.next_element['id'] == "2"
-
-    def test_next_of_last_item_is_none(self):
-        last = self.tree.find(string="Three")
-        assert last.next_element == None
-
-    def test_next_of_root_is_none(self):
-        # The document root is outside the next/previous chain.
-        assert self.tree.next_element == None
-
-    def test_find_all_next(self):
-        self.assert_selects(self.start.find_all_next('b'), ["Two", "Three"])
-        self.start.find_all_next(id=3)
-        self.assert_selects(self.start.find_all_next(id=3), ["Three"])
-
-    def test_find_next(self):
-        assert self.start.find_next('b')['id'] == '2'
-        assert self.start.find_next(string="Three") == "Three"
-
-    def test_find_next_for_text_element(self):
-        text = self.tree.find(string="One")
-        assert text.find_next("b").string == "Two"
-        self.assert_selects(text.find_all_next("b"), ["Two", "Three"])
-
-    def test_next_generator(self):
-        start = self.tree.find(string="Two")
-        successors = [node for node in start.next_elements]
-        # There are two successors: the final <b> tag and its text contents.
-        tag, contents = successors
-        assert tag['id'] == '3'
-        assert contents == "Three"
-
-class TestPreviousOperations(ProximityTest):
-
-    def setup_method(self):
-        super(TestPreviousOperations, self).setup_method()
-        self.end = self.tree.find(string="Three")
-
-    def test_previous(self):
-        assert self.end.previous_element['id'] == "3"
-        assert self.end.previous_element.previous_element == "Two"
-
-    def test_previous_of_first_item_is_none(self):
-        first = self.tree.find('html')
-        assert first.previous_element == None
-
-    def test_previous_of_root_is_none(self):
-        # The document root is outside the next/previous chain.
-        assert self.tree.previous_element == None
-
-    def test_find_all_previous(self):
-        # The <b> tag containing the "Three" node is the predecessor
-        # of the "Three" node itself, which is why "Three" shows up
-        # here.
-        self.assert_selects(
-            self.end.find_all_previous('b'), ["Three", "Two", "One"])
-        self.assert_selects(self.end.find_all_previous(id=1), ["One"])
-
-    def test_find_previous(self):
-        assert self.end.find_previous('b')['id'] == '3'
-        assert self.end.find_previous(string="One") == "One"
-
-    def test_find_previous_for_text_element(self):
-        text = self.tree.find(string="Three")
-        assert text.find_previous("b").string == "Three"
-        self.assert_selects(
-            text.find_all_previous("b"), ["Three", "Two", "One"])
-
-    def test_previous_generator(self):
-        start = self.tree.find(string="One")
-        predecessors = [node for node in start.previous_elements]
-
-        # There are four predecessors: the <b> tag containing "One"
-        # the <body> tag, the <head> tag, and the <html> tag.
-        b, body, head, html = predecessors
-        assert b['id'] == '1'
-        assert body.name == "body"
-        assert head.name == "head"
-        assert html.name == "html"
-
-
-class SiblingTest(SoupTest):
-
-    def setup_method(self):
-        markup = '''<html>
-                    <span id="1">
-                     <span id="1.1"></span>
-                    </span>
-                    <span id="2">
-                     <span id="2.1"></span>
-                    </span>
-                    <span id="3">
-                     <span id="3.1"></span>
-                    </span>
-                    <span id="4"></span>
-                    </html>'''
-        # All that whitespace looks good but makes the tests more
-        # difficult. Get rid of it.
-        markup = re.compile(r"\n\s*").sub("", markup)
-        self.tree = self.soup(markup)
-
-
-class TestNextSibling(SiblingTest):
-
-    def setup_method(self):
-        super(TestNextSibling, self).setup_method()
-        self.start = self.tree.find(id="1")
-
-    def test_next_sibling_of_root_is_none(self):
-        assert self.tree.next_sibling == None
-
-    def test_next_sibling(self):
-        assert self.start.next_sibling['id'] == '2'
-        assert self.start.next_sibling.next_sibling['id'] == '3'
-
-        # Note the difference between next_sibling and next_element.
-        assert self.start.next_element['id'] == '1.1'
-
-    def test_next_sibling_may_not_exist(self):
-        assert self.tree.html.next_sibling == None
-
-        nested_span = self.tree.find(id="1.1")
-        assert nested_span.next_sibling == None
-
-        last_span = self.tree.find(id="4")
-        assert last_span.next_sibling == None
-
-    def test_find_next_sibling(self):
-        assert self.start.find_next_sibling('span')['id'] == '2'
-
-    def test_next_siblings(self):
-        self.assert_selects_ids(self.start.find_next_siblings("span"),
-                              ['2', '3', '4'])
-
-        self.assert_selects_ids(self.start.find_next_siblings(id='3'), ['3'])
-
-    def test_next_sibling_for_text_element(self):
-        soup = self.soup("Foo<b>bar</b>baz")
-        start = soup.find(string="Foo")
-        assert start.next_sibling.name == 'b'
-        assert start.next_sibling.next_sibling == 'baz'
-
-        self.assert_selects(start.find_next_siblings('b'), ['bar'])
-        assert start.find_next_sibling(string="baz") == "baz"
-        assert start.find_next_sibling(string="nonesuch") == None
-
-
-class TestPreviousSibling(SiblingTest):
-
-    def setup_method(self):
-        super(TestPreviousSibling, self).setup_method()
-        self.end = self.tree.find(id="4")
-
-    def test_previous_sibling_of_root_is_none(self):
-        assert self.tree.previous_sibling == None
-
-    def test_previous_sibling(self):
-        assert self.end.previous_sibling['id'] == '3'
-        assert self.end.previous_sibling.previous_sibling['id'] == '2'
-
-        # Note the difference between previous_sibling and previous_element.
-        assert self.end.previous_element['id'] == '3.1'
-
-    def test_previous_sibling_may_not_exist(self):
-        assert self.tree.html.previous_sibling == None
-
-        nested_span = self.tree.find(id="1.1")
-        assert nested_span.previous_sibling == None
-
-        first_span = self.tree.find(id="1")
-        assert first_span.previous_sibling == None
-
-    def test_find_previous_sibling(self):
-        assert self.end.find_previous_sibling('span')['id'] == '3'
-
-    def test_previous_siblings(self):
-        self.assert_selects_ids(self.end.find_previous_siblings("span"),
-                              ['3', '2', '1'])
-
-        self.assert_selects_ids(self.end.find_previous_siblings(id='1'), ['1'])
-
-    def test_previous_sibling_for_text_element(self):
-        soup = self.soup("Foo<b>bar</b>baz")
-        start = soup.find(string="baz")
-        assert start.previous_sibling.name == 'b'
-        assert start.previous_sibling.previous_sibling == 'Foo'
-
-        self.assert_selects(start.find_previous_siblings('b'), ['bar'])
-        assert start.find_previous_sibling(string="Foo") == "Foo"
-        assert start.find_previous_sibling(string="nonesuch") == None
-
-
-class TestTreeModification(SoupTest):
-
-    def test_attribute_modification(self):
-        soup = self.soup('<a id="1"></a>')
-        soup.a['id'] = 2
-        assert soup.decode() == self.document_for('<a id="2"></a>')
-        del(soup.a['id'])
-        assert soup.decode() == self.document_for('<a></a>')
-        soup.a['id2'] = 'foo'
-        assert soup.decode() == self.document_for('<a id2="foo"></a>')
-
-    def test_new_tag_creation(self):
-        builder = builder_registry.lookup('html')()
-        soup = self.soup("<body></body>", builder=builder)
-        a = Tag(soup, builder, 'a')
-        ol = Tag(soup, builder, 'ol')
-        a['href'] = 'http://foo.com/'
-        soup.body.insert(0, a)
-        soup.body.insert(1, ol)
-        assert soup.body.encode() == b'<body><a href="http://foo.com/"></a><ol></ol></body>'
-
-    def test_append_to_contents_moves_tag(self):
-        doc = """<p id="1">Don't leave me <b>here</b>.</p>
-                <p id="2">Don\'t leave!</p>"""
-        soup = self.soup(doc)
-        second_para = soup.find(id='2')
-        bold = soup.b
-
-        # Move the <b> tag to the end of the second paragraph.
-        soup.find(id='2').append(soup.b)
-
-        # The <b> tag is now a child of the second paragraph.
-        assert bold.parent == second_para
-
-        assert soup.decode() == self.document_for(
-                '<p id="1">Don\'t leave me .</p>\n'
-                '<p id="2">Don\'t leave!<b>here</b></p>'
-        )
-
-    def test_replace_with_returns_thing_that_was_replaced(self):
-        text = "<a></a><b><c></c></b>"
-        soup = self.soup(text)
-        a = soup.a
-        new_a = a.replace_with(soup.c)
-        assert a == new_a
-
-    def test_unwrap_returns_thing_that_was_replaced(self):
-        text = "<a><b></b><c></c></a>"
-        soup = self.soup(text)
-        a = soup.a
-        new_a = a.unwrap()
-        assert a == new_a
-
-    def test_replace_with_and_unwrap_give_useful_exception_when_tag_has_no_parent(self):
-        soup = self.soup("<a><b>Foo</b></a><c>Bar</c>")
-        a = soup.a
-        a.extract()
-        assert None == a.parent
-        with pytest.raises(ValueError):
-            a.unwrap()
-        with pytest.raises(ValueError):
-            a.replace_with(soup.c)
-
-    def test_replace_tag_with_itself(self):
-        text = "<a><b></b><c>Foo<d></d></c></a><a><e></e></a>"
-        soup = self.soup(text)
-        c = soup.c
-        soup.c.replace_with(c)
-        assert soup.decode() == self.document_for(text)
-
-    def test_replace_tag_with_its_parent_raises_exception(self):
-        text = "<a><b></b></a>"
-        soup = self.soup(text)
-        with pytest.raises(ValueError):
-            soup.b.replace_with(soup.a)
-
-    def test_insert_tag_into_itself_raises_exception(self):
-        text = "<a><b></b></a>"
-        soup = self.soup(text)
-        with pytest.raises(ValueError):
-            soup.a.insert(0, soup.a)
-
-    def test_insert_beautifulsoup_object_inserts_children(self):
-        """Inserting one BeautifulSoup object into another actually inserts all
-        of its children -- you'll never combine BeautifulSoup objects.
-        """
-        soup = self.soup("<p>And now, a word:</p><p>And we're back.</p>")
-        
-        text = "<p>p2</p><p>p3</p>"
-        to_insert = self.soup(text)
-        soup.insert(1, to_insert)
-
-        for i in soup.descendants:
-            assert not isinstance(i, BeautifulSoup)
-        
-        p1, p2, p3, p4 = list(soup.children)
-        assert "And now, a word:" == p1.string
-        assert "p2" == p2.string
-        assert "p3" == p3.string
-        assert "And we're back." == p4.string
-        
-        
-    def test_replace_with_maintains_next_element_throughout(self):
-        soup = self.soup('<p><a>one</a><b>three</b></p>')
-        a = soup.a
-        b = a.contents[0]
-        # Make it so the <a> tag has two text children.
-        a.insert(1, "two")
-
-        # Now replace each one with the empty string.
-        left, right = a.contents
-        left.replaceWith('')
-        right.replaceWith('')
-
-        # The <b> tag is still connected to the tree.
-        assert "three" == soup.b.string
-
-    def test_replace_final_node(self):
-        soup = self.soup("<b>Argh!</b>")
-        soup.find(string="Argh!").replace_with("Hooray!")
-        new_text = soup.find(string="Hooray!")
-        b = soup.b
-        assert new_text.previous_element == b
-        assert new_text.parent == b
-        assert new_text.previous_element.next_element == new_text
-        assert new_text.next_element == None
-
-    def test_consecutive_text_nodes(self):
-        # A builder should never create two consecutive text nodes,
-        # but if you insert one next to another, Beautiful Soup will
-        # handle it correctly.
-        soup = self.soup("<a><b>Argh!</b><c></c></a>")
-        soup.b.insert(1, "Hooray!")
-
-        assert soup.decode() == self.document_for(
-            "<a><b>Argh!Hooray!</b><c></c></a>"
-        )
-
-        new_text = soup.find(string="Hooray!")
-        assert new_text.previous_element == "Argh!"
-        assert new_text.previous_element.next_element == new_text
-
-        assert new_text.previous_sibling == "Argh!"
-        assert new_text.previous_sibling.next_sibling == new_text
-
-        assert new_text.next_sibling == None
-        assert new_text.next_element == soup.c
-
-    def test_insert_string(self):
-        soup = self.soup("<a></a>")
-        soup.a.insert(0, "bar")
-        soup.a.insert(0, "foo")
-        # The string were added to the tag.
-        assert ["foo", "bar"] == soup.a.contents
-        # And they were converted to NavigableStrings.
-        assert soup.a.contents[0].next_element == "bar"
-
-    def test_insert_tag(self):
-        builder = self.default_builder()
-        soup = self.soup(
-            "<a><b>Find</b><c>lady!</c><d></d></a>", builder=builder)
-        magic_tag = Tag(soup, builder, 'magictag')
-        magic_tag.insert(0, "the")
-        soup.a.insert(1, magic_tag)
-
-        assert soup.decode() == self.document_for(
-                "<a><b>Find</b><magictag>the</magictag><c>lady!</c><d></d></a>"
-        )
-
-        # Make sure all the relationships are hooked up correctly.
-        b_tag = soup.b
-        assert b_tag.next_sibling == magic_tag
-        assert magic_tag.previous_sibling == b_tag
-
-        find = b_tag.find(string="Find")
-        assert find.next_element == magic_tag
-        assert magic_tag.previous_element == find
-
-        c_tag = soup.c
-        assert magic_tag.next_sibling == c_tag
-        assert c_tag.previous_sibling == magic_tag
-
-        the = magic_tag.find(string="the")
-        assert the.parent == magic_tag
-        assert the.next_element == c_tag
-        assert c_tag.previous_element == the
-
-    def test_append_child_thats_already_at_the_end(self):
-        data = "<a><b></b></a>"
-        soup = self.soup(data)
-        soup.a.append(soup.b)
-        assert data == soup.decode()
-
-    def test_extend(self):
-        data = "<a><b><c><d><e><f><g></g></f></e></d></c></b></a>"
-        soup = self.soup(data)
-        l = [soup.g, soup.f, soup.e, soup.d, soup.c, soup.b]
-        soup.a.extend(l)
-        assert "<a><g></g><f></f><e></e><d></d><c></c><b></b></a>" == soup.decode()
-
-    @pytest.mark.parametrize(
-        "get_tags", [lambda tag: tag, lambda tag: tag.contents]
-    )
-    def test_extend_with_another_tags_contents(self, get_tags):
-        data = '<body><div id="d1"><a>1</a><a>2</a><a>3</a><a>4</a></div><div id="d2"></div></body>'
-        soup = self.soup(data)
-        d1 = soup.find('div', id='d1')
-        d2 = soup.find('div', id='d2')
-        tags = get_tags(d1)
-        d2.extend(tags)
-        assert '<div id="d1"></div>' == d1.decode()
-        assert '<div id="d2"><a>1</a><a>2</a><a>3</a><a>4</a></div>' == d2.decode()
-        
-    def test_move_tag_to_beginning_of_parent(self):
-        data = "<a><b></b><c></c><d></d></a>"
-        soup = self.soup(data)
-        soup.a.insert(0, soup.d)
-        assert "<a><d></d><b></b><c></c></a>" == soup.decode()
-
-    def test_insert_works_on_empty_element_tag(self):
-        # This is a little strange, since most HTML parsers don't allow
-        # markup like this to come through. But in general, we don't
-        # know what the parser would or wouldn't have allowed, so
-        # I'm letting this succeed for now.
-        soup = self.soup("<br/>")
-        soup.br.insert(1, "Contents")
-        assert str(soup.br) == "<br>Contents</br>"
-
-    def test_insert_before(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_before("BAZ")
-        soup.a.insert_before("QUUX")
-        assert soup.decode() == self.document_for(
-            "QUUX<a>foo</a>BAZ<b>bar</b>"
-        )
-
-        soup.a.insert_before(soup.b)
-        assert soup.decode() == self.document_for("QUUX<b>bar</b><a>foo</a>BAZ")
-
-        # Can't insert an element before itself.
-        b = soup.b
-        with pytest.raises(ValueError):
-            b.insert_before(b)
-
-        # Can't insert before if an element has no parent.
-        b.extract()
-        with pytest.raises(ValueError):
-            b.insert_before("nope")
-
-        # Can insert an identical element
-        soup = self.soup("<a>")
-        soup.a.insert_before(soup.new_tag("a"))
-
-        # TODO: OK but what happens?
-        
-    def test_insert_multiple_before(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_before("BAZ", " ", "QUUX")
-        soup.a.insert_before("QUUX", " ", "BAZ")
-        assert soup.decode() == self.document_for(
-            "QUUX BAZ<a>foo</a>BAZ QUUX<b>bar</b>"
-        )
-
-        soup.a.insert_before(soup.b, "FOO")
-        assert soup.decode() == self.document_for(
-            "QUUX BAZ<b>bar</b>FOO<a>foo</a>BAZ QUUX"
-        )
-
-    def test_insert_after(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_after("BAZ")
-        soup.a.insert_after("QUUX")
-        assert soup.decode() == self.document_for(
-            "<a>foo</a>QUUX<b>bar</b>BAZ"
-        )
-        soup.b.insert_after(soup.a)
-        assert soup.decode() == self.document_for("QUUX<b>bar</b><a>foo</a>BAZ")
-
-        # Can't insert an element after itself.
-        b = soup.b
-        with pytest.raises(ValueError):
-            b.insert_after(b)
-
-        # Can't insert after if an element has no parent.
-        b.extract()
-        with pytest.raises(ValueError):
-            b.insert_after("nope")
-
-        # Can insert an identical element
-        soup = self.soup("<a>")
-        soup.a.insert_before(soup.new_tag("a"))
-
-        # TODO: OK but what does it look like?
-        
-    def test_insert_multiple_after(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_after("BAZ", " ", "QUUX")
-        soup.a.insert_after("QUUX", " ", "BAZ")
-        assert soup.decode() == self.document_for(
-            "<a>foo</a>QUUX BAZ<b>bar</b>BAZ QUUX"
-        )
-        soup.b.insert_after(soup.a, "FOO ")
-        assert soup.decode() == self.document_for(
-            "QUUX BAZ<b>bar</b><a>foo</a>FOO BAZ QUUX"
-        )
-
-    def test_insert_after_raises_exception_if_after_has_no_meaning(self):
-        soup = self.soup("")
-        tag = soup.new_tag("a")
-        string = soup.new_string("")
-        with pytest.raises(ValueError):
-            string.insert_after(tag)
-        with pytest.raises(NotImplementedError):
-            soup.insert_after(tag)
-        with pytest.raises(ValueError):
-            tag.insert_after(tag)
-
-    def test_insert_before_raises_notimplementederror_if_before_has_no_meaning(self):
-        soup = self.soup("")
-        tag = soup.new_tag("a")
-        string = soup.new_string("")
-        with pytest.raises(ValueError):
-            string.insert_before(tag)
-        with pytest.raises(NotImplementedError):
-            soup.insert_before(tag)
-        with pytest.raises(ValueError):
-            tag.insert_before(tag)
-
-    def test_replace_with(self):
-        soup = self.soup(
-                "<p>There's <b>no</b> business like <b>show</b> business</p>")
-        no, show = soup.find_all('b')
-        show.replace_with(no)
-        assert soup.decode() == self.document_for(
-            "<p>There's  business like <b>no</b> business</p>"
-        )
-
-        assert show.parent == None
-        assert no.parent == soup.p
-        assert no.next_element == "no"
-        assert no.next_sibling == " business"
-
-    def test_replace_with_errors(self):
-        # Can't replace a tag that's not part of a tree.
-        a_tag = Tag(name="a")
-        with pytest.raises(ValueError):
-            a_tag.replace_with("won't work")
-
-        # Can't replace a tag with its parent.
-        a_tag = self.soup("<a><b></b></a>").a
-        with pytest.raises(ValueError):
-            a_tag.b.replace_with(a_tag)
-
-        # Or with a list that includes its parent.
-        with pytest.raises(ValueError):
-            a_tag.b.replace_with("string1", a_tag, "string2")
-        
-    def test_replace_with_multiple(self):
-        data = "<a><b></b><c></c></a>"
-        soup = self.soup(data)
-        d_tag = soup.new_tag("d")
-        d_tag.string = "Text In D Tag"
-        e_tag = soup.new_tag("e")
-        f_tag = soup.new_tag("f")
-        a_string = "Random Text"
-        soup.c.replace_with(d_tag, e_tag, a_string, f_tag)
-        assert soup.decode() == "<a><b></b><d>Text In D Tag</d><e></e>Random Text<f></f></a>"
-        assert soup.b.next_element == d_tag
-        assert d_tag.string.next_element==e_tag
-        assert e_tag.next_element.string == a_string
-        assert e_tag.next_element.next_element == f_tag
-        
-    def test_replace_first_child(self):
-        data = "<a><b></b><c></c></a>"
-        soup = self.soup(data)
-        soup.b.replace_with(soup.c)
-        assert "<a><c></c></a>" == soup.decode()
-
-    def test_replace_last_child(self):
-        data = "<a><b></b><c></c></a>"
-        soup = self.soup(data)
-        soup.c.replace_with(soup.b)
-        assert "<a><b></b></a>" == soup.decode()
-
-    def test_nested_tag_replace_with(self):
-        soup = self.soup(
-            """<a>We<b>reserve<c>the</c><d>right</d></b></a><e>to<f>refuse</f><g>service</g></e>""")
-
-        # Replace the entire <b> tag and its contents ("reserve the
-        # right") with the <f> tag ("refuse").
-        remove_tag = soup.b
-        move_tag = soup.f
-        remove_tag.replace_with(move_tag)
-
-        assert soup.decode() == self.document_for(
-            "<a>We<f>refuse</f></a><e>to<g>service</g></e>"
-        )
-
-        # The <b> tag is now an orphan.
-        assert remove_tag.parent == None
-        assert remove_tag.find(string="right").next_element == None
-        assert remove_tag.previous_element == None
-        assert remove_tag.next_sibling == None
-        assert remove_tag.previous_sibling == None
-
-        # The <f> tag is now connected to the <a> tag.
-        assert move_tag.parent == soup.a
-        assert move_tag.previous_element == "We"
-        assert move_tag.next_element.next_element == soup.e
-        assert move_tag.next_sibling == None
-
-        # The gap where the <f> tag used to be has been mended, and
-        # the word "to" is now connected to the <g> tag.
-        to_text = soup.find(string="to")
-        g_tag = soup.g
-        assert to_text.next_element == g_tag
-        assert to_text.next_sibling == g_tag
-        assert g_tag.previous_element == to_text
-        assert g_tag.previous_sibling == to_text
-
-    def test_unwrap(self):
-        tree = self.soup("""
-            <p>Unneeded <em>formatting</em> is unneeded</p>
-            """)
-        tree.em.unwrap()
-        assert tree.em == None
-        assert tree.p.text == "Unneeded formatting is unneeded"
-
-    def test_wrap(self):
-        soup = self.soup("I wish I was bold.")
-        value = soup.string.wrap(soup.new_tag("b"))
-        assert value.decode() == "<b>I wish I was bold.</b>"
-        assert soup.decode() == self.document_for("<b>I wish I was bold.</b>")
-
-    def test_wrap_extracts_tag_from_elsewhere(self):
-        soup = self.soup("<b></b>I wish I was bold.")
-        soup.b.next_sibling.wrap(soup.b)
-        assert soup.decode() == self.document_for("<b>I wish I was bold.</b>")
-
-    def test_wrap_puts_new_contents_at_the_end(self):
-        soup = self.soup("<b>I like being bold.</b>I wish I was bold.")
-        soup.b.next_sibling.wrap(soup.b)
-        assert 2 == len(soup.b.contents)
-        assert soup.decode() == self.document_for(
-            "<b>I like being bold.I wish I was bold.</b>"
-        )
-
-    def test_extract(self):
-        soup = self.soup(
-            '<html><body>Some content. <div id="nav">Nav crap</div> More content.</body></html>')
-
-        assert len(soup.body.contents) == 3
-        extracted = soup.find(id="nav").extract()
-
-        assert soup.decode() == "<html><body>Some content.  More content.</body></html>"
-        assert extracted.decode() == '<div id="nav">Nav crap</div>'
-
-        # The extracted tag is now an orphan.
-        assert len(soup.body.contents) == 2
-        assert extracted.parent == None
-        assert extracted.previous_element == None
-        assert extracted.next_element.next_element == None
-
-        # The gap where the extracted tag used to be has been mended.
-        content_1 = soup.find(string="Some content. ")
-        content_2 = soup.find(string=" More content.")
-        assert content_1.next_element == content_2
-        assert content_1.next_sibling == content_2
-        assert content_2.previous_element == content_1
-        assert content_2.previous_sibling == content_1
-
-    def test_extract_distinguishes_between_identical_strings(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        foo_1 = soup.a.string
-        bar_1 = soup.b.string
-        foo_2 = soup.new_string("foo")
-        bar_2 = soup.new_string("bar")
-        soup.a.append(foo_2)
-        soup.b.append(bar_2)
-
-        # Now there are two identical strings in the <a> tag, and two
-        # in the <b> tag. Let's remove the first "foo" and the second
-        # "bar".
-        foo_1.extract()
-        bar_2.extract()
-        assert foo_2 == soup.a.string
-        assert bar_2 == soup.b.string
-
-    def test_extract_multiples_of_same_tag(self):
-        soup = self.soup("""
-<html>
-<head>
-<script>foo</script>
-</head>
-<body>
- <script>bar</script>
- <a></a>
-</body>
-<script>baz</script>
-</html>""")
-        [soup.script.extract() for i in soup.find_all("script")]
-        assert "<body>\n\n<a></a>\n</body>" == str(soup.body)
-
-
-    def test_extract_works_when_element_is_surrounded_by_identical_strings(self):
-        soup = self.soup(
- '<html>\n'
- '<body>hi</body>\n'
- '</html>')
-        soup.find('body').extract()
-        assert None == soup.find('body')
-
-
-    def test_clear(self):
-        """Tag.clear()"""
-        soup = self.soup("<p><a>String <em>Italicized</em></a> and another</p>")
-        # clear using extract()
-        a = soup.a
-        soup.p.clear()
-        assert len(soup.p.contents) == 0
-        assert hasattr(a, "contents")
-
-        # clear using decompose()
-        em = a.em
-        a.clear(decompose=True)
-        assert 0 == len(em.contents)
-
-       
-    def test_decompose(self):
-        # Test PageElement.decompose() and PageElement.decomposed
-        soup = self.soup("<p><a>String <em>Italicized</em></a></p><p>Another para</p>")
-        p1, p2 = soup.find_all('p')
-        a = p1.a
-        text = p1.em.string
-        for i in [p1, p2, a, text]:
-            assert False == i.decomposed
-
-        # This sets p1 and everything beneath it to decomposed.
-        p1.decompose()
-        for i in [p1, a, text]:
-            assert True == i.decomposed
-        # p2 is unaffected.
-        assert False == p2.decomposed
-            
-    def test_string_set(self):
-        """Tag.string = 'string'"""
-        soup = self.soup("<a></a> <b><c></c></b>")
-        soup.a.string = "foo"
-        assert soup.a.contents == ["foo"]
-        soup.b.string = "bar"
-        assert soup.b.contents == ["bar"]
-
-    def test_string_set_does_not_affect_original_string(self):
-        soup = self.soup("<a><b>foo</b><c>bar</c>")
-        soup.b.string = soup.c.string
-        assert soup.a.encode() == b"<a><b>bar</b><c>bar</c></a>"
-
-    def test_set_string_preserves_class_of_string(self):
-        soup = self.soup("<a></a>")
-        cdata = CData("foo")
-        soup.a.string = cdata
-        assert isinstance(soup.a.string, CData)
-
-
-class TestDeprecatedArguments(SoupTest):
-
-    @pytest.mark.parametrize(
-        "method_name", [
-            "find", "find_all", "find_parent", "find_parents",
-            "find_next", "find_all_next", "find_previous",
-            "find_all_previous", "find_next_sibling", "find_next_siblings",
-            "find_previous_sibling", "find_previous_siblings",
-        ]
-    )
-    def test_find_type_method_string(self, method_name):
-        soup = self.soup("<a>some</a><b>markup</b>")
-        method = getattr(soup.b, method_name)
-        with warnings.catch_warnings(record=True) as w:
-            method(text='markup')
-            [warning] = w
-            assert warning.filename == __file__
-            msg = str(warning.message)
-            assert msg == "The 'text' argument to find()-type methods is deprecated. Use 'string' instead."
-
-    def test_soupstrainer_constructor_string(self):
-        with warnings.catch_warnings(record=True) as w:
-            strainer = SoupStrainer(text="text")
-            assert strainer.text == 'text'
-            [warning] = w
-            msg = str(warning.message)
-            assert warning.filename == __file__
-            assert msg == "The 'text' argument to the SoupStrainer constructor is deprecated. Use 'string' instead."
-
diff --git a/libs/certifi-2024.12.14.dist-info/METADATA b/libs/certifi-2024.12.14.dist-info/METADATA
deleted file mode 100644
index c4809863b7..0000000000
--- a/libs/certifi-2024.12.14.dist-info/METADATA
+++ /dev/null
@@ -1,68 +0,0 @@
-Metadata-Version: 2.1
-Name: certifi
-Version: 2024.12.14
-Summary: Python package for providing Mozilla's CA Bundle.
-Home-page: https://github.com/certifi/python-certifi
-Author: Kenneth Reitz
-Author-email: me@kennethreitz.com
-License: MPL-2.0
-Project-URL: Source, https://github.com/certifi/python-certifi
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.6
-License-File: LICENSE
-
-Certifi: Python SSL Certificates
-================================
-
-Certifi provides Mozilla's carefully curated collection of Root Certificates for
-validating the trustworthiness of SSL certificates while verifying the identity
-of TLS hosts. It has been extracted from the `Requests`_ project.
-
-Installation
-------------
-
-``certifi`` is available on PyPI. Simply install it with ``pip``::
-
-    $ pip install certifi
-
-Usage
------
-
-To reference the installed certificate authority (CA) bundle, you can use the
-built-in function::
-
-    >>> import certifi
-
-    >>> certifi.where()
-    '/usr/local/lib/python3.7/site-packages/certifi/cacert.pem'
-
-Or from the command line::
-
-    $ python -m certifi
-    /usr/local/lib/python3.7/site-packages/certifi/cacert.pem
-
-Enjoy!
-
-.. _`Requests`: https://requests.readthedocs.io/en/master/
-
-Addition/Removal of Certificates
---------------------------------
-
-Certifi does not support any addition/removal or other modification of the
-CA trust store content. This project is intended to provide a reliable and
-highly portable root of trust to python deployments. Look to upstream projects
-for methods to use alternate trust.
diff --git a/libs/certifi-2024.12.14.dist-info/RECORD b/libs/certifi-2024.12.14.dist-info/RECORD
deleted file mode 100644
index e783f377c8..0000000000
--- a/libs/certifi-2024.12.14.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-certifi-2024.12.14.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-certifi-2024.12.14.dist-info/LICENSE,sha256=6TcW2mucDVpKHfYP5pWzcPBpVgPSH2-D8FPkLPwQyvc,989
-certifi-2024.12.14.dist-info/METADATA,sha256=z71eRGTFszr4qsHenZ_vG2Fd5bV9PBWmJgShthc8IkY,2274
-certifi-2024.12.14.dist-info/RECORD,,
-certifi-2024.12.14.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-certifi-2024.12.14.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-certifi-2024.12.14.dist-info/top_level.txt,sha256=KMu4vUCfsjLrkPbSNdgdekS-pVJzBAJFO__nI8NF6-U,8
-certifi/__init__.py,sha256=LqjNcwt1sYSS3uhPXrf6jJzVCuHtNVpuirg5rb7mVm8,94
-certifi/__main__.py,sha256=xBBoj905TUWBLRGANOcf7oi6e-3dMP4cEoG9OyMs11g,243
-certifi/cacert.pem,sha256=gHiXJU84Oif0XkT0llbzeKurIUHt5DpK08JCCll90j8,294769
-certifi/core.py,sha256=qRDDFyXVJwTB_EmoGppaXU_R9qCZvhl-EzxPMuV3nTA,4426
-certifi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/certifi-2024.12.14.dist-info/WHEEL b/libs/certifi-2024.12.14.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/certifi-2024.12.14.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/Unidecode-1.3.8.dist-info/INSTALLER b/libs/certifi-2026.2.25.dist-info/INSTALLER
similarity index 100%
rename from libs/Unidecode-1.3.8.dist-info/INSTALLER
rename to libs/certifi-2026.2.25.dist-info/INSTALLER
diff --git a/libs/certifi-2026.2.25.dist-info/METADATA b/libs/certifi-2026.2.25.dist-info/METADATA
new file mode 100644
index 0000000000..73df8c84d4
--- /dev/null
+++ b/libs/certifi-2026.2.25.dist-info/METADATA
@@ -0,0 +1,78 @@
+Metadata-Version: 2.4
+Name: certifi
+Version: 2026.2.25
+Summary: Python package for providing Mozilla's CA Bundle.
+Home-page: https://github.com/certifi/python-certifi
+Author: Kenneth Reitz
+Author-email: me@kennethreitz.com
+License: MPL-2.0
+Project-URL: Source, https://github.com/certifi/python-certifi
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.7
+License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
+
+Certifi: Python SSL Certificates
+================================
+
+Certifi provides Mozilla's carefully curated collection of Root Certificates for
+validating the trustworthiness of SSL certificates while verifying the identity
+of TLS hosts. It has been extracted from the `Requests`_ project.
+
+Installation
+------------
+
+``certifi`` is available on PyPI. Simply install it with ``pip``::
+
+    $ pip install certifi
+
+Usage
+-----
+
+To reference the installed certificate authority (CA) bundle, you can use the
+built-in function::
+
+    >>> import certifi
+
+    >>> certifi.where()
+    '/usr/local/lib/python3.7/site-packages/certifi/cacert.pem'
+
+Or from the command line::
+
+    $ python -m certifi
+    /usr/local/lib/python3.7/site-packages/certifi/cacert.pem
+
+Enjoy!
+
+.. _`Requests`: https://requests.readthedocs.io/en/master/
+
+Addition/Removal of Certificates
+--------------------------------
+
+Certifi does not support any addition/removal or other modification of the
+CA trust store content. This project is intended to provide a reliable and
+highly portable root of trust to python deployments. Look to upstream projects
+for methods to use alternate trust.
diff --git a/libs/certifi-2026.2.25.dist-info/RECORD b/libs/certifi-2026.2.25.dist-info/RECORD
new file mode 100644
index 0000000000..7f1c4aa3d6
--- /dev/null
+++ b/libs/certifi-2026.2.25.dist-info/RECORD
@@ -0,0 +1,12 @@
+certifi-2026.2.25.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+certifi-2026.2.25.dist-info/METADATA,sha256=4NMuGXdg_hBiRA3paKVXYcDmE3VXEBWxTvCL2xlDyPU,2474
+certifi-2026.2.25.dist-info/RECORD,,
+certifi-2026.2.25.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+certifi-2026.2.25.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+certifi-2026.2.25.dist-info/licenses/LICENSE,sha256=6TcW2mucDVpKHfYP5pWzcPBpVgPSH2-D8FPkLPwQyvc,989
+certifi-2026.2.25.dist-info/top_level.txt,sha256=KMu4vUCfsjLrkPbSNdgdekS-pVJzBAJFO__nI8NF6-U,8
+certifi/__init__.py,sha256=c9eaYufv1pSLl0Q8QNcMiMLLH4WquDcxdPyKjmI4opY,94
+certifi/__main__.py,sha256=xBBoj905TUWBLRGANOcf7oi6e-3dMP4cEoG9OyMs11g,243
+certifi/cacert.pem,sha256=_JFloSQDJj5-v72te-ej6sD6XTJdPHBGXyjTaQByyig,272441
+certifi/core.py,sha256=XFXycndG5pf37ayeF8N32HUuDafsyhkVMbO4BAPWHa0,3394
+certifi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/Unidecode-1.3.8.dist-info/REQUESTED b/libs/certifi-2026.2.25.dist-info/REQUESTED
similarity index 100%
rename from libs/Unidecode-1.3.8.dist-info/REQUESTED
rename to libs/certifi-2026.2.25.dist-info/REQUESTED
diff --git a/libs/certifi-2026.2.25.dist-info/WHEEL b/libs/certifi-2026.2.25.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/certifi-2026.2.25.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/certifi-2024.12.14.dist-info/LICENSE b/libs/certifi-2026.2.25.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/certifi-2024.12.14.dist-info/LICENSE
rename to libs/certifi-2026.2.25.dist-info/licenses/LICENSE
diff --git a/libs/certifi-2024.12.14.dist-info/top_level.txt b/libs/certifi-2026.2.25.dist-info/top_level.txt
similarity index 100%
rename from libs/certifi-2024.12.14.dist-info/top_level.txt
rename to libs/certifi-2026.2.25.dist-info/top_level.txt
diff --git a/libs/certifi/__init__.py b/libs/certifi/__init__.py
index ee8686bec1..16c0c7c268 100644
--- a/libs/certifi/__init__.py
+++ b/libs/certifi/__init__.py
@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2024.12.14"
+__version__ = "2026.02.25"
diff --git a/libs/certifi/cacert.pem b/libs/certifi/cacert.pem
index f2d66010af..5ec1afe02d 100644
--- a/libs/certifi/cacert.pem
+++ b/libs/certifi/cacert.pem
@@ -1,163 +1,4 @@
 
-# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
-# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
-# Label: "GlobalSign Root CA"
-# Serial: 4835703278459707669005204
-# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
-# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
-# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Label: "Entrust.net Premium 2048 Secure Server CA"
-# Serial: 946069240
-# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
-# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
-# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
-RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
-bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
-IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
-MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
-LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
-YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
-A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
-K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
-sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
-MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
-XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
-HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
-4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
-j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
-U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
-u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
-bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
-fF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Label: "Baltimore CyberTrust Root"
-# Serial: 33554617
-# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
-# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
-# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Label: "Entrust Root Certification Authority"
-# Serial: 1164660820
-# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
-# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
-# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
-Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
-KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
-NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
-NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
-ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
-BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
-Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
-4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
-KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
-rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
-94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
-sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
-gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
-kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
-vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
-O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
-AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
-9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
-eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
-0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
-# Subject: CN=AAA Certificate Services O=Comodo CA Limited
-# Label: "Comodo AAA Services root"
-# Serial: 1
-# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
-# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
-# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
 # Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
 # Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
 # Label: "QuoVadis Root CA 2"
@@ -245,103 +86,6 @@ mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
 4SVhM7JZG+Ju1zdXtg2pEto=
 -----END CERTIFICATE-----
 
-# Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
-# Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
-# Label: "XRamp Global CA Root"
-# Serial: 107108908803651509692980124233745014957
-# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
-# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
-# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-O+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
-# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
-# Label: "Go Daddy Class 2 CA"
-# Serial: 0
-# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
-# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
-# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----
-
-# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
-# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
-# Label: "Starfield Class 2 CA"
-# Serial: 0
-# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
-# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
-# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
-MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
-U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
-NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
-ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
-ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
-DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
-8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
-+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
-X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
-K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
-1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
-A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
-zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
-YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
-bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
-L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
-eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
-VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
-WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
 # Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
 # Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
 # Label: "DigiCert Assured ID Root CA"
@@ -474,47 +218,6 @@ ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
 Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
 -----END CERTIFICATE-----
 
-# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
-# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
-# Label: "SwissSign Silver CA - G2"
-# Serial: 5700383053117599563
-# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
-# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
-# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
-IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
-RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
-U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
-Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
-YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
-nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
-6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
-eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
-c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
-MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
-HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
-jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
-5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
-rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
-wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
-AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
-WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
-xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
-2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
-IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
-aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
-em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
-dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
-OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
-hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
-tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
 # Issuer: CN=SecureTrust CA O=SecureTrust Corporation
 # Subject: CN=SecureTrust CA O=SecureTrust Corporation
 # Label: "SecureTrust CA"
@@ -960,122 +663,6 @@ iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
 sSi6
 -----END CERTIFICATE-----
 
-# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
-# Subject: CN=AffirmTrust Commercial O=AffirmTrust
-# Label: "AffirmTrust Commercial"
-# Serial: 8608355977964138876
-# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
-# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
-# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Networking O=AffirmTrust
-# Subject: CN=AffirmTrust Networking O=AffirmTrust
-# Label: "AffirmTrust Networking"
-# Serial: 8957382827206547757
-# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
-# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
-# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium O=AffirmTrust
-# Subject: CN=AffirmTrust Premium O=AffirmTrust
-# Label: "AffirmTrust Premium"
-# Serial: 7893706540734352110
-# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
-# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
-# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Label: "AffirmTrust Premium ECC"
-# Serial: 8401224907861490260
-# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
-# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
-# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
-
 # Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
 # Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
 # Label: "Certum Trusted Network CA"
@@ -2079,65 +1666,6 @@ GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
 8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
 -----END CERTIFICATE-----
 
-# Issuer: CN=Entrust Root Certification Authority - G2 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2009 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - G2 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2009 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - G2"
-# Serial: 1246989352
-# MD5 Fingerprint: 4b:e2:c9:91:96:65:0c:f4:0e:5a:93:92:a0:0a:fe:b2
-# SHA1 Fingerprint: 8c:f4:27:fd:79:0c:3a:d1:66:06:8d:e8:1e:57:ef:bb:93:22:72:d4
-# SHA256 Fingerprint: 43:df:57:74:b0:3e:7f:ef:5f:e4:0d:93:1a:7b:ed:f1:bb:2e:6b:42:73:8c:4e:6d:38:41:10:3d:3a:a7:f3:39
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
-cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
-IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
-dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
-NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
-dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
-dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
-aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
-RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
-cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
-wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
-U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
-jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
-BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
-jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
-1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
-nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
-VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority - EC1 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2012 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - EC1 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2012 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - EC1"
-# Serial: 51543124481930649114116133369
-# MD5 Fingerprint: b6:7e:1d:f0:58:c5:49:6c:24:3b:3d:ed:98:18:ed:bc
-# SHA1 Fingerprint: 20:d8:06:40:df:9b:25:f5:12:25:3a:11:ea:f7:59:8a:eb:14:b5:47
-# SHA256 Fingerprint: 02:ed:0e:b2:8c:14:da:45:16:5c:56:67:91:70:0d:64:51:d7:fb:56:f0:b2:ab:1d:3b:8e:b0:70:e5:6e:df:f5
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
-A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
-d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
-dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
-RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
-MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
-VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
-L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
-Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
-A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
-ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
-Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
-R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
-hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
 # Issuer: CN=CFCA EV ROOT O=China Financial Certification Authority
 # Subject: CN=CFCA EV ROOT O=China Financial Certification Authority
 # Label: "CFCA EV ROOT"
@@ -3412,46 +2940,6 @@ DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
 +RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
 
-# Issuer: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
-# Subject: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
-# Label: "GLOBALTRUST 2020"
-# Serial: 109160994242082918454945253
-# MD5 Fingerprint: 8a:c7:6f:cb:6d:e3:cc:a2:f1:7c:83:fa:0e:78:d7:e8
-# SHA1 Fingerprint: d0:67:c1:13:51:01:0c:aa:d0:c7:6a:65:37:31:16:26:4f:53:71:a2
-# SHA256 Fingerprint: 9a:29:6a:51:82:d1:d4:51:a2:e3:7f:43:9b:74:da:af:a2:67:52:33:29:f9:0f:9a:0d:20:07:c3:34:e2:3c:9a
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
-A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
-FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
-MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
-aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
-RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
-YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
-QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
-yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
-BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
-SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
-r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
-4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
-dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
-q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
-nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
-H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
-XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
-6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
-+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
-kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
-wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
-TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
-MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
-4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
-aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
-qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
 # Issuer: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
 # Subject: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
 # Label: "ANF Secure Server Root CA"
@@ -4514,128 +4002,6 @@ UKNbwMp1JvK/kF0LgoxgKJ/GcJpo5PECMFxYDlZ2z1jD1xCMuo6u47xkdUfFVZDj
 /bpV6wfEU6s3qe4hsiFbYI89MvHVI5TWWA==
 -----END CERTIFICATE-----
 
-# Issuer: CN=CommScope Public Trust ECC Root-01 O=CommScope
-# Subject: CN=CommScope Public Trust ECC Root-01 O=CommScope
-# Label: "CommScope Public Trust ECC Root-01"
-# Serial: 385011430473757362783587124273108818652468453534
-# MD5 Fingerprint: 3a:40:a7:fc:03:8c:9c:38:79:2f:3a:a2:6c:b6:0a:16
-# SHA1 Fingerprint: 07:86:c0:d8:dd:8e:c0:80:98:06:98:d0:58:7a:ef:de:a6:cc:a2:5d
-# SHA256 Fingerprint: 11:43:7c:da:7b:b4:5e:41:36:5f:45:b3:9a:38:98:6b:0d:e0:0d:ef:34:8e:0c:7b:b0:87:36:33:80:0b:c3:8b
------BEGIN CERTIFICATE-----
-MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw
-TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
-bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa
-Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
-cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C
-flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE
-hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq
-hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg
-2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS
-Um9poIyNStDuiw7LR47QjRE=
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust ECC Root-02 O=CommScope
-# Subject: CN=CommScope Public Trust ECC Root-02 O=CommScope
-# Label: "CommScope Public Trust ECC Root-02"
-# Serial: 234015080301808452132356021271193974922492992893
-# MD5 Fingerprint: 59:b0:44:d5:65:4d:b8:5c:55:19:92:02:b6:d1:94:b2
-# SHA1 Fingerprint: 3c:3f:ef:57:0f:fe:65:93:86:9e:a0:fe:b0:f6:ed:8e:d1:13:c7:e5
-# SHA256 Fingerprint: 2f:fb:7f:81:3b:bb:b3:c8:9a:b4:e8:16:2d:0f:16:d7:15:09:a8:30:cc:9d:73:c2:62:e5:14:08:75:d1:ad:4a
------BEGIN CERTIFICATE-----
-MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw
-TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
-bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa
-Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
-cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL
-j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU
-v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq
-hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n
-ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV
-mkzw5l4lIhVtwodZ0LKOag==
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust RSA Root-01 O=CommScope
-# Subject: CN=CommScope Public Trust RSA Root-01 O=CommScope
-# Label: "CommScope Public Trust RSA Root-01"
-# Serial: 354030733275608256394402989253558293562031411421
-# MD5 Fingerprint: 0e:b4:15:bc:87:63:5d:5d:02:73:d4:26:38:68:73:d8
-# SHA1 Fingerprint: 6d:0a:5f:f7:b4:23:06:b4:85:b3:b7:97:64:fc:ac:75:f5:33:f2:93
-# SHA256 Fingerprint: 02:bd:f9:6e:2a:45:dd:9b:f1:8f:c7:e1:db:df:21:a0:37:9b:a3:c9:c2:61:03:44:cf:d8:d6:06:fe:c1:ed:81
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL
-BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
-Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1
-NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
-U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
-MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk
-YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh
-suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al
-DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj
-WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl
-P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547
-KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p
-UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/
-kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO
-Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB
-Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U
-CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ
-KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6
-NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ
-nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+
-QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v
-trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a
-aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD
-j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4
-Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w
-lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn
-YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc
-icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust RSA Root-02 O=CommScope
-# Subject: CN=CommScope Public Trust RSA Root-02 O=CommScope
-# Label: "CommScope Public Trust RSA Root-02"
-# Serial: 480062499834624527752716769107743131258796508494
-# MD5 Fingerprint: e1:29:f9:62:7b:76:e2:96:6d:f3:d4:d7:0f:ae:1f:aa
-# SHA1 Fingerprint: ea:b0:e2:52:1b:89:93:4c:11:68:f2:d8:9a:ac:22:4c:a3:8a:57:ae
-# SHA256 Fingerprint: ff:e9:43:d7:93:42:4b:4f:7c:44:0c:1c:3d:64:8d:53:63:f3:4b:82:dc:87:aa:7a:9f:11:8f:c5:de:e1:01:f1
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL
-BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
-Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2
-NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
-U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
-MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE
-NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0
-kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C
-rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz
-hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2
-LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs
-n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku
-FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5
-kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3
-wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v
-wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs
-5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ
-KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB
-KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3
-+VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme
-APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq
-pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT
-6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF
-sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt
-PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d
-lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670
-v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O
-rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7
------END CERTIFICATE-----
-
 # Issuer: CN=Telekom Security TLS ECC Root 2020 O=Deutsche Telekom Security GmbH
 # Subject: CN=Telekom Security TLS ECC Root 2020 O=Deutsche Telekom Security GmbH
 # Label: "Telekom Security TLS ECC Root 2020"
@@ -4854,3 +4220,275 @@ Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT
 4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJSwdLZrWeqrqgHkHZAXQ6
 bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
 -----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST BR Root CA 2 2023 O=D-Trust GmbH
+# Subject: CN=D-TRUST BR Root CA 2 2023 O=D-Trust GmbH
+# Label: "D-TRUST BR Root CA 2 2023"
+# Serial: 153168538924886464690566649552453098598
+# MD5 Fingerprint: e1:09:ed:d3:60:d4:56:1b:47:1f:b7:0c:5f:1b:5f:85
+# SHA1 Fingerprint: 2d:b0:70:ee:71:94:af:69:68:17:db:79:ce:58:9f:a0:6b:96:f7:87
+# SHA256 Fingerprint: 05:52:e6:f8:3f:df:65:e8:fa:96:70:e6:66:df:28:a4:e2:13:40:b5:10:cb:e5:25:66:f9:7c:4f:b9:4b:2b:d1
+-----BEGIN CERTIFICATE-----
+MIIFqTCCA5GgAwIBAgIQczswBEhb2U14LnNLyaHcZjANBgkqhkiG9w0BAQ0FADBI
+MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE
+LVRSVVNUIEJSIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA4NTYzMVoXDTM4MDUw
+OTA4NTYzMFowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi
+MCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAK7/CVmRgApKaOYkP7in5Mg6CjoWzckjYaCTcfKr
+i3OPoGdlYNJUa2NRb0kz4HIHE304zQaSBylSa053bATTlfrdTIzZXcFhfUvnKLNE
+gXtRr90zsWh81k5M/itoucpmacTsXld/9w3HnDY25QdgrMBM6ghs7wZ8T1soegj8
+k12b9py0i4a6Ibn08OhZWiihNIQaJZG2tY/vsvmA+vk9PBFy2OMvhnbFeSzBqZCT
+Rphny4NqoFAjpzv2gTng7fC5v2Xx2Mt6++9zA84A9H3X4F07ZrjcjrqDy4d2A/wl
+2ecjbwb9Z/Pg/4S8R7+1FhhGaRTMBffb00msa8yr5LULQyReS2tNZ9/WtT5PeB+U
+cSTq3nD88ZP+npNa5JRal1QMNXtfbO4AHyTsA7oC9Xb0n9Sa7YUsOCIvx9gvdhFP
+/Wxc6PWOJ4d/GUohR5AdeY0cW/jPSoXk7bNbjb7EZChdQcRurDhaTyN0dKkSw/bS
+uREVMweR2Ds3OmMwBtHFIjYoYiMQ4EbMl6zWK11kJNXuHA7e+whadSr2Y23OC0K+
+0bpwHJwh5Q8xaRfX/Aq03u2AnMuStIv13lmiWAmlY0cL4UEyNEHZmrHZqLAbWt4N
+DfTisl01gLmB1IRpkQLLddCNxbU9CZEJjxShFHR5PtbJFR2kWVki3PaKRT08EtY+
+XTIvAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUZ5Dw1t61
+GNVGKX5cq/ieCLxklRAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG
+OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfYnJfcm9vdF9jYV8y
+XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA097N3U9swFrktpSHxQCF16+tI
+FoE9c+CeJyrrd6kTpGoKWloUMz1oH4Guaf2Mn2VsNELZLdB/eBaxOqwjMa1ef67n
+riv6uvw8l5VAk1/DLQOj7aRvU9f6QA4w9QAgLABMjDu0ox+2v5Eyq6+SmNMW5tTR
+VFxDWy6u71cqqLRvpO8NVhTaIasgdp4D/Ca4nj8+AybmTNudX0KEPUUDAxxZiMrc
+LmEkWqTqJwtzEr5SswrPMhfiHocaFpVIbVrg0M8JkiZmkdijYQ6qgYF/6FKC0ULn
+4B0Y+qSFNueG4A3rvNTJ1jxD8V1Jbn6Bm2m1iWKPiFLY1/4nwSPFyysCu7Ff/vtD
+hQNGvl3GyiEm/9cCnnRK3PgTFbGBVzbLZVzRHTF36SXDw7IyN9XxmAnkbWOACKsG
+koHU6XCPpz+y7YaMgmo1yEJagtFSGkUPFaUA8JR7ZSdXOUPPfH/mvTWze/EZTN46
+ls/pdu4D58JDUjxqgejBWoC9EV2Ta/vH5mQ/u2kc6d0li690yVRAysuTEwrt+2aS
+Ecr1wPrYg1UDfNPFIkZ1cGt5SAYqgpq/5usWDiJFAbzdNpQ0qTUmiteXue4Icr80
+knCDgKs4qllo3UCkGJCy89UDyibK79XH4I9TjvAA46jtn/mtd+ArY0+ew+43u3gJ
+hJ65bvspmZDogNOfJA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TrustAsia TLS ECC Root CA O=TrustAsia Technologies, Inc.
+# Subject: CN=TrustAsia TLS ECC Root CA O=TrustAsia Technologies, Inc.
+# Label: "TrustAsia TLS ECC Root CA"
+# Serial: 310892014698942880364840003424242768478804666567
+# MD5 Fingerprint: 09:48:04:77:d2:fc:65:93:71:66:b1:11:95:4f:06:8c
+# SHA1 Fingerprint: b5:ec:39:f3:a1:66:37:ae:c3:05:94:57:e2:be:11:be:b7:a1:7f:36
+# SHA256 Fingerprint: c0:07:6b:9e:f0:53:1f:b1:a6:56:d6:7c:4e:be:97:cd:5d:ba:a4:1e:f4:45:98:ac:c2:48:98:78:c9:2d:87:11
+-----BEGIN CERTIFICATE-----
+MIICMTCCAbegAwIBAgIUNnThTXxlE8msg1UloD5Sfi9QaMcwCgYIKoZIzj0EAwMw
+WDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMs
+IEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgRUNDIFJvb3QgQ0EwHhcNMjQw
+NTE1MDU0MTU2WhcNNDQwNTE1MDU0MTU1WjBYMQswCQYDVQQGEwJDTjElMCMGA1UE
+ChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAGA1UEAxMZVHJ1c3RB
+c2lhIFRMUyBFQ0MgUm9vdCBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABLh/pVs/
+AT598IhtrimY4ZtcU5nb9wj/1WrgjstEpvDBjL1P1M7UiFPoXlfXTr4sP/MSpwDp
+guMqWzJ8S5sUKZ74LYO1644xST0mYekdcouJtgq7nDM1D9rs3qlKH8kzsaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQULIVTu7FDzTLqnqOH/qKYqKaT6RAw
+DgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMFRH18MtYYZI9HlaVQ01
+L18N9mdsd0AaRuf4aFtOJx24mH1/k78ITcTaRTChD15KeAIxAKORh/IRM4PDwYqR
+OkwrULG9IpRdNYlzg8WbGf60oenUoWa2AaU2+dhoYSi3dOGiMQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TrustAsia TLS RSA Root CA O=TrustAsia Technologies, Inc.
+# Subject: CN=TrustAsia TLS RSA Root CA O=TrustAsia Technologies, Inc.
+# Label: "TrustAsia TLS RSA Root CA"
+# Serial: 160405846464868906657516898462547310235378010780
+# MD5 Fingerprint: 3b:9e:c3:86:0f:34:3c:6b:c5:46:c4:8e:1d:e7:19:12
+# SHA1 Fingerprint: a5:46:50:c5:62:ea:95:9a:1a:a7:04:6f:17:58:c7:29:53:3d:03:fa
+# SHA256 Fingerprint: 06:c0:8d:7d:af:d8:76:97:1e:b1:12:4f:e6:7f:84:7e:c0:c7:a1:58:d3:ea:53:cb:e9:40:e2:ea:97:91:f4:c3
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIUHBjYz+VTPyI1RlNUJDxsR9FcSpwwDQYJKoZIhvcNAQEM
+BQAwWDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgUlNBIFJvb3QgQ0EwHhcN
+MjQwNTE1MDU0MTU3WhcNNDQwNTE1MDU0MTU2WjBYMQswCQYDVQQGEwJDTjElMCMG
+A1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAGA1UEAxMZVHJ1
+c3RBc2lhIFRMUyBSU0EgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAMMWuBtqpERz5dZO9LnPWwvB0ZqB9WOwj0PBuwhaGnrhB3YmH49pVr7+
+NmDQDIPNlOrnxS1cLwUWAp4KqC/lYCZUlviYQB2srp10Zy9U+5RjmOMmSoPGlbYJ
+Q1DNDX3eRA5gEk9bNb2/mThtfWza4mhzH/kxpRkQcwUqwzIZheo0qt1CHjCNP561
+HmHVb70AcnKtEj+qpklz8oYVlQwQX1Fkzv93uMltrOXVmPGZLmzjyUT5tUMnCE32
+ft5EebuyjBza00tsLtbDeLdM1aTk2tyKjg7/D8OmYCYozza/+lcK7Fs/6TAWe8Tb
+xNRkoDD75f0dcZLdKY9BWN4ArTr9PXwaqLEX8E40eFgl1oUh63kd0Nyrz2I8sMeX
+i9bQn9P+PN7F4/w6g3CEIR0JwqH8uyghZVNgepBtljhb//HXeltt08lwSUq6HTrQ
+UNoyIBnkiz/r1RYmNzz7dZ6wB3C4FGB33PYPXFIKvF1tjVEK2sUYyJtt3LCDs3+j
+TnhMmCWr8n4uIF6CFabW2I+s5c0yhsj55NqJ4js+k8UTav/H9xj8Z7XvGCxUq0DT
+bE3txci3OE9kxJRMT6DNrqXGJyV1J23G2pyOsAWZ1SgRxSHUuPzHlqtKZFlhaxP8
+S8ySpg+kUb8OWJDZgoM5pl+z+m6Ss80zDoWo8SnTq1mt1tve1CuBAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLgHkXlcBvRG/XtZylomkadFK/hT
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAgEAIZtqBSBdGBanEqT3
+Rz/NyjuujsCCztxIJXgXbODgcMTWltnZ9r96nBO7U5WS/8+S4PPFJzVXqDuiGev4
+iqME3mmL5Dw8veWv0BIb5Ylrc5tvJQJLkIKvQMKtuppgJFqBTQUYo+IzeXoLH5Pt
+7DlK9RME7I10nYEKqG/odv6LTytpEoYKNDbdgptvT+Bz3Ul/KD7JO6NXBNiT2Twp
+2xIQaOHEibgGIOcberyxk2GaGUARtWqFVwHxtlotJnMnlvm5P1vQiJ3koP26TpUJ
+g3933FEFlJ0gcXax7PqJtZwuhfG5WyRasQmr2soaB82G39tp27RIGAAtvKLEiUUj
+pQ7hRGU+isFqMB3iYPg6qocJQrmBktwliJiJ8Xw18WLK7nn4GS/+X/jbh87qqA8M
+pugLoDzga5SYnH+tBuYc6kIQX+ImFTw3OffXvO645e8D7r0i+yiGNFjEWn9hongP
+XvPKnbwbPKfILfanIhHKA9jnZwqKDss1jjQ52MjqjZ9k4DewbNfFj8GQYSbbJIwe
+SsCI3zWQzj8C9GRh3sfIB5XeMhg6j6JCQCTl1jNdfK7vsU1P1FeQNWrcrgSXSYk0
+ly4wBOeY99sLAZDBHwo/+ML+TvrbmnNzFrwFuHnYWa8G5z9nODmxfKuU4CkUpijy
+323imttUQ/hHWKNddBWcwauwxzQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST EV Root CA 2 2023 O=D-Trust GmbH
+# Subject: CN=D-TRUST EV Root CA 2 2023 O=D-Trust GmbH
+# Label: "D-TRUST EV Root CA 2 2023"
+# Serial: 139766439402180512324132425437959641711
+# MD5 Fingerprint: 96:b4:78:09:f0:09:cb:77:eb:bb:1b:4d:6f:36:bc:b6
+# SHA1 Fingerprint: a5:5b:d8:47:6c:8f:19:f7:4c:f4:6d:6b:b6:c2:79:82:22:df:54:8b
+# SHA256 Fingerprint: 8e:82:21:b2:e7:d4:00:78:36:a1:67:2f:0d:cc:29:9c:33:bc:07:d3:16:f1:32:fa:1a:20:6d:58:71:50:f1:ce
+-----BEGIN CERTIFICATE-----
+MIIFqTCCA5GgAwIBAgIQaSYJfoBLTKCnjHhiU19abzANBgkqhkiG9w0BAQ0FADBI
+MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE
+LVRSVVNUIEVWIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA5MTAzM1oXDTM4MDUw
+OTA5MTAzMlowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi
+MCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBANiOo4mAC7JXUtypU0w3uX9jFxPvp1sjW2l1sJkK
+F8GLxNuo4MwxusLyzV3pt/gdr2rElYfXR8mV2IIEUD2BCP/kPbOx1sWy/YgJ25yE
+7CUXFId/MHibaljJtnMoPDT3mfd/06b4HEV8rSyMlD/YZxBTfiLNTiVR8CUkNRFe
+EMbsh2aJgWi6zCudR3Mfvc2RpHJqnKIbGKBv7FD0fUDCqDDPvXPIEysQEx6Lmqg6
+lHPTGGkKSv/BAQP/eX+1SH977ugpbzZMlWGG2Pmic4ruri+W7mjNPU0oQvlFKzIb
+RlUWaqZLKfm7lVa/Rh3sHZMdwGWyH6FDrlaeoLGPaxK3YG14C8qKXO0elg6DpkiV
+jTujIcSuWMYAsoS0I6SWhjW42J7YrDRJmGOVxcttSEfi8i4YHtAxq9107PncjLgc
+jmgjutDzUNzPZY9zOjLHfP7KgiJPvo5iR2blzYfi6NUPGJ/lBHJLRjwQ8kTCZFZx
+TnXonMkmdMV9WdEKWw9t/p51HBjGGjp82A0EzM23RWV6sY+4roRIPrN6TagD4uJ+
+ARZZaBhDM7DS3LAaQzXupdqpRlyuhoFBAUp0JuyfBr/CBTdkdXgpaP3F9ev+R/nk
+hbDhezGdpn9yo7nELC7MmVcOIQxFAZRl62UJxmMiCzNJkkg8/M3OsD6Onov4/knF
+NXJHAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqvyREBuH
+kV8Wub9PS5FeAByxMoAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG
+OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfZXZfcm9vdF9jYV8y
+XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQCTy6UfmRHsmg1fLBWTxj++EI14
+QvBukEdHjqOSMo1wj/Zbjb6JzkcBahsgIIlbyIIQbODnmaprxiqgYzWRaoUlrRc4
+pZt+UPJ26oUFKidBK7GB0aL2QHWpDsvxVUjY7NHss+jOFKE17MJeNRqrphYBBo7q
+3C+jisosketSjl8MmxfPy3MHGcRqwnNU73xDUmPBEcrCRbH0O1P1aa4846XerOhU
+t7KR/aypH/KH5BfGSah82ApB9PI+53c0BFLd6IHyTS9URZ0V4U/M5d40VxDJI3IX
+cI1QcB9WbMy5/zpaT2N6w25lBx2Eof+pDGOJbbJAiDnXH3dotfyc1dZnaVuodNv8
+ifYbMvekJKZ2t0dT741Jj6m2g1qllpBFYfXeA08mD6iL8AOWsKwV0HFaanuU5nCT
+2vFp4LJiTZ6P/4mdm13NRemUAiKN4DV/6PEEeXFsVIP4M7kFMhtYVRFP0OUnR3Hs
+7dpn1mKmS00PaaLJvOwiS5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNP
+gofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAst
+Nl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L+KIkBI3Y4WNeApI02phh
+XBxvWHZks/wCuPWdCg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign RSA TLS Root CA 2022 - 1 O=SwissSign AG
+# Subject: CN=SwissSign RSA TLS Root CA 2022 - 1 O=SwissSign AG
+# Label: "SwissSign RSA TLS Root CA 2022 - 1"
+# Serial: 388078645722908516278762308316089881486363258315
+# MD5 Fingerprint: 16:2e:e4:19:76:81:85:ba:8e:91:58:f1:15:ef:72:39
+# SHA1 Fingerprint: 81:34:0a:be:4c:cd:ce:cc:e7:7d:cc:8a:d4:57:e2:45:a0:77:5d:ce
+# SHA256 Fingerprint: 19:31:44:f4:31:e0:fd:db:74:07:17:d4:de:92:6a:57:11:33:88:4b:43:60:d3:0e:27:29:13:cb:e6:60:ce:41
+-----BEGIN CERTIFICATE-----
+MIIFkzCCA3ugAwIBAgIUQ/oMX04bgBhE79G0TzUfRPSA7cswDQYJKoZIhvcNAQEL
+BQAwUTELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzErMCkGA1UE
+AxMiU3dpc3NTaWduIFJTQSBUTFMgUm9vdCBDQSAyMDIyIC0gMTAeFw0yMjA2MDgx
+MTA4MjJaFw00NzA2MDgxMTA4MjJaMFExCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxT
+d2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3aXNzU2lnbiBSU0EgVExTIFJvb3QgQ0Eg
+MjAyMiAtIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLKmjiC8NX
+vDVjvHClO/OMPE5Xlm7DTjak9gLKHqquuN6orx122ro10JFwB9+zBvKK8i5VUXu7
+LCTLf5ImgKO0lPaCoaTo+nUdWfMHamFk4saMla+ju45vVs9xzF6BYQ1t8qsCLqSX
+5XH8irCRIFucdFJtrhUnWXjyCcplDn/L9Ovn3KlMd/YrFgSVrpxxpT8q2kFC5zyE
+EPThPYxr4iuRR1VPuFa+Rd4iUU1OKNlfGUEGjw5NBuBwQCMBauTLE5tzrE0USJIt
+/m2n+IdreXXhvhCxqohAWVTXz8TQm0SzOGlkjIHRI36qOTw7D59Ke4LKa2/KIj4x
+0LDQKhySio/YGZxH5D4MucLNvkEM+KRHBdvBFzA4OmnczcNpI/2aDwLOEGrOyvi5
+KaM2iYauC8BPY7kGWUleDsFpswrzd34unYyzJ5jSmY0lpx+Gs6ZUcDj8fV3oT4MM
+0ZPlEuRU2j7yrTrePjxF8CgPBrnh25d7mUWe3f6VWQQvdT/TromZhqwUtKiE+shd
+OxtYk8EXlFXIC+OCeYSf8wCENO7cMdWP8vpPlkwGqnj73mSiI80fPsWMvDdUDrta
+clXvyFu1cvh43zcgTFeRc5JzrBh3Q4IgaezprClG5QtO+DdziZaKHG29777YtvTK
+wP1H8K4LWCDFyB02rpeNUIMmJCn3nTsPBQIDAQABo2MwYTAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBRvjmKLk0Ow4UD2p8P98Q+4
+DxU4pTAdBgNVHQ4EFgQUb45ii5NDsOFA9qfD/fEPuA8VOKUwDQYJKoZIhvcNAQEL
+BQADggIBAKwsKUF9+lz1GpUYvyypiqkkVHX1uECry6gkUSsYP2OprphWKwVDIqO3
+10aewCoSPY6WlkDfDDOLazeROpW7OSltwAJsipQLBwJNGD77+3v1dj2b9l4wBlgz
+Hqp41eZUBDqyggmNzhYzWUUo8aWjlw5DI/0LIICQ/+Mmz7hkkeUFjxOgdg3XNwwQ
+iJb0Pr6VvfHDffCjw3lHC1ySFWPtUnWK50Zpy1FVCypM9fJkT6lc/2cyjlUtMoIc
+gC9qkfjLvH4YoiaoLqNTKIftV+Vlek4ASltOU8liNr3CjlvrzG4ngRhZi0Rjn9UM
+ZfQpZX+RLOV/fuiJz48gy20HQhFRJjKKLjpHE7iNvUcNCfAWpO2Whi4Z2L6MOuhF
+LhG6rlrnub+xzI/goP+4s9GFe3lmozm1O2bYQL7Pt2eLSMkZJVX8vY3PXtpOpvJp
+zv1/THfQwUY1mFwjmwJFQ5Ra3bxHrSL+ul4vkSkphnsh3m5kt8sNjzdbowhq6/Td
+Ao9QAwKxuDdollDruF/UKIqlIgyKhPBZLtU30WHlQnNYKoH3dtvi4k0NX/a3vgW0
+rk4N3hY9A4GzJl5LuEsAz/+MF7psYC0nhzck5npgL7XTgwSqT0N1osGDsieYK7EO
+gLrAhV5Cud+xYJHT6xh+cHiudoO+cVrQkOPKwRYlZ0rwtnu64ZzZ
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE Server Root ECC G1 O=OISTE Foundation
+# Subject: CN=OISTE Server Root ECC G1 O=OISTE Foundation
+# Label: "OISTE Server Root ECC G1"
+# Serial: 47819833811561661340092227008453318557
+# MD5 Fingerprint: 42:a7:d2:35:ae:02:92:db:19:76:08:de:2f:05:b4:d4
+# SHA1 Fingerprint: 3b:f6:8b:09:ae:2a:92:7b:ba:e3:8d:3f:11:95:d9:e6:44:0c:45:e2
+# SHA256 Fingerprint: ee:c9:97:c0:c3:0f:21:6f:7e:3b:8b:30:7d:2b:ae:42:41:2d:75:3f:c8:21:9d:af:d1:52:0b:25:72:85:0f:49
+-----BEGIN CERTIFICATE-----
+MIICNTCCAbqgAwIBAgIQI/nD1jWvjyhLH/BU6n6XnTAKBggqhkjOPQQDAzBLMQsw
+CQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwY
+T0lTVEUgU2VydmVyIFJvb3QgRUNDIEcxMB4XDTIzMDUzMTE0NDIyOFoXDTQ4MDUy
+NDE0NDIyN1owSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5kYXRp
+b24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IEVDQyBHMTB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABBcv+hK8rBjzCvRE1nZCnrPoH7d5qVi2+GXROiFPqOujvqQy
+cvO2Ackr/XeFblPdreqqLiWStukhEaivtUwL85Zgmjvn6hp4LrQ95SjeHIC6XG4N
+2xml4z+cKrhAS93mT6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQ3
+TYhlz/w9itWj8UnATgwQb0K0nDAdBgNVHQ4EFgQUN02IZc/8PYrVo/FJwE4MEG9C
+tJwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2kAMGYCMQCpKjAd0MKfkFFR
+QD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxgZzFDJe0CMQCSia7pXGKD
+YmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE Server Root RSA G1 O=OISTE Foundation
+# Subject: CN=OISTE Server Root RSA G1 O=OISTE Foundation
+# Label: "OISTE Server Root RSA G1"
+# Serial: 113845518112613905024960613408179309848
+# MD5 Fingerprint: 23:a7:9e:d4:70:b8:b9:14:57:41:8a:7e:44:59:e2:68
+# SHA1 Fingerprint: f7:00:34:25:94:88:68:31:e4:34:87:3f:70:fe:86:b3:86:9f:f0:6e
+# SHA256 Fingerprint: 9a:e3:62:32:a5:18:9f:fd:db:35:3d:fd:26:52:0c:01:53:95:d2:27:77:da:c5:9d:b5:7b:98:c0:89:a6:51:e6
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBL
+MQswCQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UE
+AwwYT0lTVEUgU2VydmVyIFJvb3QgUlNBIEcxMB4XDTIzMDUzMTE0MzcxNloXDTQ4
+MDUyNDE0MzcxNVowSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5k
+YXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IFJTQSBHMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKqu9KuCz/vlNwvn1ZatkOhLKdxVYOPM
+vLO8LZK55KN68YG0nnJyQ98/qwsmtO57Gmn7KNByXEptaZnwYx4M0rH/1ow00O7b
+rEi56rAUjtgHqSSY3ekJvqgiG1k50SeH3BzN+Puz6+mTeO0Pzjd8JnduodgsIUzk
+ik/HEzxux9UTl7Ko2yRpg1bTacuCErudG/L4NPKYKyqOBGf244ehHa1uzjZ0Dl4z
+O8vbUZeUapU8zhhabkvG/AePLhq5SvdkNCncpo1Q4Y2LS+VIG24ugBA/5J8bZT8R
+tOpXaZ+0AOuFJJkk9SGdl6r7NH8CaxWQrbueWhl/pIzY+m0o/DjH40ytas7ZTpOS
+jswMZ78LS5bOZmdTaMsXEY5Z96ycG7mOaES3GK/m5Q9l3JUJsJMStR8+lKXHiHUh
+sd4JJCpM4rzsTGdHwimIuQq6+cF0zowYJmXa92/GjHtoXAvuY8BeS/FOzJ8vD+Ho
+mnqT8eDI278n5mUpezbgMxVz8p1rhAhoKzYHKyfMeNhqhw5HdPSqoBNdZH702xSu
++zrkL8Fl47l6QGzwBrd7KJvX4V84c5Ss2XCTLdyEr0YconosP4EmQufU2MVshGYR
+i3drVByjtdgQ8K4p92cIiBdcuJd5z+orKu5YM+Vt6SmqZQENghPsJQtdLEByFSnT
+kCz3GkPVavBpAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU
+8snBDw1jALvsRQ5KH7WxszbNDo0wHQYDVR0OBBYEFPLJwQ8NYwC77EUOSh+1sbM2
+zQ6NMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEANGd5sjrG5T33
+I3K5Ce+SrScfoE4KsvXaFwyihdJ+klH9FWXXXGtkFu6KRcoMQzZENdl//nk6HOjG
+5D1rd9QhEOP28yBOqb6J8xycqd+8MDoX0TJD0KqKchxRKEzdNsjkLWd9kYccnbz8
+qyiWXmFcuCIzGEgWUOrKL+mlSdx/PKQZvDatkuK59EvV6wit53j+F8Bdh3foZ3dP
+AGav9LEDOr4SfEE15fSmG0eLy3n31r8Xbk5l8PjaV8GUgeV6Vg27Rn9vkf195hfk
+gSe7BYhW3SCl95gtkRlpMV+bMPKZrXJAlszYd2abtNUOshD+FKrDgHGdPY3ofRRs
+YWSGRqbXVMW215AWRqWFyp464+YTFrYVI8ypKVL9AMb2kI5Wj4kI3Zaq5tNqqYY1
+9tVFeEJKRvwDyF7YZvZFZSS0vod7VSCd9521Kvy5YhnLbDuv0204bKt7ph6N/Ome
+/msVuduCmsuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3
+J8tRd/iWkx7P8nd9H0aTolkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2
+wq1yVAb+axj5d9spLFKebXd7Yv0PTY6YMjAwcRLWJTXjn/hvnLXrahut6hDTlhZy
+BiElxky8j3C7DOReIoMt0r7+hVu05L0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=e-Szigno TLS Root CA 2023 O=Microsec Ltd.
+# Subject: CN=e-Szigno TLS Root CA 2023 O=Microsec Ltd.
+# Label: "e-Szigno TLS Root CA 2023"
+# Serial: 71934828665710877219916191754
+# MD5 Fingerprint: 6a:e9:99:74:a5:da:5e:f1:d9:2e:f2:c8:d1:86:8b:71
+# SHA1 Fingerprint: 6f:9a:d5:d5:df:e8:2c:eb:be:37:07:ee:4f:4f:52:58:29:41:d1:fe
+# SHA256 Fingerprint: b4:91:41:50:2d:00:66:3d:74:0f:2e:7e:c3:40:c5:28:00:96:26:66:12:1a:36:d0:9c:f7:dd:2b:90:38:4f:b4
+-----BEGIN CERTIFICATE-----
+MIICzzCCAjGgAwIBAgINAOhvGHvWOWuYSkmYCjAKBggqhkjOPQQDBDB1MQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MSIwIAYDVQQDDBllLVN6aWdubyBU
+TFMgUm9vdCBDQSAyMDIzMB4XDTIzMDcxNzE0MDAwMFoXDTM4MDcxNzE0MDAwMFow
+dTELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRYwFAYDVQQKDA1NaWNy
+b3NlYyBMdGQuMRcwFQYDVQRhDA5WQVRIVS0yMzU4NDQ5NzEiMCAGA1UEAwwZZS1T
+emlnbm8gVExTIFJvb3QgQ0EgMjAyMzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAE
+AGgP36J8PKp0iGEKjcJMpQEiFNT3YHdCnAo4YKGMZz6zY+n6kbCLS+Y53wLCMAFS
+AL/fjO1ZrTJlqwlZULUZwmgcAOAFX9pQJhzDrAQixTpN7+lXWDajwRlTEArRzT/v
+SzUaQ49CE0y5LBqcvjC2xN7cS53kpDzLLtmt3999Cd8ukv+ho2MwYTAPBgNVHRMB
+Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUWYQCYlpGePVd3I8K
+ECgj3NXW+0UwHwYDVR0jBBgwFoAUWYQCYlpGePVd3I8KECgj3NXW+0UwCgYIKoZI
+zj0EAwQDgYsAMIGHAkIBLdqu9S54tma4n7Zwf2Z0z+yOfP7AAXmazlIC58PRDHpt
+y7Ve7hekm9sEdu4pKeiv+62sUvTXK9Z3hBC9xdIoaDQCQTV2WnXzkoYI9bIeCvZl
+C9p2x1L/Cx6AcCIwwzPbGO2E14vs7dOoY4G1VnxHx1YwlGhza9IuqbnZLBwpvQy6
+uWWL
+-----END CERTIFICATE-----
diff --git a/libs/certifi/core.py b/libs/certifi/core.py
index 91f538bb1f..1c9661cc7c 100644
--- a/libs/certifi/core.py
+++ b/libs/certifi/core.py
@@ -46,7 +46,7 @@ def where() -> str:
     def contents() -> str:
         return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii")
 
-elif sys.version_info >= (3, 7):
+else:
 
     from importlib.resources import path as get_path, read_text
 
@@ -81,34 +81,3 @@ def where() -> str:
 
     def contents() -> str:
         return read_text("certifi", "cacert.pem", encoding="ascii")
-
-else:
-    import os
-    import types
-    from typing import Union
-
-    Package = Union[types.ModuleType, str]
-    Resource = Union[str, "os.PathLike"]
-
-    # This fallback will work for Python versions prior to 3.7 that lack the
-    # importlib.resources module but relies on the existing `where` function
-    # so won't address issues with environments like PyOxidizer that don't set
-    # __file__ on modules.
-    def read_text(
-        package: Package,
-        resource: Resource,
-        encoding: str = 'utf-8',
-        errors: str = 'strict'
-    ) -> str:
-        with open(where(), encoding=encoding) as data:
-            return data.read()
-
-    # If we don't have importlib.resources, then we will just do the old logic
-    # of assuming we're on the filesystem and munge the path directly.
-    def where() -> str:
-        f = os.path.dirname(__file__)
-
-        return os.path.join(f, "cacert.pem")
-
-    def contents() -> str:
-        return read_text("certifi", "cacert.pem", encoding="ascii")
diff --git a/libs/chardet-5.2.0.dist-info/METADATA b/libs/chardet-5.2.0.dist-info/METADATA
index 3ec4d797a2..7eab58f561 100644
--- a/libs/chardet-5.2.0.dist-info/METADATA
+++ b/libs/chardet-5.2.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: chardet
 Version: 5.2.0
 Summary: Universal encoding detector for Python 3
@@ -29,6 +29,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Text Processing :: Linguistic
 Requires-Python: >=3.7
 License-File: LICENSE
+Dynamic: license-file
 
 Chardet: The Universal Character Encoding Detector
 --------------------------------------------------
diff --git a/libs/chardet-5.2.0.dist-info/RECORD b/libs/chardet-5.2.0.dist-info/RECORD
index 34638cb2ec..cbb62c9d7d 100644
--- a/libs/chardet-5.2.0.dist-info/RECORD
+++ b/libs/chardet-5.2.0.dist-info/RECORD
@@ -1,11 +1,11 @@
-../../bin/chardetect,sha256=hNe1Qxrl8Vaa1el5gT0V8iHTckEMwUBcC3oA2IJOyNE,244
+../../bin/chardetect,sha256=7tQYuvRzQLHg-vSFo9s17ZYVJqV7G4MWmowGBsnMebc,197
 chardet-5.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-chardet-5.2.0.dist-info/LICENSE,sha256=3GJlINzVOiL3J68-5Cx3DlbJemT-OtsGN5nYqwMv5VE,26530
-chardet-5.2.0.dist-info/METADATA,sha256=PAr2NQ6hQWpjyFnwlI7MoxHt2S_6oRiUsucOKMNhzGw,3418
+chardet-5.2.0.dist-info/METADATA,sha256=rkaOE3KgHvl1lL9e4oH3auGS4m1oS0FqM-KHugXfNtw,3440
 chardet-5.2.0.dist-info/RECORD,,
 chardet-5.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-chardet-5.2.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+chardet-5.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 chardet-5.2.0.dist-info/entry_points.txt,sha256=_cdvYc4jyY68GYfsQAAthNMxO-yodcGkvNC1xOEsLmI,59
+chardet-5.2.0.dist-info/licenses/LICENSE,sha256=3GJlINzVOiL3J68-5Cx3DlbJemT-OtsGN5nYqwMv5VE,26530
 chardet-5.2.0.dist-info/top_level.txt,sha256=AowzBbZy4x8EirABDdJSLJZMkJ_53iIag8xfKR6D7kI,8
 chardet/__init__.py,sha256=57R-HSxj0PWmILMN0GFmUNqEMfrEVSamXyjD-W6_fbs,4797
 chardet/__main__.py,sha256=puNj2o_QfBRKElEkiVp1zEIL1gGYD2o-JuXLFlqHDC4,123
diff --git a/libs/chardet-5.2.0.dist-info/WHEEL b/libs/chardet-5.2.0.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/chardet-5.2.0.dist-info/WHEEL
+++ b/libs/chardet-5.2.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/chardet-5.2.0.dist-info/LICENSE b/libs/chardet-5.2.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/chardet-5.2.0.dist-info/LICENSE
rename to libs/chardet-5.2.0.dist-info/licenses/LICENSE
diff --git a/libs/charset_normalizer-3.4.1.dist-info/METADATA b/libs/charset_normalizer-3.4.1.dist-info/METADATA
deleted file mode 100644
index 634e1d662b..0000000000
--- a/libs/charset_normalizer-3.4.1.dist-info/METADATA
+++ /dev/null
@@ -1,721 +0,0 @@
-Metadata-Version: 2.1
-Name: charset-normalizer
-Version: 3.4.1
-Summary: The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.
-Author-email: "Ahmed R. TAHRI" <tahri.ahmed@proton.me>
-Maintainer-email: "Ahmed R. TAHRI" <tahri.ahmed@proton.me>
-License: MIT
-Project-URL: Changelog, https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md
-Project-URL: Documentation, https://charset-normalizer.readthedocs.io/
-Project-URL: Code, https://github.com/jawah/charset_normalizer
-Project-URL: Issue tracker, https://github.com/jawah/charset_normalizer/issues
-Keywords: encoding,charset,charset-detector,detector,normalization,unicode,chardet,detect
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Text Processing :: Linguistic
-Classifier: Topic :: Utilities
-Classifier: Typing :: Typed
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Provides-Extra: unicode_backport
-
-<h1 align="center">Charset Detection, for Everyone ๐Ÿ‘‹</h1>
-
-<p align="center">
-  <sup>The Real First Universal Charset Detector</sup><br>
-  <a href="https://pypi.org/project/charset-normalizer">
-    <img src="https://img.shields.io/pypi/pyversions/charset_normalizer.svg?orange=blue" />
-  </a>
-  <a href="https://pepy.tech/project/charset-normalizer/">
-    <img alt="Download Count Total" src="https://static.pepy.tech/badge/charset-normalizer/month" />
-  </a>
-  <a href="https://bestpractices.coreinfrastructure.org/projects/7297">
-    <img src="https://bestpractices.coreinfrastructure.org/projects/7297/badge">
-  </a>
-</p>
-<p align="center">
-  <sup><i>Featured Packages</i></sup><br>
-  <a href="https://github.com/jawah/niquests">
-   <img alt="Static Badge" src="https://img.shields.io/badge/Niquests-Best_HTTP_Client-cyan">
-  </a>
-  <a href="https://github.com/jawah/wassima">
-   <img alt="Static Badge" src="https://img.shields.io/badge/Wassima-Certifi_Killer-cyan">
-  </a>
-</p>
-<p align="center">
-  <sup><i>In other language (unofficial port - by the community)</i></sup><br>
-  <a href="https://github.com/nickspring/charset-normalizer-rs">
-   <img alt="Static Badge" src="https://img.shields.io/badge/Rust-red">
-  </a>
-</p>
-
-> A library that helps you read text from an unknown charset encoding.<br /> Motivated by `chardet`,
-> I'm trying to resolve the issue by taking a new approach.
-> All IANA character set names for which the Python core library provides codecs are supported.
-
-<p align="center">
-  >>>>> <a href="https://charsetnormalizerweb.ousret.now.sh" target="_blank">๐Ÿ‘‰ Try Me Online Now, Then Adopt Me ๐Ÿ‘ˆ </a> <<<<<
-</p>
-
-This project offers you an alternative to **Universal Charset Encoding Detector**, also known as **Chardet**.
-
-| Feature                                          | [Chardet](https://github.com/chardet/chardet) |                                         Charset Normalizer                                         | [cChardet](https://github.com/PyYoshi/cChardet) |
-|--------------------------------------------------|:---------------------------------------------:|:--------------------------------------------------------------------------------------------------:|:-----------------------------------------------:|
-| `Fast`                                           |                       โŒ                       |                                                 โœ…                                                  |                        โœ…                        |
-| `Universal**`                                    |                       โŒ                       |                                                 โœ…                                                  |                        โŒ                        |
-| `Reliable` **without** distinguishable standards |                       โŒ                       |                                                 โœ…                                                  |                        โœ…                        |
-| `Reliable` **with** distinguishable standards    |                       โœ…                       |                                                 โœ…                                                  |                        โœ…                        |
-| `License`                                        |           LGPL-2.1<br>_restrictive_           |                                                MIT                                                 |            MPL-1.1<br>_restrictive_             |
-| `Native Python`                                  |                       โœ…                       |                                                 โœ…                                                  |                        โŒ                        |
-| `Detect spoken language`                         |                       โŒ                       |                                                 โœ…                                                  |                       N/A                       |
-| `UnicodeDecodeError Safety`                      |                       โŒ                       |                                                 โœ…                                                  |                        โŒ                        |
-| `Whl Size (min)`                                 |                   193.6 kB                    |                                               42 kB                                                |                     ~200 kB                     |
-| `Supported Encoding`                             |                      33                       | ๐ŸŽ‰ [99](https://charset-normalizer.readthedocs.io/en/latest/user/support.html#supported-encodings) |                       40                        |
-
-<p align="center">
-<img src="https://i.imgflip.com/373iay.gif" alt="Reading Normalized Text" width="226"/><img src="https://media.tenor.com/images/c0180f70732a18b4965448d33adba3d0/tenor.gif" alt="Cat Reading Text" width="200"/>
-</p>
-
-*\*\* : They are clearly using specific code for a specific encoding even if covering most of used one*<br>
-
-## โšก Performance
-
-This package offer better performance than its counterpart Chardet. Here are some numbers.
-
-| Package                                       | Accuracy | Mean per file (ms) | File per sec (est) |
-|-----------------------------------------------|:--------:|:------------------:|:------------------:|
-| [chardet](https://github.com/chardet/chardet) |   86 %   |       63 ms        |    16 file/sec     |
-| charset-normalizer                            | **98 %** |     **10 ms**      |    100 file/sec    |
-
-| Package                                       | 99th percentile | 95th percentile | 50th percentile |
-|-----------------------------------------------|:---------------:|:---------------:|:---------------:|
-| [chardet](https://github.com/chardet/chardet) |     265 ms      |      71 ms      |      7 ms       |
-| charset-normalizer                            |     100 ms      |      50 ms      |      5 ms       |
-
-_updated as of december 2024 using CPython 3.12_
-
-Chardet's performance on larger file (1MB+) are very poor. Expect huge difference on large payload.
-
-> Stats are generated using 400+ files using default parameters. More details on used files, see GHA workflows.
-> And yes, these results might change at any time. The dataset can be updated to include more files.
-> The actual delays heavily depends on your CPU capabilities. The factors should remain the same.
-> Keep in mind that the stats are generous and that Chardet accuracy vs our is measured using Chardet initial capability
-> (e.g. Supported Encoding) Challenge-them if you want.
-
-## โœจ Installation
-
-Using pip:
-
-```sh
-pip install charset-normalizer -U
-```
-
-## ๐Ÿš€ Basic Usage
-
-### CLI
-This package comes with a CLI.
-
-```
-usage: normalizer [-h] [-v] [-a] [-n] [-m] [-r] [-f] [-t THRESHOLD]
-                  file [file ...]
-
-The Real First Universal Charset Detector. Discover originating encoding used
-on text file. Normalize text to unicode.
-
-positional arguments:
-  files                 File(s) to be analysed
-
-optional arguments:
-  -h, --help            show this help message and exit
-  -v, --verbose         Display complementary information about file if any.
-                        Stdout will contain logs about the detection process.
-  -a, --with-alternative
-                        Output complementary possibilities if any. Top-level
-                        JSON WILL be a list.
-  -n, --normalize       Permit to normalize input file. If not set, program
-                        does not write anything.
-  -m, --minimal         Only output the charset detected to STDOUT. Disabling
-                        JSON output.
-  -r, --replace         Replace file when trying to normalize it instead of
-                        creating a new one.
-  -f, --force           Replace file without asking if you are sure, use this
-                        flag with caution.
-  -t THRESHOLD, --threshold THRESHOLD
-                        Define a custom maximum amount of chaos allowed in
-                        decoded content. 0. <= chaos <= 1.
-  --version             Show version information and exit.
-```
-
-```bash
-normalizer ./data/sample.1.fr.srt
-```
-
-or
-
-```bash
-python -m charset_normalizer ./data/sample.1.fr.srt
-```
-
-๐ŸŽ‰ Since version 1.4.0 the CLI produce easily usable stdout result in JSON format.
-
-```json
-{
-    "path": "/home/default/projects/charset_normalizer/data/sample.1.fr.srt",
-    "encoding": "cp1252",
-    "encoding_aliases": [
-        "1252",
-        "windows_1252"
-    ],
-    "alternative_encodings": [
-        "cp1254",
-        "cp1256",
-        "cp1258",
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-        "mbcs"
-    ],
-    "language": "French",
-    "alphabets": [
-        "Basic Latin",
-        "Latin-1 Supplement"
-    ],
-    "has_sig_or_bom": false,
-    "chaos": 0.149,
-    "coherence": 97.152,
-    "unicode_path": null,
-    "is_preferred": true
-}
-```
-
-### Python
-*Just print out normalized text*
-```python
-from charset_normalizer import from_path
-
-results = from_path('./my_subtitle.srt')
-
-print(str(results.best()))
-```
-
-*Upgrade your code without effort*
-```python
-from charset_normalizer import detect
-```
-
-The above code will behave the same as **chardet**. We ensure that we offer the best (reasonable) BC result possible.
-
-See the docs for advanced usage : [readthedocs.io](https://charset-normalizer.readthedocs.io/en/latest/)
-
-## ๐Ÿ˜‡ Why
-
-When I started using Chardet, I noticed that it was not suited to my expectations, and I wanted to propose a
-reliable alternative using a completely different method. Also! I never back down on a good challenge!
-
-I **don't care** about the **originating charset** encoding, because **two different tables** can
-produce **two identical rendered string.**
-What I want is to get readable text, the best I can.
-
-In a way, **I'm brute forcing text decoding.** How cool is that ? ๐Ÿ˜Ž
-
-Don't confuse package **ftfy** with charset-normalizer or chardet. ftfy goal is to repair Unicode string whereas charset-normalizer to convert raw file in unknown encoding to unicode.
-
-## ๐Ÿฐ How
-
-  - Discard all charset encoding table that could not fit the binary content.
-  - Measure noise, or the mess once opened (by chunks) with a corresponding charset encoding.
-  - Extract matches with the lowest mess detected.
-  - Additionally, we measure coherence / probe for a language.
-
-**Wait a minute**, what is noise/mess and coherence according to **YOU ?**
-
-*Noise :* I opened hundred of text files, **written by humans**, with the wrong encoding table. **I observed**, then
-**I established** some ground rules about **what is obvious** when **it seems like** a mess (aka. defining noise in rendered text).
- I know that my interpretation of what is noise is probably incomplete, feel free to contribute in order to
- improve or rewrite it.
-
-*Coherence :* For each language there is on earth, we have computed ranked letter appearance occurrences (the best we can). So I thought
-that intel is worth something here. So I use those records against decoded text to check if I can detect intelligent design.
-
-## โšก Known limitations
-
-  - Language detection is unreliable when text contains two or more languages sharing identical letters. (eg. HTML (english tags) + Turkish content (Sharing Latin characters))
-  - Every charset detector heavily depends on sufficient content. In common cases, do not bother run detection on very tiny content.
-
-## โš ๏ธ About Python EOLs
-
-**If you are running:**
-
-- Python >=2.7,<3.5: Unsupported
-- Python 3.5: charset-normalizer < 2.1
-- Python 3.6: charset-normalizer < 3.1
-- Python 3.7: charset-normalizer < 4.0
-
-Upgrade your Python interpreter as soon as possible.
-
-## ๐Ÿ‘ค Contributing
-
-Contributions, issues and feature requests are very much welcome.<br />
-Feel free to check [issues page](https://github.com/ousret/charset_normalizer/issues) if you want to contribute.
-
-## ๐Ÿ“ License
-
-Copyright ยฉ [Ahmed TAHRI @Ousret](https://github.com/Ousret).<br />
-This project is [MIT](https://github.com/Ousret/charset_normalizer/blob/master/LICENSE) licensed.
-
-Characters frequencies used in this project ยฉ 2012 [Denny Vrandeฤiฤ‡](http://simia.net/letters/)
-
-## ๐Ÿ’ผ For Enterprise
-
-Professional support for charset-normalizer is available as part of the [Tidelift
-Subscription][1]. Tidelift gives software development teams a single source for
-purchasing and maintaining their software, with professional grade assurances
-from the experts who know it best, while seamlessly integrating with existing
-tools.
-
-[1]: https://tidelift.com/subscription/pkg/pypi-charset-normalizer?utm_source=pypi-charset-normalizer&utm_medium=readme
-
-[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7297/badge)](https://www.bestpractices.dev/projects/7297)
-
-# Changelog
-All notable changes to charset-normalizer will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
-## [3.4.1](https://github.com/Ousret/charset_normalizer/compare/3.4.0...3.4.1) (2024-12-24)
-
-### Changed
-- Project metadata are now stored using `pyproject.toml` instead of `setup.cfg` using setuptools as the build backend.
-- Enforce annotation delayed loading for a simpler and consistent types in the project.
-- Optional mypyc compilation upgraded to version 1.14 for Python >= 3.8
-
-### Added
-- pre-commit configuration.
-- noxfile.
-
-### Removed
-- `build-requirements.txt` as per using `pyproject.toml` native build configuration.
-- `bin/integration.py` and `bin/serve.py` in favor of downstream integration test (see noxfile).
-- `setup.cfg` in favor of `pyproject.toml` metadata configuration.
-- Unused `utils.range_scan` function.
-
-### Fixed
-- Converting content to Unicode bytes may insert `utf_8` instead of preferred `utf-8`. (#572)
-- Deprecation warning "'count' is passed as positional argument" when converting to Unicode bytes on Python 3.13+
-
-## [3.4.0](https://github.com/Ousret/charset_normalizer/compare/3.3.2...3.4.0) (2024-10-08)
-
-### Added
-- Argument `--no-preemptive` in the CLI to prevent the detector to search for hints.
-- Support for Python 3.13 (#512)
-
-### Fixed
-- Relax the TypeError exception thrown when trying to compare a CharsetMatch with anything else than a CharsetMatch.
-- Improved the general reliability of the detector based on user feedbacks. (#520) (#509) (#498) (#407) (#537)
-- Declared charset in content (preemptive detection) not changed when converting to utf-8 bytes. (#381)
-
-## [3.3.2](https://github.com/Ousret/charset_normalizer/compare/3.3.1...3.3.2) (2023-10-31)
-
-### Fixed
-- Unintentional memory usage regression when using large payload that match several encoding (#376)
-- Regression on some detection case showcased in the documentation (#371)
-
-### Added
-- Noise (md) probe that identify malformed arabic representation due to the presence of letters in isolated form (credit to my wife)
-
-## [3.3.1](https://github.com/Ousret/charset_normalizer/compare/3.3.0...3.3.1) (2023-10-22)
-
-### Changed
-- Optional mypyc compilation upgraded to version 1.6.1 for Python >= 3.8
-- Improved the general detection reliability based on reports from the community
-
-## [3.3.0](https://github.com/Ousret/charset_normalizer/compare/3.2.0...3.3.0) (2023-09-30)
-
-### Added
-- Allow to execute the CLI (e.g. normalizer) through `python -m charset_normalizer.cli` or `python -m charset_normalizer`
-- Support for 9 forgotten encoding that are supported by Python but unlisted in `encoding.aliases` as they have no alias (#323)
-
-### Removed
-- (internal) Redundant utils.is_ascii function and unused function is_private_use_only
-- (internal) charset_normalizer.assets is moved inside charset_normalizer.constant
-
-### Changed
-- (internal) Unicode code blocks in constants are updated using the latest v15.0.0 definition to improve detection
-- Optional mypyc compilation upgraded to version 1.5.1 for Python >= 3.8
-
-### Fixed
-- Unable to properly sort CharsetMatch when both chaos/noise and coherence were close due to an unreachable condition in \_\_lt\_\_ (#350)
-
-## [3.2.0](https://github.com/Ousret/charset_normalizer/compare/3.1.0...3.2.0) (2023-06-07)
-
-### Changed
-- Typehint for function `from_path` no longer enforce `PathLike` as its first argument
-- Minor improvement over the global detection reliability
-
-### Added
-- Introduce function `is_binary` that relies on main capabilities, and optimized to detect binaries
-- Propagate `enable_fallback` argument throughout `from_bytes`, `from_path`, and `from_fp` that allow a deeper control over the detection (default True)
-- Explicit support for Python 3.12
-
-### Fixed
-- Edge case detection failure where a file would contain 'very-long' camel cased word (Issue #289)
-
-## [3.1.0](https://github.com/Ousret/charset_normalizer/compare/3.0.1...3.1.0) (2023-03-06)
-
-### Added
-- Argument `should_rename_legacy` for legacy function `detect` and disregard any new arguments without errors (PR #262)
-
-### Removed
-- Support for Python 3.6 (PR #260)
-
-### Changed
-- Optional speedup provided by mypy/c 1.0.1
-
-## [3.0.1](https://github.com/Ousret/charset_normalizer/compare/3.0.0...3.0.1) (2022-11-18)
-
-### Fixed
-- Multi-bytes cutter/chunk generator did not always cut correctly (PR #233)
-
-### Changed
-- Speedup provided by mypy/c 0.990 on Python >= 3.7
-
-## [3.0.0](https://github.com/Ousret/charset_normalizer/compare/2.1.1...3.0.0) (2022-10-20)
-
-### Added
-- Extend the capability of explain=True when cp_isolation contains at most two entries (min one), will log in details of the Mess-detector results
-- Support for alternative language frequency set in charset_normalizer.assets.FREQUENCIES
-- Add parameter `language_threshold` in `from_bytes`, `from_path` and `from_fp` to adjust the minimum expected coherence ratio
-- `normalizer --version` now specify if current version provide extra speedup (meaning mypyc compilation whl)
-
-### Changed
-- Build with static metadata using 'build' frontend
-- Make the language detection stricter
-- Optional: Module `md.py` can be compiled using Mypyc to provide an extra speedup up to 4x faster than v2.1
-
-### Fixed
-- CLI with opt --normalize fail when using full path for files
-- TooManyAccentuatedPlugin induce false positive on the mess detection when too few alpha character have been fed to it
-- Sphinx warnings when generating the documentation
-
-### Removed
-- Coherence detector no longer return 'Simple English' instead return 'English'
-- Coherence detector no longer return 'Classical Chinese' instead return 'Chinese'
-- Breaking: Method `first()` and `best()` from CharsetMatch
-- UTF-7 will no longer appear as "detected" without a recognized SIG/mark (is unreliable/conflict with ASCII)
-- Breaking: Class aliases CharsetDetector, CharsetDoctor, CharsetNormalizerMatch and CharsetNormalizerMatches
-- Breaking: Top-level function `normalize`
-- Breaking: Properties `chaos_secondary_pass`, `coherence_non_latin` and `w_counter` from CharsetMatch
-- Support for the backport `unicodedata2`
-
-## [3.0.0rc1](https://github.com/Ousret/charset_normalizer/compare/3.0.0b2...3.0.0rc1) (2022-10-18)
-
-### Added
-- Extend the capability of explain=True when cp_isolation contains at most two entries (min one), will log in details of the Mess-detector results
-- Support for alternative language frequency set in charset_normalizer.assets.FREQUENCIES
-- Add parameter `language_threshold` in `from_bytes`, `from_path` and `from_fp` to adjust the minimum expected coherence ratio
-
-### Changed
-- Build with static metadata using 'build' frontend
-- Make the language detection stricter
-
-### Fixed
-- CLI with opt --normalize fail when using full path for files
-- TooManyAccentuatedPlugin induce false positive on the mess detection when too few alpha character have been fed to it
-
-### Removed
-- Coherence detector no longer return 'Simple English' instead return 'English'
-- Coherence detector no longer return 'Classical Chinese' instead return 'Chinese'
-
-## [3.0.0b2](https://github.com/Ousret/charset_normalizer/compare/3.0.0b1...3.0.0b2) (2022-08-21)
-
-### Added
-- `normalizer --version` now specify if current version provide extra speedup (meaning mypyc compilation whl)
-
-### Removed
-- Breaking: Method `first()` and `best()` from CharsetMatch
-- UTF-7 will no longer appear as "detected" without a recognized SIG/mark (is unreliable/conflict with ASCII)
-
-### Fixed
-- Sphinx warnings when generating the documentation
-
-## [3.0.0b1](https://github.com/Ousret/charset_normalizer/compare/2.1.0...3.0.0b1) (2022-08-15)
-
-### Changed
-- Optional: Module `md.py` can be compiled using Mypyc to provide an extra speedup up to 4x faster than v2.1
-
-### Removed
-- Breaking: Class aliases CharsetDetector, CharsetDoctor, CharsetNormalizerMatch and CharsetNormalizerMatches
-- Breaking: Top-level function `normalize`
-- Breaking: Properties `chaos_secondary_pass`, `coherence_non_latin` and `w_counter` from CharsetMatch
-- Support for the backport `unicodedata2`
-
-## [2.1.1](https://github.com/Ousret/charset_normalizer/compare/2.1.0...2.1.1) (2022-08-19)
-
-### Deprecated
-- Function `normalize` scheduled for removal in 3.0
-
-### Changed
-- Removed useless call to decode in fn is_unprintable (#206)
-
-### Fixed
-- Third-party library (i18n xgettext) crashing not recognizing utf_8 (PEP 263) with underscore from [@aleksandernovikov](https://github.com/aleksandernovikov) (#204)
-
-## [2.1.0](https://github.com/Ousret/charset_normalizer/compare/2.0.12...2.1.0) (2022-06-19)
-
-### Added
-- Output the Unicode table version when running the CLI with `--version` (PR #194)
-
-### Changed
-- Re-use decoded buffer for single byte character sets from [@nijel](https://github.com/nijel) (PR #175)
-- Fixing some performance bottlenecks from [@deedy5](https://github.com/deedy5) (PR #183)
-
-### Fixed
-- Workaround potential bug in cpython with Zero Width No-Break Space located in Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space (PR #175)
-- CLI default threshold aligned with the API threshold from [@oleksandr-kuzmenko](https://github.com/oleksandr-kuzmenko) (PR #181)
-
-### Removed
-- Support for Python 3.5 (PR #192)
-
-### Deprecated
-- Use of backport unicodedata from `unicodedata2` as Python is quickly catching up, scheduled for removal in 3.0 (PR #194)
-
-## [2.0.12](https://github.com/Ousret/charset_normalizer/compare/2.0.11...2.0.12) (2022-02-12)
-
-### Fixed
-- ASCII miss-detection on rare cases (PR #170)
-
-## [2.0.11](https://github.com/Ousret/charset_normalizer/compare/2.0.10...2.0.11) (2022-01-30)
-
-### Added
-- Explicit support for Python 3.11 (PR #164)
-
-### Changed
-- The logging behavior have been completely reviewed, now using only TRACE and DEBUG levels (PR #163 #165)
-
-## [2.0.10](https://github.com/Ousret/charset_normalizer/compare/2.0.9...2.0.10) (2022-01-04)
-
-### Fixed
-- Fallback match entries might lead to UnicodeDecodeError for large bytes sequence (PR #154)
-
-### Changed
-- Skipping the language-detection (CD) on ASCII (PR #155)
-
-## [2.0.9](https://github.com/Ousret/charset_normalizer/compare/2.0.8...2.0.9) (2021-12-03)
-
-### Changed
-- Moderating the logging impact (since 2.0.8) for specific environments (PR #147)
-
-### Fixed
-- Wrong logging level applied when setting kwarg `explain` to True (PR #146)
-
-## [2.0.8](https://github.com/Ousret/charset_normalizer/compare/2.0.7...2.0.8) (2021-11-24)
-### Changed
-- Improvement over Vietnamese detection (PR #126)
-- MD improvement on trailing data and long foreign (non-pure latin) data (PR #124)
-- Efficiency improvements in cd/alphabet_languages from [@adbar](https://github.com/adbar) (PR #122)
-- call sum() without an intermediary list following PEP 289 recommendations from [@adbar](https://github.com/adbar) (PR #129)
-- Code style as refactored by Sourcery-AI (PR #131)
-- Minor adjustment on the MD around european words (PR #133)
-- Remove and replace SRTs from assets / tests (PR #139)
-- Initialize the library logger with a `NullHandler` by default from [@nmaynes](https://github.com/nmaynes) (PR #135)
-- Setting kwarg `explain` to True will add provisionally (bounded to function lifespan) a specific stream handler (PR #135)
-
-### Fixed
-- Fix large (misleading) sequence giving UnicodeDecodeError (PR #137)
-- Avoid using too insignificant chunk (PR #137)
-
-### Added
-- Add and expose function `set_logging_handler` to configure a specific StreamHandler from [@nmaynes](https://github.com/nmaynes) (PR #135)
-- Add `CHANGELOG.md` entries, format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) (PR #141)
-
-## [2.0.7](https://github.com/Ousret/charset_normalizer/compare/2.0.6...2.0.7) (2021-10-11)
-### Added
-- Add support for Kazakh (Cyrillic) language detection (PR #109)
-
-### Changed
-- Further, improve inferring the language from a given single-byte code page (PR #112)
-- Vainly trying to leverage PEP263 when PEP3120 is not supported (PR #116)
-- Refactoring for potential performance improvements in loops from [@adbar](https://github.com/adbar) (PR #113)
-- Various detection improvement (MD+CD) (PR #117)
-
-### Removed
-- Remove redundant logging entry about detected language(s) (PR #115)
-
-### Fixed
-- Fix a minor inconsistency between Python 3.5 and other versions regarding language detection (PR #117 #102)
-
-## [2.0.6](https://github.com/Ousret/charset_normalizer/compare/2.0.5...2.0.6) (2021-09-18)
-### Fixed
-- Unforeseen regression with the loss of the backward-compatibility with some older minor of Python 3.5.x (PR #100)
-- Fix CLI crash when using --minimal output in certain cases (PR #103)
-
-### Changed
-- Minor improvement to the detection efficiency (less than 1%) (PR #106 #101)
-
-## [2.0.5](https://github.com/Ousret/charset_normalizer/compare/2.0.4...2.0.5) (2021-09-14)
-### Changed
-- The project now comply with: flake8, mypy, isort and black to ensure a better overall quality (PR #81)
-- The BC-support with v1.x was improved, the old staticmethods are restored (PR #82)
-- The Unicode detection is slightly improved (PR #93)
-- Add syntax sugar \_\_bool\_\_ for results CharsetMatches list-container (PR #91)
-
-### Removed
-- The project no longer raise warning on tiny content given for detection, will be simply logged as warning instead (PR #92)
-
-### Fixed
-- In some rare case, the chunks extractor could cut in the middle of a multi-byte character and could mislead the mess detection (PR #95)
-- Some rare 'space' characters could trip up the UnprintablePlugin/Mess detection (PR #96)
-- The MANIFEST.in was not exhaustive (PR #78)
-
-## [2.0.4](https://github.com/Ousret/charset_normalizer/compare/2.0.3...2.0.4) (2021-07-30)
-### Fixed
-- The CLI no longer raise an unexpected exception when no encoding has been found (PR #70)
-- Fix accessing the 'alphabets' property when the payload contains surrogate characters (PR #68)
-- The logger could mislead (explain=True) on detected languages and the impact of one MBCS match (PR #72)
-- Submatch factoring could be wrong in rare edge cases (PR #72)
-- Multiple files given to the CLI were ignored when publishing results to STDOUT. (After the first path) (PR #72)
-- Fix line endings from CRLF to LF for certain project files (PR #67)
-
-### Changed
-- Adjust the MD to lower the sensitivity, thus improving the global detection reliability (PR #69 #76)
-- Allow fallback on specified encoding if any (PR #71)
-
-## [2.0.3](https://github.com/Ousret/charset_normalizer/compare/2.0.2...2.0.3) (2021-07-16)
-### Changed
-- Part of the detection mechanism has been improved to be less sensitive, resulting in more accurate detection results. Especially ASCII. (PR #63)
-- According to the community wishes, the detection will fall back on ASCII or UTF-8 in a last-resort case. (PR #64)
-
-## [2.0.2](https://github.com/Ousret/charset_normalizer/compare/2.0.1...2.0.2) (2021-07-15)
-### Fixed
-- Empty/Too small JSON payload miss-detection fixed. Report from [@tseaver](https://github.com/tseaver) (PR #59)
-
-### Changed
-- Don't inject unicodedata2 into sys.modules from [@akx](https://github.com/akx) (PR #57)
-
-## [2.0.1](https://github.com/Ousret/charset_normalizer/compare/2.0.0...2.0.1) (2021-07-13)
-### Fixed
-- Make it work where there isn't a filesystem available, dropping assets frequencies.json. Report from [@sethmlarson](https://github.com/sethmlarson). (PR #55)
-- Using explain=False permanently disable the verbose output in the current runtime (PR #47)
-- One log entry (language target preemptive) was not show in logs when using explain=True (PR #47)
-- Fix undesired exception (ValueError) on getitem of instance CharsetMatches (PR #52)
-
-### Changed
-- Public function normalize default args values were not aligned with from_bytes (PR #53)
-
-### Added
-- You may now use charset aliases in cp_isolation and cp_exclusion arguments (PR #47)
-
-## [2.0.0](https://github.com/Ousret/charset_normalizer/compare/1.4.1...2.0.0) (2021-07-02)
-### Changed
-- 4x to 5 times faster than the previous 1.4.0 release. At least 2x faster than Chardet.
-- Accent has been made on UTF-8 detection, should perform rather instantaneous.
-- The backward compatibility with Chardet has been greatly improved. The legacy detect function returns an identical charset name whenever possible.
-- The detection mechanism has been slightly improved, now Turkish content is detected correctly (most of the time)
-- The program has been rewritten to ease the readability and maintainability. (+Using static typing)+
-- utf_7 detection has been reinstated.
-
-### Removed
-- This package no longer require anything when used with Python 3.5 (Dropped cached_property)
-- Removed support for these languages: Catalan, Esperanto, Kazakh, Baque, Volapรผk, Azeri, Galician, Nynorsk, Macedonian, and Serbocroatian.
-- The exception hook on UnicodeDecodeError has been removed.
-
-### Deprecated
-- Methods coherence_non_latin, w_counter, chaos_secondary_pass of the class CharsetMatch are now deprecated and scheduled for removal in v3.0
-
-### Fixed
-- The CLI output used the relative path of the file(s). Should be absolute.
-
-## [1.4.1](https://github.com/Ousret/charset_normalizer/compare/1.4.0...1.4.1) (2021-05-28)
-### Fixed
-- Logger configuration/usage no longer conflict with others (PR #44)
-
-## [1.4.0](https://github.com/Ousret/charset_normalizer/compare/1.3.9...1.4.0) (2021-05-21)
-### Removed
-- Using standard logging instead of using the package loguru.
-- Dropping nose test framework in favor of the maintained pytest.
-- Choose to not use dragonmapper package to help with gibberish Chinese/CJK text.
-- Require cached_property only for Python 3.5 due to constraint. Dropping for every other interpreter version.
-- Stop support for UTF-7 that does not contain a SIG.
-- Dropping PrettyTable, replaced with pure JSON output in CLI.
-
-### Fixed
-- BOM marker in a CharsetNormalizerMatch instance could be False in rare cases even if obviously present. Due to the sub-match factoring process.
-- Not searching properly for the BOM when trying utf32/16 parent codec.
-
-### Changed
-- Improving the package final size by compressing frequencies.json.
-- Huge improvement over the larges payload.
-
-### Added
-- CLI now produces JSON consumable output.
-- Return ASCII if given sequences fit. Given reasonable confidence.
-
-## [1.3.9](https://github.com/Ousret/charset_normalizer/compare/1.3.8...1.3.9) (2021-05-13)
-
-### Fixed
-- In some very rare cases, you may end up getting encode/decode errors due to a bad bytes payload (PR #40)
-
-## [1.3.8](https://github.com/Ousret/charset_normalizer/compare/1.3.7...1.3.8) (2021-05-12)
-
-### Fixed
-- Empty given payload for detection may cause an exception if trying to access the `alphabets` property. (PR #39)
-
-## [1.3.7](https://github.com/Ousret/charset_normalizer/compare/1.3.6...1.3.7) (2021-05-12)
-
-### Fixed
-- The legacy detect function should return UTF-8-SIG if sig is present in the payload. (PR #38)
-
-## [1.3.6](https://github.com/Ousret/charset_normalizer/compare/1.3.5...1.3.6) (2021-02-09)
-
-### Changed
-- Amend the previous release to allow prettytable 2.0 (PR #35)
-
-## [1.3.5](https://github.com/Ousret/charset_normalizer/compare/1.3.4...1.3.5) (2021-02-08)
-
-### Fixed
-- Fix error while using the package with a python pre-release interpreter (PR #33)
-
-### Changed
-- Dependencies refactoring, constraints revised.
-
-### Added
-- Add python 3.9 and 3.10 to the supported interpreters
-
-MIT License
-
-Copyright (c) 2025 TAHRI Ahmed R.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/libs/charset_normalizer-3.4.1.dist-info/RECORD b/libs/charset_normalizer-3.4.1.dist-info/RECORD
deleted file mode 100644
index ae16f9d4d7..0000000000
--- a/libs/charset_normalizer-3.4.1.dist-info/RECORD
+++ /dev/null
@@ -1,22 +0,0 @@
-../../bin/normalizer,sha256=Vv3oTbfvf6GgVzVVme_3IY_EKie63nPd9qEo8uySQzo,249
-charset_normalizer-3.4.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-charset_normalizer-3.4.1.dist-info/LICENSE,sha256=bQ1Bv-FwrGx9wkjJpj4lTQ-0WmDVCoJX0K-SxuJJuIc,1071
-charset_normalizer-3.4.1.dist-info/METADATA,sha256=JlKQNNPteOYEvM_2q-rE7UJqWkHQ5pnGGlkdLqMoMhw,35313
-charset_normalizer-3.4.1.dist-info/RECORD,,
-charset_normalizer-3.4.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-charset_normalizer-3.4.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-charset_normalizer-3.4.1.dist-info/entry_points.txt,sha256=8C-Y3iXIfyXQ83Tpir2B8t-XLJYpxF5xbb38d_js-h4,65
-charset_normalizer-3.4.1.dist-info/top_level.txt,sha256=7ASyzePr8_xuZWJsnqJjIBtyV8vhEo0wBCv1MPRRi3Q,19
-charset_normalizer/__init__.py,sha256=OKRxRv2Zhnqk00tqkN0c1BtJjm165fWXLydE52IKuHc,1590
-charset_normalizer/__main__.py,sha256=yzYxMR-IhKRHYwcSlavEv8oGdwxsR89mr2X09qXGdps,109
-charset_normalizer/api.py,sha256=qBRz8mJ_R5E713R6TOyqHEdnmyxbEDnCSHvx32ubDGg,22617
-charset_normalizer/cd.py,sha256=WKTo1HDb-H9HfCDc3Bfwq5jzS25Ziy9SE2a74SgTq88,12522
-charset_normalizer/cli/__init__.py,sha256=D8I86lFk2-py45JvqxniTirSj_sFyE6sjaY_0-G1shc,136
-charset_normalizer/cli/__main__.py,sha256=VGC9klOoi6_R2z8rmyrc936kv7u2A1udjjHtlmNPDTM,10410
-charset_normalizer/constant.py,sha256=4VuTcZNLew1j_8ixA-Rt_VVqNWD4pwgHOHMCMlr0964,40477
-charset_normalizer/legacy.py,sha256=yhNXsPHkBfqPXKRb-sPXNj3Bscp9-mFGcYOkJ62tg9c,2328
-charset_normalizer/md.py,sha256=iyXXQGWl54nnLQLueMWTmUtlivO0-rTBgVkmJxIIAGU,20036
-charset_normalizer/models.py,sha256=lKXhOnIPtiakbK3i__J9wpOfzx3JDTKj7Dn3Rg0VaRI,12394
-charset_normalizer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-charset_normalizer/utils.py,sha256=T5UHo8AS7NVMmgruWoZyqEf0WrZVcQpgUNetRoborSk,12002
-charset_normalizer/version.py,sha256=Ambcj3O8FfvdLfDLc8dkaxZx97O1IM_R4_aKGD_TDdE,115
diff --git a/libs/charset_normalizer-3.4.1.dist-info/WHEEL b/libs/charset_normalizer-3.4.1.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/charset_normalizer-3.4.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/charset_normalizer-3.4.1.dist-info/entry_points.txt b/libs/charset_normalizer-3.4.1.dist-info/entry_points.txt
deleted file mode 100644
index ec92012521..0000000000
--- a/libs/charset_normalizer-3.4.1.dist-info/entry_points.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[console_scripts]
-normalizer = charset_normalizer:cli.cli_detect
diff --git a/libs/alembic-1.14.0.dist-info/INSTALLER b/libs/charset_normalizer-3.4.6.dist-info/INSTALLER
similarity index 100%
rename from libs/alembic-1.14.0.dist-info/INSTALLER
rename to libs/charset_normalizer-3.4.6.dist-info/INSTALLER
diff --git a/libs/charset_normalizer-3.4.6.dist-info/METADATA b/libs/charset_normalizer-3.4.6.dist-info/METADATA
new file mode 100644
index 0000000000..d2a40df91d
--- /dev/null
+++ b/libs/charset_normalizer-3.4.6.dist-info/METADATA
@@ -0,0 +1,798 @@
+Metadata-Version: 2.4
+Name: charset-normalizer
+Version: 3.4.6
+Summary: The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.
+Author-email: "Ahmed R. TAHRI" <tahri.ahmed@proton.me>
+Maintainer-email: "Ahmed R. TAHRI" <tahri.ahmed@proton.me>
+License: MIT
+Project-URL: Changelog, https://github.com/jawah/charset_normalizer/blob/master/CHANGELOG.md
+Project-URL: Documentation, https://charset-normalizer.readthedocs.io/
+Project-URL: Code, https://github.com/jawah/charset_normalizer
+Project-URL: Issue tracker, https://github.com/jawah/charset_normalizer/issues
+Keywords: encoding,charset,charset-detector,detector,normalization,unicode,chardet,detect
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Text Processing :: Linguistic
+Classifier: Topic :: Utilities
+Classifier: Typing :: Typed
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Provides-Extra: unicode-backport
+Dynamic: license-file
+
+<h1 align="center">Charset Detection, for Everyone ๐Ÿ‘‹</h1>
+
+<p align="center">
+  <sup>The Real First Universal Charset Detector</sup><br>
+  <a href="https://pypi.org/project/charset-normalizer">
+    <img src="https://img.shields.io/pypi/pyversions/charset_normalizer.svg?orange=blue" />
+  </a>
+  <a href="https://pepy.tech/project/charset-normalizer/">
+    <img alt="Download Count Total" src="https://static.pepy.tech/badge/charset-normalizer/month" />
+  </a>
+  <a href="https://bestpractices.coreinfrastructure.org/projects/7297">
+    <img src="https://bestpractices.coreinfrastructure.org/projects/7297/badge">
+  </a>
+</p>
+<p align="center">
+  <sup><i>Featured Packages</i></sup><br>
+  <a href="https://github.com/jawah/niquests">
+   <img alt="Static Badge" src="https://img.shields.io/badge/Niquests-Most_Advanced_HTTP_Client-cyan">
+  </a>
+  <a href="https://github.com/jawah/wassima">
+   <img alt="Static Badge" src="https://img.shields.io/badge/Wassima-Certifi_Replacement-cyan">
+  </a>
+</p>
+<p align="center">
+  <sup><i>In other language (unofficial port - by the community)</i></sup><br>
+  <a href="https://github.com/nickspring/charset-normalizer-rs">
+   <img alt="Static Badge" src="https://img.shields.io/badge/Rust-red">
+  </a>
+</p>
+
+> A library that helps you read text from an unknown charset encoding.<br /> Motivated by `chardet`,
+> I'm trying to resolve the issue by taking a new approach.
+> All IANA character set names for which the Python core library provides codecs are supported.
+> You can also register your own set of codecs, and yes, it would work as-is.
+
+<p align="center">
+  >>>>> <a href="https://charsetnormalizerweb.ousret.now.sh" target="_blank">๐Ÿ‘‰ Try Me Online Now, Then Adopt Me ๐Ÿ‘ˆ </a> <<<<<
+</p>
+
+This project offers you an alternative to **Universal Charset Encoding Detector**, also known as **Chardet**.
+
+| Feature                                          | [Chardet](https://github.com/chardet/chardet) |                                       Charset Normalizer                                        | [cChardet](https://github.com/PyYoshi/cChardet) |
+|--------------------------------------------------|:---------------------------------------------:|:-----------------------------------------------------------------------------------------------:|:-----------------------------------------------:|
+| `Fast`                                           |                       โœ…                       |                                                โœ…                                                |                        โœ…                        |
+| `Universal`[^1]                                  |                       โŒ                       |                                                โœ…                                                |                        โŒ                        |
+| `Reliable` **without** distinguishable standards |                       โœ…                       |                                                โœ…                                                |                        โœ…                        |
+| `Reliable` **with** distinguishable standards    |                       โœ…                       |                                                โœ…                                                |                        โœ…                        |
+| `License`                                        |        _Disputed_[^2]<br>_restrictive_        |                                               MIT                                               |            MPL-1.1<br>_restrictive_             |
+| `Native Python`                                  |                       โœ…                       |                                                โœ…                                                |                        โŒ                        |
+| `Detect spoken language`                         |                       โœ…                       |                                                โœ…                                                |                       N/A                       |
+| `UnicodeDecodeError Safety`                      |                       โœ…                       |                                                โœ…                                                |                        โŒ                        |
+| `Whl Size (min)`                                 |                    500 kB                     |                                             150 kB                                              |                     ~200 kB                     |
+| `Supported Encoding`                             |                      99                       | [99](https://charset-normalizer.readthedocs.io/en/latest/user/support.html#supported-encodings) |                       40                        |
+| `Can register custom encoding`                   |                       โŒ                       |                                                โœ…                                                |                        โŒ                        |
+
+<p align="center">
+<img src="https://i.imgflip.com/373iay.gif" alt="Reading Normalized Text" width="226"/><img src="https://media.tenor.com/images/c0180f70732a18b4965448d33adba3d0/tenor.gif" alt="Cat Reading Text" width="200"/>
+</p>
+
+[^1]: They are clearly using specific code for a specific encoding even if covering most of used one.
+[^2]: Chardet 7.0+ was relicensed from LGPL-2.1 to MIT following an AI-assisted rewrite. This relicensing is disputed on two independent grounds: **(a)** the original author [contests](https://github.com/chardet/chardet/issues/327) that the maintainer had the right to relicense, arguing the rewrite is a derivative work of the LGPL-licensed codebase since it was not a clean room implementation; **(b)** the copyright claim itself is [questionable](https://github.com/chardet/chardet/issues/334) given the code was primarily generated by an LLM, and AI-generated output may not be copyrightable under most jurisdictions. Either issue alone could undermine the MIT license. Beyond licensing, the rewrite raises questions about responsible use of AI in open source: key architectural ideas pioneered by charset-normalizer - notably decode-first validity filtering (our foundational approach since v1) and encoding pairwise similarity with the same algorithm and threshold โ€” surfaced in chardet 7 without acknowledgment. The project also imported test files from charset-normalizer to train and benchmark against it, then claimed superior accuracy on those very files. Charset-normalizer has always been MIT-licensed, encoding-agnostic by design, and built on a verifiable human-authored history.
+
+## โšก Performance
+
+This package offer better performances (99th, and 95th) against Chardet. Here are some numbers.
+
+| Package                                           | Accuracy | Mean per file (ms) | File per sec (est) |
+|---------------------------------------------------|:--------:|:------------------:|:------------------:|
+| [chardet 7.1](https://github.com/chardet/chardet) |   89 %   |        3 ms        |    333 file/sec    |
+| charset-normalizer                                | **97 %** |        3 ms        |    333 file/sec    |
+
+| Package                                           | 99th percentile | 95th percentile | 50th percentile |
+|---------------------------------------------------|:---------------:|:---------------:|:---------------:|
+| [chardet 7.1](https://github.com/chardet/chardet) |      32 ms      |      17 ms      |     < 1 ms      |
+| charset-normalizer                                |      16 ms      |      10 ms      |      1 ms       |
+
+_updated as of March 2026 using CPython 3.12, Charset-Normalizer 3.4.6, and Chardet 7.1.0_
+
+~Chardet's performance on larger file (1MB+) are very poor. Expect huge difference on large payload.~ No longer the case since Chardet 7.0+
+
+> Stats are generated using 400+ files using default parameters. More details on used files, see GHA workflows.
+> And yes, these results might change at any time. The dataset can be updated to include more files.
+> The actual delays heavily depends on your CPU capabilities. The factors should remain the same.
+> Chardet claims on his documentation to have a greater accuracy than us based on the dataset they trained Chardet on(...)
+> Well, it's normal, the opposite would have been worrying. Whereas charset-normalizer don't train on anything, our solution
+> is based on a completely different algorithm, still heuristic through, it does not need weights across every encoding tables.
+
+## โœจ Installation
+
+Using pip:
+
+```sh
+pip install charset-normalizer -U
+```
+
+## ๐Ÿš€ Basic Usage
+
+### CLI
+This package comes with a CLI.
+
+```
+usage: normalizer [-h] [-v] [-a] [-n] [-m] [-r] [-f] [-t THRESHOLD]
+                  file [file ...]
+
+The Real First Universal Charset Detector. Discover originating encoding used
+on text file. Normalize text to unicode.
+
+positional arguments:
+  files                 File(s) to be analysed
+
+optional arguments:
+  -h, --help            show this help message and exit
+  -v, --verbose         Display complementary information about file if any.
+                        Stdout will contain logs about the detection process.
+  -a, --with-alternative
+                        Output complementary possibilities if any. Top-level
+                        JSON WILL be a list.
+  -n, --normalize       Permit to normalize input file. If not set, program
+                        does not write anything.
+  -m, --minimal         Only output the charset detected to STDOUT. Disabling
+                        JSON output.
+  -r, --replace         Replace file when trying to normalize it instead of
+                        creating a new one.
+  -f, --force           Replace file without asking if you are sure, use this
+                        flag with caution.
+  -t THRESHOLD, --threshold THRESHOLD
+                        Define a custom maximum amount of chaos allowed in
+                        decoded content. 0. <= chaos <= 1.
+  --version             Show version information and exit.
+```
+
+```bash
+normalizer ./data/sample.1.fr.srt
+```
+
+or
+
+```bash
+python -m charset_normalizer ./data/sample.1.fr.srt
+```
+
+๐ŸŽ‰ Since version 1.4.0 the CLI produce easily usable stdout result in JSON format.
+
+```json
+{
+    "path": "/home/default/projects/charset_normalizer/data/sample.1.fr.srt",
+    "encoding": "cp1252",
+    "encoding_aliases": [
+        "1252",
+        "windows_1252"
+    ],
+    "alternative_encodings": [
+        "cp1254",
+        "cp1256",
+        "cp1258",
+        "iso8859_14",
+        "iso8859_15",
+        "iso8859_16",
+        "iso8859_3",
+        "iso8859_9",
+        "latin_1",
+        "mbcs"
+    ],
+    "language": "French",
+    "alphabets": [
+        "Basic Latin",
+        "Latin-1 Supplement"
+    ],
+    "has_sig_or_bom": false,
+    "chaos": 0.149,
+    "coherence": 97.152,
+    "unicode_path": null,
+    "is_preferred": true
+}
+```
+
+### Python
+*Just print out normalized text*
+```python
+from charset_normalizer import from_path
+
+results = from_path('./my_subtitle.srt')
+
+print(str(results.best()))
+```
+
+*Upgrade your code without effort*
+```python
+from charset_normalizer import detect
+```
+
+The above code will behave the same as **chardet**. We ensure that we offer the best (reasonable) BC result possible.
+
+See the docs for advanced usage : [readthedocs.io](https://charset-normalizer.readthedocs.io/en/latest/)
+
+## ๐Ÿ˜‡ Why
+
+When I started using Chardet, I noticed that it was not suited to my expectations, and I wanted to propose a
+reliable alternative using a completely different method. Also! I never back down on a good challenge!
+
+I **don't care** about the **originating charset** encoding, because **two different tables** can
+produce **two identical rendered string.**
+What I want is to get readable text, the best I can.
+
+In a way, **I'm brute forcing text decoding.** How cool is that ? ๐Ÿ˜Ž
+
+Don't confuse package **ftfy** with charset-normalizer or chardet. ftfy goal is to repair Unicode string whereas charset-normalizer to convert raw file in unknown encoding to unicode.
+
+## ๐Ÿฐ How
+
+  - Discard all charset encoding table that could not fit the binary content.
+  - Measure noise, or the mess once opened (by chunks) with a corresponding charset encoding.
+  - Extract matches with the lowest mess detected.
+  - Additionally, we measure coherence / probe for a language.
+
+**Wait a minute**, what is noise/mess and coherence according to **YOU ?**
+
+*Noise :* I opened hundred of text files, **written by humans**, with the wrong encoding table. **I observed**, then
+**I established** some ground rules about **what is obvious** when **it seems like** a mess (aka. defining noise in rendered text).
+ I know that my interpretation of what is noise is probably incomplete, feel free to contribute in order to
+ improve or rewrite it.
+
+*Coherence :* For each language there is on earth, we have computed ranked letter appearance occurrences (the best we can). So I thought
+that intel is worth something here. So I use those records against decoded text to check if I can detect intelligent design.
+
+## โšก Known limitations
+
+  - Language detection is unreliable when text contains two or more languages sharing identical letters. (eg. HTML (english tags) + Turkish content (Sharing Latin characters))
+  - Every charset detector heavily depends on sufficient content. In common cases, do not bother run detection on very tiny content.
+
+## โš ๏ธ About Python EOLs
+
+**If you are running:**
+
+- Python >=2.7,<3.5: Unsupported
+- Python 3.5: charset-normalizer < 2.1
+- Python 3.6: charset-normalizer < 3.1
+
+Upgrade your Python interpreter as soon as possible.
+
+## ๐Ÿ‘ค Contributing
+
+Contributions, issues and feature requests are very much welcome.<br />
+Feel free to check [issues page](https://github.com/ousret/charset_normalizer/issues) if you want to contribute.
+
+## ๐Ÿ“ License
+
+Copyright ยฉ [Ahmed TAHRI @Ousret](https://github.com/Ousret).<br />
+This project is [MIT](https://github.com/Ousret/charset_normalizer/blob/master/LICENSE) licensed.
+
+Characters frequencies used in this project ยฉ 2012 [Denny Vrandeฤiฤ‡](http://simia.net/letters/)
+
+## ๐Ÿ’ผ For Enterprise
+
+Professional support for charset-normalizer is available as part of the [Tidelift
+Subscription][1]. Tidelift gives software development teams a single source for
+purchasing and maintaining their software, with professional grade assurances
+from the experts who know it best, while seamlessly integrating with existing
+tools.
+
+[1]: https://tidelift.com/subscription/pkg/pypi-charset-normalizer?utm_source=pypi-charset-normalizer&utm_medium=readme
+
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/7297/badge)](https://www.bestpractices.dev/projects/7297)
+
+# Changelog
+All notable changes to charset-normalizer will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+
+## [3.4.6](https://github.com/Ousret/charset_normalizer/compare/3.4.5...3.4.6) (2026-03-15)
+
+### Changed
+- Flattened the logic in `charset_normalizer.md` for higher performance. Removed `eligible(..)` and `feed(...)`
+  in favor of `feed_info(...)`.
+- Raised upper bound for mypy[c] to 1.20, for our optimized version.
+- Updated `UNICODE_RANGES_COMBINED` using Unicode blocks v17.
+
+### Fixed
+- Edge case where noise difference between two candidates can be almost insignificant. (#672)
+- CLI `--normalize` writing to wrong path when passing multiple files in. (#702)
+
+### Misc
+- Freethreaded pre-built wheels now shipped in PyPI starting with 3.14t. (#616)
+
+## [3.4.5](https://github.com/Ousret/charset_normalizer/compare/3.4.4...3.4.5) (2026-03-06)
+
+### Changed
+- Update `setuptools` constraint to `setuptools>=68,<=82`.
+- Raised upper bound of mypyc for the optional pre-built extension to v1.19.1
+
+### Fixed
+- Add explicit link to lib math in our optimized build. (#692)
+- Logger level not restored correctly for empty byte sequences. (#701)
+- TypeError when passing bytearray to from_bytes. (#703)
+
+### Misc
+- Applied safe micro-optimizations in both our noise detector and language detector.
+- Rewrote the `query_yes_no` function (inside CLI) to avoid using ambiguous licensed code.
+- Added `cd.py` submodule into mypyc optional compilation to reduce further the performance impact.
+
+## [3.4.4](https://github.com/Ousret/charset_normalizer/compare/3.4.2...3.4.4) (2025-10-13)
+
+### Changed
+- Bound `setuptools` to a specific constraint `setuptools>=68,<=81`.
+- Raised upper bound of mypyc for the optional pre-built extension to v1.18.2
+
+### Removed
+- `setuptools-scm` as a build dependency.
+
+### Misc
+- Enforced hashes in `dev-requirements.txt` and created `ci-requirements.txt` for security purposes.
+- Additional pre-built wheels for riscv64, s390x, and armv7l architectures.
+- Restore ` multiple.intoto.jsonl` in GitHub releases in addition to individual attestation file per wheel.
+
+## [3.4.3](https://github.com/Ousret/charset_normalizer/compare/3.4.2...3.4.3) (2025-08-09)
+
+### Changed
+- mypy(c) is no longer a required dependency at build time if `CHARSET_NORMALIZER_USE_MYPYC` isn't set to `1`. (#595) (#583)
+- automatically lower confidence on small bytes samples that are not Unicode in `detect` output legacy function. (#391)
+
+### Added
+- Custom build backend to overcome inability to mark mypy as an optional dependency in the build phase.
+- Support for Python 3.14
+
+### Fixed
+- sdist archive contained useless directories.
+- automatically fallback on valid UTF-16 or UTF-32 even if the md says it's noisy. (#633)
+
+### Misc
+- SBOM are automatically published to the relevant GitHub release to comply with regulatory changes.
+  Each published wheel comes with its SBOM. We choose CycloneDX as the format.
+- Prebuilt optimized wheel are no longer distributed by default for CPython 3.7 due to a change in cibuildwheel.
+
+## [3.4.2](https://github.com/Ousret/charset_normalizer/compare/3.4.1...3.4.2) (2025-05-02)
+
+### Fixed
+- Addressed the DeprecationWarning in our CLI regarding `argparse.FileType` by backporting the target class into the package. (#591)
+- Improved the overall reliability of the detector with CJK Ideographs. (#605) (#587)
+
+### Changed
+- Optional mypyc compilation upgraded to version 1.15 for Python >= 3.8
+
+## [3.4.1](https://github.com/Ousret/charset_normalizer/compare/3.4.0...3.4.1) (2024-12-24)
+
+### Changed
+- Project metadata are now stored using `pyproject.toml` instead of `setup.cfg` using setuptools as the build backend.
+- Enforce annotation delayed loading for a simpler and consistent types in the project.
+- Optional mypyc compilation upgraded to version 1.14 for Python >= 3.8
+
+### Added
+- pre-commit configuration.
+- noxfile.
+
+### Removed
+- `build-requirements.txt` as per using `pyproject.toml` native build configuration.
+- `bin/integration.py` and `bin/serve.py` in favor of downstream integration test (see noxfile).
+- `setup.cfg` in favor of `pyproject.toml` metadata configuration.
+- Unused `utils.range_scan` function.
+
+### Fixed
+- Converting content to Unicode bytes may insert `utf_8` instead of preferred `utf-8`. (#572)
+- Deprecation warning "'count' is passed as positional argument" when converting to Unicode bytes on Python 3.13+
+
+## [3.4.0](https://github.com/Ousret/charset_normalizer/compare/3.3.2...3.4.0) (2024-10-08)
+
+### Added
+- Argument `--no-preemptive` in the CLI to prevent the detector to search for hints.
+- Support for Python 3.13 (#512)
+
+### Fixed
+- Relax the TypeError exception thrown when trying to compare a CharsetMatch with anything else than a CharsetMatch.
+- Improved the general reliability of the detector based on user feedbacks. (#520) (#509) (#498) (#407) (#537)
+- Declared charset in content (preemptive detection) not changed when converting to utf-8 bytes. (#381)
+
+## [3.3.2](https://github.com/Ousret/charset_normalizer/compare/3.3.1...3.3.2) (2023-10-31)
+
+### Fixed
+- Unintentional memory usage regression when using large payload that match several encoding (#376)
+- Regression on some detection case showcased in the documentation (#371)
+
+### Added
+- Noise (md) probe that identify malformed arabic representation due to the presence of letters in isolated form (credit to my wife)
+
+## [3.3.1](https://github.com/Ousret/charset_normalizer/compare/3.3.0...3.3.1) (2023-10-22)
+
+### Changed
+- Optional mypyc compilation upgraded to version 1.6.1 for Python >= 3.8
+- Improved the general detection reliability based on reports from the community
+
+## [3.3.0](https://github.com/Ousret/charset_normalizer/compare/3.2.0...3.3.0) (2023-09-30)
+
+### Added
+- Allow to execute the CLI (e.g. normalizer) through `python -m charset_normalizer.cli` or `python -m charset_normalizer`
+- Support for 9 forgotten encoding that are supported by Python but unlisted in `encoding.aliases` as they have no alias (#323)
+
+### Removed
+- (internal) Redundant utils.is_ascii function and unused function is_private_use_only
+- (internal) charset_normalizer.assets is moved inside charset_normalizer.constant
+
+### Changed
+- (internal) Unicode code blocks in constants are updated using the latest v15.0.0 definition to improve detection
+- Optional mypyc compilation upgraded to version 1.5.1 for Python >= 3.8
+
+### Fixed
+- Unable to properly sort CharsetMatch when both chaos/noise and coherence were close due to an unreachable condition in \_\_lt\_\_ (#350)
+
+## [3.2.0](https://github.com/Ousret/charset_normalizer/compare/3.1.0...3.2.0) (2023-06-07)
+
+### Changed
+- Typehint for function `from_path` no longer enforce `PathLike` as its first argument
+- Minor improvement over the global detection reliability
+
+### Added
+- Introduce function `is_binary` that relies on main capabilities, and optimized to detect binaries
+- Propagate `enable_fallback` argument throughout `from_bytes`, `from_path`, and `from_fp` that allow a deeper control over the detection (default True)
+- Explicit support for Python 3.12
+
+### Fixed
+- Edge case detection failure where a file would contain 'very-long' camel cased word (Issue #289)
+
+## [3.1.0](https://github.com/Ousret/charset_normalizer/compare/3.0.1...3.1.0) (2023-03-06)
+
+### Added
+- Argument `should_rename_legacy` for legacy function `detect` and disregard any new arguments without errors (PR #262)
+
+### Removed
+- Support for Python 3.6 (PR #260)
+
+### Changed
+- Optional speedup provided by mypy/c 1.0.1
+
+## [3.0.1](https://github.com/Ousret/charset_normalizer/compare/3.0.0...3.0.1) (2022-11-18)
+
+### Fixed
+- Multi-bytes cutter/chunk generator did not always cut correctly (PR #233)
+
+### Changed
+- Speedup provided by mypy/c 0.990 on Python >= 3.7
+
+## [3.0.0](https://github.com/Ousret/charset_normalizer/compare/2.1.1...3.0.0) (2022-10-20)
+
+### Added
+- Extend the capability of explain=True when cp_isolation contains at most two entries (min one), will log in details of the Mess-detector results
+- Support for alternative language frequency set in charset_normalizer.assets.FREQUENCIES
+- Add parameter `language_threshold` in `from_bytes`, `from_path` and `from_fp` to adjust the minimum expected coherence ratio
+- `normalizer --version` now specify if current version provide extra speedup (meaning mypyc compilation whl)
+
+### Changed
+- Build with static metadata using 'build' frontend
+- Make the language detection stricter
+- Optional: Module `md.py` can be compiled using Mypyc to provide an extra speedup up to 4x faster than v2.1
+
+### Fixed
+- CLI with opt --normalize fail when using full path for files
+- TooManyAccentuatedPlugin induce false positive on the mess detection when too few alpha character have been fed to it
+- Sphinx warnings when generating the documentation
+
+### Removed
+- Coherence detector no longer return 'Simple English' instead return 'English'
+- Coherence detector no longer return 'Classical Chinese' instead return 'Chinese'
+- Breaking: Method `first()` and `best()` from CharsetMatch
+- UTF-7 will no longer appear as "detected" without a recognized SIG/mark (is unreliable/conflict with ASCII)
+- Breaking: Class aliases CharsetDetector, CharsetDoctor, CharsetNormalizerMatch and CharsetNormalizerMatches
+- Breaking: Top-level function `normalize`
+- Breaking: Properties `chaos_secondary_pass`, `coherence_non_latin` and `w_counter` from CharsetMatch
+- Support for the backport `unicodedata2`
+
+## [3.0.0rc1](https://github.com/Ousret/charset_normalizer/compare/3.0.0b2...3.0.0rc1) (2022-10-18)
+
+### Added
+- Extend the capability of explain=True when cp_isolation contains at most two entries (min one), will log in details of the Mess-detector results
+- Support for alternative language frequency set in charset_normalizer.assets.FREQUENCIES
+- Add parameter `language_threshold` in `from_bytes`, `from_path` and `from_fp` to adjust the minimum expected coherence ratio
+
+### Changed
+- Build with static metadata using 'build' frontend
+- Make the language detection stricter
+
+### Fixed
+- CLI with opt --normalize fail when using full path for files
+- TooManyAccentuatedPlugin induce false positive on the mess detection when too few alpha character have been fed to it
+
+### Removed
+- Coherence detector no longer return 'Simple English' instead return 'English'
+- Coherence detector no longer return 'Classical Chinese' instead return 'Chinese'
+
+## [3.0.0b2](https://github.com/Ousret/charset_normalizer/compare/3.0.0b1...3.0.0b2) (2022-08-21)
+
+### Added
+- `normalizer --version` now specify if current version provide extra speedup (meaning mypyc compilation whl)
+
+### Removed
+- Breaking: Method `first()` and `best()` from CharsetMatch
+- UTF-7 will no longer appear as "detected" without a recognized SIG/mark (is unreliable/conflict with ASCII)
+
+### Fixed
+- Sphinx warnings when generating the documentation
+
+## [3.0.0b1](https://github.com/Ousret/charset_normalizer/compare/2.1.0...3.0.0b1) (2022-08-15)
+
+### Changed
+- Optional: Module `md.py` can be compiled using Mypyc to provide an extra speedup up to 4x faster than v2.1
+
+### Removed
+- Breaking: Class aliases CharsetDetector, CharsetDoctor, CharsetNormalizerMatch and CharsetNormalizerMatches
+- Breaking: Top-level function `normalize`
+- Breaking: Properties `chaos_secondary_pass`, `coherence_non_latin` and `w_counter` from CharsetMatch
+- Support for the backport `unicodedata2`
+
+## [2.1.1](https://github.com/Ousret/charset_normalizer/compare/2.1.0...2.1.1) (2022-08-19)
+
+### Deprecated
+- Function `normalize` scheduled for removal in 3.0
+
+### Changed
+- Removed useless call to decode in fn is_unprintable (#206)
+
+### Fixed
+- Third-party library (i18n xgettext) crashing not recognizing utf_8 (PEP 263) with underscore from [@aleksandernovikov](https://github.com/aleksandernovikov) (#204)
+
+## [2.1.0](https://github.com/Ousret/charset_normalizer/compare/2.0.12...2.1.0) (2022-06-19)
+
+### Added
+- Output the Unicode table version when running the CLI with `--version` (PR #194)
+
+### Changed
+- Re-use decoded buffer for single byte character sets from [@nijel](https://github.com/nijel) (PR #175)
+- Fixing some performance bottlenecks from [@deedy5](https://github.com/deedy5) (PR #183)
+
+### Fixed
+- Workaround potential bug in cpython with Zero Width No-Break Space located in Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space (PR #175)
+- CLI default threshold aligned with the API threshold from [@oleksandr-kuzmenko](https://github.com/oleksandr-kuzmenko) (PR #181)
+
+### Removed
+- Support for Python 3.5 (PR #192)
+
+### Deprecated
+- Use of backport unicodedata from `unicodedata2` as Python is quickly catching up, scheduled for removal in 3.0 (PR #194)
+
+## [2.0.12](https://github.com/Ousret/charset_normalizer/compare/2.0.11...2.0.12) (2022-02-12)
+
+### Fixed
+- ASCII miss-detection on rare cases (PR #170)
+
+## [2.0.11](https://github.com/Ousret/charset_normalizer/compare/2.0.10...2.0.11) (2022-01-30)
+
+### Added
+- Explicit support for Python 3.11 (PR #164)
+
+### Changed
+- The logging behavior have been completely reviewed, now using only TRACE and DEBUG levels (PR #163 #165)
+
+## [2.0.10](https://github.com/Ousret/charset_normalizer/compare/2.0.9...2.0.10) (2022-01-04)
+
+### Fixed
+- Fallback match entries might lead to UnicodeDecodeError for large bytes sequence (PR #154)
+
+### Changed
+- Skipping the language-detection (CD) on ASCII (PR #155)
+
+## [2.0.9](https://github.com/Ousret/charset_normalizer/compare/2.0.8...2.0.9) (2021-12-03)
+
+### Changed
+- Moderating the logging impact (since 2.0.8) for specific environments (PR #147)
+
+### Fixed
+- Wrong logging level applied when setting kwarg `explain` to True (PR #146)
+
+## [2.0.8](https://github.com/Ousret/charset_normalizer/compare/2.0.7...2.0.8) (2021-11-24)
+### Changed
+- Improvement over Vietnamese detection (PR #126)
+- MD improvement on trailing data and long foreign (non-pure latin) data (PR #124)
+- Efficiency improvements in cd/alphabet_languages from [@adbar](https://github.com/adbar) (PR #122)
+- call sum() without an intermediary list following PEP 289 recommendations from [@adbar](https://github.com/adbar) (PR #129)
+- Code style as refactored by Sourcery-AI (PR #131)
+- Minor adjustment on the MD around european words (PR #133)
+- Remove and replace SRTs from assets / tests (PR #139)
+- Initialize the library logger with a `NullHandler` by default from [@nmaynes](https://github.com/nmaynes) (PR #135)
+- Setting kwarg `explain` to True will add provisionally (bounded to function lifespan) a specific stream handler (PR #135)
+
+### Fixed
+- Fix large (misleading) sequence giving UnicodeDecodeError (PR #137)
+- Avoid using too insignificant chunk (PR #137)
+
+### Added
+- Add and expose function `set_logging_handler` to configure a specific StreamHandler from [@nmaynes](https://github.com/nmaynes) (PR #135)
+- Add `CHANGELOG.md` entries, format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) (PR #141)
+
+## [2.0.7](https://github.com/Ousret/charset_normalizer/compare/2.0.6...2.0.7) (2021-10-11)
+### Added
+- Add support for Kazakh (Cyrillic) language detection (PR #109)
+
+### Changed
+- Further, improve inferring the language from a given single-byte code page (PR #112)
+- Vainly trying to leverage PEP263 when PEP3120 is not supported (PR #116)
+- Refactoring for potential performance improvements in loops from [@adbar](https://github.com/adbar) (PR #113)
+- Various detection improvement (MD+CD) (PR #117)
+
+### Removed
+- Remove redundant logging entry about detected language(s) (PR #115)
+
+### Fixed
+- Fix a minor inconsistency between Python 3.5 and other versions regarding language detection (PR #117 #102)
+
+## [2.0.6](https://github.com/Ousret/charset_normalizer/compare/2.0.5...2.0.6) (2021-09-18)
+### Fixed
+- Unforeseen regression with the loss of the backward-compatibility with some older minor of Python 3.5.x (PR #100)
+- Fix CLI crash when using --minimal output in certain cases (PR #103)
+
+### Changed
+- Minor improvement to the detection efficiency (less than 1%) (PR #106 #101)
+
+## [2.0.5](https://github.com/Ousret/charset_normalizer/compare/2.0.4...2.0.5) (2021-09-14)
+### Changed
+- The project now comply with: flake8, mypy, isort and black to ensure a better overall quality (PR #81)
+- The BC-support with v1.x was improved, the old staticmethods are restored (PR #82)
+- The Unicode detection is slightly improved (PR #93)
+- Add syntax sugar \_\_bool\_\_ for results CharsetMatches list-container (PR #91)
+
+### Removed
+- The project no longer raise warning on tiny content given for detection, will be simply logged as warning instead (PR #92)
+
+### Fixed
+- In some rare case, the chunks extractor could cut in the middle of a multi-byte character and could mislead the mess detection (PR #95)
+- Some rare 'space' characters could trip up the UnprintablePlugin/Mess detection (PR #96)
+- The MANIFEST.in was not exhaustive (PR #78)
+
+## [2.0.4](https://github.com/Ousret/charset_normalizer/compare/2.0.3...2.0.4) (2021-07-30)
+### Fixed
+- The CLI no longer raise an unexpected exception when no encoding has been found (PR #70)
+- Fix accessing the 'alphabets' property when the payload contains surrogate characters (PR #68)
+- The logger could mislead (explain=True) on detected languages and the impact of one MBCS match (PR #72)
+- Submatch factoring could be wrong in rare edge cases (PR #72)
+- Multiple files given to the CLI were ignored when publishing results to STDOUT. (After the first path) (PR #72)
+- Fix line endings from CRLF to LF for certain project files (PR #67)
+
+### Changed
+- Adjust the MD to lower the sensitivity, thus improving the global detection reliability (PR #69 #76)
+- Allow fallback on specified encoding if any (PR #71)
+
+## [2.0.3](https://github.com/Ousret/charset_normalizer/compare/2.0.2...2.0.3) (2021-07-16)
+### Changed
+- Part of the detection mechanism has been improved to be less sensitive, resulting in more accurate detection results. Especially ASCII. (PR #63)
+- According to the community wishes, the detection will fall back on ASCII or UTF-8 in a last-resort case. (PR #64)
+
+## [2.0.2](https://github.com/Ousret/charset_normalizer/compare/2.0.1...2.0.2) (2021-07-15)
+### Fixed
+- Empty/Too small JSON payload miss-detection fixed. Report from [@tseaver](https://github.com/tseaver) (PR #59)
+
+### Changed
+- Don't inject unicodedata2 into sys.modules from [@akx](https://github.com/akx) (PR #57)
+
+## [2.0.1](https://github.com/Ousret/charset_normalizer/compare/2.0.0...2.0.1) (2021-07-13)
+### Fixed
+- Make it work where there isn't a filesystem available, dropping assets frequencies.json. Report from [@sethmlarson](https://github.com/sethmlarson). (PR #55)
+- Using explain=False permanently disable the verbose output in the current runtime (PR #47)
+- One log entry (language target preemptive) was not show in logs when using explain=True (PR #47)
+- Fix undesired exception (ValueError) on getitem of instance CharsetMatches (PR #52)
+
+### Changed
+- Public function normalize default args values were not aligned with from_bytes (PR #53)
+
+### Added
+- You may now use charset aliases in cp_isolation and cp_exclusion arguments (PR #47)
+
+## [2.0.0](https://github.com/Ousret/charset_normalizer/compare/1.4.1...2.0.0) (2021-07-02)
+### Changed
+- 4x to 5 times faster than the previous 1.4.0 release. At least 2x faster than Chardet.
+- Accent has been made on UTF-8 detection, should perform rather instantaneous.
+- The backward compatibility with Chardet has been greatly improved. The legacy detect function returns an identical charset name whenever possible.
+- The detection mechanism has been slightly improved, now Turkish content is detected correctly (most of the time)
+- The program has been rewritten to ease the readability and maintainability. (+Using static typing)+
+- utf_7 detection has been reinstated.
+
+### Removed
+- This package no longer require anything when used with Python 3.5 (Dropped cached_property)
+- Removed support for these languages: Catalan, Esperanto, Kazakh, Baque, Volapรผk, Azeri, Galician, Nynorsk, Macedonian, and Serbocroatian.
+- The exception hook on UnicodeDecodeError has been removed.
+
+### Deprecated
+- Methods coherence_non_latin, w_counter, chaos_secondary_pass of the class CharsetMatch are now deprecated and scheduled for removal in v3.0
+
+### Fixed
+- The CLI output used the relative path of the file(s). Should be absolute.
+
+## [1.4.1](https://github.com/Ousret/charset_normalizer/compare/1.4.0...1.4.1) (2021-05-28)
+### Fixed
+- Logger configuration/usage no longer conflict with others (PR #44)
+
+## [1.4.0](https://github.com/Ousret/charset_normalizer/compare/1.3.9...1.4.0) (2021-05-21)
+### Removed
+- Using standard logging instead of using the package loguru.
+- Dropping nose test framework in favor of the maintained pytest.
+- Choose to not use dragonmapper package to help with gibberish Chinese/CJK text.
+- Require cached_property only for Python 3.5 due to constraint. Dropping for every other interpreter version.
+- Stop support for UTF-7 that does not contain a SIG.
+- Dropping PrettyTable, replaced with pure JSON output in CLI.
+
+### Fixed
+- BOM marker in a CharsetNormalizerMatch instance could be False in rare cases even if obviously present. Due to the sub-match factoring process.
+- Not searching properly for the BOM when trying utf32/16 parent codec.
+
+### Changed
+- Improving the package final size by compressing frequencies.json.
+- Huge improvement over the larges payload.
+
+### Added
+- CLI now produces JSON consumable output.
+- Return ASCII if given sequences fit. Given reasonable confidence.
+
+## [1.3.9](https://github.com/Ousret/charset_normalizer/compare/1.3.8...1.3.9) (2021-05-13)
+
+### Fixed
+- In some very rare cases, you may end up getting encode/decode errors due to a bad bytes payload (PR #40)
+
+## [1.3.8](https://github.com/Ousret/charset_normalizer/compare/1.3.7...1.3.8) (2021-05-12)
+
+### Fixed
+- Empty given payload for detection may cause an exception if trying to access the `alphabets` property. (PR #39)
+
+## [1.3.7](https://github.com/Ousret/charset_normalizer/compare/1.3.6...1.3.7) (2021-05-12)
+
+### Fixed
+- The legacy detect function should return UTF-8-SIG if sig is present in the payload. (PR #38)
+
+## [1.3.6](https://github.com/Ousret/charset_normalizer/compare/1.3.5...1.3.6) (2021-02-09)
+
+### Changed
+- Amend the previous release to allow prettytable 2.0 (PR #35)
+
+## [1.3.5](https://github.com/Ousret/charset_normalizer/compare/1.3.4...1.3.5) (2021-02-08)
+
+### Fixed
+- Fix error while using the package with a python pre-release interpreter (PR #33)
+
+### Changed
+- Dependencies refactoring, constraints revised.
+
+### Added
+- Add python 3.9 and 3.10 to the supported interpreters
+
+MIT License
+
+Copyright (c) 2025 TAHRI Ahmed R.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/charset_normalizer-3.4.6.dist-info/RECORD b/libs/charset_normalizer-3.4.6.dist-info/RECORD
new file mode 100644
index 0000000000..9e596d239e
--- /dev/null
+++ b/libs/charset_normalizer-3.4.6.dist-info/RECORD
@@ -0,0 +1,22 @@
+../../bin/normalizer,sha256=CK0fSuBOmHoIKSfCDVnx1HMTgra-d2jIh_2BbZMpjoU,209
+charset_normalizer-3.4.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+charset_normalizer-3.4.6.dist-info/METADATA,sha256=dk9sTA95N-j8mBeWuSnjw6zoAYbY9J7viW3Jukhd8S4,40556
+charset_normalizer-3.4.6.dist-info/RECORD,,
+charset_normalizer-3.4.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+charset_normalizer-3.4.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+charset_normalizer-3.4.6.dist-info/entry_points.txt,sha256=ADSTKrkXZ3hhdOVFi6DcUEHQRS0xfxDIE_pEz4wLIXA,65
+charset_normalizer-3.4.6.dist-info/licenses/LICENSE,sha256=bQ1Bv-FwrGx9wkjJpj4lTQ-0WmDVCoJX0K-SxuJJuIc,1071
+charset_normalizer-3.4.6.dist-info/top_level.txt,sha256=7ASyzePr8_xuZWJsnqJjIBtyV8vhEo0wBCv1MPRRi3Q,19
+charset_normalizer/__init__.py,sha256=OKRxRv2Zhnqk00tqkN0c1BtJjm165fWXLydE52IKuHc,1590
+charset_normalizer/__main__.py,sha256=yzYxMR-IhKRHYwcSlavEv8oGdwxsR89mr2X09qXGdps,109
+charset_normalizer/api.py,sha256=6kHyIpfgxrjR_o_s_IGZ_zweFIfiGRBf-tnKRPqwg_E,37960
+charset_normalizer/cd.py,sha256=v0iPJweGsRegXywrM1LzUgqW9bJ1KFvIblQHP1jm5FQ,15174
+charset_normalizer/cli/__init__.py,sha256=D8I86lFk2-py45JvqxniTirSj_sFyE6sjaY_0-G1shc,136
+charset_normalizer/cli/__main__.py,sha256=E9FFSV1E2iOE_B2B1tJHQT9ExJqc60Ks_c-08sNawh8,11940
+charset_normalizer/constant.py,sha256=UMxXijQRKnoj27qP5vjNPJed2kJUB9rmCbRuLBjwIQ0,44431
+charset_normalizer/legacy.py,sha256=yBIFMNABNPE5JkdKOWyVo36fZtV9nm8bf37LrDWulz8,2661
+charset_normalizer/md.py,sha256=AYCdfDX79FrgoId3zXqmbCuDcbGr1NRuGqgJN94Rx9Q,30441
+charset_normalizer/models.py,sha256=01sizRL-AUJ5FOzANwAtV6l2rQ0Dd5dZpJUfXv6HTxc,12360
+charset_normalizer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+charset_normalizer/utils.py,sha256=9cpi-_0-vC9pGDfuoarhC6VlF_Jxwx5Jsa_8I4w2D8k,12282
+charset_normalizer/version.py,sha256=w4FVpMHIJ5sT9HC5JROzcW8kYPHryvjSgIDqUM5w1uw,115
diff --git a/libs/alembic-1.14.0.dist-info/REQUESTED b/libs/charset_normalizer-3.4.6.dist-info/REQUESTED
similarity index 100%
rename from libs/alembic-1.14.0.dist-info/REQUESTED
rename to libs/charset_normalizer-3.4.6.dist-info/REQUESTED
diff --git a/libs/charset_normalizer-3.4.6.dist-info/WHEEL b/libs/charset_normalizer-3.4.6.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/charset_normalizer-3.4.6.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/charset_normalizer-3.4.6.dist-info/entry_points.txt b/libs/charset_normalizer-3.4.6.dist-info/entry_points.txt
new file mode 100644
index 0000000000..65619e73ec
--- /dev/null
+++ b/libs/charset_normalizer-3.4.6.dist-info/entry_points.txt
@@ -0,0 +1,2 @@
+[console_scripts]
+normalizer = charset_normalizer.cli:cli_detect
diff --git a/libs/charset_normalizer-3.4.1.dist-info/LICENSE b/libs/charset_normalizer-3.4.6.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/charset_normalizer-3.4.1.dist-info/LICENSE
rename to libs/charset_normalizer-3.4.6.dist-info/licenses/LICENSE
diff --git a/libs/charset_normalizer-3.4.1.dist-info/top_level.txt b/libs/charset_normalizer-3.4.6.dist-info/top_level.txt
similarity index 100%
rename from libs/charset_normalizer-3.4.1.dist-info/top_level.txt
rename to libs/charset_normalizer-3.4.6.dist-info/top_level.txt
diff --git a/libs/charset_normalizer/api.py b/libs/charset_normalizer/api.py
index 2c8c0618cc..1f32091f22 100644
--- a/libs/charset_normalizer/api.py
+++ b/libs/charset_normalizer/api.py
@@ -10,7 +10,13 @@
     mb_encoding_languages,
     merge_coherence_ratios,
 )
-from .constant import IANA_SUPPORTED, TOO_BIG_SEQUENCE, TOO_SMALL_SEQUENCE, TRACE
+from .constant import (
+    IANA_SUPPORTED,
+    IANA_SUPPORTED_SIMILAR,
+    TOO_BIG_SEQUENCE,
+    TOO_SMALL_SEQUENCE,
+    TRACE,
+)
 from .md import mess_ratio
 from .models import CharsetMatch, CharsetMatches
 from .utils import (
@@ -18,7 +24,6 @@
     cut_sequence_chunks,
     iana_name,
     identify_sig_or_bom,
-    is_cp_similar,
     is_multi_byte_encoding,
     should_strip_sig_or_bom,
 )
@@ -29,6 +34,25 @@
     logging.Formatter("%(asctime)s | %(levelname)s | %(message)s")
 )
 
+# Pre-compute a reordered encoding list: multibyte first, then single-byte.
+# This allows the mb_definitive_match optimization to fire earlier, skipping
+# all single-byte encodings for genuine CJK content. Multibyte codecs
+# hard-fail (UnicodeDecodeError) on single-byte data almost instantly, so
+# testing them first costs negligible time for non-CJK files.
+_mb_supported: list[str] = []
+_sb_supported: list[str] = []
+
+for _supported_enc in IANA_SUPPORTED:
+    try:
+        if is_multi_byte_encoding(_supported_enc):
+            _mb_supported.append(_supported_enc)
+        else:
+            _sb_supported.append(_supported_enc)
+    except ImportError:
+        _sb_supported.append(_supported_enc)
+
+IANA_SUPPORTED_MB_FIRST: list[str] = _mb_supported + _sb_supported
+
 
 def from_bytes(
     sequences: bytes | bytearray,
@@ -78,7 +102,7 @@ def from_bytes(
         logger.debug("Encoding detection on empty bytes, assuming utf_8 intention.")
         if explain:  # Defensive: ensure exit path clean handler
             logger.removeHandler(explain_handler)
-            logger.setLevel(previous_logger_level or logging.WARNING)
+            logger.setLevel(previous_logger_level)
         return CharsetMatches([CharsetMatch(sequences, "utf_8", 0.0, False, [], "")])
 
     if cp_isolation is not None:
@@ -152,6 +176,40 @@ def from_bytes(
     tested: set[str] = set()
     tested_but_hard_failure: list[str] = []
     tested_but_soft_failure: list[str] = []
+    soft_failure_skip: set[str] = set()
+    success_fast_tracked: set[str] = set()
+
+    # Cache for decoded payload deduplication: hash(decoded_payload) -> (mean_mess_ratio, cd_ratios_merged, passed)
+    # When multiple encodings decode to the exact same string, we can skip the expensive
+    # mess_ratio and coherence_ratio analysis and reuse the results from the first encoding.
+    payload_result_cache: dict[int, tuple[float, list[tuple[str, float]], bool]] = {}
+
+    # When a definitive result (chaos=0.0 and good coherence) is found after testing
+    # the prioritized encodings (ascii, utf_8), we can significantly reduce the remaining
+    # work. Encodings that target completely different language families (e.g., Cyrillic
+    # when the definitive match is Latin) are skipped entirely.
+    # Additionally, for same-family encodings that pass chaos probing, we reuse the
+    # definitive match's coherence ratios instead of recomputing them โ€” a major savings
+    # since coherence_ratio accounts for ~30% of total time on slow Latin files.
+    definitive_match_found: bool = False
+    definitive_target_languages: set[str] = set()
+    # After the definitive match fires, we cap the number of additional same-family
+    # single-byte encodings that pass chaos probing. Once we've accumulated enough
+    # good candidates (N), further same-family SB encodings are unlikely to produce
+    # a better best() result and just waste mess_ratio + coherence_ratio time.
+    # The first encoding to trigger the definitive match is NOT counted (it's already in).
+    post_definitive_sb_success_count: int = 0
+    POST_DEFINITIVE_SB_CAP: int = 7
+
+    # When a non-UTF multibyte encoding passes chaos probing with significant multibyte
+    # content (decoded length < 98% of raw length), skip all remaining single-byte encodings.
+    # Rationale: multi-byte decoders (CJK) have strict byte-sequence validation โ€” if they
+    # decode without error AND pass chaos probing with substantial multibyte content, the
+    # data is genuinely multibyte encoded. Single-byte encodings will always decode (every
+    # byte maps to something) but waste time on mess_ratio before failing.
+    # The 98% threshold prevents false triggers on files that happen to have a few valid
+    # multibyte pairs (e.g., cp424/_ude_1.txt where big5 decodes with 99% ratio).
+    mb_definitive_match_found: bool = False
 
     fallback_ascii: CharsetMatch | None = None
     fallback_u8: CharsetMatch | None = None
@@ -177,7 +235,7 @@ def from_bytes(
     if "utf_8" not in prioritized_encodings:
         prioritized_encodings.append("utf_8")
 
-    for encoding_iana in prioritized_encodings + IANA_SUPPORTED:
+    for encoding_iana in prioritized_encodings + IANA_SUPPORTED_MB_FIRST:
         if cp_isolation and encoding_iana not in cp_isolation:
             continue
 
@@ -210,9 +268,28 @@ def from_bytes(
             )
             continue
 
+        # Skip encodings similar to ones that already soft-failed (high mess ratio).
+        # Checked BEFORE the expensive decode attempt.
+        if encoding_iana in soft_failure_skip:
+            logger.log(
+                TRACE,
+                "%s is deemed too similar to a code page that was already considered unsuited. Continuing!",
+                encoding_iana,
+            )
+            continue
+
+        # Skip encodings that were already fast-tracked from a similar successful encoding.
+        if encoding_iana in success_fast_tracked:
+            logger.log(
+                TRACE,
+                "Skipping %s: already fast-tracked from a similar successful encoding.",
+                encoding_iana,
+            )
+            continue
+
         try:
             is_multi_byte_decoder: bool = is_multi_byte_encoding(encoding_iana)
-        except (ModuleNotFoundError, ImportError):
+        except (ModuleNotFoundError, ImportError):  # Defensive:
             logger.log(
                 TRACE,
                 "Encoding %s does not provide an IncrementalDecoder",
@@ -220,6 +297,55 @@ def from_bytes(
             )
             continue
 
+        # When we've already found a definitive match (chaos=0.0 with good coherence)
+        # after testing the prioritized encodings, skip encodings that target
+        # completely different language families. This avoids running expensive
+        # mess_ratio + coherence_ratio on clearly unrelated candidates (e.g., Cyrillic
+        # when the definitive match is Latin-based).
+        if definitive_match_found:
+            if not is_multi_byte_decoder:
+                enc_languages = set(encoding_languages(encoding_iana))
+            else:
+                enc_languages = set(mb_encoding_languages(encoding_iana))
+            if not enc_languages.intersection(definitive_target_languages):
+                logger.log(
+                    TRACE,
+                    "Skipping %s: definitive match already found, this encoding targets different languages (%s vs %s).",
+                    encoding_iana,
+                    enc_languages,
+                    definitive_target_languages,
+                )
+                continue
+
+        # After the definitive match, cap the number of additional same-family
+        # single-byte encodings that pass chaos probing. This avoids testing the
+        # tail of rare, low-value same-family encodings (mac_iceland, cp860, etc.)
+        # that almost never change best() but each cost ~1-2ms of mess_ratio + coherence.
+        if (
+            definitive_match_found
+            and not is_multi_byte_decoder
+            and post_definitive_sb_success_count >= POST_DEFINITIVE_SB_CAP
+        ):
+            logger.log(
+                TRACE,
+                "Skipping %s: already accumulated %d same-family results after definitive match (cap=%d).",
+                encoding_iana,
+                post_definitive_sb_success_count,
+                POST_DEFINITIVE_SB_CAP,
+            )
+            continue
+
+        # When a multibyte encoding with significant multibyte content has already
+        # passed chaos probing, skip all single-byte encodings. They will either fail
+        # chaos probing (wasting mess_ratio time) or produce inferior results.
+        if mb_definitive_match_found and not is_multi_byte_decoder:
+            logger.log(
+                TRACE,
+                "Skipping single-byte %s: multi-byte definitive match already found.",
+                encoding_iana,
+            )
+            continue
+
         try:
             if is_too_large_sequence and is_multi_byte_decoder is False:
                 str(
@@ -250,22 +376,6 @@ def from_bytes(
             tested_but_hard_failure.append(encoding_iana)
             continue
 
-        similar_soft_failure_test: bool = False
-
-        for encoding_soft_failed in tested_but_soft_failure:
-            if is_cp_similar(encoding_iana, encoding_soft_failed):
-                similar_soft_failure_test = True
-                break
-
-        if similar_soft_failure_test:
-            logger.log(
-                TRACE,
-                "%s is deemed too similar to code page %s and was consider unsuited already. Continuing!",
-                encoding_iana,
-                encoding_soft_failed,
-            )
-            continue
-
         r_ = range(
             0 if not bom_or_sig_available else len(sig_payload),
             length,
@@ -286,6 +396,108 @@ def from_bytes(
                 encoding_iana,
             )
 
+        # Payload-hash deduplication: if another encoding already decoded to the
+        # exact same string, reuse its mess_ratio and coherence results entirely.
+        # This is strictly more general than the old IANA_SUPPORTED_SIMILAR approach
+        # because it catches ALL identical decoding, not just pre-mapped ones.
+        if decoded_payload is not None and not is_multi_byte_decoder:
+            payload_hash: int = hash(decoded_payload)
+            cached = payload_result_cache.get(payload_hash)
+            if cached is not None:
+                cached_mess, cached_cd, cached_passed = cached
+                if cached_passed:
+                    # The previous encoding with identical output passed chaos probing.
+                    fast_match = CharsetMatch(
+                        sequences,
+                        encoding_iana,
+                        cached_mess,
+                        bom_or_sig_available,
+                        cached_cd,
+                        (
+                            decoded_payload
+                            if (
+                                is_too_large_sequence is False
+                                or encoding_iana
+                                in [specified_encoding, "ascii", "utf_8"]
+                            )
+                            else None
+                        ),
+                        preemptive_declaration=specified_encoding,
+                    )
+                    results.append(fast_match)
+                    success_fast_tracked.add(encoding_iana)
+                    logger.log(
+                        TRACE,
+                        "%s fast-tracked (identical decoded payload to a prior encoding, chaos=%f %%).",
+                        encoding_iana,
+                        round(cached_mess * 100, ndigits=3),
+                    )
+
+                    if (
+                        encoding_iana in [specified_encoding, "ascii", "utf_8"]
+                        and cached_mess < 0.1
+                    ):
+                        if cached_mess == 0.0:
+                            logger.debug(
+                                "Encoding detection: %s is most likely the one.",
+                                fast_match.encoding,
+                            )
+                            if explain:
+                                logger.removeHandler(explain_handler)
+                                logger.setLevel(previous_logger_level)
+                            return CharsetMatches([fast_match])
+                        early_stop_results.append(fast_match)
+
+                    if (
+                        len(early_stop_results)
+                        and (specified_encoding is None or specified_encoding in tested)
+                        and "ascii" in tested
+                        and "utf_8" in tested
+                    ):
+                        probable_result: CharsetMatch = early_stop_results.best()  # type: ignore[assignment]
+                        logger.debug(
+                            "Encoding detection: %s is most likely the one.",
+                            probable_result.encoding,
+                        )
+                        if explain:
+                            logger.removeHandler(explain_handler)
+                            logger.setLevel(previous_logger_level)
+                        return CharsetMatches([probable_result])
+
+                    continue
+                else:
+                    # The previous encoding with identical output failed chaos probing.
+                    tested_but_soft_failure.append(encoding_iana)
+                    logger.log(
+                        TRACE,
+                        "%s fast-skipped (identical decoded payload to a prior encoding that failed chaos probing).",
+                        encoding_iana,
+                    )
+                    # Prepare fallbacks for special encodings even when skipped.
+                    if enable_fallback and encoding_iana in [
+                        "ascii",
+                        "utf_8",
+                        specified_encoding,
+                        "utf_16",
+                        "utf_32",
+                    ]:
+                        fallback_entry = CharsetMatch(
+                            sequences,
+                            encoding_iana,
+                            threshold,
+                            bom_or_sig_available,
+                            [],
+                            decoded_payload,
+                            preemptive_declaration=specified_encoding,
+                        )
+                        if encoding_iana == specified_encoding:
+                            fallback_specified = fallback_entry
+                        elif encoding_iana == "ascii":
+                            fallback_ascii = fallback_entry
+                        else:
+                            fallback_u8 = fallback_entry
+                    continue
+
         max_chunk_gave_up: int = int(len(r_) / 4)
 
         max_chunk_gave_up = max(max_chunk_gave_up, 2)
@@ -358,6 +570,14 @@ def from_bytes(
         mean_mess_ratio: float = sum(md_ratios) / len(md_ratios) if md_ratios else 0.0
         if mean_mess_ratio >= threshold or early_stop_count >= max_chunk_gave_up:
             tested_but_soft_failure.append(encoding_iana)
+            if encoding_iana in IANA_SUPPORTED_SIMILAR:
+                soft_failure_skip.update(IANA_SUPPORTED_SIMILAR[encoding_iana])
+            # Cache this soft-failure so identical decoding from other encodings
+            # can be skipped immediately.
+            if decoded_payload is not None and not is_multi_byte_decoder:
+                payload_result_cache.setdefault(
+                    hash(decoded_payload), (mean_mess_ratio, [], False)
+                )
             logger.log(
                 TRACE,
                 "%s was excluded because of initial chaos probing. Gave up %i time(s). "
@@ -369,14 +589,15 @@ def from_bytes(
             # Preparing those fallbacks in case we got nothing.
             if (
                 enable_fallback
-                and encoding_iana in ["ascii", "utf_8", specified_encoding]
+                and encoding_iana
+                in ["ascii", "utf_8", specified_encoding, "utf_16", "utf_32"]
                 and not lazy_str_hard_failure
             ):
                 fallback_entry = CharsetMatch(
                     sequences,
                     encoding_iana,
                     threshold,
-                    False,
+                    bom_or_sig_available,
                     [],
                     decoded_payload,
                     preemptive_declaration=specified_encoding,
@@ -411,9 +632,14 @@ def from_bytes(
 
         cd_ratios = []
 
-        # We shall skip the CD when its about ASCII
-        # Most of the time its not relevant to run "language-detection" on it.
+        # Run coherence detection on all chunks. We previously tried limiting to
+        # 1-2 chunks for post-definitive encodings to save time, but this caused
+        # coverage regressions by producing unrepresentative coherence scores.
+        # The SB cap and language-family skip optimizations provide sufficient
+        # speedup without sacrificing coherence accuracy.
         if encoding_iana != "ascii":
+            # We shall skip the CD when its about ASCII
+            # Most of the time its not relevant to run "language-detection" on it.
             for chunk in md_chunks:
                 chunk_languages = coherence_ratio(
                     chunk,
@@ -422,8 +648,9 @@ def from_bytes(
                 )
 
                 cd_ratios.append(chunk_languages)
-
-        cd_ratios_merged = merge_coherence_ratios(cd_ratios)
+            cd_ratios_merged = merge_coherence_ratios(cd_ratios)
+        else:
+            cd_ratios_merged = merge_coherence_ratios(cd_ratios)
 
         if cd_ratios_merged:
             logger.log(
@@ -452,6 +679,25 @@ def from_bytes(
 
         results.append(current_match)
 
+        # Cache the successful result for payload-hash deduplication.
+        if decoded_payload is not None and not is_multi_byte_decoder:
+            payload_result_cache.setdefault(
+                hash(decoded_payload),
+                (mean_mess_ratio, cd_ratios_merged, True),
+            )
+
+        # Count post-definitive same-family SB successes for the early termination cap.
+        # Only count low-mess encodings (< 2%) toward the cap. High-mess encodings are
+        # marginal results that shouldn't prevent better-quality candidates from being
+        # tested. For example, iso8859_4 (mess=0%) should not be skipped just because
+        # 7 high-mess Latin encodings (cp1252 at 8%, etc.) were tried first.
+        if (
+            definitive_match_found
+            and not is_multi_byte_decoder
+            and mean_mess_ratio < 0.02
+        ):
+            post_definitive_sb_success_count += 1
+
         if (
             encoding_iana in [specified_encoding, "ascii", "utf_8"]
             and mean_mess_ratio < 0.1
@@ -475,10 +721,10 @@ def from_bytes(
             and "ascii" in tested
             and "utf_8" in tested
         ):
-            probable_result: CharsetMatch = early_stop_results.best()  # type: ignore[assignment]
+            probable_result = early_stop_results.best()  # type: ignore[assignment]
             logger.debug(
                 "Encoding detection: %s is most likely the one.",
-                probable_result.encoding,
+                probable_result.encoding,  # type: ignore[union-attr]
             )
             if explain:  # Defensive: ensure exit path clean handler
                 logger.removeHandler(explain_handler)
@@ -486,6 +732,66 @@ def from_bytes(
 
             return CharsetMatches([probable_result])
 
+        # Once we find a result with good coherence (>= 0.5) after testing the
+        # prioritized encodings (ascii, utf_8), activate "definitive mode": skip
+        # encodings that target completely different language families. This avoids
+        # running expensive mess_ratio + coherence_ratio on clearly unrelated
+        # candidates (e.g., Cyrillic encodings when the match is Latin-based).
+        # We require coherence >= 0.5 to avoid false positives (e.g., cp1251 decoding
+        # Hebrew text with 0.0 chaos but wrong language detection at coherence 0.33).
+        if not definitive_match_found and not is_multi_byte_decoder:
+            best_coherence = (
+                max((v for _, v in cd_ratios_merged), default=0.0)
+                if cd_ratios_merged
+                else 0.0
+            )
+            if best_coherence >= 0.5 and "ascii" in tested and "utf_8" in tested:
+                definitive_match_found = True
+                definitive_target_languages.update(target_languages)
+                logger.log(
+                    TRACE,
+                    "Definitive match found: %s (chaos=%.3f, coherence=%.2f). Encodings targeting different language families will be skipped.",
+                    encoding_iana,
+                    mean_mess_ratio,
+                    best_coherence,
+                )
+
+        # When a non-UTF multibyte encoding passes chaos probing with significant
+        # multibyte content (decoded < 98% of raw), activate mb_definitive_match.
+        # This skips all remaining single-byte encodings which would either soft-fail
+        # (running expensive mess_ratio for nothing) or produce inferior results.
+        if (
+            not mb_definitive_match_found
+            and is_multi_byte_decoder
+            and multi_byte_bonus
+            and decoded_payload is not None
+            and len(decoded_payload) < length * 0.98
+            and encoding_iana
+            not in {
+                "utf_8",
+                "utf_8_sig",
+                "utf_16",
+                "utf_16_be",
+                "utf_16_le",
+                "utf_32",
+                "utf_32_be",
+                "utf_32_le",
+                "utf_7",
+            }
+            and "ascii" in tested
+            and "utf_8" in tested
+        ):
+            mb_definitive_match_found = True
+            logger.log(
+                TRACE,
+                "Multi-byte definitive match: %s (chaos=%.3f, decoded=%d/%d=%.1f%%). Single-byte encodings will be skipped.",
+                encoding_iana,
+                mean_mess_ratio,
+                len(decoded_payload),
+                length,
+                len(decoded_payload) / length * 100,
+            )
+
         if encoding_iana == sig_encoding:
             logger.debug(
                 "Encoding detection: %s is most likely the one as we detected a BOM or SIG within "
diff --git a/libs/charset_normalizer/cd.py b/libs/charset_normalizer/cd.py
index 71a3ed5197..9545d35d1e 100644
--- a/libs/charset_normalizer/cd.py
+++ b/libs/charset_normalizer/cd.py
@@ -12,6 +12,8 @@
     LANGUAGE_SUPPORTED_COUNT,
     TOO_SMALL_SEQUENCE,
     ZH_NAMES,
+    _FREQUENCIES_SET,
+    _FREQUENCIES_RANK,
 )
 from .md import is_suspiciously_successive_range
 from .models import CoherenceMatches
@@ -29,7 +31,9 @@ def encoding_unicode_range(iana_name: str) -> list[str]:
     Return associated unicode ranges in a single byte code page.
     """
     if is_multi_byte_encoding(iana_name):
-        raise OSError("Function not supported on multi-byte code page")
+        raise OSError(  # Defensive:
+            "Function not supported on multi-byte code page"
+        )
 
     decoder = importlib.import_module(f"encodings.{iana_name}").IncrementalDecoder
 
@@ -142,6 +146,7 @@ def alphabet_languages(
     """
     languages: list[tuple[str, float]] = []
 
+    characters_set: frozenset[str] = frozenset(characters)
     source_have_accents = any(is_accentuated(character) for character in characters)
 
     for language, language_characters in FREQUENCIES.items():
@@ -155,9 +160,7 @@ def alphabet_languages(
 
         character_count: int = len(language_characters)
 
-        character_match_count: int = len(
-            [c for c in language_characters if c in characters]
-        )
+        character_match_count: int = len(_FREQUENCIES_SET[language] & characters_set)
 
         ratio: float = character_match_count / character_count
 
@@ -178,26 +181,46 @@ def characters_popularity_compare(
     Beware that is function is not strict on the match in order to ease the detection. (Meaning close match is 1.)
     """
     if language not in FREQUENCIES:
-        raise ValueError(f"{language} not available")
+        raise ValueError(f"{language} not available")  # Defensive:
 
     character_approved_count: int = 0
-    FREQUENCIES_language_set = set(FREQUENCIES[language])
+    frequencies_language_set: frozenset[str] = _FREQUENCIES_SET[language]
+    lang_rank: dict[str, int] = _FREQUENCIES_RANK[language]
 
     ordered_characters_count: int = len(ordered_characters)
     target_language_characters_count: int = len(FREQUENCIES[language])
 
     large_alphabet: bool = target_language_characters_count > 26
 
+    expected_projection_ratio: float = (
+        target_language_characters_count / ordered_characters_count
+    )
+
+    # Pre-built rank dict for ordered_characters (avoids repeated list slicing).
+    ordered_rank: dict[str, int] = {
+        char: rank for rank, char in enumerate(ordered_characters)
+    }
+
+    # Pre-compute characters common to both orderings.
+    # Avoids repeated `c in ordered_rank` dict lookups in the inner counts.
+    common_chars: list[tuple[int, int]] = [
+        (lr, ordered_rank[c]) for c, lr in lang_rank.items() if c in ordered_rank
+    ]
+
+    # Pre-extract lr and orr arrays for faster iteration in the inner loop.
+    # Plain integer loops with local arrays are much faster under mypyc than
+    # generator expression sums over a list of tuples.
+    common_count: int = len(common_chars)
+    common_lr: list[int] = [p[0] for p in common_chars]
+    common_orr: list[int] = [p[1] for p in common_chars]
+
     for character, character_rank in zip(
         ordered_characters, range(0, ordered_characters_count)
     ):
-        if character not in FREQUENCIES_language_set:
+        if character not in frequencies_language_set:
             continue
 
-        character_rank_in_language: int = FREQUENCIES[language].index(character)
-        expected_projection_ratio: float = (
-            target_language_characters_count / ordered_characters_count
-        )
+        character_rank_in_language: int = lang_rank[character]
         character_rank_projection: int = int(character_rank * expected_projection_ratio)
 
         if (
@@ -214,35 +237,36 @@ def characters_popularity_compare(
             character_approved_count += 1
             continue
 
-        characters_before_source: list[str] = FREQUENCIES[language][
-            0:character_rank_in_language
-        ]
-        characters_after_source: list[str] = FREQUENCIES[language][
-            character_rank_in_language:
-        ]
-        characters_before: list[str] = ordered_characters[0:character_rank]
-        characters_after: list[str] = ordered_characters[character_rank:]
-
-        before_match_count: int = len(
-            set(characters_before) & set(characters_before_source)
-        )
-
-        after_match_count: int = len(
-            set(characters_after) & set(characters_after_source)
-        )
-
-        if len(characters_before_source) == 0 and before_match_count <= 4:
+        # Count how many characters appear "before" in both orderings,
+        # and how many appear "at or after" in both orderings.
+        # Single pass over pre-extracted arrays โ€” much faster under mypyc
+        # than two generator expression sums.
+        before_match_count: int = 0
+        after_match_count: int = 0
+        for i in range(common_count):
+            lr_i: int = common_lr[i]
+            orr_i: int = common_orr[i]
+            if lr_i < character_rank_in_language:
+                if orr_i < character_rank:
+                    before_match_count += 1
+            else:
+                if orr_i >= character_rank:
+                    after_match_count += 1
+
+        after_len: int = target_language_characters_count - character_rank_in_language
+
+        if character_rank_in_language == 0 and before_match_count <= 4:
             character_approved_count += 1
             continue
 
-        if len(characters_after_source) == 0 and after_match_count <= 4:
+        if after_len == 0 and after_match_count <= 4:
             character_approved_count += 1
             continue
 
         if (
-            before_match_count / len(characters_before_source) >= 0.4
-            or after_match_count / len(characters_after_source) >= 0.4
-        ):
+            character_rank_in_language > 0
+            and before_match_count / character_rank_in_language >= 0.4
+        ) or (after_len > 0 and after_match_count / after_len >= 0.4):
             character_approved_count += 1
             continue
 
@@ -255,37 +279,72 @@ def alpha_unicode_split(decoded_sequence: str) -> list[str]:
     Ex. a text containing English/Latin with a bit a Hebrew will return two items in the resulting list;
     One containing the latin letters and the other hebrew.
     """
-    layers: dict[str, str] = {}
+    layers: dict[str, list[str]] = {}
+
+    # Fast path: track single-layer key to skip dict iteration for single-script text.
+    single_layer_key: str | None = None
+    multi_layer: bool = False
+
+    # Cache the last character_range and its resolved layer to avoid repeated
+    # is_suspiciously_successive_range calls for consecutive same-range chars.
+    prev_character_range: str | None = None
+    prev_layer_target: str | None = None
 
     for character in decoded_sequence:
         if character.isalpha() is False:
             continue
 
-        character_range: str | None = unicode_range(character)
+        # ASCII fast-path: a-z and A-Z are always "Basic Latin".
+        # Avoids unicode_range() function call overhead for the most common case.
+        character_ord: int = ord(character)
+        if character_ord < 128:
+            character_range: str | None = "Basic Latin"
+        else:
+            character_range = unicode_range(character)
 
         if character_range is None:
             continue
 
+        # Fast path: same range as previous character โ†’ reuse cached layer target.
+        if character_range == prev_character_range:
+            if prev_layer_target is not None:
+                layers[prev_layer_target].append(character)
+            continue
+
         layer_target_range: str | None = None
 
-        for discovered_range in layers:
+        if multi_layer:
+            for discovered_range in layers:
+                if (
+                    is_suspiciously_successive_range(discovered_range, character_range)
+                    is False
+                ):
+                    layer_target_range = discovered_range
+                    break
+        elif single_layer_key is not None:
             if (
-                is_suspiciously_successive_range(discovered_range, character_range)
+                is_suspiciously_successive_range(single_layer_key, character_range)
                 is False
             ):
-                layer_target_range = discovered_range
-                break
+                layer_target_range = single_layer_key
 
         if layer_target_range is None:
             layer_target_range = character_range
 
         if layer_target_range not in layers:
-            layers[layer_target_range] = character.lower()
-            continue
+            layers[layer_target_range] = []
+            if single_layer_key is None:
+                single_layer_key = layer_target_range
+            else:
+                multi_layer = True
+
+        layers[layer_target_range].append(character)
 
-        layers[layer_target_range] += character.lower()
+        # Cache for next iteration
+        prev_character_range = character_range
+        prev_layer_target = layer_target_range
 
-    return list(layers.values())
+    return ["".join(chars).lower() for chars in layers.values()]
 
 
 def merge_coherence_ratios(results: list[CoherenceMatches]) -> CoherenceMatches:
@@ -366,7 +425,7 @@ def coherence_ratio(
         sequence_frequencies: TypeCounter[str] = Counter(layer)
         most_common = sequence_frequencies.most_common()
 
-        character_count: int = sum(o for c, o in most_common)
+        character_count: int = len(layer)
 
         if character_count <= TOO_SMALL_SEQUENCE:
             continue
diff --git a/libs/charset_normalizer/cli/__main__.py b/libs/charset_normalizer/cli/__main__.py
index 64a290f2f8..ad843c1d0f 100644
--- a/libs/charset_normalizer/cli/__main__.py
+++ b/libs/charset_normalizer/cli/__main__.py
@@ -2,6 +2,7 @@
 
 import argparse
 import sys
+import typing
 from json import dumps
 from os.path import abspath, basename, dirname, join, realpath
 from platform import python_version
@@ -13,37 +14,78 @@
 from charset_normalizer.version import __version__
 
 
-def query_yes_no(question: str, default: str = "yes") -> bool:
-    """Ask a yes/no question via input() and return their answer.
+def query_yes_no(question: str, default: str = "yes") -> bool:  # Defensive:
+    """Ask a yes/no question via input() and return the answer as a bool."""
+    prompt = " [Y/n] " if default == "yes" else " [y/N] "
 
-    "question" is a string that is presented to the user.
-    "default" is the presumed answer if the user just hits <Enter>.
-        It must be "yes" (the default), "no" or None (meaning
-        an answer is required of the user).
+    while True:
+        choice = input(question + prompt).strip().lower()
+        if not choice:
+            return default == "yes"
+        if choice in ("y", "yes"):
+            return True
+        if choice in ("n", "no"):
+            return False
+        print("Please respond with 'y' or 'n'.")
+
+
+class FileType:
+    """Factory for creating file object types
 
-    The "answer" return value is True for "yes" or False for "no".
+    Instances of FileType are typically passed as type= arguments to the
+    ArgumentParser add_argument() method.
 
-    Credit goes to (c) https://stackoverflow.com/questions/3041986/apt-command-line-interface-like-yes-no-input
+    Keyword Arguments:
+        - mode -- A string indicating how the file is to be opened. Accepts the
+            same values as the builtin open() function.
+        - bufsize -- The file's desired buffer size. Accepts the same values as
+            the builtin open() function.
+        - encoding -- The file's encoding. Accepts the same values as the
+            builtin open() function.
+        - errors -- A string indicating how encoding and decoding errors are to
+            be handled. Accepts the same value as the builtin open() function.
+
+    Backported from CPython 3.12
     """
-    valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
-    if default is None:
-        prompt = " [y/n] "
-    elif default == "yes":
-        prompt = " [Y/n] "
-    elif default == "no":
-        prompt = " [y/N] "
-    else:
-        raise ValueError("invalid default answer: '%s'" % default)
 
-    while True:
-        sys.stdout.write(question + prompt)
-        choice = input().lower()
-        if default is not None and choice == "":
-            return valid[default]
-        elif choice in valid:
-            return valid[choice]
-        else:
-            sys.stdout.write("Please respond with 'yes' or 'no' " "(or 'y' or 'n').\n")
+    def __init__(
+        self,
+        mode: str = "r",
+        bufsize: int = -1,
+        encoding: str | None = None,
+        errors: str | None = None,
+    ):
+        self._mode = mode
+        self._bufsize = bufsize
+        self._encoding = encoding
+        self._errors = errors
+
+    def __call__(self, string: str) -> typing.IO:  # type: ignore[type-arg]
+        # the special argument "-" means sys.std{in,out}
+        if string == "-":
+            if "r" in self._mode:
+                return sys.stdin.buffer if "b" in self._mode else sys.stdin
+            elif any(c in self._mode for c in "wax"):
+                return sys.stdout.buffer if "b" in self._mode else sys.stdout
+            else:
+                msg = f'argument "-" with mode {self._mode}'
+                raise ValueError(msg)
+
+        # all other arguments are used as file names
+        try:
+            return open(string, self._mode, self._bufsize, self._encoding, self._errors)
+        except OSError as e:
+            message = f"can't open '{string}': {e}"
+            raise argparse.ArgumentTypeError(message)
+
+    def __repr__(self) -> str:
+        args = self._mode, self._bufsize
+        kwargs = [("encoding", self._encoding), ("errors", self._errors)]
+        args_str = ", ".join(
+            [repr(arg) for arg in args if arg != -1]
+            + [f"{kw}={arg!r}" for kw, arg in kwargs if arg is not None]
+        )
+        return f"{type(self).__name__}({args_str})"
 
 
 def cli_detect(argv: list[str] | None = None) -> int:
@@ -59,7 +101,7 @@ def cli_detect(argv: list[str] | None = None) -> int:
     )
 
     parser.add_argument(
-        "files", type=argparse.FileType("rb"), nargs="+", help="File(s) to be analysed"
+        "files", type=FileType("rb"), nargs="+", help="File(s) to be analysed"
     )
     parser.add_argument(
         "-v",
@@ -202,25 +244,24 @@ def cli_detect(argv: list[str] | None = None) -> int:
                 )
             )
         else:
-            x_.append(
-                CliDetectionResult(
-                    abspath(my_file.name),
-                    best_guess.encoding,
-                    best_guess.encoding_aliases,
-                    [
-                        cp
-                        for cp in best_guess.could_be_from_charset
-                        if cp != best_guess.encoding
-                    ],
-                    best_guess.language,
-                    best_guess.alphabets,
-                    best_guess.bom,
-                    best_guess.percent_chaos,
-                    best_guess.percent_coherence,
-                    None,
-                    True,
-                )
+            cli_result = CliDetectionResult(
+                abspath(my_file.name),
+                best_guess.encoding,
+                best_guess.encoding_aliases,
+                [
+                    cp
+                    for cp in best_guess.could_be_from_charset
+                    if cp != best_guess.encoding
+                ],
+                best_guess.language,
+                best_guess.alphabets,
+                best_guess.bom,
+                best_guess.percent_chaos,
+                best_guess.percent_coherence,
+                None,
+                True,
             )
+            x_.append(cli_result)
 
             if len(matches) > 1 and args.alternatives:
                 for el in matches:
@@ -281,11 +322,11 @@ def cli_detect(argv: list[str] | None = None) -> int:
                     continue
 
                 try:
-                    x_[0].unicode_path = join(dir_path, ".".join(o_))
+                    cli_result.unicode_path = join(dir_path, ".".join(o_))
 
-                    with open(x_[0].unicode_path, "wb") as fp:
+                    with open(cli_result.unicode_path, "wb") as fp:
                         fp.write(best_guess.output())
-                except OSError as e:
+                except OSError as e:  # Defensive:
                     print(str(e), file=sys.stderr)
                     if my_file.closed is False:
                         my_file.close()
@@ -317,5 +358,5 @@ def cli_detect(argv: list[str] | None = None) -> int:
     return 0
 
 
-if __name__ == "__main__":
+if __name__ == "__main__":  # Defensive:
     cli_detect()
diff --git a/libs/charset_normalizer/constant.py b/libs/charset_normalizer/constant.py
index 1fb9508d2a..6ed7795675 100644
--- a/libs/charset_normalizer/constant.py
+++ b/libs/charset_normalizer/constant.py
@@ -25,7 +25,7 @@
 
 UTF8_MAXIMAL_ALLOCATION: int = 1_112_064
 
-# Up-to-date Unicode ucd/15.0.0
+# Up-to-date Unicode ucd/17.0.0
 UNICODE_RANGES_COMBINED: dict[str, range] = {
     "Control character": range(32),
     "Basic Latin": range(32, 128),
@@ -213,6 +213,7 @@
     "Elbasan": range(66816, 66864),
     "Caucasian Albanian": range(66864, 66928),
     "Vithkuqi": range(66928, 67008),
+    "Todhri": range(67008, 67072),
     "Linear A": range(67072, 67456),
     "Latin Extended-F": range(67456, 67520),
     "Cypriot Syllabary": range(67584, 67648),
@@ -222,6 +223,7 @@
     "Hatran": range(67808, 67840),
     "Phoenician": range(67840, 67872),
     "Lydian": range(67872, 67904),
+    "Sidetic": range(67904, 67936),
     "Meroitic Hieroglyphs": range(67968, 68000),
     "Meroitic Cursive": range(68000, 68096),
     "Kharoshthi": range(68096, 68192),
@@ -235,6 +237,7 @@
     "Old Turkic": range(68608, 68688),
     "Old Hungarian": range(68736, 68864),
     "Hanifi Rohingya": range(68864, 68928),
+    "Garay": range(68928, 69008),
     "Rumi Numeral Symbols": range(69216, 69248),
     "Yezidi": range(69248, 69312),
     "Arabic Extended-C": range(69312, 69376),
@@ -254,12 +257,14 @@
     "Multani": range(70272, 70320),
     "Khudawadi": range(70320, 70400),
     "Grantha": range(70400, 70528),
+    "Tulu-Tigalari": range(70528, 70656),
     "Newa": range(70656, 70784),
     "Tirhuta": range(70784, 70880),
     "Siddham": range(71040, 71168),
     "Modi": range(71168, 71264),
     "Mongolian Supplement": range(71264, 71296),
     "Takri": range(71296, 71376),
+    "Myanmar Extended-C": range(71376, 71424),
     "Ahom": range(71424, 71504),
     "Dogra": range(71680, 71760),
     "Warang Citi": range(71840, 71936),
@@ -270,10 +275,13 @@
     "Unified Canadian Aboriginal Syllabics Extended-A": range(72368, 72384),
     "Pau Cin Hau": range(72384, 72448),
     "Devanagari Extended-A": range(72448, 72544),
+    "Sharada Supplement": range(72544, 72576),
+    "Sunuwar": range(72640, 72704),
     "Bhaiksuki": range(72704, 72816),
     "Marchen": range(72816, 72896),
     "Masaram Gondi": range(72960, 73056),
     "Gunjala Gondi": range(73056, 73136),
+    "Tolong Siki": range(73136, 73200),
     "Makasar": range(73440, 73472),
     "Kawi": range(73472, 73568),
     "Lisu Supplement": range(73648, 73664),
@@ -284,19 +292,24 @@
     "Cypro-Minoan": range(77712, 77824),
     "Egyptian Hieroglyphs": range(77824, 78896),
     "Egyptian Hieroglyph Format Controls": range(78896, 78944),
+    "Egyptian Hieroglyphs Extended-A": range(78944, 82944),
     "Anatolian Hieroglyphs": range(82944, 83584),
+    "Gurung Khema": range(90368, 90432),
     "Bamum Supplement": range(92160, 92736),
     "Mro": range(92736, 92784),
     "Tangsa": range(92784, 92880),
     "Bassa Vah": range(92880, 92928),
     "Pahawh Hmong": range(92928, 93072),
+    "Kirat Rai": range(93504, 93568),
     "Medefaidrin": range(93760, 93856),
+    "Beria Erfe": range(93856, 93920),
     "Miao": range(93952, 94112),
     "Ideographic Symbols and Punctuation": range(94176, 94208),
     "Tangut": range(94208, 100352),
     "Tangut Components": range(100352, 101120),
     "Khitan Small Script": range(101120, 101632),
     "Tangut Supplement": range(101632, 101760),
+    "Tangut Components Supplement": range(101760, 101888),
     "Kana Extended-B": range(110576, 110592),
     "Kana Supplement": range(110592, 110848),
     "Kana Extended-A": range(110848, 110896),
@@ -304,6 +317,8 @@
     "Nushu": range(110960, 111360),
     "Duployan": range(113664, 113824),
     "Shorthand Format Controls": range(113824, 113840),
+    "Symbols for Legacy Computing Supplement": range(117760, 118464),
+    "Miscellaneous Symbols Supplement": range(118464, 118528),
     "Znamenny Musical Notation": range(118528, 118736),
     "Byzantine Musical Symbols": range(118784, 119040),
     "Musical Symbols": range(119040, 119296),
@@ -321,6 +336,8 @@
     "Toto": range(123536, 123584),
     "Wancho": range(123584, 123648),
     "Nag Mundari": range(124112, 124160),
+    "Ol Onal": range(124368, 124416),
+    "Tai Yo": range(124608, 124672),
     "Ethiopic Extended-B": range(124896, 124928),
     "Mende Kikakui": range(124928, 125152),
     "Adlam": range(125184, 125280),
@@ -333,7 +350,7 @@
     "Enclosed Alphanumeric Supplement": range(127232, 127488),
     "Enclosed Ideographic Supplement": range(127488, 127744),
     "Miscellaneous Symbols and Pictographs": range(127744, 128512),
-    "Emoticons range(Emoji)": range(128512, 128592),
+    "Emoticons": range(128512, 128592),
     "Ornamental Dingbats": range(128592, 128640),
     "Transport and Map Symbols": range(128640, 128768),
     "Alchemical Symbols": range(128768, 128896),
@@ -348,9 +365,11 @@
     "CJK Unified Ideographs Extension D": range(177984, 178208),
     "CJK Unified Ideographs Extension E": range(178208, 183984),
     "CJK Unified Ideographs Extension F": range(183984, 191472),
+    "CJK Unified Ideographs Extension I": range(191472, 192096),
     "CJK Compatibility Ideographs Supplement": range(194560, 195104),
     "CJK Unified Ideographs Extension G": range(196608, 201552),
     "CJK Unified Ideographs Extension H": range(201552, 205744),
+    "CJK Unified Ideographs Extension J": range(205744, 210048),
     "Tags": range(917504, 917632),
     "Variation Selectors Supplement": range(917760, 918000),
     "Supplementary Private Use Area-A": range(983040, 1048576),
@@ -529,29 +548,48 @@
 }
 
 
-COMMON_SAFE_ASCII_CHARACTERS: set[str] = {
-    "<",
-    ">",
-    "=",
-    ":",
-    "/",
-    "&",
-    ";",
-    "{",
-    "}",
-    "[",
-    "]",
-    ",",
-    "|",
-    '"',
-    "-",
-    "(",
-    ")",
-}
+COMMON_SAFE_ASCII_CHARACTERS: frozenset[str] = frozenset(
+    {
+        "<",
+        ">",
+        "=",
+        ":",
+        "/",
+        "&",
+        ";",
+        "{",
+        "}",
+        "[",
+        "]",
+        ",",
+        "|",
+        '"',
+        "-",
+        "(",
+        ")",
+    }
+)
+
+# Sample character sets โ€” replace with full lists if needed
+COMMON_CHINESE_CHARACTERS = "็š„ไธ€ๆ˜ฏๅœจไธไบ†ๆœ‰ๅ’Œไบบ่ฟ™ไธญๅคงไธบไธŠไธชๅ›ฝๆˆ‘ไปฅ่ฆไป–ๆ—ถๆฅ็”จไปฌ็”ŸๅˆฐไฝœๅœฐไบŽๅ‡บๅฐฑๅˆ†ๅฏนๆˆไผšๅฏไธปๅ‘ๅนดๅŠจๅŒๅทฅไนŸ่ƒฝไธ‹่ฟ‡ๅญ่ฏดไบง็ง้ข่€Œๆ–นๅŽๅคšๅฎš่กŒๅญฆๆณ•ๆ‰€ๆฐ‘ๅพ—็ปๅไธ‰ไน‹่ฟ›็€็ญ‰้ƒจๅบฆๅฎถ็”ตๅŠ›้‡Œๅฆ‚ๆฐดๅŒ–้ซ˜่‡ชไบŒ็†่ตทๅฐ็‰ฉ็ŽฐๅฎžๅŠ ้‡้ƒฝไธคไฝ“ๅˆถๆœบๅฝ“ไฝฟ็‚นไปŽไธšๆœฌๅŽปๆŠŠๆ€งๅฅฝๅบ”ๅผ€ๅฎƒๅˆ่ฟ˜ๅ› ็”ฑๅ…ถไบ›็„ถๅ‰ๅค–ๅคฉๆ”ฟๅ››ๆ—ฅ้‚ฃ็คพไน‰ไบ‹ๅนณๅฝข็›ธๅ…จ่กจ้—ดๆ ทไธŽๅ…ณๅ„้‡ๆ–ฐ็บฟๅ†…ๆ•ฐๆญฃๅฟƒๅไฝ ๆ˜Ž็œ‹ๅŽŸๅˆไนˆๅˆฉๆฏ”ๆˆ–ไฝ†่ดจๆฐ”็ฌฌๅ‘้“ๅ‘ฝๆญคๅ˜ๆกๅชๆฒก็ป“่งฃ้—ฎๆ„ๅปบๆœˆๅ…ฌๆ— ็ณปๅ†›ๅพˆๆƒ…่€…ๆœ€็ซ‹ไปฃๆƒณๅทฒ้€šๅนถๆ็›ด้ข˜ๅ…š็จ‹ๅฑ•ไบ”ๆžœๆ–™่ฑกๅ‘˜้ฉไฝๅ…ฅๅธธๆ–‡ๆ€ปๆฌกๅ“ๅผๆดป่ฎพๅŠ็ฎก็‰นไปถ้•ฟๆฑ‚่€ๅคดๅŸบ่ต„่พนๆต่ทฏ็บงๅฐ‘ๅ›พๅฑฑ็ปŸๆŽฅ็Ÿฅ่พƒๅฐ†็ป„่ง่ฎกๅˆซๅฅนๆ‰‹่ง’ๆœŸๆ น่ฎบ่ฟๅ†œๆŒ‡ๅ‡ ไนๅŒบๅผบๆ”พๅ†ณ่ฅฟ่ขซๅนฒๅšๅฟ…ๆˆ˜ๅ…ˆๅ›žๅˆ™ไปปๅ–ๆฎๅค„้˜Ÿๅ—็ป™่‰ฒๅ…‰้—จๅณไฟๆฒปๅŒ—้€ ็™พ่ง„็ƒญ้ข†ไธƒๆตทๅฃไธœๅฏผๅ™จๅŽ‹ๅฟ—ไธ–้‡‘ๅขžไบ‰ๆตŽ้˜ถๆฒนๆ€ๆœฏๆžไบคๅ—่”ไป€่ฎคๅ…ญๅ…ฑๆƒๆ”ถ่ฏๆ”นๆธ…ๅทฑ็พŽๅ†้‡‡่ฝฌๆ›ดๅ•้ฃŽๅˆ‡ๆ‰“็™ฝๆ•™้€Ÿ่Šฑๅธฆๅฎ‰ๅœบ่บซ่ฝฆไพ‹็œŸๅŠกๅ…ทไธ‡ๆฏ็›ฎ่‡ณ่พพ่ตฐ็งฏ็คบ่ฎฎๅฃฐๆŠฅๆ–—ๅฎŒ็ฑปๅ…ซ็ฆปๅŽๅ็กฎๆ‰็ง‘ๅผ ไฟก้ฉฌ่Š‚่ฏ็ฑณๆ•ด็ฉบๅ…ƒๅ†ตไปŠ้›†ๆธฉไผ ๅœŸ่ฎธๆญฅ็พคๅนฟ็Ÿณ่ฎฐ้œ€ๆฎต็ ”็•Œๆ‹‰ๆž—ๅพ‹ๅซไธ”็ฉถ่ง‚่ถŠ็ป‡่ฃ…ๅฝฑ็ฎ—ไฝŽๆŒ้Ÿณไผ—ไนฆๅธƒๅคๅฎนๅ„ฟ้กป้™…ๅ•†้ž้ชŒ่ฟžๆ–ญๆทฑ้šพ่ฟ‘็Ÿฟๅƒๅ‘จๅง”็ด ๆŠ€ๅค‡ๅŠๅŠž้’็œๅˆ—ไน ๅ“็บฆๆ”ฏ่ˆฌๅฒๆ„ŸๅŠณไพฟๅ›ขๅพ€้…ธๅŽ†ๅธ‚ๅ…‹ไฝ•้™คๆถˆๆž„ๅบœๅคชๅ‡†็ฒพๅ€ผๅท็Ž‡ๆ—็ปดๅˆ’้€‰ๆ ‡ๅ†™ๅญ˜ๅ€™ๆฏ›ไบฒๅฟซๆ•ˆๆ–ฏ้™ขๆŸฅๆฑŸๅž‹็œผ็Ž‹ๆŒ‰ๆ ผๅ…ปๆ˜“็ฝฎๆดพๅฑ‚็‰‡ๅง‹ๅดไธ“็Šถ่‚ฒๅŽ‚ไบฌ่ฏ†้€‚ๅฑžๅœ†ๅŒ…็ซไฝ่ฐƒๆปกๅŽฟๅฑ€็…งๅ‚็บข็ป†ๅผ•ๅฌ่ฏฅ้“ไปทไธฅ้พ™้ฃž"
 
+COMMON_JAPANESE_CHARACTERS = "ๆ—ฅไธ€ๅ›ฝๅนดๅคงๅไบŒๆœฌไธญ้•ทๅ‡บไธ‰ๆ™‚่กŒ่ฆ‹ๆœˆๅˆ†ๅพŒๅ‰็”Ÿไบ”้–“ไธŠๆฑๅ››ไปŠ้‡‘ไนๅ…ฅๅญฆ้ซ˜ๅ††ๅญๅค–ๅ…ซๅ…ญไธ‹ๆฅๆฐ—ๅฐไธƒๅฑฑ่ฉฑๅฅณๅŒ—ๅˆ็™พๆ›ธๅ…ˆๅๅทๅƒๆฐดๅŠ็”ท่ฅฟ้›ปๆ ก่ชžๅœŸๆœจ่ž้ฃŸ่ปŠไฝ•ๅ—ไธ‡ๆฏŽ็™ฝๅคฉๆฏ็ซๅณ่ชญๅ‹ๅทฆไผ‘็ˆถ้›จ"
 
-KO_NAMES: set[str] = {"johab", "cp949", "euc_kr"}
-ZH_NAMES: set[str] = {"big5", "cp950", "big5hkscs", "hz"}
+COMMON_KOREAN_CHARACTERS = "ไธ€ไบŒไธ‰ๅ››ไบ”ๅ…ญไธƒๅ…ซไนๅ็™พๅƒ่ฌไธŠไธ‹ๅทฆๅณไธญไบบๅฅณๅญๅคงๅฐๅฑฑๅทๆ—ฅๆœˆ็ซๆฐดๆœจ้‡‘ๅœŸ็ˆถๆฏๅคฉๅœฐๅœ‹ๅๅนดๆ™‚ๆ–‡ๆ กๅญธ็”Ÿ"
+
+# Combine all into a frozenset
+COMMON_CJK_CHARACTERS = frozenset(
+    "".join(
+        [
+            COMMON_CHINESE_CHARACTERS,
+            COMMON_JAPANESE_CHARACTERS,
+            COMMON_KOREAN_CHARACTERS,
+        ]
+    )
+)
+
+KO_NAMES: frozenset[str] = frozenset({"johab", "cp949", "euc_kr"})
+ZH_NAMES: frozenset[str] = frozenset({"big5", "cp950", "big5hkscs", "hz"})
 
 # Logging LEVEL below DEBUG
 TRACE: int = 5
@@ -786,12 +824,12 @@
     ],
     "Russian": [
         "ะพ",
-        "ะฐ",
         "ะต",
+        "ะฐ",
         "ะธ",
         "ะฝ",
-        "ั",
         "ั‚",
+        "ั",
         "ั€",
         "ะฒ",
         "ะป",
@@ -814,106 +852,85 @@
     ],
     # Jap-Kanji
     "Japanese": [
-        "ไบบ",
+        "ๆ—ฅ",
         "ไธ€",
+        "ไบบ",
+        "ๅนด",
         "ๅคง",
-        "ไบ…",
-        "ไธ",
-        "ไธจ",
-        "็ซน",
-        "็ฌ‘",
-        "ๅฃ",
-        "ๆ—ฅ",
-        "ไปŠ",
-        "ไบŒ",
-        "ๅฝณ",
-        "่กŒ",
         "ๅ",
-        "ๅœŸ",
-        "ไธถ",
-        "ๅฏธ",
-        "ๅฏบ",
+        "ไบŒ",
+        "ๆœฌ",
+        "ไธญ",
+        "้•ท",
+        "ๅ‡บ",
+        "ไธ‰",
         "ๆ™‚",
-        "ไน™",
-        "ไธฟ",
-        "ไน‚",
-        "ๆฐ”",
-        "ๆฐ—",
-        "ๅ†‚",
-        "ๅทพ",
-        "ไบ ",
-        "ๅธ‚",
-        "็›ฎ",
-        "ๅ„ฟ",
+        "่กŒ",
         "่ฆ‹",
-        "ๅ…ซ",
-        "ๅฐ",
-        "ๅ‡ต",
-        "็œŒ",
         "ๆœˆ",
-        "ๅฝ",
-        "้–€",
-        "้–“",
-        "ๆœจ",
-        "ๆฑ",
-        "ๅฑฑ",
-        "ๅ‡บ",
-        "ๆœฌ",
-        "ไธญ",
-        "ๅˆ€",
         "ๅˆ†",
-        "่€ณ",
-        "ๅˆ",
-        "ๅ–",
-        "ๆœ€",
-        "่จ€",
-        "็”ฐ",
-        "ๅฟƒ",
-        "ๆ€",
-        "ๅˆ‚",
+        "ๅพŒ",
         "ๅ‰",
-        "ไบฌ",
-        "ๅฐน",
-        "ไบ‹",
         "็”Ÿ",
-        "ๅŽถ",
-        "ไบ‘",
-        "ไผš",
-        "ๆœช",
-        "ๆฅ",
-        "็™ฝ",
-        "ๅ†ซ",
-        "ๆฅฝ",
-        "็ฌ",
-        "้ฆฌ",
-        "ๅฐธ",
-        "ๅฐบ",
-        "้ง…",
-        "ๆ˜Ž",
-        "่€‚",
-        "่€…",
-        "ไบ†",
-        "้˜",
-        "้ƒฝ",
-        "้ซ˜",
-        "ๅœ",
-        "ๅ ",
-        "ๅŽ‚",
-        "ๅนฟ",
-        "ๅบ—",
-        "ๅญ",
-        "็”ณ",
-        "ๅฅ„",
-        "ไบป",
-        "ไฟบ",
+        "ไบ”",
+        "้–“",
         "ไธŠ",
-        "ๆ–น",
-        "ๅ†–",
+        "ๆฑ",
+        "ๅ››",
+        "ไปŠ",
+        "้‡‘",
+        "ไน",
+        "ๅ…ฅ",
         "ๅญฆ",
-        "่กฃ",
-        "่‰ฎ",
+        "้ซ˜",
+        "ๅ††",
+        "ๅญ",
+        "ๅค–",
+        "ๅ…ซ",
+        "ๅ…ญ",
+        "ไธ‹",
+        "ๆฅ",
+        "ๆฐ—",
+        "ๅฐ",
+        "ไธƒ",
+        "ๅฑฑ",
+        "่ฉฑ",
+        "ๅฅณ",
+        "ๅŒ—",
+        "ๅˆ",
+        "็™พ",
+        "ๆ›ธ",
+        "ๅ…ˆ",
+        "ๅ",
+        "ๅท",
+        "ๅƒ",
+        "ๆฐด",
+        "ๅŠ",
+        "็”ท",
+        "่ฅฟ",
+        "้›ป",
+        "ๆ ก",
+        "่ชž",
+        "ๅœŸ",
+        "ๆœจ",
+        "่ž",
         "้ฃŸ",
-        "่‡ช",
+        "่ปŠ",
+        "ไฝ•",
+        "ๅ—",
+        "ไธ‡",
+        "ๆฏŽ",
+        "็™ฝ",
+        "ๅคฉ",
+        "ๆฏ",
+        "็ซ",
+        "ๅณ",
+        "่ชญ",
+        "ๅ‹",
+        "ๅทฆ",
+        "ไผ‘",
+        "็ˆถ",
+        "้›จ",
     ],
     # Jap-Katakana
     "Japaneseโ€”": [
@@ -1996,3 +2013,38 @@
 }
 
 LANGUAGE_SUPPORTED_COUNT: int = len(FREQUENCIES)
+
+# Bit flags for unified character classification.
+# A single unicodedata.name() call sets all relevant flags at once.
+_LATIN: int = 1
+_ACCENTUATED: int = 1 << 1
+_CJK: int = 1 << 2
+_HANGUL: int = 1 << 3
+_KATAKANA: int = 1 << 4
+_HIRAGANA: int = 1 << 5
+_THAI: int = 1 << 6
+_ARABIC: int = 1 << 7
+_ARABIC_ISOLATED_FORM: int = 1 << 8
+
+_ACCENT_KEYWORDS: tuple[str, ...] = (
+    "WITH GRAVE",
+    "WITH ACUTE",
+    "WITH CEDILLA",
+    "WITH DIAERESIS",
+    "WITH CIRCUMFLEX",
+    "WITH TILDE",
+    "WITH MACRON",
+    "WITH RING ABOVE",
+)
+
+# Pre-built lookup structures for FREQUENCIES (computed once at import time).
+# character -> rank mapping per language (replaces list .index() calls).
+_FREQUENCIES_RANK: dict[str, dict[str, int]] = {
+    lang: {char: rank for rank, char in enumerate(chars)}
+    for lang, chars in FREQUENCIES.items()
+}
+
+# frozenset per language (avoids rebuilding set() per call).
+_FREQUENCIES_SET: dict[str, frozenset[str]] = {
+    lang: frozenset(chars) for lang, chars in FREQUENCIES.items()
+}
diff --git a/libs/charset_normalizer/legacy.py b/libs/charset_normalizer/legacy.py
index a2f5345141..293c1efaf0 100644
--- a/libs/charset_normalizer/legacy.py
+++ b/libs/charset_normalizer/legacy.py
@@ -4,11 +4,10 @@
 from warnings import warn
 
 from .api import from_bytes
-from .constant import CHARDET_CORRESPONDENCE
+from .constant import CHARDET_CORRESPONDENCE, TOO_SMALL_SEQUENCE
 
-# TODO: remove this check when dropping Python 3.7 support
 if TYPE_CHECKING:
-    from typing_extensions import TypedDict
+    from typing import TypedDict
 
     class ResultDict(TypedDict):
         encoding: str | None
@@ -37,9 +36,7 @@ def detect(
 
     if not isinstance(byte_str, (bytearray, bytes)):
         raise TypeError(  # pragma: nocover
-            "Expected object of type bytes or bytearray, got: " "{}".format(
-                type(byte_str)
-            )
+            f"Expected object of type bytes or bytearray, got: {type(byte_str)}"
         )
 
     if isinstance(byte_str, bytearray):
@@ -51,6 +48,22 @@ def detect(
     language = r.language if r is not None and r.language != "Unknown" else ""
     confidence = 1.0 - r.chaos if r is not None else None
 
+    # automatically lower confidence
+    # on small bytes samples.
+    # https://github.com/jawah/charset_normalizer/issues/391
+    if (
+        confidence is not None
+        and confidence >= 0.9
+        and encoding
+        not in {
+            "utf_8",
+            "ascii",
+        }
+        and r.bom is False  # type: ignore[union-attr]
+        and len(byte_str) < TOO_SMALL_SEQUENCE
+    ):
+        confidence -= 0.2
+
     # Note: CharsetNormalizer does not return 'UTF-8-SIG' as the sig get stripped in the detection/normalization process
     # but chardet does return 'utf-8-sig' and it is a valid codec name.
     if r is not None and encoding == "utf_8" and r.bom:
diff --git a/libs/charset_normalizer/md.py b/libs/charset_normalizer/md.py
index 9ed59a868d..b41d9cfc57 100644
--- a/libs/charset_normalizer/md.py
+++ b/libs/charset_normalizer/md.py
@@ -1,33 +1,207 @@
 from __future__ import annotations
 
+import sys
 from functools import lru_cache
 from logging import getLogger
 
+if sys.version_info >= (3, 8):
+    from typing import final
+else:
+    try:
+        from typing_extensions import final
+    except ImportError:
+
+        def final(cls):  # type: ignore[misc,no-untyped-def]
+            return cls
+
+
 from .constant import (
+    COMMON_CJK_CHARACTERS,
     COMMON_SAFE_ASCII_CHARACTERS,
     TRACE,
     UNICODE_SECONDARY_RANGE_KEYWORD,
+    _ACCENTUATED,
+    _ARABIC,
+    _ARABIC_ISOLATED_FORM,
+    _CJK,
+    _HANGUL,
+    _HIRAGANA,
+    _KATAKANA,
+    _LATIN,
+    _THAI,
 )
 from .utils import (
-    is_accentuated,
-    is_arabic,
-    is_arabic_isolated_form,
-    is_case_variable,
-    is_cjk,
+    _character_flags,
     is_emoticon,
-    is_hangul,
-    is_hiragana,
-    is_katakana,
-    is_latin,
     is_punctuation,
     is_separator,
     is_symbol,
-    is_thai,
-    is_unprintable,
     remove_accent,
     unicode_range,
 )
 
+# Combined bitmask for CJK/Hangul/Katakana/Hiragana/Thai glyph detection.
+_GLYPH_MASK: int = _CJK | _HANGUL | _KATAKANA | _HIRAGANA | _THAI
+
+
+@final
+class CharInfo:
+    """Pre-computed character properties shared across all detectors.
+
+    Instantiated once and reused via :meth:`update` on every character
+    in the hot loop so that redundant calls to str methods
+    (``isalpha``, ``isupper``, โ€ฆ) and cached utility functions
+    (``_character_flags``, ``is_punctuation``, โ€ฆ) are avoided when
+    several plugins need the same information.
+    """
+
+    __slots__ = (
+        "character",
+        "printable",
+        "alpha",
+        "upper",
+        "lower",
+        "space",
+        "digit",
+        "is_ascii",
+        "case_variable",
+        "flags",
+        "accentuated",
+        "latin",
+        "is_cjk",
+        "is_arabic",
+        "is_glyph",
+        "punct",
+        "sym",
+    )
+
+    def __init__(self) -> None:
+        self.character: str = ""
+        self.printable: bool = False
+        self.alpha: bool = False
+        self.upper: bool = False
+        self.lower: bool = False
+        self.space: bool = False
+        self.digit: bool = False
+        self.is_ascii: bool = False
+        self.case_variable: bool = False
+        self.flags: int = 0
+        self.accentuated: bool = False
+        self.latin: bool = False
+        self.is_cjk: bool = False
+        self.is_arabic: bool = False
+        self.is_glyph: bool = False
+        self.punct: bool = False
+        self.sym: bool = False
+
+    def update(self, character: str) -> None:
+        """Update all properties for *character* (called once per character)."""
+        self.character = character
+
+        # ASCII fast-path: for characters with ord < 128, we can skip
+        # _character_flags() entirely and derive most properties from ord.
+        o: int = ord(character)
+        if o < 128:
+            self.is_ascii = True
+            self.accentuated = False
+            self.is_cjk = False
+            self.is_arabic = False
+            self.is_glyph = False
+            # ASCII alpha: a-z (97-122) or A-Z (65-90)
+            if 65 <= o <= 90:
+                # Uppercase ASCII letter
+                self.alpha = True
+                self.upper = True
+                self.lower = False
+                self.space = False
+                self.digit = False
+                self.printable = True
+                self.case_variable = True
+                self.flags = _LATIN
+                self.latin = True
+                self.punct = False
+                self.sym = False
+            elif 97 <= o <= 122:
+                # Lowercase ASCII letter
+                self.alpha = True
+                self.upper = False
+                self.lower = True
+                self.space = False
+                self.digit = False
+                self.printable = True
+                self.case_variable = True
+                self.flags = _LATIN
+                self.latin = True
+                self.punct = False
+                self.sym = False
+            elif 48 <= o <= 57:
+                # ASCII digit 0-9
+                self.alpha = False
+                self.upper = False
+                self.lower = False
+                self.space = False
+                self.digit = True
+                self.printable = True
+                self.case_variable = False
+                self.flags = 0
+                self.latin = False
+                self.punct = False
+                self.sym = False
+            elif o == 32 or (9 <= o <= 13):
+                # Space, tab, newline, etc.
+                self.alpha = False
+                self.upper = False
+                self.lower = False
+                self.space = True
+                self.digit = False
+                self.printable = o == 32
+                self.case_variable = False
+                self.flags = 0
+                self.latin = False
+                self.punct = False
+                self.sym = False
+            else:
+                # Other ASCII (punctuation, symbols, control chars)
+                self.printable = character.isprintable()
+                self.alpha = False
+                self.upper = False
+                self.lower = False
+                self.space = False
+                self.digit = False
+                self.case_variable = False
+                self.flags = 0
+                self.latin = False
+                self.punct = is_punctuation(character) if self.printable else False
+                self.sym = is_symbol(character) if self.printable else False
+        else:
+            # Non-ASCII path
+            self.is_ascii = False
+            self.printable = character.isprintable()
+            self.alpha = character.isalpha()
+            self.upper = character.isupper()
+            self.lower = character.islower()
+            self.space = character.isspace()
+            self.digit = character.isdigit()
+            self.case_variable = self.lower != self.upper
+
+            # Flag-based classification (single unicodedata.name() call, lru-cached)
+            flags: int
+            if self.alpha:
+                flags = _character_flags(character)
+            else:
+                flags = 0
+            self.flags = flags
+            self.accentuated = bool(flags & _ACCENTUATED)
+            self.latin = bool(flags & _LATIN)
+            self.is_cjk = bool(flags & _CJK)
+            self.is_arabic = bool(flags & _ARABIC)
+            self.is_glyph = bool(flags & _GLYPH_MASK)
+
+            # Eagerly compute punct and sym (avoids property dispatch overhead
+            # on 300K+ accesses in the hot loop).
+            self.punct = is_punctuation(character) if self.printable else False
+            self.sym = is_symbol(character) if self.printable else False
+
 
 class MessDetectorPlugin:
     """
@@ -35,20 +209,16 @@ class MessDetectorPlugin:
     All detectors MUST extend and implement given methods.
     """
 
-    def eligible(self, character: str) -> bool:
-        """
-        Determine if given character should be fed in.
-        """
-        raise NotImplementedError  # pragma: nocover
+    __slots__ = ()
 
-    def feed(self, character: str) -> None:
+    def feed_info(self, character: str, info: CharInfo) -> None:
         """
         The main routine to be executed upon character.
         Insert the logic in witch the text would be considered chaotic.
         """
-        raise NotImplementedError  # pragma: nocover
+        raise NotImplementedError  # Defensive:
 
-    def reset(self) -> None:  # pragma: no cover
+    def reset(self) -> None:  # Defensive:
         """
         Permit to reset the plugin to the initial state.
         """
@@ -60,10 +230,19 @@ def ratio(self) -> float:
         Compute the chaos ratio based on what your feed() has seen.
         Must NOT be lower than 0.; No restriction gt 0.
         """
-        raise NotImplementedError  # pragma: nocover
+        raise NotImplementedError  # Defensive:
 
 
+@final
 class TooManySymbolOrPunctuationPlugin(MessDetectorPlugin):
+    __slots__ = (
+        "_punctuation_count",
+        "_symbol_count",
+        "_character_count",
+        "_last_printable_char",
+        "_frenzy_symbol_in_word",
+    )
+
     def __init__(self) -> None:
         self._punctuation_count: int = 0
         self._symbol_count: int = 0
@@ -72,23 +251,17 @@ def __init__(self) -> None:
         self._last_printable_char: str | None = None
         self._frenzy_symbol_in_word: bool = False
 
-    def eligible(self, character: str) -> bool:
-        return character.isprintable()
-
-    def feed(self, character: str) -> None:
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
         self._character_count += 1
 
         if (
             character != self._last_printable_char
             and character not in COMMON_SAFE_ASCII_CHARACTERS
         ):
-            if is_punctuation(character):
+            if info.punct:
                 self._punctuation_count += 1
-            elif (
-                character.isdigit() is False
-                and is_symbol(character)
-                and is_emoticon(character) is False
-            ):
+            elif not info.digit and info.sym and not is_emoticon(character):
                 self._symbol_count += 2
 
         self._last_printable_char = character
@@ -110,18 +283,19 @@ def ratio(self) -> float:
         return ratio_of_punctuation if ratio_of_punctuation >= 0.3 else 0.0
 
 
+@final
 class TooManyAccentuatedPlugin(MessDetectorPlugin):
+    __slots__ = ("_character_count", "_accentuated_count")
+
     def __init__(self) -> None:
         self._character_count: int = 0
         self._accentuated_count: int = 0
 
-    def eligible(self, character: str) -> bool:
-        return character.isalpha()
-
-    def feed(self, character: str) -> None:
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
         self._character_count += 1
 
-        if is_accentuated(character):
+        if info.accentuated:
             self._accentuated_count += 1
 
     def reset(self) -> None:  # Abstract
@@ -137,16 +311,22 @@ def ratio(self) -> float:
         return ratio_of_accentuation if ratio_of_accentuation >= 0.35 else 0.0
 
 
+@final
 class UnprintablePlugin(MessDetectorPlugin):
+    __slots__ = ("_unprintable_count", "_character_count")
+
     def __init__(self) -> None:
         self._unprintable_count: int = 0
         self._character_count: int = 0
 
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        if is_unprintable(character):
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
+        if (
+            not info.space
+            and not info.printable
+            and character != "\x1a"
+            and character != "\ufeff"
+        ):
             self._unprintable_count += 1
         self._character_count += 1
 
@@ -155,40 +335,48 @@ def reset(self) -> None:  # Abstract
 
     @property
     def ratio(self) -> float:
-        if self._character_count == 0:
+        if self._character_count == 0:  # Defensive:
             return 0.0
 
         return (self._unprintable_count * 8) / self._character_count
 
 
+@final
 class SuspiciousDuplicateAccentPlugin(MessDetectorPlugin):
+    __slots__ = (
+        "_successive_count",
+        "_character_count",
+        "_last_latin_character",
+        "_last_was_accentuated",
+    )
+
     def __init__(self) -> None:
         self._successive_count: int = 0
         self._character_count: int = 0
 
         self._last_latin_character: str | None = None
+        self._last_was_accentuated: bool = False
 
-    def eligible(self, character: str) -> bool:
-        return character.isalpha() and is_latin(character)
-
-    def feed(self, character: str) -> None:
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
         self._character_count += 1
         if (
             self._last_latin_character is not None
-            and is_accentuated(character)
-            and is_accentuated(self._last_latin_character)
+            and info.accentuated
+            and self._last_was_accentuated
         ):
-            if character.isupper() and self._last_latin_character.isupper():
+            if info.upper and self._last_latin_character.isupper():
                 self._successive_count += 1
-            # Worse if its the same char duplicated with different accent.
             if remove_accent(character) == remove_accent(self._last_latin_character):
                 self._successive_count += 1
         self._last_latin_character = character
+        self._last_was_accentuated = info.accentuated
 
     def reset(self) -> None:  # Abstract
         self._successive_count = 0
         self._character_count = 0
         self._last_latin_character = None
+        self._last_was_accentuated = False
 
     @property
     def ratio(self) -> float:
@@ -198,42 +386,49 @@ def ratio(self) -> float:
         return (self._successive_count * 2) / self._character_count
 
 
+@final
 class SuspiciousRange(MessDetectorPlugin):
+    __slots__ = (
+        "_suspicious_successive_range_count",
+        "_character_count",
+        "_last_printable_seen",
+        "_last_printable_range",
+    )
+
     def __init__(self) -> None:
         self._suspicious_successive_range_count: int = 0
         self._character_count: int = 0
         self._last_printable_seen: str | None = None
+        self._last_printable_range: str | None = None
 
-    def eligible(self, character: str) -> bool:
-        return character.isprintable()
-
-    def feed(self, character: str) -> None:
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
         self._character_count += 1
 
-        if (
-            character.isspace()
-            or is_punctuation(character)
-            or character in COMMON_SAFE_ASCII_CHARACTERS
-        ):
+        if info.space or info.punct or character in COMMON_SAFE_ASCII_CHARACTERS:
             self._last_printable_seen = None
+            self._last_printable_range = None
             return
 
         if self._last_printable_seen is None:
             self._last_printable_seen = character
+            self._last_printable_range = unicode_range(character)
             return
 
-        unicode_range_a: str | None = unicode_range(self._last_printable_seen)
+        unicode_range_a: str | None = self._last_printable_range
         unicode_range_b: str | None = unicode_range(character)
 
         if is_suspiciously_successive_range(unicode_range_a, unicode_range_b):
             self._suspicious_successive_range_count += 1
 
         self._last_printable_seen = character
+        self._last_printable_range = unicode_range_b
 
     def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._suspicious_successive_range_count = 0
         self._last_printable_seen = None
+        self._last_printable_range = None
 
     @property
     def ratio(self) -> float:
@@ -247,7 +442,24 @@ def ratio(self) -> float:
         return ratio_of_suspicious_range_usage
 
 
+@final
 class SuperWeirdWordPlugin(MessDetectorPlugin):
+    __slots__ = (
+        "_word_count",
+        "_bad_word_count",
+        "_foreign_long_count",
+        "_is_current_word_bad",
+        "_foreign_long_watch",
+        "_character_count",
+        "_bad_character_count",
+        "_buffer_length",
+        "_buffer_last_char",
+        "_buffer_last_char_accentuated",
+        "_buffer_accent_count",
+        "_buffer_glyph_count",
+        "_buffer_upper_count",
+    )
+
     def __init__(self) -> None:
         self._word_count: int = 0
         self._bad_word_count: int = 0
@@ -259,56 +471,50 @@ def __init__(self) -> None:
         self._character_count: int = 0
         self._bad_character_count: int = 0
 
-        self._buffer: str = ""
+        self._buffer_length: int = 0
+        self._buffer_last_char: str | None = None
+        self._buffer_last_char_accentuated: bool = False
         self._buffer_accent_count: int = 0
         self._buffer_glyph_count: int = 0
+        self._buffer_upper_count: int = 0
 
-    def eligible(self, character: str) -> bool:
-        return True
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
+        if info.alpha:
+            self._buffer_length += 1
+            self._buffer_last_char = character
+
+            if info.upper:
+                self._buffer_upper_count += 1
 
-    def feed(self, character: str) -> None:
-        if character.isalpha():
-            self._buffer += character
-            if is_accentuated(character):
+            self._buffer_last_char_accentuated = info.accentuated
+
+            if info.accentuated:
                 self._buffer_accent_count += 1
             if (
-                self._foreign_long_watch is False
-                and (is_latin(character) is False or is_accentuated(character))
-                and is_cjk(character) is False
-                and is_hangul(character) is False
-                and is_katakana(character) is False
-                and is_hiragana(character) is False
-                and is_thai(character) is False
+                not self._foreign_long_watch
+                and (not info.latin or info.accentuated)
+                and not info.is_glyph
             ):
                 self._foreign_long_watch = True
-            if (
-                is_cjk(character)
-                or is_hangul(character)
-                or is_katakana(character)
-                or is_hiragana(character)
-                or is_thai(character)
-            ):
+            if info.is_glyph:
                 self._buffer_glyph_count += 1
             return
-        if not self._buffer:
+        if not self._buffer_length:
             return
-        if (
-            character.isspace() or is_punctuation(character) or is_separator(character)
-        ) and self._buffer:
+        if info.space or info.punct or is_separator(character):
             self._word_count += 1
-            buffer_length: int = len(self._buffer)
+            buffer_length: int = self._buffer_length
 
             self._character_count += buffer_length
 
             if buffer_length >= 4:
                 if self._buffer_accent_count / buffer_length >= 0.5:
                     self._is_current_word_bad = True
-                # Word/Buffer ending with an upper case accentuated letter are so rare,
-                # that we will consider them all as suspicious. Same weight as foreign_long suspicious.
                 elif (
-                    is_accentuated(self._buffer[-1])
-                    and self._buffer[-1].isupper()
-                    and all(_.isupper() for _ in self._buffer) is False
+                    self._buffer_last_char_accentuated
+                    and self._buffer_last_char.isupper()  # type: ignore[union-attr]
+                    and self._buffer_upper_count != buffer_length
                 ):
                     self._foreign_long_count += 1
                     self._is_current_word_bad = True
@@ -316,15 +522,10 @@ def feed(self, character: str) -> None:
                     self._is_current_word_bad = True
                     self._foreign_long_count += 1
             if buffer_length >= 24 and self._foreign_long_watch:
-                camel_case_dst = [
-                    i
-                    for c, i in zip(self._buffer, range(0, buffer_length))
-                    if c.isupper()
-                ]
-                probable_camel_cased: bool = False
-
-                if camel_case_dst and (len(camel_case_dst) / buffer_length <= 0.3):
-                    probable_camel_cased = True
+                probable_camel_cased: bool = (
+                    self._buffer_upper_count > 0
+                    and self._buffer_upper_count / buffer_length <= 0.3
+                )
 
                 if not probable_camel_cased:
                     self._foreign_long_count += 1
@@ -332,23 +533,30 @@ def feed(self, character: str) -> None:
 
             if self._is_current_word_bad:
                 self._bad_word_count += 1
-                self._bad_character_count += len(self._buffer)
+                self._bad_character_count += buffer_length
                 self._is_current_word_bad = False
 
             self._foreign_long_watch = False
-            self._buffer = ""
+            self._buffer_length = 0
+            self._buffer_last_char = None
+            self._buffer_last_char_accentuated = False
             self._buffer_accent_count = 0
             self._buffer_glyph_count = 0
+            self._buffer_upper_count = 0
         elif (
             character not in {"<", ">", "-", "=", "~", "|", "_"}
-            and character.isdigit() is False
-            and is_symbol(character)
+            and not info.digit
+            and info.sym
         ):
             self._is_current_word_bad = True
-            self._buffer += character
+            self._buffer_length += 1
+            self._buffer_last_char = character
+            self._buffer_last_char_accentuated = False
 
     def reset(self) -> None:  # Abstract
-        self._buffer = ""
+        self._buffer_length = 0
+        self._buffer_last_char = None
+        self._buffer_last_char_accentuated = False
         self._is_current_word_bad = False
         self._foreign_long_watch = False
         self._bad_word_count = 0
@@ -356,6 +564,9 @@ def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._bad_character_count = 0
         self._foreign_long_count = 0
+        self._buffer_accent_count = 0
+        self._buffer_glyph_count = 0
+        self._buffer_upper_count = 0
 
     @property
     def ratio(self) -> float:
@@ -365,38 +576,55 @@ def ratio(self) -> float:
         return self._bad_character_count / self._character_count
 
 
-class CjkInvalidStopPlugin(MessDetectorPlugin):
+@final
+class CjkUncommonPlugin(MessDetectorPlugin):
     """
-    GB(Chinese) based encoding often render the stop incorrectly when the content does not fit and
-    can be easily detected. Searching for the overuse of 'ไธ…' and 'ไธ„'.
+    Detect messy CJK text that probably means nothing.
     """
 
+    __slots__ = ("_character_count", "_uncommon_count")
+
     def __init__(self) -> None:
-        self._wrong_stop_count: int = 0
-        self._cjk_character_count: int = 0
+        self._character_count: int = 0
+        self._uncommon_count: int = 0
 
-    def eligible(self, character: str) -> bool:
-        return True
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
+        self._character_count += 1
 
-    def feed(self, character: str) -> None:
-        if character in {"ไธ…", "ไธ„"}:
-            self._wrong_stop_count += 1
-            return
-        if is_cjk(character):
-            self._cjk_character_count += 1
+        if character not in COMMON_CJK_CHARACTERS:
+            self._uncommon_count += 1
 
     def reset(self) -> None:  # Abstract
-        self._wrong_stop_count = 0
-        self._cjk_character_count = 0
+        self._character_count = 0
+        self._uncommon_count = 0
 
     @property
     def ratio(self) -> float:
-        if self._cjk_character_count < 16:
+        if self._character_count < 8:
             return 0.0
-        return self._wrong_stop_count / self._cjk_character_count
 
+        uncommon_form_usage: float = self._uncommon_count / self._character_count
 
+        # we can be pretty sure it's garbage when uncommon characters are widely
+        # used. otherwise it could just be traditional chinese for example.
+        return uncommon_form_usage / 10 if uncommon_form_usage > 0.5 else 0.0
+
+
+@final
 class ArchaicUpperLowerPlugin(MessDetectorPlugin):
+    __slots__ = (
+        "_buf",
+        "_character_count_since_last_sep",
+        "_successive_upper_lower_count",
+        "_successive_upper_lower_count_final",
+        "_character_count",
+        "_last_alpha_seen",
+        "_last_alpha_seen_upper",
+        "_last_alpha_seen_lower",
+        "_current_ascii_only",
+    )
+
     def __init__(self) -> None:
         self._buf: bool = False
 
@@ -408,20 +636,20 @@ def __init__(self) -> None:
         self._character_count: int = 0
 
         self._last_alpha_seen: str | None = None
+        self._last_alpha_seen_upper: bool = False
+        self._last_alpha_seen_lower: bool = False
         self._current_ascii_only: bool = True
 
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        is_concerned = character.isalpha() and is_case_variable(character)
-        chunk_sep = is_concerned is False
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
+        is_concerned: bool = info.alpha and info.case_variable
+        chunk_sep: bool = not is_concerned
 
         if chunk_sep and self._character_count_since_last_sep > 0:
             if (
                 self._character_count_since_last_sep <= 64
-                and character.isdigit() is False
-                and self._current_ascii_only is False
+                and not info.digit
+                and not self._current_ascii_only
             ):
                 self._successive_upper_lower_count_final += (
                     self._successive_upper_lower_count
@@ -436,14 +664,14 @@ def feed(self, character: str) -> None:
 
             return
 
-        if self._current_ascii_only is True and character.isascii() is False:
+        if self._current_ascii_only and not info.is_ascii:
             self._current_ascii_only = False
 
         if self._last_alpha_seen is not None:
-            if (character.isupper() and self._last_alpha_seen.islower()) or (
-                character.islower() and self._last_alpha_seen.isupper()
+            if (info.upper and self._last_alpha_seen_lower) or (
+                info.lower and self._last_alpha_seen_upper
             ):
-                if self._buf is True:
+                if self._buf:
                     self._successive_upper_lower_count += 2
                     self._buf = False
                 else:
@@ -454,6 +682,8 @@ def feed(self, character: str) -> None:
         self._character_count += 1
         self._character_count_since_last_sep += 1
         self._last_alpha_seen = character
+        self._last_alpha_seen_upper = info.upper
+        self._last_alpha_seen_lower = info.lower
 
     def reset(self) -> None:  # Abstract
         self._character_count = 0
@@ -461,18 +691,23 @@ def reset(self) -> None:  # Abstract
         self._successive_upper_lower_count = 0
         self._successive_upper_lower_count_final = 0
         self._last_alpha_seen = None
+        self._last_alpha_seen_upper = False
+        self._last_alpha_seen_lower = False
         self._buf = False
         self._current_ascii_only = True
 
     @property
     def ratio(self) -> float:
-        if self._character_count == 0:
+        if self._character_count == 0:  # Defensive:
             return 0.0
 
         return self._successive_upper_lower_count_final / self._character_count
 
 
+@final
 class ArabicIsolatedFormPlugin(MessDetectorPlugin):
+    __slots__ = ("_character_count", "_isolated_form_count")
+
     def __init__(self) -> None:
         self._character_count: int = 0
         self._isolated_form_count: int = 0
@@ -481,13 +716,11 @@ def reset(self) -> None:  # Abstract
         self._character_count = 0
         self._isolated_form_count = 0
 
-    def eligible(self, character: str) -> bool:
-        return is_arabic(character)
-
-    def feed(self, character: str) -> None:
+    def feed_info(self, character: str, info: CharInfo) -> None:
+        """Optimized feed using pre-computed character info."""
         self._character_count += 1
 
-        if is_arabic_isolated_form(character):
+        if info.flags & _ARABIC_ISOLATED_FORM:
             self._isolated_form_count += 1
 
     @property
@@ -582,49 +815,122 @@ def mess_ratio(
     Compute a mess ratio given a decoded bytes sequence. The maximum threshold does stop the computation earlier.
     """
 
-    detectors: list[MessDetectorPlugin] = [
-        md_class() for md_class in MessDetectorPlugin.__subclasses__()
-    ]
+    seq_len: int = len(decoded_sequence)
 
-    length: int = len(decoded_sequence) + 1
-
-    mean_mess_ratio: float = 0.0
-
-    if length < 512:
-        intermediary_mean_mess_ratio_calc: int = 32
-    elif length <= 1024:
-        intermediary_mean_mess_ratio_calc = 64
+    if seq_len < 511:
+        step: int = 32
+    elif seq_len < 1024:
+        step = 64
     else:
-        intermediary_mean_mess_ratio_calc = 128
-
-    for character, index in zip(decoded_sequence + "\n", range(length)):
-        for detector in detectors:
-            if detector.eligible(character):
-                detector.feed(character)
-
-        if (
-            index > 0 and index % intermediary_mean_mess_ratio_calc == 0
-        ) or index == length - 1:
-            mean_mess_ratio = sum(dt.ratio for dt in detectors)
+        step = 128
+
+    # Create each detector as a named local variable (unrolled from the generic loop).
+    # This eliminates per-character iteration over the detector list and
+    # per-character eligible() virtual dispatch, while keeping every plugin class
+    # intact and fully readable.
+    d_sp: TooManySymbolOrPunctuationPlugin = TooManySymbolOrPunctuationPlugin()
+    d_ta: TooManyAccentuatedPlugin = TooManyAccentuatedPlugin()
+    d_up: UnprintablePlugin = UnprintablePlugin()
+    d_sda: SuspiciousDuplicateAccentPlugin = SuspiciousDuplicateAccentPlugin()
+    d_sr: SuspiciousRange = SuspiciousRange()
+    d_sw: SuperWeirdWordPlugin = SuperWeirdWordPlugin()
+    d_cu: CjkUncommonPlugin = CjkUncommonPlugin()
+    d_au: ArchaicUpperLowerPlugin = ArchaicUpperLowerPlugin()
+    d_ai: ArabicIsolatedFormPlugin = ArabicIsolatedFormPlugin()
+
+    # Local references for feed_info methods called in the hot loop.
+    d_sp_feed = d_sp.feed_info
+    d_ta_feed = d_ta.feed_info
+    d_up_feed = d_up.feed_info
+    d_sda_feed = d_sda.feed_info
+    d_sr_feed = d_sr.feed_info
+    d_sw_feed = d_sw.feed_info
+    d_cu_feed = d_cu.feed_info
+    d_au_feed = d_au.feed_info
+    d_ai_feed = d_ai.feed_info
+
+    # Single reusable CharInfo object (avoids per-character allocation).
+    info: CharInfo = CharInfo()
+    info_update = info.update
+
+    mean_mess_ratio: float
+
+    for block_start in range(0, seq_len, step):
+        for character in decoded_sequence[block_start : block_start + step]:
+            # Pre-compute all character properties once (shared across all plugins).
+            info_update(character)
+
+            # Detectors with eligible() == always True
+            d_up_feed(character, info)
+            d_sw_feed(character, info)
+            d_au_feed(character, info)
+
+            # Detectors with eligible() == isprintable
+            if info.printable:
+                d_sp_feed(character, info)
+                d_sr_feed(character, info)
+
+            # Detectors with eligible() == isalpha
+            if info.alpha:
+                d_ta_feed(character, info)
+                # SuspiciousDuplicateAccent: isalpha() and is_latin()
+                if info.latin:
+                    d_sda_feed(character, info)
+                # CjkUncommon: is_cjk()
+                if info.is_cjk:
+                    d_cu_feed(character, info)
+                # ArabicIsolatedForm: is_arabic()
+                if info.is_arabic:
+                    d_ai_feed(character, info)
+
+        mean_mess_ratio = (
+            d_sp.ratio
+            + d_ta.ratio
+            + d_up.ratio
+            + d_sda.ratio
+            + d_sr.ratio
+            + d_sw.ratio
+            + d_cu.ratio
+            + d_au.ratio
+            + d_ai.ratio
+        )
 
-            if mean_mess_ratio >= maximum_threshold:
-                break
+        if mean_mess_ratio >= maximum_threshold:
+            break
+    else:
+        # Flush last word buffer in SuperWeirdWordPlugin via trailing newline.
+        info_update("\n")
+        d_sw_feed("\n", info)
+        d_au_feed("\n", info)
+        d_up_feed("\n", info)
+
+        mean_mess_ratio = (
+            d_sp.ratio
+            + d_ta.ratio
+            + d_up.ratio
+            + d_sda.ratio
+            + d_sr.ratio
+            + d_sw.ratio
+            + d_cu.ratio
+            + d_au.ratio
+            + d_ai.ratio
+        )
 
-    if debug:
+    if debug:  # Defensive:
         logger = getLogger("charset_normalizer")
 
         logger.log(
             TRACE,
             "Mess-detector extended-analysis start. "
-            f"intermediary_mean_mess_ratio_calc={intermediary_mean_mess_ratio_calc} mean_mess_ratio={mean_mess_ratio} "
+            f"intermediary_mean_mess_ratio_calc={step} mean_mess_ratio={mean_mess_ratio} "
             f"maximum_threshold={maximum_threshold}",
         )
 
-        if len(decoded_sequence) > 16:
+        if seq_len > 16:
             logger.log(TRACE, f"Starting with: {decoded_sequence[:16]}")
             logger.log(TRACE, f"Ending with: {decoded_sequence[-16::]}")
 
-        for dt in detectors:
+        for dt in [d_sp, d_ta, d_up, d_sda, d_sr, d_sw, d_cu, d_au, d_ai]:
             logger.log(TRACE, f"{dt.__class__}: {dt.ratio}")
 
     return round(mean_mess_ratio, 3)
diff --git a/libs/charset_normalizer/models.py b/libs/charset_normalizer/models.py
index 1042758f87..30e8a163e2 100644
--- a/libs/charset_normalizer/models.py
+++ b/libs/charset_normalizer/models.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from encodings.aliases import aliases
-from hashlib import sha256
 from json import dumps
 from re import sub
 from typing import Any, Iterator, List, Tuple
@@ -13,7 +12,7 @@
 class CharsetMatch:
     def __init__(
         self,
-        payload: bytes,
+        payload: bytes | bytearray,
         guessed_encoding: str,
         mean_mess_ratio: float,
         has_sig_or_bom: bool,
@@ -21,7 +20,7 @@ def __init__(
         decoded_payload: str | None = None,
         preemptive_declaration: str | None = None,
     ):
-        self._payload: bytes = payload
+        self._payload: bytes | bytearray = payload
 
         self._encoding: str = guessed_encoding
         self._mean_mess_ratio: float = mean_mess_ratio
@@ -56,10 +55,10 @@ def __lt__(self, other: object) -> bool:
         chaos_difference: float = abs(self.chaos - other.chaos)
         coherence_difference: float = abs(self.coherence - other.coherence)
 
-        # Below 1% difference --> Use Coherence
-        if chaos_difference < 0.01 and coherence_difference > 0.02:
+        # Below 0.5% difference --> Use Coherence
+        if chaos_difference < 0.005 and coherence_difference > 0.02:
             return self.coherence > other.coherence
-        elif chaos_difference < 0.01 and coherence_difference <= 0.02:
+        elif chaos_difference < 0.005 and coherence_difference <= 0.02:
             # When having a difficult decision, use the result that decoded as many multi-byte as possible.
             # preserve RAM usage!
             if len(self._payload) >= TOO_BIG_SEQUENCE:
@@ -79,7 +78,7 @@ def __str__(self) -> str:
         return self._string
 
     def __repr__(self) -> str:
-        return f"<CharsetMatch '{self.encoding}' bytes({self.fingerprint})>"
+        return f"<CharsetMatch '{self.encoding}' fp({self.fingerprint})>"
 
     def add_submatch(self, other: CharsetMatch) -> None:
         if not isinstance(other, CharsetMatch) or other == self:
@@ -172,7 +171,7 @@ def percent_coherence(self) -> float:
         return round(self.coherence * 100, ndigits=3)
 
     @property
-    def raw(self) -> bytes:
+    def raw(self) -> bytes | bytearray:
         """
         Original untouched bytes.
         """
@@ -235,11 +234,11 @@ def output(self, encoding: str = "utf_8") -> bytes:
         return self._output_payload  # type: ignore
 
     @property
-    def fingerprint(self) -> str:
+    def fingerprint(self) -> int:
         """
-        Retrieve the unique SHA256 computed using the transformed (re-encoded) payload. Not the original one.
+        Retrieve a hash fingerprint of the decoded payload, used for deduplication.
         """
-        return sha256(self.output()).hexdigest()
+        return hash(str(self))
 
 
 class CharsetMatches:
diff --git a/libs/charset_normalizer/utils.py b/libs/charset_normalizer/utils.py
index 0175e0a96a..0f529b59cf 100644
--- a/libs/charset_normalizer/utils.py
+++ b/libs/charset_normalizer/utils.py
@@ -3,6 +3,7 @@
 import importlib
 import logging
 import unicodedata
+from bisect import bisect_right
 from codecs import IncrementalDecoder
 from encodings.aliases import aliases
 from functools import lru_cache
@@ -20,25 +21,58 @@
     UNICODE_RANGES_COMBINED,
     UNICODE_SECONDARY_RANGE_KEYWORD,
     UTF8_MAXIMAL_ALLOCATION,
+    COMMON_CJK_CHARACTERS,
+    _LATIN,
+    _CJK,
+    _HANGUL,
+    _KATAKANA,
+    _HIRAGANA,
+    _THAI,
+    _ARABIC,
+    _ARABIC_ISOLATED_FORM,
+    _ACCENT_KEYWORDS,
+    _ACCENTUATED,
 )
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_accentuated(character: str) -> bool:
+def _character_flags(character: str) -> int:
+    """Compute all name-based classification flags with a single unicodedata.name() call."""
     try:
-        description: str = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-    return (
-        "WITH GRAVE" in description
-        or "WITH ACUTE" in description
-        or "WITH CEDILLA" in description
-        or "WITH DIAERESIS" in description
-        or "WITH CIRCUMFLEX" in description
-        or "WITH TILDE" in description
-        or "WITH MACRON" in description
-        or "WITH RING ABOVE" in description
-    )
+        desc: str = unicodedata.name(character)
+    except ValueError:
+        return 0
+
+    flags: int = 0
+
+    if "LATIN" in desc:
+        flags |= _LATIN
+    if "CJK" in desc:
+        flags |= _CJK
+    if "HANGUL" in desc:
+        flags |= _HANGUL
+    if "KATAKANA" in desc:
+        flags |= _KATAKANA
+    if "HIRAGANA" in desc:
+        flags |= _HIRAGANA
+    if "THAI" in desc:
+        flags |= _THAI
+    if "ARABIC" in desc:
+        flags |= _ARABIC
+        if "ISOLATED FORM" in desc:
+            flags |= _ARABIC_ISOLATED_FORM
+
+    for kw in _ACCENT_KEYWORDS:
+        if kw in desc:
+            flags |= _ACCENTUATED
+            break
+
+    return flags
+
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_accentuated(character: str) -> bool:
+    return bool(_character_flags(character) & _ACCENTUATED)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
@@ -52,6 +86,15 @@ def remove_accent(character: str) -> str:
     return chr(int(codes[0], 16))
 
 
+# Pre-built sorted lookup table for O(log n) binary search in unicode_range().
+# Each entry is (range_start, range_end_exclusive, range_name).
+_UNICODE_RANGES_SORTED: list[tuple[int, int, str]] = sorted(
+    (ord_range.start, ord_range.stop, name)
+    for name, ord_range in UNICODE_RANGES_COMBINED.items()
+)
+_UNICODE_RANGE_STARTS: list[int] = [e[0] for e in _UNICODE_RANGES_SORTED]
+
+
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def unicode_range(character: str) -> str | None:
     """
@@ -59,20 +102,19 @@ def unicode_range(character: str) -> str | None:
     """
     character_ord: int = ord(character)
 
-    for range_name, ord_range in UNICODE_RANGES_COMBINED.items():
-        if character_ord in ord_range:
-            return range_name
+    # Binary search: find the rightmost range whose start <= character_ord
+    idx = bisect_right(_UNICODE_RANGE_STARTS, character_ord) - 1
+    if idx >= 0:
+        start, stop, name = _UNICODE_RANGES_SORTED[idx]
+        if character_ord < stop:
+            return name
 
     return None
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_latin(character: str) -> bool:
-    try:
-        description: str = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-    return "LATIN" in description
+    return bool(_character_flags(character) & _LATIN)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
@@ -132,72 +174,42 @@ def is_case_variable(character: str) -> bool:
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_cjk(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "CJK" in character_name
+    return bool(_character_flags(character) & _CJK)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_hiragana(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "HIRAGANA" in character_name
+    return bool(_character_flags(character) & _HIRAGANA)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_katakana(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "KATAKANA" in character_name
+    return bool(_character_flags(character) & _KATAKANA)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_hangul(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "HANGUL" in character_name
+    return bool(_character_flags(character) & _HANGUL)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_thai(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "THAI" in character_name
+    return bool(_character_flags(character) & _THAI)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_arabic(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "ARABIC" in character_name
+    return bool(_character_flags(character) & _ARABIC)
 
 
 @lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
 def is_arabic_isolated_form(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
+    return bool(_character_flags(character) & _ARABIC_ISOLATED_FORM)
 
-    return "ARABIC" in character_name and "ISOLATED FORM" in character_name
+
+@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
+def is_cjk_uncommon(character: str) -> bool:
+    return character not in COMMON_CJK_CHARACTERS
 
 
 @lru_cache(maxsize=len(UNICODE_RANGES_COMBINED))
@@ -216,11 +228,13 @@ def is_unprintable(character: str) -> bool:
     )
 
 
-def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> str | None:
+def any_specified_encoding(
+    sequence: bytes | bytearray, search_zone: int = 8192
+) -> str | None:
     """
     Extract using ASCII-only decoder any specified encoding in the first n-bytes.
     """
-    if not isinstance(sequence, bytes):
+    if not isinstance(sequence, (bytes, bytearray)):
         raise TypeError
 
     seq_len: int = len(sequence)
@@ -269,7 +283,7 @@ def is_multi_byte_encoding(name: str) -> bool:
     )
 
 
-def identify_sig_or_bom(sequence: bytes) -> tuple[str | None, bytes]:
+def identify_sig_or_bom(sequence: bytes | bytearray) -> tuple[str | None, bytes]:
     """
     Identify and extract SIG/BOM in given sequence.
     """
@@ -320,12 +334,12 @@ def cp_similarity(iana_name_a: str, iana_name_b: str) -> float:
 
     character_match_count: int = 0
 
-    for i in range(255):
+    for i in range(256):
         to_be_decoded: bytes = bytes([i])
         if id_a.decode(to_be_decoded) == id_b.decode(to_be_decoded):
             character_match_count += 1
 
-    return character_match_count / 254
+    return character_match_count / 256
 
 
 def is_cp_similar(iana_name_a: str, iana_name_b: str) -> bool:
@@ -353,7 +367,7 @@ def set_logging_handler(
 
 
 def cut_sequence_chunks(
-    sequences: bytes,
+    sequences: bytes | bytearray,
     encoding_iana: str,
     offsets: range,
     chunk_size: int,
diff --git a/libs/charset_normalizer/version.py b/libs/charset_normalizer/version.py
index f85e8929e7..a80346fc7e 100644
--- a/libs/charset_normalizer/version.py
+++ b/libs/charset_normalizer/version.py
@@ -4,5 +4,5 @@
 
 from __future__ import annotations
 
-__version__ = "3.4.1"
+__version__ = "3.4.6"
 VERSION = __version__.split(".")
diff --git a/libs/click-8.1.8.dist-info/METADATA b/libs/click-8.1.8.dist-info/METADATA
deleted file mode 100644
index 366d1a7e4f..0000000000
--- a/libs/click-8.1.8.dist-info/METADATA
+++ /dev/null
@@ -1,74 +0,0 @@
-Metadata-Version: 2.3
-Name: click
-Version: 8.1.8
-Summary: Composable command line interface toolkit
-Maintainer-email: Pallets <contact@palletsprojects.com>
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Typing :: Typed
-Requires-Dist: colorama; platform_system == 'Windows'
-Requires-Dist: importlib-metadata; python_version < '3.8'
-Project-URL: Changes, https://click.palletsprojects.com/changes/
-Project-URL: Chat, https://discord.gg/pallets
-Project-URL: Documentation, https://click.palletsprojects.com/
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Source, https://github.com/pallets/click/
-
-# $ click_
-
-Click is a Python package for creating beautiful command line interfaces
-in a composable way with as little code as necessary. It's the "Command
-Line Interface Creation Kit". It's highly configurable but comes with
-sensible defaults out of the box.
-
-It aims to make the process of writing command line tools quick and fun
-while also preventing any frustration caused by the inability to
-implement an intended CLI API.
-
-Click in three points:
-
--   Arbitrary nesting of commands
--   Automatic help page generation
--   Supports lazy loading of subcommands at runtime
-
-
-## A Simple Example
-
-```python
-import click
-
-@click.command()
-@click.option("--count", default=1, help="Number of greetings.")
-@click.option("--name", prompt="Your name", help="The person to greet.")
-def hello(count, name):
-    """Simple program that greets NAME for a total of COUNT times."""
-    for _ in range(count):
-        click.echo(f"Hello, {name}!")
-
-if __name__ == '__main__':
-    hello()
-```
-
-```
-$ python hello.py --count=3
-Your name: Click
-Hello, Click!
-Hello, Click!
-Hello, Click!
-```
-
-
-## Donate
-
-The Pallets organization develops and supports Click and other popular
-packages. In order to grow the community of contributors and users, and
-allow the maintainers to devote more time to the projects, [please
-donate today][].
-
-[please donate today]: https://palletsprojects.com/donate
-
diff --git a/libs/click-8.1.8.dist-info/RECORD b/libs/click-8.1.8.dist-info/RECORD
deleted file mode 100644
index 6989c69d52..0000000000
--- a/libs/click-8.1.8.dist-info/RECORD
+++ /dev/null
@@ -1,23 +0,0 @@
-click-8.1.8.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-click-8.1.8.dist-info/LICENSE.txt,sha256=morRBqOU6FO_4h9C9OctWSgZoigF2ZG18ydQKSkrZY0,1475
-click-8.1.8.dist-info/METADATA,sha256=WJtQ6uGS2ybLfvUE4vC0XIhIBr4yFGwjrMBR2fiCQ-Q,2263
-click-8.1.8.dist-info/RECORD,,
-click-8.1.8.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-click-8.1.8.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-click/__init__.py,sha256=j1DJeCbga4ribkv5uyvIAzI0oFN13fW9mevDKShFelo,3188
-click/_compat.py,sha256=IGKh_J5QdfKELitnRfTGHneejWxoCw_NX9tfMbdcg3w,18730
-click/_termui_impl.py,sha256=a5z7I9gOFeMmu7Gb6_RPyQ8GPuVP1EeblixcWSPSQPk,24783
-click/_textwrap.py,sha256=10fQ64OcBUMuK7mFvh8363_uoOxPlRItZBmKzRJDgoY,1353
-click/_winconsole.py,sha256=5ju3jQkcZD0W27WEMGqmEP4y_crUVzPCqsX_FYb7BO0,7860
-click/core.py,sha256=Q1nEVdctZwvIPOlt4vfHko0TYnHCeE40UEEul8Wpyvs,114748
-click/decorators.py,sha256=7t6F-QWowtLh6F_6l-4YV4Y4yNTcqFQEu9i37zIz68s,18925
-click/exceptions.py,sha256=V7zDT6emqJ8iNl0kF1P5kpFmLMWQ1T1L7aNNKM4YR0w,9600
-click/formatting.py,sha256=Frf0-5W33-loyY_i9qrwXR8-STnW3m5gvyxLVUdyxyk,9706
-click/globals.py,sha256=cuJ6Bbo073lgEEmhjr394PeM-QFmXM-Ci-wmfsd7H5g,1954
-click/parser.py,sha256=h4sndcpF5OHrZQN8vD8IWb5OByvW7ABbhRToxovrqS8,19067
-click/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-click/shell_completion.py,sha256=TR0dXEGcvWb9Eo3aaQEXGhnvNS3FF4H4QcuLnvAvYo4,18636
-click/termui.py,sha256=dLxiS70UOvIYBda_nEEZaPAFOVDVmRs1sEPMuLDowQo,28310
-click/testing.py,sha256=3RA8anCf7TZ8-5RAF5it2Te-aWXBAL5VLasQnMiC2ZQ,16282
-click/types.py,sha256=BD5Qqq4h-8kawBmOIzJlmq4xzThAf4wCvaOLZSBDNx0,36422
-click/utils.py,sha256=ce-IrO9ilII76LGkU354pOdHbepM8UftfNH7SfMU_28,20330
diff --git a/libs/click-8.1.8.dist-info/WHEEL b/libs/click-8.1.8.dist-info/WHEEL
deleted file mode 100644
index e3c6feefa2..0000000000
--- a/libs/click-8.1.8.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.10.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/aniso8601-10.0.0.dist-info/INSTALLER b/libs/click-8.3.1.dist-info/INSTALLER
similarity index 100%
rename from libs/aniso8601-10.0.0.dist-info/INSTALLER
rename to libs/click-8.3.1.dist-info/INSTALLER
diff --git a/libs/click-8.3.1.dist-info/METADATA b/libs/click-8.3.1.dist-info/METADATA
new file mode 100644
index 0000000000..3f433afb9c
--- /dev/null
+++ b/libs/click-8.3.1.dist-info/METADATA
@@ -0,0 +1,84 @@
+Metadata-Version: 2.4
+Name: click
+Version: 8.3.1
+Summary: Composable command line interface toolkit
+Maintainer-email: Pallets <contact@palletsprojects.com>
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-Expression: BSD-3-Clause
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Typing :: Typed
+License-File: LICENSE.txt
+Requires-Dist: colorama; platform_system == 'Windows'
+Project-URL: Changes, https://click.palletsprojects.com/page/changes/
+Project-URL: Chat, https://discord.gg/pallets
+Project-URL: Documentation, https://click.palletsprojects.com/
+Project-URL: Donate, https://palletsprojects.com/donate
+Project-URL: Source, https://github.com/pallets/click/
+
+<div align="center"><img src="https://raw.githubusercontent.com/pallets/click/refs/heads/stable/docs/_static/click-name.svg" alt="" height="150"></div>
+
+# Click
+
+Click is a Python package for creating beautiful command line interfaces
+in a composable way with as little code as necessary. It's the "Command
+Line Interface Creation Kit". It's highly configurable but comes with
+sensible defaults out of the box.
+
+It aims to make the process of writing command line tools quick and fun
+while also preventing any frustration caused by the inability to
+implement an intended CLI API.
+
+Click in three points:
+
+-   Arbitrary nesting of commands
+-   Automatic help page generation
+-   Supports lazy loading of subcommands at runtime
+
+
+## A Simple Example
+
+```python
+import click
+
+@click.command()
+@click.option("--count", default=1, help="Number of greetings.")
+@click.option("--name", prompt="Your name", help="The person to greet.")
+def hello(count, name):
+    """Simple program that greets NAME for a total of COUNT times."""
+    for _ in range(count):
+        click.echo(f"Hello, {name}!")
+
+if __name__ == '__main__':
+    hello()
+```
+
+```
+$ python hello.py --count=3
+Your name: Click
+Hello, Click!
+Hello, Click!
+Hello, Click!
+```
+
+
+## Donate
+
+The Pallets organization develops and supports Click and other popular
+packages. In order to grow the community of contributors and users, and
+allow the maintainers to devote more time to the projects, [please
+donate today][].
+
+[please donate today]: https://palletsprojects.com/donate
+
+## Contributing
+
+See our [detailed contributing documentation][contrib] for many ways to
+contribute, including reporting issues, requesting features, asking or answering
+questions, and making PRs.
+
+[contrib]: https://palletsprojects.com/contributing/
+
diff --git a/libs/click-8.3.1.dist-info/RECORD b/libs/click-8.3.1.dist-info/RECORD
new file mode 100644
index 0000000000..0c86d4eb02
--- /dev/null
+++ b/libs/click-8.3.1.dist-info/RECORD
@@ -0,0 +1,24 @@
+click-8.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+click-8.3.1.dist-info/METADATA,sha256=XZeBrMAE0ghTE88SjfrSDuSyNCpBPplxJR1tbwD9oZg,2621
+click-8.3.1.dist-info/RECORD,,
+click-8.3.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+click-8.3.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+click-8.3.1.dist-info/licenses/LICENSE.txt,sha256=morRBqOU6FO_4h9C9OctWSgZoigF2ZG18ydQKSkrZY0,1475
+click/__init__.py,sha256=6YyS1aeyknZ0LYweWozNZy0A9nZ_11wmYIhv3cbQrYo,4473
+click/_compat.py,sha256=v3xBZkFbvA1BXPRkFfBJc6-pIwPI7345m-kQEnpVAs4,18693
+click/_termui_impl.py,sha256=rgCb3On8X5A4200rA5L6i13u5iapmFer7sru57Jy6zA,27093
+click/_textwrap.py,sha256=BOae0RQ6vg3FkNgSJyOoGzG1meGMxJ_ukWVZKx_v-0o,1400
+click/_utils.py,sha256=kZwtTf5gMuCilJJceS2iTCvRvCY-0aN5rJq8gKw7p8g,943
+click/_winconsole.py,sha256=_vxUuUaxwBhoR0vUWCNuHY8VUefiMdCIyU2SXPqoF-A,8465
+click/core.py,sha256=U6Bfxt8GkjNDqyJ0HqXvluJHtyZ4sY5USAvM1Cdq7mQ,132105
+click/decorators.py,sha256=5P7abhJtAQYp_KHgjUvhMv464ERwOzrv2enNknlwHyQ,18461
+click/exceptions.py,sha256=8utf8w6V5hJXMnO_ic1FNrtbwuEn1NUu1aDwV8UqnG4,9954
+click/formatting.py,sha256=RVfwwr0rwWNpgGr8NaHodPzkIr7_tUyVh_nDdanLMNc,9730
+click/globals.py,sha256=gM-Nh6A4M0HB_SgkaF5M4ncGGMDHc_flHXu9_oh4GEU,1923
+click/parser.py,sha256=Q31pH0FlQZEq-UXE_ABRzlygEfvxPTuZbWNh4xfXmzw,19010
+click/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+click/shell_completion.py,sha256=Cc4GQUFuWpfQBa9sF5qXeeYI7n3tI_1k6ZdSn4BZbT0,20994
+click/termui.py,sha256=hqCEjNndU-nzW08nRAkBaVgfZp_FdCA9KxfIWlKYaMc,31037
+click/testing.py,sha256=EERbzcl1br0mW0qBS9EqkknfNfXB9WQEW0ELIpkvuSs,19102
+click/types.py,sha256=ek54BNSFwPKsqtfT7jsqcc4WHui8AIFVMKM4oVZIXhc,39927
+click/utils.py,sha256=gCUoewdAhA-QLBUUHxrLh4uj6m7T1WjZZMNPvR0I7YA,20257
diff --git a/libs/aniso8601-10.0.0.dist-info/REQUESTED b/libs/click-8.3.1.dist-info/REQUESTED
similarity index 100%
rename from libs/aniso8601-10.0.0.dist-info/REQUESTED
rename to libs/click-8.3.1.dist-info/REQUESTED
diff --git a/libs/click-8.3.1.dist-info/WHEEL b/libs/click-8.3.1.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/click-8.3.1.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/click-8.1.8.dist-info/LICENSE.txt b/libs/click-8.3.1.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/click-8.1.8.dist-info/LICENSE.txt
rename to libs/click-8.3.1.dist-info/licenses/LICENSE.txt
diff --git a/libs/click/__init__.py b/libs/click/__init__.py
index 2610d0e142..1aa547c57a 100644
--- a/libs/click/__init__.py
+++ b/libs/click/__init__.py
@@ -5,13 +5,13 @@
 composable.
 """
 
+from __future__ import annotations
+
 from .core import Argument as Argument
-from .core import BaseCommand as BaseCommand
 from .core import Command as Command
 from .core import CommandCollection as CommandCollection
 from .core import Context as Context
 from .core import Group as Group
-from .core import MultiCommand as MultiCommand
 from .core import Option as Option
 from .core import Parameter as Parameter
 from .decorators import argument as argument
@@ -19,7 +19,6 @@
 from .decorators import confirmation_option as confirmation_option
 from .decorators import group as group
 from .decorators import help_option as help_option
-from .decorators import HelpOption as HelpOption
 from .decorators import make_pass_decorator as make_pass_decorator
 from .decorators import option as option
 from .decorators import pass_context as pass_context
@@ -38,7 +37,6 @@
 from .formatting import HelpFormatter as HelpFormatter
 from .formatting import wrap_text as wrap_text
 from .globals import get_current_context as get_current_context
-from .parser import OptionParser as OptionParser
 from .termui import clear as clear
 from .termui import confirm as confirm
 from .termui import echo_via_pager as echo_via_pager
@@ -72,4 +70,54 @@
 from .utils import get_text_stream as get_text_stream
 from .utils import open_file as open_file
 
-__version__ = "8.1.8"
+
+def __getattr__(name: str) -> object:
+    import warnings
+
+    if name == "BaseCommand":
+        from .core import _BaseCommand
+
+        warnings.warn(
+            "'BaseCommand' is deprecated and will be removed in Click 9.0. Use"
+            " 'Command' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _BaseCommand
+
+    if name == "MultiCommand":
+        from .core import _MultiCommand
+
+        warnings.warn(
+            "'MultiCommand' is deprecated and will be removed in Click 9.0. Use"
+            " 'Group' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _MultiCommand
+
+    if name == "OptionParser":
+        from .parser import _OptionParser
+
+        warnings.warn(
+            "'OptionParser' is deprecated and will be removed in Click 9.0. The"
+            " old parser is available in 'optparse'.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _OptionParser
+
+    if name == "__version__":
+        import importlib.metadata
+        import warnings
+
+        warnings.warn(
+            "The '__version__' attribute is deprecated and will be removed in"
+            " Click 9.1. Use feature detection or"
+            " 'importlib.metadata.version(\"click\")' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return importlib.metadata.version("click")
+
+    raise AttributeError(name)
diff --git a/libs/click/_compat.py b/libs/click/_compat.py
index 9153d150ce..f2726b93af 100644
--- a/libs/click/_compat.py
+++ b/libs/click/_compat.py
@@ -1,21 +1,25 @@
+from __future__ import annotations
+
 import codecs
+import collections.abc as cabc
 import io
 import os
 import re
 import sys
 import typing as t
+from types import TracebackType
 from weakref import WeakKeyDictionary
 
 CYGWIN = sys.platform.startswith("cygwin")
 WIN = sys.platform.startswith("win")
-auto_wrap_for_ansi: t.Optional[t.Callable[[t.TextIO], t.TextIO]] = None
+auto_wrap_for_ansi: t.Callable[[t.TextIO], t.TextIO] | None = None
 _ansi_re = re.compile(r"\033\[[;?0-9]*[a-zA-Z]")
 
 
 def _make_text_stream(
     stream: t.BinaryIO,
-    encoding: t.Optional[str],
-    errors: t.Optional[str],
+    encoding: str | None,
+    errors: str | None,
     force_readable: bool = False,
     force_writable: bool = False,
 ) -> t.TextIO:
@@ -53,8 +57,8 @@ class _NonClosingTextIOWrapper(io.TextIOWrapper):
     def __init__(
         self,
         stream: t.BinaryIO,
-        encoding: t.Optional[str],
-        errors: t.Optional[str],
+        encoding: str | None,
+        errors: str | None,
         force_readable: bool = False,
         force_writable: bool = False,
         **extra: t.Any,
@@ -125,7 +129,7 @@ def writable(self) -> bool:
         if x is not None:
             return t.cast(bool, x())
         try:
-            self._stream.write("")  # type: ignore
+            self._stream.write(b"")
         except Exception:
             try:
                 self._stream.write(b"")
@@ -166,7 +170,7 @@ def _is_binary_writer(stream: t.IO[t.Any], default: bool = False) -> bool:
     return True
 
 
-def _find_binary_reader(stream: t.IO[t.Any]) -> t.Optional[t.BinaryIO]:
+def _find_binary_reader(stream: t.IO[t.Any]) -> t.BinaryIO | None:
     # We need to figure out if the given stream is already binary.
     # This can happen because the official docs recommend detaching
     # the streams to get binary streams.  Some code might do this, so
@@ -184,7 +188,7 @@ def _find_binary_reader(stream: t.IO[t.Any]) -> t.Optional[t.BinaryIO]:
     return None
 
 
-def _find_binary_writer(stream: t.IO[t.Any]) -> t.Optional[t.BinaryIO]:
+def _find_binary_writer(stream: t.IO[t.Any]) -> t.BinaryIO | None:
     # We need to figure out if the given stream is already binary.
     # This can happen because the official docs recommend detaching
     # the streams to get binary streams.  Some code might do this, so
@@ -211,7 +215,7 @@ def _stream_is_misconfigured(stream: t.TextIO) -> bool:
     return is_ascii_encoding(getattr(stream, "encoding", None) or "ascii")
 
 
-def _is_compat_stream_attr(stream: t.TextIO, attr: str, value: t.Optional[str]) -> bool:
+def _is_compat_stream_attr(stream: t.TextIO, attr: str, value: str | None) -> bool:
     """A stream attribute is compatible if it is equal to the
     desired value or the desired value is unset and the attribute
     has a value.
@@ -221,7 +225,7 @@ def _is_compat_stream_attr(stream: t.TextIO, attr: str, value: t.Optional[str])
 
 
 def _is_compatible_text_stream(
-    stream: t.TextIO, encoding: t.Optional[str], errors: t.Optional[str]
+    stream: t.TextIO, encoding: str | None, errors: str | None
 ) -> bool:
     """Check if a stream's encoding and errors attributes are
     compatible with the desired values.
@@ -233,10 +237,10 @@ def _is_compatible_text_stream(
 
 def _force_correct_text_stream(
     text_stream: t.IO[t.Any],
-    encoding: t.Optional[str],
-    errors: t.Optional[str],
+    encoding: str | None,
+    errors: str | None,
     is_binary: t.Callable[[t.IO[t.Any], bool], bool],
-    find_binary: t.Callable[[t.IO[t.Any]], t.Optional[t.BinaryIO]],
+    find_binary: t.Callable[[t.IO[t.Any]], t.BinaryIO | None],
     force_readable: bool = False,
     force_writable: bool = False,
 ) -> t.TextIO:
@@ -279,8 +283,8 @@ def _force_correct_text_stream(
 
 def _force_correct_text_reader(
     text_reader: t.IO[t.Any],
-    encoding: t.Optional[str],
-    errors: t.Optional[str],
+    encoding: str | None,
+    errors: str | None,
     force_readable: bool = False,
 ) -> t.TextIO:
     return _force_correct_text_stream(
@@ -295,8 +299,8 @@ def _force_correct_text_reader(
 
 def _force_correct_text_writer(
     text_writer: t.IO[t.Any],
-    encoding: t.Optional[str],
-    errors: t.Optional[str],
+    encoding: str | None,
+    errors: str | None,
     force_writable: bool = False,
 ) -> t.TextIO:
     return _force_correct_text_stream(
@@ -330,27 +334,21 @@ def get_binary_stderr() -> t.BinaryIO:
     return writer
 
 
-def get_text_stdin(
-    encoding: t.Optional[str] = None, errors: t.Optional[str] = None
-) -> t.TextIO:
+def get_text_stdin(encoding: str | None = None, errors: str | None = None) -> t.TextIO:
     rv = _get_windows_console_stream(sys.stdin, encoding, errors)
     if rv is not None:
         return rv
     return _force_correct_text_reader(sys.stdin, encoding, errors, force_readable=True)
 
 
-def get_text_stdout(
-    encoding: t.Optional[str] = None, errors: t.Optional[str] = None
-) -> t.TextIO:
+def get_text_stdout(encoding: str | None = None, errors: str | None = None) -> t.TextIO:
     rv = _get_windows_console_stream(sys.stdout, encoding, errors)
     if rv is not None:
         return rv
     return _force_correct_text_writer(sys.stdout, encoding, errors, force_writable=True)
 
 
-def get_text_stderr(
-    encoding: t.Optional[str] = None, errors: t.Optional[str] = None
-) -> t.TextIO:
+def get_text_stderr(encoding: str | None = None, errors: str | None = None) -> t.TextIO:
     rv = _get_windows_console_stream(sys.stderr, encoding, errors)
     if rv is not None:
         return rv
@@ -358,10 +356,10 @@ def get_text_stderr(
 
 
 def _wrap_io_open(
-    file: t.Union[str, "os.PathLike[str]", int],
+    file: str | os.PathLike[str] | int,
     mode: str,
-    encoding: t.Optional[str],
-    errors: t.Optional[str],
+    encoding: str | None,
+    errors: str | None,
 ) -> t.IO[t.Any]:
     """Handles not passing ``encoding`` and ``errors`` in binary mode."""
     if "b" in mode:
@@ -371,12 +369,12 @@ def _wrap_io_open(
 
 
 def open_stream(
-    filename: "t.Union[str, os.PathLike[str]]",
+    filename: str | os.PathLike[str],
     mode: str = "r",
-    encoding: t.Optional[str] = None,
-    errors: t.Optional[str] = "strict",
+    encoding: str | None = None,
+    errors: str | None = "strict",
     atomic: bool = False,
-) -> t.Tuple[t.IO[t.Any], bool]:
+) -> tuple[t.IO[t.Any], bool]:
     binary = "b" in mode
     filename = os.fspath(filename)
 
@@ -416,7 +414,7 @@ def open_stream(
     import random
 
     try:
-        perm: t.Optional[int] = os.stat(filename).st_mode
+        perm: int | None = os.stat(filename).st_mode
     except OSError:
         perm = None
 
@@ -472,10 +470,15 @@ def close(self, delete: bool = False) -> None:
     def __getattr__(self, name: str) -> t.Any:
         return getattr(self._f, name)
 
-    def __enter__(self) -> "_AtomicFile":
+    def __enter__(self) -> _AtomicFile:
         return self
 
-    def __exit__(self, exc_type: t.Optional[t.Type[BaseException]], *_: t.Any) -> None:
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: TracebackType | None,
+    ) -> None:
         self.close(delete=exc_type is not None)
 
     def __repr__(self) -> str:
@@ -494,7 +497,7 @@ def _is_jupyter_kernel_output(stream: t.IO[t.Any]) -> bool:
 
 
 def should_strip_ansi(
-    stream: t.Optional[t.IO[t.Any]] = None, color: t.Optional[bool] = None
+    stream: t.IO[t.Any] | None = None, color: bool | None = None
 ) -> bool:
     if color is None:
         if stream is None:
@@ -514,11 +517,9 @@ def _get_argv_encoding() -> str:
 
         return locale.getpreferredencoding()
 
-    _ansi_stream_wrappers: t.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
+    _ansi_stream_wrappers: cabc.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
 
-    def auto_wrap_for_ansi(
-        stream: t.TextIO, color: t.Optional[bool] = None
-    ) -> t.TextIO:
+    def auto_wrap_for_ansi(stream: t.TextIO, color: bool | None = None) -> t.TextIO:
         """Support ANSI color and style codes on Windows by wrapping a
         stream with colorama.
         """
@@ -537,14 +538,14 @@ def auto_wrap_for_ansi(
         rv = t.cast(t.TextIO, ansi_wrapper.stream)
         _write = rv.write
 
-        def _safe_write(s):
+        def _safe_write(s: str) -> int:
             try:
                 return _write(s)
             except BaseException:
                 ansi_wrapper.reset_all()
                 raise
 
-        rv.write = _safe_write
+        rv.write = _safe_write  # type: ignore[method-assign]
 
         try:
             _ansi_stream_wrappers[stream] = rv
@@ -559,8 +560,8 @@ def _get_argv_encoding() -> str:
         return getattr(sys.stdin, "encoding", None) or sys.getfilesystemencoding()
 
     def _get_windows_console_stream(
-        f: t.TextIO, encoding: t.Optional[str], errors: t.Optional[str]
-    ) -> t.Optional[t.TextIO]:
+        f: t.TextIO, encoding: str | None, errors: str | None
+    ) -> t.TextIO | None:
         return None
 
 
@@ -576,12 +577,12 @@ def isatty(stream: t.IO[t.Any]) -> bool:
 
 
 def _make_cached_stream_func(
-    src_func: t.Callable[[], t.Optional[t.TextIO]],
+    src_func: t.Callable[[], t.TextIO | None],
     wrapper_func: t.Callable[[], t.TextIO],
-) -> t.Callable[[], t.Optional[t.TextIO]]:
-    cache: t.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
+) -> t.Callable[[], t.TextIO | None]:
+    cache: cabc.MutableMapping[t.TextIO, t.TextIO] = WeakKeyDictionary()
 
-    def func() -> t.Optional[t.TextIO]:
+    def func() -> t.TextIO | None:
         stream = src_func()
 
         if stream is None:
@@ -608,15 +609,13 @@ def func() -> t.Optional[t.TextIO]:
 _default_text_stderr = _make_cached_stream_func(lambda: sys.stderr, get_text_stderr)
 
 
-binary_streams: t.Mapping[str, t.Callable[[], t.BinaryIO]] = {
+binary_streams: cabc.Mapping[str, t.Callable[[], t.BinaryIO]] = {
     "stdin": get_binary_stdin,
     "stdout": get_binary_stdout,
     "stderr": get_binary_stderr,
 }
 
-text_streams: t.Mapping[
-    str, t.Callable[[t.Optional[str], t.Optional[str]], t.TextIO]
-] = {
+text_streams: cabc.Mapping[str, t.Callable[[str | None, str | None], t.TextIO]] = {
     "stdin": get_text_stdin,
     "stdout": get_text_stdout,
     "stderr": get_text_stderr,
diff --git a/libs/click/_termui_impl.py b/libs/click/_termui_impl.py
index ad9f8f6c93..ee8225c4c2 100644
--- a/libs/click/_termui_impl.py
+++ b/libs/click/_termui_impl.py
@@ -4,15 +4,19 @@
 placed in this module and only imported as needed.
 """
 
+from __future__ import annotations
+
+import collections.abc as cabc
 import contextlib
 import math
 import os
+import shlex
 import sys
 import time
 import typing as t
 from gettext import gettext as _
 from io import StringIO
-from shutil import which
+from pathlib import Path
 from types import TracebackType
 
 from ._compat import _default_text_stdout
@@ -39,19 +43,20 @@
 class ProgressBar(t.Generic[V]):
     def __init__(
         self,
-        iterable: t.Optional[t.Iterable[V]],
-        length: t.Optional[int] = None,
+        iterable: cabc.Iterable[V] | None,
+        length: int | None = None,
         fill_char: str = "#",
         empty_char: str = " ",
         bar_template: str = "%(bar)s",
         info_sep: str = "  ",
+        hidden: bool = False,
         show_eta: bool = True,
-        show_percent: t.Optional[bool] = None,
+        show_percent: bool | None = None,
         show_pos: bool = False,
-        item_show_func: t.Optional[t.Callable[[t.Optional[V]], t.Optional[str]]] = None,
-        label: t.Optional[str] = None,
-        file: t.Optional[t.TextIO] = None,
-        color: t.Optional[bool] = None,
+        item_show_func: t.Callable[[V | None], str | None] | None = None,
+        label: str | None = None,
+        file: t.TextIO | None = None,
+        color: bool | None = None,
         update_min_steps: int = 1,
         width: int = 30,
     ) -> None:
@@ -59,6 +64,7 @@ def __init__(
         self.empty_char = empty_char
         self.bar_template = bar_template
         self.info_sep = info_sep
+        self.hidden = hidden
         self.show_eta = show_eta
         self.show_percent = show_percent
         self.show_pos = show_pos
@@ -90,36 +96,36 @@ def __init__(
         if iterable is None:
             if length is None:
                 raise TypeError("iterable or length is required")
-            iterable = t.cast(t.Iterable[V], range(length))
-        self.iter: t.Iterable[V] = iter(iterable)
+            iterable = t.cast("cabc.Iterable[V]", range(length))
+        self.iter: cabc.Iterable[V] = iter(iterable)
         self.length = length
-        self.pos = 0
-        self.avg: t.List[float] = []
+        self.pos: int = 0
+        self.avg: list[float] = []
         self.last_eta: float
         self.start: float
         self.start = self.last_eta = time.time()
         self.eta_known: bool = False
         self.finished: bool = False
-        self.max_width: t.Optional[int] = None
+        self.max_width: int | None = None
         self.entered: bool = False
-        self.current_item: t.Optional[V] = None
-        self.is_hidden: bool = not isatty(self.file)
-        self._last_line: t.Optional[str] = None
+        self.current_item: V | None = None
+        self._is_atty = isatty(self.file)
+        self._last_line: str | None = None
 
-    def __enter__(self) -> "ProgressBar[V]":
+    def __enter__(self) -> ProgressBar[V]:
         self.entered = True
         self.render_progress()
         return self
 
     def __exit__(
         self,
-        exc_type: t.Optional[t.Type[BaseException]],
-        exc_value: t.Optional[BaseException],
-        tb: t.Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: TracebackType | None,
     ) -> None:
         self.render_finish()
 
-    def __iter__(self) -> t.Iterator[V]:
+    def __iter__(self) -> cabc.Iterator[V]:
         if not self.entered:
             raise RuntimeError("You need to use progress bars in a with block.")
         self.render_progress()
@@ -134,7 +140,7 @@ def __next__(self) -> V:
         return next(iter(self))
 
     def render_finish(self) -> None:
-        if self.is_hidden:
+        if self.hidden or not self._is_atty:
             return
         self.file.write(AFTER_BAR)
         self.file.flush()
@@ -228,27 +234,28 @@ def format_progress_line(self) -> str:
         ).rstrip()
 
     def render_progress(self) -> None:
-        import shutil
+        if self.hidden:
+            return
 
-        if self.is_hidden:
-            # Only output the label as it changes if the output is not a
-            # TTY. Use file=stderr if you expect to be piping stdout.
+        if not self._is_atty:
+            # Only output the label once if the output is not a TTY.
             if self._last_line != self.label:
                 self._last_line = self.label
                 echo(self.label, file=self.file, color=self.color)
-
             return
 
         buf = []
         # Update width in case the terminal has been resized
         if self.autowidth:
+            import shutil
+
             old_width = self.width
             self.width = 0
             clutter_length = term_len(self.format_progress_line())
             new_width = max(0, shutil.get_terminal_size().columns - clutter_length)
-            if new_width < old_width:
+            if new_width < old_width and self.max_width is not None:
                 buf.append(BEFORE_BAR)
-                buf.append(" " * self.max_width)  # type: ignore
+                buf.append(" " * self.max_width)
                 self.max_width = new_width
             self.width = new_width
 
@@ -294,7 +301,7 @@ def make_step(self, n_steps: int) -> None:
 
         self.eta_known = self.length is not None
 
-    def update(self, n_steps: int, current_item: t.Optional[V] = None) -> None:
+    def update(self, n_steps: int, current_item: V | None = None) -> None:
         """Update the progress bar by advancing a specified number of
         steps, and optionally set the ``current_item`` for this new
         position.
@@ -325,7 +332,7 @@ def finish(self) -> None:
         self.current_item = None
         self.finished = True
 
-    def generator(self) -> t.Iterator[V]:
+    def generator(self) -> cabc.Iterator[V]:
         """Return a generator which yields the items added to the bar
         during construction, and updates the progress bar *after* the
         yielded block returns.
@@ -340,7 +347,7 @@ def generator(self) -> t.Iterator[V]:
         if not self.entered:
             raise RuntimeError("You need to use progress bars in a with block.")
 
-        if self.is_hidden:
+        if not self._is_atty:
             yield from self.iter
         else:
             for rv in self.iter:
@@ -359,7 +366,7 @@ def generator(self) -> t.Iterator[V]:
             self.render_progress()
 
 
-def pager(generator: t.Iterable[str], color: t.Optional[bool] = None) -> None:
+def pager(generator: cabc.Iterable[str], color: bool | None = None) -> None:
     """Decide what method to use for paging through text."""
     stdout = _default_text_stdout()
 
@@ -370,20 +377,23 @@ def pager(generator: t.Iterable[str], color: t.Optional[bool] = None) -> None:
 
     if not isatty(sys.stdin) or not isatty(stdout):
         return _nullpager(stdout, generator, color)
-    pager_cmd = (os.environ.get("PAGER", None) or "").strip()
-    if pager_cmd:
+
+    # Split and normalize the pager command into parts.
+    pager_cmd_parts = shlex.split(os.environ.get("PAGER", ""), posix=False)
+    if pager_cmd_parts:
         if WIN:
-            if _tempfilepager(generator, pager_cmd, color):
+            if _tempfilepager(generator, pager_cmd_parts, color):
                 return
-        elif _pipepager(generator, pager_cmd, color):
+        elif _pipepager(generator, pager_cmd_parts, color):
             return
+
     if os.environ.get("TERM") in ("dumb", "emacs"):
         return _nullpager(stdout, generator, color)
     if (WIN or sys.platform.startswith("os2")) and _tempfilepager(
-        generator, "more", color
+        generator, ["more"], color
     ):
         return
-    if _pipepager(generator, "less", color):
+    if _pipepager(generator, ["less"], color):
         return
 
     import tempfile
@@ -391,33 +401,50 @@ def pager(generator: t.Iterable[str], color: t.Optional[bool] = None) -> None:
     fd, filename = tempfile.mkstemp()
     os.close(fd)
     try:
-        if _pipepager(generator, "more", color):
+        if _pipepager(generator, ["more"], color):
             return
         return _nullpager(stdout, generator, color)
     finally:
         os.unlink(filename)
 
 
-def _pipepager(generator: t.Iterable[str], cmd: str, color: t.Optional[bool]) -> bool:
-    """Page through text by feeding it to another program.  Invoking a
+def _pipepager(
+    generator: cabc.Iterable[str], cmd_parts: list[str], color: bool | None
+) -> bool:
+    """Page through text by feeding it to another program. Invoking a
     pager through this might support colors.
 
-    Returns True if the command was found, False otherwise and thus another
+    Returns `True` if the command was found, `False` otherwise and thus another
     pager should be attempted.
     """
-    cmd_absolute = which(cmd)
-    if cmd_absolute is None:
+    # Split the command into the invoked CLI and its parameters.
+    if not cmd_parts:
         return False
 
+    import shutil
+
+    cmd = cmd_parts[0]
+    cmd_params = cmd_parts[1:]
+
+    cmd_filepath = shutil.which(cmd)
+    if not cmd_filepath:
+        return False
+
+    # Produces a normalized absolute path string.
+    # multi-call binaries such as busybox derive their identity from the symlink
+    # less -> busybox. resolve() causes them to misbehave. (eg. less becomes busybox)
+    cmd_path = Path(cmd_filepath).absolute()
+    cmd_name = cmd_path.name
+
     import subprocess
 
+    # Make a local copy of the environment to not affect the global one.
     env = dict(os.environ)
 
-    # If we're piping to less we might support colors under the
-    # condition that
-    cmd_detail = cmd.rsplit("/", 1)[-1].split()
-    if color is None and cmd_detail[0] == "less":
-        less_flags = f"{os.environ.get('LESS', '')}{' '.join(cmd_detail[1:])}"
+    # If we're piping to less and the user hasn't decided on colors, we enable
+    # them by default we find the -R flag in the command line arguments.
+    if color is None and cmd_name == "less":
+        less_flags = f"{os.environ.get('LESS', '')}{' '.join(cmd_params)}"
         if not less_flags:
             env["LESS"] = "-R"
             color = True
@@ -425,8 +452,8 @@ def _pipepager(generator: t.Iterable[str], cmd: str, color: t.Optional[bool]) ->
             color = True
 
     c = subprocess.Popen(
-        [cmd_absolute],
-        shell=True,
+        [str(cmd_path)] + cmd_params,
+        shell=False,
         stdin=subprocess.PIPE,
         env=env,
         errors="replace",
@@ -439,44 +466,67 @@ def _pipepager(generator: t.Iterable[str], cmd: str, color: t.Optional[bool]) ->
                 text = strip_ansi(text)
 
             c.stdin.write(text)
-    except (OSError, KeyboardInterrupt):
+    except BrokenPipeError:
+        # In case the pager exited unexpectedly, ignore the broken pipe error.
         pass
-    else:
-        c.stdin.close()
-
-    # Less doesn't respect ^C, but catches it for its own UI purposes (aborting
-    # search or other commands inside less).
-    #
-    # That means when the user hits ^C, the parent process (click) terminates,
-    # but less is still alive, paging the output and messing up the terminal.
-    #
-    # If the user wants to make the pager exit on ^C, they should set
-    # `LESS='-K'`. It's not our decision to make.
-    while True:
+    except Exception as e:
+        # In case there is an exception we want to close the pager immediately
+        # and let the caller handle it.
+        # Otherwise the pager will keep running, and the user may not notice
+        # the error message, or worse yet it may leave the terminal in a broken state.
+        c.terminate()
+        raise e
+    finally:
+        # We must close stdin and wait for the pager to exit before we continue
         try:
-            c.wait()
-        except KeyboardInterrupt:
+            c.stdin.close()
+        # Close implies flush, so it might throw a BrokenPipeError if the pager
+        # process exited already.
+        except BrokenPipeError:
             pass
-        else:
-            break
+
+        # Less doesn't respect ^C, but catches it for its own UI purposes (aborting
+        # search or other commands inside less).
+        #
+        # That means when the user hits ^C, the parent process (click) terminates,
+        # but less is still alive, paging the output and messing up the terminal.
+        #
+        # If the user wants to make the pager exit on ^C, they should set
+        # `LESS='-K'`. It's not our decision to make.
+        while True:
+            try:
+                c.wait()
+            except KeyboardInterrupt:
+                pass
+            else:
+                break
 
     return True
 
 
 def _tempfilepager(
-    generator: t.Iterable[str],
-    cmd: str,
-    color: t.Optional[bool],
+    generator: cabc.Iterable[str], cmd_parts: list[str], color: bool | None
 ) -> bool:
     """Page through text by invoking a program on a temporary file.
 
-    Returns True if the command was found, False otherwise and thus another
+    Returns `True` if the command was found, `False` otherwise and thus another
     pager should be attempted.
     """
-    # Which is necessary for Windows, it is also recommended in the Popen docs.
-    cmd_absolute = which(cmd)
-    if cmd_absolute is None:
+    # Split the command into the invoked CLI and its parameters.
+    if not cmd_parts:
+        return False
+
+    import shutil
+
+    cmd = cmd_parts[0]
+
+    cmd_filepath = shutil.which(cmd)
+    if not cmd_filepath:
         return False
+    # Produces a normalized absolute path string.
+    # multi-call binaries such as busybox derive their identity from the symlink
+    # less -> busybox. resolve() causes them to misbehave. (eg. less becomes busybox)
+    cmd_path = Path(cmd_filepath).absolute()
 
     import subprocess
     import tempfile
@@ -490,7 +540,7 @@ def _tempfilepager(
     with open_stream(filename, "wb")[0] as f:
         f.write(text.encode(encoding))
     try:
-        subprocess.call([cmd_absolute, filename])
+        subprocess.call([str(cmd_path), filename])
     except OSError:
         # Command not found
         pass
@@ -502,7 +552,7 @@ def _tempfilepager(
 
 
 def _nullpager(
-    stream: t.TextIO, generator: t.Iterable[str], color: t.Optional[bool]
+    stream: t.TextIO, generator: cabc.Iterable[str], color: bool | None
 ) -> None:
     """Simply print unformatted text.  This is the ultimate fallback."""
     for text in generator:
@@ -514,8 +564,8 @@ def _nullpager(
 class Editor:
     def __init__(
         self,
-        editor: t.Optional[str] = None,
-        env: t.Optional[t.Mapping[str, str]] = None,
+        editor: str | None = None,
+        env: cabc.Mapping[str, str] | None = None,
         require_save: bool = True,
         extension: str = ".txt",
     ) -> None:
@@ -533,23 +583,30 @@ def get_editor(self) -> str:
                 return rv
         if WIN:
             return "notepad"
+
+        from shutil import which
+
         for editor in "sensible-editor", "vim", "nano":
             if which(editor) is not None:
                 return editor
         return "vi"
 
-    def edit_file(self, filename: str) -> None:
+    def edit_files(self, filenames: cabc.Iterable[str]) -> None:
         import subprocess
 
         editor = self.get_editor()
-        environ: t.Optional[t.Dict[str, str]] = None
+        environ: dict[str, str] | None = None
 
         if self.env:
             environ = os.environ.copy()
             environ.update(self.env)
 
+        exc_filename = " ".join(f'"{filename}"' for filename in filenames)
+
         try:
-            c = subprocess.Popen(f'{editor} "{filename}"', env=environ, shell=True)
+            c = subprocess.Popen(
+                args=f"{editor} {exc_filename}", env=environ, shell=True
+            )
             exit_code = c.wait()
             if exit_code != 0:
                 raise ClickException(
@@ -560,11 +617,19 @@ def edit_file(self, filename: str) -> None:
                 _("{editor}: Editing failed: {e}").format(editor=editor, e=e)
             ) from e
 
-    def edit(self, text: t.Optional[t.AnyStr]) -> t.Optional[t.AnyStr]:
+    @t.overload
+    def edit(self, text: bytes | bytearray) -> bytes | None: ...
+
+    # We cannot know whether or not the type expected is str or bytes when None
+    # is passed, so str is returned as that was what was done before.
+    @t.overload
+    def edit(self, text: str | None) -> str | None: ...
+
+    def edit(self, text: str | bytes | bytearray | None) -> str | bytes | None:
         import tempfile
 
-        if not text:
-            data = b""
+        if text is None:
+            data: bytes | bytearray = b""
         elif isinstance(text, (bytes, bytearray)):
             data = text
         else:
@@ -592,7 +657,7 @@ def edit(self, text: t.Optional[t.AnyStr]) -> t.Optional[t.AnyStr]:
             # recorded, so get the new recorded value.
             timestamp = os.path.getmtime(name)
 
-            self.edit_file(name)
+            self.edit_files((name,))
 
             if self.require_save and os.path.getmtime(name) == timestamp:
                 return None
@@ -603,7 +668,7 @@ def edit(self, text: t.Optional[t.AnyStr]) -> t.Optional[t.AnyStr]:
             if isinstance(text, (bytes, bytearray)):
                 return rv
 
-            return rv.decode("utf-8-sig").replace("\r\n", "\n")  # type: ignore
+            return rv.decode("utf-8-sig").replace("\r\n", "\n")
         finally:
             os.unlink(name)
 
@@ -679,7 +744,7 @@ def _unquote_file(url: str) -> str:
         return 1
 
 
-def _translate_ch_to_exc(ch: str) -> t.Optional[BaseException]:
+def _translate_ch_to_exc(ch: str) -> None:
     if ch == "\x03":
         raise KeyboardInterrupt()
 
@@ -692,11 +757,11 @@ def _translate_ch_to_exc(ch: str) -> t.Optional[BaseException]:
     return None
 
 
-if WIN:
+if sys.platform == "win32":
     import msvcrt
 
     @contextlib.contextmanager
-    def raw_terminal() -> t.Iterator[int]:
+    def raw_terminal() -> cabc.Iterator[int]:
         yield -1
 
     def getchar(echo: bool) -> str:
@@ -729,12 +794,11 @@ def getchar(echo: bool) -> str:
         #
         # Anyway, Click doesn't claim to do this Right(tm), and using `getwch`
         # is doing the right thing in more situations than with `getch`.
-        func: t.Callable[[], str]
 
         if echo:
-            func = msvcrt.getwche  # type: ignore
+            func = t.cast(t.Callable[[], str], msvcrt.getwche)
         else:
-            func = msvcrt.getwch  # type: ignore
+            func = t.cast(t.Callable[[], str], msvcrt.getwch)
 
         rv = func()
 
@@ -751,8 +815,8 @@ def getchar(echo: bool) -> str:
     import tty
 
     @contextlib.contextmanager
-    def raw_terminal() -> t.Iterator[int]:
-        f: t.Optional[t.TextIO]
+    def raw_terminal() -> cabc.Iterator[int]:
+        f: t.TextIO | None
         fd: int
 
         if not isatty(sys.stdin):
diff --git a/libs/click/_textwrap.py b/libs/click/_textwrap.py
index b47dcbd426..97fbee3dc6 100644
--- a/libs/click/_textwrap.py
+++ b/libs/click/_textwrap.py
@@ -1,13 +1,15 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import textwrap
-import typing as t
 from contextlib import contextmanager
 
 
 class TextWrapper(textwrap.TextWrapper):
     def _handle_long_word(
         self,
-        reversed_chunks: t.List[str],
-        cur_line: t.List[str],
+        reversed_chunks: list[str],
+        cur_line: list[str],
         cur_len: int,
         width: int,
     ) -> None:
@@ -23,7 +25,7 @@ def _handle_long_word(
             cur_line.append(reversed_chunks.pop())
 
     @contextmanager
-    def extra_indent(self, indent: str) -> t.Iterator[None]:
+    def extra_indent(self, indent: str) -> cabc.Iterator[None]:
         old_initial_indent = self.initial_indent
         old_subsequent_indent = self.subsequent_indent
         self.initial_indent += indent
diff --git a/libs/click/_utils.py b/libs/click/_utils.py
new file mode 100644
index 0000000000..09fb00855e
--- /dev/null
+++ b/libs/click/_utils.py
@@ -0,0 +1,36 @@
+from __future__ import annotations
+
+import enum
+import typing as t
+
+
+class Sentinel(enum.Enum):
+    """Enum used to define sentinel values.
+
+    .. seealso::
+
+        `PEP 661 - Sentinel Values <https://peps.python.org/pep-0661/>`_.
+    """
+
+    UNSET = object()
+    FLAG_NEEDS_VALUE = object()
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}.{self.name}"
+
+
+UNSET = Sentinel.UNSET
+"""Sentinel used to indicate that a value is not set."""
+
+FLAG_NEEDS_VALUE = Sentinel.FLAG_NEEDS_VALUE
+"""Sentinel used to indicate an option was passed as a flag without a
+value but is not a flag option.
+
+``Option.consume_value`` uses this to prompt or use the ``flag_value``.
+"""
+
+T_UNSET = t.Literal[UNSET]  # type: ignore[valid-type]
+"""Type hint for the :data:`UNSET` sentinel value."""
+
+T_FLAG_NEEDS_VALUE = t.Literal[FLAG_NEEDS_VALUE]  # type: ignore[valid-type]
+"""Type hint for the :data:`FLAG_NEEDS_VALUE` sentinel value."""
diff --git a/libs/click/_winconsole.py b/libs/click/_winconsole.py
index 6b20df315b..e56c7c6ae7 100644
--- a/libs/click/_winconsole.py
+++ b/libs/click/_winconsole.py
@@ -6,10 +6,14 @@
 # compared to the original patches as we do not need to patch
 # the entire interpreter but just work in our little world of
 # echo and prompt.
+from __future__ import annotations
+
+import collections.abc as cabc
 import io
 import sys
 import time
 import typing as t
+from ctypes import Array
 from ctypes import byref
 from ctypes import c_char
 from ctypes import c_char_p
@@ -64,6 +68,14 @@
 EOF = b"\x1a"
 MAX_BYTES_WRITTEN = 32767
 
+if t.TYPE_CHECKING:
+    try:
+        # Using `typing_extensions.Buffer` instead of `collections.abc`
+        # on Windows for some reason does not have `Sized` implemented.
+        from collections.abc import Buffer  # type: ignore
+    except ImportError:
+        from typing_extensions import Buffer
+
 try:
     from ctypes import pythonapi
 except ImportError:
@@ -73,7 +85,7 @@
 else:
 
     class Py_buffer(Structure):
-        _fields_ = [
+        _fields_ = [  # noqa: RUF012
             ("buf", c_void_p),
             ("obj", py_object),
             ("len", c_ssize_t),
@@ -90,32 +102,33 @@ class Py_buffer(Structure):
     PyObject_GetBuffer = pythonapi.PyObject_GetBuffer
     PyBuffer_Release = pythonapi.PyBuffer_Release
 
-    def get_buffer(obj, writable=False):
+    def get_buffer(obj: Buffer, writable: bool = False) -> Array[c_char]:
         buf = Py_buffer()
-        flags = PyBUF_WRITABLE if writable else PyBUF_SIMPLE
+        flags: int = PyBUF_WRITABLE if writable else PyBUF_SIMPLE
         PyObject_GetBuffer(py_object(obj), byref(buf), flags)
 
         try:
             buffer_type = c_char * buf.len
-            return buffer_type.from_address(buf.buf)
+            out: Array[c_char] = buffer_type.from_address(buf.buf)
+            return out
         finally:
             PyBuffer_Release(byref(buf))
 
 
 class _WindowsConsoleRawIOBase(io.RawIOBase):
-    def __init__(self, handle):
+    def __init__(self, handle: int | None) -> None:
         self.handle = handle
 
-    def isatty(self):
+    def isatty(self) -> t.Literal[True]:
         super().isatty()
         return True
 
 
 class _WindowsConsoleReader(_WindowsConsoleRawIOBase):
-    def readable(self):
+    def readable(self) -> t.Literal[True]:
         return True
 
-    def readinto(self, b):
+    def readinto(self, b: Buffer) -> int:
         bytes_to_be_read = len(b)
         if not bytes_to_be_read:
             return 0
@@ -147,18 +160,18 @@ def readinto(self, b):
 
 
 class _WindowsConsoleWriter(_WindowsConsoleRawIOBase):
-    def writable(self):
+    def writable(self) -> t.Literal[True]:
         return True
 
     @staticmethod
-    def _get_error_message(errno):
+    def _get_error_message(errno: int) -> str:
         if errno == ERROR_SUCCESS:
             return "ERROR_SUCCESS"
         elif errno == ERROR_NOT_ENOUGH_MEMORY:
             return "ERROR_NOT_ENOUGH_MEMORY"
         return f"Windows error {errno}"
 
-    def write(self, b):
+    def write(self, b: Buffer) -> int:
         bytes_to_be_written = len(b)
         buf = get_buffer(b)
         code_units_to_be_written = min(bytes_to_be_written, MAX_BYTES_WRITTEN) // 2
@@ -196,7 +209,7 @@ def write(self, x: t.AnyStr) -> int:
             pass
         return self.buffer.write(x)
 
-    def writelines(self, lines: t.Iterable[t.AnyStr]) -> None:
+    def writelines(self, lines: cabc.Iterable[t.AnyStr]) -> None:
         for line in lines:
             self.write(line)
 
@@ -206,7 +219,7 @@ def __getattr__(self, name: str) -> t.Any:
     def isatty(self) -> bool:
         return self.buffer.isatty()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<ConsoleStream name={self.name!r} encoding={self.encoding!r}>"
 
 
@@ -240,7 +253,7 @@ def _get_text_stderr(buffer_stream: t.BinaryIO) -> t.TextIO:
     return t.cast(t.TextIO, ConsoleStream(text_stream, buffer_stream))
 
 
-_stream_factories: t.Mapping[int, t.Callable[[t.BinaryIO], t.TextIO]] = {
+_stream_factories: cabc.Mapping[int, t.Callable[[t.BinaryIO], t.TextIO]] = {
     0: _get_text_stdin,
     1: _get_text_stdout,
     2: _get_text_stderr,
@@ -261,19 +274,23 @@ def _is_console(f: t.TextIO) -> bool:
 
 
 def _get_windows_console_stream(
-    f: t.TextIO, encoding: t.Optional[str], errors: t.Optional[str]
-) -> t.Optional[t.TextIO]:
+    f: t.TextIO, encoding: str | None, errors: str | None
+) -> t.TextIO | None:
     if (
-        get_buffer is not None
-        and encoding in {"utf-16-le", None}
-        and errors in {"strict", None}
-        and _is_console(f)
+        get_buffer is None
+        or encoding not in {"utf-16-le", None}
+        or errors not in {"strict", None}
+        or not _is_console(f)
     ):
-        func = _stream_factories.get(f.fileno())
-        if func is not None:
-            b = getattr(f, "buffer", None)
+        return None
+
+    func = _stream_factories.get(f.fileno())
+    if func is None:
+        return None
+
+    b = getattr(f, "buffer", None)
 
-            if b is None:
-                return None
+    if b is None:
+        return None
 
-            return func(b)
+    return func(b)
diff --git a/libs/click/core.py b/libs/click/core.py
index e6305011ad..57f549c793 100644
--- a/libs/click/core.py
+++ b/libs/click/core.py
@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import enum
 import errno
 import inspect
@@ -5,6 +8,8 @@
 import sys
 import typing as t
 from collections import abc
+from collections import Counter
+from contextlib import AbstractContextManager
 from contextlib import contextmanager
 from contextlib import ExitStack
 from functools import update_wrapper
@@ -14,19 +19,21 @@
 from types import TracebackType
 
 from . import types
+from ._utils import FLAG_NEEDS_VALUE
+from ._utils import UNSET
 from .exceptions import Abort
 from .exceptions import BadParameter
 from .exceptions import ClickException
 from .exceptions import Exit
 from .exceptions import MissingParameter
+from .exceptions import NoArgsIsHelpError
 from .exceptions import UsageError
 from .formatting import HelpFormatter
 from .formatting import join_options
 from .globals import pop_context
 from .globals import push_context
-from .parser import _flag_needs_value
-from .parser import OptionParser
-from .parser import split_opt
+from .parser import _OptionParser
+from .parser import _split_opt
 from .termui import confirm
 from .termui import prompt
 from .termui import style
@@ -38,25 +45,22 @@
 from .utils import PacifyFlushWrapper
 
 if t.TYPE_CHECKING:
-    import typing_extensions as te
-
-    from .decorators import HelpOption
     from .shell_completion import CompletionItem
 
-F = t.TypeVar("F", bound=t.Callable[..., t.Any])
+F = t.TypeVar("F", bound="t.Callable[..., t.Any]")
 V = t.TypeVar("V")
 
 
 def _complete_visible_commands(
-    ctx: "Context", incomplete: str
-) -> t.Iterator[t.Tuple[str, "Command"]]:
+    ctx: Context, incomplete: str
+) -> cabc.Iterator[tuple[str, Command]]:
     """List all the subcommands of a group that start with the
     incomplete value and aren't hidden.
 
     :param ctx: Invocation context for the group.
     :param incomplete: Value being completed. May be empty.
     """
-    multi = t.cast(MultiCommand, ctx.command)
+    multi = t.cast(Group, ctx.command)
 
     for name in multi.list_commands(ctx):
         if name.startswith(incomplete):
@@ -66,38 +70,34 @@ def _complete_visible_commands(
                 yield name, command
 
 
-def _check_multicommand(
-    base_command: "MultiCommand", cmd_name: str, cmd: "Command", register: bool = False
+def _check_nested_chain(
+    base_command: Group, cmd_name: str, cmd: Command, register: bool = False
 ) -> None:
-    if not base_command.chain or not isinstance(cmd, MultiCommand):
+    if not base_command.chain or not isinstance(cmd, Group):
         return
+
     if register:
-        hint = (
-            "It is not possible to add multi commands as children to"
-            " another multi command that is in chain mode."
+        message = (
+            f"It is not possible to add the group {cmd_name!r} to another"
+            f" group {base_command.name!r} that is in chain mode."
         )
     else:
-        hint = (
-            "Found a multi command as subcommand to a multi command"
-            " that is in chain mode. This is not supported."
+        message = (
+            f"Found the group {cmd_name!r} as subcommand to another group "
+            f" {base_command.name!r} that is in chain mode. This is not supported."
         )
-    raise RuntimeError(
-        f"{hint}. Command {base_command.name!r} is set to chain and"
-        f" {cmd_name!r} was added as a subcommand but it in itself is a"
-        f" multi command. ({cmd_name!r} is a {type(cmd).__name__}"
-        f" within a chained {type(base_command).__name__} named"
-        f" {base_command.name!r})."
-    )
+
+    raise RuntimeError(message)
 
 
-def batch(iterable: t.Iterable[V], batch_size: int) -> t.List[t.Tuple[V, ...]]:
-    return list(zip(*repeat(iter(iterable), batch_size)))
+def batch(iterable: cabc.Iterable[V], batch_size: int) -> list[tuple[V, ...]]:
+    return list(zip(*repeat(iter(iterable), batch_size), strict=False))
 
 
 @contextmanager
 def augment_usage_errors(
-    ctx: "Context", param: t.Optional["Parameter"] = None
-) -> t.Iterator[None]:
+    ctx: Context, param: Parameter | None = None
+) -> cabc.Iterator[None]:
     """Context manager that attaches extra information to exceptions."""
     try:
         yield
@@ -114,9 +114,9 @@ def augment_usage_errors(
 
 
 def iter_params_for_processing(
-    invocation_order: t.Sequence["Parameter"],
-    declaration_order: t.Sequence["Parameter"],
-) -> t.List["Parameter"]:
+    invocation_order: cabc.Sequence[Parameter],
+    declaration_order: cabc.Sequence[Parameter],
+) -> list[Parameter]:
     """Returns all declared parameters in the order they should be processed.
 
     The declared parameters are re-shuffled depending on the order in which
@@ -129,7 +129,7 @@ def iter_params_for_processing(
     https://click.palletsprojects.com/en/stable/advanced/#callback-evaluation-order
     """
 
-    def sort_key(item: "Parameter") -> t.Tuple[bool, float]:
+    def sort_key(item: Parameter) -> tuple[bool, float]:
         try:
             idx: float = invocation_order.index(item)
         except ValueError:
@@ -237,6 +237,10 @@ class Context:
         context. ``Command.show_default`` overrides this default for the
         specific command.
 
+    .. versionchanged:: 8.2
+        The ``protected_args`` attribute is deprecated and will be removed in
+        Click 9.0. ``args`` will contain remaining unparsed tokens.
+
     .. versionchanged:: 8.1
         The ``show_default`` parameter is overridden by
         ``Command.show_default``, instead of the other way around.
@@ -264,26 +268,26 @@ class Context:
     #: The formatter class to create with :meth:`make_formatter`.
     #:
     #: .. versionadded:: 8.0
-    formatter_class: t.Type["HelpFormatter"] = HelpFormatter
+    formatter_class: type[HelpFormatter] = HelpFormatter
 
     def __init__(
         self,
-        command: "Command",
-        parent: t.Optional["Context"] = None,
-        info_name: t.Optional[str] = None,
-        obj: t.Optional[t.Any] = None,
-        auto_envvar_prefix: t.Optional[str] = None,
-        default_map: t.Optional[t.MutableMapping[str, t.Any]] = None,
-        terminal_width: t.Optional[int] = None,
-        max_content_width: t.Optional[int] = None,
+        command: Command,
+        parent: Context | None = None,
+        info_name: str | None = None,
+        obj: t.Any | None = None,
+        auto_envvar_prefix: str | None = None,
+        default_map: cabc.MutableMapping[str, t.Any] | None = None,
+        terminal_width: int | None = None,
+        max_content_width: int | None = None,
         resilient_parsing: bool = False,
-        allow_extra_args: t.Optional[bool] = None,
-        allow_interspersed_args: t.Optional[bool] = None,
-        ignore_unknown_options: t.Optional[bool] = None,
-        help_option_names: t.Optional[t.List[str]] = None,
-        token_normalize_func: t.Optional[t.Callable[[str], str]] = None,
-        color: t.Optional[bool] = None,
-        show_default: t.Optional[bool] = None,
+        allow_extra_args: bool | None = None,
+        allow_interspersed_args: bool | None = None,
+        ignore_unknown_options: bool | None = None,
+        help_option_names: list[str] | None = None,
+        token_normalize_func: t.Callable[[str], str] | None = None,
+        color: bool | None = None,
+        show_default: bool | None = None,
     ) -> None:
         #: the parent context or `None` if none exists.
         self.parent = parent
@@ -293,23 +297,23 @@ def __init__(
         self.info_name = info_name
         #: Map of parameter names to their parsed values. Parameters
         #: with ``expose_value=False`` are not stored.
-        self.params: t.Dict[str, t.Any] = {}
+        self.params: dict[str, t.Any] = {}
         #: the leftover arguments.
-        self.args: t.List[str] = []
+        self.args: list[str] = []
         #: protected arguments.  These are arguments that are prepended
         #: to `args` when certain parsing scenarios are encountered but
         #: must be never propagated to another arguments.  This is used
         #: to implement nested parsing.
-        self.protected_args: t.List[str] = []
+        self._protected_args: list[str] = []
         #: the collected prefixes of the command's options.
-        self._opt_prefixes: t.Set[str] = set(parent._opt_prefixes) if parent else set()
+        self._opt_prefixes: set[str] = set(parent._opt_prefixes) if parent else set()
 
         if obj is None and parent is not None:
             obj = parent.obj
 
         #: the user object stored.
         self.obj: t.Any = obj
-        self._meta: t.Dict[str, t.Any] = getattr(parent, "meta", {})
+        self._meta: dict[str, t.Any] = getattr(parent, "meta", {})
 
         #: A dictionary (-like object) with defaults for parameters.
         if (
@@ -320,7 +324,7 @@ def __init__(
         ):
             default_map = parent.default_map.get(info_name)
 
-        self.default_map: t.Optional[t.MutableMapping[str, t.Any]] = default_map
+        self.default_map: cabc.MutableMapping[str, t.Any] | None = default_map
 
         #: This flag indicates if a subcommand is going to be executed. A
         #: group callback can use this information to figure out if it's
@@ -332,20 +336,20 @@ def __init__(
         #: any commands are executed.  It is however not possible to
         #: figure out which ones.  If you require this knowledge you
         #: should use a :func:`result_callback`.
-        self.invoked_subcommand: t.Optional[str] = None
+        self.invoked_subcommand: str | None = None
 
         if terminal_width is None and parent is not None:
             terminal_width = parent.terminal_width
 
         #: The width of the terminal (None is autodetection).
-        self.terminal_width: t.Optional[int] = terminal_width
+        self.terminal_width: int | None = terminal_width
 
         if max_content_width is None and parent is not None:
             max_content_width = parent.max_content_width
 
         #: The maximum width of formatted content (None implies a sensible
         #: default which is 80 for most things).
-        self.max_content_width: t.Optional[int] = max_content_width
+        self.max_content_width: int | None = max_content_width
 
         if allow_extra_args is None:
             allow_extra_args = command.allow_extra_args
@@ -385,16 +389,14 @@ def __init__(
                 help_option_names = ["--help"]
 
         #: The names for the help options.
-        self.help_option_names: t.List[str] = help_option_names
+        self.help_option_names: list[str] = help_option_names
 
         if token_normalize_func is None and parent is not None:
             token_normalize_func = parent.token_normalize_func
 
         #: An optional normalization function for tokens.  This is
         #: options, choices, commands etc.
-        self.token_normalize_func: t.Optional[t.Callable[[str], str]] = (
-            token_normalize_func
-        )
+        self.token_normalize_func: t.Callable[[str], str] | None = token_normalize_func
 
         #: Indicates if resilient parsing is enabled.  In that case Click
         #: will do its best to not cause any failures and default values
@@ -419,26 +421,38 @@ def __init__(
         if auto_envvar_prefix is not None:
             auto_envvar_prefix = auto_envvar_prefix.replace("-", "_")
 
-        self.auto_envvar_prefix: t.Optional[str] = auto_envvar_prefix
+        self.auto_envvar_prefix: str | None = auto_envvar_prefix
 
         if color is None and parent is not None:
             color = parent.color
 
         #: Controls if styling output is wanted or not.
-        self.color: t.Optional[bool] = color
+        self.color: bool | None = color
 
         if show_default is None and parent is not None:
             show_default = parent.show_default
 
         #: Show option default values when formatting help text.
-        self.show_default: t.Optional[bool] = show_default
+        self.show_default: bool | None = show_default
 
-        self._close_callbacks: t.List[t.Callable[[], t.Any]] = []
+        self._close_callbacks: list[t.Callable[[], t.Any]] = []
         self._depth = 0
-        self._parameter_source: t.Dict[str, ParameterSource] = {}
+        self._parameter_source: dict[str, ParameterSource] = {}
         self._exit_stack = ExitStack()
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    @property
+    def protected_args(self) -> list[str]:
+        import warnings
+
+        warnings.warn(
+            "'protected_args' is deprecated and will be removed in Click 9.0."
+            " 'args' will contain remaining unparsed tokens.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self._protected_args
+
+    def to_info_dict(self) -> dict[str, t.Any]:
         """Gather information that could be useful for a tool generating
         user-facing documentation. This traverses the entire CLI
         structure.
@@ -459,24 +473,27 @@ def to_info_dict(self) -> t.Dict[str, t.Any]:
             "auto_envvar_prefix": self.auto_envvar_prefix,
         }
 
-    def __enter__(self) -> "Context":
+    def __enter__(self) -> Context:
         self._depth += 1
         push_context(self)
         return self
 
     def __exit__(
         self,
-        exc_type: t.Optional[t.Type[BaseException]],
-        exc_value: t.Optional[BaseException],
-        tb: t.Optional[TracebackType],
-    ) -> None:
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: TracebackType | None,
+    ) -> bool | None:
         self._depth -= 1
+        exit_result: bool | None = None
         if self._depth == 0:
-            self.close()
+            exit_result = self._close_with_exception_info(exc_type, exc_value, tb)
         pop_context()
 
+        return exit_result
+
     @contextmanager
-    def scope(self, cleanup: bool = True) -> t.Iterator["Context"]:
+    def scope(self, cleanup: bool = True) -> cabc.Iterator[Context]:
         """This helper method can be used with the context object to promote
         it to the current thread local (see :func:`get_current_context`).
         The default behavior of this is to invoke the cleanup functions which
@@ -514,7 +531,7 @@ def scope(self, cleanup: bool = True) -> t.Iterator["Context"]:
                 self._depth -= 1
 
     @property
-    def meta(self) -> t.Dict[str, t.Any]:
+    def meta(self) -> dict[str, t.Any]:
         """This is a dictionary which is shared with all the contexts
         that are nested.  It exists so that click utilities can store some
         state here if they need to.  It is however the responsibility of
@@ -555,7 +572,7 @@ def make_formatter(self) -> HelpFormatter:
             width=self.terminal_width, max_width=self.max_content_width
         )
 
-    def with_resource(self, context_manager: t.ContextManager[V]) -> V:
+    def with_resource(self, context_manager: AbstractContextManager[V]) -> V:
         """Register a resource as if it were used in a ``with``
         statement. The resource will be cleaned up when the context is
         popped.
@@ -601,10 +618,26 @@ def close(self) -> None:
         :meth:`call_on_close`, and exit all context managers entered
         with :meth:`with_resource`.
         """
-        self._exit_stack.close()
+        self._close_with_exception_info(None, None, None)
+
+    def _close_with_exception_info(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: TracebackType | None,
+    ) -> bool | None:
+        """Unwind the exit stack by calling its :meth:`__exit__` providing the exception
+        information to allow for exception handling by the various resources registered
+        using :meth;`with_resource`
+
+        :return: Whatever ``exit_stack.__exit__()`` returns.
+        """
+        exit_result = self._exit_stack.__exit__(exc_type, exc_value, tb)
         # In case the context is reused, create a new exit stack.
         self._exit_stack = ExitStack()
 
+        return exit_result
+
     @property
     def command_path(self) -> str:
         """The computed command path.  This is used for the ``usage``
@@ -624,16 +657,16 @@ def command_path(self) -> str:
             rv = f"{' '.join(parent_command_path)} {rv}"
         return rv.lstrip()
 
-    def find_root(self) -> "Context":
+    def find_root(self) -> Context:
         """Finds the outermost context."""
         node = self
         while node.parent is not None:
             node = node.parent
         return node
 
-    def find_object(self, object_type: t.Type[V]) -> t.Optional[V]:
+    def find_object(self, object_type: type[V]) -> V | None:
         """Finds the closest object of a given type."""
-        node: t.Optional[Context] = self
+        node: Context | None = self
 
         while node is not None:
             if isinstance(node.obj, object_type):
@@ -643,7 +676,7 @@ def find_object(self, object_type: t.Type[V]) -> t.Optional[V]:
 
         return None
 
-    def ensure_object(self, object_type: t.Type[V]) -> V:
+    def ensure_object(self, object_type: type[V]) -> V:
         """Like :meth:`find_object` but sets the innermost object to a
         new instance of `object_type` if it does not exist.
         """
@@ -654,15 +687,15 @@ def ensure_object(self, object_type: t.Type[V]) -> V:
 
     @t.overload
     def lookup_default(
-        self, name: str, call: "te.Literal[True]" = True
-    ) -> t.Optional[t.Any]: ...
+        self, name: str, call: t.Literal[True] = True
+    ) -> t.Any | None: ...
 
     @t.overload
     def lookup_default(
-        self, name: str, call: "te.Literal[False]" = ...
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]: ...
+        self, name: str, call: t.Literal[False] = ...
+    ) -> t.Any | t.Callable[[], t.Any] | None: ...
 
-    def lookup_default(self, name: str, call: bool = True) -> t.Optional[t.Any]:
+    def lookup_default(self, name: str, call: bool = True) -> t.Any | None:
         """Get the default for a parameter from :attr:`default_map`.
 
         :param name: Name of the parameter.
@@ -673,16 +706,16 @@ def lookup_default(self, name: str, call: bool = True) -> t.Optional[t.Any]:
             Added the ``call`` parameter.
         """
         if self.default_map is not None:
-            value = self.default_map.get(name)
+            value = self.default_map.get(name, UNSET)
 
             if call and callable(value):
                 return value()
 
             return value
 
-        return None
+        return UNSET
 
-    def fail(self, message: str) -> "te.NoReturn":
+    def fail(self, message: str) -> t.NoReturn:
         """Aborts the execution of the program with a specific error
         message.
 
@@ -690,12 +723,18 @@ def fail(self, message: str) -> "te.NoReturn":
         """
         raise UsageError(message, self)
 
-    def abort(self) -> "te.NoReturn":
+    def abort(self) -> t.NoReturn:
         """Aborts the script."""
         raise Abort()
 
-    def exit(self, code: int = 0) -> "te.NoReturn":
-        """Exits the application with a given exit code."""
+    def exit(self, code: int = 0) -> t.NoReturn:
+        """Exits the application with a given exit code.
+
+        .. versionchanged:: 8.2
+            Callbacks and context managers registered with :meth:`call_on_close`
+            and :meth:`with_resource` are closed before exiting.
+        """
+        self.close()
         raise Exit(code)
 
     def get_usage(self) -> str:
@@ -710,7 +749,7 @@ def get_help(self) -> str:
         """
         return self.command.get_help(self)
 
-    def _make_sub_context(self, command: "Command") -> "Context":
+    def _make_sub_context(self, command: Command) -> Context:
         """Create a new context of the same type as this context, but
         for a new command.
 
@@ -720,26 +759,15 @@ def _make_sub_context(self, command: "Command") -> "Context":
 
     @t.overload
     def invoke(
-        __self,
-        __callback: "t.Callable[..., V]",
-        *args: t.Any,
-        **kwargs: t.Any,
+        self, callback: t.Callable[..., V], /, *args: t.Any, **kwargs: t.Any
     ) -> V: ...
 
     @t.overload
-    def invoke(
-        __self,
-        __callback: "Command",
-        *args: t.Any,
-        **kwargs: t.Any,
-    ) -> t.Any: ...
+    def invoke(self, callback: Command, /, *args: t.Any, **kwargs: t.Any) -> t.Any: ...
 
     def invoke(
-        __self,
-        __callback: t.Union["Command", "t.Callable[..., V]"],
-        *args: t.Any,
-        **kwargs: t.Any,
-    ) -> t.Union[t.Any, V]:
+        self, callback: Command | t.Callable[..., V], /, *args: t.Any, **kwargs: t.Any
+    ) -> t.Any | V:
         """Invokes a command callback in exactly the way it expects.  There
         are two ways to invoke this method:
 
@@ -750,44 +778,52 @@ def invoke(
             (options and click arguments) must be keyword arguments and Click
             will fill in defaults.
 
-        Note that before Click 3.2 keyword arguments were not properly filled
-        in against the intention of this code and no context was created.  For
-        more information about this change and why it was done in a bugfix
-        release see :ref:`upgrade-to-3.2`.
-
         .. versionchanged:: 8.0
             All ``kwargs`` are tracked in :attr:`params` so they will be
             passed if :meth:`forward` is called at multiple levels.
+
+        .. versionchanged:: 3.2
+            A new context is created, and missing arguments use default values.
         """
-        if isinstance(__callback, Command):
-            other_cmd = __callback
+        if isinstance(callback, Command):
+            other_cmd = callback
 
             if other_cmd.callback is None:
                 raise TypeError(
                     "The given command does not have a callback that can be invoked."
                 )
             else:
-                __callback = t.cast("t.Callable[..., V]", other_cmd.callback)
+                callback = t.cast("t.Callable[..., V]", other_cmd.callback)
 
-            ctx = __self._make_sub_context(other_cmd)
+            ctx = self._make_sub_context(other_cmd)
 
             for param in other_cmd.params:
                 if param.name not in kwargs and param.expose_value:
+                    default_value = param.get_default(ctx)
+                    # We explicitly hide the :attr:`UNSET` value to the user, as we
+                    # choose to make it an implementation detail. And because ``invoke``
+                    # has been designed as part of Click public API, we return ``None``
+                    # instead. Refs:
+                    # https://github.com/pallets/click/issues/3066
+                    # https://github.com/pallets/click/issues/3065
+                    # https://github.com/pallets/click/pull/3068
+                    if default_value is UNSET:
+                        default_value = None
                     kwargs[param.name] = param.type_cast_value(  # type: ignore
-                        ctx, param.get_default(ctx)
+                        ctx, default_value
                     )
 
             # Track all kwargs as params, so that forward() will pass
             # them on in subsequent calls.
             ctx.params.update(kwargs)
         else:
-            ctx = __self
+            ctx = self
 
-        with augment_usage_errors(__self):
+        with augment_usage_errors(self):
             with ctx:
-                return __callback(*args, **kwargs)
+                return callback(*args, **kwargs)
 
-    def forward(__self, __cmd: "Command", *args: t.Any, **kwargs: t.Any) -> t.Any:
+    def forward(self, cmd: Command, /, *args: t.Any, **kwargs: t.Any) -> t.Any:
         """Similar to :meth:`invoke` but fills in default keyword
         arguments from the current context if the other command expects
         it.  This cannot invoke callbacks directly, only other commands.
@@ -797,14 +833,14 @@ def forward(__self, __cmd: "Command", *args: t.Any, **kwargs: t.Any) -> t.Any:
             passed if ``forward`` is called at multiple levels.
         """
         # Can only forward to other commands, not direct callbacks.
-        if not isinstance(__cmd, Command):
+        if not isinstance(cmd, Command):
             raise TypeError("Callback is not a command.")
 
-        for param in __self.params:
+        for param in self.params:
             if param not in kwargs:
-                kwargs[param] = __self.params[param]
+                kwargs[param] = self.params[param]
 
-        return __self.invoke(__cmd, *args, **kwargs)
+        return self.invoke(cmd, *args, **kwargs)
 
     def set_parameter_source(self, name: str, source: ParameterSource) -> None:
         """Set the source of a parameter. This indicates the location
@@ -815,7 +851,7 @@ def set_parameter_source(self, name: str, source: ParameterSource) -> None:
         """
         self._parameter_source[name] = source
 
-    def get_parameter_source(self, name: str) -> t.Optional[ParameterSource]:
+    def get_parameter_source(self, name: str) -> ParameterSource | None:
         """Get the source of a parameter. This indicates the location
         from which the value of the parameter was obtained.
 
@@ -834,43 +870,82 @@ def get_parameter_source(self, name: str) -> t.Optional[ParameterSource]:
         return self._parameter_source.get(name)
 
 
-class BaseCommand:
-    """The base command implements the minimal API contract of commands.
-    Most code will never use this as it does not implement a lot of useful
-    functionality but it can act as the direct subclass of alternative
-    parsing methods that do not depend on the Click parser.
-
-    For instance, this can be used to bridge Click and other systems like
-    argparse or docopt.
-
-    Because base commands do not implement a lot of the API that other
-    parts of Click take for granted, they are not supported for all
-    operations.  For instance, they cannot be used with the decorators
-    usually and they have no built-in callback system.
-
-    .. versionchanged:: 2.0
-       Added the `context_settings` parameter.
+class Command:
+    """Commands are the basic building block of command line interfaces in
+    Click.  A basic command handles command line parsing and might dispatch
+    more parsing to commands nested below it.
 
     :param name: the name of the command to use unless a group overrides it.
     :param context_settings: an optional dictionary with defaults that are
                              passed to the context object.
+    :param callback: the callback to invoke.  This is optional.
+    :param params: the parameters to register with this command.  This can
+                   be either :class:`Option` or :class:`Argument` objects.
+    :param help: the help string to use for this command.
+    :param epilog: like the help string but it's printed at the end of the
+                   help page after everything else.
+    :param short_help: the short help to use for this command.  This is
+                       shown on the command listing of the parent command.
+    :param add_help_option: by default each command registers a ``--help``
+                            option.  This can be disabled by this parameter.
+    :param no_args_is_help: this controls what happens if no arguments are
+                            provided.  This option is disabled by default.
+                            If enabled this will add ``--help`` as argument
+                            if no arguments are passed
+    :param hidden: hide this command from help outputs.
+    :param deprecated: If ``True`` or non-empty string, issues a message
+                        indicating that the command is deprecated and highlights
+                        its deprecation in --help. The message can be customized
+                        by using a string as the value.
+
+    .. versionchanged:: 8.2
+        This is the base class for all commands, not ``BaseCommand``.
+        ``deprecated`` can be set to a string as well to customize the
+        deprecation message.
+
+    .. versionchanged:: 8.1
+        ``help``, ``epilog``, and ``short_help`` are stored unprocessed,
+        all formatting is done when outputting help text, not at init,
+        and is done even if not using the ``@command`` decorator.
+
+    .. versionchanged:: 8.0
+        Added a ``repr`` showing the command name.
+
+    .. versionchanged:: 7.1
+        Added the ``no_args_is_help`` parameter.
+
+    .. versionchanged:: 2.0
+        Added the ``context_settings`` parameter.
     """
 
     #: The context class to create with :meth:`make_context`.
     #:
     #: .. versionadded:: 8.0
-    context_class: t.Type[Context] = Context
+    context_class: type[Context] = Context
+
     #: the default for the :attr:`Context.allow_extra_args` flag.
     allow_extra_args = False
+
     #: the default for the :attr:`Context.allow_interspersed_args` flag.
     allow_interspersed_args = True
+
     #: the default for the :attr:`Context.ignore_unknown_options` flag.
     ignore_unknown_options = False
 
     def __init__(
         self,
-        name: t.Optional[str],
-        context_settings: t.Optional[t.MutableMapping[str, t.Any]] = None,
+        name: str | None,
+        context_settings: cabc.MutableMapping[str, t.Any] | None = None,
+        callback: t.Callable[..., t.Any] | None = None,
+        params: list[Parameter] | None = None,
+        help: str | None = None,
+        epilog: str | None = None,
+        short_help: str | None = None,
+        options_metavar: str | None = "[OPTIONS]",
+        add_help_option: bool = True,
+        no_args_is_help: bool = False,
+        hidden: bool = False,
+        deprecated: bool | str = False,
     ) -> None:
         #: the name the command thinks it has.  Upon registering a command
         #: on a :class:`Group` the group will default the command name
@@ -882,36 +957,233 @@ def __init__(
             context_settings = {}
 
         #: an optional dictionary with defaults passed to the context.
-        self.context_settings: t.MutableMapping[str, t.Any] = context_settings
-
-    def to_info_dict(self, ctx: Context) -> t.Dict[str, t.Any]:
-        """Gather information that could be useful for a tool generating
-        user-facing documentation. This traverses the entire structure
-        below this command.
-
-        Use :meth:`click.Context.to_info_dict` to traverse the entire
-        CLI structure.
+        self.context_settings: cabc.MutableMapping[str, t.Any] = context_settings
 
-        :param ctx: A :class:`Context` representing this command.
+        #: the callback to execute when the command fires.  This might be
+        #: `None` in which case nothing happens.
+        self.callback = callback
+        #: the list of parameters for this command in the order they
+        #: should show up in the help page and execute.  Eager parameters
+        #: will automatically be handled before non eager ones.
+        self.params: list[Parameter] = params or []
+        self.help = help
+        self.epilog = epilog
+        self.options_metavar = options_metavar
+        self.short_help = short_help
+        self.add_help_option = add_help_option
+        self._help_option = None
+        self.no_args_is_help = no_args_is_help
+        self.hidden = hidden
+        self.deprecated = deprecated
 
-        .. versionadded:: 8.0
-        """
-        return {"name": self.name}
+    def to_info_dict(self, ctx: Context) -> dict[str, t.Any]:
+        return {
+            "name": self.name,
+            "params": [param.to_info_dict() for param in self.get_params(ctx)],
+            "help": self.help,
+            "epilog": self.epilog,
+            "short_help": self.short_help,
+            "hidden": self.hidden,
+            "deprecated": self.deprecated,
+        }
 
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__} {self.name}>"
 
     def get_usage(self, ctx: Context) -> str:
-        raise NotImplementedError("Base commands cannot get usage")
+        """Formats the usage line into a string and returns it.
+
+        Calls :meth:`format_usage` internally.
+        """
+        formatter = ctx.make_formatter()
+        self.format_usage(ctx, formatter)
+        return formatter.getvalue().rstrip("\n")
+
+    def get_params(self, ctx: Context) -> list[Parameter]:
+        params = self.params
+        help_option = self.get_help_option(ctx)
+
+        if help_option is not None:
+            params = [*params, help_option]
+
+        if __debug__:
+            import warnings
+
+            opts = [opt for param in params for opt in param.opts]
+            opts_counter = Counter(opts)
+            duplicate_opts = (opt for opt, count in opts_counter.items() if count > 1)
+
+            for duplicate_opt in duplicate_opts:
+                warnings.warn(
+                    (
+                        f"The parameter {duplicate_opt} is used more than once. "
+                        "Remove its duplicate as parameters should be unique."
+                    ),
+                    stacklevel=3,
+                )
+
+        return params
+
+    def format_usage(self, ctx: Context, formatter: HelpFormatter) -> None:
+        """Writes the usage line into the formatter.
+
+        This is a low-level method called by :meth:`get_usage`.
+        """
+        pieces = self.collect_usage_pieces(ctx)
+        formatter.write_usage(ctx.command_path, " ".join(pieces))
+
+    def collect_usage_pieces(self, ctx: Context) -> list[str]:
+        """Returns all the pieces that go into the usage line and returns
+        it as a list of strings.
+        """
+        rv = [self.options_metavar] if self.options_metavar else []
+
+        for param in self.get_params(ctx):
+            rv.extend(param.get_usage_pieces(ctx))
+
+        return rv
+
+    def get_help_option_names(self, ctx: Context) -> list[str]:
+        """Returns the names for the help option."""
+        all_names = set(ctx.help_option_names)
+        for param in self.params:
+            all_names.difference_update(param.opts)
+            all_names.difference_update(param.secondary_opts)
+        return list(all_names)
+
+    def get_help_option(self, ctx: Context) -> Option | None:
+        """Returns the help option object.
+
+        Skipped if :attr:`add_help_option` is ``False``.
+
+        .. versionchanged:: 8.1.8
+            The help option is now cached to avoid creating it multiple times.
+        """
+        help_option_names = self.get_help_option_names(ctx)
+
+        if not help_option_names or not self.add_help_option:
+            return None
+
+        # Cache the help option object in private _help_option attribute to
+        # avoid creating it multiple times. Not doing this will break the
+        # callback odering by iter_params_for_processing(), which relies on
+        # object comparison.
+        if self._help_option is None:
+            # Avoid circular import.
+            from .decorators import help_option
+
+            # Apply help_option decorator and pop resulting option
+            help_option(*help_option_names)(self)
+            self._help_option = self.params.pop()  # type: ignore[assignment]
+
+        return self._help_option
+
+    def make_parser(self, ctx: Context) -> _OptionParser:
+        """Creates the underlying option parser for this command."""
+        parser = _OptionParser(ctx)
+        for param in self.get_params(ctx):
+            param.add_to_parser(parser, ctx)
+        return parser
 
     def get_help(self, ctx: Context) -> str:
-        raise NotImplementedError("Base commands cannot get help")
+        """Formats the help into a string and returns it.
+
+        Calls :meth:`format_help` internally.
+        """
+        formatter = ctx.make_formatter()
+        self.format_help(ctx, formatter)
+        return formatter.getvalue().rstrip("\n")
+
+    def get_short_help_str(self, limit: int = 45) -> str:
+        """Gets short help for the command or makes it by shortening the
+        long help string.
+        """
+        if self.short_help:
+            text = inspect.cleandoc(self.short_help)
+        elif self.help:
+            text = make_default_short_help(self.help, limit)
+        else:
+            text = ""
+
+        if self.deprecated:
+            deprecated_message = (
+                f"(DEPRECATED: {self.deprecated})"
+                if isinstance(self.deprecated, str)
+                else "(DEPRECATED)"
+            )
+            text = _("{text} {deprecated_message}").format(
+                text=text, deprecated_message=deprecated_message
+            )
+
+        return text.strip()
+
+    def format_help(self, ctx: Context, formatter: HelpFormatter) -> None:
+        """Writes the help into the formatter if it exists.
+
+        This is a low-level method called by :meth:`get_help`.
+
+        This calls the following methods:
+
+        -   :meth:`format_usage`
+        -   :meth:`format_help_text`
+        -   :meth:`format_options`
+        -   :meth:`format_epilog`
+        """
+        self.format_usage(ctx, formatter)
+        self.format_help_text(ctx, formatter)
+        self.format_options(ctx, formatter)
+        self.format_epilog(ctx, formatter)
+
+    def format_help_text(self, ctx: Context, formatter: HelpFormatter) -> None:
+        """Writes the help text to the formatter if it exists."""
+        if self.help is not None:
+            # truncate the help text to the first form feed
+            text = inspect.cleandoc(self.help).partition("\f")[0]
+        else:
+            text = ""
+
+        if self.deprecated:
+            deprecated_message = (
+                f"(DEPRECATED: {self.deprecated})"
+                if isinstance(self.deprecated, str)
+                else "(DEPRECATED)"
+            )
+            text = _("{text} {deprecated_message}").format(
+                text=text, deprecated_message=deprecated_message
+            )
+
+        if text:
+            formatter.write_paragraph()
+
+            with formatter.indentation():
+                formatter.write_text(text)
+
+    def format_options(self, ctx: Context, formatter: HelpFormatter) -> None:
+        """Writes all the options into the formatter if they exist."""
+        opts = []
+        for param in self.get_params(ctx):
+            rv = param.get_help_record(ctx)
+            if rv is not None:
+                opts.append(rv)
+
+        if opts:
+            with formatter.section(_("Options")):
+                formatter.write_dl(opts)
+
+    def format_epilog(self, ctx: Context, formatter: HelpFormatter) -> None:
+        """Writes the epilog into the formatter if it exists."""
+        if self.epilog:
+            epilog = inspect.cleandoc(self.epilog)
+            formatter.write_paragraph()
+
+            with formatter.indentation():
+                formatter.write_text(epilog)
 
     def make_context(
         self,
-        info_name: t.Optional[str],
-        args: t.List[str],
-        parent: t.Optional[Context] = None,
+        info_name: str | None,
+        args: list[str],
+        parent: Context | None = None,
         **extra: t.Any,
     ) -> Context:
         """This function when given an info name and arguments will kick
@@ -938,55 +1210,107 @@ def make_context(
             if key not in extra:
                 extra[key] = value
 
-        ctx = self.context_class(
-            self,  # type: ignore[arg-type]
-            info_name=info_name,
-            parent=parent,
-            **extra,
-        )
+        ctx = self.context_class(self, info_name=info_name, parent=parent, **extra)
 
         with ctx.scope(cleanup=False):
             self.parse_args(ctx, args)
         return ctx
 
-    def parse_args(self, ctx: Context, args: t.List[str]) -> t.List[str]:
-        """Given a context and a list of arguments this creates the parser
-        and parses the arguments, then modifies the context as necessary.
-        This is automatically invoked by :meth:`make_context`.
-        """
-        raise NotImplementedError("Base commands do not know how to parse arguments.")
+    def parse_args(self, ctx: Context, args: list[str]) -> list[str]:
+        if not args and self.no_args_is_help and not ctx.resilient_parsing:
+            raise NoArgsIsHelpError(ctx)
 
-    def invoke(self, ctx: Context) -> t.Any:
-        """Given a context, this invokes the command.  The default
-        implementation is raising a not implemented error.
-        """
-        raise NotImplementedError("Base commands are not invocable by default")
+        parser = self.make_parser(ctx)
+        opts, args, param_order = parser.parse_args(args=args)
 
-    def shell_complete(self, ctx: Context, incomplete: str) -> t.List["CompletionItem"]:
-        """Return a list of completions for the incomplete value. Looks
-        at the names of chained multi-commands.
+        for param in iter_params_for_processing(param_order, self.get_params(ctx)):
+            _, args = param.handle_parse_result(ctx, opts, args)
+
+        # We now have all parameters' values into `ctx.params`, but the data may contain
+        # the `UNSET` sentinel.
+        # Convert `UNSET` to `None` to ensure that the user doesn't see `UNSET`.
+        #
+        # Waiting until after the initial parse to convert allows us to treat `UNSET`
+        # more like a missing value when multiple params use the same name.
+        # Refs:
+        # https://github.com/pallets/click/issues/3071
+        # https://github.com/pallets/click/pull/3079
+        for name, value in ctx.params.items():
+            if value is UNSET:
+                ctx.params[name] = None
 
-        Any command could be part of a chained multi-command, so sibling
-        commands are valid at any point during command completion. Other
-        command classes will return more completions.
+        if args and not ctx.allow_extra_args and not ctx.resilient_parsing:
+            ctx.fail(
+                ngettext(
+                    "Got unexpected extra argument ({args})",
+                    "Got unexpected extra arguments ({args})",
+                    len(args),
+                ).format(args=" ".join(map(str, args)))
+            )
 
-        :param ctx: Invocation context for this command.
+        ctx.args = args
+        ctx._opt_prefixes.update(parser._opt_prefixes)
+        return args
+
+    def invoke(self, ctx: Context) -> t.Any:
+        """Given a context, this invokes the attached callback (if it exists)
+        in the right way.
+        """
+        if self.deprecated:
+            extra_message = (
+                f" {self.deprecated}" if isinstance(self.deprecated, str) else ""
+            )
+            message = _(
+                "DeprecationWarning: The command {name!r} is deprecated.{extra_message}"
+            ).format(name=self.name, extra_message=extra_message)
+            echo(style(message, fg="red"), err=True)
+
+        if self.callback is not None:
+            return ctx.invoke(self.callback, **ctx.params)
+
+    def shell_complete(self, ctx: Context, incomplete: str) -> list[CompletionItem]:
+        """Return a list of completions for the incomplete value. Looks
+        at the names of options and chained multi-commands.
+
+        Any command could be part of a chained multi-command, so sibling
+        commands are valid at any point during command completion.
+
+        :param ctx: Invocation context for this command.
         :param incomplete: Value being completed. May be empty.
 
         .. versionadded:: 8.0
         """
         from click.shell_completion import CompletionItem
 
-        results: t.List[CompletionItem] = []
+        results: list[CompletionItem] = []
+
+        if incomplete and not incomplete[0].isalnum():
+            for param in self.get_params(ctx):
+                if (
+                    not isinstance(param, Option)
+                    or param.hidden
+                    or (
+                        not param.multiple
+                        and ctx.get_parameter_source(param.name)  # type: ignore
+                        is ParameterSource.COMMANDLINE
+                    )
+                ):
+                    continue
+
+                results.extend(
+                    CompletionItem(name, help=param.help)
+                    for name in [*param.opts, *param.secondary_opts]
+                    if name.startswith(incomplete)
+                )
 
         while ctx.parent is not None:
             ctx = ctx.parent
 
-            if isinstance(ctx.command, MultiCommand) and ctx.command.chain:
+            if isinstance(ctx.command, Group) and ctx.command.chain:
                 results.extend(
                     CompletionItem(name, help=command.get_short_help_str())
                     for name, command in _complete_visible_commands(ctx, incomplete)
-                    if name not in ctx.protected_args
+                    if name not in ctx._protected_args
                 )
 
         return results
@@ -994,28 +1318,28 @@ def shell_complete(self, ctx: Context, incomplete: str) -> t.List["CompletionIte
     @t.overload
     def main(
         self,
-        args: t.Optional[t.Sequence[str]] = None,
-        prog_name: t.Optional[str] = None,
-        complete_var: t.Optional[str] = None,
-        standalone_mode: "te.Literal[True]" = True,
+        args: cabc.Sequence[str] | None = None,
+        prog_name: str | None = None,
+        complete_var: str | None = None,
+        standalone_mode: t.Literal[True] = True,
         **extra: t.Any,
-    ) -> "te.NoReturn": ...
+    ) -> t.NoReturn: ...
 
     @t.overload
     def main(
         self,
-        args: t.Optional[t.Sequence[str]] = None,
-        prog_name: t.Optional[str] = None,
-        complete_var: t.Optional[str] = None,
+        args: cabc.Sequence[str] | None = None,
+        prog_name: str | None = None,
+        complete_var: str | None = None,
         standalone_mode: bool = ...,
         **extra: t.Any,
     ) -> t.Any: ...
 
     def main(
         self,
-        args: t.Optional[t.Sequence[str]] = None,
-        prog_name: t.Optional[str] = None,
-        complete_var: t.Optional[str] = None,
+        args: cabc.Sequence[str] | None = None,
+        prog_name: str | None = None,
+        complete_var: str | None = None,
         standalone_mode: bool = True,
         windows_expand_args: bool = True,
         **extra: t.Any,
@@ -1126,9 +1450,9 @@ def main(
 
     def _main_shell_completion(
         self,
-        ctx_args: t.MutableMapping[str, t.Any],
+        ctx_args: cabc.MutableMapping[str, t.Any],
         prog_name: str,
-        complete_var: t.Optional[str] = None,
+        complete_var: str | None = None,
     ) -> None:
         """Check if the shell is asking for tab completion, process
         that, then exit early. Called from :meth:`main` before the
@@ -1161,416 +1485,250 @@ def __call__(self, *args: t.Any, **kwargs: t.Any) -> t.Any:
         return self.main(*args, **kwargs)
 
 
-class Command(BaseCommand):
-    """Commands are the basic building block of command line interfaces in
-    Click.  A basic command handles command line parsing and might dispatch
-    more parsing to commands nested below it.
+class _FakeSubclassCheck(type):
+    def __subclasscheck__(cls, subclass: type) -> bool:
+        return issubclass(subclass, cls.__bases__[0])
 
-    :param name: the name of the command to use unless a group overrides it.
-    :param context_settings: an optional dictionary with defaults that are
-                             passed to the context object.
-    :param callback: the callback to invoke.  This is optional.
-    :param params: the parameters to register with this command.  This can
-                   be either :class:`Option` or :class:`Argument` objects.
-    :param help: the help string to use for this command.
-    :param epilog: like the help string but it's printed at the end of the
-                   help page after everything else.
-    :param short_help: the short help to use for this command.  This is
-                       shown on the command listing of the parent command.
-    :param add_help_option: by default each command registers a ``--help``
-                            option.  This can be disabled by this parameter.
-    :param no_args_is_help: this controls what happens if no arguments are
-                            provided.  This option is disabled by default.
-                            If enabled this will add ``--help`` as argument
-                            if no arguments are passed
-    :param hidden: hide this command from help outputs.
+    def __instancecheck__(cls, instance: t.Any) -> bool:
+        return isinstance(instance, cls.__bases__[0])
 
-    :param deprecated: issues a message indicating that
-                             the command is deprecated.
 
-    .. versionchanged:: 8.1
-        ``help``, ``epilog``, and ``short_help`` are stored unprocessed,
-        all formatting is done when outputting help text, not at init,
-        and is done even if not using the ``@command`` decorator.
+class _BaseCommand(Command, metaclass=_FakeSubclassCheck):
+    """
+    .. deprecated:: 8.2
+        Will be removed in Click 9.0. Use ``Command`` instead.
+    """
 
-    .. versionchanged:: 8.0
-        Added a ``repr`` showing the command name.
 
-    .. versionchanged:: 7.1
-        Added the ``no_args_is_help`` parameter.
+class Group(Command):
+    """A group is a command that nests other commands (or more groups).
 
-    .. versionchanged:: 2.0
-        Added the ``context_settings`` parameter.
+    :param name: The name of the group command.
+    :param commands: Map names to :class:`Command` objects. Can be a list, which
+        will use :attr:`Command.name` as the keys.
+    :param invoke_without_command: Invoke the group's callback even if a
+        subcommand is not given.
+    :param no_args_is_help: If no arguments are given, show the group's help and
+        exit. Defaults to the opposite of ``invoke_without_command``.
+    :param subcommand_metavar: How to represent the subcommand argument in help.
+        The default will represent whether ``chain`` is set or not.
+    :param chain: Allow passing more than one subcommand argument. After parsing
+        a command's arguments, if any arguments remain another command will be
+        matched, and so on.
+    :param result_callback: A function to call after the group's and
+        subcommand's callbacks. The value returned by the subcommand is passed.
+        If ``chain`` is enabled, the value will be a list of values returned by
+        all the commands. If ``invoke_without_command`` is enabled, the value
+        will be the value returned by the group's callback, or an empty list if
+        ``chain`` is enabled.
+    :param kwargs: Other arguments passed to :class:`Command`.
+
+    .. versionchanged:: 8.0
+        The ``commands`` argument can be a list of command objects.
+
+    .. versionchanged:: 8.2
+        Merged with and replaces the ``MultiCommand`` base class.
     """
 
+    allow_extra_args = True
+    allow_interspersed_args = False
+
+    #: If set, this is used by the group's :meth:`command` decorator
+    #: as the default :class:`Command` class. This is useful to make all
+    #: subcommands use a custom command class.
+    #:
+    #: .. versionadded:: 8.0
+    command_class: type[Command] | None = None
+
+    #: If set, this is used by the group's :meth:`group` decorator
+    #: as the default :class:`Group` class. This is useful to make all
+    #: subgroups use a custom group class.
+    #:
+    #: If set to the special value :class:`type` (literally
+    #: ``group_class = type``), this group's class will be used as the
+    #: default class. This makes a custom group class continue to make
+    #: custom groups.
+    #:
+    #: .. versionadded:: 8.0
+    group_class: type[Group] | type[type] | None = None
+    # Literal[type] isn't valid, so use Type[type]
+
     def __init__(
         self,
-        name: t.Optional[str],
-        context_settings: t.Optional[t.MutableMapping[str, t.Any]] = None,
-        callback: t.Optional[t.Callable[..., t.Any]] = None,
-        params: t.Optional[t.List["Parameter"]] = None,
-        help: t.Optional[str] = None,
-        epilog: t.Optional[str] = None,
-        short_help: t.Optional[str] = None,
-        options_metavar: t.Optional[str] = "[OPTIONS]",
-        add_help_option: bool = True,
-        no_args_is_help: bool = False,
-        hidden: bool = False,
-        deprecated: bool = False,
+        name: str | None = None,
+        commands: cabc.MutableMapping[str, Command]
+        | cabc.Sequence[Command]
+        | None = None,
+        invoke_without_command: bool = False,
+        no_args_is_help: bool | None = None,
+        subcommand_metavar: str | None = None,
+        chain: bool = False,
+        result_callback: t.Callable[..., t.Any] | None = None,
+        **kwargs: t.Any,
     ) -> None:
-        super().__init__(name, context_settings)
-        #: the callback to execute when the command fires.  This might be
-        #: `None` in which case nothing happens.
-        self.callback = callback
-        #: the list of parameters for this command in the order they
-        #: should show up in the help page and execute.  Eager parameters
-        #: will automatically be handled before non eager ones.
-        self.params: t.List[Parameter] = params or []
-        self.help = help
-        self.epilog = epilog
-        self.options_metavar = options_metavar
-        self.short_help = short_help
-        self.add_help_option = add_help_option
-        self._help_option: t.Optional[HelpOption] = None
-        self.no_args_is_help = no_args_is_help
-        self.hidden = hidden
-        self.deprecated = deprecated
+        super().__init__(name, **kwargs)
 
-    def to_info_dict(self, ctx: Context) -> t.Dict[str, t.Any]:
-        info_dict = super().to_info_dict(ctx)
-        info_dict.update(
-            params=[param.to_info_dict() for param in self.get_params(ctx)],
-            help=self.help,
-            epilog=self.epilog,
-            short_help=self.short_help,
-            hidden=self.hidden,
-            deprecated=self.deprecated,
-        )
-        return info_dict
-
-    def get_usage(self, ctx: Context) -> str:
-        """Formats the usage line into a string and returns it.
+        if commands is None:
+            commands = {}
+        elif isinstance(commands, abc.Sequence):
+            commands = {c.name: c for c in commands if c.name is not None}
 
-        Calls :meth:`format_usage` internally.
-        """
-        formatter = ctx.make_formatter()
-        self.format_usage(ctx, formatter)
-        return formatter.getvalue().rstrip("\n")
+        #: The registered subcommands by their exported names.
+        self.commands: cabc.MutableMapping[str, Command] = commands
 
-    def get_params(self, ctx: Context) -> t.List["Parameter"]:
-        rv = self.params
-        help_option = self.get_help_option(ctx)
+        if no_args_is_help is None:
+            no_args_is_help = not invoke_without_command
 
-        if help_option is not None:
-            rv = [*rv, help_option]
+        self.no_args_is_help = no_args_is_help
+        self.invoke_without_command = invoke_without_command
 
-        return rv
+        if subcommand_metavar is None:
+            if chain:
+                subcommand_metavar = "COMMAND1 [ARGS]... [COMMAND2 [ARGS]...]..."
+            else:
+                subcommand_metavar = "COMMAND [ARGS]..."
 
-    def format_usage(self, ctx: Context, formatter: HelpFormatter) -> None:
-        """Writes the usage line into the formatter.
+        self.subcommand_metavar = subcommand_metavar
+        self.chain = chain
+        # The result callback that is stored. This can be set or
+        # overridden with the :func:`result_callback` decorator.
+        self._result_callback = result_callback
 
-        This is a low-level method called by :meth:`get_usage`.
-        """
-        pieces = self.collect_usage_pieces(ctx)
-        formatter.write_usage(ctx.command_path, " ".join(pieces))
+        if self.chain:
+            for param in self.params:
+                if isinstance(param, Argument) and not param.required:
+                    raise RuntimeError(
+                        "A group in chain mode cannot have optional arguments."
+                    )
 
-    def collect_usage_pieces(self, ctx: Context) -> t.List[str]:
-        """Returns all the pieces that go into the usage line and returns
-        it as a list of strings.
-        """
-        rv = [self.options_metavar] if self.options_metavar else []
+    def to_info_dict(self, ctx: Context) -> dict[str, t.Any]:
+        info_dict = super().to_info_dict(ctx)
+        commands = {}
 
-        for param in self.get_params(ctx):
-            rv.extend(param.get_usage_pieces(ctx))
+        for name in self.list_commands(ctx):
+            command = self.get_command(ctx, name)
 
-        return rv
+            if command is None:
+                continue
 
-    def get_help_option_names(self, ctx: Context) -> t.List[str]:
-        """Returns the names for the help option."""
-        all_names = set(ctx.help_option_names)
-        for param in self.params:
-            all_names.difference_update(param.opts)
-            all_names.difference_update(param.secondary_opts)
-        return list(all_names)
+            sub_ctx = ctx._make_sub_context(command)
 
-    def get_help_option(self, ctx: Context) -> t.Optional["Option"]:
-        """Returns the help option object.
+            with sub_ctx.scope(cleanup=False):
+                commands[name] = command.to_info_dict(sub_ctx)
 
-        Unless ``add_help_option`` is ``False``.
+        info_dict.update(commands=commands, chain=self.chain)
+        return info_dict
 
-        .. versionchanged:: 8.1.8
-            The help option is now cached to avoid creating it multiple times.
+    def add_command(self, cmd: Command, name: str | None = None) -> None:
+        """Registers another :class:`Command` with this group.  If the name
+        is not provided, the name of the command is used.
         """
-        help_options = self.get_help_option_names(ctx)
-
-        if not help_options or not self.add_help_option:
-            return None
+        name = name or cmd.name
+        if name is None:
+            raise TypeError("Command has no name.")
+        _check_nested_chain(self, name, cmd, register=True)
+        self.commands[name] = cmd
 
-        # Cache the help option object in private _help_option attribute to
-        # avoid creating it multiple times. Not doing this will break the
-        # callback odering by iter_params_for_processing(), which relies on
-        # object comparison.
-        if self._help_option is None:
-            # Avoid circular import.
-            from .decorators import HelpOption
+    @t.overload
+    def command(self, __func: t.Callable[..., t.Any]) -> Command: ...
 
-            self._help_option = HelpOption(help_options)
+    @t.overload
+    def command(
+        self, *args: t.Any, **kwargs: t.Any
+    ) -> t.Callable[[t.Callable[..., t.Any]], Command]: ...
 
-        return self._help_option
+    def command(
+        self, *args: t.Any, **kwargs: t.Any
+    ) -> t.Callable[[t.Callable[..., t.Any]], Command] | Command:
+        """A shortcut decorator for declaring and attaching a command to
+        the group. This takes the same arguments as :func:`command` and
+        immediately registers the created command with this group by
+        calling :meth:`add_command`.
 
-    def make_parser(self, ctx: Context) -> OptionParser:
-        """Creates the underlying option parser for this command."""
-        parser = OptionParser(ctx)
-        for param in self.get_params(ctx):
-            param.add_to_parser(parser, ctx)
-        return parser
+        To customize the command class used, set the
+        :attr:`command_class` attribute.
 
-    def get_help(self, ctx: Context) -> str:
-        """Formats the help into a string and returns it.
+        .. versionchanged:: 8.1
+            This decorator can be applied without parentheses.
 
-        Calls :meth:`format_help` internally.
+        .. versionchanged:: 8.0
+            Added the :attr:`command_class` attribute.
         """
-        formatter = ctx.make_formatter()
-        self.format_help(ctx, formatter)
-        return formatter.getvalue().rstrip("\n")
+        from .decorators import command
 
-    def get_short_help_str(self, limit: int = 45) -> str:
-        """Gets short help for the command or makes it by shortening the
-        long help string.
-        """
-        if self.short_help:
-            text = inspect.cleandoc(self.short_help)
-        elif self.help:
-            text = make_default_short_help(self.help, limit)
-        else:
-            text = ""
+        func: t.Callable[..., t.Any] | None = None
 
-        if self.deprecated:
-            text = _("(Deprecated) {text}").format(text=text)
+        if args and callable(args[0]):
+            assert len(args) == 1 and not kwargs, (
+                "Use 'command(**kwargs)(callable)' to provide arguments."
+            )
+            (func,) = args
+            args = ()
 
-        return text.strip()
+        if self.command_class and kwargs.get("cls") is None:
+            kwargs["cls"] = self.command_class
 
-    def format_help(self, ctx: Context, formatter: HelpFormatter) -> None:
-        """Writes the help into the formatter if it exists.
-
-        This is a low-level method called by :meth:`get_help`.
-
-        This calls the following methods:
-
-        -   :meth:`format_usage`
-        -   :meth:`format_help_text`
-        -   :meth:`format_options`
-        -   :meth:`format_epilog`
-        """
-        self.format_usage(ctx, formatter)
-        self.format_help_text(ctx, formatter)
-        self.format_options(ctx, formatter)
-        self.format_epilog(ctx, formatter)
-
-    def format_help_text(self, ctx: Context, formatter: HelpFormatter) -> None:
-        """Writes the help text to the formatter if it exists."""
-        if self.help is not None:
-            # truncate the help text to the first form feed
-            text = inspect.cleandoc(self.help).partition("\f")[0]
-        else:
-            text = ""
-
-        if self.deprecated:
-            text = _("(Deprecated) {text}").format(text=text)
-
-        if text:
-            formatter.write_paragraph()
-
-            with formatter.indentation():
-                formatter.write_text(text)
-
-    def format_options(self, ctx: Context, formatter: HelpFormatter) -> None:
-        """Writes all the options into the formatter if they exist."""
-        opts = []
-        for param in self.get_params(ctx):
-            rv = param.get_help_record(ctx)
-            if rv is not None:
-                opts.append(rv)
-
-        if opts:
-            with formatter.section(_("Options")):
-                formatter.write_dl(opts)
-
-    def format_epilog(self, ctx: Context, formatter: HelpFormatter) -> None:
-        """Writes the epilog into the formatter if it exists."""
-        if self.epilog:
-            epilog = inspect.cleandoc(self.epilog)
-            formatter.write_paragraph()
-
-            with formatter.indentation():
-                formatter.write_text(epilog)
-
-    def parse_args(self, ctx: Context, args: t.List[str]) -> t.List[str]:
-        if not args and self.no_args_is_help and not ctx.resilient_parsing:
-            echo(ctx.get_help(), color=ctx.color)
-            ctx.exit()
-
-        parser = self.make_parser(ctx)
-        opts, args, param_order = parser.parse_args(args=args)
+        def decorator(f: t.Callable[..., t.Any]) -> Command:
+            cmd: Command = command(*args, **kwargs)(f)
+            self.add_command(cmd)
+            return cmd
 
-        for param in iter_params_for_processing(param_order, self.get_params(ctx)):
-            value, args = param.handle_parse_result(ctx, opts, args)
+        if func is not None:
+            return decorator(func)
 
-        if args and not ctx.allow_extra_args and not ctx.resilient_parsing:
-            ctx.fail(
-                ngettext(
-                    "Got unexpected extra argument ({args})",
-                    "Got unexpected extra arguments ({args})",
-                    len(args),
-                ).format(args=" ".join(map(str, args)))
-            )
+        return decorator
 
-        ctx.args = args
-        ctx._opt_prefixes.update(parser._opt_prefixes)
-        return args
+    @t.overload
+    def group(self, __func: t.Callable[..., t.Any]) -> Group: ...
 
-    def invoke(self, ctx: Context) -> t.Any:
-        """Given a context, this invokes the attached callback (if it exists)
-        in the right way.
-        """
-        if self.deprecated:
-            message = _(
-                "DeprecationWarning: The command {name!r} is deprecated."
-            ).format(name=self.name)
-            echo(style(message, fg="red"), err=True)
+    @t.overload
+    def group(
+        self, *args: t.Any, **kwargs: t.Any
+    ) -> t.Callable[[t.Callable[..., t.Any]], Group]: ...
 
-        if self.callback is not None:
-            return ctx.invoke(self.callback, **ctx.params)
+    def group(
+        self, *args: t.Any, **kwargs: t.Any
+    ) -> t.Callable[[t.Callable[..., t.Any]], Group] | Group:
+        """A shortcut decorator for declaring and attaching a group to
+        the group. This takes the same arguments as :func:`group` and
+        immediately registers the created group with this group by
+        calling :meth:`add_command`.
 
-    def shell_complete(self, ctx: Context, incomplete: str) -> t.List["CompletionItem"]:
-        """Return a list of completions for the incomplete value. Looks
-        at the names of options and chained multi-commands.
+        To customize the group class used, set the :attr:`group_class`
+        attribute.
 
-        :param ctx: Invocation context for this command.
-        :param incomplete: Value being completed. May be empty.
+        .. versionchanged:: 8.1
+            This decorator can be applied without parentheses.
 
-        .. versionadded:: 8.0
+        .. versionchanged:: 8.0
+            Added the :attr:`group_class` attribute.
         """
-        from click.shell_completion import CompletionItem
-
-        results: t.List[CompletionItem] = []
-
-        if incomplete and not incomplete[0].isalnum():
-            for param in self.get_params(ctx):
-                if (
-                    not isinstance(param, Option)
-                    or param.hidden
-                    or (
-                        not param.multiple
-                        and ctx.get_parameter_source(param.name)  # type: ignore
-                        is ParameterSource.COMMANDLINE
-                    )
-                ):
-                    continue
-
-                results.extend(
-                    CompletionItem(name, help=param.help)
-                    for name in [*param.opts, *param.secondary_opts]
-                    if name.startswith(incomplete)
-                )
-
-        results.extend(super().shell_complete(ctx, incomplete))
-        return results
-
-
-class MultiCommand(Command):
-    """A multi command is the basic implementation of a command that
-    dispatches to subcommands.  The most common version is the
-    :class:`Group`.
-
-    :param invoke_without_command: this controls how the multi command itself
-                                   is invoked.  By default it's only invoked
-                                   if a subcommand is provided.
-    :param no_args_is_help: this controls what happens if no arguments are
-                            provided.  This option is enabled by default if
-                            `invoke_without_command` is disabled or disabled
-                            if it's enabled.  If enabled this will add
-                            ``--help`` as argument if no arguments are
-                            passed.
-    :param subcommand_metavar: the string that is used in the documentation
-                               to indicate the subcommand place.
-    :param chain: if this is set to `True` chaining of multiple subcommands
-                  is enabled.  This restricts the form of commands in that
-                  they cannot have optional arguments but it allows
-                  multiple commands to be chained together.
-    :param result_callback: The result callback to attach to this multi
-        command. This can be set or changed later with the
-        :meth:`result_callback` decorator.
-    :param attrs: Other command arguments described in :class:`Command`.
-    """
-
-    allow_extra_args = True
-    allow_interspersed_args = False
+        from .decorators import group
 
-    def __init__(
-        self,
-        name: t.Optional[str] = None,
-        invoke_without_command: bool = False,
-        no_args_is_help: t.Optional[bool] = None,
-        subcommand_metavar: t.Optional[str] = None,
-        chain: bool = False,
-        result_callback: t.Optional[t.Callable[..., t.Any]] = None,
-        **attrs: t.Any,
-    ) -> None:
-        super().__init__(name, **attrs)
+        func: t.Callable[..., t.Any] | None = None
 
-        if no_args_is_help is None:
-            no_args_is_help = not invoke_without_command
-
-        self.no_args_is_help = no_args_is_help
-        self.invoke_without_command = invoke_without_command
+        if args and callable(args[0]):
+            assert len(args) == 1 and not kwargs, (
+                "Use 'group(**kwargs)(callable)' to provide arguments."
+            )
+            (func,) = args
+            args = ()
 
-        if subcommand_metavar is None:
-            if chain:
-                subcommand_metavar = "COMMAND1 [ARGS]... [COMMAND2 [ARGS]...]..."
+        if self.group_class is not None and kwargs.get("cls") is None:
+            if self.group_class is type:
+                kwargs["cls"] = type(self)
             else:
-                subcommand_metavar = "COMMAND [ARGS]..."
-
-        self.subcommand_metavar = subcommand_metavar
-        self.chain = chain
-        # The result callback that is stored. This can be set or
-        # overridden with the :func:`result_callback` decorator.
-        self._result_callback = result_callback
-
-        if self.chain:
-            for param in self.params:
-                if isinstance(param, Argument) and not param.required:
-                    raise RuntimeError(
-                        "Multi commands in chain mode cannot have"
-                        " optional arguments."
-                    )
-
-    def to_info_dict(self, ctx: Context) -> t.Dict[str, t.Any]:
-        info_dict = super().to_info_dict(ctx)
-        commands = {}
-
-        for name in self.list_commands(ctx):
-            command = self.get_command(ctx, name)
-
-            if command is None:
-                continue
-
-            sub_ctx = ctx._make_sub_context(command)
-
-            with sub_ctx.scope(cleanup=False):
-                commands[name] = command.to_info_dict(sub_ctx)
+                kwargs["cls"] = self.group_class
 
-        info_dict.update(commands=commands, chain=self.chain)
-        return info_dict
+        def decorator(f: t.Callable[..., t.Any]) -> Group:
+            cmd: Group = group(*args, **kwargs)(f)
+            self.add_command(cmd)
+            return cmd
 
-    def collect_usage_pieces(self, ctx: Context) -> t.List[str]:
-        rv = super().collect_usage_pieces(ctx)
-        rv.append(self.subcommand_metavar)
-        return rv
+        if func is not None:
+            return decorator(func)
 
-    def format_options(self, ctx: Context, formatter: HelpFormatter) -> None:
-        super().format_options(ctx, formatter)
-        self.format_commands(ctx, formatter)
+        return decorator
 
     def result_callback(self, replace: bool = False) -> t.Callable[[F], F]:
         """Adds a result callback to the command.  By default if a
@@ -1608,8 +1766,8 @@ def decorator(f: F) -> F:
                 self._result_callback = f
                 return f
 
-            def function(__value, *args, **kwargs):  # type: ignore
-                inner = old_callback(__value, *args, **kwargs)
+            def function(value: t.Any, /, *args: t.Any, **kwargs: t.Any) -> t.Any:
+                inner = old_callback(value, *args, **kwargs)
                 return f(inner, *args, **kwargs)
 
             self._result_callback = rv = update_wrapper(t.cast(F, function), f)
@@ -1617,6 +1775,25 @@ def function(__value, *args, **kwargs):  # type: ignore
 
         return decorator
 
+    def get_command(self, ctx: Context, cmd_name: str) -> Command | None:
+        """Given a context and a command name, this returns a :class:`Command`
+        object if it exists or returns ``None``.
+        """
+        return self.commands.get(cmd_name)
+
+    def list_commands(self, ctx: Context) -> list[str]:
+        """Returns a list of subcommand names in the order they should appear."""
+        return sorted(self.commands)
+
+    def collect_usage_pieces(self, ctx: Context) -> list[str]:
+        rv = super().collect_usage_pieces(ctx)
+        rv.append(self.subcommand_metavar)
+        return rv
+
+    def format_options(self, ctx: Context, formatter: HelpFormatter) -> None:
+        super().format_options(ctx, formatter)
+        self.format_commands(ctx, formatter)
+
     def format_commands(self, ctx: Context, formatter: HelpFormatter) -> None:
         """Extra format methods for multi methods that adds all the commands
         after the options.
@@ -1645,18 +1822,17 @@ def format_commands(self, ctx: Context, formatter: HelpFormatter) -> None:
                 with formatter.section(_("Commands")):
                     formatter.write_dl(rows)
 
-    def parse_args(self, ctx: Context, args: t.List[str]) -> t.List[str]:
+    def parse_args(self, ctx: Context, args: list[str]) -> list[str]:
         if not args and self.no_args_is_help and not ctx.resilient_parsing:
-            echo(ctx.get_help(), color=ctx.color)
-            ctx.exit()
+            raise NoArgsIsHelpError(ctx)
 
         rest = super().parse_args(ctx, args)
 
         if self.chain:
-            ctx.protected_args = rest
+            ctx._protected_args = rest
             ctx.args = []
         elif rest:
-            ctx.protected_args, ctx.args = rest[:1], rest[1:]
+            ctx._protected_args, ctx.args = rest[:1], rest[1:]
 
         return ctx.args
 
@@ -1666,7 +1842,7 @@ def _process_result(value: t.Any) -> t.Any:
                 value = ctx.invoke(self._result_callback, value, **ctx.params)
             return value
 
-        if not ctx.protected_args:
+        if not ctx._protected_args:
             if self.invoke_without_command:
                 # No subcommand was invoked, so the result callback is
                 # invoked with the group return value for regular
@@ -1677,9 +1853,9 @@ def _process_result(value: t.Any) -> t.Any:
             ctx.fail(_("Missing command."))
 
         # Fetch args back out
-        args = [*ctx.protected_args, *ctx.args]
+        args = [*ctx._protected_args, *ctx.args]
         ctx.args = []
-        ctx.protected_args = []
+        ctx._protected_args = []
 
         # If we're not in chain mode, we only allow the invocation of a
         # single command but we also inform the current context about the
@@ -1713,290 +1889,124 @@ def _process_result(value: t.Any) -> t.Any:
                 cmd_name, cmd, args = self.resolve_command(ctx, args)
                 assert cmd is not None
                 sub_ctx = cmd.make_context(
-                    cmd_name,
-                    args,
-                    parent=ctx,
-                    allow_extra_args=True,
-                    allow_interspersed_args=False,
-                )
-                contexts.append(sub_ctx)
-                args, sub_ctx.args = sub_ctx.args, []
-
-            rv = []
-            for sub_ctx in contexts:
-                with sub_ctx:
-                    rv.append(sub_ctx.command.invoke(sub_ctx))
-            return _process_result(rv)
-
-    def resolve_command(
-        self, ctx: Context, args: t.List[str]
-    ) -> t.Tuple[t.Optional[str], t.Optional[Command], t.List[str]]:
-        cmd_name = make_str(args[0])
-        original_cmd_name = cmd_name
-
-        # Get the command
-        cmd = self.get_command(ctx, cmd_name)
-
-        # If we can't find the command but there is a normalization
-        # function available, we try with that one.
-        if cmd is None and ctx.token_normalize_func is not None:
-            cmd_name = ctx.token_normalize_func(cmd_name)
-            cmd = self.get_command(ctx, cmd_name)
-
-        # If we don't find the command we want to show an error message
-        # to the user that it was not provided.  However, there is
-        # something else we should do: if the first argument looks like
-        # an option we want to kick off parsing again for arguments to
-        # resolve things like --help which now should go to the main
-        # place.
-        if cmd is None and not ctx.resilient_parsing:
-            if split_opt(cmd_name)[0]:
-                self.parse_args(ctx, ctx.args)
-            ctx.fail(_("No such command {name!r}.").format(name=original_cmd_name))
-        return cmd_name if cmd else None, cmd, args[1:]
-
-    def get_command(self, ctx: Context, cmd_name: str) -> t.Optional[Command]:
-        """Given a context and a command name, this returns a
-        :class:`Command` object if it exists or returns `None`.
-        """
-        raise NotImplementedError
-
-    def list_commands(self, ctx: Context) -> t.List[str]:
-        """Returns a list of subcommand names in the order they should
-        appear.
-        """
-        return []
-
-    def shell_complete(self, ctx: Context, incomplete: str) -> t.List["CompletionItem"]:
-        """Return a list of completions for the incomplete value. Looks
-        at the names of options, subcommands, and chained
-        multi-commands.
-
-        :param ctx: Invocation context for this command.
-        :param incomplete: Value being completed. May be empty.
-
-        .. versionadded:: 8.0
-        """
-        from click.shell_completion import CompletionItem
-
-        results = [
-            CompletionItem(name, help=command.get_short_help_str())
-            for name, command in _complete_visible_commands(ctx, incomplete)
-        ]
-        results.extend(super().shell_complete(ctx, incomplete))
-        return results
-
-
-class Group(MultiCommand):
-    """A group allows a command to have subcommands attached. This is
-    the most common way to implement nesting in Click.
-
-    :param name: The name of the group command.
-    :param commands: A dict mapping names to :class:`Command` objects.
-        Can also be a list of :class:`Command`, which will use
-        :attr:`Command.name` to create the dict.
-    :param attrs: Other command arguments described in
-        :class:`MultiCommand`, :class:`Command`, and
-        :class:`BaseCommand`.
-
-    .. versionchanged:: 8.0
-        The ``commands`` argument can be a list of command objects.
-    """
-
-    #: If set, this is used by the group's :meth:`command` decorator
-    #: as the default :class:`Command` class. This is useful to make all
-    #: subcommands use a custom command class.
-    #:
-    #: .. versionadded:: 8.0
-    command_class: t.Optional[t.Type[Command]] = None
-
-    #: If set, this is used by the group's :meth:`group` decorator
-    #: as the default :class:`Group` class. This is useful to make all
-    #: subgroups use a custom group class.
-    #:
-    #: If set to the special value :class:`type` (literally
-    #: ``group_class = type``), this group's class will be used as the
-    #: default class. This makes a custom group class continue to make
-    #: custom groups.
-    #:
-    #: .. versionadded:: 8.0
-    group_class: t.Optional[t.Union[t.Type["Group"], t.Type[type]]] = None
-    # Literal[type] isn't valid, so use Type[type]
-
-    def __init__(
-        self,
-        name: t.Optional[str] = None,
-        commands: t.Optional[
-            t.Union[t.MutableMapping[str, Command], t.Sequence[Command]]
-        ] = None,
-        **attrs: t.Any,
-    ) -> None:
-        super().__init__(name, **attrs)
-
-        if commands is None:
-            commands = {}
-        elif isinstance(commands, abc.Sequence):
-            commands = {c.name: c for c in commands if c.name is not None}
-
-        #: The registered subcommands by their exported names.
-        self.commands: t.MutableMapping[str, Command] = commands
-
-    def add_command(self, cmd: Command, name: t.Optional[str] = None) -> None:
-        """Registers another :class:`Command` with this group.  If the name
-        is not provided, the name of the command is used.
-        """
-        name = name or cmd.name
-        if name is None:
-            raise TypeError("Command has no name.")
-        _check_multicommand(self, name, cmd, register=True)
-        self.commands[name] = cmd
-
-    @t.overload
-    def command(self, __func: t.Callable[..., t.Any]) -> Command: ...
-
-    @t.overload
-    def command(
-        self, *args: t.Any, **kwargs: t.Any
-    ) -> t.Callable[[t.Callable[..., t.Any]], Command]: ...
-
-    def command(
-        self, *args: t.Any, **kwargs: t.Any
-    ) -> t.Union[t.Callable[[t.Callable[..., t.Any]], Command], Command]:
-        """A shortcut decorator for declaring and attaching a command to
-        the group. This takes the same arguments as :func:`command` and
-        immediately registers the created command with this group by
-        calling :meth:`add_command`.
-
-        To customize the command class used, set the
-        :attr:`command_class` attribute.
-
-        .. versionchanged:: 8.1
-            This decorator can be applied without parentheses.
-
-        .. versionchanged:: 8.0
-            Added the :attr:`command_class` attribute.
-        """
-        from .decorators import command
-
-        func: t.Optional[t.Callable[..., t.Any]] = None
-
-        if args and callable(args[0]):
-            assert (
-                len(args) == 1 and not kwargs
-            ), "Use 'command(**kwargs)(callable)' to provide arguments."
-            (func,) = args
-            args = ()
-
-        if self.command_class and kwargs.get("cls") is None:
-            kwargs["cls"] = self.command_class
-
-        def decorator(f: t.Callable[..., t.Any]) -> Command:
-            cmd: Command = command(*args, **kwargs)(f)
-            self.add_command(cmd)
-            return cmd
+                    cmd_name,
+                    args,
+                    parent=ctx,
+                    allow_extra_args=True,
+                    allow_interspersed_args=False,
+                )
+                contexts.append(sub_ctx)
+                args, sub_ctx.args = sub_ctx.args, []
 
-        if func is not None:
-            return decorator(func)
+            rv = []
+            for sub_ctx in contexts:
+                with sub_ctx:
+                    rv.append(sub_ctx.command.invoke(sub_ctx))
+            return _process_result(rv)
 
-        return decorator
+    def resolve_command(
+        self, ctx: Context, args: list[str]
+    ) -> tuple[str | None, Command | None, list[str]]:
+        cmd_name = make_str(args[0])
+        original_cmd_name = cmd_name
 
-    @t.overload
-    def group(self, __func: t.Callable[..., t.Any]) -> "Group": ...
+        # Get the command
+        cmd = self.get_command(ctx, cmd_name)
 
-    @t.overload
-    def group(
-        self, *args: t.Any, **kwargs: t.Any
-    ) -> t.Callable[[t.Callable[..., t.Any]], "Group"]: ...
+        # If we can't find the command but there is a normalization
+        # function available, we try with that one.
+        if cmd is None and ctx.token_normalize_func is not None:
+            cmd_name = ctx.token_normalize_func(cmd_name)
+            cmd = self.get_command(ctx, cmd_name)
 
-    def group(
-        self, *args: t.Any, **kwargs: t.Any
-    ) -> t.Union[t.Callable[[t.Callable[..., t.Any]], "Group"], "Group"]:
-        """A shortcut decorator for declaring and attaching a group to
-        the group. This takes the same arguments as :func:`group` and
-        immediately registers the created group with this group by
-        calling :meth:`add_command`.
+        # If we don't find the command we want to show an error message
+        # to the user that it was not provided.  However, there is
+        # something else we should do: if the first argument looks like
+        # an option we want to kick off parsing again for arguments to
+        # resolve things like --help which now should go to the main
+        # place.
+        if cmd is None and not ctx.resilient_parsing:
+            if _split_opt(cmd_name)[0]:
+                self.parse_args(ctx, args)
+            ctx.fail(_("No such command {name!r}.").format(name=original_cmd_name))
+        return cmd_name if cmd else None, cmd, args[1:]
 
-        To customize the group class used, set the :attr:`group_class`
-        attribute.
+    def shell_complete(self, ctx: Context, incomplete: str) -> list[CompletionItem]:
+        """Return a list of completions for the incomplete value. Looks
+        at the names of options, subcommands, and chained
+        multi-commands.
 
-        .. versionchanged:: 8.1
-            This decorator can be applied without parentheses.
+        :param ctx: Invocation context for this command.
+        :param incomplete: Value being completed. May be empty.
 
-        .. versionchanged:: 8.0
-            Added the :attr:`group_class` attribute.
+        .. versionadded:: 8.0
         """
-        from .decorators import group
-
-        func: t.Optional[t.Callable[..., t.Any]] = None
-
-        if args and callable(args[0]):
-            assert (
-                len(args) == 1 and not kwargs
-            ), "Use 'group(**kwargs)(callable)' to provide arguments."
-            (func,) = args
-            args = ()
-
-        if self.group_class is not None and kwargs.get("cls") is None:
-            if self.group_class is type:
-                kwargs["cls"] = type(self)
-            else:
-                kwargs["cls"] = self.group_class
-
-        def decorator(f: t.Callable[..., t.Any]) -> "Group":
-            cmd: Group = group(*args, **kwargs)(f)
-            self.add_command(cmd)
-            return cmd
+        from click.shell_completion import CompletionItem
 
-        if func is not None:
-            return decorator(func)
+        results = [
+            CompletionItem(name, help=command.get_short_help_str())
+            for name, command in _complete_visible_commands(ctx, incomplete)
+        ]
+        results.extend(super().shell_complete(ctx, incomplete))
+        return results
 
-        return decorator
 
-    def get_command(self, ctx: Context, cmd_name: str) -> t.Optional[Command]:
-        return self.commands.get(cmd_name)
+class _MultiCommand(Group, metaclass=_FakeSubclassCheck):
+    """
+    .. deprecated:: 8.2
+        Will be removed in Click 9.0. Use ``Group`` instead.
+    """
 
-    def list_commands(self, ctx: Context) -> t.List[str]:
-        return sorted(self.commands)
 
+class CommandCollection(Group):
+    """A :class:`Group` that looks up subcommands on other groups. If a command
+    is not found on this group, each registered source is checked in order.
+    Parameters on a source are not added to this group, and a source's callback
+    is not invoked when invoking its commands. In other words, this "flattens"
+    commands in many groups into this one group.
 
-class CommandCollection(MultiCommand):
-    """A command collection is a multi command that merges multiple multi
-    commands together into one.  This is a straightforward implementation
-    that accepts a list of different multi commands as sources and
-    provides all the commands for each of them.
+    :param name: The name of the group command.
+    :param sources: A list of :class:`Group` objects to look up commands from.
+    :param kwargs: Other arguments passed to :class:`Group`.
 
-    See :class:`MultiCommand` and :class:`Command` for the description of
-    ``name`` and ``attrs``.
+    .. versionchanged:: 8.2
+        This is a subclass of ``Group``. Commands are looked up first on this
+        group, then each of its sources.
     """
 
     def __init__(
         self,
-        name: t.Optional[str] = None,
-        sources: t.Optional[t.List[MultiCommand]] = None,
-        **attrs: t.Any,
+        name: str | None = None,
+        sources: list[Group] | None = None,
+        **kwargs: t.Any,
     ) -> None:
-        super().__init__(name, **attrs)
-        #: The list of registered multi commands.
-        self.sources: t.List[MultiCommand] = sources or []
+        super().__init__(name, **kwargs)
+        #: The list of registered groups.
+        self.sources: list[Group] = sources or []
+
+    def add_source(self, group: Group) -> None:
+        """Add a group as a source of commands."""
+        self.sources.append(group)
+
+    def get_command(self, ctx: Context, cmd_name: str) -> Command | None:
+        rv = super().get_command(ctx, cmd_name)
 
-    def add_source(self, multi_cmd: MultiCommand) -> None:
-        """Adds a new multi command to the chain dispatcher."""
-        self.sources.append(multi_cmd)
+        if rv is not None:
+            return rv
 
-    def get_command(self, ctx: Context, cmd_name: str) -> t.Optional[Command]:
         for source in self.sources:
             rv = source.get_command(ctx, cmd_name)
 
             if rv is not None:
                 if self.chain:
-                    _check_multicommand(self, cmd_name, rv)
+                    _check_nested_chain(self, cmd_name, rv)
 
                 return rv
 
         return None
 
-    def list_commands(self, ctx: Context) -> t.List[str]:
-        rv: t.Set[str] = set()
+    def list_commands(self, ctx: Context) -> list[str]:
+        rv: set[str] = set(super().list_commands(ctx))
 
         for source in self.sources:
             rv.update(source.list_commands(ctx))
@@ -2004,7 +2014,7 @@ def list_commands(self, ctx: Context) -> t.List[str]:
         return sorted(rv)
 
 
-def _check_iter(value: t.Any) -> t.Iterator[t.Any]:
+def _check_iter(value: t.Any) -> cabc.Iterator[t.Any]:
     """Check if the value is iterable but not a string. Raises a type
     error, or return an iterator over the value.
     """
@@ -2048,13 +2058,30 @@ class Parameter:
     :param is_eager: eager values are processed before non eager ones.  This
                      should not be set for arguments or it will inverse the
                      order of processing.
-    :param envvar: a string or list of strings that are environment variables
-                   that should be checked.
+    :param envvar: environment variable(s) that are used to provide a default value for
+        this parameter. This can be a string or a sequence of strings. If a sequence is
+        given, only the first non-empty environment variable is used for the parameter.
     :param shell_complete: A function that returns custom shell
         completions. Used instead of the param's type completion if
         given. Takes ``ctx, param, incomplete`` and must return a list
         of :class:`~click.shell_completion.CompletionItem` or a list of
         strings.
+    :param deprecated: If ``True`` or non-empty string, issues a message
+                        indicating that the argument is deprecated and highlights
+                        its deprecation in --help. The message can be customized
+                        by using a string as the value. A deprecated parameter
+                        cannot be required, a ValueError will be raised otherwise.
+
+    .. versionchanged:: 8.2.0
+        Introduction of ``deprecated``.
+
+    .. versionchanged:: 8.2
+        Adding duplicate parameter names to a :class:`~click.core.Command` will
+        result in a ``UserWarning`` being shown.
+
+    .. versionchanged:: 8.2
+        Adding duplicate parameter names to a :class:`~click.core.Command` will
+        result in a ``UserWarning`` being shown.
 
     .. versionchanged:: 8.0
         ``process_value`` validates required parameters and bounded
@@ -2092,27 +2119,36 @@ class Parameter:
 
     def __init__(
         self,
-        param_decls: t.Optional[t.Sequence[str]] = None,
-        type: t.Optional[t.Union[types.ParamType, t.Any]] = None,
+        param_decls: cabc.Sequence[str] | None = None,
+        type: types.ParamType | t.Any | None = None,
         required: bool = False,
-        default: t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]] = None,
-        callback: t.Optional[t.Callable[[Context, "Parameter", t.Any], t.Any]] = None,
-        nargs: t.Optional[int] = None,
+        # XXX The default historically embed two concepts:
+        # - the declaration of a Parameter object carrying the default (handy to
+        #   arbitrage the default value of coupled Parameters sharing the same
+        #   self.name, like flag options),
+        # - and the actual value of the default.
+        # It is confusing and is the source of many issues discussed in:
+        # https://github.com/pallets/click/pull/3030
+        # In the future, we might think of splitting it in two, not unlike
+        # Option.is_flag and Option.flag_value: we could have something like
+        # Parameter.is_default and Parameter.default_value.
+        default: t.Any | t.Callable[[], t.Any] | None = UNSET,
+        callback: t.Callable[[Context, Parameter, t.Any], t.Any] | None = None,
+        nargs: int | None = None,
         multiple: bool = False,
-        metavar: t.Optional[str] = None,
+        metavar: str | None = None,
         expose_value: bool = True,
         is_eager: bool = False,
-        envvar: t.Optional[t.Union[str, t.Sequence[str]]] = None,
-        shell_complete: t.Optional[
-            t.Callable[
-                [Context, "Parameter", str],
-                t.Union[t.List["CompletionItem"], t.List[str]],
-            ]
-        ] = None,
+        envvar: str | cabc.Sequence[str] | None = None,
+        shell_complete: t.Callable[
+            [Context, Parameter, str], list[CompletionItem] | list[str]
+        ]
+        | None = None,
+        deprecated: bool | str = False,
     ) -> None:
-        self.name: t.Optional[str]
-        self.opts: t.List[str]
-        self.secondary_opts: t.List[str]
+        self.name: str | None
+        self.opts: list[str]
+        self.secondary_opts: list[str]
         self.name, self.opts, self.secondary_opts = self._parse_decls(
             param_decls or (), expose_value
         )
@@ -2131,11 +2167,12 @@ def __init__(
         self.nargs = nargs
         self.multiple = multiple
         self.expose_value = expose_value
-        self.default = default
+        self.default: t.Any | t.Callable[[], t.Any] | None = default
         self.is_eager = is_eager
         self.metavar = metavar
         self.envvar = envvar
         self._custom_shell_complete = shell_complete
+        self.deprecated = deprecated
 
         if __debug__:
             if self.type.is_composite and nargs != self.type.arity:
@@ -2144,47 +2181,23 @@ def __init__(
                     f" type {self.type!r}, but it was {nargs}."
                 )
 
-            # Skip no default or callable default.
-            check_default = default if not callable(default) else None
-
-            if check_default is not None:
-                if multiple:
-                    try:
-                        # Only check the first value against nargs.
-                        check_default = next(_check_iter(check_default), None)
-                    except TypeError:
-                        raise ValueError(
-                            "'default' must be a list when 'multiple' is true."
-                        ) from None
-
-                # Can be None for multiple with empty default.
-                if nargs != 1 and check_default is not None:
-                    try:
-                        _check_iter(check_default)
-                    except TypeError:
-                        if multiple:
-                            message = (
-                                "'default' must be a list of lists when 'multiple' is"
-                                " true and 'nargs' != 1."
-                            )
-                        else:
-                            message = "'default' must be a list when 'nargs' != 1."
-
-                        raise ValueError(message) from None
-
-                    if nargs > 1 and len(check_default) != nargs:
-                        subject = "item length" if multiple else "length"
-                        raise ValueError(
-                            f"'default' {subject} must match nargs={nargs}."
-                        )
+            if required and deprecated:
+                raise ValueError(
+                    f"The {self.param_type_name} '{self.human_readable_name}' "
+                    "is deprecated and still required. A deprecated "
+                    f"{self.param_type_name} cannot be required."
+                )
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         """Gather information that could be useful for a tool generating
         user-facing documentation.
 
         Use :meth:`click.Context.to_info_dict` to traverse the entire
         CLI structure.
 
+        .. versionchanged:: 8.3.0
+            Returns ``None`` for the :attr:`default` if it was not set.
+
         .. versionadded:: 8.0
         """
         return {
@@ -2196,7 +2209,10 @@ def to_info_dict(self) -> t.Dict[str, t.Any]:
             "required": self.required,
             "nargs": self.nargs,
             "multiple": self.multiple,
-            "default": self.default,
+            # We explicitly hide the :attr:`UNSET` value to the user, as we choose to
+            # make it an implementation detail. And because ``to_info_dict`` has been
+            # designed for documentation purposes, we return ``None`` instead.
+            "default": self.default if self.default is not UNSET else None,
             "envvar": self.envvar,
         }
 
@@ -2204,8 +2220,8 @@ def __repr__(self) -> str:
         return f"<{self.__class__.__name__} {self.name}>"
 
     def _parse_decls(
-        self, decls: t.Sequence[str], expose_value: bool
-    ) -> t.Tuple[t.Optional[str], t.List[str], t.List[str]]:
+        self, decls: cabc.Sequence[str], expose_value: bool
+    ) -> tuple[str | None, list[str], list[str]]:
         raise NotImplementedError()
 
     @property
@@ -2215,11 +2231,11 @@ def human_readable_name(self) -> str:
         """
         return self.name  # type: ignore
 
-    def make_metavar(self) -> str:
+    def make_metavar(self, ctx: Context) -> str:
         if self.metavar is not None:
             return self.metavar
 
-        metavar = self.type.get_metavar(self)
+        metavar = self.type.get_metavar(param=self, ctx=ctx)
 
         if metavar is None:
             metavar = self.type.name.upper()
@@ -2231,17 +2247,17 @@ def make_metavar(self) -> str:
 
     @t.overload
     def get_default(
-        self, ctx: Context, call: "te.Literal[True]" = True
-    ) -> t.Optional[t.Any]: ...
+        self, ctx: Context, call: t.Literal[True] = True
+    ) -> t.Any | None: ...
 
     @t.overload
     def get_default(
         self, ctx: Context, call: bool = ...
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]: ...
+    ) -> t.Any | t.Callable[[], t.Any] | None: ...
 
     def get_default(
         self, ctx: Context, call: bool = True
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]:
+    ) -> t.Any | t.Callable[[], t.Any] | None:
         """Get the default for the parameter. Tries
         :meth:`Context.lookup_default` first, then the local default.
 
@@ -2264,7 +2280,7 @@ def get_default(
         """
         value = ctx.lookup_default(self.name, call=False)  # type: ignore
 
-        if value is None:
+        if value is UNSET:
             value = self.default
 
         if call and callable(value):
@@ -2272,37 +2288,63 @@ def get_default(
 
         return value
 
-    def add_to_parser(self, parser: OptionParser, ctx: Context) -> None:
+    def add_to_parser(self, parser: _OptionParser, ctx: Context) -> None:
         raise NotImplementedError()
 
     def consume_value(
-        self, ctx: Context, opts: t.Mapping[str, t.Any]
-    ) -> t.Tuple[t.Any, ParameterSource]:
-        value = opts.get(self.name)  # type: ignore
-        source = ParameterSource.COMMANDLINE
+        self, ctx: Context, opts: cabc.Mapping[str, t.Any]
+    ) -> tuple[t.Any, ParameterSource]:
+        """Returns the parameter value produced by the parser.
 
-        if value is None:
-            value = self.value_from_envvar(ctx)
-            source = ParameterSource.ENVIRONMENT
+        If the parser did not produce a value from user input, the value is either
+        sourced from the environment variable, the default map, or the parameter's
+        default value. In that order of precedence.
 
-        if value is None:
-            value = ctx.lookup_default(self.name)  # type: ignore
-            source = ParameterSource.DEFAULT_MAP
+        If no value is found, an internal sentinel value is returned.
 
-        if value is None:
-            value = self.get_default(ctx)
-            source = ParameterSource.DEFAULT
+        :meta private:
+        """
+        # Collect from the parse the value passed by the user to the CLI.
+        value = opts.get(self.name, UNSET)  # type: ignore
+        # If the value is set, it means it was sourced from the command line by the
+        # parser, otherwise it left unset by default.
+        source = (
+            ParameterSource.COMMANDLINE
+            if value is not UNSET
+            else ParameterSource.DEFAULT
+        )
+
+        if value is UNSET:
+            envvar_value = self.value_from_envvar(ctx)
+            if envvar_value is not None:
+                value = envvar_value
+                source = ParameterSource.ENVIRONMENT
+
+        if value is UNSET:
+            default_map_value = ctx.lookup_default(self.name)  # type: ignore
+            if default_map_value is not UNSET:
+                value = default_map_value
+                source = ParameterSource.DEFAULT_MAP
+
+        if value is UNSET:
+            default_value = self.get_default(ctx)
+            if default_value is not UNSET:
+                value = default_value
+                source = ParameterSource.DEFAULT
 
         return value, source
 
     def type_cast_value(self, ctx: Context, value: t.Any) -> t.Any:
-        """Convert and validate a value against the option's
+        """Convert and validate a value against the parameter's
         :attr:`type`, :attr:`multiple`, and :attr:`nargs`.
         """
         if value is None:
-            return () if self.multiple or self.nargs == -1 else None
+            if self.multiple or self.nargs == -1:
+                return ()
+            else:
+                return value
 
-        def check_iter(value: t.Any) -> t.Iterator[t.Any]:
+        def check_iter(value: t.Any) -> cabc.Iterator[t.Any]:
             try:
                 return _check_iter(value)
             except TypeError:
@@ -2313,6 +2355,8 @@ def check_iter(value: t.Any) -> t.Iterator[t.Any]:
                     _("Value must be an iterable."), ctx=ctx, param=self
                 ) from None
 
+        # Define the conversion function based on nargs and type.
+
         if self.nargs == 1 or self.type.is_composite:
 
             def convert(value: t.Any) -> t.Any:
@@ -2320,12 +2364,12 @@ def convert(value: t.Any) -> t.Any:
 
         elif self.nargs == -1:
 
-            def convert(value: t.Any) -> t.Any:  # t.Tuple[t.Any, ...]
+            def convert(value: t.Any) -> t.Any:  # tuple[t.Any, ...]
                 return tuple(self.type(x, self, ctx) for x in check_iter(value))
 
         else:  # nargs > 1
 
-            def convert(value: t.Any) -> t.Any:  # t.Tuple[t.Any, ...]
+            def convert(value: t.Any) -> t.Any:  # tuple[t.Any, ...]
                 value = tuple(check_iter(value))
 
                 if len(value) != self.nargs:
@@ -2347,7 +2391,16 @@ def convert(value: t.Any) -> t.Any:  # t.Tuple[t.Any, ...]
         return convert(value)
 
     def value_is_missing(self, value: t.Any) -> bool:
-        if value is None:
+        """A value is considered missing if:
+
+        - it is :attr:`UNSET`,
+        - or if it is an empty sequence while the parameter is suppose to have
+          non-single value (i.e. :attr:`nargs` is not ``1`` or :attr:`multiple` is
+          set).
+
+        :meta private:
+        """
+        if value is UNSET:
             return True
 
         if (self.nargs != 1 or self.multiple) and value == ():
@@ -2356,18 +2409,97 @@ def value_is_missing(self, value: t.Any) -> bool:
         return False
 
     def process_value(self, ctx: Context, value: t.Any) -> t.Any:
-        value = self.type_cast_value(ctx, value)
+        """Process the value of this parameter:
+
+        1. Type cast the value using :meth:`type_cast_value`.
+        2. Check if the value is missing (see: :meth:`value_is_missing`), and raise
+           :exc:`MissingParameter` if it is required.
+        3. If a :attr:`callback` is set, call it to have the value replaced by the
+           result of the callback. If the value was not set, the callback receive
+           ``None``. This keep the legacy behavior as it was before the introduction of
+           the :attr:`UNSET` sentinel.
+
+        :meta private:
+        """
+        # shelter `type_cast_value` from ever seeing an `UNSET` value by handling the
+        # cases in which `UNSET` gets special treatment explicitly at this layer
+        #
+        # Refs:
+        # https://github.com/pallets/click/issues/3069
+        if value is UNSET:
+            if self.multiple or self.nargs == -1:
+                value = ()
+        else:
+            value = self.type_cast_value(ctx, value)
 
         if self.required and self.value_is_missing(value):
             raise MissingParameter(ctx=ctx, param=self)
 
         if self.callback is not None:
-            value = self.callback(ctx, self, value)
+            # Legacy case: UNSET is not exposed directly to the callback, but converted
+            # to None.
+            if value is UNSET:
+                value = None
+
+            # Search for parameters with UNSET values in the context.
+            unset_keys = {k: None for k, v in ctx.params.items() if v is UNSET}
+            # No UNSET values, call the callback as usual.
+            if not unset_keys:
+                value = self.callback(ctx, self, value)
+
+            # Legacy case: provide a temporarily manipulated context to the callback
+            # to hide UNSET values as None.
+            #
+            # Refs:
+            # https://github.com/pallets/click/issues/3136
+            # https://github.com/pallets/click/pull/3137
+            else:
+                # Add another layer to the context stack to clearly hint that the
+                # context is temporarily modified.
+                with ctx:
+                    # Update the context parameters to replace UNSET with None.
+                    ctx.params.update(unset_keys)
+                    # Feed these fake context parameters to the callback.
+                    value = self.callback(ctx, self, value)
+                    # Restore the UNSET values in the context parameters.
+                    ctx.params.update(
+                        {
+                            k: UNSET
+                            for k in unset_keys
+                            # Only restore keys that are present and still None, in case
+                            # the callback modified other parameters.
+                            if k in ctx.params and ctx.params[k] is None
+                        }
+                    )
 
         return value
 
-    def resolve_envvar_value(self, ctx: Context) -> t.Optional[str]:
-        if self.envvar is None:
+    def resolve_envvar_value(self, ctx: Context) -> str | None:
+        """Returns the value found in the environment variable(s) attached to this
+        parameter.
+
+        Environment variables values are `always returned as strings
+        <https://docs.python.org/3/library/os.html#os.environ>`_.
+
+        This method returns ``None`` if:
+
+        - the :attr:`envvar` property is not set on the :class:`Parameter`,
+        - the environment variable is not found in the environment,
+        - the variable is found in the environment but its value is empty (i.e. the
+          environment variable is present but has an empty string).
+
+        If :attr:`envvar` is setup with multiple environment variables,
+        then only the first non-empty value is returned.
+
+        .. caution::
+
+            The raw value extracted from the environment is not normalized and is
+            returned as-is. Any normalization or reconciliation is performed later by
+            the :class:`Parameter`'s :attr:`type`.
+
+        :meta private:
+        """
+        if not self.envvar:
             return None
 
         if isinstance(self.envvar, str):
@@ -2379,43 +2511,100 @@ def resolve_envvar_value(self, ctx: Context) -> t.Optional[str]:
             for envvar in self.envvar:
                 rv = os.environ.get(envvar)
 
+                # Return the first non-empty value of the list of environment variables.
                 if rv:
                     return rv
+                # Else, absence of value is interpreted as an environment variable that
+                # is not set, so proceed to the next one.
 
         return None
 
-    def value_from_envvar(self, ctx: Context) -> t.Optional[t.Any]:
-        rv: t.Optional[t.Any] = self.resolve_envvar_value(ctx)
+    def value_from_envvar(self, ctx: Context) -> str | cabc.Sequence[str] | None:
+        """Process the raw environment variable string for this parameter.
+
+        Returns the string as-is or splits it into a sequence of strings if the
+        parameter is expecting multiple values (i.e. its :attr:`nargs` property is set
+        to a value other than ``1``).
+
+        :meta private:
+        """
+        rv = self.resolve_envvar_value(ctx)
 
         if rv is not None and self.nargs != 1:
-            rv = self.type.split_envvar_value(rv)
+            return self.type.split_envvar_value(rv)
 
         return rv
 
     def handle_parse_result(
-        self, ctx: Context, opts: t.Mapping[str, t.Any], args: t.List[str]
-    ) -> t.Tuple[t.Any, t.List[str]]:
+        self, ctx: Context, opts: cabc.Mapping[str, t.Any], args: list[str]
+    ) -> tuple[t.Any, list[str]]:
+        """Process the value produced by the parser from user input.
+
+        Always process the value through the Parameter's :attr:`type`, wherever it
+        comes from.
+
+        If the parameter is deprecated, this method warn the user about it. But only if
+        the value has been explicitly set by the user (and as such, is not coming from
+        a default).
+
+        :meta private:
+        """
         with augment_usage_errors(ctx, param=self):
             value, source = self.consume_value(ctx, opts)
+
             ctx.set_parameter_source(self.name, source)  # type: ignore
 
+            # Display a deprecation warning if necessary.
+            if (
+                self.deprecated
+                and value is not UNSET
+                and source not in (ParameterSource.DEFAULT, ParameterSource.DEFAULT_MAP)
+            ):
+                extra_message = (
+                    f" {self.deprecated}" if isinstance(self.deprecated, str) else ""
+                )
+                message = _(
+                    "DeprecationWarning: The {param_type} {name!r} is deprecated."
+                    "{extra_message}"
+                ).format(
+                    param_type=self.param_type_name,
+                    name=self.human_readable_name,
+                    extra_message=extra_message,
+                )
+                echo(style(message, fg="red"), err=True)
+
+            # Process the value through the parameter's type.
             try:
                 value = self.process_value(ctx, value)
             except Exception:
                 if not ctx.resilient_parsing:
                     raise
+                # In resilient parsing mode, we do not want to fail the command if the
+                # value is incompatible with the parameter type, so we reset the value
+                # to UNSET, which will be interpreted as a missing value.
+                value = UNSET
 
-                value = None
-
-        if self.expose_value:
-            ctx.params[self.name] = value  # type: ignore
+        # Add parameter's value to the context.
+        if (
+            self.expose_value
+            # We skip adding the value if it was previously set by another parameter
+            # targeting the same variable name. This prevents parameters competing for
+            # the same name to override each other.
+            and (self.name not in ctx.params or ctx.params[self.name] is UNSET)
+        ):
+            # Click is logically enforcing that the name is None if the parameter is
+            # not to be exposed. We still assert it here to please the type checker.
+            assert self.name is not None, (
+                f"{self!r} parameter's name should not be None when exposing value."
+            )
+            ctx.params[self.name] = value
 
         return value, args
 
-    def get_help_record(self, ctx: Context) -> t.Optional[t.Tuple[str, str]]:
+    def get_help_record(self, ctx: Context) -> tuple[str, str] | None:
         pass
 
-    def get_usage_pieces(self, ctx: Context) -> t.List[str]:
+    def get_usage_pieces(self, ctx: Context) -> list[str]:
         return []
 
     def get_error_hint(self, ctx: Context) -> str:
@@ -2425,7 +2614,7 @@ def get_error_hint(self, ctx: Context) -> str:
         hint_list = self.opts or [self.human_readable_name]
         return " / ".join(f"'{x}'" for x in hint_list)
 
-    def shell_complete(self, ctx: Context, incomplete: str) -> t.List["CompletionItem"]:
+    def shell_complete(self, ctx: Context, incomplete: str) -> list[CompletionItem]:
         """Return a list of completions for the incomplete value. If a
         ``shell_complete`` function was given during init, it is used.
         Otherwise, the :attr:`type`
@@ -2444,7 +2633,7 @@ def shell_complete(self, ctx: Context, incomplete: str) -> t.List["CompletionIte
 
                 results = [CompletionItem(c) for c in results]
 
-            return t.cast(t.List["CompletionItem"], results)
+            return t.cast("list[CompletionItem]", results)
 
         return self.type.shell_complete(ctx, self, incomplete)
 
@@ -2463,11 +2652,12 @@ class Option(Parameter):
         For single option boolean flags, the default remains hidden if
         its value is ``False``.
     :param show_envvar: Controls if an environment variable should be
-        shown on the help page. Normally, environment variables are not
-        shown.
+        shown on the help page and error messages.
+        Normally, environment variables are not shown.
     :param prompt: If set to ``True`` or a non empty string then the
         user will be prompted for input. If set to ``True`` the prompt
-        will be the option name capitalized.
+        will be the option name capitalized. A deprecated option cannot be
+        prompted.
     :param confirmation_prompt: Prompt a second time to confirm the
         value if it was prompted for. Can be set to a string instead of
         ``True`` to customize the message.
@@ -2494,15 +2684,19 @@ class Option(Parameter):
     :param hidden: hide this option from help outputs.
     :param attrs: Other command arguments described in :class:`Parameter`.
 
-    .. versionchanged:: 8.1.0
+    .. versionchanged:: 8.2
+        ``envvar`` used with ``flag_value`` will always use the ``flag_value``,
+        previously it would use the value of the environment variable.
+
+    .. versionchanged:: 8.1
         Help text indentation is cleaned here instead of only in the
         ``@option`` decorator.
 
-    .. versionchanged:: 8.1.0
+    .. versionchanged:: 8.1
         The ``show_default`` parameter overrides
         ``Context.show_default``.
 
-    .. versionchanged:: 8.1.0
+    .. versionchanged:: 8.1
         The default of a single option boolean flag is not shown if the
         default value is ``False``.
 
@@ -2514,92 +2708,131 @@ class Option(Parameter):
 
     def __init__(
         self,
-        param_decls: t.Optional[t.Sequence[str]] = None,
-        show_default: t.Union[bool, str, None] = None,
-        prompt: t.Union[bool, str] = False,
-        confirmation_prompt: t.Union[bool, str] = False,
+        param_decls: cabc.Sequence[str] | None = None,
+        show_default: bool | str | None = None,
+        prompt: bool | str = False,
+        confirmation_prompt: bool | str = False,
         prompt_required: bool = True,
         hide_input: bool = False,
-        is_flag: t.Optional[bool] = None,
-        flag_value: t.Optional[t.Any] = None,
+        is_flag: bool | None = None,
+        flag_value: t.Any = UNSET,
         multiple: bool = False,
         count: bool = False,
         allow_from_autoenv: bool = True,
-        type: t.Optional[t.Union[types.ParamType, t.Any]] = None,
-        help: t.Optional[str] = None,
+        type: types.ParamType | t.Any | None = None,
+        help: str | None = None,
         hidden: bool = False,
         show_choices: bool = True,
         show_envvar: bool = False,
+        deprecated: bool | str = False,
         **attrs: t.Any,
     ) -> None:
         if help:
             help = inspect.cleandoc(help)
 
-        default_is_missing = "default" not in attrs
-        super().__init__(param_decls, type=type, multiple=multiple, **attrs)
+        super().__init__(
+            param_decls, type=type, multiple=multiple, deprecated=deprecated, **attrs
+        )
 
         if prompt is True:
             if self.name is None:
                 raise TypeError("'name' is required with 'prompt=True'.")
 
-            prompt_text: t.Optional[str] = self.name.replace("_", " ").capitalize()
+            prompt_text: str | None = self.name.replace("_", " ").capitalize()
         elif prompt is False:
             prompt_text = None
         else:
             prompt_text = prompt
 
+        if deprecated:
+            deprecated_message = (
+                f"(DEPRECATED: {deprecated})"
+                if isinstance(deprecated, str)
+                else "(DEPRECATED)"
+            )
+            help = help + deprecated_message if help is not None else deprecated_message
+
         self.prompt = prompt_text
         self.confirmation_prompt = confirmation_prompt
         self.prompt_required = prompt_required
         self.hide_input = hide_input
         self.hidden = hidden
 
-        # If prompt is enabled but not required, then the option can be
-        # used as a flag to indicate using prompt or flag_value.
+        # The _flag_needs_value property tells the parser that this option is a flag
+        # that cannot be used standalone and needs a value. With this information, the
+        # parser can determine whether to consider the next user-provided argument in
+        # the CLI as a value for this flag or as a new option.
+        # If prompt is enabled but not required, then it opens the possibility for the
+        # option to gets its value from the user.
         self._flag_needs_value = self.prompt is not None and not self.prompt_required
 
+        # Auto-detect if this is a flag or not.
         if is_flag is None:
-            if flag_value is not None:
-                # Implicitly a flag because flag_value was set.
+            # Implicitly a flag because flag_value was set.
+            if flag_value is not UNSET:
                 is_flag = True
+            # Not a flag, but when used as a flag it shows a prompt.
             elif self._flag_needs_value:
-                # Not a flag, but when used as a flag it shows a prompt.
                 is_flag = False
-            else:
-                # Implicitly a flag because flag options were given.
-                is_flag = bool(self.secondary_opts)
+            # Implicitly a flag because secondary options names were given.
+            elif self.secondary_opts:
+                is_flag = True
+        # The option is explicitly not a flag. But we do not know yet if it needs a
+        # value or not. So we look at the default value to determine it.
         elif is_flag is False and not self._flag_needs_value:
-            # Not a flag, and prompt is not enabled, can be used as a
-            # flag if flag_value is set.
-            self._flag_needs_value = flag_value is not None
+            self._flag_needs_value = self.default is UNSET
 
-        self.default: t.Union[t.Any, t.Callable[[], t.Any]]
+        if is_flag:
+            # Set missing default for flags if not explicitly required or prompted.
+            if self.default is UNSET and not self.required and not self.prompt:
+                if multiple:
+                    self.default = ()
 
-        if is_flag and default_is_missing and not self.required:
-            if multiple:
-                self.default = ()
-            else:
-                self.default = False
+            # Auto-detect the type of the flag based on the flag_value.
+            if type is None:
+                # A flag without a flag_value is a boolean flag.
+                if flag_value is UNSET:
+                    self.type: types.ParamType = types.BoolParamType()
+                # If the flag value is a boolean, use BoolParamType.
+                elif isinstance(flag_value, bool):
+                    self.type = types.BoolParamType()
+                # Otherwise, guess the type from the flag value.
+                else:
+                    self.type = types.convert_type(None, flag_value)
 
-        if flag_value is None:
-            flag_value = not self.default
+        self.is_flag: bool = bool(is_flag)
+        self.is_bool_flag: bool = bool(
+            is_flag and isinstance(self.type, types.BoolParamType)
+        )
+        self.flag_value: t.Any = flag_value
 
-        self.type: types.ParamType
-        if is_flag and type is None:
-            # Re-guess the type from the flag value instead of the
-            # default.
-            self.type = types.convert_type(None, flag_value)
+        # Set boolean flag default to False if unset and not required.
+        if self.is_bool_flag:
+            if self.default is UNSET and not self.required:
+                self.default = False
 
-        self.is_flag: bool = is_flag
-        self.is_bool_flag: bool = is_flag and isinstance(self.type, types.BoolParamType)
-        self.flag_value: t.Any = flag_value
+        # Support the special case of aligning the default value with the flag_value
+        # for flags whose default is explicitly set to True. Note that as long as we
+        # have this condition, there is no way a flag can have a default set to True,
+        # and a flag_value set to something else. Refs:
+        # https://github.com/pallets/click/issues/3024#issuecomment-3146199461
+        # https://github.com/pallets/click/pull/3030/commits/06847da
+        if self.default is True and self.flag_value is not UNSET:
+            self.default = self.flag_value
+
+        # Set the default flag_value if it is not set.
+        if self.flag_value is UNSET:
+            if self.is_flag:
+                self.flag_value = True
+            else:
+                self.flag_value = None
 
-        # Counting
+        # Counting.
         self.count = count
         if count:
             if type is None:
                 self.type = types.IntRange(min=0)
-            if default_is_missing:
+            if self.default is UNSET:
                 self.default = 0
 
         self.allow_from_autoenv = allow_from_autoenv
@@ -2609,12 +2842,12 @@ def __init__(
         self.show_envvar = show_envvar
 
         if __debug__:
+            if deprecated and prompt:
+                raise ValueError("`deprecated` options cannot use `prompt`.")
+
             if self.nargs == -1:
                 raise TypeError("nargs=-1 is not supported for options.")
 
-            if self.prompt and self.is_flag and not self.is_bool_flag:
-                raise TypeError("'prompt' is not valid for non-boolean flag.")
-
             if not self.is_bool_flag and self.secondary_opts:
                 raise TypeError("Secondary flag is not valid for non-boolean flag.")
 
@@ -2630,21 +2863,34 @@ def __init__(
                 if self.is_flag:
                     raise TypeError("'count' is not valid with 'is_flag'.")
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
+        """
+        .. versionchanged:: 8.3.0
+            Returns ``None`` for the :attr:`flag_value` if it was not set.
+        """
         info_dict = super().to_info_dict()
         info_dict.update(
             help=self.help,
             prompt=self.prompt,
             is_flag=self.is_flag,
-            flag_value=self.flag_value,
+            # We explicitly hide the :attr:`UNSET` value to the user, as we choose to
+            # make it an implementation detail. And because ``to_info_dict`` has been
+            # designed for documentation purposes, we return ``None`` instead.
+            flag_value=self.flag_value if self.flag_value is not UNSET else None,
             count=self.count,
             hidden=self.hidden,
         )
         return info_dict
 
+    def get_error_hint(self, ctx: Context) -> str:
+        result = super().get_error_hint(ctx)
+        if self.show_envvar and self.envvar is not None:
+            result += f" (env var: '{self.envvar}')"
+        return result
+
     def _parse_decls(
-        self, decls: t.Sequence[str], expose_value: bool
-    ) -> t.Tuple[t.Optional[str], t.List[str], t.List[str]]:
+        self, decls: cabc.Sequence[str], expose_value: bool
+    ) -> tuple[str | None, list[str], list[str]]:
         opts = []
         secondary_opts = []
         name = None
@@ -2661,7 +2907,7 @@ def _parse_decls(
                     first, second = decl.split(split_char, 1)
                     first = first.rstrip()
                     if first:
-                        possible_names.append(split_opt(first))
+                        possible_names.append(_split_opt(first))
                         opts.append(first)
                     second = second.lstrip()
                     if second:
@@ -2672,7 +2918,7 @@ def _parse_decls(
                             " same flag for true/false."
                         )
                 else:
-                    possible_names.append(split_opt(decl))
+                    possible_names.append(_split_opt(decl))
                     opts.append(decl)
 
         if name is None and possible_names:
@@ -2697,7 +2943,7 @@ def _parse_decls(
 
         return name, opts, secondary_opts
 
-    def add_to_parser(self, parser: OptionParser, ctx: Context) -> None:
+    def add_to_parser(self, parser: _OptionParser, ctx: Context) -> None:
         if self.multiple:
             action = "append"
         elif self.count:
@@ -2736,13 +2982,13 @@ def add_to_parser(self, parser: OptionParser, ctx: Context) -> None:
                 nargs=self.nargs,
             )
 
-    def get_help_record(self, ctx: Context) -> t.Optional[t.Tuple[str, str]]:
+    def get_help_record(self, ctx: Context) -> tuple[str, str] | None:
         if self.hidden:
             return None
 
         any_prefix_is_slash = False
 
-        def _write_opts(opts: t.Sequence[str]) -> str:
+        def _write_opts(opts: cabc.Sequence[str]) -> str:
             nonlocal any_prefix_is_slash
 
             rv, any_slashes = join_options(opts)
@@ -2751,7 +2997,7 @@ def _write_opts(opts: t.Sequence[str]) -> str:
                 any_prefix_is_slash = True
 
             if not self.is_flag and not self.count:
-                rv += f" {self.make_metavar()}"
+                rv += f" {self.make_metavar(ctx=ctx)}"
 
             return rv
 
@@ -2761,7 +3007,28 @@ def _write_opts(opts: t.Sequence[str]) -> str:
             rv.append(_write_opts(self.secondary_opts))
 
         help = self.help or ""
-        extra = []
+
+        extra = self.get_help_extra(ctx)
+        extra_items = []
+        if "envvars" in extra:
+            extra_items.append(
+                _("env var: {var}").format(var=", ".join(extra["envvars"]))
+            )
+        if "default" in extra:
+            extra_items.append(_("default: {default}").format(default=extra["default"]))
+        if "range" in extra:
+            extra_items.append(extra["range"])
+        if "required" in extra:
+            extra_items.append(_(extra["required"]))
+
+        if extra_items:
+            extra_str = "; ".join(extra_items)
+            help = f"{help}  [{extra_str}]" if help else f"[{extra_str}]"
+
+        return ("; " if any_prefix_is_slash else " / ").join(rv), help
+
+    def get_help_extra(self, ctx: Context) -> types.OptionHelpExtra:
+        extra: types.OptionHelpExtra = {}
 
         if self.show_envvar:
             envvar = self.envvar
@@ -2775,12 +3042,10 @@ def _write_opts(opts: t.Sequence[str]) -> str:
                     envvar = f"{ctx.auto_envvar_prefix}_{self.name.upper()}"
 
             if envvar is not None:
-                var_str = (
-                    envvar
-                    if isinstance(envvar, str)
-                    else ", ".join(str(d) for d in envvar)
-                )
-                extra.append(_("env var: {var}").format(var=var_str))
+                if isinstance(envvar, str):
+                    extra["envvars"] = (envvar,)
+                else:
+                    extra["envvars"] = tuple(str(d) for d in envvar)
 
         # Temporarily enable resilient parsing to avoid type casting
         # failing for the default. Might be possible to extend this to
@@ -2804,17 +3069,21 @@ def _write_opts(opts: t.Sequence[str]) -> str:
         elif ctx.show_default is not None:
             show_default = ctx.show_default
 
-        if show_default_is_str or (show_default and (default_value is not None)):
+        if show_default_is_str or (
+            show_default and (default_value not in (None, UNSET))
+        ):
             if show_default_is_str:
                 default_string = f"({self.show_default})"
             elif isinstance(default_value, (list, tuple)):
                 default_string = ", ".join(str(d) for d in default_value)
+            elif isinstance(default_value, enum.Enum):
+                default_string = default_value.name
             elif inspect.isfunction(default_value):
                 default_string = _("(dynamic)")
             elif self.is_bool_flag and self.secondary_opts:
                 # For boolean flags that have distinct True/False opts,
                 # use the opt without prefix instead of the value.
-                default_string = split_opt(
+                default_string = _split_opt(
                     (self.opts if default_value else self.secondary_opts)[0]
                 )[1]
             elif self.is_bool_flag and not self.secondary_opts and not default_value:
@@ -2825,7 +3094,7 @@ def _write_opts(opts: t.Sequence[str]) -> str:
                 default_string = str(default_value)
 
             if default_string:
-                extra.append(_("default: {default}").format(default=default_string))
+                extra["default"] = default_string
 
         if (
             isinstance(self.type, types._NumberRangeBase)
@@ -2835,42 +3104,12 @@ def _write_opts(opts: t.Sequence[str]) -> str:
             range_str = self.type._describe_range()
 
             if range_str:
-                extra.append(range_str)
+                extra["range"] = range_str
 
         if self.required:
-            extra.append(_("required"))
-
-        if extra:
-            extra_str = "; ".join(extra)
-            help = f"{help}  [{extra_str}]" if help else f"[{extra_str}]"
-
-        return ("; " if any_prefix_is_slash else " / ").join(rv), help
-
-    @t.overload
-    def get_default(
-        self, ctx: Context, call: "te.Literal[True]" = True
-    ) -> t.Optional[t.Any]: ...
-
-    @t.overload
-    def get_default(
-        self, ctx: Context, call: bool = ...
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]: ...
-
-    def get_default(
-        self, ctx: Context, call: bool = True
-    ) -> t.Optional[t.Union[t.Any, t.Callable[[], t.Any]]]:
-        # If we're a non boolean flag our default is more complex because
-        # we need to look at all flags in the same group to figure out
-        # if we're the default one in which case we return the flag
-        # value as default.
-        if self.is_flag and not self.is_bool_flag:
-            for param in ctx.command.params:
-                if param.name == self.name and param.default:
-                    return t.cast(Option, param).flag_value
-
-            return None
+            extra["required"] = "required"
 
-        return super().get_default(ctx, call=call)
+        return extra
 
     def prompt_for_value(self, ctx: Context) -> t.Any:
         """This is an alternative flow that can be activated in the full
@@ -2880,25 +3119,58 @@ def prompt_for_value(self, ctx: Context) -> t.Any:
         """
         assert self.prompt is not None
 
-        # Calculate the default before prompting anything to be stable.
+        # Calculate the default before prompting anything to lock in the value before
+        # attempting any user interaction.
         default = self.get_default(ctx)
 
-        # If this is a prompt for a flag we need to handle this
-        # differently.
+        # A boolean flag can use a simplified [y/n] confirmation prompt.
         if self.is_bool_flag:
+            # If we have no boolean default, we force the user to explicitly provide
+            # one.
+            if default in (UNSET, None):
+                default = None
+            # Nothing prevent you to declare an option that is simultaneously:
+            # 1) auto-detected as a boolean flag,
+            # 2) allowed to prompt, and
+            # 3) still declare a non-boolean default.
+            # This forced casting into a boolean is necessary to align any non-boolean
+            # default to the prompt, which is going to be a [y/n]-style confirmation
+            # because the option is still a boolean flag. That way, instead of [y/n],
+            # we get [Y/n] or [y/N] depending on the truthy value of the default.
+            # Refs: https://github.com/pallets/click/pull/3030#discussion_r2289180249
+            else:
+                default = bool(default)
             return confirm(self.prompt, default)
 
+        # If show_default is set to True/False, provide this to `prompt` as well. For
+        # non-bool values of `show_default`, we use `prompt`'s default behavior
+        prompt_kwargs: t.Any = {}
+        if isinstance(self.show_default, bool):
+            prompt_kwargs["show_default"] = self.show_default
+
         return prompt(
             self.prompt,
-            default=default,
+            # Use ``None`` to inform the prompt() function to reiterate until a valid
+            # value is provided by the user if we have no default.
+            default=None if default is UNSET else default,
             type=self.type,
             hide_input=self.hide_input,
             show_choices=self.show_choices,
             confirmation_prompt=self.confirmation_prompt,
             value_proc=lambda x: self.process_value(ctx, x),
+            **prompt_kwargs,
         )
 
-    def resolve_envvar_value(self, ctx: Context) -> t.Optional[str]:
+    def resolve_envvar_value(self, ctx: Context) -> str | None:
+        """:class:`Option` resolves its environment variable the same way as
+        :func:`Parameter.resolve_envvar_value`, but it also supports
+        :attr:`Context.auto_envvar_prefix`. If we could not find an environment from
+        the :attr:`envvar` property, we fallback on :attr:`Context.auto_envvar_prefix`
+        to build dynamiccaly the environment variable name using the
+        :python:`{ctx.auto_envvar_prefix}_{self.name.upper()}` template.
+
+        :meta private:
+        """
         rv = super().resolve_envvar_value(ctx)
 
         if rv is not None:
@@ -2917,50 +3189,103 @@ def resolve_envvar_value(self, ctx: Context) -> t.Optional[str]:
 
         return None
 
-    def value_from_envvar(self, ctx: Context) -> t.Optional[t.Any]:
-        rv: t.Optional[t.Any] = self.resolve_envvar_value(ctx)
+    def value_from_envvar(self, ctx: Context) -> t.Any:
+        """For :class:`Option`, this method processes the raw environment variable
+        string the same way as :func:`Parameter.value_from_envvar` does.
+
+        But in the case of non-boolean flags, the value is analyzed to determine if the
+        flag is activated or not, and returns a boolean of its activation, or the
+        :attr:`flag_value` if the latter is set.
+
+        This method also takes care of repeated options (i.e. options with
+        :attr:`multiple` set to ``True``).
+
+        :meta private:
+        """
+        rv = self.resolve_envvar_value(ctx)
 
+        # Absent environment variable or an empty string is interpreted as unset.
         if rv is None:
             return None
 
+        # Non-boolean flags are more liberal in what they accept. But a flag being a
+        # flag, its envvar value still needs to be analyzed to determine if the flag is
+        # activated or not.
+        if self.is_flag and not self.is_bool_flag:
+            # If the flag_value is set and match the envvar value, return it
+            # directly.
+            if self.flag_value is not UNSET and rv == self.flag_value:
+                return self.flag_value
+            # Analyze the envvar value as a boolean to know if the flag is
+            # activated or not.
+            return types.BoolParamType.str_to_bool(rv)
+
+        # Split the envvar value if it is allowed to be repeated.
         value_depth = (self.nargs != 1) + bool(self.multiple)
-
         if value_depth > 0:
-            rv = self.type.split_envvar_value(rv)
-
+            multi_rv = self.type.split_envvar_value(rv)
             if self.multiple and self.nargs != 1:
-                rv = batch(rv, self.nargs)
+                multi_rv = batch(multi_rv, self.nargs)  # type: ignore[assignment]
+
+            return multi_rv
 
         return rv
 
     def consume_value(
-        self, ctx: Context, opts: t.Mapping[str, "Parameter"]
-    ) -> t.Tuple[t.Any, ParameterSource]:
+        self, ctx: Context, opts: cabc.Mapping[str, Parameter]
+    ) -> tuple[t.Any, ParameterSource]:
+        """For :class:`Option`, the value can be collected from an interactive prompt
+        if the option is a flag that needs a value (and the :attr:`prompt` property is
+        set).
+
+        Additionally, this method handles flag option that are activated without a
+        value, in which case the :attr:`flag_value` is returned.
+
+        :meta private:
+        """
         value, source = super().consume_value(ctx, opts)
 
-        # The parser will emit a sentinel value if the option can be
-        # given as a flag without a value. This is different from None
-        # to distinguish from the flag not being given at all.
-        if value is _flag_needs_value:
+        # The parser will emit a sentinel value if the option is allowed to as a flag
+        # without a value.
+        if value is FLAG_NEEDS_VALUE:
+            # If the option allows for a prompt, we start an interaction with the user.
             if self.prompt is not None and not ctx.resilient_parsing:
                 value = self.prompt_for_value(ctx)
                 source = ParameterSource.PROMPT
+            # Else the flag takes its flag_value as value.
             else:
                 value = self.flag_value
                 source = ParameterSource.COMMANDLINE
 
+        # A flag which is activated always returns the flag value, unless the value
+        # comes from the explicitly sets default.
+        elif (
+            self.is_flag
+            and value is True
+            and not self.is_bool_flag
+            and source not in (ParameterSource.DEFAULT, ParameterSource.DEFAULT_MAP)
+        ):
+            value = self.flag_value
+
+        # Re-interpret a multiple option which has been sent as-is by the parser.
+        # Here we replace each occurrence of value-less flags (marked by the
+        # FLAG_NEEDS_VALUE sentinel) with the flag_value.
         elif (
             self.multiple
-            and value is not None
-            and any(v is _flag_needs_value for v in value)
+            and value is not UNSET
+            and source not in (ParameterSource.DEFAULT, ParameterSource.DEFAULT_MAP)
+            and any(v is FLAG_NEEDS_VALUE for v in value)
         ):
-            value = [self.flag_value if v is _flag_needs_value else v for v in value]
+            value = [self.flag_value if v is FLAG_NEEDS_VALUE else v for v in value]
             source = ParameterSource.COMMANDLINE
 
-        # The value wasn't set, or used the param's default, prompt if
-        # prompting is enabled.
+        # The value wasn't set, or used the param's default, prompt for one to the user
+        # if prompting is enabled.
         elif (
-            source in {None, ParameterSource.DEFAULT}
+            (
+                value is UNSET
+                or source in (ParameterSource.DEFAULT, ParameterSource.DEFAULT_MAP)
+            )
             and self.prompt is not None
             and (self.required or self.prompt_required)
             and not ctx.resilient_parsing
@@ -2970,6 +3295,23 @@ def consume_value(
 
         return value, source
 
+    def process_value(self, ctx: Context, value: t.Any) -> t.Any:
+        # process_value has to be overridden on Options in order to capture
+        # `value == UNSET` cases before `type_cast_value()` gets called.
+        #
+        # Refs:
+        # https://github.com/pallets/click/issues/3069
+        if self.is_flag and not self.required and self.is_bool_flag and value is UNSET:
+            value = False
+
+            if self.callback is not None:
+                value = self.callback(ctx, self, value)
+
+            return value
+
+        # in the normal case, rely on Parameter.process_value
+        return super().process_value(ctx, value)
+
 
 class Argument(Parameter):
     """Arguments are positional parameters to a command.  They generally
@@ -2983,37 +3325,39 @@ class Argument(Parameter):
 
     def __init__(
         self,
-        param_decls: t.Sequence[str],
-        required: t.Optional[bool] = None,
+        param_decls: cabc.Sequence[str],
+        required: bool | None = None,
         **attrs: t.Any,
     ) -> None:
+        # Auto-detect the requirement status of the argument if not explicitly set.
         if required is None:
-            if attrs.get("default") is not None:
-                required = False
-            else:
+            # The argument gets automatically required if it has no explicit default
+            # value set and is setup to match at least one value.
+            if attrs.get("default", UNSET) is UNSET:
                 required = attrs.get("nargs", 1) > 0
+            # If the argument has a default value, it is not required.
+            else:
+                required = False
 
         if "multiple" in attrs:
             raise TypeError("__init__() got an unexpected keyword argument 'multiple'.")
 
         super().__init__(param_decls, required=required, **attrs)
 
-        if __debug__:
-            if self.default is not None and self.nargs == -1:
-                raise TypeError("'default' is not supported for nargs=-1.")
-
     @property
     def human_readable_name(self) -> str:
         if self.metavar is not None:
             return self.metavar
         return self.name.upper()  # type: ignore
 
-    def make_metavar(self) -> str:
+    def make_metavar(self, ctx: Context) -> str:
         if self.metavar is not None:
             return self.metavar
-        var = self.type.get_metavar(self)
+        var = self.type.get_metavar(param=self, ctx=ctx)
         if not var:
             var = self.name.upper()  # type: ignore
+        if self.deprecated:
+            var += "!"
         if not self.required:
             var = f"[{var}]"
         if self.nargs != 1:
@@ -3021,8 +3365,8 @@ def make_metavar(self) -> str:
         return var
 
     def _parse_decls(
-        self, decls: t.Sequence[str], expose_value: bool
-    ) -> t.Tuple[t.Optional[str], t.List[str], t.List[str]]:
+        self, decls: cabc.Sequence[str], expose_value: bool
+    ) -> tuple[str | None, list[str], list[str]]:
         if not decls:
             if not expose_value:
                 return None, [], []
@@ -3033,15 +3377,39 @@ def _parse_decls(
         else:
             raise TypeError(
                 "Arguments take exactly one parameter declaration, got"
-                f" {len(decls)}."
+                f" {len(decls)}: {decls}."
             )
         return name, [arg], []
 
-    def get_usage_pieces(self, ctx: Context) -> t.List[str]:
-        return [self.make_metavar()]
+    def get_usage_pieces(self, ctx: Context) -> list[str]:
+        return [self.make_metavar(ctx)]
 
     def get_error_hint(self, ctx: Context) -> str:
-        return f"'{self.make_metavar()}'"
+        return f"'{self.make_metavar(ctx)}'"
 
-    def add_to_parser(self, parser: OptionParser, ctx: Context) -> None:
+    def add_to_parser(self, parser: _OptionParser, ctx: Context) -> None:
         parser.add_argument(dest=self.name, nargs=self.nargs, obj=self)
+
+
+def __getattr__(name: str) -> object:
+    import warnings
+
+    if name == "BaseCommand":
+        warnings.warn(
+            "'BaseCommand' is deprecated and will be removed in Click 9.0. Use"
+            " 'Command' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _BaseCommand
+
+    if name == "MultiCommand":
+        warnings.warn(
+            "'MultiCommand' is deprecated and will be removed in Click 9.0. Use"
+            " 'Group' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _MultiCommand
+
+    raise AttributeError(name)
diff --git a/libs/click/decorators.py b/libs/click/decorators.py
index bcf8906e70..21f4c34224 100644
--- a/libs/click/decorators.py
+++ b/libs/click/decorators.py
@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import inspect
-import types
 import typing as t
 from functools import update_wrapper
 from gettext import gettext as _
@@ -21,35 +22,35 @@
 R = t.TypeVar("R")
 T = t.TypeVar("T")
 _AnyCallable = t.Callable[..., t.Any]
-FC = t.TypeVar("FC", bound=t.Union[_AnyCallable, Command])
+FC = t.TypeVar("FC", bound="_AnyCallable | Command")
 
 
-def pass_context(f: "t.Callable[te.Concatenate[Context, P], R]") -> "t.Callable[P, R]":
+def pass_context(f: t.Callable[te.Concatenate[Context, P], R]) -> t.Callable[P, R]:
     """Marks a callback as wanting to receive the current context
     object as first argument.
     """
 
-    def new_func(*args: "P.args", **kwargs: "P.kwargs") -> "R":
+    def new_func(*args: P.args, **kwargs: P.kwargs) -> R:
         return f(get_current_context(), *args, **kwargs)
 
     return update_wrapper(new_func, f)
 
 
-def pass_obj(f: "t.Callable[te.Concatenate[t.Any, P], R]") -> "t.Callable[P, R]":
+def pass_obj(f: t.Callable[te.Concatenate[T, P], R]) -> t.Callable[P, R]:
     """Similar to :func:`pass_context`, but only pass the object on the
     context onwards (:attr:`Context.obj`).  This is useful if that object
     represents the state of a nested system.
     """
 
-    def new_func(*args: "P.args", **kwargs: "P.kwargs") -> "R":
+    def new_func(*args: P.args, **kwargs: P.kwargs) -> R:
         return f(get_current_context().obj, *args, **kwargs)
 
     return update_wrapper(new_func, f)
 
 
 def make_pass_decorator(
-    object_type: t.Type[T], ensure: bool = False
-) -> t.Callable[["t.Callable[te.Concatenate[T, P], R]"], "t.Callable[P, R]"]:
+    object_type: type[T], ensure: bool = False
+) -> t.Callable[[t.Callable[te.Concatenate[T, P], R]], t.Callable[P, R]]:
     """Given an object type this creates a decorator that will work
     similar to :func:`pass_obj` but instead of passing the object of the
     current context, it will find the innermost context of type
@@ -72,11 +73,11 @@ def new_func(ctx, *args, **kwargs):
                    remembered on the context if it's not there yet.
     """
 
-    def decorator(f: "t.Callable[te.Concatenate[T, P], R]") -> "t.Callable[P, R]":
-        def new_func(*args: "P.args", **kwargs: "P.kwargs") -> "R":
+    def decorator(f: t.Callable[te.Concatenate[T, P], R]) -> t.Callable[P, R]:
+        def new_func(*args: P.args, **kwargs: P.kwargs) -> R:
             ctx = get_current_context()
 
-            obj: t.Optional[T]
+            obj: T | None
             if ensure:
                 obj = ctx.ensure_object(object_type)
             else:
@@ -97,8 +98,8 @@ def new_func(*args: "P.args", **kwargs: "P.kwargs") -> "R":
 
 
 def pass_meta_key(
-    key: str, *, doc_description: t.Optional[str] = None
-) -> "t.Callable[[t.Callable[te.Concatenate[t.Any, P], R]], t.Callable[P, R]]":
+    key: str, *, doc_description: str | None = None
+) -> t.Callable[[t.Callable[te.Concatenate[T, P], R]], t.Callable[P, R]]:
     """Create a decorator that passes a key from
     :attr:`click.Context.meta` as the first argument to the decorated
     function.
@@ -111,8 +112,8 @@ def pass_meta_key(
     .. versionadded:: 8.0
     """
 
-    def decorator(f: "t.Callable[te.Concatenate[t.Any, P], R]") -> "t.Callable[P, R]":
-        def new_func(*args: "P.args", **kwargs: "P.kwargs") -> R:
+    def decorator(f: t.Callable[te.Concatenate[T, P], R]) -> t.Callable[P, R]:
+        def new_func(*args: P.args, **kwargs: P.kwargs) -> R:
             ctx = get_current_context()
             obj = ctx.meta[key]
             return ctx.invoke(f, obj, *args, **kwargs)
@@ -141,8 +142,8 @@ def command(name: _AnyCallable) -> Command: ...
 # @command(namearg, CommandCls, ...) or @command(namearg, cls=CommandCls, ...)
 @t.overload
 def command(
-    name: t.Optional[str],
-    cls: t.Type[CmdType],
+    name: str | None,
+    cls: type[CmdType],
     **attrs: t.Any,
 ) -> t.Callable[[_AnyCallable], CmdType]: ...
 
@@ -152,7 +153,7 @@ def command(
 def command(
     name: None = None,
     *,
-    cls: t.Type[CmdType],
+    cls: type[CmdType],
     **attrs: t.Any,
 ) -> t.Callable[[_AnyCallable], CmdType]: ...
 
@@ -160,22 +161,23 @@ def command(
 # variant: with optional string name, no cls argument provided.
 @t.overload
 def command(
-    name: t.Optional[str] = ..., cls: None = None, **attrs: t.Any
+    name: str | None = ..., cls: None = None, **attrs: t.Any
 ) -> t.Callable[[_AnyCallable], Command]: ...
 
 
 def command(
-    name: t.Union[t.Optional[str], _AnyCallable] = None,
-    cls: t.Optional[t.Type[CmdType]] = None,
+    name: str | _AnyCallable | None = None,
+    cls: type[CmdType] | None = None,
     **attrs: t.Any,
-) -> t.Union[Command, t.Callable[[_AnyCallable], t.Union[Command, CmdType]]]:
+) -> Command | t.Callable[[_AnyCallable], Command | CmdType]:
     r"""Creates a new :class:`Command` and uses the decorated function as
     callback.  This will also automatically attach all decorated
     :func:`option`\s and :func:`argument`\s as parameters to the command.
 
-    The name of the command defaults to the name of the function with
-    underscores replaced by dashes.  If you want to change that, you can
-    pass the intended name as the first argument.
+    The name of the command defaults to the name of the function, converted to
+    lowercase, with underscores ``_`` replaced by dashes ``-``, and the suffixes
+    ``_command``, ``_cmd``, ``_group``, and ``_grp`` are removed. For example,
+    ``init_data_command`` becomes ``init-data``.
 
     All keyword arguments are forwarded to the underlying command class.
     For the ``params`` argument, any decorated params are appended to
@@ -185,10 +187,13 @@ def command(
     that can be invoked as a command line utility or be attached to a
     command :class:`Group`.
 
-    :param name: the name of the command.  This defaults to the function
-                 name with underscores replaced by dashes.
-    :param cls: the command class to instantiate.  This defaults to
-                :class:`Command`.
+    :param name: The name of the command. Defaults to modifying the function's
+        name as described above.
+    :param cls: The command class to create. Defaults to :class:`Command`.
+
+    .. versionchanged:: 8.2
+        The suffixes ``_command``, ``_cmd``, ``_group``, and ``_grp`` are
+        removed when generating the name.
 
     .. versionchanged:: 8.1
         This decorator can be applied without parentheses.
@@ -198,7 +203,7 @@ def command(
         appended to the end of the list.
     """
 
-    func: t.Optional[t.Callable[[_AnyCallable], t.Any]] = None
+    func: t.Callable[[_AnyCallable], t.Any] | None = None
 
     if callable(name):
         func = name
@@ -207,7 +212,7 @@ def command(
         assert not attrs, "Use 'command(**kwargs)(callable)' to provide arguments."
 
     if cls is None:
-        cls = t.cast(t.Type[CmdType], Command)
+        cls = t.cast("type[CmdType]", Command)
 
     def decorator(f: _AnyCallable) -> CmdType:
         if isinstance(f, Command):
@@ -231,12 +236,16 @@ def decorator(f: _AnyCallable) -> CmdType:
             assert cls is not None
             assert not callable(name)
 
-        cmd = cls(
-            name=name or f.__name__.lower().replace("_", "-"),
-            callback=f,
-            params=params,
-            **attrs,
-        )
+        if name is not None:
+            cmd_name = name
+        else:
+            cmd_name = f.__name__.lower().replace("_", "-")
+            cmd_left, sep, suffix = cmd_name.rpartition("-")
+
+            if sep and suffix in {"command", "cmd", "group", "grp"}:
+                cmd_name = cmd_left
+
+        cmd = cls(name=cmd_name, callback=f, params=params, **attrs)
         cmd.__doc__ = f.__doc__
         return cmd
 
@@ -258,8 +267,8 @@ def group(name: _AnyCallable) -> Group: ...
 # @group(namearg, GroupCls, ...) or @group(namearg, cls=GroupCls, ...)
 @t.overload
 def group(
-    name: t.Optional[str],
-    cls: t.Type[GrpType],
+    name: str | None,
+    cls: type[GrpType],
     **attrs: t.Any,
 ) -> t.Callable[[_AnyCallable], GrpType]: ...
 
@@ -269,7 +278,7 @@ def group(
 def group(
     name: None = None,
     *,
-    cls: t.Type[GrpType],
+    cls: type[GrpType],
     **attrs: t.Any,
 ) -> t.Callable[[_AnyCallable], GrpType]: ...
 
@@ -277,15 +286,15 @@ def group(
 # variant: with optional string name, no cls argument provided.
 @t.overload
 def group(
-    name: t.Optional[str] = ..., cls: None = None, **attrs: t.Any
+    name: str | None = ..., cls: None = None, **attrs: t.Any
 ) -> t.Callable[[_AnyCallable], Group]: ...
 
 
 def group(
-    name: t.Union[str, _AnyCallable, None] = None,
-    cls: t.Optional[t.Type[GrpType]] = None,
+    name: str | _AnyCallable | None = None,
+    cls: type[GrpType] | None = None,
     **attrs: t.Any,
-) -> t.Union[Group, t.Callable[[_AnyCallable], t.Union[Group, GrpType]]]:
+) -> Group | t.Callable[[_AnyCallable], Group | GrpType]:
     """Creates a new :class:`Group` with a function as callback.  This
     works otherwise the same as :func:`command` just that the `cls`
     parameter is set to :class:`Group`.
@@ -294,7 +303,7 @@ def group(
         This decorator can be applied without parentheses.
     """
     if cls is None:
-        cls = t.cast(t.Type[GrpType], Group)
+        cls = t.cast("type[GrpType]", Group)
 
     if callable(name):
         return command(cls=cls, **attrs)(name)
@@ -313,7 +322,7 @@ def _param_memo(f: t.Callable[..., t.Any], param: Parameter) -> None:
 
 
 def argument(
-    *param_decls: str, cls: t.Optional[t.Type[Argument]] = None, **attrs: t.Any
+    *param_decls: str, cls: type[Argument] | None = None, **attrs: t.Any
 ) -> t.Callable[[FC], FC]:
     """Attaches an argument to the command.  All positional arguments are
     passed as parameter declarations to :class:`Argument`; all keyword
@@ -341,7 +350,7 @@ def decorator(f: FC) -> FC:
 
 
 def option(
-    *param_decls: str, cls: t.Optional[t.Type[Option]] = None, **attrs: t.Any
+    *param_decls: str, cls: type[Option] | None = None, **attrs: t.Any
 ) -> t.Callable[[FC], FC]:
     """Attaches an option to the command.  All positional arguments are
     passed as parameter declarations to :class:`Option`; all keyword
@@ -410,11 +419,11 @@ def password_option(*param_decls: str, **kwargs: t.Any) -> t.Callable[[FC], FC]:
 
 
 def version_option(
-    version: t.Optional[str] = None,
+    version: str | None = None,
     *param_decls: str,
-    package_name: t.Optional[str] = None,
-    prog_name: t.Optional[str] = None,
-    message: t.Optional[str] = None,
+    package_name: str | None = None,
+    prog_name: str | None = None,
+    message: str | None = None,
     **kwargs: t.Any,
 ) -> t.Callable[[FC], FC]:
     """Add a ``--version`` option which immediately prints the version
@@ -422,8 +431,7 @@ def version_option(
 
     If ``version`` is not provided, Click will try to detect it using
     :func:`importlib.metadata.version` to get the version for the
-    ``package_name``. On Python < 3.8, the ``importlib_metadata``
-    backport must be installed.
+    ``package_name``.
 
     If ``package_name`` is not provided, Click will try to detect it by
     inspecting the stack frames. This will be used to detect the
@@ -484,17 +492,11 @@ def callback(ctx: Context, param: Parameter, value: bool) -> None:
             prog_name = ctx.find_root().info_name
 
         if version is None and package_name is not None:
-            metadata: t.Optional[types.ModuleType]
+            import importlib.metadata
 
             try:
-                from importlib import metadata
-            except ImportError:
-                # Python < 3.8
-                import importlib_metadata as metadata  # type: ignore
-
-            try:
-                version = metadata.version(package_name)  # type: ignore
-            except metadata.PackageNotFoundError:  # type: ignore
+                version = importlib.metadata.version(package_name)
+            except importlib.metadata.PackageNotFoundError:
                 raise RuntimeError(
                     f"{package_name!r} is not installed. Try passing"
                     " 'package_name' instead."
@@ -522,41 +524,28 @@ def callback(ctx: Context, param: Parameter, value: bool) -> None:
     return option(*param_decls, **kwargs)
 
 
-class HelpOption(Option):
+def help_option(*param_decls: str, **kwargs: t.Any) -> t.Callable[[FC], FC]:
     """Pre-configured ``--help`` option which immediately prints the help page
     and exits the program.
-    """
 
-    def __init__(
-        self,
-        param_decls: t.Optional[t.Sequence[str]] = None,
-        **kwargs: t.Any,
-    ) -> None:
-        if not param_decls:
-            param_decls = ("--help",)
-
-        kwargs.setdefault("is_flag", True)
-        kwargs.setdefault("expose_value", False)
-        kwargs.setdefault("is_eager", True)
-        kwargs.setdefault("help", _("Show this message and exit."))
-        kwargs.setdefault("callback", self.show_help)
-
-        super().__init__(param_decls, **kwargs)
+    :param param_decls: One or more option names. Defaults to the single
+        value ``"--help"``.
+    :param kwargs: Extra arguments are passed to :func:`option`.
+    """
 
-    @staticmethod
     def show_help(ctx: Context, param: Parameter, value: bool) -> None:
         """Callback that print the help page on ``<stdout>`` and exits."""
         if value and not ctx.resilient_parsing:
             echo(ctx.get_help(), color=ctx.color)
             ctx.exit()
 
+    if not param_decls:
+        param_decls = ("--help",)
 
-def help_option(*param_decls: str, **kwargs: t.Any) -> t.Callable[[FC], FC]:
-    """Decorator for the pre-configured ``--help`` option defined above.
+    kwargs.setdefault("is_flag", True)
+    kwargs.setdefault("expose_value", False)
+    kwargs.setdefault("is_eager", True)
+    kwargs.setdefault("help", _("Show this message and exit."))
+    kwargs.setdefault("callback", show_help)
 
-    :param param_decls: One or more option names. Defaults to the single
-        value ``"--help"``.
-    :param kwargs: Extra arguments are passed to :func:`option`.
-    """
-    kwargs.setdefault("cls", HelpOption)
     return option(*param_decls, **kwargs)
diff --git a/libs/click/exceptions.py b/libs/click/exceptions.py
index 0b8315166e..4d782ee361 100644
--- a/libs/click/exceptions.py
+++ b/libs/click/exceptions.py
@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import typing as t
 from gettext import gettext as _
 from gettext import ngettext
@@ -13,9 +16,7 @@
     from .core import Parameter
 
 
-def _join_param_hints(
-    param_hint: t.Optional[t.Union[t.Sequence[str], str]],
-) -> t.Optional[str]:
+def _join_param_hints(param_hint: cabc.Sequence[str] | str | None) -> str | None:
     if param_hint is not None and not isinstance(param_hint, str):
         return " / ".join(repr(x) for x in param_hint)
 
@@ -32,7 +33,7 @@ def __init__(self, message: str) -> None:
         super().__init__(message)
         # The context will be removed by the time we print the message, so cache
         # the color settings here to be used later on (in `show`)
-        self.show_color: t.Optional[bool] = resolve_color_default()
+        self.show_color: bool | None = resolve_color_default()
         self.message = message
 
     def format_message(self) -> str:
@@ -41,7 +42,7 @@ def format_message(self) -> str:
     def __str__(self) -> str:
         return self.message
 
-    def show(self, file: t.Optional[t.IO[t.Any]] = None) -> None:
+    def show(self, file: t.IO[t.Any] | None = None) -> None:
         if file is None:
             file = get_text_stderr()
 
@@ -63,12 +64,12 @@ class UsageError(ClickException):
 
     exit_code = 2
 
-    def __init__(self, message: str, ctx: t.Optional["Context"] = None) -> None:
+    def __init__(self, message: str, ctx: Context | None = None) -> None:
         super().__init__(message)
         self.ctx = ctx
-        self.cmd: t.Optional[Command] = self.ctx.command if self.ctx else None
+        self.cmd: Command | None = self.ctx.command if self.ctx else None
 
-    def show(self, file: t.Optional[t.IO[t.Any]] = None) -> None:
+    def show(self, file: t.IO[t.Any] | None = None) -> None:
         if file is None:
             file = get_text_stderr()
         color = None
@@ -112,9 +113,9 @@ class BadParameter(UsageError):
     def __init__(
         self,
         message: str,
-        ctx: t.Optional["Context"] = None,
-        param: t.Optional["Parameter"] = None,
-        param_hint: t.Optional[str] = None,
+        ctx: Context | None = None,
+        param: Parameter | None = None,
+        param_hint: cabc.Sequence[str] | str | None = None,
     ) -> None:
         super().__init__(message, ctx)
         self.param = param
@@ -147,18 +148,18 @@ class MissingParameter(BadParameter):
 
     def __init__(
         self,
-        message: t.Optional[str] = None,
-        ctx: t.Optional["Context"] = None,
-        param: t.Optional["Parameter"] = None,
-        param_hint: t.Optional[str] = None,
-        param_type: t.Optional[str] = None,
+        message: str | None = None,
+        ctx: Context | None = None,
+        param: Parameter | None = None,
+        param_hint: cabc.Sequence[str] | str | None = None,
+        param_type: str | None = None,
     ) -> None:
         super().__init__(message or "", ctx, param, param_hint)
         self.param_type = param_type
 
     def format_message(self) -> str:
         if self.param_hint is not None:
-            param_hint: t.Optional[str] = self.param_hint
+            param_hint: cabc.Sequence[str] | str | None = self.param_hint
         elif self.param is not None:
             param_hint = self.param.get_error_hint(self.ctx)  # type: ignore
         else:
@@ -173,7 +174,9 @@ def format_message(self) -> str:
 
         msg = self.message
         if self.param is not None:
-            msg_extra = self.param.type.get_missing_message(self.param)
+            msg_extra = self.param.type.get_missing_message(
+                param=self.param, ctx=self.ctx
+            )
             if msg_extra:
                 if msg:
                     msg += f". {msg_extra}"
@@ -212,9 +215,9 @@ class NoSuchOption(UsageError):
     def __init__(
         self,
         option_name: str,
-        message: t.Optional[str] = None,
-        possibilities: t.Optional[t.Sequence[str]] = None,
-        ctx: t.Optional["Context"] = None,
+        message: str | None = None,
+        possibilities: cabc.Sequence[str] | None = None,
+        ctx: Context | None = None,
     ) -> None:
         if message is None:
             message = _("No such option: {name}").format(name=option_name)
@@ -247,7 +250,7 @@ class BadOptionUsage(UsageError):
     """
 
     def __init__(
-        self, option_name: str, message: str, ctx: t.Optional["Context"] = None
+        self, option_name: str, message: str, ctx: Context | None = None
     ) -> None:
         super().__init__(message, ctx)
         self.option_name = option_name
@@ -262,10 +265,19 @@ class BadArgumentUsage(UsageError):
     """
 
 
+class NoArgsIsHelpError(UsageError):
+    def __init__(self, ctx: Context) -> None:
+        self.ctx: Context
+        super().__init__(ctx.get_help(), ctx=ctx)
+
+    def show(self, file: t.IO[t.Any] | None = None) -> None:
+        echo(self.format_message(), file=file, err=True, color=self.ctx.color)
+
+
 class FileError(ClickException):
     """Raised if a file cannot be opened."""
 
-    def __init__(self, filename: str, hint: t.Optional[str] = None) -> None:
+    def __init__(self, filename: str, hint: str | None = None) -> None:
         if hint is None:
             hint = _("unknown error")
 
diff --git a/libs/click/formatting.py b/libs/click/formatting.py
index ddd2a2f825..0b64f831b5 100644
--- a/libs/click/formatting.py
+++ b/libs/click/formatting.py
@@ -1,16 +1,18 @@
-import typing as t
+from __future__ import annotations
+
+import collections.abc as cabc
 from contextlib import contextmanager
 from gettext import gettext as _
 
 from ._compat import term_len
-from .parser import split_opt
+from .parser import _split_opt
 
 # Can force a width.  This is used by the test system
-FORCED_WIDTH: t.Optional[int] = None
+FORCED_WIDTH: int | None = None
 
 
-def measure_table(rows: t.Iterable[t.Tuple[str, str]]) -> t.Tuple[int, ...]:
-    widths: t.Dict[int, int] = {}
+def measure_table(rows: cabc.Iterable[tuple[str, str]]) -> tuple[int, ...]:
+    widths: dict[int, int] = {}
 
     for row in rows:
         for idx, col in enumerate(row):
@@ -20,8 +22,8 @@ def measure_table(rows: t.Iterable[t.Tuple[str, str]]) -> t.Tuple[int, ...]:
 
 
 def iter_rows(
-    rows: t.Iterable[t.Tuple[str, str]], col_count: int
-) -> t.Iterator[t.Tuple[str, ...]]:
+    rows: cabc.Iterable[tuple[str, str]], col_count: int
+) -> cabc.Iterator[tuple[str, ...]]:
     for row in rows:
         yield row + ("",) * (col_count - len(row))
 
@@ -63,8 +65,8 @@ def wrap_text(
     if not preserve_paragraphs:
         return wrapper.fill(text)
 
-    p: t.List[t.Tuple[int, bool, str]] = []
-    buf: t.List[str] = []
+    p: list[tuple[int, bool, str]] = []
+    buf: list[str] = []
     indent = None
 
     def _flush_par() -> None:
@@ -114,21 +116,21 @@ class HelpFormatter:
     def __init__(
         self,
         indent_increment: int = 2,
-        width: t.Optional[int] = None,
-        max_width: t.Optional[int] = None,
+        width: int | None = None,
+        max_width: int | None = None,
     ) -> None:
-        import shutil
-
         self.indent_increment = indent_increment
         if max_width is None:
             max_width = 80
         if width is None:
+            import shutil
+
             width = FORCED_WIDTH
             if width is None:
                 width = max(min(shutil.get_terminal_size().columns, max_width) - 2, 50)
         self.width = width
-        self.current_indent = 0
-        self.buffer: t.List[str] = []
+        self.current_indent: int = 0
+        self.buffer: list[str] = []
 
     def write(self, string: str) -> None:
         """Writes a unicode string into the internal buffer."""
@@ -142,9 +144,7 @@ def dedent(self) -> None:
         """Decreases the indentation."""
         self.current_indent -= self.indent_increment
 
-    def write_usage(
-        self, prog: str, args: str = "", prefix: t.Optional[str] = None
-    ) -> None:
+    def write_usage(self, prog: str, args: str = "", prefix: str | None = None) -> None:
         """Writes a usage line into the buffer.
 
         :param prog: the program name.
@@ -209,7 +209,7 @@ def write_text(self, text: str) -> None:
 
     def write_dl(
         self,
-        rows: t.Sequence[t.Tuple[str, str]],
+        rows: cabc.Sequence[tuple[str, str]],
         col_max: int = 30,
         col_spacing: int = 2,
     ) -> None:
@@ -252,7 +252,7 @@ def write_dl(
                 self.write("\n")
 
     @contextmanager
-    def section(self, name: str) -> t.Iterator[None]:
+    def section(self, name: str) -> cabc.Iterator[None]:
         """Helpful context manager that writes a paragraph, a heading,
         and the indents.
 
@@ -267,7 +267,7 @@ def section(self, name: str) -> t.Iterator[None]:
             self.dedent()
 
     @contextmanager
-    def indentation(self) -> t.Iterator[None]:
+    def indentation(self) -> cabc.Iterator[None]:
         """A context manager that increases the indentation."""
         self.indent()
         try:
@@ -280,7 +280,7 @@ def getvalue(self) -> str:
         return "".join(self.buffer)
 
 
-def join_options(options: t.Sequence[str]) -> t.Tuple[str, bool]:
+def join_options(options: cabc.Sequence[str]) -> tuple[str, bool]:
     """Given a list of option strings this joins them in the most appropriate
     way and returns them in the form ``(formatted_string,
     any_prefix_is_slash)`` where the second item in the tuple is a flag that
@@ -290,7 +290,7 @@ def join_options(options: t.Sequence[str]) -> t.Tuple[str, bool]:
     any_prefix_is_slash = False
 
     for opt in options:
-        prefix = split_opt(opt)[0]
+        prefix = _split_opt(opt)[0]
 
         if prefix == "/":
             any_prefix_is_slash = True
diff --git a/libs/click/globals.py b/libs/click/globals.py
index 191e712dbd..a2f91723d2 100644
--- a/libs/click/globals.py
+++ b/libs/click/globals.py
@@ -1,23 +1,23 @@
+from __future__ import annotations
+
 import typing as t
 from threading import local
 
 if t.TYPE_CHECKING:
-    import typing_extensions as te
-
     from .core import Context
 
 _local = local()
 
 
 @t.overload
-def get_current_context(silent: "te.Literal[False]" = False) -> "Context": ...
+def get_current_context(silent: t.Literal[False] = False) -> Context: ...
 
 
 @t.overload
-def get_current_context(silent: bool = ...) -> t.Optional["Context"]: ...
+def get_current_context(silent: bool = ...) -> Context | None: ...
 
 
-def get_current_context(silent: bool = False) -> t.Optional["Context"]:
+def get_current_context(silent: bool = False) -> Context | None:
     """Returns the current click context.  This can be used as a way to
     access the current context object from anywhere.  This is a more implicit
     alternative to the :func:`pass_context` decorator.  This function is
@@ -41,7 +41,7 @@ def get_current_context(silent: bool = False) -> t.Optional["Context"]:
     return None
 
 
-def push_context(ctx: "Context") -> None:
+def push_context(ctx: Context) -> None:
     """Pushes a new context to the current stack."""
     _local.__dict__.setdefault("stack", []).append(ctx)
 
@@ -51,7 +51,7 @@ def pop_context() -> None:
     _local.stack.pop()
 
 
-def resolve_color_default(color: t.Optional[bool] = None) -> t.Optional[bool]:
+def resolve_color_default(color: bool | None = None) -> bool | None:
     """Internal helper to get the default value of the color flag.  If a
     value is passed it's returned unchanged, otherwise it's looked up from
     the current context.
diff --git a/libs/click/parser.py b/libs/click/parser.py
index 600b8436d7..1ea1f7166e 100644
--- a/libs/click/parser.py
+++ b/libs/click/parser.py
@@ -22,19 +22,24 @@
 # maintained by the Python Software Foundation.
 # Copyright 2001-2006 Gregory P. Ward
 # Copyright 2002-2006 Python Software Foundation
+from __future__ import annotations
+
+import collections.abc as cabc
 import typing as t
 from collections import deque
 from gettext import gettext as _
 from gettext import ngettext
 
+from ._utils import FLAG_NEEDS_VALUE
+from ._utils import UNSET
 from .exceptions import BadArgumentUsage
 from .exceptions import BadOptionUsage
 from .exceptions import NoSuchOption
 from .exceptions import UsageError
 
 if t.TYPE_CHECKING:
-    import typing_extensions as te
-
+    from ._utils import T_FLAG_NEEDS_VALUE
+    from ._utils import T_UNSET
     from .core import Argument as CoreArgument
     from .core import Context
     from .core import Option as CoreOption
@@ -42,15 +47,10 @@
 
 V = t.TypeVar("V")
 
-# Sentinel value that indicates an option was passed as a flag without a
-# value but is not a flag option. Option.consume_value uses this to
-# prompt or use the flag_value.
-_flag_needs_value = object()
-
 
 def _unpack_args(
-    args: t.Sequence[str], nargs_spec: t.Sequence[int]
-) -> t.Tuple[t.Sequence[t.Union[str, t.Sequence[t.Optional[str]], None]], t.List[str]]:
+    args: cabc.Sequence[str], nargs_spec: cabc.Sequence[int]
+) -> tuple[cabc.Sequence[str | cabc.Sequence[str | None] | None], list[str]]:
     """Given an iterable of arguments and an iterable of nargs specifications,
     it returns a tuple with all the unpacked arguments at the first index
     and all remaining arguments as the second.
@@ -58,21 +58,21 @@ def _unpack_args(
     The nargs specification is the number of arguments that should be consumed
     or `-1` to indicate that this position should eat up all the remainders.
 
-    Missing items are filled with `None`.
+    Missing items are filled with ``UNSET``.
     """
     args = deque(args)
     nargs_spec = deque(nargs_spec)
-    rv: t.List[t.Union[str, t.Tuple[t.Optional[str], ...], None]] = []
-    spos: t.Optional[int] = None
+    rv: list[str | tuple[str | T_UNSET, ...] | T_UNSET] = []
+    spos: int | None = None
 
-    def _fetch(c: "te.Deque[V]") -> t.Optional[V]:
+    def _fetch(c: deque[V]) -> V | T_UNSET:
         try:
             if spos is None:
                 return c.popleft()
             else:
                 return c.pop()
         except IndexError:
-            return None
+            return UNSET
 
     while nargs_spec:
         nargs = _fetch(nargs_spec)
@@ -81,7 +81,7 @@ def _fetch(c: "te.Deque[V]") -> t.Optional[V]:
             continue
 
         if nargs == 1:
-            rv.append(_fetch(args))
+            rv.append(_fetch(args))  # type: ignore[arg-type]
         elif nargs > 1:
             x = [_fetch(args) for _ in range(nargs)]
 
@@ -96,7 +96,7 @@ def _fetch(c: "te.Deque[V]") -> t.Optional[V]:
                 raise TypeError("Cannot have two nargs < 0")
 
             spos = len(rv)
-            rv.append(None)
+            rv.append(UNSET)
 
     # spos is the position of the wildcard (star).  If it's not `None`,
     # we fill it with the remainder.
@@ -108,7 +108,7 @@ def _fetch(c: "te.Deque[V]") -> t.Optional[V]:
     return tuple(rv), list(args)
 
 
-def split_opt(opt: str) -> t.Tuple[str, str]:
+def _split_opt(opt: str) -> tuple[str, str]:
     first = opt[:1]
     if first.isalnum():
         return "", opt
@@ -117,63 +117,29 @@ def split_opt(opt: str) -> t.Tuple[str, str]:
     return first, opt[1:]
 
 
-def normalize_opt(opt: str, ctx: t.Optional["Context"]) -> str:
+def _normalize_opt(opt: str, ctx: Context | None) -> str:
     if ctx is None or ctx.token_normalize_func is None:
         return opt
-    prefix, opt = split_opt(opt)
+    prefix, opt = _split_opt(opt)
     return f"{prefix}{ctx.token_normalize_func(opt)}"
 
 
-def split_arg_string(string: str) -> t.List[str]:
-    """Split an argument string as with :func:`shlex.split`, but don't
-    fail if the string is incomplete. Ignores a missing closing quote or
-    incomplete escape sequence and uses the partial token as-is.
-
-    .. code-block:: python
-
-        split_arg_string("example 'my file")
-        ["example", "my file"]
-
-        split_arg_string("example my\\")
-        ["example", "my"]
-
-    :param string: String to split.
-    """
-    import shlex
-
-    lex = shlex.shlex(string, posix=True)
-    lex.whitespace_split = True
-    lex.commenters = ""
-    out = []
-
-    try:
-        for token in lex:
-            out.append(token)
-    except ValueError:
-        # Raised when end-of-string is reached in an invalid state. Use
-        # the partial token as-is. The quote or escape character is in
-        # lex.state, not lex.token.
-        out.append(lex.token)
-
-    return out
-
-
-class Option:
+class _Option:
     def __init__(
         self,
-        obj: "CoreOption",
-        opts: t.Sequence[str],
-        dest: t.Optional[str],
-        action: t.Optional[str] = None,
+        obj: CoreOption,
+        opts: cabc.Sequence[str],
+        dest: str | None,
+        action: str | None = None,
         nargs: int = 1,
-        const: t.Optional[t.Any] = None,
+        const: t.Any | None = None,
     ):
         self._short_opts = []
         self._long_opts = []
-        self.prefixes: t.Set[str] = set()
+        self.prefixes: set[str] = set()
 
         for opt in opts:
-            prefix, value = split_opt(opt)
+            prefix, value = _split_opt(opt)
             if not prefix:
                 raise ValueError(f"Invalid start character for option ({opt})")
             self.prefixes.add(prefix[0])
@@ -196,7 +162,7 @@ def __init__(
     def takes_value(self) -> bool:
         return self.action in ("store", "append")
 
-    def process(self, value: t.Any, state: "ParsingState") -> None:
+    def process(self, value: t.Any, state: _ParsingState) -> None:
         if self.action == "store":
             state.opts[self.dest] = value  # type: ignore
         elif self.action == "store_const":
@@ -212,22 +178,22 @@ def process(self, value: t.Any, state: "ParsingState") -> None:
         state.order.append(self.obj)
 
 
-class Argument:
-    def __init__(self, obj: "CoreArgument", dest: t.Optional[str], nargs: int = 1):
+class _Argument:
+    def __init__(self, obj: CoreArgument, dest: str | None, nargs: int = 1):
         self.dest = dest
         self.nargs = nargs
         self.obj = obj
 
     def process(
         self,
-        value: t.Union[t.Optional[str], t.Sequence[t.Optional[str]]],
-        state: "ParsingState",
+        value: str | cabc.Sequence[str | None] | None | T_UNSET,
+        state: _ParsingState,
     ) -> None:
         if self.nargs > 1:
-            assert value is not None
-            holes = sum(1 for x in value if x is None)
+            assert isinstance(value, cabc.Sequence)
+            holes = sum(1 for x in value if x is UNSET)
             if holes == len(value):
-                value = None
+                value = UNSET
             elif holes != 0:
                 raise BadArgumentUsage(
                     _("Argument {name!r} takes {nargs} values.").format(
@@ -235,24 +201,23 @@ def process(
                     )
                 )
 
-        if self.nargs == -1 and self.obj.envvar is not None and value == ():
-            # Replace empty tuple with None so that a value from the
-            # environment may be tried.
-            value = None
+        # We failed to collect any argument value so we consider the argument as unset.
+        if value == ():
+            value = UNSET
 
         state.opts[self.dest] = value  # type: ignore
         state.order.append(self.obj)
 
 
-class ParsingState:
-    def __init__(self, rargs: t.List[str]) -> None:
-        self.opts: t.Dict[str, t.Any] = {}
-        self.largs: t.List[str] = []
+class _ParsingState:
+    def __init__(self, rargs: list[str]) -> None:
+        self.opts: dict[str, t.Any] = {}
+        self.largs: list[str] = []
         self.rargs = rargs
-        self.order: t.List[CoreParameter] = []
+        self.order: list[CoreParameter] = []
 
 
-class OptionParser:
+class _OptionParser:
     """The option parser is an internal class that is ultimately used to
     parse options and arguments.  It's modelled after optparse and brings
     a similar but vastly simplified API.  It should generally not be used
@@ -264,9 +229,12 @@ class OptionParser:
 
     :param ctx: optionally the :class:`~click.Context` where this parser
                 should go with.
+
+    .. deprecated:: 8.2
+        Will be removed in Click 9.0.
     """
 
-    def __init__(self, ctx: t.Optional["Context"] = None) -> None:
+    def __init__(self, ctx: Context | None = None) -> None:
         #: The :class:`~click.Context` for this parser.  This might be
         #: `None` for some advanced use cases.
         self.ctx = ctx
@@ -285,19 +253,19 @@ def __init__(self, ctx: t.Optional["Context"] = None) -> None:
             self.allow_interspersed_args = ctx.allow_interspersed_args
             self.ignore_unknown_options = ctx.ignore_unknown_options
 
-        self._short_opt: t.Dict[str, Option] = {}
-        self._long_opt: t.Dict[str, Option] = {}
+        self._short_opt: dict[str, _Option] = {}
+        self._long_opt: dict[str, _Option] = {}
         self._opt_prefixes = {"-", "--"}
-        self._args: t.List[Argument] = []
+        self._args: list[_Argument] = []
 
     def add_option(
         self,
-        obj: "CoreOption",
-        opts: t.Sequence[str],
-        dest: t.Optional[str],
-        action: t.Optional[str] = None,
+        obj: CoreOption,
+        opts: cabc.Sequence[str],
+        dest: str | None,
+        action: str | None = None,
         nargs: int = 1,
-        const: t.Optional[t.Any] = None,
+        const: t.Any | None = None,
     ) -> None:
         """Adds a new option named `dest` to the parser.  The destination
         is not inferred (unlike with optparse) and needs to be explicitly
@@ -307,34 +275,32 @@ def add_option(
         The `obj` can be used to identify the option in the order list
         that is returned from the parser.
         """
-        opts = [normalize_opt(opt, self.ctx) for opt in opts]
-        option = Option(obj, opts, dest, action=action, nargs=nargs, const=const)
+        opts = [_normalize_opt(opt, self.ctx) for opt in opts]
+        option = _Option(obj, opts, dest, action=action, nargs=nargs, const=const)
         self._opt_prefixes.update(option.prefixes)
         for opt in option._short_opts:
             self._short_opt[opt] = option
         for opt in option._long_opts:
             self._long_opt[opt] = option
 
-    def add_argument(
-        self, obj: "CoreArgument", dest: t.Optional[str], nargs: int = 1
-    ) -> None:
+    def add_argument(self, obj: CoreArgument, dest: str | None, nargs: int = 1) -> None:
         """Adds a positional argument named `dest` to the parser.
 
         The `obj` can be used to identify the option in the order list
         that is returned from the parser.
         """
-        self._args.append(Argument(obj, dest=dest, nargs=nargs))
+        self._args.append(_Argument(obj, dest=dest, nargs=nargs))
 
     def parse_args(
-        self, args: t.List[str]
-    ) -> t.Tuple[t.Dict[str, t.Any], t.List[str], t.List["CoreParameter"]]:
+        self, args: list[str]
+    ) -> tuple[dict[str, t.Any], list[str], list[CoreParameter]]:
         """Parses positional arguments and returns ``(values, args, order)``
         for the parsed options and arguments as well as the leftover
         arguments if there are any.  The order is a list of objects as they
         appear on the command line.  If arguments appear multiple times they
         will be memorized multiple times as well.
         """
-        state = ParsingState(args)
+        state = _ParsingState(args)
         try:
             self._process_args_for_options(state)
             self._process_args_for_args(state)
@@ -343,7 +309,7 @@ def parse_args(
                 raise
         return state.opts, state.largs, state.order
 
-    def _process_args_for_args(self, state: ParsingState) -> None:
+    def _process_args_for_args(self, state: _ParsingState) -> None:
         pargs, args = _unpack_args(
             state.largs + state.rargs, [x.nargs for x in self._args]
         )
@@ -354,7 +320,7 @@ def _process_args_for_args(self, state: ParsingState) -> None:
         state.largs = args
         state.rargs = []
 
-    def _process_args_for_options(self, state: ParsingState) -> None:
+    def _process_args_for_options(self, state: _ParsingState) -> None:
         while state.rargs:
             arg = state.rargs.pop(0)
             arglen = len(arg)
@@ -391,7 +357,7 @@ def _process_args_for_options(self, state: ParsingState) -> None:
         # not a very interesting subset!
 
     def _match_long_opt(
-        self, opt: str, explicit_value: t.Optional[str], state: ParsingState
+        self, opt: str, explicit_value: str | None, state: _ParsingState
     ) -> None:
         if opt not in self._long_opt:
             from difflib import get_close_matches
@@ -416,18 +382,18 @@ def _match_long_opt(
             )
 
         else:
-            value = None
+            value = UNSET
 
         option.process(value, state)
 
-    def _match_short_opt(self, arg: str, state: ParsingState) -> None:
+    def _match_short_opt(self, arg: str, state: _ParsingState) -> None:
         stop = False
         i = 1
         prefix = arg[0]
         unknown_options = []
 
         for ch in arg[1:]:
-            opt = normalize_opt(f"{prefix}{ch}", self.ctx)
+            opt = _normalize_opt(f"{prefix}{ch}", self.ctx)
             option = self._short_opt.get(opt)
             i += 1
 
@@ -446,7 +412,7 @@ def _match_short_opt(self, arg: str, state: ParsingState) -> None:
                 value = self._get_value_from_state(opt, option, state)
 
             else:
-                value = None
+                value = UNSET
 
             option.process(value, state)
 
@@ -461,14 +427,16 @@ def _match_short_opt(self, arg: str, state: ParsingState) -> None:
             state.largs.append(f"{prefix}{''.join(unknown_options)}")
 
     def _get_value_from_state(
-        self, option_name: str, option: Option, state: ParsingState
-    ) -> t.Any:
+        self, option_name: str, option: _Option, state: _ParsingState
+    ) -> str | cabc.Sequence[str] | T_FLAG_NEEDS_VALUE:
         nargs = option.nargs
 
+        value: str | cabc.Sequence[str] | T_FLAG_NEEDS_VALUE
+
         if len(state.rargs) < nargs:
             if option.obj._flag_needs_value:
                 # Option allows omitting the value.
-                value = _flag_needs_value
+                value = FLAG_NEEDS_VALUE
             else:
                 raise BadOptionUsage(
                     option_name,
@@ -489,7 +457,7 @@ def _get_value_from_state(
             ):
                 # The next arg looks like the start of an option, don't
                 # use it as the value if omitting the value is allowed.
-                value = _flag_needs_value
+                value = FLAG_NEEDS_VALUE
             else:
                 value = state.rargs.pop(0)
         else:
@@ -498,7 +466,7 @@ def _get_value_from_state(
 
         return value
 
-    def _process_opts(self, arg: str, state: ParsingState) -> None:
+    def _process_opts(self, arg: str, state: _ParsingState) -> None:
         explicit_value = None
         # Long option handling happens in two parts.  The first part is
         # supporting explicitly attached values.  In any case, we will try
@@ -507,7 +475,7 @@ def _process_opts(self, arg: str, state: ParsingState) -> None:
             long_opt, explicit_value = arg.split("=", 1)
         else:
             long_opt = arg
-        norm_long_opt = normalize_opt(long_opt, self.ctx)
+        norm_long_opt = _normalize_opt(long_opt, self.ctx)
 
         # At this point we will match the (assumed) long option through
         # the long option matching code.  Note that this allows options
@@ -529,3 +497,36 @@ def _process_opts(self, arg: str, state: ParsingState) -> None:
                 raise
 
             state.largs.append(arg)
+
+
+def __getattr__(name: str) -> object:
+    import warnings
+
+    if name in {
+        "OptionParser",
+        "Argument",
+        "Option",
+        "split_opt",
+        "normalize_opt",
+        "ParsingState",
+    }:
+        warnings.warn(
+            f"'parser.{name}' is deprecated and will be removed in Click 9.0."
+            " The old parser is available in 'optparse'.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return globals()[f"_{name}"]
+
+    if name == "split_arg_string":
+        from .shell_completion import split_arg_string
+
+        warnings.warn(
+            "Importing 'parser.split_arg_string' is deprecated, it will only be"
+            " available in 'shell_completion' in Click 9.0.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return split_arg_string
+
+    raise AttributeError(name)
diff --git a/libs/click/shell_completion.py b/libs/click/shell_completion.py
index 07d0f09bac..8f1564c49b 100644
--- a/libs/click/shell_completion.py
+++ b/libs/click/shell_completion.py
@@ -1,22 +1,24 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import os
 import re
 import typing as t
 from gettext import gettext as _
 
 from .core import Argument
-from .core import BaseCommand
+from .core import Command
 from .core import Context
-from .core import MultiCommand
+from .core import Group
 from .core import Option
 from .core import Parameter
 from .core import ParameterSource
-from .parser import split_arg_string
 from .utils import echo
 
 
 def shell_complete(
-    cli: BaseCommand,
-    ctx_args: t.MutableMapping[str, t.Any],
+    cli: Command,
+    ctx_args: cabc.MutableMapping[str, t.Any],
     prog_name: str,
     complete_var: str,
     instruction: str,
@@ -77,12 +79,12 @@ def __init__(
         self,
         value: t.Any,
         type: str = "plain",
-        help: t.Optional[str] = None,
+        help: str | None = None,
         **kwargs: t.Any,
     ) -> None:
         self.value: t.Any = value
         self.type: str = type
-        self.help: t.Optional[str] = help
+        self.help: str | None = help
         self._info = kwargs
 
     def __getattr__(self, name: str) -> t.Any:
@@ -122,6 +124,12 @@ def __getattr__(self, name: str) -> t.Any:
 %(complete_func)s_setup;
 """
 
+# See ZshComplete.format_completion below, and issue #2703, before
+# changing this script.
+#
+# (TL;DR: _describe is picky about the format, but this Zsh script snippet
+# is already widely deployed.  So freeze this script, and use clever-ish
+# handling of colons in ZshComplet.format_completion.)
 _SOURCE_ZSH = """\
 #compdef %(prog_name)s
 
@@ -215,8 +223,8 @@ class ShellComplete:
 
     def __init__(
         self,
-        cli: BaseCommand,
-        ctx_args: t.MutableMapping[str, t.Any],
+        cli: Command,
+        ctx_args: cabc.MutableMapping[str, t.Any],
         prog_name: str,
         complete_var: str,
     ) -> None:
@@ -233,7 +241,7 @@ def func_name(self) -> str:
         safe_name = re.sub(r"\W*", "", self.prog_name.replace("-", "_"), flags=re.ASCII)
         return f"_{safe_name}_completion"
 
-    def source_vars(self) -> t.Dict[str, t.Any]:
+    def source_vars(self) -> dict[str, t.Any]:
         """Vars for formatting :attr:`source_template`.
 
         By default this provides ``complete_func``, ``complete_var``,
@@ -253,16 +261,14 @@ def source(self) -> str:
         """
         return self.source_template % self.source_vars()
 
-    def get_completion_args(self) -> t.Tuple[t.List[str], str]:
+    def get_completion_args(self) -> tuple[list[str], str]:
         """Use the env vars defined by the shell script to return a
         tuple of ``args, incomplete``. This must be implemented by
         subclasses.
         """
         raise NotImplementedError
 
-    def get_completions(
-        self, args: t.List[str], incomplete: str
-    ) -> t.List[CompletionItem]:
+    def get_completions(self, args: list[str], incomplete: str) -> list[CompletionItem]:
         """Determine the context and last complete command or parameter
         from the complete args. Call that object's ``shell_complete``
         method to get the completions for the incomplete value.
@@ -338,7 +344,7 @@ def source(self) -> str:
         self._check_version()
         return super().source()
 
-    def get_completion_args(self) -> t.Tuple[t.List[str], str]:
+    def get_completion_args(self) -> tuple[list[str], str]:
         cwords = split_arg_string(os.environ["COMP_WORDS"])
         cword = int(os.environ["COMP_CWORD"])
         args = cwords[1:cword]
@@ -360,7 +366,7 @@ class ZshComplete(ShellComplete):
     name = "zsh"
     source_template = _SOURCE_ZSH
 
-    def get_completion_args(self) -> t.Tuple[t.List[str], str]:
+    def get_completion_args(self) -> tuple[list[str], str]:
         cwords = split_arg_string(os.environ["COMP_WORDS"])
         cword = int(os.environ["COMP_CWORD"])
         args = cwords[1:cword]
@@ -373,7 +379,21 @@ def get_completion_args(self) -> t.Tuple[t.List[str], str]:
         return args, incomplete
 
     def format_completion(self, item: CompletionItem) -> str:
-        return f"{item.type}\n{item.value}\n{item.help if item.help else '_'}"
+        help_ = item.help or "_"
+        # The zsh completion script uses `_describe` on items with help
+        # texts (which splits the item help from the item value at the
+        # first unescaped colon) and `compadd` on items without help
+        # text (which uses the item value as-is and does not support
+        # colon escaping).  So escape colons in the item value if and
+        # only if the item help is not the sentinel "_" value, as used
+        # by the completion script.
+        #
+        # (The zsh completion script is potentially widely deployed, and
+        # thus harder to fix than this method.)
+        #
+        # See issue #1812 and issue #2703 for further context.
+        value = item.value.replace(":", r"\:") if help_ != "_" else item.value
+        return f"{item.type}\n{value}\n{help_}"
 
 
 class FishComplete(ShellComplete):
@@ -382,9 +402,11 @@ class FishComplete(ShellComplete):
     name = "fish"
     source_template = _SOURCE_FISH
 
-    def get_completion_args(self) -> t.Tuple[t.List[str], str]:
+    def get_completion_args(self) -> tuple[list[str], str]:
         cwords = split_arg_string(os.environ["COMP_WORDS"])
         incomplete = os.environ["COMP_CWORD"]
+        if incomplete:
+            incomplete = split_arg_string(incomplete)[0]
         args = cwords[1:]
 
         # Fish stores the partial word in both COMP_WORDS and
@@ -401,10 +423,10 @@ def format_completion(self, item: CompletionItem) -> str:
         return f"{item.type},{item.value}"
 
 
-ShellCompleteType = t.TypeVar("ShellCompleteType", bound=t.Type[ShellComplete])
+ShellCompleteType = t.TypeVar("ShellCompleteType", bound="type[ShellComplete]")
 
 
-_available_shells: t.Dict[str, t.Type[ShellComplete]] = {
+_available_shells: dict[str, type[ShellComplete]] = {
     "bash": BashComplete,
     "fish": FishComplete,
     "zsh": ZshComplete,
@@ -412,7 +434,7 @@ def format_completion(self, item: CompletionItem) -> str:
 
 
 def add_completion_class(
-    cls: ShellCompleteType, name: t.Optional[str] = None
+    cls: ShellCompleteType, name: str | None = None
 ) -> ShellCompleteType:
     """Register a :class:`ShellComplete` subclass under the given name.
     The name will be provided by the completion instruction environment
@@ -431,7 +453,7 @@ def add_completion_class(
     return cls
 
 
-def get_completion_class(shell: str) -> t.Optional[t.Type[ShellComplete]]:
+def get_completion_class(shell: str) -> type[ShellComplete] | None:
     """Look up a registered :class:`ShellComplete` subclass by the name
     provided by the completion instruction environment variable. If the
     name isn't registered, returns ``None``.
@@ -441,6 +463,43 @@ def get_completion_class(shell: str) -> t.Optional[t.Type[ShellComplete]]:
     return _available_shells.get(shell)
 
 
+def split_arg_string(string: str) -> list[str]:
+    """Split an argument string as with :func:`shlex.split`, but don't
+    fail if the string is incomplete. Ignores a missing closing quote or
+    incomplete escape sequence and uses the partial token as-is.
+
+    .. code-block:: python
+
+        split_arg_string("example 'my file")
+        ["example", "my file"]
+
+        split_arg_string("example my\\")
+        ["example", "my"]
+
+    :param string: String to split.
+
+    .. versionchanged:: 8.2
+        Moved to ``shell_completion`` from ``parser``.
+    """
+    import shlex
+
+    lex = shlex.shlex(string, posix=True)
+    lex.whitespace_split = True
+    lex.commenters = ""
+    out = []
+
+    try:
+        for token in lex:
+            out.append(token)
+    except ValueError:
+        # Raised when end-of-string is reached in an invalid state. Use
+        # the partial token as-is. The quote or escape character is in
+        # lex.state, not lex.token.
+        out.append(lex.token)
+
+    return out
+
+
 def _is_incomplete_argument(ctx: Context, param: Parameter) -> bool:
     """Determine if the given parameter is an argument that can still
     accept values.
@@ -475,7 +534,7 @@ def _start_of_option(ctx: Context, value: str) -> bool:
     return c in ctx._opt_prefixes
 
 
-def _is_incomplete_option(ctx: Context, args: t.List[str], param: Parameter) -> bool:
+def _is_incomplete_option(ctx: Context, args: list[str], param: Parameter) -> bool:
     """Determine if the given parameter is an option that needs a value.
 
     :param args: List of complete args before the incomplete value.
@@ -495,15 +554,16 @@ def _is_incomplete_option(ctx: Context, args: t.List[str], param: Parameter) ->
 
         if _start_of_option(ctx, arg):
             last_option = arg
+            break
 
     return last_option is not None and last_option in param.opts
 
 
 def _resolve_context(
-    cli: BaseCommand,
-    ctx_args: t.MutableMapping[str, t.Any],
+    cli: Command,
+    ctx_args: cabc.MutableMapping[str, t.Any],
     prog_name: str,
-    args: t.List[str],
+    args: list[str],
 ) -> Context:
     """Produce the context hierarchy starting with the command and
     traversing the complete arguments. This only follows the commands,
@@ -514,51 +574,55 @@ def _resolve_context(
     :param args: List of complete args before the incomplete value.
     """
     ctx_args["resilient_parsing"] = True
-    ctx = cli.make_context(prog_name, args.copy(), **ctx_args)
-    args = ctx.protected_args + ctx.args
-
-    while args:
-        command = ctx.command
-
-        if isinstance(command, MultiCommand):
-            if not command.chain:
-                name, cmd, args = command.resolve_command(ctx, args)
+    with cli.make_context(prog_name, args.copy(), **ctx_args) as ctx:
+        args = ctx._protected_args + ctx.args
 
-                if cmd is None:
-                    return ctx
+        while args:
+            command = ctx.command
 
-                ctx = cmd.make_context(name, args, parent=ctx, resilient_parsing=True)
-                args = ctx.protected_args + ctx.args
-            else:
-                sub_ctx = ctx
-
-                while args:
+            if isinstance(command, Group):
+                if not command.chain:
                     name, cmd, args = command.resolve_command(ctx, args)
 
                     if cmd is None:
                         return ctx
 
-                    sub_ctx = cmd.make_context(
-                        name,
-                        args,
-                        parent=ctx,
-                        allow_extra_args=True,
-                        allow_interspersed_args=False,
-                        resilient_parsing=True,
-                    )
-                    args = sub_ctx.args
-
-                ctx = sub_ctx
-                args = [*sub_ctx.protected_args, *sub_ctx.args]
-        else:
-            break
+                    with cmd.make_context(
+                        name, args, parent=ctx, resilient_parsing=True
+                    ) as sub_ctx:
+                        ctx = sub_ctx
+                        args = ctx._protected_args + ctx.args
+                else:
+                    sub_ctx = ctx
+
+                    while args:
+                        name, cmd, args = command.resolve_command(ctx, args)
+
+                        if cmd is None:
+                            return ctx
+
+                        with cmd.make_context(
+                            name,
+                            args,
+                            parent=ctx,
+                            allow_extra_args=True,
+                            allow_interspersed_args=False,
+                            resilient_parsing=True,
+                        ) as sub_sub_ctx:
+                            sub_ctx = sub_sub_ctx
+                            args = sub_ctx.args
+
+                    ctx = sub_ctx
+                    args = [*sub_ctx._protected_args, *sub_ctx.args]
+            else:
+                break
 
     return ctx
 
 
 def _resolve_incomplete(
-    ctx: Context, args: t.List[str], incomplete: str
-) -> t.Tuple[t.Union[BaseCommand, Parameter], str]:
+    ctx: Context, args: list[str], incomplete: str
+) -> tuple[Command | Parameter, str]:
     """Find the Click object that will handle the completion of the
     incomplete value. Return the object and the incomplete value.
 
diff --git a/libs/click/termui.py b/libs/click/termui.py
index c084f19652..2e98a0771c 100644
--- a/libs/click/termui.py
+++ b/libs/click/termui.py
@@ -1,8 +1,12 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import inspect
 import io
 import itertools
 import sys
 import typing as t
+from contextlib import AbstractContextManager
 from gettext import gettext as _
 
 from ._compat import isatty
@@ -57,9 +61,9 @@ def _build_prompt(
     text: str,
     suffix: str,
     show_default: bool = False,
-    default: t.Optional[t.Any] = None,
+    default: t.Any | None = None,
     show_choices: bool = True,
-    type: t.Optional[ParamType] = None,
+    type: ParamType | None = None,
 ) -> str:
     prompt = text
     if type is not None and show_choices and isinstance(type, Choice):
@@ -78,11 +82,11 @@ def _format_default(default: t.Any) -> t.Any:
 
 def prompt(
     text: str,
-    default: t.Optional[t.Any] = None,
+    default: t.Any | None = None,
     hide_input: bool = False,
-    confirmation_prompt: t.Union[bool, str] = False,
-    type: t.Optional[t.Union[ParamType, t.Any]] = None,
-    value_proc: t.Optional[t.Callable[[str], t.Any]] = None,
+    confirmation_prompt: bool | str = False,
+    type: ParamType | t.Any | None = None,
+    value_proc: t.Callable[[str], t.Any] | None = None,
     prompt_suffix: str = ": ",
     show_default: bool = True,
     err: bool = False,
@@ -115,6 +119,9 @@ def prompt(
                          show_choices is true and text is "Group by" then the
                          prompt will be "Group by (day, week): ".
 
+    .. versionchanged:: 8.3.1
+        A space is no longer appended to the prompt.
+
     .. versionadded:: 8.0
         ``confirmation_prompt`` can be a custom string.
 
@@ -134,10 +141,10 @@ def prompt_func(text: str) -> str:
         try:
             # Write the prompt separately so that we get nice
             # coloring through colorama on Windows
-            echo(text.rstrip(" "), nl=False, err=err)
-            # Echo a space to stdout to work around an issue where
+            echo(text[:-1], nl=False, err=err)
+            # Echo the last character to stdout to work around an issue where
             # readline causes backspace to clear the whole line.
-            return f(" ")
+            return f(text[-1:])
         except (KeyboardInterrupt, EOFError):
             # getpass doesn't print a newline if the user aborts input with ^C.
             # Allegedly this behavior is inherited from getpass(3).
@@ -189,7 +196,7 @@ def prompt_func(text: str) -> str:
 
 def confirm(
     text: str,
-    default: t.Optional[bool] = False,
+    default: bool | None = False,
     abort: bool = False,
     prompt_suffix: str = ": ",
     show_default: bool = True,
@@ -210,6 +217,9 @@ def confirm(
     :param err: if set to true the file defaults to ``stderr`` instead of
                 ``stdout``, the same as with echo.
 
+    .. versionchanged:: 8.3.1
+        A space is no longer appended to the prompt.
+
     .. versionchanged:: 8.0
         Repeat until input is given if ``default`` is ``None``.
 
@@ -227,10 +237,10 @@ def confirm(
         try:
             # Write the prompt separately so that we get nice
             # coloring through colorama on Windows
-            echo(prompt.rstrip(" "), nl=False, err=err)
-            # Echo a space to stdout to work around an issue where
+            echo(prompt[:-1], nl=False, err=err)
+            # Echo the last character to stdout to work around an issue where
             # readline causes backspace to clear the whole line.
-            value = visible_prompt_func(" ").lower().strip()
+            value = visible_prompt_func(prompt[-1:]).lower().strip()
         except (KeyboardInterrupt, EOFError):
             raise Abort() from None
         if value in ("y", "yes"):
@@ -249,8 +259,8 @@ def confirm(
 
 
 def echo_via_pager(
-    text_or_generator: t.Union[t.Iterable[str], t.Callable[[], t.Iterable[str]], str],
-    color: t.Optional[bool] = None,
+    text_or_generator: cabc.Iterable[str] | t.Callable[[], cabc.Iterable[str]] | str,
+    color: bool | None = None,
 ) -> None:
     """This function takes a text and shows it via an environment specific
     pager on stdout.
@@ -266,11 +276,11 @@ def echo_via_pager(
     color = resolve_color_default(color)
 
     if inspect.isgeneratorfunction(text_or_generator):
-        i = t.cast(t.Callable[[], t.Iterable[str]], text_or_generator)()
+        i = t.cast("t.Callable[[], cabc.Iterable[str]]", text_or_generator)()
     elif isinstance(text_or_generator, str):
         i = [text_or_generator]
     else:
-        i = iter(t.cast(t.Iterable[str], text_or_generator))
+        i = iter(t.cast("cabc.Iterable[str]", text_or_generator))
 
     # convert every element of i to a text type if necessary
     text_generator = (el if isinstance(el, str) else str(el) for el in i)
@@ -280,23 +290,65 @@ def echo_via_pager(
     return pager(itertools.chain(text_generator, "\n"), color)
 
 
+@t.overload
+def progressbar(
+    *,
+    length: int,
+    label: str | None = None,
+    hidden: bool = False,
+    show_eta: bool = True,
+    show_percent: bool | None = None,
+    show_pos: bool = False,
+    fill_char: str = "#",
+    empty_char: str = "-",
+    bar_template: str = "%(label)s  [%(bar)s]  %(info)s",
+    info_sep: str = "  ",
+    width: int = 36,
+    file: t.TextIO | None = None,
+    color: bool | None = None,
+    update_min_steps: int = 1,
+) -> ProgressBar[int]: ...
+
+
+@t.overload
+def progressbar(
+    iterable: cabc.Iterable[V] | None = None,
+    length: int | None = None,
+    label: str | None = None,
+    hidden: bool = False,
+    show_eta: bool = True,
+    show_percent: bool | None = None,
+    show_pos: bool = False,
+    item_show_func: t.Callable[[V | None], str | None] | None = None,
+    fill_char: str = "#",
+    empty_char: str = "-",
+    bar_template: str = "%(label)s  [%(bar)s]  %(info)s",
+    info_sep: str = "  ",
+    width: int = 36,
+    file: t.TextIO | None = None,
+    color: bool | None = None,
+    update_min_steps: int = 1,
+) -> ProgressBar[V]: ...
+
+
 def progressbar(
-    iterable: t.Optional[t.Iterable[V]] = None,
-    length: t.Optional[int] = None,
-    label: t.Optional[str] = None,
+    iterable: cabc.Iterable[V] | None = None,
+    length: int | None = None,
+    label: str | None = None,
+    hidden: bool = False,
     show_eta: bool = True,
-    show_percent: t.Optional[bool] = None,
+    show_percent: bool | None = None,
     show_pos: bool = False,
-    item_show_func: t.Optional[t.Callable[[t.Optional[V]], t.Optional[str]]] = None,
+    item_show_func: t.Callable[[V | None], str | None] | None = None,
     fill_char: str = "#",
     empty_char: str = "-",
     bar_template: str = "%(label)s  [%(bar)s]  %(info)s",
     info_sep: str = "  ",
     width: int = 36,
-    file: t.Optional[t.TextIO] = None,
-    color: t.Optional[bool] = None,
+    file: t.TextIO | None = None,
+    color: bool | None = None,
     update_min_steps: int = 1,
-) -> "ProgressBar[V]":
+) -> ProgressBar[V]:
     """This function creates an iterable context manager that can be used
     to iterate over something while showing a progress bar.  It will
     either iterate over the `iterable` or `length` items (that are counted
@@ -359,6 +411,9 @@ def progressbar(
                    length.  If an iterable is not provided the progress bar
                    will iterate over a range of that length.
     :param label: the label to show next to the progress bar.
+    :param hidden: hide the progressbar. Defaults to ``False``. When no tty is
+        detected, it will only print the progressbar label. Setting this to
+        ``False`` also disables that.
     :param show_eta: enables or disables the estimated time display.  This is
                      automatically disabled if the length cannot be
                      determined.
@@ -391,6 +446,9 @@ def progressbar(
     :param update_min_steps: Render only when this many updates have
         completed. This allows tuning for very fast iterators.
 
+    .. versionadded:: 8.2
+        The ``hidden`` argument.
+
     .. versionchanged:: 8.0
         Output is shown even if execution time is less than 0.5 seconds.
 
@@ -402,11 +460,10 @@ def progressbar(
         in 7.0 that removed all output.
 
     .. versionadded:: 8.0
-       Added the ``update_min_steps`` parameter.
+       The ``update_min_steps`` parameter.
 
-    .. versionchanged:: 4.0
-        Added the ``color`` parameter. Added the ``update`` method to
-        the object.
+    .. versionadded:: 4.0
+        The ``color`` parameter and ``update`` method.
 
     .. versionadded:: 2.0
     """
@@ -416,6 +473,7 @@ def progressbar(
     return ProgressBar(
         iterable=iterable,
         length=length,
+        hidden=hidden,
         show_eta=show_eta,
         show_percent=show_percent,
         show_pos=show_pos,
@@ -446,9 +504,7 @@ def clear() -> None:
     echo("\033[2J\033[1;1H", nl=False)
 
 
-def _interpret_color(
-    color: t.Union[int, t.Tuple[int, int, int], str], offset: int = 0
-) -> str:
+def _interpret_color(color: int | tuple[int, int, int] | str, offset: int = 0) -> str:
     if isinstance(color, int):
         return f"{38 + offset};5;{color:d}"
 
@@ -461,16 +517,16 @@ def _interpret_color(
 
 def style(
     text: t.Any,
-    fg: t.Optional[t.Union[int, t.Tuple[int, int, int], str]] = None,
-    bg: t.Optional[t.Union[int, t.Tuple[int, int, int], str]] = None,
-    bold: t.Optional[bool] = None,
-    dim: t.Optional[bool] = None,
-    underline: t.Optional[bool] = None,
-    overline: t.Optional[bool] = None,
-    italic: t.Optional[bool] = None,
-    blink: t.Optional[bool] = None,
-    reverse: t.Optional[bool] = None,
-    strikethrough: t.Optional[bool] = None,
+    fg: int | tuple[int, int, int] | str | None = None,
+    bg: int | tuple[int, int, int] | str | None = None,
+    bold: bool | None = None,
+    dim: bool | None = None,
+    underline: bool | None = None,
+    overline: bool | None = None,
+    italic: bool | None = None,
+    blink: bool | None = None,
+    reverse: bool | None = None,
+    strikethrough: bool | None = None,
     reset: bool = True,
 ) -> str:
     """Styles a text with ANSI styles and returns the new string.  By
@@ -601,11 +657,11 @@ def unstyle(text: str) -> str:
 
 
 def secho(
-    message: t.Optional[t.Any] = None,
-    file: t.Optional[t.IO[t.AnyStr]] = None,
+    message: t.Any | None = None,
+    file: t.IO[t.AnyStr] | None = None,
     nl: bool = True,
     err: bool = False,
-    color: t.Optional[bool] = None,
+    color: bool | None = None,
     **styles: t.Any,
 ) -> None:
     """This function combines :func:`echo` and :func:`style` into one
@@ -634,14 +690,45 @@ def secho(
     return echo(message, file=file, nl=nl, err=err, color=color)
 
 
+@t.overload
+def edit(
+    text: bytes | bytearray,
+    editor: str | None = None,
+    env: cabc.Mapping[str, str] | None = None,
+    require_save: bool = False,
+    extension: str = ".txt",
+) -> bytes | None: ...
+
+
+@t.overload
 def edit(
-    text: t.Optional[t.AnyStr] = None,
-    editor: t.Optional[str] = None,
-    env: t.Optional[t.Mapping[str, str]] = None,
+    text: str,
+    editor: str | None = None,
+    env: cabc.Mapping[str, str] | None = None,
     require_save: bool = True,
     extension: str = ".txt",
-    filename: t.Optional[str] = None,
-) -> t.Optional[t.AnyStr]:
+) -> str | None: ...
+
+
+@t.overload
+def edit(
+    text: None = None,
+    editor: str | None = None,
+    env: cabc.Mapping[str, str] | None = None,
+    require_save: bool = True,
+    extension: str = ".txt",
+    filename: str | cabc.Iterable[str] | None = None,
+) -> None: ...
+
+
+def edit(
+    text: str | bytes | bytearray | None = None,
+    editor: str | None = None,
+    env: cabc.Mapping[str, str] | None = None,
+    require_save: bool = True,
+    extension: str = ".txt",
+    filename: str | cabc.Iterable[str] | None = None,
+) -> str | bytes | bytearray | None:
     r"""Edits the given text in the defined editor.  If an editor is given
     (should be the full path to the executable but the regular operating
     system search path is used for finding the executable) it overrides
@@ -667,7 +754,16 @@ def edit(
                       highlighting.
     :param filename: if provided it will edit this file instead of the
                      provided text contents.  It will not use a temporary
-                     file as an indirection in that case.
+                     file as an indirection in that case. If the editor supports
+                     editing multiple files at once, a sequence of files may be
+                     passed as well. Invoke `click.file` once per file instead
+                     if multiple files cannot be managed at once or editing the
+                     files serially is desired.
+
+    .. versionchanged:: 8.2.0
+        ``filename`` now accepts any ``Iterable[str]`` in addition to a ``str``
+        if the ``editor`` supports editing multiple files at once.
+
     """
     from ._termui_impl import Editor
 
@@ -676,7 +772,10 @@ def edit(
     if filename is None:
         return ed.edit(text)
 
-    ed.edit_file(filename)
+    if isinstance(filename, str):
+        filename = (filename,)
+
+    ed.edit_files(filenames=filename)
     return None
 
 
@@ -711,7 +810,7 @@ def launch(url: str, wait: bool = False, locate: bool = False) -> int:
 
 # If this is provided, getchar() calls into this instead.  This is used
 # for unittesting purposes.
-_getchar: t.Optional[t.Callable[[bool], str]] = None
+_getchar: t.Callable[[bool], str] | None = None
 
 
 def getchar(echo: bool = False) -> str:
@@ -744,13 +843,13 @@ def getchar(echo: bool = False) -> str:
     return _getchar(echo)
 
 
-def raw_terminal() -> t.ContextManager[int]:
+def raw_terminal() -> AbstractContextManager[int]:
     from ._termui_impl import raw_terminal as f
 
     return f()
 
 
-def pause(info: t.Optional[str] = None, err: bool = False) -> None:
+def pause(info: str | None = None, err: bool = False) -> None:
     """This command stops execution and waits for the user to press any
     key to continue.  This is similar to the Windows batch "pause"
     command.  If the program is not run through a terminal, this command
diff --git a/libs/click/testing.py b/libs/click/testing.py
index 772b2159cc..f6f60b809a 100644
--- a/libs/click/testing.py
+++ b/libs/click/testing.py
@@ -1,8 +1,10 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import contextlib
 import io
 import os
 import shlex
-import shutil
 import sys
 import tempfile
 import typing as t
@@ -15,7 +17,9 @@
 from ._compat import _find_binary_reader
 
 if t.TYPE_CHECKING:
-    from .core import BaseCommand
+    from _typeshed import ReadableBuffer
+
+    from .core import Command
 
 
 class EchoingStdin:
@@ -42,10 +46,10 @@ def read1(self, n: int = -1) -> bytes:
     def readline(self, n: int = -1) -> bytes:
         return self._echo(self._input.readline(n))
 
-    def readlines(self) -> t.List[bytes]:
+    def readlines(self) -> list[bytes]:
         return [self._echo(x) for x in self._input.readlines()]
 
-    def __iter__(self) -> t.Iterator[bytes]:
+    def __iter__(self) -> cabc.Iterator[bytes]:
         return iter(self._echo(x) for x in self._input)
 
     def __repr__(self) -> str:
@@ -53,7 +57,7 @@ def __repr__(self) -> str:
 
 
 @contextlib.contextmanager
-def _pause_echo(stream: t.Optional[EchoingStdin]) -> t.Iterator[None]:
+def _pause_echo(stream: EchoingStdin | None) -> cabc.Iterator[None]:
     if stream is None:
         yield
     else:
@@ -62,6 +66,51 @@ def _pause_echo(stream: t.Optional[EchoingStdin]) -> t.Iterator[None]:
         stream._paused = False
 
 
+class BytesIOCopy(io.BytesIO):
+    """Patch ``io.BytesIO`` to let the written stream be copied to another.
+
+    .. versionadded:: 8.2
+    """
+
+    def __init__(self, copy_to: io.BytesIO) -> None:
+        super().__init__()
+        self.copy_to = copy_to
+
+    def flush(self) -> None:
+        super().flush()
+        self.copy_to.flush()
+
+    def write(self, b: ReadableBuffer) -> int:
+        self.copy_to.write(b)
+        return super().write(b)
+
+
+class StreamMixer:
+    """Mixes `<stdout>` and `<stderr>` streams.
+
+    The result is available in the ``output`` attribute.
+
+    .. versionadded:: 8.2
+    """
+
+    def __init__(self) -> None:
+        self.output: io.BytesIO = io.BytesIO()
+        self.stdout: io.BytesIO = BytesIOCopy(copy_to=self.output)
+        self.stderr: io.BytesIO = BytesIOCopy(copy_to=self.output)
+
+    def __del__(self) -> None:
+        """
+        Guarantee that embedded file-like objects are closed in a
+        predictable order, protecting against races between
+        self.output being closed and other streams being flushed on close
+
+        .. versionadded:: 8.2.2
+        """
+        self.stderr.close()
+        self.stdout.close()
+        self.output.close()
+
+
 class _NamedTextIOWrapper(io.TextIOWrapper):
     def __init__(
         self, buffer: t.BinaryIO, name: str, mode: str, **kwargs: t.Any
@@ -80,11 +129,11 @@ def mode(self) -> str:
 
 
 def make_input_stream(
-    input: t.Optional[t.Union[str, bytes, t.IO[t.Any]]], charset: str
+    input: str | bytes | t.IO[t.Any] | None, charset: str
 ) -> t.BinaryIO:
     # Is already an input stream.
     if hasattr(input, "read"):
-        rv = _find_binary_reader(t.cast(t.IO[t.Any], input))
+        rv = _find_binary_reader(t.cast("t.IO[t.Any]", input))
 
         if rv is not None:
             return rv
@@ -100,41 +149,59 @@ def make_input_stream(
 
 
 class Result:
-    """Holds the captured result of an invoked CLI script."""
+    """Holds the captured result of an invoked CLI script.
+
+    :param runner: The runner that created the result
+    :param stdout_bytes: The standard output as bytes.
+    :param stderr_bytes: The standard error as bytes.
+    :param output_bytes: A mix of ``stdout_bytes`` and ``stderr_bytes``, as the
+        user would see  it in its terminal.
+    :param return_value: The value returned from the invoked command.
+    :param exit_code: The exit code as integer.
+    :param exception: The exception that happened if one did.
+    :param exc_info: Exception information (exception type, exception instance,
+        traceback type).
+
+    .. versionchanged:: 8.2
+        ``stderr_bytes`` no longer optional, ``output_bytes`` introduced and
+        ``mix_stderr`` has been removed.
+
+    .. versionadded:: 8.0
+        Added ``return_value``.
+    """
 
     def __init__(
         self,
-        runner: "CliRunner",
+        runner: CliRunner,
         stdout_bytes: bytes,
-        stderr_bytes: t.Optional[bytes],
+        stderr_bytes: bytes,
+        output_bytes: bytes,
         return_value: t.Any,
         exit_code: int,
-        exception: t.Optional[BaseException],
-        exc_info: t.Optional[
-            t.Tuple[t.Type[BaseException], BaseException, TracebackType]
-        ] = None,
+        exception: BaseException | None,
+        exc_info: tuple[type[BaseException], BaseException, TracebackType]
+        | None = None,
     ):
-        #: The runner that created the result
         self.runner = runner
-        #: The standard output as bytes.
         self.stdout_bytes = stdout_bytes
-        #: The standard error as bytes, or None if not available
         self.stderr_bytes = stderr_bytes
-        #: The value returned from the invoked command.
-        #:
-        #: .. versionadded:: 8.0
+        self.output_bytes = output_bytes
         self.return_value = return_value
-        #: The exit code as integer.
         self.exit_code = exit_code
-        #: The exception that happened if one did.
         self.exception = exception
-        #: The traceback
         self.exc_info = exc_info
 
     @property
     def output(self) -> str:
-        """The (standard) output as unicode string."""
-        return self.stdout
+        """The terminal output as unicode string, as the user would see it.
+
+        .. versionchanged:: 8.2
+            No longer a proxy for ``self.stdout``. Now has its own independent stream
+            that is mixing `<stdout>` and `<stderr>`, in the order they were written.
+        """
+        return self.output_bytes.decode(self.runner.charset, "replace").replace(
+            "\r\n", "\n"
+        )
 
     @property
     def stdout(self) -> str:
@@ -145,9 +212,11 @@ def stdout(self) -> str:
 
     @property
     def stderr(self) -> str:
-        """The standard error as unicode string."""
-        if self.stderr_bytes is None:
-            raise ValueError("stderr not separately captured")
+        """The standard error as unicode string.
+
+        .. versionchanged:: 8.2
+            No longer raise an exception, always returns the `<stderr>` string.
+        """
         return self.stderr_bytes.decode(self.runner.charset, "replace").replace(
             "\r\n", "\n"
         )
@@ -165,30 +234,33 @@ class CliRunner:
 
     :param charset: the character set for the input and output data.
     :param env: a dictionary with environment variables for overriding.
-    :param echo_stdin: if this is set to `True`, then reading from stdin writes
-                       to stdout.  This is useful for showing examples in
+    :param echo_stdin: if this is set to `True`, then reading from `<stdin>` writes
+                       to `<stdout>`.  This is useful for showing examples in
                        some circumstances.  Note that regular prompts
                        will automatically echo the input.
-    :param mix_stderr: if this is set to `False`, then stdout and stderr are
-                       preserved as independent streams.  This is useful for
-                       Unix-philosophy apps that have predictable stdout and
-                       noisy stderr, such that each may be measured
-                       independently
+    :param catch_exceptions: Whether to catch any exceptions other than
+                             ``SystemExit`` when running :meth:`~CliRunner.invoke`.
+
+    .. versionchanged:: 8.2
+        Added the ``catch_exceptions`` parameter.
+
+    .. versionchanged:: 8.2
+        ``mix_stderr`` parameter has been removed.
     """
 
     def __init__(
         self,
         charset: str = "utf-8",
-        env: t.Optional[t.Mapping[str, t.Optional[str]]] = None,
+        env: cabc.Mapping[str, str | None] | None = None,
         echo_stdin: bool = False,
-        mix_stderr: bool = True,
+        catch_exceptions: bool = True,
     ) -> None:
         self.charset = charset
-        self.env: t.Mapping[str, t.Optional[str]] = env or {}
+        self.env: cabc.Mapping[str, str | None] = env or {}
         self.echo_stdin = echo_stdin
-        self.mix_stderr = mix_stderr
+        self.catch_exceptions = catch_exceptions
 
-    def get_default_prog_name(self, cli: "BaseCommand") -> str:
+    def get_default_prog_name(self, cli: Command) -> str:
         """Given a command object it will return the default program name
         for it.  The default is the `name` attribute or ``"root"`` if not
         set.
@@ -196,8 +268,8 @@ def get_default_prog_name(self, cli: "BaseCommand") -> str:
         return cli.name or "root"
 
     def make_env(
-        self, overrides: t.Optional[t.Mapping[str, t.Optional[str]]] = None
-    ) -> t.Mapping[str, t.Optional[str]]:
+        self, overrides: cabc.Mapping[str, str | None] | None = None
+    ) -> cabc.Mapping[str, str | None]:
         """Returns the environment overrides for invoking a script."""
         rv = dict(self.env)
         if overrides:
@@ -207,25 +279,32 @@ def make_env(
     @contextlib.contextmanager
     def isolation(
         self,
-        input: t.Optional[t.Union[str, bytes, t.IO[t.Any]]] = None,
-        env: t.Optional[t.Mapping[str, t.Optional[str]]] = None,
+        input: str | bytes | t.IO[t.Any] | None = None,
+        env: cabc.Mapping[str, str | None] | None = None,
         color: bool = False,
-    ) -> t.Iterator[t.Tuple[io.BytesIO, t.Optional[io.BytesIO]]]:
+    ) -> cabc.Iterator[tuple[io.BytesIO, io.BytesIO, io.BytesIO]]:
         """A context manager that sets up the isolation for invoking of a
-        command line tool.  This sets up stdin with the given input data
+        command line tool.  This sets up `<stdin>` with the given input data
         and `os.environ` with the overrides from the given dictionary.
         This also rebinds some internals in Click to be mocked (like the
         prompt functionality).
 
         This is automatically done in the :meth:`invoke` method.
 
-        :param input: the input stream to put into sys.stdin.
+        :param input: the input stream to put into `sys.stdin`.
         :param env: the environment overrides as dictionary.
         :param color: whether the output should contain color codes. The
                       application can still override this explicitly.
 
+        .. versionadded:: 8.2
+            An additional output stream is returned, which is a mix of
+            `<stdout>` and `<stderr>` streams.
+
+        .. versionchanged:: 8.2
+            Always returns the `<stderr>` stream.
+
         .. versionchanged:: 8.0
-            ``stderr`` is opened with ``errors="backslashreplace"``
+            `<stderr>` is opened with ``errors="backslashreplace"``
             instead of the default ``"strict"``.
 
         .. versionchanged:: 4.0
@@ -242,11 +321,11 @@ def isolation(
 
         env = self.make_env(env)
 
-        bytes_output = io.BytesIO()
+        stream_mixer = StreamMixer()
 
         if self.echo_stdin:
             bytes_input = echo_input = t.cast(
-                t.BinaryIO, EchoingStdin(bytes_input, bytes_output)
+                t.BinaryIO, EchoingStdin(bytes_input, stream_mixer.stdout)
             )
 
         sys.stdin = text_input = _NamedTextIOWrapper(
@@ -259,35 +338,36 @@ def isolation(
             text_input._CHUNK_SIZE = 1  # type: ignore
 
         sys.stdout = _NamedTextIOWrapper(
-            bytes_output, encoding=self.charset, name="<stdout>", mode="w"
+            stream_mixer.stdout, encoding=self.charset, name="<stdout>", mode="w"
         )
 
-        bytes_error = None
-        if self.mix_stderr:
-            sys.stderr = sys.stdout
-        else:
-            bytes_error = io.BytesIO()
-            sys.stderr = _NamedTextIOWrapper(
-                bytes_error,
-                encoding=self.charset,
-                name="<stderr>",
-                mode="w",
-                errors="backslashreplace",
-            )
+        sys.stderr = _NamedTextIOWrapper(
+            stream_mixer.stderr,
+            encoding=self.charset,
+            name="<stderr>",
+            mode="w",
+            errors="backslashreplace",
+        )
 
         @_pause_echo(echo_input)  # type: ignore
-        def visible_input(prompt: t.Optional[str] = None) -> str:
+        def visible_input(prompt: str | None = None) -> str:
             sys.stdout.write(prompt or "")
-            val = text_input.readline().rstrip("\r\n")
+            try:
+                val = next(text_input).rstrip("\r\n")
+            except StopIteration as e:
+                raise EOFError() from e
             sys.stdout.write(f"{val}\n")
             sys.stdout.flush()
             return val
 
         @_pause_echo(echo_input)  # type: ignore
-        def hidden_input(prompt: t.Optional[str] = None) -> str:
+        def hidden_input(prompt: str | None = None) -> str:
             sys.stdout.write(f"{prompt or ''}\n")
             sys.stdout.flush()
-            return text_input.readline().rstrip("\r\n")
+            try:
+                return next(text_input).rstrip("\r\n")
+            except StopIteration as e:
+                raise EOFError() from e
 
         @_pause_echo(echo_input)  # type: ignore
         def _getchar(echo: bool) -> str:
@@ -302,7 +382,7 @@ def _getchar(echo: bool) -> str:
         default_color = color
 
         def should_strip_ansi(
-            stream: t.Optional[t.IO[t.Any]] = None, color: t.Optional[bool] = None
+            stream: t.IO[t.Any] | None = None, color: bool | None = None
         ) -> bool:
             if color is None:
                 return not default_color
@@ -330,7 +410,7 @@ def should_strip_ansi(
                         pass
                 else:
                     os.environ[key] = value
-            yield (bytes_output, bytes_error)
+            yield (stream_mixer.stdout, stream_mixer.stderr, stream_mixer.output)
         finally:
             for key, value in old_env.items():
                 if value is None:
@@ -352,11 +432,11 @@ def should_strip_ansi(
 
     def invoke(
         self,
-        cli: "BaseCommand",
-        args: t.Optional[t.Union[str, t.Sequence[str]]] = None,
-        input: t.Optional[t.Union[str, bytes, t.IO[t.Any]]] = None,
-        env: t.Optional[t.Mapping[str, t.Optional[str]]] = None,
-        catch_exceptions: bool = True,
+        cli: Command,
+        args: str | cabc.Sequence[str] | None = None,
+        input: str | bytes | t.IO[t.Any] | None = None,
+        env: cabc.Mapping[str, str | None] | None = None,
+        catch_exceptions: bool | None = None,
         color: bool = False,
         **extra: t.Any,
     ) -> Result:
@@ -375,11 +455,20 @@ def invoke(
         :param input: the input data for `sys.stdin`.
         :param env: the environment overrides.
         :param catch_exceptions: Whether to catch any other exceptions than
-                                 ``SystemExit``.
+                                 ``SystemExit``. If :data:`None`, the value
+                                 from :class:`CliRunner` is used.
         :param extra: the keyword arguments to pass to :meth:`main`.
         :param color: whether the output should contain color codes. The
                       application can still override this explicitly.
 
+        .. versionadded:: 8.2
+            The result object has the ``output_bytes`` attribute with
+            the mix of ``stdout_bytes`` and ``stderr_bytes``, as the user would
+            see it in its terminal.
+
+        .. versionchanged:: 8.2
+            The result object always returns the ``stderr_bytes`` stream.
+
         .. versionchanged:: 8.0
             The result object has the ``return_value`` attribute with
             the value returned from the invoked command.
@@ -395,9 +484,12 @@ def invoke(
             traceback if available.
         """
         exc_info = None
+        if catch_exceptions is None:
+            catch_exceptions = self.catch_exceptions
+
         with self.isolation(input=input, env=env, color=color) as outstreams:
             return_value = None
-            exception: t.Optional[BaseException] = None
+            exception: BaseException | None = None
             exit_code = 0
 
             if isinstance(args, str):
@@ -412,7 +504,7 @@ def invoke(
                 return_value = cli.main(args=args or (), prog_name=prog_name, **extra)
             except SystemExit as e:
                 exc_info = sys.exc_info()
-                e_code = t.cast(t.Optional[t.Union[int, t.Any]], e.code)
+                e_code = t.cast("int | t.Any | None", e.code)
 
                 if e_code is None:
                     e_code = 0
@@ -435,16 +527,16 @@ def invoke(
                 exc_info = sys.exc_info()
             finally:
                 sys.stdout.flush()
+                sys.stderr.flush()
                 stdout = outstreams[0].getvalue()
-                if self.mix_stderr:
-                    stderr = None
-                else:
-                    stderr = outstreams[1].getvalue()  # type: ignore
+                stderr = outstreams[1].getvalue()
+                output = outstreams[2].getvalue()
 
         return Result(
             runner=self,
             stdout_bytes=stdout,
             stderr_bytes=stderr,
+            output_bytes=output,
             return_value=return_value,
             exit_code=exit_code,
             exception=exception,
@@ -453,8 +545,8 @@ def invoke(
 
     @contextlib.contextmanager
     def isolated_filesystem(
-        self, temp_dir: t.Optional[t.Union[str, "os.PathLike[str]"]] = None
-    ) -> t.Iterator[str]:
+        self, temp_dir: str | os.PathLike[str] | None = None
+    ) -> cabc.Iterator[str]:
         """A context manager that creates a temporary directory and
         changes the current working directory to it. This isolates tests
         that affect the contents of the CWD to prevent them from
@@ -477,6 +569,8 @@ def isolated_filesystem(
             os.chdir(cwd)
 
             if temp_dir is None:
+                import shutil
+
                 try:
                     shutil.rmtree(dt)
                 except OSError:
diff --git a/libs/click/types.py b/libs/click/types.py
index a70fd58ce2..e71c1c21e4 100644
--- a/libs/click/types.py
+++ b/libs/click/types.py
@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+import collections.abc as cabc
+import enum
 import os
 import stat
 import sys
@@ -20,6 +24,8 @@
     from .core import Parameter
     from .shell_completion import CompletionItem
 
+ParamTypeValue = t.TypeVar("ParamTypeValue")
+
 
 class ParamType:
     """Represents the type of a parameter. Validates and converts values
@@ -51,9 +57,9 @@ class ParamType:
     #: whitespace splits them up.  The exception are paths and files which
     #: are split by ``os.path.pathsep`` by default (":" on Unix and ";" on
     #: Windows).
-    envvar_list_splitter: t.ClassVar[t.Optional[str]] = None
+    envvar_list_splitter: t.ClassVar[str | None] = None
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         """Gather information that could be useful for a tool generating
         user-facing documentation.
 
@@ -77,16 +83,16 @@ def to_info_dict(self) -> t.Dict[str, t.Any]:
     def __call__(
         self,
         value: t.Any,
-        param: t.Optional["Parameter"] = None,
-        ctx: t.Optional["Context"] = None,
+        param: Parameter | None = None,
+        ctx: Context | None = None,
     ) -> t.Any:
         if value is not None:
             return self.convert(value, param, ctx)
 
-    def get_metavar(self, param: "Parameter") -> t.Optional[str]:
+    def get_metavar(self, param: Parameter, ctx: Context) -> str | None:
         """Returns the metavar default for this param if it provides one."""
 
-    def get_missing_message(self, param: "Parameter") -> t.Optional[str]:
+    def get_missing_message(self, param: Parameter, ctx: Context | None) -> str | None:
         """Optionally might return extra information about a missing
         parameter.
 
@@ -94,7 +100,7 @@ def get_missing_message(self, param: "Parameter") -> t.Optional[str]:
         """
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         """Convert the value to the correct type. This is not called if
         the value is ``None`` (the missing value).
@@ -117,7 +123,7 @@ def convert(
         """
         return value
 
-    def split_envvar_value(self, rv: str) -> t.Sequence[str]:
+    def split_envvar_value(self, rv: str) -> cabc.Sequence[str]:
         """Given a value from an environment variable this splits it up
         into small chunks depending on the defined envvar list splitter.
 
@@ -130,15 +136,15 @@ def split_envvar_value(self, rv: str) -> t.Sequence[str]:
     def fail(
         self,
         message: str,
-        param: t.Optional["Parameter"] = None,
-        ctx: t.Optional["Context"] = None,
-    ) -> "t.NoReturn":
+        param: Parameter | None = None,
+        ctx: Context | None = None,
+    ) -> t.NoReturn:
         """Helper method to fail with an invalid value message."""
         raise BadParameter(message, ctx=ctx, param=param)
 
     def shell_complete(
-        self, ctx: "Context", param: "Parameter", incomplete: str
-    ) -> t.List["CompletionItem"]:
+        self, ctx: Context, param: Parameter, incomplete: str
+    ) -> list[CompletionItem]:
         """Return a list of
         :class:`~click.shell_completion.CompletionItem` objects for the
         incomplete value. Most types do not provide completions, but
@@ -167,13 +173,13 @@ def __init__(self, func: t.Callable[[t.Any], t.Any]) -> None:
         self.name: str = func.__name__
         self.func = func
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict["func"] = self.func
         return info_dict
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         try:
             return self.func(value)
@@ -190,7 +196,7 @@ class UnprocessedParamType(ParamType):
     name = "text"
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         return value
 
@@ -202,7 +208,7 @@ class StringParamType(ParamType):
     name = "text"
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         if isinstance(value, bytes):
             enc = _get_argv_encoding()
@@ -224,37 +230,91 @@ def __repr__(self) -> str:
         return "STRING"
 
 
-class Choice(ParamType):
+class Choice(ParamType, t.Generic[ParamTypeValue]):
     """The choice type allows a value to be checked against a fixed set
-    of supported values. All of these values have to be strings.
-
-    You should only pass a list or tuple of choices. Other iterables
-    (like generators) may lead to surprising results.
+    of supported values.
 
-    The resulting value will always be one of the originally passed choices
-    regardless of ``case_sensitive`` or any ``ctx.token_normalize_func``
-    being specified.
+    You may pass any iterable value which will be converted to a tuple
+    and thus will only be iterated once.
 
-    See :ref:`choice-opts` for an example.
+    The resulting value will always be one of the originally passed choices.
+    See :meth:`normalize_choice` for more info on the mapping of strings
+    to choices. See :ref:`choice-opts` for an example.
 
     :param case_sensitive: Set to false to make choices case
         insensitive. Defaults to true.
+
+    .. versionchanged:: 8.2.0
+        Non-``str`` ``choices`` are now supported. It can additionally be any
+        iterable. Before you were not recommended to pass anything but a list or
+        tuple.
+
+    .. versionadded:: 8.2.0
+        Choice normalization can be overridden via :meth:`normalize_choice`.
     """
 
     name = "choice"
 
-    def __init__(self, choices: t.Sequence[str], case_sensitive: bool = True) -> None:
-        self.choices = choices
+    def __init__(
+        self, choices: cabc.Iterable[ParamTypeValue], case_sensitive: bool = True
+    ) -> None:
+        self.choices: cabc.Sequence[ParamTypeValue] = tuple(choices)
         self.case_sensitive = case_sensitive
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict["choices"] = self.choices
         info_dict["case_sensitive"] = self.case_sensitive
         return info_dict
 
-    def get_metavar(self, param: "Parameter") -> str:
-        choices_str = "|".join(self.choices)
+    def _normalized_mapping(
+        self, ctx: Context | None = None
+    ) -> cabc.Mapping[ParamTypeValue, str]:
+        """
+        Returns mapping where keys are the original choices and the values are
+        the normalized values that are accepted via the command line.
+
+        This is a simple wrapper around :meth:`normalize_choice`, use that
+        instead which is supported.
+        """
+        return {
+            choice: self.normalize_choice(
+                choice=choice,
+                ctx=ctx,
+            )
+            for choice in self.choices
+        }
+
+    def normalize_choice(self, choice: ParamTypeValue, ctx: Context | None) -> str:
+        """
+        Normalize a choice value, used to map a passed string to a choice.
+        Each choice must have a unique normalized value.
+
+        By default uses :meth:`Context.token_normalize_func` and if not case
+        sensitive, convert it to a casefolded value.
+
+        .. versionadded:: 8.2.0
+        """
+        normed_value = choice.name if isinstance(choice, enum.Enum) else str(choice)
+
+        if ctx is not None and ctx.token_normalize_func is not None:
+            normed_value = ctx.token_normalize_func(normed_value)
+
+        if not self.case_sensitive:
+            normed_value = normed_value.casefold()
+
+        return normed_value
+
+    def get_metavar(self, param: Parameter, ctx: Context) -> str | None:
+        if param.param_type_name == "option" and not param.show_choices:  # type: ignore
+            choice_metavars = [
+                convert_type(type(choice)).name.upper() for choice in self.choices
+            ]
+            choices_str = "|".join([*dict.fromkeys(choice_metavars)])
+        else:
+            choices_str = "|".join(
+                [str(i) for i in self._normalized_mapping(ctx=ctx).values()]
+            )
 
         # Use curly braces to indicate a required argument.
         if param.required and param.param_type_name == "argument":
@@ -263,53 +323,60 @@ def get_metavar(self, param: "Parameter") -> str:
         # Use square braces to indicate an option or optional argument.
         return f"[{choices_str}]"
 
-    def get_missing_message(self, param: "Parameter") -> str:
-        return _("Choose from:\n\t{choices}").format(choices=",\n\t".join(self.choices))
+    def get_missing_message(self, param: Parameter, ctx: Context | None) -> str:
+        """
+        Message shown when no choice is passed.
+
+        .. versionchanged:: 8.2.0 Added ``ctx`` argument.
+        """
+        return _("Choose from:\n\t{choices}").format(
+            choices=",\n\t".join(self._normalized_mapping(ctx=ctx).values())
+        )
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
-    ) -> t.Any:
-        # Match through normalization and case sensitivity
-        # first do token_normalize_func, then lowercase
-        # preserve original `value` to produce an accurate message in
-        # `self.fail`
-        normed_value = value
-        normed_choices = {choice: choice for choice in self.choices}
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
+    ) -> ParamTypeValue:
+        """
+        For a given value from the parser, normalize it and find its
+        matching normalized value in the list of choices. Then return the
+        matched "original" choice.
+        """
+        normed_value = self.normalize_choice(choice=value, ctx=ctx)
+        normalized_mapping = self._normalized_mapping(ctx=ctx)
 
-        if ctx is not None and ctx.token_normalize_func is not None:
-            normed_value = ctx.token_normalize_func(value)
-            normed_choices = {
-                ctx.token_normalize_func(normed_choice): original
-                for normed_choice, original in normed_choices.items()
-            }
+        try:
+            return next(
+                original
+                for original, normalized in normalized_mapping.items()
+                if normalized == normed_value
+            )
+        except StopIteration:
+            self.fail(
+                self.get_invalid_choice_message(value=value, ctx=ctx),
+                param=param,
+                ctx=ctx,
+            )
 
-        if not self.case_sensitive:
-            normed_value = normed_value.casefold()
-            normed_choices = {
-                normed_choice.casefold(): original
-                for normed_choice, original in normed_choices.items()
-            }
+    def get_invalid_choice_message(self, value: t.Any, ctx: Context | None) -> str:
+        """Get the error message when the given choice is invalid.
 
-        if normed_value in normed_choices:
-            return normed_choices[normed_value]
+        :param value: The invalid value.
 
-        choices_str = ", ".join(map(repr, self.choices))
-        self.fail(
-            ngettext(
-                "{value!r} is not {choice}.",
-                "{value!r} is not one of {choices}.",
-                len(self.choices),
-            ).format(value=value, choice=choices_str, choices=choices_str),
-            param,
-            ctx,
-        )
+        .. versionadded:: 8.2
+        """
+        choices_str = ", ".join(map(repr, self._normalized_mapping(ctx=ctx).values()))
+        return ngettext(
+            "{value!r} is not {choice}.",
+            "{value!r} is not one of {choices}.",
+            len(self.choices),
+        ).format(value=value, choice=choices_str, choices=choices_str)
 
     def __repr__(self) -> str:
         return f"Choice({list(self.choices)})"
 
     def shell_complete(
-        self, ctx: "Context", param: "Parameter", incomplete: str
-    ) -> t.List["CompletionItem"]:
+        self, ctx: Context, param: Parameter, incomplete: str
+    ) -> list[CompletionItem]:
         """Complete choices that start with the incomplete value.
 
         :param ctx: Invocation context for this command.
@@ -354,29 +421,29 @@ class DateTime(ParamType):
 
     name = "datetime"
 
-    def __init__(self, formats: t.Optional[t.Sequence[str]] = None):
-        self.formats: t.Sequence[str] = formats or [
+    def __init__(self, formats: cabc.Sequence[str] | None = None):
+        self.formats: cabc.Sequence[str] = formats or [
             "%Y-%m-%d",
             "%Y-%m-%dT%H:%M:%S",
             "%Y-%m-%d %H:%M:%S",
         ]
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict["formats"] = self.formats
         return info_dict
 
-    def get_metavar(self, param: "Parameter") -> str:
+    def get_metavar(self, param: Parameter, ctx: Context) -> str | None:
         return f"[{'|'.join(self.formats)}]"
 
-    def _try_to_convert_date(self, value: t.Any, format: str) -> t.Optional[datetime]:
+    def _try_to_convert_date(self, value: t.Any, format: str) -> datetime | None:
         try:
             return datetime.strptime(value, format)
         except ValueError:
             return None
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         if isinstance(value, datetime):
             return value
@@ -403,10 +470,10 @@ def __repr__(self) -> str:
 
 
 class _NumberParamTypeBase(ParamType):
-    _number_class: t.ClassVar[t.Type[t.Any]]
+    _number_class: t.ClassVar[type[t.Any]]
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         try:
             return self._number_class(value)
@@ -423,8 +490,8 @@ def convert(
 class _NumberRangeBase(_NumberParamTypeBase):
     def __init__(
         self,
-        min: t.Optional[float] = None,
-        max: t.Optional[float] = None,
+        min: float | None = None,
+        max: float | None = None,
         min_open: bool = False,
         max_open: bool = False,
         clamp: bool = False,
@@ -435,7 +502,7 @@ def __init__(
         self.max_open = max_open
         self.clamp = clamp
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict.update(
             min=self.min,
@@ -447,7 +514,7 @@ def to_info_dict(self) -> t.Dict[str, t.Any]:
         return info_dict
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         import operator
 
@@ -477,7 +544,7 @@ def convert(
 
         return rv
 
-    def _clamp(self, bound: float, dir: "te.Literal[1, -1]", open: bool) -> float:
+    def _clamp(self, bound: float, dir: t.Literal[1, -1], open: bool) -> float:
         """Find the valid value to clamp to bound in the given
         direction.
 
@@ -532,7 +599,7 @@ class IntRange(_NumberRangeBase, IntParamType):
     name = "integer range"
 
     def _clamp(  # type: ignore
-        self, bound: int, dir: "te.Literal[1, -1]", open: bool
+        self, bound: int, dir: t.Literal[1, -1], open: bool
     ) -> int:
         if not open:
             return bound
@@ -568,8 +635,8 @@ class FloatRange(_NumberRangeBase, FloatParamType):
 
     def __init__(
         self,
-        min: t.Optional[float] = None,
-        max: t.Optional[float] = None,
+        min: float | None = None,
+        max: float | None = None,
         min_open: bool = False,
         max_open: bool = False,
         clamp: bool = False,
@@ -581,11 +648,11 @@ def __init__(
         if (min_open or max_open) and clamp:
             raise TypeError("Clamping is not supported for open bounds.")
 
-    def _clamp(self, bound: float, dir: "te.Literal[1, -1]", open: bool) -> float:
+    def _clamp(self, bound: float, dir: t.Literal[1, -1], open: bool) -> float:
         if not open:
             return bound
 
-        # Could use Python 3.9's math.nextafter here, but clamping an
+        # Could use math.nextafter here, but clamping an
         # open float range doesn't seem to be particularly useful. It's
         # left up to the user to write a callback to do it if needed.
         raise RuntimeError("Clamping is not supported for open bounds.")
@@ -594,23 +661,67 @@ def _clamp(self, bound: float, dir: "te.Literal[1, -1]", open: bool) -> float:
 class BoolParamType(ParamType):
     name = "boolean"
 
-    def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
-    ) -> t.Any:
-        if value in {False, True}:
-            return bool(value)
+    bool_states: dict[str, bool] = {
+        "1": True,
+        "0": False,
+        "yes": True,
+        "no": False,
+        "true": True,
+        "false": False,
+        "on": True,
+        "off": False,
+        "t": True,
+        "f": False,
+        "y": True,
+        "n": False,
+        # Absence of value is considered False.
+        "": False,
+    }
+    """A mapping of string values to boolean states.
+
+    Mapping is inspired by :py:attr:`configparser.ConfigParser.BOOLEAN_STATES`
+    and extends it.
+
+    .. caution::
+        String values are lower-cased, as the ``str_to_bool`` comparison function
+        below is case-insensitive.
+
+    .. warning::
+        The mapping is not exhaustive, and does not cover all possible boolean strings
+        representations. It will remains as it is to avoid endless bikeshedding.
+
+        Future work my be considered to make this mapping user-configurable from public
+        API.
+    """
 
-        norm = value.strip().lower()
+    @staticmethod
+    def str_to_bool(value: str | bool) -> bool | None:
+        """Convert a string to a boolean value.
 
-        if norm in {"1", "true", "t", "yes", "y", "on"}:
-            return True
+        If the value is already a boolean, it is returned as-is. If the value is a
+        string, it is stripped of whitespaces and lower-cased, then checked against
+        the known boolean states pre-defined in the `BoolParamType.bool_states` mapping
+        above.
 
-        if norm in {"0", "false", "f", "no", "n", "off"}:
-            return False
+        Returns `None` if the value does not match any known boolean state.
+        """
+        if isinstance(value, bool):
+            return value
+        return BoolParamType.bool_states.get(value.strip().lower())
 
-        self.fail(
-            _("{value!r} is not a valid boolean.").format(value=value), param, ctx
-        )
+    def convert(
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
+    ) -> bool:
+        normalized = self.str_to_bool(value)
+        if normalized is None:
+            self.fail(
+                _(
+                    "{value!r} is not a valid boolean. Recognized values: {states}"
+                ).format(value=value, states=", ".join(sorted(self.bool_states))),
+                param,
+                ctx,
+            )
+        return normalized
 
     def __repr__(self) -> str:
         return "BOOL"
@@ -620,7 +731,7 @@ class UUIDParameterType(ParamType):
     name = "uuid"
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         import uuid
 
@@ -676,9 +787,9 @@ class File(ParamType):
     def __init__(
         self,
         mode: str = "r",
-        encoding: t.Optional[str] = None,
-        errors: t.Optional[str] = "strict",
-        lazy: t.Optional[bool] = None,
+        encoding: str | None = None,
+        errors: str | None = "strict",
+        lazy: bool | None = None,
         atomic: bool = False,
     ) -> None:
         self.mode = mode
@@ -687,12 +798,12 @@ def __init__(
         self.lazy = lazy
         self.atomic = atomic
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict.update(mode=self.mode, encoding=self.encoding)
         return info_dict
 
-    def resolve_lazy_flag(self, value: "t.Union[str, os.PathLike[str]]") -> bool:
+    def resolve_lazy_flag(self, value: str | os.PathLike[str]) -> bool:
         if self.lazy is not None:
             return self.lazy
         if os.fspath(value) == "-":
@@ -703,14 +814,14 @@ def resolve_lazy_flag(self, value: "t.Union[str, os.PathLike[str]]") -> bool:
 
     def convert(
         self,
-        value: t.Union[str, "os.PathLike[str]", t.IO[t.Any]],
-        param: t.Optional["Parameter"],
-        ctx: t.Optional["Context"],
+        value: str | os.PathLike[str] | t.IO[t.Any],
+        param: Parameter | None,
+        ctx: Context | None,
     ) -> t.IO[t.Any]:
         if _is_file_like(value):
             return value
 
-        value = t.cast("t.Union[str, os.PathLike[str]]", value)
+        value = t.cast("str | os.PathLike[str]", value)
 
         try:
             lazy = self.resolve_lazy_flag(value)
@@ -723,7 +834,7 @@ def convert(
                 if ctx is not None:
                     ctx.call_on_close(lf.close_intelligently)
 
-                return t.cast(t.IO[t.Any], lf)
+                return t.cast("t.IO[t.Any]", lf)
 
             f, should_close = open_stream(
                 value, self.mode, self.encoding, self.errors, atomic=self.atomic
@@ -745,8 +856,8 @@ def convert(
             self.fail(f"'{format_filename(value)}': {e.strerror}", param, ctx)
 
     def shell_complete(
-        self, ctx: "Context", param: "Parameter", incomplete: str
-    ) -> t.List["CompletionItem"]:
+        self, ctx: Context, param: Parameter, incomplete: str
+    ) -> list[CompletionItem]:
         """Return a special completion marker that tells the completion
         system to use the shell to provide file path completions.
 
@@ -761,7 +872,7 @@ def shell_complete(
         return [CompletionItem(incomplete, type="file")]
 
 
-def _is_file_like(value: t.Any) -> "te.TypeGuard[t.IO[t.Any]]":
+def _is_file_like(value: t.Any) -> te.TypeGuard[t.IO[t.Any]]:
     return hasattr(value, "read") or hasattr(value, "write")
 
 
@@ -809,7 +920,7 @@ def __init__(
         readable: bool = True,
         resolve_path: bool = False,
         allow_dash: bool = False,
-        path_type: t.Optional[t.Type[t.Any]] = None,
+        path_type: type[t.Any] | None = None,
         executable: bool = False,
     ):
         self.exists = exists
@@ -829,7 +940,7 @@ def __init__(
         else:
             self.name = _("path")
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict.update(
             exists=self.exists,
@@ -842,8 +953,8 @@ def to_info_dict(self) -> t.Dict[str, t.Any]:
         return info_dict
 
     def coerce_path_result(
-        self, value: "t.Union[str, os.PathLike[str]]"
-    ) -> "t.Union[str, bytes, os.PathLike[str]]":
+        self, value: str | os.PathLike[str]
+    ) -> str | bytes | os.PathLike[str]:
         if self.type is not None and not isinstance(value, self.type):
             if self.type is str:
                 return os.fsdecode(value)
@@ -856,21 +967,17 @@ def coerce_path_result(
 
     def convert(
         self,
-        value: "t.Union[str, os.PathLike[str]]",
-        param: t.Optional["Parameter"],
-        ctx: t.Optional["Context"],
-    ) -> "t.Union[str, bytes, os.PathLike[str]]":
+        value: str | os.PathLike[str],
+        param: Parameter | None,
+        ctx: Context | None,
+    ) -> str | bytes | os.PathLike[str]:
         rv = value
 
         is_dash = self.file_okay and self.allow_dash and rv in (b"-", "-")
 
         if not is_dash:
             if self.resolve_path:
-                # os.path.realpath doesn't resolve symlinks on Windows
-                # until Python 3.8. Use pathlib for now.
-                import pathlib
-
-                rv = os.fsdecode(pathlib.Path(rv).resolve())
+                rv = os.path.realpath(rv)
 
             try:
                 st = os.stat(rv)
@@ -932,8 +1039,8 @@ def convert(
         return self.coerce_path_result(rv)
 
     def shell_complete(
-        self, ctx: "Context", param: "Parameter", incomplete: str
-    ) -> t.List["CompletionItem"]:
+        self, ctx: Context, param: Parameter, incomplete: str
+    ) -> list[CompletionItem]:
         """Return a special completion marker that tells the completion
         system to use the shell to provide path completions for only
         directories or any paths.
@@ -964,10 +1071,10 @@ class Tuple(CompositeParamType):
     :param types: a list of types that should be used for the tuple items.
     """
 
-    def __init__(self, types: t.Sequence[t.Union[t.Type[t.Any], ParamType]]) -> None:
-        self.types: t.Sequence[ParamType] = [convert_type(ty) for ty in types]
+    def __init__(self, types: cabc.Sequence[type[t.Any] | ParamType]) -> None:
+        self.types: cabc.Sequence[ParamType] = [convert_type(ty) for ty in types]
 
-    def to_info_dict(self) -> t.Dict[str, t.Any]:
+    def to_info_dict(self) -> dict[str, t.Any]:
         info_dict = super().to_info_dict()
         info_dict["types"] = [t.to_info_dict() for t in self.types]
         return info_dict
@@ -981,7 +1088,7 @@ def arity(self) -> int:  # type: ignore
         return len(self.types)
 
     def convert(
-        self, value: t.Any, param: t.Optional["Parameter"], ctx: t.Optional["Context"]
+        self, value: t.Any, param: Parameter | None, ctx: Context | None
     ) -> t.Any:
         len_type = len(self.types)
         len_value = len(value)
@@ -997,10 +1104,12 @@ def convert(
                 ctx=ctx,
             )
 
-        return tuple(ty(x, param, ctx) for ty, x in zip(self.types, value))
+        return tuple(
+            ty(x, param, ctx) for ty, x in zip(self.types, value, strict=False)
+        )
 
 
-def convert_type(ty: t.Optional[t.Any], default: t.Optional[t.Any] = None) -> ParamType:
+def convert_type(ty: t.Any | None, default: t.Any | None = None) -> ParamType:
     """Find the most appropriate :class:`ParamType` for the given Python
     type. If the type isn't provided, it can be inferred from a default
     value.
@@ -1091,3 +1200,10 @@ def convert_type(ty: t.Optional[t.Any], default: t.Optional[t.Any] = None) -> Pa
 
 #: A UUID parameter.
 UUID = UUIDParameterType()
+
+
+class OptionHelpExtra(t.TypedDict, total=False):
+    envvars: tuple[str, ...]
+    default: str
+    range: str
+    required: str
diff --git a/libs/click/utils.py b/libs/click/utils.py
index 836c6f21a0..beae26f761 100644
--- a/libs/click/utils.py
+++ b/libs/click/utils.py
@@ -1,3 +1,6 @@
+from __future__ import annotations
+
+import collections.abc as cabc
 import os
 import re
 import sys
@@ -30,10 +33,10 @@ def _posixify(name: str) -> str:
     return "-".join(name.split()).lower()
 
 
-def safecall(func: "t.Callable[P, R]") -> "t.Callable[P, t.Optional[R]]":
+def safecall(func: t.Callable[P, R]) -> t.Callable[P, R | None]:
     """Wraps a function so that it swallows exceptions."""
 
-    def wrapper(*args: "P.args", **kwargs: "P.kwargs") -> t.Optional[R]:
+    def wrapper(*args: P.args, **kwargs: P.kwargs) -> R | None:
         try:
             return func(*args, **kwargs)
         except Exception:
@@ -112,10 +115,10 @@ class LazyFile:
 
     def __init__(
         self,
-        filename: t.Union[str, "os.PathLike[str]"],
+        filename: str | os.PathLike[str],
         mode: str = "r",
-        encoding: t.Optional[str] = None,
-        errors: t.Optional[str] = "strict",
+        encoding: str | None = None,
+        errors: str | None = "strict",
         atomic: bool = False,
     ):
         self.name: str = os.fspath(filename)
@@ -123,7 +126,7 @@ def __init__(
         self.encoding = encoding
         self.errors = errors
         self.atomic = atomic
-        self._f: t.Optional[t.IO[t.Any]]
+        self._f: t.IO[t.Any] | None
         self.should_close: bool
 
         if self.name == "-":
@@ -175,18 +178,18 @@ def close_intelligently(self) -> None:
         if self.should_close:
             self.close()
 
-    def __enter__(self) -> "LazyFile":
+    def __enter__(self) -> LazyFile:
         return self
 
     def __exit__(
         self,
-        exc_type: t.Optional[t.Type[BaseException]],
-        exc_value: t.Optional[BaseException],
-        tb: t.Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: TracebackType | None,
     ) -> None:
         self.close_intelligently()
 
-    def __iter__(self) -> t.Iterator[t.AnyStr]:
+    def __iter__(self) -> cabc.Iterator[t.AnyStr]:
         self.open()
         return iter(self._f)  # type: ignore
 
@@ -198,30 +201,30 @@ def __init__(self, file: t.IO[t.Any]) -> None:
     def __getattr__(self, name: str) -> t.Any:
         return getattr(self._file, name)
 
-    def __enter__(self) -> "KeepOpenFile":
+    def __enter__(self) -> KeepOpenFile:
         return self
 
     def __exit__(
         self,
-        exc_type: t.Optional[t.Type[BaseException]],
-        exc_value: t.Optional[BaseException],
-        tb: t.Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        tb: TracebackType | None,
     ) -> None:
         pass
 
     def __repr__(self) -> str:
         return repr(self._file)
 
-    def __iter__(self) -> t.Iterator[t.AnyStr]:
+    def __iter__(self) -> cabc.Iterator[t.AnyStr]:
         return iter(self._file)
 
 
 def echo(
-    message: t.Optional[t.Any] = None,
-    file: t.Optional[t.IO[t.Any]] = None,
+    message: t.Any | None = None,
+    file: t.IO[t.Any] | None = None,
     nl: bool = True,
     err: bool = False,
-    color: t.Optional[bool] = None,
+    color: bool | None = None,
 ) -> None:
     """Print a message and newline to stdout or a file. This should be
     used instead of :func:`print` because it provides better support
@@ -274,7 +277,7 @@ def echo(
 
     # Convert non bytes/text into the native string type.
     if message is not None and not isinstance(message, (str, bytes, bytearray)):
-        out: t.Optional[t.Union[str, bytes]] = str(message)
+        out: str | bytes | bytearray | None = str(message)
     else:
         out = message
 
@@ -319,7 +322,7 @@ def echo(
     file.flush()
 
 
-def get_binary_stream(name: "te.Literal['stdin', 'stdout', 'stderr']") -> t.BinaryIO:
+def get_binary_stream(name: t.Literal["stdin", "stdout", "stderr"]) -> t.BinaryIO:
     """Returns a system stream for byte processing.
 
     :param name: the name of the stream to open.  Valid names are ``'stdin'``,
@@ -332,9 +335,9 @@ def get_binary_stream(name: "te.Literal['stdin', 'stdout', 'stderr']") -> t.Bina
 
 
 def get_text_stream(
-    name: "te.Literal['stdin', 'stdout', 'stderr']",
-    encoding: t.Optional[str] = None,
-    errors: t.Optional[str] = "strict",
+    name: t.Literal["stdin", "stdout", "stderr"],
+    encoding: str | None = None,
+    errors: str | None = "strict",
 ) -> t.TextIO:
     """Returns a system stream for text processing.  This usually returns
     a wrapped stream around a binary stream returned from
@@ -353,10 +356,10 @@ def get_text_stream(
 
 
 def open_file(
-    filename: t.Union[str, "os.PathLike[str]"],
+    filename: str | os.PathLike[str],
     mode: str = "r",
-    encoding: t.Optional[str] = None,
-    errors: t.Optional[str] = "strict",
+    encoding: str | None = None,
+    errors: str | None = "strict",
     lazy: bool = False,
     atomic: bool = False,
 ) -> t.IO[t.Any]:
@@ -390,19 +393,19 @@ def open_file(
     """
     if lazy:
         return t.cast(
-            t.IO[t.Any], LazyFile(filename, mode, encoding, errors, atomic=atomic)
+            "t.IO[t.Any]", LazyFile(filename, mode, encoding, errors, atomic=atomic)
         )
 
     f, should_close = open_stream(filename, mode, encoding, errors, atomic=atomic)
 
     if not should_close:
-        f = t.cast(t.IO[t.Any], KeepOpenFile(f))
+        f = t.cast("t.IO[t.Any]", KeepOpenFile(f))
 
     return f
 
 
 def format_filename(
-    filename: "t.Union[str, bytes, os.PathLike[str], os.PathLike[bytes]]",
+    filename: str | bytes | os.PathLike[str] | os.PathLike[bytes],
     shorten: bool = False,
 ) -> str:
     """Format a filename as a string for display. Ensures the filename can be
@@ -518,7 +521,7 @@ def __getattr__(self, attr: str) -> t.Any:
 
 
 def _detect_program_name(
-    path: t.Optional[str] = None, _main: t.Optional[ModuleType] = None
+    path: str | None = None, _main: ModuleType | None = None
 ) -> str:
     """Determine the command used to run the program, for use in help
     text. If a file or entry point was executed, the file name is
@@ -573,12 +576,12 @@ def _detect_program_name(
 
 
 def _expand_args(
-    args: t.Iterable[str],
+    args: cabc.Iterable[str],
     *,
     user: bool = True,
     env: bool = True,
     glob_recursive: bool = True,
-) -> t.List[str]:
+) -> list[str]:
     """Simulate Unix shell expansion with Python functions.
 
     See :func:`glob.glob`, :func:`os.path.expanduser`, and
diff --git a/libs/cloudscraper-1.2.58.dist-info/METADATA b/libs/cloudscraper-1.2.58.dist-info/METADATA
index b75a59542c..653a999dd4 100644
--- a/libs/cloudscraper-1.2.58.dist-info/METADATA
+++ b/libs/cloudscraper-1.2.58.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cloudscraper
 Version: 1.2.58
 Summary: A Python module to bypass Cloudflare's anti-bot page.
@@ -22,9 +22,19 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests >=2.9.2
-Requires-Dist: requests-toolbelt >=0.9.1
-Requires-Dist: pyparsing >=2.4.7
+Requires-Dist: requests>=2.9.2
+Requires-Dist: requests_toolbelt>=0.9.1
+Requires-Dist: pyparsing>=2.4.7
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # cloudscraper
 
diff --git a/libs/cloudscraper-1.2.58.dist-info/RECORD b/libs/cloudscraper-1.2.58.dist-info/RECORD
index 3dcf225c2e..3edd25cc42 100644
--- a/libs/cloudscraper-1.2.58.dist-info/RECORD
+++ b/libs/cloudscraper-1.2.58.dist-info/RECORD
@@ -1,9 +1,9 @@
 cloudscraper-1.2.58.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-cloudscraper-1.2.58.dist-info/LICENSE,sha256=luC9NJPEX0JAQUKWkzWlAOaaE69fNKnW1uIuDKmWERc,1091
-cloudscraper-1.2.58.dist-info/METADATA,sha256=q25vkvMHkAxmuZRwak56i4CLAFUuG5EwEzz1oEXOY3U,19537
+cloudscraper-1.2.58.dist-info/METADATA,sha256=Mc7bBhvR3izOkpQ5xahZYrRD74j0lB0QLAc_07e6pjA,19746
 cloudscraper-1.2.58.dist-info/RECORD,,
 cloudscraper-1.2.58.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudscraper-1.2.58.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+cloudscraper-1.2.58.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cloudscraper-1.2.58.dist-info/licenses/LICENSE,sha256=luC9NJPEX0JAQUKWkzWlAOaaE69fNKnW1uIuDKmWERc,1091
 cloudscraper-1.2.58.dist-info/top_level.txt,sha256=OFEsobVl62sa2NzpgNtfHZkIw_qZr_wljhjmlP9oGiM,13
 cloudscraper/__init__.py,sha256=gsOMaKAKNfJUR4FkiEefAA2fAHVFuSwkblGgqxClsrw,32790
 cloudscraper/captcha/2captcha.py,sha256=CWF62VmLqb_KvSH-dqzo1XEwCBOQh1Aee-G18cX_7aw,10371
diff --git a/libs/cloudscraper-1.2.58.dist-info/WHEEL b/libs/cloudscraper-1.2.58.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/cloudscraper-1.2.58.dist-info/WHEEL
+++ b/libs/cloudscraper-1.2.58.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/cloudscraper-1.2.58.dist-info/LICENSE b/libs/cloudscraper-1.2.58.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/cloudscraper-1.2.58.dist-info/LICENSE
rename to libs/cloudscraper-1.2.58.dist-info/licenses/LICENSE
diff --git a/libs/colorama-0.4.6.dist-info/METADATA b/libs/colorama-0.4.6.dist-info/METADATA
index da6978d099..e1b9199d7e 100644
--- a/libs/colorama-0.4.6.dist-info/METADATA
+++ b/libs/colorama-0.4.6.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: colorama
 Version: 0.4.6
 Summary: Cross-platform colored terminal text.
diff --git a/libs/colorama-0.4.6.dist-info/RECORD b/libs/colorama-0.4.6.dist-info/RECORD
index 609081b0d3..22ded53ed1 100644
--- a/libs/colorama-0.4.6.dist-info/RECORD
+++ b/libs/colorama-0.4.6.dist-info/RECORD
@@ -1,8 +1,8 @@
 colorama-0.4.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-colorama-0.4.6.dist-info/METADATA,sha256=xqjWR7jNwuay0CWKzleP1SyyTj78i_e2mdgXlnqrJcA,17191
+colorama-0.4.6.dist-info/METADATA,sha256=0SKMz_cof8aSxIgG1wDEbbevITRY-XkoM8CMfx_0WRU,17191
 colorama-0.4.6.dist-info/RECORD,,
 colorama-0.4.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-colorama-0.4.6.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
+colorama-0.4.6.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
 colorama-0.4.6.dist-info/licenses/LICENSE.txt,sha256=ysNcAmhuXQSlpxQL-zs25zrtSWZW6JEQLkKIhteTAxg,1491
 colorama/__init__.py,sha256=wePQA4U20tKgYARySLEC047ucNX-g8pRLpYBuiHlLb8,266
 colorama/ansi.py,sha256=Top4EeEuaQdBWdteKMEcGOTeKeF19Q-Wo_6_Cj5kOzQ,2522
diff --git a/libs/colorama-0.4.6.dist-info/WHEEL b/libs/colorama-0.4.6.dist-info/WHEEL
index 24a7087ee9..2ec21a5c31 100644
--- a/libs/colorama-0.4.6.dist-info/WHEEL
+++ b/libs/colorama-0.4.6.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/commonmark-0.9.1.dist-info/METADATA b/libs/commonmark-0.9.1.dist-info/METADATA
index 772d2fe5e8..c077daf32a 100644
--- a/libs/commonmark-0.9.1.dist-info/METADATA
+++ b/libs/commonmark-0.9.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: commonmark
 Version: 0.9.1
 Summary: Python parser for the CommonMark Markdown spec
@@ -26,10 +26,24 @@ Classifier: Topic :: Text Processing :: Markup
 Classifier: Topic :: Utilities
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: future >=0.14.0 ; python_version < "3"
+Requires-Dist: future>=0.14.0; python_version < "3"
 Provides-Extra: test
-Requires-Dist: flake8 ==3.7.8 ; extra == 'test'
-Requires-Dist: hypothesis ==3.55.3 ; extra == 'test'
+Requires-Dist: flake8==3.7.8; extra == "test"
+Requires-Dist: hypothesis==3.55.3; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 commonmark.py
 =============
diff --git a/libs/commonmark-0.9.1.dist-info/RECORD b/libs/commonmark-0.9.1.dist-info/RECORD
index 54266d46f9..51c548f78e 100644
--- a/libs/commonmark-0.9.1.dist-info/RECORD
+++ b/libs/commonmark-0.9.1.dist-info/RECORD
@@ -1,11 +1,11 @@
-../../bin/cmark,sha256=9VDG1ndLNwNOV_TrxTbXT8hoJDgy_8LPVNnXKiBsaPI,238
+../../bin/cmark,sha256=g6uoxffQUa9UYL2yLCpSGbNBnjlhDSQcQAD2n3KX_1Q,191
 commonmark-0.9.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-commonmark-0.9.1.dist-info/LICENSE,sha256=2gzYPRg8HXgZy_BFQcKl0fX2g47YKBCpFDqJ3cvCt94,1645
-commonmark-0.9.1.dist-info/METADATA,sha256=P4I2lYU0_28ghpI6Vk-kSLK1jDnma-dDl28W-BP_nHI,5725
+commonmark-0.9.1.dist-info/METADATA,sha256=GPMY5sZ6IQiKHDgWfQA4wqQA2uI31Szl12fZDUTn2rQ,6018
 commonmark-0.9.1.dist-info/RECORD,,
 commonmark-0.9.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-commonmark-0.9.1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+commonmark-0.9.1.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
 commonmark-0.9.1.dist-info/entry_points.txt,sha256=TKUdr3xoGWriPzVk97_5NN8G-BPB_9_lr-EaMXOw8ng,48
+commonmark-0.9.1.dist-info/licenses/LICENSE,sha256=2gzYPRg8HXgZy_BFQcKl0fX2g47YKBCpFDqJ3cvCt94,1645
 commonmark-0.9.1.dist-info/top_level.txt,sha256=HeslGuf22YTnjJce2B9Q2yrMRAr_Gia2EDi47Dye_Ig,11
 commonmark/__init__.py,sha256=RqqRUq_nHkT5wIsiQEdILfl6hFSiokLSWpfSAvgFEa0,302
 commonmark/blocks.py,sha256=GGPw34diVDEnEeO99OEu2ORmgKC1x8yvYin3uDdYQQg,30411
diff --git a/libs/commonmark-0.9.1.dist-info/WHEEL b/libs/commonmark-0.9.1.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/commonmark-0.9.1.dist-info/WHEEL
+++ b/libs/commonmark-0.9.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/commonmark-0.9.1.dist-info/LICENSE b/libs/commonmark-0.9.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/commonmark-0.9.1.dist-info/LICENSE
rename to libs/commonmark-0.9.1.dist-info/licenses/LICENSE
diff --git a/libs/dateutil/_version.py b/libs/dateutil/_version.py
index a229152e83..7fb3470167 100644
--- a/libs/dateutil/_version.py
+++ b/libs/dateutil/_version.py
@@ -1,16 +1,34 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
 __version__ = version = '2.9.0'
 __version_tuple__ = version_tuple = (2, 9, 0)
+
+__commit_id__ = commit_id = None
diff --git a/libs/decorator-5.1.1.dist-info/LICENSE.txt b/libs/decorator-5.1.1.dist-info/LICENSE.txt
deleted file mode 100644
index b0ade0487e..0000000000
--- a/libs/decorator-5.1.1.dist-info/LICENSE.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2005-2018, Michele Simionato
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-  Redistributions in bytecode form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in
-  the documentation and/or other materials provided with the
-  distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/libs/decorator-5.1.1.dist-info/METADATA b/libs/decorator-5.1.1.dist-info/METADATA
deleted file mode 100644
index b3dd0edda9..0000000000
--- a/libs/decorator-5.1.1.dist-info/METADATA
+++ /dev/null
@@ -1,126 +0,0 @@
-Metadata-Version: 2.1
-Name: decorator
-Version: 5.1.1
-Summary: Decorators for Humans
-Home-page: https://github.com/micheles/decorator
-Author: Michele Simionato
-Author-email: michele.simionato@gmail.com
-License: new BSD License
-Keywords: decorators generic utility
-Platform: All
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Utilities
-Requires-Python: >=3.5
-License-File: LICENSE.txt
-
-Decorators for Humans
-=====================
-
-The goal of the decorator module is to make it easy to define
-signature-preserving function decorators and decorator factories.
-It also includes an implementation of multiple dispatch and other niceties
-(please check the docs). It is released under a two-clauses
-BSD license, i.e. basically you can do whatever you want with it but I am not
-responsible.
-
-Installation
--------------
-
-If you are lazy, just perform
-
- ``$ pip install decorator``
-
-which will install just the module on your system.
-
-If you prefer to install the full distribution from source, including
-the documentation, clone the `GitHub repo`_ or download the tarball_, unpack it and run
-
- ``$ pip install .``
-
-in the main directory, possibly as superuser.
-
-.. _tarball: https://pypi.org/project/decorator/#files
-.. _GitHub repo: https://github.com/micheles/decorator
-
-Testing
---------
-
-If you have the source code installation you can run the tests with
-
- `$ python src/tests/test.py -v`
-
-or (if you have setuptools installed)
-
- `$ python setup.py test`
-
-Notice that you may run into trouble if in your system there
-is an older version of the decorator module; in such a case remove the
-old version. It is safe even to copy the module `decorator.py` over
-an existing one, since we kept backward-compatibility for a long time.
-
-Repository
----------------
-
-The project is hosted on GitHub. You can look at the source here:
-
- https://github.com/micheles/decorator
-
-Documentation
----------------
-
-The documentation has been moved to https://github.com/micheles/decorator/blob/master/docs/documentation.md
-
-From there you can get a PDF version by simply using the print
-functionality of your browser.
-
-Here is the documentation for previous versions of the module:
-
-https://github.com/micheles/decorator/blob/4.3.2/docs/tests.documentation.rst
-https://github.com/micheles/decorator/blob/4.2.1/docs/tests.documentation.rst
-https://github.com/micheles/decorator/blob/4.1.2/docs/tests.documentation.rst
-https://github.com/micheles/decorator/blob/4.0.0/documentation.rst
-https://github.com/micheles/decorator/blob/3.4.2/documentation.rst
-
-For the impatient
------------------
-
-Here is an example of how to define a family of decorators tracing slow
-operations:
-
-.. code-block:: python
-
-   from decorator import decorator
-
-   @decorator
-   def warn_slow(func, timelimit=60, *args, **kw):
-       t0 = time.time()
-       result = func(*args, **kw)
-       dt = time.time() - t0
-       if dt > timelimit:
-           logging.warn('%s took %d seconds', func.__name__, dt)
-       else:
-           logging.info('%s took %d seconds', func.__name__, dt)
-       return result
-
-   @warn_slow  # warn if it takes more than 1 minute
-   def preprocess_input_files(inputdir, tempdir):
-       ...
-
-   @warn_slow(timelimit=600)  # warn if it takes more than 10 minutes
-   def run_calculation(tempdir, outdir):
-       ...
-
-Enjoy!
diff --git a/libs/decorator-5.1.1.dist-info/RECORD b/libs/decorator-5.1.1.dist-info/RECORD
deleted file mode 100644
index 40bc9c991b..0000000000
--- a/libs/decorator-5.1.1.dist-info/RECORD
+++ /dev/null
@@ -1,9 +0,0 @@
-decorator-5.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-decorator-5.1.1.dist-info/LICENSE.txt,sha256=_RFmDKvwUyCCxFcGhi-vwpSQfsf44heBgkCkmZgGeC4,1309
-decorator-5.1.1.dist-info/METADATA,sha256=7idZsAHQp5EYhNG-NYCm6I2phcFFRht0raaxicOska4,3979
-decorator-5.1.1.dist-info/RECORD,,
-decorator-5.1.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-decorator-5.1.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-decorator-5.1.1.dist-info/pbr.json,sha256=AL84oUUWQHwkd8OCPhLRo2NJjU5MDdmXMqRHv-posqs,47
-decorator-5.1.1.dist-info/top_level.txt,sha256=Kn6eQjo83ctWxXVyBMOYt0_YpjRjBznKYVuNyuC_DSI,10
-decorator.py,sha256=el5cAEgoTEpRQN65tOxGhElue-CccMv0xol-J2MwOc0,16752
diff --git a/libs/decorator-5.1.1.dist-info/WHEEL b/libs/decorator-5.1.1.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/decorator-5.1.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/decorator-5.1.1.dist-info/pbr.json b/libs/decorator-5.1.1.dist-info/pbr.json
deleted file mode 100644
index cd04599789..0000000000
--- a/libs/decorator-5.1.1.dist-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"is_release": false, "git_version": "8608a46"}
\ No newline at end of file
diff --git a/libs/apprise-1.9.2.dist-info/INSTALLER b/libs/decorator-5.2.1.dist-info/INSTALLER
similarity index 100%
rename from libs/apprise-1.9.2.dist-info/INSTALLER
rename to libs/decorator-5.2.1.dist-info/INSTALLER
diff --git a/libs/decorator-5.2.1.dist-info/METADATA b/libs/decorator-5.2.1.dist-info/METADATA
new file mode 100644
index 0000000000..8a94dcbdb7
--- /dev/null
+++ b/libs/decorator-5.2.1.dist-info/METADATA
@@ -0,0 +1,125 @@
+Metadata-Version: 2.4
+Name: decorator
+Version: 5.2.1
+Summary: Decorators for Humans
+Author-email: Michele Simionato <michele.simionato@gmail.com>
+License: BSD-2-Clause
+Keywords: decorators
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Utilities
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Dynamic: license-file
+
+Decorators for Humans
+=====================
+
+The goal of the decorator module is to make it easy to define
+signature-preserving function decorators and decorator factories.
+It also includes an implementation of multiple dispatch and other niceties
+(please check the docs). It is released under a two-clauses
+BSD license, i.e. basically you can do whatever you want with it but I am not
+responsible.
+
+Installation
+-------------
+
+If you are lazy, just perform
+
+ ``$ pip install decorator``
+
+which will install just the module on your system.
+
+If you prefer to install the full distribution from source, including
+the documentation, clone the `GitHub repo`_ or download the tarball_, unpack it and run
+
+ ``$ pip install .``
+
+in the main directory, possibly as superuser.
+
+.. _tarball: https://pypi.org/project/decorator/#files
+.. _GitHub repo: https://github.com/micheles/decorator
+
+Testing
+--------
+
+If you have the source code installation you can run the tests with
+
+ `$ python src/tests/test.py -v`
+
+or (if you have setuptools installed)
+
+ `$ python setup.py test`
+
+Notice that you may run into trouble if in your system there
+is an older version of the decorator module; in such a case remove the
+old version. It is safe even to copy the module `decorator.py` over
+an existing one, since we kept backward-compatibility for a long time.
+
+Repository
+---------------
+
+The project is hosted on GitHub. You can look at the source here:
+
+ https://github.com/micheles/decorator
+
+Documentation
+---------------
+
+The documentation has been moved to https://github.com/micheles/decorator/blob/master/docs/documentation.md
+
+From there you can get a PDF version by simply using the print
+functionality of your browser.
+
+Here is the documentation for previous versions of the module:
+
+https://github.com/micheles/decorator/blob/4.3.2/docs/tests.documentation.rst
+https://github.com/micheles/decorator/blob/4.2.1/docs/tests.documentation.rst
+https://github.com/micheles/decorator/blob/4.1.2/docs/tests.documentation.rst
+https://github.com/micheles/decorator/blob/4.0.0/documentation.rst
+https://github.com/micheles/decorator/blob/3.4.2/documentation.rst
+
+For the impatient
+-----------------
+
+Here is an example of how to define a family of decorators tracing slow
+operations:
+
+.. code-block:: python
+
+   from decorator import decorator
+
+   @decorator
+   def warn_slow(func, timelimit=60, *args, **kw):
+       t0 = time.time()
+       result = func(*args, **kw)
+       dt = time.time() - t0
+       if dt > timelimit:
+           logging.warning('%s took %d seconds', func.__name__, dt)
+       else:
+           logging.info('%s took %d seconds', func.__name__, dt)
+       return result
+
+   @warn_slow  # warn if it takes more than 1 minute
+   def preprocess_input_files(inputdir, tempdir):
+       ...
+
+   @warn_slow(timelimit=600)  # warn if it takes more than 10 minutes
+   def run_calculation(tempdir, outdir):
+       ...
+
+Enjoy!
diff --git a/libs/decorator-5.2.1.dist-info/RECORD b/libs/decorator-5.2.1.dist-info/RECORD
new file mode 100644
index 0000000000..2bad5b16ae
--- /dev/null
+++ b/libs/decorator-5.2.1.dist-info/RECORD
@@ -0,0 +1,8 @@
+decorator-5.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+decorator-5.2.1.dist-info/METADATA,sha256=U46D37X6OWGXA6Tt-WtK5yasg95VceqHFqVWn-OSENY,3956
+decorator-5.2.1.dist-info/RECORD,,
+decorator-5.2.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+decorator-5.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+decorator-5.2.1.dist-info/licenses/LICENSE.txt,sha256=kU7m7Xil78FzvaaY8nCERMqdFA_MQIDGDQUD1A2znaY,1308
+decorator-5.2.1.dist-info/top_level.txt,sha256=Kn6eQjo83ctWxXVyBMOYt0_YpjRjBznKYVuNyuC_DSI,10
+decorator.py,sha256=cWnO6cKKohQrXNEG1-Fauiw8djwE3f2PA2gJGofwgXA,17067
diff --git a/libs/apprise-1.9.2.dist-info/REQUESTED b/libs/decorator-5.2.1.dist-info/REQUESTED
similarity index 100%
rename from libs/apprise-1.9.2.dist-info/REQUESTED
rename to libs/decorator-5.2.1.dist-info/REQUESTED
diff --git a/libs/decorator-5.2.1.dist-info/WHEEL b/libs/decorator-5.2.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/decorator-5.2.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/decorator-5.2.1.dist-info/licenses/LICENSE.txt b/libs/decorator-5.2.1.dist-info/licenses/LICENSE.txt
new file mode 100644
index 0000000000..3e01d05b18
--- /dev/null
+++ b/libs/decorator-5.2.1.dist-info/licenses/LICENSE.txt
@@ -0,0 +1,27 @@
+Copyright (c) 2005-2025, Michele Simionato
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/libs/decorator-5.1.1.dist-info/top_level.txt b/libs/decorator-5.2.1.dist-info/top_level.txt
similarity index 100%
rename from libs/decorator-5.1.1.dist-info/top_level.txt
rename to libs/decorator-5.2.1.dist-info/top_level.txt
diff --git a/libs/decorator.py b/libs/decorator.py
index 2479b6f7ba..40a39f2f1b 100644
--- a/libs/decorator.py
+++ b/libs/decorator.py
@@ -1,6 +1,6 @@
 # #########################     LICENSE     ############################ #
 
-# Copyright (c) 2005-2021, Michele Simionato
+# Copyright (c) 2005-2025, Michele Simionato
 # All rights reserved.
 
 # Redistribution and use in source and binary forms, with or without
@@ -37,10 +37,11 @@
 import inspect
 import operator
 import itertools
+import functools
 from contextlib import _GeneratorContextManager
 from inspect import getfullargspec, iscoroutinefunction, isgeneratorfunction
 
-__version__ = '5.1.1'
+__version__ = '5.2.1'
 
 DEF = re.compile(r'\s*def\s*([_\w][_\w\d]*)\s*\(')
 POS = inspect.Parameter.POSITIONAL_OR_KEYWORD
@@ -71,7 +72,7 @@ def __init__(self, func=None, name=None, signature=None,
                 self.name = '_lambda_'
             self.doc = func.__doc__
             self.module = func.__module__
-            if inspect.isroutine(func):
+            if inspect.isroutine(func) or isinstance(func, functools.partial):
                 argspec = getfullargspec(func)
                 self.annotations = getattr(func, '__annotations__', {})
                 for a in ('args', 'varargs', 'varkw', 'defaults', 'kwonlyargs',
@@ -214,6 +215,8 @@ def decorate(func, caller, extras=(), kwsyntax=False):
     does. By default kwsyntax is False and the the arguments are untouched.
     """
     sig = inspect.signature(func)
+    if isinstance(func, functools.partial):
+        func = functools.update_wrapper(func, func.func)
     if iscoroutinefunction(caller):
         async def fun(*args, **kw):
             if not kwsyntax:
@@ -230,6 +233,7 @@ def fun(*args, **kw):
             if not kwsyntax:
                 args, kw = fix(args, kw, sig)
             return caller(func, *(extras + args), **kw)
+
     fun.__name__ = func.__name__
     fun.__doc__ = func.__doc__
     fun.__wrapped__ = func
@@ -252,6 +256,10 @@ def fun(*args, **kw):
         fun.__module__ = func.__module__
     except AttributeError:
         pass
+    try:
+        fun.__name__ = func.__name__
+    except AttributeError:  # happens with old versions of numpy.vectorize
+        func.__name__ == 'noname'
     try:
         fun.__dict__.update(func.__dict__)
     except AttributeError:
@@ -419,8 +427,8 @@ def dispatch_info(*types):
             """
             check(types)
             lst = []
-            for anc in itertools.product(*ancestors(*types)):
-                lst.append(tuple(a.__name__ for a in anc))
+            for ancs in itertools.product(*ancestors(*types)):
+                lst.append(tuple(a.__name__ for a in ancs))
             return lst
 
         def _dispatch(dispatch_args, *args, **kw):
diff --git a/libs/deep_translator-1.11.4.dist-info/METADATA b/libs/deep_translator-1.11.4.dist-info/METADATA
index 68c3e45c1e..eb58a5c8dd 100644
--- a/libs/deep_translator-1.11.4.dist-info/METADATA
+++ b/libs/deep_translator-1.11.4.dist-info/METADATA
@@ -1,9 +1,9 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: deep-translator
 Version: 1.11.4
 Summary: A flexible free and unlimited python tool to translate between different languages in a simple way using multiple translators
-Home-page: https://github.com/nidhaloff/deep_translator
 License: MIT
+License-File: LICENSE
 Keywords: deep_translator,deepL,DeeplTranslator,translator,translation,automation,web scraping,google translator,google translation,google trans,PONS,YANDEX,MyMemory translator,Linguee,QcriTranslator,Language,Language detection,detect language,free translation,unlimited translation,translate for free
 Author: Nidhal Baccouri
 Author-email: nidhalbacc@gmail.com
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Communications
 Classifier: Topic :: Education
 Classifier: Topic :: Software Development
@@ -38,6 +39,7 @@ Requires-Dist: openai (>=0.27.6,<0.28.0) ; (python_full_version >= "3.7.1" and p
 Requires-Dist: pypdf (>=3.3.0,<4.0.0) ; extra == "pdf"
 Requires-Dist: requests (>=2.23.0,<3.0.0)
 Project-URL: Documentation, https://deep-translator.readthedocs.io/en/latest/
+Project-URL: Homepage, https://github.com/nidhaloff/deep_translator
 Project-URL: Repository, https://github.com/nidhaloff/deep_translator
 Description-Content-Type: text/x-rst
 
diff --git a/libs/deep_translator-1.11.4.dist-info/RECORD b/libs/deep_translator-1.11.4.dist-info/RECORD
index e75e457063..d3a08b69ef 100644
--- a/libs/deep_translator-1.11.4.dist-info/RECORD
+++ b/libs/deep_translator-1.11.4.dist-info/RECORD
@@ -1,12 +1,12 @@
-../../bin/deep-translator,sha256=U3_p8MJCCWdWmVZnfGHdUuFlTz1aG4rLmb48o7_T49Y,246
-../../bin/dt,sha256=U3_p8MJCCWdWmVZnfGHdUuFlTz1aG4rLmb48o7_T49Y,246
+../../bin/deep-translator,sha256=kHNA4dcbWvoQKqL2YFSf_N8NtdVpFdTd57t9Tu4hpiE,199
+../../bin/dt,sha256=kHNA4dcbWvoQKqL2YFSf_N8NtdVpFdTd57t9Tu4hpiE,199
 deep_translator-1.11.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-deep_translator-1.11.4.dist-info/LICENSE,sha256=UGnCG4PtsPuWXv32Jc-C22mZqVMVb1MAkEVWFIUgTOA,11350
-deep_translator-1.11.4.dist-info/METADATA,sha256=ef-qfaz9mwg_50OH2ZvZGl5ONHip_EgiVMNFh1Uyfx8,30522
+deep_translator-1.11.4.dist-info/METADATA,sha256=w7Uq0t-ButudwpUeAtt_7XKKkMc3XehKFixcgUb-QT4,30607
 deep_translator-1.11.4.dist-info/RECORD,,
 deep_translator-1.11.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-deep_translator-1.11.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+deep_translator-1.11.4.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
 deep_translator-1.11.4.dist-info/entry_points.txt,sha256=qQAStn9mriwaW7GNz-W_55eFUrym6XwBHSyf3oXv_lQ,98
+deep_translator-1.11.4.dist-info/licenses/LICENSE,sha256=UGnCG4PtsPuWXv32Jc-C22mZqVMVb1MAkEVWFIUgTOA,11350
 deep_translator/__init__.py,sha256=3zy0Ux3TVne-Al8QdCr_mtDtGHQiQCwpvxk6qsnPmi0,1238
 deep_translator/__main__.py,sha256=MkNnzbdqvk5qx_rgErLMjhe1Gp3Rsvl8At66JnQ8CZk,161
 deep_translator/baidu.py,sha256=Y6VydrH4kktGicVzOGlSdStzE6L0a10rz0-jBc2pIek,3687
diff --git a/libs/deep_translator-1.11.4.dist-info/WHEEL b/libs/deep_translator-1.11.4.dist-info/WHEEL
index 8b9b3a1bf3..7894e88612 100644
--- a/libs/deep_translator-1.11.4.dist-info/WHEEL
+++ b/libs/deep_translator-1.11.4.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/deep_translator-1.11.4.dist-info/LICENSE b/libs/deep_translator-1.11.4.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/deep_translator-1.11.4.dist-info/LICENSE
rename to libs/deep_translator-1.11.4.dist-info/licenses/LICENSE
diff --git a/libs/dns/__init__.py b/libs/dns/__init__.py
index a4249b9e72..d30fd742a2 100644
--- a/libs/dns/__init__.py
+++ b/libs/dns/__init__.py
@@ -21,6 +21,8 @@
     "asyncbackend",
     "asyncquery",
     "asyncresolver",
+    "btree",
+    "btreezone",
     "dnssec",
     "dnssecalgs",
     "dnssectypes",
diff --git a/libs/dns/_asyncbackend.py b/libs/dns/_asyncbackend.py
index 49f14fed68..23455db374 100644
--- a/libs/dns/_asyncbackend.py
+++ b/libs/dns/_asyncbackend.py
@@ -26,6 +26,10 @@ async def __aexit__(self, exc_type, exc_value, traceback):
 
 
 class Socket:  # pragma: no cover
+    def __init__(self, family: int, type: int):
+        self.family = family
+        self.type = type
+
     async def close(self):
         pass
 
@@ -46,9 +50,6 @@ async def __aexit__(self, exc_type, exc_value, traceback):
 
 
 class DatagramSocket(Socket):  # pragma: no cover
-    def __init__(self, family: int):
-        self.family = family
-
     async def sendto(self, what, destination, timeout):
         raise NotImplementedError
 
@@ -70,7 +71,7 @@ async def connect_tcp(self, host, port, timeout, local_address):
 
 
 class Backend:  # pragma: no cover
-    def name(self):
+    def name(self) -> str:
         return "unknown"
 
     async def make_socket(
diff --git a/libs/dns/_asyncio_backend.py b/libs/dns/_asyncio_backend.py
index 9d9ed3690c..303908cebf 100644
--- a/libs/dns/_asyncio_backend.py
+++ b/libs/dns/_asyncio_backend.py
@@ -42,14 +42,15 @@ def connection_lost(self, exc):
             if exc is None:
                 # EOF we triggered.  Is there a better way to do this?
                 try:
-                    raise EOFError
+                    raise EOFError("EOF")
                 except EOFError as e:
                     self.recvfrom.set_exception(e)
             else:
                 self.recvfrom.set_exception(exc)
 
     def close(self):
-        self.transport.close()
+        if self.transport is not None:
+            self.transport.close()
 
 
 async def _maybe_wait_for(awaitable, timeout):
@@ -64,7 +65,7 @@ async def _maybe_wait_for(awaitable, timeout):
 
 class DatagramSocket(dns._asyncbackend.DatagramSocket):
     def __init__(self, family, transport, protocol):
-        super().__init__(family)
+        super().__init__(family, socket.SOCK_DGRAM)
         self.transport = transport
         self.protocol = protocol
 
@@ -99,7 +100,7 @@ async def getpeercert(self, timeout):
 
 class StreamSocket(dns._asyncbackend.StreamSocket):
     def __init__(self, af, reader, writer):
-        self.family = af
+        super().__init__(af, socket.SOCK_STREAM)
         self.reader = reader
         self.writer = writer
 
@@ -130,7 +131,7 @@ async def getpeercert(self, timeout):
     import httpx
 
     _CoreAsyncNetworkBackend = httpcore.AsyncNetworkBackend
-    _CoreAnyIOStream = httpcore._backends.anyio.AnyIOStream
+    _CoreAnyIOStream = httpcore._backends.anyio.AnyIOStream  # pyright: ignore
 
     from dns.query import _compute_times, _expiration_for_this_attempt, _remaining
 
@@ -147,7 +148,7 @@ def __init__(self, resolver, local_port, bootstrap_address, family):
                 )
 
         async def connect_tcp(
-            self, host, port, timeout, local_address, socket_options=None
+            self, host, port, timeout=None, local_address=None, socket_options=None
         ):  # pylint: disable=signature-differs
             addresses = []
             _, expiration = _compute_times(timeout)
@@ -180,7 +181,7 @@ async def connect_tcp(
             raise httpcore.ConnectError
 
         async def connect_unix_socket(
-            self, path, timeout, socket_options=None
+            self, path, timeout=None, socket_options=None
         ):  # pylint: disable=signature-differs
             raise NotImplementedError
 
@@ -197,7 +198,7 @@ def __init__(
             family=socket.AF_UNSPEC,
             **kwargs,
         ):
-            if resolver is None:
+            if resolver is None and bootstrap_address is None:
                 # pylint: disable=import-outside-toplevel,redefined-outer-name
                 import dns.asyncresolver
 
@@ -233,7 +234,7 @@ async def make_socket(
                 # proper fix for [#637].
                 source = (dns.inet.any_for_af(af), 0)
             transport, protocol = await loop.create_datagram_endpoint(
-                _DatagramProtocol,
+                _DatagramProtocol,  # pyright: ignore
                 source,
                 family=af,
                 proto=proto,
diff --git a/libs/dns/_features.py b/libs/dns/_features.py
index 03ccaa7704..65a9a2a35a 100644
--- a/libs/dns/_features.py
+++ b/libs/dns/_features.py
@@ -32,6 +32,9 @@ def _version_check(
     package, minimum = requirement.split(">=")
     try:
         version = importlib.metadata.version(package)
+        # This shouldn't happen, but it apparently can.
+        if version is None:
+            return False
     except Exception:
         return False
     t_version = _tuple_from_text(version)
@@ -82,11 +85,11 @@ def force(feature: str, enabled: bool) -> None:
 
 _requirements: Dict[str, List[str]] = {
     ### BEGIN generated requirements
-    "dnssec": ["cryptography>=41"],
-    "doh": ["httpcore>=1.0.0", "httpx>=0.26.0", "h2>=4.1.0"],
-    "doq": ["aioquic>=0.9.25"],
-    "idna": ["idna>=3.6"],
-    "trio": ["trio>=0.23"],
+    "dnssec": ["cryptography>=45"],
+    "doh": ["httpcore>=1.0.0", "httpx>=0.28.0", "h2>=4.2.0"],
+    "doq": ["aioquic>=1.2.0"],
+    "idna": ["idna>=3.10"],
+    "trio": ["trio>=0.30"],
     "wmi": ["wmi>=1.5.1"],
     ### END generated requirements
 }
diff --git a/libs/dns/_immutable_ctx.py b/libs/dns/_immutable_ctx.py
index ae7a33bf3a..b3d72deef2 100644
--- a/libs/dns/_immutable_ctx.py
+++ b/libs/dns/_immutable_ctx.py
@@ -41,7 +41,7 @@ def nf(*args, **kwargs):
         finally:
             _in__init__.reset(previous)
 
-    nf.__signature__ = inspect.signature(f)
+    nf.__signature__ = inspect.signature(f)  # pyright: ignore
     return nf
 
 
diff --git a/libs/dns/_no_ssl.py b/libs/dns/_no_ssl.py
new file mode 100644
index 0000000000..edb452de10
--- /dev/null
+++ b/libs/dns/_no_ssl.py
@@ -0,0 +1,61 @@
+import enum
+from typing import Any
+
+CERT_NONE = 0
+
+
+class TLSVersion(enum.IntEnum):
+    TLSv1_2 = 12
+
+
+class WantReadException(Exception):
+    pass
+
+
+class WantWriteException(Exception):
+    pass
+
+
+class SSLWantReadError(Exception):
+    pass
+
+
+class SSLWantWriteError(Exception):
+    pass
+
+
+class SSLContext:
+    def __init__(self) -> None:
+        self.minimum_version: Any = TLSVersion.TLSv1_2
+        self.check_hostname: bool = False
+        self.verify_mode: int = CERT_NONE
+
+    def wrap_socket(self, *args, **kwargs) -> "SSLSocket":  # type: ignore
+        raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
+
+    def set_alpn_protocols(self, *args, **kwargs):  # type: ignore
+        raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
+
+
+class SSLSocket:
+    def pending(self) -> bool:
+        raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
+
+    def do_handshake(self) -> None:
+        raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
+
+    def settimeout(self, value: Any) -> None:
+        pass
+
+    def getpeercert(self) -> Any:
+        raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return False
+
+
+def create_default_context(*args, **kwargs) -> SSLContext:  # type: ignore
+    raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
diff --git a/libs/dns/_tls_util.py b/libs/dns/_tls_util.py
new file mode 100644
index 0000000000..10ddf72792
--- /dev/null
+++ b/libs/dns/_tls_util.py
@@ -0,0 +1,19 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+import os
+from typing import Tuple
+
+
+def convert_verify_to_cafile_and_capath(
+    verify: bool | str,
+) -> Tuple[str | None, str | None]:
+    cafile: str | None = None
+    capath: str | None = None
+    if isinstance(verify, str):
+        if os.path.isfile(verify):
+            cafile = verify
+        elif os.path.isdir(verify):
+            capath = verify
+        else:
+            raise ValueError("invalid verify string")
+    return cafile, capath
diff --git a/libs/dns/_trio_backend.py b/libs/dns/_trio_backend.py
index 398e327692..bde7e8bab2 100644
--- a/libs/dns/_trio_backend.py
+++ b/libs/dns/_trio_backend.py
@@ -30,13 +30,16 @@ def _maybe_timeout(timeout):
 
 
 class DatagramSocket(dns._asyncbackend.DatagramSocket):
-    def __init__(self, socket):
-        super().__init__(socket.family)
-        self.socket = socket
+    def __init__(self, sock):
+        super().__init__(sock.family, socket.SOCK_DGRAM)
+        self.socket = sock
 
     async def sendto(self, what, destination, timeout):
         with _maybe_timeout(timeout):
-            return await self.socket.sendto(what, destination)
+            if destination is None:
+                return await self.socket.send(what)
+            else:
+                return await self.socket.sendto(what, destination)
         raise dns.exception.Timeout(
             timeout=timeout
         )  # pragma: no cover  lgtm[py/unreachable-statement]
@@ -61,7 +64,7 @@ async def getpeercert(self, timeout):
 
 class StreamSocket(dns._asyncbackend.StreamSocket):
     def __init__(self, family, stream, tls=False):
-        self.family = family
+        super().__init__(family, socket.SOCK_STREAM)
         self.stream = stream
         self.tls = tls
 
@@ -118,7 +121,7 @@ def __init__(self, resolver, local_port, bootstrap_address, family):
             self._family = family
 
         async def connect_tcp(
-            self, host, port, timeout, local_address, socket_options=None
+            self, host, port, timeout=None, local_address=None, socket_options=None
         ):  # pylint: disable=signature-differs
             addresses = []
             _, expiration = _compute_times(timeout)
@@ -148,13 +151,14 @@ async def connect_tcp(
                     sock = await Backend().make_socket(
                         af, socket.SOCK_STREAM, 0, source, destination, timeout
                     )
+                    assert isinstance(sock, StreamSocket)
                     return _CoreTrioStream(sock.stream)
                 except Exception:
                     continue
             raise httpcore.ConnectError
 
         async def connect_unix_socket(
-            self, path, timeout, socket_options=None
+            self, path, timeout=None, socket_options=None
         ):  # pylint: disable=signature-differs
             raise NotImplementedError
 
@@ -171,7 +175,7 @@ def __init__(
             family=socket.AF_UNSPEC,
             **kwargs,
         ):
-            if resolver is None:
+            if resolver is None and bootstrap_address is None:
                 # pylint: disable=import-outside-toplevel,redefined-outer-name
                 import dns.asyncresolver
 
@@ -205,9 +209,10 @@ async def make_socket(
         try:
             if source:
                 await s.bind(_lltuple(source, af))
-            if socktype == socket.SOCK_STREAM:
+            if socktype == socket.SOCK_STREAM or destination is not None:
                 connected = False
                 with _maybe_timeout(timeout):
+                    assert destination is not None
                     await s.connect(_lltuple(destination, af))
                     connected = True
                 if not connected:
diff --git a/libs/dns/asyncquery.py b/libs/dns/asyncquery.py
index 4d9ab9ae49..bb7704582a 100644
--- a/libs/dns/asyncquery.py
+++ b/libs/dns/asyncquery.py
@@ -19,10 +19,12 @@
 
 import base64
 import contextlib
+import random
 import socket
 import struct
 import time
-from typing import Any, Dict, Optional, Tuple, Union
+import urllib.parse
+from typing import Any, Dict, Optional, Tuple, cast
 
 import dns.asyncbackend
 import dns.exception
@@ -30,24 +32,30 @@
 import dns.message
 import dns.name
 import dns.quic
-import dns.rcode
-import dns.rdataclass
 import dns.rdatatype
 import dns.transaction
+import dns.tsig
+import dns.xfr
 from dns._asyncbackend import NullContext
 from dns.query import (
     BadResponse,
+    HTTPVersion,
     NoDOH,
     NoDOQ,
     UDPMode,
+    _check_status,
     _compute_times,
-    _make_dot_ssl_context,
     _matches_destination,
     _remaining,
     have_doh,
-    ssl,
+    make_ssl_context,
 )
 
+try:
+    import ssl
+except ImportError:
+    import dns._no_ssl as ssl  # type: ignore
+
 if have_doh:
     import httpx
 
@@ -82,9 +90,9 @@ def _timeout(expiration, now=None):
 
 async def send_udp(
     sock: dns.asyncbackend.DatagramSocket,
-    what: Union[dns.message.Message, bytes],
+    what: dns.message.Message | bytes,
     destination: Any,
-    expiration: Optional[float] = None,
+    expiration: float | None = None,
 ) -> Tuple[int, float]:
     """Send a DNS message to the specified UDP socket.
 
@@ -112,16 +120,16 @@ async def send_udp(
 
 async def receive_udp(
     sock: dns.asyncbackend.DatagramSocket,
-    destination: Optional[Any] = None,
-    expiration: Optional[float] = None,
+    destination: Any | None = None,
+    expiration: float | None = None,
     ignore_unexpected: bool = False,
     one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
+    keyring: Dict[dns.name.Name, dns.tsig.Key] | None = None,
+    request_mac: bytes | None = b"",
     ignore_trailing: bool = False,
     raise_on_truncation: bool = False,
     ignore_errors: bool = False,
-    query: Optional[dns.message.Message] = None,
+    query: dns.message.Message | None = None,
 ) -> Any:
     """Read a DNS message from a UDP socket.
 
@@ -174,16 +182,16 @@ async def receive_udp(
 async def udp(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 53,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     ignore_unexpected: bool = False,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
     raise_on_truncation: bool = False,
-    sock: Optional[dns.asyncbackend.DatagramSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
+    sock: dns.asyncbackend.DatagramSocket | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
     ignore_errors: bool = False,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via UDP.
@@ -215,9 +223,9 @@ async def udp(
             dtuple = None
         cm = await backend.make_socket(af, socket.SOCK_DGRAM, 0, stuple, dtuple)
     async with cm as s:
-        await send_udp(s, wire, destination, expiration)
+        await send_udp(s, wire, destination, expiration)  # pyright: ignore
         (r, received_time, _) = await receive_udp(
-            s,
+            s,  # pyright: ignore
             destination,
             expiration,
             ignore_unexpected,
@@ -240,16 +248,16 @@ async def udp(
 async def udp_with_fallback(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 53,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     ignore_unexpected: bool = False,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    udp_sock: Optional[dns.asyncbackend.DatagramSocket] = None,
-    tcp_sock: Optional[dns.asyncbackend.StreamSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
+    udp_sock: dns.asyncbackend.DatagramSocket | None = None,
+    tcp_sock: dns.asyncbackend.StreamSocket | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
     ignore_errors: bool = False,
 ) -> Tuple[dns.message.Message, bool]:
     """Return the response to the query, trying UDP first and falling back
@@ -307,8 +315,8 @@ async def udp_with_fallback(
 
 async def send_tcp(
     sock: dns.asyncbackend.StreamSocket,
-    what: Union[dns.message.Message, bytes],
-    expiration: Optional[float] = None,
+    what: dns.message.Message | bytes,
+    expiration: float | None = None,
 ) -> Tuple[int, float]:
     """Send a DNS message to the specified TCP socket.
 
@@ -338,7 +346,7 @@ async def _read_exactly(sock, count, expiration):
     while count > 0:
         n = await sock.recv(count, _timeout(expiration))
         if n == b"":
-            raise EOFError
+            raise EOFError("EOF")
         count = count - len(n)
         s = s + n
     return s
@@ -346,10 +354,10 @@ async def _read_exactly(sock, count, expiration):
 
 async def receive_tcp(
     sock: dns.asyncbackend.StreamSocket,
-    expiration: Optional[float] = None,
+    expiration: float | None = None,
     one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
+    keyring: Dict[dns.name.Name, dns.tsig.Key] | None = None,
+    request_mac: bytes | None = b"",
     ignore_trailing: bool = False,
 ) -> Tuple[dns.message.Message, float]:
     """Read a DNS message from a TCP socket.
@@ -377,14 +385,14 @@ async def receive_tcp(
 async def tcp(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 53,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    sock: Optional[dns.asyncbackend.StreamSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
+    sock: dns.asyncbackend.StreamSocket | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via TCP.
 
@@ -420,9 +428,14 @@ async def tcp(
             af, socket.SOCK_STREAM, 0, stuple, dtuple, timeout
         )
     async with cm as s:
-        await send_tcp(s, wire, expiration)
+        await send_tcp(s, wire, expiration)  # pyright: ignore
         (r, received_time) = await receive_tcp(
-            s, expiration, one_rr_per_rrset, q.keyring, q.mac, ignore_trailing
+            s,  # pyright: ignore
+            expiration,
+            one_rr_per_rrset,
+            q.keyring,
+            q.mac,
+            ignore_trailing,
         )
         r.time = received_time - begin_time
         if not q.is_response(r):
@@ -433,17 +446,17 @@ async def tcp(
 async def tls(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 853,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    sock: Optional[dns.asyncbackend.StreamSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    ssl_context: Optional[ssl.SSLContext] = None,
-    server_hostname: Optional[str] = None,
-    verify: Union[bool, str] = True,
+    sock: dns.asyncbackend.StreamSocket | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
+    ssl_context: ssl.SSLContext | None = None,
+    server_hostname: str | None = None,
+    verify: bool | str = True,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via TLS.
 
@@ -465,7 +478,7 @@ async def tls(
         cm: contextlib.AbstractAsyncContextManager = NullContext(sock)
     else:
         if ssl_context is None:
-            ssl_context = _make_dot_ssl_context(server_hostname, verify)
+            ssl_context = make_ssl_context(verify, server_hostname is not None, ["dot"])
         af = dns.inet.af_for_address(where)
         stuple = _source_tuple(af, source, source_port)
         dtuple = (where, port)
@@ -500,22 +513,37 @@ async def tls(
         return response
 
 
+def _maybe_get_resolver(
+    resolver: Optional["dns.asyncresolver.Resolver"],  # pyright: ignore
+) -> "dns.asyncresolver.Resolver":  # pyright: ignore
+    # We need a separate method for this to avoid overriding the global
+    # variable "dns" with the as-yet undefined local variable "dns"
+    # in https().
+    if resolver is None:
+        # pylint: disable=import-outside-toplevel,redefined-outer-name
+        import dns.asyncresolver
+
+        resolver = dns.asyncresolver.Resolver()
+    return resolver
+
+
 async def https(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 443,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,  # pylint: disable=W0613
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    client: Optional["httpx.AsyncClient"] = None,
+    client: Optional["httpx.AsyncClient|dns.quic.AsyncQuicConnection"] = None,
     path: str = "/dns-query",
     post: bool = True,
-    verify: Union[bool, str] = True,
-    bootstrap_address: Optional[str] = None,
-    resolver: Optional["dns.asyncresolver.Resolver"] = None,
-    family: Optional[int] = socket.AF_UNSPEC,
+    verify: bool | str | ssl.SSLContext = True,
+    bootstrap_address: str | None = None,
+    resolver: Optional["dns.asyncresolver.Resolver"] = None,  # pyright: ignore
+    family: int = socket.AF_UNSPEC,
+    http_version: HTTPVersion = HTTPVersion.DEFAULT,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via DNS-over-HTTPS.
 
@@ -529,25 +557,72 @@ async def https(
     parameters, exceptions, and return type of this method.
     """
 
-    if not have_doh:
-        raise NoDOH  # pragma: no cover
-    if client and not isinstance(client, httpx.AsyncClient):
-        raise ValueError("session parameter must be an httpx.AsyncClient")
-
-    wire = q.to_wire()
     try:
         af = dns.inet.af_for_address(where)
     except ValueError:
         af = None
-    transport = None
-    headers = {"accept": "application/dns-message"}
+    # we bind url and then override as pyright can't figure out all paths bind.
+    url = where
     if af is not None and dns.inet.is_address(where):
         if af == socket.AF_INET:
-            url = "https://{}:{}{}".format(where, port, path)
+            url = f"https://{where}:{port}{path}"
         elif af == socket.AF_INET6:
-            url = "https://[{}]:{}{}".format(where, port, path)
-    else:
-        url = where
+            url = f"https://[{where}]:{port}{path}"
+
+    extensions = {}
+    if bootstrap_address is None:
+        # pylint: disable=possibly-used-before-assignment
+        parsed = urllib.parse.urlparse(url)
+        if parsed.hostname is None:
+            raise ValueError("no hostname in URL")
+        if dns.inet.is_address(parsed.hostname):
+            bootstrap_address = parsed.hostname
+            extensions["sni_hostname"] = parsed.hostname
+        if parsed.port is not None:
+            port = parsed.port
+
+    if http_version == HTTPVersion.H3 or (
+        http_version == HTTPVersion.DEFAULT and not have_doh
+    ):
+        if bootstrap_address is None:
+            resolver = _maybe_get_resolver(resolver)
+            assert parsed.hostname is not None  # pyright: ignore
+            answers = await resolver.resolve_name(  # pyright: ignore
+                parsed.hostname, family  # pyright: ignore
+            )
+            bootstrap_address = random.choice(list(answers.addresses()))
+        if client and not isinstance(
+            client, dns.quic.AsyncQuicConnection
+        ):  # pyright: ignore
+            raise ValueError("client parameter must be a dns.quic.AsyncQuicConnection.")
+        assert client is None or isinstance(client, dns.quic.AsyncQuicConnection)
+        return await _http3(
+            q,
+            bootstrap_address,
+            url,
+            timeout,
+            port,
+            source,
+            source_port,
+            one_rr_per_rrset,
+            ignore_trailing,
+            verify=verify,
+            post=post,
+            connection=client,
+        )
+
+    if not have_doh:
+        raise NoDOH  # pragma: no cover
+    # pylint: disable=possibly-used-before-assignment
+    if client and not isinstance(client, httpx.AsyncClient):  # pyright: ignore
+        raise ValueError("client parameter must be an httpx.AsyncClient")
+    # pylint: enable=possibly-used-before-assignment
+
+    wire = q.to_wire()
+    headers = {"accept": "application/dns-message"}
+
+    h1 = http_version in (HTTPVersion.H1, HTTPVersion.DEFAULT)
+    h2 = http_version in (HTTPVersion.H2, HTTPVersion.DEFAULT)
 
     backend = dns.asyncbackend.get_default_backend()
 
@@ -557,22 +632,23 @@ async def https(
     else:
         local_address = source
         local_port = source_port
-    transport = backend.get_transport_class()(
-        local_address=local_address,
-        http1=True,
-        http2=True,
-        verify=verify,
-        local_port=local_port,
-        bootstrap_address=bootstrap_address,
-        resolver=resolver,
-        family=family,
-    )
 
     if client:
         cm: contextlib.AbstractAsyncContextManager = NullContext(client)
     else:
-        cm = httpx.AsyncClient(
-            http1=True, http2=True, verify=verify, transport=transport
+        transport = backend.get_transport_class()(
+            local_address=local_address,
+            http1=h1,
+            http2=h2,
+            verify=verify,
+            local_port=local_port,
+            bootstrap_address=bootstrap_address,
+            resolver=resolver,
+            family=family,
+        )
+
+        cm = httpx.AsyncClient(  # pyright: ignore
+            http1=h1, http2=h2, verify=verify, transport=transport  # type: ignore
         )
 
     async with cm as the_client:
@@ -586,23 +662,33 @@ async def https(
                 }
             )
             response = await backend.wait_for(
-                the_client.post(url, headers=headers, content=wire), timeout
+                the_client.post(  # pyright: ignore
+                    url,
+                    headers=headers,
+                    content=wire,
+                    extensions=extensions,
+                ),
+                timeout,
             )
         else:
             wire = base64.urlsafe_b64encode(wire).rstrip(b"=")
             twire = wire.decode()  # httpx does a repr() if we give it bytes
             response = await backend.wait_for(
-                the_client.get(url, headers=headers, params={"dns": twire}), timeout
+                the_client.get(  # pyright: ignore
+                    url,
+                    headers=headers,
+                    params={"dns": twire},
+                    extensions=extensions,
+                ),
+                timeout,
             )
 
     # see https://tools.ietf.org/html/rfc8484#section-4.2.1 for info about DoH
     # status codes
     if response.status_code < 200 or response.status_code > 299:
         raise ValueError(
-            "{} responded with status code {}"
-            "\nResponse body: {!r}".format(
-                where, response.status_code, response.content
-            )
+            f"{where} responded with status code {response.status_code}"
+            f"\nResponse body: {response.content!r}"
         )
     r = dns.message.from_wire(
         response.content,
@@ -617,120 +703,84 @@ async def https(
     return r
 
 
-async def inbound_xfr(
+async def _http3(
+    q: dns.message.Message,
     where: str,
-    txn_manager: dns.transaction.TransactionManager,
-    query: Optional[dns.message.Message] = None,
-    port: int = 53,
-    timeout: Optional[float] = None,
-    lifetime: Optional[float] = None,
-    source: Optional[str] = None,
+    url: str,
+    timeout: float | None = None,
+    port: int = 443,
+    source: str | None = None,
     source_port: int = 0,
-    udp_mode: UDPMode = UDPMode.NEVER,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-) -> None:
-    """Conduct an inbound transfer and apply it via a transaction from the
-    txn_manager.
+    one_rr_per_rrset: bool = False,
+    ignore_trailing: bool = False,
+    verify: bool | str | ssl.SSLContext = True,
+    backend: dns.asyncbackend.Backend | None = None,
+    post: bool = True,
+    connection: dns.quic.AsyncQuicConnection | None = None,
+) -> dns.message.Message:
+    if not dns.quic.have_quic:
+        raise NoDOH("DNS-over-HTTP3 is not available.")  # pragma: no cover
 
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
+    url_parts = urllib.parse.urlparse(url)
+    hostname = url_parts.hostname
+    assert hostname is not None
+    if url_parts.port is not None:
+        port = url_parts.port
 
-    See :py:func:`dns.query.inbound_xfr()` for the documentation of
-    the other parameters, exceptions, and return type of this method.
-    """
-    if query is None:
-        (query, serial) = dns.xfr.make_query(txn_manager)
+    q.id = 0
+    wire = q.to_wire()
+    the_connection: dns.quic.AsyncQuicConnection
+    if connection:
+        cfactory = dns.quic.null_factory
+        mfactory = dns.quic.null_factory
     else:
-        serial = dns.xfr.extract_serial_from_query(query)
-    rdtype = query.question[0].rdtype
-    is_ixfr = rdtype == dns.rdatatype.IXFR
-    origin = txn_manager.from_wire_origin()
-    wire = query.to_wire()
-    af = dns.inet.af_for_address(where)
-    stuple = _source_tuple(af, source, source_port)
-    dtuple = (where, port)
-    (_, expiration) = _compute_times(lifetime)
-    retry = True
-    while retry:
-        retry = False
-        if is_ixfr and udp_mode != UDPMode.NEVER:
-            sock_type = socket.SOCK_DGRAM
-            is_udp = True
-        else:
-            sock_type = socket.SOCK_STREAM
-            is_udp = False
-        if not backend:
-            backend = dns.asyncbackend.get_default_backend()
-        s = await backend.make_socket(
-            af, sock_type, 0, stuple, dtuple, _timeout(expiration)
-        )
-        async with s:
-            if is_udp:
-                await s.sendto(wire, dtuple, _timeout(expiration))
+        (cfactory, mfactory) = dns.quic.factories_for_backend(backend)
+
+    async with cfactory() as context:
+        async with mfactory(
+            context, verify_mode=verify, server_name=hostname, h3=True
+        ) as the_manager:
+            if connection:
+                the_connection = connection
             else:
-                tcpmsg = struct.pack("!H", len(wire)) + wire
-                await s.sendall(tcpmsg, expiration)
-            with dns.xfr.Inbound(txn_manager, rdtype, serial, is_udp) as inbound:
-                done = False
-                tsig_ctx = None
-                while not done:
-                    (_, mexpiration) = _compute_times(timeout)
-                    if mexpiration is None or (
-                        expiration is not None and mexpiration > expiration
-                    ):
-                        mexpiration = expiration
-                    if is_udp:
-                        destination = _lltuple((where, port), af)
-                        while True:
-                            timeout = _timeout(mexpiration)
-                            (rwire, from_address) = await s.recvfrom(65535, timeout)
-                            if _matches_destination(
-                                af, from_address, destination, True
-                            ):
-                                break
-                    else:
-                        ldata = await _read_exactly(s, 2, mexpiration)
-                        (l,) = struct.unpack("!H", ldata)
-                        rwire = await _read_exactly(s, l, mexpiration)
-                    is_ixfr = rdtype == dns.rdatatype.IXFR
-                    r = dns.message.from_wire(
-                        rwire,
-                        keyring=query.keyring,
-                        request_mac=query.mac,
-                        xfr=True,
-                        origin=origin,
-                        tsig_ctx=tsig_ctx,
-                        multi=(not is_udp),
-                        one_rr_per_rrset=is_ixfr,
-                    )
-                    try:
-                        done = inbound.process_message(r)
-                    except dns.xfr.UseTCP:
-                        assert is_udp  # should not happen if we used TCP!
-                        if udp_mode == UDPMode.ONLY:
-                            raise
-                        done = True
-                        retry = True
-                        udp_mode = UDPMode.NEVER
-                        continue
-                    tsig_ctx = r.tsig_ctx
-                if not retry and query.keyring and not r.had_tsig:
-                    raise dns.exception.FormError("missing TSIG")
+                the_connection = the_manager.connect(  # pyright: ignore
+                    where, port, source, source_port
+                )
+            (start, expiration) = _compute_times(timeout)
+            stream = await the_connection.make_stream(timeout)  # pyright: ignore
+            async with stream:
+                # note that send_h3() does not need await
+                stream.send_h3(url, wire, post)
+                wire = await stream.receive(_remaining(expiration))
+                _check_status(stream.headers(), where, wire)
+            finish = time.time()
+        r = dns.message.from_wire(
+            wire,
+            keyring=q.keyring,
+            request_mac=q.request_mac,
+            one_rr_per_rrset=one_rr_per_rrset,
+            ignore_trailing=ignore_trailing,
+        )
+    r.time = max(finish - start, 0.0)
+    if not q.is_response(r):
+        raise BadResponse
+    return r
 
 
 async def quic(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 853,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    connection: Optional[dns.quic.AsyncQuicConnection] = None,
-    verify: Union[bool, str] = True,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    server_hostname: Optional[str] = None,
+    connection: dns.quic.AsyncQuicConnection | None = None,
+    verify: bool | str = True,
+    backend: dns.asyncbackend.Backend | None = None,
+    hostname: str | None = None,
+    server_hostname: str | None = None,
 ) -> dns.message.Message:
     """Return the response obtained after sending an asynchronous query via
     DNS-over-QUIC.
@@ -745,6 +795,9 @@ async def quic(
     if not dns.quic.have_quic:
         raise NoDOQ("DNS-over-QUIC is not available.")  # pragma: no cover
 
+    if server_hostname is not None and hostname is None:
+        hostname = server_hostname
+
     q.id = 0
     wire = q.to_wire()
     the_connection: dns.quic.AsyncQuicConnection
@@ -757,12 +810,16 @@ async def quic(
 
     async with cfactory() as context:
         async with mfactory(
-            context, verify_mode=verify, server_name=server_hostname
+            context,
+            verify_mode=verify,
+            server_name=server_hostname,
         ) as the_manager:
             if not connection:
-                the_connection = the_manager.connect(where, port, source, source_port)
+                the_connection = the_manager.connect(  # pyright: ignore
+                    where, port, source, source_port
+                )
             (start, expiration) = _compute_times(timeout)
-            stream = await the_connection.make_stream(timeout)
+            stream = await the_connection.make_stream(timeout)  # pyright: ignore
             async with stream:
                 await stream.send(wire, True)
                 wire = await stream.receive(_remaining(expiration))
@@ -778,3 +835,119 @@ async def quic(
     if not q.is_response(r):
         raise BadResponse
     return r
+
+
+async def _inbound_xfr(
+    txn_manager: dns.transaction.TransactionManager,
+    s: dns.asyncbackend.Socket,
+    query: dns.message.Message,
+    serial: int | None,
+    timeout: float | None,
+    expiration: float,
+) -> Any:
+    """Given a socket, does the zone transfer."""
+    rdtype = query.question[0].rdtype
+    is_ixfr = rdtype == dns.rdatatype.IXFR
+    origin = txn_manager.from_wire_origin()
+    wire = query.to_wire()
+    is_udp = s.type == socket.SOCK_DGRAM
+    if is_udp:
+        udp_sock = cast(dns.asyncbackend.DatagramSocket, s)
+        await udp_sock.sendto(wire, None, _timeout(expiration))
+    else:
+        tcp_sock = cast(dns.asyncbackend.StreamSocket, s)
+        tcpmsg = struct.pack("!H", len(wire)) + wire
+        await tcp_sock.sendall(tcpmsg, expiration)
+    with dns.xfr.Inbound(txn_manager, rdtype, serial, is_udp) as inbound:
+        done = False
+        tsig_ctx = None
+        r: dns.message.Message | None = None
+        while not done:
+            (_, mexpiration) = _compute_times(timeout)
+            if mexpiration is None or (
+                expiration is not None and mexpiration > expiration
+            ):
+                mexpiration = expiration
+            if is_udp:
+                timeout = _timeout(mexpiration)
+                (rwire, _) = await udp_sock.recvfrom(65535, timeout)  # pyright: ignore
+            else:
+                ldata = await _read_exactly(tcp_sock, 2, mexpiration)  # pyright: ignore
+                (l,) = struct.unpack("!H", ldata)
+                rwire = await _read_exactly(tcp_sock, l, mexpiration)  # pyright: ignore
+            r = dns.message.from_wire(
+                rwire,
+                keyring=query.keyring,
+                request_mac=query.mac,
+                xfr=True,
+                origin=origin,
+                tsig_ctx=tsig_ctx,
+                multi=(not is_udp),
+                one_rr_per_rrset=is_ixfr,
+            )
+            done = inbound.process_message(r)
+            yield r
+            tsig_ctx = r.tsig_ctx
+        if query.keyring and r is not None and not r.had_tsig:
+            raise dns.exception.FormError("missing TSIG")
+
+
+async def inbound_xfr(
+    where: str,
+    txn_manager: dns.transaction.TransactionManager,
+    query: dns.message.Message | None = None,
+    port: int = 53,
+    timeout: float | None = None,
+    lifetime: float | None = None,
+    source: str | None = None,
+    source_port: int = 0,
+    udp_mode: UDPMode = UDPMode.NEVER,
+    backend: dns.asyncbackend.Backend | None = None,
+) -> None:
+    """Conduct an inbound transfer and apply it via a transaction from the
+    txn_manager.
+
+    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
+    the default, then dnspython will use the default backend.
+
+    See :py:func:`dns.query.inbound_xfr()` for the documentation of
+    the other parameters, exceptions, and return type of this method.
+    """
+    if query is None:
+        (query, serial) = dns.xfr.make_query(txn_manager)
+    else:
+        serial = dns.xfr.extract_serial_from_query(query)
+    af = dns.inet.af_for_address(where)
+    stuple = _source_tuple(af, source, source_port)
+    dtuple = (where, port)
+    if not backend:
+        backend = dns.asyncbackend.get_default_backend()
+    (_, expiration) = _compute_times(lifetime)
+    if query.question[0].rdtype == dns.rdatatype.IXFR and udp_mode != UDPMode.NEVER:
+        s = await backend.make_socket(
+            af, socket.SOCK_DGRAM, 0, stuple, dtuple, _timeout(expiration)
+        )
+        async with s:
+            try:
+                async for _ in _inbound_xfr(  # pyright: ignore
+                    txn_manager,
+                    s,
+                    query,
+                    serial,
+                    timeout,
+                    expiration,  # pyright: ignore
+                ):
+                    pass
+                return
+            except dns.xfr.UseTCP:
+                if udp_mode == UDPMode.ONLY:
+                    raise
+
+    s = await backend.make_socket(
+        af, socket.SOCK_STREAM, 0, stuple, dtuple, _timeout(expiration)
+    )
+    async with s:
+        async for _ in _inbound_xfr(  # pyright: ignore
+            txn_manager, s, query, serial, timeout, expiration  # pyright: ignore
+        ):
+            pass
diff --git a/libs/dns/asyncresolver.py b/libs/dns/asyncresolver.py
index 8f5e062a9e..6f8c69fd3f 100644
--- a/libs/dns/asyncresolver.py
+++ b/libs/dns/asyncresolver.py
@@ -19,17 +19,20 @@
 
 import socket
 import time
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List
 
 import dns._ddr
 import dns.asyncbackend
 import dns.asyncquery
 import dns.exception
+import dns.inet
 import dns.name
+import dns.nameserver
 import dns.query
 import dns.rdataclass
 import dns.rdatatype
 import dns.resolver  # lgtm[py/import-and-import-from]
+import dns.reversename
 
 # import some resolver symbols for brevity
 from dns.resolver import NXDOMAIN, NoAnswer, NoRootSOA, NotAbsolute
@@ -44,16 +47,16 @@ class Resolver(dns.resolver.BaseResolver):
 
     async def resolve(
         self,
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+        qname: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+        rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
         tcp: bool = False,
-        source: Optional[str] = None,
+        source: str | None = None,
         raise_on_no_answer: bool = True,
         source_port: int = 0,
-        lifetime: Optional[float] = None,
-        search: Optional[bool] = None,
-        backend: Optional[dns.asyncbackend.Backend] = None,
+        lifetime: float | None = None,
+        search: bool | None = None,
+        backend: dns.asyncbackend.Backend | None = None,
     ) -> dns.resolver.Answer:
         """Query nameservers asynchronously to find the answer to the question.
 
@@ -137,7 +140,7 @@ async def resolve_address(
 
     async def resolve_name(
         self,
-        name: Union[dns.name.Name, str],
+        name: dns.name.Name | str,
         family: int = socket.AF_UNSPEC,
         **kwargs: Any,
     ) -> dns.resolver.HostAnswers:
@@ -204,7 +207,7 @@ async def resolve_name(
 
     # pylint: disable=redefined-outer-name
 
-    async def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
+    async def canonical_name(self, name: dns.name.Name | str) -> dns.name.Name:
         """Determine the canonical name of *name*.
 
         The canonical name is the name the resolver uses for queries
@@ -280,16 +283,16 @@ def reset_default_resolver() -> None:
 
 
 async def resolve(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+    qname: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
     tcp: bool = False,
-    source: Optional[str] = None,
+    source: str | None = None,
     raise_on_no_answer: bool = True,
     source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
+    lifetime: float | None = None,
+    search: bool | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
 ) -> dns.resolver.Answer:
     """Query nameservers asynchronously to find the answer to the question.
 
@@ -327,7 +330,7 @@ async def resolve_address(
 
 
 async def resolve_name(
-    name: Union[dns.name.Name, str], family: int = socket.AF_UNSPEC, **kwargs: Any
+    name: dns.name.Name | str, family: int = socket.AF_UNSPEC, **kwargs: Any
 ) -> dns.resolver.HostAnswers:
     """Use a resolver to asynchronously query for address records.
 
@@ -338,7 +341,7 @@ async def resolve_name(
     return await get_default_resolver().resolve_name(name, family, **kwargs)
 
 
-async def canonical_name(name: Union[dns.name.Name, str]) -> dns.name.Name:
+async def canonical_name(name: dns.name.Name | str) -> dns.name.Name:
     """Determine the canonical name of *name*.
 
     See :py:func:`dns.resolver.Resolver.canonical_name` for more
@@ -359,11 +362,11 @@ async def try_ddr(timeout: float = 5.0) -> None:
 
 
 async def zone_for_name(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
     tcp: bool = False,
-    resolver: Optional[Resolver] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
+    resolver: Resolver | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
 ) -> dns.name.Name:
     """Find the name of the zone which contains the specified name.
 
@@ -395,10 +398,10 @@ async def zone_for_name(
 
 
 async def make_resolver_at(
-    where: Union[dns.name.Name, str],
+    where: dns.name.Name | str,
     port: int = 53,
     family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
+    resolver: Resolver | None = None,
 ) -> Resolver:
     """Make a stub resolver using the specified destination as the full resolver.
 
@@ -419,33 +422,33 @@ async def make_resolver_at(
     """
     if resolver is None:
         resolver = get_default_resolver()
-    nameservers: List[Union[str, dns.nameserver.Nameserver]] = []
+    nameservers: List[str | dns.nameserver.Nameserver] = []
     if isinstance(where, str) and dns.inet.is_address(where):
         nameservers.append(dns.nameserver.Do53Nameserver(where, port))
     else:
         answers = await resolver.resolve_name(where, family)
         for address in answers.addresses():
             nameservers.append(dns.nameserver.Do53Nameserver(address, port))
-    res = dns.asyncresolver.Resolver(configure=False)
+    res = Resolver(configure=False)
     res.nameservers = nameservers
     return res
 
 
 async def resolve_at(
-    where: Union[dns.name.Name, str],
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+    where: dns.name.Name | str,
+    qname: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
     tcp: bool = False,
-    source: Optional[str] = None,
+    source: str | None = None,
     raise_on_no_answer: bool = True,
     source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
+    lifetime: float | None = None,
+    search: bool | None = None,
+    backend: dns.asyncbackend.Backend | None = None,
     port: int = 53,
     family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
+    resolver: Resolver | None = None,
 ) -> dns.resolver.Answer:
     """Query nameservers to find the answer to the question.
 
diff --git a/libs/dns/btree.py b/libs/dns/btree.py
new file mode 100644
index 0000000000..12da9f56e9
--- /dev/null
+++ b/libs/dns/btree.py
@@ -0,0 +1,850 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+"""
+A BTree in the style of Cormen, Leiserson, and Rivest's "Algorithms" book, with
+copy-on-write node updates, cursors, and optional space optimization for mostly-in-order
+insertion.
+"""
+
+from collections.abc import MutableMapping, MutableSet
+from typing import Any, Callable, Generic, Optional, Tuple, TypeVar, cast
+
+DEFAULT_T = 127
+
+KT = TypeVar("KT")  # the type of a key in Element
+
+
+class Element(Generic[KT]):
+    """All items stored in the BTree are Elements."""
+
+    def key(self) -> KT:
+        """The key for this element; the returned type must implement comparison."""
+        raise NotImplementedError  # pragma: no cover
+
+
+ET = TypeVar("ET", bound=Element)  # the type of a value in a _KV
+
+
+def _MIN(t: int) -> int:
+    """The minimum number of keys in a non-root node for a BTree with the specified
+    ``t``
+    """
+    return t - 1
+
+
+def _MAX(t: int) -> int:
+    """The maximum number of keys in node for a BTree with the specified ``t``"""
+    return 2 * t - 1
+
+
+class _Creator:
+    """A _Creator class instance is used as a unique id for the BTree which created
+    a node.
+
+    We use a dedicated creator rather than just a BTree reference to avoid circularity
+    that would complicate GC.
+    """
+
+    def __str__(self):  # pragma: no cover
+        return f"{id(self):x}"
+
+
+class _Node(Generic[KT, ET]):
+    """A Node in the BTree.
+
+    A Node (leaf or internal) of the BTree.
+    """
+
+    __slots__ = ["t", "creator", "is_leaf", "elts", "children"]
+
+    def __init__(self, t: int, creator: _Creator, is_leaf: bool):
+        assert t >= 3
+        self.t = t
+        self.creator = creator
+        self.is_leaf = is_leaf
+        self.elts: list[ET] = []
+        self.children: list[_Node[KT, ET]] = []
+
+    def is_maximal(self) -> bool:
+        """Does this node have the maximal number of keys?"""
+        assert len(self.elts) <= _MAX(self.t)
+        return len(self.elts) == _MAX(self.t)
+
+    def is_minimal(self) -> bool:
+        """Does this node have the minimal number of keys?"""
+        assert len(self.elts) >= _MIN(self.t)
+        return len(self.elts) == _MIN(self.t)
+
+    def search_in_node(self, key: KT) -> tuple[int, bool]:
+        """Get the index of the ``Element`` matching ``key`` or the index of its
+        least successor.
+
+        Returns a tuple of the index and an ``equal`` boolean that is ``True`` iff.
+        the key was found.
+        """
+        l = len(self.elts)
+        if l > 0 and key > self.elts[l - 1].key():
+            # This is optimizing near in-order insertion.
+            return l, False
+        l = 0
+        i = len(self.elts)
+        r = i - 1
+        equal = False
+        while l <= r:
+            m = (l + r) // 2
+            k = self.elts[m].key()
+            if key == k:
+                i = m
+                equal = True
+                break
+            elif key < k:
+                i = m
+                r = m - 1
+            else:
+                l = m + 1
+        return i, equal
+
+    def maybe_cow_child(self, index: int) -> "_Node[KT, ET]":
+        assert not self.is_leaf
+        child = self.children[index]
+        cloned = child.maybe_cow(self.creator)
+        if cloned:
+            self.children[index] = cloned
+            return cloned
+        else:
+            return child
+
+    def _get_node(self, key: KT) -> Tuple[Optional["_Node[KT, ET]"], int]:
+        """Get the node associated with key and its index, doing
+        copy-on-write if we have to descend.
+
+        Returns a tuple of the node and the index, or the tuple ``(None, 0)``
+        if the key was not found.
+        """
+        i, equal = self.search_in_node(key)
+        if equal:
+            return (self, i)
+        elif self.is_leaf:
+            return (None, 0)
+        else:
+            child = self.maybe_cow_child(i)
+            return child._get_node(key)
+
+    def get(self, key: KT) -> ET | None:
+        """Get the element associated with *key* or return ``None``"""
+        i, equal = self.search_in_node(key)
+        if equal:
+            return self.elts[i]
+        elif self.is_leaf:
+            return None
+        else:
+            return self.children[i].get(key)
+
+    def optimize_in_order_insertion(self, index: int) -> None:
+        """Try to minimize the number of Nodes in a BTree where the insertion
+        is done in-order or close to it, by stealing as much as we can from our
+        right sibling.
+
+        If we don't do this, then an in-order insertion will produce a BTree
+        where most of the nodes are minimal.
+        """
+        if index == 0:
+            return
+        left = self.children[index - 1]
+        if len(left.elts) == _MAX(self.t):
+            return
+        left = self.maybe_cow_child(index - 1)
+        while len(left.elts) < _MAX(self.t):
+            if not left.try_right_steal(self, index - 1):
+                break
+
+    def insert_nonfull(self, element: ET, in_order: bool) -> ET | None:
+        assert not self.is_maximal()
+        while True:
+            key = element.key()
+            i, equal = self.search_in_node(key)
+            if equal:
+                # replace
+                old = self.elts[i]
+                self.elts[i] = element
+                return old
+            elif self.is_leaf:
+                self.elts.insert(i, element)
+                return None
+            else:
+                child = self.maybe_cow_child(i)
+                if child.is_maximal():
+                    self.adopt(*child.split())
+                    # Splitting might result in our target moving to us, so
+                    # search again.
+                    continue
+                oelt = child.insert_nonfull(element, in_order)
+                if in_order:
+                    self.optimize_in_order_insertion(i)
+                return oelt
+
+    def split(self) -> tuple["_Node[KT, ET]", ET, "_Node[KT, ET]"]:
+        """Split a maximal node into two minimal ones and a central element."""
+        assert self.is_maximal()
+        right = self.__class__(self.t, self.creator, self.is_leaf)
+        right.elts = list(self.elts[_MIN(self.t) + 1 :])
+        middle = self.elts[_MIN(self.t)]
+        self.elts = list(self.elts[: _MIN(self.t)])
+        if not self.is_leaf:
+            right.children = list(self.children[_MIN(self.t) + 1 :])
+            self.children = list(self.children[: _MIN(self.t) + 1])
+        return self, middle, right
+
+    def try_left_steal(self, parent: "_Node[KT, ET]", index: int) -> bool:
+        """Try to steal from this Node's left sibling for balancing purposes.
+
+        Returns ``True`` if the theft was successful, or ``False`` if not.
+        """
+        if index != 0:
+            left = parent.children[index - 1]
+            if not left.is_minimal():
+                left = parent.maybe_cow_child(index - 1)
+                elt = parent.elts[index - 1]
+                parent.elts[index - 1] = left.elts.pop()
+                self.elts.insert(0, elt)
+                if not left.is_leaf:
+                    assert not self.is_leaf
+                    child = left.children.pop()
+                    self.children.insert(0, child)
+                return True
+        return False
+
+    def try_right_steal(self, parent: "_Node[KT, ET]", index: int) -> bool:
+        """Try to steal from this Node's right sibling for balancing purposes.
+
+        Returns ``True`` if the theft was successful, or ``False`` if not.
+        """
+        if index + 1 < len(parent.children):
+            right = parent.children[index + 1]
+            if not right.is_minimal():
+                right = parent.maybe_cow_child(index + 1)
+                elt = parent.elts[index]
+                parent.elts[index] = right.elts.pop(0)
+                self.elts.append(elt)
+                if not right.is_leaf:
+                    assert not self.is_leaf
+                    child = right.children.pop(0)
+                    self.children.append(child)
+                return True
+        return False
+
+    def adopt(self, left: "_Node[KT, ET]", middle: ET, right: "_Node[KT, ET]") -> None:
+        """Adopt left, middle, and right into our Node (which must not be maximal,
+        and which must not be a leaf).  In the case were we are not the new root,
+        then the left child must already be in the Node."""
+        assert not self.is_maximal()
+        assert not self.is_leaf
+        key = middle.key()
+        i, equal = self.search_in_node(key)
+        assert not equal
+        self.elts.insert(i, middle)
+        if len(self.children) == 0:
+            # We are the new root
+            self.children = [left, right]
+        else:
+            assert self.children[i] == left
+            self.children.insert(i + 1, right)
+
+    def merge(self, parent: "_Node[KT, ET]", index: int) -> None:
+        """Merge this node's parent and its right sibling into this node."""
+        right = parent.children.pop(index + 1)
+        self.elts.append(parent.elts.pop(index))
+        self.elts.extend(right.elts)
+        if not self.is_leaf:
+            self.children.extend(right.children)
+
+    def minimum(self) -> ET:
+        """The least element in this subtree."""
+        if self.is_leaf:
+            return self.elts[0]
+        else:
+            return self.children[0].minimum()
+
+    def maximum(self) -> ET:
+        """The greatest element in this subtree."""
+        if self.is_leaf:
+            return self.elts[-1]
+        else:
+            return self.children[-1].maximum()
+
+    def balance(self, parent: "_Node[KT, ET]", index: int) -> None:
+        """This Node is minimal, and we want to make it non-minimal so we can delete.
+        We try to steal from our siblings, and if that doesn't work we will merge
+        with one of them."""
+        assert not parent.is_leaf
+        if self.try_left_steal(parent, index):
+            return
+        if self.try_right_steal(parent, index):
+            return
+        # Stealing didn't work, so both siblings must be minimal.
+        if index == 0:
+            # We are the left-most node so merge with our right sibling.
+            self.merge(parent, index)
+        else:
+            # Have our left sibling merge with us.  This lets us only have "merge right"
+            # code.
+            left = parent.maybe_cow_child(index - 1)
+            left.merge(parent, index - 1)
+
+    def delete(
+        self, key: KT, parent: Optional["_Node[KT, ET]"], exact: ET | None
+    ) -> ET | None:
+        """Delete an element matching *key* if it exists.  If *exact* is not ``None``
+        then it must be an exact match with that element.  The Node must not be
+        minimal unless it is the root."""
+        assert parent is None or not self.is_minimal()
+        i, equal = self.search_in_node(key)
+        original_key = None
+        if equal:
+            # Note we use "is" here as we meant "exactly this object".
+            if exact is not None and self.elts[i] is not exact:
+                raise ValueError("exact delete did not match existing elt")
+            if self.is_leaf:
+                return self.elts.pop(i)
+            # Note we need to ensure exact is None going forward as we've
+            # already checked exactness and are about to change our target key
+            # to the least successor.
+            exact = None
+            original_key = key
+            least_successor = self.children[i + 1].minimum()
+            key = least_successor.key()
+            i = i + 1
+        if self.is_leaf:
+            # No match
+            if exact is not None:
+                raise ValueError("exact delete had no match")
+            return None
+        # recursively delete in the appropriate child
+        child = self.maybe_cow_child(i)
+        if child.is_minimal():
+            child.balance(self, i)
+            # Things may have moved.
+            i, equal = self.search_in_node(key)
+            assert not equal
+            child = self.children[i]
+            assert not child.is_minimal()
+        elt = child.delete(key, self, exact)
+        if original_key is not None:
+            node, i = self._get_node(original_key)
+            assert node is not None
+            assert elt is not None
+            oelt = node.elts[i]
+            node.elts[i] = elt
+            elt = oelt
+        return elt
+
+    def visit_in_order(self, visit: Callable[[ET], None]) -> None:
+        """Call *visit* on all of the elements in order."""
+        for i, elt in enumerate(self.elts):
+            if not self.is_leaf:
+                self.children[i].visit_in_order(visit)
+            visit(elt)
+        if not self.is_leaf:
+            self.children[-1].visit_in_order(visit)
+
+    def _visit_preorder_by_node(self, visit: Callable[["_Node[KT, ET]"], None]) -> None:
+        """Visit nodes in preorder.  This method is only used for testing."""
+        visit(self)
+        if not self.is_leaf:
+            for child in self.children:
+                child._visit_preorder_by_node(visit)
+
+    def maybe_cow(self, creator: _Creator) -> Optional["_Node[KT, ET]"]:
+        """Return a clone of this Node if it was not created by *creator*, or ``None``
+        otherwise (i.e. copy for copy-on-write if we haven't already copied it)."""
+        if self.creator is not creator:
+            return self.clone(creator)
+        else:
+            return None
+
+    def clone(self, creator: _Creator) -> "_Node[KT, ET]":
+        """Make a shallow-copy duplicate of this node."""
+        cloned = self.__class__(self.t, creator, self.is_leaf)
+        cloned.elts.extend(self.elts)
+        if not self.is_leaf:
+            cloned.children.extend(self.children)
+        return cloned
+
+    def __str__(self):  # pragma: no cover
+        if not self.is_leaf:
+            children = " " + " ".join([f"{id(c):x}" for c in self.children])
+        else:
+            children = ""
+        return f"{id(self):x} {self.creator} {self.elts}{children}"
+
+
+class Cursor(Generic[KT, ET]):
+    """A seekable cursor for a BTree.
+
+    If you are going to use a cursor on a mutable BTree, you should use it
+    in a ``with`` block so that any mutations of the BTree automatically park
+    the cursor.
+    """
+
+    def __init__(self, btree: "BTree[KT, ET]"):
+        self.btree = btree
+        self.current_node: _Node | None = None
+        # The current index is the element index within the current node, or
+        # if there is no current node then it is 0 on the left boundary and 1
+        # on the right boundary.
+        self.current_index: int = 0
+        self.recurse = False
+        self.increasing = True
+        self.parents: list[tuple[_Node, int]] = []
+        self.parked = False
+        self.parking_key: KT | None = None
+        self.parking_key_read = False
+
+    def _seek_least(self) -> None:
+        # seek to the least value in the subtree beneath the current index of the
+        # current node
+        assert self.current_node is not None
+        while not self.current_node.is_leaf:
+            self.parents.append((self.current_node, self.current_index))
+            self.current_node = self.current_node.children[self.current_index]
+            assert self.current_node is not None
+            self.current_index = 0
+
+    def _seek_greatest(self) -> None:
+        # seek to the greatest value in the subtree beneath the current index of the
+        # current node
+        assert self.current_node is not None
+        while not self.current_node.is_leaf:
+            self.parents.append((self.current_node, self.current_index))
+            self.current_node = self.current_node.children[self.current_index]
+            assert self.current_node is not None
+            self.current_index = len(self.current_node.elts)
+
+    def park(self):
+        """Park the cursor.
+
+        A cursor must be "parked" before mutating the BTree to avoid undefined behavior.
+        Cursors created in a ``with`` block register with their BTree and will park
+        automatically.  Note that a parked cursor may not observe some changes made when
+        it is parked; for example a cursor being iterated with next() will not see items
+        inserted before its current position.
+        """
+        if not self.parked:
+            self.parked = True
+
+    def _maybe_unpark(self):
+        if self.parked:
+            if self.parking_key is not None:
+                # remember our increasing hint, as seeking might change it
+                increasing = self.increasing
+                if self.parking_key_read:
+                    # We've already returned the parking key, so we want to be before it
+                    # if decreasing and after it if increasing.
+                    before = not self.increasing
+                else:
+                    # We haven't returned the parking key, so we've parked right
+                    # after seeking or are on a boundary.  Either way, the before
+                    # hint we want is the value of self.increasing.
+                    before = self.increasing
+                self.seek(self.parking_key, before)
+                self.increasing = increasing  # might have been altered by seek()
+            self.parked = False
+            self.parking_key = None
+
+    def prev(self) -> ET | None:
+        """Get the previous element, or return None if on the left boundary."""
+        self._maybe_unpark()
+        self.parking_key = None
+        if self.current_node is None:
+            # on a boundary
+            if self.current_index == 0:
+                # left boundary, there is no prev
+                return None
+            else:
+                assert self.current_index == 1
+                # right boundary; seek to the actual boundary
+                # so we can do a prev()
+                self.current_node = self.btree.root
+                self.current_index = len(self.btree.root.elts)
+                self._seek_greatest()
+        while True:
+            if self.recurse:
+                if not self.increasing:
+                    # We only want to recurse if we are continuing in the decreasing
+                    # direction.
+                    self._seek_greatest()
+                self.recurse = False
+            self.increasing = False
+            self.current_index -= 1
+            if self.current_index >= 0:
+                elt = self.current_node.elts[self.current_index]
+                if not self.current_node.is_leaf:
+                    self.recurse = True
+                self.parking_key = elt.key()
+                self.parking_key_read = True
+                return elt
+            else:
+                if len(self.parents) > 0:
+                    self.current_node, self.current_index = self.parents.pop()
+                else:
+                    self.current_node = None
+                    self.current_index = 0
+                    return None
+
+    def next(self) -> ET | None:
+        """Get the next element, or return None if on the right boundary."""
+        self._maybe_unpark()
+        self.parking_key = None
+        if self.current_node is None:
+            # on a boundary
+            if self.current_index == 1:
+                # right boundary, there is no next
+                return None
+            else:
+                assert self.current_index == 0
+                # left boundary; seek to the actual boundary
+                # so we can do a next()
+                self.current_node = self.btree.root
+                self.current_index = 0
+                self._seek_least()
+        while True:
+            if self.recurse:
+                if self.increasing:
+                    # We only want to recurse if we are continuing in the increasing
+                    # direction.
+                    self._seek_least()
+                self.recurse = False
+            self.increasing = True
+            if self.current_index < len(self.current_node.elts):
+                elt = self.current_node.elts[self.current_index]
+                self.current_index += 1
+                if not self.current_node.is_leaf:
+                    self.recurse = True
+                self.parking_key = elt.key()
+                self.parking_key_read = True
+                return elt
+            else:
+                if len(self.parents) > 0:
+                    self.current_node, self.current_index = self.parents.pop()
+                else:
+                    self.current_node = None
+                    self.current_index = 1
+                    return None
+
+    def _adjust_for_before(self, before: bool, i: int) -> None:
+        if before:
+            self.current_index = i
+        else:
+            self.current_index = i + 1
+
+    def seek(self, key: KT, before: bool = True) -> None:
+        """Seek to the specified key.
+
+        If *before* is ``True`` (the default) then the cursor is positioned just
+        before *key* if it exists, or before its least successor if it doesn't.  A
+        subsequent next() will retrieve this value.  If *before* is ``False``, then
+        the cursor is positioned just after *key* if it exists, or its greatest
+        precessessor if it doesn't.  A subsequent prev() will return this value.
+        """
+        self.current_node = self.btree.root
+        assert self.current_node is not None
+        self.recurse = False
+        self.parents = []
+        self.increasing = before
+        self.parked = False
+        self.parking_key = key
+        self.parking_key_read = False
+        while not self.current_node.is_leaf:
+            i, equal = self.current_node.search_in_node(key)
+            if equal:
+                self._adjust_for_before(before, i)
+                if before:
+                    self._seek_greatest()
+                else:
+                    self._seek_least()
+                return
+            self.parents.append((self.current_node, i))
+            self.current_node = self.current_node.children[i]
+            assert self.current_node is not None
+        i, equal = self.current_node.search_in_node(key)
+        if equal:
+            self._adjust_for_before(before, i)
+        else:
+            self.current_index = i
+
+    def seek_first(self) -> None:
+        """Seek to the left boundary (i.e. just before the least element).
+
+        A subsequent next() will return the least element if the BTree isn't empty."""
+        self.current_node = None
+        self.current_index = 0
+        self.recurse = False
+        self.increasing = True
+        self.parents = []
+        self.parked = False
+        self.parking_key = None
+
+    def seek_last(self) -> None:
+        """Seek to the right boundary (i.e. just after the greatest element).
+
+        A subsequent prev() will return the greatest element if the BTree isn't empty.
+        """
+        self.current_node = None
+        self.current_index = 1
+        self.recurse = False
+        self.increasing = False
+        self.parents = []
+        self.parked = False
+        self.parking_key = None
+
+    def __enter__(self):
+        self.btree.register_cursor(self)
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.btree.deregister_cursor(self)
+        return False
+
+
+class Immutable(Exception):
+    """The BTree is immutable."""
+
+
+class BTree(Generic[KT, ET]):
+    """An in-memory BTree with copy-on-write and cursors."""
+
+    def __init__(self, *, t: int = DEFAULT_T, original: Optional["BTree"] = None):
+        """Create a BTree.
+
+        If *original* is not ``None``, then the BTree is shallow-cloned from
+        *original* using copy-on-write.  Otherwise a new BTree with the specified
+        *t* value is created.
+
+        The BTree is not thread-safe.
+        """
+        # We don't use a reference to ourselves as a creator as we don't want
+        # to prevent GC of old btrees.
+        self.creator = _Creator()
+        self._immutable = False
+        self.t: int
+        self.root: _Node
+        self.size: int
+        self.cursors: set[Cursor] = set()
+        if original is not None:
+            if not original._immutable:
+                raise ValueError("original BTree is not immutable")
+            self.t = original.t
+            self.root = original.root
+            self.size = original.size
+        else:
+            if t < 3:
+                raise ValueError("t must be >= 3")
+            self.t = t
+            self.root = _Node(self.t, self.creator, True)
+            self.size = 0
+
+    def make_immutable(self):
+        """Make the BTree immutable.
+
+        Attempts to alter the BTree after making it immutable will raise an
+        Immutable exception.  This operation cannot be undone.
+        """
+        if not self._immutable:
+            self._immutable = True
+
+    def _check_mutable_and_park(self) -> None:
+        if self._immutable:
+            raise Immutable
+        for cursor in self.cursors:
+            cursor.park()
+
+    # Note that we don't use insert() and delete() but rather insert_element() and
+    # delete_key() so that BTreeDict can be a proper MutableMapping and supply the
+    # rest of the standard mapping API.
+
+    def insert_element(self, elt: ET, in_order: bool = False) -> ET | None:
+        """Insert the element into the BTree.
+
+        If *in_order* is ``True``, then extra work will be done to make left siblings
+        full, which optimizes storage space when the the elements are inserted in-order
+        or close to it.
+
+        Returns the previously existing element at the element's key or ``None``.
+        """
+        self._check_mutable_and_park()
+        cloned = self.root.maybe_cow(self.creator)
+        if cloned:
+            self.root = cloned
+        if self.root.is_maximal():
+            old_root = self.root
+            self.root = _Node(self.t, self.creator, False)
+            self.root.adopt(*old_root.split())
+        oelt = self.root.insert_nonfull(elt, in_order)
+        if oelt is None:
+            # We did not replace, so something was added.
+            self.size += 1
+        return oelt
+
+    def get_element(self, key: KT) -> ET | None:
+        """Get the element matching *key* from the BTree, or return ``None`` if it
+        does not exist.
+        """
+        return self.root.get(key)
+
+    def _delete(self, key: KT, exact: ET | None) -> ET | None:
+        self._check_mutable_and_park()
+        cloned = self.root.maybe_cow(self.creator)
+        if cloned:
+            self.root = cloned
+        elt = self.root.delete(key, None, exact)
+        if elt is not None:
+            # We deleted something
+            self.size -= 1
+            if len(self.root.elts) == 0:
+                # The root is now empty.  If there is a child, then collapse this root
+                # level and make the child the new root.
+                if not self.root.is_leaf:
+                    assert len(self.root.children) == 1
+                    self.root = self.root.children[0]
+        return elt
+
+    def delete_key(self, key: KT) -> ET | None:
+        """Delete the element matching *key* from the BTree.
+
+        Returns the matching element or ``None`` if it does not exist.
+        """
+        return self._delete(key, None)
+
+    def delete_exact(self, element: ET) -> ET | None:
+        """Delete *element* from the BTree.
+
+        Returns the matching element or ``None`` if it was not in the BTree.
+        """
+        delt = self._delete(element.key(), element)
+        assert delt is element
+        return delt
+
+    def __len__(self):
+        return self.size
+
+    def visit_in_order(self, visit: Callable[[ET], None]) -> None:
+        """Call *visit*(element) on all elements in the tree in sorted order."""
+        self.root.visit_in_order(visit)
+
+    def _visit_preorder_by_node(self, visit: Callable[[_Node], None]) -> None:
+        self.root._visit_preorder_by_node(visit)
+
+    def cursor(self) -> Cursor[KT, ET]:
+        """Create a cursor."""
+        return Cursor(self)
+
+    def register_cursor(self, cursor: Cursor) -> None:
+        """Register a cursor for the automatic parking service."""
+        self.cursors.add(cursor)
+
+    def deregister_cursor(self, cursor: Cursor) -> None:
+        """Deregister a cursor from the automatic parking service."""
+        self.cursors.discard(cursor)
+
+    def __copy__(self):
+        return self.__class__(original=self)
+
+    def __iter__(self):
+        with self.cursor() as cursor:
+            while True:
+                elt = cursor.next()
+                if elt is None:
+                    break
+                yield elt.key()
+
+
+VT = TypeVar("VT")  # the type of a value in a BTreeDict
+
+
+class KV(Element, Generic[KT, VT]):
+    """The BTree element type used in a ``BTreeDict``."""
+
+    def __init__(self, key: KT, value: VT):
+        self._key = key
+        self._value = value
+
+    def key(self) -> KT:
+        return self._key
+
+    def value(self) -> VT:
+        return self._value
+
+    def __str__(self):  # pragma: no cover
+        return f"KV({self._key}, {self._value})"
+
+    def __repr__(self):  # pragma: no cover
+        return f"KV({self._key}, {self._value})"
+
+
+class BTreeDict(Generic[KT, VT], BTree[KT, KV[KT, VT]], MutableMapping[KT, VT]):
+    """A MutableMapping implemented with a BTree.
+
+    Unlike a normal Python dict, the BTreeDict may be mutated while iterating.
+    """
+
+    def __init__(
+        self,
+        *,
+        t: int = DEFAULT_T,
+        original: BTree | None = None,
+        in_order: bool = False,
+    ):
+        super().__init__(t=t, original=original)
+        self.in_order = in_order
+
+    def __getitem__(self, key: KT) -> VT:
+        elt = self.get_element(key)
+        if elt is None:
+            raise KeyError
+        else:
+            return cast(KV, elt).value()
+
+    def __setitem__(self, key: KT, value: VT) -> None:
+        elt = KV(key, value)
+        self.insert_element(elt, self.in_order)
+
+    def __delitem__(self, key: KT) -> None:
+        if self.delete_key(key) is None:
+            raise KeyError
+
+
+class Member(Element, Generic[KT]):
+    """The BTree element type used in a ``BTreeSet``."""
+
+    def __init__(self, key: KT):
+        self._key = key
+
+    def key(self) -> KT:
+        return self._key
+
+
+class BTreeSet(BTree, Generic[KT], MutableSet[KT]):
+    """A MutableSet implemented with a BTree.
+
+    Unlike a normal Python set, the BTreeSet may be mutated while iterating.
+    """
+
+    def __init__(
+        self,
+        *,
+        t: int = DEFAULT_T,
+        original: BTree | None = None,
+        in_order: bool = False,
+    ):
+        super().__init__(t=t, original=original)
+        self.in_order = in_order
+
+    def __contains__(self, key: Any) -> bool:
+        return self.get_element(key) is not None
+
+    def add(self, value: KT) -> None:
+        elt = Member(value)
+        self.insert_element(elt, self.in_order)
+
+    def discard(self, value: KT) -> None:
+        self.delete_key(value)
diff --git a/libs/dns/btreezone.py b/libs/dns/btreezone.py
new file mode 100644
index 0000000000..27b5bb6feb
--- /dev/null
+++ b/libs/dns/btreezone.py
@@ -0,0 +1,367 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+# A derivative of a dnspython VersionedZone and related classes, using a BTreeDict and
+# a separate per-version delegation index.  These additions let us
+#
+# 1) Do efficient CoW versioning (useful for future online updates).
+# 2) Maintain sort order
+# 3) Allow delegations to be found easily
+# 4) Handle glue
+# 5) Add Node flags ORIGIN, DELEGATION, and GLUE whenever relevant.  The ORIGIN
+#    flag is set at the origin node, the DELEGATION FLAG is set at delegation
+#    points, and the GLUE flag is set on nodes beneath delegation points.
+
+import enum
+from dataclasses import dataclass
+from typing import Callable, MutableMapping, Tuple, cast
+
+import dns.btree
+import dns.immutable
+import dns.name
+import dns.node
+import dns.rdataclass
+import dns.rdataset
+import dns.rdatatype
+import dns.versioned
+import dns.zone
+
+
+class NodeFlags(enum.IntFlag):
+    ORIGIN = 0x01
+    DELEGATION = 0x02
+    GLUE = 0x04
+
+
+class Node(dns.node.Node):
+    __slots__ = ["flags", "id"]
+
+    def __init__(self, flags: NodeFlags | None = None):
+        super().__init__()
+        if flags is None:
+            # We allow optional flags rather than a default
+            # as pyright doesn't like assigning a literal 0
+            # to flags.
+            flags = NodeFlags(0)
+        self.flags = flags
+        self.id = 0
+
+    def is_delegation(self):
+        return (self.flags & NodeFlags.DELEGATION) != 0
+
+    def is_glue(self):
+        return (self.flags & NodeFlags.GLUE) != 0
+
+    def is_origin(self):
+        return (self.flags & NodeFlags.ORIGIN) != 0
+
+    def is_origin_or_glue(self):
+        return (self.flags & (NodeFlags.ORIGIN | NodeFlags.GLUE)) != 0
+
+
+@dns.immutable.immutable
+class ImmutableNode(Node):
+    def __init__(self, node: Node):
+        super().__init__()
+        self.id = node.id
+        self.rdatasets = tuple(  # type: ignore
+            [dns.rdataset.ImmutableRdataset(rds) for rds in node.rdatasets]
+        )
+        self.flags = node.flags
+
+    def find_rdataset(
+        self,
+        rdclass: dns.rdataclass.RdataClass,
+        rdtype: dns.rdatatype.RdataType,
+        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
+        create: bool = False,
+    ) -> dns.rdataset.Rdataset:
+        if create:
+            raise TypeError("immutable")
+        return super().find_rdataset(rdclass, rdtype, covers, False)
+
+    def get_rdataset(
+        self,
+        rdclass: dns.rdataclass.RdataClass,
+        rdtype: dns.rdatatype.RdataType,
+        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
+        create: bool = False,
+    ) -> dns.rdataset.Rdataset | None:
+        if create:
+            raise TypeError("immutable")
+        return super().get_rdataset(rdclass, rdtype, covers, False)
+
+    def delete_rdataset(
+        self,
+        rdclass: dns.rdataclass.RdataClass,
+        rdtype: dns.rdatatype.RdataType,
+        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
+    ) -> None:
+        raise TypeError("immutable")
+
+    def replace_rdataset(self, replacement: dns.rdataset.Rdataset) -> None:
+        raise TypeError("immutable")
+
+    def is_immutable(self) -> bool:
+        return True
+
+
+class Delegations(dns.btree.BTreeSet[dns.name.Name]):
+    def get_delegation(self, name: dns.name.Name) -> Tuple[dns.name.Name | None, bool]:
+        """Get the delegation applicable to *name*, if it exists.
+
+        If there delegation, then return a tuple consisting of the name of
+        the delegation point, and a boolean which is `True` if the name is a proper
+        subdomain of the delegation point, and `False` if it is equal to the delegation
+        point.
+        """
+        cursor = self.cursor()
+        cursor.seek(name, before=False)
+        prev = cursor.prev()
+        if prev is None:
+            return None, False
+        cut = prev.key()
+        reln, _, _ = name.fullcompare(cut)
+        is_subdomain = reln == dns.name.NameRelation.SUBDOMAIN
+        if is_subdomain or reln == dns.name.NameRelation.EQUAL:
+            return cut, is_subdomain
+        else:
+            return None, False
+
+    def is_glue(self, name: dns.name.Name) -> bool:
+        """Is *name* glue, i.e. is it beneath a delegation?"""
+        cursor = self.cursor()
+        cursor.seek(name, before=False)
+        cut, is_subdomain = self.get_delegation(name)
+        if cut is None:
+            return False
+        return is_subdomain
+
+
+class WritableVersion(dns.zone.WritableVersion):
+    def __init__(self, zone: dns.zone.Zone, replacement: bool = False):
+        super().__init__(zone, True)
+        if not replacement:
+            assert isinstance(zone, dns.versioned.Zone)
+            version = zone._versions[-1]
+            self.nodes: dns.btree.BTreeDict[dns.name.Name, Node] = dns.btree.BTreeDict(
+                original=version.nodes  # type: ignore
+            )
+            self.delegations = Delegations(original=version.delegations)  # type: ignore
+        else:
+            self.delegations = Delegations()
+
+    def _is_origin(self, name: dns.name.Name) -> bool:
+        # Assumes name has already been validated (and thus adjusted to the right
+        # relativity too)
+        if self.zone.relativize:
+            return name == dns.name.empty
+        else:
+            return name == self.zone.origin
+
+    def _maybe_cow_with_name(
+        self, name: dns.name.Name
+    ) -> Tuple[dns.node.Node, dns.name.Name]:
+        (node, name) = super()._maybe_cow_with_name(name)
+        node = cast(Node, node)
+        if self._is_origin(name):
+            node.flags |= NodeFlags.ORIGIN
+        elif self.delegations.is_glue(name):
+            node.flags |= NodeFlags.GLUE
+        return (node, name)
+
+    def update_glue_flag(self, name: dns.name.Name, is_glue: bool) -> None:
+        cursor = self.nodes.cursor()  # type: ignore
+        cursor.seek(name, False)
+        updates = []
+        while True:
+            elt = cursor.next()
+            if elt is None:
+                break
+            ename = elt.key()
+            if not ename.is_subdomain(name):
+                break
+            node = cast(dns.node.Node, elt.value())
+            if ename not in self.changed:
+                new_node = self.zone.node_factory()
+                new_node.id = self.id  # type: ignore
+                new_node.rdatasets.extend(node.rdatasets)
+                self.changed.add(ename)
+                node = new_node
+            assert isinstance(node, Node)
+            if is_glue:
+                node.flags |= NodeFlags.GLUE
+            else:
+                node.flags &= ~NodeFlags.GLUE
+            # We don't update node here as any insertion could disturb the
+            # btree and invalidate our cursor.  We could use the cursor in a
+            # with block and avoid this, but it would do a lot of parking and
+            # unparking so the deferred update mode may still be better.
+            updates.append((ename, node))
+        for ename, node in updates:
+            self.nodes[ename] = node
+
+    def delete_node(self, name: dns.name.Name) -> None:
+        name = self._validate_name(name)
+        node = self.nodes.get(name)
+        if node is not None:
+            if node.is_delegation():  # type: ignore
+                self.delegations.discard(name)
+                self.update_glue_flag(name, False)
+            del self.nodes[name]
+            self.changed.add(name)
+
+    def put_rdataset(
+        self, name: dns.name.Name, rdataset: dns.rdataset.Rdataset
+    ) -> None:
+        (node, name) = self._maybe_cow_with_name(name)
+        if (
+            rdataset.rdtype == dns.rdatatype.NS and not node.is_origin_or_glue()  # type: ignore
+        ):
+            node.flags |= NodeFlags.DELEGATION  # type: ignore
+            if name not in self.delegations:
+                self.delegations.add(name)
+                self.update_glue_flag(name, True)
+        node.replace_rdataset(rdataset)
+
+    def delete_rdataset(
+        self,
+        name: dns.name.Name,
+        rdtype: dns.rdatatype.RdataType,
+        covers: dns.rdatatype.RdataType,
+    ) -> None:
+        (node, name) = self._maybe_cow_with_name(name)
+        if rdtype == dns.rdatatype.NS and name in self.delegations:  # type: ignore
+            node.flags &= ~NodeFlags.DELEGATION  # type: ignore
+            self.delegations.discard(name)  # type: ignore
+            self.update_glue_flag(name, False)
+        node.delete_rdataset(self.zone.rdclass, rdtype, covers)
+        if len(node) == 0:
+            del self.nodes[name]
+
+
+@dataclass(frozen=True)
+class Bounds:
+    name: dns.name.Name
+    left: dns.name.Name
+    right: dns.name.Name | None
+    closest_encloser: dns.name.Name
+    is_equal: bool
+    is_delegation: bool
+
+    def __str__(self):
+        if self.is_equal:
+            op = "="
+        else:
+            op = "<"
+        if self.is_delegation:
+            zonecut = " zonecut"
+        else:
+            zonecut = ""
+        return (
+            f"{self.left} {op} {self.name} < {self.right}{zonecut}; "
+            f"{self.closest_encloser}"
+        )
+
+
+@dns.immutable.immutable
+class ImmutableVersion(dns.zone.Version):
+    def __init__(self, version: dns.zone.Version):
+        if not isinstance(version, WritableVersion):
+            raise ValueError(
+                "a dns.btreezone.ImmutableVersion requires a "
+                "dns.btreezone.WritableVersion"
+            )
+        super().__init__(version.zone, True)
+        self.id = version.id
+        self.origin = version.origin
+        for name in version.changed:
+            node = version.nodes.get(name)
+            if node:
+                version.nodes[name] = ImmutableNode(node)
+        # the cast below is for mypy
+        self.nodes = cast(MutableMapping[dns.name.Name, dns.node.Node], version.nodes)
+        self.nodes.make_immutable()  # type: ignore
+        self.delegations = version.delegations
+        self.delegations.make_immutable()
+
+    def bounds(self, name: dns.name.Name | str) -> Bounds:
+        """Return the 'bounds' of *name* in its zone.
+
+        The bounds information is useful when making an authoritative response, as
+        it can be used to determine whether the query name is at or beneath a delegation
+        point.  The other data in the ``Bounds`` object is useful for making on-the-fly
+        DNSSEC signatures.
+
+        The left bound of *name* is *name* itself if it is in the zone, or the greatest
+        predecessor which is in the zone.
+
+        The right bound of *name* is the least successor of *name*, or ``None`` if
+        no name in the zone is greater than *name*.
+
+        The closest encloser of *name* is *name* itself, if *name* is in the zone;
+        otherwise it is the name with the largest number of labels in common with
+        *name* that is in the zone, either explicitly or by the implied existence
+        of empty non-terminals.
+
+        The bounds *is_equal* field is ``True`` if and only if *name* is equal to
+        its left bound.
+
+        The bounds *is_delegation* field is ``True`` if and only if the left bound is a
+        delegation point.
+        """
+        assert self.origin is not None
+        # validate the origin because we may need to relativize
+        origin = self.zone._validate_name(self.origin)
+        name = self.zone._validate_name(name)
+        cut, _ = self.delegations.get_delegation(name)
+        if cut is not None:
+            target = cut
+            is_delegation = True
+        else:
+            target = name
+            is_delegation = False
+        c = cast(dns.btree.BTreeDict, self.nodes).cursor()
+        c.seek(target, False)
+        left = c.prev()
+        assert left is not None
+        c.next()  # skip over left
+        while True:
+            right = c.next()
+            if right is None or not right.value().is_glue():
+                break
+        left_comparison = left.key().fullcompare(name)
+        if right is not None:
+            right_key = right.key()
+            right_comparison = right_key.fullcompare(name)
+        else:
+            right_comparison = (
+                dns.name.NAMERELN_COMMONANCESTOR,
+                -1,
+                len(origin),
+            )
+            right_key = None
+        closest_encloser = dns.name.Name(
+            name[-max(left_comparison[2], right_comparison[2]) :]
+        )
+        return Bounds(
+            name,
+            left.key(),
+            right_key,
+            closest_encloser,
+            left_comparison[0] == dns.name.NameRelation.EQUAL,
+            is_delegation,
+        )
+
+
+class Zone(dns.versioned.Zone):
+    node_factory: Callable[[], dns.node.Node] = Node
+    map_factory: Callable[[], MutableMapping[dns.name.Name, dns.node.Node]] = cast(
+        Callable[[], MutableMapping[dns.name.Name, dns.node.Node]],
+        dns.btree.BTreeDict[dns.name.Name, Node],
+    )
+    writable_version_factory: (
+        Callable[[dns.zone.Zone, bool], dns.zone.Version] | None
+    ) = WritableVersion
+    immutable_version_factory: Callable[[dns.zone.Version], dns.zone.Version] | None = (
+        ImmutableVersion
+    )
diff --git a/libs/dns/dnssec.py b/libs/dns/dnssec.py
index e49c3b795b..0b2aa70979 100644
--- a/libs/dns/dnssec.py
+++ b/libs/dns/dnssec.py
@@ -17,6 +17,7 @@
 
 """Common DNSSEC-related functions and constants."""
 
+# pylint: disable=unused-import
 
 import base64
 import contextlib
@@ -25,10 +26,9 @@
 import struct
 import time
 from datetime import datetime
-from typing import Callable, Dict, List, Optional, Set, Tuple, Union, cast
+from typing import Callable, Dict, List, Set, Tuple, Union, cast
 
 import dns._features
-import dns.exception
 import dns.name
 import dns.node
 import dns.rdata
@@ -39,12 +39,8 @@
 import dns.transaction
 import dns.zone
 from dns.dnssectypes import Algorithm, DSDigest, NSEC3Hash
-from dns.exception import (  # pylint: disable=W0611
-    AlgorithmKeyMismatch,
-    DeniedByPolicy,
-    UnsupportedAlgorithm,
-    ValidationFailure,
-)
+from dns.exception import AlgorithmKeyMismatch as AlgorithmKeyMismatch
+from dns.exception import DeniedByPolicy, UnsupportedAlgorithm, ValidationFailure
 from dns.rdtypes.ANY.CDNSKEY import CDNSKEY
 from dns.rdtypes.ANY.CDS import CDS
 from dns.rdtypes.ANY.DNSKEY import DNSKEY
@@ -84,7 +80,7 @@ def algorithm_from_text(text: str) -> Algorithm:
     return Algorithm.from_text(text)
 
 
-def algorithm_to_text(value: Union[Algorithm, int]) -> str:
+def algorithm_to_text(value: Algorithm | int) -> str:
     """Convert a DNSSEC algorithm value to text
 
     *value*, a ``dns.dnssec.Algorithm``.
@@ -95,7 +91,7 @@ def algorithm_to_text(value: Union[Algorithm, int]) -> str:
     return Algorithm.to_text(value)
 
 
-def to_timestamp(value: Union[datetime, str, float, int]) -> int:
+def to_timestamp(value: datetime | str | float | int) -> int:
     """Convert various format to a timestamp"""
     if isinstance(value, datetime):
         return int(value.timestamp())
@@ -109,7 +105,7 @@ def to_timestamp(value: Union[datetime, str, float, int]) -> int:
         raise TypeError("Unsupported timestamp type")
 
 
-def key_id(key: Union[DNSKEY, CDNSKEY]) -> int:
+def key_id(key: DNSKEY | CDNSKEY) -> int:
     """Return the key id (a 16-bit number) for the specified key.
 
     *key*, a ``dns.rdtypes.ANY.DNSKEY.DNSKEY``
@@ -118,6 +114,7 @@ def key_id(key: Union[DNSKEY, CDNSKEY]) -> int:
     """
 
     rdata = key.to_wire()
+    assert rdata is not None  # for mypy
     if key.algorithm == Algorithm.RSAMD5:
         return (rdata[-3] << 8) + rdata[-2]
     else:
@@ -134,16 +131,16 @@ class Policy:
     def __init__(self):
         pass
 
-    def ok_to_sign(self, _: DNSKEY) -> bool:  # pragma: no cover
+    def ok_to_sign(self, key: DNSKEY) -> bool:  # pragma: no cover
         return False
 
-    def ok_to_validate(self, _: DNSKEY) -> bool:  # pragma: no cover
+    def ok_to_validate(self, key: DNSKEY) -> bool:  # pragma: no cover
         return False
 
-    def ok_to_create_ds(self, _: DSDigest) -> bool:  # pragma: no cover
+    def ok_to_create_ds(self, algorithm: DSDigest) -> bool:  # pragma: no cover
         return False
 
-    def ok_to_validate_ds(self, _: DSDigest) -> bool:  # pragma: no cover
+    def ok_to_validate_ds(self, algorithm: DSDigest) -> bool:  # pragma: no cover
         return False
 
 
@@ -182,11 +179,11 @@ def ok_to_validate_ds(self, algorithm: DSDigest) -> bool:
 
 
 def make_ds(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     key: dns.rdata.Rdata,
-    algorithm: Union[DSDigest, str],
-    origin: Optional[dns.name.Name] = None,
-    policy: Optional[Policy] = None,
+    algorithm: DSDigest | str,
+    origin: dns.name.Name | None = None,
+    policy: Policy | None = None,
     validating: bool = False,
 ) -> DS:
     """Create a DS record for a DNSSEC key.
@@ -224,15 +221,15 @@ def make_ds(
         if isinstance(algorithm, str):
             algorithm = DSDigest[algorithm.upper()]
     except Exception:
-        raise UnsupportedAlgorithm('unsupported algorithm "%s"' % algorithm)
+        raise UnsupportedAlgorithm(f'unsupported algorithm "{algorithm}"')
     if validating:
         check = policy.ok_to_validate_ds
     else:
         check = policy.ok_to_create_ds
     if not check(algorithm):
         raise DeniedByPolicy
-    if not isinstance(key, (DNSKEY, CDNSKEY)):
-        raise ValueError("key is not a DNSKEY/CDNSKEY")
+    if not isinstance(key, DNSKEY | CDNSKEY):
+        raise ValueError("key is not a DNSKEY | CDNSKEY")
     if algorithm == DSDigest.SHA1:
         dshash = hashlib.sha1()
     elif algorithm == DSDigest.SHA256:
@@ -240,14 +237,15 @@ def make_ds(
     elif algorithm == DSDigest.SHA384:
         dshash = hashlib.sha384()
     else:
-        raise UnsupportedAlgorithm('unsupported algorithm "%s"' % algorithm)
+        raise UnsupportedAlgorithm(f'unsupported algorithm "{algorithm}"')
 
     if isinstance(name, str):
         name = dns.name.from_text(name, origin)
     wire = name.canonicalize().to_wire()
-    assert wire is not None
+    kwire = key.to_wire(origin=origin)
+    assert wire is not None and kwire is not None  # for mypy
     dshash.update(wire)
-    dshash.update(key.to_wire(origin=origin))
+    dshash.update(kwire)
     digest = dshash.digest()
 
     dsrdata = struct.pack("!HBB", key_id(key), key.algorithm, algorithm) + digest
@@ -258,10 +256,10 @@ def make_ds(
 
 
 def make_cds(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     key: dns.rdata.Rdata,
-    algorithm: Union[DSDigest, str],
-    origin: Optional[dns.name.Name] = None,
+    algorithm: DSDigest | str,
+    origin: dns.name.Name | None = None,
 ) -> CDS:
     """Create a CDS record for a DNSSEC key.
 
@@ -294,8 +292,8 @@ def make_cds(
 
 
 def _find_candidate_keys(
-    keys: Dict[dns.name.Name, Union[dns.rdataset.Rdataset, dns.node.Node]], rrsig: RRSIG
-) -> Optional[List[DNSKEY]]:
+    keys: Dict[dns.name.Name, dns.rdataset.Rdataset | dns.node.Node], rrsig: RRSIG
+) -> List[DNSKEY] | None:
     value = keys.get(rrsig.signer)
     if isinstance(value, dns.node.Node):
         rdataset = value.get_rdataset(dns.rdataclass.IN, dns.rdatatype.DNSKEY)
@@ -314,7 +312,7 @@ def _find_candidate_keys(
 
 
 def _get_rrname_rdataset(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
+    rrset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
 ) -> Tuple[dns.name.Name, dns.rdataset.Rdataset]:
     if isinstance(rrset, tuple):
         return rrset[0], rrset[1]
@@ -323,6 +321,7 @@ def _get_rrname_rdataset(
 
 
 def _validate_signature(sig: bytes, data: bytes, key: DNSKEY) -> None:
+    # pylint: disable=possibly-used-before-assignment
     public_cls = get_algorithm_cls_from_dnskey(key).public_cls
     try:
         public_key = public_cls.from_dnskey(key)
@@ -332,12 +331,12 @@ def _validate_signature(sig: bytes, data: bytes, key: DNSKEY) -> None:
 
 
 def _validate_rrsig(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
+    rrset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
     rrsig: RRSIG,
-    keys: Dict[dns.name.Name, Union[dns.node.Node, dns.rdataset.Rdataset]],
-    origin: Optional[dns.name.Name] = None,
-    now: Optional[float] = None,
-    policy: Optional[Policy] = None,
+    keys: Dict[dns.name.Name, dns.node.Node | dns.rdataset.Rdataset],
+    origin: dns.name.Name | None = None,
+    now: float | None = None,
+    policy: Policy | None = None,
 ) -> None:
     """Validate an RRset against a single signature rdata, throwing an
     exception if validation is not successful.
@@ -387,6 +386,7 @@ def _validate_rrsig(
 
     data = _make_rrsig_signature_data(rrset, rrsig, origin)
 
+    # pylint: disable=possibly-used-before-assignment
     for candidate_key in candidate_keys:
         if not policy.ok_to_validate(candidate_key):
             continue
@@ -401,12 +401,12 @@ def _validate_rrsig(
 
 
 def _validate(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    rrsigset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    keys: Dict[dns.name.Name, Union[dns.node.Node, dns.rdataset.Rdataset]],
-    origin: Optional[dns.name.Name] = None,
-    now: Optional[float] = None,
-    policy: Optional[Policy] = None,
+    rrset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
+    rrsigset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
+    keys: Dict[dns.name.Name, dns.node.Node | dns.rdataset.Rdataset],
+    origin: dns.name.Name | None = None,
+    now: float | None = None,
+    policy: Policy | None = None,
 ) -> None:
     """Validate an RRset against a signature RRset, throwing an exception
     if none of the signatures validate.
@@ -474,16 +474,17 @@ def _validate(
 
 
 def _sign(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
+    rrset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
     private_key: PrivateKey,
     signer: dns.name.Name,
     dnskey: DNSKEY,
-    inception: Optional[Union[datetime, str, int, float]] = None,
-    expiration: Optional[Union[datetime, str, int, float]] = None,
-    lifetime: Optional[int] = None,
+    inception: datetime | str | int | float | None = None,
+    expiration: datetime | str | int | float | None = None,
+    lifetime: int | None = None,
     verify: bool = False,
-    policy: Optional[Policy] = None,
-    origin: Optional[dns.name.Name] = None,
+    policy: Policy | None = None,
+    origin: dns.name.Name | None = None,
+    deterministic: bool = True,
 ) -> RRSIG:
     """Sign RRset using private key.
 
@@ -523,6 +524,10 @@ def _sign(
     names in the rrset (including its owner name) must be absolute; otherwise the
     specified origin will be used to make names absolute when signing.
 
+    *deterministic*, a ``bool``. If ``True``, the default, use deterministic
+    (reproducible) signatures when supported by the algorithm used for signing.
+    Currently, this only affects ECDSA.
+
     Raises ``DeniedByPolicy`` if the signature is denied by policy.
     """
 
@@ -578,8 +583,9 @@ def _sign(
         signature=b"",
     )
 
-    data = dns.dnssec._make_rrsig_signature_data(rrset, rrsig_template, origin)
+    data = _make_rrsig_signature_data(rrset, rrsig_template, origin)
 
+    # pylint: disable=possibly-used-before-assignment
     if isinstance(private_key, GenericPrivateKey):
         signing_key = private_key
     else:
@@ -589,15 +595,15 @@ def _sign(
         except UnsupportedAlgorithm:
             raise TypeError("Unsupported key algorithm")
 
-    signature = signing_key.sign(data, verify)
+    signature = signing_key.sign(data, verify, deterministic)
 
     return cast(RRSIG, rrsig_template.replace(signature=signature))
 
 
 def _make_rrsig_signature_data(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
+    rrset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
     rrsig: RRSIG,
-    origin: Optional[dns.name.Name] = None,
+    origin: dns.name.Name | None = None,
 ) -> bytes:
     """Create signature rdata.
 
@@ -629,7 +635,9 @@ def _make_rrsig_signature_data(
     rrname, rdataset = _get_rrname_rdataset(rrset)
 
     data = b""
-    data += rrsig.to_wire(origin=signer)[:18]
+    wire = rrsig.to_wire(origin=signer)
+    assert wire is not None  # for mypy
+    data += wire[:18]
     data += rrsig.signer.to_digestable(signer)
 
     # Derelativize the name before considering labels.
@@ -661,7 +669,7 @@ def _make_rrsig_signature_data(
 
 def _make_dnskey(
     public_key: PublicKey,
-    algorithm: Union[int, str],
+    algorithm: int | str,
     flags: int = Flag.ZONE,
     protocol: int = 3,
 ) -> DNSKEY:
@@ -686,6 +694,7 @@ def _make_dnskey(
 
     algorithm = Algorithm.make(algorithm)
 
+    # pylint: disable=possibly-used-before-assignment
     if isinstance(public_key, GenericPublicKey):
         return public_key.to_dnskey(flags=flags, protocol=protocol)
     else:
@@ -695,7 +704,7 @@ def _make_dnskey(
 
 def _make_cdnskey(
     public_key: PublicKey,
-    algorithm: Union[int, str],
+    algorithm: int | str,
     flags: int = Flag.ZONE,
     protocol: int = 3,
 ) -> CDNSKEY:
@@ -732,10 +741,10 @@ def _make_cdnskey(
 
 
 def nsec3_hash(
-    domain: Union[dns.name.Name, str],
-    salt: Optional[Union[str, bytes]],
+    domain: dns.name.Name | str,
+    salt: str | bytes | None,
     iterations: int,
-    algorithm: Union[int, str],
+    algorithm: int | str,
 ) -> str:
     """
     Calculate the NSEC3 hash, according to
@@ -793,9 +802,9 @@ def nsec3_hash(
 
 
 def make_ds_rdataset(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    algorithms: Set[Union[DSDigest, str]],
-    origin: Optional[dns.name.Name] = None,
+    rrset: dns.rrset.RRset | Tuple[dns.name.Name, dns.rdataset.Rdataset],
+    algorithms: Set[DSDigest | str],
+    origin: dns.name.Name | None = None,
 ) -> dns.rdataset.Rdataset:
     """Create a DS record from DNSKEY/CDNSKEY/CDS.
 
@@ -832,7 +841,7 @@ def make_ds_rdataset(
             if isinstance(algorithm, str):
                 algorithm = DSDigest[algorithm.upper()]
         except Exception:
-            raise UnsupportedAlgorithm('unsupported algorithm "%s"' % algorithm)
+            raise UnsupportedAlgorithm(f'unsupported algorithm "{algorithm}"')
         _algorithms.add(algorithm)
 
     if rdataset.rdtype == dns.rdatatype.CDS:
@@ -880,10 +889,10 @@ def cds_rdataset_to_ds_rdataset(
 
 
 def dnskey_rdataset_to_cds_rdataset(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     rdataset: dns.rdataset.Rdataset,
-    algorithm: Union[DSDigest, str],
-    origin: Optional[dns.name.Name] = None,
+    algorithm: DSDigest | str,
+    origin: dns.name.Name | None = None,
 ) -> dns.rdataset.Rdataset:
     """Create a CDS record from DNSKEY/CDNSKEY.
 
@@ -945,11 +954,12 @@ def default_rrset_signer(
     signer: dns.name.Name,
     ksks: List[Tuple[PrivateKey, DNSKEY]],
     zsks: List[Tuple[PrivateKey, DNSKEY]],
-    inception: Optional[Union[datetime, str, int, float]] = None,
-    expiration: Optional[Union[datetime, str, int, float]] = None,
-    lifetime: Optional[int] = None,
-    policy: Optional[Policy] = None,
-    origin: Optional[dns.name.Name] = None,
+    inception: datetime | str | int | float | None = None,
+    expiration: datetime | str | int | float | None = None,
+    lifetime: int | None = None,
+    policy: Policy | None = None,
+    origin: dns.name.Name | None = None,
+    deterministic: bool = True,
 ) -> None:
     """Default RRset signer"""
 
@@ -965,7 +975,7 @@ def default_rrset_signer(
         keys = zsks
 
     for private_key, dnskey in keys:
-        rrsig = dns.dnssec.sign(
+        rrsig = sign(
             rrset=rrset,
             private_key=private_key,
             dnskey=dnskey,
@@ -975,22 +985,24 @@ def default_rrset_signer(
             signer=signer,
             policy=policy,
             origin=origin,
+            deterministic=deterministic,
         )
         txn.add(rrset.name, rrset.ttl, rrsig)
 
 
 def sign_zone(
     zone: dns.zone.Zone,
-    txn: Optional[dns.transaction.Transaction] = None,
-    keys: Optional[List[Tuple[PrivateKey, DNSKEY]]] = None,
+    txn: dns.transaction.Transaction | None = None,
+    keys: List[Tuple[PrivateKey, DNSKEY]] | None = None,
     add_dnskey: bool = True,
-    dnskey_ttl: Optional[int] = None,
-    inception: Optional[Union[datetime, str, int, float]] = None,
-    expiration: Optional[Union[datetime, str, int, float]] = None,
-    lifetime: Optional[int] = None,
-    nsec3: Optional[NSEC3PARAM] = None,
-    rrset_signer: Optional[RRsetSigner] = None,
-    policy: Optional[Policy] = None,
+    dnskey_ttl: int | None = None,
+    inception: datetime | str | int | float | None = None,
+    expiration: datetime | str | int | float | None = None,
+    lifetime: int | None = None,
+    nsec3: NSEC3PARAM | None = None,
+    rrset_signer: RRsetSigner | None = None,
+    policy: Policy | None = None,
+    deterministic: bool = True,
 ) -> None:
     """Sign zone.
 
@@ -1030,6 +1042,10 @@ def sign_zone(
     function requires two arguments: transaction and RRset. If the not specified,
     ``dns.dnssec.default_rrset_signer`` will be used.
 
+    *deterministic*, a ``bool``. If ``True``, the default, use deterministic
+    (reproducible) signatures when supported by the algorithm used for signing.
+    Currently, this only affects ECDSA.
+
     Returns ``None``.
     """
 
@@ -1056,6 +1072,9 @@ def sign_zone(
     else:
         cm = zone.writer()
 
+    if zone.origin is None:
+        raise ValueError("no zone origin")
+
     with cm as _txn:
         if add_dnskey:
             if dnskey_ttl is None:
@@ -1081,6 +1100,7 @@ def sign_zone(
                 lifetime=lifetime,
                 policy=policy,
                 origin=zone.origin,
+                deterministic=deterministic,
             )
             return _sign_zone_nsec(zone, _txn, _rrset_signer)
 
@@ -1088,17 +1108,17 @@ def sign_zone(
 def _sign_zone_nsec(
     zone: dns.zone.Zone,
     txn: dns.transaction.Transaction,
-    rrset_signer: Optional[RRsetSigner] = None,
+    rrset_signer: RRsetSigner | None = None,
 ) -> None:
     """NSEC zone signer"""
 
     def _txn_add_nsec(
         txn: dns.transaction.Transaction,
         name: dns.name.Name,
-        next_secure: Optional[dns.name.Name],
+        next_secure: dns.name.Name | None,
         rdclass: dns.rdataclass.RdataClass,
         ttl: int,
-        rrset_signer: Optional[RRsetSigner] = None,
+        rrset_signer: RRsetSigner | None = None,
     ) -> None:
         """NSEC zone signer helper"""
         mandatory_types = set(
@@ -1124,7 +1144,7 @@ def _txn_add_nsec(
             if rrset_signer:
                 rrset_signer(txn, rrset)
 
-    rrsig_ttl = zone.get_soa().minimum
+    rrsig_ttl = zone.get_soa(txn).minimum
     delegation = None
     last_secure = None
 
@@ -1172,7 +1192,6 @@ def _need_pyca(*args, **kwargs):
 
 if dns._features.have("dnssec"):
     from cryptography.exceptions import InvalidSignature
-    from cryptography.hazmat.primitives.asymmetric import dsa  # pylint: disable=W0611
     from cryptography.hazmat.primitives.asymmetric import ec  # pylint: disable=W0611
     from cryptography.hazmat.primitives.asymmetric import ed448  # pylint: disable=W0611
     from cryptography.hazmat.primitives.asymmetric import rsa  # pylint: disable=W0611
diff --git a/libs/dns/dnssecalgs/__init__.py b/libs/dns/dnssecalgs/__init__.py
index 3d9181a761..0810b19a64 100644
--- a/libs/dns/dnssecalgs/__init__.py
+++ b/libs/dns/dnssecalgs/__init__.py
@@ -1,11 +1,14 @@
-from typing import Dict, Optional, Tuple, Type, Union
+from typing import Dict, Tuple, Type
 
+import dns._features
 import dns.name
 from dns.dnssecalgs.base import GenericPrivateKey
 from dns.dnssectypes import Algorithm
 from dns.exception import UnsupportedAlgorithm
 from dns.rdtypes.ANY.DNSKEY import DNSKEY
 
+# pyright: reportPossiblyUnboundVariable=false
+
 if dns._features.have("dnssec"):
     from dns.dnssecalgs.dsa import PrivateDSA, PrivateDSANSEC3SHA1
     from dns.dnssecalgs.ecdsa import PrivateECDSAP256SHA256, PrivateECDSAP384SHA384
@@ -22,10 +25,11 @@
 else:
     _have_cryptography = False
 
-AlgorithmPrefix = Optional[Union[bytes, dns.name.Name]]
+AlgorithmPrefix = bytes | dns.name.Name | None
 
 algorithms: Dict[Tuple[Algorithm, AlgorithmPrefix], Type[GenericPrivateKey]] = {}
 if _have_cryptography:
+    # pylint: disable=possibly-used-before-assignment
     algorithms.update(
         {
             (Algorithm.RSAMD5, None): PrivateRSAMD5,
@@ -44,7 +48,7 @@
 
 
 def get_algorithm_cls(
-    algorithm: Union[int, str], prefix: AlgorithmPrefix = None
+    algorithm: int | str, prefix: AlgorithmPrefix = None
 ) -> Type[GenericPrivateKey]:
     """Get Private Key class from Algorithm.
 
@@ -59,7 +63,7 @@ def get_algorithm_cls(
     if cls:
         return cls
     raise UnsupportedAlgorithm(
-        'algorithm "%s" not supported by dnspython' % Algorithm.to_text(algorithm)
+        f'algorithm "{Algorithm.to_text(algorithm)}" not supported by dnspython'
     )
 
 
@@ -82,10 +86,10 @@ def get_algorithm_cls_from_dnskey(dnskey: DNSKEY) -> Type[GenericPrivateKey]:
 
 
 def register_algorithm_cls(
-    algorithm: Union[int, str],
+    algorithm: int | str,
     algorithm_cls: Type[GenericPrivateKey],
-    name: Optional[Union[dns.name.Name, str]] = None,
-    oid: Optional[bytes] = None,
+    name: dns.name.Name | str | None = None,
+    oid: bytes | None = None,
 ) -> None:
     """Register Algorithm Private Key class.
 
diff --git a/libs/dns/dnssecalgs/base.py b/libs/dns/dnssecalgs/base.py
index e990575a30..0334fe6b57 100644
--- a/libs/dns/dnssecalgs/base.py
+++ b/libs/dns/dnssecalgs/base.py
@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod  # pylint: disable=no-name-in-module
-from typing import Any, Optional, Type
+from typing import Any, Type
 
 import dns.rdataclass
 import dns.rdatatype
@@ -65,7 +65,12 @@ def __init__(self, key: Any) -> None:
         pass
 
     @abstractmethod
-    def sign(self, data: bytes, verify: bool = False) -> bytes:
+    def sign(
+        self,
+        data: bytes,
+        verify: bool = False,
+        deterministic: bool = True,
+    ) -> bytes:
         """Sign DNSSEC data"""
 
     @abstractmethod
@@ -75,10 +80,10 @@ def public_key(self) -> "GenericPublicKey":
     @classmethod
     @abstractmethod
     def from_pem(
-        cls, private_pem: bytes, password: Optional[bytes] = None
+        cls, private_pem: bytes, password: bytes | None = None
     ) -> "GenericPrivateKey":
         """Create private key from PEM-encoded PKCS#8"""
 
     @abstractmethod
-    def to_pem(self, password: Optional[bytes] = None) -> bytes:
+    def to_pem(self, password: bytes | None = None) -> bytes:
         """Return private key as PEM-encoded PKCS#8"""
diff --git a/libs/dns/dnssecalgs/cryptography.py b/libs/dns/dnssecalgs/cryptography.py
index 5a31a8123d..a5dde6a4af 100644
--- a/libs/dns/dnssecalgs/cryptography.py
+++ b/libs/dns/dnssecalgs/cryptography.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, Type
+from typing import Any, Type
 
 from cryptography.hazmat.primitives import serialization
 
@@ -34,7 +34,7 @@ def to_pem(self) -> bytes:
 class CryptographyPrivateKey(GenericPrivateKey):
     key: Any = None
     key_cls: Any = None
-    public_cls: Type[CryptographyPublicKey]
+    public_cls: Type[CryptographyPublicKey]  # pyright: ignore
 
     def __init__(self, key: Any) -> None:  # pylint: disable=super-init-not-called
         if self.key_cls is None:
@@ -50,12 +50,12 @@ def public_key(self) -> "CryptographyPublicKey":
 
     @classmethod
     def from_pem(
-        cls, private_pem: bytes, password: Optional[bytes] = None
+        cls, private_pem: bytes, password: bytes | None = None
     ) -> "GenericPrivateKey":
         key = serialization.load_pem_private_key(private_pem, password=password)
         return cls(key=key)
 
-    def to_pem(self, password: Optional[bytes] = None) -> bytes:
+    def to_pem(self, password: bytes | None = None) -> bytes:
         encryption_algorithm: serialization.KeySerializationEncryption
         if password:
             encryption_algorithm = serialization.BestAvailableEncryption(password)
diff --git a/libs/dns/dnssecalgs/dsa.py b/libs/dns/dnssecalgs/dsa.py
index 0fe4690d39..a4eb987909 100644
--- a/libs/dns/dnssecalgs/dsa.py
+++ b/libs/dns/dnssecalgs/dsa.py
@@ -68,12 +68,19 @@ class PrivateDSA(CryptographyPrivateKey):
     key_cls = dsa.DSAPrivateKey
     public_cls = PublicDSA
 
-    def sign(self, data: bytes, verify: bool = False) -> bytes:
+    def sign(
+        self,
+        data: bytes,
+        verify: bool = False,
+        deterministic: bool = True,
+    ) -> bytes:
         """Sign using a private key per RFC 2536, section 3."""
         public_dsa_key = self.key.public_key()
         if public_dsa_key.key_size > 1024:
             raise ValueError("DSA key size overflow")
-        der_signature = self.key.sign(data, self.public_cls.chosen_hash)
+        der_signature = self.key.sign(
+            data, self.public_cls.chosen_hash  # pyright: ignore
+        )
         dsa_r, dsa_s = utils.decode_dss_signature(der_signature)
         dsa_t = (public_dsa_key.key_size // 8 - 64) // 8
         octets = 20
diff --git a/libs/dns/dnssecalgs/ecdsa.py b/libs/dns/dnssecalgs/ecdsa.py
index a31d79f2b8..e3f3f061d4 100644
--- a/libs/dns/dnssecalgs/ecdsa.py
+++ b/libs/dns/dnssecalgs/ecdsa.py
@@ -47,13 +47,24 @@ class PrivateECDSA(CryptographyPrivateKey):
     key_cls = ec.EllipticCurvePrivateKey
     public_cls = PublicECDSA
 
-    def sign(self, data: bytes, verify: bool = False) -> bytes:
+    def sign(
+        self,
+        data: bytes,
+        verify: bool = False,
+        deterministic: bool = True,
+    ) -> bytes:
         """Sign using a private key per RFC 6605, section 4."""
-        der_signature = self.key.sign(data, ec.ECDSA(self.public_cls.chosen_hash))
+        algorithm = ec.ECDSA(
+            self.public_cls.chosen_hash,  # pyright: ignore
+            deterministic_signing=deterministic,
+        )
+        der_signature = self.key.sign(data, algorithm)
         dsa_r, dsa_s = utils.decode_dss_signature(der_signature)
         signature = int.to_bytes(
-            dsa_r, length=self.public_cls.octets, byteorder="big"
-        ) + int.to_bytes(dsa_s, length=self.public_cls.octets, byteorder="big")
+            dsa_r, length=self.public_cls.octets, byteorder="big"  # pyright: ignore
+        ) + int.to_bytes(
+            dsa_s, length=self.public_cls.octets, byteorder="big"  # pyright: ignore
+        )
         if verify:
             self.public_key().verify(signature, data)
         return signature
@@ -62,7 +73,7 @@ def sign(self, data: bytes, verify: bool = False) -> bytes:
     def generate(cls) -> "PrivateECDSA":
         return cls(
             key=ec.generate_private_key(
-                curve=cls.public_cls.curve, backend=default_backend()
+                curve=cls.public_cls.curve, backend=default_backend()  # pyright: ignore
             ),
         )
 
diff --git a/libs/dns/dnssecalgs/eddsa.py b/libs/dns/dnssecalgs/eddsa.py
index 7050534239..1cbb407960 100644
--- a/libs/dns/dnssecalgs/eddsa.py
+++ b/libs/dns/dnssecalgs/eddsa.py
@@ -27,9 +27,14 @@ def from_dnskey(cls, key: DNSKEY) -> "PublicEDDSA":
 
 
 class PrivateEDDSA(CryptographyPrivateKey):
-    public_cls: Type[PublicEDDSA]
-
-    def sign(self, data: bytes, verify: bool = False) -> bytes:
+    public_cls: Type[PublicEDDSA]  # pyright: ignore
+
+    def sign(
+        self,
+        data: bytes,
+        verify: bool = False,
+        deterministic: bool = True,
+    ) -> bytes:
         """Sign using a private key per RFC 8080, section 4."""
         signature = self.key.sign(data)
         if verify:
diff --git a/libs/dns/dnssecalgs/rsa.py b/libs/dns/dnssecalgs/rsa.py
index e95dcf1ddc..de9160bb3a 100644
--- a/libs/dns/dnssecalgs/rsa.py
+++ b/libs/dns/dnssecalgs/rsa.py
@@ -56,9 +56,16 @@ class PrivateRSA(CryptographyPrivateKey):
     public_cls = PublicRSA
     default_public_exponent = 65537
 
-    def sign(self, data: bytes, verify: bool = False) -> bytes:
+    def sign(
+        self,
+        data: bytes,
+        verify: bool = False,
+        deterministic: bool = True,
+    ) -> bytes:
         """Sign using a private key per RFC 3110, section 3."""
-        signature = self.key.sign(data, padding.PKCS1v15(), self.public_cls.chosen_hash)
+        signature = self.key.sign(
+            data, padding.PKCS1v15(), self.public_cls.chosen_hash  # pyright: ignore
+        )
         if verify:
             self.public_key().verify(signature, data)
         return signature
diff --git a/libs/dns/e164.py b/libs/dns/e164.py
index 453736d408..942d2c0fbf 100644
--- a/libs/dns/e164.py
+++ b/libs/dns/e164.py
@@ -17,7 +17,7 @@
 
 """DNS E.164 helpers."""
 
-from typing import Iterable, Optional, Union
+from typing import Iterable
 
 import dns.exception
 import dns.name
@@ -28,7 +28,7 @@
 
 
 def from_e164(
-    text: str, origin: Optional[dns.name.Name] = public_enum_domain
+    text: str, origin: dns.name.Name | None = public_enum_domain
 ) -> dns.name.Name:
     """Convert an E.164 number in textual form into a Name object whose
     value is the ENUM domain name for that number.
@@ -51,7 +51,7 @@ def from_e164(
 
 def to_e164(
     name: dns.name.Name,
-    origin: Optional[dns.name.Name] = public_enum_domain,
+    origin: dns.name.Name | None = public_enum_domain,
     want_plus_prefix: bool = True,
 ) -> str:
     """Convert an ENUM domain name into an E.164 number.
@@ -87,8 +87,8 @@ def to_e164(
 
 def query(
     number: str,
-    domains: Iterable[Union[dns.name.Name, str]],
-    resolver: Optional[dns.resolver.Resolver] = None,
+    domains: Iterable[dns.name.Name | str],
+    resolver: dns.resolver.Resolver | None = None,
 ) -> dns.resolver.Answer:
     """Look for NAPTR RRs for the specified number in the specified domains.
 
@@ -108,7 +108,7 @@ def query(
     for domain in domains:
         if isinstance(domain, str):
             domain = dns.name.from_text(domain)
-        qname = dns.e164.from_e164(number, domain)
+        qname = from_e164(number, domain)
         try:
             return resolver.resolve(qname, "NAPTR")
         except dns.resolver.NXDOMAIN as e:
diff --git a/libs/dns/edns.py b/libs/dns/edns.py
index 776e5eeba7..eb985484b9 100644
--- a/libs/dns/edns.py
+++ b/libs/dns/edns.py
@@ -21,15 +21,20 @@
 import math
 import socket
 import struct
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict
 
 import dns.enum
 import dns.inet
+import dns.ipv4
+import dns.ipv6
+import dns.name
 import dns.rdata
 import dns.wire
 
 
 class OptionType(dns.enum.IntEnum):
+    """EDNS option type codes"""
+
     #: NSID
     NSID = 3
     #: DAU
@@ -52,6 +57,8 @@ class OptionType(dns.enum.IntEnum):
     CHAIN = 13
     #: EDE (extended-dns-error)
     EDE = 15
+    #: REPORTCHANNEL
+    REPORTCHANNEL = 18
 
     @classmethod
     def _maximum(cls):
@@ -61,14 +68,14 @@ def _maximum(cls):
 class Option:
     """Base class for all EDNS option types."""
 
-    def __init__(self, otype: Union[OptionType, str]):
+    def __init__(self, otype: OptionType | str):
         """Initialize an option.
 
         *otype*, a ``dns.edns.OptionType``, is the option type.
         """
         self.otype = OptionType.make(otype)
 
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
+    def to_wire(self, file: Any | None = None) -> bytes | None:
         """Convert an option to wire format.
 
         Returns a ``bytes`` or ``None``.
@@ -79,6 +86,15 @@ def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
     def to_text(self) -> str:
         raise NotImplementedError  # pragma: no cover
 
+    def to_generic(self) -> "GenericOption":
+        """Creates a dns.edns.GenericOption equivalent of this rdata.
+
+        Returns a ``dns.edns.GenericOption``.
+        """
+        wire = self.to_wire()
+        assert wire is not None  # for mypy
+        return GenericOption(self.otype, wire)
+
     @classmethod
     def from_wire_parser(cls, otype: OptionType, parser: "dns.wire.Parser") -> "Option":
         """Build an EDNS option object from wire format.
@@ -150,11 +166,11 @@ class GenericOption(Option):  # lgtm[py/missing-equals]
     implementation.
     """
 
-    def __init__(self, otype: Union[OptionType, str], data: Union[bytes, str]):
+    def __init__(self, otype: OptionType | str, data: bytes | str):
         super().__init__(otype)
         self.data = dns.rdata.Rdata._as_bytes(data, True)
 
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
+    def to_wire(self, file: Any | None = None) -> bytes | None:
         if file:
             file.write(self.data)
             return None
@@ -162,11 +178,14 @@ def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
             return self.data
 
     def to_text(self) -> str:
-        return "Generic %d" % self.otype
+        return f"Generic {self.otype}"
+
+    def to_generic(self) -> "GenericOption":
+        return self
 
     @classmethod
     def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: "dns.wire.Parser"
+        cls, otype: OptionType | str, parser: "dns.wire.Parser"
     ) -> Option:
         return cls(otype, parser.get_remaining())
 
@@ -174,7 +193,7 @@ def from_wire_parser(
 class ECSOption(Option):  # lgtm[py/missing-equals]
     """EDNS Client Subnet (ECS, RFC7871)"""
 
-    def __init__(self, address: str, srclen: Optional[int] = None, scopelen: int = 0):
+    def __init__(self, address: str, srclen: int | None = None, scopelen: int = 0):
         """*address*, a ``str``, is the client address information.
 
         *srclen*, an ``int``, the source prefix length, which is the
@@ -222,7 +241,7 @@ def __init__(self, address: str, srclen: Optional[int] = None, scopelen: int = 0
             self.addrdata = self.addrdata[:-1] + last
 
     def to_text(self) -> str:
-        return "ECS {}/{} scope/{}".format(self.address, self.srclen, self.scopelen)
+        return f"ECS {self.address}/{self.srclen} scope/{self.scopelen}"
 
     @staticmethod
     def from_text(text: str) -> Option:
@@ -255,10 +274,10 @@ def from_text(text: str) -> Option:
             ecs_text = tokens[0]
         elif len(tokens) == 2:
             if tokens[0] != optional_prefix:
-                raise ValueError('could not parse ECS from "{}"'.format(text))
+                raise ValueError(f'could not parse ECS from "{text}"')
             ecs_text = tokens[1]
         else:
-            raise ValueError('could not parse ECS from "{}"'.format(text))
+            raise ValueError(f'could not parse ECS from "{text}"')
         n_slashes = ecs_text.count("/")
         if n_slashes == 1:
             address, tsrclen = ecs_text.split("/")
@@ -266,22 +285,20 @@ def from_text(text: str) -> Option:
         elif n_slashes == 2:
             address, tsrclen, tscope = ecs_text.split("/")
         else:
-            raise ValueError('could not parse ECS from "{}"'.format(text))
+            raise ValueError(f'could not parse ECS from "{text}"')
         try:
             scope = int(tscope)
         except ValueError:
-            raise ValueError(
-                "invalid scope " + '"{}": scope must be an integer'.format(tscope)
-            )
+            raise ValueError("invalid scope " + f'"{tscope}": scope must be an integer')
         try:
             srclen = int(tsrclen)
         except ValueError:
             raise ValueError(
-                "invalid srclen " + '"{}": srclen must be an integer'.format(tsrclen)
+                "invalid srclen " + f'"{tsrclen}": srclen must be an integer'
             )
         return ECSOption(address, srclen, scope)
 
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
+    def to_wire(self, file: Any | None = None) -> bytes | None:
         value = (
             struct.pack("!HBB", self.family, self.srclen, self.scopelen) + self.addrdata
         )
@@ -293,7 +310,7 @@ def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
 
     @classmethod
     def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: "dns.wire.Parser"
+        cls, otype: OptionType | str, parser: "dns.wire.Parser"
     ) -> Option:
         family, src, scope = parser.get_struct("!HBB")
         addrlen = int(math.ceil(src / 8.0))
@@ -311,6 +328,8 @@ def from_wire_parser(
 
 
 class EDECode(dns.enum.IntEnum):
+    """Extended DNS Error (EDE) codes"""
+
     OTHER = 0
     UNSUPPORTED_DNSKEY_ALGORITHM = 1
     UNSUPPORTED_DS_DIGEST_TYPE = 2
@@ -347,7 +366,7 @@ class EDEOption(Option):  # lgtm[py/missing-equals]
 
     _preserve_case = {"DNSKEY", "DS", "DNSSEC", "RRSIGs", "NSEC", "NXDOMAIN"}
 
-    def __init__(self, code: Union[EDECode, str], text: Optional[str] = None):
+    def __init__(self, code: EDECode | str, text: str | None = None):
         """*code*, a ``dns.edns.EDECode`` or ``str``, the info code of the
         extended error.
 
@@ -375,7 +394,7 @@ def to_text(self) -> str:
             output += f": {self.text}"
         return output
 
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
+    def to_wire(self, file: Any | None = None) -> bytes | None:
         value = struct.pack("!H", self.code)
         if self.text is not None:
             value += self.text.encode("utf8")
@@ -388,7 +407,7 @@ def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
 
     @classmethod
     def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: "dns.wire.Parser"
+        cls, otype: OptionType | str, parser: "dns.wire.Parser"
     ) -> Option:
         code = EDECode.make(parser.get_uint16())
         text = parser.get_remaining()
@@ -408,7 +427,7 @@ def __init__(self, nsid: bytes):
         super().__init__(OptionType.NSID)
         self.nsid = nsid
 
-    def to_wire(self, file: Any = None) -> Optional[bytes]:
+    def to_wire(self, file: Any = None) -> bytes | None:
         if file:
             file.write(self.nsid)
             return None
@@ -425,15 +444,70 @@ def to_text(self) -> str:
 
     @classmethod
     def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: dns.wire.Parser
+        cls, otype: OptionType | str, parser: dns.wire.Parser
     ) -> Option:
         return cls(parser.get_remaining())
 
 
+class CookieOption(Option):
+    def __init__(self, client: bytes, server: bytes):
+        super().__init__(OptionType.COOKIE)
+        self.client = client
+        self.server = server
+        if len(client) != 8:
+            raise ValueError("client cookie must be 8 bytes")
+        if len(server) != 0 and (len(server) < 8 or len(server) > 32):
+            raise ValueError("server cookie must be empty or between 8 and 32 bytes")
+
+    def to_wire(self, file: Any = None) -> bytes | None:
+        if file:
+            file.write(self.client)
+            if len(self.server) > 0:
+                file.write(self.server)
+            return None
+        else:
+            return self.client + self.server
+
+    def to_text(self) -> str:
+        client = binascii.hexlify(self.client).decode()
+        if len(self.server) > 0:
+            server = binascii.hexlify(self.server).decode()
+        else:
+            server = ""
+        return f"COOKIE {client}{server}"
+
+    @classmethod
+    def from_wire_parser(
+        cls, otype: OptionType | str, parser: dns.wire.Parser
+    ) -> Option:
+        return cls(parser.get_bytes(8), parser.get_remaining())
+
+
+class ReportChannelOption(Option):
+    # RFC 9567
+    def __init__(self, agent_domain: dns.name.Name):
+        super().__init__(OptionType.REPORTCHANNEL)
+        self.agent_domain = agent_domain
+
+    def to_wire(self, file: Any = None) -> bytes | None:
+        return self.agent_domain.to_wire(file)
+
+    def to_text(self) -> str:
+        return "REPORTCHANNEL " + self.agent_domain.to_text()
+
+    @classmethod
+    def from_wire_parser(
+        cls, otype: OptionType | str, parser: dns.wire.Parser
+    ) -> Option:
+        return cls(parser.get_name())
+
+
 _type_to_class: Dict[OptionType, Any] = {
     OptionType.ECS: ECSOption,
     OptionType.EDE: EDEOption,
     OptionType.NSID: NSIDOption,
+    OptionType.COOKIE: CookieOption,
+    OptionType.REPORTCHANNEL: ReportChannelOption,
 }
 
 
@@ -451,7 +525,7 @@ def get_option_class(otype: OptionType) -> Any:
 
 
 def option_from_wire_parser(
-    otype: Union[OptionType, str], parser: "dns.wire.Parser"
+    otype: OptionType | str, parser: "dns.wire.Parser"
 ) -> Option:
     """Build an EDNS option object from wire format.
 
@@ -468,7 +542,7 @@ def option_from_wire_parser(
 
 
 def option_from_wire(
-    otype: Union[OptionType, str], wire: bytes, current: int, olen: int
+    otype: OptionType | str, wire: bytes, current: int, olen: int
 ) -> Option:
     """Build an EDNS option object from wire format.
 
@@ -512,5 +586,6 @@ def register_type(implementation: Any, otype: OptionType) -> None:
 PADDING = OptionType.PADDING
 CHAIN = OptionType.CHAIN
 EDE = OptionType.EDE
+REPORTCHANNEL = OptionType.REPORTCHANNEL
 
 ### END generated OptionType constants
diff --git a/libs/dns/entropy.py b/libs/dns/entropy.py
index 4dcdc6272c..643092620b 100644
--- a/libs/dns/entropy.py
+++ b/libs/dns/entropy.py
@@ -20,7 +20,7 @@
 import random
 import threading
 import time
-from typing import Any, Optional
+from typing import Any
 
 
 class EntropyPool:
@@ -29,9 +29,9 @@ class EntropyPool:
     # leaving this code doesn't hurt anything as the library code
     # is used if present.
 
-    def __init__(self, seed: Optional[bytes] = None):
+    def __init__(self, seed: bytes | None = None):
         self.pool_index = 0
-        self.digest: Optional[bytearray] = None
+        self.digest: bytearray | None = None
         self.next_byte = 0
         self.lock = threading.Lock()
         self.hash = hashlib.sha1()
@@ -45,7 +45,7 @@ def __init__(self, seed: Optional[bytes] = None):
             self.seeded = False
             self.seed_pid = 0
 
-    def _stir(self, entropy: bytes) -> None:
+    def _stir(self, entropy: bytes | bytearray) -> None:
         for c in entropy:
             if self.pool_index == self.hash_len:
                 self.pool_index = 0
@@ -53,7 +53,7 @@ def _stir(self, entropy: bytes) -> None:
             self.pool[self.pool_index] ^= b
             self.pool_index += 1
 
-    def stir(self, entropy: bytes) -> None:
+    def stir(self, entropy: bytes | bytearray) -> None:
         with self.lock:
             self._stir(entropy)
 
@@ -109,7 +109,7 @@ def random_between(self, first: int, last: int) -> int:
 
 pool = EntropyPool()
 
-system_random: Optional[Any]
+system_random: Any | None
 try:
     system_random = random.SystemRandom()
 except Exception:  # pragma: no cover
diff --git a/libs/dns/enum.py b/libs/dns/enum.py
index 71461f1776..822c9958fc 100644
--- a/libs/dns/enum.py
+++ b/libs/dns/enum.py
@@ -16,7 +16,7 @@
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import enum
-from typing import Type, TypeVar, Union
+from typing import Any, Type, TypeVar
 
 TIntEnum = TypeVar("TIntEnum", bound="IntEnum")
 
@@ -25,9 +25,9 @@ class IntEnum(enum.IntEnum):
     @classmethod
     def _missing_(cls, value):
         cls._check_value(value)
-        val = int.__new__(cls, value)
+        val = int.__new__(cls, value)  # pyright: ignore
         val._name_ = cls._extra_to_text(value, None) or f"{cls._prefix()}{value}"
-        val._value_ = value
+        val._value_ = value  # pyright: ignore
         return val
 
     @classmethod
@@ -53,10 +53,7 @@ def from_text(cls: Type[TIntEnum], text: str) -> TIntEnum:
         if text.startswith(prefix) and text[len(prefix) :].isdigit():
             value = int(text[len(prefix) :])
             cls._check_value(value)
-            try:
-                return cls(value)
-            except ValueError:
-                return value
+            return cls(value)
         raise cls._unknown_exception_class()
 
     @classmethod
@@ -72,7 +69,7 @@ def to_text(cls: Type[TIntEnum], value: int) -> str:
         return text
 
     @classmethod
-    def make(cls: Type[TIntEnum], value: Union[int, str]) -> TIntEnum:
+    def make(cls: Type[TIntEnum], value: int | str) -> TIntEnum:
         """Convert text or a value into an enumerated type, if possible.
 
         *value*, the ``int`` or ``str`` to convert.
@@ -100,11 +97,11 @@ def _short_name(cls):
         return cls.__name__.lower()
 
     @classmethod
-    def _prefix(cls):
+    def _prefix(cls) -> str:
         return ""
 
     @classmethod
-    def _extra_from_text(cls, text):  # pylint: disable=W0613
+    def _extra_from_text(cls, text: str) -> Any | None:  # pylint: disable=W0613
         return None
 
     @classmethod
@@ -112,5 +109,5 @@ def _extra_to_text(cls, value, current_text):  # pylint: disable=W0613
         return current_text
 
     @classmethod
-    def _unknown_exception_class(cls):
+    def _unknown_exception_class(cls) -> Type[Exception]:
         return ValueError
diff --git a/libs/dns/exception.py b/libs/dns/exception.py
index 6982373de2..c3d42ffd3c 100644
--- a/libs/dns/exception.py
+++ b/libs/dns/exception.py
@@ -22,7 +22,7 @@
 """
 
 
-from typing import Optional, Set
+from typing import Set
 
 
 class DNSException(Exception):
@@ -48,9 +48,9 @@ class DNSException(Exception):
     and ``fmt`` class variables to get nice parametrized messages.
     """
 
-    msg: Optional[str] = None  # non-parametrized message
+    msg: str | None = None  # non-parametrized message
     supp_kwargs: Set[str] = set()  # accepted parameters for _fmt_kwargs (sanity check)
-    fmt: Optional[str] = None  # message parametrized with results from _fmt_kwargs
+    fmt: str | None = None  # message parametrized with results from _fmt_kwargs
 
     def __init__(self, *args, **kwargs):
         self._check_params(*args, **kwargs)
@@ -81,7 +81,7 @@ def _check_kwargs(self, **kwargs):
         if kwargs:
             assert (
                 set(kwargs.keys()) == self.supp_kwargs
-            ), "following set of keyword args is required: %s" % (self.supp_kwargs)
+            ), f"following set of keyword args is required: {self.supp_kwargs}"
         return kwargs
 
     def _fmt_kwargs(self, **kwargs):
@@ -92,7 +92,7 @@ def _fmt_kwargs(self, **kwargs):
         """
         fmtargs = {}
         for kw, data in kwargs.items():
-            if isinstance(data, (list, set)):
+            if isinstance(data, list | set):
                 # convert list of <someobj> to list of str(<someobj>)
                 fmtargs[kw] = list(map(str, data))
                 if len(fmtargs[kw]) == 1:
diff --git a/libs/dns/grange.py b/libs/dns/grange.py
index 3a52278feb..8d366dc8d6 100644
--- a/libs/dns/grange.py
+++ b/libs/dns/grange.py
@@ -19,7 +19,7 @@
 
 from typing import Tuple
 
-import dns
+import dns.exception
 
 
 def from_text(text: str) -> Tuple[int, int, int]:
@@ -54,7 +54,7 @@ def from_text(text: str) -> Tuple[int, int, int]:
         elif c.isdigit():
             cur += c
         else:
-            raise dns.exception.SyntaxError("Could not parse %s" % (c))
+            raise dns.exception.SyntaxError(f"Could not parse {c}")
 
     if state == 0:
         raise dns.exception.SyntaxError("no stop value specified")
diff --git a/libs/dns/inet.py b/libs/dns/inet.py
index 4a03f99622..765203b352 100644
--- a/libs/dns/inet.py
+++ b/libs/dns/inet.py
@@ -18,7 +18,7 @@
 """Generic Internet address helper functions."""
 
 import socket
-from typing import Any, Optional, Tuple
+from typing import Any, Tuple
 
 import dns.ipv4
 import dns.ipv6
@@ -135,9 +135,7 @@ def is_address(text: str) -> bool:
             return False
 
 
-def low_level_address_tuple(
-    high_tuple: Tuple[str, int], af: Optional[int] = None
-) -> Any:
+def low_level_address_tuple(high_tuple: Tuple[str, int], af: int | None = None) -> Any:
     """Given a "high-level" address tuple, i.e.
     an (address, port) return the appropriate "low-level" address tuple
     suitable for use in socket calls.
diff --git a/libs/dns/ipv4.py b/libs/dns/ipv4.py
index 65ee69c0d7..a7161bc791 100644
--- a/libs/dns/ipv4.py
+++ b/libs/dns/ipv4.py
@@ -18,7 +18,6 @@
 """IPv4 helper functions."""
 
 import struct
-from typing import Union
 
 import dns.exception
 
@@ -33,10 +32,10 @@ def inet_ntoa(address: bytes) -> str:
 
     if len(address) != 4:
         raise dns.exception.SyntaxError
-    return "%u.%u.%u.%u" % (address[0], address[1], address[2], address[3])
+    return f"{address[0]}.{address[1]}.{address[2]}.{address[3]}"
 
 
-def inet_aton(text: Union[str, bytes]) -> bytes:
+def inet_aton(text: str | bytes) -> bytes:
     """Convert an IPv4 address in text form to binary form.
 
     *text*, a ``str`` or ``bytes``, the IPv4 address in textual form.
@@ -64,7 +63,7 @@ def inet_aton(text: Union[str, bytes]) -> bytes:
         raise dns.exception.SyntaxError
 
 
-def canonicalize(text: Union[str, bytes]) -> str:
+def canonicalize(text: str | bytes) -> str:
     """Verify that *address* is a valid text form IPv4 address and return its
     canonical text form.
 
@@ -74,4 +73,4 @@ def canonicalize(text: Union[str, bytes]) -> str:
     """
     # Note that inet_aton() only accepts canonial form, but we still run through
     # inet_ntoa() to ensure the output is a str.
-    return dns.ipv4.inet_ntoa(dns.ipv4.inet_aton(text))
+    return inet_ntoa(inet_aton(text))
diff --git a/libs/dns/ipv6.py b/libs/dns/ipv6.py
index 44a1063936..eaa0f6c76f 100644
--- a/libs/dns/ipv6.py
+++ b/libs/dns/ipv6.py
@@ -19,7 +19,7 @@
 
 import binascii
 import re
-from typing import List, Union
+from typing import List
 
 import dns.exception
 import dns.ipv4
@@ -101,7 +101,7 @@ def inet_ntoa(address: bytes) -> str:
 _colon_colon_end = re.compile(rb".*::$")
 
 
-def inet_aton(text: Union[str, bytes], ignore_scope: bool = False) -> bytes:
+def inet_aton(text: str | bytes, ignore_scope: bool = False) -> bytes:
     """Convert an IPv6 address in text form to binary form.
 
     *text*, a ``str`` or ``bytes``, the IPv6 address in textual form.
@@ -143,9 +143,7 @@ def inet_aton(text: Union[str, bytes], ignore_scope: bool = False) -> bytes:
     if m is not None:
         b = dns.ipv4.inet_aton(m.group(2))
         btext = (
-            "{}:{:02x}{:02x}:{:02x}{:02x}".format(
-                m.group(1).decode(), b[0], b[1], b[2], b[3]
-            )
+            f"{m.group(1).decode()}:{b[0]:02x}{b[1]:02x}:{b[2]:02x}{b[3]:02x}"
         ).encode()
     #
     # Try to turn '::<whatever>' into ':<whatever>'; if no match try to
@@ -208,7 +206,7 @@ def is_mapped(address: bytes) -> bool:
     return address.startswith(_mapped_prefix)
 
 
-def canonicalize(text: Union[str, bytes]) -> str:
+def canonicalize(text: str | bytes) -> str:
     """Verify that *address* is a valid text form IPv6 address and return its
     canonical text form.  Addresses with scopes are rejected.
 
@@ -216,4 +214,4 @@ def canonicalize(text: Union[str, bytes]) -> str:
 
     Raises ``dns.exception.SyntaxError`` if the text is not valid.
     """
-    return dns.ipv6.inet_ntoa(dns.ipv6.inet_aton(text))
+    return inet_ntoa(inet_aton(text))
diff --git a/libs/dns/message.py b/libs/dns/message.py
index 44cacbd9c0..bbfccfc7ad 100644
--- a/libs/dns/message.py
+++ b/libs/dns/message.py
@@ -18,9 +18,10 @@
 """DNS Messages"""
 
 import contextlib
+import enum
 import io
 import time
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Tuple, cast
 
 import dns.edns
 import dns.entropy
@@ -34,9 +35,11 @@
 import dns.rdataclass
 import dns.rdatatype
 import dns.rdtypes.ANY.OPT
+import dns.rdtypes.ANY.SOA
 import dns.rdtypes.ANY.TSIG
 import dns.renderer
 import dns.rrset
+import dns.tokenizer
 import dns.tsig
 import dns.ttl
 import dns.wire
@@ -130,11 +133,11 @@ def __init__(self, exception: Exception, offset: int):
     dns.name.Name,
     dns.rdataclass.RdataClass,
     dns.rdatatype.RdataType,
-    Optional[dns.rdatatype.RdataType],
-    Optional[dns.rdataclass.RdataClass],
+    dns.rdatatype.RdataType | None,
+    dns.rdataclass.RdataClass | None,
 ]
 IndexType = Dict[IndexKeyType, dns.rrset.RRset]
-SectionType = Union[int, str, List[dns.rrset.RRset]]
+SectionType = int | str | List[dns.rrset.RRset]
 
 
 class Message:
@@ -142,25 +145,27 @@ class Message:
 
     _section_enum = MessageSection
 
-    def __init__(self, id: Optional[int] = None):
+    def __init__(self, id: int | None = None):
         if id is None:
             self.id = dns.entropy.random_16()
         else:
             self.id = id
         self.flags = 0
         self.sections: List[List[dns.rrset.RRset]] = [[], [], [], []]
-        self.opt: Optional[dns.rrset.RRset] = None
+        self.opt: dns.rrset.RRset | None = None
         self.request_payload = 0
         self.pad = 0
         self.keyring: Any = None
-        self.tsig: Optional[dns.rrset.RRset] = None
+        self.tsig: dns.rrset.RRset | None = None
+        self.want_tsig_sign = False
         self.request_mac = b""
         self.xfr = False
-        self.origin: Optional[dns.name.Name] = None
-        self.tsig_ctx: Optional[Any] = None
+        self.origin: dns.name.Name | None = None
+        self.tsig_ctx: Any | None = None
         self.index: IndexType = {}
         self.errors: List[MessageError] = []
         self.time = 0.0
+        self.wire: bytes | None = None
 
     @property
     def question(self) -> List[dns.rrset.RRset]:
@@ -206,7 +211,7 @@ def __str__(self):
 
     def to_text(
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
         **kw: Dict[str, Any],
     ) -> str:
@@ -219,22 +224,25 @@ def to_text(
         """
 
         s = io.StringIO()
-        s.write("id %d\n" % self.id)
-        s.write("opcode %s\n" % dns.opcode.to_text(self.opcode()))
-        s.write("rcode %s\n" % dns.rcode.to_text(self.rcode()))
-        s.write("flags %s\n" % dns.flags.to_text(self.flags))
+        s.write(f"id {self.id}\n")
+        s.write(f"opcode {dns.opcode.to_text(self.opcode())}\n")
+        s.write(f"rcode {dns.rcode.to_text(self.rcode())}\n")
+        s.write(f"flags {dns.flags.to_text(self.flags)}\n")
         if self.edns >= 0:
-            s.write("edns %s\n" % self.edns)
+            s.write(f"edns {self.edns}\n")
             if self.ednsflags != 0:
-                s.write("eflags %s\n" % dns.flags.edns_to_text(self.ednsflags))
-            s.write("payload %d\n" % self.payload)
+                s.write(f"eflags {dns.flags.edns_to_text(self.ednsflags)}\n")
+            s.write(f"payload {self.payload}\n")
         for opt in self.options:
-            s.write("option %s\n" % opt.to_text())
+            s.write(f"option {opt.to_text()}\n")
         for name, which in self._section_enum.__members__.items():
             s.write(f";{name}\n")
             for rrset in self.section_from_number(which):
                 s.write(rrset.to_text(origin, relativize, **kw))
                 s.write("\n")
+        if self.tsig is not None:
+            s.write(self.tsig.to_text(origin, relativize, **kw))
+            s.write("\n")
         #
         # We strip off the final \n so the caller can print the result without
         # doing weird things to get around eccentricities in Python print
@@ -344,10 +352,10 @@ def find_rrset(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
+        deleting: dns.rdataclass.RdataClass | None = None,
         create: bool = False,
         force_unique: bool = False,
-        idna_codec: Optional[dns.name.IDNACodec] = None,
+        idna_codec: dns.name.IDNACodec | None = None,
     ) -> dns.rrset.RRset:
         """Find the RRset with the given attributes in the specified section.
 
@@ -429,11 +437,11 @@ def get_rrset(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
+        deleting: dns.rdataclass.RdataClass | None = None,
         create: bool = False,
         force_unique: bool = False,
-        idna_codec: Optional[dns.name.IDNACodec] = None,
-    ) -> Optional[dns.rrset.RRset]:
+        idna_codec: dns.name.IDNACodec | None = None,
+    ) -> dns.rrset.RRset | None:
         """Get the RRset with the given attributes in the specified section.
 
         If the RRset is not found, None is returned.
@@ -527,7 +535,8 @@ def _compute_opt_reserve(self) -> int:
         # worry about that for now.  We also don't worry if there is an existing padding
         # option, as it is unlikely and probably harmless, as the worst case is that we
         # may add another, and this seems to be legal.
-        for option in self.opt[0].options:
+        opt_rdata = cast(dns.rdtypes.ANY.OPT.OPT, self.opt[0])
+        for option in opt_rdata.options:
             wire = option.to_wire()
             # We add 4 here to account for the option type and length
             size += len(wire) + 4
@@ -551,10 +560,10 @@ def _compute_tsig_reserve(self) -> int:
 
     def to_wire(
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         max_size: int = 0,
         multi: bool = False,
-        tsig_ctx: Optional[Any] = None,
+        tsig_ctx: Any | None = None,
         prepend_length: bool = False,
         prefer_truncation: bool = False,
         **kw: Dict[str, Any],
@@ -629,22 +638,24 @@ def to_wire(
             r.add_opt(self.opt, self.pad, opt_reserve, tsig_reserve)
         r.write_header()
         if self.tsig is not None:
-            (new_tsig, ctx) = dns.tsig.sign(
-                r.get_wire(),
-                self.keyring,
-                self.tsig[0],
-                int(time.time()),
-                self.request_mac,
-                tsig_ctx,
-                multi,
-            )
-            self.tsig.clear()
-            self.tsig.add(new_tsig)
+            if self.want_tsig_sign:
+                (new_tsig, ctx) = dns.tsig.sign(
+                    r.get_wire(),
+                    self.keyring,
+                    self.tsig[0],
+                    int(time.time()),
+                    self.request_mac,
+                    tsig_ctx,
+                    multi,
+                )
+                self.tsig.clear()
+                self.tsig.add(new_tsig)
+                if multi:
+                    self.tsig_ctx = ctx
             r.add_rrset(dns.renderer.ADDITIONAL, self.tsig)
             r.write_header()
-            if multi:
-                self.tsig_ctx = ctx
         wire = r.get_wire()
+        self.wire = wire
         if prepend_length:
             wire = len(wire).to_bytes(2, "big") + wire
         return wire
@@ -669,19 +680,16 @@ def _make_tsig(
     def use_tsig(
         self,
         keyring: Any,
-        keyname: Optional[Union[dns.name.Name, str]] = None,
+        keyname: dns.name.Name | str | None = None,
         fudge: int = 300,
-        original_id: Optional[int] = None,
+        original_id: int | None = None,
         tsig_error: int = 0,
         other_data: bytes = b"",
-        algorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
+        algorithm: dns.name.Name | str = dns.tsig.default_algorithm,
     ) -> None:
         """When sending, a TSIG signature using the specified key
         should be added.
 
-        *key*, a ``dns.tsig.Key`` is the key to use.  If a key is specified,
-        the *keyring* and *algorithm* fields are not used.
-
         *keyring*, a ``dict``, ``callable`` or ``dns.tsig.Key``, is either
         the TSIG keyring or key to use.
 
@@ -739,32 +747,36 @@ def use_tsig(
             tsig_error,
             other_data,
         )
+        self.want_tsig_sign = True
 
     @property
-    def keyname(self) -> Optional[dns.name.Name]:
+    def keyname(self) -> dns.name.Name | None:
         if self.tsig:
             return self.tsig.name
         else:
             return None
 
     @property
-    def keyalgorithm(self) -> Optional[dns.name.Name]:
+    def keyalgorithm(self) -> dns.name.Name | None:
         if self.tsig:
-            return self.tsig[0].algorithm
+            rdata = cast(dns.rdtypes.ANY.TSIG.TSIG, self.tsig[0])
+            return rdata.algorithm
         else:
             return None
 
     @property
-    def mac(self) -> Optional[bytes]:
+    def mac(self) -> bytes | None:
         if self.tsig:
-            return self.tsig[0].mac
+            rdata = cast(dns.rdtypes.ANY.TSIG.TSIG, self.tsig[0])
+            return rdata.mac
         else:
             return None
 
     @property
-    def tsig_error(self) -> Optional[int]:
+    def tsig_error(self) -> int | None:
         if self.tsig:
-            return self.tsig[0].error
+            rdata = cast(dns.rdtypes.ANY.TSIG.TSIG, self.tsig[0])
+            return rdata.error
         else:
             return None
 
@@ -779,11 +791,11 @@ def _make_opt(flags=0, payload=DEFAULT_EDNS_PAYLOAD, options=None):
 
     def use_edns(
         self,
-        edns: Optional[Union[int, bool]] = 0,
+        edns: int | bool | None = 0,
         ednsflags: int = 0,
         payload: int = DEFAULT_EDNS_PAYLOAD,
-        request_payload: Optional[int] = None,
-        options: Optional[List[dns.edns.Option]] = None,
+        request_payload: int | None = None,
+        options: List[dns.edns.Option] | None = None,
         pad: int = 0,
     ) -> None:
         """Configure EDNS behavior.
@@ -854,14 +866,16 @@ def ednsflags(self, v):
     @property
     def payload(self) -> int:
         if self.opt:
-            return self.opt[0].payload
+            rdata = cast(dns.rdtypes.ANY.OPT.OPT, self.opt[0])
+            return rdata.payload
         else:
             return 0
 
     @property
     def options(self) -> Tuple:
         if self.opt:
-            return self.opt[0].options
+            rdata = cast(dns.rdtypes.ANY.OPT.OPT, self.opt[0])
+            return rdata.options
         else:
             return ()
 
@@ -912,6 +926,14 @@ def set_opcode(self, opcode: dns.opcode.Opcode) -> None:
         self.flags &= 0x87FF
         self.flags |= dns.opcode.to_flags(opcode)
 
+    def get_options(self, otype: dns.edns.OptionType) -> List[dns.edns.Option]:
+        """Return the list of options of the specified type."""
+        return [option for option in self.options if option.otype == otype]
+
+    def extended_errors(self) -> List[dns.edns.EDEOption]:
+        """Return the list of Extended DNS Error (EDE) options in the message"""
+        return cast(List[dns.edns.EDEOption], self.get_options(dns.edns.OptionType.EDE))
+
     def _get_one_rr_per_rrset(self, value):
         # What the caller picked is fine.
         return value
@@ -963,7 +985,7 @@ class ChainingResult:
     def __init__(
         self,
         canonical_name: dns.name.Name,
-        answer: Optional[dns.rrset.RRset],
+        answer: dns.rrset.RRset | None,
         minimum_ttl: int,
         cnames: List[dns.rrset.RRset],
     ):
@@ -1040,7 +1062,8 @@ def resolve_chaining(self) -> ChainingResult:
                     srrset = self.find_rrset(
                         self.authority, auname, question.rdclass, dns.rdatatype.SOA
                     )
-                    min_ttl = min(min_ttl, srrset.ttl, srrset[0].minimum)
+                    srdata = cast(dns.rdtypes.ANY.SOA.SOA, srrset[0])
+                    min_ttl = min(min_ttl, srrset.ttl, srdata.minimum)
                     break
                 except KeyError:
                     try:
@@ -1080,7 +1103,7 @@ def _message_factory_from_opcode(opcode):
         return QueryMessage
     elif opcode == dns.opcode.UPDATE:
         _maybe_import_update()
-        return dns.update.UpdateMessage
+        return dns.update.UpdateMessage  # pyright: ignore
     else:
         return Message
 
@@ -1184,7 +1207,10 @@ def _get_section(self, section_number, count):
                 else:
                     with self.parser.restrict_to(rdlen):
                         rd = dns.rdata.from_wire_parser(
-                            rdclass, rdtype, self.parser, self.message.origin
+                            rdclass,  # pyright: ignore
+                            rdtype,
+                            self.parser,
+                            self.message.origin,
                         )
                     covers = rd.covers()
                 if self.message.xfr and rdtype == dns.rdatatype.SOA:
@@ -1192,36 +1218,38 @@ def _get_section(self, section_number, count):
                 if rdtype == dns.rdatatype.OPT:
                     self.message.opt = dns.rrset.from_rdata(name, ttl, rd)
                 elif rdtype == dns.rdatatype.TSIG:
-                    if self.keyring is None:
+                    trd = cast(dns.rdtypes.ANY.TSIG.TSIG, rd)
+                    if self.keyring is None or self.keyring is True:
                         raise UnknownTSIGKey("got signed message without keyring")
-                    if isinstance(self.keyring, dict):
+                    elif isinstance(self.keyring, dict):
                         key = self.keyring.get(absolute_name)
                         if isinstance(key, bytes):
-                            key = dns.tsig.Key(absolute_name, key, rd.algorithm)
+                            key = dns.tsig.Key(absolute_name, key, trd.algorithm)
                     elif callable(self.keyring):
                         key = self.keyring(self.message, absolute_name)
                     else:
                         key = self.keyring
                     if key is None:
-                        raise UnknownTSIGKey("key '%s' unknown" % name)
-                    self.message.keyring = key
-                    self.message.tsig_ctx = dns.tsig.validate(
-                        self.parser.wire,
-                        key,
-                        absolute_name,
-                        rd,
-                        int(time.time()),
-                        self.message.request_mac,
-                        rr_start,
-                        self.message.tsig_ctx,
-                        self.multi,
-                    )
+                        raise UnknownTSIGKey(f"key '{name}' unknown")
+                    if key:
+                        self.message.keyring = key
+                        self.message.tsig_ctx = dns.tsig.validate(
+                            self.parser.wire,
+                            key,
+                            absolute_name,
+                            rd,
+                            int(time.time()),
+                            self.message.request_mac,
+                            rr_start,
+                            self.message.tsig_ctx,
+                            self.multi,
+                        )
                     self.message.tsig = dns.rrset.from_rdata(absolute_name, 0, rd)
                 else:
                     rrset = self.message.find_rrset(
                         section,
                         name,
-                        rdclass,
+                        rdclass,  # pyright: ignore
                         rdtype,
                         covers,
                         deleting,
@@ -1251,6 +1279,7 @@ def read(self):
         factory = _message_factory_from_opcode(dns.opcode.from_flags(flags))
         self.message = factory(id=id)
         self.message.flags = dns.flags.Flag(flags)
+        self.message.wire = self.parser.wire
         self.initialize_message(self.message)
         self.one_rr_per_rrset = self.message._get_one_rr_per_rrset(
             self.one_rr_per_rrset
@@ -1276,11 +1305,11 @@ def read(self):
 
 def from_wire(
     wire: bytes,
-    keyring: Optional[Any] = None,
-    request_mac: Optional[bytes] = b"",
+    keyring: Any | None = None,
+    request_mac: bytes | None = b"",
     xfr: bool = False,
-    origin: Optional[dns.name.Name] = None,
-    tsig_ctx: Optional[Union[dns.tsig.HMACTSig, dns.tsig.GSSTSig]] = None,
+    origin: dns.name.Name | None = None,
+    tsig_ctx: dns.tsig.HMACTSig | dns.tsig.GSSTSig | None = None,
     multi: bool = False,
     question_only: bool = False,
     one_rr_per_rrset: bool = False,
@@ -1290,8 +1319,10 @@ def from_wire(
 ) -> Message:
     """Convert a DNS wire format message into a message object.
 
-    *keyring*, a ``dns.tsig.Key`` or ``dict``, the key or keyring to use if the message
-    is signed.
+    *keyring*, a ``dns.tsig.Key``, ``dict``, ``bool``, or ``None``, the key or keyring
+    to use if the message is signed.  If ``None`` or ``True``, then trying to decode
+    a message with a TSIG will fail as it cannot be validated.  If ``False``, then
+    TSIG validation is disabled.
 
     *request_mac*, a ``bytes`` or ``None``.  If the message is a response to a
     TSIG-signed request, *request_mac* should be set to the MAC of that request.
@@ -1399,14 +1430,14 @@ class _TextReader:
 
     def __init__(
         self,
-        text,
-        idna_codec,
-        one_rr_per_rrset=False,
-        origin=None,
-        relativize=True,
-        relativize_to=None,
+        text: str,
+        idna_codec: dns.name.IDNACodec | None,
+        one_rr_per_rrset: bool = False,
+        origin: dns.name.Name | None = None,
+        relativize: bool = True,
+        relativize_to: dns.name.Name | None = None,
     ):
-        self.message = None
+        self.message: Message | None = None  # mypy: ignore
         self.tok = dns.tokenizer.Tokenizer(text, idna_codec=idna_codec)
         self.last_name = None
         self.one_rr_per_rrset = one_rr_per_rrset
@@ -1465,6 +1496,7 @@ def _header_line(self, _):
     def _question_line(self, section_number):
         """Process one line from the text format question section."""
 
+        assert self.message is not None
         section = self.message.sections[section_number]
         token = self.tok.get(want_leading=True)
         if not token.is_whitespace():
@@ -1502,6 +1534,7 @@ def _rr_line(self, section_number):
         additional data sections.
         """
 
+        assert self.message is not None
         section = self.message.sections[section_number]
         # Name
         token = self.tok.get(want_leading=True)
@@ -1632,11 +1665,11 @@ def read(self):
 
 def from_text(
     text: str,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
+    idna_codec: dns.name.IDNACodec | None = None,
     one_rr_per_rrset: bool = False,
-    origin: Optional[dns.name.Name] = None,
+    origin: dns.name.Name | None = None,
     relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
+    relativize_to: dns.name.Name | None = None,
 ) -> Message:
     """Convert the text format message into a message object.
 
@@ -1680,7 +1713,7 @@ def from_text(
 
 def from_file(
     f: Any,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
+    idna_codec: dns.name.IDNACodec | None = None,
     one_rr_per_rrset: bool = False,
 ) -> Message:
     """Read the next text format message from the specified file.
@@ -1705,7 +1738,7 @@ def from_file(
     """
 
     if isinstance(f, str):
-        cm: contextlib.AbstractContextManager = open(f)
+        cm: contextlib.AbstractContextManager = open(f, encoding="utf-8")
     else:
         cm = contextlib.nullcontext(f)
     with cm as f:
@@ -1714,17 +1747,17 @@ def from_file(
 
 
 def make_query(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    use_edns: Optional[Union[int, bool]] = None,
+    qname: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
+    use_edns: int | bool | None = None,
     want_dnssec: bool = False,
-    ednsflags: Optional[int] = None,
-    payload: Optional[int] = None,
-    request_payload: Optional[int] = None,
-    options: Optional[List[dns.edns.Option]] = None,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    id: Optional[int] = None,
+    ednsflags: int | None = None,
+    payload: int | None = None,
+    request_payload: int | None = None,
+    options: List[dns.edns.Option] | None = None,
+    idna_codec: dns.name.IDNACodec | None = None,
+    id: int | None = None,
     flags: int = dns.flags.RD,
     pad: int = 0,
 ) -> QueryMessage:
@@ -1807,24 +1840,36 @@ def make_query(
     kwargs["edns"] = use_edns
     kwargs["pad"] = pad
     m.use_edns(**kwargs)
-    m.want_dnssec(want_dnssec)
+    if want_dnssec:
+        m.want_dnssec(want_dnssec)
     return m
 
 
+class CopyMode(enum.Enum):
+    """
+    How should sections be copied when making an update response?
+    """
+
+    NOTHING = 0
+    QUESTION = 1
+    EVERYTHING = 2
+
+
 def make_response(
     query: Message,
     recursion_available: bool = False,
     our_payload: int = 8192,
     fudge: int = 300,
     tsig_error: int = 0,
-    pad: Optional[int] = None,
+    pad: int | None = None,
+    copy_mode: CopyMode | None = None,
 ) -> Message:
     """Make a message which is a response for the specified query.
     The message returned is really a response skeleton; it has all of the infrastructure
     required of a response, but none of the content.
 
-    The response's question section is a shallow copy of the query's question section,
-    so the query's question RRsets should not be changed.
+    Response section(s) which are copied are shallow copies of the matching section(s)
+    in the query, so the query's RRsets should not be changed.
 
     *query*, a ``dns.message.Message``, the query to respond to.
 
@@ -1837,25 +1882,44 @@ def make_response(
     *tsig_error*, an ``int``, the TSIG error.
 
     *pad*, a non-negative ``int`` or ``None``.  If 0, the default, do not pad; otherwise
-    if not ``None`` add padding bytes to make the message size a multiple of *pad*.
-    Note that if padding is non-zero, an EDNS PADDING option will always be added to the
+    if not ``None`` add padding bytes to make the message size a multiple of *pad*. Note
+    that if padding is non-zero, an EDNS PADDING option will always be added to the
     message.  If ``None``, add padding following RFC 8467, namely if the request is
     padded, pad the response to 468 otherwise do not pad.
 
+    *copy_mode*, a ``dns.message.CopyMode`` or ``None``, determines how sections are
+    copied.  The default, ``None`` copies sections according to the default for the
+    message's opcode, which is currently ``dns.message.CopyMode.QUESTION`` for all
+    opcodes.   ``dns.message.CopyMode.QUESTION`` copies only the question section.
+    ``dns.message.CopyMode.EVERYTHING`` copies all sections other than OPT or TSIG
+    records, which are created appropriately if needed. ``dns.message.CopyMode.NOTHING``
+    copies no sections; note that this mode is for server testing purposes and is
+    otherwise not recommended for use.  In particular, ``dns.message.is_response()``
+    will be ``False`` if you create a response this way and the rcode is not
+    ``FORMERR``, ``SERVFAIL``, ``NOTIMP``, or ``REFUSED``.
+
     Returns a ``dns.message.Message`` object whose specific class is appropriate for the
-    query.  For example, if query is a ``dns.update.UpdateMessage``, response will be
-    too.
+    query.  For example, if query is a ``dns.update.UpdateMessage``, the response will
+    be one too.
     """
 
     if query.flags & dns.flags.QR:
         raise dns.exception.FormError("specified query message is not a query")
-    factory = _message_factory_from_opcode(query.opcode())
+    opcode = query.opcode()
+    factory = _message_factory_from_opcode(opcode)
     response = factory(id=query.id)
     response.flags = dns.flags.QR | (query.flags & dns.flags.RD)
     if recursion_available:
         response.flags |= dns.flags.RA
-    response.set_opcode(query.opcode())
-    response.question = list(query.question)
+    response.set_opcode(opcode)
+    if copy_mode is None:
+        copy_mode = CopyMode.QUESTION
+    if copy_mode != CopyMode.NOTHING:
+        response.question = list(query.question)
+    if copy_mode == CopyMode.EVERYTHING:
+        response.answer = list(query.answer)
+        response.authority = list(query.authority)
+        response.additional = list(query.additional)
     if query.edns >= 0:
         if pad is None:
             # Set response padding per RFC 8467
@@ -1864,7 +1928,9 @@ def make_response(
                 if option.otype == dns.edns.OptionType.PADDING:
                     pad = 468
         response.use_edns(0, 0, our_payload, query.payload, pad=pad)
-    if query.had_tsig:
+    if query.had_tsig and query.keyring:
+        assert query.mac is not None
+        assert query.keyalgorithm is not None
         response.use_tsig(
             query.keyring,
             query.keyname,
diff --git a/libs/dns/name.py b/libs/dns/name.py
index 22ccb39211..45c8f454ec 100644
--- a/libs/dns/name.py
+++ b/libs/dns/name.py
@@ -15,14 +15,13 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-"""DNS Names.
-"""
+"""DNS Names."""
 
 import copy
 import encodings.idna  # type: ignore
 import functools
 import struct
-from typing import Any, Callable, Dict, Iterable, Optional, Tuple, Union
+from typing import Any, Callable, Dict, Iterable, Optional, Tuple
 
 import dns._features
 import dns.enum
@@ -30,6 +29,11 @@
 import dns.immutable
 import dns.wire
 
+# Dnspython will never access idna if the import fails, but pyright can't figure
+# that out, so...
+#
+# pyright: reportAttributeAccessIssue = false, reportPossiblyUnboundVariable = false
+
 if dns._features.have("idna"):
     import idna  # type: ignore
 
@@ -37,6 +41,7 @@
 else:  # pragma: no cover
     have_idna_2008 = False
 
+
 CompressType = Dict["Name", int]
 
 
@@ -59,11 +64,11 @@ class NameRelation(dns.enum.IntEnum):
 
     @classmethod
     def _maximum(cls):
-        return cls.COMMONANCESTOR
+        return cls.COMMONANCESTOR  # pragma: no cover
 
     @classmethod
     def _short_name(cls):
-        return cls.__name__
+        return cls.__name__  # pragma: no cover
 
 
 # Backwards compatibility
@@ -138,7 +143,7 @@ class NeedSubdomainOfOrigin(dns.exception.DNSException):
 _escaped_text = '"().;\\@$'
 
 
-def _escapify(label: Union[bytes, str]) -> str:
+def _escapify(label: bytes | str) -> str:
     """Escape the characters in label which need it.
     @returns: the escaped string
     @rtype: string"""
@@ -152,7 +157,7 @@ def _escapify(label: Union[bytes, str]) -> str:
             elif c > 0x20 and c < 0x7F:
                 text += chr(c)
             else:
-                text += "\\%03d" % c
+                text += f"\\{c:03d}"
         return text
 
     # Unicode label mode.  Escape only special characters and values < 0x20
@@ -161,7 +166,7 @@ def _escapify(label: Union[bytes, str]) -> str:
         if uc in _escaped_text:
             text += "\\" + uc
         elif uc <= "\x20":
-            text += "\\%03d" % ord(uc)
+            text += f"\\{ord(uc):03d}"
         else:
             text += uc
     return text
@@ -277,6 +282,7 @@ def encode(self, label: str) -> bytes:
             raise NoIDNA2008
         try:
             if self.uts_46:
+                # pylint: disable=possibly-used-before-assignment
                 label = idna.uts46_remap(label, False, self.transitional)
             return idna.alabel(label)
         except idna.IDNAError as e:
@@ -341,7 +347,7 @@ def _validate_labels(labels: Tuple[bytes, ...]) -> None:
         raise EmptyLabel
 
 
-def _maybe_convert_to_binary(label: Union[bytes, str]) -> bytes:
+def _maybe_convert_to_binary(label: bytes | str) -> bytes:
     """If label is ``str``, convert it to ``bytes``.  If it is already
     ``bytes`` just return it.
 
@@ -365,7 +371,7 @@ class Name:
 
     __slots__ = ["labels"]
 
-    def __init__(self, labels: Iterable[Union[bytes, str]]):
+    def __init__(self, labels: Iterable[bytes | str]):
         """*labels* is any iterable whose values are ``str`` or ``bytes``."""
 
         blabels = [_maybe_convert_to_binary(x) for x in labels]
@@ -589,7 +595,7 @@ def to_text(self, omit_final_dot: bool = False) -> str:
         return s
 
     def to_unicode(
-        self, omit_final_dot: bool = False, idna_codec: Optional[IDNACodec] = None
+        self, omit_final_dot: bool = False, idna_codec: IDNACodec | None = None
     ) -> str:
         """Convert name to Unicode text format.
 
@@ -643,11 +649,11 @@ def to_digestable(self, origin: Optional["Name"] = None) -> bytes:
 
     def to_wire(
         self,
-        file: Optional[Any] = None,
-        compress: Optional[CompressType] = None,
+        file: Any | None = None,
+        compress: CompressType | None = None,
         origin: Optional["Name"] = None,
         canonicalize: bool = False,
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         """Convert name to wire format, possibly compressing it.
 
         *file* is the file where the name is emitted (typically an
@@ -893,7 +899,7 @@ def successor(self, origin: "Name", prefix_ok: bool = True) -> "Name":
 
 
 def from_unicode(
-    text: str, origin: Optional[Name] = root, idna_codec: Optional[IDNACodec] = None
+    text: str, origin: Name | None = root, idna_codec: IDNACodec | None = None
 ) -> Name:
     """Convert unicode text into a Name object.
 
@@ -977,9 +983,9 @@ def is_all_ascii(text: str) -> bool:
 
 
 def from_text(
-    text: Union[bytes, str],
-    origin: Optional[Name] = root,
-    idna_codec: Optional[IDNACodec] = None,
+    text: bytes | str,
+    origin: Name | None = root,
+    idna_codec: IDNACodec | None = None,
 ) -> Name:
     """Convert text into a Name object.
 
diff --git a/libs/dns/nameserver.py b/libs/dns/nameserver.py
index 5dbb4e8baf..c9307d3e2c 100644
--- a/libs/dns/nameserver.py
+++ b/libs/dns/nameserver.py
@@ -1,9 +1,7 @@
-from typing import Optional, Union
 from urllib.parse import urlparse
 
 import dns.asyncbackend
 import dns.asyncquery
-import dns.inet
 import dns.message
 import dns.query
 
@@ -31,7 +29,7 @@ def query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         one_rr_per_rrset: bool = False,
@@ -43,7 +41,7 @@ async def async_query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         backend: dns.asyncbackend.Backend,
@@ -87,7 +85,7 @@ def query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         one_rr_per_rrset: bool = False,
@@ -124,7 +122,7 @@ async def async_query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         backend: dns.asyncbackend.Backend,
@@ -165,15 +163,17 @@ class DoHNameserver(Nameserver):
     def __init__(
         self,
         url: str,
-        bootstrap_address: Optional[str] = None,
-        verify: Union[bool, str] = True,
+        bootstrap_address: str | None = None,
+        verify: bool | str = True,
         want_get: bool = False,
+        http_version: dns.query.HTTPVersion = dns.query.HTTPVersion.DEFAULT,
     ):
         super().__init__()
         self.url = url
         self.bootstrap_address = bootstrap_address
         self.verify = verify
         self.want_get = want_get
+        self.http_version = http_version
 
     def kind(self):
         return "DoH"
@@ -197,7 +197,7 @@ def query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool = False,
         one_rr_per_rrset: bool = False,
@@ -214,13 +214,14 @@ def query(
             ignore_trailing=ignore_trailing,
             verify=self.verify,
             post=(not self.want_get),
+            http_version=self.http_version,
         )
 
     async def async_query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         backend: dns.asyncbackend.Backend,
@@ -238,6 +239,7 @@ async def async_query(
             ignore_trailing=ignore_trailing,
             verify=self.verify,
             post=(not self.want_get),
+            http_version=self.http_version,
         )
 
 
@@ -246,8 +248,8 @@ def __init__(
         self,
         address: str,
         port: int = 853,
-        hostname: Optional[str] = None,
-        verify: Union[bool, str] = True,
+        hostname: str | None = None,
+        verify: bool | str = True,
     ):
         super().__init__(address, port)
         self.hostname = hostname
@@ -260,7 +262,7 @@ def query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool = False,
         one_rr_per_rrset: bool = False,
@@ -281,7 +283,7 @@ async def async_query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         backend: dns.asyncbackend.Backend,
@@ -305,8 +307,8 @@ def __init__(
         self,
         address: str,
         port: int = 853,
-        verify: Union[bool, str] = True,
-        server_hostname: Optional[str] = None,
+        verify: bool | str = True,
+        server_hostname: str | None = None,
     ):
         super().__init__(address, port)
         self.verify = verify
@@ -319,7 +321,7 @@ def query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool = False,
         one_rr_per_rrset: bool = False,
@@ -340,7 +342,7 @@ async def async_query(
         self,
         request: dns.message.QueryMessage,
         timeout: float,
-        source: Optional[str],
+        source: str | None,
         source_port: int,
         max_size: bool,
         backend: dns.asyncbackend.Backend,
diff --git a/libs/dns/node.py b/libs/dns/node.py
index de85a82d8c..b2cbf1b2e7 100644
--- a/libs/dns/node.py
+++ b/libs/dns/node.py
@@ -19,14 +19,13 @@
 
 import enum
 import io
-from typing import Any, Dict, Optional
+from typing import Any, Dict
 
 import dns.immutable
 import dns.name
 import dns.rdataclass
 import dns.rdataset
 import dns.rdatatype
-import dns.renderer
 import dns.rrset
 
 _cname_types = {
@@ -210,7 +209,7 @@ def get_rdataset(
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
         create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
+    ) -> dns.rdataset.Rdataset | None:
         """Get an rdataset matching the specified properties in the
         current node.
 
@@ -339,7 +338,7 @@ def get_rdataset(
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
         create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
+    ) -> dns.rdataset.Rdataset | None:
         if create:
             raise TypeError("immutable")
         return super().get_rdataset(rdclass, rdtype, covers, False)
diff --git a/libs/dns/opcode.py b/libs/dns/opcode.py
index 78b43d2cbd..3fa610d040 100644
--- a/libs/dns/opcode.py
+++ b/libs/dns/opcode.py
@@ -17,6 +17,8 @@
 
 """DNS Opcodes."""
 
+from typing import Type
+
 import dns.enum
 import dns.exception
 
@@ -38,7 +40,7 @@ def _maximum(cls):
         return 15
 
     @classmethod
-    def _unknown_exception_class(cls):
+    def _unknown_exception_class(cls) -> Type[Exception]:
         return UnknownOpcode
 
 
diff --git a/libs/dns/query.py b/libs/dns/query.py
index f0ee9161f5..17b1862dbf 100644
--- a/libs/dns/query.py
+++ b/libs/dns/query.py
@@ -22,27 +22,33 @@
 import enum
 import errno
 import os
-import os.path
+import random
 import selectors
 import socket
 import struct
 import time
-from typing import Any, Dict, Optional, Tuple, Union
+import urllib.parse
+from typing import Any, Callable, Dict, Optional, Tuple, cast
 
 import dns._features
+import dns._tls_util
 import dns.exception
 import dns.inet
 import dns.message
 import dns.name
 import dns.quic
-import dns.rcode
+import dns.rdata
 import dns.rdataclass
 import dns.rdatatype
-import dns.serial
 import dns.transaction
 import dns.tsig
 import dns.xfr
 
+try:
+    import ssl
+except ImportError:
+    import dns._no_ssl as ssl  # type: ignore
+
 
 def _remaining(expiration):
     if expiration is None:
@@ -76,7 +82,7 @@ def __init__(self, resolver, local_port, bootstrap_address, family):
             self._family = family
 
         def connect_tcp(
-            self, host, port, timeout, local_address, socket_options=None
+            self, host, port, timeout=None, local_address=None, socket_options=None
         ):  # pylint: disable=signature-differs
             addresses = []
             _, expiration = _compute_times(timeout)
@@ -96,14 +102,16 @@ def connect_tcp(
             for address in addresses:
                 af = dns.inet.af_for_address(address)
                 if local_address is not None or self._local_port != 0:
+                    if local_address is None:
+                        local_address = "0.0.0.0"
                     source = dns.inet.low_level_address_tuple(
                         (local_address, self._local_port), af
                     )
                 else:
                     source = None
-                sock = _make_socket(af, socket.SOCK_STREAM, source)
-                attempt_expiration = _expiration_for_this_attempt(2.0, expiration)
                 try:
+                    sock = make_socket(af, socket.SOCK_STREAM, source)
+                    attempt_expiration = _expiration_for_this_attempt(2.0, expiration)
                     _connect(
                         sock,
                         dns.inet.low_level_address_tuple((address, port), af),
@@ -115,11 +123,11 @@ def connect_tcp(
             raise httpcore.ConnectError
 
         def connect_unix_socket(
-            self, path, timeout, socket_options=None
+            self, path, timeout=None, socket_options=None
         ):  # pylint: disable=signature-differs
             raise NotImplementedError
 
-    class _HTTPTransport(httpx.HTTPTransport):
+    class _HTTPTransport(httpx.HTTPTransport):  # pyright: ignore
         def __init__(
             self,
             *args,
@@ -129,7 +137,7 @@ def __init__(
             family=socket.AF_UNSPEC,
             **kwargs,
         ):
-            if resolver is None:
+            if resolver is None and bootstrap_address is None:
                 # pylint: disable=import-outside-toplevel,redefined-outer-name
                 import dns.resolver
 
@@ -142,39 +150,37 @@ def __init__(
 else:
 
     class _HTTPTransport:  # type: ignore
+        def __init__(
+            self,
+            *args,
+            local_port=0,
+            bootstrap_address=None,
+            resolver=None,
+            family=socket.AF_UNSPEC,
+            **kwargs,
+        ):
+            pass
+
         def connect_tcp(self, host, port, timeout, local_address):
             raise NotImplementedError
 
 
 have_doh = _have_httpx
 
-try:
-    import ssl
-except ImportError:  # pragma: no cover
 
-    class ssl:  # type: ignore
-        CERT_NONE = 0
-
-        class WantReadException(Exception):
-            pass
-
-        class WantWriteException(Exception):
-            pass
-
-        class SSLContext:
-            pass
-
-        class SSLSocket:
-            pass
-
-        @classmethod
-        def create_default_context(cls, *args, **kwargs):
-            raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
+def default_socket_factory(
+    af: socket.AddressFamily | int,
+    kind: socket.SocketKind,
+    proto: int,
+) -> socket.socket:
+    return socket.socket(af, kind, proto)
 
 
 # Function used to create a socket.  Can be overridden if needed in special
 # situations.
-socket_factory = socket.socket
+socket_factory: Callable[
+    [socket.AddressFamily | int, socket.SocketKind, int], socket.socket
+] = default_socket_factory
 
 
 class UnexpectedSource(dns.exception.DNSException):
@@ -217,42 +223,22 @@ def _wait_for(fd, readable, writable, _, expiration):
 
     if readable and isinstance(fd, ssl.SSLSocket) and fd.pending() > 0:
         return True
-    sel = _selector_class()
-    events = 0
-    if readable:
-        events |= selectors.EVENT_READ
-    if writable:
-        events |= selectors.EVENT_WRITE
-    if events:
-        sel.register(fd, events)
-    if expiration is None:
-        timeout = None
-    else:
-        timeout = expiration - time.time()
-        if timeout <= 0.0:
+    with selectors.DefaultSelector() as sel:
+        events = 0
+        if readable:
+            events |= selectors.EVENT_READ
+        if writable:
+            events |= selectors.EVENT_WRITE
+        if events:
+            sel.register(fd, events)  # pyright: ignore
+        if expiration is None:
+            timeout = None
+        else:
+            timeout = expiration - time.time()
+            if timeout <= 0.0:
+                raise dns.exception.Timeout
+        if not sel.select(timeout):
             raise dns.exception.Timeout
-    if not sel.select(timeout):
-        raise dns.exception.Timeout
-
-
-def _set_selector_class(selector_class):
-    # Internal API. Do not use.
-
-    global _selector_class
-
-    _selector_class = selector_class
-
-
-if hasattr(selectors, "PollSelector"):
-    # Prefer poll() on platforms that support it because it has no
-    # limits on the maximum value of a file descriptor (plus it will
-    # be more efficient for high values).
-    #
-    # We ignore typing here as we can't say _selector_class is Any
-    # on python < 3.8 due to a bug.
-    _selector_class = selectors.PollSelector  # type: ignore
-else:
-    _selector_class = selectors.SelectSelector  # type: ignore
 
 
 def _wait_for_readable(s, expiration):
@@ -335,42 +321,142 @@ def _destination_and_source(
     return (af, destination, source)
 
 
-def _make_socket(af, type, source, ssl_context=None, server_hostname=None):
-    s = socket_factory(af, type)
+def make_socket(
+    af: socket.AddressFamily | int,
+    type: socket.SocketKind,
+    source: Any | None = None,
+) -> socket.socket:
+    """Make a socket.
+
+    This function uses the module's ``socket_factory`` to make a socket of the
+    specified address family and type.
+
+    *af*, a ``socket.AddressFamily`` or ``int`` is the address family, either
+    ``socket.AF_INET`` or ``socket.AF_INET6``.
+
+    *type*, a ``socket.SocketKind`` is the type of socket, e.g. ``socket.SOCK_DGRAM``,
+    a datagram socket, or ``socket.SOCK_STREAM``, a stream socket.  Note that the
+    ``proto`` attribute of a socket is always zero with this API, so a datagram socket
+    will always be a UDP socket, and a stream socket will always be a TCP socket.
+
+    *source* is the source address and port to bind to, if any.  The default is
+    ``None`` which will bind to the wildcard address and a randomly chosen port.
+    If not ``None``, it should be a (low-level) address tuple appropriate for *af*.
+    """
+    s = socket_factory(af, type, 0)
     try:
         s.setblocking(False)
         if source is not None:
             s.bind(source)
-        if ssl_context:
-            # LGTM gets a false positive here, as our default context is OK
-            return ssl_context.wrap_socket(
-                s,
-                do_handshake_on_connect=False,  # lgtm[py/insecure-protocol]
-                server_hostname=server_hostname,
-            )
-        else:
-            return s
+        return s
     except Exception:
         s.close()
         raise
 
 
+def make_ssl_socket(
+    af: socket.AddressFamily | int,
+    type: socket.SocketKind,
+    ssl_context: ssl.SSLContext,
+    server_hostname: dns.name.Name | str | None = None,
+    source: Any | None = None,
+) -> ssl.SSLSocket:
+    """Make a socket.
+
+    This function uses the module's ``socket_factory`` to make a socket of the
+    specified address family and type.
+
+    *af*, a ``socket.AddressFamily`` or ``int`` is the address family, either
+    ``socket.AF_INET`` or ``socket.AF_INET6``.
+
+    *type*, a ``socket.SocketKind`` is the type of socket, e.g. ``socket.SOCK_DGRAM``,
+    a datagram socket, or ``socket.SOCK_STREAM``, a stream socket.  Note that the
+    ``proto`` attribute of a socket is always zero with this API, so a datagram socket
+    will always be a UDP socket, and a stream socket will always be a TCP socket.
+
+    If *ssl_context* is not ``None``, then it specifies the SSL context to use,
+    typically created with ``make_ssl_context()``.
+
+    If *server_hostname* is not ``None``, then it is the hostname to use for server
+    certificate validation.  A valid hostname must be supplied if *ssl_context*
+    requires hostname checking.
+
+    *source* is the source address and port to bind to, if any.  The default is
+    ``None`` which will bind to the wildcard address and a randomly chosen port.
+    If not ``None``, it should be a (low-level) address tuple appropriate for *af*.
+    """
+    sock = make_socket(af, type, source)
+    if isinstance(server_hostname, dns.name.Name):
+        server_hostname = server_hostname.to_text()
+    # LGTM gets a false positive here, as our default context is OK
+    return ssl_context.wrap_socket(
+        sock,
+        do_handshake_on_connect=False,  # lgtm[py/insecure-protocol]
+        server_hostname=server_hostname,
+    )
+
+
+# for backwards compatibility
+def _make_socket(
+    af,
+    type,
+    source,
+    ssl_context,
+    server_hostname,
+):
+    if ssl_context is not None:
+        return make_ssl_socket(af, type, ssl_context, server_hostname, source)
+    else:
+        return make_socket(af, type, source)
+
+
+def _maybe_get_resolver(
+    resolver: Optional["dns.resolver.Resolver"],  # pyright: ignore
+) -> "dns.resolver.Resolver":  # pyright: ignore
+    # We need a separate method for this to avoid overriding the global
+    # variable "dns" with the as-yet undefined local variable "dns"
+    # in https().
+    if resolver is None:
+        # pylint: disable=import-outside-toplevel,redefined-outer-name
+        import dns.resolver
+
+        resolver = dns.resolver.Resolver()
+    return resolver
+
+
+class HTTPVersion(enum.IntEnum):
+    """Which version of HTTP should be used?
+
+    DEFAULT will select the first version from the list [2, 1.1, 3] that
+    is available.
+    """
+
+    DEFAULT = 0
+    HTTP_1 = 1
+    H1 = 1
+    HTTP_2 = 2
+    H2 = 2
+    HTTP_3 = 3
+    H3 = 3
+
+
 def https(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 443,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    session: Optional[Any] = None,
+    session: Any | None = None,
     path: str = "/dns-query",
     post: bool = True,
-    bootstrap_address: Optional[str] = None,
-    verify: Union[bool, str] = True,
-    resolver: Optional["dns.resolver.Resolver"] = None,
-    family: Optional[int] = socket.AF_UNSPEC,
+    bootstrap_address: str | None = None,
+    verify: bool | str | ssl.SSLContext = True,
+    resolver: Optional["dns.resolver.Resolver"] = None,  # pyright: ignore
+    family: int = socket.AF_UNSPEC,
+    http_version: HTTPVersion = HTTPVersion.DEFAULT,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via DNS-over-HTTPS.
 
@@ -420,27 +506,71 @@ def https(
     *family*, an ``int``, the address family.  If socket.AF_UNSPEC (the default), both A
     and AAAA records will be retrieved.
 
+    *http_version*, a ``dns.query.HTTPVersion``, indicating which HTTP version to use.
+
     Returns a ``dns.message.Message``.
     """
 
-    if not have_doh:
-        raise NoDOH  # pragma: no cover
-    if session and not isinstance(session, httpx.Client):
-        raise ValueError("session parameter must be an httpx.Client")
-
-    wire = q.to_wire()
     (af, _, the_source) = _destination_and_source(
         where, port, source, source_port, False
     )
-    transport = None
-    headers = {"accept": "application/dns-message"}
+    # we bind url and then override as pyright can't figure out all paths bind.
+    url = where
     if af is not None and dns.inet.is_address(where):
         if af == socket.AF_INET:
-            url = "https://{}:{}{}".format(where, port, path)
+            url = f"https://{where}:{port}{path}"
         elif af == socket.AF_INET6:
-            url = "https://[{}]:{}{}".format(where, port, path)
-    else:
-        url = where
+            url = f"https://[{where}]:{port}{path}"
+
+    extensions = {}
+    if bootstrap_address is None:
+        # pylint: disable=possibly-used-before-assignment
+        parsed = urllib.parse.urlparse(url)
+        if parsed.hostname is None:
+            raise ValueError("no hostname in URL")
+        if dns.inet.is_address(parsed.hostname):
+            bootstrap_address = parsed.hostname
+            extensions["sni_hostname"] = parsed.hostname
+        if parsed.port is not None:
+            port = parsed.port
+
+    if http_version == HTTPVersion.H3 or (
+        http_version == HTTPVersion.DEFAULT and not have_doh
+    ):
+        if bootstrap_address is None:
+            resolver = _maybe_get_resolver(resolver)
+            assert parsed.hostname is not None  # pyright: ignore
+            answers = resolver.resolve_name(parsed.hostname, family)  # pyright: ignore
+            bootstrap_address = random.choice(list(answers.addresses()))
+        if session and not isinstance(
+            session, dns.quic.SyncQuicConnection
+        ):  # pyright: ignore
+            raise ValueError("session parameter must be a dns.quic.SyncQuicConnection.")
+        return _http3(
+            q,
+            bootstrap_address,
+            url,  # pyright: ignore
+            timeout,
+            port,
+            source,
+            source_port,
+            one_rr_per_rrset,
+            ignore_trailing,
+            verify=verify,
+            post=post,
+            connection=session,
+        )
+
+    if not have_doh:
+        raise NoDOH  # pragma: no cover
+    if session and not isinstance(session, httpx.Client):  # pyright: ignore
+        raise ValueError("session parameter must be an httpx.Client")
+
+    wire = q.to_wire()
+    headers = {"accept": "application/dns-message"}
+
+    h1 = http_version in (HTTPVersion.H1, HTTPVersion.DEFAULT)
+    h2 = http_version in (HTTPVersion.H2, HTTPVersion.DEFAULT)
 
     # set source port and source address
 
@@ -450,24 +580,28 @@ def https(
     else:
         local_address = the_source[0]
         local_port = the_source[1]
-    transport = _HTTPTransport(
-        local_address=local_address,
-        http1=True,
-        http2=True,
-        verify=verify,
-        local_port=local_port,
-        bootstrap_address=bootstrap_address,
-        resolver=resolver,
-        family=family,
-    )
 
     if session:
         cm: contextlib.AbstractContextManager = contextlib.nullcontext(session)
     else:
-        cm = httpx.Client(http1=True, http2=True, verify=verify, transport=transport)
+        transport = _HTTPTransport(
+            local_address=local_address,
+            http1=h1,
+            http2=h2,
+            verify=verify,
+            local_port=local_port,
+            bootstrap_address=bootstrap_address,
+            resolver=resolver,
+            family=family,  # pyright: ignore
+        )
+
+        cm = httpx.Client(  # type: ignore
+            http1=h1, http2=h2, verify=verify, transport=transport  # type: ignore
+        )
     with cm as session:
         # see https://tools.ietf.org/html/rfc8484#section-4.1.1 for DoH
         # GET and POST examples
+        assert session is not None
         if post:
             headers.update(
                 {
@@ -475,20 +609,30 @@ def https(
                     "content-length": str(len(wire)),
                 }
             )
-            response = session.post(url, headers=headers, content=wire, timeout=timeout)
+            response = session.post(
+                url,
+                headers=headers,
+                content=wire,
+                timeout=timeout,
+                extensions=extensions,
+            )
         else:
             wire = base64.urlsafe_b64encode(wire).rstrip(b"=")
             twire = wire.decode()  # httpx does a repr() if we give it bytes
             response = session.get(
-                url, headers=headers, timeout=timeout, params={"dns": twire}
+                url,
+                headers=headers,
+                timeout=timeout,
+                params={"dns": twire},
+                extensions=extensions,
             )
 
     # see https://tools.ietf.org/html/rfc8484#section-4.2.1 for info about DoH
     # status codes
     if response.status_code < 200 or response.status_code > 299:
         raise ValueError(
-            "{} responded with status code {}"
-            "\nResponse body: {}".format(where, response.status_code, response.content)
+            f"{where} responded with status code {response.status_code}"
+            f"\nResponse body: {response.content}"
         )
     r = dns.message.from_wire(
         response.content,
@@ -503,6 +647,93 @@ def https(
     return r
 
 
+def _find_header(headers: dns.quic.Headers, name: bytes) -> bytes:
+    if headers is None:
+        raise KeyError
+    for header, value in headers:
+        if header == name:
+            return value
+    raise KeyError
+
+
+def _check_status(headers: dns.quic.Headers, peer: str, wire: bytes) -> None:
+    value = _find_header(headers, b":status")
+    if value is None:
+        raise SyntaxError("no :status header in response")
+    status = int(value)
+    if status < 0:
+        raise SyntaxError("status is negative")
+    if status < 200 or status > 299:
+        error = ""
+        if len(wire) > 0:
+            try:
+                error = ": " + wire.decode()
+            except Exception:
+                pass
+        raise ValueError(f"{peer} responded with status code {status}{error}")
+
+
+def _http3(
+    q: dns.message.Message,
+    where: str,
+    url: str,
+    timeout: float | None = None,
+    port: int = 443,
+    source: str | None = None,
+    source_port: int = 0,
+    one_rr_per_rrset: bool = False,
+    ignore_trailing: bool = False,
+    verify: bool | str | ssl.SSLContext = True,
+    post: bool = True,
+    connection: dns.quic.SyncQuicConnection | None = None,
+) -> dns.message.Message:
+    if not dns.quic.have_quic:
+        raise NoDOH("DNS-over-HTTP3 is not available.")  # pragma: no cover
+
+    url_parts = urllib.parse.urlparse(url)
+    hostname = url_parts.hostname
+    assert hostname is not None
+    if url_parts.port is not None:
+        port = url_parts.port
+
+    q.id = 0
+    wire = q.to_wire()
+    the_connection: dns.quic.SyncQuicConnection
+    the_manager: dns.quic.SyncQuicManager
+    if connection:
+        manager: contextlib.AbstractContextManager = contextlib.nullcontext(None)
+    else:
+        manager = dns.quic.SyncQuicManager(
+            verify_mode=verify, server_name=hostname, h3=True  # pyright: ignore
+        )
+        the_manager = manager  # for type checking happiness
+
+    with manager:
+        if connection:
+            the_connection = connection
+        else:
+            the_connection = the_manager.connect(  # pyright: ignore
+                where, port, source, source_port
+            )
+        (start, expiration) = _compute_times(timeout)
+        with the_connection.make_stream(timeout) as stream:  # pyright: ignore
+            stream.send_h3(url, wire, post)
+            wire = stream.receive(_remaining(expiration))
+            _check_status(stream.headers(), where, wire)
+        finish = time.time()
+    r = dns.message.from_wire(
+        wire,
+        keyring=q.keyring,
+        request_mac=q.request_mac,
+        one_rr_per_rrset=one_rr_per_rrset,
+        ignore_trailing=ignore_trailing,
+    )
+    r.time = max(finish - start, 0.0)
+    if not q.is_response(r):
+        raise BadResponse
+    return r
+
+
 def _udp_recv(sock, max_size, expiration):
     """Reads a datagram from the socket.
     A Timeout exception will be raised if the operation is not completed
@@ -532,9 +763,9 @@ def _udp_send(sock, data, destination, expiration):
 
 def send_udp(
     sock: Any,
-    what: Union[dns.message.Message, bytes],
+    what: dns.message.Message | bytes,
     destination: Any,
-    expiration: Optional[float] = None,
+    expiration: float | None = None,
 ) -> Tuple[int, float]:
     """Send a DNS message to the specified UDP socket.
 
@@ -561,16 +792,16 @@ def send_udp(
 
 def receive_udp(
     sock: Any,
-    destination: Optional[Any] = None,
-    expiration: Optional[float] = None,
+    destination: Any | None = None,
+    expiration: float | None = None,
     ignore_unexpected: bool = False,
     one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
+    keyring: Dict[dns.name.Name, dns.tsig.Key] | None = None,
+    request_mac: bytes | None = b"",
     ignore_trailing: bool = False,
     raise_on_truncation: bool = False,
     ignore_errors: bool = False,
-    query: Optional[dns.message.Message] = None,
+    query: dns.message.Message | None = None,
 ) -> Any:
     """Read a DNS message from a UDP socket.
 
@@ -668,15 +899,15 @@ def receive_udp(
 def udp(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 53,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     ignore_unexpected: bool = False,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
     raise_on_truncation: bool = False,
-    sock: Optional[Any] = None,
+    sock: Any | None = None,
     ignore_errors: bool = False,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via UDP.
@@ -723,13 +954,14 @@ def udp(
 
     wire = q.to_wire()
     (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
+        where, port, source, source_port, True
     )
     (begin_time, expiration) = _compute_times(timeout)
     if sock:
         cm: contextlib.AbstractContextManager = contextlib.nullcontext(sock)
     else:
-        cm = _make_socket(af, socket.SOCK_DGRAM, source)
+        assert af is not None
+        cm = make_socket(af, socket.SOCK_DGRAM, source)
     with cm as s:
         send_udp(s, wire, destination, expiration)
         (r, received_time) = receive_udp(
@@ -759,15 +991,15 @@ def udp(
 def udp_with_fallback(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 53,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     ignore_unexpected: bool = False,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    udp_sock: Optional[Any] = None,
-    tcp_sock: Optional[Any] = None,
+    udp_sock: Any | None = None,
+    tcp_sock: Any | None = None,
     ignore_errors: bool = False,
 ) -> Tuple[dns.message.Message, bool]:
     """Return the response to the query, trying UDP first and falling back
@@ -855,7 +1087,7 @@ def _net_read(sock, count, expiration):
         try:
             n = sock.recv(count)
             if n == b"":
-                raise EOFError
+                raise EOFError("EOF")
             count -= len(n)
             s += n
         except (BlockingIOError, ssl.SSLWantReadError):
@@ -883,8 +1115,8 @@ def _net_write(sock, data, expiration):
 
 def send_tcp(
     sock: Any,
-    what: Union[dns.message.Message, bytes],
-    expiration: Optional[float] = None,
+    what: dns.message.Message | bytes,
+    expiration: float | None = None,
 ) -> Tuple[int, float]:
     """Send a DNS message to the specified TCP socket.
 
@@ -913,10 +1145,10 @@ def send_tcp(
 
 def receive_tcp(
     sock: Any,
-    expiration: Optional[float] = None,
+    expiration: float | None = None,
     one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
+    keyring: Dict[dns.name.Name, dns.tsig.Key] | None = None,
+    request_mac: bytes | None = b"",
     ignore_trailing: bool = False,
 ) -> Tuple[dns.message.Message, float]:
     """Read a DNS message from a TCP socket.
@@ -972,13 +1204,13 @@ def _connect(s, address, expiration):
 def tcp(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 53,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    sock: Optional[Any] = None,
+    sock: Any | None = None,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via TCP.
 
@@ -1018,12 +1250,14 @@ def tcp(
         cm: contextlib.AbstractContextManager = contextlib.nullcontext(sock)
     else:
         (af, destination, source) = _destination_and_source(
-            where, port, source, source_port
+            where, port, source, source_port, True
         )
-        cm = _make_socket(af, socket.SOCK_STREAM, source)
+        assert af is not None
+        cm = make_socket(af, socket.SOCK_STREAM, source)
     with cm as s:
         if not sock:
-            _connect(s, destination, expiration)
+            # pylint: disable=possibly-used-before-assignment
+            _connect(s, destination, expiration)  # pyright: ignore
         send_tcp(s, wire, expiration)
         (r, received_time) = receive_tcp(
             s, expiration, one_rr_per_rrset, q.keyring, q.mac, ignore_trailing
@@ -1048,41 +1282,59 @@ def _tls_handshake(s, expiration):
             _wait_for_writable(s, expiration)
 
 
-def _make_dot_ssl_context(
-    server_hostname: Optional[str], verify: Union[bool, str]
+def make_ssl_context(
+    verify: bool | str = True,
+    check_hostname: bool = True,
+    alpns: list[str] | None = None,
 ) -> ssl.SSLContext:
-    cafile: Optional[str] = None
-    capath: Optional[str] = None
-    if isinstance(verify, str):
-        if os.path.isfile(verify):
-            cafile = verify
-        elif os.path.isdir(verify):
-            capath = verify
-        else:
-            raise ValueError("invalid verify string")
+    """Make an SSL context
+
+    If *verify* is ``True``, the default, then certificate verification will occur using
+    the standard CA roots.  If *verify* is ``False``, then certificate verification will
+    be disabled.  If *verify* is a string which is a valid pathname, then if the
+    pathname is a regular file, the CA roots will be taken from the file, otherwise if
+    the pathname is a directory roots will be taken from the directory.
+
+    If *check_hostname* is ``True``, the default, then the hostname of the server must
+    be specified when connecting and the server's certificate must authorize the
+    hostname.  If ``False``, then hostname checking is disabled.
+
+    *aplns* is ``None`` or a list of TLS ALPN (Application Layer Protocol Negotiation)
+    strings to use in negotiation.  For DNS-over-TLS, the right value is `["dot"]`.
+    """
+    cafile, capath = dns._tls_util.convert_verify_to_cafile_and_capath(verify)
     ssl_context = ssl.create_default_context(cafile=cafile, capath=capath)
-    ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
-    if server_hostname is None:
-        ssl_context.check_hostname = False
-    ssl_context.set_alpn_protocols(["dot"])
+    # the pyright ignores below are because it gets confused between the
+    # _no_ssl compatibility types and the real ones.
+    ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2  # type: ignore
+    ssl_context.check_hostname = check_hostname
     if verify is False:
-        ssl_context.verify_mode = ssl.CERT_NONE
-    return ssl_context
+        ssl_context.verify_mode = ssl.CERT_NONE  # type: ignore
+    if alpns is not None:
+        ssl_context.set_alpn_protocols(alpns)
+    return ssl_context  # type: ignore
+
+
+# for backwards compatibility
+def _make_dot_ssl_context(
+    server_hostname: str | None, verify: bool | str
+) -> ssl.SSLContext:
+    return make_ssl_context(verify, server_hostname is not None, ["dot"])
 
 
 def tls(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 853,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    sock: Optional[ssl.SSLSocket] = None,
-    ssl_context: Optional[ssl.SSLContext] = None,
-    server_hostname: Optional[str] = None,
-    verify: Union[bool, str] = True,
+    sock: ssl.SSLSocket | None = None,
+    ssl_context: ssl.SSLContext | None = None,
+    server_hostname: str | None = None,
+    verify: bool | str = True,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via TLS.
 
@@ -1150,17 +1402,18 @@ def tls(
     wire = q.to_wire()
     (begin_time, expiration) = _compute_times(timeout)
     (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
+        where, port, source, source_port, True
     )
-    if ssl_context is None and not sock:
-        ssl_context = _make_dot_ssl_context(server_hostname, verify)
+    assert af is not None  # where must be an address
+    if ssl_context is None:
+        ssl_context = make_ssl_context(verify, server_hostname is not None, ["dot"])
 
-    with _make_socket(
+    with make_ssl_socket(
         af,
         socket.SOCK_STREAM,
-        source,
         ssl_context=ssl_context,
         server_hostname=server_hostname,
+        source=source,
     ) as s:
         _connect(s, destination, expiration)
         _tls_handshake(s, expiration)
@@ -1180,15 +1433,16 @@ def tls(
 def quic(
     q: dns.message.Message,
     where: str,
-    timeout: Optional[float] = None,
+    timeout: float | None = None,
     port: int = 853,
-    source: Optional[str] = None,
+    source: str | None = None,
     source_port: int = 0,
     one_rr_per_rrset: bool = False,
     ignore_trailing: bool = False,
-    connection: Optional[dns.quic.SyncQuicConnection] = None,
-    verify: Union[bool, str] = True,
-    server_hostname: Optional[str] = None,
+    connection: dns.quic.SyncQuicConnection | None = None,
+    verify: bool | str = True,
+    hostname: str | None = None,
+    server_hostname: str | None = None,
 ) -> dns.message.Message:
     """Return the response obtained after sending a query via DNS-over-QUIC.
 
@@ -1212,17 +1466,21 @@ def quic(
     *ignore_trailing*, a ``bool``. If ``True``, ignore trailing junk at end of the
     received message.
 
-    *connection*, a ``dns.quic.SyncQuicConnection``.  If provided, the
-    connection to use to send the query.
+    *connection*, a ``dns.quic.SyncQuicConnection``.  If provided, the connection to use
+    to send the query.
 
     *verify*, a ``bool`` or ``str``.  If a ``True``, then TLS certificate verification
     of the server is done using the default CA bundle; if ``False``, then no
     verification is done; if a `str` then it specifies the path to a certificate file or
     directory which will be used for verification.
 
-    *server_hostname*, a ``str`` containing the server's hostname.  The
-    default is ``None``, which means that no hostname is known, and if an
-    SSL context is created, hostname checking will be disabled.
+    *hostname*, a ``str`` containing the server's hostname or ``None``.  The default is
+    ``None``, which means that no hostname is known, and if an SSL context is created,
+    hostname checking will be disabled.  This value is ignored if *url* is not
+    ``None``.
+
+    *server_hostname*, a ``str`` or ``None``.  This item is for backwards compatibility
+    only, and has the same meaning as *hostname*.
 
     Returns a ``dns.message.Message``.
     """
@@ -1230,6 +1488,9 @@ def quic(
     if not dns.quic.have_quic:
         raise NoDOQ("DNS-over-QUIC is not available.")  # pragma: no cover
 
+    if server_hostname is not None and hostname is None:
+        hostname = server_hostname
+
     q.id = 0
     wire = q.to_wire()
     the_connection: dns.quic.SyncQuicConnection
@@ -1239,15 +1500,17 @@ def quic(
         the_connection = connection
     else:
         manager = dns.quic.SyncQuicManager(
-            verify_mode=verify, server_name=server_hostname
+            verify_mode=verify, server_name=hostname  # pyright: ignore
         )
         the_manager = manager  # for type checking happiness
 
     with manager:
         if not connection:
-            the_connection = the_manager.connect(where, port, source, source_port)
+            the_connection = the_manager.connect(  # pyright: ignore
+                where, port, source, source_port
+            )
         (start, expiration) = _compute_times(timeout)
-        with the_connection.make_stream(timeout) as stream:
+        with the_connection.make_stream(timeout) as stream:  # pyright: ignore
             stream.send(wire, True)
             wire = stream.receive(_remaining(expiration))
         finish = time.time()
@@ -1264,22 +1527,87 @@ def quic(
     return r
 
 
+class UDPMode(enum.IntEnum):
+    """How should UDP be used in an IXFR from :py:func:`inbound_xfr()`?
+
+    NEVER means "never use UDP; always use TCP"
+    TRY_FIRST means "try to use UDP but fall back to TCP if needed"
+    ONLY means "raise ``dns.xfr.UseTCP`` if trying UDP does not succeed"
+    """
+
+    NEVER = 0
+    TRY_FIRST = 1
+    ONLY = 2
+
+
+def _inbound_xfr(
+    txn_manager: dns.transaction.TransactionManager,
+    s: socket.socket | ssl.SSLSocket,
+    query: dns.message.Message,
+    serial: int | None,
+    timeout: float | None,
+    expiration: float | None,
+) -> Any:
+    """Given a socket, does the zone transfer."""
+    rdtype = query.question[0].rdtype
+    is_ixfr = rdtype == dns.rdatatype.IXFR
+    origin = txn_manager.from_wire_origin()
+    wire = query.to_wire()
+    is_udp = isinstance(s, socket.socket) and s.type == socket.SOCK_DGRAM
+    if is_udp:
+        _udp_send(s, wire, None, expiration)
+    else:
+        tcpmsg = struct.pack("!H", len(wire)) + wire
+        _net_write(s, tcpmsg, expiration)
+    with dns.xfr.Inbound(txn_manager, rdtype, serial, is_udp) as inbound:
+        done = False
+        tsig_ctx = None
+        r: dns.message.Message | None = None
+        while not done:
+            (_, mexpiration) = _compute_times(timeout)
+            if mexpiration is None or (
+                expiration is not None and mexpiration > expiration
+            ):
+                mexpiration = expiration
+            if is_udp:
+                (rwire, _) = _udp_recv(s, 65535, mexpiration)
+            else:
+                ldata = _net_read(s, 2, mexpiration)
+                (l,) = struct.unpack("!H", ldata)
+                rwire = _net_read(s, l, mexpiration)
+            r = dns.message.from_wire(
+                rwire,
+                keyring=query.keyring,
+                request_mac=query.mac,
+                xfr=True,
+                origin=origin,
+                tsig_ctx=tsig_ctx,
+                multi=(not is_udp),
+                one_rr_per_rrset=is_ixfr,
+            )
+            done = inbound.process_message(r)
+            yield r
+            tsig_ctx = r.tsig_ctx
+        if query.keyring and r is not None and not r.had_tsig:
+            raise dns.exception.FormError("missing TSIG")
+
+
 def xfr(
     where: str,
-    zone: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.AXFR,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    timeout: Optional[float] = None,
+    zone: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.AXFR,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
+    timeout: float | None = None,
     port: int = 53,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    keyname: Optional[Union[dns.name.Name, str]] = None,
+    keyring: Dict[dns.name.Name, dns.tsig.Key] | None = None,
+    keyname: dns.name.Name | str | None = None,
     relativize: bool = True,
-    lifetime: Optional[float] = None,
-    source: Optional[str] = None,
+    lifetime: float | None = None,
+    source: str | None = None,
     source_port: int = 0,
     serial: int = 0,
     use_udp: bool = False,
-    keyalgorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
+    keyalgorithm: dns.name.Name | str = dns.tsig.default_algorithm,
 ) -> Any:
     """Return a generator for the responses to a zone transfer.
 
@@ -1333,144 +1661,63 @@ def xfr(
     Returns a generator of ``dns.message.Message`` objects.
     """
 
+    class DummyTransactionManager(dns.transaction.TransactionManager):
+        def __init__(self, origin, relativize):
+            self.info = (origin, relativize, dns.name.empty if relativize else origin)
+
+        def origin_information(self):
+            return self.info
+
+        def get_class(self) -> dns.rdataclass.RdataClass:
+            raise NotImplementedError  # pragma: no cover
+
+        def reader(self):
+            raise NotImplementedError  # pragma: no cover
+
+        def writer(self, replacement: bool = False) -> dns.transaction.Transaction:
+            class DummyTransaction:
+                def nop(self, *args, **kw):
+                    pass
+
+                def __getattr__(self, _):
+                    return self.nop
+
+            return cast(dns.transaction.Transaction, DummyTransaction())
+
     if isinstance(zone, str):
         zone = dns.name.from_text(zone)
     rdtype = dns.rdatatype.RdataType.make(rdtype)
     q = dns.message.make_query(zone, rdtype, rdclass)
     if rdtype == dns.rdatatype.IXFR:
-        rrset = dns.rrset.from_text(zone, 0, "IN", "SOA", ". . %u 0 0 0 0" % serial)
-        q.authority.append(rrset)
+        rrset = q.find_rrset(
+            q.authority, zone, dns.rdataclass.IN, dns.rdatatype.SOA, create=True
+        )
+        soa = dns.rdata.from_text("IN", "SOA", f". . {serial} 0 0 0 0")
+        rrset.add(soa, 0)
     if keyring is not None:
         q.use_tsig(keyring, keyname, algorithm=keyalgorithm)
-    wire = q.to_wire()
     (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
+        where, port, source, source_port, True
     )
+    assert af is not None
+    (_, expiration) = _compute_times(lifetime)
+    tm = DummyTransactionManager(zone, relativize)
     if use_udp and rdtype != dns.rdatatype.IXFR:
         raise ValueError("cannot do a UDP AXFR")
     sock_type = socket.SOCK_DGRAM if use_udp else socket.SOCK_STREAM
-    with _make_socket(af, sock_type, source) as s:
-        (_, expiration) = _compute_times(lifetime)
+    with make_socket(af, sock_type, source) as s:
         _connect(s, destination, expiration)
-        l = len(wire)
-        if use_udp:
-            _udp_send(s, wire, None, expiration)
-        else:
-            tcpmsg = struct.pack("!H", l) + wire
-            _net_write(s, tcpmsg, expiration)
-        done = False
-        delete_mode = True
-        expecting_SOA = False
-        soa_rrset = None
-        if relativize:
-            origin = zone
-            oname = dns.name.empty
-        else:
-            origin = None
-            oname = zone
-        tsig_ctx = None
-        while not done:
-            (_, mexpiration) = _compute_times(timeout)
-            if mexpiration is None or (
-                expiration is not None and mexpiration > expiration
-            ):
-                mexpiration = expiration
-            if use_udp:
-                (wire, _) = _udp_recv(s, 65535, mexpiration)
-            else:
-                ldata = _net_read(s, 2, mexpiration)
-                (l,) = struct.unpack("!H", ldata)
-                wire = _net_read(s, l, mexpiration)
-            is_ixfr = rdtype == dns.rdatatype.IXFR
-            r = dns.message.from_wire(
-                wire,
-                keyring=q.keyring,
-                request_mac=q.mac,
-                xfr=True,
-                origin=origin,
-                tsig_ctx=tsig_ctx,
-                multi=True,
-                one_rr_per_rrset=is_ixfr,
-            )
-            rcode = r.rcode()
-            if rcode != dns.rcode.NOERROR:
-                raise TransferError(rcode)
-            tsig_ctx = r.tsig_ctx
-            answer_index = 0
-            if soa_rrset is None:
-                if not r.answer or r.answer[0].name != oname:
-                    raise dns.exception.FormError("No answer or RRset not for qname")
-                rrset = r.answer[0]
-                if rrset.rdtype != dns.rdatatype.SOA:
-                    raise dns.exception.FormError("first RRset is not an SOA")
-                answer_index = 1
-                soa_rrset = rrset.copy()
-                if rdtype == dns.rdatatype.IXFR:
-                    if dns.serial.Serial(soa_rrset[0].serial) <= serial:
-                        #
-                        # We're already up-to-date.
-                        #
-                        done = True
-                    else:
-                        expecting_SOA = True
-            #
-            # Process SOAs in the answer section (other than the initial
-            # SOA in the first message).
-            #
-            for rrset in r.answer[answer_index:]:
-                if done:
-                    raise dns.exception.FormError("answers after final SOA")
-                if rrset.rdtype == dns.rdatatype.SOA and rrset.name == oname:
-                    if expecting_SOA:
-                        if rrset[0].serial != serial:
-                            raise dns.exception.FormError("IXFR base serial mismatch")
-                        expecting_SOA = False
-                    elif rdtype == dns.rdatatype.IXFR:
-                        delete_mode = not delete_mode
-                    #
-                    # If this SOA RRset is equal to the first we saw then we're
-                    # finished. If this is an IXFR we also check that we're
-                    # seeing the record in the expected part of the response.
-                    #
-                    if rrset == soa_rrset and (
-                        rdtype == dns.rdatatype.AXFR
-                        or (rdtype == dns.rdatatype.IXFR and delete_mode)
-                    ):
-                        done = True
-                elif expecting_SOA:
-                    #
-                    # We made an IXFR request and are expecting another
-                    # SOA RR, but saw something else, so this must be an
-                    # AXFR response.
-                    #
-                    rdtype = dns.rdatatype.AXFR
-                    expecting_SOA = False
-            if done and q.keyring and not r.had_tsig:
-                raise dns.exception.FormError("missing TSIG")
-            yield r
-
-
-class UDPMode(enum.IntEnum):
-    """How should UDP be used in an IXFR from :py:func:`inbound_xfr()`?
-
-    NEVER means "never use UDP; always use TCP"
-    TRY_FIRST means "try to use UDP but fall back to TCP if needed"
-    ONLY means "raise ``dns.xfr.UseTCP`` if trying UDP does not succeed"
-    """
-
-    NEVER = 0
-    TRY_FIRST = 1
-    ONLY = 2
+        yield from _inbound_xfr(tm, s, q, serial, timeout, expiration)
 
 
 def inbound_xfr(
     where: str,
     txn_manager: dns.transaction.TransactionManager,
-    query: Optional[dns.message.Message] = None,
+    query: dns.message.Message | None = None,
     port: int = 53,
-    timeout: Optional[float] = None,
-    lifetime: Optional[float] = None,
-    source: Optional[str] = None,
+    timeout: float | None = None,
+    lifetime: float | None = None,
+    source: str | None = None,
     source_port: int = 0,
     udp_mode: UDPMode = UDPMode.NEVER,
 ) -> None:
@@ -1502,10 +1749,10 @@ def inbound_xfr(
     The default is 0.
 
     *udp_mode*, a ``dns.query.UDPMode``, determines how UDP is used
-    for IXFRs.  The default is ``dns.UDPMode.NEVER``, i.e. only use
-    TCP.  Other possibilities are ``dns.UDPMode.TRY_FIRST``, which
+    for IXFRs.  The default is ``dns.query.UDPMode.NEVER``, i.e. only use
+    TCP.  Other possibilities are ``dns.query.UDPMode.TRY_FIRST``, which
     means "try UDP but fallback to TCP if needed", and
-    ``dns.UDPMode.ONLY``, which means "try UDP and raise
+    ``dns.query.UDPMode.ONLY``, which means "try UDP and raise
     ``dns.xfr.UseTCP`` if it does not succeed.
 
     Raises on errors.
@@ -1514,65 +1761,26 @@ def inbound_xfr(
         (query, serial) = dns.xfr.make_query(txn_manager)
     else:
         serial = dns.xfr.extract_serial_from_query(query)
-    rdtype = query.question[0].rdtype
-    is_ixfr = rdtype == dns.rdatatype.IXFR
-    origin = txn_manager.from_wire_origin()
-    wire = query.to_wire()
+
     (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
+        where, port, source, source_port, True
     )
+    assert af is not None
     (_, expiration) = _compute_times(lifetime)
-    retry = True
-    while retry:
-        retry = False
-        if is_ixfr and udp_mode != UDPMode.NEVER:
-            sock_type = socket.SOCK_DGRAM
-            is_udp = True
-        else:
-            sock_type = socket.SOCK_STREAM
-            is_udp = False
-        with _make_socket(af, sock_type, source) as s:
+    if query.question[0].rdtype == dns.rdatatype.IXFR and udp_mode != UDPMode.NEVER:
+        with make_socket(af, socket.SOCK_DGRAM, source) as s:
             _connect(s, destination, expiration)
-            if is_udp:
-                _udp_send(s, wire, None, expiration)
-            else:
-                tcpmsg = struct.pack("!H", len(wire)) + wire
-                _net_write(s, tcpmsg, expiration)
-            with dns.xfr.Inbound(txn_manager, rdtype, serial, is_udp) as inbound:
-                done = False
-                tsig_ctx = None
-                while not done:
-                    (_, mexpiration) = _compute_times(timeout)
-                    if mexpiration is None or (
-                        expiration is not None and mexpiration > expiration
-                    ):
-                        mexpiration = expiration
-                    if is_udp:
-                        (rwire, _) = _udp_recv(s, 65535, mexpiration)
-                    else:
-                        ldata = _net_read(s, 2, mexpiration)
-                        (l,) = struct.unpack("!H", ldata)
-                        rwire = _net_read(s, l, mexpiration)
-                    r = dns.message.from_wire(
-                        rwire,
-                        keyring=query.keyring,
-                        request_mac=query.mac,
-                        xfr=True,
-                        origin=origin,
-                        tsig_ctx=tsig_ctx,
-                        multi=(not is_udp),
-                        one_rr_per_rrset=is_ixfr,
-                    )
-                    try:
-                        done = inbound.process_message(r)
-                    except dns.xfr.UseTCP:
-                        assert is_udp  # should not happen if we used TCP!
-                        if udp_mode == UDPMode.ONLY:
-                            raise
-                        done = True
-                        retry = True
-                        udp_mode = UDPMode.NEVER
-                        continue
-                    tsig_ctx = r.tsig_ctx
-                if not retry and query.keyring and not r.had_tsig:
-                    raise dns.exception.FormError("missing TSIG")
+            try:
+                for _ in _inbound_xfr(
+                    txn_manager, s, query, serial, timeout, expiration
+                ):
+                    pass
+                return
+            except dns.xfr.UseTCP:
+                if udp_mode == UDPMode.ONLY:
+                    raise
+
+    with make_socket(af, socket.SOCK_STREAM, source) as s:
+        _connect(s, destination, expiration)
+        for _ in _inbound_xfr(txn_manager, s, query, serial, timeout, expiration):
+            pass
diff --git a/libs/dns/quic/__init__.py b/libs/dns/quic/__init__.py
index 20aff34552..7c2a699caf 100644
--- a/libs/dns/quic/__init__.py
+++ b/libs/dns/quic/__init__.py
@@ -1,19 +1,20 @@
 # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
 
+from typing import Any, Dict, List, Tuple
+
 import dns._features
 import dns.asyncbackend
 
 if dns._features.have("doq"):
-    import aioquic.quic.configuration  # type: ignore
-
     from dns._asyncbackend import NullContext
-    from dns.quic._asyncio import (
-        AsyncioQuicConnection,
-        AsyncioQuicManager,
-        AsyncioQuicStream,
-    )
-    from dns.quic._common import AsyncQuicConnection, AsyncQuicManager
-    from dns.quic._sync import SyncQuicConnection, SyncQuicManager, SyncQuicStream
+    from dns.quic._asyncio import AsyncioQuicConnection as AsyncioQuicConnection
+    from dns.quic._asyncio import AsyncioQuicManager
+    from dns.quic._asyncio import AsyncioQuicStream as AsyncioQuicStream
+    from dns.quic._common import AsyncQuicConnection  # pyright: ignore
+    from dns.quic._common import AsyncQuicManager as AsyncQuicManager
+    from dns.quic._sync import SyncQuicConnection  # pyright: ignore
+    from dns.quic._sync import SyncQuicStream  # pyright: ignore
+    from dns.quic._sync import SyncQuicManager as SyncQuicManager
 
     have_quic = True
 
@@ -31,16 +32,17 @@ def _asyncio_manager_factory(
     # We have a context factory and a manager factory as for trio we need to have
     # a nursery.
 
-    _async_factories = {"asyncio": (null_factory, _asyncio_manager_factory)}
+    _async_factories: Dict[str, Tuple[Any, Any]] = {
+        "asyncio": (null_factory, _asyncio_manager_factory)
+    }
 
     if dns._features.have("trio"):
         import trio
 
-        from dns.quic._trio import (  # pylint: disable=ungrouped-imports
-            TrioQuicConnection,
-            TrioQuicManager,
-            TrioQuicStream,
-        )
+        # pylint: disable=ungrouped-imports
+        from dns.quic._trio import TrioQuicConnection as TrioQuicConnection
+        from dns.quic._trio import TrioQuicManager
+        from dns.quic._trio import TrioQuicStream as TrioQuicStream
 
         def _trio_context_factory():
             return trio.open_nursery()
@@ -58,8 +60,6 @@ def factories_for_backend(backend=None):
 else:  # pragma: no cover
     have_quic = False
 
-    from typing import Any
-
     class AsyncQuicStream:  # type: ignore
         pass
 
@@ -73,3 +73,6 @@ class SyncQuicStream:  # type: ignore
     class SyncQuicConnection:  # type: ignore
         def make_stream(self) -> Any:
             raise NotImplementedError
+
+
+Headers = List[Tuple[bytes, bytes]]
diff --git a/libs/dns/quic/_asyncio.py b/libs/dns/quic/_asyncio.py
index 0f44331f61..0a177b676e 100644
--- a/libs/dns/quic/_asyncio.py
+++ b/libs/dns/quic/_asyncio.py
@@ -6,6 +6,8 @@
 import struct
 import time
 
+import aioquic.h3.connection  # type: ignore
+import aioquic.h3.events  # type: ignore
 import aioquic.quic.configuration  # type: ignore
 import aioquic.quic.connection  # type: ignore
 import aioquic.quic.events  # type: ignore
@@ -43,12 +45,26 @@ async def wait_for(self, amount, expiration):
                 raise dns.exception.Timeout
             self._expecting = 0
 
+    async def wait_for_end(self, expiration):
+        while True:
+            timeout = self._timeout_from_expiration(expiration)
+            if self._buffer.seen_end():
+                return
+            try:
+                await asyncio.wait_for(self._wait_for_wake_up(), timeout)
+            except TimeoutError:
+                raise dns.exception.Timeout
+
     async def receive(self, timeout=None):
         expiration = self._expiration_from_timeout(timeout)
-        await self.wait_for(2, expiration)
-        (size,) = struct.unpack("!H", self._buffer.get(2))
-        await self.wait_for(size, expiration)
-        return self._buffer.get(size)
+        if self._connection.is_h3():
+            await self.wait_for_end(expiration)
+            return self._buffer.get_all()
+        else:
+            await self.wait_for(2, expiration)
+            (size,) = struct.unpack("!H", self._buffer.get(2))
+            await self.wait_for(size, expiration)
+            return self._buffer.get(size)
 
     async def send(self, datagram, is_end=False):
         data = self._encapsulate(datagram)
@@ -83,6 +99,7 @@ def __init__(self, connection, address, port, source, source_port, manager=None)
         self._wake_timer = asyncio.Condition()
         self._receiver_task = None
         self._sender_task = None
+        self._wake_pending = False
 
     async def _receiver(self):
         try:
@@ -104,19 +121,24 @@ async def _receiver(self):
                     self._connection.receive_datagram(datagram, address, time.time())
                     # Wake up the timer in case the sender is sleeping, as there may be
                     # stuff to send now.
-                    async with self._wake_timer:
-                        self._wake_timer.notify_all()
+                    await self._wakeup()
         except Exception:
             pass
         finally:
             self._done = True
-            async with self._wake_timer:
-                self._wake_timer.notify_all()
+            await self._wakeup()
             self._handshake_complete.set()
 
+    async def _wakeup(self):
+        self._wake_pending = True
+        async with self._wake_timer:
+            self._wake_timer.notify_all()
+
     async def _wait_for_wake_timer(self):
         async with self._wake_timer:
-            await self._wake_timer.wait()
+            if not self._wake_pending:
+                await self._wake_timer.wait()
+        self._wake_pending = False
 
     async def _sender(self):
         await self._socket_created.wait()
@@ -124,6 +146,7 @@ async def _sender(self):
             datagrams = self._connection.datagrams_to_send(time.time())
             for datagram, address in datagrams:
                 assert address == self._peer
+                assert self._socket is not None
                 await self._socket.sendto(datagram, self._peer, None)
             (expiration, interval) = self._get_timer_values()
             try:
@@ -140,14 +163,35 @@ async def _handle_events(self):
             if event is None:
                 return
             if isinstance(event, aioquic.quic.events.StreamDataReceived):
-                stream = self._streams.get(event.stream_id)
-                if stream:
-                    await stream._add_input(event.data, event.end_stream)
+                if self.is_h3():
+                    assert self._h3_conn is not None
+                    h3_events = self._h3_conn.handle_event(event)
+                    for h3_event in h3_events:
+                        if isinstance(h3_event, aioquic.h3.events.HeadersReceived):
+                            stream = self._streams.get(event.stream_id)
+                            if stream:
+                                if stream._headers is None:
+                                    stream._headers = h3_event.headers
+                                elif stream._trailers is None:
+                                    stream._trailers = h3_event.headers
+                                if h3_event.stream_ended:
+                                    await stream._add_input(b"", True)
+                        elif isinstance(h3_event, aioquic.h3.events.DataReceived):
+                            stream = self._streams.get(event.stream_id)
+                            if stream:
+                                await stream._add_input(
+                                    h3_event.data, h3_event.stream_ended
+                                )
+                else:
+                    stream = self._streams.get(event.stream_id)
+                    if stream:
+                        await stream._add_input(event.data, event.end_stream)
             elif isinstance(event, aioquic.quic.events.HandshakeCompleted):
                 self._handshake_complete.set()
             elif isinstance(event, aioquic.quic.events.ConnectionTerminated):
                 self._done = True
-                self._receiver_task.cancel()
+                if self._receiver_task is not None:
+                    self._receiver_task.cancel()
             elif isinstance(event, aioquic.quic.events.StreamReset):
                 stream = self._streams.get(event.stream_id)
                 if stream:
@@ -161,8 +205,7 @@ async def _handle_events(self):
 
     async def write(self, stream, data, is_end=False):
         self._connection.send_stream_data(stream, data, is_end)
-        async with self._wake_timer:
-            self._wake_timer.notify_all()
+        await self._wakeup()
 
     def run(self):
         if self._closed:
@@ -184,27 +227,32 @@ async def make_stream(self, timeout=None):
 
     async def close(self):
         if not self._closed:
-            self._manager.closed(self._peer[0], self._peer[1])
+            if self._manager is not None:
+                self._manager.closed(self._peer[0], self._peer[1])
             self._closed = True
             self._connection.close()
             # sender might be blocked on this, so set it
             self._socket_created.set()
-            async with self._wake_timer:
-                self._wake_timer.notify_all()
+            await self._wakeup()
             try:
-                await self._receiver_task
+                if self._receiver_task is not None:
+                    await self._receiver_task
             except asyncio.CancelledError:
                 pass
             try:
-                await self._sender_task
+                if self._sender_task is not None:
+                    await self._sender_task
             except asyncio.CancelledError:
                 pass
-            await self._socket.close()
+            if self._socket is not None:
+                await self._socket.close()
 
 
 class AsyncioQuicManager(AsyncQuicManager):
-    def __init__(self, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None):
-        super().__init__(conf, verify_mode, AsyncioQuicConnection, server_name)
+    def __init__(
+        self, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None, h3=False
+    ):
+        super().__init__(conf, verify_mode, AsyncioQuicConnection, server_name, h3)
 
     def connect(
         self, address, port=853, source=None, source_port=0, want_session_ticket=True
diff --git a/libs/dns/quic/_common.py b/libs/dns/quic/_common.py
index 0eacc691aa..ba9d245442 100644
--- a/libs/dns/quic/_common.py
+++ b/libs/dns/quic/_common.py
@@ -1,15 +1,19 @@
 # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
 
+import base64
 import copy
 import functools
 import socket
 import struct
 import time
-from typing import Any, Optional
+import urllib.parse
+from typing import Any
 
+import aioquic.h3.connection  # type: ignore
 import aioquic.quic.configuration  # type: ignore
 import aioquic.quic.connection  # type: ignore
 
+import dns._tls_util
 import dns.inet
 
 QUIC_MAX_DATAGRAM = 2048
@@ -51,6 +55,12 @@ def get(self, amount):
         self._buffer = self._buffer[amount:]
         return data
 
+    def get_all(self):
+        assert self.seen_end()
+        data = self._buffer
+        self._buffer = b""
+        return data
+
 
 class BaseQuicStream:
     def __init__(self, connection, stream_id):
@@ -58,10 +68,18 @@ def __init__(self, connection, stream_id):
         self._stream_id = stream_id
         self._buffer = Buffer()
         self._expecting = 0
+        self._headers = None
+        self._trailers = None
 
     def id(self):
         return self._stream_id
 
+    def headers(self):
+        return self._headers
+
+    def trailers(self):
+        return self._trailers
+
     def _expiration_from_timeout(self, timeout):
         if timeout is not None:
             expiration = time.time() + timeout
@@ -77,16 +95,51 @@ def _timeout_from_expiration(self, expiration):
         return timeout
 
     # Subclass must implement receive() as sync / async and which returns a message
-    # or raises UnexpectedEOF.
+    # or raises.
+
+    # Subclass must implement send() as sync / async and which takes a message and
+    # an EOF indicator.
+
+    def send_h3(self, url, datagram, post=True):
+        if not self._connection.is_h3():
+            raise SyntaxError("cannot send H3 to a non-H3 connection")
+        url_parts = urllib.parse.urlparse(url)
+        path = url_parts.path.encode()
+        if post:
+            method = b"POST"
+        else:
+            method = b"GET"
+            path += b"?dns=" + base64.urlsafe_b64encode(datagram).rstrip(b"=")
+        headers = [
+            (b":method", method),
+            (b":scheme", url_parts.scheme.encode()),
+            (b":authority", url_parts.netloc.encode()),
+            (b":path", path),
+            (b"accept", b"application/dns-message"),
+        ]
+        if post:
+            headers.extend(
+                [
+                    (b"content-type", b"application/dns-message"),
+                    (b"content-length", str(len(datagram)).encode()),
+                ]
+            )
+        self._connection.send_headers(self._stream_id, headers, not post)
+        if post:
+            self._connection.send_data(self._stream_id, datagram, True)
 
     def _encapsulate(self, datagram):
+        if self._connection.is_h3():
+            return datagram
         l = len(datagram)
         return struct.pack("!H", l) + datagram
 
     def _common_add_input(self, data, is_end):
         self._buffer.put(data, is_end)
         try:
-            return self._expecting > 0 and self._buffer.have(self._expecting)
+            return (
+                self._expecting > 0 and self._buffer.have(self._expecting)
+            ) or self._buffer.seen_end
         except UnexpectedEOF:
             return True
 
@@ -97,7 +150,13 @@ def _close(self):
 
 class BaseQuicConnection:
     def __init__(
-        self, connection, address, port, source=None, source_port=0, manager=None
+        self,
+        connection,
+        address,
+        port,
+        source=None,
+        source_port=0,
+        manager=None,
     ):
         self._done = False
         self._connection = connection
@@ -106,6 +165,10 @@ def __init__(
         self._closed = False
         self._manager = manager
         self._streams = {}
+        if manager is not None and manager.is_h3():
+            self._h3_conn = aioquic.h3.connection.H3Connection(connection, False)
+        else:
+            self._h3_conn = None
         self._af = dns.inet.af_for_address(address)
         self._peer = dns.inet.low_level_address_tuple((address, port))
         if source is None and source_port != 0:
@@ -120,9 +183,20 @@ def __init__(
         else:
             self._source = None
 
+    def is_h3(self):
+        return self._h3_conn is not None
+
     def close_stream(self, stream_id):
         del self._streams[stream_id]
 
+    def send_headers(self, stream_id, headers, is_end=False):
+        assert self._h3_conn is not None
+        self._h3_conn.send_headers(stream_id, headers, is_end)
+
+    def send_data(self, stream_id, data, is_end=False):
+        assert self._h3_conn is not None
+        self._h3_conn.send_data(stream_id, data, is_end)
+
     def _get_timer_values(self, closed_is_special=True):
         now = time.time()
         expiration = self._connection.get_timer()
@@ -143,31 +217,48 @@ def _handle_timer(self, expiration):
 
 
 class AsyncQuicConnection(BaseQuicConnection):
-    async def make_stream(self, timeout: Optional[float] = None) -> Any:
+    async def make_stream(self, timeout: float | None = None) -> Any:
         pass
 
 
 class BaseQuicManager:
-    def __init__(self, conf, verify_mode, connection_factory, server_name=None):
+    def __init__(
+        self, conf, verify_mode, connection_factory, server_name=None, h3=False
+    ):
         self._connections = {}
         self._connection_factory = connection_factory
         self._session_tickets = {}
+        self._tokens = {}
+        self._h3 = h3
         if conf is None:
             verify_path = None
             if isinstance(verify_mode, str):
                 verify_path = verify_mode
                 verify_mode = True
+            if h3:
+                alpn_protocols = ["h3"]
+            else:
+                alpn_protocols = ["doq", "doq-i03"]
             conf = aioquic.quic.configuration.QuicConfiguration(
-                alpn_protocols=["doq", "doq-i03"],
+                alpn_protocols=alpn_protocols,
                 verify_mode=verify_mode,
                 server_name=server_name,
             )
             if verify_path is not None:
-                conf.load_verify_locations(verify_path)
+                cafile, capath = dns._tls_util.convert_verify_to_cafile_and_capath(
+                    verify_path
+                )
+                conf.load_verify_locations(cafile=cafile, capath=capath)
         self._conf = conf
 
     def _connect(
-        self, address, port=853, source=None, source_port=0, want_session_ticket=True
+        self,
+        address,
+        port=853,
+        source=None,
+        source_port=0,
+        want_session_ticket=True,
+        want_token=True,
     ):
         connection = self._connections.get((address, port))
         if connection is not None:
@@ -189,9 +280,24 @@ def _connect(
             )
         else:
             session_ticket_handler = None
+        if want_token:
+            try:
+                token = self._tokens.pop((address, port))
+                # We found a token, so make a configuration that uses it.
+                conf = copy.copy(conf)
+                conf.token = token
+            except KeyError:
+                # No token
+                pass
+            # Whether or not we found a token, we want a handler to save # one.
+            token_handler = functools.partial(self.save_token, address, port)
+        else:
+            token_handler = None
+
         qconn = aioquic.quic.connection.QuicConnection(
             configuration=conf,
             session_ticket_handler=session_ticket_handler,
+            token_handler=token_handler,
         )
         lladdress = dns.inet.low_level_address_tuple((address, port))
         qconn.connect(lladdress, time.time())
@@ -207,6 +313,9 @@ def closed(self, address, port):
         except KeyError:
             pass
 
+    def is_h3(self):
+        return self._h3
+
     def save_session_ticket(self, address, port, ticket):
         # We rely on dictionaries keys() being in insertion order here.  We
         # can't just popitem() as that would be LIFO which is the opposite of
@@ -218,6 +327,17 @@ def save_session_ticket(self, address, port, ticket):
                 del self._session_tickets[key]
         self._session_tickets[(address, port)] = ticket
 
+    def save_token(self, address, port, token):
+        # We rely on dictionaries keys() being in insertion order here.  We
+        # can't just popitem() as that would be LIFO which is the opposite of
+        # what we want.
+        l = len(self._tokens)
+        if l >= MAX_SESSION_TICKETS:
+            keys_to_delete = list(self._tokens.keys())[0:SESSIONS_TO_DELETE]
+            for key in keys_to_delete:
+                del self._tokens[key]
+        self._tokens[(address, port)] = token
+
 
 class AsyncQuicManager(BaseQuicManager):
     def connect(self, address, port=853, source=None, source_port=0):
diff --git a/libs/dns/quic/_sync.py b/libs/dns/quic/_sync.py
index 120cb5f329..18f9d05bb3 100644
--- a/libs/dns/quic/_sync.py
+++ b/libs/dns/quic/_sync.py
@@ -7,6 +7,8 @@
 import threading
 import time
 
+import aioquic.h3.connection  # type: ignore
+import aioquic.h3.events  # type: ignore
 import aioquic.quic.configuration  # type: ignore
 import aioquic.quic.connection  # type: ignore
 import aioquic.quic.events  # type: ignore
@@ -21,11 +23,9 @@
     UnexpectedEOF,
 )
 
-# Avoid circularity with dns.query
-if hasattr(selectors, "PollSelector"):
-    _selector_class = selectors.PollSelector  # type: ignore
-else:
-    _selector_class = selectors.SelectSelector  # type: ignore
+# Function used to create a socket.  Can be overridden if needed in special
+# situations.
+socket_factory = socket.socket
 
 
 class SyncQuicStream(BaseQuicStream):
@@ -46,14 +46,29 @@ def wait_for(self, amount, expiration):
                     raise dns.exception.Timeout
             self._expecting = 0
 
+    def wait_for_end(self, expiration):
+        while True:
+            timeout = self._timeout_from_expiration(expiration)
+            with self._lock:
+                if self._buffer.seen_end():
+                    return
+            with self._wake_up:
+                if not self._wake_up.wait(timeout):
+                    raise dns.exception.Timeout
+
     def receive(self, timeout=None):
         expiration = self._expiration_from_timeout(timeout)
-        self.wait_for(2, expiration)
-        with self._lock:
-            (size,) = struct.unpack("!H", self._buffer.get(2))
-        self.wait_for(size, expiration)
-        with self._lock:
-            return self._buffer.get(size)
+        if self._connection.is_h3():
+            self.wait_for_end(expiration)
+            with self._lock:
+                return self._buffer.get_all()
+        else:
+            self.wait_for(2, expiration)
+            with self._lock:
+                (size,) = struct.unpack("!H", self._buffer.get(2))
+            self.wait_for(size, expiration)
+            with self._lock:
+                return self._buffer.get(size)
 
     def send(self, datagram, is_end=False):
         data = self._encapsulate(datagram)
@@ -81,7 +96,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 class SyncQuicConnection(BaseQuicConnection):
     def __init__(self, connection, address, port, source, source_port, manager):
         super().__init__(connection, address, port, source, source_port, manager)
-        self._socket = socket.socket(self._af, socket.SOCK_DGRAM, 0)
+        self._socket = socket_factory(self._af, socket.SOCK_DGRAM, 0)
         if self._source is not None:
             try:
                 self._socket.bind(
@@ -118,28 +133,35 @@ def _drain_wakeup(self):
 
     def _worker(self):
         try:
-            sel = _selector_class()
-            sel.register(self._socket, selectors.EVENT_READ, self._read)
-            sel.register(self._receive_wakeup, selectors.EVENT_READ, self._drain_wakeup)
-            while not self._done:
-                (expiration, interval) = self._get_timer_values(False)
-                items = sel.select(interval)
-                for key, _ in items:
-                    key.data()
-                with self._lock:
-                    self._handle_timer(expiration)
-                self._handle_events()
-                with self._lock:
-                    datagrams = self._connection.datagrams_to_send(time.time())
-                for datagram, _ in datagrams:
-                    try:
-                        self._socket.send(datagram)
-                    except BlockingIOError:
-                        # we let QUIC handle any lossage
-                        pass
+            with selectors.DefaultSelector() as sel:
+                sel.register(self._socket, selectors.EVENT_READ, self._read)
+                sel.register(
+                    self._receive_wakeup, selectors.EVENT_READ, self._drain_wakeup
+                )
+                while not self._done:
+                    (expiration, interval) = self._get_timer_values(False)
+                    items = sel.select(interval)
+                    for key, _ in items:
+                        key.data()
+                    with self._lock:
+                        self._handle_timer(expiration)
+                    self._handle_events()
+                    with self._lock:
+                        datagrams = self._connection.datagrams_to_send(time.time())
+                    for datagram, _ in datagrams:
+                        try:
+                            self._socket.send(datagram)
+                        except BlockingIOError:
+                            # we let QUIC handle any lossage
+                            pass
+        except Exception:
+            # Eat all exceptions as we have no way to pass them back to the
+            # caller currently.  It might be nice to fix this in the future.
+            pass
         finally:
             with self._lock:
                 self._done = True
+            self._socket.close()
             # Ensure anyone waiting for this gets woken up.
             self._handshake_complete.set()
 
@@ -150,10 +172,30 @@ def _handle_events(self):
             if event is None:
                 return
             if isinstance(event, aioquic.quic.events.StreamDataReceived):
-                with self._lock:
-                    stream = self._streams.get(event.stream_id)
-                if stream:
-                    stream._add_input(event.data, event.end_stream)
+                if self.is_h3():
+                    assert self._h3_conn is not None
+                    h3_events = self._h3_conn.handle_event(event)
+                    for h3_event in h3_events:
+                        if isinstance(h3_event, aioquic.h3.events.HeadersReceived):
+                            with self._lock:
+                                stream = self._streams.get(event.stream_id)
+                            if stream:
+                                if stream._headers is None:
+                                    stream._headers = h3_event.headers
+                                elif stream._trailers is None:
+                                    stream._trailers = h3_event.headers
+                                if h3_event.stream_ended:
+                                    stream._add_input(b"", True)
+                        elif isinstance(h3_event, aioquic.h3.events.DataReceived):
+                            with self._lock:
+                                stream = self._streams.get(event.stream_id)
+                            if stream:
+                                stream._add_input(h3_event.data, h3_event.stream_ended)
+                else:
+                    with self._lock:
+                        stream = self._streams.get(event.stream_id)
+                    if stream:
+                        stream._add_input(event.data, event.end_stream)
             elif isinstance(event, aioquic.quic.events.HandshakeCompleted):
                 self._handshake_complete.set()
             elif isinstance(event, aioquic.quic.events.ConnectionTerminated):
@@ -170,6 +212,18 @@ def write(self, stream, data, is_end=False):
             self._connection.send_stream_data(stream, data, is_end)
         self._send_wakeup.send(b"\x01")
 
+    def send_headers(self, stream_id, headers, is_end=False):
+        with self._lock:
+            super().send_headers(stream_id, headers, is_end)
+        if is_end:
+            self._send_wakeup.send(b"\x01")
+
+    def send_data(self, stream_id, data, is_end=False):
+        with self._lock:
+            super().send_data(stream_id, data, is_end)
+        if is_end:
+            self._send_wakeup.send(b"\x01")
+
     def run(self):
         if self._closed:
             return
@@ -195,24 +249,34 @@ def close(self):
         with self._lock:
             if self._closed:
                 return
-            self._manager.closed(self._peer[0], self._peer[1])
+            if self._manager is not None:
+                self._manager.closed(self._peer[0], self._peer[1])
             self._closed = True
             self._connection.close()
             self._send_wakeup.send(b"\x01")
-        self._worker_thread.join()
+        if self._worker_thread is not None:
+            self._worker_thread.join()
 
 
 class SyncQuicManager(BaseQuicManager):
-    def __init__(self, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None):
-        super().__init__(conf, verify_mode, SyncQuicConnection, server_name)
+    def __init__(
+        self, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None, h3=False
+    ):
+        super().__init__(conf, verify_mode, SyncQuicConnection, server_name, h3)
         self._lock = threading.Lock()
 
     def connect(
-        self, address, port=853, source=None, source_port=0, want_session_ticket=True
+        self,
+        address,
+        port=853,
+        source=None,
+        source_port=0,
+        want_session_ticket=True,
+        want_token=True,
     ):
         with self._lock:
             (connection, start) = self._connect(
-                address, port, source, source_port, want_session_ticket
+                address, port, source, source_port, want_session_ticket, want_token
             )
             if start:
                 connection.run()
@@ -226,6 +290,10 @@ def save_session_ticket(self, address, port, ticket):
         with self._lock:
             super().save_session_ticket(address, port, ticket)
 
+    def save_token(self, address, port, token):
+        with self._lock:
+            super().save_token(address, port, token)
+
     def __enter__(self):
         return self
 
diff --git a/libs/dns/quic/_trio.py b/libs/dns/quic/_trio.py
index 35e36b982f..046e6aab60 100644
--- a/libs/dns/quic/_trio.py
+++ b/libs/dns/quic/_trio.py
@@ -5,6 +5,8 @@
 import struct
 import time
 
+import aioquic.h3.connection  # type: ignore
+import aioquic.h3.events  # type: ignore
 import aioquic.quic.configuration  # type: ignore
 import aioquic.quic.connection  # type: ignore
 import aioquic.quic.events  # type: ignore
@@ -36,16 +38,27 @@ async def wait_for(self, amount):
                 await self._wake_up.wait()
             self._expecting = 0
 
+    async def wait_for_end(self):
+        while True:
+            if self._buffer.seen_end():
+                return
+            async with self._wake_up:
+                await self._wake_up.wait()
+
     async def receive(self, timeout=None):
         if timeout is None:
             context = NullContext(None)
         else:
             context = trio.move_on_after(timeout)
         with context:
-            await self.wait_for(2)
-            (size,) = struct.unpack("!H", self._buffer.get(2))
-            await self.wait_for(size)
-            return self._buffer.get(size)
+            if self._connection.is_h3():
+                await self.wait_for_end()
+                return self._buffer.get_all()
+            else:
+                await self.wait_for(2)
+                (size,) = struct.unpack("!H", self._buffer.get(2))
+                await self.wait_for(size)
+                return self._buffer.get(size)
         raise dns.exception.Timeout
 
     async def send(self, datagram, is_end=False):
@@ -99,7 +112,7 @@ async def _worker(self):
                     # race.
                     interval = 0.0
                 with trio.CancelScope(
-                    deadline=trio.current_time() + interval
+                    deadline=trio.current_time() + interval  # pyright: ignore
                 ) as self._worker_scope:
                     datagram = await self._socket.recv(QUIC_MAX_DATAGRAM)
                     self._connection.receive_datagram(datagram, self._peer, time.time())
@@ -115,6 +128,7 @@ async def _worker(self):
                     await self._socket.send(datagram)
         finally:
             self._done = True
+            self._socket.close()
             self._handshake_complete.set()
 
     async def _handle_events(self):
@@ -124,9 +138,29 @@ async def _handle_events(self):
             if event is None:
                 return
             if isinstance(event, aioquic.quic.events.StreamDataReceived):
-                stream = self._streams.get(event.stream_id)
-                if stream:
-                    await stream._add_input(event.data, event.end_stream)
+                if self.is_h3():
+                    assert self._h3_conn is not None
+                    h3_events = self._h3_conn.handle_event(event)
+                    for h3_event in h3_events:
+                        if isinstance(h3_event, aioquic.h3.events.HeadersReceived):
+                            stream = self._streams.get(event.stream_id)
+                            if stream:
+                                if stream._headers is None:
+                                    stream._headers = h3_event.headers
+                                elif stream._trailers is None:
+                                    stream._trailers = h3_event.headers
+                                if h3_event.stream_ended:
+                                    await stream._add_input(b"", True)
+                        elif isinstance(h3_event, aioquic.h3.events.DataReceived):
+                            stream = self._streams.get(event.stream_id)
+                            if stream:
+                                await stream._add_input(
+                                    h3_event.data, h3_event.stream_ended
+                                )
+                else:
+                    stream = self._streams.get(event.stream_id)
+                    if stream:
+                        await stream._add_input(event.data, event.end_stream)
             elif isinstance(event, aioquic.quic.events.HandshakeCompleted):
                 self._handshake_complete.set()
             elif isinstance(event, aioquic.quic.events.ConnectionTerminated):
@@ -172,7 +206,8 @@ async def make_stream(self, timeout=None):
 
     async def close(self):
         if not self._closed:
-            self._manager.closed(self._peer[0], self._peer[1])
+            if self._manager is not None:
+                self._manager.closed(self._peer[0], self._peer[1])
             self._closed = True
             self._connection.close()
             self._send_pending = True
@@ -183,9 +218,14 @@ async def close(self):
 
 class TrioQuicManager(AsyncQuicManager):
     def __init__(
-        self, nursery, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None
+        self,
+        nursery,
+        conf=None,
+        verify_mode=ssl.CERT_REQUIRED,
+        server_name=None,
+        h3=False,
     ):
-        super().__init__(conf, verify_mode, TrioQuicConnection, server_name)
+        super().__init__(conf, verify_mode, TrioQuicConnection, server_name, h3)
         self._nursery = nursery
 
     def connect(
diff --git a/libs/dns/rcode.py b/libs/dns/rcode.py
index 8e6386f828..7bb8467e26 100644
--- a/libs/dns/rcode.py
+++ b/libs/dns/rcode.py
@@ -17,7 +17,7 @@
 
 """DNS Result Codes."""
 
-from typing import Tuple
+from typing import Tuple, Type
 
 import dns.enum
 import dns.exception
@@ -72,7 +72,7 @@ def _maximum(cls):
         return 4095
 
     @classmethod
-    def _unknown_exception_class(cls):
+    def _unknown_exception_class(cls) -> Type[Exception]:
         return UnknownRcode
 
 
diff --git a/libs/dns/rdata.py b/libs/dns/rdata.py
index 024fd8f687..c4522e6830 100644
--- a/libs/dns/rdata.py
+++ b/libs/dns/rdata.py
@@ -21,10 +21,11 @@
 import binascii
 import inspect
 import io
+import ipaddress
 import itertools
 import random
 from importlib import import_module
-from typing import Any, Dict, Optional, Tuple, Union
+from typing import Any, Dict, Tuple
 
 import dns.exception
 import dns.immutable
@@ -107,7 +108,7 @@ def _escapify(qstring):
         elif c >= 0x20 and c < 0x7F:
             text += chr(c)
         else:
-            text += "\\%03d" % c
+            text += f"\\{c:03d}"
     return text
 
 
@@ -132,7 +133,11 @@ class Rdata:
 
     __slots__ = ["rdclass", "rdtype", "rdcomment"]
 
-    def __init__(self, rdclass, rdtype):
+    def __init__(
+        self,
+        rdclass: dns.rdataclass.RdataClass,
+        rdtype: dns.rdatatype.RdataType,
+    ) -> None:
         """Initialize an rdata.
 
         *rdclass*, an ``int`` is the rdataclass of the Rdata.
@@ -197,7 +202,7 @@ def extended_rdatatype(self) -> int:
 
     def to_text(
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
         **kw: Dict[str, Any],
     ) -> str:
@@ -210,51 +215,55 @@ def to_text(
 
     def _to_wire(
         self,
-        file: Optional[Any],
-        compress: Optional[dns.name.CompressType] = None,
-        origin: Optional[dns.name.Name] = None,
+        file: Any,
+        compress: dns.name.CompressType | None = None,
+        origin: dns.name.Name | None = None,
         canonicalize: bool = False,
-    ) -> bytes:
+    ) -> None:
         raise NotImplementedError  # pragma: no cover
 
     def to_wire(
         self,
-        file: Optional[Any] = None,
-        compress: Optional[dns.name.CompressType] = None,
-        origin: Optional[dns.name.Name] = None,
+        file: Any | None = None,
+        compress: dns.name.CompressType | None = None,
+        origin: dns.name.Name | None = None,
         canonicalize: bool = False,
-    ) -> bytes:
+    ) -> bytes | None:
         """Convert an rdata to wire format.
 
-        Returns a ``bytes`` or ``None``.
+        Returns a ``bytes`` if no output file was specified, or ``None`` otherwise.
         """
 
         if file:
-            return self._to_wire(file, compress, origin, canonicalize)
+            # We call _to_wire() and then return None explicitly instead of
+            # of just returning the None from _to_wire() as mypy's func-returns-value
+            # unhelpfully errors out with "error: "_to_wire" of "Rdata" does not return
+            # a value (it only ever returns None)"
+            self._to_wire(file, compress, origin, canonicalize)
+            return None
         else:
             f = io.BytesIO()
             self._to_wire(f, compress, origin, canonicalize)
             return f.getvalue()
 
-    def to_generic(
-        self, origin: Optional[dns.name.Name] = None
-    ) -> "dns.rdata.GenericRdata":
+    def to_generic(self, origin: dns.name.Name | None = None) -> "GenericRdata":
         """Creates a dns.rdata.GenericRdata equivalent of this rdata.
 
         Returns a ``dns.rdata.GenericRdata``.
         """
-        return dns.rdata.GenericRdata(
-            self.rdclass, self.rdtype, self.to_wire(origin=origin)
-        )
+        wire = self.to_wire(origin=origin)
+        assert wire is not None  # for type checkers
+        return GenericRdata(self.rdclass, self.rdtype, wire)
 
-    def to_digestable(self, origin: Optional[dns.name.Name] = None) -> bytes:
+    def to_digestable(self, origin: dns.name.Name | None = None) -> bytes:
         """Convert rdata to a format suitable for digesting in hashes.  This
         is also the DNSSEC canonical form.
 
         Returns a ``bytes``.
         """
-
-        return self.to_wire(origin=origin, canonicalize=True)
+        wire = self.to_wire(origin=origin, canonicalize=True)
+        assert wire is not None  # for mypy
+        return wire
 
     def __repr__(self):
         covers = self.covers()
@@ -292,6 +301,9 @@ def _cmp(self, other):
             In the future, all ordering comparisons for rdata with
             relative names will be disallowed.
         """
+        # the next two lines are for type checkers, so they are bound
+        our = b""
+        their = b""
         try:
             our = self.to_digestable()
             our_relative = False
@@ -396,9 +408,9 @@ def from_text(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         tok: dns.tokenizer.Tokenizer,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
-        relativize_to: Optional[dns.name.Name] = None,
+        relativize_to: dns.name.Name | None = None,
     ) -> "Rdata":
         raise NotImplementedError  # pragma: no cover
 
@@ -408,7 +420,7 @@ def from_wire_parser(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         parser: dns.wire.Parser,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
     ) -> "Rdata":
         raise NotImplementedError  # pragma: no cover
 
@@ -434,15 +446,11 @@ def replace(self, **kwargs: Any) -> "Rdata":
                 continue
             if key not in parameters:
                 raise AttributeError(
-                    "'{}' object has no attribute '{}'".format(
-                        self.__class__.__name__, key
-                    )
+                    f"'{self.__class__.__name__}' object has no attribute '{key}'"
                 )
             if key in ("rdclass", "rdtype"):
                 raise AttributeError(
-                    "Cannot overwrite '{}' attribute '{}'".format(
-                        self.__class__.__name__, key
-                    )
+                    f"Cannot overwrite '{self.__class__.__name__}' attribute '{key}'"
                 )
 
         # Construct the parameter list.  For each field, use the value in
@@ -474,7 +482,7 @@ def _as_bytes(
         cls,
         value: Any,
         encode: bool = False,
-        max_length: Optional[int] = None,
+        max_length: int | None = None,
         empty_ok: bool = True,
     ) -> bytes:
         if encode and isinstance(value, str):
@@ -550,6 +558,8 @@ def _as_ipv4_address(cls, value):
             return dns.ipv4.canonicalize(value)
         elif isinstance(value, bytes):
             return dns.ipv4.inet_ntoa(value)
+        elif isinstance(value, ipaddress.IPv4Address):
+            return dns.ipv4.inet_ntoa(value.packed)
         else:
             raise ValueError("not an IPv4 address")
 
@@ -559,6 +569,8 @@ def _as_ipv6_address(cls, value):
             return dns.ipv6.canonicalize(value)
         elif isinstance(value, bytes):
             return dns.ipv6.inet_ntoa(value)
+        elif isinstance(value, ipaddress.IPv6Address):
+            return dns.ipv6.inet_ntoa(value.packed)
         else:
             raise ValueError("not an IPv6 address")
 
@@ -608,17 +620,22 @@ class GenericRdata(Rdata):
 
     __slots__ = ["data"]
 
-    def __init__(self, rdclass, rdtype, data):
+    def __init__(
+        self,
+        rdclass: dns.rdataclass.RdataClass,
+        rdtype: dns.rdatatype.RdataType,
+        data: bytes,
+    ) -> None:
         super().__init__(rdclass, rdtype)
         self.data = data
 
     def to_text(
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
         **kw: Dict[str, Any],
     ) -> str:
-        return r"\# %d " % len(self.data) + _hexify(self.data, **kw)
+        return rf"\# {len(self.data)} " + _hexify(self.data, **kw)  # pyright: ignore
 
     @classmethod
     def from_text(
@@ -637,6 +654,9 @@ def from_text(
     def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
         file.write(self.data)
 
+    def to_generic(self, origin: dns.name.Name | None = None) -> "GenericRdata":
+        return self
+
     @classmethod
     def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
         return cls(rdclass, rdtype, parser.get_remaining())
@@ -646,13 +666,14 @@ def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
     {}
 )
 _module_prefix = "dns.rdtypes"
+_dynamic_load_allowed = True
 
 
-def get_rdata_class(rdclass, rdtype):
+def get_rdata_class(rdclass, rdtype, use_generic=True):
     cls = _rdata_classes.get((rdclass, rdtype))
     if not cls:
-        cls = _rdata_classes.get((dns.rdatatype.ANY, rdtype))
-        if not cls:
+        cls = _rdata_classes.get((dns.rdataclass.ANY, rdtype))
+        if not cls and _dynamic_load_allowed:
             rdclass_text = dns.rdataclass.to_text(rdclass)
             rdtype_text = dns.rdatatype.to_text(rdtype)
             rdtype_text = rdtype_text.replace("-", "_")
@@ -670,20 +691,44 @@ def get_rdata_class(rdclass, rdtype):
                     _rdata_classes[(rdclass, rdtype)] = cls
                 except ImportError:
                     pass
-    if not cls:
+    if not cls and use_generic:
         cls = GenericRdata
         _rdata_classes[(rdclass, rdtype)] = cls
     return cls
 
 
+def load_all_types(disable_dynamic_load=True):
+    """Load all rdata types for which dnspython has a non-generic implementation.
+
+    Normally dnspython loads DNS rdatatype implementations on demand, but in some
+    specialized cases loading all types at an application-controlled time is preferred.
+
+    If *disable_dynamic_load*, a ``bool``, is ``True`` then dnspython will not attempt
+    to use its dynamic loading mechanism if an unknown type is subsequently encountered,
+    and will simply use the ``GenericRdata`` class.
+    """
+    # Load class IN and ANY types.
+    for rdtype in dns.rdatatype.RdataType:
+        get_rdata_class(dns.rdataclass.IN, rdtype, False)
+    # Load the one non-ANY implementation we have in CH.  Everything
+    # else in CH is an ANY type, and we'll discover those on demand but won't
+    # have to import anything.
+    get_rdata_class(dns.rdataclass.CH, dns.rdatatype.A, False)
+    if disable_dynamic_load:
+        # Now disable dynamic loading so any subsequent unknown type immediately becomes
+        # GenericRdata without a load attempt.
+        global _dynamic_load_allowed
+        _dynamic_load_allowed = False
+
+
 def from_text(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    tok: Union[dns.tokenizer.Tokenizer, str],
-    origin: Optional[dns.name.Name] = None,
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
+    tok: dns.tokenizer.Tokenizer | str,
+    origin: dns.name.Name | None = None,
     relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
+    relativize_to: dns.name.Name | None = None,
+    idna_codec: dns.name.IDNACodec | None = None,
 ) -> Rdata:
     """Build an rdata object from text format.
 
@@ -723,9 +768,12 @@ def from_text(
     """
     if isinstance(tok, str):
         tok = dns.tokenizer.Tokenizer(tok, idna_codec=idna_codec)
+    if not isinstance(tok, dns.tokenizer.Tokenizer):
+        raise ValueError("tok must be a string or a Tokenizer")
     rdclass = dns.rdataclass.RdataClass.make(rdclass)
     rdtype = dns.rdatatype.RdataType.make(rdtype)
     cls = get_rdata_class(rdclass, rdtype)
+    assert cls is not None  # for type checkers
     with dns.exception.ExceptionWrapper(dns.exception.SyntaxError):
         rdata = None
         if cls != GenericRdata:
@@ -767,10 +815,10 @@ def from_text(
 
 
 def from_wire_parser(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
     parser: dns.wire.Parser,
-    origin: Optional[dns.name.Name] = None,
+    origin: dns.name.Name | None = None,
 ) -> Rdata:
     """Build an rdata object from wire format
 
@@ -798,17 +846,18 @@ def from_wire_parser(
     rdclass = dns.rdataclass.RdataClass.make(rdclass)
     rdtype = dns.rdatatype.RdataType.make(rdtype)
     cls = get_rdata_class(rdclass, rdtype)
+    assert cls is not None  # for type checkers
     with dns.exception.ExceptionWrapper(dns.exception.FormError):
         return cls.from_wire_parser(rdclass, rdtype, parser, origin)
 
 
 def from_wire(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
     wire: bytes,
     current: int,
     rdlen: int,
-    origin: Optional[dns.name.Name] = None,
+    origin: dns.name.Name | None = None,
 ) -> Rdata:
     """Build an rdata object from wire format
 
@@ -860,8 +909,8 @@ def register_type(
 ) -> None:
     """Dynamically register a module to handle an rdatatype.
 
-    *implementation*, a module implementing the type in the usual dnspython
-    way.
+    *implementation*, a subclass of ``dns.rdata.Rdata`` implementing the type,
+    or a module containing such a class named by its text form.
 
     *rdtype*, an ``int``, the rdatatype to register.
 
@@ -878,7 +927,9 @@ def register_type(
     existing_cls = get_rdata_class(rdclass, rdtype)
     if existing_cls != GenericRdata or dns.rdatatype.is_metatype(rdtype):
         raise RdatatypeExists(rdclass=rdclass, rdtype=rdtype)
-    _rdata_classes[(rdclass, rdtype)] = getattr(
-        implementation, rdtype_text.replace("-", "_")
-    )
+    if isinstance(implementation, type) and issubclass(implementation, Rdata):
+        impclass = implementation
+    else:
+        impclass = getattr(implementation, rdtype_text.replace("-", "_"))
+    _rdata_classes[(rdclass, rdtype)] = impclass
     dns.rdatatype.register_type(rdtype, rdtype_text, is_singleton)
diff --git a/libs/dns/rdataset.py b/libs/dns/rdataset.py
index 8bff58d7a5..1edf67d740 100644
--- a/libs/dns/rdataset.py
+++ b/libs/dns/rdataset.py
@@ -20,7 +20,7 @@
 import io
 import random
 import struct
-from typing import Any, Collection, Dict, List, Optional, Union, cast
+from typing import Any, Collection, Dict, List, cast
 
 import dns.exception
 import dns.immutable
@@ -75,7 +75,7 @@ def __init__(
         self.ttl = ttl
 
     def _clone(self):
-        obj = super()._clone()
+        obj = cast(Rdataset, super()._clone())
         obj.rdclass = self.rdclass
         obj.rdtype = self.rdtype
         obj.covers = self.covers
@@ -97,8 +97,9 @@ def update_ttl(self, ttl: int) -> None:
         elif ttl < self.ttl:
             self.ttl = ttl
 
-    def add(  # pylint: disable=arguments-differ,arguments-renamed
-        self, rd: dns.rdata.Rdata, ttl: Optional[int] = None
+    # pylint: disable=arguments-differ,arguments-renamed
+    def add(  # pyright: ignore
+        self, rd: dns.rdata.Rdata, ttl: int | None = None
     ) -> None:
         """Add the specified rdata to the rdataset.
 
@@ -160,7 +161,7 @@ def maybe_truncate(s):
                 return s[:100] + "..."
             return s
 
-        return "[%s]" % ", ".join("<%s>" % maybe_truncate(str(rr)) for rr in self)
+        return "[" + ", ".join(f"<{maybe_truncate(str(rr))}>" for rr in self) + "]"
 
     def __repr__(self):
         if self.covers == 0:
@@ -197,10 +198,10 @@ def __ne__(self, other):
 
     def to_text(
         self,
-        name: Optional[dns.name.Name] = None,
-        origin: Optional[dns.name.Name] = None,
+        name: dns.name.Name | None = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
-        override_rdclass: Optional[dns.rdataclass.RdataClass] = None,
+        override_rdclass: dns.rdataclass.RdataClass | None = None,
         want_comments: bool = False,
         **kw: Dict[str, Any],
     ) -> str:
@@ -248,12 +249,8 @@ def to_text(
             # (which is meaningless anyway).
             #
             s.write(
-                "{}{}{} {}\n".format(
-                    ntext,
-                    pad,
-                    dns.rdataclass.to_text(rdclass),
-                    dns.rdatatype.to_text(self.rdtype),
-                )
+                f"{ntext}{pad}{dns.rdataclass.to_text(rdclass)} "
+                f"{dns.rdatatype.to_text(self.rdtype)}\n"
             )
         else:
             for rd in self:
@@ -262,16 +259,11 @@ def to_text(
                     if rd.rdcomment:
                         extra = f" ;{rd.rdcomment}"
                 s.write(
-                    "%s%s%d %s %s %s%s\n"
-                    % (
-                        ntext,
-                        pad,
-                        self.ttl,
-                        dns.rdataclass.to_text(rdclass),
-                        dns.rdatatype.to_text(self.rdtype),
-                        rd.to_text(origin=origin, relativize=relativize, **kw),
-                        extra,
-                    )
+                    f"{ntext}{pad}{self.ttl} "
+                    f"{dns.rdataclass.to_text(rdclass)} "
+                    f"{dns.rdatatype.to_text(self.rdtype)} "
+                    f"{rd.to_text(origin=origin, relativize=relativize, **kw)}"
+                    f"{extra}\n"
                 )
         #
         # We strip off the final \n for the caller's convenience in printing
@@ -282,9 +274,9 @@ def to_wire(
         self,
         name: dns.name.Name,
         file: Any,
-        compress: Optional[dns.name.CompressType] = None,
-        origin: Optional[dns.name.Name] = None,
-        override_rdclass: Optional[dns.rdataclass.RdataClass] = None,
+        compress: dns.name.CompressType | None = None,
+        origin: dns.name.Name | None = None,
+        override_rdclass: dns.rdataclass.RdataClass | None = None,
         want_shuffle: bool = True,
     ) -> int:
         """Convert the rdataset to wire format.
@@ -321,7 +313,7 @@ class of the rdataset.  This is useful when rendering rdatasets
             file.write(struct.pack("!HHIH", self.rdtype, rdclass, 0, 0))
             return 1
         else:
-            l: Union[Rdataset, List[dns.rdata.Rdata]]
+            l: Rdataset | List[dns.rdata.Rdata]
             if want_shuffle:
                 l = list(self)
                 random.shuffle(l)
@@ -359,7 +351,7 @@ def processing_order(self) -> List[dns.rdata.Rdata]:
         if len(self) == 0:
             return []
         else:
-            return self[0]._processing_order(iter(self))
+            return self[0]._processing_order(iter(self))  # pyright: ignore
 
 
 @dns.immutable.immutable
@@ -414,33 +406,33 @@ def clear(self):
         raise TypeError("immutable")
 
     def __copy__(self):
-        return ImmutableRdataset(super().copy())
+        return ImmutableRdataset(super().copy())  # pyright: ignore
 
     def copy(self):
-        return ImmutableRdataset(super().copy())
+        return ImmutableRdataset(super().copy())  # pyright: ignore
 
     def union(self, other):
-        return ImmutableRdataset(super().union(other))
+        return ImmutableRdataset(super().union(other))  # pyright: ignore
 
     def intersection(self, other):
-        return ImmutableRdataset(super().intersection(other))
+        return ImmutableRdataset(super().intersection(other))  # pyright: ignore
 
     def difference(self, other):
-        return ImmutableRdataset(super().difference(other))
+        return ImmutableRdataset(super().difference(other))  # pyright: ignore
 
     def symmetric_difference(self, other):
-        return ImmutableRdataset(super().symmetric_difference(other))
+        return ImmutableRdataset(super().symmetric_difference(other))  # pyright: ignore
 
 
 def from_text_list(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
     ttl: int,
     text_rdatas: Collection[str],
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    origin: Optional[dns.name.Name] = None,
+    idna_codec: dns.name.IDNACodec | None = None,
+    origin: dns.name.Name | None = None,
     relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
+    relativize_to: dns.name.Name | None = None,
 ) -> Rdataset:
     """Create an rdataset with the specified class, type, and TTL, and with
     the specified list of rdatas in text format.
@@ -473,8 +465,8 @@ def from_text_list(
 
 
 def from_text(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
     ttl: int,
     *text_rdatas: Any,
 ) -> Rdataset:
diff --git a/libs/dns/rdatatype.py b/libs/dns/rdatatype.py
index e6c581867b..211d810da6 100644
--- a/libs/dns/rdatatype.py
+++ b/libs/dns/rdatatype.py
@@ -86,6 +86,7 @@ class RdataType(dns.enum.IntEnum):
     ZONEMD = 63
     SVCB = 64
     HTTPS = 65
+    DSYNC = 66
     SPF = 99
     UNSPEC = 103
     NID = 104
@@ -105,6 +106,8 @@ class RdataType(dns.enum.IntEnum):
     CAA = 257
     AVC = 258
     AMTRELAY = 260
+    RESINFO = 261
+    WALLET = 262
     TA = 32768
     DLV = 32769
 
@@ -125,7 +128,7 @@ def _extra_from_text(cls, text):
         if text.find("-") >= 0:
             try:
                 return cls[text.replace("-", "_")]
-            except KeyError:
+            except KeyError:  # pragma: no cover
                 pass
         return _registered_by_text.get(text)
 
@@ -307,6 +310,7 @@ def register_type(
 ZONEMD = RdataType.ZONEMD
 SVCB = RdataType.SVCB
 HTTPS = RdataType.HTTPS
+DSYNC = RdataType.DSYNC
 SPF = RdataType.SPF
 UNSPEC = RdataType.UNSPEC
 NID = RdataType.NID
@@ -326,6 +330,8 @@ def register_type(
 CAA = RdataType.CAA
 AVC = RdataType.AVC
 AMTRELAY = RdataType.AMTRELAY
+RESINFO = RdataType.RESINFO
+WALLET = RdataType.WALLET
 TA = RdataType.TA
 DLV = RdataType.DLV
 
diff --git a/libs/dns/rdtypes/ANY/AMTRELAY.py b/libs/dns/rdtypes/ANY/AMTRELAY.py
index ed2b072bb9..dc9fa87708 100644
--- a/libs/dns/rdtypes/ANY/AMTRELAY.py
+++ b/libs/dns/rdtypes/ANY/AMTRELAY.py
@@ -19,6 +19,7 @@
 
 import dns.exception
 import dns.immutable
+import dns.rdata
 import dns.rdtypes.util
 
 
@@ -50,11 +51,8 @@ def __init__(
 
     def to_text(self, origin=None, relativize=True, **kw):
         relay = Relay(self.relay_type, self.relay).to_text(origin, relativize)
-        return "%d %d %d %s" % (
-            self.precedence,
-            self.discovery_optional,
-            self.relay_type,
-            relay,
+        return (
+            f"{self.precedence} {self.discovery_optional:d} {self.relay_type} {relay}"
         )
 
     @classmethod
diff --git a/libs/dns/rdtypes/ANY/CAA.py b/libs/dns/rdtypes/ANY/CAA.py
index 2e6a7e7e52..8c62e62673 100644
--- a/libs/dns/rdtypes/ANY/CAA.py
+++ b/libs/dns/rdtypes/ANY/CAA.py
@@ -40,11 +40,7 @@ def __init__(self, rdclass, rdtype, flags, tag, value):
         self.value = self._as_bytes(value)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return '%u %s "%s"' % (
-            self.flags,
-            dns.rdata._escapify(self.tag),
-            dns.rdata._escapify(self.value),
-        )
+        return f'{self.flags} {dns.rdata._escapify(self.tag)} "{dns.rdata._escapify(self.value)}"'
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/CERT.py b/libs/dns/rdtypes/ANY/CERT.py
index f369cc858a..4d5e5bda19 100644
--- a/libs/dns/rdtypes/ANY/CERT.py
+++ b/libs/dns/rdtypes/ANY/CERT.py
@@ -84,12 +84,9 @@ def __init__(
 
     def to_text(self, origin=None, relativize=True, **kw):
         certificate_type = _ctype_to_text(self.certificate_type)
-        return "%s %d %s %s" % (
-            certificate_type,
-            self.key_tag,
-            dns.dnssectypes.Algorithm.to_text(self.algorithm),
-            dns.rdata._base64ify(self.certificate, **kw),
-        )
+        algorithm = dns.dnssectypes.Algorithm.to_text(self.algorithm)
+        certificate = dns.rdata._base64ify(self.certificate, **kw)  # pyright: ignore
+        return f"{certificate_type} {self.key_tag} {algorithm} {certificate}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/CSYNC.py b/libs/dns/rdtypes/ANY/CSYNC.py
index 2f972f6e76..103486d834 100644
--- a/libs/dns/rdtypes/ANY/CSYNC.py
+++ b/libs/dns/rdtypes/ANY/CSYNC.py
@@ -46,7 +46,7 @@ def __init__(self, rdclass, rdtype, serial, flags, windows):
 
     def to_text(self, origin=None, relativize=True, **kw):
         text = Bitmap(self.windows).to_text()
-        return "%d %d%s" % (self.serial, self.flags, text)
+        return f"{self.serial} {self.flags}{text}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/DSYNC.py b/libs/dns/rdtypes/ANY/DSYNC.py
new file mode 100644
index 0000000000..e8d1394afe
--- /dev/null
+++ b/libs/dns/rdtypes/ANY/DSYNC.py
@@ -0,0 +1,72 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+import struct
+
+import dns.enum
+import dns.exception
+import dns.immutable
+import dns.rdata
+import dns.rdatatype
+import dns.rdtypes.util
+
+
+class UnknownScheme(dns.exception.DNSException):
+    """Unknown DSYNC scheme"""
+
+
+class Scheme(dns.enum.IntEnum):
+    """DSYNC SCHEME"""
+
+    NOTIFY = 1
+
+    @classmethod
+    def _maximum(cls):
+        return 255
+
+    @classmethod
+    def _unknown_exception_class(cls):
+        return UnknownScheme
+
+
+@dns.immutable.immutable
+class DSYNC(dns.rdata.Rdata):
+    """DSYNC record"""
+
+    # see: draft-ietf-dnsop-generalized-notify
+
+    __slots__ = ["rrtype", "scheme", "port", "target"]
+
+    def __init__(self, rdclass, rdtype, rrtype, scheme, port, target):
+        super().__init__(rdclass, rdtype)
+        self.rrtype = self._as_rdatatype(rrtype)
+        self.scheme = Scheme.make(scheme)
+        self.port = self._as_uint16(port)
+        self.target = self._as_name(target)
+
+    def to_text(self, origin=None, relativize=True, **kw):
+        target = self.target.choose_relativity(origin, relativize)
+        return (
+            f"{dns.rdatatype.to_text(self.rrtype)} {Scheme.to_text(self.scheme)} "
+            f"{self.port} {target}"
+        )
+
+    @classmethod
+    def from_text(
+        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
+    ):
+        rrtype = dns.rdatatype.from_text(tok.get_string())
+        scheme = Scheme.make(tok.get_string())
+        port = tok.get_uint16()
+        target = tok.get_name(origin, relativize, relativize_to)
+        return cls(rdclass, rdtype, rrtype, scheme, port, target)
+
+    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
+        three_ints = struct.pack("!HBH", self.rrtype, self.scheme, self.port)
+        file.write(three_ints)
+        self.target.to_wire(file, None, origin, False)
+
+    @classmethod
+    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
+        (rrtype, scheme, port) = parser.get_struct("!HBH")
+        target = parser.get_name(origin)
+        return cls(rdclass, rdtype, rrtype, scheme, port, target)
diff --git a/libs/dns/rdtypes/ANY/GPOS.py b/libs/dns/rdtypes/ANY/GPOS.py
index 312338f9d1..d79f4a0669 100644
--- a/libs/dns/rdtypes/ANY/GPOS.py
+++ b/libs/dns/rdtypes/ANY/GPOS.py
@@ -75,8 +75,9 @@ def __init__(self, rdclass, rdtype, latitude, longitude, altitude):
             raise dns.exception.FormError("bad longitude")
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return "{} {} {}".format(
-            self.latitude.decode(), self.longitude.decode(), self.altitude.decode()
+        return (
+            f"{self.latitude.decode()} {self.longitude.decode()} "
+            f"{self.altitude.decode()}"
         )
 
     @classmethod
diff --git a/libs/dns/rdtypes/ANY/HINFO.py b/libs/dns/rdtypes/ANY/HINFO.py
index c2c45de01d..06ad3487cf 100644
--- a/libs/dns/rdtypes/ANY/HINFO.py
+++ b/libs/dns/rdtypes/ANY/HINFO.py
@@ -37,9 +37,7 @@ def __init__(self, rdclass, rdtype, cpu, os):
         self.os = self._as_bytes(os, True, 255)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return '"{}" "{}"'.format(
-            dns.rdata._escapify(self.cpu), dns.rdata._escapify(self.os)
-        )
+        return f'"{dns.rdata._escapify(self.cpu)}" "{dns.rdata._escapify(self.os)}"'
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/HIP.py b/libs/dns/rdtypes/ANY/HIP.py
index 9166913966..dc7948a1f5 100644
--- a/libs/dns/rdtypes/ANY/HIP.py
+++ b/libs/dns/rdtypes/ANY/HIP.py
@@ -48,8 +48,8 @@ def to_text(self, origin=None, relativize=True, **kw):
         for server in self.servers:
             servers.append(server.choose_relativity(origin, relativize))
         if len(servers) > 0:
-            text += " " + " ".join((x.to_unicode() for x in servers))
-        return "%u %s %s%s" % (self.algorithm, hit, key, text)
+            text += " " + " ".join(x.to_unicode() for x in servers)
+        return f"{self.algorithm} {hit} {key}{text}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/ISDN.py b/libs/dns/rdtypes/ANY/ISDN.py
index fb01eab3bb..6428a0a822 100644
--- a/libs/dns/rdtypes/ANY/ISDN.py
+++ b/libs/dns/rdtypes/ANY/ISDN.py
@@ -38,11 +38,12 @@ def __init__(self, rdclass, rdtype, address, subaddress):
 
     def to_text(self, origin=None, relativize=True, **kw):
         if self.subaddress:
-            return '"{}" "{}"'.format(
-                dns.rdata._escapify(self.address), dns.rdata._escapify(self.subaddress)
+            return (
+                f'"{dns.rdata._escapify(self.address)}" '
+                f'"{dns.rdata._escapify(self.subaddress)}"'
             )
         else:
-            return '"%s"' % dns.rdata._escapify(self.address)
+            return f'"{dns.rdata._escapify(self.address)}"'
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/L32.py b/libs/dns/rdtypes/ANY/L32.py
index 09804c2d56..f51e5c790b 100644
--- a/libs/dns/rdtypes/ANY/L32.py
+++ b/libs/dns/rdtypes/ANY/L32.py
@@ -3,6 +3,7 @@
 import struct
 
 import dns.immutable
+import dns.ipv4
 import dns.rdata
 
 
diff --git a/libs/dns/rdtypes/ANY/L64.py b/libs/dns/rdtypes/ANY/L64.py
index fb76808ec5..a47da19e18 100644
--- a/libs/dns/rdtypes/ANY/L64.py
+++ b/libs/dns/rdtypes/ANY/L64.py
@@ -3,6 +3,7 @@
 import struct
 
 import dns.immutable
+import dns.rdata
 import dns.rdtypes.util
 
 
diff --git a/libs/dns/rdtypes/ANY/LOC.py b/libs/dns/rdtypes/ANY/LOC.py
index a36a2c109c..6c7fe5e792 100644
--- a/libs/dns/rdtypes/ANY/LOC.py
+++ b/libs/dns/rdtypes/ANY/LOC.py
@@ -44,7 +44,7 @@ def _exponent_of(what, desc):
             exp = i - 1
             break
     if exp is None or exp < 0:
-        raise dns.exception.SyntaxError("%s value out of bounds" % desc)
+        raise dns.exception.SyntaxError(f"{desc} value out of bounds")
     return exp
 
 
@@ -83,10 +83,10 @@ def _encode_size(what, desc):
 def _decode_size(what, desc):
     exponent = what & 0x0F
     if exponent > 9:
-        raise dns.exception.FormError("bad %s exponent" % desc)
+        raise dns.exception.FormError(f"bad {desc} exponent")
     base = (what & 0xF0) >> 4
     if base > 9:
-        raise dns.exception.FormError("bad %s base" % desc)
+        raise dns.exception.FormError(f"bad {desc} base")
     return base * pow(10, exponent)
 
 
@@ -143,13 +143,13 @@ def __init__(
         if isinstance(latitude, float):
             latitude = _float_to_tuple(latitude)
         _check_coordinate_list(latitude, -90, 90)
-        self.latitude = tuple(latitude)
+        self.latitude = tuple(latitude)  # pyright: ignore
         if isinstance(longitude, int):
             longitude = float(longitude)
         if isinstance(longitude, float):
             longitude = _float_to_tuple(longitude)
         _check_coordinate_list(longitude, -180, 180)
-        self.longitude = tuple(longitude)
+        self.longitude = tuple(longitude)  # pyright: ignore
         self.altitude = float(altitude)
         self.size = float(size)
         self.horizontal_precision = float(hprec)
@@ -164,18 +164,12 @@ def to_text(self, origin=None, relativize=True, **kw):
             long_hemisphere = "E"
         else:
             long_hemisphere = "W"
-        text = "%d %d %d.%03d %s %d %d %d.%03d %s %0.2fm" % (
-            self.latitude[0],
-            self.latitude[1],
-            self.latitude[2],
-            self.latitude[3],
-            lat_hemisphere,
-            self.longitude[0],
-            self.longitude[1],
-            self.longitude[2],
-            self.longitude[3],
-            long_hemisphere,
-            self.altitude / 100.0,
+        text = (
+            f"{self.latitude[0]} {self.latitude[1]} "
+            f"{self.latitude[2]}.{self.latitude[3]:03d} {lat_hemisphere} "
+            f"{self.longitude[0]} {self.longitude[1]} "
+            f"{self.longitude[2]}.{self.longitude[3]:03d} {long_hemisphere} "
+            f"{(self.altitude / 100.0):0.2f}m"
         )
 
         # do not print default values
@@ -184,10 +178,9 @@ def to_text(self, origin=None, relativize=True, **kw):
             or self.horizontal_precision != _default_hprec
             or self.vertical_precision != _default_vprec
         ):
-            text += " {:0.2f}m {:0.2f}m {:0.2f}m".format(
-                self.size / 100.0,
-                self.horizontal_precision / 100.0,
-                self.vertical_precision / 100.0,
+            text += (
+                f" {self.size / 100.0:0.2f}m {self.horizontal_precision / 100.0:0.2f}m"
+                f" {self.vertical_precision / 100.0:0.2f}m"
             )
         return text
 
diff --git a/libs/dns/rdtypes/ANY/LP.py b/libs/dns/rdtypes/ANY/LP.py
index 312663f1df..379c8627a0 100644
--- a/libs/dns/rdtypes/ANY/LP.py
+++ b/libs/dns/rdtypes/ANY/LP.py
@@ -21,7 +21,7 @@ def __init__(self, rdclass, rdtype, preference, fqdn):
 
     def to_text(self, origin=None, relativize=True, **kw):
         fqdn = self.fqdn.choose_relativity(origin, relativize)
-        return "%d %s" % (self.preference, fqdn)
+        return f"{self.preference} {fqdn}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/NID.py b/libs/dns/rdtypes/ANY/NID.py
index 2f649178f5..fa0dad5cc7 100644
--- a/libs/dns/rdtypes/ANY/NID.py
+++ b/libs/dns/rdtypes/ANY/NID.py
@@ -3,6 +3,7 @@
 import struct
 
 import dns.immutable
+import dns.rdata
 import dns.rdtypes.util
 
 
diff --git a/libs/dns/rdtypes/ANY/NSEC.py b/libs/dns/rdtypes/ANY/NSEC.py
index 340525a6eb..3c78b72288 100644
--- a/libs/dns/rdtypes/ANY/NSEC.py
+++ b/libs/dns/rdtypes/ANY/NSEC.py
@@ -44,7 +44,7 @@ def __init__(self, rdclass, rdtype, next, windows):
     def to_text(self, origin=None, relativize=True, **kw):
         next = self.next.choose_relativity(origin, relativize)
         text = Bitmap(self.windows).to_text()
-        return "{}{}".format(next, text)
+        return f"{next}{text}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/NSEC3.py b/libs/dns/rdtypes/ANY/NSEC3.py
index d71302b717..6899418760 100644
--- a/libs/dns/rdtypes/ANY/NSEC3.py
+++ b/libs/dns/rdtypes/ANY/NSEC3.py
@@ -21,6 +21,7 @@
 
 import dns.exception
 import dns.immutable
+import dns.name
 import dns.rdata
 import dns.rdatatype
 import dns.rdtypes.util
@@ -75,14 +76,7 @@ def to_text(self, origin=None, relativize=True, **kw):
         else:
             salt = binascii.hexlify(self.salt).decode()
         text = Bitmap(self.windows).to_text()
-        return "%u %u %u %s %s%s" % (
-            self.algorithm,
-            self.flags,
-            self.iterations,
-            salt,
-            next,
-            text,
-        )
+        return f"{self.algorithm} {self.flags} {self.iterations} {salt} {next}{text}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/NSEC3PARAM.py b/libs/dns/rdtypes/ANY/NSEC3PARAM.py
index d1e62ebcf1..e8678722c9 100644
--- a/libs/dns/rdtypes/ANY/NSEC3PARAM.py
+++ b/libs/dns/rdtypes/ANY/NSEC3PARAM.py
@@ -41,7 +41,7 @@ def to_text(self, origin=None, relativize=True, **kw):
             salt = "-"
         else:
             salt = binascii.hexlify(self.salt).decode()
-        return "%u %u %u %s" % (self.algorithm, self.flags, self.iterations, salt)
+        return f"{self.algorithm} {self.flags} {self.iterations} {salt}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/OPENPGPKEY.py b/libs/dns/rdtypes/ANY/OPENPGPKEY.py
index 4d7a4b6c87..ac1841cce6 100644
--- a/libs/dns/rdtypes/ANY/OPENPGPKEY.py
+++ b/libs/dns/rdtypes/ANY/OPENPGPKEY.py
@@ -34,7 +34,7 @@ def __init__(self, rdclass, rdtype, key):
         self.key = self._as_bytes(key)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return dns.rdata._base64ify(self.key, chunksize=None, **kw)
+        return dns.rdata._base64ify(self.key, chunksize=None, **kw)  # pyright: ignore
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/RESINFO.py b/libs/dns/rdtypes/ANY/RESINFO.py
new file mode 100644
index 0000000000..76c8ea2ac4
--- /dev/null
+++ b/libs/dns/rdtypes/ANY/RESINFO.py
@@ -0,0 +1,24 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
+#
+# Permission to use, copy, modify, and distribute this software and its
+# documentation for any purpose with or without fee is hereby granted,
+# provided that the above copyright notice and this permission notice
+# appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+import dns.immutable
+import dns.rdtypes.txtbase
+
+
+@dns.immutable.immutable
+class RESINFO(dns.rdtypes.txtbase.TXTBase):
+    """RESINFO record"""
diff --git a/libs/dns/rdtypes/ANY/RP.py b/libs/dns/rdtypes/ANY/RP.py
index 9b74549db9..a66cfc50f5 100644
--- a/libs/dns/rdtypes/ANY/RP.py
+++ b/libs/dns/rdtypes/ANY/RP.py
@@ -37,7 +37,7 @@ def __init__(self, rdclass, rdtype, mbox, txt):
     def to_text(self, origin=None, relativize=True, **kw):
         mbox = self.mbox.choose_relativity(origin, relativize)
         txt = self.txt.choose_relativity(origin, relativize)
-        return "{} {}".format(str(mbox), str(txt))
+        return f"{str(mbox)} {str(txt)}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/RRSIG.py b/libs/dns/rdtypes/ANY/RRSIG.py
index 8beb423786..5556cbaccc 100644
--- a/libs/dns/rdtypes/ANY/RRSIG.py
+++ b/libs/dns/rdtypes/ANY/RRSIG.py
@@ -94,16 +94,14 @@ def covers(self):
         return self.type_covered
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return "%s %d %d %d %s %s %d %s %s" % (
-            dns.rdatatype.to_text(self.type_covered),
-            self.algorithm,
-            self.labels,
-            self.original_ttl,
-            posixtime_to_sigtime(self.expiration),
-            posixtime_to_sigtime(self.inception),
-            self.key_tag,
-            self.signer.choose_relativity(origin, relativize),
-            dns.rdata._base64ify(self.signature, **kw),
+        return (
+            f"{dns.rdatatype.to_text(self.type_covered)} "
+            f"{self.algorithm} {self.labels} {self.original_ttl} "
+            f"{posixtime_to_sigtime(self.expiration)} "
+            f"{posixtime_to_sigtime(self.inception)} "
+            f"{self.key_tag} "
+            f"{self.signer.choose_relativity(origin, relativize)} "
+            f"{dns.rdata._base64ify(self.signature, **kw)}"  # pyright: ignore
         )
 
     @classmethod
@@ -154,4 +152,4 @@ def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
         header = parser.get_struct("!HBBIIIH")
         signer = parser.get_name(origin)
         signature = parser.get_remaining()
-        return cls(rdclass, rdtype, *header, signer, signature)
+        return cls(rdclass, rdtype, *header, signer, signature)  # pyright: ignore
diff --git a/libs/dns/rdtypes/ANY/SOA.py b/libs/dns/rdtypes/ANY/SOA.py
index 09aa8321c7..3c7cd8c92e 100644
--- a/libs/dns/rdtypes/ANY/SOA.py
+++ b/libs/dns/rdtypes/ANY/SOA.py
@@ -46,15 +46,7 @@ def __init__(
     def to_text(self, origin=None, relativize=True, **kw):
         mname = self.mname.choose_relativity(origin, relativize)
         rname = self.rname.choose_relativity(origin, relativize)
-        return "%s %s %d %d %d %d %d" % (
-            mname,
-            rname,
-            self.serial,
-            self.refresh,
-            self.retry,
-            self.expire,
-            self.minimum,
-        )
+        return f"{mname} {rname} {self.serial} {self.refresh} {self.retry} {self.expire} {self.minimum}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/SSHFP.py b/libs/dns/rdtypes/ANY/SSHFP.py
index d2c4b0730f..3f08f3a594 100644
--- a/libs/dns/rdtypes/ANY/SSHFP.py
+++ b/libs/dns/rdtypes/ANY/SSHFP.py
@@ -40,11 +40,10 @@ def __init__(self, rdclass, rdtype, algorithm, fp_type, fingerprint):
     def to_text(self, origin=None, relativize=True, **kw):
         kw = kw.copy()
         chunksize = kw.pop("chunksize", 128)
-        return "%d %d %s" % (
-            self.algorithm,
-            self.fp_type,
-            dns.rdata._hexify(self.fingerprint, chunksize=chunksize, **kw),
+        fingerprint = dns.rdata._hexify(
+            self.fingerprint, chunksize=chunksize, **kw  # pyright: ignore
         )
+        return f"{self.algorithm} {self.fp_type} {fingerprint}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/TKEY.py b/libs/dns/rdtypes/ANY/TKEY.py
index 5b490b82cd..f9189b16c1 100644
--- a/libs/dns/rdtypes/ANY/TKEY.py
+++ b/libs/dns/rdtypes/ANY/TKEY.py
@@ -60,18 +60,11 @@ def __init__(
 
     def to_text(self, origin=None, relativize=True, **kw):
         _algorithm = self.algorithm.choose_relativity(origin, relativize)
-        text = "%s %u %u %u %u %s" % (
-            str(_algorithm),
-            self.inception,
-            self.expiration,
-            self.mode,
-            self.error,
-            dns.rdata._base64ify(self.key, 0),
-        )
+        key = dns.rdata._base64ify(self.key, 0)
+        other = ""
         if len(self.other) > 0:
-            text += " %s" % (dns.rdata._base64ify(self.other, 0))
-
-        return text
+            other = " " + dns.rdata._base64ify(self.other, 0)
+        return f"{_algorithm} {self.inception} {self.expiration} {self.mode} {self.error} {key}{other}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/URI.py b/libs/dns/rdtypes/ANY/URI.py
index 2efbb305a9..021391d68d 100644
--- a/libs/dns/rdtypes/ANY/URI.py
+++ b/libs/dns/rdtypes/ANY/URI.py
@@ -42,7 +42,7 @@ def __init__(self, rdclass, rdtype, priority, weight, target):
             raise dns.exception.SyntaxError("URI target cannot be empty")
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return '%d %d "%s"' % (self.priority, self.weight, self.target.decode())
+        return f'{self.priority} {self.weight} "{self.target.decode()}"'
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/WALLET.py b/libs/dns/rdtypes/ANY/WALLET.py
new file mode 100644
index 0000000000..ff4647632b
--- /dev/null
+++ b/libs/dns/rdtypes/ANY/WALLET.py
@@ -0,0 +1,9 @@
+# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
+
+import dns.immutable
+import dns.rdtypes.txtbase
+
+
+@dns.immutable.immutable
+class WALLET(dns.rdtypes.txtbase.TXTBase):
+    """WALLET record"""
diff --git a/libs/dns/rdtypes/ANY/X25.py b/libs/dns/rdtypes/ANY/X25.py
index 8375611d25..2436ddb62e 100644
--- a/libs/dns/rdtypes/ANY/X25.py
+++ b/libs/dns/rdtypes/ANY/X25.py
@@ -36,7 +36,7 @@ def __init__(self, rdclass, rdtype, address):
         self.address = self._as_bytes(address, True, 255)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return '"%s"' % dns.rdata._escapify(self.address)
+        return f'"{dns.rdata._escapify(self.address)}"'
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/ZONEMD.py b/libs/dns/rdtypes/ANY/ZONEMD.py
index c90e3ee1f9..acef4f277e 100644
--- a/libs/dns/rdtypes/ANY/ZONEMD.py
+++ b/libs/dns/rdtypes/ANY/ZONEMD.py
@@ -36,12 +36,10 @@ def __init__(self, rdclass, rdtype, serial, scheme, hash_algorithm, digest):
     def to_text(self, origin=None, relativize=True, **kw):
         kw = kw.copy()
         chunksize = kw.pop("chunksize", 128)
-        return "%d %d %d %s" % (
-            self.serial,
-            self.scheme,
-            self.hash_algorithm,
-            dns.rdata._hexify(self.digest, chunksize=chunksize, **kw),
+        digest = dns.rdata._hexify(
+            self.digest, chunksize=chunksize, **kw  # pyright: ignore
         )
+        return f"{self.serial} {self.scheme} {self.hash_algorithm} {digest}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/ANY/__init__.py b/libs/dns/rdtypes/ANY/__init__.py
index 3824a0a09e..cc39f8642e 100644
--- a/libs/dns/rdtypes/ANY/__init__.py
+++ b/libs/dns/rdtypes/ANY/__init__.py
@@ -31,6 +31,7 @@
     "DNAME",
     "DNSKEY",
     "DS",
+    "DSYNC",
     "EUI48",
     "EUI64",
     "GPOS",
@@ -51,6 +52,7 @@
     "OPENPGPKEY",
     "OPT",
     "PTR",
+    "RESINFO",
     "RP",
     "RRSIG",
     "RT",
@@ -63,6 +65,7 @@
     "TSIG",
     "TXT",
     "URI",
+    "WALLET",
     "X25",
     "ZONEMD",
 ]
diff --git a/libs/dns/rdtypes/CH/A.py b/libs/dns/rdtypes/CH/A.py
index 583a88ac61..e3e0752118 100644
--- a/libs/dns/rdtypes/CH/A.py
+++ b/libs/dns/rdtypes/CH/A.py
@@ -18,6 +18,7 @@
 import struct
 
 import dns.immutable
+import dns.rdata
 import dns.rdtypes.mxbase
 
 
@@ -37,7 +38,7 @@ def __init__(self, rdclass, rdtype, domain, address):
 
     def to_text(self, origin=None, relativize=True, **kw):
         domain = self.domain.choose_relativity(origin, relativize)
-        return "%s %o" % (domain, self.address)
+        return f"{domain} {self.address:o}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/IN/APL.py b/libs/dns/rdtypes/IN/APL.py
index 44cb3fefa2..c4ce6e4588 100644
--- a/libs/dns/rdtypes/IN/APL.py
+++ b/libs/dns/rdtypes/IN/APL.py
@@ -48,9 +48,9 @@ def __init__(self, family, negation, address, prefix):
 
     def __str__(self):
         if self.negation:
-            return "!%d:%s/%s" % (self.family, self.address, self.prefix)
+            return f"!{self.family}:{self.address}/{self.prefix}"
         else:
-            return "%d:%s/%s" % (self.family, self.address, self.prefix)
+            return f"{self.family}:{self.address}/{self.prefix}"
 
     def to_wire(self, file):
         if self.family == 1:
diff --git a/libs/dns/rdtypes/IN/DHCID.py b/libs/dns/rdtypes/IN/DHCID.py
index 723492fa6c..8de8cdf167 100644
--- a/libs/dns/rdtypes/IN/DHCID.py
+++ b/libs/dns/rdtypes/IN/DHCID.py
@@ -35,7 +35,7 @@ def __init__(self, rdclass, rdtype, data):
         self.data = self._as_bytes(data)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return dns.rdata._base64ify(self.data, **kw)
+        return dns.rdata._base64ify(self.data, **kw)  # pyright: ignore
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/IN/IPSECKEY.py b/libs/dns/rdtypes/IN/IPSECKEY.py
index e3a6615749..aef93ae140 100644
--- a/libs/dns/rdtypes/IN/IPSECKEY.py
+++ b/libs/dns/rdtypes/IN/IPSECKEY.py
@@ -20,6 +20,7 @@
 
 import dns.exception
 import dns.immutable
+import dns.rdata
 import dns.rdtypes.util
 
 
@@ -48,13 +49,8 @@ def __init__(
 
     def to_text(self, origin=None, relativize=True, **kw):
         gateway = Gateway(self.gateway_type, self.gateway).to_text(origin, relativize)
-        return "%d %d %d %s %s" % (
-            self.precedence,
-            self.gateway_type,
-            self.algorithm,
-            gateway,
-            dns.rdata._base64ify(self.key, **kw),
-        )
+        key = dns.rdata._base64ify(self.key, **kw)  # pyright: ignore
+        return f"{self.precedence} {self.gateway_type} {self.algorithm} {gateway} {key}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/IN/NAPTR.py b/libs/dns/rdtypes/IN/NAPTR.py
index 195d1cbac5..98bbf4abac 100644
--- a/libs/dns/rdtypes/IN/NAPTR.py
+++ b/libs/dns/rdtypes/IN/NAPTR.py
@@ -52,13 +52,12 @@ def __init__(
 
     def to_text(self, origin=None, relativize=True, **kw):
         replacement = self.replacement.choose_relativity(origin, relativize)
-        return '%d %d "%s" "%s" "%s" %s' % (
-            self.order,
-            self.preference,
-            dns.rdata._escapify(self.flags),
-            dns.rdata._escapify(self.service),
-            dns.rdata._escapify(self.regexp),
-            replacement,
+        return (
+            f"{self.order} {self.preference} "
+            f'"{dns.rdata._escapify(self.flags)}" '
+            f'"{dns.rdata._escapify(self.service)}" '
+            f'"{dns.rdata._escapify(self.regexp)}" '
+            f"{replacement}"
         )
 
     @classmethod
diff --git a/libs/dns/rdtypes/IN/NSAP.py b/libs/dns/rdtypes/IN/NSAP.py
index a4854b3fa1..d55edb7372 100644
--- a/libs/dns/rdtypes/IN/NSAP.py
+++ b/libs/dns/rdtypes/IN/NSAP.py
@@ -36,7 +36,7 @@ def __init__(self, rdclass, rdtype, address):
         self.address = self._as_bytes(address)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return "0x%s" % binascii.hexlify(self.address).decode()
+        return f"0x{binascii.hexlify(self.address).decode()}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/IN/PX.py b/libs/dns/rdtypes/IN/PX.py
index cdca153223..20143bf6cb 100644
--- a/libs/dns/rdtypes/IN/PX.py
+++ b/libs/dns/rdtypes/IN/PX.py
@@ -41,7 +41,7 @@ def __init__(self, rdclass, rdtype, preference, map822, mapx400):
     def to_text(self, origin=None, relativize=True, **kw):
         map822 = self.map822.choose_relativity(origin, relativize)
         mapx400 = self.mapx400.choose_relativity(origin, relativize)
-        return "%d %s %s" % (self.preference, map822, mapx400)
+        return f"{self.preference} {map822} {mapx400}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/IN/SRV.py b/libs/dns/rdtypes/IN/SRV.py
index 5adef98f9d..044c10e3a4 100644
--- a/libs/dns/rdtypes/IN/SRV.py
+++ b/libs/dns/rdtypes/IN/SRV.py
@@ -41,7 +41,7 @@ def __init__(self, rdclass, rdtype, priority, weight, port, target):
 
     def to_text(self, origin=None, relativize=True, **kw):
         target = self.target.choose_relativity(origin, relativize)
-        return "%d %d %d %s" % (self.priority, self.weight, self.port, target)
+        return f"{self.priority} {self.weight} {self.port} {target}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/IN/WKS.py b/libs/dns/rdtypes/IN/WKS.py
index 881a7849a1..cc6c3733b7 100644
--- a/libs/dns/rdtypes/IN/WKS.py
+++ b/libs/dns/rdtypes/IN/WKS.py
@@ -52,7 +52,7 @@ def to_text(self, origin=None, relativize=True, **kw):
                 if byte & (0x80 >> j):
                     bits.append(str(i * 8 + j))
         text = " ".join(bits)
-        return "%s %d %s" % (self.address, self.protocol, text)
+        return f"{self.address} {self.protocol} {text}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/dnskeybase.py b/libs/dns/rdtypes/dnskeybase.py
index db300f8b15..fb49f9220d 100644
--- a/libs/dns/rdtypes/dnskeybase.py
+++ b/libs/dns/rdtypes/dnskeybase.py
@@ -48,12 +48,8 @@ def __init__(self, rdclass, rdtype, flags, protocol, algorithm, key):
         self.key = self._as_bytes(key)
 
     def to_text(self, origin=None, relativize=True, **kw):
-        return "%d %d %d %s" % (
-            self.flags,
-            self.protocol,
-            self.algorithm,
-            dns.rdata._base64ify(self.key, **kw),
-        )
+        key = dns.rdata._base64ify(self.key, **kw)  # pyright: ignore
+        return f"{self.flags} {self.protocol} {self.algorithm} {key}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/dsbase.py b/libs/dns/rdtypes/dsbase.py
index cd21f026dc..8e05c2a752 100644
--- a/libs/dns/rdtypes/dsbase.py
+++ b/libs/dns/rdtypes/dsbase.py
@@ -55,12 +55,10 @@ def __init__(self, rdclass, rdtype, key_tag, algorithm, digest_type, digest):
     def to_text(self, origin=None, relativize=True, **kw):
         kw = kw.copy()
         chunksize = kw.pop("chunksize", 128)
-        return "%d %d %d %s" % (
-            self.key_tag,
-            self.algorithm,
-            self.digest_type,
-            dns.rdata._hexify(self.digest, chunksize=chunksize, **kw),
+        digest = dns.rdata._hexify(
+            self.digest, chunksize=chunksize, **kw  # pyright: ignore
         )
+        return f"{self.key_tag} {self.algorithm} {self.digest_type} {digest}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/euibase.py b/libs/dns/rdtypes/euibase.py
index 751087b474..4eb82eb5e8 100644
--- a/libs/dns/rdtypes/euibase.py
+++ b/libs/dns/rdtypes/euibase.py
@@ -16,6 +16,7 @@
 
 import binascii
 
+import dns.exception
 import dns.immutable
 import dns.rdata
 
@@ -27,7 +28,9 @@ class EUIBase(dns.rdata.Rdata):
     # see: rfc7043.txt
 
     __slots__ = ["eui"]
-    # define these in subclasses
+    # redefine these in subclasses
+    byte_len = 0
+    text_len = 0
     # byte_len = 6  # 0123456789ab (in hex)
     # text_len = byte_len * 3 - 1  # 01-23-45-67-89-ab
 
@@ -36,7 +39,7 @@ def __init__(self, rdclass, rdtype, eui):
         self.eui = self._as_bytes(eui)
         if len(self.eui) != self.byte_len:
             raise dns.exception.FormError(
-                "EUI%s rdata has to have %s bytes" % (self.byte_len * 8, self.byte_len)
+                f"EUI{self.byte_len * 8} rdata has to have {self.byte_len} bytes"
             )
 
     def to_text(self, origin=None, relativize=True, **kw):
@@ -49,16 +52,16 @@ def from_text(
         text = tok.get_string()
         if len(text) != cls.text_len:
             raise dns.exception.SyntaxError(
-                "Input text must have %s characters" % cls.text_len
+                f"Input text must have {cls.text_len} characters"
             )
         for i in range(2, cls.byte_len * 3 - 1, 3):
             if text[i] != "-":
-                raise dns.exception.SyntaxError("Dash expected at position %s" % i)
+                raise dns.exception.SyntaxError(f"Dash expected at position {i}")
         text = text.replace("-", "")
         try:
             data = binascii.unhexlify(text.encode())
         except (ValueError, TypeError) as ex:
-            raise dns.exception.SyntaxError("Hex decoding error: %s" % str(ex))
+            raise dns.exception.SyntaxError(f"Hex decoding error: {str(ex)}")
         return cls(rdclass, rdtype, data)
 
     def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
diff --git a/libs/dns/rdtypes/mxbase.py b/libs/dns/rdtypes/mxbase.py
index 6d5e3d87e7..5d33e61f62 100644
--- a/libs/dns/rdtypes/mxbase.py
+++ b/libs/dns/rdtypes/mxbase.py
@@ -39,7 +39,7 @@ def __init__(self, rdclass, rdtype, preference, exchange):
 
     def to_text(self, origin=None, relativize=True, **kw):
         exchange = self.exchange.choose_relativity(origin, relativize)
-        return "%d %s" % (self.preference, exchange)
+        return f"{self.preference} {exchange}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/svcbbase.py b/libs/dns/rdtypes/svcbbase.py
index 0565241311..7338b664da 100644
--- a/libs/dns/rdtypes/svcbbase.py
+++ b/libs/dns/rdtypes/svcbbase.py
@@ -3,6 +3,7 @@
 import base64
 import enum
 import struct
+from typing import Any, Dict
 
 import dns.enum
 import dns.exception
@@ -35,6 +36,7 @@ class ParamKey(dns.enum.IntEnum):
     ECH = 5
     IPV6HINT = 6
     DOHPATH = 7
+    OHTTP = 8
 
     @classmethod
     def _maximum(cls):
@@ -92,13 +94,13 @@ def _escapify(qstring):
         elif c >= 0x20 and c < 0x7F:
             text += chr(c)
         else:
-            text += "\\%03d" % c
+            text += f"\\{c:03d}"
     return text
 
 
-def _unescape(value):
+def _unescape(value: str) -> bytes:
     if value == "":
-        return value
+        return b""
     unescaped = b""
     l = len(value)
     i = 0
@@ -158,7 +160,7 @@ class Param:
     """Abstract base class for SVCB parameters"""
 
     @classmethod
-    def emptiness(cls):
+    def emptiness(cls) -> Emptiness:
         return Emptiness.NEVER
 
 
@@ -396,7 +398,37 @@ def to_wire(self, file, origin=None):  # pylint: disable=W0613
         file.write(self.ech)
 
 
-_class_for_key = {
+@dns.immutable.immutable
+class OHTTPParam(Param):
+    # We don't ever expect to instantiate this class, but we need
+    # a from_value() and a from_wire_parser(), so we just return None
+    # from the class methods when things are OK.
+
+    @classmethod
+    def emptiness(cls):
+        return Emptiness.ALWAYS
+
+    @classmethod
+    def from_value(cls, value):
+        if value is None or value == "":
+            return None
+        else:
+            raise ValueError("ohttp with non-empty value")
+
+    def to_text(self):
+        raise NotImplementedError  # pragma: no cover
+
+    @classmethod
+    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
+        if parser.remaining() != 0:
+            raise dns.exception.FormError
+        return None
+
+    def to_wire(self, file, origin=None):  # pylint: disable=W0613
+        raise NotImplementedError  # pragma: no cover
+
+
+_class_for_key: Dict[ParamKey, Any] = {
     ParamKey.MANDATORY: MandatoryParam,
     ParamKey.ALPN: ALPNParam,
     ParamKey.NO_DEFAULT_ALPN: NoDefaultALPNParam,
@@ -404,6 +436,7 @@ def to_wire(self, file, origin=None):  # pylint: disable=W0613
     ParamKey.IPV4HINT: IPv4HintParam,
     ParamKey.ECH: ECHParam,
     ParamKey.IPV6HINT: IPv6HintParam,
+    ParamKey.OHTTP: OHTTPParam,
 }
 
 
@@ -470,7 +503,7 @@ def to_text(self, origin=None, relativize=True, **kw):
             space = " "
         else:
             space = ""
-        return "%d %s%s%s" % (self.priority, target, space, " ".join(params))
+        return f"{self.priority} {target}{space}{' '.join(params)}"
 
     @classmethod
     def from_text(
@@ -539,10 +572,11 @@ def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
                 raise dns.exception.FormError("keys not in order")
             prior_key = key
             vlen = parser.get_uint16()
-            pcls = _class_for_key.get(key, GenericParam)
+            pkey = ParamKey.make(key)
+            pcls = _class_for_key.get(pkey, GenericParam)
             with parser.restrict_to(vlen):
                 value = pcls.from_wire_parser(parser, origin)
-            params[key] = value
+            params[pkey] = value
         return cls(rdclass, rdtype, priority, target, params)
 
     def _processing_priority(self):
diff --git a/libs/dns/rdtypes/tlsabase.py b/libs/dns/rdtypes/tlsabase.py
index a059d2c4a4..ddc196f1f6 100644
--- a/libs/dns/rdtypes/tlsabase.py
+++ b/libs/dns/rdtypes/tlsabase.py
@@ -41,12 +41,10 @@ def __init__(self, rdclass, rdtype, usage, selector, mtype, cert):
     def to_text(self, origin=None, relativize=True, **kw):
         kw = kw.copy()
         chunksize = kw.pop("chunksize", 128)
-        return "%d %d %d %s" % (
-            self.usage,
-            self.selector,
-            self.mtype,
-            dns.rdata._hexify(self.cert, chunksize=chunksize, **kw),
+        cert = dns.rdata._hexify(
+            self.cert, chunksize=chunksize, **kw  # pyright: ignore
         )
+        return f"{self.usage} {self.selector} {self.mtype} {cert}"
 
     @classmethod
     def from_text(
diff --git a/libs/dns/rdtypes/txtbase.py b/libs/dns/rdtypes/txtbase.py
index 44d6df57e2..5e5b24f5d2 100644
--- a/libs/dns/rdtypes/txtbase.py
+++ b/libs/dns/rdtypes/txtbase.py
@@ -17,11 +17,14 @@
 
 """TXT-like base class."""
 
-from typing import Any, Dict, Iterable, Optional, Tuple, Union
+from typing import Any, Dict, Iterable, Tuple
 
 import dns.exception
 import dns.immutable
+import dns.name
 import dns.rdata
+import dns.rdataclass
+import dns.rdatatype
 import dns.renderer
 import dns.tokenizer
 
@@ -36,7 +39,7 @@ def __init__(
         self,
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
-        strings: Iterable[Union[bytes, str]],
+        strings: Iterable[bytes | str],
     ):
         """Initialize a TXT-like rdata.
 
@@ -50,17 +53,19 @@ def __init__(
         self.strings: Tuple[bytes] = self._as_tuple(
             strings, lambda x: self._as_bytes(x, True, 255)
         )
+        if len(self.strings) == 0:
+            raise ValueError("the list of strings must not be empty")
 
     def to_text(
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
         **kw: Dict[str, Any],
     ) -> str:
         txt = ""
         prefix = ""
         for s in self.strings:
-            txt += '{}"{}"'.format(prefix, dns.rdata._escapify(s))
+            txt += f'{prefix}"{dns.rdata._escapify(s)}"'
             prefix = " "
         return txt
 
@@ -70,9 +75,9 @@ def from_text(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         tok: dns.tokenizer.Tokenizer,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
-        relativize_to: Optional[dns.name.Name] = None,
+        relativize_to: dns.name.Name | None = None,
     ) -> dns.rdata.Rdata:
         strings = []
         for token in tok.get_remaining():
diff --git a/libs/dns/rdtypes/util.py b/libs/dns/rdtypes/util.py
index 54908fdc5a..c17b154b8f 100644
--- a/libs/dns/rdtypes/util.py
+++ b/libs/dns/rdtypes/util.py
@@ -18,13 +18,16 @@
 import collections
 import random
 import struct
-from typing import Any, List
+from typing import Any, Iterable, List, Tuple
 
 import dns.exception
 import dns.ipv4
 import dns.ipv6
 import dns.name
 import dns.rdata
+import dns.rdatatype
+import dns.tokenizer
+import dns.wire
 
 
 class Gateway:
@@ -32,7 +35,7 @@ class Gateway:
 
     name = ""
 
-    def __init__(self, type, gateway=None):
+    def __init__(self, type: Any, gateway: str | dns.name.Name | None = None):
         self.type = dns.rdata.Rdata._as_uint8(type)
         self.gateway = gateway
         self._check()
@@ -48,9 +51,11 @@ def _check(self):
             self.gateway = None
         elif self.type == 1:
             # check that it's OK
+            assert isinstance(self.gateway, str)
             dns.ipv4.inet_aton(self.gateway)
         elif self.type == 2:
             # check that it's OK
+            assert isinstance(self.gateway, str)
             dns.ipv6.inet_aton(self.gateway)
         elif self.type == 3:
             if not isinstance(self.gateway, dns.name.Name):
@@ -64,6 +69,7 @@ def to_text(self, origin=None, relativize=True):
         elif self.type in (1, 2):
             return self.gateway
         elif self.type == 3:
+            assert isinstance(self.gateway, dns.name.Name)
             return str(self.gateway.choose_relativity(origin, relativize))
         else:
             raise ValueError(self._invalid_type(self.type))  # pragma: no cover
@@ -87,10 +93,13 @@ def to_wire(self, file, compress=None, origin=None, canonicalize=False):
         if self.type == 0:
             pass
         elif self.type == 1:
+            assert isinstance(self.gateway, str)
             file.write(dns.ipv4.inet_aton(self.gateway))
         elif self.type == 2:
+            assert isinstance(self.gateway, str)
             file.write(dns.ipv6.inet_aton(self.gateway))
         elif self.type == 3:
+            assert isinstance(self.gateway, dns.name.Name)
             self.gateway.to_wire(file, None, origin, False)
         else:
             raise ValueError(self._invalid_type(self.type))  # pragma: no cover
@@ -117,8 +126,10 @@ class Bitmap:
 
     type_name = ""
 
-    def __init__(self, windows=None):
+    def __init__(self, windows: Iterable[Tuple[int, bytes]] | None = None):
         last_window = -1
+        if windows is None:
+            windows = []
         self.windows = windows
         for window, bitmap in self.windows:
             if not isinstance(window, int):
@@ -140,7 +151,7 @@ def to_text(self) -> str:
             for i, byte in enumerate(bitmap):
                 for j in range(0, 8):
                     if byte & (0x80 >> j):
-                        rdtype = window * 256 + i * 8 + j
+                        rdtype = dns.rdatatype.RdataType.make(window * 256 + i * 8 + j)
                         bits.append(dns.rdatatype.to_text(rdtype))
             text += " " + " ".join(bits)
         return text
@@ -231,14 +242,15 @@ def weighted_processing_order(iterable):
         total = sum(rdata._processing_weight() or _no_weight for rdata in rdatas)
         while len(rdatas) > 1:
             r = random.uniform(0, total)
-            for n, rdata in enumerate(rdatas):
+            for n, rdata in enumerate(rdatas):  # noqa: B007
                 weight = rdata._processing_weight() or _no_weight
                 if weight > r:
                     break
                 r -= weight
-            total -= weight
-            ordered.append(rdata)  # pylint: disable=undefined-loop-variable
-            del rdatas[n]  # pylint: disable=undefined-loop-variable
+            total -= weight  # pyright: ignore[reportPossiblyUnboundVariable]
+            # pylint: disable=undefined-loop-variable
+            ordered.append(rdata)  # pyright: ignore[reportPossiblyUnboundVariable]
+            del rdatas[n]  # pyright: ignore[reportPossiblyUnboundVariable]
         ordered.append(rdatas[0])
     return ordered
 
diff --git a/libs/dns/renderer.py b/libs/dns/renderer.py
index a77481f67c..cc912b29d9 100644
--- a/libs/dns/renderer.py
+++ b/libs/dns/renderer.py
@@ -23,9 +23,14 @@
 import struct
 import time
 
+import dns.edns
 import dns.exception
+import dns.rdataclass
+import dns.rdatatype
 import dns.tsig
 
+# Note we can't import dns.message for cicularity reasons
+
 QUESTION = 0
 ANSWER = 1
 AUTHORITY = 2
@@ -214,7 +219,9 @@ def add_opt(self, opt, pad=0, opt_size=0, tsig_size=0):
                 pad = b""
             options = list(opt_rdata.options)
             options.append(dns.edns.GenericOption(dns.edns.OptionType.PADDING, pad))
-            opt = dns.message.Message._make_opt(ttl, opt_rdata.rdclass, options)
+            opt = dns.message.Message._make_opt(  # pyright: ignore
+                ttl, opt_rdata.rdclass, options
+            )
             self.was_padded = True
         self.add_rrset(ADDITIONAL, opt)
 
@@ -224,7 +231,9 @@ def add_edns(self, edns, ednsflags, payload, options=None):
         # make sure the EDNS version in ednsflags agrees with edns
         ednsflags &= 0xFF00FFFF
         ednsflags |= edns << 16
-        opt = dns.message.Message._make_opt(ednsflags, payload, options)
+        opt = dns.message.Message._make_opt(  # pyright: ignore
+            ednsflags, payload, options
+        )
         self.add_opt(opt)
 
     def add_tsig(
@@ -246,7 +255,7 @@ def add_tsig(
             key = secret
         else:
             key = dns.tsig.Key(keyname, secret, algorithm)
-        tsig = dns.message.Message._make_tsig(
+        tsig = dns.message.Message._make_tsig(  # pyright: ignore
             keyname, algorithm, 0, fudge, b"", id, tsig_error, other_data
         )
         (tsig, _) = dns.tsig.sign(s, key, tsig[0], int(time.time()), request_mac)
@@ -278,7 +287,7 @@ def add_multi_tsig(
             key = secret
         else:
             key = dns.tsig.Key(keyname, secret, algorithm)
-        tsig = dns.message.Message._make_tsig(
+        tsig = dns.message.Message._make_tsig(  # pyright: ignore
             keyname, algorithm, 0, fudge, b"", id, tsig_error, other_data
         )
         (tsig, ctx) = dns.tsig.sign(
diff --git a/libs/dns/resolver.py b/libs/dns/resolver.py
index f08f824d0e..923bb4b468 100644
--- a/libs/dns/resolver.py
+++ b/libs/dns/resolver.py
@@ -24,7 +24,7 @@
 import threading
 import time
 import warnings
-from typing import Any, Dict, Iterator, List, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, Iterator, List, Sequence, Tuple, cast
 from urllib.parse import urlparse
 
 import dns._ddr
@@ -39,13 +39,15 @@
 import dns.nameserver
 import dns.query
 import dns.rcode
+import dns.rdata
 import dns.rdataclass
 import dns.rdatatype
+import dns.rdtypes.ANY.PTR
 import dns.rdtypes.svcbbase
 import dns.reversename
 import dns.tsig
 
-if sys.platform == "win32":
+if sys.platform == "win32":  # pragma: no cover
     import dns.win32util
 
 
@@ -62,8 +64,8 @@ class NXDOMAIN(dns.exception.DNSException):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-    def _check_kwargs(self, qnames, responses=None):
-        if not isinstance(qnames, (list, tuple, set)):
+    def _check_kwargs(self, qnames, responses=None):  # pyright: ignore
+        if not isinstance(qnames, list | tuple | set):
             raise AttributeError("qnames must be a list, tuple or set")
         if len(qnames) == 0:
             raise AttributeError("qnames must contain at least one element")
@@ -83,7 +85,7 @@ def __str__(self) -> str:
         else:
             msg = "The DNS query name does not exist"
         qnames = ", ".join(map(str, qnames))
-        return "{}: {}".format(msg, qnames)
+        return f"{msg}: {qnames}"
 
     @property
     def canonical_name(self):
@@ -96,7 +98,7 @@ def canonical_name(self):
                 cname = response.canonical_name()
                 if cname != qname:
                     return cname
-            except Exception:
+            except Exception:  # pragma: no cover
                 # We can just eat this exception as it means there was
                 # something wrong with the response.
                 pass
@@ -142,11 +144,11 @@ class YXDOMAIN(dns.exception.DNSException):
 
 
 ErrorTuple = Tuple[
-    Optional[str],
+    str | None,
     bool,
     int,
-    Union[Exception, str],
-    Optional[dns.message.Message],
+    Exception | str,
+    dns.message.Message | None,
 ]
 
 
@@ -154,7 +156,7 @@ def _errors_to_text(errors: List[ErrorTuple]) -> List[str]:
     """Turn a resolution errors trace into a list of text."""
     texts = []
     for err in errors:
-        texts.append("Server {} answered {}".format(err[0], err[3]))
+        texts.append(f"Server {err[0]} answered {err[3]}")
     return texts
 
 
@@ -162,7 +164,7 @@ class LifetimeTimeout(dns.exception.Timeout):
     """The resolution lifetime expired."""
 
     msg = "The resolution lifetime expired."
-    fmt = "%s after {timeout:.3f} seconds: {errors}" % msg[:-1]
+    fmt = f"{msg[:-1]} after {{timeout:.3f}} seconds: {{errors}}"
     supp_kwargs = {"timeout", "errors"}
 
     # We do this as otherwise mypy complains about unexpected keyword argument
@@ -211,7 +213,7 @@ class NoNameservers(dns.exception.DNSException):
     """
 
     msg = "All nameservers failed to answer the query."
-    fmt = "%s {query}: {errors}" % msg[:-1]
+    fmt = f"{msg[:-1]} {{query}}: {{errors}}"
     supp_kwargs = {"request", "errors"}
 
     # We do this as otherwise mypy complains about unexpected keyword argument
@@ -264,8 +266,8 @@ def __init__(
         rdtype: dns.rdatatype.RdataType,
         rdclass: dns.rdataclass.RdataClass,
         response: dns.message.QueryMessage,
-        nameserver: Optional[str] = None,
-        port: Optional[int] = None,
+        nameserver: str | None = None,
+        port: int | None = None,
     ) -> None:
         self.qname = qname
         self.rdtype = rdtype
@@ -281,24 +283,25 @@ def __init__(
         self.expiration = time.time() + self.chaining_result.minimum_ttl
 
     def __getattr__(self, attr):  # pragma: no cover
-        if attr == "name":
-            return self.rrset.name
-        elif attr == "ttl":
-            return self.rrset.ttl
-        elif attr == "covers":
-            return self.rrset.covers
-        elif attr == "rdclass":
-            return self.rrset.rdclass
-        elif attr == "rdtype":
-            return self.rrset.rdtype
+        if self.rrset is not None:
+            if attr == "name":
+                return self.rrset.name
+            elif attr == "ttl":
+                return self.rrset.ttl
+            elif attr == "covers":
+                return self.rrset.covers
+            elif attr == "rdclass":
+                return self.rrset.rdclass
+            elif attr == "rdtype":
+                return self.rrset.rdtype
         else:
             raise AttributeError(attr)
 
     def __len__(self) -> int:
-        return self.rrset and len(self.rrset) or 0
+        return self.rrset is not None and len(self.rrset) or 0
 
-    def __iter__(self):
-        return self.rrset and iter(self.rrset) or iter(tuple())
+    def __iter__(self) -> Iterator[Any]:
+        return self.rrset is not None and iter(self.rrset) or iter(tuple())
 
     def __getitem__(self, i):
         if self.rrset is None:
@@ -315,6 +318,10 @@ class Answers(dict):
     """A dict of DNS stub resolver answers, indexed by type."""
 
 
+class EmptyHostAnswers(dns.exception.DNSException):
+    """The HostAnswers has no addresses"""
+
+
 class HostAnswers(Answers):
     """A dict of DNS stub resolver answers to a host name lookup, indexed by
     type.
@@ -323,8 +330,8 @@ class HostAnswers(Answers):
     @classmethod
     def make(
         cls,
-        v6: Optional[Answer] = None,
-        v4: Optional[Answer] = None,
+        v6: Answer | None = None,
+        v4: Answer | None = None,
         add_empty: bool = True,
     ) -> "HostAnswers":
         answers = HostAnswers()
@@ -334,7 +341,7 @@ def make(
             answers[dns.rdatatype.A] = v4
         return answers
 
-    # Returns pairs of (address, family) from this result, potentiallys
+    # Returns pairs of (address, family) from this result, potentially
     # filtering by address family.
     def addresses_and_families(
         self, family: int = socket.AF_UNSPEC
@@ -347,7 +354,7 @@ def addresses_and_families(
             answer = self.get(dns.rdatatype.AAAA)
         elif family == socket.AF_INET:
             answer = self.get(dns.rdatatype.A)
-        else:
+        else:  # pragma: no cover
             raise NotImplementedError(f"unknown address family {family}")
         if answer:
             for rdata in answer:
@@ -361,6 +368,8 @@ def addresses(self, family: int = socket.AF_UNSPEC) -> Iterator[str]:
     # Returns the canonical name from this result.
     def canonical_name(self) -> dns.name.Name:
         answer = self.get(dns.rdatatype.AAAA, self.get(dns.rdatatype.A))
+        if answer is None:
+            raise EmptyHostAnswers
         return answer.canonical_name
 
 
@@ -440,7 +449,7 @@ def _maybe_clean(self) -> None:
             now = time.time()
             self.next_cleaning = now + self.cleaning_interval
 
-    def get(self, key: CacheKey) -> Optional[Answer]:
+    def get(self, key: CacheKey) -> Answer | None:
         """Get the answer associated with *key*.
 
         Returns None if no answer is cached for the key.
@@ -473,7 +482,7 @@ def put(self, key: CacheKey, value: Answer) -> None:
             self._maybe_clean()
             self.data[key] = value
 
-    def flush(self, key: Optional[CacheKey] = None) -> None:
+    def flush(self, key: CacheKey | None = None) -> None:
         """Flush the cache.
 
         If *key* is not ``None``, only that item is flushed.  Otherwise the entire cache
@@ -540,7 +549,7 @@ def set_max_size(self, max_size: int) -> None:
             max_size = 1
         self.max_size = max_size
 
-    def get(self, key: CacheKey) -> Optional[Answer]:
+    def get(self, key: CacheKey) -> Answer | None:
         """Get the answer associated with *key*.
 
         Returns None if no answer is cached for the key.
@@ -599,7 +608,7 @@ def put(self, key: CacheKey, value: Answer) -> None:
             node.link_after(self.sentinel)
             self.data[key] = node
 
-    def flush(self, key: Optional[CacheKey] = None) -> None:
+    def flush(self, key: CacheKey | None = None) -> None:
         """Flush the cache.
 
         If *key* is not ``None``, only that item is flushed.  Otherwise the entire cache
@@ -639,12 +648,12 @@ class _Resolution:
     def __init__(
         self,
         resolver: "BaseResolver",
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        rdclass: Union[dns.rdataclass.RdataClass, str],
+        qname: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        rdclass: dns.rdataclass.RdataClass | str,
         tcp: bool,
         raise_on_no_answer: bool,
-        search: Optional[bool],
+        search: bool | None,
     ) -> None:
         if isinstance(qname, str):
             qname = dns.name.from_text(qname, None)
@@ -667,15 +676,15 @@ def __init__(
         self.nameservers: List[dns.nameserver.Nameserver] = []
         self.current_nameservers: List[dns.nameserver.Nameserver] = []
         self.errors: List[ErrorTuple] = []
-        self.nameserver: Optional[dns.nameserver.Nameserver] = None
+        self.nameserver: dns.nameserver.Nameserver | None = None
         self.tcp_attempt = False
         self.retry_with_tcp = False
-        self.request: Optional[dns.message.QueryMessage] = None
+        self.request: dns.message.QueryMessage | None = None
         self.backoff = 0.0
 
     def next_request(
         self,
-    ) -> Tuple[Optional[dns.message.QueryMessage], Optional[Answer]]:
+    ) -> Tuple[dns.message.QueryMessage | None, Answer | None]:
         """Get the next request to send, and check the cache.
 
         Returns a (request, answer) tuple.  At most one of request or
@@ -770,8 +779,8 @@ def next_nameserver(self) -> Tuple[dns.nameserver.Nameserver, bool, float]:
         return (self.nameserver, self.tcp_attempt, backoff)
 
     def query_result(
-        self, response: Optional[dns.message.Message], ex: Optional[Exception]
-    ) -> Tuple[Optional[Answer], bool]:
+        self, response: dns.message.Message | None, ex: Exception | None
+    ) -> Tuple[Answer | None, bool]:
         #
         # returns an (answer: Answer, end_loop: bool) tuple.
         #
@@ -908,19 +917,19 @@ class BaseResolver:
     use_search_by_default: bool
     timeout: float
     lifetime: float
-    keyring: Optional[Any]
-    keyname: Optional[Union[dns.name.Name, str]]
-    keyalgorithm: Union[dns.name.Name, str]
+    keyring: Any | None
+    keyname: dns.name.Name | str | None
+    keyalgorithm: dns.name.Name | str
     edns: int
     ednsflags: int
-    ednsoptions: Optional[List[dns.edns.Option]]
+    ednsoptions: List[dns.edns.Option] | None
     payload: int
     cache: Any
-    flags: Optional[int]
+    flags: int | None
     retry_servfail: bool
     rotate: bool
-    ndots: Optional[int]
-    _nameservers: Sequence[Union[str, dns.nameserver.Nameserver]]
+    ndots: int | None
+    _nameservers: Sequence[str | dns.nameserver.Nameserver]
 
     def __init__(
         self, filename: str = "/etc/resolv.conf", configure: bool = True
@@ -938,7 +947,7 @@ def __init__(
 
         self.reset()
         if configure:
-            if sys.platform == "win32":
+            if sys.platform == "win32":  # pragma: no cover
                 self.read_registry()
             elif filename:
                 self.read_resolv_conf(filename)
@@ -947,7 +956,7 @@ def reset(self) -> None:
         """Reset all resolver configuration to the defaults."""
 
         self.domain = dns.name.Name(dns.name.from_text(socket.gethostname())[1:])
-        if len(self.domain) == 0:
+        if len(self.domain) == 0:  # pragma: no cover
             self.domain = dns.name.root
         self._nameservers = []
         self.nameserver_ports = {}
@@ -989,7 +998,7 @@ def read_resolv_conf(self, f: Any) -> None:
         nameservers = []
         if isinstance(f, str):
             try:
-                cm: contextlib.AbstractContextManager = open(f)
+                cm: contextlib.AbstractContextManager = open(f, encoding="utf-8")
             except OSError:
                 # /etc/resolv.conf doesn't exist, can't be read, etc.
                 raise NoResolverConfiguration(f"cannot open {f}")
@@ -1040,7 +1049,7 @@ def read_resolv_conf(self, f: Any) -> None:
         # setter logic, with additonal checking and enrichment.
         self.nameservers = nameservers
 
-    def read_registry(self) -> None:
+    def read_registry(self) -> None:  # pragma: no cover
         """Extract resolver configuration from the Windows registry."""
         try:
             info = dns.win32util.get_dns_info()  # type: ignore
@@ -1054,8 +1063,8 @@ def read_registry(self) -> None:
     def _compute_timeout(
         self,
         start: float,
-        lifetime: Optional[float] = None,
-        errors: Optional[List[ErrorTuple]] = None,
+        lifetime: float | None = None,
+        errors: List[ErrorTuple] | None = None,
     ) -> float:
         lifetime = self.lifetime if lifetime is None else lifetime
         now = time.time()
@@ -1076,7 +1085,7 @@ def _compute_timeout(
         return min(lifetime - duration, self.timeout)
 
     def _get_qnames_to_try(
-        self, qname: dns.name.Name, search: Optional[bool]
+        self, qname: dns.name.Name, search: bool | None
     ) -> List[dns.name.Name]:
         # This is a separate method so we can unit test the search
         # rules without requiring the Internet.
@@ -1119,8 +1128,8 @@ def _get_qnames_to_try(
     def use_tsig(
         self,
         keyring: Any,
-        keyname: Optional[Union[dns.name.Name, str]] = None,
-        algorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
+        keyname: dns.name.Name | str | None = None,
+        algorithm: dns.name.Name | str = dns.tsig.default_algorithm,
     ) -> None:
         """Add a TSIG signature to each query.
 
@@ -1134,10 +1143,10 @@ def use_tsig(
 
     def use_edns(
         self,
-        edns: Optional[Union[int, bool]] = 0,
+        edns: int | bool | None = 0,
         ednsflags: int = 0,
         payload: int = dns.message.DEFAULT_EDNS_PAYLOAD,
-        options: Optional[List[dns.edns.Option]] = None,
+        options: List[dns.edns.Option] | None = None,
     ) -> None:
         """Configure EDNS behavior.
 
@@ -1176,12 +1185,12 @@ def set_flags(self, flags: int) -> None:
     @classmethod
     def _enrich_nameservers(
         cls,
-        nameservers: Sequence[Union[str, dns.nameserver.Nameserver]],
+        nameservers: Sequence[str | dns.nameserver.Nameserver],
         nameserver_ports: Dict[str, int],
         default_port: int,
     ) -> List[dns.nameserver.Nameserver]:
         enriched_nameservers = []
-        if isinstance(nameservers, list):
+        if isinstance(nameservers, list | tuple):
             for nameserver in nameservers:
                 enriched_nameserver: dns.nameserver.Nameserver
                 if isinstance(nameserver, dns.nameserver.Nameserver):
@@ -1205,24 +1214,22 @@ def _enrich_nameservers(
                 enriched_nameservers.append(enriched_nameserver)
         else:
             raise ValueError(
-                "nameservers must be a list or tuple (not a {})".format(
-                    type(nameservers)
-                )
+                f"nameservers must be a list or tuple (not a {type(nameservers)})"
             )
         return enriched_nameservers
 
     @property
     def nameservers(
         self,
-    ) -> Sequence[Union[str, dns.nameserver.Nameserver]]:
+    ) -> Sequence[str | dns.nameserver.Nameserver]:
         return self._nameservers
 
     @nameservers.setter
     def nameservers(
-        self, nameservers: Sequence[Union[str, dns.nameserver.Nameserver]]
+        self, nameservers: Sequence[str | dns.nameserver.Nameserver]
     ) -> None:
         """
-        *nameservers*, a ``list`` of nameservers, where a nameserver is either
+        *nameservers*, a ``list`` or ``tuple`` of nameservers, where a nameserver is either
         a string interpretable as a nameserver, or a ``dns.nameserver.Nameserver``
         instance.
 
@@ -1238,15 +1245,15 @@ class Resolver(BaseResolver):
 
     def resolve(
         self,
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+        qname: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+        rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
         tcp: bool = False,
-        source: Optional[str] = None,
+        source: str | None = None,
         raise_on_no_answer: bool = True,
         source_port: int = 0,
-        lifetime: Optional[float] = None,
-        search: Optional[bool] = None,
+        lifetime: float | None = None,
+        search: bool | None = None,
     ) -> Answer:  # pylint: disable=arguments-differ
         """Query nameservers to find the answer to the question.
 
@@ -1340,14 +1347,14 @@ def resolve(
 
     def query(
         self,
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+        qname: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+        rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
         tcp: bool = False,
-        source: Optional[str] = None,
+        source: str | None = None,
         raise_on_no_answer: bool = True,
         source_port: int = 0,
-        lifetime: Optional[float] = None,
+        lifetime: float | None = None,
     ) -> Answer:  # pragma: no cover
         """Query nameservers to find the answer to the question.
 
@@ -1399,7 +1406,7 @@ def resolve_address(self, ipaddr: str, *args: Any, **kwargs: Any) -> Answer:
 
     def resolve_name(
         self,
-        name: Union[dns.name.Name, str],
+        name: dns.name.Name | str,
         family: int = socket.AF_UNSPEC,
         **kwargs: Any,
     ) -> HostAnswers:
@@ -1431,7 +1438,7 @@ def resolve_name(
         elif family == socket.AF_INET6:
             v6 = self.resolve(name, dns.rdatatype.AAAA, **modified_kwargs)
             return HostAnswers.make(v6=v6)
-        elif family != socket.AF_UNSPEC:
+        elif family != socket.AF_UNSPEC:  # pragma: no cover
             raise NotImplementedError(f"unknown address family {family}")
 
         raise_on_no_answer = modified_kwargs.pop("raise_on_no_answer", True)
@@ -1464,7 +1471,7 @@ def resolve_name(
 
     # pylint: disable=redefined-outer-name
 
-    def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
+    def canonical_name(self, name: dns.name.Name | str) -> dns.name.Name:
         """Determine the canonical name of *name*.
 
         The canonical name is the name the resolver uses for queries
@@ -1481,7 +1488,7 @@ def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
         try:
             answer = self.resolve(name, raise_on_no_answer=False)
             canonical_name = answer.canonical_name
-        except dns.resolver.NXDOMAIN as e:
+        except NXDOMAIN as e:
             canonical_name = e.canonical_name
         return canonical_name
 
@@ -1515,12 +1522,12 @@ def try_ddr(self, lifetime: float = 5.0) -> None:
             nameservers = dns._ddr._get_nameservers_sync(answer, timeout)
             if len(nameservers) > 0:
                 self.nameservers = nameservers
-        except Exception:
+        except Exception:  # pragma: no cover
             pass
 
 
 #: The default resolver.
-default_resolver: Optional[Resolver] = None
+default_resolver: Resolver | None = None
 
 
 def get_default_resolver() -> Resolver:
@@ -1543,15 +1550,15 @@ def reset_default_resolver() -> None:
 
 
 def resolve(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+    qname: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
     tcp: bool = False,
-    source: Optional[str] = None,
+    source: str | None = None,
     raise_on_no_answer: bool = True,
     source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
+    lifetime: float | None = None,
+    search: bool | None = None,
 ) -> Answer:  # pragma: no cover
     """Query nameservers to find the answer to the question.
 
@@ -1576,14 +1583,14 @@ def resolve(
 
 
 def query(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+    qname: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
     tcp: bool = False,
-    source: Optional[str] = None,
+    source: str | None = None,
     raise_on_no_answer: bool = True,
     source_port: int = 0,
-    lifetime: Optional[float] = None,
+    lifetime: float | None = None,
 ) -> Answer:  # pragma: no cover
     """Query nameservers to find the answer to the question.
 
@@ -1619,7 +1626,7 @@ def resolve_address(ipaddr: str, *args: Any, **kwargs: Any) -> Answer:
 
 
 def resolve_name(
-    name: Union[dns.name.Name, str], family: int = socket.AF_UNSPEC, **kwargs: Any
+    name: dns.name.Name | str, family: int = socket.AF_UNSPEC, **kwargs: Any
 ) -> HostAnswers:
     """Use a resolver to query for address records.
 
@@ -1630,7 +1637,7 @@ def resolve_name(
     return get_default_resolver().resolve_name(name, family, **kwargs)
 
 
-def canonical_name(name: Union[dns.name.Name, str]) -> dns.name.Name:
+def canonical_name(name: dns.name.Name | str) -> dns.name.Name:
     """Determine the canonical name of *name*.
 
     See ``dns.resolver.Resolver.canonical_name`` for more information on the
@@ -1640,7 +1647,7 @@ def canonical_name(name: Union[dns.name.Name, str]) -> dns.name.Name:
     return get_default_resolver().canonical_name(name)
 
 
-def try_ddr(lifetime: float = 5.0) -> None:
+def try_ddr(lifetime: float = 5.0) -> None:  # pragma: no cover
     """Try to update the default resolver's nameservers using Discovery of Designated
     Resolvers (DDR).  If successful, the resolver will subsequently use
     DNS-over-HTTPS or DNS-over-TLS for future queries.
@@ -1651,12 +1658,12 @@ def try_ddr(lifetime: float = 5.0) -> None:
 
 
 def zone_for_name(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
     tcp: bool = False,
-    resolver: Optional[Resolver] = None,
-    lifetime: Optional[float] = None,
-) -> dns.name.Name:
+    resolver: Resolver | None = None,
+    lifetime: float | None = None,
+) -> dns.name.Name:  # pyright: ignore[reportReturnType]
     """Find the name of the zone which contains the specified name.
 
     *name*, an absolute ``dns.name.Name`` or ``str``, the query name.
@@ -1689,14 +1696,14 @@ def zone_for_name(
     if not name.is_absolute():
         raise NotAbsolute(name)
     start = time.time()
-    expiration: Optional[float]
+    expiration: float | None
     if lifetime is not None:
         expiration = start + lifetime
     else:
         expiration = None
     while 1:
         try:
-            rlifetime: Optional[float]
+            rlifetime: float | None
             if expiration is not None:
                 rlifetime = expiration - time.time()
                 if rlifetime <= 0:
@@ -1710,8 +1717,8 @@ def zone_for_name(
             if answer.rrset.name == name:
                 return name
             # otherwise we were CNAMEd or DNAMEd and need to look higher
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer) as e:
-            if isinstance(e, dns.resolver.NXDOMAIN):
+        except (NXDOMAIN, NoAnswer) as e:
+            if isinstance(e, NXDOMAIN):
                 response = e.responses().get(name)
             else:
                 response = e.response()  # pylint: disable=no-value-for-parameter
@@ -1736,10 +1743,10 @@ def zone_for_name(
 
 
 def make_resolver_at(
-    where: Union[dns.name.Name, str],
+    where: dns.name.Name | str,
     port: int = 53,
     family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
+    resolver: Resolver | None = None,
 ) -> Resolver:
     """Make a stub resolver using the specified destination as the full resolver.
 
@@ -1760,31 +1767,31 @@ def make_resolver_at(
     """
     if resolver is None:
         resolver = get_default_resolver()
-    nameservers: List[Union[str, dns.nameserver.Nameserver]] = []
+    nameservers: List[str | dns.nameserver.Nameserver] = []
     if isinstance(where, str) and dns.inet.is_address(where):
         nameservers.append(dns.nameserver.Do53Nameserver(where, port))
     else:
         for address in resolver.resolve_name(where, family).addresses():
             nameservers.append(dns.nameserver.Do53Nameserver(address, port))
-    res = dns.resolver.Resolver(configure=False)
+    res = Resolver(configure=False)
     res.nameservers = nameservers
     return res
 
 
 def resolve_at(
-    where: Union[dns.name.Name, str],
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
+    where: dns.name.Name | str,
+    qname: dns.name.Name | str,
+    rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.A,
+    rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
     tcp: bool = False,
-    source: Optional[str] = None,
+    source: str | None = None,
     raise_on_no_answer: bool = True,
     source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
+    lifetime: float | None = None,
+    search: bool | None = None,
     port: int = 53,
     family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
+    resolver: Resolver | None = None,
 ) -> Answer:
     """Query nameservers to find the answer to the question.
 
@@ -1817,12 +1824,12 @@ def resolve_at(
 # running process.
 #
 
-_protocols_for_socktype = {
+_protocols_for_socktype: Dict[Any, List[Any]] = {
     socket.SOCK_DGRAM: [socket.SOL_UDP],
     socket.SOCK_STREAM: [socket.SOL_TCP],
 }
 
-_resolver = None
+_resolver: Resolver | None = None
 _original_getaddrinfo = socket.getaddrinfo
 _original_getnameinfo = socket.getnameinfo
 _original_getfqdn = socket.getfqdn
@@ -1871,10 +1878,11 @@ def _getaddrinfo(
         pass
     # Something needs resolution!
     try:
+        assert _resolver is not None
         answers = _resolver.resolve_name(host, family)
         addrs = answers.addresses_and_families()
         canonical_name = answers.canonical_name().to_text(True)
-    except dns.resolver.NXDOMAIN:
+    except NXDOMAIN:
         raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
     except Exception:
         # We raise EAI_AGAIN here as the failure may be temporary
@@ -1891,7 +1899,7 @@ def _getaddrinfo(
     except Exception:
         if flags & socket.AI_NUMERICSERV == 0:
             try:
-                port = socket.getservbyname(service)
+                port = socket.getservbyname(service)  # pyright: ignore
             except Exception:
                 pass
     if port is None:
@@ -1907,7 +1915,8 @@ def _getaddrinfo(
         cname = ""
     for addr, af in addrs:
         for socktype in socktypes:
-            for proto in _protocols_for_socktype[socktype]:
+            for sockproto in _protocols_for_socktype[socktype]:
+                proto = int(sockproto)
                 addr_tuple = dns.inet.low_level_address_tuple((addr, port), af)
                 tuples.append((af, socktype, proto, cname, addr_tuple))
     if len(tuples) == 0:
@@ -1926,18 +1935,22 @@ def _getnameinfo(sockaddr, flags=0):
         family = socket.AF_INET
     tuples = _getaddrinfo(host, port, family, socket.SOCK_STREAM, socket.SOL_TCP, 0)
     if len(tuples) > 1:
-        raise socket.error("sockaddr resolved to multiple addresses")
+        raise OSError("sockaddr resolved to multiple addresses")
     addr = tuples[0][4][0]
     if flags & socket.NI_DGRAM:
         pname = "udp"
     else:
         pname = "tcp"
+    assert isinstance(addr, str)
     qname = dns.reversename.from_address(addr)
     if flags & socket.NI_NUMERICHOST == 0:
         try:
+            assert _resolver is not None
             answer = _resolver.resolve(qname, "PTR")
-            hostname = answer.rrset[0].target.to_text(True)
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+            assert answer.rrset is not None
+            rdata = cast(dns.rdtypes.ANY.PTR.PTR, answer.rrset[0])
+            hostname = rdata.target.to_text(True)
+        except (NXDOMAIN, NoAnswer):
             if flags & socket.NI_NAMEREQD:
                 raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
             hostname = addr
@@ -1961,7 +1974,7 @@ def _getfqdn(name=None):
         (name, _, _) = _gethostbyaddr(name)
         # Python's version checks aliases too, but our gethostbyname
         # ignores them, so we do so here as well.
-    except Exception:
+    except Exception:  # pragma: no cover
         pass
     return name
 
@@ -2008,6 +2021,7 @@ def _gethostbyaddr(ip):
     bin_ip = dns.inet.inet_pton(family, ip)
     for item in tuples:
         addr = item[4][0]
+        assert isinstance(addr, str)
         bin_addr = dns.inet.inet_pton(family, addr)
         if bin_ip == bin_addr:
             addresses.append(addr)
@@ -2015,7 +2029,7 @@ def _gethostbyaddr(ip):
     return (canonical, aliases, addresses)
 
 
-def override_system_resolver(resolver: Optional[Resolver] = None) -> None:
+def override_system_resolver(resolver: Resolver | None = None) -> None:
     """Override the system resolver routines in the socket module with
     versions which use dnspython's resolver.
 
diff --git a/libs/dns/reversename.py b/libs/dns/reversename.py
index 8236c711f1..60a4e839a0 100644
--- a/libs/dns/reversename.py
+++ b/libs/dns/reversename.py
@@ -19,6 +19,7 @@
 
 import binascii
 
+import dns.exception
 import dns.ipv4
 import dns.ipv6
 import dns.name
@@ -54,13 +55,13 @@ def from_address(
     try:
         v6 = dns.ipv6.inet_aton(text)
         if dns.ipv6.is_mapped(v6):
-            parts = ["%d" % byte for byte in v6[12:]]
+            parts = [str(byte) for byte in v6[12:]]
             origin = v4_origin
         else:
             parts = [x for x in str(binascii.hexlify(v6).decode())]
             origin = v6_origin
     except Exception:
-        parts = ["%d" % byte for byte in dns.ipv4.inet_aton(text)]
+        parts = [str(byte) for byte in dns.ipv4.inet_aton(text)]
         origin = v4_origin
     return dns.name.from_text(".".join(reversed(parts)), origin=origin)
 
diff --git a/libs/dns/rrset.py b/libs/dns/rrset.py
index 6f39b108db..271ddbe860 100644
--- a/libs/dns/rrset.py
+++ b/libs/dns/rrset.py
@@ -17,11 +17,13 @@
 
 """DNS RRsets (an RRset is a named rdataset)"""
 
-from typing import Any, Collection, Dict, Optional, Union, cast
+from typing import Any, Collection, Dict, cast
 
 import dns.name
+import dns.rdata
 import dns.rdataclass
 import dns.rdataset
+import dns.rdatatype
 import dns.renderer
 
 
@@ -43,7 +45,7 @@ def __init__(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
+        deleting: dns.rdataclass.RdataClass | None = None,
     ):
         """Create a new RRset."""
 
@@ -52,7 +54,7 @@ def __init__(
         self.deleting = deleting
 
     def _clone(self):
-        obj = super()._clone()
+        obj = cast(RRset, super()._clone())
         obj.name = self.name
         obj.deleting = self.deleting
         return obj
@@ -114,7 +116,7 @@ def full_match(
         rdclass: dns.rdataclass.RdataClass,
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
+        deleting: dns.rdataclass.RdataClass | None = None,
     ) -> bool:
         """Returns ``True`` if this rrset matches the specified name, class,
         type, covers, and deletion state.
@@ -129,7 +131,7 @@ def full_match(
 
     def to_text(  # type: ignore[override]
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = True,
         **kw: Dict[str, Any],
     ) -> str:
@@ -156,8 +158,8 @@ def to_text(  # type: ignore[override]
     def to_wire(  # type: ignore[override]
         self,
         file: Any,
-        compress: Optional[dns.name.CompressType] = None,  # type: ignore
-        origin: Optional[dns.name.Name] = None,
+        compress: dns.name.CompressType | None = None,  # type: ignore
+        origin: dns.name.Name | None = None,
         **kw: Dict[str, Any],
     ) -> int:
         """Convert the RRset to wire format.
@@ -183,15 +185,15 @@ def to_rdataset(self) -> dns.rdataset.Rdataset:
 
 
 def from_text_list(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     ttl: int,
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
     text_rdatas: Collection[str],
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    origin: Optional[dns.name.Name] = None,
+    idna_codec: dns.name.IDNACodec | None = None,
+    origin: dns.name.Name | None = None,
     relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
+    relativize_to: dns.name.Name | None = None,
 ) -> RRset:
     """Create an RRset with the specified name, TTL, class, and type, and with
     the specified list of rdatas in text format.
@@ -226,10 +228,10 @@ def from_text_list(
 
 
 def from_text(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     ttl: int,
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
+    rdclass: dns.rdataclass.RdataClass | str,
+    rdtype: dns.rdatatype.RdataType | str,
     *text_rdatas: Any,
 ) -> RRset:
     """Create an RRset with the specified name, TTL, class, and type and with
@@ -244,10 +246,10 @@ def from_text(
 
 
 def from_rdata_list(
-    name: Union[dns.name.Name, str],
+    name: dns.name.Name | str,
     ttl: int,
     rdatas: Collection[dns.rdata.Rdata],
-    idna_codec: Optional[dns.name.IDNACodec] = None,
+    idna_codec: dns.name.IDNACodec | None = None,
 ) -> RRset:
     """Create an RRset with the specified name and TTL, and with
     the specified list of rdata objects.
@@ -275,7 +277,7 @@ def from_rdata_list(
     return r
 
 
-def from_rdata(name: Union[dns.name.Name, str], ttl: int, *rdatas: Any) -> RRset:
+def from_rdata(name: dns.name.Name | str, ttl: int, *rdatas: Any) -> RRset:
     """Create an RRset with the specified name and TTL, and with
     the specified rdata objects.
 
diff --git a/libs/dns/set.py b/libs/dns/set.py
index f0fb0d50d3..ae8f0dd503 100644
--- a/libs/dns/set.py
+++ b/libs/dns/set.py
@@ -21,10 +21,11 @@
 class Set:
     """A simple set class.
 
-    This class was originally used to deal with sets being missing in
-    ancient versions of python, but dnspython will continue to use it
-    as these sets are based on lists and are thus indexable, and this
-    ability is widely used in dnspython applications.
+    This class was originally used to deal with python not having a set class, and
+    originally the class used lists in its implementation.  The ordered and indexable
+    nature of RRsets and Rdatasets is unfortunately widely used in dnspython
+    applications, so for backwards compatibility sets continue to be a custom class, now
+    based on an ordered dictionary.
     """
 
     __slots__ = ["items"]
@@ -43,7 +44,7 @@ def __init__(self, items=None):
                 self.add(item)  # lgtm[py/init-calls-subclass]
 
     def __repr__(self):
-        return "dns.set.Set(%s)" % repr(list(self.items.keys()))
+        return f"dns.set.Set({repr(list(self.items.keys()))})"  # pragma: no cover
 
     def add(self, item):
         """Add an item to the set."""
diff --git a/libs/dns/tokenizer.py b/libs/dns/tokenizer.py
index 454cac4a85..86ae3e2d72 100644
--- a/libs/dns/tokenizer.py
+++ b/libs/dns/tokenizer.py
@@ -19,7 +19,7 @@
 
 import io
 import sys
-from typing import Any, List, Optional, Tuple
+from typing import Any, List, Tuple
 
 import dns.exception
 import dns.name
@@ -54,7 +54,7 @@ def __init__(
         ttype: int,
         value: Any = "",
         has_escape: bool = False,
-        comment: Optional[str] = None,
+        comment: str | None = None,
     ):
         """Initialize a token instance."""
 
@@ -98,7 +98,7 @@ def __ne__(self, other):
         return self.ttype != other.ttype or self.value != other.value
 
     def __str__(self):
-        return '%d "%s"' % (self.ttype, self.value)
+        return f'{self.ttype} "{self.value}"'
 
     def unescape(self) -> "Token":
         if not self.has_escape:
@@ -231,8 +231,8 @@ class Tokenizer:
     def __init__(
         self,
         f: Any = sys.stdin,
-        filename: Optional[str] = None,
-        idna_codec: Optional[dns.name.IDNACodec] = None,
+        filename: str | None = None,
+        idna_codec: dns.name.IDNACodec | None = None,
     ):
         """Initialize a tokenizer instance.
 
@@ -263,8 +263,8 @@ def __init__(
                 else:
                     filename = "<file>"
         self.file = f
-        self.ungotten_char: Optional[str] = None
-        self.ungotten_token: Optional[Token] = None
+        self.ungotten_char: str | None = None
+        self.ungotten_token: Token | None = None
         self.multiline = 0
         self.quoting = False
         self.eof = False
@@ -510,9 +510,7 @@ def get_uint8(self) -> int:
 
         value = self.get_int()
         if value < 0 or value > 255:
-            raise dns.exception.SyntaxError(
-                "%d is not an unsigned 8-bit integer" % value
-            )
+            raise dns.exception.SyntaxError(f"{value} is not an unsigned 8-bit integer")
         return value
 
     def get_uint16(self, base: int = 10) -> int:
@@ -528,11 +526,11 @@ def get_uint16(self, base: int = 10) -> int:
         if value < 0 or value > 65535:
             if base == 8:
                 raise dns.exception.SyntaxError(
-                    "%o is not an octal unsigned 16-bit integer" % value
+                    f"{value:o} is not an octal unsigned 16-bit integer"
                 )
             else:
                 raise dns.exception.SyntaxError(
-                    "%d is not an unsigned 16-bit integer" % value
+                    f"{value} is not an unsigned 16-bit integer"
                 )
         return value
 
@@ -548,7 +546,7 @@ def get_uint32(self, base: int = 10) -> int:
         value = self.get_int(base=base)
         if value < 0 or value > 4294967295:
             raise dns.exception.SyntaxError(
-                "%d is not an unsigned 32-bit integer" % value
+                f"{value} is not an unsigned 32-bit integer"
             )
         return value
 
@@ -564,11 +562,11 @@ def get_uint48(self, base: int = 10) -> int:
         value = self.get_int(base=base)
         if value < 0 or value > 281474976710655:
             raise dns.exception.SyntaxError(
-                "%d is not an unsigned 48-bit integer" % value
+                f"{value} is not an unsigned 48-bit integer"
             )
         return value
 
-    def get_string(self, max_length: Optional[int] = None) -> str:
+    def get_string(self, max_length: int | None = None) -> str:
         """Read the next token and interpret it as a string.
 
         Raises dns.exception.SyntaxError if not a string.
@@ -598,7 +596,7 @@ def get_identifier(self) -> str:
             raise dns.exception.SyntaxError("expecting an identifier")
         return token.value
 
-    def get_remaining(self, max_tokens: Optional[int] = None) -> List[Token]:
+    def get_remaining(self, max_tokens: int | None = None) -> List[Token]:
         """Return the remaining tokens on the line, until an EOL or EOF is seen.
 
         max_tokens: If not None, stop after this number of tokens.
@@ -645,9 +643,9 @@ def concatenate_remaining_identifiers(self, allow_empty: bool = False) -> str:
     def as_name(
         self,
         token: Token,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = False,
-        relativize_to: Optional[dns.name.Name] = None,
+        relativize_to: dns.name.Name | None = None,
     ) -> dns.name.Name:
         """Try to interpret the token as a DNS name.
 
@@ -662,9 +660,9 @@ def as_name(
 
     def get_name(
         self,
-        origin: Optional[dns.name.Name] = None,
+        origin: dns.name.Name | None = None,
         relativize: bool = False,
-        relativize_to: Optional[dns.name.Name] = None,
+        relativize_to: dns.name.Name | None = None,
     ) -> dns.name.Name:
         """Read the next token and interpret it as a DNS name.
 
@@ -686,7 +684,7 @@ def get_eol_as_token(self) -> Token:
         token = self.get()
         if not token.is_eol_or_eof():
             raise dns.exception.SyntaxError(
-                'expected EOL or EOF, got %d "%s"' % (token.ttype, token.value)
+                f'expected EOL or EOF, got {token.ttype} "{token.value}"'
             )
         return token
 
diff --git a/libs/dns/transaction.py b/libs/dns/transaction.py
index 84e54f7d54..9ecd737725 100644
--- a/libs/dns/transaction.py
+++ b/libs/dns/transaction.py
@@ -1,11 +1,12 @@
 # Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
 
 import collections
-from typing import Any, Callable, Iterator, List, Optional, Tuple, Union
+from typing import Any, Callable, Iterator, List, Tuple
 
 import dns.exception
 import dns.name
 import dns.node
+import dns.rdata
 import dns.rdataclass
 import dns.rdataset
 import dns.rdatatype
@@ -31,7 +32,7 @@ def writer(self, replacement: bool = False) -> "Transaction":
 
     def origin_information(
         self,
-    ) -> Tuple[Optional[dns.name.Name], bool, Optional[dns.name.Name]]:
+    ) -> Tuple[dns.name.Name | None, bool, dns.name.Name | None]:
         """Returns a tuple
 
             (absolute_origin, relativize, effective_origin)
@@ -60,7 +61,7 @@ def get_class(self) -> dns.rdataclass.RdataClass:
         """The class of the transaction manager."""
         raise NotImplementedError  # pragma: no cover
 
-    def from_wire_origin(self) -> Optional[dns.name.Name]:
+    def from_wire_origin(self) -> dns.name.Name | None:
         """Origin to use in from_wire() calls."""
         (absolute_origin, relativize, _) = self.origin_information()
         if relativize:
@@ -127,9 +128,9 @@ def __init__(
 
     def get(
         self,
-        name: Optional[Union[dns.name.Name, str]],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str | None,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
     ) -> dns.rdataset.Rdataset:
         """Return the rdataset associated with *name*, *rdtype*, and *covers*,
         or `None` if not found.
@@ -144,7 +145,7 @@ def get(
         rdataset = self._get_rdataset(name, rdtype, covers)
         return _ensure_immutable_rdataset(rdataset)
 
-    def get_node(self, name: dns.name.Name) -> Optional[dns.node.Node]:
+    def get_node(self, name: dns.name.Name) -> dns.node.Node | None:
         """Return the node at *name*, if any.
 
         Returns an immutable node or ``None``.
@@ -236,7 +237,7 @@ def delete_exact(self, *args: Any) -> None:
         self._check_read_only()
         self._delete(True, args)
 
-    def name_exists(self, name: Union[dns.name.Name, str]) -> bool:
+    def name_exists(self, name: dns.name.Name | str) -> bool:
         """Does the specified name exist?"""
         self._check_ended()
         if isinstance(name, str):
@@ -416,12 +417,12 @@ def _rdataset_from_args(self, method, deleting, args):
                 raise TypeError(f"{method}: expected more arguments")
 
     def _add(self, replace, args):
+        if replace:
+            method = "replace()"
+        else:
+            method = "add()"
         try:
             args = collections.deque(args)
-            if replace:
-                method = "replace()"
-            else:
-                method = "add()"
             arg = args.popleft()
             if isinstance(arg, str):
                 arg = dns.name.from_text(arg, None)
@@ -438,6 +439,7 @@ def _add(self, replace, args):
                 raise TypeError(
                     f"{method} requires a name or RRset as the first argument"
                 )
+            assert rdataset is not None  # for type checkers
             if rdataset.rdclass != self.manager.get_class():
                 raise ValueError(f"{method} has objects of wrong RdataClass")
             if rdataset.rdtype == dns.rdatatype.SOA:
@@ -460,12 +462,12 @@ def _add(self, replace, args):
             raise TypeError(f"not enough parameters to {method}")
 
     def _delete(self, exact, args):
+        if exact:
+            method = "delete_exact()"
+        else:
+            method = "delete()"
         try:
             args = collections.deque(args)
-            if exact:
-                method = "delete_exact()"
-            else:
-                method = "delete()"
             arg = args.popleft()
             if isinstance(arg, str):
                 arg = dns.name.from_text(arg, None)
@@ -486,7 +488,7 @@ def _delete(self, exact, args):
                         if exact:
                             raise DeleteNotExact(f"{method}: missing rdataset")
                     else:
-                        self._delete_rdataset(name, rdtype, covers)
+                        self._checked_delete_rdataset(name, rdtype, covers)
                     return
                 else:
                     rdataset = self._rdataset_from_args(method, True, args)
@@ -529,8 +531,6 @@ def _check_ended(self):
 
     def _end(self, commit):
         self._check_ended()
-        if self._ended:
-            raise AlreadyEnded
         try:
             self._end_transaction(commit)
         finally:
diff --git a/libs/dns/tsig.py b/libs/dns/tsig.py
index 780852e8e3..333f9aa475 100644
--- a/libs/dns/tsig.py
+++ b/libs/dns/tsig.py
@@ -26,6 +26,7 @@
 import dns.name
 import dns.rcode
 import dns.rdataclass
+import dns.rdatatype
 
 
 class BadTime(dns.exception.DNSException):
@@ -221,6 +222,7 @@ def _digest(wire, key, rdata, time=None, request_mac=None, ctx=None, multi=None)
         if request_mac:
             ctx.update(struct.pack("!H", len(request_mac)))
             ctx.update(request_mac)
+    assert ctx is not None  # for type checkers
     ctx.update(struct.pack("!H", rdata.original_id))
     ctx.update(wire[2:])
     if first:
@@ -299,7 +301,7 @@ def validate(
         elif rdata.error == dns.rcode.BADTRUNC:
             raise PeerBadTruncation
         else:
-            raise PeerError("unknown TSIG error code %d" % rdata.error)
+            raise PeerError(f"unknown TSIG error code {rdata.error}")
     if abs(rdata.time_signed - now) > rdata.fudge:
         raise BadTime
     if key.name != owner:
@@ -325,7 +327,12 @@ def get_context(key):
 
 
 class Key:
-    def __init__(self, name, secret, algorithm=default_algorithm):
+    def __init__(
+        self,
+        name: dns.name.Name | str,
+        secret: bytes | str,
+        algorithm: dns.name.Name | str = default_algorithm,
+    ):
         if isinstance(name, str):
             name = dns.name.from_text(name)
         self.name = name
diff --git a/libs/dns/tsigkeyring.py b/libs/dns/tsigkeyring.py
index 1010a79f8f..5996295a22 100644
--- a/libs/dns/tsigkeyring.py
+++ b/libs/dns/tsigkeyring.py
@@ -24,14 +24,14 @@
 import dns.tsig
 
 
-def from_text(textring: Dict[str, Any]) -> Dict[dns.name.Name, dns.tsig.Key]:
+def from_text(textring: Dict[str, Any]) -> Dict[dns.name.Name, Any]:
     """Convert a dictionary containing (textual DNS name, base64 secret)
     pairs into a binary keyring which has (dns.name.Name, bytes) pairs, or
     a dictionary containing (textual DNS name, (algorithm, base64 secret))
     pairs into a binary keyring which has (dns.name.Name, dns.tsig.Key) pairs.
     @rtype: dict"""
 
-    keyring = {}
+    keyring: Dict[dns.name.Name, Any] = {}
     for name, value in textring.items():
         kname = dns.name.from_text(name)
         if isinstance(value, str):
diff --git a/libs/dns/ttl.py b/libs/dns/ttl.py
index 264b0338b6..16289cd053 100644
--- a/libs/dns/ttl.py
+++ b/libs/dns/ttl.py
@@ -17,8 +17,6 @@
 
 """DNS TTL conversion."""
 
-from typing import Union
-
 import dns.exception
 
 # Technically TTLs are supposed to be between 0 and 2**31 - 1, with values
@@ -73,7 +71,7 @@ def from_text(text: str) -> int:
                 elif c == "s":
                     total += current
                 else:
-                    raise BadTTL("unknown unit '%s'" % c)
+                    raise BadTTL(f"unknown unit '{c}'")
                 current = 0
                 need_digit = True
         if not current == 0:
@@ -83,10 +81,10 @@ def from_text(text: str) -> int:
     return total
 
 
-def make(value: Union[int, str]) -> int:
+def make(value: int | str) -> int:
     if isinstance(value, int):
         return value
     elif isinstance(value, str):
-        return dns.ttl.from_text(value)
+        return from_text(value)
     else:
         raise ValueError("cannot convert value to TTL")
diff --git a/libs/dns/update.py b/libs/dns/update.py
index bf1157acdf..0e4aee411d 100644
--- a/libs/dns/update.py
+++ b/libs/dns/update.py
@@ -17,8 +17,10 @@
 
 """DNS Dynamic Update Support"""
 
-from typing import Any, List, Optional, Union
+from typing import Any, List
 
+import dns.enum
+import dns.exception
 import dns.message
 import dns.name
 import dns.opcode
@@ -26,6 +28,7 @@
 import dns.rdataclass
 import dns.rdataset
 import dns.rdatatype
+import dns.rrset
 import dns.tsig
 
 
@@ -48,12 +51,12 @@ class UpdateMessage(dns.message.Message):  # lgtm[py/missing-equals]
 
     def __init__(
         self,
-        zone: Optional[Union[dns.name.Name, str]] = None,
+        zone: dns.name.Name | str | None = None,
         rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-        keyring: Optional[Any] = None,
-        keyname: Optional[dns.name.Name] = None,
-        keyalgorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-        id: Optional[int] = None,
+        keyring: Any | None = None,
+        keyname: dns.name.Name | None = None,
+        keyalgorithm: dns.name.Name | str = dns.tsig.default_algorithm,
+        id: int | None = None,
     ):
         """Initialize a new DNS Update object.
 
@@ -167,7 +170,7 @@ def _add(self, replace, section, name, *args):
                     rd = dns.rdata.from_text(self.zone_rdclass, rdtype, s, self.origin)
                     self._add_rr(name, ttl, rd, section=section)
 
-    def add(self, name: Union[dns.name.Name, str], *args: Any) -> None:
+    def add(self, name: dns.name.Name | str, *args: Any) -> None:
         """Add records.
 
         The first argument is always a name.  The other
@@ -182,7 +185,7 @@ def add(self, name: Union[dns.name.Name, str], *args: Any) -> None:
 
         self._add(False, self.update, name, *args)
 
-    def delete(self, name: Union[dns.name.Name, str], *args: Any) -> None:
+    def delete(self, name: dns.name.Name | str, *args: Any) -> None:
         """Delete records.
 
         The first argument is always a name.  The other
@@ -242,7 +245,7 @@ def delete(self, name: Union[dns.name.Name, str], *args: Any) -> None:
                         )
                         self._add_rr(name, 0, rd, dns.rdataclass.NONE)
 
-    def replace(self, name: Union[dns.name.Name, str], *args: Any) -> None:
+    def replace(self, name: dns.name.Name | str, *args: Any) -> None:
         """Replace records.
 
         The first argument is always a name.  The other
@@ -260,7 +263,7 @@ def replace(self, name: Union[dns.name.Name, str], *args: Any) -> None:
 
         self._add(True, self.update, name, *args)
 
-    def present(self, name: Union[dns.name.Name, str], *args: Any) -> None:
+    def present(self, name: dns.name.Name | str, *args: Any) -> None:
         """Require that an owner name (and optionally an rdata type,
         or specific rdataset) exists as a prerequisite to the
         execution of the update.
@@ -315,8 +318,8 @@ def present(self, name: Union[dns.name.Name, str], *args: Any) -> None:
 
     def absent(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Optional[Union[dns.rdatatype.RdataType, str]] = None,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str | None = None,
     ) -> None:
         """Require that an owner name (and optionally an rdata type) does
         not exist as a prerequisite to the execution of the update."""
@@ -351,7 +354,7 @@ def _get_one_rr_per_rrset(self, value):
         # Updates are always one_rr_per_rrset
         return True
 
-    def _parse_rr_header(self, section, name, rdclass, rdtype):
+    def _parse_rr_header(self, section, name, rdclass, rdtype):  # pyright: ignore
         deleting = None
         empty = False
         if section == UpdateSection.ZONE:
diff --git a/libs/dns/version.py b/libs/dns/version.py
index 251f2583d3..e11dd29c2d 100644
--- a/libs/dns/version.py
+++ b/libs/dns/version.py
@@ -20,9 +20,9 @@
 #: MAJOR
 MAJOR = 2
 #: MINOR
-MINOR = 6
+MINOR = 8
 #: MICRO
-MICRO = 1
+MICRO = 0
 #: RELEASELEVEL
 RELEASELEVEL = 0x0F
 #: SERIAL
@@ -30,29 +30,13 @@
 
 if RELEASELEVEL == 0x0F:  # pragma: no cover  lgtm[py/unreachable-statement]
     #: version
-    version = "%d.%d.%d" % (MAJOR, MINOR, MICRO)  # lgtm[py/unreachable-statement]
+    version = f"{MAJOR}.{MINOR}.{MICRO}"  # lgtm[py/unreachable-statement]
 elif RELEASELEVEL == 0x00:  # pragma: no cover  lgtm[py/unreachable-statement]
-    version = "%d.%d.%ddev%d" % (
-        MAJOR,
-        MINOR,
-        MICRO,
-        SERIAL,
-    )  # lgtm[py/unreachable-statement]
+    version = f"{MAJOR}.{MINOR}.{MICRO}dev{SERIAL}"  # lgtm[py/unreachable-statement]
 elif RELEASELEVEL == 0x0C:  # pragma: no cover  lgtm[py/unreachable-statement]
-    version = "%d.%d.%drc%d" % (
-        MAJOR,
-        MINOR,
-        MICRO,
-        SERIAL,
-    )  # lgtm[py/unreachable-statement]
+    version = f"{MAJOR}.{MINOR}.{MICRO}rc{SERIAL}"  # lgtm[py/unreachable-statement]
 else:  # pragma: no cover  lgtm[py/unreachable-statement]
-    version = "%d.%d.%d%x%d" % (
-        MAJOR,
-        MINOR,
-        MICRO,
-        RELEASELEVEL,
-        SERIAL,
-    )  # lgtm[py/unreachable-statement]
+    version = f"{MAJOR}.{MINOR}.{MICRO}{RELEASELEVEL:x}{SERIAL}"  # lgtm[py/unreachable-statement]
 
 #: hexversion
 hexversion = MAJOR << 24 | MINOR << 16 | MICRO << 8 | RELEASELEVEL << 4 | SERIAL
diff --git a/libs/dns/versioned.py b/libs/dns/versioned.py
index fd78e674e6..3644711eb4 100644
--- a/libs/dns/versioned.py
+++ b/libs/dns/versioned.py
@@ -4,10 +4,9 @@
 
 import collections
 import threading
-from typing import Callable, Deque, Optional, Set, Union
+from typing import Callable, Deque, Set, cast
 
 import dns.exception
-import dns.immutable
 import dns.name
 import dns.node
 import dns.rdataclass
@@ -41,14 +40,14 @@ class Zone(dns.zone.Zone):  # lgtm[py/missing-equals]
         "_readers",
     ]
 
-    node_factory = Node
+    node_factory: Callable[[], dns.node.Node] = Node
 
     def __init__(
         self,
-        origin: Optional[Union[dns.name.Name, str]],
+        origin: dns.name.Name | str | None,
         rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
         relativize: bool = True,
-        pruning_policy: Optional[Callable[["Zone", Version], Optional[bool]]] = None,
+        pruning_policy: Callable[["Zone", Version], bool | None] | None = None,
     ):
         """Initialize a versioned zone object.
 
@@ -72,8 +71,8 @@ def __init__(
             self._pruning_policy = self._default_pruning_policy
         else:
             self._pruning_policy = pruning_policy
-        self._write_txn: Optional[Transaction] = None
-        self._write_event: Optional[threading.Event] = None
+        self._write_txn: Transaction | None = None
+        self._write_event: threading.Event | None = None
         self._write_waiters: Deque[threading.Event] = collections.deque()
         self._readers: Set[Transaction] = set()
         self._commit_version_unlocked(
@@ -81,7 +80,7 @@ def __init__(
         )
 
     def reader(
-        self, id: Optional[int] = None, serial: Optional[int] = None
+        self, id: int | None = None, serial: int | None = None
     ) -> Transaction:  # pylint: disable=arguments-differ
         if id is not None and serial is not None:
             raise ValueError("cannot specify both id and serial")
@@ -105,7 +104,10 @@ def reader(
                     n = v.nodes.get(oname)
                     if n:
                         rds = n.get_rdataset(self.rdclass, dns.rdatatype.SOA)
-                        if rds and rds[0].serial == serial:
+                        if rds is None:
+                            continue
+                        soa = cast(dns.rdtypes.ANY.SOA.SOA, rds[0])
+                        if rds and soa.serial == serial:
                             version = v
                             break
                 if version is None:
@@ -186,7 +188,7 @@ def _prune_versions_unlocked(self):
         # Note our definition of least_kept also ensures we do not try to
         # delete the greatest version.
         if len(self._readers) > 0:
-            least_kept = min(txn.version.id for txn in self._readers)
+            least_kept = min(txn.version.id for txn in self._readers)  # pyright: ignore
         else:
             least_kept = self._versions[-1].id
         while self._versions[0].id < least_kept and self._pruning_policy(
@@ -194,15 +196,15 @@ def _prune_versions_unlocked(self):
         ):
             self._versions.popleft()
 
-    def set_max_versions(self, max_versions: Optional[int]) -> None:
+    def set_max_versions(self, max_versions: int | None) -> None:
         """Set a pruning policy that retains up to the specified number
         of versions
         """
         if max_versions is not None and max_versions < 1:
             raise ValueError("max versions must be at least 1")
         if max_versions is None:
-
-            def policy(zone, _):  # pylint: disable=unused-argument
+            # pylint: disable=unused-argument
+            def policy(zone, _):  # pyright: ignore
                 return False
 
         else:
@@ -213,7 +215,7 @@ def policy(zone, _):
         self.set_pruning_policy(policy)
 
     def set_pruning_policy(
-        self, policy: Optional[Callable[["Zone", Version], Optional[bool]]]
+        self, policy: Callable[["Zone", Version], bool | None] | None
     ) -> None:
         """Set the pruning policy for the zone.
 
@@ -268,20 +270,20 @@ def _get_next_version_id(self):
         return id
 
     def find_node(
-        self, name: Union[dns.name.Name, str], create: bool = False
+        self, name: dns.name.Name | str, create: bool = False
     ) -> dns.node.Node:
         if create:
             raise UseTransaction
         return super().find_node(name)
 
-    def delete_node(self, name: Union[dns.name.Name, str]) -> None:
+    def delete_node(self, name: dns.name.Name | str) -> None:
         raise UseTransaction
 
     def find_rdataset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
         create: bool = False,
     ) -> dns.rdataset.Rdataset:
         if create:
@@ -291,11 +293,11 @@ def find_rdataset(
 
     def get_rdataset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
         create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
+    ) -> dns.rdataset.Rdataset | None:
         if create:
             raise UseTransaction
         rdataset = super().get_rdataset(name, rdtype, covers)
@@ -306,13 +308,13 @@ def get_rdataset(
 
     def delete_rdataset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
     ) -> None:
         raise UseTransaction
 
     def replace_rdataset(
-        self, name: Union[dns.name.Name, str], replacement: dns.rdataset.Rdataset
+        self, name: dns.name.Name | str, replacement: dns.rdataset.Rdataset
     ) -> None:
         raise UseTransaction
diff --git a/libs/dns/win32util.py b/libs/dns/win32util.py
index aaa7e93e32..2d77b4cb65 100644
--- a/libs/dns/win32util.py
+++ b/libs/dns/win32util.py
@@ -2,38 +2,26 @@
 
 import dns._features
 
+# pylint: disable=W0612,W0613,C0301
+
 if sys.platform == "win32":
-    from typing import Any
+    import ctypes
+    import ctypes.wintypes as wintypes
+    import winreg  # pylint: disable=import-error
+    from enum import IntEnum
 
     import dns.name
 
-    _prefer_wmi = True
-
-    import winreg  # pylint: disable=import-error
-
     # Keep pylint quiet on non-windows.
     try:
-        WindowsError is None  # pylint: disable=used-before-assignment
-    except KeyError:
+        _ = WindowsError  # pylint: disable=used-before-assignment
+    except NameError:
         WindowsError = Exception
 
-    if dns._features.have("wmi"):
-        import threading
-
-        import pythoncom  # pylint: disable=import-error
-        import wmi  # pylint: disable=import-error
-
-        _have_wmi = True
-    else:
-        _have_wmi = False
-
-    def _config_domain(domain):
-        # Sometimes DHCP servers add a '.' prefix to the default domain, and
-        # Windows just stores such values in the registry (see #687).
-        # Check for this and fix it.
-        if domain.startswith("."):
-            domain = domain[1:]
-        return dns.name.from_text(domain)
+    class ConfigMethod(IntEnum):
+        Registry = 1
+        WMI = 2
+        Win32 = 3
 
     class DnsInfo:
         def __init__(self):
@@ -41,9 +29,19 @@ def __init__(self):
             self.nameservers = []
             self.search = []
 
-    if _have_wmi:
+    _config_method = ConfigMethod.Registry
+
+    if dns._features.have("wmi"):
+        import threading
+
+        import pythoncom  # pylint: disable=import-error
+        import wmi  # pylint: disable=import-error
+
+        # Prefer WMI by default if wmi is installed.
+        _config_method = ConfigMethod.WMI
 
         class _WMIGetter(threading.Thread):
+            # pylint: disable=possibly-used-before-assignment
             def __init__(self):
                 super().__init__()
                 self.info = DnsInfo()
@@ -78,36 +76,33 @@ def get(self):
         class _WMIGetter:  # type: ignore
             pass
 
+    def _config_domain(domain):
+        # Sometimes DHCP servers add a '.' prefix to the default domain, and
+        # Windows just stores such values in the registry (see #687).
+        # Check for this and fix it.
+        if domain.startswith("."):
+            domain = domain[1:]
+        return dns.name.from_text(domain)
+
     class _RegistryGetter:
         def __init__(self):
             self.info = DnsInfo()
 
-        def _determine_split_char(self, entry):
-            #
-            # The windows registry irritatingly changes the list element
-            # delimiter in between ' ' and ',' (and vice-versa) in various
-            # versions of windows.
-            #
-            if entry.find(" ") >= 0:
-                split_char = " "
-            elif entry.find(",") >= 0:
-                split_char = ","
-            else:
-                # probably a singleton; treat as a space-separated list.
-                split_char = " "
-            return split_char
+        def _split(self, text):
+            # The windows registry has used both " " and "," as a delimiter, and while
+            # it is currently using "," in Windows 10 and later, updates can seemingly
+            # leave a space in too, e.g. "a, b".  So we just convert all commas to
+            # spaces, and use split() in its default configuration, which splits on
+            # all whitespace and ignores empty strings.
+            return text.replace(",", " ").split()
 
         def _config_nameservers(self, nameservers):
-            split_char = self._determine_split_char(nameservers)
-            ns_list = nameservers.split(split_char)
-            for ns in ns_list:
+            for ns in self._split(nameservers):
                 if ns not in self.info.nameservers:
                     self.info.nameservers.append(ns)
 
         def _config_search(self, search):
-            split_char = self._determine_split_char(search)
-            search_list = search.split(split_char)
-            for s in search_list:
+            for s in self._split(search):
                 s = _config_domain(s)
                 if s not in self.info.search:
                     self.info.search.append(s)
@@ -164,7 +159,7 @@ def _is_nic_enabled(self, lm, guid):
                     lm,
                     r"SYSTEM\CurrentControlSet\Control\Network"
                     r"\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-                    r"\%s\Connection" % guid,
+                    rf"\{guid}\Connection",
                 )
 
                 try:
@@ -177,7 +172,7 @@ def _is_nic_enabled(self, lm, guid):
                         raise ValueError  # pragma: no cover
 
                     device_key = winreg.OpenKey(
-                        lm, r"SYSTEM\CurrentControlSet\Enum\%s" % pnp_id
+                        lm, rf"SYSTEM\CurrentControlSet\Enum\{pnp_id}"
                     )
 
                     try:
@@ -232,7 +227,7 @@ def get(self):
                                 self._config_fromkey(key, False)
                             finally:
                                 key.Close()
-                        except EnvironmentError:
+                        except OSError:
                             break
                 finally:
                     interfaces.Close()
@@ -240,13 +235,204 @@ def get(self):
                 lm.Close()
             return self.info
 
-    _getter_class: Any
-    if _have_wmi and _prefer_wmi:
-        _getter_class = _WMIGetter
-    else:
-        _getter_class = _RegistryGetter
+    class _Win32Getter(_RegistryGetter):
+
+        def get(self):
+            """Get the attributes using the Windows API."""
+            # Load the IP Helper library
+            # # https://learn.microsoft.com/en-us/windows/win32/api/iphlpapi/nf-iphlpapi-getadaptersaddresses
+            IPHLPAPI = ctypes.WinDLL("Iphlpapi.dll")
+
+            # Constants
+            AF_UNSPEC = 0
+            ERROR_SUCCESS = 0
+            GAA_FLAG_INCLUDE_PREFIX = 0x00000010
+            AF_INET = 2
+            AF_INET6 = 23
+            IF_TYPE_SOFTWARE_LOOPBACK = 24
+
+            # Define necessary structures
+            class SOCKADDRV4(ctypes.Structure):
+                _fields_ = [
+                    ("sa_family", wintypes.USHORT),
+                    ("sa_data", ctypes.c_ubyte * 14),
+                ]
+
+            class SOCKADDRV6(ctypes.Structure):
+                _fields_ = [
+                    ("sa_family", wintypes.USHORT),
+                    ("sa_data", ctypes.c_ubyte * 26),
+                ]
+
+            class SOCKET_ADDRESS(ctypes.Structure):
+                _fields_ = [
+                    ("lpSockaddr", ctypes.POINTER(SOCKADDRV4)),
+                    ("iSockaddrLength", wintypes.INT),
+                ]
+
+            class IP_ADAPTER_DNS_SERVER_ADDRESS(ctypes.Structure):
+                pass  # Forward declaration
+
+            IP_ADAPTER_DNS_SERVER_ADDRESS._fields_ = [
+                ("Length", wintypes.ULONG),
+                ("Reserved", wintypes.DWORD),
+                ("Next", ctypes.POINTER(IP_ADAPTER_DNS_SERVER_ADDRESS)),
+                ("Address", SOCKET_ADDRESS),
+            ]
+
+            class IF_LUID(ctypes.Structure):
+                _fields_ = [("Value", ctypes.c_ulonglong)]
+
+            class NET_IF_NETWORK_GUID(ctypes.Structure):
+                _fields_ = [("Value", ctypes.c_ubyte * 16)]
+
+            class IP_ADAPTER_PREFIX_XP(ctypes.Structure):
+                pass  # Left undefined here for simplicity
+
+            class IP_ADAPTER_GATEWAY_ADDRESS_LH(ctypes.Structure):
+                pass  # Left undefined here for simplicity
+
+            class IP_ADAPTER_DNS_SUFFIX(ctypes.Structure):
+                _fields_ = [
+                    ("String", ctypes.c_wchar * 256),
+                    ("Next", ctypes.POINTER(ctypes.c_void_p)),
+                ]
+
+            class IP_ADAPTER_UNICAST_ADDRESS_LH(ctypes.Structure):
+                pass  # Left undefined here for simplicity
+
+            class IP_ADAPTER_MULTICAST_ADDRESS_XP(ctypes.Structure):
+                pass  # Left undefined here for simplicity
+
+            class IP_ADAPTER_ANYCAST_ADDRESS_XP(ctypes.Structure):
+                pass  # Left undefined here for simplicity
+
+            class IP_ADAPTER_DNS_SERVER_ADDRESS_XP(ctypes.Structure):
+                pass  # Left undefined here for simplicity
+
+            class IP_ADAPTER_ADDRESSES(ctypes.Structure):
+                pass  # Forward declaration
+
+            IP_ADAPTER_ADDRESSES._fields_ = [
+                ("Length", wintypes.ULONG),
+                ("IfIndex", wintypes.DWORD),
+                ("Next", ctypes.POINTER(IP_ADAPTER_ADDRESSES)),
+                ("AdapterName", ctypes.c_char_p),
+                ("FirstUnicastAddress", ctypes.POINTER(SOCKET_ADDRESS)),
+                ("FirstAnycastAddress", ctypes.POINTER(SOCKET_ADDRESS)),
+                ("FirstMulticastAddress", ctypes.POINTER(SOCKET_ADDRESS)),
+                (
+                    "FirstDnsServerAddress",
+                    ctypes.POINTER(IP_ADAPTER_DNS_SERVER_ADDRESS),
+                ),
+                ("DnsSuffix", wintypes.LPWSTR),
+                ("Description", wintypes.LPWSTR),
+                ("FriendlyName", wintypes.LPWSTR),
+                ("PhysicalAddress", ctypes.c_ubyte * 8),
+                ("PhysicalAddressLength", wintypes.ULONG),
+                ("Flags", wintypes.ULONG),
+                ("Mtu", wintypes.ULONG),
+                ("IfType", wintypes.ULONG),
+                ("OperStatus", ctypes.c_uint),
+                # Remaining fields removed for brevity
+            ]
+
+            def format_ipv4(sockaddr_in):
+                return ".".join(map(str, sockaddr_in.sa_data[2:6]))
+
+            def format_ipv6(sockaddr_in6):
+                # The sa_data is:
+                #
+                # USHORT    sin6_port;
+                # ULONG     sin6_flowinfo;
+                # IN6_ADDR  sin6_addr;
+                # ULONG     sin6_scope_id;
+                #
+                # which is 2 + 4 + 16 + 4 = 26 bytes, and we need the plus 6 below
+                # to be in the sin6_addr range.
+                parts = [
+                    sockaddr_in6.sa_data[i + 6] << 8 | sockaddr_in6.sa_data[i + 6 + 1]
+                    for i in range(0, 16, 2)
+                ]
+                return ":".join(f"{part:04x}" for part in parts)
+
+            buffer_size = ctypes.c_ulong(15000)
+            while True:
+                buffer = ctypes.create_string_buffer(buffer_size.value)
+
+                ret_val = IPHLPAPI.GetAdaptersAddresses(
+                    AF_UNSPEC,
+                    GAA_FLAG_INCLUDE_PREFIX,
+                    None,
+                    buffer,
+                    ctypes.byref(buffer_size),
+                )
+
+                if ret_val == ERROR_SUCCESS:
+                    break
+                elif ret_val != 0x6F:  # ERROR_BUFFER_OVERFLOW
+                    print(f"Error retrieving adapter information: {ret_val}")
+                    return
+
+            adapter_addresses = ctypes.cast(
+                buffer, ctypes.POINTER(IP_ADAPTER_ADDRESSES)
+            )
+
+            current_adapter = adapter_addresses
+            while current_adapter:
+
+                # Skip non-operational adapters.
+                oper_status = current_adapter.contents.OperStatus
+                if oper_status != 1:
+                    current_adapter = current_adapter.contents.Next
+                    continue
+
+                # Exclude loopback adapters.
+                if current_adapter.contents.IfType == IF_TYPE_SOFTWARE_LOOPBACK:
+                    current_adapter = current_adapter.contents.Next
+                    continue
+
+                # Get the domain from the DnsSuffix attribute.
+                dns_suffix = current_adapter.contents.DnsSuffix
+                if dns_suffix:
+                    self.info.domain = dns.name.from_text(dns_suffix)
+
+                current_dns_server = current_adapter.contents.FirstDnsServerAddress
+                while current_dns_server:
+                    sockaddr = current_dns_server.contents.Address.lpSockaddr
+                    sockaddr_family = sockaddr.contents.sa_family
+
+                    ip = None
+                    if sockaddr_family == AF_INET:  # IPv4
+                        ip = format_ipv4(sockaddr.contents)
+                    elif sockaddr_family == AF_INET6:  # IPv6
+                        sockaddr = ctypes.cast(sockaddr, ctypes.POINTER(SOCKADDRV6))
+                        ip = format_ipv6(sockaddr.contents)
+
+                    if ip:
+                        if ip not in self.info.nameservers:
+                            self.info.nameservers.append(ip)
+
+                    current_dns_server = current_dns_server.contents.Next
+
+                current_adapter = current_adapter.contents.Next
+
+            # Use the registry getter to get the search info, since it is set at the system level.
+            registry_getter = _RegistryGetter()
+            info = registry_getter.get()
+            self.info.search = info.search
+            return self.info
+
+    def set_config_method(method: ConfigMethod) -> None:
+        global _config_method
+        _config_method = method
 
-    def get_dns_info():
+    def get_dns_info() -> DnsInfo:
         """Extract resolver configuration."""
-        getter = _getter_class()
+        if _config_method == ConfigMethod.Win32:
+            getter = _Win32Getter()
+        elif _config_method == ConfigMethod.WMI:
+            getter = _WMIGetter()
+        else:
+            getter = _RegistryGetter()
         return getter.get()
diff --git a/libs/dns/wire.py b/libs/dns/wire.py
index 9f9b1573d5..cd027fa16a 100644
--- a/libs/dns/wire.py
+++ b/libs/dns/wire.py
@@ -9,7 +9,16 @@
 
 
 class Parser:
+    """Helper class for parsing DNS wire format."""
+
     def __init__(self, wire: bytes, current: int = 0):
+        """Initialize a Parser
+
+        *wire*, a ``bytes`` contains the data to be parsed, and possibly other data.
+        Typically it is the whole message or a slice of it.
+
+        *current*, an `int`, the offset within *wire* where parsing should begin.
+        """
         self.wire = wire
         self.current = 0
         self.end = len(self.wire)
diff --git a/libs/dns/xfr.py b/libs/dns/xfr.py
index dd247d33db..219fdc8caf 100644
--- a/libs/dns/xfr.py
+++ b/libs/dns/xfr.py
@@ -15,14 +15,21 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, List, Tuple, cast
 
+import dns.edns
 import dns.exception
 import dns.message
 import dns.name
 import dns.rcode
+import dns.rdata
 import dns.rdataset
 import dns.rdatatype
+import dns.rdtypes
+import dns.rdtypes.ANY
+import dns.rdtypes.ANY.SMIMEA
+import dns.rdtypes.ANY.SOA
+import dns.rdtypes.svcbbase
 import dns.serial
 import dns.transaction
 import dns.tsig
@@ -33,7 +40,7 @@ class TransferError(dns.exception.DNSException):
     """A zone transfer response got a non-zero rcode."""
 
     def __init__(self, rcode):
-        message = "Zone transfer error: %s" % dns.rcode.to_text(rcode)
+        message = f"Zone transfer error: {dns.rcode.to_text(rcode)}"
         super().__init__(message)
         self.rcode = rcode
 
@@ -55,7 +62,7 @@ def __init__(
         self,
         txn_manager: dns.transaction.TransactionManager,
         rdtype: dns.rdatatype.RdataType = dns.rdatatype.AXFR,
-        serial: Optional[int] = None,
+        serial: int | None = None,
         is_udp: bool = False,
     ):
         """Initialize an inbound zone transfer.
@@ -71,17 +78,22 @@ def __init__(
         XFR.
         """
         self.txn_manager = txn_manager
-        self.txn: Optional[dns.transaction.Transaction] = None
+        self.txn: dns.transaction.Transaction | None = None
         self.rdtype = rdtype
         if rdtype == dns.rdatatype.IXFR:
             if serial is None:
                 raise ValueError("a starting serial must be supplied for IXFRs")
-        elif is_udp:
-            raise ValueError("is_udp specified for AXFR")
+            self.incremental = True
+        elif rdtype == dns.rdatatype.AXFR:
+            if is_udp:
+                raise ValueError("is_udp specified for AXFR")
+            self.incremental = False
+        else:
+            raise ValueError("rdtype is not IXFR or AXFR")
         self.serial = serial
         self.is_udp = is_udp
         (_, _, self.origin) = txn_manager.origin_information()
-        self.soa_rdataset: Optional[dns.rdataset.Rdataset] = None
+        self.soa_rdataset: dns.rdataset.Rdataset | None = None
         self.done = False
         self.expecting_SOA = False
         self.delete_mode = False
@@ -96,8 +108,7 @@ def process_message(self, message: dns.message.Message) -> bool:
         Returns `True` if the transfer is complete, and `False` otherwise.
         """
         if self.txn is None:
-            replacement = self.rdtype == dns.rdatatype.AXFR
-            self.txn = self.txn_manager.writer(replacement)
+            self.txn = self.txn_manager.writer(not self.incremental)
         rcode = message.rcode()
         if rcode != dns.rcode.NOERROR:
             raise TransferError(rcode)
@@ -123,14 +134,16 @@ def process_message(self, message: dns.message.Message) -> bool:
             if rdataset.rdtype != dns.rdatatype.SOA:
                 raise dns.exception.FormError("first RRset is not an SOA")
             answer_index = 1
-            self.soa_rdataset = rdataset.copy()
-            if self.rdtype == dns.rdatatype.IXFR:
-                if self.soa_rdataset[0].serial == self.serial:
+            self.soa_rdataset = rdataset.copy()  # pyright: ignore
+            if self.incremental:
+                assert self.soa_rdataset is not None
+                soa = cast(dns.rdtypes.ANY.SOA.SOA, self.soa_rdataset[0])
+                if soa.serial == self.serial:
                     #
                     # We're already up-to-date.
                     #
                     self.done = True
-                elif dns.serial.Serial(self.soa_rdataset[0].serial) < self.serial:
+                elif dns.serial.Serial(soa.serial) < self.serial:
                     # It went backwards!
                     raise SerialWentBackwards
                 else:
@@ -159,7 +172,7 @@ def process_message(self, message: dns.message.Message) -> bool:
                 #
                 # Every time we see an origin SOA delete_mode inverts
                 #
-                if self.rdtype == dns.rdatatype.IXFR:
+                if self.incremental:
                     self.delete_mode = not self.delete_mode
                 #
                 # If this SOA Rdataset is equal to the first we saw
@@ -168,19 +181,16 @@ def process_message(self, message: dns.message.Message) -> bool:
                 # part of the response.
                 #
                 if rdataset == self.soa_rdataset and (
-                    self.rdtype == dns.rdatatype.AXFR
-                    or (self.rdtype == dns.rdatatype.IXFR and self.delete_mode)
+                    (not self.incremental) or self.delete_mode
                 ):
                     #
                     # This is the final SOA
                     #
+                    soa = cast(dns.rdtypes.ANY.SOA.SOA, rdataset[0])
                     if self.expecting_SOA:
                         # We got an empty IXFR sequence!
                         raise dns.exception.FormError("empty IXFR sequence")
-                    if (
-                        self.rdtype == dns.rdatatype.IXFR
-                        and self.serial != rdataset[0].serial
-                    ):
+                    if self.incremental and self.serial != soa.serial:
                         raise dns.exception.FormError("unexpected end of IXFR sequence")
                     self.txn.replace(name, rdataset)
                     self.txn.commit()
@@ -191,16 +201,17 @@ def process_message(self, message: dns.message.Message) -> bool:
                     # This is not the final SOA
                     #
                     self.expecting_SOA = False
-                    if self.rdtype == dns.rdatatype.IXFR:
+                    soa = cast(dns.rdtypes.ANY.SOA.SOA, rdataset[0])
+                    if self.incremental:
                         if self.delete_mode:
                             # This is the start of an IXFR deletion set
-                            if rdataset[0].serial != self.serial:
+                            if soa.serial != self.serial:
                                 raise dns.exception.FormError(
                                     "IXFR base serial mismatch"
                                 )
                         else:
                             # This is the start of an IXFR addition set
-                            self.serial = rdataset[0].serial
+                            self.serial = soa.serial
                             self.txn.replace(name, rdataset)
                     else:
                         # We saw a non-final SOA for the origin in an AXFR.
@@ -212,7 +223,7 @@ def process_message(self, message: dns.message.Message) -> bool:
                 # SOA RR, but saw something else, so this must be an
                 # AXFR response.
                 #
-                self.rdtype = dns.rdatatype.AXFR
+                self.incremental = False
                 self.expecting_SOA = False
                 self.delete_mode = False
                 self.txn.rollback()
@@ -249,16 +260,16 @@ def __exit__(self, exc_type, exc_val, exc_tb):
 
 def make_query(
     txn_manager: dns.transaction.TransactionManager,
-    serial: Optional[int] = 0,
-    use_edns: Optional[Union[int, bool]] = None,
-    ednsflags: Optional[int] = None,
-    payload: Optional[int] = None,
-    request_payload: Optional[int] = None,
-    options: Optional[List[dns.edns.Option]] = None,
+    serial: int | None = 0,
+    use_edns: int | bool | None = None,
+    ednsflags: int | None = None,
+    payload: int | None = None,
+    request_payload: int | None = None,
+    options: List[dns.edns.Option] | None = None,
     keyring: Any = None,
-    keyname: Optional[dns.name.Name] = None,
-    keyalgorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-) -> Tuple[dns.message.QueryMessage, Optional[int]]:
+    keyname: dns.name.Name | None = None,
+    keyalgorithm: dns.name.Name | str = dns.tsig.default_algorithm,
+) -> Tuple[dns.message.QueryMessage, int | None]:
     """Make an AXFR or IXFR query.
 
     *txn_manager* is a ``dns.transaction.TransactionManager``, typically a
@@ -289,7 +300,8 @@ def make_query(
         with txn_manager.reader() as txn:
             rdataset = txn.get(origin, "SOA")
             if rdataset:
-                serial = rdataset[0].serial
+                soa = cast(dns.rdtypes.ANY.SOA.SOA, rdataset[0])
+                serial = soa.serial
                 rdtype = dns.rdatatype.IXFR
             else:
                 serial = None
@@ -321,7 +333,7 @@ def make_query(
     return (q, serial)
 
 
-def extract_serial_from_query(query: dns.message.Message) -> Optional[int]:
+def extract_serial_from_query(query: dns.message.Message) -> int | None:
     """Extract the SOA serial number from query if it is an IXFR and return
     it, otherwise return None.
 
@@ -337,7 +349,8 @@ def extract_serial_from_query(query: dns.message.Message) -> Optional[int]:
         return None
     elif question.rdtype != dns.rdatatype.IXFR:
         raise ValueError("query is not an AXFR or IXFR")
-    soa = query.find_rrset(
+    soa_rrset = query.find_rrset(
         query.authority, question.name, question.rdclass, dns.rdatatype.SOA
     )
-    return soa[0].serial
+    soa = cast(dns.rdtypes.ANY.SOA.SOA, soa_rrset[0])
+    return soa.serial
diff --git a/libs/dns/zone.py b/libs/dns/zone.py
index 844919e41f..f916ffee55 100644
--- a/libs/dns/zone.py
+++ b/libs/dns/zone.py
@@ -28,10 +28,9 @@
     Iterator,
     List,
     MutableMapping,
-    Optional,
     Set,
     Tuple,
-    Union,
+    cast,
 )
 
 import dns.exception
@@ -87,7 +86,7 @@ class DigestVerificationFailure(dns.exception.DNSException):
 
 def _validate_name(
     name: dns.name.Name,
-    origin: Optional[dns.name.Name],
+    origin: dns.name.Name | None,
     relativize: bool,
 ) -> dns.name.Name:
     # This name validation code is shared by Zone and Version
@@ -130,14 +129,16 @@ class Zone(dns.transaction.TransactionManager):
 
     node_factory: Callable[[], dns.node.Node] = dns.node.Node
     map_factory: Callable[[], MutableMapping[dns.name.Name, dns.node.Node]] = dict
-    writable_version_factory: Optional[Callable[[], "WritableVersion"]] = None
-    immutable_version_factory: Optional[Callable[[], "ImmutableVersion"]] = None
+    # We only require the version types as "Version" to allow for flexibility, as
+    # only the version protocol matters
+    writable_version_factory: Callable[["Zone", bool], "Version"] | None = None
+    immutable_version_factory: Callable[["Version"], "Version"] | None = None
 
     __slots__ = ["rdclass", "origin", "nodes", "relativize"]
 
     def __init__(
         self,
-        origin: Optional[Union[dns.name.Name, str]],
+        origin: dns.name.Name | str | None,
         rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
         relativize: bool = True,
     ):
@@ -190,7 +191,7 @@ def __ne__(self, other):
 
         return not self.__eq__(other)
 
-    def _validate_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
+    def _validate_name(self, name: dns.name.Name | str) -> dns.name.Name:
         # Note that any changes in this method should have corresponding changes
         # made in the Version _validate_name() method.
         if isinstance(name, str):
@@ -232,7 +233,7 @@ def __contains__(self, key):
         return key in self.nodes
 
     def find_node(
-        self, name: Union[dns.name.Name, str], create: bool = False
+        self, name: dns.name.Name | str, create: bool = False
     ) -> dns.node.Node:
         """Find a node in the zone, possibly creating it.
 
@@ -260,8 +261,8 @@ def find_node(
         return node
 
     def get_node(
-        self, name: Union[dns.name.Name, str], create: bool = False
-    ) -> Optional[dns.node.Node]:
+        self, name: dns.name.Name | str, create: bool = False
+    ) -> dns.node.Node | None:
         """Get a node in the zone, possibly creating it.
 
         This method is like ``find_node()``, except it returns None instead
@@ -285,7 +286,7 @@ def get_node(
             node = None
         return node
 
-    def delete_node(self, name: Union[dns.name.Name, str]) -> None:
+    def delete_node(self, name: dns.name.Name | str) -> None:
         """Delete the specified node if it exists.
 
         *name*: the name of the node to find.
@@ -302,9 +303,9 @@ def delete_node(self, name: Union[dns.name.Name, str]) -> None:
 
     def find_rdataset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
         create: bool = False,
     ) -> dns.rdataset.Rdataset:
         """Look for an rdataset with the specified name and type in the zone,
@@ -349,11 +350,11 @@ def find_rdataset(
 
     def get_rdataset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
         create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
+    ) -> dns.rdataset.Rdataset | None:
         """Look for an rdataset with the specified name and type in the zone.
 
         This method is like ``find_rdataset()``, except it returns None instead
@@ -397,9 +398,9 @@ def get_rdataset(
 
     def delete_rdataset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
     ) -> None:
         """Delete the rdataset matching *rdtype* and *covers*, if it
         exists at the node specified by *name*.
@@ -434,7 +435,7 @@ def delete_rdataset(
                 self.delete_node(name)
 
     def replace_rdataset(
-        self, name: Union[dns.name.Name, str], replacement: dns.rdataset.Rdataset
+        self, name: dns.name.Name | str, replacement: dns.rdataset.Rdataset
     ) -> None:
         """Replace an rdataset at name.
 
@@ -461,9 +462,9 @@ def replace_rdataset(
 
     def find_rrset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
     ) -> dns.rrset.RRset:
         """Look for an rdataset with the specified name and type in the zone,
         and return an RRset encapsulating it.
@@ -513,10 +514,10 @@ def find_rrset(
 
     def get_rrset(
         self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> Optional[dns.rrset.RRset]:
+        name: dns.name.Name | str,
+        rdtype: dns.rdatatype.RdataType | str,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
+    ) -> dns.rrset.RRset | None:
         """Look for an rdataset with the specified name and type in the zone,
         and return an RRset encapsulating it.
 
@@ -559,8 +560,8 @@ def get_rrset(
 
     def iterate_rdatasets(
         self,
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.ANY,
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.ANY,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
     ) -> Iterator[Tuple[dns.name.Name, dns.rdataset.Rdataset]]:
         """Return a generator which yields (name, rdataset) tuples for
         all rdatasets in the zone which have the specified *rdtype*
@@ -591,8 +592,8 @@ def iterate_rdatasets(
 
     def iterate_rdatas(
         self,
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.ANY,
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
+        rdtype: dns.rdatatype.RdataType | str = dns.rdatatype.ANY,
+        covers: dns.rdatatype.RdataType | str = dns.rdatatype.NONE,
     ) -> Iterator[Tuple[dns.name.Name, int, dns.rdata.Rdata]]:
         """Return a generator which yields (name, ttl, rdata) tuples for
         all rdatas in the zone which have the specified *rdtype*
@@ -627,7 +628,7 @@ def to_file(
         f: Any,
         sorted: bool = True,
         relativize: bool = True,
-        nl: Optional[str] = None,
+        nl: str | None = None,
         want_comments: bool = False,
         want_origin: bool = False,
     ) -> None:
@@ -698,9 +699,9 @@ def to_file(
             for n in names:
                 l = self[n].to_text(
                     n,
-                    origin=self.origin,
-                    relativize=relativize,
-                    want_comments=want_comments,
+                    origin=self.origin,  # pyright: ignore
+                    relativize=relativize,  # pyright: ignore
+                    want_comments=want_comments,  # pyright: ignore
                 )
                 l_b = l.encode(file_enc)
 
@@ -715,7 +716,7 @@ def to_text(
         self,
         sorted: bool = True,
         relativize: bool = True,
-        nl: Optional[str] = None,
+        nl: str | None = None,
         want_comments: bool = False,
         want_origin: bool = False,
     ) -> str:
@@ -770,7 +771,7 @@ def check_origin(self) -> None:
             raise NoNS
 
     def get_soa(
-        self, txn: Optional[dns.transaction.Transaction] = None
+        self, txn: dns.transaction.Transaction | None = None
     ) -> dns.rdtypes.ANY.SOA.SOA:
         """Get the zone SOA rdata.
 
@@ -786,14 +787,16 @@ def get_soa(
                 # an SOA if there is no origin.
                 raise NoSOA
             origin_name = self.origin
-        soa: Optional[dns.rdataset.Rdataset]
+        soa_rds: dns.rdataset.Rdataset | None
         if txn:
-            soa = txn.get(origin_name, dns.rdatatype.SOA)
+            soa_rds = txn.get(origin_name, dns.rdatatype.SOA)
         else:
-            soa = self.get_rdataset(origin_name, dns.rdatatype.SOA)
-        if soa is None:
+            soa_rds = self.get_rdataset(origin_name, dns.rdatatype.SOA)
+        if soa_rds is None:
             raise NoSOA
-        return soa[0]
+        else:
+            soa = cast(dns.rdtypes.ANY.SOA.SOA, soa_rds[0])
+            return soa
 
     def _compute_digest(
         self,
@@ -841,9 +844,9 @@ def compute_digest(
         )
 
     def verify_digest(
-        self, zonemd: Optional[dns.rdtypes.ANY.ZONEMD.ZONEMD] = None
+        self, zonemd: dns.rdtypes.ANY.ZONEMD.ZONEMD | None = None
     ) -> None:
-        digests: Union[dns.rdataset.Rdataset, List[dns.rdtypes.ANY.ZONEMD.ZONEMD]]
+        digests: dns.rdataset.Rdataset | List[dns.rdtypes.ANY.ZONEMD.ZONEMD]
         if zonemd:
             digests = [zonemd]
         else:
@@ -873,8 +876,8 @@ def writer(self, replacement: bool = False) -> "Transaction":
 
     def origin_information(
         self,
-    ) -> Tuple[Optional[dns.name.Name], bool, Optional[dns.name.Name]]:
-        effective: Optional[dns.name.Name]
+    ) -> Tuple[dns.name.Name | None, bool, dns.name.Name | None]:
+        effective: dns.name.Name | None
         if self.relativize:
             effective = dns.name.empty
         else:
@@ -892,12 +895,12 @@ def _end_read(self, txn):
     def _end_write(self, txn):
         pass
 
-    def _commit_version(self, _, version, origin):
+    def _commit_version(self, txn, version, origin):
         self.nodes = version.nodes
         if self.origin is None:
             self.origin = origin
 
-    def _get_next_version_id(self):
+    def _get_next_version_id(self) -> int:
         # Versions are ephemeral and all have id 1
         return 1
 
@@ -945,7 +948,7 @@ def get_rdataset(
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
         create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
+    ) -> dns.rdataset.Rdataset | None:
         if create:
             raise TypeError("immutable")
         return super().get_rdataset(rdclass, rdtype, covers, False)
@@ -970,8 +973,8 @@ def __init__(
         self,
         zone: Zone,
         id: int,
-        nodes: Optional[MutableMapping[dns.name.Name, dns.node.Node]] = None,
-        origin: Optional[dns.name.Name] = None,
+        nodes: MutableMapping[dns.name.Name, dns.node.Node] | None = None,
+        origin: dns.name.Name | None = None,
     ):
         self.zone = zone
         self.id = id
@@ -984,7 +987,7 @@ def __init__(
     def _validate_name(self, name: dns.name.Name) -> dns.name.Name:
         return _validate_name(name, self.origin, self.zone.relativize)
 
-    def get_node(self, name: dns.name.Name) -> Optional[dns.node.Node]:
+    def get_node(self, name: dns.name.Name) -> dns.node.Node | None:
         name = self._validate_name(name)
         return self.nodes.get(name)
 
@@ -993,7 +996,7 @@ def get_rdataset(
         name: dns.name.Name,
         rdtype: dns.rdatatype.RdataType,
         covers: dns.rdatatype.RdataType,
-    ) -> Optional[dns.rdataset.Rdataset]:
+    ) -> dns.rdataset.Rdataset | None:
         node = self.get_node(name)
         if node is None:
             return None
@@ -1023,7 +1026,9 @@ def __init__(self, zone: Zone, replacement: bool = False):
         self.origin = zone.origin
         self.changed: Set[dns.name.Name] = set()
 
-    def _maybe_cow(self, name: dns.name.Name) -> dns.node.Node:
+    def _maybe_cow_with_name(
+        self, name: dns.name.Name
+    ) -> Tuple[dns.node.Node, dns.name.Name]:
         name = self._validate_name(name)
         node = self.nodes.get(name)
         if node is None or name not in self.changed:
@@ -1041,9 +1046,12 @@ def _maybe_cow(self, name: dns.name.Name) -> dns.node.Node:
                 new_node.rdatasets.extend(node.rdatasets)
             self.nodes[name] = new_node
             self.changed.add(name)
-            return new_node
+            return (new_node, name)
         else:
-            return node
+            return (node, name)
+
+    def _maybe_cow(self, name: dns.name.Name) -> dns.node.Node:
+        return self._maybe_cow_with_name(name)[0]
 
     def delete_node(self, name: dns.name.Name) -> None:
         name = self._validate_name(name)
@@ -1071,7 +1079,11 @@ def delete_rdataset(
 
 @dns.immutable.immutable
 class ImmutableVersion(Version):
-    def __init__(self, version: WritableVersion):
+    def __init__(self, version: Version):
+        if not isinstance(version, WritableVersion):
+            raise ValueError(
+                "a dns.zone.ImmutableVersion requires a dns.zone.WritableVersion"
+            )
         # We tell super() that it's a replacement as we don't want it
         # to copy the nodes, as we're about to do that with an
         # immutable Dict.
@@ -1106,67 +1118,83 @@ def zone(self):
 
     def _setup_version(self):
         assert self.version is None
-        factory = self.manager.writable_version_factory
+        factory = self.manager.writable_version_factory  # pyright: ignore
         if factory is None:
             factory = WritableVersion
-        self.version = factory(self.zone, self.replacement)
+        self.version = factory(self.zone, self.replacement)  # pyright: ignore
 
     def _get_rdataset(self, name, rdtype, covers):
+        assert self.version is not None
         return self.version.get_rdataset(name, rdtype, covers)
 
     def _put_rdataset(self, name, rdataset):
         assert not self.read_only
+        assert self.version is not None
         self.version.put_rdataset(name, rdataset)
 
     def _delete_name(self, name):
         assert not self.read_only
+        assert self.version is not None
         self.version.delete_node(name)
 
     def _delete_rdataset(self, name, rdtype, covers):
         assert not self.read_only
+        assert self.version is not None
         self.version.delete_rdataset(name, rdtype, covers)
 
     def _name_exists(self, name):
+        assert self.version is not None
         return self.version.get_node(name) is not None
 
     def _changed(self):
         if self.read_only:
             return False
         else:
+            assert self.version is not None
             return len(self.version.changed) > 0
 
     def _end_transaction(self, commit):
+        assert self.zone is not None
+        assert self.version is not None
         if self.read_only:
-            self.zone._end_read(self)
+            self.zone._end_read(self)  # pyright: ignore
         elif commit and len(self.version.changed) > 0:
             if self.make_immutable:
-                factory = self.manager.immutable_version_factory
+                factory = self.manager.immutable_version_factory  # pyright: ignore
                 if factory is None:
                     factory = ImmutableVersion
                 version = factory(self.version)
             else:
                 version = self.version
-            self.zone._commit_version(self, version, self.version.origin)
+            self.zone._commit_version(  # pyright: ignore
+                self, version, self.version.origin
+            )
+
         else:
             # rollback
-            self.zone._end_write(self)
+            self.zone._end_write(self)  # pyright: ignore
 
     def _set_origin(self, origin):
+        assert self.version is not None
         if self.version.origin is None:
             self.version.origin = origin
 
     def _iterate_rdatasets(self):
+        assert self.version is not None
         for name, node in self.version.items():
             for rdataset in node:
                 yield (name, rdataset)
 
     def _iterate_names(self):
+        assert self.version is not None
         return self.version.keys()
 
     def _get_node(self, name):
+        assert self.version is not None
         return self.version.get_node(name)
 
     def _origin_information(self):
+        assert self.version is not None
         (absolute, relativize, effective) = self.manager.origin_information()
         if absolute is None and self.version.origin is not None:
             # No origin has been committed yet, but we've learned one as part of
@@ -1181,15 +1209,15 @@ def _origin_information(self):
 
 def _from_text(
     text: Any,
-    origin: Optional[Union[dns.name.Name, str]] = None,
+    origin: dns.name.Name | str | None = None,
     rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
     relativize: bool = True,
     zone_factory: Any = Zone,
-    filename: Optional[str] = None,
+    filename: str | None = None,
     allow_include: bool = False,
     check_origin: bool = True,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    allow_directives: Union[bool, Iterable[str]] = True,
+    idna_codec: dns.name.IDNACodec | None = None,
+    allow_directives: bool | Iterable[str] = True,
 ) -> Zone:
     # See the comments for the public APIs from_text() and from_file() for
     # details.
@@ -1214,7 +1242,7 @@ def _from_text(
             reader.read()
         except dns.zonefile.UnknownOrigin:
             # for backwards compatibility
-            raise dns.zone.UnknownOrigin
+            raise UnknownOrigin
     # Now that we're done reading, do some basic checking of the zone.
     if check_origin:
         zone.check_origin()
@@ -1223,15 +1251,15 @@ def _from_text(
 
 def from_text(
     text: str,
-    origin: Optional[Union[dns.name.Name, str]] = None,
+    origin: dns.name.Name | str | None = None,
     rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
     relativize: bool = True,
     zone_factory: Any = Zone,
-    filename: Optional[str] = None,
+    filename: str | None = None,
     allow_include: bool = False,
     check_origin: bool = True,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    allow_directives: Union[bool, Iterable[str]] = True,
+    idna_codec: dns.name.IDNACodec | None = None,
+    allow_directives: bool | Iterable[str] = True,
 ) -> Zone:
     """Build a zone object from a zone file format string.
 
@@ -1297,15 +1325,15 @@ class IN.
 
 def from_file(
     f: Any,
-    origin: Optional[Union[dns.name.Name, str]] = None,
+    origin: dns.name.Name | str | None = None,
     rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
     relativize: bool = True,
     zone_factory: Any = Zone,
-    filename: Optional[str] = None,
+    filename: str | None = None,
     allow_include: bool = True,
     check_origin: bool = True,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    allow_directives: Union[bool, Iterable[str]] = True,
+    idna_codec: dns.name.IDNACodec | None = None,
+    allow_directives: bool | Iterable[str] = True,
 ) -> Zone:
     """Read a zone file and build a zone object.
 
@@ -1359,7 +1387,7 @@ def from_file(
     if isinstance(f, str):
         if filename is None:
             filename = f
-        cm: contextlib.AbstractContextManager = open(f)
+        cm: contextlib.AbstractContextManager = open(f, encoding="utf-8")
     else:
         cm = contextlib.nullcontext(f)
     with cm as f:
diff --git a/libs/dns/zonefile.py b/libs/dns/zonefile.py
index af064e730e..7a81454b68 100644
--- a/libs/dns/zonefile.py
+++ b/libs/dns/zonefile.py
@@ -19,7 +19,7 @@
 
 import re
 import sys
-from typing import Any, Iterable, List, Optional, Set, Tuple, Union
+from typing import Any, Iterable, List, Set, Tuple, cast
 
 import dns.exception
 import dns.grange
@@ -68,9 +68,9 @@ def _check_cname_and_other_data(txn, name, rdataset):
 
 SavedStateType = Tuple[
     dns.tokenizer.Tokenizer,
-    Optional[dns.name.Name],  # current_origin
-    Optional[dns.name.Name],  # last_name
-    Optional[Any],  # current_file
+    dns.name.Name | None,  # current_origin
+    dns.name.Name | None,  # last_name
+    Any | None,  # current_file
     int,  # last_ttl
     bool,  # last_ttl_known
     int,  # default_ttl
@@ -94,12 +94,12 @@ def __init__(
         rdclass: dns.rdataclass.RdataClass,
         txn: dns.transaction.Transaction,
         allow_include: bool = False,
-        allow_directives: Union[bool, Iterable[str]] = True,
-        force_name: Optional[dns.name.Name] = None,
-        force_ttl: Optional[int] = None,
-        force_rdclass: Optional[dns.rdataclass.RdataClass] = None,
-        force_rdtype: Optional[dns.rdatatype.RdataType] = None,
-        default_ttl: Optional[int] = None,
+        allow_directives: bool | Iterable[str] = True,
+        force_name: dns.name.Name | None = None,
+        force_ttl: int | None = None,
+        force_rdclass: dns.rdataclass.RdataClass | None = None,
+        force_rdtype: dns.rdatatype.RdataType | None = None,
+        default_ttl: int | None = None,
     ):
         self.tok = tok
         (self.zone_origin, self.relativize, _) = txn.manager.origin_information()
@@ -118,7 +118,7 @@ def __init__(
         self.zone_rdclass = rdclass
         self.txn = txn
         self.saved_state: List[SavedStateType] = []
-        self.current_file: Optional[Any] = None
+        self.current_file: Any | None = None
         self.allowed_directives: Set[str]
         if allow_directives is True:
             self.allowed_directives = {"$GENERATE", "$ORIGIN", "$TTL"}
@@ -169,6 +169,9 @@ def _rr_line(self):
                     return
                 self.tok.unget(token)
             name = self.last_name
+            if name is None:
+                raise dns.exception.SyntaxError("the last used name is undefined")
+            assert self.zone_origin is not None
             if not name.is_subdomain(self.zone_origin):
                 self._eat_line()
                 return
@@ -230,7 +233,7 @@ def _rr_line(self):
             try:
                 rdtype = dns.rdatatype.from_text(token.value)
             except Exception:
-                raise dns.exception.SyntaxError("unknown rdatatype '%s'" % token.value)
+                raise dns.exception.SyntaxError(f"unknown rdatatype '{token.value}'")
 
         try:
             rd = dns.rdata.from_text(
@@ -251,19 +254,18 @@ def _rr_line(self):
             # We convert them to syntax errors so that we can emit
             # helpful filename:line info.
             (ty, va) = sys.exc_info()[:2]
-            raise dns.exception.SyntaxError(
-                "caught exception {}: {}".format(str(ty), str(va))
-            )
+            raise dns.exception.SyntaxError(f"caught exception {str(ty)}: {str(va)}")
 
         if not self.default_ttl_known and rdtype == dns.rdatatype.SOA:
             # The pre-RFC2308 and pre-BIND9 behavior inherits the zone default
             # TTL from the SOA minttl if no $TTL statement is present before the
             # SOA is parsed.
-            self.default_ttl = rd.minimum
+            soa_rd = cast(dns.rdtypes.ANY.SOA.SOA, rd)
+            self.default_ttl = soa_rd.minimum
             self.default_ttl_known = True
             if ttl is None:
                 # if we didn't have a TTL on the SOA, set it!
-                ttl = rd.minimum
+                ttl = soa_rd.minimum
 
         # TTL check.  We had to wait until now to do this as the SOA RR's
         # own TTL can be inferred from its minimum.
@@ -281,41 +283,41 @@ def _parse_modify(self, side: str) -> Tuple[str, str, int, int, str]:
         # Sometimes there are modifiers in the hostname. These come after
         # the dollar sign. They are in the form: ${offset[,width[,base]]}.
         # Make names
+        mod = ""
+        sign = "+"
+        offset = "0"
+        width = "0"
+        base = "d"
         g1 = is_generate1.match(side)
         if g1:
             mod, sign, offset, width, base = g1.groups()
             if sign == "":
                 sign = "+"
-        g2 = is_generate2.match(side)
-        if g2:
-            mod, sign, offset = g2.groups()
-            if sign == "":
-                sign = "+"
-            width = 0
-            base = "d"
-        g3 = is_generate3.match(side)
-        if g3:
-            mod, sign, offset, width = g3.groups()
-            if sign == "":
-                sign = "+"
-            base = "d"
-
-        if not (g1 or g2 or g3):
-            mod = ""
-            sign = "+"
-            offset = 0
-            width = 0
-            base = "d"
+        else:
+            g2 = is_generate2.match(side)
+            if g2:
+                mod, sign, offset = g2.groups()
+                if sign == "":
+                    sign = "+"
+                width = "0"
+                base = "d"
+            else:
+                g3 = is_generate3.match(side)
+                if g3:
+                    mod, sign, offset, width = g3.groups()
+                    if sign == "":
+                        sign = "+"
+                    base = "d"
 
-        offset = int(offset)
-        width = int(width)
+        ioffset = int(offset)
+        iwidth = int(width)
 
         if sign not in ["+", "-"]:
-            raise dns.exception.SyntaxError("invalid offset sign %s" % sign)
+            raise dns.exception.SyntaxError(f"invalid offset sign {sign}")
         if base not in ["d", "o", "x", "X", "n", "N"]:
-            raise dns.exception.SyntaxError("invalid type %s" % base)
+            raise dns.exception.SyntaxError(f"invalid type {base}")
 
-        return mod, sign, offset, width, base
+        return mod, sign, ioffset, iwidth, base
 
     def _generate_line(self):
         # range lhs [ttl] [class] type rhs [ comment ]
@@ -358,6 +360,12 @@ def _generate_line(self):
                 ttl = self.default_ttl
             elif self.last_ttl_known:
                 ttl = self.last_ttl
+            else:
+                # We don't go to the extra "look at the SOA" level of effort for
+                # $GENERATE, because the user really ought to have defined a TTL
+                # somehow!
+                raise dns.exception.SyntaxError("Missing default TTL value")
+
         # Class
         try:
             rdclass = dns.rdataclass.from_text(token.value)
@@ -377,7 +385,7 @@ def _generate_line(self):
             if not token.is_identifier():
                 raise dns.exception.SyntaxError
         except Exception:
-            raise dns.exception.SyntaxError("unknown rdatatype '%s'" % token.value)
+            raise dns.exception.SyntaxError(f"unknown rdatatype '{token.value}'")
 
         # rhs (required)
         rhs = token.value
@@ -412,13 +420,14 @@ def _format_index(index: int, base: str, width: int) -> str:
             lzfindex = _format_index(lindex, lbase, lwidth)
             rzfindex = _format_index(rindex, rbase, rwidth)
 
-            name = lhs.replace("$%s" % (lmod), lzfindex)
-            rdata = rhs.replace("$%s" % (rmod), rzfindex)
+            name = lhs.replace(f"${lmod}", lzfindex)
+            rdata = rhs.replace(f"${rmod}", rzfindex)
 
             self.last_name = dns.name.from_text(
                 name, self.current_origin, self.tok.idna_codec
             )
             name = self.last_name
+            assert self.zone_origin is not None
             if not name.is_subdomain(self.zone_origin):
                 self._eat_line()
                 return
@@ -445,7 +454,7 @@ def _format_index(index: int, base: str, width: int) -> str:
                 # helpful filename:line info.
                 (ty, va) = sys.exc_info()[:2]
                 raise dns.exception.SyntaxError(
-                    "caught exception %s: %s" % (str(ty), str(va))
+                    f"caught exception {str(ty)}: {str(va)}"
                 )
 
             self.txn.add(name, ttl, rd)
@@ -506,7 +515,7 @@ def read(self) -> None:
                         token = self.tok.get()
                         filename = token.value
                         token = self.tok.get()
-                        new_origin: Optional[dns.name.Name]
+                        new_origin: dns.name.Name | None
                         if token.is_identifier():
                             new_origin = dns.name.from_text(
                                 token.value, self.current_origin, self.tok.idna_codec
@@ -528,7 +537,7 @@ def read(self) -> None:
                                 self.default_ttl_known,
                             )
                         )
-                        self.current_file = open(filename, "r")
+                        self.current_file = open(filename, encoding="utf-8")
                         self.tok = dns.tokenizer.Tokenizer(self.current_file, filename)
                         self.current_origin = new_origin
                     elif c == "$GENERATE":
@@ -544,9 +553,7 @@ def read(self) -> None:
             (filename, line_number) = self.tok.where()
             if detail is None:
                 detail = "syntax error"
-            ex = dns.exception.SyntaxError(
-                "%s:%d: %s" % (filename, line_number, detail)
-            )
+            ex = dns.exception.SyntaxError(f"{filename}:{line_number}: {detail}")
             tb = sys.exc_info()[2]
             raise ex.with_traceback(tb) from None
 
@@ -608,7 +615,7 @@ def _end_transaction(self, commit):
                 )
                 rrset.update(rdataset)
                 rrsets.append(rrset)
-            self.manager.set_rrsets(rrsets)
+            self.manager.set_rrsets(rrsets)  # pyright: ignore
 
     def _set_origin(self, origin):
         pass
@@ -622,12 +629,15 @@ def _iterate_names(self):
 
 class RRSetsReaderManager(dns.transaction.TransactionManager):
     def __init__(
-        self, origin=dns.name.root, relativize=False, rdclass=dns.rdataclass.IN
+        self,
+        origin: dns.name.Name | None = dns.name.root,
+        relativize: bool = False,
+        rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
     ):
         self.origin = origin
         self.relativize = relativize
         self.rdclass = rdclass
-        self.rrsets = []
+        self.rrsets: List[dns.rrset.RRset] = []
 
     def reader(self):  # pragma: no cover
         raise NotImplementedError
@@ -646,20 +656,20 @@ def origin_information(self):
             effective = self.origin
         return (self.origin, self.relativize, effective)
 
-    def set_rrsets(self, rrsets):
+    def set_rrsets(self, rrsets: List[dns.rrset.RRset]) -> None:
         self.rrsets = rrsets
 
 
 def read_rrsets(
     text: Any,
-    name: Optional[Union[dns.name.Name, str]] = None,
-    ttl: Optional[int] = None,
-    rdclass: Optional[Union[dns.rdataclass.RdataClass, str]] = dns.rdataclass.IN,
-    default_rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    rdtype: Optional[Union[dns.rdatatype.RdataType, str]] = None,
-    default_ttl: Optional[Union[int, str]] = None,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    origin: Optional[Union[dns.name.Name, str]] = dns.name.root,
+    name: dns.name.Name | str | None = None,
+    ttl: int | None = None,
+    rdclass: dns.rdataclass.RdataClass | str | None = dns.rdataclass.IN,
+    default_rdclass: dns.rdataclass.RdataClass | str = dns.rdataclass.IN,
+    rdtype: dns.rdatatype.RdataType | str | None = None,
+    default_ttl: int | str | None = None,
+    idna_codec: dns.name.IDNACodec | None = None,
+    origin: dns.name.Name | str | None = dns.name.root,
     relativize: bool = False,
 ) -> List[dns.rrset.RRset]:
     """Read one or more rrsets from the specified text, possibly subject
diff --git a/libs/dnspython-2.6.1.dist-info/METADATA b/libs/dnspython-2.6.1.dist-info/METADATA
deleted file mode 100644
index 596853b3ac..0000000000
--- a/libs/dnspython-2.6.1.dist-info/METADATA
+++ /dev/null
@@ -1,147 +0,0 @@
-Metadata-Version: 2.3
-Name: dnspython
-Version: 2.6.1
-Summary: DNS toolkit
-Project-URL: homepage, https://www.dnspython.org
-Project-URL: repository, https://github.com/rthalley/dnspython.git
-Project-URL: documentation, https://dnspython.readthedocs.io/en/stable/
-Project-URL: issues, https://github.com/rthalley/dnspython/issues
-Author-email: Bob Halley <halley@dnspython.org>
-License-Expression: ISC
-License-File: LICENSE
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: ISC License (ISCL)
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Internet :: Name Service (DNS)
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
-Provides-Extra: dev
-Requires-Dist: black>=23.1.0; extra == 'dev'
-Requires-Dist: coverage>=7.0; extra == 'dev'
-Requires-Dist: flake8>=7; extra == 'dev'
-Requires-Dist: mypy>=1.8; extra == 'dev'
-Requires-Dist: pylint>=3; extra == 'dev'
-Requires-Dist: pytest-cov>=4.1.0; extra == 'dev'
-Requires-Dist: pytest>=7.4; extra == 'dev'
-Requires-Dist: sphinx>=7.2.0; extra == 'dev'
-Requires-Dist: twine>=4.0.0; extra == 'dev'
-Requires-Dist: wheel>=0.42.0; extra == 'dev'
-Provides-Extra: dnssec
-Requires-Dist: cryptography>=41; extra == 'dnssec'
-Provides-Extra: doh
-Requires-Dist: h2>=4.1.0; extra == 'doh'
-Requires-Dist: httpcore>=1.0.0; extra == 'doh'
-Requires-Dist: httpx>=0.26.0; extra == 'doh'
-Provides-Extra: doq
-Requires-Dist: aioquic>=0.9.25; extra == 'doq'
-Provides-Extra: idna
-Requires-Dist: idna>=3.6; extra == 'idna'
-Provides-Extra: trio
-Requires-Dist: trio>=0.23; extra == 'trio'
-Provides-Extra: wmi
-Requires-Dist: wmi>=1.5.1; extra == 'wmi'
-Description-Content-Type: text/markdown
-
-# dnspython
-
-[![Build Status](https://github.com/rthalley/dnspython/actions/workflows/python-package.yml/badge.svg)](https://github.com/rthalley/dnspython/actions/)
-[![Documentation Status](https://readthedocs.org/projects/dnspython/badge/?version=latest)](https://dnspython.readthedocs.io/en/latest/?badge=latest)
-[![PyPI version](https://badge.fury.io/py/dnspython.svg)](https://badge.fury.io/py/dnspython)
-[![License: ISC](https://img.shields.io/badge/License-ISC-brightgreen.svg)](https://opensource.org/licenses/ISC)
-[![Coverage](https://codecov.io/github/rthalley/dnspython/coverage.svg?branch=master)](https://codecov.io/github/rthalley/dnspython)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-
-## INTRODUCTION
-
-dnspython is a DNS toolkit for Python. It supports almost all record types. It
-can be used for queries, zone transfers, and dynamic updates. It supports TSIG
-authenticated messages and EDNS0.
-
-dnspython provides both high and low level access to DNS. The high level classes
-perform queries for data of a given name, type, and class, and return an answer
-set. The low level classes allow direct manipulation of DNS zones, messages,
-names, and records.
-
-To see a few of the ways dnspython can be used, look in the `examples/`
-directory.
-
-dnspython is a utility to work with DNS, `/etc/hosts` is thus not used. For
-simple forward DNS lookups, it's better to use `socket.getaddrinfo()` or
-`socket.gethostbyname()`.
-
-dnspython originated at Nominum where it was developed
-to facilitate the testing of DNS software.
-
-## ABOUT THIS RELEASE
-
-This is dnspython 2.6.1.
-Please read
-[What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
-information about the changes in this release.
-
-## INSTALLATION
-
-* Many distributions have dnspython packaged for you, so you should
-  check there first.
-* To use a wheel downloaded from PyPi, run:
-
-    pip install dnspython
-
-* To install from the source code, go into the top-level of the source code
-  and run:
-
-```
-    pip install --upgrade pip build
-    python -m build
-    pip install dist/*.whl
-```
-
-* To install the latest from the master branch, run `pip install git+https://github.com/rthalley/dnspython.git`
-
-Dnspython's default installation does not depend on any modules other than
-those in the Python standard library.  To use some features, additional modules
-must be installed.  For convenience, pip options are defined for the
-requirements.
-
-If you want to use DNS-over-HTTPS, run
-`pip install dnspython[doh]`.
-
-If you want to use DNSSEC functionality, run
-`pip install dnspython[dnssec]`.
-
-If you want to use internationalized domain names (IDNA)
-functionality, you must run
-`pip install dnspython[idna]`
-
-If you want to use the Trio asynchronous I/O package, run
-`pip install dnspython[trio]`.
-
-If you want to use WMI on Windows to determine the active DNS settings
-instead of the default registry scanning method, run
-`pip install dnspython[wmi]`.
-
-If you want to try the experimental DNS-over-QUIC code, run
-`pip install dnspython[doq]`.
-
-Note that you can install any combination of the above, e.g.:
-`pip install dnspython[doh,dnssec,idna]`
-
-### Notices
-
-Python 2.x support ended with the release of 1.16.0.  Dnspython 2.0.0 through
-2.2.x support Python 3.6 and later.  For dnspython 2.3.x, the minimum
-supported Python version is 3.7, and for 2.4.x the minimum supported verison is 3.8.
-We plan to align future support with the lifetime of the Python 3 versions.
-
-Documentation has moved to
-[dnspython.readthedocs.io](https://dnspython.readthedocs.io).
diff --git a/libs/dnspython-2.6.1.dist-info/RECORD b/libs/dnspython-2.6.1.dist-info/RECORD
deleted file mode 100644
index 00515e4968..0000000000
--- a/libs/dnspython-2.6.1.dist-info/RECORD
+++ /dev/null
@@ -1,149 +0,0 @@
-dns/__init__.py,sha256=YJZtDG14Idw5ui3h1nWooSwPM9gsxQgB8M0GBZ3aly0,1663
-dns/_asyncbackend.py,sha256=Ny0kGesm9wbLBnt-0u-tANOKsxcYt2jbMuRoRz_JZUA,2360
-dns/_asyncio_backend.py,sha256=q58xPdqAOLmOYOux8GFRyiH-fSZ7jiwZF-Jg2vHjYSU,8971
-dns/_ddr.py,sha256=rHXKC8kncCTT9N4KBh1flicl79nyDjQ-DDvq30MJ3B8,5247
-dns/_features.py,sha256=MUeyfM_nMYAYkasGfbY7I_15JmwftaZjseuP1L43MT0,2384
-dns/_immutable_ctx.py,sha256=gtoCLMmdHXI23zt5lRSIS3A4Ca3jZJngebdoFFOtiwU,2459
-dns/_trio_backend.py,sha256=Vab_wR2CxDgy2Jz3iM_64FZmP_kMUN9j8LS4eNl-Oig,8269
-dns/asyncbackend.py,sha256=82fXTFls_m7F_ekQbgUGOkoBbs4BI-GBLDZAWNGUvJ0,2796
-dns/asyncquery.py,sha256=Q7u04mbbqCoe9VxsqRcsWTPxgH2Cx49eWWgi2wUyZHU,26850
-dns/asyncresolver.py,sha256=GD86dCyW9YGKs6SggWXwBKEXifW7Qdx4cEAGFKY6fA4,17852
-dns/dnssec.py,sha256=xyYW1cf6eeFNXROrEs1pyY4TgC8jlmUiiootaPbVjjY,40693
-dns/dnssecalgs/__init__.py,sha256=DcnGIbL6m-USPSiLWHSw511awB7dytlljvCOOmzchS0,4279
-dns/dnssecalgs/base.py,sha256=hsFHFr_eCYeDcI0eU6_WiLlOYL0GR4QJ__sXoMrIAfE,2446
-dns/dnssecalgs/cryptography.py,sha256=3uqMfRm-zCkJPOrxUqlu9CmdxIMy71dVor9eAHi0wZM,2425
-dns/dnssecalgs/dsa.py,sha256=hklh_HkT_ZffQBHQ7t6pKUStTH4x5nXlz8R9RUP72aY,3497
-dns/dnssecalgs/ecdsa.py,sha256=GWrJgEXAK08MCdbLk7LQcD2ajKqW_dbONWXh3wieLzw,3016
-dns/dnssecalgs/eddsa.py,sha256=9lQQZ92f2PiIhhylieInO-19aSTDQiyoY8X2kTkGlcs,1914
-dns/dnssecalgs/rsa.py,sha256=jWkhWKByylIo7Y9gAiiO8t8bowF8IZ0siVjgZpdhLSE,3555
-dns/dnssectypes.py,sha256=CyeuGTS_rM3zXr8wD9qMT9jkzvVfTY2JWckUcogG83E,1799
-dns/e164.py,sha256=EsK8cnOtOx7kQ0DmSwibcwkzp6efMWjbRiTyHZO8Q-M,3978
-dns/edns.py,sha256=d8QWhmRd6qlaGfO-tY6iDQZt9XUiyfJfKdjoGjvwOU4,15263
-dns/entropy.py,sha256=qkG8hXDLzrJS6R5My26iA59c0RhPwJNzuOhOCAZU5Bw,4242
-dns/enum.py,sha256=EepaunPKixTSrascy7iAe9UQEXXxP_MB5Gx4jUpHIhg,3691
-dns/exception.py,sha256=FphWy-JLRG06UUUq2VmUGwdPA1xWja_8YfrcffRFlQs,5957
-dns/flags.py,sha256=cQ3kTFyvcKiWHAxI5AwchNqxVOrsIrgJ6brgrH42Wq8,2750
-dns/grange.py,sha256=HA623Mv2mZDmOK_BZNDDakT0L6EHsMQU9lFFkE8dKr0,2148
-dns/immutable.py,sha256=InrtpKvPxl-74oYbzsyneZwAuX78hUqeG22f2aniZbk,2017
-dns/inet.py,sha256=j6jQs3K_ehVhDv-i4jwCKePr5HpEiSzvOXQ4uhgn1sU,5772
-dns/ipv4.py,sha256=qEUXtlqWDH_blicj6VMvyQhfX7-BF0gB_lWJliV-2FI,2552
-dns/ipv6.py,sha256=EyiF5T8t2oww9-W4ZA5Zk2GGnOjTy_uZ50CI7maed_8,6600
-dns/message.py,sha256=DyUtBHArPX-WGj_AtcngyIXZNpLppLZX-6q9TryL_wI,65993
-dns/name.py,sha256=eaR1wVR0rErnD3EPANquCuyqpbxy5VfFVhMenWlBPDE,42672
-dns/namedict.py,sha256=hJRYpKeQv6Bd2LaUOPV0L_a0eXEIuqgggPXaH4c3Tow,4000
-dns/nameserver.py,sha256=VkYRnX5wQ7RihAD6kYqidI_hb9NgKJSAE0GaYulNpHY,9909
-dns/node.py,sha256=NGZa0AUMq-CNledJ6wn1Rx6TFYc703cH2OraLysoNWM,12663
-dns/opcode.py,sha256=I6JyuFUL0msja_BYm6bzXHfbbfqUod_69Ss4xcv8xWQ,2730
-dns/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dns/query.py,sha256=vB8C5u6HyjPWrEx9kUdTSg3kxrOoWbPGu7brC0eetIM,54832
-dns/quic/__init__.py,sha256=F6BybmRKnMGc4W8nX7K98PeyXiSwy1FHb_bJeA2lQSw,2202
-dns/quic/_asyncio.py,sha256=vv4RR3Ol0Y1ZOj7rPAzXxy1UcWjPvhTGQvVkMidPs-o,8159
-dns/quic/_common.py,sha256=06TfauL2VciPYSfrL4gif1eR1rm-TRkQhS2Puuk5URU,7282
-dns/quic/_sync.py,sha256=kE0PRavzd27GPQ9UgYApXZ6SGSW2LwCt8k6XWUvrbVE,8133
-dns/quic/_trio.py,sha256=9zCCBtDs6GAtY_b8ck-A17QMiLZ0njjhVtfFT5qMP7s,7670
-dns/rcode.py,sha256=N6JjrIQjCdJy0boKIp8Hcky5tm__LSDscpDz3rE_sgU,4156
-dns/rdata.py,sha256=9cXM9Y9MK2hy9w5mYqmP-r7_aKjHosigfNn_SfqfGGw,29456
-dns/rdataclass.py,sha256=TK4W4ywB1L_X7EZqk2Gmwnu7vdQpolQF5DtQWyNk5xo,2984
-dns/rdataset.py,sha256=96gTaEIcYEL348VKtTOMAazXBVNtk7m0Xez0mF1eg4I,16756
-dns/rdatatype.py,sha256=gIdYZ0iHRlgiTEO-ftobUANmaAmjTnNc4JljMaP1OnQ,7339
-dns/rdtypes/ANY/AFSDB.py,sha256=k75wMwreF1DAfDymu4lHh16BUx7ulVP3PLeQBZnkurY,1661
-dns/rdtypes/ANY/AMTRELAY.py,sha256=19jfS61mT1CQT-8vf67ZylhDS9JVRVp4WCbFE-7l0jM,3381
-dns/rdtypes/ANY/AVC.py,sha256=SpsXYzlBirRWN0mGnQe0MdN6H8fvlgXPJX5PjOHnEak,1024
-dns/rdtypes/ANY/CAA.py,sha256=AHh59Is-4WiVWd26yovnPM3hXqKS-yx7IWfXSS0NZhE,2511
-dns/rdtypes/ANY/CDNSKEY.py,sha256=bJAdrBMsFHIJz8TF1AxZoNbdxVWBCRTG-bR_uR_r_G4,1225
-dns/rdtypes/ANY/CDS.py,sha256=Y9nIRUCAabztVLbxm2SXAdYapFemCOUuGh5JqroCDUs,1163
-dns/rdtypes/ANY/CERT.py,sha256=2Cu2LQM6-K4darqhHv1EM_blmpYpnrBIIX1GnL_rxKE,3533
-dns/rdtypes/ANY/CNAME.py,sha256=IHGGq2BDpeKUahTr1pvyBQgm0NGBI_vQ3Vs5mKTXO4w,1206
-dns/rdtypes/ANY/CSYNC.py,sha256=KkZ_rG6PfeL14il97nmJGWWmUGGS5o9nd2EqbJqOuYo,2439
-dns/rdtypes/ANY/DLV.py,sha256=J-pOrw5xXsDoaB9G0r6znlYXJtqtcqhsl1OXs6CPRU4,986
-dns/rdtypes/ANY/DNAME.py,sha256=yqXRtx4dAWwB4YCCv-qW6uaxeGhg2LPQ2uyKwWaMdXs,1150
-dns/rdtypes/ANY/DNSKEY.py,sha256=MD8HUVH5XXeAGOnFWg5aVz_w-2tXYwCeVXmzExhiIeQ,1223
-dns/rdtypes/ANY/DS.py,sha256=_gf8vk1O_uY8QXFjsfUw-bny-fm6e-QpCk3PT0JCyoM,995
-dns/rdtypes/ANY/EUI48.py,sha256=x0BkK0sY_tgzuCwfDYpw6tyuChHjjtbRpAgYhO0Y44o,1151
-dns/rdtypes/ANY/EUI64.py,sha256=1jCff2-SXHJLDnNDnMW8Cd_o-ok0P3x6zKy_bcCU5h4,1161
-dns/rdtypes/ANY/GPOS.py,sha256=pM3i6Tn4qwHWOGOuIuW9FENPlSXT_R4xsNJeGrrABc8,4433
-dns/rdtypes/ANY/HINFO.py,sha256=vYGCHGZmYOhtmxHlvPqrK7m4pBg3MSY5herBsKJTbKQ,2249
-dns/rdtypes/ANY/HIP.py,sha256=Ucrnndu3xDyHFB93AVUA3xW-r61GR50kpRHLyLacvZY,3228
-dns/rdtypes/ANY/ISDN.py,sha256=uymYB-ayZSBob6jQgXe4EefNB8-JMLW6VfxXn7ncwPg,2713
-dns/rdtypes/ANY/L32.py,sha256=TMz2kdGCd0siiQZyiocVDCSnvkOdjhUuYRFyf8o622M,1286
-dns/rdtypes/ANY/L64.py,sha256=sb2BjuPA0PQt67nEyT9rBt759C9e6lH71d3EJHGGnww,1592
-dns/rdtypes/ANY/LOC.py,sha256=hLkzgCxqEhg6fn5Uf-DJigKEIE6oavQ8rLpajp3HDLs,12024
-dns/rdtypes/ANY/LP.py,sha256=wTsKIjtK6vh66qZRLSsiE0k54GO8ieVBGZH8dzVvFnE,1338
-dns/rdtypes/ANY/MX.py,sha256=qQk83idY0-SbRMDmB15JOpJi7cSyiheF-ALUD0Ev19E,995
-dns/rdtypes/ANY/NID.py,sha256=N7Xx4kXf3yVAocTlCXQeJ3BtiQNPFPQVdL1iMuyl5W4,1544
-dns/rdtypes/ANY/NINFO.py,sha256=bdL_-6Bejb2EH-xwR1rfSr_9E3SDXLTAnov7x2924FI,1041
-dns/rdtypes/ANY/NS.py,sha256=ThfaPalUlhbyZyNyvBM3k-7onl3eJKq5wCORrOGtkMM,995
-dns/rdtypes/ANY/NSEC.py,sha256=6uRn1SxNuLRNumeoc76BkpECF8ztuqyaYviLjFe7FkQ,2475
-dns/rdtypes/ANY/NSEC3.py,sha256=696h-Zz30bmcT0n1rqoEtS5wqE6jIgsVGzaw5TfdGJo,4331
-dns/rdtypes/ANY/NSEC3PARAM.py,sha256=08p6NWS4DiLav1wOuPbxUxB9MtY2IPjfOMCtJwzzMuA,2635
-dns/rdtypes/ANY/OPENPGPKEY.py,sha256=Va0FGo_8vm1OeX62N5iDTWukAdLwrjTXIZeQ6oanE78,1851
-dns/rdtypes/ANY/OPT.py,sha256=W36RslT_Psp95OPUC70knumOYjKpaRHvGT27I-NV2qc,2561
-dns/rdtypes/ANY/PTR.py,sha256=5HcR1D77Otyk91vVY4tmqrfZfSxSXWyWvwIW-rIH5gc,997
-dns/rdtypes/ANY/RP.py,sha256=5Dgaava9mbLKr87XgbfKZPrunYPBaN8ejNzpmbW6r4s,2184
-dns/rdtypes/ANY/RRSIG.py,sha256=O8vwzS7ldfaj_x8DypvEGFsDSb7al-D7OEnprA3QQoo,4922
-dns/rdtypes/ANY/RT.py,sha256=2t9q3FZQ28iEyceeU25KU2Ur0T5JxELAu8BTwfOUgVw,1013
-dns/rdtypes/ANY/SMIMEA.py,sha256=6yjHuVDfIEodBU9wxbCGCDZ5cWYwyY6FCk-aq2VNU0s,222
-dns/rdtypes/ANY/SOA.py,sha256=Cn8yrag1YvrvwivQgWg-KXmOCaVQVdFHSkFF77w-CE0,3145
-dns/rdtypes/ANY/SPF.py,sha256=rA3Srs9ECQx-37lqm7Zf7aYmMpp_asv4tGS8_fSQ-CU,1022
-dns/rdtypes/ANY/SSHFP.py,sha256=l6TZH2R0kytiZGWez_g-Lq94o5a2xMuwLKwUwsPMx5w,2530
-dns/rdtypes/ANY/TKEY.py,sha256=HjJMIMl4Qb1Nt1JXS6iAymzd2nv_zdLWTt887PJU_5w,4931
-dns/rdtypes/ANY/TLSA.py,sha256=cytzebS3W7FFr9qeJ9gFSHq_bOwUk9aRVlXWHfnVrRs,218
-dns/rdtypes/ANY/TSIG.py,sha256=4fNQJSNWZXUKZejCciwQuUJtTw2g-YbPmqHrEj_pitg,4750
-dns/rdtypes/ANY/TXT.py,sha256=F1U9gIAhwXIV4UVT7CwOCEn_su6G1nJIdgWJsLktk20,1000
-dns/rdtypes/ANY/URI.py,sha256=dpcS8KwcJ2WJ7BkOp4CZYaUyRuw7U2S9GzvVwKUihQg,2921
-dns/rdtypes/ANY/X25.py,sha256=PxjYTKIuoq44LT2S2JHWOV8BOFD0ASqjq0S5VBeGkFM,1944
-dns/rdtypes/ANY/ZONEMD.py,sha256=JQicv69EvUxh4FCT7eZSLzzU5L5brw_dSM65Um2t5lQ,2393
-dns/rdtypes/ANY/__init__.py,sha256=Pox71HfsEnGGB1PGU44pwrrmjxPLQlA-IbX6nQRoA2M,1497
-dns/rdtypes/CH/A.py,sha256=3S3OhOkSc7_ZsZBVB4GhTS19LPrrZ-yQ8sAp957qEgI,2216
-dns/rdtypes/CH/__init__.py,sha256=GD9YeDKb9VBDo-J5rrChX1MWEGyQXuR9Htnbhg_iYLc,923
-dns/rdtypes/IN/A.py,sha256=FfFn3SqbpneL9Ky63COP50V2ZFxqS1ldCKJh39Enwug,1814
-dns/rdtypes/IN/AAAA.py,sha256=AxrOlYy-1TTTWeQypDKeXrDCrdHGor0EKCE4fxzSQGo,1820
-dns/rdtypes/IN/APL.py,sha256=ppyFwn0KYMdyDzphxd0BUhgTmZv0QnDMRLjzQQM793U,5097
-dns/rdtypes/IN/DHCID.py,sha256=zRUh_EOxUPVpJjWY5m7taX8q4Oz5K70785ZtKv5OTCU,1856
-dns/rdtypes/IN/HTTPS.py,sha256=P-IjwcvDQMmtoBgsDHglXF7KgLX73G6jEDqCKsnaGpQ,220
-dns/rdtypes/IN/IPSECKEY.py,sha256=RyIy9K0Yt0uJRjdr6cj5S95ELHHbl--0xV-Qq9O3QQk,3290
-dns/rdtypes/IN/KX.py,sha256=K1JwItL0n5G-YGFCjWeh0C9DyDD8G8VzicsBeQiNAv0,1013
-dns/rdtypes/IN/NAPTR.py,sha256=SaOK-0hIYImwLtb5Hqewi-e49ykJaQiLNvk8ZzNoG7Q,3750
-dns/rdtypes/IN/NSAP.py,sha256=3OUpPOSOxU8fcdi0Oe6Ex2ERXcQ-U3iNf6FftZMtNOw,2165
-dns/rdtypes/IN/NSAP_PTR.py,sha256=iTxlV6fr_Y9lqivLLncSHxEhmFqz5UEElDW3HMBtuCU,1015
-dns/rdtypes/IN/PX.py,sha256=vHDNN2rfLObuUKwpYDIvpPB482BqXlHA-ZQpQn9Sb_E,2756
-dns/rdtypes/IN/SRV.py,sha256=a0zGaUwzvih_a4Q9BViUTFs7NZaCqgl7mls3-KRVHm8,2769
-dns/rdtypes/IN/SVCB.py,sha256=HeFmi2v01F00Hott8FlvQ4R7aPxFmT7RF-gt45R5K_M,218
-dns/rdtypes/IN/WKS.py,sha256=kErSG5AO2qIuot_hkMHnQuZB1_uUzUirNdqBoCp97rk,3652
-dns/rdtypes/IN/__init__.py,sha256=HbI8aw9HWroI6SgEvl8Sx6FdkDswCCXMbSRuJy5o8LQ,1083
-dns/rdtypes/__init__.py,sha256=NYizfGglJfhqt_GMtSSXf7YQXIEHHCiJ_Y_qaLVeiOI,1073
-dns/rdtypes/dnskeybase.py,sha256=FoDllfa9Pz2j2rf45VyUUYUsIt3kjjrwDy6LxrlPb5s,2856
-dns/rdtypes/dsbase.py,sha256=I85Aps1lBsiItdqGpsNY1O8icosfPtkWjiUn1J1lLUQ,3427
-dns/rdtypes/euibase.py,sha256=umN9A3VNw1TziAVtePvUses2jWPcynxINvjgyndPCdQ,2630
-dns/rdtypes/mxbase.py,sha256=DzjbiKoAAgpqbhwMBIFGA081jR5_doqGAq-kLvy2mns,3196
-dns/rdtypes/nsbase.py,sha256=tueXVV6E8lelebOmrmoOPq47eeRvOpsxHVXH4cOFxcs,2323
-dns/rdtypes/svcbbase.py,sha256=TQRT52m8F2NpSJsHUkTFS-hrkyhcIoAodW6bBHED4CY,16674
-dns/rdtypes/tlsabase.py,sha256=pIiWem6sF4IwyyKmyqx5xg55IG0w3K9r502Yx8PdziA,2596
-dns/rdtypes/txtbase.py,sha256=K4v2ulFu0DxPjxyf_Ul7YRjfBpUO-Ay_ChnR_Wx-ywA,3601
-dns/rdtypes/util.py,sha256=6AGQ-k3mLNlx4Ep_FiDABj1WVumUUGs3zQ6X-2iISec,9003
-dns/renderer.py,sha256=5THf1iKql2JPL2sKZt2-b4zqHKfk_vlx0FEfPtMJysY,11254
-dns/resolver.py,sha256=wagpUIu8Oh12O-zk48U30A6VQQOspjfibU4Ls2So-kM,73552
-dns/reversename.py,sha256=zoqXEbMZXm6R13nXbJHgTsf6L2C6uReODj6mqSHrTiE,3828
-dns/rrset.py,sha256=J-oQPEPJuKueLLiz1FN08P-ys9fjHhPWuwpDdrL4UTQ,9170
-dns/serial.py,sha256=-t5rPW-TcJwzBMfIJo7Tl-uDtaYtpqOfCVYx9dMaDCY,3606
-dns/set.py,sha256=Lr1qhyqywoobNkj9sAfdovoFy9vBfkz2eHdTCc7sZRs,9088
-dns/tokenizer.py,sha256=Dcc3lQgEIHCVZBuO6FaKWEojtPSd3EuaUC4vQA-spnk,23583
-dns/transaction.py,sha256=ZlnDT-V4W01J3cS501GaRLVhE9t1jZdnEZxPyZ0Cvg4,22636
-dns/tsig.py,sha256=I-Y-c3WMBX11bVioy5puFly2BhlpptUz82ikahxuh1c,11413
-dns/tsigkeyring.py,sha256=Z0xZemcU3XjZ9HlxBYv2E2PSuIhaFreqLDlD7HcmZDA,2633
-dns/ttl.py,sha256=fWFkw8qfk6saTp7lAPxZOuD3U3TRxVRvIpljQnG-01I,2979
-dns/update.py,sha256=y9d6LOO8xrUaH2UrZhy3ssnx8bJEsxqTArw5V8XqBRs,12243
-dns/version.py,sha256=sRMqE5tzPhXEzz-SEvdN82pP77xF_i1iELxaJN0roDE,1926
-dns/versioned.py,sha256=3YQj8mzGmZEsjnuVJJjcWopVmDKYLhEj4hEGTLEwzco,11765
-dns/win32util.py,sha256=NEjd5RXQU2aV1WsBMoIGZmXyqqKCxS4WYq9HqFQoVig,9107
-dns/wire.py,sha256=vy0SolgECbO1UXB4dnhXhDeFKOJT29nQxXvSfKOgA5s,2830
-dns/xfr.py,sha256=FKkKO-kSpyE1vHU5mnoPIP4YxiCl5gG7E5wOgY_4GO8,13273
-dns/zone.py,sha256=lLAarSxPtpx4Sw29OQ0ifPshD4QauGu8RnPh2dEropA,52086
-dns/zonefile.py,sha256=9pgkO0pV8Js53Oq9ZKOSbpFkGS5r_orU-25tmufGP9M,27929
-dns/zonetypes.py,sha256=HrQNZxZ_gWLWI9dskix71msi9wkYK5pgrBBbPb1T74Y,690
-dnspython-2.6.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-dnspython-2.6.1.dist-info/METADATA,sha256=93MjwRdAibIDnxyA4eYzHKDKbG1sUWeke-xJPhPeaUo,5808
-dnspython-2.6.1.dist-info/RECORD,,
-dnspython-2.6.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dnspython-2.6.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-dnspython-2.6.1.dist-info/licenses/LICENSE,sha256=w-o_9WVLMpwZ07xfdIGvYjw93tSmFFWFSZ-EOtPXQc0,1526
diff --git a/libs/dnspython-2.6.1.dist-info/WHEEL b/libs/dnspython-2.6.1.dist-info/WHEEL
deleted file mode 100644
index cdd68a497c..0000000000
--- a/libs/dnspython-2.6.1.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.25.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/attrs-24.3.0.dist-info/INSTALLER b/libs/dnspython-2.8.0.dist-info/INSTALLER
similarity index 100%
rename from libs/attrs-24.3.0.dist-info/INSTALLER
rename to libs/dnspython-2.8.0.dist-info/INSTALLER
diff --git a/libs/dnspython-2.8.0.dist-info/METADATA b/libs/dnspython-2.8.0.dist-info/METADATA
new file mode 100644
index 0000000000..eaaf09bba9
--- /dev/null
+++ b/libs/dnspython-2.8.0.dist-info/METADATA
@@ -0,0 +1,149 @@
+Metadata-Version: 2.4
+Name: dnspython
+Version: 2.8.0
+Summary: DNS toolkit
+Project-URL: homepage, https://www.dnspython.org
+Project-URL: repository, https://github.com/rthalley/dnspython.git
+Project-URL: documentation, https://dnspython.readthedocs.io/en/stable/
+Project-URL: issues, https://github.com/rthalley/dnspython/issues
+Author-email: Bob Halley <halley@dnspython.org>
+License: ISC
+License-File: LICENSE
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: ISC License (ISCL)
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Internet :: Name Service (DNS)
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.10
+Provides-Extra: dev
+Requires-Dist: black>=25.1.0; extra == 'dev'
+Requires-Dist: coverage>=7.0; extra == 'dev'
+Requires-Dist: flake8>=7; extra == 'dev'
+Requires-Dist: hypercorn>=0.17.0; extra == 'dev'
+Requires-Dist: mypy>=1.17; extra == 'dev'
+Requires-Dist: pylint>=3; extra == 'dev'
+Requires-Dist: pytest-cov>=6.2.0; extra == 'dev'
+Requires-Dist: pytest>=8.4; extra == 'dev'
+Requires-Dist: quart-trio>=0.12.0; extra == 'dev'
+Requires-Dist: sphinx-rtd-theme>=3.0.0; extra == 'dev'
+Requires-Dist: sphinx>=8.2.0; extra == 'dev'
+Requires-Dist: twine>=6.1.0; extra == 'dev'
+Requires-Dist: wheel>=0.45.0; extra == 'dev'
+Provides-Extra: dnssec
+Requires-Dist: cryptography>=45; extra == 'dnssec'
+Provides-Extra: doh
+Requires-Dist: h2>=4.2.0; extra == 'doh'
+Requires-Dist: httpcore>=1.0.0; extra == 'doh'
+Requires-Dist: httpx>=0.28.0; extra == 'doh'
+Provides-Extra: doq
+Requires-Dist: aioquic>=1.2.0; extra == 'doq'
+Provides-Extra: idna
+Requires-Dist: idna>=3.10; extra == 'idna'
+Provides-Extra: trio
+Requires-Dist: trio>=0.30; extra == 'trio'
+Provides-Extra: wmi
+Requires-Dist: wmi>=1.5.1; (platform_system == 'Windows') and extra == 'wmi'
+Description-Content-Type: text/markdown
+
+# dnspython
+
+[![Build Status](https://github.com/rthalley/dnspython/actions/workflows/ci.yml/badge.svg)](https://github.com/rthalley/dnspython/actions/)
+[![Documentation Status](https://readthedocs.org/projects/dnspython/badge/?version=latest)](https://dnspython.readthedocs.io/en/latest/?badge=latest)
+[![PyPI version](https://badge.fury.io/py/dnspython.svg)](https://badge.fury.io/py/dnspython)
+[![License: ISC](https://img.shields.io/badge/License-ISC-brightgreen.svg)](https://opensource.org/licenses/ISC)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
+## INTRODUCTION
+
+`dnspython` is a DNS toolkit for Python. It supports almost all record types. It
+can be used for queries, zone transfers, and dynamic updates. It supports
+TSIG-authenticated messages and EDNS0.
+
+`dnspython` provides both high- and low-level access to DNS. The high-level
+classes perform queries for data of a given name, type, and class, and return an
+answer set. The low-level classes allow direct manipulation of DNS zones,
+messages, names, and records.
+
+To see a few of the ways `dnspython` can be used, look in the `examples/`
+directory.
+
+`dnspython` is a utility to work with DNS, `/etc/hosts` is thus not used. For
+simple forward DNS lookups, it's better to use `socket.getaddrinfo()` or
+`socket.gethostbyname()`.
+
+`dnspython` originated at Nominum where it was developed to facilitate the
+testing of DNS software.
+
+## ABOUT THIS RELEASE
+
+This is of `dnspython` 2.8.0.
+Please read
+[What's New](https://dnspython.readthedocs.io/en/stable/whatsnew.html) for
+information about the changes in this release.
+
+## INSTALLATION
+
+* Many distributions have dnspython packaged for you, so you should check there
+  first.
+* To use a wheel downloaded from PyPi, run:
+
+```
+    pip install dnspython
+```
+
+* To install from the source code, go into the top-level of the source code
+  and run:
+
+```
+    pip install --upgrade pip build
+    python -m build
+    pip install dist/*.whl
+```
+
+* To install the latest from the main branch, run
+`pip install git+https://github.com/rthalley/dnspython.git`
+
+`dnspython`'s default installation does not depend on any modules other than
+those in the Python standard library.  To use some features, additional modules
+must be installed.  For convenience, `pip` options are defined for the
+requirements.
+
+If you want to use DNS-over-HTTPS, run
+`pip install dnspython[doh]`.
+
+If you want to use DNSSEC functionality, run
+`pip install dnspython[dnssec]`.
+
+If you want to use internationalized domain names (IDNA)
+functionality, you must run
+`pip install dnspython[idna]`
+
+If you want to use the Trio asynchronous I/O package, run
+`pip install dnspython[trio]`.
+
+If you want to use WMI on Windows to determine the active DNS settings
+instead of the default registry scanning method, run
+`pip install dnspython[wmi]`.
+
+If you want to try the experimental DNS-over-QUIC code, run
+`pip install dnspython[doq]`.
+
+Note that you can install any combination of the above, e.g.:
+`pip install dnspython[doh,dnssec,idna]`
+
+### Notices
+
+Python 2.x support ended with the release of 1.16.0.  `dnspython` supports Python 3.10
+and later.  Future support is aligned with the lifetime of the Python 3 versions.
+
+Documentation has moved to
+[dnspython.readthedocs.io](https://dnspython.readthedocs.io).
diff --git a/libs/dnspython-2.8.0.dist-info/RECORD b/libs/dnspython-2.8.0.dist-info/RECORD
new file mode 100644
index 0000000000..de708df1f7
--- /dev/null
+++ b/libs/dnspython-2.8.0.dist-info/RECORD
@@ -0,0 +1,156 @@
+dns/__init__.py,sha256=2TTaN3FRnBIkYhrrkDUs7XYnu4h9zTlfOWdQ4nLuxnA,1693
+dns/_asyncbackend.py,sha256=bv-2iaDTEDH4Esx2tc2GeVCnaqHtsQqb3WWqoYZngzA,2403
+dns/_asyncio_backend.py,sha256=08Ezq3L8G190Sdr8qMgjwnWNhbyMa1MFB3pWYkGQ0a0,9147
+dns/_ddr.py,sha256=rHXKC8kncCTT9N4KBh1flicl79nyDjQ-DDvq30MJ3B8,5247
+dns/_features.py,sha256=VYTUetGL5x8IEtxMUQk9_ftat2cvyYJw8HfIfpMM8D8,2493
+dns/_immutable_ctx.py,sha256=Schj9tuGUAQ_QMh612H7Uq6XcvPo5AkVwoBxZJJ8liA,2478
+dns/_no_ssl.py,sha256=M8mj_xYkpsuhny_vHaTWCjI1pNvekYG6V52kdqFkUYY,1502
+dns/_tls_util.py,sha256=kcvrPdGnSGP1fP9sNKekBZ3j-599HwZkmAk6ybyCebM,528
+dns/_trio_backend.py,sha256=Tqzm46FuRSYkUJDYL8qp6Qk8hbc6ZxiLBc8z-NsTULg,8597
+dns/asyncbackend.py,sha256=82fXTFls_m7F_ekQbgUGOkoBbs4BI-GBLDZAWNGUvJ0,2796
+dns/asyncquery.py,sha256=34B1EIekX3oSg0jF8ZSqEiUbNZTsJa3r2oqC01OIY7U,32329
+dns/asyncresolver.py,sha256=TncJ7UukzA0vF79AwNa2gel0y9UO02tCdQf3zUHbygg,17728
+dns/btree.py,sha256=QPz4IzW_yTtSmz_DC6LKvZdJvTs50CQRKbAa0UAFMTs,30757
+dns/btreezone.py,sha256=H9orKjQaMhnPjtAhHpRZlV5wd91N17iuqOmTUVzv6sU,13082
+dns/dnssec.py,sha256=zXqhmUM4k6M-9YVR49crEI6Jc0zhZSk7NX9BWDafhTQ,41356
+dns/dnssecalgs/__init__.py,sha256=B4hebjElugf8zhCauhH6kvACqI50iYLSKxEqUfL6970,4350
+dns/dnssecalgs/base.py,sha256=4Oq9EhKBEYupojZ3hENBiuq2Js3Spimy_NeDb9Rl1a8,2497
+dns/dnssecalgs/cryptography.py,sha256=utsBa_s8OOOKUeudvFullBNMRMjHmeoa66RNA6UiJMw,2428
+dns/dnssecalgs/dsa.py,sha256=ONilkD8Hhartj3Mwe7LKBT0vXS4E0KgfvTtV2ysZLhM,3605
+dns/dnssecalgs/ecdsa.py,sha256=TK8PclMAt7xVQTv6FIse9jZwXVCv_B-_AAgfhK0rTWQ,3283
+dns/dnssecalgs/eddsa.py,sha256=Yc0L9O2A_ySOSSalJiq5h7TU1LWtJgW1JIJWsGx96FI,2000
+dns/dnssecalgs/rsa.py,sha256=YOPPtpfOKdgBfBJvOcDofYTiC4mGmwCfqdYUvEbdHf8,3663
+dns/dnssectypes.py,sha256=CyeuGTS_rM3zXr8wD9qMT9jkzvVfTY2JWckUcogG83E,1799
+dns/e164.py,sha256=Sc-Ctv8lXpaDot_Su02wLFxLpxLReVW7_23YiGrnMC4,3937
+dns/edns.py,sha256=E5HRHMJNGGOyNvkR4iKY2jkaoQasa4K61Feuko9uY5s,17436
+dns/entropy.py,sha256=dSbsNoNVoypURvOu-clqMiD-dFQ-fsKOPYSHwoTjaec,4247
+dns/enum.py,sha256=PBphGzrIWOi8l3MgvkEMpsJapKIejkaQUqFuMWUcZXc,3685
+dns/exception.py,sha256=zEdlBUUsjb3dqk0etKxbFXUng0lLB7TPj7JFsNN7HzQ,5936
+dns/flags.py,sha256=cQ3kTFyvcKiWHAxI5AwchNqxVOrsIrgJ6brgrH42Wq8,2750
+dns/grange.py,sha256=ZqjNVDtb7i6E9D3ai6mcWR_nFNHyCXPp7j3dLFidtvY,2154
+dns/immutable.py,sha256=InrtpKvPxl-74oYbzsyneZwAuX78hUqeG22f2aniZbk,2017
+dns/inet.py,sha256=DbkUeb4PNLmxgUVPXX1GeWQH6e7a5WZ2AP_-befdg-o,5753
+dns/ipv4.py,sha256=dRiZRfyZAOlwlj3YlfbvZChRQAKstYh9k0ibNZwHu5U,2487
+dns/ipv6.py,sha256=GccOccOFZGFlwNFgV79GffZJv6u1GW28jM_amdiLqeM,6517
+dns/message.py,sha256=YVNQjYYFDSY6ttuwz_zvJnsCGuY1t11DdchsNlcBHG0,69152
+dns/name.py,sha256=rHvrUjhkCoR0_ANOH3fHJcY1swefx62SfBTDRvoGTsI,42910
+dns/namedict.py,sha256=hJRYpKeQv6Bd2LaUOPV0L_a0eXEIuqgggPXaH4c3Tow,4000
+dns/nameserver.py,sha256=LLOUGTjdAcj4cs-zAXeaH7Pf90IW0P64MQOrAb9PAPE,10007
+dns/node.py,sha256=Z2lzeqvPjqoR-Pbevp0OJqI_bGxwYzJIIevUccTElaM,12627
+dns/opcode.py,sha256=2EgPHQaGBRXN5q4C0KslagWbmWAbyT9Cw_cBj_sMXeA,2774
+dns/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dns/query.py,sha256=85EWlMD1hDJO5xozZ7tFazMbZldpQ04L0sQFoQfBZiI,61686
+dns/quic/__init__.py,sha256=eqHPKj8SUk5rdeQxJSS-x3XSVqwcUPZlzTUio8mOpSg,2575
+dns/quic/_asyncio.py,sha256=YgoU65THKtpHfV8UPAnNr-HkpbkR7XY01E7R3oh5apg,10314
+dns/quic/_common.py,sha256=M7lfxwUfr07fHkefo9BbRogQmwB_lEbittc7ZAQ_ulI,11087
+dns/quic/_sync.py,sha256=Ixj0BR6ngRWaKqTUiTrYbLw0rWVsUE6uJuNJB5oUlI0,10982
+dns/quic/_trio.py,sha256=NdClJJ80TY4kg8wM34JCfzX75fhhDb0vLy-WZkSyW6E,9452
+dns/rcode.py,sha256=A7UyvwbaFDz1PZaoYcAmXcerpZV-bRC2Zv3uJepiXa4,4181
+dns/rdata.py,sha256=7OAmPoSVEysCF84bjvaGXrfB1K69bpswaKtM1X89tXQ,31977
+dns/rdataclass.py,sha256=TK4W4ywB1L_X7EZqk2Gmwnu7vdQpolQF5DtQWyNk5xo,2984
+dns/rdataset.py,sha256=aoOatp7pbWhs2JieS0vcHnNc4dfwA0SBuvXAoqe3vxE,16627
+dns/rdatatype.py,sha256=W7r_B43ja4ZTHIJgqbb2eR99lXOYntf3ngGj396AvKg,7487
+dns/rdtypes/ANY/AFSDB.py,sha256=k75wMwreF1DAfDymu4lHh16BUx7ulVP3PLeQBZnkurY,1661
+dns/rdtypes/ANY/AMTRELAY.py,sha256=zE5xls02_NvbQwXUy-MnpV-uVVSJJuaKtZ86H8_X4ic,3355
+dns/rdtypes/ANY/AVC.py,sha256=SpsXYzlBirRWN0mGnQe0MdN6H8fvlgXPJX5PjOHnEak,1024
+dns/rdtypes/ANY/CAA.py,sha256=Hq1tHBrFW-BdxkjrGCq9u6ezaUHj6nFspBD5ClpkRYc,2456
+dns/rdtypes/ANY/CDNSKEY.py,sha256=bJAdrBMsFHIJz8TF1AxZoNbdxVWBCRTG-bR_uR_r_G4,1225
+dns/rdtypes/ANY/CDS.py,sha256=Y9nIRUCAabztVLbxm2SXAdYapFemCOUuGh5JqroCDUs,1163
+dns/rdtypes/ANY/CERT.py,sha256=OAYbtDdcwRhW8w_lbxHbgyWUHxYkTHV2zbiQff00X74,3547
+dns/rdtypes/ANY/CNAME.py,sha256=IHGGq2BDpeKUahTr1pvyBQgm0NGBI_vQ3Vs5mKTXO4w,1206
+dns/rdtypes/ANY/CSYNC.py,sha256=TnO2TjHfc9Cccfsz8dSsuH9Y53o-HllMVeU2DSAglrc,2431
+dns/rdtypes/ANY/DLV.py,sha256=J-pOrw5xXsDoaB9G0r6znlYXJtqtcqhsl1OXs6CPRU4,986
+dns/rdtypes/ANY/DNAME.py,sha256=yqXRtx4dAWwB4YCCv-qW6uaxeGhg2LPQ2uyKwWaMdXs,1150
+dns/rdtypes/ANY/DNSKEY.py,sha256=MD8HUVH5XXeAGOnFWg5aVz_w-2tXYwCeVXmzExhiIeQ,1223
+dns/rdtypes/ANY/DS.py,sha256=_gf8vk1O_uY8QXFjsfUw-bny-fm6e-QpCk3PT0JCyoM,995
+dns/rdtypes/ANY/DSYNC.py,sha256=q-26ceC4f2A2A6OmVaiOwDwAe_LAHvRsra1PZ4GyotA,2154
+dns/rdtypes/ANY/EUI48.py,sha256=x0BkK0sY_tgzuCwfDYpw6tyuChHjjtbRpAgYhO0Y44o,1151
+dns/rdtypes/ANY/EUI64.py,sha256=1jCff2-SXHJLDnNDnMW8Cd_o-ok0P3x6zKy_bcCU5h4,1161
+dns/rdtypes/ANY/GPOS.py,sha256=u4qwiDBVoC7bsKfxDKGbPjnOKddpdjy2p1AhziDWcPw,4439
+dns/rdtypes/ANY/HINFO.py,sha256=D2WvjTsvD_XqT8BepBIyjPL2iYGMgYqb1VQa9ApO0qE,2217
+dns/rdtypes/ANY/HIP.py,sha256=WSw31w96y1JM6ufasx7gRHUPTQuI5ejtyLxpD7vcINE,3216
+dns/rdtypes/ANY/ISDN.py,sha256=L4C2Rxrr4JJN17lmJRbZN8RhM_ujjwIskY_4V4Gd3r4,2723
+dns/rdtypes/ANY/L32.py,sha256=I0HcPHmvRUz2_yeDd0c5uueNKwcxmbz6V-7upNOc1GA,1302
+dns/rdtypes/ANY/L64.py,sha256=rbdYukNdezhQGH6vowKu1VbUWwi5cYSg_VbWEDWyYGA,1609
+dns/rdtypes/ANY/LOC.py,sha256=jxbB0bmbnMW8AVrElmoSW0SOmLPoEf5AwQLwUeAyMsY,11962
+dns/rdtypes/ANY/LP.py,sha256=X0xGo9vr1b3AQ8J8LPMyn_ooKRuEmjwdi7TGE2mqK_k,1332
+dns/rdtypes/ANY/MX.py,sha256=qQk83idY0-SbRMDmB15JOpJi7cSyiheF-ALUD0Ev19E,995
+dns/rdtypes/ANY/NID.py,sha256=8D8RDttb0BPObs0dXbFKajAhA05iZlqAq-51b6wusEI,1561
+dns/rdtypes/ANY/NINFO.py,sha256=bdL_-6Bejb2EH-xwR1rfSr_9E3SDXLTAnov7x2924FI,1041
+dns/rdtypes/ANY/NS.py,sha256=ThfaPalUlhbyZyNyvBM3k-7onl3eJKq5wCORrOGtkMM,995
+dns/rdtypes/ANY/NSEC.py,sha256=kicEYxcKaLBpV6C_M8cHdDaqBoiYl6EYtPvjyR6kExI,2465
+dns/rdtypes/ANY/NSEC3.py,sha256=NUG3AT626zu3My8QeNMiPVfpn3PRK9AGBkKW3cIZDzM,4250
+dns/rdtypes/ANY/NSEC3PARAM.py,sha256=-r5rBTMezSh7J9Wb7bWng_TXPKIETs2AXY4WFdhz7tM,2625
+dns/rdtypes/ANY/OPENPGPKEY.py,sha256=3LHryx1g0g-WrOI19PhGzGZG0anIJw2CCn93P4aT-Lk,1870
+dns/rdtypes/ANY/OPT.py,sha256=W36RslT_Psp95OPUC70knumOYjKpaRHvGT27I-NV2qc,2561
+dns/rdtypes/ANY/PTR.py,sha256=5HcR1D77Otyk91vVY4tmqrfZfSxSXWyWvwIW-rIH5gc,997
+dns/rdtypes/ANY/RESINFO.py,sha256=Kf2NcKbkeI5gFE1bJfQNqQCaitYyXfV_9nQYl1luUZ0,1008
+dns/rdtypes/ANY/RP.py,sha256=8doJlhjYDYiAT6KNF1mAaemJ20YJFUPvit8LOx4-I-U,2174
+dns/rdtypes/ANY/RRSIG.py,sha256=_ohbap8Dp_3VMU4w7ozVWGyFCtpm8A-l1F1wQiFZogA,4941
+dns/rdtypes/ANY/RT.py,sha256=2t9q3FZQ28iEyceeU25KU2Ur0T5JxELAu8BTwfOUgVw,1013
+dns/rdtypes/ANY/SMIMEA.py,sha256=6yjHuVDfIEodBU9wxbCGCDZ5cWYwyY6FCk-aq2VNU0s,222
+dns/rdtypes/ANY/SOA.py,sha256=tbbpP7RK2kpTTYCgdAWGCxlIMcX9U5MTOhz7vLP4p0I,3034
+dns/rdtypes/ANY/SPF.py,sha256=rA3Srs9ECQx-37lqm7Zf7aYmMpp_asv4tGS8_fSQ-CU,1022
+dns/rdtypes/ANY/SSHFP.py,sha256=F5vrZB-MAmeGJFAgEwRjXxgxerhoAd6kT9AcNNmkcF4,2550
+dns/rdtypes/ANY/TKEY.py,sha256=qvMJd0HGQF1wHGk1eWdITBVnAkj1oTHHbP5zSzV4cTc,4848
+dns/rdtypes/ANY/TLSA.py,sha256=cytzebS3W7FFr9qeJ9gFSHq_bOwUk9aRVlXWHfnVrRs,218
+dns/rdtypes/ANY/TSIG.py,sha256=4fNQJSNWZXUKZejCciwQuUJtTw2g-YbPmqHrEj_pitg,4750
+dns/rdtypes/ANY/TXT.py,sha256=F1U9gIAhwXIV4UVT7CwOCEn_su6G1nJIdgWJsLktk20,1000
+dns/rdtypes/ANY/URI.py,sha256=JyPYKh2RXzI34oABDiJ2oDh3TE_l-zmut4jBNA-ONt4,2913
+dns/rdtypes/ANY/WALLET.py,sha256=IaP2g7Nq26jWGKa8MVxvJjWXLQ0wrNR1IWJVyyMG8oU,219
+dns/rdtypes/ANY/X25.py,sha256=BzEM7uOY7CMAm7QN-dSLj-_LvgnnohwJDUjMstzwqYo,1942
+dns/rdtypes/ANY/ZONEMD.py,sha256=DjBYvHY13nF70uxTM77zf3R9n0Uy8Frbj1LuBXbC7jU,2389
+dns/rdtypes/ANY/__init__.py,sha256=2UKaYp81SLH6ofE021on9pR7jzmB47D1iXjQ3M7FXrw,1539
+dns/rdtypes/CH/A.py,sha256=Iq82L3RLM-OwB5hyvtX1Das9oToiZMzNgs979cAkDz8,2229
+dns/rdtypes/CH/__init__.py,sha256=GD9YeDKb9VBDo-J5rrChX1MWEGyQXuR9Htnbhg_iYLc,923
+dns/rdtypes/IN/A.py,sha256=FfFn3SqbpneL9Ky63COP50V2ZFxqS1ldCKJh39Enwug,1814
+dns/rdtypes/IN/AAAA.py,sha256=AxrOlYy-1TTTWeQypDKeXrDCrdHGor0EKCE4fxzSQGo,1820
+dns/rdtypes/IN/APL.py,sha256=4Kz56antsRGu-cfV2MCHN8rmVo90wnZXnLWA6uQpnk4,5081
+dns/rdtypes/IN/DHCID.py,sha256=x9vedfzJ3vvxPC1ihWTTcxXBMYL0Q24Wmj6O67aY5og,1875
+dns/rdtypes/IN/HTTPS.py,sha256=P-IjwcvDQMmtoBgsDHglXF7KgLX73G6jEDqCKsnaGpQ,220
+dns/rdtypes/IN/IPSECKEY.py,sha256=jMO-aGl1eglWDqMxAkM2BvKDjfe9O1X0avBoWCtWi30,3261
+dns/rdtypes/IN/KX.py,sha256=K1JwItL0n5G-YGFCjWeh0C9DyDD8G8VzicsBeQiNAv0,1013
+dns/rdtypes/IN/NAPTR.py,sha256=JhGpvtCn_qlNWWlW9ilrWh9PNElBgNq1SWJPqD3LRzA,3741
+dns/rdtypes/IN/NSAP.py,sha256=6YfWCVSIPTTBmRAzG8nVBj3LnohncXUhSFJHgp-TRdc,2163
+dns/rdtypes/IN/NSAP_PTR.py,sha256=iTxlV6fr_Y9lqivLLncSHxEhmFqz5UEElDW3HMBtuCU,1015
+dns/rdtypes/IN/PX.py,sha256=zRg_5eGQdpzCRUsXIccxJOs7xoTAn7i4PIrj0Zwv-1A,2748
+dns/rdtypes/IN/SRV.py,sha256=TVai6Rtfx0_73wH999uPGuz-p2m6BTVIleXy1Tlm5Dc,2759
+dns/rdtypes/IN/SVCB.py,sha256=HeFmi2v01F00Hott8FlvQ4R7aPxFmT7RF-gt45R5K_M,218
+dns/rdtypes/IN/WKS.py,sha256=4_dLY3Bh6ePkfgku11QzLJv74iSyoSpt8EflIp_AMNc,3644
+dns/rdtypes/IN/__init__.py,sha256=HbI8aw9HWroI6SgEvl8Sx6FdkDswCCXMbSRuJy5o8LQ,1083
+dns/rdtypes/__init__.py,sha256=NYizfGglJfhqt_GMtSSXf7YQXIEHHCiJ_Y_qaLVeiOI,1073
+dns/rdtypes/dnskeybase.py,sha256=GXSOvGtiRjY3fhqlI_T-4ukF4JQvvh3sk7UF0vipmPc,2824
+dns/rdtypes/dsbase.py,sha256=elOLkRb45vYzyh36_1FSJWWO9AI2wnK3GpddmQNdj3Y,3423
+dns/rdtypes/euibase.py,sha256=2DluC_kTi2io2ICgzFEdSxKGPFx3ib3ZXnA6YaAhAp0,2675
+dns/rdtypes/mxbase.py,sha256=N_3EX_2BgY0wMdGADL6_5nxBRUdx4ZcdNIYfGg5rMP8,3190
+dns/rdtypes/nsbase.py,sha256=tueXVV6E8lelebOmrmoOPq47eeRvOpsxHVXH4cOFxcs,2323
+dns/rdtypes/svcbbase.py,sha256=0VnPpt7fSCNt_MtGnWOiYtkY-6jQRWIli8JTRROakys,17717
+dns/rdtypes/tlsabase.py,sha256=hHuRO_MQ5g_tWBIDyTNArAWwbUc-MdZlXcjQxy5defA,2588
+dns/rdtypes/txtbase.py,sha256=lEzlKS6dx6UnhgoBPGIzqC3G0e8iWBetrkDtkwM16Ic,3723
+dns/rdtypes/util.py,sha256=WjiRlxsu_sq40XpSdR6wN54WWavKe7PLh-V9UaNhk7A,9680
+dns/renderer.py,sha256=sj_m9NRJoY8gdQ9zOhSVu0pTAUyBtM5AGpfea83jGpQ,11500
+dns/resolver.py,sha256=FRa-pJApeV_DFgLEwiwZP-2g7RHAg0kVCbg9EdNYLnc,73967
+dns/reversename.py,sha256=pPDGRfg7iq09cjEhKLKEcahdoyViS0y0ORip--r5vk8,3845
+dns/rrset.py,sha256=f8avzbtBb-y93jdyhhTJ8EJx1zOTcNTK3DtiK84eGNY,9129
+dns/serial.py,sha256=-t5rPW-TcJwzBMfIJo7Tl-uDtaYtpqOfCVYx9dMaDCY,3606
+dns/set.py,sha256=hublMKCIhd9zp5Hz_fvQTwF-Ze28jn7mjqei6vTGWfs,9213
+dns/tokenizer.py,sha256=dqQvBF3oUjP7URC7ZzBuQVLMVXhvf1gJusIpkV-IQ6U,23490
+dns/transaction.py,sha256=HnHa4nKL_ddtuWH4FaiKPEt81ImELL1fumZb3ll4KbI,22579
+dns/tsig.py,sha256=mWjZGZL75atl-jf3va1FhP9LfLGWT5g9Y9DgsSan4Mo,11576
+dns/tsigkeyring.py,sha256=1xSBgaV1KLR_9FQGsGWbkBD3XJjK8IFQx-H_olH1qyQ,2650
+dns/ttl.py,sha256=Rl8UOKV0_QyZzOdQ-JoB7nSHvBFehZXe_M0cxIBVc3Y,2937
+dns/update.py,sha256=iqZEO-_U0ooAqLlIRo1OhAKI8d-jpwPhBy-vC8v1dtY,12236
+dns/version.py,sha256=d7ViavUC8gYfrWbeyH8WMAldyGk_WVF5_zkCmCJv0ZQ,1763
+dns/versioned.py,sha256=yJ76QfKdIEKBtKX_DLA_IZGUZoFB1id1mMKzIj2eRm8,11841
+dns/win32util.py,sha256=iz5Gw0CTHAIqumdE25xdYUbhhSFiaZTRM-HXskglB2o,16799
+dns/wire.py,sha256=hylnQ30yjA3UcJSElhSAqYKMt5HICYqQ_N5b71K2smA,3155
+dns/xfr.py,sha256=UE4xAyfRDNH14x4os8yC-4Tl8brc_kCpBLxT0h6x-AM,13637
+dns/zone.py,sha256=ZferSA6wMN46uuBNkrgbRcSM8FSCCxMrNiLT3WoISbw,53098
+dns/zonefile.py,sha256=Xz24A8wH97NoA_iTbastSzUZ-S-DmLFG0SgIfVzQinY,28517
+dns/zonetypes.py,sha256=HrQNZxZ_gWLWI9dskix71msi9wkYK5pgrBBbPb1T74Y,690
+dnspython-2.8.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+dnspython-2.8.0.dist-info/METADATA,sha256=dPdZU5uJ4pkVGy1pfGEjBzRbdm27fpQ1z4Y6Bpgf04U,5680
+dnspython-2.8.0.dist-info/RECORD,,
+dnspython-2.8.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dnspython-2.8.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dnspython-2.8.0.dist-info/licenses/LICENSE,sha256=w-o_9WVLMpwZ07xfdIGvYjw93tSmFFWFSZ-EOtPXQc0,1526
diff --git a/libs/attrs-24.3.0.dist-info/REQUESTED b/libs/dnspython-2.8.0.dist-info/REQUESTED
similarity index 100%
rename from libs/attrs-24.3.0.dist-info/REQUESTED
rename to libs/dnspython-2.8.0.dist-info/REQUESTED
diff --git a/libs/dnspython-2.8.0.dist-info/WHEEL b/libs/dnspython-2.8.0.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/dnspython-2.8.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/dnspython-2.6.1.dist-info/licenses/LICENSE b/libs/dnspython-2.8.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/dnspython-2.6.1.dist-info/licenses/LICENSE
rename to libs/dnspython-2.8.0.dist-info/licenses/LICENSE
diff --git a/libs/dogpile.cache-1.3.3.dist-info/LICENSE b/libs/dogpile.cache-1.3.3.dist-info/LICENSE
deleted file mode 100644
index 0281ac3800..0000000000
--- a/libs/dogpile.cache-1.3.3.dist-info/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright 2005-2024 Michael Bayer.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/libs/dogpile.cache-1.3.3.dist-info/METADATA b/libs/dogpile.cache-1.3.3.dist-info/METADATA
deleted file mode 100644
index e466816f29..0000000000
--- a/libs/dogpile.cache-1.3.3.dist-info/METADATA
+++ /dev/null
@@ -1,117 +0,0 @@
-Metadata-Version: 2.1
-Name: dogpile.cache
-Version: 1.3.3
-Summary: A caching front-end based on the Dogpile lock.
-Author-email: Mike Bayer <mike_mp@zzzcomputing.com>
-License: MIT
-Project-URL: Homepage, https://github.com/sqlalchemy/dogpile.cache
-Project-URL: Documentation, https://dogpilecache.sqlalchemy.org
-Project-URL: Issue Tracker, https://github.com/sqlalchemy/dogpile.cache/
-Keywords: caching
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: decorator >=4.0.0
-Requires-Dist: stevedore >=3.0.0
-Requires-Dist: typing-extensions >=4.0.1 ; python_version < "3.11"
-Provides-Extra: pifpaf
-Requires-Dist: pifpaf >=2.5.0 ; extra == 'pifpaf'
-Requires-Dist: setuptools ; (python_version >= "3.12") and extra == 'pifpaf'
-
-dogpile
-=======
-
-Dogpile consists of two subsystems, one building on top of the other.
-
-``dogpile`` provides the concept of a "dogpile lock", a control structure
-which allows a single thread of execution to be selected as the "creator" of
-some resource, while allowing other threads of execution to refer to the previous
-version of this resource as the creation proceeds; if there is no previous
-version, then those threads block until the object is available.
-
-``dogpile.cache`` is a caching API which provides a generic interface to
-caching backends of any variety, and additionally provides API hooks which
-integrate these cache backends with the locking mechanism of ``dogpile``.
-
-Overall, dogpile.cache is intended as a replacement to the `Beaker
-<https://pypi.org/project/Beaker/>`_ caching system, the internals of which are
-written by the same author.   All the ideas of Beaker which "work" are re-
-implemented in dogpile.cache in a more efficient and succinct manner, and all
-the cruft (Beaker's internals were first written in 2005) relegated to the
-trash heap.
-
-Documentation
--------------
-
-See dogpile.cache's full documentation at
-`dogpile.cache documentation <https://dogpilecache.sqlalchemy.org>`_.  The
-sections below provide a brief synopsis of the ``dogpile`` packages.
-
-Features
---------
-
-* A succinct API which encourages up-front configuration of pre-defined
-  "regions", each one defining a set of caching characteristics including
-  storage backend, configuration options, and default expiration time.
-* A standard get/set/delete API as well as a function decorator API is
-  provided.
-* The mechanics of key generation are fully customizable.   The function
-  decorator API features a pluggable "key generator" to customize how
-  cache keys are made to correspond to function calls, and an optional
-  "key mangler" feature provides for pluggable mangling of keys
-  (such as encoding, SHA-1 hashing) as desired for each region.
-* The dogpile lock, first developed as the core engine behind the Beaker
-  caching system, here vastly simplified, improved, and better tested.
-  Some key performance
-  issues that were intrinsic to Beaker's architecture, particularly that
-  values would frequently be "double-fetched" from the cache, have been fixed.
-* Backends implement their own version of a "distributed" lock, where the
-  "distribution" matches the backend's storage system.  For example, the
-  memcached backends allow all clients to coordinate creation of values
-  using memcached itself.   The dbm file backend uses a lockfile
-  alongside the dbm file.  New backends, such as a Redis-based backend,
-  can provide their own locking mechanism appropriate to the storage
-  engine.
-* Writing new backends or hacking on the existing backends is intended to be
-  routine - all that's needed are basic get/set/delete methods. A distributed
-  lock tailored towards the backend is an optional addition, else dogpile uses
-  a regular thread mutex. New backends can be registered with dogpile.cache
-  directly or made available via setuptools entry points.
-* Included backends feature three memcached backends (python-memcached, pylibmc,
-  bmemcached), a Redis backend, a backend based on Python's
-  anydbm, and a plain dictionary backend.
-* Space for third party plugins, including one which provides the
-  dogpile.cache engine to Mako templates.
-
-
-The SQLAlchemy Project
-----------------------
-
-Dogpile is part of the `SQLAlchemy Project <https://www.sqlalchemy.org>`_ and
-adheres to the same standards and conventions as the core project.
-
-Development / Bug reporting / Pull requests
-___________________________________________
-
-Please refer to the
-`SQLAlchemy Community Guide <https://www.sqlalchemy.org/develop.html>`_ for
-guidelines on coding and participating in this project.
-
-Code of Conduct
-_______________
-
-Above all, SQLAlchemy places great emphasis on polite, thoughtful, and
-constructive communication between users and developers.
-Please see our current Code of Conduct at
-`Code of Conduct <https://www.sqlalchemy.org/codeofconduct.html>`_.
-
-License
--------
-
-Dogpile is distributed under the `MIT license
-<https://opensource.org/licenses/MIT>`_.
diff --git a/libs/dogpile.cache-1.3.3.dist-info/RECORD b/libs/dogpile.cache-1.3.3.dist-info/RECORD
deleted file mode 100644
index e287ce20e1..0000000000
--- a/libs/dogpile.cache-1.3.3.dist-info/RECORD
+++ /dev/null
@@ -1,35 +0,0 @@
-dogpile.cache-1.3.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-dogpile.cache-1.3.3.dist-info/LICENSE,sha256=6mI3atkmgsiipPJp3i526pyP_NVuNSKAGA7jbB1dAyo,1059
-dogpile.cache-1.3.3.dist-info/METADATA,sha256=rOv9RsQapDoS1HDFLhiqFoNI_lq6JOvLbk07E2E1ZBg,5184
-dogpile.cache-1.3.3.dist-info/RECORD,,
-dogpile.cache-1.3.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dogpile.cache-1.3.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-dogpile.cache-1.3.3.dist-info/entry_points.txt,sha256=9_62qgwpYf1Kp06LazdG2FNgaJQiUTUGBn-Fl0URfq4,73
-dogpile.cache-1.3.3.dist-info/top_level.txt,sha256=XGYQHt1p8HLN4sRU6sGpQBA2GMTZQbPwHX5A1PUENgk,8
-dogpile/__init__.py,sha256=rSfQtRaK-ePncI3Mo3wyrfmLXYjBNGWLdFSVupCxR-w,106
-dogpile/cache/__init__.py,sha256=QSxZd91vI3BTBDcT7BVt1_qUio5g4rVADVcJMeIuLoQ,180
-dogpile/cache/api.py,sha256=EZBQ96IS79Xp8e1ERi9x6E3BHOq9bZR5cPINMnisUqI,18029
-dogpile/cache/backends/__init__.py,sha256=bqQudgYKfg1n-wvYn3Sr0mlOX5Wbsifmn1WHUTGfu8s,1315
-dogpile/cache/backends/file.py,sha256=8ZNqQOOec-1MhPB7Z6IoH6ra47P-JdQNO9nN351WYNc,13710
-dogpile/cache/backends/memcached.py,sha256=eVtjiOmeuKAgg46EGf0qaMu5L6n7-EgztL1ZhEHKrSo,21552
-dogpile/cache/backends/memory.py,sha256=7Wo_yT0bdym9TonXxmhVt1Uvl_M_-GGMmMAwNWQ5YMo,3030
-dogpile/cache/backends/null.py,sha256=DzZXHt64alfYuYP_Ei322I2D-mZMpT-Y_zzLF1pXd74,1167
-dogpile/cache/backends/redis.py,sha256=bpEGn0rOmG-Nw7I4gLwKgh8B4W84V59PxDM2MW8hjh0,19744
-dogpile/cache/exception.py,sha256=8XDELddxVqj0fthUYpPaX85QfEQqdsP23e_7bQFC0Us,601
-dogpile/cache/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dogpile/cache/plugins/mako_cache.py,sha256=SRG6Pr_wHji_jGE07bLbj-IldbUo_BYyccNNhXM7X6c,2964
-dogpile/cache/proxy.py,sha256=nUhu_HAaWtaPE_oPY4kcALVvROi541JTxwxFRyzK9Us,3667
-dogpile/cache/region.py,sha256=vLoQXJKCUwqPB6hnmqRSpea8AoxO3vYLm73IK_yVnDo,69988
-dogpile/cache/util.py,sha256=KWrykvRkWK1YE0YRKUFtZnKI75TP_3XBJEoKQHjaFZ4,5416
-dogpile/core.py,sha256=2ojPK5ASUk9QQFH4pUQObQSwqhAKoocRlhlo4jskFGY,565
-dogpile/lock.py,sha256=zXMtrnUBTGkTgsWYAmENCtT_Zifgrnz62t7Iwe9_qUA,7077
-dogpile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dogpile/testing/__init__.py,sha256=pfpf0xAmjNFwhQ3p6KwRVUMTgwqaI0zi-cwqfwApypM,221
-dogpile/testing/assertions.py,sha256=9a90onA-7yRH1ctouugSV_VsY6auyDzSy7kxrpTmH0s,870
-dogpile/testing/fixtures.py,sha256=-mhpc6OVuhXmkRMLr073wsbW9Tx_oR38stus3uohWnM,17368
-dogpile/util/__init__.py,sha256=TCSGLbDysGhlcSOyrasfhrKj_APC8v6yF3P4RioKCxI,339
-dogpile/util/compat.py,sha256=F1vOV7Ib7dXXSXK6_lyQ0v8YQvH00wzhHg8pA_hcflk,1735
-dogpile/util/langhelpers.py,sha256=hI8BZai2SzZNQVvnEQTE96k2bY725flEmZcfX-p0xDs,4479
-dogpile/util/nameregistry.py,sha256=tF0C8T-s9dYZxAazfE5C5hXiFkUgBwvfW5d9gXGxbFc,2801
-dogpile/util/readwrite_lock.py,sha256=Z4WM14gOS6IuvD2U5DQgUOzRDSfvAPEVkupmqpgwGQg,4532
-dogpile/util/typing.py,sha256=JYczTeiRY5UDyVSh4xebbqNBCyvvOMyVZkmJ-_d669E,131
diff --git a/libs/dogpile.cache-1.3.3.dist-info/WHEEL b/libs/dogpile.cache-1.3.3.dist-info/WHEEL
deleted file mode 100644
index da25d7b423..0000000000
--- a/libs/dogpile.cache-1.3.3.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/dogpile/__init__.py b/libs/dogpile/__init__.py
index 4168f8935a..8e2007147e 100644
--- a/libs/dogpile/__init__.py
+++ b/libs/dogpile/__init__.py
@@ -1,4 +1,10 @@
-__version__ = "1.3.3"
+__version__ = "1.5.0"
 
-from .lock import Lock  # noqa
-from .lock import NeedRegenerationException  # noqa
+from .lock import Lock
+from .lock import NeedRegenerationException
+
+__all__ = [
+    "Lock",
+    "NeedRegenerationException",
+    "__version__",
+]
diff --git a/libs/dogpile/cache/__init__.py b/libs/dogpile/cache/__init__.py
index 91c3a82c95..76ac3a1ad8 100644
--- a/libs/dogpile/cache/__init__.py
+++ b/libs/dogpile/cache/__init__.py
@@ -1,6 +1,13 @@
-from .region import CacheRegion  # noqa
-from .region import make_region  # noqa
-from .region import register_backend  # noqa
-from .. import __version__  # noqa
+from .backends import register_backend
+from .region import CacheRegion
+from .region import make_region
+from .. import __version__
 
 # backwards compat
+
+__all__ = [
+    "CacheRegion",
+    "make_region",
+    "register_backend",
+    "__version__",
+]
diff --git a/libs/dogpile/cache/api.py b/libs/dogpile/cache/api.py
index 6fbe842794..896a2acbcc 100644
--- a/libs/dogpile/cache/api.py
+++ b/libs/dogpile/cache/api.py
@@ -1,18 +1,17 @@
 from __future__ import annotations
 
 import abc
+from collections.abc import Callable
+from collections.abc import Iterable
+from collections.abc import Mapping
+from collections.abc import Sequence
 import enum
 import pickle
 import time
 from typing import Any
-from typing import Callable
 from typing import cast
 from typing import Literal
-from typing import Mapping
 from typing import NamedTuple
-from typing import Optional
-from typing import Sequence
-from typing import Union
 
 from ..util.typing import Self
 
@@ -166,19 +165,19 @@ def age(self) -> float:
         return time.time() - self.cached_time
 
 
-CacheReturnType = Union[CachedValue, NoValueType]
+CacheReturnType = CachedValue | NoValueType
 """The non-serialized form of what may be returned from a backend
 get method.
 
 """
 
-SerializedReturnType = Union[bytes, NoValueType]
+SerializedReturnType = bytes | NoValueType
 """the serialized form of what may be returned from a backend get method."""
 
-BackendFormatted = Union[CacheReturnType, SerializedReturnType]
+BackendFormatted = CacheReturnType | SerializedReturnType
 """Describes the type returned from the :meth:`.CacheBackend.get` method."""
 
-BackendSetType = Union[CachedValue, bytes]
+BackendSetType = CachedValue | bytes
 """Describes the value argument passed to the :meth:`.CacheBackend.set`
 method."""
 
@@ -194,7 +193,7 @@ class CacheBackend:
 
     """
 
-    key_mangler: Optional[Callable[[KeyType], KeyType]] = None
+    key_mangler: Callable[[KeyType], KeyType] | None = None
     """Key mangling function.
 
     May be None, or otherwise declared
@@ -202,7 +201,7 @@ class CacheBackend:
 
     """
 
-    serializer: Union[None, Serializer] = None
+    serializer: Serializer | None = None
     """Serializer function that will be used by default if not overridden
     by the region.
 
@@ -210,7 +209,7 @@ class CacheBackend:
 
     """
 
-    deserializer: Union[None, Deserializer] = None
+    deserializer: Deserializer | None = None
     """deserializer function that will be used by default if not overridden
     by the region.
 
@@ -246,7 +245,7 @@ def from_config_dict(
     def has_lock_timeout(self) -> bool:
         return False
 
-    def get_mutex(self, key: KeyType) -> Optional[CacheMutex]:
+    def get_mutex(self, key: KeyType) -> CacheMutex | None:
         """Return an optional mutexing object for the given key.
 
         This object need only provide an ``acquire()``
@@ -297,7 +296,7 @@ def get(self, key: KeyType) -> BackendFormatted:  # pragma NO COVERAGE
         raise NotImplementedError()
 
     def get_multi(
-        self, keys: Sequence[KeyType]
+        self, keys: Iterable[KeyType]
     ) -> Sequence[BackendFormatted]:  # pragma NO COVERAGE
         """Retrieve multiple optionally serialized values from the cache.
 
@@ -340,7 +339,7 @@ def get_serialized(self, key: KeyType) -> SerializedReturnType:
         return cast(SerializedReturnType, self.get(key))
 
     def get_serialized_multi(
-        self, keys: Sequence[KeyType]
+        self, keys: Iterable[KeyType]
     ) -> Sequence[SerializedReturnType]:  # pragma NO COVERAGE
         """Retrieve multiple serialized values from the cache.
 
@@ -478,7 +477,7 @@ def delete(self, key: KeyType) -> None:  # pragma NO COVERAGE
         raise NotImplementedError()
 
     def delete_multi(
-        self, keys: Sequence[KeyType]
+        self, keys: Iterable[KeyType]
     ) -> None:  # pragma NO COVERAGE
         """Delete multiple values from the cache.
 
@@ -498,12 +497,8 @@ def delete_multi(
 
 
 class DefaultSerialization:
-    serializer: Union[None, Serializer] = staticmethod(  # type: ignore
-        pickle.dumps
-    )
-    deserializer: Union[None, Deserializer] = staticmethod(  # type: ignore
-        pickle.loads
-    )
+    serializer: Serializer | None = staticmethod(pickle.dumps)
+    deserializer: Deserializer | None = staticmethod(pickle.loads)
 
 
 class BytesBackend(DefaultSerialization, CacheBackend):
@@ -535,7 +530,7 @@ def get_serialized(self, key: KeyType) -> SerializedReturnType:
         raise NotImplementedError()
 
     def get_serialized_multi(
-        self, keys: Sequence[KeyType]
+        self, keys: Iterable[KeyType]
     ) -> Sequence[SerializedReturnType]:  # pragma NO COVERAGE
         """Retrieve multiple serialized values from the cache.
 
diff --git a/libs/dogpile/cache/backends/__init__.py b/libs/dogpile/cache/backends/__init__.py
index cd0e3e428a..1ee0a7773e 100644
--- a/libs/dogpile/cache/backends/__init__.py
+++ b/libs/dogpile/cache/backends/__init__.py
@@ -50,3 +50,16 @@
     "dogpile.cache.backends.redis",
     "RedisClusterBackend",
 )
+register_backend(
+    "dogpile.cache.valkey", "dogpile.cache.backends.valkey", "ValkeyBackend"
+)
+register_backend(
+    "dogpile.cache.valkey_sentinel",
+    "dogpile.cache.backends.valkey",
+    "ValkeySentinelBackend",
+)
+register_backend(
+    "dogpile.cache.valkey_cluster",
+    "dogpile.cache.backends.valkey",
+    "ValkeyClusterBackend",
+)
diff --git a/libs/dogpile/cache/backends/memcached.py b/libs/dogpile/cache/backends/memcached.py
index eee3448388..0842cb6524 100644
--- a/libs/dogpile/cache/backends/memcached.py
+++ b/libs/dogpile/cache/backends/memcached.py
@@ -6,12 +6,12 @@
 
 """
 
+from collections.abc import Mapping
 import random
 import threading
 import time
 import typing
 from typing import Any
-from typing import Mapping
 import warnings
 
 from ..api import CacheBackend
diff --git a/libs/dogpile/cache/backends/memory.py b/libs/dogpile/cache/backends/memory.py
index f09b302908..0ace10bd21 100644
--- a/libs/dogpile/cache/backends/memory.py
+++ b/libs/dogpile/cache/backends/memory.py
@@ -10,7 +10,6 @@
 
 """
 
-
 from ..api import CacheBackend
 from ..api import DefaultSerialization
 from ..api import NO_VALUE
@@ -51,7 +50,7 @@ class MemoryBackend(CacheBackend):
     """
 
     def __init__(self, arguments):
-        self._cache = arguments.pop("cache_dict", {})
+        self._cache = arguments.get("cache_dict", {})
 
     def get(self, key):
         return self._cache.get(key, NO_VALUE)
diff --git a/libs/dogpile/cache/backends/redis.py b/libs/dogpile/cache/backends/redis.py
index cde17b2dc0..0e9b4f6b1d 100644
--- a/libs/dogpile/cache/backends/redis.py
+++ b/libs/dogpile/cache/backends/redis.py
@@ -2,10 +2,11 @@
 Redis Backends
 ------------------
 
-Provides backends for talking to `Redis <http://redis.io>`_.
+Provides backends for talking to `Redis <http://redis.io>`__.
 
 """
 
+import re
 import typing
 import warnings
 
@@ -21,9 +22,12 @@
 __all__ = ("RedisBackend", "RedisSentinelBackend", "RedisClusterBackend")
 
 
+RE_VALID_PREFIX = re.compile(r"^[\w\-\.\:]{2,10}$")
+
+
 class RedisBackend(BytesBackend):
-    r"""A `Redis <http://redis.io/>`_ backend, using the
-    `redis-py <http://pypi.python.org/pypi/redis/>`_ driver.
+    r"""A `Redis <http://redis.io/>`__ backend, using the
+    `redis-py <http://pypi.python.org/pypi/redis/>`__ driver.
 
     Example configuration::
 
@@ -73,6 +77,26 @@ class RedisBackend(BytesBackend):
      Redis should expire it.  This argument is only valid when
      ``distributed_lock`` is ``True``.
 
+    :param lock_sleep: integer, number of seconds to sleep when failed to
+     acquire a lock.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param lock_blocking: bool, default ``True``. Passed to the Redis client's
+     lock constructor when ``distributed_lock`` is ``True``.
+
+     .. versionadded:: 1.4.1
+
+    :param lock_blocking_timeout: int or float, default ``None``. Passed to the
+     Redis client's lock constructor when ``distributed_lock`` is ``True``.
+
+     .. versionadded:: 1.4.1
+
+    :param lock_prefix: string. This prefix is used for generating the name of
+     locks. If customized, the prefix must be between 2 and 10 characters long,
+     and may contain any alphanumeric character and the symbols "_-.:".
+
+     .. versionadded:: 1.5.0
+
     :param socket_timeout: float, seconds for socket timeout.
      Default is None (no timeout).
 
@@ -91,10 +115,6 @@ class RedisBackend(BytesBackend):
 
      .. versionadded:: 1.3.2
 
-    :param lock_sleep: integer, number of seconds to sleep when failed to
-     acquire a lock.  This argument is only valid when
-     ``distributed_lock`` is ``True``.
-
     :param connection_pool: ``redis.ConnectionPool`` object.  If provided,
      this object supersedes other connection arguments passed to the
      ``redis.StrictRedis`` instance, including url and/or host as well as
@@ -106,6 +126,13 @@ class RedisBackend(BytesBackend):
      asynchronous runners, as they run in a different thread than the one
      used to create the lock.
 
+    :param ssl: boolean, default ``None``. If set, this is passed to the
+     ``redis.StrictRedis`` constructor as ``ssl``. All additional ``ssl_``
+     prefixed args should be submitted via the
+     :paramref:`.RedisBackend.connection_kwargs` dict.
+
+     .. versionadded:: 1.4.1
+
     :param connection_kwargs: dict, additional keyword arguments are passed
      along to the
      ``StrictRedis.from_url()`` method or ``StrictRedis()`` constructor
@@ -113,12 +140,10 @@ class RedisBackend(BytesBackend):
      ``charset``, etc.
 
      .. versionadded:: 1.1.6
-
-
-
-
     """
 
+    lock_template: str = "_lock{0}"
+
     def __init__(self, arguments):
         arguments = arguments.copy()
         self._imports()
@@ -128,7 +153,6 @@ def __init__(self, arguments):
         self.password = arguments.pop("password", None)
         self.port = arguments.pop("port", 6379)
         self.db = arguments.pop("db", 0)
-        self.distributed_lock = arguments.pop("distributed_lock", False)
         self.socket_timeout = arguments.pop("socket_timeout", None)
         self.socket_connect_timeout = arguments.pop(
             "socket_connect_timeout", None
@@ -137,8 +161,19 @@ def __init__(self, arguments):
         self.socket_keepalive_options = arguments.pop(
             "socket_keepalive_options", None
         )
+
+        # additional ssl params should be submitted in `connection_kwargs`
+        self.ssl = arguments.pop("ssl", None)
+
+        # used by `get_mutex`
+        self.distributed_lock = arguments.pop("distributed_lock", False)
         self.lock_timeout = arguments.pop("lock_timeout", None)
         self.lock_sleep = arguments.pop("lock_sleep", 0.1)
+        self.lock_blocking = arguments.pop("lock_blocking", True)
+        self.lock_blocking_timeout = arguments.pop(
+            "lock_blocking_timeout", None
+        )
+
         self.thread_local_lock = arguments.pop("thread_local_lock", True)
         self.connection_kwargs = arguments.pop("connection_kwargs", {})
 
@@ -150,6 +185,17 @@ def __init__(self, arguments):
 
         self.redis_expiration_time = arguments.pop("redis_expiration_time", 0)
         self.connection_pool = arguments.pop("connection_pool", None)
+
+        lock_prefix = arguments.pop("lock_prefix", None)
+        if lock_prefix:
+            if (not isinstance(lock_prefix, str)) or (
+                not RE_VALID_PREFIX.match(lock_prefix)
+            ):
+                raise ValueError(
+                    "Invalid `lock_prefix` submitted: `%s`." % lock_prefix
+                )
+            self.lock_template = "%s{0}" % lock_prefix
+
         self._create_client()
 
     def _imports(self):
@@ -176,9 +222,11 @@ def _create_client(self):
             if self.socket_keepalive:
                 args["socket_keepalive"] = True
                 if self.socket_keepalive_options is not None:
-                    args[
-                        "socket_keepalive_options"
-                    ] = self.socket_keepalive_options
+                    args["socket_keepalive_options"] = (
+                        self.socket_keepalive_options
+                    )
+            if self.ssl is not None:
+                args["ssl"] = self.ssl
 
             if self.url is not None:
                 args.update(url=self.url)
@@ -199,10 +247,12 @@ def get_mutex(self, key):
         if self.distributed_lock:
             return _RedisLockWrapper(
                 self.writer_client.lock(
-                    "_lock{0}".format(key),
+                    self.lock_template.format(key),
                     timeout=self.lock_timeout,
                     sleep=self.lock_sleep,
                     thread_local=self.thread_local_lock,
+                    blocking=self.lock_blocking,
+                    blocking_timeout=self.lock_blocking_timeout,
                 )
             )
         else:
@@ -259,10 +309,10 @@ def locked(self) -> bool:
 
 
 class RedisSentinelBackend(RedisBackend):
-    """A `Redis <http://redis.io/>`_ backend, using the
-    `redis-py <http://pypi.python.org/pypi/redis/>`_ driver.
+    """A `Redis <http://redis.io/>`__ backend, using the
+    `redis-py <http://pypi.python.org/pypi/redis/>`__ driver.
     This backend is to be used when using
-    `Redis Sentinel <https://redis.io/docs/management/sentinel/>`_.
+    `Redis Sentinel <https://redis.io/docs/management/sentinel/>`__.
 
     .. versionadded:: 1.0.0
 
@@ -413,17 +463,17 @@ def _create_client(self):
 
 
 class RedisClusterBackend(RedisBackend):
-    r"""A `Redis <http://redis.io/>`_ backend, using the
-    `redis-py <http://pypi.python.org/pypi/redis/>`_ driver.
+    r"""A `Redis <http://redis.io/>`__ backend, using the
+    `redis-py <http://pypi.python.org/pypi/redis/>`__ driver.
     This backend is to be used when connecting to a
-    `Redis Cluster <https://redis.io/docs/management/scaling/>`_ which
+    `Redis Cluster <https://redis.io/docs/management/scaling/>`__ which
     will use the
     `RedisCluster Client
-    <https://redis.readthedocs.io/en/stable/connections.html#cluster-client>`_.
+    <https://redis.readthedocs.io/en/stable/connections.html#cluster-client>`__.
 
     .. seealso::
 
-        `Clustering <https://redis.readthedocs.io/en/stable/clustering.html>`_
+        `Clustering <https://redis.readthedocs.io/en/stable/clustering.html>`__
         in the redis-py documentation.
 
     Requires redis-py version >=4.1.0.
@@ -565,5 +615,5 @@ def _create_client(self):
                 startup_nodes=self.startup_nodes,
                 **self.connection_kwargs,
             )
-        self.writer_client = typing.cast(redis.Redis[bytes], redis_cluster)
+        self.writer_client = typing.cast("redis.Redis[bytes]", redis_cluster)
         self.reader_client = self.writer_client
diff --git a/libs/dogpile/cache/backends/valkey.py b/libs/dogpile/cache/backends/valkey.py
new file mode 100644
index 0000000000..53c9d5747c
--- /dev/null
+++ b/libs/dogpile/cache/backends/valkey.py
@@ -0,0 +1,612 @@
+"""
+Valkey Backends
+------------------
+
+Provides backends for talking to `Valkey <http://valkey.io>`__.
+
+"""
+
+import re
+import typing
+import warnings
+
+from ..api import BytesBackend
+from ..api import NO_VALUE
+
+if typing.TYPE_CHECKING:
+    import valkey
+else:
+    # delayed import
+    valkey = None  # noqa F811
+
+__all__ = ("ValkeyBackend", "ValkeySentinelBackend", "ValkeyClusterBackend")
+
+
+RE_VALID_PREFIX = re.compile(r"^[\w\-\.\:]{2,10}$")
+
+
+class ValkeyBackend(BytesBackend):
+    r"""A `Valkey <http://valkey.io/>`__ backend, using the
+    `valkey-py <http://pypi.python.org/pypi/valkey/>`__ driver.
+
+    .. versionadded:: 1.3.4
+
+    Example configuration::
+
+        from dogpile.cache import make_region
+
+        region = make_region().configure(
+            'dogpile.cache.valkey',
+            arguments = {
+                'host': 'localhost',
+                'port': 6379,
+                'db': 0,
+                'valkey_expiration_time': 60*60*2,   # 2 hours
+                'distributed_lock': True,
+                'thread_local_lock': False
+                }
+        )
+
+
+    Arguments accepted in the arguments dictionary:
+
+    :param url: string. If provided, will override separate
+     host/username/password/port/db params.  The format is that accepted by
+     ``StrictValkey.from_url()``.
+
+    :param host: string, default is ``localhost``.
+
+    :param username: string, default is no username.
+
+    :param password: string, default is no password.
+
+    :param port: integer, default is ``6379``.
+
+    :param db: integer, default is ``0``.
+
+    :param valkey_expiration_time: integer, number of seconds after setting a
+     value that Valkey should expire it.  This should be larger than dogpile's
+     cache expiration.  By default no expiration is set.
+
+    :param distributed_lock: boolean, when True, will use a
+     valkey-lock as the dogpile lock. Use this when multiple processes will be
+     talking to the same valkey instance. When left at False, dogpile will
+     coordinate on a regular threading mutex.
+
+    :param lock_timeout: integer, number of seconds after acquiring a lock that
+     Valkey should expire it.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param lock_sleep: integer, number of seconds to sleep when failed to
+     acquire a lock.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param lock_blocking: bool, default ``True``. Passed to the Valkey client's
+     lock constructor when ``distributed_lock`` is ``True``.
+
+     .. versionadded:: 1.4.1
+
+    :param lock_blocking_timeout: int or float, default ``None``.  Passed to
+     the Valkey client's lock constructor, when ``distributed_lock`` is
+     ``True``.
+
+     .. versionadded:: 1.4.1
+
+    :param lock_prefix: string. This prefix is used for generating the name of
+     locks. If customized, the prefix must be between 2 and 10 characters long,
+     and may contain any alphanumeric character and the symbols "_-.:".
+
+     .. versionadded:: 1.5.0
+
+    :param socket_timeout: float, seconds for socket timeout.
+     Default is None (no timeout).
+
+    :param socket_connect_timeout: float, seconds for socket connection
+     timeout. Default is None (no timeout).
+
+    :param socket_keepalive: boolean, when True, socket keepalive is enabled.
+     Default is False.
+
+    :param socket_keepalive_options: dict, socket keepalive options.
+     Default is None (no options).
+
+    :param connection_pool: ``valkey.ConnectionPool`` object.  If provided,
+     this object supersedes other connection arguments passed to the
+     ``valkey.StrictValkey`` instance, including url and/or host as well as
+     socket_timeout, and will be passed to ``valkey.StrictValkey`` as the
+     source of connectivity.
+
+    :param thread_local_lock: bool, whether a thread-local Valkey lock object
+     should be used. This is the default, but is not compatible with
+     asynchronous runners, as they run in a different thread than the one
+     used to create the lock.
+
+    :param ssl: boolean, default ``None``. If set, this is passed to the
+      ``valkey.StrictValkey`` constructor as ``ssl``. All additional ``ssl_``
+      prefixed args should be submitted via the
+      :paramref:`.ValkeyBackend.connection_kwargs` dict.
+
+      .. versionadded:: 1.4.1
+
+    :param connection_kwargs: dict, additional keyword arguments are passed
+     along to the
+     ``StrictValkey.from_url()`` method or ``StrictValkey()`` constructor
+     directly, including parameters like ``ssl``, ``ssl_certfile``,
+     ``charset``, etc.
+    """
+
+    lock_template: str = "_lock{0}"
+
+    def __init__(self, arguments):
+        arguments = arguments.copy()
+        self._imports()
+        self.url = arguments.pop("url", None)
+        self.host = arguments.pop("host", "localhost")
+        self.username = arguments.pop("username", None)
+        self.password = arguments.pop("password", None)
+        self.port = arguments.pop("port", 6379)
+        self.db = arguments.pop("db", 0)
+        self.socket_timeout = arguments.pop("socket_timeout", None)
+        self.socket_connect_timeout = arguments.pop(
+            "socket_connect_timeout", None
+        )
+        self.socket_keepalive = arguments.pop("socket_keepalive", False)
+        self.socket_keepalive_options = arguments.pop(
+            "socket_keepalive_options", None
+        )
+
+        # additional ssl params should be submitted in `connection_kwargs`
+        self.ssl = arguments.pop("ssl", None)
+
+        # used by `get_mutex`
+        self.distributed_lock = arguments.pop("distributed_lock", False)
+        self.lock_timeout = arguments.pop("lock_timeout", None)
+        self.lock_sleep = arguments.pop("lock_sleep", 0.1)
+        self.lock_blocking = arguments.pop("lock_blocking", True)
+        self.lock_blocking_timeout = arguments.pop(
+            "lock_blocking_timeout", None
+        )
+
+        self.thread_local_lock = arguments.pop("thread_local_lock", True)
+        self.connection_kwargs = arguments.pop("connection_kwargs", {})
+
+        if self.distributed_lock and self.thread_local_lock:
+            warnings.warn(
+                "The Valkey backend thread_local_lock parameter should be "
+                "set to False when distributed_lock is True"
+            )
+
+        self.valkey_expiration_time = arguments.pop(
+            "valkey_expiration_time", 0
+        )
+        self.connection_pool = arguments.pop("connection_pool", None)
+
+        lock_prefix = arguments.pop("lock_prefix", None)
+        if lock_prefix:
+            if (not isinstance(lock_prefix, str)) or (
+                not RE_VALID_PREFIX.match(lock_prefix)
+            ):
+                raise ValueError("Invalid `lock_prefix` submitted.")
+            self.lock_template = "%s{0}" % lock_prefix
+
+        self._create_client()
+
+    def _imports(self):
+        # defer imports until backend is used
+        global valkey
+        import valkey  # noqa
+
+    def _create_client(self):
+        if self.connection_pool is not None:
+            # the connection pool already has all other connection
+            # options present within, so here we disregard socket_timeout
+            # and others.
+            self.writer_client = valkey.StrictValkey(
+                connection_pool=self.connection_pool
+            )
+            self.reader_client = self.writer_client
+        else:
+            args = {}
+            args.update(self.connection_kwargs)
+            if self.socket_timeout is not None:
+                args["socket_timeout"] = self.socket_timeout
+            if self.socket_connect_timeout is not None:
+                args["socket_connect_timeout"] = self.socket_connect_timeout
+            if self.socket_keepalive:
+                args["socket_keepalive"] = True
+                if self.socket_keepalive_options is not None:
+                    args["socket_keepalive_options"] = (
+                        self.socket_keepalive_options
+                    )
+            if self.ssl is not None:
+                args["ssl"] = self.ssl
+
+            if self.url is not None:
+                args.update(url=self.url)
+                self.writer_client = valkey.StrictValkey.from_url(**args)
+                self.reader_client = self.writer_client
+            else:
+                args.update(
+                    host=self.host,
+                    username=self.username,
+                    password=self.password,
+                    port=self.port,
+                    db=self.db,
+                )
+                self.writer_client = valkey.StrictValkey(**args)
+                self.reader_client = self.writer_client
+
+    def get_mutex(self, key):
+        if self.distributed_lock:
+            return _ValkeyLockWrapper(
+                self.writer_client.lock(
+                    self.lock_template.format(key),
+                    timeout=self.lock_timeout,
+                    sleep=self.lock_sleep,
+                    thread_local=self.thread_local_lock,
+                    blocking=self.lock_blocking,
+                    blocking_timeout=self.lock_blocking_timeout,
+                )
+            )
+        else:
+            return None
+
+    def get_serialized(self, key):
+        value = self.reader_client.get(key)
+        if value is None:
+            return NO_VALUE
+        return value
+
+    def get_serialized_multi(self, keys):
+        if not keys:
+            return []
+        values = self.reader_client.mget(keys)
+        return [v if v is not None else NO_VALUE for v in values]  # type: ignore   # noqa: E501
+
+    def set_serialized(self, key, value):
+        if self.valkey_expiration_time:
+            self.writer_client.setex(key, self.valkey_expiration_time, value)
+        else:
+            self.writer_client.set(key, value)
+
+    def set_serialized_multi(self, mapping):
+        if not self.valkey_expiration_time:
+            self.writer_client.mset(mapping)
+        else:
+            pipe = self.writer_client.pipeline()
+            for key, value in mapping.items():
+                pipe.setex(key, self.valkey_expiration_time, value)
+            pipe.execute()
+
+    def delete(self, key):
+        self.writer_client.delete(key)
+
+    def delete_multi(self, keys):
+        self.writer_client.delete(*keys)
+
+
+class _ValkeyLockWrapper:
+    __slots__ = ("mutex", "__weakref__")
+
+    def __init__(self, mutex: typing.Any):
+        self.mutex = mutex
+
+    def acquire(self, wait: bool = True) -> typing.Any:
+        return self.mutex.acquire(blocking=wait)
+
+    def release(self) -> typing.Any:
+        return self.mutex.release()
+
+    def locked(self) -> bool:
+        return self.mutex.locked()  # type: ignore
+
+
+class ValkeySentinelBackend(ValkeyBackend):
+    """A `Valkey <http://valkey.io/>`__ backend, using the
+    `valkey-py <http://pypi.python.org/pypi/valkey/>`__ driver.
+    This backend is to be used when using
+    `Valkey Sentinel <https://valkey.io/docs/management/sentinel/>`__.
+
+    .. versionadded:: 1.0.0
+
+    Example configuration::
+
+        from dogpile.cache import make_region
+
+        region = make_region().configure(
+            'dogpile.cache.valkey_sentinel',
+            arguments = {
+                'sentinels': [
+                    ['valkey_sentinel_1', 26379],
+                    ['valkey_sentinel_2', 26379]
+                ],
+                'db': 0,
+                'valkey_expiration_time': 60*60*2,   # 2 hours
+                'distributed_lock': True,
+                'thread_local_lock': False
+            }
+        )
+
+
+    Arguments accepted in the arguments dictionary:
+
+    :param username: string, default is no username.
+
+     .. versionadded:: 1.3.1
+
+    :param password: string, default is no password.
+
+    :param db: integer, default is ``0``.
+
+    :param valkey_expiration_time: integer, number of seconds after setting a
+     value that Valkey should expire it.  This should be larger than dogpile's
+     cache expiration.  By default no expiration is set.
+
+    :param distributed_lock: boolean, when True, will use a
+     valkey-lock as the dogpile lock. Use this when multiple processes will be
+     talking to the same valkey instance. When False, dogpile will
+     coordinate on a regular threading mutex, Default is True.
+
+    :param lock_timeout: integer, number of seconds after acquiring a lock that
+     Valkey should expire it.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param socket_timeout: float, seconds for socket timeout.
+     Default is None (no timeout).
+
+     .. versionadded:: 1.3.2
+
+    :param socket_connect_timeout: float, seconds for socket connection
+     timeout.  Default is None (no timeout).
+
+     .. versionadded:: 1.3.2
+
+    :param socket_keepalive: boolean, when True, socket keepalive is enabled
+     Default is False.
+
+     .. versionadded:: 1.3.2
+
+    :param socket_keepalive_options: dict, socket keepalive options.
+     Default is {} (no options).
+
+    :param sentinels: is a list of sentinel nodes. Each node is represented by
+     a pair (hostname, port).
+     Default is None (not in sentinel mode).
+
+    :param service_name: str, the service name.
+     Default is 'mymaster'.
+
+    :param sentinel_kwargs: is a dictionary of connection arguments used when
+     connecting to sentinel instances. Any argument that can be passed to
+     a normal Valkey connection can be specified here.
+     Default is {}.
+
+    :param connection_kwargs: dict, additional keyword arguments are passed
+     along to the
+     ``StrictValkey.from_url()`` method or ``StrictValkey()`` constructor
+     directly, including parameters like ``ssl``, ``ssl_certfile``,
+     ``charset``, etc.
+
+    :param lock_sleep: integer, number of seconds to sleep when failed to
+     acquire a lock.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param thread_local_lock: bool, whether a thread-local Valkey lock object
+     should be used. This is the default, but is not compatible with
+     asynchronous runners, as they run in a different thread than the one
+     used to create the lock.
+
+
+    """
+
+    def __init__(self, arguments):
+        arguments = arguments.copy()
+
+        self.sentinels = arguments.pop("sentinels", None)
+        self.service_name = arguments.pop("service_name", "mymaster")
+        self.sentinel_kwargs = arguments.pop("sentinel_kwargs", {})
+
+        super().__init__(
+            arguments={
+                "distributed_lock": True,
+                "thread_local_lock": False,
+                **arguments,
+            }
+        )
+
+    def _imports(self):
+        # defer imports until backend is used
+        global valkey
+        import valkey.sentinel  # noqa
+
+    def _create_client(self):
+        sentinel_kwargs = {}
+        sentinel_kwargs.update(self.sentinel_kwargs)
+        sentinel_kwargs.setdefault("username", self.username)
+        sentinel_kwargs.setdefault("password", self.password)
+
+        connection_kwargs = {}
+        connection_kwargs.update(self.connection_kwargs)
+        connection_kwargs.setdefault("username", self.username)
+        connection_kwargs.setdefault("password", self.password)
+
+        if self.db is not None:
+            connection_kwargs.setdefault("db", self.db)
+            sentinel_kwargs.setdefault("db", self.db)
+        if self.socket_timeout is not None:
+            connection_kwargs.setdefault("socket_timeout", self.socket_timeout)
+        if self.socket_connect_timeout is not None:
+            connection_kwargs.setdefault(
+                "socket_connect_timeout", self.socket_connect_timeout
+            )
+        if self.socket_keepalive:
+            connection_kwargs.setdefault("socket_keepalive", True)
+            if self.socket_keepalive_options is not None:
+                connection_kwargs.setdefault(
+                    "socket_keepalive_options", self.socket_keepalive_options
+                )
+
+        sentinel = valkey.sentinel.Sentinel(
+            self.sentinels,
+            sentinel_kwargs=sentinel_kwargs,
+            **connection_kwargs,
+        )
+        self.writer_client = sentinel.master_for(self.service_name)
+        self.reader_client = sentinel.slave_for(self.service_name)
+
+
+class ValkeyClusterBackend(ValkeyBackend):
+    r"""A `Valkey <http://valkey.io/>`__ backend, using the
+    `valkey-py <http://pypi.python.org/pypi/valkey/>`__ driver.
+    This backend is to be used when connecting to a
+    `Valkey Cluster <https://valkey.io/docs/management/scaling/>`__ which
+    will use the
+    `ValkeyCluster Client
+    <https://valkey.readthedocs.io/en/stable/connections.html#cluster-client>`__.
+
+    .. seealso::
+
+        `Clustering <https://valkey.readthedocs.io/en/stable/clustering.html>`__
+        in the valkey-py documentation.
+
+    Requires valkey-py version >=4.1.0.
+
+    .. versionadded:: 1.3.2
+
+    Connecting to the cluster requires one of:
+
+    * Passing a list of startup nodes
+    * Passing only one node of the cluster, Valkey will use automatic discovery
+      to find the other nodes.
+
+    Example configuration, using startup nodes::
+
+        from dogpile.cache import make_region
+        from valkey.cluster import ClusterNode
+
+        region = make_region().configure(
+            'dogpile.cache.valkey_cluster',
+            arguments = {
+                "startup_nodes": [
+                    ClusterNode('localhost', 6379),
+                    ClusterNode('localhost', 6378)
+                ]
+            }
+        )
+
+    It is recommended to use startup nodes, so that connections will be
+    successful as at least one node will always be present.  Connection
+    arguments such as password, username or
+    CA certificate may be passed using ``connection_kwargs``::
+
+        from dogpile.cache import make_region
+        from valkey.cluster import ClusterNode
+
+        connection_kwargs = {
+            "username": "admin",
+            "password": "averystrongpassword",
+            "ssl": True,
+            "ssl_ca_certs": "valkey.pem",
+        }
+
+        nodes = [
+            ClusterNode("localhost", 6379),
+            ClusterNode("localhost", 6380),
+            ClusterNode("localhost", 6381),
+        ]
+
+        region = make_region().configure(
+            "dogpile.cache.valkey_cluster",
+            arguments={
+                "startup_nodes": nodes,
+                "connection_kwargs": connection_kwargs,
+            },
+        )
+
+    Passing a URL to one node only will allow the driver to discover the whole
+    cluster automatically::
+
+        from dogpile.cache import make_region
+
+        region = make_region().configure(
+            'dogpile.cache.valkey_cluster',
+            arguments = {
+                "url": "localhost:6379/0"
+            }
+        )
+
+    A caveat of the above approach is that if the single node targeting
+    is not available, this would prevent the connection from being successful.
+
+    Parameters accepted include:
+
+    :param startup_nodes: List of ClusterNode. The list of nodes in
+     the cluster that the client will try to connect to.
+
+    :param url: string. If provided, will override separate
+     host/password/port/db params.  The format is that accepted by
+     ``ValkeyCluster.from_url()``.
+
+    :param db: integer, default is ``0``.
+
+    :param valkey_expiration_time: integer, number of seconds after setting
+     a value that Valkey should expire it.  This should be larger than dogpile's
+     cache expiration.  By default no expiration is set.
+
+    :param distributed_lock: boolean, when True, will use a
+     valkey-lock as the dogpile lock. Use this when multiple processes will be
+     talking to the same valkey instance. When left at False, dogpile will
+     coordinate on a regular threading mutex.
+
+    :param lock_timeout: integer, number of seconds after acquiring a lock that
+     Valkey should expire it.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param socket_timeout: float, seconds for socket timeout.
+     Default is None (no timeout).
+
+    :param socket_connect_timeout: float, seconds for socket connection
+     timeout.  Default is None (no timeout).
+
+    :param socket_keepalive: boolean, when True, socket keepalive is enabled
+     Default is False.
+
+    :param lock_sleep: integer, number of seconds to sleep when failed to
+     acquire a lock.  This argument is only valid when
+     ``distributed_lock`` is ``True``.
+
+    :param thread_local_lock: bool, whether a thread-local Valkey lock object
+     should be used. This is the default, but is not compatible with
+     asynchronous runners, as they run in a different thread than the one
+     used to create the lock.
+
+    :param connection_kwargs: dict, additional keyword arguments are passed
+     along to the
+     ``ValkeyCluster.from_url()`` method or ``ValkeyCluster()`` constructor
+     directly, including parameters like ``ssl``, ``ssl_certfile``,
+     ``charset``, etc.
+
+    """  # noqa: E501
+
+    def __init__(self, arguments):
+        arguments = arguments.copy()
+        self.startup_nodes = arguments.pop("startup_nodes", None)
+        super().__init__(arguments)
+
+    def _imports(self):
+        global valkey
+        import valkey.cluster
+
+    def _create_client(self):
+        valkey_cluster: valkey.cluster.ValkeyCluster[typing.Any]  # type: ignore   # noqa: E501
+        if self.url is not None:
+            valkey_cluster = valkey.cluster.ValkeyCluster.from_url(
+                self.url, **self.connection_kwargs
+            )
+        else:
+            valkey_cluster = valkey.cluster.ValkeyCluster(  # type: ignore   # noqa: E501
+                startup_nodes=self.startup_nodes,
+                **self.connection_kwargs,
+            )
+        self.writer_client = typing.cast(valkey.Valkey[bytes], valkey_cluster)  # type: ignore   # noqa: E501
+        self.reader_client = self.writer_client
diff --git a/libs/dogpile/cache/plugins/mako_cache.py b/libs/dogpile/cache/plugins/mako_cache.py
index b1bf6201c9..c9c9ba8873 100644
--- a/libs/dogpile/cache/plugins/mako_cache.py
+++ b/libs/dogpile/cache/plugins/mako_cache.py
@@ -42,10 +42,11 @@
 
 
 """
+
 from mako.cache import CacheImpl
 
 
-class MakoPlugin(CacheImpl):
+class MakoPlugin(CacheImpl):  # type: ignore[misc]
     """A Mako ``CacheImpl`` which talks to dogpile.cache."""
 
     def __init__(self, cache):
diff --git a/libs/dogpile/cache/proxy.py b/libs/dogpile/cache/proxy.py
index 540104155e..ac1e87e8ba 100644
--- a/libs/dogpile/cache/proxy.py
+++ b/libs/dogpile/cache/proxy.py
@@ -12,9 +12,9 @@
 
 from __future__ import annotations
 
-from typing import Mapping
-from typing import Optional
-from typing import Sequence
+from collections.abc import Iterable
+from collections.abc import Mapping
+from collections.abc import Sequence
 
 from .api import BackendFormatted
 from .api import BackendSetType
@@ -34,6 +34,10 @@ class ProxyBackend(CacheBackend):
         from dogpile.cache.proxy import ProxyBackend
 
         class MyFirstProxy(ProxyBackend):
+            def get_serialized(self, key):
+                # ... custom code goes here ...
+                return self.proxied.get_serialized(key)
+
             def get(self, key):
                 # ... custom code goes here ...
                 return self.proxied.get(key)
@@ -43,6 +47,10 @@ def set(self, key, value):
                 self.proxied.set(key)
 
         class MySecondProxy(ProxyBackend):
+            def get_serialized(self, key):
+                # ... custom code goes here ...
+                return self.proxied.get_serialized(key)
+
             def get(self, key):
                 # ... custom code goes here ...
                 return self.proxied.get(key)
@@ -94,23 +102,23 @@ def set(self, key: KeyType, value: BackendSetType) -> None:
     def delete(self, key: KeyType) -> None:
         self.proxied.delete(key)
 
-    def get_multi(self, keys: Sequence[KeyType]) -> Sequence[BackendFormatted]:
+    def get_multi(self, keys: Iterable[KeyType]) -> Sequence[BackendFormatted]:
         return self.proxied.get_multi(keys)
 
     def set_multi(self, mapping: Mapping[KeyType, BackendSetType]) -> None:
         self.proxied.set_multi(mapping)
 
-    def delete_multi(self, keys: Sequence[KeyType]) -> None:
+    def delete_multi(self, keys: Iterable[KeyType]) -> None:
         self.proxied.delete_multi(keys)
 
-    def get_mutex(self, key: KeyType) -> Optional[CacheMutex]:
+    def get_mutex(self, key: KeyType) -> CacheMutex | None:
         return self.proxied.get_mutex(key)
 
     def get_serialized(self, key: KeyType) -> SerializedReturnType:
         return self.proxied.get_serialized(key)
 
     def get_serialized_multi(
-        self, keys: Sequence[KeyType]
+        self, keys: Iterable[KeyType]
     ) -> Sequence[SerializedReturnType]:
         return self.proxied.get_serialized_multi(keys)
 
diff --git a/libs/dogpile/cache/region.py b/libs/dogpile/cache/region.py
index a446e4c9ce..0ccdc4f8bc 100644
--- a/libs/dogpile/cache/region.py
+++ b/libs/dogpile/cache/region.py
@@ -1,5 +1,10 @@
 from __future__ import annotations
 
+from collections.abc import Callable
+from collections.abc import Generator
+from collections.abc import Iterable
+from collections.abc import Mapping
+from collections.abc import Sequence
 import contextlib
 import datetime
 from functools import partial
@@ -10,15 +15,9 @@
 import threading
 import time
 from typing import Any
-from typing import Callable
 from typing import cast
-from typing import Mapping
-from typing import Optional
-from typing import Sequence
-from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
-from typing import Union
 
 from decorator import decorate
 
@@ -64,7 +63,7 @@
     ["CacheRegion", KeyType, Callable[[], ValuePayload], CacheMutex], None
 ]
 
-ExpirationTimeCallable = Callable[[], float]
+ExpirationTimeCallable = Callable[[], float | None]
 
 ToStr = Callable[[Any], str]
 
@@ -399,13 +398,13 @@ def runner():
 
     def __init__(
         self,
-        name: Optional[str] = None,
+        name: str | None = None,
         function_key_generator: FunctionKeyGenerator = function_key_generator,
         function_multi_key_generator: FunctionMultiKeyGenerator = function_multi_key_generator,  # noqa E501
-        key_mangler: Optional[Callable[[KeyType], KeyType]] = None,
-        serializer: Optional[Callable[[ValuePayload], bytes]] = None,
-        deserializer: Optional[Callable[[bytes], ValuePayload]] = None,
-        async_creation_runner: Optional[AsyncCreator] = None,
+        key_mangler: Callable[[KeyType], KeyType] | None = None,
+        serializer: Callable[[ValuePayload], bytes] | None = None,
+        deserializer: Callable[[bytes], ValuePayload] | None = None,
+        async_creation_runner: AsyncCreator | None = None,
     ):
         """Construct a new :class:`.CacheRegion`."""
         self.name = name
@@ -422,13 +421,13 @@ def __init__(
     def configure(
         self,
         backend: str,
-        expiration_time: Optional[Union[float, datetime.timedelta]] = None,
-        arguments: Optional[BackendArguments] = None,
-        _config_argument_dict: Optional[Mapping[str, Any]] = None,
-        _config_prefix: Optional[str] = None,
-        wrap: Sequence[Union[ProxyBackend, Type[ProxyBackend]]] = (),
+        expiration_time: float | datetime.timedelta | None = None,
+        arguments: BackendArguments | None = None,
+        _config_argument_dict: Mapping[str, Any] | None = None,
+        _config_prefix: str | None = None,
+        wrap: Sequence[ProxyBackend | Type[ProxyBackend]] = (),
         replace_existing_backend: bool = False,
-        region_invalidator: Optional[RegionInvalidationStrategy] = None,
+        region_invalidator: RegionInvalidationStrategy | None = None,
     ) -> Self:
         """Configure a :class:`.CacheRegion`.
 
@@ -504,10 +503,10 @@ def configure(
         else:
             self.backend = backend_cls(arguments or {})
 
-        self.expiration_time: Union[float, None]
+        self.expiration_time: float | None
 
         if not expiration_time or isinstance(expiration_time, Number):
-            self.expiration_time = cast(Union[None, float], expiration_time)
+            self.expiration_time = cast(None | float, expiration_time)
         elif isinstance(expiration_time, datetime.timedelta):
             self.expiration_time = int(expiration_time.total_seconds())
         else:
@@ -535,7 +534,7 @@ def configure(
 
         return self
 
-    def wrap(self, proxy: Union[ProxyBackend, Type[ProxyBackend]]) -> None:
+    def wrap(self, proxy: ProxyBackend | Type[ProxyBackend]) -> None:
         """Takes a ProxyBackend instance or class and wraps the
         attached backend."""
 
@@ -648,7 +647,9 @@ def invalidate(self, hard=True):
         """
         self.region_invalidator.invalidate(hard)
 
-    def configure_from_config(self, config_dict, prefix):
+    def configure_from_config(
+        self, config_dict: dict[str, Any], prefix: str
+    ) -> Self:
         """Configure from a configuration dictionary
         and a prefix.
 
@@ -680,7 +681,7 @@ def configure_from_config(self, config_dict, prefix):
             ),
             _config_argument_dict=config_dict,
             _config_prefix="%sarguments." % prefix,
-            wrap=config_dict.get("%swrap" % prefix, None),
+            wrap=config_dict.get("%swrap" % prefix, None),  # type: ignore
             replace_existing_backend=config_dict.get(
                 "%sreplace_existing_backend" % prefix, False
             ),
@@ -693,7 +694,7 @@ def backend(self):
         )
 
     @property
-    def is_configured(self):
+    def is_configured(self) -> bool:
         """Return True if the backend has been configured via the
         :meth:`.CacheRegion.configure` method already.
 
@@ -705,9 +706,9 @@ def is_configured(self):
     def get(
         self,
         key: KeyType,
-        expiration_time: Optional[float] = None,
+        expiration_time: float | None = None,
         ignore_expiration: bool = False,
-    ) -> Union[ValuePayload, NoValueType]:
+    ) -> ValuePayload | NoValueType:
         """Return a value from the cache, based on the given key.
 
         If the value is not present, the method returns the token
@@ -785,9 +786,9 @@ def get(
     def get_value_metadata(
         self,
         key: KeyType,
-        expiration_time: Optional[float] = None,
+        expiration_time: float | None = None,
         ignore_expiration: bool = False,
-    ) -> Optional[CachedValue]:
+    ) -> CachedValue | None:
         """Return the :class:`.CachedValue` object directly from the cache.
 
         This is the enclosing datastructure that includes the value as well as
@@ -812,7 +813,7 @@ def get_value_metadata(
     def _get_cache_value(
         self,
         key: KeyType,
-        expiration_time: Optional[float] = None,
+        expiration_time: float | None = None,
         ignore_expiration: bool = False,
     ) -> CacheReturnType:
         if self.key_mangler:
@@ -823,7 +824,9 @@ def _get_cache_value(
         )
         return value
 
-    def _unexpired_value_fn(self, expiration_time, ignore_expiration):
+    def _unexpired_value_fn(
+        self, expiration_time: float | None, ignore_expiration: bool
+    ) -> Callable[[CacheReturnType], CacheReturnType]:
         if ignore_expiration:
             return lambda value: value
         else:
@@ -900,7 +903,7 @@ def get_multi(self, keys, expiration_time=None, ignore_expiration=False):
         ]
 
     @contextlib.contextmanager
-    def _log_time(self, keys):
+    def _log_time(self, keys: Iterable[str]) -> Generator[None, None, None]:
         start_time = time.time()
         yield
         seconds = time.time() - start_time
@@ -937,9 +940,9 @@ def get_or_create(
         self,
         key: KeyType,
         creator: Callable[..., ValuePayload],
-        expiration_time: Optional[float] = None,
-        should_cache_fn: Optional[Callable[[ValuePayload], bool]] = None,
-        creator_args: Optional[Tuple[Any, Mapping[str, Any]]] = None,
+        expiration_time: float | None = None,
+        should_cache_fn: Callable[[ValuePayload], bool] | None = None,
+        creator_args: tuple[Any, Mapping[str, Any]] | None = None,
     ) -> ValuePayload:
         """Return a cached value based on the given key.
 
@@ -1072,7 +1075,7 @@ def gen_value():
         if expiration_time == -1:
             expiration_time = None
 
-        async_creator: Optional[Callable[[CacheMutex], AsyncCreator]]
+        async_creator: Callable[[CacheMutex], AsyncCreator] | None
         if self.async_creation_runner:
             acr = self.async_creation_runner
 
@@ -1102,10 +1105,10 @@ def go():
 
     def get_or_create_multi(
         self,
-        keys: Sequence[KeyType],
+        keys: Iterable[KeyType],
         creator: Callable[[], ValuePayload],
-        expiration_time: Optional[float] = None,
-        should_cache_fn: Optional[Callable[[ValuePayload], bool]] = None,
+        expiration_time: float | None = None,
+        should_cache_fn: Callable[[ValuePayload], bool] | None = None,
     ) -> Sequence[ValuePayload]:
         """Return a sequence of cached values based on a sequence of keys.
 
@@ -1252,7 +1255,7 @@ def async_creator(mutexes, key, mutex):
                 mutex.release()
 
     def _value(
-        self, value: Any, metadata: Optional[MetaDataType] = None
+        self, value: Any, metadata: MetaDataType | None = None
     ) -> CachedValue:
         """Return a :class:`.CachedValue` given a value."""
 
@@ -1289,7 +1292,7 @@ def _serialize_cached_value_elements(
         )
 
     def _serialized_payload(
-        self, payload: ValuePayload, metadata: Optional[MetaDataType] = None
+        self, payload: ValuePayload, metadata: MetaDataType | None = None
     ) -> BackendFormatted:
         """Return a backend formatted representation of a value.
 
@@ -1325,7 +1328,7 @@ def _get_from_backend(self, key: KeyType) -> CacheReturnType:
             return cast(CacheReturnType, self.backend.get(key))
 
     def _get_multi_from_backend(
-        self, keys: Sequence[KeyType]
+        self, keys: Iterable[KeyType]
     ) -> Sequence[CacheReturnType]:
         if self.deserializer:
             return [
@@ -1423,7 +1426,7 @@ def delete(self, key: KeyType) -> None:
 
         self.backend.delete(key)
 
-    def delete_multi(self, keys: Sequence[KeyType]) -> None:
+    def delete_multi(self, keys: Iterable[KeyType]) -> None:
         """Remove multiple values from the cache.
 
         This operation is idempotent (can be called multiple times, or on a
@@ -1441,11 +1444,11 @@ def delete_multi(self, keys: Sequence[KeyType]) -> None:
 
     def cache_on_arguments(
         self,
-        namespace: Optional[str] = None,
-        expiration_time: Union[float, ExpirationTimeCallable, None] = None,
-        should_cache_fn: Optional[Callable[[ValuePayload], bool]] = None,
+        namespace: str | None = None,
+        expiration_time: float | ExpirationTimeCallable | None = None,
+        should_cache_fn: Callable[[ValuePayload], bool] | None = None,
         to_str: Callable[[Any], str] = str,
-        function_key_generator: Optional[FunctionKeyGenerator] = None,
+        function_key_generator: FunctionKeyGenerator | None = None,
     ) -> Callable[[Callable[..., ValuePayload]], Callable[..., ValuePayload]]:
         """A function decorator that will cache the return
         value of the function using a key derived from the
@@ -1626,10 +1629,10 @@ def somemethod(self, x, y):
         def get_or_create_for_user_func(key_generator, user_func, *arg, **kw):
             key = key_generator(*arg, **kw)
 
-            timeout: Optional[float] = (
+            timeout: float | None = (
                 cast(ExpirationTimeCallable, expiration_time)()
                 if expiration_time_is_callable
-                else cast(Optional[float], expiration_time)
+                else cast(float | None, expiration_time)
             )
             return self.get_or_create(
                 key, user_func, timeout, should_cache_fn, (arg, kw)
@@ -1638,9 +1641,7 @@ def get_or_create_for_user_func(key_generator, user_func, *arg, **kw):
         def cache_decorator(user_func):
             if to_str is cast(Callable[[Any], str], str):
                 # backwards compatible
-                key_generator = _function_key_generator(
-                    namespace, user_func
-                )  # type: ignore
+                key_generator = _function_key_generator(namespace, user_func)
             else:
                 key_generator = _function_key_generator(
                     namespace, user_func, to_str
@@ -1683,19 +1684,15 @@ def get(*arg, **kw):
 
     def cache_multi_on_arguments(
         self,
-        namespace: Optional[str] = None,
-        expiration_time: Union[float, ExpirationTimeCallable, None] = None,
-        should_cache_fn: Optional[Callable[[ValuePayload], bool]] = None,
+        namespace: str | None = None,
+        expiration_time: float | ExpirationTimeCallable | None = None,
+        should_cache_fn: Callable[[ValuePayload], bool] | None = None,
         asdict: bool = False,
         to_str: ToStr = str,
-        function_multi_key_generator: Optional[
-            FunctionMultiKeyGenerator
-        ] = None,
+        function_multi_key_generator: FunctionMultiKeyGenerator | None = None,
     ) -> Callable[
         [Callable[..., Sequence[ValuePayload]]],
-        Callable[
-            ..., Union[Sequence[ValuePayload], Mapping[KeyType, ValuePayload]]
-        ],
+        Callable[..., Sequence[ValuePayload] | Mapping[KeyType, ValuePayload]],
     ]:
         """A function decorator that will cache multiple return
         values from the function using a sequence of keys derived from the
@@ -1825,7 +1822,7 @@ def get_or_create_for_user_func(
             user_func: Callable[..., Sequence[ValuePayload]],
             *arg: Any,
             **kw: Any,
-        ) -> Union[Sequence[ValuePayload], Mapping[KeyType, ValuePayload]]:
+        ) -> Sequence[ValuePayload] | Mapping[KeyType, ValuePayload]:
             cache_keys = arg
             keys = key_generator(*arg, **kw)
             key_lookup = dict(zip(keys, cache_keys))
@@ -1834,15 +1831,13 @@ def get_or_create_for_user_func(
             def creator(*keys_to_create):
                 return user_func(*[key_lookup[k] for k in keys_to_create])
 
-            timeout: Optional[float] = (
+            timeout: float | None = (
                 cast(ExpirationTimeCallable, expiration_time)()
                 if expiration_time_is_callable
-                else cast(Optional[float], expiration_time)
+                else cast(float | None, expiration_time)
             )
 
-            result: Union[
-                Sequence[ValuePayload], Mapping[KeyType, ValuePayload]
-            ]
+            result: Sequence[ValuePayload] | Mapping[KeyType, ValuePayload]
 
             if asdict:
 
diff --git a/libs/dogpile/cache/util.py b/libs/dogpile/cache/util.py
index 7fddaa500e..e361d67764 100644
--- a/libs/dogpile/cache/util.py
+++ b/libs/dogpile/cache/util.py
@@ -1,10 +1,17 @@
+from __future__ import annotations
+
+from collections.abc import Callable
+from collections.abc import Iterable
 from hashlib import sha1
+from typing import Any
 
 from ..util import compat
 from ..util import langhelpers
 
 
-def function_key_generator(namespace, fn, to_str=str):
+def function_key_generator(
+    namespace: str, fn: Callable[..., Any], to_str: Callable[[Any], str] = str
+) -> Callable[..., str]:
     """Return a function that generates a string
     key, based on a given function as well as
     arguments to the returned function itself.
@@ -45,7 +52,9 @@ def generate_key(*args, **kw):
     return generate_key
 
 
-def function_multi_key_generator(namespace, fn, to_str=str):
+def function_multi_key_generator(
+    namespace: str, fn: Callable[..., Any], to_str: Callable[[Any], str] = str
+) -> Callable[..., list[str]]:
     if namespace is None:
         namespace = "%s:%s" % (fn.__module__, fn.__name__)
     else:
@@ -67,7 +76,9 @@ def generate_keys(*args, **kw):
     return generate_keys
 
 
-def kwarg_function_key_generator(namespace, fn, to_str=str):
+def kwarg_function_key_generator(
+    namespace: str, fn: Callable[..., Any], to_str: Callable[[Any], str] = str
+) -> Callable[..., str]:
     """Return a function that generates a string
     key, based on a given function as well as
     arguments to the returned function itself.
@@ -127,22 +138,23 @@ def generate_key(*args, **kwargs):
     return generate_key
 
 
-def sha1_mangle_key(key):
+def sha1_mangle_key(key: str | bytes) -> str:
     """a SHA1 key mangler."""
 
-    if isinstance(key, str):
-        key = key.encode("utf-8")
-
-    return sha1(key).hexdigest()
+    return sha1(
+        key.encode("utf-8") if isinstance(key, str) else key
+    ).hexdigest()
 
 
-def length_conditional_mangler(length, mangler):
+def length_conditional_mangler(
+    length: int, mangler: Callable[[str], str]
+) -> Callable[[str], str]:
     """a key mangler that mangles if the length of the key is
     past a certain threshold.
 
     """
 
-    def mangle(key):
+    def mangle(key: str) -> str:
         if len(key) >= length:
             return mangler(key)
         else:
@@ -164,14 +176,16 @@ def mangle(key):
 class repr_obj:
     __slots__ = ("value", "max_chars")
 
-    def __init__(self, value, max_chars=300):
+    def __init__(self, value: Iterable[str], max_chars: int = 300) -> None:
         self.value = value
         self.max_chars = max_chars
 
-    def __eq__(self, other):
-        return other.value == self.value
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, repr_obj):
+            return NotImplemented
+        return bool(other.value == self.value)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         rep = repr(self.value)
         lenrep = len(rep)
         if lenrep > self.max_chars:
diff --git a/libs/dogpile/testing/fixtures.py b/libs/dogpile/testing/fixtures.py
index 3c364a46cb..4dff69fd5b 100644
--- a/libs/dogpile/testing/fixtures.py
+++ b/libs/dogpile/testing/fixtures.py
@@ -50,9 +50,11 @@ def teardown_method(self, method):
     def _check_backend_available(cls, backend):
         pass
 
+    backend: str
     region_args = {}
     config_args = {}
     extra_arguments = {}
+    backend_argument_names = ()
 
     _region_inst = None
     _backend_inst = None
@@ -398,6 +400,33 @@ def boom():
             Exception, "boom", reg.get_or_create, some_key, boom
         )
 
+    def test_argument_dictionary_unmodified(self):
+        fixed_arg_names = getattr(self, "backend_argument_names", None)
+
+        backend_arguments = {}
+        if not fixed_arg_names:
+            backend_arguments.update(self.config_args["arguments"])
+        else:
+            backend_arguments.update(
+                {key: "somevalue" for key in self.backend_argument_names}
+            )
+
+        assert backend_arguments, (
+            "suite has no config_args['arguments'] and no "
+            "backend_argument_names attribute I can use to generate an "
+            "arg dict"
+        )
+
+        backend_arguments.update(
+            {"arbitrary_arg_one": "foo", "arbitrary_arg_two": "bar"}
+        )
+        argument_dict_copy = dict(backend_arguments)
+
+        region = CacheRegion()
+        region.configure(self.backend, arguments=backend_arguments)
+
+        eq_(backend_arguments, argument_dict_copy)
+
 
 def raise_cant_deserialize_exception(v):
     raise CantDeserializeException()
diff --git a/libs/dogpile/util/__init__.py b/libs/dogpile/util/__init__.py
index 77d65ff403..dc5f408ca1 100644
--- a/libs/dogpile/util/__init__.py
+++ b/libs/dogpile/util/__init__.py
@@ -1,7 +1,17 @@
-from .langhelpers import coerce_string_conf  # noqa
-from .langhelpers import KeyReentrantMutex  # noqa
-from .langhelpers import memoized_property  # noqa
-from .langhelpers import PluginLoader  # noqa
-from .langhelpers import to_list  # noqa
-from .nameregistry import NameRegistry  # noqa
-from .readwrite_lock import ReadWriteMutex  # noqa
+from .langhelpers import coerce_string_conf
+from .langhelpers import KeyReentrantMutex
+from .langhelpers import memoized_property
+from .langhelpers import PluginLoader
+from .langhelpers import to_list
+from .nameregistry import NameRegistry
+from .readwrite_lock import ReadWriteMutex
+
+__all__ = [
+    "coerce_string_conf",
+    "KeyReentrantMutex",
+    "memoized_property",
+    "PluginLoader",
+    "to_list",
+    "NameRegistry",
+    "ReadWriteMutex",
+]
diff --git a/libs/dogpile/util/langhelpers.py b/libs/dogpile/util/langhelpers.py
index a59b24ef42..b5317052c6 100644
--- a/libs/dogpile/util/langhelpers.py
+++ b/libs/dogpile/util/langhelpers.py
@@ -1,9 +1,9 @@
 import abc
 import collections
+from collections.abc import MutableMapping
+from collections.abc import MutableSet
 import re
 import threading
-from typing import MutableMapping
-from typing import MutableSet
 
 import stevedore
 
@@ -115,9 +115,9 @@ def factory(cls, mutex):
         # this collection holds zero or one
         # thread idents as the key; a set of
         # keynames held as the value.
-        keystore: MutableMapping[
-            int, MutableSet[str]
-        ] = collections.defaultdict(set)
+        keystore: MutableMapping[int, MutableSet[str]] = (
+            collections.defaultdict(set)
+        )
 
         def fac(key):
             return KeyReentrantMutex(key, mutex, keystore)
diff --git a/libs/dogpile/util/nameregistry.py b/libs/dogpile/util/nameregistry.py
index 3c4cc0229d..9277a6ff12 100644
--- a/libs/dogpile/util/nameregistry.py
+++ b/libs/dogpile/util/nameregistry.py
@@ -1,7 +1,7 @@
+from collections.abc import Callable
+from collections.abc import MutableMapping
 import threading
 from typing import Any
-from typing import Callable
-from typing import MutableMapping
 import weakref
 
 
diff --git a/libs/dogpile/util/typing.py b/libs/dogpile/util/typing.py
index 218c42945a..c79b6b751f 100644
--- a/libs/dogpile/util/typing.py
+++ b/libs/dogpile/util/typing.py
@@ -4,3 +4,7 @@
     from typing import Self
 else:
     from typing_extensions import Self  # noqa: F401
+
+__all__ = [
+    "Self",
+]
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/INSTALLER b/libs/dogpile_cache-1.5.0.dist-info/INSTALLER
similarity index 100%
rename from libs/backports.functools_lru_cache-2.0.0.dist-info/INSTALLER
rename to libs/dogpile_cache-1.5.0.dist-info/INSTALLER
diff --git a/libs/dogpile_cache-1.5.0.dist-info/METADATA b/libs/dogpile_cache-1.5.0.dist-info/METADATA
new file mode 100644
index 0000000000..b56c9c274e
--- /dev/null
+++ b/libs/dogpile_cache-1.5.0.dist-info/METADATA
@@ -0,0 +1,128 @@
+Metadata-Version: 2.4
+Name: dogpile.cache
+Version: 1.5.0
+Summary: A caching front-end based on the Dogpile lock.
+Author-email: Mike Bayer <mike_mp@zzzcomputing.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/sqlalchemy/dogpile.cache
+Project-URL: Documentation, https://dogpilecache.sqlalchemy.org
+Project-URL: Issue Tracker, https://github.com/sqlalchemy/dogpile.cache/
+Keywords: caching
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: decorator>=4.0.0
+Requires-Dist: stevedore>=3.0.0
+Requires-Dist: typing_extensions>=4.0.1; python_version < "3.11"
+Provides-Extra: pifpaf
+Requires-Dist: pifpaf>=3.3.0; extra == "pifpaf"
+Provides-Extra: pymemcache
+Requires-Dist: pymemcache; extra == "pymemcache"
+Provides-Extra: memcached
+Requires-Dist: python-memcached; extra == "memcached"
+Provides-Extra: bmemcached
+Requires-Dist: python-binary-memcached; extra == "bmemcached"
+Provides-Extra: pylibmc
+Requires-Dist: pylibmc; extra == "pylibmc"
+Provides-Extra: redis
+Requires-Dist: redis; extra == "redis"
+Provides-Extra: valkey
+Requires-Dist: valkey; extra == "valkey"
+Dynamic: license-file
+
+dogpile
+=======
+
+Dogpile consists of two subsystems, one building on top of the other.
+
+``dogpile`` provides the concept of a "dogpile lock", a control structure
+which allows a single thread of execution to be selected as the "creator" of
+some resource, while allowing other threads of execution to refer to the previous
+version of this resource as the creation proceeds; if there is no previous
+version, then those threads block until the object is available.
+
+``dogpile.cache`` is a caching API which provides a generic interface to
+caching backends of any variety, and additionally provides API hooks which
+integrate these cache backends with the locking mechanism of ``dogpile``.
+
+Overall, dogpile.cache is intended as a replacement to the `Beaker
+<https://pypi.org/project/Beaker/>`_ caching system, the internals of which are
+written by the same author.   All the ideas of Beaker which "work" are re-
+implemented in dogpile.cache in a more efficient and succinct manner, and all
+the cruft (Beaker's internals were first written in 2005) relegated to the
+trash heap.
+
+Documentation
+-------------
+
+See dogpile.cache's full documentation at
+`dogpile.cache documentation <https://dogpilecache.sqlalchemy.org>`_.  The
+sections below provide a brief synopsis of the ``dogpile`` packages.
+
+Features
+--------
+
+* A succinct API which encourages up-front configuration of pre-defined
+  "regions", each one defining a set of caching characteristics including
+  storage backend, configuration options, and default expiration time.
+* A standard get/set/delete API as well as a function decorator API is
+  provided.
+* The mechanics of key generation are fully customizable.   The function
+  decorator API features a pluggable "key generator" to customize how
+  cache keys are made to correspond to function calls, and an optional
+  "key mangler" feature provides for pluggable mangling of keys
+  (such as encoding, SHA-1 hashing) as desired for each region.
+* The dogpile lock, first developed as the core engine behind the Beaker
+  caching system, here vastly simplified, improved, and better tested.
+  Some key performance
+  issues that were intrinsic to Beaker's architecture, particularly that
+  values would frequently be "double-fetched" from the cache, have been fixed.
+* Backends implement their own version of a "distributed" lock, where the
+  "distribution" matches the backend's storage system.  For example, the
+  memcached backends allow all clients to coordinate creation of values
+  using memcached itself.   The dbm file backend uses a lockfile
+  alongside the dbm file.  New backends, such as a Redis-based backend,
+  can provide their own locking mechanism appropriate to the storage
+  engine.
+* Writing new backends or hacking on the existing backends is intended to be
+  routine - all that's needed are basic get/set/delete methods. A distributed
+  lock tailored towards the backend is an optional addition, else dogpile uses
+  a regular thread mutex. New backends can be registered with dogpile.cache
+  directly or made available via setuptools entry points.
+* Included backends feature three memcached backends (python-memcached, pylibmc,
+  bmemcached), a Redis backend, a backend based on Python's
+  anydbm, and a plain dictionary backend.
+* Space for third party plugins, including one which provides the
+  dogpile.cache engine to Mako templates.
+
+
+The SQLAlchemy Project
+----------------------
+
+Dogpile is part of the `SQLAlchemy Project <https://www.sqlalchemy.org>`_ and
+adheres to the same standards and conventions as the core project.
+
+Development / Bug reporting / Pull requests
+___________________________________________
+
+Please refer to the
+`SQLAlchemy Community Guide <https://www.sqlalchemy.org/develop.html>`_ for
+guidelines on coding and participating in this project.
+
+Code of Conduct
+_______________
+
+Above all, SQLAlchemy places great emphasis on polite, thoughtful, and
+constructive communication between users and developers.
+Please see our current Code of Conduct at
+`Code of Conduct <https://www.sqlalchemy.org/codeofconduct.html>`_.
+
+License
+-------
+
+Dogpile is distributed under the `MIT license
+<https://opensource.org/licenses/MIT>`_.
diff --git a/libs/dogpile_cache-1.5.0.dist-info/RECORD b/libs/dogpile_cache-1.5.0.dist-info/RECORD
new file mode 100644
index 0000000000..259bd973c9
--- /dev/null
+++ b/libs/dogpile_cache-1.5.0.dist-info/RECORD
@@ -0,0 +1,36 @@
+dogpile/__init__.py,sha256=cFA9Ywwk-qzvAsQt8iPbM-pCrsJy-4cbu3Ee8Tdb1kE,169
+dogpile/cache/__init__.py,sha256=XJSqrhVTUkeuZxuLP8jROkD6bDA8rK2QIskK5JSq3lY,246
+dogpile/cache/api.py,sha256=0bBswWnXq7uWBOXDnb5OnNWlRVPDUYT991fWDDHlwU4,17926
+dogpile/cache/backends/__init__.py,sha256=WHQG3jhKQQ_D-JBQA0_WTP847e4VcWVKCJq-gJKm8f0,1656
+dogpile/cache/backends/file.py,sha256=8ZNqQOOec-1MhPB7Z6IoH6ra47P-JdQNO9nN351WYNc,13710
+dogpile/cache/backends/memcached.py,sha256=897MLRwBJKTRe9X9yJfZ0fnlvzh024HEAcOVBSqoTTw,21561
+dogpile/cache/backends/memory.py,sha256=UQtGunE6a1jVIA3UwW5i8Z8W7p1sgJnVhWFwcUfcQCo,3029
+dogpile/cache/backends/null.py,sha256=DzZXHt64alfYuYP_Ei322I2D-mZMpT-Y_zzLF1pXd74,1167
+dogpile/cache/backends/redis.py,sha256=z2gjKDsB-Wgd-d7pv0F6amO97pyqg_jT_xwcI938W-4,21669
+dogpile/cache/backends/valkey.py,sha256=8UhKKGGMozllivZjrzxBEjE2RzZqelzwNUHSSKn3qss,21777
+dogpile/cache/exception.py,sha256=8XDELddxVqj0fthUYpPaX85QfEQqdsP23e_7bQFC0Us,601
+dogpile/cache/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dogpile/cache/plugins/mako_cache.py,sha256=omlFyTabuUGIKmW9KbNIq0h3VpQ_OAsGGETU1rDJuN4,2987
+dogpile/cache/proxy.py,sha256=Q_WAdivuFXBhbrMM-6w-zmbfw_XoZzAPeJ5BjSBRQ2c,3987
+dogpile/cache/region.py,sha256=JmWr6guWp2gzekWf278XiSD80lY8ocZFKKdwKu47AtQ,69926
+dogpile/cache/util.py,sha256=Jyz_s9WfRWb_U6g9gbX1TBhWib172ZZQ96jnEEsnFAU,6011
+dogpile/core.py,sha256=2ojPK5ASUk9QQFH4pUQObQSwqhAKoocRlhlo4jskFGY,565
+dogpile/lock.py,sha256=zXMtrnUBTGkTgsWYAmENCtT_Zifgrnz62t7Iwe9_qUA,7077
+dogpile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dogpile/testing/__init__.py,sha256=pfpf0xAmjNFwhQ3p6KwRVUMTgwqaI0zi-cwqfwApypM,221
+dogpile/testing/assertions.py,sha256=9a90onA-7yRH1ctouugSV_VsY6auyDzSy7kxrpTmH0s,870
+dogpile/testing/fixtures.py,sha256=o31vTPnJpAhrf6QRD5acFMK5X6hGNdPwzOHEhg95dmg,18335
+dogpile/util/__init__.py,sha256=yXNuoF66LodOproGyb2TZHKuz57tpB1s7DcRIb6oPOo,451
+dogpile/util/compat.py,sha256=F1vOV7Ib7dXXSXK6_lyQ0v8YQvH00wzhHg8pA_hcflk,1735
+dogpile/util/langhelpers.py,sha256=Ti9WLOXSD6tFHxSqssDF1L0AGIme9Lvcz4vaQEARQtQ,4499
+dogpile/util/nameregistry.py,sha256=V4kzFdvbnldE8rDRRjtLP0vGBbO0uj8hhvbbNTpkNT8,2819
+dogpile/util/readwrite_lock.py,sha256=Z4WM14gOS6IuvD2U5DQgUOzRDSfvAPEVkupmqpgwGQg,4532
+dogpile/util/typing.py,sha256=INRpRpTZWnwRZSy48b96whdHpKgoR3X-h1QMc7q5nbA,158
+dogpile_cache-1.5.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+dogpile_cache-1.5.0.dist-info/METADATA,sha256=P4_XW9saVwQnUK-ugvXx9HG3XhwZeJohFsNToAURka4,5521
+dogpile_cache-1.5.0.dist-info/RECORD,,
+dogpile_cache-1.5.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dogpile_cache-1.5.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dogpile_cache-1.5.0.dist-info/entry_points.txt,sha256=9_62qgwpYf1Kp06LazdG2FNgaJQiUTUGBn-Fl0URfq4,73
+dogpile_cache-1.5.0.dist-info/licenses/LICENSE,sha256=G9hi_rB7rZyjzpIsokLjRVddqkVd9YXjAFafpg9aYUo,1059
+dogpile_cache-1.5.0.dist-info/top_level.txt,sha256=XGYQHt1p8HLN4sRU6sGpQBA2GMTZQbPwHX5A1PUENgk,8
diff --git a/libs/backports.functools_lru_cache-2.0.0.dist-info/REQUESTED b/libs/dogpile_cache-1.5.0.dist-info/REQUESTED
similarity index 100%
rename from libs/backports.functools_lru_cache-2.0.0.dist-info/REQUESTED
rename to libs/dogpile_cache-1.5.0.dist-info/REQUESTED
diff --git a/libs/dogpile_cache-1.5.0.dist-info/WHEEL b/libs/dogpile_cache-1.5.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/dogpile_cache-1.5.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/dogpile.cache-1.3.3.dist-info/entry_points.txt b/libs/dogpile_cache-1.5.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/dogpile.cache-1.3.3.dist-info/entry_points.txt
rename to libs/dogpile_cache-1.5.0.dist-info/entry_points.txt
diff --git a/libs/dogpile_cache-1.5.0.dist-info/licenses/LICENSE b/libs/dogpile_cache-1.5.0.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..d376cce8e6
--- /dev/null
+++ b/libs/dogpile_cache-1.5.0.dist-info/licenses/LICENSE
@@ -0,0 +1,19 @@
+Copyright 2005-2025 Michael Bayer.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/dogpile.cache-1.3.3.dist-info/top_level.txt b/libs/dogpile_cache-1.5.0.dist-info/top_level.txt
similarity index 100%
rename from libs/dogpile.cache-1.3.3.dist-info/top_level.txt
rename to libs/dogpile_cache-1.5.0.dist-info/top_level.txt
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/INSTALLER b/libs/dynaconf-3.2.12.dist-info/INSTALLER
similarity index 100%
rename from libs/backports.zoneinfo-0.2.1.dist-info/INSTALLER
rename to libs/dynaconf-3.2.12.dist-info/INSTALLER
diff --git a/libs/dynaconf-3.2.12.dist-info/METADATA b/libs/dynaconf-3.2.12.dist-info/METADATA
new file mode 100644
index 0000000000..f2dd83d860
--- /dev/null
+++ b/libs/dynaconf-3.2.12.dist-info/METADATA
@@ -0,0 +1,218 @@
+Metadata-Version: 2.4
+Name: dynaconf
+Version: 3.2.12
+Summary: The dynamic configurator for your Python Project
+Home-page: https://github.com/dynaconf/dynaconf
+Author: Bruno Rocha
+Author-email: rochacbruno@gmail.com
+License: MIT
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Framework :: Django
+Classifier: Framework :: Flask
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Utilities
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+License-File: vendor_licenses/box-LICENSE.txt
+License-File: vendor_licenses/click-LICENSE.rst
+License-File: vendor_licenses/licenses.sh
+License-File: vendor_licenses/python-dotenv-LICENSE.txt
+License-File: vendor_licenses/ruamel.yaml-LICENSE.txt
+License-File: vendor_licenses/toml-LICENSE.txt
+License-File: vendor_licenses/tomli-LICENSE.txt
+License-File: vendor_licenses/vendor_versions.txt
+Provides-Extra: redis
+Requires-Dist: redis; extra == "redis"
+Provides-Extra: vault
+Requires-Dist: hvac; extra == "vault"
+Provides-Extra: yaml
+Requires-Dist: ruamel.yaml; extra == "yaml"
+Provides-Extra: toml
+Requires-Dist: toml; extra == "toml"
+Provides-Extra: ini
+Requires-Dist: configobj; extra == "ini"
+Provides-Extra: configobj
+Requires-Dist: configobj; extra == "configobj"
+Provides-Extra: all
+Requires-Dist: redis; extra == "all"
+Requires-Dist: ruamel.yaml; extra == "all"
+Requires-Dist: configobj; extra == "all"
+Requires-Dist: hvac; extra == "all"
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
+Requires-Dist: radon; extra == "test"
+Requires-Dist: flask>=0.12; extra == "test"
+Requires-Dist: django; extra == "test"
+Requires-Dist: python-dotenv; extra == "test"
+Requires-Dist: toml; extra == "test"
+Requires-Dist: redis; extra == "test"
+Requires-Dist: hvac>=1.1.0; extra == "test"
+Requires-Dist: configobj; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: provides-extra
+Dynamic: requires-python
+Dynamic: summary
+
+<!-- [![Dynaconf](docs/img/logo_400.svg?sanitize=true)](http://dynaconf.com) -->
+
+<p align="center"><img src="/art/header.png?v2" alt="dynaconf. new logo"></p>
+
+> **dynaconf** - Configuration Management for Python.
+
+[![MIT License](https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square)](/LICENSE) [![PyPI](https://img.shields.io/pypi/v/dynaconf.svg)](https://pypi.python.org/pypi/dynaconf) [![PyPI](https://img.shields.io/pypi/pyversions/dynaconf.svg)]() ![PyPI - Downloads](https://img.shields.io/pypi/dm/dynaconf.svg?label=pip%20installs&logo=python) [![CI](https://github.com/dynaconf/dynaconf/actions/workflows/main.yml/badge.svg)](https://github.com/dynaconf/dynaconf/actions/workflows/main.yml) [![codecov](https://codecov.io/gh/dynaconf/dynaconf/branch/master/graph/badge.svg)](https://codecov.io/gh/dynaconf/dynaconf) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/3fb2de98464442f99a7663181803b400)](https://www.codacy.com/gh/dynaconf/dynaconf/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=dynaconf/dynaconf&amp;utm_campaign=Badge_Grade)  ![GitHub stars](https://img.shields.io/github/stars/dynaconf/dynaconf.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/dynaconf/dynaconf.svg) ![GitHub commits since latest release](https://img.shields.io/github/commits-since/dynaconf/dynaconf/latest.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/dynaconf/dynaconf.svg) [![Code Style Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black/)
+
+![GitHub issues](https://img.shields.io/github/issues/dynaconf/dynaconf.svg) [![User Forum](https://img.shields.io/badge/users-forum-blue.svg?logo=googlechat)](https://github.com/dynaconf/dynaconf/discussions) [![Join the chat at https://gitter.im/dynaconf/dev](https://badges.gitter.im/dynaconf/dev.svg)](https://gitter.im/dynaconf/dev?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![ Matrix](https://img.shields.io/badge/dev-room-blue.svg?logo=matrix)](https://matrix.to/#/#dynaconf:matrix.org)
+
+## Features
+
+- Inspired by the [12-factor application guide](https://12factor.net/config)
+- Settings management (default values, validation, parsing, templating)
+- Protection of sensitive information (passwords/tokens)
+- Multiple file formats `toml|yaml|json|ini|py` and also customizable loaders.
+- Full support for environment variables to override existing settings (dotenv support included).
+- Optional layered system for multi environments `[default, development, testing, production]`
+- Built-in support for Hashicorp Vault and Redis as settings and secrets storage.
+- Built-in extensions for **Django** and **Flask** web frameworks.
+- CLI for common operations such as `init, list, write, validate, export`.
+- full docs on https://dynaconf.com
+
+### Install
+
+```bash
+$ pip install dynaconf
+```
+
+#### Initialize Dynaconf on project root directory
+
+```plain
+$ cd path/to/your/project/
+
+$ dynaconf init -f toml
+
+โš™๏ธ  Configuring your Dynaconf environment
+------------------------------------------
+๐Ÿ The file `config.py` was generated.
+
+๐ŸŽ›๏ธ  settings.toml created to hold your settings.
+
+๐Ÿ”‘ .secrets.toml created to hold your secrets.
+
+๐Ÿ™ˆ the .secrets.* is also included in `.gitignore`
+  beware to not push your secrets to a public repo.
+
+๐ŸŽ‰ Dynaconf is configured! read more on https://dynaconf.com
+```
+
+> **TIP:** You can select `toml|yaml|json|ini|py` on `dynaconf init -f <fileformat>`  **toml** is the default and also the most recommended format for configuration.
+
+#### Dynaconf init creates the following files
+
+```plain
+.
+โ”œโ”€โ”€ config.py       # This is from where you import your settings object (required)
+โ”œโ”€โ”€ .secrets.toml   # This is to hold sensitive data like passwords and tokens (optional)
+โ””โ”€โ”€ settings.toml   # This is to hold your application settings (optional)
+```
+
+On the file `config.py` Dynaconf init generates the following boilerpate
+
+```py
+from dynaconf import Dynaconf
+
+settings = Dynaconf(
+    envvar_prefix="DYNACONF",  # export envvars with `export DYNACONF_FOO=bar`.
+    settings_files=['settings.yaml', '.secrets.yaml'],  # Load files in the given order.
+)
+```
+
+> **TIP:** You can create the files yourself instead of using the `init` command as shown above and you can give any name you want instead of the default `config.py` (the file must be in your importable python path) - See more options that you can pass to `Dynaconf` class initializer on https://dynaconf.com
+
+
+#### Using Dynaconf
+
+Put your settings on `settings.{toml|yaml|ini|json|py}`
+
+```toml
+username = "admin"
+port = 5555
+database = {name='mydb', schema='main'}
+```
+
+Put sensitive information on `.secrets.{toml|yaml|ini|json|py}`
+
+```toml
+password = "secret123"
+```
+
+> **IMPORTANT:** `dynaconf init` command puts the `.secrets.*` in your `.gitignore` to avoid it to be exposed on public repos but it is your responsibility to keep it safe in your local environment, also the recommendation for production environments is to use the built-in support for Hashicorp Vault service for password and tokens.
+
+
+Optionally you can now use environment variables to override values per execution or per environment.
+
+```bash
+# override `port` from settings.toml file and automatically casts as `int` value.
+export DYNACONF_PORT=9900
+```
+
+
+On your code import the `settings` object
+
+```py
+from path.to.project.config import settings
+
+# Reading the settings
+
+settings.username == "admin"  # dot notation with multi nesting support
+settings.PORT == 9900  # case insensitive
+settings['password'] == "secret123"  # dict like access
+settings.get("nonexisting", "default value")  # Default values just like a dict
+settings.databases.name == "mydb"  # Nested key traversing
+settings['databases.schema'] == "main"  # Nested key traversing
+```
+
+## More
+
+- Settings Schema Validation
+- Custom Settings Loaders
+- Vault Services
+- Template substitutions
+- etc...
+
+There is a lot more you can do, **read the docs:** http://dynaconf.com
+
+## Contribute
+
+Main discussions happens on [Discussions Tab](https://github.com/dynaconf/dynaconf/discussions) learn more about how to get involved on [CONTRIBUTING.md guide](CONTRIBUTING.md)
+
+## More
+
+If you are looking for something similar to Dynaconf to use in your Rust projects: https://github.com/rubik/hydroconf
+
+And a special thanks to [Caneco](https://twitter.com/caneco) for the logo.
diff --git a/libs/dynaconf-3.2.12.dist-info/RECORD b/libs/dynaconf-3.2.12.dist-info/RECORD
new file mode 100644
index 0000000000..3469fd15a7
--- /dev/null
+++ b/libs/dynaconf-3.2.12.dist-info/RECORD
@@ -0,0 +1,124 @@
+../../bin/dynaconf,sha256=-FSvOwTY9houenFaB1kKxmC7_yfhsPPKTAUuSoRkBAs,187
+dynaconf-3.2.12.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+dynaconf-3.2.12.dist-info/METADATA,sha256=OjXoZS_xFMmNCGCwapQFBCtr9aHNIQjLVbPtTi7PI4U,9417
+dynaconf-3.2.12.dist-info/RECORD,,
+dynaconf-3.2.12.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dynaconf-3.2.12.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+dynaconf-3.2.12.dist-info/entry_points.txt,sha256=olhFwb2rJswbRmjY97fTrkNfqPQhMv1Pxjez4mSxMSg,47
+dynaconf-3.2.12.dist-info/licenses/LICENSE,sha256=VXHf05Hz7uwTdLkQEFy4s7L4cb3mJ6Jc6yvoRPCg65c,1078
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/box-LICENSE.txt,sha256=OA9QtZRAYGpaFevuHWrHckHw0fQT4yhurfH56sJYDqw,1076
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/click-LICENSE.rst,sha256=morRBqOU6FO_4h9C9OctWSgZoigF2ZG18ydQKSkrZY0,1475
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/licenses.sh,sha256=9eID6RHwv82Obub4D4G--lIbRZya65Fa9EwgYNWXvFU,769
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/python-dotenv-LICENSE.txt,sha256=0nIJqz0WJ4Ko-OOHK5s1PEngksmqRnpkUiiDQH2NEDA,4600
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/ruamel.yaml-LICENSE.txt,sha256=QYxdb3JocDuWY6zvk3rVKcVO47J-9miiolkf4w6hH_8,1121
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/toml-LICENSE.txt,sha256=QitPoBx3Vs5N5go556B0Zf3Mz4YGxWeUiRYa9C1EGMg,1253
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/tomli-LICENSE.txt,sha256=uAgWsNUwuKzLTCIReDeQmEpuO2GSLCte6S8zcqsnQv4,1072
+dynaconf-3.2.12.dist-info/licenses/vendor_licenses/vendor_versions.txt,sha256=QD2pB7JBhr6oIGaPCXFVhhFfs2uQibsJXBT9cUYlgHQ,100
+dynaconf-3.2.12.dist-info/top_level.txt,sha256=y9G5RO-Ts5h0yOx6qVr8r_TBCSFA8wBxEWcvMZJq66c,9
+dynaconf/VERSION,sha256=AuldHXhefHbKIRCWuFMfRmLBkXSPxKYcrh6Ug_vsoRc,7
+dynaconf/__init__.py,sha256=XRctNsCYmSFUvmZHU3Cz4BLV3YbxSiXvwq9MB1M41pI,1277
+dynaconf/__main__.py,sha256=mHeEO4Ae_9Ams2xunnHknpHKOUoHpUuRNv2jQCKnojA,105
+dynaconf/base.py,sha256=oOkTOzO2bG3F0IDpNwJRN3y6d9FUyePee4g1pqnV8MM,53310
+dynaconf/cli.py,sha256=_zJlB3fM2V76HvaRzYlivSDiPsDQto-wAaTNifgEzM0,28447
+dynaconf/constants.py,sha256=DKUWa2XfcyqA-TpbfLBnpkwMF9rjAr86P_GrB8PbR1Y,1259
+dynaconf/contrib/__init__.py,sha256=kyYhXVPeWZL-zeMFGqbal4f3U0-B6ktLK7-IEOetgP8,216
+dynaconf/contrib/django_dynaconf_v2.py,sha256=FcdbU-PLUxUaXZkVIDP09no8xuPZ-axY5RjooYaeWC8,4699
+dynaconf/contrib/flask_dynaconf.py,sha256=l1lT1D51clnya-SJ0qWk_g7NQTzf2kcCn_wE7zu4V14,7567
+dynaconf/default_settings.py,sha256=vYK7BwRHHMuGIXJmdare4mVl6f6OHo71i1U5Htx54Ss,9846
+dynaconf/hooking.py,sha256=J5XZdXhoveA1Tv0-WFBYypHjc2wU5vGJ96ulLUVurwI,11158
+dynaconf/loaders/__init__.py,sha256=KZvfUAEz6rWLRKVbmD1y2ZIGrmQRr7YqGxC3DuAb_XI,14480
+dynaconf/loaders/base.py,sha256=fTwUMgDOAMVet94lf86uB7btIwPyIyPh3gEyjiZcoEo,8317
+dynaconf/loaders/env_loader.py,sha256=ekOt5cXcE4OTF64EULDs1V6UULX7G42qvf4FsYuZI98,4530
+dynaconf/loaders/ini_loader.py,sha256=blt-jj728DVc28nOk12ymELLBn9U2AsTNQ6-kzOBTn4,2269
+dynaconf/loaders/json_loader.py,sha256=ldjSEQgcMIMtltP0rQyjJ793g92cKBQAsMmg7sGyRPg,2733
+dynaconf/loaders/py_loader.py,sha256=4QFQP4Vr4WV5Ick4jlTwetBRtro4QaCi7ccLGK-d6Ck,6494
+dynaconf/loaders/redis_loader.py,sha256=Km5THGgkz4GJsmDLqbHmReN8o3h9dL-ER0esXlQRPjI,4106
+dynaconf/loaders/toml_loader.py,sha256=AG5m95sRjDNd-MlmTFYkwRu3cnbrIE_1GhPxE6uCC1c,4629
+dynaconf/loaders/vault_loader.py,sha256=tmFtR-IlCc30jYWSfT227jwxTfga9OMncwzcO8R-OSE,7451
+dynaconf/loaders/yaml_loader.py,sha256=6T9v4Eijd8tsVfIXoO8B79l4GznZknBE2asVeEu0mBE,4645
+dynaconf/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dynaconf/strategies/filtering.py,sha256=2Ezpg7azrEKWFpaCTWS_KytY_NEviySkuVmBv3WgkXg,851
+dynaconf/test_settings.py,sha256=lVkCYSe2yEmCgM_rtB56NibLn1oWrX_8FPaXIdr4JDU,170
+dynaconf/utils/__init__.py,sha256=bJg_ZWWsW_8K4hc3UQPgjsTixIbddDpnGYMb1E9EBNM,17575
+dynaconf/utils/boxing.py,sha256=dFz25RuJxJ0As9CMIpZN6_5zYsGTU-tSF6Hv-rdvYiw,3052
+dynaconf/utils/files.py,sha256=b7VfD9uln2zTnP6hGtXIFfQnxI1YdP0yggGbD5Bf7Sg,4211
+dynaconf/utils/functional.py,sha256=Umiy8J3DO_kFvWtz1Xz5ZFJMdG6RwvutXH656NRJvVA,4582
+dynaconf/utils/inspect.py,sha256=veV3bLbzz_Hjth6LaAnA5iO7iyWIofF_-MQTkJ-VycQ,14854
+dynaconf/utils/parse_conf.py,sha256=9idL7Dyu6NQbksctq--RPAy46o7QhusqeXBd64wPIMY,17519
+dynaconf/validator.py,sha256=nPkV6DnQdtCcNM-HkRw0ogr_snMpKS8Xves8G67TQ7M,18496
+dynaconf/validator_conditions.py,sha256=d3hKJJ6nBKxMWmyghtGsiRArdRwBqhpNt21WKoh81bM,1527
+dynaconf/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dynaconf/vendor/box/__init__.py,sha256=bC6Imy93waRoExHLfaLbHmit0DDc-mXDpCS2Hw2tMWg,262
+dynaconf/vendor/box/box.py,sha256=u1Q5kgtSNGxAtdq0y0bkjbSPGrrbWIISU3LgoWNOET8,14037
+dynaconf/vendor/box/box_list.py,sha256=IbTk4mYGNDJ-hfU4VNtRJ7ZB1h3JCUryaXmBiUb6TEo,5518
+dynaconf/vendor/box/config_box.py,sha256=lDqYuCARqcSnErShBbmKupN3_gSPqbxWEAzdWTIc8g8,1678
+dynaconf/vendor/box/converters.py,sha256=Csx0US57He8FPYdJAu21XTj7oG3QUOhdNAngNqhW7Qg,3192
+dynaconf/vendor/box/exceptions.py,sha256=jQ9isNd1B7a13phZPJsM7V1Ua5DgfJYwTxId2mvALs4,219
+dynaconf/vendor/box/from_file.py,sha256=yOJOnhooyRrz2IIU-BaKvILfpJ0OUpNrf1rV2PFtxjc,1480
+dynaconf/vendor/box/shorthand_box.py,sha256=YuQQJORajUzmPaL-IUG5bqsdSQxipwNGwZH3EhlxCZw,573
+dynaconf/vendor/click/__init__.py,sha256=PDhi9Hye3jtKGSnXzffMuM6ErSrm4XzFEeErQPzSRYo,1912
+dynaconf/vendor/click/_bashcomplete.py,sha256=SnwaY7byw7DM8dyAK5n4yqQQNq9YREhDKlw--B_Xkco,6398
+dynaconf/vendor/click/_compat.py,sha256=fOHAeu9SrTO-kBjyfyTVrNutNBBWMP1lR1UplqF3CT8,9819
+dynaconf/vendor/click/_termui_impl.py,sha256=s5GMIjJenqNY5__lTlTSS-G6fHAADQkx7mgOa5Yf0vs,9565
+dynaconf/vendor/click/_textwrap.py,sha256=e5JSLGSkMx-sVtJZoFqxHQ8GDIB7H2Lu1nWU9HUcN3Y,701
+dynaconf/vendor/click/_unicodefun.py,sha256=uPN8f7SlBvKndwnnXk6EcG1V4iA8iDBIKzJfYF-nByE,1658
+dynaconf/vendor/click/_winconsole.py,sha256=DcMGHEgoMTo_1RvlfbRqZ39tBcC2J9VAADYheOQuvM4,4828
+dynaconf/vendor/click/core.py,sha256=QdwA0xqjIlzGAm_5Sfn--oSIEAOvTjuHZxi5tkqrzRo,25759
+dynaconf/vendor/click/decorators.py,sha256=ME5BDfkLNkvqOs_RQvPCu_kpzBtRkQN5p9pTycqWmOg,8709
+dynaconf/vendor/click/exceptions.py,sha256=WSOYnxqgnFWGJr9Ce1XxKLebIMl3gk6mKrzdE9GR1F0,3291
+dynaconf/vendor/click/formatting.py,sha256=6hKX4R6n9aXYilerb4pTa-izfwCrG6mrijRxGph9GiQ,3375
+dynaconf/vendor/click/globals.py,sha256=0-MQGJpcmq9zRDlf7zjyFYNbu56zdyY4U1JWTnoSJpY,472
+dynaconf/vendor/click/parser.py,sha256=7UvD2-eqk4IkJeYk2v18UqIw1jBeaAPY8YTkl0oOZB4,5712
+dynaconf/vendor/click/termui.py,sha256=Ch5NoaNVdA67-wJb-Z2YudDxO9fAj77ZpRR_pAHCfJs,5767
+dynaconf/vendor/click/testing.py,sha256=2lJD83BNuRhp52D4sCg9QhJPCdItC8znfReHWecAK2M,4559
+dynaconf/vendor/click/types.py,sha256=3mBU5ik7zvsHvLhNj0hgxFVfL0hMLFuIEnm2fc4knLM,8990
+dynaconf/vendor/click/utils.py,sha256=JOupNs_GTrtGXQB5KwRKN3Vv6mYXh2bffNMU8bQAe3k,4355
+dynaconf/vendor/dotenv/__init__.py,sha256=ngw0zLKjRUqyJG0lKLPhMxF26mDdD1FJxPb594a3dR4,698
+dynaconf/vendor/dotenv/cli.py,sha256=abikHBD4AO0HWt1Qq88hoSE_rz81UninCM6a0cdRxfQ,2280
+dynaconf/vendor/dotenv/compat.py,sha256=s9MGbIYLfQBrEzJR7WosWJDpopzF0LHTn9NXIzO_x1U,473
+dynaconf/vendor/dotenv/ipython.py,sha256=5GD9HWTVkREtXRgV3I5s1l4kvzAuUOLRv6Db2QsQ2So,908
+dynaconf/vendor/dotenv/main.py,sha256=9OLTtKuHSJ3G6hcP8thcH9aq-pzeNa7R6XBNXs8e6_w,4998
+dynaconf/vendor/dotenv/parser.py,sha256=vmPbt4sQFJEuKDOpoA0XxKmmsdGiYHWAuc8BD2-LFy8,3894
+dynaconf/vendor/dotenv/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
+dynaconf/vendor/dotenv/version.py,sha256=DryEhnt-2c1Gv3rDKDoN-B_DFjR1G35T0ZC9nzOoMpE,20
+dynaconf/vendor/ruamel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dynaconf/vendor/ruamel/yaml/__init__.py,sha256=qHGJTVChd_Fgm5c2q7K-ub0Q9p_U694eMx9zTf5McMs,1657
+dynaconf/vendor/ruamel/yaml/anchor.py,sha256=q_eXg9UTW4vcuPp2qyp1Pd9KgEiNMjoBtifSqg51_wE,322
+dynaconf/vendor/ruamel/yaml/comments.py,sha256=PLUOxpv3FiJ0zn_vnnX044lmAvTqhHYEtT-l-ATwAH0,16734
+dynaconf/vendor/ruamel/yaml/compat.py,sha256=mj74dbRSkO5A2vPvbek7zZwSII3PCOGjm3FkW2EqXrA,4459
+dynaconf/vendor/ruamel/yaml/composer.py,sha256=fBSqryTtbxk8mY2B92Yxo5QIbKv3bi5dQG6XeF491Tw,4048
+dynaconf/vendor/ruamel/yaml/configobjwalker.py,sha256=iNBnAbQVLYCJrynvB303Ytq78K8A9m0bcKiy7-ZT8Sc,253
+dynaconf/vendor/ruamel/yaml/constructor.py,sha256=qP49T9ehcN0MSPJ7Pt35xGCFLYsDqNOVWtCKSqCXiB0,40748
+dynaconf/vendor/ruamel/yaml/cyaml.py,sha256=YzDqNt5xkJK3vc_VdDQk14p7SYKyuNc61W1b-CRUo5Q,3257
+dynaconf/vendor/ruamel/yaml/dumper.py,sha256=TLwBtv5hHHbZ2ZDMeJSenSpWjEccMpZjLr5ug_VmVc4,3512
+dynaconf/vendor/ruamel/yaml/emitter.py,sha256=dtDkT03LM4cQtR7lYwelxJmBd_9YvwbXkyG0e_vlqbs,35831
+dynaconf/vendor/ruamel/yaml/error.py,sha256=IKA5g6Yu3GFVhMEDwElGQ1fLa0Yf25DG2V0Rw7tTJmU,5446
+dynaconf/vendor/ruamel/yaml/events.py,sha256=g8p1SG53c5LLoBiT06KmKI5uP6PmKYgYajpYMLWXBUI,2325
+dynaconf/vendor/ruamel/yaml/loader.py,sha256=el0Ipmn2-T1coy4G4k2ISMCtDYaALdH1gA-1-eYek2k,1930
+dynaconf/vendor/ruamel/yaml/main.py,sha256=Pb2HnzABRmD9uns-K0l_QWrA5DcSimU-LyhxfEQ9bbQ,28357
+dynaconf/vendor/ruamel/yaml/nodes.py,sha256=7QGVXO9uvwOe2M5ej3CwYSOFPlSMcmwq5dPGA_C3eI4,1849
+dynaconf/vendor/ruamel/yaml/parser.py,sha256=HK30nNCNjtGKAa4Nfe_zWtlHq5U6gzRKz_hNZvrO2Uk,16966
+dynaconf/vendor/ruamel/yaml/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dynaconf/vendor/ruamel/yaml/reader.py,sha256=nYZkIRxhmsF8HidQCaOpGssvG7O8tjYFbZkKo6WSCDQ,5020
+dynaconf/vendor/ruamel/yaml/representer.py,sha256=ggjNKMtjhc0EKFQUs7cDN4RW_L-MLNHVaM66iYQpPxU,29415
+dynaconf/vendor/ruamel/yaml/resolver.py,sha256=vzB2BRUMRqgwVIHxou2Fs6o4HwdVTmXCLM8g0A3WmG4,9516
+dynaconf/vendor/ruamel/yaml/scalarbool.py,sha256=KocV9T8urGKYuU2Idh64CwSNQy2MbqGQUqJlM2uSVuE,709
+dynaconf/vendor/ruamel/yaml/scalarfloat.py,sha256=pUS3h8owp2scA40YEJFJBz5KLG91Ez5bO7GYqH_n7PA,2309
+dynaconf/vendor/ruamel/yaml/scalarint.py,sha256=6CF8Pjr7wWU8fTfbTpbRGsngeZ_RLhP-hhYO78kkxTQ,2345
+dynaconf/vendor/ruamel/yaml/scalarstring.py,sha256=tZxK8XjAML_vm_9q0bn1knw5pL5CN4o_QkgDuxiJKto,2394
+dynaconf/vendor/ruamel/yaml/scanner.py,sha256=hxZObib5TXe2AXutVxAX2DBNFwqNWXVl4RsifOb-sHU,32446
+dynaconf/vendor/ruamel/yaml/serializer.py,sha256=vW6P7MDR67N8xWb5d0XBPlLKwhCsHvF5OszRo3HFdw4,4103
+dynaconf/vendor/ruamel/yaml/setup.py,sha256=swaKpMSnQlmstlL9e__oVVaX5w2khLeAB5fGS-VdUZ8,18985
+dynaconf/vendor/ruamel/yaml/timestamp.py,sha256=EbJrLp3IscRt_VuOAjx29R6zxhHO1mpAixa8Wijwv-U,440
+dynaconf/vendor/ruamel/yaml/tokens.py,sha256=sh31DFMGFuUmMm9kUVwGnaLESejyPxUBEOls7PhwHcM,3927
+dynaconf/vendor/ruamel/yaml/util.py,sha256=bgg0pXaZSeErrjwSS1RRgTenUCuYWq3zXU9qYSR9ydQ,2061
+dynaconf/vendor/toml/__init__.py,sha256=2_yMDuPr6RpOG83q3uXmkDH0YPtR_DNWaO4wflK0FNc,583
+dynaconf/vendor/toml/decoder.py,sha256=o3l2wiUvwxcHbGHkbLYI2SUNeNPBykJe4902EbaJ7w8,16391
+dynaconf/vendor/toml/encoder.py,sha256=kRc7NKdrmRxHzGqHVw3rBZ3DUbRLx9fBFd4ZsWR-O-8,4733
+dynaconf/vendor/toml/ordered.py,sha256=pe-N-gM_WxYv3gLgNQzuFpf4GZXBEyd3Y7bvYU3tSvM,293
+dynaconf/vendor/toml/tz.py,sha256=E96NOZ7Ya3FKI7-YOCd_axJbI6B9LzKC3DWe4J2XYAQ,435
+dynaconf/vendor/tomllib/__init__.py,sha256=rNwRuzbohxBjMej5KgRcPdgZvyguuBBD7LE4fLpY81M,169
+dynaconf/vendor/tomllib/_parser.py,sha256=1AEWud8ZuaJmactAL9hiw0VclR2xQMOaK4uQz05Z3n4,11494
+dynaconf/vendor/tomllib/_re.py,sha256=J_AoZU_HuhoMlMewrEgnZAyXl8Sg1oFSNXcHEPqnsfs,1686
+dynaconf/vendor/tomllib/_types.py,sha256=SBeIFswsGRtqybwb5nHhrtY3mu7vfLcjtqEtvw0Khfc,95
+dynaconf/vendor/tomllib/_writer.py,sha256=WAagETIhbX3giAQ7lwQYZmhS-TPd5HrAu9D_bwxCl8Y,3577
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/REQUESTED b/libs/dynaconf-3.2.12.dist-info/REQUESTED
similarity index 100%
rename from libs/backports.zoneinfo-0.2.1.dist-info/REQUESTED
rename to libs/dynaconf-3.2.12.dist-info/REQUESTED
diff --git a/libs/dynaconf-3.2.12.dist-info/WHEEL b/libs/dynaconf-3.2.12.dist-info/WHEEL
new file mode 100644
index 0000000000..798dd6195b
--- /dev/null
+++ b/libs/dynaconf-3.2.12.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/dynaconf-3.2.6.dist-info/entry_points.txt b/libs/dynaconf-3.2.12.dist-info/entry_points.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/entry_points.txt
rename to libs/dynaconf-3.2.12.dist-info/entry_points.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/LICENSE b/libs/dynaconf-3.2.12.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/LICENSE
rename to libs/dynaconf-3.2.12.dist-info/licenses/LICENSE
diff --git a/libs/dynaconf-3.2.6.dist-info/box-LICENSE.txt b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/box-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/box-LICENSE.txt
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/box-LICENSE.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/click-LICENSE.rst b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/click-LICENSE.rst
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/click-LICENSE.rst
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/click-LICENSE.rst
diff --git a/libs/dynaconf-3.2.6.dist-info/licenses.sh b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/licenses.sh
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/licenses.sh
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/licenses.sh
diff --git a/libs/dynaconf-3.2.6.dist-info/python-dotenv-LICENSE.txt b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/python-dotenv-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/python-dotenv-LICENSE.txt
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/python-dotenv-LICENSE.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/ruamel.yaml-LICENSE.txt b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/ruamel.yaml-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/ruamel.yaml-LICENSE.txt
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/ruamel.yaml-LICENSE.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/toml-LICENSE.txt b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/toml-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/toml-LICENSE.txt
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/toml-LICENSE.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/tomli-LICENSE.txt b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/tomli-LICENSE.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/tomli-LICENSE.txt
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/tomli-LICENSE.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/vendor_versions.txt b/libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/vendor_versions.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/vendor_versions.txt
rename to libs/dynaconf-3.2.12.dist-info/licenses/vendor_licenses/vendor_versions.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/top_level.txt b/libs/dynaconf-3.2.12.dist-info/top_level.txt
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/top_level.txt
rename to libs/dynaconf-3.2.12.dist-info/top_level.txt
diff --git a/libs/dynaconf-3.2.6.dist-info/METADATA b/libs/dynaconf-3.2.6.dist-info/METADATA
deleted file mode 100644
index bf4e9f7962..0000000000
--- a/libs/dynaconf-3.2.6.dist-info/METADATA
+++ /dev/null
@@ -1,204 +0,0 @@
-Metadata-Version: 2.1
-Name: dynaconf
-Version: 3.2.6
-Summary: The dynamic configurator for your Python Project
-Home-page: https://github.com/dynaconf/dynaconf
-Author: Bruno Rocha
-Author-email: rochacbruno@gmail.com
-License: MIT
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Framework :: Django
-Classifier: Framework :: Flask
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Topic :: Utilities
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-License-File: vendor_licenses/box-LICENSE.txt
-License-File: vendor_licenses/click-LICENSE.rst
-License-File: vendor_licenses/licenses.sh
-License-File: vendor_licenses/python-dotenv-LICENSE.txt
-License-File: vendor_licenses/ruamel.yaml-LICENSE.txt
-License-File: vendor_licenses/toml-LICENSE.txt
-License-File: vendor_licenses/tomli-LICENSE.txt
-License-File: vendor_licenses/vendor_versions.txt
-Provides-Extra: all
-Requires-Dist: redis ; extra == 'all'
-Requires-Dist: ruamel.yaml ; extra == 'all'
-Requires-Dist: configobj ; extra == 'all'
-Requires-Dist: hvac ; extra == 'all'
-Provides-Extra: configobj
-Requires-Dist: configobj ; extra == 'configobj'
-Provides-Extra: ini
-Requires-Dist: configobj ; extra == 'ini'
-Provides-Extra: redis
-Requires-Dist: redis ; extra == 'redis'
-Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
-Requires-Dist: pytest-xdist ; extra == 'test'
-Requires-Dist: pytest-mock ; extra == 'test'
-Requires-Dist: radon ; extra == 'test'
-Requires-Dist: flask >=0.12 ; extra == 'test'
-Requires-Dist: django ; extra == 'test'
-Requires-Dist: python-dotenv ; extra == 'test'
-Requires-Dist: toml ; extra == 'test'
-Requires-Dist: redis ; extra == 'test'
-Requires-Dist: hvac >=1.1.0 ; extra == 'test'
-Requires-Dist: configobj ; extra == 'test'
-Provides-Extra: toml
-Requires-Dist: toml ; extra == 'toml'
-Provides-Extra: vault
-Requires-Dist: hvac ; extra == 'vault'
-Provides-Extra: yaml
-Requires-Dist: ruamel.yaml ; extra == 'yaml'
-
-<!-- [![Dynaconf](docs/img/logo_400.svg?sanitize=true)](http://dynaconf.com) -->
-
-<p align="center"><img src="/art/header.png?v2" alt="dynaconf. new logo"></p>
-
-> **dynaconf** - Configuration Management for Python.
-
-[![MIT License](https://img.shields.io/badge/license-MIT-007EC7.svg?style=flat-square)](/LICENSE) [![PyPI](https://img.shields.io/pypi/v/dynaconf.svg)](https://pypi.python.org/pypi/dynaconf) [![PyPI](https://img.shields.io/pypi/pyversions/dynaconf.svg)]() ![PyPI - Downloads](https://img.shields.io/pypi/dm/dynaconf.svg?label=pip%20installs&logo=python) [![CI](https://github.com/dynaconf/dynaconf/actions/workflows/main.yml/badge.svg)](https://github.com/dynaconf/dynaconf/actions/workflows/main.yml) [![codecov](https://codecov.io/gh/dynaconf/dynaconf/branch/master/graph/badge.svg)](https://codecov.io/gh/dynaconf/dynaconf) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/3fb2de98464442f99a7663181803b400)](https://www.codacy.com/gh/dynaconf/dynaconf/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=dynaconf/dynaconf&amp;utm_campaign=Badge_Grade)  ![GitHub stars](https://img.shields.io/github/stars/dynaconf/dynaconf.svg) ![GitHub Release Date](https://img.shields.io/github/release-date/dynaconf/dynaconf.svg) ![GitHub commits since latest release](https://img.shields.io/github/commits-since/dynaconf/dynaconf/latest.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/dynaconf/dynaconf.svg) [![Code Style Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black/)
-
-![GitHub issues](https://img.shields.io/github/issues/dynaconf/dynaconf.svg) [![User Forum](https://img.shields.io/badge/users-forum-blue.svg?logo=googlechat)](https://github.com/dynaconf/dynaconf/discussions) [![Join the chat at https://gitter.im/dynaconf/dev](https://badges.gitter.im/dynaconf/dev.svg)](https://gitter.im/dynaconf/dev?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![ Matrix](https://img.shields.io/badge/dev-room-blue.svg?logo=matrix)](https://matrix.to/#/#dynaconf:matrix.org)
-
-## Features
-
-- Inspired by the [12-factor application guide](https://12factor.net/config)
-- Settings management (default values, validation, parsing, templating)
-- Protection of sensitive information (passwords/tokens)
-- Multiple file formats `toml|yaml|json|ini|py` and also customizable loaders.
-- Full support for environment variables to override existing settings (dotenv support included).
-- Optional layered system for multi environments `[default, development, testing, production]`
-- Built-in support for Hashicorp Vault and Redis as settings and secrets storage.
-- Built-in extensions for **Django** and **Flask** web frameworks.
-- CLI for common operations such as `init, list, write, validate, export`.
-- full docs on https://dynaconf.com
-
-### Install
-
-```bash
-$ pip install dynaconf
-```
-
-#### Initialize Dynaconf on project root directory
-
-```plain
-$ cd path/to/your/project/
-
-$ dynaconf init -f toml
-
-โš™๏ธ  Configuring your Dynaconf environment
-------------------------------------------
-๐Ÿ The file `config.py` was generated.
-
-๐ŸŽ›๏ธ  settings.toml created to hold your settings.
-
-๐Ÿ”‘ .secrets.toml created to hold your secrets.
-
-๐Ÿ™ˆ the .secrets.* is also included in `.gitignore`
-  beware to not push your secrets to a public repo.
-
-๐ŸŽ‰ Dynaconf is configured! read more on https://dynaconf.com
-```
-
-> **TIP:** You can select `toml|yaml|json|ini|py` on `dynaconf init -f <fileformat>`  **toml** is the default and also the most recommended format for configuration.
-
-#### Dynaconf init creates the following files
-
-```plain
-.
-โ”œโ”€โ”€ config.py       # This is from where you import your settings object (required)
-โ”œโ”€โ”€ .secrets.toml   # This is to hold sensitive data like passwords and tokens (optional)
-โ””โ”€โ”€ settings.toml   # This is to hold your application settings (optional)
-```
-
-On the file `config.py` Dynaconf init generates the following boilerpate
-
-```py
-from dynaconf import Dynaconf
-
-settings = Dynaconf(
-    envvar_prefix="DYNACONF",  # export envvars with `export DYNACONF_FOO=bar`.
-    settings_files=['settings.yaml', '.secrets.yaml'],  # Load files in the given order.
-)
-```
-
-> **TIP:** You can create the files yourself instead of using the `init` command as shown above and you can give any name you want instead of the default `config.py` (the file must be in your importable python path) - See more options that you can pass to `Dynaconf` class initializer on https://dynaconf.com
-
-
-#### Using Dynaconf
-
-Put your settings on `settings.{toml|yaml|ini|json|py}`
-
-```toml
-username = "admin"
-port = 5555
-database = {name='mydb', schema='main'}
-```
-
-Put sensitive information on `.secrets.{toml|yaml|ini|json|py}`
-
-```toml
-password = "secret123"
-```
-
-> **IMPORTANT:** `dynaconf init` command puts the `.secrets.*` in your `.gitignore` to avoid it to be exposed on public repos but it is your responsibility to keep it safe in your local environment, also the recommendation for production environments is to use the built-in support for Hashicorp Vault service for password and tokens.
-
-
-Optionally you can now use environment variables to override values per execution or per environment.
-
-```bash
-# override `port` from settings.toml file and automatically casts as `int` value.
-export DYNACONF_PORT=9900
-```
-
-
-On your code import the `settings` object
-
-```py
-from path.to.project.config import settings
-
-# Reading the settings
-
-settings.username == "admin"  # dot notation with multi nesting support
-settings.PORT == 9900  # case insensitive
-settings['password'] == "secret123"  # dict like access
-settings.get("nonexisting", "default value")  # Default values just like a dict
-settings.databases.name == "mydb"  # Nested key traversing
-settings['databases.schema'] == "main"  # Nested key traversing
-```
-
-## More
-
-- Settings Schema Validation
-- Custom Settings Loaders
-- Vault Services
-- Template substitutions
-- etc...
-
-There is a lot more you can do, **read the docs:** http://dynaconf.com
-
-## Contribute
-
-Main discussions happens on [Discussions Tab](https://github.com/dynaconf/dynaconf/discussions) learn more about how to get involved on [CONTRIBUTING.md guide](CONTRIBUTING.md)
-
-## More
-
-If you are looking for something similar to Dynaconf to use in your Rust projects: https://github.com/rubik/hydroconf
-
-And a special thanks to [Caneco](https://twitter.com/caneco) for the logo.
diff --git a/libs/dynaconf-3.2.6.dist-info/RECORD b/libs/dynaconf-3.2.6.dist-info/RECORD
deleted file mode 100644
index eb96de575f..0000000000
--- a/libs/dynaconf-3.2.6.dist-info/RECORD
+++ /dev/null
@@ -1,121 +0,0 @@
-../../bin/dynaconf,sha256=3EDP6hZ2u78FIaQ-Nqua_TvwQyyacEGh8qF8dN1hNfI,234
-dynaconf-3.2.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-dynaconf-3.2.6.dist-info/LICENSE,sha256=VXHf05Hz7uwTdLkQEFy4s7L4cb3mJ6Jc6yvoRPCg65c,1078
-dynaconf-3.2.6.dist-info/METADATA,sha256=ldv1NIqsLYvWG3Zux0X6CkjGkKYesBBAHZKepkZtoSs,9083
-dynaconf-3.2.6.dist-info/RECORD,,
-dynaconf-3.2.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dynaconf-3.2.6.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-dynaconf-3.2.6.dist-info/box-LICENSE.txt,sha256=OA9QtZRAYGpaFevuHWrHckHw0fQT4yhurfH56sJYDqw,1076
-dynaconf-3.2.6.dist-info/click-LICENSE.rst,sha256=morRBqOU6FO_4h9C9OctWSgZoigF2ZG18ydQKSkrZY0,1475
-dynaconf-3.2.6.dist-info/entry_points.txt,sha256=olhFwb2rJswbRmjY97fTrkNfqPQhMv1Pxjez4mSxMSg,47
-dynaconf-3.2.6.dist-info/licenses.sh,sha256=9eID6RHwv82Obub4D4G--lIbRZya65Fa9EwgYNWXvFU,769
-dynaconf-3.2.6.dist-info/python-dotenv-LICENSE.txt,sha256=0nIJqz0WJ4Ko-OOHK5s1PEngksmqRnpkUiiDQH2NEDA,4600
-dynaconf-3.2.6.dist-info/ruamel.yaml-LICENSE.txt,sha256=QYxdb3JocDuWY6zvk3rVKcVO47J-9miiolkf4w6hH_8,1121
-dynaconf-3.2.6.dist-info/toml-LICENSE.txt,sha256=QitPoBx3Vs5N5go556B0Zf3Mz4YGxWeUiRYa9C1EGMg,1253
-dynaconf-3.2.6.dist-info/tomli-LICENSE.txt,sha256=uAgWsNUwuKzLTCIReDeQmEpuO2GSLCte6S8zcqsnQv4,1072
-dynaconf-3.2.6.dist-info/top_level.txt,sha256=y9G5RO-Ts5h0yOx6qVr8r_TBCSFA8wBxEWcvMZJq66c,9
-dynaconf-3.2.6.dist-info/vendor_versions.txt,sha256=QD2pB7JBhr6oIGaPCXFVhhFfs2uQibsJXBT9cUYlgHQ,100
-dynaconf/VERSION,sha256=wX-7S95xjeV7UD4RFHjNYDXJNtLEQMaptJtEZzNHI1U,6
-dynaconf/__init__.py,sha256=1SJQLzyyP-h6Z0Ws8QQaqJNWS8UFaSaHSNRK1ZOomDw,1221
-dynaconf/base.py,sha256=Pm8kEqQTFY-bQcR-sd3E8w1Vpw9Npp8kVsT4dizMLrs,51283
-dynaconf/cli.py,sha256=a8WFL3MmMK7rMBDaeVY--6ApnjO43g6S9NKDv91xdG4,26380
-dynaconf/constants.py,sha256=DKUWa2XfcyqA-TpbfLBnpkwMF9rjAr86P_GrB8PbR1Y,1259
-dynaconf/contrib/__init__.py,sha256=kyYhXVPeWZL-zeMFGqbal4f3U0-B6ktLK7-IEOetgP8,216
-dynaconf/contrib/django_dynaconf_v2.py,sha256=FcdbU-PLUxUaXZkVIDP09no8xuPZ-axY5RjooYaeWC8,4699
-dynaconf/contrib/flask_dynaconf.py,sha256=l1lT1D51clnya-SJ0qWk_g7NQTzf2kcCn_wE7zu4V14,7567
-dynaconf/default_settings.py,sha256=LEkJqz_6AIeXdAG8v_DRtCeq386j997hsP6Arrk_Sw0,9768
-dynaconf/hooking.py,sha256=UygwwSP4Gvhh4NudIUUy3SeTk7evOi1H3Yvi2y53jvQ,9673
-dynaconf/loaders/__init__.py,sha256=adT9ZH2ZZVQDYNFQC3GeTE0dM2z3iFB2ZGs4IL9oiiA,11990
-dynaconf/loaders/base.py,sha256=rsaiXO7ljPD5COBUHTwz_zKNkcUCnn6weJbHlIr3dgg,8255
-dynaconf/loaders/env_loader.py,sha256=rdfBJlQPAa8m6mCTDL8DorTiM-3NJJEy6AD7DS-GvlI,3982
-dynaconf/loaders/ini_loader.py,sha256=B1kvkY12NRpsN_x2Y2xkBC7_uk6oHYiC1ALDmZviQQQ,1933
-dynaconf/loaders/json_loader.py,sha256=FexRwMQNBvzfNbqFomQF2Hb2Ph1eIGsOp2Vz4Bwu5BI,2397
-dynaconf/loaders/py_loader.py,sha256=HrJ-wjBZhykOCqoPUJTjutPyoB9Zo5-v-ME_VqtgNkA,5760
-dynaconf/loaders/redis_loader.py,sha256=u4BYWEeWlckuAm0V84znsknndu8OMH9kq0UrFAnG6Is,3990
-dynaconf/loaders/toml_loader.py,sha256=xoFrce6V_RI0ZrDsSJyoiNGrn5FDBzADfjKmCMM4-C4,4290
-dynaconf/loaders/vault_loader.py,sha256=brL2kkOT8VtF-e5Zyu1qJcw4zaPResrX9xHqWdZ9nig,7367
-dynaconf/loaders/yaml_loader.py,sha256=rwRxWepvPQcZfYVEmUIK1EB4Xayv32ui4s8LaoLdNR0,4309
-dynaconf/strategies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dynaconf/strategies/filtering.py,sha256=2Ezpg7azrEKWFpaCTWS_KytY_NEviySkuVmBv3WgkXg,851
-dynaconf/test_settings.py,sha256=lVkCYSe2yEmCgM_rtB56NibLn1oWrX_8FPaXIdr4JDU,170
-dynaconf/utils/__init__.py,sha256=NlT5g85UoeQqHCNGGaWpzuBdXyXgJL_kcQk7R2EN2zU,15697
-dynaconf/utils/boxing.py,sha256=bXlz0AP-9qhdMvkvkNtf5gQkWRRtXGCfR_1D6ShFgx0,3146
-dynaconf/utils/files.py,sha256=b7VfD9uln2zTnP6hGtXIFfQnxI1YdP0yggGbD5Bf7Sg,4211
-dynaconf/utils/functional.py,sha256=Umiy8J3DO_kFvWtz1Xz5ZFJMdG6RwvutXH656NRJvVA,4582
-dynaconf/utils/inspect.py,sha256=YPCFPungbb0tTiPgaH-ugFKqIDsJZ_VuxmfBUdrmLQI,9966
-dynaconf/utils/parse_conf.py,sha256=xx-EEMswGO4WxXWrCZjl4SrhDJzmbasj5GpOyHOAaJg,15143
-dynaconf/validator.py,sha256=g6hPj_EZHTn0LZZLVfOKt5VQk9k1qJuHEMcRYpHjonE,17837
-dynaconf/validator_conditions.py,sha256=d3hKJJ6nBKxMWmyghtGsiRArdRwBqhpNt21WKoh81bM,1527
-dynaconf/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dynaconf/vendor/box/__init__.py,sha256=bC6Imy93waRoExHLfaLbHmit0DDc-mXDpCS2Hw2tMWg,262
-dynaconf/vendor/box/box.py,sha256=TvCDIyKr7mNgflKzFTMWprUTxHWvDn6pmvkKVnNtPCQ,14009
-dynaconf/vendor/box/box_list.py,sha256=IbTk4mYGNDJ-hfU4VNtRJ7ZB1h3JCUryaXmBiUb6TEo,5518
-dynaconf/vendor/box/config_box.py,sha256=lDqYuCARqcSnErShBbmKupN3_gSPqbxWEAzdWTIc8g8,1678
-dynaconf/vendor/box/converters.py,sha256=Csx0US57He8FPYdJAu21XTj7oG3QUOhdNAngNqhW7Qg,3192
-dynaconf/vendor/box/exceptions.py,sha256=jQ9isNd1B7a13phZPJsM7V1Ua5DgfJYwTxId2mvALs4,219
-dynaconf/vendor/box/from_file.py,sha256=yOJOnhooyRrz2IIU-BaKvILfpJ0OUpNrf1rV2PFtxjc,1480
-dynaconf/vendor/box/shorthand_box.py,sha256=YuQQJORajUzmPaL-IUG5bqsdSQxipwNGwZH3EhlxCZw,573
-dynaconf/vendor/click/__init__.py,sha256=PDhi9Hye3jtKGSnXzffMuM6ErSrm4XzFEeErQPzSRYo,1912
-dynaconf/vendor/click/_bashcomplete.py,sha256=SnwaY7byw7DM8dyAK5n4yqQQNq9YREhDKlw--B_Xkco,6398
-dynaconf/vendor/click/_compat.py,sha256=fOHAeu9SrTO-kBjyfyTVrNutNBBWMP1lR1UplqF3CT8,9819
-dynaconf/vendor/click/_termui_impl.py,sha256=4ckaxZ9rABwoW1E5ofsiMXOOYnEq1VIXeff1R6nDPDE,9571
-dynaconf/vendor/click/_textwrap.py,sha256=e5JSLGSkMx-sVtJZoFqxHQ8GDIB7H2Lu1nWU9HUcN3Y,701
-dynaconf/vendor/click/_unicodefun.py,sha256=uPN8f7SlBvKndwnnXk6EcG1V4iA8iDBIKzJfYF-nByE,1658
-dynaconf/vendor/click/_winconsole.py,sha256=DcMGHEgoMTo_1RvlfbRqZ39tBcC2J9VAADYheOQuvM4,4828
-dynaconf/vendor/click/core.py,sha256=rDwGyOFq2Kqg657TToPvM9A7ZJsFyZDM8o66mO9wCS8,25761
-dynaconf/vendor/click/decorators.py,sha256=ME5BDfkLNkvqOs_RQvPCu_kpzBtRkQN5p9pTycqWmOg,8709
-dynaconf/vendor/click/exceptions.py,sha256=WSOYnxqgnFWGJr9Ce1XxKLebIMl3gk6mKrzdE9GR1F0,3291
-dynaconf/vendor/click/formatting.py,sha256=6hKX4R6n9aXYilerb4pTa-izfwCrG6mrijRxGph9GiQ,3375
-dynaconf/vendor/click/globals.py,sha256=0-MQGJpcmq9zRDlf7zjyFYNbu56zdyY4U1JWTnoSJpY,472
-dynaconf/vendor/click/parser.py,sha256=7UvD2-eqk4IkJeYk2v18UqIw1jBeaAPY8YTkl0oOZB4,5712
-dynaconf/vendor/click/termui.py,sha256=Ch5NoaNVdA67-wJb-Z2YudDxO9fAj77ZpRR_pAHCfJs,5767
-dynaconf/vendor/click/testing.py,sha256=2lJD83BNuRhp52D4sCg9QhJPCdItC8znfReHWecAK2M,4559
-dynaconf/vendor/click/types.py,sha256=yl29jxJ6vXhUIgFZFK-axtcDSYSaUJerMVt6sHCz1Z8,8992
-dynaconf/vendor/click/utils.py,sha256=JOupNs_GTrtGXQB5KwRKN3Vv6mYXh2bffNMU8bQAe3k,4355
-dynaconf/vendor/dotenv/__init__.py,sha256=ngw0zLKjRUqyJG0lKLPhMxF26mDdD1FJxPb594a3dR4,698
-dynaconf/vendor/dotenv/cli.py,sha256=abikHBD4AO0HWt1Qq88hoSE_rz81UninCM6a0cdRxfQ,2280
-dynaconf/vendor/dotenv/compat.py,sha256=s9MGbIYLfQBrEzJR7WosWJDpopzF0LHTn9NXIzO_x1U,473
-dynaconf/vendor/dotenv/ipython.py,sha256=5GD9HWTVkREtXRgV3I5s1l4kvzAuUOLRv6Db2QsQ2So,908
-dynaconf/vendor/dotenv/main.py,sha256=9OLTtKuHSJ3G6hcP8thcH9aq-pzeNa7R6XBNXs8e6_w,4998
-dynaconf/vendor/dotenv/parser.py,sha256=vmPbt4sQFJEuKDOpoA0XxKmmsdGiYHWAuc8BD2-LFy8,3894
-dynaconf/vendor/dotenv/version.py,sha256=DryEhnt-2c1Gv3rDKDoN-B_DFjR1G35T0ZC9nzOoMpE,20
-dynaconf/vendor/ruamel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dynaconf/vendor/ruamel/yaml/__init__.py,sha256=qHGJTVChd_Fgm5c2q7K-ub0Q9p_U694eMx9zTf5McMs,1657
-dynaconf/vendor/ruamel/yaml/anchor.py,sha256=q_eXg9UTW4vcuPp2qyp1Pd9KgEiNMjoBtifSqg51_wE,322
-dynaconf/vendor/ruamel/yaml/comments.py,sha256=PLUOxpv3FiJ0zn_vnnX044lmAvTqhHYEtT-l-ATwAH0,16734
-dynaconf/vendor/ruamel/yaml/compat.py,sha256=mj74dbRSkO5A2vPvbek7zZwSII3PCOGjm3FkW2EqXrA,4459
-dynaconf/vendor/ruamel/yaml/composer.py,sha256=fBSqryTtbxk8mY2B92Yxo5QIbKv3bi5dQG6XeF491Tw,4048
-dynaconf/vendor/ruamel/yaml/configobjwalker.py,sha256=iNBnAbQVLYCJrynvB303Ytq78K8A9m0bcKiy7-ZT8Sc,253
-dynaconf/vendor/ruamel/yaml/constructor.py,sha256=qP49T9ehcN0MSPJ7Pt35xGCFLYsDqNOVWtCKSqCXiB0,40748
-dynaconf/vendor/ruamel/yaml/cyaml.py,sha256=YzDqNt5xkJK3vc_VdDQk14p7SYKyuNc61W1b-CRUo5Q,3257
-dynaconf/vendor/ruamel/yaml/dumper.py,sha256=TLwBtv5hHHbZ2ZDMeJSenSpWjEccMpZjLr5ug_VmVc4,3512
-dynaconf/vendor/ruamel/yaml/emitter.py,sha256=dtDkT03LM4cQtR7lYwelxJmBd_9YvwbXkyG0e_vlqbs,35831
-dynaconf/vendor/ruamel/yaml/error.py,sha256=bbjNGgzIqO0tM9GPq6NDNEIjg38e-HwO20ocSPIVIbQ,5440
-dynaconf/vendor/ruamel/yaml/events.py,sha256=Ht74m0rKAQIwalOHKgsTgdO27Jzt5fLtCPMqEq8x7TI,2309
-dynaconf/vendor/ruamel/yaml/loader.py,sha256=el0Ipmn2-T1coy4G4k2ISMCtDYaALdH1gA-1-eYek2k,1930
-dynaconf/vendor/ruamel/yaml/main.py,sha256=Pb2HnzABRmD9uns-K0l_QWrA5DcSimU-LyhxfEQ9bbQ,28357
-dynaconf/vendor/ruamel/yaml/nodes.py,sha256=7QGVXO9uvwOe2M5ej3CwYSOFPlSMcmwq5dPGA_C3eI4,1849
-dynaconf/vendor/ruamel/yaml/parser.py,sha256=HK30nNCNjtGKAa4Nfe_zWtlHq5U6gzRKz_hNZvrO2Uk,16966
-dynaconf/vendor/ruamel/yaml/reader.py,sha256=nYZkIRxhmsF8HidQCaOpGssvG7O8tjYFbZkKo6WSCDQ,5020
-dynaconf/vendor/ruamel/yaml/representer.py,sha256=ggjNKMtjhc0EKFQUs7cDN4RW_L-MLNHVaM66iYQpPxU,29415
-dynaconf/vendor/ruamel/yaml/resolver.py,sha256=vzB2BRUMRqgwVIHxou2Fs6o4HwdVTmXCLM8g0A3WmG4,9516
-dynaconf/vendor/ruamel/yaml/scalarbool.py,sha256=KocV9T8urGKYuU2Idh64CwSNQy2MbqGQUqJlM2uSVuE,709
-dynaconf/vendor/ruamel/yaml/scalarfloat.py,sha256=pUS3h8owp2scA40YEJFJBz5KLG91Ez5bO7GYqH_n7PA,2309
-dynaconf/vendor/ruamel/yaml/scalarint.py,sha256=6CF8Pjr7wWU8fTfbTpbRGsngeZ_RLhP-hhYO78kkxTQ,2345
-dynaconf/vendor/ruamel/yaml/scalarstring.py,sha256=g8frDVxv2eP1UjUYT9pmZDg57oA5EbAIICTIQ0A2vQs,2393
-dynaconf/vendor/ruamel/yaml/scanner.py,sha256=hxZObib5TXe2AXutVxAX2DBNFwqNWXVl4RsifOb-sHU,32446
-dynaconf/vendor/ruamel/yaml/serializer.py,sha256=vW6P7MDR67N8xWb5d0XBPlLKwhCsHvF5OszRo3HFdw4,4103
-dynaconf/vendor/ruamel/yaml/setup.py,sha256=swaKpMSnQlmstlL9e__oVVaX5w2khLeAB5fGS-VdUZ8,18985
-dynaconf/vendor/ruamel/yaml/timestamp.py,sha256=EbJrLp3IscRt_VuOAjx29R6zxhHO1mpAixa8Wijwv-U,440
-dynaconf/vendor/ruamel/yaml/tokens.py,sha256=kO7nhkhxs0IpywYDuyUeW-SR-XURkNR5659bArom7Xo,3893
-dynaconf/vendor/ruamel/yaml/util.py,sha256=bgg0pXaZSeErrjwSS1RRgTenUCuYWq3zXU9qYSR9ydQ,2061
-dynaconf/vendor/toml/__init__.py,sha256=2_yMDuPr6RpOG83q3uXmkDH0YPtR_DNWaO4wflK0FNc,583
-dynaconf/vendor/toml/decoder.py,sha256=o3l2wiUvwxcHbGHkbLYI2SUNeNPBykJe4902EbaJ7w8,16391
-dynaconf/vendor/toml/encoder.py,sha256=kRc7NKdrmRxHzGqHVw3rBZ3DUbRLx9fBFd4ZsWR-O-8,4733
-dynaconf/vendor/toml/ordered.py,sha256=pe-N-gM_WxYv3gLgNQzuFpf4GZXBEyd3Y7bvYU3tSvM,293
-dynaconf/vendor/toml/tz.py,sha256=E96NOZ7Ya3FKI7-YOCd_axJbI6B9LzKC3DWe4J2XYAQ,435
-dynaconf/vendor/tomllib/__init__.py,sha256=rNwRuzbohxBjMej5KgRcPdgZvyguuBBD7LE4fLpY81M,169
-dynaconf/vendor/tomllib/_parser.py,sha256=1AEWud8ZuaJmactAL9hiw0VclR2xQMOaK4uQz05Z3n4,11494
-dynaconf/vendor/tomllib/_re.py,sha256=J_AoZU_HuhoMlMewrEgnZAyXl8Sg1oFSNXcHEPqnsfs,1686
-dynaconf/vendor/tomllib/_types.py,sha256=SBeIFswsGRtqybwb5nHhrtY3mu7vfLcjtqEtvw0Khfc,95
-dynaconf/vendor/tomllib/_writer.py,sha256=WAagETIhbX3giAQ7lwQYZmhS-TPd5HrAu9D_bwxCl8Y,3577
diff --git a/libs/dynaconf-3.2.6.dist-info/WHEEL b/libs/dynaconf-3.2.6.dist-info/WHEEL
deleted file mode 100644
index f31e450fda..0000000000
--- a/libs/dynaconf-3.2.6.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/dynaconf/__init__.py b/libs/dynaconf/__init__.py
index d59d40580e..ed2e47b408 100644
--- a/libs/dynaconf/__init__.py
+++ b/libs/dynaconf/__init__.py
@@ -4,6 +4,7 @@
 from dynaconf.constants import DEFAULT_SETTINGS_FILES
 from dynaconf.contrib import DjangoDynaconf
 from dynaconf.contrib import FlaskDynaconf
+from dynaconf.hooking import post_hook
 from dynaconf.utils.inspect import get_history
 from dynaconf.utils.inspect import inspect_settings
 from dynaconf.utils.parse_conf import add_converter
@@ -39,4 +40,5 @@
     "get_history",
     "DynaconfFormatError",
     "DynaconfParseError",
+    "post_hook",
 ]
diff --git a/libs/dynaconf/__main__.py b/libs/dynaconf/__main__.py
new file mode 100644
index 0000000000..1ce76deac3
--- /dev/null
+++ b/libs/dynaconf/__main__.py
@@ -0,0 +1,6 @@
+from __future__ import annotations
+
+from dynaconf.cli import main
+
+if __name__ == "__main__":
+    main()
diff --git a/libs/dynaconf/base.py b/libs/dynaconf/base.py
index 3e57ba6d83..78a82e79bc 100644
--- a/libs/dynaconf/base.py
+++ b/libs/dynaconf/base.py
@@ -27,7 +27,6 @@
 from dynaconf.utils import ensure_a_list
 from dynaconf.utils import missing
 from dynaconf.utils import object_merge
-from dynaconf.utils import recursively_evaluate_lazy_format
 from dynaconf.utils import RENAMED_VARS
 from dynaconf.utils import upperfy
 from dynaconf.utils.boxing import DynaBox
@@ -143,8 +142,6 @@ def __getattr__(self, name):
         ):
             return self._wrapped.get_fresh(name)
         value = getattr(self._wrapped, name)
-        if name not in RESERVED_ATTRS:
-            return recursively_evaluate_lazy_format(value, self)
         return value
 
     def __call__(self, *args, **kwargs):
@@ -464,7 +461,7 @@ def get(
         dotted_lookup=empty,
         parent=None,
         sysenv_fallback=None,
-    ):
+    ) -> Any:
         """
         Get a value from settings store, this is the preferred way to access::
 
@@ -968,6 +965,15 @@ def set(
             self.store.get(key, None) if not isinstance(parsed, Lazy) else None
         )
 
+        if getattr(parsed, "_dynaconf_insert", False):
+            # `@insert` calls insert in a list by index
+            if existing and isinstance(existing, list):
+                source_metadata = source_metadata._replace(merged=True)
+                existing.insert(parsed.index, parsed.unwrap())
+                parsed = existing
+            else:
+                parsed = [parsed.unwrap()]
+
         if getattr(parsed, "_dynaconf_del", None):
             self.unset(key, force=True)  # `@del` in a first level var.
             return
@@ -1152,6 +1158,10 @@ def reload(self, env=None, silent=None):  # pragma: no cover
         """Clean end Execute all loaders"""
         self.clean()
         self._loaded_hooks.clear()
+        for hook in self._post_hooks:
+            with suppress(AttributeError, TypeError):
+                hook._called = False
+
         self.execute_loaders(env, silent)
 
     def execute_loaders(
@@ -1208,7 +1218,13 @@ def load_includes(self, env, silent, key):
                 last_loader.load(self, env, silent, key)
 
     def load_file(
-        self, path=None, env=None, silent=True, key=None, validate=empty
+        self,
+        path=None,
+        env=None,
+        silent=True,
+        key=None,
+        validate=empty,
+        run_hooks=True,
     ):
         """Programmatically load files from ``path``.
 
@@ -1217,63 +1233,95 @@ def load_file(
         - Directory of the last loaded file
         - CWD
 
-        :param path: A single filename or a file list
+        :param path: A single filename, a glob or a file list
         :param env: Which env to load from file (default current_env)
         :param silent: Should raise errors?
         :param key: Load a single key?
         :param validate: Should trigger validation?
+        :param run_hooks: Should run collected hooks?
         """
+        files = ensure_a_list(path)
+        if not files:  # a glob pattern may return empty
+            return
+
         if validate is empty:
             validate = self.get("VALIDATE_ON_UPDATE_FOR_DYNACONF")
 
-        env = (env or self.current_env).upper()
-        files = ensure_a_list(path)
-        if files:
-            already_loaded = set()
-            for _filename in files:
+        env = "_envless" if env is False else (env or self.current_env).upper()
+
+        # Using inspect take the filename and line number of the caller
+        # to be used in the source_metadata
+        frame = inspect.currentframe()
+        caller = inspect.getouterframes(frame)[1]
+
+        already_loaded = set()
+        for _filename in files:
+            # load_file() will handle validation later
+            with suppress(ValidationError):
+                source_metadata = SourceMetadata(
+                    loader=f"load_file@{caller.filename}:{caller.lineno}",
+                    identifier=_filename,
+                    env=env,
+                )
+                if py_loader.try_to_load_from_py_module_name(
+                    obj=self,
+                    name=_filename,
+                    silent=True,
+                    identifier=source_metadata,
+                ):
+                    # if it was possible to load from module name
+                    # continue the loop.
+                    continue
+
+            root_dir = str(self._root_path or os.getcwd())
+
+            # Issue #494
+            if (
+                isinstance(_filename, Path)
+                and str(_filename.parent) in root_dir
+            ):  # pragma: no cover
+                filepath = str(_filename)
+            else:
+                filepath = os.path.join(root_dir, str(_filename))
+
+            paths = [p for p in sorted(glob(filepath)) if ".local." not in p]
+            local_paths = [p for p in sorted(glob(filepath)) if ".local." in p]
+
+            # Handle possible *.globs sorted alphanumeric
+            for path in paths + local_paths:
+                if path in already_loaded:  # pragma: no cover
+                    continue
+
                 # load_file() will handle validation later
                 with suppress(ValidationError):
-                    if py_loader.try_to_load_from_py_module_name(
-                        obj=self, name=_filename, silent=True
-                    ):
-                        # if it was possible to load from module name
-                        # continue the loop.
-                        continue
-
-                root_dir = str(self._root_path or os.getcwd())
-
-                # Issue #494
-                if (
-                    isinstance(_filename, Path)
-                    and str(_filename.parent) in root_dir
-                ):  # pragma: no cover
-                    filepath = str(_filename)
-                else:
-                    filepath = os.path.join(root_dir, str(_filename))
-
-                paths = [
-                    p for p in sorted(glob(filepath)) if ".local." not in p
-                ]
-                local_paths = [
-                    p for p in sorted(glob(filepath)) if ".local." in p
-                ]
-
-                # Handle possible *.globs sorted alphanumeric
-                for path in paths + local_paths:
-                    if path in already_loaded:  # pragma: no cover
-                        continue
-
-                    # load_file() will handle validation later
-                    with suppress(ValidationError):
-                        settings_loader(
-                            obj=self,
-                            env=env,
-                            silent=silent,
-                            key=key,
-                            filename=path,
-                            validate=validate,
-                        )
-                        already_loaded.add(path)
+                    source_metadata = SourceMetadata(
+                        loader=f"load_file@{caller.filename}:{caller.lineno}",
+                        identifier=path,
+                        env=env,
+                    )
+                    settings_loader(
+                        obj=self,
+                        env=env,
+                        silent=silent,
+                        key=key,
+                        filename=path,
+                        validate=validate,
+                        identifier=source_metadata,
+                    )
+                    already_loaded.add(path)
+
+        if run_hooks:
+            # this will call any collected hook that was not called yet
+            execute_instance_hooks(
+                self,
+                "post",
+                [
+                    _hook
+                    for _hook in self._post_hooks
+                    if getattr(_hook, "_dynaconf_hook", False) is True
+                    and not getattr(_hook, "_called", False)
+                ],
+            )
 
         # handle param `validate`
         if validate is True:
@@ -1357,19 +1405,33 @@ def flag(self, key, env=None):
             value = self.get_fresh(key)
             return value is True or value in true_values
 
-    def populate_obj(self, obj, keys=None, ignore=None):
+    def populate_obj(
+        self,
+        obj,
+        keys=None,
+        ignore=None,
+        internal=False,
+        convert_to_dict=False,
+    ):
         """Given the `obj` populate it using self.store items.
 
         :param obj: An object to be populated, a class instance.
         :param keys: A list of keys to be included.
         :param ignore: A list of keys to be excluded.
+        :param internal: Include internal keys.
+        :param convert_to_dict: Convert the settings to a pure dict (no Box)
+         before populating.
         """
+        data = self.to_dict(internal=internal) if convert_to_dict else self
         keys = keys or self.keys()
         for key in keys:
             key = upperfy(key)
+            if not internal:
+                if key in UPPER_DEFAULT_SETTINGS:
+                    continue
             if ignore and key in ignore:
                 continue
-            value = self.get(key, empty)
+            value = data.get(key, empty)
             if value is not empty:
                 setattr(obj, key, value)
 
diff --git a/libs/dynaconf/cli.py b/libs/dynaconf/cli.py
index 108464d442..ff3f26180e 100644
--- a/libs/dynaconf/cli.py
+++ b/libs/dynaconf/cli.py
@@ -1,22 +1,25 @@
 from __future__ import annotations
 
 import importlib
+import inspect as python_inspect
 import json
 import os
 import pprint
 import sys
 import warnings
 import webbrowser
+from contextlib import redirect_stdout
 from contextlib import suppress
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 from dynaconf import constants
 from dynaconf import default_settings
 from dynaconf import LazySettings
 from dynaconf import loaders
 from dynaconf import settings as legacy_settings
+from dynaconf.base import Settings
 from dynaconf.loaders.py_loader import get_module
+from dynaconf.utils import prepare_json
 from dynaconf.utils import upperfy
 from dynaconf.utils.files import read_file
 from dynaconf.utils.functional import empty
@@ -25,6 +28,7 @@
 from dynaconf.utils.inspect import inspect_settings
 from dynaconf.utils.inspect import KeyNotFoundError
 from dynaconf.utils.inspect import OutputFormatError
+from dynaconf.utils.inspect import print_debug_info
 from dynaconf.utils.parse_conf import parse_conf_data
 from dynaconf.utils.parse_conf import unparse_conf_data
 from dynaconf.validator import ValidationError
@@ -33,9 +37,6 @@
 from dynaconf.vendor import toml
 from dynaconf.vendor import tomllib
 
-if TYPE_CHECKING:  # pragma: no cover
-    from dynaconf.base import Settings  # noqa: F401
-
 os.environ["PYTHONIOENCODING"] = "utf-8"
 
 CWD = None
@@ -54,7 +55,14 @@ def set_settings(ctx, instance=None):
 
     settings = None
 
-    _echo_enabled = ctx.invoked_subcommand not in ["get", "inspect", None]
+    _echo_enabled = ctx.invoked_subcommand not in [
+        "get",
+        "inspect",
+        "debug-info",
+        None,
+    ]
+    if "--json" in sys.argv:
+        _echo_enabled = False
 
     if instance is not None:
         if ctx.invoked_subcommand in ["init"]:
@@ -79,20 +87,18 @@ def set_settings(ctx, instance=None):
                 )
     elif "DJANGO_SETTINGS_MODULE" in os.environ:  # pragma: no cover
         sys.path.insert(0, os.path.abspath(os.getcwd()))
-        try:
-            # Django extension v2
-            from django.conf import settings  # noqa
-            import dynaconf  # noqa: F401
-            import django
-
-            # see https://docs.djangoproject.com/en/4.2/ref/applications/
-            # at #troubleshooting
-            django.setup()
-
-            settings.DYNACONF.configure()
-        except AttributeError:
-            settings = LazySettings()
+        import django  # noqa
 
+        django.setup()  # ensure django is setup to avoid AppRegistryNotReady
+        settings_module = import__django_settings(
+            os.environ["DJANGO_SETTINGS_MODULE"]
+        )
+        found_settings = python_inspect.getmembers(
+            settings_module,
+            lambda item: isinstance(item, (LazySettings, Settings)),
+        )
+        if found_settings:
+            settings = found_settings[0][1]
         if settings is not None and _echo_enabled:
             click.echo(
                 click.style(
@@ -101,7 +107,7 @@ def set_settings(ctx, instance=None):
             )
 
     if settings is None:
-        if instance is None and "--help" not in click.get_os_args():
+        if instance is None and "--help" not in sys.argv:
             if ctx.invoked_subcommand and ctx.invoked_subcommand not in [
                 "init",
             ]:
@@ -117,6 +123,18 @@ def set_settings(ctx, instance=None):
             settings = LazySettings()
 
 
+def import__django_settings(django_settings_module):
+    """Import the Django settings module from the string importable path."""
+    try:
+        with redirect_stdout(None):
+            module = importlib.import_module(django_settings_module)
+    except ImportError as e:
+        raise click.UsageError(e)
+    except FileNotFoundError:
+        return
+    return module
+
+
 def import_settings(dotted_path):
     """Import settings instance from python dotted path.
 
@@ -130,8 +148,10 @@ def import_settings(dotted_path):
         raise click.UsageError(
             f"invalid path to settings instance: {dotted_path}"
         )
+
     try:
-        module = importlib.import_module(module)
+        with redirect_stdout(None):
+            module = importlib.import_module(module)
     except ImportError as e:
         raise click.UsageError(e)
     except FileNotFoundError:
@@ -297,7 +317,7 @@ def init(ctx, fileformat, path, env, _vars, _secrets, wg, y, django):
             "app = Flask(__name__)\n"
             "FlaskDynaconf(app)\n"
         )
-        exit(1)
+        sys.exit(1)
 
     path = Path(path)
 
@@ -485,7 +505,7 @@ def get(key, default, env, unparse):
         result = unparse_conf_data(result)
 
     if isinstance(result, (dict, list, tuple)):
-        result = json.dumps(result, sort_keys=True)
+        result = json.dumps(prepare_json(result), sort_keys=True, default=repr)
 
     click.echo(result, nl=False)
 
@@ -530,7 +550,24 @@ def get(key, default, env, unparse):
     default=False,
     help="Output file is flat (do not include [env] name)",
 )
-def _list(env, key, more, loader, _all=False, output=None, flat=False):
+@click.option(
+    "--json",
+    "_json",
+    "-j",
+    is_flag=True,
+    default=False,
+    help="Prints out data serialized as JSON",
+)
+def _list(
+    env,
+    key,
+    more,
+    loader,
+    _all=False,
+    output=None,
+    flat=False,
+    _json=False,
+):
     """
     Lists user defined settings or all (including internal configs).
 
@@ -552,14 +589,15 @@ def _list(env, key, more, loader, _all=False, output=None, flat=False):
     if cur_env == "main":
         flat = True
 
-    click.echo(
-        click.style(
-            f"Working in {cur_env} environment ",
-            bold=True,
-            bg="bright_blue",
-            fg="bright_white",
+    if not _json:
+        click.echo(
+            click.style(
+                f"Working in {cur_env} environment ",
+                bold=True,
+                bg="bright_blue",
+                fg="bright_white",
+            )
         )
-    )
 
     if not loader:
         data = settings.as_dict(env=env, internal=_all)
@@ -585,14 +623,20 @@ def format_setting(_k, _v):
         return f"{key}{data_type} {value}"
 
     if not key:
-        datalines = "\n".join(
-            format_setting(k, v)
-            for k, v in data.items()
-            if k not in data.get("RENAMED_VARS", [])
-        )
-        (click.echo_via_pager if more else click.echo)(datalines)
+        if not _json:
+            datalines = "\n".join(
+                format_setting(k, v)
+                for k, v in data.items()
+                if k not in data.get("RENAMED_VARS", [])
+            )
+            (click.echo_via_pager if more else click.echo)(datalines)
         if output:
-            loaders.write(output, data, env=not flat and cur_env)
+            loaders.write(output, prepare_json(data), env=not flat and cur_env)
+        if _json:
+            json_data = json.dumps(
+                prepare_json(data), sort_keys=True, default=repr
+            )
+            click.echo(json_data, nl=False)
     else:
         key = upperfy(key)
 
@@ -603,11 +647,18 @@ def format_setting(_k, _v):
 
         if value is empty:
             click.secho("Key not found", bg="red", fg="white", err=True)
-            return
+            sys.exit(1)
 
-        click.echo(format_setting(key, value))
+        if not _json:
+            click.echo(format_setting(key, value))
         if output:
-            loaders.write(output, {key: value}, env=not flat and cur_env)
+            loaders.write(
+                output, prepare_json({key: value}), env=not flat and cur_env
+            )
+        if _json:
+            click.echo(
+                json.dumps(prepare_json({key: value}), default=repr), nl=True
+            )
 
     if env:
         settings.setenv()
@@ -813,7 +864,10 @@ def validate(path):  # pragma: no cover
 @main.command()
 @click.option("--key", "-k", help="Filters result by key.")
 @click.option(
-    "--env", "-e", help="Filters result by environment.", default=None
+    "--env",
+    "-e",
+    help="Filters result by environment on --report-mode=inspect.",
+    default=None,
 )
 @click.option(
     "--format",
@@ -826,7 +880,7 @@ def validate(path):  # pragma: no cover
     "--old-first",
     "new_first",
     "-s",
-    help="Invert history sorting to 'old-first'",
+    help="Invert history sorting to 'old-first' on --report-mode=inspect.",
     default=True,
     is_flag=True,
 )
@@ -836,7 +890,7 @@ def validate(path):  # pragma: no cover
     "-n",
     default=None,
     type=int,
-    help="Limits how many history entries are shown.",
+    help="Limits how many history entries are shown on --report-mode=inspect.",
 )
 @click.option(
     "--all",
@@ -846,28 +900,54 @@ def validate(path):  # pragma: no cover
     is_flag=True,
     help="Show dynaconf internal settings?",
 )
+@click.option(
+    "--report-mode",
+    "report_mode",
+    "-m",
+    default="inspect",
+    type=click.Choice(["inspect", "debug"]),
+)
+@click.option(
+    "-v",
+    "--verbose",
+    count=True,
+    help="Increase verbosity of the output on --report-mode=debug.",
+)
 def inspect(
-    key, env, format, new_first, history_limit, _all
+    key, env, format, new_first, history_limit, _all, report_mode, verbose
 ):  # pragma: no cover
     """
     Inspect the loading history of the given settings instance.
 
     Filters by key and environment, otherwise shows all.
     """
-    try:
-        inspect_settings(
+
+    if report_mode == "debug":
+        print_debug_info(
             settings,
-            key=key,
-            env=env or None,
             dumper=format,
-            new_first=new_first,
-            include_internal=_all,
-            history_limit=history_limit,
-            print_report=True,
+            verbosity=verbose,
+            key=key,
         )
         click.echo()
-    except (KeyNotFoundError, EnvNotFoundError, OutputFormatError) as err:
-        click.echo(err)
+    elif report_mode == "inspect":
+        try:
+            inspect_settings(
+                settings,
+                key=key,
+                env=env or None,
+                dumper=format,
+                new_first=new_first,
+                include_internal=_all,
+                history_limit=history_limit,
+                print_report=True,
+            )
+            click.echo()
+        except (KeyNotFoundError, EnvNotFoundError, OutputFormatError) as err:
+            click.echo(err)
+            sys.exit(1)
+    else:
+        click.echo("Invalid report mode")
         sys.exit(1)
 
 
diff --git a/libs/dynaconf/default_settings.py b/libs/dynaconf/default_settings.py
index 8b864694cd..3ae857bf23 100644
--- a/libs/dynaconf/default_settings.py
+++ b/libs/dynaconf/default_settings.py
@@ -191,6 +191,7 @@ def reload(load_dotenv=None, *args, **kwargs):
 VAULT_SECRET_ID_FOR_DYNACONF = get("VAULT_SECRET_ID_FOR_DYNACONF", None)
 VAULT_USERNAME_FOR_DYNACONF = get("VAULT_USERNAME_FOR_DYNACONF", None)
 VAULT_PASSWORD_FOR_DYNACONF = get("VAULT_PASSWORD_FOR_DYNACONF", None)
+VAULT_TOKEN_RENEW_FOR_DYNACONF = get("VAULT_TOKEN_RENEW_FOR_DYNACONF", False)
 
 # Only core loaders defined on this list will be invoked
 core_loaders = ["YAML", "TOML", "INI", "JSON", "PY"]
diff --git a/libs/dynaconf/hooking.py b/libs/dynaconf/hooking.py
index 092deb46e8..d7308e3018 100644
--- a/libs/dynaconf/hooking.py
+++ b/libs/dynaconf/hooking.py
@@ -18,6 +18,7 @@
     "MethodValue",
     "Action",
     "HookableSettings",
+    "post_hook",
 ]
 
 
@@ -312,7 +313,7 @@ def _initialize(self):
             self._settings = Settings(
                 dynaconf_skip_loaders=True,
                 dynaconf_skip_validators=True,
-                _store=self._original_settings._store._safe_copy(),
+                _store=self._original_settings._store.copy(bypass_eval=True),
             )
 
     def __getattr__(self, attr):
@@ -341,3 +342,41 @@ def __setattr__(self, attr, value):
         else:
             self._initialize()
             setattr(self._settings, attr, value)
+
+
+def post_hook(function: Callable) -> Callable:
+    """This decorator marks a function as a post hook.
+    This works by adding the _dynaconf_hook attribute to the function,
+    then the python loader, when reading the module, will look for
+    this attribute and register the function as a post_hook for the settings.
+
+    e.g: On a settings file with .py extension:
+
+    from dynaconf import post_hook
+    @post_hook
+    def set_log_handlers(settings) -> dict:
+        data = {}  # data to be merged into settings
+
+        # conditionals
+        if (logging := settings.get('LOGGING')) is not None:
+            # do something with logging
+            # add it back to data
+            data['LOGGING'] = logging
+        return data
+    """
+    try:
+        function._dynaconf_hook = True  # type: ignore
+        function._called = False  # type: ignore
+        function._dynaconf_hook_source = function.__module__  # type: ignore
+    except (AttributeError, TypeError):
+        raise TypeError(
+            "post_hook decorator must be applied to a function or method."
+        )
+    else:
+        # On the same scope where the decorated function is defined we
+        # add a variable with the same name as the function but prefixed
+        # with _dynaconf_hook_ this variable will be used by the loader
+        # to register the function as a post_hook
+        function.__globals__[f"_dynaconf_hook_{function.__name__}"] = function
+
+    return function
diff --git a/libs/dynaconf/loaders/__init__.py b/libs/dynaconf/loaders/__init__.py
index 153b64d5c7..1879cf8d5b 100644
--- a/libs/dynaconf/loaders/__init__.py
+++ b/libs/dynaconf/loaders/__init__.py
@@ -2,6 +2,7 @@
 
 import importlib
 import os
+from contextlib import suppress
 from typing import Callable
 from typing import TYPE_CHECKING
 
@@ -12,6 +13,7 @@
 from dynaconf.loaders import py_loader
 from dynaconf.loaders import toml_loader
 from dynaconf.loaders import yaml_loader
+from dynaconf.loaders.base import SourceMetadata
 from dynaconf.utils import deduplicate
 from dynaconf.utils import ensure_a_list
 from dynaconf.utils.boxing import DynaBox
@@ -145,6 +147,22 @@ def execute_module_hooks(
 execute_hooks = execute_module_hooks
 
 
+def _get_unique_hook_id(hook_func, hook_source):
+    """get unique identifier for a hook function.
+    in most of cases this will be the function name@source_file
+    however, if the function is a lambda, it will be a hash of the code object.
+    because lambda functions are not hashable itself and we can't rely on its id.
+    """
+    hook_unique_id = hook_func.__name__
+    if hook_unique_id == "<lambda>":
+        frame_info = getattr(hook_func, "__code__", None)
+        if frame_info:
+            hook_unique_id = f"lambda_{hash(frame_info.co_code)}"
+        else:
+            hook_unique_id = f"lambda_{id(hook_func)}"
+    return f"{hook_unique_id}@{hook_source}"
+
+
 def _run_hook_module(hook_type, hook_module, obj, key=""):
     """
     Run a hook function from hook_module.
@@ -152,11 +170,6 @@ def _run_hook_module(hook_type, hook_module, obj, key=""):
     Given a @hook_type, a @hook_module and a settings @obj, load the function
     and execute it if found.
     """
-    hook_source = hook_module.__file__
-
-    # check if already loaded
-    if hook_type in obj._loaded_hooks.get(hook_source, {}):
-        return
 
     # check errors
     if hook_module and getattr(hook_module, "_error", False):
@@ -164,9 +177,12 @@ def _run_hook_module(hook_type, hook_module, obj, key=""):
             raise hook_module._error
 
     # execute hook
+    hook_source = hook_module.__file__
     hook_func = getattr(hook_module, hook_type, None)
     if hook_func:
-        _run_hook_function(obj, hook_type, hook_func, hook_source, key)
+        identifier = _get_unique_hook_id(hook_func, hook_source)
+        if hook_type not in obj._loaded_hooks.get(identifier, {}):
+            _run_hook_function(obj, hook_type, hook_func, hook_source, key)
 
 
 def _run_hook_function(
@@ -182,15 +198,27 @@ def _run_hook_function(
     It execute @hook_func, update the results into settings @obj and
     add it to _loaded_hook registry ([@hook_source][@hook_type])
     """
+    # if the function has a _dynaconf_hook_source attribute set
+    # hook_source to it
+    hook_source = getattr(hook_func, "_dynaconf_hook_source", hook_source)
+
     # optional settings argument
     try:
         hook_dict = hook_func(obj.dynaconf.clone())
     except TypeError:
         hook_dict = hook_func()
 
-    # update obj settings
+    # mark as called so executors such as `load_file` can avoid calling it again
+    with suppress(AttributeError, TypeError):
+        # callable may not be writable, the caveat is that it will be called again in case of reload
+        # however, this must not be a problem since the function should be idempotent
+        # and documentation warns about this behavior.
+        hook_func._called = True
+
+    identifier = _get_unique_hook_id(hook_func, hook_source)
+
     if hook_dict:
-        identifier = f"{hook_func.__name__}@{hook_source}"
+        # update obj settings
         merge = hook_dict.pop(
             "dynaconf_merge", hook_dict.pop("DYNACONF_MERGE", False)
         )
@@ -211,7 +239,7 @@ def _run_hook_function(
             )
 
     # add to registry
-    obj._loaded_hooks[hook_source][hook_type] = hook_dict
+    obj._loaded_hooks[identifier][hook_type] = hook_dict
 
 
 def settings_loader(
@@ -222,6 +250,7 @@ def settings_loader(
     key=None,
     filename=None,
     validate=False,
+    identifier="settings_loader",
 ):
     """Loads from defined settings module
 
@@ -231,6 +260,8 @@ def settings_loader(
     :param silent: Boolean to raise loading errors
     :param key: Load a single key if provided
     :param filename: optional filename to override the settings_module
+    :param validate: If True validate the loaded data
+    :param identifier: A string or SourceMetadata to identify the loader
     """
     if filename is None:
         settings_module = settings_module or obj.settings_module
@@ -295,6 +326,9 @@ def settings_loader(
                 continue
 
             if mod_file.endswith(loader["ext"]):
+                if isinstance(identifier, str):
+                    # ensure it is always loader name
+                    identifier = loader["name"].lower()
                 loader["loader"].load(
                     obj,
                     filename=mod_file,
@@ -302,6 +336,7 @@ def settings_loader(
                     silent=silent,
                     key=key,
                     validate=validate,
+                    identifier=identifier,
                 )
                 continue
 
@@ -314,45 +349,73 @@ def settings_loader(
 
         # must be Python file or module
         # load from default defined module settings.py or .secrets.py if exists
-        py_loader.load(obj, mod_file, key=key, validate=validate)
+        py_loader.load(
+            obj, mod_file, key=key, validate=validate, identifier=identifier
+        )
 
         # load from the current env e.g: development_settings.py
+        # counting on the case where env is a comma separated string
         env = env or obj.current_env
-        if mod_file.endswith(".py"):
-            if ".secrets.py" == mod_file:
-                tmpl = ".{0}_{1}{2}"
-                mod_file = "secrets.py"
-            else:
-                tmpl = "{0}_{1}{2}"
-
-            dirname = os.path.dirname(mod_file)
-            filename, extension = os.path.splitext(os.path.basename(mod_file))
-            new_filename = tmpl.format(env.lower(), filename, extension)
-            env_mod_file = os.path.join(dirname, new_filename)
-            global_filename = tmpl.format("global", filename, extension)
-            global_mod_file = os.path.join(dirname, global_filename)
+        if env and isinstance(env, str):
+            for env_name in env.split(","):
+                load_from_env_named_file(
+                    obj, env_name, key, validate, identifier, mod_file
+                )
+
+
+def load_from_env_named_file(obj, env, key, validate, identifier, mod_file):
+    """Load from env named file e.g: development_settings.py"""
+    if mod_file.endswith(".py"):
+        if ".secrets.py" == mod_file:
+            tmpl = ".{0}_{1}{2}"
+            mod_file = "secrets.py"
+        else:
+            tmpl = "{0}_{1}{2}"
+
+        dirname = os.path.dirname(mod_file)
+        filename, extension = os.path.splitext(os.path.basename(mod_file))
+        new_filename = tmpl.format(env.lower(), filename, extension)
+        env_mod_file = os.path.join(dirname, new_filename)
+        global_filename = tmpl.format("global", filename, extension)
+        global_mod_file = os.path.join(dirname, global_filename)
+    else:
+        parts = mod_file.rsplit(".", 1)
+        if len(parts) > 1:
+            head, tail = parts
         else:
-            env_mod_file = f"{env.lower()}_{mod_file}"
-            global_mod_file = f"global_{mod_file}"
+            head, tail = None, parts[0]
+        tail = env_mod_file = f"{env.lower()}_{tail}"
 
-        py_loader.load(
-            obj,
-            env_mod_file,
-            identifier=f"py_{env.upper()}",
-            silent=True,
-            key=key,
-            validate=validate,
-        )
+        if head:
+            env_mod_file = f"{head}.{tail}"
+            global_mod_file = f"{head}.global_{tail}"
+        else:
+            env_mod_file = tail
+            global_mod_file = f"global_{tail}"
 
-        # load from global_settings.py
-        py_loader.load(
-            obj,
-            global_mod_file,
-            identifier="py_global",
-            silent=True,
-            key=key,
-            validate=validate,
-        )
+    source_metadata = SourceMetadata(
+        loader="py",
+        identifier=identifier,
+        env=env,
+    )
+    py_loader.load(
+        obj,
+        env_mod_file,
+        identifier=source_metadata,
+        silent=True,
+        key=key,
+        validate=validate,
+    )
+
+    # load from global_settings.py
+    py_loader.load(
+        obj,
+        global_mod_file,
+        identifier="py_global",
+        silent=True,
+        key=key,
+        validate=validate,
+    )
 
 
 def enable_external_loaders(obj):
diff --git a/libs/dynaconf/loaders/base.py b/libs/dynaconf/loaders/base.py
index e0ea23bf85..0326311784 100644
--- a/libs/dynaconf/loaders/base.py
+++ b/libs/dynaconf/loaders/base.py
@@ -78,7 +78,10 @@ def load(self, filename=None, key=None, silent=True, merge=empty):
 
         source_data = self.get_source_data(files)
 
-        if self.obj.get("ENVIRONMENTS_FOR_DYNACONF") is False:
+        if (
+            self.env == "_envless"
+            or self.obj.get("ENVIRONMENTS_FOR_DYNACONF") is False
+        ):
             self._envless_load(source_data, silent, key)
         else:
             self._load_all_envs(source_data, silent, key)
diff --git a/libs/dynaconf/loaders/env_loader.py b/libs/dynaconf/loaders/env_loader.py
index a563b4e206..97223aa557 100644
--- a/libs/dynaconf/loaders/env_loader.py
+++ b/libs/dynaconf/loaders/env_loader.py
@@ -15,34 +15,50 @@
 
     DOTENV_IMPORTED = True
 
-IDENTIFIER = "env"
+IDENTIFIER_PREFIX = "env"
 
 
-def load(obj, env=None, silent=True, key=None, validate=False):
+def load(
+    obj, env=None, silent=True, key=None, validate=False, identifier="global"
+):
     """Loads envvars with prefixes:
 
     `DYNACONF_` (default global) or `$(ENVVAR_PREFIX_FOR_DYNACONF)_`
+
+    if envvar_prefix is set to:
+      str: -> load {str}_*
+      str,str1 -> load [{str}_, {str1}_]
+      False -> load *
+      None -> return not loading anything
+
     """
     global_prefix = obj.get("ENVVAR_PREFIX_FOR_DYNACONF")
+    if global_prefix is None:
+        return
+
     if global_prefix is False or global_prefix.upper() != "DYNACONF":
         load_from_env(
             obj,
             "DYNACONF",
             key,
             silent,
-            IDENTIFIER + "_global",
+            f"{IDENTIFIER_PREFIX}_{identifier}",
             validate=validate,
         )
 
     # Load the global env if exists and overwrite everything
-    load_from_env(
-        obj,
-        global_prefix,
-        key,
-        silent,
-        IDENTIFIER + "_global",
-        validate=validate,
-    )
+    # if the prefix is separated by comma then load all prefixes
+    # counting on the case where global_prefix is set to None, False or ""
+    prefixes = global_prefix.split(",") if global_prefix else [global_prefix]
+    for prefix in prefixes:
+        load_from_env(
+            obj,
+            prefix,
+            key,
+            silent,
+            f"{IDENTIFIER_PREFIX}_{identifier}",
+            validate=validate,
+        )
 
 
 def load_from_env(
@@ -50,7 +66,7 @@ def load_from_env(
     prefix=False,
     key=None,
     silent=False,
-    identifier=IDENTIFIER,
+    identifier=IDENTIFIER_PREFIX,
     env=False,  # backwards compatibility bc renamed param
     validate=False,
 ):
@@ -66,7 +82,7 @@ def load_from_env(
         env_ = f"{prefix}_"
 
     # set source metadata
-    source_metadata = SourceMetadata(identifier, "unique", "global")
+    source_metadata = SourceMetadata(identifier, prefix, "global")
 
     # Load a single environment variable explicitly.
     if key:
diff --git a/libs/dynaconf/loaders/ini_loader.py b/libs/dynaconf/loaders/ini_loader.py
index bf92d2a82f..6688206800 100644
--- a/libs/dynaconf/loaders/ini_loader.py
+++ b/libs/dynaconf/loaders/ini_loader.py
@@ -5,6 +5,7 @@
 from dynaconf import default_settings
 from dynaconf.constants import INI_EXTENSIONS
 from dynaconf.loaders.base import BaseLoader
+from dynaconf.loaders.base import SourceMetadata
 from dynaconf.utils import object_merge
 
 try:
@@ -13,7 +14,15 @@
     ConfigObj = None
 
 
-def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
+def load(
+    obj,
+    env=None,
+    silent=True,
+    key=None,
+    filename=None,
+    validate=False,
+    identifier="ini",
+):
     """
     Reads and loads in to "obj" a single key or all keys from source file.
 
@@ -28,10 +37,16 @@ def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
         BaseLoader.warn_not_installed(obj, "ini")
         return
 
+    # when load_file function is called directly it comes with module and line number
+    if isinstance(identifier, SourceMetadata) and identifier.loader.startswith(
+        "load_file"
+    ):
+        identifier = identifier.loader
+
     loader = BaseLoader(
         obj=obj,
         env=env,
-        identifier="ini",
+        identifier=identifier,
         extensions=INI_EXTENSIONS,
         file_reader=lambda fileobj: ConfigObj(fileobj).dict(),
         string_reader=lambda strobj: ConfigObj(strobj.split("\n")).dict(),
diff --git a/libs/dynaconf/loaders/json_loader.py b/libs/dynaconf/loaders/json_loader.py
index 7bf9961bea..d48137abb1 100644
--- a/libs/dynaconf/loaders/json_loader.py
+++ b/libs/dynaconf/loaders/json_loader.py
@@ -6,6 +6,7 @@
 from dynaconf import default_settings
 from dynaconf.constants import JSON_EXTENSIONS
 from dynaconf.loaders.base import BaseLoader
+from dynaconf.loaders.base import SourceMetadata
 from dynaconf.utils import object_merge
 from dynaconf.utils.parse_conf import try_to_encode
 
@@ -15,7 +16,15 @@
     commentjson = None
 
 
-def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
+def load(
+    obj,
+    env=None,
+    silent=True,
+    key=None,
+    filename=None,
+    validate=False,
+    identifier="json",
+):
     """
     Reads and loads in to "obj" a single key or all keys from source file.
 
@@ -35,10 +44,16 @@ def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
         file_reader = json.load
         string_reader = json.loads
 
+    # when load_file function is called directly it comes with module and line number
+    if isinstance(identifier, SourceMetadata) and identifier.loader.startswith(
+        "load_file"
+    ):
+        identifier = identifier.loader
+
     loader = BaseLoader(
         obj=obj,
         env=env,
-        identifier="json",
+        identifier=identifier,
         extensions=JSON_EXTENSIONS,
         file_reader=file_reader,
         string_reader=string_reader,
diff --git a/libs/dynaconf/loaders/py_loader.py b/libs/dynaconf/loaders/py_loader.py
index f8f5755058..320d56fb85 100644
--- a/libs/dynaconf/loaders/py_loader.py
+++ b/libs/dynaconf/loaders/py_loader.py
@@ -37,7 +37,12 @@ def load(
         return
 
     # setup SourceMetadata (for inspecting)
-    loader_identifier = SourceMetadata(identifier, mod.__name__, "global")
+    if isinstance(identifier, SourceMetadata):
+        loader_identifier = SourceMetadata(
+            identifier.loader, mod.__name__, identifier.env
+        )
+    else:
+        loader_identifier = SourceMetadata(identifier, mod.__name__, "global")
 
     load_from_python_object(
         obj, mod, settings_module, key, loader_identifier, validate=validate
@@ -52,13 +57,13 @@ def load_from_python_object(
         file_merge = getattr(mod, "DYNACONF_MERGE", empty)
 
     for setting in dir(mod):
+        setting_value = getattr(mod, setting)
         # A setting var in a Python file should start with upper case
         # valid: A_value=1, ABC_value=3 A_BBB__default=1
         # invalid: a_value=1, MyValue=3
         # This is to avoid loading functions, classes and built-ins
         if setting.split("__")[0].isupper():
             if key is None or key == setting:
-                setting_value = getattr(mod, setting)
                 obj.set(
                     setting,
                     setting_value,
@@ -66,6 +71,14 @@ def load_from_python_object(
                     merge=file_merge,
                     validate=validate,
                 )
+        # if setting (name) starts with _dynaconf_hook
+        # and the value is a callable
+        # then we want to add it to the post_hooks list on the obj
+        # we use the name instead checking on an attribute to avoid
+        # loading a lazy object early in the process
+        elif setting.startswith("_dynaconf_hook") and callable(setting_value):
+            if setting_value not in obj._post_hooks:
+                obj._post_hooks.append(setting_value)
 
     obj._loaded_py_modules.append(mod.__name__)
     obj._loaded_files.append(mod.__file__)
@@ -88,7 +101,10 @@ def try_to_load_from_py_module_name(
     ctx = suppress(ImportError, TypeError) if silent else suppress()
 
     # setup SourceMetadata (for inspecting)
-    loader_identifier = SourceMetadata(identifier, name, "global")
+    if isinstance(identifier, SourceMetadata):
+        loader_identifier = identifier
+    else:
+        loader_identifier = SourceMetadata(identifier, name, "global")
 
     with ctx:
         mod = importlib.import_module(str(name))
diff --git a/libs/dynaconf/loaders/redis_loader.py b/libs/dynaconf/loaders/redis_loader.py
index d1da4e18aa..d9996d0b39 100644
--- a/libs/dynaconf/loaders/redis_loader.py
+++ b/libs/dynaconf/loaders/redis_loader.py
@@ -32,10 +32,17 @@ def load(obj, env=None, silent=True, key=None, validate=False):
 
     redis = StrictRedis(**obj.get("REDIS_FOR_DYNACONF"))
     prefix = obj.get("ENVVAR_PREFIX_FOR_DYNACONF")
+    env_list = build_env_list(obj, env or obj.current_env)
     # prefix is added to env_list to keep backwards compatibility
-    env_list = [prefix] + build_env_list(obj, env or obj.current_env)
+    if prefix:
+        env_list.insert(0, prefix)
+
     for env_name in env_list:
-        holder = f"{prefix.upper()}_{env_name.upper()}"
+        if prefix:
+            holder = f"{prefix.upper()}_{env_name.upper()}"
+        else:
+            holder = env_name.upper()
+
         try:
             source_metadata = SourceMetadata(IDENTIFIER, "unique", env_name)
             if key:
diff --git a/libs/dynaconf/loaders/toml_loader.py b/libs/dynaconf/loaders/toml_loader.py
index 42db7b366e..641ac91130 100644
--- a/libs/dynaconf/loaders/toml_loader.py
+++ b/libs/dynaconf/loaders/toml_loader.py
@@ -6,12 +6,21 @@
 from dynaconf import default_settings
 from dynaconf.constants import TOML_EXTENSIONS
 from dynaconf.loaders.base import BaseLoader
+from dynaconf.loaders.base import SourceMetadata
 from dynaconf.utils import object_merge
 from dynaconf.vendor import toml  # Backwards compatibility with uiri/toml
 from dynaconf.vendor import tomllib  # New tomllib stdlib on py3.11
 
 
-def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
+def load(
+    obj,
+    env=None,
+    silent=True,
+    key=None,
+    filename=None,
+    validate=False,
+    identifier="toml",
+):
     """
     Reads and loads in to "obj" a single key or all keys from source file.
 
@@ -22,12 +31,17 @@ def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
     :param filename: Optional custom filename to load
     :return: None
     """
+    # when load_file function is called directly it comes with module and line number
+    if isinstance(identifier, SourceMetadata) and identifier.loader.startswith(
+        "load_file"
+    ):
+        identifier = identifier.loader
 
     try:
         loader = BaseLoader(
             obj=obj,
             env=env,
-            identifier="toml",
+            identifier=identifier,
             extensions=TOML_EXTENSIONS,
             file_reader=tomllib.load,
             string_reader=tomllib.loads,
@@ -57,7 +71,7 @@ def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
         loader = BaseLoader(
             obj=obj,
             env=env,
-            identifier="toml",
+            identifier=identifier,
             extensions=TOML_EXTENSIONS,
             file_reader=toml.load,
             string_reader=toml.loads,
diff --git a/libs/dynaconf/loaders/vault_loader.py b/libs/dynaconf/loaders/vault_loader.py
index 79d757475e..36fb5e0b91 100644
--- a/libs/dynaconf/loaders/vault_loader.py
+++ b/libs/dynaconf/loaders/vault_loader.py
@@ -62,6 +62,10 @@ def get_client(obj):
             credentials.token,
             role=obj.VAULT_AUTH_ROLE_FOR_DYNACONF,
         )
+
+    if obj.VAULT_TOKEN_RENEW_FOR_DYNACONF:
+        client.auth.token.renew_self()
+
     assert client.is_authenticated(), (
         "Vault authentication error: is VAULT_TOKEN_FOR_DYNACONF or "
         "VAULT_ROLE_ID_FOR_DYNACONF defined?"
diff --git a/libs/dynaconf/loaders/yaml_loader.py b/libs/dynaconf/loaders/yaml_loader.py
index af06298383..e646e8a018 100644
--- a/libs/dynaconf/loaders/yaml_loader.py
+++ b/libs/dynaconf/loaders/yaml_loader.py
@@ -6,6 +6,7 @@
 from dynaconf import default_settings
 from dynaconf.constants import YAML_EXTENSIONS
 from dynaconf.loaders.base import BaseLoader
+from dynaconf.loaders.base import SourceMetadata
 from dynaconf.utils import object_merge
 from dynaconf.utils.parse_conf import try_to_encode
 from dynaconf.vendor.ruamel import yaml
@@ -53,7 +54,15 @@ def get_source_data(self, files):
         return data
 
 
-def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
+def load(
+    obj,
+    env=None,
+    silent=True,
+    key=None,
+    filename=None,
+    validate=False,
+    identifier="yaml",
+):
     """
     Reads and loads in to "obj" a single key or all keys from source file.
 
@@ -82,10 +91,16 @@ def load(obj, env=None, silent=True, key=None, filename=None, validate=False):
     if yaml_reader.__name__.endswith("_all"):
         _loader = AllLoader
 
+    # when load_file function is called directly it comes with module and line number
+    if isinstance(identifier, SourceMetadata) and identifier.loader.startswith(
+        "load_file"
+    ):
+        identifier = identifier.loader
+
     loader = _loader(
         obj=obj,
         env=env,
-        identifier="yaml",
+        identifier=identifier,
         extensions=YAML_EXTENSIONS,
         file_reader=yaml_reader,
         string_reader=yaml_reader,
diff --git a/libs/dynaconf/utils/__init__.py b/libs/dynaconf/utils/__init__.py
index 339a4ef296..f13cae7567 100644
--- a/libs/dynaconf/utils/__init__.py
+++ b/libs/dynaconf/utils/__init__.py
@@ -3,7 +3,9 @@
 import os
 import warnings
 from collections import defaultdict
+from functools import lru_cache
 from json import JSONDecoder
+from pathlib import Path
 from typing import Any
 from typing import Iterator
 from typing import TYPE_CHECKING
@@ -65,7 +67,8 @@ def object_merge(
         # data existing on `old` object has the correct case: key4|KEY4|Key4
         # So we need to ensure that new keys matches the existing keys
         for new_key in list(new.keys()):
-            correct_case_key = find_the_correct_casing(new_key, old)
+            all_keys = tuple(old.keys())
+            correct_case_key = find_the_correct_casing(new_key, all_keys)
             if correct_case_key:
                 new[correct_case_key] = new.pop(new_key)
 
@@ -74,10 +77,14 @@ def safe_items(data):
             Get items from DynaBox without triggering recursive evaluation
             """
             if data.__class__.__name__ == "DynaBox":
-                return data._safe_items()
+                return data.items(bypass_eval=True)
             else:
                 return data.items()
 
+        # TODO @rochacbruno: Make the above line work with 2 dynaconf_merge
+        # https://github.com/dynaconf/dynaconf/issues/todo
+        # {"a": ["d", "e"], "dynaconf_merge": True},
+
         # local mark may set dynaconf_merge=False
         should_merge = new.pop("dynaconf_merge", True)
         if should_merge:
@@ -142,6 +149,16 @@ def handle_metavalues(
             new[key] = object_merge(
                 old.get(key), new[key].unwrap(), unique=new[key].unique
             )
+        elif getattr(new[key], "_dynaconf_insert", False):
+            # Insert on `new` triggers insert with existing data
+            # if existing is a list it inserts at specified .index
+            # if existing is not a list it creates a new list with the value
+            existing = old.get(key)  # keep the same reference
+            if isinstance(existing, list):  # perform insert on it
+                existing.insert(new[key].index, new[key].unwrap())
+                new[key] = existing
+            else:
+                new[key] = [new[key].unwrap()]
 
         # Data structures containing merge tokens
         if isinstance(new.get(key), (list, tuple)):
@@ -334,14 +351,18 @@ def build_env_list(obj: Settings | LazySettings, env: str | None) -> list[str]:
     if global_env not in env_list:
         env_list.append(global_env)
 
-    # add the current env
+    # add the current env counting on the case where it is a comma separated list
     current_env = obj.current_env
-    if current_env and current_env.lower() not in env_list:
-        env_list.append(current_env.lower())
+    if current_env and isinstance(current_env, str):
+        for item in current_env.split(","):
+            if item and (_name := item.strip().lower()) not in env_list:
+                env_list.append(_name)
 
-    # add a manually set env
-    if env and env.lower() not in env_list:
-        env_list.append(env.lower())
+    # add a manually set env counting on the case where it is a comma separated list
+    if env and isinstance(env, str):
+        for item in env.split(","):
+            if item and (_name := item.strip().lower()) not in env_list:
+                env_list.append(_name)
 
     # add the [global] env
     env_list.append("global")
@@ -421,21 +442,18 @@ def recursively_evaluate_lazy_format(
 
     For example: Evaluate values inside lists and dicts
     """
-    return _recursively_evaluate_lazy_format(value, settings)
-
-
-def _recursively_evaluate_lazy_format(
-    value: Any, settings: Settings | LazySettings
-) -> Any:
-    """Recursive implementation. Separate for easier debugging."""
     if getattr(value, "_dynaconf_lazy_format", None):
         value = value(settings)
 
     if isinstance(value, list):
-        # Keep the original type, can be a BoxList
+        # This must be the right way of doing it, but breaks validators
+        # To be changed on 4.0.0
+        # for idx, item in enumerate(value):
+        #     value[idx] = _recursively_evaluate_lazy_format(item, settings)
+
         value = value.__class__(
             [
-                _recursively_evaluate_lazy_format(item, settings)
+                recursively_evaluate_lazy_format(item, settings)
                 for item in value
             ]
         )
@@ -460,21 +478,24 @@ def isnamedtupleinstance(value):
     return all(isinstance(n, str) for n in f)
 
 
-def find_the_correct_casing(key: str, data: dict[str, Any]) -> str | None:
+@lru_cache
+def find_the_correct_casing(
+    key: str, data_keys: tuple[Any, ...]
+) -> str | None:
     """Given a key, find the proper casing in data.
 
     Return 'None' for non-str key types.
 
     Arguments:
-        key {str} -- A key to be searched in data
-        data {dict} -- A dict to be searched
+        key {str} -- A key to be searched in data_keys
+        data_keys {tuple} -- A tuple with all the dict keys
 
     Returns:
         str -- The proper casing of the key in data
     """
-    if not isinstance(key, str) or key in data:
+    if not isinstance(key, str) or key in data_keys:
         return key
-    for k in data.keys():
+    for k in data_keys:
         if not isinstance(k, str):
             return None
         if k.lower() == key.lower():
@@ -482,3 +503,23 @@ def find_the_correct_casing(key: str, data: dict[str, Any]) -> str | None:
         if k.replace(" ", "_").lower() == key.lower():
             return k
     return None
+
+
+def prepare_json(data: Any) -> Any:
+    """Takes a data dict and transforms unserializable values to str for JSON.
+    {1: PosixPath("/foo")} -> {"1": "/foo"}
+    """
+    unserializable_types = (Path,)
+    if isinstance(data, dict):
+        return_data = {}
+        for key, val in data.items():
+            value = str(val) if isinstance(val, unserializable_types) else val
+            return_data[str(key)] = value
+        return return_data
+    elif isinstance(data, (list, tuple)):
+        return_data = []
+        for val in data:
+            value = str(val) if isinstance(val, unserializable_types) else val
+            return_data.append(value)
+        return return_data
+    return data
diff --git a/libs/dynaconf/utils/boxing.py b/libs/dynaconf/utils/boxing.py
index 1fc9a342f9..99420dec7c 100644
--- a/libs/dynaconf/utils/boxing.py
+++ b/libs/dynaconf/utils/boxing.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import inspect
-from functools import wraps
+from typing import Any
 
 from dynaconf.utils import find_the_correct_casing
 from dynaconf.utils import recursively_evaluate_lazy_format
@@ -9,59 +9,48 @@
 from dynaconf.vendor.box import Box
 
 
-def evaluate_lazy_format(f):
-    """Marks a method on Dynabox instance to
-    lazily evaluate LazyFormat objects upon access."""
-
-    @wraps(f)
-    def evaluate(dynabox, item, *args, **kwargs):
-        value = f(dynabox, item, *args, **kwargs)
-        settings = dynabox._box_config["box_settings"]
-
-        if getattr(value, "_dynaconf_lazy_format", None):
-            dynabox._box_config[f"raw_{item.lower()}"] = (
-                f"@{value.formatter.token} {value.value}"
-            )
-
-        return recursively_evaluate_lazy_format(value, settings)
-
-    return evaluate
-
-
 class DynaBox(Box):
     """Specialized Box for dynaconf
     it allows items/attrs to be found both in upper or lower case"""
 
-    @evaluate_lazy_format
     def __getattr__(self, item, *args, **kwargs):
         try:
-            return super().__getattr__(item, *args, **kwargs)
+            result = super().__getattr__(item, *args, **kwargs)
         except (AttributeError, KeyError):
-            n_item = find_the_correct_casing(item, self) or item
-            return super().__getattr__(n_item, *args, **kwargs)
+            all_keys = tuple(self.keys())
+            n_item = find_the_correct_casing(item, all_keys) or item
+            result = super().__getattr__(n_item, *args, **kwargs)
+        return self.__evaluate_lazy__(result)
 
-    @evaluate_lazy_format
     def __getitem__(self, item, *args, **kwargs):
         try:
-            return super().__getitem__(item, *args, **kwargs)
+            result = super().__getitem__(item, *args, **kwargs)
         except (AttributeError, KeyError):
-            n_item = find_the_correct_casing(item, self) or item
-            return super().__getitem__(n_item, *args, **kwargs)
-
-    def _safe_get(self, item, *args, **kwargs):
-        """Get item bypassing recursive evaluation"""
+            all_keys = tuple(self.keys())
+            n_item = find_the_correct_casing(item, all_keys) or item
+            result = super().__getitem__(n_item, *args, **kwargs)
+        return self.__evaluate_lazy__(result)
+
+    def get(
+        self, item, default=None, bypass_eval=False, *args, **kwargs
+    ) -> Any:
+        # _TODO(pbrochad): refactor all these getter methods to make consistency easier
+        if not bypass_eval:
+            all_keys = tuple(self.keys())
+            n_item = find_the_correct_casing(item, all_keys) or item
+            result = super().get(n_item, empty, *args, **kwargs)
+            result = result if result is not empty else default
+            return self.__evaluate_lazy__(result)
         try:
             return super().__getitem__(item, *args, **kwargs)
         except (AttributeError, KeyError):
-            n_item = find_the_correct_casing(item, self) or item
+            all_keys = tuple(self.keys())
+            n_item = find_the_correct_casing(item, all_keys) or item
             return super().__getitem__(n_item, *args, **kwargs)
 
-    def _safe_copy(self):
-        """Copy bypassing lazy evaluation"""
-        return self.__class__(
-            {k: self._safe_get(k) for k in self.keys()},
-            box_settings=self._box_config.get("box_settings"),
-        )
+    def __evaluate_lazy__(self, result):
+        settings = self._box_config["box_settings"]
+        return recursively_evaluate_lazy_format(result, settings)
 
     def __copy__(self):
         return self.__class__(
@@ -69,18 +58,17 @@ def __copy__(self):
             box_settings=self._box_config.get("box_settings"),
         )
 
-    def copy(self):
+    def copy(self, bypass_eval=False):
+        if not bypass_eval:
+            return self.__class__(
+                super(Box, self).copy(),
+                box_settings=self._box_config.get("box_settings"),
+            )
         return self.__class__(
-            super(Box, self).copy(),
+            {k: self.get(k, bypass_eval=True) for k in self.keys()},
             box_settings=self._box_config.get("box_settings"),
         )
 
-    @evaluate_lazy_format
-    def get(self, item, default=None, *args, **kwargs):
-        n_item = find_the_correct_casing(item, self) or item
-        value = super().get(n_item, empty, *args, **kwargs)
-        return value if value is not empty else default
-
     def __dir__(self):
         keys = list(self.keys())
         reserved = [
diff --git a/libs/dynaconf/utils/inspect.py b/libs/dynaconf/utils/inspect.py
index eee06f0de0..b0a7c1ee0a 100644
--- a/libs/dynaconf/utils/inspect.py
+++ b/libs/dynaconf/utils/inspect.py
@@ -4,7 +4,10 @@
 
 import json
 import sys
+from contextlib import suppress
 from functools import partial
+from importlib.metadata import PackageNotFoundError
+from importlib.metadata import version
 from pathlib import PosixPath
 from typing import Any
 from typing import Callable
@@ -17,6 +20,7 @@
 from dynaconf.loaders.base import SourceMetadata
 from dynaconf.utils.boxing import DynaBox
 from dynaconf.utils.functional import empty
+from dynaconf.utils.parse_conf import Lazy
 from dynaconf.vendor.box.box_list import BoxList
 from dynaconf.vendor.ruamel.yaml import YAML
 
@@ -27,11 +31,21 @@
 
 # Dumpers config
 
-json_pretty = partial(json.dump, indent=2)
-json_compact = json.dump
+json_pretty = partial(json.dump, indent=2, default=str)
+json_compact = partial(json.dump, default=str)
+
+
+def yaml_dumper_with_defaults(data: dict, text_stream: TextIO) -> None:
+    """Easier way to get YAML dumper to handle unseralizable types"""
+    yaml = YAML()
+    # let JSON handle unserializable types and then load it back
+    data = json.loads(json.dumps(data, default=str))
+    yaml.default_flow_style = False
+    yaml.dump(data, text_stream)
+
 
 builtin_dumpers = {
-    "yaml": YAML().dump,
+    "yaml": yaml_dumper_with_defaults,
     "json": json_pretty,
     "json-compact": json_compact,
 }
@@ -311,7 +325,7 @@ def _get_data_by_key(
     key_dotted_path: str,
     default: Any = None,
     sep="__",
-):
+) -> Any:
     """
     Returns value found in data[key] using dot-path str (e.g, "path.to.key").
     Raises KeyError if not found
@@ -322,13 +336,19 @@ def _get_data_by_key(
     if sep in key_dotted_path:
         key_dotted_path = key_dotted_path.replace(sep, ".")
 
+    def handle_repr(value):
+        # lazy values shouldnt be evaluated for inspecting
+        if isinstance(value, Lazy):
+            return value._dynaconf_encode()
+        return value
+
     def traverse_data(data, path):
         # transform `a.b.c` in successive calls to `data['a']['b']['c']`
         path = path.split(".")
         root_key, nested_keys = path[0], path[1:]
-        result = data[root_key]
+        result = data.get(root_key, bypass_eval=True)
         for key in nested_keys:
-            result = result[key]
+            result = handle_repr(result.get(key, bypass_eval=True))
         return result
 
     try:
@@ -337,3 +357,131 @@ def traverse_data(data, path):
         if not default:
             raise KeyError(f"Path not found in data: {key_dotted_path!r}")
         return default
+
+
+def get_debug_info(
+    settings: Settings | LazySettings,
+    verbosity: int = 0,
+    key: str | None = None,
+) -> dict:
+    """Returns a dict with debug info about the settings object"""
+
+    if key:
+        verbosity = 2
+
+    def filter_by_key(data: dict) -> dict:
+        """If key is not None, filter dict keeping only the key"""
+        if key and data:
+            try:
+                return {key: _get_data_by_key(data, key)}
+            except KeyError:
+                return {}
+        return data
+
+    def build_loading_history() -> list[dict]:
+        _data = []
+        for (
+            source_metadata,
+            source_data,
+        ) in settings._loaded_by_loaders.items():
+            _real_data = filter_by_key(source_data)
+            if verbosity == 0:
+                _data.append(
+                    {
+                        "loader": source_metadata.loader,
+                        "identifier": source_metadata.identifier,
+                        "data": len(_real_data),
+                    }
+                )
+            elif verbosity == 1:
+                _data.append(
+                    {
+                        "loader": source_metadata.loader,
+                        "identifier": source_metadata.identifier,
+                        "data": list(_real_data.keys()),
+                    }
+                )
+            else:
+                _data.append(
+                    {
+                        "loader": source_metadata.loader,
+                        "identifier": source_metadata.identifier,
+                        "data": _real_data,
+                    }
+                )
+        return _data
+
+    def build_loaded_hooks():
+        _data = []
+        for hook, hook_data in settings._loaded_hooks.items():
+            _real_data = filter_by_key(hook_data.get("post", {})) or {}
+            if verbosity == 0:
+                _data.append(
+                    {
+                        "hook": str(hook),
+                        "data": len(_real_data),
+                    }
+                )
+            elif verbosity == 1:
+                _data.append(
+                    {
+                        "hook": str(hook),
+                        "data": list(_real_data.keys()),
+                    }
+                )
+            else:
+                _data.append(
+                    {
+                        "hook": str(hook),
+                        "data": _real_data,
+                    }
+                )
+        return _data
+
+    data = {
+        "versions": {
+            "dynaconf": version("dynaconf"),
+        },
+        "root_path": settings._root_path,
+        "validators": [str(v) for v in settings.validators],
+        "core_loaders": settings._loaders,
+        "loaded_files": settings._loaded_files,
+        "history": build_loading_history(),
+        "post_hooks": [str(h) for h in settings._post_hooks],
+        "loaded_hooks": build_loaded_hooks(),
+    }
+    for name in ["django", "flask", "fastapi", "starlette"]:
+        with suppress(PackageNotFoundError):
+            data["versions"][name] = version(name)
+
+    if settings.get("ENVIRONMENTS_FOR_DYNACONF"):
+        environments = settings.get("ENVIRONMENTS_FOR_DYNACONF")
+        if isinstance(environments, (list, tuple)):
+            data["environments"] = list(environments)
+        else:
+            data["environments"] = environments
+        data["loaded_envs"] = settings._loaded_envs
+
+    if key:
+        data["current"] = {key: settings.get(key)}
+    return data
+
+
+def print_debug_info(
+    settings: Settings | LazySettings,
+    *,
+    dumper: DumperPreset | DumperType | None = None,
+    verbosity: int = 0,
+    key: str | None = None,
+):
+    """Calls dumper with settings debug info"""
+    dumper = dumper or "yaml"
+    if isinstance(dumper, str):
+        dumper = builtin_dumpers.get(dumper)
+        if dumper is None:
+            raise OutputFormatError(
+                f"The desired format is not available: {dumper!r}"
+            )
+
+    data = get_debug_info(settings, verbosity, key)
+    dumper(data, sys.stdout)
diff --git a/libs/dynaconf/utils/parse_conf.py b/libs/dynaconf/utils/parse_conf.py
index 74036208a1..f443105561 100644
--- a/libs/dynaconf/utils/parse_conf.py
+++ b/libs/dynaconf/utils/parse_conf.py
@@ -133,7 +133,12 @@ def __init__(self, value, box_settings, unique=False):
                     }
                 elif "," in self.value:
                     # @merge foo,bar
-                    self.value = self.value.split(",")
+                    self.value = [
+                        parse_conf_data(
+                            v, tomlfy=True, box_settings=box_settings
+                        )
+                        for v in self.value.split(",")
+                    ]
                 else:
                     # @merge foo
                     self.value = [self.value]
@@ -141,6 +146,52 @@ def __init__(self, value, box_settings, unique=False):
         self.unique = unique
 
 
+class Insert(MetaValue):
+    """Triggers the value to be inserted into a list at specific index"""
+
+    _dynaconf_insert = True
+
+    def __init__(self, value, box_settings):
+        """
+        normally value will be a string like
+        `0 foo` or `-1 foo` and needs to get split
+        but value can also be just a single string with or without space
+        like `foo` and in this case it will be treated as `0 foo`
+        but it can also be `foo bar` and in this case it will be treated as `0 foo bar`
+        we need to check if the first part is a number
+        if it is not a number then we will treat it as `0 value`
+        if it is a number then we will split it as `index, value`
+        this must use a regex to match value, examples:
+            -1 foo -> index = -1, value = foo
+            0 foo -> index = 0, value = foo
+            0 foo bar -> index = 0, value = foo bar
+            0 42 -> index = 0, value = 42
+            0 42 foo -> index = 0, value = 42 foo
+            foo -> index = 0, value = foo
+            foo bar -> index = 0, value = foo bar
+            42 -> index = 0, value = 42
+            42 foo -> index = 42, value = foo
+            42 foo bar -> index = 42, value = foo bar
+        """
+        self.box_settings = box_settings
+
+        try:
+            if value.lstrip("-+")[0].isdigit():
+                # `0 foo` or `-1 foo` or `42 foo` or `42`(raise ValueError)
+                index, value = value.split(" ", 1)
+            else:
+                # `foo` or `foo bar`
+                index, value = 0, value
+        except ValueError:
+            # `42` or any other non split able value
+            index, value = 0, value
+
+        self.index = int(index)
+        self.value = parse_conf_data(
+            value, tomlfy=True, box_settings=box_settings
+        )
+
+
 class BaseFormatter:
     def __init__(self, function, token):
         self.function = function
@@ -219,8 +270,14 @@ def __init__(
         self, value=empty, formatter=Formatters.python_formatter, casting=None
     ):
         self.value = value
-        self.formatter = formatter
         self.casting = casting
+        # Sometimes a simple function is passed to the formatter.
+        # but on evaluation-time, we may need to access `formatter.token`
+        # so we are wrapping the fn to comply with this interface.
+        if isinstance(formatter, BaseFormatter):
+            self.formatter = formatter
+        else:
+            self.formatter = BaseFormatter(formatter, "lambda")
 
     @property
     def context(self):
@@ -303,6 +360,7 @@ def evaluate(settings, *args, **kwargs):
     "@merge_unique": lambda value, box_settings: Merge(
         value, box_settings, unique=True
     ),
+    "@insert": Insert,
     "@get": lambda value: Lazy(value, formatter=Formatters.get_formatter),
     # Special markers to be used as placeholders e.g: in prefilled forms
     # will always return None when evaluated
@@ -443,7 +501,7 @@ def parse_conf_data(data, tomlfy=False, box_settings=None):
         # recursively parse inner dict items
         # It is important to keep the same object id because
         # of mutability
-        for k, v in data._safe_items():
+        for k, v in data.items(bypass_eval=True):
             data[k] = parse_conf_data(
                 v, tomlfy=tomlfy, box_settings=box_settings
             )
diff --git a/libs/dynaconf/validator.py b/libs/dynaconf/validator.py
index 37e2f7f785..cbd95b9a2f 100644
--- a/libs/dynaconf/validator.py
+++ b/libs/dynaconf/validator.py
@@ -11,6 +11,7 @@
 from dynaconf import validator_conditions
 from dynaconf.utils import ensure_a_list
 from dynaconf.utils.functional import empty
+from dynaconf.utils.parse_conf import Lazy
 
 if TYPE_CHECKING:
     from dynaconf.base import LazySettings  # noqa: F401
@@ -128,6 +129,21 @@ def __init__(
         if condition is not None and not callable(condition):
             raise TypeError("condition must be callable")
 
+        # in the case that:
+        # * default is a Lazy object AND
+        # * there isnt any validate operation to perform (that would require knowing the lazy value)
+        # Then we shouldnt trigger the Lazy evaluation
+        self.should_call_lazy = not all(
+            (
+                default,
+                isinstance(default, Lazy),
+                not must_exist,
+                not required,
+                not cast,
+                not operations,
+            )
+        )
+
         self.names = names
         self.must_exist = must_exist if must_exist is not None else required
         self.condition = condition
@@ -243,11 +259,10 @@ def _validate_items(
                 continue
 
             if self.default is not empty:
-                default_value = (
-                    self.default(settings, self)
-                    if callable(self.default)
-                    else self.default
-                )
+                if callable(self.default) and self.should_call_lazy:
+                    default_value = self.default(settings, self)
+                else:
+                    default_value = self.default
             else:
                 default_value = empty
 
@@ -292,8 +307,11 @@ def _validate_items(
             # by settings.setdefault above
             # however we need to cast it
             # so we call .set again
-            value = self.cast(settings.get(name))
-            settings.set(name, value, validate=False)
+            if self.should_call_lazy:
+                value = self.cast(settings.get(name))
+            settings.set(
+                name, value, validate=False, loader_identifier="validator"
+            )
 
             # is there a callable condition?
             if self.condition is not None:
diff --git a/libs/dynaconf/vendor/box/box.py b/libs/dynaconf/vendor/box/box.py
index 9ad66d71f0..55a9ea579a 100644
--- a/libs/dynaconf/vendor/box/box.py
+++ b/libs/dynaconf/vendor/box/box.py
@@ -15,9 +15,9 @@
 _J='default_box'
 _I='utf-8'
 _H='_box_config'
-_G=True
-_F='camel_killer_box'
-_E='conversion_box'
+_G='camel_killer_box'
+_F='conversion_box'
+_E=True
 _D='frozen_box'
 _C='__safe_keys'
 _B=False
@@ -52,10 +52,10 @@ def _parse_box_dots(item):
 def _get_box_config():return{_Q:_B,_C:{}}
 class Box(dict):
 	_protected_keys=['to_dict','to_json','to_yaml','from_yaml','from_json','from_toml','to_toml','merge_update']+[A for A in dir({})if not A.startswith('_')]
-	def __new__(A,*D,box_settings=_A,default_box=_B,default_box_attr=NO_DEFAULT,default_box_none_transform=_G,frozen_box=_B,camel_killer_box=_B,conversion_box=_G,modify_tuples_box=_B,box_safe_prefix='x',box_duplicates=_N,box_intact_types=(),box_recast=_A,box_dots=_B,**E):C=default_box_attr;B=super(Box,A).__new__(A,*D,**E);B._box_config=_get_box_config();B._box_config.update({_J:default_box,_V:A.__class__ if C is NO_DEFAULT else C,_R:default_box_none_transform,_E:conversion_box,_S:box_safe_prefix,_D:frozen_box,_F:camel_killer_box,_T:modify_tuples_box,_O:box_duplicates,_K:tuple(box_intact_types),_L:box_recast,_P:box_dots,_W:box_settings or{}});return B
-	def __init__(A,*B,box_settings=_A,default_box=_B,default_box_attr=NO_DEFAULT,default_box_none_transform=_G,frozen_box=_B,camel_killer_box=_B,conversion_box=_G,modify_tuples_box=_B,box_safe_prefix='x',box_duplicates=_N,box_intact_types=(),box_recast=_A,box_dots=_B,**F):
-		E=default_box_attr;super().__init__();A._box_config=_get_box_config();A._box_config.update({_J:default_box,_V:A.__class__ if E is NO_DEFAULT else E,_R:default_box_none_transform,_E:conversion_box,_S:box_safe_prefix,_D:frozen_box,_F:camel_killer_box,_T:modify_tuples_box,_O:box_duplicates,_K:tuple(box_intact_types),_L:box_recast,_P:box_dots,_W:box_settings or{}})
-		if not A._box_config[_E]and A._box_config[_O]!=_N:raise BoxError('box_duplicates are only for conversion_boxes')
+	def __new__(A,*D,box_settings=_A,default_box=_B,default_box_attr=NO_DEFAULT,default_box_none_transform=_E,frozen_box=_B,camel_killer_box=_B,conversion_box=_E,modify_tuples_box=_B,box_safe_prefix='x',box_duplicates=_N,box_intact_types=(),box_recast=_A,box_dots=_B,**E):C=default_box_attr;B=super(Box,A).__new__(A,*D,**E);B._box_config=_get_box_config();B._box_config.update({_J:default_box,_V:A.__class__ if C is NO_DEFAULT else C,_R:default_box_none_transform,_F:conversion_box,_S:box_safe_prefix,_D:frozen_box,_G:camel_killer_box,_T:modify_tuples_box,_O:box_duplicates,_K:tuple(box_intact_types),_L:box_recast,_P:box_dots,_W:box_settings or{}});return B
+	def __init__(A,*B,box_settings=_A,default_box=_B,default_box_attr=NO_DEFAULT,default_box_none_transform=_E,frozen_box=_B,camel_killer_box=_B,conversion_box=_E,modify_tuples_box=_B,box_safe_prefix='x',box_duplicates=_N,box_intact_types=(),box_recast=_A,box_dots=_B,**F):
+		E=default_box_attr;super().__init__();A._box_config=_get_box_config();A._box_config.update({_J:default_box,_V:A.__class__ if E is NO_DEFAULT else E,_R:default_box_none_transform,_F:conversion_box,_S:box_safe_prefix,_D:frozen_box,_G:camel_killer_box,_T:modify_tuples_box,_O:box_duplicates,_K:tuple(box_intact_types),_L:box_recast,_P:box_dots,_W:box_settings or{}})
+		if not A._box_config[_F]and A._box_config[_O]!=_N:raise BoxError('box_duplicates are only for conversion_boxes')
 		if len(B)==1:
 			if isinstance(B[0],str):raise BoxValueError('Cannot extrapolate Box from string')
 			if isinstance(B[0],Mapping):
@@ -70,7 +70,7 @@ def __init__(A,*B,box_settings=_A,default_box=_B,default_box_attr=NO_DEFAULT,def
 		for(D,C)in F.items():
 			if B and isinstance(B[0],Mapping)and C is B[0]:C=A
 			A.__setitem__(D,C)
-		A._box_config[_Q]=_G
+		A._box_config[_Q]=_E
 	def __add__(C,other):
 		A=other;B=C.copy()
 		if not isinstance(A,dict):raise BoxTypeError(f"Box can only merge two boxes or a box and a dictionary.")
@@ -91,7 +91,7 @@ def __dir__(B):
 				else:C.add(A)
 		for A in B.keys():
 			if A not in C:
-				if B._box_config[_E]:
+				if B._box_config[_F]:
 					A=B._safe_attr(A)
 					if A:C.add(A)
 		return list(C)
@@ -114,8 +114,9 @@ def __deepcopy__(A,memodict=_A):
 	def __setstate__(A,state):B=state;A._box_config=B[_H];A.__dict__.update(B)
 	def keys(A):return super().keys()
 	def values(A):return[A[B]for B in A.keys()]
-	def items(A):return[(B,A[B])for B in A.keys()]
-	def _safe_items(A):return[(B,A._safe_get(B))for B in A.keys()]
+	def items(A,bypass_eval=_B):
+		if not bypass_eval:return[(B,A[B])for B in A.keys()]
+		return[(B,A.get(B,bypass_eval=_E))for B in A.keys()]
 	def __get_default(B,item):
 		A=B._box_config[_V]
 		if A in(B.__class__,dict):C=B.__class__(**B.__box_config())
@@ -138,14 +139,14 @@ def __recast(A,item,value):
 		return C
 	def __convert_and_store(B,item,value):
 		C=item;A=value
-		if B._box_config[_E]:D=B._safe_attr(C);B._box_config[_C][D]=C
+		if B._box_config[_F]:D=B._safe_attr(C);B._box_config[_C][D]=C
 		if isinstance(A,(int,float,str,bytes,bytearray,bool,complex,set,frozenset)):return super().__setitem__(C,A)
 		if B._box_config[_K]and isinstance(A,B._box_config[_K]):return super().__setitem__(C,A)
 		if isinstance(A,dict)and not isinstance(A,Box):A=B.__class__(A,**B.__box_config())
 		elif isinstance(A,list)and not isinstance(A,box.BoxList):
 			if B._box_config[_D]:A=_recursive_tuples(A,B.__class__,recreate_tuples=B._box_config[_T],**B.__box_config())
 			else:A=box.BoxList(A,box_class=B.__class__,**B.__box_config())
-		elif B._box_config[_T]and isinstance(A,tuple):A=_recursive_tuples(A,B.__class__,recreate_tuples=_G,**B.__box_config())
+		elif B._box_config[_T]and isinstance(A,tuple):A=_recursive_tuples(A,B.__class__,recreate_tuples=_E,**B.__box_config())
 		super().__setitem__(C,A)
 	def __getitem__(B,item,_ignore_default=_B):
 		A=item
@@ -156,7 +157,7 @@ def __getitem__(B,item,_ignore_default=_B):
 				C,F=_parse_box_dots(A)
 				if C in B.keys():
 					if hasattr(B[C],'__getitem__'):return B[C][F]
-			if B._box_config[_F]and isinstance(A,str):
+			if B._box_config[_G]and isinstance(A,str):
 				D=_camel_killer(A)
 				if D in B.keys():return super().__getitem__(D)
 			if B._box_config[_J]and not _ignore_default:return B.__get_default(A)
@@ -164,12 +165,12 @@ def __getitem__(B,item,_ignore_default=_B):
 	def __getattr__(A,item):
 		B=item
 		try:
-			try:C=A.__getitem__(B,_ignore_default=_G)
+			try:C=A.__getitem__(B,_ignore_default=_E)
 			except KeyError:C=object.__getattribute__(A,B)
 		except AttributeError as E:
 			if B=='__getstate__':raise BoxKeyError(B)from _A
 			if B==_H:raise BoxError('_box_config key must exist')from _A
-			if A._box_config[_E]:
+			if A._box_config[_F]:
 				D=A._safe_attr(B)
 				if D in A._box_config[_C]:return A.__getitem__(A._box_config[_C][D])
 			if A._box_config[_J]:return A.__get_default(B)
@@ -183,9 +184,9 @@ def __setitem__(A,key,value):
 			if D in A.keys():
 				if hasattr(A[D],'__setitem__'):return A[D].__setitem__(E,C)
 		C=A.__recast(B,C)
-		if B not in A.keys()and A._box_config[_F]:
-			if A._box_config[_F]and isinstance(B,str):B=_camel_killer(B)
-		if A._box_config[_E]and A._box_config[_O]!=_N:A._conversion_checks(B)
+		if B not in A.keys()and A._box_config[_G]:
+			if A._box_config[_G]and isinstance(B,str):B=_camel_killer(B)
+		if A._box_config[_F]and A._box_config[_O]!=_N:A._conversion_checks(B)
 		A.__convert_and_store(B,C)
 	def __setattr__(A,key,value):
 		C=value;B=key
@@ -201,8 +202,8 @@ def __delitem__(A,key):
 		if B not in A.keys()and A._box_config[_P]and isinstance(B,str)and'.'in B:
 			C,E=B.split('.',1)
 			if C in A.keys()and isinstance(A[C],dict):return A[C].__delitem__(E)
-		if B not in A.keys()and A._box_config[_F]:
-			if A._box_config[_F]and isinstance(B,str):
+		if B not in A.keys()and A._box_config[_G]:
+			if A._box_config[_G]and isinstance(B,str):
 				for D in A:
 					if _camel_killer(B)==D:B=D;break
 		super().__delitem__(B)
@@ -213,7 +214,7 @@ def __delattr__(A,item):
 		if B in A._protected_keys:raise BoxKeyError(f'Key name "{B}" is protected')
 		try:A.__delitem__(B)
 		except KeyError as D:
-			if A._box_config[_E]:
+			if A._box_config[_F]:
 				C=A._safe_attr(B)
 				if C in A._box_config[_C]:A.__delitem__(A._box_config[_C][C]);del A._box_config[_C][C];return
 			raise BoxKeyError(D)
@@ -281,7 +282,7 @@ def _safe_attr(C,attr):
 		B=attr;G=string.ascii_letters+string.digits+'_'
 		if isinstance(B,tuple):B='_'.join([str(A)for A in B])
 		B=B.decode(_I,_N)if isinstance(B,bytes)else str(B)
-		if C.__box_config()[_F]:B=_camel_killer(B)
+		if C.__box_config()[_G]:B=_camel_killer(B)
 		A=[];D=0
 		for(E,F)in enumerate(B):
 			if F in G:D=E;A.append(F)
diff --git a/libs/dynaconf/vendor/click/_termui_impl.py b/libs/dynaconf/vendor/click/_termui_impl.py
index b7a121f18f..d351cdfa11 100644
--- a/libs/dynaconf/vendor/click/_termui_impl.py
+++ b/libs/dynaconf/vendor/click/_termui_impl.py
@@ -227,9 +227,9 @@ def E(url):
 		if A.startswith(('http://','https://'))and not D and not C:import webbrowser as J;J.open(A);return 0
 		return 1
 def _translate_ch_to_exc(ch):
-	if ch=='\x03':raise KeyboardInterrupt()
-	if ch=='\x04'and not WIN:raise EOFError()
-	if ch=='\x1a'and WIN:raise EOFError()
+	if ch=='\x03':raise KeyboardInterrupt
+	if ch=='\x04'and not WIN:raise EOFError
+	if ch=='\x1a'and WIN:raise EOFError
 if WIN:
 	import msvcrt
 	@contextlib.contextmanager
diff --git a/libs/dynaconf/vendor/click/core.py b/libs/dynaconf/vendor/click/core.py
index d77137eca3..30d7694155 100644
--- a/libs/dynaconf/vendor/click/core.py
+++ b/libs/dynaconf/vendor/click/core.py
@@ -353,7 +353,7 @@ def resolve_command(D,ctx,args):
 			if split_opt(B)[0]:D.parse_args(A,A.args)
 			A.fail(f"No such command '{E}'.")
 		return B,C,args[1:]
-	def get_command(A,ctx,cmd_name):raise NotImplementedError()
+	def get_command(A,ctx,cmd_name):raise NotImplementedError
 	def list_commands(A,ctx):return[]
 class Group(MultiCommand):
 	def __init__(A,name=_A,commands=_A,**B):MultiCommand.__init__(A,name,**B);A.commands=commands or{}
diff --git a/libs/dynaconf/vendor/click/types.py b/libs/dynaconf/vendor/click/types.py
index 06604ad4ca..1ecddc531a 100644
--- a/libs/dynaconf/vendor/click/types.py
+++ b/libs/dynaconf/vendor/click/types.py
@@ -26,7 +26,7 @@ def fail(A,message,param=_A,ctx=_A):raise BadParameter(message,ctx=ctx,param=par
 class CompositeParamType(ParamType):
 	is_composite=_C
 	@property
-	def arity(self):raise NotImplementedError()
+	def arity(self):raise NotImplementedError
 class FuncParamType(ParamType):
 	def __init__(A,func):A.name=func.__name__;A.func=func
 	def convert(B,value,param,ctx):
diff --git a/libs/dynaconf/vendor/dotenv/py.typed b/libs/dynaconf/vendor/dotenv/py.typed
new file mode 100644
index 0000000000..7632ecf775
--- /dev/null
+++ b/libs/dynaconf/vendor/dotenv/py.typed
@@ -0,0 +1 @@
+# Marker file for PEP 561
diff --git a/libs/dynaconf/vendor/ruamel/yaml/error.py b/libs/dynaconf/vendor/ruamel/yaml/error.py
index 12ea45240a..bdc4430bd5 100644
--- a/libs/dynaconf/vendor/ruamel/yaml/error.py
+++ b/libs/dynaconf/vendor/ruamel/yaml/error.py
@@ -1,6 +1,5 @@
 from __future__ import absolute_import
-_E='  in "%s", line %d, column %d'
-_D='column'
+_D='  in "%s", line %d, column %d'
 _C=False
 _B='\n'
 _A=None
@@ -9,9 +8,9 @@
 if _C:from typing import Any,Dict,Optional,List,Text
 __all__=['FileMark','StringMark','CommentMark','YAMLError','MarkedYAMLError','ReusedAnchorWarning','UnsafeLoaderWarning','MarkedYAMLWarning','MarkedYAMLFutureWarning']
 class StreamMark:
-	__slots__='name','index','line',_D
+	__slots__='name','index','line','column'
 	def __init__(A,name,index,line,column):A.name=name;A.index=index;A.line=line;A.column=column
-	def __str__(A):B=_E%(A.name,A.line+1,A.column+1);return B
+	def __str__(A):B=_D%(A.name,A.line+1,A.column+1);return B
 	def __eq__(A,other):
 		B=other
 		if A.line!=B.line or A.column!=B.column:return _C
@@ -20,7 +19,7 @@ def __eq__(A,other):
 	def __ne__(A,other):return not A.__eq__(other)
 class FileMark(StreamMark):__slots__=()
 class StringMark(StreamMark):
-	__slots__='name','index','line',_D,'buffer','pointer'
+	__slots__='name','index','line','column','buffer','pointer'
 	def __init__(A,name,index,line,column,buffer,pointer):StreamMark.__init__(A,name,index,line,column);A.buffer=buffer;A.pointer=pointer
 	def get_snippet(A,indent=4,max_length=75):
 		J=' ... ';I='\x00\r\n\x85\u2028\u2029';F=max_length;E=indent
@@ -35,11 +34,11 @@ def get_snippet(A,indent=4,max_length=75):
 			if C-A.pointer>F/2-1:G=J;C-=5;break
 		K=utf8(A.buffer[B:C]);H='^';H='^ (line: {})'.format(A.line+1);return' '*E+D+K+G+_B+' '*(E+A.pointer-B+len(D))+H
 	def __str__(A):
-		B=A.get_snippet();C=_E%(A.name,A.line+1,A.column+1)
+		B=A.get_snippet();C=_D%(A.name,A.line+1,A.column+1)
 		if B is not _A:C+=':\n'+B
 		return C
 class CommentMark:
-	__slots__=_D,
+	__slots__='column',
 	def __init__(A,column):A.column=column
 class YAMLError(Exception):0
 class MarkedYAMLError(YAMLError):
diff --git a/libs/dynaconf/vendor/ruamel/yaml/events.py b/libs/dynaconf/vendor/ruamel/yaml/events.py
index 545eae2a19..c00715f419 100644
--- a/libs/dynaconf/vendor/ruamel/yaml/events.py
+++ b/libs/dynaconf/vendor/ruamel/yaml/events.py
@@ -1,8 +1,3 @@
-_F='explicit'
-_E='flow_style'
-_D='anchor'
-_C='implicit'
-_B='tag'
 _A=None
 if False:from typing import Any,Dict,Optional,List
 def CommentCheck():0
@@ -13,14 +8,14 @@ def __init__(A,start_mark=_A,end_mark=_A,comment=CommentCheck):
 		if B is CommentCheck:B=_A
 		A.comment=B
 	def __repr__(A):
-		C=[B for B in[_D,_B,_C,'value',_E,'style']if hasattr(A,B)];B=', '.join(['%s=%r'%(B,getattr(A,B))for B in C])
+		C=[B for B in['anchor','tag','implicit','value','flow_style','style']if hasattr(A,B)];B=', '.join(['%s=%r'%(B,getattr(A,B))for B in C])
 		if A.comment not in[_A,CommentCheck]:B+=', comment={!r}'.format(A.comment)
 		return'%s(%s)'%(A.__class__.__name__,B)
 class NodeEvent(Event):
-	__slots__=_D,
+	__slots__='anchor',
 	def __init__(A,anchor,start_mark=_A,end_mark=_A,comment=_A):Event.__init__(A,start_mark,end_mark,comment);A.anchor=anchor
 class CollectionStartEvent(NodeEvent):
-	__slots__=_B,_C,_E,'nr_items'
+	__slots__='tag','implicit','flow_style','nr_items'
 	def __init__(A,anchor,tag,implicit,start_mark=_A,end_mark=_A,flow_style=_A,comment=_A,nr_items=_A):NodeEvent.__init__(A,anchor,start_mark,end_mark,comment);A.tag=tag;A.implicit=implicit;A.flow_style=flow_style;A.nr_items=nr_items
 class CollectionEndEvent(Event):__slots__=()
 class StreamStartEvent(Event):
@@ -28,14 +23,14 @@ class StreamStartEvent(Event):
 	def __init__(A,start_mark=_A,end_mark=_A,encoding=_A,comment=_A):Event.__init__(A,start_mark,end_mark,comment);A.encoding=encoding
 class StreamEndEvent(Event):__slots__=()
 class DocumentStartEvent(Event):
-	__slots__=_F,'version','tags'
+	__slots__='explicit','version','tags'
 	def __init__(A,start_mark=_A,end_mark=_A,explicit=_A,version=_A,tags=_A,comment=_A):Event.__init__(A,start_mark,end_mark,comment);A.explicit=explicit;A.version=version;A.tags=tags
 class DocumentEndEvent(Event):
-	__slots__=_F,
+	__slots__='explicit',
 	def __init__(A,start_mark=_A,end_mark=_A,explicit=_A,comment=_A):Event.__init__(A,start_mark,end_mark,comment);A.explicit=explicit
 class AliasEvent(NodeEvent):__slots__=()
 class ScalarEvent(NodeEvent):
-	__slots__=_B,_C,'value','style'
+	__slots__='tag','implicit','value','style'
 	def __init__(A,anchor,tag,implicit,value,start_mark=_A,end_mark=_A,style=_A,comment=_A):NodeEvent.__init__(A,anchor,start_mark,end_mark,comment);A.tag=tag;A.implicit=implicit;A.value=value;A.style=style
 class SequenceStartEvent(CollectionStartEvent):__slots__=()
 class SequenceEndEvent(CollectionEndEvent):__slots__=()
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/REQUESTED b/libs/dynaconf/vendor/ruamel/yaml/py.typed
similarity index 100%
rename from libs/beautifulsoup4-4.12.3.dist-info/REQUESTED
rename to libs/dynaconf/vendor/ruamel/yaml/py.typed
diff --git a/libs/dynaconf/vendor/ruamel/yaml/scalarstring.py b/libs/dynaconf/vendor/ruamel/yaml/scalarstring.py
index 3175987cca..c898040752 100644
--- a/libs/dynaconf/vendor/ruamel/yaml/scalarstring.py
+++ b/libs/dynaconf/vendor/ruamel/yaml/scalarstring.py
@@ -1,5 +1,4 @@
 from __future__ import print_function,absolute_import,division,unicode_literals
-_C='comment'
 _B=False
 _A=None
 from.compat import text_type
@@ -23,11 +22,11 @@ def yaml_anchor(A,any=_B):
 		if any or A.anchor.always_dump:return A.anchor
 	def yaml_set_anchor(A,value,always_dump=_B):A.anchor.value=value;A.anchor.always_dump=always_dump
 class LiteralScalarString(ScalarString):
-	__slots__=_C;style='|'
+	__slots__='comment';style='|'
 	def __new__(A,value,anchor=_A):return ScalarString.__new__(A,value,anchor=anchor)
 PreservedScalarString=LiteralScalarString
 class FoldedScalarString(ScalarString):
-	__slots__='fold_pos',_C;style='>'
+	__slots__='fold_pos','comment';style='>'
 	def __new__(A,value,anchor=_A):return ScalarString.__new__(A,value,anchor=anchor)
 class SingleQuotedScalarString(ScalarString):
 	__slots__=();style="'"
diff --git a/libs/dynaconf/vendor/ruamel/yaml/tokens.py b/libs/dynaconf/vendor/ruamel/yaml/tokens.py
index da29fe8695..3bccfdb5b2 100644
--- a/libs/dynaconf/vendor/ruamel/yaml/tokens.py
+++ b/libs/dynaconf/vendor/ruamel/yaml/tokens.py
@@ -1,19 +1,17 @@
 from __future__ import unicode_literals
-_F=', line: '
-_E='pre_done'
-_D=False
-_C='value'
+_D=', line: '
+_C=False
 _B='_comment'
 _A=None
-if _D:from typing import Text,Any,Dict,Optional,List;from.error import StreamMark
+if _C:from typing import Text,Any,Dict,Optional,List;from.error import StreamMark
 SHOWLINES=True
 class Token:
-	__slots__='start_mark','end_mark',_B
+	__slots__='start_mark','end_mark','_comment'
 	def __init__(A,start_mark,end_mark):A.start_mark=start_mark;A.end_mark=end_mark
 	def __repr__(A):
 		C=[A for A in A.__slots__ if not A.endswith('_mark')];C.sort();B=', '.join(['%s=%r'%(B,getattr(A,B))for B in C])
 		if SHOWLINES:
-			try:B+=_F+str(A.start_mark.line)
+			try:B+=_D+str(A.start_mark.line)
 			except:pass
 		try:B+=', comment: '+str(A._comment)
 		except:pass
@@ -27,7 +25,7 @@ def add_pre_comments(A,comments):
 	def get_comment(A):return getattr(A,_B,_A)
 	@property
 	def comment(self):return getattr(self,_B,_A)
-	def move_comment(C,target,empty=_D):
+	def move_comment(C,target,empty=_C):
 		D=target;A=C.comment
 		if A is _A:return
 		if isinstance(D,(StreamEndToken,DocumentStartToken)):return
@@ -46,7 +44,7 @@ def split_comment(B):
 		if A[1]is _A:delattr(B,_B)
 		return C
 class DirectiveToken(Token):
-	__slots__='name',_C;id='<directive>'
+	__slots__='name','value';id='<directive>'
 	def __init__(A,name,value,start_mark,end_mark):Token.__init__(A,start_mark,end_mark);A.name=name;A.value=value
 class DocumentStartToken(Token):__slots__=();id='<document start>'
 class DocumentEndToken(Token):__slots__=();id='<document end>'
@@ -66,32 +64,33 @@ class ValueToken(Token):__slots__=();id=':'
 class BlockEntryToken(Token):__slots__=();id='-'
 class FlowEntryToken(Token):__slots__=();id=','
 class AliasToken(Token):
-	__slots__=_C,;id='<alias>'
+	__slots__='value',;id='<alias>'
 	def __init__(A,value,start_mark,end_mark):Token.__init__(A,start_mark,end_mark);A.value=value
 class AnchorToken(Token):
-	__slots__=_C,;id='<anchor>'
+	__slots__='value',;id='<anchor>'
 	def __init__(A,value,start_mark,end_mark):Token.__init__(A,start_mark,end_mark);A.value=value
 class TagToken(Token):
-	__slots__=_C,;id='<tag>'
+	__slots__='value',;id='<tag>'
 	def __init__(A,value,start_mark,end_mark):Token.__init__(A,start_mark,end_mark);A.value=value
 class ScalarToken(Token):
-	__slots__=_C,'plain','style';id='<scalar>'
+	__slots__='value','plain','style';id='<scalar>'
 	def __init__(A,value,plain,start_mark,end_mark,style=_A):Token.__init__(A,start_mark,end_mark);A.value=value;A.plain=plain;A.style=style
 class CommentToken(Token):
-	__slots__=_C,_E;id='<comment>'
+	__slots__='value','pre_done';id='<comment>'
 	def __init__(A,value,start_mark,end_mark):Token.__init__(A,start_mark,end_mark);A.value=value
 	def reset(A):
-		if hasattr(A,_E):delattr(A,_E)
+		B='pre_done'
+		if hasattr(A,B):delattr(A,B)
 	def __repr__(A):
 		B='{!r}'.format(A.value)
 		if SHOWLINES:
-			try:B+=_F+str(A.start_mark.line);B+=', col: '+str(A.start_mark.column)
+			try:B+=_D+str(A.start_mark.line);B+=', col: '+str(A.start_mark.column)
 			except:pass
 		return'CommentToken({})'.format(B)
 	def __eq__(A,other):
 		B=other
-		if A.start_mark!=B.start_mark:return _D
-		if A.end_mark!=B.end_mark:return _D
-		if A.value!=B.value:return _D
+		if A.start_mark!=B.start_mark:return _C
+		if A.end_mark!=B.end_mark:return _C
+		if A.value!=B.value:return _C
 		return True
 	def __ne__(A,other):return not A.__eq__(other)
\ No newline at end of file
diff --git a/libs/emoji-2.15.0.dist-info/METADATA b/libs/emoji-2.15.0.dist-info/METADATA
index ad38b69c50..4b7129ff54 100644
--- a/libs/emoji-2.15.0.dist-info/METADATA
+++ b/libs/emoji-2.15.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: emoji
 Version: 2.15.0
 Summary: Emoji for Python
@@ -30,8 +30,9 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Provides-Extra: dev
-Requires-Dist: pytest >=7.4.4 ; extra == 'dev'
-Requires-Dist: coverage ; extra == 'dev'
+Requires-Dist: pytest>=7.4.4; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Dynamic: license-file
 
 Emoji
 =====
diff --git a/libs/emoji-2.15.0.dist-info/RECORD b/libs/emoji-2.15.0.dist-info/RECORD
index 3e35e5db1f..eeafa34cf1 100644
--- a/libs/emoji-2.15.0.dist-info/RECORD
+++ b/libs/emoji-2.15.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 emoji-2.15.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-emoji-2.15.0.dist-info/LICENSE.txt,sha256=qr2kOJIUWxqqcdUw68m401hiYjUFScW5KezCFDn8JJI,1483
-emoji-2.15.0.dist-info/METADATA,sha256=kyyn-n5Ki1oYQmsl13A4FLBusuzOD9tNUxoRXNzXu8I,5663
+emoji-2.15.0.dist-info/METADATA,sha256=-CdcS3VOA-TjSZn5nRegc-V92kGrFtCvJSbjLFQ2kTY,5682
 emoji-2.15.0.dist-info/RECORD,,
 emoji-2.15.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-emoji-2.15.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+emoji-2.15.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+emoji-2.15.0.dist-info/licenses/LICENSE.txt,sha256=qr2kOJIUWxqqcdUw68m401hiYjUFScW5KezCFDn8JJI,1483
 emoji-2.15.0.dist-info/top_level.txt,sha256=UxKwtYLYBTA8ldfisbxvrXDgSz3eVBOq51i2h2ewato,6
 emoji/__init__.py,sha256=lre9bUqWcCnm3C_vrgoL1Gb3XgFq21AzfR0pFJMx8Bg,2147
 emoji/core.py,sha256=brUYVrp8gvERytZjNA9_5haRjs-XibB7Kl1WtTZWKYI,15677
diff --git a/libs/emoji-2.15.0.dist-info/WHEEL b/libs/emoji-2.15.0.dist-info/WHEEL
index 1f646157df..0885d05555 100644
--- a/libs/emoji-2.15.0.dist-info/WHEEL
+++ b/libs/emoji-2.15.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/emoji-2.15.0.dist-info/LICENSE.txt b/libs/emoji-2.15.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/emoji-2.15.0.dist-info/LICENSE.txt
rename to libs/emoji-2.15.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/engineio/async_client.py b/libs/engineio/async_client.py
index 7db3879e74..238ba52703 100644
--- a/libs/engineio/async_client.py
+++ b/libs/engineio/async_client.py
@@ -1,4 +1,6 @@
 import asyncio
+from http.cookies import SimpleCookie
+import inspect
 import signal
 import ssl
 import threading
@@ -53,10 +55,11 @@ class AsyncClient(base_client.BaseClient):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param request_timeout: A timeout in seconds for requests. The default is
                             5 seconds.
     :param http_session: an initialized ``aiohttp.ClientSession`` object to be
@@ -126,7 +129,6 @@ async def connect(self, url, headers=None, transports=None,
             if not transports:
                 raise ValueError('No valid transports provided')
         self.transports = transports or valid_transports
-        self.queue = self.create_queue()
         return await getattr(self, '_connect_' + self.transports[0])(
             url, headers or {}, engineio_path)
 
@@ -199,11 +201,15 @@ async def sleep(self, seconds=0):
         """
         return await asyncio.sleep(seconds)
 
-    def create_queue(self):
+    def create_queue(self, *args, **kwargs):
         """Create a queue object."""
-        q = asyncio.Queue()
-        q.Empty = asyncio.QueueEmpty
-        return q
+        return asyncio.Queue(*args, **kwargs)
+
+    def get_queue_empty_exception(self):
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        return asyncio.QueueEmpty
 
     def create_event(self):
         """Create an event object."""
@@ -211,6 +217,12 @@ def create_event(self):
 
     async def _reset(self):
         super()._reset()
+        while True:  # pragma: no cover
+            try:
+                self.queue.get_nowait()
+                self.queue.task_done()
+            except self.queue_empty:
+                break
         if not self.external_http:  # pragma: no cover
             if self.http and not self.http.closed:
                 await self.http.close()
@@ -310,16 +322,16 @@ async def _connect_websocket(self, url, headers, engineio_path):
 
         # extract any new cookies passed in a header so that they can also be
         # sent the the WebSocket route
-        cookies = {}
         for header, value in headers.items():
             if header.lower() == 'cookie':
-                cookies = dict(
-                    [cookie.split('=', 1) for cookie in value.split('; ')])
+                ck = SimpleCookie(headers[header])
+                self.http.cookie_jar.update_cookies(
+                    {k: m.value for k, m in ck.items()})
                 del headers[header]
                 break
-        self.http.cookie_jar.update_cookies(cookies)
 
-        extra_options = {'timeout': self.request_timeout}
+        extra_options = {
+            'timeout': aiohttp.ClientWSTimeout(ws_close=self.request_timeout)}
         if not self.ssl_verify:
             ssl_context = ssl.create_default_context()
             ssl_context.check_hostname = False
@@ -459,7 +471,7 @@ async def _trigger_event(self, event, *args, **kwargs):
         run_async = kwargs.pop('run_async', False)
         ret = None
         if event in self.handlers:
-            if asyncio.iscoroutinefunction(self.handlers[event]) is True:
+            if inspect.iscoroutinefunction(self.handlers[event]) is True:
                 if run_async:
                     task = self.start_background_task(self.handlers[event],
                                                       *args)
@@ -624,7 +636,7 @@ async def _write_loop(self):
             packets = None
             try:
                 packets = [await asyncio.wait_for(self.queue.get(), timeout)]
-            except (self.queue.Empty, asyncio.TimeoutError):
+            except (self.queue_empty, asyncio.TimeoutError):
                 self.logger.error('packet queue is empty, aborting')
                 break
             except asyncio.CancelledError:  # pragma: no cover
@@ -636,7 +648,7 @@ async def _write_loop(self):
                 while True:
                     try:
                         packets.append(self.queue.get_nowait())
-                    except self.queue.Empty:
+                    except self.queue_empty:
                         break
                     if packets[-1] is None:
                         packets = packets[:-1]
diff --git a/libs/engineio/async_drivers/aiohttp.py b/libs/engineio/async_drivers/aiohttp.py
index 7c3440f03a..41131d830e 100644
--- a/libs/engineio/async_drivers/aiohttp.py
+++ b/libs/engineio/async_drivers/aiohttp.py
@@ -1,6 +1,5 @@
-import asyncio
+import inspect
 import sys
-from urllib.parse import urlsplit
 
 from aiohttp.web import Response, WebSocketResponse
 
@@ -22,12 +21,8 @@ def translate_request(request):
     """This function takes the arguments passed to the request handler and
     uses them to generate a WSGI compatible environ dictionary.
     """
-    message = request._message
-    payload = request._payload
-
-    uri_parts = urlsplit(message.path)
     environ = {
-        'wsgi.input': payload,
+        'wsgi.input': request.content,
         'wsgi.errors': sys.stderr,
         'wsgi.version': (1, 0),
         'wsgi.async': True,
@@ -35,10 +30,10 @@ def translate_request(request):
         'wsgi.multiprocess': False,
         'wsgi.run_once': False,
         'SERVER_SOFTWARE': 'aiohttp',
-        'REQUEST_METHOD': message.method,
-        'QUERY_STRING': uri_parts.query or '',
-        'RAW_URI': message.path,
-        'SERVER_PROTOCOL': 'HTTP/%s.%s' % message.version,
+        'REQUEST_METHOD': request.method,
+        'QUERY_STRING': request.query_string or '',
+        'RAW_URI': request.path_qs,
+        'SERVER_PROTOCOL': f'HTTP/{request.version[0]}.{request.version[1]}',
         'REMOTE_ADDR': '127.0.0.1',
         'REMOTE_PORT': '0',
         'SERVER_NAME': 'aiohttp',
@@ -46,7 +41,7 @@ def translate_request(request):
         'aiohttp.request': request
     }
 
-    for hdr_name, hdr_value in message.headers.items():
+    for hdr_name, hdr_value in request.headers.items():
         hdr_name = hdr_name.upper()
         if hdr_name == 'CONTENT-TYPE':
             environ['CONTENT_TYPE'] = hdr_value
@@ -63,9 +58,7 @@ def translate_request(request):
 
     environ['wsgi.url_scheme'] = environ.get('HTTP_X_FORWARDED_PROTO', 'http')
 
-    path_info = uri_parts.path
-
-    environ['PATH_INFO'] = path_info
+    environ['PATH_INFO'] = request.path
     environ['SCRIPT_NAME'] = ''
 
     return environ
@@ -105,7 +98,7 @@ async def send(self, message):
             f = self._sock.send_bytes
         else:
             f = self._sock.send_str
-        if asyncio.iscoroutinefunction(f):
+        if inspect.iscoroutinefunction(f):
             await f(message)
         else:
             f(message)
diff --git a/libs/engineio/async_drivers/asgi.py b/libs/engineio/async_drivers/asgi.py
index 866033bbac..c3581c6433 100644
--- a/libs/engineio/async_drivers/asgi.py
+++ b/libs/engineio/async_drivers/asgi.py
@@ -1,6 +1,6 @@
+import inspect
 import os
 import sys
-import asyncio
 
 from engineio.static_files import get_static_file
 
@@ -102,7 +102,7 @@ async def lifespan(self, scope, receive, send):
                 if self.on_startup:
                     try:
                         await self.on_startup() \
-                            if asyncio.iscoroutinefunction(self.on_startup) \
+                            if inspect.iscoroutinefunction(self.on_startup) \
                             else self.on_startup()
                     except:
                         await send({'type': 'lifespan.startup.failed'})
@@ -112,7 +112,7 @@ async def lifespan(self, scope, receive, send):
                 if self.on_shutdown:
                     try:
                         await self.on_shutdown() \
-                            if asyncio.iscoroutinefunction(self.on_shutdown) \
+                            if inspect.iscoroutinefunction(self.on_shutdown) \
                             else self.on_shutdown()
                     except:
                         await send({'type': 'lifespan.shutdown.failed'})
@@ -280,7 +280,12 @@ async def wait(self):
         event = await self.asgi_receive()
         if event['type'] != 'websocket.receive':
             raise OSError()
-        return event.get('bytes') or event.get('text')
+        if event.get('bytes', None) is not None:
+            return event['bytes']
+        elif event.get('text', None) is not None:
+            return event['text']
+        else:  # pragma: no cover
+            raise OSError()
 
 
 _async = {
diff --git a/libs/engineio/async_drivers/tornado.py b/libs/engineio/async_drivers/tornado.py
index abb1e2b544..01e7d71438 100644
--- a/libs/engineio/async_drivers/tornado.py
+++ b/libs/engineio/async_drivers/tornado.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import sys
 from urllib.parse import urlsplit
 from .. import exceptions
@@ -24,7 +25,7 @@ def __init__(self, *args, **kwargs):
         async def get(self, *args, **kwargs):
             if self.request.headers.get('Upgrade', '').lower() == 'websocket':
                 ret = super().get(*args, **kwargs)
-                if asyncio.iscoroutine(ret):
+                if inspect.iscoroutine(ret):
                     await ret
             else:
                 await engineio_server.handle_request(self)
diff --git a/libs/engineio/async_server.py b/libs/engineio/async_server.py
index 4bf28f23d4..e0e252e0a4 100644
--- a/libs/engineio/async_server.py
+++ b/libs/engineio/async_server.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import urllib
 
 from . import base_server
@@ -56,17 +57,18 @@ class AsyncServer(base_server.BaseServer):
     :param cors_allowed_origins: Origin or list of origins that are allowed to
                                  connect to this server. Only the same origin
                                  is allowed by default. Set this argument to
-                                 ``'*'`` to allow all origins, or to ``[]`` to
-                                 disable CORS handling.
+                                 ``'*'`` or ``['*']`` to allow all origins, or
+                                 to ``[]`` to disable CORS handling.
     :param cors_credentials: Whether credentials (cookies, authentication) are
                              allowed in requests to this server.
     :param logger: To enable logging set to ``True`` or pass a logger object to
                    use. To disable logging set to ``False``. Note that fatal
                    errors are logged even when ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
-                 packets. Custom json modules must have ``dumps`` and ``loads``
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom JSON modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, run message event handlers in
                            non-blocking threads. To run handlers synchronously,
                            set to ``False``. The default is ``True``.
@@ -212,7 +214,7 @@ async def handle_request(self, *args, **kwargs):
         Note: this method is a coroutine.
         """
         translate_request = self._async['translate_request']
-        if asyncio.iscoroutinefunction(translate_request):
+        if inspect.iscoroutinefunction(translate_request):
             environ = await translate_request(*args, **kwargs)
         else:
             environ = translate_request(*args, **kwargs)
@@ -427,7 +429,7 @@ def create_event(self, *args, **kwargs):
     async def _make_response(self, response_dict, environ):
         cors_headers = self._cors_headers(environ)
         make_response = self._async['make_response']
-        if asyncio.iscoroutinefunction(make_response):
+        if inspect.iscoroutinefunction(make_response):
             response = await make_response(
                 response_dict['status'],
                 response_dict['headers'] + cors_headers,
@@ -502,7 +504,7 @@ async def _trigger_event(self, event, *args, **kwargs):
         run_async = kwargs.pop('run_async', False)
         ret = None
         if event in self.handlers:
-            if asyncio.iscoroutinefunction(self.handlers[event]):
+            if inspect.iscoroutinefunction(self.handlers[event]):
                 async def run_async_handler():
                     try:
                         try:
diff --git a/libs/engineio/base_client.py b/libs/engineio/base_client.py
index 912baf720c..01a42c55a7 100644
--- a/libs/engineio/base_client.py
+++ b/libs/engineio/base_client.py
@@ -61,7 +61,8 @@ def __init__(self, logger=False, json=None, request_timeout=5,
         self.ws = None
         self.read_loop_task = None
         self.write_loop_task = None
-        self.queue = None
+        self.queue = self.create_queue()
+        self.queue_empty = self.get_queue_empty_exception()
         self.state = 'disconnected'
         self.ssl_verify = ssl_verify
         self.websocket_extra_options = websocket_extra_options or {}
@@ -156,3 +157,13 @@ def _get_url_timestamp(self):
         if not self.timestamp_requests:
             return ''
         return '&t=' + str(time.time())
+
+    def create_queue(self, *args, **kwargs):  # pragma: no cover
+        """Create a queue object."""
+        raise NotImplementedError('must be implemented in a subclass')
+
+    def get_queue_empty_exception(self):  # pragma: no cover
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        raise NotImplementedError('must be implemented in a subclass')
diff --git a/libs/engineio/base_server.py b/libs/engineio/base_server.py
index bfb4165bee..7d717fbd39 100644
--- a/libs/engineio/base_server.py
+++ b/libs/engineio/base_server.py
@@ -282,31 +282,38 @@ def _unauthorized(self, message=None):
                 'response': message.encode('utf-8')}
 
     def _cors_allowed_origins(self, environ):
-        default_origins = []
-        if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
-            default_origins.append('{scheme}://{host}'.format(
-                scheme=environ['wsgi.url_scheme'], host=environ['HTTP_HOST']))
-            if 'HTTP_X_FORWARDED_PROTO' in environ or \
-                    'HTTP_X_FORWARDED_HOST' in environ:
-                scheme = environ.get(
-                    'HTTP_X_FORWARDED_PROTO',
-                    environ['wsgi.url_scheme']).split(',')[0].strip()
-                default_origins.append('{scheme}://{host}'.format(
-                    scheme=scheme, host=environ.get(
-                        'HTTP_X_FORWARDED_HOST', environ['HTTP_HOST']).split(
-                            ',')[0].strip()))
         if self.cors_allowed_origins is None:
-            allowed_origins = default_origins
+            allowed_origins = []
+            if 'wsgi.url_scheme' in environ and 'HTTP_HOST' in environ:
+                allowed_origins.append('{scheme}://{host}'.format(
+                    scheme=environ['wsgi.url_scheme'],
+                    host=environ['HTTP_HOST']))
+                if 'HTTP_X_FORWARDED_PROTO' in environ or \
+                        'HTTP_X_FORWARDED_HOST' in environ:
+                    scheme = environ.get(
+                        'HTTP_X_FORWARDED_PROTO',
+                        environ['wsgi.url_scheme']).split(',')[0].strip()
+                    allowed_origins.append('{scheme}://{host}'.format(
+                        scheme=scheme, host=environ.get(
+                            'HTTP_X_FORWARDED_HOST',
+                            environ['HTTP_HOST']).split(
+                                ',')[0].strip()))
         elif self.cors_allowed_origins == '*':
             allowed_origins = None
         elif isinstance(self.cors_allowed_origins, str):
             allowed_origins = [self.cors_allowed_origins]
         elif callable(self.cors_allowed_origins):
             origin = environ.get('HTTP_ORIGIN')
-            allowed_origins = [origin] \
-                if self.cors_allowed_origins(origin) else []
+            try:
+                is_allowed = self.cors_allowed_origins(origin, environ)
+            except TypeError:
+                is_allowed = self.cors_allowed_origins(origin)
+            allowed_origins = [origin] if is_allowed else []
         else:
-            allowed_origins = self.cors_allowed_origins
+            if '*' in self.cors_allowed_origins:
+                allowed_origins = None
+            else:
+                allowed_origins = self.cors_allowed_origins
         return allowed_origins
 
     def _cors_headers(self, environ):
diff --git a/libs/engineio/client.py b/libs/engineio/client.py
index 987c3998db..e8865df5d1 100644
--- a/libs/engineio/client.py
+++ b/libs/engineio/client.py
@@ -1,11 +1,12 @@
 from base64 import b64encode
-from engineio.json import JSONDecodeError
+from http.cookies import SimpleCookie
 import logging
 import queue
 import ssl
 import threading
 import time
 import urllib
+from engineio.json import JSONDecodeError
 
 try:
     import requests
@@ -33,10 +34,11 @@ class Client(base_client.BaseClient):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param request_timeout: A timeout in seconds for requests. The default is
                             5 seconds.
     :param http_session: an initialized ``requests.Session`` object to be used
@@ -91,7 +93,6 @@ def connect(self, url, headers=None, transports=None,
             if not transports:
                 raise ValueError('No valid transports provided')
         self.transports = transports or valid_transports
-        self.queue = self.create_queue()
         return getattr(self, '_connect_' + self.transports[0])(
             url, headers or {}, engineio_path)
 
@@ -162,14 +163,27 @@ def sleep(self, seconds=0):
 
     def create_queue(self, *args, **kwargs):
         """Create a queue object."""
-        q = queue.Queue(*args, **kwargs)
-        q.Empty = queue.Empty
-        return q
+        return queue.Queue(*args, **kwargs)
+
+    def get_queue_empty_exception(self):
+        """Return the queue empty exception raised by queues created by the
+        ``create_queue()`` method.
+        """
+        return queue.Empty
 
     def create_event(self, *args, **kwargs):
         """Create an event object."""
         return threading.Event(*args, **kwargs)
 
+    def _reset(self):
+        super()._reset()
+        while True:  # pragma: no cover
+            try:
+                self.queue.get_nowait()
+                self.queue.task_done()
+            except self.queue_empty:
+                break
+
     def _connect_polling(self, url, headers, engineio_path):
         """Establish a long-polling connection to the Engine.IO server."""
         if requests is None:  # pragma: no cover
@@ -256,8 +270,10 @@ def _connect_websocket(self, url, headers, engineio_path):
         extra_options = {}
         if self.http:
             # cookies
-            cookies = '; '.join([f"{cookie.name}={cookie.value}"
-                                 for cookie in self.http.cookies])
+            ck = SimpleCookie()
+            for cookie in self.http.cookies:
+                ck[cookie.name] = cookie.value
+            cookies = ck.output(header='', sep=';').strip()
             for header, value in headers.items():
                 if header.lower() == 'cookie':
                     if cookies:
@@ -566,7 +582,7 @@ def _write_loop(self):
             packets = None
             try:
                 packets = [self.queue.get(timeout=timeout)]
-            except self.queue.Empty:
+            except self.queue_empty:
                 self.logger.error('packet queue is empty, aborting')
                 break
             if packets == [None]:
@@ -576,7 +592,7 @@ def _write_loop(self):
                 while True:
                     try:
                         packets.append(self.queue.get(block=False))
-                    except self.queue.Empty:
+                    except self.queue_empty:
                         break
                     if packets[-1] is None:
                         packets = packets[:-1]
diff --git a/libs/engineio/packet.py b/libs/engineio/packet.py
index 7edc7a332c..40bb6df876 100644
--- a/libs/engineio/packet.py
+++ b/libs/engineio/packet.py
@@ -72,11 +72,11 @@ def decode(self, encoded_packet):
             else:
                 self.packet_type = int(encoded_packet[0])
                 try:
-                    self.data = self.json.loads(encoded_packet[1:])
-                    if isinstance(self.data, int):
+                    if encoded_packet[1].isnumeric():
                         # do not allow integer payloads, see
                         # github.com/miguelgrinberg/python-engineio/issues/75
                         # for background on this decision
                         raise ValueError
-                except ValueError:
+                    self.data = self.json.loads(encoded_packet[1:])
+                except (ValueError, IndexError):
                     self.data = encoded_packet[1:]
diff --git a/libs/engineio/server.py b/libs/engineio/server.py
index f1b136713c..917c53f2c8 100644
--- a/libs/engineio/server.py
+++ b/libs/engineio/server.py
@@ -54,8 +54,8 @@ class Server(base_server.BaseServer):
     :param cors_allowed_origins: Origin or list of origins that are allowed to
                                  connect to this server. Only the same origin
                                  is allowed by default. Set this argument to
-                                 ``'*'`` to allow all origins, or to ``[]`` to
-                                 disable CORS handling.
+                                 ``'*'`` or ``['*']`` to allow all origins, or
+                                 to ``[]`` to disable CORS handling.
     :param cors_credentials: Whether credentials (cookies, authentication) are
                              allowed in requests to this server. The default
                              is ``True``.
@@ -63,10 +63,11 @@ class Server(base_server.BaseServer):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
-                 packets. Custom json modules must have ``dumps`` and ``loads``
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom JSON modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, run message event handlers in
                            non-blocking threads. To run handlers synchronously,
                            set to ``False``. The default is ``True``.
diff --git a/libs/enzyme-0.5.2.dist-info/METADATA b/libs/enzyme-0.5.2.dist-info/METADATA
index abe3ac08b4..369934c261 100644
--- a/libs/enzyme-0.5.2.dist-info/METADATA
+++ b/libs/enzyme-0.5.2.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: enzyme
 Version: 0.5.2
 Summary: Video metadata parser
@@ -25,24 +25,25 @@ Classifier: Topic :: Multimedia :: Video
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: importlib-resources >=4.6 ; python_version == "3.8"
-Provides-Extra: dev
-Requires-Dist: doc8 ; extra == 'dev'
-Requires-Dist: mypy ; extra == 'dev'
-Requires-Dist: ruff ; extra == 'dev'
-Requires-Dist: typos ; extra == 'dev'
-Requires-Dist: validate-pyproject ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
+Requires-Dist: importlib_resources>=4.6; python_version == "3.8"
 Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme ; extra == 'docs'
-Requires-Dist: myst-parser ; extra == 'docs'
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-rtd-theme; extra == "docs"
+Requires-Dist: myst-parser; extra == "docs"
 Provides-Extra: test
-Requires-Dist: PyYAML ; extra == 'test'
-Requires-Dist: requests ; extra == 'test'
-Requires-Dist: mypy ; extra == 'test'
-Requires-Dist: pytest >=6.0 ; extra == 'test'
-Requires-Dist: importlib-metadata >=4.6 ; (python_version < "3.10") and extra == 'test'
+Requires-Dist: PyYAML; extra == "test"
+Requires-Dist: requests; extra == "test"
+Requires-Dist: mypy; extra == "test"
+Requires-Dist: pytest>=6.0; extra == "test"
+Requires-Dist: importlib_metadata>=4.6; python_version < "3.10" and extra == "test"
+Provides-Extra: dev
+Requires-Dist: doc8; extra == "dev"
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: typos; extra == "dev"
+Requires-Dist: validate-pyproject; extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Dynamic: license-file
 
 # Enzyme
 
diff --git a/libs/enzyme-0.5.2.dist-info/RECORD b/libs/enzyme-0.5.2.dist-info/RECORD
index 2b02eed08f..8cb62975a3 100644
--- a/libs/enzyme-0.5.2.dist-info/RECORD
+++ b/libs/enzyme-0.5.2.dist-info/RECORD
@@ -1,9 +1,9 @@
 enzyme-0.5.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-enzyme-0.5.2.dist-info/LICENSE,sha256=29cmv2ez8aYybOYLMMZOC5ZiKtX4sBZTJ4nKINDWdU0,1072
-enzyme-0.5.2.dist-info/METADATA,sha256=JA_WEchw6yhLjGeVCf9SJUb9KDl4PPFKNE4Sf92wKrM,2464
+enzyme-0.5.2.dist-info/METADATA,sha256=IK3oA7dmau5-Ij_HOEvjfPzf8nUuBJ-kBQijX0iNsVA,2466
 enzyme-0.5.2.dist-info/RECORD,,
 enzyme-0.5.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-enzyme-0.5.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+enzyme-0.5.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+enzyme-0.5.2.dist-info/licenses/LICENSE,sha256=29cmv2ez8aYybOYLMMZOC5ZiKtX4sBZTJ4nKINDWdU0,1072
 enzyme-0.5.2.dist-info/top_level.txt,sha256=ZnBG41c0gHbSzWViydQBVrwPW1GOY1yM8gJ4dykf98A,7
 enzyme/__init__.py,sha256=rfY7cJy1R3VIwVczd-GBNIWY2EQeldE-FEybuuDIkOU,266
 enzyme/exceptions.py,sha256=FrxTjGmic1OsDVFORgD-Grj2lgyFXYW-EagU3MiJWhg,528
diff --git a/libs/enzyme-0.5.2.dist-info/WHEEL b/libs/enzyme-0.5.2.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/enzyme-0.5.2.dist-info/WHEEL
+++ b/libs/enzyme-0.5.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/enzyme-0.5.2.dist-info/LICENSE b/libs/enzyme-0.5.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/enzyme-0.5.2.dist-info/LICENSE
rename to libs/enzyme-0.5.2.dist-info/licenses/LICENSE
diff --git a/libs/fcache-0.5.2.dist-info/METADATA b/libs/fcache-0.5.2.dist-info/METADATA
deleted file mode 100644
index 62a0a761b0..0000000000
--- a/libs/fcache-0.5.2.dist-info/METADATA
+++ /dev/null
@@ -1,86 +0,0 @@
-Metadata-Version: 2.4
-Name: fcache
-Version: 0.5.2
-Summary: a dictionary-like, file-based cache module for Python
-Project-URL: Documentation, https://tsroten.github.io/fcache
-Project-URL: Changes, https://tsroten.github.io/fcache/history.html
-Project-URL: Issue Tracker, https://github.com/tsroten/fcache/issues
-Project-URL: Source Code, https://github.com/tsroten/fcache
-Author-email: Thomas Roten <thomas@roten.us>
-License-Expression: MIT
-License-File: AUTHORS.rst
-License-File: LICENSE.txt
-Keywords: cache,file,serialize
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: System :: Filesystems
-Requires-Python: >=3.7
-Requires-Dist: platformdirs~=3.0
-Description-Content-Type: text/x-rst
-
-fcache
-======
-
-.. image:: https://badge.fury.io/py/fcache.svg
-    :target: https://pypi.org/project/fcache
-
-.. image:: https://github.com/tsroten/fcache/actions/workflows/ci.yml/badge.svg
-    :target: https://github.com/tsroten/fcache/actions/workflows/ci.yml
-
-fcache is a dictionary-like, file-based cache module for Python. It's simple
-to use, has an optional write buffer, and is
-`Shelf <http://docs.python.org/3/library/shelve.html#shelve.Shelf>`_-compatible.
-
-.. code:: python
-
-    >>> from fcache.cache import FileCache
-    >>> mycache = FileCache('myapp')
-    >>> mycache['foo'] = [1, 2, 3, 4, 5]
-    >>> mycache['foo']
-    [1, 2, 3, 4, 5]
-    >>> mycache['bar'] = 'value'
-    >>> list(mycache)
-    ['foo', 'bar']
-    >>> del mycache['foo']
-    >>> mycache['foo']
-        ...
-        KeyError: 'foo'
-
-.. code:: python
-
-   with FileCache('myapp') as mycache:
-       mycache['foo'] = [1, 2, 3, 4, 5]
-
-Install
--------
-
-To install fcache, use pip:
-
-.. code:: bash
-
-    $ pip install fcache
-
-Documentation
--------------
-
-`fcache's documentation <https://tsroten.github.io/fcache/>`_ contains an introduction along with an API overview. For more information on how to get started with fcache, be sure to read the documentation.
-
-Bug/Issues Tracker
-------------------
-
-fcache uses its `GitHub Issues page <https://github.com/tsroten/fcache/issues>`_ to track bugs, feature requests, and support questions.
-
-License
--------
-
-fcache is released under the OSI-approved `MIT License <http://opensource.org/licenses/MIT>`_. See the file LICENSE.txt for more information.
diff --git a/libs/fcache-0.5.2.dist-info/RECORD b/libs/fcache-0.5.2.dist-info/RECORD
deleted file mode 100644
index aef3b9395c..0000000000
--- a/libs/fcache-0.5.2.dist-info/RECORD
+++ /dev/null
@@ -1,10 +0,0 @@
-fcache-0.5.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-fcache-0.5.2.dist-info/METADATA,sha256=xwdG1gRS2RjB0eDNq7ZWCneWblSA4l59P324z6kC9hE,2840
-fcache-0.5.2.dist-info/RECORD,,
-fcache-0.5.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fcache-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fcache-0.5.2.dist-info/licenses/AUTHORS.rst,sha256=z5OBAQvrU1cODlriE7s3MA3AK1JRqcz_c5lxaagXIec,398
-fcache-0.5.2.dist-info/licenses/LICENSE.txt,sha256=UK1ituPhetE5O947l7Iz53IihKh1ZtmBBjUbCCas8-Y,1056
-fcache/__init__.py,sha256=isJrmDBLRag7Zc2UK9ZovWGOv7ji1Oh-zJtJMNJFkXw,22
-fcache/cache.py,sha256=wc340BUDMoH-2xV4Hdzctiha1i6jS6JtABrenbBzBvA,11444
-fcache/posixemulation.py,sha256=qBz1W_LLS0sa9PfAq5SsL_jiZ_OH3h09rwqgrQT4a9A,3748
diff --git a/libs/fcache-0.5.2.dist-info/WHEEL b/libs/fcache-0.5.2.dist-info/WHEEL
deleted file mode 100644
index 12228d414b..0000000000
--- a/libs/fcache-0.5.2.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.27.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/beautifulsoup4-4.12.3.dist-info/INSTALLER b/libs/fcache-0.6.0.dist-info/INSTALLER
similarity index 100%
rename from libs/beautifulsoup4-4.12.3.dist-info/INSTALLER
rename to libs/fcache-0.6.0.dist-info/INSTALLER
diff --git a/libs/fcache-0.6.0.dist-info/METADATA b/libs/fcache-0.6.0.dist-info/METADATA
new file mode 100644
index 0000000000..7cb8b9bede
--- /dev/null
+++ b/libs/fcache-0.6.0.dist-info/METADATA
@@ -0,0 +1,86 @@
+Metadata-Version: 2.4
+Name: fcache
+Version: 0.6.0
+Summary: a dictionary-like, file-based cache module for Python
+Project-URL: Documentation, https://tsroten.github.io/fcache
+Project-URL: Changes, https://tsroten.github.io/fcache/history.html
+Project-URL: Issue Tracker, https://github.com/tsroten/fcache/issues
+Project-URL: Source Code, https://github.com/tsroten/fcache
+Author: Thomas Roten
+License-Expression: MIT
+License-File: AUTHORS.rst
+License-File: LICENSE.txt
+Keywords: cache,file,serialize
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: System :: Filesystems
+Requires-Python: >=3.9
+Requires-Dist: platformdirs~=3.0
+Description-Content-Type: text/x-rst
+
+fcache
+======
+
+.. image:: https://badge.fury.io/py/fcache.svg
+    :target: https://pypi.org/project/fcache
+
+.. image:: https://github.com/tsroten/fcache/actions/workflows/ci.yml/badge.svg
+    :target: https://github.com/tsroten/fcache/actions/workflows/ci.yml
+
+fcache is a dictionary-like, file-based cache module for Python. It's simple
+to use, has an optional write buffer, and is
+`Shelf <http://docs.python.org/3/library/shelve.html#shelve.Shelf>`_-compatible.
+
+.. code:: python
+
+    >>> from fcache.cache import FileCache
+    >>> mycache = FileCache('myapp')
+    >>> mycache['foo'] = [1, 2, 3, 4, 5]
+    >>> mycache['foo']
+    [1, 2, 3, 4, 5]
+    >>> mycache['bar'] = 'value'
+    >>> list(mycache)
+    ['foo', 'bar']
+    >>> del mycache['foo']
+    >>> mycache['foo']
+        ...
+        KeyError: 'foo'
+
+.. code:: python
+
+   with FileCache('myapp') as mycache:
+       mycache['foo'] = [1, 2, 3, 4, 5]
+
+Install
+-------
+
+To install fcache, use pip:
+
+.. code:: bash
+
+    $ pip install fcache
+
+Documentation
+-------------
+
+`fcache's documentation <https://tsroten.github.io/fcache/>`_ contains an introduction along with an API overview. For more information on how to get started with fcache, be sure to read the documentation.
+
+Bug/Issues Tracker
+------------------
+
+fcache uses its `GitHub Issues page <https://github.com/tsroten/fcache/issues>`_ to track bugs, feature requests, and support questions.
+
+License
+-------
+
+fcache is released under the OSI-approved `MIT License <http://opensource.org/licenses/MIT>`_. See the file LICENSE.txt for more information.
diff --git a/libs/fcache-0.6.0.dist-info/RECORD b/libs/fcache-0.6.0.dist-info/RECORD
new file mode 100644
index 0000000000..4c2c40717a
--- /dev/null
+++ b/libs/fcache-0.6.0.dist-info/RECORD
@@ -0,0 +1,10 @@
+fcache-0.6.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+fcache-0.6.0.dist-info/METADATA,sha256=zbfQF7h7gdqEqoEVV1JG3YKafEWp5MejX1KII2vtD-U,2818
+fcache-0.6.0.dist-info/RECORD,,
+fcache-0.6.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fcache-0.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fcache-0.6.0.dist-info/licenses/AUTHORS.rst,sha256=z5OBAQvrU1cODlriE7s3MA3AK1JRqcz_c5lxaagXIec,398
+fcache-0.6.0.dist-info/licenses/LICENSE.txt,sha256=UK1ituPhetE5O947l7Iz53IihKh1ZtmBBjUbCCas8-Y,1056
+fcache/__init__.py,sha256=cID1jLnC_vj48GgMN6Yb1FA3JsQ95zNmCHmRYE8TFhY,22
+fcache/cache.py,sha256=WseAg7MRCBRFGIHQYXIKt-cC0MYsFpNuHEAeBRfFgkc,11714
+fcache/posixemulation.py,sha256=qBz1W_LLS0sa9PfAq5SsL_jiZ_OH3h09rwqgrQT4a9A,3748
diff --git a/libs/blinker-1.8.2.dist-info/REQUESTED b/libs/fcache-0.6.0.dist-info/REQUESTED
similarity index 100%
rename from libs/blinker-1.8.2.dist-info/REQUESTED
rename to libs/fcache-0.6.0.dist-info/REQUESTED
diff --git a/libs/fcache-0.6.0.dist-info/WHEEL b/libs/fcache-0.6.0.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/fcache-0.6.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/fcache-0.5.2.dist-info/licenses/AUTHORS.rst b/libs/fcache-0.6.0.dist-info/licenses/AUTHORS.rst
similarity index 100%
rename from libs/fcache-0.5.2.dist-info/licenses/AUTHORS.rst
rename to libs/fcache-0.6.0.dist-info/licenses/AUTHORS.rst
diff --git a/libs/fcache-0.5.2.dist-info/licenses/LICENSE.txt b/libs/fcache-0.6.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/fcache-0.5.2.dist-info/licenses/LICENSE.txt
rename to libs/fcache-0.6.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/fcache/__init__.py b/libs/fcache/__init__.py
index 722515271f..906d362f7d 100644
--- a/libs/fcache/__init__.py
+++ b/libs/fcache/__init__.py
@@ -1 +1 @@
-__version__ = "0.5.2"
+__version__ = "0.6.0"
diff --git a/libs/fcache/cache.py b/libs/fcache/cache.py
index 53326af185..7373b031a9 100644
--- a/libs/fcache/cache.py
+++ b/libs/fcache/cache.py
@@ -154,7 +154,14 @@ def delete(self):
         """Delete the write buffer and cache directory."""
         if not self._sync:
             del self._buffer
-        shutil.rmtree(self.cache_dir)
+
+        # Allow multiple processes to delete() at the same time,
+        # meaning some or all of cache_dir may already be deleted
+        def _on_error(function, path, excinfo):
+            if excinfo[0] != FileNotFoundError:
+                raise
+
+        shutil.rmtree(self.cache_dir, onerror=_on_error)
 
     def close(self):
         """Sync the write buffer, then close the cache.
diff --git a/libs/fese-0.3.0.dist-info/METADATA b/libs/fese-0.3.0.dist-info/METADATA
index 8c87824508..bb81446873 100644
--- a/libs/fese-0.3.0.dist-info/METADATA
+++ b/libs/fese-0.3.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: fese
 Version: 0.3.0
 Summary: A library to extract FFmpeg subtitle streams
@@ -8,6 +8,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: babelfish
 Requires-Dist: pysubs2
+Dynamic: license-file
 
 # fese
 
diff --git a/libs/fese-0.3.0.dist-info/RECORD b/libs/fese-0.3.0.dist-info/RECORD
index 29825b4309..cf68457087 100644
--- a/libs/fese-0.3.0.dist-info/RECORD
+++ b/libs/fese-0.3.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 fese-0.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-fese-0.3.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-fese-0.3.0.dist-info/METADATA,sha256=Y6rn3cPjHc2ySJrSnUAuXxahgSFs2YoAivSIgJqi40M,655
+fese-0.3.0.dist-info/METADATA,sha256=XpNfOcnmU2w_ofTNyC0W0WRhzj2SMfN8mv4d33Ae6CA,677
 fese-0.3.0.dist-info/RECORD,,
 fese-0.3.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fese-0.3.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+fese-0.3.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+fese-0.3.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 fese-0.3.0.dist-info/top_level.txt,sha256=ra2BuARVEUZpk76YpHnjVoqjR2FxvzhCdmW2OyBWGzE,5
 fese/__init__.py,sha256=_YUpx7sq26ioEp5LZOEKa-0MrRHQUuRuDCs0EQ6Amv4,150
 fese/container.py,sha256=zhUNLut9Tdy_oPa6gCophUekTQegGWbHdbd1prR5aHg,10443
diff --git a/libs/fese-0.3.0.dist-info/WHEEL b/libs/fese-0.3.0.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/fese-0.3.0.dist-info/WHEEL
+++ b/libs/fese-0.3.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/fese-0.3.0.dist-info/LICENSE b/libs/fese-0.3.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/fese-0.3.0.dist-info/LICENSE
rename to libs/fese-0.3.0.dist-info/licenses/LICENSE
diff --git a/libs/fese/tags.py b/libs/fese/tags.py
index 46c8f440c1..3c4625eb1f 100644
--- a/libs/fese/tags.py
+++ b/libs/fese/tags.py
@@ -196,8 +196,4 @@ def _safe_int(value, default=None):
         "matches": ("fil", "filipino"),
         "language_args": ("tgl", "PH"),
     },
-    "chi": {
-        "matches": ("zh-tw", "zht", "zh-hant", "zhhant", "hant", "big5", "traditional"),
-        "language_args": ("zho", "TW"),
-    },
 }
diff --git a/libs/ffmpeg_python-0.2.0.dist-info/METADATA b/libs/ffmpeg_python-0.2.0.dist-info/METADATA
index 29108796bc..4c3273fe6a 100644
--- a/libs/ffmpeg_python-0.2.0.dist-info/METADATA
+++ b/libs/ffmpeg_python-0.2.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ffmpeg-python
 Version: 0.2.0
 Summary: Python bindings for FFmpeg - with complex filtering support
@@ -21,12 +21,22 @@ Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Requires-Dist: future
 Provides-Extra: dev
-Requires-Dist: future ==0.17.1 ; extra == 'dev'
-Requires-Dist: numpy ==1.16.4 ; extra == 'dev'
-Requires-Dist: pytest-mock ==1.10.4 ; extra == 'dev'
-Requires-Dist: pytest ==4.6.1 ; extra == 'dev'
-Requires-Dist: Sphinx ==2.1.0 ; extra == 'dev'
-Requires-Dist: tox ==3.12.1 ; extra == 'dev'
+Requires-Dist: future==0.17.1; extra == "dev"
+Requires-Dist: numpy==1.16.4; extra == "dev"
+Requires-Dist: pytest-mock==1.10.4; extra == "dev"
+Requires-Dist: pytest==4.6.1; extra == "dev"
+Requires-Dist: Sphinx==2.1.0; extra == "dev"
+Requires-Dist: tox==3.12.1; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 ffmpeg-python: Python bindings for FFmpeg
 =========================================
diff --git a/libs/ffmpeg_python-0.2.0.dist-info/RECORD b/libs/ffmpeg_python-0.2.0.dist-info/RECORD
index 49a07be571..ea524fcaa0 100644
--- a/libs/ffmpeg_python-0.2.0.dist-info/RECORD
+++ b/libs/ffmpeg_python-0.2.0.dist-info/RECORD
@@ -8,8 +8,8 @@ ffmpeg/_view.py,sha256=6Yi2nyjFWBsLx0VX9t0F5WT2cAcGHBtEVrV_Pp6j5UM,3262
 ffmpeg/dag.py,sha256=DU2kOPnmIz2m41wQIcnO0RSzvlrhCHK2lPAgEZVWaLo,7763
 ffmpeg/nodes.py,sha256=ro9rL-vBtoR_FqI9043_CLS-hPZPNi9a5RDjK2v7ntM,12636
 ffmpeg_python-0.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-ffmpeg_python-0.2.0.dist-info/METADATA,sha256=dd6H_KN4VCDtAl2eBRgWjVdv8oUz_Zn5d6_EqIqtRE8,1684
+ffmpeg_python-0.2.0.dist-info/METADATA,sha256=MCMH-A4_s4NXlFiwsgc5iDYaJh0cpGdyZ6PmKGEIHYg,1874
 ffmpeg_python-0.2.0.dist-info/RECORD,,
 ffmpeg_python-0.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ffmpeg_python-0.2.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+ffmpeg_python-0.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 ffmpeg_python-0.2.0.dist-info/top_level.txt,sha256=z628G4f1qm1oii2XkgEn5nrm9Po8Lc5pEIqe96eodlk,7
diff --git a/libs/ffmpeg_python-0.2.0.dist-info/WHEEL b/libs/ffmpeg_python-0.2.0.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/ffmpeg_python-0.2.0.dist-info/WHEEL
+++ b/libs/ffmpeg_python-0.2.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/ffsubsync-0.4.27.dist-info/METADATA b/libs/ffsubsync-0.4.27.dist-info/METADATA
deleted file mode 100644
index b1437b481f..0000000000
--- a/libs/ffsubsync-0.4.27.dist-info/METADATA
+++ /dev/null
@@ -1,196 +0,0 @@
-Metadata-Version: 2.1
-Name: ffsubsync
-Version: 0.4.27
-Summary: Language-agnostic synchronization of subtitles with video.
-Home-page: https://github.com/smacke/ffsubsync
-Author: Stephen Macke
-Author-email: stephen.macke@gmail.com
-License: MIT
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Multimedia :: Sound/Audio :: Analysis
-Classifier: Topic :: Multimedia :: Sound/Audio :: Speech
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: auditok (==0.1.5)
-Requires-Dist: charset-normalizer
-Requires-Dist: faust-cchardet
-Requires-Dist: ffmpeg-python
-Requires-Dist: future (>=0.18.2)
-Requires-Dist: numpy (>=1.12.0)
-Requires-Dist: rich
-Requires-Dist: setuptools
-Requires-Dist: six
-Requires-Dist: srt (>=3.0.0)
-Requires-Dist: tqdm
-Requires-Dist: typing-extensions
-Requires-Dist: webrtcvad ; platform_system != "Windows"
-Requires-Dist: webrtcvad-wheels ; platform_system == "Windows"
-Requires-Dist: pysubs2 ; python_version < "3.7"
-Requires-Dist: chardet ; python_version >= "3.7"
-Requires-Dist: pysubs2 (>=1.2.0) ; python_version >= "3.7"
-
-FFsubsync
-=======
-
-[![CI Status](https://github.com/smacke/ffsubsync/workflows/ffsubsync/badge.svg)](https://github.com/smacke/ffsubsync/actions)
-[![Support Ukraine](https://badgen.net/badge/support/UKRAINE/?color=0057B8&labelColor=FFD700)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
-[![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![License: MIT](https://img.shields.io/badge/License-MIT-maroon.svg)](https://opensource.org/licenses/MIT)
-[![Python Versions](https://img.shields.io/pypi/pyversions/ffsubsync.svg)](https://pypi.org/project/ffsubsync)
-[![Documentation Status](https://readthedocs.org/projects/ffsubsync/badge/?version=latest)](https://ffsubsync.readthedocs.io/en/latest/?badge=latest)
-[![PyPI Version](https://img.shields.io/pypi/v/ffsubsync.svg)](https://pypi.org/project/ffsubsync)
-
-
-Language-agnostic automatic synchronization of subtitles with video, so that
-subtitles are aligned to the correct starting point within the video.
-
-Turn this:                       |  Into this:
-:-------------------------------:|:-------------------------:
-![](https://raw.githubusercontent.com/smacke/ffsubsync/master/resources/img/tearing-me-apart-wrong.gif)  |  ![](https://raw.githubusercontent.com/smacke/ffsubsync/master/resources/img/tearing-me-apart-correct.gif)
-
-Helping Development
--------------------
-Please consider [supporting Ukraine](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
-rather than donating directly to this project. That said, at the request of
-some, you can now help cover my coffee expenses using the Github Sponsors
-button at the top, or using the below Paypal Donate button:
-
-[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XJC5ANLMYECJE)
-
-Install
--------
-First, make sure ffmpeg is installed. On MacOS, this looks like:
-~~~
-brew install ffmpeg
-~~~
-(Windows users: make sure `ffmpeg` is on your path and can be referenced
-from the command line!)
-
-Next, grab the package (compatible with Python >= 3.6):
-~~~
-pip install ffsubsync
-~~~
-If you want to live dangerously, you can grab the latest version as follows:
-~~~
-pip install git+https://github.com/smacke/ffsubsync@latest
-~~~
-
-Usage
------
-`ffs`, `subsync` and `ffsubsync` all work as entrypoints:
-~~~
-ffs video.mp4 -i unsynchronized.srt -o synchronized.srt
-~~~
-
-There may be occasions where you have a correctly synchronized srt file in a
-language you are unfamiliar with, as well as an unsynchronized srt file in your
-native language. In this case, you can use the correctly synchronized srt file
-directly as a reference for synchronization, instead of using the video as the
-reference:
-
-~~~
-ffsubsync reference.srt -i unsynchronized.srt -o synchronized.srt
-~~~
-
-`ffsubsync` uses the file extension to decide whether to perform voice activity
-detection on the audio or to directly extract speech from an srt file.
-
-Sync Issues
------------
-If the sync fails, the following recourses are available:
-- Try to sync assuming identical video / subtitle framerates by passing
-  `--no-fix-framerate`;
-- Try passing `--gss` to use [golden-section search](https://en.wikipedia.org/wiki/Golden-section_search)
-  to find the optimal ratio between video and subtitle framerates (by default,
-  only a few common ratios are evaluated);
-- Try a value of `--max-offset-seconds` greater than the default of 60, in the
-  event that the subtitles are out of sync by more than 60 seconds (empirically
-  unlikely in practice, but possible).
-- Try `--vad=auditok` since [auditok](https://github.com/amsehili/auditok) can
-  sometimes work better in the case of low-quality audio than WebRTC's VAD.
-  Auditok does not specifically detect voice, but instead detects all audio;
-  this property can yield suboptimal syncing behavior when a proper VAD can
-  work well, but can be effective in some cases.
-
-If the sync still fails, consider trying one of the following similar tools:
-- [sc0ty/subsync](https://github.com/sc0ty/subsync): does speech-to-text and looks for matching word morphemes
-- [kaegi/alass](https://github.com/kaegi/alass): rust-based subtitle synchronizer with a fancy dynamic programming algorithm
-- [tympanix/subsync](https://github.com/tympanix/subsync): neural net based approach that optimizes directly for alignment when performing speech detection
-- [oseiskar/autosubsync](https://github.com/oseiskar/autosubsync): performs speech detection with bespoke spectrogram + logistic regression
-- [pums974/srtsync](https://github.com/pums974/srtsync): similar approach to ffsubsync (WebRTC's VAD + FFT to maximize signal cross correlation)
-
-Speed
------
-`ffsubsync` usually finishes in 20 to 30 seconds, depending on the length of
-the video. The most expensive step is actually extraction of raw audio. If you
-already have a correctly synchronized "reference" srt file (in which case audio
-extraction can be skipped), `ffsubsync` typically runs in less than a second.
-
-How It Works
-------------
-The synchronization algorithm operates in 3 steps:
-1. Discretize both the video file's audio stream and the subtitles into 10ms
-   windows.
-2. For each 10ms window, determine whether that window contains speech.  This
-   is trivial to do for subtitles (we just determine whether any subtitle is
-   "on" during each time window); for the audio stream, use an off-the-shelf
-   voice activity detector (VAD) like
-   the one built into [webrtc](https://webrtc.org/).
-3. Now we have two binary strings: one for the subtitles, and one for the
-   video.  Try to align these strings by matching 0's with 0's and 1's with
-   1's. We score these alignments as (# video 1's matched w/ subtitle 1's) - (#
-   video 1's matched with subtitle 0's).
-
-The best-scoring alignment from step 3 determines how to offset the subtitles
-in time so that they are properly synced with the video. Because the binary
-strings are fairly long (millions of digits for video longer than an hour), the
-naive O(n^2) strategy for scoring all alignments is unacceptable. Instead, we
-use the fact that "scoring all alignments" is a convolution operation and can
-be implemented with the Fast Fourier Transform (FFT), bringing the complexity
-down to O(n log n).
-
-Limitations
------------
-In most cases, inconsistencies between video and subtitles occur when starting
-or ending segments present in video are not present in subtitles, or vice versa.
-This can occur, for example, when a TV episode recap in the subtitles was pruned
-from video. FFsubsync typically works well in these cases, and in my experience
-this covers >95% of use cases. Handling breaks and splits outside of the beginning
-and ending segments is left to future work (see below).
-
-Future Work
------------
-Besides general stability and usability improvements, one line
-of work aims to extend the synchronization algorithm to handle splits
-/ breaks in the middle of video not present in subtitles (or vice versa).
-Developing a robust solution will take some time (assuming one is possible).
-See [#10](https://github.com/smacke/ffsubsync/issues/10) for more details.
-
-History
--------
-The implementation for this project was started during HackIllinois 2019, for
-which it received an **_Honorable Mention_** (ranked in the top 5 projects,
-excluding projects that won company-specific prizes).
-
-Credits
--------
-This project would not be possible without the following libraries:
-- [ffmpeg](https://www.ffmpeg.org/) and the [ffmpeg-python](https://github.com/kkroening/ffmpeg-python) wrapper, for extracting raw audio from video
-- VAD from [webrtc](https://webrtc.org/) and the [py-webrtcvad](https://github.com/wiseman/py-webrtcvad) wrapper, for speech detection
-- [srt](https://pypi.org/project/srt/) for operating on [SRT files](https://en.wikipedia.org/wiki/SubRip#SubRip_text_file_format)
-- [numpy](http://www.numpy.org/) and, indirectly, [FFTPACK](https://www.netlib.org/fftpack/), which powers the FFT-based algorithm for fast scoring of alignments between subtitles (or subtitles and video)
-- Other excellent Python libraries like [argparse](https://docs.python.org/3/library/argparse.html), [rich](https://github.com/willmcgugan/rich), and [tqdm](https://tqdm.github.io/), not related to the core functionality, but which enable much better experiences for developers and users.
-
-# License
-Code in this project is [MIT licensed](https://opensource.org/licenses/MIT).
diff --git a/libs/ffsubsync-0.4.27.dist-info/RECORD b/libs/ffsubsync-0.4.27.dist-info/RECORD
deleted file mode 100644
index c4e5060e53..0000000000
--- a/libs/ffsubsync-0.4.27.dist-info/RECORD
+++ /dev/null
@@ -1,26 +0,0 @@
-../../bin/ffs,sha256=DxvuHhnq32-Y1GV_I7TgwLKfOdmvGmt3YEor11O66T0,231
-../../bin/ffsubsync,sha256=DxvuHhnq32-Y1GV_I7TgwLKfOdmvGmt3YEor11O66T0,231
-../../bin/subsync,sha256=DxvuHhnq32-Y1GV_I7TgwLKfOdmvGmt3YEor11O66T0,231
-ffsubsync-0.4.27.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-ffsubsync-0.4.27.dist-info/LICENSE,sha256=DojZETNKKMCxh_kvQYZwyPFvuoM9pkllyQDqVdT9Ja4,1053
-ffsubsync-0.4.27.dist-info/METADATA,sha256=mrI29TjVdai0IUimAOLBYpyQKLS_1whpy3I_xFdAs8k,10152
-ffsubsync-0.4.27.dist-info/RECORD,,
-ffsubsync-0.4.27.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ffsubsync-0.4.27.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-ffsubsync-0.4.27.dist-info/entry_points.txt,sha256=x5tYAy_9mGKvB6HtyypAE7bMClVIVPxcxcTozISatsg,91
-ffsubsync-0.4.27.dist-info/top_level.txt,sha256=rD4Pc_QfEQZsZ-i6QXAdnbhVWanzT9edNbD7htPRjWs,10
-ffsubsync/__init__.py,sha256=ZvmoQa78CTLOAugFvZ2Ui4CpqSIbvcAEbDSNUjLNwt0,601
-ffsubsync/_version.py,sha256=7rAxsJ78XcG31MGnkympk8M2vM1ccLVn2oD4GXdH0kc,498
-ffsubsync/aligners.py,sha256=uaWmoCax0t8C6njy9paPkhgG4luPk8VIDm97WrZMzWU,5738
-ffsubsync/constants.py,sha256=SYqge3UW2ZQsGk_bi_wgg010SJCBhu6akR9R9fatv_0,1324
-ffsubsync/ffmpeg_utils.py,sha256=QeWpxoZ4Lm1IyLptl-pc1DZjn2zgLocZ0wyie86Popc,3161
-ffsubsync/ffsubsync.py,sha256=8b0bj4z25AdPIglVtoshWwPI90RV9F3H_YYcFgo9hng,26017
-ffsubsync/ffsubsync_gui.py,sha256=0cC9shk5q6KShAMzpo9ERbh2xVTyJNY7T4IOPqrE5p8,3617
-ffsubsync/file_utils.py,sha256=B5iTlmTuolE2JwhbFkJY8KqPvtwtHPNrAKsADtPgAQM,893
-ffsubsync/generic_subtitles.py,sha256=eq9M4p0sWIse_Ci46qSclOIiaxLmV5M4bM5XXh7y3u8,6218
-ffsubsync/golden_section_search.py,sha256=hJjjORLTzN01Yaz2H95_3RFHxmPoJGAg3yPSdg_7IKI,1831
-ffsubsync/sklearn_shim.py,sha256=KcnfAfCUMUDEWYiDooTZrAvWZSYsrRZhBZZn787NrrU,14569
-ffsubsync/speech_transformers.py,sha256=msv1V5DIbkF3NSli2as0pJuSZQMgg1t2aWk867IS-pg,19267
-ffsubsync/subtitle_parser.py,sha256=Edy5OYTyGxNgluFlz09qKLp96p2PvY9nlXoHqgdZNiU,6483
-ffsubsync/subtitle_transformers.py,sha256=qxD-FDRLDHUdXBXtr25Y8eXVLlV_XPv8tt5UQUMekGE,4547
-ffsubsync/version.py,sha256=GCDvVUjTaRo3LJ6PsWPopYN5eY6rjRFl3MdlxeH2nsI,1232
diff --git a/libs/ffsubsync-0.4.27.dist-info/WHEEL b/libs/ffsubsync-0.4.27.dist-info/WHEEL
deleted file mode 100644
index f771c29b87..0000000000
--- a/libs/ffsubsync-0.4.27.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/blinker-1.8.2.dist-info/INSTALLER b/libs/ffsubsync-0.4.31.dist-info/INSTALLER
similarity index 100%
rename from libs/blinker-1.8.2.dist-info/INSTALLER
rename to libs/ffsubsync-0.4.31.dist-info/INSTALLER
diff --git a/libs/ffsubsync-0.4.31.dist-info/METADATA b/libs/ffsubsync-0.4.31.dist-info/METADATA
new file mode 100644
index 0000000000..44e8462516
--- /dev/null
+++ b/libs/ffsubsync-0.4.31.dist-info/METADATA
@@ -0,0 +1,204 @@
+Metadata-Version: 2.4
+Name: ffsubsync
+Version: 0.4.31
+Home-page: https://github.com/smacke/ffsubsync
+Author: Stephen Macke
+Author-email: stephen.macke@gmail.com
+License: MIT
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Multimedia :: Sound/Audio :: Analysis
+Classifier: Topic :: Multimedia :: Sound/Audio :: Speech
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: auditok==0.1.5
+Requires-Dist: chardet; python_version >= "3.7"
+Requires-Dist: charset_normalizer
+Requires-Dist: faust-cchardet; python_version < "3.13"
+Requires-Dist: ffmpeg-python
+Requires-Dist: numpy>=1.12.0
+Requires-Dist: pysubs2; python_version < "3.7"
+Requires-Dist: pysubs2>=1.2.0; python_version >= "3.7"
+Requires-Dist: rich
+Requires-Dist: setuptools
+Requires-Dist: srt>=3.0.0
+Requires-Dist: tqdm
+Requires-Dist: typing_extensions
+Requires-Dist: webrtcvad; platform_system != "Windows"
+Requires-Dist: webrtcvad-wheels; platform_system == "Windows"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+
+FFsubsync
+=======
+
+[![CI Status](https://github.com/smacke/ffsubsync/workflows/ffsubsync/badge.svg)](https://github.com/smacke/ffsubsync/actions)
+[![Support Ukraine](https://badgen.net/badge/support/UKRAINE/?color=0057B8&labelColor=FFD700)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
+[![Checked with mypy](http://www.mypy-lang.org/static/mypy_badge.svg)](http://mypy-lang.org/)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![License: MIT](https://img.shields.io/badge/License-MIT-maroon.svg)](https://opensource.org/licenses/MIT)
+[![Python Versions](https://img.shields.io/pypi/pyversions/ffsubsync.svg)](https://pypi.org/project/ffsubsync)
+[![Documentation Status](https://readthedocs.org/projects/ffsubsync/badge/?version=latest)](https://ffsubsync.readthedocs.io/en/latest/?badge=latest)
+[![PyPI Version](https://img.shields.io/pypi/v/ffsubsync.svg)](https://pypi.org/project/ffsubsync)
+
+
+Language-agnostic automatic synchronization of subtitles with video, so that
+subtitles are aligned to the correct starting point within the video.
+
+Turn this:                       |  Into this:
+:-------------------------------:|:-------------------------:
+![](https://raw.githubusercontent.com/smacke/ffsubsync/master/resources/img/tearing-me-apart-wrong.gif)  |  ![](https://raw.githubusercontent.com/smacke/ffsubsync/master/resources/img/tearing-me-apart-correct.gif)
+
+Helping Development
+-------------------
+Please consider [supporting Ukraine](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
+rather than donating directly to this project. That said, at the request of
+some, you can now help cover my coffee expenses using the Github Sponsors
+button at the top, or using the below Paypal Donate button:
+
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XJC5ANLMYECJE)
+
+Install
+-------
+First, make sure ffmpeg is installed. On MacOS, this looks like:
+~~~
+brew install ffmpeg
+~~~
+(Windows users: make sure `ffmpeg` is on your path and can be referenced
+from the command line!)
+
+Next, grab the package (compatible with Python >= 3.6):
+~~~
+pip install ffsubsync
+~~~
+If you want to live dangerously, you can grab the latest version as follows:
+~~~
+pip install git+https://github.com/smacke/ffsubsync@latest
+~~~
+
+Usage
+-----
+`ffs`, `subsync` and `ffsubsync` all work as entrypoints:
+~~~
+ffs video.mp4 -i unsynchronized.srt -o synchronized.srt
+~~~
+
+There may be occasions where you have a correctly synchronized srt file in a
+language you are unfamiliar with, as well as an unsynchronized srt file in your
+native language. In this case, you can use the correctly synchronized srt file
+directly as a reference for synchronization, instead of using the video as the
+reference:
+
+~~~
+ffsubsync reference.srt -i unsynchronized.srt -o synchronized.srt
+~~~
+
+`ffsubsync` uses the file extension to decide whether to perform voice activity
+detection on the audio or to directly extract speech from an srt file.
+
+Sync Issues
+-----------
+If the sync fails, the following recourses are available:
+- Try to sync assuming identical video / subtitle framerates by passing
+  `--no-fix-framerate`;
+- Try passing `--gss` to use [golden-section search](https://en.wikipedia.org/wiki/Golden-section_search)
+  to find the optimal ratio between video and subtitle framerates (by default,
+  only a few common ratios are evaluated);
+- Try a value of `--max-offset-seconds` greater than the default of 60, in the
+  event that the subtitles are out of sync by more than 60 seconds (empirically
+  unlikely in practice, but possible).
+- Try `--vad=auditok` since [auditok](https://github.com/amsehili/auditok) can
+  sometimes work better in the case of low-quality audio than WebRTC's VAD.
+  Auditok does not specifically detect voice, but instead detects all audio;
+  this property can yield suboptimal syncing behavior when a proper VAD can
+  work well, but can be effective in some cases.
+
+If the sync still fails, consider trying one of the following similar tools:
+- [sc0ty/subsync](https://github.com/sc0ty/subsync): does speech-to-text and looks for matching word morphemes
+- [kaegi/alass](https://github.com/kaegi/alass): rust-based subtitle synchronizer with a fancy dynamic programming algorithm
+- [tympanix/subsync](https://github.com/tympanix/subsync): neural net based approach that optimizes directly for alignment when performing speech detection
+- [oseiskar/autosubsync](https://github.com/oseiskar/autosubsync): performs speech detection with bespoke spectrogram + logistic regression
+- [pums974/srtsync](https://github.com/pums974/srtsync): similar approach to ffsubsync (WebRTC's VAD + FFT to maximize signal cross correlation)
+
+Speed
+-----
+`ffsubsync` usually finishes in 20 to 30 seconds, depending on the length of
+the video. The most expensive step is actually extraction of raw audio. If you
+already have a correctly synchronized "reference" srt file (in which case audio
+extraction can be skipped), `ffsubsync` typically runs in less than a second.
+
+How It Works
+------------
+The synchronization algorithm operates in 3 steps:
+1. Discretize both the video file's audio stream and the subtitles into 10ms
+   windows.
+2. For each 10ms window, determine whether that window contains speech.  This
+   is trivial to do for subtitles (we just determine whether any subtitle is
+   "on" during each time window); for the audio stream, use an off-the-shelf
+   voice activity detector (VAD) like
+   the one built into [webrtc](https://webrtc.org/).
+3. Now we have two binary strings: one for the subtitles, and one for the
+   video.  Try to align these strings by matching 0's with 0's and 1's with
+   1's. We score these alignments as (# video 1's matched w/ subtitle 1's) - (#
+   video 1's matched with subtitle 0's).
+
+The best-scoring alignment from step 3 determines how to offset the subtitles
+in time so that they are properly synced with the video. Because the binary
+strings are fairly long (millions of digits for video longer than an hour), the
+naive O(n^2) strategy for scoring all alignments is unacceptable. Instead, we
+use the fact that "scoring all alignments" is a convolution operation and can
+be implemented with the Fast Fourier Transform (FFT), bringing the complexity
+down to O(n log n).
+
+Limitations
+-----------
+In most cases, inconsistencies between video and subtitles occur when starting
+or ending segments present in video are not present in subtitles, or vice versa.
+This can occur, for example, when a TV episode recap in the subtitles was pruned
+from video. FFsubsync typically works well in these cases, and in my experience
+this covers >95% of use cases. Handling breaks and splits outside of the beginning
+and ending segments is left to future work (see below).
+
+Future Work
+-----------
+Besides general stability and usability improvements, one line
+of work aims to extend the synchronization algorithm to handle splits
+/ breaks in the middle of video not present in subtitles (or vice versa).
+Developing a robust solution will take some time (assuming one is possible).
+See [#10](https://github.com/smacke/ffsubsync/issues/10) for more details.
+
+History
+-------
+The implementation for this project was started during HackIllinois 2019, for
+which it received an **_Honorable Mention_** (ranked in the top 5 projects,
+excluding projects that won company-specific prizes).
+
+Credits
+-------
+This project would not be possible without the following libraries:
+- [ffmpeg](https://www.ffmpeg.org/) and the [ffmpeg-python](https://github.com/kkroening/ffmpeg-python) wrapper, for extracting raw audio from video
+- VAD from [webrtc](https://webrtc.org/) and the [py-webrtcvad](https://github.com/wiseman/py-webrtcvad) wrapper, for speech detection
+- [srt](https://pypi.org/project/srt/) for operating on [SRT files](https://en.wikipedia.org/wiki/SubRip#SubRip_text_file_format)
+- [numpy](http://www.numpy.org/) and, indirectly, [FFTPACK](https://www.netlib.org/fftpack/), which powers the FFT-based algorithm for fast scoring of alignments between subtitles (or subtitles and video)
+- Other excellent Python libraries like [argparse](https://docs.python.org/3/library/argparse.html), [rich](https://github.com/willmcgugan/rich), and [tqdm](https://tqdm.github.io/), not related to the core functionality, but which enable much better experiences for developers and users.
+
+# License
+Code in this project is [MIT licensed](https://opensource.org/licenses/MIT).
diff --git a/libs/ffsubsync-0.4.31.dist-info/RECORD b/libs/ffsubsync-0.4.31.dist-info/RECORD
new file mode 100644
index 0000000000..f0083e096d
--- /dev/null
+++ b/libs/ffsubsync-0.4.31.dist-info/RECORD
@@ -0,0 +1,26 @@
+../../bin/ffs,sha256=32XxXbBZUX4ykfqdmPzCJi1nyuY8eNklysCZ6vXDNro,184
+../../bin/ffsubsync,sha256=32XxXbBZUX4ykfqdmPzCJi1nyuY8eNklysCZ6vXDNro,184
+../../bin/subsync,sha256=32XxXbBZUX4ykfqdmPzCJi1nyuY8eNklysCZ6vXDNro,184
+ffsubsync-0.4.31.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+ffsubsync-0.4.31.dist-info/METADATA,sha256=atAt88_KOHZSJeQeOnok6axknkSv-lb8rw3qdxHFRwo,10336
+ffsubsync-0.4.31.dist-info/RECORD,,
+ffsubsync-0.4.31.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ffsubsync-0.4.31.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+ffsubsync-0.4.31.dist-info/entry_points.txt,sha256=x5tYAy_9mGKvB6HtyypAE7bMClVIVPxcxcTozISatsg,91
+ffsubsync-0.4.31.dist-info/licenses/LICENSE,sha256=DojZETNKKMCxh_kvQYZwyPFvuoM9pkllyQDqVdT9Ja4,1053
+ffsubsync-0.4.31.dist-info/top_level.txt,sha256=rD4Pc_QfEQZsZ-i6QXAdnbhVWanzT9edNbD7htPRjWs,10
+ffsubsync/__init__.py,sha256=ZvmoQa78CTLOAugFvZ2Ui4CpqSIbvcAEbDSNUjLNwt0,601
+ffsubsync/_version.py,sha256=L_crtYFeaUjpj1PjY9398V2NobkBGQ79wehWJuimw1w,498
+ffsubsync/aligners.py,sha256=uaWmoCax0t8C6njy9paPkhgG4luPk8VIDm97WrZMzWU,5738
+ffsubsync/constants.py,sha256=SYqge3UW2ZQsGk_bi_wgg010SJCBhu6akR9R9fatv_0,1324
+ffsubsync/ffmpeg_utils.py,sha256=QeWpxoZ4Lm1IyLptl-pc1DZjn2zgLocZ0wyie86Popc,3161
+ffsubsync/ffsubsync.py,sha256=8b0bj4z25AdPIglVtoshWwPI90RV9F3H_YYcFgo9hng,26017
+ffsubsync/ffsubsync_gui.py,sha256=0cC9shk5q6KShAMzpo9ERbh2xVTyJNY7T4IOPqrE5p8,3617
+ffsubsync/file_utils.py,sha256=lKFNzGEVObAaCNsGt8drPSRFP_MLRGVWw3pi_ltlEUo,790
+ffsubsync/generic_subtitles.py,sha256=ikm_x09aU4aDQUfqLHPmuaxbvWTTH3Q4hla75IuEUk4,6036
+ffsubsync/golden_section_search.py,sha256=hJjjORLTzN01Yaz2H95_3RFHxmPoJGAg3yPSdg_7IKI,1831
+ffsubsync/sklearn_shim.py,sha256=KcnfAfCUMUDEWYiDooTZrAvWZSYsrRZhBZZn787NrrU,14569
+ffsubsync/speech_transformers.py,sha256=msv1V5DIbkF3NSli2as0pJuSZQMgg1t2aWk867IS-pg,19267
+ffsubsync/subtitle_parser.py,sha256=Edy5OYTyGxNgluFlz09qKLp96p2PvY9nlXoHqgdZNiU,6483
+ffsubsync/subtitle_transformers.py,sha256=qxD-FDRLDHUdXBXtr25Y8eXVLlV_XPv8tt5UQUMekGE,4547
+ffsubsync/version.py,sha256=GCDvVUjTaRo3LJ6PsWPopYN5eY6rjRFl3MdlxeH2nsI,1232
diff --git a/libs/certifi-2024.12.14.dist-info/REQUESTED b/libs/ffsubsync-0.4.31.dist-info/REQUESTED
similarity index 100%
rename from libs/certifi-2024.12.14.dist-info/REQUESTED
rename to libs/ffsubsync-0.4.31.dist-info/REQUESTED
diff --git a/libs/ffsubsync-0.4.31.dist-info/WHEEL b/libs/ffsubsync-0.4.31.dist-info/WHEEL
new file mode 100644
index 0000000000..5f133dbb5c
--- /dev/null
+++ b/libs/ffsubsync-0.4.31.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.9.0)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/ffsubsync-0.4.27.dist-info/entry_points.txt b/libs/ffsubsync-0.4.31.dist-info/entry_points.txt
similarity index 100%
rename from libs/ffsubsync-0.4.27.dist-info/entry_points.txt
rename to libs/ffsubsync-0.4.31.dist-info/entry_points.txt
diff --git a/libs/ffsubsync-0.4.27.dist-info/LICENSE b/libs/ffsubsync-0.4.31.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/ffsubsync-0.4.27.dist-info/LICENSE
rename to libs/ffsubsync-0.4.31.dist-info/licenses/LICENSE
diff --git a/libs/ffsubsync-0.4.27.dist-info/top_level.txt b/libs/ffsubsync-0.4.31.dist-info/top_level.txt
similarity index 100%
rename from libs/ffsubsync-0.4.27.dist-info/top_level.txt
rename to libs/ffsubsync-0.4.31.dist-info/top_level.txt
diff --git a/libs/ffsubsync/_version.py b/libs/ffsubsync/_version.py
index 4b43a6da3b..0517bde13d 100644
--- a/libs/ffsubsync/_version.py
+++ b/libs/ffsubsync/_version.py
@@ -8,11 +8,11 @@
 
 version_json = '''
 {
- "date": "2024-12-23T23:09:43-0800",
+ "date": "2025-11-23T21:22:43-0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "70ab16ffce283c86a1b66d8e35db351fbfbf2d19",
- "version": "0.4.27"
+ "full-revisionid": "73968e5c43bee79a363eb7e30c3fab87f99ca7f8",
+ "version": "0.4.31"
 }
 '''  # END VERSION_JSON
 
diff --git a/libs/ffsubsync/file_utils.py b/libs/ffsubsync/file_utils.py
index 22fc43d708..9fce7bc965 100644
--- a/libs/ffsubsync/file_utils.py
+++ b/libs/ffsubsync/file_utils.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import six
 import sys
 
 
@@ -13,11 +12,8 @@ def __init__(self, filename, *args, **kwargs) -> None:
         self.closing = kwargs.pop("closing", False)
         if filename is None:
             stream = sys.stdout if "w" in args else sys.stdin
-            if six.PY3:
-                self.fh = open(stream.fileno(), *args, **kwargs)
-            else:
-                self.fh = stream
-        elif isinstance(filename, six.string_types):
+            self.fh = open(stream.fileno(), *args, **kwargs)
+        elif isinstance(filename, str):
             self.fh = open(filename, *args, **kwargs)
             self.closing = True
         else:
diff --git a/libs/ffsubsync/generic_subtitles.py b/libs/ffsubsync/generic_subtitles.py
index 2dcf433ae2..d0eb0eaeae 100644
--- a/libs/ffsubsync/generic_subtitles.py
+++ b/libs/ffsubsync/generic_subtitles.py
@@ -7,7 +7,6 @@
 
 import pysubs2
 import srt
-import six
 import sys
 
 
@@ -158,13 +157,8 @@ def write_file(self, fname: str) -> None:
         else:
             raise NotImplementedError("unsupported output format: %s" % out_format)
 
-        to_write = to_write.encode(self._encoding)
-        if six.PY3:
-            with open(fname or sys.stdout.fileno(), "wb") as f:
-                f.write(to_write)
-        else:
-            with (fname and open(fname, "wb")) or sys.stdout as f:
-                f.write(to_write)
+        with open(fname or sys.stdout.fileno(), "wb") as f:
+            f.write(to_write.encode(self._encoding))
 
 
 class SubsMixin:
diff --git a/libs/filetype-1.2.0.dist-info/METADATA b/libs/filetype-1.2.0.dist-info/METADATA
index 2ebcc45da2..11768a544f 100644
--- a/libs/filetype-1.2.0.dist-info/METADATA
+++ b/libs/filetype-1.2.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: filetype
 Version: 1.2.0
 Summary: Infer file type and MIME type of any file/buffer. No external dependencies.
@@ -26,6 +26,17 @@ Classifier: Topic :: System
 Classifier: Topic :: System :: Filesystems
 Classifier: Topic :: Utilities
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: platform
+Dynamic: summary
 
 filetype.py |Build Status| |PyPI| |Pyversions| |API|
 ====================================================
diff --git a/libs/filetype-1.2.0.dist-info/RECORD b/libs/filetype-1.2.0.dist-info/RECORD
index 1a5229fd6a..e8aa775b7b 100644
--- a/libs/filetype-1.2.0.dist-info/RECORD
+++ b/libs/filetype-1.2.0.dist-info/RECORD
@@ -1,11 +1,11 @@
-../../bin/filetype,sha256=qhZzWIjpierkU7BFhcUqdo8jpXcpw4t1BOBkR_UK1fY,239
+../../bin/filetype,sha256=5w_99zSfxSVzAmVERzhpsSo5n_zP6IkkANIBVQlnIPk,192
 filetype-1.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-filetype-1.2.0.dist-info/LICENSE,sha256=jkTiqjWzcb3MhWvPDSRCpBDdVf3maw38L83wdtl5Rqw,1082
-filetype-1.2.0.dist-info/METADATA,sha256=IukENsJLniEMUy5Kauljm-JAi2RR1th0YD3E7hXw8UM,6532
+filetype-1.2.0.dist-info/METADATA,sha256=imM71eCVTr4adZlcyH6VK3qh_nxKGqe2gqkHYd5kql4,6744
 filetype-1.2.0.dist-info/RECORD,,
 filetype-1.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-filetype-1.2.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+filetype-1.2.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
 filetype-1.2.0.dist-info/entry_points.txt,sha256=FW9vQKv-y3mEcT51mUaPeIu3vixzcr6WdLfjD4SFUVM,52
+filetype-1.2.0.dist-info/licenses/LICENSE,sha256=jkTiqjWzcb3MhWvPDSRCpBDdVf3maw38L83wdtl5Rqw,1082
 filetype-1.2.0.dist-info/top_level.txt,sha256=9E4F1bIRPoq5TGtC-BHwM1_svcsWYRiC0N_qAGrlW0Y,9
 filetype-1.2.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 filetype/__init__.py,sha256=7c1C2XIbB7md1oI-0nwBzxoD52he_7NYry3YQV5OXa8,223
diff --git a/libs/filetype-1.2.0.dist-info/WHEEL b/libs/filetype-1.2.0.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/filetype-1.2.0.dist-info/WHEEL
+++ b/libs/filetype-1.2.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/filetype-1.2.0.dist-info/LICENSE b/libs/filetype-1.2.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/filetype-1.2.0.dist-info/LICENSE
rename to libs/filetype-1.2.0.dist-info/licenses/LICENSE
diff --git a/libs/flask-3.0.3.dist-info/METADATA b/libs/flask-3.0.3.dist-info/METADATA
deleted file mode 100644
index f6c57113cd..0000000000
--- a/libs/flask-3.0.3.dist-info/METADATA
+++ /dev/null
@@ -1,101 +0,0 @@
-Metadata-Version: 2.3
-Name: Flask
-Version: 3.0.3
-Summary: A simple framework for building complex web applications.
-Maintainer-email: Pallets <contact@palletsprojects.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Framework :: Flask
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
-Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Classifier: Typing :: Typed
-Requires-Dist: Werkzeug>=3.0.0
-Requires-Dist: Jinja2>=3.1.2
-Requires-Dist: itsdangerous>=2.1.2
-Requires-Dist: click>=8.1.3
-Requires-Dist: blinker>=1.6.2
-Requires-Dist: importlib-metadata>=3.6.0; python_version < '3.10'
-Requires-Dist: asgiref>=3.2 ; extra == "async"
-Requires-Dist: python-dotenv ; extra == "dotenv"
-Project-URL: Changes, https://flask.palletsprojects.com/changes/
-Project-URL: Chat, https://discord.gg/pallets
-Project-URL: Documentation, https://flask.palletsprojects.com/
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Source, https://github.com/pallets/flask/
-Provides-Extra: async
-Provides-Extra: dotenv
-
-# Flask
-
-Flask is a lightweight [WSGI][] web application framework. It is designed
-to make getting started quick and easy, with the ability to scale up to
-complex applications. It began as a simple wrapper around [Werkzeug][]
-and [Jinja][], and has become one of the most popular Python web
-application frameworks.
-
-Flask offers suggestions, but doesn't enforce any dependencies or
-project layout. It is up to the developer to choose the tools and
-libraries they want to use. There are many extensions provided by the
-community that make adding new functionality easy.
-
-[WSGI]: https://wsgi.readthedocs.io/
-[Werkzeug]: https://werkzeug.palletsprojects.com/
-[Jinja]: https://jinja.palletsprojects.com/
-
-
-## Installing
-
-Install and update from [PyPI][] using an installer such as [pip][]:
-
-```
-$ pip install -U Flask
-```
-
-[PyPI]: https://pypi.org/project/Flask/
-[pip]: https://pip.pypa.io/en/stable/getting-started/
-
-
-## A Simple Example
-
-```python
-# save this as app.py
-from flask import Flask
-
-app = Flask(__name__)
-
-@app.route("/")
-def hello():
-    return "Hello, World!"
-```
-
-```
-$ flask run
-  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
-```
-
-
-## Contributing
-
-For guidance on setting up a development environment and how to make a
-contribution to Flask, see the [contributing guidelines][].
-
-[contributing guidelines]: https://github.com/pallets/flask/blob/main/CONTRIBUTING.rst
-
-
-## Donate
-
-The Pallets organization develops and supports Flask and the libraries
-it uses. In order to grow the community of contributors and users, and
-allow the maintainers to devote more time to the projects, [please
-donate today][].
-
-[please donate today]: https://palletsprojects.com/donate
-
diff --git a/libs/flask-3.0.3.dist-info/RECORD b/libs/flask-3.0.3.dist-info/RECORD
deleted file mode 100644
index 3d0eb06802..0000000000
--- a/libs/flask-3.0.3.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-../../bin/flask,sha256=mkfqP1bdu7Q1Kux98Y6YmUcCGO8FyMAkRMD3_v5My8s,231
-flask-3.0.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-flask-3.0.3.dist-info/LICENSE.txt,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
-flask-3.0.3.dist-info/METADATA,sha256=-GseG-fPuzoaGGjjQphGgkch9Xj7zOaXM01CsgSsBWk,3177
-flask-3.0.3.dist-info/RECORD,,
-flask-3.0.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flask-3.0.3.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-flask-3.0.3.dist-info/entry_points.txt,sha256=bBP7hTOS5fz9zLtC7sPofBZAlMkEvBxu7KqS6l5lvc4,40
-flask/__init__.py,sha256=6xMqdVA0FIQ2U1KVaGX3lzNCdXPzoHPaa0hvQCNcfSk,2625
-flask/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
-flask/app.py,sha256=7-lh6cIj27riTE1Q18Ok1p5nOZ8qYiMux4Btc6o6mNc,60143
-flask/blueprints.py,sha256=7INXPwTkUxfOQXOOv1yu52NpHPmPGI5fMTMFZ-BG9yY,4430
-flask/cli.py,sha256=OOaf_Efqih1i2in58j-5ZZZmQnPpaSfiUFbEjlL9bzw,35825
-flask/config.py,sha256=bLzLVAj-cq-Xotu9erqOFte0xSFaVXyfz0AkP4GbwmY,13312
-flask/ctx.py,sha256=4atDhJJ_cpV1VMq4qsfU4E_61M1oN93jlS2H9gjrl58,15120
-flask/debughelpers.py,sha256=PGIDhStW_efRjpaa3zHIpo-htStJOR41Ip3OJWPYBwo,6080
-flask/globals.py,sha256=XdQZmStBmPIs8t93tjx6pO7Bm3gobAaONWkFcUHaGas,1713
-flask/helpers.py,sha256=tYrcQ_73GuSZVEgwFr-eMmV69UriFQDBmt8wZJIAqvg,23084
-flask/json/__init__.py,sha256=hLNR898paqoefdeAhraa5wyJy-bmRB2k2dV4EgVy2Z8,5602
-flask/json/provider.py,sha256=q6iB83lSiopy80DZPrU-9mGcWwrD0mvLjiv9fHrRZgc,7646
-flask/json/tag.py,sha256=DhaNwuIOhdt2R74oOC9Y4Z8ZprxFYiRb5dUP5byyINw,9281
-flask/logging.py,sha256=8sM3WMTubi1cBb2c_lPkWpN0J8dMAqrgKRYLLi1dCVI,2377
-flask/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flask/sansio/README.md,sha256=-0X1tECnilmz1cogx-YhNw5d7guK7GKrq_DEV2OzlU0,228
-flask/sansio/app.py,sha256=YG5Gf7JVf1c0yccWDZ86q5VSfJUidOVp27HFxFNxC7U,38053
-flask/sansio/blueprints.py,sha256=Tqe-7EkZ-tbWchm8iDoCfD848f0_3nLv6NNjeIPvHwM,24637
-flask/sansio/scaffold.py,sha256=WLV9TRQMMhGlXz-1OKtQ3lv6mtIBQZxdW2HezYrGxoI,30633
-flask/sessions.py,sha256=RU4lzm9MQW9CtH8rVLRTDm8USMJyT4LbvYe7sxM2__k,14807
-flask/signals.py,sha256=V7lMUww7CqgJ2ThUBn1PiatZtQanOyt7OZpu2GZI-34,750
-flask/templating.py,sha256=2TcXLT85Asflm2W9WOSFxKCmYn5e49w_Jkg9-NaaJWo,7537
-flask/testing.py,sha256=3BFXb3bP7R5r-XLBuobhczbxDu8-1LWRzYuhbr-lwaE,10163
-flask/typing.py,sha256=ZavK-wV28Yv8CQB7u73qZp_jLalpbWdrXS37QR1ftN0,3190
-flask/views.py,sha256=B66bTvYBBcHMYk4dA1ScZD0oTRTBl0I5smp1lRm9riI,6939
-flask/wrappers.py,sha256=m1j5tIJxIu8_sPPgTAB_G4TTh52Q-HoDuw_qHV5J59g,5831
diff --git a/libs/flask-3.0.3.dist-info/WHEEL b/libs/flask-3.0.3.dist-info/WHEEL
deleted file mode 100644
index e3c6feefa2..0000000000
--- a/libs/flask-3.0.3.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.10.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/certifi-2024.12.14.dist-info/INSTALLER b/libs/flask-3.1.3.dist-info/INSTALLER
similarity index 100%
rename from libs/certifi-2024.12.14.dist-info/INSTALLER
rename to libs/flask-3.1.3.dist-info/INSTALLER
diff --git a/libs/flask-3.1.3.dist-info/METADATA b/libs/flask-3.1.3.dist-info/METADATA
new file mode 100644
index 0000000000..9d8623c9ae
--- /dev/null
+++ b/libs/flask-3.1.3.dist-info/METADATA
@@ -0,0 +1,91 @@
+Metadata-Version: 2.4
+Name: Flask
+Version: 3.1.3
+Summary: A simple framework for building complex web applications.
+Maintainer-email: Pallets <contact@palletsprojects.com>
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-Expression: BSD-3-Clause
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Framework :: Flask
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Typing :: Typed
+License-File: LICENSE.txt
+Requires-Dist: blinker>=1.9.0
+Requires-Dist: click>=8.1.3
+Requires-Dist: importlib-metadata>=3.6.0; python_version < '3.10'
+Requires-Dist: itsdangerous>=2.2.0
+Requires-Dist: jinja2>=3.1.2
+Requires-Dist: markupsafe>=2.1.1
+Requires-Dist: werkzeug>=3.1.0
+Requires-Dist: asgiref>=3.2 ; extra == "async"
+Requires-Dist: python-dotenv ; extra == "dotenv"
+Project-URL: Changes, https://flask.palletsprojects.com/page/changes/
+Project-URL: Chat, https://discord.gg/pallets
+Project-URL: Documentation, https://flask.palletsprojects.com/
+Project-URL: Donate, https://palletsprojects.com/donate
+Project-URL: Source, https://github.com/pallets/flask/
+Provides-Extra: async
+Provides-Extra: dotenv
+
+<div align="center"><img src="https://raw.githubusercontent.com/pallets/flask/refs/heads/stable/docs/_static/flask-name.svg" alt="" height="150"></div>
+
+# Flask
+
+Flask is a lightweight [WSGI] web application framework. It is designed
+to make getting started quick and easy, with the ability to scale up to
+complex applications. It began as a simple wrapper around [Werkzeug]
+and [Jinja], and has become one of the most popular Python web
+application frameworks.
+
+Flask offers suggestions, but doesn't enforce any dependencies or
+project layout. It is up to the developer to choose the tools and
+libraries they want to use. There are many extensions provided by the
+community that make adding new functionality easy.
+
+[WSGI]: https://wsgi.readthedocs.io/
+[Werkzeug]: https://werkzeug.palletsprojects.com/
+[Jinja]: https://jinja.palletsprojects.com/
+
+## A Simple Example
+
+```python
+# save this as app.py
+from flask import Flask
+
+app = Flask(__name__)
+
+@app.route("/")
+def hello():
+    return "Hello, World!"
+```
+
+```
+$ flask run
+  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+```
+
+## Donate
+
+The Pallets organization develops and supports Flask and the libraries
+it uses. In order to grow the community of contributors and users, and
+allow the maintainers to devote more time to the projects, [please
+donate today].
+
+[please donate today]: https://palletsprojects.com/donate
+
+## Contributing
+
+See our [detailed contributing documentation][contrib] for many ways to
+contribute, including reporting issues, requesting features, asking or answering
+questions, and making PRs.
+
+[contrib]: https://palletsprojects.com/contributing/
+
diff --git a/libs/flask-3.1.3.dist-info/RECORD b/libs/flask-3.1.3.dist-info/RECORD
new file mode 100644
index 0000000000..14c607ee77
--- /dev/null
+++ b/libs/flask-3.1.3.dist-info/RECORD
@@ -0,0 +1,34 @@
+../../bin/flask,sha256=lV9cpQlxrUV2BI5ldP6qZRBGHOkTOPhl-dvNG7refkY,184
+flask-3.1.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+flask-3.1.3.dist-info/METADATA,sha256=qmdg7W9UVwRHTXBzPkpjp_FIHjdpc-3IlqE9AqciTHw,3167
+flask-3.1.3.dist-info/RECORD,,
+flask-3.1.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask-3.1.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+flask-3.1.3.dist-info/entry_points.txt,sha256=bBP7hTOS5fz9zLtC7sPofBZAlMkEvBxu7KqS6l5lvc4,40
+flask-3.1.3.dist-info/licenses/LICENSE.txt,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
+flask/__init__.py,sha256=mHvJN9Swtl1RDtjCqCIYyIniK_SZ_l_hqUynOzgpJ9o,2701
+flask/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
+flask/app.py,sha256=k7tW8LHRSldUi6zKsFKK7Axa_WL4zu1e2wPNthIsu7o,61719
+flask/blueprints.py,sha256=p5QE2lY18GItbdr_RKRpZ8Do17g0PvQGIgZkSUDhX2k,4541
+flask/cli.py,sha256=Pfh72-BxlvoH0QHCDOc1HvXG7Kq5Xetf3zzNz2kNSHk,37184
+flask/config.py,sha256=PiqF0DPam6HW0FH4CH1hpXTBe30NSzjPEOwrz1b6kt0,13219
+flask/ctx.py,sha256=oMe0TRsScW0qdaIqavVsk8P9qiEvAY5VHn1FAgkX8nk,15521
+flask/debughelpers.py,sha256=PGIDhStW_efRjpaa3zHIpo-htStJOR41Ip3OJWPYBwo,6080
+flask/globals.py,sha256=XdQZmStBmPIs8t93tjx6pO7Bm3gobAaONWkFcUHaGas,1713
+flask/helpers.py,sha256=rJZge7_J288J1UQv5-kNf4oEaw332PP8NTW0QRIBbXE,23517
+flask/json/__init__.py,sha256=hLNR898paqoefdeAhraa5wyJy-bmRB2k2dV4EgVy2Z8,5602
+flask/json/provider.py,sha256=5imEzY5HjV2HoUVrQbJLqXCzMNpZXfD0Y1XqdLV2XBA,7672
+flask/json/tag.py,sha256=DhaNwuIOhdt2R74oOC9Y4Z8ZprxFYiRb5dUP5byyINw,9281
+flask/logging.py,sha256=8sM3WMTubi1cBb2c_lPkWpN0J8dMAqrgKRYLLi1dCVI,2377
+flask/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask/sansio/README.md,sha256=-0X1tECnilmz1cogx-YhNw5d7guK7GKrq_DEV2OzlU0,228
+flask/sansio/app.py,sha256=whGURQDkN0jmhS4CHO7DQ96GGlZS0kETkKkAkoRjl4U,38106
+flask/sansio/blueprints.py,sha256=Tqe-7EkZ-tbWchm8iDoCfD848f0_3nLv6NNjeIPvHwM,24637
+flask/sansio/scaffold.py,sha256=wSASXYdFRWJmqcL0Xq-T7N-PDVUSiFGvjO9kPZg58bk,30371
+flask/sessions.py,sha256=eywRqmytTmYnX_EC78-YBGJoTc5XD_lRphQG5LbN1d0,14969
+flask/signals.py,sha256=V7lMUww7CqgJ2ThUBn1PiatZtQanOyt7OZpu2GZI-34,750
+flask/templating.py,sha256=vbIkwYAxsSEfDxQID1gKRvBQQcGWEuWYCnH0XK3EqOI,7678
+flask/testing.py,sha256=zzC7XxhBWOP9H697IV_4SG7Lg3Lzb5PWiyEP93_KQXE,10117
+flask/typing.py,sha256=L-L5t2jKgS0aOmVhioQ_ylqcgiVFnA6yxO-RLNhq-GU,3293
+flask/views.py,sha256=xzJx6oJqGElThtEghZN7ZQGMw5TDFyuRxUkecwRuAoA,6962
+flask/wrappers.py,sha256=jUkv4mVek2Iq4hwxd4RvqrIMb69Bv0PElDgWLmd5ORo,9406
diff --git a/libs/charset_normalizer-3.4.1.dist-info/REQUESTED b/libs/flask-3.1.3.dist-info/REQUESTED
similarity index 100%
rename from libs/charset_normalizer-3.4.1.dist-info/REQUESTED
rename to libs/flask-3.1.3.dist-info/REQUESTED
diff --git a/libs/flask-3.1.3.dist-info/WHEEL b/libs/flask-3.1.3.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/flask-3.1.3.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/flask-3.0.3.dist-info/entry_points.txt b/libs/flask-3.1.3.dist-info/entry_points.txt
similarity index 100%
rename from libs/flask-3.0.3.dist-info/entry_points.txt
rename to libs/flask-3.1.3.dist-info/entry_points.txt
diff --git a/libs/flask-3.0.3.dist-info/LICENSE.txt b/libs/flask-3.1.3.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/flask-3.0.3.dist-info/LICENSE.txt
rename to libs/flask-3.1.3.dist-info/licenses/LICENSE.txt
diff --git a/libs/flask/__init__.py b/libs/flask/__init__.py
index e86eb43ee9..1fdc50cea1 100644
--- a/libs/flask/__init__.py
+++ b/libs/flask/__init__.py
@@ -42,19 +42,20 @@
 from .wrappers import Request as Request
 from .wrappers import Response as Response
 
+if not t.TYPE_CHECKING:
 
-def __getattr__(name: str) -> t.Any:
-    if name == "__version__":
-        import importlib.metadata
-        import warnings
+    def __getattr__(name: str) -> t.Any:
+        if name == "__version__":
+            import importlib.metadata
+            import warnings
 
-        warnings.warn(
-            "The '__version__' attribute is deprecated and will be removed in"
-            " Flask 3.1. Use feature detection or"
-            " 'importlib.metadata.version(\"flask\")' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return importlib.metadata.version("flask")
+            warnings.warn(
+                "The '__version__' attribute is deprecated and will be removed in"
+                " Flask 3.2. Use feature detection or"
+                " 'importlib.metadata.version(\"flask\")' instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            return importlib.metadata.version("flask")
 
-    raise AttributeError(name)
+        raise AttributeError(name)
diff --git a/libs/flask/app.py b/libs/flask/app.py
index 7622b5e838..cc326dbe3c 100644
--- a/libs/flask/app.py
+++ b/libs/flask/app.py
@@ -24,6 +24,7 @@
 from werkzeug.routing import Rule
 from werkzeug.serving import is_running_from_reloader
 from werkzeug.wrappers import Response as BaseResponse
+from werkzeug.wsgi import get_host
 
 from . import cli
 from . import typing as ft
@@ -59,6 +60,7 @@
 
     from .testing import FlaskClient
     from .testing import FlaskCliRunner
+    from .typing import HeadersValue
 
 T_shell_context_processor = t.TypeVar(
     "T_shell_context_processor", bound=ft.ShellContextProcessorCallable
@@ -179,8 +181,10 @@ class Flask(App):
             "TESTING": False,
             "PROPAGATE_EXCEPTIONS": None,
             "SECRET_KEY": None,
+            "SECRET_KEY_FALLBACKS": None,
             "PERMANENT_SESSION_LIFETIME": timedelta(days=31),
             "USE_X_SENDFILE": False,
+            "TRUSTED_HOSTS": None,
             "SERVER_NAME": None,
             "APPLICATION_ROOT": "/",
             "SESSION_COOKIE_NAME": "session",
@@ -188,9 +192,12 @@ class Flask(App):
             "SESSION_COOKIE_PATH": None,
             "SESSION_COOKIE_HTTPONLY": True,
             "SESSION_COOKIE_SECURE": False,
+            "SESSION_COOKIE_PARTITIONED": False,
             "SESSION_COOKIE_SAMESITE": None,
             "SESSION_REFRESH_EACH_REQUEST": True,
             "MAX_CONTENT_LENGTH": None,
+            "MAX_FORM_MEMORY_SIZE": 500_000,
+            "MAX_FORM_PARTS": 1_000,
             "SEND_FILE_MAX_AGE_DEFAULT": None,
             "TRAP_BAD_REQUEST_ERRORS": None,
             "TRAP_HTTP_EXCEPTIONS": False,
@@ -198,6 +205,7 @@ class Flask(App):
             "PREFERRED_URL_SCHEME": "http",
             "TEMPLATES_AUTO_RELOAD": None,
             "MAX_COOKIE_SIZE": 4093,
+            "PROVIDE_AUTOMATIC_OPTIONS": True,
         }
     )
 
@@ -257,9 +265,9 @@ def __init__(
         # For one, it might be created while the server is running (e.g. during
         # development). Also, Google App Engine stores static files somewhere
         if self.has_static_folder:
-            assert (
-                bool(static_host) == host_matching
-            ), "Invalid static_host/host_matching combination"
+            assert bool(static_host) == host_matching, (
+                "Invalid static_host/host_matching combination"
+            )
             # Use a weakref to avoid creating a reference cycle between the app
             # and the view function (see #3761).
             self_ref = weakref.ref(self)
@@ -267,7 +275,7 @@ def __init__(
                 f"{self.static_url_path}/<path:filename>",
                 endpoint="static",
                 host=static_host,
-                view_func=lambda **kw: self_ref().send_static_file(**kw),  # type: ignore # noqa: B950
+                view_func=lambda **kw: self_ref().send_static_file(**kw),  # type: ignore
             )
 
     def get_send_file_max_age(self, filename: str | None) -> int | None:
@@ -319,9 +327,10 @@ def send_static_file(self, filename: str) -> Response:
             t.cast(str, self.static_folder), filename, max_age=max_age
         )
 
-    def open_resource(self, resource: str, mode: str = "rb") -> t.IO[t.AnyStr]:
-        """Open a resource file relative to :attr:`root_path` for
-        reading.
+    def open_resource(
+        self, resource: str, mode: str = "rb", encoding: str | None = None
+    ) -> t.IO[t.AnyStr]:
+        """Open a resource file relative to :attr:`root_path` for reading.
 
         For example, if the file ``schema.sql`` is next to the file
         ``app.py`` where the ``Flask`` app is defined, it can be opened
@@ -332,31 +341,46 @@ def open_resource(self, resource: str, mode: str = "rb") -> t.IO[t.AnyStr]:
             with app.open_resource("schema.sql") as f:
                 conn.executescript(f.read())
 
-        :param resource: Path to the resource relative to
-            :attr:`root_path`.
-        :param mode: Open the file in this mode. Only reading is
-            supported, valid values are "r" (or "rt") and "rb".
-
-        Note this is a duplicate of the same method in the Flask
-        class.
+        :param resource: Path to the resource relative to :attr:`root_path`.
+        :param mode: Open the file in this mode. Only reading is supported,
+            valid values are ``"r"`` (or ``"rt"``) and ``"rb"``.
+        :param encoding: Open the file with this encoding when opening in text
+            mode. This is ignored when opening in binary mode.
 
+        .. versionchanged:: 3.1
+            Added the ``encoding`` parameter.
         """
         if mode not in {"r", "rt", "rb"}:
             raise ValueError("Resources can only be opened for reading.")
 
-        return open(os.path.join(self.root_path, resource), mode)
+        path = os.path.join(self.root_path, resource)
+
+        if mode == "rb":
+            return open(path, mode)  # pyright: ignore
 
-    def open_instance_resource(self, resource: str, mode: str = "rb") -> t.IO[t.AnyStr]:
-        """Opens a resource from the application's instance folder
-        (:attr:`instance_path`).  Otherwise works like
-        :meth:`open_resource`.  Instance resources can also be opened for
-        writing.
+        return open(path, mode, encoding=encoding)
 
-        :param resource: the name of the resource.  To access resources within
-                         subfolders use forward slashes as separator.
-        :param mode: resource file opening mode, default is 'rb'.
+    def open_instance_resource(
+        self, resource: str, mode: str = "rb", encoding: str | None = "utf-8"
+    ) -> t.IO[t.AnyStr]:
+        """Open a resource file relative to the application's instance folder
+        :attr:`instance_path`. Unlike :meth:`open_resource`, files in the
+        instance folder can be opened for writing.
+
+        :param resource: Path to the resource relative to :attr:`instance_path`.
+        :param mode: Open the file in this mode.
+        :param encoding: Open the file with this encoding when opening in text
+            mode. This is ignored when opening in binary mode.
+
+        .. versionchanged:: 3.1
+            Added the ``encoding`` parameter.
         """
-        return open(os.path.join(self.instance_path, resource), mode)
+        path = os.path.join(self.instance_path, resource)
+
+        if "b" in mode:
+            return open(path, mode)
+
+        return open(path, mode, encoding=encoding)
 
     def create_jinja_environment(self) -> Environment:
         """Create the Jinja environment based on :attr:`jinja_options`
@@ -403,32 +427,45 @@ def create_url_adapter(self, request: Request | None) -> MapAdapter | None:
         is created at a point where the request context is not yet set
         up so the request is passed explicitly.
 
-        .. versionadded:: 0.6
-
-        .. versionchanged:: 0.9
-           This can now also be called without a request object when the
-           URL adapter is created for the application context.
+        .. versionchanged:: 3.1
+            If :data:`SERVER_NAME` is set, it does not restrict requests to
+            only that domain, for both ``subdomain_matching`` and
+            ``host_matching``.
 
         .. versionchanged:: 1.0
             :data:`SERVER_NAME` no longer implicitly enables subdomain
             matching. Use :attr:`subdomain_matching` instead.
+
+        .. versionchanged:: 0.9
+           This can be called outside a request when the URL adapter is created
+           for an application context.
+
+        .. versionadded:: 0.6
         """
         if request is not None:
-            # If subdomain matching is disabled (the default), use the
-            # default subdomain in all cases. This should be the default
-            # in Werkzeug but it currently does not have that feature.
-            if not self.subdomain_matching:
-                subdomain = self.url_map.default_subdomain or None
-            else:
-                subdomain = None
+            if (trusted_hosts := self.config["TRUSTED_HOSTS"]) is not None:
+                request.trusted_hosts = trusted_hosts
+
+            # Check trusted_hosts here until bind_to_environ does.
+            request.host = get_host(request.environ, request.trusted_hosts)  # pyright: ignore
+            subdomain = None
+            server_name = self.config["SERVER_NAME"]
+
+            if self.url_map.host_matching:
+                # Don't pass SERVER_NAME, otherwise it's used and the actual
+                # host is ignored, which breaks host matching.
+                server_name = None
+            elif not self.subdomain_matching:
+                # Werkzeug doesn't implement subdomain matching yet. Until then,
+                # disable it by forcing the current subdomain to the default, or
+                # the empty string.
+                subdomain = self.url_map.default_subdomain or ""
 
             return self.url_map.bind_to_environ(
-                request.environ,
-                server_name=self.config["SERVER_NAME"],
-                subdomain=subdomain,
+                request.environ, server_name=server_name, subdomain=subdomain
             )
-        # We need at the very least the server name to be set for this
-        # to work.
+
+        # Need at least SERVER_NAME to match/build outside a request.
         if self.config["SERVER_NAME"] is not None:
             return self.url_map.bind(
                 self.config["SERVER_NAME"],
@@ -1146,7 +1183,8 @@ def make_response(self, rv: ft.ResponseReturnValue) -> Response:
            response object.
         """
 
-        status = headers = None
+        status: int | None = None
+        headers: HeadersValue | None = None
 
         # unpack tuple returns
         if isinstance(rv, tuple):
@@ -1158,7 +1196,7 @@ def make_response(self, rv: ft.ResponseReturnValue) -> Response:
             # decide if a 2-tuple has status or headers
             elif len_rv == 2:
                 if isinstance(rv[1], (Headers, dict, tuple, list)):
-                    rv, headers = rv
+                    rv, headers = rv  # pyright: ignore
                 else:
                     rv, status = rv  # type: ignore[assignment,misc]
             # other sized tuples are not allowed
@@ -1184,7 +1222,7 @@ def make_response(self, rv: ft.ResponseReturnValue) -> Response:
                 # waiting to do it manually, so that the class can handle any
                 # special logic
                 rv = self.response_class(
-                    rv,
+                    rv,  # pyright: ignore
                     status=status,
                     headers=headers,  # type: ignore[arg-type]
                 )
@@ -1226,7 +1264,7 @@ def make_response(self, rv: ft.ResponseReturnValue) -> Response:
 
         # extend existing headers with provided headers
         if headers:
-            rv.headers.update(headers)  # type: ignore[arg-type]
+            rv.headers.update(headers)
 
         return rv
 
@@ -1280,8 +1318,8 @@ def process_response(self, response: Response) -> Response:
                 for func in reversed(self.after_request_funcs[name]):
                     response = self.ensure_sync(func)(response)
 
-        if not self.session_interface.is_null_session(ctx.session):
-            self.session_interface.save_session(self, ctx.session, response)
+        if not self.session_interface.is_null_session(ctx._session):
+            self.session_interface.save_session(self, ctx._session, response)
 
         return response
 
@@ -1474,7 +1512,7 @@ def wsgi_app(
             except Exception as e:
                 error = e
                 response = self.handle_exception(e)
-            except:  # noqa: B001
+            except:
                 error = sys.exc_info()[1]
                 raise
             return response(environ, start_response)
diff --git a/libs/flask/blueprints.py b/libs/flask/blueprints.py
index aa9eacf21b..b6d4e43339 100644
--- a/libs/flask/blueprints.py
+++ b/libs/flask/blueprints.py
@@ -101,29 +101,28 @@ def send_static_file(self, filename: str) -> Response:
             t.cast(str, self.static_folder), filename, max_age=max_age
         )
 
-    def open_resource(self, resource: str, mode: str = "rb") -> t.IO[t.AnyStr]:
-        """Open a resource file relative to :attr:`root_path` for
-        reading.
-
-        For example, if the file ``schema.sql`` is next to the file
-        ``app.py`` where the ``Flask`` app is defined, it can be opened
-        with:
-
-        .. code-block:: python
-
-            with app.open_resource("schema.sql") as f:
-                conn.executescript(f.read())
-
-        :param resource: Path to the resource relative to
-            :attr:`root_path`.
-        :param mode: Open the file in this mode. Only reading is
-            supported, valid values are "r" (or "rt") and "rb".
-
-        Note this is a duplicate of the same method in the Flask
-        class.
-
+    def open_resource(
+        self, resource: str, mode: str = "rb", encoding: str | None = "utf-8"
+    ) -> t.IO[t.AnyStr]:
+        """Open a resource file relative to :attr:`root_path` for reading. The
+        blueprint-relative equivalent of the app's :meth:`~.Flask.open_resource`
+        method.
+
+        :param resource: Path to the resource relative to :attr:`root_path`.
+        :param mode: Open the file in this mode. Only reading is supported,
+            valid values are ``"r"`` (or ``"rt"``) and ``"rb"``.
+        :param encoding: Open the file with this encoding when opening in text
+            mode. This is ignored when opening in binary mode.
+
+        .. versionchanged:: 3.1
+            Added the ``encoding`` parameter.
         """
         if mode not in {"r", "rt", "rb"}:
             raise ValueError("Resources can only be opened for reading.")
 
-        return open(os.path.join(self.root_path, resource), mode)
+        path = os.path.join(self.root_path, resource)
+
+        if mode == "rb":
+            return open(path, mode)  # pyright: ignore
+
+        return open(path, mode, encoding=encoding)
diff --git a/libs/flask/cli.py b/libs/flask/cli.py
index ecb292a01e..ed11f256a1 100644
--- a/libs/flask/cli.py
+++ b/libs/flask/cli.py
@@ -297,6 +297,9 @@ class ScriptInfo:
     a bigger role.  Typically it's created automatically by the
     :class:`FlaskGroup` but you can also manually create it and pass it
     onwards as click object.
+
+    .. versionchanged:: 3.1
+        Added the ``load_dotenv_defaults`` parameter and attribute.
     """
 
     def __init__(
@@ -304,6 +307,7 @@ def __init__(
         app_import_path: str | None = None,
         create_app: t.Callable[..., Flask] | None = None,
         set_debug_flag: bool = True,
+        load_dotenv_defaults: bool = True,
     ) -> None:
         #: Optionally the import path for the Flask application.
         self.app_import_path = app_import_path
@@ -314,6 +318,16 @@ def __init__(
         #: this script info.
         self.data: dict[t.Any, t.Any] = {}
         self.set_debug_flag = set_debug_flag
+
+        self.load_dotenv_defaults = get_load_dotenv(load_dotenv_defaults)
+        """Whether default ``.flaskenv`` and ``.env`` files should be loaded.
+
+        ``ScriptInfo`` doesn't load anything, this is for reference when doing
+        the load elsewhere during processing.
+
+        .. versionadded:: 3.1
+        """
+
         self._loaded_app: Flask | None = None
 
     def load_app(self) -> Flask:
@@ -323,9 +337,9 @@ def load_app(self) -> Flask:
         """
         if self._loaded_app is not None:
             return self._loaded_app
-
+        app: Flask | None = None
         if self.create_app is not None:
-            app: Flask | None = self.create_app()
+            app = self.create_app()
         else:
             if self.app_import_path:
                 path, name = (
@@ -479,23 +493,22 @@ def _set_debug(ctx: click.Context, param: click.Option, value: bool) -> bool | N
 def _env_file_callback(
     ctx: click.Context, param: click.Option, value: str | None
 ) -> str | None:
-    if value is None:
-        return None
-
-    import importlib
-
     try:
-        importlib.import_module("dotenv")
+        import dotenv  # noqa: F401
     except ImportError:
-        raise click.BadParameter(
-            "python-dotenv must be installed to load an env file.",
-            ctx=ctx,
-            param=param,
-        ) from None
+        # Only show an error if a value was passed, otherwise we still want to
+        # call load_dotenv and show a message without exiting.
+        if value is not None:
+            raise click.BadParameter(
+                "python-dotenv must be installed to load an env file.",
+                ctx=ctx,
+                param=param,
+            ) from None
+
+    # Load if a value was passed, or we want to load default files, or both.
+    if value is not None or ctx.obj.load_dotenv_defaults:
+        load_dotenv(value, load_defaults=ctx.obj.load_dotenv_defaults)
 
-    # Don't check FLASK_SKIP_DOTENV, that only disables automatically
-    # loading .env and .flaskenv files.
-    load_dotenv(value)
     return value
 
 
@@ -504,7 +517,11 @@ def _env_file_callback(
 _env_file_option = click.Option(
     ["-e", "--env-file"],
     type=click.Path(exists=True, dir_okay=False),
-    help="Load environment variables from this file. python-dotenv must be installed.",
+    help=(
+        "Load environment variables from this file, taking precedence over"
+        " those set by '.env' and '.flaskenv'. Variables set directly in the"
+        " environment take highest precedence. python-dotenv must be installed."
+    ),
     is_eager=True,
     expose_value=False,
     callback=_env_file_callback,
@@ -528,6 +545,9 @@ class FlaskGroup(AppGroup):
         directory to the directory containing the first file found.
     :param set_debug_flag: Set the app's debug flag.
 
+    .. versionchanged:: 3.1
+        ``-e path`` takes precedence over default ``.env`` and ``.flaskenv`` files.
+
     .. versionchanged:: 2.2
         Added the ``-A/--app``, ``--debug/--no-debug``, ``-e/--env-file`` options.
 
@@ -549,7 +569,7 @@ def __init__(
         set_debug_flag: bool = True,
         **extra: t.Any,
     ) -> None:
-        params = list(extra.pop("params", None) or ())
+        params: list[click.Parameter] = list(extra.pop("params", None) or ())
         # Processing is done with option callbacks instead of a group
         # callback. This allows users to make a custom group callback
         # without losing the behavior. --env-file must come first so
@@ -587,7 +607,7 @@ def _load_plugin_commands(self) -> None:
             # Use a backport on Python < 3.10. We technically have
             # importlib.metadata on 3.8+, but the API changed in 3.10,
             # so use the backport for consistency.
-            import importlib_metadata as metadata
+            import importlib_metadata as metadata  # pyright: ignore
 
         for ep in metadata.entry_points(group="flask.commands"):
             self.add_command(ep.load(), ep.name)
@@ -654,20 +674,19 @@ def make_context(
         # when importing, blocking whatever command is being called.
         os.environ["FLASK_RUN_FROM_CLI"] = "true"
 
-        # Attempt to load .env and .flask env files. The --env-file
-        # option can cause another file to be loaded.
-        if get_load_dotenv(self.load_dotenv):
-            load_dotenv()
-
         if "obj" not in extra and "obj" not in self.context_settings:
             extra["obj"] = ScriptInfo(
-                create_app=self.create_app, set_debug_flag=self.set_debug_flag
+                create_app=self.create_app,
+                set_debug_flag=self.set_debug_flag,
+                load_dotenv_defaults=self.load_dotenv,
             )
 
         return super().make_context(info_name, args, parent=parent, **extra)
 
     def parse_args(self, ctx: click.Context, args: list[str]) -> list[str]:
-        if not args and self.no_args_is_help:
+        if (not args and self.no_args_is_help) or (
+            len(args) == 1 and args[0] in self.get_help_option_names(ctx)
+        ):
             # Attempt to load --env-file and --app early in case they
             # were given as env vars. Otherwise no_args_is_help will not
             # see commands from app.cli.
@@ -684,18 +703,26 @@ def _path_is_ancestor(path: str, other: str) -> bool:
     return os.path.join(path, other[len(path) :].lstrip(os.sep)) == other
 
 
-def load_dotenv(path: str | os.PathLike[str] | None = None) -> bool:
-    """Load "dotenv" files in order of precedence to set environment variables.
-
-    If an env var is already set it is not overwritten, so earlier files in the
-    list are preferred over later files.
+def load_dotenv(
+    path: str | os.PathLike[str] | None = None, load_defaults: bool = True
+) -> bool:
+    """Load "dotenv" files to set environment variables. A given path takes
+    precedence over ``.env``, which takes precedence over ``.flaskenv``. After
+    loading and combining these files, values are only set if the key is not
+    already set in ``os.environ``.
 
     This is a no-op if `python-dotenv`_ is not installed.
 
     .. _python-dotenv: https://github.com/theskumar/python-dotenv#readme
 
-    :param path: Load the file at this location instead of searching.
-    :return: ``True`` if a file was loaded.
+    :param path: Load the file at this location.
+    :param load_defaults: Search for and load the default ``.flaskenv`` and
+        ``.env`` files.
+    :return: ``True`` if at least one env var was loaded.
+
+    .. versionchanged:: 3.1
+        Added the ``load_defaults`` parameter. A given path takes precedence
+        over default files.
 
     .. versionchanged:: 2.0
         The current directory is not changed to the location of the
@@ -715,34 +742,33 @@ def load_dotenv(path: str | os.PathLike[str] | None = None) -> bool:
     except ImportError:
         if path or os.path.isfile(".env") or os.path.isfile(".flaskenv"):
             click.secho(
-                " * Tip: There are .env or .flaskenv files present."
-                ' Do "pip install python-dotenv" to use them.',
+                " * Tip: There are .env files present. Install python-dotenv"
+                " to use them.",
                 fg="yellow",
                 err=True,
             )
 
         return False
 
-    # Always return after attempting to load a given path, don't load
-    # the default files.
-    if path is not None:
-        if os.path.isfile(path):
-            return dotenv.load_dotenv(path, encoding="utf-8")
+    data: dict[str, str | None] = {}
 
-        return False
+    if load_defaults:
+        for default_name in (".flaskenv", ".env"):
+            if not (default_path := dotenv.find_dotenv(default_name, usecwd=True)):
+                continue
 
-    loaded = False
+            data |= dotenv.dotenv_values(default_path, encoding="utf-8")
 
-    for name in (".env", ".flaskenv"):
-        path = dotenv.find_dotenv(name, usecwd=True)
+    if path is not None and os.path.isfile(path):
+        data |= dotenv.dotenv_values(path, encoding="utf-8")
 
-        if not path:
+    for key, value in data.items():
+        if key in os.environ or value is None:
             continue
 
-        dotenv.load_dotenv(path, encoding="utf-8")
-        loaded = True
+        os.environ[key] = value
 
-    return loaded  # True if at least one file was located and loaded.
+    return bool(data)  # True if at least one env var was loaded.
 
 
 def show_server_banner(debug: bool, app_import_path: str | None) -> None:
@@ -934,7 +960,7 @@ def run_command(
     option.
     """
     try:
-        app: WSGIApplication = info.load_app()
+        app: WSGIApplication = info.load_app()  # pyright: ignore
     except Exception as e:
         if is_running_from_reloader():
             # When reloading, print out the error immediately, but raise
diff --git a/libs/flask/config.py b/libs/flask/config.py
index 7e3ba1790b..34ef1a5721 100644
--- a/libs/flask/config.py
+++ b/libs/flask/config.py
@@ -150,13 +150,13 @@ def from_prefixed_env(
         .. versionadded:: 2.1
         """
         prefix = f"{prefix}_"
-        len_prefix = len(prefix)
 
         for key in sorted(os.environ):
             if not key.startswith(prefix):
                 continue
 
             value = os.environ[key]
+            key = key.removeprefix(prefix)
 
             try:
                 value = loads(value)
@@ -164,9 +164,6 @@ def from_prefixed_env(
                 # Keep the value as a string if loading failed.
                 pass
 
-            # Change to key.removeprefix(prefix) on Python >= 3.9.
-            key = key[len_prefix:]
-
             if "__" not in key:
                 # A non-nested key, set directly.
                 self[key] = value
diff --git a/libs/flask/ctx.py b/libs/flask/ctx.py
index 9b164d3907..5f7b1f1db0 100644
--- a/libs/flask/ctx.py
+++ b/libs/flask/ctx.py
@@ -187,8 +187,8 @@ def do_some_work():
     ctx = ctx.copy()
 
     def wrapper(*args: t.Any, **kwargs: t.Any) -> t.Any:
-        with ctx:  # type: ignore[union-attr]
-            return ctx.app.ensure_sync(f)(*args, **kwargs)  # type: ignore[union-attr]
+        with ctx:
+            return ctx.app.ensure_sync(f)(*args, **kwargs)
 
     return update_wrapper(wrapper, f)  # type: ignore[return-value]
 
@@ -324,7 +324,7 @@ def __init__(
         except HTTPException as e:
             self.request.routing_exception = e
         self.flashes: list[tuple[str, str]] | None = None
-        self.session: SessionMixin | None = session
+        self._session: SessionMixin | None = session
         # Functions that should be executed after the request on the response
         # object.  These will be called before the regular "after_request"
         # functions.
@@ -351,7 +351,7 @@ def copy(self) -> RequestContext:
             self.app,
             environ=self.request.environ,
             request=self.request,
-            session=self.session,
+            session=self._session,
         )
 
     def match_request(self) -> None:
@@ -364,6 +364,16 @@ def match_request(self) -> None:
         except HTTPException as e:
             self.request.routing_exception = e
 
+    @property
+    def session(self) -> SessionMixin:
+        """The session data associated with this request. Not available until
+        this context has been pushed. Accessing this property, also accessed by
+        the :data:`~flask.session` proxy, sets :attr:`.SessionMixin.accessed`.
+        """
+        assert self._session is not None, "The session has not yet been opened."
+        self._session.accessed = True
+        return self._session
+
     def push(self) -> None:
         # Before we push the request context we have to ensure that there
         # is an application context.
@@ -381,12 +391,12 @@ def push(self) -> None:
         # This allows a custom open_session method to use the request context.
         # Only open a new session if this is the first time the request was
         # pushed, otherwise stream_with_context loses the session.
-        if self.session is None:
+        if self._session is None:
             session_interface = self.app.session_interface
-            self.session = session_interface.open_session(self.app, self.request)
+            self._session = session_interface.open_session(self.app, self.request)
 
-            if self.session is None:
-                self.session = session_interface.make_null_session(self.app)
+            if self._session is None:
+                self._session = session_interface.make_null_session(self.app)
 
         # Match the request URL after loading the session, so that the
         # session is available in custom URL converters.
diff --git a/libs/flask/helpers.py b/libs/flask/helpers.py
index 359a842af8..5d412c90f2 100644
--- a/libs/flask/helpers.py
+++ b/libs/flask/helpers.py
@@ -5,7 +5,7 @@
 import sys
 import typing as t
 from datetime import datetime
-from functools import lru_cache
+from functools import cache
 from functools import update_wrapper
 
 import werkzeug.utils
@@ -13,6 +13,7 @@
 from werkzeug.utils import redirect as _wz_redirect
 from werkzeug.wrappers import Response as BaseResponse
 
+from .globals import _cv_app
 from .globals import _cv_request
 from .globals import current_app
 from .globals import request
@@ -47,38 +48,55 @@ def get_load_dotenv(default: bool = True) -> bool:
     return val.lower() in ("0", "false", "no")
 
 
+@t.overload
+def stream_with_context(
+    generator_or_function: t.Iterator[t.AnyStr],
+) -> t.Iterator[t.AnyStr]: ...
+
+
+@t.overload
+def stream_with_context(
+    generator_or_function: t.Callable[..., t.Iterator[t.AnyStr]],
+) -> t.Callable[[t.Iterator[t.AnyStr]], t.Iterator[t.AnyStr]]: ...
+
+
 def stream_with_context(
     generator_or_function: t.Iterator[t.AnyStr] | t.Callable[..., t.Iterator[t.AnyStr]],
-) -> t.Iterator[t.AnyStr]:
-    """Request contexts disappear when the response is started on the server.
-    This is done for efficiency reasons and to make it less likely to encounter
-    memory leaks with badly written WSGI middlewares.  The downside is that if
-    you are using streamed responses, the generator cannot access request bound
-    information any more.
+) -> t.Iterator[t.AnyStr] | t.Callable[[t.Iterator[t.AnyStr]], t.Iterator[t.AnyStr]]:
+    """Wrap a response generator function so that it runs inside the current
+    request context. This keeps :data:`request`, :data:`session`, and :data:`g`
+    available, even though at the point the generator runs the request context
+    will typically have ended.
+
+    Use it as a decorator on a generator function:
 
-    This function however can help you keep the context around for longer::
+    .. code-block:: python
 
         from flask import stream_with_context, request, Response
 
-        @app.route('/stream')
+        @app.get("/stream")
         def streamed_response():
             @stream_with_context
             def generate():
-                yield 'Hello '
-                yield request.args['name']
-                yield '!'
+                yield "Hello "
+                yield request.args["name"]
+                yield "!"
+
             return Response(generate())
 
-    Alternatively it can also be used around a specific generator::
+    Or use it as a wrapper around a created generator:
+
+    .. code-block:: python
 
         from flask import stream_with_context, request, Response
 
-        @app.route('/stream')
+        @app.get("/stream")
         def streamed_response():
             def generate():
-                yield 'Hello '
-                yield request.args['name']
-                yield '!'
+                yield "Hello "
+                yield request.args["name"]
+                yield "!"
+
             return Response(stream_with_context(generate()))
 
     .. versionadded:: 0.9
@@ -93,35 +111,36 @@ def decorator(*args: t.Any, **kwargs: t.Any) -> t.Any:
 
         return update_wrapper(decorator, generator_or_function)  # type: ignore[arg-type]
 
-    def generator() -> t.Iterator[t.AnyStr | None]:
-        ctx = _cv_request.get(None)
-        if ctx is None:
+    def generator() -> t.Iterator[t.AnyStr]:
+        if (req_ctx := _cv_request.get(None)) is None:
             raise RuntimeError(
                 "'stream_with_context' can only be used when a request"
                 " context is active, such as in a view function."
             )
-        with ctx:
-            # Dummy sentinel.  Has to be inside the context block or we're
-            # not actually keeping the context around.
-            yield None
-
-            # The try/finally is here so that if someone passes a WSGI level
-            # iterator in we're still running the cleanup logic.  Generators
-            # don't need that because they are closed on their destruction
-            # automatically.
+
+        app_ctx = _cv_app.get()
+        # Setup code below will run the generator to this point, so that the
+        # current contexts are recorded. The contexts must be pushed after,
+        # otherwise their ContextVar will record the wrong event loop during
+        # async view functions.
+        yield None  # type: ignore[misc]
+
+        # Push the app context first, so that the request context does not
+        # automatically create and push a different app context.
+        with app_ctx, req_ctx:
             try:
                 yield from gen
             finally:
+                # Clean up in case the user wrapped a WSGI iterator.
                 if hasattr(gen, "close"):
                     gen.close()
 
-    # The trick is to start the generator.  Then the code execution runs until
-    # the first dummy None is yielded at which point the context was already
-    # pushed.  This item is discarded.  Then when the iteration continues the
-    # real generator is executed.
+    # Execute the generator to the sentinel value. This ensures the context is
+    # preserved in the generator's state. Further iteration will push the
+    # context and yield from the original iterator.
     wrapped_g = generator()
     next(wrapped_g)
-    return wrapped_g  # type: ignore[return-value]
+    return wrapped_g
 
 
 def make_response(*args: t.Any) -> Response:
@@ -380,13 +399,13 @@ def _prepare_send_file_kwargs(**kwargs: t.Any) -> dict[str, t.Any]:
         environ=request.environ,
         use_x_sendfile=current_app.config["USE_X_SENDFILE"],
         response_class=current_app.response_class,
-        _root_path=current_app.root_path,  # type: ignore
+        _root_path=current_app.root_path,
     )
     return kwargs
 
 
 def send_file(
-    path_or_file: os.PathLike[t.AnyStr] | str | t.BinaryIO,
+    path_or_file: os.PathLike[t.AnyStr] | str | t.IO[bytes],
     mimetype: str | None = None,
     as_attachment: bool = False,
     download_name: str | None = None,
@@ -535,7 +554,8 @@ def download_file(name):
     raises a 404 :exc:`~werkzeug.exceptions.NotFound` error.
 
     :param directory: The directory that ``path`` must be located under,
-        relative to the current application's root path.
+        relative to the current application's root path. This *must not*
+        be a value provided by the client, otherwise it becomes insecure.
     :param path: The path to the file to send, relative to
         ``directory``.
     :param kwargs: Arguments to pass to :func:`send_file`.
@@ -587,7 +607,7 @@ def get_root_path(import_name: str) -> str:
         return os.getcwd()
 
     if hasattr(loader, "get_filename"):
-        filepath = loader.get_filename(import_name)
+        filepath = loader.get_filename(import_name)  # pyright: ignore
     else:
         # Fall back to imports.
         __import__(import_name)
@@ -611,7 +631,7 @@ def get_root_path(import_name: str) -> str:
     return os.path.dirname(os.path.abspath(filepath))  # type: ignore[no-any-return]
 
 
-@lru_cache(maxsize=None)
+@cache
 def _split_blueprint_path(name: str) -> list[str]:
     out: list[str] = [name]
 
diff --git a/libs/flask/json/provider.py b/libs/flask/json/provider.py
index f9b2e8ff55..ea7e4753ff 100644
--- a/libs/flask/json/provider.py
+++ b/libs/flask/json/provider.py
@@ -113,7 +113,7 @@ def _default(o: t.Any) -> t.Any:
         return str(o)
 
     if dataclasses and dataclasses.is_dataclass(o):
-        return dataclasses.asdict(o)
+        return dataclasses.asdict(o)  # type: ignore[arg-type]
 
     if hasattr(o, "__html__"):
         return str(o.__html__())
diff --git a/libs/flask/sansio/app.py b/libs/flask/sansio/app.py
index 01fd5dbfae..58cb873062 100644
--- a/libs/flask/sansio/app.py
+++ b/libs/flask/sansio/app.py
@@ -291,7 +291,7 @@ def __init__(
         instance_path: str | None = None,
         instance_relative_config: bool = False,
         root_path: str | None = None,
-    ):
+    ) -> None:
         super().__init__(
             import_name=import_name,
             static_folder=static_folder,
@@ -423,7 +423,7 @@ def _check_setup_finished(self, f_name: str) -> None:
             )
 
     @cached_property
-    def name(self) -> str:  # type: ignore
+    def name(self) -> str:
         """The name of the application.  This is usually the import name
         with the difference that it's guessed from the run file if the
         import name is main.  This name is used as a display name when
@@ -521,7 +521,7 @@ def auto_find_instance_path(self) -> str:
         return os.path.join(prefix, "var", f"{self.name}-instance")
 
     def create_global_jinja_loader(self) -> DispatchingJinjaLoader:
-        """Creates the loader for the Jinja2 environment.  Can be used to
+        """Creates the loader for the Jinja environment.  Can be used to
         override just the loader and keeping the rest unchanged.  It's
         discouraged to override this function.  Instead one should override
         the :meth:`jinja_loader` function instead.
@@ -533,7 +533,7 @@ def create_global_jinja_loader(self) -> DispatchingJinjaLoader:
         """
         return DispatchingJinjaLoader(self)
 
-    def select_jinja_autoescape(self, filename: str) -> bool:
+    def select_jinja_autoescape(self, filename: str | None) -> bool:
         """Returns ``True`` if autoescaping should be active for the given
         template name. If no template name is given, returns `True`.
 
@@ -628,7 +628,7 @@ def add_url_rule(
         methods = {item.upper() for item in methods}
 
         # Methods that should always be added
-        required_methods = set(getattr(view_func, "required_methods", ()))
+        required_methods: set[str] = set(getattr(view_func, "required_methods", ()))
 
         # starting with Flask 0.8 the view_func object can disable and
         # force-enable the automatic options handling.
@@ -638,7 +638,7 @@ def add_url_rule(
             )
 
         if provide_automatic_options is None:
-            if "OPTIONS" not in methods:
+            if "OPTIONS" not in methods and self.config["PROVIDE_AUTOMATIC_OPTIONS"]:
                 provide_automatic_options = True
                 required_methods.add("OPTIONS")
             else:
diff --git a/libs/flask/sansio/scaffold.py b/libs/flask/sansio/scaffold.py
index 69e33a095b..0e96f15b74 100644
--- a/libs/flask/sansio/scaffold.py
+++ b/libs/flask/sansio/scaffold.py
@@ -84,7 +84,7 @@ def __init__(
         #: to. Do not change this once it is set by the constructor.
         self.import_name = import_name
 
-        self.static_folder = static_folder  # type: ignore
+        self.static_folder = static_folder
         self.static_url_path = static_url_path
 
         #: The path to the templates folder, relative to
@@ -706,15 +706,6 @@ def _endpoint_from_view_func(view_func: ft.RouteCallable) -> str:
     return view_func.__name__
 
 
-def _path_is_relative_to(path: pathlib.PurePath, base: str) -> bool:
-    # Path.is_relative_to doesn't exist until Python 3.9
-    try:
-        path.relative_to(base)
-        return True
-    except ValueError:
-        return False
-
-
 def _find_package_path(import_name: str) -> str:
     """Find the path that contains the package or module."""
     root_mod_name, _, _ = import_name.partition(".")
@@ -745,7 +736,7 @@ def _find_package_path(import_name: str) -> str:
                 search_location = next(
                     location
                     for location in root_spec.submodule_search_locations
-                    if _path_is_relative_to(package_path, location)
+                    if package_path.is_relative_to(location)
                 )
             else:
                 # Pick the first path.
@@ -777,7 +768,7 @@ def find_package(import_name: str) -> tuple[str | None, str]:
     py_prefix = os.path.abspath(sys.prefix)
 
     # installed to the system
-    if _path_is_relative_to(pathlib.PurePath(package_path), py_prefix):
+    if pathlib.PurePath(package_path).is_relative_to(py_prefix):
         return py_prefix, package_path
 
     site_parent, site_folder = os.path.split(package_path)
diff --git a/libs/flask/sessions.py b/libs/flask/sessions.py
index ee19ad6387..ad357706ff 100644
--- a/libs/flask/sessions.py
+++ b/libs/flask/sessions.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc as c
 import hashlib
 import typing as t
 from collections.abc import MutableMapping
@@ -20,14 +21,13 @@
     from .wrappers import Response
 
 
-# TODO generic when Python > 3.8
-class SessionMixin(MutableMapping):  # type: ignore[type-arg]
+class SessionMixin(MutableMapping[str, t.Any]):
     """Expands a basic dictionary with session attributes."""
 
     @property
     def permanent(self) -> bool:
         """This reflects the ``'_permanent'`` key in the dict."""
-        return self.get("_permanent", False)
+        return self.get("_permanent", False)  # type: ignore[no-any-return]
 
     @permanent.setter
     def permanent(self, value: bool) -> None:
@@ -43,14 +43,18 @@ def permanent(self, value: bool) -> None:
     #: ``True``.
     modified = True
 
-    #: Some implementations can detect when session data is read or
-    #: written and set this when that happens. The mixin default is hard
-    #: coded to ``True``.
-    accessed = True
+    accessed = False
+    """Indicates if the session was accessed, even if it was not modified. This
+    is set when the session object is accessed through the request context,
+    including the global :data:`.session` proxy. A ``Vary: cookie`` header will
+    be added if this is ``True``.
+
+    .. versionchanged:: 3.1.3
+        This is tracked by the request context.
+    """
 
 
-# TODO generic when Python > 3.8
-class SecureCookieSession(CallbackDict, SessionMixin):  # type: ignore[type-arg]
+class SecureCookieSession(CallbackDict[str, t.Any], SessionMixin):
     """Base class for sessions based on signed cookies.
 
     This session backend will set the :attr:`modified` and
@@ -66,31 +70,15 @@ class SecureCookieSession(CallbackDict, SessionMixin):  # type: ignore[type-arg]
     #: will only be written to the response if this is ``True``.
     modified = False
 
-    #: When data is read or written, this is set to ``True``. Used by
-    # :class:`.SecureCookieSessionInterface` to add a ``Vary: Cookie``
-    #: header, which allows caching proxies to cache different pages for
-    #: different users.
-    accessed = False
-
-    def __init__(self, initial: t.Any = None) -> None:
+    def __init__(
+        self,
+        initial: c.Mapping[str, t.Any] | None = None,
+    ) -> None:
         def on_update(self: te.Self) -> None:
             self.modified = True
-            self.accessed = True
 
         super().__init__(initial, on_update)
 
-    def __getitem__(self, key: str) -> t.Any:
-        self.accessed = True
-        return super().__getitem__(key)
-
-    def get(self, key: str, default: t.Any = None) -> t.Any:
-        self.accessed = True
-        return super().get(key, default)
-
-    def setdefault(self, key: str, default: t.Any = None) -> t.Any:
-        self.accessed = True
-        return super().setdefault(key, default)
-
 
 class NullSession(SecureCookieSession):
     """Class used to generate nicer error messages if sessions are not
@@ -105,7 +93,7 @@ def _fail(self, *args: t.Any, **kwargs: t.Any) -> t.NoReturn:
             "application to something unique and secret."
         )
 
-    __setitem__ = __delitem__ = clear = pop = popitem = update = setdefault = _fail  # type: ignore # noqa: B950
+    __setitem__ = __delitem__ = clear = pop = popitem = update = setdefault = _fail
     del _fail
 
 
@@ -224,6 +212,14 @@ def get_cookie_samesite(self, app: Flask) -> str | None:
         """
         return app.config["SESSION_COOKIE_SAMESITE"]  # type: ignore[no-any-return]
 
+    def get_cookie_partitioned(self, app: Flask) -> bool:
+        """Returns True if the cookie should be partitioned. By default, uses
+        the value of :data:`SESSION_COOKIE_PARTITIONED`.
+
+        .. versionadded:: 3.1
+        """
+        return app.config["SESSION_COOKIE_PARTITIONED"]  # type: ignore[no-any-return]
+
     def get_expiration_time(self, app: Flask, session: SessionMixin) -> datetime | None:
         """A helper method that returns an expiration date for the session
         or ``None`` if the session is linked to the browser session.  The
@@ -307,14 +303,21 @@ class SecureCookieSessionInterface(SessionInterface):
     def get_signing_serializer(self, app: Flask) -> URLSafeTimedSerializer | None:
         if not app.secret_key:
             return None
-        signer_kwargs = dict(
-            key_derivation=self.key_derivation, digest_method=self.digest_method
-        )
+
+        keys: list[str | bytes] = []
+
+        if fallbacks := app.config["SECRET_KEY_FALLBACKS"]:
+            keys.extend(fallbacks)
+
+        keys.append(app.secret_key)  # itsdangerous expects current key at top
         return URLSafeTimedSerializer(
-            app.secret_key,
+            keys,  # type: ignore[arg-type]
             salt=self.salt,
             serializer=self.serializer,
-            signer_kwargs=signer_kwargs,
+            signer_kwargs={
+                "key_derivation": self.key_derivation,
+                "digest_method": self.digest_method,
+            },
         )
 
     def open_session(self, app: Flask, request: Request) -> SecureCookieSession | None:
@@ -338,6 +341,7 @@ def save_session(
         domain = self.get_cookie_domain(app)
         path = self.get_cookie_path(app)
         secure = self.get_cookie_secure(app)
+        partitioned = self.get_cookie_partitioned(app)
         samesite = self.get_cookie_samesite(app)
         httponly = self.get_cookie_httponly(app)
 
@@ -354,6 +358,7 @@ def save_session(
                     domain=domain,
                     path=path,
                     secure=secure,
+                    partitioned=partitioned,
                     samesite=samesite,
                     httponly=httponly,
                 )
@@ -365,15 +370,16 @@ def save_session(
             return
 
         expires = self.get_expiration_time(app, session)
-        val = self.get_signing_serializer(app).dumps(dict(session))  # type: ignore
+        val = self.get_signing_serializer(app).dumps(dict(session))  # type: ignore[union-attr]
         response.set_cookie(
             name,
-            val,  # type: ignore
+            val,
             expires=expires,
             httponly=httponly,
             domain=domain,
             path=path,
             secure=secure,
+            partitioned=partitioned,
             samesite=samesite,
         )
         response.vary.add("Cookie")
diff --git a/libs/flask/templating.py b/libs/flask/templating.py
index 618a3b35d0..c5fb5b9905 100644
--- a/libs/flask/templating.py
+++ b/libs/flask/templating.py
@@ -22,8 +22,8 @@
 
 
 def _default_template_ctx_processor() -> dict[str, t.Any]:
-    """Default template context processor.  Injects `request`,
-    `session` and `g`.
+    """Default template context processor.  Replaces the ``request`` and ``g``
+    proxies with their concrete objects for faster access.
     """
     appctx = _cv_app.get(None)
     reqctx = _cv_request.get(None)
@@ -32,12 +32,13 @@ def _default_template_ctx_processor() -> dict[str, t.Any]:
         rv["g"] = appctx.g
     if reqctx is not None:
         rv["request"] = reqctx.request
-        rv["session"] = reqctx.session
+        # The session proxy cannot be replaced, accessing it gets
+        # RequestContext.session, which sets session.accessed.
     return rv
 
 
 class Environment(BaseEnvironment):
-    """Works like a regular Jinja2 environment but has some additional
+    """Works like a regular Jinja environment but has some additional
     knowledge of how Flask's blueprint works so that it can prepend the
     name of the blueprint to referenced templates if necessary.
     """
diff --git a/libs/flask/testing.py b/libs/flask/testing.py
index a27b7c8fe9..55eb12fe75 100644
--- a/libs/flask/testing.py
+++ b/libs/flask/testing.py
@@ -10,6 +10,7 @@
 
 import werkzeug.test
 from click.testing import CliRunner
+from click.testing import Result
 from werkzeug.test import Client
 from werkzeug.wrappers import Request as BaseRequest
 
@@ -57,9 +58,9 @@ def __init__(
     ) -> None:
         assert not (base_url or subdomain or url_scheme) or (
             base_url is not None
-        ) != bool(
-            subdomain or url_scheme
-        ), 'Cannot pass "subdomain" or "url_scheme" with "base_url".'
+        ) != bool(subdomain or url_scheme), (
+            'Cannot pass "subdomain" or "url_scheme" with "base_url".'
+        )
 
         if base_url is None:
             http_host = app.config.get("SERVER_NAME") or "localhost"
@@ -79,13 +80,12 @@ def __init__(
             path = url.path
 
             if url.query:
-                sep = b"?" if isinstance(url.query, bytes) else "?"
-                path += sep + url.query
+                path = f"{path}?{url.query}"
 
         self.app = app
         super().__init__(path, base_url, *args, **kwargs)
 
-    def json_dumps(self, obj: t.Any, **kwargs: t.Any) -> str:  # type: ignore
+    def json_dumps(self, obj: t.Any, **kwargs: t.Any) -> str:
         """Serialize ``obj`` to a JSON-formatted string.
 
         The serialization will be configured according to the config associated
@@ -240,10 +240,10 @@ def open(
         response.json_module = self.application.json  # type: ignore[assignment]
 
         # Re-push contexts that were preserved during the request.
-        while self._new_contexts:
-            cm = self._new_contexts.pop()
+        for cm in self._new_contexts:
             self._context_stack.enter_context(cm)
 
+        self._new_contexts.clear()
         return response
 
     def __enter__(self) -> FlaskClient:
@@ -274,7 +274,7 @@ def __init__(self, app: Flask, **kwargs: t.Any) -> None:
 
     def invoke(  # type: ignore
         self, cli: t.Any = None, args: t.Any = None, **kwargs: t.Any
-    ) -> t.Any:
+    ) -> Result:
         """Invokes a CLI command in an isolated environment. See
         :meth:`CliRunner.invoke <click.testing.CliRunner.invoke>` for
         full method documentation. See :ref:`testing-cli` for examples.
diff --git a/libs/flask/typing.py b/libs/flask/typing.py
index cf6d4ae6dd..6b70c40973 100644
--- a/libs/flask/typing.py
+++ b/libs/flask/typing.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc as cabc
 import typing as t
 
 if t.TYPE_CHECKING:  # pragma: no cover
@@ -12,30 +13,32 @@
     "Response",
     str,
     bytes,
-    t.List[t.Any],
+    list[t.Any],
     # Only dict is actually accepted, but Mapping allows for TypedDict.
     t.Mapping[str, t.Any],
     t.Iterator[str],
     t.Iterator[bytes],
+    cabc.AsyncIterable[str],  # for Quart, until App is generic.
+    cabc.AsyncIterable[bytes],
 ]
 
 # the possible types for an individual HTTP header
 # This should be a Union, but mypy doesn't pass unless it's a TypeVar.
-HeaderValue = t.Union[str, t.List[str], t.Tuple[str, ...]]
+HeaderValue = t.Union[str, list[str], tuple[str, ...]]
 
 # the possible types for HTTP headers
 HeadersValue = t.Union[
     "Headers",
     t.Mapping[str, HeaderValue],
-    t.Sequence[t.Tuple[str, HeaderValue]],
+    t.Sequence[tuple[str, HeaderValue]],
 ]
 
 # The possible types returned by a route function.
 ResponseReturnValue = t.Union[
     ResponseValue,
-    t.Tuple[ResponseValue, HeadersValue],
-    t.Tuple[ResponseValue, int],
-    t.Tuple[ResponseValue, int, HeadersValue],
+    tuple[ResponseValue, HeadersValue],
+    tuple[ResponseValue, int],
+    tuple[ResponseValue, int, HeadersValue],
     "WSGIApplication",
 ]
 
@@ -56,21 +59,21 @@
     t.Callable[[], t.Optional[ResponseReturnValue]],
     t.Callable[[], t.Awaitable[t.Optional[ResponseReturnValue]]],
 ]
-ShellContextProcessorCallable = t.Callable[[], t.Dict[str, t.Any]]
+ShellContextProcessorCallable = t.Callable[[], dict[str, t.Any]]
 TeardownCallable = t.Union[
     t.Callable[[t.Optional[BaseException]], None],
     t.Callable[[t.Optional[BaseException]], t.Awaitable[None]],
 ]
 TemplateContextProcessorCallable = t.Union[
-    t.Callable[[], t.Dict[str, t.Any]],
-    t.Callable[[], t.Awaitable[t.Dict[str, t.Any]]],
+    t.Callable[[], dict[str, t.Any]],
+    t.Callable[[], t.Awaitable[dict[str, t.Any]]],
 ]
 TemplateFilterCallable = t.Callable[..., t.Any]
 TemplateGlobalCallable = t.Callable[..., t.Any]
 TemplateTestCallable = t.Callable[..., bool]
-URLDefaultCallable = t.Callable[[str, t.Dict[str, t.Any]], None]
+URLDefaultCallable = t.Callable[[str, dict[str, t.Any]], None]
 URLValuePreprocessorCallable = t.Callable[
-    [t.Optional[str], t.Optional[t.Dict[str, t.Any]]], None
+    [t.Optional[str], t.Optional[dict[str, t.Any]]], None
 ]
 
 # This should take Exception, but that either breaks typing the argument
diff --git a/libs/flask/views.py b/libs/flask/views.py
index 794fdc06cf..53fe976dc2 100644
--- a/libs/flask/views.py
+++ b/libs/flask/views.py
@@ -61,7 +61,7 @@ def dispatch_request(self, name):
     #: decorator.
     #:
     #: .. versionadded:: 0.8
-    decorators: t.ClassVar[list[t.Callable[[F], F]]] = []
+    decorators: t.ClassVar[list[t.Callable[..., t.Any]]] = []
 
     #: Create a new instance of this view class for every request by
     #: default. If a view subclass sets this to ``False``, the same
@@ -110,7 +110,7 @@ def view(**kwargs: t.Any) -> ft.ResponseReturnValue:
                 return current_app.ensure_sync(self.dispatch_request)(**kwargs)  # type: ignore[no-any-return]
 
         else:
-            self = cls(*class_args, **class_kwargs)
+            self = cls(*class_args, **class_kwargs)  # pyright: ignore
 
             def view(**kwargs: t.Any) -> ft.ResponseReturnValue:
                 return current_app.ensure_sync(self.dispatch_request)(**kwargs)  # type: ignore[no-any-return]
diff --git a/libs/flask/wrappers.py b/libs/flask/wrappers.py
index c1eca80783..bab610291c 100644
--- a/libs/flask/wrappers.py
+++ b/libs/flask/wrappers.py
@@ -52,13 +52,96 @@ class Request(RequestBase):
     #: something similar.
     routing_exception: HTTPException | None = None
 
+    _max_content_length: int | None = None
+    _max_form_memory_size: int | None = None
+    _max_form_parts: int | None = None
+
     @property
-    def max_content_length(self) -> int | None:  # type: ignore[override]
-        """Read-only view of the ``MAX_CONTENT_LENGTH`` config key."""
-        if current_app:
-            return current_app.config["MAX_CONTENT_LENGTH"]  # type: ignore[no-any-return]
-        else:
-            return None
+    def max_content_length(self) -> int | None:
+        """The maximum number of bytes that will be read during this request. If
+        this limit is exceeded, a 413 :exc:`~werkzeug.exceptions.RequestEntityTooLarge`
+        error is raised. If it is set to ``None``, no limit is enforced at the
+        Flask application level. However, if it is ``None`` and the request has
+        no ``Content-Length`` header and the WSGI server does not indicate that
+        it terminates the stream, then no data is read to avoid an infinite
+        stream.
+
+        Each request defaults to the :data:`MAX_CONTENT_LENGTH` config, which
+        defaults to ``None``. It can be set on a specific ``request`` to apply
+        the limit to that specific view. This should be set appropriately based
+        on an application's or view's specific needs.
+
+        .. versionchanged:: 3.1
+            This can be set per-request.
+
+        .. versionchanged:: 0.6
+            This is configurable through Flask config.
+        """
+        if self._max_content_length is not None:
+            return self._max_content_length
+
+        if not current_app:
+            return super().max_content_length
+
+        return current_app.config["MAX_CONTENT_LENGTH"]  # type: ignore[no-any-return]
+
+    @max_content_length.setter
+    def max_content_length(self, value: int | None) -> None:
+        self._max_content_length = value
+
+    @property
+    def max_form_memory_size(self) -> int | None:
+        """The maximum size in bytes any non-file form field may be in a
+        ``multipart/form-data`` body. If this limit is exceeded, a 413
+        :exc:`~werkzeug.exceptions.RequestEntityTooLarge` error is raised. If it
+        is set to ``None``, no limit is enforced at the Flask application level.
+
+        Each request defaults to the :data:`MAX_FORM_MEMORY_SIZE` config, which
+        defaults to ``500_000``. It can be set on a specific ``request`` to
+        apply the limit to that specific view. This should be set appropriately
+        based on an application's or view's specific needs.
+
+        .. versionchanged:: 3.1
+            This is configurable through Flask config.
+        """
+        if self._max_form_memory_size is not None:
+            return self._max_form_memory_size
+
+        if not current_app:
+            return super().max_form_memory_size
+
+        return current_app.config["MAX_FORM_MEMORY_SIZE"]  # type: ignore[no-any-return]
+
+    @max_form_memory_size.setter
+    def max_form_memory_size(self, value: int | None) -> None:
+        self._max_form_memory_size = value
+
+    @property  # type: ignore[override]
+    def max_form_parts(self) -> int | None:
+        """The maximum number of fields that may be present in a
+        ``multipart/form-data`` body. If this limit is exceeded, a 413
+        :exc:`~werkzeug.exceptions.RequestEntityTooLarge` error is raised. If it
+        is set to ``None``, no limit is enforced at the Flask application level.
+
+        Each request defaults to the :data:`MAX_FORM_PARTS` config, which
+        defaults to ``1_000``. It can be set on a specific ``request`` to apply
+        the limit to that specific view. This should be set appropriately based
+        on an application's or view's specific needs.
+
+        .. versionchanged:: 3.1
+            This is configurable through Flask config.
+        """
+        if self._max_form_parts is not None:
+            return self._max_form_parts
+
+        if not current_app:
+            return super().max_form_parts
+
+        return current_app.config["MAX_FORM_PARTS"]  # type: ignore[no-any-return]
+
+    @max_form_parts.setter
+    def max_form_parts(self, value: int | None) -> None:
+        self._max_form_parts = value
 
     @property
     def endpoint(self) -> str | None:
@@ -71,7 +154,7 @@ def endpoint(self) -> str | None:
         reconstruct the same URL or a modified URL.
         """
         if self.url_rule is not None:
-            return self.url_rule.endpoint
+            return self.url_rule.endpoint  # type: ignore[no-any-return]
 
         return None
 
@@ -129,11 +212,11 @@ def _load_form_data(self) -> None:
     def on_json_loading_failed(self, e: ValueError | None) -> t.Any:
         try:
             return super().on_json_loading_failed(e)
-        except BadRequest as e:
+        except BadRequest as ebr:
             if current_app and current_app.debug:
                 raise
 
-            raise BadRequest() from e
+            raise BadRequest() from ebr
 
 
 class Response(ResponseBase):
diff --git a/libs/charset_normalizer-3.4.1.dist-info/INSTALLER b/libs/flask_cors-6.0.2.dist-info/INSTALLER
similarity index 100%
rename from libs/charset_normalizer-3.4.1.dist-info/INSTALLER
rename to libs/flask_cors-6.0.2.dist-info/INSTALLER
diff --git a/libs/flask_cors-6.0.2.dist-info/METADATA b/libs/flask_cors-6.0.2.dist-info/METADATA
new file mode 100644
index 0000000000..44bd26425b
--- /dev/null
+++ b/libs/flask_cors-6.0.2.dist-info/METADATA
@@ -0,0 +1,144 @@
+Metadata-Version: 2.4
+Name: flask-cors
+Version: 6.0.2
+Summary: A Flask extension simplifying CORS support
+Author-email: Cory Dolphin <corydolphin@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://corydolphin.github.io/flask-cors/
+Project-URL: Repository, https://github.com/corydolphin/flask-cors
+Project-URL: Documentation, https://corydolphin.github.io/flask-cors/
+Keywords: python
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: <4.0,>=3.9
+Description-Content-Type: text/x-rst
+Requires-Dist: flask>=0.9
+Requires-Dist: Werkzeug>=0.7
+
+Flask-CORS
+==========
+
+|Build Status| |Latest Version| |Supported Python versions|
+|License|
+
+A Flask extension for handling Cross Origin Resource Sharing (CORS), making cross-origin AJAX possible.
+
+This package has a simple philosophy: when you want to enable CORS, you wish to enable it for all use cases on a domain.
+This means no mucking around with different allowed headers, methods, etc.
+
+By default, submission of cookies across domains is disabled due to the security implications.
+Please see the documentation for how to enable credential'ed requests, and please make sure you add some sort of `CSRF <http://en.wikipedia.org/wiki/Cross-site_request_forgery>`__ protection before doing so!
+
+Installation
+------------
+
+Install the extension with using pip, or easy\_install.
+
+.. code:: bash
+
+    $ pip install -U flask-cors
+
+Usage
+-----
+
+This package exposes a Flask extension which by default enables CORS support on all routes, for all origins and methods.
+It allows parameterization of all CORS headers on a per-resource level.
+The package also contains a decorator, for those who prefer this approach.
+
+Simple Usage
+~~~~~~~~~~~~
+
+In the simplest case, initialize the Flask-Cors extension with default arguments in order to allow CORS for all domains on all routes.
+See the full list of options in the `documentation <https://flask-cors.readthedocs.io/en/latest/api.html#extension>`__.
+
+.. code:: python
+
+
+    from flask import Flask
+    from flask_cors import CORS
+
+    app = Flask(__name__)
+    CORS(app)
+
+    @app.route("/")
+    def helloWorld():
+      return "Hello, cross-origin-world!"
+
+Resource specific CORS
+^^^^^^^^^^^^^^^^^^^^^^
+
+Alternatively, you can specify CORS options on a resource and origin level of granularity by passing a dictionary as the `resources` option, mapping paths to a set of options.
+See the full list of options in the `documentation <https://flask-cors.readthedocs.io/en/latest/api.html#extension>`__.
+
+.. code:: python
+
+    app = Flask(__name__)
+    cors = CORS(app, resources={r"/api/*": {"origins": "*"}})
+
+    @app.route("/api/v1/users")
+    def list_users():
+      return "user example"
+
+Route specific CORS via decorator
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This extension also exposes a simple decorator to decorate flask routes with.
+Simply add ``@cross_origin()`` below a call to Flask's ``@app.route(..)`` to allow CORS on a given route.
+See the full list of options in the `decorator documentation <https://flask-cors.readthedocs.io/en/latest/api.html#decorator>`__.
+
+.. code:: python
+
+    @app.route("/")
+    @cross_origin()
+    def helloWorld():
+      return "Hello, cross-origin-world!"
+
+Documentation
+-------------
+
+For a full list of options, please see the full `documentation <https://flask-cors.readthedocs.io/en/latest/api.html>`__
+
+Troubleshooting
+---------------
+
+If things aren't working as you expect, enable logging to help understand what is going on under the hood, and why.
+
+.. code:: python
+
+    logging.getLogger('flask_cors').level = logging.DEBUG
+
+
+
+Set Up Your Development Environment
+---
+The development environment uses `uv` for Python version management as well as dependency management.
+There are helpful Makefile targets to do everything you need. Use `make test` to get started!
+
+
+Contributing
+------------
+
+Questions, comments or improvements?
+Please create an issue on `Github <https://github.com/corydolphin/flask-cors>`__, tweet at `@corydolphin <https://twitter.com/corydolphin>`__ or send me an email.
+I do my best to include every contribution proposed in any way that I can.
+
+Credits
+-------
+
+This Flask extension is based upon the `Decorator for the HTTP Access Control <https://web.archive.org/web/20190128010149/http://flask.pocoo.org/snippets/56/>`__ written by Armin Ronacher.
+
+.. |Build Status| image:: https://github.com/corydolphin/flask-cors/actions/workflows/unittests.yaml/badge.svg
+   :target: https://travis-ci.org/corydolphin/flask-cors
+.. |Latest Version| image:: https://img.shields.io/pypi/v/Flask-Cors.svg
+   :target: https://pypi.python.org/pypi/Flask-Cors/
+.. |Supported Python versions| image:: https://img.shields.io/pypi/pyversions/Flask-Cors.svg
+   :target: https://img.shields.io/pypi/pyversions/Flask-Cors.svg
+.. |License| image:: http://img.shields.io/:license-mit-blue.svg
+   :target: https://pypi.python.org/pypi/Flask-Cors/
diff --git a/libs/flask_cors-6.0.2.dist-info/RECORD b/libs/flask_cors-6.0.2.dist-info/RECORD
new file mode 100644
index 0000000000..11229e1321
--- /dev/null
+++ b/libs/flask_cors-6.0.2.dist-info/RECORD
@@ -0,0 +1,11 @@
+flask_cors-6.0.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+flask_cors-6.0.2.dist-info/METADATA,sha256=xYYixYpXPBqR21WrRmV6PMSlRh7OQ5J3A4G9WD6k_-M,5327
+flask_cors-6.0.2.dist-info/RECORD,,
+flask_cors-6.0.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask_cors-6.0.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+flask_cors-6.0.2.dist-info/top_level.txt,sha256=aWye_0QNZPp_QtPF4ZluLHqnyVLT9CPJsfiGhwqkWuo,11
+flask_cors/__init__.py,sha256=Hnwpy4nxEz4tlcB3enWNXUBctcjgxRnUqa5B5zDabQ4,522
+flask_cors/core.py,sha256=S8Wv7dz9e0FcR386TkBT-T8_VRsjFQGhNiR0jIpUYiY,14416
+flask_cors/decorator.py,sha256=YnPIDyWAfz60t2yxLgoOZLzgWWjZEvxQAPTTV4qfsss,4706
+flask_cors/extension.py,sha256=ONk6eNJiYT7HPEtmmySG8KgjzvAs9xtcJHNYvWLAS9s,8268
+flask_cors/version.py,sha256=lze97Y7ToUnpENKGAhOoSKx1zlZQe6ZfCSr8M50_K1g,22
diff --git a/libs/click-8.1.8.dist-info/REQUESTED b/libs/flask_cors-6.0.2.dist-info/REQUESTED
similarity index 100%
rename from libs/click-8.1.8.dist-info/REQUESTED
rename to libs/flask_cors-6.0.2.dist-info/REQUESTED
diff --git a/libs/flask_cors-6.0.2.dist-info/WHEEL b/libs/flask_cors-6.0.2.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/flask_cors-6.0.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/Flask_Cors-5.0.0.dist-info/top_level.txt b/libs/flask_cors-6.0.2.dist-info/top_level.txt
similarity index 100%
rename from libs/Flask_Cors-5.0.0.dist-info/top_level.txt
rename to libs/flask_cors-6.0.2.dist-info/top_level.txt
diff --git a/libs/flask_cors/__init__.py b/libs/flask_cors/__init__.py
index 458150efbb..732d401fe8 100644
--- a/libs/flask_cors/__init__.py
+++ b/libs/flask_cors/__init__.py
@@ -1,18 +1,8 @@
-# -*- coding: utf-8 -*-
-"""
-    flask_cors
-    ~~~~
-    Flask-CORS is a simple extension to Flask allowing you to support cross
-    origin resource sharing (CORS) using a simple decorator.
-
-    :copyright: (c) 2016 by Cory Dolphin.
-    :license: MIT, see LICENSE for more details.
-"""
 from .decorator import cross_origin
 from .extension import CORS
 from .version import __version__
 
-__all__ = ['CORS', 'cross_origin']
+__all__ = ["CORS", "__version__", "cross_origin"]
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
diff --git a/libs/flask_cors/core.py b/libs/flask_cors/core.py
index 3fcc4d346d..8df343c935 100644
--- a/libs/flask_cors/core.py
+++ b/libs/flask_cors/core.py
@@ -1,63 +1,66 @@
-# -*- coding: utf-8 -*-
-"""
-    core
-    ~~~~
-    Core functionality shared between the extension and the decorator.
-
-    :copyright: (c) 2016 by Cory Dolphin.
-    :license: MIT, see LICENSE for more details.
-"""
-import re
 import logging
+import re
 from collections.abc import Iterable
 from datetime import timedelta
-from flask import request, current_app
+
+from flask import current_app, request
 from werkzeug.datastructures import Headers, MultiDict
 
 LOG = logging.getLogger(__name__)
 
 # Response Headers
-ACL_ORIGIN = 'Access-Control-Allow-Origin'
-ACL_METHODS = 'Access-Control-Allow-Methods'
-ACL_ALLOW_HEADERS = 'Access-Control-Allow-Headers'
-ACL_EXPOSE_HEADERS = 'Access-Control-Expose-Headers'
-ACL_CREDENTIALS = 'Access-Control-Allow-Credentials'
-ACL_MAX_AGE = 'Access-Control-Max-Age'
-ACL_RESPONSE_PRIVATE_NETWORK = 'Access-Control-Allow-Private-Network'
+ACL_ORIGIN = "Access-Control-Allow-Origin"
+ACL_METHODS = "Access-Control-Allow-Methods"
+ACL_ALLOW_HEADERS = "Access-Control-Allow-Headers"
+ACL_EXPOSE_HEADERS = "Access-Control-Expose-Headers"
+ACL_CREDENTIALS = "Access-Control-Allow-Credentials"
+ACL_MAX_AGE = "Access-Control-Max-Age"
+ACL_RESPONSE_PRIVATE_NETWORK = "Access-Control-Allow-Private-Network"
 
 # Request Header
-ACL_REQUEST_METHOD = 'Access-Control-Request-Method'
-ACL_REQUEST_HEADERS = 'Access-Control-Request-Headers'
-ACL_REQUEST_HEADER_PRIVATE_NETWORK = 'Access-Control-Request-Private-Network'
-
-ALL_METHODS = ['GET', 'HEAD', 'POST', 'OPTIONS', 'PUT', 'PATCH', 'DELETE']
-CONFIG_OPTIONS = ['CORS_ORIGINS', 'CORS_METHODS', 'CORS_ALLOW_HEADERS',
-                  'CORS_EXPOSE_HEADERS', 'CORS_SUPPORTS_CREDENTIALS',
-                  'CORS_MAX_AGE', 'CORS_SEND_WILDCARD',
-                  'CORS_AUTOMATIC_OPTIONS', 'CORS_VARY_HEADER',
-                  'CORS_RESOURCES', 'CORS_INTERCEPT_EXCEPTIONS',
-                  'CORS_ALWAYS_SEND', 'CORS_ALLOW_PRIVATE_NETWORK']
+ACL_REQUEST_METHOD = "Access-Control-Request-Method"
+ACL_REQUEST_HEADERS = "Access-Control-Request-Headers"
+ACL_REQUEST_HEADER_PRIVATE_NETWORK = "Access-Control-Request-Private-Network"
+
+ALL_METHODS = ["GET", "HEAD", "POST", "OPTIONS", "PUT", "PATCH", "DELETE"]
+CONFIG_OPTIONS = [
+    "CORS_ORIGINS",
+    "CORS_METHODS",
+    "CORS_ALLOW_HEADERS",
+    "CORS_EXPOSE_HEADERS",
+    "CORS_SUPPORTS_CREDENTIALS",
+    "CORS_MAX_AGE",
+    "CORS_SEND_WILDCARD",
+    "CORS_AUTOMATIC_OPTIONS",
+    "CORS_VARY_HEADER",
+    "CORS_RESOURCES",
+    "CORS_INTERCEPT_EXCEPTIONS",
+    "CORS_ALWAYS_SEND",
+    "CORS_ALLOW_PRIVATE_NETWORK",
+]
 # Attribute added to request object by decorator to indicate that CORS
 # was evaluated, in case the decorator and extension are both applied
 # to a view.
-FLASK_CORS_EVALUATED = '_FLASK_CORS_EVALUATED'
+FLASK_CORS_EVALUATED = "_FLASK_CORS_EVALUATED"
 
 # Strange, but this gets the type of a compiled regex, which is otherwise not
 # exposed in a public API.
-RegexObject = type(re.compile(''))
-DEFAULT_OPTIONS = dict(origins='*',
-                       methods=ALL_METHODS,
-                       allow_headers='*',
-                       expose_headers=None,
-                       supports_credentials=False,
-                       max_age=None,
-                       send_wildcard=False,
-                       automatic_options=True,
-                       vary_header=True,
-                       resources=r'/*',
-                       intercept_exceptions=True,
-                       always_send=True,
-                       allow_private_network=False)
+RegexObject = type(re.compile(""))
+DEFAULT_OPTIONS = dict(
+    origins="*",
+    methods=ALL_METHODS,
+    allow_headers="*",
+    expose_headers=None,
+    supports_credentials=False,
+    max_age=None,
+    send_wildcard=False,
+    automatic_options=True,
+    vary_header=True,
+    resources=r"/*",
+    intercept_exceptions=True,
+    always_send=True,
+    allow_private_network=False,
+)
 
 
 def parse_resources(resources):
@@ -66,16 +69,17 @@ def parse_resources(resources):
         # resource of '*', which is not actually a valid regexp.
         resources = [(re_fix(k), v) for k, v in resources.items()]
 
-        # Sort by regex length to provide consistency of matching and
-        # to provide a proxy for specificity of match. E.G. longer
-        # regular expressions are tried first.
-        def pattern_length(pair):
-            maybe_regex, _ = pair
-            return len(get_regexp_pattern(maybe_regex))
+        # Sort patterns with static (literal) paths first, then by regex specificity
+        def sort_key(pair):
+            pattern, _ = pair
+            if isinstance(pattern, RegexObject):
+                return (1, 0, -pattern.pattern.count("/"), -len(pattern.pattern))
+            elif probably_regex(pattern):
+                return (1, 1, -pattern.count("/"), -len(pattern))
+            else:
+                return (0, 0, -pattern.count("/"), -len(pattern))
 
-        return sorted(resources,
-                      key=pattern_length,
-                      reverse=True)
+        return sorted(resources, key=sort_key)
 
     elif isinstance(resources, str):
         return [(re_fix(resources), {})]
@@ -85,7 +89,7 @@ def pattern_length(pair):
 
     # Type of compiled regex is not part of the public API. Test for this
     # at runtime.
-    elif isinstance(resources,  RegexObject):
+    elif isinstance(resources, RegexObject):
         return [(re_fix(resources), {})]
 
     else:
@@ -108,8 +112,8 @@ def get_regexp_pattern(regexp):
 
 
 def get_cors_origins(options, request_origin):
-    origins = options.get('origins')
-    wildcard = r'.*' in origins
+    origins = options.get("origins")
+    wildcard = r".*" in origins
 
     # If the Origin header is not present terminate this set of steps.
     # The request is outside the scope of this specification.-- W3Spec
@@ -117,13 +121,16 @@ def get_cors_origins(options, request_origin):
         LOG.debug("CORS request received with 'Origin' %s", request_origin)
 
         # If the allowed origins is an asterisk or 'wildcard', always match
-        if wildcard and options.get('send_wildcard'):
+        if wildcard and options.get("send_wildcard"):
             LOG.debug("Allowed origins are set to '*'. Sending wildcard CORS header.")
-            return ['*']
-        # If the value of the Origin header is a case-sensitive match
-        # for any of the values in list of origins
-        elif try_match_any(request_origin, origins):
-            LOG.debug("The request's Origin header matches. Sending CORS headers.", )
+            return ["*"]
+        # If the value of the Origin header is a case-insensitive match
+        # for any of the values in list of origins.
+        # NOTE: Per RFC 1035 and RFC 4343 schemes and hostnames are case insensitive.
+        elif try_match_any_pattern(request_origin, origins, caseSensitive=False):
+            LOG.debug(
+                "The request's Origin header matches. Sending CORS headers.",
+            )
             # Add a single Access-Control-Allow-Origin header, with either
             # the value of the Origin header or the string "*" as value.
             # -- W3Spec
@@ -132,46 +139,44 @@ def get_cors_origins(options, request_origin):
             LOG.debug("The request's Origin header does not match any of allowed origins.")
             return None
 
-
-    elif options.get('always_send'):
+    elif options.get("always_send"):
         if wildcard:
             # If wildcard is in the origins, even if 'send_wildcard' is False,
             # simply send the wildcard. Unless supports_credentials is True,
-            # since that is forbidded by the spec..
+            # since that is forbidden by the spec..
             # It is the most-likely to be correct thing to do (the only other
             # option is to return nothing, which  almost certainly not what
             # the developer wants if the '*' origin was specified.
-            if options.get('supports_credentials'):
+            if options.get("supports_credentials"):
                 return None
             else:
-                return ['*']
+                return ["*"]
         else:
             # Return all origins that are not regexes.
             return sorted([o for o in origins if not probably_regex(o)])
 
     # Terminate these steps, return the original request untouched.
     else:
-        LOG.debug("The request did not contain an 'Origin' header. This means the browser or client did not request CORS, ensure the Origin Header is set.")
+        LOG.debug(
+            "The request did not contain an 'Origin' header. This means the browser or client did not request CORS, ensure the Origin Header is set."
+        )
         return None
 
 
 def get_allow_headers(options, acl_request_headers):
     if acl_request_headers:
-        request_headers = [h.strip() for h in acl_request_headers.split(',')]
+        request_headers = [h.strip() for h in acl_request_headers.split(",")]
 
         # any header that matches in the allow_headers
-        matching_headers = filter(
-            lambda h: try_match_any(h, options.get('allow_headers')),
-            request_headers
-        )
+        matching_headers = filter(lambda h: try_match_any_pattern(h, options.get("allow_headers"), caseSensitive=False), request_headers)
 
-        return ', '.join(sorted(matching_headers))
+        return ", ".join(sorted(matching_headers))
 
     return None
 
 
 def get_cors_headers(options, request_headers, request_method):
-    origins_to_set = get_cors_origins(options, request_headers.get('Origin'))
+    origins_to_set = get_cors_origins(options, request_headers.get("Origin"))
     headers = MultiDict()
 
     if not origins_to_set:  # CORS is not enabled for this route
@@ -180,45 +185,50 @@ def get_cors_headers(options, request_headers, request_method):
     for origin in origins_to_set:
         headers.add(ACL_ORIGIN, origin)
 
-    headers[ACL_EXPOSE_HEADERS] = options.get('expose_headers')
+    headers[ACL_EXPOSE_HEADERS] = options.get("expose_headers")
 
-    if options.get('supports_credentials'):
-        headers[ACL_CREDENTIALS] = 'true'  # case sensitive
+    if options.get("supports_credentials"):
+        headers[ACL_CREDENTIALS] = "true"  # case sensitive
 
-    if ACL_REQUEST_HEADER_PRIVATE_NETWORK in request_headers \
-            and request_headers.get(ACL_REQUEST_HEADER_PRIVATE_NETWORK) == 'true':
-        allow_private_network = 'true' if options.get('allow_private_network') else 'false'
+    if (
+        ACL_REQUEST_HEADER_PRIVATE_NETWORK in request_headers
+        and request_headers.get(ACL_REQUEST_HEADER_PRIVATE_NETWORK) == "true"
+    ):
+        allow_private_network = "true" if options.get("allow_private_network") else "false"
         headers[ACL_RESPONSE_PRIVATE_NETWORK] = allow_private_network
 
     # This is a preflight request
     # http://www.w3.org/TR/cors/#resource-preflight-requests
-    if request_method == 'OPTIONS':
-        acl_request_method = request_headers.get(ACL_REQUEST_METHOD, '').upper()
+    if request_method == "OPTIONS":
+        acl_request_method = request_headers.get(ACL_REQUEST_METHOD, "").upper()
 
         # If there is no Access-Control-Request-Method header or if parsing
         # failed, do not set any additional headers
-        if acl_request_method and acl_request_method in options.get('methods'):
-
+        if acl_request_method and acl_request_method in options.get("methods"):
             # If method is not a case-sensitive match for any of the values in
             # list of methods do not set any additional headers and terminate
             # this set of steps.
             headers[ACL_ALLOW_HEADERS] = get_allow_headers(options, request_headers.get(ACL_REQUEST_HEADERS))
-            headers[ACL_MAX_AGE] = options.get('max_age')
-            headers[ACL_METHODS] = options.get('methods')
+            headers[ACL_MAX_AGE] = options.get("max_age")
+            headers[ACL_METHODS] = options.get("methods")
         else:
-            LOG.info("The request's Access-Control-Request-Method header does not match allowed methods. CORS headers will not be applied.")
+            LOG.info(
+                "The request's Access-Control-Request-Method header does not match allowed methods. CORS headers will not be applied."
+            )
 
     # http://www.w3.org/TR/cors/#resource-implementation
-    if options.get('vary_header'):
+    if options.get("vary_header"):
         # Only set header if the origin returned will vary dynamically,
         # i.e. if we are not returning an asterisk, and there are multiple
         # origins that can be matched.
-        if headers[ACL_ORIGIN] == '*':
+        if headers[ACL_ORIGIN] == "*":
             pass
-        elif (len(options.get('origins')) > 1 or
-              len(origins_to_set) > 1 or
-              any(map(probably_regex, options.get('origins')))):
-            headers.add('Vary', 'Origin')
+        elif (
+            len(options.get("origins")) > 1
+            or len(origins_to_set) > 1
+            or any(map(probably_regex, options.get("origins")))
+        ):
+            headers.add("Vary", "Origin")
 
     return MultiDict((k, v) for k, v in headers.items() if v)
 
@@ -234,58 +244,68 @@ def set_cors_headers(resp, options):
 
     # If CORS has already been evaluated via the decorator, skip
     if hasattr(resp, FLASK_CORS_EVALUATED):
-        LOG.debug('CORS have been already evaluated, skipping')
+        LOG.debug("CORS have been already evaluated, skipping")
         return resp
 
     # Some libraries, like OAuthlib, set resp.headers to non Multidict
     # objects (Werkzeug Headers work as well). This is a problem because
     # headers allow repeated values.
-    if (not isinstance(resp.headers, Headers)
-           and not isinstance(resp.headers, MultiDict)):
+    if not isinstance(resp.headers, Headers) and not isinstance(resp.headers, MultiDict):
         resp.headers = MultiDict(resp.headers)
 
     headers_to_set = get_cors_headers(options, request.headers, request.method)
 
-    LOG.debug('Settings CORS headers: %s', str(headers_to_set))
+    LOG.debug("Settings CORS headers: %s", str(headers_to_set))
 
     for k, v in headers_to_set.items():
         resp.headers.add(k, v)
 
     return resp
 
+
 def probably_regex(maybe_regex):
     if isinstance(maybe_regex, RegexObject):
         return True
     else:
-        common_regex_chars = ['*', '\\', ']', '?', '$', '^', '[', ']', '(', ')']
+        common_regex_chars = ["*", "\\", "]", "?", "$", "^", "[", "]", "(", ")"]
         # Use common characters used in regular expressions as a proxy
         # for if this string is in fact a regex.
-        return any((c in maybe_regex for c in common_regex_chars))
+        return any(c in maybe_regex for c in common_regex_chars)
+
 
 def re_fix(reg):
     """
-        Replace the invalid regex r'*' with the valid, wildcard regex r'/.*' to
-        enable the CORS app extension to have a more user friendly api.
+    Replace the invalid regex r'*' with the valid, wildcard regex r'/.*' to
+    enable the CORS app extension to have a more user friendly api.
     """
-    return r'.*' if reg == r'*' else reg
-
+    return r".*" if reg == r"*" else reg
 
-def try_match_any(inst, patterns):
-    return any(try_match(inst, pattern) for pattern in patterns)
 
+def try_match_any_pattern(inst, patterns, caseSensitive=True):
+    return any(try_match_pattern(inst, pattern, caseSensitive) for pattern in patterns)
 
-def try_match(request_origin, maybe_regex):
-    """Safely attempts to match a pattern or string to a request origin."""
-    if isinstance(maybe_regex, RegexObject):
-        return re.match(maybe_regex, request_origin)
-    elif probably_regex(maybe_regex):
-        return re.match(maybe_regex, request_origin, flags=re.IGNORECASE)
-    else:
+def try_match_pattern(value, pattern, caseSensitive=True):
+    """
+    Safely attempts to match a pattern or string to a value. This
+    function can be used to match request origins, headers, or paths.
+    The value of caseSensitive should be set in accordance to the
+    data being compared e.g. origins and headers are case insensitive
+    whereas paths are case-sensitive
+    """
+    if isinstance(pattern, RegexObject):
+        return re.match(pattern, value)
+    if probably_regex(pattern):
+        flags = 0 if caseSensitive else re.IGNORECASE
         try:
-            return request_origin.lower() == maybe_regex.lower()
-        except AttributeError:
-            return request_origin == maybe_regex
-
+            return re.match(pattern, value, flags=flags)
+        except re.error:
+            return False
+    try:
+        v = str(value)
+        p = str(pattern)
+        return v == p if caseSensitive else v.casefold() == p.casefold()
+    except Exception:
+        return value == pattern
 
 def get_cors_options(appInstance, *dicts):
     """
@@ -304,16 +324,12 @@ def get_cors_options(appInstance, *dicts):
 
 def get_app_kwarg_dict(appInstance=None):
     """Returns the dictionary of CORS specific app configurations."""
-    app = (appInstance or current_app)
+    app = appInstance or current_app
 
     # In order to support blueprints which do not have a config attribute
-    app_config = getattr(app, 'config', {})
+    app_config = getattr(app, "config", {})
 
-    return {
-        k.lower().replace('cors_', ''): app_config.get(k)
-        for k in CONFIG_OPTIONS
-        if app_config.get(k) is not None
-    }
+    return {k.lower().replace("cors_", ""): app_config.get(k) for k in CONFIG_OPTIONS if app_config.get(k) is not None}
 
 
 def flexible_str(obj):
@@ -341,13 +357,12 @@ def ensure_iterable(inst):
     """
     Wraps scalars or string types as a list, or returns the iterable instance.
     """
-    if isinstance(inst, str):
-        return [inst]
-    elif not isinstance(inst, Iterable):
+    if isinstance(inst, str) or not isinstance(inst, Iterable):
         return [inst]
     else:
         return inst
 
+
 def sanitize_regex_param(param):
     return [re_fix(x) for x in ensure_iterable(param)]
 
@@ -363,22 +378,22 @@ def serialize_options(opts):
             LOG.warning("Unknown option passed to Flask-CORS: %s", key)
 
     # Ensure origins is a list of allowed origins with at least one entry.
-    options['origins'] = sanitize_regex_param(options.get('origins'))
-    options['allow_headers'] = sanitize_regex_param(options.get('allow_headers'))
+    options["origins"] = sanitize_regex_param(options.get("origins"))
+    options["allow_headers"] = sanitize_regex_param(options.get("allow_headers"))
 
     # This is expressly forbidden by the spec. Raise a value error so people
     # don't get burned in production.
-    if r'.*' in options['origins'] and options['supports_credentials'] and options['send_wildcard']:
-        raise ValueError("Cannot use supports_credentials in conjunction with"
-                         "an origin string of '*'. See: "
-                         "http://www.w3.org/TR/cors/#resource-requests")
-
-
+    if r".*" in options["origins"] and options["supports_credentials"] and options["send_wildcard"]:
+        raise ValueError(
+            "Cannot use supports_credentials in conjunction with"
+            "an origin string of '*'. See: "
+            "http://www.w3.org/TR/cors/#resource-requests"
+        )
 
-    serialize_option(options, 'expose_headers')
-    serialize_option(options, 'methods', upper=True)
+    serialize_option(options, "expose_headers")
+    serialize_option(options, "methods", upper=True)
 
-    if isinstance(options.get('max_age'), timedelta):
-        options['max_age'] = str(int(options['max_age'].total_seconds()))
+    if isinstance(options.get("max_age"), timedelta):
+        options["max_age"] = str(int(options["max_age"].total_seconds()))
 
     return options
diff --git a/libs/flask_cors/decorator.py b/libs/flask_cors/decorator.py
index b61d22f802..f8915b62d5 100644
--- a/libs/flask_cors/decorator.py
+++ b/libs/flask_cors/decorator.py
@@ -1,22 +1,13 @@
-# -*- coding: utf-8 -*-
-"""
-    decorator
-    ~~~~
-    This unit exposes a single decorator which should be used to wrap a
-    Flask route with. It accepts all parameters and options as
-    the CORS extension.
-
-    :copyright: (c) 2016 by Cory Dolphin.
-    :license: MIT, see LICENSE for more details.
-"""
 import logging
 from functools import update_wrapper
-from flask import make_response, request, current_app
 
-from .core import get_cors_options, set_cors_headers, FLASK_CORS_EVALUATED
+from flask import current_app, make_response, request
+
+from .core import FLASK_CORS_EVALUATED, get_cors_options, set_cors_headers
 
 LOG = logging.getLogger(__name__)
 
+
 def cross_origin(*args, **kwargs):
     """
     This function is the decorator which is used to wrap a Flask route with.
@@ -115,16 +106,16 @@ def decorator(f):
         # If f.provide_automatic_options is unset or True, Flask's route
         # decorator (which is actually wraps the function object we return)
         # intercepts OPTIONS handling, and requests will not have CORS headers
-        if _options.get('automatic_options', True):
-            f.required_methods = getattr(f, 'required_methods', set())
-            f.required_methods.add('OPTIONS')
+        if _options.get("automatic_options", True):
+            f.required_methods = getattr(f, "required_methods", set())
+            f.required_methods.add("OPTIONS")
             f.provide_automatic_options = False
 
         def wrapped_function(*args, **kwargs):
             # Handle setting of Flask-Cors parameters
             options = get_cors_options(current_app, _options)
 
-            if options.get('automatic_options') and request.method == 'OPTIONS':
+            if options.get("automatic_options") and request.method == "OPTIONS":
                 resp = current_app.make_default_options_response()
             else:
                 resp = make_response(f(*args, **kwargs))
@@ -134,4 +125,5 @@ def wrapped_function(*args, **kwargs):
             return resp
 
         return update_wrapper(wrapped_function, f)
+
     return decorator
diff --git a/libs/flask_cors/extension.py b/libs/flask_cors/extension.py
index abf5cafe9c..434f65eaa2 100644
--- a/libs/flask_cors/extension.py
+++ b/libs/flask_cors/extension.py
@@ -1,37 +1,21 @@
-# -*- coding: utf-8 -*-
-"""
-    extension
-    ~~~~
-    Flask-CORS is a simple extension to Flask allowing you to support cross
-    origin resource sharing (CORS) using a simple decorator.
-
-    :copyright: (c) 2016 by Cory Dolphin.
-    :license: MIT, see LICENSE for more details.
-"""
 import logging
-from urllib.parse import unquote_plus
-from flask import request
+from urllib.parse import unquote
 
-from .core import (
-    parse_resources,
-    get_cors_options,
-    get_regexp_pattern,
-    ACL_ORIGIN,
-    try_match,
-    set_cors_headers
-)
+from flask import request
 
+from .core import ACL_ORIGIN, get_cors_options, get_regexp_pattern, parse_resources, set_cors_headers, try_match_pattern
 
 LOG = logging.getLogger(__name__)
 
-class CORS(object):
+
+class CORS:
     """
     Initializes Cross Origin Resource sharing for the application. The
-    arguments are identical to :py:func:`cross_origin`, with the addition of a
+    arguments are identical to `cross_origin`, with the addition of a
     `resources` parameter. The resources parameter defines a series of regular
     expressions for resource paths to match and optionally, the associated
     options to be applied to the particular resource. These options are
-    identical to the arguments to :py:func:`cross_origin`.
+    identical to the arguments to `cross_origin`.
 
     The settings for CORS are determined in the following order
 
@@ -144,7 +128,7 @@ class CORS(object):
         will be set with the value 'true' whenever the request header
         `Access-Control-Request-Private-Network` has a value 'true'.
 
-        If False, the reponse header `Access-Control-Allow-Private-Network`
+        If False, the response header `Access-Control-Allow-Private-Network`
         will be set with the value 'false' whenever the request header
         `Access-Control-Request-Private-Network` has a value of 'true'.
 
@@ -168,19 +152,16 @@ def init_app(self, app, **kwargs):
 
         # Flatten our resources into a list of the form
         # (pattern_or_regexp, dictionary_of_options)
-        resources = parse_resources(options.get('resources'))
+        resources = parse_resources(options.get("resources"))
 
         # Compute the options for each resource by combining the options from
         # the app's configuration, the constructor, the kwargs to init_app, and
         # finally the options specified in the resources dictionary.
-        resources = [
-                     (pattern, get_cors_options(app, options, opts))
-                     for (pattern, opts) in resources
-                    ]
+        resources = [(pattern, get_cors_options(app, options, opts)) for (pattern, opts) in resources]
 
         # Create a human-readable form of these resources by converting the compiled
         # regular expressions into strings.
-        resources_human = {get_regexp_pattern(pattern): opts for (pattern,opts) in resources}
+        resources_human = {get_regexp_pattern(pattern): opts for (pattern, opts) in resources}
         LOG.debug("Configuring CORS with resources: %s", resources_human)
 
         cors_after_request = make_after_request_function(resources)
@@ -188,32 +169,38 @@ def init_app(self, app, **kwargs):
 
         # Wrap exception handlers with cross_origin
         # These error handlers will still respect the behavior of the route
-        if options.get('intercept_exceptions', True):
+        if options.get("intercept_exceptions", True):
+
             def _after_request_decorator(f):
                 def wrapped_function(*args, **kwargs):
                     return cors_after_request(app.make_response(f(*args, **kwargs)))
+
                 return wrapped_function
 
-            if hasattr(app, 'handle_exception'):
-                app.handle_exception = _after_request_decorator(
-                    app.handle_exception)
-                app.handle_user_exception = _after_request_decorator(
-                    app.handle_user_exception)
+            if hasattr(app, "handle_exception"):
+                app.handle_exception = _after_request_decorator(app.handle_exception)
+                app.handle_user_exception = _after_request_decorator(app.handle_user_exception)
+
 
 def make_after_request_function(resources):
     def cors_after_request(resp):
         # If CORS headers are set in a view decorator, pass
         if resp.headers is not None and resp.headers.get(ACL_ORIGIN):
-            LOG.debug('CORS have been already evaluated, skipping')
+            LOG.debug("CORS have been already evaluated, skipping")
             return resp
-        normalized_path = unquote_plus(request.path)
+        normalized_path = unquote(request.path)
         for res_regex, res_options in resources:
-            if try_match(normalized_path, res_regex):
-                LOG.debug("Request to '%r' matches CORS resource '%s'. Using options: %s",
-                      request.path, get_regexp_pattern(res_regex), res_options)
+            if try_match_pattern(normalized_path, res_regex, caseSensitive=True):
+                LOG.debug(
+                    "Request to '%r' matches CORS resource '%s'. Using options: %s",
+                    request.path,
+                    get_regexp_pattern(res_regex),
+                    res_options,
+                )
                 set_cors_headers(resp, res_options)
                 break
         else:
-            LOG.debug('No CORS rule matches')
+            LOG.debug("No CORS rule matches")
         return resp
+
     return cors_after_request
diff --git a/libs/flask_cors/version.py b/libs/flask_cors/version.py
index a0f66580ce..7f229cf189 100644
--- a/libs/flask_cors/version.py
+++ b/libs/flask_cors/version.py
@@ -1 +1 @@
-__version__ = '5.0.0'
+__version__ = "6.0.2"
diff --git a/libs/click-8.1.8.dist-info/INSTALLER b/libs/flask_migrate-4.1.0.dist-info/INSTALLER
similarity index 100%
rename from libs/click-8.1.8.dist-info/INSTALLER
rename to libs/flask_migrate-4.1.0.dist-info/INSTALLER
diff --git a/libs/flask_migrate-4.1.0.dist-info/METADATA b/libs/flask_migrate-4.1.0.dist-info/METADATA
new file mode 100644
index 0000000000..0b89e51cd3
--- /dev/null
+++ b/libs/flask_migrate-4.1.0.dist-info/METADATA
@@ -0,0 +1,92 @@
+Metadata-Version: 2.4
+Name: Flask-Migrate
+Version: 4.1.0
+Summary: SQLAlchemy database migrations for Flask applications using Alembic.
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/miguelgrinberg/flask-migrate
+Project-URL: Bug Tracker, https://github.com/miguelgrinberg/flask-migrate/issues
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: Flask>=0.9
+Requires-Dist: Flask-SQLAlchemy>=1.0
+Requires-Dist: alembic>=1.9.0
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Dynamic: license-file
+
+Flask-Migrate
+=============
+
+[![Build status](https://github.com/miguelgrinberg/flask-migrate/workflows/build/badge.svg)](https://github.com/miguelgrinberg/flask-migrate/actions)
+
+Flask-Migrate is an extension that handles SQLAlchemy database migrations for Flask applications using Alembic. The database operations are provided as command-line arguments under the `flask db` command.
+
+Installation
+------------
+
+Install Flask-Migrate with `pip`:
+
+    pip install Flask-Migrate
+
+Example
+-------
+
+This is an example application that handles database migrations through Flask-Migrate:
+
+```python
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+from flask_migrate import Migrate
+
+app = Flask(__name__)
+app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///app.db'
+
+db = SQLAlchemy(app)
+migrate = Migrate(app, db)
+
+class User(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(128))
+```
+
+With the above application you can create the database or enable migrations if the database already exists with the following command:
+
+    $ flask db init
+
+Note that the `FLASK_APP` environment variable must be set according to the Flask documentation for this command to work. This will add a `migrations` folder to your application. The contents of this folder need to be added to version control along with your other source files. 
+
+You can then generate an initial migration:
+
+    $ flask db migrate
+    
+The migration script needs to be reviewed and edited, as Alembic currently does not detect every change you make to your models. In particular, Alembic is currently unable to detect indexes. Once finalized, the migration script also needs to be added to version control.
+
+Then you can apply the migration to the database:
+
+    $ flask db upgrade
+    
+Then each time the database models change repeat the `migrate` and `upgrade` commands.
+
+To sync the database in another system just refresh the `migrations` folder from source control and run the `upgrade` command.
+
+To see all the commands that are available run this command:
+
+    $ flask db --help
+
+Resources
+---------
+
+- [Documentation](http://flask-migrate.readthedocs.io/en/latest/)
+- [pypi](https://pypi.python.org/pypi/Flask-Migrate) 
+- [Change Log](https://github.com/miguelgrinberg/Flask-Migrate/blob/master/CHANGES.md)
diff --git a/libs/flask_migrate-4.1.0.dist-info/RECORD b/libs/flask_migrate-4.1.0.dist-info/RECORD
new file mode 100644
index 0000000000..3514c51736
--- /dev/null
+++ b/libs/flask_migrate-4.1.0.dist-info/RECORD
@@ -0,0 +1,25 @@
+flask_migrate-4.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+flask_migrate-4.1.0.dist-info/METADATA,sha256=1bA492meS2k4iqK2vBX3qIbYKl4uAi7lsOztLMAStHw,3311
+flask_migrate-4.1.0.dist-info/RECORD,,
+flask_migrate-4.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask_migrate-4.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+flask_migrate-4.1.0.dist-info/licenses/LICENSE,sha256=kfkXGlJQvKy3Y__6tAJ8ynIp1HQfeROXhL8jZU1d-DI,1082
+flask_migrate-4.1.0.dist-info/top_level.txt,sha256=jLoPgiMG6oR4ugNteXn3IHskVVIyIXVStZOVq-AWLdU,14
+flask_migrate/__init__.py,sha256=JMySGA55Y8Gxy3HviWu7qq5rPUNQBWc2NID2OicpDyw,10082
+flask_migrate/cli.py,sha256=IxrxBSC82S5sPfWac8Qg83_FVsRvqTYtCG7HRyMW8RU,11097
+flask_migrate/templates/aioflask-multidb/README,sha256=Ek4cJqTaxneVjtkue--BXMlfpfp3MmJRjqoZvnSizww,43
+flask_migrate/templates/aioflask-multidb/alembic.ini.mako,sha256=SjYEmJKzz6K8QfuZWtLJAJWcCKOdRbfUhsVlpgv8ock,857
+flask_migrate/templates/aioflask-multidb/env.py,sha256=UcjeqkAbyUjTkuQFmCFPG7QOvqhco8-uGp8QEbto0T8,6573
+flask_migrate/templates/aioflask-multidb/script.py.mako,sha256=198VPxVEN3NZ3vHcRuCxSoI4XnOYirGWt01qkbPKoJw,1246
+flask_migrate/templates/aioflask/README,sha256=KKqWGl4YC2RqdOdq-y6quTDW0b7D_UZNHuM8glM1L-c,44
+flask_migrate/templates/aioflask/alembic.ini.mako,sha256=SjYEmJKzz6K8QfuZWtLJAJWcCKOdRbfUhsVlpgv8ock,857
+flask_migrate/templates/aioflask/env.py,sha256=m6ZtBhdpwuq89vVeLTWmNT-1NfJZqarC_hsquCdR9bw,3478
+flask_migrate/templates/aioflask/script.py.mako,sha256=8_xgA-gm_OhehnO7CiIijWgnm00ZlszEHtIHrAYFJl0,494
+flask_migrate/templates/flask-multidb/README,sha256=AfiP5foaV2odZxXxuUuSIS6YhkIpR7CsOo2mpuxwHdc,40
+flask_migrate/templates/flask-multidb/alembic.ini.mako,sha256=SjYEmJKzz6K8QfuZWtLJAJWcCKOdRbfUhsVlpgv8ock,857
+flask_migrate/templates/flask-multidb/env.py,sha256=F44iqsAxLTVBN_zD8CMUkdE7Aub4niHMmo5wl9mY4Uw,6190
+flask_migrate/templates/flask-multidb/script.py.mako,sha256=198VPxVEN3NZ3vHcRuCxSoI4XnOYirGWt01qkbPKoJw,1246
+flask_migrate/templates/flask/README,sha256=JL0NrjOrscPcKgRmQh1R3hlv1_rohDot0TvpmdM27Jk,41
+flask_migrate/templates/flask/alembic.ini.mako,sha256=SjYEmJKzz6K8QfuZWtLJAJWcCKOdRbfUhsVlpgv8ock,857
+flask_migrate/templates/flask/env.py,sha256=ibK1hsdOsOBzXNU2yQoAIza7f_EFzaVSWwON_NSpNzQ,3344
+flask_migrate/templates/flask/script.py.mako,sha256=8_xgA-gm_OhehnO7CiIijWgnm00ZlszEHtIHrAYFJl0,494
diff --git a/libs/decorator-5.1.1.dist-info/REQUESTED b/libs/flask_migrate-4.1.0.dist-info/REQUESTED
similarity index 100%
rename from libs/decorator-5.1.1.dist-info/REQUESTED
rename to libs/flask_migrate-4.1.0.dist-info/REQUESTED
diff --git a/libs/flask_migrate-4.1.0.dist-info/WHEEL b/libs/flask_migrate-4.1.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/flask_migrate-4.1.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/flask_migrate-4.1.0.dist-info/licenses/LICENSE b/libs/flask_migrate-4.1.0.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..2448fd2665
--- /dev/null
+++ b/libs/flask_migrate-4.1.0.dist-info/licenses/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Miguel Grinberg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/libs/flask_migrate-4.1.0.dist-info/top_level.txt b/libs/flask_migrate-4.1.0.dist-info/top_level.txt
new file mode 100644
index 0000000000..0652762c7b
--- /dev/null
+++ b/libs/flask_migrate-4.1.0.dist-info/top_level.txt
@@ -0,0 +1 @@
+flask_migrate
diff --git a/libs/flask_restx-1.3.0.dist-info/METADATA b/libs/flask_restx-1.3.0.dist-info/METADATA
deleted file mode 100644
index 26a5920251..0000000000
--- a/libs/flask_restx-1.3.0.dist-info/METADATA
+++ /dev/null
@@ -1,283 +0,0 @@
-Metadata-Version: 2.1
-Name: flask-restx
-Version: 1.3.0
-Summary: Fully featured framework for fast, easy and documented API development with Flask
-Home-page: https://github.com/python-restx/flask-restx
-Author: python-restx Authors
-License: BSD-3-Clause
-Keywords: flask restx rest api swagger openapi
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python
-Classifier: Environment :: Web Environment
-Classifier: Operating System :: OS Independent
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: System :: Software Distribution
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: License :: OSI Approved :: BSD License
-License-File: LICENSE
-Requires-Dist: aniso8601 >=0.82
-Requires-Dist: jsonschema
-Requires-Dist: Flask !=2.0.0,>=0.8
-Requires-Dist: werkzeug !=2.0.0
-Requires-Dist: pytz
-Requires-Dist: importlib-resources
-Provides-Extra: dev
-Requires-Dist: blinker ; extra == 'dev'
-Requires-Dist: Faker ==2.0.0 ; extra == 'dev'
-Requires-Dist: mock ==3.0.5 ; extra == 'dev'
-Requires-Dist: pytest ==7.0.1 ; extra == 'dev'
-Requires-Dist: pytest-benchmark ==3.4.1 ; extra == 'dev'
-Requires-Dist: pytest-cov ==4.0.0 ; extra == 'dev'
-Requires-Dist: pytest-flask ==1.3.0 ; extra == 'dev'
-Requires-Dist: pytest-mock ==3.6.1 ; extra == 'dev'
-Requires-Dist: pytest-profiling ==1.7.0 ; extra == 'dev'
-Requires-Dist: tzlocal ; extra == 'dev'
-Requires-Dist: invoke ==2.2.0 ; extra == 'dev'
-Requires-Dist: twine ==3.8.0 ; extra == 'dev'
-Requires-Dist: setuptools ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
-Requires-Dist: black ; extra == 'dev'
-Provides-Extra: doc
-Requires-Dist: alabaster ==0.7.12 ; extra == 'doc'
-Requires-Dist: Sphinx ==5.3.0 ; extra == 'doc'
-Requires-Dist: sphinx-issues ==3.0.1 ; extra == 'doc'
-Provides-Extra: test
-Requires-Dist: blinker ; extra == 'test'
-Requires-Dist: Faker ==2.0.0 ; extra == 'test'
-Requires-Dist: mock ==3.0.5 ; extra == 'test'
-Requires-Dist: pytest ==7.0.1 ; extra == 'test'
-Requires-Dist: pytest-benchmark ==3.4.1 ; extra == 'test'
-Requires-Dist: pytest-cov ==4.0.0 ; extra == 'test'
-Requires-Dist: pytest-flask ==1.3.0 ; extra == 'test'
-Requires-Dist: pytest-mock ==3.6.1 ; extra == 'test'
-Requires-Dist: pytest-profiling ==1.7.0 ; extra == 'test'
-Requires-Dist: tzlocal ; extra == 'test'
-Requires-Dist: invoke ==2.2.0 ; extra == 'test'
-Requires-Dist: twine ==3.8.0 ; extra == 'test'
-Requires-Dist: setuptools ; extra == 'test'
-
-===========
-Flask RESTX
-===========
-
-.. image:: https://github.com/python-restx/flask-restx/workflows/Tests/badge.svg?tag=1.3.0&event=push
-    :target: https://github.com/python-restx/flask-restx/actions?query=workflow%3ATests
-    :alt: Tests status
-.. image:: https://codecov.io/gh/python-restx/flask-restx/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/python-restx/flask-restx
-    :alt: Code coverage
-.. image:: https://readthedocs.org/projects/flask-restx/badge/?version=1.3.0
-    :target: https://flask-restx.readthedocs.io/en/1.3.0/
-    :alt: Documentation status
-.. image:: https://img.shields.io/pypi/l/flask-restx.svg
-    :target: https://pypi.org/project/flask-restx
-    :alt: License
-.. image:: https://img.shields.io/pypi/pyversions/flask-restx.svg
-    :target: https://pypi.org/project/flask-restx
-    :alt: Supported Python versions
-.. image:: https://badges.gitter.im/Join%20Chat.svg
-    :target: https://gitter.im/python-restx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
-    :alt: Join the chat at https://gitter.im/python-restx
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Code style: black
-
-
-Flask-RESTX is a community driven fork of `Flask-RESTPlus <https://github.com/noirbizarre/flask-restplus>`_.
-
-
-Flask-RESTX is an extension for `Flask`_ that adds support for quickly building REST APIs.
-Flask-RESTX encourages best practices with minimal setup.
-If you are familiar with Flask, Flask-RESTX should be easy to pick up.
-It provides a coherent collection of decorators and tools to describe your API
-and expose its documentation properly using `Swagger`_.
-
-
-Compatibility
-=============
-
-Flask-RESTX requires Python 3.8+.
-
-On Flask Compatibility
-======================
-
-Flask and Werkzeug moved to versions 2.0 in March 2020. This caused a breaking change in Flask-RESTX.
-
-.. list-table:: RESTX and Flask / Werkzeug Compatibility
-    :widths: 25 25 25
-    :header-rows: 1
-
-
-    * - Flask-RESTX version
-      - Flask version
-      - Note
-    * - <= 0.3.0
-      - < 2.0.0
-      - unpinned in Flask-RESTX. Pin your projects!
-    * - == 0.4.0
-      - < 2.0.0
-      - pinned in Flask-RESTX.
-    * - >= 0.5.0
-      - < 3.0.0
-      - unpinned, import statements wrapped for compatibility
-    * - == 1.2.0
-      - < 3.0.0
-      - pinned in Flask-RESTX.
-    * - >= 1.3.0
-      - >= 2.0.0 (Flask >= 3.0.0 support)
-      - unpinned, import statements wrapped for compatibility
-    * - trunk branch in Github
-      - >= 2.0.0 (Flask >= 3.0.0 support)
-      - unpinned, will address issues faster than releases.
-
-Installation
-============
-
-You can install Flask-RESTX with pip:
-
-.. code-block:: console
-
-    $ pip install flask-restx
-
-or with easy_install:
-
-.. code-block:: console
-
-    $ easy_install flask-restx
-
-
-Quick start
-===========
-
-With Flask-RESTX, you only import the api instance to route and document your endpoints.
-
-.. code-block:: python
-
-    from flask import Flask
-    from flask_restx import Api, Resource, fields
-
-    app = Flask(__name__)
-    api = Api(app, version='1.0', title='TodoMVC API',
-        description='A simple TodoMVC API',
-    )
-
-    ns = api.namespace('todos', description='TODO operations')
-
-    todo = api.model('Todo', {
-        'id': fields.Integer(readonly=True, description='The task unique identifier'),
-        'task': fields.String(required=True, description='The task details')
-    })
-
-
-    class TodoDAO(object):
-        def __init__(self):
-            self.counter = 0
-            self.todos = []
-
-        def get(self, id):
-            for todo in self.todos:
-                if todo['id'] == id:
-                    return todo
-            api.abort(404, "Todo {} doesn't exist".format(id))
-
-        def create(self, data):
-            todo = data
-            todo['id'] = self.counter = self.counter + 1
-            self.todos.append(todo)
-            return todo
-
-        def update(self, id, data):
-            todo = self.get(id)
-            todo.update(data)
-            return todo
-
-        def delete(self, id):
-            todo = self.get(id)
-            self.todos.remove(todo)
-
-
-    DAO = TodoDAO()
-    DAO.create({'task': 'Build an API'})
-    DAO.create({'task': '?????'})
-    DAO.create({'task': 'profit!'})
-
-
-    @ns.route('/')
-    class TodoList(Resource):
-        '''Shows a list of all todos, and lets you POST to add new tasks'''
-        @ns.doc('list_todos')
-        @ns.marshal_list_with(todo)
-        def get(self):
-            '''List all tasks'''
-            return DAO.todos
-
-        @ns.doc('create_todo')
-        @ns.expect(todo)
-        @ns.marshal_with(todo, code=201)
-        def post(self):
-            '''Create a new task'''
-            return DAO.create(api.payload), 201
-
-
-    @ns.route('/<int:id>')
-    @ns.response(404, 'Todo not found')
-    @ns.param('id', 'The task identifier')
-    class Todo(Resource):
-        '''Show a single todo item and lets you delete them'''
-        @ns.doc('get_todo')
-        @ns.marshal_with(todo)
-        def get(self, id):
-            '''Fetch a given resource'''
-            return DAO.get(id)
-
-        @ns.doc('delete_todo')
-        @ns.response(204, 'Todo deleted')
-        def delete(self, id):
-            '''Delete a task given its identifier'''
-            DAO.delete(id)
-            return '', 204
-
-        @ns.expect(todo)
-        @ns.marshal_with(todo)
-        def put(self, id):
-            '''Update a task given its identifier'''
-            return DAO.update(id, api.payload)
-
-
-    if __name__ == '__main__':
-        app.run(debug=True)
-
-
-Contributors
-============
-
-Flask-RESTX is brought to you by @python-restx. Since early 2019 @SteadBytes,
-@a-luna, @j5awry, @ziirish volunteered to help @python-restx keep the project up
-and running, they did so for a long time! Since the beginning of 2023, the project
-is maintained by @peter-doggart with help from @ziirish.
-Of course everyone is welcome to contribute and we will be happy to review your
-PR's or answer to your issues.
-
-
-Documentation
-=============
-
-The documentation is hosted `on Read the Docs <http://flask-restx.readthedocs.io/en/latest/>`_
-
-
-.. _Flask: https://flask.palletsprojects.com/
-.. _Swagger: https://swagger.io/
-
-
-Contribution
-============
-Want to contribute! That's awesome! Check out `CONTRIBUTING.rst! <https://github.com/python-restx/flask-restx/blob/master/CONTRIBUTING.rst>`_
-
diff --git a/libs/flask_restx-1.3.0.dist-info/RECORD b/libs/flask_restx-1.3.0.dist-info/RECORD
deleted file mode 100644
index 3c4a3edf57..0000000000
--- a/libs/flask_restx-1.3.0.dist-info/RECORD
+++ /dev/null
@@ -1,52 +0,0 @@
-flask_restx-1.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-flask_restx-1.3.0.dist-info/LICENSE,sha256=1zb8INl5gxq1w4CXPQFULel4V9l1tgpM8D772eTjiZc,1626
-flask_restx-1.3.0.dist-info/METADATA,sha256=TJoOPzFNsKa5oINdR8IkmNH1snSNzxu8LuhpMnX_KjM,9291
-flask_restx-1.3.0.dist-info/RECORD,,
-flask_restx-1.3.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flask_restx-1.3.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-flask_restx-1.3.0.dist-info/top_level.txt,sha256=VFn6iRHVPJup9-6Sb4-jAjxN-tEY6OBuP4PJj10oKjw,12
-flask_restx/__about__.py,sha256=iYTATfYpLj5cO2TV-Mc6sirJyaaWiRT2uBypOnPNwnI,156
-flask_restx/__init__.py,sha256=uD-UFi_tnOyWlC5l6GXP0K6av71jLO4WZh-Ywni8USE,849
-flask_restx/_http.py,sha256=LeaxT9JB3jeFReyV3yRr5tBUJytVH3rX1mz7_skSTRo,6400
-flask_restx/api.py,sha256=yAPjyIgblD3b_Kekf4AF0hSKDDZkCMIcZn1S8TsRtSM,37172
-flask_restx/apidoc.py,sha256=mnynxW6Xqotnbzt9k5tJHLANISpMzx-2WNl75Vv6EyM,901
-flask_restx/cors.py,sha256=oJ9YxDK7JAdcxpYQ4i_AhRBONp7rymDKg1EL0mat6cY,2131
-flask_restx/errors.py,sha256=as4r0Tf6imHJhBA9x5qD2P4tc0smHfJvwVMDqxBqgjw,1201
-flask_restx/fields.py,sha256=8G8CLN11xEd5_UFF4oEpAAacbh4t3hn0hSgse7kay8k,27991
-flask_restx/inputs.py,sha256=fFSc8Zwr-IZHoYDRjYZCan_eju_8kd6HFdGJQxXyK8A,18422
-flask_restx/marshalling.py,sha256=v72VNhauISwwRvETBHwdpPTLo2Gc38of1xiFzj025Ro,9868
-flask_restx/mask.py,sha256=fQ52WlUjA-Si7cSntkHpdlhSDGSVALPTXmO5KY9oCas,5470
-flask_restx/model.py,sha256=m5vpZjsQoQdNTjlSdrwUXoBUsLzA1diGWhkMfkRTeq4,8219
-flask_restx/namespace.py,sha256=mfC8CzZtW6KoldR9J_IfxvZb_Fw9u-RZzOaEa07j2jw,12943
-flask_restx/postman.py,sha256=BeNW8EMo4XjxJL3IPMUGsQWsZm7B-eCGItrNTrRMddk,6409
-flask_restx/representations.py,sha256=bElgjPEEh9-82CKHQUfELYtoqVXsT3cWNuEPA5x7beI,768
-flask_restx/reqparse.py,sha256=KoYD_b2pvfyYoTVRVuUktyLf6Yr2V19E8RaPY6x_9po,16270
-flask_restx/resource.py,sha256=huM_ZdIq-L9gCdLzgYvRIpoPXZuUz58n83dW0ZcEkCE,3221
-flask_restx/schemas/__init__.py,sha256=1CUNi_uSaOE7BY1zyoSzx-wD9l0dzJ-RsIRIM-uU5LU,3325
-flask_restx/schemas/oas-2.0.json,sha256=s2hxyAFiksXmbdOyA-aa7_mL_vl-CzxnwZCQNglVhqU,40247
-flask_restx/static/droid-sans.css,sha256=Oi7PdaoE6YmfwGw-fuUC1Qhh3CIk04t4EhW_O2YKsVQ,778
-flask_restx/static/favicon-16x16.png,sha256=ryStYE3Xs7zaj5dauXMHX0ovcKQIeUShL474tjo-B8I,665
-flask_restx/static/favicon-32x32.png,sha256=PtYS9B4FDKXnAAytbxy-fn2jn2X8qZwC6Z5lkQVuWDc,628
-flask_restx/static/files/.npmignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flask_restx/static/files/droid-sans-latin-400.woff,sha256=GmCNrhdpg4Wy24O2OdzcQiqnChecKIR1LlqMJgnoiUo,24888
-flask_restx/static/files/droid-sans-latin-400.woff2,sha256=GX8pqdQ-ldV8Gu4yynthjao9RpOMBne8Wkw6Cz4Yi8A,21252
-flask_restx/static/files/droid-sans-latin-700.woff,sha256=HeHqJ3qcOgxfwiesgTR2PKw-w0g1f30Yh1RBMHa6m20,26012
-flask_restx/static/files/droid-sans-latin-700.woff2,sha256=TS4i9xihZHDiWAfIBagE3vIqoPMq75kiZaLo4PULkBQ,22296
-flask_restx/static/oauth2-redirect.html,sha256=OX_TCiSZzSxfNBGt4Mp_vXhtUBFjnKeKBoJNWAuDwSI,2715
-flask_restx/static/swagger-ui-bundle.js,sha256=rC3gtSIhxpalJh4cLClpkHR4Veukz_vw8mWLg2bXDmE,1048219
-flask_restx/static/swagger-ui-bundle.js.map,sha256=Fn4Se5yJmtQ-UfBB3SZ3aJYvNGY1g6_2pY35rCNmLao,1540741
-flask_restx/static/swagger-ui-es-bundle-core.js,sha256=fbRZTBx9mPvD1qCc5DzroYjmhd6sk3WvC9oWXkPHJI8,369975
-flask_restx/static/swagger-ui-es-bundle-core.js.map,sha256=cQk1Thl9pykdVVAy2MNjsgqALkwpNRnFz2SmMaHFfF0,1290538
-flask_restx/static/swagger-ui-es-bundle.js,sha256=kg3txtJKpjBzSiA_EavAMYzmCvn8xTAkuJheDS_J3w4,1048009
-flask_restx/static/swagger-ui-es-bundle.js.map,sha256=y4gVlCrTae81Wr1dBbCIO43zkAH5te-FNNaZt6JHrnI,1536391
-flask_restx/static/swagger-ui-standalone-preset.js,sha256=XgYgZu41fCIwo9PZbkwpPnDeGRicPkYMgOZQZTKKr7M,322770
-flask_restx/static/swagger-ui-standalone-preset.js.map,sha256=FlgeogyONzHnDCvmp5ByqGM4tyochZk5BmKqpYRWnCQ,516969
-flask_restx/static/swagger-ui.css,sha256=SAA66tKLwuKJA6buaPtWkbgU4beu9n-GYPUplCMeAzE,145206
-flask_restx/static/swagger-ui.css.map,sha256=VH4Fk6LbhMDyFx5JPt1N9FcPMqO7MfWIcZwBX0q307s,251096
-flask_restx/static/swagger-ui.js,sha256=cTinLV3ZnSH8aLuRoPzl-kTSs0ijjZGifP1oAcbKs0o,257887
-flask_restx/static/swagger-ui.js.map,sha256=7Bing7vGfcJgvWei_8WuuNYyFcq8GC0E1G7AqWZfDLE,306403
-flask_restx/swagger.py,sha256=Nn4i-Su9Lie4mMiLpx_mtCzaNYjtHTIHKtWLkMnRyP8,27158
-flask_restx/templates/swagger-ui-css.html,sha256=DN_qPIAXqaqxNI56uuEdQfhYvwkATcE5MHfb9-vzoeQ,950
-flask_restx/templates/swagger-ui-libs.html,sha256=fsU-NlDNXFrcMzA8HvfFKjaI52FNFs70sMbaQSJLsh4,478
-flask_restx/templates/swagger-ui.html,sha256=StghLEX70mP0iwJ-bwd--lr4HjTbo_8y1X5cmEXG5BA,4286
-flask_restx/utils.py,sha256=H_N9-yYCBh8xYjbAF6fdJVXKruaE4lKBc-aWMp_kagg,5420
diff --git a/libs/flask_restx-1.3.0.dist-info/WHEEL b/libs/flask_restx-1.3.0.dist-info/WHEEL
deleted file mode 100644
index f31e450fda..0000000000
--- a/libs/flask_restx-1.3.0.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/decorator-5.1.1.dist-info/INSTALLER b/libs/flask_restx-1.3.2.dist-info/INSTALLER
similarity index 100%
rename from libs/decorator-5.1.1.dist-info/INSTALLER
rename to libs/flask_restx-1.3.2.dist-info/INSTALLER
diff --git a/libs/flask_restx-1.3.2.dist-info/METADATA b/libs/flask_restx-1.3.2.dist-info/METADATA
new file mode 100644
index 0000000000..a7ccec76da
--- /dev/null
+++ b/libs/flask_restx-1.3.2.dist-info/METADATA
@@ -0,0 +1,294 @@
+Metadata-Version: 2.4
+Name: flask-restx
+Version: 1.3.2
+Summary: Fully featured framework for fast, easy and documented API development with Flask
+Home-page: https://github.com/python-restx/flask-restx
+Author: python-restx Authors
+License: BSD-3-Clause
+Keywords: flask restx rest api swagger openapi
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Programming Language :: Python
+Classifier: Environment :: Web Environment
+Classifier: Operating System :: OS Independent
+Classifier: Intended Audience :: Developers
+Classifier: Topic :: System :: Software Distribution
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: License :: OSI Approved :: BSD License
+Requires-Python: >=3.9
+License-File: LICENSE
+Requires-Dist: aniso8601>=0.82
+Requires-Dist: jsonschema
+Requires-Dist: referencing
+Requires-Dist: Flask!=2.0.0,>=0.8
+Requires-Dist: werkzeug!=2.0.0
+Requires-Dist: importlib_resources
+Provides-Extra: test
+Requires-Dist: blinker; extra == "test"
+Requires-Dist: Faker==2.0.0; extra == "test"
+Requires-Dist: mock==3.0.5; extra == "test"
+Requires-Dist: pytest==7.0.1; extra == "test"
+Requires-Dist: pytest-benchmark==3.4.1; extra == "test"
+Requires-Dist: pytest-cov==4.0.0; extra == "test"
+Requires-Dist: pytest-flask==1.3.0; extra == "test"
+Requires-Dist: pytest-mock==3.6.1; extra == "test"
+Requires-Dist: pytest-profiling==1.7.0; extra == "test"
+Requires-Dist: invoke==2.2.0; extra == "test"
+Requires-Dist: twine==3.8.0; extra == "test"
+Requires-Dist: setuptools; extra == "test"
+Requires-Dist: backports.zoneinfo; python_version < "3.9" and extra == "test"
+Provides-Extra: doc
+Requires-Dist: alabaster==0.7.12; extra == "doc"
+Requires-Dist: Sphinx==5.3.0; extra == "doc"
+Requires-Dist: sphinx-issues==3.0.1; extra == "doc"
+Provides-Extra: dev
+Requires-Dist: blinker; extra == "dev"
+Requires-Dist: Faker==2.0.0; extra == "dev"
+Requires-Dist: mock==3.0.5; extra == "dev"
+Requires-Dist: pytest==7.0.1; extra == "dev"
+Requires-Dist: pytest-benchmark==3.4.1; extra == "dev"
+Requires-Dist: pytest-cov==4.0.0; extra == "dev"
+Requires-Dist: pytest-flask==1.3.0; extra == "dev"
+Requires-Dist: pytest-mock==3.6.1; extra == "dev"
+Requires-Dist: pytest-profiling==1.7.0; extra == "dev"
+Requires-Dist: invoke==2.2.0; extra == "dev"
+Requires-Dist: twine==3.8.0; extra == "dev"
+Requires-Dist: setuptools; extra == "dev"
+Requires-Dist: backports.zoneinfo; python_version < "3.9" and extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+===========
+Flask RESTX
+===========
+
+.. image:: https://github.com/python-restx/flask-restx/workflows/Tests/badge.svg?tag=1.3.2&event=push
+    :target: https://github.com/python-restx/flask-restx/actions?query=workflow%3ATests
+    :alt: Tests status
+.. image:: https://codecov.io/gh/python-restx/flask-restx/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/python-restx/flask-restx
+    :alt: Code coverage
+.. image:: https://readthedocs.org/projects/flask-restx/badge/?version=1.3.2
+    :target: https://flask-restx.readthedocs.io/en/1.3.2/
+    :alt: Documentation status
+.. image:: https://img.shields.io/pypi/l/flask-restx.svg
+    :target: https://pypi.org/project/flask-restx
+    :alt: License
+.. image:: https://img.shields.io/pypi/pyversions/flask-restx.svg
+    :target: https://pypi.org/project/flask-restx
+    :alt: Supported Python versions
+.. image:: https://badges.gitter.im/Join%20Chat.svg
+    :target: https://gitter.im/python-restx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+    :alt: Join the chat at https://gitter.im/python-restx
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/psf/black
+    :alt: Code style: black
+
+
+Flask-RESTX is a community driven fork of `Flask-RESTPlus <https://github.com/noirbizarre/flask-restplus>`_.
+
+
+Flask-RESTX is an extension for `Flask`_ that adds support for quickly building REST APIs.
+Flask-RESTX encourages best practices with minimal setup.
+If you are familiar with Flask, Flask-RESTX should be easy to pick up.
+It provides a coherent collection of decorators and tools to describe your API
+and expose its documentation properly using `Swagger`_.
+
+
+Compatibility
+=============
+
+Flask-RESTX requires Python 3.9+.
+
+On Flask Compatibility
+======================
+
+Flask and Werkzeug moved to versions 2.0 in March 2020. This caused a breaking change in Flask-RESTX.
+
+.. list-table:: RESTX and Flask / Werkzeug Compatibility
+    :widths: 25 25 25
+    :header-rows: 1
+
+
+    * - Flask-RESTX version
+      - Flask version
+      - Note
+    * - <= 0.3.0
+      - < 2.0.0
+      - unpinned in Flask-RESTX. Pin your projects!
+    * - == 0.4.0
+      - < 2.0.0
+      - pinned in Flask-RESTX.
+    * - >= 0.5.0
+      - < 3.0.0
+      - unpinned, import statements wrapped for compatibility
+    * - == 1.2.0
+      - < 3.0.0
+      - pinned in Flask-RESTX.
+    * - >= 1.3.0
+      - >= 2.0.0 (Flask >= 3.0.0 support)
+      - unpinned, import statements wrapped for compatibility
+    * - trunk branch in Github
+      - >= 2.0.0 (Flask >= 3.0.0 support)
+      - unpinned, will address issues faster than releases.
+
+Installation
+============
+
+You can install Flask-RESTX with pip:
+
+.. code-block:: console
+
+    $ pip install flask-restx
+
+or with easy_install:
+
+.. code-block:: console
+
+    $ easy_install flask-restx
+
+
+Quick start
+===========
+
+With Flask-RESTX, you only import the api instance to route and document your endpoints.
+
+.. code-block:: python
+
+    from flask import Flask
+    from flask_restx import Api, Resource, fields
+
+    app = Flask(__name__)
+    api = Api(app, version='1.0', title='TodoMVC API',
+        description='A simple TodoMVC API',
+    )
+
+    ns = api.namespace('todos', description='TODO operations')
+
+    todo = api.model('Todo', {
+        'id': fields.Integer(readonly=True, description='The task unique identifier'),
+        'task': fields.String(required=True, description='The task details')
+    })
+
+
+    class TodoDAO(object):
+        def __init__(self):
+            self.counter = 0
+            self.todos = []
+
+        def get(self, id):
+            for todo in self.todos:
+                if todo['id'] == id:
+                    return todo
+            api.abort(404, "Todo {} doesn't exist".format(id))
+
+        def create(self, data):
+            todo = data
+            todo['id'] = self.counter = self.counter + 1
+            self.todos.append(todo)
+            return todo
+
+        def update(self, id, data):
+            todo = self.get(id)
+            todo.update(data)
+            return todo
+
+        def delete(self, id):
+            todo = self.get(id)
+            self.todos.remove(todo)
+
+
+    DAO = TodoDAO()
+    DAO.create({'task': 'Build an API'})
+    DAO.create({'task': '?????'})
+    DAO.create({'task': 'profit!'})
+
+
+    @ns.route('/')
+    class TodoList(Resource):
+        '''Shows a list of all todos, and lets you POST to add new tasks'''
+        @ns.doc('list_todos')
+        @ns.marshal_list_with(todo)
+        def get(self):
+            '''List all tasks'''
+            return DAO.todos
+
+        @ns.doc('create_todo')
+        @ns.expect(todo)
+        @ns.marshal_with(todo, code=201)
+        def post(self):
+            '''Create a new task'''
+            return DAO.create(api.payload), 201
+
+
+    @ns.route('/<int:id>')
+    @ns.response(404, 'Todo not found')
+    @ns.param('id', 'The task identifier')
+    class Todo(Resource):
+        '''Show a single todo item and lets you delete them'''
+        @ns.doc('get_todo')
+        @ns.marshal_with(todo)
+        def get(self, id):
+            '''Fetch a given resource'''
+            return DAO.get(id)
+
+        @ns.doc('delete_todo')
+        @ns.response(204, 'Todo deleted')
+        def delete(self, id):
+            '''Delete a task given its identifier'''
+            DAO.delete(id)
+            return '', 204
+
+        @ns.expect(todo)
+        @ns.marshal_with(todo)
+        def put(self, id):
+            '''Update a task given its identifier'''
+            return DAO.update(id, api.payload)
+
+
+    if __name__ == '__main__':
+        app.run(debug=True)
+
+
+Contributors
+============
+
+Flask-RESTX is brought to you by @python-restx. Since early 2019 @SteadBytes,
+@a-luna, @j5awry, @ziirish volunteered to help @python-restx keep the project up
+and running, they did so for a long time! Since the beginning of 2023, the project
+is maintained by @peter-doggart with help from @ziirish.
+Of course everyone is welcome to contribute and we will be happy to review your
+PR's or answer to your issues.
+
+
+Documentation
+=============
+
+The documentation is hosted `on Read the Docs <http://flask-restx.readthedocs.io/en/latest/>`_
+
+
+.. _Flask: https://flask.palletsprojects.com/
+.. _Swagger: https://swagger.io/
+
+
+Contribution
+============
+Want to contribute! That's awesome! Check out `CONTRIBUTING.rst! <https://github.com/python-restx/flask-restx/blob/master/CONTRIBUTING.rst>`_
+
diff --git a/libs/flask_restx-1.3.2.dist-info/RECORD b/libs/flask_restx-1.3.2.dist-info/RECORD
new file mode 100644
index 0000000000..ee7c5790f0
--- /dev/null
+++ b/libs/flask_restx-1.3.2.dist-info/RECORD
@@ -0,0 +1,52 @@
+flask_restx-1.3.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+flask_restx-1.3.2.dist-info/METADATA,sha256=zNfgJHKW_7jdbUI0uSNzN4xBS6hBiAW-y6gG30n_f4A,9512
+flask_restx-1.3.2.dist-info/RECORD,,
+flask_restx-1.3.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask_restx-1.3.2.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+flask_restx-1.3.2.dist-info/licenses/LICENSE,sha256=1zb8INl5gxq1w4CXPQFULel4V9l1tgpM8D772eTjiZc,1626
+flask_restx-1.3.2.dist-info/top_level.txt,sha256=VFn6iRHVPJup9-6Sb4-jAjxN-tEY6OBuP4PJj10oKjw,12
+flask_restx/__about__.py,sha256=ZLAXo72p8BG3DCaQrfh86bMB_kEFLSe2kZSPrhYHujk,156
+flask_restx/__init__.py,sha256=uD-UFi_tnOyWlC5l6GXP0K6av71jLO4WZh-Ywni8USE,849
+flask_restx/_http.py,sha256=LeaxT9JB3jeFReyV3yRr5tBUJytVH3rX1mz7_skSTRo,6400
+flask_restx/api.py,sha256=Bil03QIp1VTXFHNm6iwt3VJgkgghEQzC4trSh7M0kTA,39155
+flask_restx/apidoc.py,sha256=mnynxW6Xqotnbzt9k5tJHLANISpMzx-2WNl75Vv6EyM,901
+flask_restx/cors.py,sha256=oJ9YxDK7JAdcxpYQ4i_AhRBONp7rymDKg1EL0mat6cY,2131
+flask_restx/errors.py,sha256=as4r0Tf6imHJhBA9x5qD2P4tc0smHfJvwVMDqxBqgjw,1201
+flask_restx/fields.py,sha256=WHf1gtWTvaQei7MssCselbEj8wGJOfBZYjZV4tGNqHI,28868
+flask_restx/inputs.py,sha256=7lzICQNnPfoDm8ZQz2vW5CkJkUOCD08qIj2f-nO7jRQ,18476
+flask_restx/marshalling.py,sha256=KT4CAfN5Tb4PSA-3LhGs4T6kW1tGdJa343Qk6Tyo1Fo,9900
+flask_restx/mask.py,sha256=fQ52WlUjA-Si7cSntkHpdlhSDGSVALPTXmO5KY9oCas,5470
+flask_restx/model.py,sha256=FT1qNvlf3pxgA0Ptgl0owPHlVCqSu9Z2TEPCqOmhrq8,10063
+flask_restx/namespace.py,sha256=i6HfQ45X79Fz2L1nHdo5qzbTL4SdgTtWlxLaD0CBAcM,12999
+flask_restx/postman.py,sha256=BeNW8EMo4XjxJL3IPMUGsQWsZm7B-eCGItrNTrRMddk,6409
+flask_restx/representations.py,sha256=bElgjPEEh9-82CKHQUfELYtoqVXsT3cWNuEPA5x7beI,768
+flask_restx/reqparse.py,sha256=KoYD_b2pvfyYoTVRVuUktyLf6Yr2V19E8RaPY6x_9po,16270
+flask_restx/resource.py,sha256=huM_ZdIq-L9gCdLzgYvRIpoPXZuUz58n83dW0ZcEkCE,3221
+flask_restx/schemas/__init__.py,sha256=B9xyCirLUiAFKbha4TxoFsZaVc28mMr7NYnE8tYC9og,3326
+flask_restx/schemas/oas-2.0.json,sha256=s2hxyAFiksXmbdOyA-aa7_mL_vl-CzxnwZCQNglVhqU,40247
+flask_restx/static/droid-sans.css,sha256=Oi7PdaoE6YmfwGw-fuUC1Qhh3CIk04t4EhW_O2YKsVQ,778
+flask_restx/static/favicon-16x16.png,sha256=ryStYE3Xs7zaj5dauXMHX0ovcKQIeUShL474tjo-B8I,665
+flask_restx/static/favicon-32x32.png,sha256=PtYS9B4FDKXnAAytbxy-fn2jn2X8qZwC6Z5lkQVuWDc,628
+flask_restx/static/files/.npmignore,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask_restx/static/files/droid-sans-latin-400.woff,sha256=GmCNrhdpg4Wy24O2OdzcQiqnChecKIR1LlqMJgnoiUo,24888
+flask_restx/static/files/droid-sans-latin-400.woff2,sha256=GX8pqdQ-ldV8Gu4yynthjao9RpOMBne8Wkw6Cz4Yi8A,21252
+flask_restx/static/files/droid-sans-latin-700.woff,sha256=HeHqJ3qcOgxfwiesgTR2PKw-w0g1f30Yh1RBMHa6m20,26012
+flask_restx/static/files/droid-sans-latin-700.woff2,sha256=TS4i9xihZHDiWAfIBagE3vIqoPMq75kiZaLo4PULkBQ,22296
+flask_restx/static/oauth2-redirect.html,sha256=OX_TCiSZzSxfNBGt4Mp_vXhtUBFjnKeKBoJNWAuDwSI,2715
+flask_restx/static/swagger-ui-bundle.js,sha256=rC3gtSIhxpalJh4cLClpkHR4Veukz_vw8mWLg2bXDmE,1048219
+flask_restx/static/swagger-ui-bundle.js.map,sha256=Fn4Se5yJmtQ-UfBB3SZ3aJYvNGY1g6_2pY35rCNmLao,1540741
+flask_restx/static/swagger-ui-es-bundle-core.js,sha256=fbRZTBx9mPvD1qCc5DzroYjmhd6sk3WvC9oWXkPHJI8,369975
+flask_restx/static/swagger-ui-es-bundle-core.js.map,sha256=cQk1Thl9pykdVVAy2MNjsgqALkwpNRnFz2SmMaHFfF0,1290538
+flask_restx/static/swagger-ui-es-bundle.js,sha256=kg3txtJKpjBzSiA_EavAMYzmCvn8xTAkuJheDS_J3w4,1048009
+flask_restx/static/swagger-ui-es-bundle.js.map,sha256=y4gVlCrTae81Wr1dBbCIO43zkAH5te-FNNaZt6JHrnI,1536391
+flask_restx/static/swagger-ui-standalone-preset.js,sha256=XgYgZu41fCIwo9PZbkwpPnDeGRicPkYMgOZQZTKKr7M,322770
+flask_restx/static/swagger-ui-standalone-preset.js.map,sha256=FlgeogyONzHnDCvmp5ByqGM4tyochZk5BmKqpYRWnCQ,516969
+flask_restx/static/swagger-ui.css,sha256=SAA66tKLwuKJA6buaPtWkbgU4beu9n-GYPUplCMeAzE,145206
+flask_restx/static/swagger-ui.css.map,sha256=VH4Fk6LbhMDyFx5JPt1N9FcPMqO7MfWIcZwBX0q307s,251096
+flask_restx/static/swagger-ui.js,sha256=cTinLV3ZnSH8aLuRoPzl-kTSs0ijjZGifP1oAcbKs0o,257887
+flask_restx/static/swagger-ui.js.map,sha256=7Bing7vGfcJgvWei_8WuuNYyFcq8GC0E1G7AqWZfDLE,306403
+flask_restx/swagger.py,sha256=Nn4i-Su9Lie4mMiLpx_mtCzaNYjtHTIHKtWLkMnRyP8,27158
+flask_restx/templates/swagger-ui-css.html,sha256=DN_qPIAXqaqxNI56uuEdQfhYvwkATcE5MHfb9-vzoeQ,950
+flask_restx/templates/swagger-ui-libs.html,sha256=fsU-NlDNXFrcMzA8HvfFKjaI52FNFs70sMbaQSJLsh4,478
+flask_restx/templates/swagger-ui.html,sha256=StghLEX70mP0iwJ-bwd--lr4HjTbo_8y1X5cmEXG5BA,4286
+flask_restx/utils.py,sha256=H_N9-yYCBh8xYjbAF6fdJVXKruaE4lKBc-aWMp_kagg,5420
diff --git a/libs/dnspython-2.6.1.dist-info/REQUESTED b/libs/flask_restx-1.3.2.dist-info/REQUESTED
similarity index 100%
rename from libs/dnspython-2.6.1.dist-info/REQUESTED
rename to libs/flask_restx-1.3.2.dist-info/REQUESTED
diff --git a/libs/flask_restx-1.3.2.dist-info/WHEEL b/libs/flask_restx-1.3.2.dist-info/WHEEL
new file mode 100644
index 0000000000..798dd6195b
--- /dev/null
+++ b/libs/flask_restx-1.3.2.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/flask_restx-1.3.0.dist-info/LICENSE b/libs/flask_restx-1.3.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/flask_restx-1.3.0.dist-info/LICENSE
rename to libs/flask_restx-1.3.2.dist-info/licenses/LICENSE
diff --git a/libs/flask_restx-1.3.0.dist-info/top_level.txt b/libs/flask_restx-1.3.2.dist-info/top_level.txt
similarity index 100%
rename from libs/flask_restx-1.3.0.dist-info/top_level.txt
rename to libs/flask_restx-1.3.2.dist-info/top_level.txt
diff --git a/libs/flask_restx/__about__.py b/libs/flask_restx/__about__.py
index 1b0e846877..09fc5e94cc 100644
--- a/libs/flask_restx/__about__.py
+++ b/libs/flask_restx/__about__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.3.0"
+__version__ = "1.3.2"
 __description__ = (
     "Fully featured framework for fast, easy and documented API development with Flask"
 )
diff --git a/libs/flask_restx/api.py b/libs/flask_restx/api.py
index a76ae3a26e..4f758714e2 100644
--- a/libs/flask_restx/api.py
+++ b/libs/flask_restx/api.py
@@ -2,6 +2,7 @@
 import inspect
 from itertools import chain
 import logging
+import threading
 import operator
 import re
 import sys
@@ -16,7 +17,7 @@
 
 from flask.signals import got_request_exception
 
-from jsonschema import RefResolver
+from referencing import Registry
 
 from werkzeug.utils import cached_property
 from werkzeug.datastructures import Headers
@@ -133,7 +134,7 @@ def __init__(
         format_checker=None,
         url_scheme=None,
         default_swagger_filename="swagger.json",
-        **kwargs
+        **kwargs,
     ):
         self.version = version
         self.title = title or "API"
@@ -161,6 +162,7 @@ def __init__(
             }
         )
         self._schema = None
+        self._schema_lock = threading.Lock()
         self.models = {}
         self._refresolver = None
         self.format_checker = format_checker
@@ -567,14 +569,17 @@ def __schema__(self):
         :returns dict: the schema as a serializable dict
         """
         if not self._schema:
-            try:
-                self._schema = Swagger(self).as_dict()
-            except Exception:
-                # Log the source exception for debugging purpose
-                # and return an error message
-                msg = "Unable to render schema"
-                log.exception(msg)  # This will provide a full traceback
-                return {"error": msg}
+            # Guard schema initialization to avoid concurrent construction on first access
+            with self._schema_lock:
+                if not self._schema:
+                    try:
+                        self._schema = Swagger(self).as_dict()
+                    except Exception:
+                        # Log the source exception for debugging purpose
+                        # and return an error message
+                        msg = "Unable to render schema"
+                        log.exception(msg)  # This will provide a full traceback
+                        return {"error": msg}
         return self._schema
 
     @property
@@ -825,7 +830,44 @@ def payload(self):
     @property
     def refresolver(self):
         if not self._refresolver:
-            self._refresolver = RefResolver.from_schema(self.__schema__)
+            # Create a registry that can resolve references within our schema
+            registry = Registry()
+            schema = self.__schema__
+
+            # If schema has definitions, register it
+            if "definitions" in schema:
+                schema_id = schema.get("$id", "http://localhost/schema.json")
+                registry = registry.with_resource(schema_id, schema)
+            else:
+                # If no definitions in schema, register all models individually
+                for name, model in self.models.items():
+                    model_schema = model.__schema__
+                    # Add $id to the model schema so it can be referenced
+                    if "$id" not in model_schema:
+                        model_schema = model_schema.copy()
+                        model_schema["$id"] = (
+                            f"http://localhost/schema.json#/definitions/{name}"
+                        )
+                    registry = registry.with_resource(
+                        f"http://localhost/schema.json#/definitions/{name}",
+                        model_schema,
+                    )
+
+                # Also register the root schema with definitions
+                if self.models:
+                    definitions = {}
+                    for name, model in self.models.items():
+                        definitions[name] = model.__schema__
+
+                    schema_with_definitions = {
+                        "$id": "http://localhost/schema.json",
+                        "definitions": definitions,
+                    }
+                    registry = registry.with_resource(
+                        "http://localhost/schema.json", schema_with_definitions
+                    )
+
+            self._refresolver = registry
         return self._refresolver
 
     @staticmethod
@@ -861,7 +903,7 @@ def _blueprint_setup_add_url_rule_patch(
             "%s.%s" % (blueprint_setup.blueprint.name, endpoint),
             view_func,
             defaults=defaults,
-            **options
+            **options,
         )
 
     def _deferred_blueprint_init(self, setup_state):
diff --git a/libs/flask_restx/fields.py b/libs/flask_restx/fields.py
index 97957f7f6a..4484ef51f4 100644
--- a/libs/flask_restx/fields.py
+++ b/libs/flask_restx/fields.py
@@ -134,6 +134,9 @@ class Raw(object):
     :param bool readonly: Is the field read only ? (for documentation purpose)
     :param example: An optional data example (for documentation purpose)
     :param callable mask: An optional mask function to be applied to output
+    :param bool nullable: Whether the field accepts null values in input
+        validation. When True, the generated JSON Schema will allow null
+        values for this field during request payload validation.
     """
 
     #: The JSON/Swagger schema type
@@ -153,6 +156,7 @@ def __init__(
         readonly=None,
         example=None,
         mask=None,
+        nullable=None,
         **kwargs
     ):
         self.attribute = attribute
@@ -163,6 +167,7 @@ def __init__(
         self.readonly = readonly
         self.example = example if example is not None else self.__schema_example__
         self.mask = mask
+        self.nullable = nullable
 
     def format(self, value):
         """
@@ -284,6 +289,19 @@ def schema(self):
             schema["allOf"] = allOf
         else:
             schema["$ref"] = ref
+
+        # If nullable is True, wrap using anyOf to permit nulls for input validation
+        if self.nullable:
+            # Remove structural keys that conflict with anyOf composition
+            for key in ("$ref", "allOf", "type", "items"):
+                schema.pop(key, None)
+            # Create anyOf with the original schema and null type
+            anyOf = [{"$ref": ref}]
+            if self.as_list:
+                anyOf = [{"type": "array", "items": {"$ref": ref}}]
+            anyOf.append({"type": "null"})
+            schema["anyOf"] = anyOf
+
         return schema
 
     def clone(self, mask=None):
@@ -333,9 +351,11 @@ def is_attr(val):
         return [
             self.container.output(
                 idx,
-                val
-                if (isinstance(val, dict) or is_attr(val)) and not is_nested
-                else value,
+                (
+                    val
+                    if (isinstance(val, dict) or is_attr(val)) and not is_nested
+                    else value
+                ),
             )
             for idx, val in enumerate(value)
         ]
diff --git a/libs/flask_restx/inputs.py b/libs/flask_restx/inputs.py
index 912ae1640c..e800a74979 100644
--- a/libs/flask_restx/inputs.py
+++ b/libs/flask_restx/inputs.py
@@ -19,16 +19,15 @@ def my_type(value):
 import re
 import socket
 
-from datetime import datetime, time, timedelta
+from datetime import datetime, time, timedelta, timezone
 from email.utils import parsedate_tz, mktime_tz
 from urllib.parse import urlparse
 
 import aniso8601
-import pytz
 
 # Constants for upgrading date-based intervals to full datetimes.
-START_OF_DAY = time(0, 0, 0, tzinfo=pytz.UTC)
-END_OF_DAY = time(23, 59, 59, 999999, tzinfo=pytz.UTC)
+START_OF_DAY = time(0, 0, 0, tzinfo=timezone.utc)
+END_OF_DAY = time(23, 59, 59, 999999, tzinfo=timezone.utc)
 
 
 netloc_regex = re.compile(
@@ -338,11 +337,11 @@ def _normalize_interval(start, end, value):
         end = datetime.combine(end, START_OF_DAY)
 
     if start.tzinfo is None:
-        start = pytz.UTC.localize(start)
-        end = pytz.UTC.localize(end)
+        start = start.replace(tzinfo=timezone.utc)
+        end = end.replace(tzinfo=timezone.utc)
     else:
-        start = start.astimezone(pytz.UTC)
-        end = end.astimezone(pytz.UTC)
+        start = start.astimezone(timezone.utc)
+        end = end.astimezone(timezone.utc)
 
     return start, end
 
@@ -424,11 +423,11 @@ def iso8601interval(value, argument="argument"):
 
         start, end = _normalize_interval(start, end, value)
 
-    except ValueError:
+    except ValueError as e:
         msg = (
             "Invalid {arg}: {value}. {arg} must be a valid ISO8601 date/time interval."
         )
-        raise ValueError(msg.format(arg=argument, value=value))
+        raise ValueError(msg.format(arg=argument, value=value)) from e
 
     return start, end
 
@@ -559,9 +558,9 @@ def datetime_from_rfc822(value):
         timetuple = parsedate_tz(value)
         timestamp = mktime_tz(timetuple)
         if timetuple[-1] is None:
-            return datetime.fromtimestamp(timestamp).replace(tzinfo=pytz.utc)
+            return datetime.fromtimestamp(timestamp).replace(tzinfo=timezone.utc)
         else:
-            return datetime.fromtimestamp(timestamp, pytz.utc)
+            return datetime.fromtimestamp(timestamp, timezone.utc)
     except Exception:
         raise ValueError('Invalid date literal "{0}"'.format(raw))
 
diff --git a/libs/flask_restx/marshalling.py b/libs/flask_restx/marshalling.py
index 6648f66ffb..df4bbecfc3 100644
--- a/libs/flask_restx/marshalling.py
+++ b/libs/flask_restx/marshalling.py
@@ -171,9 +171,11 @@ def __format_field(key, val):
         return (key, value)
 
     items = (
-        (k, marshal(data, v, skip_none=skip_none, ordered=ordered))
-        if isinstance(v, dict)
-        else __format_field(k, v)
+        (
+            (k, marshal(data, v, skip_none=skip_none, ordered=ordered))
+            if isinstance(v, dict)
+            else __format_field(k, v)
+        )
         for k, v in fields.items()
     )
 
diff --git a/libs/flask_restx/model.py b/libs/flask_restx/model.py
index dea43c6a1b..b72496cf1b 100644
--- a/libs/flask_restx/model.py
+++ b/libs/flask_restx/model.py
@@ -11,6 +11,7 @@
 from .errors import abort
 
 from jsonschema import Draft4Validator
+from jsonschema.validators import validator_for
 from jsonschema.exceptions import ValidationError
 
 from .utils import not_none
@@ -89,9 +90,48 @@ def inherit(cls, name, *parents):
         return model
 
     def validate(self, data, resolver=None, format_checker=None):
-        validator = Draft4Validator(
-            self.__schema__, resolver=resolver, format_checker=format_checker
-        )
+        # For backward compatibility, resolver can be either a RefResolver or a Registry
+        if resolver is not None and hasattr(resolver, "resolve"):
+            # Old RefResolver - convert to registry
+            registry = None
+            validator = Draft4Validator(
+                self.__schema__, resolver=resolver, format_checker=format_checker
+            )
+        else:
+            # New Registry or None
+            # If we have a registry, we need to create a schema that includes definitions
+            schema_to_validate = self.__schema__
+            if resolver is not None:
+                # Check if the schema has $ref that need to be resolved
+                import json
+
+                schema_str = json.dumps(self.__schema__)
+                if '"$ref"' in schema_str:
+                    # Create a schema with inline definitions from the registry
+                    definitions = {}
+                    for uri in resolver:
+                        resource = resolver[uri]
+                        if isinstance(resource, dict) and "definitions" in resource:
+                            definitions.update(resource["definitions"])
+
+                    if definitions:
+                        # Create a new schema that includes the definitions
+                        schema_to_validate = {
+                            "$id": "http://localhost/schema.json",
+                            "definitions": definitions,
+                            **self.__schema__,
+                        }
+
+            ValidatorClass = validator_for(schema_to_validate)
+            if resolver is not None:
+                validator = ValidatorClass(
+                    schema_to_validate, registry=resolver, format_checker=format_checker
+                )
+            else:
+                validator = ValidatorClass(
+                    schema_to_validate, format_checker=format_checker
+                )
+
         try:
             validator.validate(data)
         except ValidationError:
diff --git a/libs/flask_restx/namespace.py b/libs/flask_restx/namespace.py
index 86b4b3378e..6d55fabeff 100644
--- a/libs/flask_restx/namespace.py
+++ b/libs/flask_restx/namespace.py
@@ -253,9 +253,11 @@ def marshal_with(
         def wrapper(func):
             doc = {
                 "responses": {
-                    str(code): (description, [fields], kwargs)
-                    if as_list
-                    else (description, fields, kwargs)
+                    str(code): (
+                        (description, [fields], kwargs)
+                        if as_list
+                        else (description, fields, kwargs)
+                    )
                 },
                 "__mask__": kwargs.get(
                     "mask", True
diff --git a/libs/flask_restx/schemas/__init__.py b/libs/flask_restx/schemas/__init__.py
index 27b98660f6..84e4db17ee 100644
--- a/libs/flask_restx/schemas/__init__.py
+++ b/libs/flask_restx/schemas/__init__.py
@@ -4,6 +4,7 @@
 
 .. versionadded:: 0.12.1
 """
+
 import io
 import json
 
diff --git a/libs/dnspython-2.6.1.dist-info/INSTALLER b/libs/flask_socketio-5.6.1.dist-info/INSTALLER
similarity index 100%
rename from libs/dnspython-2.6.1.dist-info/INSTALLER
rename to libs/flask_socketio-5.6.1.dist-info/INSTALLER
diff --git a/libs/flask_socketio-5.6.1.dist-info/METADATA b/libs/flask_socketio-5.6.1.dist-info/METADATA
new file mode 100644
index 0000000000..e34ddf374f
--- /dev/null
+++ b/libs/flask_socketio-5.6.1.dist-info/METADATA
@@ -0,0 +1,80 @@
+Metadata-Version: 2.4
+Name: Flask-SocketIO
+Version: 5.6.1
+Summary: Socket.IO integration for Flask applications
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+Project-URL: Homepage, https://github.com/miguelgrinberg/flask-socketio
+Project-URL: Bug Tracker, https://github.com/miguelgrinberg/flask-socketio/issues
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: blinker
+Requires-Dist: click
+Requires-Dist: flask
+Requires-Dist: Flask>=2.1.0
+Requires-Dist: jinja2
+Requires-Dist: python-socketio>=5.12.0
+Requires-Dist: werkzeug
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Provides-Extra: dev
+Requires-Dist: flask-login; extra == "dev"
+Requires-Dist: flask-session; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: redis; extra == "dev"
+Requires-Dist: tox; extra == "dev"
+Dynamic: license-file
+
+Flask-SocketIO
+==============
+
+[![Build status](https://github.com/miguelgrinberg/flask-socketio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/Flask-SocketIO/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/flask-socketio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/flask-socketio)
+
+Socket.IO integration for Flask applications.
+
+Installation
+------------
+
+You can install this package as usual with pip:
+
+    pip install flask-socketio
+
+Example
+-------
+
+```py
+from flask import Flask, render_template
+from flask_socketio import SocketIO, emit
+    
+app = Flask(__name__)
+app.config['SECRET_KEY'] = 'secret!'
+socketio = SocketIO(app)
+
+@app.route('/')
+def index():
+    return render_template('index.html')
+
+@socketio.event
+def my_event(message):
+    emit('my response', {'data': 'got it!'})
+
+if __name__ == '__main__':
+    socketio.run(app)
+```
+
+Resources
+---------
+
+- [Tutorial](http://blog.miguelgrinberg.com/post/easy-websockets-with-flask-and-gevent)
+- [Documentation](http://flask-socketio.readthedocs.io/en/latest/)
+- [PyPI](https://pypi.python.org/pypi/Flask-SocketIO)
+- [Change Log](https://github.com/miguelgrinberg/Flask-SocketIO/blob/main/CHANGES.md)
+- Questions? See the [questions](https://stackoverflow.com/questions/tagged/flask-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+flask-socketio+python-socketio) your own question.
+
diff --git a/libs/flask_socketio-5.6.1.dist-info/RECORD b/libs/flask_socketio-5.6.1.dist-info/RECORD
new file mode 100644
index 0000000000..c16953e961
--- /dev/null
+++ b/libs/flask_socketio-5.6.1.dist-info/RECORD
@@ -0,0 +1,10 @@
+flask_socketio-5.6.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+flask_socketio-5.6.1.dist-info/METADATA,sha256=UxUoj5w97Okq7Da_t5eNKjqKPePH8742sKIKz7sApz4,2650
+flask_socketio-5.6.1.dist-info/RECORD,,
+flask_socketio-5.6.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flask_socketio-5.6.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+flask_socketio-5.6.1.dist-info/licenses/LICENSE,sha256=aNCWbkgKjS_T1cJtACyZbvCM36KxWnfQ0LWTuavuYKQ,1082
+flask_socketio-5.6.1.dist-info/top_level.txt,sha256=C1ugzQBJ3HHUJsWGzyt70XRVOX-y4CUAR8MWKjwJOQ8,15
+flask_socketio/__init__.py,sha256=jM_b0DUuMVqujMJDqknjaUgAOagdgGlbNILdAX4rKuw,56423
+flask_socketio/namespace.py,sha256=UkVryJvFYgnCMKWSF35GVfGdyh2cXRDyRbfmEPPchVA,2329
+flask_socketio/test_client.py,sha256=pyvjNemWok8WuvEMDu8KYxc0U5Hdyvek4_vbxKsLCdU,11348
diff --git a/libs/dogpile.cache-1.3.3.dist-info/REQUESTED b/libs/flask_socketio-5.6.1.dist-info/REQUESTED
similarity index 100%
rename from libs/dogpile.cache-1.3.3.dist-info/REQUESTED
rename to libs/flask_socketio-5.6.1.dist-info/REQUESTED
diff --git a/libs/flask_socketio-5.6.1.dist-info/WHEEL b/libs/flask_socketio-5.6.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/flask_socketio-5.6.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/LICENSE b/libs/flask_socketio-5.6.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/Flask_SocketIO-5.5.1.dist-info/LICENSE
rename to libs/flask_socketio-5.6.1.dist-info/licenses/LICENSE
diff --git a/libs/Flask_SocketIO-5.5.1.dist-info/top_level.txt b/libs/flask_socketio-5.6.1.dist-info/top_level.txt
similarity index 100%
rename from libs/Flask_SocketIO-5.5.1.dist-info/top_level.txt
rename to libs/flask_socketio-5.6.1.dist-info/top_level.txt
diff --git a/libs/flask_socketio/__init__.py b/libs/flask_socketio/__init__.py
index 219f30cd6b..eeee6e247e 100644
--- a/libs/flask_socketio/__init__.py
+++ b/libs/flask_socketio/__init__.py
@@ -84,18 +84,23 @@ class SocketIO:
     :param client_manager: The client manager instance that will manage the
                            client list. When this is omitted, the client list
                            is stored in an in-memory structure, so the use of
-                           multiple connected servers is not possible. In most
-                           cases, this argument does not need to be set
-                           explicitly.
+                           multiple connected servers is not possible.
     :param logger: To enable logging set to ``True`` or pass a logger object to
                    use. To disable logging set to ``False``. The default is
-                   ``False``. Note that fatal errors will be logged even when
+                   ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param serializer: The serialization method to use when transmitting
+                       packets. Valid values are ``'default'``, ``'pickle'``,
+                       ``'msgpack'`` and ``'cbor'``. Alternatively, a subclass
+                       of the :class:`Packet` class with custom implementations
+                       of the ``encode()`` and ``decode()`` methods can be
+                       provided. Client and server must use compatible
+                       serializers.
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions. To use the same json encoder and decoder as a Flask
-                 application, use ``flask.json``.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, event handlers for a client are
                            executed in separate threads. To run handlers for a
                            client synchronously, set to ``False``. The default
@@ -110,17 +115,22 @@ class SocketIO:
                            connect handler and your client is confused when it
                            receives events before the connection acceptance.
                            In any other case use the default of ``False``.
+    :param namespaces: a list of namespaces that are accepted, in addition to
+                       any namespaces for which handlers have been defined. The
+                       default is `['/']`, which always accepts connections to
+                       the default namespace. Set to `'*'` to accept all
+                       namespaces.
 
     The Engine.IO server configuration supports the following settings:
 
     :param async_mode: The asynchronous model to use. See the Deployment
                        section in the documentation for a description of the
-                       available options. Valid async modes are ``threading``,
-                       ``eventlet``, ``gevent`` and ``gevent_uwsgi``. If this
-                       argument is not given, ``eventlet`` is tried first, then
-                       ``gevent_uwsgi``, then ``gevent``, and finally
-                       ``threading``. The first async mode that has all its
-                       dependencies installed is then one that is chosen.
+                       available options. Valid async modes are "threading",
+                       "eventlet", "gevent" and "gevent_uwsgi". If this
+                       argument is not given, "eventlet" is tried first, then
+                       "gevent_uwsgi", then "gevent", and finally "threading".
+                       The first async mode that has all its dependencies
+                       installed is the one that is chosen.
     :param ping_interval: The interval in seconds at which the server pings
                           the client. The default is 25 seconds. For advanced
                           control, a two element tuple can be given, where
@@ -128,10 +138,12 @@ class SocketIO:
                           is a grace period added by the server.
     :param ping_timeout: The time in seconds that the client waits for the
                          server to respond before disconnecting. The default
-                         is 5 seconds.
-    :param max_http_buffer_size: The maximum size of a message when using the
-                                 polling transport. The default is 1,000,000
-                                 bytes.
+                         is 20 seconds.
+    :param max_http_buffer_size: The maximum size that is accepted for incoming
+                                 messages.  The default is 1,000,000 bytes. In
+                                 spite of its name, the value set in this
+                                 argument is enforced for HTTP long-polling and
+                                 WebSocket connections.
     :param allow_upgrades: Whether to allow transport upgrades or not. The
                            default is ``True``.
     :param http_compression: Whether to compress packages when using the
@@ -140,7 +152,7 @@ class SocketIO:
                                   is greater than this value. The default is
                                   1024 bytes.
     :param cookie: If set to a string, it is the name of the HTTP cookie the
-                   server sends back to the client containing the client
+                   server sends back tot he client containing the client
                    session id. If set to a dictionary, the ``'name'`` key
                    contains the cookie name and other keys define cookie
                    attributes, where the value of each attribute can be a
@@ -150,15 +162,18 @@ class SocketIO:
     :param cors_allowed_origins: Origin or list of origins that are allowed to
                                  connect to this server. Only the same origin
                                  is allowed by default. Set this argument to
-                                 ``'*'`` to allow all origins, or to ``[]`` to
-                                 disable CORS handling.
+                                 ``'*'`` or ``['*']`` to allow all origins, or
+                                 to ``[]`` to disable CORS handling.
     :param cors_credentials: Whether credentials (cookies, authentication) are
-                             allowed in requests to this server. The default is
-                             ``True``.
+                             allowed in requests to this server. The default
+                             is ``True``.
     :param monitor_clients: If set to ``True``, a background task will ensure
                             inactive clients are closed. Set to ``False`` to
                             disable the monitoring task (not recommended). The
                             default is ``True``.
+    :param transports: The list of allowed transports. Valid transports
+                       are ``'polling'`` and ``'websocket'``. Defaults to
+                       ``['polling', 'websocket']``.
     :param engineio_logger: To enable Engine.IO logging set to ``True`` or pass
                             a logger object to use. To disable logging set to
                             ``False``. The default is ``False``. Note that
@@ -278,7 +293,6 @@ def handle_my_custom_event(json):
         def decorator(handler):
             @wraps(handler)
             def _handler(sid, *args):
-                nonlocal namespace
                 real_ns = namespace
                 if namespace == '*':
                     real_ns = sid
@@ -807,13 +821,22 @@ def _handle_event(self, handler, message, namespace, sid, *args):
                     environ['saved_session'] = _ManagedSession(flask.session)
                 session_obj = environ['saved_session']
                 if hasattr(flask, 'globals') and \
-                        hasattr(flask.globals, 'request_ctx'):
-                    # update session for Flask >= 2.2
-                    ctx = flask.globals.request_ctx._get_current_object()
+                        hasattr(flask.globals, 'app_ctx'):
+                    if hasattr(flask.globals.app_ctx, 'session'):
+                        # get context for flask >= 3.2
+                        ctx = flask.globals.app_ctx._get_current_object()
+                    else:
+                        # get context for Flask >= 2.2, < 3.2
+                        ctx = flask.globals.request_ctx._get_current_object()
                 else:  # pragma: no cover
-                    # update session for Flask < 2.2
+                    # get context for Flask < 2.2
                     ctx = flask._request_ctx_stack.top
-                ctx.session = session_obj
+                if hasattr(ctx, '_session'):
+                    # update session for Flask >= 3.1.3
+                    ctx._session = session_obj
+                else:
+                    # update session for Flask < 3.1.3
+                    ctx.session = session_obj
             else:
                 # let Flask handle the user session
                 # for cookie based sessions, this effectively freezes the
diff --git a/libs/flask_socketio/test_client.py b/libs/flask_socketio/test_client.py
index 312bac1d32..f1ac44188c 100644
--- a/libs/flask_socketio/test_client.py
+++ b/libs/flask_socketio/test_client.py
@@ -2,7 +2,7 @@
 
 from socketio import packet
 from socketio.pubsub_manager import PubSubManager
-from werkzeug.test import EnvironBuilder
+from flask.testing import EnvironBuilder
 
 
 class SocketIOTestClient:
@@ -128,8 +128,16 @@ def connect(self, namespace=None, query_string=None, headers=None,
             if query_string[0] != '?':
                 query_string = '?' + query_string
             url += query_string
-        environ = EnvironBuilder(url, headers=headers).get_environ()
+        if self.flask_test_client:
+            # let Flask's test client build an environ dictionary
+            req = self.flask_test_client._request_from_builder_args(
+                args=(), kwargs={'path': url, 'headers': headers})
+            environ = req.environ
+        else:
+            environ = EnvironBuilder(
+                self.app, path=url, headers=headers).get_environ()
         environ['flask.app'] = self.app
+
         if self.flask_test_client:
             # inject cookies from Flask
             if hasattr(self.flask_test_client, '_add_cookies_to_wsgi'):
diff --git a/libs/flask_sqlalchemy-3.1.1.dist-info/METADATA b/libs/flask_sqlalchemy-3.1.1.dist-info/METADATA
index 92f239cd94..61230e3821 100644
--- a/libs/flask_sqlalchemy-3.1.1.dist-info/METADATA
+++ b/libs/flask_sqlalchemy-3.1.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: Flask-SQLAlchemy
 Version: 3.1.1
 Summary: Add SQLAlchemy support to your Flask application.
@@ -12,6 +12,7 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+License-File: LICENSE.rst
 Requires-Dist: flask>=2.2.5
 Requires-Dist: sqlalchemy>=2.0.16
 Project-URL: Changes, https://flask-sqlalchemy.palletsprojects.com/changes/
diff --git a/libs/flask_sqlalchemy-3.1.1.dist-info/RECORD b/libs/flask_sqlalchemy-3.1.1.dist-info/RECORD
index 8644833cad..896ac0f092 100644
--- a/libs/flask_sqlalchemy-3.1.1.dist-info/RECORD
+++ b/libs/flask_sqlalchemy-3.1.1.dist-info/RECORD
@@ -1,9 +1,9 @@
 flask_sqlalchemy-3.1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-flask_sqlalchemy-3.1.1.dist-info/LICENSE.rst,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
-flask_sqlalchemy-3.1.1.dist-info/METADATA,sha256=lBxR1akBt7n9XBjIVTL2OV52OhCfFrb-Mqtoe0DCbR8,3432
+flask_sqlalchemy-3.1.1.dist-info/METADATA,sha256=b5E6EZXv0xSAfQYsvu8GoerzijMK9DNllxOQ5KA_sug,3458
 flask_sqlalchemy-3.1.1.dist-info/RECORD,,
 flask_sqlalchemy-3.1.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flask_sqlalchemy-3.1.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+flask_sqlalchemy-3.1.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+flask_sqlalchemy-3.1.1.dist-info/licenses/LICENSE.rst,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
 flask_sqlalchemy/__init__.py,sha256=he_w4qQQVS2Z1ms5GCTptDTXNOXBXw0n8zSuWCp8n6Y,653
 flask_sqlalchemy/cli.py,sha256=pg3QDxP36GW2qnwe_CpPtkRhPchyVSGM6zlBNWuNCFE,484
 flask_sqlalchemy/extension.py,sha256=71tP_kNtb5VgZdafy_OH1sWdZOA6PaT7cJqX7tKgZ-k,38261
diff --git a/libs/flask_sqlalchemy-3.1.1.dist-info/WHEEL b/libs/flask_sqlalchemy-3.1.1.dist-info/WHEEL
index 3b5e64b5e6..d8b9936dad 100644
--- a/libs/flask_sqlalchemy-3.1.1.dist-info/WHEEL
+++ b/libs/flask_sqlalchemy-3.1.1.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/MarkupSafe-2.1.5.dist-info/LICENSE.rst b/libs/flask_sqlalchemy-3.1.1.dist-info/licenses/LICENSE.rst
similarity index 100%
rename from libs/MarkupSafe-2.1.5.dist-info/LICENSE.rst
rename to libs/flask_sqlalchemy-3.1.1.dist-info/licenses/LICENSE.rst
diff --git a/libs/ftfy-6.2.3.dist-info/METADATA b/libs/ftfy-6.2.3.dist-info/METADATA
deleted file mode 100644
index 013f2c36cc..0000000000
--- a/libs/ftfy-6.2.3.dist-info/METADATA
+++ /dev/null
@@ -1,165 +0,0 @@
-Metadata-Version: 2.1
-Name: ftfy
-Version: 6.2.3
-Summary: Fixes mojibake and other problems with Unicode, after the fact
-Home-page: https://ftfy.readthedocs.io/en/latest/
-License: Apache-2.0
-Author: Robyn Speer
-Author-email: rspeer@arborelia.net
-Requires-Python: >=3.8.1,<4
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: wcwidth (>=0.2.12,<0.3.0)
-Project-URL: Changelog, https://github.com/rspeer/python-ftfy/blob/main/CHANGELOG.md
-Project-URL: Cohost, https://cohost.org/arborelia
-Project-URL: Documentation, https://ftfy.readthedocs.io/en/latest/
-Project-URL: Issues, https://github.com/rspeer/python-ftfy/issues/
-Project-URL: Repository, https://github.com/rspeer/python-ftfy
-Description-Content-Type: text/markdown
-
-# ftfy: fixes text for you
-
-[![PyPI package](https://badge.fury.io/py/ftfy.svg)](https://badge.fury.io/py/ftfy)
-[![Docs](https://readthedocs.org/projects/ftfy/badge/?version=latest)](https://ftfy.readthedocs.org/en/latest/)
-
-```python
-
->>> from ftfy import fix_encoding
->>> print(fix_encoding("(ร ยธโ€ก'รขล’ยฃ')ร ยธโ€ก"))
-(เธ‡'โŒฃ')เธ‡
-
-```
-
-The full documentation of ftfy is available at [ftfy.readthedocs.org](https://ftfy.readthedocs.org). The documentation covers a lot more than this README, so here are
-some links into it:
-
-- [Fixing problems and getting explanations](https://ftfy.readthedocs.io/en/latest/explain.html)
-- [Configuring ftfy](https://ftfy.readthedocs.io/en/latest/config.html)
-- [Encodings ftfy can handle](https://ftfy.readthedocs.io/en/latest/encodings.html)
-- [โ€œFixerโ€ functions](https://ftfy.readthedocs.io/en/latest/fixes.html)
-- [Is ftfy an encoding detector?](https://ftfy.readthedocs.io/en/latest/detect.html)
-- [Heuristics for detecting mojibake](https://ftfy.readthedocs.io/en/latest/heuristic.html)
-- [Support for โ€œbadโ€ encodings](https://ftfy.readthedocs.io/en/latest/bad_encodings.html)
-- [Command-line usage](https://ftfy.readthedocs.io/en/latest/cli.html)
-- [Citing ftfy](https://ftfy.readthedocs.io/en/latest/cite.html)
-
-## Testimonials
-
-- โ€œMy life is livable again!โ€
-  โ€” [@planarrowspace](https://twitter.com/planarrowspace)
-- โ€œA handy piece of magicโ€
-  โ€” [@simonw](https://twitter.com/simonw)
-- โ€œSaved me a large amount of frustrating dev workโ€
-  โ€” [@iancal](https://twitter.com/iancal)
-- โ€œftfy did the right thing right away, with no faffing about. Excellent work, solving a very tricky real-world (whole-world!) problem.โ€
-  โ€” Brennan Young
-- โ€œI have no idea when Iโ€™m gonna need this, but Iโ€™m definitely bookmarking it.โ€
-  โ€” [/u/ocrow](https://reddit.com/u/ocrow)
-- โ€œ9.2/10โ€
-  โ€” [pylint](https://bitbucket.org/logilab/pylint/)
-
-## What it does
-
-Here are some examples (found in the real world) of what ftfy can do:
-
-ftfy can fix mojibake (encoding mix-ups), by detecting patterns of characters that were clearly meant to be UTF-8 but were decoded as something else:
-
-    >>> import ftfy
-    >>> ftfy.fix_text('รขล“โ€ No problems')
-    'โœ” No problems'
-
-Does this sound impossible? It's really not. UTF-8 is a well-designed encoding that makes it obvious when it's being misused, and a string of mojibake usually contains all the information we need to recover the original string.
-
-ftfy can fix multiple layers of mojibake simultaneously:
-
-    >>> ftfy.fix_text('The Mona Lisa doesnรƒฦ’ร‚ยขรƒยขรขโ‚ฌลกร‚ยฌรƒยขรขโ‚ฌลพร‚ยขt have eyebrows.')
-    "The Mona Lisa doesn't have eyebrows."
-
-It can fix mojibake that has had "curly quotes" applied on top of it, which cannot be consistently decoded until the quotes are uncurled:
-
-    >>> ftfy.fix_text("lโ€™humanitรƒยฉ")
-    "l'humanitรฉ"
-
-ftfy can fix mojibake that would have included the character U+A0 (non-breaking space), but the U+A0 was turned into an ASCII space and then combined with another following space:
-
-    >>> ftfy.fix_text('รƒ\xa0 perturber la rรƒยฉflexion')
-    'ร  perturber la rรฉflexion'
-    >>> ftfy.fix_text('รƒ perturber la rรƒยฉflexion')
-    'ร  perturber la rรฉflexion'
-
-ftfy can also decode HTML entities that appear outside of HTML, even in cases where the entity has been incorrectly capitalized:
-
-    >>> # by the HTML 5 standard, only 'P&Eacute;REZ' is acceptable
-    >>> ftfy.fix_text('P&EACUTE;REZ')
-    'Pร‰REZ'
-  
-These fixes are not applied in all cases, because ftfy has a strongly-held goal of avoiding false positives -- it should never change correctly-decoded text to something else.
-
-The following text could be encoded in Windows-1252 and decoded in UTF-8, and it would decode as 'MARQUษ…'. However, the original text is already sensible, so it is unchanged.
-
-    >>> ftfy.fix_text('IL Y MARQUร‰โ€ฆ')
-    'IL Y MARQUร‰โ€ฆ'
-
-## Installing
-
-ftfy is a Python 3 package that can be installed using `pip`:
-
-    pip install ftfy
-
-(Or use `pip3 install ftfy` on systems where Python 2 and 3 are both globally installed and `pip` refers to Python 2.)
-
-If you use `poetry`, you can use ftfy as a dependency in the usual way (such as `poetry add ftfy`).
-
-### Local development
-
-ftfy is developed using `poetry`. Its `setup.py` is vestigial and is not the recommended way to install it.
-
-[Install Poetry](https://python-poetry.org/docs/master/#installing-with-the-official-installer), check out this repository, and run `poetry install` to install ftfy for local development, such as experimenting with the heuristic or running tests.
-
-## Who maintains ftfy?
-
-I'm Robyn Speer, also known as Elia Robyn Lake. You can find me
-[on GitHub](https://github.com/rspeer) or [Cohost](https://cohost.org/arborelia).
-
-## Citing ftfy
-
-ftfy has been used as a crucial data processing step in major NLP research.
-
-It's important to give credit appropriately to everyone whose work you build on in research. This includes software, not just high-status contributions such as mathematical models. All I ask when you use ftfy for research is that you cite it.
-
-ftfy has a citable record [on Zenodo](https://zenodo.org/record/2591652).
-A citation of ftfy may look like this:
-
-    Robyn Speer. (2019). ftfy (Version 5.5). Zenodo.
-    http://doi.org/10.5281/zenodo.2591652
-
-In BibTeX format, the citation is::
-
-    @misc{speer-2019-ftfy,
-      author       = {Robyn Speer},
-      title        = {ftfy},
-      note         = {Version 5.5},
-      year         = 2019,
-      howpublished = {Zenodo},
-      doi          = {10.5281/zenodo.2591652},
-      url          = {https://doi.org/10.5281/zenodo.2591652}
-    }
-
-## Important license clarifications
-
-If you do not follow ftfy's license, you do not have a license to ftfy.
-
-This sounds obvious and tautological, but there are people who think open source licenses mean that they can just do what they want, especially in the field of generative AI. It's a permissive license but you still have to follow it. The [Apache license](https://www.apache.org/licenses/LICENSE-2.0) is the only thing that gives you permission to use and copy ftfy; otherwise, all rights are reserved.
-
-If you use or distribute ftfy, you must follow the terms of the [Apache license](https://www.apache.org/licenses/LICENSE-2.0), including that you must attribute the author of ftfy (Robyn Speer) correctly.
-
-You _may not_ make a derived work of ftfy that obscures its authorship, such as by putting its code in an AI training dataset, including the code in AI training at runtime, or using a generative AI that copies code from such a dataset.
-
-At my discretion, I may notify you of a license violation, and give you a chance to either remedy it or delete all copies of ftfy in your possession.
-
-
diff --git a/libs/ftfy-6.2.3.dist-info/RECORD b/libs/ftfy-6.2.3.dist-info/RECORD
deleted file mode 100644
index 991af898c0..0000000000
--- a/libs/ftfy-6.2.3.dist-info/RECORD
+++ /dev/null
@@ -1,18 +0,0 @@
-../../bin/ftfy,sha256=RiqPO-DVZ0PjvYA-L6_heE5XGXpqCUH_cuFkg3x_Nro,230
-ftfy-6.2.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-ftfy-6.2.3.dist-info/LICENSE.txt,sha256=oL_FAgvC4eggVRoGJccMlfqomMFec3EA_0iAqhAZeFc,552
-ftfy-6.2.3.dist-info/METADATA,sha256=hAdQ7jdqJ5bO9CmRbjnu6eNI3NvjYnHD70TgvMlSzBg,7821
-ftfy-6.2.3.dist-info/RECORD,,
-ftfy-6.2.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ftfy-6.2.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-ftfy-6.2.3.dist-info/entry_points.txt,sha256=N8flv0M3Cdg0X56vlUPd7R_CdvTG76C8pKhrDS9Ysug,38
-ftfy/__init__.py,sha256=aQ1aDlnMRmAXh73MQ6N5zaQyjRuiTiTpHqn_5dp1pbU,29669
-ftfy/bad_codecs/__init__.py,sha256=leOXAQMXM0FCRi-Q2SujbgHv3WqaWAmpUCCSLYBACUg,3288
-ftfy/bad_codecs/sloppy.py,sha256=kLlM9uqoC2xQYDQf9CJfentPGRzE__bkWQ_zzd3Fkgs,6905
-ftfy/bad_codecs/utf8_variants.py,sha256=ZWQXXiZCw40qg6MFSTLRtcJpiPpGZYMrxhkFz9-hLX4,10015
-ftfy/badness.py,sha256=r0t9crAjTizKzuTij8yD3_8keOGp9MySAYNgEMzbdaE,14353
-ftfy/chardata.py,sha256=-Dp2VDodc2FN95fYvZflv8fBSpjgzMDHSeqH5TFfj-4,12028
-ftfy/cli.py,sha256=CqRTXQt7PfaEb0AGQLYNXNq-TZSOW-xNbIXhUgELLEg,4186
-ftfy/fixes.py,sha256=t7FM-Vn8N3WRcud_tK9GSu4PZkagSvNWzwufcl2JQI4,18239
-ftfy/formatting.py,sha256=pbmBunYydgPs3bxMhCXFtaTM0_3qT_yp6esZvjvOKZk,5882
-ftfy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/ftfy-6.2.3.dist-info/WHEEL b/libs/ftfy-6.2.3.dist-info/WHEEL
deleted file mode 100644
index 8b9b3a1bf3..0000000000
--- a/libs/ftfy-6.2.3.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/ftfy-6.2.3.dist-info/entry_points.txt b/libs/ftfy-6.2.3.dist-info/entry_points.txt
deleted file mode 100644
index 5bb7dea16d..0000000000
--- a/libs/ftfy-6.2.3.dist-info/entry_points.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[console_scripts]
-ftfy=ftfy.cli:main
-
diff --git a/libs/dogpile.cache-1.3.3.dist-info/INSTALLER b/libs/ftfy-6.3.1.dist-info/INSTALLER
similarity index 100%
rename from libs/dogpile.cache-1.3.3.dist-info/INSTALLER
rename to libs/ftfy-6.3.1.dist-info/INSTALLER
diff --git a/libs/ftfy-6.3.1.dist-info/METADATA b/libs/ftfy-6.3.1.dist-info/METADATA
new file mode 100644
index 0000000000..15d33b9c16
--- /dev/null
+++ b/libs/ftfy-6.3.1.dist-info/METADATA
@@ -0,0 +1,151 @@
+Metadata-Version: 2.4
+Name: ftfy
+Version: 6.3.1
+Summary: Fixes mojibake and other problems with Unicode, after the fact
+Project-URL: Homepage, https://ftfy.readthedocs.io/en/latest/
+Project-URL: Documentation, https://ftfy.readthedocs.io/en/latest/
+Project-URL: Repository, https://github.com/rspeer/python-ftfy
+Project-URL: Issues, https://github.com/rspeer/python-ftfy/issues/
+Project-URL: Changelog, https://github.com/rspeer/python-ftfy/blob/main/CHANGELOG.md
+Project-URL: Blog, https://posts.arborelia.net
+Author-email: Robyn Speer <rspeer@arborelia.net>
+License: Apache-2.0
+License-File: LICENSE.txt
+Requires-Python: >=3.9
+Requires-Dist: wcwidth
+Description-Content-Type: text/markdown
+
+# ftfy: fixes text for you
+
+[![PyPI package](https://badge.fury.io/py/ftfy.svg)](https://badge.fury.io/py/ftfy)
+[![Docs](https://readthedocs.org/projects/ftfy/badge/?version=latest)](https://ftfy.readthedocs.org/en/latest/)
+
+```python
+
+>>> from ftfy import fix_encoding
+>>> print(fix_encoding("(ร ยธโ€ก'รขล’ยฃ')ร ยธโ€ก"))
+(เธ‡'โŒฃ')เธ‡
+
+```
+
+The full documentation of ftfy is available at [ftfy.readthedocs.org](https://ftfy.readthedocs.org). The documentation covers a lot more than this README, so here are some links into it:
+
+- [Fixing problems and getting explanations](https://ftfy.readthedocs.io/en/latest/explain.html)
+- [Configuring ftfy](https://ftfy.readthedocs.io/en/latest/config.html)
+- [Encodings ftfy can handle](https://ftfy.readthedocs.io/en/latest/encodings.html)
+- [โ€œFixerโ€ functions](https://ftfy.readthedocs.io/en/latest/fixes.html)
+- [Is ftfy an encoding detector?](https://ftfy.readthedocs.io/en/latest/detect.html)
+- [Heuristics for detecting mojibake](https://ftfy.readthedocs.io/en/latest/heuristic.html)
+- [Support for โ€œbadโ€ encodings](https://ftfy.readthedocs.io/en/latest/bad_encodings.html)
+- [Command-line usage](https://ftfy.readthedocs.io/en/latest/cli.html)
+- [Citing ftfy](https://ftfy.readthedocs.io/en/latest/cite.html)
+
+## Testimonials
+
+- โ€œMy life is livable again!โ€
+  โ€” [@planarrowspace](https://twitter.com/planarrowspace)
+- โ€œA handy piece of magicโ€
+  โ€” [@simonw](https://twitter.com/simonw)
+- โ€œSaved me a large amount of frustrating dev workโ€
+  โ€” [@iancal](https://twitter.com/iancal)
+- โ€œftfy did the right thing right away, with no faffing about. Excellent work, solving a very tricky real-world (whole-world!) problem.โ€
+  โ€” Brennan Young
+- โ€œI have no idea when Iโ€™m gonna need this, but Iโ€™m definitely bookmarking it.โ€
+  โ€” [/u/ocrow](https://reddit.com/u/ocrow)
+
+## What it does
+
+Here are some examples (found in the real world) of what ftfy can do:
+
+ftfy can fix mojibake (encoding mix-ups), by detecting patterns of characters that were clearly meant to be UTF-8 but were decoded as something else:
+
+    >>> import ftfy
+    >>> ftfy.fix_text('รขล“โ€ No problems')
+    'โœ” No problems'
+
+Does this sound impossible? It's really not. UTF-8 is a well-designed encoding that makes it obvious when it's being misused, and a string of mojibake usually contains all the information we need to recover the original string.
+
+ftfy can fix multiple layers of mojibake simultaneously:
+
+    >>> ftfy.fix_text('The Mona Lisa doesnรƒฦ’ร‚ยขรƒยขรขโ‚ฌลกร‚ยฌรƒยขรขโ‚ฌลพร‚ยขt have eyebrows.')
+    "The Mona Lisa doesn't have eyebrows."
+
+It can fix mojibake that has had "curly quotes" applied on top of it, which cannot be consistently decoded until the quotes are uncurled:
+
+    >>> ftfy.fix_text("lโ€™humanitรƒยฉ")
+    "l'humanitรฉ"
+
+ftfy can fix mojibake that would have included the character U+A0 (non-breaking space), but the U+A0 was turned into an ASCII space and then combined with another following space:
+
+    >>> ftfy.fix_text('รƒ\xa0 perturber la rรƒยฉflexion')
+    'ร  perturber la rรฉflexion'
+    >>> ftfy.fix_text('รƒ perturber la rรƒยฉflexion')
+    'ร  perturber la rรฉflexion'
+
+ftfy can also decode HTML entities that appear outside of HTML, even in cases where the entity has been incorrectly capitalized:
+
+    >>> # by the HTML 5 standard, only 'P&Eacute;REZ' is acceptable
+    >>> ftfy.fix_text('P&EACUTE;REZ')
+    'Pร‰REZ'
+  
+These fixes are not applied in all cases, because ftfy has a strongly-held goal of avoiding false positives -- it should never change correctly-decoded text to something else.
+
+The following text could be encoded in Windows-1252 and decoded in UTF-8, and it would decode as 'MARQUษ…'. However, the original text is already sensible, so it is unchanged.
+
+    >>> ftfy.fix_text('IL Y MARQUร‰โ€ฆ')
+    'IL Y MARQUร‰โ€ฆ'
+
+## Installing
+
+ftfy is a Python 3 package that can be installed using `pip` or `uv pip`:
+
+    pip install ftfy
+
+(Or use `pip3 install ftfy` on systems where Python 2 and 3 are both globally installed and `pip` refers to Python 2.)
+
+If you use `poetry`, you can use ftfy as a dependency in the usual way (such as `poetry add ftfy`).
+
+### Local development
+
+ftfy is developed using [uv](https://github.com/astral-sh/uv). You can build a virtual environment with its local dependencies by running `uv venv`, and test it with `uv run pytest`.
+
+## Who maintains ftfy?
+
+I'm Robyn Speer, also known as Elia Robyn Lake. You can find my projects
+[on GitHub](https://github.com/rspeer) and my posts on [my own blog](https://posts.arborelia.net).
+
+## Citing ftfy
+
+ftfy has been used as a crucial data processing step in major NLP research.
+
+It's important to give credit appropriately to everyone whose work you build on in research. This includes software, not just high-status contributions such as mathematical models. All I ask when you use ftfy for research is that you cite it.
+
+ftfy has a citable record [on Zenodo](https://zenodo.org/record/2591652). A citation of ftfy may look like this:
+
+    Robyn Speer. (2019). ftfy (Version 5.5). Zenodo.
+    http://doi.org/10.5281/zenodo.2591652
+
+In BibTeX format, the citation is::
+
+    @misc{speer-2019-ftfy,
+      author       = {Robyn Speer},
+      title        = {ftfy},
+      note         = {Version 5.5},
+      year         = 2019,
+      howpublished = {Zenodo},
+      doi          = {10.5281/zenodo.2591652},
+      url          = {https://doi.org/10.5281/zenodo.2591652}
+    }
+
+## Important license clarifications
+
+If you do not follow ftfy's license, you do not have a license to ftfy.
+
+This sounds obvious and tautological, but there are people who think open source licenses mean that they can just do what they want, especially in the field of generative AI. It's a permissive license but you still have to follow it. The [Apache license](https://www.apache.org/licenses/LICENSE-2.0) is the only thing that gives you permission to use and copy ftfy; otherwise, all rights are reserved.
+
+If you use or distribute ftfy, you must follow the terms of the [Apache license](https://www.apache.org/licenses/LICENSE-2.0), including that you must attribute the author of ftfy (Robyn Speer) correctly.
+
+You _may not_ make a derived work of ftfy that obscures its authorship, such as by putting its code in an AI training dataset, including the code in AI training at runtime, or using a generative AI that copies code from such a dataset.
+
+At my discretion, I may notify you of a license violation, and give you a chance to either remedy it or delete all copies of ftfy in your possession.
+
diff --git a/libs/ftfy-6.3.1.dist-info/RECORD b/libs/ftfy-6.3.1.dist-info/RECORD
new file mode 100644
index 0000000000..bda9a79e78
--- /dev/null
+++ b/libs/ftfy-6.3.1.dist-info/RECORD
@@ -0,0 +1,18 @@
+../../bin/ftfy,sha256=xUCCC3M8UPA_Kqu0PaWkrOzTWWfy5e1MAWhLJUzvW90,183
+ftfy-6.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+ftfy-6.3.1.dist-info/METADATA,sha256=uaa43UP5IREeSxdPi7z54SapftsRP-0nc3s6cHr_pBo,7257
+ftfy-6.3.1.dist-info/RECORD,,
+ftfy-6.3.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ftfy-6.3.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ftfy-6.3.1.dist-info/entry_points.txt,sha256=sy4Ei29IqZhQRgYFC17GVrT1JkE6l1-ooJheKulSqO8,39
+ftfy-6.3.1.dist-info/licenses/LICENSE.txt,sha256=oL_FAgvC4eggVRoGJccMlfqomMFec3EA_0iAqhAZeFc,552
+ftfy/__init__.py,sha256=ekX6ZbJnR3UxmgWwpM2_0Eoizn82ukCYQRv57Bsiyzw,29593
+ftfy/bad_codecs/__init__.py,sha256=sPKWae974vjc3JeOsGhZ8ZFNUoPTISx988zBbxJ7SIQ,3282
+ftfy/bad_codecs/sloppy.py,sha256=bzgoZAQIrzRUxb-qJmDVX6_Eh2l143IqstdFFFayTII,6814
+ftfy/bad_codecs/utf8_variants.py,sha256=WlyMbOtUFftePEj_SpxDTXirPAj8HcuxVZ1aSYApVh0,9964
+ftfy/badness.py,sha256=jOR-ucAfX6LTjmUP4EdHS95VN766WXG3IsprQHnfb9M,15561
+ftfy/chardata.py,sha256=tAXqrX2Y3zBslAZoj6tFBy-Yn-_-UwF1uszvKN7cVck,34911
+ftfy/cli.py,sha256=q9DNi4LuhKGrleoH_Z3aB6J0oST34a2WWatap7Odr7s,4137
+ftfy/fixes.py,sha256=G8XQKzMlcsw4aPhRrQgcwAMcxqatf7EDmNaOrsY-C6U,18233
+ftfy/formatting.py,sha256=pbmBunYydgPs3bxMhCXFtaTM0_3qT_yp6esZvjvOKZk,5882
+ftfy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/dynaconf-3.2.6.dist-info/REQUESTED b/libs/ftfy-6.3.1.dist-info/REQUESTED
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/REQUESTED
rename to libs/ftfy-6.3.1.dist-info/REQUESTED
diff --git a/libs/ftfy-6.3.1.dist-info/WHEEL b/libs/ftfy-6.3.1.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/ftfy-6.3.1.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/ftfy-6.3.1.dist-info/entry_points.txt b/libs/ftfy-6.3.1.dist-info/entry_points.txt
new file mode 100644
index 0000000000..99476a44fd
--- /dev/null
+++ b/libs/ftfy-6.3.1.dist-info/entry_points.txt
@@ -0,0 +1,2 @@
+[console_scripts]
+ftfy = ftfy.cli:main
diff --git a/libs/ftfy-6.2.3.dist-info/LICENSE.txt b/libs/ftfy-6.3.1.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/ftfy-6.2.3.dist-info/LICENSE.txt
rename to libs/ftfy-6.3.1.dist-info/licenses/LICENSE.txt
diff --git a/libs/ftfy/__init__.py b/libs/ftfy/__init__.py
index 6b97b58597..cc0a12049e 100644
--- a/libs/ftfy/__init__.py
+++ b/libs/ftfy/__init__.py
@@ -9,19 +9,14 @@
 
 import unicodedata
 import warnings
+from collections.abc import Iterator
 from typing import (
     Any,
     BinaryIO,
     Callable,
-    Dict,
-    Iterator,
-    List,
     Literal,
     NamedTuple,
-    Optional,
     TextIO,
-    Tuple,
-    Union,
     cast,
 )
 
@@ -29,7 +24,7 @@
 from ftfy.badness import is_bad
 from ftfy.formatting import display_ljust
 
-__version__ = "6.2.3"
+__version__ = "6.3.1"
 
 
 # Though this function does nothing, it lets linters know that we're using
@@ -73,11 +68,11 @@ class ExplainedText(NamedTuple):
     """
 
     text: str
-    explanation: Optional[List[ExplanationStep]]
+    explanation: list[ExplanationStep] | None
 
 
 # Functions that can be applied using `apply_plan`.
-FIXERS: Dict[str, Callable] = {  # type: ignore[type-arg]
+FIXERS: dict[str, Callable] = {  # type: ignore[type-arg]
     "unescape_html": fixes.unescape_html,
     "remove_terminal_escapes": fixes.remove_terminal_escapes,
     "restore_byte_a0": fixes.restore_byte_a0,
@@ -214,7 +209,7 @@ class TextFixerConfig(NamedTuple):
       will automatically set `explain` to False.
     """
 
-    unescape_html: Union[str, bool] = "auto"
+    unescape_html: str | bool = "auto"
     remove_terminal_escapes: bool = True
     fix_encoding: bool = True
     restore_byte_a0: bool = True
@@ -227,13 +222,13 @@ class TextFixerConfig(NamedTuple):
     fix_line_breaks: bool = True
     fix_surrogates: bool = True
     remove_control_chars: bool = True
-    normalization: Optional[Literal["NFC", "NFD", "NFKC", "NFKD"]] = "NFC"
+    normalization: Literal["NFC", "NFD", "NFKC", "NFKD"] | None = "NFC"
     max_decode_length: int = 1000000
     explain: bool = True
 
 
 def _config_from_kwargs(
-    config: TextFixerConfig, kwargs: Dict[str, Any]
+    config: TextFixerConfig, kwargs: dict[str, Any]
 ) -> TextFixerConfig:
     """
     Handle parameters provided as keyword arguments to ftfy's top-level
@@ -276,7 +271,7 @@ def _try_fix(
     fixer_name: str,
     text: str,
     config: TextFixerConfig,
-    steps: Optional[List[ExplanationStep]],
+    steps: list[ExplanationStep] | None,
 ) -> str:
     """
     A helper function used across several 'fixer' steps, deciding whether to
@@ -292,7 +287,7 @@ def _try_fix(
     return text
 
 
-def fix_text(text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any) -> str:
+def fix_text(text: str, config: TextFixerConfig | None = None, **kwargs: Any) -> str:
     r"""
     Given Unicode text as input, fix inconsistencies and glitches in it,
     such as mojibake (text that was decoded in the wrong encoding).
@@ -367,7 +362,7 @@ def fix_text(text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any)
 
 
 def fix_and_explain(
-    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
+    text: str, config: TextFixerConfig | None = None, **kwargs: Any
 ) -> ExplainedText:
     """
     Fix text as a single segment, returning the fixed text and an explanation
@@ -386,7 +381,7 @@ def fix_and_explain(
         config = config._replace(unescape_html=False)
 
     if config.explain:
-        steps: Optional[List[ExplanationStep]] = []
+        steps: list[ExplanationStep] | None = []
     else:
         # If explanations aren't desired, `steps` will be None
         steps = None
@@ -427,7 +422,7 @@ def fix_and_explain(
 
 
 def fix_encoding_and_explain(
-    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
+    text: str, config: TextFixerConfig | None = None, **kwargs: Any
 ) -> ExplainedText:
     """
     Apply the steps of ftfy that detect mojibake and fix it. Returns the fixed
@@ -460,7 +455,7 @@ def fix_encoding_and_explain(
         # fixing the encoding
         return ExplainedText(text, [])
 
-    plan_so_far: List[ExplanationStep] = []
+    plan_so_far: list[ExplanationStep] = []
     while True:
         prevtext = text
         text, plan = _fix_encoding_one_step_and_explain(text, config)
@@ -589,7 +584,7 @@ def _fix_encoding_one_step_and_explain(
 
 
 def fix_encoding(
-    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
+    text: str, config: TextFixerConfig | None = None, **kwargs: Any
 ) -> str:
     """
     Apply just the encoding-fixing steps of ftfy to this text. Returns the
@@ -612,7 +607,7 @@ def fix_encoding(
 
 
 def fix_text_segment(
-    text: str, config: Optional[TextFixerConfig] = None, **kwargs: Any
+    text: str, config: TextFixerConfig | None = None, **kwargs: Any
 ) -> str:
     """
     Fix text as a single segment, with a consistent sequence of steps that
@@ -627,8 +622,8 @@ def fix_text_segment(
 
 def fix_file(
     input_file: TextIO | BinaryIO,
-    encoding: Optional[str] = None,
-    config: Optional[TextFixerConfig] = None,
+    encoding: str | None = None,
+    config: TextFixerConfig | None = None,
     **kwargs: Any,
 ) -> Iterator[str]:
     """
@@ -658,7 +653,7 @@ def fix_file(
         yield fixed_line
 
 
-def guess_bytes(bstring: bytes) -> Tuple[str, str]:
+def guess_bytes(bstring: bytes) -> tuple[str, str]:
     """
     NOTE: Using `guess_bytes` is not the recommended way of using ftfy. ftfy
     is not designed to be an encoding detector.
@@ -729,7 +724,7 @@ def guess_bytes(bstring: bytes) -> Tuple[str, str]:
     return bstring.decode("sloppy-windows-1252"), "sloppy-windows-1252"
 
 
-def apply_plan(text: str, plan: List[Tuple[str, str]]) -> str:
+def apply_plan(text: str, plan: list[tuple[str, str]]) -> str:
     """
     Apply a plan for fixing the encoding of text.
 
@@ -763,9 +758,9 @@ def apply_plan(text: str, plan: List[Tuple[str, str]]) -> str:
             if encoding in FIXERS:
                 obj = FIXERS[encoding](obj)
             else:
-                raise ValueError("Unknown function to apply: %s" % encoding)
+                raise ValueError(f"Unknown function to apply: {encoding}")
         else:
-            raise ValueError("Unknown plan step: %s" % operation)
+            raise ValueError(f"Unknown plan step: {operation}")
 
     return obj
 
diff --git a/libs/ftfy/bad_codecs/__init__.py b/libs/ftfy/bad_codecs/__init__.py
index bb71136abe..a449a38ed1 100644
--- a/libs/ftfy/bad_codecs/__init__.py
+++ b/libs/ftfy/bad_codecs/__init__.py
@@ -32,9 +32,9 @@
 
 import codecs
 from encodings import normalize_encoding
-from typing import Dict, Optional
+from typing import Optional
 
-_CACHE: Dict[str, codecs.CodecInfo] = {}
+_CACHE: dict[str, codecs.CodecInfo] = {}
 
 # Define some aliases for 'utf-8-variants'. All hyphens get turned into
 # underscores, because of `normalize_encoding`.
diff --git a/libs/ftfy/bad_codecs/sloppy.py b/libs/ftfy/bad_codecs/sloppy.py
index 6f63b1e8d6..656f01cf26 100644
--- a/libs/ftfy/bad_codecs/sloppy.py
+++ b/libs/ftfy/bad_codecs/sloppy.py
@@ -76,7 +76,6 @@
 
 import codecs
 from encodings import normalize_encoding
-from typing import Optional, Tuple
 
 REPLACEMENT_CHAR = "\ufffd"
 
@@ -121,14 +120,10 @@ def make_sloppy_codec(encoding: str) -> codecs.CodecInfo:
     # `encodings.cp1252` for comparison; this is almost exactly the same,
     # except I made it follow pep8.
     class Codec(codecs.Codec):
-        def encode(
-            self, input: str, errors: Optional[str] = "strict"
-        ) -> Tuple[bytes, int]:
+        def encode(self, input: str, errors: str | None = "strict") -> tuple[bytes, int]:
             return codecs.charmap_encode(input, errors, encoding_table)
 
-        def decode(
-            self, input: bytes, errors: Optional[str] = "strict"
-        ) -> Tuple[str, int]:
+        def decode(self, input: bytes, errors: str | None = "strict") -> tuple[str, int]:
             return codecs.charmap_decode(input, errors, decoding_table)  # type: ignore[arg-type]
 
     class IncrementalEncoder(codecs.IncrementalEncoder):
@@ -160,9 +155,9 @@ class StreamReader(Codec, codecs.StreamReader):
 # can be used by the main module of ftfy.bad_codecs.
 CODECS = {}
 INCOMPLETE_ENCODINGS = (
-    ["windows-%s" % num for num in range(1250, 1259)]
-    + ["iso-8859-%s" % num for num in (3, 6, 7, 8, 11)]
-    + ["cp%s" % num for num in range(1250, 1259)]
+    [f"windows-{num}" for num in range(1250, 1259)]
+    + [f"iso-8859-{num}" for num in (3, 6, 7, 8, 11)]
+    + [f"cp{num}" for num in range(1250, 1259)]
     + ["cp874"]
 )
 
diff --git a/libs/ftfy/bad_codecs/utf8_variants.py b/libs/ftfy/bad_codecs/utf8_variants.py
index 28366a548c..c15a3cf184 100644
--- a/libs/ftfy/bad_codecs/utf8_variants.py
+++ b/libs/ftfy/bad_codecs/utf8_variants.py
@@ -47,7 +47,7 @@
 from encodings.utf_8 import (
     IncrementalEncoder as UTF8IncrementalEncoder,
 )
-from typing import Callable, Optional, Tuple
+from typing import Callable, Optional
 
 NAME = "utf-8-variants"
 
@@ -95,7 +95,7 @@ class IncrementalDecoder(UTF8IncrementalDecoder):
     @staticmethod
     def _buffer_decode(  # type: ignore[override]
         input: bytes, errors: Optional[str], final: bool
-    ) -> Tuple[str, int]:
+    ) -> tuple[str, int]:
         """
         Decode bytes that may be arriving in a stream, following the Codecs
         API.
@@ -137,9 +137,7 @@ def _buffer_decode(  # type: ignore[override]
         return "".join(decoded_segments), position
 
     @staticmethod
-    def _buffer_decode_step(
-        input: bytes, errors: Optional[str], final: bool
-    ) -> Tuple[str, int]:
+    def _buffer_decode_step(input: bytes, errors: Optional[str], final: bool) -> tuple[str, int]:
         """
         There are three possibilities for each decoding step:
 
@@ -178,17 +176,15 @@ def _buffer_decode_step(
                     return "", 0
         else:
             # Decode a possible six-byte sequence starting with 0xed.
-            return IncrementalDecoder._buffer_decode_surrogates(
-                sup, input, errors, final
-            )
+            return IncrementalDecoder._buffer_decode_surrogates(sup, input, errors, final)
 
     @staticmethod
     def _buffer_decode_surrogates(
-        sup: Callable[[bytes, Optional[str], bool], Tuple[str, int]],
+        sup: Callable[[bytes, Optional[str], bool], tuple[str, int]],
         input: bytes,
         errors: Optional[str],
         final: bool,
-    ) -> Tuple[str, int]:
+    ) -> tuple[str, int]:
         """
         When we have improperly encoded surrogates, we can still see the
         bits that they were meant to represent.
@@ -239,13 +235,13 @@ def _buffer_decode_surrogates(
 
 class StreamWriter(codecs.StreamWriter):
     @staticmethod
-    def encode(input: str, errors: str = "strict") -> Tuple[bytes, int]:
+    def encode(input: str, errors: str = "strict") -> tuple[bytes, int]:
         return IncrementalEncoder(errors).encode(input, final=True), len(input)
 
 
 class StreamReader(codecs.StreamReader):
     @staticmethod
-    def decode(input: bytes, errors: str = "strict") -> Tuple[str, int]:
+    def decode(input: bytes, errors: str = "strict") -> tuple[str, int]:
         return IncrementalDecoder(errors).decode(input, final=True), len(input)
 
 
diff --git a/libs/ftfy/badness.py b/libs/ftfy/badness.py
index 81c52744da..38ec1f44c4 100644
--- a/libs/ftfy/badness.py
+++ b/libs/ftfy/badness.py
@@ -16,7 +16,7 @@
 import re
 
 
-# There are only 403 characters that occur in known UTF-8 mojibake, and we can
+# There are only a few hundred characters that occur in known UTF-8 mojibake, and we can
 # characterize them:
 
 MOJIBAKE_CATEGORIES = {
@@ -42,8 +42,6 @@
         "\N{DIAERESIS}"
         "\N{NOT SIGN}"
         "\N{MACRON}"
-        "\N{PILCROW SIGN}"
-        "\N{SECTION SIGN}"
         "\N{CEDILLA}"
         "\N{LATIN SMALL LETTER F WITH HOOK}"
         "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}"  # it's not a modifier
@@ -62,6 +60,11 @@
         "\N{FEMININE ORDINAL INDICATOR}"
         "\N{MASCULINE ORDINAL INDICATOR}"
     ),
+    # Characters used in legalese
+    "law": (
+        "\N{PILCROW SIGN}"
+        "\N{SECTION SIGN}"
+    ),
     "currency": (
         "\N{CENT SIGN}"
         "\N{POUND SIGN}"
@@ -132,6 +135,9 @@
         "รฒ-รถ"
         "รธ-รผ"
         "\N{LATIN CAPITAL LETTER O WITH DOUBLE ACUTE}"
+        "\N{LATIN CAPITAL LETTER O WITH MACRON}"
+        "\N{LATIN CAPITAL LETTER U WITH MACRON}"
+        "\N{LATIN CAPITAL LETTER U WITH OGONEK}"
         "\N{DEGREE SIGN}"
     ),
     "upper_accented": (
@@ -143,6 +149,7 @@
         "\N{LATIN CAPITAL LETTER U WITH DIAERESIS}"
         "\N{LATIN CAPITAL LETTER Y WITH ACUTE}"
         "\N{LATIN CAPITAL LETTER A WITH BREVE}"
+        "\N{LATIN CAPITAL LETTER A WITH MACRON}"
         "\N{LATIN CAPITAL LETTER A WITH OGONEK}"
         "\N{LATIN CAPITAL LETTER C WITH ACUTE}"
         "\N{LATIN CAPITAL LETTER C WITH CARON}"
@@ -150,13 +157,20 @@
         "\N{LATIN CAPITAL LETTER D WITH STROKE}"
         "\N{LATIN CAPITAL LETTER E WITH OGONEK}"
         "\N{LATIN CAPITAL LETTER E WITH CARON}"
+        "\N{LATIN CAPITAL LETTER E WITH MACRON}"
+        "\N{LATIN CAPITAL LETTER E WITH DOT ABOVE}"
         "\N{LATIN CAPITAL LETTER G WITH BREVE}"
+        "\N{LATIN CAPITAL LETTER G WITH CEDILLA}"
         "\N{LATIN CAPITAL LETTER I WITH DOT ABOVE}"
+        "\N{LATIN CAPITAL LETTER I WITH MACRON}"
+        "\N{LATIN CAPITAL LETTER K WITH CEDILLA}"
         "\N{LATIN CAPITAL LETTER L WITH ACUTE}"
         "\N{LATIN CAPITAL LETTER L WITH CARON}"
         "\N{LATIN CAPITAL LETTER L WITH STROKE}"
+        "\N{LATIN CAPITAL LETTER L WITH CEDILLA}"
         "\N{LATIN CAPITAL LETTER N WITH ACUTE}"
         "\N{LATIN CAPITAL LETTER N WITH CARON}"
+        "\N{LATIN CAPITAL LETTER N WITH CEDILLA}"
         "\N{LATIN CAPITAL LIGATURE OE}"
         "\N{LATIN CAPITAL LETTER R WITH CARON}"
         "\N{LATIN CAPITAL LETTER S WITH ACUTE}"
@@ -179,16 +193,24 @@
         # skip o's and u's that could be used in kaomoji
         "\N{LATIN SMALL LETTER A WITH BREVE}"
         "\N{LATIN SMALL LETTER A WITH OGONEK}"
+        "\N{LATIN SMALL LETTER A WITH MACRON}"
         "\N{LATIN SMALL LETTER C WITH ACUTE}"
         "\N{LATIN SMALL LETTER C WITH CARON}"
         "\N{LATIN SMALL LETTER D WITH CARON}"
         "\N{LATIN SMALL LETTER D WITH STROKE}"
         "\N{LATIN SMALL LETTER E WITH OGONEK}"
         "\N{LATIN SMALL LETTER E WITH CARON}"
+        "\N{LATIN SMALL LETTER E WITH MACRON}"
+        "\N{LATIN SMALL LETTER E WITH DOT ABOVE}"
         "\N{LATIN SMALL LETTER G WITH BREVE}"
+        "\N{LATIN SMALL LETTER G WITH CEDILLA}"
+        "\N{LATIN SMALL LETTER I WITH OGONEK}"
+        "\N{LATIN SMALL LETTER I WITH MACRON}"
+        "\N{LATIN SMALL LETTER K WITH CEDILLA}"
         "\N{LATIN SMALL LETTER L WITH ACUTE}"
         "\N{LATIN SMALL LETTER L WITH CARON}"
         "\N{LATIN SMALL LETTER L WITH STROKE}"
+        "\N{LATIN SMALL LETTER L WITH CEDILLA}"
         "\N{LATIN SMALL LIGATURE OE}"
         "\N{LATIN SMALL LETTER R WITH ACUTE}"
         "\N{LATIN SMALL LETTER S WITH ACUTE}"
@@ -253,11 +275,11 @@
     r"""
     [{c1}]
     |
-    [{bad}{lower_accented}{upper_accented}{box}{start_punctuation}{end_punctuation}{currency}{numeric}] [{bad}]
+    [{bad}{lower_accented}{upper_accented}{box}{start_punctuation}{end_punctuation}{currency}{numeric}{law}] [{bad}]
     |
     [a-zA-Z] [{lower_common}{upper_common}] [{bad}]
     |
-    [{bad}] [{lower_accented}{upper_accented}{box}{start_punctuation}{end_punctuation}{currency}{numeric}]
+    [{bad}] [{lower_accented}{upper_accented}{box}{start_punctuation}{end_punctuation}{currency}{numeric}{law}]
     |
     [{lower_accented}{lower_common}{box}{end_punctuation}{currency}{numeric}] [{upper_accented}]
     |
@@ -267,11 +289,11 @@
     |
     \s [{upper_accented}] [{currency}]
     |
-    [{upper_accented}{box}] [{numeric}]
+    [{upper_accented}{box}] [{numeric}{law}]
     |
     [{lower_accented}{upper_accented}{box}{currency}{end_punctuation}] [{start_punctuation}] [{numeric}]
     |
-    [{lower_accented}{upper_accented}{currency}{numeric}{box}] [{end_punctuation}] [{start_punctuation}]
+    [{lower_accented}{upper_accented}{currency}{numeric}{box}{law}] [{end_punctuation}] [{start_punctuation}]
     |
     [{currency}{numeric}{box}] [{start_punctuation}]
     |
@@ -279,19 +301,23 @@
     |
     [{box}] [{kaomoji}]
     |
-    [{lower_accented}{upper_accented}{currency}{numeric}{start_punctuation}{end_punctuation}] [{box}]
+    [{lower_accented}{upper_accented}{currency}{numeric}{start_punctuation}{end_punctuation}{law}] [{box}]
     |
     [{box}] [{end_punctuation}]
     |
-    [{lower_accented}{upper_accented}] [{end_punctuation}] \w
+    [{lower_accented}{upper_accented}] [{start_punctuation}{end_punctuation}] \w
     |
 
     # The ligature ล“ when not followed by an unaccented Latin letter
     [ล’ล“][^A-Za-z]
     |
 
+    # Degree signs after capital letters
+    [{upper_accented}]ยฐ
+    |
+
     # Common Windows-1252 2-character mojibake that isn't covered by the cases above
-    [ร‚รƒรŽร][โ‚ฌล ลกยขยฃลธลพ\xa0\xadยฎยฉยฐยทยป{start_punctuation}{end_punctuation}โ€“โ€”ยด]
+    [ร‚รƒรŽร][โ‚ฌล“ล ลกยขยฃลธลพ\xa0\xadยฎยฉยฐยทยป{start_punctuation}{end_punctuation}โ€“โ€”ยด]
     |
     ร— [ยฒยณ]
     |
@@ -350,7 +376,13 @@
 
     # Windows-1253 mojibake of Latin-1 characters and/or the Greek alphabet
     [ฮ’ฮ“ฮžฮŸ][{c1}{bad}{start_punctuation}{end_punctuation}{currency}ยฐ][ฮ’ฮ“ฮžฮŸ]
-""".format(**MOJIBAKE_CATEGORIES),
+    |
+
+    # Windows-1257 mojibake of characters in the U+2000 range
+    ฤโ‚ฌ
+    """.format(
+        **MOJIBAKE_CATEGORIES
+    ),
     re.VERBOSE,
 )
 
diff --git a/libs/ftfy/chardata.py b/libs/ftfy/chardata.py
index 2e0e82a81f..afcc767157 100644
--- a/libs/ftfy/chardata.py
+++ b/libs/ftfy/chardata.py
@@ -9,7 +9,6 @@
 import itertools
 import re
 import unicodedata
-from typing import Dict
 
 # These are the encodings we will try to fix in ftfy, in the
 # order that they should be tried.
@@ -20,6 +19,7 @@
     "sloppy-windows-1250",
     "sloppy-windows-1253",
     "sloppy-windows-1254",
+    "sloppy-windows-1257",
     "iso-8859-2",
     "macroman",
     "cp437",
@@ -29,7 +29,7 @@
 DOUBLE_QUOTE_RE = re.compile("[\u201c-\u201f]")
 
 
-def _build_regexes() -> Dict[str, re.Pattern[str]]:
+def _build_regexes() -> dict[str, re.Pattern[str]]:
     """
     ENCODING_REGEXES contain reasonably fast ways to detect if we
     could represent a given string in a given encoding. The simplest one is
@@ -51,7 +51,7 @@ def _build_regexes() -> Dict[str, re.Pattern[str]]:
         # support, so we can just include them as ranges. This also lets us
         # not worry about escaping regex special characters, because all of
         # them are in the \x1B to \x7F range.
-        regex = "^[\x00-\x19\x1b-\x7f{0}]*$".format(charlist)
+        regex = f"^[\x00-\x19\x1b-\x7f{charlist}]*$"
         encoding_regexes[encoding] = re.compile(regex)
     return encoding_regexes
 
@@ -59,7 +59,7 @@ def _build_regexes() -> Dict[str, re.Pattern[str]]:
 ENCODING_REGEXES = _build_regexes()
 
 
-def _build_html_entities() -> Dict[str, str]:
+def _build_html_entities() -> dict[str, str]:
     entities = {}
     # Create a dictionary based on the built-in HTML5 entity dictionary.
     # Add a limited set of HTML entities that we'll also decode if they've
@@ -94,13 +94,13 @@ def possible_encoding(text: str, encoding: str) -> bool:
     return bool(ENCODING_REGEXES[encoding].match(text))
 
 
-def _build_control_char_mapping() -> Dict[int, None]:
+def _build_control_char_mapping() -> dict[int, None]:
     """
     Build a translate mapping that strips likely-unintended control characters.
     See :func:`ftfy.fixes.remove_control_chars` for a description of these
     codepoint ranges and why they should be removed.
     """
-    control_chars: Dict[int, None] = {}
+    control_chars: dict[int, None] = {}
 
     for i in itertools.chain(
         range(0x00, 0x09),
@@ -230,7 +230,7 @@ def _build_control_char_mapping() -> Dict[int, None]:
 }
 
 
-def _build_width_map() -> Dict[int, str]:
+def _build_width_map() -> dict[int, str]:
     """
     Build a translate mapping that replaces halfwidth and fullwidth forms
     with their standard-width forms.
@@ -252,34 +252,410 @@ def _build_width_map() -> Dict[int, str]:
 
 # Character classes that help us pinpoint embedded mojibake. These can
 # include common characters, because we'll also check them for 'badness'.
-UTF8_CLUES = {
+#
+# Though they go on for many lines, the members of this dictionary are
+# single concatenated strings.
+#
+# This code is generated using scripts/char_data_table.py.
+UTF8_CLUES: dict[str, str] = {
     # Letters that decode to 0xC2 - 0xDF in a Latin-1-like encoding
     "utf8_first_of_2": (
-        "ร‚รƒร„ร…ร†ร‡รˆร‰รŠร‹รŒรรŽรรร‘ร’ร“ร”ร•ร–ร—ร˜ร™รšร›รœรรžรŸฤ‚ฤ†ฤŒฤŽฤฤ˜ฤšฤžฤฐฤนลƒล‡ลล˜ลžลขลฎลฐ"
-        "ฮ’ฮ“ฮ”ฮ•ฮ–ฮ—ฮ˜ฮ™ฮšฮ›ฮœฮฮžฮŸฮ ฮกฮฃฮคฮฅฮฆฮงฮจฮฉฮชฮซฮฌฮญฮฎฮฏะ’ะ“ะ”ะ•ะ–ะ—ะ˜ะ™ะšะ›ะœะะžะŸะ ะกะขะฃะคะฅะฆะงะจะฉะชะซะฌะญะฎะฏ"
+        "\N{LATIN CAPITAL LETTER A WITH BREVE}"  # windows-1250:C3
+        "\N{LATIN CAPITAL LETTER A WITH CIRCUMFLEX}"  # latin-1:C2
+        "\N{LATIN CAPITAL LETTER A WITH DIAERESIS}"  # latin-1:C4
+        "\N{LATIN CAPITAL LETTER A WITH MACRON}"  # windows-1257:C2
+        "\N{LATIN CAPITAL LETTER A WITH RING ABOVE}"  # latin-1:C5
+        "\N{LATIN CAPITAL LETTER A WITH TILDE}"  # latin-1:C3
+        "\N{LATIN CAPITAL LETTER AE}"  # latin-1:C6
+        "\N{LATIN CAPITAL LETTER C WITH ACUTE}"  # windows-1250:C6
+        "\N{LATIN CAPITAL LETTER C WITH CARON}"  # windows-1250:C8
+        "\N{LATIN CAPITAL LETTER C WITH CEDILLA}"  # latin-1:C7
+        "\N{LATIN CAPITAL LETTER D WITH CARON}"  # windows-1250:CF
+        "\N{LATIN CAPITAL LETTER D WITH STROKE}"  # windows-1250:D0
+        "\N{LATIN CAPITAL LETTER E WITH ACUTE}"  # latin-1:C9
+        "\N{LATIN CAPITAL LETTER E WITH CARON}"  # windows-1250:CC
+        "\N{LATIN CAPITAL LETTER E WITH CIRCUMFLEX}"  # latin-1:CA
+        "\N{LATIN CAPITAL LETTER E WITH DIAERESIS}"  # latin-1:CB
+        "\N{LATIN CAPITAL LETTER E WITH DOT ABOVE}"  # windows-1257:CB
+        "\N{LATIN CAPITAL LETTER E WITH GRAVE}"  # latin-1:C8
+        "\N{LATIN CAPITAL LETTER E WITH MACRON}"  # windows-1257:C7
+        "\N{LATIN CAPITAL LETTER E WITH OGONEK}"  # windows-1250:CA
+        "\N{LATIN CAPITAL LETTER ETH}"  # latin-1:D0
+        "\N{LATIN CAPITAL LETTER G WITH BREVE}"  # windows-1254:D0
+        "\N{LATIN CAPITAL LETTER G WITH CEDILLA}"  # windows-1257:CC
+        "\N{LATIN CAPITAL LETTER I WITH ACUTE}"  # latin-1:CD
+        "\N{LATIN CAPITAL LETTER I WITH CIRCUMFLEX}"  # latin-1:CE
+        "\N{LATIN CAPITAL LETTER I WITH DIAERESIS}"  # latin-1:CF
+        "\N{LATIN CAPITAL LETTER I WITH DOT ABOVE}"  # windows-1254:DD
+        "\N{LATIN CAPITAL LETTER I WITH GRAVE}"  # latin-1:CC
+        "\N{LATIN CAPITAL LETTER I WITH MACRON}"  # windows-1257:CE
+        "\N{LATIN CAPITAL LETTER K WITH CEDILLA}"  # windows-1257:CD
+        "\N{LATIN CAPITAL LETTER L WITH ACUTE}"  # windows-1250:C5
+        "\N{LATIN CAPITAL LETTER L WITH CEDILLA}"  # windows-1257:CF
+        "\N{LATIN CAPITAL LETTER L WITH STROKE}"  # windows-1257:D9
+        "\N{LATIN CAPITAL LETTER N WITH ACUTE}"  # windows-1250:D1
+        "\N{LATIN CAPITAL LETTER N WITH CARON}"  # windows-1250:D2
+        "\N{LATIN CAPITAL LETTER N WITH CEDILLA}"  # windows-1257:D2
+        "\N{LATIN CAPITAL LETTER N WITH TILDE}"  # latin-1:D1
+        "\N{LATIN CAPITAL LETTER O WITH ACUTE}"  # latin-1:D3
+        "\N{LATIN CAPITAL LETTER O WITH CIRCUMFLEX}"  # latin-1:D4
+        "\N{LATIN CAPITAL LETTER O WITH DIAERESIS}"  # latin-1:D6
+        "\N{LATIN CAPITAL LETTER O WITH DOUBLE ACUTE}"  # windows-1250:D5
+        "\N{LATIN CAPITAL LETTER O WITH GRAVE}"  # latin-1:D2
+        "\N{LATIN CAPITAL LETTER O WITH MACRON}"  # windows-1257:D4
+        "\N{LATIN CAPITAL LETTER O WITH STROKE}"  # latin-1:D8
+        "\N{LATIN CAPITAL LETTER O WITH TILDE}"  # latin-1:D5
+        "\N{LATIN CAPITAL LETTER R WITH CARON}"  # windows-1250:D8
+        "\N{LATIN CAPITAL LETTER S WITH ACUTE}"  # windows-1257:DA
+        "\N{LATIN CAPITAL LETTER S WITH CARON}"  # windows-1257:D0
+        "\N{LATIN CAPITAL LETTER S WITH CEDILLA}"  # windows-1254:DE
+        "\N{LATIN CAPITAL LETTER T WITH CEDILLA}"  # windows-1250:DE
+        "\N{LATIN CAPITAL LETTER THORN}"  # latin-1:DE
+        "\N{LATIN CAPITAL LETTER U WITH ACUTE}"  # latin-1:DA
+        "\N{LATIN CAPITAL LETTER U WITH CIRCUMFLEX}"  # latin-1:DB
+        "\N{LATIN CAPITAL LETTER U WITH DIAERESIS}"  # latin-1:DC
+        "\N{LATIN CAPITAL LETTER U WITH DOUBLE ACUTE}"  # windows-1250:DB
+        "\N{LATIN CAPITAL LETTER U WITH GRAVE}"  # latin-1:D9
+        "\N{LATIN CAPITAL LETTER U WITH MACRON}"  # windows-1257:DB
+        "\N{LATIN CAPITAL LETTER U WITH OGONEK}"  # windows-1257:D8
+        "\N{LATIN CAPITAL LETTER U WITH RING ABOVE}"  # windows-1250:D9
+        "\N{LATIN CAPITAL LETTER Y WITH ACUTE}"  # latin-1:DD
+        "\N{LATIN CAPITAL LETTER Z WITH ACUTE}"  # windows-1257:CA
+        "\N{LATIN CAPITAL LETTER Z WITH CARON}"  # windows-1257:DE
+        "\N{LATIN CAPITAL LETTER Z WITH DOT ABOVE}"  # windows-1257:DD
+        "\N{LATIN SMALL LETTER SHARP S}"  # latin-1:DF
+        "\N{MULTIPLICATION SIGN}"  # latin-1:D7
+        "\N{GREEK CAPITAL LETTER BETA}"  # windows-1253:C2
+        "\N{GREEK CAPITAL LETTER GAMMA}"  # windows-1253:C3
+        "\N{GREEK CAPITAL LETTER DELTA}"  # windows-1253:C4
+        "\N{GREEK CAPITAL LETTER EPSILON}"  # windows-1253:C5
+        "\N{GREEK CAPITAL LETTER ZETA}"  # windows-1253:C6
+        "\N{GREEK CAPITAL LETTER ETA}"  # windows-1253:C7
+        "\N{GREEK CAPITAL LETTER THETA}"  # windows-1253:C8
+        "\N{GREEK CAPITAL LETTER IOTA}"  # windows-1253:C9
+        "\N{GREEK CAPITAL LETTER KAPPA}"  # windows-1253:CA
+        "\N{GREEK CAPITAL LETTER LAMDA}"  # windows-1253:CB
+        "\N{GREEK CAPITAL LETTER MU}"  # windows-1253:CC
+        "\N{GREEK CAPITAL LETTER NU}"  # windows-1253:CD
+        "\N{GREEK CAPITAL LETTER XI}"  # windows-1253:CE
+        "\N{GREEK CAPITAL LETTER OMICRON}"  # windows-1253:CF
+        "\N{GREEK CAPITAL LETTER PI}"  # windows-1253:D0
+        "\N{GREEK CAPITAL LETTER RHO}"  # windows-1253:D1
+        "\N{GREEK CAPITAL LETTER SIGMA}"  # windows-1253:D3
+        "\N{GREEK CAPITAL LETTER TAU}"  # windows-1253:D4
+        "\N{GREEK CAPITAL LETTER UPSILON}"  # windows-1253:D5
+        "\N{GREEK CAPITAL LETTER PHI}"  # windows-1253:D6
+        "\N{GREEK CAPITAL LETTER CHI}"  # windows-1253:D7
+        "\N{GREEK CAPITAL LETTER PSI}"  # windows-1253:D8
+        "\N{GREEK CAPITAL LETTER OMEGA}"  # windows-1253:D9
+        "\N{GREEK CAPITAL LETTER IOTA WITH DIALYTIKA}"  # windows-1253:DA
+        "\N{GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA}"  # windows-1253:DB
+        "\N{GREEK SMALL LETTER ALPHA WITH TONOS}"  # windows-1253:DC
+        "\N{GREEK SMALL LETTER EPSILON WITH TONOS}"  # windows-1253:DD
+        "\N{GREEK SMALL LETTER ETA WITH TONOS}"  # windows-1253:DE
+        "\N{GREEK SMALL LETTER IOTA WITH TONOS}"  # windows-1253:DF
+        "\N{CYRILLIC CAPITAL LETTER VE}"  # windows-1251:C2
+        "\N{CYRILLIC CAPITAL LETTER GHE}"  # windows-1251:C3
+        "\N{CYRILLIC CAPITAL LETTER DE}"  # windows-1251:C4
+        "\N{CYRILLIC CAPITAL LETTER IE}"  # windows-1251:C5
+        "\N{CYRILLIC CAPITAL LETTER ZHE}"  # windows-1251:C6
+        "\N{CYRILLIC CAPITAL LETTER ZE}"  # windows-1251:C7
+        "\N{CYRILLIC CAPITAL LETTER I}"  # windows-1251:C8
+        "\N{CYRILLIC CAPITAL LETTER SHORT I}"  # windows-1251:C9
+        "\N{CYRILLIC CAPITAL LETTER KA}"  # windows-1251:CA
+        "\N{CYRILLIC CAPITAL LETTER EL}"  # windows-1251:CB
+        "\N{CYRILLIC CAPITAL LETTER EM}"  # windows-1251:CC
+        "\N{CYRILLIC CAPITAL LETTER EN}"  # windows-1251:CD
+        "\N{CYRILLIC CAPITAL LETTER O}"  # windows-1251:CE
+        "\N{CYRILLIC CAPITAL LETTER PE}"  # windows-1251:CF
+        "\N{CYRILLIC CAPITAL LETTER ER}"  # windows-1251:D0
+        "\N{CYRILLIC CAPITAL LETTER ES}"  # windows-1251:D1
+        "\N{CYRILLIC CAPITAL LETTER TE}"  # windows-1251:D2
+        "\N{CYRILLIC CAPITAL LETTER U}"  # windows-1251:D3
+        "\N{CYRILLIC CAPITAL LETTER EF}"  # windows-1251:D4
+        "\N{CYRILLIC CAPITAL LETTER HA}"  # windows-1251:D5
+        "\N{CYRILLIC CAPITAL LETTER TSE}"  # windows-1251:D6
+        "\N{CYRILLIC CAPITAL LETTER CHE}"  # windows-1251:D7
+        "\N{CYRILLIC CAPITAL LETTER SHA}"  # windows-1251:D8
+        "\N{CYRILLIC CAPITAL LETTER SHCHA}"  # windows-1251:D9
+        "\N{CYRILLIC CAPITAL LETTER HARD SIGN}"  # windows-1251:DA
+        "\N{CYRILLIC CAPITAL LETTER YERU}"  # windows-1251:DB
+        "\N{CYRILLIC CAPITAL LETTER SOFT SIGN}"  # windows-1251:DC
+        "\N{CYRILLIC CAPITAL LETTER E}"  # windows-1251:DD
+        "\N{CYRILLIC CAPITAL LETTER YU}"  # windows-1251:DE
+        "\N{CYRILLIC CAPITAL LETTER YA}"  # windows-1251:DF
     ),
     # Letters that decode to 0xE0 - 0xEF in a Latin-1-like encoding
-    "utf8_first_of_3": ("ร รกรขรฃรครฅรฆรงรจรฉรชรซรฌรญรฎรฏฤƒฤ‡ฤฤฤ™ฤ›ฤบล•ฮฐฮฑฮฒฮณฮดฮตฮถฮทฮธฮนฮบฮปฮผฮฝฮพฮฟะฐะฑะฒะณะดะตะถะทะธะนะบะปะผะฝะพะฟ"),
+    "utf8_first_of_3": (
+        "\N{LATIN SMALL LETTER A WITH ACUTE}"  # latin-1:E1
+        "\N{LATIN SMALL LETTER A WITH BREVE}"  # windows-1250:E3
+        "\N{LATIN SMALL LETTER A WITH CIRCUMFLEX}"  # latin-1:E2
+        "\N{LATIN SMALL LETTER A WITH DIAERESIS}"  # latin-1:E4
+        "\N{LATIN SMALL LETTER A WITH GRAVE}"  # latin-1:E0
+        "\N{LATIN SMALL LETTER A WITH MACRON}"  # windows-1257:E2
+        "\N{LATIN SMALL LETTER A WITH OGONEK}"  # windows-1257:E0
+        "\N{LATIN SMALL LETTER A WITH RING ABOVE}"  # latin-1:E5
+        "\N{LATIN SMALL LETTER A WITH TILDE}"  # latin-1:E3
+        "\N{LATIN SMALL LETTER AE}"  # latin-1:E6
+        "\N{LATIN SMALL LETTER C WITH ACUTE}"  # windows-1250:E6
+        "\N{LATIN SMALL LETTER C WITH CARON}"  # windows-1250:E8
+        "\N{LATIN SMALL LETTER C WITH CEDILLA}"  # latin-1:E7
+        "\N{LATIN SMALL LETTER D WITH CARON}"  # windows-1250:EF
+        "\N{LATIN SMALL LETTER E WITH ACUTE}"  # latin-1:E9
+        "\N{LATIN SMALL LETTER E WITH CARON}"  # windows-1250:EC
+        "\N{LATIN SMALL LETTER E WITH CIRCUMFLEX}"  # latin-1:EA
+        "\N{LATIN SMALL LETTER E WITH DIAERESIS}"  # latin-1:EB
+        "\N{LATIN SMALL LETTER E WITH DOT ABOVE}"  # windows-1257:EB
+        "\N{LATIN SMALL LETTER E WITH GRAVE}"  # latin-1:E8
+        "\N{LATIN SMALL LETTER E WITH MACRON}"  # windows-1257:E7
+        "\N{LATIN SMALL LETTER E WITH OGONEK}"  # windows-1250:EA
+        "\N{LATIN SMALL LETTER E WITH OGONEK}"  # windows-1250:EA
+        "\N{LATIN SMALL LETTER G WITH CEDILLA}"  # windows-1257:EC
+        "\N{LATIN SMALL LETTER I WITH ACUTE}"  # latin-1:ED
+        "\N{LATIN SMALL LETTER I WITH CIRCUMFLEX}"  # latin-1:EE
+        "\N{LATIN SMALL LETTER I WITH DIAERESIS}"  # latin-1:EF
+        "\N{LATIN SMALL LETTER I WITH GRAVE}"  # latin-1:EC
+        "\N{LATIN SMALL LETTER I WITH MACRON}"  # windows-1257:EE
+        "\N{LATIN SMALL LETTER I WITH OGONEK}"  # windows-1257:E1
+        "\N{LATIN SMALL LETTER K WITH CEDILLA}"  # windows-1257:ED
+        "\N{LATIN SMALL LETTER L WITH ACUTE}"  # windows-1250:E5
+        "\N{LATIN SMALL LETTER L WITH CEDILLA}"  # windows-1257:EF
+        "\N{LATIN SMALL LETTER R WITH ACUTE}"  # windows-1250:E0
+        "\N{LATIN SMALL LETTER Z WITH ACUTE}"  # windows-1257:EA
+        "\N{GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS}"  # windows-1253:E0
+        "\N{GREEK SMALL LETTER ALPHA}"  # windows-1253:E1
+        "\N{GREEK SMALL LETTER BETA}"  # windows-1253:E2
+        "\N{GREEK SMALL LETTER GAMMA}"  # windows-1253:E3
+        "\N{GREEK SMALL LETTER DELTA}"  # windows-1253:E4
+        "\N{GREEK SMALL LETTER EPSILON}"  # windows-1253:E5
+        "\N{GREEK SMALL LETTER ZETA}"  # windows-1253:E6
+        "\N{GREEK SMALL LETTER ETA}"  # windows-1253:E7
+        "\N{GREEK SMALL LETTER THETA}"  # windows-1253:E8
+        "\N{GREEK SMALL LETTER IOTA}"  # windows-1253:E9
+        "\N{GREEK SMALL LETTER KAPPA}"  # windows-1253:EA
+        "\N{GREEK SMALL LETTER LAMDA}"  # windows-1253:EB
+        "\N{GREEK SMALL LETTER MU}"  # windows-1253:EC
+        "\N{GREEK SMALL LETTER NU}"  # windows-1253:ED
+        "\N{GREEK SMALL LETTER XI}"  # windows-1253:EE
+        "\N{GREEK SMALL LETTER OMICRON}"  # windows-1253:EF
+        "\N{CYRILLIC SMALL LETTER A}"  # windows-1251:E0
+        "\N{CYRILLIC SMALL LETTER BE}"  # windows-1251:E1
+        "\N{CYRILLIC SMALL LETTER VE}"  # windows-1251:E2
+        "\N{CYRILLIC SMALL LETTER GHE}"  # windows-1251:E3
+        "\N{CYRILLIC SMALL LETTER DE}"  # windows-1251:E4
+        "\N{CYRILLIC SMALL LETTER IE}"  # windows-1251:E5
+        "\N{CYRILLIC SMALL LETTER ZHE}"  # windows-1251:E6
+        "\N{CYRILLIC SMALL LETTER ZE}"  # windows-1251:E7
+        "\N{CYRILLIC SMALL LETTER I}"  # windows-1251:E8
+        "\N{CYRILLIC SMALL LETTER SHORT I}"  # windows-1251:E9
+        "\N{CYRILLIC SMALL LETTER KA}"  # windows-1251:EA
+        "\N{CYRILLIC SMALL LETTER EL}"  # windows-1251:EB
+        "\N{CYRILLIC SMALL LETTER EM}"  # windows-1251:EC
+        "\N{CYRILLIC SMALL LETTER EN}"  # windows-1251:ED
+        "\N{CYRILLIC SMALL LETTER O}"  # windows-1251:EE
+        "\N{CYRILLIC SMALL LETTER PE}"  # windows-1251:EF
+    ),
     # Letters that decode to 0xF0 or 0xF3 in a Latin-1-like encoding.
     # (Other leading bytes correspond only to unassigned codepoints)
-    "utf8_first_of_4": ("รฐรณฤ‘ฤŸฯ€ฯƒั€ัƒ"),
+    "utf8_first_of_4": (
+        "\N{LATIN SMALL LETTER D WITH STROKE}"  # windows-1250:F0
+        "\N{LATIN SMALL LETTER ETH}"  # latin-1:F0
+        "\N{LATIN SMALL LETTER G WITH BREVE}"  # windows-1254:F0
+        "\N{LATIN SMALL LETTER O WITH ACUTE}"  # latin-1:F3
+        "\N{LATIN SMALL LETTER S WITH CARON}"  # windows-1257:F0
+        "\N{GREEK SMALL LETTER PI}"  # windows-1253:F0
+        "\N{GREEK SMALL LETTER SIGMA}"  # windows-1253:F3
+        "\N{CYRILLIC SMALL LETTER ER}"  # windows-1251:F0
+        "\N{CYRILLIC SMALL LETTER U}"  # windows-1251:F3
+    ),
     # Letters that decode to 0x80 - 0xBF in a Latin-1-like encoding,
     # including a space standing in for 0xA0
     "utf8_continuation": (
         "\x80-\xbf"
-        "ฤ„ฤ…ฤฝฤพลล‚ล’ล“ลšล›ลžลŸล ลกลคลฅลธลนลบลปลผลฝลพฦ’ห†ห‡ห˜ห›หœหฮ„ฮ…"
-        "ฮ†ฮˆฮ‰ฮŠฮŒฮŽฮะะ‚ะƒะ„ะ…ะ†ะ‡ะˆะ‰ะŠะ‹ะŒะŽะั‘ั’ั“ั”ั•ั–ั—ั˜ั™ัšั›ัœัžัŸาา‘"
-        "โ€“โ€”โ€•โ€˜โ€™โ€šโ€œโ€โ€žโ€ โ€กโ€ขโ€ฆโ€ฐโ€นโ€บโ‚ฌโ„–โ„ข"
-        " "
+        "\N{SPACE}"  # modification of latin-1:A0, NO-BREAK SPACE
+        "\N{LATIN CAPITAL LETTER A WITH OGONEK}"  # windows-1250:A5
+        "\N{LATIN CAPITAL LETTER AE}"  # windows-1257:AF
+        "\N{LATIN CAPITAL LETTER L WITH CARON}"  # windows-1250:BC
+        "\N{LATIN CAPITAL LETTER L WITH STROKE}"  # windows-1250:A3
+        "\N{LATIN CAPITAL LETTER O WITH STROKE}"  # windows-1257:A8
+        "\N{LATIN CAPITAL LETTER R WITH CEDILLA}"  # windows-1257:AA
+        "\N{LATIN CAPITAL LETTER S WITH ACUTE}"  # windows-1250:8C
+        "\N{LATIN CAPITAL LETTER S WITH CARON}"  # windows-1252:8A
+        "\N{LATIN CAPITAL LETTER S WITH CEDILLA}"  # windows-1250:AA
+        "\N{LATIN CAPITAL LETTER T WITH CARON}"  # windows-1250:8D
+        "\N{LATIN CAPITAL LETTER Y WITH DIAERESIS}"  # windows-1252:9F
+        "\N{LATIN CAPITAL LETTER Z WITH ACUTE}"  # windows-1250:8F
+        "\N{LATIN CAPITAL LETTER Z WITH CARON}"  # windows-1252:8E
+        "\N{LATIN CAPITAL LETTER Z WITH DOT ABOVE}"  # windows-1250:AF
+        "\N{LATIN CAPITAL LIGATURE OE}"  # windows-1252:8C
+        "\N{LATIN SMALL LETTER A WITH OGONEK}"  # windows-1250:B9
+        "\N{LATIN SMALL LETTER AE}"  # windows-1257:BF
+        "\N{LATIN SMALL LETTER F WITH HOOK}"  # windows-1252:83
+        "\N{LATIN SMALL LETTER L WITH CARON}"  # windows-1250:BE
+        "\N{LATIN SMALL LETTER L WITH STROKE}"  # windows-1250:B3
+        "\N{LATIN SMALL LETTER O WITH STROKE}"  # windows-1257:B8
+        "\N{LATIN SMALL LETTER R WITH CEDILLA}"  # windows-1257:BA
+        "\N{LATIN SMALL LETTER S WITH ACUTE}"  # windows-1250:9C
+        "\N{LATIN SMALL LETTER S WITH CARON}"  # windows-1252:9A
+        "\N{LATIN SMALL LETTER S WITH CEDILLA}"  # windows-1250:BA
+        "\N{LATIN SMALL LETTER T WITH CARON}"  # windows-1250:9D
+        "\N{LATIN SMALL LETTER Z WITH ACUTE}"  # windows-1250:9F
+        "\N{LATIN SMALL LETTER Z WITH CARON}"  # windows-1252:9E
+        "\N{LATIN SMALL LETTER Z WITH DOT ABOVE}"  # windows-1250:BF
+        "\N{LATIN SMALL LIGATURE OE}"  # windows-1252:9C
+        "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}"  # windows-1252:88
+        "\N{CARON}"  # windows-1250:A1
+        "\N{BREVE}"  # windows-1250:A2
+        "\N{OGONEK}"  # windows-1250:B2
+        "\N{SMALL TILDE}"  # windows-1252:98
+        "\N{DOUBLE ACUTE ACCENT}"  # windows-1250:BD
+        "\N{GREEK TONOS}"  # windows-1253:B4
+        "\N{GREEK DIALYTIKA TONOS}"  # windows-1253:A1
+        "\N{GREEK CAPITAL LETTER ALPHA WITH TONOS}"  # windows-1253:A2
+        "\N{GREEK CAPITAL LETTER EPSILON WITH TONOS}"  # windows-1253:B8
+        "\N{GREEK CAPITAL LETTER ETA WITH TONOS}"  # windows-1253:B9
+        "\N{GREEK CAPITAL LETTER IOTA WITH TONOS}"  # windows-1253:BA
+        "\N{GREEK CAPITAL LETTER OMICRON WITH TONOS}"  # windows-1253:BC
+        "\N{GREEK CAPITAL LETTER UPSILON WITH TONOS}"  # windows-1253:BE
+        "\N{GREEK CAPITAL LETTER OMEGA WITH TONOS}"  # windows-1253:BF
+        "\N{CYRILLIC CAPITAL LETTER IO}"  # windows-1251:A8
+        "\N{CYRILLIC CAPITAL LETTER DJE}"  # windows-1251:80
+        "\N{CYRILLIC CAPITAL LETTER GJE}"  # windows-1251:81
+        "\N{CYRILLIC CAPITAL LETTER UKRAINIAN IE}"  # windows-1251:AA
+        "\N{CYRILLIC CAPITAL LETTER DZE}"  # windows-1251:BD
+        "\N{CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I}"  # windows-1251:B2
+        "\N{CYRILLIC CAPITAL LETTER YI}"  # windows-1251:AF
+        "\N{CYRILLIC CAPITAL LETTER JE}"  # windows-1251:A3
+        "\N{CYRILLIC CAPITAL LETTER LJE}"  # windows-1251:8A
+        "\N{CYRILLIC CAPITAL LETTER NJE}"  # windows-1251:8C
+        "\N{CYRILLIC CAPITAL LETTER TSHE}"  # windows-1251:8E
+        "\N{CYRILLIC CAPITAL LETTER KJE}"  # windows-1251:8D
+        "\N{CYRILLIC CAPITAL LETTER SHORT U}"  # windows-1251:A1
+        "\N{CYRILLIC CAPITAL LETTER DZHE}"  # windows-1251:8F
+        "\N{CYRILLIC SMALL LETTER IO}"  # windows-1251:B8
+        "\N{CYRILLIC SMALL LETTER DJE}"  # windows-1251:90
+        "\N{CYRILLIC SMALL LETTER GJE}"  # windows-1251:83
+        "\N{CYRILLIC SMALL LETTER UKRAINIAN IE}"  # windows-1251:BA
+        "\N{CYRILLIC SMALL LETTER DZE}"  # windows-1251:BE
+        "\N{CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I}"  # windows-1251:B3
+        "\N{CYRILLIC SMALL LETTER YI}"  # windows-1251:BF
+        "\N{CYRILLIC SMALL LETTER JE}"  # windows-1251:BC
+        "\N{CYRILLIC SMALL LETTER LJE}"  # windows-1251:9A
+        "\N{CYRILLIC SMALL LETTER NJE}"  # windows-1251:9C
+        "\N{CYRILLIC SMALL LETTER TSHE}"  # windows-1251:9E
+        "\N{CYRILLIC SMALL LETTER KJE}"  # windows-1251:9D
+        "\N{CYRILLIC SMALL LETTER SHORT U}"  # windows-1251:A2
+        "\N{CYRILLIC SMALL LETTER DZHE}"  # windows-1251:9F
+        "\N{CYRILLIC CAPITAL LETTER GHE WITH UPTURN}"  # windows-1251:A5
+        "\N{CYRILLIC SMALL LETTER GHE WITH UPTURN}"  # windows-1251:B4
+        "\N{EN DASH}"  # windows-1252:96
+        "\N{EM DASH}"  # windows-1252:97
+        "\N{HORIZONTAL BAR}"  # windows-1253:AF
+        "\N{LEFT SINGLE QUOTATION MARK}"  # windows-1252:91
+        "\N{RIGHT SINGLE QUOTATION MARK}"  # windows-1252:92
+        "\N{SINGLE LOW-9 QUOTATION MARK}"  # windows-1252:82
+        "\N{LEFT DOUBLE QUOTATION MARK}"  # windows-1252:93
+        "\N{RIGHT DOUBLE QUOTATION MARK}"  # windows-1252:94
+        "\N{DOUBLE LOW-9 QUOTATION MARK}"  # windows-1252:84
+        "\N{DAGGER}"  # windows-1252:86
+        "\N{DOUBLE DAGGER}"  # windows-1252:87
+        "\N{BULLET}"  # windows-1252:95
+        "\N{HORIZONTAL ELLIPSIS}"  # windows-1252:85
+        "\N{PER MILLE SIGN}"  # windows-1252:89
+        "\N{SINGLE LEFT-POINTING ANGLE QUOTATION MARK}"  # windows-1252:8B
+        "\N{SINGLE RIGHT-POINTING ANGLE QUOTATION MARK}"  # windows-1252:9B
+        "\N{EURO SIGN}"  # windows-1252:80
+        "\N{NUMERO SIGN}"  # windows-1251:B9
+        "\N{TRADE MARK SIGN}"  # windows-1252:99
     ),
     # Letters that decode to 0x80 - 0xBF in a Latin-1-like encoding,
     # and don't usually stand for themselves when adjacent to mojibake.
-    # This excludes spaces, dashes, quotation marks, and ellipses.
+    # This excludes spaces, dashes, 'bullet', quotation marks, and ellipses.
     "utf8_continuation_strict": (
         "\x80-\xbf"
-        "ฤ„ฤ…ฤฝฤพลล‚ล’ล“ลšล›ลžลŸล ลกลคลฅลธลนลบลปลผลฝลพฦ’ห†ห‡ห˜ห›หœหฮ„ฮ…"
-        "ฮ†ฮˆฮ‰ฮŠฮŒฮŽฮะะ‚ะƒะ„ะ…ะ†ะ‡ะˆะ‰ะŠะ‹ะŒะŽะั‘ั’ั“ั”ั•ั–ั—ั˜ั™ัšั›ัœัžัŸาา‘"
-        "โ€ โ€กโ€ขโ€ฐโ€นโ€บโ‚ฌโ„–โ„ข"
+        "\N{LATIN CAPITAL LETTER A WITH OGONEK}"  # windows-1250:A5
+        "\N{LATIN CAPITAL LETTER AE}"  # windows-1257:AF
+        "\N{LATIN CAPITAL LETTER L WITH CARON}"  # windows-1250:BC
+        "\N{LATIN CAPITAL LETTER L WITH STROKE}"  # windows-1250:A3
+        "\N{LATIN CAPITAL LETTER O WITH STROKE}"  # windows-1257:A8
+        "\N{LATIN CAPITAL LETTER R WITH CEDILLA}"  # windows-1257:AA
+        "\N{LATIN CAPITAL LETTER S WITH ACUTE}"  # windows-1250:8C
+        "\N{LATIN CAPITAL LETTER S WITH CARON}"  # windows-1252:8A
+        "\N{LATIN CAPITAL LETTER S WITH CEDILLA}"  # windows-1250:AA
+        "\N{LATIN CAPITAL LETTER T WITH CARON}"  # windows-1250:8D
+        "\N{LATIN CAPITAL LETTER Y WITH DIAERESIS}"  # windows-1252:9F
+        "\N{LATIN CAPITAL LETTER Z WITH ACUTE}"  # windows-1250:8F
+        "\N{LATIN CAPITAL LETTER Z WITH CARON}"  # windows-1252:8E
+        "\N{LATIN CAPITAL LETTER Z WITH DOT ABOVE}"  # windows-1250:AF
+        "\N{LATIN CAPITAL LIGATURE OE}"  # windows-1252:8C
+        "\N{LATIN SMALL LETTER A WITH OGONEK}"  # windows-1250:B9
+        "\N{LATIN SMALL LETTER AE}"  # windows-1257:BF
+        "\N{LATIN SMALL LETTER F WITH HOOK}"  # windows-1252:83
+        "\N{LATIN SMALL LETTER L WITH CARON}"  # windows-1250:BE
+        "\N{LATIN SMALL LETTER L WITH STROKE}"  # windows-1250:B3
+        "\N{LATIN SMALL LETTER O WITH STROKE}"  # windows-1257:B8
+        "\N{LATIN SMALL LETTER R WITH CEDILLA}"  # windows-1257:BA
+        "\N{LATIN SMALL LETTER S WITH ACUTE}"  # windows-1250:9C
+        "\N{LATIN SMALL LETTER S WITH CARON}"  # windows-1252:9A
+        "\N{LATIN SMALL LETTER S WITH CEDILLA}"  # windows-1250:BA
+        "\N{LATIN SMALL LETTER T WITH CARON}"  # windows-1250:9D
+        "\N{LATIN SMALL LETTER Z WITH ACUTE}"  # windows-1250:9F
+        "\N{LATIN SMALL LETTER Z WITH CARON}"  # windows-1252:9E
+        "\N{LATIN SMALL LETTER Z WITH DOT ABOVE}"  # windows-1250:BF
+        "\N{LATIN SMALL LIGATURE OE}"  # windows-1252:9C
+        "\N{MODIFIER LETTER CIRCUMFLEX ACCENT}"  # windows-1252:88
+        "\N{CARON}"  # windows-1250:A1
+        "\N{BREVE}"  # windows-1250:A2
+        "\N{OGONEK}"  # windows-1250:B2
+        "\N{SMALL TILDE}"  # windows-1252:98
+        "\N{DOUBLE ACUTE ACCENT}"  # windows-1250:BD
+        "\N{GREEK TONOS}"  # windows-1253:B4
+        "\N{GREEK DIALYTIKA TONOS}"  # windows-1253:A1
+        "\N{GREEK CAPITAL LETTER ALPHA WITH TONOS}"  # windows-1253:A2
+        "\N{GREEK CAPITAL LETTER EPSILON WITH TONOS}"  # windows-1253:B8
+        "\N{GREEK CAPITAL LETTER ETA WITH TONOS}"  # windows-1253:B9
+        "\N{GREEK CAPITAL LETTER IOTA WITH TONOS}"  # windows-1253:BA
+        "\N{GREEK CAPITAL LETTER OMICRON WITH TONOS}"  # windows-1253:BC
+        "\N{GREEK CAPITAL LETTER UPSILON WITH TONOS}"  # windows-1253:BE
+        "\N{GREEK CAPITAL LETTER OMEGA WITH TONOS}"  # windows-1253:BF
+        "\N{CYRILLIC CAPITAL LETTER IO}"  # windows-1251:A8
+        "\N{CYRILLIC CAPITAL LETTER DJE}"  # windows-1251:80
+        "\N{CYRILLIC CAPITAL LETTER GJE}"  # windows-1251:81
+        "\N{CYRILLIC CAPITAL LETTER UKRAINIAN IE}"  # windows-1251:AA
+        "\N{CYRILLIC CAPITAL LETTER DZE}"  # windows-1251:BD
+        "\N{CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I}"  # windows-1251:B2
+        "\N{CYRILLIC CAPITAL LETTER YI}"  # windows-1251:AF
+        "\N{CYRILLIC CAPITAL LETTER JE}"  # windows-1251:A3
+        "\N{CYRILLIC CAPITAL LETTER LJE}"  # windows-1251:8A
+        "\N{CYRILLIC CAPITAL LETTER NJE}"  # windows-1251:8C
+        "\N{CYRILLIC CAPITAL LETTER TSHE}"  # windows-1251:8E
+        "\N{CYRILLIC CAPITAL LETTER KJE}"  # windows-1251:8D
+        "\N{CYRILLIC CAPITAL LETTER SHORT U}"  # windows-1251:A1
+        "\N{CYRILLIC CAPITAL LETTER DZHE}"  # windows-1251:8F
+        "\N{CYRILLIC SMALL LETTER IO}"  # windows-1251:B8
+        "\N{CYRILLIC SMALL LETTER DJE}"  # windows-1251:90
+        "\N{CYRILLIC SMALL LETTER GJE}"  # windows-1251:83
+        "\N{CYRILLIC SMALL LETTER UKRAINIAN IE}"  # windows-1251:BA
+        "\N{CYRILLIC SMALL LETTER DZE}"  # windows-1251:BE
+        "\N{CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I}"  # windows-1251:B3
+        "\N{CYRILLIC SMALL LETTER YI}"  # windows-1251:BF
+        "\N{CYRILLIC SMALL LETTER JE}"  # windows-1251:BC
+        "\N{CYRILLIC SMALL LETTER LJE}"  # windows-1251:9A
+        "\N{CYRILLIC SMALL LETTER NJE}"  # windows-1251:9C
+        "\N{CYRILLIC SMALL LETTER TSHE}"  # windows-1251:9E
+        "\N{CYRILLIC SMALL LETTER KJE}"  # windows-1251:9D
+        "\N{CYRILLIC SMALL LETTER SHORT U}"  # windows-1251:A2
+        "\N{CYRILLIC SMALL LETTER DZHE}"  # windows-1251:9F
+        "\N{CYRILLIC CAPITAL LETTER GHE WITH UPTURN}"  # windows-1251:A5
+        "\N{CYRILLIC SMALL LETTER GHE WITH UPTURN}"  # windows-1251:B4
+        "\N{DAGGER}"  # windows-1252:86
+        "\N{DOUBLE DAGGER}"  # windows-1252:87
+        "\N{PER MILLE SIGN}"  # windows-1252:89
+        "\N{SINGLE LEFT-POINTING ANGLE QUOTATION MARK}"  # windows-1252:8B
+        "\N{SINGLE RIGHT-POINTING ANGLE QUOTATION MARK}"  # windows-1252:9B
+        "\N{EURO SIGN}"  # windows-1252:80
+        "\N{NUMERO SIGN}"  # windows-1251:B9
+        "\N{TRADE MARK SIGN}"  # windows-1252:99
     ),
 }
 
@@ -310,8 +686,6 @@ def _build_width_map() -> Dict[int, str]:
         |
         [{utf8_first_of_4}] [{utf8_continuation}]{{3}}
     )+
-""".format(
-        **UTF8_CLUES
-    ),
+    """.format(**UTF8_CLUES),
     re.VERBOSE,
 )
diff --git a/libs/ftfy/cli.py b/libs/ftfy/cli.py
index dfb2e93502..2807a8604f 100644
--- a/libs/ftfy/cli.py
+++ b/libs/ftfy/cli.py
@@ -48,28 +48,26 @@ def main() -> None:
     import argparse
 
     parser = argparse.ArgumentParser(
-        description="ftfy (fixes text for you), version %s" % __version__
+        description=f"ftfy (fixes text for you), version {__version__}"
     )
     parser.add_argument(
         "filename",
         default="-",
         nargs="?",
-        help="The file whose Unicode is to be fixed. Defaults "
-        "to -, meaning standard input.",
+        help="The file whose Unicode is to be fixed. Defaults to -, meaning standard input.",
     )
     parser.add_argument(
         "-o",
         "--output",
         type=str,
         default="-",
-        help="The file to output to. Defaults to -, meaning " "standard output.",
+        help="The file to output to. Defaults to -, meaning standard output.",
     )
     parser.add_argument(
         "-g",
         "--guess",
         action="store_true",
-        help="Ask ftfy to guess the encoding of your input. "
-        "This is risky. Overrides -e.",
+        help="Ask ftfy to guess the encoding of your input. This is risky. Overrides -e.",
     )
     parser.add_argument(
         "-e",
@@ -83,15 +81,13 @@ def main() -> None:
         "--normalization",
         type=str,
         default="NFC",
-        help="The normalization of Unicode to apply. "
-        'Defaults to NFC. Can be "none".',
+        help='The normalization of Unicode to apply. Defaults to NFC. Can be "none".',
     )
     parser.add_argument(
         "--preserve-entities",
         action="store_true",
         help="Leave HTML entities as they are. The default "
-        "is to decode them, as long as no HTML tags "
-        "have appeared in the file.",
+        "is to decode them, as long as no HTML tags have appeared in the file.",
     )
 
     args = parser.parse_args()
diff --git a/libs/ftfy/fixes.py b/libs/ftfy/fixes.py
index a248bc8334..41d3c2f817 100644
--- a/libs/ftfy/fixes.py
+++ b/libs/ftfy/fixes.py
@@ -14,7 +14,8 @@
 import html
 import re
 import warnings
-from typing import Any, List, Match, Tuple
+from re import Match
+from typing import Any
 
 import ftfy
 from ftfy.badness import is_bad
@@ -57,7 +58,7 @@ def fix_encoding(text: str) -> str:
     return ftfy.fix_encoding(text)
 
 
-def apply_plan(text: str, plan: List[Tuple[str, str]]) -> str:
+def apply_plan(text: str, plan: list[tuple[str, str]]) -> str:
     """
     Deprecated copy of `ftfy.apply_plan()`.
     """
@@ -474,7 +475,7 @@ def replace_lossy_sequences(byts: bytes) -> bytes:
 
     This is used as a transcoder within `fix_encoding`.
     """
-    return LOSSY_UTF8_RE.sub("\ufffd".encode("utf-8"), byts)
+    return LOSSY_UTF8_RE.sub("\ufffd".encode(), byts)
 
 
 def decode_inconsistent_utf8(text: str) -> str:
diff --git a/libs/future-1.0.0.dist-info/METADATA b/libs/future-1.0.0.dist-info/METADATA
index 3d0e5512c6..23ff242863 100644
--- a/libs/future-1.0.0.dist-info/METADATA
+++ b/libs/future-1.0.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: future
 Version: 1.0.0
 Summary: Clean single-source support for Python 3 and 2
@@ -29,6 +29,17 @@ Classifier: Development Status :: 6 - Mature
 Classifier: Intended Audience :: Developers
 Requires-Python: >=2.6, !=3.0.*, !=3.1.*, !=3.2.*
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 
 future: Easy, safe support for Python 2/3 compatibility
diff --git a/libs/future-1.0.0.dist-info/RECORD b/libs/future-1.0.0.dist-info/RECORD
index 177325ef8f..cebd37fd50 100644
--- a/libs/future-1.0.0.dist-info/RECORD
+++ b/libs/future-1.0.0.dist-info/RECORD
@@ -1,12 +1,12 @@
-../../bin/futurize,sha256=7Lk9R2v7Usin7rOiWvHbV-X3oc6CYy2xASihkysoa9E,238
-../../bin/pasteurize,sha256=wR7PHvhXRdB8TXwiZN3U2yIg5zLkWFnEkeo-XsZl-1Y,240
+../../bin/futurize,sha256=0rIbTcKHf_wbiGyG39YusJOLKI8gp9L4KwFK2Xy35Y4,191
+../../bin/pasteurize,sha256=VI5mNq5LUEdSo0OD0o8Ll8mAX2Rd5a0sTNUggklZS4w,193
 future-1.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-future-1.0.0.dist-info/LICENSE.txt,sha256=vroEEDw6n_-Si1nHfV--sDo-S9DXrD0eH4mUoh4w7js,1075
-future-1.0.0.dist-info/METADATA,sha256=MNNaUKMRbZAmVYq5Am_-1NtYZ1ViECpSa8VsQjXbkT4,3959
+future-1.0.0.dist-info/METADATA,sha256=dZAK1V_8LoINxvLyWh7gTiGSU7b_bY_vR_uY0E8UUh8,4177
 future-1.0.0.dist-info/RECORD,,
 future-1.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-future-1.0.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+future-1.0.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 future-1.0.0.dist-info/entry_points.txt,sha256=U9LtP60KSNXoj58mzV5TbotBF371gTWzrKrzJIH80Kw,88
+future-1.0.0.dist-info/licenses/LICENSE.txt,sha256=vroEEDw6n_-Si1nHfV--sDo-S9DXrD0eH4mUoh4w7js,1075
 future-1.0.0.dist-info/top_level.txt,sha256=DT0C3az2gb-uJaj-fs0h4WwHYlJVDp0EvLdud1y5Zyw,38
 future/__init__.py,sha256=T9PNLu6ycmVtpETLxRurmufuRAaosICWmWdAExZb5a8,2938
 future/backports/__init__.py,sha256=5QXvQ_jc5Xx6p4dSaHnZXPZazBEunKDKhbUjxZ0XD1I,530
diff --git a/libs/future-1.0.0.dist-info/WHEEL b/libs/future-1.0.0.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/future-1.0.0.dist-info/WHEEL
+++ b/libs/future-1.0.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/future-1.0.0.dist-info/LICENSE.txt b/libs/future-1.0.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/future-1.0.0.dist-info/LICENSE.txt
rename to libs/future-1.0.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/guess_language_spirit-0.5.3.dist-info/METADATA b/libs/guess_language_spirit-0.5.3.dist-info/METADATA
index 7bbed99b15..d78d4d3438 100644
--- a/libs/guess_language_spirit-0.5.3.dist-info/METADATA
+++ b/libs/guess_language_spirit-0.5.3.dist-info/METADATA
@@ -1,5 +1,5 @@
-Metadata-Version: 2.1
-Name: guess-language-spirit
+Metadata-Version: 2.4
+Name: guess_language-spirit
 Version: 0.5.3
 Summary: Guess the natural language of a text
 Home-page: https://bitbucket.org/spirit/guess_language
@@ -11,6 +11,13 @@ Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 or l
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: summary
 
 guess_language โ€“ Guess the natural language of a text
 =====================================================
diff --git a/libs/guess_language_spirit-0.5.3.dist-info/RECORD b/libs/guess_language_spirit-0.5.3.dist-info/RECORD
index c02a2fe8cd..513ef3268f 100644
--- a/libs/guess_language_spirit-0.5.3.dist-info/RECORD
+++ b/libs/guess_language_spirit-0.5.3.dist-info/RECORD
@@ -70,8 +70,8 @@ guess_language/data/models/vi.py,sha256=A1-bGDXVRx4r_dGqAvHEHDvuJiQpXfIYa9DYLzLf
 guess_language/data/models/xh.py,sha256=gkQ8i_DixgzThg17YqU0vp3eP5-kcMFHWEdpgjbUSXQ,3826
 guess_language/data/models/zu.py,sha256=SguRTk-d_A7mVyznuVbP2joBLkPpwRYdaZClc3hUMHw,3826
 guess_language_spirit-0.5.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-guess_language_spirit-0.5.3.dist-info/METADATA,sha256=3PvSEj3x79xi0O38uBWHaGZCM6EIqiH37SRuI7iETqE,1925
+guess_language_spirit-0.5.3.dist-info/METADATA,sha256=dRD1NMRlJ4Y6thoCyMbwet796dnl4u3zDjqIYTJYWYs,2062
 guess_language_spirit-0.5.3.dist-info/RECORD,,
 guess_language_spirit-0.5.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-guess_language_spirit-0.5.3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+guess_language_spirit-0.5.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 guess_language_spirit-0.5.3.dist-info/top_level.txt,sha256=SN1QhobUTAAeXA3O17ZbzzUa9VIGm5XvcXM6rR8ask0,15
diff --git a/libs/guess_language_spirit-0.5.3.dist-info/WHEEL b/libs/guess_language_spirit-0.5.3.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/guess_language_spirit-0.5.3.dist-info/WHEEL
+++ b/libs/guess_language_spirit-0.5.3.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/guessit-3.8.0.dist-info/METADATA b/libs/guessit-3.8.0.dist-info/METADATA
index c2d5a2fb5a..6bd5e7f7ec 100644
--- a/libs/guessit-3.8.0.dist-info/METADATA
+++ b/libs/guessit-3.8.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: guessit
 Version: 3.8.0
 Summary: GuessIt - a library for guessing information from video filenames.
@@ -27,6 +27,13 @@ Requires-Dist: rebulk>=3.2.0
 Requires-Dist: babelfish>=0.6.0
 Requires-Dist: python-dateutil
 Requires-Dist: importlib-resources; python_version < "3.9"
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-mock; extra == "test"
+Requires-Dist: pytest-benchmark; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pylint; extra == "test"
+Requires-Dist: PyYAML; extra == "test"
 Provides-Extra: dev
 Requires-Dist: tox; extra == "dev"
 Requires-Dist: mkdocs; extra == "dev"
@@ -35,13 +42,19 @@ Requires-Dist: pyinstaller; extra == "dev"
 Requires-Dist: wheel; extra == "dev"
 Requires-Dist: python-semantic-release; extra == "dev"
 Requires-Dist: twine; extra == "dev"
-Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-mock; extra == "test"
-Requires-Dist: pytest-benchmark; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: pylint; extra == "test"
-Requires-Dist: PyYAML; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 GuessIt
 
diff --git a/libs/guessit-3.8.0.dist-info/RECORD b/libs/guessit-3.8.0.dist-info/RECORD
index aee9c2f8be..c90f013836 100644
--- a/libs/guessit-3.8.0.dist-info/RECORD
+++ b/libs/guessit-3.8.0.dist-info/RECORD
@@ -1,12 +1,12 @@
-../../bin/guessit,sha256=-LvCAvWHpDTnFHz1IR-wA2gEXYI0q9AednKo9i7oWrQ,238
-guessit-3.8.0.dist-info/AUTHORS.md,sha256=8UKCF10oLsrPtPLJPqw05bfJ5eyc0g91VmYcLEzi2f0,565
+../../bin/guessit,sha256=STgK2z_JWNzNiv7tXU3o_pQbkkeoa7B7fKm_1LEsWeQ,191
 guessit-3.8.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-guessit-3.8.0.dist-info/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-guessit-3.8.0.dist-info/METADATA,sha256=VUhjbKLAYqbDxZQqt4uabvRd_Pp-9TBOGZZZ8wav87E,140723
+guessit-3.8.0.dist-info/METADATA,sha256=OEoQQ0N98QSyJHEY944a1yElz2z9ricVZtNWxjFNWhQ,140998
 guessit-3.8.0.dist-info/RECORD,,
 guessit-3.8.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-guessit-3.8.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+guessit-3.8.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 guessit-3.8.0.dist-info/entry_points.txt,sha256=E03zXaeYI3YX6zekg8Gg3MO6reVOnJqH5G-Uh27QBsw,50
+guessit-3.8.0.dist-info/licenses/AUTHORS.md,sha256=8UKCF10oLsrPtPLJPqw05bfJ5eyc0g91VmYcLEzi2f0,565
+guessit-3.8.0.dist-info/licenses/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
 guessit-3.8.0.dist-info/top_level.txt,sha256=VXrxhYsS5fHWY-GfzrQYnsL1u_zplTpwxe7eOdfFQAU,8
 guessit-3.8.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 guessit/__init__.py,sha256=muM1TZ8H9JGjFJWiuz0L6fpMJTQ13DK0htFU0w8LQlg,351
diff --git a/libs/guessit-3.8.0.dist-info/WHEEL b/libs/guessit-3.8.0.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/guessit-3.8.0.dist-info/WHEEL
+++ b/libs/guessit-3.8.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/guessit-3.8.0.dist-info/AUTHORS.md b/libs/guessit-3.8.0.dist-info/licenses/AUTHORS.md
similarity index 100%
rename from libs/guessit-3.8.0.dist-info/AUTHORS.md
rename to libs/guessit-3.8.0.dist-info/licenses/AUTHORS.md
diff --git a/libs/guessit-3.8.0.dist-info/LICENSE b/libs/guessit-3.8.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/guessit-3.8.0.dist-info/LICENSE
rename to libs/guessit-3.8.0.dist-info/licenses/LICENSE
diff --git a/libs/h11-0.14.0.dist-info/METADATA b/libs/h11-0.14.0.dist-info/METADATA
deleted file mode 100644
index b2b8a5db47..0000000000
--- a/libs/h11-0.14.0.dist-info/METADATA
+++ /dev/null
@@ -1,193 +0,0 @@
-Metadata-Version: 2.1
-Name: h11
-Version: 0.14.0
-Summary: A pure-Python, bring-your-own-I/O implementation of HTTP/1.1
-Home-page: https://github.com/python-hyper/h11
-Author: Nathaniel J. Smith
-Author-email: njs@pobox.com
-License: MIT
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: System :: Networking
-Requires-Python: >=3.7
-License-File: LICENSE.txt
-Requires-Dist: typing-extensions; python_version < "3.8"
-
-h11
-===
-
-.. image:: https://travis-ci.org/python-hyper/h11.svg?branch=master
-   :target: https://travis-ci.org/python-hyper/h11
-   :alt: Automated test status
-
-.. image:: https://codecov.io/gh/python-hyper/h11/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/python-hyper/h11
-   :alt: Test coverage
-
-.. image:: https://readthedocs.org/projects/h11/badge/?version=latest
-   :target: http://h11.readthedocs.io/en/latest/?badge=latest
-   :alt: Documentation Status
-
-This is a little HTTP/1.1 library written from scratch in Python,
-heavily inspired by `hyper-h2 <https://hyper-h2.readthedocs.io/>`_.
-
-It's a "bring-your-own-I/O" library; h11 contains no IO code
-whatsoever. This means you can hook h11 up to your favorite network
-API, and that could be anything you want: synchronous, threaded,
-asynchronous, or your own implementation of `RFC 6214
-<https://tools.ietf.org/html/rfc6214>`_ -- h11 won't judge you.
-(Compare this to the current state of the art, where every time a `new
-network API <https://trio.readthedocs.io/>`_ comes along then someone
-gets to start over reimplementing the entire HTTP protocol from
-scratch.) Cory Benfield made an `excellent blog post describing the
-benefits of this approach
-<https://lukasa.co.uk/2015/10/The_New_Hyper/>`_, or if you like video
-then here's his `PyCon 2016 talk on the same theme
-<https://www.youtube.com/watch?v=7cC3_jGwl_U>`_.
-
-This also means that h11 is not immediately useful out of the box:
-it's a toolkit for building programs that speak HTTP, not something
-that could directly replace ``requests`` or ``twisted.web`` or
-whatever. But h11 makes it much easier to implement something like
-``requests`` or ``twisted.web``.
-
-At a high level, working with h11 goes like this:
-
-1) First, create an ``h11.Connection`` object to track the state of a
-   single HTTP/1.1 connection.
-
-2) When you read data off the network, pass it to
-   ``conn.receive_data(...)``; you'll get back a list of objects
-   representing high-level HTTP "events".
-
-3) When you want to send a high-level HTTP event, create the
-   corresponding "event" object and pass it to ``conn.send(...)``;
-   this will give you back some bytes that you can then push out
-   through the network.
-
-For example, a client might instantiate and then send a
-``h11.Request`` object, then zero or more ``h11.Data`` objects for the
-request body (e.g., if this is a POST), and then a
-``h11.EndOfMessage`` to indicate the end of the message. Then the
-server would then send back a ``h11.Response``, some ``h11.Data``, and
-its own ``h11.EndOfMessage``. If either side violates the protocol,
-you'll get a ``h11.ProtocolError`` exception.
-
-h11 is suitable for implementing both servers and clients, and has a
-pleasantly symmetric API: the events you send as a client are exactly
-the ones that you receive as a server and vice-versa.
-
-`Here's an example of a tiny HTTP client
-<https://github.com/python-hyper/h11/blob/master/examples/basic-client.py>`_
-
-It also has `a fine manual <https://h11.readthedocs.io/>`_.
-
-FAQ
----
-
-*Whyyyyy?*
-
-I wanted to play with HTTP in `Curio
-<https://curio.readthedocs.io/en/latest/tutorial.html>`__ and `Trio
-<https://trio.readthedocs.io>`__, which at the time didn't have any
-HTTP libraries. So I thought, no big deal, Python has, like, a dozen
-different implementations of HTTP, surely I can find one that's
-reusable. I didn't find one, but I did find Cory's call-to-arms
-blog-post. So I figured, well, fine, if I have to implement HTTP from
-scratch, at least I can make sure no-one *else* has to ever again.
-
-*Should I use it?*
-
-Maybe. You should be aware that it's a very young project. But, it's
-feature complete and has an exhaustive test-suite and complete docs,
-so the next step is for people to try using it and see how it goes
-:-). If you do then please let us know -- if nothing else we'll want
-to talk to you before making any incompatible changes!
-
-*What are the features/limitations?*
-
-Roughly speaking, it's trying to be a robust, complete, and non-hacky
-implementation of the first "chapter" of the HTTP/1.1 spec: `RFC 7230:
-HTTP/1.1 Message Syntax and Routing
-<https://tools.ietf.org/html/rfc7230>`_. That is, it mostly focuses on
-implementing HTTP at the level of taking bytes on and off the wire,
-and the headers related to that, and tries to be anal about spec
-conformance. It doesn't know about higher-level concerns like URL
-routing, conditional GETs, cross-origin cookie policies, or content
-negotiation. But it does know how to take care of framing,
-cross-version differences in keep-alive handling, and the "obsolete
-line folding" rule, so you can focus your energies on the hard /
-interesting parts for your application, and it tries to support the
-full specification in the sense that any useful HTTP/1.1 conformant
-application should be able to use h11.
-
-It's pure Python, and has no dependencies outside of the standard
-library.
-
-It has a test suite with 100.0% coverage for both statements and
-branches.
-
-Currently it supports Python 3 (testing on 3.7-3.10) and PyPy 3.
-The last Python 2-compatible version was h11 0.11.x.
-(Originally it had a Cython wrapper for `http-parser
-<https://github.com/nodejs/http-parser>`_ and a beautiful nested state
-machine implemented with ``yield from`` to postprocess the output. But
-I had to take these out -- the new *parser* needs fewer lines-of-code
-than the old *parser wrapper*, is written in pure Python, uses no
-exotic language syntax, and has more features. It's sad, really; that
-old state machine was really slick. I just need a few sentences here
-to mourn that.)
-
-I don't know how fast it is. I haven't benchmarked or profiled it yet,
-so it's probably got a few pointless hot spots, and I've been trying
-to err on the side of simplicity and robustness instead of
-micro-optimization. But at the architectural level I tried hard to
-avoid fundamentally bad decisions, e.g., I believe that all the
-parsing algorithms remain linear-time even in the face of pathological
-input like slowloris, and there are no byte-by-byte loops. (I also
-believe that it maintains bounded memory usage in the face of
-arbitrary/pathological input.)
-
-The whole library is ~800 lines-of-code. You can read and understand
-the whole thing in less than an hour. Most of the energy invested in
-this so far has been spent on trying to keep things simple by
-minimizing special-cases and ad hoc state manipulation; even though it
-is now quite small and simple, I'm still annoyed that I haven't
-figured out how to make it even smaller and simpler. (Unfortunately,
-HTTP does not lend itself to simplicity.)
-
-The API is ~feature complete and I don't expect the general outlines
-to change much, but you can't judge an API's ergonomics until you
-actually document and use it, so I'd expect some changes in the
-details.
-
-*How do I try it?*
-
-.. code-block:: sh
-
-  $ pip install h11
-  $ git clone git@github.com:python-hyper/h11
-  $ cd h11/examples
-  $ python basic-client.py
-
-and go from there.
-
-*License?*
-
-MIT
-
-*Code of conduct?*
-
-Contributors are requested to follow our `code of conduct
-<https://github.com/python-hyper/h11/blob/master/CODE_OF_CONDUCT.md>`_ in
-all project spaces.
diff --git a/libs/h11-0.14.0.dist-info/RECORD b/libs/h11-0.14.0.dist-info/RECORD
deleted file mode 100644
index 1a31701c69..0000000000
--- a/libs/h11-0.14.0.dist-info/RECORD
+++ /dev/null
@@ -1,31 +0,0 @@
-h11-0.14.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-h11-0.14.0.dist-info/LICENSE.txt,sha256=N9tbuFkm2yikJ6JYZ_ELEjIAOuob5pzLhRE4rbjm82E,1124
-h11-0.14.0.dist-info/METADATA,sha256=ql-03yzC2R3KPYYtngVlhyt21TRceo3qQTVx4j2s1KI,8174
-h11-0.14.0.dist-info/RECORD,,
-h11-0.14.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h11-0.14.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-h11-0.14.0.dist-info/top_level.txt,sha256=F7dC4jl3zeh8TGHEPaWJrMbeuoWbS379Gwdi-Yvdcis,4
-h11/__init__.py,sha256=iO1KzkSO42yZ6ffg-VMgbx_ZVTWGUY00nRYEWn-s3kY,1507
-h11/_abnf.py,sha256=ybixr0xsupnkA6GFAyMubuXF6Tc1lb_hF890NgCsfNc,4815
-h11/_connection.py,sha256=eS2sorMD0zKLCFiB9lW9W9F_Nzny2tjHa4e6s1ujr1c,26539
-h11/_events.py,sha256=LEfuvg1AbhHaVRwxCd0I-pFn9-ezUOaoL8o2Kvy1PBA,11816
-h11/_headers.py,sha256=RqB8cd8CN0blYPzcLe5qeCh-phv6D1U_CHj4hs67lgQ,10230
-h11/_readers.py,sha256=EbSed0jzwVUiD1nOPAeUcVE4Flf3wXkxfb8c06-OTBM,8383
-h11/_receivebuffer.py,sha256=xrspsdsNgWFxRfQcTXxR8RrdjRXXTK0Io5cQYWpJ1Ws,5252
-h11/_state.py,sha256=k1VL6SDbaPkSrZ-49ewCXDpuiUS69_46YhbWjuV1qEY,13300
-h11/_util.py,sha256=LWkkjXyJaFlAy6Lt39w73UStklFT5ovcvo0TkY7RYuk,4888
-h11/_version.py,sha256=LVyTdiZRzIIEv79UyOgbM5iUrJUllEzlCWaJEYBY1zc,686
-h11/_writers.py,sha256=oFKm6PtjeHfbj4RLX7VB7KDc1gIY53gXG3_HR9ltmTA,5081
-h11/py.typed,sha256=sow9soTwP9T_gEAQSVh7Gb8855h04Nwmhs2We-JRgZM,7
-h11/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-h11/tests/data/test-file,sha256=ZJ03Rqs98oJw29OHzJg7LlMzyGQaRAY0r3AqBeM2wVU,65
-h11/tests/helpers.py,sha256=a1EVG_p7xU4wRsa3tMPTRxuaKCmretok9sxXWvqfmQA,3355
-h11/tests/test_against_stdlib_http.py,sha256=cojCHgHXFQ8gWhNlEEwl3trmOpN-5uDukRoHnElqo3A,3995
-h11/tests/test_connection.py,sha256=ZbPLDPclKvjgjAhgk-WlCPBaf17c4XUIV2tpaW08jOI,38720
-h11/tests/test_events.py,sha256=LPVLbcV-NvPNK9fW3rraR6Bdpz1hAlsWubMtNaJ5gHg,4657
-h11/tests/test_headers.py,sha256=qd8T1Zenuz5GbD6wklSJ5G8VS7trrYgMV0jT-SMvqg8,5612
-h11/tests/test_helpers.py,sha256=kAo0CEM4LGqmyyP2ZFmhsyq3UFJqoFfAbzu3hbWreRM,794
-h11/tests/test_io.py,sha256=uCZVnjarkRBkudfC1ij-KSCQ71XWJhnkgkgWWkKgYPQ,16386
-h11/tests/test_receivebuffer.py,sha256=3jGbeJM36Akqg_pAhPb7XzIn2NS6RhPg-Ryg8Eu6ytk,3454
-h11/tests/test_state.py,sha256=rqll9WqFsJPE0zSrtCn9LH659mPKsDeXZ-DwXwleuBQ,8928
-h11/tests/test_util.py,sha256=VO5L4nSFe4pgtSwKuv6u_6l0H7UeizF5WKuHTWreg70,2970
diff --git a/libs/h11-0.14.0.dist-info/WHEEL b/libs/h11-0.14.0.dist-info/WHEEL
deleted file mode 100644
index da25d7b423..0000000000
--- a/libs/h11-0.14.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/dynaconf-3.2.6.dist-info/INSTALLER b/libs/h11-0.16.0.dist-info/INSTALLER
similarity index 100%
rename from libs/dynaconf-3.2.6.dist-info/INSTALLER
rename to libs/h11-0.16.0.dist-info/INSTALLER
diff --git a/libs/h11-0.16.0.dist-info/METADATA b/libs/h11-0.16.0.dist-info/METADATA
new file mode 100644
index 0000000000..8a2f639061
--- /dev/null
+++ b/libs/h11-0.16.0.dist-info/METADATA
@@ -0,0 +1,202 @@
+Metadata-Version: 2.4
+Name: h11
+Version: 0.16.0
+Summary: A pure-Python, bring-your-own-I/O implementation of HTTP/1.1
+Home-page: https://github.com/python-hyper/h11
+Author: Nathaniel J. Smith
+Author-email: njs@pobox.com
+License: MIT
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: System :: Networking
+Requires-Python: >=3.8
+License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
+
+h11
+===
+
+.. image:: https://travis-ci.org/python-hyper/h11.svg?branch=master
+   :target: https://travis-ci.org/python-hyper/h11
+   :alt: Automated test status
+
+.. image:: https://codecov.io/gh/python-hyper/h11/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/python-hyper/h11
+   :alt: Test coverage
+
+.. image:: https://readthedocs.org/projects/h11/badge/?version=latest
+   :target: http://h11.readthedocs.io/en/latest/?badge=latest
+   :alt: Documentation Status
+
+This is a little HTTP/1.1 library written from scratch in Python,
+heavily inspired by `hyper-h2 <https://hyper-h2.readthedocs.io/>`_.
+
+It's a "bring-your-own-I/O" library; h11 contains no IO code
+whatsoever. This means you can hook h11 up to your favorite network
+API, and that could be anything you want: synchronous, threaded,
+asynchronous, or your own implementation of `RFC 6214
+<https://tools.ietf.org/html/rfc6214>`_ -- h11 won't judge you.
+(Compare this to the current state of the art, where every time a `new
+network API <https://trio.readthedocs.io/>`_ comes along then someone
+gets to start over reimplementing the entire HTTP protocol from
+scratch.) Cory Benfield made an `excellent blog post describing the
+benefits of this approach
+<https://lukasa.co.uk/2015/10/The_New_Hyper/>`_, or if you like video
+then here's his `PyCon 2016 talk on the same theme
+<https://www.youtube.com/watch?v=7cC3_jGwl_U>`_.
+
+This also means that h11 is not immediately useful out of the box:
+it's a toolkit for building programs that speak HTTP, not something
+that could directly replace ``requests`` or ``twisted.web`` or
+whatever. But h11 makes it much easier to implement something like
+``requests`` or ``twisted.web``.
+
+At a high level, working with h11 goes like this:
+
+1) First, create an ``h11.Connection`` object to track the state of a
+   single HTTP/1.1 connection.
+
+2) When you read data off the network, pass it to
+   ``conn.receive_data(...)``; you'll get back a list of objects
+   representing high-level HTTP "events".
+
+3) When you want to send a high-level HTTP event, create the
+   corresponding "event" object and pass it to ``conn.send(...)``;
+   this will give you back some bytes that you can then push out
+   through the network.
+
+For example, a client might instantiate and then send a
+``h11.Request`` object, then zero or more ``h11.Data`` objects for the
+request body (e.g., if this is a POST), and then a
+``h11.EndOfMessage`` to indicate the end of the message. Then the
+server would then send back a ``h11.Response``, some ``h11.Data``, and
+its own ``h11.EndOfMessage``. If either side violates the protocol,
+you'll get a ``h11.ProtocolError`` exception.
+
+h11 is suitable for implementing both servers and clients, and has a
+pleasantly symmetric API: the events you send as a client are exactly
+the ones that you receive as a server and vice-versa.
+
+`Here's an example of a tiny HTTP client
+<https://github.com/python-hyper/h11/blob/master/examples/basic-client.py>`_
+
+It also has `a fine manual <https://h11.readthedocs.io/>`_.
+
+FAQ
+---
+
+*Whyyyyy?*
+
+I wanted to play with HTTP in `Curio
+<https://curio.readthedocs.io/en/latest/tutorial.html>`__ and `Trio
+<https://trio.readthedocs.io>`__, which at the time didn't have any
+HTTP libraries. So I thought, no big deal, Python has, like, a dozen
+different implementations of HTTP, surely I can find one that's
+reusable. I didn't find one, but I did find Cory's call-to-arms
+blog-post. So I figured, well, fine, if I have to implement HTTP from
+scratch, at least I can make sure no-one *else* has to ever again.
+
+*Should I use it?*
+
+Maybe. You should be aware that it's a very young project. But, it's
+feature complete and has an exhaustive test-suite and complete docs,
+so the next step is for people to try using it and see how it goes
+:-). If you do then please let us know -- if nothing else we'll want
+to talk to you before making any incompatible changes!
+
+*What are the features/limitations?*
+
+Roughly speaking, it's trying to be a robust, complete, and non-hacky
+implementation of the first "chapter" of the HTTP/1.1 spec: `RFC 7230:
+HTTP/1.1 Message Syntax and Routing
+<https://tools.ietf.org/html/rfc7230>`_. That is, it mostly focuses on
+implementing HTTP at the level of taking bytes on and off the wire,
+and the headers related to that, and tries to be anal about spec
+conformance. It doesn't know about higher-level concerns like URL
+routing, conditional GETs, cross-origin cookie policies, or content
+negotiation. But it does know how to take care of framing,
+cross-version differences in keep-alive handling, and the "obsolete
+line folding" rule, so you can focus your energies on the hard /
+interesting parts for your application, and it tries to support the
+full specification in the sense that any useful HTTP/1.1 conformant
+application should be able to use h11.
+
+It's pure Python, and has no dependencies outside of the standard
+library.
+
+It has a test suite with 100.0% coverage for both statements and
+branches.
+
+Currently it supports Python 3 (testing on 3.8-3.12) and PyPy 3.
+The last Python 2-compatible version was h11 0.11.x.
+(Originally it had a Cython wrapper for `http-parser
+<https://github.com/nodejs/http-parser>`_ and a beautiful nested state
+machine implemented with ``yield from`` to postprocess the output. But
+I had to take these out -- the new *parser* needs fewer lines-of-code
+than the old *parser wrapper*, is written in pure Python, uses no
+exotic language syntax, and has more features. It's sad, really; that
+old state machine was really slick. I just need a few sentences here
+to mourn that.)
+
+I don't know how fast it is. I haven't benchmarked or profiled it yet,
+so it's probably got a few pointless hot spots, and I've been trying
+to err on the side of simplicity and robustness instead of
+micro-optimization. But at the architectural level I tried hard to
+avoid fundamentally bad decisions, e.g., I believe that all the
+parsing algorithms remain linear-time even in the face of pathological
+input like slowloris, and there are no byte-by-byte loops. (I also
+believe that it maintains bounded memory usage in the face of
+arbitrary/pathological input.)
+
+The whole library is ~800 lines-of-code. You can read and understand
+the whole thing in less than an hour. Most of the energy invested in
+this so far has been spent on trying to keep things simple by
+minimizing special-cases and ad hoc state manipulation; even though it
+is now quite small and simple, I'm still annoyed that I haven't
+figured out how to make it even smaller and simpler. (Unfortunately,
+HTTP does not lend itself to simplicity.)
+
+The API is ~feature complete and I don't expect the general outlines
+to change much, but you can't judge an API's ergonomics until you
+actually document and use it, so I'd expect some changes in the
+details.
+
+*How do I try it?*
+
+.. code-block:: sh
+
+  $ pip install h11
+  $ git clone git@github.com:python-hyper/h11
+  $ cd h11/examples
+  $ python basic-client.py
+
+and go from there.
+
+*License?*
+
+MIT
+
+*Code of conduct?*
+
+Contributors are requested to follow our `code of conduct
+<https://github.com/python-hyper/h11/blob/master/CODE_OF_CONDUCT.md>`_ in
+all project spaces.
diff --git a/libs/h11-0.16.0.dist-info/RECORD b/libs/h11-0.16.0.dist-info/RECORD
new file mode 100644
index 0000000000..8259551578
--- /dev/null
+++ b/libs/h11-0.16.0.dist-info/RECORD
@@ -0,0 +1,19 @@
+h11-0.16.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+h11-0.16.0.dist-info/METADATA,sha256=KPMmCYrAn8unm48YD5YIfIQf4kViFct7hyqcfVzRnWQ,8348
+h11-0.16.0.dist-info/RECORD,,
+h11-0.16.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+h11-0.16.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+h11-0.16.0.dist-info/licenses/LICENSE.txt,sha256=N9tbuFkm2yikJ6JYZ_ELEjIAOuob5pzLhRE4rbjm82E,1124
+h11-0.16.0.dist-info/top_level.txt,sha256=F7dC4jl3zeh8TGHEPaWJrMbeuoWbS379Gwdi-Yvdcis,4
+h11/__init__.py,sha256=iO1KzkSO42yZ6ffg-VMgbx_ZVTWGUY00nRYEWn-s3kY,1507
+h11/_abnf.py,sha256=ybixr0xsupnkA6GFAyMubuXF6Tc1lb_hF890NgCsfNc,4815
+h11/_connection.py,sha256=k9YRVf6koZqbttBW36xSWaJpWdZwa-xQVU9AHEo9DuI,26863
+h11/_events.py,sha256=I97aXoal1Wu7dkL548BANBUCkOIbe-x5CioYA9IBY14,11792
+h11/_headers.py,sha256=P7D-lBNxHwdLZPLimmYwrPG-9ZkjElvvJZJdZAgSP-4,10412
+h11/_readers.py,sha256=a4RypORUCC3d0q_kxPuBIM7jTD8iLt5X91TH0FsduN4,8590
+h11/_receivebuffer.py,sha256=xrspsdsNgWFxRfQcTXxR8RrdjRXXTK0Io5cQYWpJ1Ws,5252
+h11/_state.py,sha256=_5LG_BGR8FCcFQeBPH-TMHgm_-B-EUcWCnQof_9XjFE,13231
+h11/_util.py,sha256=LWkkjXyJaFlAy6Lt39w73UStklFT5ovcvo0TkY7RYuk,4888
+h11/_version.py,sha256=GVSsbPSPDcOuF6ptfIiXnVJoaEm3ygXbMnqlr_Giahw,686
+h11/_writers.py,sha256=oFKm6PtjeHfbj4RLX7VB7KDc1gIY53gXG3_HR9ltmTA,5081
+h11/py.typed,sha256=sow9soTwP9T_gEAQSVh7Gb8855h04Nwmhs2We-JRgZM,7
diff --git a/libs/fcache-0.5.2.dist-info/REQUESTED b/libs/h11-0.16.0.dist-info/REQUESTED
similarity index 100%
rename from libs/fcache-0.5.2.dist-info/REQUESTED
rename to libs/h11-0.16.0.dist-info/REQUESTED
diff --git a/libs/h11-0.16.0.dist-info/WHEEL b/libs/h11-0.16.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/h11-0.16.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/h11-0.14.0.dist-info/LICENSE.txt b/libs/h11-0.16.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/h11-0.14.0.dist-info/LICENSE.txt
rename to libs/h11-0.16.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/h11-0.14.0.dist-info/top_level.txt b/libs/h11-0.16.0.dist-info/top_level.txt
similarity index 100%
rename from libs/h11-0.14.0.dist-info/top_level.txt
rename to libs/h11-0.16.0.dist-info/top_level.txt
diff --git a/libs/h11/_connection.py b/libs/h11/_connection.py
index d175270759..e37d82a82a 100644
--- a/libs/h11/_connection.py
+++ b/libs/h11/_connection.py
@@ -1,6 +1,17 @@
 # This contains the main Connection class. Everything in h11 revolves around
 # this.
-from typing import Any, Callable, cast, Dict, List, Optional, Tuple, Type, Union
+from typing import (
+    Any,
+    Callable,
+    cast,
+    Dict,
+    List,
+    Optional,
+    overload,
+    Tuple,
+    Type,
+    Union,
+)
 
 from ._events import (
     ConnectionClosed,
@@ -57,6 +68,7 @@ class PAUSED(Sentinel, metaclass=Sentinel):
 # - Apache: <8 KiB per line>
 DEFAULT_MAX_INCOMPLETE_EVENT_SIZE = 16 * 1024
 
+
 # RFC 7230's rules for connection lifecycles:
 # - If either side says they want to close the connection, then the connection
 #   must close.
@@ -160,7 +172,7 @@ def __init__(
         self._max_incomplete_event_size = max_incomplete_event_size
         # State and role tracking
         if our_role not in (CLIENT, SERVER):
-            raise ValueError("expected CLIENT or SERVER, not {!r}".format(our_role))
+            raise ValueError(f"expected CLIENT or SERVER, not {our_role!r}")
         self.our_role = our_role
         self.their_role: Type[Sentinel]
         if our_role is CLIENT:
@@ -416,7 +428,7 @@ def _extract_next_receive_event(
                 # return that event, and then the state will change and we'll
                 # get called again to generate the actual ConnectionClosed().
                 if hasattr(self._reader, "read_eof"):
-                    event = self._reader.read_eof()  # type: ignore[attr-defined]
+                    event = self._reader.read_eof()
                 else:
                     event = ConnectionClosed()
         if event is None:
@@ -488,6 +500,20 @@ def next_event(self) -> Union[Event, Type[NEED_DATA], Type[PAUSED]]:
             else:
                 raise
 
+    @overload
+    def send(self, event: ConnectionClosed) -> None:
+        ...
+
+    @overload
+    def send(
+        self, event: Union[Request, InformationalResponse, Response, Data, EndOfMessage]
+    ) -> bytes:
+        ...
+
+    @overload
+    def send(self, event: Event) -> Optional[bytes]:
+        ...
+
     def send(self, event: Event) -> Optional[bytes]:
         """Convert a high-level event into bytes that can be sent to the peer,
         while updating our internal state machine.
diff --git a/libs/h11/_events.py b/libs/h11/_events.py
index 075bf8a469..ca1c3adbde 100644
--- a/libs/h11/_events.py
+++ b/libs/h11/_events.py
@@ -7,8 +7,8 @@
 
 import re
 from abc import ABC
-from dataclasses import dataclass, field
-from typing import Any, cast, Dict, List, Tuple, Union
+from dataclasses import dataclass
+from typing import List, Tuple, Union
 
 from ._abnf import method, request_target
 from ._headers import Headers, normalize_and_validate
diff --git a/libs/h11/_headers.py b/libs/h11/_headers.py
index b97d020b63..31da3e2b23 100644
--- a/libs/h11/_headers.py
+++ b/libs/h11/_headers.py
@@ -12,6 +12,8 @@
 except ImportError:
     from typing_extensions import Literal  # type: ignore
 
+CONTENT_LENGTH_MAX_DIGITS = 20  # allow up to 1 billion TB - 1
+
 
 # Facts
 # -----
@@ -173,6 +175,8 @@ def normalize_and_validate(
                 raise LocalProtocolError("conflicting Content-Length headers")
             value = lengths.pop()
             validate(_content_length_re, value, "bad Content-Length")
+            if len(value) > CONTENT_LENGTH_MAX_DIGITS:
+                raise LocalProtocolError("bad Content-Length")
             if seen_content_length is None:
                 seen_content_length = value
                 new_headers.append((raw_name, name, value))
diff --git a/libs/h11/_readers.py b/libs/h11/_readers.py
index 08a9574da4..576804cc28 100644
--- a/libs/h11/_readers.py
+++ b/libs/h11/_readers.py
@@ -148,10 +148,9 @@ def read_eof(self) -> NoReturn:
 class ChunkedReader:
     def __init__(self) -> None:
         self._bytes_in_chunk = 0
-        # After reading a chunk, we have to throw away the trailing \r\n; if
-        # this is >0 then we discard that many bytes before resuming regular
-        # de-chunkification.
-        self._bytes_to_discard = 0
+        # After reading a chunk, we have to throw away the trailing \r\n.
+        # This tracks the bytes that we need to match and throw away.
+        self._bytes_to_discard = b""
         self._reading_trailer = False
 
     def __call__(self, buf: ReceiveBuffer) -> Union[Data, EndOfMessage, None]:
@@ -160,15 +159,19 @@ def __call__(self, buf: ReceiveBuffer) -> Union[Data, EndOfMessage, None]:
             if lines is None:
                 return None
             return EndOfMessage(headers=list(_decode_header_lines(lines)))
-        if self._bytes_to_discard > 0:
-            data = buf.maybe_extract_at_most(self._bytes_to_discard)
+        if self._bytes_to_discard:
+            data = buf.maybe_extract_at_most(len(self._bytes_to_discard))
             if data is None:
                 return None
-            self._bytes_to_discard -= len(data)
-            if self._bytes_to_discard > 0:
+            if data != self._bytes_to_discard[: len(data)]:
+                raise LocalProtocolError(
+                    f"malformed chunk footer: {data!r} (expected {self._bytes_to_discard!r})"
+                )
+            self._bytes_to_discard = self._bytes_to_discard[len(data) :]
+            if self._bytes_to_discard:
                 return None
             # else, fall through and read some more
-        assert self._bytes_to_discard == 0
+        assert self._bytes_to_discard == b""
         if self._bytes_in_chunk == 0:
             # We need to refill our chunk count
             chunk_header = buf.maybe_extract_next_line()
@@ -194,7 +197,7 @@ def __call__(self, buf: ReceiveBuffer) -> Union[Data, EndOfMessage, None]:
             return None
         self._bytes_in_chunk -= len(data)
         if self._bytes_in_chunk == 0:
-            self._bytes_to_discard = 2
+            self._bytes_to_discard = b"\r\n"
             chunk_end = True
         else:
             chunk_end = False
diff --git a/libs/h11/_state.py b/libs/h11/_state.py
index 3593430a74..3ad444b043 100644
--- a/libs/h11/_state.py
+++ b/libs/h11/_state.py
@@ -283,9 +283,7 @@ def process_event(
             assert role is SERVER
             if server_switch_event not in self.pending_switch_proposals:
                 raise LocalProtocolError(
-                    "Received server {} event without a pending proposal".format(
-                        server_switch_event
-                    )
+                    "Received server _SWITCH_UPGRADE event without a pending proposal"
                 )
             _event_type = (event_type, server_switch_event)
         if server_switch_event is None and _event_type is Response:
@@ -358,7 +356,7 @@ def _fire_state_triggered_transitions(self) -> None:
     def start_next_cycle(self) -> None:
         if self.states != {CLIENT: DONE, SERVER: DONE}:
             raise LocalProtocolError(
-                "not in a reusable state. self.states={}".format(self.states)
+                f"not in a reusable state. self.states={self.states}"
             )
         # Can't reach DONE/DONE with any of these active, but still, let's be
         # sure.
diff --git a/libs/h11/_version.py b/libs/h11/_version.py
index 4c89113056..76e7327b86 100644
--- a/libs/h11/_version.py
+++ b/libs/h11/_version.py
@@ -13,4 +13,4 @@
 # want. (Contrast with the special suffix 1.0.0.dev, which sorts *before*
 # 1.0.0.)
 
-__version__ = "0.14.0"
+__version__ = "0.16.0"
diff --git a/libs/h11/tests/data/test-file b/libs/h11/tests/data/test-file
deleted file mode 100644
index d0be0a6c5d..0000000000
--- a/libs/h11/tests/data/test-file
+++ /dev/null
@@ -1 +0,0 @@
-92b12bc045050b55b848d37167a1a63947c364579889ce1d39788e45e9fac9e5
diff --git a/libs/h11/tests/helpers.py b/libs/h11/tests/helpers.py
deleted file mode 100644
index 571be44461..0000000000
--- a/libs/h11/tests/helpers.py
+++ /dev/null
@@ -1,101 +0,0 @@
-from typing import cast, List, Type, Union, ValuesView
-
-from .._connection import Connection, NEED_DATA, PAUSED
-from .._events import (
-    ConnectionClosed,
-    Data,
-    EndOfMessage,
-    Event,
-    InformationalResponse,
-    Request,
-    Response,
-)
-from .._state import CLIENT, CLOSED, DONE, MUST_CLOSE, SERVER
-from .._util import Sentinel
-
-try:
-    from typing import Literal
-except ImportError:
-    from typing_extensions import Literal  # type: ignore
-
-
-def get_all_events(conn: Connection) -> List[Event]:
-    got_events = []
-    while True:
-        event = conn.next_event()
-        if event in (NEED_DATA, PAUSED):
-            break
-        event = cast(Event, event)
-        got_events.append(event)
-        if type(event) is ConnectionClosed:
-            break
-    return got_events
-
-
-def receive_and_get(conn: Connection, data: bytes) -> List[Event]:
-    conn.receive_data(data)
-    return get_all_events(conn)
-
-
-# Merges adjacent Data events, converts payloads to bytestrings, and removes
-# chunk boundaries.
-def normalize_data_events(in_events: List[Event]) -> List[Event]:
-    out_events: List[Event] = []
-    for event in in_events:
-        if type(event) is Data:
-            event = Data(data=bytes(event.data), chunk_start=False, chunk_end=False)
-        if out_events and type(out_events[-1]) is type(event) is Data:
-            out_events[-1] = Data(
-                data=out_events[-1].data + event.data,
-                chunk_start=out_events[-1].chunk_start,
-                chunk_end=out_events[-1].chunk_end,
-            )
-        else:
-            out_events.append(event)
-    return out_events
-
-
-# Given that we want to write tests that push some events through a Connection
-# and check that its state updates appropriately... we might as make a habit
-# of pushing them through two Connections with a fake network link in
-# between.
-class ConnectionPair:
-    def __init__(self) -> None:
-        self.conn = {CLIENT: Connection(CLIENT), SERVER: Connection(SERVER)}
-        self.other = {CLIENT: SERVER, SERVER: CLIENT}
-
-    @property
-    def conns(self) -> ValuesView[Connection]:
-        return self.conn.values()
-
-    # expect="match" if expect=send_events; expect=[...] to say what expected
-    def send(
-        self,
-        role: Type[Sentinel],
-        send_events: Union[List[Event], Event],
-        expect: Union[List[Event], Event, Literal["match"]] = "match",
-    ) -> bytes:
-        if not isinstance(send_events, list):
-            send_events = [send_events]
-        data = b""
-        closed = False
-        for send_event in send_events:
-            new_data = self.conn[role].send(send_event)
-            if new_data is None:
-                closed = True
-            else:
-                data += new_data
-        # send uses b"" to mean b"", and None to mean closed
-        # receive uses b"" to mean closed, and None to mean "try again"
-        # so we have to translate between the two conventions
-        if data:
-            self.conn[self.other[role]].receive_data(data)
-        if closed:
-            self.conn[self.other[role]].receive_data(b"")
-        got_events = get_all_events(self.conn[self.other[role]])
-        if expect == "match":
-            expect = send_events
-        if not isinstance(expect, list):
-            expect = [expect]
-        assert got_events == expect
-        return data
diff --git a/libs/h11/tests/test_against_stdlib_http.py b/libs/h11/tests/test_against_stdlib_http.py
deleted file mode 100644
index d2ee13149d..0000000000
--- a/libs/h11/tests/test_against_stdlib_http.py
+++ /dev/null
@@ -1,115 +0,0 @@
-import json
-import os.path
-import socket
-import socketserver
-import threading
-from contextlib import closing, contextmanager
-from http.server import SimpleHTTPRequestHandler
-from typing import Callable, Generator
-from urllib.request import urlopen
-
-import h11
-
-
-@contextmanager
-def socket_server(
-    handler: Callable[..., socketserver.BaseRequestHandler]
-) -> Generator[socketserver.TCPServer, None, None]:
-    httpd = socketserver.TCPServer(("127.0.0.1", 0), handler)
-    thread = threading.Thread(
-        target=httpd.serve_forever, kwargs={"poll_interval": 0.01}
-    )
-    thread.daemon = True
-    try:
-        thread.start()
-        yield httpd
-    finally:
-        httpd.shutdown()
-
-
-test_file_path = os.path.join(os.path.dirname(__file__), "data/test-file")
-with open(test_file_path, "rb") as f:
-    test_file_data = f.read()
-
-
-class SingleMindedRequestHandler(SimpleHTTPRequestHandler):
-    def translate_path(self, path: str) -> str:
-        return test_file_path
-
-
-def test_h11_as_client() -> None:
-    with socket_server(SingleMindedRequestHandler) as httpd:
-        with closing(socket.create_connection(httpd.server_address)) as s:
-            c = h11.Connection(h11.CLIENT)
-
-            s.sendall(
-                c.send(  # type: ignore[arg-type]
-                    h11.Request(
-                        method="GET", target="/foo", headers=[("Host", "localhost")]
-                    )
-                )
-            )
-            s.sendall(c.send(h11.EndOfMessage()))  # type: ignore[arg-type]
-
-            data = bytearray()
-            while True:
-                event = c.next_event()
-                print(event)
-                if event is h11.NEED_DATA:
-                    # Use a small read buffer to make things more challenging
-                    # and exercise more paths :-)
-                    c.receive_data(s.recv(10))
-                    continue
-                if type(event) is h11.Response:
-                    assert event.status_code == 200
-                if type(event) is h11.Data:
-                    data += event.data
-                if type(event) is h11.EndOfMessage:
-                    break
-            assert bytes(data) == test_file_data
-
-
-class H11RequestHandler(socketserver.BaseRequestHandler):
-    def handle(self) -> None:
-        with closing(self.request) as s:
-            c = h11.Connection(h11.SERVER)
-            request = None
-            while True:
-                event = c.next_event()
-                if event is h11.NEED_DATA:
-                    # Use a small read buffer to make things more challenging
-                    # and exercise more paths :-)
-                    c.receive_data(s.recv(10))
-                    continue
-                if type(event) is h11.Request:
-                    request = event
-                if type(event) is h11.EndOfMessage:
-                    break
-            assert request is not None
-            info = json.dumps(
-                {
-                    "method": request.method.decode("ascii"),
-                    "target": request.target.decode("ascii"),
-                    "headers": {
-                        name.decode("ascii"): value.decode("ascii")
-                        for (name, value) in request.headers
-                    },
-                }
-            )
-            s.sendall(c.send(h11.Response(status_code=200, headers=[])))  # type: ignore[arg-type]
-            s.sendall(c.send(h11.Data(data=info.encode("ascii"))))
-            s.sendall(c.send(h11.EndOfMessage()))
-
-
-def test_h11_as_server() -> None:
-    with socket_server(H11RequestHandler) as httpd:
-        host, port = httpd.server_address
-        url = "http://{}:{}/some-path".format(host, port)
-        with closing(urlopen(url)) as f:
-            assert f.getcode() == 200
-            data = f.read()
-    info = json.loads(data.decode("ascii"))
-    print(info)
-    assert info["method"] == "GET"
-    assert info["target"] == "/some-path"
-    assert "urllib" in info["headers"]["user-agent"]
diff --git a/libs/h11/tests/test_connection.py b/libs/h11/tests/test_connection.py
deleted file mode 100644
index 73a27b98be..0000000000
--- a/libs/h11/tests/test_connection.py
+++ /dev/null
@@ -1,1122 +0,0 @@
-from typing import Any, cast, Dict, List, Optional, Tuple, Type
-
-import pytest
-
-from .._connection import _body_framing, _keep_alive, Connection, NEED_DATA, PAUSED
-from .._events import (
-    ConnectionClosed,
-    Data,
-    EndOfMessage,
-    Event,
-    InformationalResponse,
-    Request,
-    Response,
-)
-from .._state import (
-    CLIENT,
-    CLOSED,
-    DONE,
-    ERROR,
-    IDLE,
-    MIGHT_SWITCH_PROTOCOL,
-    MUST_CLOSE,
-    SEND_BODY,
-    SEND_RESPONSE,
-    SERVER,
-    SWITCHED_PROTOCOL,
-)
-from .._util import LocalProtocolError, RemoteProtocolError, Sentinel
-from .helpers import ConnectionPair, get_all_events, receive_and_get
-
-
-def test__keep_alive() -> None:
-    assert _keep_alive(
-        Request(method="GET", target="/", headers=[("Host", "Example.com")])
-    )
-    assert not _keep_alive(
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "Example.com"), ("Connection", "close")],
-        )
-    )
-    assert not _keep_alive(
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "Example.com"), ("Connection", "a, b, cLOse, foo")],
-        )
-    )
-    assert not _keep_alive(
-        Request(method="GET", target="/", headers=[], http_version="1.0")  # type: ignore[arg-type]
-    )
-
-    assert _keep_alive(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    assert not _keep_alive(Response(status_code=200, headers=[("Connection", "close")]))
-    assert not _keep_alive(
-        Response(status_code=200, headers=[("Connection", "a, b, cLOse, foo")])
-    )
-    assert not _keep_alive(Response(status_code=200, headers=[], http_version="1.0"))  # type: ignore[arg-type]
-
-
-def test__body_framing() -> None:
-    def headers(cl: Optional[int], te: bool) -> List[Tuple[str, str]]:
-        headers = []
-        if cl is not None:
-            headers.append(("Content-Length", str(cl)))
-        if te:
-            headers.append(("Transfer-Encoding", "chunked"))
-        return headers
-
-    def resp(
-        status_code: int = 200, cl: Optional[int] = None, te: bool = False
-    ) -> Response:
-        return Response(status_code=status_code, headers=headers(cl, te))
-
-    def req(cl: Optional[int] = None, te: bool = False) -> Request:
-        h = headers(cl, te)
-        h += [("Host", "example.com")]
-        return Request(method="GET", target="/", headers=h)
-
-    # Special cases where the headers are ignored:
-    for kwargs in [{}, {"cl": 100}, {"te": True}, {"cl": 100, "te": True}]:
-        kwargs = cast(Dict[str, Any], kwargs)
-        for meth, r in [
-            (b"HEAD", resp(**kwargs)),
-            (b"GET", resp(status_code=204, **kwargs)),
-            (b"GET", resp(status_code=304, **kwargs)),
-        ]:
-            assert _body_framing(meth, r) == ("content-length", (0,))
-
-    # Transfer-encoding
-    for kwargs in [{"te": True}, {"cl": 100, "te": True}]:
-        kwargs = cast(Dict[str, Any], kwargs)
-        for meth, r in [(None, req(**kwargs)), (b"GET", resp(**kwargs))]:  # type: ignore
-            assert _body_framing(meth, r) == ("chunked", ())
-
-    # Content-Length
-    for meth, r in [(None, req(cl=100)), (b"GET", resp(cl=100))]:  # type: ignore
-        assert _body_framing(meth, r) == ("content-length", (100,))
-
-    # No headers
-    assert _body_framing(None, req()) == ("content-length", (0,))  # type: ignore
-    assert _body_framing(b"GET", resp()) == ("http/1.0", ())
-
-
-def test_Connection_basics_and_content_length() -> None:
-    with pytest.raises(ValueError):
-        Connection("CLIENT")  # type: ignore
-
-    p = ConnectionPair()
-    assert p.conn[CLIENT].our_role is CLIENT
-    assert p.conn[CLIENT].their_role is SERVER
-    assert p.conn[SERVER].our_role is SERVER
-    assert p.conn[SERVER].their_role is CLIENT
-
-    data = p.send(
-        CLIENT,
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "example.com"), ("Content-Length", "10")],
-        ),
-    )
-    assert data == (
-        b"GET / HTTP/1.1\r\n" b"Host: example.com\r\n" b"Content-Length: 10\r\n\r\n"
-    )
-
-    for conn in p.conns:
-        assert conn.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-    assert p.conn[CLIENT].our_state is SEND_BODY
-    assert p.conn[CLIENT].their_state is SEND_RESPONSE
-    assert p.conn[SERVER].our_state is SEND_RESPONSE
-    assert p.conn[SERVER].their_state is SEND_BODY
-
-    assert p.conn[CLIENT].their_http_version is None
-    assert p.conn[SERVER].their_http_version == b"1.1"
-
-    data = p.send(SERVER, InformationalResponse(status_code=100, headers=[]))  # type: ignore[arg-type]
-    assert data == b"HTTP/1.1 100 \r\n\r\n"
-
-    data = p.send(SERVER, Response(status_code=200, headers=[("Content-Length", "11")]))
-    assert data == b"HTTP/1.1 200 \r\nContent-Length: 11\r\n\r\n"
-
-    for conn in p.conns:
-        assert conn.states == {CLIENT: SEND_BODY, SERVER: SEND_BODY}
-
-    assert p.conn[CLIENT].their_http_version == b"1.1"
-    assert p.conn[SERVER].their_http_version == b"1.1"
-
-    data = p.send(CLIENT, Data(data=b"12345"))
-    assert data == b"12345"
-    data = p.send(
-        CLIENT, Data(data=b"67890"), expect=[Data(data=b"67890"), EndOfMessage()]
-    )
-    assert data == b"67890"
-    data = p.send(CLIENT, EndOfMessage(), expect=[])
-    assert data == b""
-
-    for conn in p.conns:
-        assert conn.states == {CLIENT: DONE, SERVER: SEND_BODY}
-
-    data = p.send(SERVER, Data(data=b"1234567890"))
-    assert data == b"1234567890"
-    data = p.send(SERVER, Data(data=b"1"), expect=[Data(data=b"1"), EndOfMessage()])
-    assert data == b"1"
-    data = p.send(SERVER, EndOfMessage(), expect=[])
-    assert data == b""
-
-    for conn in p.conns:
-        assert conn.states == {CLIENT: DONE, SERVER: DONE}
-
-
-def test_chunked() -> None:
-    p = ConnectionPair()
-
-    p.send(
-        CLIENT,
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "example.com"), ("Transfer-Encoding", "chunked")],
-        ),
-    )
-    data = p.send(CLIENT, Data(data=b"1234567890", chunk_start=True, chunk_end=True))
-    assert data == b"a\r\n1234567890\r\n"
-    data = p.send(CLIENT, Data(data=b"abcde", chunk_start=True, chunk_end=True))
-    assert data == b"5\r\nabcde\r\n"
-    data = p.send(CLIENT, Data(data=b""), expect=[])
-    assert data == b""
-    data = p.send(CLIENT, EndOfMessage(headers=[("hello", "there")]))
-    assert data == b"0\r\nhello: there\r\n\r\n"
-
-    p.send(
-        SERVER, Response(status_code=200, headers=[("Transfer-Encoding", "chunked")])
-    )
-    p.send(SERVER, Data(data=b"54321", chunk_start=True, chunk_end=True))
-    p.send(SERVER, Data(data=b"12345", chunk_start=True, chunk_end=True))
-    p.send(SERVER, EndOfMessage())
-
-    for conn in p.conns:
-        assert conn.states == {CLIENT: DONE, SERVER: DONE}
-
-
-def test_chunk_boundaries() -> None:
-    conn = Connection(our_role=SERVER)
-
-    request = (
-        b"POST / HTTP/1.1\r\n"
-        b"Host: example.com\r\n"
-        b"Transfer-Encoding: chunked\r\n"
-        b"\r\n"
-    )
-    conn.receive_data(request)
-    assert conn.next_event() == Request(
-        method="POST",
-        target="/",
-        headers=[("Host", "example.com"), ("Transfer-Encoding", "chunked")],
-    )
-    assert conn.next_event() is NEED_DATA
-
-    conn.receive_data(b"5\r\nhello\r\n")
-    assert conn.next_event() == Data(data=b"hello", chunk_start=True, chunk_end=True)
-
-    conn.receive_data(b"5\r\nhel")
-    assert conn.next_event() == Data(data=b"hel", chunk_start=True, chunk_end=False)
-
-    conn.receive_data(b"l")
-    assert conn.next_event() == Data(data=b"l", chunk_start=False, chunk_end=False)
-
-    conn.receive_data(b"o\r\n")
-    assert conn.next_event() == Data(data=b"o", chunk_start=False, chunk_end=True)
-
-    conn.receive_data(b"5\r\nhello")
-    assert conn.next_event() == Data(data=b"hello", chunk_start=True, chunk_end=True)
-
-    conn.receive_data(b"\r\n")
-    assert conn.next_event() == NEED_DATA
-
-    conn.receive_data(b"0\r\n\r\n")
-    assert conn.next_event() == EndOfMessage()
-
-
-def test_client_talking_to_http10_server() -> None:
-    c = Connection(CLIENT)
-    c.send(Request(method="GET", target="/", headers=[("Host", "example.com")]))
-    c.send(EndOfMessage())
-    assert c.our_state is DONE
-    # No content-length, so Http10 framing for body
-    assert receive_and_get(c, b"HTTP/1.0 200 OK\r\n\r\n") == [
-        Response(status_code=200, headers=[], http_version="1.0", reason=b"OK")  # type: ignore[arg-type]
-    ]
-    assert c.our_state is MUST_CLOSE
-    assert receive_and_get(c, b"12345") == [Data(data=b"12345")]
-    assert receive_and_get(c, b"67890") == [Data(data=b"67890")]
-    assert receive_and_get(c, b"") == [EndOfMessage(), ConnectionClosed()]
-    assert c.their_state is CLOSED
-
-
-def test_server_talking_to_http10_client() -> None:
-    c = Connection(SERVER)
-    # No content-length, so no body
-    # NB: no host header
-    assert receive_and_get(c, b"GET / HTTP/1.0\r\n\r\n") == [
-        Request(method="GET", target="/", headers=[], http_version="1.0"),  # type: ignore[arg-type]
-        EndOfMessage(),
-    ]
-    assert c.their_state is MUST_CLOSE
-
-    # We automatically Connection: close back at them
-    assert (
-        c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-        == b"HTTP/1.1 200 \r\nConnection: close\r\n\r\n"
-    )
-
-    assert c.send(Data(data=b"12345")) == b"12345"
-    assert c.send(EndOfMessage()) == b""
-    assert c.our_state is MUST_CLOSE
-
-    # Check that it works if they do send Content-Length
-    c = Connection(SERVER)
-    # NB: no host header
-    assert receive_and_get(c, b"POST / HTTP/1.0\r\nContent-Length: 10\r\n\r\n1") == [
-        Request(
-            method="POST",
-            target="/",
-            headers=[("Content-Length", "10")],
-            http_version="1.0",
-        ),
-        Data(data=b"1"),
-    ]
-    assert receive_and_get(c, b"234567890") == [Data(data=b"234567890"), EndOfMessage()]
-    assert c.their_state is MUST_CLOSE
-    assert receive_and_get(c, b"") == [ConnectionClosed()]
-
-
-def test_automatic_transfer_encoding_in_response() -> None:
-    # Check that in responses, the user can specify either Transfer-Encoding:
-    # chunked or no framing at all, and in both cases we automatically select
-    # the right option depending on whether the peer speaks HTTP/1.0 or
-    # HTTP/1.1
-    for user_headers in [
-        [("Transfer-Encoding", "chunked")],
-        [],
-        # In fact, this even works if Content-Length is set,
-        # because if both are set then Transfer-Encoding wins
-        [("Transfer-Encoding", "chunked"), ("Content-Length", "100")],
-    ]:
-        user_headers = cast(List[Tuple[str, str]], user_headers)
-        p = ConnectionPair()
-        p.send(
-            CLIENT,
-            [
-                Request(method="GET", target="/", headers=[("Host", "example.com")]),
-                EndOfMessage(),
-            ],
-        )
-        # When speaking to HTTP/1.1 client, all of the above cases get
-        # normalized to Transfer-Encoding: chunked
-        p.send(
-            SERVER,
-            Response(status_code=200, headers=user_headers),
-            expect=Response(
-                status_code=200, headers=[("Transfer-Encoding", "chunked")]
-            ),
-        )
-
-        # When speaking to HTTP/1.0 client, all of the above cases get
-        # normalized to no-framing-headers
-        c = Connection(SERVER)
-        receive_and_get(c, b"GET / HTTP/1.0\r\n\r\n")
-        assert (
-            c.send(Response(status_code=200, headers=user_headers))
-            == b"HTTP/1.1 200 \r\nConnection: close\r\n\r\n"
-        )
-        assert c.send(Data(data=b"12345")) == b"12345"
-
-
-def test_automagic_connection_close_handling() -> None:
-    p = ConnectionPair()
-    # If the user explicitly sets Connection: close, then we notice and
-    # respect it
-    p.send(
-        CLIENT,
-        [
-            Request(
-                method="GET",
-                target="/",
-                headers=[("Host", "example.com"), ("Connection", "close")],
-            ),
-            EndOfMessage(),
-        ],
-    )
-    for conn in p.conns:
-        assert conn.states[CLIENT] is MUST_CLOSE
-    # And if the client sets it, the server automatically echoes it back
-    p.send(
-        SERVER,
-        # no header here...
-        [Response(status_code=204, headers=[]), EndOfMessage()],  # type: ignore[arg-type]
-        # ...but oh look, it arrived anyway
-        expect=[
-            Response(status_code=204, headers=[("connection", "close")]),
-            EndOfMessage(),
-        ],
-    )
-    for conn in p.conns:
-        assert conn.states == {CLIENT: MUST_CLOSE, SERVER: MUST_CLOSE}
-
-
-def test_100_continue() -> None:
-    def setup() -> ConnectionPair:
-        p = ConnectionPair()
-        p.send(
-            CLIENT,
-            Request(
-                method="GET",
-                target="/",
-                headers=[
-                    ("Host", "example.com"),
-                    ("Content-Length", "100"),
-                    ("Expect", "100-continue"),
-                ],
-            ),
-        )
-        for conn in p.conns:
-            assert conn.client_is_waiting_for_100_continue
-        assert not p.conn[CLIENT].they_are_waiting_for_100_continue
-        assert p.conn[SERVER].they_are_waiting_for_100_continue
-        return p
-
-    # Disabled by 100 Continue
-    p = setup()
-    p.send(SERVER, InformationalResponse(status_code=100, headers=[]))  # type: ignore[arg-type]
-    for conn in p.conns:
-        assert not conn.client_is_waiting_for_100_continue
-        assert not conn.they_are_waiting_for_100_continue
-
-    # Disabled by a real response
-    p = setup()
-    p.send(
-        SERVER, Response(status_code=200, headers=[("Transfer-Encoding", "chunked")])
-    )
-    for conn in p.conns:
-        assert not conn.client_is_waiting_for_100_continue
-        assert not conn.they_are_waiting_for_100_continue
-
-    # Disabled by the client going ahead and sending stuff anyway
-    p = setup()
-    p.send(CLIENT, Data(data=b"12345"))
-    for conn in p.conns:
-        assert not conn.client_is_waiting_for_100_continue
-        assert not conn.they_are_waiting_for_100_continue
-
-
-def test_max_incomplete_event_size_countermeasure() -> None:
-    # Infinitely long headers are definitely not okay
-    c = Connection(SERVER)
-    c.receive_data(b"GET / HTTP/1.0\r\nEndless: ")
-    assert c.next_event() is NEED_DATA
-    with pytest.raises(RemoteProtocolError):
-        while True:
-            c.receive_data(b"a" * 1024)
-            c.next_event()
-
-    # Checking that the same header is accepted / rejected depending on the
-    # max_incomplete_event_size setting:
-    c = Connection(SERVER, max_incomplete_event_size=5000)
-    c.receive_data(b"GET / HTTP/1.0\r\nBig: ")
-    c.receive_data(b"a" * 4000)
-    c.receive_data(b"\r\n\r\n")
-    assert get_all_events(c) == [
-        Request(
-            method="GET", target="/", http_version="1.0", headers=[("big", "a" * 4000)]
-        ),
-        EndOfMessage(),
-    ]
-
-    c = Connection(SERVER, max_incomplete_event_size=4000)
-    c.receive_data(b"GET / HTTP/1.0\r\nBig: ")
-    c.receive_data(b"a" * 4000)
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-    # Temporarily exceeding the size limit is fine, as long as its done with
-    # complete events:
-    c = Connection(SERVER, max_incomplete_event_size=5000)
-    c.receive_data(b"GET / HTTP/1.0\r\nContent-Length: 10000")
-    c.receive_data(b"\r\n\r\n" + b"a" * 10000)
-    assert get_all_events(c) == [
-        Request(
-            method="GET",
-            target="/",
-            http_version="1.0",
-            headers=[("Content-Length", "10000")],
-        ),
-        Data(data=b"a" * 10000),
-        EndOfMessage(),
-    ]
-
-    c = Connection(SERVER, max_incomplete_event_size=100)
-    # Two pipelined requests to create a way-too-big receive buffer... but
-    # it's fine because we're not checking
-    c.receive_data(
-        b"GET /1 HTTP/1.1\r\nHost: a\r\n\r\n"
-        b"GET /2 HTTP/1.1\r\nHost: b\r\n\r\n" + b"X" * 1000
-    )
-    assert get_all_events(c) == [
-        Request(method="GET", target="/1", headers=[("host", "a")]),
-        EndOfMessage(),
-    ]
-    # Even more data comes in, still no problem
-    c.receive_data(b"X" * 1000)
-    # We can respond and reuse to get the second pipelined request
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-    c.start_next_cycle()
-    assert get_all_events(c) == [
-        Request(method="GET", target="/2", headers=[("host", "b")]),
-        EndOfMessage(),
-    ]
-    # But once we unpause and try to read the next message, and find that it's
-    # incomplete and the buffer is *still* way too large, then *that's* a
-    # problem:
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-    c.start_next_cycle()
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-
-def test_reuse_simple() -> None:
-    p = ConnectionPair()
-    p.send(
-        CLIENT,
-        [Request(method="GET", target="/", headers=[("Host", "a")]), EndOfMessage()],
-    )
-    p.send(
-        SERVER,
-        [
-            Response(status_code=200, headers=[(b"transfer-encoding", b"chunked")]),
-            EndOfMessage(),
-        ],
-    )
-    for conn in p.conns:
-        assert conn.states == {CLIENT: DONE, SERVER: DONE}
-        conn.start_next_cycle()
-
-    p.send(
-        CLIENT,
-        [
-            Request(method="DELETE", target="/foo", headers=[("Host", "a")]),
-            EndOfMessage(),
-        ],
-    )
-    p.send(
-        SERVER,
-        [
-            Response(status_code=404, headers=[(b"transfer-encoding", b"chunked")]),
-            EndOfMessage(),
-        ],
-    )
-
-
-def test_pipelining() -> None:
-    # Client doesn't support pipelining, so we have to do this by hand
-    c = Connection(SERVER)
-    assert c.next_event() is NEED_DATA
-    # 3 requests all bunched up
-    c.receive_data(
-        b"GET /1 HTTP/1.1\r\nHost: a.com\r\nContent-Length: 5\r\n\r\n"
-        b"12345"
-        b"GET /2 HTTP/1.1\r\nHost: a.com\r\nContent-Length: 5\r\n\r\n"
-        b"67890"
-        b"GET /3 HTTP/1.1\r\nHost: a.com\r\n\r\n"
-    )
-    assert get_all_events(c) == [
-        Request(
-            method="GET",
-            target="/1",
-            headers=[("Host", "a.com"), ("Content-Length", "5")],
-        ),
-        Data(data=b"12345"),
-        EndOfMessage(),
-    ]
-    assert c.their_state is DONE
-    assert c.our_state is SEND_RESPONSE
-
-    assert c.next_event() is PAUSED
-
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-    assert c.their_state is DONE
-    assert c.our_state is DONE
-
-    c.start_next_cycle()
-
-    assert get_all_events(c) == [
-        Request(
-            method="GET",
-            target="/2",
-            headers=[("Host", "a.com"), ("Content-Length", "5")],
-        ),
-        Data(data=b"67890"),
-        EndOfMessage(),
-    ]
-    assert c.next_event() is PAUSED
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-    c.start_next_cycle()
-
-    assert get_all_events(c) == [
-        Request(method="GET", target="/3", headers=[("Host", "a.com")]),
-        EndOfMessage(),
-    ]
-    # Doesn't pause this time, no trailing data
-    assert c.next_event() is NEED_DATA
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-
-    # Arrival of more data triggers pause
-    assert c.next_event() is NEED_DATA
-    c.receive_data(b"SADF")
-    assert c.next_event() is PAUSED
-    assert c.trailing_data == (b"SADF", False)
-    # If EOF arrives while paused, we don't see that either:
-    c.receive_data(b"")
-    assert c.trailing_data == (b"SADF", True)
-    assert c.next_event() is PAUSED
-    c.receive_data(b"")
-    assert c.next_event() is PAUSED
-    # Can't call receive_data with non-empty buf after closing it
-    with pytest.raises(RuntimeError):
-        c.receive_data(b"FDSA")
-
-
-def test_protocol_switch() -> None:
-    for (req, deny, accept) in [
-        (
-            Request(
-                method="CONNECT",
-                target="example.com:443",
-                headers=[("Host", "foo"), ("Content-Length", "1")],
-            ),
-            Response(status_code=404, headers=[(b"transfer-encoding", b"chunked")]),
-            Response(status_code=200, headers=[(b"transfer-encoding", b"chunked")]),
-        ),
-        (
-            Request(
-                method="GET",
-                target="/",
-                headers=[("Host", "foo"), ("Content-Length", "1"), ("Upgrade", "a, b")],
-            ),
-            Response(status_code=200, headers=[(b"transfer-encoding", b"chunked")]),
-            InformationalResponse(status_code=101, headers=[("Upgrade", "a")]),
-        ),
-        (
-            Request(
-                method="CONNECT",
-                target="example.com:443",
-                headers=[("Host", "foo"), ("Content-Length", "1"), ("Upgrade", "a, b")],
-            ),
-            Response(status_code=404, headers=[(b"transfer-encoding", b"chunked")]),
-            # Accept CONNECT, not upgrade
-            Response(status_code=200, headers=[(b"transfer-encoding", b"chunked")]),
-        ),
-        (
-            Request(
-                method="CONNECT",
-                target="example.com:443",
-                headers=[("Host", "foo"), ("Content-Length", "1"), ("Upgrade", "a, b")],
-            ),
-            Response(status_code=404, headers=[(b"transfer-encoding", b"chunked")]),
-            # Accept Upgrade, not CONNECT
-            InformationalResponse(status_code=101, headers=[("Upgrade", "b")]),
-        ),
-    ]:
-
-        def setup() -> ConnectionPair:
-            p = ConnectionPair()
-            p.send(CLIENT, req)
-            # No switch-related state change stuff yet; the client has to
-            # finish the request before that kicks in
-            for conn in p.conns:
-                assert conn.states[CLIENT] is SEND_BODY
-            p.send(CLIENT, [Data(data=b"1"), EndOfMessage()])
-            for conn in p.conns:
-                assert conn.states[CLIENT] is MIGHT_SWITCH_PROTOCOL
-            assert p.conn[SERVER].next_event() is PAUSED
-            return p
-
-        # Test deny case
-        p = setup()
-        p.send(SERVER, deny)
-        for conn in p.conns:
-            assert conn.states == {CLIENT: DONE, SERVER: SEND_BODY}
-        p.send(SERVER, EndOfMessage())
-        # Check that re-use is still allowed after a denial
-        for conn in p.conns:
-            conn.start_next_cycle()
-
-        # Test accept case
-        p = setup()
-        p.send(SERVER, accept)
-        for conn in p.conns:
-            assert conn.states == {CLIENT: SWITCHED_PROTOCOL, SERVER: SWITCHED_PROTOCOL}
-            conn.receive_data(b"123")
-            assert conn.next_event() is PAUSED
-            conn.receive_data(b"456")
-            assert conn.next_event() is PAUSED
-            assert conn.trailing_data == (b"123456", False)
-
-        # Pausing in might-switch, then recovery
-        # (weird artificial case where the trailing data actually is valid
-        # HTTP for some reason, because this makes it easier to test the state
-        # logic)
-        p = setup()
-        sc = p.conn[SERVER]
-        sc.receive_data(b"GET / HTTP/1.0\r\n\r\n")
-        assert sc.next_event() is PAUSED
-        assert sc.trailing_data == (b"GET / HTTP/1.0\r\n\r\n", False)
-        sc.send(deny)
-        assert sc.next_event() is PAUSED
-        sc.send(EndOfMessage())
-        sc.start_next_cycle()
-        assert get_all_events(sc) == [
-            Request(method="GET", target="/", headers=[], http_version="1.0"),  # type: ignore[arg-type]
-            EndOfMessage(),
-        ]
-
-        # When we're DONE, have no trailing data, and the connection gets
-        # closed, we report ConnectionClosed(). When we're in might-switch or
-        # switched, we don't.
-        p = setup()
-        sc = p.conn[SERVER]
-        sc.receive_data(b"")
-        assert sc.next_event() is PAUSED
-        assert sc.trailing_data == (b"", True)
-        p.send(SERVER, accept)
-        assert sc.next_event() is PAUSED
-
-        p = setup()
-        sc = p.conn[SERVER]
-        sc.receive_data(b"")
-        assert sc.next_event() is PAUSED
-        sc.send(deny)
-        assert sc.next_event() == ConnectionClosed()
-
-        # You can't send after switching protocols, or while waiting for a
-        # protocol switch
-        p = setup()
-        with pytest.raises(LocalProtocolError):
-            p.conn[CLIENT].send(
-                Request(method="GET", target="/", headers=[("Host", "a")])
-            )
-        p = setup()
-        p.send(SERVER, accept)
-        with pytest.raises(LocalProtocolError):
-            p.conn[SERVER].send(Data(data=b"123"))
-
-
-def test_close_simple() -> None:
-    # Just immediately closing a new connection without anything having
-    # happened yet.
-    for (who_shot_first, who_shot_second) in [(CLIENT, SERVER), (SERVER, CLIENT)]:
-
-        def setup() -> ConnectionPair:
-            p = ConnectionPair()
-            p.send(who_shot_first, ConnectionClosed())
-            for conn in p.conns:
-                assert conn.states == {
-                    who_shot_first: CLOSED,
-                    who_shot_second: MUST_CLOSE,
-                }
-            return p
-
-        # You can keep putting b"" into a closed connection, and you keep
-        # getting ConnectionClosed() out:
-        p = setup()
-        assert p.conn[who_shot_second].next_event() == ConnectionClosed()
-        assert p.conn[who_shot_second].next_event() == ConnectionClosed()
-        p.conn[who_shot_second].receive_data(b"")
-        assert p.conn[who_shot_second].next_event() == ConnectionClosed()
-        # Second party can close...
-        p = setup()
-        p.send(who_shot_second, ConnectionClosed())
-        for conn in p.conns:
-            assert conn.our_state is CLOSED
-            assert conn.their_state is CLOSED
-        # But trying to receive new data on a closed connection is a
-        # RuntimeError (not ProtocolError, because the problem here isn't
-        # violation of HTTP, it's violation of physics)
-        p = setup()
-        with pytest.raises(RuntimeError):
-            p.conn[who_shot_second].receive_data(b"123")
-        # And receiving new data on a MUST_CLOSE connection is a ProtocolError
-        p = setup()
-        p.conn[who_shot_first].receive_data(b"GET")
-        with pytest.raises(RemoteProtocolError):
-            p.conn[who_shot_first].next_event()
-
-
-def test_close_different_states() -> None:
-    req = [
-        Request(method="GET", target="/foo", headers=[("Host", "a")]),
-        EndOfMessage(),
-    ]
-    resp = [
-        Response(status_code=200, headers=[(b"transfer-encoding", b"chunked")]),
-        EndOfMessage(),
-    ]
-
-    # Client before request
-    p = ConnectionPair()
-    p.send(CLIENT, ConnectionClosed())
-    for conn in p.conns:
-        assert conn.states == {CLIENT: CLOSED, SERVER: MUST_CLOSE}
-
-    # Client after request
-    p = ConnectionPair()
-    p.send(CLIENT, req)
-    p.send(CLIENT, ConnectionClosed())
-    for conn in p.conns:
-        assert conn.states == {CLIENT: CLOSED, SERVER: SEND_RESPONSE}
-
-    # Server after request -> not allowed
-    p = ConnectionPair()
-    p.send(CLIENT, req)
-    with pytest.raises(LocalProtocolError):
-        p.conn[SERVER].send(ConnectionClosed())
-    p.conn[CLIENT].receive_data(b"")
-    with pytest.raises(RemoteProtocolError):
-        p.conn[CLIENT].next_event()
-
-    # Server after response
-    p = ConnectionPair()
-    p.send(CLIENT, req)
-    p.send(SERVER, resp)
-    p.send(SERVER, ConnectionClosed())
-    for conn in p.conns:
-        assert conn.states == {CLIENT: MUST_CLOSE, SERVER: CLOSED}
-
-    # Both after closing (ConnectionClosed() is idempotent)
-    p = ConnectionPair()
-    p.send(CLIENT, req)
-    p.send(SERVER, resp)
-    p.send(CLIENT, ConnectionClosed())
-    p.send(SERVER, ConnectionClosed())
-    p.send(CLIENT, ConnectionClosed())
-    p.send(SERVER, ConnectionClosed())
-
-    # In the middle of sending -> not allowed
-    p = ConnectionPair()
-    p.send(
-        CLIENT,
-        Request(
-            method="GET", target="/", headers=[("Host", "a"), ("Content-Length", "10")]
-        ),
-    )
-    with pytest.raises(LocalProtocolError):
-        p.conn[CLIENT].send(ConnectionClosed())
-    p.conn[SERVER].receive_data(b"")
-    with pytest.raises(RemoteProtocolError):
-        p.conn[SERVER].next_event()
-
-
-# Receive several requests and then client shuts down their side of the
-# connection; we can respond to each
-def test_pipelined_close() -> None:
-    c = Connection(SERVER)
-    # 2 requests then a close
-    c.receive_data(
-        b"GET /1 HTTP/1.1\r\nHost: a.com\r\nContent-Length: 5\r\n\r\n"
-        b"12345"
-        b"GET /2 HTTP/1.1\r\nHost: a.com\r\nContent-Length: 5\r\n\r\n"
-        b"67890"
-    )
-    c.receive_data(b"")
-    assert get_all_events(c) == [
-        Request(
-            method="GET",
-            target="/1",
-            headers=[("host", "a.com"), ("content-length", "5")],
-        ),
-        Data(data=b"12345"),
-        EndOfMessage(),
-    ]
-    assert c.states[CLIENT] is DONE
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-    assert c.states[SERVER] is DONE
-    c.start_next_cycle()
-    assert get_all_events(c) == [
-        Request(
-            method="GET",
-            target="/2",
-            headers=[("host", "a.com"), ("content-length", "5")],
-        ),
-        Data(data=b"67890"),
-        EndOfMessage(),
-        ConnectionClosed(),
-    ]
-    assert c.states == {CLIENT: CLOSED, SERVER: SEND_RESPONSE}
-    c.send(Response(status_code=200, headers=[]))  # type: ignore[arg-type]
-    c.send(EndOfMessage())
-    assert c.states == {CLIENT: CLOSED, SERVER: MUST_CLOSE}
-    c.send(ConnectionClosed())
-    assert c.states == {CLIENT: CLOSED, SERVER: CLOSED}
-
-
-def test_sendfile() -> None:
-    class SendfilePlaceholder:
-        def __len__(self) -> int:
-            return 10
-
-    placeholder = SendfilePlaceholder()
-
-    def setup(
-        header: Tuple[str, str], http_version: str
-    ) -> Tuple[Connection, Optional[List[bytes]]]:
-        c = Connection(SERVER)
-        receive_and_get(
-            c, "GET / HTTP/{}\r\nHost: a\r\n\r\n".format(http_version).encode("ascii")
-        )
-        headers = []
-        if header:
-            headers.append(header)
-        c.send(Response(status_code=200, headers=headers))
-        return c, c.send_with_data_passthrough(Data(data=placeholder))  # type: ignore
-
-    c, data = setup(("Content-Length", "10"), "1.1")
-    assert data == [placeholder]  # type: ignore
-    # Raises an error if the connection object doesn't think we've sent
-    # exactly 10 bytes
-    c.send(EndOfMessage())
-
-    _, data = setup(("Transfer-Encoding", "chunked"), "1.1")
-    assert placeholder in data  # type: ignore
-    data[data.index(placeholder)] = b"x" * 10  # type: ignore
-    assert b"".join(data) == b"a\r\nxxxxxxxxxx\r\n"  # type: ignore
-
-    c, data = setup(None, "1.0")  # type: ignore
-    assert data == [placeholder]  # type: ignore
-    assert c.our_state is SEND_BODY
-
-
-def test_errors() -> None:
-    # After a receive error, you can't receive
-    for role in [CLIENT, SERVER]:
-        c = Connection(our_role=role)
-        c.receive_data(b"gibberish\r\n\r\n")
-        with pytest.raises(RemoteProtocolError):
-            c.next_event()
-        # Now any attempt to receive continues to raise
-        assert c.their_state is ERROR
-        assert c.our_state is not ERROR
-        print(c._cstate.states)
-        with pytest.raises(RemoteProtocolError):
-            c.next_event()
-        # But we can still yell at the client for sending us gibberish
-        if role is SERVER:
-            assert (
-                c.send(Response(status_code=400, headers=[]))  # type: ignore[arg-type]
-                == b"HTTP/1.1 400 \r\nConnection: close\r\n\r\n"
-            )
-
-    # After an error sending, you can no longer send
-    # (This is especially important for things like content-length errors,
-    # where there's complex internal state being modified)
-    def conn(role: Type[Sentinel]) -> Connection:
-        c = Connection(our_role=role)
-        if role is SERVER:
-            # Put it into the state where it *could* send a response...
-            receive_and_get(c, b"GET / HTTP/1.0\r\n\r\n")
-            assert c.our_state is SEND_RESPONSE
-        return c
-
-    for role in [CLIENT, SERVER]:
-        if role is CLIENT:
-            # This HTTP/1.0 request won't be detected as bad until after we go
-            # through the state machine and hit the writing code
-            good = Request(method="GET", target="/", headers=[("Host", "example.com")])
-            bad = Request(
-                method="GET",
-                target="/",
-                headers=[("Host", "example.com")],
-                http_version="1.0",
-            )
-        elif role is SERVER:
-            good = Response(status_code=200, headers=[])  # type: ignore[arg-type,assignment]
-            bad = Response(status_code=200, headers=[], http_version="1.0")  # type: ignore[arg-type,assignment]
-        # Make sure 'good' actually is good
-        c = conn(role)
-        c.send(good)
-        assert c.our_state is not ERROR
-        # Do that again, but this time sending 'bad' first
-        c = conn(role)
-        with pytest.raises(LocalProtocolError):
-            c.send(bad)
-        assert c.our_state is ERROR
-        assert c.their_state is not ERROR
-        # Now 'good' is not so good
-        with pytest.raises(LocalProtocolError):
-            c.send(good)
-
-        # And check send_failed() too
-        c = conn(role)
-        c.send_failed()
-        assert c.our_state is ERROR
-        assert c.their_state is not ERROR
-        # This is idempotent
-        c.send_failed()
-        assert c.our_state is ERROR
-        assert c.their_state is not ERROR
-
-
-def test_idle_receive_nothing() -> None:
-    # At one point this incorrectly raised an error
-    for role in [CLIENT, SERVER]:
-        c = Connection(role)
-        assert c.next_event() is NEED_DATA
-
-
-def test_connection_drop() -> None:
-    c = Connection(SERVER)
-    c.receive_data(b"GET /")
-    assert c.next_event() is NEED_DATA
-    c.receive_data(b"")
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-
-def test_408_request_timeout() -> None:
-    # Should be able to send this spontaneously as a server without seeing
-    # anything from client
-    p = ConnectionPair()
-    p.send(SERVER, Response(status_code=408, headers=[(b"connection", b"close")]))
-
-
-# This used to raise IndexError
-def test_empty_request() -> None:
-    c = Connection(SERVER)
-    c.receive_data(b"\r\n")
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-
-# This used to raise IndexError
-def test_empty_response() -> None:
-    c = Connection(CLIENT)
-    c.send(Request(method="GET", target="/", headers=[("Host", "a")]))
-    c.receive_data(b"\r\n")
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-
-@pytest.mark.parametrize(
-    "data",
-    [
-        b"\x00",
-        b"\x20",
-        b"\x16\x03\x01\x00\xa5",  # Typical start of a TLS Client Hello
-    ],
-)
-def test_early_detection_of_invalid_request(data: bytes) -> None:
-    c = Connection(SERVER)
-    # Early detection should occur before even receiving a `\r\n`
-    c.receive_data(data)
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-
-@pytest.mark.parametrize(
-    "data",
-    [
-        b"\x00",
-        b"\x20",
-        b"\x16\x03\x03\x00\x31",  # Typical start of a TLS Server Hello
-    ],
-)
-def test_early_detection_of_invalid_response(data: bytes) -> None:
-    c = Connection(CLIENT)
-    # Early detection should occur before even receiving a `\r\n`
-    c.receive_data(data)
-    with pytest.raises(RemoteProtocolError):
-        c.next_event()
-
-
-# This used to give different headers for HEAD and GET.
-# The correct way to handle HEAD is to put whatever headers we *would* have
-# put if it were a GET -- even though we know that for HEAD, those headers
-# will be ignored.
-def test_HEAD_framing_headers() -> None:
-    def setup(method: bytes, http_version: bytes) -> Connection:
-        c = Connection(SERVER)
-        c.receive_data(
-            method + b" / HTTP/" + http_version + b"\r\n" + b"Host: example.com\r\n\r\n"
-        )
-        assert type(c.next_event()) is Request
-        assert type(c.next_event()) is EndOfMessage
-        return c
-
-    for method in [b"GET", b"HEAD"]:
-        # No Content-Length, HTTP/1.1 peer, should use chunked
-        c = setup(method, b"1.1")
-        assert (
-            c.send(Response(status_code=200, headers=[])) == b"HTTP/1.1 200 \r\n"  # type: ignore[arg-type]
-            b"Transfer-Encoding: chunked\r\n\r\n"
-        )
-
-        # No Content-Length, HTTP/1.0 peer, frame with connection: close
-        c = setup(method, b"1.0")
-        assert (
-            c.send(Response(status_code=200, headers=[])) == b"HTTP/1.1 200 \r\n"  # type: ignore[arg-type]
-            b"Connection: close\r\n\r\n"
-        )
-
-        # Content-Length + Transfer-Encoding, TE wins
-        c = setup(method, b"1.1")
-        assert (
-            c.send(
-                Response(
-                    status_code=200,
-                    headers=[
-                        ("Content-Length", "100"),
-                        ("Transfer-Encoding", "chunked"),
-                    ],
-                )
-            )
-            == b"HTTP/1.1 200 \r\n"
-            b"Transfer-Encoding: chunked\r\n\r\n"
-        )
-
-
-def test_special_exceptions_for_lost_connection_in_message_body() -> None:
-    c = Connection(SERVER)
-    c.receive_data(
-        b"POST / HTTP/1.1\r\n" b"Host: example.com\r\n" b"Content-Length: 100\r\n\r\n"
-    )
-    assert type(c.next_event()) is Request
-    assert c.next_event() is NEED_DATA
-    c.receive_data(b"12345")
-    assert c.next_event() == Data(data=b"12345")
-    c.receive_data(b"")
-    with pytest.raises(RemoteProtocolError) as excinfo:
-        c.next_event()
-    assert "received 5 bytes" in str(excinfo.value)
-    assert "expected 100" in str(excinfo.value)
-
-    c = Connection(SERVER)
-    c.receive_data(
-        b"POST / HTTP/1.1\r\n"
-        b"Host: example.com\r\n"
-        b"Transfer-Encoding: chunked\r\n\r\n"
-    )
-    assert type(c.next_event()) is Request
-    assert c.next_event() is NEED_DATA
-    c.receive_data(b"8\r\n012345")
-    assert c.next_event().data == b"012345"  # type: ignore
-    c.receive_data(b"")
-    with pytest.raises(RemoteProtocolError) as excinfo:
-        c.next_event()
-    assert "incomplete chunked read" in str(excinfo.value)
diff --git a/libs/h11/tests/test_events.py b/libs/h11/tests/test_events.py
deleted file mode 100644
index bc6c313706..0000000000
--- a/libs/h11/tests/test_events.py
+++ /dev/null
@@ -1,150 +0,0 @@
-from http import HTTPStatus
-
-import pytest
-
-from .. import _events
-from .._events import (
-    ConnectionClosed,
-    Data,
-    EndOfMessage,
-    Event,
-    InformationalResponse,
-    Request,
-    Response,
-)
-from .._util import LocalProtocolError
-
-
-def test_events() -> None:
-    with pytest.raises(LocalProtocolError):
-        # Missing Host:
-        req = Request(
-            method="GET", target="/", headers=[("a", "b")], http_version="1.1"
-        )
-    # But this is okay (HTTP/1.0)
-    req = Request(method="GET", target="/", headers=[("a", "b")], http_version="1.0")
-    # fields are normalized
-    assert req.method == b"GET"
-    assert req.target == b"/"
-    assert req.headers == [(b"a", b"b")]
-    assert req.http_version == b"1.0"
-
-    # This is also okay -- has a Host (with weird capitalization, which is ok)
-    req = Request(
-        method="GET",
-        target="/",
-        headers=[("a", "b"), ("hOSt", "example.com")],
-        http_version="1.1",
-    )
-    # we normalize header capitalization
-    assert req.headers == [(b"a", b"b"), (b"host", b"example.com")]
-
-    # Multiple host is bad too
-    with pytest.raises(LocalProtocolError):
-        req = Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "a"), ("Host", "a")],
-            http_version="1.1",
-        )
-    # Even for HTTP/1.0
-    with pytest.raises(LocalProtocolError):
-        req = Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "a"), ("Host", "a")],
-            http_version="1.0",
-        )
-
-    # Header values are validated
-    for bad_char in "\x00\r\n\f\v":
-        with pytest.raises(LocalProtocolError):
-            req = Request(
-                method="GET",
-                target="/",
-                headers=[("Host", "a"), ("Foo", "asd" + bad_char)],
-                http_version="1.0",
-            )
-
-    # But for compatibility we allow non-whitespace control characters, even
-    # though they're forbidden by the spec.
-    Request(
-        method="GET",
-        target="/",
-        headers=[("Host", "a"), ("Foo", "asd\x01\x02\x7f")],
-        http_version="1.0",
-    )
-
-    # Request target is validated
-    for bad_byte in b"\x00\x20\x7f\xee":
-        target = bytearray(b"/")
-        target.append(bad_byte)
-        with pytest.raises(LocalProtocolError):
-            Request(
-                method="GET", target=target, headers=[("Host", "a")], http_version="1.1"
-            )
-
-    # Request method is validated
-    with pytest.raises(LocalProtocolError):
-        Request(
-            method="GET / HTTP/1.1",
-            target=target,
-            headers=[("Host", "a")],
-            http_version="1.1",
-        )
-
-    ir = InformationalResponse(status_code=100, headers=[("Host", "a")])
-    assert ir.status_code == 100
-    assert ir.headers == [(b"host", b"a")]
-    assert ir.http_version == b"1.1"
-
-    with pytest.raises(LocalProtocolError):
-        InformationalResponse(status_code=200, headers=[("Host", "a")])
-
-    resp = Response(status_code=204, headers=[], http_version="1.0")  # type: ignore[arg-type]
-    assert resp.status_code == 204
-    assert resp.headers == []
-    assert resp.http_version == b"1.0"
-
-    with pytest.raises(LocalProtocolError):
-        resp = Response(status_code=100, headers=[], http_version="1.0")  # type: ignore[arg-type]
-
-    with pytest.raises(LocalProtocolError):
-        Response(status_code="100", headers=[], http_version="1.0")  # type: ignore[arg-type]
-
-    with pytest.raises(LocalProtocolError):
-        InformationalResponse(status_code=b"100", headers=[], http_version="1.0")  # type: ignore[arg-type]
-
-    d = Data(data=b"asdf")
-    assert d.data == b"asdf"
-
-    eom = EndOfMessage()
-    assert eom.headers == []
-
-    cc = ConnectionClosed()
-    assert repr(cc) == "ConnectionClosed()"
-
-
-def test_intenum_status_code() -> None:
-    # https://github.com/python-hyper/h11/issues/72
-
-    r = Response(status_code=HTTPStatus.OK, headers=[], http_version="1.0")  # type: ignore[arg-type]
-    assert r.status_code == HTTPStatus.OK
-    assert type(r.status_code) is not type(HTTPStatus.OK)
-    assert type(r.status_code) is int
-
-
-def test_header_casing() -> None:
-    r = Request(
-        method="GET",
-        target="/",
-        headers=[("Host", "example.org"), ("Connection", "keep-alive")],
-        http_version="1.1",
-    )
-    assert len(r.headers) == 2
-    assert r.headers[0] == (b"host", b"example.org")
-    assert r.headers == [(b"host", b"example.org"), (b"connection", b"keep-alive")]
-    assert r.headers.raw_items() == [
-        (b"Host", b"example.org"),
-        (b"Connection", b"keep-alive"),
-    ]
diff --git a/libs/h11/tests/test_headers.py b/libs/h11/tests/test_headers.py
deleted file mode 100644
index ba53d088f6..0000000000
--- a/libs/h11/tests/test_headers.py
+++ /dev/null
@@ -1,157 +0,0 @@
-import pytest
-
-from .._events import Request
-from .._headers import (
-    get_comma_header,
-    has_expect_100_continue,
-    Headers,
-    normalize_and_validate,
-    set_comma_header,
-)
-from .._util import LocalProtocolError
-
-
-def test_normalize_and_validate() -> None:
-    assert normalize_and_validate([("foo", "bar")]) == [(b"foo", b"bar")]
-    assert normalize_and_validate([(b"foo", b"bar")]) == [(b"foo", b"bar")]
-
-    # no leading/trailing whitespace in names
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([(b"foo ", "bar")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([(b" foo", "bar")])
-
-    # no weird characters in names
-    with pytest.raises(LocalProtocolError) as excinfo:
-        normalize_and_validate([(b"foo bar", b"baz")])
-    assert "foo bar" in str(excinfo.value)
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([(b"foo\x00bar", b"baz")])
-    # Not even 8-bit characters:
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([(b"foo\xffbar", b"baz")])
-    # And not even the control characters we allow in values:
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([(b"foo\x01bar", b"baz")])
-
-    # no return or NUL characters in values
-    with pytest.raises(LocalProtocolError) as excinfo:
-        normalize_and_validate([("foo", "bar\rbaz")])
-    assert "bar\\rbaz" in str(excinfo.value)
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("foo", "bar\nbaz")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("foo", "bar\x00baz")])
-    # no leading/trailing whitespace
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("foo", "barbaz  ")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("foo", "  barbaz")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("foo", "barbaz\t")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("foo", "\tbarbaz")])
-
-    # content-length
-    assert normalize_and_validate([("Content-Length", "1")]) == [
-        (b"content-length", b"1")
-    ]
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("Content-Length", "asdf")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("Content-Length", "1x")])
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("Content-Length", "1"), ("Content-Length", "2")])
-    assert normalize_and_validate(
-        [("Content-Length", "0"), ("Content-Length", "0")]
-    ) == [(b"content-length", b"0")]
-    assert normalize_and_validate([("Content-Length", "0 , 0")]) == [
-        (b"content-length", b"0")
-    ]
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate(
-            [("Content-Length", "1"), ("Content-Length", "1"), ("Content-Length", "2")]
-        )
-    with pytest.raises(LocalProtocolError):
-        normalize_and_validate([("Content-Length", "1 , 1,2")])
-
-    # transfer-encoding
-    assert normalize_and_validate([("Transfer-Encoding", "chunked")]) == [
-        (b"transfer-encoding", b"chunked")
-    ]
-    assert normalize_and_validate([("Transfer-Encoding", "cHuNkEd")]) == [
-        (b"transfer-encoding", b"chunked")
-    ]
-    with pytest.raises(LocalProtocolError) as excinfo:
-        normalize_and_validate([("Transfer-Encoding", "gzip")])
-    assert excinfo.value.error_status_hint == 501  # Not Implemented
-    with pytest.raises(LocalProtocolError) as excinfo:
-        normalize_and_validate(
-            [("Transfer-Encoding", "chunked"), ("Transfer-Encoding", "gzip")]
-        )
-    assert excinfo.value.error_status_hint == 501  # Not Implemented
-
-
-def test_get_set_comma_header() -> None:
-    headers = normalize_and_validate(
-        [
-            ("Connection", "close"),
-            ("whatever", "something"),
-            ("connectiON", "fOo,, , BAR"),
-        ]
-    )
-
-    assert get_comma_header(headers, b"connection") == [b"close", b"foo", b"bar"]
-
-    headers = set_comma_header(headers, b"newthing", ["a", "b"])  # type: ignore
-
-    with pytest.raises(LocalProtocolError):
-        set_comma_header(headers, b"newthing", ["  a", "b"])  # type: ignore
-
-    assert headers == [
-        (b"connection", b"close"),
-        (b"whatever", b"something"),
-        (b"connection", b"fOo,, , BAR"),
-        (b"newthing", b"a"),
-        (b"newthing", b"b"),
-    ]
-
-    headers = set_comma_header(headers, b"whatever", ["different thing"])  # type: ignore
-
-    assert headers == [
-        (b"connection", b"close"),
-        (b"connection", b"fOo,, , BAR"),
-        (b"newthing", b"a"),
-        (b"newthing", b"b"),
-        (b"whatever", b"different thing"),
-    ]
-
-
-def test_has_100_continue() -> None:
-    assert has_expect_100_continue(
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "example.com"), ("Expect", "100-continue")],
-        )
-    )
-    assert not has_expect_100_continue(
-        Request(method="GET", target="/", headers=[("Host", "example.com")])
-    )
-    # Case insensitive
-    assert has_expect_100_continue(
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "example.com"), ("Expect", "100-Continue")],
-        )
-    )
-    # Doesn't work in HTTP/1.0
-    assert not has_expect_100_continue(
-        Request(
-            method="GET",
-            target="/",
-            headers=[("Host", "example.com"), ("Expect", "100-continue")],
-            http_version="1.0",
-        )
-    )
diff --git a/libs/h11/tests/test_helpers.py b/libs/h11/tests/test_helpers.py
deleted file mode 100644
index c329c76783..0000000000
--- a/libs/h11/tests/test_helpers.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from .._events import (
-    ConnectionClosed,
-    Data,
-    EndOfMessage,
-    Event,
-    InformationalResponse,
-    Request,
-    Response,
-)
-from .helpers import normalize_data_events
-
-
-def test_normalize_data_events() -> None:
-    assert normalize_data_events(
-        [
-            Data(data=bytearray(b"1")),
-            Data(data=b"2"),
-            Response(status_code=200, headers=[]),  # type: ignore[arg-type]
-            Data(data=b"3"),
-            Data(data=b"4"),
-            EndOfMessage(),
-            Data(data=b"5"),
-            Data(data=b"6"),
-            Data(data=b"7"),
-        ]
-    ) == [
-        Data(data=b"12"),
-        Response(status_code=200, headers=[]),  # type: ignore[arg-type]
-        Data(data=b"34"),
-        EndOfMessage(),
-        Data(data=b"567"),
-    ]
diff --git a/libs/h11/tests/test_io.py b/libs/h11/tests/test_io.py
deleted file mode 100644
index 2b47c0eac9..0000000000
--- a/libs/h11/tests/test_io.py
+++ /dev/null
@@ -1,572 +0,0 @@
-from typing import Any, Callable, Generator, List
-
-import pytest
-
-from .._events import (
-    ConnectionClosed,
-    Data,
-    EndOfMessage,
-    Event,
-    InformationalResponse,
-    Request,
-    Response,
-)
-from .._headers import Headers, normalize_and_validate
-from .._readers import (
-    _obsolete_line_fold,
-    ChunkedReader,
-    ContentLengthReader,
-    Http10Reader,
-    READERS,
-)
-from .._receivebuffer import ReceiveBuffer
-from .._state import (
-    CLIENT,
-    CLOSED,
-    DONE,
-    IDLE,
-    MIGHT_SWITCH_PROTOCOL,
-    MUST_CLOSE,
-    SEND_BODY,
-    SEND_RESPONSE,
-    SERVER,
-    SWITCHED_PROTOCOL,
-)
-from .._util import LocalProtocolError
-from .._writers import (
-    ChunkedWriter,
-    ContentLengthWriter,
-    Http10Writer,
-    write_any_response,
-    write_headers,
-    write_request,
-    WRITERS,
-)
-from .helpers import normalize_data_events
-
-SIMPLE_CASES = [
-    (
-        (CLIENT, IDLE),
-        Request(
-            method="GET",
-            target="/a",
-            headers=[("Host", "foo"), ("Connection", "close")],
-        ),
-        b"GET /a HTTP/1.1\r\nHost: foo\r\nConnection: close\r\n\r\n",
-    ),
-    (
-        (SERVER, SEND_RESPONSE),
-        Response(status_code=200, headers=[("Connection", "close")], reason=b"OK"),
-        b"HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",
-    ),
-    (
-        (SERVER, SEND_RESPONSE),
-        Response(status_code=200, headers=[], reason=b"OK"),  # type: ignore[arg-type]
-        b"HTTP/1.1 200 OK\r\n\r\n",
-    ),
-    (
-        (SERVER, SEND_RESPONSE),
-        InformationalResponse(
-            status_code=101, headers=[("Upgrade", "websocket")], reason=b"Upgrade"
-        ),
-        b"HTTP/1.1 101 Upgrade\r\nUpgrade: websocket\r\n\r\n",
-    ),
-    (
-        (SERVER, SEND_RESPONSE),
-        InformationalResponse(status_code=101, headers=[], reason=b"Upgrade"),  # type: ignore[arg-type]
-        b"HTTP/1.1 101 Upgrade\r\n\r\n",
-    ),
-]
-
-
-def dowrite(writer: Callable[..., None], obj: Any) -> bytes:
-    got_list: List[bytes] = []
-    writer(obj, got_list.append)
-    return b"".join(got_list)
-
-
-def tw(writer: Any, obj: Any, expected: Any) -> None:
-    got = dowrite(writer, obj)
-    assert got == expected
-
-
-def makebuf(data: bytes) -> ReceiveBuffer:
-    buf = ReceiveBuffer()
-    buf += data
-    return buf
-
-
-def tr(reader: Any, data: bytes, expected: Any) -> None:
-    def check(got: Any) -> None:
-        assert got == expected
-        # Headers should always be returned as bytes, not e.g. bytearray
-        # https://github.com/python-hyper/wsproto/pull/54#issuecomment-377709478
-        for name, value in getattr(got, "headers", []):
-            assert type(name) is bytes
-            assert type(value) is bytes
-
-    # Simple: consume whole thing
-    buf = makebuf(data)
-    check(reader(buf))
-    assert not buf
-
-    # Incrementally growing buffer
-    buf = ReceiveBuffer()
-    for i in range(len(data)):
-        assert reader(buf) is None
-        buf += data[i : i + 1]
-    check(reader(buf))
-
-    # Trailing data
-    buf = makebuf(data)
-    buf += b"trailing"
-    check(reader(buf))
-    assert bytes(buf) == b"trailing"
-
-
-def test_writers_simple() -> None:
-    for ((role, state), event, binary) in SIMPLE_CASES:
-        tw(WRITERS[role, state], event, binary)
-
-
-def test_readers_simple() -> None:
-    for ((role, state), event, binary) in SIMPLE_CASES:
-        tr(READERS[role, state], binary, event)
-
-
-def test_writers_unusual() -> None:
-    # Simple test of the write_headers utility routine
-    tw(
-        write_headers,
-        normalize_and_validate([("foo", "bar"), ("baz", "quux")]),
-        b"foo: bar\r\nbaz: quux\r\n\r\n",
-    )
-    tw(write_headers, Headers([]), b"\r\n")
-
-    # We understand HTTP/1.0, but we don't speak it
-    with pytest.raises(LocalProtocolError):
-        tw(
-            write_request,
-            Request(
-                method="GET",
-                target="/",
-                headers=[("Host", "foo"), ("Connection", "close")],
-                http_version="1.0",
-            ),
-            None,
-        )
-    with pytest.raises(LocalProtocolError):
-        tw(
-            write_any_response,
-            Response(
-                status_code=200, headers=[("Connection", "close")], http_version="1.0"
-            ),
-            None,
-        )
-
-
-def test_readers_unusual() -> None:
-    # Reading HTTP/1.0
-    tr(
-        READERS[CLIENT, IDLE],
-        b"HEAD /foo HTTP/1.0\r\nSome: header\r\n\r\n",
-        Request(
-            method="HEAD",
-            target="/foo",
-            headers=[("Some", "header")],
-            http_version="1.0",
-        ),
-    )
-
-    # check no-headers, since it's only legal with HTTP/1.0
-    tr(
-        READERS[CLIENT, IDLE],
-        b"HEAD /foo HTTP/1.0\r\n\r\n",
-        Request(method="HEAD", target="/foo", headers=[], http_version="1.0"),  # type: ignore[arg-type]
-    )
-
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.0 200 OK\r\nSome: header\r\n\r\n",
-        Response(
-            status_code=200,
-            headers=[("Some", "header")],
-            http_version="1.0",
-            reason=b"OK",
-        ),
-    )
-
-    # single-character header values (actually disallowed by the ABNF in RFC
-    # 7230 -- this is a bug in the standard that we originally copied...)
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.0 200 OK\r\n" b"Foo: a a a a a \r\n\r\n",
-        Response(
-            status_code=200,
-            headers=[("Foo", "a a a a a")],
-            http_version="1.0",
-            reason=b"OK",
-        ),
-    )
-
-    # Empty headers -- also legal
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.0 200 OK\r\n" b"Foo:\r\n\r\n",
-        Response(
-            status_code=200, headers=[("Foo", "")], http_version="1.0", reason=b"OK"
-        ),
-    )
-
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.0 200 OK\r\n" b"Foo: \t \t \r\n\r\n",
-        Response(
-            status_code=200, headers=[("Foo", "")], http_version="1.0", reason=b"OK"
-        ),
-    )
-
-    # Tolerate broken servers that leave off the response code
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.0 200\r\n" b"Foo: bar\r\n\r\n",
-        Response(
-            status_code=200, headers=[("Foo", "bar")], http_version="1.0", reason=b""
-        ),
-    )
-
-    # Tolerate headers line endings (\r\n and \n)
-    #    \n\r\b between headers and body
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.1 200 OK\r\nSomeHeader: val\n\r\n",
-        Response(
-            status_code=200,
-            headers=[("SomeHeader", "val")],
-            http_version="1.1",
-            reason="OK",
-        ),
-    )
-
-    #   delimited only with \n
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.1 200 OK\nSomeHeader1: val1\nSomeHeader2: val2\n\n",
-        Response(
-            status_code=200,
-            headers=[("SomeHeader1", "val1"), ("SomeHeader2", "val2")],
-            http_version="1.1",
-            reason="OK",
-        ),
-    )
-
-    #   mixed \r\n and \n
-    tr(
-        READERS[SERVER, SEND_RESPONSE],
-        b"HTTP/1.1 200 OK\r\nSomeHeader1: val1\nSomeHeader2: val2\n\r\n",
-        Response(
-            status_code=200,
-            headers=[("SomeHeader1", "val1"), ("SomeHeader2", "val2")],
-            http_version="1.1",
-            reason="OK",
-        ),
-    )
-
-    # obsolete line folding
-    tr(
-        READERS[CLIENT, IDLE],
-        b"HEAD /foo HTTP/1.1\r\n"
-        b"Host: example.com\r\n"
-        b"Some: multi-line\r\n"
-        b" header\r\n"
-        b"\tnonsense\r\n"
-        b"    \t   \t\tI guess\r\n"
-        b"Connection: close\r\n"
-        b"More-nonsense: in the\r\n"
-        b"    last header  \r\n\r\n",
-        Request(
-            method="HEAD",
-            target="/foo",
-            headers=[
-                ("Host", "example.com"),
-                ("Some", "multi-line header nonsense I guess"),
-                ("Connection", "close"),
-                ("More-nonsense", "in the last header"),
-            ],
-        ),
-    )
-
-    with pytest.raises(LocalProtocolError):
-        tr(
-            READERS[CLIENT, IDLE],
-            b"HEAD /foo HTTP/1.1\r\n" b"  folded: line\r\n\r\n",
-            None,
-        )
-
-    with pytest.raises(LocalProtocolError):
-        tr(
-            READERS[CLIENT, IDLE],
-            b"HEAD /foo HTTP/1.1\r\n" b"foo  : line\r\n\r\n",
-            None,
-        )
-    with pytest.raises(LocalProtocolError):
-        tr(
-            READERS[CLIENT, IDLE],
-            b"HEAD /foo HTTP/1.1\r\n" b"foo\t: line\r\n\r\n",
-            None,
-        )
-    with pytest.raises(LocalProtocolError):
-        tr(
-            READERS[CLIENT, IDLE],
-            b"HEAD /foo HTTP/1.1\r\n" b"foo\t: line\r\n\r\n",
-            None,
-        )
-    with pytest.raises(LocalProtocolError):
-        tr(READERS[CLIENT, IDLE], b"HEAD /foo HTTP/1.1\r\n" b": line\r\n\r\n", None)
-
-
-def test__obsolete_line_fold_bytes() -> None:
-    # _obsolete_line_fold has a defensive cast to bytearray, which is
-    # necessary to protect against O(n^2) behavior in case anyone ever passes
-    # in regular bytestrings... but right now we never pass in regular
-    # bytestrings. so this test just exists to get some coverage on that
-    # defensive cast.
-    assert list(_obsolete_line_fold([b"aaa", b"bbb", b"  ccc", b"ddd"])) == [
-        b"aaa",
-        bytearray(b"bbb ccc"),
-        b"ddd",
-    ]
-
-
-def _run_reader_iter(
-    reader: Any, buf: bytes, do_eof: bool
-) -> Generator[Any, None, None]:
-    while True:
-        event = reader(buf)
-        if event is None:
-            break
-        yield event
-        # body readers have undefined behavior after returning EndOfMessage,
-        # because this changes the state so they don't get called again
-        if type(event) is EndOfMessage:
-            break
-    if do_eof:
-        assert not buf
-        yield reader.read_eof()
-
-
-def _run_reader(*args: Any) -> List[Event]:
-    events = list(_run_reader_iter(*args))
-    return normalize_data_events(events)
-
-
-def t_body_reader(thunk: Any, data: bytes, expected: Any, do_eof: bool = False) -> None:
-    # Simple: consume whole thing
-    print("Test 1")
-    buf = makebuf(data)
-    assert _run_reader(thunk(), buf, do_eof) == expected
-
-    # Incrementally growing buffer
-    print("Test 2")
-    reader = thunk()
-    buf = ReceiveBuffer()
-    events = []
-    for i in range(len(data)):
-        events += _run_reader(reader, buf, False)
-        buf += data[i : i + 1]
-    events += _run_reader(reader, buf, do_eof)
-    assert normalize_data_events(events) == expected
-
-    is_complete = any(type(event) is EndOfMessage for event in expected)
-    if is_complete and not do_eof:
-        buf = makebuf(data + b"trailing")
-        assert _run_reader(thunk(), buf, False) == expected
-
-
-def test_ContentLengthReader() -> None:
-    t_body_reader(lambda: ContentLengthReader(0), b"", [EndOfMessage()])
-
-    t_body_reader(
-        lambda: ContentLengthReader(10),
-        b"0123456789",
-        [Data(data=b"0123456789"), EndOfMessage()],
-    )
-
-
-def test_Http10Reader() -> None:
-    t_body_reader(Http10Reader, b"", [EndOfMessage()], do_eof=True)
-    t_body_reader(Http10Reader, b"asdf", [Data(data=b"asdf")], do_eof=False)
-    t_body_reader(
-        Http10Reader, b"asdf", [Data(data=b"asdf"), EndOfMessage()], do_eof=True
-    )
-
-
-def test_ChunkedReader() -> None:
-    t_body_reader(ChunkedReader, b"0\r\n\r\n", [EndOfMessage()])
-
-    t_body_reader(
-        ChunkedReader,
-        b"0\r\nSome: header\r\n\r\n",
-        [EndOfMessage(headers=[("Some", "header")])],
-    )
-
-    t_body_reader(
-        ChunkedReader,
-        b"5\r\n01234\r\n"
-        + b"10\r\n0123456789abcdef\r\n"
-        + b"0\r\n"
-        + b"Some: header\r\n\r\n",
-        [
-            Data(data=b"012340123456789abcdef"),
-            EndOfMessage(headers=[("Some", "header")]),
-        ],
-    )
-
-    t_body_reader(
-        ChunkedReader,
-        b"5\r\n01234\r\n" + b"10\r\n0123456789abcdef\r\n" + b"0\r\n\r\n",
-        [Data(data=b"012340123456789abcdef"), EndOfMessage()],
-    )
-
-    # handles upper and lowercase hex
-    t_body_reader(
-        ChunkedReader,
-        b"aA\r\n" + b"x" * 0xAA + b"\r\n" + b"0\r\n\r\n",
-        [Data(data=b"x" * 0xAA), EndOfMessage()],
-    )
-
-    # refuses arbitrarily long chunk integers
-    with pytest.raises(LocalProtocolError):
-        # Technically this is legal HTTP/1.1, but we refuse to process chunk
-        # sizes that don't fit into 20 characters of hex
-        t_body_reader(ChunkedReader, b"9" * 100 + b"\r\nxxx", [Data(data=b"xxx")])
-
-    # refuses garbage in the chunk count
-    with pytest.raises(LocalProtocolError):
-        t_body_reader(ChunkedReader, b"10\x00\r\nxxx", None)
-
-    # handles (and discards) "chunk extensions" omg wtf
-    t_body_reader(
-        ChunkedReader,
-        b"5; hello=there\r\n"
-        + b"xxxxx"
-        + b"\r\n"
-        + b'0; random="junk"; some=more; canbe=lonnnnngg\r\n\r\n',
-        [Data(data=b"xxxxx"), EndOfMessage()],
-    )
-
-    t_body_reader(
-        ChunkedReader,
-        b"5   	 \r\n01234\r\n" + b"0\r\n\r\n",
-        [Data(data=b"01234"), EndOfMessage()],
-    )
-
-
-def test_ContentLengthWriter() -> None:
-    w = ContentLengthWriter(5)
-    assert dowrite(w, Data(data=b"123")) == b"123"
-    assert dowrite(w, Data(data=b"45")) == b"45"
-    assert dowrite(w, EndOfMessage()) == b""
-
-    w = ContentLengthWriter(5)
-    with pytest.raises(LocalProtocolError):
-        dowrite(w, Data(data=b"123456"))
-
-    w = ContentLengthWriter(5)
-    dowrite(w, Data(data=b"123"))
-    with pytest.raises(LocalProtocolError):
-        dowrite(w, Data(data=b"456"))
-
-    w = ContentLengthWriter(5)
-    dowrite(w, Data(data=b"123"))
-    with pytest.raises(LocalProtocolError):
-        dowrite(w, EndOfMessage())
-
-    w = ContentLengthWriter(5)
-    dowrite(w, Data(data=b"123")) == b"123"
-    dowrite(w, Data(data=b"45")) == b"45"
-    with pytest.raises(LocalProtocolError):
-        dowrite(w, EndOfMessage(headers=[("Etag", "asdf")]))
-
-
-def test_ChunkedWriter() -> None:
-    w = ChunkedWriter()
-    assert dowrite(w, Data(data=b"aaa")) == b"3\r\naaa\r\n"
-    assert dowrite(w, Data(data=b"a" * 20)) == b"14\r\n" + b"a" * 20 + b"\r\n"
-
-    assert dowrite(w, Data(data=b"")) == b""
-
-    assert dowrite(w, EndOfMessage()) == b"0\r\n\r\n"
-
-    assert (
-        dowrite(w, EndOfMessage(headers=[("Etag", "asdf"), ("a", "b")]))
-        == b"0\r\nEtag: asdf\r\na: b\r\n\r\n"
-    )
-
-
-def test_Http10Writer() -> None:
-    w = Http10Writer()
-    assert dowrite(w, Data(data=b"1234")) == b"1234"
-    assert dowrite(w, EndOfMessage()) == b""
-
-    with pytest.raises(LocalProtocolError):
-        dowrite(w, EndOfMessage(headers=[("Etag", "asdf")]))
-
-
-def test_reject_garbage_after_request_line() -> None:
-    with pytest.raises(LocalProtocolError):
-        tr(READERS[SERVER, SEND_RESPONSE], b"HTTP/1.0 200 OK\x00xxxx\r\n\r\n", None)
-
-
-def test_reject_garbage_after_response_line() -> None:
-    with pytest.raises(LocalProtocolError):
-        tr(
-            READERS[CLIENT, IDLE],
-            b"HEAD /foo HTTP/1.1 xxxxxx\r\n" b"Host: a\r\n\r\n",
-            None,
-        )
-
-
-def test_reject_garbage_in_header_line() -> None:
-    with pytest.raises(LocalProtocolError):
-        tr(
-            READERS[CLIENT, IDLE],
-            b"HEAD /foo HTTP/1.1\r\n" b"Host: foo\x00bar\r\n\r\n",
-            None,
-        )
-
-
-def test_reject_non_vchar_in_path() -> None:
-    for bad_char in b"\x00\x20\x7f\xee":
-        message = bytearray(b"HEAD /")
-        message.append(bad_char)
-        message.extend(b" HTTP/1.1\r\nHost: foobar\r\n\r\n")
-        with pytest.raises(LocalProtocolError):
-            tr(READERS[CLIENT, IDLE], message, None)
-
-
-# https://github.com/python-hyper/h11/issues/57
-def test_allow_some_garbage_in_cookies() -> None:
-    tr(
-        READERS[CLIENT, IDLE],
-        b"HEAD /foo HTTP/1.1\r\n"
-        b"Host: foo\r\n"
-        b"Set-Cookie: ___utmvafIumyLc=kUd\x01UpAt; path=/; Max-Age=900\r\n"
-        b"\r\n",
-        Request(
-            method="HEAD",
-            target="/foo",
-            headers=[
-                ("Host", "foo"),
-                ("Set-Cookie", "___utmvafIumyLc=kUd\x01UpAt; path=/; Max-Age=900"),
-            ],
-        ),
-    )
-
-
-def test_host_comes_first() -> None:
-    tw(
-        write_headers,
-        normalize_and_validate([("foo", "bar"), ("Host", "example.com")]),
-        b"Host: example.com\r\nfoo: bar\r\n\r\n",
-    )
diff --git a/libs/h11/tests/test_receivebuffer.py b/libs/h11/tests/test_receivebuffer.py
deleted file mode 100644
index 21a3870b6b..0000000000
--- a/libs/h11/tests/test_receivebuffer.py
+++ /dev/null
@@ -1,135 +0,0 @@
-import re
-from typing import Tuple
-
-import pytest
-
-from .._receivebuffer import ReceiveBuffer
-
-
-def test_receivebuffer() -> None:
-    b = ReceiveBuffer()
-    assert not b
-    assert len(b) == 0
-    assert bytes(b) == b""
-
-    b += b"123"
-    assert b
-    assert len(b) == 3
-    assert bytes(b) == b"123"
-
-    assert bytes(b) == b"123"
-
-    assert b.maybe_extract_at_most(2) == b"12"
-    assert b
-    assert len(b) == 1
-    assert bytes(b) == b"3"
-
-    assert bytes(b) == b"3"
-
-    assert b.maybe_extract_at_most(10) == b"3"
-    assert bytes(b) == b""
-
-    assert b.maybe_extract_at_most(10) is None
-    assert not b
-
-    ################################################################
-    # maybe_extract_until_next
-    ################################################################
-
-    b += b"123\n456\r\n789\r\n"
-
-    assert b.maybe_extract_next_line() == b"123\n456\r\n"
-    assert bytes(b) == b"789\r\n"
-
-    assert b.maybe_extract_next_line() == b"789\r\n"
-    assert bytes(b) == b""
-
-    b += b"12\r"
-    assert b.maybe_extract_next_line() is None
-    assert bytes(b) == b"12\r"
-
-    b += b"345\n\r"
-    assert b.maybe_extract_next_line() is None
-    assert bytes(b) == b"12\r345\n\r"
-
-    # here we stopped at the middle of b"\r\n" delimiter
-
-    b += b"\n6789aaa123\r\n"
-    assert b.maybe_extract_next_line() == b"12\r345\n\r\n"
-    assert b.maybe_extract_next_line() == b"6789aaa123\r\n"
-    assert b.maybe_extract_next_line() is None
-    assert bytes(b) == b""
-
-    ################################################################
-    # maybe_extract_lines
-    ################################################################
-
-    b += b"123\r\na: b\r\nfoo:bar\r\n\r\ntrailing"
-    lines = b.maybe_extract_lines()
-    assert lines == [b"123", b"a: b", b"foo:bar"]
-    assert bytes(b) == b"trailing"
-
-    assert b.maybe_extract_lines() is None
-
-    b += b"\r\n\r"
-    assert b.maybe_extract_lines() is None
-
-    assert b.maybe_extract_at_most(100) == b"trailing\r\n\r"
-    assert not b
-
-    # Empty body case (as happens at the end of chunked encoding if there are
-    # no trailing headers, e.g.)
-    b += b"\r\ntrailing"
-    assert b.maybe_extract_lines() == []
-    assert bytes(b) == b"trailing"
-
-
-@pytest.mark.parametrize(
-    "data",
-    [
-        pytest.param(
-            (
-                b"HTTP/1.1 200 OK\r\n",
-                b"Content-type: text/plain\r\n",
-                b"Connection: close\r\n",
-                b"\r\n",
-                b"Some body",
-            ),
-            id="with_crlf_delimiter",
-        ),
-        pytest.param(
-            (
-                b"HTTP/1.1 200 OK\n",
-                b"Content-type: text/plain\n",
-                b"Connection: close\n",
-                b"\n",
-                b"Some body",
-            ),
-            id="with_lf_only_delimiter",
-        ),
-        pytest.param(
-            (
-                b"HTTP/1.1 200 OK\n",
-                b"Content-type: text/plain\r\n",
-                b"Connection: close\n",
-                b"\n",
-                b"Some body",
-            ),
-            id="with_mixed_crlf_and_lf",
-        ),
-    ],
-)
-def test_receivebuffer_for_invalid_delimiter(data: Tuple[bytes]) -> None:
-    b = ReceiveBuffer()
-
-    for line in data:
-        b += line
-
-    lines = b.maybe_extract_lines()
-
-    assert lines == [
-        b"HTTP/1.1 200 OK",
-        b"Content-type: text/plain",
-        b"Connection: close",
-    ]
-    assert bytes(b) == b"Some body"
diff --git a/libs/h11/tests/test_state.py b/libs/h11/tests/test_state.py
deleted file mode 100644
index bc974e636e..0000000000
--- a/libs/h11/tests/test_state.py
+++ /dev/null
@@ -1,271 +0,0 @@
-import pytest
-
-from .._events import (
-    ConnectionClosed,
-    Data,
-    EndOfMessage,
-    Event,
-    InformationalResponse,
-    Request,
-    Response,
-)
-from .._state import (
-    _SWITCH_CONNECT,
-    _SWITCH_UPGRADE,
-    CLIENT,
-    CLOSED,
-    ConnectionState,
-    DONE,
-    IDLE,
-    MIGHT_SWITCH_PROTOCOL,
-    MUST_CLOSE,
-    SEND_BODY,
-    SEND_RESPONSE,
-    SERVER,
-    SWITCHED_PROTOCOL,
-)
-from .._util import LocalProtocolError
-
-
-def test_ConnectionState() -> None:
-    cs = ConnectionState()
-
-    # Basic event-triggered transitions
-
-    assert cs.states == {CLIENT: IDLE, SERVER: IDLE}
-
-    cs.process_event(CLIENT, Request)
-    # The SERVER-Request special case:
-    assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-
-    # Illegal transitions raise an error and nothing happens
-    with pytest.raises(LocalProtocolError):
-        cs.process_event(CLIENT, Request)
-    assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-
-    cs.process_event(SERVER, InformationalResponse)
-    assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-
-    cs.process_event(SERVER, Response)
-    assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_BODY}
-
-    cs.process_event(CLIENT, EndOfMessage)
-    cs.process_event(SERVER, EndOfMessage)
-    assert cs.states == {CLIENT: DONE, SERVER: DONE}
-
-    # State-triggered transition
-
-    cs.process_event(SERVER, ConnectionClosed)
-    assert cs.states == {CLIENT: MUST_CLOSE, SERVER: CLOSED}
-
-
-def test_ConnectionState_keep_alive() -> None:
-    # keep_alive = False
-    cs = ConnectionState()
-    cs.process_event(CLIENT, Request)
-    cs.process_keep_alive_disabled()
-    cs.process_event(CLIENT, EndOfMessage)
-    assert cs.states == {CLIENT: MUST_CLOSE, SERVER: SEND_RESPONSE}
-
-    cs.process_event(SERVER, Response)
-    cs.process_event(SERVER, EndOfMessage)
-    assert cs.states == {CLIENT: MUST_CLOSE, SERVER: MUST_CLOSE}
-
-
-def test_ConnectionState_keep_alive_in_DONE() -> None:
-    # Check that if keep_alive is disabled when the CLIENT is already in DONE,
-    # then this is sufficient to immediately trigger the DONE -> MUST_CLOSE
-    # transition
-    cs = ConnectionState()
-    cs.process_event(CLIENT, Request)
-    cs.process_event(CLIENT, EndOfMessage)
-    assert cs.states[CLIENT] is DONE
-    cs.process_keep_alive_disabled()
-    assert cs.states[CLIENT] is MUST_CLOSE
-
-
-def test_ConnectionState_switch_denied() -> None:
-    for switch_type in (_SWITCH_CONNECT, _SWITCH_UPGRADE):
-        for deny_early in (True, False):
-            cs = ConnectionState()
-            cs.process_client_switch_proposal(switch_type)
-            cs.process_event(CLIENT, Request)
-            cs.process_event(CLIENT, Data)
-            assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-
-            assert switch_type in cs.pending_switch_proposals
-
-            if deny_early:
-                # before client reaches DONE
-                cs.process_event(SERVER, Response)
-                assert not cs.pending_switch_proposals
-
-            cs.process_event(CLIENT, EndOfMessage)
-
-            if deny_early:
-                assert cs.states == {CLIENT: DONE, SERVER: SEND_BODY}
-            else:
-                assert cs.states == {
-                    CLIENT: MIGHT_SWITCH_PROTOCOL,
-                    SERVER: SEND_RESPONSE,
-                }
-
-                cs.process_event(SERVER, InformationalResponse)
-                assert cs.states == {
-                    CLIENT: MIGHT_SWITCH_PROTOCOL,
-                    SERVER: SEND_RESPONSE,
-                }
-
-                cs.process_event(SERVER, Response)
-                assert cs.states == {CLIENT: DONE, SERVER: SEND_BODY}
-                assert not cs.pending_switch_proposals
-
-
-_response_type_for_switch = {
-    _SWITCH_UPGRADE: InformationalResponse,
-    _SWITCH_CONNECT: Response,
-    None: Response,
-}
-
-
-def test_ConnectionState_protocol_switch_accepted() -> None:
-    for switch_event in [_SWITCH_UPGRADE, _SWITCH_CONNECT]:
-        cs = ConnectionState()
-        cs.process_client_switch_proposal(switch_event)
-        cs.process_event(CLIENT, Request)
-        cs.process_event(CLIENT, Data)
-        assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-
-        cs.process_event(CLIENT, EndOfMessage)
-        assert cs.states == {CLIENT: MIGHT_SWITCH_PROTOCOL, SERVER: SEND_RESPONSE}
-
-        cs.process_event(SERVER, InformationalResponse)
-        assert cs.states == {CLIENT: MIGHT_SWITCH_PROTOCOL, SERVER: SEND_RESPONSE}
-
-        cs.process_event(SERVER, _response_type_for_switch[switch_event], switch_event)
-        assert cs.states == {CLIENT: SWITCHED_PROTOCOL, SERVER: SWITCHED_PROTOCOL}
-
-
-def test_ConnectionState_double_protocol_switch() -> None:
-    # CONNECT + Upgrade is legal! Very silly, but legal. So we support
-    # it. Because sometimes doing the silly thing is easier than not.
-    for server_switch in [None, _SWITCH_UPGRADE, _SWITCH_CONNECT]:
-        cs = ConnectionState()
-        cs.process_client_switch_proposal(_SWITCH_UPGRADE)
-        cs.process_client_switch_proposal(_SWITCH_CONNECT)
-        cs.process_event(CLIENT, Request)
-        cs.process_event(CLIENT, EndOfMessage)
-        assert cs.states == {CLIENT: MIGHT_SWITCH_PROTOCOL, SERVER: SEND_RESPONSE}
-        cs.process_event(
-            SERVER, _response_type_for_switch[server_switch], server_switch
-        )
-        if server_switch is None:
-            assert cs.states == {CLIENT: DONE, SERVER: SEND_BODY}
-        else:
-            assert cs.states == {CLIENT: SWITCHED_PROTOCOL, SERVER: SWITCHED_PROTOCOL}
-
-
-def test_ConnectionState_inconsistent_protocol_switch() -> None:
-    for client_switches, server_switch in [
-        ([], _SWITCH_CONNECT),
-        ([], _SWITCH_UPGRADE),
-        ([_SWITCH_UPGRADE], _SWITCH_CONNECT),
-        ([_SWITCH_CONNECT], _SWITCH_UPGRADE),
-    ]:
-        cs = ConnectionState()
-        for client_switch in client_switches:  # type: ignore[attr-defined]
-            cs.process_client_switch_proposal(client_switch)
-        cs.process_event(CLIENT, Request)
-        with pytest.raises(LocalProtocolError):
-            cs.process_event(SERVER, Response, server_switch)
-
-
-def test_ConnectionState_keepalive_protocol_switch_interaction() -> None:
-    # keep_alive=False + pending_switch_proposals
-    cs = ConnectionState()
-    cs.process_client_switch_proposal(_SWITCH_UPGRADE)
-    cs.process_event(CLIENT, Request)
-    cs.process_keep_alive_disabled()
-    cs.process_event(CLIENT, Data)
-    assert cs.states == {CLIENT: SEND_BODY, SERVER: SEND_RESPONSE}
-
-    # the protocol switch "wins"
-    cs.process_event(CLIENT, EndOfMessage)
-    assert cs.states == {CLIENT: MIGHT_SWITCH_PROTOCOL, SERVER: SEND_RESPONSE}
-
-    # but when the server denies the request, keep_alive comes back into play
-    cs.process_event(SERVER, Response)
-    assert cs.states == {CLIENT: MUST_CLOSE, SERVER: SEND_BODY}
-
-
-def test_ConnectionState_reuse() -> None:
-    cs = ConnectionState()
-
-    with pytest.raises(LocalProtocolError):
-        cs.start_next_cycle()
-
-    cs.process_event(CLIENT, Request)
-    cs.process_event(CLIENT, EndOfMessage)
-
-    with pytest.raises(LocalProtocolError):
-        cs.start_next_cycle()
-
-    cs.process_event(SERVER, Response)
-    cs.process_event(SERVER, EndOfMessage)
-
-    cs.start_next_cycle()
-    assert cs.states == {CLIENT: IDLE, SERVER: IDLE}
-
-    # No keepalive
-
-    cs.process_event(CLIENT, Request)
-    cs.process_keep_alive_disabled()
-    cs.process_event(CLIENT, EndOfMessage)
-    cs.process_event(SERVER, Response)
-    cs.process_event(SERVER, EndOfMessage)
-
-    with pytest.raises(LocalProtocolError):
-        cs.start_next_cycle()
-
-    # One side closed
-
-    cs = ConnectionState()
-    cs.process_event(CLIENT, Request)
-    cs.process_event(CLIENT, EndOfMessage)
-    cs.process_event(CLIENT, ConnectionClosed)
-    cs.process_event(SERVER, Response)
-    cs.process_event(SERVER, EndOfMessage)
-
-    with pytest.raises(LocalProtocolError):
-        cs.start_next_cycle()
-
-    # Succesful protocol switch
-
-    cs = ConnectionState()
-    cs.process_client_switch_proposal(_SWITCH_UPGRADE)
-    cs.process_event(CLIENT, Request)
-    cs.process_event(CLIENT, EndOfMessage)
-    cs.process_event(SERVER, InformationalResponse, _SWITCH_UPGRADE)
-
-    with pytest.raises(LocalProtocolError):
-        cs.start_next_cycle()
-
-    # Failed protocol switch
-
-    cs = ConnectionState()
-    cs.process_client_switch_proposal(_SWITCH_UPGRADE)
-    cs.process_event(CLIENT, Request)
-    cs.process_event(CLIENT, EndOfMessage)
-    cs.process_event(SERVER, Response)
-    cs.process_event(SERVER, EndOfMessage)
-
-    cs.start_next_cycle()
-    assert cs.states == {CLIENT: IDLE, SERVER: IDLE}
-
-
-def test_server_request_is_illegal() -> None:
-    # There used to be a bug in how we handled the Request special case that
-    # made this allowed...
-    cs = ConnectionState()
-    with pytest.raises(LocalProtocolError):
-        cs.process_event(SERVER, Request)
diff --git a/libs/h11/tests/test_util.py b/libs/h11/tests/test_util.py
deleted file mode 100644
index 79bc095185..0000000000
--- a/libs/h11/tests/test_util.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import re
-import sys
-import traceback
-from typing import NoReturn
-
-import pytest
-
-from .._util import (
-    bytesify,
-    LocalProtocolError,
-    ProtocolError,
-    RemoteProtocolError,
-    Sentinel,
-    validate,
-)
-
-
-def test_ProtocolError() -> None:
-    with pytest.raises(TypeError):
-        ProtocolError("abstract base class")
-
-
-def test_LocalProtocolError() -> None:
-    try:
-        raise LocalProtocolError("foo")
-    except LocalProtocolError as e:
-        assert str(e) == "foo"
-        assert e.error_status_hint == 400
-
-    try:
-        raise LocalProtocolError("foo", error_status_hint=418)
-    except LocalProtocolError as e:
-        assert str(e) == "foo"
-        assert e.error_status_hint == 418
-
-    def thunk() -> NoReturn:
-        raise LocalProtocolError("a", error_status_hint=420)
-
-    try:
-        try:
-            thunk()
-        except LocalProtocolError as exc1:
-            orig_traceback = "".join(traceback.format_tb(sys.exc_info()[2]))
-            exc1._reraise_as_remote_protocol_error()
-    except RemoteProtocolError as exc2:
-        assert type(exc2) is RemoteProtocolError
-        assert exc2.args == ("a",)
-        assert exc2.error_status_hint == 420
-        new_traceback = "".join(traceback.format_tb(sys.exc_info()[2]))
-        assert new_traceback.endswith(orig_traceback)
-
-
-def test_validate() -> None:
-    my_re = re.compile(rb"(?P<group1>[0-9]+)\.(?P<group2>[0-9]+)")
-    with pytest.raises(LocalProtocolError):
-        validate(my_re, b"0.")
-
-    groups = validate(my_re, b"0.1")
-    assert groups == {"group1": b"0", "group2": b"1"}
-
-    # successful partial matches are an error - must match whole string
-    with pytest.raises(LocalProtocolError):
-        validate(my_re, b"0.1xx")
-    with pytest.raises(LocalProtocolError):
-        validate(my_re, b"0.1\n")
-
-
-def test_validate_formatting() -> None:
-    my_re = re.compile(rb"foo")
-
-    with pytest.raises(LocalProtocolError) as excinfo:
-        validate(my_re, b"", "oops")
-    assert "oops" in str(excinfo.value)
-
-    with pytest.raises(LocalProtocolError) as excinfo:
-        validate(my_re, b"", "oops {}")
-    assert "oops {}" in str(excinfo.value)
-
-    with pytest.raises(LocalProtocolError) as excinfo:
-        validate(my_re, b"", "oops {} xx", 10)
-    assert "oops 10 xx" in str(excinfo.value)
-
-
-def test_make_sentinel() -> None:
-    class S(Sentinel, metaclass=Sentinel):
-        pass
-
-    assert repr(S) == "S"
-    assert S == S
-    assert type(S).__name__ == "S"
-    assert S in {S}
-    assert type(S) is S
-
-    class S2(Sentinel, metaclass=Sentinel):
-        pass
-
-    assert repr(S2) == "S2"
-    assert S != S2
-    assert S not in {S2}
-    assert type(S) is not type(S2)
-
-
-def test_bytesify() -> None:
-    assert bytesify(b"123") == b"123"
-    assert bytesify(bytearray(b"123")) == b"123"
-    assert bytesify("123") == b"123"
-
-    with pytest.raises(UnicodeEncodeError):
-        bytesify("\u1234")
-
-    with pytest.raises(TypeError):
-        bytesify(10)
diff --git a/libs/html5lib-1.1.dist-info/METADATA b/libs/html5lib-1.1.dist-info/METADATA
index 8dbe469244..4f79a2706d 100644
--- a/libs/html5lib-1.1.dist-info/METADATA
+++ b/libs/html5lib-1.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: html5lib
 Version: 1.1
 Summary: HTML parser based on the WHATWG HTML specification
@@ -25,18 +25,29 @@ Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: six >=1.9
+Requires-Dist: six>=1.9
 Requires-Dist: webencodings
-Provides-Extra: all
-Requires-Dist: genshi ; extra == 'all'
-Requires-Dist: chardet >=2.2 ; extra == 'all'
-Requires-Dist: lxml ; (platform_python_implementation == 'CPython') and extra == 'all'
-Provides-Extra: chardet
-Requires-Dist: chardet >=2.2 ; extra == 'chardet'
-Provides-Extra: genshi
-Requires-Dist: genshi ; extra == 'genshi'
 Provides-Extra: lxml
-Requires-Dist: lxml ; (platform_python_implementation == 'CPython') and extra == 'lxml'
+Requires-Dist: lxml; platform_python_implementation == "CPython" and extra == "lxml"
+Provides-Extra: genshi
+Requires-Dist: genshi; extra == "genshi"
+Provides-Extra: chardet
+Requires-Dist: chardet>=2.2; extra == "chardet"
+Provides-Extra: all
+Requires-Dist: genshi; extra == "all"
+Requires-Dist: chardet>=2.2; extra == "all"
+Requires-Dist: lxml; platform_python_implementation == "CPython" and extra == "all"
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 html5lib
 ========
diff --git a/libs/html5lib-1.1.dist-info/RECORD b/libs/html5lib-1.1.dist-info/RECORD
index 6e245fb2d0..ba3bdcab9c 100644
--- a/libs/html5lib-1.1.dist-info/RECORD
+++ b/libs/html5lib-1.1.dist-info/RECORD
@@ -1,10 +1,10 @@
-html5lib-1.1.dist-info/AUTHORS.rst,sha256=DrNAMifoDpuQyJn-KW-H6K8Tt2a5rKnV2UF4-DRrGUI,983
 html5lib-1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-html5lib-1.1.dist-info/LICENSE,sha256=FqOZkWGekvGGgJMtoqkZn999ld8-yu3FLqBiGKq6_W8,1084
-html5lib-1.1.dist-info/METADATA,sha256=o9amJ3IQEmkazpYOi8BlOpuZzAxHaFC7MDg7R_u4bsI,16098
+html5lib-1.1.dist-info/METADATA,sha256=YRnbU0xsELfcLEmMmEbrdtWZL7_a7muglhmZFJQK2qc,16319
 html5lib-1.1.dist-info/RECORD,,
 html5lib-1.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-html5lib-1.1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+html5lib-1.1.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+html5lib-1.1.dist-info/licenses/AUTHORS.rst,sha256=DrNAMifoDpuQyJn-KW-H6K8Tt2a5rKnV2UF4-DRrGUI,983
+html5lib-1.1.dist-info/licenses/LICENSE,sha256=FqOZkWGekvGGgJMtoqkZn999ld8-yu3FLqBiGKq6_W8,1084
 html5lib-1.1.dist-info/top_level.txt,sha256=XEX6CHpskSmvjJB4tP6m4Q5NYXhIf_0ceMc0PNbzJPQ,9
 html5lib/__init__.py,sha256=pWnYcfZ69wNLrdQL7bpr49FUi8O8w0KhKCOHsyRgYGQ,1143
 html5lib/_ihatexml.py,sha256=ifOwF7pXqmyThIXc3boWc96s4MDezqRrRVp7FwDYUFs,16728
diff --git a/libs/html5lib-1.1.dist-info/WHEEL b/libs/html5lib-1.1.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/html5lib-1.1.dist-info/WHEEL
+++ b/libs/html5lib-1.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/html5lib-1.1.dist-info/AUTHORS.rst b/libs/html5lib-1.1.dist-info/licenses/AUTHORS.rst
similarity index 100%
rename from libs/html5lib-1.1.dist-info/AUTHORS.rst
rename to libs/html5lib-1.1.dist-info/licenses/AUTHORS.rst
diff --git a/libs/html5lib-1.1.dist-info/LICENSE b/libs/html5lib-1.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/html5lib-1.1.dist-info/LICENSE
rename to libs/html5lib-1.1.dist-info/licenses/LICENSE
diff --git a/libs/idna-3.10.dist-info/LICENSE.md b/libs/idna-3.10.dist-info/LICENSE.md
deleted file mode 100644
index 19b6b45242..0000000000
--- a/libs/idna-3.10.dist-info/LICENSE.md
+++ /dev/null
@@ -1,31 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2013-2024, Kim Davies and contributors.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/idna-3.10.dist-info/METADATA b/libs/idna-3.10.dist-info/METADATA
deleted file mode 100644
index c42623e942..0000000000
--- a/libs/idna-3.10.dist-info/METADATA
+++ /dev/null
@@ -1,250 +0,0 @@
-Metadata-Version: 2.1
-Name: idna
-Version: 3.10
-Summary: Internationalized Domain Names in Applications (IDNA)
-Author-email: Kim Davies <kim+pypi@gumleaf.org>
-Requires-Python: >=3.6
-Description-Content-Type: text/x-rst
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Internet :: Name Service (DNS)
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Utilities
-Requires-Dist: ruff >= 0.6.2 ; extra == "all"
-Requires-Dist: mypy >= 1.11.2 ; extra == "all"
-Requires-Dist: pytest >= 8.3.2 ; extra == "all"
-Requires-Dist: flake8 >= 7.1.1 ; extra == "all"
-Project-URL: Changelog, https://github.com/kjd/idna/blob/master/HISTORY.rst
-Project-URL: Issue tracker, https://github.com/kjd/idna/issues
-Project-URL: Source, https://github.com/kjd/idna
-Provides-Extra: all
-
-Internationalized Domain Names in Applications (IDNA)
-=====================================================
-
-Support for the Internationalized Domain Names in
-Applications (IDNA) protocol as specified in `RFC 5891
-<https://tools.ietf.org/html/rfc5891>`_. This is the latest version of
-the protocol and is sometimes referred to as โ€œIDNA 2008โ€.
-
-This library also provides support for Unicode Technical
-Standard 46, `Unicode IDNA Compatibility Processing
-<https://unicode.org/reports/tr46/>`_.
-
-This acts as a suitable replacement for the โ€œencodings.idnaโ€
-module that comes with the Python standard library, but which
-only supports the older superseded IDNA specification (`RFC 3490
-<https://tools.ietf.org/html/rfc3490>`_).
-
-Basic functions are simply executed:
-
-.. code-block:: pycon
-
-    >>> import idna
-    >>> idna.encode('ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ')
-    b'xn--eckwd4c7c.xn--zckzah'
-    >>> print(idna.decode('xn--eckwd4c7c.xn--zckzah'))
-    ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ
-
-
-Installation
-------------
-
-This package is available for installation from PyPI:
-
-.. code-block:: bash
-
-    $ python3 -m pip install idna
-
-
-Usage
------
-
-For typical usage, the ``encode`` and ``decode`` functions will take a
-domain name argument and perform a conversion to A-labels or U-labels
-respectively.
-
-.. code-block:: pycon
-
-    >>> import idna
-    >>> idna.encode('ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ')
-    b'xn--eckwd4c7c.xn--zckzah'
-    >>> print(idna.decode('xn--eckwd4c7c.xn--zckzah'))
-    ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ
-
-You may use the codec encoding and decoding methods using the
-``idna.codec`` module:
-
-.. code-block:: pycon
-
-    >>> import idna.codec
-    >>> print('ะดะพะผะตะฝ.ะธัะฟั‹ั‚ะฐะฝะธะต'.encode('idna2008'))
-    b'xn--d1acufc.xn--80akhbyknj4f'
-    >>> print(b'xn--d1acufc.xn--80akhbyknj4f'.decode('idna2008'))
-    ะดะพะผะตะฝ.ะธัะฟั‹ั‚ะฐะฝะธะต
-
-Conversions can be applied at a per-label basis using the ``ulabel`` or
-``alabel`` functions if necessary:
-
-.. code-block:: pycon
-
-    >>> idna.alabel('ๆต‹่ฏ•')
-    b'xn--0zwm56d'
-
-Compatibility Mapping (UTS #46)
-+++++++++++++++++++++++++++++++
-
-As described in `RFC 5895 <https://tools.ietf.org/html/rfc5895>`_, the
-IDNA specification does not normalize input from different potential
-ways a user may input a domain name. This functionality, known as
-a โ€œmappingโ€, is considered by the specification to be a local
-user-interface issue distinct from IDNA conversion functionality.
-
-This library provides one such mapping that was developed by the
-Unicode Consortium. Known as `Unicode IDNA Compatibility Processing
-<https://unicode.org/reports/tr46/>`_, it provides for both a regular
-mapping for typical applications, as well as a transitional mapping to
-help migrate from older IDNA 2003 applications. Strings are
-preprocessed according to Section 4.4 โ€œPreprocessing for IDNA2008โ€
-prior to the IDNA operations.
-
-For example, โ€œKรถnigsgรครŸchenโ€ is not a permissible label as *LATIN
-CAPITAL LETTER K* is not allowed (nor are capital letters in general).
-UTS 46 will convert this into lower case prior to applying the IDNA
-conversion.
-
-.. code-block:: pycon
-
-    >>> import idna
-    >>> idna.encode('KรถnigsgรครŸchen')
-    ...
-    idna.core.InvalidCodepoint: Codepoint U+004B at position 1 of 'KรถnigsgรครŸchen' not allowed
-    >>> idna.encode('KรถnigsgรครŸchen', uts46=True)
-    b'xn--knigsgchen-b4a3dun'
-    >>> print(idna.decode('xn--knigsgchen-b4a3dun'))
-    kรถnigsgรครŸchen
-
-Transitional processing provides conversions to help transition from
-the older 2003 standard to the current standard. For example, in the
-original IDNA specification, the *LATIN SMALL LETTER SHARP S* (รŸ) was
-converted into two *LATIN SMALL LETTER S* (ss), whereas in the current
-IDNA specification this conversion is not performed.
-
-.. code-block:: pycon
-
-    >>> idna.encode('KรถnigsgรครŸchen', uts46=True, transitional=True)
-    'xn--knigsgsschen-lcb0w'
-
-Implementers should use transitional processing with caution, only in
-rare cases where conversion from legacy labels to current labels must be
-performed (i.e. IDNA implementations that pre-date 2008). For typical
-applications that just need to convert labels, transitional processing
-is unlikely to be beneficial and could produce unexpected incompatible
-results.
-
-``encodings.idna`` Compatibility
-++++++++++++++++++++++++++++++++
-
-Function calls from the Python built-in ``encodings.idna`` module are
-mapped to their IDNA 2008 equivalents using the ``idna.compat`` module.
-Simply substitute the ``import`` clause in your code to refer to the new
-module name.
-
-Exceptions
-----------
-
-All errors raised during the conversion following the specification
-should raise an exception derived from the ``idna.IDNAError`` base
-class.
-
-More specific exceptions that may be generated as ``idna.IDNABidiError``
-when the error reflects an illegal combination of left-to-right and
-right-to-left characters in a label; ``idna.InvalidCodepoint`` when
-a specific codepoint is an illegal character in an IDN label (i.e.
-INVALID); and ``idna.InvalidCodepointContext`` when the codepoint is
-illegal based on its positional context (i.e. it is CONTEXTO or CONTEXTJ
-but the contextual requirements are not satisfied.)
-
-Building and Diagnostics
-------------------------
-
-The IDNA and UTS 46 functionality relies upon pre-calculated lookup
-tables for performance. These tables are derived from computing against
-eligibility criteria in the respective standards. These tables are
-computed using the command-line script ``tools/idna-data``.
-
-This tool will fetch relevant codepoint data from the Unicode repository
-and perform the required calculations to identify eligibility. There are
-three main modes:
-
-* ``idna-data make-libdata``. Generates ``idnadata.py`` and
-  ``uts46data.py``, the pre-calculated lookup tables used for IDNA and
-  UTS 46 conversions. Implementers who wish to track this library against
-  a different Unicode version may use this tool to manually generate a
-  different version of the ``idnadata.py`` and ``uts46data.py`` files.
-
-* ``idna-data make-table``. Generate a table of the IDNA disposition
-  (e.g. PVALID, CONTEXTJ, CONTEXTO) in the format found in Appendix
-  B.1 of RFC 5892 and the pre-computed tables published by `IANA
-  <https://www.iana.org/>`_.
-
-* ``idna-data U+0061``. Prints debugging output on the various
-  properties associated with an individual Unicode codepoint (in this
-  case, U+0061), that are used to assess the IDNA and UTS 46 status of a
-  codepoint. This is helpful in debugging or analysis.
-
-The tool accepts a number of arguments, described using ``idna-data
--h``. Most notably, the ``--version`` argument allows the specification
-of the version of Unicode to be used in computing the table data. For
-example, ``idna-data --version 9.0.0 make-libdata`` will generate
-library data against Unicode 9.0.0.
-
-
-Additional Notes
-----------------
-
-* **Packages**. The latest tagged release version is published in the
-  `Python Package Index <https://pypi.org/project/idna/>`_.
-
-* **Version support**. This library supports Python 3.6 and higher.
-  As this library serves as a low-level toolkit for a variety of
-  applications, many of which strive for broad compatibility with older
-  Python versions, there is no rush to remove older interpreter support.
-  Removing support for older versions should be well justified in that the
-  maintenance burden has become too high.
-
-* **Python 2**. Python 2 is supported by version 2.x of this library.
-  Use "idna<3" in your requirements file if you need this library for
-  a Python 2 application. Be advised that these versions are no longer
-  actively developed.
-
-* **Testing**. The library has a test suite based on each rule of the
-  IDNA specification, as well as tests that are provided as part of the
-  Unicode Technical Standard 46, `Unicode IDNA Compatibility Processing
-  <https://unicode.org/reports/tr46/>`_.
-
-* **Emoji**. It is an occasional request to support emoji domains in
-  this library. Encoding of symbols like emoji is expressly prohibited by
-  the technical standard IDNA 2008 and emoji domains are broadly phased
-  out across the domain industry due to associated security risks. For
-  now, applications that need to support these non-compliant labels
-  may wish to consider trying the encode/decode operation in this library
-  first, and then falling back to using `encodings.idna`. See `the Github
-  project <https://github.com/kjd/idna/issues/18>`_ for more discussion.
-
diff --git a/libs/idna-3.10.dist-info/RECORD b/libs/idna-3.10.dist-info/RECORD
deleted file mode 100644
index 9a78b98718..0000000000
--- a/libs/idna-3.10.dist-info/RECORD
+++ /dev/null
@@ -1,15 +0,0 @@
-idna-3.10.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-idna-3.10.dist-info/LICENSE.md,sha256=pZ8LDvNjWHQQmkRhykT_enDVBpboFHZ7-vch1Mmw2w8,1541
-idna-3.10.dist-info/METADATA,sha256=URR5ZyDfQ1PCEGhkYoojqfi2Ra0tau2--lhwG4XSfjI,10158
-idna-3.10.dist-info/RECORD,,
-idna-3.10.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-idna-3.10.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-idna/__init__.py,sha256=MPqNDLZbXqGaNdXxAFhiqFPKEQXju2jNQhCey6-5eJM,868
-idna/codec.py,sha256=PEew3ItwzjW4hymbasnty2N2OXvNcgHB-JjrBuxHPYY,3422
-idna/compat.py,sha256=RzLy6QQCdl9784aFhb2EX9EKGCJjg0P3PilGdeXXcx8,316
-idna/core.py,sha256=YJYyAMnwiQEPjVC4-Fqu_p4CJ6yKKuDGmppBNQNQpFs,13239
-idna/idnadata.py,sha256=W30GcIGvtOWYwAjZj4ZjuouUutC6ffgNuyjJy7fZ-lo,78306
-idna/intranges.py,sha256=amUtkdhYcQG8Zr-CoMM_kVRacxkivC1WgxN1b63KKdU,1898
-idna/package_data.py,sha256=q59S3OXsc5VI8j6vSD0sGBMyk6zZ4vWFREE88yCJYKs,21
-idna/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-idna/uts46data.py,sha256=rt90K9J40gUSwppDPCrhjgi5AA6pWM65dEGRSf6rIhM,239289
diff --git a/libs/idna-3.10.dist-info/WHEEL b/libs/idna-3.10.dist-info/WHEEL
deleted file mode 100644
index 3b5e64b5e6..0000000000
--- a/libs/idna-3.10.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.9.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/fcache-0.5.2.dist-info/INSTALLER b/libs/idna-3.11.dist-info/INSTALLER
similarity index 100%
rename from libs/fcache-0.5.2.dist-info/INSTALLER
rename to libs/idna-3.11.dist-info/INSTALLER
diff --git a/libs/idna-3.11.dist-info/METADATA b/libs/idna-3.11.dist-info/METADATA
new file mode 100644
index 0000000000..7a4a4b7a7e
--- /dev/null
+++ b/libs/idna-3.11.dist-info/METADATA
@@ -0,0 +1,209 @@
+Metadata-Version: 2.4
+Name: idna
+Version: 3.11
+Summary: Internationalized Domain Names in Applications (IDNA)
+Author-email: Kim Davies <kim+pypi@gumleaf.org>
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
+License-Expression: BSD-3-Clause
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: Name Service (DNS)
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Utilities
+License-File: LICENSE.md
+Requires-Dist: ruff >= 0.6.2 ; extra == "all"
+Requires-Dist: mypy >= 1.11.2 ; extra == "all"
+Requires-Dist: pytest >= 8.3.2 ; extra == "all"
+Requires-Dist: flake8 >= 7.1.1 ; extra == "all"
+Project-URL: Changelog, https://github.com/kjd/idna/blob/master/HISTORY.rst
+Project-URL: Issue tracker, https://github.com/kjd/idna/issues
+Project-URL: Source, https://github.com/kjd/idna
+Provides-Extra: all
+
+Internationalized Domain Names in Applications (IDNA)
+=====================================================
+
+Support for `Internationalized Domain Names in
+Applications (IDNA) <https://tools.ietf.org/html/rfc5891>`_
+and `Unicode IDNA Compatibility Processing
+<https://unicode.org/reports/tr46/>`_.
+
+The latest versions of these standards supplied here provide
+more comprehensive language coverage and reduce the potential of
+allowing domains with known security vulnerabilities. This library
+is a suitable replacement for the โ€œencodings.idnaโ€
+module that comes with the Python standard library, but which
+only supports an older superseded IDNA specification from 2003.
+
+Basic functions are simply executed:
+
+.. code-block:: pycon
+
+    >>> import idna
+    >>> idna.encode('ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ')
+    b'xn--eckwd4c7c.xn--zckzah'
+    >>> print(idna.decode('xn--eckwd4c7c.xn--zckzah'))
+    ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ
+
+
+Installation
+------------
+
+This package is available for installation from PyPI via the
+typical mechanisms, such as:
+
+.. code-block:: bash
+
+    $ python3 -m pip install idna
+
+
+Usage
+-----
+
+For typical usage, the ``encode`` and ``decode`` functions will take a
+domain name argument and perform a conversion to ASCII compatible encoding
+(known as A-labels), or to Unicode strings (known as U-labels)
+respectively.
+
+.. code-block:: pycon
+
+    >>> import idna
+    >>> idna.encode('ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ')
+    b'xn--eckwd4c7c.xn--zckzah'
+    >>> print(idna.decode('xn--eckwd4c7c.xn--zckzah'))
+    ใƒ‰ใƒกใ‚คใƒณ.ใƒ†ใ‚นใƒˆ
+
+Conversions can be applied at a per-label basis using the ``ulabel`` or
+``alabel`` functions if necessary:
+
+.. code-block:: pycon
+
+    >>> idna.alabel('ๆต‹่ฏ•')
+    b'xn--0zwm56d'
+
+
+Compatibility Mapping (UTS #46)
++++++++++++++++++++++++++++++++
+
+This library provides support for `Unicode IDNA Compatibility
+Processing <https://unicode.org/reports/tr46/>`_ which normalizes input from
+different potential ways a user may input a domain prior to performing the IDNA
+conversion operations. This functionality, known as a 
+`mapping <https://tools.ietf.org/html/rfc5895>`_, is considered by the
+specification to be a local user-interface issue distinct from IDNA
+conversion functionality.
+
+For example, โ€œKรถnigsgรครŸchenโ€ is not a permissible label as *LATIN
+CAPITAL LETTER K* is not allowed (nor are capital letters in general).
+UTS 46 will convert this into lower case prior to applying the IDNA
+conversion.
+
+.. code-block:: pycon
+
+    >>> import idna
+    >>> idna.encode('KรถnigsgรครŸchen')
+    ...
+    idna.core.InvalidCodepoint: Codepoint U+004B at position 1 of 'KรถnigsgรครŸchen' not allowed
+    >>> idna.encode('KรถnigsgรครŸchen', uts46=True)
+    b'xn--knigsgchen-b4a3dun'
+    >>> print(idna.decode('xn--knigsgchen-b4a3dun'))
+    kรถnigsgรครŸchen
+
+
+Exceptions
+----------
+
+All errors raised during the conversion following the specification
+should raise an exception derived from the ``idna.IDNAError`` base
+class.
+
+More specific exceptions that may be generated as ``idna.IDNABidiError``
+when the error reflects an illegal combination of left-to-right and
+right-to-left characters in a label; ``idna.InvalidCodepoint`` when
+a specific codepoint is an illegal character in an IDN label (i.e.
+INVALID); and ``idna.InvalidCodepointContext`` when the codepoint is
+illegal based on its position in the string (i.e. it is CONTEXTO or CONTEXTJ
+but the contextual requirements are not satisfied.)
+
+Building and Diagnostics
+------------------------
+
+The IDNA and UTS 46 functionality relies upon pre-calculated lookup
+tables for performance. These tables are derived from computing against
+eligibility criteria in the respective standards using the command-line
+script ``tools/idna-data``.
+
+This tool will fetch relevant codepoint data from the Unicode repository
+and perform the required calculations to identify eligibility. There are
+three main modes:
+
+* ``idna-data make-libdata``. Generates ``idnadata.py`` and
+  ``uts46data.py``, the pre-calculated lookup tables used for IDNA and
+  UTS 46 conversions. Implementers who wish to track this library against
+  a different Unicode version may use this tool to manually generate a
+  different version of the ``idnadata.py`` and ``uts46data.py`` files.
+
+* ``idna-data make-table``. Generate a table of the IDNA disposition
+  (e.g. PVALID, CONTEXTJ, CONTEXTO) in the format found in Appendix
+  B.1 of RFC 5892 and the pre-computed tables published by `IANA
+  <https://www.iana.org/>`_.
+
+* ``idna-data U+0061``. Prints debugging output on the various
+  properties associated with an individual Unicode codepoint (in this
+  case, U+0061), that are used to assess the IDNA and UTS 46 status of a
+  codepoint. This is helpful in debugging or analysis.
+
+The tool accepts a number of arguments, described using ``idna-data
+-h``. Most notably, the ``--version`` argument allows the specification
+of the version of Unicode to be used in computing the table data. For
+example, ``idna-data --version 9.0.0 make-libdata`` will generate
+library data against Unicode 9.0.0.
+
+
+Additional Notes
+----------------
+
+* **Packages**. The latest tagged release version is published in the
+  `Python Package Index <https://pypi.org/project/idna/>`_.
+
+* **Version support**. This library supports Python 3.8 and higher.
+  As this library serves as a low-level toolkit for a variety of
+  applications, many of which strive for broad compatibility with older
+  Python versions, there is no rush to remove older interpreter support.
+  Support for older versions are likely to be removed from new releases
+  as automated tests can no longer easily be run, i.e. once the Python
+  version is officially end-of-life.
+
+* **Testing**. The library has a test suite based on each rule of the
+  IDNA specification, as well as tests that are provided as part of the
+  Unicode Technical Standard 46, `Unicode IDNA Compatibility Processing
+  <https://unicode.org/reports/tr46/>`_.
+
+* **Emoji**. It is an occasional request to support emoji domains in
+  this library. Encoding of symbols like emoji is expressly prohibited by
+  the technical standard IDNA 2008 and emoji domains are broadly phased
+  out across the domain industry due to associated security risks. For
+  now, applications that need to support these non-compliant labels
+  may wish to consider trying the encode/decode operation in this library
+  first, and then falling back to using `encodings.idna`. See `the Github
+  project <https://github.com/kjd/idna/issues/18>`_ for more discussion.
+
+* **Transitional processing**. Unicode 16.0.0 removed transitional
+  processing so the `transitional` argument for the encode() method
+  no longer has any effect and will be removed at a later date.
+
diff --git a/libs/idna-3.11.dist-info/RECORD b/libs/idna-3.11.dist-info/RECORD
new file mode 100644
index 0000000000..e9b095ac72
--- /dev/null
+++ b/libs/idna-3.11.dist-info/RECORD
@@ -0,0 +1,15 @@
+idna-3.11.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+idna-3.11.dist-info/METADATA,sha256=fCwSww9SuiN8TIHllFSASUQCW55hAs8dzKnr9RaEEbA,8378
+idna-3.11.dist-info/RECORD,,
+idna-3.11.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+idna-3.11.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+idna-3.11.dist-info/licenses/LICENSE.md,sha256=t6M2q_OwThgOwGXN0W5wXQeeHMehT5EKpukYfza5zYc,1541
+idna/__init__.py,sha256=MPqNDLZbXqGaNdXxAFhiqFPKEQXju2jNQhCey6-5eJM,868
+idna/codec.py,sha256=M2SGWN7cs_6B32QmKTyTN6xQGZeYQgQ2wiX3_DR6loE,3438
+idna/compat.py,sha256=RzLy6QQCdl9784aFhb2EX9EKGCJjg0P3PilGdeXXcx8,316
+idna/core.py,sha256=P26_XVycuMTZ1R2mNK1ZREVzM5mvTzdabBXfyZVU1Lc,13246
+idna/idnadata.py,sha256=SG8jhaGE53iiD6B49pt2pwTv_UvClciWE-N54oR2p4U,79623
+idna/intranges.py,sha256=amUtkdhYcQG8Zr-CoMM_kVRacxkivC1WgxN1b63KKdU,1898
+idna/package_data.py,sha256=_CUavOxobnbyNG2FLyHoN8QHP3QM9W1tKuw7eq9QwBk,21
+idna/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+idna/uts46data.py,sha256=H9J35VkD0F9L9mKOqjeNGd2A-Va6FlPoz6Jz4K7h-ps,243725
diff --git a/libs/ffsubsync-0.4.27.dist-info/REQUESTED b/libs/idna-3.11.dist-info/REQUESTED
similarity index 100%
rename from libs/ffsubsync-0.4.27.dist-info/REQUESTED
rename to libs/idna-3.11.dist-info/REQUESTED
diff --git a/libs/idna-3.11.dist-info/WHEEL b/libs/idna-3.11.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/idna-3.11.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/idna-3.11.dist-info/licenses/LICENSE.md b/libs/idna-3.11.dist-info/licenses/LICENSE.md
new file mode 100644
index 0000000000..256ba90cd9
--- /dev/null
+++ b/libs/idna-3.11.dist-info/licenses/LICENSE.md
@@ -0,0 +1,31 @@
+BSD 3-Clause License
+
+Copyright (c) 2013-2025, Kim Davies and contributors.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/idna/codec.py b/libs/idna/codec.py
index 913abfd6a2..cbc2e4ff4e 100644
--- a/libs/idna/codec.py
+++ b/libs/idna/codec.py
@@ -111,7 +111,7 @@ def search_function(name: str) -> Optional[codecs.CodecInfo]:
     return codecs.CodecInfo(
         name=name,
         encode=Codec().encode,
-        decode=Codec().decode,
+        decode=Codec().decode,  # type: ignore
         incrementalencoder=IncrementalEncoder,
         incrementaldecoder=IncrementalDecoder,
         streamwriter=StreamWriter,
diff --git a/libs/idna/core.py b/libs/idna/core.py
index 9115f123f0..8177bf7a32 100644
--- a/libs/idna/core.py
+++ b/libs/idna/core.py
@@ -308,7 +308,7 @@ def ulabel(label: Union[str, bytes, bytearray]) -> str:
             check_label(label)
             return label
     else:
-        label_bytes = label
+        label_bytes = bytes(label)
 
     label_bytes = label_bytes.lower()
     if label_bytes.startswith(_alabel_prefix):
diff --git a/libs/idna/idnadata.py b/libs/idna/idnadata.py
index 4be6004622..ded47cae0b 100644
--- a/libs/idna/idnadata.py
+++ b/libs/idna/idnadata.py
@@ -1,6 +1,7 @@
 # This file is automatically generated by tools/idna-data
 
-__version__ = "15.1.0"
+__version__ = "16.0.0"
+
 scripts = {
     "Greek": (
         0x37000000374,
@@ -727,6 +728,7 @@
     0x88C: 68,
     0x88D: 68,
     0x88E: 82,
+    0x897: 84,
     0x898: 84,
     0x899: 84,
     0x89A: 84,
@@ -1873,8 +1875,17 @@
     0x10D25: 84,
     0x10D26: 84,
     0x10D27: 84,
+    0x10D69: 84,
+    0x10D6A: 84,
+    0x10D6B: 84,
+    0x10D6C: 84,
+    0x10D6D: 84,
     0x10EAB: 84,
     0x10EAC: 84,
+    0x10EC2: 82,
+    0x10EC3: 68,
+    0x10EC4: 68,
+    0x10EFC: 84,
     0x10EFD: 84,
     0x10EFE: 84,
     0x10EFF: 84,
@@ -2053,6 +2064,17 @@
     0x11372: 84,
     0x11373: 84,
     0x11374: 84,
+    0x113BB: 84,
+    0x113BC: 84,
+    0x113BD: 84,
+    0x113BE: 84,
+    0x113BF: 84,
+    0x113C0: 84,
+    0x113CE: 84,
+    0x113D0: 84,
+    0x113D2: 84,
+    0x113E1: 84,
+    0x113E2: 84,
     0x11438: 84,
     0x11439: 84,
     0x1143A: 84,
@@ -2108,7 +2130,6 @@
     0x116B5: 84,
     0x116B7: 84,
     0x1171D: 84,
-    0x1171E: 84,
     0x1171F: 84,
     0x11722: 84,
     0x11723: 84,
@@ -2265,6 +2286,7 @@
     0x11F3A: 84,
     0x11F40: 84,
     0x11F42: 84,
+    0x11F5A: 84,
     0x13430: 84,
     0x13431: 84,
     0x13432: 84,
@@ -2297,6 +2319,21 @@
     0x13453: 84,
     0x13454: 84,
     0x13455: 84,
+    0x1611E: 84,
+    0x1611F: 84,
+    0x16120: 84,
+    0x16121: 84,
+    0x16122: 84,
+    0x16123: 84,
+    0x16124: 84,
+    0x16125: 84,
+    0x16126: 84,
+    0x16127: 84,
+    0x16128: 84,
+    0x16129: 84,
+    0x1612D: 84,
+    0x1612E: 84,
+    0x1612F: 84,
     0x16AF0: 84,
     0x16AF1: 84,
     0x16AF2: 84,
@@ -2605,6 +2642,8 @@
     0x1E4ED: 84,
     0x1E4EE: 84,
     0x1E4EF: 84,
+    0x1E5EE: 84,
+    0x1E5EF: 84,
     0x1E8D0: 84,
     0x1E8D1: 84,
     0x1E8D2: 84,
@@ -3328,7 +3367,7 @@
         0x8600000086B,
         0x87000000888,
         0x8890000088F,
-        0x898000008E2,
+        0x897000008E2,
         0x8E300000958,
         0x96000000964,
         0x96600000970,
@@ -3563,6 +3602,7 @@
         0x1C0000001C38,
         0x1C4000001C4A,
         0x1C4D00001C7E,
+        0x1C8A00001C8B,
         0x1CD000001CD3,
         0x1CD400001CFB,
         0x1D0000001D2C,
@@ -3926,11 +3966,13 @@
         0xA7C30000A7C4,
         0xA7C80000A7C9,
         0xA7CA0000A7CB,
+        0xA7CD0000A7CE,
         0xA7D10000A7D2,
         0xA7D30000A7D4,
         0xA7D50000A7D6,
         0xA7D70000A7D8,
         0xA7D90000A7DA,
+        0xA7DB0000A7DC,
         0xA7F60000A7F8,
         0xA7FA0000A828,
         0xA82C0000A82D,
@@ -4000,6 +4042,7 @@
         0x105A3000105B2,
         0x105B3000105BA,
         0x105BB000105BD,
+        0x105C0000105F4,
         0x1060000010737,
         0x1074000010756,
         0x1076000010768,
@@ -4037,10 +4080,14 @@
         0x10CC000010CF3,
         0x10D0000010D28,
         0x10D3000010D3A,
+        0x10D4000010D50,
+        0x10D6900010D6E,
+        0x10D6F00010D86,
         0x10E8000010EAA,
         0x10EAB00010EAD,
         0x10EB000010EB2,
-        0x10EFD00010F1D,
+        0x10EC200010EC5,
+        0x10EFC00010F1D,
         0x10F2700010F28,
         0x10F3000010F51,
         0x10F7000010F86,
@@ -4086,6 +4133,16 @@
         0x1135D00011364,
         0x113660001136D,
         0x1137000011375,
+        0x113800001138A,
+        0x1138B0001138C,
+        0x1138E0001138F,
+        0x11390000113B6,
+        0x113B7000113C1,
+        0x113C2000113C3,
+        0x113C5000113C6,
+        0x113C7000113CB,
+        0x113CC000113D4,
+        0x113E1000113E3,
         0x114000001144B,
         0x114500001145A,
         0x1145E00011462,
@@ -4100,6 +4157,7 @@
         0x116500001165A,
         0x11680000116B9,
         0x116C0000116CA,
+        0x116D0000116E4,
         0x117000001171B,
         0x1171D0001172C,
         0x117300001173A,
@@ -4123,6 +4181,8 @@
         0x11A5000011A9A,
         0x11A9D00011A9E,
         0x11AB000011AF9,
+        0x11BC000011BE1,
+        0x11BF000011BFA,
         0x11C0000011C09,
         0x11C0A00011C37,
         0x11C3800011C41,
@@ -4147,14 +4207,16 @@
         0x11F0000011F11,
         0x11F1200011F3B,
         0x11F3E00011F43,
-        0x11F5000011F5A,
+        0x11F5000011F5B,
         0x11FB000011FB1,
         0x120000001239A,
         0x1248000012544,
         0x12F9000012FF1,
         0x1300000013430,
         0x1344000013456,
+        0x13460000143FB,
         0x1440000014647,
+        0x161000001613A,
         0x1680000016A39,
         0x16A4000016A5F,
         0x16A6000016A6A,
@@ -4167,6 +4229,8 @@
         0x16B5000016B5A,
         0x16B6300016B78,
         0x16B7D00016B90,
+        0x16D4000016D6D,
+        0x16D7000016D7A,
         0x16E6000016E80,
         0x16F0000016F4B,
         0x16F4F00016F88,
@@ -4176,7 +4240,7 @@
         0x16FF000016FF2,
         0x17000000187F8,
         0x1880000018CD6,
-        0x18D0000018D09,
+        0x18CFF00018D09,
         0x1AFF00001AFF4,
         0x1AFF50001AFFC,
         0x1AFFD0001AFFF,
@@ -4191,6 +4255,7 @@
         0x1BC800001BC89,
         0x1BC900001BC9A,
         0x1BC9D0001BC9F,
+        0x1CCF00001CCFA,
         0x1CF000001CF2E,
         0x1CF300001CF47,
         0x1DA000001DA37,
@@ -4214,6 +4279,7 @@
         0x1E2900001E2AF,
         0x1E2C00001E2FA,
         0x1E4D00001E4FA,
+        0x1E5D00001E5FB,
         0x1E7E00001E7E7,
         0x1E7E80001E7EC,
         0x1E7ED0001E7EF,
diff --git a/libs/idna/package_data.py b/libs/idna/package_data.py
index 514ff7e2e6..7272c8d923 100644
--- a/libs/idna/package_data.py
+++ b/libs/idna/package_data.py
@@ -1 +1 @@
-__version__ = "3.10"
+__version__ = "3.11"
diff --git a/libs/idna/uts46data.py b/libs/idna/uts46data.py
index eb89432741..4610b71dad 100644
--- a/libs/idna/uts46data.py
+++ b/libs/idna/uts46data.py
@@ -6,59 +6,59 @@
 """IDNA Mapping Table from UTS46."""
 
 
-__version__ = "15.1.0"
+__version__ = "16.0.0"
 
 
 def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-        (0x0, "3"),
-        (0x1, "3"),
-        (0x2, "3"),
-        (0x3, "3"),
-        (0x4, "3"),
-        (0x5, "3"),
-        (0x6, "3"),
-        (0x7, "3"),
-        (0x8, "3"),
-        (0x9, "3"),
-        (0xA, "3"),
-        (0xB, "3"),
-        (0xC, "3"),
-        (0xD, "3"),
-        (0xE, "3"),
-        (0xF, "3"),
-        (0x10, "3"),
-        (0x11, "3"),
-        (0x12, "3"),
-        (0x13, "3"),
-        (0x14, "3"),
-        (0x15, "3"),
-        (0x16, "3"),
-        (0x17, "3"),
-        (0x18, "3"),
-        (0x19, "3"),
-        (0x1A, "3"),
-        (0x1B, "3"),
-        (0x1C, "3"),
-        (0x1D, "3"),
-        (0x1E, "3"),
-        (0x1F, "3"),
-        (0x20, "3"),
-        (0x21, "3"),
-        (0x22, "3"),
-        (0x23, "3"),
-        (0x24, "3"),
-        (0x25, "3"),
-        (0x26, "3"),
-        (0x27, "3"),
-        (0x28, "3"),
-        (0x29, "3"),
-        (0x2A, "3"),
-        (0x2B, "3"),
-        (0x2C, "3"),
+        (0x0, "V"),
+        (0x1, "V"),
+        (0x2, "V"),
+        (0x3, "V"),
+        (0x4, "V"),
+        (0x5, "V"),
+        (0x6, "V"),
+        (0x7, "V"),
+        (0x8, "V"),
+        (0x9, "V"),
+        (0xA, "V"),
+        (0xB, "V"),
+        (0xC, "V"),
+        (0xD, "V"),
+        (0xE, "V"),
+        (0xF, "V"),
+        (0x10, "V"),
+        (0x11, "V"),
+        (0x12, "V"),
+        (0x13, "V"),
+        (0x14, "V"),
+        (0x15, "V"),
+        (0x16, "V"),
+        (0x17, "V"),
+        (0x18, "V"),
+        (0x19, "V"),
+        (0x1A, "V"),
+        (0x1B, "V"),
+        (0x1C, "V"),
+        (0x1D, "V"),
+        (0x1E, "V"),
+        (0x1F, "V"),
+        (0x20, "V"),
+        (0x21, "V"),
+        (0x22, "V"),
+        (0x23, "V"),
+        (0x24, "V"),
+        (0x25, "V"),
+        (0x26, "V"),
+        (0x27, "V"),
+        (0x28, "V"),
+        (0x29, "V"),
+        (0x2A, "V"),
+        (0x2B, "V"),
+        (0x2C, "V"),
         (0x2D, "V"),
         (0x2E, "V"),
-        (0x2F, "3"),
+        (0x2F, "V"),
         (0x30, "V"),
         (0x31, "V"),
         (0x32, "V"),
@@ -69,13 +69,13 @@ def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x37, "V"),
         (0x38, "V"),
         (0x39, "V"),
-        (0x3A, "3"),
-        (0x3B, "3"),
-        (0x3C, "3"),
-        (0x3D, "3"),
-        (0x3E, "3"),
-        (0x3F, "3"),
-        (0x40, "3"),
+        (0x3A, "V"),
+        (0x3B, "V"),
+        (0x3C, "V"),
+        (0x3D, "V"),
+        (0x3E, "V"),
+        (0x3F, "V"),
+        (0x40, "V"),
         (0x41, "M", "a"),
         (0x42, "M", "b"),
         (0x43, "M", "c"),
@@ -102,12 +102,12 @@ def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x58, "M", "x"),
         (0x59, "M", "y"),
         (0x5A, "M", "z"),
-        (0x5B, "3"),
-        (0x5C, "3"),
-        (0x5D, "3"),
-        (0x5E, "3"),
-        (0x5F, "3"),
-        (0x60, "3"),
+        (0x5B, "V"),
+        (0x5C, "V"),
+        (0x5D, "V"),
+        (0x5E, "V"),
+        (0x5F, "V"),
+        (0x60, "V"),
         (0x61, "V"),
         (0x62, "V"),
         (0x63, "V"),
@@ -139,11 +139,11 @@ def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x78, "V"),
         (0x79, "V"),
         (0x7A, "V"),
-        (0x7B, "3"),
-        (0x7C, "3"),
-        (0x7D, "3"),
-        (0x7E, "3"),
-        (0x7F, "3"),
+        (0x7B, "V"),
+        (0x7C, "V"),
+        (0x7D, "V"),
+        (0x7E, "V"),
+        (0x7F, "V"),
         (0x80, "X"),
         (0x81, "X"),
         (0x82, "X"),
@@ -176,7 +176,7 @@ def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x9D, "X"),
         (0x9E, "X"),
         (0x9F, "X"),
-        (0xA0, "3", " "),
+        (0xA0, "M", " "),
         (0xA1, "V"),
         (0xA2, "V"),
         (0xA3, "V"),
@@ -184,23 +184,23 @@ def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA5, "V"),
         (0xA6, "V"),
         (0xA7, "V"),
-        (0xA8, "3", " ฬˆ"),
+        (0xA8, "M", " ฬˆ"),
         (0xA9, "V"),
         (0xAA, "M", "a"),
         (0xAB, "V"),
         (0xAC, "V"),
         (0xAD, "I"),
         (0xAE, "V"),
-        (0xAF, "3", " ฬ„"),
+        (0xAF, "M", " ฬ„"),
         (0xB0, "V"),
         (0xB1, "V"),
         (0xB2, "M", "2"),
         (0xB3, "M", "3"),
-        (0xB4, "3", " ฬ"),
+        (0xB4, "M", " ฬ"),
         (0xB5, "M", "ฮผ"),
         (0xB6, "V"),
         (0xB7, "V"),
-        (0xB8, "3", " ฬง"),
+        (0xB8, "M", " ฬง"),
         (0xB9, "M", "1"),
         (0xBA, "M", "o"),
         (0xBB, "V"),
@@ -606,12 +606,12 @@ def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2B7, "M", "w"),
         (0x2B8, "M", "y"),
         (0x2B9, "V"),
-        (0x2D8, "3", " ฬ†"),
-        (0x2D9, "3", " ฬ‡"),
-        (0x2DA, "3", " ฬŠ"),
-        (0x2DB, "3", " ฬจ"),
-        (0x2DC, "3", " ฬƒ"),
-        (0x2DD, "3", " ฬ‹"),
+        (0x2D8, "M", " ฬ†"),
+        (0x2D9, "M", " ฬ‡"),
+        (0x2DA, "M", " ฬŠ"),
+        (0x2DB, "M", " ฬจ"),
+        (0x2DC, "M", " ฬƒ"),
+        (0x2DD, "M", " ฬ‹"),
         (0x2DE, "V"),
         (0x2E0, "M", "ษฃ"),
         (0x2E1, "M", "l"),
@@ -642,13 +642,13 @@ def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
 def _seg_6() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
         (0x378, "X"),
-        (0x37A, "3", " ฮน"),
+        (0x37A, "M", " ฮน"),
         (0x37B, "V"),
-        (0x37E, "3", ";"),
+        (0x37E, "M", ";"),
         (0x37F, "M", "ฯณ"),
         (0x380, "X"),
-        (0x384, "3", " ฬ"),
-        (0x385, "3", " ฬˆฬ"),
+        (0x384, "M", " ฬ"),
+        (0x385, "M", " ฬˆฬ"),
         (0x386, "M", "ฮฌ"),
         (0x387, "M", "ยท"),
         (0x388, "M", "ฮญ"),
@@ -885,7 +885,7 @@ def _seg_8() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x4BD, "V"),
         (0x4BE, "M", "าฟ"),
         (0x4BF, "V"),
-        (0x4C0, "X"),
+        (0x4C0, "M", "ำ"),
         (0x4C1, "M", "ำ‚"),
         (0x4C2, "V"),
         (0x4C3, "M", "ำ„"),
@@ -1087,7 +1087,7 @@ def _seg_10() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x86B, "X"),
         (0x870, "V"),
         (0x88F, "X"),
-        (0x898, "V"),
+        (0x897, "V"),
         (0x8E2, "X"),
         (0x8E3, "V"),
         (0x958, "M", "เค•เคผ"),
@@ -1438,7 +1438,50 @@ def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFCE, "V"),
         (0xFDB, "X"),
         (0x1000, "V"),
-        (0x10A0, "X"),
+        (0x10A0, "M", "โด€"),
+        (0x10A1, "M", "โด"),
+        (0x10A2, "M", "โด‚"),
+        (0x10A3, "M", "โดƒ"),
+        (0x10A4, "M", "โด„"),
+        (0x10A5, "M", "โด…"),
+        (0x10A6, "M", "โด†"),
+        (0x10A7, "M", "โด‡"),
+        (0x10A8, "M", "โดˆ"),
+        (0x10A9, "M", "โด‰"),
+        (0x10AA, "M", "โดŠ"),
+        (0x10AB, "M", "โด‹"),
+        (0x10AC, "M", "โดŒ"),
+        (0x10AD, "M", "โด"),
+        (0x10AE, "M", "โดŽ"),
+        (0x10AF, "M", "โด"),
+        (0x10B0, "M", "โด"),
+        (0x10B1, "M", "โด‘"),
+        (0x10B2, "M", "โด’"),
+        (0x10B3, "M", "โด“"),
+        (0x10B4, "M", "โด”"),
+        (0x10B5, "M", "โด•"),
+        (0x10B6, "M", "โด–"),
+        (0x10B7, "M", "โด—"),
+        (0x10B8, "M", "โด˜"),
+        (0x10B9, "M", "โด™"),
+        (0x10BA, "M", "โดš"),
+        (0x10BB, "M", "โด›"),
+        (0x10BC, "M", "โดœ"),
+        (0x10BD, "M", "โด"),
+        (0x10BE, "M", "โดž"),
+        (0x10BF, "M", "โดŸ"),
+        (0x10C0, "M", "โด "),
+        (0x10C1, "M", "โดก"),
+        (0x10C2, "M", "โดข"),
+        (0x10C3, "M", "โดฃ"),
+        (0x10C4, "M", "โดค"),
+        (0x10C5, "M", "โดฅ"),
+    ]
+
+
+def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
+        (0x10C6, "X"),
         (0x10C7, "M", "โดง"),
         (0x10C8, "X"),
         (0x10CD, "M", "โดญ"),
@@ -1446,7 +1489,7 @@ def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x10D0, "V"),
         (0x10FC, "M", "แƒœ"),
         (0x10FD, "V"),
-        (0x115F, "X"),
+        (0x115F, "I"),
         (0x1161, "V"),
         (0x1249, "X"),
         (0x124A, "V"),
@@ -1476,11 +1519,6 @@ def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x12D8, "V"),
         (0x1311, "X"),
         (0x1312, "V"),
-    ]
-
-
-def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1316, "X"),
         (0x1318, "V"),
         (0x135B, "X"),
@@ -1516,7 +1554,7 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1772, "V"),
         (0x1774, "X"),
         (0x1780, "V"),
-        (0x17B4, "X"),
+        (0x17B4, "I"),
         (0x17B6, "V"),
         (0x17DE, "X"),
         (0x17E0, "V"),
@@ -1524,11 +1562,7 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x17F0, "V"),
         (0x17FA, "X"),
         (0x1800, "V"),
-        (0x1806, "X"),
-        (0x1807, "V"),
         (0x180B, "I"),
-        (0x180E, "X"),
-        (0x180F, "I"),
         (0x1810, "V"),
         (0x181A, "X"),
         (0x1820, "V"),
@@ -1547,6 +1581,11 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1941, "X"),
         (0x1944, "V"),
         (0x196E, "X"),
+    ]
+
+
+def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1970, "V"),
         (0x1975, "X"),
         (0x1980, "V"),
@@ -1571,9 +1610,7 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1ACF, "X"),
         (0x1B00, "V"),
         (0x1B4D, "X"),
-        (0x1B50, "V"),
-        (0x1B7F, "X"),
-        (0x1B80, "V"),
+        (0x1B4E, "V"),
         (0x1BF4, "X"),
         (0x1BFC, "V"),
         (0x1C38, "X"),
@@ -1581,11 +1618,6 @@ def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1C4A, "X"),
         (0x1C4D, "V"),
         (0x1C80, "M", "ะฒ"),
-    ]
-
-
-def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1C81, "M", "ะด"),
         (0x1C82, "M", "ะพ"),
         (0x1C83, "M", "ั"),
@@ -1593,7 +1625,9 @@ def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1C86, "M", "ัŠ"),
         (0x1C87, "M", "ัฃ"),
         (0x1C88, "M", "๊™‹"),
-        (0x1C89, "X"),
+        (0x1C89, "M", "แฒŠ"),
+        (0x1C8A, "V"),
+        (0x1C8B, "X"),
         (0x1C90, "M", "แƒ"),
         (0x1C91, "M", "แƒ‘"),
         (0x1C92, "M", "แƒ’"),
@@ -1652,6 +1686,11 @@ def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D2F, "V"),
         (0x1D30, "M", "d"),
         (0x1D31, "M", "e"),
+    ]
+
+
+def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D32, "M", "ว"),
         (0x1D33, "M", "g"),
         (0x1D34, "M", "h"),
@@ -1686,11 +1725,6 @@ def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D51, "M", "ล‹"),
         (0x1D52, "M", "o"),
         (0x1D53, "M", "ษ”"),
-    ]
-
-
-def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D54, "M", "แด–"),
         (0x1D55, "M", "แด—"),
         (0x1D56, "M", "p"),
@@ -1757,6 +1791,11 @@ def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1DC0, "V"),
         (0x1E00, "M", "แธ"),
         (0x1E01, "V"),
+    ]
+
+
+def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1E02, "M", "แธƒ"),
         (0x1E03, "V"),
         (0x1E04, "M", "แธ…"),
@@ -1791,11 +1830,6 @@ def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E21, "V"),
         (0x1E22, "M", "แธฃ"),
         (0x1E23, "V"),
-    ]
-
-
-def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1E24, "M", "แธฅ"),
         (0x1E25, "V"),
         (0x1E26, "M", "แธง"),
@@ -1862,6 +1896,11 @@ def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E63, "V"),
         (0x1E64, "M", "แนฅ"),
         (0x1E65, "V"),
+    ]
+
+
+def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1E66, "M", "แนง"),
         (0x1E67, "V"),
         (0x1E68, "M", "แนฉ"),
@@ -1896,11 +1935,6 @@ def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E85, "V"),
         (0x1E86, "M", "แบ‡"),
         (0x1E87, "V"),
-    ]
-
-
-def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1E88, "M", "แบ‰"),
         (0x1E89, "V"),
         (0x1E8A, "M", "แบ‹"),
@@ -1967,6 +2001,11 @@ def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1ECC, "M", "แป"),
         (0x1ECD, "V"),
         (0x1ECE, "M", "แป"),
+    ]
+
+
+def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1ECF, "V"),
         (0x1ED0, "M", "แป‘"),
         (0x1ED1, "V"),
@@ -2001,11 +2040,6 @@ def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1EEE, "M", "แปฏ"),
         (0x1EEF, "V"),
         (0x1EF0, "M", "แปฑ"),
-    ]
-
-
-def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1EF1, "V"),
         (0x1EF2, "M", "แปณ"),
         (0x1EF3, "V"),
@@ -2072,6 +2106,11 @@ def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1F5B, "M", "แฝ“"),
         (0x1F5C, "X"),
         (0x1F5D, "M", "แฝ•"),
+    ]
+
+
+def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1F5E, "X"),
         (0x1F5F, "M", "แฝ—"),
         (0x1F60, "V"),
@@ -2106,11 +2145,6 @@ def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1F85, "M", "แผ…ฮน"),
         (0x1F86, "M", "แผ†ฮน"),
         (0x1F87, "M", "แผ‡ฮน"),
-    ]
-
-
-def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1F88, "M", "แผ€ฮน"),
         (0x1F89, "M", "แผฮน"),
         (0x1F8A, "M", "แผ‚ฮน"),
@@ -2163,11 +2197,11 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1FBA, "M", "แฝฐ"),
         (0x1FBB, "M", "ฮฌ"),
         (0x1FBC, "M", "ฮฑฮน"),
-        (0x1FBD, "3", " ฬ“"),
+        (0x1FBD, "M", " ฬ“"),
         (0x1FBE, "M", "ฮน"),
-        (0x1FBF, "3", " ฬ“"),
-        (0x1FC0, "3", " อ‚"),
-        (0x1FC1, "3", " ฬˆอ‚"),
+        (0x1FBF, "M", " ฬ“"),
+        (0x1FC0, "M", " อ‚"),
+        (0x1FC1, "M", " ฬˆอ‚"),
         (0x1FC2, "M", "แฝดฮน"),
         (0x1FC3, "M", "ฮทฮน"),
         (0x1FC4, "M", "ฮฎฮน"),
@@ -2177,11 +2211,16 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1FC8, "M", "แฝฒ"),
         (0x1FC9, "M", "ฮญ"),
         (0x1FCA, "M", "แฝด"),
+    ]
+
+
+def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1FCB, "M", "ฮฎ"),
         (0x1FCC, "M", "ฮทฮน"),
-        (0x1FCD, "3", " ฬ“ฬ€"),
-        (0x1FCE, "3", " ฬ“ฬ"),
-        (0x1FCF, "3", " ฬ“อ‚"),
+        (0x1FCD, "M", " ฬ“ฬ€"),
+        (0x1FCE, "M", " ฬ“ฬ"),
+        (0x1FCF, "M", " ฬ“อ‚"),
         (0x1FD0, "V"),
         (0x1FD3, "M", "ฮ"),
         (0x1FD4, "X"),
@@ -2191,9 +2230,9 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1FDA, "M", "แฝถ"),
         (0x1FDB, "M", "ฮฏ"),
         (0x1FDC, "X"),
-        (0x1FDD, "3", " ฬ”ฬ€"),
-        (0x1FDE, "3", " ฬ”ฬ"),
-        (0x1FDF, "3", " ฬ”อ‚"),
+        (0x1FDD, "M", " ฬ”ฬ€"),
+        (0x1FDE, "M", " ฬ”ฬ"),
+        (0x1FDF, "M", " ฬ”อ‚"),
         (0x1FE0, "V"),
         (0x1FE3, "M", "ฮฐ"),
         (0x1FE4, "V"),
@@ -2202,42 +2241,37 @@ def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1FEA, "M", "แฝบ"),
         (0x1FEB, "M", "ฯ"),
         (0x1FEC, "M", "แฟฅ"),
-        (0x1FED, "3", " ฬˆฬ€"),
-        (0x1FEE, "3", " ฬˆฬ"),
-        (0x1FEF, "3", "`"),
+        (0x1FED, "M", " ฬˆฬ€"),
+        (0x1FEE, "M", " ฬˆฬ"),
+        (0x1FEF, "M", "`"),
         (0x1FF0, "X"),
         (0x1FF2, "M", "แฝผฮน"),
         (0x1FF3, "M", "ฯ‰ฮน"),
         (0x1FF4, "M", "ฯŽฮน"),
         (0x1FF5, "X"),
         (0x1FF6, "V"),
-    ]
-
-
-def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1FF7, "M", "แฟถฮน"),
         (0x1FF8, "M", "แฝธ"),
         (0x1FF9, "M", "ฯŒ"),
         (0x1FFA, "M", "แฝผ"),
         (0x1FFB, "M", "ฯŽ"),
         (0x1FFC, "M", "ฯ‰ฮน"),
-        (0x1FFD, "3", " ฬ"),
-        (0x1FFE, "3", " ฬ”"),
+        (0x1FFD, "M", " ฬ"),
+        (0x1FFE, "M", " ฬ”"),
         (0x1FFF, "X"),
-        (0x2000, "3", " "),
+        (0x2000, "M", " "),
         (0x200B, "I"),
         (0x200C, "D", ""),
         (0x200E, "X"),
         (0x2010, "V"),
         (0x2011, "M", "โ€"),
         (0x2012, "V"),
-        (0x2017, "3", " ฬณ"),
+        (0x2017, "M", " ฬณ"),
         (0x2018, "V"),
         (0x2024, "X"),
         (0x2027, "V"),
         (0x2028, "X"),
-        (0x202F, "3", " "),
+        (0x202F, "M", " "),
         (0x2030, "V"),
         (0x2033, "M", "โ€ฒโ€ฒ"),
         (0x2034, "M", "โ€ฒโ€ฒโ€ฒ"),
@@ -2245,21 +2279,20 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2036, "M", "โ€ตโ€ต"),
         (0x2037, "M", "โ€ตโ€ตโ€ต"),
         (0x2038, "V"),
-        (0x203C, "3", "!!"),
+        (0x203C, "M", "!!"),
         (0x203D, "V"),
-        (0x203E, "3", " ฬ…"),
+        (0x203E, "M", " ฬ…"),
         (0x203F, "V"),
-        (0x2047, "3", "??"),
-        (0x2048, "3", "?!"),
-        (0x2049, "3", "!?"),
+        (0x2047, "M", "??"),
+        (0x2048, "M", "?!"),
+        (0x2049, "M", "!?"),
         (0x204A, "V"),
         (0x2057, "M", "โ€ฒโ€ฒโ€ฒโ€ฒ"),
         (0x2058, "V"),
-        (0x205F, "3", " "),
+        (0x205F, "M", " "),
         (0x2060, "I"),
-        (0x2061, "X"),
-        (0x2064, "I"),
         (0x2065, "X"),
+        (0x206A, "I"),
         (0x2070, "M", "0"),
         (0x2071, "M", "i"),
         (0x2072, "X"),
@@ -2269,11 +2302,11 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2077, "M", "7"),
         (0x2078, "M", "8"),
         (0x2079, "M", "9"),
-        (0x207A, "3", "+"),
+        (0x207A, "M", "+"),
         (0x207B, "M", "โˆ’"),
-        (0x207C, "3", "="),
-        (0x207D, "3", "("),
-        (0x207E, "3", ")"),
+        (0x207C, "M", "="),
+        (0x207D, "M", "("),
+        (0x207E, "M", ")"),
         (0x207F, "M", "n"),
         (0x2080, "M", "0"),
         (0x2081, "M", "1"),
@@ -2283,13 +2316,18 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2085, "M", "5"),
         (0x2086, "M", "6"),
         (0x2087, "M", "7"),
+    ]
+
+
+def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2088, "M", "8"),
         (0x2089, "M", "9"),
-        (0x208A, "3", "+"),
+        (0x208A, "M", "+"),
         (0x208B, "M", "โˆ’"),
-        (0x208C, "3", "="),
-        (0x208D, "3", "("),
-        (0x208E, "3", ")"),
+        (0x208C, "M", "="),
+        (0x208D, "M", "("),
+        (0x208E, "M", ")"),
         (0x208F, "X"),
         (0x2090, "M", "a"),
         (0x2091, "M", "e"),
@@ -2311,18 +2349,13 @@ def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x20C1, "X"),
         (0x20D0, "V"),
         (0x20F1, "X"),
-        (0x2100, "3", "a/c"),
-        (0x2101, "3", "a/s"),
+        (0x2100, "M", "a/c"),
+        (0x2101, "M", "a/s"),
         (0x2102, "M", "c"),
         (0x2103, "M", "ยฐc"),
         (0x2104, "V"),
-    ]
-
-
-def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2105, "3", "c/o"),
-        (0x2106, "3", "c/u"),
+        (0x2105, "M", "c/o"),
+        (0x2106, "M", "c/u"),
         (0x2107, "M", "ษ›"),
         (0x2108, "V"),
         (0x2109, "M", "ยฐf"),
@@ -2356,7 +2389,7 @@ def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x212E, "V"),
         (0x212F, "M", "e"),
         (0x2131, "M", "f"),
-        (0x2132, "X"),
+        (0x2132, "M", "โ…Ž"),
         (0x2133, "M", "m"),
         (0x2134, "M", "o"),
         (0x2135, "M", "ื"),
@@ -2388,6 +2421,11 @@ def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2159, "M", "1โ„6"),
         (0x215A, "M", "5โ„6"),
         (0x215B, "M", "1โ„8"),
+    ]
+
+
+def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x215C, "M", "3โ„8"),
         (0x215D, "M", "5โ„8"),
         (0x215E, "M", "7โ„8"),
@@ -2421,16 +2459,11 @@ def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x217A, "M", "xi"),
         (0x217B, "M", "xii"),
         (0x217C, "M", "l"),
-    ]
-
-
-def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x217D, "M", "c"),
         (0x217E, "M", "d"),
         (0x217F, "M", "m"),
         (0x2180, "V"),
-        (0x2183, "X"),
+        (0x2183, "M", "โ†„"),
         (0x2184, "V"),
         (0x2189, "M", "0โ„3"),
         (0x218A, "V"),
@@ -2445,7 +2478,7 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2329, "M", "ใ€ˆ"),
         (0x232A, "M", "ใ€‰"),
         (0x232B, "V"),
-        (0x2427, "X"),
+        (0x242A, "X"),
         (0x2440, "V"),
         (0x244B, "X"),
         (0x2460, "M", "1"),
@@ -2468,53 +2501,58 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2471, "M", "18"),
         (0x2472, "M", "19"),
         (0x2473, "M", "20"),
-        (0x2474, "3", "(1)"),
-        (0x2475, "3", "(2)"),
-        (0x2476, "3", "(3)"),
-        (0x2477, "3", "(4)"),
-        (0x2478, "3", "(5)"),
-        (0x2479, "3", "(6)"),
-        (0x247A, "3", "(7)"),
-        (0x247B, "3", "(8)"),
-        (0x247C, "3", "(9)"),
-        (0x247D, "3", "(10)"),
-        (0x247E, "3", "(11)"),
-        (0x247F, "3", "(12)"),
-        (0x2480, "3", "(13)"),
-        (0x2481, "3", "(14)"),
-        (0x2482, "3", "(15)"),
-        (0x2483, "3", "(16)"),
-        (0x2484, "3", "(17)"),
-        (0x2485, "3", "(18)"),
-        (0x2486, "3", "(19)"),
-        (0x2487, "3", "(20)"),
+        (0x2474, "M", "(1)"),
+        (0x2475, "M", "(2)"),
+        (0x2476, "M", "(3)"),
+        (0x2477, "M", "(4)"),
+        (0x2478, "M", "(5)"),
+        (0x2479, "M", "(6)"),
+        (0x247A, "M", "(7)"),
+        (0x247B, "M", "(8)"),
+        (0x247C, "M", "(9)"),
+        (0x247D, "M", "(10)"),
+        (0x247E, "M", "(11)"),
+        (0x247F, "M", "(12)"),
+        (0x2480, "M", "(13)"),
+        (0x2481, "M", "(14)"),
+        (0x2482, "M", "(15)"),
+        (0x2483, "M", "(16)"),
+        (0x2484, "M", "(17)"),
+        (0x2485, "M", "(18)"),
+        (0x2486, "M", "(19)"),
+        (0x2487, "M", "(20)"),
         (0x2488, "X"),
-        (0x249C, "3", "(a)"),
-        (0x249D, "3", "(b)"),
-        (0x249E, "3", "(c)"),
-        (0x249F, "3", "(d)"),
-        (0x24A0, "3", "(e)"),
-        (0x24A1, "3", "(f)"),
-        (0x24A2, "3", "(g)"),
-        (0x24A3, "3", "(h)"),
-        (0x24A4, "3", "(i)"),
-        (0x24A5, "3", "(j)"),
-        (0x24A6, "3", "(k)"),
-        (0x24A7, "3", "(l)"),
-        (0x24A8, "3", "(m)"),
-        (0x24A9, "3", "(n)"),
-        (0x24AA, "3", "(o)"),
-        (0x24AB, "3", "(p)"),
-        (0x24AC, "3", "(q)"),
-        (0x24AD, "3", "(r)"),
-        (0x24AE, "3", "(s)"),
-        (0x24AF, "3", "(t)"),
-        (0x24B0, "3", "(u)"),
-        (0x24B1, "3", "(v)"),
-        (0x24B2, "3", "(w)"),
-        (0x24B3, "3", "(x)"),
-        (0x24B4, "3", "(y)"),
-        (0x24B5, "3", "(z)"),
+        (0x249C, "M", "(a)"),
+        (0x249D, "M", "(b)"),
+        (0x249E, "M", "(c)"),
+        (0x249F, "M", "(d)"),
+    ]
+
+
+def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
+        (0x24A0, "M", "(e)"),
+        (0x24A1, "M", "(f)"),
+        (0x24A2, "M", "(g)"),
+        (0x24A3, "M", "(h)"),
+        (0x24A4, "M", "(i)"),
+        (0x24A5, "M", "(j)"),
+        (0x24A6, "M", "(k)"),
+        (0x24A7, "M", "(l)"),
+        (0x24A8, "M", "(m)"),
+        (0x24A9, "M", "(n)"),
+        (0x24AA, "M", "(o)"),
+        (0x24AB, "M", "(p)"),
+        (0x24AC, "M", "(q)"),
+        (0x24AD, "M", "(r)"),
+        (0x24AE, "M", "(s)"),
+        (0x24AF, "M", "(t)"),
+        (0x24B0, "M", "(u)"),
+        (0x24B1, "M", "(v)"),
+        (0x24B2, "M", "(w)"),
+        (0x24B3, "M", "(x)"),
+        (0x24B4, "M", "(y)"),
+        (0x24B5, "M", "(z)"),
         (0x24B6, "M", "a"),
         (0x24B7, "M", "b"),
         (0x24B8, "M", "c"),
@@ -2526,11 +2564,6 @@ def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x24BE, "M", "i"),
         (0x24BF, "M", "j"),
         (0x24C0, "M", "k"),
-    ]
-
-
-def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x24C1, "M", "l"),
         (0x24C2, "M", "m"),
         (0x24C3, "M", "n"),
@@ -2576,9 +2609,9 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x24EB, "V"),
         (0x2A0C, "M", "โˆซโˆซโˆซโˆซ"),
         (0x2A0D, "V"),
-        (0x2A74, "3", "::="),
-        (0x2A75, "3", "=="),
-        (0x2A76, "3", "==="),
+        (0x2A74, "M", "::="),
+        (0x2A75, "M", "=="),
+        (0x2A76, "M", "==="),
         (0x2A77, "V"),
         (0x2ADC, "M", "โซฬธ"),
         (0x2ADD, "V"),
@@ -2598,6 +2631,11 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2C09, "M", "โฐน"),
         (0x2C0A, "M", "โฐบ"),
         (0x2C0B, "M", "โฐป"),
+    ]
+
+
+def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2C0C, "M", "โฐผ"),
         (0x2C0D, "M", "โฐฝ"),
         (0x2C0E, "M", "โฐพ"),
@@ -2631,11 +2669,6 @@ def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2C2A, "M", "โฑš"),
         (0x2C2B, "M", "โฑ›"),
         (0x2C2C, "M", "โฑœ"),
-    ]
-
-
-def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2C2D, "M", "โฑ"),
         (0x2C2E, "M", "โฑž"),
         (0x2C2F, "M", "โฑŸ"),
@@ -2703,6 +2736,11 @@ def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2CA3, "V"),
         (0x2CA4, "M", "โฒฅ"),
         (0x2CA5, "V"),
+    ]
+
+
+def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2CA6, "M", "โฒง"),
         (0x2CA7, "V"),
         (0x2CA8, "M", "โฒฉ"),
@@ -2736,11 +2774,6 @@ def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2CC4, "M", "โณ…"),
         (0x2CC5, "V"),
         (0x2CC6, "M", "โณ‡"),
-    ]
-
-
-def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2CC7, "V"),
         (0x2CC8, "M", "โณ‰"),
         (0x2CC9, "V"),
@@ -2808,6 +2841,11 @@ def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2DDF, "X"),
         (0x2DE0, "V"),
         (0x2E5E, "X"),
+    ]
+
+
+def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2E80, "V"),
         (0x2E9A, "X"),
         (0x2E9B, "V"),
@@ -2841,11 +2879,6 @@ def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F17, "M", "ๅ"),
         (0x2F18, "M", "ๅœ"),
         (0x2F19, "M", "ๅฉ"),
-    ]
-
-
-def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F1A, "M", "ๅŽ‚"),
         (0x2F1B, "M", "ๅŽถ"),
         (0x2F1C, "M", "ๅˆ"),
@@ -2913,6 +2946,11 @@ def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F5A, "M", "็‰‡"),
         (0x2F5B, "M", "็‰™"),
         (0x2F5C, "M", "็‰›"),
+    ]
+
+
+def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2F5D, "M", "็Šฌ"),
         (0x2F5E, "M", "็Ž„"),
         (0x2F5F, "M", "็Ž‰"),
@@ -2946,11 +2984,6 @@ def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F7B, "M", "็พฝ"),
         (0x2F7C, "M", "่€"),
         (0x2F7D, "M", "่€Œ"),
-    ]
-
-
-def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F7E, "M", "่€’"),
         (0x2F7F, "M", "่€ณ"),
         (0x2F80, "M", "่ฟ"),
@@ -3018,6 +3051,11 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2FBE, "M", "้ฌฅ"),
         (0x2FBF, "M", "้ฌฏ"),
         (0x2FC0, "M", "้ฌฒ"),
+    ]
+
+
+def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2FC1, "M", "้ฌผ"),
         (0x2FC2, "M", "้ญš"),
         (0x2FC3, "M", "้ณฅ"),
@@ -3040,7 +3078,7 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2FD4, "M", "้พœ"),
         (0x2FD5, "M", "้พ "),
         (0x2FD6, "X"),
-        (0x3000, "3", " "),
+        (0x3000, "M", " "),
         (0x3001, "V"),
         (0x3002, "M", "."),
         (0x3003, "V"),
@@ -3051,16 +3089,11 @@ def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x303A, "M", "ๅ…"),
         (0x303B, "V"),
         (0x3040, "X"),
-    ]
-
-
-def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x3041, "V"),
         (0x3097, "X"),
         (0x3099, "V"),
-        (0x309B, "3", " ใ‚™"),
-        (0x309C, "3", " ใ‚š"),
+        (0x309B, "M", " ใ‚™"),
+        (0x309C, "M", " ใ‚š"),
         (0x309D, "V"),
         (0x309F, "M", "ใ‚ˆใ‚Š"),
         (0x30A0, "V"),
@@ -3119,10 +3152,15 @@ def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x3161, "M", "แ…ณ"),
         (0x3162, "M", "แ…ด"),
         (0x3163, "M", "แ…ต"),
-        (0x3164, "X"),
+        (0x3164, "I"),
         (0x3165, "M", "แ„”"),
         (0x3166, "M", "แ„•"),
         (0x3167, "M", "แ‡‡"),
+    ]
+
+
+def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x3168, "M", "แ‡ˆ"),
         (0x3169, "M", "แ‡Œ"),
         (0x316A, "M", "แ‡Ž"),
@@ -3156,11 +3194,6 @@ def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x3186, "M", "แ…™"),
         (0x3187, "M", "แ†„"),
         (0x3188, "M", "แ†…"),
-    ]
-
-
-def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x3189, "M", "แ†ˆ"),
         (0x318A, "M", "แ†‘"),
         (0x318B, "M", "แ†’"),
@@ -3184,76 +3217,81 @@ def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x319E, "M", "ๅœฐ"),
         (0x319F, "M", "ไบบ"),
         (0x31A0, "V"),
-        (0x31E4, "X"),
+        (0x31E6, "X"),
         (0x31F0, "V"),
-        (0x3200, "3", "(แ„€)"),
-        (0x3201, "3", "(แ„‚)"),
-        (0x3202, "3", "(แ„ƒ)"),
-        (0x3203, "3", "(แ„…)"),
-        (0x3204, "3", "(แ„†)"),
-        (0x3205, "3", "(แ„‡)"),
-        (0x3206, "3", "(แ„‰)"),
-        (0x3207, "3", "(แ„‹)"),
-        (0x3208, "3", "(แ„Œ)"),
-        (0x3209, "3", "(แ„Ž)"),
-        (0x320A, "3", "(แ„)"),
-        (0x320B, "3", "(แ„)"),
-        (0x320C, "3", "(แ„‘)"),
-        (0x320D, "3", "(แ„’)"),
-        (0x320E, "3", "(๊ฐ€)"),
-        (0x320F, "3", "(๋‚˜)"),
-        (0x3210, "3", "(๋‹ค)"),
-        (0x3211, "3", "(๋ผ)"),
-        (0x3212, "3", "(๋งˆ)"),
-        (0x3213, "3", "(๋ฐ”)"),
-        (0x3214, "3", "(์‚ฌ)"),
-        (0x3215, "3", "(์•„)"),
-        (0x3216, "3", "(์ž)"),
-        (0x3217, "3", "(์ฐจ)"),
-        (0x3218, "3", "(์นด)"),
-        (0x3219, "3", "(ํƒ€)"),
-        (0x321A, "3", "(ํŒŒ)"),
-        (0x321B, "3", "(ํ•˜)"),
-        (0x321C, "3", "(์ฃผ)"),
-        (0x321D, "3", "(์˜ค์ „)"),
-        (0x321E, "3", "(์˜คํ›„)"),
+        (0x3200, "M", "(แ„€)"),
+        (0x3201, "M", "(แ„‚)"),
+        (0x3202, "M", "(แ„ƒ)"),
+        (0x3203, "M", "(แ„…)"),
+        (0x3204, "M", "(แ„†)"),
+        (0x3205, "M", "(แ„‡)"),
+        (0x3206, "M", "(แ„‰)"),
+        (0x3207, "M", "(แ„‹)"),
+        (0x3208, "M", "(แ„Œ)"),
+        (0x3209, "M", "(แ„Ž)"),
+        (0x320A, "M", "(แ„)"),
+        (0x320B, "M", "(แ„)"),
+        (0x320C, "M", "(แ„‘)"),
+        (0x320D, "M", "(แ„’)"),
+        (0x320E, "M", "(๊ฐ€)"),
+        (0x320F, "M", "(๋‚˜)"),
+        (0x3210, "M", "(๋‹ค)"),
+        (0x3211, "M", "(๋ผ)"),
+        (0x3212, "M", "(๋งˆ)"),
+        (0x3213, "M", "(๋ฐ”)"),
+        (0x3214, "M", "(์‚ฌ)"),
+        (0x3215, "M", "(์•„)"),
+        (0x3216, "M", "(์ž)"),
+        (0x3217, "M", "(์ฐจ)"),
+        (0x3218, "M", "(์นด)"),
+        (0x3219, "M", "(ํƒ€)"),
+        (0x321A, "M", "(ํŒŒ)"),
+        (0x321B, "M", "(ํ•˜)"),
+        (0x321C, "M", "(์ฃผ)"),
+        (0x321D, "M", "(์˜ค์ „)"),
+        (0x321E, "M", "(์˜คํ›„)"),
         (0x321F, "X"),
-        (0x3220, "3", "(ไธ€)"),
-        (0x3221, "3", "(ไบŒ)"),
-        (0x3222, "3", "(ไธ‰)"),
-        (0x3223, "3", "(ๅ››)"),
-        (0x3224, "3", "(ไบ”)"),
-        (0x3225, "3", "(ๅ…ญ)"),
-        (0x3226, "3", "(ไธƒ)"),
-        (0x3227, "3", "(ๅ…ซ)"),
-        (0x3228, "3", "(ไน)"),
-        (0x3229, "3", "(ๅ)"),
-        (0x322A, "3", "(ๆœˆ)"),
-        (0x322B, "3", "(็ซ)"),
-        (0x322C, "3", "(ๆฐด)"),
-        (0x322D, "3", "(ๆœจ)"),
-        (0x322E, "3", "(้‡‘)"),
-        (0x322F, "3", "(ๅœŸ)"),
-        (0x3230, "3", "(ๆ—ฅ)"),
-        (0x3231, "3", "(ๆ ช)"),
-        (0x3232, "3", "(ๆœ‰)"),
-        (0x3233, "3", "(็คพ)"),
-        (0x3234, "3", "(ๅ)"),
-        (0x3235, "3", "(็‰น)"),
-        (0x3236, "3", "(่ฒก)"),
-        (0x3237, "3", "(็ฅ)"),
-        (0x3238, "3", "(ๅŠด)"),
-        (0x3239, "3", "(ไปฃ)"),
-        (0x323A, "3", "(ๅ‘ผ)"),
-        (0x323B, "3", "(ๅญฆ)"),
-        (0x323C, "3", "(็›ฃ)"),
-        (0x323D, "3", "(ไผ)"),
-        (0x323E, "3", "(่ณ‡)"),
-        (0x323F, "3", "(ๅ”)"),
-        (0x3240, "3", "(็ฅญ)"),
-        (0x3241, "3", "(ไผ‘)"),
-        (0x3242, "3", "(่‡ช)"),
-        (0x3243, "3", "(่‡ณ)"),
+        (0x3220, "M", "(ไธ€)"),
+        (0x3221, "M", "(ไบŒ)"),
+        (0x3222, "M", "(ไธ‰)"),
+        (0x3223, "M", "(ๅ››)"),
+        (0x3224, "M", "(ไบ”)"),
+        (0x3225, "M", "(ๅ…ญ)"),
+        (0x3226, "M", "(ไธƒ)"),
+        (0x3227, "M", "(ๅ…ซ)"),
+        (0x3228, "M", "(ไน)"),
+        (0x3229, "M", "(ๅ)"),
+    ]
+
+
+def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
+        (0x322A, "M", "(ๆœˆ)"),
+        (0x322B, "M", "(็ซ)"),
+        (0x322C, "M", "(ๆฐด)"),
+        (0x322D, "M", "(ๆœจ)"),
+        (0x322E, "M", "(้‡‘)"),
+        (0x322F, "M", "(ๅœŸ)"),
+        (0x3230, "M", "(ๆ—ฅ)"),
+        (0x3231, "M", "(ๆ ช)"),
+        (0x3232, "M", "(ๆœ‰)"),
+        (0x3233, "M", "(็คพ)"),
+        (0x3234, "M", "(ๅ)"),
+        (0x3235, "M", "(็‰น)"),
+        (0x3236, "M", "(่ฒก)"),
+        (0x3237, "M", "(็ฅ)"),
+        (0x3238, "M", "(ๅŠด)"),
+        (0x3239, "M", "(ไปฃ)"),
+        (0x323A, "M", "(ๅ‘ผ)"),
+        (0x323B, "M", "(ๅญฆ)"),
+        (0x323C, "M", "(็›ฃ)"),
+        (0x323D, "M", "(ไผ)"),
+        (0x323E, "M", "(่ณ‡)"),
+        (0x323F, "M", "(ๅ”)"),
+        (0x3240, "M", "(็ฅญ)"),
+        (0x3241, "M", "(ไผ‘)"),
+        (0x3242, "M", "(่‡ช)"),
+        (0x3243, "M", "(่‡ณ)"),
         (0x3244, "M", "ๅ•"),
         (0x3245, "M", "ๅนผ"),
         (0x3246, "M", "ๆ–‡"),
@@ -3261,11 +3299,6 @@ def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x3248, "V"),
         (0x3250, "M", "pte"),
         (0x3251, "M", "21"),
-    ]
-
-
-def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x3252, "M", "22"),
         (0x3253, "M", "23"),
         (0x3254, "M", "24"),
@@ -3333,6 +3366,11 @@ def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x3292, "M", "ๆœ‰"),
         (0x3293, "M", "็คพ"),
         (0x3294, "M", "ๅ"),
+    ]
+
+
+def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x3295, "M", "็‰น"),
         (0x3296, "M", "่ฒก"),
         (0x3297, "M", "็ฅ"),
@@ -3366,11 +3404,6 @@ def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x32B3, "M", "38"),
         (0x32B4, "M", "39"),
         (0x32B5, "M", "40"),
-    ]
-
-
-def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x32B6, "M", "41"),
         (0x32B7, "M", "42"),
         (0x32B8, "M", "43"),
@@ -3438,6 +3471,11 @@ def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x32F6, "M", "ใƒฉ"),
         (0x32F7, "M", "ใƒช"),
         (0x32F8, "M", "ใƒซ"),
+    ]
+
+
+def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x32F9, "M", "ใƒฌ"),
         (0x32FA, "M", "ใƒญ"),
         (0x32FB, "M", "ใƒฏ"),
@@ -3471,11 +3509,6 @@ def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x3317, "M", "ใ‚ญใƒญใƒฏใƒƒใƒˆ"),
         (0x3318, "M", "ใ‚ฐใƒฉใƒ "),
         (0x3319, "M", "ใ‚ฐใƒฉใƒ ใƒˆใƒณ"),
-    ]
-
-
-def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x331A, "M", "ใ‚ฏใƒซใ‚ผใ‚คใƒญ"),
         (0x331B, "M", "ใ‚ฏใƒญใƒผใƒ"),
         (0x331C, "M", "ใ‚ฑใƒผใ‚น"),
@@ -3543,6 +3576,11 @@ def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x335A, "M", "2็‚น"),
         (0x335B, "M", "3็‚น"),
         (0x335C, "M", "4็‚น"),
+    ]
+
+
+def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x335D, "M", "5็‚น"),
         (0x335E, "M", "6็‚น"),
         (0x335F, "M", "7็‚น"),
@@ -3576,11 +3614,6 @@ def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x337B, "M", "ๅนณๆˆ"),
         (0x337C, "M", "ๆ˜ญๅ’Œ"),
         (0x337D, "M", "ๅคงๆญฃ"),
-    ]
-
-
-def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x337E, "M", "ๆ˜Žๆฒป"),
         (0x337F, "M", "ๆ ชๅผไผš็คพ"),
         (0x3380, "M", "pa"),
@@ -3648,6 +3681,11 @@ def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x33BE, "M", "kw"),
         (0x33BF, "M", "mw"),
         (0x33C0, "M", "kฯ‰"),
+    ]
+
+
+def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x33C1, "M", "mฯ‰"),
         (0x33C2, "X"),
         (0x33C3, "M", "bq"),
@@ -3681,11 +3719,6 @@ def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x33DF, "M", "aโˆ•m"),
         (0x33E0, "M", "1ๆ—ฅ"),
         (0x33E1, "M", "2ๆ—ฅ"),
-    ]
-
-
-def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x33E2, "M", "3ๆ—ฅ"),
         (0x33E3, "M", "4ๆ—ฅ"),
         (0x33E4, "M", "5ๆ—ฅ"),
@@ -3753,6 +3786,11 @@ def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA65C, "M", "๊™"),
         (0xA65D, "V"),
         (0xA65E, "M", "๊™Ÿ"),
+    ]
+
+
+def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xA65F, "V"),
         (0xA660, "M", "๊™ก"),
         (0xA661, "V"),
@@ -3786,11 +3824,6 @@ def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA68F, "V"),
         (0xA690, "M", "๊š‘"),
         (0xA691, "V"),
-    ]
-
-
-def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xA692, "M", "๊š“"),
         (0xA693, "V"),
         (0xA694, "M", "๊š•"),
@@ -3858,6 +3891,11 @@ def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA755, "V"),
         (0xA756, "M", "๊—"),
         (0xA757, "V"),
+    ]
+
+
+def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xA758, "M", "๊™"),
         (0xA759, "V"),
         (0xA75A, "M", "๊›"),
@@ -3891,11 +3929,6 @@ def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA77D, "M", "แตน"),
         (0xA77E, "M", "๊ฟ"),
         (0xA77F, "V"),
-    ]
-
-
-def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xA780, "M", "๊ž"),
         (0xA781, "V"),
         (0xA782, "M", "๊žƒ"),
@@ -3963,9 +3996,17 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA7C6, "M", "แถŽ"),
         (0xA7C7, "M", "๊Ÿˆ"),
         (0xA7C8, "V"),
+    ]
+
+
+def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xA7C9, "M", "๊ŸŠ"),
         (0xA7CA, "V"),
-        (0xA7CB, "X"),
+        (0xA7CB, "M", "ษค"),
+        (0xA7CC, "M", "๊Ÿ"),
+        (0xA7CD, "V"),
+        (0xA7CE, "X"),
         (0xA7D0, "M", "๊Ÿ‘"),
         (0xA7D1, "V"),
         (0xA7D2, "X"),
@@ -3976,7 +4017,10 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA7D7, "V"),
         (0xA7D8, "M", "๊Ÿ™"),
         (0xA7D9, "V"),
-        (0xA7DA, "X"),
+        (0xA7DA, "M", "๊Ÿ›"),
+        (0xA7DB, "V"),
+        (0xA7DC, "M", "ฦ›"),
+        (0xA7DD, "X"),
         (0xA7F2, "M", "c"),
         (0xA7F3, "M", "f"),
         (0xA7F4, "M", "q"),
@@ -3996,11 +4040,6 @@ def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xA8DA, "X"),
         (0xA8E0, "V"),
         (0xA954, "X"),
-    ]
-
-
-def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xA95F, "V"),
         (0xA97D, "X"),
         (0xA980, "V"),
@@ -4062,6 +4101,11 @@ def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xAB85, "M", "แŽต"),
         (0xAB86, "M", "แŽถ"),
         (0xAB87, "M", "แŽท"),
+    ]
+
+
+def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xAB88, "M", "แŽธ"),
         (0xAB89, "M", "แŽน"),
         (0xAB8A, "M", "แŽบ"),
@@ -4101,11 +4145,6 @@ def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xABAC, "M", "แœ"),
         (0xABAD, "M", "แ"),
         (0xABAE, "M", "แž"),
-    ]
-
-
-def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xABAF, "M", "แŸ"),
         (0xABB0, "M", "แ "),
         (0xABB1, "M", "แก"),
@@ -4167,6 +4206,11 @@ def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xF920, "M", "้ธž"),
         (0xF921, "M", "ๅต"),
         (0xF922, "M", "ๆฟซ"),
+    ]
+
+
+def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xF923, "M", "่—"),
         (0xF924, "M", "่ฅค"),
         (0xF925, "M", "ๆ‹‰"),
@@ -4206,11 +4250,6 @@ def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xF947, "M", "็ฃŠ"),
         (0xF948, "M", "่ณ‚"),
         (0xF949, "M", "้›ท"),
-    ]
-
-
-def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xF94A, "M", "ๅฃ˜"),
         (0xF94B, "M", "ๅฑข"),
         (0xF94C, "M", "ๆจ“"),
@@ -4272,6 +4311,11 @@ def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xF984, "M", "ๆฟพ"),
         (0xF985, "M", "็คช"),
         (0xF986, "M", "้–ญ"),
+    ]
+
+
+def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xF987, "M", "้ฉช"),
         (0xF988, "M", "้บ—"),
         (0xF989, "M", "้ปŽ"),
@@ -4311,11 +4355,6 @@ def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xF9AB, "M", "ๅถบ"),
         (0xF9AC, "M", "ๆ€œ"),
         (0xF9AD, "M", "็Žฒ"),
-    ]
-
-
-def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xF9AE, "M", "็‘ฉ"),
         (0xF9AF, "M", "็พš"),
         (0xF9B0, "M", "่†"),
@@ -4377,6 +4416,11 @@ def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xF9E8, "M", "่ฃก"),
         (0xF9E9, "M", "้‡Œ"),
         (0xF9EA, "M", "้›ข"),
+    ]
+
+
+def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xF9EB, "M", "ๅŒฟ"),
         (0xF9EC, "M", "ๆบบ"),
         (0xF9ED, "M", "ๅ"),
@@ -4416,11 +4460,6 @@ def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFA10, "M", "ๅกš"),
         (0xFA11, "V"),
         (0xFA12, "M", "ๆ™ด"),
-    ]
-
-
-def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFA13, "V"),
         (0xFA15, "M", "ๅ‡ž"),
         (0xFA16, "M", "็Œช"),
@@ -4482,6 +4521,11 @@ def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFA51, "M", "็ฅ"),
         (0xFA52, "M", "็ฆ"),
         (0xFA53, "M", "็ฆŽ"),
+    ]
+
+
+def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFA54, "M", "็ฉ€"),
         (0xFA55, "M", "็ช"),
         (0xFA56, "M", "็ฏ€"),
@@ -4521,11 +4565,6 @@ def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFA7A, "M", "ๅ–™"),
         (0xFA7B, "M", "ๅ—ข"),
         (0xFA7C, "M", "ๅกš"),
-    ]
-
-
-def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFA7D, "M", "ๅขณ"),
         (0xFA7E, "M", "ๅฅ„"),
         (0xFA7F, "M", "ๅฅ”"),
@@ -4587,6 +4626,11 @@ def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFAB7, "M", "่ฆ†"),
         (0xFAB8, "M", "่ฆ–"),
         (0xFAB9, "M", "่ชฟ"),
+    ]
+
+
+def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFABA, "M", "่ซธ"),
         (0xFABB, "M", "่ซ‹"),
         (0xFABC, "M", "่ฌ"),
@@ -4626,11 +4670,6 @@ def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFB03, "M", "ffi"),
         (0xFB04, "M", "ffl"),
         (0xFB05, "M", "st"),
-    ]
-
-
-def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFB07, "X"),
         (0xFB13, "M", "ีดีถ"),
         (0xFB14, "M", "ีดีฅ"),
@@ -4650,7 +4689,7 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFB26, "M", "ื"),
         (0xFB27, "M", "ืจ"),
         (0xFB28, "M", "ืช"),
-        (0xFB29, "3", "+"),
+        (0xFB29, "M", "+"),
         (0xFB2A, "M", "ืฉื"),
         (0xFB2B, "M", "ืฉื‚"),
         (0xFB2C, "M", "ืฉึผื"),
@@ -4692,6 +4731,11 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFB50, "M", "ูฑ"),
         (0xFB52, "M", "ูป"),
         (0xFB56, "M", "ูพ"),
+    ]
+
+
+def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFB5A, "M", "ฺ€"),
         (0xFB5E, "M", "ูบ"),
         (0xFB62, "M", "ูฟ"),
@@ -4731,11 +4775,6 @@ def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFBE2, "M", "�‰"),
         (0xFBE4, "M", "�"),
         (0xFBE8, "M", "ู‰"),
-    ]
-
-
-def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFBEA, "M", "ุฆุง"),
         (0xFBEC, "M", "ุฆ�•"),
         (0xFBEE, "M", "ุฆูˆ"),
@@ -4797,6 +4836,11 @@ def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFC31, "M", "ูู‰"),
         (0xFC32, "M", "ููŠ"),
         (0xFC33, "M", "ู‚ุญ"),
+    ]
+
+
+def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFC34, "M", "ู‚ู…"),
         (0xFC35, "M", "ู‚ู‰"),
         (0xFC36, "M", "ู‚ูŠ"),
@@ -4836,20 +4880,15 @@ def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFC58, "M", "ูŠู…"),
         (0xFC59, "M", "ูŠู‰"),
         (0xFC5A, "M", "ูŠูŠ"),
-    ]
-
-
-def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFC5B, "M", "ุฐูฐ"),
         (0xFC5C, "M", "ุฑูฐ"),
         (0xFC5D, "M", "ู‰ูฐ"),
-        (0xFC5E, "3", " ูŒู‘"),
-        (0xFC5F, "3", " ูู‘"),
-        (0xFC60, "3", " ูŽู‘"),
-        (0xFC61, "3", " ูู‘"),
-        (0xFC62, "3", " ูู‘"),
-        (0xFC63, "3", " ู‘ูฐ"),
+        (0xFC5E, "M", " ูŒู‘"),
+        (0xFC5F, "M", " ูู‘"),
+        (0xFC60, "M", " ูŽู‘"),
+        (0xFC61, "M", " ูู‘"),
+        (0xFC62, "M", " ูู‘"),
+        (0xFC63, "M", " ู‘ูฐ"),
         (0xFC64, "M", "ุฆุฑ"),
         (0xFC65, "M", "ุฆุฒ"),
         (0xFC66, "M", "ุฆู…"),
@@ -4902,6 +4941,11 @@ def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFC95, "M", "ูŠู‰"),
         (0xFC96, "M", "ูŠูŠ"),
         (0xFC97, "M", "ุฆุฌ"),
+    ]
+
+
+def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFC98, "M", "ุฆุญ"),
         (0xFC99, "M", "ุฆุฎ"),
         (0xFC9A, "M", "ุฆู…"),
@@ -4941,11 +4985,6 @@ def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFCBC, "M", "ุบุฌ"),
         (0xFCBD, "M", "ุบู…"),
         (0xFCBE, "M", "ูุฌ"),
-    ]
-
-
-def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFCBF, "M", "ูุญ"),
         (0xFCC0, "M", "ูุฎ"),
         (0xFCC1, "M", "ูู…"),
@@ -5007,6 +5046,11 @@ def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFCF9, "M", "ุบู‰"),
         (0xFCFA, "M", "ุบูŠ"),
         (0xFCFB, "M", "ุณู‰"),
+    ]
+
+
+def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFCFC, "M", "ุณูŠ"),
         (0xFCFD, "M", "ุดู‰"),
         (0xFCFE, "M", "ุดูŠ"),
@@ -5046,11 +5090,6 @@ def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFD20, "M", "ุฎูŠ"),
         (0xFD21, "M", "ุตู‰"),
         (0xFD22, "M", "ุตูŠ"),
-    ]
-
-
-def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFD23, "M", "ุถู‰"),
         (0xFD24, "M", "ุถูŠ"),
         (0xFD25, "M", "ุดุฌ"),
@@ -5112,6 +5151,11 @@ def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFD7A, "M", "ุบู…ูŠ"),
         (0xFD7B, "M", "ุบู…ู‰"),
         (0xFD7C, "M", "ูุฎู…"),
+    ]
+
+
+def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFD7E, "M", "ู‚ู…ุญ"),
         (0xFD7F, "M", "ู‚ู…ู…"),
         (0xFD80, "M", "ู„ุญู…"),
@@ -5151,11 +5195,6 @@ def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFDA8, "M", "ุณุฎู‰"),
         (0xFDA9, "M", "ุตุญูŠ"),
         (0xFDAA, "M", "ุดุญูŠ"),
-    ]
-
-
-def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFDAB, "M", "ุถุญูŠ"),
         (0xFDAC, "M", "ู„ุฌูŠ"),
         (0xFDAD, "M", "ู„ู…ูŠ"),
@@ -5198,18 +5237,18 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFDF7, "M", "ุนู„ูŠู‡"),
         (0xFDF8, "M", "ูˆุณู„ู…"),
         (0xFDF9, "M", "ุตู„ู‰"),
-        (0xFDFA, "3", "ุตู„ู‰ ุงู„ู„ู‡ ุนู„ูŠู‡ ูˆุณู„ู…"),
-        (0xFDFB, "3", "ุฌู„ ุฌู„ุงู„ู‡"),
+        (0xFDFA, "M", "ุตู„ู‰ ุงู„ู„ู‡ ุนู„ูŠู‡ ูˆุณู„ู…"),
+        (0xFDFB, "M", "ุฌู„ ุฌู„ุงู„ู‡"),
         (0xFDFC, "M", "ุฑ�Œุงู„"),
         (0xFDFD, "V"),
         (0xFE00, "I"),
-        (0xFE10, "3", ","),
+        (0xFE10, "M", ","),
         (0xFE11, "M", "ใ€"),
         (0xFE12, "X"),
-        (0xFE13, "3", ":"),
-        (0xFE14, "3", ";"),
-        (0xFE15, "3", "!"),
-        (0xFE16, "3", "?"),
+        (0xFE13, "M", ":"),
+        (0xFE14, "M", ";"),
+        (0xFE15, "M", "!"),
+        (0xFE16, "M", "?"),
         (0xFE17, "M", "ใ€–"),
         (0xFE18, "M", "ใ€—"),
         (0xFE19, "X"),
@@ -5217,11 +5256,16 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFE30, "X"),
         (0xFE31, "M", "โ€”"),
         (0xFE32, "M", "โ€“"),
-        (0xFE33, "3", "_"),
-        (0xFE35, "3", "("),
-        (0xFE36, "3", ")"),
-        (0xFE37, "3", "{"),
-        (0xFE38, "3", "}"),
+    ]
+
+
+def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
+        (0xFE33, "M", "_"),
+        (0xFE35, "M", "("),
+        (0xFE36, "M", ")"),
+        (0xFE37, "M", "{"),
+        (0xFE38, "M", "}"),
         (0xFE39, "M", "ใ€”"),
         (0xFE3A, "M", "ใ€•"),
         (0xFE3B, "M", "ใ€"),
@@ -5235,58 +5279,53 @@ def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFE43, "M", "ใ€Ž"),
         (0xFE44, "M", "ใ€"),
         (0xFE45, "V"),
-        (0xFE47, "3", "["),
-        (0xFE48, "3", "]"),
-        (0xFE49, "3", " ฬ…"),
-        (0xFE4D, "3", "_"),
-        (0xFE50, "3", ","),
+        (0xFE47, "M", "["),
+        (0xFE48, "M", "]"),
+        (0xFE49, "M", " ฬ…"),
+        (0xFE4D, "M", "_"),
+        (0xFE50, "M", ","),
         (0xFE51, "M", "ใ€"),
         (0xFE52, "X"),
-        (0xFE54, "3", ";"),
-        (0xFE55, "3", ":"),
-        (0xFE56, "3", "?"),
-        (0xFE57, "3", "!"),
+        (0xFE54, "M", ";"),
+        (0xFE55, "M", ":"),
+        (0xFE56, "M", "?"),
+        (0xFE57, "M", "!"),
         (0xFE58, "M", "โ€”"),
-        (0xFE59, "3", "("),
-        (0xFE5A, "3", ")"),
-        (0xFE5B, "3", "{"),
-        (0xFE5C, "3", "}"),
+        (0xFE59, "M", "("),
+        (0xFE5A, "M", ")"),
+        (0xFE5B, "M", "{"),
+        (0xFE5C, "M", "}"),
         (0xFE5D, "M", "ใ€”"),
         (0xFE5E, "M", "ใ€•"),
-        (0xFE5F, "3", "#"),
-        (0xFE60, "3", "&"),
-        (0xFE61, "3", "*"),
-    ]
-
-
-def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFE62, "3", "+"),
+        (0xFE5F, "M", "#"),
+        (0xFE60, "M", "&"),
+        (0xFE61, "M", "*"),
+        (0xFE62, "M", "+"),
         (0xFE63, "M", "-"),
-        (0xFE64, "3", "<"),
-        (0xFE65, "3", ">"),
-        (0xFE66, "3", "="),
+        (0xFE64, "M", "<"),
+        (0xFE65, "M", ">"),
+        (0xFE66, "M", "="),
         (0xFE67, "X"),
-        (0xFE68, "3", "\\"),
-        (0xFE69, "3", "$"),
-        (0xFE6A, "3", "%"),
-        (0xFE6B, "3", "@"),
+        (0xFE68, "M", "\\"),
+        (0xFE69, "M", "$"),
+        (0xFE6A, "M", "%"),
+        (0xFE6B, "M", "@"),
         (0xFE6C, "X"),
-        (0xFE70, "3", " ู‹"),
+        (0xFE70, "M", " ู‹"),
         (0xFE71, "M", "ู€ู‹"),
-        (0xFE72, "3", " ูŒ"),
+        (0xFE72, "M", " ูŒ"),
         (0xFE73, "V"),
-        (0xFE74, "3", " ู"),
+        (0xFE74, "M", " ู"),
         (0xFE75, "X"),
-        (0xFE76, "3", " ูŽ"),
+        (0xFE76, "M", " ูŽ"),
         (0xFE77, "M", "ู€ูŽ"),
-        (0xFE78, "3", " ู"),
+        (0xFE78, "M", " ู"),
         (0xFE79, "M", "ู€ู"),
-        (0xFE7A, "3", " ู"),
+        (0xFE7A, "M", " ู"),
         (0xFE7B, "M", "ู€ู"),
-        (0xFE7C, "3", " ู‘"),
+        (0xFE7C, "M", " ู‘"),
         (0xFE7D, "M", "ู€ู‘"),
-        (0xFE7E, "3", " ู’"),
+        (0xFE7E, "M", " ู’"),
         (0xFE7F, "M", "ู€ู’"),
         (0xFE80, "M", "ุก"),
         (0xFE81, "M", "ุข"),
@@ -5322,6 +5361,11 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFEE5, "M", "ู†"),
         (0xFEE9, "M", "ู‡"),
         (0xFEED, "M", "ูˆ"),
+    ]
+
+
+def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFEEF, "M", "ู‰"),
         (0xFEF1, "M", "ูŠ"),
         (0xFEF5, "M", "ู„ุข"),
@@ -5331,21 +5375,21 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFEFD, "X"),
         (0xFEFF, "I"),
         (0xFF00, "X"),
-        (0xFF01, "3", "!"),
-        (0xFF02, "3", '"'),
-        (0xFF03, "3", "#"),
-        (0xFF04, "3", "$"),
-        (0xFF05, "3", "%"),
-        (0xFF06, "3", "&"),
-        (0xFF07, "3", "'"),
-        (0xFF08, "3", "("),
-        (0xFF09, "3", ")"),
-        (0xFF0A, "3", "*"),
-        (0xFF0B, "3", "+"),
-        (0xFF0C, "3", ","),
+        (0xFF01, "M", "!"),
+        (0xFF02, "M", '"'),
+        (0xFF03, "M", "#"),
+        (0xFF04, "M", "$"),
+        (0xFF05, "M", "%"),
+        (0xFF06, "M", "&"),
+        (0xFF07, "M", "'"),
+        (0xFF08, "M", "("),
+        (0xFF09, "M", ")"),
+        (0xFF0A, "M", "*"),
+        (0xFF0B, "M", "+"),
+        (0xFF0C, "M", ","),
         (0xFF0D, "M", "-"),
         (0xFF0E, "M", "."),
-        (0xFF0F, "3", "/"),
+        (0xFF0F, "M", "/"),
         (0xFF10, "M", "0"),
         (0xFF11, "M", "1"),
         (0xFF12, "M", "2"),
@@ -5356,18 +5400,13 @@ def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFF17, "M", "7"),
         (0xFF18, "M", "8"),
         (0xFF19, "M", "9"),
-        (0xFF1A, "3", ":"),
-        (0xFF1B, "3", ";"),
-        (0xFF1C, "3", "<"),
-        (0xFF1D, "3", "="),
-        (0xFF1E, "3", ">"),
-    ]
-
-
-def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFF1F, "3", "?"),
-        (0xFF20, "3", "@"),
+        (0xFF1A, "M", ":"),
+        (0xFF1B, "M", ";"),
+        (0xFF1C, "M", "<"),
+        (0xFF1D, "M", "="),
+        (0xFF1E, "M", ">"),
+        (0xFF1F, "M", "?"),
+        (0xFF20, "M", "@"),
         (0xFF21, "M", "a"),
         (0xFF22, "M", "b"),
         (0xFF23, "M", "c"),
@@ -5394,12 +5433,12 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFF38, "M", "x"),
         (0xFF39, "M", "y"),
         (0xFF3A, "M", "z"),
-        (0xFF3B, "3", "["),
-        (0xFF3C, "3", "\\"),
-        (0xFF3D, "3", "]"),
-        (0xFF3E, "3", "^"),
-        (0xFF3F, "3", "_"),
-        (0xFF40, "3", "`"),
+        (0xFF3B, "M", "["),
+        (0xFF3C, "M", "\\"),
+        (0xFF3D, "M", "]"),
+        (0xFF3E, "M", "^"),
+        (0xFF3F, "M", "_"),
+        (0xFF40, "M", "`"),
         (0xFF41, "M", "a"),
         (0xFF42, "M", "b"),
         (0xFF43, "M", "c"),
@@ -5426,10 +5465,15 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFF58, "M", "x"),
         (0xFF59, "M", "y"),
         (0xFF5A, "M", "z"),
-        (0xFF5B, "3", "{"),
-        (0xFF5C, "3", "|"),
-        (0xFF5D, "3", "}"),
-        (0xFF5E, "3", "~"),
+        (0xFF5B, "M", "{"),
+    ]
+
+
+def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
+        (0xFF5C, "M", "|"),
+        (0xFF5D, "M", "}"),
+        (0xFF5E, "M", "~"),
         (0xFF5F, "M", "โฆ…"),
         (0xFF60, "M", "โฆ†"),
         (0xFF61, "M", "."),
@@ -5466,11 +5510,6 @@ def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFF80, "M", "ใ‚ฟ"),
         (0xFF81, "M", "ใƒ"),
         (0xFF82, "M", "ใƒ„"),
-    ]
-
-
-def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFF83, "M", "ใƒ†"),
         (0xFF84, "M", "ใƒˆ"),
         (0xFF85, "M", "ใƒŠ"),
@@ -5500,7 +5539,7 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFF9D, "M", "ใƒณ"),
         (0xFF9E, "M", "ใ‚™"),
         (0xFF9F, "M", "ใ‚š"),
-        (0xFFA0, "X"),
+        (0xFFA0, "I"),
         (0xFFA1, "M", "แ„€"),
         (0xFFA2, "M", "แ„"),
         (0xFFA3, "M", "แ†ช"),
@@ -5532,6 +5571,11 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFFBD, "M", "แ„‘"),
         (0xFFBE, "M", "แ„’"),
         (0xFFBF, "X"),
+    ]
+
+
+def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0xFFC2, "M", "แ…ก"),
         (0xFFC3, "M", "แ…ข"),
         (0xFFC4, "M", "แ…ฃ"),
@@ -5560,7 +5604,7 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFFE0, "M", "ยข"),
         (0xFFE1, "M", "ยฃ"),
         (0xFFE2, "M", "ยฌ"),
-        (0xFFE3, "3", " ฬ„"),
+        (0xFFE3, "M", " ฬ„"),
         (0xFFE4, "M", "ยฆ"),
         (0xFFE5, "M", "ยฅ"),
         (0xFFE6, "M", "โ‚ฉ"),
@@ -5571,11 +5615,6 @@ def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0xFFEB, "M", "โ†’"),
         (0xFFEC, "M", "โ†“"),
         (0xFFED, "M", "โ– "),
-    ]
-
-
-def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0xFFEE, "M", "โ—‹"),
         (0xFFEF, "X"),
         (0x10000, "V"),
@@ -5637,6 +5676,11 @@ def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1040C, "M", "๐ด"),
         (0x1040D, "M", "๐ต"),
         (0x1040E, "M", "๐ถ"),
+    ]
+
+
+def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1040F, "M", "๐ท"),
         (0x10410, "M", "๐ธ"),
         (0x10411, "M", "๐น"),
@@ -5676,11 +5720,6 @@ def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x104B7, "M", "๐“Ÿ"),
         (0x104B8, "M", "๐“ "),
         (0x104B9, "M", "๐“ก"),
-    ]
-
-
-def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x104BA, "M", "๐“ข"),
         (0x104BB, "M", "๐“ฃ"),
         (0x104BC, "M", "๐“ค"),
@@ -5742,6 +5781,11 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x10588, "M", "๐–ฏ"),
         (0x10589, "M", "๐–ฐ"),
         (0x1058A, "M", "๐–ฑ"),
+    ]
+
+
+def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1058B, "X"),
         (0x1058C, "M", "๐–ณ"),
         (0x1058D, "M", "๐–ด"),
@@ -5762,6 +5806,8 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x105BA, "X"),
         (0x105BB, "V"),
         (0x105BD, "X"),
+        (0x105C0, "V"),
+        (0x105F4, "X"),
         (0x10600, "V"),
         (0x10737, "X"),
         (0x10740, "V"),
@@ -5781,11 +5827,6 @@ def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1078A, "M", "สค"),
         (0x1078B, "M", "ษ–"),
         (0x1078C, "M", "ษ—"),
-    ]
-
-
-def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1078D, "M", "แถ‘"),
         (0x1078E, "M", "ษ˜"),
         (0x1078F, "M", "ษž"),
@@ -5845,6 +5886,11 @@ def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1083D, "X"),
         (0x1083F, "V"),
         (0x10856, "X"),
+    ]
+
+
+def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x10857, "V"),
         (0x1089F, "X"),
         (0x108A7, "V"),
@@ -5886,11 +5932,6 @@ def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x10AEB, "V"),
         (0x10AF7, "X"),
         (0x10B00, "V"),
-    ]
-
-
-def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x10B36, "X"),
         (0x10B39, "V"),
         (0x10B56, "X"),
@@ -5950,6 +5991,11 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x10CAB, "M", "๐ณซ"),
         (0x10CAC, "M", "๐ณฌ"),
         (0x10CAD, "M", "๐ณญ"),
+    ]
+
+
+def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x10CAE, "M", "๐ณฎ"),
         (0x10CAF, "M", "๐ณฏ"),
         (0x10CB0, "M", "๐ณฐ"),
@@ -5962,6 +6008,34 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x10D28, "X"),
         (0x10D30, "V"),
         (0x10D3A, "X"),
+        (0x10D40, "V"),
+        (0x10D50, "M", "๐ตฐ"),
+        (0x10D51, "M", "๐ตฑ"),
+        (0x10D52, "M", "๐ตฒ"),
+        (0x10D53, "M", "๐ตณ"),
+        (0x10D54, "M", "๐ตด"),
+        (0x10D55, "M", "๐ตต"),
+        (0x10D56, "M", "๐ตถ"),
+        (0x10D57, "M", "๐ตท"),
+        (0x10D58, "M", "๐ตธ"),
+        (0x10D59, "M", "๐ตน"),
+        (0x10D5A, "M", "๐ตบ"),
+        (0x10D5B, "M", "๐ตป"),
+        (0x10D5C, "M", "๐ตผ"),
+        (0x10D5D, "M", "๐ตฝ"),
+        (0x10D5E, "M", "๐ตพ"),
+        (0x10D5F, "M", "๐ตฟ"),
+        (0x10D60, "M", "๐ถ€"),
+        (0x10D61, "M", "๐ถ"),
+        (0x10D62, "M", "๐ถ‚"),
+        (0x10D63, "M", "๐ถƒ"),
+        (0x10D64, "M", "๐ถ„"),
+        (0x10D65, "M", "๐ถ…"),
+        (0x10D66, "X"),
+        (0x10D69, "V"),
+        (0x10D86, "X"),
+        (0x10D8E, "V"),
+        (0x10D90, "X"),
         (0x10E60, "V"),
         (0x10E7F, "X"),
         (0x10E80, "V"),
@@ -5970,7 +6044,9 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x10EAE, "X"),
         (0x10EB0, "V"),
         (0x10EB2, "X"),
-        (0x10EFD, "V"),
+        (0x10EC2, "V"),
+        (0x10EC5, "X"),
+        (0x10EFC, "V"),
         (0x10F28, "X"),
         (0x10F30, "V"),
         (0x10F5A, "X"),
@@ -5991,11 +6067,6 @@ def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x110D0, "V"),
         (0x110E9, "X"),
         (0x110F0, "V"),
-    ]
-
-
-def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x110FA, "X"),
         (0x11100, "V"),
         (0x11135, "X"),
@@ -6025,6 +6096,11 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x112EB, "X"),
         (0x112F0, "V"),
         (0x112FA, "X"),
+    ]
+
+
+def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x11300, "V"),
         (0x11304, "X"),
         (0x11305, "V"),
@@ -6055,6 +6131,28 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1136D, "X"),
         (0x11370, "V"),
         (0x11375, "X"),
+        (0x11380, "V"),
+        (0x1138A, "X"),
+        (0x1138B, "V"),
+        (0x1138C, "X"),
+        (0x1138E, "V"),
+        (0x1138F, "X"),
+        (0x11390, "V"),
+        (0x113B6, "X"),
+        (0x113B7, "V"),
+        (0x113C1, "X"),
+        (0x113C2, "V"),
+        (0x113C3, "X"),
+        (0x113C5, "V"),
+        (0x113C6, "X"),
+        (0x113C7, "V"),
+        (0x113CB, "X"),
+        (0x113CC, "V"),
+        (0x113D6, "X"),
+        (0x113D7, "V"),
+        (0x113D9, "X"),
+        (0x113E1, "V"),
+        (0x113E3, "X"),
         (0x11400, "V"),
         (0x1145C, "X"),
         (0x1145D, "V"),
@@ -6077,6 +6175,8 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x116BA, "X"),
         (0x116C0, "V"),
         (0x116CA, "X"),
+        (0x116D0, "V"),
+        (0x116E4, "X"),
         (0x11700, "V"),
         (0x1171B, "X"),
         (0x1171D, "V"),
@@ -6096,16 +6196,16 @@ def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x118A8, "M", "๐‘ฃˆ"),
         (0x118A9, "M", "๐‘ฃ‰"),
         (0x118AA, "M", "๐‘ฃŠ"),
-    ]
-
-
-def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x118AB, "M", "๐‘ฃ‹"),
         (0x118AC, "M", "๐‘ฃŒ"),
         (0x118AD, "M", "๐‘ฃ"),
         (0x118AE, "M", "๐‘ฃŽ"),
         (0x118AF, "M", "๐‘ฃ"),
+    ]
+
+
+def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x118B0, "M", "๐‘ฃ"),
         (0x118B1, "M", "๐‘ฃ‘"),
         (0x118B2, "M", "๐‘ฃ’"),
@@ -6154,6 +6254,10 @@ def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x11AF9, "X"),
         (0x11B00, "V"),
         (0x11B0A, "X"),
+        (0x11BC0, "V"),
+        (0x11BE2, "X"),
+        (0x11BF0, "V"),
+        (0x11BFA, "X"),
         (0x11C00, "V"),
         (0x11C09, "X"),
         (0x11C0A, "V"),
@@ -6201,12 +6305,12 @@ def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x11F12, "V"),
         (0x11F3B, "X"),
         (0x11F3E, "V"),
+        (0x11F5B, "X"),
     ]
 
 
-def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     return [
-        (0x11F5A, "X"),
         (0x11FB0, "V"),
         (0x11FB1, "X"),
         (0x11FC0, "V"),
@@ -6225,8 +6329,12 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x13430, "X"),
         (0x13440, "V"),
         (0x13456, "X"),
+        (0x13460, "V"),
+        (0x143FB, "X"),
         (0x14400, "V"),
         (0x14647, "X"),
+        (0x16100, "V"),
+        (0x1613A, "X"),
         (0x16800, "V"),
         (0x16A39, "X"),
         (0x16A40, "V"),
@@ -6251,6 +6359,8 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x16B78, "X"),
         (0x16B7D, "V"),
         (0x16B90, "X"),
+        (0x16D40, "V"),
+        (0x16D7A, "X"),
         (0x16E40, "M", "๐–น "),
         (0x16E41, "M", "๐–นก"),
         (0x16E42, "M", "๐–นข"),
@@ -6299,18 +6409,18 @@ def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x187F8, "X"),
         (0x18800, "V"),
         (0x18CD6, "X"),
-        (0x18D00, "V"),
+        (0x18CFF, "V"),
         (0x18D09, "X"),
+    ]
+
+
+def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1AFF0, "V"),
         (0x1AFF4, "X"),
         (0x1AFF5, "V"),
         (0x1AFFC, "X"),
         (0x1AFFD, "V"),
-    ]
-
-
-def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1AFFF, "X"),
         (0x1B000, "V"),
         (0x1B123, "X"),
@@ -6335,6 +6445,46 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1BC9C, "V"),
         (0x1BCA0, "I"),
         (0x1BCA4, "X"),
+        (0x1CC00, "V"),
+        (0x1CCD6, "M", "a"),
+        (0x1CCD7, "M", "b"),
+        (0x1CCD8, "M", "c"),
+        (0x1CCD9, "M", "d"),
+        (0x1CCDA, "M", "e"),
+        (0x1CCDB, "M", "f"),
+        (0x1CCDC, "M", "g"),
+        (0x1CCDD, "M", "h"),
+        (0x1CCDE, "M", "i"),
+        (0x1CCDF, "M", "j"),
+        (0x1CCE0, "M", "k"),
+        (0x1CCE1, "M", "l"),
+        (0x1CCE2, "M", "m"),
+        (0x1CCE3, "M", "n"),
+        (0x1CCE4, "M", "o"),
+        (0x1CCE5, "M", "p"),
+        (0x1CCE6, "M", "q"),
+        (0x1CCE7, "M", "r"),
+        (0x1CCE8, "M", "s"),
+        (0x1CCE9, "M", "t"),
+        (0x1CCEA, "M", "u"),
+        (0x1CCEB, "M", "v"),
+        (0x1CCEC, "M", "w"),
+        (0x1CCED, "M", "x"),
+        (0x1CCEE, "M", "y"),
+        (0x1CCEF, "M", "z"),
+        (0x1CCF0, "M", "0"),
+        (0x1CCF1, "M", "1"),
+        (0x1CCF2, "M", "2"),
+        (0x1CCF3, "M", "3"),
+        (0x1CCF4, "M", "4"),
+        (0x1CCF5, "M", "5"),
+        (0x1CCF6, "M", "6"),
+        (0x1CCF7, "M", "7"),
+        (0x1CCF8, "M", "8"),
+        (0x1CCF9, "M", "9"),
+        (0x1CCFA, "X"),
+        (0x1CD00, "V"),
+        (0x1CEB4, "X"),
         (0x1CF00, "V"),
         (0x1CF2E, "X"),
         (0x1CF30, "V"),
@@ -6354,7 +6504,7 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D163, "M", "๐…˜๐…ฅ๐…ฑ"),
         (0x1D164, "M", "๐…˜๐…ฅ๐…ฒ"),
         (0x1D165, "V"),
-        (0x1D173, "X"),
+        (0x1D173, "I"),
         (0x1D17B, "V"),
         (0x1D1BB, "M", "๐†น๐…ฅ"),
         (0x1D1BC, "M", "๐†บ๐…ฅ"),
@@ -6366,6 +6516,11 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D1EB, "X"),
         (0x1D200, "V"),
         (0x1D246, "X"),
+    ]
+
+
+def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D2C0, "V"),
         (0x1D2D4, "X"),
         (0x1D2E0, "V"),
@@ -6411,11 +6566,6 @@ def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D422, "M", "i"),
         (0x1D423, "M", "j"),
         (0x1D424, "M", "k"),
-    ]
-
-
-def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D425, "M", "l"),
         (0x1D426, "M", "m"),
         (0x1D427, "M", "n"),
@@ -6471,6 +6621,11 @@ def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D459, "M", "l"),
         (0x1D45A, "M", "m"),
         (0x1D45B, "M", "n"),
+    ]
+
+
+def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D45C, "M", "o"),
         (0x1D45D, "M", "p"),
         (0x1D45E, "M", "q"),
@@ -6516,11 +6671,6 @@ def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D486, "M", "e"),
         (0x1D487, "M", "f"),
         (0x1D488, "M", "g"),
-    ]
-
-
-def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D489, "M", "h"),
         (0x1D48A, "M", "i"),
         (0x1D48B, "M", "j"),
@@ -6576,6 +6726,11 @@ def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D4C0, "M", "k"),
         (0x1D4C1, "M", "l"),
         (0x1D4C2, "M", "m"),
+    ]
+
+
+def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D4C3, "M", "n"),
         (0x1D4C4, "X"),
         (0x1D4C5, "M", "p"),
@@ -6621,11 +6776,6 @@ def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D4ED, "M", "d"),
         (0x1D4EE, "M", "e"),
         (0x1D4EF, "M", "f"),
-    ]
-
-
-def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D4F0, "M", "g"),
         (0x1D4F1, "M", "h"),
         (0x1D4F2, "M", "i"),
@@ -6681,6 +6831,11 @@ def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D525, "M", "h"),
         (0x1D526, "M", "i"),
         (0x1D527, "M", "j"),
+    ]
+
+
+def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D528, "M", "k"),
         (0x1D529, "M", "l"),
         (0x1D52A, "M", "m"),
@@ -6726,11 +6881,6 @@ def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D554, "M", "c"),
         (0x1D555, "M", "d"),
         (0x1D556, "M", "e"),
-    ]
-
-
-def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D557, "M", "f"),
         (0x1D558, "M", "g"),
         (0x1D559, "M", "h"),
@@ -6786,6 +6936,11 @@ def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D58B, "M", "f"),
         (0x1D58C, "M", "g"),
         (0x1D58D, "M", "h"),
+    ]
+
+
+def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D58E, "M", "i"),
         (0x1D58F, "M", "j"),
         (0x1D590, "M", "k"),
@@ -6831,11 +6986,6 @@ def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D5B8, "M", "y"),
         (0x1D5B9, "M", "z"),
         (0x1D5BA, "M", "a"),
-    ]
-
-
-def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D5BB, "M", "b"),
         (0x1D5BC, "M", "c"),
         (0x1D5BD, "M", "d"),
@@ -6891,6 +7041,11 @@ def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D5EF, "M", "b"),
         (0x1D5F0, "M", "c"),
         (0x1D5F1, "M", "d"),
+    ]
+
+
+def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D5F2, "M", "e"),
         (0x1D5F3, "M", "f"),
         (0x1D5F4, "M", "g"),
@@ -6936,11 +7091,6 @@ def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D61C, "M", "u"),
         (0x1D61D, "M", "v"),
         (0x1D61E, "M", "w"),
-    ]
-
-
-def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D61F, "M", "x"),
         (0x1D620, "M", "y"),
         (0x1D621, "M", "z"),
@@ -6996,6 +7146,11 @@ def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D653, "M", "x"),
         (0x1D654, "M", "y"),
         (0x1D655, "M", "z"),
+    ]
+
+
+def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D656, "M", "a"),
         (0x1D657, "M", "b"),
         (0x1D658, "M", "c"),
@@ -7041,11 +7196,6 @@ def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D680, "M", "q"),
         (0x1D681, "M", "r"),
         (0x1D682, "M", "s"),
-    ]
-
-
-def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D683, "M", "t"),
         (0x1D684, "M", "u"),
         (0x1D685, "M", "v"),
@@ -7101,6 +7251,11 @@ def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D6B8, "M", "ฯ"),
         (0x1D6B9, "M", "ฮธ"),
         (0x1D6BA, "M", "ฯƒ"),
+    ]
+
+
+def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D6BB, "M", "ฯ„"),
         (0x1D6BC, "M", "ฯ…"),
         (0x1D6BD, "M", "ฯ†"),
@@ -7146,11 +7301,6 @@ def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D6E6, "M", "ฮต"),
         (0x1D6E7, "M", "ฮถ"),
         (0x1D6E8, "M", "ฮท"),
-    ]
-
-
-def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D6E9, "M", "ฮธ"),
         (0x1D6EA, "M", "ฮน"),
         (0x1D6EB, "M", "ฮบ"),
@@ -7206,6 +7356,11 @@ def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D71E, "M", "ฮณ"),
         (0x1D71F, "M", "ฮด"),
         (0x1D720, "M", "ฮต"),
+    ]
+
+
+def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D721, "M", "ฮถ"),
         (0x1D722, "M", "ฮท"),
         (0x1D723, "M", "ฮธ"),
@@ -7251,11 +7406,6 @@ def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D74C, "M", "ฯ‡"),
         (0x1D74D, "M", "ฯˆ"),
         (0x1D74E, "M", "ฯ‰"),
-    ]
-
-
-def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D74F, "M", "โˆ‚"),
         (0x1D750, "M", "ฮต"),
         (0x1D751, "M", "ฮธ"),
@@ -7311,6 +7461,11 @@ def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D784, "M", "ฯ…"),
         (0x1D785, "M", "ฯ†"),
         (0x1D786, "M", "ฯ‡"),
+    ]
+
+
+def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D787, "M", "ฯˆ"),
         (0x1D788, "M", "ฯ‰"),
         (0x1D789, "M", "โˆ‚"),
@@ -7356,11 +7511,6 @@ def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D7B1, "M", "ฮธ"),
         (0x1D7B2, "M", "ฮน"),
         (0x1D7B3, "M", "ฮบ"),
-    ]
-
-
-def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1D7B4, "M", "ฮป"),
         (0x1D7B5, "M", "ฮผ"),
         (0x1D7B6, "M", "ฮฝ"),
@@ -7416,6 +7566,11 @@ def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1D7EB, "M", "9"),
         (0x1D7EC, "M", "0"),
         (0x1D7ED, "M", "1"),
+    ]
+
+
+def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1D7EE, "M", "2"),
         (0x1D7EF, "M", "3"),
         (0x1D7F0, "M", "4"),
@@ -7461,11 +7616,6 @@ def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E034, "M", "ะด"),
         (0x1E035, "M", "ะต"),
         (0x1E036, "M", "ะถ"),
-    ]
-
-
-def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1E037, "M", "ะท"),
         (0x1E038, "M", "ะธ"),
         (0x1E039, "M", "ะบ"),
@@ -7521,6 +7671,11 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E06B, "M", "าซ"),
         (0x1E06C, "M", "๊™‘"),
         (0x1E06D, "M", "าฑ"),
+    ]
+
+
+def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1E06E, "X"),
         (0x1E08F, "V"),
         (0x1E090, "X"),
@@ -7540,6 +7695,10 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E300, "X"),
         (0x1E4D0, "V"),
         (0x1E4FA, "X"),
+        (0x1E5D0, "V"),
+        (0x1E5FB, "X"),
+        (0x1E5FF, "V"),
+        (0x1E600, "X"),
         (0x1E7E0, "V"),
         (0x1E7E7, "X"),
         (0x1E7E8, "V"),
@@ -7566,11 +7725,6 @@ def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1E90B, "M", "๐žคญ"),
         (0x1E90C, "M", "๐žคฎ"),
         (0x1E90D, "M", "๐žคฏ"),
-    ]
-
-
-def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1E90E, "M", "๐žคฐ"),
         (0x1E90F, "M", "๐žคฑ"),
         (0x1E910, "M", "๐žคฒ"),
@@ -7622,6 +7776,11 @@ def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1EE12, "M", "ู‚"),
         (0x1EE13, "M", "ุฑ"),
         (0x1EE14, "M", "ุด"),
+    ]
+
+
+def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1EE15, "M", "ุช"),
         (0x1EE16, "M", "ุซ"),
         (0x1EE17, "M", "ุฎ"),
@@ -7671,11 +7830,6 @@ def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1EE4C, "X"),
         (0x1EE4D, "M", "ู†"),
         (0x1EE4E, "M", "ุณ"),
-    ]
-
-
-def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1EE4F, "M", "ุน"),
         (0x1EE50, "X"),
         (0x1EE51, "M", "ุต"),
@@ -7727,6 +7881,11 @@ def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1EE81, "M", "ุจ"),
         (0x1EE82, "M", "ุฌ"),
         (0x1EE83, "M", "ุฏ"),
+    ]
+
+
+def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1EE84, "M", "ู‡"),
         (0x1EE85, "M", "ูˆ"),
         (0x1EE86, "M", "ุฒ"),
@@ -7776,11 +7935,6 @@ def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1EEB6, "M", "ุซ"),
         (0x1EEB7, "M", "ุฎ"),
         (0x1EEB8, "M", "ุฐ"),
-    ]
-
-
-def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1EEB9, "M", "ุถ"),
         (0x1EEBA, "M", "ุธ"),
         (0x1EEBB, "M", "ุบ"),
@@ -7799,43 +7953,48 @@ def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1F0D0, "X"),
         (0x1F0D1, "V"),
         (0x1F0F6, "X"),
-        (0x1F101, "3", "0,"),
-        (0x1F102, "3", "1,"),
-        (0x1F103, "3", "2,"),
-        (0x1F104, "3", "3,"),
-        (0x1F105, "3", "4,"),
-        (0x1F106, "3", "5,"),
-        (0x1F107, "3", "6,"),
-        (0x1F108, "3", "7,"),
-        (0x1F109, "3", "8,"),
-        (0x1F10A, "3", "9,"),
+        (0x1F101, "M", "0,"),
+        (0x1F102, "M", "1,"),
+        (0x1F103, "M", "2,"),
+        (0x1F104, "M", "3,"),
+        (0x1F105, "M", "4,"),
+        (0x1F106, "M", "5,"),
+        (0x1F107, "M", "6,"),
+        (0x1F108, "M", "7,"),
+        (0x1F109, "M", "8,"),
+        (0x1F10A, "M", "9,"),
         (0x1F10B, "V"),
-        (0x1F110, "3", "(a)"),
-        (0x1F111, "3", "(b)"),
-        (0x1F112, "3", "(c)"),
-        (0x1F113, "3", "(d)"),
-        (0x1F114, "3", "(e)"),
-        (0x1F115, "3", "(f)"),
-        (0x1F116, "3", "(g)"),
-        (0x1F117, "3", "(h)"),
-        (0x1F118, "3", "(i)"),
-        (0x1F119, "3", "(j)"),
-        (0x1F11A, "3", "(k)"),
-        (0x1F11B, "3", "(l)"),
-        (0x1F11C, "3", "(m)"),
-        (0x1F11D, "3", "(n)"),
-        (0x1F11E, "3", "(o)"),
-        (0x1F11F, "3", "(p)"),
-        (0x1F120, "3", "(q)"),
-        (0x1F121, "3", "(r)"),
-        (0x1F122, "3", "(s)"),
-        (0x1F123, "3", "(t)"),
-        (0x1F124, "3", "(u)"),
-        (0x1F125, "3", "(v)"),
-        (0x1F126, "3", "(w)"),
-        (0x1F127, "3", "(x)"),
-        (0x1F128, "3", "(y)"),
-        (0x1F129, "3", "(z)"),
+        (0x1F110, "M", "(a)"),
+        (0x1F111, "M", "(b)"),
+        (0x1F112, "M", "(c)"),
+        (0x1F113, "M", "(d)"),
+        (0x1F114, "M", "(e)"),
+        (0x1F115, "M", "(f)"),
+        (0x1F116, "M", "(g)"),
+        (0x1F117, "M", "(h)"),
+        (0x1F118, "M", "(i)"),
+        (0x1F119, "M", "(j)"),
+        (0x1F11A, "M", "(k)"),
+        (0x1F11B, "M", "(l)"),
+        (0x1F11C, "M", "(m)"),
+        (0x1F11D, "M", "(n)"),
+        (0x1F11E, "M", "(o)"),
+        (0x1F11F, "M", "(p)"),
+        (0x1F120, "M", "(q)"),
+        (0x1F121, "M", "(r)"),
+        (0x1F122, "M", "(s)"),
+        (0x1F123, "M", "(t)"),
+        (0x1F124, "M", "(u)"),
+        (0x1F125, "M", "(v)"),
+    ]
+
+
+def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
+        (0x1F126, "M", "(w)"),
+        (0x1F127, "M", "(x)"),
+        (0x1F128, "M", "(y)"),
+        (0x1F129, "M", "(z)"),
         (0x1F12A, "M", "ใ€”sใ€•"),
         (0x1F12B, "M", "c"),
         (0x1F12C, "M", "r"),
@@ -7881,11 +8040,6 @@ def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1F16D, "V"),
         (0x1F190, "M", "dj"),
         (0x1F191, "V"),
-    ]
-
-
-def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x1F1AE, "X"),
         (0x1F1E6, "V"),
         (0x1F200, "M", "ใปใ‹"),
@@ -7937,6 +8091,11 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1F23A, "M", "ๅ–ถ"),
         (0x1F23B, "M", "้…"),
         (0x1F23C, "X"),
+    ]
+
+
+def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x1F240, "M", "ใ€”ๆœฌใ€•"),
         (0x1F241, "M", "ใ€”ไธ‰ใ€•"),
         (0x1F242, "M", "ใ€”ไบŒใ€•"),
@@ -7977,7 +8136,9 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1F890, "V"),
         (0x1F8AE, "X"),
         (0x1F8B0, "V"),
-        (0x1F8B2, "X"),
+        (0x1F8BC, "X"),
+        (0x1F8C0, "V"),
+        (0x1F8C2, "X"),
         (0x1F900, "V"),
         (0x1FA54, "X"),
         (0x1FA60, "V"),
@@ -7985,26 +8146,18 @@ def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x1FA70, "V"),
         (0x1FA7D, "X"),
         (0x1FA80, "V"),
-        (0x1FA89, "X"),
-    ]
-
-
-def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1FA90, "V"),
-        (0x1FABE, "X"),
-        (0x1FABF, "V"),
-        (0x1FAC6, "X"),
+        (0x1FA8A, "X"),
+        (0x1FA8F, "V"),
+        (0x1FAC7, "X"),
         (0x1FACE, "V"),
-        (0x1FADC, "X"),
-        (0x1FAE0, "V"),
-        (0x1FAE9, "X"),
+        (0x1FADD, "X"),
+        (0x1FADF, "V"),
+        (0x1FAEA, "X"),
         (0x1FAF0, "V"),
         (0x1FAF9, "X"),
         (0x1FB00, "V"),
         (0x1FB93, "X"),
         (0x1FB94, "V"),
-        (0x1FBCB, "X"),
         (0x1FBF0, "M", "0"),
         (0x1FBF1, "M", "1"),
         (0x1FBF2, "M", "2"),
@@ -8043,6 +8196,11 @@ def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F80C, "M", "ใ’ž"),
         (0x2F80D, "M", "๐ ˜บ"),
         (0x2F80E, "M", "ๅ…"),
+    ]
+
+
+def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2F80F, "M", "ๅ…”"),
         (0x2F810, "M", "ๅ…ค"),
         (0x2F811, "M", "ๅ…ท"),
@@ -8091,11 +8249,6 @@ def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F83E, "M", "ๅ‘ˆ"),
         (0x2F83F, "M", "ๅ‘จ"),
         (0x2F840, "M", "ๅ’ข"),
-    ]
-
-
-def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F841, "M", "ๅ“ถ"),
         (0x2F842, "M", "ๅ”"),
         (0x2F843, "M", "ๅ•“"),
@@ -8134,7 +8287,7 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F865, "M", "ๅง˜"),
         (0x2F866, "M", "ๅฉฆ"),
         (0x2F867, "M", "ใ›ฎ"),
-        (0x2F868, "X"),
+        (0x2F868, "M", "ใ›ผ"),
         (0x2F869, "M", "ๅฌˆ"),
         (0x2F86A, "M", "ๅฌพ"),
         (0x2F86C, "M", "๐กงˆ"),
@@ -8145,9 +8298,14 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F871, "M", "๐กฌ˜"),
         (0x2F872, "M", "ๅฏฟ"),
         (0x2F873, "M", "ๅฐ†"),
-        (0x2F874, "X"),
+        (0x2F874, "M", "ๅฝ“"),
         (0x2F875, "M", "ๅฐข"),
         (0x2F876, "M", "ใž"),
+    ]
+
+
+def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2F877, "M", "ๅฑ "),
         (0x2F878, "M", "ๅฑฎ"),
         (0x2F879, "M", "ๅณ€"),
@@ -8196,11 +8354,6 @@ def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F8A6, "M", "ๆ…ˆ"),
         (0x2F8A7, "M", "ๆ…Œ"),
         (0x2F8A8, "M", "ๆ…Ž"),
-    ]
-
-
-def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F8A9, "M", "ๆ…Œ"),
         (0x2F8AA, "M", "ๆ…บ"),
         (0x2F8AB, "M", "ๆ†Ž"),
@@ -8253,6 +8406,11 @@ def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F8DA, "M", "ๆœก"),
         (0x2F8DB, "M", "ๆž"),
         (0x2F8DC, "M", "ๆ“"),
+    ]
+
+
+def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2F8DD, "M", "๐ฃƒ"),
         (0x2F8DE, "M", "ใญ‰"),
         (0x2F8DF, "M", "ๆŸบ"),
@@ -8301,11 +8459,6 @@ def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F90A, "M", "ใดณ"),
         (0x2F90B, "M", "ๆป‹"),
         (0x2F90C, "M", "ๆป‡"),
-    ]
-
-
-def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F90D, "M", "๐ฃป‘"),
         (0x2F90E, "M", "ๆทน"),
         (0x2F90F, "M", "ๆฝฎ"),
@@ -8324,7 +8477,7 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F91C, "M", "็……"),
         (0x2F91D, "M", "๐ค‰ฃ"),
         (0x2F91E, "M", "็†œ"),
-        (0x2F91F, "X"),
+        (0x2F91F, "M", "๐คŽซ"),
         (0x2F920, "M", "็ˆจ"),
         (0x2F921, "M", "็ˆต"),
         (0x2F922, "M", "็‰"),
@@ -8358,6 +8511,11 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F93F, "M", "ไ€ˆ"),
         (0x2F940, "M", "็›ด"),
         (0x2F941, "M", "๐ฅƒณ"),
+    ]
+
+
+def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2F942, "M", "๐ฅƒฒ"),
         (0x2F943, "M", "๐ฅ„™"),
         (0x2F944, "M", "๐ฅ„ณ"),
@@ -8385,7 +8543,7 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F95B, "M", "็ฉ"),
         (0x2F95C, "M", "๐ฅฅผ"),
         (0x2F95D, "M", "๐ฅชง"),
-        (0x2F95F, "X"),
+        (0x2F95F, "M", "็ซฎ"),
         (0x2F960, "M", "ไˆ‚"),
         (0x2F961, "M", "๐ฅฎซ"),
         (0x2F962, "M", "็ฏ†"),
@@ -8406,11 +8564,6 @@ def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F971, "M", "ไŒด"),
         (0x2F972, "M", "๐ฆˆจ"),
         (0x2F973, "M", "๐ฆ‰‡"),
-    ]
-
-
-def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F974, "M", "ไ™"),
         (0x2F975, "M", "๐ฆ‹™"),
         (0x2F976, "M", "็ฝบ"),
@@ -8463,6 +8616,11 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F9A5, "M", "๐ฆตซ"),
         (0x2F9A6, "M", "๐ฆณ•"),
         (0x2F9A7, "M", "ไ”ซ"),
+    ]
+
+
+def _seg_82() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2F9A8, "M", "่“ฑ"),
         (0x2F9A9, "M", "่“ณ"),
         (0x2F9AA, "M", "่”–"),
@@ -8486,7 +8644,7 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F9BC, "M", "่œจ"),
         (0x2F9BD, "M", "่ซ"),
         (0x2F9BE, "M", "่ž†"),
-        (0x2F9BF, "X"),
+        (0x2F9BF, "M", "ไ——"),
         (0x2F9C0, "M", "่Ÿก"),
         (0x2F9C1, "M", "่ "),
         (0x2F9C2, "M", "ไ—น"),
@@ -8511,11 +8669,6 @@ def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2F9D5, "M", "่ณ"),
         (0x2F9D6, "M", "่ด›"),
         (0x2F9D7, "M", "่ตท"),
-    ]
-
-
-def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
         (0x2F9D8, "M", "๐งผฏ"),
         (0x2F9D9, "M", "๐  „"),
         (0x2F9DA, "M", "่ท‹"),
@@ -8568,6 +8721,11 @@ def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
         (0x2FA0A, "M", "้ฌ’"),
         (0x2FA0B, "M", "้ฑ€"),
         (0x2FA0C, "M", "้ณฝ"),
+    ]
+
+
+def _seg_83() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
+    return [
         (0x2FA0D, "M", "ไณŽ"),
         (0x2FA0E, "M", "ไณญ"),
         (0x2FA0F, "M", "้ตง"),
@@ -8678,4 +8836,6 @@ def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
     + _seg_79()
     + _seg_80()
     + _seg_81()
+    + _seg_82()
+    + _seg_83()
 )  # type: Tuple[Union[Tuple[int, str], Tuple[int, str, str]], ...]
diff --git a/libs/importlib_metadata-7.2.1.dist-info/METADATA b/libs/importlib_metadata-7.2.1.dist-info/METADATA
index 7ba1967b19..0430715c61 100644
--- a/libs/importlib_metadata-7.2.1.dist-info/METADATA
+++ b/libs/importlib_metadata-7.2.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: importlib_metadata
 Version: 7.2.1
 Summary: Read metadata from Python packages
@@ -12,30 +12,31 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: zipp >=0.5
-Requires-Dist: typing-extensions >=3.6.4 ; python_version < "3.8"
+Requires-Dist: zipp>=0.5
+Requires-Dist: typing-extensions>=3.6.4; python_version < "3.8"
+Provides-Extra: test
+Requires-Dist: pytest!=8.1.*,>=6; extra == "test"
+Requires-Dist: pytest-checkdocs>=2.4; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-mypy; extra == "test"
+Requires-Dist: pytest-enabler>=2.2; extra == "test"
+Requires-Dist: pytest-ruff>=0.2.1; extra == "test"
+Requires-Dist: importlib_resources>=1.3; python_version < "3.9" and extra == "test"
+Requires-Dist: packaging; extra == "test"
+Requires-Dist: pyfakefs; extra == "test"
+Requires-Dist: flufl.flake8; extra == "test"
+Requires-Dist: pytest-perf>=0.9.2; extra == "test"
+Requires-Dist: jaraco.test>=5.4; extra == "test"
 Provides-Extra: doc
-Requires-Dist: sphinx >=3.5 ; extra == 'doc'
-Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
-Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
-Requires-Dist: furo ; extra == 'doc'
-Requires-Dist: sphinx-lint ; extra == 'doc'
-Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
+Requires-Dist: sphinx>=3.5; extra == "doc"
+Requires-Dist: jaraco.packaging>=9.3; extra == "doc"
+Requires-Dist: rst.linker>=1.9; extra == "doc"
+Requires-Dist: furo; extra == "doc"
+Requires-Dist: sphinx-lint; extra == "doc"
+Requires-Dist: jaraco.tidelift>=1.4; extra == "doc"
 Provides-Extra: perf
-Requires-Dist: ipython ; extra == 'perf'
-Provides-Extra: test
-Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
-Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'test'
-Requires-Dist: pytest-cov ; extra == 'test'
-Requires-Dist: pytest-mypy ; extra == 'test'
-Requires-Dist: pytest-enabler >=2.2 ; extra == 'test'
-Requires-Dist: pytest-ruff >=0.2.1 ; extra == 'test'
-Requires-Dist: packaging ; extra == 'test'
-Requires-Dist: pyfakefs ; extra == 'test'
-Requires-Dist: flufl.flake8 ; extra == 'test'
-Requires-Dist: pytest-perf >=0.9.2 ; extra == 'test'
-Requires-Dist: jaraco.test >=5.4 ; extra == 'test'
-Requires-Dist: importlib-resources >=1.3 ; (python_version < "3.9") and extra == 'test'
+Requires-Dist: ipython; extra == "perf"
+Dynamic: license-file
 
 .. image:: https://img.shields.io/pypi/v/importlib_metadata.svg
    :target: https://pypi.org/project/importlib_metadata
diff --git a/libs/importlib_metadata-7.2.1.dist-info/RECORD b/libs/importlib_metadata-7.2.1.dist-info/RECORD
index 7f1c16f510..0c8461b410 100644
--- a/libs/importlib_metadata-7.2.1.dist-info/RECORD
+++ b/libs/importlib_metadata-7.2.1.dist-info/RECORD
@@ -1,9 +1,9 @@
 importlib_metadata-7.2.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-importlib_metadata-7.2.1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-importlib_metadata-7.2.1.dist-info/METADATA,sha256=hEvctiPIb3ke8xTdUeHrdh7Hwa4T-nC_ugLZyvSFLB0,4648
+importlib_metadata-7.2.1.dist-info/METADATA,sha256=i36K7jtn_3ETHXbBeNliQwqrtZLFV-Zk-XJofXOQga0,4635
 importlib_metadata-7.2.1.dist-info/RECORD,,
 importlib_metadata-7.2.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_metadata-7.2.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+importlib_metadata-7.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+importlib_metadata-7.2.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
 importlib_metadata-7.2.1.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
 importlib_metadata/__init__.py,sha256=tIqhoBxCohAGl-SpQsRoRiUo4rP_tt5vl5bgP0k_v80,34411
 importlib_metadata/_adapters.py,sha256=jZr_CmHrl8qTGatO0yMmuOdfFExOY64G8eEYf6Cnj9k,2455
diff --git a/libs/importlib_metadata-7.2.1.dist-info/WHEEL b/libs/importlib_metadata-7.2.1.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/importlib_metadata-7.2.1.dist-info/WHEEL
+++ b/libs/importlib_metadata-7.2.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/importlib_metadata-7.2.1.dist-info/LICENSE b/libs/importlib_metadata-7.2.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/importlib_metadata-7.2.1.dist-info/LICENSE
rename to libs/importlib_metadata-7.2.1.dist-info/licenses/LICENSE
diff --git a/libs/importlib_resources-6.4.5.dist-info/METADATA b/libs/importlib_resources-6.4.5.dist-info/METADATA
deleted file mode 100644
index 1ee4166c16..0000000000
--- a/libs/importlib_resources-6.4.5.dist-info/METADATA
+++ /dev/null
@@ -1,103 +0,0 @@
-Metadata-Version: 2.1
-Name: importlib_resources
-Version: 6.4.5
-Summary: Read resources from Python packages
-Author-email: Barry Warsaw <barry@python.org>
-Maintainer-email: "Jason R. Coombs" <jaraco@jaraco.com>
-Project-URL: Source, https://github.com/python/importlib_resources
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: zipp >=3.1.0 ; python_version < "3.10"
-Provides-Extra: check
-Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'check'
-Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'check'
-Provides-Extra: cover
-Requires-Dist: pytest-cov ; extra == 'cover'
-Provides-Extra: doc
-Requires-Dist: sphinx >=3.5 ; extra == 'doc'
-Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
-Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
-Requires-Dist: furo ; extra == 'doc'
-Requires-Dist: sphinx-lint ; extra == 'doc'
-Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
-Provides-Extra: enabler
-Requires-Dist: pytest-enabler >=2.2 ; extra == 'enabler'
-Provides-Extra: test
-Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
-Requires-Dist: zipp >=3.17 ; extra == 'test'
-Requires-Dist: jaraco.test >=5.4 ; extra == 'test'
-Provides-Extra: type
-Requires-Dist: pytest-mypy ; extra == 'type'
-
-.. image:: https://img.shields.io/pypi/v/importlib_resources.svg
-   :target: https://pypi.org/project/importlib_resources
-
-.. image:: https://img.shields.io/pypi/pyversions/importlib_resources.svg
-
-.. image:: https://github.com/python/importlib_resources/actions/workflows/main.yml/badge.svg
-   :target: https://github.com/python/importlib_resources/actions?query=workflow%3A%22tests%22
-   :alt: tests
-
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
-    :target: https://github.com/astral-sh/ruff
-    :alt: Ruff
-
-.. image:: https://readthedocs.org/projects/importlib-resources/badge/?version=latest
-   :target: https://importlib-resources.readthedocs.io/en/latest/?badge=latest
-
-.. image:: https://img.shields.io/badge/skeleton-2024-informational
-   :target: https://blog.jaraco.com/skeleton
-
-.. image:: https://tidelift.com/badges/package/pypi/importlib-resources
-   :target: https://tidelift.com/subscription/pkg/pypi-importlib-resources?utm_source=pypi-importlib-resources&utm_medium=readme
-
-``importlib_resources`` is a backport of Python standard library
-`importlib.resources
-<https://docs.python.org/3/library/importlib.html#module-importlib.resources>`_
-module for older Pythons.
-
-The key goal of this module is to replace parts of `pkg_resources
-<https://setuptools.readthedocs.io/en/latest/pkg_resources.html>`_ with a
-solution in Python's stdlib that relies on well-defined APIs.  This makes
-reading resources included in packages easier, with more stable and consistent
-semantics.
-
-Compatibility
-=============
-
-New features are introduced in this third-party library and later merged
-into CPython. The following table indicates which versions of this library
-were contributed to different versions in the standard library:
-
-.. list-table::
-   :header-rows: 1
-
-   * - importlib_resources
-     - stdlib
-   * - 6.0
-     - 3.13
-   * - 5.12
-     - 3.12
-   * - 5.7
-     - 3.11
-   * - 5.0
-     - 3.10
-   * - 1.3
-     - 3.9
-   * - 0.5 (?)
-     - 3.7
-
-For Enterprise
-==============
-
-Available as part of the Tidelift Subscription.
-
-This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
-
-`Learn more <https://tidelift.com/subscription/pkg/pypi-importlib-resources?utm_source=pypi-importlib-resources&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/importlib_resources-6.4.5.dist-info/RECORD b/libs/importlib_resources-6.4.5.dist-info/RECORD
deleted file mode 100644
index 2883b0ad3c..0000000000
--- a/libs/importlib_resources-6.4.5.dist-info/RECORD
+++ /dev/null
@@ -1,38 +0,0 @@
-importlib_resources-6.4.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-importlib_resources-6.4.5.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-importlib_resources-6.4.5.dist-info/METADATA,sha256=iwGfOzcc9jUBSuQa6zQeXla0el4YCZlAoj5uRIm7fyg,3975
-importlib_resources-6.4.5.dist-info/RECORD,,
-importlib_resources-6.4.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources-6.4.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-importlib_resources-6.4.5.dist-info/top_level.txt,sha256=fHIjHU1GZwAjvcydpmUnUrTnbvdiWjG4OEVZK8by0TQ,20
-importlib_resources/__init__.py,sha256=3J-261Qqzg-1kBenMVsOsvJo19EbUmYqjHkrZWiFHOM,703
-importlib_resources/_adapters.py,sha256=vprJGbUeHbajX6XCuMP6J3lMrqCi-P_MTlziJUR7jfk,4482
-importlib_resources/_common.py,sha256=5PVT4ezn_Ptj7LIAebtLYquK7A6X4EYoQJM37yTBdbQ,5624
-importlib_resources/_functional.py,sha256=mLU4DwSlh8_2IXWqwKOfPVxyRqAEpB3B4XTfRxr3X3M,2651
-importlib_resources/_itertools.py,sha256=eDisV6RqiNZOogLSXf6LOGHOYc79FGgPrKNLzFLmCrU,1277
-importlib_resources/abc.py,sha256=UKNU9ncEDkZRB3txcGb3WLxsL2iju9JbaLTI-dfLE_4,5162
-importlib_resources/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/compat/py38.py,sha256=MWhut3XsAJwBYUaa5Qb2AoCrZNqcQjVThP-P1uBoE_4,230
-importlib_resources/compat/py39.py,sha256=KlP7QiD3NkoytWFjJgrJI33uRTw667vEDtkZWUtBDZM,152
-importlib_resources/future/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/future/adapters.py,sha256=1-MF2VRcCButhcC1OMfZILU9o3kwZ4nXB2lurXpaIAw,2940
-importlib_resources/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/readers.py,sha256=n9Rn8B5UHapkXGSfFhQNbdk_pfDCISPBLIXZnpoOKs8,6251
-importlib_resources/simple.py,sha256=wJm2qGZ9EMPFhRLiJBa9Em5tVKbD7Q8ibWtt4ZNgWBU,2590
-importlib_resources/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/_path.py,sha256=eqMTKkYA9Hc8_mzrVBN14HPuoc2HFNxuyTWqAo_2ZEM,2288
-importlib_resources/tests/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-importlib_resources/tests/compat/py312.py,sha256=qcWjpZhQo2oEsdwIlRRQHrsMGDltkFTnETeG7fLdUS8,364
-importlib_resources/tests/compat/py39.py,sha256=nOjut4CZDtRgZEblX9hWhupo9vli_CA1270_JwdQzRo,441
-importlib_resources/tests/test_compatibilty_files.py,sha256=95N_R7aik8cvnE6sBJpsxmP0K5plOWRIJDgbalD-Hpw,3314
-importlib_resources/tests/test_contents.py,sha256=EagRx9Mz7MOe1kRaOc9XNX_YlBYy90Qzhv2rqWMhMlw,837
-importlib_resources/tests/test_custom.py,sha256=QrHZqIWl0e-fsQRfm0ych8stOlKJOsAIU3rK6QOcyN0,1221
-importlib_resources/tests/test_files.py,sha256=4G4Wo4_2UJtpg9HrEKjRaXimM68lXKjkAmFY-9OLCyE,5796
-importlib_resources/tests/test_functional.py,sha256=DV8sdnwtpacNjHQ3ExifIoeQTCr4C-M-NVbaWewOcAo,8863
-importlib_resources/tests/test_open.py,sha256=eCDLP6SszzBK6vs5j6LDkuR0Y2rHXrTYNRVZsAFKnCQ,2681
-importlib_resources/tests/test_path.py,sha256=rz_BOqNzEu5ZRyrhAHOi9tvx3K_0AqHiRNkYT4QFhQw,1985
-importlib_resources/tests/test_read.py,sha256=oh0ZkCZ04N0DxPXgBLdadENwia4J0_sYt73uaH_I11g,3045
-importlib_resources/tests/test_reader.py,sha256=G62D2vkFjYSeFT6BFE-z_shUX8n7h80f089ojXCufBY,4655
-importlib_resources/tests/test_resource.py,sha256=ZxW6cIXJRwgvU7-wCc2jIRWV9M4pX4uznijN0vNfplM,7686
-importlib_resources/tests/util.py,sha256=CtY1uL-Xl71sw553ow2st6M5X710jf2jrhYAv6nhZ_Y,6065
-importlib_resources/tests/zip.py,sha256=nG9D6u_4nu67NrEUFfMt7vzba0qO_-QPyAAWc6W4gP4,577
diff --git a/libs/importlib_resources-6.4.5.dist-info/WHEEL b/libs/importlib_resources-6.4.5.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/importlib_resources-6.4.5.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/ffsubsync-0.4.27.dist-info/INSTALLER b/libs/importlib_resources-6.5.2.dist-info/INSTALLER
similarity index 100%
rename from libs/ffsubsync-0.4.27.dist-info/INSTALLER
rename to libs/importlib_resources-6.5.2.dist-info/INSTALLER
diff --git a/libs/importlib_resources-6.5.2.dist-info/METADATA b/libs/importlib_resources-6.5.2.dist-info/METADATA
new file mode 100644
index 0000000000..2952ea3f9b
--- /dev/null
+++ b/libs/importlib_resources-6.5.2.dist-info/METADATA
@@ -0,0 +1,104 @@
+Metadata-Version: 2.4
+Name: importlib_resources
+Version: 6.5.2
+Summary: Read resources from Python packages
+Author-email: Barry Warsaw <barry@python.org>
+Maintainer-email: "Jason R. Coombs" <jaraco@jaraco.com>
+Project-URL: Source, https://github.com/python/importlib_resources
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: zipp>=3.1.0; python_version < "3.10"
+Provides-Extra: test
+Requires-Dist: pytest!=8.1.*,>=6; extra == "test"
+Requires-Dist: zipp>=3.17; extra == "test"
+Requires-Dist: jaraco.test>=5.4; extra == "test"
+Provides-Extra: doc
+Requires-Dist: sphinx>=3.5; extra == "doc"
+Requires-Dist: jaraco.packaging>=9.3; extra == "doc"
+Requires-Dist: rst.linker>=1.9; extra == "doc"
+Requires-Dist: furo; extra == "doc"
+Requires-Dist: sphinx-lint; extra == "doc"
+Requires-Dist: jaraco.tidelift>=1.4; extra == "doc"
+Provides-Extra: check
+Requires-Dist: pytest-checkdocs>=2.4; extra == "check"
+Requires-Dist: pytest-ruff>=0.2.1; sys_platform != "cygwin" and extra == "check"
+Provides-Extra: cover
+Requires-Dist: pytest-cov; extra == "cover"
+Provides-Extra: enabler
+Requires-Dist: pytest-enabler>=2.2; extra == "enabler"
+Provides-Extra: type
+Requires-Dist: pytest-mypy; extra == "type"
+Dynamic: license-file
+
+.. image:: https://img.shields.io/pypi/v/importlib_resources.svg
+   :target: https://pypi.org/project/importlib_resources
+
+.. image:: https://img.shields.io/pypi/pyversions/importlib_resources.svg
+
+.. image:: https://github.com/python/importlib_resources/actions/workflows/main.yml/badge.svg
+   :target: https://github.com/python/importlib_resources/actions?query=workflow%3A%22tests%22
+   :alt: tests
+
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
+
+.. image:: https://readthedocs.org/projects/importlib-resources/badge/?version=latest
+   :target: https://importlib-resources.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://img.shields.io/badge/skeleton-2025-informational
+   :target: https://blog.jaraco.com/skeleton
+
+.. image:: https://tidelift.com/badges/package/pypi/importlib-resources
+   :target: https://tidelift.com/subscription/pkg/pypi-importlib-resources?utm_source=pypi-importlib-resources&utm_medium=readme
+
+``importlib_resources`` is a backport of Python standard library
+`importlib.resources
+<https://docs.python.org/3/library/importlib.html#module-importlib.resources>`_
+module for older Pythons.
+
+The key goal of this module is to replace parts of `pkg_resources
+<https://setuptools.readthedocs.io/en/latest/pkg_resources.html>`_ with a
+solution in Python's stdlib that relies on well-defined APIs.  This makes
+reading resources included in packages easier, with more stable and consistent
+semantics.
+
+Compatibility
+=============
+
+New features are introduced in this third-party library and later merged
+into CPython. The following table indicates which versions of this library
+were contributed to different versions in the standard library:
+
+.. list-table::
+   :header-rows: 1
+
+   * - importlib_resources
+     - stdlib
+   * - 6.0
+     - 3.13
+   * - 5.12
+     - 3.12
+   * - 5.7
+     - 3.11
+   * - 5.0
+     - 3.10
+   * - 1.3
+     - 3.9
+   * - 0.5 (?)
+     - 3.7
+
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-importlib-resources?utm_source=pypi-importlib-resources&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/importlib_resources-6.5.2.dist-info/RECORD b/libs/importlib_resources-6.5.2.dist-info/RECORD
new file mode 100644
index 0000000000..c88b474189
--- /dev/null
+++ b/libs/importlib_resources-6.5.2.dist-info/RECORD
@@ -0,0 +1,38 @@
+importlib_resources-6.5.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+importlib_resources-6.5.2.dist-info/METADATA,sha256=snGqWHAR2n2pnsjqoCMZsTjVhV5B3kqZ9z4cHa31Bzo,3969
+importlib_resources-6.5.2.dist-info/RECORD,,
+importlib_resources-6.5.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_resources-6.5.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+importlib_resources-6.5.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+importlib_resources-6.5.2.dist-info/top_level.txt,sha256=fHIjHU1GZwAjvcydpmUnUrTnbvdiWjG4OEVZK8by0TQ,20
+importlib_resources/__init__.py,sha256=F6SOMZILiez96lK3h9duE_c5kRTEydzHvI6D7TRcOJE,700
+importlib_resources/_adapters.py,sha256=vprJGbUeHbajX6XCuMP6J3lMrqCi-P_MTlziJUR7jfk,4482
+importlib_resources/_common.py,sha256=Vfmmdk5ICrZ8odgfWEuUHG-P7ZbJ-5x3pRLCVwVk8Tg,5624
+importlib_resources/_functional.py,sha256=nMop9Zc7g1Yhiyk5oqr9ukvfJcOx4vnvqD7nh24hV7Y,2743
+importlib_resources/_itertools.py,sha256=eDisV6RqiNZOogLSXf6LOGHOYc79FGgPrKNLzFLmCrU,1277
+importlib_resources/abc.py,sha256=inhYsYj6LrYHn4kCraZq8zqXFQnDX4stNnLTruhf6NU,5549
+importlib_resources/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_resources/compat/py39.py,sha256=gx5NE25XH1pQrTRJDY7QJUngZpD7OotsK9F6pZy5KjM,151
+importlib_resources/future/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_resources/future/adapters.py,sha256=UFIMxEuLo4PqcVbtoV3e_k9BcxCS-mmG22f8U2Vtkx4,3285
+importlib_resources/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_resources/readers.py,sha256=uHf9X-smA3CtxdB9IHWH0z-O53379wlcEMmzA2UXzqE,6250
+importlib_resources/simple.py,sha256=wJm2qGZ9EMPFhRLiJBa9Em5tVKbD7Q8ibWtt4ZNgWBU,2590
+importlib_resources/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_resources/tests/_path.py,sha256=IK3o6J_4UaN-4DPuwKr0lOb2KWpoUjwIyQkOtGqZWzs,2250
+importlib_resources/tests/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+importlib_resources/tests/compat/py312.py,sha256=qcWjpZhQo2oEsdwIlRRQHrsMGDltkFTnETeG7fLdUS8,364
+importlib_resources/tests/compat/py39.py,sha256=nOjut4CZDtRgZEblX9hWhupo9vli_CA1270_JwdQzRo,441
+importlib_resources/tests/test_compatibilty_files.py,sha256=cOLwa5kU6ucxNfiNsAQSpLHCE8asuqAHui6Aw9mxKX8,3313
+importlib_resources/tests/test_contents.py,sha256=r8kVH1k7DHrco2JVTUMCbsWK0JvvjKt0zgrmH56c4Vg,838
+importlib_resources/tests/test_custom.py,sha256=ep5mGT6uT6O1gPdM-b3mXo9HWDnCLD90uc4H1bU68oI,1222
+importlib_resources/tests/test_files.py,sha256=u4vMrXPpaWGJY8DyFJBkgg78lr_l9sfjzatP_7mkn88,5741
+importlib_resources/tests/test_functional.py,sha256=B3cFWFztSkMh4Y58MyOex_lcEooIPR-ezTaA9xzI6Y4,9070
+importlib_resources/tests/test_open.py,sha256=dT-cZmJoGbMMIVVWkNXt8KUxWcQn9Cd0emb85U4CiBA,2682
+importlib_resources/tests/test_path.py,sha256=orETYbmGyYNgXA8Dslj9MM3XjGUDRW8u4dJhIBy0qdU,1986
+importlib_resources/tests/test_read.py,sha256=o3uXJCUTYmUZeaFoQyXeRxTPpwhbjgRz-aALAg_btz8,3046
+importlib_resources/tests/test_reader.py,sha256=1RFB-rJs1hCDSy6qgv2z3LDm42gbQmj2n718CCdn1JY,4655
+importlib_resources/tests/test_resource.py,sha256=ZgpXCuYs4GZpSCElJyhZlMkb8oOfMZX1cnPLoinzis0,7687
+importlib_resources/tests/test_util.py,sha256=VotLNbngOyFg03FKVTzIZKd4Gz4UO-dMEr0G-vHMiuI,1105
+importlib_resources/tests/util.py,sha256=PKybGEyCo53mMu7A-5vC6n0e3nc9R8DS2NtvO-JCyxY,9804
+importlib_resources/tests/zip.py,sha256=nG9D6u_4nu67NrEUFfMt7vzba0qO_-QPyAAWc6W4gP4,577
diff --git a/libs/flask-3.0.3.dist-info/REQUESTED b/libs/importlib_resources-6.5.2.dist-info/REQUESTED
similarity index 100%
rename from libs/flask-3.0.3.dist-info/REQUESTED
rename to libs/importlib_resources-6.5.2.dist-info/REQUESTED
diff --git a/libs/importlib_resources-6.5.2.dist-info/WHEEL b/libs/importlib_resources-6.5.2.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/importlib_resources-6.5.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/importlib_resources-6.4.5.dist-info/LICENSE b/libs/importlib_resources-6.5.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/importlib_resources-6.4.5.dist-info/LICENSE
rename to libs/importlib_resources-6.5.2.dist-info/licenses/LICENSE
diff --git a/libs/importlib_resources-6.4.5.dist-info/top_level.txt b/libs/importlib_resources-6.5.2.dist-info/top_level.txt
similarity index 100%
rename from libs/importlib_resources-6.4.5.dist-info/top_level.txt
rename to libs/importlib_resources-6.5.2.dist-info/top_level.txt
diff --git a/libs/importlib_resources/__init__.py b/libs/importlib_resources/__init__.py
index 723c9f9eb3..27d6c7f893 100644
--- a/libs/importlib_resources/__init__.py
+++ b/libs/importlib_resources/__init__.py
@@ -8,12 +8,11 @@
 """
 
 from ._common import (
+    Anchor,
+    Package,
     as_file,
     files,
-    Package,
-    Anchor,
 )
-
 from ._functional import (
     contents,
     is_resource,
@@ -23,10 +22,8 @@
     read_binary,
     read_text,
 )
-
 from .abc import ResourceReader
 
-
 __all__ = [
     'Package',
     'Anchor',
diff --git a/libs/importlib_resources/_common.py b/libs/importlib_resources/_common.py
index f065d493fb..5f41c26528 100644
--- a/libs/importlib_resources/_common.py
+++ b/libs/importlib_resources/_common.py
@@ -1,15 +1,15 @@
+import contextlib
+import functools
+import importlib
+import inspect
+import itertools
 import os
 import pathlib
 import tempfile
-import functools
-import contextlib
 import types
-import importlib
-import inspect
 import warnings
-import itertools
+from typing import Optional, Union, cast
 
-from typing import Union, Optional, cast
 from .abc import ResourceReader, Traversable
 
 Package = Union[types.ModuleType, str]
diff --git a/libs/importlib_resources/_functional.py b/libs/importlib_resources/_functional.py
index f59416f2dd..b08a5c6efe 100644
--- a/libs/importlib_resources/_functional.py
+++ b/libs/importlib_resources/_functional.py
@@ -2,8 +2,8 @@
 
 import warnings
 
-from ._common import files, as_file
-
+from ._common import as_file, files
+from .abc import TraversalError
 
 _MISSING = object()
 
@@ -42,7 +42,10 @@ def is_resource(anchor, *path_names):
 
     Otherwise returns ``False``.
     """
-    return _get_resource(anchor, path_names).is_file()
+    try:
+        return _get_resource(anchor, path_names).is_file()
+    except TraversalError:
+        return False
 
 
 def contents(anchor, *path_names):
diff --git a/libs/importlib_resources/abc.py b/libs/importlib_resources/abc.py
index 7a58dd2f96..883d332836 100644
--- a/libs/importlib_resources/abc.py
+++ b/libs/importlib_resources/abc.py
@@ -1,12 +1,24 @@
 import abc
-import io
 import itertools
+import os
 import pathlib
-from typing import Any, BinaryIO, Iterable, Iterator, NoReturn, Text, Optional
-from typing import runtime_checkable, Protocol
-
-from .compat.py38 import StrPath
-
+from typing import (
+    Any,
+    BinaryIO,
+    Iterable,
+    Iterator,
+    NoReturn,
+    Literal,
+    Optional,
+    Protocol,
+    Text,
+    TextIO,
+    Union,
+    overload,
+    runtime_checkable,
+)
+
+StrPath = Union[str, os.PathLike[str]]
 
 __all__ = ["ResourceReader", "Traversable", "TraversableResources"]
 
@@ -80,11 +92,13 @@ def read_bytes(self) -> bytes:
         with self.open('rb') as strm:
             return strm.read()
 
-    def read_text(self, encoding: Optional[str] = None) -> str:
+    def read_text(
+        self, encoding: Optional[str] = None, errors: Optional[str] = None
+    ) -> str:
         """
         Read contents of self as text
         """
-        with self.open(encoding=encoding) as strm:
+        with self.open(encoding=encoding, errors=errors) as strm:
             return strm.read()
 
     @abc.abstractmethod
@@ -130,8 +144,16 @@ def __truediv__(self, child: StrPath) -> "Traversable":
         """
         return self.joinpath(child)
 
+    @overload
+    def open(self, mode: Literal['r'] = 'r', *args: Any, **kwargs: Any) -> TextIO: ...
+
+    @overload
+    def open(self, mode: Literal['rb'], *args: Any, **kwargs: Any) -> BinaryIO: ...
+
     @abc.abstractmethod
-    def open(self, mode='r', *args, **kwargs):
+    def open(
+        self, mode: str = 'r', *args: Any, **kwargs: Any
+    ) -> Union[TextIO, BinaryIO]:
         """
         mode may be 'r' or 'rb' to open as text or binary. Return a handle
         suitable for reading (same as pathlib.Path.open).
@@ -158,7 +180,7 @@ class TraversableResources(ResourceReader):
     def files(self) -> "Traversable":
         """Return a Traversable object for the loaded package."""
 
-    def open_resource(self, resource: StrPath) -> io.BufferedReader:
+    def open_resource(self, resource: StrPath) -> BinaryIO:
         return self.files().joinpath(resource).open('rb')
 
     def resource_path(self, resource: Any) -> NoReturn:
diff --git a/libs/importlib_resources/compat/py38.py b/libs/importlib_resources/compat/py38.py
deleted file mode 100644
index 4d548257f8..0000000000
--- a/libs/importlib_resources/compat/py38.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import os
-import sys
-
-from typing import Union
-
-
-if sys.version_info >= (3, 9):
-    StrPath = Union[str, os.PathLike[str]]
-else:
-    # PathLike is only subscriptable at runtime in 3.9+
-    StrPath = Union[str, "os.PathLike[str]"]
diff --git a/libs/importlib_resources/compat/py39.py b/libs/importlib_resources/compat/py39.py
index ed5abd5e58..684d3c6383 100644
--- a/libs/importlib_resources/compat/py39.py
+++ b/libs/importlib_resources/compat/py39.py
@@ -1,6 +1,5 @@
 import sys
 
-
 __all__ = ['ZipPath']
 
 
diff --git a/libs/importlib_resources/future/adapters.py b/libs/importlib_resources/future/adapters.py
index 0e9764bae8..239e52b795 100644
--- a/libs/importlib_resources/future/adapters.py
+++ b/libs/importlib_resources/future/adapters.py
@@ -3,7 +3,7 @@
 from contextlib import suppress
 from types import SimpleNamespace
 
-from .. import readers, _adapters
+from .. import _adapters, readers
 
 
 def _block_standard(reader_getter):
@@ -23,6 +23,13 @@ def wrapper(*args, **kwargs):
         except NotADirectoryError:
             # MultiplexedPath may fail on zip subdirectory
             return
+        except ValueError as exc:
+            # NamespaceReader in stdlib may fail for editable installs
+            # (python/importlib_resources#311, python/importlib_resources#318)
+            # Remove after bugfix applied to Python 3.13.
+            if "not enough values to unpack" not in str(exc):
+                raise
+            return
         # Python 3.10+
         mod_name = reader.__class__.__module__
         if mod_name.startswith('importlib.') and mod_name.endswith('readers'):
diff --git a/libs/importlib_resources/readers.py b/libs/importlib_resources/readers.py
index 4f761c64b5..99884b6af9 100644
--- a/libs/importlib_resources/readers.py
+++ b/libs/importlib_resources/readers.py
@@ -3,14 +3,13 @@
 import collections
 import contextlib
 import itertools
-import pathlib
 import operator
+import pathlib
 import re
 import warnings
 from collections.abc import Iterator
 
 from . import abc
-
 from ._itertools import only
 from .compat.py39 import ZipPath
 
diff --git a/libs/importlib_resources/tests/_path.py b/libs/importlib_resources/tests/_path.py
index b144628cb7..0033983dc6 100644
--- a/libs/importlib_resources/tests/_path.py
+++ b/libs/importlib_resources/tests/_path.py
@@ -1,10 +1,6 @@
-import pathlib
 import functools
-
-from typing import Dict, Union
-from typing import runtime_checkable
-from typing import Protocol
-
+import pathlib
+from typing import Dict, Protocol, Union, runtime_checkable
 
 ####
 # from jaraco.path 3.7.1
diff --git a/libs/importlib_resources/tests/test_compatibilty_files.py b/libs/importlib_resources/tests/test_compatibilty_files.py
index 13ad0dfb21..e8aac28415 100644
--- a/libs/importlib_resources/tests/test_compatibilty_files.py
+++ b/libs/importlib_resources/tests/test_compatibilty_files.py
@@ -2,7 +2,6 @@
 import unittest
 
 import importlib_resources as resources
-
 from importlib_resources._adapters import (
     CompatibilityFiles,
     wrap_spec,
diff --git a/libs/importlib_resources/tests/test_contents.py b/libs/importlib_resources/tests/test_contents.py
index 741a740761..dcb872ec05 100644
--- a/libs/importlib_resources/tests/test_contents.py
+++ b/libs/importlib_resources/tests/test_contents.py
@@ -1,4 +1,5 @@
 import unittest
+
 import importlib_resources as resources
 
 from . import util
diff --git a/libs/importlib_resources/tests/test_custom.py b/libs/importlib_resources/tests/test_custom.py
index 86c65676f1..25ae0e7578 100644
--- a/libs/importlib_resources/tests/test_custom.py
+++ b/libs/importlib_resources/tests/test_custom.py
@@ -1,10 +1,11 @@
-import unittest
 import contextlib
 import pathlib
+import unittest
 
 import importlib_resources as resources
+
 from .. import abc
-from ..abc import TraversableResources, ResourceReader
+from ..abc import ResourceReader, TraversableResources
 from . import util
 from .compat.py39 import os_helper
 
diff --git a/libs/importlib_resources/tests/test_files.py b/libs/importlib_resources/tests/test_files.py
index f1fe2337a2..be20660313 100644
--- a/libs/importlib_resources/tests/test_files.py
+++ b/libs/importlib_resources/tests/test_files.py
@@ -1,17 +1,16 @@
-import os
+import contextlib
+import importlib
 import pathlib
 import py_compile
-import shutil
 import textwrap
 import unittest
 import warnings
-import importlib
-import contextlib
 
 import importlib_resources as resources
+
 from ..abc import Traversable
 from . import util
-from .compat.py39 import os_helper, import_helper
+from .compat.py39 import import_helper, os_helper
 
 
 @contextlib.contextmanager
@@ -72,7 +71,7 @@ def test_non_paths_in_dunder_path(self):
         to cause the ``PathEntryFinder`` to be called when searching
         for packages. In that case, resources should still be loadable.
         """
-        import namespacedata01
+        import namespacedata01  # type: ignore[import-not-found]
 
         namespacedata01.__path__.append(
             '__editable__.sample_namespace-1.0.finder.__path_hook__'
@@ -154,18 +153,19 @@ def test_implicit_files_submodule(self):
     def _compile_importlib(self):
         """
         Make a compiled-only copy of the importlib resources package.
+
+        Currently only code is copied, as importlib resources doesn't itself
+        have any resources.
         """
         bin_site = self.fixtures.enter_context(os_helper.temp_dir())
         c_resources = pathlib.Path(bin_site, 'c_resources')
         sources = pathlib.Path(resources.__file__).parent
-        shutil.copytree(sources, c_resources, ignore=lambda *_: ['__pycache__'])
-
-        for dirpath, _, filenames in os.walk(c_resources):
-            for filename in filenames:
-                source_path = pathlib.Path(dirpath) / filename
-                cfile = source_path.with_suffix('.pyc')
-                py_compile.compile(source_path, cfile)
-                pathlib.Path.unlink(source_path)
+
+        for source_path in sources.glob('**/*.py'):
+            c_path = c_resources.joinpath(source_path.relative_to(sources)).with_suffix(
+                '.pyc'
+            )
+            py_compile.compile(source_path, c_path)
         self.fixtures.enter_context(import_helper.DirsOnSysPath(bin_site))
 
     def test_implicit_files_with_compiled_importlib(self):
diff --git a/libs/importlib_resources/tests/test_functional.py b/libs/importlib_resources/tests/test_functional.py
index 1851edfba9..9eb2d8153f 100644
--- a/libs/importlib_resources/tests/test_functional.py
+++ b/libs/importlib_resources/tests/test_functional.py
@@ -1,16 +1,11 @@
-import unittest
-import os
 import importlib
-
-from .compat.py39 import warnings_helper
+import os
+import unittest
 
 import importlib_resources as resources
 
 from . import util
-
-# Since the functional API forwards to Traversable, we only test
-# filesystem resources here -- not zip files, namespace packages etc.
-# We do test for two kinds of Anchor, though.
+from .compat.py39 import warnings_helper
 
 
 class StringAnchorMixin:
@@ -28,7 +23,7 @@ def anchor02(self):
         return importlib.import_module('data02')
 
 
-class FunctionalAPIBase(util.DiskSetup):
+class FunctionalAPIBase:
     def setUp(self):
         super().setUp()
         self.load_fixture('data02')
@@ -77,7 +72,7 @@ def test_read_text(self):
         # fail with PermissionError rather than IsADirectoryError
         with self.assertRaises(OSError):
             resources.read_text(self.anchor01)
-        with self.assertRaises(OSError):
+        with self.assertRaises((OSError, resources.abc.TraversalError)):
             resources.read_text(self.anchor01, 'no-such-file')
         with self.assertRaises(UnicodeDecodeError):
             resources.read_text(self.anchor01, 'utf-16.file')
@@ -125,7 +120,7 @@ def test_open_text(self):
         # fail with PermissionError rather than IsADirectoryError
         with self.assertRaises(OSError):
             resources.open_text(self.anchor01)
-        with self.assertRaises(OSError):
+        with self.assertRaises((OSError, resources.abc.TraversalError)):
             resources.open_text(self.anchor01, 'no-such-file')
         with resources.open_text(self.anchor01, 'utf-16.file') as f:
             with self.assertRaises(UnicodeDecodeError):
@@ -182,17 +177,23 @@ def test_contents(self):
             set(c),
             {'utf-8.file', 'utf-16.file', 'binary.file', 'subdirectory'},
         )
-        with self.assertRaises(OSError), warnings_helper.check_warnings((
-            ".*contents.*",
-            DeprecationWarning,
-        )):
+        with (
+            self.assertRaises(OSError),
+            warnings_helper.check_warnings((
+                ".*contents.*",
+                DeprecationWarning,
+            )),
+        ):
             list(resources.contents(self.anchor01, 'utf-8.file'))
 
         for path_parts in self._gen_resourcetxt_path_parts():
-            with self.assertRaises(OSError), warnings_helper.check_warnings((
-                ".*contents.*",
-                DeprecationWarning,
-            )):
+            with (
+                self.assertRaises((OSError, resources.abc.TraversalError)),
+                warnings_helper.check_warnings((
+                    ".*contents.*",
+                    DeprecationWarning,
+                )),
+            ):
                 list(resources.contents(self.anchor01, *path_parts))
         with warnings_helper.check_warnings((".*contents.*", DeprecationWarning)):
             c = resources.contents(self.anchor01, 'subdirectory')
@@ -239,17 +240,28 @@ def test_text_errors(self):
                     )
 
 
-class FunctionalAPITest_StringAnchor(
+class FunctionalAPITest_StringAnchor_Disk(
     StringAnchorMixin,
     FunctionalAPIBase,
+    util.DiskSetup,
     unittest.TestCase,
 ):
     pass
 
 
-class FunctionalAPITest_ModuleAnchor(
+class FunctionalAPITest_ModuleAnchor_Disk(
     ModuleAnchorMixin,
     FunctionalAPIBase,
+    util.DiskSetup,
+    unittest.TestCase,
+):
+    pass
+
+
+class FunctionalAPITest_StringAnchor_Memory(
+    StringAnchorMixin,
+    FunctionalAPIBase,
+    util.MemorySetup,
     unittest.TestCase,
 ):
     pass
diff --git a/libs/importlib_resources/tests/test_open.py b/libs/importlib_resources/tests/test_open.py
index c40bb8c6f4..8a4b68e32c 100644
--- a/libs/importlib_resources/tests/test_open.py
+++ b/libs/importlib_resources/tests/test_open.py
@@ -1,6 +1,7 @@
 import unittest
 
 import importlib_resources as resources
+
 from . import util
 
 
diff --git a/libs/importlib_resources/tests/test_path.py b/libs/importlib_resources/tests/test_path.py
index 1e30f2bc53..0be673d2b1 100644
--- a/libs/importlib_resources/tests/test_path.py
+++ b/libs/importlib_resources/tests/test_path.py
@@ -3,6 +3,7 @@
 import unittest
 
 import importlib_resources as resources
+
 from . import util
 
 
diff --git a/libs/importlib_resources/tests/test_read.py b/libs/importlib_resources/tests/test_read.py
index 6780a2d161..216c8feb14 100644
--- a/libs/importlib_resources/tests/test_read.py
+++ b/libs/importlib_resources/tests/test_read.py
@@ -1,8 +1,9 @@
 import unittest
+from importlib import import_module
+
 import importlib_resources as resources
 
 from . import util
-from importlib import import_module
 
 
 class CommonBinaryTests(util.CommonTests, unittest.TestCase):
diff --git a/libs/importlib_resources/tests/test_reader.py b/libs/importlib_resources/tests/test_reader.py
index 0a77eb4045..f8cfd8dea0 100644
--- a/libs/importlib_resources/tests/test_reader.py
+++ b/libs/importlib_resources/tests/test_reader.py
@@ -1,8 +1,8 @@
 import os.path
 import pathlib
 import unittest
-
 from importlib import import_module
+
 from importlib_resources.readers import MultiplexedPath, NamespaceReader
 
 from . import util
diff --git a/libs/importlib_resources/tests/test_resource.py b/libs/importlib_resources/tests/test_resource.py
index a0da6a3566..c80afdc729 100644
--- a/libs/importlib_resources/tests/test_resource.py
+++ b/libs/importlib_resources/tests/test_resource.py
@@ -1,8 +1,9 @@
 import unittest
+from importlib import import_module
+
 import importlib_resources as resources
 
 from . import util
-from importlib import import_module
 
 
 class ResourceTests:
diff --git a/libs/importlib_resources/tests/test_util.py b/libs/importlib_resources/tests/test_util.py
new file mode 100644
index 0000000000..de304b6f35
--- /dev/null
+++ b/libs/importlib_resources/tests/test_util.py
@@ -0,0 +1,29 @@
+import unittest
+
+from .util import MemorySetup, Traversable
+
+
+class TestMemoryTraversableImplementation(unittest.TestCase):
+    def test_concrete_methods_are_not_overridden(self):
+        """`MemoryTraversable` must not override `Traversable` concrete methods.
+
+        This test is not an attempt to enforce a particular `Traversable` protocol;
+        it merely catches changes in the `Traversable` abstract/concrete methods
+        that have not been mirrored in the `MemoryTraversable` subclass.
+        """
+
+        traversable_concrete_methods = {
+            method
+            for method, value in Traversable.__dict__.items()
+            if callable(value) and method not in Traversable.__abstractmethods__
+        }
+        memory_traversable_concrete_methods = {
+            method
+            for method, value in MemorySetup.MemoryTraversable.__dict__.items()
+            if callable(value) and not method.startswith("__")
+        }
+        overridden_methods = (
+            memory_traversable_concrete_methods & traversable_concrete_methods
+        )
+
+        assert not overridden_methods
diff --git a/libs/importlib_resources/tests/util.py b/libs/importlib_resources/tests/util.py
index a4eafac3ae..0340c150f6 100644
--- a/libs/importlib_resources/tests/util.py
+++ b/libs/importlib_resources/tests/util.py
@@ -1,18 +1,17 @@
 import abc
+import contextlib
+import functools
 import importlib
 import io
+import pathlib
 import sys
 import types
-import pathlib
-import contextlib
+from importlib.machinery import ModuleSpec
 
-from ..abc import ResourceReader
-from .compat.py39 import import_helper, os_helper
-from . import zip as zip_
+from ..abc import ResourceReader, Traversable, TraversableResources
 from . import _path
-
-
-from importlib.machinery import ModuleSpec
+from . import zip as zip_
+from .compat.py39 import import_helper, os_helper
 
 
 class Reader(ResourceReader):
@@ -145,7 +144,7 @@ def test_useless_loader(self):
     data01={
         '__init__.py': '',
         'binary.file': bytes(range(4)),
-        'utf-16.file': 'Hello, UTF-16 world!\n'.encode('utf-16'),
+        'utf-16.file': '\ufeffHello, UTF-16 world!\n'.encode('utf-16-le'),
         'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
         'subdirectory': {
             '__init__.py': '',
@@ -160,7 +159,7 @@ def test_useless_loader(self):
     },
     namespacedata01={
         'binary.file': bytes(range(4)),
-        'utf-16.file': 'Hello, UTF-16 world!\n'.encode('utf-16'),
+        'utf-16.file': '\ufeffHello, UTF-16 world!\n'.encode('utf-16-le'),
         'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
         'subdirectory': {
             'binary.file': bytes(range(12, 16)),
@@ -202,5 +201,108 @@ def tree_on_path(self, spec):
         self.fixtures.enter_context(import_helper.DirsOnSysPath(temp_dir))
 
 
+class MemorySetup(ModuleSetup):
+    """Support loading a module in memory."""
+
+    MODULE = 'data01'
+
+    def load_fixture(self, module):
+        self.fixtures.enter_context(self.augment_sys_metapath(module))
+        return importlib.import_module(module)
+
+    @contextlib.contextmanager
+    def augment_sys_metapath(self, module):
+        finder_instance = self.MemoryFinder(module)
+        sys.meta_path.append(finder_instance)
+        yield
+        sys.meta_path.remove(finder_instance)
+
+    class MemoryFinder(importlib.abc.MetaPathFinder):
+        def __init__(self, module):
+            self._module = module
+
+        def find_spec(self, fullname, path, target=None):
+            if fullname != self._module:
+                return None
+
+            return importlib.machinery.ModuleSpec(
+                name=fullname,
+                loader=MemorySetup.MemoryLoader(self._module),
+                is_package=True,
+            )
+
+    class MemoryLoader(importlib.abc.Loader):
+        def __init__(self, module):
+            self._module = module
+
+        def exec_module(self, module):
+            pass
+
+        def get_resource_reader(self, fullname):
+            return MemorySetup.MemoryTraversableResources(self._module, fullname)
+
+    class MemoryTraversableResources(TraversableResources):
+        def __init__(self, module, fullname):
+            self._module = module
+            self._fullname = fullname
+
+        def files(self):
+            return MemorySetup.MemoryTraversable(self._module, self._fullname)
+
+    class MemoryTraversable(Traversable):
+        """Implement only the abstract methods of `Traversable`.
+
+        Besides `.__init__()`, no other methods may be implemented or overridden.
+        This is critical for validating the concrete `Traversable` implementations.
+        """
+
+        def __init__(self, module, fullname):
+            self._module = module
+            self._fullname = fullname
+
+        def _resolve(self):
+            """
+            Fully traverse the `fixtures` dictionary.
+
+            This should be wrapped in a `try/except KeyError`
+            but it is not currently needed and lowers the code coverage numbers.
+            """
+            path = pathlib.PurePosixPath(self._fullname)
+            return functools.reduce(lambda d, p: d[p], path.parts, fixtures)
+
+        def iterdir(self):
+            directory = self._resolve()
+            if not isinstance(directory, dict):
+                # Filesystem openers raise OSError, and that exception is mirrored here.
+                raise OSError(f"{self._fullname} is not a directory")
+            for path in directory:
+                yield MemorySetup.MemoryTraversable(
+                    self._module, f"{self._fullname}/{path}"
+                )
+
+        def is_dir(self) -> bool:
+            return isinstance(self._resolve(), dict)
+
+        def is_file(self) -> bool:
+            return not self.is_dir()
+
+        def open(self, mode='r', encoding=None, errors=None, *_, **__):
+            contents = self._resolve()
+            if isinstance(contents, dict):
+                # Filesystem openers raise OSError when attempting to open a directory,
+                # and that exception is mirrored here.
+                raise OSError(f"{self._fullname} is a directory")
+            if isinstance(contents, str):
+                contents = contents.encode("utf-8")
+            result = io.BytesIO(contents)
+            if "b" in mode:
+                return result
+            return io.TextIOWrapper(result, encoding=encoding, errors=errors)
+
+        @property
+        def name(self):
+            return pathlib.PurePosixPath(self._fullname).name
+
+
 class CommonTests(DiskSetup, CommonTestsBase):
     pass
diff --git a/libs/inflect-7.4.0.dist-info/METADATA b/libs/inflect-7.4.0.dist-info/METADATA
deleted file mode 100644
index 00a7fcdd0c..0000000000
--- a/libs/inflect-7.4.0.dist-info/METADATA
+++ /dev/null
@@ -1,595 +0,0 @@
-Metadata-Version: 2.1
-Name: inflect
-Version: 7.4.0
-Summary: Correctly generate plurals, singular nouns, ordinals, indefinite articles
-Author-email: Paul Dyson <pwdyson@yahoo.com>
-Maintainer-email: "Jason R. Coombs" <jaraco@jaraco.com>
-Project-URL: Source, https://github.com/jaraco/inflect
-Keywords: plural,inflect,participle
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Text Processing :: Linguistic
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: more-itertools >=8.5.0
-Requires-Dist: typeguard >=4.0.1
-Requires-Dist: typing-extensions ; python_version < "3.9"
-Provides-Extra: check
-Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'check'
-Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'check'
-Provides-Extra: cover
-Requires-Dist: pytest-cov ; extra == 'cover'
-Provides-Extra: doc
-Requires-Dist: sphinx >=3.5 ; extra == 'doc'
-Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
-Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
-Requires-Dist: furo ; extra == 'doc'
-Requires-Dist: sphinx-lint ; extra == 'doc'
-Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
-Provides-Extra: enabler
-Requires-Dist: pytest-enabler >=2.2 ; extra == 'enabler'
-Provides-Extra: test
-Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
-Requires-Dist: pygments ; extra == 'test'
-Provides-Extra: type
-Requires-Dist: pytest-mypy ; extra == 'type'
-
-.. image:: https://img.shields.io/pypi/v/inflect.svg
-   :target: https://pypi.org/project/inflect
-
-.. image:: https://img.shields.io/pypi/pyversions/inflect.svg
-
-.. image:: https://github.com/jaraco/inflect/actions/workflows/main.yml/badge.svg
-   :target: https://github.com/jaraco/inflect/actions?query=workflow%3A%22tests%22
-   :alt: tests
-
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
-    :target: https://github.com/astral-sh/ruff
-    :alt: Ruff
-
-.. image:: https://readthedocs.org/projects/inflect/badge/?version=latest
-   :target: https://inflect.readthedocs.io/en/latest/?badge=latest
-
-.. image:: https://img.shields.io/badge/skeleton-2024-informational
-   :target: https://blog.jaraco.com/skeleton
-
-.. image:: https://tidelift.com/badges/package/pypi/inflect
-   :target: https://tidelift.com/subscription/pkg/pypi-inflect?utm_source=pypi-inflect&utm_medium=readme
-
-NAME
-====
-
-inflect.py - Accurately generate plurals, singular nouns, ordinals, indefinite articles, and word-based representations of numbers. This functionality is limited to English.
-
-SYNOPSIS
-========
-
-.. code-block:: python
-
-    import inflect
-
-    p = inflect.engine()
-
-    # METHODS:
-
-    # plural plural_noun plural_verb plural_adj singular_noun no num
-    # compare compare_nouns compare_nouns compare_adjs
-    # a an
-    # present_participle
-    # ordinal number_to_words
-    # join
-    # inflect classical gender
-    # defnoun defverb defadj defa defan
-
-
-    # UNCONDITIONALLY FORM THE PLURAL
-
-    print("The plural of ", word, " is ", p.plural(word))
-
-
-    # CONDITIONALLY FORM THE PLURAL
-
-    print("I saw", cat_count, p.plural("cat", cat_count))
-
-
-    # FORM PLURALS FOR SPECIFIC PARTS OF SPEECH
-
-    print(
-        p.plural_noun("I", N1),
-        p.plural_verb("saw", N1),
-        p.plural_adj("my", N2),
-        p.plural_noun("saw", N2),
-    )
-
-
-    # FORM THE SINGULAR OF PLURAL NOUNS
-
-    print("The singular of ", word, " is ", p.singular_noun(word))
-
-    # SELECT THE GENDER OF SINGULAR PRONOUNS
-
-    print(p.singular_noun("they"))  # 'it'
-    p.gender("feminine")
-    print(p.singular_noun("they"))  # 'she'
-
-
-    # DEAL WITH "0/1/N" -> "no/1/N" TRANSLATION:
-
-    print("There ", p.plural_verb("was", errors), p.no(" error", errors))
-
-
-    # USE DEFAULT COUNTS:
-
-    print(
-        p.num(N1, ""),
-        p.plural("I"),
-        p.plural_verb(" saw"),
-        p.num(N2),
-        p.plural_noun(" saw"),
-    )
-    print("There ", p.num(errors, ""), p.plural_verb("was"), p.no(" error"))
-
-
-    # COMPARE TWO WORDS "NUMBER-INSENSITIVELY":
-
-    if p.compare(word1, word2):
-        print("same")
-    if p.compare_nouns(word1, word2):
-        print("same noun")
-    if p.compare_verbs(word1, word2):
-        print("same verb")
-    if p.compare_adjs(word1, word2):
-        print("same adj.")
-
-
-    # ADD CORRECT "a" OR "an" FOR A GIVEN WORD:
-
-    print("Did you want ", p.a(thing), " or ", p.an(idea))
-
-
-    # CONVERT NUMERALS INTO ORDINALS (i.e. 1->1st, 2->2nd, 3->3rd, etc.)
-
-    print("It was", p.ordinal(position), " from the left\n")
-
-    # CONVERT NUMERALS TO WORDS (i.e. 1->"one", 101->"one hundred and one", etc.)
-    # RETURNS A SINGLE STRING...
-
-    words = p.number_to_words(1234)
-    # "one thousand, two hundred and thirty-four"
-    words = p.number_to_words(p.ordinal(1234))
-    # "one thousand, two hundred and thirty-fourth"
-
-
-    # GET BACK A LIST OF STRINGS, ONE FOR EACH "CHUNK"...
-
-    words = p.number_to_words(1234, wantlist=True)
-    # ("one thousand","two hundred and thirty-four")
-
-
-    # OPTIONAL PARAMETERS CHANGE TRANSLATION:
-
-    words = p.number_to_words(12345, group=1)
-    # "one, two, three, four, five"
-
-    words = p.number_to_words(12345, group=2)
-    # "twelve, thirty-four, five"
-
-    words = p.number_to_words(12345, group=3)
-    # "one twenty-three, forty-five"
-
-    words = p.number_to_words(1234, andword="")
-    # "one thousand, two hundred thirty-four"
-
-    words = p.number_to_words(1234, andword=", plus")
-    # "one thousand, two hundred, plus thirty-four"
-    # TODO: I get no comma before plus: check perl
-
-    words = p.number_to_words(555_1202, group=1, zero="oh")
-    # "five, five, five, one, two, oh, two"
-
-    words = p.number_to_words(555_1202, group=1, one="unity")
-    # "five, five, five, unity, two, oh, two"
-
-    words = p.number_to_words(123.456, group=1, decimal="mark")
-    # "one two three mark four five six"
-    # TODO: DOCBUG: perl gives commas here as do I
-
-    # LITERAL STYLE ONLY NAMES NUMBERS LESS THAN A CERTAIN THRESHOLD...
-
-    words = p.number_to_words(9, threshold=10)  # "nine"
-    words = p.number_to_words(10, threshold=10)  # "ten"
-    words = p.number_to_words(11, threshold=10)  # "11"
-    words = p.number_to_words(1000, threshold=10)  # "1,000"
-
-    # JOIN WORDS INTO A LIST:
-
-    mylist = p.join(("apple", "banana", "carrot"))
-    # "apple, banana, and carrot"
-
-    mylist = p.join(("apple", "banana"))
-    # "apple and banana"
-
-    mylist = p.join(("apple", "banana", "carrot"), final_sep="")
-    # "apple, banana and carrot"
-
-
-    # REQUIRE "CLASSICAL" PLURALS (EG: "focus"->"foci", "cherub"->"cherubim")
-
-    p.classical()  # USE ALL CLASSICAL PLURALS
-
-    p.classical(all=True)  # USE ALL CLASSICAL PLURALS
-    p.classical(all=False)  # SWITCH OFF CLASSICAL MODE
-
-    p.classical(zero=True)  #  "no error" INSTEAD OF "no errors"
-    p.classical(zero=False)  #  "no errors" INSTEAD OF "no error"
-
-    p.classical(herd=True)  #  "2 buffalo" INSTEAD OF "2 buffalos"
-    p.classical(herd=False)  #  "2 buffalos" INSTEAD OF "2 buffalo"
-
-    p.classical(persons=True)  # "2 chairpersons" INSTEAD OF "2 chairpeople"
-    p.classical(persons=False)  # "2 chairpeople" INSTEAD OF "2 chairpersons"
-
-    p.classical(ancient=True)  # "2 formulae" INSTEAD OF "2 formulas"
-    p.classical(ancient=False)  # "2 formulas" INSTEAD OF "2 formulae"
-
-
-    # INTERPOLATE "plural()", "plural_noun()", "plural_verb()", "plural_adj()", "singular_noun()",
-    # a()", "an()", "num()" AND "ordinal()" WITHIN STRINGS:
-
-    print(p.inflect("The plural of {0} is plural('{0}')".format(word)))
-    print(p.inflect("The singular of {0} is singular_noun('{0}')".format(word)))
-    print(p.inflect("I saw {0} plural('cat',{0})".format(cat_count)))
-    print(
-        p.inflect(
-            "plural('I',{0}) "
-            "plural_verb('saw',{0}) "
-            "plural('a',{1}) "
-            "plural_noun('saw',{1})".format(N1, N2)
-        )
-    )
-    print(
-        p.inflect(
-            "num({0}, False)plural('I') "
-            "plural_verb('saw') "
-            "num({1}, False)plural('a') "
-            "plural_noun('saw')".format(N1, N2)
-        )
-    )
-    print(p.inflect("I saw num({0}) plural('cat')\nnum()".format(cat_count)))
-    print(p.inflect("There plural_verb('was',{0}) no('error',{0})".format(errors)))
-    print(p.inflect("There num({0}, False)plural_verb('was') no('error')".format(errors)))
-    print(p.inflect("Did you want a('{0}') or an('{1}')".format(thing, idea)))
-    print(p.inflect("It was ordinal('{0}') from the left".format(position)))
-
-
-    # ADD USER-DEFINED INFLECTIONS (OVERRIDING INBUILT RULES):
-
-    p.defnoun("VAX", "VAXen")  # SINGULAR => PLURAL
-
-    p.defverb(
-        "will",  # 1ST PERSON SINGULAR
-        "shall",  # 1ST PERSON PLURAL
-        "will",  # 2ND PERSON SINGULAR
-        "will",  # 2ND PERSON PLURAL
-        "will",  # 3RD PERSON SINGULAR
-        "will",  # 3RD PERSON PLURAL
-    )
-
-    p.defadj("hir", "their")  # SINGULAR => PLURAL
-
-    p.defa("h")  # "AY HALWAYS SEZ 'HAITCH'!"
-
-    p.defan("horrendous.*")  # "AN HORRENDOUS AFFECTATION"
-
-
-DESCRIPTION
-===========
-
-The methods of the class ``engine`` in module ``inflect.py`` provide plural
-inflections, singular noun inflections, "a"/"an" selection for English words,
-and manipulation of numbers as words.
-
-Plural forms of all nouns, most verbs, and some adjectives are
-provided. Where appropriate, "classical" variants (for example: "brother" ->
-"brethren", "dogma" -> "dogmata", etc.) are also provided.
-
-Single forms of nouns are also provided. The gender of singular pronouns
-can be chosen (for example "they" -> "it" or "she" or "he" or "they").
-
-Pronunciation-based "a"/"an" selection is provided for all English
-words, and most initialisms.
-
-It is also possible to inflect numerals (1,2,3) to ordinals (1st, 2nd, 3rd)
-and to English words ("one", "two", "three").
-
-In generating these inflections, ``inflect.py`` follows the Oxford
-English Dictionary and the guidelines in Fowler's Modern English
-Usage, preferring the former where the two disagree.
-
-The module is built around standard British spelling, but is designed
-to cope with common American variants as well. Slang, jargon, and
-other English dialects are *not* explicitly catered for.
-
-Where two or more inflected forms exist for a single word (typically a
-"classical" form and a "modern" form), ``inflect.py`` prefers the
-more common form (typically the "modern" one), unless "classical"
-processing has been specified
-(see `MODERN VS CLASSICAL INFLECTIONS`).
-
-FORMING PLURALS AND SINGULARS
-=============================
-
-Inflecting Plurals and Singulars
---------------------------------
-
-All of the ``plural...`` plural inflection methods take the word to be
-inflected as their first argument and return the corresponding inflection.
-Note that all such methods expect the *singular* form of the word. The
-results of passing a plural form are undefined (and unlikely to be correct).
-Similarly, the ``si...`` singular inflection method expects the *plural*
-form of the word.
-
-The ``plural...`` methods also take an optional second argument,
-which indicates the grammatical "number" of the word (or of another word
-with which the word being inflected must agree). If the "number" argument is
-supplied and is not ``1`` (or ``"one"`` or ``"a"``, or some other adjective that
-implies the singular), the plural form of the word is returned. If the
-"number" argument *does* indicate singularity, the (uninflected) word
-itself is returned. If the number argument is omitted, the plural form
-is returned unconditionally.
-
-The ``si...`` method takes a second argument in a similar fashion. If it is
-some form of the number ``1``, or is omitted, the singular form is returned.
-Otherwise the plural is returned unaltered.
-
-
-The various methods of ``inflect.engine`` are:
-
-
-
-``plural_noun(word, count=None)``
-
- The method ``plural_noun()`` takes a *singular* English noun or
- pronoun and returns its plural. Pronouns in the nominative ("I" ->
- "we") and accusative ("me" -> "us") cases are handled, as are
- possessive pronouns ("mine" -> "ours").
-
-
-``plural_verb(word, count=None)``
-
- The method ``plural_verb()`` takes the *singular* form of a
- conjugated verb (that is, one which is already in the correct "person"
- and "mood") and returns the corresponding plural conjugation.
-
-
-``plural_adj(word, count=None)``
-
- The method ``plural_adj()`` takes the *singular* form of
- certain types of adjectives and returns the corresponding plural form.
- Adjectives that are correctly handled include: "numerical" adjectives
- ("a" -> "some"), demonstrative adjectives ("this" -> "these", "that" ->
- "those"), and possessives ("my" -> "our", "cat's" -> "cats'", "child's"
- -> "childrens'", etc.)
-
-
-``plural(word, count=None)``
-
- The method ``plural()`` takes a *singular* English noun,
- pronoun, verb, or adjective and returns its plural form. Where a word
- has more than one inflection depending on its part of speech (for
- example, the noun "thought" inflects to "thoughts", the verb "thought"
- to "thought"), the (singular) noun sense is preferred to the (singular)
- verb sense.
-
- Hence ``plural("knife")`` will return "knives" ("knife" having been treated
- as a singular noun), whereas ``plural("knifes")`` will return "knife"
- ("knifes" having been treated as a 3rd person singular verb).
-
- The inherent ambiguity of such cases suggests that,
- where the part of speech is known, ``plural_noun``, ``plural_verb``, and
- ``plural_adj`` should be used in preference to ``plural``.
-
-
-``singular_noun(word, count=None)``
-
- The method ``singular_noun()`` takes a *plural* English noun or
- pronoun and returns its singular. Pronouns in the nominative ("we" ->
- "I") and accusative ("us" -> "me") cases are handled, as are
- possessive pronouns ("ours" -> "mine"). When third person
- singular pronouns are returned they take the neuter gender by default
- ("they" -> "it"), not ("they"-> "she") nor ("they" -> "he"). This can be
- changed with ``gender()``.
-
-Note that all these methods ignore any whitespace surrounding the
-word being inflected, but preserve that whitespace when the result is
-returned. For example, ``plural(" cat  ")`` returns " cats  ".
-
-
-``gender(genderletter)``
-
- The third person plural pronoun takes the same form for the female, male and
- neuter (e.g. "they"). The singular however, depends upon gender (e.g. "she",
- "he", "it" and "they" -- "they" being the gender neutral form.) By default
- ``singular_noun`` returns the neuter form, however, the gender can be selected with
- the ``gender`` method. Pass the first letter of the gender to
- ``gender`` to return the f(eminine), m(asculine), n(euter) or t(hey)
- form of the singular. e.g.
- gender('f') followed by singular_noun('themselves') returns 'herself'.
-
-Numbered plurals
-----------------
-
-The ``plural...`` methods return only the inflected word, not the count that
-was used to inflect it. Thus, in order to produce "I saw 3 ducks", it
-is necessary to use:
-
-.. code-block:: python
-
-    print("I saw", N, p.plural_noun(animal, N))
-
-Since the usual purpose of producing a plural is to make it agree with
-a preceding count, inflect.py provides a method
-(``no(word, count)``) which, given a word and a(n optional) count, returns the
-count followed by the correctly inflected word. Hence the previous
-example can be rewritten:
-
-.. code-block:: python
-
-    print("I saw ", p.no(animal, N))
-
-In addition, if the count is zero (or some other term which implies
-zero, such as ``"zero"``, ``"nil"``, etc.) the count is replaced by the
-word "no". Hence, if ``N`` had the value zero, the previous example
-would print (the somewhat more elegant)::
-
-    I saw no animals
-
-rather than::
-
-    I saw 0 animals
-
-Note that the name of the method is a pun: the method
-returns either a number (a *No.*) or a ``"no"``, in front of the
-inflected word.
-
-
-Reducing the number of counts required
---------------------------------------
-
-In some contexts, the need to supply an explicit count to the various
-``plural...`` methods makes for tiresome repetition. For example:
-
-.. code-block:: python
-
-    print(
-        plural_adj("This", errors),
-        plural_noun(" error", errors),
-        plural_verb(" was", errors),
-        " fatal.",
-    )
-
-inflect.py therefore provides a method
-(``num(count=None, show=None)``) which may be used to set a persistent "default number"
-value. If such a value is set, it is subsequently used whenever an
-optional second "number" argument is omitted. The default value thus set
-can subsequently be removed by calling ``num()`` with no arguments.
-Hence we could rewrite the previous example:
-
-.. code-block:: python
-
-    p.num(errors)
-    print(p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal.")
-    p.num()
-
-Normally, ``num()`` returns its first argument, so that it may also
-be "inlined" in contexts like:
-
-.. code-block:: python
-
-    print(p.num(errors), p.plural_noun(" error"), p.plural_verb(" was"), " detected.")
-    if severity > 1:
-        print(
-            p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal."
-        )
-
-However, in certain contexts (see `INTERPOLATING INFLECTIONS IN STRINGS`)
-it is preferable that ``num()`` return an empty string. Hence ``num()``
-provides an optional second argument. If that argument is supplied (that is, if
-it is defined) and evaluates to false, ``num`` returns an empty string
-instead of its first argument. For example:
-
-.. code-block:: python
-
-    print(p.num(errors, 0), p.no("error"), p.plural_verb(" was"), " detected.")
-    if severity > 1:
-        print(
-            p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal."
-        )
-
-
-
-Number-insensitive equality
----------------------------
-
-inflect.py also provides a solution to the problem
-of comparing words of differing plurality through the methods
-``compare(word1, word2)``, ``compare_nouns(word1, word2)``,
-``compare_verbs(word1, word2)``, and ``compare_adjs(word1, word2)``.
-Each  of these methods takes two strings, and  compares them
-using the corresponding plural-inflection method (``plural()``, ``plural_noun()``,
-``plural_verb()``, and ``plural_adj()`` respectively).
-
-The comparison returns true if:
-
-- the strings are equal, or
-- one string is equal to a plural form of the other, or
-- the strings are two different plural forms of the one word.
-
-
-Hence all of the following return true:
-
-.. code-block:: python
-
-    p.compare("index", "index")  # RETURNS "eq"
-    p.compare("index", "indexes")  # RETURNS "s:p"
-    p.compare("index", "indices")  # RETURNS "s:p"
-    p.compare("indexes", "index")  # RETURNS "p:s"
-    p.compare("indices", "index")  # RETURNS "p:s"
-    p.compare("indices", "indexes")  # RETURNS "p:p"
-    p.compare("indexes", "indices")  # RETURNS "p:p"
-    p.compare("indices", "indices")  # RETURNS "eq"
-
-As indicated by the comments in the previous example, the actual value
-returned by the various ``compare`` methods encodes which of the
-three equality rules succeeded: "eq" is returned if the strings were
-identical, "s:p" if the strings were singular and plural respectively,
-"p:s" for plural and singular, and "p:p" for two distinct plurals.
-Inequality is indicated by returning an empty string.
-
-It should be noted that two distinct singular words which happen to take
-the same plural form are *not* considered equal, nor are cases where
-one (singular) word's plural is the other (plural) word's singular.
-Hence all of the following return false:
-
-.. code-block:: python
-
-    p.compare("base", "basis")  # ALTHOUGH BOTH -> "bases"
-    p.compare("syrinx", "syringe")  # ALTHOUGH BOTH -> "syringes"
-    p.compare("she", "he")  # ALTHOUGH BOTH -> "they"
-
-    p.compare("opus", "operas")  # ALTHOUGH "opus" -> "opera" -> "operas"
-    p.compare("taxi", "taxes")  # ALTHOUGH "taxi" -> "taxis" -> "taxes"
-
-Note too that, although the comparison is "number-insensitive" it is *not*
-case-insensitive (that is, ``plural("time","Times")`` returns false. To obtain
-both number and case insensitivity, use the ``lower()`` method on both strings
-(that is, ``plural("time".lower(), "Times".lower())`` returns true).
-
-Related Functionality
-=====================
-
-Shout out to these libraries that provide related functionality:
-
-* `WordSet <https://jaracotext.readthedocs.io/en/latest/#jaraco.text.WordSet>`_
-  parses identifiers like variable names into sets of words suitable for re-assembling
-  in another form.
-
-* `word2number <https://pypi.org/project/word2number/>`_ converts words to
-  a number.
-
-
-For Enterprise
-==============
-
-Available as part of the Tidelift Subscription.
-
-This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
-
-`Learn more <https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/inflect-7.4.0.dist-info/RECORD b/libs/inflect-7.4.0.dist-info/RECORD
deleted file mode 100644
index 82e7c9ff4f..0000000000
--- a/libs/inflect-7.4.0.dist-info/RECORD
+++ /dev/null
@@ -1,11 +0,0 @@
-inflect-7.4.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-inflect-7.4.0.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-inflect-7.4.0.dist-info/METADATA,sha256=MV9Pl_30VbIbBxTU6A6sw-H9g6caHnyx2OYY2ZP0Spg,21265
-inflect-7.4.0.dist-info/RECORD,,
-inflect-7.4.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inflect-7.4.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-inflect-7.4.0.dist-info/top_level.txt,sha256=m52ujdp10CqT6jh1XQxZT6kEntcnv-7Tl7UiGNTzWZA,8
-inflect/__init__.py,sha256=BsJ4xVkg2TcttXL0zl43ZAR55IOmj54XSddEuxyD2bc,103635
-inflect/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inflect/compat/py38.py,sha256=oObVfVnWX9_OpnOuEJn1mFbJxVhwyR5epbiTNXDDaso,160
-inflect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/inflect-7.4.0.dist-info/WHEEL b/libs/inflect-7.4.0.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/inflect-7.4.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/flask-3.0.3.dist-info/INSTALLER b/libs/inflect-7.5.0.dist-info/INSTALLER
similarity index 100%
rename from libs/flask-3.0.3.dist-info/INSTALLER
rename to libs/inflect-7.5.0.dist-info/INSTALLER
diff --git a/libs/inflect-7.5.0.dist-info/METADATA b/libs/inflect-7.5.0.dist-info/METADATA
new file mode 100644
index 0000000000..41ea3e90e3
--- /dev/null
+++ b/libs/inflect-7.5.0.dist-info/METADATA
@@ -0,0 +1,742 @@
+Metadata-Version: 2.4
+Name: inflect
+Version: 7.5.0
+Summary: Correctly generate plurals, singular nouns, ordinals, indefinite articles
+Author-email: Paul Dyson <pwdyson@yahoo.com>
+Maintainer-email: "Jason R. Coombs" <jaraco@jaraco.com>
+Project-URL: Source, https://github.com/jaraco/inflect
+Keywords: plural,inflect,participle
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Linguistic
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: more_itertools>=8.5.0
+Requires-Dist: typeguard>=4.0.1
+Requires-Dist: typing_extensions; python_version < "3.9"
+Provides-Extra: test
+Requires-Dist: pytest!=8.1.*,>=6; extra == "test"
+Requires-Dist: pygments; extra == "test"
+Provides-Extra: doc
+Requires-Dist: sphinx>=3.5; extra == "doc"
+Requires-Dist: jaraco.packaging>=9.3; extra == "doc"
+Requires-Dist: rst.linker>=1.9; extra == "doc"
+Requires-Dist: furo; extra == "doc"
+Requires-Dist: sphinx-lint; extra == "doc"
+Requires-Dist: jaraco.tidelift>=1.4; extra == "doc"
+Provides-Extra: check
+Requires-Dist: pytest-checkdocs>=2.4; extra == "check"
+Requires-Dist: pytest-ruff>=0.2.1; sys_platform != "cygwin" and extra == "check"
+Provides-Extra: cover
+Requires-Dist: pytest-cov; extra == "cover"
+Provides-Extra: enabler
+Requires-Dist: pytest-enabler>=2.2; extra == "enabler"
+Provides-Extra: type
+Requires-Dist: pytest-mypy; extra == "type"
+Dynamic: license-file
+
+.. image:: https://img.shields.io/pypi/v/inflect.svg
+   :target: https://pypi.org/project/inflect
+
+.. image:: https://img.shields.io/pypi/pyversions/inflect.svg
+
+.. image:: https://github.com/jaraco/inflect/actions/workflows/main.yml/badge.svg
+   :target: https://github.com/jaraco/inflect/actions?query=workflow%3A%22tests%22
+   :alt: tests
+
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
+
+.. image:: https://readthedocs.org/projects/inflect/badge/?version=latest
+   :target: https://inflect.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://img.shields.io/badge/skeleton-2024-informational
+   :target: https://blog.jaraco.com/skeleton
+
+.. image:: https://tidelift.com/badges/package/pypi/inflect
+   :target: https://tidelift.com/subscription/pkg/pypi-inflect?utm_source=pypi-inflect&utm_medium=readme
+
+NAME
+====
+
+inflect.py - Accurately generate plurals, singular nouns, ordinals, indefinite articles, and word-based representations of numbers. This functionality is limited to English.
+
+SYNOPSIS
+========
+
+.. code-block:: python
+    
+    >>> import inflect
+    >>> p = inflect.engine()
+
+Simple example with pluralization and word-representation of numbers:
+
+.. code-block:: python
+    
+    >>> count=1
+    >>> print('There', p.plural_verb('was', count), p.number_to_words(count), p.plural_noun('person', count), 'by the door.')
+    There was one person by the door.
+
+When ``count=243``, the same code will generate:
+
+.. code-block:: python
+    
+    There were two hundred and forty-three people by the door.
+
+
+Methods
+=======
+
+- ``plural``, ``plural_noun``, ``plural_verb``, ``plural_adj``, ``singular_noun``, ``no``, ``num``
+- ``compare``, ``compare_nouns``, ``compare_nouns``, ``compare_adjs``
+- ``a``, ``an``
+- ``present_participle``
+- ``ordinal``, ``number_to_words``
+- ``join``
+- ``inflect``, ``classical``, ``gender``
+- ``defnoun``, ``defverb``, ``defadj``, ``defa``, ``defan``
+
+Plurality/Singularity
+---------------------
+Unconditionally Form the Plural
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> "the plural of person is " + p.plural("person")
+    'the plural of person is people'
+
+Conditionally Form the Plural
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> "the plural of 1 person is " + p.plural("person", 1)
+    'the plural of 1 person is person'
+
+Form Plurals for Specific Parts of Speech
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.plural_noun("I", 2)
+    'we'
+    >>> p.plural_verb("saw", 1)
+    'saw'
+    >>> p.plural_adj("my", 2)
+    'our'
+    >>> p.plural_noun("saw", 2)
+    'saws'
+
+Form the Singular of Plural Nouns
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> "The singular of people is " + p.singular_noun("people")
+    'The singular of people is person'
+
+Select the Gender of Singular Pronouns
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.singular_noun("they")
+    'it'
+    >>> p.gender("feminine")
+    >>> p.singular_noun("they")
+    'she'
+
+Deal with "0/1/N" -> "no/1/N" Translation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> errors = 1
+    >>> "There ", p.plural_verb("was", errors), p.no(" error", errors)
+    ('There ', 'was', ' 1 error')
+    >>> errors = 2
+    >>> "There ", p.plural_verb("was", errors), p.no(" error", errors)
+    ('There ', 'were', ' 2 errors')
+
+Use Default Counts
+^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.num(1, "")
+    ''
+    >>> p.plural("I")
+    'I'
+    >>> p.plural_verb(" saw")
+    ' saw'
+    >>> p.num(2)
+    '2'
+    >>> p.plural_noun(" saw")
+    ' saws'
+    >>> "There ", p.num(errors, ""), p.plural_verb("was"), p.no(" error")
+    ('There ', '', 'were', ' 2 errors')
+
+Compare Two Words Number-Intensitively
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.compare('person', 'person')
+    'eq'
+    >>> p.compare('person', 'people')
+    's:p'
+    >>> p.compare_nouns('person', 'people')
+    's:p'
+    >>> p.compare_verbs('run', 'ran')
+    False
+    >>> p.compare_verbs('run', 'running')
+    False
+    >>> p.compare_verbs('run', 'run')
+    'eq'
+    >>> p.compare_adjs('my', 'mine')
+    False
+    >>> p.compare_adjs('my', 'our')
+    's:p'
+
+Add Correct *a* or *an* for a Given Word
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> "Did you want ", p.a('thing'), " or ", p.a('idea')
+    ('Did you want ', 'a thing', ' or ', 'an idea')
+
+Convert Numerals into Ordinals
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> "It was", p.ordinal(1), " from the left"
+    ('It was', '1st', ' from the left')
+    >>> "It was", p.ordinal(2), " from the left"
+    ('It was', '2nd', ' from the left')
+    >>> "It was", p.ordinal(3), " from the left"
+    ('It was', '3rd', ' from the left')
+    >>> "It was", p.ordinal(347), " from the left"
+    ('It was', '347th', ' from the left')
+
+Convert Numerals to Words
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Note: This returns a single string.
+
+.. code-block:: python
+    
+    >>> p.number_to_words(1)
+    'one'
+    >>> p.number_to_words(38)
+    'thirty-eight'
+    >>> p.number_to_words(1234)
+    'one thousand, two hundred and thirty-four'
+    >>> p.number_to_words(p.ordinal(1234))
+    'one thousand, two hundred and thirty-fourth'
+
+Retrieve Words as List of Parts
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.number_to_words(1234, wantlist=True)
+    ['one thousand', 'two hundred and thirty-four']
+
+Grouping Options
+^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.number_to_words(12345, group=1)
+    'one, two, three, four, five'
+    >>> p.number_to_words(12345, group=2)
+    'twelve, thirty-four, five'
+    >>> p.number_to_words(12345, group=3)
+    'one twenty-three, forty-five'
+    >>> p.number_to_words(1234, andword="")
+    'one thousand, two hundred thirty-four'
+    >>> p.number_to_words(1234, andword=", plus")
+    'one thousand, two hundred, plus thirty-four'
+    >>> p.number_to_words(555_1202, group=1, zero="oh")
+    'five, five, five, one, two, oh, two'
+    >>> p.number_to_words(555_1202, group=1, one="unity")
+    'five, five, five, unity, two, zero, two'
+    >>> p.number_to_words(123.456, group=1, decimal="mark")
+    'one, two, three, mark, four, five, six'
+
+Apply Threshold for Word-Representation of Numbers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Above provided threshold, numberals will remain numerals
+
+.. code-block:: python
+    
+    >>> p.number_to_words(9, threshold=10)
+    'nine'
+    >>> p.number_to_words(10, threshold=10)
+    'ten'
+    >>> p.number_to_words(11, threshold=10)
+    '11'
+    >>> p.number_to_words(1000, threshold=10)
+    '1,000'
+
+Join Words into a List
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: python
+    
+    >>> p.join(("apple", "banana", "carrot"))
+    'apple, banana, and carrot'
+    >>> p.join(("apple", "banana"))
+    'apple and banana'
+    >>> p.join(("apple", "banana", "carrot"), final_sep="")
+    'apple, banana and carrot'
+    >>> p.join(('apples', 'bananas', 'carrots'), conj='and even')
+    'apples, bananas, and even carrots'
+    >>> p.join(('apple', 'banana', 'carrot'), sep='/', sep_spaced=False, conj='', conj_spaced=False)
+    'apple/banana/carrot'
+    
+Require Classical Plurals
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Adhere to conventions from Classical Latin and Classical Greek
+
+.. code-block:: python
+        
+    >>> p.classical()
+    >>> p.plural_noun("focus", 2)
+    'foci'
+    >>> p.plural_noun("cherubim", 2)
+    'cherubims'
+    >>> p.plural_noun("cherub", 2)
+    'cherubim'
+
+Other options for classical plurals:
+
+.. code-block:: python
+    
+    p.classical(all=True)  # USE ALL CLASSICAL PLURALS
+    p.classical(all=False)  # SWITCH OFF CLASSICAL MODE
+    
+    p.classical(zero=True)  #  "no error" INSTEAD OF "no errors"
+    p.classical(zero=False)  #  "no errors" INSTEAD OF "no error"
+    
+    p.classical(herd=True)  #  "2 buffalo" INSTEAD OF "2 buffalos"
+    p.classical(herd=False)  #  "2 buffalos" INSTEAD OF "2 buffalo"
+    
+    p.classical(persons=True)  # "2 chairpersons" INSTEAD OF "2 chairpeople"
+    p.classical(persons=False)  # "2 chairpeople" INSTEAD OF "2 chairpersons"
+    
+    p.classical(ancient=True)  # "2 formulae" INSTEAD OF "2 formulas"
+    p.classical(ancient=False)  # "2 formulas" INSTEAD OF "2 formulae"
+
+
+Support for interpolation
+^^^^^^^^^^^^^^^^^^^^^^^^^
+Supports string interpolation with the following functions: ``plural()``, ``plural_noun()``, ``plural_verb()``, ``plural_adj()``, ``singular_noun()``, ``a()``, ``an()``, ``num()`` and ``ordinal()``.
+
+.. code-block:: python
+    
+    >>> p.inflect("The plural of {0} is plural('{0}')".format('car'))
+    'The plural of car is cars'
+    >>> p.inflect("The singular of {0} is singular_noun('{0}')".format('car'))
+    'The singular of car is car'
+    >>> p.inflect("I saw {0} plural('cat',{0})".format(3))
+    'I saw 3 cats'
+    >>> p.inflect(
+    ...     "plural('I',{0}) "
+    ...     "plural_verb('saw',{0}) "
+    ...     "plural('a',{1}) "
+    ...     "plural_noun('saw',{1})".format(1, 2)
+    ... )
+    'I saw some saws'
+    >>> p.inflect(
+    ...     "num({0}, False)plural('I') "
+    ...     "plural_verb('saw') "
+    ...     "num({1}, False)plural('a') "
+    ...     "plural_noun('saw')".format(N1, 1)
+    ... )
+    'I saw a saw'
+    >>> p.inflect(
+    ...     "num({0}, False)plural('I') "
+    ...     "plural_verb('saw') "
+    ...     "num({1}, False)plural('a') "
+    ...     "plural_noun('saw')".format(2, 2)
+    ... )
+    'we saw some saws'
+    >>> p.inflect("I saw num({0}) plural('cat')\nnum()".format(cat_count))
+    'I saw 3 cats\n'
+    >>> p.inflect("There plural_verb('was',{0}) no('error',{0})".format(errors))
+    'There were 2 errors'
+    >>> p.inflect("There num({0}, False)plural_verb('was') no('error')".format(errors))
+    'There were 2 errors'
+    >>> p.inflect("Did you want a('{0}') or an('{1}')".format(thing, idea))
+    'Did you want a thing or an idea'
+    >>> p.inflect("It was ordinal('{0}') from the left".format(2))
+    'It was 2nd from the left'
+
+Add User-Defined Inflections
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Allows for overriding default rules.
+
+Override noun defaults:
+
+.. code-block:: python
+        
+    p.defnoun("VAX", "VAXen")  # SINGULAR => PLURAL
+
+Override Verb defaults:
+
+.. code-block:: python
+    
+    p.defverb(
+        "will",  # 1ST PERSON SINGULAR
+        "shall",  # 1ST PERSON PLURAL
+        "will",  # 2ND PERSON SINGULAR
+        "will",  # 2ND PERSON PLURAL
+        "will",  # 3RD PERSON SINGULAR
+        "will",  # 3RD PERSON PLURAL
+    )
+
+Override adjective defaults:
+
+.. code-block:: python
+    
+    >>> p.defadj('hir', 'their')
+    1
+    >>> p.plural_adj('hir', 2)
+    'their'
+
+Override the words that use the indefinite articles "a" or "an":
+
+.. code-block:: python
+    
+    >>> p.a('ape', 1)
+    'an ape'
+    >>> p.defa('a')
+    1
+    >>> p.a('ape', 1)
+    'an ape'
+    >>> p.defa('ape')
+    1
+    >>> p.a('ape', 1)
+    'a ape'
+    >>> p.defan('horrendous.*')
+    1
+    >>> p.a('horrendous affectation', 1)
+    'an horrendous affectation'
+    >>> 
+
+
+DESCRIPTION
+===========
+
+The methods of the class ``engine`` in module ``inflect.py`` provide plural
+inflections, singular noun inflections, "a"/"an" selection for English words,
+and manipulation of numbers as words.
+
+Plural forms of all nouns, most verbs, and some adjectives are
+provided. Where appropriate, "classical" variants (for example: "brother" ->
+"brethren", "dogma" -> "dogmata", etc.) are also provided.
+
+Single forms of nouns are also provided. The gender of singular pronouns
+can be chosen (for example "they" -> "it" or "she" or "he" or "they").
+
+Pronunciation-based "a"/"an" selection is provided for all English
+words, and most initialisms.
+
+It is also possible to inflect numerals (1,2,3) to ordinals (1st, 2nd, 3rd)
+or to English words ("one", "two", "three").
+
+In generating these inflections, ``inflect.py`` follows the Oxford
+English Dictionary and the guidelines in Fowler's Modern English
+Usage, preferring the former where the two disagree.
+
+The module is built around standard British spelling, but is designed
+to cope with common American variants as well. Slang, jargon, and
+other English dialects are *not* explicitly catered for.
+
+Where two or more inflected forms exist for a single word (typically a
+"classical" form and a "modern" form), ``inflect.py`` prefers the
+more common form (typically the "modern" one), unless "classical"
+processing has been specified
+(see `MODERN VS CLASSICAL INFLECTIONS`).
+
+FORMING PLURALS AND SINGULARS
+=============================
+
+Inflecting Plurals and Singulars
+--------------------------------
+
+All of the ``plural...`` plural inflection methods take the word to be
+inflected as their first argument and return the corresponding inflection.
+Note that all such methods expect the *singular* form of the word. The
+results of passing a plural form are undefined (and unlikely to be correct).
+Similarly, the ``si...`` singular inflection method expects the *plural*
+form of the word.
+
+The ``plural...`` methods also take an optional second argument,
+which indicates the grammatical "number" of the word (or of another word
+with which the word being inflected must agree). If the "number" argument is
+supplied and is not ``1`` (or ``"one"`` or ``"a"``, or some other adjective that
+implies the singular), the plural form of the word is returned. If the
+"number" argument *does* indicate singularity, the (uninflected) word
+itself is returned. If the number argument is omitted, the plural form
+is returned unconditionally.
+
+The ``si...`` method takes a second argument in a similar fashion. If it is
+some form of the number ``1``, or is omitted, the singular form is returned.
+Otherwise the plural is returned unaltered.
+
+
+The various methods of ``inflect.engine`` are:
+
+
+
+``plural_noun(word, count=None)``
+
+ The method ``plural_noun()`` takes a *singular* English noun or
+ pronoun and returns its plural. Pronouns in the nominative ("I" ->
+ "we") and accusative ("me" -> "us") cases are handled, as are
+ possessive pronouns ("mine" -> "ours").
+
+
+``plural_verb(word, count=None)``
+
+ The method ``plural_verb()`` takes the *singular* form of a
+ conjugated verb (that is, one which is already in the correct "person"
+ and "mood") and returns the corresponding plural conjugation.
+
+
+``plural_adj(word, count=None)``
+
+ The method ``plural_adj()`` takes the *singular* form of
+ certain types of adjectives and returns the corresponding plural form.
+ Adjectives that are correctly handled include: "numerical" adjectives
+ ("a" -> "some"), demonstrative adjectives ("this" -> "these", "that" ->
+ "those"), and possessives ("my" -> "our", "cat's" -> "cats'", "child's"
+ -> "childrens'", etc.)
+
+
+``plural(word, count=None)``
+
+ The method ``plural()`` takes a *singular* English noun,
+ pronoun, verb, or adjective and returns its plural form. Where a word
+ has more than one inflection depending on its part of speech (for
+ example, the noun "thought" inflects to "thoughts", the verb "thought"
+ to "thought"), the (singular) noun sense is preferred to the (singular)
+ verb sense.
+
+ Hence ``plural("knife")`` will return "knives" ("knife" having been treated
+ as a singular noun), whereas ``plural("knifes")`` will return "knife"
+ ("knifes" having been treated as a 3rd person singular verb).
+
+ The inherent ambiguity of such cases suggests that,
+ where the part of speech is known, ``plural_noun``, ``plural_verb``, and
+ ``plural_adj`` should be used in preference to ``plural``.
+
+
+``singular_noun(word, count=None)``
+
+ The method ``singular_noun()`` takes a *plural* English noun or
+ pronoun and returns its singular. Pronouns in the nominative ("we" ->
+ "I") and accusative ("us" -> "me") cases are handled, as are
+ possessive pronouns ("ours" -> "mine"). When third person
+ singular pronouns are returned they take the neuter gender by default
+ ("they" -> "it"), not ("they"-> "she") nor ("they" -> "he"). This can be
+ changed with ``gender()``.
+
+Note that all these methods ignore any whitespace surrounding the
+word being inflected, but preserve that whitespace when the result is
+returned. For example, ``plural(" cat  ")`` returns " cats  ".
+
+
+``gender(genderletter)``
+
+ The third person plural pronoun takes the same form for the female, male and
+ neuter (e.g. "they"). The singular however, depends upon gender (e.g. "she",
+ "he", "it" and "they" -- "they" being the gender neutral form.) By default
+ ``singular_noun`` returns the neuter form, however, the gender can be selected with
+ the ``gender`` method. Pass the first letter of the gender to
+ ``gender`` to return the f(eminine), m(asculine), n(euter) or t(hey)
+ form of the singular. e.g.
+ gender('f') followed by singular_noun('themselves') returns 'herself'.
+
+Numbered plurals
+----------------
+
+The ``plural...`` methods return only the inflected word, not the count that
+was used to inflect it. Thus, in order to produce "I saw 3 ducks", it
+is necessary to use:
+
+.. code-block:: python
+
+    print("I saw", N, p.plural_noun(animal, N))
+
+Since the usual purpose of producing a plural is to make it agree with
+a preceding count, inflect.py provides a method
+(``no(word, count)``) which, given a word and a(n optional) count, returns the
+count followed by the correctly inflected word. Hence the previous
+example can be rewritten:
+
+.. code-block:: python
+
+    print("I saw ", p.no(animal, N))
+
+In addition, if the count is zero (or some other term which implies
+zero, such as ``"zero"``, ``"nil"``, etc.) the count is replaced by the
+word "no". Hence, if ``N`` had the value zero, the previous example
+would print (the somewhat more elegant)::
+
+    I saw no animals
+
+rather than::
+
+    I saw 0 animals
+
+Note that the name of the method is a pun: the method
+returns either a number (a *No.*) or a ``"no"``, in front of the
+inflected word.
+
+
+Reducing the number of counts required
+--------------------------------------
+
+In some contexts, the need to supply an explicit count to the various
+``plural...`` methods makes for tiresome repetition. For example:
+
+.. code-block:: python
+
+    print(
+        plural_adj("This", errors),
+        plural_noun(" error", errors),
+        plural_verb(" was", errors),
+        " fatal.",
+    )
+
+inflect.py therefore provides a method
+(``num(count=None, show=None)``) which may be used to set a persistent "default number"
+value. If such a value is set, it is subsequently used whenever an
+optional second "number" argument is omitted. The default value thus set
+can subsequently be removed by calling ``num()`` with no arguments.
+Hence we could rewrite the previous example:
+
+.. code-block:: python
+
+    p.num(errors)
+    print(p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal.")
+    p.num()
+
+Normally, ``num()`` returns its first argument, so that it may also
+be "inlined" in contexts like:
+
+.. code-block:: python
+
+    print(p.num(errors), p.plural_noun(" error"), p.plural_verb(" was"), " detected.")
+    if severity > 1:
+        print(
+            p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal."
+        )
+
+However, in certain contexts (see `INTERPOLATING INFLECTIONS IN STRINGS`)
+it is preferable that ``num()`` return an empty string. Hence ``num()``
+provides an optional second argument. If that argument is supplied (that is, if
+it is defined) and evaluates to false, ``num`` returns an empty string
+instead of its first argument. For example:
+
+.. code-block:: python
+
+    print(p.num(errors, 0), p.no("error"), p.plural_verb(" was"), " detected.")
+    if severity > 1:
+        print(
+            p.plural_adj("This"), p.plural_noun(" error"), p.plural_verb(" was"), "fatal."
+        )
+
+
+
+Number-insensitive equality
+---------------------------
+
+inflect.py also provides a solution to the problem
+of comparing words of differing plurality through the methods
+``compare(word1, word2)``, ``compare_nouns(word1, word2)``,
+``compare_verbs(word1, word2)``, and ``compare_adjs(word1, word2)``.
+Each  of these methods takes two strings, and  compares them
+using the corresponding plural-inflection method (``plural()``, ``plural_noun()``,
+``plural_verb()``, and ``plural_adj()`` respectively).
+
+The comparison returns true if:
+
+- the strings are equal, or
+- one string is equal to a plural form of the other, or
+- the strings are two different plural forms of the one word.
+
+
+Hence all of the following return true:
+
+.. code-block:: python
+
+    p.compare("index", "index")  # RETURNS "eq"
+    p.compare("index", "indexes")  # RETURNS "s:p"
+    p.compare("index", "indices")  # RETURNS "s:p"
+    p.compare("indexes", "index")  # RETURNS "p:s"
+    p.compare("indices", "index")  # RETURNS "p:s"
+    p.compare("indices", "indexes")  # RETURNS "p:p"
+    p.compare("indexes", "indices")  # RETURNS "p:p"
+    p.compare("indices", "indices")  # RETURNS "eq"
+
+As indicated by the comments in the previous example, the actual value
+returned by the various ``compare`` methods encodes which of the
+three equality rules succeeded: "eq" is returned if the strings were
+identical, "s:p" if the strings were singular and plural respectively,
+"p:s" for plural and singular, and "p:p" for two distinct plurals.
+Inequality is indicated by returning an empty string.
+
+It should be noted that two distinct singular words which happen to take
+the same plural form are *not* considered equal, nor are cases where
+one (singular) word's plural is the other (plural) word's singular.
+Hence all of the following return false:
+
+.. code-block:: python
+
+    p.compare("base", "basis")  # ALTHOUGH BOTH -> "bases"
+    p.compare("syrinx", "syringe")  # ALTHOUGH BOTH -> "syringes"
+    p.compare("she", "he")  # ALTHOUGH BOTH -> "they"
+
+    p.compare("opus", "operas")  # ALTHOUGH "opus" -> "opera" -> "operas"
+    p.compare("taxi", "taxes")  # ALTHOUGH "taxi" -> "taxis" -> "taxes"
+
+Note too that, although the comparison is "number-insensitive" it is *not*
+case-insensitive (that is, ``plural("time","Times")`` returns false. To obtain
+both number and case insensitivity, use the ``lower()`` method on both strings
+(that is, ``plural("time".lower(), "Times".lower())`` returns true).
+
+Related Functionality
+=====================
+
+Shout out to these libraries that provide related functionality:
+
+* `WordSet <https://jaracotext.readthedocs.io/en/latest/#jaraco.text.WordSet>`_
+  parses identifiers like variable names into sets of words suitable for re-assembling
+  in another form.
+
+* `word2number <https://pypi.org/project/word2number/>`_ converts words to
+  a number.
+
+
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-PROJECT?utm_source=pypi-PROJECT&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/inflect-7.5.0.dist-info/RECORD b/libs/inflect-7.5.0.dist-info/RECORD
new file mode 100644
index 0000000000..78584c4169
--- /dev/null
+++ b/libs/inflect-7.5.0.dist-info/RECORD
@@ -0,0 +1,11 @@
+inflect-7.5.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+inflect-7.5.0.dist-info/METADATA,sha256=nBpC4XfOmO4qLx5BNyMDhiehzBXA0nRvUrfegl58Yic,24831
+inflect-7.5.0.dist-info/RECORD,,
+inflect-7.5.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+inflect-7.5.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+inflect-7.5.0.dist-info/licenses/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
+inflect-7.5.0.dist-info/top_level.txt,sha256=m52ujdp10CqT6jh1XQxZT6kEntcnv-7Tl7UiGNTzWZA,8
+inflect/__init__.py,sha256=JGFQ6n6LMyJSBuTFpCAx9PJSuN9yZwEm6DhyUQLuUjc,103339
+inflect/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+inflect/compat/py38.py,sha256=oObVfVnWX9_OpnOuEJn1mFbJxVhwyR5epbiTNXDDaso,160
+inflect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/flask_restx-1.3.0.dist-info/REQUESTED b/libs/inflect-7.5.0.dist-info/REQUESTED
similarity index 100%
rename from libs/flask_restx-1.3.0.dist-info/REQUESTED
rename to libs/inflect-7.5.0.dist-info/REQUESTED
diff --git a/libs/inflect-7.5.0.dist-info/WHEEL b/libs/inflect-7.5.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/inflect-7.5.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/inflect-7.4.0.dist-info/LICENSE b/libs/inflect-7.5.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/inflect-7.4.0.dist-info/LICENSE
rename to libs/inflect-7.5.0.dist-info/licenses/LICENSE
diff --git a/libs/inflect-7.4.0.dist-info/top_level.txt b/libs/inflect-7.5.0.dist-info/top_level.txt
similarity index 100%
rename from libs/inflect-7.4.0.dist-info/top_level.txt
rename to libs/inflect-7.5.0.dist-info/top_level.txt
diff --git a/libs/inflect/__init__.py b/libs/inflect/__init__.py
index 47a8e05fae..3eef486b84 100644
--- a/libs/inflect/__init__.py
+++ b/libs/inflect/__init__.py
@@ -2264,19 +2264,13 @@ def _get_value_from_ast(self, obj):
         """
         Return the value of the ast object.
         """
-        if isinstance(obj, ast.Num):
-            return obj.n
-        elif isinstance(obj, ast.Str):
-            return obj.s
+        if isinstance(obj, ast.Constant):
+            return obj.value
         elif isinstance(obj, ast.List):
             return [self._get_value_from_ast(e) for e in obj.elts]
         elif isinstance(obj, ast.Tuple):
             return tuple([self._get_value_from_ast(e) for e in obj.elts])
 
-        # None, True and False are NameConstants in Py3.4 and above.
-        elif isinstance(obj, ast.NameConstant):
-            return obj.value
-
         # Probably passed a variable name.
         # Or passed a single word without wrapping it in quotes as an argument
         # ex: p.inflect("I plural(see)") instead of p.inflect("I plural('see')")
@@ -2600,20 +2594,16 @@ def singular_noun(
             return f"{pre}{plural}{post}"
         return False
 
-    def _plequal(self, word1: str, word2: str, pl) -> Union[str, bool]:  # noqa: C901
+    def _plequal(self, word1: str, word2: str, pl) -> Union[str, bool]:
         classval = self.classical_dict.copy()
-        self.classical_dict = all_classical.copy()
-        if word1 == word2:
-            return "eq"
-        if word1 == pl(word2):
-            return "p:s"
-        if pl(word1) == word2:
-            return "s:p"
-        self.classical_dict = no_classical.copy()
-        if word1 == pl(word2):
-            return "p:s"
-        if pl(word1) == word2:
-            return "s:p"
+        for dictionary in (all_classical, no_classical):
+            self.classical_dict = dictionary.copy()
+            if word1 == word2:
+                return "eq"
+            if word1 == pl(word2):
+                return "p:s"
+            if pl(word1) == word2:
+                return "s:p"
         self.classical_dict = classval.copy()
 
         if pl == self.plural or pl == self.plural_noun:
diff --git a/libs/itsdangerous-2.2.0.dist-info/METADATA b/libs/itsdangerous-2.2.0.dist-info/METADATA
index ddf5464849..068c26807f 100644
--- a/libs/itsdangerous-2.2.0.dist-info/METADATA
+++ b/libs/itsdangerous-2.2.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: itsdangerous
 Version: 2.2.0
 Summary: Safely pass data to untrusted environments and back.
@@ -11,6 +11,7 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Typing :: Typed
+License-File: LICENSE.txt
 Project-URL: Changes, https://itsdangerous.palletsprojects.com/changes/
 Project-URL: Chat, https://discord.gg/pallets
 Project-URL: Documentation, https://itsdangerous.palletsprojects.com/
diff --git a/libs/itsdangerous-2.2.0.dist-info/RECORD b/libs/itsdangerous-2.2.0.dist-info/RECORD
index 01486a83b0..97f1c8ba34 100644
--- a/libs/itsdangerous-2.2.0.dist-info/RECORD
+++ b/libs/itsdangerous-2.2.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 itsdangerous-2.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-itsdangerous-2.2.0.dist-info/LICENSE.txt,sha256=Y68JiRtr6K0aQlLtQ68PTvun_JSOIoNnvtfzxa4LCdc,1475
-itsdangerous-2.2.0.dist-info/METADATA,sha256=0rk0-1ZwihuU5DnwJVwPWoEI4yWOyCexih3JyZHblhE,1924
+itsdangerous-2.2.0.dist-info/METADATA,sha256=RiGPKqVN5nLW1yTCysNcH4cS134_oNhUowNV24yEi9c,1950
 itsdangerous-2.2.0.dist-info/RECORD,,
 itsdangerous-2.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-itsdangerous-2.2.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+itsdangerous-2.2.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+itsdangerous-2.2.0.dist-info/licenses/LICENSE.txt,sha256=Y68JiRtr6K0aQlLtQ68PTvun_JSOIoNnvtfzxa4LCdc,1475
 itsdangerous/__init__.py,sha256=4SK75sCe29xbRgQE1ZQtMHnKUuZYAf3bSpZOrff1IAY,1427
 itsdangerous/_json.py,sha256=wPQGmge2yZ9328EHKF6gadGeyGYCJQKxtU-iLKE6UnA,473
 itsdangerous/encoding.py,sha256=wwTz5q_3zLcaAdunk6_vSoStwGqYWe307Zl_U87aRFM,1409
diff --git a/libs/itsdangerous-2.2.0.dist-info/WHEEL b/libs/itsdangerous-2.2.0.dist-info/WHEEL
index 3b5e64b5e6..d8b9936dad 100644
--- a/libs/itsdangerous-2.2.0.dist-info/WHEEL
+++ b/libs/itsdangerous-2.2.0.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.12.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/itsdangerous-2.2.0.dist-info/LICENSE.txt b/libs/itsdangerous-2.2.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/itsdangerous-2.2.0.dist-info/LICENSE.txt
rename to libs/itsdangerous-2.2.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/jinja2-3.1.5.dist-info/METADATA b/libs/jinja2-3.1.5.dist-info/METADATA
deleted file mode 100644
index 6d0348d9dd..0000000000
--- a/libs/jinja2-3.1.5.dist-info/METADATA
+++ /dev/null
@@ -1,75 +0,0 @@
-Metadata-Version: 2.3
-Name: Jinja2
-Version: 3.1.5
-Summary: A very fast and expressive template engine.
-Maintainer-email: Pallets <contact@palletsprojects.com>
-Requires-Python: >=3.7
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Classifier: Topic :: Text Processing :: Markup :: HTML
-Classifier: Typing :: Typed
-Requires-Dist: MarkupSafe>=2.0
-Requires-Dist: Babel>=2.7 ; extra == "i18n"
-Project-URL: Changes, https://jinja.palletsprojects.com/changes/
-Project-URL: Chat, https://discord.gg/pallets
-Project-URL: Documentation, https://jinja.palletsprojects.com/
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Source, https://github.com/pallets/jinja/
-Provides-Extra: i18n
-
-# Jinja
-
-Jinja is a fast, expressive, extensible templating engine. Special
-placeholders in the template allow writing code similar to Python
-syntax. Then the template is passed data to render the final document.
-
-It includes:
-
--   Template inheritance and inclusion.
--   Define and import macros within templates.
--   HTML templates can use autoescaping to prevent XSS from untrusted
-    user input.
--   A sandboxed environment can safely render untrusted templates.
--   AsyncIO support for generating templates and calling async
-    functions.
--   I18N support with Babel.
--   Templates are compiled to optimized Python code just-in-time and
-    cached, or can be compiled ahead-of-time.
--   Exceptions point to the correct line in templates to make debugging
-    easier.
--   Extensible filters, tests, functions, and even syntax.
-
-Jinja's philosophy is that while application logic belongs in Python if
-possible, it shouldn't make the template designer's job difficult by
-restricting functionality too much.
-
-
-## In A Nutshell
-
-```jinja
-{% extends "base.html" %}
-{% block title %}Members{% endblock %}
-{% block content %}
-  <ul>
-  {% for user in users %}
-    <li><a href="{{ user.url }}">{{ user.username }}</a></li>
-  {% endfor %}
-  </ul>
-{% endblock %}
-```
-
-## Donate
-
-The Pallets organization develops and supports Jinja and other popular
-packages. In order to grow the community of contributors and users, and
-allow the maintainers to devote more time to the projects, [please
-donate today][].
-
-[please donate today]: https://palletsprojects.com/donate
-
diff --git a/libs/jinja2-3.1.5.dist-info/RECORD b/libs/jinja2-3.1.5.dist-info/RECORD
deleted file mode 100644
index 35ef2e15e5..0000000000
--- a/libs/jinja2-3.1.5.dist-info/RECORD
+++ /dev/null
@@ -1,33 +0,0 @@
-jinja2-3.1.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-jinja2-3.1.5.dist-info/LICENSE.txt,sha256=O0nc7kEF6ze6wQ-vG-JgQI_oXSUrjp3y4JefweCUQ3s,1475
-jinja2-3.1.5.dist-info/METADATA,sha256=PJNSUFNBwoqGA2vce2XSP8M_p2EYqAHYI7hoWLABtFo,2593
-jinja2-3.1.5.dist-info/RECORD,,
-jinja2-3.1.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jinja2-3.1.5.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-jinja2-3.1.5.dist-info/entry_points.txt,sha256=OL85gYU1eD8cuPlikifFngXpeBjaxl6rIJ8KkC_3r-I,58
-jinja2/__init__.py,sha256=zpt8UHzpS2eB1c04kn1LkKkaXLXXcKd33klq7UJGIgg,1928
-jinja2/_identifier.py,sha256=_zYctNKzRqlk_murTNlzrju1FFJL7Va_Ijqqd7ii2lU,1958
-jinja2/async_utils.py,sha256=vK-PdsuorOMnWSnEkT3iUJRIkTnYgO2T6MnGxDgHI5o,2834
-jinja2/bccache.py,sha256=gh0qs9rulnXo0PhX5jTJy2UHzI8wFnQ63o_vw7nhzRg,14061
-jinja2/compiler.py,sha256=9RpCQl5X88BHllJiPsHPh295Hh0uApvwFJNQuutULeM,74131
-jinja2/constants.py,sha256=GMoFydBF_kdpaRKPoM5cl5MviquVRLVyZtfp5-16jg0,1433
-jinja2/debug.py,sha256=CnHqCDHd-BVGvti_8ZsTolnXNhA3ECsY-6n_2pwU8Hw,6297
-jinja2/defaults.py,sha256=boBcSw78h-lp20YbaXSJsqkAI2uN_mD_TtCydpeq5wU,1267
-jinja2/environment.py,sha256=9nhrP7Ch-NbGX00wvyr4yy-uhNHq2OCc60ggGrni_fk,61513
-jinja2/exceptions.py,sha256=ioHeHrWwCWNaXX1inHmHVblvc4haO7AXsjCp3GfWvx0,5071
-jinja2/ext.py,sha256=5PF5eHfh8mXAIxXHHRB2xXbXohi8pE3nHSOxa66uS7E,31875
-jinja2/filters.py,sha256=cvRI2pqXNMzw8ba41VOBpgu_wu1r-l1_QxwD6yVoJ5g,55025
-jinja2/idtracking.py,sha256=-ll5lIp73pML3ErUYiIJj7tdmWxcH_IlDv3yA_hiZYo,10555
-jinja2/lexer.py,sha256=LYiYio6br-Tep9nPcupWXsPEtjluw3p1mU-lNBVRUfk,29786
-jinja2/loaders.py,sha256=wIrnxjvcbqh5VwW28NSkfotiDq8qNCxIOSFbGUiSLB4,24055
-jinja2/meta.py,sha256=OTDPkaFvU2Hgvx-6akz7154F8BIWaRmvJcBFvwopHww,4397
-jinja2/nativetypes.py,sha256=7GIGALVJgdyL80oZJdQUaUfwSt5q2lSSZbXt0dNf_M4,4210
-jinja2/nodes.py,sha256=m1Duzcr6qhZI8JQ6VyJgUNinjAf5bQzijSmDnMsvUx8,34579
-jinja2/optimizer.py,sha256=rJnCRlQ7pZsEEmMhsQDgC_pKyDHxP5TPS6zVPGsgcu8,1651
-jinja2/parser.py,sha256=lLOFy3sEmHc5IaEHRiH1sQVnId2moUQzhyeJZTtdY30,40383
-jinja2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jinja2/runtime.py,sha256=gDk-GvdriJXqgsGbHgrcKTP0Yp6zPXzhzrIpCFH3jAU,34249
-jinja2/sandbox.py,sha256=Mw2aitlY2I8la7FYhcX2YG9BtUYcLnD0Gh3d29cDWrY,15009
-jinja2/tests.py,sha256=VLsBhVFnWg-PxSBz1MhRnNWgP1ovXk3neO1FLQMeC9Q,5926
-jinja2/utils.py,sha256=rRp3o9e7ZKS4fyrWRbELyLcpuGVTFcnooaOa1qx_FIk,24129
-jinja2/visitor.py,sha256=EcnL1PIwf_4RVCOMxsRNuR8AXHbS1qfAdMOE2ngKJz4,3557
diff --git a/libs/jinja2-3.1.5.dist-info/WHEEL b/libs/jinja2-3.1.5.dist-info/WHEEL
deleted file mode 100644
index e3c6feefa2..0000000000
--- a/libs/jinja2-3.1.5.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.10.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/flask_restx-1.3.0.dist-info/INSTALLER b/libs/jinja2-3.1.6.dist-info/INSTALLER
similarity index 100%
rename from libs/flask_restx-1.3.0.dist-info/INSTALLER
rename to libs/jinja2-3.1.6.dist-info/INSTALLER
diff --git a/libs/jinja2-3.1.6.dist-info/METADATA b/libs/jinja2-3.1.6.dist-info/METADATA
new file mode 100644
index 0000000000..ffef2ff3bf
--- /dev/null
+++ b/libs/jinja2-3.1.6.dist-info/METADATA
@@ -0,0 +1,84 @@
+Metadata-Version: 2.4
+Name: Jinja2
+Version: 3.1.6
+Summary: A very fast and expressive template engine.
+Maintainer-email: Pallets <contact@palletsprojects.com>
+Requires-Python: >=3.7
+Description-Content-Type: text/markdown
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Classifier: Topic :: Text Processing :: Markup :: HTML
+Classifier: Typing :: Typed
+License-File: LICENSE.txt
+Requires-Dist: MarkupSafe>=2.0
+Requires-Dist: Babel>=2.7 ; extra == "i18n"
+Project-URL: Changes, https://jinja.palletsprojects.com/changes/
+Project-URL: Chat, https://discord.gg/pallets
+Project-URL: Documentation, https://jinja.palletsprojects.com/
+Project-URL: Donate, https://palletsprojects.com/donate
+Project-URL: Source, https://github.com/pallets/jinja/
+Provides-Extra: i18n
+
+# Jinja
+
+Jinja is a fast, expressive, extensible templating engine. Special
+placeholders in the template allow writing code similar to Python
+syntax. Then the template is passed data to render the final document.
+
+It includes:
+
+-   Template inheritance and inclusion.
+-   Define and import macros within templates.
+-   HTML templates can use autoescaping to prevent XSS from untrusted
+    user input.
+-   A sandboxed environment can safely render untrusted templates.
+-   AsyncIO support for generating templates and calling async
+    functions.
+-   I18N support with Babel.
+-   Templates are compiled to optimized Python code just-in-time and
+    cached, or can be compiled ahead-of-time.
+-   Exceptions point to the correct line in templates to make debugging
+    easier.
+-   Extensible filters, tests, functions, and even syntax.
+
+Jinja's philosophy is that while application logic belongs in Python if
+possible, it shouldn't make the template designer's job difficult by
+restricting functionality too much.
+
+
+## In A Nutshell
+
+```jinja
+{% extends "base.html" %}
+{% block title %}Members{% endblock %}
+{% block content %}
+  <ul>
+  {% for user in users %}
+    <li><a href="{{ user.url }}">{{ user.username }}</a></li>
+  {% endfor %}
+  </ul>
+{% endblock %}
+```
+
+## Donate
+
+The Pallets organization develops and supports Jinja and other popular
+packages. In order to grow the community of contributors and users, and
+allow the maintainers to devote more time to the projects, [please
+donate today][].
+
+[please donate today]: https://palletsprojects.com/donate
+
+## Contributing
+
+See our [detailed contributing documentation][contrib] for many ways to
+contribute, including reporting issues, requesting features, asking or answering
+questions, and making PRs.
+
+[contrib]: https://palletsprojects.com/contributing/
+
diff --git a/libs/jinja2-3.1.6.dist-info/RECORD b/libs/jinja2-3.1.6.dist-info/RECORD
new file mode 100644
index 0000000000..63c734af37
--- /dev/null
+++ b/libs/jinja2-3.1.6.dist-info/RECORD
@@ -0,0 +1,33 @@
+jinja2-3.1.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+jinja2-3.1.6.dist-info/METADATA,sha256=aMVUj7Z8QTKhOJjZsx7FDGvqKr3ZFdkh8hQ1XDpkmcg,2871
+jinja2-3.1.6.dist-info/RECORD,,
+jinja2-3.1.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jinja2-3.1.6.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+jinja2-3.1.6.dist-info/entry_points.txt,sha256=OL85gYU1eD8cuPlikifFngXpeBjaxl6rIJ8KkC_3r-I,58
+jinja2-3.1.6.dist-info/licenses/LICENSE.txt,sha256=O0nc7kEF6ze6wQ-vG-JgQI_oXSUrjp3y4JefweCUQ3s,1475
+jinja2/__init__.py,sha256=xxepO9i7DHsqkQrgBEduLtfoz2QCuT6_gbL4XSN1hbU,1928
+jinja2/_identifier.py,sha256=_zYctNKzRqlk_murTNlzrju1FFJL7Va_Ijqqd7ii2lU,1958
+jinja2/async_utils.py,sha256=vK-PdsuorOMnWSnEkT3iUJRIkTnYgO2T6MnGxDgHI5o,2834
+jinja2/bccache.py,sha256=gh0qs9rulnXo0PhX5jTJy2UHzI8wFnQ63o_vw7nhzRg,14061
+jinja2/compiler.py,sha256=9RpCQl5X88BHllJiPsHPh295Hh0uApvwFJNQuutULeM,74131
+jinja2/constants.py,sha256=GMoFydBF_kdpaRKPoM5cl5MviquVRLVyZtfp5-16jg0,1433
+jinja2/debug.py,sha256=CnHqCDHd-BVGvti_8ZsTolnXNhA3ECsY-6n_2pwU8Hw,6297
+jinja2/defaults.py,sha256=boBcSw78h-lp20YbaXSJsqkAI2uN_mD_TtCydpeq5wU,1267
+jinja2/environment.py,sha256=9nhrP7Ch-NbGX00wvyr4yy-uhNHq2OCc60ggGrni_fk,61513
+jinja2/exceptions.py,sha256=ioHeHrWwCWNaXX1inHmHVblvc4haO7AXsjCp3GfWvx0,5071
+jinja2/ext.py,sha256=5PF5eHfh8mXAIxXHHRB2xXbXohi8pE3nHSOxa66uS7E,31875
+jinja2/filters.py,sha256=PQ_Egd9n9jSgtnGQYyF4K5j2nYwhUIulhPnyimkdr-k,55212
+jinja2/idtracking.py,sha256=-ll5lIp73pML3ErUYiIJj7tdmWxcH_IlDv3yA_hiZYo,10555
+jinja2/lexer.py,sha256=LYiYio6br-Tep9nPcupWXsPEtjluw3p1mU-lNBVRUfk,29786
+jinja2/loaders.py,sha256=wIrnxjvcbqh5VwW28NSkfotiDq8qNCxIOSFbGUiSLB4,24055
+jinja2/meta.py,sha256=OTDPkaFvU2Hgvx-6akz7154F8BIWaRmvJcBFvwopHww,4397
+jinja2/nativetypes.py,sha256=7GIGALVJgdyL80oZJdQUaUfwSt5q2lSSZbXt0dNf_M4,4210
+jinja2/nodes.py,sha256=m1Duzcr6qhZI8JQ6VyJgUNinjAf5bQzijSmDnMsvUx8,34579
+jinja2/optimizer.py,sha256=rJnCRlQ7pZsEEmMhsQDgC_pKyDHxP5TPS6zVPGsgcu8,1651
+jinja2/parser.py,sha256=lLOFy3sEmHc5IaEHRiH1sQVnId2moUQzhyeJZTtdY30,40383
+jinja2/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jinja2/runtime.py,sha256=gDk-GvdriJXqgsGbHgrcKTP0Yp6zPXzhzrIpCFH3jAU,34249
+jinja2/sandbox.py,sha256=Mw2aitlY2I8la7FYhcX2YG9BtUYcLnD0Gh3d29cDWrY,15009
+jinja2/tests.py,sha256=VLsBhVFnWg-PxSBz1MhRnNWgP1ovXk3neO1FLQMeC9Q,5926
+jinja2/utils.py,sha256=rRp3o9e7ZKS4fyrWRbELyLcpuGVTFcnooaOa1qx_FIk,24129
+jinja2/visitor.py,sha256=EcnL1PIwf_4RVCOMxsRNuR8AXHbS1qfAdMOE2ngKJz4,3557
diff --git a/libs/ftfy-6.2.3.dist-info/REQUESTED b/libs/jinja2-3.1.6.dist-info/REQUESTED
similarity index 100%
rename from libs/ftfy-6.2.3.dist-info/REQUESTED
rename to libs/jinja2-3.1.6.dist-info/REQUESTED
diff --git a/libs/jinja2-3.1.6.dist-info/WHEEL b/libs/jinja2-3.1.6.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/jinja2-3.1.6.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/jinja2-3.1.5.dist-info/entry_points.txt b/libs/jinja2-3.1.6.dist-info/entry_points.txt
similarity index 100%
rename from libs/jinja2-3.1.5.dist-info/entry_points.txt
rename to libs/jinja2-3.1.6.dist-info/entry_points.txt
diff --git a/libs/jinja2-3.1.5.dist-info/LICENSE.txt b/libs/jinja2-3.1.6.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/jinja2-3.1.5.dist-info/LICENSE.txt
rename to libs/jinja2-3.1.6.dist-info/licenses/LICENSE.txt
diff --git a/libs/jinja2/__init__.py b/libs/jinja2/__init__.py
index d669f295b4..1a423a3eac 100644
--- a/libs/jinja2/__init__.py
+++ b/libs/jinja2/__init__.py
@@ -35,4 +35,4 @@
 from .utils import pass_eval_context as pass_eval_context
 from .utils import select_autoescape as select_autoescape
 
-__version__ = "3.1.5"
+__version__ = "3.1.6"
diff --git a/libs/jinja2/filters.py b/libs/jinja2/filters.py
index e5b5a00c5e..2bcba4fbd3 100644
--- a/libs/jinja2/filters.py
+++ b/libs/jinja2/filters.py
@@ -6,6 +6,7 @@
 import typing
 import typing as t
 from collections import abc
+from inspect import getattr_static
 from itertools import chain
 from itertools import groupby
 
@@ -1411,31 +1412,25 @@ def do_reverse(value: t.Union[str, t.Iterable[V]]) -> t.Union[str, t.Iterable[V]
 def do_attr(
     environment: "Environment", obj: t.Any, name: str
 ) -> t.Union[Undefined, t.Any]:
-    """Get an attribute of an object.  ``foo|attr("bar")`` works like
-    ``foo.bar`` just that always an attribute is returned and items are not
-    looked up.
+    """Get an attribute of an object. ``foo|attr("bar")`` works like
+    ``foo.bar``, but returns undefined instead of falling back to ``foo["bar"]``
+    if the attribute doesn't exist.
 
     See :ref:`Notes on subscriptions <notes-on-subscriptions>` for more details.
     """
+    # Environment.getattr will fall back to obj[name] if obj.name doesn't exist.
+    # But we want to call env.getattr to get behavior such as sandboxing.
+    # Determine if the attr exists first, so we know the fallback won't trigger.
     try:
-        name = str(name)
-    except UnicodeError:
-        pass
-    else:
-        try:
-            value = getattr(obj, name)
-        except AttributeError:
-            pass
-        else:
-            if environment.sandboxed:
-                environment = t.cast("SandboxedEnvironment", environment)
-
-                if not environment.is_safe_attribute(obj, name, value):
-                    return environment.unsafe_undefined(obj, name)
-
-            return value
-
-    return environment.undefined(obj=obj, name=name)
+        # This avoids executing properties/descriptors, but misses __getattr__
+        # and __getattribute__ dynamic attrs.
+        getattr_static(obj, name)
+    except AttributeError:
+        # This finds dynamic attrs, and we know it's not a descriptor at this point.
+        if not hasattr(obj, name):
+            return environment.undefined(obj=obj, name=name)
+
+    return environment.getattr(obj, name)
 
 
 @typing.overload
diff --git a/libs/ftfy-6.2.3.dist-info/INSTALLER b/libs/js2py-0.74.dist-info/INSTALLER
similarity index 100%
rename from libs/ftfy-6.2.3.dist-info/INSTALLER
rename to libs/js2py-0.74.dist-info/INSTALLER
diff --git a/libs/js2py-0.74.dist-info/METADATA b/libs/js2py-0.74.dist-info/METADATA
new file mode 100644
index 0000000000..a35be0b740
--- /dev/null
+++ b/libs/js2py-0.74.dist-info/METADATA
@@ -0,0 +1,37 @@
+Metadata-Version: 2.4
+Name: Js2Py
+Version: 0.74
+Summary: JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python.
+Home-page: https://github.com/PiotrDabkowski/Js2Py
+Author: Piotr Dabkowski
+Author-email: piodrus@gmail.com
+License: MIT
+License-File: LICENSE.md
+Requires-Dist: tzlocal>=1.2
+Requires-Dist: six>=1.10
+Requires-Dist: pyjsparser>=2.5.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
+
+Translates JavaScript to Python code. Js2Py is able to translate and execute virtually any JavaScript code.
+
+Js2Py is written in pure python and does not have any dependencies. Basically an implementation of JavaScript core in pure python.
+
+
+    import js2py
+
+    f = js2py.eval_js( "function $(name) {return name.length}" )
+
+    f("Hello world")
+
+    # returns 11
+
+Now also supports ECMA 6 through js2py.eval_js6(js6_code)!
+
+More examples at: https://github.com/PiotrDabkowski/Js2Py
diff --git a/libs/js2py-0.74.dist-info/RECORD b/libs/js2py-0.74.dist-info/RECORD
new file mode 100644
index 0000000000..cf583183c6
--- /dev/null
+++ b/libs/js2py-0.74.dist-info/RECORD
@@ -0,0 +1,101 @@
+js2py-0.74.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+js2py-0.74.dist-info/METADATA,sha256=EsxDQrBB3A2LSeMzBE55q-4t-GTdP7AD1iLqykYiv2Q,1016
+js2py-0.74.dist-info/RECORD,,
+js2py-0.74.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+js2py-0.74.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+js2py-0.74.dist-info/licenses/LICENSE.md,sha256=5HcnGlDEDJrDrVbQLnDH19l_ZscybPUk0TsS-IQsxOk,1088
+js2py-0.74.dist-info/top_level.txt,sha256=Me1vDvBnqRgA6Jf96euhHjsa-dYkaXpr3Sm0RGPoGn8,6
+js2py/__init__.py,sha256=VlWswk9Sf3qBwxaJ1E9STDxUdTYh3PLKp6Kn1ws0STE,2886
+js2py/base.py,sha256=_h7HbsB30cybzGAU7XIX5tawMA4C7IHFsRi_ESRqzZc,115810
+js2py/constructors/__init__.py,sha256=isKbPQhm2gf7O6f4aW0F9J0yBlds8jYDq5xA4u08xrE,30
+js2py/constructors/jsarray.py,sha256=_uwE632g_crmwQeBTdi5U0RztCeTOofjm2eoStiMFlI,969
+js2py/constructors/jsarraybuffer.py,sha256=jD3kFsBykePAjsSitg3qki4Dhc1fGvOM1hxomtxPPEI,871
+js2py/constructors/jsboolean.py,sha256=1LneDP_41oaQ6twN8qTDcu_gHPPPE0lcpUKegWPXGbA,350
+js2py/constructors/jsdate.py,sha256=8Qs-e8u0SuYzPsuL7TRabf2oMKcwAWKNu1UXl9bu__o,16407
+js2py/constructors/jsfloat32array.py,sha256=NElqLQu99NnJDKhYab6LUg-UP6kNQ9E1TAJOmPpMpzs,2811
+js2py/constructors/jsfloat64array.py,sha256=V-lurvILkLevzDywcO6UBZgLQsZ7wEYEeV0r-zUUcT0,2811
+js2py/constructors/jsfunction.py,sha256=QKsFNBO4JJjtWX809G4xuKvXm1HCf3a_Klq8TQ0ChRw,1399
+js2py/constructors/jsint16array.py,sha256=S8lJSOSHQzrrF2RPhhYA24YR68HWcJZ_ofrsVg-JMBw,2779
+js2py/constructors/jsint32array.py,sha256=OIopIBcREY8Xd-Gw-nNMFg5wrhmzD6o7euiefO0rpvw,2779
+js2py/constructors/jsint8array.py,sha256=71jSjflD8FAXhD0NMXJMFIA3l-dBZgeGsHqnVtDwxCk,2422
+js2py/constructors/jsmath.py,sha256=AksaLOtJRNBXP7SvYGHh2pI-e9PM8nhfxtLZxPqyKic,3692
+js2py/constructors/jsnumber.py,sha256=_0Aa-sk5URPu-SnZ6g5Hi1OshPn5G4TkASciHGOJeXA,491
+js2py/constructors/jsobject.py,sha256=AgGDGiYBQAQ5lWtwSXf3O85zSGMrQxquunODOVHqYck,6916
+js2py/constructors/jsregexp.py,sha256=Dk4yjWOBlCxOnFmrFKoj6IEKBWjpuxBRxAcSfgFV4ts,346
+js2py/constructors/jsstring.py,sha256=_q2sUc3q_zMkzUFo4N0ymsgnve-Pe6jvhzn5Q6oU-jY,775
+js2py/constructors/jsuint16array.py,sha256=h7XTf3db433tFN6uXEDdkhThXk0p_w3d6S8fCo4KIN8,2795
+js2py/constructors/jsuint32array.py,sha256=Haa0wtsu6krz4I51bLSKGBzVxCZLGuwOJCImFcfxg3g,3041
+js2py/constructors/jsuint8array.py,sha256=DJyP2x45ww7tLaVEYAVA2bkmqvAAIdRL9yDLVYzD67E,2436
+js2py/constructors/jsuint8clampedarray.py,sha256=Imk2Sijw-PKFTQoZ9d5hsCpONnq0yjUGc1Q3s73K-5c,2569
+js2py/constructors/time_helpers.py,sha256=AVgKArQqglPzVgm2ojMJZIpLPOu__s1hYq9hZPcfGGo,4392
+js2py/es6/__init__.py,sha256=1wsp7UrLjeluUuj8DT3PynY1PItrRZ7LDoIzuLMKR9E,1346
+js2py/es6/babel.py,sha256=WaOzA-YAo3KuBejnQJHl_CeKE_G7mfj5ywtz2QRfK6A,3846971
+js2py/evaljs.py,sha256=52H7wu72rsg-2FoOQ8R1w0Qd3QEXCT-XHTbjqytQs60,9435
+js2py/host/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+js2py/host/console.py,sha256=7kNYyF5aOlhUXG6kcVnvA1eBe6yBaNOLhOA6Y-UfMds,263
+js2py/host/jseval.py,sha256=A9efTYN58c3XaHk2codGCfV4qt7odoP_OIv9l1koOuo,1570
+js2py/host/jsfunctions.py,sha256=NCndE01xYPxiNZ0y39YIYIpmltFLndWxlSXWItN_QGE,3038
+js2py/internals/__init__.py,sha256=JbzdjbrSn4FHH_6eAEZHoNRzZmJc09GHXrE7QnrlhoU,29
+js2py/internals/base.py,sha256=p1ThnCKaClCfK0PlLfk5V-mXt6WTXUvu9r0OF99RebM,33137
+js2py/internals/byte_trans.py,sha256=eMcDUGNgT37sK3O36HwdOO37014XoBwAF65Qv8bqRTM,26157
+js2py/internals/code.py,sha256=zTEZyucV-cQLM6ftMqTUWo_FoBqMN-E2k5fAPNGKqlE,8877
+js2py/internals/constructors/__init__.py,sha256=isKbPQhm2gf7O6f4aW0F9J0yBlds8jYDq5xA4u08xrE,30
+js2py/internals/constructors/jsarray.py,sha256=mYtyK3OGFBlS7FFwUdeYgK8zDuuy67Gk0SwVRjBzpOE,725
+js2py/internals/constructors/jsboolean.py,sha256=YDYyR4l9rbxYenmPaI2IoFGq6_1f_tVXXmQs5-1QCQU,323
+js2py/internals/constructors/jsconsole.py,sha256=GKp-m6mQ7w_cfYAXBFVa--RfRgf1Kyf79H1qFmCPHFQ,264
+js2py/internals/constructors/jsdate.py,sha256=eFdrKx8eBZyDJ2xLmeQkye_jEsshe-GheQlShs9t-H8,15954
+js2py/internals/constructors/jsfunction.py,sha256=L2J4jCye3uPmjHm1LsIXs248BTV9g7RnWkLCCCNEvXw,2700
+js2py/internals/constructors/jsmath.py,sha256=7_Jwne8-oYrwPDbIy1f1yU-BYaZ7RJRb4q-jo5YNA-A,3743
+js2py/internals/constructors/jsnumber.py,sha256=3urg8xZT0lnJekhTKeID3FHPJy--GgmXotQD_ItREtY,591
+js2py/internals/constructors/jsobject.py,sha256=QZziWhJyEUkr5lzuM8JgtTTZxuGp_fY2gppuLxBsjAE,7304
+js2py/internals/constructors/jsregexp.py,sha256=cxJf0EW-amFQGsgMQYZWn7SgLgTnVQipz-9_H6VBhl0,1243
+js2py/internals/constructors/jsstring.py,sha256=Te0BVkhfUQmhC5LyWKccL6GvwEM10TLbMI49zfqaW80,514
+js2py/internals/constructors/time_helpers.py,sha256=ajXM8YbzIhKP_Bftq8DjCyHC4Hih7rAbNysjFzatC6g,4433
+js2py/internals/conversions.py,sha256=5_O67_HPuK1H2EsVu8TtaedjgROXfe3XlL6eGaQL_cQ,4159
+js2py/internals/desc.py,sha256=wpZvelGC3sLOoYxRTZMe2Y_f_uZkJn-O1BME6-r1n6c,2861
+js2py/internals/fill_space.py,sha256=hinxkuzAQEbYGcaE4k_710mLXsFsMS81q2H13PYTpfM,9023
+js2py/internals/func_utils.py,sha256=zFX9OxGLv-VzvJuWhlR3H3VmgY_fFjLKI0vE1MHAvLI,1927
+js2py/internals/gen.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+js2py/internals/opcodes.py,sha256=Mrx_0fYyjxriZuJS5LiO2GWuOClVGaRZpUXL0SOYrFk,21830
+js2py/internals/operations.py,sha256=Eq9HKy-16xG3ytMIwI3R2W8H03YdfAyVlA-Wx83e1ac,7756
+js2py/internals/prototypes/__init__.py,sha256=vToaNN4iVR00Jnk-mwC6gsNQptrsGHWD_a3cL2w45yg,31
+js2py/internals/prototypes/jsarray.py,sha256=blCDuSVhsKW-pUGHFFOWCJeXtQ7LLzgkjj0SSr06QU8,16374
+js2py/internals/prototypes/jsboolean.py,sha256=UK2MLfLEuwDZPmQ2AMGgIHLhrlv9CcEe7ZVEghjaZAE,670
+js2py/internals/prototypes/jserror.py,sha256=0G1GqkBf6JZFtxofqoNFsIDrDVMpFS5wrDoxaaQAPN4,545
+js2py/internals/prototypes/jsfunction.py,sha256=Bae5hCPSQ7C1pR5M795J0p0ldxEzD_mQ1aRnA1JJaYc,2009
+js2py/internals/prototypes/jsjson.py,sha256=2G-jpFBnyQCF1vkC5UURdtWVKfIR15SvZBYrOXVeeNE,6347
+js2py/internals/prototypes/jsnumber.py,sha256=RdLgKR-JFRK1VwoiPGo4B_B1IKGQYLJKfr2sVtvJBHM,4419
+js2py/internals/prototypes/jsobject.py,sha256=iC9Zjln76ouLwwfUovCKtQuP7d_OORqzXPcsgYg-3Fs,1665
+js2py/internals/prototypes/jsregexp.py,sha256=9ZzdAGEbNat_HLRtgKXNa86AbB09XEvaOmB8VwVt5sQ,1627
+js2py/internals/prototypes/jsstring.py,sha256=i541J5lk1qfbdGVe_mZS6p6dTDJhsR3EKkMFq7Q3_4g,10804
+js2py/internals/prototypes/jsutils.py,sha256=QQPrU63TkAiZQFqy799_0FQUbwEQCu4iJ2AWmo3WVUY,2730
+js2py/internals/seval.py,sha256=Yt-sET-BQpr8aPwPdeF4qJRsrnEZ3Wp15hh0ngWm_Hc,751
+js2py/internals/simplex.py,sha256=O7ucCFjiLsX8D87HfA5n78fcMKOwHEs-PJP4KRw7FoU,4132
+js2py/internals/space.py,sha256=Y5NNHy4TF7Ojn6QPwWlwmaV0FD8Dc83yoRLYo6FbwIA,2669
+js2py/internals/speed.py,sha256=FCvaUwjafvSB_wWzW4Yu64UXNNw3sIwH_sKFosWh4iw,974
+js2py/internals/trans_utils.py,sha256=k7cXh-zRpr-Rn-iL9yIPgrlrNXj5LNGFyiVMeTiH5aM,956
+js2py/node_import.py,sha256=xPeGi7BEk3heZwsRHsXy2MMvD4h-X2YWp0M5DkcSrYQ,7224
+js2py/prototypes/__init__.py,sha256=vToaNN4iVR00Jnk-mwC6gsNQptrsGHWD_a3cL2w45yg,31
+js2py/prototypes/jsarray.py,sha256=NjbL_zWtITrJKgLBOhkDVZlLc_ss6nUM-6P8MO8hggE,15458
+js2py/prototypes/jsarraybuffer.py,sha256=v1_XhH4NdmM6CoM6IxMTZsLMxZyJFZSblW4cLsHBos0,278
+js2py/prototypes/jsboolean.py,sha256=yj3oR9dA-fCpJUh-gAgwZ7K1oHjwYYSoCRGvLiZrjaQ,337
+js2py/prototypes/jserror.py,sha256=eNbCFQWOUWxPP7bYwjIAVrjpppRN7BHscF-lTaIXs-8,446
+js2py/prototypes/jsfunction.py,sha256=BxdpfEBdf_1h8D6FOX7QegIxxjxQRSU2ntX_bKg25fk,1497
+js2py/prototypes/jsjson.py,sha256=iNfpz0QS4lLdxKesJLYTrGo902A-8FAKQExKDgp3w3Y,6544
+js2py/prototypes/jsnumber.py,sha256=tx7yKbgsZ_p66BPE4Ax2PVy3bjHf09xlHYQHXDYuw2I,4016
+js2py/prototypes/jsobject.py,sha256=B2SfLQf_69CsdWm9G6qe3XGIHdXcMRLNi9fjxF-QtTE,855
+js2py/prototypes/jsregexp.py,sha256=5ceKcSGBoGs73NLQz1tpxwp3sWgT1E3nf6rRQVVcxlc,1379
+js2py/prototypes/jsstring.py,sha256=b7wbqtmuhr88mjFah-gUuzJ1ppiwYLBQZiidFYGx6G4,10059
+js2py/prototypes/jstypedarray.py,sha256=KK1cW-sRojT1iTNEdXYfbKtEPSiQ5HwbcEfJhvaeF2c,11070
+js2py/py_node_modules/__init__.py,sha256=lQz6EnruY5a4_aaPK1j9izKeF1ADaeit0ngviwZBDKI,83
+js2py/py_node_modules/crypto_js.py,sha256=100zdrTH8qL1Tt9-XmM93yBlErs2MtITS2EAWBy1H48,1207658
+js2py/py_node_modules/escodegen.py,sha256=99so-iaKhYzGfSpYzJQZrrUUM7kocUy8DLS3DFYKDUY,1255227
+js2py/py_node_modules/esprima.py,sha256=h1lRQWkvXo0L5Y4kJtp5FpKkHBRRErfVnvRZuLHFWQ0,1064590
+js2py/pyjs.py,sha256=Y3wBk8oOa5bPJmMhSvgAeMCc-7WKBM0BuYng_oKovck,2904
+js2py/translators/__init__.py,sha256=qcFRnTsPT7rSTkPWG0l0VUTQs-y23aCxZx3-3gAEAU4,1719
+js2py/translators/friendly_nodes.py,sha256=guMKmKsuNj6iCzngs40OZS2cizOdteKzx4Er8APjYtQ,8761
+js2py/translators/jsregexps.py,sha256=HDxWj-_zrnGiRztTn2aTXcqR_tgLf9TUR7TK2kKK0iw,6763
+js2py/translators/translating_nodes.py,sha256=-w18ybCM18YxWxnBmphltXbLhzlvKmSg_Ox6HIxm3xo,24712
+js2py/translators/translator.py,sha256=NGzNkN3fRrChdzmsu6fvhKhgxcdV-hVoOlNRA9gbWtk,6523
+js2py/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+js2py/utils/injector.py,sha256=gdTCsBT3KnMRjgZI7V37pIs1YjrPgMuexEU5ATSZSgc,12882
diff --git a/libs/h11-0.14.0.dist-info/REQUESTED b/libs/js2py-0.74.dist-info/REQUESTED
similarity index 100%
rename from libs/h11-0.14.0.dist-info/REQUESTED
rename to libs/js2py-0.74.dist-info/REQUESTED
diff --git a/libs/js2py-0.74.dist-info/WHEEL b/libs/js2py-0.74.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/js2py-0.74.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/js2py-0.74.dist-info/licenses/LICENSE.md b/libs/js2py-0.74.dist-info/licenses/LICENSE.md
new file mode 100644
index 0000000000..059be8d60c
--- /dev/null
+++ b/libs/js2py-0.74.dist-info/licenses/LICENSE.md
@@ -0,0 +1,19 @@
+The MIT License
+
+Copyright ยฉ 2014, 2015 Piotr Dabkowski
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the โ€œSoftwareโ€),
+to deal in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so, subject
+to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED โ€œAS ISโ€, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
\ No newline at end of file
diff --git a/libs/js2py-0.74.dist-info/top_level.txt b/libs/js2py-0.74.dist-info/top_level.txt
new file mode 100644
index 0000000000..c5a949ec97
--- /dev/null
+++ b/libs/js2py-0.74.dist-info/top_level.txt
@@ -0,0 +1 @@
+js2py
diff --git a/libs/json_tricks-3.17.3.dist-info/METADATA b/libs/json_tricks-3.17.3.dist-info/METADATA
index b446e1a0c2..c1a2798c82 100644
--- a/libs/json_tricks-3.17.3.dist-info/METADATA
+++ b/libs/json_tricks-3.17.3.dist-info/METADATA
@@ -1,5 +1,5 @@
-Metadata-Version: 2.1
-Name: json-tricks
+Metadata-Version: 2.4
+Name: json_tricks
 Version: 3.17.3
 Summary: Extra features for Python's JSON: comments, order, numpy, pandas, datetimes, and many more! Simple but customizable.
 Home-page: https://github.com/mverleg/pyjson_tricks
@@ -29,6 +29,17 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: summary
 
 # JSON tricks (python)
 
diff --git a/libs/json_tricks-3.17.3.dist-info/RECORD b/libs/json_tricks-3.17.3.dist-info/RECORD
index 5e26f48d4c..5b907bf9e3 100644
--- a/libs/json_tricks-3.17.3.dist-info/RECORD
+++ b/libs/json_tricks-3.17.3.dist-info/RECORD
@@ -1,9 +1,9 @@
 json_tricks-3.17.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-json_tricks-3.17.3.dist-info/LICENSE.txt,sha256=lVlH8LklWeHpkR8K7i3KfqD7ZHBheJ9D9byZD1RybvY,1501
-json_tricks-3.17.3.dist-info/METADATA,sha256=kOLvvWdtorbHS4vuzLZMO4CGKsN3d2fBr37M7t9Gqzs,16907
+json_tricks-3.17.3.dist-info/METADATA,sha256=dJl1rvLXxUJ5EkppVPu_xwiU0Suc2IARLPpKs-ubAOE,17133
 json_tricks-3.17.3.dist-info/RECORD,,
 json_tricks-3.17.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-json_tricks-3.17.3.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+json_tricks-3.17.3.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+json_tricks-3.17.3.dist-info/licenses/LICENSE.txt,sha256=lVlH8LklWeHpkR8K7i3KfqD7ZHBheJ9D9byZD1RybvY,1501
 json_tricks-3.17.3.dist-info/top_level.txt,sha256=cIJdcQJF7Hp1oM4islwmZvJc34kAtMLILDaxF-d5ZHE,12
 json_tricks-3.17.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 json_tricks/__init__.py,sha256=D7QTRO4WbuMTp4KBWaGJlhjHqZLg_0ogyITc96VPzYw,1559
diff --git a/libs/json_tricks-3.17.3.dist-info/WHEEL b/libs/json_tricks-3.17.3.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/json_tricks-3.17.3.dist-info/WHEEL
+++ b/libs/json_tricks-3.17.3.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/json_tricks-3.17.3.dist-info/LICENSE.txt b/libs/json_tricks-3.17.3.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/json_tricks-3.17.3.dist-info/LICENSE.txt
rename to libs/json_tricks-3.17.3.dist-info/licenses/LICENSE.txt
diff --git a/libs/jsonschema-4.17.3.dist-info/METADATA b/libs/jsonschema-4.17.3.dist-info/METADATA
index e1b42afd39..bb50e6e92f 100644
--- a/libs/jsonschema-4.17.3.dist-info/METADATA
+++ b/libs/jsonschema-4.17.3.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: jsonschema
 Version: 4.17.3
 Summary: An implementation of JSON Schema validation for Python
diff --git a/libs/jsonschema-4.17.3.dist-info/RECORD b/libs/jsonschema-4.17.3.dist-info/RECORD
index a3d24eb006..c7e9f3d6da 100644
--- a/libs/jsonschema-4.17.3.dist-info/RECORD
+++ b/libs/jsonschema-4.17.3.dist-info/RECORD
@@ -1,9 +1,9 @@
-../../bin/jsonschema,sha256=OGb6w5dwZHsl6rXgS34xFKvogE2caDivcWj8ukkFJDc,236
+../../bin/jsonschema,sha256=BjAbIXRMcTZJd5xPhFrdAr2Ijr1o57nVavmwibILOc4,189
 jsonschema-4.17.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-jsonschema-4.17.3.dist-info/METADATA,sha256=x_UDV2TgG-vvXjMZDEKIsx-NByuAhR-0OaABungk3cM,7879
+jsonschema-4.17.3.dist-info/METADATA,sha256=QKGCN8m5ENFczeaGDqCtWkqe6VsVzCxe_1hkbkxovQ4,7879
 jsonschema-4.17.3.dist-info/RECORD,,
 jsonschema-4.17.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jsonschema-4.17.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+jsonschema-4.17.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
 jsonschema-4.17.3.dist-info/entry_points.txt,sha256=vO7rX4Fs_xIVJy2pnAtKgTSxfpnozAVQ0DjCmpMxnWE,51
 jsonschema-4.17.3.dist-info/licenses/COPYING,sha256=T5KgFaE8TRoEC-8BiqE0MLTxvHO0Gxa7hGw0Z2bedDk,1057
 jsonschema/__init__.py,sha256=FRdJDXN8-AFk-Fj1qclckQsZNeGQB__r_QuMjtRoze4,2187
diff --git a/libs/jsonschema-4.17.3.dist-info/WHEEL b/libs/jsonschema-4.17.3.dist-info/WHEEL
index cdd68a497c..ae8ec1bdaa 100644
--- a/libs/jsonschema-4.17.3.dist-info/WHEEL
+++ b/libs/jsonschema-4.17.3.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/h11-0.14.0.dist-info/INSTALLER b/libs/knowit-0.5.11.dist-info/INSTALLER
similarity index 100%
rename from libs/h11-0.14.0.dist-info/INSTALLER
rename to libs/knowit-0.5.11.dist-info/INSTALLER
diff --git a/libs/knowit-0.5.11.dist-info/METADATA b/libs/knowit-0.5.11.dist-info/METADATA
new file mode 100644
index 0000000000..2213393217
--- /dev/null
+++ b/libs/knowit-0.5.11.dist-info/METADATA
@@ -0,0 +1,279 @@
+Metadata-Version: 2.4
+Name: knowit
+Version: 0.5.11
+Summary: Know better your media files
+License: MIT
+License-File: LICENSE
+Keywords: video,mkv,mp4,mediainfo,metadata,movie,episode,tv,shows,series
+Author: Rato
+Requires-Python: >=3.9,<4.0
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Multimedia :: Video
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Provides-Extra: pint
+Requires-Dist: babelfish (>=0.6.1,<0.7.0)
+Requires-Dist: enzyme (>=0.5.2,<0.6.0)
+Requires-Dist: pint (>=0.20.1,<0.25.0) ; extra == "pint"
+Requires-Dist: pymediainfo (>=7.0.1,<8.0.0)
+Requires-Dist: pyyaml (>=6.0,<7.0)
+Requires-Dist: trakit (>=0.2.2,<0.3.0)
+Project-URL: Repository, https://github.com/ratoaq2/knowit
+Description-Content-Type: text/markdown
+
+# KnowIt
+
+Know better your media files.
+
+[![Latest
+Version](https://img.shields.io/pypi/v/knowit.svg)](https://pypi.python.org/pypi/knowit)
+
+[![tests](https://github.com/ratoaq2/knowit/actions/workflows/test.yml/badge.svg)](https://github.com/ratoaq2/knowit/actions/workflows/test.yml)
+
+[![License](https://img.shields.io/github/license/ratoaq2/knowit.svg)](https://github.com/ratoaq2/knowit/blob/master/LICENSE)
+
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/knowit)
+
+  - Project page  
+    <https://github.com/ratoaq2/knowit>
+
+## Usage
+
+### CLI
+
+Extract information from a video file:
+
+    $ knowit /folder/Audio Samples/hd_dtsma_7.1.mkv
+    For: /folder/Audio Samples/hd_dtsma_7.1.mkv
+    Knowit 0.4.0 found:
+    {
+        "title": "7.1Ch DTS-HD MA - Speaker Mapping Test File",
+        "path": "/folder/Audio Samples/hd_dtsma_7.1.mkv",
+        "duration": "0:01:37",
+        "size": "40.77 MB",
+        "bit_rate": "3.3 Mbps",
+        "container": "mkv",
+        "video": [
+            {
+                "id": 1,
+                "duration": "0:01:37",
+                "width": "1920 pixel",
+                "height": "1080 pixel",
+                "scan_type": "Progressive",
+                "aspect_ratio": "1.778",
+                "pixel_aspect_ratio": "1.0",
+                "resolution": "1080p",
+                "frame_rate": "23.976 FPS",
+                "bit_depth": "8 bit",
+                "codec": "H.264",
+                "profile": "Main",
+                "profile_level": "4",
+                "media_type": "video/H264",
+                "default": true
+            }
+        ],
+        "audio": [
+            {
+                "id": 2,
+                "name": "7.1Ch DTS-HD MA",
+                "language": "English",
+                "duration": "0:01:37",
+                "codec": "DTS-HD",
+                "profile": "Master Audio",
+                "channels_count": 8,
+                "channels": "7.1",
+                "bit_depth": "24 bit",
+                "bit_rate_mode": "Variable",
+                "sampling_rate": "48.0 KHz",
+                "compression": "Lossless",
+                "default": true
+            }
+        ],
+        "provider": {
+            "name": "mediainfo",
+            "version": {
+                "pymediainfo": "5.0.3",
+                "libmediainfo.so.0": "v20.9"
+            }
+        }
+    }
+
+Extract information from a video file using ffmpeg:
+
+    $ knowit --provider ffmpeg /folder/Audio Samples/hd_dtsma_7.1.mkv
+    For: /folder/Audio Samples/hd_dtsma_7.1.mkv
+    Knowit 0.4.0 found:
+    {
+        "title": "7.1Ch DTS-HD MA - Speaker Mapping Test File",
+        "path": "/folder/Audio Samples/hd_dtsma_7.1.mkv",
+        "duration": "0:01:37",
+        "size": "40.77 MB",
+        "bit_rate": "3.3 Mbps",
+        "container": "mkv",
+        "video": [
+            {
+                "id": 0,
+                "width": "1920 pixel",
+                "height": "1080 pixel",
+                "scan_type": "Progressive",
+                "aspect_ratio": "1.778",
+                "pixel_aspect_ratio": "1.0",
+                "resolution": "1080p",
+                "frame_rate": "23.976 FPS",
+                "bit_depth": "8 bit",
+                "codec": "H.264",
+                "profile": "Main",
+                "default": true
+            }
+        ],
+        "audio": [
+            {
+                "id": 1,
+                "name": "7.1Ch DTS-HD MA",
+                "language": "English",
+                "codec": "DTS-HD",
+                "profile": "Master Audio",
+                "channels_count": 8,
+                "channels": "7.1",
+                "bit_depth": "24 bit",
+                "sampling_rate": "48.0 KHz",
+                "default": true
+            }
+        ],
+        "provider": {
+            "name": "ffmpeg",
+            "version": {
+                "ffprobe": "v4.2.4-1ubuntu0.1"
+            }
+        }
+    }
+
+Using docker:
+
+    docker run -it --rm -v /folder:/folder knowit /folder/Audio Samples/hd_dtsma_7.1.mkv
+    For: /folder/Audio Samples/hd_dtsma_7.1.mkv
+    Knowit 0.4.0 found:
+    {
+        "title": "7.1Ch DTS-HD MA - Speaker Mapping Test File",
+        "path": "/folder/Audio Samples/hd_dtsma_7.1.mkv",
+        "duration": "0:01:37",
+        "size": "40.77 MB",
+        "bit_rate": "3.3 Mbps",
+        "container": "mkv",
+        "video": [
+            {
+                "id": 1,
+                "duration": "0:01:37",
+                "width": "1920 pixel",
+                "height": "1080 pixel",
+                "scan_type": "Progressive",
+                "aspect_ratio": "1.778",
+                "pixel_aspect_ratio": "1.0",
+                "resolution": "1080p",
+                "frame_rate": "23.976 FPS",
+                "bit_depth": "8 bit",
+                "codec": "H.264",
+                "profile": "Main",
+                "profile_level": "4",
+                "media_type": "video/H264",
+                "default": true
+            }
+        ],
+        "audio": [
+            {
+                "id": 2,
+                "name": "7.1Ch DTS-HD MA",
+                "language": "English",
+                "duration": "0:01:37",
+                "codec": "DTS-HD",
+                "profile": "Master Audio",
+                "channels_count": 8,
+                "channels": "7.1",
+                "bit_depth": "24 bit",
+                "bit_rate_mode": "Variable",
+                "sampling_rate": "48.0 KHz",
+                "compression": "Lossless",
+                "default": true
+            }
+        ],
+        "provider": {
+            "name": "mediainfo",
+            "version": {
+                "pymediainfo": "5.0.3",
+                "libmediainfo.so.0": "v20.9"
+            }
+        }
+    }
+
+All available CLI options:
+
+    $ knowit --help
+    usage: knowit [-h] [-p PROVIDER] [--debug] [--report] [-y] [-N] [-P PROFILE] [--mediainfo MEDIAINFO] [--ffmpeg FFMPEG] [--mkvmerge MKVMERGE] [--version] [videopath [videopath ...]]
+    
+    positional arguments:
+      videopath             Path to the video to introspect
+    
+    optional arguments:
+      -h, --help            show this help message and exit
+    
+    Providers:
+      -p PROVIDER, --provider PROVIDER
+                            The provider to be used: mediainfo, ffmpeg, mkvmerge or enzyme.
+    
+    Output:
+      --debug               Print information for debugging knowit and for reporting bugs.
+      --report              Parse media and report all non-detected values
+      -y, --yaml            Display output in yaml format
+      -N, --no-units        Display output without units
+      -P PROFILE, --profile PROFILE
+                            Display values according to specified profile: code, default, human, technical
+    
+    Configuration:
+      --mediainfo MEDIAINFO
+                            The location to search for MediaInfo binaries
+      --ffmpeg FFMPEG       The location to search for ffprobe (FFmpeg) binaries
+      --mkvmerge MKVMERGE   The location to search for mkvmerge (MKVToolNix) binaries
+    
+    Information:
+      --version             Display knowit version.
+
+## Installation
+
+KnowIt can be installed as a regular python module by running:
+
+    $ [sudo] pip install knowit
+
+For a better isolation with your system you should use a dedicated
+virtualenv or install for your user only using the `--user` flag.
+
+## External dependencies
+
+KnowIt can use MediaInfo, ffprobe (FFmpeg) or mkvmerge (MKVToolNix)
+
+KnowIt supports MKV regardless if MediaInfo, FFmpeg or MKVToolNix are
+installed.
+
+MediaInfo, FFmpeg or MKVToolNix increases the number of supported
+formats and the number of extracted information.
+
+MediaInfo is the default provider. Visit their
+[website](http://mediaarea.net/MediaInfo) and install the proper package
+for your system.
+
+ffprobe (FFmpeg) can be downloaded
+[here](https://ffmpeg.org/download.html)
+
+mkvmerge (MKVToolNix) can be downloaded
+[here](https://mkvtoolnix.download/downloads.html)
+
diff --git a/libs/knowit-0.5.11.dist-info/RECORD b/libs/knowit-0.5.11.dist-info/RECORD
new file mode 100644
index 0000000000..e79c25877c
--- /dev/null
+++ b/libs/knowit-0.5.11.dist-info/RECORD
@@ -0,0 +1,33 @@
+../../bin/knowit,sha256=Xf5xDBavuHsfju4MCh2x6_oimDYu_svjYykRXlbzTvE,190
+knowit-0.5.11.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+knowit-0.5.11.dist-info/METADATA,sha256=ebNzYa90mUd8nJ7QsWGDxtEDV7wDmLFIDK_z1LnLlvs,9320
+knowit-0.5.11.dist-info/RECORD,,
+knowit-0.5.11.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+knowit-0.5.11.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+knowit-0.5.11.dist-info/entry_points.txt,sha256=IuayIkjKpJlQRE1a7lN4axDUR6d13l5obIbpXuL3gsc,47
+knowit-0.5.11.dist-info/licenses/LICENSE,sha256=R8zPEs6FTm1j_QfmnmUjM63LiqD44a7-C6hWnoCh-8M,1061
+knowit/__init__.py,sha256=tsamwJurHtE8Iupqg4DQ9Yq12cxnkwuqegcztsjSuLI,1261
+knowit/__main__.py,sha256=W-A3O0IO37SA5Tjsney8I2TGEfwaiwbgBxIcDPIguh4,6243
+knowit/api.py,sha256=9qxqqQawKZg-x0OlPSWWI1Ohtj1cMYjhVK8K6B6foK8,4523
+knowit/config.py,sha256=GSiyDXu5mKZiHedmcs4eu9iohBwwjvNAiIOG4uybfNU,2175
+knowit/core.py,sha256=aUZbuAcmeCw1FsvTnvbcZH8eYZZgRdPB5qJspjTCGpk,7697
+knowit/defaults.yml,sha256=oWilBJyi0FkIwyOGQpz7q3Ax1pTmTSIG-ekYJpqWlJc,11748
+knowit/properties/__init__.py,sha256=VvBTxa9wdzQ1ka6XtXibe7m_XUWRyQ_N0DW1q_S-Wms,504
+knowit/properties/audio.py,sha256=wbW8Oq5VcbTUC-MdmVZh7pVC2sz4c0bSS-NcmF0Kz6U,1340
+knowit/properties/general.py,sha256=q71ehseIwmbSvhs1xfSrpN-1dmONjDr9p93aBHuzE9Q,4739
+knowit/properties/subtitle.py,sha256=HY-MN6ZIQS4Vw6_Eu3mTWRX6yKZ-c47viye8Y1R2U_0,303
+knowit/properties/video.py,sha256=KfDQ0b-ndLtNgYtW4ScSDQ2MZipzuLhU8yrDtgdjzlU,3154
+knowit/provider.py,sha256=S7qeLI0Cydw3jDGSxG8k_cfy3LjHk1wDME71ZVx4b6k,5955
+knowit/providers/__init__.py,sha256=iXwunl_-TXZobVSv5CWuhdpPG-psgGSGjSZ8IbztPiM,239
+knowit/providers/enzyme.py,sha256=IeaVApxWaGDExU1HJYcacDFgYsTVLucRntH8NUOTy_Q,6842
+knowit/providers/ffmpeg.py,sha256=rAzi_CeJlZH7sYohMkRJc-DurXAi8ha36NWaCNSi3XA,12140
+knowit/providers/mediainfo.py,sha256=yol2MV9nBMGGvzwtfeqLiwh61eJKgoAFGvZygvxX8pg,17052
+knowit/providers/mkvmerge.py,sha256=7SnDnQa06sNWgAAC9Zr0w3lKtorBYo7WawO4Vs1RmEc,10840
+knowit/rules/__init__.py,sha256=lBOmgKQ_h5qcgNlV6bdVWwus2lyO96wdwmezdVubhg8,330
+knowit/rules/audio.py,sha256=-adiFZjG6Rowam6ZmnwuhLSujR8ud_lILGa4Vc4ib9E,3351
+knowit/rules/general.py,sha256=78Io4Pda8TWZyeBw3aiGl9Ry0OfmguxAtEd_pvabtis,904
+knowit/rules/subtitle.py,sha256=a7R1Jst8U-j1gig7CJJS15uywoiedLkADIkr2b8wnm4,771
+knowit/rules/video.py,sha256=yjXiKgmf__q4Ol6kECof5R8TGhq7cHuBoEt5o8aQbw8,2297
+knowit/serializer.py,sha256=tGwPzmLwIDI82vqOCT8ITQZPc5KYQdVP8iLK4DlfNjs,6446
+knowit/units.py,sha256=v5X23TPuVyBkSzPnXOAKH5N0tVJYiELd9YFmM677uWo,1272
+knowit/utils.py,sha256=yhCTxcdTMyllqWbbbfgrcJVf0Zp0MoEVc44PPXuK9vI,4238
diff --git a/libs/idna-3.10.dist-info/REQUESTED b/libs/knowit-0.5.11.dist-info/REQUESTED
similarity index 100%
rename from libs/idna-3.10.dist-info/REQUESTED
rename to libs/knowit-0.5.11.dist-info/REQUESTED
diff --git a/libs/knowit-0.5.11.dist-info/WHEEL b/libs/knowit-0.5.11.dist-info/WHEEL
new file mode 100644
index 0000000000..7894e88612
--- /dev/null
+++ b/libs/knowit-0.5.11.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 2.3.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/knowit-0.5.3.dist-info/entry_points.txt b/libs/knowit-0.5.11.dist-info/entry_points.txt
similarity index 100%
rename from libs/knowit-0.5.3.dist-info/entry_points.txt
rename to libs/knowit-0.5.11.dist-info/entry_points.txt
diff --git a/libs/knowit-0.5.3.dist-info/LICENSE b/libs/knowit-0.5.11.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/knowit-0.5.3.dist-info/LICENSE
rename to libs/knowit-0.5.11.dist-info/licenses/LICENSE
diff --git a/libs/knowit-0.5.3.dist-info/METADATA b/libs/knowit-0.5.3.dist-info/METADATA
deleted file mode 100644
index f47f60f0d0..0000000000
--- a/libs/knowit-0.5.3.dist-info/METADATA
+++ /dev/null
@@ -1,274 +0,0 @@
-Metadata-Version: 2.1
-Name: knowit
-Version: 0.5.3
-Summary: Know better your media files
-Home-page: https://github.com/ratoaq2/knowit
-License: MIT
-Keywords: video,mkv,mp4,mediainfo,metadata,movie,episode,tv,shows,series
-Author: Rato
-Requires-Python: >=3.9.0,<4.0.0
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Topic :: Multimedia :: Video
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: babelfish (>=0.6.0,<0.7.0)
-Requires-Dist: enzyme (>=0.4.1,<0.5.0)
-Requires-Dist: pint (>=0.20.1,<0.22.0)
-Requires-Dist: pymediainfo (>=6.0.1,<7.0.0)
-Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: trakit (>=0.2.1,<0.3.0)
-Project-URL: Repository, https://github.com/ratoaq2/knowit
-Description-Content-Type: text/markdown
-
-# KnowIt
-
-Know better your media files.
-
-[![Latest
-Version](https://img.shields.io/pypi/v/knowit.svg)](https://pypi.python.org/pypi/knowit)
-
-[![tests](https://github.com/ratoaq2/knowit/actions/workflows/test.yml/badge.svg)](https://github.com/ratoaq2/knowit/actions/workflows/test.yml)
-
-[![License](https://img.shields.io/github/license/ratoaq2/knowit.svg)](https://github.com/ratoaq2/knowit/blob/master/LICENSE)
-
-  - Project page  
-    <https://github.com/ratoaq2/knowit>
-
-## Usage
-
-### CLI
-
-Extract information from a video file:
-
-    $ knowit /folder/Audio Samples/hd_dtsma_7.1.mkv
-    For: /folder/Audio Samples/hd_dtsma_7.1.mkv
-    Knowit 0.4.0 found:
-    {
-        "title": "7.1Ch DTS-HD MA - Speaker Mapping Test File",
-        "path": "/folder/Audio Samples/hd_dtsma_7.1.mkv",
-        "duration": "0:01:37",
-        "size": "40.77 MB",
-        "bit_rate": "3.3 Mbps",
-        "container": "mkv",
-        "video": [
-            {
-                "id": 1,
-                "duration": "0:01:37",
-                "width": "1920 pixel",
-                "height": "1080 pixel",
-                "scan_type": "Progressive",
-                "aspect_ratio": "1.778",
-                "pixel_aspect_ratio": "1.0",
-                "resolution": "1080p",
-                "frame_rate": "23.976 FPS",
-                "bit_depth": "8 bit",
-                "codec": "H.264",
-                "profile": "Main",
-                "profile_level": "4",
-                "media_type": "video/H264",
-                "default": true
-            }
-        ],
-        "audio": [
-            {
-                "id": 2,
-                "name": "7.1Ch DTS-HD MA",
-                "language": "English",
-                "duration": "0:01:37",
-                "codec": "DTS-HD",
-                "profile": "Master Audio",
-                "channels_count": 8,
-                "channels": "7.1",
-                "bit_depth": "24 bit",
-                "bit_rate_mode": "Variable",
-                "sampling_rate": "48.0 KHz",
-                "compression": "Lossless",
-                "default": true
-            }
-        ],
-        "provider": {
-            "name": "mediainfo",
-            "version": {
-                "pymediainfo": "5.0.3",
-                "libmediainfo.so.0": "v20.9"
-            }
-        }
-    }
-
-Extract information from a video file using ffmpeg:
-
-    $ knowit --provider ffmpeg /folder/Audio Samples/hd_dtsma_7.1.mkv
-    For: /folder/Audio Samples/hd_dtsma_7.1.mkv
-    Knowit 0.4.0 found:
-    {
-        "title": "7.1Ch DTS-HD MA - Speaker Mapping Test File",
-        "path": "/folder/Audio Samples/hd_dtsma_7.1.mkv",
-        "duration": "0:01:37",
-        "size": "40.77 MB",
-        "bit_rate": "3.3 Mbps",
-        "container": "mkv",
-        "video": [
-            {
-                "id": 0,
-                "width": "1920 pixel",
-                "height": "1080 pixel",
-                "scan_type": "Progressive",
-                "aspect_ratio": "1.778",
-                "pixel_aspect_ratio": "1.0",
-                "resolution": "1080p",
-                "frame_rate": "23.976 FPS",
-                "bit_depth": "8 bit",
-                "codec": "H.264",
-                "profile": "Main",
-                "default": true
-            }
-        ],
-        "audio": [
-            {
-                "id": 1,
-                "name": "7.1Ch DTS-HD MA",
-                "language": "English",
-                "codec": "DTS-HD",
-                "profile": "Master Audio",
-                "channels_count": 8,
-                "channels": "7.1",
-                "bit_depth": "24 bit",
-                "sampling_rate": "48.0 KHz",
-                "default": true
-            }
-        ],
-        "provider": {
-            "name": "ffmpeg",
-            "version": {
-                "ffprobe": "v4.2.4-1ubuntu0.1"
-            }
-        }
-    }
-
-Using docker:
-
-    docker run -it --rm -v /folder:/folder knowit /folder/Audio Samples/hd_dtsma_7.1.mkv
-    For: /folder/Audio Samples/hd_dtsma_7.1.mkv
-    Knowit 0.4.0 found:
-    {
-        "title": "7.1Ch DTS-HD MA - Speaker Mapping Test File",
-        "path": "/folder/Audio Samples/hd_dtsma_7.1.mkv",
-        "duration": "0:01:37",
-        "size": "40.77 MB",
-        "bit_rate": "3.3 Mbps",
-        "container": "mkv",
-        "video": [
-            {
-                "id": 1,
-                "duration": "0:01:37",
-                "width": "1920 pixel",
-                "height": "1080 pixel",
-                "scan_type": "Progressive",
-                "aspect_ratio": "1.778",
-                "pixel_aspect_ratio": "1.0",
-                "resolution": "1080p",
-                "frame_rate": "23.976 FPS",
-                "bit_depth": "8 bit",
-                "codec": "H.264",
-                "profile": "Main",
-                "profile_level": "4",
-                "media_type": "video/H264",
-                "default": true
-            }
-        ],
-        "audio": [
-            {
-                "id": 2,
-                "name": "7.1Ch DTS-HD MA",
-                "language": "English",
-                "duration": "0:01:37",
-                "codec": "DTS-HD",
-                "profile": "Master Audio",
-                "channels_count": 8,
-                "channels": "7.1",
-                "bit_depth": "24 bit",
-                "bit_rate_mode": "Variable",
-                "sampling_rate": "48.0 KHz",
-                "compression": "Lossless",
-                "default": true
-            }
-        ],
-        "provider": {
-            "name": "mediainfo",
-            "version": {
-                "pymediainfo": "5.0.3",
-                "libmediainfo.so.0": "v20.9"
-            }
-        }
-    }
-
-All available CLI options:
-
-    $ knowit --help
-    usage: knowit [-h] [-p PROVIDER] [--debug] [--report] [-y] [-N] [-P PROFILE] [--mediainfo MEDIAINFO] [--ffmpeg FFMPEG] [--mkvmerge MKVMERGE] [--version] [videopath [videopath ...]]
-    
-    positional arguments:
-      videopath             Path to the video to introspect
-    
-    optional arguments:
-      -h, --help            show this help message and exit
-    
-    Providers:
-      -p PROVIDER, --provider PROVIDER
-                            The provider to be used: mediainfo, ffmpeg, mkvmerge or enzyme.
-    
-    Output:
-      --debug               Print information for debugging knowit and for reporting bugs.
-      --report              Parse media and report all non-detected values
-      -y, --yaml            Display output in yaml format
-      -N, --no-units        Display output without units
-      -P PROFILE, --profile PROFILE
-                            Display values according to specified profile: code, default, human, technical
-    
-    Configuration:
-      --mediainfo MEDIAINFO
-                            The location to search for MediaInfo binaries
-      --ffmpeg FFMPEG       The location to search for ffprobe (FFmpeg) binaries
-      --mkvmerge MKVMERGE   The location to search for mkvmerge (MKVToolNix) binaries
-    
-    Information:
-      --version             Display knowit version.
-
-## Installation
-
-KnowIt can be installed as a regular python module by running:
-
-    $ [sudo] pip install knowit
-
-For a better isolation with your system you should use a dedicated
-virtualenv or install for your user only using the `--user` flag.
-
-## External dependencies
-
-KnowIt can use MediaInfo, ffprobe (FFmpeg) or mkvmerge (MKVToolNix)
-
-KnowIt supports MKV regardless if MediaInfo, FFmpeg or MKVToolNix are
-installed.
-
-MediaInfo, FFmpeg or MKVToolNix increases the number of supported
-formats and the number of extracted information.
-
-MediaInfo is the default provider. Visit their
-[website](http://mediaarea.net/MediaInfo) and install the proper package
-for your system.
-
-ffprobe (FFmpeg) can be downloaded
-[here](https://ffmpeg.org/download.html)
-
-mkvmerge (MKVToolNix) can be downloaded
-[here](https://mkvtoolnix.download/downloads.html)
-
diff --git a/libs/knowit-0.5.3.dist-info/RECORD b/libs/knowit-0.5.3.dist-info/RECORD
deleted file mode 100644
index c4a1e97888..0000000000
--- a/libs/knowit-0.5.3.dist-info/RECORD
+++ /dev/null
@@ -1,33 +0,0 @@
-../../bin/knowit,sha256=VqcR7w0JoAIAiHTJ_VmoiEcl-TWfAD3N3AvwOmhVJ6w,240
-knowit-0.5.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-knowit-0.5.3.dist-info/LICENSE,sha256=R8zPEs6FTm1j_QfmnmUjM63LiqD44a7-C6hWnoCh-8M,1061
-knowit-0.5.3.dist-info/METADATA,sha256=_fzw9UzG4zpVnYXbrwicSgdNcYfiT7TYOhvfwNlR08k,9132
-knowit-0.5.3.dist-info/RECORD,,
-knowit-0.5.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-knowit-0.5.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-knowit-0.5.3.dist-info/entry_points.txt,sha256=IuayIkjKpJlQRE1a7lN4axDUR6d13l5obIbpXuL3gsc,47
-knowit/__init__.py,sha256=TxzHZ2jeocfO1t5sOLMEt5GJXT4FUJrSsUDM463oO0M,1269
-knowit/__main__.py,sha256=W-A3O0IO37SA5Tjsney8I2TGEfwaiwbgBxIcDPIguh4,6243
-knowit/api.py,sha256=LFaWZamIeBeNhEG6YNv8mJELqTV_Oo8TfifONWHQuXc,3890
-knowit/config.py,sha256=GSiyDXu5mKZiHedmcs4eu9iohBwwjvNAiIOG4uybfNU,2175
-knowit/core.py,sha256=7YMpLMjrIWSTvNoGYsQot3ZImITRJijxAZYdA-yN_e4,7457
-knowit/defaults.yml,sha256=oWilBJyi0FkIwyOGQpz7q3Ax1pTmTSIG-ekYJpqWlJc,11748
-knowit/properties/__init__.py,sha256=VvBTxa9wdzQ1ka6XtXibe7m_XUWRyQ_N0DW1q_S-Wms,504
-knowit/properties/audio.py,sha256=wbW8Oq5VcbTUC-MdmVZh7pVC2sz4c0bSS-NcmF0Kz6U,1340
-knowit/properties/general.py,sha256=ipAHNJFfECfY6fwFWqXP6YFg3__I9coM695YoVlJyCU,4761
-knowit/properties/subtitle.py,sha256=HY-MN6ZIQS4Vw6_Eu3mTWRX6yKZ-c47viye8Y1R2U_0,303
-knowit/properties/video.py,sha256=KfDQ0b-ndLtNgYtW4ScSDQ2MZipzuLhU8yrDtgdjzlU,3154
-knowit/provider.py,sha256=GHwOS_bW-MxeWIUdlbWY89uGbOzx3bLBRKnZB1e9mb8,4300
-knowit/providers/__init__.py,sha256=iXwunl_-TXZobVSv5CWuhdpPG-psgGSGjSZ8IbztPiM,239
-knowit/providers/enzyme.py,sha256=CliE_I2FqRjuMk9hmhwexhEWErEdIoIgGgeRwf0CQZM,6728
-knowit/providers/ffmpeg.py,sha256=vq1FQu8Huct4vBEt52poFNupP1D8Chm2FKj367BmcB4,11713
-knowit/providers/mediainfo.py,sha256=PQxBfeN75M79NGeKXL3rYfbYOJf2H1Hp0XWuBdwD4f4,16163
-knowit/providers/mkvmerge.py,sha256=s8n1K3nmUcnbOIRfVCGcD7WELUCrIkCzFHWLvTy9JdI,10511
-knowit/rules/__init__.py,sha256=lBOmgKQ_h5qcgNlV6bdVWwus2lyO96wdwmezdVubhg8,330
-knowit/rules/audio.py,sha256=-adiFZjG6Rowam6ZmnwuhLSujR8ud_lILGa4Vc4ib9E,3351
-knowit/rules/general.py,sha256=78Io4Pda8TWZyeBw3aiGl9Ry0OfmguxAtEd_pvabtis,904
-knowit/rules/subtitle.py,sha256=a7R1Jst8U-j1gig7CJJS15uywoiedLkADIkr2b8wnm4,771
-knowit/rules/video.py,sha256=yjXiKgmf__q4Ol6kECof5R8TGhq7cHuBoEt5o8aQbw8,2297
-knowit/serializer.py,sha256=Y3vuKeAVLEnpAbv8WRqZRCiF9p-f4fcCcwMOcPVc47Q,6525
-knowit/units.py,sha256=TFPAh8Pv9cV9ltDIj9dAd966rrEEsL8_Fgy1nQcSs08,824
-knowit/utils.py,sha256=Sif7QWpMyvUy0ZKSCIkx_BOauzFJDy_AEetg2mLVT3Y,4273
diff --git a/libs/knowit-0.5.3.dist-info/WHEEL b/libs/knowit-0.5.3.dist-info/WHEEL
deleted file mode 100644
index d73ccaae8e..0000000000
--- a/libs/knowit-0.5.3.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/knowit/__init__.py b/libs/knowit/__init__.py
index 5c936b2e04..42fa872d55 100644
--- a/libs/knowit/__init__.py
+++ b/libs/knowit/__init__.py
@@ -6,7 +6,7 @@
 __short_version__ = '.'.join(__version__.split('.')[:2])
 __author__ = metadata.metadata(__package__)['author']
 __license__ = metadata.metadata(__package__)['license']
-__url__ = metadata.metadata(__package__)['home_page']
+__url__ = 'https://github.com/ratoaq2/knowit'
 
 del metadata
 
diff --git a/libs/knowit/api.py b/libs/knowit/api.py
index c6ebd3bd68..a32034baf4 100644
--- a/libs/knowit/api.py
+++ b/libs/knowit/api.py
@@ -28,15 +28,19 @@ class KnowitException(Exception):
     """Exception raised when knowit encounters an internal error."""
 
 
-def initialize(context: typing.Optional[typing.Mapping] = None) -> None:
-    """Initialize knowit."""
-    if not available_providers:
-        context = context or {}
-        config = Config.build(context.get('config'))
-        for name, provider_cls in _provider_map.items():
-            general_config = getattr(config, 'general', {})
-            mapping = context.get(name) or general_config.get(name)
-            available_providers[name] = provider_cls(config, mapping)
+def initialize(context: typing.Optional[typing.Mapping] = None, *, force: bool = False) -> None:
+    """Initialize knowit, reload provider if a new suggested path is given."""
+    context = context or {}
+    config = Config.build(context.get('config'))
+    for name, provider_cls in _provider_map.items():
+        general_config = getattr(config, 'general', {})
+        suggested_path = context.get(name) or general_config.get(name)
+        # create provider if it is not initialized or if it is not loaded and suggesting a new path
+        p = available_providers.get(name)
+        if force or p is None or (
+            not p.loaded() and not p.match_executor_location(suggested_path)
+        ):
+            available_providers[name] = provider_cls(config, suggested_path)
 
 
 def know(
@@ -70,7 +74,7 @@ def dependencies(context: typing.Optional[typing.Mapping] = None) -> typing.Mapp
     deps = {}
     try:
         initialize(context)
-        for name, provider_cls in _provider_map.items():
+        for name in _provider_map:
             if name in available_providers:
                 deps[name] = available_providers[name].version
             else:
@@ -81,6 +85,15 @@ def dependencies(context: typing.Optional[typing.Mapping] = None) -> typing.Mapp
     return deps
 
 
+def loaded_providers(options: typing.Union[dict[str, typing.Any], None] = None) -> dict[str, bool]:
+    """Return a dict with each provider and if they are installed."""
+    # initialize providers with options
+    initialize(options)
+
+    # return a dict of providers and the loaded state
+    return {k: p.loaded() for k, p in available_providers.items()}
+
+
 def _centered(value: str) -> str:
     value = value[-52:]
     return f'| {value:^53} |'
@@ -97,7 +110,7 @@ def debug_info(
     ]
 
     first = True
-    for key, info in dependencies(context).items():
+    for info in dependencies(context).values():
         if not first:
             lines.append(_centered(''))
         first = False
diff --git a/libs/knowit/core.py b/libs/knowit/core.py
index ede307dad7..1e6516f20d 100644
--- a/libs/knowit/core.py
+++ b/libs/knowit/core.py
@@ -148,17 +148,17 @@ def handle(self, value, context):
         """Return Variable or Constant."""
         key = self._extract_key(value)
         if key is False:
-            return
+            return None
 
         result = self._lookup(key, context)
         if result is False:
-            return
+            return None
 
         while not result and key:
             key = self._extract_fallback_key(value, key)
             result = self._lookup(key, context)
             if result is False:
-                return
+                return None
 
         if not result:
             self.report(value, context)
@@ -170,7 +170,9 @@ class MultiValue(Property):
     """Property with multiple values."""
 
     def __init__(self, prop: typing.Optional[Property] = None, delimiter='/', single=False,
-                 handler=None, name=None, **kwargs):
+                 handler: typing.Optional[
+                     typing.Callable[[typing.Optional[str], typing.MutableMapping], typing.Optional[str]]] = None,
+                 name=None, **kwargs):
         """Init method."""
         super().__init__(*(prop.names if prop else (name,)), **kwargs)
         self.prop = prop
@@ -182,13 +184,16 @@ def handle(
             self,
             value: str,
             context: typing.MutableMapping,
-    ) -> typing.Union[T, typing.List[T]]:
+    ) -> typing.Optional[typing.Union[str, typing.List[str]]]:
         """Handle properties with multiple values."""
         if self.handler:
             call = self.handler
         elif self.prop:
             call = self.prop.handle
         else:
+            call = None
+
+        if call is None:
             raise NotImplementedError('No handler available')
 
         result = call(value, context)
@@ -206,8 +211,8 @@ def handle(
         if values is None:
             return call(values, context)
         if len(values) > 1 and not self.single:
-            results = [call(item, context) if not _is_unknown(item) else None for item in values]
-            results = [r for r in results if r is not None]
+            part_results = [call(item, context) if not _is_unknown(item) else None for item in values]
+            results = [r for r in part_results if r is not None]
             if results:
                 return results
         return call(values[0], context)
diff --git a/libs/knowit/properties/general.py b/libs/knowit/properties/general.py
index 701b9adbff..86604dd09a 100644
--- a/libs/knowit/properties/general.py
+++ b/libs/knowit/properties/general.py
@@ -5,11 +5,9 @@
 
 import babelfish
 
-from knowit.core import Configurable, Property
+from knowit.core import Configurable, Property, T
 from knowit.utils import round_decimal
 
-T = typing.TypeVar('T')
-
 
 class Basic(Property[T]):
     """Basic property to handle int, Decimal and other basic types."""
diff --git a/libs/knowit/provider.py b/libs/knowit/provider.py
index 5306d83889..6c40deff33 100755
--- a/libs/knowit/provider.py
+++ b/libs/knowit/provider.py
@@ -24,6 +24,7 @@
 class Provider:
     """Base class for all providers."""
 
+    executor: typing.Union["Executor", None]
     min_fps = 10
     max_fps = 200
 
@@ -37,6 +38,11 @@ def __init__(
         self.config = config
         self.mapping = mapping
         self.rules = rules or {}
+        self.executor = None
+
+    def loaded(self) -> bool:
+        """Whether or not this provider was loaded."""
+        raise NotImplementedError
 
     def accepts(self, target):
         """Whether or not the video is supported by this provider."""
@@ -120,12 +126,60 @@ def _describe_track(self, track, track_type, context):
 
         return props
 
+    def match_executor_location(self, suggested_path: typing.Union[str, None]) -> bool:
+        """Compare the suggested path to the path that was suggested when creating the provider."""
+        if self.executor is None:
+            return True
+        if self.executor.location == suggested_path:
+            return True
+        return False
+
     @property
     def version(self):
         """Return provider version information."""
         raise NotImplementedError
 
 
+class Executor:
+    """Abstraction to a library or executable to be used by a provider."""
+
+    def __init__(self, location, version):
+        """Initialize the object."""
+        self.location = location
+        self.version = version
+
+    def extract_info(self, filename):
+        """Extract media info."""
+        raise NotImplementedError
+
+    @classmethod
+    def create(cls, os_family=None, suggested_path=None):
+        """Create the executor instance."""
+        raise NotImplementedError
+
+    @classmethod
+    def get_executor_instance(cls, suggested_path=None) -> "Executor":
+        """Return executor instance."""
+        raise NotImplementedError
+
+
+class NotFoundExecutor(Executor):
+    """Executor with a library or executable that was not found."""
+
+    def __init__(self, location, version=None) -> None:
+        """Initialize the object."""
+        self.location = location
+        self.warned = False
+
+    def __bool__(self) -> bool:
+        """Executor not found is always False."""
+        return False
+
+    def extract_info(self, filename):
+        """Extract media info."""
+        return {}
+
+
 class ProviderError(Exception):
     """Base class for provider exceptions."""
 
diff --git a/libs/knowit/providers/enzyme.py b/libs/knowit/providers/enzyme.py
index 6a06599d4d..bec0d6bdc1 100644
--- a/libs/knowit/providers/enzyme.py
+++ b/libs/knowit/providers/enzyme.py
@@ -101,6 +101,10 @@ def __init__(self, config, *args, **kwargs):
             }
         })
 
+    def loaded(self) -> bool:
+        """Return always True as enzyme is always imported."""
+        return True
+
     def accepts(self, video_path):
         """Accept only MKV files."""
         return video_path.lower().endswith('.mkv')
diff --git a/libs/knowit/providers/ffmpeg.py b/libs/knowit/providers/ffmpeg.py
index f19cea90b7..0c66db8b57 100644
--- a/libs/knowit/providers/ffmpeg.py
+++ b/libs/knowit/providers/ffmpeg.py
@@ -4,6 +4,7 @@
 import re
 from logging import NullHandler, getLogger
 from subprocess import check_output
+from typing import Any, Union
 
 from knowit import VIDEO_EXTENSIONS
 from knowit.core import Property
@@ -24,7 +25,9 @@
     YesNo,
 )
 from knowit.provider import (
+    Executor,
     MalformedFileError,
+    NotFoundExecutor,
     Provider,
 )
 from knowit.rules import (
@@ -60,7 +63,7 @@
 '''
 
 
-class FFmpegExecutor:
+class FFmpegExecutor(Executor):
     """Executor that knows how to execute media info: using ctypes or cli."""
 
     version_re = re.compile(r'\bversion\s+(?P<version>[^\b\s]+)')
@@ -70,11 +73,6 @@ class FFmpegExecutor:
         'macos': ('__PATH__', ),
     }
 
-    def __init__(self, location, version):
-        """Initialize the object."""
-        self.location = location
-        self.version = version
-
     def extract_info(self, filename):
         """Extract media info."""
         json_dump = self._execute(filename)
@@ -91,7 +89,7 @@ def _get_version(cls, output):
             return version
 
     @classmethod
-    def get_executor_instance(cls, suggested_path=None):
+    def get_executor_instance(cls, suggested_path=None) -> Union["FFmpegExecutor", NotFoundExecutor]:
         """Return executor instance."""
         os_family = detect_os()
         logger.debug('Detected os: %s', os_family)
@@ -99,6 +97,7 @@ def get_executor_instance(cls, suggested_path=None):
             executor = exec_cls.create(os_family, suggested_path)
             if executor:
                 return executor
+        return NotFoundExecutor(suggested_path)
 
 
 class FFmpegCliExecutor(FFmpegExecutor):
@@ -209,16 +208,24 @@ def __init__(self, config, suggested_path=None):
         })
         self.executor = FFmpegExecutor.get_executor_instance(suggested_path)
 
+    def loaded(self) -> bool:
+        """If library or executable was found."""
+        # if executor is None, print a warning and set to False to not repeat the warning
+        if isinstance(self.executor, NotFoundExecutor):
+            if not self.executor.warned:
+                logger.warning(WARN_MSG)
+                self.executor.warned = True
+        # check if loaded
+        return bool(self.executor)
+
     def accepts(self, video_path):
         """Accept any video when FFprobe is available."""
-        if self.executor is None:
-            logger.warning(WARN_MSG)
-            self.executor = False
+        return self.loaded() and video_path.lower().endswith(VIDEO_EXTENSIONS)
 
-        return self.executor and video_path.lower().endswith(VIDEO_EXTENSIONS)
-
-    def describe(self, video_path, context):
+    def describe(self, video_path, context) -> dict[str, Any]:
         """Return video metadata."""
+        if not self.loaded() or self.executor is None:
+            return {}
         data = self.executor.extract_info(video_path)
 
         def debug_data():
diff --git a/libs/knowit/providers/mediainfo.py b/libs/knowit/providers/mediainfo.py
index a19301bc65..2a06abc4d3 100644
--- a/libs/knowit/providers/mediainfo.py
+++ b/libs/knowit/providers/mediainfo.py
@@ -6,6 +6,7 @@
 from decimal import Decimal
 from logging import DEBUG, NullHandler, getLogger
 from subprocess import CalledProcessError, check_output
+from typing import Any, Union
 
 from pymediainfo import MediaInfo
 from pymediainfo import __version__ as pymediainfo_version
@@ -32,7 +33,9 @@
     YesNo,
 )
 from knowit.provider import (
+    Executor,
     MalformedFileError,
+    NotFoundExecutor,
     Provider,
 )
 from knowit.rules import (
@@ -72,7 +75,7 @@
 '''
 
 
-class MediaInfoExecutor:
+class MediaInfoExecutor(Executor):
     """Media info executable knows how to execute media info: using ctypes or cli."""
 
     version_re = re.compile(r'\bv(?P<version>\d+(?:\.\d+)+)\b')
@@ -83,11 +86,6 @@ class MediaInfoExecutor:
         'macos': ('__PATH__', ),
     }
 
-    def __init__(self, location, version):
-        """Initialize the object."""
-        self.location = location
-        self.version = version
-
     def extract_info(self, filename):
         """Extract media info."""
         return self._execute(filename)
@@ -103,7 +101,7 @@ def _get_version(cls, output):
             return version
 
     @classmethod
-    def get_executor_instance(cls, suggested_path=None):
+    def get_executor_instance(cls, suggested_path=None) -> Union["MediaInfoExecutor", NotFoundExecutor]:
         """Return the executor instance."""
         os_family = detect_os()
         logger.debug('Detected os: %s', os_family)
@@ -111,6 +109,7 @@ def get_executor_instance(cls, suggested_path=None):
             executor = exec_cls.create(os_family, suggested_path)
             if executor:
                 return executor
+        return NotFoundExecutor(suggested_path)
 
 
 class MediaInfoCliExecutor(MediaInfoExecutor):
@@ -176,10 +175,21 @@ def _execute(self, filename):
 
         return json.loads(data) if data else {}
 
+    @staticmethod
+    def _get_bundled_paths(os_family=None):
+        """Return a tuple with the paths of the library bundled with the pymediainfo package."""
+        os_is_nt = (os_family or detect_os()) == 'windows'
+        # Only return the absolute paths
+        return tuple(f for f in MediaInfo._get_library_paths(os_is_nt) if os.path.isfile(f))
+
     @classmethod
     def create(cls, os_family=None, suggested_path=None):
         """Create the executor instance."""
-        for candidate in define_candidate(cls.locations, cls.names, os_family, suggested_path):
+        candidates = (
+            *define_candidate(cls.locations, cls.names, os_family, suggested_path),
+            *cls._get_bundled_paths(os_family),
+        )
+        for candidate in candidates:
             if MediaInfo.can_parse(candidate):
                 lib, handle, lib_version_str, lib_version = MediaInfo._get_library(candidate)
                 lib.MediaInfo_Option.argtypes = [c_void_p, c_wchar_p, c_wchar_p]
@@ -294,16 +304,24 @@ def __init__(self, config, suggested_path):
         })
         self.executor = MediaInfoExecutor.get_executor_instance(suggested_path)
 
+    def loaded(self) -> bool:
+        """If library or executable was found."""
+        # if executor is None, print a warning and set to False to not repeat the warning
+        if isinstance(self.executor, NotFoundExecutor):
+            if not self.executor.warned:
+                logger.warning(WARN_MSG)
+                self.executor.warned = True
+        # check if loaded
+        return bool(self.executor)
+
     def accepts(self, video_path):
         """Accept any video when MediaInfo is available."""
-        if self.executor is None:
-            logger.warning(WARN_MSG)
-            self.executor = False
-
-        return self.executor and video_path.lower().endswith(VIDEO_EXTENSIONS)
+        return self.loaded() and video_path.lower().endswith(VIDEO_EXTENSIONS)
 
-    def describe(self, video_path, context):
+    def describe(self, video_path, context) -> dict[str, Any]:
         """Return video metadata."""
+        if not self.loaded() or self.executor is None:
+            return {}
         data = self.executor.extract_info(video_path)
 
         def debug_data():
diff --git a/libs/knowit/providers/mkvmerge.py b/libs/knowit/providers/mkvmerge.py
index ff422f8b40..dced561581 100644
--- a/libs/knowit/providers/mkvmerge.py
+++ b/libs/knowit/providers/mkvmerge.py
@@ -5,6 +5,7 @@
 from decimal import Decimal
 from logging import NullHandler, getLogger
 from subprocess import check_output
+from typing import Union
 
 from knowit.core import Property
 from knowit.properties import (
@@ -18,7 +19,9 @@
     YesNo,
 )
 from knowit.provider import (
+    Executor,
     MalformedFileError,
+    NotFoundExecutor,
     Provider,
 )
 from knowit.rules import (
@@ -50,7 +53,7 @@
 '''
 
 
-class MkvMergeExecutor:
+class MkvMergeExecutor(Executor):
     """Executor that knows how to execute mkvmerge."""
 
     version_re = re.compile(r'\bv(?P<version>[^\b\s]+)')
@@ -60,11 +63,6 @@ class MkvMergeExecutor:
         'macos': ('__PATH__', ),
     }
 
-    def __init__(self, location, version):
-        """Initialize the object."""
-        self.location = location
-        self.version = version
-
     def extract_info(self, filename):
         """Extract media info."""
         json_dump = self._execute(filename)
@@ -81,7 +79,7 @@ def _get_version(cls, output):
             return version
 
     @classmethod
-    def get_executor_instance(cls, suggested_path=None):
+    def get_executor_instance(cls, suggested_path=None) -> Union["MkvMergeExecutor", NotFoundExecutor]:
         """Return executor instance."""
         os_family = detect_os()
         logger.debug('Detected os: %s', os_family)
@@ -89,6 +87,7 @@ def get_executor_instance(cls, suggested_path=None):
             executor = exec_cls.create(os_family, suggested_path)
             if executor:
                 return executor
+        return NotFoundExecutor(suggested_path)
 
 
 class MkvMergeCliExecutor(MkvMergeExecutor):
@@ -185,13 +184,19 @@ def __init__(self, config, suggested_path=None, *args, **kwargs):
         })
         self.executor = MkvMergeExecutor.get_executor_instance(suggested_path)
 
+    def loaded(self) -> bool:
+        """If library or executable was found."""
+        # if executor is None, print a warning and set to False to not repeat the warning
+        if isinstance(self.executor, NotFoundExecutor):
+            if not self.executor.warned:
+                logger.warning(WARN_MSG)
+                self.executor.warned = True
+        # check if loaded
+        return bool(self.executor)
+
     def accepts(self, video_path):
         """Accept Matroska videos when mkvmerge is available."""
-        if self.executor is None:
-            logger.warning(WARN_MSG)
-            self.executor = False
-
-        return self.executor and video_path.lower().endswith(('.mkv', '.mka', '.mks'))
+        return self.loaded() and video_path.lower().endswith(('.mkv', '.mka', '.mks'))
 
     @classmethod
     def extract_info(cls, video_path):
diff --git a/libs/knowit/serializer.py b/libs/knowit/serializer.py
index 6543edfb8d..19abb04710 100644
--- a/libs/knowit/serializer.py
+++ b/libs/knowit/serializer.py
@@ -77,17 +77,16 @@ def default_duration_representer(self, data):
 def get_yaml_loader(constructors=None):
     """Return a yaml loader that handles sequences as python lists."""
     constructors = constructors or {}
-    yaml_implicit_resolvers = dict(DefaultResolver.yaml_implicit_resolvers)
+    custom_yaml_implicit_resolvers = {
+        ch: [(tag, regexp) for tag, regexp in vs if not tag.endswith('float')]
+        for ch, vs in DefaultResolver.yaml_implicit_resolvers.items()
+    }
 
     class Resolver(DefaultResolver):
         """Custom YAML Resolver."""
 
-    Resolver.yaml_implicit_resolvers.clear()
-    for ch, vs in yaml_implicit_resolvers.items():
-        Resolver.yaml_implicit_resolvers.setdefault(ch, []).extend(
-            (tag, regexp) for tag, regexp in vs
-            if not tag.endswith('float')
-        )
+        yaml_implicit_resolvers = custom_yaml_implicit_resolvers
+
     Resolver.add_implicit_resolver(  # regex copied from yaml source
         '!decimal',
         re.compile(r'''^(?:
diff --git a/libs/knowit/units.py b/libs/knowit/units.py
index 51e6cae73d..684658b82b 100644
--- a/libs/knowit/units.py
+++ b/libs/knowit/units.py
@@ -1,5 +1,8 @@
+import logging
 import typing
 
+logger = logging.getLogger(__name__)
+
 
 class NullRegistry:
     """A NullRegistry that masquerades as a pint.UnitRegistry."""
@@ -11,6 +14,17 @@ def __getattr__(self, item: typing.Any) -> int:
         """Return a Scalar 1 to simulate a unit."""
         return 1
 
+    def __call__(self, value: str) -> float:
+        """Try converting to int, to float and fallback to a scalar 1.0."""
+        try:
+            return int(value)
+        except ValueError:
+            try:
+                return float(value)
+            except ValueError:
+                pass
+        return 1
+
     def __bool__(self):
         """Return False since a NullRegistry is not a pint.UnitRegistry."""
         return False
@@ -30,6 +44,8 @@ def _build_unit_registry():
         return registry
     except ModuleNotFoundError:
         pass
+    except Exception:
+        logger.exception("Cannot import the pint package")
 
     return NullRegistry()
 
diff --git a/libs/knowit/utils.py b/libs/knowit/utils.py
index 4d80103ec7..b0eb160938 100644
--- a/libs/knowit/utils.py
+++ b/libs/knowit/utils.py
@@ -5,10 +5,7 @@
 
 from knowit import VIDEO_EXTENSIONS
 
-if sys.version_info < (3, 8):
-    OS_FAMILY = str
-else:
-    OS_FAMILY = typing.Literal['windows', 'macos', 'unix']
+OS_FAMILY = typing.Literal['windows', 'macos', 'unix']
 
 OPTION_MAP = typing.Dict[str, typing.Tuple[str]]
 
@@ -119,6 +116,7 @@ def build_path_candidates(
             for path in paths
             for name in names
         )
+        yield from names
 
 
 def round_decimal(value: Decimal, min_digits=0, max_digits: typing.Optional[int] = None):
diff --git a/libs/idna-3.10.dist-info/INSTALLER b/libs/mako-1.3.10.dist-info/INSTALLER
similarity index 100%
rename from libs/idna-3.10.dist-info/INSTALLER
rename to libs/mako-1.3.10.dist-info/INSTALLER
diff --git a/libs/mako-1.3.10.dist-info/METADATA b/libs/mako-1.3.10.dist-info/METADATA
new file mode 100644
index 0000000000..067e8fa64f
--- /dev/null
+++ b/libs/mako-1.3.10.dist-info/METADATA
@@ -0,0 +1,88 @@
+Metadata-Version: 2.4
+Name: Mako
+Version: 1.3.10
+Summary: A super-fast templating language that borrows the best ideas from the existing templating languages.
+Home-page: https://www.makotemplates.org/
+Author: Mike Bayer
+Author-email: mike@zzzcomputing.com
+License: MIT
+Project-URL: Documentation, https://docs.makotemplates.org
+Project-URL: Issue Tracker, https://github.com/sqlalchemy/mako
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: MarkupSafe>=0.9.2
+Provides-Extra: testing
+Requires-Dist: pytest; extra == "testing"
+Provides-Extra: babel
+Requires-Dist: Babel; extra == "babel"
+Provides-Extra: lingua
+Requires-Dist: lingua; extra == "lingua"
+Dynamic: license-file
+
+=========================
+Mako Templates for Python
+=========================
+
+Mako is a template library written in Python. It provides a familiar, non-XML 
+syntax which compiles into Python modules for maximum performance. Mako's 
+syntax and API borrows from the best ideas of many others, including Django
+templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded 
+Python (i.e. Python Server Page) language, which refines the familiar ideas
+of componentized layout and inheritance to produce one of the most 
+straightforward and flexible models available, while also maintaining close 
+ties to Python calling and scoping semantics.
+
+Nutshell
+========
+
+::
+
+    <%inherit file="base.html"/>
+    <%
+        rows = [[v for v in range(0,10)] for row in range(0,10)]
+    %>
+    <table>
+        % for row in rows:
+            ${makerow(row)}
+        % endfor
+    </table>
+
+    <%def name="makerow(row)">
+        <tr>
+        % for name in row:
+            <td>${name}</td>\
+        % endfor
+        </tr>
+    </%def>
+
+Philosophy
+===========
+
+Python is a great scripting language. Don't reinvent the wheel...your templates can handle it !
+
+Documentation
+==============
+
+See documentation for Mako at https://docs.makotemplates.org/en/latest/
+
+License
+========
+
+Mako is licensed under an MIT-style license (see LICENSE).
+Other incorporated projects may be licensed under different licenses.
+All licenses allow for non-commercial and commercial use.
diff --git a/libs/mako-1.3.10.dist-info/RECORD b/libs/mako-1.3.10.dist-info/RECORD
new file mode 100644
index 0000000000..419b44e1ac
--- /dev/null
+++ b/libs/mako-1.3.10.dist-info/RECORD
@@ -0,0 +1,42 @@
+../../bin/mako-render,sha256=Fzn7OVefsZWTvGZ5vS8Vwrp5MP4vyqxWITpWxPDqdgc,189
+mako-1.3.10.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+mako-1.3.10.dist-info/METADATA,sha256=VAbwPOfALVKbDJYv5l848ZceyGwynnE9s_TXP6_dr5o,2919
+mako-1.3.10.dist-info/RECORD,,
+mako-1.3.10.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mako-1.3.10.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+mako-1.3.10.dist-info/entry_points.txt,sha256=LsKkUsOsJQYbJ2M72hZCm968wi5K8Ywb5uFxCuN8Obk,512
+mako-1.3.10.dist-info/licenses/LICENSE,sha256=aNcGTlPj_6jp9CCp5gS9LiBZ2cMwSS-m69TrPUgRFok,1098
+mako-1.3.10.dist-info/top_level.txt,sha256=LItdH8cDPetpUu8rUyBG3DObS6h9Gcpr9j_WLj2S-R0,5
+mako/__init__.py,sha256=n-XoSW8ChrO6NkJ2xUHElzvSnU6XUu5ruMZe86QldTI,243
+mako/_ast_util.py,sha256=hCbfnnizWEa3xRCA-uVyShC2HohSpmVvexz5as_lHc8,20247
+mako/ast.py,sha256=xYrdSiJFbf1CxJ9tU9pcPEWK0BYfwF2aDNDNLQG9PqQ,6642
+mako/cache.py,sha256=kA6FKGl5NeTBnSTcnhoPkSaeJ0JeYpF6GM8qzEZGSts,7680
+mako/cmd.py,sha256=Y2Y6VxNCYwO2Y8EXOdLTf5tpYgfdoondV6Ehlbh8a84,2813
+mako/codegen.py,sha256=N49EH57CcTUfKGzI8V7GFBrAEoFhRo9lkdXBzpFYzBY,47736
+mako/compat.py,sha256=owGbObdoF0C-6rCCs6Vnk3YGHv0bf0PpTja55Woxqb4,1820
+mako/exceptions.py,sha256=87Djuoi1IS5zyVFml1Z5zpCP1IoI7UMOH3h4ejt3x3g,12530
+mako/ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mako/ext/autohandler.py,sha256=QuhNiPSF1LZ53awQ1Qfpwu1Zi9RGOmrtCDnwCLgQzeE,1885
+mako/ext/babelplugin.py,sha256=mmt5fG3pcYII1QsrLEV3wH1ltj-C7uKl8vBIpAjxsKY,2091
+mako/ext/beaker_cache.py,sha256=4quuJQuXRKKUyF6kM43LQhJT1J2z1KSglRZVDW-7c1I,2578
+mako/ext/extract.py,sha256=ZUeaRL2jWcUlrpnhXFXJB0CUJfvQVGBF9tJr5nKJAWI,4659
+mako/ext/linguaplugin.py,sha256=sUZalJSI_XeON9aRBb2hds-ilVQaxHKlfCg_nAl7EuU,1935
+mako/ext/preprocessors.py,sha256=HYG45idRJUwJkDpswEELL8lPFLisQzgDhW5EHpTDGkI,576
+mako/ext/pygmentplugin.py,sha256=TnpJDyQeWTTGHZraMDpw8FB3PNzbmXhaZcjyIBudyi0,4753
+mako/ext/turbogears.py,sha256=egv8hradAnnSJwxtmW8uXAsqPUzX8cZZCXclmO_8hMA,2141
+mako/filters.py,sha256=IBXyGOby4eFE3UGvNLhJlzbe1FfwJ2dcEr1-gKO_Ljc,4658
+mako/lexer.py,sha256=GMq8yf0dEn04-xw2EVDEzaOLXMSVVQz9HyUbfwKnZKg,16321
+mako/lookup.py,sha256=4ALORJiL0wIdDvK1okW8rbjq2jL5F_TNASekDFQSULY,12428
+mako/parsetree.py,sha256=-wmyX_mklAoKhc-7Psx0U15EKpNSd8oGRXFmvk2JQWo,19021
+mako/pygen.py,sha256=689_jR0GG_8Am62Dmlm5h59VY6eyZAU3GroodqEDnZ0,10416
+mako/pyparser.py,sha256=8ZqUbCDIlgEup4si2zP7-xJns14JvVzX_QMO9sCCGJ0,7558
+mako/runtime.py,sha256=ZsUEN22nX3d3dECQujF69mBKDQS6yVv2nvz_0eTvFGg,27804
+mako/template.py,sha256=Vn5nLoBY-YzSQJKvRPFGb4fiPyZryA5Q-8mWutv0b9A,23563
+mako/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mako/testing/_config.py,sha256=k-qpnsnbXUoN-ykMN5BRpg84i1x0p6UsAddKQnrIytU,3566
+mako/testing/assertions.py,sha256=pfbGl84QlW7QWGg3_lo3wP8XnBAVo9AjzNp2ajmn7FA,5161
+mako/testing/config.py,sha256=wmYVZfzGvOK3mJUZpzmgO8-iIgvaCH41Woi4yDpxq6E,323
+mako/testing/exclusions.py,sha256=_t6ADKdatk3f18tOfHV_ZY6u_ZwQsKphZ2MXJVSAOcI,1553
+mako/testing/fixtures.py,sha256=nEp7wTusf7E0n3Q-BHJW2s_t1vx0KB9poadQ1BmIJzE,3044
+mako/testing/helpers.py,sha256=z4HAactwlht4ut1cbvxKt1QLb3yLPk1U7cnh5BwVUlc,1623
+mako/util.py,sha256=SNYeX2_PmajQJIR3-S1Yqxxylz8lwS65rC8YbCdTkUU,10638
diff --git a/libs/importlib_resources-6.4.5.dist-info/REQUESTED b/libs/mako-1.3.10.dist-info/REQUESTED
similarity index 100%
rename from libs/importlib_resources-6.4.5.dist-info/REQUESTED
rename to libs/mako-1.3.10.dist-info/REQUESTED
diff --git a/libs/mako-1.3.10.dist-info/WHEEL b/libs/mako-1.3.10.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/mako-1.3.10.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/Mako-1.3.8.dist-info/entry_points.txt b/libs/mako-1.3.10.dist-info/entry_points.txt
similarity index 100%
rename from libs/Mako-1.3.8.dist-info/entry_points.txt
rename to libs/mako-1.3.10.dist-info/entry_points.txt
diff --git a/libs/mako-1.3.10.dist-info/licenses/LICENSE b/libs/mako-1.3.10.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..4c18adee3d
--- /dev/null
+++ b/libs/mako-1.3.10.dist-info/licenses/LICENSE
@@ -0,0 +1,19 @@
+Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/Mako-1.3.8.dist-info/top_level.txt b/libs/mako-1.3.10.dist-info/top_level.txt
similarity index 100%
rename from libs/Mako-1.3.8.dist-info/top_level.txt
rename to libs/mako-1.3.10.dist-info/top_level.txt
diff --git a/libs/mako/__init__.py b/libs/mako/__init__.py
index ba34f43bf0..71f8f6036d 100644
--- a/libs/mako/__init__.py
+++ b/libs/mako/__init__.py
@@ -1,8 +1,8 @@
 # mako/__init__.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = "1.3.8"
+__version__ = "1.3.10"
diff --git a/libs/mako/_ast_util.py b/libs/mako/_ast_util.py
index 63b8f22865..385d7a0087 100644
--- a/libs/mako/_ast_util.py
+++ b/libs/mako/_ast_util.py
@@ -1,5 +1,5 @@
 # mako/_ast_util.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ast.py b/libs/mako/ast.py
index e59df3eb1b..82cfa11665 100644
--- a/libs/mako/ast.py
+++ b/libs/mako/ast.py
@@ -1,5 +1,5 @@
 # mako/ast.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/cache.py b/libs/mako/cache.py
index bad2525756..267411c33a 100644
--- a/libs/mako/cache.py
+++ b/libs/mako/cache.py
@@ -1,5 +1,5 @@
 # mako/cache.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/cmd.py b/libs/mako/cmd.py
index 3858a1274c..3fff197ba7 100644
--- a/libs/mako/cmd.py
+++ b/libs/mako/cmd.py
@@ -1,5 +1,5 @@
 # mako/cmd.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/codegen.py b/libs/mako/codegen.py
index b9fea937b0..b5293f4757 100644
--- a/libs/mako/codegen.py
+++ b/libs/mako/codegen.py
@@ -1,5 +1,5 @@
 # mako/codegen.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/compat.py b/libs/mako/compat.py
index 183221595f..1c17601247 100644
--- a/libs/mako/compat.py
+++ b/libs/mako/compat.py
@@ -1,5 +1,5 @@
 # mako/compat.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/exceptions.py b/libs/mako/exceptions.py
index ca22567730..6aeb2d274e 100644
--- a/libs/mako/exceptions.py
+++ b/libs/mako/exceptions.py
@@ -1,5 +1,5 @@
 # mako/exceptions.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/autohandler.py b/libs/mako/ext/autohandler.py
index dff9b6a845..829ed097ce 100644
--- a/libs/mako/ext/autohandler.py
+++ b/libs/mako/ext/autohandler.py
@@ -1,5 +1,5 @@
 # ext/autohandler.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/babelplugin.py b/libs/mako/ext/babelplugin.py
index cdb37cdf3f..541ea54091 100644
--- a/libs/mako/ext/babelplugin.py
+++ b/libs/mako/ext/babelplugin.py
@@ -1,5 +1,5 @@
 # ext/babelplugin.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/beaker_cache.py b/libs/mako/ext/beaker_cache.py
index 590fbd017c..b1392f30f6 100644
--- a/libs/mako/ext/beaker_cache.py
+++ b/libs/mako/ext/beaker_cache.py
@@ -1,5 +1,5 @@
 # ext/beaker_cache.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/extract.py b/libs/mako/ext/extract.py
index d03789db55..609c5c2988 100644
--- a/libs/mako/ext/extract.py
+++ b/libs/mako/ext/extract.py
@@ -1,5 +1,5 @@
 # ext/extract.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/linguaplugin.py b/libs/mako/ext/linguaplugin.py
index 22077e665b..118668de2c 100644
--- a/libs/mako/ext/linguaplugin.py
+++ b/libs/mako/ext/linguaplugin.py
@@ -1,5 +1,5 @@
 # ext/linguaplugin.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/preprocessors.py b/libs/mako/ext/preprocessors.py
index 6d1aaf5d1c..21f2db54db 100644
--- a/libs/mako/ext/preprocessors.py
+++ b/libs/mako/ext/preprocessors.py
@@ -1,5 +1,5 @@
 # ext/preprocessors.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/pygmentplugin.py b/libs/mako/ext/pygmentplugin.py
index f422623de6..74a8fb9dbc 100644
--- a/libs/mako/ext/pygmentplugin.py
+++ b/libs/mako/ext/pygmentplugin.py
@@ -1,5 +1,5 @@
 # ext/pygmentplugin.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/ext/turbogears.py b/libs/mako/ext/turbogears.py
index 2a3ec7d7a9..25ad35e774 100644
--- a/libs/mako/ext/turbogears.py
+++ b/libs/mako/ext/turbogears.py
@@ -1,5 +1,5 @@
 # ext/turbogears.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/filters.py b/libs/mako/filters.py
index 2a4b438626..d5338bd9cf 100644
--- a/libs/mako/filters.py
+++ b/libs/mako/filters.py
@@ -1,5 +1,5 @@
 # mako/filters.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/lexer.py b/libs/mako/lexer.py
index b4a76a45f3..37afb4de29 100644
--- a/libs/mako/lexer.py
+++ b/libs/mako/lexer.py
@@ -1,5 +1,5 @@
 # mako/lexer.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/lookup.py b/libs/mako/lookup.py
index d916db771a..1a431c8059 100644
--- a/libs/mako/lookup.py
+++ b/libs/mako/lookup.py
@@ -1,5 +1,5 @@
 # mako/lookup.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/parsetree.py b/libs/mako/parsetree.py
index ac99736863..f7bdda8d67 100644
--- a/libs/mako/parsetree.py
+++ b/libs/mako/parsetree.py
@@ -1,5 +1,5 @@
 # mako/parsetree.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/pygen.py b/libs/mako/pygen.py
index 820e101d33..41f9afdaa5 100644
--- a/libs/mako/pygen.py
+++ b/libs/mako/pygen.py
@@ -1,5 +1,5 @@
 # mako/pygen.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/mako/pyparser.py b/libs/mako/pyparser.py
index 714e004355..1da9ddb554 100644
--- a/libs/mako/pyparser.py
+++ b/libs/mako/pyparser.py
@@ -1,5 +1,5 @@
 # mako/pyparser.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -93,6 +93,7 @@ def visit_FunctionDef(self, node):
     def visit_ListComp(self, node):
         if self.in_function:
             for comp in node.generators:
+                self.visit(comp.target)
                 self.visit(comp.iter)
         else:
             self.generic_visit(node)
@@ -102,6 +103,7 @@ def visit_ListComp(self, node):
     def visit_DictComp(self, node):
         if self.in_function:
             for comp in node.generators:
+                self.visit(comp.target)
                 self.visit(comp.iter)
         else:
             self.generic_visit(node)
diff --git a/libs/mako/template.py b/libs/mako/template.py
index e277172761..82c7cba8b4 100644
--- a/libs/mako/template.py
+++ b/libs/mako/template.py
@@ -1,5 +1,5 @@
 # mako/template.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -119,11 +119,7 @@ class Template:
     :param future_imports: String list of names to import from `__future__`.
      These will be concatenated into a comma-separated string and inserted
      into the beginning of the template, e.g. ``futures_imports=['FOO',
-     'BAR']`` results in ``from __future__ import FOO, BAR``.  If you're
-     interested in using features like the new division operator, you must
-     use future_imports to convey that to the renderer, as otherwise the
-     import will not appear as the first executed statement in the generated
-     code and will therefore not have the desired effect.
+     'BAR']`` results in ``from __future__ import FOO, BAR``.
 
     :param include_error_handler: An error handler that runs when this template
      is included within another one via the ``<%include>`` tag, and raises an
diff --git a/libs/mako/util.py b/libs/mako/util.py
index 91188cacfa..470713a517 100644
--- a/libs/mako/util.py
+++ b/libs/mako/util.py
@@ -1,5 +1,5 @@
 # mako/util.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright 2006-2025 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
diff --git a/libs/importlib_resources-6.4.5.dist-info/INSTALLER b/libs/markdown-3.10.2.dist-info/INSTALLER
similarity index 100%
rename from libs/importlib_resources-6.4.5.dist-info/INSTALLER
rename to libs/markdown-3.10.2.dist-info/INSTALLER
diff --git a/libs/markdown-3.10.2.dist-info/METADATA b/libs/markdown-3.10.2.dist-info/METADATA
new file mode 100644
index 0000000000..50024fa4ef
--- /dev/null
+++ b/libs/markdown-3.10.2.dist-info/METADATA
@@ -0,0 +1,115 @@
+Metadata-Version: 2.4
+Name: Markdown
+Version: 3.10.2
+Summary: Python implementation of John Gruber's Markdown.
+Author: Manfred Stienstra, Yuri Takhteyev
+Author-email: Waylan limberg <python.markdown@gmail.com>
+Maintainer: Isaac Muse
+Maintainer-email: Waylan Limberg <python.markdown@gmail.com>
+License-Expression: BSD-3-Clause
+Project-URL: Homepage, https://Python-Markdown.github.io/
+Project-URL: Documentation, https://Python-Markdown.github.io/
+Project-URL: Repository, https://github.com/Python-Markdown/markdown
+Project-URL: Issue Tracker, https://github.com/Python-Markdown/markdown/issues
+Project-URL: Changelog, https://python-markdown.github.io/changelog/
+Keywords: markdown,markdown-parser,python-markdown,markdown-to-html
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Communications :: Email :: Filters
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries
+Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
+Classifier: Topic :: Software Development :: Documentation
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Filters
+Classifier: Topic :: Text Processing :: Markup :: HTML
+Classifier: Topic :: Text Processing :: Markup :: Markdown
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Provides-Extra: testing
+Requires-Dist: coverage; extra == "testing"
+Requires-Dist: pyyaml; extra == "testing"
+Provides-Extra: docs
+Requires-Dist: mkdocs>=1.6; extra == "docs"
+Requires-Dist: mkdocs-nature>=0.6; extra == "docs"
+Requires-Dist: mdx_gh_links>=0.2; extra == "docs"
+Requires-Dist: mkdocstrings[python]>=0.28.3; extra == "docs"
+Requires-Dist: mkdocs-gen-files; extra == "docs"
+Requires-Dist: mkdocs-section-index; extra == "docs"
+Requires-Dist: mkdocs-literate-nav; extra == "docs"
+Dynamic: license-file
+
+[Python-Markdown][]
+===================
+
+[![Build Status][build-button]][build]
+[![Coverage Status][codecov-button]][codecov]
+[![Latest Version][mdversion-button]][md-pypi]
+[![Python Versions][pyversion-button]][md-pypi]
+[![BSD License][bsdlicense-button]][bsdlicense]
+[![Code of Conduct][codeofconduct-button]][Code of Conduct]
+
+[build-button]: https://github.com/Python-Markdown/markdown/actions/workflows/tox.yml/badge.svg
+[build]: https://github.com/Python-Markdown/markdown/actions/workflows/tox.yml
+[codecov-button]: https://codecov.io/gh/Python-Markdown/markdown/branch/master/graph/badge.svg
+[codecov]: https://codecov.io/gh/Python-Markdown/markdown
+[mdversion-button]: https://img.shields.io/pypi/v/Markdown.svg
+[md-pypi]: https://pypi.org/project/Markdown/
+[pyversion-button]: https://img.shields.io/pypi/pyversions/Markdown.svg
+[bsdlicense-button]: https://img.shields.io/badge/license-BSD-yellow.svg
+[bsdlicense]: https://opensource.org/licenses/BSD-3-Clause
+[codeofconduct-button]: https://img.shields.io/badge/code%20of%20conduct-contributor%20covenant-green.svg?style=flat-square
+[Code of Conduct]: https://github.com/Python-Markdown/markdown/blob/master/CODE_OF_CONDUCT.md
+
+This is a Python implementation of John Gruber's [Markdown][].
+It is almost completely compliant with the reference implementation,
+though there are a few known issues. See [Features][] for information
+on what exactly is supported and what is not. Additional features are
+supported by the [Available Extensions][].
+
+[Python-Markdown]: https://Python-Markdown.github.io/
+[Markdown]: https://daringfireball.net/projects/markdown/
+[Features]: https://Python-Markdown.github.io#Features
+[Available Extensions]: https://Python-Markdown.github.io/extensions
+
+Documentation
+-------------
+
+```bash
+pip install markdown
+```
+```python
+import markdown
+html = markdown.markdown(your_text_string)
+```
+
+For more advanced [installation] and [usage] documentation, see the `docs/` directory
+of the distribution or the project website at <https://Python-Markdown.github.io/>.
+
+[installation]: https://python-markdown.github.io/install/
+[usage]: https://python-markdown.github.io/reference/
+
+See the change log at <https://python-markdown.github.io/changelog/>.
+
+Support
+-------
+
+You may report bugs, ask for help, and discuss various other issues on the [bug tracker][].
+
+[bug tracker]: https://github.com/Python-Markdown/markdown/issues
+
+Code of Conduct
+---------------
+
+Everyone interacting in the Python-Markdown project's code bases, issue trackers,
+and mailing lists is expected to follow the [Code of Conduct].
diff --git a/libs/markdown-3.10.2.dist-info/RECORD b/libs/markdown-3.10.2.dist-info/RECORD
new file mode 100644
index 0000000000..3c6a6e752e
--- /dev/null
+++ b/libs/markdown-3.10.2.dist-info/RECORD
@@ -0,0 +1,42 @@
+../../bin/markdown_py,sha256=UPWjcrlBVNq2Jn8CQgzo0COfzOjDch6rHh8jTDINl0w,190
+markdown-3.10.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+markdown-3.10.2.dist-info/METADATA,sha256=0-pxtXzBqGpqFeriCgPg9Pc8vbQSeNjQtkFGK-PigIU,5067
+markdown-3.10.2.dist-info/RECORD,,
+markdown-3.10.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+markdown-3.10.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+markdown-3.10.2.dist-info/entry_points.txt,sha256=lMEyiiA_ZZyfPCBlDviBl-SiU0cfoeuEKpwxw361sKQ,1102
+markdown-3.10.2.dist-info/licenses/LICENSE.md,sha256=e6TrbRCzKy0R3OE4ITQDUc27swuozMZ4Qdsv_Ybnmso,1650
+markdown-3.10.2.dist-info/top_level.txt,sha256=IAxs8x618RXoH1uCqeLLxXsDefJvE_mIibr_M4sOlyk,9
+markdown/__init__.py,sha256=dfzwwdpG9L8QLEPBpLFPIHx_BN056aZXp9xZifTxYIU,1777
+markdown/__main__.py,sha256=Ymu_RG0Kmflg2kv3q3RoTlwOdftEUS5czXkntaxu7hA,6200
+markdown/__meta__.py,sha256=34PN4stocHfSrnyUfOevv0GNDX-HsrdJ48EStGRLUBs,1713
+markdown/blockparser.py,sha256=j4CQImVpiq7g9pz8wCxvzT61X_T2iSAjXupHJk8P3eA,5728
+markdown/blockprocessors.py,sha256=koY5rq8DixzBCHcquvZJp6x2JYyBGjrwxMWNZhd6D2U,27013
+markdown/core.py,sha256=WHmVA9wYnguysniqTQu0Jb-VNUtQktuQ9sNHOTLAd64,22964
+markdown/extensions/__init__.py,sha256=9z1khsdKCVrmrJ_2GfxtPAdjD3FyMe5vhC7wmM4O9m0,4822
+markdown/extensions/abbr.py,sha256=EmeD1EZVRjNxANtDiTCyi48GtGuKxHKIw2A8hop_Gr4,7144
+markdown/extensions/admonition.py,sha256=Vj1VkMdoK1gX6_79HSkT0mCcnXiOHeEASNwL0dYfVVs,6566
+markdown/extensions/attr_list.py,sha256=BX3ltqF5dvL2ouScX8_0OKBwkC2oQugueEd89hNRPqE,7841
+markdown/extensions/codehilite.py,sha256=FVVXs5ABX-B7_ucasse1RqWMMsAxXhmXXtMgQd3e2C8,13506
+markdown/extensions/def_list.py,sha256=mQGPIIRJT8eLpnxNWvuLCe4luA67Es1QZ5ZChN7vUyA,4033
+markdown/extensions/extra.py,sha256=1vleT284kued4HQBtF83IjSumJVo0q3ng6MjTkVNfNQ,2163
+markdown/extensions/fenced_code.py,sha256=pdeC-e0hIuk60_-A9u9eiv7EqRSVLp3b7qZfCySu7bs,8303
+markdown/extensions/footnotes.py,sha256=hsH4RSBygGEi2xMWCPTSxUT76GVrH9fkvI_03klx3_c,19373
+markdown/extensions/legacy_attrs.py,sha256=oWcyNrfP0F6zsBoBOaD5NiwrJyy4kCpgQLl12HA7JGU,2788
+markdown/extensions/legacy_em.py,sha256=-Z_w4PEGSS-Xg-2-BtGAnXwwy5g5GDgv2tngASnPgxg,1693
+markdown/extensions/md_in_html.py,sha256=LM3FeNErfJTE6F125bCYSzsQZgkFTCmilN4OZq2jN2M,19785
+markdown/extensions/meta.py,sha256=Da6jDcY4esvdfLUt_MkxyPchHReTE9kcq1_Vo5IpxP8,2604
+markdown/extensions/nl2br.py,sha256=qO5FUnrkAHPtCfHfFbY5Cbm1hVhW7Ci3TRZ__8Ezxic,1102
+markdown/extensions/sane_lists.py,sha256=ttYhHruV3Jbr1z9stnWyHKrChkRSV_EwQqhwRlwIAes,2154
+markdown/extensions/smarty.py,sha256=M3D015BcvXdKi_DOhhZU1EQK8edZYVs0sO02C9JRokE,11238
+markdown/extensions/tables.py,sha256=nu_kf5H2YIEFz0218XWDsg1mQM8NGmkd10C-Ay3TldQ,8743
+markdown/extensions/toc.py,sha256=vg5s5E8yDxo1KtC75KCFGX1SJ8NWb56IHUkEwLnu4Jc,18332
+markdown/extensions/wikilinks.py,sha256=JBmBHkUzT8764tUyAHaBrkAq30UQC9RCKEXYdikDJjs,3288
+markdown/htmlparser.py,sha256=LfjaVZLLCfhTzRhvOssxo1tqmzH3gDFtjsPR9BBqIoA,17364
+markdown/inlinepatterns.py,sha256=lT3QXfaa3hoTaIfYIPdJWVcA1Y8j05YG96GGgT7qlKY,38551
+markdown/postprocessors.py,sha256=vTDjF9Cx4SXlYtUSmHgNd6TIIneO1NXZjT_DObcleA0,4493
+markdown/preprocessors.py,sha256=pq5NnHKkOSVQeIo-ajC-Yt44kvyMV97D04FBOQXctJM,3224
+markdown/serializers.py,sha256=YtAFYQoOdp_TAmYGow6nBo0eB6I-Sl4PTLdLDfQJHwQ,7174
+markdown/test_tools.py,sha256=MtN4cf3ZPDtb83wXLTol-3q3aIGRIkJ2zWr6fd-RgVE,8662
+markdown/treeprocessors.py,sha256=QtWj5MqH3dN5hf1SHgriZkV1dZSk8__unCduYuadFFk,17652
+markdown/util.py,sha256=J0ZWsvuC_71sx_uKSYkHBIA4VdijxQKY5bk63SbdKG0,13943
diff --git a/libs/inflect-7.4.0.dist-info/REQUESTED b/libs/markdown-3.10.2.dist-info/REQUESTED
similarity index 100%
rename from libs/inflect-7.4.0.dist-info/REQUESTED
rename to libs/markdown-3.10.2.dist-info/REQUESTED
diff --git a/libs/markdown-3.10.2.dist-info/WHEEL b/libs/markdown-3.10.2.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/markdown-3.10.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/Markdown-3.7.dist-info/entry_points.txt b/libs/markdown-3.10.2.dist-info/entry_points.txt
similarity index 100%
rename from libs/Markdown-3.7.dist-info/entry_points.txt
rename to libs/markdown-3.10.2.dist-info/entry_points.txt
diff --git a/libs/Markdown-3.7.dist-info/LICENSE.md b/libs/markdown-3.10.2.dist-info/licenses/LICENSE.md
similarity index 100%
rename from libs/Markdown-3.7.dist-info/LICENSE.md
rename to libs/markdown-3.10.2.dist-info/licenses/LICENSE.md
diff --git a/libs/Markdown-3.7.dist-info/top_level.txt b/libs/markdown-3.10.2.dist-info/top_level.txt
similarity index 100%
rename from libs/Markdown-3.7.dist-info/top_level.txt
rename to libs/markdown-3.10.2.dist-info/top_level.txt
diff --git a/libs/markdown/__main__.py b/libs/markdown/__main__.py
index c323aaac41..60f9a5e85e 100644
--- a/libs/markdown/__main__.py
+++ b/libs/markdown/__main__.py
@@ -21,7 +21,6 @@
 
 import sys
 import optparse
-import codecs
 import warnings
 import markdown
 try:
@@ -50,10 +49,14 @@ def parse_options(args=None, values=None):
     usage = """%prog [options] [INPUTFILE]
        (STDIN is assumed if no INPUTFILE is given)"""
     desc = "A Python implementation of John Gruber's Markdown. " \
-           "https://Python-Markdown.github.io/"
+           "https://python-markdown.github.io/"
     ver = "%%prog %s" % markdown.__version__
+    epilog = "WARNING: The Python-Markdown library does NOT sanitize its HTML output. If " \
+             "you are processing Markdown input from an untrusted source, it is your " \
+             "responsibility to ensure that it is properly sanitized. For more " \
+             "information see <https://python-markdown.github.io/sanitization/>."
 
-    parser = optparse.OptionParser(usage=usage, description=desc, version=ver)
+    parser = optparse.OptionParser(usage=usage, description=desc, version=ver, epilog=epilog)
     parser.add_option("-f", "--file", dest="filename", default=None,
                       help="Write output to OUTPUT_FILE. Defaults to STDOUT.",
                       metavar="OUTPUT_FILE")
@@ -100,7 +103,7 @@ def parse_options(args=None, values=None):
 
     extension_configs = {}
     if options.configfile:
-        with codecs.open(
+        with open(
             options.configfile, mode="r", encoding=options.encoding
         ) as fp:
             try:
diff --git a/libs/markdown/__meta__.py b/libs/markdown/__meta__.py
index 640d23fb56..ab267613ac 100644
--- a/libs/markdown/__meta__.py
+++ b/libs/markdown/__meta__.py
@@ -28,7 +28,7 @@
 from __future__ import annotations
 
 
-__version_info__ = (3, 7, 0, 'final', 0)
+__version_info__ = (3, 10, 2, 'final', 0)
 
 
 def _get_version(version_info):
diff --git a/libs/markdown/core.py b/libs/markdown/core.py
index 6c7a21be9b..370cb7ec56 100644
--- a/libs/markdown/core.py
+++ b/libs/markdown/core.py
@@ -335,6 +335,12 @@ def convert(self, source: str) -> str:
            [`ElementTree`][xml.etree.ElementTree.ElementTree] object has been serialized into text.
         5. The output is returned as a string.
 
+        !!! warning
+            The Python-Markdown library does ***not*** sanitize its HTML output.
+            If you are processing Markdown input from an untrusted source, it is your
+            responsibility to ensure that it is properly sanitized. For more
+            information see [Sanitizing HTML Output](../../sanitization.md).
+
         """
 
         # Fix up the source text
@@ -392,9 +398,9 @@ def convertFile(
         encoding: str | None = None,
     ) -> Markdown:
         """
-        Converts a Markdown file and returns the HTML as a Unicode string.
+        Read Markdown text from a file or stream and write HTML output to a file or stream.
 
-        Decodes the file using the provided encoding (defaults to `utf-8`),
+        Decodes the input file using the provided encoding (defaults to `utf-8`),
         passes the file content to markdown, and outputs the HTML to either
         the provided stream or the file with provided name, using the same
         encoding as the source file. The
@@ -410,6 +416,14 @@ def convertFile(
             output: File object or path. Writes to `stdout` if `None`.
             encoding: Encoding of input and output files. Defaults to `utf-8`.
 
+        !!! warning
+            The Python-Markdown library does ***not*** sanitize its HTML output.
+            As `Markdown.convertFile` writes directly to the file system, there is no
+            easy way to sanitize the output from Python code. Therefore, it is
+            recommended that the `Markdown.convertFile` method not be used on input
+            from an untrusted source.  For more information see [Sanitizing HTML
+            Output](../../sanitization.md).
+
         """
 
         encoding = encoding or "utf-8"
@@ -417,7 +431,7 @@ def convertFile(
         # Read the source
         if input:
             if isinstance(input, str):
-                input_file = codecs.open(input, mode="r", encoding=encoding)
+                input_file = open(input, mode="r", encoding=encoding)
             else:
                 input_file = codecs.getreader(encoding)(input)
             text = input_file.read()
@@ -477,6 +491,12 @@ def markdown(text: str, **kwargs: Any) -> str:
     Returns:
         A string in the specified output format.
 
+    !!! warning
+        The Python-Markdown library does ***not*** sanitize its HTML output.
+        If you are processing Markdown input from an untrusted source, it is your
+        responsibility to ensure that it is properly sanitized. For more
+        information see [Sanitizing HTML Output](../../sanitization.md).
+
     """
     md = Markdown(**kwargs)
     return md.convert(text)
@@ -484,7 +504,7 @@ def markdown(text: str, **kwargs: Any) -> str:
 
 def markdownFromFile(**kwargs: Any):
     """
-    Read Markdown text from a file and write output to a file or a stream.
+    Read Markdown text from a file or stream and write HTML output to a file or stream.
 
     This is a shortcut function which initializes an instance of [`Markdown`][markdown.Markdown],
     and calls the [`convertFile`][markdown.Markdown.convertFile] method rather than
@@ -496,6 +516,14 @@ def markdownFromFile(**kwargs: Any):
         encoding (str): Encoding of input and output.
         **kwargs: Any arguments accepted by the `Markdown` class.
 
+    !!! warning
+        The Python-Markdown library does ***not*** sanitize its HTML output.
+        As `markdown.markdownFromFile` writes directly to the file system, there is no
+        easy way to sanitize the output from Python code. Therefore, it is
+        recommended that the `markdown.markdownFromFile` function not be used on input
+        from an untrusted source.  For more information see [Sanitizing HTML
+        Output](../../sanitization.md).
+
     """
     md = Markdown(**kwargs)
     md.convertFile(kwargs.get('input', None),
diff --git a/libs/markdown/extensions/abbr.py b/libs/markdown/extensions/abbr.py
index 693c3bba9a..9e10259b88 100644
--- a/libs/markdown/extensions/abbr.py
+++ b/libs/markdown/extensions/abbr.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/abbreviations
 # for documentation.
 
-# Original code Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/)
+# Original code Copyright 2007-2008 [Waylan Limberg](https://github.com/waylan)
 # and [Seemant Kulleen](http://www.kulleen.org/)
 
 # All changes Copyright 2008-2014 The Python Markdown Project
@@ -33,7 +33,7 @@
 
 if TYPE_CHECKING:  # pragma: no cover
     from .. import Markdown
-    from ..blockparsers import BlockParser
+    from ..blockparser import BlockParser
 
 
 class AbbrExtension(Extension):
@@ -86,29 +86,34 @@ def __init__(self, md: Markdown | None = None, abbrs: dict | None = None):
         self.RE: re.RegexObject | None = None
         super().__init__(md)
 
+    def create_element(self, title: str, text: str, tail: str) -> etree.Element:
+        ''' Create an `abbr` element. '''
+        abbr = etree.Element('abbr', {'title': title})
+        abbr.text = AtomicString(text)
+        abbr.tail = tail
+        return abbr
+
     def iter_element(self, el: etree.Element, parent: etree.Element | None = None) -> None:
         ''' Recursively iterate over elements, run regex on text and wrap matches in `abbr` tags. '''
         for child in reversed(el):
             self.iter_element(child, el)
         if text := el.text:
-            for m in reversed(list(self.RE.finditer(text))):
-                if self.abbrs[m.group(0)]:
-                    abbr = etree.Element('abbr', {'title': self.abbrs[m.group(0)]})
-                    abbr.text = AtomicString(m.group(0))
-                    abbr.tail = text[m.end():]
-                    el.insert(0, abbr)
-                    text = text[:m.start()]
-            el.text = text
+            if not isinstance(text, AtomicString):
+                for m in reversed(list(self.RE.finditer(text))):
+                    if self.abbrs[m.group(0)]:
+                        abbr = self.create_element(self.abbrs[m.group(0)], m.group(0), text[m.end():])
+                        el.insert(0, abbr)
+                        text = text[:m.start()]
+                el.text = text
         if parent is not None and el.tail:
             tail = el.tail
             index = list(parent).index(el) + 1
-            for m in reversed(list(self.RE.finditer(tail))):
-                abbr = etree.Element('abbr', {'title': self.abbrs[m.group(0)]})
-                abbr.text = AtomicString(m.group(0))
-                abbr.tail = tail[m.end():]
-                parent.insert(index, abbr)
-                tail = tail[:m.start()]
-            el.tail = tail
+            if not isinstance(tail, AtomicString):
+                for m in reversed(list(self.RE.finditer(tail))):
+                    abbr = self.create_element(self.abbrs[m.group(0)], m.group(0), tail[m.end():])
+                    parent.insert(index, abbr)
+                    tail = tail[:m.start()]
+                el.tail = tail
 
     def run(self, root: etree.Element) -> etree.Element | None:
         ''' Step through tree to find known abbreviations. '''
diff --git a/libs/markdown/extensions/admonition.py b/libs/markdown/extensions/admonition.py
index 01c2316d2b..edfeb49642 100644
--- a/libs/markdown/extensions/admonition.py
+++ b/libs/markdown/extensions/admonition.py
@@ -16,7 +16,8 @@
 
 
 """
-Adds rST-style admonitions. Inspired by [rST][] feature with the same name.
+Adds rST-style admonitions to Python-Markdown.
+Inspired by [rST][] feature with the same name.
 
 [rST]: http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
 
diff --git a/libs/markdown/extensions/attr_list.py b/libs/markdown/extensions/attr_list.py
index 9206d11e69..52ac38a6bc 100644
--- a/libs/markdown/extensions/attr_list.py
+++ b/libs/markdown/extensions/attr_list.py
@@ -8,14 +8,15 @@
 # See https://Python-Markdown.github.io/extensions/attr_list
 # for documentation.
 
-# Original code Copyright 2011 [Waylan Limberg](http://achinghead.com/).
+# Original code Copyright 2011 [Waylan Limberg](https://github.com/waylan).
 
 # All changes Copyright 2011-2014 The Python Markdown Project
 
 # License: [BSD](https://opensource.org/licenses/bsd-license.php)
 
 """
- Adds attribute list syntax. Inspired by
+Adds attribute list syntax to Python-Markdown.
+Inspired by
 [Maruku](http://maruku.rubyforge.org/proposal.html#attribute_lists)'s
 feature of the same name.
 
diff --git a/libs/markdown/extensions/codehilite.py b/libs/markdown/extensions/codehilite.py
index 92e7d8f2be..be45a3f184 100644
--- a/libs/markdown/extensions/codehilite.py
+++ b/libs/markdown/extensions/codehilite.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/code_hilite
 # for documentation.
 
-# Original code Copyright 2006-2008 [Waylan Limberg](http://achinghead.com/).
+# Original code Copyright 2006-2008 [Waylan Limberg](https://github.com/waylan).
 
 # All changes Copyright 2008-2014 The Python Markdown Project
 
diff --git a/libs/markdown/extensions/def_list.py b/libs/markdown/extensions/def_list.py
index 5324bf193a..f09abe379d 100644
--- a/libs/markdown/extensions/def_list.py
+++ b/libs/markdown/extensions/def_list.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/definition_lists
 # for documentation.
 
-# Original code Copyright 2008 [Waylan Limberg](http://achinghead.com)
+# Original code Copyright 2008 [Waylan Limberg](https://github.com/waylan)
 
 # All changes Copyright 2008-2014 The Python Markdown Project
 
diff --git a/libs/markdown/extensions/fenced_code.py b/libs/markdown/extensions/fenced_code.py
index bae7330a35..709e9238cb 100644
--- a/libs/markdown/extensions/fenced_code.py
+++ b/libs/markdown/extensions/fenced_code.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/fenced_code_blocks
 # for documentation.
 
-# Original code Copyright 2007-2008 [Waylan Limberg](http://achinghead.com/).
+# Original code Copyright 2007-2008 [Waylan Limberg](https://github.com/waylan).
 
 # All changes Copyright 2008-2014 The Python Markdown Project
 
diff --git a/libs/markdown/extensions/footnotes.py b/libs/markdown/extensions/footnotes.py
index 30c081138f..8787e4dc48 100644
--- a/libs/markdown/extensions/footnotes.py
+++ b/libs/markdown/extensions/footnotes.py
@@ -33,6 +33,7 @@
 FN_BACKLINK_TEXT = util.STX + "zz1337820767766393qq" + util.ETX
 NBSP_PLACEHOLDER = util.STX + "qq3936677670287331zz" + util.ETX
 RE_REF_ID = re.compile(r'(fnref)(\d+)')
+RE_REFERENCE = re.compile(r'(?<!!)\[\^([^\]]*)\](?!\s*:)')
 
 
 class FootnoteExtension(Extension):
@@ -61,6 +62,11 @@ def __init__(self, **kwargs):
             ],
             'SEPARATOR': [
                 ':', 'Footnote separator.'
+            ],
+            'USE_DEFINITION_ORDER': [
+                True,
+                'Order footnote labels by definition order (True) or by document order (False). '
+                'Default: True.'
             ]
         }
         """ Default configuration options. """
@@ -71,6 +77,9 @@ def __init__(self, **kwargs):
         self.found_refs: dict[str, int] = {}
         self.used_refs: set[str] = set()
 
+        # Backward compatibility with old '%d' placeholder
+        self.setConfig('BACKLINK_TITLE', self.getConfig("BACKLINK_TITLE").replace("%d", "{}"))
+
         self.reset()
 
     def extendMarkdown(self, md):
@@ -89,6 +98,12 @@ def extendMarkdown(self, md):
         # `codehilite`) so they can run on the the contents of the div.
         md.treeprocessors.register(FootnoteTreeprocessor(self), 'footnote', 50)
 
+        # Insert a tree-processor to reorder the footnotes if necessary. This must be after
+        # `inline` tree-processor so it can access the footnote reference order
+        # (`self.footnote_order`) that gets populated by the `FootnoteInlineProcessor`.
+        if not self.getConfig("USE_DEFINITION_ORDER"):
+            md.treeprocessors.register(FootnoteReorderingProcessor(self), 'footnote-reorder', 19)
+
         # Insert a tree-processor that will run after inline is done.
         # In this tree-processor we want to check our duplicate footnote tracker
         # And add additional `backrefs` to the footnote pointing back to the
@@ -100,6 +115,7 @@ def extendMarkdown(self, md):
 
     def reset(self) -> None:
         """ Clear footnotes on reset, and prepare for distinct document. """
+        self.footnote_order: list[str] = []
         self.footnotes: OrderedDict[str, str] = OrderedDict()
         self.unique_prefix += 1
         self.found_refs = {}
@@ -150,6 +166,11 @@ def setFootnote(self, id: str, text: str) -> None:
         """ Store a footnote for later retrieval. """
         self.footnotes[id] = text
 
+    def addFootnoteRef(self, id: str) -> None:
+        """ Store a footnote reference id in order of appearance. """
+        if id not in self.footnote_order:
+            self.footnote_order.append(id)
+
     def get_separator(self) -> str:
         """ Get the footnote separator. """
         return self.getConfig("SEPARATOR")
@@ -180,9 +201,6 @@ def makeFootnotesDiv(self, root: etree.Element) -> etree.Element | None:
         ol = etree.SubElement(div, "ol")
         surrogate_parent = etree.Element("div")
 
-        # Backward compatibility with old '%d' placeholder
-        backlink_title = self.getConfig("BACKLINK_TITLE").replace("%d", "{}")
-
         for index, id in enumerate(self.footnotes.keys(), start=1):
             li = etree.SubElement(ol, "li")
             li.set("id", self.makeFootnoteId(id))
@@ -198,7 +216,7 @@ def makeFootnotesDiv(self, root: etree.Element) -> etree.Element | None:
             backlink.set("class", "footnote-backref")
             backlink.set(
                 "title",
-                backlink_title.format(index)
+                self.getConfig('BACKLINK_TITLE').format(index)
             )
             backlink.text = FN_BACKLINK_TEXT
 
@@ -214,7 +232,7 @@ def makeFootnotesDiv(self, root: etree.Element) -> etree.Element | None:
 
 
 class FootnoteBlockProcessor(BlockProcessor):
-    """ Find all footnote references and store for later use. """
+    """ Find footnote definitions and store for later use. """
 
     RE = re.compile(r'^[ ]{0,3}\[\^([^\]]*)\]:[ ]*(.*)$', re.MULTILINE)
 
@@ -228,6 +246,7 @@ def test(self, parent: etree.Element, block: str) -> bool:
     def run(self, parent: etree.Element, blocks: list[str]) -> bool:
         """ Find, set, and remove footnote definitions. """
         block = blocks.pop(0)
+
         m = self.RE.search(block)
         if m:
             id = m.group(1)
@@ -312,14 +331,21 @@ def __init__(self, pattern: str, footnotes: FootnoteExtension):
     def handleMatch(self, m: re.Match[str], data: str) -> tuple[etree.Element | None, int | None, int | None]:
         id = m.group(1)
         if id in self.footnotes.footnotes.keys():
+            self.footnotes.addFootnoteRef(id)
+
+            if not self.footnotes.getConfig("USE_DEFINITION_ORDER"):
+                # Order by reference
+                footnote_num = self.footnotes.footnote_order.index(id) + 1
+            else:
+                # Order by definition
+                footnote_num = list(self.footnotes.footnotes.keys()).index(id) + 1
+
             sup = etree.Element("sup")
             a = etree.SubElement(sup, "a")
             sup.set('id', self.footnotes.makeFootnoteRefId(id, found=True))
             a.set('href', '#' + self.footnotes.makeFootnoteId(id))
             a.set('class', 'footnote-ref')
-            a.text = self.footnotes.getConfig("SUPERSCRIPT_TEXT").format(
-                list(self.footnotes.footnotes.keys()).index(id) + 1
-            )
+            a.text = self.footnotes.getConfig("SUPERSCRIPT_TEXT").format(footnote_num)
             return sup, m.start(0), m.end(0)
         else:
             return None, None, None
@@ -401,6 +427,44 @@ def run(self, root: etree.Element) -> None:
                 root.append(footnotesDiv)
 
 
+class FootnoteReorderingProcessor(Treeprocessor):
+    """ Reorder list items in the footnotes div. """
+
+    def __init__(self, footnotes: FootnoteExtension):
+        self.footnotes = footnotes
+
+    def run(self, root: etree.Element) -> None:
+        if not self.footnotes.footnotes:
+            return
+        if self.footnotes.footnote_order != list(self.footnotes.footnotes.keys()):
+            for div in root.iter('div'):
+                if div.attrib.get('class', '') == 'footnote':
+                    self.reorder_footnotes(div)
+                    break
+
+    def reorder_footnotes(self, parent: etree.Element) -> None:
+        old_list = parent.find('ol')
+        parent.remove(old_list)
+        items = old_list.findall('li')
+
+        def order_by_id(li) -> int:
+            id = li.attrib.get('id', '').split(self.footnotes.get_separator(), 1)[-1]
+            return (
+                self.footnotes.footnote_order.index(id)
+                if id in self.footnotes.footnote_order
+                else len(self.footnotes.footnotes)
+            )
+
+        items = sorted(items, key=order_by_id)
+
+        new_list = etree.SubElement(parent, 'ol')
+
+        for index, item in enumerate(items, start=1):
+            backlink = item.find('.//a[@class="footnote-backref"]')
+            backlink.set("title", self.footnotes.getConfig("BACKLINK_TITLE").format(index))
+            new_list.append(item)
+
+
 class FootnotePostprocessor(Postprocessor):
     """ Replace placeholders with html entities. """
     def __init__(self, footnotes: FootnoteExtension):
diff --git a/libs/markdown/extensions/md_in_html.py b/libs/markdown/extensions/md_in_html.py
index 64b84a5f4c..7eada6ffcc 100644
--- a/libs/markdown/extensions/md_in_html.py
+++ b/libs/markdown/extensions/md_in_html.py
@@ -12,8 +12,8 @@
 # License: [BSD](https://opensource.org/licenses/bsd-license.php)
 
 """
-An implementation of [PHP Markdown Extra](http://michelf.com/projects/php-markdown/extra/)'s
-parsing of Markdown syntax in raw HTML.
+Parse Markdown syntax within raw HTML.
+Based on the implementation in [PHP Markdown Extra](http://michelf.com/projects/php-markdown/extra/).
 
 See the [documentation](https://Python-Markdown.github.io/extensions/raw_html)
 for details.
@@ -61,6 +61,7 @@ def reset(self):
         self.mdstack: list[str] = []  # When markdown=1, stack contains a list of tags
         self.treebuilder = etree.TreeBuilder()
         self.mdstate: list[Literal['block', 'span', 'off', None]] = []
+        self.mdstarted: list[bool] = []
         super().reset()
 
     def close(self):
@@ -111,7 +112,10 @@ def handle_starttag(self, tag, attrs):
             self.handle_empty_tag(data, True)
             return
 
-        if tag in self.block_level_tags and (self.at_line_start() or self.intail):
+        if (
+            tag in self.block_level_tags and
+            (self.at_line_start() or self.intail or self.mdstarted and self.mdstarted[-1])
+        ):
             # Valueless attribute (ex: `<tag checked>`) results in `[('checked', None)]`.
             # Convert to `{'checked': 'checked'}`.
             attrs = {key: value if value is not None else key for key, value in attrs}
@@ -126,8 +130,10 @@ def handle_starttag(self, tag, attrs):
                     self.handle_endtag('p')
                 self.mdstate.append(state)
                 self.mdstack.append(tag)
+                self.mdstarted.append(True)
                 attrs['markdown'] = state
                 self.treebuilder.start(tag, attrs)
+
         else:
             # Span level tag
             if self.inraw:
@@ -151,6 +157,7 @@ def handle_endtag(self, tag):
                 while self.mdstack:
                     item = self.mdstack.pop()
                     self.mdstate.pop()
+                    self.mdstarted.pop()
                     self.treebuilder.end(item)
                     if item == tag:
                         break
@@ -163,6 +170,45 @@ def handle_endtag(self, tag):
                     # If we only have one newline before block element, add another
                     if not item.endswith('\n\n') and item.endswith('\n'):
                         self.cleandoc.append('\n')
+
+                    # Flatten the HTML structure of "markdown" blocks such that when they
+                    # get parsed, content will be parsed similar inside the blocks as it
+                    # does outside the block. Having real HTML elements in the tree before
+                    # the content adjacent content is processed can cause unpredictable
+                    # issues for extensions.
+                    current = element
+                    last = []
+                    while current is not None:
+                        for child in list(current):
+                            current.remove(child)
+                            text = current.text if current.text is not None else ''
+                            tail = child.tail if child.tail is not None else ''
+                            child.tail = None
+                            state = child.attrib.get('markdown', 'off')
+
+                            # Add a newline to tail if it is not just a trailing newline
+                            if tail != '\n':
+                                tail = '\n' + tail.rstrip('\n')
+
+                            # Ensure there is an empty new line between blocks
+                            if not text.endswith('\n\n'):
+                                text = text.rstrip('\n') + '\n\n'
+
+                            # Process the block nested under the span appropriately
+                            if state in ('span', 'block'):
+                                current.text = f'{text}{self.md.htmlStash.store(child)}{tail}'
+                                last.append(child)
+                            else:
+                                # Non-Markdown HTML will not be recursively parsed for Markdown,
+                                # so we can just remove markers and leave them unflattened.
+                                # Additionally, we don't need to append to our list for further
+                                # processing.
+                                child.attrib.pop('markdown')
+                                [c.attrib.pop('markdown', None) for c in child.iter()]
+                                current.text = f'{text}{self.md.htmlStash.store(child)}{tail}'
+                        # Target the child elements that have been expanded.
+                        current = last.pop(0) if last else None
+
                     self.cleandoc.append(self.md.htmlStash.store(element))
                     self.cleandoc.append('\n\n')
                     self.state = []
@@ -208,6 +254,7 @@ def handle_data(self, data):
         if self.inraw or not self.mdstack:
             super().handle_data(data)
         else:
+            self.mdstarted[-1] = False
             self.treebuilder.data(data)
 
     def handle_empty_tag(self, data, is_block):
@@ -216,8 +263,10 @@ def handle_empty_tag(self, data, is_block):
         else:
             if self.at_line_start() and is_block:
                 self.handle_data('\n' + self.md.htmlStash.store(data) + '\n\n')
-            else:
+            elif self.mdstate and self.mdstate[-1] == "off":
                 self.handle_data(self.md.htmlStash.store(data))
+            else:
+                self.handle_data(data)
 
     def parse_pi(self, i: int) -> int:
         if self.at_line_start() or self.intail or self.mdstack:
@@ -231,6 +280,14 @@ def parse_pi(self, i: int) -> int:
 
     def parse_html_declaration(self, i: int) -> int:
         if self.at_line_start() or self.intail or self.mdstack:
+            if self.rawdata[i:i+3] == '<![' and not self.rawdata[i:i+9] == '<![CDATA[':
+                # We have encountered the bug in #1534 (Python bug `gh-77057`).
+                # Provide an override until we drop support for Python < 3.13.
+                result = self.parse_bogus_comment(i)
+                if result == -1:
+                    self.handle_data(self.rawdata[i:i + 1])
+                    return i + 1
+                return result
             # The same override exists in `HTMLExtractor` without the check
             # for `mdstack`. Therefore, use parent of `HTMLExtractor` instead.
             return super(HTMLExtractor, self).parse_html_declaration(i)
@@ -270,53 +327,56 @@ def parse_element_content(self, element: etree.Element) -> None:
         md_attr = element.attrib.pop('markdown', 'off')
 
         if md_attr == 'block':
-            # Parse content as block level
-            # The order in which the different parts are parsed (text, children, tails) is important here as the
-            # order of elements needs to be preserved. We can't be inserting items at a later point in the current
-            # iteration as we don't want to do raw processing on elements created from parsing Markdown text (for
-            # example). Therefore, the order of operations is children, tails, text.
-
-            # Recursively parse existing children from raw HTML
-            for child in list(element):
-                self.parse_element_content(child)
-
-            # Parse Markdown text in tail of children. Do this separate to avoid raw HTML parsing.
-            # Save the position of each item to be inserted later in reverse.
-            tails = []
-            for pos, child in enumerate(element):
-                if child.tail:
-                    block = child.tail.rstrip('\n')
-                    child.tail = ''
-                    # Use a dummy placeholder element.
-                    dummy = etree.Element('div')
-                    self.parser.parseBlocks(dummy, block.split('\n\n'))
-                    children = list(dummy)
-                    children.reverse()
-                    tails.append((pos + 1, children))
-
-            # Insert the elements created from the tails in reverse.
-            tails.reverse()
-            for pos, tail in tails:
-                for item in tail:
-                    element.insert(pos, item)
-
-            # Parse Markdown text content. Do this last to avoid raw HTML parsing.
+            # Parse the block elements content as Markdown
             if element.text:
                 block = element.text.rstrip('\n')
                 element.text = ''
-                # Use a dummy placeholder element as the content needs to get inserted before existing children.
-                dummy = etree.Element('div')
-                self.parser.parseBlocks(dummy, block.split('\n\n'))
-                children = list(dummy)
-                children.reverse()
-                for child in children:
-                    element.insert(0, child)
+                self.parser.parseBlocks(element, block.split('\n\n'))
 
         elif md_attr == 'span':
-            # Span level parsing will be handled by inline processors.
-            # Walk children here to remove any `markdown` attributes.
-            for child in list(element):
-                self.parse_element_content(child)
+            # Span elements need to be recursively processed for block elements and raw HTML
+            # as their content is not normally accessed by block processors, so expand stashed
+            # HTML under the span. Span content itself will not be parsed here, but will await
+            # the inline parser.
+            block = element.text if element.text is not None else ''
+            element.text = ''
+            child = None
+            start = 0
+
+            # Search the content for HTML placeholders and process the elements
+            for m in util.HTML_PLACEHOLDER_RE.finditer(block):
+                index = int(m.group(1))
+                el = self.parser.md.htmlStash.rawHtmlBlocks[index]
+                end = m.start()
+
+                if isinstance(el, etree.Element):
+                    # Replace the placeholder with the element and process it.
+                    # Content after the placeholder should be attached to the tail.
+                    if child is None:
+                        element.text += block[start:end]
+                    else:
+                        child.tail += block[start:end]
+                    element.append(el)
+                    self.parse_element_content(el)
+                    child = el
+                    if child.tail is None:
+                        child.tail = ''
+                    self.parser.md.htmlStash.rawHtmlBlocks.pop(index)
+                    self.parser.md.htmlStash.rawHtmlBlocks.insert(index, '')
+
+                else:
+                    # Not an element object, so insert content back into the element
+                    if child is None:
+                        element.text += block[start:end]
+                    else:
+                        child.tail += block[start:end]
+                start = end
+
+            # Insert anything left after last element
+            if child is None:
+                element.text += block[start:]
+            else:
+                child.tail += block[start:]
 
         else:
             # Disable inline parsing for everything else
@@ -335,12 +395,16 @@ def run(self, parent: etree.Element, blocks: list[str]) -> bool:
             element = self.parser.md.htmlStash.rawHtmlBlocks[index]
             if isinstance(element, etree.Element):
                 # We have a matched element. Process it.
-                blocks.pop(0)
-                self.parse_element_content(element)
+                block = blocks.pop(0)
                 parent.append(element)
+                self.parse_element_content(element)
                 # Cleanup stash. Replace element with empty string to avoid confusing postprocessor.
                 self.parser.md.htmlStash.rawHtmlBlocks.pop(index)
                 self.parser.md.htmlStash.rawHtmlBlocks.insert(index, '')
+                content = block[m.end(0):]
+                # Ensure the rest of the content gets handled
+                if content:
+                    blocks.insert(0, content)
                 # Confirm the match to the `blockparser`.
                 return True
         # No match found.
diff --git a/libs/markdown/extensions/meta.py b/libs/markdown/extensions/meta.py
index cb703399bd..9976b8de28 100644
--- a/libs/markdown/extensions/meta.py
+++ b/libs/markdown/extensions/meta.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/meta_data
 # for documentation.
 
-# Original code Copyright 2007-2008 [Waylan Limberg](http://achinghead.com).
+# Original code Copyright 2007-2008 [Waylan Limberg](https://github.com/waylan).
 
 # All changes Copyright 2008-2014 The Python Markdown Project
 
diff --git a/libs/markdown/extensions/nl2br.py b/libs/markdown/extensions/nl2br.py
index 177df1ee41..d472920257 100644
--- a/libs/markdown/extensions/nl2br.py
+++ b/libs/markdown/extensions/nl2br.py
@@ -14,8 +14,8 @@
 # License: [BSD](https://opensource.org/licenses/bsd-license.php)
 
 """
-A Python-Markdown extension to treat newlines as hard breaks; like
-GitHub-flavored Markdown does.
+A Python-Markdown extension to treat newlines as hard breaks.
+Similar to GitHub-flavored Markdown's behavior.
 
 See the [documentation](https://Python-Markdown.github.io/extensions/nl2br)
 for details.
diff --git a/libs/markdown/extensions/sane_lists.py b/libs/markdown/extensions/sane_lists.py
index be421f9435..5e05459fba 100644
--- a/libs/markdown/extensions/sane_lists.py
+++ b/libs/markdown/extensions/sane_lists.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/sane_lists
 # for documentation.
 
-# Original code Copyright 2011 [Waylan Limberg](http://achinghead.com)
+# Original code Copyright 2011 [Waylan Limberg](https://github.com/waylan)
 
 # All changes Copyright 2011-2014 The Python Markdown Project
 
diff --git a/libs/markdown/extensions/smarty.py b/libs/markdown/extensions/smarty.py
index 7a7c952dcf..c1817e634d 100644
--- a/libs/markdown/extensions/smarty.py
+++ b/libs/markdown/extensions/smarty.py
@@ -77,8 +77,7 @@
 #    of this software, even if advised of the possibility of such damage.
 
 """
-Adds conversion of ASCII dashes, quotes and ellipses to their HTML
-entity equivalents.
+Convert ASCII dashes, quotes and ellipses to their HTML entity equivalents.
 
 See the [documentation](https://Python-Markdown.github.io/extensions/smarty)
 for details.
@@ -135,6 +134,8 @@
 #   <p>He said, "'Quoted' words in a larger quote."</p>
 doubleQuoteSetsRe = r""""'(?=\w)"""
 singleQuoteSetsRe = r"""'"(?=\w)"""
+doubleQuoteSetsRe2 = r'(?<=%s)\'"' % closeClass
+singleQuoteSetsRe2 = r"(?<=%s)\"'" % closeClass
 
 # Special case for decade abbreviations (the '80s):
 decadeAbbrRe = r"(?<!\w)'(?=\d{2}s)"
@@ -144,7 +145,7 @@
 
 # Double closing quotes:
 closingDoubleQuotesRegex = r'"(?=\s)'
-closingDoubleQuotesRegex2 = '(?<=%s)"' % closeClass
+closingDoubleQuotesRegex2 = r'(?<=%s)"' % closeClass
 
 # Get most opening single quotes:
 openingSingleQuotesRegex = r"%s'(?=\w)" % openingQuotesBase
@@ -241,6 +242,8 @@ def educateQuotes(self, md: Markdown) -> None:
             (doubleQuoteStartRe, (rdquo,)),
             (doubleQuoteSetsRe, (ldquo + lsquo,)),
             (singleQuoteSetsRe, (lsquo + ldquo,)),
+            (doubleQuoteSetsRe2, (rsquo + rdquo,)),
+            (singleQuoteSetsRe2, (rdquo + rsquo,)),
             (decadeAbbrRe, (rsquo,)),
             (openingSingleQuotesRegex, (1, lsquo)),
             (closingSingleQuotesRegex, (rsquo,)),
diff --git a/libs/markdown/extensions/tables.py b/libs/markdown/extensions/tables.py
index 6e2fa17427..678048e61b 100644
--- a/libs/markdown/extensions/tables.py
+++ b/libs/markdown/extensions/tables.py
@@ -1,19 +1,19 @@
 # Tables Extension for Python-Markdown
 # ====================================
 
-# Added parsing of tables to Python-Markdown.
+# Adds parsing of tables to Python-Markdown.
 
 # See https://Python-Markdown.github.io/extensions/tables
 # for documentation.
 
-# Original code Copyright 2009 [Waylan Limberg](http://achinghead.com)
+# Original code Copyright 2009 [Waylan Limberg](https://github.com/waylan)
 
 # All changes Copyright 2008-2014 The Python Markdown Project
 
 # License: [BSD](https://opensource.org/licenses/bsd-license.php)
 
 """
-Added parsing of tables to Python-Markdown.
+Adds parsing of tables to Python-Markdown.
 
 See the [documentation](https://Python-Markdown.github.io/extensions/tables)
 for details.
diff --git a/libs/markdown/extensions/toc.py b/libs/markdown/extensions/toc.py
index 5462a906cc..c92f928b66 100644
--- a/libs/markdown/extensions/toc.py
+++ b/libs/markdown/extensions/toc.py
@@ -391,7 +391,7 @@ def run(self, doc: etree.Element) -> None:
                 if int(el.tag[-1]) >= self.toc_top and int(el.tag[-1]) <= self.toc_bottom:
                     toc_tokens.append({
                         'level': int(el.tag[-1]),
-                        'id': el.attrib["id"],
+                        'id': unescape(el.attrib["id"]),
                         'name': name,
                         'html': innerhtml,
                         'data-toc-label': data_toc_label
diff --git a/libs/markdown/extensions/wikilinks.py b/libs/markdown/extensions/wikilinks.py
index 3f3cbe2ddd..bb72c3d8fd 100644
--- a/libs/markdown/extensions/wikilinks.py
+++ b/libs/markdown/extensions/wikilinks.py
@@ -6,7 +6,7 @@
 # See https://Python-Markdown.github.io/extensions/wikilinks
 # for documentation.
 
-# Original code Copyright [Waylan Limberg](http://achinghead.com/).
+# Original code Copyright [Waylan Limberg](https://github.com/waylan).
 
 # All changes Copyright The Python Markdown Project
 
diff --git a/libs/markdown/htmlparser.py b/libs/markdown/htmlparser.py
index 33b918d54b..488da0333f 100644
--- a/libs/markdown/htmlparser.py
+++ b/libs/markdown/htmlparser.py
@@ -33,6 +33,8 @@
 if TYPE_CHECKING:  # pragma: no cover
     from markdown import Markdown
 
+# Included for versions which do not have current comment fix
+commentclose = re.compile(r'--!?>')
 
 # Import a copy of the html.parser lib as `htmlparser` so we can monkeypatch it.
 # Users can still do `from html import parser` and get the default behavior.
@@ -41,6 +43,12 @@
 spec.loader.exec_module(htmlparser)
 sys.modules['htmlparser'] = htmlparser
 
+# This is a hack. We are sneaking in `</>` so we can capture it without the HTML parser
+# throwing it away. When we see it, we will process it as data.
+htmlparser.starttagopen = re.compile('<[a-zA-Z]|</>')
+
+htmlparser.endtagopen = re.compile('</[a-zA-Z]?')
+
 # Monkeypatch `HTMLParser` to only accept `?>` to close Processing Instructions.
 htmlparser.piclose = re.compile(r'\?>')
 # Monkeypatch `HTMLParser` to only recognize entity references with a closing semicolon.
@@ -65,12 +73,50 @@
    )?
   \s*                                 # trailing whitespace
 """, re.VERBOSE)
+htmlparser.locatetagend = re.compile(r"""
+  [a-zA-Z][^`\t\n\r\f />]*           # tag name
+  [\t\n\r\f /]*                     # optional whitespace before attribute name
+  (?:(?<=['"\t\n\r\f /])[^`\t\n\r\f />][^\t\n\r\f /=>]*  # attribute name
+    (?:=                            # value indicator
+      (?:'[^']*'                    # LITA-enclosed value
+        |"[^"]*"                    # LIT-enclosed value
+        |(?!['"])[^>\t\n\r\f ]*     # bare value
+       )
+     )?
+    [\t\n\r\f /]*                   # possibly followed by a space
+   )*
+   >?
+""", re.VERBOSE)
 
 # Match a blank line at the start of a block of text (two newlines).
 # The newlines may be preceded by additional whitespace.
 blank_line_re = re.compile(r'^([ ]*\n){2}')
 
 
+class _HTMLParser(htmlparser.HTMLParser):
+    """Handle special start and end tags."""
+
+    def parse_endtag(self, i):
+        start = self.rawdata[i:i+3]
+        c = ord(start[-1])
+        if len(start) < 3 or not (65 <= c <= 90 or 97 <= c <= 122):
+            self.handle_data(self.rawdata[i:i + 2])
+            return i + 2
+        return super().parse_endtag(i)
+
+    def parse_starttag(self, i: int) -> int:  # pragma: no cover
+        # Treat `</>` as normal data as it is not a real tag.
+        if self.rawdata[i:i + 3] == '</>':
+            self.handle_data(self.rawdata[i:i + 3])
+            return i + 3
+
+        return super().parse_starttag(i)
+
+
+# Overwrite our custom one for people like MkDocs that pull it in
+htmlparser.HTMLParser = _HTMLParser
+
+
 class HTMLExtractor(htmlparser.HTMLParser):
     """
     Extract raw HTML from text.
@@ -249,6 +295,7 @@ def handle_entityref(self, name: str):
         self.handle_empty_tag('&{};'.format(name), is_block=False)
 
     def handle_comment(self, data: str):
+        # Check if the comment is unclosed, if so, we need to override position
         self.handle_empty_tag('<!--{}-->'.format(data), is_block=True)
 
     def handle_decl(self, data: str):
@@ -269,8 +316,30 @@ def parse_pi(self, i: int) -> int:
         self.handle_data('<?')
         return i + 2
 
+    # Internal -- parse comment, return length or -1 if not terminated
+    # see https://html.spec.whatwg.org/multipage/parsing.html#comment-start-state
+    def parse_comment(self, i, report=True):
+        rawdata = self.rawdata
+        assert rawdata.startswith('<!--', i), 'unexpected call to parse_comment()'
+        match = commentclose.search(rawdata, i+4)
+        if not match:
+            self.handle_data('<')
+            return i + 1
+        if report:
+            j = match.start()
+            self.handle_comment(rawdata[i+4: j])
+        return match.end()
+
     def parse_html_declaration(self, i: int) -> int:
         if self.at_line_start() or self.intail:
+            if self.rawdata[i:i+3] == '<![' and not self.rawdata[i:i+9] == '<![CDATA[':
+                # We have encountered the bug in #1534 (Python bug `gh-77057`).
+                # Provide an override until we drop support for Python < 3.13.
+                result = self.parse_bogus_comment(i)
+                if result == -1:
+                    self.handle_data(self.rawdata[i:i + 1])
+                    return i + 1
+                return result
             return super().parse_html_declaration(i)
         # This is not the beginning of a raw block so treat as plain data
         # and avoid consuming any tags which may follow (see #1066).
@@ -297,10 +366,16 @@ def get_starttag_text(self) -> str:
         return self.__starttag_text
 
     def parse_starttag(self, i: int) -> int:  # pragma: no cover
+        # Treat `</>` as normal data as it is not a real tag.
+        if self.rawdata[i:i + 3] == '</>':
+            self.handle_data(self.rawdata[i:i + 3])
+            return i + 3
+
         self.__starttag_text = None
         endpos = self.check_for_whole_start_tag(i)
         if endpos < 0:
-            return endpos
+            self.handle_data(self.rawdata[i:i + 1])
+            return i + 1
         rawdata = self.rawdata
         self.__starttag_text = rawdata[i:endpos]
 
diff --git a/libs/markdown/inlinepatterns.py b/libs/markdown/inlinepatterns.py
index 3d366ad964..9f24512bfa 100644
--- a/libs/markdown/inlinepatterns.py
+++ b/libs/markdown/inlinepatterns.py
@@ -158,7 +158,13 @@ def build_inlinepatterns(md: Markdown, **kwargs: Any) -> util.Registry[InlinePro
 AUTOMAIL_RE = r'<([^<> !]+@[^@<> ]+)>'
 """ Match an automatic email link (`<me@example.com>`). """
 
-HTML_RE = r'(<(\/?[a-zA-Z][^<>@ ]*( [^<>]*)?|!--(?:(?!<!--|-->).)*--)>)'
+HTML_RE = (
+    r'(<(\/?[a-zA-Z][^<>@ ]*( [^<>]*)?|'          # Tag
+    r'!--(?:(?!<!--|-->).)*--|'                   # Comment
+    r'[?](?:(?!<[?]|[?]>).)*[?]|'                 # Processing instruction
+    r'!\[CDATA\[(?:(?!<!\[CDATA\[|\]\]>).)*\]\]'  # `CDATA`
+    ')>)'
+)
 """ Match an HTML tag (`<...>`). """
 
 ENTITY_RE = r'(&(?:\#[0-9]+|\#x[0-9a-fA-F]+|[a-zA-Z0-9]+);)'
@@ -514,7 +520,8 @@ def get_stash(m: re.Match[str]) -> str:
             value = stash.get(id)
             if value is not None:
                 try:
-                    return self.md.serializer(value)
+                    # Ensure we don't have a placeholder inside a placeholder
+                    return self.unescape(self.md.serializer(value))
                 except Exception:
                     return r'\%s' % value
 
diff --git a/libs/markdown/postprocessors.py b/libs/markdown/postprocessors.py
index 7f5ede90cb..d4b0e1fdc7 100644
--- a/libs/markdown/postprocessors.py
+++ b/libs/markdown/postprocessors.py
@@ -28,7 +28,6 @@
 
 from __future__ import annotations
 
-from collections import OrderedDict
 from typing import TYPE_CHECKING, Any
 from . import util
 import re
@@ -73,37 +72,26 @@ class RawHtmlPostprocessor(Postprocessor):
 
     def run(self, text: str) -> str:
         """ Iterate over html stash and restore html. """
-        replacements = OrderedDict()
-        for i in range(self.md.htmlStash.html_counter):
-            html = self.stash_to_string(self.md.htmlStash.rawHtmlBlocks[i])
-            if self.isblocklevel(html):
-                replacements["<p>{}</p>".format(
-                    self.md.htmlStash.get_placeholder(i))] = html
-            replacements[self.md.htmlStash.get_placeholder(i)] = html
-
         def substitute_match(m: re.Match[str]) -> str:
-            key = m.group(0)
-
-            if key not in replacements:
-                if key[3:-4] in replacements:
-                    return f'<p>{ replacements[key[3:-4]] }</p>'
-                else:
-                    return key
-
-            return replacements[key]
-
-        if replacements:
+            if key := m.group(1):
+                wrapped = True
+            else:
+                key = m.group(2)
+                wrapped = False
+            if (key := int(key)) >= self.md.htmlStash.html_counter:
+                return m.group(0)
+            html = self.stash_to_string(self.md.htmlStash.rawHtmlBlocks[key])
+            if not wrapped or self.isblocklevel(html):
+                return pattern.sub(substitute_match, html)
+            return pattern.sub(substitute_match, f"<p>{html}</p>")
+
+        if self.md.htmlStash.html_counter:
             base_placeholder = util.HTML_PLACEHOLDER % r'([0-9]+)'
             pattern = re.compile(f'<p>{ base_placeholder }</p>|{ base_placeholder }')
-            processed_text = pattern.sub(substitute_match, text)
+            return pattern.sub(substitute_match, text)
         else:
             return text
 
-        if processed_text == text:
-            return processed_text
-        else:
-            return self.run(processed_text)
-
     def isblocklevel(self, html: str) -> bool:
         """ Check is block of HTML is block-level. """
         m = self.BLOCK_LEVEL_REGEX.match(html)
diff --git a/libs/markdown/treeprocessors.py b/libs/markdown/treeprocessors.py
index 83630999e4..9a27446d47 100644
--- a/libs/markdown/treeprocessors.py
+++ b/libs/markdown/treeprocessors.py
@@ -368,7 +368,7 @@ def run(self, tree: etree.Element, ancestors: list[str] | None = None) -> etree.
         stack = [(tree, tree_parents)]
 
         while stack:
-            currElement, parents = stack.pop()
+            currElement, parents = stack.pop(0)
 
             self.ancestors = parents
             self.__build_ancestors(currElement, self.ancestors)
diff --git a/libs/markdown/util.py b/libs/markdown/util.py
index b4642023e2..f547721eb7 100644
--- a/libs/markdown/util.py
+++ b/libs/markdown/util.py
@@ -54,7 +54,8 @@
     # Other elements which Markdown should not be mucking up the contents of.
     'canvas', 'colgroup', 'dd', 'body', 'dt', 'group', 'html', 'iframe', 'li', 'legend',
     'math', 'map', 'noscript', 'output', 'object', 'option', 'progress', 'script',
-    'style', 'summary', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'video'
+    'style', 'summary', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'tr', 'video',
+    'center'
 ]
 """
 List of HTML tags which get treated as block-level elements. Same as the `block_level_elements`
diff --git a/libs/inflect-7.4.0.dist-info/INSTALLER b/libs/markupsafe-3.0.3.dist-info/INSTALLER
similarity index 100%
rename from libs/inflect-7.4.0.dist-info/INSTALLER
rename to libs/markupsafe-3.0.3.dist-info/INSTALLER
diff --git a/libs/markupsafe-3.0.3.dist-info/METADATA b/libs/markupsafe-3.0.3.dist-info/METADATA
new file mode 100644
index 0000000000..0282933652
--- /dev/null
+++ b/libs/markupsafe-3.0.3.dist-info/METADATA
@@ -0,0 +1,74 @@
+Metadata-Version: 2.4
+Name: MarkupSafe
+Version: 3.0.3
+Summary: Safely add untrusted strings to HTML/XML markup.
+Maintainer-email: Pallets <contact@palletsprojects.com>
+License-Expression: BSD-3-Clause
+Project-URL: Donate, https://palletsprojects.com/donate
+Project-URL: Documentation, https://markupsafe.palletsprojects.com/
+Project-URL: Changes, https://markupsafe.palletsprojects.com/page/changes/
+Project-URL: Source, https://github.com/pallets/markupsafe/
+Project-URL: Chat, https://discord.gg/pallets
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Classifier: Topic :: Text Processing :: Markup :: HTML
+Classifier: Typing :: Typed
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Dynamic: license-file
+
+<div align="center"><img src="https://raw.githubusercontent.com/pallets/markupsafe/refs/heads/stable/docs/_static/markupsafe-name.svg" alt="" height="150"></div>
+
+# MarkupSafe
+
+MarkupSafe implements a text object that escapes characters so it is
+safe to use in HTML and XML. Characters that have special meanings are
+replaced so that they display as the actual characters. This mitigates
+injection attacks, meaning untrusted user input can safely be displayed
+on a page.
+
+
+## Examples
+
+```pycon
+>>> from markupsafe import Markup, escape
+
+>>> # escape replaces special characters and wraps in Markup
+>>> escape("<script>alert(document.cookie);</script>")
+Markup('&lt;script&gt;alert(document.cookie);&lt;/script&gt;')
+
+>>> # wrap in Markup to mark text "safe" and prevent escaping
+>>> Markup("<strong>Hello</strong>")
+Markup('<strong>hello</strong>')
+
+>>> escape(Markup("<strong>Hello</strong>"))
+Markup('<strong>hello</strong>')
+
+>>> # Markup is a str subclass
+>>> # methods and operators escape their arguments
+>>> template = Markup("Hello <em>{name}</em>")
+>>> template.format(name='"World"')
+Markup('Hello <em>&#34;World&#34;</em>')
+```
+
+## Donate
+
+The Pallets organization develops and supports MarkupSafe and other
+popular packages. In order to grow the community of contributors and
+users, and allow the maintainers to devote more time to the projects,
+[please donate today][].
+
+[please donate today]: https://palletsprojects.com/donate
+
+## Contributing
+
+See our [detailed contributing documentation][contrib] for many ways to
+contribute, including reporting issues, requesting features, asking or answering
+questions, and making PRs.
+
+[contrib]: https://palletsprojects.com/contributing/
diff --git a/libs/markupsafe-3.0.3.dist-info/RECORD b/libs/markupsafe-3.0.3.dist-info/RECORD
new file mode 100644
index 0000000000..2291a87dcf
--- /dev/null
+++ b/libs/markupsafe-3.0.3.dist-info/RECORD
@@ -0,0 +1,13 @@
+markupsafe-3.0.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+markupsafe-3.0.3.dist-info/METADATA,sha256=ErTMYaf6KIz3Zn7j8hN4bZYZ21f7M_9vk0r7y1wS7IE,2690
+markupsafe-3.0.3.dist-info/RECORD,,
+markupsafe-3.0.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+markupsafe-3.0.3.dist-info/WHEEL,sha256=DkV-ntIm-3VWD87iCIyvXSz28ISStjMGlDRnHg-QlnQ,110
+markupsafe-3.0.3.dist-info/licenses/LICENSE.txt,sha256=SJqOEQhQntmKN7uYPhHg9-HTHwvY-Zp5yESOf_N9B-o,1475
+markupsafe-3.0.3.dist-info/top_level.txt,sha256=qy0Plje5IJuvsCBjejJyhDCjEAdcDLK_2agVcex8Z6U,11
+markupsafe/__init__.py,sha256=u1fLcNCx0P8E7LT6z3OXf6ipnSmgm6aefne5y-d7o40,13248
+markupsafe/_native.py,sha256=hSLs8Jmz5aqayuengJJ3kdT5PwNpBWpKrmQSdipndC8,210
+markupsafe/_speedups.c,sha256=t3tC6oVV7-bmKUqvCO5pVSky-G8ACIXpWMaJwkNtJjg,4327
+markupsafe/_speedups.cpython-310-darwin.so,sha256=6bd-s_bI-KmdKIUFIb_A7BlqP4RIO6YjNYArSTuty58,50896
+markupsafe/_speedups.pyi,sha256=ENd1bYe7gbBUf2ywyYWOGUpnXOHNJ-cgTNqetlW8h5k,41
+markupsafe/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/jinja2-3.1.5.dist-info/REQUESTED b/libs/markupsafe-3.0.3.dist-info/REQUESTED
similarity index 100%
rename from libs/jinja2-3.1.5.dist-info/REQUESTED
rename to libs/markupsafe-3.0.3.dist-info/REQUESTED
diff --git a/libs/markupsafe-3.0.3.dist-info/WHEEL b/libs/markupsafe-3.0.3.dist-info/WHEEL
new file mode 100644
index 0000000000..10166b37bf
--- /dev/null
+++ b/libs/markupsafe-3.0.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: false
+Tag: cp310-cp310-macosx_14_0_arm64
+
diff --git a/libs/flask_sqlalchemy-3.1.1.dist-info/LICENSE.rst b/libs/markupsafe-3.0.3.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/flask_sqlalchemy-3.1.1.dist-info/LICENSE.rst
rename to libs/markupsafe-3.0.3.dist-info/licenses/LICENSE.txt
diff --git a/libs/MarkupSafe-2.1.5.dist-info/top_level.txt b/libs/markupsafe-3.0.3.dist-info/top_level.txt
similarity index 100%
rename from libs/MarkupSafe-2.1.5.dist-info/top_level.txt
rename to libs/markupsafe-3.0.3.dist-info/top_level.txt
diff --git a/libs/markupsafe/__init__.py b/libs/markupsafe/__init__.py
index b40f24c66d..4c395d7ba6 100644
--- a/libs/markupsafe/__init__.py
+++ b/libs/markupsafe/__init__.py
@@ -1,29 +1,84 @@
-import functools
+from __future__ import annotations
+
+import collections.abc as cabc
 import string
-import sys
 import typing as t
 
+try:
+    from ._speedups import _escape_inner
+except ImportError:
+    from ._native import _escape_inner
+
 if t.TYPE_CHECKING:
     import typing_extensions as te
 
-    class HasHTML(te.Protocol):
-        def __html__(self) -> str:
-            pass
 
-    _P = te.ParamSpec("_P")
+class _HasHTML(t.Protocol):
+    def __html__(self, /) -> str: ...
+
+
+class _TPEscape(t.Protocol):
+    def __call__(self, s: t.Any, /) -> Markup: ...
+
+
+def escape(s: t.Any, /) -> Markup:
+    """Replace the characters ``&``, ``<``, ``>``, ``'``, and ``"`` in
+    the string with HTML-safe sequences. Use this if you need to display
+    text that might contain such characters in HTML.
+
+    If the object has an ``__html__`` method, it is called and the
+    return value is assumed to already be safe for HTML.
+
+    :param s: An object to be converted to a string and escaped.
+    :return: A :class:`Markup` string with the escaped text.
+    """
+    # If the object is already a plain string, skip __html__ check and string
+    # conversion. This is the most common use case.
+    # Use type(s) instead of s.__class__ because a proxy object may be reporting
+    # the __class__ of the proxied value.
+    if type(s) is str:
+        return Markup(_escape_inner(s))
+
+    if hasattr(s, "__html__"):
+        return Markup(s.__html__())
+
+    return Markup(_escape_inner(str(s)))
+
+
+def escape_silent(s: t.Any | None, /) -> Markup:
+    """Like :func:`escape` but treats ``None`` as the empty string.
+    Useful with optional values, as otherwise you get the string
+    ``'None'`` when the value is ``None``.
+
+    >>> escape(None)
+    Markup('None')
+    >>> escape_silent(None)
+    Markup('')
+    """
+    if s is None:
+        return Markup()
 
+    return escape(s)
 
-__version__ = "2.1.5"
 
+def soft_str(s: t.Any, /) -> str:
+    """Convert an object to a string if it isn't already. This preserves
+    a :class:`Markup` string rather than converting it back to a basic
+    string, so it will still be marked as safe and won't be escaped
+    again.
 
-def _simple_escaping_wrapper(func: "t.Callable[_P, str]") -> "t.Callable[_P, Markup]":
-    @functools.wraps(func)
-    def wrapped(self: "Markup", *args: "_P.args", **kwargs: "_P.kwargs") -> "Markup":
-        arg_list = _escape_argspec(list(args), enumerate(args), self.escape)
-        _escape_argspec(kwargs, kwargs.items(), self.escape)
-        return self.__class__(func(self, *arg_list, **kwargs))  # type: ignore[arg-type]
+    >>> value = escape("<User 1>")
+    >>> value
+    Markup('&lt;User 1&gt;')
+    >>> escape(str(value))
+    Markup('&amp;lt;User 1&amp;gt;')
+    >>> escape(soft_str(value))
+    Markup('&lt;User 1&gt;')
+    """
+    if not isinstance(s, str):
+        return str(s)
 
-    return wrapped  # type: ignore[return-value]
+    return s
 
 
 class Markup(str):
@@ -65,82 +120,72 @@ class Markup(str):
     __slots__ = ()
 
     def __new__(
-        cls, base: t.Any = "", encoding: t.Optional[str] = None, errors: str = "strict"
-    ) -> "te.Self":
-        if hasattr(base, "__html__"):
-            base = base.__html__()
+        cls, object: t.Any = "", encoding: str | None = None, errors: str = "strict"
+    ) -> te.Self:
+        if hasattr(object, "__html__"):
+            object = object.__html__()
 
         if encoding is None:
-            return super().__new__(cls, base)
+            return super().__new__(cls, object)
 
-        return super().__new__(cls, base, encoding, errors)
+        return super().__new__(cls, object, encoding, errors)
 
-    def __html__(self) -> "te.Self":
+    def __html__(self, /) -> te.Self:
         return self
 
-    def __add__(self, other: t.Union[str, "HasHTML"]) -> "te.Self":
-        if isinstance(other, str) or hasattr(other, "__html__"):
-            return self.__class__(super().__add__(self.escape(other)))
+    def __add__(self, value: str | _HasHTML, /) -> te.Self:
+        if isinstance(value, str) or hasattr(value, "__html__"):
+            return self.__class__(super().__add__(self.escape(value)))
 
         return NotImplemented
 
-    def __radd__(self, other: t.Union[str, "HasHTML"]) -> "te.Self":
-        if isinstance(other, str) or hasattr(other, "__html__"):
-            return self.escape(other).__add__(self)
+    def __radd__(self, value: str | _HasHTML, /) -> te.Self:
+        if isinstance(value, str) or hasattr(value, "__html__"):
+            return self.escape(value).__add__(self)
 
         return NotImplemented
 
-    def __mul__(self, num: "te.SupportsIndex") -> "te.Self":
-        if isinstance(num, int):
-            return self.__class__(super().__mul__(num))
+    def __mul__(self, value: t.SupportsIndex, /) -> te.Self:
+        return self.__class__(super().__mul__(value))
 
-        return NotImplemented
-
-    __rmul__ = __mul__
+    def __rmul__(self, value: t.SupportsIndex, /) -> te.Self:
+        return self.__class__(super().__mul__(value))
 
-    def __mod__(self, arg: t.Any) -> "te.Self":
-        if isinstance(arg, tuple):
+    def __mod__(self, value: t.Any, /) -> te.Self:
+        if isinstance(value, tuple):
             # a tuple of arguments, each wrapped
-            arg = tuple(_MarkupEscapeHelper(x, self.escape) for x in arg)
-        elif hasattr(type(arg), "__getitem__") and not isinstance(arg, str):
+            value = tuple(_MarkupEscapeHelper(x, self.escape) for x in value)
+        elif hasattr(type(value), "__getitem__") and not isinstance(value, str):
             # a mapping of arguments, wrapped
-            arg = _MarkupEscapeHelper(arg, self.escape)
+            value = _MarkupEscapeHelper(value, self.escape)
         else:
             # a single argument, wrapped with the helper and a tuple
-            arg = (_MarkupEscapeHelper(arg, self.escape),)
+            value = (_MarkupEscapeHelper(value, self.escape),)
 
-        return self.__class__(super().__mod__(arg))
+        return self.__class__(super().__mod__(value))
 
-    def __repr__(self) -> str:
+    def __repr__(self, /) -> str:
         return f"{self.__class__.__name__}({super().__repr__()})"
 
-    def join(self, seq: t.Iterable[t.Union[str, "HasHTML"]]) -> "te.Self":
-        return self.__class__(super().join(map(self.escape, seq)))
-
-    join.__doc__ = str.join.__doc__
+    def join(self, iterable: cabc.Iterable[str | _HasHTML], /) -> te.Self:
+        return self.__class__(super().join(map(self.escape, iterable)))
 
     def split(  # type: ignore[override]
-        self, sep: t.Optional[str] = None, maxsplit: int = -1
-    ) -> t.List["te.Self"]:
+        self, /, sep: str | None = None, maxsplit: t.SupportsIndex = -1
+    ) -> list[te.Self]:
         return [self.__class__(v) for v in super().split(sep, maxsplit)]
 
-    split.__doc__ = str.split.__doc__
-
     def rsplit(  # type: ignore[override]
-        self, sep: t.Optional[str] = None, maxsplit: int = -1
-    ) -> t.List["te.Self"]:
+        self, /, sep: str | None = None, maxsplit: t.SupportsIndex = -1
+    ) -> list[te.Self]:
         return [self.__class__(v) for v in super().rsplit(sep, maxsplit)]
 
-    rsplit.__doc__ = str.rsplit.__doc__
-
     def splitlines(  # type: ignore[override]
-        self, keepends: bool = False
-    ) -> t.List["te.Self"]:
+        self, /, keepends: bool = False
+    ) -> list[te.Self]:
         return [self.__class__(v) for v in super().splitlines(keepends)]
 
-    splitlines.__doc__ = str.splitlines.__doc__
-
-    def unescape(self) -> str:
+    def unescape(self, /) -> str:
         """Convert escaped markup back into a text string. This replaces
         HTML entities with the characters they represent.
 
@@ -151,7 +196,7 @@ def unescape(self) -> str:
 
         return unescape(str(self))
 
-    def striptags(self) -> str:
+    def striptags(self, /) -> str:
         """:meth:`unescape` the markup, remove tags, and normalize
         whitespace to single spaces.
 
@@ -163,41 +208,27 @@ def striptags(self) -> str:
         # Look for comments then tags separately. Otherwise, a comment that
         # contains a tag would end early, leaving some of the comment behind.
 
-        while True:
-            # keep finding comment start marks
-            start = value.find("<!--")
-
-            if start == -1:
-                break
-
+        # keep finding comment start marks
+        while (start := value.find("<!--")) != -1:
             # find a comment end mark beyond the start, otherwise stop
-            end = value.find("-->", start)
-
-            if end == -1:
+            if (end := value.find("-->", start)) == -1:
                 break
 
-            value = f"{value[:start]}{value[end + 3:]}"
+            value = f"{value[:start]}{value[end + 3 :]}"
 
         # remove tags using the same method
-        while True:
-            start = value.find("<")
-
-            if start == -1:
+        while (start := value.find("<")) != -1:
+            if (end := value.find(">", start)) == -1:
                 break
 
-            end = value.find(">", start)
-
-            if end == -1:
-                break
-
-            value = f"{value[:start]}{value[end + 1:]}"
+            value = f"{value[:start]}{value[end + 1 :]}"
 
         # collapse spaces
         value = " ".join(value.split())
         return self.__class__(value).unescape()
 
     @classmethod
-    def escape(cls, s: t.Any) -> "te.Self":
+    def escape(cls, s: t.Any, /) -> te.Self:
         """Escape a string. Calls :func:`escape` and ensures that for
         subclasses the correct type is returned.
         """
@@ -208,49 +239,90 @@ def escape(cls, s: t.Any) -> "te.Self":
 
         return rv  # type: ignore[return-value]
 
-    __getitem__ = _simple_escaping_wrapper(str.__getitem__)
-    capitalize = _simple_escaping_wrapper(str.capitalize)
-    title = _simple_escaping_wrapper(str.title)
-    lower = _simple_escaping_wrapper(str.lower)
-    upper = _simple_escaping_wrapper(str.upper)
-    replace = _simple_escaping_wrapper(str.replace)
-    ljust = _simple_escaping_wrapper(str.ljust)
-    rjust = _simple_escaping_wrapper(str.rjust)
-    lstrip = _simple_escaping_wrapper(str.lstrip)
-    rstrip = _simple_escaping_wrapper(str.rstrip)
-    center = _simple_escaping_wrapper(str.center)
-    strip = _simple_escaping_wrapper(str.strip)
-    translate = _simple_escaping_wrapper(str.translate)
-    expandtabs = _simple_escaping_wrapper(str.expandtabs)
-    swapcase = _simple_escaping_wrapper(str.swapcase)
-    zfill = _simple_escaping_wrapper(str.zfill)
-    casefold = _simple_escaping_wrapper(str.casefold)
-
-    if sys.version_info >= (3, 9):
-        removeprefix = _simple_escaping_wrapper(str.removeprefix)
-        removesuffix = _simple_escaping_wrapper(str.removesuffix)
-
-    def partition(self, sep: str) -> t.Tuple["te.Self", "te.Self", "te.Self"]:
-        l, s, r = super().partition(self.escape(sep))
+    def __getitem__(self, key: t.SupportsIndex | slice, /) -> te.Self:
+        return self.__class__(super().__getitem__(key))
+
+    def capitalize(self, /) -> te.Self:
+        return self.__class__(super().capitalize())
+
+    def title(self, /) -> te.Self:
+        return self.__class__(super().title())
+
+    def lower(self, /) -> te.Self:
+        return self.__class__(super().lower())
+
+    def upper(self, /) -> te.Self:
+        return self.__class__(super().upper())
+
+    def replace(self, old: str, new: str, count: t.SupportsIndex = -1, /) -> te.Self:
+        return self.__class__(super().replace(old, self.escape(new), count))
+
+    def ljust(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self:
+        return self.__class__(super().ljust(width, self.escape(fillchar)))
+
+    def rjust(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self:
+        return self.__class__(super().rjust(width, self.escape(fillchar)))
+
+    def lstrip(self, chars: str | None = None, /) -> te.Self:
+        return self.__class__(super().lstrip(chars))
+
+    def rstrip(self, chars: str | None = None, /) -> te.Self:
+        return self.__class__(super().rstrip(chars))
+
+    def center(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self:
+        return self.__class__(super().center(width, self.escape(fillchar)))
+
+    def strip(self, chars: str | None = None, /) -> te.Self:
+        return self.__class__(super().strip(chars))
+
+    def translate(
+        self,
+        table: cabc.Mapping[int, str | int | None],  # type: ignore[override]
+        /,
+    ) -> str:
+        return self.__class__(super().translate(table))
+
+    def expandtabs(self, /, tabsize: t.SupportsIndex = 8) -> te.Self:
+        return self.__class__(super().expandtabs(tabsize))
+
+    def swapcase(self, /) -> te.Self:
+        return self.__class__(super().swapcase())
+
+    def zfill(self, width: t.SupportsIndex, /) -> te.Self:
+        return self.__class__(super().zfill(width))
+
+    def casefold(self, /) -> te.Self:
+        return self.__class__(super().casefold())
+
+    def removeprefix(self, prefix: str, /) -> te.Self:
+        return self.__class__(super().removeprefix(prefix))
+
+    def removesuffix(self, suffix: str) -> te.Self:
+        return self.__class__(super().removesuffix(suffix))
+
+    def partition(self, sep: str, /) -> tuple[te.Self, te.Self, te.Self]:
+        left, sep, right = super().partition(sep)
         cls = self.__class__
-        return cls(l), cls(s), cls(r)
+        return cls(left), cls(sep), cls(right)
 
-    def rpartition(self, sep: str) -> t.Tuple["te.Self", "te.Self", "te.Self"]:
-        l, s, r = super().rpartition(self.escape(sep))
+    def rpartition(self, sep: str, /) -> tuple[te.Self, te.Self, te.Self]:
+        left, sep, right = super().rpartition(sep)
         cls = self.__class__
-        return cls(l), cls(s), cls(r)
+        return cls(left), cls(sep), cls(right)
 
-    def format(self, *args: t.Any, **kwargs: t.Any) -> "te.Self":
+    def format(self, *args: t.Any, **kwargs: t.Any) -> te.Self:
         formatter = EscapeFormatter(self.escape)
         return self.__class__(formatter.vformat(self, args, kwargs))
 
-    def format_map(  # type: ignore[override]
-        self, map: t.Mapping[str, t.Any]
-    ) -> "te.Self":
+    def format_map(
+        self,
+        mapping: cabc.Mapping[str, t.Any],  # type: ignore[override]
+        /,
+    ) -> te.Self:
         formatter = EscapeFormatter(self.escape)
-        return self.__class__(formatter.vformat(self, (), map))
+        return self.__class__(formatter.vformat(self, (), mapping))
 
-    def __html_format__(self, format_spec: str) -> "te.Self":
+    def __html_format__(self, format_spec: str, /) -> te.Self:
         if format_spec:
             raise ValueError("Unsupported format specification for Markup.")
 
@@ -260,8 +332,8 @@ def __html_format__(self, format_spec: str) -> "te.Self":
 class EscapeFormatter(string.Formatter):
     __slots__ = ("escape",)
 
-    def __init__(self, escape: t.Callable[[t.Any], Markup]) -> None:
-        self.escape = escape
+    def __init__(self, escape: _TPEscape) -> None:
+        self.escape: _TPEscape = escape
         super().__init__()
 
     def format_field(self, value: t.Any, format_spec: str) -> str:
@@ -278,55 +350,47 @@ def format_field(self, value: t.Any, format_spec: str) -> str:
         else:
             # We need to make sure the format spec is str here as
             # otherwise the wrong callback methods are invoked.
-            rv = string.Formatter.format_field(self, value, str(format_spec))
+            rv = super().format_field(value, str(format_spec))
         return str(self.escape(rv))
 
 
-_ListOrDict = t.TypeVar("_ListOrDict", list, dict)
-
-
-def _escape_argspec(
-    obj: _ListOrDict, iterable: t.Iterable[t.Any], escape: t.Callable[[t.Any], Markup]
-) -> _ListOrDict:
-    """Helper for various string-wrapped functions."""
-    for key, value in iterable:
-        if isinstance(value, str) or hasattr(value, "__html__"):
-            obj[key] = escape(value)
-
-    return obj
-
-
 class _MarkupEscapeHelper:
     """Helper for :meth:`Markup.__mod__`."""
 
     __slots__ = ("obj", "escape")
 
-    def __init__(self, obj: t.Any, escape: t.Callable[[t.Any], Markup]) -> None:
-        self.obj = obj
-        self.escape = escape
+    def __init__(self, obj: t.Any, escape: _TPEscape) -> None:
+        self.obj: t.Any = obj
+        self.escape: _TPEscape = escape
 
-    def __getitem__(self, item: t.Any) -> "te.Self":
-        return self.__class__(self.obj[item], self.escape)
+    def __getitem__(self, key: t.Any, /) -> te.Self:
+        return self.__class__(self.obj[key], self.escape)
 
-    def __str__(self) -> str:
+    def __str__(self, /) -> str:
         return str(self.escape(self.obj))
 
-    def __repr__(self) -> str:
+    def __repr__(self, /) -> str:
         return str(self.escape(repr(self.obj)))
 
-    def __int__(self) -> int:
+    def __int__(self, /) -> int:
         return int(self.obj)
 
-    def __float__(self) -> float:
+    def __float__(self, /) -> float:
         return float(self.obj)
 
 
-# circular import
-try:
-    from ._speedups import escape as escape
-    from ._speedups import escape_silent as escape_silent
-    from ._speedups import soft_str as soft_str
-except ImportError:
-    from ._native import escape as escape
-    from ._native import escape_silent as escape_silent  # noqa: F401
-    from ._native import soft_str as soft_str  # noqa: F401
+def __getattr__(name: str) -> t.Any:
+    if name == "__version__":
+        import importlib.metadata
+        import warnings
+
+        warnings.warn(
+            "The '__version__' attribute is deprecated and will be removed in"
+            " MarkupSafe 3.1. Use feature detection, or"
+            ' `importlib.metadata.version("markupsafe")`, instead.',
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return importlib.metadata.version("markupsafe")
+
+    raise AttributeError(name)
diff --git a/libs/markupsafe/_native.py b/libs/markupsafe/_native.py
index 8117b2716d..088b3bca98 100644
--- a/libs/markupsafe/_native.py
+++ b/libs/markupsafe/_native.py
@@ -1,63 +1,8 @@
-import typing as t
-
-from . import Markup
-
-
-def escape(s: t.Any) -> Markup:
-    """Replace the characters ``&``, ``<``, ``>``, ``'``, and ``"`` in
-    the string with HTML-safe sequences. Use this if you need to display
-    text that might contain such characters in HTML.
-
-    If the object has an ``__html__`` method, it is called and the
-    return value is assumed to already be safe for HTML.
-
-    :param s: An object to be converted to a string and escaped.
-    :return: A :class:`Markup` string with the escaped text.
-    """
-    if hasattr(s, "__html__"):
-        return Markup(s.__html__())
-
-    return Markup(
-        str(s)
-        .replace("&", "&amp;")
+def _escape_inner(s: str, /) -> str:
+    return (
+        s.replace("&", "&amp;")
         .replace(">", "&gt;")
         .replace("<", "&lt;")
         .replace("'", "&#39;")
         .replace('"', "&#34;")
     )
-
-
-def escape_silent(s: t.Optional[t.Any]) -> Markup:
-    """Like :func:`escape` but treats ``None`` as the empty string.
-    Useful with optional values, as otherwise you get the string
-    ``'None'`` when the value is ``None``.
-
-    >>> escape(None)
-    Markup('None')
-    >>> escape_silent(None)
-    Markup('')
-    """
-    if s is None:
-        return Markup()
-
-    return escape(s)
-
-
-def soft_str(s: t.Any) -> str:
-    """Convert an object to a string if it isn't already. This preserves
-    a :class:`Markup` string rather than converting it back to a basic
-    string, so it will still be marked as safe and won't be escaped
-    again.
-
-    >>> value = escape("<User 1>")
-    >>> value
-    Markup('&lt;User 1&gt;')
-    >>> escape(str(value))
-    Markup('&amp;lt;User 1&amp;gt;')
-    >>> escape(soft_str(value))
-    Markup('&lt;User 1&gt;')
-    """
-    if not isinstance(s, str):
-        return str(s)
-
-    return s
diff --git a/libs/markupsafe/_speedups.c b/libs/markupsafe/_speedups.c
index 3c463fb82d..8a315f23c5 100644
--- a/libs/markupsafe/_speedups.c
+++ b/libs/markupsafe/_speedups.c
@@ -1,22 +1,5 @@
 #include <Python.h>
 
-static PyObject* markup;
-
-static int
-init_constants(void)
-{
-	PyObject *module;
-
-	/* import markup type so that we can mark the return value */
-	module = PyImport_ImportModule("markupsafe");
-	if (!module)
-		return 0;
-	markup = PyObject_GetAttrString(module, "Markup");
-	Py_DECREF(module);
-
-	return 1;
-}
-
 #define GET_DELTA(inp, inp_end, delta) \
 	while (inp < inp_end) { \
 		switch (*inp++) { \
@@ -166,155 +149,52 @@ escape_unicode_kind4(PyUnicodeObject *in)
 }
 
 static PyObject*
-escape_unicode(PyUnicodeObject *in)
+escape_unicode(PyObject *self, PyObject *s)
 {
-	if (PyUnicode_READY(in))
+	if (!PyUnicode_Check(s))
 		return NULL;
 
-	switch (PyUnicode_KIND(in)) {
+    // This check is no longer needed in Python 3.12.
+	if (PyUnicode_READY(s))
+		return NULL;
+
+	switch (PyUnicode_KIND(s)) {
 	case PyUnicode_1BYTE_KIND:
-		return escape_unicode_kind1(in);
+		return escape_unicode_kind1((PyUnicodeObject*) s);
 	case PyUnicode_2BYTE_KIND:
-		return escape_unicode_kind2(in);
+		return escape_unicode_kind2((PyUnicodeObject*) s);
 	case PyUnicode_4BYTE_KIND:
-		return escape_unicode_kind4(in);
+		return escape_unicode_kind4((PyUnicodeObject*) s);
 	}
 	assert(0);  /* shouldn't happen */
 	return NULL;
 }
 
-static PyObject*
-escape(PyObject *self, PyObject *text)
-{
-	static PyObject *id_html;
-	PyObject *s = NULL, *rv = NULL, *html;
-
-	if (id_html == NULL) {
-		id_html = PyUnicode_InternFromString("__html__");
-		if (id_html == NULL) {
-			return NULL;
-		}
-	}
-
-	/* we don't have to escape integers, bools or floats */
-	if (PyLong_CheckExact(text) ||
-		PyFloat_CheckExact(text) || PyBool_Check(text) ||
-		text == Py_None)
-		return PyObject_CallFunctionObjArgs(markup, text, NULL);
-
-	/* if the object has an __html__ method that performs the escaping */
-	html = PyObject_GetAttr(text ,id_html);
-	if (html) {
-		s = PyObject_CallObject(html, NULL);
-		Py_DECREF(html);
-		if (s == NULL) {
-			return NULL;
-		}
-		/* Convert to Markup object */
-		rv = PyObject_CallFunctionObjArgs(markup, (PyObject*)s, NULL);
-		Py_DECREF(s);
-		return rv;
-	}
-
-	/* otherwise make the object unicode if it isn't, then escape */
-	PyErr_Clear();
-	if (!PyUnicode_Check(text)) {
-		PyObject *unicode = PyObject_Str(text);
-		if (!unicode)
-			return NULL;
-		s = escape_unicode((PyUnicodeObject*)unicode);
-		Py_DECREF(unicode);
-	}
-	else
-		s = escape_unicode((PyUnicodeObject*)text);
-
-	/* convert the unicode string into a markup object. */
-	rv = PyObject_CallFunctionObjArgs(markup, (PyObject*)s, NULL);
-	Py_DECREF(s);
-	return rv;
-}
-
-
-static PyObject*
-escape_silent(PyObject *self, PyObject *text)
-{
-	if (text != Py_None)
-		return escape(self, text);
-	return PyObject_CallFunctionObjArgs(markup, NULL);
-}
-
-
-static PyObject*
-soft_str(PyObject *self, PyObject *s)
-{
-	if (!PyUnicode_Check(s))
-		return PyObject_Str(s);
-	Py_INCREF(s);
-	return s;
-}
-
-
 static PyMethodDef module_methods[] = {
-	{
-		"escape",
-		(PyCFunction)escape,
-		METH_O,
-		"Replace the characters ``&``, ``<``, ``>``, ``'``, and ``\"`` in"
-		" the string with HTML-safe sequences. Use this if you need to display"
-		" text that might contain such characters in HTML.\n\n"
-		"If the object has an ``__html__`` method, it is called and the"
-		" return value is assumed to already be safe for HTML.\n\n"
-		":param s: An object to be converted to a string and escaped.\n"
-		":return: A :class:`Markup` string with the escaped text.\n"
-	},
-	{
-		"escape_silent",
-		(PyCFunction)escape_silent,
-		METH_O,
-		"Like :func:`escape` but treats ``None`` as the empty string."
-		" Useful with optional values, as otherwise you get the string"
-		" ``'None'`` when the value is ``None``.\n\n"
-		">>> escape(None)\n"
-		"Markup('None')\n"
-		">>> escape_silent(None)\n"
-		"Markup('')\n"
-	},
-	{
-		"soft_str",
-		(PyCFunction)soft_str,
-		METH_O,
-		"Convert an object to a string if it isn't already. This preserves"
-		" a :class:`Markup` string rather than converting it back to a basic"
-		" string, so it will still be marked as safe and won't be escaped"
-		" again.\n\n"
-		">>> value = escape(\"<User 1>\")\n"
-		">>> value\n"
-		"Markup('&lt;User 1&gt;')\n"
-		">>> escape(str(value))\n"
-		"Markup('&amp;lt;User 1&amp;gt;')\n"
-		">>> escape(soft_str(value))\n"
-		"Markup('&lt;User 1&gt;')\n"
-	},
+	{"_escape_inner", (PyCFunction)escape_unicode, METH_O, NULL},
 	{NULL, NULL, 0, NULL}  /* Sentinel */
 };
 
+static PyModuleDef_Slot module_slots[] = {
+#ifdef Py_mod_multiple_interpreters  // Python 3.12+
+	{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
+#endif
+#ifdef Py_mod_gil  // Python 3.13+
+	{Py_mod_gil, Py_MOD_GIL_NOT_USED},
+#endif
+	{0, NULL}  /* Sentinel */
+};
+
 static struct PyModuleDef module_definition = {
-	PyModuleDef_HEAD_INIT,
-	"markupsafe._speedups",
-	NULL,
-	-1,
-	module_methods,
-	NULL,
-	NULL,
-	NULL,
-	NULL
+	.m_base = PyModuleDef_HEAD_INIT,
+	.m_name = "markupsafe._speedups",
+	.m_size = 0,
+	.m_methods = module_methods,
+	.m_slots = module_slots,
 };
 
 PyMODINIT_FUNC
 PyInit__speedups(void)
 {
-	if (!init_constants())
-		return NULL;
-
-	return PyModule_Create(&module_definition);
+	return PyModuleDef_Init(&module_definition);
 }
diff --git a/libs/markupsafe/_speedups.pyi b/libs/markupsafe/_speedups.pyi
index f673240f6d..8c8885852a 100644
--- a/libs/markupsafe/_speedups.pyi
+++ b/libs/markupsafe/_speedups.pyi
@@ -1,9 +1 @@
-from typing import Any
-from typing import Optional
-
-from . import Markup
-
-def escape(s: Any) -> Markup: ...
-def escape_silent(s: Optional[Any]) -> Markup: ...
-def soft_str(s: Any) -> str: ...
-def soft_unicode(s: Any) -> str: ...
+def _escape_inner(s: str, /) -> str: ...
diff --git a/libs/msgpack-1.1.0.dist-info/METADATA b/libs/msgpack-1.1.0.dist-info/METADATA
deleted file mode 100644
index 0adb412dba..0000000000
--- a/libs/msgpack-1.1.0.dist-info/METADATA
+++ /dev/null
@@ -1,271 +0,0 @@
-Metadata-Version: 2.1
-Name: msgpack
-Version: 1.1.0
-Summary: MessagePack serializer
-Author-email: Inada Naoki <songofacandy@gmail.com>
-License: Apache 2.0
-Project-URL: Homepage, https://msgpack.org/
-Project-URL: Documentation, https://msgpack-python.readthedocs.io/
-Project-URL: Repository, https://github.com/msgpack/msgpack-python/
-Project-URL: Tracker, https://github.com/msgpack/msgpack-python/issues
-Project-URL: Changelog, https://github.com/msgpack/msgpack-python/blob/main/ChangeLog.rst
-Keywords: msgpack,messagepack,serializer,serialization,binary
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: COPYING
-
-# MessagePack for Python
-
-[![Build Status](https://github.com/msgpack/msgpack-python/actions/workflows/wheel.yml/badge.svg)](https://github.com/msgpack/msgpack-python/actions/workflows/wheel.yml)
-[![Documentation Status](https://readthedocs.org/projects/msgpack-python/badge/?version=latest)](https://msgpack-python.readthedocs.io/en/latest/?badge=latest)
-
-## What's this
-
-[MessagePack](https://msgpack.org/) is an efficient binary serialization format.
-It lets you exchange data among multiple languages like JSON.
-But it's faster and smaller.
-This package provides CPython bindings for reading and writing MessagePack data.
-
-## Install
-
-```
-$ pip install msgpack
-```
-
-### Pure Python implementation
-
-The extension module in msgpack (`msgpack._cmsgpack`) does not support PyPy.
-
-But msgpack provides a pure Python implementation (`msgpack.fallback`) for PyPy.
-
-
-### Windows
-
-When you can't use a binary distribution, you need to install Visual Studio
-or Windows SDK on Windows.
-Without extension, using pure Python implementation on CPython runs slowly.
-
-
-## How to use
-
-### One-shot pack & unpack
-
-Use `packb` for packing and `unpackb` for unpacking.
-msgpack provides `dumps` and `loads` as an alias for compatibility with
-`json` and `pickle`.
-
-`pack` and `dump` packs to a file-like object.
-`unpack` and `load` unpacks from a file-like object.
-
-```pycon
->>> import msgpack
->>> msgpack.packb([1, 2, 3])
-'\x93\x01\x02\x03'
->>> msgpack.unpackb(_)
-[1, 2, 3]
-```
-
-Read the docstring for options.
-
-
-### Streaming unpacking
-
-`Unpacker` is a "streaming unpacker". It unpacks multiple objects from one
-stream (or from bytes provided through its `feed` method).
-
-```py
-import msgpack
-from io import BytesIO
-
-buf = BytesIO()
-for i in range(100):
-   buf.write(msgpack.packb(i))
-
-buf.seek(0)
-
-unpacker = msgpack.Unpacker(buf)
-for unpacked in unpacker:
-    print(unpacked)
-```
-
-
-### Packing/unpacking of custom data type
-
-It is also possible to pack/unpack custom data types. Here is an example for
-`datetime.datetime`.
-
-```py
-import datetime
-import msgpack
-
-useful_dict = {
-    "id": 1,
-    "created": datetime.datetime.now(),
-}
-
-def decode_datetime(obj):
-    if '__datetime__' in obj:
-        obj = datetime.datetime.strptime(obj["as_str"], "%Y%m%dT%H:%M:%S.%f")
-    return obj
-
-def encode_datetime(obj):
-    if isinstance(obj, datetime.datetime):
-        return {'__datetime__': True, 'as_str': obj.strftime("%Y%m%dT%H:%M:%S.%f")}
-    return obj
-
-
-packed_dict = msgpack.packb(useful_dict, default=encode_datetime)
-this_dict_again = msgpack.unpackb(packed_dict, object_hook=decode_datetime)
-```
-
-`Unpacker`'s `object_hook` callback receives a dict; the
-`object_pairs_hook` callback may instead be used to receive a list of
-key-value pairs.
-
-NOTE: msgpack can encode datetime with tzinfo into standard ext type for now.
-See `datetime` option in `Packer` docstring.
-
-
-### Extended types
-
-It is also possible to pack/unpack custom data types using the **ext** type.
-
-```pycon
->>> import msgpack
->>> import array
->>> def default(obj):
-...     if isinstance(obj, array.array) and obj.typecode == 'd':
-...         return msgpack.ExtType(42, obj.tostring())
-...     raise TypeError("Unknown type: %r" % (obj,))
-...
->>> def ext_hook(code, data):
-...     if code == 42:
-...         a = array.array('d')
-...         a.fromstring(data)
-...         return a
-...     return ExtType(code, data)
-...
->>> data = array.array('d', [1.2, 3.4])
->>> packed = msgpack.packb(data, default=default)
->>> unpacked = msgpack.unpackb(packed, ext_hook=ext_hook)
->>> data == unpacked
-True
-```
-
-
-### Advanced unpacking control
-
-As an alternative to iteration, `Unpacker` objects provide `unpack`,
-`skip`, `read_array_header` and `read_map_header` methods. The former two
-read an entire message from the stream, respectively de-serialising and returning
-the result, or ignoring it. The latter two methods return the number of elements
-in the upcoming container, so that each element in an array, or key-value pair
-in a map, can be unpacked or skipped individually.
-
-
-## Notes
-
-### string and binary type in old msgpack spec
-
-Early versions of msgpack didn't distinguish string and binary types.
-The type for representing both string and binary types was named **raw**.
-
-You can pack into and unpack from this old spec using `use_bin_type=False`
-and `raw=True` options.
-
-```pycon
->>> import msgpack
->>> msgpack.unpackb(msgpack.packb([b'spam', 'eggs'], use_bin_type=False), raw=True)
-[b'spam', b'eggs']
->>> msgpack.unpackb(msgpack.packb([b'spam', 'eggs'], use_bin_type=True), raw=False)
-[b'spam', 'eggs']
-```
-
-### ext type
-
-To use the **ext** type, pass `msgpack.ExtType` object to packer.
-
-```pycon
->>> import msgpack
->>> packed = msgpack.packb(msgpack.ExtType(42, b'xyzzy'))
->>> msgpack.unpackb(packed)
-ExtType(code=42, data='xyzzy')
-```
-
-You can use it with `default` and `ext_hook`. See below.
-
-
-### Security
-
-To unpacking data received from unreliable source, msgpack provides
-two security options.
-
-`max_buffer_size` (default: `100*1024*1024`) limits the internal buffer size.
-It is used to limit the preallocated list size too.
-
-`strict_map_key` (default: `True`) limits the type of map keys to bytes and str.
-While msgpack spec doesn't limit the types of the map keys,
-there is a risk of the hashdos.
-If you need to support other types for map keys, use `strict_map_key=False`.
-
-
-### Performance tips
-
-CPython's GC starts when growing allocated object.
-This means unpacking may cause useless GC.
-You can use `gc.disable()` when unpacking large message.
-
-List is the default sequence type of Python.
-But tuple is lighter than list.
-You can use `use_list=False` while unpacking when performance is important.
-
-
-## Major breaking changes in the history
-
-### msgpack 0.5
-
-Package name on PyPI was changed from `msgpack-python` to `msgpack` from 0.5.
-
-When upgrading from msgpack-0.4 or earlier, do `pip uninstall msgpack-python` before
-`pip install -U msgpack`.
-
-
-### msgpack 1.0
-
-* Python 2 support
-
-  * The extension module does not support Python 2 anymore.
-    The pure Python implementation (`msgpack.fallback`) is used for Python 2.
-  
-  * msgpack 1.0.6 drops official support of Python 2.7, as pip and
-    GitHub Action (setup-python) no longer support Python 2.7.
-
-* Packer
-
-  * Packer uses `use_bin_type=True` by default.
-    Bytes are encoded in bin type in msgpack.
-  * The `encoding` option is removed.  UTF-8 is used always.
-
-* Unpacker
-
-  * Unpacker uses `raw=False` by default.  It assumes str types are valid UTF-8 string
-    and decode them to Python str (unicode) object.
-  * `encoding` option is removed.  You can use `raw=True` to support old format (e.g. unpack into bytes, not str).
-  * Default value of `max_buffer_size` is changed from 0 to 100 MiB to avoid DoS attack.
-    You need to pass `max_buffer_size=0` if you have large but safe data.
-  * Default value of `strict_map_key` is changed to True to avoid hashdos.
-    You need to pass `strict_map_key=False` if you have data which contain map keys
-    which type is not bytes or str.
diff --git a/libs/msgpack-1.1.0.dist-info/RECORD b/libs/msgpack-1.1.0.dist-info/RECORD
deleted file mode 100644
index 3056956948..0000000000
--- a/libs/msgpack-1.1.0.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-msgpack-1.1.0.dist-info/COPYING,sha256=SS3tuoXaWHL3jmCRvNH-pHTWYNNay03ulkuKqz8AdCc,614
-msgpack-1.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-msgpack-1.1.0.dist-info/METADATA,sha256=UgNSGURjli2SCAvt62QCD4Ixhpp5KfFYK3IN_gG502Y,8361
-msgpack-1.1.0.dist-info/RECORD,,
-msgpack-1.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-msgpack-1.1.0.dist-info/WHEEL,sha256=8MbRJsGMYV6Ym1_SoG8YuJPvArpN2Z2wVWusEpp3feg,108
-msgpack-1.1.0.dist-info/top_level.txt,sha256=2tykSY1pXdiA2xYTDR6jPw0qI5ZGxRihyhf4S5hZyXk,8
-msgpack/__init__.py,sha256=reRaiOtEzSjPnr7TpxjgIvbfln5pV66FhricAs2eC-g,1109
-msgpack/_cmsgpack.cpython-38-darwin.so,sha256=w0_QrIPIxL9M2Y0i2fHnsp1XbZJWGqmznXJFdVrvaw8,181448
-msgpack/exceptions.py,sha256=dCTWei8dpkrMsQDcjQk74ATl9HsIBH0ybt8zOPNqMYc,1081
-msgpack/ext.py,sha256=kteJv03n9tYzd5oo3xYopVTo4vRaAxonBQQJhXohZZo,5726
-msgpack/fallback.py,sha256=0g1Pzp0vtmBEmJ5w9F3s_-JMVURP8RS4G1cc5TRaAsI,32390
diff --git a/libs/msgpack-1.1.0.dist-info/WHEEL b/libs/msgpack-1.1.0.dist-info/WHEEL
deleted file mode 100644
index be75fa70de..0000000000
--- a/libs/msgpack-1.1.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: false
-Tag: cp38-cp38-macosx_12_0_x86_64
-
diff --git a/libs/jinja2-3.1.5.dist-info/INSTALLER b/libs/msgpack-1.1.2.dist-info/INSTALLER
similarity index 100%
rename from libs/jinja2-3.1.5.dist-info/INSTALLER
rename to libs/msgpack-1.1.2.dist-info/INSTALLER
diff --git a/libs/msgpack-1.1.2.dist-info/METADATA b/libs/msgpack-1.1.2.dist-info/METADATA
new file mode 100644
index 0000000000..d23f73ba4b
--- /dev/null
+++ b/libs/msgpack-1.1.2.dist-info/METADATA
@@ -0,0 +1,265 @@
+Metadata-Version: 2.4
+Name: msgpack
+Version: 1.1.2
+Summary: MessagePack serializer
+Author-email: Inada Naoki <songofacandy@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://msgpack.org/
+Project-URL: Documentation, https://msgpack-python.readthedocs.io/
+Project-URL: Repository, https://github.com/msgpack/msgpack-python/
+Project-URL: Tracker, https://github.com/msgpack/msgpack-python/issues
+Project-URL: Changelog, https://github.com/msgpack/msgpack-python/blob/main/ChangeLog.rst
+Keywords: msgpack,messagepack,serializer,serialization,binary
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: File Formats
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: COPYING
+Dynamic: license-file
+
+# MessagePack for Python
+
+[![Build Status](https://github.com/msgpack/msgpack-python/actions/workflows/wheel.yml/badge.svg)](https://github.com/msgpack/msgpack-python/actions/workflows/wheel.yml)
+[![Documentation Status](https://readthedocs.org/projects/msgpack-python/badge/?version=latest)](https://msgpack-python.readthedocs.io/en/latest/?badge=latest)
+
+## What is this?
+
+[MessagePack](https://msgpack.org/) is an efficient binary serialization format.
+It lets you exchange data among multiple languages like JSON.
+But it's faster and smaller.
+This package provides CPython bindings for reading and writing MessagePack data.
+
+## Install
+
+```
+$ pip install msgpack
+```
+
+### Pure Python implementation
+
+The extension module in msgpack (`msgpack._cmsgpack`) does not support PyPy.
+
+But msgpack provides a pure Python implementation (`msgpack.fallback`) for PyPy.
+
+
+### Windows
+
+If you can't use a binary distribution, you need to install Visual Studio
+or the Windows SDK on Windows.
+Without the extension, the pure Python implementation on CPython runs slowly.
+
+
+## How to use
+
+### One-shot pack & unpack
+
+Use `packb` for packing and `unpackb` for unpacking.
+msgpack provides `dumps` and `loads` as aliases for compatibility with
+`json` and `pickle`.
+
+`pack` and `dump` pack to a file-like object.
+`unpack` and `load` unpack from a file-like object.
+
+```pycon
+>>> import msgpack
+>>> msgpack.packb([1, 2, 3])
+'\x93\x01\x02\x03'
+>>> msgpack.unpackb(_)
+[1, 2, 3]
+```
+
+Read the docstring for options.
+
+
+### Streaming unpacking
+
+`Unpacker` is a "streaming unpacker". It unpacks multiple objects from one
+stream (or from bytes provided through its `feed` method).
+
+```py
+import msgpack
+from io import BytesIO
+
+buf = BytesIO()
+for i in range(100):
+   buf.write(msgpack.packb(i))
+
+buf.seek(0)
+
+unpacker = msgpack.Unpacker(buf)
+for unpacked in unpacker:
+    print(unpacked)
+```
+
+
+### Packing/unpacking of custom data types
+
+It is also possible to pack/unpack custom data types. Here is an example for
+`datetime.datetime`.
+
+```py
+import datetime
+import msgpack
+
+useful_dict = {
+    "id": 1,
+    "created": datetime.datetime.now(),
+}
+
+def decode_datetime(obj):
+    if '__datetime__' in obj:
+        obj = datetime.datetime.strptime(obj["as_str"], "%Y%m%dT%H:%M:%S.%f")
+    return obj
+
+def encode_datetime(obj):
+    if isinstance(obj, datetime.datetime):
+        return {'__datetime__': True, 'as_str': obj.strftime("%Y%m%dT%H:%M:%S.%f")}
+    return obj
+
+
+packed_dict = msgpack.packb(useful_dict, default=encode_datetime)
+this_dict_again = msgpack.unpackb(packed_dict, object_hook=decode_datetime)
+```
+
+`Unpacker`'s `object_hook` callback receives a dict; the
+`object_pairs_hook` callback may instead be used to receive a list of
+key-value pairs.
+
+NOTE: msgpack can encode datetime with tzinfo into standard ext type for now.
+See `datetime` option in `Packer` docstring.
+
+
+### Extended types
+
+It is also possible to pack/unpack custom data types using the **ext** type.
+
+```pycon
+>>> import msgpack
+>>> import array
+>>> def default(obj):
+...     if isinstance(obj, array.array) and obj.typecode == 'd':
+...         return msgpack.ExtType(42, obj.tostring())
+...     raise TypeError("Unknown type: %r" % (obj,))
+...
+>>> def ext_hook(code, data):
+...     if code == 42:
+...         a = array.array('d')
+...         a.fromstring(data)
+...         return a
+...     return ExtType(code, data)
+...
+>>> data = array.array('d', [1.2, 3.4])
+>>> packed = msgpack.packb(data, default=default)
+>>> unpacked = msgpack.unpackb(packed, ext_hook=ext_hook)
+>>> data == unpacked
+True
+```
+
+
+### Advanced unpacking control
+
+As an alternative to iteration, `Unpacker` objects provide `unpack`,
+`skip`, `read_array_header`, and `read_map_header` methods. The former two
+read an entire message from the stream, respectively deserializing and returning
+the result, or ignoring it. The latter two methods return the number of elements
+in the upcoming container, so that each element in an array, or key-value pair
+in a map, can be unpacked or skipped individually.
+
+
+## Notes
+
+### String and binary types in the old MessagePack spec
+
+Early versions of msgpack didn't distinguish string and binary types.
+The type for representing both string and binary types was named **raw**.
+
+You can pack into and unpack from this old spec using `use_bin_type=False`
+and `raw=True` options.
+
+```pycon
+>>> import msgpack
+>>> msgpack.unpackb(msgpack.packb([b'spam', 'eggs'], use_bin_type=False), raw=True)
+[b'spam', b'eggs']
+>>> msgpack.unpackb(msgpack.packb([b'spam', 'eggs'], use_bin_type=True), raw=False)
+[b'spam', 'eggs']
+```
+
+### ext type
+
+To use the **ext** type, pass a `msgpack.ExtType` object to the packer.
+
+```pycon
+>>> import msgpack
+>>> packed = msgpack.packb(msgpack.ExtType(42, b'xyzzy'))
+>>> msgpack.unpackb(packed)
+ExtType(code=42, data='xyzzy')
+```
+
+You can use it with `default` and `ext_hook`. See below.
+
+
+### Security
+
+When unpacking data received from an unreliable source, msgpack provides
+two security options.
+
+`max_buffer_size` (default: `100*1024*1024`) limits the internal buffer size.
+It is also used to limit preallocated list sizes.
+
+`strict_map_key` (default: `True`) limits the type of map keys to bytes and str.
+While the MessagePack spec doesn't limit map key types,
+there is a risk of a hash DoS.
+If you need to support other types for map keys, use `strict_map_key=False`.
+
+
+### Performance tips
+
+CPython's GC starts when the number of allocated objects grows.
+This means unpacking may trigger unnecessary GC.
+You can use `gc.disable()` when unpacking a large message.
+
+A list is the default sequence type in Python.
+However, a tuple is lighter than a list.
+You can use `use_list=False` while unpacking when performance is important.
+
+
+## Major breaking changes in the history
+
+### msgpack 0.5
+
+The package name on PyPI was changed from `msgpack-python` to `msgpack` in 0.5.
+
+When upgrading from msgpack-0.4 or earlier, do `pip uninstall msgpack-python` before
+`pip install -U msgpack`.
+
+
+### msgpack 1.0
+
+* Python 2 support
+
+  * The extension module no longer supports Python 2.
+    The pure Python implementation (`msgpack.fallback`) is used for Python 2.
+  
+  * msgpack 1.0.6 drops official support of Python 2.7, as pip and
+    GitHub Action "setup-python" no longer supports Python 2.7.
+
+* Packer
+
+  * Packer uses `use_bin_type=True` by default.
+    Bytes are encoded in the bin type in MessagePack.
+  * The `encoding` option is removed. UTF-8 is always used.
+
+* Unpacker
+
+  * Unpacker uses `raw=False` by default. It assumes str values are valid UTF-8 strings
+    and decodes them to Python str (Unicode) objects.
+  * `encoding` option is removed.  You can use `raw=True` to support old format (e.g. unpack into bytes, not str).
+  * The default value of `max_buffer_size` is changed from 0 to 100 MiB to avoid DoS attacks.
+    You need to pass `max_buffer_size=0` if you have large but safe data.
+  * The default value of `strict_map_key` is changed to True to avoid hash DoS.
+    You need to pass `strict_map_key=False` if you have data that contain map keys
+    whose type is neither bytes nor str.
diff --git a/libs/msgpack-1.1.2.dist-info/RECORD b/libs/msgpack-1.1.2.dist-info/RECORD
new file mode 100644
index 0000000000..d7f2ca222c
--- /dev/null
+++ b/libs/msgpack-1.1.2.dist-info/RECORD
@@ -0,0 +1,12 @@
+msgpack-1.1.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+msgpack-1.1.2.dist-info/METADATA,sha256=hWxCylxh7YtECg6LELP_zJVXOXpQDuIjwQ2f-ZRb-As,8091
+msgpack-1.1.2.dist-info/RECORD,,
+msgpack-1.1.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+msgpack-1.1.2.dist-info/WHEEL,sha256=DkV-ntIm-3VWD87iCIyvXSz28ISStjMGlDRnHg-QlnQ,110
+msgpack-1.1.2.dist-info/licenses/COPYING,sha256=SS3tuoXaWHL3jmCRvNH-pHTWYNNay03ulkuKqz8AdCc,614
+msgpack-1.1.2.dist-info/top_level.txt,sha256=2tykSY1pXdiA2xYTDR6jPw0qI5ZGxRihyhf4S5hZyXk,8
+msgpack/__init__.py,sha256=RA8gcqK17YpkxBnNwXJVa1oa2LygWDgfF1nA1NPw3mo,1109
+msgpack/_cmsgpack.cpython-310-darwin.so,sha256=imGj-cEEW5KnWaHgqeP7Ba6P2WPfmio5MTVdEs4ryvA,211008
+msgpack/exceptions.py,sha256=dCTWei8dpkrMsQDcjQk74ATl9HsIBH0ybt8zOPNqMYc,1081
+msgpack/ext.py,sha256=kteJv03n9tYzd5oo3xYopVTo4vRaAxonBQQJhXohZZo,5726
+msgpack/fallback.py,sha256=0g1Pzp0vtmBEmJ5w9F3s_-JMVURP8RS4G1cc5TRaAsI,32390
diff --git a/libs/knowit-0.5.3.dist-info/REQUESTED b/libs/msgpack-1.1.2.dist-info/REQUESTED
similarity index 100%
rename from libs/knowit-0.5.3.dist-info/REQUESTED
rename to libs/msgpack-1.1.2.dist-info/REQUESTED
diff --git a/libs/msgpack-1.1.2.dist-info/WHEEL b/libs/msgpack-1.1.2.dist-info/WHEEL
new file mode 100644
index 0000000000..10166b37bf
--- /dev/null
+++ b/libs/msgpack-1.1.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: false
+Tag: cp310-cp310-macosx_14_0_arm64
+
diff --git a/libs/msgpack-1.1.0.dist-info/COPYING b/libs/msgpack-1.1.2.dist-info/licenses/COPYING
similarity index 100%
rename from libs/msgpack-1.1.0.dist-info/COPYING
rename to libs/msgpack-1.1.2.dist-info/licenses/COPYING
diff --git a/libs/msgpack-1.1.0.dist-info/top_level.txt b/libs/msgpack-1.1.2.dist-info/top_level.txt
similarity index 100%
rename from libs/msgpack-1.1.0.dist-info/top_level.txt
rename to libs/msgpack-1.1.2.dist-info/top_level.txt
diff --git a/libs/msgpack/__init__.py b/libs/msgpack/__init__.py
index b61510544a..f3266b701f 100644
--- a/libs/msgpack/__init__.py
+++ b/libs/msgpack/__init__.py
@@ -4,8 +4,8 @@
 from .exceptions import *  # noqa: F403
 from .ext import ExtType, Timestamp
 
-version = (1, 1, 0)
-__version__ = "1.1.0"
+version = (1, 1, 2)
+__version__ = "1.1.2"
 
 
 if os.environ.get("MSGPACK_PUREPYTHON"):
diff --git a/libs/oauthlib-3.2.2.dist-info/LICENSE b/libs/oauthlib-3.2.2.dist-info/LICENSE
deleted file mode 100644
index d5a9e9acd0..0000000000
--- a/libs/oauthlib-3.2.2.dist-info/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2019 The OAuthlib Community
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    3. Neither the name of this project nor the names of its contributors may
-       be used to endorse or promote products derived from this software without
-       specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/oauthlib-3.2.2.dist-info/METADATA b/libs/oauthlib-3.2.2.dist-info/METADATA
deleted file mode 100644
index b51a13c0af..0000000000
--- a/libs/oauthlib-3.2.2.dist-info/METADATA
+++ /dev/null
@@ -1,179 +0,0 @@
-Metadata-Version: 2.1
-Name: oauthlib
-Version: 3.2.2
-Summary: A generic, spec-compliant, thorough implementation of the OAuth request-signing logic
-Home-page: https://github.com/oauthlib/oauthlib
-Author: The OAuthlib Community
-Author-email: idan@gazit.me
-Maintainer: Ib Lundgren
-Maintainer-email: ib.lundgren@gmail.com
-License: BSD
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: POSIX
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.6
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Provides-Extra: rsa
-Requires-Dist: cryptography >=3.0.0 ; extra == 'rsa'
-Provides-Extra: signals
-Requires-Dist: blinker >=1.4.0 ; extra == 'signals'
-Provides-Extra: signedtoken
-Requires-Dist: cryptography >=3.0.0 ; extra == 'signedtoken'
-Requires-Dist: pyjwt <3,>=2.0.0 ; extra == 'signedtoken'
-
-OAuthLib - Python Framework for OAuth1 & OAuth2
-===============================================
-
-*A generic, spec-compliant, thorough implementation of the OAuth request-signing
-logic for Python 3.6+.*
-
-.. image:: https://app.travis-ci.com/oauthlib/oauthlib.svg?branch=master
-  :target: https://app.travis-ci.com/oauthlib/oauthlib
-  :alt: Travis
-.. image:: https://coveralls.io/repos/oauthlib/oauthlib/badge.svg?branch=master
-  :target: https://coveralls.io/r/oauthlib/oauthlib
-  :alt: Coveralls
-.. image:: https://img.shields.io/pypi/pyversions/oauthlib.svg
-  :target: https://pypi.org/project/oauthlib/
-  :alt: Download from PyPI
-.. image:: https://img.shields.io/pypi/l/oauthlib.svg
-  :target: https://pypi.org/project/oauthlib/
-  :alt: License
-.. image:: https://app.fossa.io/api/projects/git%2Bgithub.com%2Foauthlib%2Foauthlib.svg?type=shield
-   :target: https://app.fossa.io/projects/git%2Bgithub.com%2Foauthlib%2Foauthlib?ref=badge_shield
-   :alt: FOSSA Status
-.. image:: https://img.shields.io/readthedocs/oauthlib.svg
-  :target: https://oauthlib.readthedocs.io/en/latest/index.html
-  :alt: Read the Docs
-.. image:: https://badges.gitter.im/oauthlib/oauthlib.svg
-  :target: https://gitter.im/oauthlib/Lobby
-  :alt: Chat on Gitter
-
-
-.. image:: https://raw.githubusercontent.com/oauthlib/oauthlib/8d71b161fd145d11c40d55c9ab66ac134a303253/docs/logo/oauthlib-banner-700x192.png
-  :target: https://github.com/oauthlib/oauthlib/
-  :alt: OAuth + Python = OAuthlib Python Framework
-
-
-OAuth often seems complicated and difficult-to-implement. There are several
-prominent libraries for handling OAuth requests, but they all suffer from one or
-both of the following:
-
-1. They predate the `OAuth 1.0 spec`_, AKA RFC 5849.
-2. They predate the `OAuth 2.0 spec`_, AKA RFC 6749.
-3. They assume the usage of a specific HTTP request library.
-
-.. _`OAuth 1.0 spec`: https://tools.ietf.org/html/rfc5849
-.. _`OAuth 2.0 spec`: https://tools.ietf.org/html/rfc6749
-
-OAuthLib is a framework which implements the logic of OAuth1 or OAuth2 without
-assuming a specific HTTP request object or web framework. Use it to graft OAuth
-client support onto your favorite HTTP library, or provide support onto your
-favourite web framework. If you're a maintainer of such a library, write a thin
-veneer on top of OAuthLib and get OAuth support for very little effort.
-
-
-Documentation
---------------
-
-Full documentation is available on `Read the Docs`_. All contributions are very
-welcome! The documentation is still quite sparse, please open an issue for what
-you'd like to know, or discuss it in our `Gitter community`_, or even better, send a
-pull request!
-
-.. _`Gitter community`: https://gitter.im/oauthlib/Lobby
-.. _`Read the Docs`: https://oauthlib.readthedocs.io/en/latest/index.html
-
-Interested in making OAuth requests?
-------------------------------------
-
-Then you might be more interested in using `requests`_ which has OAuthLib
-powered OAuth support provided by the `requests-oauthlib`_ library.
-
-.. _`requests`: https://github.com/requests/requests
-.. _`requests-oauthlib`: https://github.com/requests/requests-oauthlib
-
-Which web frameworks are supported?
------------------------------------
-
-The following packages provide OAuth support using OAuthLib.
-
-- For Django there is `django-oauth-toolkit`_, which includes `Django REST framework`_ support.
-- For Flask there is `flask-oauthlib`_ and `Flask-Dance`_.
-- For Pyramid there is `pyramid-oauthlib`_.
-- For Bottle there is `bottle-oauthlib`_.
-
-If you have written an OAuthLib package that supports your favorite framework,
-please open a Pull Request, updating the documentation.
-
-.. _`django-oauth-toolkit`: https://github.com/evonove/django-oauth-toolkit
-.. _`flask-oauthlib`: https://github.com/lepture/flask-oauthlib
-.. _`Django REST framework`: http://django-rest-framework.org
-.. _`Flask-Dance`: https://github.com/singingwolfboy/flask-dance
-.. _`pyramid-oauthlib`: https://github.com/tilgovi/pyramid-oauthlib
-.. _`bottle-oauthlib`: https://github.com/thomsonreuters/bottle-oauthlib
-
-Using OAuthLib? Please get in touch!
-------------------------------------
-Patching OAuth support onto an http request framework? Creating an OAuth
-provider extension for a web framework? Simply using OAuthLib to Get Things Done
-or to learn?
-
-No matter which we'd love to hear from you in our `Gitter community`_ or if you have
-anything in particular you would like to have, change or comment on don't
-hesitate for a second to send a pull request or open an issue. We might be quite
-busy and therefore slow to reply but we love feedback!
-
-Chances are you have run into something annoying that you wish there was
-documentation for, if you wish to gain eternal fame and glory, and a drink if we
-have the pleasure to run into each other, please send a docs pull request =)
-
-.. _`Gitter community`: https://gitter.im/oauthlib/Lobby
-
-License
--------
-
-OAuthLib is yours to use and abuse according to the terms of the BSD license.
-Check the LICENSE file for full details.
-
-Credits
--------
-
-OAuthLib has been started and maintained several years by Idan Gazit and other
-amazing `AUTHORS`_. Thanks to their wonderful work, the open-source `community`_
-creation has been possible and the project can stay active and reactive to users
-requests.
-
-
-.. _`AUTHORS`: https://github.com/oauthlib/oauthlib/blob/master/AUTHORS
-.. _`community`: https://github.com/oauthlib/
-
-Changelog
----------
-
-*OAuthLib is in active development, with the core of both OAuth1 and OAuth2
-completed, for providers as well as clients.* See `supported features`_ for
-details.
-
-.. _`supported features`: https://oauthlib.readthedocs.io/en/latest/feature_matrix.html
-
-For a full changelog see ``CHANGELOG.rst``.
diff --git a/libs/oauthlib-3.2.2.dist-info/RECORD b/libs/oauthlib-3.2.2.dist-info/RECORD
deleted file mode 100644
index c595723392..0000000000
--- a/libs/oauthlib-3.2.2.dist-info/RECORD
+++ /dev/null
@@ -1,75 +0,0 @@
-oauthlib-3.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-oauthlib-3.2.2.dist-info/LICENSE,sha256=PR4S2KxSwLbBSK9tKR9yQAuHIO0WwKxKiYaLbRSxyTk,1530
-oauthlib-3.2.2.dist-info/METADATA,sha256=w6A_7g5q7GKrepdXMPOV6fi_ToPWrWDGl8eRfE_0LGo,7446
-oauthlib-3.2.2.dist-info/RECORD,,
-oauthlib-3.2.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oauthlib-3.2.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-oauthlib-3.2.2.dist-info/top_level.txt,sha256=gz2py0fFs1AhG1O7KpHPcIXOgXOwdIiCaSnmLkiR12Q,9
-oauthlib/__init__.py,sha256=XeBZVT7i8Hx3nnEIb0MaNWrFQmxS3sc4SvGkOKhnht4,686
-oauthlib/common.py,sha256=VL5A-cXOkRbjMu7E79OxDymV7tLOt0Cm2y1xchEw_Ig,13377
-oauthlib/oauth1/__init__.py,sha256=47hEQ7s_FZXLyUt6XVE-DPC8vUMVsJl7_-HCkNM2IlM,822
-oauthlib/oauth1/rfc5849/__init__.py,sha256=-5sJHDG3JRZQRJYlCjkj3CP2jZgqEg0OY5pVIxE4mxE,16744
-oauthlib/oauth1/rfc5849/endpoints/__init__.py,sha256=SeIECziJ-Sv_NCGnowG3P9UnX_VdFNldRqRywEaJvxY,327
-oauthlib/oauth1/rfc5849/endpoints/access_token.py,sha256=CRgLV5DqDiwVvbo8MiHySbTEKrxETJV29-VGu-2kQ7Y,9347
-oauthlib/oauth1/rfc5849/endpoints/authorization.py,sha256=zbU7TzO6nB6853UIqtTkhxUV-JTHOdOc-CvdQsIQKWk,6724
-oauthlib/oauth1/rfc5849/endpoints/base.py,sha256=W0IxgaFM7sNFpsis-mo3Ky59wbLl2PNlYjIeqUCvyak,11637
-oauthlib/oauth1/rfc5849/endpoints/pre_configured.py,sha256=Ie5oBUq_JTsXQdvfWhcMRjhH3OOxS_mRHbKBQ9TpsGg,543
-oauthlib/oauth1/rfc5849/endpoints/request_token.py,sha256=1eljiIUPkObutaNDD6J7Kx5Ens1bknqHIEnnEkQGF7k,9291
-oauthlib/oauth1/rfc5849/endpoints/resource.py,sha256=F6f2AecZ1fTdrC7DOERrIFUp2YQ5MLq8-a6VbQLM2ds,7374
-oauthlib/oauth1/rfc5849/endpoints/signature_only.py,sha256=MX5zV66v4-wrR4cu7OmOd_GF3L8ysM60HmEiHtRR0l8,3327
-oauthlib/oauth1/rfc5849/errors.py,sha256=WPvKVjPlgkCYp6TXvcwC8VETkhsZBzphKCkTJKDPNfM,2474
-oauthlib/oauth1/rfc5849/parameters.py,sha256=Abnxpix_Yy7P3A3vbkrV2bkFxtnR5TRTTKdOu9MKydo,4802
-oauthlib/oauth1/rfc5849/request_validator.py,sha256=7Tt1uyt4LAWhKCMrQc9GR_EShZyckPigDXkxDNvxiBE,30987
-oauthlib/oauth1/rfc5849/signature.py,sha256=WY0ArNQg-9HBU2Hl4cpfFfW0Y3WUsW7XRqgL4w5jLmE,32076
-oauthlib/oauth1/rfc5849/utils.py,sha256=IapG_jM6iMe4e0DYWWds1jp-wce2Lf_cuhFrtCP_2ls,2613
-oauthlib/oauth2/__init__.py,sha256=uPkdHF2NEpIM6Ybz-jPPEKU5e56eHptaOz2NPwppyys,1597
-oauthlib/oauth2/rfc6749/__init__.py,sha256=sJcxfdG6HTloXzhkG8-PTJTVQWoCeNtnw6ODNCJNw58,404
-oauthlib/oauth2/rfc6749/clients/__init__.py,sha256=TuYtiErfo0_Ej0816tIv5rBsrwA9BjYz3tu_ZM0X364,504
-oauthlib/oauth2/rfc6749/clients/backend_application.py,sha256=2kEw6T5Ii2TMSpvHlvi697_eMV9fXjkjqc8DY5sG310,3224
-oauthlib/oauth2/rfc6749/clients/base.py,sha256=6ZW6ewf4SdS2BBGc-rZunfsGYalOqeucToNN8j8f7lc,26652
-oauthlib/oauth2/rfc6749/clients/legacy_application.py,sha256=9V-PGgToIoQcvmG14g9WiQjsDgWs7OnvLpZfmiA2Z24,4032
-oauthlib/oauth2/rfc6749/clients/mobile_application.py,sha256=eos0OLJmy-e5FFRHD-sjzDjMu7DlQxqayslZfbBtTNE,8878
-oauthlib/oauth2/rfc6749/clients/service_application.py,sha256=wksSW2I-sth3ykXps_CssI0m7GC20lOh5jIl_mIjdQU,7812
-oauthlib/oauth2/rfc6749/clients/web_application.py,sha256=RMk0_wzV-36TdMtcoeZ0I-lSB5sHWDpyWFTg5JFYVFM,12088
-oauthlib/oauth2/rfc6749/endpoints/__init__.py,sha256=RL_txhULl35A74dbvlJ7nvqwp3GMCSCpg_4TvjoO-Xk,553
-oauthlib/oauth2/rfc6749/endpoints/authorization.py,sha256=2N2Cb_TQtpUPcqDIclsJnZERtaMKmH9uSgGoMZLFnUI,4584
-oauthlib/oauth2/rfc6749/endpoints/base.py,sha256=fUhCGaftD5bm5PstA6L2CqUNb9kHDpUj4_BsvLRbi4w,4130
-oauthlib/oauth2/rfc6749/endpoints/introspect.py,sha256=zMkbHNJUC0Ww4aqs-Px_Yil_bNPSDDcMlZVA4C1nOb0,4947
-oauthlib/oauth2/rfc6749/endpoints/metadata.py,sha256=NOqXwoD34n94pC3IczakrpXMrZSPDruLMUl2_2MjW6Q,10530
-oauthlib/oauth2/rfc6749/endpoints/pre_configured.py,sha256=ChhORao78XGGlnikJsLb6d_FZvKaLGBUM-te-84NeJ8,11954
-oauthlib/oauth2/rfc6749/endpoints/resource.py,sha256=vpXoovgpmByY-IuW0PDccS5IJGFoFiLVjLLUpGFmXX4,3248
-oauthlib/oauth2/rfc6749/endpoints/revocation.py,sha256=68Ukipz7UOdeBCmO5KTRo0vwbUFd8tTG22Ck0hFlumw,5212
-oauthlib/oauth2/rfc6749/endpoints/token.py,sha256=iJDlaSkVR8U6s1_T9fiyVnLgfCgOWsq9PFDcmzL74H4,4595
-oauthlib/oauth2/rfc6749/errors.py,sha256=5EE4Qs3ru34d33wqaFo-WGOofLLYK1jTov9sqG92CW0,12947
-oauthlib/oauth2/rfc6749/grant_types/__init__.py,sha256=im_XwEWmw3dhmzcdfyhkN38xZopBhL3cRShmmCtqQs0,368
-oauthlib/oauth2/rfc6749/grant_types/authorization_code.py,sha256=RPXH4qdy0byAFjgsEvD0iiOxSrGkbEj7hkweeT8pZRQ,26102
-oauthlib/oauth2/rfc6749/grant_types/base.py,sha256=x5Q6Fm9iScvbkiXU6J_dUzxpXJq-qb_N-TNPYuIiObU,10969
-oauthlib/oauth2/rfc6749/grant_types/client_credentials.py,sha256=Wr0CpWDVmHrIfOBPTYp9RxnISTfYdp5SjSaRAu77vUY,5079
-oauthlib/oauth2/rfc6749/grant_types/implicit.py,sha256=hYAEYOwToxo3eNpGRC9SyJue93tu37jZVL7MYiaErDs,16852
-oauthlib/oauth2/rfc6749/grant_types/refresh_token.py,sha256=3oYMvW0gVhIrjs17RP_SFyZrTNi6hjVrEh45Z1GcIA0,5891
-oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py,sha256=9FsDbrSNNylWKkEvgdafJDzlNncTRCOhIZODo-f4ZIM,8516
-oauthlib/oauth2/rfc6749/parameters.py,sha256=BUGD3N_H9pBRctUYEDCD7dwncqjcHv7hW1ZcHMMQJb4,19016
-oauthlib/oauth2/rfc6749/request_validator.py,sha256=BZj1OURgQh_sxG5agbSpLTeo_IVxvYUqqDKkoAGqCbM,28851
-oauthlib/oauth2/rfc6749/tokens.py,sha256=RMcY7F4fCAoxZbyUUDN9el_B_XRp4ELrY3pj5awA1Do,11116
-oauthlib/oauth2/rfc6749/utils.py,sha256=EKlU_U-FcYkdd8PvXo1irtHTqBXF7gKqdFKBadteZ64,2207
-oauthlib/oauth2/rfc8628/__init__.py,sha256=yfG2QHuDxrp7_9HNKPEeXYXA_qBVZqiRrhI7q2cG4NM,232
-oauthlib/oauth2/rfc8628/clients/__init__.py,sha256=indCdGycy9cekvLOBxYbCwtyezEVhl3uKZzoShml-aY,201
-oauthlib/oauth2/rfc8628/clients/device.py,sha256=0QgAfokzgzh6Jx5Nbnkwi2F67N7HruEAc_ZRCWr-JH0,4052
-oauthlib/openid/__init__.py,sha256=qZQCKCdQt40myte_nxSYrWvzf1VVADqRl8om0-t6LzE,162
-oauthlib/openid/connect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oauthlib/openid/connect/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oauthlib/openid/connect/core/endpoints/__init__.py,sha256=nQ6mGniUaM9X1ENG0tZlPgWgbLdlFESWGK-5_e8mp5Y,229
-oauthlib/openid/connect/core/endpoints/pre_configured.py,sha256=p4Bq4HHUTvCBYXlTHr3PXktABKjHFGC3yBmwxWifzKc,5426
-oauthlib/openid/connect/core/endpoints/userinfo.py,sha256=kc1Q3DN8xByk3Qe_S0LAlmJR2MkXnCnNFqLqVr8y3zU,4096
-oauthlib/openid/connect/core/exceptions.py,sha256=uMMjE7VMc16jyL7TIhpbCx48_MsHD2C_atoMIemBKVA,4790
-oauthlib/openid/connect/core/grant_types/__init__.py,sha256=geSZh6OFlupoC2tg9Bqqsnd31nu1-EheWNobzu86ZqU,426
-oauthlib/openid/connect/core/grant_types/authorization_code.py,sha256=WOlS5RlSjIk2VNNmC5O4svxfTeUJiXpL3o5Mqn5EULk,1441
-oauthlib/openid/connect/core/grant_types/base.py,sha256=o0Nn_k6X0VB6m6iKpvlm-QMbtWcYzGagX6Uq2XaBS20,15385
-oauthlib/openid/connect/core/grant_types/dispatchers.py,sha256=RsIHHV8ne8fvlU1bL0jIUNb2pb2DbtJ1RYGV2_Z5GVQ,3978
-oauthlib/openid/connect/core/grant_types/hybrid.py,sha256=PHWBazxe3qpJq02rpU93jaK7URxI_r1zl0Ee4ibcaPA,2742
-oauthlib/openid/connect/core/grant_types/implicit.py,sha256=UICxnDNoePZfTUbL5QCBWA231o8XIQEnxocSrPp9gzw,1971
-oauthlib/openid/connect/core/grant_types/refresh_token.py,sha256=8X0i1EHLgBIrlqP10rwJ5lXWO3f8iupmfn2E6DlLmnw,1035
-oauthlib/openid/connect/core/request_validator.py,sha256=-lo1BnAhMWVkCj2Qhpn22LbV6CDmx4Nh4tCOntCg9tQ,13767
-oauthlib/openid/connect/core/tokens.py,sha256=j8WPb5T8SbmprFUJdM2DjafNU_fa1eohkjUeaJagn0s,1605
-oauthlib/signals.py,sha256=_PKDXWqKW6X3IbQUxGqW4eJ5Yi3p8jdOqXPAKfI956E,1489
-oauthlib/uri_validate.py,sha256=1LwAANg5vBjaypKgbDF_qrt_u7rJPlfg1hTrD9oanEU,6112
diff --git a/libs/oauthlib-3.2.2.dist-info/WHEEL b/libs/oauthlib-3.2.2.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/oauthlib-3.2.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/knowit-0.5.3.dist-info/INSTALLER b/libs/oauthlib-3.3.1.dist-info/INSTALLER
similarity index 100%
rename from libs/knowit-0.5.3.dist-info/INSTALLER
rename to libs/oauthlib-3.3.1.dist-info/INSTALLER
diff --git a/libs/oauthlib-3.3.1.dist-info/METADATA b/libs/oauthlib-3.3.1.dist-info/METADATA
new file mode 100644
index 0000000000..83e56a432e
--- /dev/null
+++ b/libs/oauthlib-3.3.1.dist-info/METADATA
@@ -0,0 +1,194 @@
+Metadata-Version: 2.4
+Name: oauthlib
+Version: 3.3.1
+Summary: A generic, spec-compliant, thorough implementation of the OAuth request-signing logic
+Home-page: https://github.com/oauthlib/oauthlib
+Author: The OAuthlib Community
+Maintainer: Jonathan Huot
+Maintainer-email: jonathan.huot@gmail.com
+License: BSD-3-Clause
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Provides-Extra: rsa
+Requires-Dist: cryptography>=3.0.0; extra == "rsa"
+Provides-Extra: signedtoken
+Requires-Dist: cryptography>=3.0.0; extra == "signedtoken"
+Requires-Dist: pyjwt<3,>=2.0.0; extra == "signedtoken"
+Provides-Extra: signals
+Requires-Dist: blinker>=1.4.0; extra == "signals"
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: platform
+Dynamic: provides-extra
+Dynamic: requires-python
+Dynamic: summary
+
+OAuthLib - Python Framework for OAuth1 & OAuth2
+===============================================
+
+*A generic, spec-compliant, thorough implementation of the OAuth request-signing
+logic for Python 3.8+*
+
+.. image:: https://github.com/oauthlib/oauthlib/actions/workflows/python-build.yml/badge.svg
+  :target: https://github.com/oauthlib/oauthlib/actions
+  :alt: GitHub Actions
+.. image:: https://coveralls.io/repos/oauthlib/oauthlib/badge.svg?branch=master
+  :target: https://coveralls.io/r/oauthlib/oauthlib
+  :alt: Coveralls
+.. image:: https://img.shields.io/pypi/pyversions/oauthlib.svg
+  :target: https://pypi.org/project/oauthlib/
+  :alt: Download from PyPI
+.. image:: https://img.shields.io/pypi/l/oauthlib.svg
+  :target: https://pypi.org/project/oauthlib/
+  :alt: License
+.. image:: https://app.fossa.io/api/projects/git%2Bgithub.com%2Foauthlib%2Foauthlib.svg?type=shield
+   :target: https://app.fossa.io/projects/git%2Bgithub.com%2Foauthlib%2Foauthlib?ref=badge_shield
+   :alt: FOSSA Status
+.. image:: https://img.shields.io/readthedocs/oauthlib.svg
+  :target: https://oauthlib.readthedocs.io/en/latest/index.html
+  :alt: Read the Docs
+.. image:: https://badges.gitter.im/oauthlib/oauthlib.svg
+  :target: https://gitter.im/oauthlib/Lobby
+  :alt: Chat on Gitter
+
+
+.. image:: https://raw.githubusercontent.com/oauthlib/oauthlib/8d71b161fd145d11c40d55c9ab66ac134a303253/docs/logo/oauthlib-banner-700x192.png
+  :target: https://github.com/oauthlib/oauthlib/
+  :alt: OAuth + Python = OAuthlib Python Framework
+
+
+OAuth often seems complicated and difficult-to-implement. There are several
+prominent libraries for handling OAuth requests, but they all suffer from one or
+both of the following:
+
+1. They predate the `OAuth 1.0 spec`_, AKA RFC 5849.
+2. They predate the `OAuth 2.0 spec`_, AKA RFC 6749.
+3. They assume the usage of a specific HTTP request library.
+
+.. _`OAuth 1.0 spec`: https://tools.ietf.org/html/rfc5849
+.. _`OAuth 2.0 spec`: https://tools.ietf.org/html/rfc6749
+
+OAuthLib is a framework which implements the logic of OAuth1 or OAuth2 without
+assuming a specific HTTP request object or web framework. Use it to graft OAuth
+client support onto your favorite HTTP library, or provide support onto your
+favourite web framework. If you're a maintainer of such a library, write a thin
+veneer on top of OAuthLib and get OAuth support for very little effort.
+
+
+Documentation
+--------------
+
+Full documentation is available on `Read the Docs`_. All contributions are very
+welcome! The documentation is still quite sparse, please open an issue for what
+you'd like to know, or discuss it in our `Gitter community`_, or even better, send a
+pull request!
+
+.. _`Gitter community`: https://gitter.im/oauthlib/Lobby
+.. _`Read the Docs`: https://oauthlib.readthedocs.io/en/latest/index.html
+
+Interested in making OAuth requests?
+------------------------------------
+
+Then you might be more interested in using `requests`_ which has OAuthLib
+powered OAuth support provided by the `requests-oauthlib`_ library.
+
+.. _`requests`: https://github.com/requests/requests
+.. _`requests-oauthlib`: https://github.com/requests/requests-oauthlib
+
+Which web frameworks are supported?
+-----------------------------------
+
+The following packages provide OAuth support using OAuthLib.
+
+- For Django there is:
+  - `django-oauth-toolkit`_, which includes `Django REST framework`_ support.
+  - `django-allauth`_, which includes `Django REST framework`_ as well as `Django Ninja`_ support.
+- For Flask there is `flask-oauthlib`_ and `Flask-Dance`_.
+- For Pyramid there is `pyramid-oauthlib`_.
+- For Bottle there is `bottle-oauthlib`_.
+
+If you have written an OAuthLib package that supports your favorite framework,
+please open a Pull Request, updating the documentation.
+
+.. _`django-oauth-toolkit`: https://github.com/evonove/django-oauth-toolkit
+.. _`flask-oauthlib`: https://github.com/lepture/flask-oauthlib
+.. _`Django REST framework`: http://django-rest-framework.org
+.. _`Flask-Dance`: https://github.com/singingwolfboy/flask-dance
+.. _`pyramid-oauthlib`: https://github.com/tilgovi/pyramid-oauthlib
+.. _`bottle-oauthlib`: https://github.com/thomsonreuters/bottle-oauthlib
+.. _`django-allauth`: https://allauth.org/
+.. _`Django Ninja`: https://django-ninja.dev/
+
+Using OAuthLib? Please get in touch!
+------------------------------------
+Patching OAuth support onto an http request framework? Creating an OAuth
+provider extension for a web framework? Simply using OAuthLib to Get Things Done
+or to learn?
+
+No matter which we'd love to hear from you in our `Gitter community`_ or if you have
+anything in particular you would like to have, change or comment on don't
+hesitate for a second to send a pull request or open an issue. We might be quite
+busy and therefore slow to reply but we love feedback!
+
+Chances are you have run into something annoying that you wish there was
+documentation for, if you wish to gain eternal fame and glory, and a drink if we
+have the pleasure to run into each other, please send a docs pull request =)
+
+.. _`Gitter community`: https://gitter.im/oauthlib/Lobby
+
+License
+-------
+
+OAuthLib is yours to use and abuse according to the terms of the BSD-3-Clause license.
+Check the LICENSE file for full details.
+
+Credits
+-------
+
+OAuthLib has been started and maintained several years by Idan Gazit and other
+amazing `AUTHORS`_. Thanks to their wonderful work, the open-source `community`_
+creation has been possible and the project can stay active and reactive to users
+requests.
+
+
+.. _`AUTHORS`: https://github.com/oauthlib/oauthlib/blob/master/AUTHORS
+.. _`community`: https://github.com/oauthlib/
+
+Changelog
+---------
+
+*OAuthLib is in active development, with the core of both OAuth1 and OAuth2
+completed, for providers as well as clients.* See `supported features`_ for
+details.
+
+.. _`supported features`: https://oauthlib.readthedocs.io/en/latest/feature_matrix.html
+
+For a full changelog see ``CHANGELOG.rst``.
diff --git a/libs/oauthlib-3.3.1.dist-info/RECORD b/libs/oauthlib-3.3.1.dist-info/RECORD
new file mode 100644
index 0000000000..4a2ecad7af
--- /dev/null
+++ b/libs/oauthlib-3.3.1.dist-info/RECORD
@@ -0,0 +1,82 @@
+oauthlib-3.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+oauthlib-3.3.1.dist-info/METADATA,sha256=TyjUwFSdCWrsQCgOkJ0MmWY9LdynHmrFKkR2bapkM6E,7898
+oauthlib-3.3.1.dist-info/RECORD,,
+oauthlib-3.3.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oauthlib-3.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+oauthlib-3.3.1.dist-info/licenses/LICENSE,sha256=ACiqR2OooLCcpMaNWFJjR0z5qqbsaf--86ManszdO5E,1534
+oauthlib-3.3.1.dist-info/top_level.txt,sha256=gz2py0fFs1AhG1O7KpHPcIXOgXOwdIiCaSnmLkiR12Q,9
+oauthlib/__init__.py,sha256=zL-KQLdQshkx-EKxtBbgu1yyTpf1TRJ7QtfaOOsdXcQ,724
+oauthlib/common.py,sha256=OeaG-SiwDXAEsK1fkh5GabgSPGjG4AcuwuqwB5hrG_A,13439
+oauthlib/oauth1/__init__.py,sha256=47hEQ7s_FZXLyUt6XVE-DPC8vUMVsJl7_-HCkNM2IlM,822
+oauthlib/oauth1/rfc5849/__init__.py,sha256=aXt9PJ6XHU2uYR9a3wtkmGCQYbAN73JWQdbOPByrMcE,16773
+oauthlib/oauth1/rfc5849/endpoints/__init__.py,sha256=SeIECziJ-Sv_NCGnowG3P9UnX_VdFNldRqRywEaJvxY,327
+oauthlib/oauth1/rfc5849/endpoints/access_token.py,sha256=CRgLV5DqDiwVvbo8MiHySbTEKrxETJV29-VGu-2kQ7Y,9347
+oauthlib/oauth1/rfc5849/endpoints/authorization.py,sha256=zbU7TzO6nB6853UIqtTkhxUV-JTHOdOc-CvdQsIQKWk,6724
+oauthlib/oauth1/rfc5849/endpoints/base.py,sha256=6zvL13RbAEO7t_ZOdmenkkD28FektdEnvyBNM25YYbs,11534
+oauthlib/oauth1/rfc5849/endpoints/pre_configured.py,sha256=Ie5oBUq_JTsXQdvfWhcMRjhH3OOxS_mRHbKBQ9TpsGg,543
+oauthlib/oauth1/rfc5849/endpoints/request_token.py,sha256=1eljiIUPkObutaNDD6J7Kx5Ens1bknqHIEnnEkQGF7k,9291
+oauthlib/oauth1/rfc5849/endpoints/resource.py,sha256=F6f2AecZ1fTdrC7DOERrIFUp2YQ5MLq8-a6VbQLM2ds,7374
+oauthlib/oauth1/rfc5849/endpoints/signature_only.py,sha256=MX5zV66v4-wrR4cu7OmOd_GF3L8ysM60HmEiHtRR0l8,3327
+oauthlib/oauth1/rfc5849/errors.py,sha256=WPvKVjPlgkCYp6TXvcwC8VETkhsZBzphKCkTJKDPNfM,2474
+oauthlib/oauth1/rfc5849/parameters.py,sha256=Abnxpix_Yy7P3A3vbkrV2bkFxtnR5TRTTKdOu9MKydo,4802
+oauthlib/oauth1/rfc5849/request_validator.py,sha256=7Tt1uyt4LAWhKCMrQc9GR_EShZyckPigDXkxDNvxiBE,30987
+oauthlib/oauth1/rfc5849/signature.py,sha256=RJjRA31C0uCtwx_pevvXx3KyKwJEuwNeUxnF5uV2zf4,32109
+oauthlib/oauth1/rfc5849/utils.py,sha256=nv90MM04_gPHS0hTLgGyoE07_gfjGcKNOetewzH2OVM,2638
+oauthlib/oauth2/__init__.py,sha256=K7IHw_BNCZLSTQqAfQqsLK0K0zA6_KrQDCzc4S-33iQ,1885
+oauthlib/oauth2/rfc6749/__init__.py,sha256=sJcxfdG6HTloXzhkG8-PTJTVQWoCeNtnw6ODNCJNw58,404
+oauthlib/oauth2/rfc6749/clients/__init__.py,sha256=TuYtiErfo0_Ej0816tIv5rBsrwA9BjYz3tu_ZM0X364,504
+oauthlib/oauth2/rfc6749/clients/backend_application.py,sha256=2kEw6T5Ii2TMSpvHlvi697_eMV9fXjkjqc8DY5sG310,3224
+oauthlib/oauth2/rfc6749/clients/base.py,sha256=LbPA9x3rtsI2V8TsQGYrtBVGceEdQa8NpmcKKH97anQ,26368
+oauthlib/oauth2/rfc6749/clients/legacy_application.py,sha256=9V-PGgToIoQcvmG14g9WiQjsDgWs7OnvLpZfmiA2Z24,4032
+oauthlib/oauth2/rfc6749/clients/mobile_application.py,sha256=5eBA_9GcivMwQiuq0rOM3TKAcmWnvLbpGfgmZ51r9fc,8874
+oauthlib/oauth2/rfc6749/clients/service_application.py,sha256=8G8TC0O7La3mHmuC6aZPTH9D3udlzua4M9pQfz6j7MI,7836
+oauthlib/oauth2/rfc6749/clients/web_application.py,sha256=9ipzAKihE4y_RcEDrTDNH0EnIKoFn2HqdR_NOqQnSlk,12082
+oauthlib/oauth2/rfc6749/endpoints/__init__.py,sha256=RL_txhULl35A74dbvlJ7nvqwp3GMCSCpg_4TvjoO-Xk,553
+oauthlib/oauth2/rfc6749/endpoints/authorization.py,sha256=2N2Cb_TQtpUPcqDIclsJnZERtaMKmH9uSgGoMZLFnUI,4584
+oauthlib/oauth2/rfc6749/endpoints/base.py,sha256=fSVQAiOiVYH9trIzzKKUMCErpqIo06MeohI36F0PPAQ,4119
+oauthlib/oauth2/rfc6749/endpoints/introspect.py,sha256=AmRbazioFljCCaca6ppWSi38koZhYlz_PrgHLgMcAHA,4946
+oauthlib/oauth2/rfc6749/endpoints/metadata.py,sha256=aZDPlzTulQK2XK69f3bku3NU8GCC-0pmsZViW_d6Fh0,10558
+oauthlib/oauth2/rfc6749/endpoints/pre_configured.py,sha256=b-By4p6U8Ltvplv4oiOJOycC6Nd8UklLOJ91uz68YxY,11665
+oauthlib/oauth2/rfc6749/endpoints/resource.py,sha256=QtMiVVIUvUYzVTfdVw7BFn5n6_dRsoadQCx4dm3RRYo,3243
+oauthlib/oauth2/rfc6749/endpoints/revocation.py,sha256=68Ukipz7UOdeBCmO5KTRo0vwbUFd8tTG22Ck0hFlumw,5212
+oauthlib/oauth2/rfc6749/endpoints/token.py,sha256=iJDlaSkVR8U6s1_T9fiyVnLgfCgOWsq9PFDcmzL74H4,4595
+oauthlib/oauth2/rfc6749/errors.py,sha256=BP0N3lS8_2Xx2GrSGT5lVRAHFMNfkU1gTv5VGI19wo4,12934
+oauthlib/oauth2/rfc6749/grant_types/__init__.py,sha256=im_XwEWmw3dhmzcdfyhkN38xZopBhL3cRShmmCtqQs0,368
+oauthlib/oauth2/rfc6749/grant_types/authorization_code.py,sha256=DWkxYBxOiKB4-zzPXwUsA1rWpLshce-5whjgiKcnLcY,26086
+oauthlib/oauth2/rfc6749/grant_types/base.py,sha256=UrBKri89mxVHkLBi47OEa34NOaOylBAl_rZbI9wD3lc,10909
+oauthlib/oauth2/rfc6749/grant_types/client_credentials.py,sha256=vIQ956Mq2IHOP3DLPndP--HYKeLFml5dPJdjgb3jx3Y,5051
+oauthlib/oauth2/rfc6749/grant_types/implicit.py,sha256=oLufSBEX5m1_kE4NCj1dmaSLjyKMZdsvBrSn05ik0H4,16810
+oauthlib/oauth2/rfc6749/grant_types/refresh_token.py,sha256=WDVae--UmQt1cJkhO0bwZtoEdgZnSfrr5RfLEj2-aak,6077
+oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py,sha256=Bs3kNx1qdTHZVOa7Mn2GpiOzgpdGmfeT_iB6uxPoIO4,8484
+oauthlib/oauth2/rfc6749/parameters.py,sha256=gtZOiG6fT2K3Coy8RHncu9K41ao6AdwAhjvDeLA3rBw,21355
+oauthlib/oauth2/rfc6749/request_validator.py,sha256=TnMSojtirMu2DkTYwhjc_rXL2IabLWYnyokkxzOWGM8,28848
+oauthlib/oauth2/rfc6749/tokens.py,sha256=KVCC64_NTup0BvfojFuzdtbsO6bXsOcyECj55Dg1AmY,11015
+oauthlib/oauth2/rfc6749/utils.py,sha256=EKlU_U-FcYkdd8PvXo1irtHTqBXF7gKqdFKBadteZ64,2207
+oauthlib/oauth2/rfc8628/__init__.py,sha256=S2qH3aljQLTnAAOeeNolAooaaSY7Gqtg9yjCOA948uY,353
+oauthlib/oauth2/rfc8628/clients/__init__.py,sha256=indCdGycy9cekvLOBxYbCwtyezEVhl3uKZzoShml-aY,201
+oauthlib/oauth2/rfc8628/clients/device.py,sha256=v4MZoZAkeKtsTugPn28L0C3cQ02T7EMznmRMal18Rs8,4046
+oauthlib/oauth2/rfc8628/endpoints/__init__.py,sha256=NuVzRnUpdSS2BiVzglloMqAVCRwgjYJQaXLbycYL-vs,297
+oauthlib/oauth2/rfc8628/endpoints/device_authorization.py,sha256=tbyeQZ83DpZlcCRSgbtJiQT8ywqvkGA384r0KmaC39o,9721
+oauthlib/oauth2/rfc8628/endpoints/pre_configured.py,sha256=BT7KKFW-Ym0iY5YRxs3ILTSEx3kWlp5VgKuCosWrx8s,1403
+oauthlib/oauth2/rfc8628/errors.py,sha256=wuXMEv2b6Syytoc4xQZoxech4XBfaWRtmZBi7W1t0ao,1684
+oauthlib/oauth2/rfc8628/grant_types/__init__.py,sha256=9jwg_aNcLlqHZ_YsE6jQC8QbWnsG5iv35NnJGtouE9w,76
+oauthlib/oauth2/rfc8628/grant_types/device_code.py,sha256=Dj6cCV1Crrct1FohOeQY8Oj8t9ZkQ33lerOOdtFxAtE,4265
+oauthlib/oauth2/rfc8628/request_validator.py,sha256=vbpIIMjUvDCIVbZ31OydUCN2bcaWsV_-DLS2QCA302g,1161
+oauthlib/openid/__init__.py,sha256=qZQCKCdQt40myte_nxSYrWvzf1VVADqRl8om0-t6LzE,162
+oauthlib/openid/connect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oauthlib/openid/connect/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+oauthlib/openid/connect/core/endpoints/__init__.py,sha256=nQ6mGniUaM9X1ENG0tZlPgWgbLdlFESWGK-5_e8mp5Y,229
+oauthlib/openid/connect/core/endpoints/pre_configured.py,sha256=vG_xpfojwtzDp4ISXhPZM1XnOr8uT63EBrhuvOEh5-4,5449
+oauthlib/openid/connect/core/endpoints/userinfo.py,sha256=kc1Q3DN8xByk3Qe_S0LAlmJR2MkXnCnNFqLqVr8y3zU,4096
+oauthlib/openid/connect/core/exceptions.py,sha256=YdkjNSPAensGEZdR9_s6KMxldB4hKFp7R6QlM3YTb8E,4783
+oauthlib/openid/connect/core/grant_types/__init__.py,sha256=geSZh6OFlupoC2tg9Bqqsnd31nu1-EheWNobzu86ZqU,426
+oauthlib/openid/connect/core/grant_types/authorization_code.py,sha256=WOlS5RlSjIk2VNNmC5O4svxfTeUJiXpL3o5Mqn5EULk,1441
+oauthlib/openid/connect/core/grant_types/base.py,sha256=Jy7IE9P977yLufKL89h6NhzI4v1yWy4TXoYFncLFQbM,15503
+oauthlib/openid/connect/core/grant_types/dispatchers.py,sha256=vd0svo-ZvdCME4hwXhQpDfL82iMX4m4QKKjF5iL2vTY,3960
+oauthlib/openid/connect/core/grant_types/hybrid.py,sha256=zUnWGu5H2kRmiOBAjDDL2Ehkrqd1lVlaT4WEB6IsYrI,2714
+oauthlib/openid/connect/core/grant_types/implicit.py,sha256=UICxnDNoePZfTUbL5QCBWA231o8XIQEnxocSrPp9gzw,1971
+oauthlib/openid/connect/core/grant_types/refresh_token.py,sha256=8X0i1EHLgBIrlqP10rwJ5lXWO3f8iupmfn2E6DlLmnw,1035
+oauthlib/openid/connect/core/request_validator.py,sha256=ukfRscjG0zvksOqGhXEDQSX8mk4nfFxRJYKOSZVI1Io,13766
+oauthlib/openid/connect/core/tokens.py,sha256=mynCra3XHwv_MJmt3pBYyHaAU-zP_eLXbGd1o3kNqqA,1558
+oauthlib/signals.py,sha256=-W_28gjwm_sVbn9HCLUcI9xRwe9284GuOIGUAlvOCq0,1496
+oauthlib/uri_validate.py,sha256=vNzraCfSqYLoGbPq5kq-rAxTQ98S4RIcy5g9cRDI3qM,6125
diff --git a/libs/msgpack-1.1.0.dist-info/REQUESTED b/libs/oauthlib-3.3.1.dist-info/REQUESTED
similarity index 100%
rename from libs/msgpack-1.1.0.dist-info/REQUESTED
rename to libs/oauthlib-3.3.1.dist-info/REQUESTED
diff --git a/libs/oauthlib-3.3.1.dist-info/WHEEL b/libs/oauthlib-3.3.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/oauthlib-3.3.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/oauthlib-3.3.1.dist-info/licenses/LICENSE b/libs/oauthlib-3.3.1.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..ffab12676f
--- /dev/null
+++ b/libs/oauthlib-3.3.1.dist-info/licenses/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) The OAuthlib Community
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    3. Neither the name of the copyright holder nor the names of its
+       contributors may be used to endorse or promote products derived from this
+       software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/oauthlib-3.2.2.dist-info/top_level.txt b/libs/oauthlib-3.3.1.dist-info/top_level.txt
similarity index 100%
rename from libs/oauthlib-3.2.2.dist-info/top_level.txt
rename to libs/oauthlib-3.3.1.dist-info/top_level.txt
diff --git a/libs/oauthlib/__init__.py b/libs/oauthlib/__init__.py
index d9a5e38ea0..462612f85e 100644
--- a/libs/oauthlib/__init__.py
+++ b/libs/oauthlib/__init__.py
@@ -5,30 +5,30 @@
     A generic, spec-compliant, thorough implementation of the OAuth
     request-signing logic.
 
-    :copyright: (c) 2019 by The OAuthlib Community
-    :license: BSD, see LICENSE for details.
+    :copyright: (c) The OAuthlib Community
+    :license: BSD-3-Clause, see LICENSE for details.
 """
 import logging
 from logging import NullHandler
 
 __author__ = 'The OAuthlib Community'
-__version__ = '3.2.2'
+__version__ = '3.3.1'
 
 logging.getLogger('oauthlib').addHandler(NullHandler())
 
 _DEBUG = False
 
 def set_debug(debug_val):
-	"""Set value of debug flag
-	
+    """Set value of debug flag
+
     :param debug_val: Value to set. Must be a bool value.
-	"""
-	global _DEBUG
-	_DEBUG = debug_val
+    """
+    global _DEBUG  # noqa: PLW0603
+    _DEBUG = debug_val
 
 def get_debug():
-	"""Get debug mode value. 
-	
-	:return: `True` if debug mode is on, `False` otherwise
-	"""
-	return _DEBUG	
+    """Get debug mode value.
+
+    :return: `True` if debug mode is on, `False` otherwise
+    """
+    return _DEBUG
diff --git a/libs/oauthlib/common.py b/libs/oauthlib/common.py
index 395e75efc9..dfa8517988 100644
--- a/libs/oauthlib/common.py
+++ b/libs/oauthlib/common.py
@@ -34,7 +34,7 @@
 
 always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                'abcdefghijklmnopqrstuvwxyz'
-               '0123456789' '_.-')
+               '0123456789_.-')
 
 log = logging.getLogger('oauthlib')
 
@@ -198,7 +198,7 @@ def generate_token(length=30, chars=UNICODE_ASCII_CHARACTER_SET):
 
 
 def generate_signed_token(private_pem, request):
-    import jwt
+    import jwt  # noqa: PLC0415
 
     now = datetime.datetime.utcnow()
 
@@ -216,7 +216,7 @@ def generate_signed_token(private_pem, request):
 
 
 def verify_signed_token(public_pem, token):
-    import jwt
+    import jwt  # noqa: PLC0415
 
     return jwt.decode(token, public_pem, algorithms=['RS256'])
 
@@ -316,7 +316,7 @@ def __getitem__(self, k):
         return super().__getitem__(key)
 
     def get(self, k, default=None):
-        return self[k] if k in self else default
+        return self[k] if k in self else default  # noqa: SIM401
 
     def __setitem__(self, k, v):
         super().__setitem__(k, v)
@@ -346,7 +346,8 @@ class Request:
     def __init__(self, uri, http_method='GET', body=None, headers=None,
                  encoding='utf-8'):
         # Convert to unicode using encoding if given, else assume unicode
-        encode = lambda x: to_unicode(x, encoding) if encoding else x
+        def encode(x):
+            return to_unicode(x, encoding) if encoding else x
 
         self.uri = encode(uri)
         self.http_method = encode(http_method)
diff --git a/libs/oauthlib/oauth1/rfc5849/__init__.py b/libs/oauthlib/oauth1/rfc5849/__init__.py
index c559251fed..85e0b90b63 100644
--- a/libs/oauthlib/oauth1/rfc5849/__init__.py
+++ b/libs/oauthlib/oauth1/rfc5849/__init__.py
@@ -121,7 +121,8 @@ def __init__(self, client_key,
         :param timestamp: Use this timestamp instead of using current. (Mainly for testing)
         """
         # Convert to unicode using encoding if given, else assume unicode
-        encode = lambda x: to_unicode(x, encoding) if encoding else x
+        def encode(x):
+            return to_unicode(x, encoding) if encoding else x
 
         self.client_key = encode(client_key)
         self.client_secret = encode(client_secret)
@@ -219,7 +220,7 @@ def get_oauth_params(self, request):
         content_type = request.headers.get('Content-Type', None)
         content_type_eligible = content_type and content_type.find('application/x-www-form-urlencoded') < 0
         if request.body is not None and content_type_eligible:
-            params.append(('oauth_body_hash', base64.b64encode(hashlib.sha1(request.body.encode('utf-8')).digest()).decode('utf-8')))
+            params.append(('oauth_body_hash', base64.b64encode(hashlib.sha1(request.body.encode('utf-8')).digest()).decode('utf-8')))  # noqa: S324
 
         return params
 
diff --git a/libs/oauthlib/oauth1/rfc5849/endpoints/base.py b/libs/oauthlib/oauth1/rfc5849/endpoints/base.py
index 7831be7c5e..8d3d89c672 100644
--- a/libs/oauthlib/oauth1/rfc5849/endpoints/base.py
+++ b/libs/oauthlib/oauth1/rfc5849/endpoints/base.py
@@ -69,12 +69,10 @@ def _get_signature_type_and_params(self, request):
     def _create_request(self, uri, http_method, body, headers):
         # Only include body data from x-www-form-urlencoded requests
         headers = CaseInsensitiveDict(headers or {})
-        if ("Content-Type" in headers and
-                CONTENT_TYPE_FORM_URLENCODED in headers["Content-Type"]):
+        if "Content-Type" in headers and CONTENT_TYPE_FORM_URLENCODED in headers["Content-Type"]:  # noqa: SIM108
             request = Request(uri, http_method, body, headers)
         else:
             request = Request(uri, http_method, '', headers)
-
         signature_type, params, oauth_params = (
             self._get_signature_type_and_params(request))
 
@@ -129,8 +127,7 @@ def _check_mandatory_parameters(self, request):
         # Considerations section (`Section 4`_) before deciding on which
         # method to support.
         # .. _`Section 4`: https://tools.ietf.org/html/rfc5849#section-4
-        if (not request.signature_method in
-                self.request_validator.allowed_signature_methods):
+        if (request.signature_method not in self.request_validator.allowed_signature_methods):
             raise errors.InvalidSignatureMethodError(
                 description="Invalid signature, {} not in {!r}.".format(
                     request.signature_method,
@@ -180,9 +177,7 @@ def _check_mandatory_parameters(self, request):
 
     def _check_signature(self, request, is_token_request=False):
         # ---- RSA Signature verification ----
-        if request.signature_method == SIGNATURE_RSA_SHA1 or \
-           request.signature_method == SIGNATURE_RSA_SHA256 or \
-           request.signature_method == SIGNATURE_RSA_SHA512:
+        if request.signature_method in {SIGNATURE_RSA_SHA1, SIGNATURE_RSA_SHA256, SIGNATURE_RSA_SHA512}:
             # RSA-based signature method
 
             # The server verifies the signature per `[RFC3447] section 8.2.2`_
diff --git a/libs/oauthlib/oauth1/rfc5849/signature.py b/libs/oauthlib/oauth1/rfc5849/signature.py
index 9cb1a517ee..a27cb2e76f 100644
--- a/libs/oauthlib/oauth1/rfc5849/signature.py
+++ b/libs/oauthlib/oauth1/rfc5849/signature.py
@@ -45,6 +45,7 @@
 from oauthlib.common import extract_params, safe_string_equals, urldecode
 
 from . import utils
+import contextlib
 
 log = logging.getLogger(__name__)
 
@@ -188,10 +189,9 @@ def base_string_uri(uri: str, host: str = None) -> str:
         raise ValueError('missing host')
 
     # NOTE: Try guessing if we're dealing with IP or hostname
-    try:
+    with contextlib.suppress(ValueError):
         hostname = ipaddress.ip_address(hostname)
-    except ValueError:
-        pass
+
 
     if isinstance(hostname, ipaddress.IPv6Address):
         hostname = f"[{hostname}]"
@@ -568,7 +568,7 @@ def _get_jwt_rsa_algorithm(hash_algorithm_name: str):
         # Not in cache: instantiate a new RSAAlgorithm
 
         # PyJWT has some nice pycrypto/cryptography abstractions
-        import jwt.algorithms as jwt_algorithms
+        import jwt.algorithms as jwt_algorithms  # noqa: PLC0415
         m = {
             'SHA-1': jwt_algorithms.hashes.SHA1,
             'SHA-256': jwt_algorithms.hashes.SHA256,
diff --git a/libs/oauthlib/oauth1/rfc5849/utils.py b/libs/oauthlib/oauth1/rfc5849/utils.py
index 8fb8302e30..0915105bcb 100644
--- a/libs/oauthlib/oauth1/rfc5849/utils.py
+++ b/libs/oauthlib/oauth1/rfc5849/utils.py
@@ -30,7 +30,8 @@ def wrapper(params, *args, **kwargs):
 
 def filter_oauth_params(params):
     """Removes all non oauth parameters from a dict or a list of params."""
-    is_oauth = lambda kv: kv[0].startswith("oauth_")
+    def is_oauth(kv):
+        return kv[0].startswith('oauth_')
     if isinstance(params, dict):
         return list(filter(is_oauth, list(params.items())))
     else:
@@ -59,7 +60,7 @@ def unescape(u):
     return unquote(u)
 
 
-def parse_keqv_list(l):
+def parse_keqv_list(l):  # noqa: E741
     """A unicode-safe version of urllib2.parse_keqv_list"""
     # With Python 2.6, parse_http_list handles unicode fine
     return urllib2.parse_keqv_list(l)
diff --git a/libs/oauthlib/oauth2/__init__.py b/libs/oauthlib/oauth2/__init__.py
index deefb1af78..3bb5102174 100644
--- a/libs/oauthlib/oauth2/__init__.py
+++ b/libs/oauthlib/oauth2/__init__.py
@@ -5,32 +5,66 @@
 This module is a wrapper for the most recent implementation of OAuth 2.0 Client
 and Server classes.
 """
+
 from .rfc6749.clients import (
-    BackendApplicationClient, Client, LegacyApplicationClient,
-    MobileApplicationClient, ServiceApplicationClient, WebApplicationClient,
+    BackendApplicationClient,
+    Client,
+    LegacyApplicationClient,
+    MobileApplicationClient,
+    ServiceApplicationClient,
+    WebApplicationClient,
 )
 from .rfc6749.endpoints import (
-    AuthorizationEndpoint, BackendApplicationServer, IntrospectEndpoint,
-    LegacyApplicationServer, MetadataEndpoint, MobileApplicationServer,
-    ResourceEndpoint, RevocationEndpoint, Server, TokenEndpoint,
+    AuthorizationEndpoint,
+    BackendApplicationServer,
+    IntrospectEndpoint,
+    LegacyApplicationServer,
+    MetadataEndpoint,
+    MobileApplicationServer,
+    ResourceEndpoint,
+    RevocationEndpoint,
+    Server,
+    TokenEndpoint,
     WebApplicationServer,
 )
 from .rfc6749.errors import (
-    AccessDeniedError, FatalClientError, InsecureTransportError,
-    InvalidClientError, InvalidClientIdError, InvalidGrantError,
-    InvalidRedirectURIError, InvalidRequestError, InvalidRequestFatalError,
-    InvalidScopeError, MismatchingRedirectURIError, MismatchingStateError,
-    MissingClientIdError, MissingCodeError, MissingRedirectURIError,
-    MissingResponseTypeError, MissingTokenError, MissingTokenTypeError,
-    OAuth2Error, ServerError, TemporarilyUnavailableError, TokenExpiredError,
-    UnauthorizedClientError, UnsupportedGrantTypeError,
-    UnsupportedResponseTypeError, UnsupportedTokenTypeError,
+    AccessDeniedError,
+    FatalClientError,
+    InsecureTransportError,
+    InvalidClientError,
+    InvalidClientIdError,
+    InvalidGrantError,
+    InvalidRedirectURIError,
+    InvalidRequestError,
+    InvalidRequestFatalError,
+    InvalidScopeError,
+    MismatchingRedirectURIError,
+    MismatchingStateError,
+    MissingClientIdError,
+    MissingCodeError,
+    MissingRedirectURIError,
+    MissingResponseTypeError,
+    MissingTokenError,
+    MissingTokenTypeError,
+    OAuth2Error,
+    ServerError,
+    TemporarilyUnavailableError,
+    TokenExpiredError,
+    UnauthorizedClientError,
+    UnsupportedGrantTypeError,
+    UnsupportedResponseTypeError,
+    UnsupportedTokenTypeError,
 )
 from .rfc6749.grant_types import (
-    AuthorizationCodeGrant, ClientCredentialsGrant, ImplicitGrant,
-    RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant,
+    AuthorizationCodeGrant,
+    ClientCredentialsGrant,
+    ImplicitGrant,
+    RefreshTokenGrant,
+    ResourceOwnerPasswordCredentialsGrant,
 )
 from .rfc6749.request_validator import RequestValidator
 from .rfc6749.tokens import BearerToken, OAuth2Token
 from .rfc6749.utils import is_secure_transport
 from .rfc8628.clients import DeviceClient
+from oauthlib.oauth2.rfc8628.endpoints import DeviceAuthorizationEndpoint, DeviceApplicationServer
+from oauthlib.oauth2.rfc8628.grant_types import DeviceCodeGrant
diff --git a/libs/oauthlib/oauth2/rfc6749/clients/base.py b/libs/oauthlib/oauth2/rfc6749/clients/base.py
index d5eb0cc15f..17f833d236 100644
--- a/libs/oauthlib/oauth2/rfc6749/clients/base.py
+++ b/libs/oauthlib/oauth2/rfc6749/clients/base.py
@@ -8,17 +8,16 @@
 """
 import base64
 import hashlib
-import re
-import secrets
 import time
 import warnings
 
-from oauthlib.common import generate_token
+from oauthlib.common import UNICODE_ASCII_CHARACTER_SET, generate_token
 from oauthlib.oauth2.rfc6749 import tokens
 from oauthlib.oauth2.rfc6749.errors import (
     InsecureTransportError, TokenExpiredError,
 )
 from oauthlib.oauth2.rfc6749.parameters import (
+    parse_expires,
     parse_token_response, prepare_token_request,
     prepare_token_revocation_request,
 )
@@ -207,7 +206,7 @@ def add_token(self, uri, http_method='GET', body=None, headers=None,
 
         case_insensitive_token_types = {
             k.lower(): v for k, v in self.token_types.items()}
-        if not self.token_type.lower() in case_insensitive_token_types:
+        if self.token_type.lower() not in case_insensitive_token_types:
             raise ValueError("Unsupported token type: %s" % self.token_type)
 
         if not (self.access_token or self.token.get('access_token')):
@@ -466,7 +465,7 @@ def _add_bearer_token(self, uri, http_method='GET', body=None,
         return uri, headers, body
 
     def create_code_verifier(self, length):
-        """Create PKCE **code_verifier** used in computing **code_challenge**. 
+        """Create PKCE **code_verifier** used in computing **code_challenge**.
         See `RFC7636 Section 4.1`_
 
         :param length: REQUIRED. The length of the code_verifier.
@@ -491,11 +490,7 @@ def create_code_verifier(self, length):
         if not length <= 128:
             raise ValueError("Length must be less than or equal to 128")
 
-        allowed_characters = re.compile('^[A-Zaa-z0-9-._~]')
-        code_verifier = secrets.token_urlsafe(length)
-
-        if not re.search(allowed_characters, code_verifier):
-            raise ValueError("code_verifier contains invalid characters")
+        code_verifier = generate_token(length, UNICODE_ASCII_CHARACTER_SET + "-._~")
 
         self.code_verifier = code_verifier
 
@@ -530,10 +525,10 @@ def create_code_challenge(self, code_verifier, code_challenge_method=None):
         """
         code_challenge = None
 
-        if code_verifier == None:
+        if code_verifier is None:
             raise ValueError("Invalid code_verifier")
 
-        if code_challenge_method == None:
+        if code_challenge_method is None:
             code_challenge_method = "plain"
             self.code_challenge_method = code_challenge_method
             code_challenge = code_verifier
@@ -587,15 +582,13 @@ def populate_token_attributes(self, response):
         if 'token_type' in response:
             self.token_type = response.get('token_type')
 
-        if 'expires_in' in response:
-            self.expires_in = response.get('expires_in')
-            self._expires_at = time.time() + int(self.expires_in)
-
-        if 'expires_at' in response:
-            try:
-                self._expires_at = int(response.get('expires_at'))
-            except:
-                self._expires_at = None
+        vin, vat, v_at = parse_expires(response)
+        if vin:
+            self.expires_in = vin
+        if vat:
+            self.expires_at = vat
+        if v_at:
+            self._expires_at = v_at
 
         if 'mac_key' in response:
             self.mac_key = response.get('mac_key')
diff --git a/libs/oauthlib/oauth2/rfc6749/clients/mobile_application.py b/libs/oauthlib/oauth2/rfc6749/clients/mobile_application.py
index b10b41ced3..023cf23623 100644
--- a/libs/oauthlib/oauth2/rfc6749/clients/mobile_application.py
+++ b/libs/oauthlib/oauth2/rfc6749/clients/mobile_application.py
@@ -43,7 +43,7 @@ class MobileApplicationClient(Client):
     redirection URI, it may be exposed to the resource owner and other
     applications residing on the same device.
     """
-    
+
     response_type = 'token'
 
     def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
diff --git a/libs/oauthlib/oauth2/rfc6749/clients/service_application.py b/libs/oauthlib/oauth2/rfc6749/clients/service_application.py
index 8fb173776d..abf22d2d8e 100644
--- a/libs/oauthlib/oauth2/rfc6749/clients/service_application.py
+++ b/libs/oauthlib/oauth2/rfc6749/clients/service_application.py
@@ -91,7 +91,7 @@ def prepare_request_body(self,
                          ``https://provider.com/oauth2/token``.
 
         :param expires_at: A unix expiration timestamp for the JWT. Defaults
-                           to an hour from now, i.e. ``time.time() + 3600``.
+                           to an hour from now, i.e. ``round(time.time()) + 3600``.
 
         :param issued_at: A unix timestamp of when the JWT was created.
                           Defaults to now, i.e. ``time.time()``.
@@ -149,7 +149,7 @@ def prepare_request_body(self,
 
         .. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
         """
-        import jwt
+        import jwt  # noqa: PLC0415
 
         key = private_key or self.private_key
         if not key:
diff --git a/libs/oauthlib/oauth2/rfc6749/clients/web_application.py b/libs/oauthlib/oauth2/rfc6749/clients/web_application.py
index 50890fbf8a..3bf94c4b51 100644
--- a/libs/oauthlib/oauth2/rfc6749/clients/web_application.py
+++ b/libs/oauthlib/oauth2/rfc6749/clients/web_application.py
@@ -33,7 +33,7 @@ class WebApplicationClient(Client):
     browser) and capable of receiving incoming requests (via redirection)
     from the authorization server.
     """
-    
+
     grant_type = 'authorization_code'
 
     def __init__(self, client_id, code=None, **kwargs):
@@ -62,8 +62,8 @@ def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
                         to the client.  The parameter SHOULD be used for preventing
                         cross-site request forgery as described in `Section 10.12`_.
 
-        :param code_challenge: OPTIONAL. PKCE parameter. REQUIRED if PKCE is enforced. 
-                        A challenge derived from the code_verifier that is sent in the 
+        :param code_challenge: OPTIONAL. PKCE parameter. REQUIRED if PKCE is enforced.
+                        A challenge derived from the code_verifier that is sent in the
                         authorization request, to be verified against later.
 
         :param code_challenge_method: OPTIONAL. PKCE parameter. A method that was used to derive code challenge.
diff --git a/libs/oauthlib/oauth2/rfc6749/endpoints/base.py b/libs/oauthlib/oauth2/rfc6749/endpoints/base.py
index 3f239917cb..987fac6a8f 100644
--- a/libs/oauthlib/oauth2/rfc6749/endpoints/base.py
+++ b/libs/oauthlib/oauth2/rfc6749/endpoints/base.py
@@ -32,7 +32,7 @@ def valid_request_methods(self, valid_request_methods):
         if valid_request_methods is not None:
             valid_request_methods = [x.upper() for x in valid_request_methods]
         self._valid_request_methods = valid_request_methods
-    
+
 
     @property
     def available(self):
@@ -40,7 +40,7 @@ def available(self):
 
     @available.setter
     def available(self, available):
-        self._available = available       
+        self._available = available
 
     @property
     def catch_errors(self):
diff --git a/libs/oauthlib/oauth2/rfc6749/endpoints/introspect.py b/libs/oauthlib/oauth2/rfc6749/endpoints/introspect.py
index 3cc61e6627..ef73988d48 100644
--- a/libs/oauthlib/oauth2/rfc6749/endpoints/introspect.py
+++ b/libs/oauthlib/oauth2/rfc6749/endpoints/introspect.py
@@ -74,7 +74,7 @@ def create_introspect_response(self, uri, http_method='POST', body=None,
             request
         )
         if claims is None:
-            return resp_headers, json.dumps(dict(active=False)), 200
+            return resp_headers, json.dumps({'active': False}), 200
         if "active" in claims:
             claims.pop("active")
         return resp_headers, json.dumps(dict(active=True, **claims)), 200
diff --git a/libs/oauthlib/oauth2/rfc6749/endpoints/metadata.py b/libs/oauthlib/oauth2/rfc6749/endpoints/metadata.py
index a2820f28a5..34274cba67 100644
--- a/libs/oauthlib/oauth2/rfc6749/endpoints/metadata.py
+++ b/libs/oauthlib/oauth2/rfc6749/endpoints/metadata.py
@@ -38,9 +38,9 @@ class MetadataEndpoint(BaseEndpoint):
    """
 
     def __init__(self, endpoints, claims={}, raise_errors=True):
-        assert isinstance(claims, dict)
+        assert isinstance(claims, dict)  # noqa: S101
         for endpoint in endpoints:
-            assert isinstance(endpoint, BaseEndpoint)
+            assert isinstance(endpoint, BaseEndpoint)  # noqa: S101
 
         BaseEndpoint.__init__(self)
         self.raise_errors = raise_errors
diff --git a/libs/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py b/libs/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
index d64a166391..8f6aa32b74 100644
--- a/libs/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
+++ b/libs/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
@@ -5,9 +5,13 @@
 This module is an implementation of various endpoints needed
 for providing OAuth 2.0 RFC6749 servers.
 """
+
 from ..grant_types import (
-    AuthorizationCodeGrant, ClientCredentialsGrant, ImplicitGrant,
-    RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant,
+    AuthorizationCodeGrant,
+    ClientCredentialsGrant,
+    ImplicitGrant,
+    RefreshTokenGrant,
+    ResourceOwnerPasswordCredentialsGrant,
 )
 from ..tokens import BearerToken
 from .authorization import AuthorizationEndpoint
@@ -15,16 +19,26 @@
 from .resource import ResourceEndpoint
 from .revocation import RevocationEndpoint
 from .token import TokenEndpoint
+from oauthlib.oauth2.rfc8628.grant_types import DeviceCodeGrant
 
 
-class Server(AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint,
-             ResourceEndpoint, RevocationEndpoint):
-
-    """An all-in-one endpoint featuring all four major grant types."""
+class Server(
+    AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint, ResourceEndpoint, RevocationEndpoint
+):
+    """
+    An all-in-one endpoint featuring all four major grant types
+    and extension grants.
+    """
 
-    def __init__(self, request_validator, token_expires_in=None,
-                 token_generator=None, refresh_token_generator=None,
-                 *args, **kwargs):
+    def __init__(
+        self,
+        request_validator,
+        token_expires_in=None,
+        token_generator=None,
+        refresh_token_generator=None,
+        *args,
+        **kwargs,
+    ):
         """Construct a new all-grants-in-one server.
 
         :param request_validator: An implementation of
@@ -40,43 +54,58 @@ def __init__(self, request_validator, token_expires_in=None,
         """
         self.auth_grant = AuthorizationCodeGrant(request_validator)
         self.implicit_grant = ImplicitGrant(request_validator)
-        self.password_grant = ResourceOwnerPasswordCredentialsGrant(
-            request_validator)
+        self.password_grant = ResourceOwnerPasswordCredentialsGrant(request_validator)
         self.credentials_grant = ClientCredentialsGrant(request_validator)
         self.refresh_grant = RefreshTokenGrant(request_validator)
+        self.device_code_grant = DeviceCodeGrant(request_validator, **kwargs)
+
+        self.bearer = BearerToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
+
+        AuthorizationEndpoint.__init__(
+            self,
+            default_response_type="code",
+            response_types={
+                "code": self.auth_grant,
+                "token": self.implicit_grant,
+                "none": self.auth_grant,
+            },
+            default_token_type=self.bearer,
+        )
 
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-
-        AuthorizationEndpoint.__init__(self, default_response_type='code',
-                                       response_types={
-                                           'code': self.auth_grant,
-                                           'token': self.implicit_grant,
-                                           'none': self.auth_grant
-                                       },
-                                       default_token_type=self.bearer)
-
-        TokenEndpoint.__init__(self, default_grant_type='authorization_code',
-                               grant_types={
-                                   'authorization_code': self.auth_grant,
-                                   'password': self.password_grant,
-                                   'client_credentials': self.credentials_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
+        TokenEndpoint.__init__(
+            self,
+            default_grant_type="authorization_code",
+            grant_types={
+                "authorization_code": self.auth_grant,
+                "password": self.password_grant,
+                "client_credentials": self.credentials_grant,
+                "refresh_token": self.refresh_grant,
+                "urn:ietf:params:oauth:grant-type:device_code": self.device_code_grant,
+            },
+            default_token_type=self.bearer,
+        )
+        ResourceEndpoint.__init__(
+            self, default_token="Bearer", token_types={"Bearer": self.bearer}
+        )
         RevocationEndpoint.__init__(self, request_validator)
         IntrospectEndpoint.__init__(self, request_validator)
 
 
-class WebApplicationServer(AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint,
-                           ResourceEndpoint, RevocationEndpoint):
-
+class WebApplicationServer(
+    AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint, ResourceEndpoint, RevocationEndpoint
+):
     """An all-in-one endpoint featuring Authorization code grant and Bearer tokens."""
 
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
+    def __init__(
+        self,
+        request_validator,
+        token_generator=None,
+        token_expires_in=None,
+        refresh_token_generator=None,
+        **kwargs,
+    ):
         """Construct a new web application server.
 
         :param request_validator: An implementation of
@@ -92,30 +121,44 @@ def __init__(self, request_validator, token_generator=None,
         """
         self.auth_grant = AuthorizationCodeGrant(request_validator)
         self.refresh_grant = RefreshTokenGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        AuthorizationEndpoint.__init__(self, default_response_type='code',
-                                       response_types={'code': self.auth_grant},
-                                       default_token_type=self.bearer)
-        TokenEndpoint.__init__(self, default_grant_type='authorization_code',
-                               grant_types={
-                                   'authorization_code': self.auth_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
+        self.bearer = BearerToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
+        AuthorizationEndpoint.__init__(
+            self,
+            default_response_type="code",
+            response_types={"code": self.auth_grant},
+            default_token_type=self.bearer,
+        )
+        TokenEndpoint.__init__(
+            self,
+            default_grant_type="authorization_code",
+            grant_types={
+                "authorization_code": self.auth_grant,
+                "refresh_token": self.refresh_grant,
+            },
+            default_token_type=self.bearer,
+        )
+        ResourceEndpoint.__init__(
+            self, default_token="Bearer", token_types={"Bearer": self.bearer}
+        )
         RevocationEndpoint.__init__(self, request_validator)
         IntrospectEndpoint.__init__(self, request_validator)
 
 
-class MobileApplicationServer(AuthorizationEndpoint, IntrospectEndpoint,
-                              ResourceEndpoint, RevocationEndpoint):
-
+class MobileApplicationServer(
+    AuthorizationEndpoint, IntrospectEndpoint, ResourceEndpoint, RevocationEndpoint
+):
     """An all-in-one endpoint featuring Implicit code grant and Bearer tokens."""
 
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
+    def __init__(
+        self,
+        request_validator,
+        token_generator=None,
+        token_expires_in=None,
+        refresh_token_generator=None,
+        **kwargs,
+    ):
         """Construct a new implicit grant server.
 
         :param request_validator: An implementation of
@@ -130,27 +173,39 @@ def __init__(self, request_validator, token_generator=None,
                        token-, resource-, and revocation-endpoint constructors.
         """
         self.implicit_grant = ImplicitGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        AuthorizationEndpoint.__init__(self, default_response_type='token',
-                                       response_types={
-                                           'token': self.implicit_grant},
-                                       default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
-        IntrospectEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
-
-
-class LegacyApplicationServer(TokenEndpoint, IntrospectEndpoint,
-                              ResourceEndpoint, RevocationEndpoint):
+        self.bearer = BearerToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
+        AuthorizationEndpoint.__init__(
+            self,
+            default_response_type="token",
+            response_types={"token": self.implicit_grant},
+            default_token_type=self.bearer,
+        )
+        ResourceEndpoint.__init__(
+            self, default_token="Bearer", token_types={"Bearer": self.bearer}
+        )
+        RevocationEndpoint.__init__(
+            self, request_validator, supported_token_types=["access_token"]
+        )
+        IntrospectEndpoint.__init__(
+            self, request_validator, supported_token_types=["access_token"]
+        )
 
+
+class LegacyApplicationServer(
+    TokenEndpoint, IntrospectEndpoint, ResourceEndpoint, RevocationEndpoint
+):
     """An all-in-one endpoint featuring Resource Owner Password Credentials grant and Bearer tokens."""
 
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
+    def __init__(
+        self,
+        request_validator,
+        token_generator=None,
+        token_expires_in=None,
+        refresh_token_generator=None,
+        **kwargs,
+    ):
         """Construct a resource owner password credentials grant server.
 
         :param request_validator: An implementation of
@@ -164,30 +219,40 @@ def __init__(self, request_validator, token_generator=None,
         :param kwargs: Extra parameters to pass to authorization-,
                        token-, resource-, and revocation-endpoint constructors.
         """
-        self.password_grant = ResourceOwnerPasswordCredentialsGrant(
-            request_validator)
+        self.password_grant = ResourceOwnerPasswordCredentialsGrant(request_validator)
         self.refresh_grant = RefreshTokenGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        TokenEndpoint.__init__(self, default_grant_type='password',
-                               grant_types={
-                                   'password': self.password_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
+        self.bearer = BearerToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
+        TokenEndpoint.__init__(
+            self,
+            default_grant_type="password",
+            grant_types={
+                "password": self.password_grant,
+                "refresh_token": self.refresh_grant,
+            },
+            default_token_type=self.bearer,
+        )
+        ResourceEndpoint.__init__(
+            self, default_token="Bearer", token_types={"Bearer": self.bearer}
+        )
         RevocationEndpoint.__init__(self, request_validator)
         IntrospectEndpoint.__init__(self, request_validator)
 
 
-class BackendApplicationServer(TokenEndpoint, IntrospectEndpoint,
-                               ResourceEndpoint, RevocationEndpoint):
-
+class BackendApplicationServer(
+    TokenEndpoint, IntrospectEndpoint, ResourceEndpoint, RevocationEndpoint
+):
     """An all-in-one endpoint featuring Client Credentials grant and Bearer tokens."""
 
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
+    def __init__(
+        self,
+        request_validator,
+        token_generator=None,
+        token_expires_in=None,
+        refresh_token_generator=None,
+        **kwargs,
+    ):
         """Construct a client credentials grant server.
 
         :param request_validator: An implementation of
@@ -202,15 +267,21 @@ def __init__(self, request_validator, token_generator=None,
                        token-, resource-, and revocation-endpoint constructors.
         """
         self.credentials_grant = ClientCredentialsGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        TokenEndpoint.__init__(self, default_grant_type='client_credentials',
-                               grant_types={
-                                   'client_credentials': self.credentials_grant},
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
-        IntrospectEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
+        self.bearer = BearerToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
+        TokenEndpoint.__init__(
+            self,
+            default_grant_type="client_credentials",
+            grant_types={"client_credentials": self.credentials_grant},
+            default_token_type=self.bearer,
+        )
+        ResourceEndpoint.__init__(
+            self, default_token="Bearer", token_types={"Bearer": self.bearer}
+        )
+        RevocationEndpoint.__init__(
+            self, request_validator, supported_token_types=["access_token"]
+        )
+        IntrospectEndpoint.__init__(
+            self, request_validator, supported_token_types=["access_token"]
+        )
diff --git a/libs/oauthlib/oauth2/rfc6749/endpoints/resource.py b/libs/oauthlib/oauth2/rfc6749/endpoints/resource.py
index f7562255df..d1ff5049d8 100644
--- a/libs/oauthlib/oauth2/rfc6749/endpoints/resource.py
+++ b/libs/oauthlib/oauth2/rfc6749/endpoints/resource.py
@@ -81,4 +81,4 @@ def find_token_type(self, request):
         """
         estimates = sorted(((t.estimate_type(request), n)
                             for n, t in self.tokens.items()), reverse=True)
-        return estimates[0][1] if len(estimates) else None
+        return estimates[0][1] if estimates else None
diff --git a/libs/oauthlib/oauth2/rfc6749/errors.py b/libs/oauthlib/oauth2/rfc6749/errors.py
index da24feab75..be8e7a1ec6 100644
--- a/libs/oauthlib/oauth2/rfc6749/errors.py
+++ b/libs/oauthlib/oauth2/rfc6749/errors.py
@@ -6,6 +6,8 @@
 defined error responses for all four core grant types.
 """
 import json
+import inspect
+import sys
 
 from oauthlib.common import add_params_to_uri, urlencode
 
@@ -60,7 +62,7 @@ def __init__(self, description=None, uri=None, state=None,
             self.response_type = request.response_type
             self.response_mode = request.response_mode
             self.grant_type = request.grant_type
-            if not state:
+            if state is None:
                 self.state = request.state
         else:
             self.redirect_uri = None
@@ -150,7 +152,6 @@ class FatalClientError(OAuth2Error):
 
     Instead the user should be informed of the error by the provider itself.
     """
-    pass
 
 
 class InvalidRequestFatalError(FatalClientError):
@@ -387,8 +388,6 @@ def __init__(self, error, *args, **kwargs):
 
 
 def raise_from_error(error, params=None):
-    import inspect
-    import sys
     kwargs = {
         'description': params.get('error_description'),
         'uri': params.get('error_uri'),
diff --git a/libs/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py b/libs/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
index 858855a174..09dc619988 100644
--- a/libs/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
+++ b/libs/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
@@ -387,7 +387,7 @@ def validate_authorization_request(self, request):
             raise errors.MissingResponseTypeError(request=request)
         # Value MUST be set to "code" or one of the OpenID authorization code including
         # response_types "code token", "code id_token", "code token id_token"
-        elif not 'code' in request.response_type and request.response_type != 'none':
+        elif 'code' not in request.response_type and request.response_type != 'none':
             raise errors.UnsupportedResponseTypeError(request=request)
 
         if not self.request_validator.validate_response_type(request.client_id,
@@ -400,9 +400,8 @@ def validate_authorization_request(self, request):
 
         # OPTIONAL. Validate PKCE request or reply with "error"/"invalid_request"
         # https://tools.ietf.org/html/rfc6749#section-4.4.1
-        if self.request_validator.is_pkce_required(request.client_id, request) is True:
-            if request.code_challenge is None:
-                raise errors.MissingCodeChallengeError(request=request)
+        if self.request_validator.is_pkce_required(request.client_id, request) is True and request.code_challenge is None:
+            raise errors.MissingCodeChallengeError(request=request)
 
         if request.code_challenge is not None:
             request_info["code_challenge"] = request.code_challenge
diff --git a/libs/oauthlib/oauth2/rfc6749/grant_types/base.py b/libs/oauthlib/oauth2/rfc6749/grant_types/base.py
index ca343a1193..d96a2db4fa 100644
--- a/libs/oauthlib/oauth2/rfc6749/grant_types/base.py
+++ b/libs/oauthlib/oauth2/rfc6749/grant_types/base.py
@@ -143,7 +143,7 @@ def add_token(self, token, token_handler, request):
         :type request: oauthlib.common.Request
         """
         # Only add a hybrid access token on auth step if asked for
-        if not request.response_type in ["token", "code token", "id_token token", "code id_token token"]:
+        if request.response_type not in ["token", "code token", "id_token token", "code id_token token"]:
             return token
 
         token.update(token_handler.create_token(request, refresh_token=False))
@@ -199,10 +199,7 @@ def prepare_authorization_response(self, request, token, headers, body, status):
 
         if request.response_type == 'none':
             state = token.get('state', None)
-            if state:
-                token_items = [('state', state)]
-            else:
-                token_items = []
+            token_items = [('state', state)] if state else []
 
         if request.response_mode == 'query':
             headers['Location'] = add_params_to_uri(
diff --git a/libs/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py b/libs/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
index e7b4618977..35c544027e 100644
--- a/libs/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
+++ b/libs/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
@@ -107,11 +107,10 @@ def validate_token_request(self, request):
         if not self.request_validator.authenticate_client(request):
             log.debug('Client authentication failed, %r.', request)
             raise errors.InvalidClientError(request=request)
-        else:
-            if not hasattr(request.client, 'client_id'):
-                raise NotImplementedError('Authenticate client must set the '
-                                          'request.client.client_id attribute '
-                                          'in authenticate_client.')
+        elif not hasattr(request.client, 'client_id'):
+            raise NotImplementedError('Authenticate client must set the '
+                                      'request.client.client_id attribute '
+                                      'in authenticate_client.')
         # Ensure client is authorized use of this grant type
         self.validate_grant_type(request)
 
diff --git a/libs/oauthlib/oauth2/rfc6749/grant_types/implicit.py b/libs/oauthlib/oauth2/rfc6749/grant_types/implicit.py
index 6110b6f337..cd3bfeb643 100644
--- a/libs/oauthlib/oauth2/rfc6749/grant_types/implicit.py
+++ b/libs/oauthlib/oauth2/rfc6749/grant_types/implicit.py
@@ -233,10 +233,7 @@ def create_token_response(self, request, token_handler):
         # In OIDC implicit flow it is possible to have a request_type that does not include the access_token!
         # "id_token token" - return the access token and the id token
         # "id_token" - don't return the access token
-        if "token" in request.response_type.split():
-            token = token_handler.create_token(request, refresh_token=False)
-        else:
-            token = {}
+        token = token_handler.create_token(request, refresh_token=False) if 'token' in request.response_type.split() else {}
 
         if request.state is not None:
             token['state'] = request.state
diff --git a/libs/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py b/libs/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
index ce33df0e7d..43bf55ac90 100644
--- a/libs/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
+++ b/libs/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
@@ -101,6 +101,9 @@ def validate_token_request(self, request):
             if not self.request_validator.authenticate_client(request):
                 log.debug('Invalid client (%r), denying access.', request)
                 raise errors.InvalidClientError(request=request)
+            # Ensure that request.client_id is set.
+            if request.client_id is None and request.client is not None:
+                request.client_id = request.client.client_id
         elif not self.request_validator.authenticate_client_id(request.client_id, request):
             log.debug('Client authentication failed, %r.', request)
             raise errors.InvalidClientError(request=request)
diff --git a/libs/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py b/libs/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
index 4b0de5bf6f..55d928709a 100644
--- a/libs/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
+++ b/libs/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
@@ -180,12 +180,11 @@ def validate_token_request(self, request):
                                                     request.password, request.client, request):
             raise errors.InvalidGrantError(
                 'Invalid credentials given.', request=request)
-        else:
-            if not hasattr(request.client, 'client_id'):
-                raise NotImplementedError(
-                    'Validate user must set the '
-                    'request.client.client_id attribute '
-                    'in authenticate_client.')
+        elif not hasattr(request.client, 'client_id'):
+            raise NotImplementedError(
+                'Validate user must set the '
+                'request.client.client_id attribute '
+                'in authenticate_client.')
         log.debug('Authorizing access to user %r.', request.user)
 
         # Ensure client is authorized use of this grant type
diff --git a/libs/oauthlib/oauth2/rfc6749/parameters.py b/libs/oauthlib/oauth2/rfc6749/parameters.py
index 8f6ce2c7fc..8268ef927c 100644
--- a/libs/oauthlib/oauth2/rfc6749/parameters.py
+++ b/libs/oauthlib/oauth2/rfc6749/parameters.py
@@ -45,10 +45,10 @@ def prepare_grant_uri(uri, client_id, response_type, redirect_uri=None,
                   back to the client.  The parameter SHOULD be used for
                   preventing cross-site request forgery as described in
                   `Section 10.12`_.
-    :param code_challenge: PKCE parameter. A challenge derived from the 
-                           code_verifier that is sent in the authorization 
+    :param code_challenge: PKCE parameter. A challenge derived from the
+                           code_verifier that is sent in the authorization
                            request, to be verified against later.
-    :param code_challenge_method: PKCE parameter. A method that was used to derive the 
+    :param code_challenge_method: PKCE parameter. A method that was used to derive the
                                   code_challenge. Defaults to "plain" if not present in the request.
     :param kwargs: Extra arguments to embed in the grant/authorization URL.
 
@@ -150,9 +150,8 @@ def prepare_token_request(grant_type, body='', include_client_id=True, code_veri
 
     # pull the `client_id` out of the kwargs.
     client_id = kwargs.pop('client_id', None)
-    if include_client_id:
-        if client_id is not None:
-            params.append(('client_id', client_id))
+    if include_client_id and client_id is not None:
+        params.append(('client_id', client_id))
 
     # use code_verifier if code_challenge was passed in the authorization request
     if code_verifier is not None:
@@ -274,13 +273,13 @@ def parse_authorization_code_response(uri, state=None):
     query = urlparse.urlparse(uri).query
     params = dict(urlparse.parse_qsl(query))
 
-    if state and params.get('state', None) != state:
+    if state and params.get('state') != state:
         raise MismatchingStateError()
 
     if 'error' in params:
         raise_from_error(params.get('error'), params)
 
-    if not 'code' in params:
+    if 'code' not in params:
         raise MissingCodeError("Missing code parameter in response.")
 
     return params
@@ -337,17 +336,20 @@ def parse_implicit_response(uri, state=None, scope=None):
     fragment = urlparse.urlparse(uri).fragment
     params = dict(urlparse.parse_qsl(fragment, keep_blank_values=True))
 
-    for key in ('expires_in',):
-        if key in params:  # cast things to int
-            params[key] = int(params[key])
-
     if 'scope' in params:
         params['scope'] = scope_to_list(params['scope'])
 
-    if 'expires_in' in params:
-        params['expires_at'] = time.time() + int(params['expires_in'])
-
-    if state and params.get('state', None) != state:
+    vin, vat, v_at = parse_expires(params)
+    if vin:
+        params['expires_in'] = vin
+    elif 'expires_in' in params:
+        params.pop('expires_in')
+    if vat:
+        params['expires_at'] = vat
+    elif 'expires_at' in params:
+        params.pop('expires_at')
+
+    if state and params.get('state') != state:
         raise ValueError("Mismatching or missing state in params.")
 
     params = OAuth2Token(params, old_scope=scope)
@@ -424,18 +426,19 @@ def parse_token_response(body, scope=None):
         #   https://github.com/oauthlib/oauthlib/issues/267
 
         params = dict(urlparse.parse_qsl(body))
-        for key in ('expires_in',):
-            if key in params:  # cast things to int
-                params[key] = int(params[key])
 
     if 'scope' in params:
         params['scope'] = scope_to_list(params['scope'])
 
-    if 'expires_in' in params:
-        if params['expires_in'] is None:
-            params.pop('expires_in')
-        else:
-            params['expires_at'] = time.time() + int(params['expires_in'])
+    vin, vat, v_at = parse_expires(params)
+    if vin:
+        params['expires_in'] = vin
+    elif 'expires_in' in params:
+        params.pop('expires_in')
+    if vat:
+        params['expires_at'] = vat
+    elif 'expires_at' in params:
+        params.pop('expires_at')
 
     params = OAuth2Token(params, old_scope=scope)
     validate_token_parameters(params)
@@ -447,12 +450,11 @@ def validate_token_parameters(params):
     if 'error' in params:
         raise_from_error(params.get('error'), params)
 
-    if not 'access_token' in params:
+    if 'access_token' not in params:
         raise MissingTokenError(description="Missing access token parameter.")
 
-    if not 'token_type' in params:
-        if os.environ.get('OAUTHLIB_STRICT_TOKEN_TYPE'):
-            raise MissingTokenTypeError()
+    if 'token_type' not in params and os.environ.get('OAUTHLIB_STRICT_TOKEN_TYPE'):
+        raise MissingTokenTypeError()
 
     # If the issued access token scope is different from the one requested by
     # the client, the authorization server MUST include the "scope" response
@@ -469,3 +471,58 @@ def validate_token_parameters(params):
             w.old_scope = params.old_scopes
             w.new_scope = params.scopes
             raise w
+
+def parse_expires(params):
+    """Parse `expires_in`, `expires_at` fields from params
+
+    Parse following these rules:
+    - `expires_in` must be either integer, float or None. If a float, it is converted into an integer.
+    - `expires_at` is not in specification so it does its best to:
+      - convert into a int, else
+      - convert into a float, else
+      - reuse the same type as-is (usually string)
+    - `_expires_at` is a special internal value returned to be always an `int`, based
+    either on the presence of `expires_at`, or reuse the current time plus
+    `expires_in`. This is typically used to validate token expiry.
+
+    :param params: Dict with expires_in and expires_at optionally set
+    :return: Tuple of `expires_in`, `expires_at`, and `_expires_at`. None if not set.
+    """
+    expires_in = None
+    expires_at = None
+    _expires_at = None
+
+    if 'expires_in' in params:
+        if isinstance(params.get('expires_in'), int):
+            expires_in = params.get('expires_in')
+        elif isinstance(params.get('expires_in'), float):
+            expires_in = int(params.get('expires_in'))
+        elif isinstance(params.get('expires_in'), str):
+            try:
+                # Attempt to convert to int
+                expires_in = int(params.get('expires_in'))
+            except ValueError:
+                raise ValueError("expires_in must be an int")
+        elif params.get('expires_in') is not None:
+            raise ValueError("expires_in must be an int")
+
+    if 'expires_at' in params:
+        if isinstance(params.get('expires_at'), (float, int)):
+            expires_at = params.get('expires_at')
+            _expires_at = expires_at
+        elif isinstance(params.get('expires_at'), str):
+            try:
+                # Attempt to convert to int first, then float if int fails
+                expires_at = int(params.get('expires_at'))
+                _expires_at = expires_at
+            except ValueError:
+                try:
+                    expires_at = float(params.get('expires_at'))
+                    _expires_at = expires_at
+                except ValueError:
+                    # no change from str
+                    expires_at = params.get('expires_at')
+    if _expires_at is None and expires_in:
+        expires_at = round(time.time()) + expires_in
+        _expires_at = expires_at
+    return expires_in, expires_at, _expires_at
diff --git a/libs/oauthlib/oauth2/rfc6749/request_validator.py b/libs/oauthlib/oauth2/rfc6749/request_validator.py
index 3910c0b918..6d6ebaa8e9 100644
--- a/libs/oauthlib/oauth2/rfc6749/request_validator.py
+++ b/libs/oauthlib/oauth2/rfc6749/request_validator.py
@@ -48,12 +48,12 @@ def authenticate_client(self, request, *args, **kwargs):
         Headers may be accesses through request.headers and parameters found in
         both body and query can be obtained by direct attribute access, i.e.
         request.client_id for client_id in the URL query.
-		
+
         The authentication process is required to contain the identification of
         the client (i.e. search the database based on the client_id). In case the
         client doesn't exist based on the received client_id, this method has to
         return False and the HTTP response created by the library will contain
-        'invalid_client' message. 
+        'invalid_client' message.
 
         After the client identification succeeds, this method needs to set the
         client on the request, i.e. request.client = client. A client object's
diff --git a/libs/oauthlib/oauth2/rfc6749/tokens.py b/libs/oauthlib/oauth2/rfc6749/tokens.py
index 0757d07ea5..73b8c66a96 100644
--- a/libs/oauthlib/oauth2/rfc6749/tokens.py
+++ b/libs/oauthlib/oauth2/rfc6749/tokens.py
@@ -24,7 +24,7 @@ class OAuth2Token(dict):
     def __init__(self, params, old_scope=None):
         super().__init__(params)
         self._new_scope = None
-        if 'scope' in params and params['scope']:
+        if params.get('scope'):
             self._new_scope = set(utils.scope_to_list(params['scope']))
         if old_scope is not None:
             self._old_scope = set(utils.scope_to_list(old_scope))
@@ -123,10 +123,7 @@ def prepare_mac_header(token, uri, key, http_method,
 
     sch, net, path, par, query, fra = urlparse(uri)
 
-    if query:
-        request_uri = path + '?' + query
-    else:
-        request_uri = path
+    request_uri = path + '?' + query if query else path
 
     # Hash the body/payload
     if body is not None and draft == 0:
@@ -305,10 +302,7 @@ def create_token(self, request, refresh_token=False, **kwargs):
                           "If you do, call `request_validator.save_token()` instead.",
                           DeprecationWarning)
 
-        if callable(self.expires_in):
-            expires_in = self.expires_in(request)
-        else:
-            expires_in = self.expires_in
+        expires_in = self.expires_in(request) if callable(self.expires_in) else self.expires_in
 
         request.expires_in = expires_in
 
diff --git a/libs/oauthlib/oauth2/rfc8628/__init__.py b/libs/oauthlib/oauth2/rfc8628/__init__.py
index 531929dcc7..65891445e3 100644
--- a/libs/oauthlib/oauth2/rfc8628/__init__.py
+++ b/libs/oauthlib/oauth2/rfc8628/__init__.py
@@ -5,6 +5,12 @@
 This module is an implementation of various logic needed
 for consuming and providing OAuth 2.0 Device Authorization RFC8628.
 """
+
+from oauthlib.oauth2.rfc8628.errors import (
+    SlowDownError,
+    AuthorizationPendingError,
+    ExpiredTokenError,
+)
 import logging
 
 log = logging.getLogger(__name__)
diff --git a/libs/oauthlib/oauth2/rfc8628/clients/device.py b/libs/oauthlib/oauth2/rfc8628/clients/device.py
index b9ba2150a2..ee0ccf8d61 100644
--- a/libs/oauthlib/oauth2/rfc8628/clients/device.py
+++ b/libs/oauthlib/oauth2/rfc8628/clients/device.py
@@ -45,9 +45,9 @@ def prepare_request_uri(self, uri, scope=None, **kwargs):
         if scope:
             params.append(('scope', list_to_scope(scope)))
 
-        for k in kwargs:
-            if kwargs[k]:
-                params.append((str(k), kwargs[k]))
+        for k,v in kwargs.items():
+            if v:
+                params.append((str(k), v))
 
         return add_params_to_uri(uri, params)
 
diff --git a/libs/oauthlib/oauth2/rfc8628/endpoints/__init__.py b/libs/oauthlib/oauth2/rfc8628/endpoints/__init__.py
new file mode 100644
index 0000000000..dc834797cd
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/endpoints/__init__.py
@@ -0,0 +1,10 @@
+"""
+oauthlib.oauth2.rfc8628
+~~~~~~~~~~~~~~~~~~~~~~~
+
+This module is an implementation of various logic needed
+for consuming and providing OAuth 2.0 Device Authorization RFC8628.
+"""
+
+from .device_authorization import DeviceAuthorizationEndpoint
+from .pre_configured import DeviceApplicationServer
diff --git a/libs/oauthlib/oauth2/rfc8628/endpoints/device_authorization.py b/libs/oauthlib/oauth2/rfc8628/endpoints/device_authorization.py
new file mode 100644
index 0000000000..3f38a54059
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/endpoints/device_authorization.py
@@ -0,0 +1,232 @@
+"""
+oauthlib.oauth2.rfc8628
+~~~~~~~~~~~~~~~~~~~~~~~
+
+This module is an implementation of various logic needed
+for consuming and providing OAuth 2.0 RFC8628.
+"""
+
+import logging
+from typing import Callable
+
+from oauthlib.common import Request, generate_token
+from oauthlib.oauth2.rfc6749 import errors
+from oauthlib.oauth2.rfc6749.endpoints.base import (
+    BaseEndpoint,
+    catch_errors_and_unavailability,
+)
+
+log = logging.getLogger(__name__)
+
+
+class DeviceAuthorizationEndpoint(BaseEndpoint):
+    """DeviceAuthorization endpoint - used by the client to initiate
+    the authorization flow by requesting a set of verification codes
+    from the authorization server by making an HTTP "POST" request to
+    the device authorization endpoint.
+
+    The client authentication requirements of Section 3.2.1 of [RFC6749]
+    apply to requests on this endpoint, which means that confidential
+    clients (those that have established client credentials) authenticate
+    in the same manner as when making requests to the token endpoint, and
+    public clients provide the "client_id" parameter to identify
+    themselves.
+    """
+
+    def __init__(
+        self,
+        request_validator,
+        verification_uri,
+        expires_in=1800,
+        interval=None,
+        verification_uri_complete=None,
+        user_code_generator: Callable[[None], str] = None,
+    ):
+        """
+        :param request_validator: An instance of RequestValidator.
+        :type request_validator: oauthlib.oauth2.rfc6749.RequestValidator.
+        :param verification_uri: a string containing the URL that can be polled by the client application
+        :param expires_in: a number that represents the lifetime of the `user_code` and `device_code`
+        :param interval: an option number that represents the number of seconds between each poll requests
+        :param verification_uri_complete: a string of a function that can be called with `user_data` as parameter
+        :param user_code_generator: a callable that returns a configurable user code
+        """
+        self.request_validator = request_validator
+        self._expires_in = expires_in
+        self._interval = interval
+        self._verification_uri = verification_uri
+        self._verification_uri_complete = verification_uri_complete
+        self.user_code_generator = user_code_generator
+
+        BaseEndpoint.__init__(self)
+
+    @property
+    def interval(self):
+        """The minimum amount of time in seconds that the client
+        SHOULD wait between polling requests to the token endpoint.  If no
+        value is provided, clients MUST use 5 as the default.
+        """
+        return self._interval
+
+    @property
+    def expires_in(self):
+        """The lifetime in seconds of the "device_code" and "user_code"."""
+        return self._expires_in
+
+    @property
+    def verification_uri(self):
+        """The end-user verification URI on the authorization
+        server.  The URI should be short and easy to remember as end users
+        will be asked to manually type it into their user agent.
+        """
+        return self._verification_uri
+
+    def verification_uri_complete(self, user_code):
+        if not self._verification_uri_complete:
+            return None
+        if isinstance(self._verification_uri_complete, str):
+            return self._verification_uri_complete.format(user_code=user_code)
+        if callable(self._verification_uri_complete):
+            return self._verification_uri_complete(user_code)
+        return None
+
+    @catch_errors_and_unavailability
+    def validate_device_authorization_request(self, request):
+        """Validate the device authorization request.
+
+        The client_id is required if the client is not authenticating with the
+        authorization server as described in `Section 3.2.1. of [RFC6749]`_.
+        The client identifier as described in `Section 2.2 of [RFC6749]`_.
+
+        .. _`Section 3.2.1. of [RFC6749]`: https://www.rfc-editor.org/rfc/rfc6749#section-3.2.1
+        .. _`Section 2.2 of [RFC6749]`: https://www.rfc-editor.org/rfc/rfc6749#section-2.2
+        """
+
+        # First check duplicate parameters
+        for param in ("client_id", "scope"):
+            try:
+                duplicate_params = request.duplicate_params
+            except ValueError:
+                raise errors.InvalidRequestFatalError(
+                    description="Unable to parse query string", request=request
+                )
+            if param in duplicate_params:
+                raise errors.InvalidRequestFatalError(
+                    description="Duplicate %s parameter." % param, request=request
+                )
+
+        # the "application/x-www-form-urlencoded" format, per Appendix B of [RFC6749]
+        # https://www.rfc-editor.org/rfc/rfc6749#appendix-B
+        if request.headers["Content-Type"] != "application/x-www-form-urlencoded":
+            raise errors.InvalidRequestError(
+                "Content-Type must be application/x-www-form-urlencoded",
+                request=request,
+            )
+
+        # REQUIRED. The client identifier as described in Section 2.2.
+        # https://tools.ietf.org/html/rfc6749#section-2.2
+        # TODO: extract client_id an helper validation function.
+        if not request.client_id:
+            raise errors.MissingClientIdError(request=request)
+
+        if not self.request_validator.validate_client_id(request.client_id, request):
+            raise errors.InvalidClientIdError(request=request)
+
+        # The client authentication requirements of Section 3.2.1 of [RFC6749]
+        # apply to requests on this endpoint, which means that confidential
+        # clients (those that have established client credentials) authenticate
+        # in the same manner as when making requests to the token endpoint, and
+        # public clients provide the "client_id" parameter to identify
+        # themselves.
+        self._raise_on_invalid_client(request)
+
+    @catch_errors_and_unavailability
+    def create_device_authorization_response(
+        self, uri, http_method="POST", body=None, headers=None
+    ):
+        """
+           Generate a unique device verification code and an end-user code that are valid for a limited time.
+           Include them in the HTTP response body using the "application/json" format [RFC8259] with a
+           200 (OK) status code, as described in `Section-3.2`_.
+
+           :param uri: The full URI of the token request.
+           :type uri: str
+           :param request: OAuthlib request.
+           :type request: oauthlib.common.Request
+           :param user_code_generator:
+               A callable that returns a string for the user code.
+               This allows the caller to decide how the `user_code` should be formatted.
+           :type user_code_generator: Callable[[], str]
+           :return: A tuple of three elements:
+                    1. A dict of headers to set on the response.
+                    2. The response body as a string.
+                    3. The response status code as an integer.
+           :rtype: tuple
+
+           The response contains the following parameters:
+
+           device_code
+              **REQUIRED.** The device verification code.
+
+           user_code
+              **REQUIRED.** The end-user verification code.
+
+           verification_uri
+              **REQUIRED.** The end-user verification URI on the authorization server.
+              The URI should be short and easy to remember as end users will be asked
+              to manually type it into their user agent.
+
+           verification_uri_complete
+              **OPTIONAL.** A verification URI that includes the `user_code` (or
+              other information with the same function as the `user_code`), which is
+              designed for non-textual transmission.
+
+           expires_in
+              **REQUIRED.** The lifetime in seconds of the `device_code` and `user_code`.
+
+           interval
+              **OPTIONAL.** The minimum amount of time in seconds that the client
+              SHOULD wait between polling requests to the token endpoint. If no
+              value is provided, clients MUST use 5 as the default.
+
+           **For example:**
+
+              .. code-block:: http
+
+                 HTTP/1.1 200 OK
+                 Content-Type: application/json
+                 Cache-Control: no-store
+
+                 {
+                   "device_code": "GmRhmhcxhwAzkoEqiMEg_DnyEysNkuNhszIySk9eS",
+                   "user_code": "WDJB-MJHT",
+                   "verification_uri": "https://example.com/device",
+                   "verification_uri_complete":
+                       "https://example.com/device?user_code=WDJB-MJHT",
+                   "expires_in": 1800,
+                   "interval": 5
+                 }
+
+           .. _`Section-3.2`: https://www.rfc-editor.org/rfc/rfc8628#section-3.2
+           """
+        request = Request(uri, http_method, body, headers)
+        self.validate_device_authorization_request(request)
+        log.debug("Pre resource owner authorization validation ok for %r.", request)
+
+        headers = {}
+        user_code = self.user_code_generator() if self.user_code_generator else generate_token()
+        data = {
+            "verification_uri": self.verification_uri,
+            "expires_in": self.expires_in,
+            "user_code": user_code,
+            "device_code": generate_token(),
+        }
+        if self.interval is not None:
+            data["interval"] = self.interval
+
+
+        verification_uri_complete = self.verification_uri_complete(user_code)
+        if verification_uri_complete:
+            data["verification_uri_complete"] = verification_uri_complete
+
+        return headers, data, 200
diff --git a/libs/oauthlib/oauth2/rfc8628/endpoints/pre_configured.py b/libs/oauthlib/oauth2/rfc8628/endpoints/pre_configured.py
new file mode 100644
index 0000000000..6cce683304
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/endpoints/pre_configured.py
@@ -0,0 +1,36 @@
+from oauthlib.oauth2.rfc8628.endpoints.device_authorization import (
+    DeviceAuthorizationEndpoint,
+)
+
+from typing import Callable, Optional
+from oauthlib.openid.connect.core.request_validator import RequestValidator
+
+
+class DeviceApplicationServer(DeviceAuthorizationEndpoint):
+    """An all-in-one endpoint featuring Authorization code grant and Bearer tokens."""
+
+    def __init__(
+        self,
+        request_validator: RequestValidator,
+        verification_uri: str,
+        interval: int = 5,
+        verification_uri_complete: Optional[str] = None,  # noqa: FA100
+        user_code_generator: Callable[[None], str] = None,
+        **kwargs,
+    ):
+        """Construct a new web application server.
+
+        :param request_validator: An implementation of
+                                  oauthlib.oauth2.rfc8626.RequestValidator.
+        :param interval: How long the device needs to wait before polling the server
+        :param verification_uri: the verification_uri to be send back.
+        :param user_code_generator: a callable that allows the user code to be configured.
+        """
+        DeviceAuthorizationEndpoint.__init__(
+            self,
+            request_validator,
+            interval=interval,
+            verification_uri=verification_uri,
+            user_code_generator=user_code_generator,
+            verification_uri_complete=verification_uri_complete,
+        )
diff --git a/libs/oauthlib/oauth2/rfc8628/errors.py b/libs/oauthlib/oauth2/rfc8628/errors.py
new file mode 100644
index 0000000000..a43593898e
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/errors.py
@@ -0,0 +1,55 @@
+from oauthlib.oauth2.rfc6749.errors import OAuth2Error
+
+"""
+oauthlib.oauth2.rfc8628.errors
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Error used both by OAuth2 clients and providers to represent the spec
+defined error responses specific to the the device grant
+"""
+
+
+class AuthorizationPendingError(OAuth2Error):
+    """
+    For the device authorization grant;
+      The authorization request is still pending as the end user hasn't
+      yet completed the user-interaction steps (Section 3.3).  The
+      client SHOULD repeat the access token request to the token
+      endpoint (a process known as polling).  Before each new request,
+      the client MUST wait at least the number of seconds specified by
+      the "interval" parameter of the device authorization response,
+      or 5 seconds if none was provided, and respect any
+      increase in the polling interval required by the "slow_down"
+      error.
+    """
+
+    error = "authorization_pending"
+
+
+class SlowDownError(OAuth2Error):
+    """
+    A variant of "authorization_pending", the authorization request is
+    still pending and polling should continue, but the interval MUST
+    be increased by 5 seconds for this and all subsequent requests.
+    """
+
+    error = "slow_down"
+
+
+class ExpiredTokenError(OAuth2Error):
+    """
+    The "device_code" has expired, and the device authorization
+    session has concluded.  The client MAY commence a new device
+    authorization request but SHOULD wait for user interaction before
+    restarting to avoid unnecessary polling.
+    """
+
+    error = "expired_token"
+
+
+class AccessDenied(OAuth2Error):
+    """
+    The authorization request was denied.
+    """
+
+    error = "access_denied"
diff --git a/libs/oauthlib/oauth2/rfc8628/grant_types/__init__.py b/libs/oauthlib/oauth2/rfc8628/grant_types/__init__.py
new file mode 100644
index 0000000000..418dba775d
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/grant_types/__init__.py
@@ -0,0 +1 @@
+from oauthlib.oauth2.rfc8628.grant_types.device_code import DeviceCodeGrant
diff --git a/libs/oauthlib/oauth2/rfc8628/grant_types/device_code.py b/libs/oauthlib/oauth2/rfc8628/grant_types/device_code.py
new file mode 100644
index 0000000000..082daf0fcc
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/grant_types/device_code.py
@@ -0,0 +1,111 @@
+from __future__ import annotations
+import json
+
+from typing import Callable
+
+from oauthlib import common # noqa: TC001
+
+from oauthlib.oauth2.rfc6749 import errors as rfc6749_errors
+from oauthlib.oauth2.rfc6749.grant_types.base import GrantTypeBase
+
+
+class DeviceCodeGrant(GrantTypeBase):
+    def create_authorization_response(
+        self, request: common.Request, token_handler: Callable
+    ) -> tuple[dict, str, int]:
+        """
+        Validate the device flow request -> create the access token
+        -> persist the token -> return the token.
+        """
+        headers = self._get_default_headers()
+        try:
+            self.validate_token_request(request)
+        except rfc6749_errors.OAuth2Error as e:
+            headers.update(e.headers)
+            return headers, e.json, e.status_code
+
+        token = token_handler.create_token(request, refresh_token=False)
+
+        for modifier in self._token_modifiers:
+            token = modifier(token)
+
+        self.request_validator.save_token(token, request)
+
+        return self.create_token_response(request, token_handler)
+
+    def validate_token_request(self, request: common.Request) -> None:
+        """
+        Performs the necessary check against the request to ensure
+        it's allowed to retrieve a token.
+        """
+        for validator in self.custom_validators.pre_token:
+            validator(request)
+
+        if not getattr(request, "grant_type", None):
+            raise rfc6749_errors.InvalidRequestError(
+                "Request is missing grant type.", request=request
+            )
+
+        if request.grant_type != "urn:ietf:params:oauth:grant-type:device_code":
+            raise rfc6749_errors.UnsupportedGrantTypeError(request=request)
+
+        for param in ("grant_type", "scope"):
+            if param in request.duplicate_params:
+                raise rfc6749_errors.InvalidRequestError(
+                    description=f"Duplicate {param} parameter.", request=request
+                )
+
+        if not self.request_validator.authenticate_client(request):
+            raise rfc6749_errors.InvalidClientError(request=request)
+        elif not hasattr(request.client, "client_id"):
+            raise NotImplementedError(
+                "Authenticate client must set the "
+                "request.client.client_id attribute "
+                "in authenticate_client."
+            )
+
+        # Ensure client is authorized use of this grant type
+        self.validate_grant_type(request)
+
+        request.client_id = request.client_id or request.client.client_id
+        self.validate_scopes(request)
+
+        for validator in self.custom_validators.post_token:
+            validator(request)
+
+    def create_token_response(
+        self, request: common.Request, token_handler: Callable
+    ) -> tuple[dict, str, int]:
+        """Return token or error in json format.
+
+        :param request: OAuthlib request.
+        :type request: oauthlib.common.Request
+        :param token_handler: A token handler instance, for example of type
+                              oauthlib.oauth2.BearerToken.
+
+        If the access token request is valid and authorized, the
+        authorization server issues an access token and optional refresh
+        token as described in `Section 5.1`_.  If the request failed client
+        authentication or is invalid, the authorization server returns an
+        error response as described in `Section 5.2`_.
+        .. _`Section 5.1`: https://tools.ietf.org/html/rfc6749#section-5.1
+        .. _`Section 5.2`: https://tools.ietf.org/html/rfc6749#section-5.2
+        """
+        headers = self._get_default_headers()
+        try:
+            if self.request_validator.client_authentication_required(
+                request
+            ) and not self.request_validator.authenticate_client(request):
+                raise rfc6749_errors.InvalidClientError(request=request)
+
+            self.validate_token_request(request)
+
+        except rfc6749_errors.OAuth2Error as e:
+            headers.update(e.headers)
+            return headers, e.json, e.status_code
+
+        token = token_handler.create_token(request, self.refresh_token)
+
+        self.request_validator.save_token(token, request)
+
+        return headers, json.dumps(token), 200
diff --git a/libs/oauthlib/oauth2/rfc8628/request_validator.py b/libs/oauthlib/oauth2/rfc8628/request_validator.py
new file mode 100644
index 0000000000..70ee7824e9
--- /dev/null
+++ b/libs/oauthlib/oauth2/rfc8628/request_validator.py
@@ -0,0 +1,25 @@
+from oauthlib.oauth2 import RequestValidator as OAuth2RequestValidator
+
+
+class RequestValidator(OAuth2RequestValidator):
+    def client_authentication_required(self, request, *args, **kwargs):
+        """Determine if client authentication is required for current request.
+
+        According to the rfc8628, client authentication is required in the following cases:
+            - Device Authorization Request follows the, the client authentication requirements
+              of Section 3.2.1 of [RFC6749] apply to requests on this endpoint, which means that
+              confidential clients (those that have established client credentials) authenticate
+              in the same manner as when making requests to the token endpoint, and
+              public clients provide the "client_id" parameter to identify themselves,
+              see `Section 3.1`_.
+
+        :param request: OAuthlib request.
+        :type request: oauthlib.common.Request
+        :rtype: True or False
+
+        Method is used by:
+            - Device Authorization Request
+
+        .. _`Section 3.1`: https://www.rfc-editor.org/rfc/rfc8628#section-3.1
+        """
+        return True
diff --git a/libs/oauthlib/openid/connect/core/endpoints/pre_configured.py b/libs/oauthlib/openid/connect/core/endpoints/pre_configured.py
index 8ce8bee67b..17df516d17 100644
--- a/libs/oauthlib/openid/connect/core/endpoints/pre_configured.py
+++ b/libs/oauthlib/openid/connect/core/endpoints/pre_configured.py
@@ -5,34 +5,60 @@
 This module is an implementation of various endpoints needed
 for providing OpenID Connect servers.
 """
+
 from oauthlib.oauth2.rfc6749.endpoints import (
-    AuthorizationEndpoint, IntrospectEndpoint, ResourceEndpoint,
-    RevocationEndpoint, TokenEndpoint,
+    AuthorizationEndpoint,
+    IntrospectEndpoint,
+    ResourceEndpoint,
+    RevocationEndpoint,
+    TokenEndpoint,
 )
 from oauthlib.oauth2.rfc6749.grant_types import (
     AuthorizationCodeGrant as OAuth2AuthorizationCodeGrant,
-    ClientCredentialsGrant, ImplicitGrant as OAuth2ImplicitGrant,
-    RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant,
+    ClientCredentialsGrant,
+    ImplicitGrant as OAuth2ImplicitGrant,
+    ResourceOwnerPasswordCredentialsGrant,
 )
+from oauthlib.oauth2.rfc8628.grant_types import DeviceCodeGrant
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 
-from ..grant_types import AuthorizationCodeGrant, HybridGrant, ImplicitGrant
+from ..grant_types import (
+    AuthorizationCodeGrant,
+    HybridGrant,
+    ImplicitGrant,
+    RefreshTokenGrant,
+)
 from ..grant_types.dispatchers import (
-    AuthorizationCodeGrantDispatcher, AuthorizationTokenGrantDispatcher,
+    AuthorizationCodeGrantDispatcher,
+    AuthorizationTokenGrantDispatcher,
     ImplicitTokenGrantDispatcher,
 )
 from ..tokens import JWTToken
 from .userinfo import UserInfoEndpoint
 
 
-class Server(AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint,
-             ResourceEndpoint, RevocationEndpoint, UserInfoEndpoint):
-
-    """An all-in-one endpoint featuring all four major grant types."""
+class Server(
+    AuthorizationEndpoint,
+    IntrospectEndpoint,
+    TokenEndpoint,
+    ResourceEndpoint,
+    RevocationEndpoint,
+    UserInfoEndpoint,
+):
+    """
+    An all-in-one endpoint featuring all four major grant types
+    and extension grants.
+    """
 
-    def __init__(self, request_validator, token_expires_in=None,
-                 token_generator=None, refresh_token_generator=None,
-                 *args, **kwargs):
+    def __init__(
+        self,
+        request_validator,
+        token_expires_in=None,
+        token_generator=None,
+        refresh_token_generator=None,
+        *args,
+        **kwargs,
+    ):
         """Construct a new all-grants-in-one server.
 
         :param request_validator: An implementation of
@@ -48,50 +74,66 @@ def __init__(self, request_validator, token_expires_in=None,
         """
         self.auth_grant = OAuth2AuthorizationCodeGrant(request_validator)
         self.implicit_grant = OAuth2ImplicitGrant(request_validator)
-        self.password_grant = ResourceOwnerPasswordCredentialsGrant(
-            request_validator)
+        self.password_grant = ResourceOwnerPasswordCredentialsGrant(request_validator)
         self.credentials_grant = ClientCredentialsGrant(request_validator)
         self.refresh_grant = RefreshTokenGrant(request_validator)
         self.openid_connect_auth = AuthorizationCodeGrant(request_validator)
         self.openid_connect_implicit = ImplicitGrant(request_validator)
         self.openid_connect_hybrid = HybridGrant(request_validator)
+        self.device_code_grant = DeviceCodeGrant(request_validator, **kwargs)
 
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
+        self.bearer = BearerToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
 
-        self.jwt = JWTToken(request_validator, token_generator,
-                       token_expires_in, refresh_token_generator)
+        self.jwt = JWTToken(
+            request_validator, token_generator, token_expires_in, refresh_token_generator
+        )
 
-        self.auth_grant_choice = AuthorizationCodeGrantDispatcher(default_grant=self.auth_grant, oidc_grant=self.openid_connect_auth)
-        self.implicit_grant_choice = ImplicitTokenGrantDispatcher(default_grant=self.implicit_grant, oidc_grant=self.openid_connect_implicit)
+        self.auth_grant_choice = AuthorizationCodeGrantDispatcher(
+            default_grant=self.auth_grant, oidc_grant=self.openid_connect_auth
+        )
+        self.implicit_grant_choice = ImplicitTokenGrantDispatcher(
+            default_grant=self.implicit_grant, oidc_grant=self.openid_connect_implicit
+        )
 
         # See http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#Combinations for valid combinations
         # internally our AuthorizationEndpoint will ensure they can appear in any order for any valid combination
-        AuthorizationEndpoint.__init__(self, default_response_type='code',
-                                       response_types={
-                                           'code': self.auth_grant_choice,
-                                           'token': self.implicit_grant_choice,
-                                           'id_token': self.openid_connect_implicit,
-                                           'id_token token': self.openid_connect_implicit,
-                                           'code token': self.openid_connect_hybrid,
-                                           'code id_token': self.openid_connect_hybrid,
-                                           'code id_token token': self.openid_connect_hybrid,
-                                           'none': self.auth_grant
-                                       },
-                                       default_token_type=self.bearer)
+        AuthorizationEndpoint.__init__(
+            self,
+            default_response_type="code",
+            response_types={
+                "code": self.auth_grant_choice,
+                "token": self.implicit_grant_choice,
+                "id_token": self.openid_connect_implicit,
+                "id_token token": self.openid_connect_implicit,
+                "code token": self.openid_connect_hybrid,
+                "code id_token": self.openid_connect_hybrid,
+                "code id_token token": self.openid_connect_hybrid,
+                "none": self.auth_grant,
+            },
+            default_token_type=self.bearer,
+        )
 
-        self.token_grant_choice = AuthorizationTokenGrantDispatcher(request_validator, default_grant=self.auth_grant, oidc_grant=self.openid_connect_auth)
+        self.token_grant_choice = AuthorizationTokenGrantDispatcher(
+            request_validator, default_grant=self.auth_grant, oidc_grant=self.openid_connect_auth
+        )
 
-        TokenEndpoint.__init__(self, default_grant_type='authorization_code',
-                               grant_types={
-                                   'authorization_code': self.token_grant_choice,
-                                   'password': self.password_grant,
-                                   'client_credentials': self.credentials_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer, 'JWT': self.jwt})
+        TokenEndpoint.__init__(
+            self,
+            default_grant_type="authorization_code",
+            grant_types={
+                "authorization_code": self.token_grant_choice,
+                "password": self.password_grant,
+                "client_credentials": self.credentials_grant,
+                "refresh_token": self.refresh_grant,
+                "urn:ietf:params:oauth:grant-type:device_code": self.device_code_grant,
+            },
+            default_token_type=self.bearer,
+        )
+        ResourceEndpoint.__init__(
+            self, default_token="Bearer", token_types={"Bearer": self.bearer, "JWT": self.jwt}
+        )
         RevocationEndpoint.__init__(self, request_validator)
         IntrospectEndpoint.__init__(self, request_validator)
         UserInfoEndpoint.__init__(self, request_validator)
diff --git a/libs/oauthlib/openid/connect/core/exceptions.py b/libs/oauthlib/openid/connect/core/exceptions.py
index 099b84e2da..291cf13776 100644
--- a/libs/oauthlib/openid/connect/core/exceptions.py
+++ b/libs/oauthlib/openid/connect/core/exceptions.py
@@ -5,6 +5,9 @@
 Error used both by OAuth 2 clients and providers to represent the spec
 defined error responses for all four core grant types.
 """
+import inspect
+import sys
+
 from oauthlib.oauth2.rfc6749.errors import FatalClientError, OAuth2Error
 
 
@@ -72,8 +75,8 @@ class InvalidRequestURI(OpenIDClientError):
     contains invalid data.
     """
     error = 'invalid_request_uri'
-    description = 'The request_uri in the Authorization Request returns an ' \
-                  'error or contains invalid data.'
+    description = ('The request_uri in the Authorization Request returns an '
+                  'error or contains invalid data.')
 
 
 class InvalidRequestObject(OpenIDClientError):
@@ -137,8 +140,6 @@ class InsufficientScopeError(OAuth2Error):
 
 
 def raise_from_error(error, params=None):
-    import inspect
-    import sys
     kwargs = {
         'description': params.get('error_description'),
         'uri': params.get('error_uri'),
diff --git a/libs/oauthlib/openid/connect/core/grant_types/base.py b/libs/oauthlib/openid/connect/core/grant_types/base.py
index 33411dad75..29d583eb1c 100644
--- a/libs/oauthlib/openid/connect/core/grant_types/base.py
+++ b/libs/oauthlib/openid/connect/core/grant_types/base.py
@@ -310,11 +310,15 @@ def openid_authorization_validator(self, request):
             msg = "Session user does not match client supplied user."
             raise LoginRequired(request=request, description=msg)
 
+        ui_locales = request.ui_locales if request.ui_locales else []
+        if hasattr(ui_locales, 'split'):
+            ui_locales = ui_locales.strip().split()
+
         request_info = {
             'display': request.display,
             'nonce': request.nonce,
             'prompt': prompt,
-            'ui_locales': request.ui_locales.split() if request.ui_locales else [],
+            'ui_locales': ui_locales,
             'id_token_hint': request.id_token_hint,
             'login_hint': request.login_hint,
             'claims': request.claims
diff --git a/libs/oauthlib/openid/connect/core/grant_types/dispatchers.py b/libs/oauthlib/openid/connect/core/grant_types/dispatchers.py
index 5aa7d4698b..7e0739684f 100644
--- a/libs/oauthlib/openid/connect/core/grant_types/dispatchers.py
+++ b/libs/oauthlib/openid/connect/core/grant_types/dispatchers.py
@@ -80,9 +80,9 @@ def _handler_for_request(self, request):
         handler = self.default_grant
         scopes = ()
         parameters = dict(request.decoded_body)
-        client_id = parameters.get('client_id', None)
-        code = parameters.get('code', None)
-        redirect_uri = parameters.get('redirect_uri', None)
+        client_id = parameters.get('client_id')
+        code = parameters.get('code')
+        redirect_uri = parameters.get('redirect_uri')
 
         # If code is not present fallback to `default_grant` which will
         # raise an error for the missing `code` in `create_token_response` step.
diff --git a/libs/oauthlib/openid/connect/core/grant_types/hybrid.py b/libs/oauthlib/openid/connect/core/grant_types/hybrid.py
index 7cb0758b81..9c1fc702f9 100644
--- a/libs/oauthlib/openid/connect/core/grant_types/hybrid.py
+++ b/libs/oauthlib/openid/connect/core/grant_types/hybrid.py
@@ -54,10 +54,9 @@ def openid_authorization_validator(self, request):
         # Token. Sufficient entropy MUST be present in the `nonce`
         # values used to prevent attackers from guessing values. For
         # implementation notes, see Section 15.5.2.
-        if request.response_type in ["code id_token", "code id_token token"]:
-            if not request.nonce:
-                raise InvalidRequestError(
-                    request=request,
-                    description='Request is missing mandatory nonce parameter.'
-                )
+        if request.response_type in ["code id_token", "code id_token token"] and not request.nonce:
+            raise InvalidRequestError(
+                request=request,
+                description='Request is missing mandatory nonce parameter.'
+            )
         return request_info
diff --git a/libs/oauthlib/openid/connect/core/request_validator.py b/libs/oauthlib/openid/connect/core/request_validator.py
index 47c4cd9406..e3cea79b77 100644
--- a/libs/oauthlib/openid/connect/core/request_validator.py
+++ b/libs/oauthlib/openid/connect/core/request_validator.py
@@ -143,7 +143,7 @@ def finalize_id_token(self, id_token, token, token_handler, request):
           Token MUST NOT be accepted by the RP when performing
           authentication with the OP.
 
-        Additionals claims must be added, note that `request.scope`
+        Additional claims must be added, note that `request.scope`
         should be used to determine the list of claims.
 
         More information can be found at `OpenID Connect Core#Claims`_
diff --git a/libs/oauthlib/openid/connect/core/tokens.py b/libs/oauthlib/openid/connect/core/tokens.py
index 936ab52e38..3ab3549243 100644
--- a/libs/oauthlib/openid/connect/core/tokens.py
+++ b/libs/oauthlib/openid/connect/core/tokens.py
@@ -27,10 +27,7 @@ def __init__(self, request_validator=None, token_generator=None,
     def create_token(self, request, refresh_token=False):
         """Create a JWT Token, using requestvalidator method."""
 
-        if callable(self.expires_in):
-            expires_in = self.expires_in(request)
-        else:
-            expires_in = self.expires_in
+        expires_in = self.expires_in(request) if callable(self.expires_in) else self.expires_in
 
         request.expires_in = expires_in
 
diff --git a/libs/oauthlib/signals.py b/libs/oauthlib/signals.py
index 8fd347a5c8..9538d098ce 100644
--- a/libs/oauthlib/signals.py
+++ b/libs/oauthlib/signals.py
@@ -7,7 +7,7 @@
 try:
     from blinker import Namespace
     signals_available = True
-except ImportError:  # noqa
+except ImportError:
     class Namespace:
         def signal(self, name, doc=None):
             return _FakeSignal(name, doc)
@@ -26,7 +26,8 @@ def _fail(self, *args, **kwargs):
             raise RuntimeError('signalling support is unavailable '
                                'because the blinker library is '
                                'not installed.')
-        send = lambda *a, **kw: None
+        def send(*a, **kw):
+            return None
         connect = disconnect = has_receivers_for = receivers_for = \
             temporarily_connected_to = connected_to = _fail
         del _fail
diff --git a/libs/oauthlib/uri_validate.py b/libs/oauthlib/uri_validate.py
index a6fe0fb23e..69d2c9506a 100644
--- a/libs/oauthlib/uri_validate.py
+++ b/libs/oauthlib/uri_validate.py
@@ -174,8 +174,7 @@
 URI_reference = r"^(?: %(URI)s | %(relative_ref)s )$" % locals()
 
 #   absolute-URI  = scheme ":" hier-part [ "?" query ]
-absolute_URI = r"^(?: %(scheme)s : %(hier_part)s (?: \? %(query)s )? )$" % locals(
-)
+absolute_URI = r"^(?: %(scheme)s : %(hier_part)s (?: \? %(query)s )? )$" % locals()  # noqa: N816
 
 
 def is_uri(uri):
diff --git a/libs/platformdirs-4.3.6.dist-info/METADATA b/libs/platformdirs-4.3.6.dist-info/METADATA
deleted file mode 100644
index 91c59c9a28..0000000000
--- a/libs/platformdirs-4.3.6.dist-info/METADATA
+++ /dev/null
@@ -1,327 +0,0 @@
-Metadata-Version: 2.3
-Name: platformdirs
-Version: 4.3.6
-Summary: A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`.
-Project-URL: Changelog, https://github.com/tox-dev/platformdirs/releases
-Project-URL: Documentation, https://platformdirs.readthedocs.io
-Project-URL: Homepage, https://github.com/tox-dev/platformdirs
-Project-URL: Source, https://github.com/tox-dev/platformdirs
-Project-URL: Tracker, https://github.com/tox-dev/platformdirs/issues
-Maintainer-email: Bernรกt Gรกbor <gaborjbernat@gmail.com>, Julian Berman <Julian@GrayVines.com>, Ofek Lev <oss@ofek.dev>, Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
-License-Expression: MIT
-License-File: LICENSE
-Keywords: appdirs,application,cache,directory,log,user
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
-Provides-Extra: docs
-Requires-Dist: furo>=2024.8.6; extra == 'docs'
-Requires-Dist: proselint>=0.14; extra == 'docs'
-Requires-Dist: sphinx-autodoc-typehints>=2.4; extra == 'docs'
-Requires-Dist: sphinx>=8.0.2; extra == 'docs'
-Provides-Extra: test
-Requires-Dist: appdirs==1.4.4; extra == 'test'
-Requires-Dist: covdefaults>=2.3; extra == 'test'
-Requires-Dist: pytest-cov>=5; extra == 'test'
-Requires-Dist: pytest-mock>=3.14; extra == 'test'
-Requires-Dist: pytest>=8.3.2; extra == 'test'
-Provides-Extra: type
-Requires-Dist: mypy>=1.11.2; extra == 'type'
-Description-Content-Type: text/x-rst
-
-The problem
-===========
-
-.. image:: https://badge.fury.io/py/platformdirs.svg
-   :target: https://badge.fury.io/py/platformdirs
-.. image:: https://img.shields.io/pypi/pyversions/platformdirs.svg
-   :target: https://pypi.python.org/pypi/platformdirs/
-.. image:: https://github.com/tox-dev/platformdirs/actions/workflows/check.yaml/badge.svg
-   :target: https://github.com/platformdirs/platformdirs/actions
-.. image:: https://static.pepy.tech/badge/platformdirs/month
-   :target: https://pepy.tech/project/platformdirs
-
-When writing desktop application, finding the right location to store user data
-and configuration varies per platform. Even for single-platform apps, there
-may by plenty of nuances in figuring out the right location.
-
-For example, if running on macOS, you should use::
-
-    ~/Library/Application Support/<AppName>
-
-If on Windows (at least English Win) that should be::
-
-    C:\Documents and Settings\<User>\Application Data\Local Settings\<AppAuthor>\<AppName>
-
-or possibly::
-
-    C:\Documents and Settings\<User>\Application Data\<AppAuthor>\<AppName>
-
-for `roaming profiles <https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-vista/cc766489(v=ws.10)>`_ but that is another story.
-
-On Linux (and other Unices), according to the `XDG Basedir Spec`_, it should be::
-
-    ~/.local/share/<AppName>
-
-.. _XDG Basedir Spec: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
-
-``platformdirs`` to the rescue
-==============================
-
-This kind of thing is what the ``platformdirs`` package is for.
-``platformdirs`` will help you choose an appropriate:
-
-- user data dir (``user_data_dir``)
-- user config dir (``user_config_dir``)
-- user cache dir (``user_cache_dir``)
-- site data dir (``site_data_dir``)
-- site config dir (``site_config_dir``)
-- user log dir (``user_log_dir``)
-- user documents dir (``user_documents_dir``)
-- user downloads dir (``user_downloads_dir``)
-- user pictures dir (``user_pictures_dir``)
-- user videos dir (``user_videos_dir``)
-- user music dir (``user_music_dir``)
-- user desktop dir (``user_desktop_dir``)
-- user runtime dir (``user_runtime_dir``)
-
-And also:
-
-- Is slightly opinionated on the directory names used. Look for "OPINION" in
-  documentation and code for when an opinion is being applied.
-
-Example output
-==============
-
-On macOS:
-
-.. code-block:: pycon
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    '/Users/trentm/Library/Application Support/SuperApp'
-    >>> site_data_dir(appname, appauthor)
-    '/Library/Application Support/SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    '/Users/trentm/Library/Caches/SuperApp'
-    >>> user_log_dir(appname, appauthor)
-    '/Users/trentm/Library/Logs/SuperApp'
-    >>> user_documents_dir()
-    '/Users/trentm/Documents'
-    >>> user_downloads_dir()
-    '/Users/trentm/Downloads'
-    >>> user_pictures_dir()
-    '/Users/trentm/Pictures'
-    >>> user_videos_dir()
-    '/Users/trentm/Movies'
-    >>> user_music_dir()
-    '/Users/trentm/Music'
-    >>> user_desktop_dir()
-    '/Users/trentm/Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    '/Users/trentm/Library/Caches/TemporaryItems/SuperApp'
-
-On Windows:
-
-.. code-block:: pycon
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp'
-    >>> user_data_dir(appname, appauthor, roaming=True)
-    'C:\\Users\\trentm\\AppData\\Roaming\\Acme\\SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp\\Cache'
-    >>> user_log_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Acme\\SuperApp\\Logs'
-    >>> user_documents_dir()
-    'C:\\Users\\trentm\\Documents'
-    >>> user_downloads_dir()
-    'C:\\Users\\trentm\\Downloads'
-    >>> user_pictures_dir()
-    'C:\\Users\\trentm\\Pictures'
-    >>> user_videos_dir()
-    'C:\\Users\\trentm\\Videos'
-    >>> user_music_dir()
-    'C:\\Users\\trentm\\Music'
-    >>> user_desktop_dir()
-    'C:\\Users\\trentm\\Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    'C:\\Users\\trentm\\AppData\\Local\\Temp\\Acme\\SuperApp'
-
-On Linux:
-
-.. code-block:: pycon
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    '/home/trentm/.local/share/SuperApp'
-    >>> site_data_dir(appname, appauthor)
-    '/usr/local/share/SuperApp'
-    >>> site_data_dir(appname, appauthor, multipath=True)
-    '/usr/local/share/SuperApp:/usr/share/SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    '/home/trentm/.cache/SuperApp'
-    >>> user_log_dir(appname, appauthor)
-    '/home/trentm/.local/state/SuperApp/log'
-    >>> user_config_dir(appname)
-    '/home/trentm/.config/SuperApp'
-    >>> user_documents_dir()
-    '/home/trentm/Documents'
-    >>> user_downloads_dir()
-    '/home/trentm/Downloads'
-    >>> user_pictures_dir()
-    '/home/trentm/Pictures'
-    >>> user_videos_dir()
-    '/home/trentm/Videos'
-    >>> user_music_dir()
-    '/home/trentm/Music'
-    >>> user_desktop_dir()
-    '/home/trentm/Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    '/run/user/{os.getuid()}/SuperApp'
-    >>> site_config_dir(appname)
-    '/etc/xdg/SuperApp'
-    >>> os.environ["XDG_CONFIG_DIRS"] = "/etc:/usr/local/etc"
-    >>> site_config_dir(appname, multipath=True)
-    '/etc/SuperApp:/usr/local/etc/SuperApp'
-
-On Android::
-
-    >>> from platformdirs import *
-    >>> appname = "SuperApp"
-    >>> appauthor = "Acme"
-    >>> user_data_dir(appname, appauthor)
-    '/data/data/com.myApp/files/SuperApp'
-    >>> user_cache_dir(appname, appauthor)
-    '/data/data/com.myApp/cache/SuperApp'
-    >>> user_log_dir(appname, appauthor)
-    '/data/data/com.myApp/cache/SuperApp/log'
-    >>> user_config_dir(appname)
-    '/data/data/com.myApp/shared_prefs/SuperApp'
-    >>> user_documents_dir()
-    '/storage/emulated/0/Documents'
-    >>> user_downloads_dir()
-    '/storage/emulated/0/Downloads'
-    >>> user_pictures_dir()
-    '/storage/emulated/0/Pictures'
-    >>> user_videos_dir()
-    '/storage/emulated/0/DCIM/Camera'
-    >>> user_music_dir()
-    '/storage/emulated/0/Music'
-    >>> user_desktop_dir()
-    '/storage/emulated/0/Desktop'
-    >>> user_runtime_dir(appname, appauthor)
-    '/data/data/com.myApp/cache/SuperApp/tmp'
-
-Note: Some android apps like Termux and Pydroid are used as shells. These
-apps are used by the end user to emulate Linux environment. Presence of
-``SHELL`` environment variable is used by Platformdirs to differentiate
-between general android apps and android apps used as shells. Shell android
-apps also support ``XDG_*`` environment variables.
-
-
-``PlatformDirs`` for convenience
-================================
-
-.. code-block:: pycon
-
-    >>> from platformdirs import PlatformDirs
-    >>> dirs = PlatformDirs("SuperApp", "Acme")
-    >>> dirs.user_data_dir
-    '/Users/trentm/Library/Application Support/SuperApp'
-    >>> dirs.site_data_dir
-    '/Library/Application Support/SuperApp'
-    >>> dirs.user_cache_dir
-    '/Users/trentm/Library/Caches/SuperApp'
-    >>> dirs.user_log_dir
-    '/Users/trentm/Library/Logs/SuperApp'
-    >>> dirs.user_documents_dir
-    '/Users/trentm/Documents'
-    >>> dirs.user_downloads_dir
-    '/Users/trentm/Downloads'
-    >>> dirs.user_pictures_dir
-    '/Users/trentm/Pictures'
-    >>> dirs.user_videos_dir
-    '/Users/trentm/Movies'
-    >>> dirs.user_music_dir
-    '/Users/trentm/Music'
-    >>> dirs.user_desktop_dir
-    '/Users/trentm/Desktop'
-    >>> dirs.user_runtime_dir
-    '/Users/trentm/Library/Caches/TemporaryItems/SuperApp'
-
-Per-version isolation
-=====================
-
-If you have multiple versions of your app in use that you want to be
-able to run side-by-side, then you may want version-isolation for these
-dirs::
-
-    >>> from platformdirs import PlatformDirs
-    >>> dirs = PlatformDirs("SuperApp", "Acme", version="1.0")
-    >>> dirs.user_data_dir
-    '/Users/trentm/Library/Application Support/SuperApp/1.0'
-    >>> dirs.site_data_dir
-    '/Library/Application Support/SuperApp/1.0'
-    >>> dirs.user_cache_dir
-    '/Users/trentm/Library/Caches/SuperApp/1.0'
-    >>> dirs.user_log_dir
-    '/Users/trentm/Library/Logs/SuperApp/1.0'
-    >>> dirs.user_documents_dir
-    '/Users/trentm/Documents'
-    >>> dirs.user_downloads_dir
-    '/Users/trentm/Downloads'
-    >>> dirs.user_pictures_dir
-    '/Users/trentm/Pictures'
-    >>> dirs.user_videos_dir
-    '/Users/trentm/Movies'
-    >>> dirs.user_music_dir
-    '/Users/trentm/Music'
-    >>> dirs.user_desktop_dir
-    '/Users/trentm/Desktop'
-    >>> dirs.user_runtime_dir
-    '/Users/trentm/Library/Caches/TemporaryItems/SuperApp/1.0'
-
-Be wary of using this for configuration files though; you'll need to handle
-migrating configuration files manually.
-
-Why this Fork?
-==============
-
-This repository is a friendly fork of the wonderful work started by
-`ActiveState <https://github.com/ActiveState/appdirs>`_ who created
-``appdirs``, this package's ancestor.
-
-Maintaining an open source project is no easy task, particularly
-from within an organization, and the Python community is indebted
-to ``appdirs`` (and to Trent Mick and Jeff Rouse in particular) for
-creating an incredibly useful simple module, as evidenced by the wide
-number of users it has attracted over the years.
-
-Nonetheless, given the number of long-standing open issues
-and pull requests, and no clear path towards `ensuring
-that maintenance of the package would continue or grow
-<https://github.com/ActiveState/appdirs/issues/79>`_, this fork was
-created.
-
-Contributions are most welcome.
diff --git a/libs/platformdirs-4.3.6.dist-info/RECORD b/libs/platformdirs-4.3.6.dist-info/RECORD
deleted file mode 100644
index a4024095d2..0000000000
--- a/libs/platformdirs-4.3.6.dist-info/RECORD
+++ /dev/null
@@ -1,15 +0,0 @@
-platformdirs-4.3.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-platformdirs-4.3.6.dist-info/METADATA,sha256=085GgRFo5U1nc9NR8e6unEWKxUjDMsgSHDyaCETsCQ4,11868
-platformdirs-4.3.6.dist-info/RECORD,,
-platformdirs-4.3.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platformdirs-4.3.6.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-platformdirs-4.3.6.dist-info/licenses/LICENSE,sha256=KeD9YukphQ6G6yjD_czwzv30-pSHkBHP-z0NS-1tTbY,1089
-platformdirs/__init__.py,sha256=mVCfMmBM4q24lq6336V3VJncdxaOegI4qQSmQCjkR5E,22284
-platformdirs/__main__.py,sha256=HnsUQHpiBaiTxwcmwVw-nFaPdVNZtQIdi1eWDtI-MzI,1493
-platformdirs/android.py,sha256=kV5oL3V3DZ6WZKu9yFiQupv18yp_jlSV2ChH1TmPcds,9007
-platformdirs/api.py,sha256=2dfUDNbEXeDhDKarqtR5NY7oUikUZ4RZhs3ozstmhBQ,9246
-platformdirs/macos.py,sha256=UlbyFZ8Rzu3xndCqQEHrfsYTeHwYdFap1Ioz-yxveT4,6154
-platformdirs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platformdirs/unix.py,sha256=uRPJWRyQEtv7yOSvU94rUmsblo5XKDLA1SzFg55kbK0,10393
-platformdirs/version.py,sha256=oH4KgTfK4AklbTYVcV_yynvJ9JLI3pyvDVay0hRsLCs,411
-platformdirs/windows.py,sha256=IFpiohUBwxPtCzlyKwNtxyW4Jk8haa6W8o59mfrDXVo,10125
diff --git a/libs/platformdirs-4.3.6.dist-info/WHEEL b/libs/platformdirs-4.3.6.dist-info/WHEEL
deleted file mode 100644
index cdd68a497c..0000000000
--- a/libs/platformdirs-4.3.6.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.25.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/msgpack-1.1.0.dist-info/INSTALLER b/libs/platformdirs-4.9.4.dist-info/INSTALLER
similarity index 100%
rename from libs/msgpack-1.1.0.dist-info/INSTALLER
rename to libs/platformdirs-4.9.4.dist-info/INSTALLER
diff --git a/libs/platformdirs-4.9.4.dist-info/METADATA b/libs/platformdirs-4.9.4.dist-info/METADATA
new file mode 100644
index 0000000000..c2b3e9e8f1
--- /dev/null
+++ b/libs/platformdirs-4.9.4.dist-info/METADATA
@@ -0,0 +1,100 @@
+Metadata-Version: 2.4
+Name: platformdirs
+Version: 4.9.4
+Summary: A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`.
+Project-URL: Changelog, https://platformdirs.readthedocs.io/en/latest/changelog.html
+Project-URL: Documentation, https://platformdirs.readthedocs.io
+Project-URL: Homepage, https://github.com/tox-dev/platformdirs
+Project-URL: Source, https://github.com/tox-dev/platformdirs
+Project-URL: Tracker, https://github.com/tox-dev/platformdirs/issues
+Maintainer-email: Bernรกt Gรกbor <gaborjbernat@gmail.com>, Julian Berman <Julian@GrayVines.com>, Ofek Lev <oss@ofek.dev>, Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
+License-Expression: MIT
+License-File: LICENSE
+Keywords: appdirs,application,cache,directory,log,user
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+
+# platformdirs
+
+[![PyPI version](https://badge.fury.io/py/platformdirs.svg)](https://badge.fury.io/py/platformdirs)
+[![Python versions](https://img.shields.io/pypi/pyversions/platformdirs.svg)](https://pypi.python.org/pypi/platformdirs/)
+[![CI](https://github.com/tox-dev/platformdirs/actions/workflows/check.yaml/badge.svg)](https://github.com/platformdirs/platformdirs/actions)
+[![Downloads](https://static.pepy.tech/badge/platformdirs/month)](https://pepy.tech/project/platformdirs)
+
+A Python package for determining platform-specific directories (e.g. user data, config, cache, logs). Handles the
+differences between macOS, Windows, Linux/Unix, and Android so you don't have to.
+
+## Quick start
+
+```python
+from platformdirs import PlatformDirs
+
+dirs = PlatformDirs("MyApp", "MyCompany")
+dirs.user_data_dir  # ~/.local/share/MyApp (Linux)
+dirs.user_config_dir  # ~/.config/MyApp (Linux)
+dirs.user_cache_dir  # ~/.cache/MyApp (Linux)
+dirs.user_state_dir  # ~/.local/state/MyApp (Linux)
+dirs.user_log_dir  # ~/.local/state/MyApp/log (Linux)
+dirs.user_documents_dir  # ~/Documents
+dirs.user_downloads_dir  # ~/Downloads
+dirs.user_runtime_dir  # /run/user/<uid>/MyApp (Linux)
+```
+
+For Path objects instead of strings:
+
+```python
+from platformdirs import PlatformDirs
+
+dirs = PlatformDirs("MyApp", "MyCompany")
+dirs.user_data_path  # pathlib.Path('~/.local/share/MyApp')
+dirs.user_config_path  # pathlib.Path('~/.config/MyApp')
+```
+
+Convenience functions for quick access:
+
+```python
+from platformdirs import user_data_dir, user_config_path
+
+user_data_dir("MyApp", "MyCompany")  # returns str
+user_config_path("MyApp", "MyCompany")  # returns pathlib.Path
+```
+
+## Directory types
+
+- **Data**: Persistent application data (`user_data_dir`, `site_data_dir`)
+- **Config**: Configuration files and settings (`user_config_dir`, `site_config_dir`)
+- **Cache**: Cached data that can be regenerated (`user_cache_dir`, `site_cache_dir`)
+- **State**: Non-essential runtime state like window positions (`user_state_dir`, `site_state_dir`)
+- **Logs**: Log files (`user_log_dir`, `site_log_dir`)
+- **Runtime**: Runtime files like sockets and PIDs (`user_runtime_dir`, `site_runtime_dir`)
+
+Each type has both `user_*` (per-user, writable) and `site_*` (system-wide, read-only for users) variants.
+
+## Documentation
+
+Full documentation is available at [platformdirs.readthedocs.io](https://platformdirs.readthedocs.io):
+
+- **[Getting started tutorial](https://platformdirs.readthedocs.io/en/latest/tutorial.html)** -- learn core concepts
+  through real-world examples
+- **[How-to guides](https://platformdirs.readthedocs.io/en/latest/howto.html)** -- recipes for common tasks and
+  platform-specific tips
+- **[API reference](https://platformdirs.readthedocs.io/en/latest/api.html)** -- complete list of functions and classes
+- **[Platform details](https://platformdirs.readthedocs.io/en/latest/platforms.html)** -- default paths for each
+  operating system
+
+Contributions are welcome! See [CONTRIBUTING.md](https://github.com/tox-dev/platformdirs/blob/main/CONTRIBUTING.md) for
+details.
diff --git a/libs/platformdirs-4.9.4.dist-info/RECORD b/libs/platformdirs-4.9.4.dist-info/RECORD
new file mode 100644
index 0000000000..5fad1e7ce9
--- /dev/null
+++ b/libs/platformdirs-4.9.4.dist-info/RECORD
@@ -0,0 +1,16 @@
+platformdirs-4.9.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+platformdirs-4.9.4.dist-info/METADATA,sha256=Jl0ycpV78hiBFdFunnqwuP71goJfqOUuNL5odYuR3Xo,4683
+platformdirs-4.9.4.dist-info/RECORD,,
+platformdirs-4.9.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+platformdirs-4.9.4.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+platformdirs-4.9.4.dist-info/licenses/LICENSE,sha256=KeD9YukphQ6G6yjD_czwzv30-pSHkBHP-z0NS-1tTbY,1089
+platformdirs/__init__.py,sha256=hL_ZyhsQ5EfYf4W_Tr4O6F0lAOKLvQi0TZ4e_WGCIc4,30718
+platformdirs/__main__.py,sha256=MvM6fKJpBAeiTZckNJGSihXFKkS46tS9_P5gySZg3RI,1633
+platformdirs/_xdg.py,sha256=zzf6nX5N329OzNe2PhFEFWAUhN7ijmghapDb81ll2Us,6457
+platformdirs/android.py,sha256=nbEJY4dyNjF-OM5RalA0WJIQHCUy8OKioGDS9G_-ZGg,10591
+platformdirs/api.py,sha256=iuNVDTrHntrQjBknqA-BSCsxWqix8aJugdYo4SbuBAo,12734
+platformdirs/macos.py,sha256=YP2C4B1krgWVSA7yOq1T6NrUqduZqaFXIUxVtB4FuEg,7869
+platformdirs/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+platformdirs/unix.py,sha256=mcg5c1grrP1w566JAxDLSWtfq7L9qvS7foAr4b-IIrw,12189
+platformdirs/version.py,sha256=wnb6jtnQL3AvpQz2Kc9V7_5rRAT9pBykIPguVZgvo48,704
+platformdirs/windows.py,sha256=eQFkbOcRcI5YplmPx59FOd7yXJlhq27PpL7HVaC7se4,14564
diff --git a/libs/oauthlib-3.2.2.dist-info/REQUESTED b/libs/platformdirs-4.9.4.dist-info/REQUESTED
similarity index 100%
rename from libs/oauthlib-3.2.2.dist-info/REQUESTED
rename to libs/platformdirs-4.9.4.dist-info/REQUESTED
diff --git a/libs/platformdirs-4.9.4.dist-info/WHEEL b/libs/platformdirs-4.9.4.dist-info/WHEEL
new file mode 100644
index 0000000000..b1b94fd58e
--- /dev/null
+++ b/libs/platformdirs-4.9.4.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.29.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/platformdirs-4.3.6.dist-info/licenses/LICENSE b/libs/platformdirs-4.9.4.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/platformdirs-4.3.6.dist-info/licenses/LICENSE
rename to libs/platformdirs-4.9.4.dist-info/licenses/LICENSE
diff --git a/libs/platformdirs/__init__.py b/libs/platformdirs/__init__.py
index afe8351d20..4ab450ea95 100644
--- a/libs/platformdirs/__init__.py
+++ b/libs/platformdirs/__init__.py
@@ -1,5 +1,7 @@
-"""
-Utilities for determining application-specific dirs.
+"""Utilities for determining application-specific dirs.
+
+Provides convenience functions (e.g. :func:`user_data_dir`, :func:`user_config_path`), a :data:`PlatformDirs` class that
+auto-detects the current platform, and the :class:`~platformdirs.api.PlatformDirsABC` base class.
 
 See <https://github.com/platformdirs/platformdirs> for details and usage.
 
@@ -50,20 +52,23 @@ def _set_platform_dir_class() -> type[PlatformDirsABC]:
 AppDirs = PlatformDirs  #: Backwards compatibility with appdirs
 
 
-def user_data_dir(
+def user_data_dir(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: data directory tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -71,23 +76,25 @@ def user_data_dir(
         version=version,
         roaming=roaming,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_data_dir
 
 
 def site_data_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `roaming <platformdirs.api.PlatformDirsABC.multipath>`.
+    :param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
     :returns: data directory shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -98,20 +105,23 @@ def site_data_dir(
     ).site_data_dir
 
 
-def user_config_dir(
+def user_config_dir(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: config directory tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -119,23 +129,25 @@ def user_config_dir(
         version=version,
         roaming=roaming,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_config_dir
 
 
 def site_config_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `roaming <platformdirs.api.PlatformDirsABC.multipath>`.
+    :param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: config directory shared by the users
+
+    :returns: config directory shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -146,20 +158,23 @@ def site_config_dir(
     ).site_config_dir
 
 
-def user_cache_dir(
+def user_cache_dir(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
+    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: cache directory tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -167,23 +182,25 @@ def user_cache_dir(
         version=version,
         opinion=opinion,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_cache_dir
 
 
 def site_cache_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: cache directory tied to the user
+
+    :returns: cache directory shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -194,20 +211,23 @@ def site_cache_dir(
     ).site_cache_dir
 
 
-def user_state_dir(
+def user_state_dir(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: state directory tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -215,23 +235,49 @@ def user_state_dir(
         version=version,
         roaming=roaming,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_state_dir
 
 
-def user_log_dir(
+def site_state_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
+    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
+    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    :returns: state directory shared by users
+
     """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    return PlatformDirs(
+        appname=appname,
+        appauthor=appauthor,
+        version=version,
+        ensure_exists=ensure_exists,
+    ).site_state_dir
+
+
+def user_log_dir(  # noqa: PLR0913, PLR0917
+    appname: str | None = None,
+    appauthor: str | Literal[False] | None = None,
+    version: str | None = None,
+    opinion: bool = True,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
+) -> str:
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
+    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: log directory tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -239,9 +285,35 @@ def user_log_dir(
         version=version,
         opinion=opinion,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_log_dir
 
 
+def site_log_dir(
+    appname: str | None = None,
+    appauthor: str | Literal[False] | None = None,
+    version: str | None = None,
+    opinion: bool = True,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+) -> str:
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
+    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
+    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
+    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    :returns: log directory shared by users
+
+    """
+    return PlatformDirs(
+        appname=appname,
+        appauthor=appauthor,
+        version=version,
+        opinion=opinion,
+        ensure_exists=ensure_exists,
+    ).site_log_dir
+
+
 def user_documents_dir() -> str:
     """:returns: documents directory tied to the user"""
     return PlatformDirs().user_documents_dir
@@ -272,20 +344,54 @@ def user_desktop_dir() -> str:
     return PlatformDirs().user_desktop_dir
 
 
-def user_runtime_dir(
+def user_bin_dir() -> str:
+    """:returns: bin directory tied to the user"""
+    return PlatformDirs().user_bin_dir
+
+
+def site_bin_dir() -> str:
+    """:returns: bin directory shared by users"""
+    return PlatformDirs().site_bin_dir
+
+
+def user_applications_dir() -> str:
+    """:returns: applications directory tied to the user"""
+    return PlatformDirs().user_applications_dir
+
+
+def site_applications_dir(
+    multipath: bool = False,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+) -> str:
+    """:param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
+    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    :returns: applications directory shared by users
+
+    """
+    return PlatformDirs(
+        multipath=multipath,
+        ensure_exists=ensure_exists,
+    ).site_applications_dir
+
+
+def user_runtime_dir(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: runtime directory tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -293,23 +399,25 @@ def user_runtime_dir(
         version=version,
         opinion=opinion,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_runtime_dir
 
 
 def site_runtime_dir(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
     :returns: runtime directory shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -320,20 +428,23 @@ def site_runtime_dir(
     ).site_runtime_dir
 
 
-def user_data_path(
+def user_data_path(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: data path tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -341,23 +452,25 @@ def user_data_path(
         version=version,
         roaming=roaming,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_data_path
 
 
 def site_data_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
     :returns: data path shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -368,20 +481,23 @@ def site_data_path(
     ).site_data_path
 
 
-def user_config_path(
+def user_config_path(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: config path tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -389,23 +505,25 @@ def user_config_path(
         version=version,
         roaming=roaming,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_config_path
 
 
 def site_config_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     multipath: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `roaming <platformdirs.api.PlatformDirsABC.multipath>`.
+    :param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: config path shared by the users
+
+    :returns: config path shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -418,18 +536,19 @@ def site_config_path(
 
 def site_cache_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: cache directory tied to the user
+
+    :returns: cache path shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -440,20 +559,23 @@ def site_cache_path(
     ).site_cache_path
 
 
-def user_cache_path(
+def user_cache_path(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
+    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: cache path tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -461,23 +583,27 @@ def user_cache_path(
         version=version,
         opinion=opinion,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_cache_path
 
 
-def user_state_path(
+def user_state_path(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     roaming: bool = False,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: state path tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -485,23 +611,49 @@ def user_state_path(
         version=version,
         roaming=roaming,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_state_path
 
 
-def user_log_path(
+def site_state_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
+    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
+    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    :returns: state path shared by users
+
     """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    return PlatformDirs(
+        appname=appname,
+        appauthor=appauthor,
+        version=version,
+        ensure_exists=ensure_exists,
+    ).site_state_path
+
+
+def user_log_path(  # noqa: PLR0913, PLR0917
+    appname: str | None = None,
+    appauthor: str | Literal[False] | None = None,
+    version: str | None = None,
+    opinion: bool = True,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
+) -> Path:
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
+    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: log path tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -509,11 +661,37 @@ def user_log_path(
         version=version,
         opinion=opinion,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_log_path
 
 
+def site_log_path(
+    appname: str | None = None,
+    appauthor: str | Literal[False] | None = None,
+    version: str | None = None,
+    opinion: bool = True,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+) -> Path:
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
+    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
+    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
+    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    :returns: log path shared by users
+
+    """
+    return PlatformDirs(
+        appname=appname,
+        appauthor=appauthor,
+        version=version,
+        opinion=opinion,
+        ensure_exists=ensure_exists,
+    ).site_log_path
+
+
 def user_documents_path() -> Path:
-    """:returns: documents a path tied to the user"""
+    """:returns: documents path tied to the user"""
     return PlatformDirs().user_documents_path
 
 
@@ -542,20 +720,54 @@ def user_desktop_path() -> Path:
     return PlatformDirs().user_desktop_path
 
 
-def user_runtime_path(
+def user_bin_path() -> Path:
+    """:returns: bin path tied to the user"""
+    return PlatformDirs().user_bin_path
+
+
+def site_bin_path() -> Path:
+    """:returns: bin path shared by users"""
+    return PlatformDirs().site_bin_path
+
+
+def user_applications_path() -> Path:
+    """:returns: applications path tied to the user"""
+    return PlatformDirs().user_applications_path
+
+
+def site_applications_path(
+    multipath: bool = False,  # noqa: FBT001, FBT002
+    ensure_exists: bool = False,  # noqa: FBT001, FBT002
+) -> Path:
+    """:param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
+    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    :returns: applications path shared by users
+
+    """
+    return PlatformDirs(
+        multipath=multipath,
+        ensure_exists=ensure_exists,
+    ).site_applications_path
+
+
+def user_runtime_path(  # noqa: PLR0913, PLR0917
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
+    use_site_for_root: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    :param use_site_for_root: See `use_site_for_root <platformdirs.api.PlatformDirsABC.use_site_for_root>`.
+
     :returns: runtime path tied to the user
+
     """
     return PlatformDirs(
         appname=appname,
@@ -563,23 +775,25 @@ def user_runtime_path(
         version=version,
         opinion=opinion,
         ensure_exists=ensure_exists,
+        use_site_for_root=use_site_for_root,
     ).user_runtime_path
 
 
 def site_runtime_path(
     appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
+    appauthor: str | Literal[False] | None = None,
     version: str | None = None,
     opinion: bool = True,  # noqa: FBT001, FBT002
     ensure_exists: bool = False,  # noqa: FBT001, FBT002
 ) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
+    """:param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
     :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
     :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
     :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
     :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
     :returns: runtime path shared by users
+
     """
     return PlatformDirs(
         appname=appname,
@@ -596,14 +810,26 @@ def site_runtime_path(
     "PlatformDirsABC",
     "__version__",
     "__version_info__",
+    "site_applications_dir",
+    "site_applications_path",
+    "site_bin_dir",
+    "site_bin_path",
     "site_cache_dir",
     "site_cache_path",
     "site_config_dir",
     "site_config_path",
     "site_data_dir",
     "site_data_path",
+    "site_log_dir",
+    "site_log_path",
     "site_runtime_dir",
     "site_runtime_path",
+    "site_state_dir",
+    "site_state_path",
+    "user_applications_dir",
+    "user_applications_path",
+    "user_bin_dir",
+    "user_bin_path",
     "user_cache_dir",
     "user_cache_path",
     "user_config_dir",
diff --git a/libs/platformdirs/__main__.py b/libs/platformdirs/__main__.py
index 922c521358..2490ffbbe1 100644
--- a/libs/platformdirs/__main__.py
+++ b/libs/platformdirs/__main__.py
@@ -15,10 +15,16 @@
     "user_pictures_dir",
     "user_videos_dir",
     "user_music_dir",
+    "user_bin_dir",
+    "site_bin_dir",
+    "user_applications_dir",
     "user_runtime_dir",
     "site_data_dir",
     "site_config_dir",
     "site_cache_dir",
+    "site_state_dir",
+    "site_log_dir",
+    "site_applications_dir",
     "site_runtime_dir",
 )
 
diff --git a/libs/platformdirs/_xdg.py b/libs/platformdirs/_xdg.py
new file mode 100644
index 0000000000..c4aadd6d03
--- /dev/null
+++ b/libs/platformdirs/_xdg.py
@@ -0,0 +1,143 @@
+"""XDG environment variable mixin for Unix and macOS."""
+
+from __future__ import annotations
+
+import os
+
+from .api import PlatformDirsABC
+
+
+class XDGMixin(PlatformDirsABC):
+    """Mixin that checks XDG environment variables, falling back to platform-specific defaults via ``super()``."""
+
+    @property
+    def user_data_dir(self) -> str:
+        """:returns: data directory tied to the user, from ``$XDG_DATA_HOME`` if set, else platform default"""
+        if path := os.environ.get("XDG_DATA_HOME", "").strip():
+            return self._append_app_name_and_version(path)
+        return super().user_data_dir
+
+    @property
+    def _site_data_dirs(self) -> list[str]:
+        if xdg_dirs := os.environ.get("XDG_DATA_DIRS", "").strip():
+            return [self._append_app_name_and_version(p) for p in xdg_dirs.split(os.pathsep) if p.strip()]
+        return super()._site_data_dirs  # type: ignore[misc]
+
+    @property
+    def site_data_dir(self) -> str:
+        """:returns: data directories shared by users, from ``$XDG_DATA_DIRS`` if set, else platform default"""
+        dirs = self._site_data_dirs
+        return os.pathsep.join(dirs) if self.multipath else dirs[0]
+
+    @property
+    def user_config_dir(self) -> str:
+        """:returns: config directory tied to the user, from ``$XDG_CONFIG_HOME`` if set, else platform default"""
+        if path := os.environ.get("XDG_CONFIG_HOME", "").strip():
+            return self._append_app_name_and_version(path)
+        return super().user_config_dir
+
+    @property
+    def _site_config_dirs(self) -> list[str]:
+        if xdg_dirs := os.environ.get("XDG_CONFIG_DIRS", "").strip():
+            return [self._append_app_name_and_version(p) for p in xdg_dirs.split(os.pathsep) if p.strip()]
+        return super()._site_config_dirs  # type: ignore[misc]
+
+    @property
+    def site_config_dir(self) -> str:
+        """:returns: config directories shared by users, from ``$XDG_CONFIG_DIRS`` if set, else platform default"""
+        dirs = self._site_config_dirs
+        return os.pathsep.join(dirs) if self.multipath else dirs[0]
+
+    @property
+    def user_cache_dir(self) -> str:
+        """:returns: cache directory tied to the user, from ``$XDG_CACHE_HOME`` if set, else platform default"""
+        if path := os.environ.get("XDG_CACHE_HOME", "").strip():
+            return self._append_app_name_and_version(path)
+        return super().user_cache_dir
+
+    @property
+    def user_state_dir(self) -> str:
+        """:returns: state directory tied to the user, from ``$XDG_STATE_HOME`` if set, else platform default"""
+        if path := os.environ.get("XDG_STATE_HOME", "").strip():
+            return self._append_app_name_and_version(path)
+        return super().user_state_dir
+
+    @property
+    def user_runtime_dir(self) -> str:
+        """:returns: runtime directory tied to the user, from ``$XDG_RUNTIME_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_RUNTIME_DIR", "").strip():
+            return self._append_app_name_and_version(path)
+        return super().user_runtime_dir
+
+    @property
+    def site_runtime_dir(self) -> str:
+        """:returns: runtime directory shared by users, from ``$XDG_RUNTIME_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_RUNTIME_DIR", "").strip():
+            return self._append_app_name_and_version(path)
+        return super().site_runtime_dir
+
+    @property
+    def user_documents_dir(self) -> str:
+        """:returns: documents directory tied to the user, from ``$XDG_DOCUMENTS_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_DOCUMENTS_DIR", "").strip():
+            return os.path.expanduser(path)  # noqa: PTH111
+        return super().user_documents_dir
+
+    @property
+    def user_downloads_dir(self) -> str:
+        """:returns: downloads directory tied to the user, from ``$XDG_DOWNLOAD_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_DOWNLOAD_DIR", "").strip():
+            return os.path.expanduser(path)  # noqa: PTH111
+        return super().user_downloads_dir
+
+    @property
+    def user_pictures_dir(self) -> str:
+        """:returns: pictures directory tied to the user, from ``$XDG_PICTURES_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_PICTURES_DIR", "").strip():
+            return os.path.expanduser(path)  # noqa: PTH111
+        return super().user_pictures_dir
+
+    @property
+    def user_videos_dir(self) -> str:
+        """:returns: videos directory tied to the user, from ``$XDG_VIDEOS_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_VIDEOS_DIR", "").strip():
+            return os.path.expanduser(path)  # noqa: PTH111
+        return super().user_videos_dir
+
+    @property
+    def user_music_dir(self) -> str:
+        """:returns: music directory tied to the user, from ``$XDG_MUSIC_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_MUSIC_DIR", "").strip():
+            return os.path.expanduser(path)  # noqa: PTH111
+        return super().user_music_dir
+
+    @property
+    def user_desktop_dir(self) -> str:
+        """:returns: desktop directory tied to the user, from ``$XDG_DESKTOP_DIR`` if set, else platform default"""
+        if path := os.environ.get("XDG_DESKTOP_DIR", "").strip():
+            return os.path.expanduser(path)  # noqa: PTH111
+        return super().user_desktop_dir
+
+    @property
+    def user_applications_dir(self) -> str:
+        """:returns: applications directory tied to the user, from ``$XDG_DATA_HOME`` if set, else platform default"""
+        if path := os.environ.get("XDG_DATA_HOME", "").strip():
+            return os.path.join(os.path.expanduser(path), "applications")  # noqa: PTH111, PTH118
+        return super().user_applications_dir
+
+    @property
+    def _site_applications_dirs(self) -> list[str]:
+        if xdg_dirs := os.environ.get("XDG_DATA_DIRS", "").strip():
+            return [os.path.join(p, "applications") for p in xdg_dirs.split(os.pathsep) if p.strip()]  # noqa: PTH118
+        return super()._site_applications_dirs  # type: ignore[misc]
+
+    @property
+    def site_applications_dir(self) -> str:
+        """:returns: applications directories shared by users, from ``$XDG_DATA_DIRS`` if set, else platform default"""
+        dirs = self._site_applications_dirs
+        return os.pathsep.join(dirs) if self.multipath else dirs[0]
+
+
+__all__ = [
+    "XDGMixin",
+]
diff --git a/libs/platformdirs/android.py b/libs/platformdirs/android.py
index 7004a85242..8c798b95e3 100644
--- a/libs/platformdirs/android.py
+++ b/libs/platformdirs/android.py
@@ -11,114 +11,140 @@
 from .api import PlatformDirsABC
 
 
-class Android(PlatformDirsABC):
-    """
-    Follows the guidance `from here <https://android.stackexchange.com/a/216132>`_.
+class Android(PlatformDirsABC):  # noqa: PLR0904
+    """Platform directories for Android.
+
+    Follows the guidance `from here <https://android.stackexchange.com/a/216132>`_. Directories are typically located
+    under the app's private storage (``/data/user/<userid>/<packagename>/``).
 
     Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`, `version
-    <platformdirs.api.PlatformDirsABC.version>`, `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    <platformdirs.api.PlatformDirsABC.version>`, `opinion <platformdirs.api.PlatformDirsABC.opinion>`, `ensure_exists
+    <platformdirs.api.PlatformDirsABC.ensure_exists>`.
 
     """
 
     @property
     def user_data_dir(self) -> str:
-        """:return: data directory tied to the user, e.g. ``/data/user/<userid>/<packagename>/files/<AppName>``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "files")
+        """:returns: data directory tied to the user, e.g. ``/data/user/<userid>/<packagename>/files/<AppName>``"""
+        return self._append_app_name_and_version(cast("str", _android_folder()), "files")
 
     @property
     def site_data_dir(self) -> str:
-        """:return: data directory shared by users, same as `user_data_dir`"""
+        """:returns: data directory shared by users, same as `user_data_dir`"""
         return self.user_data_dir
 
     @property
     def user_config_dir(self) -> str:
-        """
-        :return: config directory tied to the user, e.g. \
-        ``/data/user/<userid>/<packagename>/shared_prefs/<AppName>``
-        """
-        return self._append_app_name_and_version(cast(str, _android_folder()), "shared_prefs")
+        """:returns: config directory tied to the user, e.g. ``/data/user/<userid>/<packagename>/shared_prefs/<AppName>``"""
+        return self._append_app_name_and_version(cast("str", _android_folder()), "shared_prefs")
 
     @property
     def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `user_config_dir`"""
+        """:returns: config directory shared by users, same as `user_config_dir`"""
         return self.user_config_dir
 
     @property
     def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g.,``/data/user/<userid>/<packagename>/cache/<AppName>``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "cache")
+        """:returns: cache directory tied to the user, e.g.,``/data/user/<userid>/<packagename>/cache/<AppName>``"""
+        return self._append_app_name_and_version(cast("str", _android_folder()), "cache")
 
     @property
     def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, same as `user_cache_dir`"""
+        """:returns: cache directory shared by users, same as `user_cache_dir`"""
         return self.user_cache_dir
 
     @property
     def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
+        """:returns: state directory tied to the user, same as `user_data_dir`"""
         return self.user_data_dir
 
+    @property
+    def site_state_dir(self) -> str:
+        """:returns: state directory shared by users, same as `user_state_dir`"""
+        return self.user_state_dir
+
     @property
     def user_log_dir(self) -> str:
-        """
-        :return: log directory tied to the user, same as `user_cache_dir` if not opinionated else ``log`` in it,
-          e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>/log``
-        """
+        """:returns: log directory tied to the user, same as `user_cache_dir` if not opinionated else ``log`` in it, e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>/log``"""
         path = self.user_cache_dir
         if self.opinion:
             path = os.path.join(path, "log")  # noqa: PTH118
+            self._optionally_create_directory(path)
         return path
 
+    @property
+    def site_log_dir(self) -> str:
+        """:returns: log directory shared by users, same as `user_log_dir`"""
+        return self.user_log_dir
+
     @property
     def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``"""
+        """:returns: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``"""
         return _android_documents_folder()
 
     @property
     def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user e.g. ``/storage/emulated/0/Downloads``"""
+        """:returns: downloads directory tied to the user e.g. ``/storage/emulated/0/Downloads``"""
         return _android_downloads_folder()
 
     @property
     def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user e.g. ``/storage/emulated/0/Pictures``"""
+        """:returns: pictures directory tied to the user e.g. ``/storage/emulated/0/Pictures``"""
         return _android_pictures_folder()
 
     @property
     def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user e.g. ``/storage/emulated/0/DCIM/Camera``"""
+        """:returns: videos directory tied to the user e.g. ``/storage/emulated/0/DCIM/Camera``"""
         return _android_videos_folder()
 
     @property
     def user_music_dir(self) -> str:
-        """:return: music directory tied to the user e.g. ``/storage/emulated/0/Music``"""
+        """:returns: music directory tied to the user e.g. ``/storage/emulated/0/Music``"""
         return _android_music_folder()
 
     @property
     def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user e.g. ``/storage/emulated/0/Desktop``"""
+        """:returns: desktop directory tied to the user e.g. ``/storage/emulated/0/Desktop``"""
         return "/storage/emulated/0/Desktop"
 
+    @property
+    def user_bin_dir(self) -> str:
+        """:returns: bin directory tied to the user, e.g. ``/data/user/<userid>/<packagename>/files/bin``"""
+        return os.path.join(cast("str", _android_folder()), "files", "bin")  # noqa: PTH118
+
+    @property
+    def site_bin_dir(self) -> str:
+        """:returns: bin directory shared by users, same as `user_bin_dir`"""
+        return self.user_bin_dir
+
+    @property
+    def user_applications_dir(self) -> str:
+        """:returns: applications directory tied to the user, same as `user_data_dir`"""
+        return self.user_data_dir
+
+    @property
+    def site_applications_dir(self) -> str:
+        """:returns: applications directory shared by users, same as `user_applications_dir`"""
+        return self.user_applications_dir
+
     @property
     def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, same as `user_cache_dir` if not opinionated else ``tmp`` in it,
-          e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>/tmp``
-        """
+        """:returns: runtime directory tied to the user, same as `user_cache_dir` if not opinionated else ``tmp`` in it, e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>/tmp``"""
         path = self.user_cache_dir
         if self.opinion:
             path = os.path.join(path, "tmp")  # noqa: PTH118
+            self._optionally_create_directory(path)
         return path
 
     @property
     def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
+        """:returns: runtime directory shared by users, same as `user_runtime_dir`"""
         return self.user_runtime_dir
 
 
 @lru_cache(maxsize=1)
 def _android_folder() -> str | None:  # noqa: C901
-    """:return: base folder for the Android OS or None if it cannot be found"""
+    """:returns: base folder for the Android OS or None if it cannot be found"""
     result: str | None = None
     # type checker isn't happy with our "import android", just don't do this when type checking see
     # https://stackoverflow.com/a/61394121
@@ -135,7 +161,7 @@ def _android_folder() -> str | None:  # noqa: C901
         try:
             # ...and fall back to using plain pyjnius, if python4android isn't available or doesn't deliver any useful
             # result...
-            from jnius import autoclass  # noqa: PLC0415
+            from jnius import autoclass  # noqa: PLC0415  # ty: ignore[unresolved-import]
 
             context = autoclass("android.content.Context")
             result = context.getFilesDir().getParentFile().getAbsolutePath()
@@ -166,10 +192,10 @@ def _android_folder() -> str | None:  # noqa: C901
 
 @lru_cache(maxsize=1)
 def _android_documents_folder() -> str:
-    """:return: documents folder for the Android OS"""
+    """:returns: documents folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass  # noqa: PLC0415
+        from jnius import autoclass  # noqa: PLC0415  # ty: ignore[unresolved-import]
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -182,10 +208,10 @@ def _android_documents_folder() -> str:
 
 @lru_cache(maxsize=1)
 def _android_downloads_folder() -> str:
-    """:return: downloads folder for the Android OS"""
+    """:returns: downloads folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass  # noqa: PLC0415
+        from jnius import autoclass  # noqa: PLC0415  # ty: ignore[unresolved-import]
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -198,10 +224,10 @@ def _android_downloads_folder() -> str:
 
 @lru_cache(maxsize=1)
 def _android_pictures_folder() -> str:
-    """:return: pictures folder for the Android OS"""
+    """:returns: pictures folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass  # noqa: PLC0415
+        from jnius import autoclass  # noqa: PLC0415  # ty: ignore[unresolved-import]
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -214,10 +240,10 @@ def _android_pictures_folder() -> str:
 
 @lru_cache(maxsize=1)
 def _android_videos_folder() -> str:
-    """:return: videos folder for the Android OS"""
+    """:returns: videos folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass  # noqa: PLC0415
+        from jnius import autoclass  # noqa: PLC0415  # ty: ignore[unresolved-import]
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
@@ -230,10 +256,10 @@ def _android_videos_folder() -> str:
 
 @lru_cache(maxsize=1)
 def _android_music_folder() -> str:
-    """:return: music folder for the Android OS"""
+    """:returns: music folder for the Android OS"""
     # Get directories with pyjnius
     try:
-        from jnius import autoclass  # noqa: PLC0415
+        from jnius import autoclass  # noqa: PLC0415  # ty: ignore[unresolved-import]
 
         context = autoclass("android.content.Context")
         environment = autoclass("android.os.Environment")
diff --git a/libs/platformdirs/api.py b/libs/platformdirs/api.py
index 18d660e4f8..1ee29adb5b 100644
--- a/libs/platformdirs/api.py
+++ b/libs/platformdirs/api.py
@@ -8,24 +8,31 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Iterator, Literal
+    from collections.abc import Iterator
+    from typing import Literal
 
 
 class PlatformDirsABC(ABC):  # noqa: PLR0904
-    """Abstract base class for platform directories."""
+    """Abstract base class defining all platform directory properties, their :class:`~pathlib.Path` variants, and iterators.
+
+    Platform-specific subclasses (e.g. :class:`~platformdirs.windows.Windows`, :class:`~platformdirs.macos.MacOS`,
+    :class:`~platformdirs.unix.Unix`) implement the abstract properties to return the appropriate paths for each
+    operating system.
+
+    """
 
     def __init__(  # noqa: PLR0913, PLR0917
         self,
         appname: str | None = None,
-        appauthor: str | None | Literal[False] = None,
+        appauthor: str | Literal[False] | None = None,
         version: str | None = None,
         roaming: bool = False,  # noqa: FBT001, FBT002
         multipath: bool = False,  # noqa: FBT001, FBT002
         opinion: bool = True,  # noqa: FBT001, FBT002
         ensure_exists: bool = False,  # noqa: FBT001, FBT002
+        use_site_for_root: bool = False,  # noqa: FBT001, FBT002
     ) -> None:
-        """
-        Create a new platform directory.
+        """Create a new platform directory.
 
         :param appname: See `appname`.
         :param appauthor: See `appauthor`.
@@ -34,48 +41,57 @@ def __init__(  # noqa: PLR0913, PLR0917
         :param multipath: See `multipath`.
         :param opinion: See `opinion`.
         :param ensure_exists: See `ensure_exists`.
+        :param use_site_for_root: See `use_site_for_root`.
 
         """
-        self.appname = appname  #: The name of application.
+        self.appname = appname  #: The name of the application.
         self.appauthor = appauthor
-        """
-        The name of the app author or distributing body for this application.
+        """The name of the app author or distributing body for this application.
 
         Typically, it is the owning company name. Defaults to `appname`. You may pass ``False`` to disable it.
 
         """
         self.version = version
-        """
-        An optional version path element to append to the path.
+        """An optional version path element to append to the path.
 
         You might want to use this if you want multiple versions of your app to be able to run independently. If used,
         this would typically be ``<major>.<minor>``.
 
         """
         self.roaming = roaming
-        """
-        Whether to use the roaming appdata directory on Windows.
+        """Whether to use the roaming appdata directory on Windows.
 
         That means that for users on a Windows network setup for roaming profiles, this user data will be synced on
-        login (see
-        `here <https://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>`_).
+        login (see `here <https://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>`_).
 
         """
         self.multipath = multipath
+        """An optional parameter which indicates that the entire list of data dirs should be returned.
+
+        By default, the first item would only be returned. Only affects ``site_data_dir`` and ``site_config_dir`` on
+        Unix and macOS.
+
         """
-        An optional parameter which indicates that the entire list of data dirs should be returned.
+        self.opinion = opinion
+        """Whether to use opinionated values.
 
-        By default, the first item would only be returned.
+        When enabled, appends an additional subdirectory for certain directories: e.g. ``Cache`` for cache and ``Logs``
+        for logs on Windows, ``log`` for logs on Unix.
 
         """
-        self.opinion = opinion  #: A flag to indicating to use opinionated values.
         self.ensure_exists = ensure_exists
-        """
-        Optionally create the directory (and any missing parents) upon access if it does not exist.
+        """Optionally create the directory (and any missing parents) upon access if it does not exist.
 
         By default, no directories are created.
 
         """
+        self.use_site_for_root = use_site_for_root
+        """Whether to redirect ``user_*_dir`` calls to their ``site_*_dir`` equivalents when running as root (uid 0).
+
+        Only has an effect on Unix. Disabled by default for backwards compatibility. When enabled, XDG user environment
+        variables (e.g. ``XDG_DATA_HOME``) are bypassed for the redirected directories.
+
+        """
 
     def _append_app_name_and_version(self, *base: str) -> str:
         params = list(base[1:])
@@ -94,167 +110,227 @@ def _optionally_create_directory(self, path: str) -> None:
     def _first_item_as_path_if_multipath(self, directory: str) -> Path:
         if self.multipath:
             # If multipath is True, the first path is returned.
-            directory = directory.split(os.pathsep)[0]
+            directory = directory.partition(os.pathsep)[0]
         return Path(directory)
 
     @property
     @abstractmethod
     def user_data_dir(self) -> str:
-        """:return: data directory tied to the user"""
+        """:returns: data directory tied to the user"""
 
     @property
     @abstractmethod
     def site_data_dir(self) -> str:
-        """:return: data directory shared by users"""
+        """:returns: data directory shared by users"""
 
     @property
     @abstractmethod
     def user_config_dir(self) -> str:
-        """:return: config directory tied to the user"""
+        """:returns: config directory tied to the user"""
 
     @property
     @abstractmethod
     def site_config_dir(self) -> str:
-        """:return: config directory shared by the users"""
+        """:returns: config directory shared by users"""
 
     @property
     @abstractmethod
     def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user"""
+        """:returns: cache directory tied to the user"""
 
     @property
     @abstractmethod
     def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users"""
+        """:returns: cache directory shared by users"""
 
     @property
     @abstractmethod
     def user_state_dir(self) -> str:
-        """:return: state directory tied to the user"""
+        """:returns: state directory tied to the user"""
+
+    @property
+    @abstractmethod
+    def site_state_dir(self) -> str:
+        """:returns: state directory shared by users"""
 
     @property
     @abstractmethod
     def user_log_dir(self) -> str:
-        """:return: log directory tied to the user"""
+        """:returns: log directory tied to the user"""
+
+    @property
+    @abstractmethod
+    def site_log_dir(self) -> str:
+        """:returns: log directory shared by users"""
 
     @property
     @abstractmethod
     def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user"""
+        """:returns: documents directory tied to the user"""
 
     @property
     @abstractmethod
     def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user"""
+        """:returns: downloads directory tied to the user"""
 
     @property
     @abstractmethod
     def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user"""
+        """:returns: pictures directory tied to the user"""
 
     @property
     @abstractmethod
     def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user"""
+        """:returns: videos directory tied to the user"""
 
     @property
     @abstractmethod
     def user_music_dir(self) -> str:
-        """:return: music directory tied to the user"""
+        """:returns: music directory tied to the user"""
 
     @property
     @abstractmethod
     def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user"""
+        """:returns: desktop directory tied to the user"""
+
+    @property
+    @abstractmethod
+    def user_bin_dir(self) -> str:
+        """:returns: bin directory tied to the user"""
+
+    @property
+    @abstractmethod
+    def site_bin_dir(self) -> str:
+        """:returns: bin directory shared by users"""
+
+    @property
+    @abstractmethod
+    def user_applications_dir(self) -> str:
+        """:returns: applications directory tied to the user"""
+
+    @property
+    @abstractmethod
+    def site_applications_dir(self) -> str:
+        """:returns: applications directory shared by users"""
 
     @property
     @abstractmethod
     def user_runtime_dir(self) -> str:
-        """:return: runtime directory tied to the user"""
+        """:returns: runtime directory tied to the user"""
 
     @property
     @abstractmethod
     def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users"""
+        """:returns: runtime directory shared by users"""
 
     @property
     def user_data_path(self) -> Path:
-        """:return: data path tied to the user"""
+        """:returns: data path tied to the user"""
         return Path(self.user_data_dir)
 
     @property
     def site_data_path(self) -> Path:
-        """:return: data path shared by users"""
+        """:returns: data path shared by users"""
         return Path(self.site_data_dir)
 
     @property
     def user_config_path(self) -> Path:
-        """:return: config path tied to the user"""
+        """:returns: config path tied to the user"""
         return Path(self.user_config_dir)
 
     @property
     def site_config_path(self) -> Path:
-        """:return: config path shared by the users"""
+        """:returns: config path shared by users"""
         return Path(self.site_config_dir)
 
     @property
     def user_cache_path(self) -> Path:
-        """:return: cache path tied to the user"""
+        """:returns: cache path tied to the user"""
         return Path(self.user_cache_dir)
 
     @property
     def site_cache_path(self) -> Path:
-        """:return: cache path shared by users"""
+        """:returns: cache path shared by users"""
         return Path(self.site_cache_dir)
 
     @property
     def user_state_path(self) -> Path:
-        """:return: state path tied to the user"""
+        """:returns: state path tied to the user"""
         return Path(self.user_state_dir)
 
+    @property
+    def site_state_path(self) -> Path:
+        """:returns: state path shared by users"""
+        return Path(self.site_state_dir)
+
     @property
     def user_log_path(self) -> Path:
-        """:return: log path tied to the user"""
+        """:returns: log path tied to the user"""
         return Path(self.user_log_dir)
 
+    @property
+    def site_log_path(self) -> Path:
+        """:returns: log path shared by users"""
+        return Path(self.site_log_dir)
+
     @property
     def user_documents_path(self) -> Path:
-        """:return: documents a path tied to the user"""
+        """:returns: documents path tied to the user"""
         return Path(self.user_documents_dir)
 
     @property
     def user_downloads_path(self) -> Path:
-        """:return: downloads path tied to the user"""
+        """:returns: downloads path tied to the user"""
         return Path(self.user_downloads_dir)
 
     @property
     def user_pictures_path(self) -> Path:
-        """:return: pictures path tied to the user"""
+        """:returns: pictures path tied to the user"""
         return Path(self.user_pictures_dir)
 
     @property
     def user_videos_path(self) -> Path:
-        """:return: videos path tied to the user"""
+        """:returns: videos path tied to the user"""
         return Path(self.user_videos_dir)
 
     @property
     def user_music_path(self) -> Path:
-        """:return: music path tied to the user"""
+        """:returns: music path tied to the user"""
         return Path(self.user_music_dir)
 
     @property
     def user_desktop_path(self) -> Path:
-        """:return: desktop path tied to the user"""
+        """:returns: desktop path tied to the user"""
         return Path(self.user_desktop_dir)
 
+    @property
+    def user_bin_path(self) -> Path:
+        """:returns: bin path tied to the user"""
+        return Path(self.user_bin_dir)
+
+    @property
+    def site_bin_path(self) -> Path:
+        """:returns: bin path shared by users"""
+        return Path(self.site_bin_dir)
+
+    @property
+    def user_applications_path(self) -> Path:
+        """:returns: applications path tied to the user"""
+        return Path(self.user_applications_dir)
+
+    @property
+    def site_applications_path(self) -> Path:
+        """:returns: applications path shared by users"""
+        return Path(self.site_applications_dir)
+
     @property
     def user_runtime_path(self) -> Path:
-        """:return: runtime path tied to the user"""
+        """:returns: runtime path tied to the user"""
         return Path(self.user_runtime_dir)
 
     @property
     def site_runtime_path(self) -> Path:
-        """:return: runtime path shared by users"""
+        """:returns: runtime path shared by users"""
         return Path(self.site_runtime_dir)
 
     def iter_config_dirs(self) -> Iterator[str]:
@@ -272,6 +348,16 @@ def iter_cache_dirs(self) -> Iterator[str]:
         yield self.user_cache_dir
         yield self.site_cache_dir
 
+    def iter_state_dirs(self) -> Iterator[str]:
+        """:yield: all user and site state directories."""
+        yield self.user_state_dir
+        yield self.site_state_dir
+
+    def iter_log_dirs(self) -> Iterator[str]:
+        """:yield: all user and site log directories."""
+        yield self.user_log_dir
+        yield self.site_log_dir
+
     def iter_runtime_dirs(self) -> Iterator[str]:
         """:yield: all user and site runtime directories."""
         yield self.user_runtime_dir
@@ -292,6 +378,16 @@ def iter_cache_paths(self) -> Iterator[Path]:
         for path in self.iter_cache_dirs():
             yield Path(path)
 
+    def iter_state_paths(self) -> Iterator[Path]:
+        """:yield: all user and site state paths."""
+        for path in self.iter_state_dirs():
+            yield Path(path)
+
+    def iter_log_paths(self) -> Iterator[Path]:
+        """:yield: all user and site log paths."""
+        for path in self.iter_log_dirs():
+            yield Path(path)
+
     def iter_runtime_paths(self) -> Iterator[Path]:
         """:yield: all user and site runtime paths."""
         for path in self.iter_runtime_dirs():
diff --git a/libs/platformdirs/macos.py b/libs/platformdirs/macos.py
index e4b0391abd..249324672b 100644
--- a/libs/platformdirs/macos.py
+++ b/libs/platformdirs/macos.py
@@ -6,78 +6,63 @@
 import sys
 from typing import TYPE_CHECKING
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
+from ._xdg import XDGMixin
 from .api import PlatformDirsABC
 
 if TYPE_CHECKING:
     from pathlib import Path
 
 
-class MacOS(PlatformDirsABC):
-    """
-    Platform directories for the macOS operating system.
+class _MacOSDefaults(PlatformDirsABC):  # noqa: PLR0904
+    """Default platform directories for macOS without XDG environment variable overrides.
 
-    Follows the guidance from
-    `Apple documentation <https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html>`_.
-    Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`,
-    `version <platformdirs.api.PlatformDirsABC.version>`,
-    `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    Follows the guidance from `Apple's File System Programming Guide
+    <https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html>`_.
+    The XDG env var handling is in :class:`~platformdirs._xdg.XDGMixin`.
 
     """
 
     @property
     def user_data_dir(self) -> str:
-        """:return: data directory tied to the user, e.g. ``~/Library/Application Support/$appname/$version``"""
+        """:returns: data directory tied to the user, e.g. ``~/Library/Application Support/$appname/$version``"""
         return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support"))  # noqa: PTH111
 
     @property
-    def site_data_dir(self) -> str:
-        """
-        :return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``.
-          If we're using a Python binary managed by `Homebrew <https://brew.sh>`_, the directory
-          will be under the Homebrew prefix, e.g. ``/opt/homebrew/share/$appname/$version``.
-          If `multipath <platformdirs.api.PlatformDirsABC.multipath>` is enabled, and we're in Homebrew,
-          the response is a multi-path string separated by ":", e.g.
-          ``/opt/homebrew/share/$appname/$version:/Library/Application Support/$appname/$version``
-        """
-        is_homebrew = sys.prefix.startswith("/opt/homebrew")
-        path_list = [self._append_app_name_and_version("/opt/homebrew/share")] if is_homebrew else []
+    def _site_data_dirs(self) -> list[str]:
+        is_homebrew = "/opt/python" in sys.prefix
+        homebrew_prefix = sys.prefix.split("/opt/python")[0] if is_homebrew else ""
+        path_list = [self._append_app_name_and_version(f"{homebrew_prefix}/share")] if is_homebrew else []
         path_list.append(self._append_app_name_and_version("/Library/Application Support"))
-        if self.multipath:
-            return os.pathsep.join(path_list)
-        return path_list[0]
+        return path_list
 
     @property
     def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+        """:returns: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_data_dir)
 
     @property
     def user_config_dir(self) -> str:
-        """:return: config directory tied to the user, same as `user_data_dir`"""
+        """:returns: config directory tied to the user, same as `user_data_dir`"""
         return self.user_data_dir
 
     @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `site_data_dir`"""
-        return self.site_data_dir
+    def _site_config_dirs(self) -> list[str]:
+        return self._site_data_dirs
 
     @property
     def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g. ``~/Library/Caches/$appname/$version``"""
+        """:returns: cache directory tied to the user, e.g. ``~/Library/Caches/$appname/$version``"""
         return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches"))  # noqa: PTH111
 
     @property
     def site_cache_dir(self) -> str:
-        """
-        :return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``.
-          If we're using a Python binary managed by `Homebrew <https://brew.sh>`_, the directory
-          will be under the Homebrew prefix, e.g. ``/opt/homebrew/var/cache/$appname/$version``.
-          If `multipath <platformdirs.api.PlatformDirsABC.multipath>` is enabled, and we're in Homebrew,
-          the response is a multi-path string separated by ":", e.g.
-          ``/opt/homebrew/var/cache/$appname/$version:/Library/Caches/$appname/$version``
-        """
-        is_homebrew = sys.prefix.startswith("/opt/homebrew")
-        path_list = [self._append_app_name_and_version("/opt/homebrew/var/cache")] if is_homebrew else []
+        """:returns: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``. If we're using a Python binary managed by `Homebrew <https://brew.sh>`_, the directory will be under the Homebrew prefix, e.g. ``$homebrew_prefix/var/cache/$appname/$version``. If `multipath <platformdirs.api.PlatformDirsABC.multipath>` is enabled, and we're in Homebrew, the response is a multi-path string separated by ":", e.g. ``$homebrew_prefix/var/cache/$appname/$version:/Library/Caches/$appname/$version``"""
+        is_homebrew = "/opt/python" in sys.prefix
+        homebrew_prefix = sys.prefix.split("/opt/python")[0] if is_homebrew else ""
+        path_list = [self._append_app_name_and_version(f"{homebrew_prefix}/var/cache")] if is_homebrew else []
         path_list.append(self._append_app_name_and_version("/Library/Caches"))
         if self.multipath:
             return os.pathsep.join(path_list)
@@ -85,59 +70,117 @@ def site_cache_dir(self) -> str:
 
     @property
     def site_cache_path(self) -> Path:
-        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+        """:returns: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_cache_dir)
 
     @property
     def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
+        """:returns: state directory tied to the user, same as `user_data_dir`"""
         return self.user_data_dir
 
+    @property
+    def site_state_dir(self) -> str:
+        """:returns: state directory shared by users, same as `site_data_dir`"""
+        return self.site_data_dir
+
     @property
     def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, e.g. ``~/Library/Logs/$appname/$version``"""
+        """:returns: log directory tied to the user, e.g. ``~/Library/Logs/$appname/$version``"""
         return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs"))  # noqa: PTH111
 
+    @property
+    def site_log_dir(self) -> str:
+        """:returns: log directory shared by users, e.g. ``/Library/Logs/$appname/$version``"""
+        return self._append_app_name_and_version("/Library/Logs")
+
     @property
     def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user, e.g. ``~/Documents``"""
+        """:returns: documents directory tied to the user, e.g. ``~/Documents``"""
         return os.path.expanduser("~/Documents")  # noqa: PTH111
 
     @property
     def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
+        """:returns: downloads directory tied to the user, e.g. ``~/Downloads``"""
         return os.path.expanduser("~/Downloads")  # noqa: PTH111
 
     @property
     def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
+        """:returns: pictures directory tied to the user, e.g. ``~/Pictures``"""
         return os.path.expanduser("~/Pictures")  # noqa: PTH111
 
     @property
     def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user, e.g. ``~/Movies``"""
+        """:returns: videos directory tied to the user, e.g. ``~/Movies``"""
         return os.path.expanduser("~/Movies")  # noqa: PTH111
 
     @property
     def user_music_dir(self) -> str:
-        """:return: music directory tied to the user, e.g. ``~/Music``"""
+        """:returns: music directory tied to the user, e.g. ``~/Music``"""
         return os.path.expanduser("~/Music")  # noqa: PTH111
 
     @property
     def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
+        """:returns: desktop directory tied to the user, e.g. ``~/Desktop``"""
         return os.path.expanduser("~/Desktop")  # noqa: PTH111
 
+    @property
+    def user_bin_dir(self) -> str:
+        """:returns: bin directory tied to the user, e.g. ``~/.local/bin``"""
+        return os.path.expanduser("~/.local/bin")  # noqa: PTH111
+
+    @property
+    def site_bin_dir(self) -> str:
+        """:returns: bin directory shared by users, e.g. ``/usr/local/bin``"""
+        return "/usr/local/bin"
+
+    @property
+    def user_applications_dir(self) -> str:
+        """:returns: applications directory tied to the user, e.g. ``~/Applications``"""
+        return os.path.expanduser("~/Applications")  # noqa: PTH111
+
+    @property
+    def _site_applications_dirs(self) -> list[str]:
+        return ["/Applications"]
+
+    @property
+    def site_applications_dir(self) -> str:
+        """:returns: applications directory shared by users, e.g. ``/Applications``"""
+        dirs = self._site_applications_dirs
+        return os.pathsep.join(dirs) if self.multipath else dirs[0]
+
     @property
     def user_runtime_dir(self) -> str:
-        """:return: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``"""
+        """:returns: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``"""
         return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems"))  # noqa: PTH111
 
     @property
     def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
+        """:returns: runtime directory shared by users, same as `user_runtime_dir`"""
         return self.user_runtime_dir
 
+    def iter_config_dirs(self) -> Iterator[str]:
+        """:yield: all user and site configuration directories."""
+        yield self.user_config_dir
+        yield from self._site_config_dirs
+
+    def iter_data_dirs(self) -> Iterator[str]:
+        """:yield: all user and site data directories."""
+        yield self.user_data_dir
+        yield from self._site_data_dirs
+
+
+class MacOS(XDGMixin, _MacOSDefaults):
+    """Platform directories for the macOS operating system.
+
+    Follows the guidance from `Apple documentation
+    <https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html>`_.
+    Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`, `version
+    <platformdirs.api.PlatformDirsABC.version>`, `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    XDG environment variables (e.g. ``$XDG_DATA_HOME``) are supported and take precedence over macOS defaults.
+
+    """
+
 
 __all__ = [
     "MacOS",
diff --git a/libs/platformdirs/unix.py b/libs/platformdirs/unix.py
index f1942e92ef..0638700c19 100644
--- a/libs/platformdirs/unix.py
+++ b/libs/platformdirs/unix.py
@@ -5,11 +5,17 @@
 import os
 import sys
 from configparser import ConfigParser
+from functools import cached_property
 from pathlib import Path
-from typing import Iterator, NoReturn
+from tempfile import gettempdir
+from typing import TYPE_CHECKING, NoReturn
 
+from ._xdg import XDGMixin
 from .api import PlatformDirsABC
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 if sys.platform == "win32":
 
     def getuid() -> NoReturn:
@@ -20,202 +26,175 @@ def getuid() -> NoReturn:
     from os import getuid
 
 
-class Unix(PlatformDirsABC):  # noqa: PLR0904
-    """
-    On Unix/Linux, we follow the `XDG Basedir Spec <https://specifications.freedesktop.org/basedir-spec/basedir-spec-
-    latest.html>`_.
+class _UnixDefaults(PlatformDirsABC):  # noqa: PLR0904
+    """Default directories for Unix/Linux without XDG environment variable overrides.
 
-    The spec allows overriding directories with environment variables. The examples shown are the default values,
-    alongside the name of the environment variable that overrides them. Makes use of the `appname
-    <platformdirs.api.PlatformDirsABC.appname>`, `version <platformdirs.api.PlatformDirsABC.version>`, `multipath
-    <platformdirs.api.PlatformDirsABC.multipath>`, `opinion <platformdirs.api.PlatformDirsABC.opinion>`, `ensure_exists
-    <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+    The XDG env var handling is in :class:`~platformdirs._xdg.XDGMixin`.
 
     """
 
+    @cached_property
+    def _use_site(self) -> bool:
+        return self.use_site_for_root and getuid() == 0
+
     @property
     def user_data_dir(self) -> str:
-        """
-        :return: data directory tied to the user, e.g. ``~/.local/share/$appname/$version`` or
-         ``$XDG_DATA_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_DATA_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.local/share")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
+        """:returns: data directory tied to the user, e.g. ``~/.local/share/$appname/$version`` or ``$XDG_DATA_HOME/$appname/$version``"""
+        return self._append_app_name_and_version(os.path.expanduser("~/.local/share"))  # noqa: PTH111
 
     @property
     def _site_data_dirs(self) -> list[str]:
-        path = os.environ.get("XDG_DATA_DIRS", "")
-        if not path.strip():
-            path = f"/usr/local/share{os.pathsep}/usr/share"
-        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
-    @property
-    def site_data_dir(self) -> str:
-        """
-        :return: data directories shared by users (if `multipath <platformdirs.api.PlatformDirsABC.multipath>` is
-         enabled and ``XDG_DATA_DIRS`` is set and a multi path the response is also a multi path separated by the
-         OS path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
-        """
-        # XDG default for $XDG_DATA_DIRS; only first, if multipath is False
-        dirs = self._site_data_dirs
-        if not self.multipath:
-            return dirs[0]
-        return os.pathsep.join(dirs)
+        return [self._append_app_name_and_version("/usr/local/share"), self._append_app_name_and_version("/usr/share")]
 
     @property
     def user_config_dir(self) -> str:
-        """
-        :return: config directory tied to the user, e.g. ``~/.config/$appname/$version`` or
-         ``$XDG_CONFIG_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_CONFIG_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.config")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
+        """:returns: config directory tied to the user, e.g. ``~/.config/$appname/$version`` or ``$XDG_CONFIG_HOME/$appname/$version``"""
+        return self._append_app_name_and_version(os.path.expanduser("~/.config"))  # noqa: PTH111
 
     @property
     def _site_config_dirs(self) -> list[str]:
-        path = os.environ.get("XDG_CONFIG_DIRS", "")
-        if not path.strip():
-            path = "/etc/xdg"
-        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
-    @property
-    def site_config_dir(self) -> str:
-        """
-        :return: config directories shared by users (if `multipath <platformdirs.api.PlatformDirsABC.multipath>`
-         is enabled and ``XDG_CONFIG_DIRS`` is set and a multi path the response is also a multi path separated by
-         the OS path separator), e.g. ``/etc/xdg/$appname/$version``
-        """
-        # XDG default for $XDG_CONFIG_DIRS only first, if multipath is False
-        dirs = self._site_config_dirs
-        if not self.multipath:
-            return dirs[0]
-        return os.pathsep.join(dirs)
+        return [self._append_app_name_and_version("/etc/xdg")]
 
     @property
     def user_cache_dir(self) -> str:
-        """
-        :return: cache directory tied to the user, e.g. ``~/.cache/$appname/$version`` or
-         ``~/$XDG_CACHE_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_CACHE_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.cache")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
+        """:returns: cache directory tied to the user, e.g. ``~/.cache/$appname/$version`` or ``$XDG_CACHE_HOME/$appname/$version``"""
+        return self._append_app_name_and_version(os.path.expanduser("~/.cache"))  # noqa: PTH111
 
     @property
     def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``/var/cache/$appname/$version``"""
+        """:returns: cache directory shared by users, e.g. ``/var/cache/$appname/$version``"""
         return self._append_app_name_and_version("/var/cache")
 
     @property
     def user_state_dir(self) -> str:
-        """
-        :return: state directory tied to the user, e.g. ``~/.local/state/$appname/$version`` or
-         ``$XDG_STATE_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_STATE_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.local/state")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
+        """:returns: state directory tied to the user, e.g. ``~/.local/state/$appname/$version`` or ``$XDG_STATE_HOME/$appname/$version``"""
+        return self._append_app_name_and_version(os.path.expanduser("~/.local/state"))  # noqa: PTH111
+
+    @property
+    def site_state_dir(self) -> str:
+        """:returns: state directory shared by users, e.g. ``/var/lib/$appname/$version``"""
+        return self._append_app_name_and_version("/var/lib")
 
     @property
     def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it"""
+        """:returns: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it"""
         path = self.user_state_dir
         if self.opinion:
             path = os.path.join(path, "log")  # noqa: PTH118
             self._optionally_create_directory(path)
         return path
 
+    @property
+    def site_log_dir(self) -> str:
+        """:returns: log directory shared by users, e.g. ``/var/log/$appname/$version``
+
+        Unlike `user_log_dir`, ``opinion`` has no effect since ``/var/log`` is inherently a log directory.
+
+        """
+        return self._append_app_name_and_version("/var/log")
+
     @property
     def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user, e.g. ``~/Documents``"""
+        """:returns: documents directory tied to the user, e.g. ``~/Documents``"""
         return _get_user_media_dir("XDG_DOCUMENTS_DIR", "~/Documents")
 
     @property
     def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
+        """:returns: downloads directory tied to the user, e.g. ``~/Downloads``"""
         return _get_user_media_dir("XDG_DOWNLOAD_DIR", "~/Downloads")
 
     @property
     def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
+        """:returns: pictures directory tied to the user, e.g. ``~/Pictures``"""
         return _get_user_media_dir("XDG_PICTURES_DIR", "~/Pictures")
 
     @property
     def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user, e.g. ``~/Videos``"""
+        """:returns: videos directory tied to the user, e.g. ``~/Videos``"""
         return _get_user_media_dir("XDG_VIDEOS_DIR", "~/Videos")
 
     @property
     def user_music_dir(self) -> str:
-        """:return: music directory tied to the user, e.g. ``~/Music``"""
+        """:returns: music directory tied to the user, e.g. ``~/Music``"""
         return _get_user_media_dir("XDG_MUSIC_DIR", "~/Music")
 
     @property
     def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
+        """:returns: desktop directory tied to the user, e.g. ``~/Desktop``"""
         return _get_user_media_dir("XDG_DESKTOP_DIR", "~/Desktop")
 
+    @property
+    def user_bin_dir(self) -> str:
+        """:returns: bin directory tied to the user, e.g. ``~/.local/bin``"""
+        return os.path.expanduser("~/.local/bin")  # noqa: PTH111
+
+    @property
+    def site_bin_dir(self) -> str:
+        """:returns: bin directory shared by users, e.g. ``/usr/local/bin``"""
+        return "/usr/local/bin"
+
+    @property
+    def user_applications_dir(self) -> str:
+        """:returns: applications directory tied to the user, e.g. ``~/.local/share/applications``"""
+        return os.path.join(os.path.expanduser("~/.local/share"), "applications")  # noqa: PTH111, PTH118
+
+    @property
+    def _site_applications_dirs(self) -> list[str]:
+        return [os.path.join(p, "applications") for p in ["/usr/local/share", "/usr/share"]]  # noqa: PTH118
+
+    @property
+    def site_applications_dir(self) -> str:
+        """:returns: applications directory shared by users, e.g. ``/usr/share/applications``"""
+        dirs = self._site_applications_dirs
+        return os.pathsep.join(dirs) if self.multipath else dirs[0]
+
     @property
     def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, e.g. ``/run/user/$(id -u)/$appname/$version`` or
-         ``$XDG_RUNTIME_DIR/$appname/$version``.
+        """:returns: runtime directory tied to the user, e.g. ``$XDG_RUNTIME_DIR/$appname/$version``.
+
+        If ``$XDG_RUNTIME_DIR`` is unset, tries the platform default (``/tmp/run/user/$(id -u)`` on OpenBSD, ``/var/run/user/$(id -u)`` on FreeBSD/NetBSD, ``/run/user/$(id -u)`` otherwise). If the default is not writable, falls back to a temporary directory.
 
-         For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/user/$(id -u)/$appname/$version`` if
-         exists, otherwise ``/tmp/runtime-$(id -u)/$appname/$version``, if``$XDG_RUNTIME_DIR``
-         is not set.
         """
-        path = os.environ.get("XDG_RUNTIME_DIR", "")
-        if not path.strip():
-            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
-                path = f"/var/run/user/{getuid()}"
-                if not Path(path).exists():
-                    path = f"/tmp/runtime-{getuid()}"  # noqa: S108
-            else:
-                path = f"/run/user/{getuid()}"
+        if sys.platform.startswith("openbsd"):
+            path = f"/tmp/run/user/{getuid()}"  # noqa: S108
+        elif sys.platform.startswith(("freebsd", "netbsd")):
+            path = f"/var/run/user/{getuid()}"
+        else:
+            path = f"/run/user/{getuid()}"
+        if not os.access(path, os.W_OK):
+            path = f"{gettempdir()}/runtime-{getuid()}"
         return self._append_app_name_and_version(path)
 
     @property
     def site_runtime_dir(self) -> str:
-        """
-        :return: runtime directory shared by users, e.g. ``/run/$appname/$version`` or \
-        ``$XDG_RUNTIME_DIR/$appname/$version``.
+        """:returns: runtime directory shared by users, e.g. ``/run/$appname/$version`` or ``$XDG_RUNTIME_DIR/$appname/$version``.
 
-        Note that this behaves almost exactly like `user_runtime_dir` if ``$XDG_RUNTIME_DIR`` is set, but will
-        fall back to paths associated to the root user instead of a regular logged-in user if it's not set.
+        Note that this behaves almost exactly like `user_runtime_dir` if ``$XDG_RUNTIME_DIR`` is set, but will fall back to paths associated to the root user instead of a regular logged-in user if it's not set.
 
-        If you wish to ensure that a logged-in root user path is returned e.g. ``/run/user/0``, use `user_runtime_dir`
-        instead.
+        If you wish to ensure that a logged-in root user path is returned e.g. ``/run/user/0``, use `user_runtime_dir` instead.
 
         For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/$appname/$version`` if ``$XDG_RUNTIME_DIR`` is not set.
+
         """
-        path = os.environ.get("XDG_RUNTIME_DIR", "")
-        if not path.strip():
-            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
-                path = "/var/run"
-            else:
-                path = "/run"
+        if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
+            path = "/var/run"
+        else:
+            path = "/run"
         return self._append_app_name_and_version(path)
 
     @property
     def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+        """:returns: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_data_dir)
 
     @property
     def site_config_path(self) -> Path:
-        """:return: config path shared by the users, returns the first item, even if ``multipath`` is set to ``True``"""
+        """:returns: config path shared by users, returns the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_config_dir)
 
     @property
     def site_cache_path(self) -> Path:
-        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
+        """:returns: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
         return self._first_item_as_path_if_multipath(self.site_cache_dir)
 
     def iter_config_dirs(self) -> Iterator[str]:
@@ -229,36 +208,82 @@ def iter_data_dirs(self) -> Iterator[str]:
         yield from self._site_data_dirs
 
 
-def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
-    media_dir = _get_user_dirs_folder(env_var)
-    if media_dir is None:
-        media_dir = os.environ.get(env_var, "").strip()
-        if not media_dir:
-            media_dir = os.path.expanduser(fallback_tilde_path)  # noqa: PTH111
+class Unix(XDGMixin, _UnixDefaults):
+    """On Unix/Linux, we follow the `XDG Basedir Spec <https://specifications.freedesktop.org/basedir/latest/>`_.
 
-    return media_dir
+    The spec allows overriding directories with environment variables. The examples shown are the default values,
+    alongside the name of the environment variable that overrides them. Makes use of the `appname
+    <platformdirs.api.PlatformDirsABC.appname>`, `version <platformdirs.api.PlatformDirsABC.version>`, `multipath
+    <platformdirs.api.PlatformDirsABC.multipath>`, `opinion <platformdirs.api.PlatformDirsABC.opinion>`, `ensure_exists
+    <platformdirs.api.PlatformDirsABC.ensure_exists>`.
+
+    """
+
+    @property
+    def user_data_dir(self) -> str:
+        """:returns: data directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_data_dir if self._use_site else super().user_data_dir
+
+    @property
+    def user_config_dir(self) -> str:
+        """:returns: config directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_config_dir if self._use_site else super().user_config_dir
+
+    @property
+    def user_cache_dir(self) -> str:
+        """:returns: cache directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_cache_dir if self._use_site else super().user_cache_dir
+
+    @property
+    def user_state_dir(self) -> str:
+        """:returns: state directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_state_dir if self._use_site else super().user_state_dir
+
+    @property
+    def user_log_dir(self) -> str:
+        """:returns: log directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_log_dir if self._use_site else super().user_log_dir
+
+    @property
+    def user_applications_dir(self) -> str:
+        """:returns: applications directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_applications_dir if self._use_site else super().user_applications_dir
+
+    @property
+    def user_runtime_dir(self) -> str:
+        """:returns: runtime directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_runtime_dir if self._use_site else super().user_runtime_dir
+
+    @property
+    def user_bin_dir(self) -> str:
+        """:returns: bin directory tied to the user, or site equivalent when root with ``use_site_for_root``"""
+        return self.site_bin_dir if self._use_site else super().user_bin_dir
+
+
+def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
+    if media_dir := _get_user_dirs_folder(env_var):
+        return media_dir
+    return os.path.expanduser(fallback_tilde_path)  # noqa: PTH111
 
 
 def _get_user_dirs_folder(key: str) -> str | None:
-    """
-    Return directory from user-dirs.dirs config file.
+    """Return directory from user-dirs.dirs config file.
 
     See https://freedesktop.org/wiki/Software/xdg-user-dirs/.
 
     """
-    user_dirs_config_path = Path(Unix().user_config_dir) / "user-dirs.dirs"
+    config_home = os.environ.get("XDG_CONFIG_HOME", "").strip() or os.path.expanduser("~/.config")  # noqa: PTH111
+    user_dirs_config_path = Path(config_home) / "user-dirs.dirs"
     if user_dirs_config_path.exists():
         parser = ConfigParser()
 
         with user_dirs_config_path.open() as stream:
-            # Add fake section header, so ConfigParser doesn't complain
             parser.read_string(f"[top]\n{stream.read()}")
 
         if key not in parser["top"]:
             return None
 
         path = parser["top"][key].strip('"')
-        # Handle relative home paths
         return path.replace("$HOME", os.path.expanduser("~"))  # noqa: PTH111
 
     return None
diff --git a/libs/platformdirs/version.py b/libs/platformdirs/version.py
index afb49243e3..190c600dc6 100644
--- a/libs/platformdirs/version.py
+++ b/libs/platformdirs/version.py
@@ -1,16 +1,34 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '4.9.4'
+__version_tuple__ = version_tuple = (4, 9, 4)
 
-__version__ = version = '4.3.6'
-__version_tuple__ = version_tuple = (4, 3, 6)
+__commit_id__ = commit_id = None
diff --git a/libs/platformdirs/windows.py b/libs/platformdirs/windows.py
index d7bc96091a..47403dea5e 100644
--- a/libs/platformdirs/windows.py
+++ b/libs/platformdirs/windows.py
@@ -4,18 +4,19 @@
 
 import os
 import sys
-from functools import lru_cache
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Final
 
 from .api import PlatformDirsABC
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
+# Not exposed by CPython; defined in the Windows SDK (shlobj_core.h)
+_KF_FLAG_DONT_VERIFY: Final[int] = 0x00004000
 
-class Windows(PlatformDirsABC):
-    """
-    `MSDN on where to store app data files <https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid>`_.
+
+class Windows(PlatformDirsABC):  # noqa: PLR0904
+    """`MSDN on where to store app data files <https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid>`_.
 
     Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`, `appauthor
     <platformdirs.api.PlatformDirsABC.appauthor>`, `version <platformdirs.api.PlatformDirsABC.version>`, `roaming
@@ -26,11 +27,7 @@ class Windows(PlatformDirsABC):
 
     @property
     def user_data_dir(self) -> str:
-        """
-        :return: data directory tied to the user, e.g.
-         ``%USERPROFILE%\\AppData\\Local\\$appauthor\\$appname`` (not roaming) or
-         ``%USERPROFILE%\\AppData\\Roaming\\$appauthor\\$appname`` (roaming)
-        """
+        r""":returns: data directory tied to the user, e.g. ``%USERPROFILE%\AppData\Local\$appauthor\$appname`` (not roaming) or ``%USERPROFILE%\AppData\Roaming\$appauthor\$appname`` (roaming)"""
         const = "CSIDL_APPDATA" if self.roaming else "CSIDL_LOCAL_APPDATA"
         path = os.path.normpath(get_win_folder(const))
         return self._append_parts(path)
@@ -52,91 +49,119 @@ def _append_parts(self, path: str, *, opinion_value: str | None = None) -> str:
 
     @property
     def site_data_dir(self) -> str:
-        """:return: data directory shared by users, e.g. ``C:\\ProgramData\\$appauthor\\$appname``"""
+        r""":returns: data directory shared by users, e.g. ``C:\ProgramData\$appauthor\$appname``"""
         path = os.path.normpath(get_win_folder("CSIDL_COMMON_APPDATA"))
         return self._append_parts(path)
 
     @property
     def user_config_dir(self) -> str:
-        """:return: config directory tied to the user, same as `user_data_dir`"""
+        """:returns: config directory tied to the user, same as `user_data_dir`"""
         return self.user_data_dir
 
     @property
     def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `site_data_dir`"""
+        """:returns: config directory shared by users, same as `site_data_dir`"""
         return self.site_data_dir
 
     @property
     def user_cache_dir(self) -> str:
-        """
-        :return: cache directory tied to the user (if opinionated with ``Cache`` folder within ``$appname``) e.g.
-         ``%USERPROFILE%\\AppData\\Local\\$appauthor\\$appname\\Cache\\$version``
-        """
+        r""":returns: cache directory tied to the user (if opinionated with ``Cache`` folder within ``$appname``) e.g. ``%USERPROFILE%\AppData\Local\$appauthor\$appname\Cache\$version``"""
         path = os.path.normpath(get_win_folder("CSIDL_LOCAL_APPDATA"))
         return self._append_parts(path, opinion_value="Cache")
 
     @property
     def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``C:\\ProgramData\\$appauthor\\$appname\\Cache\\$version``"""
+        r""":returns: cache directory shared by users, e.g. ``C:\ProgramData\$appauthor\$appname\Cache\$version``"""
         path = os.path.normpath(get_win_folder("CSIDL_COMMON_APPDATA"))
         return self._append_parts(path, opinion_value="Cache")
 
     @property
     def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
+        """:returns: state directory tied to the user, same as `user_data_dir`"""
         return self.user_data_dir
 
+    @property
+    def site_state_dir(self) -> str:
+        """:returns: state directory shared by users, same as `site_data_dir`"""
+        return self.site_data_dir
+
     @property
     def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it"""
+        """:returns: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it"""
         path = self.user_data_dir
         if self.opinion:
             path = os.path.join(path, "Logs")  # noqa: PTH118
             self._optionally_create_directory(path)
         return path
 
+    @property
+    def site_log_dir(self) -> str:
+        """:returns: log directory shared by users, same as `site_data_dir` if not opinionated else ``Logs`` in it"""
+        path = self.site_data_dir
+        if self.opinion:
+            path = os.path.join(path, "Logs")  # noqa: PTH118
+            self._optionally_create_directory(path)
+        return path
+
     @property
     def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents``"""
+        r""":returns: documents directory tied to the user e.g. ``%USERPROFILE%\Documents``"""
         return os.path.normpath(get_win_folder("CSIDL_PERSONAL"))
 
     @property
     def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user e.g. ``%USERPROFILE%\\Downloads``"""
+        r""":returns: downloads directory tied to the user e.g. ``%USERPROFILE%\Downloads``"""
         return os.path.normpath(get_win_folder("CSIDL_DOWNLOADS"))
 
     @property
     def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user e.g. ``%USERPROFILE%\\Pictures``"""
+        r""":returns: pictures directory tied to the user e.g. ``%USERPROFILE%\Pictures``"""
         return os.path.normpath(get_win_folder("CSIDL_MYPICTURES"))
 
     @property
     def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user e.g. ``%USERPROFILE%\\Videos``"""
+        r""":returns: videos directory tied to the user e.g. ``%USERPROFILE%\Videos``"""
         return os.path.normpath(get_win_folder("CSIDL_MYVIDEO"))
 
     @property
     def user_music_dir(self) -> str:
-        """:return: music directory tied to the user e.g. ``%USERPROFILE%\\Music``"""
+        r""":returns: music directory tied to the user e.g. ``%USERPROFILE%\Music``"""
         return os.path.normpath(get_win_folder("CSIDL_MYMUSIC"))
 
     @property
     def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``%USERPROFILE%\\Desktop``"""
+        r""":returns: desktop directory tied to the user, e.g. ``%USERPROFILE%\Desktop``"""
         return os.path.normpath(get_win_folder("CSIDL_DESKTOPDIRECTORY"))
 
+    @property
+    def user_bin_dir(self) -> str:
+        r""":returns: bin directory tied to the user, e.g. ``%LOCALAPPDATA%\Programs``"""
+        return os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Programs"))  # noqa: PTH118
+
+    @property
+    def site_bin_dir(self) -> str:
+        """:returns: bin directory shared by users, e.g. ``C:\\ProgramData\bin``"""
+        return os.path.normpath(os.path.join(get_win_folder("CSIDL_COMMON_APPDATA"), "bin"))  # noqa: PTH118
+
+    @property
+    def user_applications_dir(self) -> str:
+        r""":returns: applications directory tied to the user, e.g. ``Start Menu\Programs``"""
+        return os.path.normpath(get_win_folder("CSIDL_PROGRAMS"))
+
+    @property
+    def site_applications_dir(self) -> str:
+        r""":returns: applications directory shared by users, e.g. ``C:\ProgramData\Microsoft\Windows\Start Menu\Programs``"""
+        return os.path.normpath(get_win_folder("CSIDL_COMMON_PROGRAMS"))
+
     @property
     def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, e.g.
-         ``%USERPROFILE%\\AppData\\Local\\Temp\\$appauthor\\$appname``
-        """
+        r""":returns: runtime directory tied to the user, e.g. ``%USERPROFILE%\AppData\Local\Temp\$appauthor\$appname``"""
         path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp"))  # noqa: PTH118
         return self._append_parts(path)
 
     @property
     def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
+        """:returns: runtime directory shared by users, same as `user_runtime_dir`"""
         return self.user_runtime_dir
 
 
@@ -161,7 +186,7 @@ def get_win_folder_from_env_vars(csidl_name: str) -> str:
     return result
 
 
-def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
+def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:  # noqa: PLR0911
     """Get a folder for a CSIDL name that does not exist as an environment variable."""
     if csidl_name == "CSIDL_PERSONAL":
         return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents")  # noqa: PTH118
@@ -177,17 +202,38 @@ def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
 
     if csidl_name == "CSIDL_MYMUSIC":
         return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Music")  # noqa: PTH118
+
+    if csidl_name == "CSIDL_PROGRAMS":
+        return os.path.join(  # noqa: PTH118
+            os.path.normpath(os.environ["APPDATA"]),
+            "Microsoft",
+            "Windows",
+            "Start Menu",
+            "Programs",
+        )
+
+    if csidl_name == "CSIDL_COMMON_PROGRAMS":
+        return os.path.join(  # noqa: PTH118
+            os.path.normpath(os.environ.get("PROGRAMDATA", os.environ.get("ALLUSERSPROFILE", "C:\\ProgramData"))),
+            "Microsoft",
+            "Windows",
+            "Start Menu",
+            "Programs",
+        )
     return None
 
 
 def get_win_folder_from_registry(csidl_name: str) -> str:
-    """
-    Get folder from the registry.
+    """Get folder from the registry.
 
     This is a fallback technique at best. I'm not sure if using the registry for these guarantees us the correct answer
     for all CSIDL_* names.
 
     """
+    machine_names = {
+        "CSIDL_COMMON_APPDATA",
+        "CSIDL_COMMON_PROGRAMS",
+    }
     shell_folder_name = {
         "CSIDL_APPDATA": "AppData",
         "CSIDL_COMMON_APPDATA": "Common AppData",
@@ -197,6 +243,8 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
         "CSIDL_MYPICTURES": "My Pictures",
         "CSIDL_MYVIDEO": "My Video",
         "CSIDL_MYMUSIC": "My Music",
+        "CSIDL_PROGRAMS": "Programs",
+        "CSIDL_COMMON_PROGRAMS": "Common Programs",
     }.get(csidl_name)
     if shell_folder_name is None:
         msg = f"Unknown CSIDL name: {csidl_name}"
@@ -205,58 +253,94 @@ def get_win_folder_from_registry(csidl_name: str) -> str:
         raise NotImplementedError
     import winreg  # noqa: PLC0415
 
-    key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
+    # Use HKEY_LOCAL_MACHINE for system-wide folders, HKEY_CURRENT_USER for user-specific folders
+    hkey = winreg.HKEY_LOCAL_MACHINE if csidl_name in machine_names else winreg.HKEY_CURRENT_USER
+
+    key = winreg.OpenKey(hkey, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
     directory, _ = winreg.QueryValueEx(key, shell_folder_name)
     return str(directory)
 
 
+_KNOWN_FOLDER_GUIDS: dict[str, str] = {
+    "CSIDL_APPDATA": "{3EB685DB-65F9-4CF6-A03A-E3EF65729F3D}",
+    "CSIDL_COMMON_APPDATA": "{62AB5D82-FDC1-4DC3-A9DD-070D1D495D97}",
+    "CSIDL_LOCAL_APPDATA": "{F1B32785-6FBA-4FCF-9D55-7B8E7F157091}",
+    "CSIDL_PERSONAL": "{FDD39AD0-238F-46AF-ADB4-6C85480369C7}",
+    "CSIDL_MYPICTURES": "{33E28130-4E1E-4676-835A-98395C3BC3BB}",
+    "CSIDL_MYVIDEO": "{18989B1D-99B5-455B-841C-AB7C74E4DDFC}",
+    "CSIDL_MYMUSIC": "{4BD8D571-6D19-48D3-BE97-422220080E43}",
+    "CSIDL_DOWNLOADS": "{374DE290-123F-4565-9164-39C4925E467B}",
+    "CSIDL_DESKTOPDIRECTORY": "{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}",
+    "CSIDL_PROGRAMS": "{A77F5D77-2E2B-44C3-A6A2-ABA601054A51}",
+    "CSIDL_COMMON_PROGRAMS": "{0139D44E-6AFE-49F2-8690-3DAFCAE6FFB8}",
+}
+
+
 def get_win_folder_via_ctypes(csidl_name: str) -> str:
-    """Get folder with ctypes."""
-    # There is no 'CSIDL_DOWNLOADS'.
-    # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead.
-    # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid
-
-    import ctypes  # noqa: PLC0415
-
-    csidl_const = {
-        "CSIDL_APPDATA": 26,
-        "CSIDL_COMMON_APPDATA": 35,
-        "CSIDL_LOCAL_APPDATA": 28,
-        "CSIDL_PERSONAL": 5,
-        "CSIDL_MYPICTURES": 39,
-        "CSIDL_MYVIDEO": 14,
-        "CSIDL_MYMUSIC": 13,
-        "CSIDL_DOWNLOADS": 40,
-        "CSIDL_DESKTOPDIRECTORY": 16,
-    }.get(csidl_name)
-    if csidl_const is None:
+    """Get folder via :func:`SHGetKnownFolderPath`.
+
+    See https://learn.microsoft.com/en-us/windows/win32/api/shlobj_core/nf-shlobj_core-shgetknownfolderpath.
+
+    """
+    if sys.platform != "win32":  # only needed for type checker to know that this code runs only on Windows
+        raise NotImplementedError
+    from ctypes import HRESULT, POINTER, Structure, WinDLL, byref, create_unicode_buffer, wintypes  # noqa: PLC0415
+
+    class _GUID(Structure):
+        _fields_ = [
+            ("Data1", wintypes.DWORD),
+            ("Data2", wintypes.WORD),
+            ("Data3", wintypes.WORD),
+            ("Data4", wintypes.BYTE * 8),
+        ]
+
+    ole32 = WinDLL("ole32")
+    ole32.CLSIDFromString.restype = HRESULT
+    ole32.CLSIDFromString.argtypes = [wintypes.LPCOLESTR, POINTER(_GUID)]
+    ole32.CoTaskMemFree.restype = None
+    ole32.CoTaskMemFree.argtypes = [wintypes.LPVOID]
+
+    shell32 = WinDLL("shell32")
+    shell32.SHGetKnownFolderPath.restype = HRESULT
+    shell32.SHGetKnownFolderPath.argtypes = [POINTER(_GUID), wintypes.DWORD, wintypes.HANDLE, POINTER(wintypes.LPWSTR)]
+
+    kernel32 = WinDLL("kernel32")
+    kernel32.GetShortPathNameW.restype = wintypes.DWORD
+    kernel32.GetShortPathNameW.argtypes = [wintypes.LPWSTR, wintypes.LPWSTR, wintypes.DWORD]
+
+    folder_guid = _KNOWN_FOLDER_GUIDS.get(csidl_name)
+    if folder_guid is None:
         msg = f"Unknown CSIDL name: {csidl_name}"
         raise ValueError(msg)
 
-    buf = ctypes.create_unicode_buffer(1024)
-    windll = getattr(ctypes, "windll")  # noqa: B009 # using getattr to avoid false positive with mypy type checker
-    windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
+    guid = _GUID()
+    ole32.CLSIDFromString(folder_guid, byref(guid))
 
-    # Downgrade to short path name if it has high-bit chars.
-    if any(ord(c) > 255 for c in buf):  # noqa: PLR2004
-        buf2 = ctypes.create_unicode_buffer(1024)
-        if windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
-            buf = buf2
+    path_ptr = wintypes.LPWSTR()
+    shell32.SHGetKnownFolderPath(byref(guid), _KF_FLAG_DONT_VERIFY, None, byref(path_ptr))
+    result = path_ptr.value
+    ole32.CoTaskMemFree(path_ptr)
 
-    if csidl_name == "CSIDL_DOWNLOADS":
-        return os.path.join(buf.value, "Downloads")  # noqa: PTH118
+    if result is None:
+        msg = f"SHGetKnownFolderPath returned NULL for {csidl_name}"
+        raise ValueError(msg)
 
-    return buf.value
+    if any(ord(c) > 255 for c in result):  # noqa: PLR2004
+        buf = create_unicode_buffer(1024)
+        if kernel32.GetShortPathNameW(result, buf, 1024):
+            result = buf.value
+
+    return result
 
 
 def _pick_get_win_folder() -> Callable[[str], str]:
+    """Select the best method to resolve Windows folder paths: ctypes, then registry, then environment variables."""
     try:
-        import ctypes  # noqa: PLC0415
+        import ctypes  # noqa: PLC0415, F401
     except ImportError:
         pass
     else:
-        if hasattr(ctypes, "windll"):
-            return get_win_folder_via_ctypes
+        return get_win_folder_via_ctypes
     try:
         import winreg  # noqa: PLC0415, F401
     except ImportError:
@@ -265,7 +349,20 @@ def _pick_get_win_folder() -> Callable[[str], str]:
         return get_win_folder_from_registry
 
 
-get_win_folder = lru_cache(maxsize=None)(_pick_get_win_folder())
+_resolve_win_folder = _pick_get_win_folder()
+
+
+def get_win_folder(csidl_name: str) -> str:
+    """Get a Windows folder path, checking for ``WIN_PD_OVERRIDE_*`` environment variable overrides first.
+
+    For example, ``CSIDL_LOCAL_APPDATA`` can be overridden by setting ``WIN_PD_OVERRIDE_LOCAL_APPDATA``.
+
+    """
+    env_var = f"WIN_PD_OVERRIDE_{csidl_name.removeprefix('CSIDL_')}"
+    if override := os.environ.get(env_var, "").strip():
+        return override
+    return _resolve_win_folder(csidl_name)
+
 
 __all__ = [
     "Windows",
diff --git a/libs/oauthlib-3.2.2.dist-info/INSTALLER b/libs/plexapi-4.18.0.dist-info/INSTALLER
similarity index 100%
rename from libs/oauthlib-3.2.2.dist-info/INSTALLER
rename to libs/plexapi-4.18.0.dist-info/INSTALLER
diff --git a/libs/plexapi-4.18.0.dist-info/METADATA b/libs/plexapi-4.18.0.dist-info/METADATA
new file mode 100644
index 0000000000..997501bca9
--- /dev/null
+++ b/libs/plexapi-4.18.0.dist-info/METADATA
@@ -0,0 +1,285 @@
+Metadata-Version: 2.4
+Name: PlexAPI
+Version: 4.18.0
+Summary: Python bindings for the Plex API.
+Author-email: Michael Shepanski <michael.shepanski@gmail.com>
+License-Expression: BSD-3-Clause
+Project-URL: Homepage, https://github.com/pushingkarmaorg/python-plexapi
+Project-URL: Documentation, https://python-plexapi.readthedocs.io
+Keywords: plex,api
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+License-File: AUTHORS.txt
+Requires-Dist: requests
+Provides-Extra: alert
+Requires-Dist: websocket-client>=1.3.3; extra == "alert"
+Provides-Extra: jwt
+Requires-Dist: pyjwt[crypto]; extra == "jwt"
+Dynamic: license-file
+
+Python-PlexAPI
+==============
+.. image:: https://github.com/pushingkarmaorg/python-plexapi/workflows/CI/badge.svg
+    :target: https://github.com/pushingkarmaorg/python-plexapi/actions?query=workflow%3ACI
+.. image:: https://readthedocs.org/projects/python-plexapi/badge/?version=latest
+    :target: http://python-plexapi.readthedocs.io/en/latest/?badge=latest
+.. image:: https://codecov.io/gh/pushingkarmaorg/python-plexapi/branch/master/graph/badge.svg?token=fOECznuMtw
+    :target: https://codecov.io/gh/pushingkarmaorg/python-plexapi
+.. image:: https://img.shields.io/github/tag/pushingkarmaorg/python-plexapi.svg?label=github+release
+    :target: https://github.com/pushingkarmaorg/python-plexapi/releases
+.. image:: https://badge.fury.io/py/PlexAPI.svg
+    :target: https://badge.fury.io/py/PlexAPI
+.. image:: https://img.shields.io/github/last-commit/pushingkarmaorg/python-plexapi.svg
+    :target: https://img.shields.io/github/last-commit/pushingkarmaorg/python-plexapi.svg
+
+
+Overview
+--------
+Unofficial Python bindings for the Plex API. Our goal is to match all capabilities of the official
+Plex Web Client. A few of the many features we currently support are:
+
+* Navigate local or remote shared libraries.
+* Perform library actions such as scan, analyze, empty trash.
+* Remote control and play media on connected clients, including `Controlling Sonos speakers`_
+* Listen in on all Plex Server notifications.
+ 
+
+Installation & Documentation
+----------------------------
+
+.. code-block:: python
+
+    pip install plexapi
+
+*Install extra features:*
+
+.. code-block:: python
+
+    pip install plexapi[alert]  # Install with dependencies required for plexapi.alert
+    pip install plexapi[jwt]    # Install with dependencies required for Plex JWT authentication
+
+Documentation_ can be found at Read the Docs.
+
+.. _Documentation: http://python-plexapi.readthedocs.io/en/latest/
+
+Join our Discord_ for support and discussion.
+
+.. _Discord: https://discord.gg/GtAnnZAkuw
+
+
+Getting a PlexServer Instance
+-----------------------------
+
+There are two types of authentication. If you are running on a separate network
+or using Plex Users you can log into MyPlex to get a PlexServer instance. An
+example of this is below. NOTE: Servername below is the name of the server (not
+the hostname and port).  If logged into Plex Web you can see the server name in
+the top left above your available libraries.
+
+.. code-block:: python
+
+    from plexapi.myplex import MyPlexAccount
+    account = MyPlexAccount('<USERNAME>', '<PASSWORD>')
+    plex = account.resource('<SERVERNAME>').connect()  # returns a PlexServer instance
+
+If you want to avoid logging into MyPlex and you already know your auth token
+string, you can use the PlexServer object directly as above, by passing in
+the baseurl and auth token directly.
+
+.. code-block:: python
+
+    from plexapi.server import PlexServer
+    baseurl = 'http://plexserver:32400'
+    token = '2ffLuB84dqLswk9skLos'
+    plex = PlexServer(baseurl, token)
+
+
+Usage Examples
+--------------
+
+.. code-block:: python
+
+    # Example 1: List all unwatched movies.
+    movies = plex.library.section('Movies')
+    for video in movies.search(unwatched=True):
+        print(video.title)
+
+
+.. code-block:: python
+
+    # Example 2: Mark all Game of Thrones episodes as played.
+    plex.library.section('TV Shows').get('Game of Thrones').markPlayed()
+
+
+.. code-block:: python
+
+    # Example 3: List all clients connected to the Server.
+    for client in plex.clients():
+        print(client.title)
+
+
+.. code-block:: python
+
+    # Example 4: Play the movie Cars on another client.
+    # Note: Client must be on same network as server.
+    cars = plex.library.section('Movies').get('Cars')
+    client = plex.client("Michael's iPhone")
+    client.playMedia(cars)
+
+
+.. code-block:: python
+
+    # Example 5: List all content with the word 'Game' in the title.
+    for video in plex.search('Game'):
+        print(f'{video.title} ({video.TYPE})')
+
+
+.. code-block:: python
+
+    # Example 6: List all movies directed by the same person as Elephants Dream.
+    movies = plex.library.section('Movies')
+    elephants_dream = movies.get('Elephants Dream')
+    director = elephants_dream.directors[0]
+    for movie in movies.search(None, director=director):
+        print(movie.title)
+
+
+.. code-block:: python
+
+    # Example 7: List files for the latest episode of The 100.
+    last_episode = plex.library.section('TV Shows').get('The 100').episodes()[-1]
+    for part in last_episode.iterParts():
+        print(part.file)
+
+
+.. code-block:: python
+
+    # Example 8: Get audio/video/all playlists
+    for playlist in plex.playlists():
+        print(playlist.title)
+
+
+.. code-block:: python
+
+    # Example 9: Rate the 100 four stars.
+    plex.library.section('TV Shows').get('The 100').rate(8.0)
+
+
+Controlling Sonos speakers
+--------------------------
+
+To control Sonos speakers directly using Plex APIs, the following requirements must be met:
+
+1. Active Plex Pass subscription
+2. Sonos account linked to Plex account
+3. Plex remote access enabled
+
+Due to the design of Sonos music services, the API calls to control Sonos speakers route through https://sonos.plex.tv
+and back via the Plex server's remote access. Actual media playback is local unless networking restrictions prevent the
+Sonos speakers from connecting to the Plex server directly.
+
+.. code-block:: python
+
+    from plexapi.myplex import MyPlexAccount
+    from plexapi.server import PlexServer
+
+    baseurl = 'http://plexserver:32400'
+    token = '2ffLuB84dqLswk9skLos'
+
+    account = MyPlexAccount(token)
+    server = PlexServer(baseurl, token)
+
+    # List available speakers/groups
+    for speaker in account.sonos_speakers():
+        print(speaker.title)
+
+    # Obtain PlexSonosPlayer instance
+    speaker = account.sonos_speaker("Kitchen")
+
+    album = server.library.section('Music').get('Stevie Wonder').album('Innervisions')
+
+    # Speaker control examples
+    speaker.playMedia(album)
+    speaker.pause()
+    speaker.setVolume(10)
+    speaker.skipNext()
+
+
+Running tests over PlexAPI
+--------------------------
+
+Use:
+
+.. code-block:: bash
+
+     tools/plex-boostraptest.py 
+    
+with appropriate
+arguments and add this new server to a shared user which username is defined in environment variable `SHARED_USERNAME`.
+It uses `official docker image`_ to create a proper instance.
+
+For skipping the docker and reuse a existing server use 
+
+.. code-block:: bash
+
+    python plex-bootstraptest.py --no-docker --username USERNAME --password PASSWORD --server-name NAME-OF-YOUR-SEVER
+
+Also in order to run most of the tests you have to provide some environment variables:
+
+* `PLEXAPI_AUTH_SERVER_BASEURL` containing an URL to your Plex instance, e.g. `http://127.0.0.1:32400` (without trailing
+  slash)
+* `PLEXAPI_AUTH_MYPLEX_USERNAME` and `PLEXAPI_AUTH_MYPLEX_PASSWORD` with your MyPlex username and password accordingly
+
+After this step you can run tests with following command:
+
+.. code-block:: bash
+
+    py.test tests -rxXs --ignore=tests/test_sync.py
+
+Some of the tests in main test-suite require a shared user in your account (e.g. `test_myplex_users`,
+`test_myplex_updateFriend`, etc.), you need to provide a valid shared user's username to get them running you need to
+provide the username of the shared user as an environment variable `SHARED_USERNAME`. You can enable a Guest account and
+simply pass `Guest` as `SHARED_USERNAME` (or just create a user like `plexapitest` and play with it).
+
+To be able to run tests over Mobile Sync api you have to some some more environment variables, to following values
+exactly:
+
+* PLEXAPI_HEADER_PROVIDES='controller,sync-target'
+* PLEXAPI_HEADER_PLATFORM=iOS
+* PLEXAPI_HEADER_PLATFORM_VERSION=11.4.1
+* PLEXAPI_HEADER_DEVICE=iPhone
+
+And finally run the sync-related tests:
+
+.. code-block:: bash
+
+    py.test tests/test_sync.py -rxXs
+
+.. _official docker image: https://hub.docker.com/r/plexinc/pms-docker/
+
+Common Questions
+----------------
+
+**Why are you using camelCase and not following PEP8 guidelines?**
+
+This API reads XML documents provided by MyPlex and the Plex Server.
+We decided to conform to their style so that the API variable names directly
+match with the provided XML documents.
+
+
+**Why don't you offer feature XYZ?**
+
+This library is meant to be a wrapper around the XML pages the Plex
+server provides. If we are not providing an API that is offered in the
+XML pages, please let us know! -- Adding additional features beyond that
+should be done outside the scope of this library.
+
+
+**What are some helpful links if trying to understand the raw Plex API?**
+
+* https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
+* https://forums.plex.tv/discussion/104353/pms-web-api-documentation
+* https://github.com/Arcanemagus/plex-api/wiki
diff --git a/libs/plexapi-4.18.0.dist-info/RECORD b/libs/plexapi-4.18.0.dist-info/RECORD
new file mode 100644
index 0000000000..b47fae56a0
--- /dev/null
+++ b/libs/plexapi-4.18.0.dist-info/RECORD
@@ -0,0 +1,42 @@
+plexapi-4.18.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+plexapi-4.18.0.dist-info/METADATA,sha256=q7_uMO2otffYZdZR7Gatsgm6dNs7mjvZu1I11S-TxBk,9515
+plexapi-4.18.0.dist-info/RECORD,,
+plexapi-4.18.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plexapi-4.18.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+plexapi-4.18.0.dist-info/licenses/AUTHORS.txt,sha256=iEonabCDE0G6AnfT0tCcppsJ0AaTJZGhRjIM4lIIAck,228
+plexapi-4.18.0.dist-info/licenses/LICENSE.txt,sha256=ZmoFInlwd6lOpMMQCWIbjLLtu4pwhwWArg_dnYS3X5A,1515
+plexapi-4.18.0.dist-info/top_level.txt,sha256=PTwXHiZDiXtrZnSI7lpZkRz1oJs5DyYpiiu_FuhuSlk,8
+plexapi/__init__.py,sha256=RtfTaqQqDszgxsjiTMqgTbIUvi3mPnHZl77KDo_17l0,2120
+plexapi/alert.py,sha256=gA7LxPAt2qBDhdZKIts3uHzAMjCp5175NWaGIjGwD4Q,4041
+plexapi/audio.py,sha256=o7vVmoOchE_VBjw6Uu0HBOo01PwAO6cTUk7LpkiDI0g,30186
+plexapi/base.py,sha256=x8PBfUTC8zpHxDds5FxVVjiZ384cxMsEh1MbYzRMFjY,51855
+plexapi/client.py,sha256=KEa6b_xFsb2WvuWElVJ00EZmG-eqnDb8CcVhRsaUHTw,27835
+plexapi/collection.py,sha256=5BkdIBg6qZheh1Vi1ST2G3Qhr9lejKHCm_rzqw3ZsX8,24907
+plexapi/config.py,sha256=xg0TSjKZo_t9AUHtrnFTrPmelCGJB13JnVwozOaLjuM,2672
+plexapi/const.py,sha256=MXs7BXFB5LopNMxC8YVCfcIX13qkkNjOfhToah8_jt4,215
+plexapi/exceptions.py,sha256=fOJGOAnL2gnlHBYkNyujhBK56fILIO8kppDlhqYt79s,657
+plexapi/gdm.py,sha256=SVi6uZu5pCuLNUAPIm8WeIJy1J55NTtN-bsBnTvB6Ec,5066
+plexapi/library.py,sha256=PAaPPb8qO_27vSLwKHa-BoGuh9VGeMsYjLhLIzmJHbs,144665
+plexapi/media.py,sha256=gSjHhvpracVQiIAy2tnJpzuoecEn_ZefhWru0vKVOtg,61986
+plexapi/mixins/__init__.py,sha256=j4PAxJyc0pDYgy07ieGaKMmDEC06FjOHSXuC48N31hw,7996
+plexapi/mixins/advanced_settings.py,sha256=fLZmLpi33xuNFkubUiBRv2MXyuf8P-Do1e0vwsfM6io,2217
+plexapi/mixins/edit.py,sha256=MvUFIS90eFS_guOX5jmhblorZURlUw9l9j0qyFZ1Qq4,21482
+plexapi/mixins/objects.py,sha256=wojcUijb_2cbn30xrZdVKdp5Pgl1rECeRe0abs0WfJM,591
+plexapi/mixins/played_unplayed.py,sha256=zUZh4aLHOnosukrBl_T3J-JMm2zJ3TqseqdfVM4nIVA,1167
+plexapi/mixins/rating.py,sha256=8di6zWqw7djFTMa28XriwxiM5GcdN-vE8E55lO-BJw4,891
+plexapi/mixins/resources.py,sha256=lzAKEstt-32IHQ-G-H8j3j1U-k4ht-xf7sd3JjARbsM,11776
+plexapi/mixins/smart_filter.py,sha256=0e8Yug6amoqkaCmSTXw-TdUerNE5v0NFgRzdLXFYgwI,3788
+plexapi/mixins/split_merge.py,sha256=g0G0hOL2xgaDWOrca9_qBZrwIOJq8XCcQqzoIGrtlQ8,759
+plexapi/mixins/unmatch_match.py,sha256=_lwPwr7r9-grEVYiM4zM3DPbKGGHsCFOudy6PxWcPko,3978
+plexapi/mixins/watchlist.py,sha256=jtwHI2vJpnWfOLSg_JJxlJJVBO9tYX27jZPAN9jfKkw,2829
+plexapi/myplex.py,sha256=m7opaZh5DlQ5wKX3k51ym7GtQ5v0He5YajIrF0iTq_I,121562
+plexapi/photo.py,sha256=arbrZX88xgt7RbGuuZ16pNCnlfpmFsNa516uVVbHfd0,15789
+plexapi/playlist.py,sha256=Klfk-Pus0KsIbryLORhybFa0Fqvy51amIIo1GIW5T9k,23530
+plexapi/playqueue.py,sha256=Q0_kngkn0f-jkWELDPmYyrwL6E99sxUCiswFooYTZOg,13109
+plexapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plexapi/server.py,sha256=yQ3Ar0kem9wslUBHbN_VTzS5LV_LZxGhr39Uho4G5SQ,63386
+plexapi/settings.py,sha256=0ZpQUZ7blGg6HZ3mYlKwBpKHWUelBLFQGWXcOkmN3M4,7117
+plexapi/sonos.py,sha256=mFAGorzeSHppKiAZTuNBM8jOYZv_HPHoAVoSYHTWlzQ,5092
+plexapi/sync.py,sha256=qVhkhpHI6GjS-sHwG2w0_WzgaYtC6FQVdgD6XVdhuRE,13776
+plexapi/utils.py,sha256=mVu7z006KK-fG_CZzCTcFJJ3dI-vqg2n2y04UA6RwEg,27596
+plexapi/video.py,sha256=h4r57U8WuF03FRuP6oqahxD8H192WjltBTniWrA9hCQ,64622
diff --git a/libs/platformdirs-4.3.6.dist-info/REQUESTED b/libs/plexapi-4.18.0.dist-info/REQUESTED
similarity index 100%
rename from libs/platformdirs-4.3.6.dist-info/REQUESTED
rename to libs/plexapi-4.18.0.dist-info/REQUESTED
diff --git a/libs/plexapi-4.18.0.dist-info/WHEEL b/libs/plexapi-4.18.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/plexapi-4.18.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/PlexAPI-4.16.1.dist-info/AUTHORS.txt b/libs/plexapi-4.18.0.dist-info/licenses/AUTHORS.txt
similarity index 100%
rename from libs/PlexAPI-4.16.1.dist-info/AUTHORS.txt
rename to libs/plexapi-4.18.0.dist-info/licenses/AUTHORS.txt
diff --git a/libs/PlexAPI-4.16.1.dist-info/LICENSE.txt b/libs/plexapi-4.18.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/PlexAPI-4.16.1.dist-info/LICENSE.txt
rename to libs/plexapi-4.18.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/PlexAPI-4.16.1.dist-info/top_level.txt b/libs/plexapi-4.18.0.dist-info/top_level.txt
similarity index 100%
rename from libs/PlexAPI-4.16.1.dist-info/top_level.txt
rename to libs/plexapi-4.18.0.dist-info/top_level.txt
diff --git a/libs/plexapi/__init__.py b/libs/plexapi/__init__.py
index 1d4fb471e1..af856aa883 100644
--- a/libs/plexapi/__init__.py
+++ b/libs/plexapi/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import logging
 import os
 from logging.handlers import RotatingFileHandler
diff --git a/libs/plexapi/alert.py b/libs/plexapi/alert.py
index 2d6a18e8af..e114732225 100644
--- a/libs/plexapi/alert.py
+++ b/libs/plexapi/alert.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import json
 import socket
 from typing import Callable
diff --git a/libs/plexapi/audio.py b/libs/plexapi/audio.py
index 05d38a9c77..542fa7cc2c 100644
--- a/libs/plexapi/audio.py
+++ b/libs/plexapi/audio.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
 import os
@@ -8,13 +7,9 @@
 from typing import Any, Dict, List, Optional, TypeVar
 
 from plexapi import media, utils
-from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession
+from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, PlayedUnplayedMixin, RatingMixin,
-    ArtUrlMixin, ArtMixin, PosterUrlMixin, PosterMixin, ThemeMixin, ThemeUrlMixin,
-    ArtistEditMixins, AlbumEditMixins, TrackEditMixins
-)
+from plexapi.mixins import ArtistMixins, AlbumMixins, TrackMixins, PlayedUnplayedMixin
 from plexapi.playlist import Playlist
 
 
@@ -59,14 +54,11 @@ class Audio(PlexPartialObject, PlayedUnplayedMixin):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
         self.art = data.attrib.get('art')
         self.artBlurHash = data.attrib.get('artBlurHash')
         self.distance = utils.cast(float, data.attrib.get('distance'))
-        self.fields = self.findItems(data, media.Field)
         self.guid = data.attrib.get('guid')
-        self.images = self.findItems(data, media.Image)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = data.attrib.get('key', '')
         self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
@@ -75,7 +67,6 @@ def _loadData(self, data):
         self.librarySectionKey = data.attrib.get('librarySectionKey')
         self.librarySectionTitle = data.attrib.get('librarySectionTitle')
         self.listType = 'audio'
-        self.moods = self.findItems(data, media.Mood)
         self.musicAnalysisVersion = utils.cast(int, data.attrib.get('musicAnalysisVersion'))
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
         self.summary = data.attrib.get('summary')
@@ -88,6 +79,18 @@ def _loadData(self, data):
         self.userRating = utils.cast(float, data.attrib.get('userRating'))
         self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
 
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
+
+    @cached_data_property
+    def images(self):
+        return self.findItems(self._data, media.Image)
+
+    @cached_data_property
+    def moods(self):
+        return self.findItems(self._data, media.Mood)
+
     def url(self, part):
         """ Returns the full URL for the audio item. Typically used for getting a specific track. """
         return self._server.url(part, includeToken=True) if part else None
@@ -171,10 +174,7 @@ def sonicallySimilar(
 
 @utils.registerPlexObject
 class Artist(
-    Audio,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeMixin,
-    ArtistEditMixins
+    Audio, ArtistMixins
 ):
     """ Represents a single Artist.
 
@@ -205,18 +205,45 @@ def _loadData(self, data):
         Audio._loadData(self, data)
         self.albumSort = utils.cast(int, data.attrib.get('albumSort', '-1'))
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.collections = self.findItems(data, media.Collection)
-        self.countries = self.findItems(data, media.Country)
-        self.genres = self.findItems(data, media.Genre)
-        self.guids = self.findItems(data, media.Guid)
         self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.labels = self.findItems(data, media.Label)
-        self.locations = self.listAttrs(data, 'path', etag='Location')
         self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.similar = self.findItems(data, media.Similar)
-        self.styles = self.findItems(data, media.Style)
         self.theme = data.attrib.get('theme')
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
+
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def countries(self):
+        return self.findItems(self._data, media.Country)
+
+    @cached_data_property
+    def genres(self):
+        return self.findItems(self._data, media.Genre)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def locations(self):
+        return self.listAttrs(self._data, 'path', etag='Location')
+
+    @cached_data_property
+    def similar(self):
+        return self.findItems(self._data, media.Similar)
+
+    @cached_data_property
+    def styles(self):
+        return self.findItems(self._data, media.Style)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
 
     def __iter__(self):
         for album in self.albums():
@@ -314,10 +341,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Album(
-    Audio,
-    SplitMergeMixin, UnmatchMatchMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeUrlMixin,
-    AlbumEditMixins
+    Audio, AlbumMixins
 ):
     """ Represents a single Album.
 
@@ -355,12 +379,7 @@ def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         Audio._loadData(self, data)
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.collections = self.findItems(data, media.Collection)
-        self.formats = self.findItems(data, media.Format)
-        self.genres = self.findItems(data, media.Genre)
-        self.guids = self.findItems(data, media.Guid)
         self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.labels = self.findItems(data, media.Label)
         self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
         self.loudnessAnalysisVersion = utils.cast(int, data.attrib.get('loudnessAnalysisVersion'))
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
@@ -372,12 +391,41 @@ def _loadData(self, data):
         self.parentTitle = data.attrib.get('parentTitle')
         self.rating = utils.cast(float, data.attrib.get('rating'))
         self.studio = data.attrib.get('studio')
-        self.styles = self.findItems(data, media.Style)
-        self.subformats = self.findItems(data, media.Subformat)
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
         self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def formats(self):
+        return self.findItems(self._data, media.Format)
+
+    @cached_data_property
+    def genres(self):
+        return self.findItems(self._data, media.Genre)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def styles(self):
+        return self.findItems(self._data, media.Style)
+
+    @cached_data_property
+    def subformats(self):
+        return self.findItems(self._data, media.Subformat)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
+
     def __iter__(self):
         for track in self.tracks():
             yield track
@@ -443,10 +491,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Track(
-    Audio, Playable,
-    ExtrasMixin, RatingMixin,
-    ArtUrlMixin, PosterUrlMixin, ThemeUrlMixin,
-    TrackEditMixins
+    Audio, Playable, TrackMixins
 ):
     """ Represents a single Track.
 
@@ -495,11 +540,8 @@ def _loadData(self, data):
         Audio._loadData(self, data)
         Playable._loadData(self, data)
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.chapters = self.findItems(data, media.Chapter)
         self.chapterSource = data.attrib.get('chapterSource')
-        self.collections = self.findItems(data, media.Collection)
         self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.genres = self.findItems(data, media.Genre)
         self.grandparentArt = data.attrib.get('grandparentArt')
         self.grandparentGuid = data.attrib.get('grandparentGuid')
         self.grandparentKey = data.attrib.get('grandparentKey')
@@ -507,9 +549,6 @@ def _loadData(self, data):
         self.grandparentTheme = data.attrib.get('grandparentTheme')
         self.grandparentThumb = data.attrib.get('grandparentThumb')
         self.grandparentTitle = data.attrib.get('grandparentTitle')
-        self.guids = self.findItems(data, media.Guid)
-        self.labels = self.findItems(data, media.Label)
-        self.media = self.findItems(data, media.Media)
         self.originalTitle = data.attrib.get('originalTitle')
         self.parentGuid = data.attrib.get('parentGuid')
         self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
@@ -525,6 +564,30 @@ def _loadData(self, data):
         self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def chapters(self):
+        return self.findItems(self._data, media.Chapter)
+
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def genres(self):
+        return self.findItems(self._data, media.Genre)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def media(self):
+        return self.findItems(self._data, media.Media)
+
     @property
     def locations(self):
         """ This does not exist in plex xml response but is added to have a common
diff --git a/libs/plexapi/base.py b/libs/plexapi/base.py
index 675ac5d985..65da20c4d7 100644
--- a/libs/plexapi/base.py
+++ b/libs/plexapi/base.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import re
 from typing import TYPE_CHECKING, Generic, Iterable, List, Optional, TypeVar, Union
 import weakref
@@ -39,7 +38,42 @@
 }
 
 
-class PlexObject:
+class cached_data_property(cached_property):
+    """Caching for PlexObject data properties.
+
+    This decorator creates properties that cache their values with
+    automatic invalidation on data changes.
+    """
+
+    def __set_name__(self, owner, name):
+        """Register the annotated property in the parent class's _cached_data_properties set."""
+        super().__set_name__(owner, name)
+        if not hasattr(owner, '_cached_data_properties'):
+            owner._cached_data_properties = set()
+        owner._cached_data_properties.add(name)
+
+
+class PlexObjectMeta(type):
+    """Metaclass for PlexObject to handle cached_data_properties."""
+    def __new__(mcs, name, bases, attrs):
+        cached_data_props = set()
+
+        # Merge all _cached_data_properties from parent classes
+        for base in bases:
+            if hasattr(base, '_cached_data_properties'):
+                cached_data_props.update(base._cached_data_properties)
+
+        # Find all properties annotated with cached_data_property in the current class
+        for attr_name, attr_value in attrs.items():
+            if isinstance(attr_value, cached_data_property):
+                cached_data_props.add(attr_name)
+
+        attrs['_cached_data_properties'] = cached_data_props
+
+        return super().__new__(mcs, name, bases, attrs)
+
+
+class PlexObject(metaclass=PlexObjectMeta):
     """ Base class for all Plex objects.
 
         Parameters:
@@ -387,7 +421,7 @@ def listAttrs(self, data, attr, rtag=None, **kwargs):
         return results
 
     def reload(self, key=None, **kwargs):
-        """ Reload the data for this object from self.key.
+        """ Reload the data for this object.
 
             Parameters:
                 key (string, optional): Override the key to reload.
@@ -435,7 +469,7 @@ def _reload(self, key=None, _overwriteNone=True, **kwargs):
         self._initpath = key
         data = self._server.query(key)
         self._overwriteNone = _overwriteNone
-        self._loadData(data[0])
+        self._invalidateCacheAndLoadData(data[0])
         self._overwriteNone = True
         return self
 
@@ -497,9 +531,35 @@ def _castAttrValue(self, op, query, value):
             return float(value)
         return value
 
+    def _invalidateCacheAndLoadData(self, data):
+        """Load attribute values from Plex XML response and invalidate cached properties."""
+        old_data_id = id(getattr(self, '_data', None))
+        self._data = data
+
+        # If the data's object ID has changed, invalidate cached properties
+        if id(data) != old_data_id:
+            self._invalidateCachedProperties()
+
+        self._loadData(data)
+
+    def _invalidateCachedProperties(self):
+        """Invalidate all cached data property values."""
+        cached_props = getattr(self.__class__, '_cached_data_properties', set())
+
+        for prop_name in cached_props:
+            if prop_name in self.__dict__:
+                del self.__dict__[prop_name]
+
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         raise NotImplementedError('Abstract method not implemented.')
 
+    def _findAndLoadElem(self, data, **kwargs):
+        """ Find and load the first element in the data that matches the specified attributes. """
+        for elem in data:
+            if self._checkAttrs(elem, **kwargs):
+                self._invalidateCacheAndLoadData(elem)
+
     @property
     def _searchType(self):
         return self.TYPE
@@ -754,7 +814,7 @@ def playQueue(self, *args, **kwargs):
 
 
 class Playable:
-    """ This is a general place to store functions specific to media that is Playable.
+    """ This is a mixin to store functions specific to media that is Playable.
         Things were getting mixed up a bit when dealing with Shows, Season, Artists,
         Albums which are all not playable.
 
@@ -764,6 +824,7 @@ class Playable:
     """
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.playlistItemID = utils.cast(int, data.attrib.get('playlistItemID'))    # playlist
         self.playQueueItemID = utils.cast(int, data.attrib.get('playQueueItemID'))  # playqueue
 
@@ -931,8 +992,8 @@ def updateTimeline(self, time, state='stopped', duration=None):
         return self
 
 
-class PlexSession(object):
-    """ This is a general place to store functions specific to media that is a Plex Session.
+class PlexSession:
+    """ This is a mixin to store functions specific to media that is a Plex Session.
 
         Attributes:
             live (bool): True if this is a live tv session.
@@ -945,23 +1006,44 @@ class PlexSession(object):
     """
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.live = utils.cast(bool, data.attrib.get('live', '0'))
-        self.player = self.findItem(data, etag='Player')
-        self.session = self.findItem(data, etag='Session')
         self.sessionKey = utils.cast(int, data.attrib.get('sessionKey'))
-        self.transcodeSession = self.findItem(data, etag='TranscodeSession')
 
         user = data.find('User')
         self._username = user.attrib.get('title')
         self._userId = utils.cast(int, user.attrib.get('id'))
 
         # For backwards compatibility
-        self.players = [self.player] if self.player else []
-        self.sessions = [self.session] if self.session else []
-        self.transcodeSessions = [self.transcodeSession] if self.transcodeSession else []
         self.usernames = [self._username] if self._username else []
+        # `players`, `sessions`, and `transcodeSessions` are returned with properties
+        # to support lazy loading. See PR #1510
+
+    @cached_data_property
+    def player(self):
+        return self.findItem(self._data, etag='Player')
+
+    @cached_data_property
+    def session(self):
+        return self.findItem(self._data, etag='Session')
+
+    @cached_data_property
+    def transcodeSession(self):
+        return self.findItem(self._data, etag='TranscodeSession')
+
+    @property
+    def players(self):
+        return [self.player] if self.player else []
+
+    @property
+    def sessions(self):
+        return [self.session] if self.session else []
 
-    @cached_property
+    @property
+    def transcodeSessions(self):
+        return [self.transcodeSession] if self.transcodeSession else []
+
+    @cached_data_property
     def user(self):
         """ Returns the :class:`~plexapi.myplex.MyPlexAccount` object (for admin)
             or :class:`~plexapi.myplex.MyPlexUser` object (for users) for this session.
@@ -978,18 +1060,11 @@ def reload(self):
         """
         return self._reload()
 
-    def _reload(self, _autoReload=False, **kwargs):
-        """ Perform the actual reload. """
-        # Do not auto reload sessions
-        if _autoReload:
-            return self
-
+    def _reload(self, **kwargs):
+        """ Reload the data for the session. """
         key = self._initpath
         data = self._server.query(key)
-        for elem in data:
-            if elem.attrib.get('sessionKey') == str(self.sessionKey):
-                self._loadData(elem)
-                break
+        self._findAndLoadElem(data, sessionKey=str(self.sessionKey))
         return self
 
     def source(self):
@@ -1010,8 +1085,8 @@ def stop(self, reason=''):
         return self._server.query(key, params=params)
 
 
-class PlexHistory(object):
-    """ This is a general place to store functions specific to media that is a Plex history item.
+class PlexHistory:
+    """ This is a mixin to store functions specific to media that is a Plex history item.
 
         Attributes:
             accountID (int): The associated :class:`~plexapi.server.SystemAccount` ID.
@@ -1021,6 +1096,7 @@ class PlexHistory(object):
     """
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.accountID = utils.cast(int, data.attrib.get('accountID'))
         self.deviceID = utils.cast(int, data.attrib.get('deviceID'))
         self.historyKey = data.attrib.get('historyKey')
@@ -1124,7 +1200,7 @@ def extend(
                 setattr(self, key, getattr(__iterable, key))
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.allowSync = utils.cast(int, data.attrib.get('allowSync'))
         self.augmentationKey = data.attrib.get('augmentationKey')
         self.identifier = data.attrib.get('identifier')
diff --git a/libs/plexapi/client.py b/libs/plexapi/client.py
index 3d89e3dc68..4aa7d8755d 100644
--- a/libs/plexapi/client.py
+++ b/libs/plexapi/client.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import time
 import weakref
 from xml.etree import ElementTree
@@ -115,7 +114,7 @@ def connect(self, timeout=None):
                 )
         else:
             client = data[0]
-        self._loadData(client)
+        self._invalidateCacheAndLoadData(client)
         return self
 
     def reload(self):
@@ -124,7 +123,6 @@ def reload(self):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.deviceClass = data.attrib.get('deviceClass')
         self.machineIdentifier = data.attrib.get('machineIdentifier')
         self.product = data.attrib.get('product')
@@ -197,8 +195,7 @@ def query(self, path, method=None, headers=None, timeout=None, **kwargs):
                 raise NotFound(message)
             else:
                 raise BadRequest(message)
-        data = utils.cleanXMLString(response.text).encode('utf8')
-        return ElementTree.fromstring(data) if data.strip() else None
+        return utils.parseXMLString(response.text)
 
     def sendCommand(self, command, proxy=None, **params):
         """ Convenience wrapper around :func:`~plexapi.client.PlexClient.query` to more easily
@@ -222,7 +219,7 @@ def sendCommand(self, command, proxy=None, **params):
         proxy = self._proxyThroughServer if proxy is None else proxy
         query = self._server.query if proxy else self.query
 
-        # Workaround for ptp. See https://github.com/pkkid/python-plexapi/issues/244
+        # Workaround for ptp. See https://github.com/pushingkarmaorg/python-plexapi/issues/244
         t = time.time()
         if command == 'timeline/poll':
             self._last_call = t
@@ -606,7 +603,7 @@ class ClientTimeline(PlexObject):
     key = 'timeline/poll'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.address = data.attrib.get('address')
         self.audioStreamId = utils.cast(int, data.attrib.get('audioStreamId'))
         self.autoPlay = utils.cast(bool, data.attrib.get('autoPlay'))
diff --git a/libs/plexapi/collection.py b/libs/plexapi/collection.py
index 63ea837300..def67a73e3 100644
--- a/libs/plexapi/collection.py
+++ b/libs/plexapi/collection.py
@@ -1,25 +1,16 @@
-# -*- coding: utf-8 -*-
 from pathlib import Path
 from urllib.parse import quote_plus
 
 from plexapi import media, utils
-from plexapi.base import PlexPartialObject
+from plexapi.base import PlexPartialObject, cached_data_property
 from plexapi.exceptions import BadRequest, NotFound, Unsupported
 from plexapi.library import LibrarySection, ManagedHub
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeMixin,
-    CollectionEditMixins
-)
-from plexapi.utils import deprecated
+from plexapi.mixins import CollectionMixins
 
 
 @utils.registerPlexObject
 class Collection(
-    PlexPartialObject,
-    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeMixin,
-    CollectionEditMixins
+    PlexPartialObject, CollectionMixins
 ):
     """ Represents a single Collection.
 
@@ -69,7 +60,7 @@ class Collection(
     TYPE = 'collection'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
         self.art = data.attrib.get('art')
         self.artBlurHash = data.attrib.get('artBlurHash')
@@ -81,12 +72,9 @@ def _loadData(self, data):
         self.collectionSort = utils.cast(int, data.attrib.get('collectionSort', '0'))
         self.content = data.attrib.get('content')
         self.contentRating = data.attrib.get('contentRating')
-        self.fields = self.findItems(data, media.Field)
         self.guid = data.attrib.get('guid')
-        self.images = self.findItems(data, media.Image)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = data.attrib.get('key', '').replace('/children', '')  # FIX_BUG_50
-        self.labels = self.findItems(data, media.Label)
         self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
         self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
         self.librarySectionKey = data.attrib.get('librarySectionKey')
@@ -105,12 +93,24 @@ def _loadData(self, data):
         self.title = data.attrib.get('title')
         self.titleSort = data.attrib.get('titleSort', self.title)
         self.type = data.attrib.get('type')
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
         self.userRating = utils.cast(float, data.attrib.get('userRating'))
-        self._items = None  # cache for self.items
-        self._section = None  # cache for self.section
-        self._filters = None  # cache for self.filters
+
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
+
+    @cached_data_property
+    def images(self):
+        return self.findItems(self._data, media.Image)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
 
     def __len__(self):  # pragma: no cover
         return len(self.items())
@@ -157,25 +157,26 @@ def isPhoto(self):
         """ Returns True if this is a photo collection. """
         return self.subtype in {'photoalbum', 'photo'}
 
-    @property
-    @deprecated('use "items" instead', stacklevel=3)
-    def children(self):
-        return self.items()
+    @cached_data_property
+    def _filters(self):
+        """ Cache for filters. """
+        return self._parseFilters(self.content)
 
     def filters(self):
         """ Returns the search filter dict for smart collection.
             The filter dict be passed back into :func:`~plexapi.library.LibrarySection.search`
             to get the list of items.
         """
-        if self.smart and self._filters is None:
-            self._filters = self._parseFilters(self.content)
         return self._filters
 
+    @cached_data_property
+    def _section(self):
+        """ Cache for section. """
+        return super(Collection, self).section()
+
     def section(self):
         """ Returns the :class:`~plexapi.library.LibrarySection` this collection belongs to.
         """
-        if self._section is None:
-            self._section = super(Collection, self).section()
         return self._section
 
     def item(self, title):
@@ -192,12 +193,14 @@ def item(self, title):
                 return item
         raise NotFound(f'Item with title "{title}" not found in the collection')
 
+    @cached_data_property
+    def _items(self):
+        """ Cache for the items. """
+        key = f'{self.key}/children'
+        return self.fetchItems(key)
+
     def items(self):
         """ Returns a list of all items in the collection. """
-        if self._items is None:
-            key = f'{self.key}/children'
-            items = self.fetchItems(key)
-            self._items = items
         return self._items
 
     def visibility(self):
@@ -405,33 +408,6 @@ def updateFilters(self, libtype=None, limit=None, sort=None, filters=None, **kwa
         self._server.query(key, method=self._server._session.put)
         return self
 
-    @deprecated('use editTitle, editSortTitle, editContentRating, and editSummary instead')
-    def edit(self, title=None, titleSort=None, contentRating=None, summary=None, **kwargs):
-        """ Edit the collection.
-
-            Parameters:
-                title (str, optional): The title of the collection.
-                titleSort (str, optional): The sort title of the collection.
-                contentRating (str, optional): The summary of the collection.
-                summary (str, optional): The summary of the collection.
-        """
-        args = {}
-        if title is not None:
-            args['title.value'] = title
-            args['title.locked'] = 1
-        if titleSort is not None:
-            args['titleSort.value'] = titleSort
-            args['titleSort.locked'] = 1
-        if contentRating is not None:
-            args['contentRating.value'] = contentRating
-            args['contentRating.locked'] = 1
-        if summary is not None:
-            args['summary.value'] = summary
-            args['summary.locked'] = 1
-
-        args.update(kwargs)
-        self._edit(**args)
-
     def delete(self):
         """ Delete the collection. """
         super(Collection, self).delete()
diff --git a/libs/plexapi/config.py b/libs/plexapi/config.py
index 5cfa74c8e8..6d68384663 100644
--- a/libs/plexapi/config.py
+++ b/libs/plexapi/config.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import os
 from collections import defaultdict
 from configparser import ConfigParser
diff --git a/libs/plexapi/const.py b/libs/plexapi/const.py
index bc3e81aa31..f45e6a6b21 100644
--- a/libs/plexapi/const.py
+++ b/libs/plexapi/const.py
@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 """Constants used by plexapi."""
 
 # Library version
 MAJOR_VERSION = 4
-MINOR_VERSION = 16
-PATCH_VERSION = 1
+MINOR_VERSION = 18
+PATCH_VERSION = 0
 __short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__ = f"{__short_version__}.{PATCH_VERSION}"
diff --git a/libs/plexapi/exceptions.py b/libs/plexapi/exceptions.py
index 182feb13df..1d209de9c0 100644
--- a/libs/plexapi/exceptions.py
+++ b/libs/plexapi/exceptions.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 class PlexApiException(Exception):
     """ Base class for all PlexAPI exceptions. """
     pass
diff --git a/libs/plexapi/library.py b/libs/plexapi/library.py
index 6df8b6d2e4..9073ec4c4b 100644
--- a/libs/plexapi/library.py
+++ b/libs/plexapi/library.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from __future__ import annotations
 
 import re
@@ -6,18 +5,16 @@
 import warnings
 from collections import defaultdict
 from datetime import datetime
-from functools import cached_property
 from urllib.parse import parse_qs, quote_plus, urlencode, urlparse
 
 from plexapi import log, media, utils
-from plexapi.base import OPERATORS, PlexObject
+from plexapi.base import OPERATORS, PlexObject, cached_data_property
 from plexapi.exceptions import BadRequest, NotFound
 from plexapi.mixins import (
     MovieEditMixins, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins,
     ArtistEditMixins, AlbumEditMixins, TrackEditMixins, PhotoalbumEditMixins, PhotoEditMixins
 )
 from plexapi.settings import Setting
-from plexapi.utils import deprecated
 
 
 if TYPE_CHECKING:
@@ -39,14 +36,13 @@ class Library(PlexObject):
     key = '/library'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.identifier = data.attrib.get('identifier')
         self.mediaTagVersion = data.attrib.get('mediaTagVersion')
         self.title1 = data.attrib.get('title1')
         self.title2 = data.attrib.get('title2')
-        self._sectionsByID = {}  # cached sections by key
-        self._sectionsByTitle = {}  # cached sections by title
 
+    @cached_data_property
     def _loadSections(self):
         """ Loads and caches all the library sections. """
         key = '/library/sections'
@@ -64,15 +60,23 @@ def _loadSections(self):
             sectionsByID[section.key] = section
             sectionsByTitle[section.title.lower().strip()].append(section)
 
-        self._sectionsByID = sectionsByID
-        self._sectionsByTitle = dict(sectionsByTitle)
+        return sectionsByID, dict(sectionsByTitle)
+
+    @property
+    def _sectionsByID(self):
+        """ Returns a dictionary of all library sections by ID. """
+        return self._loadSections[0]
+
+    @property
+    def _sectionsByTitle(self):
+        """ Returns a dictionary of all library sections by title. """
+        return self._loadSections[1]
 
     def sections(self):
         """ Returns a list of all media sections in this library. Library sections may be any of
             :class:`~plexapi.library.MovieSection`, :class:`~plexapi.library.ShowSection`,
             :class:`~plexapi.library.MusicSection`, :class:`~plexapi.library.PhotoSection`.
         """
-        self._loadSections()
         return list(self._sectionsByID.values())
 
     def section(self, title):
@@ -87,8 +91,6 @@ def section(self, title):
                 :exc:`~plexapi.exceptions.NotFound`: The library section title is not found on the server.
         """
         normalized_title = title.lower().strip()
-        if not self._sectionsByTitle or normalized_title not in self._sectionsByTitle:
-            self._loadSections()
         try:
             sections = self._sectionsByTitle[normalized_title]
         except KeyError:
@@ -110,8 +112,6 @@ def sectionByID(self, sectionID):
             Raises:
                 :exc:`~plexapi.exceptions.NotFound`: The library section ID is not found on the server.
         """
-        if not self._sectionsByID or sectionID not in self._sectionsByID:
-            self._loadSections()
         try:
             return self._sectionsByID[sectionID]
         except KeyError:
@@ -182,6 +182,7 @@ def cleanBundles(self):
             removed. Removing these old bundles can reduce the size of your install. By default, your
             server will automatically clean up old bundles once a week as part of Scheduled Tasks.
         """
+        # TODO: Should this check the response for success or the correct mediaprefix?
         self._server.query('/library/clean/bundles?async=1', method=self._server._session.put)
         return self
 
@@ -384,7 +385,9 @@ def add(self, name='', type='', agent='', scanner='', location='', language='en-
         if kwargs:
             prefs_params = {f'prefs[{k}]': v for k, v in kwargs.items()}
             part += f'&{urlencode(prefs_params)}'
-        return self._server.query(part, method=self._server._session.post)
+        data = self._server.query(part, method=self._server._session.post)
+        self._invalidateCachedProperties()
+        return data
 
     def history(self, maxresults=None, mindate=None):
         """ Get Play History for all library Sections for the owner.
@@ -431,7 +434,7 @@ class LibrarySection(PlexObject):
     """
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.agent = data.attrib.get('agent')
         self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
         self.art = data.attrib.get('art')
@@ -440,7 +443,6 @@ def _loadData(self, data):
         self.filters = utils.cast(bool, data.attrib.get('filters'))
         self.key = utils.cast(int, data.attrib.get('key'))
         self.language = data.attrib.get('language')
-        self.locations = self.listAttrs(data, 'path', etag='Location')
         self.refreshing = utils.cast(bool, data.attrib.get('refreshing'))
         self.scanner = data.attrib.get('scanner')
         self.thumb = data.attrib.get('thumb')
@@ -448,14 +450,12 @@ def _loadData(self, data):
         self.type = data.attrib.get('type')
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
         self.uuid = data.attrib.get('uuid')
-        # Private attrs as we don't want a reload.
-        self._filterTypes = None
-        self._fieldTypes = None
-        self._totalViewSize = None
-        self._totalDuration = None
-        self._totalStorage = None
-
-    @cached_property
+
+    @cached_data_property
+    def locations(self):
+        return self.listAttrs(self._data, 'path', etag='Location')
+
+    @cached_data_property
     def totalSize(self):
         """ Returns the total number of items in the library for the default library type. """
         return self.totalViewSize(includeCollections=False)
@@ -463,16 +463,12 @@ def totalSize(self):
     @property
     def totalDuration(self):
         """ Returns the total duration (in milliseconds) of items in the library. """
-        if self._totalDuration is None:
-            self._getTotalDurationStorage()
-        return self._totalDuration
+        return self._getTotalDurationStorage[0]
 
     @property
     def totalStorage(self):
         """ Returns the total storage (in bytes) of items in the library. """
-        if self._totalStorage is None:
-            self._getTotalDurationStorage()
-        return self._totalStorage
+        return self._getTotalDurationStorage[1]
 
     def __getattribute__(self, attr):
         # Intercept to call EditFieldMixin and EditTagMixin methods
@@ -488,6 +484,7 @@ def __getattribute__(self, attr):
                 )
         return value
 
+    @cached_data_property
     def _getTotalDurationStorage(self):
         """ Queries the Plex server for the total library duration and storage and caches the values. """
         data = self._server.query('/media/providers?includeStorage=1')
@@ -498,8 +495,10 @@ def _getTotalDurationStorage(self):
         )
         directory = next(iter(data.findall(xpath)), None)
         if directory:
-            self._totalDuration = utils.cast(int, directory.attrib.get('durationTotal'))
-            self._totalStorage = utils.cast(int, directory.attrib.get('storageTotal'))
+            totalDuration = utils.cast(int, directory.attrib.get('durationTotal'))
+            totalStorage = utils.cast(int, directory.attrib.get('storageTotal'))
+            return totalDuration, totalStorage
+        return None, None
 
     def totalViewSize(self, libtype=None, includeCollections=True):
         """ Returns the total number of items in the library for a specified libtype.
@@ -530,18 +529,20 @@ def totalViewSize(self, libtype=None, includeCollections=True):
     def delete(self):
         """ Delete a library section. """
         try:
-            return self._server.query(f'/library/sections/{self.key}', method=self._server._session.delete)
+            data = self._server.query(f'/library/sections/{self.key}', method=self._server._session.delete)
+            self._server.library._invalidateCachedProperties()
+            return data
         except BadRequest:  # pragma: no cover
             msg = f'Failed to delete library {self.key}'
             msg += 'You may need to allow this permission in your Plex settings.'
             log.error(msg)
             raise
 
-    def reload(self):
+    def _reload(self, **kwargs):
         """ Reload the data for the library section. """
-        self._server.library._loadSections()
-        newLibrary = self._server.library.sectionByID(self.key)
-        self.__dict__.update(newLibrary.__dict__)
+        key = self._initpath
+        data = self._server.query(key)
+        self._findAndLoadElem(data, key=str(self.key))
         return self
 
     def edit(self, agent=None, **kwargs):
@@ -870,6 +871,7 @@ def deleteMediaPreviews(self):
         self._server.query(key, method=self._server._session.delete)
         return self
 
+    @cached_data_property
     def _loadFilters(self):
         """ Retrieves and caches the list of :class:`~plexapi.library.FilteringType` and
             list of :class:`~plexapi.library.FilteringFieldType` for this library section.
@@ -879,23 +881,23 @@ def _loadFilters(self):
 
         key = _key.format(key=self.key, filter='all')
         data = self._server.query(key)
-        self._filterTypes = self.findItems(data, FilteringType, rtag='Meta')
-        self._fieldTypes = self.findItems(data, FilteringFieldType, rtag='Meta')
+        filterTypes = self.findItems(data, FilteringType, rtag='Meta')
+        fieldTypes = self.findItems(data, FilteringFieldType, rtag='Meta')
 
         if self.TYPE != 'photo':  # No collections for photo library
             key = _key.format(key=self.key, filter='collections')
             data = self._server.query(key)
-            self._filterTypes.extend(self.findItems(data, FilteringType, rtag='Meta'))
+            filterTypes.extend(self.findItems(data, FilteringType, rtag='Meta'))
 
         # Manually add guid field type, only allowing "is" operator
         guidFieldType = '<FieldType type="guid"><Operator key="=" title="is"/></FieldType>'
-        self._fieldTypes.append(self._manuallyLoadXML(guidFieldType, FilteringFieldType))
+        fieldTypes.append(self._manuallyLoadXML(guidFieldType, FilteringFieldType))
+
+        return filterTypes, fieldTypes
 
     def filterTypes(self):
         """ Returns a list of available :class:`~plexapi.library.FilteringType` for this library section. """
-        if self._filterTypes is None:
-            self._loadFilters()
-        return self._filterTypes
+        return self._loadFilters[0]
 
     def getFilterType(self, libtype=None):
         """ Returns a :class:`~plexapi.library.FilteringType` for a specified libtype.
@@ -917,9 +919,7 @@ def getFilterType(self, libtype=None):
 
     def fieldTypes(self):
         """ Returns a list of available :class:`~plexapi.library.FilteringFieldType` for this library section. """
-        if self._fieldTypes is None:
-            self._loadFilters()
-        return self._fieldTypes
+        return self._loadFilters[1]
 
     def getFieldType(self, fieldType):
         """ Returns a :class:`~plexapi.library.FilteringFieldType` for a specified fieldType.
@@ -1686,14 +1686,6 @@ def playlists(self, sort=None, **kwargs):
         return self._server.playlists(
             playlistType=self.CONTENT_TYPE, sectionId=self.key, sort=sort, **kwargs)
 
-    @deprecated('use "listFields" instead')
-    def filterFields(self, mediaType=None):
-        return self.listFields(libtype=mediaType)
-
-    @deprecated('use "listFilterChoices" instead')
-    def listChoices(self, category, libtype=None, **kwargs):
-        return self.listFilterChoices(field=category, libtype=libtype)
-
     def getWebURL(self, base=None, tab=None, key=None):
         """ Returns the Plex Web URL for the library.
 
@@ -1968,7 +1960,7 @@ def albums(self):
 
     def stations(self):
         """ Returns a list of :class:`~plexapi.playlist.Playlist` stations in this section. """
-        return next((hub.items for hub in self.hubs() if hub.context == 'hub.music.stations'), None)
+        return next((hub._partialItems for hub in self.hubs() if hub.context == 'hub.music.stations'), None)
 
     def searchArtists(self, **kwargs):
         """ Search for an artist. See :func:`~plexapi.library.LibrarySection.search` for usage. """
@@ -2164,7 +2156,6 @@ class LibraryTimeline(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.size = utils.cast(int, data.attrib.get('size'))
         self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
         self.art = data.attrib.get('art')
@@ -2193,7 +2184,6 @@ class Location(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.id = utils.cast(int, data.attrib.get('id'))
         self.path = data.attrib.get('path')
 
@@ -2207,9 +2197,10 @@ class Hub(PlexObject):
             context (str): The context of the hub.
             hubKey (str): API URL for these specific hub items.
             hubIdentifier (str): The identifier of the hub.
-            items (list): List of items in the hub.
+            items (list): List of items in the hub (automatically loads all items if more is True).
             key (str): API URL for the hub.
-            more (bool): True if there are more items to load (call reload() to fetch all items).
+            random (bool): True if the items in the hub are randomized.
+            more (bool): True if there are more items to load (call items to fetch all items).
             size (int): The number of items in the hub.
             style (str): The style of the hub.
             title (str): The title of the hub.
@@ -2219,36 +2210,57 @@ class Hub(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.context = data.attrib.get('context')
         self.hubKey = data.attrib.get('hubKey')
         self.hubIdentifier = data.attrib.get('hubIdentifier')
-        self.items = self.findItems(data)
         self.key = data.attrib.get('key')
         self.more = utils.cast(bool, data.attrib.get('more'))
+        self.random = utils.cast(bool, data.attrib.get('random', '0'))
         self.size = utils.cast(int, data.attrib.get('size'))
         self.style = data.attrib.get('style')
         self.title = data.attrib.get('title')
         self.type = data.attrib.get('type')
-        self._section = None  # cache for self.section
 
     def __len__(self):
         return self.size
 
-    def reload(self):
-        """ Reloads the hub to fetch all items in the hub. """
-        if self.more and self.key:
-            self.items = self.fetchItems(self.key)
+    @cached_data_property
+    def _partialItems(self):
+        """ Cache for partial items. """
+        return self.findItems(self._data)
+
+    @cached_data_property
+    def _items(self):
+        """ Cache for items. """
+        if self.more and self.key:  # If there are more items to load, fetch them
+            items = self.fetchItems(self.key)
             self.more = False
-            self.size = len(self.items)
+            self.size = len(items)
+            return items
+        # Otherwise, all the data is in the initial _data XML response
+        return self._partialItems
+
+    def items(self):
+        """ Returns a list of all items in the hub. """
+        return self._items
+
+    @cached_data_property
+    def _section(self):
+        """ Cache for section. """
+        return self._server.library.sectionByID(self.librarySectionID)
 
     def section(self):
         """ Returns the :class:`~plexapi.library.LibrarySection` this hub belongs to.
         """
-        if self._section is None:
-            self._section = self._server.library.sectionByID(self.librarySectionID)
         return self._section
 
+    def _reload(self, **kwargs):
+        """ Reload the data for the hub. """
+        key = self._initpath
+        data = self._server.query(key)
+        self._findAndLoadElem(data, hubIdentifier=self.hubIdentifier)
+        return self
+
 
 class LibraryMediaTag(PlexObject):
     """ Base class of library media tags.
@@ -2278,7 +2290,6 @@ class LibraryMediaTag(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.count = utils.cast(int, data.attrib.get('count'))
         self.filter = data.attrib.get('filter')
         self.id = utils.cast(int, data.attrib.get('id'))
@@ -2667,22 +2678,25 @@ def __repr__(self):
         return f"<{':'.join([p for p in [self.__class__.__name__, _type] if p])}>"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.active = utils.cast(bool, data.attrib.get('active', '0'))
-        self.fields = self.findItems(data, FilteringField)
-        self.filters = self.findItems(data, FilteringFilter)
         self.key = data.attrib.get('key')
-        self.sorts = self.findItems(data, FilteringSort)
         self.title = data.attrib.get('title')
         self.type = data.attrib.get('type')
 
         self._librarySectionID = self._parent().key
 
-        # Add additional manual filters, sorts, and fields which are available
-        # but not exposed on the Plex server
-        self.filters += self._manualFilters()
-        self.sorts += self._manualSorts()
-        self.fields += self._manualFields()
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, FilteringField) + self._manualFields()
+
+    @cached_data_property
+    def filters(self):
+        return self.findItems(self._data, FilteringFilter) + self._manualFilters()
+
+    @cached_data_property
+    def sorts(self):
+        return self.findItems(self._data, FilteringSort) + self._manualSorts()
 
     def _manualFilters(self):
         """ Manually add additional filters which are available
@@ -2862,7 +2876,7 @@ class FilteringFilter(PlexObject):
     TAG = 'Filter'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.filter = data.attrib.get('filter')
         self.filterType = data.attrib.get('filterType')
         self.key = data.attrib.get('key')
@@ -2888,7 +2902,6 @@ class FilteringSort(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.active = utils.cast(bool, data.attrib.get('active', '0'))
         self.activeDirection = data.attrib.get('activeDirection')
         self.default = data.attrib.get('default')
@@ -2913,7 +2926,6 @@ class FilteringField(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.key = data.attrib.get('key')
         self.title = data.attrib.get('title')
         self.type = data.attrib.get('type')
@@ -2936,9 +2948,11 @@ def __repr__(self):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.type = data.attrib.get('type')
-        self.operators = self.findItems(data, FilteringOperator)
+
+    @cached_data_property
+    def operators(self):
+        return self.findItems(self._data, FilteringOperator)
 
 
 class FilteringOperator(PlexObject):
@@ -2975,7 +2989,6 @@ class FilterChoice(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.fastKey = data.attrib.get('fastKey')
         self.key = data.attrib.get('key')
         self.thumb = data.attrib.get('thumb')
@@ -3005,7 +3018,6 @@ class ManagedHub(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.deletable = utils.cast(bool, data.attrib.get('deletable', True))
         self.homeVisibility = data.attrib.get('homeVisibility', 'none')
         self.identifier = data.attrib.get('identifier')
@@ -3019,11 +3031,11 @@ def _loadData(self, data):
         parent = self._parent()
         self.librarySectionID = parent.key if isinstance(parent, LibrarySection) else parent.librarySectionID
 
-    def reload(self):
+    def _reload(self, **kwargs):
         """ Reload the data for this managed hub. """
         key = f'/hubs/sections/{self.librarySectionID}/manage'
-        hub = self.fetchItem(key, self.__class__, identifier=self.identifier)
-        self.__dict__.update(hub.__dict__)
+        data = self._server.query(key)
+        self._findAndLoadElem(data, identifier=self.identifier)
         return self
 
     def move(self, after=None):
@@ -3169,7 +3181,6 @@ class FirstCharacter(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.key = data.attrib.get('key')
         self.size = data.attrib.get('size')
         self.title = data.attrib.get('title')
@@ -3190,6 +3201,7 @@ class Path(PlexObject):
     TAG = 'Path'
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.home = utils.cast(bool, data.attrib.get('home'))
         self.key = data.attrib.get('key')
         self.network = utils.cast(bool, data.attrib.get('network'))
@@ -3219,6 +3231,7 @@ class File(PlexObject):
     TAG = 'File'
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.key = data.attrib.get('key')
         self.path = data.attrib.get('path')
         self.title = data.attrib.get('title')
@@ -3267,41 +3280,83 @@ class Common(PlexObject):
     TAG = 'Common'
 
     def _loadData(self, data):
-        self._data = data
-        self.collections = self.findItems(data, media.Collection)
+        """ Load attribute values from Plex XML response. """
         self.contentRating = data.attrib.get('contentRating')
-        self.countries = self.findItems(data, media.Country)
-        self.directors = self.findItems(data, media.Director)
         self.editionTitle = data.attrib.get('editionTitle')
-        self.fields = self.findItems(data, media.Field)
-        self.genres = self.findItems(data, media.Genre)
         self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
         self.grandparentTitle = data.attrib.get('grandparentTitle')
         self.guid = data.attrib.get('guid')
-        self.guids = self.findItems(data, media.Guid)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = data.attrib.get('key')
-        self.labels = self.findItems(data, media.Label)
         self.mixedFields = data.attrib.get('mixedFields').split(',')
-        self.moods = self.findItems(data, media.Mood)
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'))
         self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
         self.parentTitle = data.attrib.get('parentTitle')
-        self.producers = self.findItems(data, media.Producer)
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.ratings = self.findItems(data, media.Rating)
-        self.roles = self.findItems(data, media.Role)
         self.studio = data.attrib.get('studio')
-        self.styles = self.findItems(data, media.Style)
         self.summary = data.attrib.get('summary')
         self.tagline = data.attrib.get('tagline')
-        self.tags = self.findItems(data, media.Tag)
         self.title = data.attrib.get('title')
         self.titleSort = data.attrib.get('titleSort')
         self.type = data.attrib.get('type')
-        self.writers = self.findItems(data, media.Writer)
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def countries(self):
+        return self.findItems(self._data, media.Country)
+
+    @cached_data_property
+    def directors(self):
+        return self.findItems(self._data, media.Director)
+
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
+
+    @cached_data_property
+    def genres(self):
+        return self.findItems(self._data, media.Genre)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def moods(self):
+        return self.findItems(self._data, media.Mood)
+
+    @cached_data_property
+    def producers(self):
+        return self.findItems(self._data, media.Producer)
+
+    @cached_data_property
+    def ratings(self):
+        return self.findItems(self._data, media.Rating)
+
+    @cached_data_property
+    def roles(self):
+        return self.findItems(self._data, media.Role)
+
+    @cached_data_property
+    def styles(self):
+        return self.findItems(self._data, media.Style)
+
+    @cached_data_property
+    def tags(self):
+        return self.findItems(self._data, media.Tag)
+
+    @cached_data_property
+    def writers(self):
+        return self.findItems(self._data, media.Writer)
+
     def __repr__(self):
         return '<%s:%s:%s>' % (
             self.__class__.__name__,
diff --git a/libs/plexapi/media.py b/libs/plexapi/media.py
index 9c6e3115b9..465eaf7487 100644
--- a/libs/plexapi/media.py
+++ b/libs/plexapi/media.py
@@ -1,12 +1,10 @@
-# -*- coding: utf-8 -*-
-import xml
 from pathlib import Path
 from urllib.parse import quote_plus
+from xml.etree import ElementTree
 
 from plexapi import log, settings, utils
-from plexapi.base import PlexObject
+from plexapi.base import PlexObject, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.utils import deprecated
 
 
 @utils.registerPlexObject
@@ -51,7 +49,6 @@ class Media(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.aspectRatio = utils.cast(float, data.attrib.get('aspectRatio'))
         self.audioChannels = utils.cast(int, data.attrib.get('audioChannels'))
         self.audioCodec = data.attrib.get('audioCodec')
@@ -64,7 +61,6 @@ def _loadData(self, data):
         self.has64bitOffsets = utils.cast(bool, data.attrib.get('has64bitOffsets'))
         self.hasVoiceActivity = utils.cast(bool, data.attrib.get('hasVoiceActivity', '0'))
         self.optimizedForStreaming = utils.cast(bool, data.attrib.get('optimizedForStreaming'))
-        self.parts = self.findItems(data, MediaPart)
         self.proxyType = utils.cast(int, data.attrib.get('proxyType'))
         self.selected = utils.cast(bool, data.attrib.get('selected'))
         self.target = data.attrib.get('target')
@@ -87,6 +83,10 @@ def _loadData(self, data):
         parent = self._parent()
         self._parentKey = parent.key
 
+    @cached_data_property
+    def parts(self):
+        return self.findItems(self._data, MediaPart)
+
     @property
     def isOptimizedVersion(self):
         """ Returns True if the media is a Plex optimized version. """
@@ -138,7 +138,6 @@ class MediaPart(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.accessible = utils.cast(bool, data.attrib.get('accessible'))
         self.audioProfile = data.attrib.get('audioProfile')
         self.container = data.attrib.get('container')
@@ -230,18 +229,6 @@ def resetSelectedSubtitleStream(self):
         self._server.query(key, method=self._server._session.put, params=params)
         return self
 
-    @deprecated('Use "setSelectedAudioStream" instead.')
-    def setDefaultAudioStream(self, stream):
-        return self.setSelectedAudioStream(stream)
-
-    @deprecated('Use "setSelectedSubtitleStream" instead.')
-    def setDefaultSubtitleStream(self, stream):
-        return self.setSelectedSubtitleStream(stream)
-
-    @deprecated('Use "resetSelectedSubtitleStream" instead.')
-    def resetDefaultSubtitleStream(self):
-        return self.resetSelectedSubtitleStream()
-
 
 class MediaPartStream(PlexObject):
     """ Base class for media streams. These consist of video, audio, subtitles, and lyrics.
@@ -268,7 +255,6 @@ class MediaPartStream(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.bitrate = utils.cast(int, data.attrib.get('bitrate'))
         self.codec = data.attrib.get('codec')
         self.decision = data.attrib.get('decision')
@@ -386,6 +372,7 @@ class AudioStream(MediaPartStream):
             profile (str): The profile of the audio stream.
             samplingRate (int): The sampling rate of the audio stream (ex: xxx)
             streamIdentifier (int): The stream identifier of the audio stream.
+            visualImpaired (bool): True if this is a visually impaired (AD) audio stream.
 
             Track_only_attributes: The following attributes are only available for tracks.
 
@@ -413,6 +400,7 @@ def _loadData(self, data):
         self.profile = data.attrib.get('profile')
         self.samplingRate = utils.cast(int, data.attrib.get('samplingRate'))
         self.streamIdentifier = utils.cast(int, data.attrib.get('streamIdentifier'))
+        self.visualImpaired = utils.cast(bool, data.attrib.get('visualImpaired', '0'))
 
         # Track only attributes
         self.albumGain = utils.cast(float, data.attrib.get('albumGain'))
@@ -431,9 +419,16 @@ def setSelected(self):
         """
         return self._parent().setSelectedAudioStream(self)
 
-    @deprecated('Use "setSelected" instead.')
-    def setDefault(self):
-        return self.setSelected()
+    def levels(self, subSample=128):
+        """ Returns a list of :class:`~plexapi.media.Level` objects for this AudioStream.
+            Only available for Tracks which have been analyzed for loudness.
+
+            Attributes:
+                subSample (int): The number of loudness samples to return. Default 128.
+        """
+        key = f'/library/streams/{self.id}/levels'
+        params = {'subsample': subSample}
+        return self.fetchItems(key, params=params)
 
 
 @utils.registerPlexObject
@@ -481,10 +476,6 @@ def setSelected(self):
         """
         return self._parent().setSelectedSubtitleStream(self)
 
-    @deprecated('Use "setSelected" instead.')
-    def setDefault(self):
-        return self.setSelected()
-
 
 @utils.registerPlexObject
 class LyricStream(MediaPartStream):
@@ -523,6 +514,7 @@ class Session(PlexObject):
     TAG = 'Session'
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.id = data.attrib.get('id')
         self.bandwidth = utils.cast(int, data.attrib.get('bandwidth'))
         self.location = data.attrib.get('location')
@@ -569,7 +561,6 @@ class TranscodeSession(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.audioChannels = utils.cast(int, data.attrib.get('audioChannels'))
         self.audioCodec = data.attrib.get('audioCodec')
         self.audioDecision = data.attrib.get('audioDecision')
@@ -610,7 +601,7 @@ class TranscodeJob(PlexObject):
     TAG = 'TranscodeJob'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.generatorID = data.attrib.get('generatorID')
         self.key = data.attrib.get('key')
         self.progress = data.attrib.get('progress')
@@ -629,7 +620,7 @@ class Optimized(PlexObject):
     TAG = 'Item'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.id = data.attrib.get('id')
         self.composite = data.attrib.get('composite')
         self.title = data.attrib.get('title')
@@ -667,7 +658,7 @@ class Conversion(PlexObject):
     TAG = 'Video'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.addedAt = data.attrib.get('addedAt')
         self.art = data.attrib.get('art')
         self.chapterSource = data.attrib.get('chapterSource')
@@ -728,7 +719,7 @@ class MediaTag(PlexObject):
 
         Attributes:
             filter (str): The library filter for the tag.
-            id (id): Tag ID (This seems meaningless except to use it as a unique id).
+            id (int): Tag ID (This seems meaningless except to use it as a unique id).
             key (str): API URL (/library/section/<librarySectionID>/all?<filter>).
             role (str): The name of the character role for :class:`~plexapi.media.Role` only.
             tag (str): Name of the tag. This will be Animation, SciFi etc for Genres. The name of
@@ -743,7 +734,6 @@ def __str__(self):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.filter = data.attrib.get('filter')
         self.id = utils.cast(int, data.attrib.get('id'))
         self.key = data.attrib.get('key')
@@ -954,7 +944,6 @@ class Guid(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.id = data.attrib.get('id')
 
 
@@ -972,7 +961,6 @@ class Image(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.alt = data.attrib.get('alt')
         self.type = data.attrib.get('type')
         self.url = data.attrib.get('url')
@@ -994,7 +982,6 @@ class Rating(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.image = data.attrib.get('image')
         self.type = data.attrib.get('type')
         self.value = utils.cast(float, data.attrib.get('value'))
@@ -1017,7 +1004,7 @@ class Review(PlexObject):
     TAG = 'Review'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.filter = data.attrib.get('filter')
         self.id = utils.cast(int, data.attrib.get('id', 0))
         self.image = data.attrib.get('image')
@@ -1042,7 +1029,6 @@ class UltraBlurColors(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.bottomLeft = data.attrib.get('bottomLeft')
         self.bottomRight = data.attrib.get('bottomRight')
         self.topLeft = data.attrib.get('topLeft')
@@ -1063,7 +1049,7 @@ class BaseResource(PlexObject):
     """
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.key = data.attrib.get('key')
         self.provider = data.attrib.get('provider')
         self.ratingKey = data.attrib.get('ratingKey')
@@ -1075,7 +1061,7 @@ def select(self):
         data = f'{key}?url={quote_plus(self.ratingKey)}'
         try:
             self._server.query(data, method=self._server._session.put)
-        except xml.etree.ElementTree.ParseError:
+        except ElementTree.ParseError:
             pass
 
     @property
@@ -1108,6 +1094,11 @@ class Poster(BaseResource):
     TAG = 'Photo'
 
 
+class SquareArt(BaseResource):
+    """ Represents a single Square Art object. """
+    TAG = 'Photo'
+
+
 class Theme(BaseResource):
     """ Represents a single Theme object. """
     TAG = 'Track'
@@ -1138,7 +1129,7 @@ def __repr__(self):
         return f"<{':'.join([self.__class__.__name__, name, offsets])}>"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.end = utils.cast(int, data.attrib.get('endTimeOffset'))
         self.filter = data.attrib.get('filter')
         self.id = utils.cast(int, data.attrib.get('id', 0))
@@ -1172,7 +1163,7 @@ def __repr__(self):
         return f"<{':'.join([self.__class__.__name__, name, offsets])}>"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.end = utils.cast(int, data.attrib.get('endTimeOffset'))
         self.final = utils.cast(bool, data.attrib.get('final'))
         self.id = utils.cast(int, data.attrib.get('id'))
@@ -1206,7 +1197,7 @@ class Field(PlexObject):
     TAG = 'Field'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.locked = utils.cast(bool, data.attrib.get('locked'))
         self.name = data.attrib.get('name')
 
@@ -1226,7 +1217,7 @@ def __repr__(self):
         return f"<{':'.join([p for p in [self.__class__.__name__, name, score] if p])}>"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.guid = data.attrib.get('guid')
         self.lifespanEnded = data.attrib.get('lifespanEnded')
         self.name = data.attrib.get('name')
@@ -1248,7 +1239,7 @@ def __repr__(self):
         return f"<{':'.join([p for p in [self.__class__.__name__, uid] if p])}>"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.hasAttribution = data.attrib.get('hasAttribution')
         self.hasPrefs = data.attrib.get('hasPrefs')
         self.identifier = data.attrib.get('identifier')
@@ -1256,27 +1247,23 @@ def _loadData(self, data):
         self.primary = data.attrib.get('primary')
         self.shortIdentifier = self.identifier.rsplit('.', 1)[1]
 
+    @cached_data_property
+    def languageCodes(self):
         if 'mediaType' in self._initpath:
-            self.languageCodes = self.listAttrs(data, 'code', etag='Language')
-            self.mediaTypes = []
-        else:
-            self.languageCodes = []
-            self.mediaTypes = self.findItems(data, cls=AgentMediaType)
+            return self.listAttrs(self._data, 'code', etag='Language')
+        return []
 
-    @property
-    @deprecated('use "languageCodes" instead')
-    def languageCode(self):
-        return self.languageCodes
+    @cached_data_property
+    def mediaTypes(self):
+        if 'mediaType' not in self._initpath:
+            return self.findItems(self._data, cls=AgentMediaType)
+        return []
 
     def settings(self):
         key = f'/:/plugins/{self.identifier}/prefs'
         data = self._server.query(key)
         return self.findItems(data, cls=settings.Setting)
 
-    @deprecated('use "settings" instead')
-    def _settings(self):
-        return self.settings()
-
 
 class AgentMediaType(Agent):
     """ Represents a single Agent MediaType.
@@ -1291,14 +1278,13 @@ def __repr__(self):
         return f"<{':'.join([p for p in [self.__class__.__name__, uid] if p])}>"
 
     def _loadData(self, data):
-        self.languageCodes = self.listAttrs(data, 'code', etag='Language')
+        """ Load attribute values from Plex XML response. """
         self.mediaType = utils.cast(int, data.attrib.get('mediaType'))
         self.name = data.attrib.get('name')
 
-    @property
-    @deprecated('use "languageCodes" instead')
-    def languageCode(self):
-        return self.languageCodes
+    @cached_data_property
+    def languageCodes(self):
+        return self.listAttrs(self._data, 'code', etag='Language')
 
 
 @utils.registerPlexObject
@@ -1325,7 +1311,7 @@ def __repr__(self):
         return f'<{self.__class__.__name__}:{self.platform}:{self.offerType}>'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.country = data.attrib.get('country')
         self.offerType = data.attrib.get('offerType')
         self.platform = data.attrib.get('platform')
@@ -1337,3 +1323,135 @@ def _loadData(self, data):
         self.quality = data.attrib.get('quality')
         self.title = data.attrib.get('title')
         self.url = data.attrib.get('url')
+
+
+@utils.registerPlexObject
+class Level(PlexObject):
+    """ Represents a single loudness Level sample for an AudioStream.
+
+        Attributes:
+            loudness (float): Loudness level value
+    """
+    def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
+        self.loudness = utils.cast(float, data.attrib.get('v'))
+
+
+@utils.registerPlexObject
+class CommonSenseMedia(PlexObject):
+    """ Represents a single CommonSenseMedia media tag.
+        Note: This object is only loaded with partial data from a Plex Media Server.
+        Call `reload()` to load the full data from Plex Discover (Plex Pass required).
+
+        Attributes:
+            TAG (str): 'CommonSenseMedia'
+            ageRatings (List<:class:`~plexapi.media.AgeRating`>): List of AgeRating objects.
+            anyGood (str): A brief description of the media's quality.
+            id (int): The ID of the CommonSenseMedia tag.
+            key (str): The unique key for the CommonSenseMedia tag.
+            oneLiner (str): A brief description of the CommonSenseMedia tag.
+            parentalAdvisoryTopics (List<:class:`~plexapi.media.ParentalAdvisoryTopic`>):
+                List of ParentalAdvisoryTopic objects.
+            parentsNeedToKnow (str): A brief description of what parents need to know about the media.
+            talkingPoints (List<:class:`~plexapi.media.TalkingPoint`>): List of TalkingPoint objects.
+
+        Example:
+
+            .. code-block:: python
+
+                from plexapi.server import PlexServer
+                plex = PlexServer('http://localhost:32400', token='xxxxxxxxxxxxxxxxxxxx')
+
+                # Retrieve the Common Sense Media info for a movie
+                movie = plex.library.section('Movies').get('Cars')
+                commonSenseMedia = movie.commonSenseMedia
+                ageRating = commonSenseMedia.ageRatings[0].age
+
+                # Load the Common Sense Media info from Plex Discover (Plex Pass required)
+                commonSenseMedia.reload()
+                parentalAdvisoryTopics = commonSenseMedia.parentalAdvisoryTopics
+                talkingPoints = commonSenseMedia.talkingPoints
+
+    """
+    TAG = 'CommonSenseMedia'
+
+    def _loadData(self, data):
+        self.ageRatings = self.findItems(data, AgeRating)
+        self.anyGood = data.attrib.get('anyGood')
+        self.id = utils.cast(int, data.attrib.get('id'))
+        self.key = data.attrib.get('key')
+        self.oneLiner = data.attrib.get('oneLiner')
+        self.parentalAdvisoryTopics = self.findItems(data, ParentalAdvisoryTopic)
+        self.parentsNeedToKnow = data.attrib.get('parentsNeedToKnow')
+        self.talkingPoints = self.findItems(data, TalkingPoint)
+
+    def _reload(self, **kwargs):
+        """ Reload the data for the Common Sense Media object. """
+        guid = self._parent().guid
+        if not guid.startswith('plex://'):
+            return self
+
+        ratingKey = guid.rsplit('/', 1)[-1]
+        account = self._server.myPlexAccount()
+        key = f'{account.METADATA}/library/metadata/{ratingKey}/commonsensemedia'
+        data = account.query(key)
+        self._findAndLoadElem(data)
+        return self
+
+
+@utils.registerPlexObject
+class AgeRating(PlexObject):
+    """ Represents a single AgeRating for a Common Sense Media tag.
+
+        Attributes:
+            TAG (str): 'AgeRating'
+            age (float): The age rating (e.g. 13, 17).
+            ageGroup (str): The age group for the rating (e.g. Little Kids, Teens, etc.).
+            rating (float): The star rating (out of 5).
+            ratingCount (int): The number of ratings contributing to the star rating.
+            type (str): The type of rating (official, adult, child).
+    """
+    TAG = 'AgeRating'
+
+    def _loadData(self, data):
+        self.age = utils.cast(float, data.attrib.get('age'))
+        self.ageGroup = data.attrib.get('ageGroup')
+        self.rating = utils.cast(float, data.attrib.get('rating'))
+        self.ratingCount = utils.cast(int, data.attrib.get('ratingCount'))
+        self.type = data.attrib.get('type')
+
+
+@utils.registerPlexObject
+class TalkingPoint(PlexObject):
+    """ Represents a single TalkingPoint for a Common Sense Media tag.
+
+        Attributes:
+            TAG (str): 'TalkingPoint'
+            tag (str): The description of the talking point.
+    """
+    TAG = 'TalkingPoint'
+
+    def _loadData(self, data):
+        self.tag = data.attrib.get('tag')
+
+
+@utils.registerPlexObject
+class ParentalAdvisoryTopic(PlexObject):
+    """ Represents a single ParentalAdvisoryTopic for a Common Sense Media tag.
+
+        Attributes:
+            TAG (str): 'ParentalAdvisoryTopic'
+            id (str): The ID of the topic (e.g. violence, language, etc.).
+            label (str): The label for the topic (e.g. Violence & Scariness, Language, etc.).
+            positive (bool): Whether the topic is considered positive.
+            rating (float): The rating of the topic (out of 5).
+            tag (str): The description of the parental advisory topic.
+    """
+    TAG = 'ParentalAdvisoryTopic'
+
+    def _loadData(self, data):
+        self.id = data.attrib.get('id')
+        self.label = data.attrib.get('label')
+        self.positive = utils.cast(bool, data.attrib.get('positive'))
+        self.rating = utils.cast(float, data.attrib.get('rating'))
+        self.tag = data.attrib.get('tag')
diff --git a/libs/plexapi/mixins.py b/libs/plexapi/mixins.py
deleted file mode 100644
index 95f785fcc9..0000000000
--- a/libs/plexapi/mixins.py
+++ /dev/null
@@ -1,1325 +0,0 @@
-# -*- coding: utf-8 -*-
-from collections import deque
-from datetime import datetime
-from typing import Deque, Set, Tuple, Union
-from urllib.parse import parse_qsl, quote, quote_plus, unquote, urlencode, urlsplit
-
-from plexapi import media, settings, utils
-from plexapi.exceptions import BadRequest, NotFound
-from plexapi.utils import deprecated, openOrRead
-
-
-class AdvancedSettingsMixin:
-    """ Mixin for Plex objects that can have advanced settings. """
-
-    def preferences(self):
-        """ Returns a list of :class:`~plexapi.settings.Preferences` objects. """
-        key = f'{self.key}?includePreferences=1'
-        return self.fetchItems(key, cls=settings.Preferences, rtag='Preferences')
-
-    def preference(self, pref):
-        """ Returns a :class:`~plexapi.settings.Preferences` object for the specified pref.
-
-            Parameters:
-                pref (str): The id of the preference to return.
-        """
-        prefs = self.preferences()
-        try:
-            return next(p for p in prefs if p.id == pref)
-        except StopIteration:
-            availablePrefs = [p.id for p in prefs]
-            raise NotFound(f'Unknown preference "{pref}" for {self.TYPE}. '
-                           f'Available preferences: {availablePrefs}') from None
-
-    def editAdvanced(self, **kwargs):
-        """ Edit a Plex object's advanced settings. """
-        data = {}
-        key = f'{self.key}/prefs?'
-        preferences = {pref.id: pref for pref in self.preferences() if pref.enumValues}
-        for settingID, value in kwargs.items():
-            try:
-                pref = preferences[settingID]
-            except KeyError:
-                raise NotFound(f'{value} not found in {list(preferences.keys())}')
-
-            enumValues = pref.enumValues
-            if enumValues.get(value, enumValues.get(str(value))):
-                data[settingID] = value
-            else:
-                raise NotFound(f'{value} not found in {list(enumValues)}')
-        url = key + urlencode(data)
-        self._server.query(url, method=self._server._session.put)
-        return self
-
-    def defaultAdvanced(self):
-        """ Edit all of a Plex object's advanced settings to default. """
-        data = {}
-        key = f'{self.key}/prefs?'
-        for preference in self.preferences():
-            data[preference.id] = preference.default
-        url = key + urlencode(data)
-        self._server.query(url, method=self._server._session.put)
-        return self
-
-
-class SmartFilterMixin:
-    """ Mixin for Plex objects that can have smart filters. """
-
-    def _parseFilterGroups(self, feed: Deque[Tuple[str, str]], returnOn: Union[Set[str], None] = None) -> dict:
-        """ Parse filter groups from input lines between push and pop. """
-        currentFiltersStack: list[dict] = []
-        operatorForStack = None
-        if returnOn is None:
-            returnOn = set("pop")
-        else:
-            returnOn.add("pop")
-        allowedLogicalOperators = ["and", "or"]  # first is the default
-
-        while feed:
-            key, value = feed.popleft()  # consume the first item
-            if key == "push":
-                # recurse and add the result to the current stack
-                currentFiltersStack.append(
-                    self._parseFilterGroups(feed, returnOn)
-                )
-            elif key in returnOn:
-                # stop iterating and return the current stack
-                if not key == "pop":
-                    feed.appendleft((key, value))  # put the item back
-                break
-
-            elif key in allowedLogicalOperators:
-                # set the operator
-                if operatorForStack and not operatorForStack == key:
-                    raise ValueError(
-                        "cannot have different logical operators for the same"
-                        " filter group"
-                    )
-                operatorForStack = key
-
-            else:
-                # add the key value pair to the current filter
-                currentFiltersStack.append({key: value})
-
-        if not operatorForStack and len(currentFiltersStack) > 1:
-            # consider 'and' as the default operator
-            operatorForStack = allowedLogicalOperators[0]
-
-        if operatorForStack:
-            return {operatorForStack: currentFiltersStack}
-        return currentFiltersStack.pop()
-
-    def _parseQueryFeed(self, feed: "deque[Tuple[str, str]]") -> dict:
-        """ Parse the query string into a dict. """
-        filtersDict = {}
-        special_keys = {"type", "sort"}
-        integer_keys = {"includeGuids", "limit"}
-        as_is_keys = {"group", "having"}
-        reserved_keys = special_keys | integer_keys | as_is_keys
-        while feed:
-            key, value = feed.popleft()
-            if key in integer_keys:
-                filtersDict[key] = int(value)
-            elif key in as_is_keys:
-                filtersDict[key] = value
-            elif key == "type":
-                filtersDict["libtype"] = utils.reverseSearchType(value)
-            elif key == "sort":
-                filtersDict["sort"] = value.split(",")
-            else:
-                feed.appendleft((key, value))  # put the item back
-                filter_group = self._parseFilterGroups(
-                    feed, returnOn=reserved_keys
-                )
-                if "filters" in filtersDict:
-                    filtersDict["filters"] = {
-                        "and": [filtersDict["filters"], filter_group]
-                    }
-                else:
-                    filtersDict["filters"] = filter_group
-
-        return filtersDict
-
-    def _parseFilters(self, content):
-        """ Parse the content string and returns the filter dict. """
-        content = urlsplit(unquote(content))
-        feed = deque()
-
-        for key, value in parse_qsl(content.query):
-            # Move = sign to key when operator is ==
-            if value.startswith("="):
-                key, value = f"{key}=", value[1:]
-
-            feed.append((key, value))
-
-        return self._parseQueryFeed(feed)
-
-
-class SplitMergeMixin:
-    """ Mixin for Plex objects that can be split and merged. """
-
-    def split(self):
-        """ Split duplicated Plex object into separate objects. """
-        key = f'{self.key}/split'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def merge(self, ratingKeys):
-        """ Merge other Plex objects into the current object.
-
-            Parameters:
-                ratingKeys (list): A list of rating keys to merge.
-        """
-        if not isinstance(ratingKeys, list):
-            ratingKeys = str(ratingKeys).split(',')
-
-        key = f"{self.key}/merge?ids={','.join(str(r) for r in ratingKeys)}"
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-
-class UnmatchMatchMixin:
-    """ Mixin for Plex objects that can be unmatched and matched. """
-
-    def unmatch(self):
-        """ Unmatches metadata match from object. """
-        key = f'{self.key}/unmatch'
-        self._server.query(key, method=self._server._session.put)
-
-    def matches(self, agent=None, title=None, year=None, language=None):
-        """ Return list of (:class:`~plexapi.media.SearchResult`) metadata matches.
-
-             Parameters:
-                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
-                title (str): Title of item to search for
-                year (str): Year of item to search in
-                language (str) : Language of item to search in
-
-            Examples:
-                1. video.matches()
-                2. video.matches(title="something", year=2020)
-                3. video.matches(title="something")
-                4. video.matches(year=2020)
-                5. video.matches(title="something", year="")
-                6. video.matches(title="", year=2020)
-                7. video.matches(title="", year="")
-
-                1. The default behaviour in Plex Web = no params in plexapi
-                2. Both title and year specified by user
-                3. Year automatically filled in
-                4. Title automatically filled in
-                5. Explicitly searches for title with blank year
-                6. Explicitly searches for blank title with year
-                7. I don't know what the user is thinking... return the same result as 1
-
-                For 2 to 7, the agent and language is automatically filled in
-        """
-        key = f'{self.key}/matches'
-        params = {'manual': 1}
-
-        if agent and not any([title, year, language]):
-            params['language'] = self.section().language
-            params['agent'] = utils.getAgentIdentifier(self.section(), agent)
-        else:
-            if any(x is not None for x in [agent, title, year, language]):
-                if title is None:
-                    params['title'] = self.title
-                else:
-                    params['title'] = title
-
-                if year is None:
-                    params['year'] = getattr(self, 'year', '')
-                else:
-                    params['year'] = year
-
-                params['language'] = language or self.section().language
-
-                if agent is None:
-                    params['agent'] = self.section().agent
-                else:
-                    params['agent'] = utils.getAgentIdentifier(self.section(), agent)
-
-        key = key + '?' + urlencode(params)
-        return self.fetchItems(key, cls=media.SearchResult)
-
-    def fixMatch(self, searchResult=None, auto=False, agent=None):
-        """ Use match result to update show metadata.
-
-            Parameters:
-                auto (bool): True uses first match from matches
-                    False allows user to provide the match
-                searchResult (:class:`~plexapi.media.SearchResult`): Search result from
-                    ~plexapi.base.matches()
-                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
-        """
-        key = f'{self.key}/match'
-        if auto:
-            autoMatch = self.matches(agent=agent)
-            if autoMatch:
-                searchResult = autoMatch[0]
-            else:
-                raise NotFound(f'No matches found using this agent: ({agent}:{autoMatch})')
-        elif not searchResult:
-            raise NotFound('fixMatch() requires either auto=True or '
-                           'searchResult=:class:`~plexapi.media.SearchResult`.')
-
-        params = {'guid': searchResult.guid,
-                  'name': searchResult.name}
-
-        data = key + '?' + urlencode(params)
-        self._server.query(data, method=self._server._session.put)
-        return self
-
-
-class ExtrasMixin:
-    """ Mixin for Plex objects that can have extras. """
-
-    def extras(self):
-        """ Returns a list of :class:`~plexapi.video.Extra` objects. """
-        from plexapi.video import Extra
-        key = f'{self.key}/extras'
-        return self.fetchItems(key, cls=Extra)
-
-
-class HubsMixin:
-    """ Mixin for Plex objects that can have related hubs. """
-
-    def hubs(self):
-        """ Returns a list of :class:`~plexapi.library.Hub` objects. """
-        from plexapi.library import Hub
-        key = f'{self.key}/related'
-        return self.fetchItems(key, cls=Hub)
-
-
-class PlayedUnplayedMixin:
-    """ Mixin for Plex objects that can be marked played and unplayed. """
-
-    @property
-    def isPlayed(self):
-        """ Returns True if this video is played. """
-        return bool(self.viewCount > 0) if self.viewCount else False
-
-    def markPlayed(self):
-        """ Mark the Plex object as played. """
-        key = '/:/scrobble'
-        params = {'key': self.ratingKey, 'identifier': 'com.plexapp.plugins.library'}
-        self._server.query(key, params=params)
-        return self
-
-    def markUnplayed(self):
-        """ Mark the Plex object as unplayed. """
-        key = '/:/unscrobble'
-        params = {'key': self.ratingKey, 'identifier': 'com.plexapp.plugins.library'}
-        self._server.query(key, params=params)
-        return self
-
-    @property
-    def isWatched(self):
-        """ Alias to self.isPlayed. """
-        return self.isPlayed
-
-    def markWatched(self):
-        """ Alias to :func:`~plexapi.mixins.PlayedUnplayedMixin.markPlayed`. """
-        self.markPlayed()
-
-    def markUnwatched(self):
-        """ Alias to :func:`~plexapi.mixins.PlayedUnplayedMixin.markUnplayed`. """
-        self.markUnplayed()
-
-
-class RatingMixin:
-    """ Mixin for Plex objects that can have user star ratings. """
-
-    def rate(self, rating=None):
-        """ Rate the Plex object. Note: Plex ratings are displayed out of 5 stars (e.g. rating 7.0 = 3.5 stars).
-
-            Parameters:
-                rating (float, optional): Rating from 0 to 10. Exclude to reset the rating.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If the rating is invalid.
-        """
-        if rating is None:
-            rating = -1
-        elif not isinstance(rating, (int, float)) or rating < 0 or rating > 10:
-            raise BadRequest('Rating must be between 0 to 10.')
-        key = f'/:/rate?key={self.ratingKey}&identifier=com.plexapp.plugins.library&rating={rating}'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-
-class ArtUrlMixin:
-    """ Mixin for Plex objects that can have a background artwork url. """
-
-    @property
-    def artUrl(self):
-        """ Return the art url for the Plex object. """
-        art = self.firstAttr('art', 'grandparentArt')
-        return self._server.url(art, includeToken=True) if art else None
-
-
-class ArtLockMixin:
-    """ Mixin for Plex objects that can have a locked background artwork. """
-
-    def lockArt(self):
-        """ Lock the background artwork for a Plex object. """
-        return self._edit(**{'art.locked': 1})
-
-    def unlockArt(self):
-        """ Unlock the background artwork for a Plex object. """
-        return self._edit(**{'art.locked': 0})
-
-
-class ArtMixin(ArtUrlMixin, ArtLockMixin):
-    """ Mixin for Plex objects that can have background artwork. """
-
-    def arts(self):
-        """ Returns list of available :class:`~plexapi.media.Art` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/arts', cls=media.Art)
-
-    def uploadArt(self, url=None, filepath=None):
-        """ Upload a background artwork from a url or filepath.
-
-            Parameters:
-                url (str): The full URL to the image to upload.
-                filepath (str): The full file path the the image to upload or file-like object.
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/arts?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/arts'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data)
-        return self
-
-    def setArt(self, art):
-        """ Set the background artwork for a Plex object.
-
-            Parameters:
-                art (:class:`~plexapi.media.Art`): The art object to select.
-        """
-        art.select()
-        return self
-
-
-class LogoUrlMixin:
-    """ Mixin for Plex objects that can have a logo url. """
-
-    @property
-    def logoUrl(self):
-        """ Return the logo url for the Plex object. """
-        image = next((i for i in self.images if i.type == 'clearLogo'), None)
-        return self._server.url(image.url, includeToken=True) if image else None
-
-
-class LogoLockMixin:
-    """ Mixin for Plex objects that can have a locked logo. """
-
-    def lockLogo(self):
-        """ Lock the logo for a Plex object. """
-        raise NotImplementedError('Logo cannot be locked through the API.')
-
-    def unlockLogo(self):
-        """ Unlock the logo for a Plex object. """
-        raise NotImplementedError('Logo cannot be unlocked through the API.')
-
-
-class LogoMixin(LogoUrlMixin, LogoLockMixin):
-    """ Mixin for Plex objects that can have logos. """
-
-    def logos(self):
-        """ Returns list of available :class:`~plexapi.media.Logo` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/clearLogos', cls=media.Logo)
-
-    def uploadLogo(self, url=None, filepath=None):
-        """ Upload a logo from a url or filepath.
-
-            Parameters:
-                url (str): The full URL to the image to upload.
-                filepath (str): The full file path the the image to upload or file-like object.
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/clearLogos?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/clearLogos'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data)
-        return self
-
-    def setLogo(self, logo):
-        """ Set the logo for a Plex object.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotImplementedError`: Logo cannot be set through the API.
-        """
-        raise NotImplementedError(
-            'Logo cannot be set through the API. '
-            'Re-upload the logo using "uploadLogo" to set it.'
-        )
-
-
-class PosterUrlMixin:
-    """ Mixin for Plex objects that can have a poster url. """
-
-    @property
-    def thumbUrl(self):
-        """ Return the thumb url for the Plex object. """
-        thumb = self.firstAttr('thumb', 'parentThumb', 'grandparentThumb')
-        return self._server.url(thumb, includeToken=True) if thumb else None
-
-    @property
-    def posterUrl(self):
-        """ Alias to self.thumbUrl. """
-        return self.thumbUrl
-
-
-class PosterLockMixin:
-    """ Mixin for Plex objects that can have a locked poster. """
-
-    def lockPoster(self):
-        """ Lock the poster for a Plex object. """
-        return self._edit(**{'thumb.locked': 1})
-
-    def unlockPoster(self):
-        """ Unlock the poster for a Plex object. """
-        return self._edit(**{'thumb.locked': 0})
-
-
-class PosterMixin(PosterUrlMixin, PosterLockMixin):
-    """ Mixin for Plex objects that can have posters. """
-
-    def posters(self):
-        """ Returns list of available :class:`~plexapi.media.Poster` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/posters', cls=media.Poster)
-
-    def uploadPoster(self, url=None, filepath=None):
-        """ Upload a poster from a url or filepath.
-
-            Parameters:
-                url (str): The full URL to the image to upload.
-                filepath (str): The full file path the the image to upload or file-like object.
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/posters?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/posters'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data)
-        return self
-
-    def setPoster(self, poster):
-        """ Set the poster for a Plex object.
-
-            Parameters:
-                poster (:class:`~plexapi.media.Poster`): The poster object to select.
-        """
-        poster.select()
-        return self
-
-
-class ThemeUrlMixin:
-    """ Mixin for Plex objects that can have a theme url. """
-
-    @property
-    def themeUrl(self):
-        """ Return the theme url for the Plex object. """
-        theme = self.firstAttr('theme', 'parentTheme', 'grandparentTheme')
-        return self._server.url(theme, includeToken=True) if theme else None
-
-
-class ThemeLockMixin:
-    """ Mixin for Plex objects that can have a locked theme. """
-
-    def lockTheme(self):
-        """ Lock the theme for a Plex object. """
-        return self._edit(**{'theme.locked': 1})
-
-    def unlockTheme(self):
-        """ Unlock the theme for a Plex object. """
-        return self._edit(**{'theme.locked': 0})
-
-
-class ThemeMixin(ThemeUrlMixin, ThemeLockMixin):
-    """ Mixin for Plex objects that can have themes. """
-
-    def themes(self):
-        """ Returns list of available :class:`~plexapi.media.Theme` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/themes', cls=media.Theme)
-
-    def uploadTheme(self, url=None, filepath=None, timeout=None):
-        """ Upload a theme from url or filepath.
-
-            Warning: Themes cannot be deleted using PlexAPI!
-
-            Parameters:
-                url (str): The full URL to the theme to upload.
-                filepath (str): The full file path to the theme to upload or file-like object.
-                timeout (int, optional): Timeout, in seconds, to use when uploading themes to the server.
-                    (default config.TIMEOUT).
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/themes?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post, timeout=timeout)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/themes'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data, timeout=timeout)
-        return self
-
-    def setTheme(self, theme):
-        """ Set the theme for a Plex object.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotImplementedError`: Themes cannot be set through the API.
-        """
-        raise NotImplementedError(
-            'Themes cannot be set through the API. '
-            'Re-upload the theme using "uploadTheme" to set it.'
-        )
-
-
-class EditFieldMixin:
-    """ Mixin for editing Plex object fields. """
-
-    def editField(self, field, value, locked=True, **kwargs):
-        """ Edit the field of a Plex object. All field editing methods can be chained together.
-            Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing fields.
-
-            Parameters:
-                field (str): The name of the field to edit.
-                value (str): The value to edit the field to.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Chaining multiple field edits with reloading
-                    Movie.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline').reload()
-
-        """
-        edits = {
-            f'{field}.value': value or '',
-            f'{field}.locked': 1 if locked else 0
-        }
-        edits.update(kwargs)
-        return self._edit(**edits)
-
-
-class AddedAtMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an added at date. """
-
-    def editAddedAt(self, addedAt, locked=True):
-        """ Edit the added at date.
-
-            Parameters:
-                addedAt (int or str or datetime): The new value as a unix timestamp (int),
-                    "YYYY-MM-DD" (str), or datetime object.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        if isinstance(addedAt, str):
-            addedAt = int(round(datetime.strptime(addedAt, '%Y-%m-%d').timestamp()))
-        elif isinstance(addedAt, datetime):
-            addedAt = int(round(addedAt.timestamp()))
-        return self.editField('addedAt', addedAt, locked=locked)
-
-
-class AudienceRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an audience rating. """
-
-    def editAudienceRating(self, audienceRating, locked=True):
-        """ Edit the audience rating.
-
-            Parameters:
-                audienceRating (float): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('audienceRating', audienceRating, locked=locked)
-
-
-class ContentRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a content rating. """
-
-    def editContentRating(self, contentRating, locked=True):
-        """ Edit the content rating.
-
-            Parameters:
-                contentRating (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('contentRating', contentRating, locked=locked)
-
-
-class CriticRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a critic rating. """
-
-    def editCriticRating(self, criticRating, locked=True):
-        """ Edit the critic rating.
-
-            Parameters:
-                criticRating (float): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('rating', criticRating, locked=locked)
-
-
-class EditionTitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an edition title. """
-
-    def editEditionTitle(self, editionTitle, locked=True):
-        """ Edit the edition title. Plex Pass is required to edit this field.
-
-            Parameters:
-                editionTitle (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('editionTitle', editionTitle, locked=locked)
-
-
-class OriginallyAvailableMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an originally available date. """
-
-    def editOriginallyAvailable(self, originallyAvailable, locked=True):
-        """ Edit the originally available date.
-
-            Parameters:
-                originallyAvailable (str or datetime): The new value "YYYY-MM-DD (str) or datetime object.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        if isinstance(originallyAvailable, datetime):
-            originallyAvailable = originallyAvailable.strftime('%Y-%m-%d')
-        return self.editField('originallyAvailableAt', originallyAvailable, locked=locked)
-
-
-class OriginalTitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an original title. """
-
-    def editOriginalTitle(self, originalTitle, locked=True):
-        """ Edit the original title.
-
-            Parameters:
-                originalTitle (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('originalTitle', originalTitle, locked=locked)
-
-
-class SortTitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a sort title. """
-
-    def editSortTitle(self, sortTitle, locked=True):
-        """ Edit the sort title.
-
-            Parameters:
-                sortTitle (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('titleSort', sortTitle, locked=locked)
-
-
-class StudioMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a studio. """
-
-    def editStudio(self, studio, locked=True):
-        """ Edit the studio.
-
-            Parameters:
-                studio (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('studio', studio, locked=locked)
-
-
-class SummaryMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a summary. """
-
-    def editSummary(self, summary, locked=True):
-        """ Edit the summary.
-
-            Parameters:
-                summary (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('summary', summary, locked=locked)
-
-
-class TaglineMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a tagline. """
-
-    def editTagline(self, tagline, locked=True):
-        """ Edit the tagline.
-
-            Parameters:
-                tagline (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('tagline', tagline, locked=locked)
-
-
-class TitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a title. """
-
-    def editTitle(self, title, locked=True):
-        """ Edit the title.
-
-            Parameters:
-                title (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        kwargs = {}
-        if self.TYPE == 'album':
-            # Editing album title also requires the artist ratingKey
-            kwargs['artist.id.value'] = self.parentRatingKey
-        return self.editField('title', title, locked=locked, **kwargs)
-
-
-class TrackArtistMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a track artist. """
-
-    def editTrackArtist(self, trackArtist, locked=True):
-        """ Edit the track artist.
-
-            Parameters:
-                trackArtist (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('originalTitle', trackArtist, locked=locked)
-
-
-class TrackNumberMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a track number. """
-
-    def editTrackNumber(self, trackNumber, locked=True):
-        """ Edit the track number.
-
-            Parameters:
-                trackNumber (int): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('index', trackNumber, locked=locked)
-
-
-class TrackDiscNumberMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a track disc number. """
-
-    def editDiscNumber(self, discNumber, locked=True):
-        """ Edit the track disc number.
-
-            Parameters:
-                discNumber (int): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('parentIndex', discNumber, locked=locked)
-
-
-class PhotoCapturedTimeMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a captured time. """
-
-    def editCapturedTime(self, capturedTime, locked=True):
-        """ Edit the photo captured time.
-
-            Parameters:
-                capturedTime (str or datetime): The new value "YYYY-MM-DD hh:mm:ss" (str) or datetime object.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        if isinstance(capturedTime, datetime):
-            capturedTime = capturedTime.strftime('%Y-%m-%d %H:%M:%S')
-        return self.editField('originallyAvailableAt', capturedTime, locked=locked)
-
-
-class UserRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a user rating. """
-
-    def editUserRating(self, userRating, locked=True):
-        """ Edit the user rating.
-
-            Parameters:
-                userRating (float): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('userRating', userRating, locked=locked)
-
-
-class EditTagsMixin:
-    """ Mixin for editing Plex object tags. """
-
-    @deprecated('use "editTags" instead')
-    def _edit_tags(self, tag, items, locked=True, remove=False):
-        return self.editTags(tag, items, locked, remove)
-
-    def editTags(self, tag, items, locked=True, remove=False, **kwargs):
-        """ Edit the tags of a Plex object. All tag editing methods can be chained together.
-            Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing tags.
-
-            Parameters:
-                tag (str): Name of the tag to edit.
-                items (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags to add or remove.
-                locked (bool): True (default) to lock the tags, False to unlock the tags.
-                remove (bool): True to remove the tags in items.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Chaining multiple tag edits with reloading
-                    Show.addCollection('New Collection').removeGenre('Action').addLabel('Favorite').reload()
-
-        """
-        if not isinstance(items, list):
-            items = [items]
-
-        if not remove:
-            tags = getattr(self, self._tagPlural(tag), [])
-            if isinstance(tags, list):
-                items = tags + items
-
-        edits = self._tagHelper(self._tagSingular(tag), items, locked, remove)
-        edits.update(kwargs)
-        return self._edit(**edits)
-
-    @staticmethod
-    def _tagSingular(tag):
-        """ Return the singular name of a tag. """
-        if tag == 'countries':
-            return 'country'
-        elif tag == 'similar':
-            return 'similar'
-        elif tag[-1] == 's':
-            return tag[:-1]
-        return tag
-
-    @staticmethod
-    def _tagPlural(tag):
-        """ Return the plural name of a tag. """
-        if tag == 'country':
-            return 'countries'
-        elif tag == 'similar':
-            return 'similar'
-        elif tag[-1] != 's':
-            return tag + 's'
-        return tag
-
-    @staticmethod
-    def _tagHelper(tag, items, locked=True, remove=False):
-        """ Return a dict of the query parameters for editing a tag. """
-        if not isinstance(items, list):
-            items = [items]
-
-        data = {
-            f'{tag}.locked': 1 if locked else 0
-        }
-
-        if remove:
-            tagname = f'{tag}[].tag.tag-'
-            data[tagname] = ','.join(quote(str(t)) for t in items)
-        else:
-            for i, item in enumerate(items):
-                tagname = f'{str(tag)}[{i}].tag.tag'
-                data[tagname] = item
-
-        return data
-
-
-class CollectionMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have collections. """
-
-    def addCollection(self, collections, locked=True):
-        """ Add a collection tag(s).
-
-            Parameters:
-                collections (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('collection', collections, locked=locked)
-
-    def removeCollection(self, collections, locked=True):
-        """ Remove a collection tag(s).
-
-            Parameters:
-                collections (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('collection', collections, locked=locked, remove=True)
-
-
-class CountryMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have countries. """
-
-    def addCountry(self, countries, locked=True):
-        """ Add a country tag(s).
-
-            Parameters:
-                countries (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('country', countries, locked=locked)
-
-    def removeCountry(self, countries, locked=True):
-        """ Remove a country tag(s).
-
-            Parameters:
-                countries (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('country', countries, locked=locked, remove=True)
-
-
-class DirectorMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have directors. """
-
-    def addDirector(self, directors, locked=True):
-        """ Add a director tag(s).
-
-            Parameters:
-                directors (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('director', directors, locked=locked)
-
-    def removeDirector(self, directors, locked=True):
-        """ Remove a director tag(s).
-
-            Parameters:
-                directors (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('director', directors, locked=locked, remove=True)
-
-
-class GenreMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have genres. """
-
-    def addGenre(self, genres, locked=True):
-        """ Add a genre tag(s).
-
-            Parameters:
-                genres (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('genre', genres, locked=locked)
-
-    def removeGenre(self, genres, locked=True):
-        """ Remove a genre tag(s).
-
-            Parameters:
-                genres (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('genre', genres, locked=locked, remove=True)
-
-
-class LabelMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have labels. """
-
-    def addLabel(self, labels, locked=True):
-        """ Add a label tag(s).
-
-            Parameters:
-                labels (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('label', labels, locked=locked)
-
-    def removeLabel(self, labels, locked=True):
-        """ Remove a label tag(s).
-
-            Parameters:
-                labels (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('label', labels, locked=locked, remove=True)
-
-
-class MoodMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have moods. """
-
-    def addMood(self, moods, locked=True):
-        """ Add a mood tag(s).
-
-            Parameters:
-                moods (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('mood', moods, locked=locked)
-
-    def removeMood(self, moods, locked=True):
-        """ Remove a mood tag(s).
-
-            Parameters:
-                moods (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('mood', moods, locked=locked, remove=True)
-
-
-class ProducerMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have producers. """
-
-    def addProducer(self, producers, locked=True):
-        """ Add a producer tag(s).
-
-            Parameters:
-                producers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('producer', producers, locked=locked)
-
-    def removeProducer(self, producers, locked=True):
-        """ Remove a producer tag(s).
-
-            Parameters:
-                producers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('producer', producers, locked=locked, remove=True)
-
-
-class SimilarArtistMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have similar artists. """
-
-    def addSimilarArtist(self, artists, locked=True):
-        """ Add a similar artist tag(s).
-
-            Parameters:
-                artists (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('similar', artists, locked=locked)
-
-    def removeSimilarArtist(self, artists, locked=True):
-        """ Remove a similar artist tag(s).
-
-            Parameters:
-                artists (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('similar', artists, locked=locked, remove=True)
-
-
-class StyleMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have styles. """
-
-    def addStyle(self, styles, locked=True):
-        """ Add a style tag(s).
-
-            Parameters:
-                styles (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('style', styles, locked=locked)
-
-    def removeStyle(self, styles, locked=True):
-        """ Remove a style tag(s).
-
-            Parameters:
-                styles (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('style', styles, locked=locked, remove=True)
-
-
-class TagMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have tags. """
-
-    def addTag(self, tags, locked=True):
-        """ Add a tag(s).
-
-            Parameters:
-                tags (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('tag', tags, locked=locked)
-
-    def removeTag(self, tags, locked=True):
-        """ Remove a tag(s).
-
-            Parameters:
-                tags (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('tag', tags, locked=locked, remove=True)
-
-
-class WriterMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have writers. """
-
-    def addWriter(self, writers, locked=True):
-        """ Add a writer tag(s).
-
-            Parameters:
-                writers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('writer', writers, locked=locked)
-
-    def removeWriter(self, writers, locked=True):
-        """ Remove a writer tag(s).
-
-            Parameters:
-                writers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('writer', writers, locked=locked, remove=True)
-
-
-class WatchlistMixin:
-    """ Mixin for Plex objects that can be added to a user's watchlist. """
-
-    def onWatchlist(self, account=None):
-        """ Returns True if the item is on the user's watchlist.
-            Also see :func:`~plexapi.myplex.MyPlexAccount.onWatchlist`.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to check item on the watchlist.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        return account.onWatchlist(self)
-
-    def addToWatchlist(self, account=None):
-        """ Add this item to the specified user's watchlist.
-            Also see :func:`~plexapi.myplex.MyPlexAccount.addToWatchlist`.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to add item to the watchlist.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        account.addToWatchlist(self)
-        return self
-
-    def removeFromWatchlist(self, account=None):
-        """ Remove this item from the specified user's watchlist.
-            Also see :func:`~plexapi.myplex.MyPlexAccount.removeFromWatchlist`.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to remove item from the watchlist.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        account.removeFromWatchlist(self)
-        return self
-
-    def streamingServices(self, account=None):
-        """ Return a list of :class:`~plexapi.media.Availability`
-            objects for the available streaming services for this item.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account used to retrieve availability.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        ratingKey = self.guid.rsplit('/', 1)[-1]
-        data = account.query(f"{account.METADATA}/library/metadata/{ratingKey}/availabilities")
-        return self.findItems(data)
-
-
-class MovieEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin, EditionTitleMixin,
-    OriginallyAvailableMixin, OriginalTitleMixin, SortTitleMixin,
-    StudioMixin, SummaryMixin, TaglineMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, CountryMixin, DirectorMixin, GenreMixin, LabelMixin, ProducerMixin, WriterMixin
-):
-    pass
-
-
-class ShowEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
-    OriginallyAvailableMixin, OriginalTitleMixin, SortTitleMixin, StudioMixin,
-    SummaryMixin, TaglineMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, GenreMixin, LabelMixin,
-):
-    pass
-
-
-class SeasonEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, LabelMixin
-):
-    pass
-
-
-class EpisodeEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
-    OriginallyAvailableMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, DirectorMixin, LabelMixin, WriterMixin
-):
-    pass
-
-
-class ArtistEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, CountryMixin, GenreMixin, LabelMixin, MoodMixin, SimilarArtistMixin, StyleMixin
-):
-    pass
-
-
-class AlbumEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    OriginallyAvailableMixin, SortTitleMixin, StudioMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, GenreMixin, LabelMixin, MoodMixin, StyleMixin
-):
-    pass
-
-
-class TrackEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    TitleMixin, TrackArtistMixin, TrackNumberMixin, TrackDiscNumberMixin, UserRatingMixin,
-    CollectionMixin, GenreMixin, LabelMixin, MoodMixin
-):
-    pass
-
-
-class PhotoalbumEditMixins(
-    ArtLockMixin, PosterLockMixin,
-    AddedAtMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin
-):
-    pass
-
-
-class PhotoEditMixins(
-    ArtLockMixin, PosterLockMixin,
-    AddedAtMixin, PhotoCapturedTimeMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    TagMixin
-):
-    pass
-
-
-class CollectionEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
-    SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    LabelMixin
-):
-    pass
-
-
-class PlaylistEditMixins(
-    ArtLockMixin, PosterLockMixin,
-    SortTitleMixin, SummaryMixin, TitleMixin
-):
-    pass
diff --git a/libs/plexapi/mixins/__init__.py b/libs/plexapi/mixins/__init__.py
new file mode 100644
index 0000000000..740382eee6
--- /dev/null
+++ b/libs/plexapi/mixins/__init__.py
@@ -0,0 +1,266 @@
+"""
+PlexAPI Mixins Module
+
+This module contains mixins for Plex objects.
+"""
+
+from .advanced_settings import AdvancedSettingsMixin
+from .edit import (
+    AddedAtMixin, AudienceRatingMixin, CollectionMixin, ContentRatingMixin,
+    CountryMixin, CriticRatingMixin, DirectorMixin, EditionTitleMixin,
+    EditFieldMixin, EditTagsMixin, GenreMixin, LabelMixin, MoodMixin,
+    OriginallyAvailableMixin, OriginalTitleMixin, PhotoCapturedTimeMixin,
+    ProducerMixin, SimilarArtistMixin, SortTitleMixin, StudioMixin,
+    StyleMixin, SummaryMixin, TaglineMixin, TagMixin, TitleMixin,
+    TrackArtistMixin, TrackDiscNumberMixin, TrackNumberMixin,
+    UserRatingMixin, WriterMixin
+)
+from .objects import ExtrasMixin, HubsMixin
+from .played_unplayed import PlayedUnplayedMixin
+from .rating import RatingMixin
+from .resources import (
+    ArtLockMixin, ArtMixin, ArtUrlMixin,
+    LogoLockMixin, LogoMixin, LogoUrlMixin,
+    PosterLockMixin, PosterMixin, PosterUrlMixin,
+    SquareArtLockMixin, SquareArtMixin, SquareArtUrlMixin,
+    ThemeLockMixin, ThemeMixin, ThemeUrlMixin
+)
+from .smart_filter import SmartFilterMixin
+from .split_merge import SplitMergeMixin
+from .unmatch_match import UnmatchMatchMixin
+from .watchlist import WatchlistMixin
+
+
+class MovieEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin, EditionTitleMixin,
+    OriginallyAvailableMixin, OriginalTitleMixin, SortTitleMixin,
+    StudioMixin, SummaryMixin, TaglineMixin, TitleMixin, UserRatingMixin,
+    CollectionMixin, CountryMixin, DirectorMixin, GenreMixin, LabelMixin, ProducerMixin, WriterMixin
+):
+    pass
+
+
+class ShowEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
+    OriginallyAvailableMixin, OriginalTitleMixin, SortTitleMixin, StudioMixin,
+    SummaryMixin, TaglineMixin, TitleMixin, UserRatingMixin,
+    CollectionMixin, GenreMixin, LabelMixin,
+):
+    pass
+
+
+class SeasonEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
+    SummaryMixin, TitleMixin, UserRatingMixin,
+    CollectionMixin, LabelMixin
+):
+    pass
+
+
+class EpisodeEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
+    OriginallyAvailableMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
+    CollectionMixin, DirectorMixin, LabelMixin, WriterMixin
+):
+    pass
+
+
+class ArtistEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
+    SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
+    CollectionMixin, CountryMixin, GenreMixin, LabelMixin, MoodMixin, SimilarArtistMixin, StyleMixin
+):
+    pass
+
+
+class AlbumEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
+    OriginallyAvailableMixin, SortTitleMixin, StudioMixin, SummaryMixin, TitleMixin, UserRatingMixin,
+    CollectionMixin, GenreMixin, LabelMixin, MoodMixin, StyleMixin
+):
+    pass
+
+
+class TrackEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
+    TitleMixin, TrackArtistMixin, TrackNumberMixin, TrackDiscNumberMixin, UserRatingMixin,
+    CollectionMixin, GenreMixin, LabelMixin, MoodMixin
+):
+    pass
+
+
+class PhotoalbumEditMixins(
+    ArtLockMixin, PosterLockMixin,
+    AddedAtMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin
+):
+    pass
+
+
+class PhotoEditMixins(
+    ArtLockMixin, PosterLockMixin,
+    AddedAtMixin, PhotoCapturedTimeMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
+    TagMixin
+):
+    pass
+
+
+class CollectionEditMixins(
+    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
+    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
+    SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
+    LabelMixin
+):
+    pass
+
+
+class PlaylistEditMixins(
+    ArtLockMixin, PosterLockMixin,
+    SortTitleMixin, SummaryMixin, TitleMixin
+):
+    pass
+
+
+class MovieMixins(
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    MovieEditMixins,
+    WatchlistMixin
+):
+    pass
+
+
+class ShowMixins(
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    ShowEditMixins,
+    WatchlistMixin
+):
+    pass
+
+
+class SeasonMixins(
+    AdvancedSettingsMixin, ExtrasMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
+    SeasonEditMixins
+):
+    pass
+
+
+class EpisodeMixins(
+    ExtrasMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
+    EpisodeEditMixins
+):
+    pass
+
+
+class ClipMixins(
+    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin
+):
+    pass
+
+
+class ArtistMixins(
+    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    ArtistEditMixins
+):
+    pass
+
+
+class AlbumMixins(
+    SplitMergeMixin, UnmatchMatchMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeUrlMixin,
+    AlbumEditMixins
+):
+    pass
+
+
+class TrackMixins(
+    ExtrasMixin, RatingMixin,
+    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin, ThemeUrlMixin,
+    TrackEditMixins
+):
+    pass
+
+
+class PhotoalbumMixins(
+    RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin,
+    PhotoalbumEditMixins
+):
+    pass
+
+
+class PhotoMixins(
+    RatingMixin,
+    ArtUrlMixin, LogoUrlMixin, PosterUrlMixin, SquareArtUrlMixin,
+    PhotoEditMixins
+):
+    pass
+
+
+class CollectionMixins(
+    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin, ThemeMixin,
+    CollectionEditMixins
+):
+    pass
+
+
+class PlaylistMixins(
+    SmartFilterMixin,
+    ArtMixin, LogoMixin, PosterMixin, SquareArtMixin,
+    PlaylistEditMixins
+):
+    pass
+
+
+__all__ = [
+    # Advanced settings
+    'AdvancedSettingsMixin',
+    # Edit mixins
+    'AddedAtMixin', 'AudienceRatingMixin', 'CollectionMixin', 'ContentRatingMixin',
+    'CountryMixin', 'CriticRatingMixin', 'DirectorMixin', 'EditionTitleMixin',
+    'EditFieldMixin', 'EditTagsMixin', 'GenreMixin', 'LabelMixin', 'MoodMixin',
+    'OriginallyAvailableMixin', 'OriginalTitleMixin', 'PhotoCapturedTimeMixin',
+    'ProducerMixin', 'SimilarArtistMixin', 'SortTitleMixin', 'StudioMixin',
+    'StyleMixin', 'SummaryMixin', 'TaglineMixin', 'TagMixin', 'TitleMixin',
+    'TrackArtistMixin', 'TrackDiscNumberMixin', 'TrackNumberMixin',
+    'UserRatingMixin', 'WriterMixin',
+    # Objects
+    'ExtrasMixin', 'HubsMixin',
+    # Played/Unplayed
+    'PlayedUnplayedMixin',
+    # Rating
+    'RatingMixin',
+    # Resource mixins
+    'ArtLockMixin', 'ArtMixin', 'ArtUrlMixin',
+    'LogoLockMixin', 'LogoMixin', 'LogoUrlMixin',
+    'PosterLockMixin', 'PosterMixin', 'PosterUrlMixin',
+    'SquareArtLockMixin', 'SquareArtMixin', 'SquareArtUrlMixin',
+    'ThemeLockMixin', 'ThemeMixin', 'ThemeUrlMixin',
+    # Smart Filter
+    'SmartFilterMixin',
+    # Split/Merge
+    'SplitMergeMixin',
+    # Unmatch/Match
+    'UnmatchMatchMixin',
+    # Watchlist
+    'WatchlistMixin',
+    # Composite Edit Mixins
+    'AlbumEditMixins', 'ArtistEditMixins', 'CollectionEditMixins', 'EpisodeEditMixins',
+    'MovieEditMixins', 'PhotoEditMixins', 'PhotoalbumEditMixins', 'PlaylistEditMixins',
+    'SeasonEditMixins', 'ShowEditMixins', 'TrackEditMixins',
+    # Composite Mixins
+    'AlbumMixins', 'ArtistMixins', 'ClipMixins', 'CollectionMixins', 'EpisodeMixins',
+    'MovieMixins', 'PhotoMixins', 'PhotoalbumMixins', 'PlaylistMixins',
+    'SeasonMixins', 'ShowMixins', 'TrackMixins',
+]
diff --git a/libs/plexapi/mixins/advanced_settings.py b/libs/plexapi/mixins/advanced_settings.py
new file mode 100644
index 0000000000..9c2adb662c
--- /dev/null
+++ b/libs/plexapi/mixins/advanced_settings.py
@@ -0,0 +1,57 @@
+from urllib.parse import urlencode
+
+from plexapi import settings
+from plexapi.exceptions import NotFound
+
+
+class AdvancedSettingsMixin:
+    """ Mixin for Plex objects that can have advanced settings. """
+
+    def preferences(self):
+        """ Returns a list of :class:`~plexapi.settings.Preferences` objects. """
+        key = f'{self.key}?includePreferences=1'
+        return self.fetchItems(key, cls=settings.Preferences, rtag='Preferences')
+
+    def preference(self, pref):
+        """ Returns a :class:`~plexapi.settings.Preferences` object for the specified pref.
+
+            Parameters:
+                pref (str): The id of the preference to return.
+        """
+        prefs = self.preferences()
+        try:
+            return next(p for p in prefs if p.id == pref)
+        except StopIteration:
+            availablePrefs = [p.id for p in prefs]
+            raise NotFound(f'Unknown preference "{pref}" for {self.TYPE}. '
+                           f'Available preferences: {availablePrefs}') from None
+
+    def editAdvanced(self, **kwargs):
+        """ Edit a Plex object's advanced settings. """
+        data = {}
+        key = f'{self.key}/prefs?'
+        preferences = {pref.id: pref for pref in self.preferences() if pref.enumValues}
+        for settingID, value in kwargs.items():
+            try:
+                pref = preferences[settingID]
+            except KeyError:
+                raise NotFound(f'{value} not found in {list(preferences.keys())}')
+
+            enumValues = pref.enumValues
+            if enumValues.get(value, enumValues.get(str(value))):
+                data[settingID] = value
+            else:
+                raise NotFound(f'{value} not found in {list(enumValues)}')
+        url = key + urlencode(data)
+        self._server.query(url, method=self._server._session.put)
+        return self
+
+    def defaultAdvanced(self):
+        """ Edit all of a Plex object's advanced settings to default. """
+        data = {}
+        key = f'{self.key}/prefs?'
+        for preference in self.preferences():
+            data[preference.id] = preference.default
+        url = key + urlencode(data)
+        self._server.query(url, method=self._server._session.put)
+        return self
diff --git a/libs/plexapi/mixins/edit.py b/libs/plexapi/mixins/edit.py
new file mode 100644
index 0000000000..70aea703a1
--- /dev/null
+++ b/libs/plexapi/mixins/edit.py
@@ -0,0 +1,582 @@
+from datetime import datetime
+from urllib.parse import quote
+
+
+class EditFieldMixin:
+    """ Mixin for editing Plex object fields. """
+
+    def editField(self, field, value, locked=True, **kwargs):
+        """ Edit the field of a Plex object. All field editing methods can be chained together.
+            Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing fields.
+
+            Parameters:
+                field (str): The name of the field to edit.
+                value (str): The value to edit the field to.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+
+            Example:
+
+                .. code-block:: python
+
+                    # Chaining multiple field edits with reloading
+                    Movie.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline').reload()
+
+        """
+        edits = {
+            f'{field}.value': value or '',
+            f'{field}.locked': 1 if locked else 0
+        }
+        edits.update(kwargs)
+        return self._edit(**edits)
+
+
+class AddedAtMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have an added at date. """
+
+    def editAddedAt(self, addedAt, locked=True):
+        """ Edit the added at date.
+
+            Parameters:
+                addedAt (int or str or datetime): The new value as a unix timestamp (int),
+                    "YYYY-MM-DD" (str), or datetime object.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        if isinstance(addedAt, str):
+            addedAt = int(round(datetime.strptime(addedAt, '%Y-%m-%d').timestamp()))
+        elif isinstance(addedAt, datetime):
+            addedAt = int(round(addedAt.timestamp()))
+        return self.editField('addedAt', addedAt, locked=locked)
+
+
+class AudienceRatingMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have an audience rating. """
+
+    def editAudienceRating(self, audienceRating, locked=True):
+        """ Edit the audience rating.
+
+            Parameters:
+                audienceRating (float): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('audienceRating', audienceRating, locked=locked)
+
+
+class ContentRatingMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a content rating. """
+
+    def editContentRating(self, contentRating, locked=True):
+        """ Edit the content rating.
+
+            Parameters:
+                contentRating (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('contentRating', contentRating, locked=locked)
+
+
+class CriticRatingMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a critic rating. """
+
+    def editCriticRating(self, criticRating, locked=True):
+        """ Edit the critic rating.
+
+            Parameters:
+                criticRating (float): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('rating', criticRating, locked=locked)
+
+
+class EditionTitleMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have an edition title. """
+
+    def editEditionTitle(self, editionTitle, locked=True):
+        """ Edit the edition title. Plex Pass is required to edit this field.
+
+            Parameters:
+                editionTitle (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('editionTitle', editionTitle, locked=locked)
+
+
+class OriginallyAvailableMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have an originally available date. """
+
+    def editOriginallyAvailable(self, originallyAvailable, locked=True):
+        """ Edit the originally available date.
+
+            Parameters:
+                originallyAvailable (str or datetime): The new value "YYYY-MM-DD (str) or datetime object.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        if isinstance(originallyAvailable, datetime):
+            originallyAvailable = originallyAvailable.strftime('%Y-%m-%d')
+        return self.editField('originallyAvailableAt', originallyAvailable, locked=locked)
+
+
+class OriginalTitleMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have an original title. """
+
+    def editOriginalTitle(self, originalTitle, locked=True):
+        """ Edit the original title.
+
+            Parameters:
+                originalTitle (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('originalTitle', originalTitle, locked=locked)
+
+
+class SortTitleMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a sort title. """
+
+    def editSortTitle(self, sortTitle, locked=True):
+        """ Edit the sort title.
+
+            Parameters:
+                sortTitle (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('titleSort', sortTitle, locked=locked)
+
+
+class StudioMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a studio. """
+
+    def editStudio(self, studio, locked=True):
+        """ Edit the studio.
+
+            Parameters:
+                studio (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('studio', studio, locked=locked)
+
+
+class SummaryMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a summary. """
+
+    def editSummary(self, summary, locked=True):
+        """ Edit the summary.
+
+            Parameters:
+                summary (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('summary', summary, locked=locked)
+
+
+class TaglineMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a tagline. """
+
+    def editTagline(self, tagline, locked=True):
+        """ Edit the tagline.
+
+            Parameters:
+                tagline (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('tagline', tagline, locked=locked)
+
+
+class TitleMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a title. """
+
+    def editTitle(self, title, locked=True):
+        """ Edit the title.
+
+            Parameters:
+                title (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        kwargs = {}
+        if self.TYPE == 'album':
+            # Editing album title also requires the artist ratingKey
+            kwargs['artist.id.value'] = self.parentRatingKey
+        return self.editField('title', title, locked=locked, **kwargs)
+
+
+class TrackArtistMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a track artist. """
+
+    def editTrackArtist(self, trackArtist, locked=True):
+        """ Edit the track artist.
+
+            Parameters:
+                trackArtist (str): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('originalTitle', trackArtist, locked=locked)
+
+
+class TrackNumberMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a track number. """
+
+    def editTrackNumber(self, trackNumber, locked=True):
+        """ Edit the track number.
+
+            Parameters:
+                trackNumber (int): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('index', trackNumber, locked=locked)
+
+
+class TrackDiscNumberMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a track disc number. """
+
+    def editDiscNumber(self, discNumber, locked=True):
+        """ Edit the track disc number.
+
+            Parameters:
+                discNumber (int): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('parentIndex', discNumber, locked=locked)
+
+
+class PhotoCapturedTimeMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a captured time. """
+
+    def editCapturedTime(self, capturedTime, locked=True):
+        """ Edit the photo captured time.
+
+            Parameters:
+                capturedTime (str or datetime): The new value "YYYY-MM-DD hh:mm:ss" (str) or datetime object.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        if isinstance(capturedTime, datetime):
+            capturedTime = capturedTime.strftime('%Y-%m-%d %H:%M:%S')
+        return self.editField('originallyAvailableAt', capturedTime, locked=locked)
+
+
+class UserRatingMixin(EditFieldMixin):
+    """ Mixin for Plex objects that can have a user rating. """
+
+    def editUserRating(self, userRating, locked=True):
+        """ Edit the user rating.
+
+            Parameters:
+                userRating (float): The new value.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editField('userRating', userRating, locked=locked)
+
+
+class EditTagsMixin:
+    """ Mixin for editing Plex object tags. """
+
+    def editTags(self, tag, items, locked=True, remove=False, **kwargs):
+        """ Edit the tags of a Plex object. All tag editing methods can be chained together.
+            Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing tags.
+
+            Parameters:
+                tag (str): Name of the tag to edit.
+                items (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags to add or remove.
+                locked (bool): True (default) to lock the tags, False to unlock the tags.
+                remove (bool): True to remove the tags in items.
+
+            Example:
+
+                .. code-block:: python
+
+                    # Chaining multiple tag edits with reloading
+                    Show.addCollection('New Collection').removeGenre('Action').addLabel('Favorite').reload()
+
+        """
+        if not isinstance(items, list):
+            items = [items]
+
+        if not remove:
+            tags = getattr(self, self._tagPlural(tag), [])
+            if isinstance(tags, list):
+                items = tags + items
+
+        edits = self._tagHelper(self._tagSingular(tag), items, locked, remove)
+        edits.update(kwargs)
+        return self._edit(**edits)
+
+    @staticmethod
+    def _tagSingular(tag):
+        """ Return the singular name of a tag. """
+        if tag == 'countries':
+            return 'country'
+        elif tag == 'similar':
+            return 'similar'
+        elif tag[-1] == 's':
+            return tag[:-1]
+        return tag
+
+    @staticmethod
+    def _tagPlural(tag):
+        """ Return the plural name of a tag. """
+        if tag == 'country':
+            return 'countries'
+        elif tag == 'similar':
+            return 'similar'
+        elif tag[-1] != 's':
+            return tag + 's'
+        return tag
+
+    @staticmethod
+    def _tagHelper(tag, items, locked=True, remove=False):
+        """ Return a dict of the query parameters for editing a tag. """
+        if not isinstance(items, list):
+            items = [items]
+
+        data = {
+            f'{tag}.locked': 1 if locked else 0
+        }
+
+        if remove:
+            tagname = f'{tag}[].tag.tag-'
+            data[tagname] = ','.join(quote(str(t)) for t in items)
+        else:
+            for i, item in enumerate(items):
+                tagname = f'{str(tag)}[{i}].tag.tag'
+                data[tagname] = item
+
+        return data
+
+
+class CollectionMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have collections. """
+
+    def addCollection(self, collections, locked=True):
+        """ Add a collection tag(s).
+
+            Parameters:
+                collections (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('collection', collections, locked=locked)
+
+    def removeCollection(self, collections, locked=True):
+        """ Remove a collection tag(s).
+
+            Parameters:
+                collections (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('collection', collections, locked=locked, remove=True)
+
+
+class CountryMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have countries. """
+
+    def addCountry(self, countries, locked=True):
+        """ Add a country tag(s).
+
+            Parameters:
+                countries (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('country', countries, locked=locked)
+
+    def removeCountry(self, countries, locked=True):
+        """ Remove a country tag(s).
+
+            Parameters:
+                countries (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('country', countries, locked=locked, remove=True)
+
+
+class DirectorMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have directors. """
+
+    def addDirector(self, directors, locked=True):
+        """ Add a director tag(s).
+
+            Parameters:
+                directors (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('director', directors, locked=locked)
+
+    def removeDirector(self, directors, locked=True):
+        """ Remove a director tag(s).
+
+            Parameters:
+                directors (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('director', directors, locked=locked, remove=True)
+
+
+class GenreMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have genres. """
+
+    def addGenre(self, genres, locked=True):
+        """ Add a genre tag(s).
+
+            Parameters:
+                genres (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('genre', genres, locked=locked)
+
+    def removeGenre(self, genres, locked=True):
+        """ Remove a genre tag(s).
+
+            Parameters:
+                genres (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('genre', genres, locked=locked, remove=True)
+
+
+class LabelMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have labels. """
+
+    def addLabel(self, labels, locked=True):
+        """ Add a label tag(s).
+
+            Parameters:
+                labels (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('label', labels, locked=locked)
+
+    def removeLabel(self, labels, locked=True):
+        """ Remove a label tag(s).
+
+            Parameters:
+                labels (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('label', labels, locked=locked, remove=True)
+
+
+class MoodMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have moods. """
+
+    def addMood(self, moods, locked=True):
+        """ Add a mood tag(s).
+
+            Parameters:
+                moods (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('mood', moods, locked=locked)
+
+    def removeMood(self, moods, locked=True):
+        """ Remove a mood tag(s).
+
+            Parameters:
+                moods (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('mood', moods, locked=locked, remove=True)
+
+
+class ProducerMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have producers. """
+
+    def addProducer(self, producers, locked=True):
+        """ Add a producer tag(s).
+
+            Parameters:
+                producers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('producer', producers, locked=locked)
+
+    def removeProducer(self, producers, locked=True):
+        """ Remove a producer tag(s).
+
+            Parameters:
+                producers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('producer', producers, locked=locked, remove=True)
+
+
+class SimilarArtistMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have similar artists. """
+
+    def addSimilarArtist(self, artists, locked=True):
+        """ Add a similar artist tag(s).
+
+            Parameters:
+                artists (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('similar', artists, locked=locked)
+
+    def removeSimilarArtist(self, artists, locked=True):
+        """ Remove a similar artist tag(s).
+
+            Parameters:
+                artists (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('similar', artists, locked=locked, remove=True)
+
+
+class StyleMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have styles. """
+
+    def addStyle(self, styles, locked=True):
+        """ Add a style tag(s).
+
+            Parameters:
+                styles (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('style', styles, locked=locked)
+
+    def removeStyle(self, styles, locked=True):
+        """ Remove a style tag(s).
+
+            Parameters:
+                styles (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('style', styles, locked=locked, remove=True)
+
+
+class TagMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have tags. """
+
+    def addTag(self, tags, locked=True):
+        """ Add a tag(s).
+
+            Parameters:
+                tags (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('tag', tags, locked=locked)
+
+    def removeTag(self, tags, locked=True):
+        """ Remove a tag(s).
+
+            Parameters:
+                tags (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('tag', tags, locked=locked, remove=True)
+
+
+class WriterMixin(EditTagsMixin):
+    """ Mixin for Plex objects that can have writers. """
+
+    def addWriter(self, writers, locked=True):
+        """ Add a writer tag(s).
+
+            Parameters:
+                writers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('writer', writers, locked=locked)
+
+    def removeWriter(self, writers, locked=True):
+        """ Remove a writer tag(s).
+
+            Parameters:
+                writers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
+                locked (bool): True (default) to lock the field, False to unlock the field.
+        """
+        return self.editTags('writer', writers, locked=locked, remove=True)
diff --git a/libs/plexapi/mixins/objects.py b/libs/plexapi/mixins/objects.py
new file mode 100644
index 0000000000..56ab0b5cd6
--- /dev/null
+++ b/libs/plexapi/mixins/objects.py
@@ -0,0 +1,18 @@
+class ExtrasMixin:
+    """ Mixin for Plex objects that can have extras. """
+
+    def extras(self):
+        """ Returns a list of :class:`~plexapi.video.Extra` objects. """
+        from plexapi.video import Extra
+        key = f'{self.key}/extras'
+        return self.fetchItems(key, cls=Extra)
+
+
+class HubsMixin:
+    """ Mixin for Plex objects that can have related hubs. """
+
+    def hubs(self):
+        """ Returns a list of :class:`~plexapi.library.Hub` objects. """
+        from plexapi.library import Hub
+        key = f'{self.key}/related'
+        return self.fetchItems(key, cls=Hub)
diff --git a/libs/plexapi/mixins/played_unplayed.py b/libs/plexapi/mixins/played_unplayed.py
new file mode 100644
index 0000000000..ad86e9c28e
--- /dev/null
+++ b/libs/plexapi/mixins/played_unplayed.py
@@ -0,0 +1,34 @@
+class PlayedUnplayedMixin:
+    """ Mixin for Plex objects that can be marked played and unplayed. """
+
+    @property
+    def isPlayed(self):
+        """ Returns True if this video is played. """
+        return bool(self.viewCount > 0) if self.viewCount else False
+
+    def markPlayed(self):
+        """ Mark the Plex object as played. """
+        key = '/:/scrobble'
+        params = {'key': self.ratingKey, 'identifier': 'com.plexapp.plugins.library'}
+        self._server.query(key, params=params)
+        return self
+
+    def markUnplayed(self):
+        """ Mark the Plex object as unplayed. """
+        key = '/:/unscrobble'
+        params = {'key': self.ratingKey, 'identifier': 'com.plexapp.plugins.library'}
+        self._server.query(key, params=params)
+        return self
+
+    @property
+    def isWatched(self):
+        """ Alias to self.isPlayed. """
+        return self.isPlayed
+
+    def markWatched(self):
+        """ Alias to :func:`~plexapi.mixins.PlayedUnplayedMixin.markPlayed`. """
+        self.markPlayed()
+
+    def markUnwatched(self):
+        """ Alias to :func:`~plexapi.mixins.PlayedUnplayedMixin.markUnplayed`. """
+        self.markUnplayed()
diff --git a/libs/plexapi/mixins/rating.py b/libs/plexapi/mixins/rating.py
new file mode 100644
index 0000000000..0d468afd2f
--- /dev/null
+++ b/libs/plexapi/mixins/rating.py
@@ -0,0 +1,22 @@
+from plexapi.exceptions import BadRequest
+
+
+class RatingMixin:
+    """ Mixin for Plex objects that can have user star ratings. """
+
+    def rate(self, rating=None):
+        """ Rate the Plex object. Note: Plex ratings are displayed out of 5 stars (e.g. rating 7.0 = 3.5 stars).
+
+            Parameters:
+                rating (float, optional): Rating from 0 to 10. Exclude to reset the rating.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: If the rating is invalid.
+        """
+        if rating is None:
+            rating = -1
+        elif not isinstance(rating, (int, float)) or rating < 0 or rating > 10:
+            raise BadRequest('Rating must be between 0 to 10.')
+        key = f'/:/rate?key={self.ratingKey}&identifier=com.plexapp.plugins.library&rating={rating}'
+        self._server.query(key, method=self._server._session.put)
+        return self
diff --git a/libs/plexapi/mixins/resources.py b/libs/plexapi/mixins/resources.py
new file mode 100644
index 0000000000..19a44b7300
--- /dev/null
+++ b/libs/plexapi/mixins/resources.py
@@ -0,0 +1,328 @@
+from urllib.parse import quote_plus
+
+from plexapi import media
+from plexapi.utils import openOrRead
+
+
+class ArtUrlMixin:
+    """ Mixin for Plex objects that can have a background artwork url. """
+
+    @property
+    def artUrl(self):
+        """ Return the art url for the Plex object. """
+        art = self.firstAttr('art', 'grandparentArt')
+        return self._server.url(art, includeToken=True) if art else None
+
+
+class ArtLockMixin:
+    """ Mixin for Plex objects that can have a locked background artwork. """
+
+    def lockArt(self):
+        """ Lock the background artwork for a Plex object. """
+        return self._edit(**{'art.locked': 1})
+
+    def unlockArt(self):
+        """ Unlock the background artwork for a Plex object. """
+        return self._edit(**{'art.locked': 0})
+
+
+class ArtMixin(ArtUrlMixin, ArtLockMixin):
+    """ Mixin for Plex objects that can have background artwork. """
+
+    def arts(self):
+        """ Returns list of available :class:`~plexapi.media.Art` objects. """
+        return self.fetchItems(f'/library/metadata/{self.ratingKey}/arts', cls=media.Art)
+
+    def uploadArt(self, url=None, filepath=None):
+        """ Upload a background artwork from a url or filepath.
+
+            Parameters:
+                url (str): The full URL to the image to upload.
+                filepath (str): The full file path to the image to upload or file-like object.
+        """
+        if url:
+            key = f'/library/metadata/{self.ratingKey}/arts?url={quote_plus(url)}'
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = f'/library/metadata/{self.ratingKey}/arts'
+            data = openOrRead(filepath)
+            self._server.query(key, method=self._server._session.post, data=data)
+        return self
+
+    def setArt(self, art):
+        """ Set the background artwork for a Plex object.
+
+            Parameters:
+                art (:class:`~plexapi.media.Art`): The art object to select.
+        """
+        art.select()
+        return self
+
+    def deleteArt(self):
+        """ Delete the art from a Plex object. """
+        key = f'/library/metadata/{self.ratingKey}/art'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+
+class LogoUrlMixin:
+    """ Mixin for Plex objects that can have a logo url. """
+
+    @property
+    def logo(self):
+        """ Return the API path to the logo image. """
+        return next((i.url for i in self.images if i.type == 'clearLogo'), None)
+
+    @property
+    def logoUrl(self):
+        """ Return the logo url for the Plex object. """
+        return self._server.url(self.logo, includeToken=True) if self.logo else None
+
+
+class LogoLockMixin:
+    """ Mixin for Plex objects that can have a locked logo. """
+
+    def lockLogo(self):
+        """ Lock the logo for a Plex object. """
+        return self._edit(**{'clearLogo.locked': 1})
+
+    def unlockLogo(self):
+        """ Unlock the logo for a Plex object. """
+        return self._edit(**{'clearLogo.locked': 0})
+
+
+class LogoMixin(LogoUrlMixin, LogoLockMixin):
+    """ Mixin for Plex objects that can have logos. """
+
+    def logos(self):
+        """ Returns list of available :class:`~plexapi.media.Logo` objects. """
+        return self.fetchItems(f'/library/metadata/{self.ratingKey}/clearLogos', cls=media.Logo)
+
+    def uploadLogo(self, url=None, filepath=None):
+        """ Upload a logo from a url or filepath.
+
+            Parameters:
+                url (str): The full URL to the image to upload.
+                filepath (str): The full file path to the image to upload or file-like object.
+        """
+        if url:
+            key = f'/library/metadata/{self.ratingKey}/clearLogos?url={quote_plus(url)}'
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = f'/library/metadata/{self.ratingKey}/clearLogos'
+            data = openOrRead(filepath)
+            self._server.query(key, method=self._server._session.post, data=data)
+        return self
+
+    def setLogo(self, logo):
+        """ Set the logo for a Plex object.
+
+            Parameters:
+                logo (:class:`~plexapi.media.Logo`): The logo object to select.
+        """
+        logo.select()
+        return self
+
+    def deleteLogo(self):
+        """ Delete the logo from a Plex object. """
+        key = f'/library/metadata/{self.ratingKey}/clearLogo'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+
+class PosterUrlMixin:
+    """ Mixin for Plex objects that can have a poster url. """
+
+    @property
+    def thumbUrl(self):
+        """ Return the thumb url for the Plex object. """
+        thumb = self.firstAttr('thumb', 'parentThumb', 'grandparentThumb')
+        return self._server.url(thumb, includeToken=True) if thumb else None
+
+    @property
+    def posterUrl(self):
+        """ Alias to self.thumbUrl. """
+        return self.thumbUrl
+
+
+class PosterLockMixin:
+    """ Mixin for Plex objects that can have a locked poster. """
+
+    def lockPoster(self):
+        """ Lock the poster for a Plex object. """
+        return self._edit(**{'thumb.locked': 1})
+
+    def unlockPoster(self):
+        """ Unlock the poster for a Plex object. """
+        return self._edit(**{'thumb.locked': 0})
+
+
+class PosterMixin(PosterUrlMixin, PosterLockMixin):
+    """ Mixin for Plex objects that can have posters. """
+
+    def posters(self):
+        """ Returns list of available :class:`~plexapi.media.Poster` objects. """
+        return self.fetchItems(f'/library/metadata/{self.ratingKey}/posters', cls=media.Poster)
+
+    def uploadPoster(self, url=None, filepath=None):
+        """ Upload a poster from a url or filepath.
+
+            Parameters:
+                url (str): The full URL to the image to upload.
+                filepath (str): The full file path to the image to upload or file-like object.
+        """
+        if url:
+            key = f'/library/metadata/{self.ratingKey}/posters?url={quote_plus(url)}'
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = f'/library/metadata/{self.ratingKey}/posters'
+            data = openOrRead(filepath)
+            self._server.query(key, method=self._server._session.post, data=data)
+        return self
+
+    def setPoster(self, poster):
+        """ Set the poster for a Plex object.
+
+            Parameters:
+                poster (:class:`~plexapi.media.Poster`): The poster object to select.
+        """
+        poster.select()
+        return self
+
+    def deletePoster(self):
+        """ Delete the poster from a Plex object. """
+        key = f'/library/metadata/{self.ratingKey}/thumb'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+
+class SquareArtUrlMixin:
+    """ Mixin for Plex objects that can have a square art url. """
+
+    @property
+    def squareArt(self):
+        """ Return the API path to the square art image. """
+        return next((i.url for i in self.images if i.type == 'backgroundSquare'), None)
+
+    @property
+    def squareArtUrl(self):
+        """ Return the square art url for the Plex object. """
+        return self._server.url(self.squareArt, includeToken=True) if self.squareArt else None
+
+
+class SquareArtLockMixin:
+    """ Mixin for Plex objects that can have a locked square art. """
+
+    def lockSquareArt(self):
+        """ Lock the square art for a Plex object. """
+        return self._edit(**{'squareArt.locked': 1})
+
+    def unlockSquareArt(self):
+        """ Unlock the square art for a Plex object. """
+        return self._edit(**{'squareArt.locked': 0})
+
+
+class SquareArtMixin(SquareArtUrlMixin, SquareArtLockMixin):
+    """ Mixin for Plex objects that can have square art. """
+
+    def squareArts(self):
+        """ Returns list of available :class:`~plexapi.media.SquareArt` objects. """
+        return self.fetchItems(f'/library/metadata/{self.ratingKey}/squareArts', cls=media.SquareArt)
+
+    def uploadSquareArt(self, url=None, filepath=None):
+        """ Upload a square art from a url or filepath.
+
+            Parameters:
+                url (str): The full URL to the image to upload.
+                filepath (str): The full file path to the image to upload or file-like object.
+        """
+        if url:
+            key = f'/library/metadata/{self.ratingKey}/squareArts?url={quote_plus(url)}'
+            self._server.query(key, method=self._server._session.post)
+        elif filepath:
+            key = f'/library/metadata/{self.ratingKey}/squareArts'
+            data = openOrRead(filepath)
+            self._server.query(key, method=self._server._session.post, data=data)
+        return self
+
+    def setSquareArt(self, squareArt):
+        """ Set the square art for a Plex object.
+
+            Parameters:
+                squareArt (:class:`~plexapi.media.SquareArt`): The square art object to select.
+        """
+        squareArt.select()
+        return self
+
+    def deleteSquareArt(self):
+        """ Delete the square art from a Plex object. """
+        key = f'/library/metadata/{self.ratingKey}/squareArt'
+        self._server.query(key, method=self._server._session.delete)
+        return self
+
+
+class ThemeUrlMixin:
+    """ Mixin for Plex objects that can have a theme url. """
+
+    @property
+    def themeUrl(self):
+        """ Return the theme url for the Plex object. """
+        theme = self.firstAttr('theme', 'parentTheme', 'grandparentTheme')
+        return self._server.url(theme, includeToken=True) if theme else None
+
+
+class ThemeLockMixin:
+    """ Mixin for Plex objects that can have a locked theme. """
+
+    def lockTheme(self):
+        """ Lock the theme for a Plex object. """
+        return self._edit(**{'theme.locked': 1})
+
+    def unlockTheme(self):
+        """ Unlock the theme for a Plex object. """
+        return self._edit(**{'theme.locked': 0})
+
+
+class ThemeMixin(ThemeUrlMixin, ThemeLockMixin):
+    """ Mixin for Plex objects that can have themes. """
+
+    def themes(self):
+        """ Returns list of available :class:`~plexapi.media.Theme` objects. """
+        return self.fetchItems(f'/library/metadata/{self.ratingKey}/themes', cls=media.Theme)
+
+    def uploadTheme(self, url=None, filepath=None, timeout=None):
+        """ Upload a theme from url or filepath.
+
+            Warning: Themes cannot be deleted using PlexAPI!
+
+            Parameters:
+                url (str): The full URL to the theme to upload.
+                filepath (str): The full file path to the theme to upload or file-like object.
+                timeout (int, optional): Timeout, in seconds, to use when uploading themes to the server.
+                    (default config.TIMEOUT).
+        """
+        if url:
+            key = f'/library/metadata/{self.ratingKey}/themes?url={quote_plus(url)}'
+            self._server.query(key, method=self._server._session.post, timeout=timeout)
+        elif filepath:
+            key = f'/library/metadata/{self.ratingKey}/themes'
+            data = openOrRead(filepath)
+            self._server.query(key, method=self._server._session.post, data=data, timeout=timeout)
+        return self
+
+    def setTheme(self, theme):
+        """ Set the theme for a Plex object.
+
+            Raises:
+                :exc:`~plexapi.exceptions.NotImplementedError`: Themes cannot be set through the API.
+        """
+        raise NotImplementedError(
+            'Themes cannot be set through the API. '
+            'Re-upload the theme using "uploadTheme" to set it.'
+        )
+
+    def deleteTheme(self):
+        """ Delete the theme from a Plex object. """
+        key = f'/library/metadata/{self.ratingKey}/theme'
+        self._server.query(key, method=self._server._session.delete)
+        return self
diff --git a/libs/plexapi/mixins/smart_filter.py b/libs/plexapi/mixins/smart_filter.py
new file mode 100644
index 0000000000..3e4d5be387
--- /dev/null
+++ b/libs/plexapi/mixins/smart_filter.py
@@ -0,0 +1,98 @@
+from collections import deque
+from typing import Deque, Set, Tuple, Union
+from urllib.parse import parse_qsl, unquote, urlsplit
+
+from plexapi import utils
+
+
+class SmartFilterMixin:
+    """ Mixin for Plex objects that can have smart filters. """
+
+    def _parseFilterGroups(self, feed: Deque[Tuple[str, str]], returnOn: Union[Set[str], None] = None) -> dict:
+        """ Parse filter groups from input lines between push and pop. """
+        currentFiltersStack: list[dict] = []
+        operatorForStack = None
+        if returnOn is None:
+            returnOn = set("pop")
+        else:
+            returnOn.add("pop")
+        allowedLogicalOperators = ["and", "or"]  # first is the default
+
+        while feed:
+            key, value = feed.popleft()  # consume the first item
+            if key == "push":
+                # recurse and add the result to the current stack
+                currentFiltersStack.append(
+                    self._parseFilterGroups(feed, returnOn)
+                )
+            elif key in returnOn:
+                # stop iterating and return the current stack
+                if not key == "pop":
+                    feed.appendleft((key, value))  # put the item back
+                break
+
+            elif key in allowedLogicalOperators:
+                # set the operator
+                if operatorForStack and not operatorForStack == key:
+                    raise ValueError(
+                        "cannot have different logical operators for the same"
+                        " filter group"
+                    )
+                operatorForStack = key
+
+            else:
+                # add the key value pair to the current filter
+                currentFiltersStack.append({key: value})
+
+        if not operatorForStack and len(currentFiltersStack) > 1:
+            # consider 'and' as the default operator
+            operatorForStack = allowedLogicalOperators[0]
+
+        if operatorForStack:
+            return {operatorForStack: currentFiltersStack}
+        return currentFiltersStack.pop()
+
+    def _parseQueryFeed(self, feed: "deque[Tuple[str, str]]") -> dict:
+        """ Parse the query string into a dict. """
+        filtersDict: dict[str, Union[str, int, list, dict]] = {}
+        special_keys = {"type", "sort"}
+        integer_keys = {"includeGuids", "limit"}
+        as_is_keys = {"group", "having"}
+        reserved_keys = special_keys | integer_keys | as_is_keys
+        while feed:
+            key, value = feed.popleft()
+            if key in integer_keys:
+                filtersDict[key] = int(value)
+            elif key in as_is_keys:
+                filtersDict[key] = value
+            elif key == "type":
+                filtersDict["libtype"] = utils.reverseSearchType(value)
+            elif key == "sort":
+                filtersDict["sort"] = value.split(",")
+            else:
+                feed.appendleft((key, value))  # put the item back
+                filter_group = self._parseFilterGroups(
+                    feed, returnOn=reserved_keys
+                )
+                if "filters" in filtersDict:
+                    filtersDict["filters"] = {
+                        "and": [filtersDict["filters"], filter_group]
+                    }
+                else:
+                    filtersDict["filters"] = filter_group
+
+        return filtersDict
+
+    def _parseFilters(self, content):
+        """ Parse the content string and returns the filter dict. """
+        content = urlsplit(unquote(content))
+        feed = deque()
+
+        for key, value in parse_qsl(content.query):
+            # Move = sign to key when operator is ==
+            if value.startswith("="):
+                key, value = f"{key}=", value[1:]
+
+            feed.append((key, value))
+
+        return self._parseQueryFeed(feed)
diff --git a/libs/plexapi/mixins/split_merge.py b/libs/plexapi/mixins/split_merge.py
new file mode 100644
index 0000000000..d3bb8bf5cf
--- /dev/null
+++ b/libs/plexapi/mixins/split_merge.py
@@ -0,0 +1,21 @@
+class SplitMergeMixin:
+    """ Mixin for Plex objects that can be split and merged. """
+
+    def split(self):
+        """ Split duplicated Plex object into separate objects. """
+        key = f'{self.key}/split'
+        self._server.query(key, method=self._server._session.put)
+        return self
+
+    def merge(self, ratingKeys):
+        """ Merge other Plex objects into the current object.
+
+            Parameters:
+                ratingKeys (list): A list of rating keys to merge.
+        """
+        if not isinstance(ratingKeys, list):
+            ratingKeys = str(ratingKeys).split(',')
+
+        key = f"{self.key}/merge?ids={','.join(str(r) for r in ratingKeys)}"
+        self._server.query(key, method=self._server._session.put)
+        return self
diff --git a/libs/plexapi/mixins/unmatch_match.py b/libs/plexapi/mixins/unmatch_match.py
new file mode 100644
index 0000000000..fe94b849e4
--- /dev/null
+++ b/libs/plexapi/mixins/unmatch_match.py
@@ -0,0 +1,97 @@
+from urllib.parse import urlencode
+
+from plexapi import media, utils
+from plexapi.exceptions import NotFound
+
+
+class UnmatchMatchMixin:
+    """ Mixin for Plex objects that can be unmatched and matched. """
+
+    def unmatch(self):
+        """ Unmatches metadata match from object. """
+        key = f'{self.key}/unmatch'
+        self._server.query(key, method=self._server._session.put)
+
+    def matches(self, agent=None, title=None, year=None, language=None):
+        """ Return list of (:class:`~plexapi.media.SearchResult`) metadata matches.
+
+             Parameters:
+                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
+                title (str): Title of item to search for
+                year (str): Year of item to search in
+                language (str) : Language of item to search in
+
+            Examples:
+                1. video.matches()
+                2. video.matches(title="something", year=2020)
+                3. video.matches(title="something")
+                4. video.matches(year=2020)
+                5. video.matches(title="something", year="")
+                6. video.matches(title="", year=2020)
+                7. video.matches(title="", year="")
+
+                1. The default behaviour in Plex Web = no params in plexapi
+                2. Both title and year specified by user
+                3. Year automatically filled in
+                4. Title automatically filled in
+                5. Explicitly searches for title with blank year
+                6. Explicitly searches for blank title with year
+                7. I don't know what the user is thinking... return the same result as 1
+
+                For 2 to 7, the agent and language is automatically filled in
+        """
+        key = f'{self.key}/matches'
+        params = {'manual': 1}
+
+        if agent and not any([title, year, language]):
+            params['language'] = self.section().language
+            params['agent'] = utils.getAgentIdentifier(self.section(), agent)
+        else:
+            if any(x is not None for x in [agent, title, year, language]):
+                if title is None:
+                    params['title'] = self.title
+                else:
+                    params['title'] = title
+
+                if year is None:
+                    params['year'] = getattr(self, 'year', '')
+                else:
+                    params['year'] = year
+
+                params['language'] = language or self.section().language
+
+                if agent is None:
+                    params['agent'] = self.section().agent
+                else:
+                    params['agent'] = utils.getAgentIdentifier(self.section(), agent)
+
+        key = key + '?' + urlencode(params)
+        return self.fetchItems(key, cls=media.SearchResult)
+
+    def fixMatch(self, searchResult=None, auto=False, agent=None):
+        """ Use match result to update show metadata.
+
+            Parameters:
+                auto (bool): True uses first match from matches
+                    False allows user to provide the match
+                searchResult (:class:`~plexapi.media.SearchResult`): Search result from
+                    ~plexapi.base.matches()
+                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
+        """
+        key = f'{self.key}/match'
+        if auto:
+            autoMatch = self.matches(agent=agent)
+            if autoMatch:
+                searchResult = autoMatch[0]
+            else:
+                raise NotFound(f'No matches found using this agent: ({agent}:{autoMatch})')
+        elif not searchResult:
+            raise NotFound('fixMatch() requires either auto=True or '
+                           'searchResult=:class:`~plexapi.media.SearchResult`.')
+
+        params = {'guid': searchResult.guid,
+                  'name': searchResult.name}
+
+        data = key + '?' + urlencode(params)
+        self._server.query(data, method=self._server._session.put)
+        return self
diff --git a/libs/plexapi/mixins/watchlist.py b/libs/plexapi/mixins/watchlist.py
new file mode 100644
index 0000000000..e800c967e2
--- /dev/null
+++ b/libs/plexapi/mixins/watchlist.py
@@ -0,0 +1,62 @@
+class WatchlistMixin:
+    """ Mixin for Plex objects that can be added to a user's watchlist. """
+
+    def onWatchlist(self, account=None):
+        """ Returns True if the item is on the user's watchlist.
+            Also see :func:`~plexapi.myplex.MyPlexAccount.onWatchlist`.
+
+            Parameters:
+                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to check item on the watchlist.
+                   Note: This is required if you are not connected to a Plex server instance using the admin account.
+        """
+        try:
+            account = account or self._server.myPlexAccount()
+        except AttributeError:
+            account = self._server
+        return account.onWatchlist(self)
+
+    def addToWatchlist(self, account=None):
+        """ Add this item to the specified user's watchlist.
+            Also see :func:`~plexapi.myplex.MyPlexAccount.addToWatchlist`.
+
+            Parameters:
+                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to add item to the watchlist.
+                   Note: This is required if you are not connected to a Plex server instance using the admin account.
+        """
+        try:
+            account = account or self._server.myPlexAccount()
+        except AttributeError:
+            account = self._server
+        account.addToWatchlist(self)
+        return self
+
+    def removeFromWatchlist(self, account=None):
+        """ Remove this item from the specified user's watchlist.
+            Also see :func:`~plexapi.myplex.MyPlexAccount.removeFromWatchlist`.
+
+            Parameters:
+                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to remove item from the watchlist.
+                   Note: This is required if you are not connected to a Plex server instance using the admin account.
+        """
+        try:
+            account = account or self._server.myPlexAccount()
+        except AttributeError:
+            account = self._server
+        account.removeFromWatchlist(self)
+        return self
+
+    def streamingServices(self, account=None):
+        """ Return a list of :class:`~plexapi.media.Availability`
+            objects for the available streaming services for this item.
+
+            Parameters:
+                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account used to retrieve availability.
+                   Note: This is required if you are not connected to a Plex server instance using the admin account.
+        """
+        try:
+            account = account or self._server.myPlexAccount()
+        except AttributeError:
+            account = self._server
+        ratingKey = self.guid.rsplit('/', 1)[-1]
+        data = account.query(f"{account.METADATA}/library/metadata/{ratingKey}/availabilities")
+        return self.findItems(data)
diff --git a/libs/plexapi/myplex.py b/libs/plexapi/myplex.py
index abcc9417e3..58c135a980 100644
--- a/libs/plexapi/myplex.py
+++ b/libs/plexapi/myplex.py
@@ -1,16 +1,29 @@
-# -*- coding: utf-8 -*-
 import copy
+import hashlib
 import html
+import os
 import threading
 import time
+from datetime import datetime, timedelta, timezone
 from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
-from xml.etree import ElementTree
 
 import requests
 
+try:
+    import cryptography
+    from cryptography.hazmat.primitives import serialization
+    from cryptography.hazmat.primitives.asymmetric import ed25519
+except ImportError:  # pragma: no cover
+    cryptography = None
+
+try:
+    import jwt
+except ImportError:  # pragma: no cover
+    jwt = None
+
 from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_ENABLE_FAST_CONNECT, X_PLEX_IDENTIFIER,
                      log, logfilter, utils)
-from plexapi.base import PlexObject
+from plexapi.base import PlexObject, cached_data_property
 from plexapi.client import PlexClient
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized, TwoFactorRequired
 from plexapi.library import LibrarySection
@@ -144,7 +157,6 @@ def signout(self):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self._token = logfilter.add_secret(data.attrib.get('authToken'))
         self._webhooks = []
 
@@ -185,7 +197,6 @@ def _loadData(self, data):
         subscription = data.find('subscription')
         self.subscriptionActive = utils.cast(bool, subscription.attrib.get('active'))
         self.subscriptionDescription = data.attrib.get('subscriptionDescription')
-        self.subscriptionFeatures = self.listAttrs(subscription, 'id', rtag='features', etag='feature')
         self.subscriptionPaymentService = subscription.attrib.get('paymentService')
         self.subscriptionPlan = subscription.attrib.get('plan')
         self.subscriptionStatus = subscription.attrib.get('status')
@@ -201,20 +212,31 @@ def _loadData(self, data):
         self.profileDefaultSubtitleAccessibility = utils.cast(int, profile.attrib.get('defaultSubtitleAccessibility'))
         self.profileDefaultSubtitleForces = utils.cast(int, profile.attrib.get('defaultSubtitleForces'))
 
-        self.entitlements = self.listAttrs(data, 'id', rtag='entitlements', etag='entitlement')
-        self.roles = self.listAttrs(data, 'id', rtag='roles', etag='role')
-
+        # TODO: Fetch missing MyPlexAccount services
         self.services = None
 
+    @cached_data_property
+    def subscriptionFeatures(self):
+        subscription = self._data.find('subscription')
+        return self.listAttrs(subscription, 'id', rtag='features', etag='feature')
+
+    @cached_data_property
+    def entitlements(self):
+        return self.listAttrs(self._data, 'id', rtag='entitlements', etag='entitlement')
+
+    @cached_data_property
+    def roles(self):
+        return self.listAttrs(self._data, 'id', rtag='roles', etag='role')
+
     @property
     def authenticationToken(self):
         """ Returns the authentication token for the account. Alias for ``authToken``. """
         return self.authToken
 
-    def _reload(self, key=None, **kwargs):
+    def _reload(self, **kwargs):
         """ Perform the actual reload. """
         data = self.query(self.key)
-        self._loadData(data)
+        self._invalidateCacheAndLoadData(data)
         return self
 
     def _headers(self, **kwargs):
@@ -249,8 +271,7 @@ def query(self, url, method=None, headers=None, timeout=None, **kwargs):
             return response.json()
         elif 'text/plain' in response.headers.get('Content-Type', ''):
             return response.text.strip()
-        data = utils.cleanXMLString(response.text).encode('utf8')
-        return ElementTree.fromstring(data) if data.strip() else None
+        return utils.parseXMLString(response.text)
 
     def ping(self):
         """ Ping the Plex.tv API.
@@ -942,7 +963,7 @@ def watchlist(self, filter=None, sort=None, libtype=None, maxresults=None, **kwa
 
         params.update(kwargs)
 
-        key = f'{self.METADATA}/library/sections/watchlist/{filter}{utils.joinArgs(params)}'
+        key = f'{self.DISCOVER}/library/sections/watchlist/{filter}{utils.joinArgs(params)}'
         return self._toOnlineMetadata(self.fetchItems(key, maxresults=maxresults), **kwargs)
 
     def onWatchlist(self, item):
@@ -972,7 +993,7 @@ def addToWatchlist(self, items):
             if self.onWatchlist(item):
                 raise BadRequest(f'"{item.title}" is already on the watchlist')
             ratingKey = item.guid.rsplit('/', 1)[-1]
-            self.query(f'{self.METADATA}/actions/addToWatchlist?ratingKey={ratingKey}', method=self._session.put)
+            self.query(f'{self.DISCOVER}/actions/addToWatchlist?ratingKey={ratingKey}', method=self._session.put)
         return self
 
     def removeFromWatchlist(self, items):
@@ -993,7 +1014,7 @@ def removeFromWatchlist(self, items):
             if not self.onWatchlist(item):
                 raise BadRequest(f'"{item.title}" is not on the watchlist')
             ratingKey = item.guid.rsplit('/', 1)[-1]
-            self.query(f'{self.METADATA}/actions/removeFromWatchlist?ratingKey={ratingKey}', method=self._session.put)
+            self.query(f'{self.DISCOVER}/actions/removeFromWatchlist?ratingKey={ratingKey}', method=self._session.put)
         return self
 
     def userState(self, item):
@@ -1135,6 +1156,7 @@ def link(self, pin):
 
     def _toOnlineMetadata(self, objs, **kwargs):
         """ Convert a list of media objects to online metadata objects. """
+        # TODO: Add proper support for metadata.provider.plex.tv
         # Temporary workaround to allow reloading and browsing of online media objects
         server = PlexServer(self.METADATA, self._token, session=self._session)
 
@@ -1204,7 +1226,6 @@ class MyPlexUser(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.friend = self._initpath == self.key
         self.allowCameraUpload = utils.cast(bool, data.attrib.get('allowCameraUpload'))
         self.allowChannels = utils.cast(bool, data.attrib.get('allowChannels'))
@@ -1223,10 +1244,13 @@ def _loadData(self, data):
         self.thumb = data.attrib.get('thumb')
         self.title = data.attrib.get('title', '')
         self.username = data.attrib.get('username', '')
-        self.servers = self.findItems(data, MyPlexServerShare)
         for server in self.servers:
             server.accountID = self.id
 
+    @cached_data_property
+    def servers(self):
+        return self.findItems(self._data, MyPlexServerShare)
+
     def get_token(self, machineIdentifier):
         try:
             for item in self._server.query(self._server.FRIENDINVITE.format(machineId=machineIdentifier)):
@@ -1281,7 +1305,6 @@ class MyPlexInvite(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
         self.email = data.attrib.get('email')
         self.friend = utils.cast(bool, data.attrib.get('friend'))
@@ -1289,12 +1312,15 @@ def _loadData(self, data):
         self.home = utils.cast(bool, data.attrib.get('home'))
         self.id = utils.cast(int, data.attrib.get('id'))
         self.server = utils.cast(bool, data.attrib.get('server'))
-        self.servers = self.findItems(data, MyPlexServerShare)
         self.thumb = data.attrib.get('thumb')
         self.username = data.attrib.get('username', '')
         for server in self.servers:
             server.accountID = self.id
 
+    @cached_data_property
+    def servers(self):
+        return self.findItems(self._data, MyPlexServerShare)
+
 
 class Section(PlexObject):
     """ This refers to a shared section. The raw xml for the data presented here
@@ -1312,7 +1338,7 @@ class Section(PlexObject):
     TAG = 'Section'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.id = utils.cast(int, data.attrib.get('id'))
         self.key = utils.cast(int, data.attrib.get('key'))
         self.shared = utils.cast(bool, data.attrib.get('shared', '0'))
@@ -1351,7 +1377,6 @@ class MyPlexServerShare(PlexObject):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.id = utils.cast(int, data.attrib.get('id'))
         self.accountID = utils.cast(int, data.attrib.get('accountID'))
         self.serverId = utils.cast(int, data.attrib.get('serverId'))
@@ -1435,10 +1460,9 @@ class MyPlexResource(PlexObject):
     DEFAULT_SCHEME_ORDER = ['https', 'http']
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.accessToken = logfilter.add_secret(data.attrib.get('accessToken'))
         self.clientIdentifier = data.attrib.get('clientIdentifier')
-        self.connections = self.findItems(data, ResourceConnection, rtag='connections')
         self.createdAt = utils.toDatetime(data.attrib.get('createdAt'), "%Y-%m-%dT%H:%M:%SZ")
         self.device = data.attrib.get('device')
         self.dnsRebindingProtection = utils.cast(bool, data.attrib.get('dnsRebindingProtection'))
@@ -1460,6 +1484,10 @@ def _loadData(self, data):
         self.sourceTitle = data.attrib.get('sourceTitle')
         self.synced = utils.cast(bool, data.attrib.get('synced'))
 
+    @cached_data_property
+    def connections(self):
+        return self.findItems(self._data, ResourceConnection, rtag='connections')
+
     def preferred_connections(
         self,
         ssl=None,
@@ -1553,7 +1581,7 @@ class ResourceConnection(PlexObject):
     TAG = 'connection'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.address = data.attrib.get('address')
         self.ipv6 = utils.cast(bool, data.attrib.get('IPv6'))
         self.local = utils.cast(bool, data.attrib.get('local'))
@@ -1596,7 +1624,7 @@ class MyPlexDevice(PlexObject):
     key = 'https://plex.tv/devices.xml'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.name = data.attrib.get('name')
         self.publicAddress = data.attrib.get('publicAddress')
         self.product = data.attrib.get('product')
@@ -1615,7 +1643,10 @@ def _loadData(self, data):
         self.screenDensity = data.attrib.get('screenDensity')
         self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
         self.lastSeenAt = utils.toDatetime(data.attrib.get('lastSeenAt'))
-        self.connections = self.listAttrs(data, 'uri', etag='Connection')
+
+    @cached_data_property
+    def connections(self):
+        return self.listAttrs(self._data, 'uri', etag='Connection')
 
     def connect(self, timeout=None):
         """ Returns a new :class:`~plexapi.client.PlexClient` or :class:`~plexapi.server.PlexServer`
@@ -1651,9 +1682,11 @@ def syncItems(self):
 
 class MyPlexPinLogin:
     """
-        MyPlex PIN login class which supports getting the four character PIN which the user must
-        enter on https://plex.tv/link to authenticate the client and provide an access token to
-        create a :class:`~plexapi.myplex.MyPlexAccount` instance.
+        MyPlex PIN login class which supports getting a token for authenticating the client and
+        providing an access token to create a :class:`~plexapi.myplex.MyPlexAccount` instance.
+        The login can be done using the four character PIN which the user must enter at
+        https://plex.tv/link or using Plex OAuth.
+
         This helper class supports a polling, threaded and callback approach.
 
         - The polling approach expects the developer to periodically check if the PIN login was
@@ -1662,36 +1695,49 @@ class MyPlexPinLogin:
           :func:`~plexapi.myplex.MyPlexPinLogin.run` and then at a later time call
           :func:`~plexapi.myplex.MyPlexPinLogin.waitForLogin` to wait for and check the result.
         - The callback approach is an extension of the threaded approach and expects the developer
-          to pass the `callback` parameter to the call to :func:`~plexapi.myplex.MyPlexPinLogin.run`.
+          to pass the ``callback`` parameter to the call to :func:`~plexapi.myplex.MyPlexPinLogin.run`.
           The callback will be called when the thread waiting for the PIN login to succeed either
           finishes or expires. The parameter passed to the callback is the received authentication
-          token or `None` if the login expired.
+          token or ``None`` if the login expired.
 
         Parameters:
             session (requests.Session, optional): Use your own session object if you want to
-                cache the http responses from PMS
-            requestTimeout (int): timeout in seconds on initial connect to plex.tv (default config.TIMEOUT).
-            headers (dict): A dict of X-Plex headers to send with requests.
-            oauth (bool): True to use Plex OAuth instead of PIN login.
+                cache the http responses from Plex.
+            requestTimeout (int, optional): Timeout in seconds on initial connect to plex.tv (default config.TIMEOUT).
+            headers (dict, optional): A dict of X-Plex headers to send with requests.
+            oauth (bool, optional): True to use Plex OAuth instead of PIN login.
 
         Attributes:
             PINS (str): 'https://plex.tv/api/v2/pins'
-            CHECKPINS (str): 'https://plex.tv/api/v2/pins/{pinid}'
             POLLINTERVAL (int): 1
+            pin (str): Four character PIN to use for the login at https://plex.tv/link.
             finished (bool): Whether the pin login has finished or not.
             expired (bool): Whether the pin login has expired or not.
-            token (str): Token retrieved through the pin login.
-            pin (str): Pin to use for the login on https://plex.tv/link.
+            token (str): Token retrieved after login.
+
+        Example:
+
+            .. code-block:: python
+
+                from plexapi.myplex import MyPlexAccount, MyPlexPinLogin
+
+                pinlogin = MyPlexPinLogin(oauth=True)
+                pinlogin.run()
+                print(f'Login to Plex at the following url:\\n{pinlogin.oauthUrl()}')
+                pinlogin.waitForLogin()
+                token = pinlogin.token
+
+                account = MyPlexAccount(token=token)
+
     """
-    PINS = 'https://plex.tv/api/v2/pins'               # get
-    CHECKPINS = 'https://plex.tv/api/v2/pins/{pinid}'  # get
+    PINS = 'https://plex.tv/api/v2/pins'
     POLLINTERVAL = 1
 
     def __init__(self, session=None, requestTimeout=None, headers=None, oauth=False):
         super(MyPlexPinLogin, self).__init__()
         self._session = session or requests.Session()
         self._requestTimeout = requestTimeout or TIMEOUT
-        self.headers = headers
+        self._customHeaders = headers
 
         self._oauth = oauth
         self._loginTimeout = None
@@ -1700,7 +1746,6 @@ def __init__(self, session=None, requestTimeout=None, headers=None, oauth=False)
         self._abort = False
         self._id = None
         self._code = None
-        self._getCode()
 
         self.finished = False
         self.expired = False
@@ -1708,12 +1753,12 @@ def __init__(self, session=None, requestTimeout=None, headers=None, oauth=False)
 
     @property
     def pin(self):
-        """ Return the 4 character PIN used for linking a device at
+        """ Return the four character PIN used for linking a device at
             https://plex.tv/link.
         """
         if self._oauth:
             raise BadRequest('Cannot use PIN for Plex OAuth login')
-        return self._code
+        return self._getCode()
 
     def oauthUrl(self, forwardUrl=None):
         """ Return the Plex OAuth url for login.
@@ -1733,29 +1778,31 @@ def oauthUrl(self, forwardUrl=None):
             'context[device][platformVersion]': headers['X-Plex-Platform-Version'],
             'context[device][device]': headers['X-Plex-Device'],
             'context[device][deviceName]': headers['X-Plex-Device-Name'],
-            'code': self._code
+            'code': self._getCode()
         }
         if forwardUrl:
             params['forwardUrl'] = forwardUrl
 
         return f'https://app.plex.tv/auth/#!?{urlencode(params)}'
 
-    def run(self, callback=None, timeout=None):
+    def run(self, callback=None, timeout=120):
         """ Starts the thread which monitors the PIN login state.
 
             Parameters:
-                callback (Callable[str]): Callback called with the received authentication token (optional).
-                timeout (int): Timeout in seconds waiting for the PIN login to succeed (optional).
+                callback (Callable[str], optional): Callback called with the received authentication token.
+                timeout (int, optional): Timeout in seconds to wait for user login. Default 120 seconds.
 
             Raises:
-                :class:`RuntimeError`: If the thread is already running.
-                :class:`RuntimeError`: If the PIN login for the current PIN has expired.
+                :exc:`RuntimeError`: If the thread is already running.
+                :exc:`RuntimeError`: If the PIN login for the current PIN has expired.
         """
         if self._thread and not self._abort:
             raise RuntimeError('MyPlexPinLogin thread is already running')
         if self.expired:
             raise RuntimeError('MyPlexPinLogin has expired')
 
+        self._getCode()
+
         self._loginTimeout = timeout
         self._callback = callback
         self._abort = False
@@ -1766,12 +1813,8 @@ def run(self, callback=None, timeout=None):
     def waitForLogin(self):
         """ Waits for the PIN login to succeed or expire.
 
-            Parameters:
-                callback (Callable[str]): Callback called with the received authentication token (optional).
-                timeout (int): Timeout in seconds waiting for the PIN login to succeed (optional).
-
             Returns:
-                `True` if the PIN login succeeded or `False` otherwise.
+                bool: ``True`` if the PIN login succeeded or ``False`` otherwise.
         """
         if not self._thread or self._abort:
             return False
@@ -1791,7 +1834,7 @@ def stop(self):
         self._thread.join()
 
     def checkLogin(self):
-        """ Returns `True` if the PIN login has succeeded. """
+        """ Returns ``True`` if the PIN login has succeeded. """
         if self._thread:
             return False
 
@@ -1804,6 +1847,9 @@ def checkLogin(self):
         return False
 
     def _getCode(self):
+        if self._code:
+            return self._code
+
         url = self.PINS
 
         if self._oauth:
@@ -1827,7 +1873,7 @@ def _checkLogin(self):
         if self.token:
             return True
 
-        url = self.CHECKPINS.format(pinid=self._id)
+        url = f'{self.PINS}/{self._id}'
         response = self._query(url)
         if response is None:
             return False
@@ -1863,9 +1909,532 @@ def _pollLogin(self):
     def _headers(self, **kwargs):
         """ Returns dict containing base headers for all requests for pin login. """
         headers = BASE_HEADERS.copy()
-        if self.headers:
-            headers.update(self.headers)
+        if self._customHeaders:
+            headers.update(self._customHeaders)
+        headers.update(kwargs)
+        return headers
+
+    def _query(self, url, method=None, headers=None, **kwargs):
+        method = method or self._session.get
+        log.debug('%s %s', method.__name__.upper(), url)
+        headers = headers or self._headers()
+        response = method(url, headers=headers, timeout=self._requestTimeout, **kwargs)
+        if not response.ok:  # pragma: no cover
+            codename = codes.get(response.status_code)[0]
+            errtext = response.text.replace('\n', ' ')
+            raise BadRequest(f'({response.status_code}) {codename} {response.url}; {errtext}')
+        return utils.parseXMLString(response.text)
+
+
+class MyPlexJWTLogin:
+    """
+        MyPlex JWT login class which supports getting a JWT for authenticating the client and
+        providing an access token to create a :class:`~plexapi.myplex.MyPlexAccount` instance.
+        The login can be done using the four character PIN which the user must enter at
+        https://plex.tv/link or using Plex OAuth.
+        This class can also be used to refresh or verify an existing JWT.
+
+        See: https://developer.plex.tv/pms/#section/API-Info/Authenticating-with-Plex
+
+        Using this class requires the ``PyJWT`` with ``cryptography`` packages to be installed
+        (``pyjwt[crypto]``).
+
+        This helper class supports a polling, threaded and callback approach.
+
+        - The polling approach expects the developer to periodically check if the PIN login was
+          successful using :func:`~plexapi.myplex.MyPlexJWTLogin.checkLogin`.
+        - The threaded approach expects the developer to call
+          :func:`~plexapi.myplex.MyPlexJWTLogin.run` and then at a later time call
+          :func:`~plexapi.myplex.MyPlexJWTLogin.waitForLogin` to wait for and check the result.
+        - The callback approach is an extension of the threaded approach and expects the developer
+          to pass the ``callback`` parameter to the call to :func:`~plexapi.myplex.MyPlexJWTLogin.run`.
+          The callback will be called when the thread waiting for the PIN login to succeed either
+          finishes or expires. The parameter passed to the callback is the received authentication
+          token or ``None`` if the login expired.
+
+        Parameters:
+            session (requests.Session, optional): Use your own session object if you want to
+                cache the http responses from Plex.
+            requestTimeout (int, optional): Timeout in seconds on initial connect to plex.tv (default config.TIMEOUT).
+            headers (dict, optional): A dict of X-Plex headers to send with requests.
+            oauth (bool, optional): True to use Plex OAuth instead of PIN login.
+            token (str, optional): Plex token only required to register the device initially if not using OAuth.
+            jwtToken (str, optional): Existing Plex JWT to verify or refresh.
+            keypair (tuple[str|bytes], optional): A tuple of the full file paths (str) to the ED25519 private and public
+                key pair or the raw keys themselves (bytes) to use for signing the JWT.
+                Use :func:`~plexapi.myplex.MyPlexJWTLogin.generateKeypair` to generate a new keypair if not provided.
+            scope (list[str], optional): List of scopes to request in the new token.
+                Default is all available scopes.
+
+        Attributes:
+            PINS (str): 'https://plex.tv/api/v2/pins'
+            AUTH (str): 'https://clients.plex.tv/api/v2/auth'
+            POLLINTERVAL (int): 1
+            SCOPES (list): List of all available scopes to request for the JWT.
+            pin (str): Four character PIN to use for the login at https://plex.tv/link.
+            finished (bool): Whether the JWT login has finished or not.
+            expired (bool): Whether the JWT login has expired or not.
+            jwtToken (str): The Plex JWT received after login or refreshing.
+            decodedJWT (dict): The decoded Plex JWT payload.
+
+        Example:
+
+            .. code-block:: python
+
+                from plexapi.myplex import MyPlexAccount, MyPlexJWTLogin
+
+                # Method 1: Generate a new Plex JWT using Plex OAuth
+                jwtlogin = MyPlexJWTLogin(
+                    oauth=True,
+                    scopes=['username', 'email', 'friendly_name']
+                )
+                jwtlogin.generateKeypair(keyfiles=('private.key', 'public.key'))
+                jwtlogin.run()
+                print(f'Login to Plex at the following url:\\n{jwtlogin.oauthUrl()}')
+                jwtlogin.waitForLogin()
+                jwtToken = jwtlogin.jwtToken
+
+                account = MyPlexAccount(token=jwtToken)
+
+                # Method 2: Generate a new Plex JWT using an existing Plex token and keypair
+                jwtlogin = MyPlexJWTLogin(
+                    token='2ffLuB84dqLswk9skLos',
+                    keypair=('private.key', 'public.key'),
+                    scopes=['username', 'email', 'friendly_name']
+                )
+                jwtlogin.registerDevice()
+                jwtToken = jwtlogin.refreshJWT()
+
+                account = MyPlexAccount(token=jwtToken)
+
+                # Refresh an existing Plex JWT
+                jwtlogin = MyPlexJWTLogin(
+                    jwtToken=jwtToken,
+                    keypair=('private.key', 'public.key'),
+                    scopes=['username', 'email', 'friendly_name']
+                )
+                if not jwtlogin.verifyJWT():
+                    jwtToken = jwtlogin.refreshJWT()
+
+                account = MyPlexAccount(token=jwtToken)
+
+    """
+    PINS = 'https://clients.plex.tv/api/v2/pins'
+    AUTH = 'https://clients.plex.tv/api/v2/auth'
+    POLLINTERVAL = 1
+    SCOPES = ['username', 'email', 'friendly_name', 'restricted', 'anonymous', 'joinedAt']
+
+    def __init__(self, session=None, requestTimeout=None, headers=None, oauth=False,
+                 token=None, jwtToken=None, keypair=(None, None), scopes=None):
+        super(MyPlexJWTLogin, self).__init__()
+        self._session = session or requests.Session()
+        self._requestTimeout = requestTimeout or TIMEOUT
+        self._customHeaders = headers
+        self._token = token
+        self._privateKey = utils.openOrRead(keypair[0]) if keypair[0] else None
+        self._publicKey = utils.openOrRead(keypair[1]) if keypair[1] else None
+        self._scopes = scopes or self.SCOPES
+        self._clientJWT = None
+
+        self._oauth = oauth
+        self._loginTimeout = None
+        self._callback = None
+        self._thread = None
+        self._abort = False
+        self._id = None
+        self._code = None
+
+        self.finished = False
+        self.expired = False
+        self.jwtToken = jwtToken
+
+        if not jwt:
+            log.warning('PyJWT package is not installed, cannot use Plex JWT login')
+            return
+
+    def generateKeypair(self, keyfiles=(None, None), overwrite=False):
+        """ Generates a new ED25519 private/public keypair for signing the JWT and saves them to files.
+            Requires the ``cryptography`` package to be installed.
+
+            Parameters:
+                keyfiles (tuple[str]): A tuple of the full file paths to write the private and public keypair to.
+                overwrite (bool): Set to True to overwrite existing keypair files. Default is False.
+
+            Raises:
+                :exc:`FileExistsError`: when keypair files already exist and overwrite is False.
+        """
+        if not cryptography:
+            log.warning('Cryptography package is not installed, cannot generate ED25519 keypair')
+            return
+
+        privateKey = ed25519.Ed25519PrivateKey.generate()
+        publicKey = privateKey.public_key()
+        _privateKey = privateKey.private_bytes(
+            encoding=serialization.Encoding.Raw,
+            format=serialization.PrivateFormat.Raw,
+            encryption_algorithm=serialization.NoEncryption()
+        )
+        _publicKey = publicKey.public_bytes(
+            encoding=serialization.Encoding.Raw,
+            format=serialization.PublicFormat.Raw
+        )
+
+        if keyfiles[0] and keyfiles[1]:
+            if not overwrite and (os.path.exists(keyfiles[0]) or os.path.exists(keyfiles[1])):
+                raise FileExistsError('Keypair files already exist, set overwrite=True to overwrite them.')
+
+            with open(keyfiles[0], 'wb') as privateFile, open(keyfiles[1], 'wb') as publicFile:
+                privateFile.write(_privateKey)
+                publicFile.write(_publicKey)
+
+        self._privateKey = _privateKey
+        self._publicKey = _publicKey
+
+    @property
+    def _clientIdentifier(self):
+        """ Returns the client identifier from the headers. """
+        headers = self._headers()
+        return headers['X-Plex-Client-Identifier']
+
+    @property
+    def _keyID(self):
+        """ Returns the key ID (thumbprint) for the ED25519 keypair. """
+        if not self._privateKey or not self._publicKey:
+            return None
+        return hashlib.sha256(self._privateKey + self._publicKey).hexdigest()
+
+    @property
+    def _privateJWK(self):
+        """ Returns the private JWK (JSON Web Key) for the ED25519 keypair."""
+        return jwt.PyJWK.from_dict({
+            'kty': 'OKP',
+            'crv': 'Ed25519',
+            'x': utils.base64urlEncode(self._publicKey),
+            'd': utils.base64urlEncode(self._privateKey),
+            'use': 'sig',
+            'alg': 'EdDSA',
+            'kid': self._keyID,
+        })
+
+    @property
+    def _publicJWK(self):
+        """ Returns the public JWK (JSON Web Key) for the ED25519 keypair."""
+        return jwt.PyJWK.from_dict({
+            'kty': 'OKP',
+            'crv': 'Ed25519',
+            'x': utils.base64urlEncode(self._publicKey),
+            'use': 'sig',
+            'alg': 'EdDSA',
+            'kid': self._keyID,
+        })
+
+    def _encodeClientJWT(self):
+        """ Returns the encoded client JWT using the private JWK. """
+        payload = {
+            'nonce': self._getPlexNonce(),
+            'scope': ','.join(self._scopes),
+            'aud': 'plex.tv',
+            'iss': self._clientIdentifier,
+            'iat': int(datetime.now(timezone.utc).timestamp()),
+            'exp': int((datetime.now(timezone.utc) + timedelta(minutes=5)).timestamp()),
+        }
+        headers = {
+            'kid': self._keyID
+        }
+        return jwt.encode(
+            payload,
+            key=self._privateJWK,
+            algorithm='EdDSA',
+            headers=headers
+        )
+
+    def decodePlexJWT(self, verify_signature=True):
+        """ Returns the decoded Plex JWT with optional signature verification using the Plex public JWK.
+
+            Parameters:
+                verify_signature (bool): Whether to verify the JWT signature and required claims.
+                    Defaults to True. Set to False to skip signature verification and required-claim enforcement.
+        """
+        kwargs = {
+            'jwt': self.jwtToken,
+            'algorithms': ['EdDSA'],
+            'options': {'verify_signature': verify_signature},
+            'audience': ['plex.tv', self._clientIdentifier],
+            'issuer': 'plex.tv',
+        }
+
+        if not verify_signature:
+            return jwt.decode(**kwargs)
+
+        kwargs['options']['require'] = ['aud', 'iss', 'exp', 'iat', 'thumbprint']
+
+        for plexJWK in reversed(self._getPlexPublicJWK()):
+            try:
+                return jwt.decode(
+                    key=jwt.PyJWK.from_dict(plexJWK),
+                    **kwargs
+                )
+            except jwt.InvalidSignatureError:
+                continue
+            except jwt.InvalidTokenError as e:
+                log.warning('Invalid Plex JWT: %s', str(e))
+                raise
+
+        log.warning('Plex JWT signature could not be verified with any known Plex JWKs')
+        raise jwt.InvalidSignatureError
+
+    @property
+    def decodedJWT(self):
+        """ Returns the decoded Plex JWT with signature verification and required-claim enforcement. """
+        return self.decodePlexJWT()
+
+    def _registerPlexDevice(self):
+        """ Registers the public JWK with Plex. """
+        url = f'{self.AUTH}/jwk'
+        headers = self._headers(**{'X-Plex-Token': self._token})
+        body = {'jwk': self._publicJWK._jwk_data}
+        self._query(url, method=self._session.post, headers=headers, json=body)
+
+    def _getPlexNonce(self):
+        """ Gets a nonce from Plex. """
+        url = f'{self.AUTH}/nonce'
+        data = self._query(url, method=self._session.get)
+        return data['nonce']
+
+    def _exchangePlexJWT(self):
+        """ Exchanges the client JWT for a Plex JWT. """
+        url = f'{self.AUTH}/token'
+        body = {'jwt': self._clientJWT}
+        data = self._query(url, method=self._session.post, json=body)
+        return data['auth_token']
+
+    def _getPlexPublicJWK(self):
+        """ Gets the Plex public JWKs. """
+        url = f'{self.AUTH}/keys'
+        data = self._query(url, method=self._session.get)
+        return data['keys']
+
+    def registerDevice(self):
+        """ Registers the device with Plex using the provided token and private/public keypair.
+            This must be done once if OAuth was not used before the Plex JWT can be refreshed.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: when token or keypair is missing.
+        """
+        if not self._token:
+            raise BadRequest('Plex token is required to register device.')
+
+        if not self._privateKey or not self._publicKey:
+            raise BadRequest('ED25519 private and public keys are required to register device. '
+                             'Use generateKeypair() to generate a new keypair.')
+
+        self._registerPlexDevice()
+
+    def refreshJWT(self):
+        """ Refreshes the Plex JWT using the existing private/public keypair.
+
+            Returns:
+                str: The new Plex JWT.
+
+            Raises:
+                :exc:`~plexapi.exceptions.BadRequest`: when keypair is missing.
+                :exc:`~plexapi.exceptions.BadRequest`: when the newly obtained JWT cannot be verified.
+        """
+        if not self._privateKey or not self._publicKey:
+            raise BadRequest('ED25519 private and public keys are required to refresh JWT.')
+
+        self._clientJWT = self._encodeClientJWT()
+        self.jwtToken = self._exchangePlexJWT()
+        if self.verifyJWT():
+            return self.jwtToken
+        raise BadRequest('Failed to verify newly obtained JWT.')
+
+    def verifyJWT(self, refreshWithinDays=1):
+        """ Verifies the existing Plex JWT is valid and not expiring within the specified number of days.
+
+            Parameters:
+                refreshWithinDays (int): Number of days before expiration to consider
+                    the JWT invalid and in need of refresh. Default is 1 day.
+        """
+        try:
+            decodedJWT = self.decodedJWT
+        except jwt.InvalidTokenError:
+            return False
+        else:
+            if decodedJWT['thumbprint'] != self._keyID:
+                log.warning('Existing JWT was signed with a different key')
+                return False
+            elif decodedJWT['exp'] < int((datetime.now(timezone.utc) + timedelta(days=refreshWithinDays)).timestamp()):
+                log.warning(f'Existing JWT is expiring within {refreshWithinDays} day(s)')
+                return False
+        return True
+
+    @property
+    def pin(self):
+        """ Return the four character PIN used for linking a device at
+            https://plex.tv/link.
+        """
+        if self._oauth:
+            raise BadRequest('Cannot use PIN for Plex OAuth login')
+        return self._code
+
+    def oauthUrl(self, forwardUrl=None):
+        """ Return the Plex OAuth url for login.
+
+            Parameters:
+                forwardUrl (str, optional): The url to redirect the client to after login.
+        """
+        if not self._oauth:
+            raise BadRequest('Must use "MyPlexJWTLogin(oauth=True)" for Plex OAuth login.')
+
+        headers = self._headers()
+        params = {
+            'clientID': headers['X-Plex-Client-Identifier'],
+            'context[device][product]': headers['X-Plex-Product'],
+            'context[device][version]': headers['X-Plex-Version'],
+            'context[device][platform]': headers['X-Plex-Platform'],
+            'context[device][platformVersion]': headers['X-Plex-Platform-Version'],
+            'context[device][device]': headers['X-Plex-Device'],
+            'context[device][deviceName]': headers['X-Plex-Device-Name'],
+            'code': self._code
+        }
+        if forwardUrl:
+            params['forwardUrl'] = forwardUrl
+
+        return f'https://app.plex.tv/auth/#!?{urlencode(params)}'
+
+    def run(self, callback=None, timeout=120):
+        """ Starts the thread which monitors the PIN login state.
+
+            Parameters:
+                callback (Callable[str], optional): Callback called with the received authentication token.
+                timeout (int, optional): Timeout in seconds to wait for user login. Default 120 seconds.
+
+            Raises:
+                :exc:`RuntimeError`: If the thread is already running.
+                :exc:`RuntimeError`: If the PIN login for the current PIN has expired.
+        """
+        if self._thread and not self._abort:
+            raise RuntimeError('MyPlexJWTLogin thread is already running')
+        if self.expired:
+            raise RuntimeError('MyPlexJWTLogin has expired')
+
+        self._getCode()
+        self._clientJWT = self._encodeClientJWT()
+
+        self._loginTimeout = timeout
+        self._callback = callback
+        self._abort = False
+        self.finished = False
+        self._thread = threading.Thread(target=self._pollLogin, name='plexapi.myplex.MyPlexJWTLogin')
+        self._thread.start()
+
+    def waitForLogin(self):
+        """ Waits for the user login to succeed or expire.
+
+            Returns:
+                bool: ``True`` if the user login succeeded or ``False`` otherwise.
+        """
+        if not self._thread or self._abort:
+            return False
+
+        self._thread.join()
+        if self.expired or not self.jwtToken:
+            return False
+
+        return True
+
+    def stop(self):
+        """ Stops the thread monitoring the user login state. """
+        if not self._thread or self._abort:
+            return
+
+        self._abort = True
+        self._thread.join()
+
+    def checkLogin(self):
+        """ Returns ``True`` if the user login has succeeded. """
+        if self._thread:
+            return False
+
+        try:
+            return self._checkLogin()
+        except Exception:
+            self.expired = True
+            self.finished = True
+
+        return False
+
+    def _getCode(self):
+        url = self.PINS
+
+        if self._oauth:
+            body = {
+                'jwk': self._publicJWK._jwk_data,
+                'strong': True,
+            }
+        else:
+            body = {
+                'jwk': self._publicJWK._jwk_data,
+            }
+
+        response = self._query(url, self._session.post, json=body)
+        if response is None:
+            return None
+
+        self._id = response.get('id')
+        self._code = response.get('code')
+
+        return self._code
+
+    def _checkLogin(self):
+        if not self._id:
+            return False
+
+        if self.jwtToken:
+            return True
+
+        url = f'{self.PINS}/{self._id}'
+        params = {'deviceJWT': self._clientJWT}
+        response = self._query(url, params=params)
+        if response is None:
+            return False
+
+        token = response.get('authToken')
+        if not token:
+            return False
+
+        self.jwtToken = token
+        self.finished = True
+        return True
+
+    def _pollLogin(self):
+        try:
+            start = time.time()
+            while not self._abort and (not self._loginTimeout or (time.time() - start) < self._loginTimeout):
+                try:
+                    result = self._checkLogin()
+                except Exception:
+                    self.expired = True
+                    break
+
+                if result:
+                    break
+
+                time.sleep(self.POLLINTERVAL)
+
+            if self.jwtToken and self._callback:
+                self._callback(self.jwtToken)
+        finally:
+            self.finished = True
+
+    def _headers(self, **kwargs):
+        """ Returns dict containing base headers for all requests for Plex JWT login. """
+        headers = BASE_HEADERS.copy()
+        if self._customHeaders:
+            headers.update(self._customHeaders)
         headers.update(kwargs)
+        headers['Accept'] = 'application/json'
         return headers
 
     def _query(self, url, method=None, headers=None, **kwargs):
@@ -1877,8 +2446,9 @@ def _query(self, url, method=None, headers=None, **kwargs):
             codename = codes.get(response.status_code)[0]
             errtext = response.text.replace('\n', ' ')
             raise BadRequest(f'({response.status_code}) {codename} {response.url}; {errtext}')
-        data = response.text.encode('utf8')
-        return ElementTree.fromstring(data) if data.strip() else None
+        if 'application/json' in response.headers.get('Content-Type', '') and len(response.content):
+            return response.json()
+        return utils.parseXMLString(response.text)
 
 
 def _connect(cls, url, token, session, timeout, results, i, job_is_done_event=None):
@@ -1937,6 +2507,7 @@ class AccountOptOut(PlexObject):
     CHOICES = {'opt_in', 'opt_out', 'opt_out_managed'}
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.key = data.attrib.get('key')
         self.value = data.attrib.get('value')
 
@@ -1995,6 +2566,7 @@ def __repr__(self):
         return f'<{self.__class__.__name__}:{self.ratingKey}>'
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
         self.ratingKey = data.attrib.get('ratingKey')
         self.type = data.attrib.get('type')
@@ -2024,7 +2596,7 @@ class GeoLocation(PlexObject):
     TAG = 'location'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.city = data.attrib.get('city')
         self.code = data.attrib.get('code')
         self.continentCode = data.attrib.get('continent_code')
diff --git a/libs/plexapi/photo.py b/libs/plexapi/photo.py
index 4347f31a87..7f4658f52e 100644
--- a/libs/plexapi/photo.py
+++ b/libs/plexapi/photo.py
@@ -1,24 +1,16 @@
-# -*- coding: utf-8 -*-
 import os
 from pathlib import Path
 from urllib.parse import quote_plus
 
 from plexapi import media, utils, video
-from plexapi.base import Playable, PlexPartialObject, PlexSession
+from plexapi.base import Playable, PlexPartialObject, PlexSession, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    RatingMixin,
-    ArtUrlMixin, ArtMixin, PosterUrlMixin, PosterMixin,
-    PhotoalbumEditMixins, PhotoEditMixins
-)
+from plexapi.mixins import PhotoalbumMixins, PhotoMixins
 
 
 @utils.registerPlexObject
 class Photoalbum(
-    PlexPartialObject,
-    RatingMixin,
-    ArtMixin, PosterMixin,
-    PhotoalbumEditMixins
+    PlexPartialObject, PhotoalbumMixins
 ):
     """ Represents a single Photoalbum (collection of photos).
 
@@ -56,9 +48,7 @@ def _loadData(self, data):
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
         self.art = data.attrib.get('art')
         self.composite = data.attrib.get('composite')
-        self.fields = self.findItems(data, media.Field)
         self.guid = data.attrib.get('guid')
-        self.images = self.findItems(data, media.Image)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = data.attrib.get('key', '').replace('/children', '')  # FIX_BUG_50
         self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
@@ -75,6 +65,14 @@ def _loadData(self, data):
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
         self.userRating = utils.cast(float, data.attrib.get('userRating'))
 
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
+
+    @cached_data_property
+    def images(self):
+        return self.findItems(self._data, media.Image)
+
     def album(self, title):
         """ Returns the :class:`~plexapi.photo.Photoalbum` that matches the specified title.
 
@@ -151,10 +149,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Photo(
-    PlexPartialObject, Playable,
-    RatingMixin,
-    ArtUrlMixin, PosterUrlMixin,
-    PhotoEditMixins
+    PlexPartialObject, Playable, PhotoMixins
 ):
     """ Represents a single Photo.
 
@@ -205,9 +200,7 @@ def _loadData(self, data):
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
         self.createdAtAccuracy = data.attrib.get('createdAtAccuracy')
         self.createdAtTZOffset = utils.cast(int, data.attrib.get('createdAtTZOffset'))
-        self.fields = self.findItems(data, media.Field)
         self.guid = data.attrib.get('guid')
-        self.images = self.findItems(data, media.Image)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = data.attrib.get('key', '')
         self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
@@ -215,7 +208,6 @@ def _loadData(self, data):
         self.librarySectionKey = data.attrib.get('librarySectionKey')
         self.librarySectionTitle = data.attrib.get('librarySectionTitle')
         self.listType = 'photo'
-        self.media = self.findItems(data, media.Media)
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
         self.parentGuid = data.attrib.get('parentGuid')
         self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
@@ -226,7 +218,6 @@ def _loadData(self, data):
         self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
         self.sourceURI = data.attrib.get('source')  # remote playlist item
         self.summary = data.attrib.get('summary')
-        self.tags = self.findItems(data, media.Tag)
         self.thumb = data.attrib.get('thumb')
         self.title = data.attrib.get('title')
         self.titleSort = data.attrib.get('titleSort', self.title)
@@ -235,6 +226,22 @@ def _loadData(self, data):
         self.userRating = utils.cast(float, data.attrib.get('userRating'))
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
+
+    @cached_data_property
+    def images(self):
+        return self.findItems(self._data, media.Image)
+
+    @cached_data_property
+    def media(self):
+        return self.findItems(self._data, media.Media)
+
+    @cached_data_property
+    def tags(self):
+        return self.findItems(self._data, media.Tag)
+
     def _prettyfilename(self):
         """ Returns a filename for use in download. """
         if self.parentTitle:
diff --git a/libs/plexapi/playlist.py b/libs/plexapi/playlist.py
index e2c4da635c..80dcb2dd78 100644
--- a/libs/plexapi/playlist.py
+++ b/libs/plexapi/playlist.py
@@ -1,23 +1,18 @@
-# -*- coding: utf-8 -*-
 import re
 from itertools import groupby
 from pathlib import Path
 from urllib.parse import quote_plus, unquote
 
 from plexapi import media, utils
-from plexapi.base import Playable, PlexPartialObject
+from plexapi.base import Playable, PlexPartialObject, cached_data_property
 from plexapi.exceptions import BadRequest, NotFound, Unsupported
 from plexapi.library import LibrarySection, MusicSection
-from plexapi.mixins import SmartFilterMixin, ArtMixin, PosterMixin, PlaylistEditMixins
-from plexapi.utils import deprecated
+from plexapi.mixins import PlaylistMixins
 
 
 @utils.registerPlexObject
 class Playlist(
-    PlexPartialObject, Playable,
-    SmartFilterMixin,
-    ArtMixin, PosterMixin,
-    PlaylistEditMixins
+    PlexPartialObject, Playable, PlaylistMixins
 ):
     """ Represents a single Playlist.
 
@@ -60,7 +55,6 @@ def _loadData(self, data):
         self.content = data.attrib.get('content')
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.durationInSeconds = utils.cast(int, data.attrib.get('durationInSeconds'))
-        self.fields = self.findItems(data, media.Field)
         self.guid = data.attrib.get('guid')
         self.icon = data.attrib.get('icon')
         self.key = data.attrib.get('key', '').replace('/items', '')  # FIX_BUG_50
@@ -77,9 +71,10 @@ def _loadData(self, data):
         self.titleSort = data.attrib.get('titleSort', self.title)
         self.type = data.attrib.get('type')
         self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self._items = None  # cache for self.items
-        self._section = None  # cache for self.section
-        self._filters = None  # cache for self.filters
+
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
 
     def __len__(self):  # pragma: no cover
         return len(self.items())
@@ -133,15 +128,36 @@ def _getPlaylistItemID(self, item):
                 return _item.playlistItemID
         raise NotFound(f'Item with title "{item.title}" not found in the playlist')
 
+    @cached_data_property
+    def _filters(self):
+        """ Cache for filters. """
+        return self._parseFilters(self.content)
+
     def filters(self):
         """ Returns the search filter dict for smart playlist.
             The filter dict be passed back into :func:`~plexapi.library.LibrarySection.search`
             to get the list of items.
         """
-        if self.smart and self._filters is None:
-            self._filters = self._parseFilters(self.content)
         return self._filters
 
+    @cached_data_property
+    def _section(self):
+        """ Cache for section. """
+        if not self.smart:
+            raise BadRequest('Regular playlists are not associated with a library.')
+
+        # Try to parse the library section from the content URI string
+        match = re.search(r'/library/sections/(\d+)/all', unquote(self.content or ''))
+        if match:
+            sectionKey = int(match.group(1))
+            return self._server.library.sectionByID(sectionKey)
+
+        # Try to get the library section from the first item in the playlist
+        if self.items():
+            return self.items()[0].section()
+
+        raise Unsupported('Unable to determine the library section')
+
     def section(self):
         """ Returns the :class:`~plexapi.library.LibrarySection` this smart playlist belongs to.
 
@@ -149,24 +165,6 @@ def section(self):
                 :class:`plexapi.exceptions.BadRequest`: When trying to get the section for a regular playlist.
                 :class:`plexapi.exceptions.Unsupported`: When unable to determine the library section.
         """
-        if not self.smart:
-            raise BadRequest('Regular playlists are not associated with a library.')
-
-        if self._section is None:
-            # Try to parse the library section from the content URI string
-            match = re.search(r'/library/sections/(\d+)/all', unquote(self.content or ''))
-            if match:
-                sectionKey = int(match.group(1))
-                self._section = self._server.library.sectionByID(sectionKey)
-                return self._section
-
-            # Try to get the library section from the first item in the playlist
-            if self.items():
-                self._section = self.items()[0].section()
-                return self._section
-
-            raise Unsupported('Unable to determine the library section')
-
         return self._section
 
     def item(self, title):
@@ -183,28 +181,32 @@ def item(self, title):
                 return item
         raise NotFound(f'Item with title "{title}" not found in the playlist')
 
-    def items(self):
-        """ Returns a list of all items in the playlist. """
+    @cached_data_property
+    def _items(self):
+        """ Cache for items. """
         if self.radio:
             return []
-        if self._items is None:
-            key = f'{self.key}/items'
-            items = self.fetchItems(key)
-
-            # Cache server connections to avoid reconnecting for each item
-            _servers = {}
-            for item in items:
-                if item.sourceURI:
-                    serverID = item.sourceURI.split('/')[2]
-                    if serverID not in _servers:
-                        try:
-                            _servers[serverID] = self._server.myPlexAccount().resource(serverID).connect()
-                        except NotFound:
-                            # Override the server connection with None if the server is not found
-                            _servers[serverID] = None
-                    item._server = _servers[serverID]
-
-            self._items = items
+
+        key = f'{self.key}/items'
+        items = self.fetchItems(key)
+
+        # Cache server connections to avoid reconnecting for each item
+        _servers = {}
+        for item in items:
+            if item.sourceURI:
+                serverID = item.sourceURI.split('/')[2]
+                if serverID not in _servers:
+                    try:
+                        _servers[serverID] = self._server.myPlexAccount().resource(serverID).connect()
+                    except NotFound:
+                        # Override the server connection with None if the server is not found
+                        _servers[serverID] = None
+                item._server = _servers[serverID]
+
+        return items
+
+    def items(self):
+        """ Returns a list of all items in the playlist. """
         return self._items
 
     def get(self, title):
@@ -246,10 +248,6 @@ def addItems(self, items):
 
         return self
 
-    @deprecated('use "removeItems" instead')
-    def removeItem(self, item):
-        self.removeItems(item)
-
     def removeItems(self, items):
         """ Remove items from the playlist.
 
@@ -338,21 +336,6 @@ def _edit(self, **kwargs):
         self._server.query(key, method=self._server._session.put)
         return self
 
-    @deprecated('use "editTitle" and "editSummary" instead')
-    def edit(self, title=None, summary=None):
-        """ Edit the playlist.
-
-            Parameters:
-                title (str, optional): The title of the playlist.
-                summary (str, optional): The summary of the playlist.
-        """
-        args = {}
-        if title:
-            args['title'] = title
-        if summary:
-            args['summary'] = summary
-        return self._edit(**args)
-
     def delete(self):
         """ Delete the playlist. """
         self._server.query(self.key, method=self._server._session.delete)
diff --git a/libs/plexapi/playqueue.py b/libs/plexapi/playqueue.py
index 9835c0dd2d..ede8ccb0fa 100644
--- a/libs/plexapi/playqueue.py
+++ b/libs/plexapi/playqueue.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 from urllib.parse import quote_plus
 
 from plexapi import utils
-from plexapi.base import PlexObject
+from plexapi.base import PlexObject, cached_data_property
 from plexapi.exceptions import BadRequest
 
 
@@ -36,7 +35,7 @@ class PlayQueue(PlexObject):
     TYPE = "playqueue"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.identifier = data.attrib.get("identifier")
         self.mediaTagPrefix = data.attrib.get("mediaTagPrefix")
         self.mediaTagVersion = utils.cast(int, data.attrib.get("mediaTagVersion"))
@@ -62,9 +61,12 @@ def _loadData(self, data):
         )
         self.playQueueVersion = utils.cast(int, data.attrib.get("playQueueVersion"))
         self.size = utils.cast(int, data.attrib.get("size", 0))
-        self.items = self.findItems(data)
         self.selectedItem = self[self.playQueueSelectedItemOffset]
 
+    @cached_data_property
+    def items(self):
+        return self.findItems(self._data)
+
     def __getitem__(self, key):
         if not self.items:
             return None
@@ -254,7 +256,7 @@ def addItem(self, item, playNext=False, refresh=True):
 
         path = f"/playQueues/{self.playQueueID}{utils.joinArgs(args)}"
         data = self._server.query(path, method=self._server._session.put)
-        self._loadData(data)
+        self._invalidateCacheAndLoadData(data)
         return self
 
     def moveItem(self, item, after=None, refresh=True):
@@ -283,7 +285,7 @@ def moveItem(self, item, after=None, refresh=True):
 
         path = f"/playQueues/{self.playQueueID}/items/{item.playQueueItemID}/move{utils.joinArgs(args)}"
         data = self._server.query(path, method=self._server._session.put)
-        self._loadData(data)
+        self._invalidateCacheAndLoadData(data)
         return self
 
     def removeItem(self, item, refresh=True):
@@ -301,19 +303,19 @@ def removeItem(self, item, refresh=True):
 
         path = f"/playQueues/{self.playQueueID}/items/{item.playQueueItemID}"
         data = self._server.query(path, method=self._server._session.delete)
-        self._loadData(data)
+        self._invalidateCacheAndLoadData(data)
         return self
 
     def clear(self):
         """Remove all items from the PlayQueue."""
         path = f"/playQueues/{self.playQueueID}/items"
         data = self._server.query(path, method=self._server._session.delete)
-        self._loadData(data)
+        self._invalidateCacheAndLoadData(data)
         return self
 
     def refresh(self):
         """Refresh the PlayQueue from the Plex server."""
         path = f"/playQueues/{self.playQueueID}"
         data = self._server.query(path, method=self._server._session.get)
-        self._loadData(data)
+        self._invalidateCacheAndLoadData(data)
         return self
diff --git a/libs/h11/tests/__init__.py b/libs/plexapi/py.typed
similarity index 100%
rename from libs/h11/tests/__init__.py
rename to libs/plexapi/py.typed
diff --git a/libs/plexapi/server.py b/libs/plexapi/server.py
index 1a1cf8355a..7f930562c3 100644
--- a/libs/plexapi/server.py
+++ b/libs/plexapi/server.py
@@ -1,15 +1,12 @@
-# -*- coding: utf-8 -*-
 import os
-from functools import cached_property
 from urllib.parse import urlencode
-from xml.etree import ElementTree
 
 import requests
 
 from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter
 from plexapi import utils
 from plexapi.alert import AlertListener
-from plexapi.base import PlexObject
+from plexapi.base import PlexObject, cached_data_property
 from plexapi.client import PlexClient
 from plexapi.collection import Collection
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized
@@ -18,7 +15,6 @@
 from plexapi.playlist import Playlist
 from plexapi.playqueue import PlayQueue
 from plexapi.settings import Settings
-from plexapi.utils import deprecated
 from requests.status_codes import _codes as codes
 
 # Need these imports to populate utils.PLEXOBJECTS
@@ -110,15 +106,11 @@ def __init__(self, baseurl=None, token=None, session=None, timeout=None):
         self._showSecrets = CONFIG.get('log.show_secrets', '').lower() == 'true'
         self._session = session or requests.Session()
         self._timeout = timeout or TIMEOUT
-        self._myPlexAccount = None   # cached myPlexAccount
-        self._systemAccounts = None   # cached list of SystemAccount
-        self._systemDevices = None   # cached list of SystemDevice
         data = self.query(self.key, timeout=self._timeout)
         super(PlexServer, self).__init__(self, data, self.key)
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.allowCameraUpload = utils.cast(bool, data.attrib.get('allowCameraUpload'))
         self.allowChannelAccess = utils.cast(bool, data.attrib.get('allowChannelAccess'))
         self.allowMediaDeletion = utils.cast(bool, data.attrib.get('allowMediaDeletion'))
@@ -172,7 +164,7 @@ def _headers(self, **kwargs):
     def _uriRoot(self):
         return f'server://{self.machineIdentifier}/com.plexapp.plugins.library'
 
-    @cached_property
+    @cached_data_property
     def library(self):
         """ Library to browse or search your media. """
         try:
@@ -183,7 +175,7 @@ def library(self):
             data = self.query('/library/sections/')
         return Library(self, data)
 
-    @cached_property
+    @cached_data_property
     def settings(self):
         """ Returns a list of all server settings. """
         data = self.query(Settings.key)
@@ -276,11 +268,14 @@ def switchUser(self, user, session=None, timeout=None):
             timeout = self._timeout
         return PlexServer(self._baseurl, token=userToken, session=session, timeout=timeout)
 
+    @cached_data_property
+    def _systemAccounts(self):
+        """ Cache for systemAccounts. """
+        key = '/accounts'
+        return self.fetchItems(key, SystemAccount)
+
     def systemAccounts(self):
         """ Returns a list of :class:`~plexapi.server.SystemAccount` objects this server contains. """
-        if self._systemAccounts is None:
-            key = '/accounts'
-            self._systemAccounts = self.fetchItems(key, SystemAccount)
         return self._systemAccounts
 
     def systemAccount(self, accountID):
@@ -294,11 +289,14 @@ def systemAccount(self, accountID):
         except StopIteration:
             raise NotFound(f'Unknown account with accountID={accountID}') from None
 
+    @cached_data_property
+    def _systemDevices(self):
+        """ Cache for systemDevices. """
+        key = '/devices'
+        return self.fetchItems(key, SystemDevice)
+
     def systemDevices(self):
         """ Returns a list of :class:`~plexapi.server.SystemDevice` objects this server contains. """
-        if self._systemDevices is None:
-            key = '/devices'
-            self._systemDevices = self.fetchItems(key, SystemDevice)
         return self._systemDevices
 
     def systemDevice(self, deviceID):
@@ -312,21 +310,24 @@ def systemDevice(self, deviceID):
         except StopIteration:
             raise NotFound(f'Unknown device with deviceID={deviceID}') from None
 
+    @cached_data_property
+    def _myPlexAccount(self):
+        """ Cache for myPlexAccount. """
+        from plexapi.myplex import MyPlexAccount
+        return MyPlexAccount(token=self._token, session=self._session)
+
     def myPlexAccount(self):
         """ Returns a :class:`~plexapi.myplex.MyPlexAccount` object using the same
             token to access this server. If you are not the owner of this PlexServer
             you're likely to receive an authentication error calling this.
         """
-        if self._myPlexAccount is None:
-            from plexapi.myplex import MyPlexAccount
-            self._myPlexAccount = MyPlexAccount(token=self._token, session=self._session)
         return self._myPlexAccount
 
     def _myPlexClientPorts(self):
         """ Sometimes the PlexServer does not properly advertise port numbers required
             to connect. This attempts to look up device port number from plex.tv.
             See issue #126: Make PlexServer.clients() more user friendly.
-              https://github.com/pkkid/python-plexapi/issues/126
+              https://github.com/pushingkarmaorg/python-plexapi/issues/126
         """
         try:
             ports = {}
@@ -610,10 +611,6 @@ def runButlerTask(self, task):
         self.query(f'/butler/{task}', method=self._session.post)
         return self
 
-    @deprecated('use "checkForUpdate" instead')
-    def check_for_update(self, force=True, download=False):
-        return self.checkForUpdate(force=force, download=download)
-
     def checkForUpdate(self, force=True, download=False):
         """ Returns a :class:`~plexapi.server.Release` object containing release info
             if an update is available or None if no update is available.
@@ -696,6 +693,7 @@ def playlists(self, playlistType=None, sectionId=None, title=None, sort=None, **
         if title is not None:
             args['title'] = title
         if sort is not None:
+            # TODO: Automatically retrieve and validate sort field similar to LibrarySection.search()
             args['sort'] = sort
 
         key = f'/playlists{utils.joinArgs(args)}'
@@ -724,15 +722,6 @@ def optimizedItems(self, removeAll=None):
             backgroundProcessing = self.fetchItem('/playlists?type=42')
             return self.fetchItems(f'{backgroundProcessing.key}/items', cls=Optimized)
 
-    @deprecated('use "plexapi.media.Optimized.items()" instead')
-    def optimizedItem(self, optimizedID):
-        """ Returns single queued optimized item :class:`~plexapi.media.Video` object.
-            Allows for using optimized item ID to connect back to source item.
-        """
-
-        backgroundProcessing = self.fetchItem('/playlists?type=42')
-        return self.fetchItem(f'{backgroundProcessing.key}/items/{optimizedID}/items')
-
     def conversions(self, pause=None):
         """ Returns list of all :class:`~plexapi.media.Conversion` objects connected to server. """
         if pause is True:
@@ -767,8 +756,7 @@ def query(self, key, method=None, headers=None, params=None, timeout=None, **kwa
                 raise NotFound(message)
             else:
                 raise BadRequest(message)
-        data = utils.cleanXMLString(response.text).encode('utf8')
-        return ElementTree.fromstring(data) if data.strip() else None
+        return utils.parseXMLString(response.text)
 
     def search(self, query, mediatype=None, limit=None, sectionId=None):
         """ Returns a list of media items or filter categories from the resulting
@@ -803,9 +791,9 @@ def search(self, query, mediatype=None, limit=None, sectionId=None):
         for hub in self.fetchItems(key, Hub):
             if mediatype:
                 if hub.type == mediatype:
-                    return hub.items
+                    return hub._partialItems
             else:
-                results += hub.items
+                results += hub._partialItems
         return results
 
     def continueWatching(self):
@@ -1071,7 +1059,6 @@ class Account(PlexObject):
             data (ElementTree): Response from PlexServer used to build this object (optional).
 
         Attributes:
-            authToken (str): Plex authentication token to access the server.
             mappingError (str): Unknown
             mappingErrorMessage (str): Unknown
             mappingState (str): Unknown
@@ -1092,8 +1079,7 @@ class Account(PlexObject):
     key = '/myplex/account'
 
     def _loadData(self, data):
-        self._data = data
-        self.authToken = data.attrib.get('authToken')
+        """ Load attribute values from Plex XML response. """
         self.username = data.attrib.get('username')
         self.mappingState = data.attrib.get('mappingState')
         self.mappingError = data.attrib.get('mappingError')
@@ -1113,7 +1099,7 @@ class Activity(PlexObject):
     key = '/activities'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.cancellable = utils.cast(bool, data.attrib.get('cancellable'))
         self.progress = utils.cast(int, data.attrib.get('progress'))
         self.title = data.attrib.get('title')
@@ -1128,6 +1114,7 @@ class Release(PlexObject):
     key = '/updater/status'
 
     def _loadData(self, data):
+        """ Load attribute values from Plex XML response. """
         self.download_key = data.attrib.get('key')
         self.version = data.attrib.get('version')
         self.added = data.attrib.get('added')
@@ -1153,7 +1140,7 @@ class SystemAccount(PlexObject):
     TAG = 'Account'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.autoSelectAudio = utils.cast(bool, data.attrib.get('autoSelectAudio'))
         self.defaultAudioLanguage = data.attrib.get('defaultAudioLanguage')
         self.defaultSubtitleLanguage = data.attrib.get('defaultSubtitleLanguage')
@@ -1182,7 +1169,7 @@ class SystemDevice(PlexObject):
     TAG = 'Device'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.clientIdentifier = data.attrib.get('clientIdentifier')
         self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
         self.id = utils.cast(int, data.attrib.get('id'))
@@ -1208,7 +1195,7 @@ class StatisticsBandwidth(PlexObject):
     TAG = 'StatisticsBandwidth'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.accountID = utils.cast(int, data.attrib.get('accountID'))
         self.at = utils.toDatetime(data.attrib.get('at'))
         self.bytes = utils.cast(int, data.attrib.get('bytes'))
@@ -1250,7 +1237,7 @@ class StatisticsResources(PlexObject):
     TAG = 'StatisticsResources'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.at = utils.toDatetime(data.attrib.get('at'))
         self.hostCpuUtilization = utils.cast(float, data.attrib.get('hostCpuUtilization'))
         self.hostMemoryUtilization = utils.cast(float, data.attrib.get('hostMemoryUtilization'))
@@ -1278,7 +1265,7 @@ class ButlerTask(PlexObject):
     TAG = 'ButlerTask'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.description = data.attrib.get('description')
         self.enabled = utils.cast(bool, data.attrib.get('enabled'))
         self.interval = utils.cast(int, data.attrib.get('interval'))
@@ -1300,7 +1287,7 @@ def __repr__(self):
         return f"<{self.__class__.__name__}:{self.machineIdentifier}>"
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.claimed = utils.cast(bool, data.attrib.get('claimed'))
         self.machineIdentifier = data.attrib.get('machineIdentifier')
         self.version = data.attrib.get('version')
diff --git a/libs/plexapi/settings.py b/libs/plexapi/settings.py
index c191e36896..80b836be7b 100644
--- a/libs/plexapi/settings.py
+++ b/libs/plexapi/settings.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from collections import defaultdict
 from urllib.parse import quote
 
@@ -34,11 +33,10 @@ def __setattr__(self, attr, value):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         for elem in data:
             id = utils.lowerFirst(elem.attrib['id'])
             if id in self._settings:
-                self._settings[id]._loadData(elem)
+                self._settings[id]._invalidateCacheAndLoadData(elem)
                 continue
             self._settings[id] = Setting(self._server, elem, self._initpath)
 
diff --git a/libs/plexapi/sonos.py b/libs/plexapi/sonos.py
index 8f1295f440..47d44b1a0d 100644
--- a/libs/plexapi/sonos.py
+++ b/libs/plexapi/sonos.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import requests
 
 from plexapi import CONFIG, X_PLEX_IDENTIFIER, TIMEOUT
@@ -47,7 +46,6 @@ class PlexSonosClient(PlexClient):
     """
 
     def __init__(self, account, data, timeout=None):
-        self._data = data
         self.deviceClass = data.attrib.get("deviceClass")
         self.machineIdentifier = data.attrib.get("machineIdentifier")
         self.product = data.attrib.get("product")
@@ -67,6 +65,7 @@ def __init__(self, account, data, timeout=None):
         self._proxyThroughServer = False
         self._showSecrets = CONFIG.get("log.show_secrets", "").lower() == "true"
         self._timeout = timeout or TIMEOUT
+        self._timeline_cache_timestamp = 0
 
     def playMedia(self, media, offset=0, **params):
 
diff --git a/libs/plexapi/sync.py b/libs/plexapi/sync.py
index f57e89d964..49612588b0 100644
--- a/libs/plexapi/sync.py
+++ b/libs/plexapi/sync.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 You can work with Mobile Sync on other devices straight away, but if you'd like to use your app as a `sync-target` (when
 you can set items to be synced to your app) you need to init some variables.
@@ -63,7 +62,7 @@ def __init__(self, server, data, initpath=None, clientIdentifier=None):
         self.clientIdentifier = clientIdentifier
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.id = plexapi.utils.cast(int, data.attrib.get('id'))
         self.version = plexapi.utils.cast(int, data.attrib.get('version'))
         self.rootTitle = data.attrib.get('rootTitle')
@@ -118,7 +117,7 @@ class SyncList(PlexObject):
     TAG = 'SyncList'
 
     def _loadData(self, data):
-        self._data = data
+        """ Load attribute values from Plex XML response. """
         self.clientId = data.attrib.get('clientIdentifier')
         self.items = []
 
diff --git a/libs/plexapi/utils.py b/libs/plexapi/utils.py
index dd1cfc9ce8..4c14a0f9e6 100644
--- a/libs/plexapi/utils.py
+++ b/libs/plexapi/utils.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import base64
 import functools
 import json
@@ -9,6 +8,7 @@
 import sys
 import time
 import unicodedata
+import uuid
 import warnings
 import zipfile
 from collections import deque
@@ -17,12 +17,12 @@
 from hashlib import sha1
 from threading import Event, Thread
 from urllib.parse import quote
+from xml.etree import ElementTree
 
 import requests
 from requests.status_codes import _codes as codes
 
 from plexapi.exceptions import BadRequest, NotFound, Unauthorized
-
 try:
     from tqdm import tqdm
 except ImportError:
@@ -80,6 +80,7 @@
     'mood': 300,
     'style': 301,
     'format': 302,
+    'subformat': 303,
     'similar': 305,
     'concert': 306,
     'banner': 311,
@@ -92,7 +93,10 @@
     'network': 319,
     'showOrdering': 322,
     'clearLogo': 323,
+    'commonSenseMedia': 324,
+    'squareArt': 325,
     'place': 400,
+    'sharedWidth': 500,
 }
 REVERSETAGTYPES = {v: k for k, v in TAGTYPES.items()}
 
@@ -532,18 +536,22 @@ def getMyPlexAccount(opts=None):  # pragma: no cover
     return MyPlexAccount(username, password)
 
 
-def createMyPlexDevice(headers, account, timeout=10):  # pragma: no cover
+def createMyPlexDevice(headers=None, account=None, timeout=10):  # pragma: no cover
     """ Helper function to create a new MyPlexDevice. Returns a new MyPlexDevice instance.
 
         Parameters:
             headers (dict): Provide the X-Plex- headers for the new device.
-                A unique X-Plex-Client-Identifier is required.
+                A unique X-Plex-Client-Identifier is required or one will be generated if not provided.
             account (MyPlexAccount): The Plex account to create the device on.
             timeout (int): Timeout in seconds to wait for device login.
     """
     from plexapi.myplex import MyPlexPinLogin
 
-    if 'X-Plex-Client-Identifier' not in headers:
+    if not headers:
+        client_identifier = generateUUID()
+        headers = {'X-Plex-Client-Identifier': client_identifier}
+        print(f'No X-Plex-Client-Identifier provided, generated: {client_identifier}')
+    elif 'X-Plex-Client-Identifier' not in headers:
         raise BadRequest('The X-Plex-Client-Identifier header is required.')
 
     clientIdentifier = headers['X-Plex-Client-Identifier']
@@ -561,19 +569,22 @@ def plexOAuth(headers, forwardUrl=None, timeout=120):  # pragma: no cover
 
         Parameters:
             headers (dict): Provide the X-Plex- headers for the new device.
-                A unique X-Plex-Client-Identifier is required.
+                A unique X-Plex-Client-Identifier is required or one will be generated if not provided.
             forwardUrl (str, optional): The url to redirect the client to after login.
-            timeout (int, optional): Timeout in seconds to wait for device login. Default 120 seconds.
+            timeout (int, optional): Timeout in seconds to wait for user login. Default 120 seconds.
     """
     from plexapi.myplex import MyPlexAccount, MyPlexPinLogin
 
-    if 'X-Plex-Client-Identifier' not in headers:
+    if not headers:
+        client_identifier = generateUUID()
+        headers = {'X-Plex-Client-Identifier': client_identifier}
+        print(f'No X-Plex-Client-Identifier provided, generated: {client_identifier}')
+    elif 'X-Plex-Client-Identifier' not in headers:
         raise BadRequest('The X-Plex-Client-Identifier header is required.')
 
     pinlogin = MyPlexPinLogin(headers=headers, oauth=True)
-    print('Login to Plex at the following url:')
-    print(pinlogin.oauthUrl(forwardUrl))
     pinlogin.run(timeout=timeout)
+    print(f'Login to Plex at the following url:\n{pinlogin.oauthUrl(forwardUrl=forwardUrl)}')
     pinlogin.waitForLogin()
 
     if pinlogin.token:
@@ -583,6 +594,44 @@ def plexOAuth(headers, forwardUrl=None, timeout=120):  # pragma: no cover
         print('Login failed.')
 
 
+def plexJWTAuth(headers=None, forwardUrl=None, timeout=120, keypair=(None, None), scopes=None):  # pragma: no cover
+    """ Helper function for Plex JWT authentication using Plex OAuth. Returns a new MyPlexAccount instance.
+
+        Parameters:
+            headers (dict, optional): Provide the X-Plex- headers for the new device.
+                A unique X-Plex-Client-Identifier is required or one will be generated if not provided.
+            forwardUrl (str, optional): The url to redirect the client to after login.
+            timeout (int, optional): Timeout in seconds to wait for user login. Default 120 seconds.
+            keypair (tuple, optional): A tuple of the ED25519 (privateKey, publicKey) to use for signing the JWT.
+                If not provided, a new keypair will be generated and saved to 'private.key' and 'public.key'.
+            scopes (list[str], optional): List of scopes to request in the JWT.
+    """
+    from plexapi.myplex import MyPlexAccount, MyPlexJWTLogin
+
+    if not headers:
+        client_identifier = generateUUID()
+        headers = {'X-Plex-Client-Identifier': client_identifier}
+        print(f'No X-Plex-Client-Identifier provided, generated: {client_identifier}')
+    elif 'X-Plex-Client-Identifier' not in headers:
+        raise BadRequest('The X-Plex-Client-Identifier header is required.')
+
+    jwtlogin = MyPlexJWTLogin(headers=headers, oauth=True, keypair=keypair, scopes=scopes)
+
+    if not keypair[0] or not keypair[1]:
+        jwtlogin.generateKeypair(keyfiles=('private.key', 'public.key'))
+        print('Generated new ED25519 keypair and saved to "private.key" and "public.key".')
+
+    jwtlogin.run(timeout=timeout)
+    print(f'Login to Plex at the following url:\n{jwtlogin.oauthUrl(forwardUrl=forwardUrl)}')
+    jwtlogin.waitForLogin()
+
+    if jwtlogin.jwtToken:
+        print('JWT authentication successful!')
+        return MyPlexAccount(token=jwtlogin.jwtToken)
+    else:
+        print('JWT authentication failed.')
+
+
 def choose(msg, items, attr):  # pragma: no cover
     """ Command line helper to display a list of choices, asking the
         user to choose one of the options.
@@ -625,6 +674,10 @@ def base64str(text):
     return base64.b64encode(text.encode('utf-8')).decode('utf-8')
 
 
+def base64urlEncode(data: bytes) -> str:
+    return base64.urlsafe_b64encode(data).rstrip(b'=').decode('utf-8')
+
+
 def deprecated(message, stacklevel=2):
     def decorator(func):
         """This is a decorator which can be used to mark functions
@@ -667,6 +720,8 @@ def serialize(obj):
 
 
 def openOrRead(file):
+    if isinstance(file, bytes):
+        return file
     if hasattr(file, 'read'):
         return file.read()
     with open(file, 'rb') as f:
@@ -718,3 +773,18 @@ def sha1hash(guid):
 
 def cleanXMLString(s):
     return _illegal_XML_re.sub('', s)
+
+
+def parseXMLString(s: str):
+    """ Parse an XML string and return an ElementTree object. """
+    if not s.strip():
+        return None
+    try:  # Attempt to parse the string as-is without cleaning (which is expensive)
+        return ElementTree.fromstring(s.encode('utf-8'))
+    except ElementTree.ParseError:  # If it fails, clean the string and try again
+        cleaned_s = cleanXMLString(s).encode('utf-8')
+        return ElementTree.fromstring(cleaned_s) if cleaned_s.strip() else None
+
+
+def generateUUID() -> str:
+    return str(uuid.uuid4())
diff --git a/libs/plexapi/video.py b/libs/plexapi/video.py
index 9e4201b884..a418908fd3 100644
--- a/libs/plexapi/video.py
+++ b/libs/plexapi/video.py
@@ -1,18 +1,11 @@
-# -*- coding: utf-8 -*-
 import os
-from functools import cached_property
 from pathlib import Path
 from urllib.parse import quote_plus
 
 from plexapi import media, utils
-from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession
+from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession, cached_data_property
 from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, PlayedUnplayedMixin, RatingMixin,
-    ArtUrlMixin, ArtMixin, LogoMixin, PosterUrlMixin, PosterMixin, ThemeUrlMixin, ThemeMixin,
-    MovieEditMixins, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins,
-    WatchlistMixin
-)
+from plexapi.mixins import MovieMixins, ShowMixins, SeasonMixins, EpisodeMixins, ClipMixins, PlayedUnplayedMixin
 
 
 class Video(PlexPartialObject, PlayedUnplayedMixin):
@@ -48,13 +41,10 @@ class Video(PlexPartialObject, PlayedUnplayedMixin):
 
     def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
-        self._data = data
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
         self.art = data.attrib.get('art')
         self.artBlurHash = data.attrib.get('artBlurHash')
-        self.fields = self.findItems(data, media.Field)
         self.guid = data.attrib.get('guid')
-        self.images = self.findItems(data, media.Image)
         self.key = data.attrib.get('key', '')
         self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
         self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
@@ -73,6 +63,14 @@ def _loadData(self, data):
         self.userRating = utils.cast(float, data.attrib.get('userRating'))
         self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
 
+    @cached_data_property
+    def fields(self):
+        return self.findItems(self._data, media.Field)
+
+    @cached_data_property
+    def images(self):
+        return self.findItems(self._data, media.Image)
+
     def url(self, part):
         """ Returns the full url for something. Typically used for getting a specific image. """
         return self._server.url(part, includeToken=True) if part else None
@@ -332,11 +330,7 @@ def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=F
 
 @utils.registerPlexObject
 class Movie(
-    Video, Playable,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeMixin,
-    MovieEditMixins,
-    WatchlistMixin
+    Video, Playable, MovieMixins
 ):
     """ Represents a single Movie.
 
@@ -345,11 +339,12 @@ class Movie(
             TYPE (str): 'movie'
             audienceRating (float): Audience rating (usually from Rotten Tomatoes).
             audienceRatingImage (str): Key to audience rating image (rottentomatoes://image.rating.spilled).
-            chapters (List<:class:`~plexapi.media.Chapter`>): List of Chapter objects.
+            chapters (List<:class:`~plexapi.media.Chapter`>): List of chapter objects.
             chapterSource (str): Chapter source (agent; media; mixed).
             collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            commonSenseMedia (:class:`~plexapi.media.CommonSenseMedia`): Common Sense Media object.
             contentRating (str) Content rating (PG-13; NR; TV-G).
-            countries (List<:class:`~plexapi.media.Country`>): List of countries objects.
+            countries (List<:class:`~plexapi.media.Country`>): List of country objects.
             directors (List<:class:`~plexapi.media.Director`>): List of director objects.
             duration (int): Duration of the movie in milliseconds.
             editionTitle (str): The edition title of the movie (e.g. Director's Cut, Extended Edition, etc.).
@@ -394,41 +389,90 @@ def _loadData(self, data):
         Playable._loadData(self, data)
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
         self.audienceRatingImage = data.attrib.get('audienceRatingImage')
-        self.chapters = self.findItems(data, media.Chapter)
         self.chapterSource = data.attrib.get('chapterSource')
-        self.collections = self.findItems(data, media.Collection)
         self.contentRating = data.attrib.get('contentRating')
-        self.countries = self.findItems(data, media.Country)
-        self.directors = self.findItems(data, media.Director)
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.editionTitle = data.attrib.get('editionTitle')
         self.enableCreditsMarkerGeneration = utils.cast(int, data.attrib.get('enableCreditsMarkerGeneration', '-1'))
-        self.genres = self.findItems(data, media.Genre)
-        self.guids = self.findItems(data, media.Guid)
-        self.labels = self.findItems(data, media.Label)
         self.languageOverride = data.attrib.get('languageOverride')
-        self.markers = self.findItems(data, media.Marker)
-        self.media = self.findItems(data, media.Media)
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
         self.originalTitle = data.attrib.get('originalTitle')
         self.primaryExtraKey = data.attrib.get('primaryExtraKey')
-        self.producers = self.findItems(data, media.Producer)
         self.rating = utils.cast(float, data.attrib.get('rating'))
         self.ratingImage = data.attrib.get('ratingImage')
-        self.ratings = self.findItems(data, media.Rating)
-        self.roles = self.findItems(data, media.Role)
         self.slug = data.attrib.get('slug')
-        self.similar = self.findItems(data, media.Similar)
         self.sourceURI = data.attrib.get('source')  # remote playlist item
         self.studio = data.attrib.get('studio')
         self.tagline = data.attrib.get('tagline')
         self.theme = data.attrib.get('theme')
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
         self.useOriginalTitle = utils.cast(int, data.attrib.get('useOriginalTitle', '-1'))
         self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.writers = self.findItems(data, media.Writer)
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def chapters(self):
+        return self.findItems(self._data, media.Chapter)
+
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def commonSenseMedia(self):
+        return self.findItem(self._data, media.CommonSenseMedia)
+
+    @cached_data_property
+    def countries(self):
+        return self.findItems(self._data, media.Country)
+
+    @cached_data_property
+    def directors(self):
+        return self.findItems(self._data, media.Director)
+
+    @cached_data_property
+    def genres(self):
+        return self.findItems(self._data, media.Genre)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def markers(self):
+        return self.findItems(self._data, media.Marker)
+
+    @cached_data_property
+    def media(self):
+        return self.findItems(self._data, media.Media)
+
+    @cached_data_property
+    def producers(self):
+        return self.findItems(self._data, media.Producer)
+
+    @cached_data_property
+    def ratings(self):
+        return self.findItems(self._data, media.Rating)
+
+    @cached_data_property
+    def roles(self):
+        return self.findItems(self._data, media.Role)
+
+    @cached_data_property
+    def similar(self):
+        return self.findItems(self._data, media.Similar)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
+
+    @cached_data_property
+    def writers(self):
+        return self.findItems(self._data, media.Writer)
+
     @property
     def actors(self):
         """ Alias to self.roles. """
@@ -494,11 +538,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Show(
-    Video,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeMixin,
-    ShowEditMixins,
-    WatchlistMixin
+    Video, ShowMixins
 ):
     """ Represents a single Show (including all seasons and episodes).
 
@@ -517,6 +557,7 @@ class Show(
                 100 = On next refresh).
             childCount (int): Number of seasons (including Specials) in the show.
             collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
+            commonSenseMedia (:class:`~plexapi.media.CommonSenseMedia`): Common Sense Media object.
             contentRating (str) Content rating (PG-13; NR; TV-G).
             duration (int): Typical duration of the show episodes in milliseconds.
             enableCreditsMarkerGeneration (int): Setting that indicates if credits markers detection is enabled.
@@ -573,40 +614,71 @@ def _loadData(self, data):
         self.autoDeletionItemPolicyWatchedLibrary = utils.cast(
             int, data.attrib.get('autoDeletionItemPolicyWatchedLibrary', '0'))
         self.childCount = utils.cast(int, data.attrib.get('childCount'))
-        self.collections = self.findItems(data, media.Collection)
         self.contentRating = data.attrib.get('contentRating')
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.enableCreditsMarkerGeneration = utils.cast(int, data.attrib.get('enableCreditsMarkerGeneration', '-1'))
         self.episodeSort = utils.cast(int, data.attrib.get('episodeSort', '-1'))
         self.flattenSeasons = utils.cast(int, data.attrib.get('flattenSeasons', '-1'))
-        self.genres = self.findItems(data, media.Genre)
-        self.guids = self.findItems(data, media.Guid)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.labels = self.findItems(data, media.Label)
         self.languageOverride = data.attrib.get('languageOverride')
         self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
-        self.locations = self.listAttrs(data, 'path', etag='Location')
         self.network = data.attrib.get('network')
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
         self.originalTitle = data.attrib.get('originalTitle')
         self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.ratings = self.findItems(data, media.Rating)
-        self.roles = self.findItems(data, media.Role)
         self.seasonCount = utils.cast(int, data.attrib.get('seasonCount', self.childCount))
         self.showOrdering = data.attrib.get('showOrdering')
-        self.similar = self.findItems(data, media.Similar)
         self.slug = data.attrib.get('slug')
         self.studio = data.attrib.get('studio')
         self.subtitleLanguage = data.attrib.get('subtitleLanguage', '')
         self.subtitleMode = utils.cast(int, data.attrib.get('subtitleMode', '-1'))
         self.tagline = data.attrib.get('tagline')
         self.theme = data.attrib.get('theme')
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
         self.useOriginalTitle = utils.cast(int, data.attrib.get('useOriginalTitle', '-1'))
         self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def commonSenseMedia(self):
+        return self.findItem(self._data, media.CommonSenseMedia)
+
+    @cached_data_property
+    def genres(self):
+        return self.findItems(self._data, media.Genre)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def locations(self):
+        return self.listAttrs(self._data, 'path', etag='Location')
+
+    @cached_data_property
+    def ratings(self):
+        return self.findItems(self._data, media.Rating)
+
+    @cached_data_property
+    def roles(self):
+        return self.findItems(self._data, media.Role)
+
+    @cached_data_property
+    def similar(self):
+        return self.findItems(self._data, media.Similar)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
+
     def __iter__(self):
         for season in self.seasons():
             yield season
@@ -714,10 +786,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Season(
-    Video,
-    AdvancedSettingsMixin, ExtrasMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeUrlMixin,
-    SeasonEditMixins
+    Video, SeasonMixins
 ):
     """ Represents a single Season.
 
@@ -759,11 +828,8 @@ def _loadData(self, data):
         Video._loadData(self, data)
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
         self.audioLanguage = data.attrib.get('audioLanguage', '')
-        self.collections = self.findItems(data, media.Collection)
-        self.guids = self.findItems(data, media.Guid)
         self.index = utils.cast(int, data.attrib.get('index'))
         self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.labels = self.findItems(data, media.Label)
         self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
         self.parentGuid = data.attrib.get('parentGuid')
         self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
@@ -775,13 +841,31 @@ def _loadData(self, data):
         self.parentThumb = data.attrib.get('parentThumb')
         self.parentTitle = data.attrib.get('parentTitle')
         self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.ratings = self.findItems(data, media.Rating)
         self.subtitleLanguage = data.attrib.get('subtitleLanguage', '')
         self.subtitleMode = utils.cast(int, data.attrib.get('subtitleMode', '-1'))
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
         self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def ratings(self):
+        return self.findItems(self._data, media.Rating)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
+
     def __iter__(self):
         for episode in self.episodes():
             yield episode
@@ -881,10 +965,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Episode(
-    Video, Playable,
-    ExtrasMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeUrlMixin,
-    EpisodeEditMixins
+    Video, Playable, EpisodeMixins
 ):
     """ Represents a single Episode.
 
@@ -893,7 +974,7 @@ class Episode(
             TYPE (str): 'episode'
             audienceRating (float): Audience rating (TMDB or TVDB).
             audienceRatingImage (str): Key to audience rating image (tmdb://image.rating).
-            chapters (List<:class:`~plexapi.media.Chapter`>): List of Chapter objects.
+            chapters (List<:class:`~plexapi.media.Chapter`>): List of chapter objects.
             chapterSource (str): Chapter source (agent; media; mixed).
             collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
             contentRating (str) Content rating (PG-13; NR; TV-G).
@@ -942,11 +1023,8 @@ def _loadData(self, data):
         Playable._loadData(self, data)
         self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
         self.audienceRatingImage = data.attrib.get('audienceRatingImage')
-        self.chapters = self.findItems(data, media.Chapter)
         self.chapterSource = data.attrib.get('chapterSource')
-        self.collections = self.findItems(data, media.Collection)
         self.contentRating = data.attrib.get('contentRating')
-        self.directors = self.findItems(data, media.Director)
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.grandparentArt = data.attrib.get('grandparentArt')
         self.grandparentGuid = data.attrib.get('grandparentGuid')
@@ -956,25 +1034,16 @@ def _loadData(self, data):
         self.grandparentTheme = data.attrib.get('grandparentTheme')
         self.grandparentThumb = data.attrib.get('grandparentThumb')
         self.grandparentTitle = data.attrib.get('grandparentTitle')
-        self.guids = self.findItems(data, media.Guid)
         self.index = utils.cast(int, data.attrib.get('index'))
-        self.labels = self.findItems(data, media.Label)
-        self.markers = self.findItems(data, media.Marker)
-        self.media = self.findItems(data, media.Media)
         self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
         self.parentGuid = data.attrib.get('parentGuid')
         self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
         self.parentTitle = data.attrib.get('parentTitle')
         self.parentYear = utils.cast(int, data.attrib.get('parentYear'))
-        self.producers = self.findItems(data, media.Producer)
         self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.ratings = self.findItems(data, media.Rating)
-        self.roles = self.findItems(data, media.Role)
         self.skipParent = utils.cast(bool, data.attrib.get('skipParent', '0'))
         self.sourceURI = data.attrib.get('source')  # remote playlist item
-        self.ultraBlurColors = self.findItem(data, media.UltraBlurColors)
         self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.writers = self.findItems(data, media.Writer)
         self.year = utils.cast(int, data.attrib.get('year'))
 
         # If seasons are hidden, parentKey and parentRatingKey are missing from the XML response.
@@ -984,7 +1053,55 @@ def _loadData(self, data):
         self._parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
         self._parentThumb = data.attrib.get('parentThumb')
 
-    @cached_property
+    @cached_data_property
+    def chapters(self):
+        return self.findItems(self._data, media.Chapter)
+
+    @cached_data_property
+    def collections(self):
+        return self.findItems(self._data, media.Collection)
+
+    @cached_data_property
+    def directors(self):
+        return self.findItems(self._data, media.Director)
+
+    @cached_data_property
+    def guids(self):
+        return self.findItems(self._data, media.Guid)
+
+    @cached_data_property
+    def labels(self):
+        return self.findItems(self._data, media.Label)
+
+    @cached_data_property
+    def markers(self):
+        return self.findItems(self._data, media.Marker)
+
+    @cached_data_property
+    def media(self):
+        return self.findItems(self._data, media.Media)
+
+    @cached_data_property
+    def producers(self):
+        return self.findItems(self._data, media.Producer)
+
+    @cached_data_property
+    def ratings(self):
+        return self.findItems(self._data, media.Rating)
+
+    @cached_data_property
+    def roles(self):
+        return self.findItems(self._data, media.Role)
+
+    @cached_data_property
+    def writers(self):
+        return self.findItems(self._data, media.Writer)
+
+    @cached_data_property
+    def ultraBlurColors(self):
+        return self.findItem(self._data, media.UltraBlurColors)
+
+    @cached_data_property
     def parentKey(self):
         """ Returns the parentKey. Refer to the Episode attributes. """
         if self._parentKey:
@@ -993,7 +1110,7 @@ def parentKey(self):
             return f'/library/metadata/{self.parentRatingKey}'
         return None
 
-    @cached_property
+    @cached_data_property
     def parentRatingKey(self):
         """ Returns the parentRatingKey. Refer to the Episode attributes. """
         if self._parentRatingKey is not None:
@@ -1006,7 +1123,7 @@ def parentRatingKey(self):
             return self._season.ratingKey
         return None
 
-    @cached_property
+    @cached_data_property
     def parentThumb(self):
         """ Returns the parentThumb. Refer to the Episode attributes. """
         if self._parentThumb:
@@ -1015,7 +1132,7 @@ def parentThumb(self):
             return self._season.thumb
         return None
 
-    @cached_property
+    @cached_data_property
     def _season(self):
         """ Returns the :class:`~plexapi.video.Season` object by querying for the show's children. """
         if self.grandparentKey and self.parentIndex is not None:
@@ -1055,7 +1172,7 @@ def episodeNumber(self):
         """ Returns the episode number. """
         return self.index
 
-    @cached_property
+    @cached_data_property
     def seasonNumber(self):
         """ Returns the episode's season number. """
         if isinstance(self.parentIndex, int):
@@ -1122,8 +1239,7 @@ def metadataDirectory(self):
 
 @utils.registerPlexObject
 class Clip(
-    Video, Playable,
-    ArtUrlMixin, PosterUrlMixin
+    Video, Playable, ClipMixins
 ):
     """ Represents a single Clip.
 
@@ -1149,12 +1265,10 @@ def _loadData(self, data):
         """ Load attribute values from Plex XML response. """
         Video._loadData(self, data)
         Playable._loadData(self, data)
-        self._data = data
         self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
         self.duration = utils.cast(int, data.attrib.get('duration'))
         self.extraType = utils.cast(int, data.attrib.get('extraType'))
         self.index = utils.cast(int, data.attrib.get('index'))
-        self.media = self.findItems(data, media.Media)
         self.originallyAvailableAt = utils.toDatetime(
             data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
         self.skipDetails = utils.cast(int, data.attrib.get('skipDetails'))
@@ -1163,6 +1277,10 @@ def _loadData(self, data):
         self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
         self.year = utils.cast(int, data.attrib.get('year'))
 
+    @cached_data_property
+    def media(self):
+        return self.findItems(self._data, media.Media)
+
     @property
     def locations(self):
         """ This does not exist in plex xml response but is added to have a common
diff --git a/libs/pycountry-24.6.1.dist-info/METADATA b/libs/pycountry-24.6.1.dist-info/METADATA
deleted file mode 100644
index 67e077ff23..0000000000
--- a/libs/pycountry-24.6.1.dist-info/METADATA
+++ /dev/null
@@ -1,410 +0,0 @@
-Metadata-Version: 2.1
-Name: pycountry
-Version: 24.6.1
-Summary: ISO country, subdivision, language, currency and script definitions and their translations
-Home-page: https://github.com/flyingcircusio/pycountry
-License: LGPL-2.1-only
-Keywords: country,subdivision,language,currency,iso,3166,639,4217,15924,3166-1,3166-2,3166-3
-Author: Christian Theune
-Author-email: ct@flyingcircus.io
-Maintainer: Nate Schimmoller
-Maintainer-email: nschimmo@gmail.com
-Requires-Python: >=3.8
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development :: Internationalization
-Classifier: Topic :: Software Development :: Localization
-Requires-Dist: importlib-resources (>5.12.0) ; python_version < "3.9"
-Project-URL: Repository, https://github.com/flyingcircusio/pycountry
-Description-Content-Type: text/x-rst
-
-###########
- pycountry
-###########
-
-..
-   image:g: https://travis-ci.org/flyingcircusio/pycountry.svg?branch=master
-
-pycountry provides the ISO databases for the standards:
-
--  `639-3 <https://en.wikipedia.org/wiki/ISO_639-3>`_ Languages
--  `3166 <https://en.wikipedia.org/wiki/ISO_3166>`_ Codes for
-   representation of names of countries and their subdivisions
--  `3166-1 <https://en.wikipedia.org/wiki/ISO_3166-1>`_ Countries
--  `3166-3 <https://en.wikipedia.org/wiki/ISO_3166-3>`_ Deleted
-   countries
--  `3166-2 <https://en.wikipedia.org/wiki/ISO_3166-2>`_ Subdivisions of
-   countries
--  `4217 <https://en.wikipedia.org/wiki/ISO_4217>`_ Currencies
--  `15924 <https://en.wikipedia.org/wiki/ISO_15924>`_ Scripts
-
-The package includes a copy from Debian's `pkg-isocodes
-<https://salsa.debian.org/iso-codes-team/iso-codes>`_ and makes the data
-accessible through a Python API.
-
-Translation files for the various strings are included as well.
-
-********************
- Data update policy
-********************
-
-No changes to the data will be accepted into pycountry. This is a pure
-wrapper around the ISO standard using the ``pkg-isocodes`` database from
-Debian *as is*. If you need changes to the political situation in the
-world, please talk to the ISO or Debian people, not me.
-
-******************************
- Donations / Monetary Support
-******************************
-
-This is a small project that I maintain in my personal time. I am not
-interested in personal financial gain. However, if you would like to
-support the project then I would love if you would donate to `Feminist
-Frequency <https://feministfrequency.com/donate/>`_ instead. Also, let
-the world know you did so, so that others can follow your path.
-
-***************
- Contributions
-***************
-
-The code lives in a `git repository on GitHub
-<https://github.com/pycountry/pycountry>`_, and issues must be reported
-in there as well.
-
-************************
- Countries (ISO 3166-1)
-************************
-
-Countries are accessible through a database object that is already
-configured upon import of pycountry and works as an iterable:
-
-.. code:: pycon
-
-   >>> import pycountry
-   >>> len(pycountry.countries)
-   249
-   >>> list(pycountry.countries)[0]
-   Country(alpha_2='AF', alpha_3='AFG', name='Afghanistan', numeric='004', official_name='Islamic Republic of Afghanistan')
-
-Specific countries can be looked up by their various codes and provide
-the information included in the standard as attributes:
-
-.. code:: pycon
-
-   >>> germany = pycountry.countries.get(alpha_2='DE')
-   >>> germany
-   Country(alpha_2='DE', alpha_3='DEU', name='Germany', numeric='276', official_name='Federal Republic of Germany')
-   >>> germany.alpha_2
-   'DE'
-   >>> germany.alpha_3
-   'DEU'
-   >>> germany.numeric
-   '276'
-   >>> germany.name
-   'Germany'
-   >>> germany.official_name
-   'Federal Republic of Germany'
-
-There's also a "fuzzy" search to help people discover "proper" countries
-for names that might only actually be subdivisions. The fuzziness also
-includes normalizing unicode accents. There's also a bit of
-prioritization included to prefer matches on country names before
-subdivision names and have countries with more matches be listed before
-ones with fewer matches:
-
-.. code:: pycon
-
-   >>> pycountry.countries.search_fuzzy('England')
-   [Country(alpha_2='GB', alpha_3='GBR', name='United Kingdom', numeric='826', official_name='United Kingdom of Great Britain and Northern Ireland')]
-
-   >>> pycountry.countries.search_fuzzy('Cote')
-   [Country(alpha_2='CI', alpha_3='CIV', name="Cรดte d'Ivoire", numeric='384', official_name="Republic of Cรดte d'Ivoire"),
-    Country(alpha_2='FR', alpha_3='FRA', name='France', numeric='250', official_name='French Republic'),
-    Country(alpha_2='HN', alpha_3='HND', name='Honduras', numeric='340', official_name='Republic of Honduras')]
-
-Attributes for the country class can be accessed using the
-``__getattr__`` method. If the requested attribute is a key for the
-country class, it will return the corresponding value. In the special
-cases of missing 'common_name' or 'official_name' attributes,
-``__getattr__`` will return 'name'. Here are some examples:
-
-.. code:: pycon
-
-   >>> aland = pycountry.countries.get(alpha_2='AX')
-
-   >>> print(aland)
-   Country(alpha_2='AX', alpha_3='ALA', flag='๐Ÿ‡ฆ๐Ÿ‡ฝ', name='ร…land Islands', numeric='248')
-
-   >>> aland.common_name
-   UserWarning: Country's common_name not found. Country name provided instead.
-     warnings.warn(warning_message, UserWarning)
-   'ร…land Islands'
-
-   >>> aland.official_name
-   Country's official_name not found. Country name provided instead.
-     warnings.warn(warning_message, UserWarning)
-   'ร…land Islands'
-
-   >>> aland.flag
-   '๐Ÿ‡ฆ๐Ÿ‡ฝ'
-
-   >>> aland.foo  # Raises AttributeError
-
-*********************************
- Historic Countries (ISO 3166-3)
-*********************************
-
-The ``historic_countries`` database contains former countries that have
-been removed from the standard and are now included in ISO 3166-3,
-excluding existing ones:
-
-.. code:: pycon
-
-   >>> ussr = pycountry.historic_countries.get(alpha_3='SUN')
-   >>> ussr
-   Country(alpha_3='SUN', alpha_4='SUHH', withdrawal_date='1992-08-30', name='USSR, Union of Soviet Socialist Republics', numeric='810')
-   >>> ussr.alpha_4
-   'SUHH'
-   >>> ussr.alpha_3
-   'SUN'
-   >>> ussr.name
-   'USSR, Union of Soviet Socialist Republics'
-   >>> ussr.withdrawal_date
-   '1992-08-30'
-
-***********************************
- Country subdivisions (ISO 3166-2)
-***********************************
-
-The country subdivisions are a little more complex than the countries
-itself because they provide a nested and typed structure.
-
-All subdivisons can be accessed directly:
-
-.. code:: pycon
-
-   >>> len(pycountry.subdivisions)
-   4847
-   >>> list(pycountry.subdivisions)[0]
-   Subdivision(code='AD-07', country_code='AD', name='Andorra la Vella', parent_code=None, type='Parish')
-
-Subdivisions can be accessed using their unique code. The resulting
-object will provide at least their code, name and type:
-
-.. code:: pycon
-
-   >>> de_st = pycountry.subdivisions.get(code='DE-ST')
-   >>> de_st.code
-   'DE-ST'
-   >>> de_st.name
-   'Sachsen-Anhalt'
-   >>> de_st.type
-   'State'
-   >>> de_st.country
-   Country(alpha_2='DE', alpha_3='DEU', name='Germany', numeric='276', official_name='Federal Republic of Germany')
-
-Some subdivisions specify another subdivision as a parent:
-
-.. code:: pycon
-
-   >>> al_br = pycountry.subdivisions.get(code='AL-BU')
-   >>> al_br.code
-   'AL-BU'
-   >>> al_br.name
-   'Bulqiz\xeb'
-   >>> al_br.type
-   'District'
-   >>> al_br.parent_code
-   'AL-09'
-   >>> al_br.parent
-   Subdivision(code='AL-09', country_code='AL', name='Dib\xebr', parent_code=None, type='County')
-   >>> al_br.parent.name
-   'Dib\xebr'
-
-The divisions of a single country can be queried using the country_code
-index:
-
-.. code:: pycon
-
-   >>> len(pycountry.subdivisions.get(country_code='DE'))
-   16
-
-   >>> len(pycountry.subdivisions.get(country_code='US'))
-   57
-
-Similar to countries, the ``search_fuzzy`` method has been implemented
-for subdivisions to facilitate finding relevant subdivision entries.
-This method includes unicode normalization for accents and prioritizes
-matches on subdivision names. The search algorithm is designed to return
-more relevant matches first:
-
-This method is especially useful for cases where the exact name or code
-of the subdivision is not known.
-
-.. code:: pycon
-
-   >>> pycountry.subdivisions.search_fuzzy('York')
-     [Subdivision(code='GB-YOR', country_code='GB', name='York', parent='GB-ENG', parent_code='GB-GB-ENG', type='Unitary authority')
-     Subdivision(code='GB-ERY', country_code='GB', name='East Riding of Yorkshire', parent='GB-ENG', parent_code='GB-GB-ENG', type='Unitary authority')
-     Subdivision(code='GB-NYK', country_code='GB', name='North Yorkshire', parent='GB-ENG', parent_code='GB-GB-ENG', type='Two-tier county')
-     Subdivision(code='US-NY', country_code='US', name='New York', parent_code=None, type='State')]
-
-*********************
- Scripts (ISO 15924)
-*********************
-
-Scripts are available from a database similar to the countries:
-
-.. code:: pycon
-
-   >>> len(pycountry.scripts)
-   169
-   >>> list(pycountry.scripts)[0]
-   Script(alpha_4='Afak', name='Afaka', numeric='439')
-
-   >>> latin = pycountry.scripts.get(name='Latin')
-   >>> latin
-   Script(alpha_4='Latn', name='Latin', numeric='215')
-   >>> latin.alpha4
-   'Latn'
-   >>> latin.name
-   'Latin'
-   >>> latin.numeric
-   '215'
-
-***********************
- Currencies (ISO 4217)
-***********************
-
-The currencies database is, again, similar to the ones before:
-
-.. code:: pycon
-
-   >>> len(pycountry.currencies)
-   182
-   >>> list(pycountry.currencies)[0]
-   Currency(alpha_3='AED', name='UAE Dirham', numeric='784')
-   >>> argentine_peso = pycountry.currencies.get(alpha_3='ARS')
-   >>> argentine_peso
-   Currency(alpha_3='ARS', name='Argentine Peso', numeric='032')
-   >>> argentine_peso.alpha_3
-   'ARS'
-   >>> argentine_peso.name
-   'Argentine Peso'
-   >>> argentine_peso.numeric
-   '032'
-
-***********************
- Languages (ISO 639-3)
-***********************
-
-The languages database is similar too:
-
-.. code:: pycon
-
-   >>> len(pycountry.languages)
-   7874
-   >>> list(pycountry.languages)[0]
-   Language(alpha_3='aaa', name='Ghotuo', scope='I', type='L')
-
-   >>> aragonese = pycountry.languages.get(alpha_2='an')
-   >>> aragonese.alpha_2
-   'an'
-   >>> aragonese.alpha_3
-   'arg'
-   >>> aragonese.name
-   'Aragonese'
-
-   >>> bengali = pycountry.languages.get(alpha_2='bn')
-   >>> bengali.name
-   'Bengali'
-   >>> bengali.common_name
-   'Bangla'
-
-*********
- Locales
-*********
-
-Locales are available in the ``pycountry.LOCALES_DIR`` subdirectory of
-this package. The translation domains are called ``isoXXX`` according to
-the standard they provide translations for. The directory is structured
-in a way compatible to Python's gettext module.
-
-Here is an example translating language names:
-
-.. code:: pycon
-
-   >>> import gettext
-   >>> german = gettext.translation('iso3166-1', pycountry.LOCALES_DIR,
-   ...                              languages=['de'])
-   >>> german.install()
-   >>> _('Germany')
-   'Deutschland'
-
-*********
- Lookups
-*********
-
-For each database (countries, languages, scripts, etc.), you can also
-look up entities case insensitively without knowing which key the value
-may match. For example:
-
-.. code:: pycon
-
-   >>> pycountry.countries.lookup('de')
-   <pycountry.db.Country object at 0x...>
-
-The search ends with the first match, which is returned.
-
-********************
- Dict Compatibility
-********************
-
-You can cast each object type into a ``dict``:
-
-.. code:: pycon
-
-   >>> country = pycountry.countries.lookup('de')
-   >>> dict(country)
-   {'alpha_2': 'DE', 'name': 'Germany', ...}
-
-******************
- Custom Countries
-******************
-
-While pycountry will not be adding non-ISO values to its standard
-library, you can add or remove entries at runtime to fit your needs.
-
-Add a non-ISO country:
-
-.. code:: pycon
-
-   >>> pycountry.countries.add_entry(alpha_2="XK", alpha_3="XXK", name="Kosovo", numeric="926")
-
-Remove a country from a database:
-
-.. code:: pycon
-
-   >>> pycountry.countries.remove_entry(alpha_2="XK")
-
-***************************
- PyInstaller Compatibility
-***************************
-
-Some users have reported issues using PyCountry with PyInstaller
-guidance on how to handle the issues can be found in the `PyInstaller
-Google Group
-<https://groups.google.com/g/pyinstaller/c/OYhJdeZ9010/m/vLhYAWUzAQAJ>`_.
-
diff --git a/libs/pycountry-24.6.1.dist-info/RECORD b/libs/pycountry-24.6.1.dist-info/RECORD
deleted file mode 100644
index 5d8fb037e6..0000000000
--- a/libs/pycountry-24.6.1.dist-info/RECORD
+++ /dev/null
@@ -1,599 +0,0 @@
-pycountry-24.6.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pycountry-24.6.1.dist-info/LICENSE.txt,sha256=P6OcbhijpEEQgrZMFk3q4dj0ewOk1FMEwfCuR4Ym44I,24463
-pycountry-24.6.1.dist-info/METADATA,sha256=eQp7PAiAqzFjGMPZCPGYmDuB3JbA8vSwxUqeJg8y9Uo,13035
-pycountry-24.6.1.dist-info/RECORD,,
-pycountry-24.6.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycountry-24.6.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pycountry/COPYRIGHT.txt,sha256=9LAWFwZLzZ6f49ti7Jxu-NCvzDiN2ljZspNaVR15YOQ,2054
-pycountry/__init__.py,sha256=YLNhtu9WmoG-K6yDc3MwQFHlCk5o-kLiA6BfSdf65xE,10577
-pycountry/databases/iso15924.json,sha256=Z009yLGKO5ma9xlvd5QopGXl-wr0FNBxlX0QNIvJgX4,17097
-pycountry/databases/iso3166-1.json,sha256=8BuBK1f7qfMf9iG_M-fHVwoBlk2-tb4hZ-lN7PU4yJ8,43284
-pycountry/databases/iso3166-2.json,sha256=Td3W3F6nzH26HuKJxlnJTGHUWBPw5feXNj3ii_Po4po,498094
-pycountry/databases/iso3166-3.json,sha256=65LRzOPjUlWfYQ5g4qyyNofrHPB7I2dfsRKGOldBpvo,6193
-pycountry/databases/iso4217.json,sha256=ycN7QmMXgJpv_gZ9o6M0oxUPQklPrpGCNVevt70aQTU,16584
-pycountry/databases/iso639-3.json,sha256=ljbOUmYFOGdicUDOWtofmqiXygenUBMCwbFLjRFHzdo,874782
-pycountry/databases/iso639-5.json,sha256=EswG_z7ZXrgJF0pobLKuczFfPLFlgs9v5CZ856KtYZg,8486
-pycountry/db.py,sha256=DZOSHXrX7B9nfbUyUBUA7qUWyCxrXnSE18dlAI1hvNU,5730
-pycountry/locales/ab/LC_MESSAGES/iso3166-1.mo,sha256=k3uGEcGMyUV9r-Lb71LOqXroLQp_IhkTAhr0PD3U9e0,528
-pycountry/locales/ab/LC_MESSAGES/iso639-5.mo,sha256=5Gbou7M6kfDcvKTN-rjYaO5EhzF19peITObAKV4GBlM,371
-pycountry/locales/ace/LC_MESSAGES/iso3166-1.mo,sha256=6Vkm8uXyq25_SQj_rzs-GBpNZPd8IXKAoQ9XIfeXpFk,524
-pycountry/locales/ach/LC_MESSAGES/iso3166-1.mo,sha256=2usbjDzDqMgZazSwE-vdgc08TO7cgtvCtsoJL4fJJ34,9144
-pycountry/locales/af/LC_MESSAGES/iso3166-1.mo,sha256=4VxdeFM3YYXCgtjcd_oHRZRCtOwlIm8OSJHZ29UtVCc,22487
-pycountry/locales/af/LC_MESSAGES/iso3166-3.mo,sha256=3s548xWglPw-c-szsi2VPtStJA9YZMKN5skK3wmT4Q4,1001
-pycountry/locales/af/LC_MESSAGES/iso639-3.mo,sha256=FmEu-2iY9g700VLvruD8LVEGIuHofjxuUaSFl7OAST8,5414
-pycountry/locales/ak/LC_MESSAGES/iso3166-1.mo,sha256=HfKQMjsWhW9Ni7ac9nqeQzSrODe_IO9Yb7O5yXWxwlk,522
-pycountry/locales/am/LC_MESSAGES/iso3166-1.mo,sha256=3jsi1iJsfthdvxkmCv1VhvHOzpDeh-4GzyhCE0qTmbU,6413
-pycountry/locales/am/LC_MESSAGES/iso3166-3.mo,sha256=vyw6Cwq3SQOIWP6gDRI0eexeoydR0B3GqirUxe-t418,476
-pycountry/locales/am/LC_MESSAGES/iso639-3.mo,sha256=yF1yOdiBBo1pwOMtA8RCUfGs_rMfwV5oMUdA5p23dTg,5797
-pycountry/locales/an/LC_MESSAGES/iso3166-1.mo,sha256=l_6UPVkRZtiPLwYYTpz5vUgM52bXK0Yao39PnirHuBo,3810
-pycountry/locales/ar/LC_MESSAGES/iso15924.mo,sha256=zUUHbVE7omuduSRbiQ-T5SL5gOO2a8IbzMvGUy3FhdE,4112
-pycountry/locales/ar/LC_MESSAGES/iso3166-1.mo,sha256=qLUx_EDLoLwRssI3x6SEZxdkiXrzupYXM2AnR2gNLK8,28339
-pycountry/locales/ar/LC_MESSAGES/iso3166-3.mo,sha256=Rahaka3wBXrsvWs9uEA-sFjIF1866PG1ayEpULmMHhs,3225
-pycountry/locales/ar/LC_MESSAGES/iso4217.mo,sha256=-QMYzQARcJ7io3jZbGkGGmfNH3zYqTlzPGffRTwgk7c,8672
-pycountry/locales/ar/LC_MESSAGES/iso639-3.mo,sha256=xPkXdFG-wDN63PWutDf95H5-szO1V4xu6_2_9anOzBU,8284
-pycountry/locales/as/LC_MESSAGES/iso3166-1.mo,sha256=vHPXBAhS2ZQq_YYDOfXpU-iwW8Mw9hzR03F_XsYAViM,33554
-pycountry/locales/as/LC_MESSAGES/iso3166-3.mo,sha256=5vD8t0dokLtK1gPNKt1Olg3ZvOYKpzp0s9RSU41E_Qc,4070
-pycountry/locales/ast/LC_MESSAGES/iso15924.mo,sha256=oiGUX_ZTtunE4RLegO39k_klYJSYIt6FQved3j4UGEU,372
-pycountry/locales/ast/LC_MESSAGES/iso3166-1.mo,sha256=R_MeKZ0zClp2m9y9w9W8UlhaB2g2hASXKw4Rh_V90o8,22752
-pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo,sha256=_MhjBaxHk5eg6-ntsvqEnmYxp5DD5Rt4apKOAMSjEeQ,373
-pycountry/locales/ast/LC_MESSAGES/iso3166-3.mo,sha256=rmQaVdr-XS2nXnO6abzuyU2EFEG6YEYgQFzI2ORqt_o,2670
-pycountry/locales/ast/LC_MESSAGES/iso4217.mo,sha256=KNPjXdmAfShoiU3wJvyox22mFd-N6UAobV_DmiyshZg,371
-pycountry/locales/ast/LC_MESSAGES/iso639-3.mo,sha256=YMAQ-2GWeKLqMZz8GB0lNta2Tz6rabkwQI4v1qg93-0,311331
-pycountry/locales/ast/LC_MESSAGES/iso639-5.mo,sha256=qn-We9gdhe_PEYMLPhrc3q4vAOe5Bgk2JtfotbOGMew,4029
-pycountry/locales/ay/LC_MESSAGES/iso3166-1.mo,sha256=cBggVpg-cvg496_r1P2iP8c6pXeV5tXAWHeI4MUGjS8,521
-pycountry/locales/az/LC_MESSAGES/iso3166-1.mo,sha256=YVWW1lokxjKqOJutVRom6sIwd2Kgg2_-9Dex0GUvy20,10337
-pycountry/locales/az/LC_MESSAGES/iso3166-2.mo,sha256=KOq3mDw9DYUS-rjkJuUPnx4Gy-UAOi8VNSuEi4V4lRA,3341
-pycountry/locales/az/LC_MESSAGES/iso3166-3.mo,sha256=CSPNosZvIUgoOmmqhyT0oSeV2mfloubjv1rZWB2WUMA,497
-pycountry/locales/az/LC_MESSAGES/iso639-3.mo,sha256=CjljkA8FBDD0PsX0EKqyLHqqAj-H5Swl8IfWeSQCYto,1431
-pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo,sha256=V-M118MNtoP1d8Ieo28BjZUm8rNt7_hv5tIWWdeIx-g,526
-pycountry/locales/bar/LC_MESSAGES/iso3166-1.mo,sha256=ZIp9uz675vRJx3f83vGmkkz0X_BI4K1ECL2tlz4HYhg,6864
-pycountry/locales/be/LC_MESSAGES/iso15924.mo,sha256=_N0zYkRXhRxc6OY_uM0nEdTTQGkJemjPJbweseMkY-E,12701
-pycountry/locales/be/LC_MESSAGES/iso3166-1.mo,sha256=BLzhRMgKoRbCdH_-IR2ktrxoUlv7umx3i3vLhmbpMtA,30045
-pycountry/locales/be/LC_MESSAGES/iso3166-2.mo,sha256=7dvTbx2XXzaGDM77eZuOGunGghqlWF_Qr1cwR1BsQ2c,194548
-pycountry/locales/be/LC_MESSAGES/iso3166-3.mo,sha256=NY8tsH-xZAISTaPkv-sZoeSe4pS1XwLo0UevpYfPE9M,3661
-pycountry/locales/be/LC_MESSAGES/iso4217.mo,sha256=LWwT3Fk73ol8TAPhKJYvN7wC9i2FFQZFIkmnr3uhZ3M,12256
-pycountry/locales/be/LC_MESSAGES/iso639-3.mo,sha256=6n5MlHRR5j8DFbjEWxgX5_cLsvRcI-n84-tpxuYMFto,18766
-pycountry/locales/be/LC_MESSAGES/iso639-5.mo,sha256=71r8IrsY_YGNzqaX4W6IwaWRRkdg_GJXemcQlDCozRI,9437
-pycountry/locales/bg/LC_MESSAGES/iso15924.mo,sha256=ek0OdIRZK1sg51aer-aBKmTWPTvANA2j6IXDG3GbktA,2003
-pycountry/locales/bg/LC_MESSAGES/iso3166-1.mo,sha256=XiHw6_WKu_Z80bstGu7AxWA_t4Z3HxLLyd14pUIgE0Y,28945
-pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo,sha256=Rfv2XakO8KebOwl5UgAW4x68txJMo0-sHruTk4F82Ck,15883
-pycountry/locales/bg/LC_MESSAGES/iso3166-3.mo,sha256=ajS_H5nLTATojKgYS-VUJHBblcGMlKy4c3xzZfIbZIU,3381
-pycountry/locales/bg/LC_MESSAGES/iso639-3.mo,sha256=K_5aQ06aBayWyvHGM7PyzKV32vYDEpI81U6cYs51vR0,24471
-pycountry/locales/bi/LC_MESSAGES/iso3166-1.mo,sha256=_VIBxp1rhKVdnoUMCJGdHw7tunzjUH_VjXYpz9soUrU,526
-pycountry/locales/bn/LC_MESSAGES/iso3166-1.mo,sha256=ashBjzxU8D7XQxzZLsuAm2D6xkeqcoxtkRacjN8T74w,35751
-pycountry/locales/bn/LC_MESSAGES/iso3166-3.mo,sha256=PUeYbYkNPrt_VO7Ex_zt51qqrI20ANBQpQTI9de2S_c,4015
-pycountry/locales/bn/LC_MESSAGES/iso4217.mo,sha256=4oYedxUp0lHxdllCSVGv7VShAeRHqxaaiLFTZtQJam8,6448
-pycountry/locales/bn/LC_MESSAGES/iso639-3.mo,sha256=TfCKcL6WYGVXojn6_r9S1wqCYUfGCzdEzgY2REioGRc,96597
-pycountry/locales/bn/LC_MESSAGES/iso639-5.mo,sha256=GDRlAiAPncL-NNs1DjcvszQ-Wk9RkO4L65zyO-H1vHY,5688
-pycountry/locales/bn_BD/LC_MESSAGES/iso15924.mo,sha256=ovwmvIRPtPMDH4T9o4efoMjZZ2odclx7JjsbBNGMl6E,14811
-pycountry/locales/bn_BD/LC_MESSAGES/iso3166-2.mo,sha256=QXTOHWYkINzQgpTWYgc9kwv7eVta683ZrVsccKC-fMI,1161
-pycountry/locales/bn_BD/LC_MESSAGES/iso639-5.mo,sha256=xXfd6IKyzFc2dJtsBSa5_0mBCRBvPz7tCcId3NjDzJ8,2772
-pycountry/locales/bn_IN/LC_MESSAGES/iso3166-1.mo,sha256=5Px391j-95rq_YCKjQgXRZ1zfZXWhjtXCHdtd4ywLNY,36015
-pycountry/locales/bn_IN/LC_MESSAGES/iso3166-3.mo,sha256=pIptGQpE8d5nuzL0jTYJLPv3JZY0gxUuCMWgdXI0TgQ,4091
-pycountry/locales/br/LC_MESSAGES/iso15924.mo,sha256=FHcA4B8HH6tW9s6V38M1RanR8vLCPwT5Uqs0xKUgm1s,6545
-pycountry/locales/br/LC_MESSAGES/iso3166-1.mo,sha256=AXx3h9JbJouvTQcKKT-gjdgd5thutVMognb3Cp36oEI,10555
-pycountry/locales/br/LC_MESSAGES/iso3166-3.mo,sha256=NDwEC3COS46PUyPxviqz3FcXPu4EMPD9mfFf0Ov4MQM,2105
-pycountry/locales/br/LC_MESSAGES/iso4217.mo,sha256=2tpB8EW0tcbLKioS1oV-QncS4Cgt8UB2Um7Y1Ird_wE,4788
-pycountry/locales/br/LC_MESSAGES/iso639-3.mo,sha256=K4JL2FdlhYYeA5JQcTpQW9sIO36BIu0JcX5eF-L_JO0,32879
-pycountry/locales/bs/LC_MESSAGES/iso3166-1.mo,sha256=jXst5_Jspv9qSo37HDE_V88j4dmOnVDLkn0KJj-2Qlc,22283
-pycountry/locales/bs/LC_MESSAGES/iso3166-2.mo,sha256=SqCsAuu_JfoyzdkKdu_h4RRIlvIEhDtKw7Gcfn3BblE,3326
-pycountry/locales/bs/LC_MESSAGES/iso3166-3.mo,sha256=vmd-r__7CfEP7lNLKO5XaTRbl74cD0gf9jXY5gHb0Ys,2593
-pycountry/locales/bs/LC_MESSAGES/iso639-3.mo,sha256=lp3LUAvixy_p_ahI8y5t4b-ZIh8jpGc0bjPMwybcW0o,2394
-pycountry/locales/byn/LC_MESSAGES/iso3166-1.mo,sha256=zmm0ZRkYUfh_6wWfm85FVzwBNaL9weTOmkUrHsJm5wo,5711
-pycountry/locales/byn/LC_MESSAGES/iso3166-3.mo,sha256=hwn6l96WEVf5gMMD0D-seBHNzNNrPRPXUcnNoQNh5A0,474
-pycountry/locales/byn/LC_MESSAGES/iso639-3.mo,sha256=U6uIgSE3nyqvmHEegh5we5qY92PQ2_TQw8vY3FHaPpY,5693
-pycountry/locales/ca/LC_MESSAGES/iso15924.mo,sha256=NLX6H4JPcYkvcS5owWmaNNRjekuyVlyILFyeQ4bQtO0,2945
-pycountry/locales/ca/LC_MESSAGES/iso3166-1.mo,sha256=xiAEFdhGYRlBPfAKHjdbMYckwJa0R9RLoyqMl7WRiTc,23927
-pycountry/locales/ca/LC_MESSAGES/iso3166-2.mo,sha256=wiuZD4uELssC58wznMnURsgBM9ViOcxsNq89sPkgbuQ,4601
-pycountry/locales/ca/LC_MESSAGES/iso3166-3.mo,sha256=rE7KKu_cHR59jP_DXCwZAe7GoAWzbqsPu7hJ3rwJ_IQ,2865
-pycountry/locales/ca/LC_MESSAGES/iso4217.mo,sha256=f8WynUdYDEdufjoEZsEknic0mNrSCMedZfLV95k761w,9059
-pycountry/locales/ca/LC_MESSAGES/iso639-3.mo,sha256=Yr9NecTSkaXNySUggjeqikORLd0UkfzWifmtWUAIzlQ,25765
-pycountry/locales/ce/LC_MESSAGES/iso3166-1.mo,sha256=Ry8LH4ZammiHGSaFExQ2Go7_bsz5PR3oxzXMonsAurY,10819
-pycountry/locales/ch/LC_MESSAGES/iso3166-1.mo,sha256=LKRR9EeT_QvK_YRa4PYZjAjUPCJOXxLOvoX_TVyz96E,1416
-pycountry/locales/chr/LC_MESSAGES/iso3166-1.mo,sha256=dNxi__17QfyJIfXLpTZlOpIDbNhKI-xQNZHWm_iRP7s,5143
-pycountry/locales/ckb/LC_MESSAGES/iso3166-1.mo,sha256=-CG05duYTphKeUL6urQKcq_V-CILrwm_rCWE5MDjwnI,10429
-pycountry/locales/crh/LC_MESSAGES/iso3166-1.mo,sha256=mio4ksDgP3vkAZv35b7vzwvPSLX8XN3b4nYkmoHjr78,21581
-pycountry/locales/crh/LC_MESSAGES/iso3166-2.mo,sha256=PVhzh91jmokj0OMzgIsN5ZNPGuFJrJ3GS4AUVXT5LSk,3684
-pycountry/locales/crh/LC_MESSAGES/iso3166-3.mo,sha256=69s89vyss35u5TfPoPFe35C8GDl461egj-T3XpmMUZY,2773
-pycountry/locales/crh/LC_MESSAGES/iso639-3.mo,sha256=g36ALRhWzI5PM-9Qg50cM44OZAxKBd0lTU5HvbFKsIY,256161
-pycountry/locales/cs/LC_MESSAGES/iso15924.mo,sha256=GHXFTh4eRZIV4XkuyZtuerlprHhST1O1ih3TMR4PWH8,9003
-pycountry/locales/cs/LC_MESSAGES/iso3166-1.mo,sha256=AGt1wa04gJq0kLKw5yh24tyhTb9hziY-sJMvHYvz5gI,24094
-pycountry/locales/cs/LC_MESSAGES/iso3166-2.mo,sha256=NWMUzpPFs_inKaa8KiZWQ--HdMfUr2qgtYkbNYCeagg,9150
-pycountry/locales/cs/LC_MESSAGES/iso3166-3.mo,sha256=XlpGocVlJciJE6HrOH1yri3lvbXfXjqVDPA6LlTBM8A,2879
-pycountry/locales/cs/LC_MESSAGES/iso4217.mo,sha256=xwx_BJqjmzr_mmzYjR5Wt5g3SbWOAk4rUoc1HcNbTZk,9477
-pycountry/locales/cs/LC_MESSAGES/iso639-3.mo,sha256=SzZZh2Z2QGKCbxsolAiDSaUAl6t73j66HGkLbi7Tjpc,14412
-pycountry/locales/cs/LC_MESSAGES/iso639-5.mo,sha256=Us1dtkxGW_FZIiuzaeFgJtihU33i-xIieqlYRywCKlk,3971
-pycountry/locales/csb/LC_MESSAGES/iso3166-1.mo,sha256=O6VFwNjiIBO6J2cQ2THq6nsDRX0Nrj_2HYcjIIwpHeQ,4448
-pycountry/locales/cv/LC_MESSAGES/iso15924.mo,sha256=mt3g5WZ6prfb64-Wo6IGYbhkDetKnwKu7hHTQACh2Qk,10986
-pycountry/locales/cv/LC_MESSAGES/iso3166-1.mo,sha256=x5y2q0VpspabSAL1TzR_t_OaOfi316tLdX45_eI_KGw,10906
-pycountry/locales/cy/LC_MESSAGES/iso15924.mo,sha256=sxBCf6VU1IgCJ-K9OdwRBIC1kEexZEKt23NUKOUCZpM,3619
-pycountry/locales/cy/LC_MESSAGES/iso3166-1.mo,sha256=bZcvDOVpLy693csdzJa9EU6SO6vDi-qcuTWCDNdzFM4,23789
-pycountry/locales/cy/LC_MESSAGES/iso3166-2.mo,sha256=YQcHAwAOE7d0y6KUYZisn3NIn8oDty2Vldbunj51geo,34985
-pycountry/locales/cy/LC_MESSAGES/iso3166-3.mo,sha256=A1pcNJOs0wk8co-v1yRG_lF6i-j-_EyL0jSi88DI_yo,2876
-pycountry/locales/cy/LC_MESSAGES/iso4217.mo,sha256=Q_XAA9wuKeTjIfA1fTyRs3lTPdBbw_qf38HReYkvln8,1790
-pycountry/locales/cy/LC_MESSAGES/iso639-3.mo,sha256=N0JMXN9X2y5oAc3FppwF_2ejp5DdAOOnsbPt2CRaais,14506
-pycountry/locales/cy/LC_MESSAGES/iso639-5.mo,sha256=V2Ow87MXb2B-y4iCVWCZPfXnj3J_NJbN05IvCoQg7m0,2109
-pycountry/locales/da/LC_MESSAGES/iso15924.mo,sha256=Njhq1F6ZvIvdpR2xy3sQGjvYnopq4VmFYqAsHht0yFY,10182
-pycountry/locales/da/LC_MESSAGES/iso3166-1.mo,sha256=sGYEO6DUweOnXEujMTvaDRJfK9DEb2i8EG-keSkpetw,23328
-pycountry/locales/da/LC_MESSAGES/iso3166-2.mo,sha256=eY60uUOd31mrjQ4yxqiURV5lUJ9w7eBqfrWjXJTKWQs,134479
-pycountry/locales/da/LC_MESSAGES/iso3166-3.mo,sha256=ujrGCZUJOjnhZSjYF7zcuG8JLhBtN285ktQjqRlLC8s,2671
-pycountry/locales/da/LC_MESSAGES/iso4217.mo,sha256=sIUU5sEf89-trTQAgxEqT562xPi5z03hUVqRLVzOz9o,8861
-pycountry/locales/da/LC_MESSAGES/iso639-3.mo,sha256=apW4_GcBnKIxA1gTlD47CKInRLioHZ5Bnu8gqsCYbss,19729
-pycountry/locales/da/LC_MESSAGES/iso639-5.mo,sha256=RxLEyc0Xe-CWsmJXY0H7VtXMnOZjiyHaipYE_IEZrAA,3961
-pycountry/locales/de/LC_MESSAGES/iso15924.mo,sha256=ZYrOcYO7mU2HtDKo431U1dlgnsSepnH3PVNIh6lME9k,10383
-pycountry/locales/de/LC_MESSAGES/iso3166-1.mo,sha256=61jN9MqyRZ-QQ0stb44pOn9xFvdny13P0VBksFUXnxs,23454
-pycountry/locales/de/LC_MESSAGES/iso3166-2.mo,sha256=RmqrahSmqr_uTORk80tATDJS0Pbygzbx3alyZY7Xqhk,212230
-pycountry/locales/de/LC_MESSAGES/iso3166-3.mo,sha256=ROp9ZyyraJszLaXxy6ToJSj1h2MTAeDFU9YpzcWvrt4,2815
-pycountry/locales/de/LC_MESSAGES/iso4217.mo,sha256=-WNvFBFdc_F52si4GtVELc94pXQwg1Vek8H6Vi5-lcw,9904
-pycountry/locales/de/LC_MESSAGES/iso639-3.mo,sha256=YCZPZM3duYrFiDvt5uvp2mYy975JdgkU9ub0sngTD0s,395660
-pycountry/locales/de/LC_MESSAGES/iso639-5.mo,sha256=rMJ6B4Yt8rtbeLvWaw-TcDbOxf8ggfytflQOKlKU8jk,7860
-pycountry/locales/dv/LC_MESSAGES/iso3166-1.mo,sha256=XDsoK_W6k_U96CcC5YauBU2pA9kMOFT5cyVl6aR7g2I,11257
-pycountry/locales/dz/LC_MESSAGES/iso3166-1.mo,sha256=uV4vcsy0e-e8-cC5n3m7dQle39x5THKOcuX7ybdQr1g,40229
-pycountry/locales/dz/LC_MESSAGES/iso3166-3.mo,sha256=koBYk1RwabIAOHN43YwxcfrlYMCUE19R5gYVARwtuj0,4758
-pycountry/locales/ee/LC_MESSAGES/iso3166-1.mo,sha256=yEnDc6En7uBp7y4XPGerjfTESbTMdHIp-uk5_ZQfuWQ,522
-pycountry/locales/el/LC_MESSAGES/iso15924.mo,sha256=k9pEyyu1TbQzMbwfW_nvq37P8GVF3nLv1mxgxG0m2RI,1864
-pycountry/locales/el/LC_MESSAGES/iso3166-1.mo,sha256=8BjqMl4_9pEqUF0bXoVFqvpEOFLAznTyha9HYF0_cNA,30772
-pycountry/locales/el/LC_MESSAGES/iso3166-2.mo,sha256=3PIeh6MRCdG0AL_0VN10_pk7uht4yB9VOm_PXOrJziI,9264
-pycountry/locales/el/LC_MESSAGES/iso3166-3.mo,sha256=-EQ2ULB1zDz_-q8E_RoeyNEDulJH0lDiRPg_ukBpKCU,3428
-pycountry/locales/el/LC_MESSAGES/iso4217.mo,sha256=hwuizS_gpzXs17LR0KDg7DCXChAqxbo0OPiI44yOoNw,9431
-pycountry/locales/el/LC_MESSAGES/iso639-3.mo,sha256=A78zCtB-KAgGcc_I_UwlzQ6wEMumiXM38le68DdZ_AU,57390
-pycountry/locales/el/LC_MESSAGES/iso639-5.mo,sha256=7KaqAqDWDQgtpqPIBEYfN2Nn-4oL9651RpjvWFw0EWE,2391
-pycountry/locales/en/LC_MESSAGES/iso3166-2.mo,sha256=8uY3WaRyWfDcgAftUjP9yhLDeO-6_zYHthsBzYncZyc,90768
-pycountry/locales/eo/LC_MESSAGES/iso15924.mo,sha256=OedZ3T7f97tZ8LMMptEh_Vua3VaAZYRaOCTm0p3iZck,8524
-pycountry/locales/eo/LC_MESSAGES/iso3166-1.mo,sha256=dr01nC8FEUgGjZCdOMzXbm7xt8W_4q4NjkoDWaVcAks,23042
-pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo,sha256=Xopo3v14n2Oua8e7yFUdUrRdOS6dzV7R5e_UzVWr5yc,46967
-pycountry/locales/eo/LC_MESSAGES/iso3166-3.mo,sha256=mOFUjyiPsHicME4Lt5_1qHrgLrXhqfcYF-AEmakcJko,2599
-pycountry/locales/eo/LC_MESSAGES/iso4217.mo,sha256=epKWtcArMSTraE47QbQ9ji8vITvxD6Ph1xG3Elnb_Q4,8374
-pycountry/locales/eo/LC_MESSAGES/iso639-3.mo,sha256=8w197bKO5-bipI24moC5t6a1SHcC7-QvAlQcTTi9ckw,48656
-pycountry/locales/eo/LC_MESSAGES/iso639-5.mo,sha256=6WlSyNLvedWIBv04knXYPEwqFH5eTyC4hjWfwGnkwzQ,6705
-pycountry/locales/es/LC_MESSAGES/iso15924.mo,sha256=gdkpJiaiQSKCYw9nomHgm4rSdvg65nWMeaaWeW5Qd-k,10493
-pycountry/locales/es/LC_MESSAGES/iso3166-1.mo,sha256=h3Hzd2DyCMAtOkEu8fjiAKywX4MQPlcn7JTl1IrvkyQ,24037
-pycountry/locales/es/LC_MESSAGES/iso3166-2.mo,sha256=2HCnjjkXXUvGrIZAOwLpb8aAmjIR7Qi8-pzrv5hMTnE,15680
-pycountry/locales/es/LC_MESSAGES/iso3166-3.mo,sha256=MTW-LfPGXXKazp_9140BPRBvk8Ehj1qF9zfPjUd-I8I,2927
-pycountry/locales/es/LC_MESSAGES/iso4217.mo,sha256=zXh9O43AU_gvnJ9zp6l-D_F5RKkmFDMFqTOfOlbfNm4,9745
-pycountry/locales/es/LC_MESSAGES/iso639-3.mo,sha256=R32b8YA1xni3qAwYb0yUmgEkLSH3M7sr1qmn57Gc9zU,33190
-pycountry/locales/et/LC_MESSAGES/iso15924.mo,sha256=bBa-lP-KW8kk92aI6iytdmRso7ckXLn2QRM68D4T0rw,9689
-pycountry/locales/et/LC_MESSAGES/iso3166-1.mo,sha256=JkdyhAU40azro986veHLyFW1WnNx_dKVfXIbTHmrp1A,23059
-pycountry/locales/et/LC_MESSAGES/iso3166-2.mo,sha256=1v3cr3e1XE9miKSntAOB_y42DBq7_8-7JdOpSnRQZ10,12218
-pycountry/locales/et/LC_MESSAGES/iso3166-3.mo,sha256=fWoF_uCGivdUfWpLdcfMbxOIMzPr4Lg3KYtFbp2MjeM,2748
-pycountry/locales/et/LC_MESSAGES/iso4217.mo,sha256=JMU7n6uUa9fQ3ULXCuoJ4EeOlUm8tU_vjS4tK7DkiVI,9565
-pycountry/locales/et/LC_MESSAGES/iso639-3.mo,sha256=02PjBSBx7RHgbNQf8sVbhx0k2LM5xYrXSBGfQP4sVqA,32017
-pycountry/locales/et/LC_MESSAGES/iso639-5.mo,sha256=u2UzyeBVJ4EfgURDtAotsgLFc84jalBE9_OhQqvIu5I,7437
-pycountry/locales/eu/LC_MESSAGES/iso15924.mo,sha256=DGTqul6pkxC1N3_tNru3up577rnHLULk_OvqrD2b7XE,10499
-pycountry/locales/eu/LC_MESSAGES/iso3166-1.mo,sha256=nINnO49UTvGw_P6GqParxGP2Ra-3uBSQHfxx4EcLt3M,23811
-pycountry/locales/eu/LC_MESSAGES/iso3166-2.mo,sha256=VHeL7j9VeX0pmIrevJsIC-lr-XfI2jLMoJZBZZaxHpw,23745
-pycountry/locales/eu/LC_MESSAGES/iso3166-3.mo,sha256=WDxWO7IFnw8NWJT2ozJuWIAG3EDekFDN8NVm7WNd1JY,2745
-pycountry/locales/eu/LC_MESSAGES/iso4217.mo,sha256=_9cNERxaRATG5mlsgcx4OgTlZ52nr_GJKskhk-CldC0,856
-pycountry/locales/eu/LC_MESSAGES/iso639-3.mo,sha256=2ksCA4389wGczCflrrqKOSc93mdOIePvCYndei-QtHQ,20888
-pycountry/locales/fa/LC_MESSAGES/iso15924.mo,sha256=pVoYWVxZZboJzTYmf57zXEyKa3ZrBfAZvYsncb0a6jE,2314
-pycountry/locales/fa/LC_MESSAGES/iso3166-1.mo,sha256=7dFgCzOYnrZZaODsiEqZ0rYdUIX18zatIJO084ypjA0,26404
-pycountry/locales/fa/LC_MESSAGES/iso3166-2.mo,sha256=XdCQ4pAZ91oZSsWapWBa4N_vFfNHnboHAeExmcprOqs,372
-pycountry/locales/fa/LC_MESSAGES/iso3166-3.mo,sha256=dgATH1gPQogKMcVIhGLN3EqSymsx-UwG7FLsQUP92Io,3140
-pycountry/locales/fa/LC_MESSAGES/iso639-3.mo,sha256=WWUyB1VwOCphybCzND1GPh42PsU2q95ngArgmpejWZw,13407
-pycountry/locales/ff/LC_MESSAGES/iso3166-1.mo,sha256=SmjnFB-fFSYNCZKLP04fQOuhtENGAmQOuqgos48y1vU,3704
-pycountry/locales/fi/LC_MESSAGES/iso15924.mo,sha256=30xDiP6wZe9WSIaoGbXd9XbTf3TW9RrhewXOOuByPak,9006
-pycountry/locales/fi/LC_MESSAGES/iso3166-1.mo,sha256=bemhvHKjMonjuuBfwfK0mWieb1xYovqJUDGlbC72SXs,22418
-pycountry/locales/fi/LC_MESSAGES/iso3166-2.mo,sha256=mQtnJpLmI2HOFZvUdgTmKIecmMtoBdXP6pdD2mXLJDA,5183
-pycountry/locales/fi/LC_MESSAGES/iso3166-3.mo,sha256=TVMIlCs7iYo7FJecpg_BYTHfIfnA9ZqIS4X6bcT-93M,2647
-pycountry/locales/fi/LC_MESSAGES/iso4217.mo,sha256=dflS5jOAIcqzJ2XKkTP3LxI8YcxZ2O3QvuBXBbkzFAY,7172
-pycountry/locales/fi/LC_MESSAGES/iso639-3.mo,sha256=hTeZ1_Uz9D26qP5iWfQYM1RNR3JP2aK3iH9b_EV_oYE,13276
-pycountry/locales/fil/LC_MESSAGES/iso15924.mo,sha256=kfOl9pZBZ_rGdCj3sLzzR0Wt0Gd0EYwet9i7y7zuwg8,10473
-pycountry/locales/fil/LC_MESSAGES/iso3166-1.mo,sha256=CYgq3YrtaoqSms_KiG-lw2ljv0ruWqxsm8atAsPvKyk,23844
-pycountry/locales/fil/LC_MESSAGES/iso3166-2.mo,sha256=GRpA98El7KAGhLqrYxt4cExJ8P0LOHVZ6q_ydGzKVwQ,3047
-pycountry/locales/fo/LC_MESSAGES/iso3166-1.mo,sha256=_gC9v3TLsART2i3d83FTHnmWvpmpG9R-Wf4L3evp-ak,5837
-pycountry/locales/fo/LC_MESSAGES/iso3166-3.mo,sha256=5mYU9BUU_7BucS0iceQGWyeamCkcMbIzpTC4ovDYkr8,393
-pycountry/locales/fr/LC_MESSAGES/iso15924.mo,sha256=js32YkDs2dmkHI9_WFvO9eIzJw7Jr0dVRIiykfBt5No,10260
-pycountry/locales/fr/LC_MESSAGES/iso3166-1.mo,sha256=0xquoUO2OaXbl5OPBVw7qCSYqVBJciTZvjgG1ngsO-Y,24340
-pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo,sha256=SOv40Jm_MLFCUQevW7LrXCz0dLb4JL9CBGXjr5NtAd4,160680
-pycountry/locales/fr/LC_MESSAGES/iso3166-3.mo,sha256=_kUqnSih1FWAMxZ6KnF7pETF9kB73nyPHHUSAS0JIGQ,2860
-pycountry/locales/fr/LC_MESSAGES/iso4217.mo,sha256=xkf83c1q_fH-YZ-Lf1GvaUjNVajhD4QVHUoxMN3byTA,9998
-pycountry/locales/fr/LC_MESSAGES/iso639-3.mo,sha256=woJzt9pMpa8c-6vdkHAhmjevosuIvYWaqWunEnGn3O4,418827
-pycountry/locales/fr/LC_MESSAGES/iso639-5.mo,sha256=w4gK091KSpZ-h5jsHMUO8rBqh25CaI-DCrGAZOBAALU,7943
-pycountry/locales/frp/LC_MESSAGES/iso3166-1.mo,sha256=IvjxXG0W4tSh-ltlxuhP-mCS-nUhu0T6CiPPw_25HWE,9173
-pycountry/locales/fur/LC_MESSAGES/iso3166-1.mo,sha256=0BP25keqdfR4xusOFaQ8bKMADYINpzMjOJm2_Szzbrg,23950
-pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo,sha256=hvBD-ZkMSEuNqYjQvRJH5C_y-Fn99zy82p8b2RmT3z8,1483
-pycountry/locales/fur/LC_MESSAGES/iso639-3.mo,sha256=7ldEmDsfzEH735euvsKTDxGe85NseqCoLjssaXeVnJo,755
-pycountry/locales/fur/LC_MESSAGES/iso639-5.mo,sha256=P1rvQRKyur4ODVrNHFCT_3v4kp8CpILKMTtx9wGzhKo,7791
-pycountry/locales/fy/LC_MESSAGES/iso3166-1.mo,sha256=KYhmJx_lEHsdCuY7ZdaZtz2gI75ZBkZ888Dd_dZ5pBo,9356
-pycountry/locales/ga/LC_MESSAGES/iso3166-1.mo,sha256=eYYdvb0znruo9eAvmBbnAFZMTNfvb8svRX95q-fs6ng,23528
-pycountry/locales/ga/LC_MESSAGES/iso3166-2.mo,sha256=Hat1IzOSoDduYMlZ0VYqTy6xWW4ctSMCzFN_2IDkcHo,2380
-pycountry/locales/ga/LC_MESSAGES/iso3166-3.mo,sha256=LNuDlZiP2kT3yYnODsAVm5bD4PjuC2VSztuGokSzRP8,2691
-pycountry/locales/ga/LC_MESSAGES/iso4217.mo,sha256=RQDSVe2fsUQrbFFyVQNgqZYlzi7tKt0nlk0z_0r5n8c,4140
-pycountry/locales/ga/LC_MESSAGES/iso639-3.mo,sha256=p_c4KxUcsVXQx9pFPf1Qfc-P3SrtDVRqd7WAXWSHdNw,8814
-pycountry/locales/gez/LC_MESSAGES/iso3166-1.mo,sha256=JpzM7q09FPEDKh2HQYdkuXSdRNwFgdn5MaCKVorP-Ts,5761
-pycountry/locales/gez/LC_MESSAGES/iso3166-3.mo,sha256=zhI0xMndQj3An33A1kwA9Bh-u2gPBX3uYj0MNh1Nhqg,476
-pycountry/locales/gez/LC_MESSAGES/iso639-3.mo,sha256=0fYmG2PNN23wg8tgcO4nVFKXb5ssNIVm0XCvhcS33fc,5696
-pycountry/locales/gl/LC_MESSAGES/iso15924.mo,sha256=5BSkiLq_WtMnGnTJFeLqmwwi8wZ1sakoZabwYvVAcLk,8054
-pycountry/locales/gl/LC_MESSAGES/iso3166-1.mo,sha256=POqwc0GuezY-aRcYDuyK_0g9MBBpBwBZz2rX1AGjVc0,23252
-pycountry/locales/gl/LC_MESSAGES/iso3166-3.mo,sha256=3rMs00uCCQvh7sRz2lYsJXU8yqmRLxHTWtSYMt8UiVg,2695
-pycountry/locales/gl/LC_MESSAGES/iso4217.mo,sha256=K49BpfNZ8Prrick3I5NWbDod0rYAB_kk7l0mrfAF4EE,2840
-pycountry/locales/gl/LC_MESSAGES/iso639-3.mo,sha256=J1p57MndIdeIhb2SJk0qtMEEsDJ_3Xs-TVhwp8MBipE,306888
-pycountry/locales/gn/LC_MESSAGES/iso3166-1.mo,sha256=cfVLYnjOabG7BJAnUytlNFF8gX6oUFmGHigqSGeXHY8,8952
-pycountry/locales/gu/LC_MESSAGES/iso3166-1.mo,sha256=BTbIDjcopoGl-bq5XtmV36jIhMIn1dFbo-36oQWPH74,35101
-pycountry/locales/gu/LC_MESSAGES/iso3166-3.mo,sha256=spiaVCBHo7BSunG1rggmBMDOzsJsx15JWzfEdIxNysI,3904
-pycountry/locales/gu/LC_MESSAGES/iso639-3.mo,sha256=p2PKssMJTYTOYiX5uG9ywTyx2RpA4jCxK8Zh0S2McBs,44025
-pycountry/locales/gv/LC_MESSAGES/iso3166-1.mo,sha256=8rEYVKEPZVSB4SGyNWu0ArnMIiE-FY9MF_LHg3VVfp0,8982
-pycountry/locales/ha/LC_MESSAGES/iso3166-1.mo,sha256=TnHC_7VDELwHJc4d_WYcxzggGhdHlFFekvq2N-Ms6yg,5135
-pycountry/locales/haw/LC_MESSAGES/iso3166-1.mo,sha256=iRcwqDVb2jDSHf5H1PYWmS_0nWvv2g81dpI0c-xRp30,1305
-pycountry/locales/haw/LC_MESSAGES/iso3166-3.mo,sha256=HK1sDsEiXNA_NK6XqUtXKNRfP-dfwjYx9WHUHKLBI6A,395
-pycountry/locales/he/LC_MESSAGES/iso15924.mo,sha256=_3Nlkzr0LiLDKke0T0CsXbgs9x5N0eJOQscqbYH33G8,3410
-pycountry/locales/he/LC_MESSAGES/iso3166-1.mo,sha256=5v6_NYS1q3s5R9-jsoD_VVCiRpFAn8CvAL_FIKccoK8,27802
-pycountry/locales/he/LC_MESSAGES/iso3166-2.mo,sha256=dzm0v3NnXSecuWexx3oW1-PKg2LXnJMgwaWmfqkxJPk,43708
-pycountry/locales/he/LC_MESSAGES/iso3166-3.mo,sha256=F-OSPpj7nitjFo8mJHrJP61KZ3QJPYylusCpad8_e_g,3369
-pycountry/locales/he/LC_MESSAGES/iso639-3.mo,sha256=NuCJOIa-FqJ_FQuDWZ_auFhu06sSOhWYsa5Our3B_5E,5910
-pycountry/locales/hi/LC_MESSAGES/iso3166-1.mo,sha256=Q95AylmMfANJAGv0dhovcs0r6lxjWshQhoa0I_t4xE8,35310
-pycountry/locales/hi/LC_MESSAGES/iso3166-3.mo,sha256=pFd1cAHyRWzwkp_QhgSSiAVz7p_CRgvCzbrcJbjM804,3973
-pycountry/locales/hi/LC_MESSAGES/iso639-3.mo,sha256=luMW2-6Pp3sTvB9buOB34UDI15WZh0hCgPfcbZ1-wBc,6805
-pycountry/locales/hi/LC_MESSAGES/iso639-5.mo,sha256=RTUHKIcxhISyqJCqGfUysfQa2m2nIYwmkA_c7Pc3DfM,632
-pycountry/locales/hr/LC_MESSAGES/iso15924.mo,sha256=vuHO5WUcYSss-53qa4Pu4xuRKMsyhZnIbAtbulE0X2Q,10432
-pycountry/locales/hr/LC_MESSAGES/iso3166-1.mo,sha256=Rdhem8HnWKsJE5evHcxajZ0_NdVXIhXecRZ6vlLwe3Q,23488
-pycountry/locales/hr/LC_MESSAGES/iso3166-2.mo,sha256=eIfp6z7nrt_vdSifl0rwIc7CBUhJCHV2iwM5yNMueYM,25948
-pycountry/locales/hr/LC_MESSAGES/iso3166-3.mo,sha256=X-RNvwujPoNxjm5yRjTCDWGYikvgPPW_3soWw3PARaM,2755
-pycountry/locales/hr/LC_MESSAGES/iso4217.mo,sha256=LKkmodvlp_dTo93mNCsL_fNJ_aWMSrbkKECe2eo7qu8,10437
-pycountry/locales/hr/LC_MESSAGES/iso639-3.mo,sha256=QtArEyn7AdKwmye6VoNo0-dHRcQuoUaqxakqGqArano,52545
-pycountry/locales/hr/LC_MESSAGES/iso639-5.mo,sha256=e4HigZoiybRHAoCU0W5fvIEwcFwXlc6SkiHMUDUftuA,7671
-pycountry/locales/ht/LC_MESSAGES/iso3166-1.mo,sha256=zH-6PntafPCOEc5uX0cMqq8OyBbmOCCZmwGPzsrSPrw,7744
-pycountry/locales/hu/LC_MESSAGES/iso15924.mo,sha256=4yVUZPWcTvsPt3gjXBo_io3IZqzoainMJSopZhPUCJc,10301
-pycountry/locales/hu/LC_MESSAGES/iso3166-1.mo,sha256=I6lBfkjygbj1Bj1vrzuuGDG4AKE5R3uj1iQjtxLO3PQ,24602
-pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo,sha256=h1z536RGjQhxQmx8IfaQO2Wpxffj6-wwYuvuXtK6jaE,68957
-pycountry/locales/hu/LC_MESSAGES/iso3166-3.mo,sha256=4fAqt1b4fSFw63xk8jvdw5bHwfsGe6SXwhzfcHLwkl8,2749
-pycountry/locales/hu/LC_MESSAGES/iso4217.mo,sha256=rLNyDbd0ZzKgCFDngXk82EdYSpqIT_tB20Aw2XArRVY,9822
-pycountry/locales/hu/LC_MESSAGES/iso639-3.mo,sha256=numYY-s-qG2n6jz8yW94gEEmhEIBF8en3CQnbSLBoRc,37180
-pycountry/locales/hu/LC_MESSAGES/iso639-5.mo,sha256=Gi5BDPXcwIMgQMVBmgI1pA3FSp6l0j12yfrmlv9vbcc,7550
-pycountry/locales/hy/LC_MESSAGES/iso3166-1.mo,sha256=SgoKIEZqOiJsfjFAVm-UEbIbO8J-4t-GIsNGi5CVdCc,30567
-pycountry/locales/hy/LC_MESSAGES/iso3166-3.mo,sha256=DFerwwdEXTrsOKykW5P_ShRYkT5sPebh-VPHO6oJd00,3474
-pycountry/locales/ia/LC_MESSAGES/iso15924.mo,sha256=1PBiVydopGdzqCdISFT_li4SvVSbcrdWsZRfs3w_8LE,8085
-pycountry/locales/ia/LC_MESSAGES/iso3166-1.mo,sha256=g8rup6qwLOGQdWBvdLX5wBILn3Xut0ksPwhiczD5U-Y,23347
-pycountry/locales/ia/LC_MESSAGES/iso3166-3.mo,sha256=qhAUSwo3yGpiUNpwuwSzMhGTR-9yF3JQ2h3dTjJO5uQ,2678
-pycountry/locales/id/LC_MESSAGES/iso15924.mo,sha256=3LEl9wkbCLMt9olNSdtyydFD9Sl5MBa2h0_glewmFNE,10195
-pycountry/locales/id/LC_MESSAGES/iso3166-1.mo,sha256=1VlyKfhYIZ431EQldXjUZXkDgLAUkiVpqBu6IMS9cRQ,23086
-pycountry/locales/id/LC_MESSAGES/iso3166-2.mo,sha256=8KzPIwuGBKn0WT6lrCeF8z8G7yZu7dDAZwXPwmG_JZY,159848
-pycountry/locales/id/LC_MESSAGES/iso3166-3.mo,sha256=ozybktlkBokoXXbkf-urGvEv43JWCSxDO1Vda7O7BIw,2702
-pycountry/locales/id/LC_MESSAGES/iso4217.mo,sha256=bZa_WATIF-LFNvAhseqzbtQFaQ6eYFClFJ9RXwFCMsE,9513
-pycountry/locales/id/LC_MESSAGES/iso639-3.mo,sha256=kApzflAdWd4t9eHUq15iJXA-FiHiJ2KBdL3VbSG0yLE,292415
-pycountry/locales/id/LC_MESSAGES/iso639-5.mo,sha256=ek0deioGwFL9VCZz5N0FWLj0CS_iZN31e1qwM24I86g,6346
-pycountry/locales/io/LC_MESSAGES/iso3166-1.mo,sha256=the_kbOffosZWAy_AczRytjRJ-N9Rs0VAjs6bzpijT4,9210
-pycountry/locales/is/LC_MESSAGES/iso15924.mo,sha256=NsRE93o-G5ZqhHFPzJLeExrqh_VKrQEm5-DSSlbjFAo,10637
-pycountry/locales/is/LC_MESSAGES/iso3166-1.mo,sha256=A82F_9dYIwcISOQ-46XaA8OKQ5IEUUwo146oG3NoMZk,24295
-pycountry/locales/is/LC_MESSAGES/iso3166-2.mo,sha256=NJ3kQGeSxOODOH2gFd7L4dMcFqCWXxwWEMqIagCKX90,4405
-pycountry/locales/is/LC_MESSAGES/iso3166-3.mo,sha256=H4DY1fZ_yZh1dFy8DCazWL_wKqEMbBV6i5ZDsevDJNE,2961
-pycountry/locales/is/LC_MESSAGES/iso4217.mo,sha256=9WF-9Tng8xunSKcJfsYuvGL9fGjGnqrTfB1lahTR2-4,9804
-pycountry/locales/is/LC_MESSAGES/iso639-3.mo,sha256=MoMDngccs6iCtwBXty1GnjaajKyV9M8PXToEYTwR72c,149997
-pycountry/locales/is/LC_MESSAGES/iso639-5.mo,sha256=bVNRcpSArWK7djnpmhOM8EGw9uYGTzrVN6_MlBqsCJI,8015
-pycountry/locales/it/LC_MESSAGES/iso15924.mo,sha256=3PcifL8wKpwbWx9dFSHkVeROgTZLqJZvXxle-073dWc,9447
-pycountry/locales/it/LC_MESSAGES/iso3166-1.mo,sha256=PoHfAmyCRWOlnbTgEbxATpn4MxEN9zd1S4FdxpxGdHM,23660
-pycountry/locales/it/LC_MESSAGES/iso3166-2.mo,sha256=ga7v0RIDdcdhbQTAuYGsMkdT0NYLH7vYFN8mbvBUJwc,157445
-pycountry/locales/it/LC_MESSAGES/iso3166-3.mo,sha256=OHn1oi0HReKAuA5iL8UuvcJkTsB1JgfB-QnQivGhtM8,2720
-pycountry/locales/it/LC_MESSAGES/iso4217.mo,sha256=Ho2xKcqhfDiGjSdCPI0rI6_9JIE7nnjnUFaHkaB7Tg8,9244
-pycountry/locales/it/LC_MESSAGES/iso639-3.mo,sha256=aPsP1OZAeba1cMeTwGNnRp-jFStALeX0onPnssISNWQ,369645
-pycountry/locales/it/LC_MESSAGES/iso639-5.mo,sha256=lZR81FkGkil6wZCILOorTOuybp_AdUiw5l5aIPn0HOM,6985
-pycountry/locales/iu/LC_MESSAGES/iso3166-1.mo,sha256=KML26LA8WfyalJ2HpmWRo2vRw3yV0RnxeRouMsEmbx0,1634
-pycountry/locales/ja/LC_MESSAGES/iso15924.mo,sha256=-jJCTC-JMAHR2milX9I6jOURullaz3REgv_WxUr0Rx0,4131
-pycountry/locales/ja/LC_MESSAGES/iso3166-1.mo,sha256=B6HRa1uWbjbpXpYr9oCO3Iut79PvhX9mw7DT5nardY4,24942
-pycountry/locales/ja/LC_MESSAGES/iso3166-2.mo,sha256=9grxJjonmTxBNcbfJ8HmXqygDOkEwup4se4O48MiXr4,99516
-pycountry/locales/ja/LC_MESSAGES/iso3166-3.mo,sha256=fhh7_zTxzd3FhSVEbhqzKUcQ8mwoCkDjTHyHJGV46D8,2724
-pycountry/locales/ja/LC_MESSAGES/iso4217.mo,sha256=OpOggFonS1d7L8ayRakkdMi6PMkUkP3dKtwGNGIy13c,10051
-pycountry/locales/ja/LC_MESSAGES/iso639-3.mo,sha256=FZWYk_X_VAFXgarDvUOlPQg363NhY3ynh_6vvlbL4ao,16790
-pycountry/locales/jam/LC_MESSAGES/iso3166-1.mo,sha256=uwGY95PKQaNhrVHycFQvwW1Rmzxa99R0o5EH_tJeh2I,8321
-pycountry/locales/ka/LC_MESSAGES/iso15924.mo,sha256=X7EaDENBGyFA5t46us0J9PBdS3U1vT8t3ojjPoWXU0I,6755
-pycountry/locales/ka/LC_MESSAGES/iso3166-1.mo,sha256=ZoDszEZ3RoUf0RmmC-ZMWNF0pDRNTex5lucgJdTBFYc,36655
-pycountry/locales/ka/LC_MESSAGES/iso3166-2.mo,sha256=SDWPbTZRDy6cxI4YEGcGiCclTpG4FcNUfZGGOLmQQPM,111221
-pycountry/locales/ka/LC_MESSAGES/iso3166-3.mo,sha256=USd-N-sbW_zNmAuC_-yvitKenHAr8-jgJjUPEtQ8nw0,4426
-pycountry/locales/ka/LC_MESSAGES/iso4217.mo,sha256=3ENLfUSCC793IMX80iSktX4rpj4hd_zDokzEEIcJYJI,13229
-pycountry/locales/ka/LC_MESSAGES/iso639-3.mo,sha256=aC4dBiZ3RhvTpGZlw1y2auiq6kgjWke8ALnIaqhPse4,371
-pycountry/locales/ka/LC_MESSAGES/iso639-5.mo,sha256=9Vm75nkeluDlrDbgxEsVA4u-xeTrBhe5bTKiPgZ07nY,11127
-pycountry/locales/kab/LC_MESSAGES/iso15924.mo,sha256=WQ04VkSplBiAbzyUG5IdEwUd0id88G9Mo915Iy5S2T8,571
-pycountry/locales/kab/LC_MESSAGES/iso3166-1.mo,sha256=wlwveOA7MtH7NnfdppMvke-oizv1Hq0EZLtFyWu4zq4,6371
-pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo,sha256=RZ2aoXFVl9w0mH4-1u2zrE_aVgtuNVjLhcFMNt_xibs,1099
-pycountry/locales/kab/LC_MESSAGES/iso4217.mo,sha256=WEAogp5MgADVviLyZjT64FhWkiIPrCWAgqXua00xtIQ,830
-pycountry/locales/kab/LC_MESSAGES/iso639-3.mo,sha256=JkAo9SMzPrJFc-PurqUQ6kbvPwlxb19xaNzxbQOgf9s,979
-pycountry/locales/kab/LC_MESSAGES/iso639-5.mo,sha256=XJdqi1jdqzyerEao1SFBOOUe_UZgtz58Rshzk2mu2Eg,372
-pycountry/locales/ki/LC_MESSAGES/iso3166-1.mo,sha256=mWIyJogZzDehTwYKmxXK8bdpdk2hlx7pkDX0Rt9FBks,5119
-pycountry/locales/kk/LC_MESSAGES/iso3166-1.mo,sha256=5f5iQLfEVfkHOLbQ0WK-aJB8nMOuGHxaQAjm9Ze5ofU,29652
-pycountry/locales/kk/LC_MESSAGES/iso3166-3.mo,sha256=W5bf02Qa5Psz9AWQR44QFx1BAOC2hzggCk33dz0S8Zs,3237
-pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo,sha256=k81CXX4w66zGYW2eLG_5C_7H8Drqg8-xSneTDtK8pf4,530
-pycountry/locales/km/LC_MESSAGES/iso3166-1.mo,sha256=3FTC8RZ6c4jN1nJ_2Mac5WcZ9SHL43Nzu6g1yFRcorg,36282
-pycountry/locales/km/LC_MESSAGES/iso3166-2.mo,sha256=aRMO25FLuuJsXc_X21V09B9V3Ctds-nG7kB8lx3aJgY,372
-pycountry/locales/km/LC_MESSAGES/iso3166-3.mo,sha256=YklIULLU34pf4DJeUUFs_mJ-gE2V_42-OZs1pyur-94,4069
-pycountry/locales/km/LC_MESSAGES/iso4217.mo,sha256=x6Z9uZDQcGCBpVzDXixvB3b1bZ65ilqxMu1baxQNLds,5396
-pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo,sha256=zGBNbF0LUNqh1aTAQICfM5h-S_dCY9vdl5hH_Iov_5o,21966
-pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo,sha256=hyMipX89DXSas_Ut-NJHBxvps90OTLKl4aB1x46Nr6g,2695
-pycountry/locales/kmr/LC_MESSAGES/iso639-3.mo,sha256=zlbjl066YcmcUvZcsar8lCH3EYbjuBPxo7d0W1wjDGs,770
-pycountry/locales/kn/LC_MESSAGES/iso3166-1.mo,sha256=T6dtyPAolD3mTkF-nFzEyjyJSAnaj17isjlWh1Z3_tA,29606
-pycountry/locales/kn/LC_MESSAGES/iso3166-3.mo,sha256=pZnO4_hvideU6kf6qhDNvr7fGsFEQRr-Q0796Tl7rn0,419
-pycountry/locales/kn/LC_MESSAGES/iso639-3.mo,sha256=AYCMdh8NjdapUwVSGDzUCZmrK4wV-u341qo29NLpjSQ,390349
-pycountry/locales/ko/LC_MESSAGES/iso15924.mo,sha256=NkRygCl0Pguf15xKrTF9-NcCY4V-OlDIsUMdcsX9cjg,2668
-pycountry/locales/ko/LC_MESSAGES/iso3166-1.mo,sha256=srf9KWiBvy8MsyrJ1Xj-maVD8ZNlLTtr7C1oJfeyiCo,24296
-pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo,sha256=PveY_Yqmkr4y53TzZ5nikMEiKAAU5uh6k4-anuJDB5o,4513
-pycountry/locales/ko/LC_MESSAGES/iso3166-3.mo,sha256=NkIgm4Bv9odil2Dew18uCTygia4XisFmnivqeBRpH8M,2783
-pycountry/locales/ko/LC_MESSAGES/iso4217.mo,sha256=mSbaU3uFMgEmxVNt_WDwGz96t-hZ26thZ-wE46cnWfM,10767
-pycountry/locales/ko/LC_MESSAGES/iso639-3.mo,sha256=ayL0NVXCjlkiYu6GA5SGDbARF2VH1JTW8P89zNESfTM,18040
-pycountry/locales/kok/LC_MESSAGES/iso639-3.mo,sha256=5S4r9mRLkIXhlEoDoYpjQKOGlaYnIi59kulMJaV0OPM,6584
-pycountry/locales/kv/LC_MESSAGES/iso3166-1.mo,sha256=BZbH8N87ExrFP0-ZJOCdu5XRt3svWGnB3MMdKKXM9Dk,5803
-pycountry/locales/kw/LC_MESSAGES/iso3166-1.mo,sha256=Dxg932KVJl8zZ37knp-LOO-lYXo_rrkinzBJ3DOm2jU,9310
-pycountry/locales/ky/LC_MESSAGES/iso3166-1.mo,sha256=0rvHR3neRAG5sPD_VTZpyZV9rIu8fi2Iqc9PNwmq3bA,29069
-pycountry/locales/ky/LC_MESSAGES/iso3166-2.mo,sha256=YNzhvpBhs7kqZbjtU3OrnVWwR33DkDqTgX2Lncnl4VA,1419
-pycountry/locales/lo/LC_MESSAGES/iso3166-1.mo,sha256=KUVxvsDSnxv1LQ3gc0AAG3y5Ysg5YhwVDSd-x0Otij4,5756
-pycountry/locales/lt/LC_MESSAGES/iso15924.mo,sha256=9QYebB0VXZr3l08a9NlFNI2epclur8RiIxKjF1RS2Es,10170
-pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo,sha256=oWNw_HLnYXVraRY0JYf2q2VqK_ux5zeX7uI7zz1QuLc,24199
-pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo,sha256=Bnp6shUfWxRuWfWdRvYhyUsL-M9qRIfySCBl_9zTzz8,75519
-pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo,sha256=kVA78seKlAPiIVsAurshuYvJCbuw-itdcQGhCL25BCQ,2987
-pycountry/locales/lt/LC_MESSAGES/iso4217.mo,sha256=pWPemu3SsvgecohxWkQydWvrn-YO8Bk082LbIReJoe0,10089
-pycountry/locales/lt/LC_MESSAGES/iso639-3.mo,sha256=c4HrVVFW1WIHg2LoDw1eGki7mgA4EaVl_tIyOefQSfw,31678
-pycountry/locales/lt/LC_MESSAGES/iso639-5.mo,sha256=rQGaYxSU5AAqer2AIW1Xx0JQF63GgaWzNO6aIwT_h8U,7646
-pycountry/locales/lv/LC_MESSAGES/iso15924.mo,sha256=OoS8qucwkeEXxfn1RGtFTltZnRlfO_lvmUs_J3tPNl8,9267
-pycountry/locales/lv/LC_MESSAGES/iso3166-1.mo,sha256=FbigEYJkunPuKaXRK8op-FQBSts_ehkPH7T5UxFm0Os,22888
-pycountry/locales/lv/LC_MESSAGES/iso3166-2.mo,sha256=MaAHhZQbeXynbc_J4_iTsaEwqMj3soPIVsVwSMe8MSE,2565
-pycountry/locales/lv/LC_MESSAGES/iso3166-3.mo,sha256=Ff997ECeSBlB5gzRRBUNhz0aH0LIOsjUu71ajYkkD7A,2671
-pycountry/locales/lv/LC_MESSAGES/iso4217.mo,sha256=AJ8ufVtN-z4M0DtYWFMSBWMxwrWAcj8QIBxNy8ixEk0,7313
-pycountry/locales/lv/LC_MESSAGES/iso639-3.mo,sha256=OQwqiAnV-kje06xMnY5wa_BxOl3ZRtCmsn63vlCAd-o,10625
-pycountry/locales/mai/LC_MESSAGES/iso3166-1.mo,sha256=Q3zMxb1sdp3H11a2ZWPMsxYuE4SSiWEKA2Fv0ZECiJQ,4535
-pycountry/locales/mhr/LC_MESSAGES/iso3166-1.mo,sha256=OV_oQbIiaNsA67k5yfpXqRyVovHcZgnWBePeOB4RcWc,5636
-pycountry/locales/mi/LC_MESSAGES/iso3166-1.mo,sha256=-mgk82qP3F3t5qVkFXlloMNM2idpyR4pF-jllMpknYw,10467
-pycountry/locales/mi/LC_MESSAGES/iso3166-3.mo,sha256=G_QNpnHvyCtiAh5Qio6C9xVPfhbq55uA5DtBJk7lcn4,446
-pycountry/locales/mi/LC_MESSAGES/iso639-3.mo,sha256=A3hPSvsJwEjJanUMFv_gV6wqe_7ITt4cHsU-E9EupQI,1619
-pycountry/locales/mk/LC_MESSAGES/iso3166-1.mo,sha256=f7aGLn5mdmyNHbLVUwO1IuC7FRQy2watIQZq7nlSBG0,27425
-pycountry/locales/mk/LC_MESSAGES/iso3166-3.mo,sha256=7EABtmE5bsAqb8WIiuwnb9Xj0Dgf_C2cOOptNPkwKGo,3238
-pycountry/locales/mk/LC_MESSAGES/iso639-3.mo,sha256=Q_wdjEiWESD75_JaKNgTliv8gRT6F-FS2pVQVuO79sA,2178
-pycountry/locales/ml/LC_MESSAGES/iso15924.mo,sha256=3P2PyoHcd9EwikqSN6Aw7cAAIRXUeNE5WkwafL9Jnm4,1295
-pycountry/locales/ml/LC_MESSAGES/iso3166-1.mo,sha256=moYe_RNoONL6eDJm4OVvhtykxpwYFtOfkTL6yV-8lvs,34752
-pycountry/locales/ml/LC_MESSAGES/iso3166-3.mo,sha256=WdB6nZlhBoIA5A5DrnSZ4oKfKZejUnIfjW6X2X0EB4M,4406
-pycountry/locales/mn/LC_MESSAGES/iso3166-1.mo,sha256=_xQUlpY_x_hWtWV8T8HMorrm24VTjhD5XNndVGhXJs8,10101
-pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo,sha256=Tyr2sUeOHxFeqCxCyKYFR8kz_MMsEf5RIipQXcEceKw,427
-pycountry/locales/mn/LC_MESSAGES/iso4217.mo,sha256=CdhlTrQlm_9TFLzt6d1MxXLFTXlsnMeaMMriyPaC4Bk,5207
-pycountry/locales/mn/LC_MESSAGES/iso639-3.mo,sha256=n_gwivkBpobWRq7mB--L1JdB172cHm78xbwqA_KUNd4,6401
-pycountry/locales/mr/LC_MESSAGES/iso3166-1.mo,sha256=BnSxHnjfkTcXH03VahbT3kxr1b6zbHEYXwh33ERlC7g,35144
-pycountry/locales/mr/LC_MESSAGES/iso3166-3.mo,sha256=KFmyk3-Uf6vDStG14wk9kMk4qx34jDClz6PfLl-kIPs,3916
-pycountry/locales/mr/LC_MESSAGES/iso639-3.mo,sha256=AkCjp5dpBhLUvrBhBIy_mPBCxgHIQRsyiG7jcQldXkA,425099
-pycountry/locales/ms/LC_MESSAGES/iso3166-1.mo,sha256=U_dzi6MSkgaGpnIll9EsrZmWERbcBd_Z_Y0exgxS_lY,12693
-pycountry/locales/ms/LC_MESSAGES/iso3166-3.mo,sha256=rqFgeg2aulLXDqz6J3okbjs6K4gHlr_v5iTmDNWHbw0,473
-pycountry/locales/ms/LC_MESSAGES/iso639-3.mo,sha256=kEePQIWzA6yt7j3TVuiIYdIoZuaNM5C4BnIf-QhSjzo,2386
-pycountry/locales/mt/LC_MESSAGES/iso3166-1.mo,sha256=OhMqW3cJN9BNX-8QIUkNjt6TkCpHX7kYCKqg9ZwGciw,9641
-pycountry/locales/mt/LC_MESSAGES/iso3166-3.mo,sha256=wcDxImw9CGvLGsVLL3vNJFLMbyy5hyg5DHUA_f-jyik,402
-pycountry/locales/mt/LC_MESSAGES/iso639-3.mo,sha256=KyLeF56ABhY1GES7FPy9CNYBpAl5bbbmFSi9cI6Sexg,9694
-pycountry/locales/my/LC_MESSAGES/iso3166-1.mo,sha256=XRheiVAoJlgFplfbVXr4jqmYjHfazkDxHxPbr26tzGQ,15588
-pycountry/locales/na/LC_MESSAGES/iso3166-1.mo,sha256=oHg0zdK3UGG6on99NzrvTpWLNoC2C2mK_TKU4cTtt04,6574
-pycountry/locales/nah/LC_MESSAGES/iso3166-1.mo,sha256=M83IQ32HXa150nN5RqyumBNkBO0vJrgma8AJHU--G7Y,8116
-pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo,sha256=ZEh0GY5fQesNRed0yWel58JmU-cVr7WiEWeYVPoRCKc,4069
-pycountry/locales/nb_NO/LC_MESSAGES/iso3166-1.mo,sha256=Arn3Zn3jGewiogV__nJGrHjIIS04M1j37an8CJdPwR8,23547
-pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo,sha256=R_aHdRjjiA7PICO2q69-xzk0xtQ2Z_93TVktIMHa7bM,1305
-pycountry/locales/nb_NO/LC_MESSAGES/iso3166-3.mo,sha256=-o90o0KauhkoyIMQ6NuVMQCuRax0jC1HWLlzxO5hCYs,2838
-pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo,sha256=XyDB11iBY7HYZw0hPntMaEEsPipm6Rlq-fK9He-aOC4,8569
-pycountry/locales/nb_NO/LC_MESSAGES/iso639-3.mo,sha256=l6jiErTbYHJ4AFcfenmlPq9wQtDcy1PvA1SRItdyzKg,5570
-pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo,sha256=bidWzaFBsRoOv2OWh_plbhZz00MmUZHuBsGfeZU1BTU,1237
-pycountry/locales/ne/LC_MESSAGES/iso3166-1.mo,sha256=KqYeIe99y3Ew9AHs8RvpYAdkmgxEswtuUaknRtcDSt4,32389
-pycountry/locales/ne/LC_MESSAGES/iso3166-3.mo,sha256=rRjEPNnu3Y-W_VoLzmKc72CnqLhyxFQxWtbPJuMrvoU,3799
-pycountry/locales/nl/LC_MESSAGES/iso15924.mo,sha256=a9799cDp42S4QxtT8ofhkvYRXFh9kn5tUD9P-2D5fKw,10224
-pycountry/locales/nl/LC_MESSAGES/iso3166-1.mo,sha256=sPXfhapd55zYe57bTbiHuIYdiUk0xHIvtG8oQQotSlk,23512
-pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo,sha256=Rnq8tMHb8IsIUcxrK-naH9jIyuRbKFU4kmQmOWOyHtE,215191
-pycountry/locales/nl/LC_MESSAGES/iso3166-3.mo,sha256=QzLPYfbj8ko6LQLQPh0Qfdkx4xRN1RxOLR4DoVUfiaY,2959
-pycountry/locales/nl/LC_MESSAGES/iso4217.mo,sha256=bRJeb7rmRFiMPm6CrJ6fY6vSsmE8v9OYGp5nbTjUp9g,10365
-pycountry/locales/nl/LC_MESSAGES/iso639-3.mo,sha256=4C7AFhBEw3zd8FYYv3_Xbc_FcsrUvoY-d1rPjqFdxzM,86365
-pycountry/locales/nl/LC_MESSAGES/iso639-5.mo,sha256=eqhBfJsw89Ys-a4Kanl3g4X0UWbkhKk9SWgzCJ62C84,7532
-pycountry/locales/nn/LC_MESSAGES/iso15924.mo,sha256=CqbUV23MOxzmzuZgB8WtLMbBB7uwuPM9JI98RlXjrXI,3464
-pycountry/locales/nn/LC_MESSAGES/iso3166-1.mo,sha256=GpNnfkiFwCnCiaT3ujWx3ArZSSm78DuVnvEkosK58WQ,21966
-pycountry/locales/nn/LC_MESSAGES/iso3166-3.mo,sha256=0Mggn7fYr37ZRb2Ooc7MoHqchPbf8_DpDVSp-lGPapM,2601
-pycountry/locales/nn/LC_MESSAGES/iso4217.mo,sha256=32ankGZqOLvRsGGkSHmK8CaY1MiuaQeTu52kr-Hj7E8,7566
-pycountry/locales/nn/LC_MESSAGES/iso639-3.mo,sha256=f_ONciTEpsEqcvJc6GcYUloAONNv9SgYwSjy6e4fQWQ,7462
-pycountry/locales/nso/LC_MESSAGES/iso3166-1.mo,sha256=RCdEiQwrUWbdd2WSrnXmWknjz0zARWdpT2w9nnOhblk,7830
-pycountry/locales/nso/LC_MESSAGES/iso3166-2.mo,sha256=YhnDOB-v4jfMR4TGjv_9cAMqfw-qBGL9Rj4zSRr28NE,932
-pycountry/locales/nso/LC_MESSAGES/iso3166-3.mo,sha256=Ofa3OP2PVJhWdUMJeDgMm208HTQYrqsLu0oiK-Mu7a4,521
-pycountry/locales/nso/LC_MESSAGES/iso639-3.mo,sha256=lAzl_ZZmKdS4Xexh20QcVi1GUiAFsu3v29b8Y5-u_Kc,2872
-pycountry/locales/nv/LC_MESSAGES/iso3166-1.mo,sha256=TvwEZNkDekfC7Pwo98I7s5rEuXo1Sy166H5Pzm_s57M,5808
-pycountry/locales/oc/LC_MESSAGES/iso15924.mo,sha256=JbJNE3pUlwNeuEqWGM8EqRkmYxV2z-fqwfQs-vbVjZ8,1713
-pycountry/locales/oc/LC_MESSAGES/iso3166-1.mo,sha256=x36bwuWld6kT8GQ5hXmTWWyZFb8rTcTtvx9MfYCMcXw,23749
-pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo,sha256=Ig7I7dxfosV1l98AyUlZ3SO15y85pnk_eIGbBy4dGNM,5637
-pycountry/locales/oc/LC_MESSAGES/iso3166-3.mo,sha256=ECpyuk5S_Rnzwley3Qo2mAKyehN2Rl4HwmU3js18OFc,1105
-pycountry/locales/oc/LC_MESSAGES/iso4217.mo,sha256=3w9xX-qdcOvwQE1zILof_dCdCkqLT42X0-9h0zgr0Ow,527
-pycountry/locales/oc/LC_MESSAGES/iso639-3.mo,sha256=XCztvixWxvZdsv7exOJqn_bzvZmqcmEBGeSkwKzlVLA,3446
-pycountry/locales/oc/LC_MESSAGES/iso639-5.mo,sha256=tz9tIGP47WFBJkd3bBCWTV4RdOU1U0FZgbENT7qGiE4,856
-pycountry/locales/or/LC_MESSAGES/iso3166-1.mo,sha256=l_IeB2IJTCvBKpjxpgzsOvx-p7psmaRtW8f_oVeKKAY,34110
-pycountry/locales/or/LC_MESSAGES/iso3166-3.mo,sha256=DzJxc6bigfxYLlpkdUGrcEzb1b8lx2ZVnl_Sr9ITGdo,3975
-pycountry/locales/or/LC_MESSAGES/iso639-3.mo,sha256=yZFsd6SCJlAcMURl06SoxbAGV_jQ2bQbpatjUL3nQ7M,217560
-pycountry/locales/pa/LC_MESSAGES/iso3166-1.mo,sha256=9ErCZdyNlZYAeAPRMvT-2gk7yxbaF3n-9p4kkxibi4g,30877
-pycountry/locales/pa/LC_MESSAGES/iso3166-3.mo,sha256=Tk-lQ6dBpKC8UXjFfTs7q5TTiq2Uk7IFnE_qgBlPIps,3558
-pycountry/locales/pa/LC_MESSAGES/iso639-3.mo,sha256=T54oKUkzOnvS06ffITy4IDNZ6N0biTyUQMdwOrVBOfA,410401
-pycountry/locales/pa_PK/LC_MESSAGES/iso15924.mo,sha256=LJ-WjXSCxdR7deHiNLN_80s1izE8-7Njtgq7JvZQiNk,1418
-pycountry/locales/pa_PK/LC_MESSAGES/iso3166-2.mo,sha256=qlW7oyRPyaCgtkARCmw5qYtL47ULlyJ2hubStN0r3ck,1018
-pycountry/locales/pa_PK/LC_MESSAGES/iso3166-3.mo,sha256=ouL9SO_HROrNz0-ni3vXOI_KcYiDge_V3k8X7qEAAmA,601
-pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo,sha256=FBb09ZfgpfjYTvXwOKXQz7_Fzv-8ZRBc9XtOhCIWIN8,531
-pycountry/locales/pi/LC_MESSAGES/iso3166-1.mo,sha256=pFlBizXn1qcFEftRLHC1OvO5YEY8pXhPYKA1G658Lqk,9264
-pycountry/locales/pl/LC_MESSAGES/iso15924.mo,sha256=ChZDUSPyEhTcn_CmTJkUN-OVScdBsVXnBH-GksUraVM,10158
-pycountry/locales/pl/LC_MESSAGES/iso3166-1.mo,sha256=hwzk101N_IVUvwufamjDcNe1fJ35SvOnrB4Ifwy70y8,23849
-pycountry/locales/pl/LC_MESSAGES/iso3166-2.mo,sha256=dDeL9yhP7MJnUwmHA_qZWXjMcnxVto9d3FIe40tS8t8,203350
-pycountry/locales/pl/LC_MESSAGES/iso3166-3.mo,sha256=DrapsF8pgNEYySgjjUYr4b5_VaSC4rSQaSo2cXcF3FE,3054
-pycountry/locales/pl/LC_MESSAGES/iso4217.mo,sha256=XDBLhQVRL4QgTdo7EgA-l0QUBLAofjT4dDDMjc6n-aM,9807
-pycountry/locales/pl/LC_MESSAGES/iso639-3.mo,sha256=1467OYlnc9nfNzHOWF6yijaZP0YD2alsnaAM5sRww6Y,121821
-pycountry/locales/pl/LC_MESSAGES/iso639-5.mo,sha256=pUck00ME7y7U8wwe2D0tAAGDofM3L5mGV9fOoPKCqFY,7985
-pycountry/locales/ps/LC_MESSAGES/iso3166-1.mo,sha256=xPw4NqIJqKxTIAp2OuKAd_ca5NMfZ4aNkEiD_nYzoHY,7217
-pycountry/locales/ps/LC_MESSAGES/iso3166-3.mo,sha256=erg7jvNw-16he0-ZncGQLITx9EO2y_QqEVcTG3LxZzY,392
-pycountry/locales/ps/LC_MESSAGES/iso639-3.mo,sha256=0XxdqpiZdMeBtRMFFxukxfnK59hpmBW4JSj2EWZ9N8w,1709
-pycountry/locales/pt/LC_MESSAGES/iso15924.mo,sha256=JwYTVlQ3mxSFJ3nM2rteUO-Ea528Jt-wVBE9DLxPSm8,9583
-pycountry/locales/pt/LC_MESSAGES/iso3166-1.mo,sha256=uK1qggQLhfKMdhnIAsa6dHnsM8-fToIyBGGQ8YjStmQ,23926
-pycountry/locales/pt/LC_MESSAGES/iso3166-3.mo,sha256=w5pTDJ8tXLVYy03azTi45nRpHpKG-v98gbi4Ko7eaDc,2716
-pycountry/locales/pt/LC_MESSAGES/iso4217.mo,sha256=YgHNnGn8_rwdixUmkqi2UkxXD9O3Fnt16DOFno8UVjE,9110
-pycountry/locales/pt/LC_MESSAGES/iso639-3.mo,sha256=56AzlSwKl3EY9LejPNhNxVJX2VsHlX_ZGCPse-jO3eA,15062
-pycountry/locales/pt_BR/LC_MESSAGES/iso15924.mo,sha256=8PbEoQcRvIjgHHofQW00hndDMuwmWZYYTNAssU50Gc8,10363
-pycountry/locales/pt_BR/LC_MESSAGES/iso3166-1.mo,sha256=N2ZJSGXno7X6FXWPdIuAwlrY3ogUnwFq55972aw1JQY,24079
-pycountry/locales/pt_BR/LC_MESSAGES/iso3166-2.mo,sha256=7qWV_nMXP2DzALW4yhfdL1hguzywzQvoY0QWszs6g4I,858
-pycountry/locales/pt_BR/LC_MESSAGES/iso3166-3.mo,sha256=DCpWd3635J0iZDReha3WpsMjqMb8hbalzVOwFn3yao8,2874
-pycountry/locales/pt_BR/LC_MESSAGES/iso4217.mo,sha256=4jkfYCQ7l7g2KOYehzby6gX5hZc5nk5cP3GPltz4j_4,9032
-pycountry/locales/pt_BR/LC_MESSAGES/iso639-3.mo,sha256=wZESsoY5izriySsHA-qWdmGwevHu-A_YAmFJSRnyyN0,17829
-pycountry/locales/pt_BR/LC_MESSAGES/iso639-5.mo,sha256=9rvvH1v8spqAF__R_WLf3gLqTS2zjQ_MMrWZsk2GTm0,7751
-pycountry/locales/ro/LC_MESSAGES/iso15924.mo,sha256=1hb54cTl8Ar7XJ6NsRq-I1RB66rFpbQ_aFB_Iyl7okk,10632
-pycountry/locales/ro/LC_MESSAGES/iso3166-1.mo,sha256=9adL4zOH3Uj-U_XzcfBfEyhnhXptt3QhnUKDziTULvo,23486
-pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo,sha256=2AJIFTDrgKN4ZfOk6pfSmMYu1xeth536mNOB25CewZE,229998
-pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo,sha256=6at6aDNhW5PJf9Fu38J8SG8lTrA7x9xZNay5sA8whr0,2987
-pycountry/locales/ro/LC_MESSAGES/iso4217.mo,sha256=uL3NPnUt7wptPaNm19-TrSjuxK1jUExTqu0CIGLoiCA,9977
-pycountry/locales/ro/LC_MESSAGES/iso639-3.mo,sha256=P3QxxTJqqULInvWK8bq25xaJMurvEO2qsqAGEA84AHA,10854
-pycountry/locales/ro/LC_MESSAGES/iso639-5.mo,sha256=Gs01_bLv7tVgk6YHOBMdo8YwxxFzQOegik4j4izamzo,10650
-pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo,sha256=8AiYPq4bSuyBEGrJsLYmgB5O-Bn1AO6IiB0Z2eyO_30,1779
-pycountry/locales/ru/LC_MESSAGES/iso15924.mo,sha256=D5nhIbZqZHViF0o7WCIIhyeto0fXS86S7K8KCnY31rM,12713
-pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo,sha256=9pk6rUxpE7I96m134PUhpMsa0aQdPyepjnE9xfu0Qgg,29823
-pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo,sha256=I-RxALMIdmlGpmVQNOog8kJrJ-guGvFqD-Nhi5R4444,105964
-pycountry/locales/ru/LC_MESSAGES/iso3166-3.mo,sha256=qg0LShA2DRa0FseecDzAwz0KqeSRKjyNtlJGgUf7Pc8,3480
-pycountry/locales/ru/LC_MESSAGES/iso4217.mo,sha256=Ko1sklB9eL6rTchOfDhyijv5p1RfWhjd9q9HJgKAL4A,11510
-pycountry/locales/ru/LC_MESSAGES/iso639-3.mo,sha256=BRjNeHk99_CZr_nyfgDjv0am70NrDdhbNGR04b_PN-4,18412
-pycountry/locales/ru/LC_MESSAGES/iso639-5.mo,sha256=xPQkTh32f-291290kVULkZT6qRxcekL5fA_u_lLvyKk,9598
-pycountry/locales/rw/LC_MESSAGES/iso3166-1.mo,sha256=0dfUtV06-48LrFMpuQb0kKxvmlzNcP8IGJ_P0nUHuks,21974
-pycountry/locales/rw/LC_MESSAGES/iso3166-3.mo,sha256=n8NqLeYepsK71DRZg4ruvP5oQhX83_NZ56vt2QimFdk,560
-pycountry/locales/rw/LC_MESSAGES/iso4217.mo,sha256=p3aVUk8p6Wp0bHdh0bu_N-3HBbXOZSOynm0x4SoLUN8,4998
-pycountry/locales/rw/LC_MESSAGES/iso639-3.mo,sha256=ty7dUCVZtqhhipVkC8FFfjbBpXFbjwZRNT4kUrBpgt4,14237
-pycountry/locales/sc/LC_MESSAGES/iso15924.mo,sha256=puEq5iMH0DSy_PoPfzpm1MJlxgCSSK_6LLX3-P7YeLc,10473
-pycountry/locales/sc/LC_MESSAGES/iso3166-1.mo,sha256=a-5NsP93OJzAomcXMuhAmmUFOGz9PyKXoMhBYtHstYw,24430
-pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo,sha256=I1K9JxJWVrdqqXZiw88INw0Zk-er9UbfITtcgigt5yU,99178
-pycountry/locales/sc/LC_MESSAGES/iso3166-3.mo,sha256=49J-KVKf6uO1GkN1XDla2hfNVn8G_WvfnE-3yLSG9b0,2948
-pycountry/locales/sc/LC_MESSAGES/iso4217.mo,sha256=n9dy-L4xLPMUoK4THCi402jIBwfUicixAqhcop1IZTI,9999
-pycountry/locales/sc/LC_MESSAGES/iso639-3.mo,sha256=g5yoELm4g5lREZ-VW7dD45gr-lRBJnM7_VEhMb_jdAg,19985
-pycountry/locales/sc/LC_MESSAGES/iso639-5.mo,sha256=xZwNntGTvduMcHXwJyb_j_0bQmQENHL6j6V9Rkz5C0o,7679
-pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo,sha256=V3bYIhtjsBccUKR5b3Q6KzceC-V9ZBSFTJDXqAEB1Ac,3785
-pycountry/locales/si/LC_MESSAGES/iso15924.mo,sha256=r8OMAYoDUkZIV8uLQqsl3v6OOIq_qXgjeqklAaGPgVk,600
-pycountry/locales/si/LC_MESSAGES/iso3166-1.mo,sha256=MVytBciZLPiFg1A8hdZjrUUgyasQhm7wBNe44Qg5i-k,31931
-pycountry/locales/si/LC_MESSAGES/iso3166-3.mo,sha256=zsvrlfeeg_GXVuSI0yhZj3nYwCnnqsYBf_5Gpkz6Rc4,3816
-pycountry/locales/sk/LC_MESSAGES/iso15924.mo,sha256=Sfg3wQLW7k337omWSP1sgOk_UtaoMtoXA3BtVAWmGpI,1782
-pycountry/locales/sk/LC_MESSAGES/iso3166-1.mo,sha256=T45425Ar2I0Gb7HUOkh3h6pnmtVmu0CSlLikzy_-oYs,24190
-pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo,sha256=Ha6oIfiN1HtxZBSEenVf2jCh-EWTHjvD_IcNLYE3_zQ,13180
-pycountry/locales/sk/LC_MESSAGES/iso3166-3.mo,sha256=Qlk2HG60ssgXDYEU0kKyc8LgYc2wwaQUdIzMT3XKPt0,2887
-pycountry/locales/sk/LC_MESSAGES/iso4217.mo,sha256=_fmxcCaFZiO_sPGHyP3QQpch8J-QfsQk6jFnMbEyWfM,4911
-pycountry/locales/sk/LC_MESSAGES/iso639-3.mo,sha256=7fb1U7ylNLw0RwO-2Zsg5yHLU-eCkkaSrKLlY7JiKS4,11443
-pycountry/locales/sl/LC_MESSAGES/iso15924.mo,sha256=v12SjHgRm8aD-fvGzzO1t_ly2TGq_cVRzlbaBOqdAYk,6350
-pycountry/locales/sl/LC_MESSAGES/iso3166-1.mo,sha256=Eo4U8KyzSl5YjeqZTwpcXRWtPwOn5e44zUZ6y2tsUXY,22611
-pycountry/locales/sl/LC_MESSAGES/iso3166-2.mo,sha256=qJzdttVJy_27na2WMlMnIsnNpgVBgnD1PUuQ0xB3lxY,79342
-pycountry/locales/sl/LC_MESSAGES/iso3166-3.mo,sha256=he-9cSPr8xanRF6OlaSpRSnCdDnFyQbvt6Iccevlt1I,2596
-pycountry/locales/sl/LC_MESSAGES/iso4217.mo,sha256=BR6o-Jdk-MGqAgY7HOjmjoX2bd-_cV3WMuj3yCTL05c,7114
-pycountry/locales/sl/LC_MESSAGES/iso639-3.mo,sha256=mS5lyMCtHsOtfBYCtQ_ZkVuEWk_VFKXoae_Lvl5AmHw,14346
-pycountry/locales/so/LC_MESSAGES/iso15924.mo,sha256=t7pyh8r06chYo7T4RwxG3_vRu0G9VSNRSZjXupDAc3Q,1189
-pycountry/locales/so/LC_MESSAGES/iso3166-1.mo,sha256=v6ih3uvcmqbT3vo7l_54nrcZ4ad42h-bXNOiDCz9SsA,6066
-pycountry/locales/so/LC_MESSAGES/iso3166-2.mo,sha256=mwH2Zxm3CU0xJX9HJQDj7dNiDkLpj5XR3Derog-cwXs,372
-pycountry/locales/so/LC_MESSAGES/iso3166-3.mo,sha256=QJ91kNEe1pmPM906vCXgJ0A9hfW2qVXrrgBoIVPfuoM,996
-pycountry/locales/so/LC_MESSAGES/iso4217.mo,sha256=FmVSkEXoHpW9NSR3yADXzD3DZpGlzKqMiuhevWowzjI,370
-pycountry/locales/so/LC_MESSAGES/iso639-3.mo,sha256=qfn_eoOkGZe35_J9rbUEUdykn9daS16mvZXlygVLmDY,371
-pycountry/locales/son/LC_MESSAGES/iso3166-1.mo,sha256=BJf3H3lFsXnmPxzg_MO2HjfRbtw_VMr6Rhju8KVkEGU,9275
-pycountry/locales/sq/LC_MESSAGES/iso15924.mo,sha256=uqUGKRbJuVujMX8TXq-7oaXGsqWT-vldqRjmH7S5dZU,518
-pycountry/locales/sq/LC_MESSAGES/iso3166-1.mo,sha256=qgg_HzcqjaQIB6HYynenZ7Ya1PqJt2ObXBbPVnxRl68,23866
-pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo,sha256=4s5zR0XhpAuw-SnXpaoJFUkt9jV3YCvyR2phdVYI7Ao,372
-pycountry/locales/sq/LC_MESSAGES/iso3166-3.mo,sha256=TsSeS0Yq30VDTikdJ2JAl7l4qiKGcg2norY1YHuoJ2M,2664
-pycountry/locales/sq/LC_MESSAGES/iso4217.mo,sha256=Xth9DE39BemxDH03jrg88695KNirBqFajadu-fbU2_0,370
-pycountry/locales/sq/LC_MESSAGES/iso639-3.mo,sha256=3mL_7NdlD2lX4q0_ODbr11iUOut7rUDvyRfRFpz94Zk,371
-pycountry/locales/sq/LC_MESSAGES/iso639-5.mo,sha256=c_6ngFn97IVi-zbhR4oljfnAhpg_jYjJrePIVnuY18Y,3810
-pycountry/locales/sr/LC_MESSAGES/iso15924.mo,sha256=eYo1GKGjHbLQlhambmHYpRvw8XsW0cyCTYijz8h5aGE,12875
-pycountry/locales/sr/LC_MESSAGES/iso3166-1.mo,sha256=vgEgAcY81cjYqHK4tsAOY77vdSXpdk-O3gRpEwcQnXs,28915
-pycountry/locales/sr/LC_MESSAGES/iso3166-2.mo,sha256=TbKirHfaYQWszhFuH-RtFULHoCgfOhNH2IhVjsGz1I0,144341
-pycountry/locales/sr/LC_MESSAGES/iso3166-3.mo,sha256=Y9sDJ32tTzNbl3m5OOk62DIc86BQ-x64fS3ryCK4dXk,3352
-pycountry/locales/sr/LC_MESSAGES/iso4217.mo,sha256=Ygprf9YtRR3N-I-8iaO9cm2CCaprdvBoWjqYnCF6wnY,9338
-pycountry/locales/sr/LC_MESSAGES/iso639-3.mo,sha256=pXTHorjW00WRE2JMR5R0EPGz_vsTrEYIWb3oLnkApmc,17095
-pycountry/locales/sr/LC_MESSAGES/iso639-5.mo,sha256=34piuKMjb1CmXWZUcp12HZ0OQdbYTtZTPOGre96UgIM,6247
-pycountry/locales/sr@latin/LC_MESSAGES/iso15924.mo,sha256=sw6yQ4S_MFdl_i-Gy9kKLXwJisA_V4kK_5RgSSJUw88,10451
-pycountry/locales/sr@latin/LC_MESSAGES/iso3166-1.mo,sha256=mQh3QCxwNJiXB_40sJRVOE6mfFiO73KXHBFnQzZDMQE,23246
-pycountry/locales/sr@latin/LC_MESSAGES/iso3166-2.mo,sha256=joWuPaXmGktimuPSrEeJjDYWZMocTAHNBhev4HxyOk0,121630
-pycountry/locales/sr@latin/LC_MESSAGES/iso3166-3.mo,sha256=2zlS7CRGoi4QBqgQdX1VfUMYD1FMK9EQ6qbcdbFWVS0,2709
-pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo,sha256=wF9LQtk76mPxthujLL6iRDkBiPzjH5sy74Zc_7_roIU,7652
-pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo,sha256=ERPiEnQ4UyQl9vFTw3hoAvpb4nkORa739qjtzkGFMAI,14420
-pycountry/locales/sr@latin/LC_MESSAGES/iso639-5.mo,sha256=3ZtgzQqOCZ5DqaU3W9x9YngC7PI7opZAR1EWo0o1nzg,5040
-pycountry/locales/sv/LC_MESSAGES/iso15924.mo,sha256=jiv0-ieSaizYyJmBKJnbw-4zvv9bJp2l7qc33qvWOC8,10290
-pycountry/locales/sv/LC_MESSAGES/iso3166-1.mo,sha256=hdzOp52V6XQV4x_QU2SXGmz-Z0BV9h0S-QOJvtca07Q,23553
-pycountry/locales/sv/LC_MESSAGES/iso3166-2.mo,sha256=Wc9RbAQziL3BRERy2jTGRP7TpIVRoNFC6fKcEoRFIoU,158999
-pycountry/locales/sv/LC_MESSAGES/iso3166-3.mo,sha256=btjqVszhhQZnYBe2uV652pN5pmKE4Q0A7xWtlgBK9LE,2738
-pycountry/locales/sv/LC_MESSAGES/iso4217.mo,sha256=9SFR12NZzak2ibCMtpc-odXlNWVXeReCQ8QtCv2-S4g,9466
-pycountry/locales/sv/LC_MESSAGES/iso639-3.mo,sha256=gNjeBOXjQZwuhvsYcQ0l0YKdJddP6FGcUy8f1-1_O64,398696
-pycountry/locales/sv/LC_MESSAGES/iso639-5.mo,sha256=yK2_LQZ7UpcPnGFGua3NkNr3yt7qWIs8XIsn9BSl-hU,7469
-pycountry/locales/sw/LC_MESSAGES/iso3166-1.mo,sha256=puo5AcrjhUMrPVvv4ctytx2y-hl8nLZvRM8hcfeXSIE,7984
-pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo,sha256=GTz8tO8hTl6B30ZJ6hNboAvBlocq7aIOpHufsw0835o,456
-pycountry/locales/ta/LC_MESSAGES/iso15924.mo,sha256=w-AOQsewUK2prYIDoyxecb0h74K7WQ_39UuG2YWZFDc,15455
-pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo,sha256=JzDcKSbmcmQk8qSEys_KOMoslUy9D4wlqD3q0sbFfH0,35476
-pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo,sha256=S-PGRpwJ1Sg6rps2dXt4AmdNEPz-I_t7J7FNBZj5VEA,372
-pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo,sha256=cPKoxYmPgZV9MFKxuJ6Ku2xHCzkjO9Z2LSXMxqsaNNI,4343
-pycountry/locales/ta/LC_MESSAGES/iso4217.mo,sha256=6AwG1as7eikFI0O-EJVk7pTJpWPclSi9OooVqHq3mAM,14738
-pycountry/locales/ta/LC_MESSAGES/iso639-3.mo,sha256=SKhcrQG7pA-ueZBfh9UAmvvyG40KpLhAiUtYAe6gLxo,438885
-pycountry/locales/ta/LC_MESSAGES/iso639-5.mo,sha256=ANCGgfbY4F7ou3YoEbHTpRDDPyQkz9Q1OuyJm1ZV0qU,11658
-pycountry/locales/te/LC_MESSAGES/iso3166-1.mo,sha256=mcFUynzR9m9pOA7DQhz2eiiNwJNbjWiekP3y7_R7I74,35338
-pycountry/locales/te/LC_MESSAGES/iso3166-3.mo,sha256=1J3pjyPhcOEx0r5ai_wGP-CYtmMbey3j3f_64VBOcHs,4169
-pycountry/locales/tg/LC_MESSAGES/iso3166-1.mo,sha256=Q1GsbdEj1Pyrysbq2yzBLVdMdhCr9G2YWJ2Z0NKQb_U,28527
-pycountry/locales/th/LC_MESSAGES/iso15924.mo,sha256=ImX6_DD65iAEA-A8dORr6wrqob6QxPY5ASbydbHqVHs,11584
-pycountry/locales/th/LC_MESSAGES/iso3166-1.mo,sha256=6ThLMem5BNLYZ0u6S5VqaB5IhlavWZqDYTt1hBk0gNI,33663
-pycountry/locales/th/LC_MESSAGES/iso3166-2.mo,sha256=18LfmN92xfFzmPruPXCMh1qUU_gkGpzXcpyn4TtquXE,82740
-pycountry/locales/th/LC_MESSAGES/iso3166-3.mo,sha256=IpVULSIJH4a9rErHYMd6PhXvfRZp1_OUQHZNlDdTiRA,3819
-pycountry/locales/th/LC_MESSAGES/iso4217.mo,sha256=g6uA11k1shQdjskX_P-To_m6_mja4KpeS33_ImpU6h8,10193
-pycountry/locales/th/LC_MESSAGES/iso639-3.mo,sha256=ZRCDEoiUegTcELdrKJaGiLwJj2aMhhEQiFqOs6X4KGw,53438
-pycountry/locales/ti/LC_MESSAGES/iso3166-1.mo,sha256=jLyqklwEaSPBoHEn3qM4MuQwpjt3e2lGuEE2RROJgGc,11811
-pycountry/locales/ti/LC_MESSAGES/iso3166-3.mo,sha256=Wzmda-589yuFBuxwE9NxhikP3sjgZ0GfN0AWM_S6ZHE,477
-pycountry/locales/ti/LC_MESSAGES/iso639-3.mo,sha256=rudT0161eMCs7pDBdCvsDzVCkp7Uu-3oOuRzVE0WTX0,5858
-pycountry/locales/tig/LC_MESSAGES/iso3166-1.mo,sha256=VqELNsWPC8d0GfnR-i39uhWtQlJ2DhkiDhhjDvHrx1A,5712
-pycountry/locales/tig/LC_MESSAGES/iso3166-3.mo,sha256=nNn_DuHr6UAVZZ1vgbdhiVFAIc-qbeEzGU0-_LbySKo,475
-pycountry/locales/tig/LC_MESSAGES/iso639-3.mo,sha256=WJYDBiPwZI_MTFJwAcudQwiZmcnPIFurHgk0n_U8xUY,5697
-pycountry/locales/tk/LC_MESSAGES/iso3166-1.mo,sha256=PlNOnnM6E0c0obtWOp_XHnZPZWsIy5vw9xgLl2Y3Nvg,18029
-pycountry/locales/tk/LC_MESSAGES/iso3166-3.mo,sha256=ONXoCX_y_cwOQykQVAGTHgss5Lp3gopNAGg7182SAis,416
-pycountry/locales/tl/LC_MESSAGES/iso3166-1.mo,sha256=J1GKGeMDNvkJgjiMjbSNMUwNwp8rGMiDWsHGcXGBZwU,21411
-pycountry/locales/tl/LC_MESSAGES/iso3166-3.mo,sha256=I2g0ohTAhPm_9UhASYSNX8Xw4g3iEPlUvi-Ho9l3NJM,477
-pycountry/locales/tr/LC_MESSAGES/iso15924.mo,sha256=LByG1pluXvEtX58EmSSM2C1FejG7OFF6YdlaWtlPRA0,10222
-pycountry/locales/tr/LC_MESSAGES/iso3166-1.mo,sha256=yr_-WN2CQuw21YwQehdipCiBbMsTUKRYTlriLU0Z_Nc,23676
-pycountry/locales/tr/LC_MESSAGES/iso3166-2.mo,sha256=YwAD7hziqNJFf_axlTgiZzUS7c2IdfR2g8xI4dmOco4,76675
-pycountry/locales/tr/LC_MESSAGES/iso3166-3.mo,sha256=CNAu-ntnaWEiDS8l2zWeIAS9voMHRDkX9VUO-fI8tiM,2771
-pycountry/locales/tr/LC_MESSAGES/iso4217.mo,sha256=fSUr6ax4xjMSSa_xlObeBjhUyeroWZuOsbCuwNlleUs,9693
-pycountry/locales/tr/LC_MESSAGES/iso639-3.mo,sha256=9YRTy65obg3k-BJBtaWJKgooMg0_PZ5g2Czts2mj_Co,343245
-pycountry/locales/tr/LC_MESSAGES/iso639-5.mo,sha256=6NhQ-_LVXjnOIniEleyvDJjdfPU24fux2oa1xQb0iYA,7390
-pycountry/locales/tt/LC_MESSAGES/iso3166-1.mo,sha256=gdYOQv9w4lOepwyyJbCVHYvzP5iGvrr-VC7ohKpHm2Y,21810
-pycountry/locales/tt/LC_MESSAGES/iso3166-3.mo,sha256=8h6JDzC6q2pX8g9E5KlUI69PFyMFrnrzRwntIhQKBt0,501
-pycountry/locales/tt/LC_MESSAGES/iso639-3.mo,sha256=y8d2njNTkCYRDFvdr2xptprhpzxeaOlYl8dDoyYiYPs,7206
-pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-1.mo,sha256=0HtZ1pOcYvYiQRpawNp9pMy-lqiKjJyYI9ffXorm8f0,18209
-pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-3.mo,sha256=HKaTaYazrRYA3cEq6I6jFhKVAcVIr1Lj0b-wDKKDQ58,492
-pycountry/locales/tt@iqtelif/LC_MESSAGES/iso639-3.mo,sha256=YxxQU4qdA0XzR3pAkuN3Uc51vgRopL1uU6SLFuC_rN8,6381
-pycountry/locales/tzm/LC_MESSAGES/iso15924.mo,sha256=VTu9P1hcNVA4i86iD-KsdR-vCY0AF0trsiBx9WPsJ6c,798
-pycountry/locales/tzm/LC_MESSAGES/iso3166-1.mo,sha256=47FJoXYiAjTnUDandgloMWAu1ta07_cBh76jgB0T2MU,608
-pycountry/locales/tzm/LC_MESSAGES/iso4217.mo,sha256=D1sFOG9x4BF1MCCFF6eQulSXi88nqUoRK679W_ZDRL0,371
-pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo,sha256=XQVt-M9x-VTRB1iWsuOURL7SIwiENYt4hjLP6g5ZzJ8,29812
-pycountry/locales/ug/LC_MESSAGES/iso3166-3.mo,sha256=8zmB7JZ74Ns5Ij9bujcs0Ikdpbcp0sPRUVvzSKLHyPo,3467
-pycountry/locales/uk/LC_MESSAGES/iso15924.mo,sha256=MoqwZqWVtxzHJtZohk8WB0JRGhplE5vEatsycFhNiMg,12713
-pycountry/locales/uk/LC_MESSAGES/iso3166-1.mo,sha256=zSv-T1bAy0B0_q5qnMwitrP4CntTCQnRWcMKzVDp9_k,29887
-pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo,sha256=x3BIJcVLF_mQwoFZCdMqLFGyPKOBIlIT4mLs-28VVcM,255945
-pycountry/locales/uk/LC_MESSAGES/iso3166-3.mo,sha256=NB2QqOD1clWnT2yT0ePxA8VzxdgZKdDzxbR0qrwOt4o,3668
-pycountry/locales/uk/LC_MESSAGES/iso4217.mo,sha256=Kj2Ww7jwvurvNC6dvOVvnCUItSlBYrV_ZdXpkzxtMN0,12535
-pycountry/locales/uk/LC_MESSAGES/iso639-3.mo,sha256=wkqhL4HmtRNccl5d-OdGoRbEjZsWQfgg6VyUZhSWPX4,511201
-pycountry/locales/uk/LC_MESSAGES/iso639-5.mo,sha256=12FnzPhOQn1oAZ8sBW7l5POo6QYOlA_FzpdeSlN7oP8,9363
-pycountry/locales/ur/LC_MESSAGES/iso3166-1.mo,sha256=tcC6Dkmh4a9vUhMpVoU2Nbks5oiO-ygU8wcnWE2Tbm8,11711
-pycountry/locales/uz/LC_MESSAGES/iso3166-1.mo,sha256=SQKPadwtPkruf-KXRLkSzo_j4V1DhGwq2JLwPflVQfo,8863
-pycountry/locales/ve/LC_MESSAGES/iso3166-1.mo,sha256=UPng9ItwV8-dFA4Ec6TgV3QVXUFQfsHMgrmA9C8Z2tY,7913
-pycountry/locales/ve/LC_MESSAGES/iso3166-2.mo,sha256=HOuM6pt8cvX2vj49g7-Gn01EIcgis0ffMd82WmbrlvY,924
-pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo,sha256=3NgTS5O5xyhV4eGgQQQfgH1JZB1eKNDS9jpc0WjIyFM,514
-pycountry/locales/ve/LC_MESSAGES/iso639-3.mo,sha256=tzbEkeGyMcCiADL2GaoaaM66NmOcEr__mh0P5sXrvvY,1997
-pycountry/locales/vi/LC_MESSAGES/iso15924.mo,sha256=19Gv8QMvlccPkOy0keeSzz4UedM30N7rMDFy_xL_lGk,7457
-pycountry/locales/vi/LC_MESSAGES/iso3166-1.mo,sha256=ymVEYnAP_TPBhwzWXdhJpYlh6HBmsdbkgMElEZ9CdJs,24644
-pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo,sha256=6HQ4_kJekZWUO-FOKyfhSyZx7himx15XqQFXFvKDwGA,135199
-pycountry/locales/vi/LC_MESSAGES/iso3166-3.mo,sha256=8KWsYZAmqADgIwh2V9CGv4otl0d-O-1fbn3kYuml7tc,2686
-pycountry/locales/vi/LC_MESSAGES/iso4217.mo,sha256=o10Kb3UE8GRTUrtovFCGP3ZHlloGUHWpPC7YYHTk86E,8278
-pycountry/locales/vi/LC_MESSAGES/iso639-3.mo,sha256=QeaUje99ocE7WSsPWQV6xEGwRW4Tr0LnogKem69b6Xg,16925
-pycountry/locales/wa/LC_MESSAGES/iso3166-1.mo,sha256=DY6d4V7EMPpQEbSbyfrmN_8yz6KRzfH9Gc1NTk0cL9Y,22427
-pycountry/locales/wa/LC_MESSAGES/iso3166-2.mo,sha256=-lSDdukzA_xt8Iqtf5d1fsWXY-UrA0muTGBvpzkJZtY,2646
-pycountry/locales/wa/LC_MESSAGES/iso3166-3.mo,sha256=BOO0onmAiuczLLyKkOyy8MasftWeGhwEEnDO3OEubwc,2663
-pycountry/locales/wa/LC_MESSAGES/iso639-3.mo,sha256=RMdySfNZzMfxGr5Wts1TD0gzOT9I7xC49VP7Vm4kS1E,12889
-pycountry/locales/wal/LC_MESSAGES/iso3166-1.mo,sha256=YKTYQvmI4WLckv6MZTnOGhWwoMi2qCeHJ86c2Wr6ja4,5713
-pycountry/locales/wal/LC_MESSAGES/iso3166-3.mo,sha256=_smA6ucdzdYF4JKooYMg0c8KBDAIE8VoLV-iO3DLQ04,476
-pycountry/locales/wo/LC_MESSAGES/iso3166-1.mo,sha256=xCAnRFH-UuZUHqmX3k0bOCC7ErAnsmuJF3UlfMUL6Yk,21638
-pycountry/locales/wo/LC_MESSAGES/iso3166-3.mo,sha256=jmlyZQmJiL1-cU-LConA_8-krM5XfkaOAyob_ED9X7U,2544
-pycountry/locales/xh/LC_MESSAGES/iso3166-1.mo,sha256=rN4Xj7i9i-Bn8jkmLMzY7Tze5ZcuMXs6soNWwI6e-Ts,2821
-pycountry/locales/xh/LC_MESSAGES/iso3166-3.mo,sha256=JQ3G-Jcvv2DlWPnVKHqVXQaBCbFm1B8-QEAxvWSOayc,422
-pycountry/locales/xh/LC_MESSAGES/iso639-3.mo,sha256=b7f1geW_5oIXnTcJdd5EzUHuaZ-oC1x0aqB6M4zc-04,2528
-pycountry/locales/yo/LC_MESSAGES/iso3166-1.mo,sha256=vXJUAuLaCWXvxbmLfdztNJmW7AEfCCoTk6BjAuIiGdo,11032
-pycountry/locales/zh_CN/LC_MESSAGES/iso15924.mo,sha256=73edCLVOwivnJWxbRcqrT0B1suCwpYDmJQw-5ESuZJY,7170
-pycountry/locales/zh_CN/LC_MESSAGES/iso3166-1.mo,sha256=cFvm2thL8VrUOBg_wgRSCNpE8kl5W50oFWU_2ouL8aU,23425
-pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo,sha256=5GXMVkjvIYpLRFCXD6ye7nyKvqinds-4OB5t-FOEfSk,116542
-pycountry/locales/zh_CN/LC_MESSAGES/iso3166-3.mo,sha256=jGDFtKMfZqEVephlYDTyEes8xxpKmnKBHDNWAifoT_s,2696
-pycountry/locales/zh_CN/LC_MESSAGES/iso4217.mo,sha256=K1NVIoFpGsgCLWByDVn9ThoS68my9bu-0BicPSweioI,9620
-pycountry/locales/zh_CN/LC_MESSAGES/iso639-3.mo,sha256=T_LY18QKETT27xLi9OhZEyMig0-MiaYa0V6SXoHjlCk,14527
-pycountry/locales/zh_HK/LC_MESSAGES/iso15924.mo,sha256=Sws2OMrBFpLoDq0U02l5kDyjprNVaSlbg0r-Ip4hQeY,4992
-pycountry/locales/zh_HK/LC_MESSAGES/iso3166-1.mo,sha256=04tOpotVQDSWsiIL1r92Pde5MblNEQcHRntdxhgvW7I,23388
-pycountry/locales/zh_HK/LC_MESSAGES/iso3166-3.mo,sha256=72JQpg5mwgA_5w_YmznbN2NpMGHdsCbN0I3tq30heIA,2714
-pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo,sha256=DFMqOA2PnPpXRCczQg0ipzmwTA79-815IAee1y78hY8,8815
-pycountry/locales/zh_Hans/LC_MESSAGES/iso639-5.mo,sha256=HfSKsdJZGmr9k-E4OnfWDHPP3bI9Db8dKgBxXKXuJe0,886
-pycountry/locales/zh_Hant/LC_MESSAGES/iso639-5.mo,sha256=MAmFhM-eAAF9PwLmpfJQyCMdfRpATE-eEjQ7KRF3KjA,7424
-pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo,sha256=rdTojxMvRAvyA-P2mofNpubQBeuw9mQSYA4CCecbJFc,10644
-pycountry/locales/zh_TW/LC_MESSAGES/iso3166-1.mo,sha256=jZHJGmfv_rcv6SI3xWgLLmH_iiWzR_t9eCB4BPxuVO0,23390
-pycountry/locales/zh_TW/LC_MESSAGES/iso3166-2.mo,sha256=hI-cDmSoWhYrzDVx04_sGQkqvrjA1QEzi-O60qA5V9U,18208
-pycountry/locales/zh_TW/LC_MESSAGES/iso3166-3.mo,sha256=tcw6oJie_J4xxELZd-w6rhMuxLdDTEk8kAt95lcqJwI,2685
-pycountry/locales/zh_TW/LC_MESSAGES/iso4217.mo,sha256=lx1x5_mZKbQkC__xebK2v-I55EU4yBh27HhDR9xq2Rg,9664
-pycountry/locales/zh_TW/LC_MESSAGES/iso639-3.mo,sha256=KroXcTbtcwXJubSGfIrloFYskt1cPZPzGVZGBcButNA,32698
-pycountry/locales/zu/LC_MESSAGES/iso3166-1.mo,sha256=MfXG5fBPOFvJHdiGFlSxSPPMijmuLsAAn2xbNRlpoSE,5882
-pycountry/locales/zu/LC_MESSAGES/iso3166-3.mo,sha256=U8swrNDQXoC5L2-ujZdcO68vePFKT6Wn7HQHn3Bmaq4,415
-pycountry/locales/zu/LC_MESSAGES/iso639-3.mo,sha256=Q4EhRCks8BThDf7KzLbMx788L_JsLfUmJ8ZFimyF_FE,2596
-pycountry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycountry/tests/test_general.py,sha256=HLy1GcvTAB1YyMK81XNFdDK1I4VNLrZ6VYCAfjpJ4Wk,15209
diff --git a/libs/pycountry-24.6.1.dist-info/WHEEL b/libs/pycountry-24.6.1.dist-info/WHEEL
deleted file mode 100644
index 8b9b3a1bf3..0000000000
--- a/libs/pycountry-24.6.1.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/platformdirs-4.3.6.dist-info/INSTALLER b/libs/pycountry-26.2.16.dist-info/INSTALLER
similarity index 100%
rename from libs/platformdirs-4.3.6.dist-info/INSTALLER
rename to libs/pycountry-26.2.16.dist-info/INSTALLER
diff --git a/libs/pycountry-26.2.16.dist-info/METADATA b/libs/pycountry-26.2.16.dist-info/METADATA
new file mode 100644
index 0000000000..7dd8b4c99f
--- /dev/null
+++ b/libs/pycountry-26.2.16.dist-info/METADATA
@@ -0,0 +1,377 @@
+Metadata-Version: 2.4
+Name: pycountry
+Version: 26.2.16
+Summary: ISO country, subdivision, language, currency and script definitions and their translations
+License-Expression: LGPL-2.1-only
+License-File: LICENSE.txt
+Keywords: country,subdivision,language,currency,iso,3166,639,4217,15924,3166-1,3166-2,3166-3
+Author: Christian Theune
+Author-email: ct@flyingcircus.io
+Maintainer: Nate Schimmoller
+Maintainer-email: nschimmo@gmail.com
+Requires-Python: >=3.10
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Software Development :: Internationalization
+Classifier: Topic :: Software Development :: Localization
+Project-URL: changelog, https://github.com/pycountry/pycountry/blob/main/HISTORY.txt
+Project-URL: issues, https://github.com/pycountry/pycountry/issues
+Project-URL: source, https://github.com/pycountry/pycountry
+Description-Content-Type: text/x-rst
+
+###########
+ pycountry
+###########
+
+pycountry provides the ISO databases for the standards:
+
+-  `639-3 <https://en.wikipedia.org/wiki/ISO_639-3>`_ Languages
+-  `3166 <https://en.wikipedia.org/wiki/ISO_3166>`_ Codes for
+   representation of names of countries and their subdivisions
+-  `3166-1 <https://en.wikipedia.org/wiki/ISO_3166-1>`_ Countries
+-  `3166-3 <https://en.wikipedia.org/wiki/ISO_3166-3>`_ Deleted
+   countries
+-  `3166-2 <https://en.wikipedia.org/wiki/ISO_3166-2>`_ Subdivisions of
+   countries
+-  `4217 <https://en.wikipedia.org/wiki/ISO_4217>`_ Currencies
+-  `15924 <https://en.wikipedia.org/wiki/ISO_15924>`_ Scripts
+
+The package includes a copy from Debian's `pkg-isocodes
+<https://salsa.debian.org/iso-codes-team/iso-codes>`_ and makes the data
+accessible through a Python API.
+
+Translation files for the various strings are included as well.
+
+********************
+ Data update policy
+********************
+
+No changes to the data will be accepted into pycountry. This is a pure
+wrapper around the ISO standard using the ``pkg-isocodes`` database from
+Debian *as is*. If you need changes to the political situation in the
+world, please talk to the ISO or Debian people, not me.
+
+***************
+ Contributions
+***************
+
+The code lives in a `git repository on GitHub
+<https://github.com/pycountry/pycountry>`_, and issues must be reported
+in there as well.
+
+************************
+ Countries (ISO 3166-1)
+************************
+
+Countries are accessible through a database object that is already
+configured upon import of pycountry and works as an iterable:
+
+.. code:: pycon
+
+   >>> import pycountry
+   >>> len(pycountry.countries)
+   249
+   >>> list(pycountry.countries)[0]
+   Country(alpha_2='AW', alpha_3='ABW', flag='๐Ÿ‡ฆ๐Ÿ‡ผ', name='Aruba', numeric='533')
+
+Specific countries can be looked up by their various codes and provide
+the information included in the standard as attributes:
+
+.. code:: pycon
+
+   >>> germany = pycountry.countries.get(alpha_2='DE')
+   >>> germany
+   Country(alpha_2='DE', alpha_3='DEU', flag='๐Ÿ‡ฉ๐Ÿ‡ช', name='Germany', numeric='276', official_name='Federal Republic of Germany')
+   >>> germany.alpha_2
+   'DE'
+   >>> germany.alpha_3
+   'DEU'
+   >>> germany.numeric
+   '276'
+   >>> germany.name
+   'Germany'
+   >>> germany.official_name
+   'Federal Republic of Germany'
+
+There's also a "fuzzy" search to help people discover "proper" countries
+for names that might only actually be subdivisions. The fuzziness also
+includes normalizing unicode accents. There's also a bit of
+prioritization included to prefer matches on country names before
+subdivision names and have countries with more matches be listed before
+ones with fewer matches:
+
+.. code:: pycon
+
+   >>> pycountry.countries.search_fuzzy('England')
+   [Country(alpha_2='GB', alpha_3='GBR', flag='๐Ÿ‡ฌ๐Ÿ‡ง', name='United Kingdom', numeric='826', official_name='United Kingdom of Great Britain and Northern Ireland')]
+
+   >>> pycountry.countries.search_fuzzy('Cote')
+   [Country(alpha_2='CI', alpha_3='CIV', flag='๐Ÿ‡จ๐Ÿ‡ฎ', name="Cรดte d'Ivoire", numeric='384', official_name="Republic of Cรดte d'Ivoire"),
+    Country(alpha_2='FR', alpha_3='FRA', flag='๐Ÿ‡ซ๐Ÿ‡ท', name='France', numeric='250', official_name='French Republic'),
+    Country(alpha_2='HN', alpha_3='HND', flag='๐Ÿ‡ญ๐Ÿ‡ณ', name='Honduras', numeric='340', official_name='Republic of Honduras')]
+
+Attributes for the country class can be accessed using the
+``__getattr__`` method. If the requested attribute is a key for the
+country class, it will return the corresponding value. Here are some
+examples:
+
+.. code:: pycon
+
+   >>> aland = pycountry.countries.get(alpha_2='AX')
+   >>> print(aland)
+   Country(alpha_2='AX', alpha_3='ALA', flag='๐Ÿ‡ฆ๐Ÿ‡ฝ', name='ร…land Islands', numeric='248')
+   >>> aland.common_name
+   Traceback (most recent call last):
+   AttributeError: common_name
+   >>> aland.flag
+   '๐Ÿ‡ฆ๐Ÿ‡ฝ'
+   >>> aland.foo
+   Traceback (most recent call last):
+   AttributeError: foo
+
+*********************************
+ Historic Countries (ISO 3166-3)
+*********************************
+
+The ``historic_countries`` database contains former countries that have
+been removed from the standard and are now included in ISO 3166-3,
+excluding existing ones:
+
+.. code:: pycon
+
+   >>> ussr = pycountry.historic_countries.get(alpha_3='SUN')
+   >>> ussr
+   Country(alpha_2='SU', alpha_3='SUN', alpha_4='SUHH', name='USSR, Union of Soviet Socialist Republics', numeric='810', withdrawal_date='1992-08-30')
+   >>> ussr.alpha_4
+   'SUHH'
+   >>> ussr.alpha_3
+   'SUN'
+   >>> ussr.name
+   'USSR, Union of Soviet Socialist Republics'
+   >>> ussr.withdrawal_date
+   '1992-08-30'
+
+***********************************
+ Country subdivisions (ISO 3166-2)
+***********************************
+
+The country subdivisions are a little more complex than the countries
+itself because they provide a nested and typed structure.
+
+All subdivisons can be accessed directly:
+
+.. code:: pycon
+
+   >>> len(pycountry.subdivisions)
+   5046
+   >>> list(pycountry.subdivisions)[0]
+   SubdivisionHierarchy(code='AD-02', country_code='AD', name='Canillo', parent_code=None, type='Parish')
+
+Subdivisions can be accessed using their unique code. The resulting
+object will provide at least their code, name and type:
+
+.. code:: pycon
+
+   >>> de_st = pycountry.subdivisions.get(code='DE-ST')
+   >>> de_st.code
+   'DE-ST'
+   >>> de_st.name
+   'Sachsen-Anhalt'
+   >>> de_st.type
+   'Land'
+   >>> de_st.country
+   Country(alpha_2='DE', alpha_3='DEU', flag='๐Ÿ‡ฉ๐Ÿ‡ช', name='Germany', numeric='276', official_name='Federal Republic of Germany')
+
+Some subdivisions specify another subdivision as a parent:
+
+.. code:: pycon
+
+   >>> fr_01 = pycountry.subdivisions.get(code='FR-01')
+   >>> fr_01.code
+   'FR-01'
+   >>> fr_01.name
+   'Ain'
+   >>> fr_01.type
+   'Metropolitan department'
+   >>> fr_01.parent_code
+   'FR-ARA'
+   >>> fr_01.parent
+   SubdivisionHierarchy(code='FR-ARA', country_code='FR', name='Auvergne-Rhรดne-Alpes', parent_code=None, type='Metropolitan region')
+   >>> fr_01.parent.name
+   'Auvergne-Rhรดne-Alpes'
+
+The divisions of a single country can be queried using the country_code
+index:
+
+.. code:: pycon
+
+   >>> len(pycountry.subdivisions.get(country_code='DE'))
+   16
+
+   >>> len(pycountry.subdivisions.get(country_code='US'))
+   57
+
+Similar to countries, the ``search_fuzzy`` method has been implemented
+for subdivisions to facilitate finding relevant subdivision entries.
+This method includes unicode normalization for accents and prioritizes
+matches on subdivision names. The search algorithm is designed to return
+more relevant matches first:
+
+This method is especially useful for cases where the exact name or code
+of the subdivision is not known.
+
+.. code:: pycon
+
+   >>> pycountry.subdivisions.search_fuzzy('York')
+   [SubdivisionHierarchy(code='GB-YOR', country_code='GB', name='York', parent='GB-ENG', parent_code='GB-ENG', type='Unitary authority'),
+    SubdivisionHierarchy(code='GB-ERY', country_code='GB', name='East Riding of Yorkshire', parent='GB-ENG', parent_code='GB-ENG', type='Unitary authority'),
+    SubdivisionHierarchy(code='GB-NYK', country_code='GB', name='North Yorkshire', parent='GB-ENG', parent_code='GB-ENG', type='Two-tier county'),
+    SubdivisionHierarchy(code='US-NY', country_code='US', name='New York', parent_code=None, type='State')]
+
+*********************
+ Scripts (ISO 15924)
+*********************
+
+Scripts are available from a database similar to the countries:
+
+.. code:: pycon
+
+   >>> len(pycountry.scripts)
+   226
+   >>> list(pycountry.scripts)[0]
+   Script(alpha_4='Adlm', name='Adlam', numeric='166')
+   >>> latin = pycountry.scripts.get(name='Latin')
+   >>> latin
+   Script(alpha_4='Latn', name='Latin', numeric='215')
+   >>> latin.alpha_4
+   'Latn'
+   >>> latin.name
+   'Latin'
+   >>> latin.numeric
+   '215'
+
+***********************
+ Currencies (ISO 4217)
+***********************
+
+The currencies database is, again, similar to the ones before:
+
+.. code:: pycon
+
+   >>> len(pycountry.currencies)
+   178
+   >>> list(pycountry.currencies)[0]
+   Currency(alpha_3='AED', name='UAE Dirham', numeric='784')
+   >>> argentine_peso = pycountry.currencies.get(alpha_3='ARS')
+   >>> argentine_peso
+   Currency(alpha_3='ARS', name='Argentine Peso', numeric='032')
+   >>> argentine_peso.alpha_3
+   'ARS'
+   >>> argentine_peso.name
+   'Argentine Peso'
+   >>> argentine_peso.numeric
+   '032'
+
+***********************
+ Languages (ISO 639-3)
+***********************
+
+The languages database is similar too:
+
+.. code:: pycon
+
+   >>> len(pycountry.languages)
+   7923
+   >>> list(pycountry.languages)[0]
+   Language(alpha_3='aaa', name='Ghotuo', scope='I', type='L')
+
+   >>> aragonese = pycountry.languages.get(alpha_2='an')
+   >>> aragonese.alpha_2
+   'an'
+   >>> aragonese.alpha_3
+   'arg'
+   >>> aragonese.name
+   'Aragonese'
+
+   >>> bengali = pycountry.languages.get(alpha_2='bn')
+   >>> bengali.name
+   'Bengali'
+   >>> bengali.common_name
+   'Bangla'
+
+*********
+ Locales
+*********
+
+Locales are available in the ``pycountry.LOCALES_DIR`` subdirectory of
+this package. The translation domains are called ``isoXXX`` according to
+the standard they provide translations for. The directory is structured
+in a way compatible to Python's gettext module.
+
+Here is an example translating language names:
+
+.. code:: pycon
+
+   >>> import gettext
+   >>> german = gettext.translation('iso3166-1', pycountry.LOCALES_DIR,
+   ...                              languages=['de'])
+   >>> german.install()
+   >>> _('Germany')
+   'Deutschland'
+
+*********
+ Lookups
+*********
+
+For each database (countries, languages, scripts, etc.), you can also
+look up entities case insensitively without knowing which key the value
+may match. For example:
+
+.. code:: pycon
+
+   >>> pycountry.countries.lookup('de')
+   Country(alpha_2='DE', alpha_3='DEU', flag='๐Ÿ‡ฉ๐Ÿ‡ช', name='Germany', numeric='276', official_name='Federal Republic of Germany')
+
+The search ends with the first match, which is returned.
+
+********************
+ Dict Compatibility
+********************
+
+You can cast each object type into a ``dict``:
+
+.. code:: pycon
+
+   >>> country = pycountry.countries.lookup('de')
+   >>> dict(country)
+   {'alpha_2': 'DE', 'alpha_3': 'DEU', 'flag': '๐Ÿ‡ฉ๐Ÿ‡ช', 'name': 'Germany', 'numeric': '276', 'official_name': 'Federal Republic of Germany'}
+
+******************
+ Custom Countries
+******************
+
+While pycountry will not be adding non-ISO values to its standard
+library, you can add or remove entries at runtime to fit your needs.
+
+Add a non-ISO country:
+
+.. code:: pycon
+
+   >>> pycountry.countries.add_entry(alpha_2="XK", alpha_3="XXK", name="Kosovo", numeric="926")
+
+Remove a country from a database:
+
+.. code:: pycon
+
+   >>> pycountry.countries.remove_entry(alpha_2="XK")
+
diff --git a/libs/pycountry-26.2.16.dist-info/RECORD b/libs/pycountry-26.2.16.dist-info/RECORD
new file mode 100644
index 0000000000..78ab606d92
--- /dev/null
+++ b/libs/pycountry-26.2.16.dist-info/RECORD
@@ -0,0 +1,632 @@
+pycountry-26.2.16.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pycountry-26.2.16.dist-info/METADATA,sha256=LhKQsZ5mt7HEgFIUvcIthOiqT_KL0EgFlVTiQyp5H60,12203
+pycountry-26.2.16.dist-info/RECORD,,
+pycountry-26.2.16.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pycountry-26.2.16.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+pycountry-26.2.16.dist-info/licenses/LICENSE.txt,sha256=P6OcbhijpEEQgrZMFk3q4dj0ewOk1FMEwfCuR4Ym44I,24463
+pycountry/COPYRIGHT.txt,sha256=9LAWFwZLzZ6f49ti7Jxu-NCvzDiN2ljZspNaVR15YOQ,2054
+pycountry/__init__.py,sha256=PJItOaROxK-lybrbGft0rBSspiVpFQQdiEhucWXCrfs,10458
+pycountry/databases/iso15924.json,sha256=y34u0b0jRamsEZqtCjit-vYXC4aZ9FuYjDDMECGZMS0,21268
+pycountry/databases/iso3166-1.json,sha256=8BuBK1f7qfMf9iG_M-fHVwoBlk2-tb4hZ-lN7PU4yJ8,43284
+pycountry/databases/iso3166-2.json,sha256=eMkO9_wltcJjGqxfCJvJ_27CLAJcBbbdvAh6Hxvi5Go,498028
+pycountry/databases/iso3166-3.json,sha256=65LRzOPjUlWfYQ5g4qyyNofrHPB7I2dfsRKGOldBpvo,6193
+pycountry/databases/iso4217.json,sha256=qEpbg8OFkeh1abLguhhO2Gc4bgDytakzSaDNHe1rbM8,16319
+pycountry/databases/iso639-3.json,sha256=LGGpu5CoxQxGv7q0hIOIY6EjNb_dCpK0gJ8_rxdWsi0,876207
+pycountry/databases/iso639-5.json,sha256=EswG_z7ZXrgJF0pobLKuczFfPLFlgs9v5CZ856KtYZg,8486
+pycountry/db.py,sha256=lUSWd5Gt_x9oR_rzoWfUVlt0c9_2ly-pUgZDCWxqS7A,6210
+pycountry/locales/ab/LC_MESSAGES/iso3166-1.mo,sha256=T4i_3AoepLWMwmrBmtg3t8PtWWjF9M1__duSklVBsG0,560
+pycountry/locales/ab/LC_MESSAGES/iso639-5.mo,sha256=RW9MQIdtif8Be2HcY4NddKH7cb1gxmWMAtlrgj3lC_8,403
+pycountry/locales/ace/LC_MESSAGES/iso3166-1.mo,sha256=AtgcU37x9yY8z-qr9iaQpyR7LLUugaBTWPtuhYa5s64,556
+pycountry/locales/ach/LC_MESSAGES/iso3166-1.mo,sha256=2usbjDzDqMgZazSwE-vdgc08TO7cgtvCtsoJL4fJJ34,9144
+pycountry/locales/af/LC_MESSAGES/iso3166-1.mo,sha256=4VxdeFM3YYXCgtjcd_oHRZRCtOwlIm8OSJHZ29UtVCc,22487
+pycountry/locales/af/LC_MESSAGES/iso3166-3.mo,sha256=3s548xWglPw-c-szsi2VPtStJA9YZMKN5skK3wmT4Q4,1001
+pycountry/locales/af/LC_MESSAGES/iso639-3.mo,sha256=FmEu-2iY9g700VLvruD8LVEGIuHofjxuUaSFl7OAST8,5414
+pycountry/locales/ak/LC_MESSAGES/iso3166-1.mo,sha256=6STtWyYw1YDHSsTlbjOLEsSYHiaZpJr1vqi7S56lc5w,594
+pycountry/locales/am/LC_MESSAGES/iso3166-1.mo,sha256=3jsi1iJsfthdvxkmCv1VhvHOzpDeh-4GzyhCE0qTmbU,6413
+pycountry/locales/am/LC_MESSAGES/iso3166-3.mo,sha256=OkBYiMOaXnN-gp__dFS2DbcSvxwCnnOcVcxwLumT9lM,500
+pycountry/locales/am/LC_MESSAGES/iso639-3.mo,sha256=yF1yOdiBBo1pwOMtA8RCUfGs_rMfwV5oMUdA5p23dTg,5797
+pycountry/locales/an/LC_MESSAGES/iso3166-1.mo,sha256=l_6UPVkRZtiPLwYYTpz5vUgM52bXK0Yao39PnirHuBo,3810
+pycountry/locales/ar/LC_MESSAGES/iso15924.mo,sha256=GzvPUSmTBkFdI_2WZ6S9V54iCmKYMz3ZX1ov_neevsY,3991
+pycountry/locales/ar/LC_MESSAGES/iso3166-1.mo,sha256=qLUx_EDLoLwRssI3x6SEZxdkiXrzupYXM2AnR2gNLK8,28339
+pycountry/locales/ar/LC_MESSAGES/iso3166-3.mo,sha256=Rahaka3wBXrsvWs9uEA-sFjIF1866PG1ayEpULmMHhs,3225
+pycountry/locales/ar/LC_MESSAGES/iso4217.mo,sha256=SqVRfAGPTenOiJ8kR87TDxQ65DIsxTC61arDHk4E9Mo,8414
+pycountry/locales/ar/LC_MESSAGES/iso639-3.mo,sha256=KSFSM9l0hMr9E4YjjSHEa1YGdFCudMMChL695no5OAI,8248
+pycountry/locales/as/LC_MESSAGES/iso3166-1.mo,sha256=zbHlLwcA5lUcmh1elP4LD99H7vtE9qQvTNtj3VMJyLU,36078
+pycountry/locales/as/LC_MESSAGES/iso3166-3.mo,sha256=UekBfP1tExntyCcEEavcThiDRAMu0u_B-jn0SNhQ2xw,4343
+pycountry/locales/ast/LC_MESSAGES/iso15924.mo,sha256=H02ldlEMjyw--8KhWHzk7D4hByQKAvgiKlrO-3eQGYU,404
+pycountry/locales/ast/LC_MESSAGES/iso3166-1.mo,sha256=A97SOABbHA8Tr8LYh8zlPeaHhngDRtbuet2n3tfHmz0,23280
+pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo,sha256=mzsh5t_gIyoqLxxqqN9JfhBz_it13s9eASm9bY1j9no,405
+pycountry/locales/ast/LC_MESSAGES/iso3166-3.mo,sha256=rmQaVdr-XS2nXnO6abzuyU2EFEG6YEYgQFzI2ORqt_o,2670
+pycountry/locales/ast/LC_MESSAGES/iso4217.mo,sha256=d94AGJ4HLANjEfVjTb5mLBETh8OwsyNSMbAfuV6EjaU,403
+pycountry/locales/ast/LC_MESSAGES/iso639-3.mo,sha256=3wxK6aCwlEOkaf1L-FKmHwuGguUF2Fi46JrQPnC97U0,310099
+pycountry/locales/ast/LC_MESSAGES/iso639-5.mo,sha256=qn-We9gdhe_PEYMLPhrc3q4vAOe5Bgk2JtfotbOGMew,4029
+pycountry/locales/ay/LC_MESSAGES/iso3166-1.mo,sha256=CZsbQxNVzjRDJBfdoFsE5d6EbRWoilWKUmmy53gbmXA,553
+pycountry/locales/az/LC_MESSAGES/iso3166-1.mo,sha256=YVWW1lokxjKqOJutVRom6sIwd2Kgg2_-9Dex0GUvy20,10337
+pycountry/locales/az/LC_MESSAGES/iso3166-2.mo,sha256=KOq3mDw9DYUS-rjkJuUPnx4Gy-UAOi8VNSuEi4V4lRA,3341
+pycountry/locales/az/LC_MESSAGES/iso3166-3.mo,sha256=qVmbEY2NKx6jUrUD2619DJd-2WffCMsCQoTNncQEqqg,521
+pycountry/locales/az/LC_MESSAGES/iso639-3.mo,sha256=CjljkA8FBDD0PsX0EKqyLHqqAj-H5Swl8IfWeSQCYto,1431
+pycountry/locales/ba/LC_MESSAGES/iso15924.mo,sha256=kjFp4ZmTMgd_HIeefJcQqlwCkFphW_n4GMvGWgq6h8A,11730
+pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo,sha256=aNp3LmcCjCFlw5oR6ObmkyyVcQjAgzJEmrSz_Wr_0Iw,29887
+pycountry/locales/ba/LC_MESSAGES/iso3166-2.mo,sha256=IGS3XxKnc_BV8BLubw8VUHSimPZPL_w0KMRP_S0NSOU,248171
+pycountry/locales/ba/LC_MESSAGES/iso3166-3.mo,sha256=3hM8QUCQQRvE3hwkTVobOvnsHI31YtjOq6f-cOxEXCQ,3499
+pycountry/locales/ba/LC_MESSAGES/iso4217.mo,sha256=yYjPVArQ4J0rxKIEhAqKDi-n48eAhX2PUhiohESVo68,11457
+pycountry/locales/ba/LC_MESSAGES/iso639-3.mo,sha256=2eCwuvVUswn7xGy85t6RAfi-w96zAwrnwS3ERGICG2U,487964
+pycountry/locales/ba/LC_MESSAGES/iso639-5.mo,sha256=1sj26ycHju0fZ7jl-Ap1Jcc3xL-Sbscl3n6OJcX1TiA,9155
+pycountry/locales/bar/LC_MESSAGES/iso3166-1.mo,sha256=Fy4JfvfnlcFvl_IPqZAj2wmLkRdaXCWY10GnWYdEou8,7166
+pycountry/locales/be/LC_MESSAGES/iso15924.mo,sha256=60OlCYToRoDArW7FLuHL2y13b7EYvyZ3MKF4H9e4fdA,12377
+pycountry/locales/be/LC_MESSAGES/iso3166-1.mo,sha256=BLzhRMgKoRbCdH_-IR2ktrxoUlv7umx3i3vLhmbpMtA,30045
+pycountry/locales/be/LC_MESSAGES/iso3166-2.mo,sha256=zc8YQbbxae-ocNmOQXu8ULRNzUP6VOsoaZriW3gtKus,193963
+pycountry/locales/be/LC_MESSAGES/iso3166-3.mo,sha256=NY8tsH-xZAISTaPkv-sZoeSe4pS1XwLo0UevpYfPE9M,3661
+pycountry/locales/be/LC_MESSAGES/iso4217.mo,sha256=4PIZXmfifAFs1ts8FT0KRcxYuD8GZPdEyEFgBytIPZc,11879
+pycountry/locales/be/LC_MESSAGES/iso639-3.mo,sha256=CAAY0sia2PrLoADaYwDWF2L4DqokYNoA-hRN9wF2N_Q,18730
+pycountry/locales/be/LC_MESSAGES/iso639-5.mo,sha256=71r8IrsY_YGNzqaX4W6IwaWRRkdg_GJXemcQlDCozRI,9437
+pycountry/locales/bg/LC_MESSAGES/iso15924.mo,sha256=clOfT7xZQdNdhh1NxO6iRcEIaCjUszxC1xMp7nWWFjI,1960
+pycountry/locales/bg/LC_MESSAGES/iso3166-1.mo,sha256=XiHw6_WKu_Z80bstGu7AxWA_t4Z3HxLLyd14pUIgE0Y,28945
+pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo,sha256=2qv_nWe0Sk3pGvtikyrvZ8bMmgUsQSSsFQod9hR7kk0,15982
+pycountry/locales/bg/LC_MESSAGES/iso3166-3.mo,sha256=ajS_H5nLTATojKgYS-VUJHBblcGMlKy4c3xzZfIbZIU,3381
+pycountry/locales/bg/LC_MESSAGES/iso639-3.mo,sha256=lzx0KkahiAqteXh58jjdoKw_LwFQMsks_-hNAKF2KTA,27394
+pycountry/locales/bi/LC_MESSAGES/iso3166-1.mo,sha256=ZGFDWXJxOR6OzgXN09K7QCtfY2Zk0PlKstfKWzFUpYQ,558
+pycountry/locales/bn/LC_MESSAGES/iso3166-1.mo,sha256=ashBjzxU8D7XQxzZLsuAm2D6xkeqcoxtkRacjN8T74w,35751
+pycountry/locales/bn/LC_MESSAGES/iso3166-3.mo,sha256=PUeYbYkNPrt_VO7Ex_zt51qqrI20ANBQpQTI9de2S_c,4015
+pycountry/locales/bn/LC_MESSAGES/iso4217.mo,sha256=1Bww7_EKSgNJgJD0_9u5PO4jXzmvTX58ljyYX-F5slU,6031
+pycountry/locales/bn/LC_MESSAGES/iso639-3.mo,sha256=rKZezhk4NhCDac35gZL_MblsA5hJrIRMKVg7AzKr4js,95995
+pycountry/locales/bn/LC_MESSAGES/iso639-5.mo,sha256=GDRlAiAPncL-NNs1DjcvszQ-Wk9RkO4L65zyO-H1vHY,5688
+pycountry/locales/bn_BD/LC_MESSAGES/iso15924.mo,sha256=sUwR0tr1vY9Wv3nuOMjNDHao3D4kK-1RRs-WyhE7T4Y,14373
+pycountry/locales/bn_BD/LC_MESSAGES/iso3166-2.mo,sha256=QXTOHWYkINzQgpTWYgc9kwv7eVta683ZrVsccKC-fMI,1161
+pycountry/locales/bn_BD/LC_MESSAGES/iso639-5.mo,sha256=xXfd6IKyzFc2dJtsBSa5_0mBCRBvPz7tCcId3NjDzJ8,2772
+pycountry/locales/bn_IN/LC_MESSAGES/iso3166-1.mo,sha256=5Px391j-95rq_YCKjQgXRZ1zfZXWhjtXCHdtd4ywLNY,36015
+pycountry/locales/bn_IN/LC_MESSAGES/iso3166-3.mo,sha256=pIptGQpE8d5nuzL0jTYJLPv3JZY0gxUuCMWgdXI0TgQ,4091
+pycountry/locales/br/LC_MESSAGES/iso15924.mo,sha256=bzikrrMGGbv89ePHYl9FarTjif6L49--RUdhXNf2cxY,8665
+pycountry/locales/br/LC_MESSAGES/iso3166-1.mo,sha256=M3ekEjYGABFPe1Kz1HHa8YVlQOYCIqDny8x3UedlB4o,23056
+pycountry/locales/br/LC_MESSAGES/iso3166-2.mo,sha256=z4m7Emk3IGGks4-6YBVOzjsdiaUHVv2VxxbQySwr4Jg,2199
+pycountry/locales/br/LC_MESSAGES/iso3166-3.mo,sha256=NDwEC3COS46PUyPxviqz3FcXPu4EMPD9mfFf0Ov4MQM,2105
+pycountry/locales/br/LC_MESSAGES/iso4217.mo,sha256=6vlrSTRiidHHd56M_QaB14op8BbnTAykuA6oOXj_Eqc,4672
+pycountry/locales/br/LC_MESSAGES/iso639-3.mo,sha256=JsQP0vgU2lBGq0O7iec-12a5qo2lIkXABqcWV09mj94,32738
+pycountry/locales/bs/LC_MESSAGES/iso3166-1.mo,sha256=jXst5_Jspv9qSo37HDE_V88j4dmOnVDLkn0KJj-2Qlc,22283
+pycountry/locales/bs/LC_MESSAGES/iso3166-2.mo,sha256=SqCsAuu_JfoyzdkKdu_h4RRIlvIEhDtKw7Gcfn3BblE,3326
+pycountry/locales/bs/LC_MESSAGES/iso3166-3.mo,sha256=vmd-r__7CfEP7lNLKO5XaTRbl74cD0gf9jXY5gHb0Ys,2593
+pycountry/locales/bs/LC_MESSAGES/iso639-3.mo,sha256=lp3LUAvixy_p_ahI8y5t4b-ZIh8jpGc0bjPMwybcW0o,2394
+pycountry/locales/byn/LC_MESSAGES/iso3166-1.mo,sha256=zmm0ZRkYUfh_6wWfm85FVzwBNaL9weTOmkUrHsJm5wo,5711
+pycountry/locales/byn/LC_MESSAGES/iso3166-3.mo,sha256=174eD2n3ep9lXJDSr2sabJPPO73sQEbWXWlylJAWyOU,498
+pycountry/locales/byn/LC_MESSAGES/iso639-3.mo,sha256=U6uIgSE3nyqvmHEegh5we5qY92PQ2_TQw8vY3FHaPpY,5693
+pycountry/locales/ca/LC_MESSAGES/iso15924.mo,sha256=WXf0BQyBhTXVwCemcSMW_BpvNSiUjs1aXRgoJ47aK5E,3578
+pycountry/locales/ca/LC_MESSAGES/iso3166-1.mo,sha256=F2PA5TWtQVL6u8byUrDyp8X-43t-OJd-SrPUNPF3oTo,23891
+pycountry/locales/ca/LC_MESSAGES/iso3166-2.mo,sha256=9W2sPJZYhR-NhBssL5uR7fjORplboJ0MNu3yec-bhC8,26805
+pycountry/locales/ca/LC_MESSAGES/iso3166-3.mo,sha256=rE7KKu_cHR59jP_DXCwZAe7GoAWzbqsPu7hJ3rwJ_IQ,2865
+pycountry/locales/ca/LC_MESSAGES/iso4217.mo,sha256=3lVFrST-KSyJ9xeguqNoZLhjO_qZFFaN_ewLL-VCbv4,9687
+pycountry/locales/ca/LC_MESSAGES/iso639-3.mo,sha256=kWtCHZ47sTcTlj7Q1uVzOfutBnhnY2nKyFUjklNcNR0,52105
+pycountry/locales/ce/LC_MESSAGES/iso3166-1.mo,sha256=Ry8LH4ZammiHGSaFExQ2Go7_bsz5PR3oxzXMonsAurY,10819
+pycountry/locales/ch/LC_MESSAGES/iso3166-1.mo,sha256=LKRR9EeT_QvK_YRa4PYZjAjUPCJOXxLOvoX_TVyz96E,1416
+pycountry/locales/chr/LC_MESSAGES/iso3166-1.mo,sha256=dNxi__17QfyJIfXLpTZlOpIDbNhKI-xQNZHWm_iRP7s,5143
+pycountry/locales/ckb/LC_MESSAGES/iso15924.mo,sha256=D984CIdE0P1U45GRmccIvkOpKvwgdGcUMOP_6yPKslM,404
+pycountry/locales/ckb/LC_MESSAGES/iso3166-1.mo,sha256=y-YwCeqO4ti8HBCH6lY1vV0FmYmQcsST1XvtuJhdLzE,10596
+pycountry/locales/ckb/LC_MESSAGES/iso639-3.mo,sha256=BdU29lXjBa0X5wxlvSIPHSttY2B9RDZFgcIw56oNWTc,404
+pycountry/locales/crh/LC_MESSAGES/iso3166-1.mo,sha256=mio4ksDgP3vkAZv35b7vzwvPSLX8XN3b4nYkmoHjr78,21581
+pycountry/locales/crh/LC_MESSAGES/iso3166-2.mo,sha256=PVhzh91jmokj0OMzgIsN5ZNPGuFJrJ3GS4AUVXT5LSk,3684
+pycountry/locales/crh/LC_MESSAGES/iso3166-3.mo,sha256=69s89vyss35u5TfPoPFe35C8GDl461egj-T3XpmMUZY,2773
+pycountry/locales/crh/LC_MESSAGES/iso639-3.mo,sha256=xOa0brEeDKwhQaj2boxRFbDPaHTYLs_h7feBzL301js,255110
+pycountry/locales/cs/LC_MESSAGES/iso15924.mo,sha256=6VJnW9babAkLstym62QLmEiQ2t1CmCPeQrNTHHp4cKc,8689
+pycountry/locales/cs/LC_MESSAGES/iso3166-1.mo,sha256=AGt1wa04gJq0kLKw5yh24tyhTb9hziY-sJMvHYvz5gI,24094
+pycountry/locales/cs/LC_MESSAGES/iso3166-2.mo,sha256=NWMUzpPFs_inKaa8KiZWQ--HdMfUr2qgtYkbNYCeagg,9150
+pycountry/locales/cs/LC_MESSAGES/iso3166-3.mo,sha256=XlpGocVlJciJE6HrOH1yri3lvbXfXjqVDPA6LlTBM8A,2879
+pycountry/locales/cs/LC_MESSAGES/iso4217.mo,sha256=mh7q-PKmL6JNYWd4pwS-s7m480_abcJJI9AmAtfgkHA,9206
+pycountry/locales/cs/LC_MESSAGES/iso639-3.mo,sha256=DV4QPs4NlIcJDIkEef_IvFGdoU2smEZdL8VbCZ_2BPQ,14382
+pycountry/locales/cs/LC_MESSAGES/iso639-5.mo,sha256=Us1dtkxGW_FZIiuzaeFgJtihU33i-xIieqlYRywCKlk,3971
+pycountry/locales/csb/LC_MESSAGES/iso3166-1.mo,sha256=O6VFwNjiIBO6J2cQ2THq6nsDRX0Nrj_2HYcjIIwpHeQ,4448
+pycountry/locales/cv/LC_MESSAGES/iso15924.mo,sha256=XHbhbsZ4GXgTJ_iXMuaMBluT7baj5n6VbE8RGK-3gyE,10777
+pycountry/locales/cv/LC_MESSAGES/iso3166-1.mo,sha256=6f9pyeN2K5izv81F5s-L9ujDfphz8sJJMGvElFOLKjQ,26648
+pycountry/locales/cy/LC_MESSAGES/iso15924.mo,sha256=3sYSAbHAsHlc6DZac8NVjbGEqIqd8OiDdug-rOVznrA,3591
+pycountry/locales/cy/LC_MESSAGES/iso3166-1.mo,sha256=bZcvDOVpLy693csdzJa9EU6SO6vDi-qcuTWCDNdzFM4,23789
+pycountry/locales/cy/LC_MESSAGES/iso3166-2.mo,sha256=YQcHAwAOE7d0y6KUYZisn3NIn8oDty2Vldbunj51geo,34985
+pycountry/locales/cy/LC_MESSAGES/iso3166-3.mo,sha256=A1pcNJOs0wk8co-v1yRG_lF6i-j-_EyL0jSi88DI_yo,2876
+pycountry/locales/cy/LC_MESSAGES/iso4217.mo,sha256=Q_XAA9wuKeTjIfA1fTyRs3lTPdBbw_qf38HReYkvln8,1790
+pycountry/locales/cy/LC_MESSAGES/iso639-3.mo,sha256=N0JMXN9X2y5oAc3FppwF_2ejp5DdAOOnsbPt2CRaais,14506
+pycountry/locales/cy/LC_MESSAGES/iso639-5.mo,sha256=V2Ow87MXb2B-y4iCVWCZPfXnj3J_NJbN05IvCoQg7m0,2109
+pycountry/locales/da/LC_MESSAGES/iso15924.mo,sha256=EVRf_vk8E-92oZMPqwqRdvYtmySM5mbDKu9CoFbXwk4,9869
+pycountry/locales/da/LC_MESSAGES/iso3166-1.mo,sha256=sGYEO6DUweOnXEujMTvaDRJfK9DEb2i8EG-keSkpetw,23328
+pycountry/locales/da/LC_MESSAGES/iso3166-2.mo,sha256=8KYJdidl7VdsIBnMUtiP4IfUAfcjC36rXdcD7GDYRrs,134169
+pycountry/locales/da/LC_MESSAGES/iso3166-3.mo,sha256=ujrGCZUJOjnhZSjYF7zcuG8JLhBtN285ktQjqRlLC8s,2671
+pycountry/locales/da/LC_MESSAGES/iso4217.mo,sha256=-dlgh9TVCJaLJ5yoIdbdOQvHfEsxQE1VSfJ0n9NoH_g,8621
+pycountry/locales/da/LC_MESSAGES/iso639-3.mo,sha256=3ew_k-NnySPmoizFyMJPWl1zzD-am3KDB9OncHKyU48,19659
+pycountry/locales/da/LC_MESSAGES/iso639-5.mo,sha256=RxLEyc0Xe-CWsmJXY0H7VtXMnOZjiyHaipYE_IEZrAA,3961
+pycountry/locales/de/LC_MESSAGES/iso15924.mo,sha256=kc-r_NDUPnXaW_d0zqNlqy3Atze6-tQQ9rUb8uUWWD4,12840
+pycountry/locales/de/LC_MESSAGES/iso3166-1.mo,sha256=61jN9MqyRZ-QQ0stb44pOn9xFvdny13P0VBksFUXnxs,23454
+pycountry/locales/de/LC_MESSAGES/iso3166-2.mo,sha256=TD0YDObhySpxVCP87bkx9_CXpStR4AB9YxfQRkM763M,205303
+pycountry/locales/de/LC_MESSAGES/iso3166-3.mo,sha256=ROp9ZyyraJszLaXxy6ToJSj1h2MTAeDFU9YpzcWvrt4,2815
+pycountry/locales/de/LC_MESSAGES/iso4217.mo,sha256=grY1W1TxNIyKYm_v2ewgmIFEy48FSdKFAUdqyzJLGLo,9797
+pycountry/locales/de/LC_MESSAGES/iso639-3.mo,sha256=F-hLzVZIpRYrHgYicyBhcWbHXSe-uW2ux4b2pWKdhFU,394243
+pycountry/locales/de/LC_MESSAGES/iso639-5.mo,sha256=rMJ6B4Yt8rtbeLvWaw-TcDbOxf8ggfytflQOKlKU8jk,7860
+pycountry/locales/dv/LC_MESSAGES/iso3166-1.mo,sha256=XDsoK_W6k_U96CcC5YauBU2pA9kMOFT5cyVl6aR7g2I,11257
+pycountry/locales/dz/LC_MESSAGES/iso3166-1.mo,sha256=uV4vcsy0e-e8-cC5n3m7dQle39x5THKOcuX7ybdQr1g,40229
+pycountry/locales/dz/LC_MESSAGES/iso3166-3.mo,sha256=koBYk1RwabIAOHN43YwxcfrlYMCUE19R5gYVARwtuj0,4758
+pycountry/locales/ee/LC_MESSAGES/iso3166-1.mo,sha256=6ndALIIS_ueCVeZZwlFb_nyjkznPApYAYO6pdf5Q1nE,554
+pycountry/locales/el/LC_MESSAGES/iso15924.mo,sha256=kOZTT7lOqAsewkWfDpJ56iwNzz7bQUS6xk7vUq-2Ucg,1780
+pycountry/locales/el/LC_MESSAGES/iso3166-1.mo,sha256=8BjqMl4_9pEqUF0bXoVFqvpEOFLAznTyha9HYF0_cNA,30772
+pycountry/locales/el/LC_MESSAGES/iso3166-2.mo,sha256=3PIeh6MRCdG0AL_0VN10_pk7uht4yB9VOm_PXOrJziI,9264
+pycountry/locales/el/LC_MESSAGES/iso3166-3.mo,sha256=-EQ2ULB1zDz_-q8E_RoeyNEDulJH0lDiRPg_ukBpKCU,3428
+pycountry/locales/el/LC_MESSAGES/iso4217.mo,sha256=XLWJGgb3TPL9Sjq7uk-lhpf1HBw-nMZLr9Ot-CjR_tQ,9217
+pycountry/locales/el/LC_MESSAGES/iso639-3.mo,sha256=57vVFSwFz9X4LuFaZM9eaP8EZQ8IZqTZPZbl_uk4gQc,57009
+pycountry/locales/el/LC_MESSAGES/iso639-5.mo,sha256=7KaqAqDWDQgtpqPIBEYfN2Nn-4oL9651RpjvWFw0EWE,2391
+pycountry/locales/en/LC_MESSAGES/iso3166-2.mo,sha256=tqBaObVheTp9c80KelLlHE80qxL-HjYNd-PLTYFt_s4,90816
+pycountry/locales/eo/LC_MESSAGES/iso15924.mo,sha256=XFmpQlWU6g4cm_PI4jqYDftpqSbM-ejwWfDtXL6Lckc,8268
+pycountry/locales/eo/LC_MESSAGES/iso3166-1.mo,sha256=dr01nC8FEUgGjZCdOMzXbm7xt8W_4q4NjkoDWaVcAks,23042
+pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo,sha256=fkImk03eLyVqoiVzGTec4CMdNL9t8fZol0IvUmtsEVA,44961
+pycountry/locales/eo/LC_MESSAGES/iso3166-3.mo,sha256=mOFUjyiPsHicME4Lt5_1qHrgLrXhqfcYF-AEmakcJko,2599
+pycountry/locales/eo/LC_MESSAGES/iso4217.mo,sha256=8OSbcxbrcEf7Hg52t1YtWw0z_txLSWn_IXwFjYpaxaA,8065
+pycountry/locales/eo/LC_MESSAGES/iso639-3.mo,sha256=lYPs7UbkG52iwmZONEVo20veU0OgPcNKES5hvYlSM7M,48310
+pycountry/locales/eo/LC_MESSAGES/iso639-5.mo,sha256=6WlSyNLvedWIBv04knXYPEwqFH5eTyC4hjWfwGnkwzQ,6705
+pycountry/locales/es/LC_MESSAGES/iso15924.mo,sha256=-5ViRIVE8FhZ11EzR-Z0dIgHWgP4bZyqU3KlrtLbXDo,12410
+pycountry/locales/es/LC_MESSAGES/iso3166-1.mo,sha256=a7HXNyjnKnPvnejAktacS6oLa0tquvAaStcmnh2MkH8,24030
+pycountry/locales/es/LC_MESSAGES/iso3166-2.mo,sha256=-X797NkDYce1w3VR1k_zDvVNVphRy6qp_AOnCMEffPE,19001
+pycountry/locales/es/LC_MESSAGES/iso3166-3.mo,sha256=MTW-LfPGXXKazp_9140BPRBvk8Ehj1qF9zfPjUd-I8I,2927
+pycountry/locales/es/LC_MESSAGES/iso4217.mo,sha256=yjoR0SqPjmQT37LueaZ9VW5D2CVpm9wpz6Y7ichqEc8,9590
+pycountry/locales/es/LC_MESSAGES/iso639-3.mo,sha256=ZsLV_GFx8JpX71f9FEMkg97ULilnSopk46qVnq6_ZoE,35811
+pycountry/locales/et/LC_MESSAGES/iso15924.mo,sha256=jrU86gbu9n4C3UQmoOk-JiQV_wBojKAdJhXkPEVB5MY,9757
+pycountry/locales/et/LC_MESSAGES/iso3166-1.mo,sha256=JkdyhAU40azro986veHLyFW1WnNx_dKVfXIbTHmrp1A,23059
+pycountry/locales/et/LC_MESSAGES/iso3166-2.mo,sha256=VWsH2mLdKqOHLHR1Dmj1ANxdrge4W5WLlvXJyWEgPKU,12342
+pycountry/locales/et/LC_MESSAGES/iso3166-3.mo,sha256=fWoF_uCGivdUfWpLdcfMbxOIMzPr4Lg3KYtFbp2MjeM,2748
+pycountry/locales/et/LC_MESSAGES/iso4217.mo,sha256=tGC20QUvvlpa1ldi58SuWqoWVG7LWYwZirMr0cQAOvE,9492
+pycountry/locales/et/LC_MESSAGES/iso639-3.mo,sha256=vGcOAEGBxV13MGuGGkOsPpNpvIC5zjiYrZ57iCu_j_g,32026
+pycountry/locales/et/LC_MESSAGES/iso639-5.mo,sha256=u2UzyeBVJ4EfgURDtAotsgLFc84jalBE9_OhQqvIu5I,7437
+pycountry/locales/eu/LC_MESSAGES/iso15924.mo,sha256=ko9BjeWGGCXryDofgMh_juSO13PTwSh9ZyJsBvSSlBU,10190
+pycountry/locales/eu/LC_MESSAGES/iso3166-1.mo,sha256=nINnO49UTvGw_P6GqParxGP2Ra-3uBSQHfxx4EcLt3M,23811
+pycountry/locales/eu/LC_MESSAGES/iso3166-2.mo,sha256=VHeL7j9VeX0pmIrevJsIC-lr-XfI2jLMoJZBZZaxHpw,23745
+pycountry/locales/eu/LC_MESSAGES/iso3166-3.mo,sha256=WDxWO7IFnw8NWJT2ozJuWIAG3EDekFDN8NVm7WNd1JY,2745
+pycountry/locales/eu/LC_MESSAGES/iso4217.mo,sha256=_9cNERxaRATG5mlsgcx4OgTlZ52nr_GJKskhk-CldC0,856
+pycountry/locales/eu/LC_MESSAGES/iso639-3.mo,sha256=moUkszaRuu5CqHq48SJRYMniUjpt-7sxYitQUf3ITOE,20792
+pycountry/locales/fa/LC_MESSAGES/iso15924.mo,sha256=fVphpJt5NV0nbkZcFoEEUvvQqkeIuiV9JUd353ePiB0,2213
+pycountry/locales/fa/LC_MESSAGES/iso3166-1.mo,sha256=7dFgCzOYnrZZaODsiEqZ0rYdUIX18zatIJO084ypjA0,26404
+pycountry/locales/fa/LC_MESSAGES/iso3166-2.mo,sha256=uzAlpNxtDqQBiYDmWzNT7_QEKOb5bdVlASN7ySLWF7Q,404
+pycountry/locales/fa/LC_MESSAGES/iso3166-3.mo,sha256=7HW_kwrJeHHKcWp_P7lsl4VI2JAns3VPHDg__AOzNRU,3106
+pycountry/locales/fa/LC_MESSAGES/iso639-3.mo,sha256=WWUyB1VwOCphybCzND1GPh42PsU2q95ngArgmpejWZw,13407
+pycountry/locales/ff/LC_MESSAGES/iso3166-1.mo,sha256=SmjnFB-fFSYNCZKLP04fQOuhtENGAmQOuqgos48y1vU,3704
+pycountry/locales/fi/LC_MESSAGES/iso15924.mo,sha256=4Jk9F50gAZepourzmEWCBd2ua4dLNO3D_AHPXrabrDI,8706
+pycountry/locales/fi/LC_MESSAGES/iso3166-1.mo,sha256=g8AqTgk0_XZOnqRfzMUd7De6VBslgmcavOZgKDWc-Lo,23587
+pycountry/locales/fi/LC_MESSAGES/iso3166-2.mo,sha256=dZnAEXkVYnbtVBPmgRM5AzFJfrKJHdxJKcG08h22vmI,5473
+pycountry/locales/fi/LC_MESSAGES/iso3166-3.mo,sha256=1kgk7vxOMD_BB5MybqwkbCx_Hij7CSRmTW_lSDW_H4c,2797
+pycountry/locales/fi/LC_MESSAGES/iso4217.mo,sha256=pCfR5zeHcqadROJ_czrPMGkEPcHZRBnHCYHVi4SCffw,7073
+pycountry/locales/fi/LC_MESSAGES/iso639-3.mo,sha256=P6TALBwLeU6WJpAxEYR7ZmhjWOfHW_AgY9hzg4eMU4A,13246
+pycountry/locales/fil/LC_MESSAGES/iso15924.mo,sha256=538ZBaawvbHFJXJVrkxS5ycwyj_gQvuSwJPTy_s5n6E,10167
+pycountry/locales/fil/LC_MESSAGES/iso3166-1.mo,sha256=CYgq3YrtaoqSms_KiG-lw2ljv0ruWqxsm8atAsPvKyk,23844
+pycountry/locales/fil/LC_MESSAGES/iso3166-2.mo,sha256=GRpA98El7KAGhLqrYxt4cExJ8P0LOHVZ6q_ydGzKVwQ,3047
+pycountry/locales/fo/LC_MESSAGES/iso3166-1.mo,sha256=_gC9v3TLsART2i3d83FTHnmWvpmpG9R-Wf4L3evp-ak,5837
+pycountry/locales/fo/LC_MESSAGES/iso3166-3.mo,sha256=P1iPGAp6OJ--qu_qcIuUvPNu29W6Edtt9N7V0VM--kQ,425
+pycountry/locales/fr/LC_MESSAGES/iso15924.mo,sha256=Gli6Za-YIyR0imC6fpv3xvwJ9xJq9iYMrXd8rPryuo4,9972
+pycountry/locales/fr/LC_MESSAGES/iso3166-1.mo,sha256=0xquoUO2OaXbl5OPBVw7qCSYqVBJciTZvjgG1ngsO-Y,24340
+pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo,sha256=C3zJm1OpsZwUgm8h-nLB79zwDtq_8yjg0nNGJV7Hsyg,160397
+pycountry/locales/fr/LC_MESSAGES/iso3166-3.mo,sha256=_kUqnSih1FWAMxZ6KnF7pETF9kB73nyPHHUSAS0JIGQ,2860
+pycountry/locales/fr/LC_MESSAGES/iso4217.mo,sha256=ST0GP-1q456xXzizuYKDRbqGYWDh3i7dX9cpeMsDexg,9716
+pycountry/locales/fr/LC_MESSAGES/iso639-3.mo,sha256=TvuiQ7e5PiizR4SILauvQVHLIU7dWGJ6_YPuIfurkaI,417364
+pycountry/locales/fr/LC_MESSAGES/iso639-5.mo,sha256=w4gK091KSpZ-h5jsHMUO8rBqh25CaI-DCrGAZOBAALU,7943
+pycountry/locales/frp/LC_MESSAGES/iso3166-1.mo,sha256=IvjxXG0W4tSh-ltlxuhP-mCS-nUhu0T6CiPPw_25HWE,9173
+pycountry/locales/fur/LC_MESSAGES/iso3166-1.mo,sha256=0BP25keqdfR4xusOFaQ8bKMADYINpzMjOJm2_Szzbrg,23950
+pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo,sha256=b2ajZQ6epzNlWt-00MEU1MUMYyXyukse5NCW1Z1BWKk,2752
+pycountry/locales/fur/LC_MESSAGES/iso639-3.mo,sha256=7ldEmDsfzEH735euvsKTDxGe85NseqCoLjssaXeVnJo,755
+pycountry/locales/fur/LC_MESSAGES/iso639-5.mo,sha256=P1rvQRKyur4ODVrNHFCT_3v4kp8CpILKMTtx9wGzhKo,7791
+pycountry/locales/fy/LC_MESSAGES/iso3166-1.mo,sha256=KYhmJx_lEHsdCuY7ZdaZtz2gI75ZBkZ888Dd_dZ5pBo,9356
+pycountry/locales/ga/LC_MESSAGES/iso3166-1.mo,sha256=xwjgq2_pZlwKVe1IKNZU0dfWqlIkjA_ORzowuKqNJfw,24529
+pycountry/locales/ga/LC_MESSAGES/iso3166-2.mo,sha256=OX1BYri2JZHNVtb8CfOdNOD_Xn9eWprtRFBFKRMwKj8,219239
+pycountry/locales/ga/LC_MESSAGES/iso3166-3.mo,sha256=wU1DDoKBgDePxCFKMT7s_dbHu77ZHVNlppPNvy0J_Hw,2959
+pycountry/locales/ga/LC_MESSAGES/iso4217.mo,sha256=JkKqsVmc4tOOkCFWB3vZZdlNJt4HhVR_uuI9QxQBwBQ,9897
+pycountry/locales/ga/LC_MESSAGES/iso639-3.mo,sha256=5TwcgNz84lNekJ1H5r1lbHxv9HWLDW7WBvo4S_pMccU,416644
+pycountry/locales/gez/LC_MESSAGES/iso3166-1.mo,sha256=JpzM7q09FPEDKh2HQYdkuXSdRNwFgdn5MaCKVorP-Ts,5761
+pycountry/locales/gez/LC_MESSAGES/iso3166-3.mo,sha256=GN0VMwZHqlqm-TUjvl1MryveihMngKfRZvpAD52a5oI,500
+pycountry/locales/gez/LC_MESSAGES/iso639-3.mo,sha256=0fYmG2PNN23wg8tgcO4nVFKXb5ssNIVm0XCvhcS33fc,5696
+pycountry/locales/gl/LC_MESSAGES/iso15924.mo,sha256=kW9IAT78z1bZyD1VS7fhS6FjmvVhoLLb5Q9Bx4iKq9s,7784
+pycountry/locales/gl/LC_MESSAGES/iso3166-1.mo,sha256=POqwc0GuezY-aRcYDuyK_0g9MBBpBwBZz2rX1AGjVc0,23252
+pycountry/locales/gl/LC_MESSAGES/iso3166-3.mo,sha256=3rMs00uCCQvh7sRz2lYsJXU8yqmRLxHTWtSYMt8UiVg,2695
+pycountry/locales/gl/LC_MESSAGES/iso4217.mo,sha256=rP_5PKeAP0CIaejAfVH5_Gtqt6i2lUhjrIZK7k2GA0s,2738
+pycountry/locales/gl/LC_MESSAGES/iso639-3.mo,sha256=_n1CGjhMM3a5r6aRKvC7C_mWCC1INZVQzK6MVhGtZNY,305634
+pycountry/locales/gn/LC_MESSAGES/iso3166-1.mo,sha256=cfVLYnjOabG7BJAnUytlNFF8gX6oUFmGHigqSGeXHY8,8952
+pycountry/locales/gu/LC_MESSAGES/iso3166-1.mo,sha256=BTbIDjcopoGl-bq5XtmV36jIhMIn1dFbo-36oQWPH74,35101
+pycountry/locales/gu/LC_MESSAGES/iso3166-3.mo,sha256=spiaVCBHo7BSunG1rggmBMDOzsJsx15JWzfEdIxNysI,3904
+pycountry/locales/gu/LC_MESSAGES/iso639-3.mo,sha256=L9JdsfwxKD-zWFhrmZ4GgxuTZisjgs3UChMluhTjk7E,43902
+pycountry/locales/gv/LC_MESSAGES/iso3166-1.mo,sha256=8rEYVKEPZVSB4SGyNWu0ArnMIiE-FY9MF_LHg3VVfp0,8982
+pycountry/locales/ha/LC_MESSAGES/iso3166-1.mo,sha256=TnHC_7VDELwHJc4d_WYcxzggGhdHlFFekvq2N-Ms6yg,5135
+pycountry/locales/haw/LC_MESSAGES/iso3166-1.mo,sha256=iRcwqDVb2jDSHf5H1PYWmS_0nWvv2g81dpI0c-xRp30,1305
+pycountry/locales/haw/LC_MESSAGES/iso3166-3.mo,sha256=WV5aaforemIYxzAu_hedBTJkRbab1OUQin874A3tk74,427
+pycountry/locales/he/LC_MESSAGES/iso15924.mo,sha256=hMrcUZE8HtqcWJkcCAEZKlP5d2wWaQTns4OpHK39dmQ,3332
+pycountry/locales/he/LC_MESSAGES/iso3166-1.mo,sha256=5v6_NYS1q3s5R9-jsoD_VVCiRpFAn8CvAL_FIKccoK8,27802
+pycountry/locales/he/LC_MESSAGES/iso3166-2.mo,sha256=wcLnl6X_Tuv9xAVow5IjIzBIRakyh0UCrBGpxYD_XSc,43462
+pycountry/locales/he/LC_MESSAGES/iso3166-3.mo,sha256=F-OSPpj7nitjFo8mJHrJP61KZ3QJPYylusCpad8_e_g,3369
+pycountry/locales/he/LC_MESSAGES/iso639-3.mo,sha256=ZCMhrEwt1Z1H5wMqu3jM3Fs8EaR-mRSR5F53v9oMyns,6280
+pycountry/locales/hi/LC_MESSAGES/iso15924.mo,sha256=XoASd4t4oolEumcKaN7OpY6cZG6gcpiKdLeGsTg_qw8,14070
+pycountry/locales/hi/LC_MESSAGES/iso3166-1.mo,sha256=kDE3PVHVOtbQ9HdsISBEIo_SgK_J0D7cYjQ8On7tKOA,34018
+pycountry/locales/hi/LC_MESSAGES/iso3166-2.mo,sha256=mURbB2wzR9Zr1HaT47fIxMp4Ayrq3d1BF4woZ1Hr5AM,293910
+pycountry/locales/hi/LC_MESSAGES/iso3166-3.mo,sha256=jq2cEMqKqa-toXQHzg_lCV8LdXAZjd0PK4ZsH0JE1oc,3981
+pycountry/locales/hi/LC_MESSAGES/iso4217.mo,sha256=L3RpXK6KD7ynresAPUGFDXbiPzgMNNBiFMy0g83SJrc,13122
+pycountry/locales/hi/LC_MESSAGES/iso639-3.mo,sha256=gTDWFwK3RuNj6WsZLExhd6h47aO5FCphJ3IQDrgJSuk,574295
+pycountry/locales/hi/LC_MESSAGES/iso639-5.mo,sha256=USw_vRCDwgJUkpd8IYf1XCbyinfIu-HHCk8M3GI3nBk,10812
+pycountry/locales/hr/LC_MESSAGES/iso15924.mo,sha256=kWNgwChMvSeB1AvTA88VnnMrNSAJOdxW9P6BXyJaJ5w,10120
+pycountry/locales/hr/LC_MESSAGES/iso3166-1.mo,sha256=jdqArqFWSceD1E-RL6DEhiZhWwt-ld8m7l3XiYG5GF8,23588
+pycountry/locales/hr/LC_MESSAGES/iso3166-2.mo,sha256=eIfp6z7nrt_vdSifl0rwIc7CBUhJCHV2iwM5yNMueYM,25948
+pycountry/locales/hr/LC_MESSAGES/iso3166-3.mo,sha256=_aQzhsup0_C4WR9JGj20TPUkOs4csUsY3xu_D88bdKQ,2896
+pycountry/locales/hr/LC_MESSAGES/iso4217.mo,sha256=qMhIrd7RD1R53j-CZXdLBCvJJmoR5eyN6vr5hhHBsco,10142
+pycountry/locales/hr/LC_MESSAGES/iso639-3.mo,sha256=-zc9wh35LljQuP3FGbVKeRuAiEvQHz60oKuEMZd-hsw,52871
+pycountry/locales/hr/LC_MESSAGES/iso639-5.mo,sha256=e4HigZoiybRHAoCU0W5fvIEwcFwXlc6SkiHMUDUftuA,7671
+pycountry/locales/ht/LC_MESSAGES/iso3166-1.mo,sha256=zH-6PntafPCOEc5uX0cMqq8OyBbmOCCZmwGPzsrSPrw,7744
+pycountry/locales/hu/LC_MESSAGES/iso15924.mo,sha256=uMbb5gy6yo70Ind0gRtv86scWuvZFJMpVPBzlMmuX6w,10005
+pycountry/locales/hu/LC_MESSAGES/iso3166-1.mo,sha256=CVyvWk6oOi-szp29aaMdyQzUztoaiQqmkTLeyG4LGvA,24607
+pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo,sha256=IF4i-vTk6tkqTnms7zh7FBVdKAcY0KUJW969z3uaVMs,210922
+pycountry/locales/hu/LC_MESSAGES/iso3166-3.mo,sha256=7JheLGgKWA4BBvUszH3-LkjYh0KTHiyq4PPGlw9fb0U,2959
+pycountry/locales/hu/LC_MESSAGES/iso4217.mo,sha256=SR2LSmAqPPmUoQmOGu9QCHVZf7ifS-O38YMTgIUuWlk,9539
+pycountry/locales/hu/LC_MESSAGES/iso639-3.mo,sha256=NIuaxliBA6-JqdGuduCx56YKnbWH33oP4hVdyc39OXE,407785
+pycountry/locales/hu/LC_MESSAGES/iso639-5.mo,sha256=Gi5BDPXcwIMgQMVBmgI1pA3FSp6l0j12yfrmlv9vbcc,7550
+pycountry/locales/hy/LC_MESSAGES/iso3166-1.mo,sha256=UoMjQvqWad7buvhxpeWInlZR_SdHzg8r6WVFjVizoRQ,31919
+pycountry/locales/hy/LC_MESSAGES/iso3166-3.mo,sha256=Pm1jytbwk8auQGaWDosSqiAWhMTktJBOW_FupIyvM6k,3726
+pycountry/locales/ia/LC_MESSAGES/iso15924.mo,sha256=QrRaMp1WPre3bACRvSt5rG6fxBO1AncWYvfsfkvo_n4,7910
+pycountry/locales/ia/LC_MESSAGES/iso3166-1.mo,sha256=g8rup6qwLOGQdWBvdLX5wBILn3Xut0ksPwhiczD5U-Y,23347
+pycountry/locales/ia/LC_MESSAGES/iso3166-3.mo,sha256=qhAUSwo3yGpiUNpwuwSzMhGTR-9yF3JQ2h3dTjJO5uQ,2678
+pycountry/locales/id/LC_MESSAGES/iso15924.mo,sha256=CfrC9DBb0JIBgtQQgjNlCon_wzutHXzX39eb-XqxOHw,12607
+pycountry/locales/id/LC_MESSAGES/iso3166-1.mo,sha256=1VlyKfhYIZ431EQldXjUZXkDgLAUkiVpqBu6IMS9cRQ,23086
+pycountry/locales/id/LC_MESSAGES/iso3166-2.mo,sha256=SeVsAvyFOSSeLEcbsXnkJZMWbBBVnycCwraYNaxerzs,161572
+pycountry/locales/id/LC_MESSAGES/iso3166-3.mo,sha256=ozybktlkBokoXXbkf-urGvEv43JWCSxDO1Vda7O7BIw,2702
+pycountry/locales/id/LC_MESSAGES/iso4217.mo,sha256=A6HhM7w36UjSrSKRmFTbSnZHpMQKoQlhD7gnBH_kNsA,9418
+pycountry/locales/id/LC_MESSAGES/iso639-3.mo,sha256=_QhOb_aGNUkYdCYb_YYkuobk_hvjla0WOC0O6-vfPU4,292336
+pycountry/locales/id/LC_MESSAGES/iso639-5.mo,sha256=l3r5cz3EbITYOmgvmesxCTlhsJBKrYN1rcItekhC-xM,7756
+pycountry/locales/io/LC_MESSAGES/iso3166-1.mo,sha256=the_kbOffosZWAy_AczRytjRJ-N9Rs0VAjs6bzpijT4,9210
+pycountry/locales/is/LC_MESSAGES/iso15924.mo,sha256=SwYyC2HRwScPaXiq0Am09ilOahi7x9S-LBupjFRGEL0,10580
+pycountry/locales/is/LC_MESSAGES/iso3166-1.mo,sha256=A82F_9dYIwcISOQ-46XaA8OKQ5IEUUwo146oG3NoMZk,24295
+pycountry/locales/is/LC_MESSAGES/iso3166-2.mo,sha256=1NfBKTJdDQqP6-39kE3IAbdEv7_d2WDh0BU6ZxVZDzo,6094
+pycountry/locales/is/LC_MESSAGES/iso3166-3.mo,sha256=H4DY1fZ_yZh1dFy8DCazWL_wKqEMbBV6i5ZDsevDJNE,2961
+pycountry/locales/is/LC_MESSAGES/iso4217.mo,sha256=e-bDvyBZqB9gkIFAdv-ciG5efZCOvpjRb2yCuS4M3xI,9958
+pycountry/locales/is/LC_MESSAGES/iso639-3.mo,sha256=TeBdiHvXTo8NORMqcVegke16e064_FSGL1-r0Knouw0,149579
+pycountry/locales/is/LC_MESSAGES/iso639-5.mo,sha256=bVNRcpSArWK7djnpmhOM8EGw9uYGTzrVN6_MlBqsCJI,8015
+pycountry/locales/it/LC_MESSAGES/iso15924.mo,sha256=mnoKuwvdz5ATvCXXgXqKwpc3onwmErDJwiFjy6ztoOw,9161
+pycountry/locales/it/LC_MESSAGES/iso3166-1.mo,sha256=BsZZ5q3q-GvX0PFV9rDehcrzdUKIzjjglMDOR0fCOrk,23826
+pycountry/locales/it/LC_MESSAGES/iso3166-2.mo,sha256=4Di9ZNdcK7puTeEdGJuPhGQ3VOtKTDHhNfqXjcP_WnE,155859
+pycountry/locales/it/LC_MESSAGES/iso3166-3.mo,sha256=OHn1oi0HReKAuA5iL8UuvcJkTsB1JgfB-QnQivGhtM8,2720
+pycountry/locales/it/LC_MESSAGES/iso4217.mo,sha256=2EztVL_6nIWcXsuK-dhwoAqLxz5voqHEgKVfKYnr2EY,8962
+pycountry/locales/it/LC_MESSAGES/iso639-3.mo,sha256=JId5JcoaTHsNCpPMqKVAXPL8KU5zbBwxNJjhtbhO-dM,368225
+pycountry/locales/it/LC_MESSAGES/iso639-5.mo,sha256=lZR81FkGkil6wZCILOorTOuybp_AdUiw5l5aIPn0HOM,6985
+pycountry/locales/iu/LC_MESSAGES/iso3166-1.mo,sha256=KML26LA8WfyalJ2HpmWRo2vRw3yV0RnxeRouMsEmbx0,1634
+pycountry/locales/ja/LC_MESSAGES/iso15924.mo,sha256=i3VW2S_dsxpt64q0_v75KgUvwPgh6NHWvzRF3ZzPye8,4074
+pycountry/locales/ja/LC_MESSAGES/iso3166-1.mo,sha256=L8VXzEnTS7xQIvcqt6xEgem9hBbaI16MVClgRf-LwaI,25564
+pycountry/locales/ja/LC_MESSAGES/iso3166-2.mo,sha256=dkxjiWjTef3ZrxXGhmutUt0C_OO3PkHqXh2OQuTO9jg,99262
+pycountry/locales/ja/LC_MESSAGES/iso3166-3.mo,sha256=fhh7_zTxzd3FhSVEbhqzKUcQ8mwoCkDjTHyHJGV46D8,2724
+pycountry/locales/ja/LC_MESSAGES/iso4217.mo,sha256=yo4qG98HjcFRXjJAl_W2OUyB9SQcAQ6gb2swiZtMKm4,9773
+pycountry/locales/ja/LC_MESSAGES/iso639-3.mo,sha256=rNfYu4SjwdkiXqd4dm077C-xa28uRlUSGBzY4NMAR7Q,16953
+pycountry/locales/jam/LC_MESSAGES/iso3166-1.mo,sha256=b2le-CQh-_jjoh2fEaIUWD8fiaF_VaE1CzhPvmVxxmM,9120
+pycountry/locales/ka/LC_MESSAGES/iso15924.mo,sha256=Bf86d4CrI5pN4b7J7lnpZGHy0VBiRBNXVXH_JyaleGI,7161
+pycountry/locales/ka/LC_MESSAGES/iso3166-1.mo,sha256=ZoDszEZ3RoUf0RmmC-ZMWNF0pDRNTex5lucgJdTBFYc,36655
+pycountry/locales/ka/LC_MESSAGES/iso3166-2.mo,sha256=Mj4AAZfR8-ja7LBohPLpBsMjcFIyhFc6tHuuEWh8Pqk,116269
+pycountry/locales/ka/LC_MESSAGES/iso3166-3.mo,sha256=USd-N-sbW_zNmAuC_-yvitKenHAr8-jgJjUPEtQ8nw0,4426
+pycountry/locales/ka/LC_MESSAGES/iso4217.mo,sha256=B1emYr4bGAmpGKf9we6fiWizcTRMM-5QFmcPpj28qoE,12796
+pycountry/locales/ka/LC_MESSAGES/iso639-3.mo,sha256=UGgHqqfOEc5ExWUKlUxMXJdKLHLuX-2MAch9ktMjQa0,403
+pycountry/locales/ka/LC_MESSAGES/iso639-5.mo,sha256=9Vm75nkeluDlrDbgxEsVA4u-xeTrBhe5bTKiPgZ07nY,11127
+pycountry/locales/kab/LC_MESSAGES/iso15924.mo,sha256=e1BG3_oMin3VBUml1UPf4erFUBMdsZgq7Ec8HD2Qh7g,698
+pycountry/locales/kab/LC_MESSAGES/iso3166-1.mo,sha256=XfDHMGv1BNUuMnZ-Zltw0pw7wfaWR-0DsOoJTKZED_Y,6630
+pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo,sha256=oedAPXj9Vo0DZQLeR2WED4j7E81jqB5leKGm1WnKJJs,2889
+pycountry/locales/kab/LC_MESSAGES/iso3166-3.mo,sha256=zw_65SQXiRpJ3V7zUJ_7zHw2O0InI-LrRTAwkmezj_0,856
+pycountry/locales/kab/LC_MESSAGES/iso4217.mo,sha256=WEAogp5MgADVviLyZjT64FhWkiIPrCWAgqXua00xtIQ,830
+pycountry/locales/kab/LC_MESSAGES/iso639-3.mo,sha256=GU33yFz1rMZf6uUTFoKioA1UOhrOm-auRiE5mh_3TRg,1751
+pycountry/locales/kab/LC_MESSAGES/iso639-5.mo,sha256=dQo0PHQTM8V9naMhpon8zf74QcQ5z2eDiHVPUgIWbx8,675
+pycountry/locales/ki/LC_MESSAGES/iso3166-1.mo,sha256=mWIyJogZzDehTwYKmxXK8bdpdk2hlx7pkDX0Rt9FBks,5119
+pycountry/locales/kk/LC_MESSAGES/iso3166-1.mo,sha256=5f5iQLfEVfkHOLbQ0WK-aJB8nMOuGHxaQAjm9Ze5ofU,29652
+pycountry/locales/kk/LC_MESSAGES/iso3166-3.mo,sha256=W5bf02Qa5Psz9AWQR44QFx1BAOC2hzggCk33dz0S8Zs,3237
+pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo,sha256=GLpF1OExadl49Tvh6VYbpJP0SSr1-tRwto7AWY5LCW4,562
+pycountry/locales/km/LC_MESSAGES/iso3166-1.mo,sha256=3FTC8RZ6c4jN1nJ_2Mac5WcZ9SHL43Nzu6g1yFRcorg,36282
+pycountry/locales/km/LC_MESSAGES/iso3166-2.mo,sha256=9CUIMa-TWyXG_dYlf6NR19hEUS7hh99hOMOR11hhe7k,404
+pycountry/locales/km/LC_MESSAGES/iso3166-3.mo,sha256=YklIULLU34pf4DJeUUFs_mJ-gE2V_42-OZs1pyur-94,4069
+pycountry/locales/km/LC_MESSAGES/iso4217.mo,sha256=bRQbqQkCilrCo-ICG_WbqcGEH1sB_f_36Vf9iLXVifo,5135
+pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo,sha256=cmFm2USs2wrmDaaspjU_J3AP7LIpW4tDo3oWpVU_xWc,23299
+pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo,sha256=uykyRsn3ESNiB2pTBMQHo08nBAywD51rHWziPyajPlE,2846
+pycountry/locales/kmr/LC_MESSAGES/iso639-3.mo,sha256=zlbjl066YcmcUvZcsar8lCH3EYbjuBPxo7d0W1wjDGs,770
+pycountry/locales/kn/LC_MESSAGES/iso3166-1.mo,sha256=T6dtyPAolD3mTkF-nFzEyjyJSAnaj17isjlWh1Z3_tA,29606
+pycountry/locales/kn/LC_MESSAGES/iso3166-3.mo,sha256=LL069Hpd7Gr3PlGlzakR9IGx4KrndZ0D6WQreoxnatM,451
+pycountry/locales/kn/LC_MESSAGES/iso639-3.mo,sha256=V0T-GU3X3rAZH5dHSjS0Gv-_lbBfSbP7MGzYUxpOKCs,388744
+pycountry/locales/ko/LC_MESSAGES/iso15924.mo,sha256=22MicgQ3c_Zxp3b-6NnJYsDwhiz50UWnOluBcE4CG7g,2539
+pycountry/locales/ko/LC_MESSAGES/iso3166-1.mo,sha256=srf9KWiBvy8MsyrJ1Xj-maVD8ZNlLTtr7C1oJfeyiCo,24296
+pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo,sha256=mijlIaxIGHgpMnQ-GVi2SmEwZ1sVYqaup6t2HkAadDc,4062
+pycountry/locales/ko/LC_MESSAGES/iso3166-3.mo,sha256=NkIgm4Bv9odil2Dew18uCTygia4XisFmnivqeBRpH8M,2783
+pycountry/locales/ko/LC_MESSAGES/iso4217.mo,sha256=WV68Ab9WziKrTyjD-4yHjVPnjCWBiwSZFSixgmC85TY,10453
+pycountry/locales/ko/LC_MESSAGES/iso639-3.mo,sha256=ydBfMFFvFea54YU-qMQZgkGcqDJaisjrcVjDgoMOlEg,18001
+pycountry/locales/kok/LC_MESSAGES/iso639-3.mo,sha256=5S4r9mRLkIXhlEoDoYpjQKOGlaYnIi59kulMJaV0OPM,6584
+pycountry/locales/kv/LC_MESSAGES/iso3166-1.mo,sha256=BZbH8N87ExrFP0-ZJOCdu5XRt3svWGnB3MMdKKXM9Dk,5803
+pycountry/locales/kw/LC_MESSAGES/iso3166-1.mo,sha256=Dxg932KVJl8zZ37knp-LOO-lYXo_rrkinzBJ3DOm2jU,9310
+pycountry/locales/ky/LC_MESSAGES/iso3166-1.mo,sha256=0rvHR3neRAG5sPD_VTZpyZV9rIu8fi2Iqc9PNwmq3bA,29069
+pycountry/locales/ky/LC_MESSAGES/iso3166-2.mo,sha256=YNzhvpBhs7kqZbjtU3OrnVWwR33DkDqTgX2Lncnl4VA,1419
+pycountry/locales/lo/LC_MESSAGES/iso15924.mo,sha256=4jL1_o33FaOC6e-150xi1rqCq4IOMg6tpA5jWE9PUIs,15540
+pycountry/locales/lo/LC_MESSAGES/iso3166-1.mo,sha256=1YLFvJVHeun2xifDx-SuHdFauHCElY-b7FqpUJnXpCk,35736
+pycountry/locales/lo/LC_MESSAGES/iso3166-2.mo,sha256=DSNKfWPjBaLoAoOSaKc8bZQN8W-QB5XMw0Q5SGQV-Bs,292962
+pycountry/locales/lo/LC_MESSAGES/iso3166-3.mo,sha256=bpDzU3ccJO_zUf9VFz1GyJ1az4xYz0ALIywOeDKGqPY,4167
+pycountry/locales/lo/LC_MESSAGES/iso4217.mo,sha256=QYKKU0ayRYI9gy8ILM3qTcIMajz5Qb4r0-zRZdg_SkI,12966
+pycountry/locales/lo/LC_MESSAGES/iso639-3.mo,sha256=OzVhQl7SIL6Roslv_8hOH2THBE-jB3gaVyuoSLtUgdc,570503
+pycountry/locales/lo/LC_MESSAGES/iso639-5.mo,sha256=Sqz2nU269OQvzMJfgLVIwTtTpYPYJP_Hr7MqmUHkMPs,10035
+pycountry/locales/lt/LC_MESSAGES/iso15924.mo,sha256=aHzZpm0GmKGbhesw_xqR1Oo0wAtYHPhl5iqFIeBLFz0,9938
+pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo,sha256=Wj0QFicqB7WOPpa4VU1_VWokYdkgUapTm6C4uOskPZA,24191
+pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo,sha256=gZQWh-qoFK8kR-VAgk7xY9PXJnKQp-wUvtiilNVORLE,75472
+pycountry/locales/lt/LC_MESSAGES/iso3166-3.mo,sha256=kVA78seKlAPiIVsAurshuYvJCbuw-itdcQGhCL25BCQ,2987
+pycountry/locales/lt/LC_MESSAGES/iso4217.mo,sha256=Dipbe1SIPGMeWhDVi6Lp5erD_MWCnuAdUdqa5239Wis,9798
+pycountry/locales/lt/LC_MESSAGES/iso639-3.mo,sha256=yPGOhTcTrixzOwDsJimEKfWPFEx-U7aC_MgwzevWpfk,31616
+pycountry/locales/lt/LC_MESSAGES/iso639-5.mo,sha256=v37xreHRGQz5Wsk0H_90_sBAUdrEQkGhBDwl1UY7L1A,7725
+pycountry/locales/lv/LC_MESSAGES/iso15924.mo,sha256=bUx9cPEtv6AaHRpzTT-fZWJs_Pc5EesdVftiTEq1hkM,9027
+pycountry/locales/lv/LC_MESSAGES/iso3166-1.mo,sha256=FbigEYJkunPuKaXRK8op-FQBSts_ehkPH7T5UxFm0Os,22888
+pycountry/locales/lv/LC_MESSAGES/iso3166-2.mo,sha256=MaAHhZQbeXynbc_J4_iTsaEwqMj3soPIVsVwSMe8MSE,2565
+pycountry/locales/lv/LC_MESSAGES/iso3166-3.mo,sha256=Ff997ECeSBlB5gzRRBUNhz0aH0LIOsjUu71ajYkkD7A,2671
+pycountry/locales/lv/LC_MESSAGES/iso4217.mo,sha256=H4eZsIqWhiwsokrgDlxuALClBk3BV8I_io5m4YE6fPA,7216
+pycountry/locales/lv/LC_MESSAGES/iso639-3.mo,sha256=LlvXPCEtkM5rBNKXPiEgSZTiMUth1a5gjLRU6p6RIBA,10594
+pycountry/locales/mai/LC_MESSAGES/iso3166-1.mo,sha256=Q3zMxb1sdp3H11a2ZWPMsxYuE4SSiWEKA2Fv0ZECiJQ,4535
+pycountry/locales/mhr/LC_MESSAGES/iso3166-1.mo,sha256=OV_oQbIiaNsA67k5yfpXqRyVovHcZgnWBePeOB4RcWc,5636
+pycountry/locales/mi/LC_MESSAGES/iso3166-1.mo,sha256=-mgk82qP3F3t5qVkFXlloMNM2idpyR4pF-jllMpknYw,10467
+pycountry/locales/mi/LC_MESSAGES/iso3166-3.mo,sha256=tjhQA9cPhROIA1GVUy6EG9BV0ilKzjkzy5Ip61_9QBo,478
+pycountry/locales/mi/LC_MESSAGES/iso639-3.mo,sha256=A3hPSvsJwEjJanUMFv_gV6wqe_7ITt4cHsU-E9EupQI,1619
+pycountry/locales/mk/LC_MESSAGES/iso3166-1.mo,sha256=f7aGLn5mdmyNHbLVUwO1IuC7FRQy2watIQZq7nlSBG0,27425
+pycountry/locales/mk/LC_MESSAGES/iso3166-3.mo,sha256=7EABtmE5bsAqb8WIiuwnb9Xj0Dgf_C2cOOptNPkwKGo,3238
+pycountry/locales/mk/LC_MESSAGES/iso639-3.mo,sha256=Q_wdjEiWESD75_JaKNgTliv8gRT6F-FS2pVQVuO79sA,2178
+pycountry/locales/ml/LC_MESSAGES/iso15924.mo,sha256=Lw5T_mcg0Jrbh5CdSfdGQeQ9P9Oj-87yHsM5x309Lmk,1193
+pycountry/locales/ml/LC_MESSAGES/iso3166-1.mo,sha256=moYe_RNoONL6eDJm4OVvhtykxpwYFtOfkTL6yV-8lvs,34752
+pycountry/locales/ml/LC_MESSAGES/iso3166-3.mo,sha256=WdB6nZlhBoIA5A5DrnSZ4oKfKZejUnIfjW6X2X0EB4M,4406
+pycountry/locales/mn/LC_MESSAGES/iso3166-1.mo,sha256=_xQUlpY_x_hWtWV8T8HMorrm24VTjhD5XNndVGhXJs8,10101
+pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo,sha256=qmyKvWvwk-MrbF3Lm7Wklc4INaCR4ZlKLho85vDg7gU,459
+pycountry/locales/mn/LC_MESSAGES/iso4217.mo,sha256=QvNIc1GLfv7W6yhbb_S5YRaZaoWTUbekBT7fXFt2Yv4,5087
+pycountry/locales/mn/LC_MESSAGES/iso639-3.mo,sha256=n_gwivkBpobWRq7mB--L1JdB172cHm78xbwqA_KUNd4,6401
+pycountry/locales/mr/LC_MESSAGES/iso3166-1.mo,sha256=BnSxHnjfkTcXH03VahbT3kxr1b6zbHEYXwh33ERlC7g,35144
+pycountry/locales/mr/LC_MESSAGES/iso3166-3.mo,sha256=KFmyk3-Uf6vDStG14wk9kMk4qx34jDClz6PfLl-kIPs,3916
+pycountry/locales/mr/LC_MESSAGES/iso639-3.mo,sha256=J85BXJ7lsPg0OKdFI12yGj-M_e1dcWzI-yBQiVhchcs,423429
+pycountry/locales/ms/LC_MESSAGES/iso3166-1.mo,sha256=U_dzi6MSkgaGpnIll9EsrZmWERbcBd_Z_Y0exgxS_lY,12693
+pycountry/locales/ms/LC_MESSAGES/iso3166-3.mo,sha256=UrWcPl2QuYHJUn3mAvF-4afhWKfYaJhQFA_HQd46YxE,497
+pycountry/locales/ms/LC_MESSAGES/iso639-3.mo,sha256=kEePQIWzA6yt7j3TVuiIYdIoZuaNM5C4BnIf-QhSjzo,2386
+pycountry/locales/mt/LC_MESSAGES/iso3166-1.mo,sha256=OhMqW3cJN9BNX-8QIUkNjt6TkCpHX7kYCKqg9ZwGciw,9641
+pycountry/locales/mt/LC_MESSAGES/iso3166-3.mo,sha256=zr7aeMbzEaesKc2ecb1puq-oVKYOUTeFGnkC-a6TYKM,434
+pycountry/locales/mt/LC_MESSAGES/iso639-3.mo,sha256=nPlykxDSi9eEsn48bcuR7yZaJ9oE7xkf2evRDvEzc28,9664
+pycountry/locales/my/LC_MESSAGES/iso3166-1.mo,sha256=XRheiVAoJlgFplfbVXr4jqmYjHfazkDxHxPbr26tzGQ,15588
+pycountry/locales/na/LC_MESSAGES/iso3166-1.mo,sha256=oHg0zdK3UGG6on99NzrvTpWLNoC2C2mK_TKU4cTtt04,6574
+pycountry/locales/nah/LC_MESSAGES/iso3166-1.mo,sha256=M83IQ32HXa150nN5RqyumBNkBO0vJrgma8AJHU--G7Y,8116
+pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo,sha256=TgOIv5zgJPOQZ1lyZR8KCCMT-dLrK0x_hg2dOve0GRg,3957
+pycountry/locales/nb_NO/LC_MESSAGES/iso3166-1.mo,sha256=Arn3Zn3jGewiogV__nJGrHjIIS04M1j37an8CJdPwR8,23547
+pycountry/locales/nb_NO/LC_MESSAGES/iso3166-2.mo,sha256=R_aHdRjjiA7PICO2q69-xzk0xtQ2Z_93TVktIMHa7bM,1305
+pycountry/locales/nb_NO/LC_MESSAGES/iso3166-3.mo,sha256=-o90o0KauhkoyIMQ6NuVMQCuRax0jC1HWLlzxO5hCYs,2838
+pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo,sha256=BCFmqXPiPuP9kJRFSBQ81FizkesBlGZK7Enp7XR6uDc,8334
+pycountry/locales/nb_NO/LC_MESSAGES/iso639-3.mo,sha256=l6jiErTbYHJ4AFcfenmlPq9wQtDcy1PvA1SRItdyzKg,5570
+pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo,sha256=_fowpx1Yfq401AI7KuKrgRi7HXW_YZsRa7n4prufkbs,1693
+pycountry/locales/ne/LC_MESSAGES/iso3166-1.mo,sha256=KqYeIe99y3Ew9AHs8RvpYAdkmgxEswtuUaknRtcDSt4,32389
+pycountry/locales/ne/LC_MESSAGES/iso3166-3.mo,sha256=rRjEPNnu3Y-W_VoLzmKc72CnqLhyxFQxWtbPJuMrvoU,3799
+pycountry/locales/nl/LC_MESSAGES/iso15924.mo,sha256=2iiMBGjhtApLW7NJPjGacr6KjH4kYqu-rt55aM85sd8,9939
+pycountry/locales/nl/LC_MESSAGES/iso3166-1.mo,sha256=sPXfhapd55zYe57bTbiHuIYdiUk0xHIvtG8oQQotSlk,23512
+pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo,sha256=dsbckJBld3SK8uy3r5bbTTnEl2LiirWvo7LHd4stImE,208325
+pycountry/locales/nl/LC_MESSAGES/iso3166-3.mo,sha256=QzLPYfbj8ko6LQLQPh0Qfdkx4xRN1RxOLR4DoVUfiaY,2959
+pycountry/locales/nl/LC_MESSAGES/iso4217.mo,sha256=_GvD5otO6kTSQLQMmkK4dBQX6A7csswloNtkQZ860C0,10092
+pycountry/locales/nl/LC_MESSAGES/iso639-3.mo,sha256=3A7bVsvf9SXrhwd9Xq1MCJBwpq-VVSgawEgb3CuaxAg,87433
+pycountry/locales/nl/LC_MESSAGES/iso639-5.mo,sha256=eqhBfJsw89Ys-a4Kanl3g4X0UWbkhKk9SWgzCJ62C84,7532
+pycountry/locales/nn/LC_MESSAGES/iso15924.mo,sha256=XNRx0CguZbZvUIi2p-BwuIn_0MzZoYASPCo7P6N896g,3361
+pycountry/locales/nn/LC_MESSAGES/iso3166-1.mo,sha256=GpNnfkiFwCnCiaT3ujWx3ArZSSm78DuVnvEkosK58WQ,21966
+pycountry/locales/nn/LC_MESSAGES/iso3166-3.mo,sha256=0Mggn7fYr37ZRb2Ooc7MoHqchPbf8_DpDVSp-lGPapM,2601
+pycountry/locales/nn/LC_MESSAGES/iso4217.mo,sha256=62DGU6ykFxvzbR_C014jpx85CfnbWm0agN7PEp6bkI8,7471
+pycountry/locales/nn/LC_MESSAGES/iso639-3.mo,sha256=f_ONciTEpsEqcvJc6GcYUloAONNv9SgYwSjy6e4fQWQ,7462
+pycountry/locales/nso/LC_MESSAGES/iso3166-1.mo,sha256=RCdEiQwrUWbdd2WSrnXmWknjz0zARWdpT2w9nnOhblk,7830
+pycountry/locales/nso/LC_MESSAGES/iso3166-2.mo,sha256=YhnDOB-v4jfMR4TGjv_9cAMqfw-qBGL9Rj4zSRr28NE,932
+pycountry/locales/nso/LC_MESSAGES/iso3166-3.mo,sha256=YQ3rqhN-BQG5yon18KPWj3SPa_yQoZLX4eDFrrNjDbA,545
+pycountry/locales/nso/LC_MESSAGES/iso639-3.mo,sha256=lAzl_ZZmKdS4Xexh20QcVi1GUiAFsu3v29b8Y5-u_Kc,2872
+pycountry/locales/nv/LC_MESSAGES/iso3166-1.mo,sha256=TvwEZNkDekfC7Pwo98I7s5rEuXo1Sy166H5Pzm_s57M,5808
+pycountry/locales/oc/LC_MESSAGES/iso15924.mo,sha256=KeSoGgmrMvCA12LRPfku2SPpVBrStcq2Qgj017fJ73c,1627
+pycountry/locales/oc/LC_MESSAGES/iso3166-1.mo,sha256=uMXa9xDl7hAJ-wyGzM-RZtBcxqTBB68nHakJHsUyKaM,23903
+pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo,sha256=HsLB7kQftUzxATL7xPBVdRE77E4uurMqf8fD5cU1mUw,5685
+pycountry/locales/oc/LC_MESSAGES/iso3166-3.mo,sha256=ECpyuk5S_Rnzwley3Qo2mAKyehN2Rl4HwmU3js18OFc,1105
+pycountry/locales/oc/LC_MESSAGES/iso4217.mo,sha256=qCNy1kxnvXlLJx7P9KoVaKKoShtKBlZXhJfe3Q2Xa3I,728
+pycountry/locales/oc/LC_MESSAGES/iso639-3.mo,sha256=nPXZ_yHhNswpLdu25knHWRv3f4xkbs4po0_13m0AF-c,3603
+pycountry/locales/oc/LC_MESSAGES/iso639-5.mo,sha256=MGZRCA6M4PBpCMNNB6LIcCNEIJqYfQT-ANgJJBee8ew,1044
+pycountry/locales/or/LC_MESSAGES/iso3166-1.mo,sha256=l_IeB2IJTCvBKpjxpgzsOvx-p7psmaRtW8f_oVeKKAY,34110
+pycountry/locales/or/LC_MESSAGES/iso3166-3.mo,sha256=DzJxc6bigfxYLlpkdUGrcEzb1b8lx2ZVnl_Sr9ITGdo,3975
+pycountry/locales/or/LC_MESSAGES/iso639-3.mo,sha256=GtXv5Eg1wlujQsvuy_28TkzBogmufQkGwd8uIuIRlIo,216866
+pycountry/locales/ota/LC_MESSAGES/iso15924.mo,sha256=O029rM-DI7yeue971pUn2euK0keWNa4oBuHF6BHTzwI,816
+pycountry/locales/ota/LC_MESSAGES/iso3166-1.mo,sha256=8bdG2Sxetus2m3kOgkUIJo0S0N4SjH3OarxIMJO5lAQ,446
+pycountry/locales/ota/LC_MESSAGES/iso3166-2.mo,sha256=fqMaODn7M1zSkSznrgLi5FVrSaLaSNrABCU5G0dVG6w,446
+pycountry/locales/ota/LC_MESSAGES/iso3166-3.mo,sha256=cM7KnhDLbwPHujtzyKj7B18NBSS3orVtoNdBTflrHWY,807
+pycountry/locales/ota/LC_MESSAGES/iso4217.mo,sha256=7iCS9xogrLw6nP_ykNi2NSnn8HYOiQH8fi6q7uANEF8,444
+pycountry/locales/ota/LC_MESSAGES/iso639-3.mo,sha256=a3jQQw_6d3b4-XUbz9JMUXIewfPqz-tUpsFHoACxhUU,445
+pycountry/locales/ota/LC_MESSAGES/iso639-5.mo,sha256=OlMxsETBnAp2YaSdz-wJ4cggWPZiBc6-hN0hfObAlJA,445
+pycountry/locales/pa/LC_MESSAGES/iso3166-1.mo,sha256=9ErCZdyNlZYAeAPRMvT-2gk7yxbaF3n-9p4kkxibi4g,30877
+pycountry/locales/pa/LC_MESSAGES/iso3166-3.mo,sha256=Tk-lQ6dBpKC8UXjFfTs7q5TTiq2Uk7IFnE_qgBlPIps,3558
+pycountry/locales/pa/LC_MESSAGES/iso639-3.mo,sha256=JWU5IlOeuP6gdtK5imSBH0_pHfGlWyaD3OzyhN6Aes4,408739
+pycountry/locales/pa_PK/LC_MESSAGES/iso15924.mo,sha256=Jjm3fXWdohqpwOKcCXEvXnyFcAF7Loopic8lJBtnvGA,1357
+pycountry/locales/pa_PK/LC_MESSAGES/iso3166-2.mo,sha256=qlW7oyRPyaCgtkARCmw5qYtL47ULlyJ2hubStN0r3ck,1018
+pycountry/locales/pa_PK/LC_MESSAGES/iso3166-3.mo,sha256=TNrJJDJygeyyaNmsHfyDwgk4cHXML7XRSFHHHpE00JM,625
+pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo,sha256=viIMkW7bvZN3Kx0lPpS6DRXtl7tOwmnvwz4vqhlz8NY,563
+pycountry/locales/pi/LC_MESSAGES/iso3166-1.mo,sha256=pFlBizXn1qcFEftRLHC1OvO5YEY8pXhPYKA1G658Lqk,9264
+pycountry/locales/pl/LC_MESSAGES/iso15924.mo,sha256=btv3EOHTJBuTxkVYnduz7u0TbOmq1YxFkyuBMskTqdU,9852
+pycountry/locales/pl/LC_MESSAGES/iso3166-1.mo,sha256=hwzk101N_IVUvwufamjDcNe1fJ35SvOnrB4Ifwy70y8,23849
+pycountry/locales/pl/LC_MESSAGES/iso3166-2.mo,sha256=AosuCpkjkc9TjeEyYVP9tk6NSsKAa5MMRMqfZ4j9COY,209131
+pycountry/locales/pl/LC_MESSAGES/iso3166-3.mo,sha256=DrapsF8pgNEYySgjjUYr4b5_VaSC4rSQaSo2cXcF3FE,3054
+pycountry/locales/pl/LC_MESSAGES/iso4217.mo,sha256=KOH6WVPbVYgQMhuyl_EKktrG-j09R_8SsqR-LDQvnIU,9545
+pycountry/locales/pl/LC_MESSAGES/iso639-3.mo,sha256=sB3Zh6UhEJX0xlYgU5AkbBdrXqoFSEXTSusPaL61vsQ,121121
+pycountry/locales/pl/LC_MESSAGES/iso639-5.mo,sha256=pUck00ME7y7U8wwe2D0tAAGDofM3L5mGV9fOoPKCqFY,7985
+pycountry/locales/ps/LC_MESSAGES/iso3166-1.mo,sha256=xPw4NqIJqKxTIAp2OuKAd_ca5NMfZ4aNkEiD_nYzoHY,7217
+pycountry/locales/ps/LC_MESSAGES/iso3166-3.mo,sha256=9khJiWUt2pG6ps1NkobuWxUpWALatJghp1i1R9GHXv4,424
+pycountry/locales/ps/LC_MESSAGES/iso639-3.mo,sha256=0XxdqpiZdMeBtRMFFxukxfnK59hpmBW4JSj2EWZ9N8w,1709
+pycountry/locales/pt/LC_MESSAGES/iso15924.mo,sha256=nwxdJQeHdSsqCBMiofKpdoJ3qkGXKpAZ8KG4sC6RjZs,9307
+pycountry/locales/pt/LC_MESSAGES/iso3166-1.mo,sha256=NYiQzZ-QbhP9dMaoypCZHyoOVTPQeU2Yror9iMN_mRk,24073
+pycountry/locales/pt/LC_MESSAGES/iso3166-2.mo,sha256=-cJqBr6c_fy30ygA3yopNnXEtvGS_qe9aAvSnsXOuwQ,404
+pycountry/locales/pt/LC_MESSAGES/iso3166-3.mo,sha256=b-elsy9F7nWPCDHKVIicldFeJKy6lwXfoBt-TiuuWwU,2867
+pycountry/locales/pt/LC_MESSAGES/iso4217.mo,sha256=nA5RCAs3A_uP6B-NH_3JVg9WfzF1cOFI_uFE1bdPiK0,8860
+pycountry/locales/pt/LC_MESSAGES/iso639-3.mo,sha256=QNO-pVVrCzt91d-Rux1pjPC1KB9joiGdCnIGoOFY-RU,18208
+pycountry/locales/pt_BR/LC_MESSAGES/iso15924.mo,sha256=_k0u0_eRZTZB__vlzbxQPazVh-TIFVNN1JM77HPNfA0,10055
+pycountry/locales/pt_BR/LC_MESSAGES/iso3166-1.mo,sha256=N2ZJSGXno7X6FXWPdIuAwlrY3ogUnwFq55972aw1JQY,24079
+pycountry/locales/pt_BR/LC_MESSAGES/iso3166-2.mo,sha256=Ts9Opo0VZQqb_1gnVfokHemZMtU91C9fANQuLnhbf50,1087
+pycountry/locales/pt_BR/LC_MESSAGES/iso3166-3.mo,sha256=DCpWd3635J0iZDReha3WpsMjqMb8hbalzVOwFn3yao8,2874
+pycountry/locales/pt_BR/LC_MESSAGES/iso4217.mo,sha256=mFnuTiQOpaTyDeEzSmplWXnAwRTfdDuHHBwb_jd3pyw,8783
+pycountry/locales/pt_BR/LC_MESSAGES/iso639-3.mo,sha256=AsKN4Oki3wwFwfZGSqbX8GVrnoXTljNkHDdeChBl6hk,17857
+pycountry/locales/pt_BR/LC_MESSAGES/iso639-5.mo,sha256=9rvvH1v8spqAF__R_WLf3gLqTS2zjQ_MMrWZsk2GTm0,7751
+pycountry/locales/ro/LC_MESSAGES/iso15924.mo,sha256=twQrBw2PpRUbjiagHyPOn_IqcX2WZL9l5bXWi6jP0Vk,13015
+pycountry/locales/ro/LC_MESSAGES/iso3166-1.mo,sha256=9adL4zOH3Uj-U_XzcfBfEyhnhXptt3QhnUKDziTULvo,23486
+pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo,sha256=kDWMzrq_KwL5ts0TBZm5n6Fwg7V8CYntvTjGL0qJ_t4,214710
+pycountry/locales/ro/LC_MESSAGES/iso3166-3.mo,sha256=6at6aDNhW5PJf9Fu38J8SG8lTrA7x9xZNay5sA8whr0,2987
+pycountry/locales/ro/LC_MESSAGES/iso4217.mo,sha256=IuiXjg3iR-JvJQs_GLELtJT47Bj4F_vyspSb78vqUsY,9881
+pycountry/locales/ro/LC_MESSAGES/iso639-3.mo,sha256=Oge3GZNj1964KOgVOr_BYJFAguv0tRuWLDc9-L_Bsk8,52493
+pycountry/locales/ro/LC_MESSAGES/iso639-5.mo,sha256=Gs01_bLv7tVgk6YHOBMdo8YwxxFzQOegik4j4izamzo,10650
+pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo,sha256=UhrYTED-fRUjjfVP2TDOmuIZXVqwVTWYR_xppK57-Nk,1941
+pycountry/locales/ru/LC_MESSAGES/iso15924.mo,sha256=cDhjtfGfoNFFa3H_kRkE2C1rRN2GCxHfHazzmQdMv44,12393
+pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo,sha256=Jmz25zE0BZZtTAD92HEQ8s0UvI53PHU4SVcr4RDPRlY,30033
+pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo,sha256=6c-kRz9N2PCHXuRLQTxpNUWu8UieYTxBQL2MEaVtY8A,99436
+pycountry/locales/ru/LC_MESSAGES/iso3166-3.mo,sha256=LyLT9-4u8rQdwHLDbObQp_ZjmBqsRMkwOjb9D6zObmk,3692
+pycountry/locales/ru/LC_MESSAGES/iso4217.mo,sha256=7MK2rPh5JQAn0SEtsXZ6S3kIDfl6g6053xmGXLMNUGo,11630
+pycountry/locales/ru/LC_MESSAGES/iso639-3.mo,sha256=q_PfyTcAU5A4r3AEKjcKuVfhPtyn6aAe5y5ZQaWsCIo,30368
+pycountry/locales/ru/LC_MESSAGES/iso639-5.mo,sha256=xPQkTh32f-291290kVULkZT6qRxcekL5fA_u_lLvyKk,9598
+pycountry/locales/rw/LC_MESSAGES/iso3166-1.mo,sha256=0dfUtV06-48LrFMpuQb0kKxvmlzNcP8IGJ_P0nUHuks,21974
+pycountry/locales/rw/LC_MESSAGES/iso3166-3.mo,sha256=b_-A8k6091MWimWtwUNm5rZ3r7yOCrQE857XrjMS6as,584
+pycountry/locales/rw/LC_MESSAGES/iso4217.mo,sha256=dnoYpI1VKji_fo-2dEba7loADcPXusU0tuQq2eiOdEY,4879
+pycountry/locales/rw/LC_MESSAGES/iso639-3.mo,sha256=_KgnAhyHfKS2APNS1bFtrUgVaRp1y2HO3v6gQamrspo,14199
+pycountry/locales/sc/LC_MESSAGES/iso15924.mo,sha256=6paq4RQAbysz6xD_FjShmexLjX_PxcRFgCR5i0QIpO0,10162
+pycountry/locales/sc/LC_MESSAGES/iso3166-1.mo,sha256=a-5NsP93OJzAomcXMuhAmmUFOGz9PyKXoMhBYtHstYw,24430
+pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo,sha256=F2PI6nDhewzya__OnzrtSK5jHQliJwp_t3WsHIEBIus,98911
+pycountry/locales/sc/LC_MESSAGES/iso3166-3.mo,sha256=49J-KVKf6uO1GkN1XDla2hfNVn8G_WvfnE-3yLSG9b0,2948
+pycountry/locales/sc/LC_MESSAGES/iso4217.mo,sha256=u6rc_Jc11prQYSsZHyr1FP-orxXEBgqyI-bnz9bsPjw,9710
+pycountry/locales/sc/LC_MESSAGES/iso639-3.mo,sha256=1MlrPwpjbZTZF9CJ_6YE_VbH4hYr23lAvC73VoHiggs,19865
+pycountry/locales/sc/LC_MESSAGES/iso639-5.mo,sha256=xZwNntGTvduMcHXwJyb_j_0bQmQENHL6j6V9Rkz5C0o,7679
+pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo,sha256=-65XrntHP5pDcOs9-5IvGNgtAa7mXj0lZrYAPtO3Qw4,3764
+pycountry/locales/si/LC_MESSAGES/iso15924.mo,sha256=sFBX2Rq5AAW0-Wy845frvGrcbydvpBKIf6MFf4lIK2k,624
+pycountry/locales/si/LC_MESSAGES/iso3166-1.mo,sha256=MVytBciZLPiFg1A8hdZjrUUgyasQhm7wBNe44Qg5i-k,31931
+pycountry/locales/si/LC_MESSAGES/iso3166-3.mo,sha256=zsvrlfeeg_GXVuSI0yhZj3nYwCnnqsYBf_5Gpkz6Rc4,3816
+pycountry/locales/sk/LC_MESSAGES/iso15924.mo,sha256=Sfg3wQLW7k337omWSP1sgOk_UtaoMtoXA3BtVAWmGpI,1782
+pycountry/locales/sk/LC_MESSAGES/iso3166-1.mo,sha256=T45425Ar2I0Gb7HUOkh3h6pnmtVmu0CSlLikzy_-oYs,24190
+pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo,sha256=i6JxCUVYsSxS1eqXfhOr8OrsW6DLxYWPhU1XOGUUOzs,13127
+pycountry/locales/sk/LC_MESSAGES/iso3166-3.mo,sha256=Qlk2HG60ssgXDYEU0kKyc8LgYc2wwaQUdIzMT3XKPt0,2887
+pycountry/locales/sk/LC_MESSAGES/iso4217.mo,sha256=mxt2TzgrOggU9PDCy6WRcAyh6Jq_6Oam3-uTwJIOnTg,5328
+pycountry/locales/sk/LC_MESSAGES/iso639-3.mo,sha256=ZvKQTIfkHfnmeGGXxHhzm_toiaMlytuj6--72zfyXHU,11408
+pycountry/locales/sk/LC_MESSAGES/iso639-5.mo,sha256=hrF2lIlKqBA2Rzc67jlNHYv1vgstOzbd2N_zDlFLXMk,3980
+pycountry/locales/sl/LC_MESSAGES/iso15924.mo,sha256=qxFeXen39tISB-1NnFinkWDYKVcQg7X3_STHJI5-x4w,6128
+pycountry/locales/sl/LC_MESSAGES/iso3166-1.mo,sha256=Eo4U8KyzSl5YjeqZTwpcXRWtPwOn5e44zUZ6y2tsUXY,22611
+pycountry/locales/sl/LC_MESSAGES/iso3166-2.mo,sha256=zKKClGMW-FNlvzr4Bjw-X0tTuoN_PiOtqY86p7DWsqo,79243
+pycountry/locales/sl/LC_MESSAGES/iso3166-3.mo,sha256=he-9cSPr8xanRF6OlaSpRSnCdDnFyQbvt6Iccevlt1I,2596
+pycountry/locales/sl/LC_MESSAGES/iso4217.mo,sha256=VCbAiApE4t6s9vJmNauwlhdV4Pr9zp80sSxFN5g4xy4,7019
+pycountry/locales/sl/LC_MESSAGES/iso639-3.mo,sha256=xzEROwXAF5UvW3Y2My3Sgi12a6HE4LQVOiA3waT_Lz0,14533
+pycountry/locales/so/LC_MESSAGES/iso15924.mo,sha256=-jN6umTZBQ_0pUPbGYGqsZHxgftLtap41AI3AtHJ5YM,1150
+pycountry/locales/so/LC_MESSAGES/iso3166-1.mo,sha256=v6ih3uvcmqbT3vo7l_54nrcZ4ad42h-bXNOiDCz9SsA,6066
+pycountry/locales/so/LC_MESSAGES/iso3166-2.mo,sha256=balscTDsuhkBZeSaKhjWT3VPuTxRYsfDnmxkaZjVKNM,404
+pycountry/locales/so/LC_MESSAGES/iso3166-3.mo,sha256=QJ91kNEe1pmPM906vCXgJ0A9hfW2qVXrrgBoIVPfuoM,996
+pycountry/locales/so/LC_MESSAGES/iso4217.mo,sha256=zTTSKtkur4hKwghfHOhtoVF8m3Lk-Kt5G4r3cGf_N3Q,402
+pycountry/locales/so/LC_MESSAGES/iso639-3.mo,sha256=Xvv5Cb0ELfbP3_PJFrvifgTSSB3uT61rAY13jfns1Z8,403
+pycountry/locales/son/LC_MESSAGES/iso3166-1.mo,sha256=BJf3H3lFsXnmPxzg_MO2HjfRbtw_VMr6Rhju8KVkEGU,9275
+pycountry/locales/sq/LC_MESSAGES/iso15924.mo,sha256=3btuiYrSAvxaCVpRTg4pzqhuqPMM6P2lvywjJBg-0jM,550
+pycountry/locales/sq/LC_MESSAGES/iso3166-1.mo,sha256=1NAHwBcoY_3R_o4mg_4-ymyS_JCguS7MomteXwdN3TU,24061
+pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo,sha256=IUrsHeAtilgSYCuqCzUwoRilpLcv7XBwzvhtVsON3HU,711
+pycountry/locales/sq/LC_MESSAGES/iso3166-3.mo,sha256=Yr0oUSiP5Ld0csVHKCyaTpT9C5pyGKt9jZRYGWUOwz0,2768
+pycountry/locales/sq/LC_MESSAGES/iso4217.mo,sha256=R8v9dbgb4kaQBeDWDcv7pWHwTj9CRQiHxMf2XlPsfJk,402
+pycountry/locales/sq/LC_MESSAGES/iso639-3.mo,sha256=JkoGtrHqaDHrUxPMx-0k_7b7l1gn8S4cgbtjnvoLl74,403
+pycountry/locales/sq/LC_MESSAGES/iso639-5.mo,sha256=c_6ngFn97IVi-zbhR4oljfnAhpg_jYjJrePIVnuY18Y,3810
+pycountry/locales/sr/LC_MESSAGES/iso15924.mo,sha256=DFLjVe_PqNxIpnWqXFd1u-M-xmWRlB50vn0o8eszUjM,12539
+pycountry/locales/sr/LC_MESSAGES/iso3166-1.mo,sha256=vgEgAcY81cjYqHK4tsAOY77vdSXpdk-O3gRpEwcQnXs,28915
+pycountry/locales/sr/LC_MESSAGES/iso3166-2.mo,sha256=RIaZBuAM7r6JNVaB6AQ1amYTrufiUonGkQc22NPTiV0,144043
+pycountry/locales/sr/LC_MESSAGES/iso3166-3.mo,sha256=Y9sDJ32tTzNbl3m5OOk62DIc86BQ-x64fS3ryCK4dXk,3352
+pycountry/locales/sr/LC_MESSAGES/iso4217.mo,sha256=Q412qsUWUZ2PbUNUMVneyeq1d4n6Mul1ZasEF2XiDg8,9176
+pycountry/locales/sr/LC_MESSAGES/iso639-3.mo,sha256=g8JauoHrsjE1R-Mmuatzn_kExynNaUi2JTSJk4jfXFA,17059
+pycountry/locales/sr/LC_MESSAGES/iso639-5.mo,sha256=34piuKMjb1CmXWZUcp12HZ0OQdbYTtZTPOGre96UgIM,6247
+pycountry/locales/sr@latin/LC_MESSAGES/iso15924.mo,sha256=C2NT1Cza9ElC7XeLIzX7Tv1W9cAfv_xEopwZdoiJcnc,10170
+pycountry/locales/sr@latin/LC_MESSAGES/iso3166-1.mo,sha256=mQh3QCxwNJiXB_40sJRVOE6mfFiO73KXHBFnQzZDMQE,23246
+pycountry/locales/sr@latin/LC_MESSAGES/iso3166-2.mo,sha256=R9ZgIhY-PDDFObWs4eVY2oT0JbH5HvqxboJoignuuks,121370
+pycountry/locales/sr@latin/LC_MESSAGES/iso3166-3.mo,sha256=2zlS7CRGoi4QBqgQdX1VfUMYD1FMK9EQ6qbcdbFWVS0,2709
+pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo,sha256=iBYUTn15qFqgcPm--PSbvHwEN5FuM75tEiPgVvbXpkg,7523
+pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo,sha256=LA_oWjAjSsDbbBaC_RXxiEOnRP1oW0Nac4l2D1B0R6s,14390
+pycountry/locales/sr@latin/LC_MESSAGES/iso639-5.mo,sha256=3ZtgzQqOCZ5DqaU3W9x9YngC7PI7opZAR1EWo0o1nzg,5040
+pycountry/locales/sv/LC_MESSAGES/iso15924.mo,sha256=I4QIgNat44omP4DsLNw8wKGMB3aW8D9LlBdTtVfu8l0,10088
+pycountry/locales/sv/LC_MESSAGES/iso3166-1.mo,sha256=R7-oUgpMFmeOrL5rdpjvO8qzVT65dq5DXEcWTM_JqaM,23537
+pycountry/locales/sv/LC_MESSAGES/iso3166-2.mo,sha256=nPCQdN_JrygqcjzSmS8DfH0Q9MZX0FB8sOsHwSBLqxg,158811
+pycountry/locales/sv/LC_MESSAGES/iso3166-3.mo,sha256=btjqVszhhQZnYBe2uV652pN5pmKE4Q0A7xWtlgBK9LE,2738
+pycountry/locales/sv/LC_MESSAGES/iso4217.mo,sha256=5804vzbhcZ1FjUp7dbOyc8DM9qmU1b7L6sVvpYH9Xn8,9317
+pycountry/locales/sv/LC_MESSAGES/iso639-3.mo,sha256=8iSYramtQRsW27wRCMq6JRVm6q4ddI2OK5jvUu0XQyA,397370
+pycountry/locales/sv/LC_MESSAGES/iso639-5.mo,sha256=yK2_LQZ7UpcPnGFGua3NkNr3yt7qWIs8XIsn9BSl-hU,7469
+pycountry/locales/sw/LC_MESSAGES/iso3166-1.mo,sha256=puo5AcrjhUMrPVvv4ctytx2y-hl8nLZvRM8hcfeXSIE,7984
+pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo,sha256=3WZ72zsYk8Iq1Rjif5Lp1FqOhL_LrCA6fDbFU5RjDsM,488
+pycountry/locales/ta/LC_MESSAGES/iso15924.mo,sha256=cdxf39a49Dw5qrr7mVWA2vdcVmH8obV7UOWukiWF6xM,18991
+pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo,sha256=SJ1T2wQgNyIjbVqVRQ9k_7G4en6PybalToWk55dmyiE,35573
+pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo,sha256=A0IO3Uf2elbLCe46QaBRRkTiAsUQ42GqL15vzqJ7n1o,303417
+pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo,sha256=TGv0I2EHKOlFs8wcLHKBRgD0CowRabQu-3EnsuxcVrw,4339
+pycountry/locales/ta/LC_MESSAGES/iso4217.mo,sha256=Ub8W7jsPso5CcAq4mvPjtnXFkr0rrRTs2EBgAWaRfHk,14589
+pycountry/locales/ta/LC_MESSAGES/iso639-3.mo,sha256=IaQKVzm7txu3WSp32VP8qrJDM8Rs-424tjVt_ZtQR0Q,606044
+pycountry/locales/ta/LC_MESSAGES/iso639-5.mo,sha256=ANCGgfbY4F7ou3YoEbHTpRDDPyQkz9Q1OuyJm1ZV0qU,11658
+pycountry/locales/te/LC_MESSAGES/iso3166-1.mo,sha256=mcFUynzR9m9pOA7DQhz2eiiNwJNbjWiekP3y7_R7I74,35338
+pycountry/locales/te/LC_MESSAGES/iso3166-3.mo,sha256=1J3pjyPhcOEx0r5ai_wGP-CYtmMbey3j3f_64VBOcHs,4169
+pycountry/locales/tg/LC_MESSAGES/iso3166-1.mo,sha256=Q1GsbdEj1Pyrysbq2yzBLVdMdhCr9G2YWJ2Z0NKQb_U,28527
+pycountry/locales/th/LC_MESSAGES/iso15924.mo,sha256=c0BF5cJmNGxnV9FcL3QgVqQ_qLZa_yb-ZDjn5dGCwPM,11448
+pycountry/locales/th/LC_MESSAGES/iso3166-1.mo,sha256=6ThLMem5BNLYZ0u6S5VqaB5IhlavWZqDYTt1hBk0gNI,33663
+pycountry/locales/th/LC_MESSAGES/iso3166-2.mo,sha256=18LfmN92xfFzmPruPXCMh1qUU_gkGpzXcpyn4TtquXE,82740
+pycountry/locales/th/LC_MESSAGES/iso3166-3.mo,sha256=IpVULSIJH4a9rErHYMd6PhXvfRZp1_OUQHZNlDdTiRA,3819
+pycountry/locales/th/LC_MESSAGES/iso4217.mo,sha256=fBsp4tFmO97ndwqGL18H6sKKSu0T__jNS-KWI0Bf1Ms,10046
+pycountry/locales/th/LC_MESSAGES/iso639-3.mo,sha256=CHN2KvlCpRmie6LuIMppaix8TivnTzbbrWfDpEJXdW0,65786
+pycountry/locales/ti/LC_MESSAGES/iso3166-1.mo,sha256=jLyqklwEaSPBoHEn3qM4MuQwpjt3e2lGuEE2RROJgGc,11811
+pycountry/locales/ti/LC_MESSAGES/iso3166-3.mo,sha256=l4GiOVcbcWTFrNSY3em_W2_0VCLrDuBASg9HTMUdMac,501
+pycountry/locales/ti/LC_MESSAGES/iso639-3.mo,sha256=rudT0161eMCs7pDBdCvsDzVCkp7Uu-3oOuRzVE0WTX0,5858
+pycountry/locales/tig/LC_MESSAGES/iso3166-1.mo,sha256=VqELNsWPC8d0GfnR-i39uhWtQlJ2DhkiDhhjDvHrx1A,5712
+pycountry/locales/tig/LC_MESSAGES/iso3166-3.mo,sha256=QOo7zNHZ3EvaEw6p5VZOCPuTuIaEN78YrQoMGnE5Jhk,499
+pycountry/locales/tig/LC_MESSAGES/iso639-3.mo,sha256=WJYDBiPwZI_MTFJwAcudQwiZmcnPIFurHgk0n_U8xUY,5697
+pycountry/locales/tk/LC_MESSAGES/iso3166-1.mo,sha256=PlNOnnM6E0c0obtWOp_XHnZPZWsIy5vw9xgLl2Y3Nvg,18029
+pycountry/locales/tk/LC_MESSAGES/iso3166-3.mo,sha256=vm2FgMUaBQJYR4bDpQAuufWWkrbZjAGoTpId2XamQdk,448
+pycountry/locales/tl/LC_MESSAGES/iso3166-1.mo,sha256=J1GKGeMDNvkJgjiMjbSNMUwNwp8rGMiDWsHGcXGBZwU,21411
+pycountry/locales/tl/LC_MESSAGES/iso3166-3.mo,sha256=qi8Fmp1iCUBsxJsn-PVEklTRFiNAdY43c2jLBQlOLS4,501
+pycountry/locales/tr/LC_MESSAGES/iso15924.mo,sha256=yzpoggM3YRo-iqLSIMgCTngms_FvwF_bYH2-sIPjBDg,9913
+pycountry/locales/tr/LC_MESSAGES/iso3166-1.mo,sha256=yr_-WN2CQuw21YwQehdipCiBbMsTUKRYTlriLU0Z_Nc,23676
+pycountry/locales/tr/LC_MESSAGES/iso3166-2.mo,sha256=YzPbGSQPY4XNRyDjuAgPbLDI6Gat5QGNwW-v3SlAG2M,76644
+pycountry/locales/tr/LC_MESSAGES/iso3166-3.mo,sha256=_FlpRSJ4-9E5ak_v93AmVrFi5jX5wwtoA_HmN5nnATM,2781
+pycountry/locales/tr/LC_MESSAGES/iso4217.mo,sha256=SmUHN1tAr9OY7kBybvZNR2B-0S0NJ1EMVQuzlMdXb7o,9411
+pycountry/locales/tr/LC_MESSAGES/iso639-3.mo,sha256=e7vxgPeeE8VdmMZg7dh2CgwmSo8bAa0gSjevogVv4r0,341832
+pycountry/locales/tr/LC_MESSAGES/iso639-5.mo,sha256=6NhQ-_LVXjnOIniEleyvDJjdfPU24fux2oa1xQb0iYA,7390
+pycountry/locales/tt/LC_MESSAGES/iso3166-1.mo,sha256=Le-AkalOro5GQLStsQsBBPpBCgrKPQCkD0Lv0pPwx3M,22050
+pycountry/locales/tt/LC_MESSAGES/iso3166-3.mo,sha256=Ie8Z_6erypkn3ntulzMaEK2aNUfnPypuXq4aVD6478M,525
+pycountry/locales/tt/LC_MESSAGES/iso639-3.mo,sha256=hdmI6VESSCHdUnKbJMeUrcosuJf56MDv43BrCXXfA34,7224
+pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-1.mo,sha256=0Ua0sab0Q-sT_chXvQKEK0JqHsrqAmXsd0jXdTnAESI,18361
+pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-3.mo,sha256=Eu3m-3wKzabYJqjb4AXzScOVEVQgXwGjYYgmd5YoLBA,516
+pycountry/locales/tt@iqtelif/LC_MESSAGES/iso639-3.mo,sha256=YxxQU4qdA0XzR3pAkuN3Uc51vgRopL1uU6SLFuC_rN8,6381
+pycountry/locales/tzm/LC_MESSAGES/iso15924.mo,sha256=BH7SzL6ZQvY85_3lcOykpcHCCxrAw-2ibKd5pGSAsP0,763
+pycountry/locales/tzm/LC_MESSAGES/iso3166-1.mo,sha256=CR-lj5Z2wKuBHJPqMGn7yg1Csly5wMAl871Rm4_1uxg,632
+pycountry/locales/tzm/LC_MESSAGES/iso4217.mo,sha256=gdwS6EId_ndx7bwlwMEn3C8qL-lV26yqJ1ebypppksg,403
+pycountry/locales/ug/LC_MESSAGES/iso15924.mo,sha256=cYBxCdUUNEeUs7wx6dFVHiHsAjabe2Lj7wCu4vXaYmQ,11953
+pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo,sha256=T5zAS_yuSgTG5XbxBkTeu-zDuyf_9hTVm39jdppDh9Y,30169
+pycountry/locales/ug/LC_MESSAGES/iso3166-2.mo,sha256=2jaT-6j6AEKWL1MkhPjn7OMGoUEkcyc7qjs98PL7ZE4,445
+pycountry/locales/ug/LC_MESSAGES/iso3166-3.mo,sha256=y--tq63Q68vpBycDxl53f1ezlTaDsnGlezOVxTGhvJI,3690
+pycountry/locales/ug/LC_MESSAGES/iso4217.mo,sha256=jGktm5AHntwHzJNXzZsldMUOCgmo2MVeP3BLVQHLkxA,12052
+pycountry/locales/ug/LC_MESSAGES/iso639-3.mo,sha256=XBvvyedasO1Oyqv8kDszp6Faw_ISWxDcZW4-DW0CteE,444
+pycountry/locales/ug/LC_MESSAGES/iso639-5.mo,sha256=dyZ0xExmflW32suDH99xbzTrN3tNgMXnPM7XVoEv78Q,9356
+pycountry/locales/uk/LC_MESSAGES/iso15924.mo,sha256=b7Unc8NzprDOx4-6xwRG0TcnifYnUxxPHI658J5N5o8,15624
+pycountry/locales/uk/LC_MESSAGES/iso3166-1.mo,sha256=zSv-T1bAy0B0_q5qnMwitrP4CntTCQnRWcMKzVDp9_k,29887
+pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo,sha256=aqFr6zRZXPqt7mWI9fW6lNMj2czjgfAz13Txd7f1AKY,260509
+pycountry/locales/uk/LC_MESSAGES/iso3166-3.mo,sha256=NB2QqOD1clWnT2yT0ePxA8VzxdgZKdDzxbR0qrwOt4o,3668
+pycountry/locales/uk/LC_MESSAGES/iso4217.mo,sha256=Msn2I7_a8JC9JlaWBjx7_9IUSg4jBcR-4CrS-sbKnw4,12401
+pycountry/locales/uk/LC_MESSAGES/iso639-3.mo,sha256=hSihXYJxnL56XLozXLMTke8FshosF3q4ohYRhgp9_Z8,512005
+pycountry/locales/uk/LC_MESSAGES/iso639-5.mo,sha256=12FnzPhOQn1oAZ8sBW7l5POo6QYOlA_FzpdeSlN7oP8,9363
+pycountry/locales/ur/LC_MESSAGES/iso3166-1.mo,sha256=tcC6Dkmh4a9vUhMpVoU2Nbks5oiO-ygU8wcnWE2Tbm8,11711
+pycountry/locales/uz/LC_MESSAGES/iso3166-1.mo,sha256=SQKPadwtPkruf-KXRLkSzo_j4V1DhGwq2JLwPflVQfo,8863
+pycountry/locales/ve/LC_MESSAGES/iso3166-1.mo,sha256=UPng9ItwV8-dFA4Ec6TgV3QVXUFQfsHMgrmA9C8Z2tY,7913
+pycountry/locales/ve/LC_MESSAGES/iso3166-2.mo,sha256=HOuM6pt8cvX2vj49g7-Gn01EIcgis0ffMd82WmbrlvY,924
+pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo,sha256=AlWZYr4Gg8zo-r1vgmIFtV23APE1RIRg2vOvHIiuCf0,538
+pycountry/locales/ve/LC_MESSAGES/iso639-3.mo,sha256=tzbEkeGyMcCiADL2GaoaaM66NmOcEr__mh0P5sXrvvY,1997
+pycountry/locales/vi/LC_MESSAGES/iso15924.mo,sha256=jlRhHPzYMMdcjokRu_P2QksEioCjVRIwLMOzWMU7efQ,7173
+pycountry/locales/vi/LC_MESSAGES/iso3166-1.mo,sha256=ymVEYnAP_TPBhwzWXdhJpYlh6HBmsdbkgMElEZ9CdJs,24644
+pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo,sha256=1D3OCcZ5lHjq1djdivDUQAG6DPn0zzIOxO01c_NwLRA,135083
+pycountry/locales/vi/LC_MESSAGES/iso3166-3.mo,sha256=8KWsYZAmqADgIwh2V9CGv4otl0d-O-1fbn3kYuml7tc,2686
+pycountry/locales/vi/LC_MESSAGES/iso4217.mo,sha256=nV_2KRTOE1vdZ7KXpc3MeQuSEaXLS4Ebc5z6T-S94qU,8169
+pycountry/locales/vi/LC_MESSAGES/iso639-3.mo,sha256=JfajpPRuNcAKLbilAyElz5urduh39WbJZmLCJiy9xPs,16885
+pycountry/locales/wa/LC_MESSAGES/iso3166-1.mo,sha256=DY6d4V7EMPpQEbSbyfrmN_8yz6KRzfH9Gc1NTk0cL9Y,22427
+pycountry/locales/wa/LC_MESSAGES/iso3166-2.mo,sha256=-lSDdukzA_xt8Iqtf5d1fsWXY-UrA0muTGBvpzkJZtY,2646
+pycountry/locales/wa/LC_MESSAGES/iso3166-3.mo,sha256=BOO0onmAiuczLLyKkOyy8MasftWeGhwEEnDO3OEubwc,2663
+pycountry/locales/wa/LC_MESSAGES/iso639-3.mo,sha256=v-QEhD9Tc5fhtEXU-uJ3O48R8wpXeMm3NgBj7wC8UC8,12859
+pycountry/locales/wal/LC_MESSAGES/iso3166-1.mo,sha256=YKTYQvmI4WLckv6MZTnOGhWwoMi2qCeHJ86c2Wr6ja4,5713
+pycountry/locales/wal/LC_MESSAGES/iso3166-3.mo,sha256=D-QWLj9WwGcX_4g8CWvwTtpIGvuRKlA1bEc4F4v021Q,500
+pycountry/locales/wo/LC_MESSAGES/iso3166-1.mo,sha256=xCAnRFH-UuZUHqmX3k0bOCC7ErAnsmuJF3UlfMUL6Yk,21638
+pycountry/locales/wo/LC_MESSAGES/iso3166-3.mo,sha256=jmlyZQmJiL1-cU-LConA_8-krM5XfkaOAyob_ED9X7U,2544
+pycountry/locales/xh/LC_MESSAGES/iso3166-1.mo,sha256=rN4Xj7i9i-Bn8jkmLMzY7Tze5ZcuMXs6soNWwI6e-Ts,2821
+pycountry/locales/xh/LC_MESSAGES/iso3166-3.mo,sha256=KtBKiUeaslKrmgjPOFA3LhQnpPSZU-iKzSifRlGVwyY,454
+pycountry/locales/xh/LC_MESSAGES/iso639-3.mo,sha256=b7f1geW_5oIXnTcJdd5EzUHuaZ-oC1x0aqB6M4zc-04,2528
+pycountry/locales/yo/LC_MESSAGES/iso3166-1.mo,sha256=vXJUAuLaCWXvxbmLfdztNJmW7AEfCCoTk6BjAuIiGdo,11032
+pycountry/locales/zh_CN/LC_MESSAGES/iso15924.mo,sha256=6vqWNn5Vul7VQX73E-4rFLxZw-XaJUJM2UKxIjFFdkc,6882
+pycountry/locales/zh_CN/LC_MESSAGES/iso3166-1.mo,sha256=lPsuXjJhjYec1NQZLsBM5MwN6ji5fIR_dUHaj1hpRuM,23436
+pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo,sha256=KUYGocLdLxeOKCeI-Umn9ET3yNdKvS43IC9eqKzH9YU,116595
+pycountry/locales/zh_CN/LC_MESSAGES/iso3166-3.mo,sha256=jGDFtKMfZqEVephlYDTyEes8xxpKmnKBHDNWAifoT_s,2696
+pycountry/locales/zh_CN/LC_MESSAGES/iso4217.mo,sha256=Dr9L4-Tl0ftjdxmBpjDqqr_i5Trm2ppeQcuwz-XQ9fw,9372
+pycountry/locales/zh_CN/LC_MESSAGES/iso639-3.mo,sha256=S8jZeYh8z-WZokCqd4-VsMCWy3SlNq5G2jq6oE7GN9A,86556
+pycountry/locales/zh_CN/LC_MESSAGES/iso639-5.mo,sha256=ngxvL-DfCy2RXaVy3LNgEBYZPwv8bSEpr8vvottEJ30,7389
+pycountry/locales/zh_HK/LC_MESSAGES/iso15924.mo,sha256=GO--fWRD04TejHjV0YK1htSjIT4m2iekN7jB0CxVyZU,4809
+pycountry/locales/zh_HK/LC_MESSAGES/iso3166-1.mo,sha256=04tOpotVQDSWsiIL1r92Pde5MblNEQcHRntdxhgvW7I,23388
+pycountry/locales/zh_HK/LC_MESSAGES/iso3166-3.mo,sha256=72JQpg5mwgA_5w_YmznbN2NpMGHdsCbN0I3tq30heIA,2714
+pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo,sha256=jx-prv9hyKFFwmQU0w-k1G4-SRPzUAM3ajIekrPQGjM,8564
+pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo,sha256=UVoeetUOfNpKpcXzQIfvwVcUoybleFIouvIaFBreVX4,10356
+pycountry/locales/zh_TW/LC_MESSAGES/iso3166-1.mo,sha256=jZHJGmfv_rcv6SI3xWgLLmH_iiWzR_t9eCB4BPxuVO0,23390
+pycountry/locales/zh_TW/LC_MESSAGES/iso3166-2.mo,sha256=hI-cDmSoWhYrzDVx04_sGQkqvrjA1QEzi-O60qA5V9U,18208
+pycountry/locales/zh_TW/LC_MESSAGES/iso3166-3.mo,sha256=tcw6oJie_J4xxELZd-w6rhMuxLdDTEk8kAt95lcqJwI,2685
+pycountry/locales/zh_TW/LC_MESSAGES/iso4217.mo,sha256=B3uGu998yylgMUEmJhqHicVaeGtKCWB2785GOuzX4Ak,9395
+pycountry/locales/zh_TW/LC_MESSAGES/iso639-3.mo,sha256=E2RAFbCHkdPTC_s256olpWaSI9scFIYflFdOg066mwI,32659
+pycountry/locales/zh_TW/LC_MESSAGES/iso639-5.mo,sha256=MAmFhM-eAAF9PwLmpfJQyCMdfRpATE-eEjQ7KRF3KjA,7424
+pycountry/locales/zu/LC_MESSAGES/iso3166-1.mo,sha256=MfXG5fBPOFvJHdiGFlSxSPPMijmuLsAAn2xbNRlpoSE,5882
+pycountry/locales/zu/LC_MESSAGES/iso3166-3.mo,sha256=kmcmO_QJ26bQUJnhynbGUHL1PmK8sKA1ojSEjZhn2u4,447
+pycountry/locales/zu/LC_MESSAGES/iso639-3.mo,sha256=Q4EhRCks8BThDf7KzLbMx788L_JsLfUmJ8ZFimyF_FE,2596
+pycountry/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pycountry/tests/test_general.py,sha256=-SxpqPpakAguColJUusO61B4QUHswd8rQG_m0ZMGvBQ,17113
diff --git a/libs/pycountry-24.6.1.dist-info/REQUESTED b/libs/pycountry-26.2.16.dist-info/REQUESTED
similarity index 100%
rename from libs/pycountry-24.6.1.dist-info/REQUESTED
rename to libs/pycountry-26.2.16.dist-info/REQUESTED
diff --git a/libs/pycountry-26.2.16.dist-info/WHEEL b/libs/pycountry-26.2.16.dist-info/WHEEL
new file mode 100644
index 0000000000..7894e88612
--- /dev/null
+++ b/libs/pycountry-26.2.16.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 2.3.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/pycountry-24.6.1.dist-info/LICENSE.txt b/libs/pycountry-26.2.16.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/pycountry-24.6.1.dist-info/LICENSE.txt
rename to libs/pycountry-26.2.16.dist-info/licenses/LICENSE.txt
diff --git a/libs/pycountry/__init__.py b/libs/pycountry/__init__.py
index 33c3b1d52a..5a4f95c9fc 100644
--- a/libs/pycountry/__init__.py
+++ b/libs/pycountry/__init__.py
@@ -3,28 +3,19 @@
 import os.path
 import unicodedata
 from importlib import metadata as _importlib_metadata
-from typing import Dict, List, Optional, Type
+from importlib import resources as _importlib_resources
+from typing import cast
 
 import pycountry.db
 
-# We prioritise importing the backported `importlib_resources`
-# because the function we use (`importlib.resources.files`) is only
-# available from Python 3.9, but the module itself exists since 3.7.
-# We install `importlib_resources` on Python < 3.9.
-# TODO: Remove usage of importlib_resources once support for Python 3.8 is dropped
-try:
-    import importlib_resources  # type: ignore
-except ModuleNotFoundError:
-    from importlib import resources as importlib_resources  # type: ignore
-
 
 def resource_filename(package_or_requirement: str, resource_name: str) -> str:
     return str(
-        importlib_resources.files(package_or_requirement) / resource_name
+        _importlib_resources.files(package_or_requirement) / resource_name
     )
 
 
-def get_version(distribution_name: str) -> Optional[str]:
+def get_version(distribution_name: str) -> str | None:
     try:
         return _importlib_metadata.version(distribution_name)
     except _importlib_metadata.PackageNotFoundError:
@@ -34,7 +25,7 @@ def get_version(distribution_name: str) -> Optional[str]:
 # Variable annotations
 LOCALES_DIR: str = resource_filename("pycountry", "locales")
 DATABASE_DIR: str = resource_filename("pycountry", "databases")
-__version__: Optional[str] = get_version("pycountry")
+__version__: str | None = get_version("pycountry")
 
 
 def remove_accents(input_str: str) -> str:
@@ -48,13 +39,13 @@ def remove_accents(input_str: str) -> str:
     return output_str
 
 
-class ExistingCountries(pycountry.db.Database):
+class ExistingCountries(pycountry.db.Database[pycountry.db.Country]):
     """Provides access to an ISO 3166 database (Countries)."""
 
     data_class = pycountry.db.Country
     root_key = "3166-1"
 
-    def search_fuzzy(self, query: str) -> List[Type["ExistingCountries"]]:
+    def search_fuzzy(self, query: str) -> list[pycountry.db.Country]:
         query = remove_accents(query.strip().lower())
 
         # A country-code to points mapping for later sorting countries
@@ -87,6 +78,11 @@ def add_result(country: "pycountry.db.Country", points: int) -> None:
                 candidate._fields.get("comment"),
             ]:
                 if v is not None:
+                    # Check for initials match
+                    initials = "".join([c for c in v if c.isupper()])
+                    if query == remove_accents(initials.lower()):
+                        add_result(candidate, 40)
+                        break
                     v = remove_accents(v.lower())
                     if query in v:
                         # This prefers countries with a match early in their name
@@ -118,7 +114,7 @@ def add_result(country: "pycountry.db.Country", points: int) -> None:
             # points but ascending on the country code.
             for x in sorted(results.items(), key=lambda x: (-x[1], x[0]))
         ]
-        return sorted_results
+        return cast(list[pycountry.db.Country], sorted_results)
 
 
 class HistoricCountries(ExistingCountries):
@@ -192,18 +188,18 @@ class Subdivisions(pycountry.db.Database):
 
     data_class = SubdivisionHierarchy
     no_index = ["name", "parent_code", "parent", "type"]
+    special_index = ["country_code"]
     root_key = "3166-2"
 
-    def _load(self, *args, **kw):
-        super()._load(*args, **kw)
+    def _special_index(self, obj, key):
+        index = self.indices.setdefault(key, {})
+        divs = index.setdefault(getattr(obj, key).lower(), set())
+        divs.add(obj)
 
-        # Add index for the country code.
-        self.indices["country_code"] = {}
-        for subdivision in self:
-            divs = self.indices["country_code"].setdefault(
-                subdivision.country_code.lower(), set()
-            )
-            divs.add(subdivision)
+    def _special_deindex(self, obj, key):
+        index = self.indices.get(key)
+        divs = index.get(getattr(obj, key).lower(), set())
+        divs.discard(obj)
 
     def get(self, **kw):
         default = kw.setdefault("default", None)
@@ -243,7 +239,7 @@ def partial_match(self, query):
 
         return matching_candidates
 
-    def search_fuzzy(self, query: str) -> List[Type["Subdivisions"]]:
+    def search_fuzzy(self, query: str) -> list[type["Subdivisions"]]:
         query = remove_accents(query.strip().lower())
 
         # A Subdivision's code to points mapping for later sorting subdivisions
diff --git a/libs/pycountry/databases/iso15924.json b/libs/pycountry/databases/iso15924.json
index 32a31139ab..aca6595df9 100644
--- a/libs/pycountry/databases/iso15924.json
+++ b/libs/pycountry/databases/iso15924.json
@@ -67,9 +67,14 @@
     },
     {
       "alpha_4": "Beng",
-      "name": "Bengali",
+      "name": "Bengali (Bangla)",
       "numeric": "325"
     },
+    {
+      "alpha_4": "Berf",
+      "name": "Beria Erfe",
+      "numeric": "258"
+    },
     {
       "alpha_4": "Bhks",
       "name": "Bhaiksuki",
@@ -130,6 +135,16 @@
       "name": "Cherokee",
       "numeric": "445"
     },
+    {
+      "alpha_4": "Chis",
+      "name": "Chisoi",
+      "numeric": "298"
+    },
+    {
+      "alpha_4": "Chrs",
+      "name": "Chorasmian",
+      "numeric": "109"
+    },
     {
       "alpha_4": "Cirt",
       "name": "Cirth",
@@ -140,9 +155,14 @@
       "name": "Coptic",
       "numeric": "204"
     },
+    {
+      "alpha_4": "Cpmn",
+      "name": "Cypro-Minoan",
+      "numeric": "402"
+    },
     {
       "alpha_4": "Cprt",
-      "name": "Cypriot",
+      "name": "Cypriot syllabary",
       "numeric": "403"
     },
     {
@@ -160,6 +180,16 @@
       "name": "Devanagari (Nagari)",
       "numeric": "315"
     },
+    {
+      "alpha_4": "Diak",
+      "name": "Dives Akuru",
+      "numeric": "342"
+    },
+    {
+      "alpha_4": "Dogr",
+      "name": "Dogra",
+      "numeric": "328"
+    },
     {
       "alpha_4": "Dsrt",
       "name": "Deseret (Mormon)",
@@ -190,11 +220,21 @@
       "name": "Elbasan",
       "numeric": "226"
     },
+    {
+      "alpha_4": "Elym",
+      "name": "Elymaic",
+      "numeric": "128"
+    },
     {
       "alpha_4": "Ethi",
       "name": "Ethiopic (Geสปez)",
       "numeric": "430"
     },
+    {
+      "alpha_4": "Gara",
+      "name": "Garay",
+      "numeric": "164"
+    },
     {
       "alpha_4": "Geok",
       "name": "Khutsuri (Asomtavruli and Nuskhuri)",
@@ -202,7 +242,7 @@
     },
     {
       "alpha_4": "Geor",
-      "name": "Georgian (Mkhedruli)",
+      "name": "Georgian (Mkhedruli and Mtavruli)",
       "numeric": "240"
     },
     {
@@ -210,6 +250,16 @@
       "name": "Glagolitic",
       "numeric": "225"
     },
+    {
+      "alpha_4": "Gong",
+      "name": "Gunjala Gondi",
+      "numeric": "312"
+    },
+    {
+      "alpha_4": "Gonm",
+      "name": "Masaram Gondi",
+      "numeric": "313"
+    },
     {
       "alpha_4": "Goth",
       "name": "Gothic",
@@ -230,6 +280,11 @@
       "name": "Gujarati",
       "numeric": "320"
     },
+    {
+      "alpha_4": "Gukh",
+      "name": "Gurung Khema",
+      "numeric": "397"
+    },
     {
       "alpha_4": "Guru",
       "name": "Gurmukhi",
@@ -290,6 +345,16 @@
       "name": "Pahawh Hmong",
       "numeric": "450"
     },
+    {
+      "alpha_4": "Hmnp",
+      "name": "Nyiakeng Puachue Hmong",
+      "numeric": "451"
+    },
+    {
+      "alpha_4": "Hntl",
+      "name": "Han (Traditional variant) with Latin (alias for Hant + Latn)",
+      "numeric": "504"
+    },
     {
       "alpha_4": "Hrkt",
       "name": "Japanese syllabaries (alias for Hiragana + Katakana)",
@@ -340,6 +405,11 @@
       "name": "Katakana",
       "numeric": "411"
     },
+    {
+      "alpha_4": "Kawi",
+      "name": "Kawi",
+      "numeric": "368"
+    },
     {
       "alpha_4": "Khar",
       "name": "Kharoshthi",
@@ -380,6 +450,11 @@
       "name": "Kpelle",
       "numeric": "436"
     },
+    {
+      "alpha_4": "Krai",
+      "name": "Kirat Rai",
+      "numeric": "396"
+    },
     {
       "alpha_4": "Kthi",
       "name": "Kaithi",
@@ -460,6 +535,11 @@
       "name": "Mahajani",
       "numeric": "314"
     },
+    {
+      "alpha_4": "Maka",
+      "name": "Makasar",
+      "numeric": "366"
+    },
     {
       "alpha_4": "Mand",
       "name": "Mandaic, Mandaean",
@@ -480,6 +560,11 @@
       "name": "Mayan hieroglyphs",
       "numeric": "090"
     },
+    {
+      "alpha_4": "Medf",
+      "name": "Medefaidrin (Oberi Okaime, Oberi ฦ†kaimษ›)",
+      "numeric": "265"
+    },
     {
       "alpha_4": "Mend",
       "name": "Mende Kikakui",
@@ -518,7 +603,7 @@
     {
       "alpha_4": "Mroo",
       "name": "Mro, Mru",
-      "numeric": "199"
+      "numeric": "264"
     },
     {
       "alpha_4": "Mtei",
@@ -535,6 +620,16 @@
       "name": "Myanmar (Burmese)",
       "numeric": "350"
     },
+    {
+      "alpha_4": "Nagm",
+      "name": "Nag Mundari",
+      "numeric": "295"
+    },
+    {
+      "alpha_4": "Nand",
+      "name": "Nandinagari",
+      "numeric": "311"
+    },
     {
       "alpha_4": "Narb",
       "name": "Old North Arabian (Ancient North Arabian)",
@@ -550,9 +645,14 @@
       "name": "Newa, Newar, Newari, Nepฤla lipi",
       "numeric": "333"
     },
+    {
+      "alpha_4": "Nkdb",
+      "name": "Naxi Dongba (naยฒยนษ•iยณยณ toยณยณbaยฒยน, Nakhi Tomba)",
+      "numeric": "085"
+    },
     {
       "alpha_4": "Nkgb",
-      "name": "Nakhi Geba ('Na-'Khi ยฒGgล-ยนbaw, Naxi Geba)",
+      "name": "Naxi Geba (naยฒยนษ•iยณยณ gสŒยฒยนbaยฒยน, 'Na-'Khi ยฒGgล-ยนbaw, Nakhi Geba)",
       "numeric": "420"
     },
     {
@@ -575,6 +675,11 @@
       "name": "Ol Chiki (Ol Cemetโ€™, Ol, Santali)",
       "numeric": "261"
     },
+    {
+      "alpha_4": "Onao",
+      "name": "Ol Onal",
+      "numeric": "296"
+    },
     {
       "alpha_4": "Orkh",
       "name": "Old Turkic, Orkhon Runic",
@@ -582,7 +687,7 @@
     },
     {
       "alpha_4": "Orya",
-      "name": "Oriya",
+      "name": "Oriya (Odia)",
       "numeric": "327"
     },
     {
@@ -595,6 +700,11 @@
       "name": "Osmanya",
       "numeric": "260"
     },
+    {
+      "alpha_4": "Ougr",
+      "name": "Old Uyghur",
+      "numeric": "143"
+    },
     {
       "alpha_4": "Palm",
       "name": "Palmyrene",
@@ -605,6 +715,16 @@
       "name": "Pau Cin Hau",
       "numeric": "263"
     },
+    {
+      "alpha_4": "Pcun",
+      "name": "Proto-Cuneiform",
+      "numeric": "015"
+    },
+    {
+      "alpha_4": "Pelm",
+      "name": "Proto-Elamite",
+      "numeric": "016"
+    },
     {
       "alpha_4": "Perm",
       "name": "Old Permic",
@@ -650,6 +770,11 @@
       "name": "Inscriptional Parthian",
       "numeric": "130"
     },
+    {
+      "alpha_4": "Psin",
+      "name": "Proto-Sinaitic",
+      "numeric": "103"
+    },
     {
       "alpha_4": "Qaaa",
       "name": "Reserved for private use (start)",
@@ -660,11 +785,21 @@
       "name": "Reserved for private use (end)",
       "numeric": "949"
     },
+    {
+      "alpha_4": "Ranj",
+      "name": "Ranjana",
+      "numeric": "303"
+    },
     {
       "alpha_4": "Rjng",
       "name": "Rejang (Redjang, Kaganga)",
       "numeric": "363"
     },
+    {
+      "alpha_4": "Rohg",
+      "name": "Hanifi Rohingya",
+      "numeric": "167"
+    },
     {
       "alpha_4": "Roro",
       "name": "Rongorongo",
@@ -695,6 +830,11 @@
       "name": "Saurashtra",
       "numeric": "344"
     },
+    {
+      "alpha_4": "Seal",
+      "name": "(Small) Seal",
+      "numeric": "590"
+    },
     {
       "alpha_4": "Sgnw",
       "name": "SignWriting",
@@ -710,11 +850,21 @@
       "name": "Sharada, ลšฤradฤ",
       "numeric": "319"
     },
+    {
+      "alpha_4": "Shui",
+      "name": "Shuishu",
+      "numeric": "530"
+    },
     {
       "alpha_4": "Sidd",
       "name": "Siddham, Siddhaแนƒ, Siddhamฤtแน›kฤ",
       "numeric": "302"
     },
+    {
+      "alpha_4": "Sidt",
+      "name": "Sidetic",
+      "numeric": "180"
+    },
     {
       "alpha_4": "Sind",
       "name": "Khudawadi, Sindhi",
@@ -725,16 +875,36 @@
       "name": "Sinhala",
       "numeric": "348"
     },
+    {
+      "alpha_4": "Sogd",
+      "name": "Sogdian",
+      "numeric": "141"
+    },
+    {
+      "alpha_4": "Sogo",
+      "name": "Old Sogdian",
+      "numeric": "142"
+    },
     {
       "alpha_4": "Sora",
       "name": "Sora Sompeng",
       "numeric": "398"
     },
+    {
+      "alpha_4": "Soyo",
+      "name": "Soyombo",
+      "numeric": "329"
+    },
     {
       "alpha_4": "Sund",
       "name": "Sundanese",
       "numeric": "362"
     },
+    {
+      "alpha_4": "Sunu",
+      "name": "Sunuwar",
+      "numeric": "274"
+    },
     {
       "alpha_4": "Sylo",
       "name": "Syloti Nagri",
@@ -795,6 +965,11 @@
       "name": "Tai Viet",
       "numeric": "359"
     },
+    {
+      "alpha_4": "Tayo",
+      "name": "Tai Yo",
+      "numeric": "380"
+    },
     {
       "alpha_4": "Telu",
       "name": "Telugu",
@@ -835,6 +1010,31 @@
       "name": "Tirhuta",
       "numeric": "326"
     },
+    {
+      "alpha_4": "Tnsa",
+      "name": "Tangsa",
+      "numeric": "275"
+    },
+    {
+      "alpha_4": "Todr",
+      "name": "Todhri",
+      "numeric": "229"
+    },
+    {
+      "alpha_4": "Tols",
+      "name": "Tolong Siki",
+      "numeric": "299"
+    },
+    {
+      "alpha_4": "Toto",
+      "name": "Toto",
+      "numeric": "294"
+    },
+    {
+      "alpha_4": "Tutg",
+      "name": "Tulu-Tigalari",
+      "numeric": "341"
+    },
     {
       "alpha_4": "Ugar",
       "name": "Ugaritic",
@@ -850,11 +1050,21 @@
       "name": "Visible Speech",
       "numeric": "280"
     },
+    {
+      "alpha_4": "Vith",
+      "name": "Vithkuqi",
+      "numeric": "228"
+    },
     {
       "alpha_4": "Wara",
       "name": "Warang Citi (Varang Kshiti)",
       "numeric": "262"
     },
+    {
+      "alpha_4": "Wcho",
+      "name": "Wancho",
+      "numeric": "283"
+    },
     {
       "alpha_4": "Wole",
       "name": "Woleai",
@@ -870,11 +1080,21 @@
       "name": "Cuneiform, Sumero-Akkadian",
       "numeric": "020"
     },
+    {
+      "alpha_4": "Yezi",
+      "name": "Yezidi",
+      "numeric": "192"
+    },
     {
       "alpha_4": "Yiii",
       "name": "Yi",
       "numeric": "460"
     },
+    {
+      "alpha_4": "Zanb",
+      "name": "Zanabazar Square (Zanabazarin Dรถrbรถljin Useg, Xewtee Dรถrbรถljin Bicig, Horizontal Square Script)",
+      "numeric": "339"
+    },
     {
       "alpha_4": "Zinh",
       "name": "Code for inherited script",
diff --git a/libs/pycountry/databases/iso3166-2.json b/libs/pycountry/databases/iso3166-2.json
index e16038b9a0..788bc88f88 100644
--- a/libs/pycountry/databases/iso3166-2.json
+++ b/libs/pycountry/databases/iso3166-2.json
@@ -2864,17 +2864,17 @@
     },
     {
       "code": "BY-HM",
-      "name": "Gorod Minsk",
+      "name": "Horad Minsk",
       "type": "City"
     },
     {
       "code": "BY-HO",
-      "name": "Gomel'skaja oblast'",
+      "name": "Homieฤบskaja voblasฤ‡",
       "type": "Oblast"
     },
     {
       "code": "BY-HR",
-      "name": "Grodnenskaja oblast'",
+      "name": "Hrodzienskaja voblasฤ‡",
       "type": "Oblast"
     },
     {
@@ -2884,7 +2884,7 @@
     },
     {
       "code": "BY-MI",
-      "name": "Minskaja oblast'",
+      "name": "Minskaja voblasฤ‡",
       "type": "Oblast"
     },
     {
@@ -4206,12 +4206,12 @@
     },
     {
       "code": "CY-05",
-      "name": "Baf",
+      "name": "Pafos",
       "type": "District"
     },
     {
       "code": "CY-06",
-      "name": "Girne",
+      "name": "Keryneia",
       "type": "District"
     },
     {
@@ -6268,7 +6268,7 @@
     },
     {
       "code": "ER-DK",
-      "name": "Debubawi Kโ€™eyyฤญแธฅ Baแธฅri",
+      "name": "Janลซbฤซ al Baแธฉrฤซ al Aแธฉmar",
       "type": "Region"
     },
     {
@@ -6278,7 +6278,7 @@
     },
     {
       "code": "ER-GB",
-      "name": "Gash-Barka",
+      "name": "Qฤsh-Barkah",
       "type": "Region"
     },
     {
@@ -6288,12 +6288,12 @@
     },
     {
       "code": "ER-SK",
-      "name": "Semienawi Kโ€™eyyฤญแธฅ Baแธฅri",
+      "name": "Shimฤlฤซ al Baแธฉrฤซ al Aแธฉmar",
       "type": "Region"
     },
     {
       "code": "ES-A",
-      "name": "Alacant*",
+      "name": "Alicante",
       "parent": "ES-VC",
       "type": "Province"
     },
@@ -6411,7 +6411,7 @@
     },
     {
       "code": "ES-CS",
-      "name": "Castellรณ*",
+      "name": "Castellรณn",
       "parent": "ES-VC",
       "type": "Province"
     },
@@ -6542,13 +6542,13 @@
     },
     {
       "code": "ES-NA",
-      "name": "Nafarroa*",
+      "name": "Navarra",
       "parent": "ES-NC",
       "type": "Province"
     },
     {
       "code": "ES-NC",
-      "name": "Nafarroako Foru Komunitatea*",
+      "name": "Navarra, Comunidad Foral de",
       "type": "Autonomous community"
     },
     {
@@ -6583,7 +6583,7 @@
     },
     {
       "code": "ES-PV",
-      "name": "Euskal Herria",
+      "name": "Paรญs Vasco",
       "type": "Autonomous community"
     },
     {
@@ -6670,7 +6670,7 @@
     },
     {
       "code": "ES-VI",
-      "name": "Araba*",
+      "name": "รlava",
       "parent": "ES-PV",
       "type": "Province"
     },
@@ -10790,7 +10790,7 @@
     },
     {
       "code": "IL-HA",
-      "name": "Hฬฑefa",
+      "name": "แธจayfฤ",
       "type": "District"
     },
     {
@@ -11047,7 +11047,7 @@
     },
     {
       "code": "IQ-KR",
-      "name": "Herรชm-รฎ Kurdistan",
+      "name": "Iqlฤซm Kลซrdistฤn",
       "type": "Region"
     },
     {
@@ -11677,7 +11677,7 @@
     },
     {
       "code": "IT-23",
-      "name": "Val d'Aoste",
+      "name": "Valle d'Aosta",
       "type": "Autonomous region"
     },
     {
@@ -13013,7 +13013,7 @@
     },
     {
       "code": "KG-C",
-      "name": "Chuyskaya oblast'",
+      "name": "Chรผy",
       "type": "Region"
     },
     {
@@ -13023,12 +13023,12 @@
     },
     {
       "code": "KG-GO",
-      "name": "Gorod Osh",
+      "name": "Osh Shaary",
       "type": "City"
     },
     {
       "code": "KG-J",
-      "name": "Dzhalal-Abadskaya oblast'",
+      "name": "Jalal-Abad",
       "type": "Region"
     },
     {
@@ -13048,7 +13048,7 @@
     },
     {
       "code": "KG-Y",
-      "name": "Issyk-Kul'skaja oblast'",
+      "name": "Ysyk-Kรถl",
       "type": "Region"
     },
     {
@@ -13103,7 +13103,7 @@
     },
     {
       "code": "KH-19",
-      "name": "Stoฤ•ng Trรชng",
+      "name": "Stueng Traeng",
       "type": "Province"
     },
     {
@@ -13302,32 +13302,32 @@
     },
     {
       "code": "KP-01",
-      "name": "P'yว’ngyang",
+      "name": "Phyeongyang",
       "type": "Capital city"
     },
     {
       "code": "KP-02",
-      "name": "P'yว’ngan-namdo",
+      "name": "Phyeongannamto",
       "type": "Province"
     },
     {
       "code": "KP-03",
-      "name": "P'yว’ngan-bukto",
+      "name": "Phyeonganpukto",
       "type": "Province"
     },
     {
       "code": "KP-04",
-      "name": "Chagang-do",
+      "name": "Jakangto",
       "type": "Province"
     },
     {
       "code": "KP-05",
-      "name": "Hwanghae-namdo",
+      "name": "Hwanghainamto",
       "type": "Province"
     },
     {
       "code": "KP-06",
-      "name": "Hwanghae-bukto",
+      "name": "Hwanghaipukto",
       "type": "Province"
     },
     {
@@ -13337,17 +13337,17 @@
     },
     {
       "code": "KP-08",
-      "name": "Hamgyว’ng-namdo",
+      "name": "Hamkyeongnamto",
       "type": "Province"
     },
     {
       "code": "KP-09",
-      "name": "Hamgyว’ng-bukto",
+      "name": "Hamkyeongpukto",
       "type": "Province"
     },
     {
       "code": "KP-10",
-      "name": "Ryanggang-do",
+      "name": "Ryangkangto",
       "type": "Province"
     },
     {
@@ -13482,27 +13482,27 @@
     },
     {
       "code": "KZ-10",
-      "name": "Abajskaja oblastโ€™",
+      "name": "Abay oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-11",
-      "name": "Akmolinskaja oblast'",
+      "name": "Aqmola oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-15",
-      "name": "Aktjubinskaja oblast'",
+      "name": "Aqtรถbe oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-19",
-      "name": "Almatinskaja oblast'",
+      "name": "Almaty oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-23",
-      "name": "Atyrauskaja oblast'",
+      "name": "Atyraลซ oblysy",
       "type": "Region"
     },
     {
@@ -13522,17 +13522,17 @@
     },
     {
       "code": "KZ-35",
-      "name": "Karagandinskaja oblast'",
+      "name": "Qaraghandy oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-39",
-      "name": "Kostanajskaja oblast'",
+      "name": "Qostanay oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-43",
-      "name": "Kyzylordinskaja oblast'",
+      "name": "Qyzylorda oblysy",
       "type": "Region"
     },
     {
@@ -13547,17 +13547,17 @@
     },
     {
       "code": "KZ-59",
-      "name": "Severo-Kazahstanskaja oblast'",
+      "name": "Soltรผstik Qazaqstan oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-61",
-      "name": "Turkestankaya oblast'",
+      "name": "Tรผrkistan oblysy",
       "type": "Region"
     },
     {
       "code": "KZ-62",
-      "name": "Ulytauskaja oblastโ€™",
+      "name": "Ulytaลซ oblysy",
       "type": "Region"
     },
     {
@@ -13672,7 +13672,7 @@
     },
     {
       "code": "LB-AK",
-      "name": "Aakkรขr",
+      "name": "โ€˜Akkฤr",
       "type": "Governorate"
     },
     {
@@ -13687,7 +13687,7 @@
     },
     {
       "code": "LB-BH",
-      "name": "Baalbek-Hermel",
+      "name": "Bโ€˜alabak-Al Hirmil",
       "type": "Governorate"
     },
     {
@@ -18244,12 +18244,12 @@
     },
     {
       "code": "NO-50",
-      "name": "Trรถรถndelage",
+      "name": "Trรธndelag",
       "type": "County"
     },
     {
       "code": "NO-54",
-      "name": "Romssa ja Finnmรกrkku",
+      "name": "Troms og Finnmark",
       "type": "County"
     },
     {
@@ -18569,7 +18569,7 @@
     },
     {
       "code": "PE-AMA",
-      "name": "Amarumayu",
+      "name": "Amazonas",
       "type": "Region"
     },
     {
@@ -18579,7 +18579,7 @@
     },
     {
       "code": "PE-APU",
-      "name": "Apurimaq",
+      "name": "Apurรญmac",
       "type": "Region"
     },
     {
@@ -18624,7 +18624,7 @@
     },
     {
       "code": "PE-JUN",
-      "name": "Hunin",
+      "name": "Junรญn",
       "type": "Region"
     },
     {
@@ -18644,7 +18644,7 @@
     },
     {
       "code": "PE-LMA",
-      "name": "Lima hatun llaqta",
+      "name": "Municipalidad Metropolitana de Lima",
       "type": "Municipality"
     },
     {
@@ -18679,7 +18679,7 @@
     },
     {
       "code": "PE-SAM",
-      "name": "San Martin",
+      "name": "San Martรญn",
       "type": "Region"
     },
     {
@@ -20273,32 +20273,32 @@
     },
     {
       "code": "RU-AD",
-      "name": "Adygeja, Respublika",
+      "name": "Adygeya, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-AL",
-      "name": "Altaj, Respublika",
+      "name": "Altay, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-ALT",
-      "name": "Altajskij kraj",
+      "name": "Altayskiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-AMU",
-      "name": "Amurskaja oblast'",
+      "name": "Amurskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-ARK",
-      "name": "Arhangel'skaja oblast'",
+      "name": "Arkhangel'skaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-AST",
-      "name": "Astrahanskaja oblast'",
+      "name": "Astrakhanskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20308,17 +20308,17 @@
     },
     {
       "code": "RU-BEL",
-      "name": "Belgorodskaja oblast'",
+      "name": "Belgorodskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-BRY",
-      "name": "Brjanskaja oblast'",
+      "name": "Bryanskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-BU",
-      "name": "Burjatija, Respublika",
+      "name": "Buryatiya, Respublika",
       "type": "Republic"
     },
     {
@@ -20353,12 +20353,12 @@
     },
     {
       "code": "RU-IRK",
-      "name": "Irkutskaja oblast'",
+      "name": "Irkutskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-IVA",
-      "name": "Ivanovskaja oblast'",
+      "name": "Ivanovskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20368,7 +20368,7 @@
     },
     {
       "code": "RU-KB",
-      "name": "Kabardino-Balkarskaja Respublika",
+      "name": "Kabardino-Balkarskaya Respublika",
       "type": "Republic"
     },
     {
@@ -20378,47 +20378,47 @@
     },
     {
       "code": "RU-KDA",
-      "name": "Krasnodarskij kraj",
+      "name": "Krasnodarskiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-KEM",
-      "name": "Kemerovskaja oblast'",
+      "name": "Kemerovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-KGD",
-      "name": "Kaliningradskaja oblast'",
+      "name": "Kaliningradskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-KGN",
-      "name": "Kurganskaja oblast'",
+      "name": "Kurganskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-KHA",
-      "name": "Habarovskij kraj",
+      "name": "Khabarovskiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-KHM",
-      "name": "Hanty-Mansijskij avtonomnyj okrug",
+      "name": "Khanty-Mansiyskiy avtonomnyy okrug",
       "type": "Autonomous district"
     },
     {
       "code": "RU-KIR",
-      "name": "Kirovskaja oblast'",
+      "name": "Kirovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-KK",
-      "name": "Hakasija, Respublika",
+      "name": "Khakasiya, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-KL",
-      "name": "Kalmykija, Respublika",
+      "name": "Kalmykiya, Respublika",
       "type": "Republic"
     },
     {
@@ -20433,52 +20433,52 @@
     },
     {
       "code": "RU-KOS",
-      "name": "Kostromskaja oblast'",
+      "name": "Kostromskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-KR",
-      "name": "Karelija, Respublika",
+      "name": "Kareliya, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-KRS",
-      "name": "Kurskaja oblast'",
+      "name": "Kurskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-KYA",
-      "name": "Krasnojarskij kraj",
+      "name": "Krasnoyarskiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-LEN",
-      "name": "Leningradskaja oblast'",
+      "name": "Leningradskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-LIP",
-      "name": "Lipeckaja oblast'",
+      "name": "Lipetskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-MAG",
-      "name": "Magadanskaja oblast'",
+      "name": "Magadanskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-ME",
-      "name": "Marij รˆl, Respublika",
+      "name": "Mariy El, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-MO",
-      "name": "Mordovija, Respublika",
+      "name": "Mordoviya, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-MOS",
-      "name": "Moskovskaja oblast'",
+      "name": "Moskovskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20488,17 +20488,17 @@
     },
     {
       "code": "RU-MUR",
-      "name": "Murmanskaja oblast'",
+      "name": "Murmanskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-NEN",
-      "name": "Neneckij avtonomnyj okrug",
+      "name": "Nenetskiy avtonomnyy okrug",
       "type": "Autonomous district"
     },
     {
       "code": "RU-NGR",
-      "name": "Novgorodskaja oblast'",
+      "name": "Novgorodskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20508,52 +20508,52 @@
     },
     {
       "code": "RU-NVS",
-      "name": "Novosibirskaja oblast'",
+      "name": "Novosibirskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-OMS",
-      "name": "Omskaja oblast'",
+      "name": "Omskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-ORE",
-      "name": "Orenburgskaja oblast'",
+      "name": "Orenburgskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-ORL",
-      "name": "Orlovskaja oblast'",
+      "name": "Orlovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-PER",
-      "name": "Permskij kraj",
+      "name": "Permskiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-PNZ",
-      "name": "Penzenskaja oblast'",
+      "name": "Penzenskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-PRI",
-      "name": "Primorskij kraj",
+      "name": "Primorskiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-PSK",
-      "name": "Pskovskaja oblast'",
+      "name": "Pskovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-ROS",
-      "name": "Rostovskaja oblast'",
+      "name": "Rostovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-RYA",
-      "name": "Rjazanskaja oblast'",
+      "name": "Ryazanskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20563,27 +20563,27 @@
     },
     {
       "code": "RU-SAK",
-      "name": "Sahalinskaja oblast'",
+      "name": "Sakhalinskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-SAM",
-      "name": "Samarskaja oblast'",
+      "name": "Samarskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-SAR",
-      "name": "Saratovskaja oblast'",
+      "name": "Saratovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-SE",
-      "name": "Severnaja Osetija, Respublika",
+      "name": "Severnaya Osetiya, Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-SMO",
-      "name": "Smolenskaja oblast'",
+      "name": "Smolenskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20593,12 +20593,12 @@
     },
     {
       "code": "RU-STA",
-      "name": "Stavropol'skij kraj",
+      "name": "Stavropol'skiy kray",
       "type": "Administrative territory"
     },
     {
       "code": "RU-SVE",
-      "name": "Sverdlovskaja oblast'",
+      "name": "Sverdlovskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20608,22 +20608,22 @@
     },
     {
       "code": "RU-TAM",
-      "name": "Tambovskaja oblast'",
+      "name": "Tambovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-TOM",
-      "name": "Tomskaja oblast'",
+      "name": "Tomskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-TUL",
-      "name": "Tul'skaja oblast'",
+      "name": "Tul'skaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-TVE",
-      "name": "Tverskaja oblast'",
+      "name": "Tverskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20633,32 +20633,32 @@
     },
     {
       "code": "RU-TYU",
-      "name": "Tjumenskaja oblast'",
+      "name": "Tyumenskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-UD",
-      "name": "Udmurtskaja Respublika",
+      "name": "Udmurtskaya Respublika",
       "type": "Republic"
     },
     {
       "code": "RU-ULY",
-      "name": "Ul'janovskaja oblast'",
+      "name": "Ul'yanovskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-VGG",
-      "name": "Volgogradskaja oblast'",
+      "name": "Volgogradskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-VLA",
-      "name": "Vladimirskaja oblast'",
+      "name": "Vladimirskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-VLG",
-      "name": "Vologodskaja oblast'",
+      "name": "Vologodskaya oblast'",
       "type": "Administrative region"
     },
     {
@@ -20668,22 +20668,22 @@
     },
     {
       "code": "RU-YAN",
-      "name": "Jamalo-Neneckij avtonomnyj okrug",
+      "name": "Yamalo-Nenetskiy avtonomnyy okrug",
       "type": "Autonomous district"
     },
     {
       "code": "RU-YAR",
-      "name": "Jaroslavskaja oblast'",
+      "name": "Yaroslavskaya oblast'",
       "type": "Administrative region"
     },
     {
       "code": "RU-YEV",
-      "name": "Evrejskaja avtonomnaja oblast'",
+      "name": "Yevreyskaya avtonomnaya oblast'",
       "type": "Autonomous region"
     },
     {
       "code": "RU-ZAB",
-      "name": "Zabajkal'skij kraj",
+      "name": "Zabaykal'skiy kray",
       "type": "Administrative territory"
     },
     {
@@ -23413,12 +23413,12 @@
     },
     {
       "code": "TL-LA",
-      "name": "Lautein",
+      "name": "Lautรฉm",
       "type": "Municipality"
     },
     {
       "code": "TL-LI",
-      "name": "Likisรก",
+      "name": "Liquiรงa",
       "type": "Municipality"
     },
     {
@@ -23433,12 +23433,12 @@
     },
     {
       "code": "TL-OE",
-      "name": "Oekusi-Ambenu",
+      "name": "Oรฉ-Cusse Ambeno",
       "type": "Special administrative region"
     },
     {
       "code": "TL-VI",
-      "name": "Vikeke",
+      "name": "Viqueque",
       "type": "Municipality"
     },
     {
diff --git a/libs/pycountry/databases/iso4217.json b/libs/pycountry/databases/iso4217.json
index 4bd42d3bc7..9f41243f4a 100644
--- a/libs/pycountry/databases/iso4217.json
+++ b/libs/pycountry/databases/iso4217.json
@@ -20,11 +20,6 @@
       "name": "Armenian Dram",
       "numeric": "051"
     },
-    {
-      "alpha_3": "ANG",
-      "name": "Netherlands Antillean Guilder",
-      "numeric": "532"
-    },
     {
       "alpha_3": "AOA",
       "name": "Kwanza",
@@ -65,11 +60,6 @@
       "name": "Taka",
       "numeric": "050"
     },
-    {
-      "alpha_3": "BGN",
-      "name": "Bulgarian Lev",
-      "numeric": "975"
-    },
     {
       "alpha_3": "BHD",
       "name": "Bahraini Dinar",
@@ -185,11 +175,6 @@
       "name": "Costa Rican Colon",
       "numeric": "188"
     },
-    {
-      "alpha_3": "CUC",
-      "name": "Peso Convertible",
-      "numeric": "931"
-    },
     {
       "alpha_3": "CUP",
       "name": "Cuban Peso",
@@ -305,11 +290,6 @@
       "name": "Lempira",
       "numeric": "340"
     },
-    {
-      "alpha_3": "HRK",
-      "name": "Kuna",
-      "numeric": "191"
-    },
     {
       "alpha_3": "HTG",
       "name": "Gourde",
@@ -650,11 +630,6 @@
       "name": "Leone",
       "numeric": "925"
     },
-    {
-      "alpha_3": "SLL",
-      "name": "Leone",
-      "numeric": "694"
-    },
     {
       "alpha_3": "SOS",
       "name": "Somali Shilling",
@@ -800,6 +775,11 @@
       "name": "Tala",
       "numeric": "882"
     },
+    {
+      "alpha_3": "XAD",
+      "name": "Arab Accounting Dinar",
+      "numeric": "396"
+    },
     {
       "alpha_3": "XAF",
       "name": "CFA Franc BEAC",
@@ -840,6 +820,11 @@
       "name": "East Caribbean Dollar",
       "numeric": "951"
     },
+    {
+      "alpha_3": "XCG",
+      "name": "Caribbean Guilder",
+      "numeric": "532"
+    },
     {
       "alpha_3": "XDR",
       "name": "SDR (Special Drawing Right)",
@@ -901,9 +886,9 @@
       "numeric": "967"
     },
     {
-      "alpha_3": "ZWL",
-      "name": "Zimbabwe Dollar",
-      "numeric": "932"
+      "alpha_3": "ZWG",
+      "name": "Zimbabwe Gold",
+      "numeric": "924"
     }
   ]
 }
diff --git a/libs/pycountry/databases/iso639-3.json b/libs/pycountry/databases/iso639-3.json
index 7a09889c19..3e9e69f1f5 100644
--- a/libs/pycountry/databases/iso639-3.json
+++ b/libs/pycountry/databases/iso639-3.json
@@ -1162,13 +1162,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "ajp",
-      "inverted_name": "Arabic, South Levantine",
-      "name": "South Levantine Arabic",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "ajs",
       "name": "Algerian Jewish Sign Language",
@@ -1260,7 +1253,7 @@
       "alpha_3": "akk",
       "name": "Akkadian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "akl",
@@ -1922,8 +1915,8 @@
     },
     {
       "alpha_3": "apc",
-      "inverted_name": "Arabic, North Levantine",
-      "name": "North Levantine Arabic",
+      "inverted_name": "Arabic, Levantine",
+      "name": "Levantine Arabic",
       "scope": "I",
       "type": "L"
     },
@@ -2153,7 +2146,7 @@
       "inverted_name": "Aramaic, Official (700-300 BCE)",
       "name": "Official Aramaic (700-300 BCE)",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ard",
@@ -2743,7 +2736,7 @@
       "alpha_3": "ave",
       "name": "Avestan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "avi",
@@ -5617,7 +5610,7 @@
     },
     {
       "alpha_3": "bql",
-      "name": "Bilakura",
+      "name": "Karian",
       "scope": "I",
       "type": "L"
     },
@@ -7689,7 +7682,7 @@
       "inverted_name": "Slavic, Church",
       "name": "Church Slavic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_2": "cv",
@@ -8030,7 +8023,7 @@
     },
     {
       "alpha_3": "clm",
-      "name": "Clallam",
+      "name": "Klallam",
       "scope": "I",
       "type": "L"
     },
@@ -8041,6 +8034,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "cls",
+      "name": "Classical Sanskrit",
+      "scope": "I",
+      "type": "H"
+    },
     {
       "alpha_3": "clt",
       "inverted_name": "Chin, Lautu",
@@ -8129,7 +8128,7 @@
       "alpha_3": "cms",
       "name": "Messapic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "cmt",
@@ -9062,6 +9061,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "cxh",
+      "name": "Cha'ari",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "cya",
       "inverted_name": "Chatino, Nopala",
@@ -9250,7 +9255,7 @@
     },
     {
       "alpha_3": "daz",
-      "name": "Dao",
+      "name": "Moi-Wadea",
       "scope": "I",
       "type": "L"
     },
@@ -9500,12 +9505,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "dek",
-      "name": "Dek",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "del",
       "name": "Delaware",
@@ -9647,7 +9646,7 @@
     },
     {
       "alpha_3": "dgr",
-      "name": "Dogrib",
+      "name": "Tlicho",
       "scope": "I",
       "type": "L"
     },
@@ -9880,7 +9879,7 @@
     {
       "alpha_2": "dv",
       "alpha_3": "div",
-      "name": "Dhivehi",
+      "name": "Divehi",
       "scope": "I",
       "type": "L"
     },
@@ -10511,6 +10510,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "dsk",
+      "name": "Dokshi",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "dsl",
       "name": "Danish Sign Language",
@@ -10890,6 +10895,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "dyr",
+      "name": "Dyarim",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "dyu",
       "name": "Dyula",
@@ -10908,6 +10919,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "dzd",
+      "name": "Daza",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "dze",
       "name": "Djiwarli",
@@ -10986,7 +11003,7 @@
       "alpha_3": "ecr",
       "name": "Eteocretan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ecs",
@@ -10998,7 +11015,7 @@
       "alpha_3": "ecy",
       "name": "Eteocypriot",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "eee",
@@ -11052,7 +11069,7 @@
       "alpha_3": "egy",
       "name": "Egyptian (Ancient)",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ehs",
@@ -11213,7 +11230,7 @@
       "alpha_3": "elx",
       "name": "Elamite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ema",
@@ -11310,7 +11327,7 @@
       "inverted_name": "Mayan, Epigraphic",
       "name": "Epigraphic Mayan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "emz",
@@ -11640,7 +11657,7 @@
       "alpha_3": "ett",
       "name": "Etruscan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "etu",
@@ -11660,6 +11677,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "eud",
+      "name": "Eudeve",
+      "scope": "I",
+      "type": "E"
+    },
     {
       "alpha_2": "eu",
       "alpha_3": "eus",
@@ -12920,7 +12943,7 @@
       "alpha_3": "gez",
       "name": "Geez",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "gfk",
@@ -13044,7 +13067,7 @@
       "alpha_3": "gho",
       "name": "Ghomara",
       "scope": "I",
-      "type": "E"
+      "type": "L"
     },
     {
       "alpha_3": "ghr",
@@ -13450,7 +13473,7 @@
       "inverted_name": "Greek, Mycenaean",
       "name": "Mycenaean Greek",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "gmz",
@@ -13700,7 +13723,7 @@
       "alpha_3": "got",
       "name": "Gothic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "gou",
@@ -14424,7 +14447,7 @@
     },
     {
       "alpha_3": "haa",
-      "name": "Han",
+      "name": "Hรคn",
       "scope": "I",
       "type": "L"
     },
@@ -14818,7 +14841,7 @@
       "alpha_3": "hit",
       "name": "Hittite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "hiw",
@@ -14910,7 +14933,7 @@
       "inverted_name": "Luwian, Hieroglyphic",
       "name": "Hieroglyphic Luwian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "hma",
@@ -14984,7 +15007,7 @@
       "alpha_3": "hmk",
       "name": "Maek",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "hml",
@@ -15121,6 +15144,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "hnm",
+      "name": "Hainanese",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "hnn",
       "name": "Hanunoo",
@@ -15415,7 +15444,7 @@
       "inverted_name": "Hittite, Middle",
       "name": "Middle Hittite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "hub",
@@ -16017,6 +16046,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "ikh",
+      "name": "Ikhin-Arokho",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "iki",
       "name": "Iko",
@@ -16210,7 +16245,7 @@
       "alpha_3": "ims",
       "name": "Marsian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "imt",
@@ -16222,7 +16257,7 @@
       "alpha_3": "imy",
       "name": "Milyan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_2": "ia",
@@ -16273,7 +16308,7 @@
       "alpha_3": "inm",
       "name": "Minaean",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "inn",
@@ -16506,6 +16541,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "isv",
+      "name": "Interslavic",
+      "scope": "I",
+      "type": "C"
+    },
     {
       "alpha_2": "it",
       "alpha_3": "ita",
@@ -16694,6 +16735,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "izm",
+      "name": "Kizamani",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "izr",
       "name": "Izere",
@@ -17418,7 +17465,7 @@
       "alpha_3": "juc",
       "name": "Jurchen",
       "scope": "I",
-      "type": "E"
+      "type": "H"
     },
     {
       "alpha_3": "jud",
@@ -17684,7 +17731,7 @@
       "alpha_3": "kaw",
       "name": "Kawi",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "kax",
@@ -17908,7 +17955,7 @@
     },
     {
       "alpha_3": "kci",
-      "name": "Kamantan",
+      "name": "Ngyian",
       "scope": "I",
       "type": "L"
     },
@@ -18520,12 +18567,6 @@
       "scope": "I",
       "type": "E"
     },
-    {
-      "alpha_3": "kgm",
-      "name": "Karipรบna",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "kgn",
       "name": "Karingani",
@@ -18684,7 +18725,7 @@
       "alpha_3": "kho",
       "name": "Khotanese",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "khp",
@@ -20229,7 +20270,7 @@
     },
     {
       "alpha_3": "krp",
-      "name": "Korop",
+      "name": "Durop",
       "scope": "I",
       "type": "L"
     },
@@ -20290,12 +20331,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "ksa",
-      "name": "Shuwa-Zamani",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "ksb",
       "name": "Shambala",
@@ -20981,7 +21016,7 @@
     },
     {
       "alpha_3": "kwk",
-      "name": "Kwakiutl",
+      "name": "Kwak'wala",
       "scope": "I",
       "type": "L"
     },
@@ -21522,7 +21557,7 @@
       "alpha_3": "lab",
       "name": "Linear A",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "lac",
@@ -21550,7 +21585,7 @@
     },
     {
       "alpha_3": "lag",
-      "name": "Langi",
+      "name": "Rangi",
       "scope": "I",
       "type": "L"
     },
@@ -21626,7 +21661,7 @@
       "alpha_3": "lat",
       "name": "Latin",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "lau",
@@ -22180,6 +22215,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "lgs",
+      "name": "Guinea-Bissau Sign Language",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "lgt",
       "name": "Pahi",
@@ -22831,7 +22872,7 @@
       "alpha_3": "lng",
       "name": "Langobardic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "lnh",
@@ -22932,7 +22973,7 @@
     },
     {
       "alpha_3": "loh",
-      "name": "Narim",
+      "name": "Laarim",
       "scope": "I",
       "type": "L"
     },
@@ -23379,6 +23420,13 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "luh",
+      "inverted_name": "Chinese, Leizhou",
+      "name": "Leizhou Chinese",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "lui",
       "name": "Luiseno",
@@ -23449,7 +23497,7 @@
       "alpha_3": "lut",
       "name": "Lushootseed",
       "scope": "I",
-      "type": "L"
+      "type": "E"
     },
     {
       "alpha_3": "luu",
@@ -23500,6 +23548,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "lvl",
+      "name": "Lwel",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "lvs",
       "inverted_name": "Latvian, Standard",
@@ -24776,7 +24830,7 @@
     },
     {
       "alpha_3": "mhn",
-      "name": "Mรณcheno",
+      "name": "Mรฒcheno",
       "scope": "I",
       "type": "L"
     },
@@ -25516,7 +25570,7 @@
     },
     {
       "alpha_3": "mmi",
-      "name": "Musar",
+      "name": "Hember Avu",
       "scope": "I",
       "type": "L"
     },
@@ -28195,7 +28249,7 @@
       "inverted_name": "Hittite, Neo-",
       "name": "Neo-Hittite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "nej",
@@ -28274,7 +28328,8 @@
     },
     {
       "alpha_3": "new",
-      "name": "Newari",
+      "inverted_name": "Bhasa, Nepal",
+      "name": "Nepal Bhasa",
       "scope": "I",
       "type": "L"
     },
@@ -29530,12 +29585,6 @@
       "scope": "I",
       "type": "E"
     },
-    {
-      "alpha_3": "nom",
-      "name": "Nocamรกn",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "non",
       "inverted_name": "Norse, Old",
@@ -29756,7 +29805,7 @@
       "alpha_3": "nrc",
       "name": "Noric",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "nre",
@@ -29813,7 +29862,7 @@
       "inverted_name": "Picene, North",
       "name": "North Picene",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "nrr",
@@ -30011,12 +30060,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "nte",
-      "name": "Nathembo",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "ntg",
       "name": "Ngantangarra",
@@ -30390,7 +30433,7 @@
       "alpha_3": "nxm",
       "name": "Numidian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "nxn",
@@ -30425,7 +30468,7 @@
     {
       "alpha_2": "ny",
       "alpha_3": "nya",
-      "name": "Nyanja",
+      "name": "Chichewa",
       "scope": "I",
       "type": "L"
     },
@@ -30611,6 +30654,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "nzr",
+      "name": "Dir-Nyamzak-Mbarimi",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "nzs",
       "name": "New Zealand Sign Language",
@@ -30648,12 +30697,18 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "oak",
+      "name": "Noakhali",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "oar",
       "inverted_name": "Aramaic, Old (up to 700 BCE)",
       "name": "Old Aramaic (up to 700 BCE)",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "oav",
@@ -30685,7 +30740,7 @@
       "alpha_3": "obm",
       "name": "Moabite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "obo",
@@ -30725,7 +30780,7 @@
       "inverted_name": "Chinese, Old",
       "name": "Old Chinese",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_2": "oc",
@@ -30841,7 +30896,7 @@
       "inverted_name": "Hittite, Old",
       "name": "Old Hittite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ohu",
@@ -31151,7 +31206,7 @@
       "alpha_3": "omn",
       "name": "Minoan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "omo",
@@ -31334,7 +31389,7 @@
       "inverted_name": "Ossetic, Old",
       "name": "Old Ossetic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "opa",
@@ -31494,7 +31549,7 @@
       "alpha_3": "osc",
       "name": "Oscan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "osi",
@@ -31661,7 +31716,7 @@
       "inverted_name": "Tamil, Old",
       "name": "Old Tamil",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "otz",
@@ -31808,7 +31863,7 @@
       "alpha_3": "pal",
       "name": "Pahlavi",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "pam",
@@ -32329,13 +32384,13 @@
       "inverted_name": "Irish, Primitive",
       "name": "Primitive Irish",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "pgn",
       "name": "Paelignian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "pgs",
@@ -32407,7 +32462,7 @@
       "alpha_3": "phn",
       "name": "Phoenician",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "pho",
@@ -32612,7 +32667,7 @@
       "alpha_3": "pkc",
       "name": "Paekche",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "pkg",
@@ -32717,13 +32772,7 @@
       "alpha_3": "pli",
       "name": "Pali",
       "scope": "I",
-      "type": "A"
-    },
-    {
-      "alpha_3": "plj",
-      "name": "Polci",
-      "scope": "I",
-      "type": "L"
+      "type": "H"
     },
     {
       "alpha_3": "plk",
@@ -32756,7 +32805,7 @@
       "alpha_3": "plq",
       "name": "Palaic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "plr",
@@ -32862,12 +32911,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "pmk",
-      "name": "Pamlico",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "pml",
       "name": "Lingua Franca",
@@ -33386,12 +33429,6 @@
       "scope": "I",
       "type": "H"
     },
-    {
-      "alpha_3": "prp",
-      "name": "Parsi",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "prq",
       "name": "Ashรฉninka Perenรฉ",
@@ -33858,7 +33895,7 @@
       "alpha_3": "pyx",
       "name": "Pyu (Myanmar)",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "pyy",
@@ -33866,6 +33903,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "pze",
+      "name": "Pesse",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "pzh",
       "name": "Pazeh",
@@ -33874,6 +33917,7 @@
     },
     {
       "alpha_3": "pzn",
+      "inverted_name": "Naga, Jejara",
       "name": "Jejara Naga",
       "scope": "I",
       "type": "L"
@@ -35025,6 +35069,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "rrm",
+      "name": "Moriori",
+      "scope": "I",
+      "type": "E"
+    },
     {
       "alpha_3": "rro",
       "name": "Waima",
@@ -35067,6 +35117,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "rsw",
+      "name": "Rishiwa",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "rtc",
       "inverted_name": "Chin, Rungtu",
@@ -35352,8 +35408,8 @@
       "alpha_2": "sa",
       "alpha_3": "san",
       "name": "Sanskrit",
-      "scope": "I",
-      "type": "A"
+      "scope": "M",
+      "type": "H"
     },
     {
       "alpha_3": "sao",
@@ -35555,7 +35611,7 @@
       "alpha_3": "sbv",
       "name": "Sabine",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "sbw",
@@ -35691,7 +35747,7 @@
       "alpha_3": "scx",
       "name": "Sicel",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "sda",
@@ -36430,6 +36486,13 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "sjc",
+      "inverted_name": "Chinese, Shaojiang",
+      "name": "Shaojiang Chinese",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "sjd",
       "inverted_name": "Sami, Kildin",
@@ -36750,12 +36813,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "slq",
-      "name": "Salchuq",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "slr",
       "name": "Salar",
@@ -37139,7 +37196,7 @@
       "alpha_3": "sog",
       "name": "Sogdian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "soh",
@@ -37376,7 +37433,7 @@
       "inverted_name": "Picene, South",
       "name": "South Picene",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "spy",
@@ -38022,7 +38079,7 @@
       "alpha_3": "sux",
       "name": "Sumerian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "suy",
@@ -38244,7 +38301,7 @@
       "alpha_3": "sxc",
       "name": "Sicanian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "sxe",
@@ -38287,7 +38344,7 @@
       "alpha_3": "sxo",
       "name": "Sorothaptic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "sxr",
@@ -38420,12 +38477,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "szd",
-      "name": "Seru",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "sze",
       "name": "Seze",
@@ -40059,13 +40110,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "tmk",
-      "inverted_name": "Tamang, Northwestern",
-      "name": "Northwestern Tamang",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "tml",
       "inverted_name": "Citak, Tamnim",
@@ -40544,12 +40588,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "tpw",
-      "name": "Tupรญ",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "tpx",
       "inverted_name": "Me'phaa, Acatepec",
@@ -41263,6 +41301,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "tvi",
+      "name": "Tulai",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "tvk",
       "inverted_name": "Ambrym, Southeast",
@@ -41473,7 +41517,7 @@
       "alpha_3": "txb",
       "name": "Tokharian B",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "txc",
@@ -41491,13 +41535,13 @@
       "alpha_3": "txg",
       "name": "Tangut",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "txh",
       "name": "Thracian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "txi",
@@ -41540,7 +41584,7 @@
       "alpha_3": "txr",
       "name": "Tartessian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "txs",
@@ -41837,7 +41881,7 @@
       "alpha_3": "uga",
       "name": "Ugaritic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ugb",
@@ -42069,6 +42113,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "uly",
+      "name": "Buli",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "uma",
       "name": "Umatilla",
@@ -42085,7 +42135,7 @@
       "alpha_3": "umc",
       "name": "Marrucinian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "umd",
@@ -42766,6 +42816,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "vjk",
+      "name": "Bajjika",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "vka",
       "name": "Kariyarra",
@@ -42850,7 +42906,7 @@
       "alpha_3": "vma",
       "name": "Martuyhunira",
       "scope": "I",
-      "type": "L"
+      "type": "E"
     },
     {
       "alpha_3": "vmb",
@@ -43068,6 +43124,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "vsn",
+      "name": "Vedic Sanskrit",
+      "scope": "I",
+      "type": "H"
+    },
     {
       "alpha_3": "vsv",
       "name": "Valencian Sign Language",
@@ -43934,7 +43996,7 @@
     },
     {
       "alpha_3": "wnb",
-      "name": "Wanambre",
+      "name": "Mokati",
       "scope": "I",
       "type": "L"
     },
@@ -44284,6 +44346,12 @@
       "scope": "I",
       "type": "E"
     },
+    {
+      "alpha_3": "wtb",
+      "name": "Matambwe",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "wtf",
       "name": "Watiwa",
@@ -44507,13 +44575,13 @@
       "alpha_3": "xae",
       "name": "Aequian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xag",
       "name": "Aghwan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xai",
@@ -44567,7 +44635,7 @@
       "alpha_3": "xaq",
       "name": "Aquitanian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xar",
@@ -44622,7 +44690,7 @@
       "alpha_3": "xbc",
       "name": "Bactrian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xbd",
@@ -44707,20 +44775,20 @@
       "alpha_3": "xcc",
       "name": "Camunic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xce",
       "name": "Celtiberian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xcg",
       "inverted_name": "Gaulish, Cisalpine",
       "name": "Cisalpine Gaulish",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xch",
@@ -44751,13 +44819,13 @@
       "alpha_3": "xco",
       "name": "Chorasmian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xcr",
       "name": "Carian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xct",
@@ -44800,7 +44868,7 @@
       "alpha_3": "xdc",
       "name": "Dacian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xdk",
@@ -44812,7 +44880,7 @@
       "alpha_3": "xdm",
       "name": "Edomite",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xdo",
@@ -44837,7 +44905,7 @@
       "alpha_3": "xeb",
       "name": "Eblan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xed",
@@ -44867,7 +44935,7 @@
       "alpha_3": "xep",
       "name": "Epi-Olmec",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xer",
@@ -44897,13 +44965,13 @@
       "alpha_3": "xfa",
       "name": "Faliscan",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xga",
       "name": "Galatian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xgb",
@@ -44969,19 +45037,19 @@
       "alpha_3": "xha",
       "name": "Harami",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xhc",
       "name": "Hunnic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xhd",
       "name": "Hadrami",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xhe",
@@ -45007,19 +45075,19 @@
       "alpha_3": "xhr",
       "name": "Hernican",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xht",
       "name": "Hattic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xhu",
       "name": "Hurrian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xhv",
@@ -45031,7 +45099,7 @@
       "alpha_3": "xib",
       "name": "Iberian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xii",
@@ -45043,7 +45111,7 @@
       "alpha_3": "xil",
       "name": "Illyrian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xin",
@@ -45067,7 +45135,7 @@
       "alpha_3": "xiv",
       "name": "Indus Valley Language",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xiy",
@@ -45250,37 +45318,37 @@
       "alpha_3": "xlc",
       "name": "Lycian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xld",
       "name": "Lydian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xle",
       "name": "Lemnian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xlg",
       "name": "Ligurian (Ancient)",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xli",
       "name": "Liburnian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xln",
       "name": "Alanic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xlo",
@@ -45292,26 +45360,26 @@
       "alpha_3": "xlp",
       "name": "Lepontic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xls",
       "name": "Lusitanian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xlu",
       "inverted_name": "Luwian, Cuneiform",
       "name": "Cuneiform Luwian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xly",
       "name": "Elymian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xma",
@@ -45341,7 +45409,7 @@
       "alpha_3": "xme",
       "name": "Median",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xmf",
@@ -45372,7 +45440,7 @@
       "inverted_name": "Macedonian, Ancient",
       "name": "Ancient Macedonian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xml",
@@ -45416,7 +45484,7 @@
       "alpha_3": "xmr",
       "name": "Meroitic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xms",
@@ -45473,7 +45541,7 @@
       "inverted_name": "North Arabian, Ancient",
       "name": "Ancient North Arabian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xnb",
@@ -45683,7 +45751,7 @@
       "alpha_3": "xpg",
       "name": "Phrygian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xph",
@@ -45740,7 +45808,7 @@
       "alpha_3": "xpp",
       "name": "Puyo-Paekche",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xpq",
@@ -45752,13 +45820,13 @@
       "alpha_3": "xpr",
       "name": "Parthian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xps",
       "name": "Pisidian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xpt",
@@ -45770,7 +45838,7 @@
       "alpha_3": "xpu",
       "name": "Punic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xpv",
@@ -45797,7 +45865,7 @@
       "alpha_3": "xpy",
       "name": "Puyo",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xpz",
@@ -45816,7 +45884,7 @@
       "alpha_3": "xqt",
       "name": "Qatabanian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xra",
@@ -45859,7 +45927,7 @@
       "alpha_3": "xrm",
       "name": "Armazic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xrn",
@@ -45871,7 +45939,7 @@
       "alpha_3": "xrr",
       "name": "Raetic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xrt",
@@ -45895,7 +45963,7 @@
       "alpha_3": "xsa",
       "name": "Sabaean",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xsb",
@@ -45907,13 +45975,13 @@
       "alpha_3": "xsc",
       "name": "Scythian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xsd",
       "name": "Sidetic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xse",
@@ -45982,12 +46050,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "xss",
-      "name": "Assan",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "xsu",
       "name": "Sanumรก",
@@ -46044,7 +46106,7 @@
       "inverted_name": "Gaulish, Transalpine",
       "name": "Transalpine Gaulish",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xth",
@@ -46091,7 +46153,7 @@
       "alpha_3": "xto",
       "name": "Tokharian A",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xtp",
@@ -46111,7 +46173,7 @@
       "inverted_name": "Tripuri, Early",
       "name": "Early Tripuri",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xts",
@@ -46196,7 +46258,7 @@
       "alpha_3": "xum",
       "name": "Umbrian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xun",
@@ -46221,7 +46283,7 @@
       "alpha_3": "xur",
       "name": "Urartian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xut",
@@ -46239,7 +46301,7 @@
       "alpha_3": "xve",
       "name": "Venetic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xvi",
@@ -46251,19 +46313,19 @@
       "alpha_3": "xvn",
       "name": "Vandalic",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xvo",
       "name": "Volscian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xvs",
       "name": "Vestinian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xwa",
@@ -46416,7 +46478,7 @@
       "alpha_3": "xzh",
       "name": "Zhang-Zhung",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "xzm",
@@ -46691,6 +46753,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "ycr",
+      "name": "Yilan Creole",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "yda",
       "name": "Yanda",
@@ -47017,6 +47085,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "ykh",
+      "name": "Khamnigan Mongol",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "yki",
       "name": "Yoke",
@@ -47248,7 +47322,7 @@
       "alpha_3": "yms",
       "name": "Mysian",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "ymx",
@@ -47269,6 +47343,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "ynb",
+      "name": "Yamben",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "ynd",
       "name": "Yandruwandha",
@@ -48143,6 +48223,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "zem",
+      "name": "Zeem",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "zen",
       "name": "Zenaga",
@@ -48290,12 +48376,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "zkb",
-      "name": "Koibal",
-      "scope": "I",
-      "type": "E"
-    },
     {
       "alpha_3": "zkd",
       "name": "Kadu",
@@ -48306,7 +48386,7 @@
       "alpha_3": "zkg",
       "name": "Koguryo",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "zkh",
@@ -48402,6 +48482,12 @@
       "scope": "I",
       "type": "L"
     },
+    {
+      "alpha_3": "zlu",
+      "name": "Zul",
+      "scope": "I",
+      "type": "L"
+    },
     {
       "alpha_3": "zma",
       "name": "Manda (Australia)",
@@ -48494,7 +48580,7 @@
     },
     {
       "alpha_3": "zmp",
-      "name": "Mpuono",
+      "name": "Mbuun",
       "scope": "I",
       "type": "L"
     },
@@ -48829,7 +48915,7 @@
       "alpha_3": "zra",
       "name": "Kara (Korea)",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "zrg",
@@ -48871,7 +48957,7 @@
       "alpha_3": "zsk",
       "name": "Kaskean",
       "scope": "I",
-      "type": "A"
+      "type": "H"
     },
     {
       "alpha_3": "zsl",
@@ -48983,12 +49069,6 @@
       "scope": "I",
       "type": "L"
     },
-    {
-      "alpha_3": "zua",
-      "name": "Zeem",
-      "scope": "I",
-      "type": "L"
-    },
     {
       "alpha_3": "zuh",
       "name": "Tokano",
diff --git a/libs/pycountry/db.py b/libs/pycountry/db.py
index 08f24e8c97..94a18ee235 100644
--- a/libs/pycountry/db.py
+++ b/libs/pycountry/db.py
@@ -1,7 +1,8 @@
 import json
 import logging
 import threading
-from typing import Any, Iterator, List, Optional, Type, Union
+from collections.abc import Callable, Iterator
+from typing import Any, Generic, TypeVar, cast
 
 logger = logging.getLogger("pycountry.db")
 
@@ -10,7 +11,7 @@ class Data:
     def __init__(self, **fields: str):
         self._fields = fields
 
-    def __getattr__(self, key):
+    def __getattr__(self, key: str) -> str:
         if key in self._fields:
             return self._fields[key]
         raise AttributeError(key)
@@ -25,7 +26,7 @@ def __repr__(self) -> str:
         fields = ", ".join("%s=%r" % i for i in sorted(self._fields.items()))
         return f"{cls_name}({fields})"
 
-    def __dir__(self) -> List[str]:
+    def __dir__(self) -> list[str]:
         return dir(self.__class__) + list(self._fields)
 
     def __iter__(self):
@@ -42,20 +43,27 @@ class Subdivision(Data):
     pass
 
 
-def lazy_load(f):
+F = TypeVar("F", bound=Callable[..., Any])
+
+
+def lazy_load(f: F) -> F:
     def load_if_needed(self, *args, **kw):
         if not self._is_loaded:
             with self._load_lock:
                 self._load()
         return f(self, *args, **kw)
 
-    return load_if_needed
+    return cast(F, load_if_needed)
+
 
+T = TypeVar("T", bound=Data)
 
-class Database:
-    data_class: Union[Type, str]
-    root_key: Optional[str] = None
-    no_index: List[str] = []
+
+class Database(Generic[T]):
+    data_class: type | str
+    root_key: str | None = None
+    no_index: list[str] = []
+    special_index: list[str] = []
 
     def __init__(self, filename: str) -> None:
         self.filename = filename
@@ -70,9 +78,45 @@ def __init__(self, filename: str) -> None:
     def _clear(self):
         self._is_loaded = False
         self.objects = []
-        self.index_names = set()
         self.indices = {}
 
+    def _special_index(self, obj, key) -> None:
+        raise NotImplementedError("Must be implemented in subclass")
+
+    def _special_deindex(self, obj, key) -> None:
+        raise NotImplementedError("Must be implemented in subclass")
+
+    def _index_object(self, obj) -> None:
+        for key, value in obj._fields.items():
+            if key in self.no_index:
+                continue
+            if key in self.special_index:
+                self._special_index(obj, key)
+                continue
+            # Lookups and searches are case insensitive. Normalize
+            # here.
+            index = self.indices.setdefault(key, {})
+            value = value.lower()
+            if value in index:
+                logger.debug(
+                    "%s %r already taken in index %r and will be "
+                    "ignored. This is an error in the databases."
+                    % (self.factory.__name__, value, key)
+                )
+            index[value] = obj
+
+    def _deindex_object(self, obj) -> None:
+        for key, value in obj._fields.items():
+            if key in self.no_index:
+                continue
+            if key in self.special_index:
+                self._special_deindex(obj, key)
+                continue
+            value = value.lower()
+            index = self.indices.setdefault(key, {})
+            if value in index:
+                del index[value]
+
     def _load(self) -> None:
         if self._is_loaded:
             # Help keeping the _load_if_needed code easier
@@ -86,22 +130,8 @@ def _load(self) -> None:
         for entry in tree[self.root_key]:
             obj = self.factory(**entry)
             self.objects.append(obj)
-            # Inject into index.
-            for key, value in entry.items():
-                if key in self.no_index:
-                    continue
-                # Lookups and searches are case insensitive. Normalize
-                # here.
-                index = self.indices.setdefault(key, {})
-                value = value.lower()
-                if value in index:
-                    logger.debug(
-                        "%s %r already taken in index %r and will be "
-                        "ignored. This is an error in the databases."
-                        % (self.factory.__name__, value, key)
-                    )
-                index[value] = obj
-
+            # Inject into indices
+            self._index_object(obj)
         self._is_loaded = True
 
     # Public API
@@ -115,18 +145,12 @@ def add_entry(self, **kw):
         self.objects.append(obj)
 
         # update indices
-        for key, value in kw.items():
-            if key in self.no_index:
-                continue
-            value = value.lower()
-            index = self.indices.setdefault(key, {})
-            index[value] = obj
+        self._index_object(obj)
 
     @lazy_load
     def remove_entry(self, **kw):
         # make sure that we receive None if no entry found
-        if "default" in kw:
-            del kw["default"]
+        kw.pop("default", None)
         obj = self.get(**kw)
         if not obj:
             raise KeyError(
@@ -137,16 +161,10 @@ def remove_entry(self, **kw):
         self.objects.remove(obj)
 
         # update indices
-        for key, value in obj:
-            if key in self.no_index:
-                continue
-            value = value.lower()
-            index = self.indices.setdefault(key, {})
-            if value in index:
-                del index[value]
+        self._deindex_object(obj)
 
     @lazy_load
-    def __iter__(self) -> Iterator["Database"]:
+    def __iter__(self) -> Iterator[T]:
         return iter(self.objects)
 
     @lazy_load
@@ -154,9 +172,7 @@ def __len__(self) -> int:
         return len(self.objects)
 
     @lazy_load
-    def get(
-        self, *, default: Optional[Any] = None, **kw: Optional[str]
-    ) -> Optional[Any]:
+    def get(self, *, default: T | None = None, **kw: str | None) -> T | None:
         if len(kw) != 1:
             raise TypeError("Only one criteria may be given")
         field, value = kw.popitem()
@@ -174,7 +190,7 @@ def get(
             return default
 
     @lazy_load
-    def lookup(self, value: str) -> Type:
+    def lookup(self, value: str) -> T:
         if not isinstance(value, str):
             raise LookupError()
 
diff --git a/libs/pycountry/locales/ab/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ab/LC_MESSAGES/iso3166-1.mo
index 09f6341ab8..623eeef6ba 100644
Binary files a/libs/pycountry/locales/ab/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ab/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ab/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/ab/LC_MESSAGES/iso639-5.mo
index 2193d1d3fe..3b59eb58eb 100644
Binary files a/libs/pycountry/locales/ab/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/ab/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/ace/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ace/LC_MESSAGES/iso3166-1.mo
index 3294922fd4..a5af45fa9f 100644
Binary files a/libs/pycountry/locales/ace/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ace/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ak/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ak/LC_MESSAGES/iso3166-1.mo
index 4277660655..6b3ba42972 100644
Binary files a/libs/pycountry/locales/ak/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ak/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/am/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/am/LC_MESSAGES/iso3166-3.mo
index b009b1d468..657839801f 100644
Binary files a/libs/pycountry/locales/am/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/am/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ar/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ar/LC_MESSAGES/iso15924.mo
index b09763ee94..3163eec7ab 100644
Binary files a/libs/pycountry/locales/ar/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ar/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ar/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ar/LC_MESSAGES/iso4217.mo
index 663726c43c..c05493e02b 100644
Binary files a/libs/pycountry/locales/ar/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ar/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ar/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ar/LC_MESSAGES/iso639-3.mo
index 8749de6987..17d4ea13ab 100644
Binary files a/libs/pycountry/locales/ar/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ar/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/as/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/as/LC_MESSAGES/iso3166-1.mo
index e30b1354ec..2108533ae1 100644
Binary files a/libs/pycountry/locales/as/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/as/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/as/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/as/LC_MESSAGES/iso3166-3.mo
index 3a85d8670b..07672fc31c 100644
Binary files a/libs/pycountry/locales/as/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/as/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ast/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ast/LC_MESSAGES/iso15924.mo
index 1510c57a87..d339adc8a0 100644
Binary files a/libs/pycountry/locales/ast/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ast/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-1.mo
index c42640f8c0..9073e0a868 100644
Binary files a/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo
index d3c3d7e1e6..5c80dac79f 100644
Binary files a/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ast/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ast/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ast/LC_MESSAGES/iso4217.mo
index 76e3883c71..d8fb7ec43e 100644
Binary files a/libs/pycountry/locales/ast/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ast/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ast/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ast/LC_MESSAGES/iso639-3.mo
index 9c9d7a139d..1d27b3a708 100644
Binary files a/libs/pycountry/locales/ast/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ast/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ay/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ay/LC_MESSAGES/iso3166-1.mo
index 722bb6dec3..de0d085ec7 100644
Binary files a/libs/pycountry/locales/ay/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ay/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/az/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/az/LC_MESSAGES/iso3166-3.mo
index 8dc5cc7005..afdeb5f0ae 100644
Binary files a/libs/pycountry/locales/az/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/az/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso15924.mo
new file mode 100644
index 0000000000..514de722ae
Binary files /dev/null and b/libs/pycountry/locales/ba/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo
index fed8c412ad..3ae31d1cee 100644
Binary files a/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..d07e1897bb
Binary files /dev/null and b/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-3.mo
new file mode 100644
index 0000000000..aa3aef03e1
Binary files /dev/null and b/libs/pycountry/locales/ba/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso4217.mo
new file mode 100644
index 0000000000..375c91dc58
Binary files /dev/null and b/libs/pycountry/locales/ba/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso639-3.mo
new file mode 100644
index 0000000000..361b2251b5
Binary files /dev/null and b/libs/pycountry/locales/ba/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ba/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/ba/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 0000000000..efcee93be4
Binary files /dev/null and b/libs/pycountry/locales/ba/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/bar/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/bar/LC_MESSAGES/iso3166-1.mo
index 1f6607e527..f340b3ade3 100644
Binary files a/libs/pycountry/locales/bar/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/bar/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/be/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/be/LC_MESSAGES/iso15924.mo
index 02e6137107..8bd91b9f00 100644
Binary files a/libs/pycountry/locales/be/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/be/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/be/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/be/LC_MESSAGES/iso3166-2.mo
index ccd9fc0ed2..331c9f0f69 100644
Binary files a/libs/pycountry/locales/be/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/be/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/be/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/be/LC_MESSAGES/iso4217.mo
index 168318d5e5..621c0522b7 100644
Binary files a/libs/pycountry/locales/be/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/be/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/be/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/be/LC_MESSAGES/iso639-3.mo
index f69e8c204a..7bbb8b011c 100644
Binary files a/libs/pycountry/locales/be/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/be/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/bg/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/bg/LC_MESSAGES/iso15924.mo
index dbfdb6ffe8..7f318e088d 100644
Binary files a/libs/pycountry/locales/bg/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/bg/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo
index 958264c183..d8392481f5 100644
Binary files a/libs/pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/bg/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/bg/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/bg/LC_MESSAGES/iso639-3.mo
index 0c92dc9c43..1afc3d65d2 100644
Binary files a/libs/pycountry/locales/bg/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/bg/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/bi/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/bi/LC_MESSAGES/iso3166-1.mo
index 3ca1db7a31..3c6d332918 100644
Binary files a/libs/pycountry/locales/bi/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/bi/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/bn/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/bn/LC_MESSAGES/iso4217.mo
index d6c0f08fbd..1204cad391 100644
Binary files a/libs/pycountry/locales/bn/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/bn/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/bn/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/bn/LC_MESSAGES/iso639-3.mo
index 17012ef782..1d6a5635e4 100644
Binary files a/libs/pycountry/locales/bn/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/bn/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/bn_BD/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/bn_BD/LC_MESSAGES/iso15924.mo
index bee7a566bf..56d41b474c 100644
Binary files a/libs/pycountry/locales/bn_BD/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/bn_BD/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/br/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/br/LC_MESSAGES/iso15924.mo
index 46130822ff..f3bd864d8f 100644
Binary files a/libs/pycountry/locales/br/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/br/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/br/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/br/LC_MESSAGES/iso3166-1.mo
index 1f793fb525..615d99f9f6 100644
Binary files a/libs/pycountry/locales/br/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/br/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/br/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/br/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..1d4907487a
Binary files /dev/null and b/libs/pycountry/locales/br/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/br/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/br/LC_MESSAGES/iso4217.mo
index 4ba7f93a32..67bc177d92 100644
Binary files a/libs/pycountry/locales/br/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/br/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/br/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/br/LC_MESSAGES/iso639-3.mo
index a194e2e8d7..3bc1a2cef2 100644
Binary files a/libs/pycountry/locales/br/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/br/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/byn/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/byn/LC_MESSAGES/iso3166-3.mo
index 6aa6db6f45..99209c83ef 100644
Binary files a/libs/pycountry/locales/byn/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/byn/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ca/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ca/LC_MESSAGES/iso15924.mo
index a06cc55429..4437b9a238 100644
Binary files a/libs/pycountry/locales/ca/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ca/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-1.mo
index 9b00915c29..b8b98816f2 100644
Binary files a/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-2.mo
index 8416b0cbe7..84a8fd2f04 100644
Binary files a/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ca/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ca/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ca/LC_MESSAGES/iso4217.mo
index f57c5f6dcd..6a42259382 100644
Binary files a/libs/pycountry/locales/ca/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ca/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ca/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ca/LC_MESSAGES/iso639-3.mo
index 4db8b6bf13..970d4283c7 100644
Binary files a/libs/pycountry/locales/ca/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ca/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ckb/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ckb/LC_MESSAGES/iso15924.mo
new file mode 100644
index 0000000000..87adabc23b
Binary files /dev/null and b/libs/pycountry/locales/ckb/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ckb/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ckb/LC_MESSAGES/iso3166-1.mo
index 11b3a5e331..9f704759bc 100644
Binary files a/libs/pycountry/locales/ckb/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ckb/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ckb/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ckb/LC_MESSAGES/iso639-3.mo
new file mode 100644
index 0000000000..1e9b85b987
Binary files /dev/null and b/libs/pycountry/locales/ckb/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/crh/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/crh/LC_MESSAGES/iso639-3.mo
index dac55fe8a5..23a5253408 100644
Binary files a/libs/pycountry/locales/crh/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/crh/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/cs/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/cs/LC_MESSAGES/iso15924.mo
index 2494329057..ecc08e6da1 100644
Binary files a/libs/pycountry/locales/cs/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/cs/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/cs/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/cs/LC_MESSAGES/iso4217.mo
index 0dfefee974..3aef77065c 100644
Binary files a/libs/pycountry/locales/cs/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/cs/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/cs/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/cs/LC_MESSAGES/iso639-3.mo
index 864f3d6357..19eb416283 100644
Binary files a/libs/pycountry/locales/cs/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/cs/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/cv/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/cv/LC_MESSAGES/iso15924.mo
index 733492fb3c..c9528dbd25 100644
Binary files a/libs/pycountry/locales/cv/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/cv/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/cv/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/cv/LC_MESSAGES/iso3166-1.mo
index 31e566f4a0..1df270884c 100644
Binary files a/libs/pycountry/locales/cv/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/cv/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/cy/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/cy/LC_MESSAGES/iso15924.mo
index 871bd59815..a619d2a463 100644
Binary files a/libs/pycountry/locales/cy/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/cy/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/da/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/da/LC_MESSAGES/iso15924.mo
index f1d545552b..3138e5708b 100644
Binary files a/libs/pycountry/locales/da/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/da/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/da/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/da/LC_MESSAGES/iso3166-2.mo
index 71471b21b4..3f210bbb34 100644
Binary files a/libs/pycountry/locales/da/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/da/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/da/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/da/LC_MESSAGES/iso4217.mo
index 49775aadf9..2c865ec74e 100644
Binary files a/libs/pycountry/locales/da/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/da/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/da/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/da/LC_MESSAGES/iso639-3.mo
index e8987d6bfd..4ff132f281 100644
Binary files a/libs/pycountry/locales/da/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/da/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/de/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/de/LC_MESSAGES/iso15924.mo
index aa57692104..16641eddb3 100644
Binary files a/libs/pycountry/locales/de/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/de/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/de/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/de/LC_MESSAGES/iso3166-2.mo
index a4fb7d8ae5..f40849bb1f 100644
Binary files a/libs/pycountry/locales/de/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/de/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/de/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/de/LC_MESSAGES/iso4217.mo
index 02594130b0..131ad011e8 100644
Binary files a/libs/pycountry/locales/de/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/de/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/de/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/de/LC_MESSAGES/iso639-3.mo
index c48f5d092f..eb27abcc19 100644
Binary files a/libs/pycountry/locales/de/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/de/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ee/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ee/LC_MESSAGES/iso3166-1.mo
index 5ffd23198a..aee7861873 100644
Binary files a/libs/pycountry/locales/ee/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ee/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/el/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/el/LC_MESSAGES/iso15924.mo
index b24d46cb36..4aece72500 100644
Binary files a/libs/pycountry/locales/el/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/el/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/el/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/el/LC_MESSAGES/iso4217.mo
index c08a168e6d..7cfd836cf3 100644
Binary files a/libs/pycountry/locales/el/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/el/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/el/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/el/LC_MESSAGES/iso639-3.mo
index 591d3ff7f4..fc3e18f2a3 100644
Binary files a/libs/pycountry/locales/el/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/el/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/en/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/en/LC_MESSAGES/iso3166-2.mo
index c8a4213b10..d8c96da894 100644
Binary files a/libs/pycountry/locales/en/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/en/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/eo/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/eo/LC_MESSAGES/iso15924.mo
index 04c35cd16c..8a3e206819 100644
Binary files a/libs/pycountry/locales/eo/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/eo/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo
index 2a3351dd5c..c373d48ed2 100644
Binary files a/libs/pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/eo/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/eo/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/eo/LC_MESSAGES/iso4217.mo
index b2fdb37358..f47abe1e51 100644
Binary files a/libs/pycountry/locales/eo/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/eo/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/eo/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/eo/LC_MESSAGES/iso639-3.mo
index 151d60f0db..50852dbc38 100644
Binary files a/libs/pycountry/locales/eo/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/eo/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/es/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso15924.mo
index 22f1649275..7da8469308 100644
Binary files a/libs/pycountry/locales/es/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/es/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/es/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso3166-1.mo
index 6a8cbefa6f..9e5dde4c2c 100644
Binary files a/libs/pycountry/locales/es/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/es/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/es/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso3166-2.mo
index 02967c2d3f..5e211ecccb 100644
Binary files a/libs/pycountry/locales/es/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/es/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/es/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso4217.mo
index 94e820e5b7..d524f98fb1 100644
Binary files a/libs/pycountry/locales/es/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/es/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/es/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/es/LC_MESSAGES/iso639-3.mo
index 58da57013f..3e6ecc38a5 100644
Binary files a/libs/pycountry/locales/es/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/es/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/et/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/et/LC_MESSAGES/iso15924.mo
index b91269c6ff..4708e80699 100644
Binary files a/libs/pycountry/locales/et/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/et/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/et/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/et/LC_MESSAGES/iso3166-2.mo
index a91e2cf3dc..4dafd84089 100644
Binary files a/libs/pycountry/locales/et/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/et/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/et/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/et/LC_MESSAGES/iso4217.mo
index d30ce66838..2584255428 100644
Binary files a/libs/pycountry/locales/et/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/et/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/et/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/et/LC_MESSAGES/iso639-3.mo
index ccf9c094ba..6b14f401b1 100644
Binary files a/libs/pycountry/locales/et/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/et/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/eu/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/eu/LC_MESSAGES/iso15924.mo
index bbb7cca31f..0f0bc743df 100644
Binary files a/libs/pycountry/locales/eu/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/eu/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/eu/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/eu/LC_MESSAGES/iso639-3.mo
index d3395e7470..9c6d43b452 100644
Binary files a/libs/pycountry/locales/eu/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/eu/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/fa/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/fa/LC_MESSAGES/iso15924.mo
index e9752e2611..8ce3d7694f 100644
Binary files a/libs/pycountry/locales/fa/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/fa/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-2.mo
index 095f574587..a31d43ce42 100644
Binary files a/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-3.mo
index 4cbe061971..8241170920 100644
Binary files a/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/fa/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/fi/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/fi/LC_MESSAGES/iso15924.mo
index c5df0cc99e..13bbb2ea05 100644
Binary files a/libs/pycountry/locales/fi/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/fi/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-1.mo
index 3701272739..de7e952b5e 100644
Binary files a/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-2.mo
index c4444d1abb..54db1f712e 100644
Binary files a/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-3.mo
index 0d0164e2a8..caf3aa7fcc 100644
Binary files a/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/fi/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/fi/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/fi/LC_MESSAGES/iso4217.mo
index d77bb3586c..9b25558651 100644
Binary files a/libs/pycountry/locales/fi/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/fi/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/fi/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/fi/LC_MESSAGES/iso639-3.mo
index a097d20a7f..01ef665a1c 100644
Binary files a/libs/pycountry/locales/fi/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/fi/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/fil/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/fil/LC_MESSAGES/iso15924.mo
index e8e857c3a9..e676af4dfb 100644
Binary files a/libs/pycountry/locales/fil/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/fil/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/fo/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/fo/LC_MESSAGES/iso3166-3.mo
index 4e36f12c00..22c68fdf19 100644
Binary files a/libs/pycountry/locales/fo/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/fo/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/fr/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso15924.mo
index 62b78b1843..7254871776 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo
index e55fc69c8a..59baf4f111 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/fr/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso4217.mo
index a73aa850da..537402b615 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/fr/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/fr/LC_MESSAGES/iso639-3.mo
index d805737466..ba25f1c5ef 100644
Binary files a/libs/pycountry/locales/fr/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/fr/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo
index 7e3ac265ff..3491d5cf48 100644
Binary files a/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/fur/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-1.mo
index 529b111dff..ea17ddd279 100644
Binary files a/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-2.mo
index e4e5029443..4bb8a41181 100644
Binary files a/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-3.mo
index 0a9dd28cd0..2ddc4fbb4d 100644
Binary files a/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ga/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ga/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ga/LC_MESSAGES/iso4217.mo
index a8a49df94e..389d37e329 100644
Binary files a/libs/pycountry/locales/ga/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ga/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ga/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ga/LC_MESSAGES/iso639-3.mo
index c5611168eb..24fd5fad5f 100644
Binary files a/libs/pycountry/locales/ga/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ga/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/gez/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/gez/LC_MESSAGES/iso3166-3.mo
index aff223a46d..aeee6e0483 100644
Binary files a/libs/pycountry/locales/gez/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/gez/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/gl/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/gl/LC_MESSAGES/iso15924.mo
index 05e1440847..827d2407ba 100644
Binary files a/libs/pycountry/locales/gl/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/gl/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/gl/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/gl/LC_MESSAGES/iso4217.mo
index 56657f816f..226dc72ec9 100644
Binary files a/libs/pycountry/locales/gl/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/gl/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/gl/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/gl/LC_MESSAGES/iso639-3.mo
index 4dcc913ddd..1a92384481 100644
Binary files a/libs/pycountry/locales/gl/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/gl/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/gu/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/gu/LC_MESSAGES/iso639-3.mo
index ba1d2c07e8..4818b4069b 100644
Binary files a/libs/pycountry/locales/gu/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/gu/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/haw/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/haw/LC_MESSAGES/iso3166-3.mo
index 525110273e..796560a0b5 100644
Binary files a/libs/pycountry/locales/haw/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/haw/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/he/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/he/LC_MESSAGES/iso15924.mo
index f91a8207e7..74cb973687 100644
Binary files a/libs/pycountry/locales/he/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/he/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/he/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/he/LC_MESSAGES/iso3166-2.mo
index c16da1986a..4dc6376bb6 100644
Binary files a/libs/pycountry/locales/he/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/he/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/he/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/he/LC_MESSAGES/iso639-3.mo
index 140986ab9f..34180be692 100644
Binary files a/libs/pycountry/locales/he/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/he/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso15924.mo
new file mode 100644
index 0000000000..90eebd1e3c
Binary files /dev/null and b/libs/pycountry/locales/hi/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-1.mo
index c1b737970d..e4097b5a78 100644
Binary files a/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..aaa8cca382
Binary files /dev/null and b/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-3.mo
index 6b8879abc2..023859a5f5 100644
Binary files a/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/hi/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso4217.mo
new file mode 100644
index 0000000000..4ed3719c95
Binary files /dev/null and b/libs/pycountry/locales/hi/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso639-3.mo
index 32fab94a8b..a2cde724b3 100644
Binary files a/libs/pycountry/locales/hi/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/hi/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/hi/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/hi/LC_MESSAGES/iso639-5.mo
index ddb95fcd4d..050c17a9f8 100644
Binary files a/libs/pycountry/locales/hi/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/hi/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/hr/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/hr/LC_MESSAGES/iso15924.mo
index 46d4653416..ba7a601ed5 100644
Binary files a/libs/pycountry/locales/hr/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/hr/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-1.mo
index 028574d9d2..1e1fff6cfc 100644
Binary files a/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-3.mo
index 3c621207f6..d4e1b73776 100644
Binary files a/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/hr/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/hr/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/hr/LC_MESSAGES/iso4217.mo
index 9dbfae6b44..96662e0848 100644
Binary files a/libs/pycountry/locales/hr/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/hr/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/hr/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/hr/LC_MESSAGES/iso639-3.mo
index 73b6468a5e..b666e0c748 100644
Binary files a/libs/pycountry/locales/hr/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/hr/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/hu/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso15924.mo
index 7de88e89ac..cf6bcb63c0 100644
Binary files a/libs/pycountry/locales/hu/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/hu/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-1.mo
index 36a7cf9231..deb0ce1b6a 100644
Binary files a/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo
index b1b580d562..4c489cd759 100644
Binary files a/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-3.mo
index 5c5c60ce6d..3f081b3342 100644
Binary files a/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/hu/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/hu/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso4217.mo
index 0da2c7d5d2..9697b1178e 100644
Binary files a/libs/pycountry/locales/hu/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/hu/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/hu/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/hu/LC_MESSAGES/iso639-3.mo
index f50f62568b..2cbc14172b 100644
Binary files a/libs/pycountry/locales/hu/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/hu/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-1.mo
index 7805d35f32..627daa3194 100644
Binary files a/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-3.mo
index 8f52c3d373..0f85480ead 100644
Binary files a/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/hy/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ia/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ia/LC_MESSAGES/iso15924.mo
index 64396b5063..da1a1054e7 100644
Binary files a/libs/pycountry/locales/ia/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ia/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/id/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/id/LC_MESSAGES/iso15924.mo
index fa262dbde5..b475fc5320 100644
Binary files a/libs/pycountry/locales/id/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/id/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/id/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/id/LC_MESSAGES/iso3166-2.mo
index 81ff7c71ce..22fb5e5da6 100644
Binary files a/libs/pycountry/locales/id/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/id/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/id/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/id/LC_MESSAGES/iso4217.mo
index 084bf15c83..f7605abfd1 100644
Binary files a/libs/pycountry/locales/id/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/id/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/id/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/id/LC_MESSAGES/iso639-3.mo
index 1b70ac7943..4a9a5305ae 100644
Binary files a/libs/pycountry/locales/id/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/id/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/id/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/id/LC_MESSAGES/iso639-5.mo
index 1774f29a64..e9ecd12e44 100644
Binary files a/libs/pycountry/locales/id/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/id/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/is/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/is/LC_MESSAGES/iso15924.mo
index 49c4ceccc3..9e37d574ae 100644
Binary files a/libs/pycountry/locales/is/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/is/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/is/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/is/LC_MESSAGES/iso3166-2.mo
index 0b4b2b28a5..7f0f3bc14e 100644
Binary files a/libs/pycountry/locales/is/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/is/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/is/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/is/LC_MESSAGES/iso4217.mo
index f8e25cd336..96abf19932 100644
Binary files a/libs/pycountry/locales/is/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/is/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/is/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/is/LC_MESSAGES/iso639-3.mo
index c6b3dec5bc..1a636a003b 100644
Binary files a/libs/pycountry/locales/is/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/is/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/it/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso15924.mo
index f8c5f967bf..bfc23258c3 100644
Binary files a/libs/pycountry/locales/it/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/it/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/it/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso3166-1.mo
index c85f044b6c..427383f167 100644
Binary files a/libs/pycountry/locales/it/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/it/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/it/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso3166-2.mo
index ce73070268..2f5f8ac343 100644
Binary files a/libs/pycountry/locales/it/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/it/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/it/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso4217.mo
index 0676d45989..c8694943f0 100644
Binary files a/libs/pycountry/locales/it/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/it/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/it/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/it/LC_MESSAGES/iso639-3.mo
index 41ea663720..1cd5cc77d0 100644
Binary files a/libs/pycountry/locales/it/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/it/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ja/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ja/LC_MESSAGES/iso15924.mo
index c547a64241..be2e479e29 100644
Binary files a/libs/pycountry/locales/ja/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ja/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-1.mo
index e4501e1ba0..43d70b813e 100644
Binary files a/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-2.mo
index 4d483138ed..d009857ab0 100644
Binary files a/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ja/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ja/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ja/LC_MESSAGES/iso4217.mo
index e69f69a4c4..088bae4310 100644
Binary files a/libs/pycountry/locales/ja/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ja/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ja/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ja/LC_MESSAGES/iso639-3.mo
index 2ac10ba115..ba57e42a5c 100644
Binary files a/libs/pycountry/locales/ja/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ja/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/jam/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/jam/LC_MESSAGES/iso3166-1.mo
index 59023fef14..a8a8f77527 100644
Binary files a/libs/pycountry/locales/jam/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/jam/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ka/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ka/LC_MESSAGES/iso15924.mo
index 124d5a4941..357b0e3ba9 100644
Binary files a/libs/pycountry/locales/ka/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ka/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ka/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ka/LC_MESSAGES/iso3166-2.mo
index 76e9a5bccc..3b9fc2594f 100644
Binary files a/libs/pycountry/locales/ka/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ka/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ka/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ka/LC_MESSAGES/iso4217.mo
index 40d0e71263..f6f2424936 100644
Binary files a/libs/pycountry/locales/ka/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ka/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ka/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ka/LC_MESSAGES/iso639-3.mo
index 215739ee15..b2f1766a5d 100644
Binary files a/libs/pycountry/locales/ka/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ka/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/kab/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso15924.mo
index 5ee7f7a32f..17a14f7806 100644
Binary files a/libs/pycountry/locales/kab/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/kab/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-1.mo
index 7a34ec436c..aa0ee820cc 100644
Binary files a/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo
index 3c7467b120..7aa5037b75 100644
Binary files a/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-3.mo
new file mode 100644
index 0000000000..7e94c00794
Binary files /dev/null and b/libs/pycountry/locales/kab/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/kab/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso639-3.mo
index 04d79b0cb7..45628cd098 100644
Binary files a/libs/pycountry/locales/kab/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/kab/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/kab/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/kab/LC_MESSAGES/iso639-5.mo
index 1d570453dd..ecd568a32e 100644
Binary files a/libs/pycountry/locales/kab/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/kab/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo
index a7c5b2c0f8..df5eb58841 100644
Binary files a/libs/pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/kl/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/km/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/km/LC_MESSAGES/iso3166-2.mo
index 0bd63b419c..67e190c682 100644
Binary files a/libs/pycountry/locales/km/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/km/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/km/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/km/LC_MESSAGES/iso4217.mo
index e152336c14..1ff7adabb1 100644
Binary files a/libs/pycountry/locales/km/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/km/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo
index ab691df91b..ade8617855 100644
Binary files a/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo
index 4ea4ca4808..287e811e43 100644
Binary files a/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/kmr/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/kn/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/kn/LC_MESSAGES/iso3166-3.mo
index afbace4521..1d771c2b2e 100644
Binary files a/libs/pycountry/locales/kn/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/kn/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/kn/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/kn/LC_MESSAGES/iso639-3.mo
index 89a8eeeea8..0a58048f23 100644
Binary files a/libs/pycountry/locales/kn/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/kn/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ko/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso15924.mo
index 7fb82448ec..7f83444f75 100644
Binary files a/libs/pycountry/locales/ko/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ko/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo
index c9b613abc0..68d7c9533e 100644
Binary files a/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ko/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ko/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso4217.mo
index 1080a48bd5..c0e965ab34 100644
Binary files a/libs/pycountry/locales/ko/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ko/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ko/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ko/LC_MESSAGES/iso639-3.mo
index d91b12925f..c9c94a6927 100644
Binary files a/libs/pycountry/locales/ko/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ko/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso15924.mo
new file mode 100644
index 0000000000..fac2a7afad
Binary files /dev/null and b/libs/pycountry/locales/lo/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-1.mo
index 4456314088..9cf6c48dc5 100644
Binary files a/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..0c116f805c
Binary files /dev/null and b/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-3.mo
new file mode 100644
index 0000000000..ab9af949b1
Binary files /dev/null and b/libs/pycountry/locales/lo/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso4217.mo
new file mode 100644
index 0000000000..0ad468afe7
Binary files /dev/null and b/libs/pycountry/locales/lo/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso639-3.mo
new file mode 100644
index 0000000000..43d433f2d2
Binary files /dev/null and b/libs/pycountry/locales/lo/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/lo/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/lo/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 0000000000..a8c8fca546
Binary files /dev/null and b/libs/pycountry/locales/lo/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso15924.mo
index b1faf83711..ea6c7cc7ab 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo
index 694745b41d..7bc88d2296 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo
index 500b1ac0c7..ddc0acf757 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso4217.mo
index 1ac600b9da..019289fdaf 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso639-3.mo
index 2a6a34567f..3a2f659c95 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo
index 295c093600..f96b814df2 100644
Binary files a/libs/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/lt/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/lv/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/lv/LC_MESSAGES/iso15924.mo
index 527603e459..8968cb280b 100644
Binary files a/libs/pycountry/locales/lv/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/lv/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/lv/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/lv/LC_MESSAGES/iso4217.mo
index e8d3fd7f9e..9eddf6d49c 100644
Binary files a/libs/pycountry/locales/lv/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/lv/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/lv/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/lv/LC_MESSAGES/iso639-3.mo
index a0f56160f5..c3e4df7cf5 100644
Binary files a/libs/pycountry/locales/lv/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/lv/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/mi/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/mi/LC_MESSAGES/iso3166-3.mo
index a31d9f3a02..bcf1fc2f94 100644
Binary files a/libs/pycountry/locales/mi/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/mi/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ml/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ml/LC_MESSAGES/iso15924.mo
index d169c8f101..7357469f05 100644
Binary files a/libs/pycountry/locales/ml/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ml/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo
index 837ada1bb5..3269dc7026 100644
Binary files a/libs/pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/mn/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/mn/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/mn/LC_MESSAGES/iso4217.mo
index 05173c1def..2e2d2d030b 100644
Binary files a/libs/pycountry/locales/mn/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/mn/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/mr/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/mr/LC_MESSAGES/iso639-3.mo
index 40c0cec573..8f83ebdf36 100644
Binary files a/libs/pycountry/locales/mr/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/mr/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ms/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ms/LC_MESSAGES/iso3166-3.mo
index de59ce4aaf..3e18efd3c7 100644
Binary files a/libs/pycountry/locales/ms/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ms/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/mt/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/mt/LC_MESSAGES/iso3166-3.mo
index 1f399179a0..573aaf7d83 100644
Binary files a/libs/pycountry/locales/mt/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/mt/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/mt/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/mt/LC_MESSAGES/iso639-3.mo
index 93027f3407..7df2e4e956 100644
Binary files a/libs/pycountry/locales/mt/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/mt/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo
index 85b2c590e0..c904432760 100644
Binary files a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo
index e121d6c21f..ac0d7b190f 100644
Binary files a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo
index 7c59228100..46674ebcf6 100644
Binary files a/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/nb_NO/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/nl/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/nl/LC_MESSAGES/iso15924.mo
index 1da79d79e2..338f4b0b38 100644
Binary files a/libs/pycountry/locales/nl/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/nl/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo
index 474d5a3808..3334a8915b 100644
Binary files a/libs/pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/nl/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/nl/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/nl/LC_MESSAGES/iso4217.mo
index 444308b5f0..8b2457cc54 100644
Binary files a/libs/pycountry/locales/nl/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/nl/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/nl/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/nl/LC_MESSAGES/iso639-3.mo
index 3627a9b408..d44a9123fe 100644
Binary files a/libs/pycountry/locales/nl/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/nl/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/nn/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/nn/LC_MESSAGES/iso15924.mo
index d9721924c7..b8d798020f 100644
Binary files a/libs/pycountry/locales/nn/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/nn/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/nn/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/nn/LC_MESSAGES/iso4217.mo
index d25f28bf96..dc5eb7e366 100644
Binary files a/libs/pycountry/locales/nn/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/nn/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/nso/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/nso/LC_MESSAGES/iso3166-3.mo
index ae8a2bc7df..07a94d6d69 100644
Binary files a/libs/pycountry/locales/nso/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/nso/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/oc/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso15924.mo
index 153d4f2380..ae29169a18 100644
Binary files a/libs/pycountry/locales/oc/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/oc/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-1.mo
index 0f71422334..c23581ac3d 100644
Binary files a/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo
index e038825f97..bf48f0eeb4 100644
Binary files a/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/oc/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/oc/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso4217.mo
index 5031841ee1..3ec6c18f01 100644
Binary files a/libs/pycountry/locales/oc/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/oc/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/oc/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso639-3.mo
index 804edfa487..c70f72d6e8 100644
Binary files a/libs/pycountry/locales/oc/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/oc/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/oc/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/oc/LC_MESSAGES/iso639-5.mo
index ceae311081..5c56e37d79 100644
Binary files a/libs/pycountry/locales/oc/LC_MESSAGES/iso639-5.mo and b/libs/pycountry/locales/oc/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/or/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/or/LC_MESSAGES/iso639-3.mo
index 8f41e1ffb9..6a1c078552 100644
Binary files a/libs/pycountry/locales/or/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/or/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso15924.mo
new file mode 100644
index 0000000000..2926b3230d
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-1.mo
new file mode 100644
index 0000000000..8471ce48f4
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..8df5e412ed
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-3.mo
new file mode 100644
index 0000000000..1e0d03deaf
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso4217.mo
new file mode 100644
index 0000000000..e5b886d0cc
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso639-3.mo
new file mode 100644
index 0000000000..446af39db5
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ota/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/ota/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 0000000000..1a1d40af98
Binary files /dev/null and b/libs/pycountry/locales/ota/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/pa/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/pa/LC_MESSAGES/iso639-3.mo
index b853619697..d11436ef4a 100644
Binary files a/libs/pycountry/locales/pa/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/pa/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso15924.mo
index 395e4771b4..2e88a02760 100644
Binary files a/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso3166-3.mo
index 833a5ec82f..7da5105093 100644
Binary files a/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/pa_PK/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo
index 188a02cba6..1c0a8df202 100644
Binary files a/libs/pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/pap/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/pl/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/pl/LC_MESSAGES/iso15924.mo
index cfb37d7af0..e6b63b3493 100644
Binary files a/libs/pycountry/locales/pl/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/pl/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/pl/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/pl/LC_MESSAGES/iso3166-2.mo
index bf32f44279..df2a25b423 100644
Binary files a/libs/pycountry/locales/pl/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/pl/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/pl/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/pl/LC_MESSAGES/iso4217.mo
index 065ce24eed..ff74973244 100644
Binary files a/libs/pycountry/locales/pl/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/pl/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/pl/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/pl/LC_MESSAGES/iso639-3.mo
index c462ad67d0..822c52b43a 100644
Binary files a/libs/pycountry/locales/pl/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/pl/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ps/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ps/LC_MESSAGES/iso3166-3.mo
index f94fd29360..5f1a9f7869 100644
Binary files a/libs/pycountry/locales/ps/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ps/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/pt/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/pt/LC_MESSAGES/iso15924.mo
index 86b484020f..1e0126bccb 100644
Binary files a/libs/pycountry/locales/pt/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/pt/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-1.mo
index c243a4aa1a..960fe3efd5 100644
Binary files a/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..929c2d76f7
Binary files /dev/null and b/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-3.mo
index 6591107711..a0aa0c9759 100644
Binary files a/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/pt/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/pt/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/pt/LC_MESSAGES/iso4217.mo
index 1e4bf45d1f..ba19440070 100644
Binary files a/libs/pycountry/locales/pt/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/pt/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/pt/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/pt/LC_MESSAGES/iso639-3.mo
index e4b946f1fb..a402fdcb3b 100644
Binary files a/libs/pycountry/locales/pt/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/pt/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso15924.mo
index 8a9e4b36b2..145c981051 100644
Binary files a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-2.mo
index 86598e253d..7e2075d4a1 100644
Binary files a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso4217.mo
index 43991bb9f6..dc8572de38 100644
Binary files a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso639-3.mo
index 23af2d7d09..965d54d2d5 100644
Binary files a/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/pt_BR/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ro/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso15924.mo
index 8402eea4c4..dcce506e16 100644
Binary files a/libs/pycountry/locales/ro/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ro/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo
index d6e45254c1..617530085a 100644
Binary files a/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ro/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ro/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso4217.mo
index d27a289c1f..d72fdb0f4e 100644
Binary files a/libs/pycountry/locales/ro/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ro/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ro/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ro/LC_MESSAGES/iso639-3.mo
index a2fb70290e..3e2ea28eb1 100644
Binary files a/libs/pycountry/locales/ro/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ro/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo
index 35d1af7264..d951fe0015 100644
Binary files a/libs/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ro_MD/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso15924.mo
index d254a0a4b1..959287a3d5 100644
Binary files a/libs/pycountry/locales/ru/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ru/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo
index 0826877a2d..44358686d0 100644
Binary files a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo
index 63fa853e17..19fb3a3049 100644
Binary files a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-3.mo
index 9bf4d1aafd..bba5636811 100644
Binary files a/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ru/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso4217.mo
index aefa88b6e1..eae447cc1f 100644
Binary files a/libs/pycountry/locales/ru/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ru/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ru/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ru/LC_MESSAGES/iso639-3.mo
index b85ce6dcb6..d1f1035d07 100644
Binary files a/libs/pycountry/locales/ru/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ru/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/rw/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/rw/LC_MESSAGES/iso3166-3.mo
index 318872b727..5e0119a75f 100644
Binary files a/libs/pycountry/locales/rw/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/rw/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/rw/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/rw/LC_MESSAGES/iso4217.mo
index d74e510675..f3133151c0 100644
Binary files a/libs/pycountry/locales/rw/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/rw/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/rw/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/rw/LC_MESSAGES/iso639-3.mo
index 627a6c41ac..b6724d6317 100644
Binary files a/libs/pycountry/locales/rw/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/rw/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sc/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/sc/LC_MESSAGES/iso15924.mo
index 72e254f1ca..5cd4b4acf6 100644
Binary files a/libs/pycountry/locales/sc/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/sc/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo
index 6f7eeeb9d0..ebe36c6e3b 100644
Binary files a/libs/pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sc/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sc/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sc/LC_MESSAGES/iso4217.mo
index 63c4dbff8f..c16cd5e6ab 100644
Binary files a/libs/pycountry/locales/sc/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sc/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sc/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sc/LC_MESSAGES/iso639-3.mo
index 019e17cc47..3c88e72652 100644
Binary files a/libs/pycountry/locales/sc/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sc/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo
index 8ec898c8c0..06ae3ff0d2 100644
Binary files a/libs/pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/sd/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/si/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/si/LC_MESSAGES/iso15924.mo
index 6ddb6654b0..fb2dc4d3ef 100644
Binary files a/libs/pycountry/locales/si/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/si/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo
index 6ffeb35af3..ef8fd3f2d2 100644
Binary files a/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sk/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sk/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sk/LC_MESSAGES/iso4217.mo
index ffe0e99d3e..9be98d5016 100644
Binary files a/libs/pycountry/locales/sk/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sk/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sk/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sk/LC_MESSAGES/iso639-3.mo
index 11399ae656..b484cb8a56 100644
Binary files a/libs/pycountry/locales/sk/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sk/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sk/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/sk/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 0000000000..651b34b532
Binary files /dev/null and b/libs/pycountry/locales/sk/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/sl/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/sl/LC_MESSAGES/iso15924.mo
index 350c7539bc..0c05c409b3 100644
Binary files a/libs/pycountry/locales/sl/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/sl/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sl/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sl/LC_MESSAGES/iso3166-2.mo
index 67e5bc37ea..f1b70c96b7 100644
Binary files a/libs/pycountry/locales/sl/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sl/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sl/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sl/LC_MESSAGES/iso4217.mo
index 4b6e8aeb75..cc367e2914 100644
Binary files a/libs/pycountry/locales/sl/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sl/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sl/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sl/LC_MESSAGES/iso639-3.mo
index aef4a572f7..687d0b001b 100644
Binary files a/libs/pycountry/locales/sl/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sl/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/so/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/so/LC_MESSAGES/iso15924.mo
index 7a7bfa63ac..6831f741b7 100644
Binary files a/libs/pycountry/locales/so/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/so/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/so/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/so/LC_MESSAGES/iso3166-2.mo
index 52262df100..e4c56e95b3 100644
Binary files a/libs/pycountry/locales/so/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/so/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/so/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/so/LC_MESSAGES/iso4217.mo
index dc44d0cccb..1d0a7cfb1f 100644
Binary files a/libs/pycountry/locales/so/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/so/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/so/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/so/LC_MESSAGES/iso639-3.mo
index cfe9bb0b84..596f84e9e9 100644
Binary files a/libs/pycountry/locales/so/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/so/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sq/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso15924.mo
index 436250eb6f..eb74f152a9 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-1.mo
index 4ac70ed01c..a8ce3c24c5 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo
index 8c41c3e94d..2632813a82 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-3.mo
index d715df0063..96edcc3456 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/sq/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso4217.mo
index baade15f85..361b747020 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sq/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sq/LC_MESSAGES/iso639-3.mo
index a0b9ef86ec..d224946530 100644
Binary files a/libs/pycountry/locales/sq/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sq/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sr/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/sr/LC_MESSAGES/iso15924.mo
index 533c89ea74..029ab3e7dd 100644
Binary files a/libs/pycountry/locales/sr/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/sr/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sr/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sr/LC_MESSAGES/iso3166-2.mo
index 0d8bf76293..95a348643d 100644
Binary files a/libs/pycountry/locales/sr/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sr/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sr/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sr/LC_MESSAGES/iso4217.mo
index acc25f0370..6b04f219ae 100644
Binary files a/libs/pycountry/locales/sr/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sr/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sr/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sr/LC_MESSAGES/iso639-3.mo
index a20ae0c9a8..d91f0a149e 100644
Binary files a/libs/pycountry/locales/sr/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sr/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso15924.mo
index 7b613906ab..3783092be8 100644
Binary files a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso3166-2.mo
index 2531403a81..45a0e89272 100644
Binary files a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo
index f8ad12343c..793ed5eec7 100644
Binary files a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo
index ddf4b59908..b057118c7f 100644
Binary files a/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sr@latin/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sv/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/sv/LC_MESSAGES/iso15924.mo
index e1f8261a5c..ed4774c481 100644
Binary files a/libs/pycountry/locales/sv/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/sv/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-1.mo
index 362b3be27d..b89ee063eb 100644
Binary files a/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-2.mo
index f5e228709c..e5972fafe7 100644
Binary files a/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/sv/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/sv/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/sv/LC_MESSAGES/iso4217.mo
index cb6f447f2f..47acfab4f7 100644
Binary files a/libs/pycountry/locales/sv/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/sv/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/sv/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/sv/LC_MESSAGES/iso639-3.mo
index 3514f05c7c..b5a2652b85 100644
Binary files a/libs/pycountry/locales/sv/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/sv/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo
index fda2f665bf..2cf3a27563 100644
Binary files a/libs/pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/sw/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ta/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso15924.mo
index d718005011..a215c7fb31 100644
Binary files a/libs/pycountry/locales/ta/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/ta/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo
index 0e98c7f3bd..2382d8cd05 100644
Binary files a/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo
index c27fdce88f..0c9f22436e 100644
Binary files a/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo
index 257950a8c6..3c31d0494e 100644
Binary files a/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ta/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ta/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso4217.mo
index a3a66cdb5d..733b3e1ded 100644
Binary files a/libs/pycountry/locales/ta/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/ta/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ta/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ta/LC_MESSAGES/iso639-3.mo
index b12c0f0e64..582088a462 100644
Binary files a/libs/pycountry/locales/ta/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/ta/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/th/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/th/LC_MESSAGES/iso15924.mo
index 8e32df9af4..8c13001641 100644
Binary files a/libs/pycountry/locales/th/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/th/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/th/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/th/LC_MESSAGES/iso4217.mo
index c2f3b0b4ef..769348de70 100644
Binary files a/libs/pycountry/locales/th/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/th/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/th/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/th/LC_MESSAGES/iso639-3.mo
index 2af06ce177..a4f4bf3ce2 100644
Binary files a/libs/pycountry/locales/th/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/th/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ti/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ti/LC_MESSAGES/iso3166-3.mo
index c3ce62f1bf..bf1ce518a5 100644
Binary files a/libs/pycountry/locales/ti/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ti/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tig/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/tig/LC_MESSAGES/iso3166-3.mo
index fb92fd70da..3db94be262 100644
Binary files a/libs/pycountry/locales/tig/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/tig/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tk/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/tk/LC_MESSAGES/iso3166-3.mo
index fd0f3631a1..4ae2fe45a8 100644
Binary files a/libs/pycountry/locales/tk/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/tk/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tl/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/tl/LC_MESSAGES/iso3166-3.mo
index 89bef01cb1..89a0f13276 100644
Binary files a/libs/pycountry/locales/tl/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/tl/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tr/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/tr/LC_MESSAGES/iso15924.mo
index a97e6cf6e2..34e35a5f4f 100644
Binary files a/libs/pycountry/locales/tr/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/tr/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-2.mo
index 4cf52fb943..152440cad3 100644
Binary files a/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-3.mo
index 748fc81e3d..9d9f60fd8e 100644
Binary files a/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/tr/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tr/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/tr/LC_MESSAGES/iso4217.mo
index e29a5bc802..7b3a06c32f 100644
Binary files a/libs/pycountry/locales/tr/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/tr/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/tr/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/tr/LC_MESSAGES/iso639-3.mo
index f580761aa3..3f0e3c4811 100644
Binary files a/libs/pycountry/locales/tr/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/tr/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-1.mo
index 78cd5739bb..1aad3c5ec7 100644
Binary files a/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-3.mo
index ca0ea7d5f0..dcc254a104 100644
Binary files a/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/tt/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tt/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/tt/LC_MESSAGES/iso639-3.mo
index 20098623f3..4dbeee49aa 100644
Binary files a/libs/pycountry/locales/tt/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/tt/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-1.mo
index 683c9e1cc0..c85299edab 100644
Binary files a/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-3.mo
index 91231b9346..2fcd5bead3 100644
Binary files a/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/tt@iqtelif/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/tzm/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/tzm/LC_MESSAGES/iso15924.mo
index e7bf3ddbfc..a274d84d08 100644
Binary files a/libs/pycountry/locales/tzm/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/tzm/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/tzm/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/tzm/LC_MESSAGES/iso3166-1.mo
index 854b17abf3..301d45b49a 100644
Binary files a/libs/pycountry/locales/tzm/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/tzm/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/tzm/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/tzm/LC_MESSAGES/iso4217.mo
index a690e2b372..2c4b18b427 100644
Binary files a/libs/pycountry/locales/tzm/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/tzm/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso15924.mo
new file mode 100644
index 0000000000..ef2ef4a42b
Binary files /dev/null and b/libs/pycountry/locales/ug/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo
index 3f840cb1e8..563fea7ceb 100644
Binary files a/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-2.mo
new file mode 100644
index 0000000000..e324e536a5
Binary files /dev/null and b/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-3.mo
index 289ac315c1..1db6028059 100644
Binary files a/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ug/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso4217.mo
new file mode 100644
index 0000000000..b3ccbe866d
Binary files /dev/null and b/libs/pycountry/locales/ug/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso639-3.mo
new file mode 100644
index 0000000000..04ae20adaa
Binary files /dev/null and b/libs/pycountry/locales/ug/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ug/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/ug/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 0000000000..93f1c772dd
Binary files /dev/null and b/libs/pycountry/locales/ug/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/uk/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/uk/LC_MESSAGES/iso15924.mo
index d6d140da06..77517da781 100644
Binary files a/libs/pycountry/locales/uk/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/uk/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo
index b0a01825f0..4df3419abd 100644
Binary files a/libs/pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/uk/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/uk/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/uk/LC_MESSAGES/iso4217.mo
index 830147c23f..7622d4bee8 100644
Binary files a/libs/pycountry/locales/uk/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/uk/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/uk/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/uk/LC_MESSAGES/iso639-3.mo
index fc0664edc6..18bb6a0abf 100644
Binary files a/libs/pycountry/locales/uk/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/uk/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo
index ce6b77f7e5..8d5d6c9344 100644
Binary files a/libs/pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/ve/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/vi/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/vi/LC_MESSAGES/iso15924.mo
index 948c465386..c10847d30e 100644
Binary files a/libs/pycountry/locales/vi/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/vi/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo
index 89ff1505a8..85d95e9927 100644
Binary files a/libs/pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/vi/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/vi/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/vi/LC_MESSAGES/iso4217.mo
index a3a95b99a6..044e1fbb4d 100644
Binary files a/libs/pycountry/locales/vi/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/vi/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/vi/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/vi/LC_MESSAGES/iso639-3.mo
index 5efdd0af78..ff7c52e620 100644
Binary files a/libs/pycountry/locales/vi/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/vi/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/wa/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/wa/LC_MESSAGES/iso639-3.mo
index 098797def0..c637fdb756 100644
Binary files a/libs/pycountry/locales/wa/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/wa/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/wal/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/wal/LC_MESSAGES/iso3166-3.mo
index faa48c98da..3433b19c35 100644
Binary files a/libs/pycountry/locales/wal/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/wal/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/xh/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/xh/LC_MESSAGES/iso3166-3.mo
index b8d832ed46..c2048d8a4f 100644
Binary files a/libs/pycountry/locales/xh/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/xh/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso15924.mo
index c18be2a4a1..a90b1d41bc 100644
Binary files a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-1.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-1.mo
index 0e3ae2e7ab..5c76c8f4f9 100644
Binary files a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-1.mo and b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-1.mo differ
diff --git a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo
index 0f8e8ebb0d..d7590960dd 100644
Binary files a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo and b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso3166-2.mo differ
diff --git a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso4217.mo
index 74c3b04ee6..d5b571bba3 100644
Binary files a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-3.mo
index af8ec26f6e..ebbc4c2994 100644
Binary files a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-5.mo
new file mode 100644
index 0000000000..f75b29b327
Binary files /dev/null and b/libs/pycountry/locales/zh_CN/LC_MESSAGES/iso639-5.mo differ
diff --git a/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso15924.mo
index a7bbc5e8f6..af08ff92a6 100644
Binary files a/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo
index 33372520ce..159d4452c2 100644
Binary files a/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/zh_HK/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/zh_Hans/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/zh_Hans/LC_MESSAGES/iso639-5.mo
deleted file mode 100644
index 770b809f6f..0000000000
Binary files a/libs/pycountry/locales/zh_Hans/LC_MESSAGES/iso639-5.mo and /dev/null differ
diff --git a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo
index 1e577c4225..9c7987c1d6 100644
Binary files a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo and b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso15924.mo differ
diff --git a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso4217.mo b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso4217.mo
index 67454c226e..60ad6bd4f5 100644
Binary files a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso4217.mo and b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso4217.mo differ
diff --git a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso639-3.mo b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso639-3.mo
index cb224bce00..ad6df1b9cf 100644
Binary files a/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso639-3.mo and b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso639-3.mo differ
diff --git a/libs/pycountry/locales/zh_Hant/LC_MESSAGES/iso639-5.mo b/libs/pycountry/locales/zh_TW/LC_MESSAGES/iso639-5.mo
similarity index 100%
rename from libs/pycountry/locales/zh_Hant/LC_MESSAGES/iso639-5.mo
rename to libs/pycountry/locales/zh_TW/LC_MESSAGES/iso639-5.mo
diff --git a/libs/pycountry/locales/zu/LC_MESSAGES/iso3166-3.mo b/libs/pycountry/locales/zu/LC_MESSAGES/iso3166-3.mo
index 0812046537..63819a1916 100644
Binary files a/libs/pycountry/locales/zu/LC_MESSAGES/iso3166-3.mo and b/libs/pycountry/locales/zu/LC_MESSAGES/iso3166-3.mo differ
diff --git a/libs/pycountry/tests/test_general.py b/libs/pycountry/tests/test_general.py
index 7039f1d89a..cc5217f6a2 100644
--- a/libs/pycountry/tests/test_general.py
+++ b/libs/pycountry/tests/test_general.py
@@ -17,6 +17,13 @@ def countries():
     pycountry.countries._clear()
 
 
+@pytest.fixture
+def subdivisions():
+    pycountry.subdivisions._clear()
+    yield pycountry.subdivisions
+    pycountry.subdivisions._clear()
+
+
 def test_country_list(countries):
     assert len(pycountry.countries) == 249
     assert isinstance(list(pycountry.countries)[0], pycountry.db.Data)
@@ -62,6 +69,12 @@ def test_country_fuzzy_search(countries):
     assert len(results) == 1
     assert results[0] == pycountry.countries.get(alpha_2="US")
 
+    # bug #231, try initials
+    results = pycountry.countries.search_fuzzy("UK")
+    # There are a lot of matches, but United Kingdom should be one of the top
+    assert len(results) >= 4
+    assert pycountry.countries.get(alpha_2="GB") in results[:4]
+
 
 def test_historic_country_fuzzy_search(countries):
     results = pycountry.historic_countries.search_fuzzy("burma")
@@ -131,7 +144,7 @@ def test_query_subdivisions_of_country():
 
 
 def test_scripts():
-    assert len(pycountry.scripts) == 182
+    assert len(pycountry.scripts) == 226
     assert isinstance(list(pycountry.scripts)[0], pycountry.db.Data)
 
     latin = pycountry.scripts.get(name="Latin")
@@ -141,7 +154,7 @@ def test_scripts():
 
 
 def test_currencies():
-    assert len(pycountry.currencies) == 181
+    assert len(pycountry.currencies) == 178
     assert isinstance(list(pycountry.currencies)[0], pycountry.db.Data)
 
     argentine_peso = pycountry.currencies.get(alpha_3="ARS")
@@ -151,7 +164,7 @@ def test_currencies():
 
 
 def test_languages():
-    assert len(pycountry.languages) == 7910
+    assert len(pycountry.languages) == 7923
     assert isinstance(list(pycountry.languages)[0], pycountry.db.Data)
 
     aragonese = pycountry.languages.get(alpha_2="an")
@@ -301,7 +314,7 @@ def test_is_instance_of_country(countries):
     assert class_name == "Country"
 
 
-def test_is_instance_of_subdivision():
+def test_is_instance_of_subdivision(subdivisions):
     assert isinstance(pycountry.subdivisions, pycountry.Subdivisions)
 
 
@@ -313,7 +326,7 @@ def test_is_instance_of_currency():
     assert isinstance(pycountry.currencies, pycountry.Currencies)
 
 
-def test_add_entry(countries):
+def test_country_add_entry(countries):
     assert pycountry.countries.get(alpha_2="XK") is None
 
     pycountry.countries.add_entry(
@@ -324,7 +337,7 @@ def test_add_entry(countries):
     assert isinstance(country, pycountry.countries.data_class)
 
 
-def test_remove_entry(countries):
+def test_country_remove_entry(countries):
     assert pycountry.countries.get(alpha_2="DE") is not None
 
     pycountry.countries.remove_entry(alpha_2="DE")
@@ -332,11 +345,60 @@ def test_remove_entry(countries):
     assert pycountry.countries.get(alpha_2="DE") is None
 
 
-def test_remove_non_existent_entry():
+def test_country_remove_non_existent_entry(countries):
     with pytest.raises(KeyError, match="not found"):
         pycountry.countries.remove_entry(name="Not A Real Country")
 
 
+def test_subdivision_add_entry(subdivisions):
+    assert subdivisions.get(code="IT-A0") is None
+    it_subdivs = sorted(
+        subdivisions.get(country_code="IT"),
+        key=lambda s: s.code,
+    )
+    assert len(it_subdivs) == 126
+    assert it_subdivs[0] == subdivisions.get(code="IT-21")
+
+    subdivisions.add_entry(
+        code="IT-A0",
+        country_code="IT",
+        name="Valle d'Aosta",
+        parent="23",
+        parent_code="IT-23",
+        type="Province",
+    )
+
+    it_a0 = subdivisions.get(code="IT-A0")
+    assert isinstance(it_a0, subdivisions.data_class)
+
+    # Confirm that indexes were not destroyed
+    it_subdivs = sorted(
+        subdivisions.get(country_code="IT"),
+        key=lambda s: s.code,
+    )
+    assert len(it_subdivs) == 127
+    assert it_subdivs[0] == subdivisions.get(code="IT-21")
+
+
+def test_subdivision_remove_entry(subdivisions):
+    assert subdivisions.get(code="IT-21") is not None
+
+    subdivisions.remove_entry(code="IT-21")
+
+    assert subdivisions.get(code="IT-21") is None
+
+    # Confirm that indexes were not destroyed
+    it_subdivs = sorted(
+        subdivisions.get(country_code="IT"),
+        key=lambda s: s.code,
+    )
+    assert len(it_subdivs) == 125
+    assert it_subdivs[0] == subdivisions.get(code="IT-23")
+
+    # Removing an entry does not remove its children
+    assert subdivisions.match("IT-21")[0].parent_code == "IT-21"
+
+
 def test_no_results_lookup_error(countries):
     try:
         import importlib_resources  # type: ignore
@@ -358,25 +420,25 @@ def resource_filename(package_or_requirement, resource_name):
         countries.search_fuzzy(query)
 
 
-def test_subdivision_fuzzy_search_match():
+def test_subdivision_fuzzy_search_match(subdivisions):
     results = pycountry.subdivisions.search_fuzzy("Alabama")
     assert len(results) == 1
     assert results[0].name == "Alabama"
 
 
-def test_subdivision_fuzzy_search_partial_match():
+def test_subdivision_fuzzy_search_partial_match(subdivisions):
     results = pycountry.subdivisions.search_fuzzy("Massachusett")
     assert len(results) == 1
     assert results[0].name == "Massachusetts"
 
 
-def test_subdivision_match():
+def test_subdivision_match(subdivisions):
     results = pycountry.subdivisions.match("Alabama")
     assert len(results) == 1
     assert results[0].name == "Alabama"
 
 
-def test_subdivision_partial_match():
+def test_subdivision_partial_match(subdivisions):
     results = pycountry.subdivisions.partial_match("Massachusett")
     assert len(results) == 1
     assert results[0].name == "Massachusetts"
@@ -421,17 +483,17 @@ def test_unicode_characters():
     )  # Japanese characters
 
 
-def test_subdivision_search_fuzzy_non_existent_subdivision():
+def test_subdivision_search_fuzzy_non_existent_subdivision(subdivisions):
     with pytest.raises(LookupError):
         pycountry.subdivisions.search_fuzzy("Non Existent Subdivision")
 
 
-def test_subdivision_partial_match_non():
+def test_subdivision_partial_match_non(subdivisions):
     result = pycountry.subdivisions.partial_match("Non Existent Subdivision")
     assert len(result) == 0
 
 
-def test_subdivision_match_non():
+def test_subdivision_match_non(subdivisions):
     result = pycountry.subdivisions.match("Non Existent Subdivision")
     assert len(result) == 0
 
@@ -449,8 +511,7 @@ def test_get_version_with_package_not_found():
         assert result == "n/a"
 
 
-def test_all_subdivisions_have_name_attribute():
-    subdivisions = pycountry.subdivisions
+def test_all_subdivisions_have_name_attribute(subdivisions):
     has_name_attr = [
         hasattr(subdivision, "name") for subdivision in subdivisions
     ]
@@ -459,7 +520,7 @@ def test_all_subdivisions_have_name_attribute():
     assert all_have_name_attr
 
 
-def test_subdivisions_with_missing_parents():
+def test_subdivisions_with_missing_parents(subdivisions):
     result = [
         (i.code, i.parent_code)
         for i in pycountry.subdivisions
diff --git a/libs/pydantic-1.10.14.dist-info/METADATA b/libs/pydantic-1.10.14.dist-info/METADATA
index a0ec94b2a1..9d85dfc1cc 100644
--- a/libs/pydantic-1.10.14.dist-info/METADATA
+++ b/libs/pydantic-1.10.14.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pydantic
 Version: 1.10.14
 Summary: Data validation and settings management using python type hints
@@ -30,11 +30,23 @@ Classifier: Topic :: Internet
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typing-extensions >=4.2.0
-Provides-Extra: dotenv
-Requires-Dist: python-dotenv >=0.10.4 ; extra == 'dotenv'
+Requires-Dist: typing-extensions>=4.2.0
 Provides-Extra: email
-Requires-Dist: email-validator >=1.0.3 ; extra == 'email'
+Requires-Dist: email-validator>=1.0.3; extra == "email"
+Provides-Extra: dotenv
+Requires-Dist: python-dotenv>=0.10.4; extra == "dotenv"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # pydantic
 
diff --git a/libs/pydantic-1.10.14.dist-info/RECORD b/libs/pydantic-1.10.14.dist-info/RECORD
index 9560288492..8cabb2dbc7 100644
--- a/libs/pydantic-1.10.14.dist-info/RECORD
+++ b/libs/pydantic-1.10.14.dist-info/RECORD
@@ -1,10 +1,10 @@
 pydantic-1.10.14.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pydantic-1.10.14.dist-info/LICENSE,sha256=njlGaQrIi2tz6PABoFhq8TVovohS_VFOQ5Pzl2F2Q4c,1127
-pydantic-1.10.14.dist-info/METADATA,sha256=DNR2l_mD0QFQmYDjgw39Zj1Ps7j1zOLR_NoAcgeLSC4,150194
+pydantic-1.10.14.dist-info/METADATA,sha256=j6taetaRij1eE9KE9PzbcBD5nMfGmgi6NRgb2D5U310,150449
 pydantic-1.10.14.dist-info/RECORD,,
 pydantic-1.10.14.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pydantic-1.10.14.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+pydantic-1.10.14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 pydantic-1.10.14.dist-info/entry_points.txt,sha256=EquH5n3pilIXg-LLa1K4evpu5-6dnvxzi6vwvkoAMns,45
+pydantic-1.10.14.dist-info/licenses/LICENSE,sha256=njlGaQrIi2tz6PABoFhq8TVovohS_VFOQ5Pzl2F2Q4c,1127
 pydantic-1.10.14.dist-info/top_level.txt,sha256=cmo_5n0F_YY5td5nPZBfdjBENkmGg_pE5ShWXYbXxTM,9
 pydantic/__init__.py,sha256=iTu8CwWWvn6zM_zYJtqhie24PImW25zokitz_06kDYw,2771
 pydantic/_hypothesis_plugin.py,sha256=gILcyAEfZ3u9YfKxtDxkReLpakjMou1VWC3FEcXmJgQ,14844
diff --git a/libs/pydantic-1.10.14.dist-info/WHEEL b/libs/pydantic-1.10.14.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/pydantic-1.10.14.dist-info/WHEEL
+++ b/libs/pydantic-1.10.14.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/pydantic-1.10.14.dist-info/LICENSE b/libs/pydantic-1.10.14.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/pydantic-1.10.14.dist-info/LICENSE
rename to libs/pydantic-1.10.14.dist-info/licenses/LICENSE
diff --git a/libs/pygments-2.19.1.dist-info/METADATA b/libs/pygments-2.19.1.dist-info/METADATA
deleted file mode 100644
index 8671c6d8f8..0000000000
--- a/libs/pygments-2.19.1.dist-info/METADATA
+++ /dev/null
@@ -1,58 +0,0 @@
-Metadata-Version: 2.4
-Name: Pygments
-Version: 2.19.1
-Summary: Pygments is a syntax highlighting package written in Python.
-Project-URL: Homepage, https://pygments.org
-Project-URL: Documentation, https://pygments.org/docs
-Project-URL: Source, https://github.com/pygments/pygments
-Project-URL: Bug Tracker, https://github.com/pygments/pygments/issues
-Project-URL: Changelog, https://github.com/pygments/pygments/blob/master/CHANGES
-Author-email: Georg Brandl <georg@python.org>
-Maintainer: Matthรคus G. Chajdas
-Maintainer-email: Georg Brandl <georg@python.org>, Jean Abou Samra <jean@abou-samra.fr>
-License: BSD-2-Clause
-License-File: AUTHORS
-License-File: LICENSE
-Keywords: syntax highlighting
-Classifier: Development Status :: 6 - Mature
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Text Processing :: Filters
-Classifier: Topic :: Utilities
-Requires-Python: >=3.8
-Provides-Extra: plugins
-Provides-Extra: windows-terminal
-Requires-Dist: colorama>=0.4.6; extra == 'windows-terminal'
-Description-Content-Type: text/x-rst
-
-Pygments
-~~~~~~~~
-
-Pygments is a syntax highlighting package written in Python.
-
-It is a generic syntax highlighter suitable for use in code hosting, forums,
-wikis or other applications that need to prettify source code.  Highlights
-are:
-
-* a wide range of over 500 languages and other text formats is supported
-* special attention is paid to details, increasing quality by a fair amount
-* support for new languages and formats are added easily
-* a number of output formats, presently HTML, LaTeX, RTF, SVG, all image
-  formats that PIL supports and ANSI sequences
-* it is usable as a command-line tool and as a library
-
-Copyright 2006-2025 by the Pygments team, see ``AUTHORS``.
-Licensed under the BSD, see ``LICENSE`` for details.
diff --git a/libs/pygments-2.19.1.dist-info/RECORD b/libs/pygments-2.19.1.dist-info/RECORD
deleted file mode 100644
index 4801085a71..0000000000
--- a/libs/pygments-2.19.1.dist-info/RECORD
+++ /dev/null
@@ -1,346 +0,0 @@
-../../bin/pygmentize,sha256=iP3M-_dI6wQP1Gtg8ZvtFWFDy3x82yIJIrmsdlQpEe0,238
-pygments-2.19.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pygments-2.19.1.dist-info/METADATA,sha256=QGjhRksrfp_I-eQNvdNKViqR538H_0l-x473HqO-rxM,2512
-pygments-2.19.1.dist-info/RECORD,,
-pygments-2.19.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pygments-2.19.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pygments-2.19.1.dist-info/entry_points.txt,sha256=uUXw-XhMKBEX4pWcCtpuTTnPhL3h7OEE2jWi51VQsa8,53
-pygments-2.19.1.dist-info/licenses/AUTHORS,sha256=BmDjGKbyFYAq3Icxq4XQxl_yfPzKP10oWX8wZHYZW9k,10824
-pygments-2.19.1.dist-info/licenses/LICENSE,sha256=qdZvHVJt8C4p3Oc0NtNOVuhjL0bCdbvf_HBWnogvnxc,1331
-pygments/__init__.py,sha256=H0XmVJ1Fe9qSEDBU1j1wZLT-Tfu7blFbDiFSfpwU63c,2959
-pygments/__main__.py,sha256=p8AJyoyCOMYGvzWHdnq0_A9qaaVqaj02nIu3xhJp1_4,348
-pygments/cmdline.py,sha256=4pL9Kpn2PUEKPobgrsQgg-vCx2NjsrapKzQ6LxQR7Q0,23536
-pygments/console.py,sha256=AagDWqwea2yBWf10KC9ptBgMpMjxKp8yABAmh-NQOVk,1718
-pygments/filter.py,sha256=YLtpTnZiu07nY3oK9nfR6E9Y1FBHhP5PX8gvkJWcfag,1910
-pygments/filters/__init__.py,sha256=B00KqPCQh5E0XhzaDK74Qa1E4fDSTlD6b0Pvr1v-vEQ,40344
-pygments/formatter.py,sha256=H_4J-moKkKfRWUOW9J0u7hhw6n1LiO-2Xu1q2B0sE5w,4366
-pygments/formatters/__init__.py,sha256=7OuvmoYLyoPzoOQV_brHG8GSKYB_wjFSkAQng6x2y9g,5349
-pygments/formatters/_mapping.py,sha256=1Cw37FuQlNacnxRKmtlPX4nyLoX9_ttko5ZwscNUZZ4,4176
-pygments/formatters/bbcode.py,sha256=s0Ka35OKuIchoSgEAGf6rj0rl2a9ym9L31JVNSRbZFQ,3296
-pygments/formatters/groff.py,sha256=pLcIHj4jJS_lRAVFnyJODKDu1Xlyl9_AEIdOtbl3DT0,5082
-pygments/formatters/html.py,sha256=FrHJ69FUliEyPY0zTfab0C1gPf7LXsKgeRlhwkniqIs,35953
-pygments/formatters/img.py,sha256=aRpFo8mBmWTL3sBUjRCWkeS3rc6FZrSFC4EksDrl53g,23301
-pygments/formatters/irc.py,sha256=R0Js0TYWySlI2yE9sW6tN4d4X-x3k9ZmudsijGPnLmU,4945
-pygments/formatters/latex.py,sha256=BRYtbLeW_YD1kwhhnFInhJIKylurnri8CF1lP069KWE,19258
-pygments/formatters/other.py,sha256=8pYW27sU_7XicLUqOEt2yWSO0h1IEUM3TIv34KODLwo,4986
-pygments/formatters/pangomarkup.py,sha256=pcFvEC7K1Me0EjGeOZth4oCnEY85bfqc77XzZASEPpY,2206
-pygments/formatters/rtf.py,sha256=kcKMCxTXu-2-hpgEftlGJRm7Ss-yA_Sy8OsHH_qzykA,11921
-pygments/formatters/svg.py,sha256=R6A2ME6JsMQWFiyn8wcKwFUOD6vsu-HLwiIztLu-77E,7138
-pygments/formatters/terminal.py,sha256=J_F_dFXwR9LHWvatIDnwqRYJyjVmSo1Zx8K_XDh6SyM,4626
-pygments/formatters/terminal256.py,sha256=7GQFLE5cfmeu53CAzANO74-kBk2BFkXfn5phmZjYkhM,11717
-pygments/lexer.py,sha256=ib-F_0GxHkwGpb6vWP0DeLMLc7EYgjo3hWFKN5IgOq0,35109
-pygments/lexers/__init__.py,sha256=6YhzxGKlWk38P6JpIJUQ1rVvV0DEZjEmdYsdMQ58hSk,12067
-pygments/lexers/_ada_builtins.py,sha256=CA_OnShtdc7wWh9oYcRlcrkDAQwYUKl6w7tdSbALQd4,1543
-pygments/lexers/_asy_builtins.py,sha256=cd9M00YH19w5ZL7aqucmC3nwpJGTS04U-01NLy5E2_4,27287
-pygments/lexers/_cl_builtins.py,sha256=kQeUIyZjP4kX0frkICDcKxBYQCLqzIDXa5WV5cevhDo,13994
-pygments/lexers/_cocoa_builtins.py,sha256=Ka1lLJe7JfWtdho4IFIB82X9yBvrbfHCCmEG-peXXhQ,105173
-pygments/lexers/_csound_builtins.py,sha256=qnQYKeI26ZHim316uqy_hDiRiCoHo2RHjD3sYBALyXs,18414
-pygments/lexers/_css_builtins.py,sha256=aD-dhLFXVd1Atn_bZd7gEdQn7Mhe60_VHpvZ340WzDI,12446
-pygments/lexers/_googlesql_builtins.py,sha256=IkrOk-T2v1yzbGzUEEQh5_Cf4uC_cmL_uuhwDpZlTug,16132
-pygments/lexers/_julia_builtins.py,sha256=N2WdSw5zgI2fhDat_i4YeVqurRTC_P8x71ez00SCN6U,11883
-pygments/lexers/_lasso_builtins.py,sha256=8q1gbsrMJeaeUhxIYKhaOxC9j_B-NBpq_XFj2Ze41X0,134510
-pygments/lexers/_lilypond_builtins.py,sha256=XTbGL1z1oKMoqWLEktG33jx5GdGTI9CpeO5NheEi4Y0,108094
-pygments/lexers/_lua_builtins.py,sha256=PhFdZV5-Tzz2j_q4lvG9lr84ELGfL41BhnrSDNNTaG4,8108
-pygments/lexers/_luau_builtins.py,sha256=-IDrU04kUVfjXwSQzMMpXmMYhNsQxZVVZk8cuAA0Lo0,955
-pygments/lexers/_mapping.py,sha256=9fv7xYOUAOr6LzfdFS4MDbPu78o4OQQH-2nsI1bNZf4,70438
-pygments/lexers/_mql_builtins.py,sha256=ybRQjlb7Cul0sDstnzxJl3h0qS6Ieqsr811fqrxyumU,24713
-pygments/lexers/_mysql_builtins.py,sha256=y0kAWZVAs0z2dTFJJV42OZpILgRnd8T3zSlBFv-g_oA,25838
-pygments/lexers/_openedge_builtins.py,sha256=Sz4j9-CPWIaxMa-2fZgY66j7igcu1ob1GR2UtI8zAkg,49398
-pygments/lexers/_php_builtins.py,sha256=Jd4BZpjMDELPi4EVoSxK1-8BFTc63HUwYfm1rLrGj0M,107922
-pygments/lexers/_postgres_builtins.py,sha256=Pqh4z0RBRbnW6rCQtWUdzWCJxNyqpJ7_0HOktxHDxk4,13343
-pygments/lexers/_qlik_builtins.py,sha256=xuJy9c9uZDXv6h8z582P5PrxqkxTZ_nS8gPl9OD9VN8,12595
-pygments/lexers/_scheme_builtins.py,sha256=2hNtJOJmP21lUsikpqMJ2gAmLT3Rwn_KEeqhXwCjgfk,32564
-pygments/lexers/_scilab_builtins.py,sha256=oZYPB1XPdIEz3pII11pFDe6extRRyWGA7pY06X8KZ8w,52411
-pygments/lexers/_sourcemod_builtins.py,sha256=H8AFLsNDdEpymIWOpDwbDJGCP1w-x-1gSlzPDioMF4o,26777
-pygments/lexers/_stan_builtins.py,sha256=dwi1hllM_NsaCv-aXJy7lEi57X5Hh5gSD97aCQyT9KM,13445
-pygments/lexers/_stata_builtins.py,sha256=Hqrr6j77zWU3cGGpBPohwexZci43YA4_sVYE4E1sNow,27227
-pygments/lexers/_tsql_builtins.py,sha256=Pi2RhTXcLE3glI9oxNhyVsOMn-fK_1TRxJ-EsYP5LcI,15460
-pygments/lexers/_usd_builtins.py,sha256=c9hbU1cwqBUCFIhNfu_Dob8ywv1rlPhi9w2OTj3kR8s,1658
-pygments/lexers/_vbscript_builtins.py,sha256=MqJ2ABywD21aSRtWYZRG64CCbGstC1kfsiHGJmZzxiw,4225
-pygments/lexers/_vim_builtins.py,sha256=bA4mH8t1mPPQfEiUCKEqRO1O0rL2DUG0Ux1Bt8ZSu0E,57066
-pygments/lexers/actionscript.py,sha256=JBngCe5UhYT_0dLD2j7PnPO0xRRJhmypEuQ-C5in8pY,11727
-pygments/lexers/ada.py,sha256=58k5ra1vGS4iLpW3h1ItY9ftzF3WevaeAAXzAYTiYkQ,5353
-pygments/lexers/agile.py,sha256=DN-7AVIqtG1MshA94rtSGYI_884hVHgzq405wD0_dl8,896
-pygments/lexers/algebra.py,sha256=yGTu9Tt-cQzAISQYIC5MS5a3z4QmL-tGcXnd_pkWGbk,9952
-pygments/lexers/ambient.py,sha256=UnzKpIlfSm3iitHvMd7XTMSY8TjZYYhKOC3AiARS_cE,2605
-pygments/lexers/amdgpu.py,sha256=S8qjn2UMLhBFm3Yn_c06XAGf8cl5x_ZeluelWG_-JAw,1723
-pygments/lexers/ampl.py,sha256=ZBRfDXm760gR1a1gqItnsHuoO3JdUcTBjJ5tFY9UtPA,4176
-pygments/lexers/apdlexer.py,sha256=Zr5-jgjxC8PKzRlEeclakZXPHci7FHBZghQ6wwiuT7A,30800
-pygments/lexers/apl.py,sha256=PTQMp-bxT5P-DbrEvFha10HBTcsDJ5srL3I1s9ljz58,3404
-pygments/lexers/archetype.py,sha256=pQVlP1Fb5OA8nn7QwmFaaaOSvvpoIsQVw43FVCQCve4,11538
-pygments/lexers/arrow.py,sha256=2PKdbWq3xQLF1KoDbWvSxpjwKRrznnDiArTflRGZzBo,3564
-pygments/lexers/arturo.py,sha256=U5MtRNHJtnBn4ZOeWmW6MKlVRG7SX6KhTRamDqzn9tA,11414
-pygments/lexers/asc.py,sha256=-DgZl9jccBDHPlDmjCsrEqx0-Q7ap7XVdNKtxLNWG1w,1693
-pygments/lexers/asm.py,sha256=xm2Y5mcT-sF3oQvair4SWs9EWTyndoaUoSsDy5v6shI,41967
-pygments/lexers/asn1.py,sha256=BlcloIX2bu6Q7BxGcksuhYFHGsXLVKyB4B9mFd4Pj6E,4262
-pygments/lexers/automation.py,sha256=Q61qon8EwpfakMh_2MS2E2zUUT16rG3UNIKPYjITeTs,19831
-pygments/lexers/bare.py,sha256=tWoei86JJX1k-ADhaXd5TgX6ItDTici9yFWpkTPhnfM,3020
-pygments/lexers/basic.py,sha256=qpVe5h8Fa7NJo1EihN-4R_UZpHO6my2Ssgkb-BktkKs,27989
-pygments/lexers/bdd.py,sha256=yysefcOFAEyk9kJ2y4EXmzJTecgLYUHlWixt_3YzPMU,1641
-pygments/lexers/berry.py,sha256=zxGowFb8HMIyN15-m8nmWnW6bPRR4esKtSEVugc9uXM,3209
-pygments/lexers/bibtex.py,sha256=yuNoPxwrJf9DCGUT17hxfDzbq_HtCLkQkRbBtiTVmeQ,4811
-pygments/lexers/blueprint.py,sha256=NzvWHMxCLDWt8hc6gB5jokltxVJgNa7Jwh4c61ng388,6188
-pygments/lexers/boa.py,sha256=dOot1XWNZThPIio2UyAX67K6EpISjSRCFjotD7dcnwE,3921
-pygments/lexers/bqn.py,sha256=nJiwrPKKbRF-qdai5tfqipwBkkko2P3weiZAjHUMimY,3671
-pygments/lexers/business.py,sha256=lRtekOJfsDkb12AGbuz10-G67OJrVJgCBtihTQ8_aoY,28345
-pygments/lexers/c_cpp.py,sha256=D7ZIswaHASlGBgoTlwnSqTQHf8_JyvvSt2L2q1W-F6g,18059
-pygments/lexers/c_like.py,sha256=FTGp17ds6X2rDZOHup2hH6BEn3gKK4nLm9pydNEhm0E,32021
-pygments/lexers/capnproto.py,sha256=XQJAh1WS-0ulqbTn9TdzR6gEgWLcuBqb4sj3jNsrhsY,2174
-pygments/lexers/carbon.py,sha256=av12YuTGZGpOa1Cmxp3lppx3LfSJUWbvOu0ixmUVll0,3211
-pygments/lexers/cddl.py,sha256=MKa70IwABgjBjYu15_Q9v8rsu2sr1a-i2jkiaPTI6sM,5076
-pygments/lexers/chapel.py,sha256=0n_fL3ehLC4pw4YKnmq9jxIXOJcxGPka1Wr1t1zsXPc,5156
-pygments/lexers/clean.py,sha256=dkDPAwF5BTALPeuKFoRKOSD3RfsKcGWbaRo6_G8LHng,6418
-pygments/lexers/codeql.py,sha256=ebvghn2zbrnETV4buVozMDmRCVKSdGiIN8ycLlHpGsE,2576
-pygments/lexers/comal.py,sha256=TC3NzcJ58ew5jw7qwK0kJ-okTA47psZje0yAIS39HR4,3179
-pygments/lexers/compiled.py,sha256=Slfo1sjWqcPawUwf0dIIZLBCL5pkOIoAX2S8Lxs02Mc,1426
-pygments/lexers/configs.py,sha256=wW8pY0Sa5a10pnAeTLGf48HhixQTVageIyHEf1aYMCc,50913
-pygments/lexers/console.py,sha256=-jAG120dupvV3kG3zC70brLJvSLwTFqMubBQuj_GVnU,4180
-pygments/lexers/cplint.py,sha256=DkbyE5EKydLgf6BRr1FhQrK-IeQPL7Zmjk0DVdlRFnQ,1389
-pygments/lexers/crystal.py,sha256=xU-RnpIkpjrquoxtOuOcP8fcesSJl4xhU7kO9m42LZY,15754
-pygments/lexers/csound.py,sha256=ioSw4Q04wdwjUAbnTZ1qLhUq1vxdWFxhh3QtEl5RAJc,16998
-pygments/lexers/css.py,sha256=JN1RBYsee-jrpHWrSmhN3TKc4TkOBn-_BEGpgTCzcqE,25376
-pygments/lexers/d.py,sha256=piOy0EJeiAwPHugiM3gVv0z7HNh3u2gZQoCUSASRbY4,9920
-pygments/lexers/dalvik.py,sha256=deFg2JPBktJ9mEGb9EgxNkmd6vaMjJFQVzUHo8NKIa8,4606
-pygments/lexers/data.py,sha256=o0x0SmB5ms_CPUPljEEEenOON4IQWn86DkwFjkJYCOg,27026
-pygments/lexers/dax.py,sha256=ASi73qmr7OA7cVZXF2GTYGt01Ly1vY8CgD_Pnpm8k-4,8098
-pygments/lexers/devicetree.py,sha256=RecSQCidt8DRE1QFCPUbwwR0hiRlNtsFihdGldeUn3k,4019
-pygments/lexers/diff.py,sha256=F6vxZ64wm5Nag_97de1H_3F700ZwCVnYjKvtT5jilww,5382
-pygments/lexers/dns.py,sha256=Hh5hJ7MXfrq36KgfyIRwK3X8o1LdR98IKERcV4eZ7HY,3891
-pygments/lexers/dotnet.py,sha256=NDE0kOmpe96GLO-zwNLazmj77E9ORGmKpa4ZMCXDXxQ,39441
-pygments/lexers/dsls.py,sha256=GnHKhGL5GxsRFnqC7-65NTPZLOZdmnllNrGP86x_fQE,36746
-pygments/lexers/dylan.py,sha256=7zZ1EbHWXeVHqTD36AqykKqo3fhuIh4sM-whcxUaH_Y,10409
-pygments/lexers/ecl.py,sha256=vhmpa2LBrHxsPkYcf3kPZ1ItVaLRDTebi186wY0xGZA,6371
-pygments/lexers/eiffel.py,sha256=5ydYIEFcgcMoEj4BlK31hZ0aJb8OX0RdAvuCNdlxwqw,2690
-pygments/lexers/elm.py,sha256=uRCddU8jK5vVkH6Y66y8KOsDJprIfrOgeYq3hv1PxAM,3152
-pygments/lexers/elpi.py,sha256=O9j_WKBPyvNFjCRuPciVpW4etVSnILm_T79BhCPZYmo,6877
-pygments/lexers/email.py,sha256=ZZL6yvwCRl1CEQyysuOu0lbabp5tjMutS7f3efFKGR4,4804
-pygments/lexers/erlang.py,sha256=bU11eVHvooLwmVknzN6Xkb2DMk7HbenqdNlYSzhThDM,19147
-pygments/lexers/esoteric.py,sha256=Jfp8UUKyKYsqLaqXRZT3GSM9dzkF65zduwfnH1GoGhU,10500
-pygments/lexers/ezhil.py,sha256=22r-xjvvBVpExTqCI-HycAwunDb1p5gY4tIfDmM0vDw,3272
-pygments/lexers/factor.py,sha256=urZ4En4uKFCLXdEkXLWg9EYUFGHQTTDCwNXtyq-ngok,19530
-pygments/lexers/fantom.py,sha256=JJ13-NwykD-iIESnuzCefCYeQDO95cHMJA8TasF4gHA,10231
-pygments/lexers/felix.py,sha256=F-v0si4zPtRelqzDQWXI1-tarCE-BvawziODxRU7378,9655
-pygments/lexers/fift.py,sha256=rOCwp3v5ocK5YOWvt7Td3Md--97_8e-7Sonx52uS8mA,1644
-pygments/lexers/floscript.py,sha256=aHh82k52jMuDuzl9LatrcSANJiXTCyjGU3SO53bwbb0,2667
-pygments/lexers/forth.py,sha256=ZMtsHdNbnS_0IdSYlfAlfTSPEr0MEsRo-YZriQNueTQ,7193
-pygments/lexers/fortran.py,sha256=1PE5dTxf4Df6LUeXFcmNtyeXWsC8tSiK5dYwPHIJeeQ,10382
-pygments/lexers/foxpro.py,sha256=CBkW62Fuibz3yfyelZCaEO8GGdFJWsuRhqwtsSeBwLM,26295
-pygments/lexers/freefem.py,sha256=LFBQk-m1-nNCgrl-VDH3QwnVWurvb7W29i06LoT207A,26913
-pygments/lexers/func.py,sha256=OR2rkM7gf9fKvad5WcFQln-_U_pb-RUCM9eQatToF4A,3700
-pygments/lexers/functional.py,sha256=fYT2AGZ642cRkIAId0rnXFBsx1c8LLEDRN_VuCEkUyM,693
-pygments/lexers/futhark.py,sha256=Vf1i4t-tR3zqaktVjhTzFNg_ts_9CcyA4ZDfDizbCmk,3743
-pygments/lexers/gcodelexer.py,sha256=4Xs9ax4-JZGupW_qSnHon39wQGpb-tNA3xorMKg841E,874
-pygments/lexers/gdscript.py,sha256=Ws7JKxy0M0IyZ_1iMfRvJPrizEwmeCNLDoeMIFaM-CU,7566
-pygments/lexers/gleam.py,sha256=XIlTcq6cB743pCqbNYo8PocSkjZyDPR6hHgdaJNJ1Vc,2392
-pygments/lexers/go.py,sha256=4LezefgyuqZWHzLZHieUkKTi-ssY6aHJxx7Z-LFaLK0,3783
-pygments/lexers/grammar_notation.py,sha256=LvzhRQHgwZzq9oceukZS_hwnKK58ee7Z5d0cwXOR734,8043
-pygments/lexers/graph.py,sha256=WFqoPA1c_hHYrV0i_F7-eUw3Co4_HmZY3GJ-TyDr670,4108
-pygments/lexers/graphics.py,sha256=tmF9NNALnvPnax8ywYC3pLOla45YXtp9UA0H-5EiTQY,39145
-pygments/lexers/graphql.py,sha256=O_zcrGrBaDaKTlUoJGRruxqk7CJi-NR92Y0Cs-KkCvw,5601
-pygments/lexers/graphviz.py,sha256=mzdXOMpwz9_V-be1eTAMyhkKCBl6UxCIXuq6C2yrtsw,1934
-pygments/lexers/gsql.py,sha256=VPZk9sb26-DumRkWfEaSTeoc0lx5xt5n-6eDDLezMtc,3990
-pygments/lexers/hare.py,sha256=PGCOuILktJsmtTpCZZKkMFtObfJuBpei8HM8HHuq1Tw,2649
-pygments/lexers/haskell.py,sha256=MYr74-PAC8kGJRX-dZmvZsHTc7a2u6yFS2B19LfDD7g,33262
-pygments/lexers/haxe.py,sha256=WHCy_nrXHnfLITfbdp3Ji3lqQU4HAsTUpXsLCp2_4sk,30974
-pygments/lexers/hdl.py,sha256=MOWxhmAuE4Ei0CKDqqaON7T8tl43geancrNYM136Z0U,22738
-pygments/lexers/hexdump.py,sha256=1lj9oJ-KiZXSVYvTMfGmEAQzNEW08WlMcC2I5aYvHK4,3653
-pygments/lexers/html.py,sha256=MxYTI4EeT7QxoGleCAyQq-8n_Sgly6tD95H5zanCNmk,21977
-pygments/lexers/idl.py,sha256=rcihUAGhfuGEaSW6pgFq6NzplT_pv0DagUoefg4zAmk,15449
-pygments/lexers/igor.py,sha256=wVefbUjb3ftaW3LCKGtX1JgLgiY4EmRor5gVOn8vQA8,31633
-pygments/lexers/inferno.py,sha256=ChE_5y5SLH_75Uv7D2dKWQMk2dlN6z1gY1IDjlJZ8rU,3135
-pygments/lexers/installers.py,sha256=ZHliit4Pxz1tYKOIjKkDXI5djTkpzYUMVIPR1xvUrL8,14435
-pygments/lexers/int_fiction.py,sha256=0ZzIa1sZDUQsltd1oHuS-BoNiOF8zKQfcVuDyK1Ttv8,56544
-pygments/lexers/iolang.py,sha256=L6dNDCLH0kxkIUi00fI4Z14QnRu79UcNDrgv02c5Zw8,1905
-pygments/lexers/j.py,sha256=DqNdwQGFLiZW3mCNLRg81gpmsy4Hgcai_9NP3LbWhNU,4853
-pygments/lexers/javascript.py,sha256=TGKQLSrCprCKfhLLGAq_0EOdvqvJKX9pOdKo7tCRurQ,63243
-pygments/lexers/jmespath.py,sha256=R5yA5LJ2nTIaDwnFIpSNGAThd0sAYFccwawA9xBptlg,2082
-pygments/lexers/jslt.py,sha256=OeYQf8O2_9FCaf9W6Q3a7rPdAFLthePCtVSgCrOTcl8,3700
-pygments/lexers/json5.py,sha256=8JZbc8EiTEZdKaIdQg3hXEh0mHWSzPlwd473a0nUuT0,2502
-pygments/lexers/jsonnet.py,sha256=bx2G6J4tJqGrJV1PyZrIWzWHXcoefCX-4lIxxtbn2gw,5636
-pygments/lexers/jsx.py,sha256=wGsoGSB40qAJrVfXwRPtan7OcK0O87RVsHHk0m6gogk,2693
-pygments/lexers/julia.py,sha256=0ZDJ9X83V5GqJzA6T6p0TTN8WHy2JAjvu-FSBXvfXdc,11710
-pygments/lexers/jvm.py,sha256=Yt1iQ3QodXRY-x_HUOGedhyuBBHn5jYH-I8NzOzHTlE,72667
-pygments/lexers/kuin.py,sha256=3dKKJVJlskgrvMKv2tY9NOsFfDjyo-3MLcJ1lFKdXSg,11405
-pygments/lexers/kusto.py,sha256=kaxkoPpEBDsBTCvCOkZZx7oGfv0jk_UNIRIRbfVAsBE,3477
-pygments/lexers/ldap.py,sha256=77vF4t_19x9V522cxRCM5d3HW8Ne3giYsFsMPVYYBw4,6551
-pygments/lexers/lean.py,sha256=7HWRgxFsxS1N9XKqw0vfKwaxl27s5YiVYtZeRUoTHFo,8570
-pygments/lexers/lilypond.py,sha256=yd2Tuv67um6EyCIr-VwBnlPhTHxMaQsBJ4nGgO5fjIk,9752
-pygments/lexers/lisp.py,sha256=EHUy1g4pzEsYPE-zGj2rAXm3YATE1j9dCQOr5-JPSkU,157668
-pygments/lexers/macaulay2.py,sha256=zkV-vxjQYa0Jj9TGfFP1iMgpTZ4ApQuAAIdJVGWb2is,33366
-pygments/lexers/make.py,sha256=YMI5DBCrxWca-pz9cVXcyfuHLcikPx9R_3pW_98Myqo,7831
-pygments/lexers/maple.py,sha256=Rs0dEmOMD3C1YQPd0mntN-vzReq4XfHegH6xV4lvJWo,7960
-pygments/lexers/markup.py,sha256=zWtxsyIx_1OxQzS6wLe8bEqglePv4RqvJjbia8AvV5c,65088
-pygments/lexers/math.py,sha256=P3ZK1ePd8ZnLdlmHezo2irCA8T2-nlHBoSaBoT5mEVI,695
-pygments/lexers/matlab.py,sha256=F9KO4qowIhfP8oVhCRRzE_1sqg4zmQbsB2NZH193PiM,133027
-pygments/lexers/maxima.py,sha256=a0h9Ggs9JEovTrzbJT-BLVbOqI29yPnaMZlkU5f_FeY,2715
-pygments/lexers/meson.py,sha256=BMrsDo6BH2lzTFw7JDwQ9SDNMTrRkXCNRDVf4aFHdsI,4336
-pygments/lexers/mime.py,sha256=yGrf3h37LK4b6ERBpFiL_qzn3JgOfGR5KLagnbWFl6c,7582
-pygments/lexers/minecraft.py,sha256=Nu88snDDPzM0D-742fFdUriczL-EE911pAd4_I4-pAw,13696
-pygments/lexers/mips.py,sha256=STKiZT67b3QERXXn7XKVxlPBu7vwbPC5EyCpuf3Jfbw,4656
-pygments/lexers/ml.py,sha256=t8sCv4BjvuBq6AihKKUwStEONIgdXCC2RMtO0RopNbM,35390
-pygments/lexers/modeling.py,sha256=M7B58bGB-Zwd1EmPxKqtRvg7TgNCyem3MVUHv0_H2SQ,13683
-pygments/lexers/modula2.py,sha256=NtpXBRoUCeHfflgB39LknSkCwhBHBKv2Er_pinjVsNE,53072
-pygments/lexers/mojo.py,sha256=8JRVoftN1E-W2woG0K-4n8PQXTUM9iY6Sl5sWb2uGNg,24233
-pygments/lexers/monte.py,sha256=baWU6zlXloenw9MO1MtEVGE9i3CfiXAYhqU621MIjRk,6289
-pygments/lexers/mosel.py,sha256=gjRdedhA1jTjoYoM1Gpaoog_I9o7TRbYMHk97N1TXwg,9297
-pygments/lexers/ncl.py,sha256=zJ6ahlitit4S0pBXc7Wu96PB7xOn59MwfR2HdY5_C60,63999
-pygments/lexers/nimrod.py,sha256=Q1NSqEkLC5wWt7xJyKC-vzWw_Iw2SfDNP_pyMFBuIfA,6413
-pygments/lexers/nit.py,sha256=p_hVD8GzMRl3CABVKHtYgnXFUQk0i5F2FbWFA6WXm6s,2725
-pygments/lexers/nix.py,sha256=NOrv20gdq-2A7eZ6c2gElPHv1Xx2pvv20-qOymL9GMg,4421
-pygments/lexers/numbair.py,sha256=fxkp2CXeXWKBMewfi1H4JSYkmm4kU58wZ2Sh9BDYAWQ,1758
-pygments/lexers/oberon.py,sha256=jw403qUUs7zpTHAs5CbLjb8qiuwtxLk0spDIYqGZwAw,4210
-pygments/lexers/objective.py,sha256=Fo1WB3JMj8sNeYnvB84H4_qwhOt4WNJtJWjVEOwrJGk,23297
-pygments/lexers/ooc.py,sha256=kD1XaJZaihDF_s-Vyu1Bx68S_9zFt2rhox7NF8LpOZM,3002
-pygments/lexers/openscad.py,sha256=h9I1k8kiuQmhX5vZm6VDSr2fa5Finy0sN8ZDIE-jx1c,3700
-pygments/lexers/other.py,sha256=WLVyqPsvm9oSXIbZwbfyJloS6HGgoFW5nVTaU1uQpTw,1763
-pygments/lexers/parasail.py,sha256=DWMGhtyQgGTXbIgQl_mID6CKqi-Dhbvs_dTkmvrZXfE,2719
-pygments/lexers/parsers.py,sha256=feNgxroPoWRf0NEsON2mtmKDUfslIQppukw6ndEsQ3M,26596
-pygments/lexers/pascal.py,sha256=N2tRAjlXnTxggAzzk2tOOAVzeC2MBzrXy97_HQl5n44,30989
-pygments/lexers/pawn.py,sha256=LWUYQYsebMMt2d5oxX1HYWvBqbakR1h7Av_z8Vw94Wg,8253
-pygments/lexers/pddl.py,sha256=Mk4_BzlROJCd0xR4KKRRSrbj0F7LLQcBRjmsmtWmrCg,2989
-pygments/lexers/perl.py,sha256=9BXn3tyHMA49NvzbM9E2czSCHjeU7bvaPLUcoZrhz-4,39192
-pygments/lexers/phix.py,sha256=hZqychqo5sFMBDESzDPXg1DYHQe_9sn294UfbjihaFk,23249
-pygments/lexers/php.py,sha256=l4hzQrlm0525i5dSw9Vmjcai3TzbPT6DkjzxPg9l6Zc,13061
-pygments/lexers/pointless.py,sha256=WSDjqQyGrNIGmTCdaMxl4zk7OZTlJAMzeUZ02kfgcTI,1974
-pygments/lexers/pony.py,sha256=EXrMkacqMZblI7v4AvBRQe-3Py8__bx5FOgjCLdfXxQ,3279
-pygments/lexers/praat.py,sha256=4UFK-nbC6WkZBhJgcQqEGqq9CocJkW7AmT_OJQbjWzk,12676
-pygments/lexers/procfile.py,sha256=05W2fyofLTP-FbEdSXD1eles-PPqVNfF6RWXjQdW2us,1155
-pygments/lexers/prolog.py,sha256=9Kc5YNUFqkfWu2sYoyzC3RX65abf1bm7oHr86z1s4kQ,12866
-pygments/lexers/promql.py,sha256=n-0vo-o8-ZasqP3Va4ujs562UfZSLfZF-RzT71yL0Tk,4738
-pygments/lexers/prql.py,sha256=PFReuvhbv4K5aeu6lvDfw4m-3hULkB3r43bKAy948os,8747
-pygments/lexers/ptx.py,sha256=KSHAvbiNVUntKilQ6EPYoLFocmJpRsBy_7fW6_Nrs1Y,4501
-pygments/lexers/python.py,sha256=WZe7fBAHKZ_BxPg8qIU26UGhk8qwUYyENJ3IyPW64mc,53805
-pygments/lexers/q.py,sha256=WQFUh3JrpK2j-VGW_Ytn3uJ5frUNmQIFnLtMVGRA9DI,6936
-pygments/lexers/qlik.py,sha256=2wqwdfIjrAz6RNBsP4MyeLX8Z7QpIGzxtf1CvaOlr_g,3693
-pygments/lexers/qvt.py,sha256=XMBnsWRrvCDf989OuDeb-KpszAkeETiACyaghZeL1ns,6103
-pygments/lexers/r.py,sha256=B6WgrD9SY1UTCV1fQBSlZbezPfpYsARn3FQIHcFYOiM,6474
-pygments/lexers/rdf.py,sha256=qUzxLna9v071bHhZAjdsBi8dKaJNk_h9g1ZRUAYCfoo,16056
-pygments/lexers/rebol.py,sha256=4u3N4kzui55HapopXDu3Kt0jczxDZ4buzwR7Mt4tQiM,18259
-pygments/lexers/rego.py,sha256=Rx5Gphbktr9ojg5DbqlyxHeQqqtF7g8W-oF0rmloDNY,1748
-pygments/lexers/resource.py,sha256=ioEzgWksB5HCjoz85XNkQPSd7n5kL0SZiuPkJP1hunQ,2927
-pygments/lexers/ride.py,sha256=kCWdxuR3PclVi4wiA0uUx4CYEFwuTqoMsKjhSW4X3yg,5035
-pygments/lexers/rita.py,sha256=Mj1QNxx1sWAZYC02kw8piVckaiw9B0MqQtiIiDFH0pA,1127
-pygments/lexers/rnc.py,sha256=g7ZD334PMGUqy_Ij64laSN1vJerwHqVkegfMCa3E-y8,1972
-pygments/lexers/roboconf.py,sha256=HbYuK5CqmQdd63SRY2nle01r7-p7mil0SnoauYDmEOY,2074
-pygments/lexers/robotframework.py,sha256=c4U1B9Q9ITBCTohqJTZOvkfyeVbenN4xhzSWIoZh5eU,18448
-pygments/lexers/ruby.py,sha256=uG617E5abBZcECRCqkhIfc-IbZcRb5cGuUZq_xpax90,22753
-pygments/lexers/rust.py,sha256=ZY-9vtsreBP0NfDd0WCouLSp_9MChAL8U8Abe-m9PB8,8260
-pygments/lexers/sas.py,sha256=C1Uz2s9DU6_s2kL-cB_PAGPtpyK5THlmhNmCumC1l48,9456
-pygments/lexers/savi.py,sha256=jrmruK0GnXktgBTWXW3oN3TXtofn3HBbkMlHnR84cko,4878
-pygments/lexers/scdoc.py,sha256=DXRmFDmYuc7h3gPAAVhfcL1OEbNBK5RdPpJqQzF3ZTk,2524
-pygments/lexers/scripting.py,sha256=jnJv_AFDyDrpzEPGNat5K6xzUBsEAiBr6N2_yLMt8LQ,81724
-pygments/lexers/sgf.py,sha256=w6C513ENaO2YCnqrduK7k03NaMDf-pgygvfzq2NaSRk,1985
-pygments/lexers/shell.py,sha256=dCS1zwkf5KwTog4__MnMC7h3Xmwv4_d3fnEV29tSwXI,36381
-pygments/lexers/sieve.py,sha256=eob-L84yf2jmhdNyYZUlbUJozdcd6GXcHW68lmAe8WE,2514
-pygments/lexers/slash.py,sha256=I-cRepmaxhL1SgYvD1hHX3gNBFI8NPszdU7hn1o5JlA,8484
-pygments/lexers/smalltalk.py,sha256=ue2PmqDK2sw0j75WdseiiENJBdZ1OwysH2Op1QN1r24,7204
-pygments/lexers/smithy.py,sha256=VREWoeuz7ANap_Uiopn7rs0Tnsfc-xBisDJKRGQY_y8,2659
-pygments/lexers/smv.py,sha256=He_VBSMbWONMWZmkrB5RYR0cfHVnMyKIXz68IFYl-a8,2805
-pygments/lexers/snobol.py,sha256=qDzb41xQQWMNmjB2MtZs23pFoFgZ2gbRZhK_Ir03r7I,2778
-pygments/lexers/solidity.py,sha256=Tixfnwku4Yezj6nNm8xVaw7EdV1qgAgdwahdTFP0St8,3163
-pygments/lexers/soong.py,sha256=Vm18vV4g6T8UPgjjY2yTRlSXGDpZowmuqQUBFfm4A9A,2339
-pygments/lexers/sophia.py,sha256=2YtYIT8iwAoW0B7TZuuoG_ZILhJV-2A7oBGat-98naE,3376
-pygments/lexers/special.py,sha256=8JuR2Vex8X-RWnC36S0HXTHWp2qmZclc90-TrLUWyaY,3585
-pygments/lexers/spice.py,sha256=m4nK0q4Sq_OFQez7kGWfki0No4ZV24YrONfHVj1Piqs,2790
-pygments/lexers/sql.py,sha256=2QvawM04xY96nvWadmHgHPDhOFbHGaFAQ_01rbNX_mc,48919
-pygments/lexers/srcinfo.py,sha256=B8vDs-sJogG3mWa5Hp_7JfHHUMyYRwGvKv6cKbFQXLM,1746
-pygments/lexers/stata.py,sha256=Zr9BC52D5O_3BbdW0N-tzoUmy0NTguL2sC-saXRVM-c,6415
-pygments/lexers/supercollider.py,sha256=_H5wDrn0DiGnlhB_cz6Rt_lo2TvqjSm0o6NPTd9R4Ko,3697
-pygments/lexers/tablegen.py,sha256=1JjedXYY18BNiY9JtNGLOtGfiwduNDZpQLBGTeQ6jAw,3987
-pygments/lexers/tact.py,sha256=X_lsxjFUMaC1TmYysXJq9tmAGifRnil83Bt1zA86Xdo,10809
-pygments/lexers/tal.py,sha256=xS9PlaWQOPj8MVr56fUNq31vUQKRWoLTlyWj9ZHm8AM,2904
-pygments/lexers/tcl.py,sha256=lK97ju4nikkt-oGOzIeyFEM98yq4dZSI8uEmYsq0R6c,5512
-pygments/lexers/teal.py,sha256=t3dqy_Arwv8_yExbX_xiFxv1TqJLPv4vh1MVKjKwS4Y,3522
-pygments/lexers/templates.py,sha256=BVdjYeoacIUuFyHTG39j4PxeNCe5E1oUURjH1rITrI4,75731
-pygments/lexers/teraterm.py,sha256=ciwztagW5Drg2gr17Qykrh6GwMsKy7e4xdQshX95GyQ,9718
-pygments/lexers/testing.py,sha256=YZgDgUEaLEYKSKEqpDsUi3Bn-Db_D42IlyiSsr1oX8U,10810
-pygments/lexers/text.py,sha256=nOCQPssIlKdVWU3PKxZiBPkf_KFM2V48IOssSyqhFY8,1068
-pygments/lexers/textedit.py,sha256=ttT4Ph-hIdgFLG6maRy_GskkziTFK0Wcg28yU0s6lek,7760
-pygments/lexers/textfmts.py,sha256=mi9KLEq4mrzDJbEc8G3VM-mSki_Tylkzodu47yH6z84,15524
-pygments/lexers/theorem.py,sha256=51ppBAEdhJmwU_lC916zMyjEoKLXqf89VAE_Lr0PNCc,17855
-pygments/lexers/thingsdb.py,sha256=x_fHNkLA-hIJyeIs6rg_X8n5OLYvFqaSu1FhI3apI5Y,6017
-pygments/lexers/tlb.py,sha256=ue2gqm45BI512lM13O8skAky9zAb7pLMrxZ8pbt5zRU,1450
-pygments/lexers/tls.py,sha256=_uQUVuMRDOhN-XUyGR5DIlVCk1CUZ1fIOSN4_WQYPKk,1540
-pygments/lexers/tnt.py,sha256=pK4LgoKON7u1xF66JYFncAPSbD8DZaeI_WTZ9HqEFlY,10456
-pygments/lexers/trafficscript.py,sha256=X3B8kgxS54ecuok9ic6Hkp-UMn5DvOmCK0p70Tz27Cw,1506
-pygments/lexers/typoscript.py,sha256=mBuePiVZUoAORPKsHwrx6fBWiy3fAIqG-2O67QmMiFI,8332
-pygments/lexers/typst.py,sha256=zIJBEhUXtWp5OiyAmvFA5m8d1EQG-ocwrJ677dvTUAk,7167
-pygments/lexers/ul4.py,sha256=rCaw0J9j3cdql9lX_HTilg65k9-9S118zOA6TAYfxaM,10499
-pygments/lexers/unicon.py,sha256=RAqoCnAAJBYOAGdR8ng0g6FtB39bGemLRlIqv5mcg9E,18625
-pygments/lexers/urbi.py,sha256=ajNP70NJg32jNnFDZsLvr_-4TToSGqRGkFyAPIJLfCU,6082
-pygments/lexers/usd.py,sha256=2eEGouolodYS402P_gtBrn4lLzpg1z8uHwPCKqjUb_k,3304
-pygments/lexers/varnish.py,sha256=dSh0Ku9SrjmlB29Fi_mWdWavN7M0cMKeepR4a34sOyI,7473
-pygments/lexers/verification.py,sha256=Qu433Q_h3EK3uS4bJoLRFZK0kIVwzX5AFKsa4Z-qnxA,3934
-pygments/lexers/verifpal.py,sha256=buyOOzCo_dGnoC40h0tthylHVVpgDt8qXu4olLvYy_4,2661
-pygments/lexers/vip.py,sha256=2lEV4cLV9p4E37wctBL7zkZ4ZU4p3HVsiLJFzB1bie0,5711
-pygments/lexers/vyper.py,sha256=Zq6sQIUBk6mBdpgOVgu3A6swGoBne0kDlRyjZznm2BY,5615
-pygments/lexers/web.py,sha256=4W9a7vcskrGJnxt4KmoE3SZydWB1qLq7lP2XS85J_m8,913
-pygments/lexers/webassembly.py,sha256=zgcMouzLawcbeFr6w_SOvGoUR68ZtqnnsbOcWEVleLk,5698
-pygments/lexers/webidl.py,sha256=ODtVmw4gVzI8HQWxuEckP6KMwm8WP2G2lSZEjagDXts,10516
-pygments/lexers/webmisc.py,sha256=-_-INDVdk47e2jlj-9bFcuLtntqVorBqIjlnwPfZFdI,40564
-pygments/lexers/wgsl.py,sha256=9igd9dzixGIgNewruv9mPnFms-c9BahkZcCCrZygv84,11880
-pygments/lexers/whiley.py,sha256=lMr750lA4MZsB4xqzVsIRtVMJIC3_dArhFYTHvOPwvA,4017
-pygments/lexers/wowtoc.py,sha256=8xxvf0xGeYtf4PE7KtkHZ_ly9xY_XXHrpCitdKE42Ro,4076
-pygments/lexers/wren.py,sha256=goGXnAMKKa13LLL40ybT3aMGPrk3gCRwZQFYAkKB_w0,3229
-pygments/lexers/x10.py,sha256=Q-AmgdF2E-N7mtOPpZ07CsxrTVnikyqC4uRRv6H75sk,1943
-pygments/lexers/xorg.py,sha256=9ttrBd3_Y2nXANsqtMposSgblYmMYqWXQ-Iz5RH9RsU,925
-pygments/lexers/yang.py,sha256=13CWbSaNr9giOHz4o0SXSklh0bfWt0ah14jJGpTvcn0,4499
-pygments/lexers/yara.py,sha256=jUSv78KTDfguCoAoAZKbYzQERkkyxBBWv5dInVrkDxo,2427
-pygments/lexers/zig.py,sha256=f-80MVOSp1KnczAMokQLVM-_wAEOD16EcGFnaCNlsN0,3976
-pygments/modeline.py,sha256=K5eSkR8GS1r5OkXXTHOcV0aM_6xpk9eWNEIAW-OOJ2g,1005
-pygments/plugin.py,sha256=tPx0rJCTIZ9ioRgLNYG4pifCbAwTRUZddvLw-NfAk2w,1891
-pygments/regexopt.py,sha256=wXaP9Gjp_hKAdnICqoDkRxAOQJSc4v3X6mcxx3z-TNs,3072
-pygments/scanner.py,sha256=nNcETRR1tRuiTaHmHSTTECVYFPcLf6mDZu1e4u91A9E,3092
-pygments/sphinxext.py,sha256=VEe_oHNgLoEGMHc2ROfbee2mF2PPREFyE6_m_JN5FvQ,7898
-pygments/style.py,sha256=Cpw9dCAyW3_JAwFRXOJXmtKb5ZwO2_5KSmlq6q4fZw4,6408
-pygments/styles/__init__.py,sha256=f9KCQXN4uKbe8aI8-L3qTC-_XPfT563FwTg6VTGVfwI,2006
-pygments/styles/_mapping.py,sha256=6lovFUE29tz6EsV3XYY4hgozJ7q1JL7cfO3UOlgnS8w,3312
-pygments/styles/abap.py,sha256=64Uwr8uPdEdcT-tE-Y2VveTXfH3SkqH9qdMgY49YHQI,749
-pygments/styles/algol.py,sha256=fCuk8ITTehvbJSufiaKlgnFsKbl-xFxxR82xhltc-cQ,2262
-pygments/styles/algol_nu.py,sha256=Gv9WfHJvYegGcUk1zcufQgsdXPNjCUNk8sAHyrSGGh4,2283
-pygments/styles/arduino.py,sha256=NoUB8xk7M1HGPoLfuySOLU0sVwoTuLcZqllXl2EO_iE,4557
-pygments/styles/autumn.py,sha256=fLLfjHXjxCl6crBAxEsBLH372ALMkFacA2bG6KFbJi4,2195
-pygments/styles/borland.py,sha256=_0ySKp4KGCSgtYjPe8uzD6gQhlmAIR4T43i-FoRYNOM,1611
-pygments/styles/bw.py,sha256=vhk8Xoj64fLPdA9IQU6mUVsYMel255jR-FDU7BjIHtI,1406
-pygments/styles/coffee.py,sha256=NqLt-fc7LONma1BGggbceVRY9uDE70WBuZXqK4zwaco,2308
-pygments/styles/colorful.py,sha256=mYcSbehtH7itH_QV9NqJp4Wna1X4lrwl2wkVXS2u-5A,2832
-pygments/styles/default.py,sha256=RTgG2zKWWUxPTDCFxhTnyZI_WZBIVgu5XsUpNvFisCA,2588
-pygments/styles/dracula.py,sha256=vRJmixBoSKV9o8NVQhXGViQqchhIYugfikLmvX0DoBw,2182
-pygments/styles/emacs.py,sha256=TiOG9oc83qToMCRMnJrXtWYqnzAqYycRz_50OoCKtxc,2535
-pygments/styles/friendly.py,sha256=oAi-l9anQTs9STDmUzXGDlOegatEOH4hpD0j6o6dZGM,2604
-pygments/styles/friendly_grayscale.py,sha256=a7Cqkzt6-uTiXvj6GoYBXzRvX5_zviCjjRB04Kf_-Q0,2828
-pygments/styles/fruity.py,sha256=GfSUTG0stlJr5Ow_saCaxbI2IB4-34Dp2TuRTpfUJBs,1324
-pygments/styles/gh_dark.py,sha256=ruNX3d4rf22rx-8HnwvGbNbXRQpXCNcHU1HNq6N4uNg,3590
-pygments/styles/gruvbox.py,sha256=KrFoHEoVnZW6XM9udyXncPomeGyZgIDsNWOH3kCrxFQ,3387
-pygments/styles/igor.py,sha256=fYYPhM0dRCvcDTMVrMVO5oFKnYm-8YVlsuVBoczFLtY,737
-pygments/styles/inkpot.py,sha256=jggSeX9NV15eOL2oJaVmZ6vmV7LWRzXJQRUqcWEqGRs,2404
-pygments/styles/lightbulb.py,sha256=Y8u1qdvlHfBqI2jJex55SkvVatVo_FjEUzE6h-X7m-0,3172
-pygments/styles/lilypond.py,sha256=Y6fp_sEL-zESmxAaMxzjtrKk90cuDC_DalNdC8wj0nw,2066
-pygments/styles/lovelace.py,sha256=cA9uhmbnzY04MccsiYSgMY7fvb4WMRbegWBUrGvXh1M,3178
-pygments/styles/manni.py,sha256=g9FyO7plTwfMm2cU4iiKgdlkMlvQLG6l2Lwkgz5ITS4,2443
-pygments/styles/material.py,sha256=LDmgomAbgtJDZhbv446_zIwgYh50UAqEEtgYNUns1rQ,4201
-pygments/styles/monokai.py,sha256=lrxTJpkBarV9gTLkBQryZ6oNSjekAVheJueKJP5iEYA,5184
-pygments/styles/murphy.py,sha256=-AKZiLkpiWej-otjHMsYCE-I-_IzCOLJY-_GBdKRZRw,2805
-pygments/styles/native.py,sha256=l6tezGSQTB8p_SyOXJ0PWI7KzCeEdtsPmVc4Yn4_CwU,2043
-pygments/styles/nord.py,sha256=GDt3WAaqaWsiCeqpIBPxd8TEUX708fGfwaA7S0w0oy0,5391
-pygments/styles/onedark.py,sha256=k80cZEppCEF-HLoxy_FEA0QmQDZze68nHVMNGyUVa28,1719
-pygments/styles/paraiso_dark.py,sha256=Jkrg4nUKIVNF8U4fPNV_Smq_g9NFbb9eiUrjYpVgQZg,5662
-pygments/styles/paraiso_light.py,sha256=MxN964ZEpze3wF0ss-igaa2I7E684MHe-Zq0rWPH3wo,5668
-pygments/styles/pastie.py,sha256=ZvAs9UpBNYFC-5PFrCRGYnm3FoPKb-eKR-ozbWZP-4g,2525
-pygments/styles/perldoc.py,sha256=HSxB93e4UpQkZspReQ34FeJbZ-59ksGvdaH-hToehi8,2230
-pygments/styles/rainbow_dash.py,sha256=4ugL18Or7aNtaLfPfCLFRiFy0Gu2RA4a9G2LQUE9SrM,2390
-pygments/styles/rrt.py,sha256=fgzfpC0PC_SCcLOMCNEIQTjPUMOncRe7SR10GfSRbXY,1006
-pygments/styles/sas.py,sha256=yzoXmbfQ2ND1WWq93b4vVGYkQSZHPqb4ymes9YYRT3w,1440
-pygments/styles/solarized.py,sha256=qupILFZn02WspnAF5SPYb-W8guo9xnUtjb1HeLw3XgE,4247
-pygments/styles/staroffice.py,sha256=CLbBeMoxay21Xyu3Af2p4xUXyG1_6ydCbvs5RJKYe5w,831
-pygments/styles/stata_dark.py,sha256=vX8SwHV__sG92F4CKribG08MJfSVq98dgs7gEA_n9yc,1257
-pygments/styles/stata_light.py,sha256=uV3GE-ylvffQ0yN3py1YAVqBB5wflIKZbceyK1Lqvrc,1289
-pygments/styles/tango.py,sha256=O2wcM4hHuU1Yt071M9CK7JPtiiSCqyxtT9tbiQICV28,7137
-pygments/styles/trac.py,sha256=9kMv1ZZyMKACWlx2fQVjRP0I2pgcRYCNrd7iGGZg9qk,1981
-pygments/styles/vim.py,sha256=J7_TqvrGkTX_XuTHW0In5wqPLAUPRWyr1122XueZWmM,2019
-pygments/styles/vs.py,sha256=s7YnzbIPuFU3LIke27mc4lAQSn2R3vbbHc1baMGSU_U,1130
-pygments/styles/xcode.py,sha256=PbQdzgGaA4a9LAU1i58alY9kM4IFlQX5jHQwOYmf_Rk,1504
-pygments/styles/zenburn.py,sha256=suZEKzBTCYdhf2cxNwcY7UATJK1tq5eYhGdBcXdf6MU,2203
-pygments/token.py,sha256=WbdWGhYm_Vosb0DDxW9lHNPgITXfWTsQmHt6cy9RbcM,6226
-pygments/unistring.py,sha256=al-_rBemRuGvinsrM6atNsHTmJ6DUbw24q2O2Ru1cBc,63208
-pygments/util.py,sha256=oRtSpiAo5jM9ulntkvVbgXUdiAW57jnuYGB7t9fYuhc,10031
diff --git a/libs/pygments-2.19.1.dist-info/WHEEL b/libs/pygments-2.19.1.dist-info/WHEEL
deleted file mode 100644
index 12228d414b..0000000000
--- a/libs/pygments-2.19.1.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.27.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/pycountry-24.6.1.dist-info/INSTALLER b/libs/pygments-2.19.2.dist-info/INSTALLER
similarity index 100%
rename from libs/pycountry-24.6.1.dist-info/INSTALLER
rename to libs/pygments-2.19.2.dist-info/INSTALLER
diff --git a/libs/pygments-2.19.2.dist-info/METADATA b/libs/pygments-2.19.2.dist-info/METADATA
new file mode 100644
index 0000000000..2eff6a0c38
--- /dev/null
+++ b/libs/pygments-2.19.2.dist-info/METADATA
@@ -0,0 +1,58 @@
+Metadata-Version: 2.4
+Name: Pygments
+Version: 2.19.2
+Summary: Pygments is a syntax highlighting package written in Python.
+Project-URL: Homepage, https://pygments.org
+Project-URL: Documentation, https://pygments.org/docs
+Project-URL: Source, https://github.com/pygments/pygments
+Project-URL: Bug Tracker, https://github.com/pygments/pygments/issues
+Project-URL: Changelog, https://github.com/pygments/pygments/blob/master/CHANGES
+Author-email: Georg Brandl <georg@python.org>
+Maintainer: Matthรคus G. Chajdas
+Maintainer-email: Georg Brandl <georg@python.org>, Jean Abou Samra <jean@abou-samra.fr>
+License: BSD-2-Clause
+License-File: AUTHORS
+License-File: LICENSE
+Keywords: syntax highlighting
+Classifier: Development Status :: 6 - Mature
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Text Processing :: Filters
+Classifier: Topic :: Utilities
+Requires-Python: >=3.8
+Provides-Extra: plugins
+Provides-Extra: windows-terminal
+Requires-Dist: colorama>=0.4.6; extra == 'windows-terminal'
+Description-Content-Type: text/x-rst
+
+Pygments
+~~~~~~~~
+
+Pygments is a syntax highlighting package written in Python.
+
+It is a generic syntax highlighter suitable for use in code hosting, forums,
+wikis or other applications that need to prettify source code.  Highlights
+are:
+
+* a wide range of over 500 languages and other text formats is supported
+* special attention is paid to details, increasing quality by a fair amount
+* support for new languages and formats are added easily
+* a number of output formats, presently HTML, LaTeX, RTF, SVG, all image
+  formats that PIL supports and ANSI sequences
+* it is usable as a command-line tool and as a library
+
+Copyright 2006-2025 by the Pygments team, see ``AUTHORS``.
+Licensed under the BSD, see ``LICENSE`` for details.
diff --git a/libs/pygments-2.19.2.dist-info/RECORD b/libs/pygments-2.19.2.dist-info/RECORD
new file mode 100644
index 0000000000..a7b490ad48
--- /dev/null
+++ b/libs/pygments-2.19.2.dist-info/RECORD
@@ -0,0 +1,347 @@
+../../bin/pygmentize,sha256=fEHn7Q2L56HE6EpmQFzaq1L3_hYLGbRUcUwIerLenIY,191
+pygments-2.19.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pygments-2.19.2.dist-info/METADATA,sha256=euEA1n1nAGxkeYA92DX89HqbWfrHlEQeqOZqp_WYTYI,2512
+pygments-2.19.2.dist-info/RECORD,,
+pygments-2.19.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pygments-2.19.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pygments-2.19.2.dist-info/entry_points.txt,sha256=uUXw-XhMKBEX4pWcCtpuTTnPhL3h7OEE2jWi51VQsa8,53
+pygments-2.19.2.dist-info/licenses/AUTHORS,sha256=BmDjGKbyFYAq3Icxq4XQxl_yfPzKP10oWX8wZHYZW9k,10824
+pygments-2.19.2.dist-info/licenses/LICENSE,sha256=qdZvHVJt8C4p3Oc0NtNOVuhjL0bCdbvf_HBWnogvnxc,1331
+pygments/__init__.py,sha256=_3UT86TGpHuW8FekdZ8uLidEZH1NhmcLiOy2KKNPCt4,2959
+pygments/__main__.py,sha256=p8AJyoyCOMYGvzWHdnq0_A9qaaVqaj02nIu3xhJp1_4,348
+pygments/cmdline.py,sha256=4pL9Kpn2PUEKPobgrsQgg-vCx2NjsrapKzQ6LxQR7Q0,23536
+pygments/console.py,sha256=AagDWqwea2yBWf10KC9ptBgMpMjxKp8yABAmh-NQOVk,1718
+pygments/filter.py,sha256=YLtpTnZiu07nY3oK9nfR6E9Y1FBHhP5PX8gvkJWcfag,1910
+pygments/filters/__init__.py,sha256=B00KqPCQh5E0XhzaDK74Qa1E4fDSTlD6b0Pvr1v-vEQ,40344
+pygments/formatter.py,sha256=H_4J-moKkKfRWUOW9J0u7hhw6n1LiO-2Xu1q2B0sE5w,4366
+pygments/formatters/__init__.py,sha256=7OuvmoYLyoPzoOQV_brHG8GSKYB_wjFSkAQng6x2y9g,5349
+pygments/formatters/_mapping.py,sha256=1Cw37FuQlNacnxRKmtlPX4nyLoX9_ttko5ZwscNUZZ4,4176
+pygments/formatters/bbcode.py,sha256=s0Ka35OKuIchoSgEAGf6rj0rl2a9ym9L31JVNSRbZFQ,3296
+pygments/formatters/groff.py,sha256=pLcIHj4jJS_lRAVFnyJODKDu1Xlyl9_AEIdOtbl3DT0,5082
+pygments/formatters/html.py,sha256=FrHJ69FUliEyPY0zTfab0C1gPf7LXsKgeRlhwkniqIs,35953
+pygments/formatters/img.py,sha256=aRpFo8mBmWTL3sBUjRCWkeS3rc6FZrSFC4EksDrl53g,23301
+pygments/formatters/irc.py,sha256=R0Js0TYWySlI2yE9sW6tN4d4X-x3k9ZmudsijGPnLmU,4945
+pygments/formatters/latex.py,sha256=BRYtbLeW_YD1kwhhnFInhJIKylurnri8CF1lP069KWE,19258
+pygments/formatters/other.py,sha256=8pYW27sU_7XicLUqOEt2yWSO0h1IEUM3TIv34KODLwo,4986
+pygments/formatters/pangomarkup.py,sha256=pcFvEC7K1Me0EjGeOZth4oCnEY85bfqc77XzZASEPpY,2206
+pygments/formatters/rtf.py,sha256=kcKMCxTXu-2-hpgEftlGJRm7Ss-yA_Sy8OsHH_qzykA,11921
+pygments/formatters/svg.py,sha256=R6A2ME6JsMQWFiyn8wcKwFUOD6vsu-HLwiIztLu-77E,7138
+pygments/formatters/terminal.py,sha256=J_F_dFXwR9LHWvatIDnwqRYJyjVmSo1Zx8K_XDh6SyM,4626
+pygments/formatters/terminal256.py,sha256=7GQFLE5cfmeu53CAzANO74-kBk2BFkXfn5phmZjYkhM,11717
+pygments/lexer.py,sha256=ib-F_0GxHkwGpb6vWP0DeLMLc7EYgjo3hWFKN5IgOq0,35109
+pygments/lexers/__init__.py,sha256=6YhzxGKlWk38P6JpIJUQ1rVvV0DEZjEmdYsdMQ58hSk,12067
+pygments/lexers/_ada_builtins.py,sha256=CA_OnShtdc7wWh9oYcRlcrkDAQwYUKl6w7tdSbALQd4,1543
+pygments/lexers/_asy_builtins.py,sha256=cd9M00YH19w5ZL7aqucmC3nwpJGTS04U-01NLy5E2_4,27287
+pygments/lexers/_cl_builtins.py,sha256=kQeUIyZjP4kX0frkICDcKxBYQCLqzIDXa5WV5cevhDo,13994
+pygments/lexers/_cocoa_builtins.py,sha256=Ka1lLJe7JfWtdho4IFIB82X9yBvrbfHCCmEG-peXXhQ,105173
+pygments/lexers/_csound_builtins.py,sha256=qnQYKeI26ZHim316uqy_hDiRiCoHo2RHjD3sYBALyXs,18414
+pygments/lexers/_css_builtins.py,sha256=aD-dhLFXVd1Atn_bZd7gEdQn7Mhe60_VHpvZ340WzDI,12446
+pygments/lexers/_googlesql_builtins.py,sha256=IkrOk-T2v1yzbGzUEEQh5_Cf4uC_cmL_uuhwDpZlTug,16132
+pygments/lexers/_julia_builtins.py,sha256=N2WdSw5zgI2fhDat_i4YeVqurRTC_P8x71ez00SCN6U,11883
+pygments/lexers/_lasso_builtins.py,sha256=8q1gbsrMJeaeUhxIYKhaOxC9j_B-NBpq_XFj2Ze41X0,134510
+pygments/lexers/_lilypond_builtins.py,sha256=XTbGL1z1oKMoqWLEktG33jx5GdGTI9CpeO5NheEi4Y0,108094
+pygments/lexers/_lua_builtins.py,sha256=PhFdZV5-Tzz2j_q4lvG9lr84ELGfL41BhnrSDNNTaG4,8108
+pygments/lexers/_luau_builtins.py,sha256=-IDrU04kUVfjXwSQzMMpXmMYhNsQxZVVZk8cuAA0Lo0,955
+pygments/lexers/_mapping.py,sha256=9fv7xYOUAOr6LzfdFS4MDbPu78o4OQQH-2nsI1bNZf4,70438
+pygments/lexers/_mql_builtins.py,sha256=ybRQjlb7Cul0sDstnzxJl3h0qS6Ieqsr811fqrxyumU,24713
+pygments/lexers/_mysql_builtins.py,sha256=y0kAWZVAs0z2dTFJJV42OZpILgRnd8T3zSlBFv-g_oA,25838
+pygments/lexers/_openedge_builtins.py,sha256=Sz4j9-CPWIaxMa-2fZgY66j7igcu1ob1GR2UtI8zAkg,49398
+pygments/lexers/_php_builtins.py,sha256=Jd4BZpjMDELPi4EVoSxK1-8BFTc63HUwYfm1rLrGj0M,107922
+pygments/lexers/_postgres_builtins.py,sha256=Pqh4z0RBRbnW6rCQtWUdzWCJxNyqpJ7_0HOktxHDxk4,13343
+pygments/lexers/_qlik_builtins.py,sha256=xuJy9c9uZDXv6h8z582P5PrxqkxTZ_nS8gPl9OD9VN8,12595
+pygments/lexers/_scheme_builtins.py,sha256=2hNtJOJmP21lUsikpqMJ2gAmLT3Rwn_KEeqhXwCjgfk,32564
+pygments/lexers/_scilab_builtins.py,sha256=oZYPB1XPdIEz3pII11pFDe6extRRyWGA7pY06X8KZ8w,52411
+pygments/lexers/_sourcemod_builtins.py,sha256=H8AFLsNDdEpymIWOpDwbDJGCP1w-x-1gSlzPDioMF4o,26777
+pygments/lexers/_sql_builtins.py,sha256=oe8F9wWuO2iS6nEsZAdJtCUChBTjgM1Sq_aipu74jXM,6767
+pygments/lexers/_stan_builtins.py,sha256=dwi1hllM_NsaCv-aXJy7lEi57X5Hh5gSD97aCQyT9KM,13445
+pygments/lexers/_stata_builtins.py,sha256=Hqrr6j77zWU3cGGpBPohwexZci43YA4_sVYE4E1sNow,27227
+pygments/lexers/_tsql_builtins.py,sha256=Pi2RhTXcLE3glI9oxNhyVsOMn-fK_1TRxJ-EsYP5LcI,15460
+pygments/lexers/_usd_builtins.py,sha256=c9hbU1cwqBUCFIhNfu_Dob8ywv1rlPhi9w2OTj3kR8s,1658
+pygments/lexers/_vbscript_builtins.py,sha256=MqJ2ABywD21aSRtWYZRG64CCbGstC1kfsiHGJmZzxiw,4225
+pygments/lexers/_vim_builtins.py,sha256=bA4mH8t1mPPQfEiUCKEqRO1O0rL2DUG0Ux1Bt8ZSu0E,57066
+pygments/lexers/actionscript.py,sha256=JBngCe5UhYT_0dLD2j7PnPO0xRRJhmypEuQ-C5in8pY,11727
+pygments/lexers/ada.py,sha256=58k5ra1vGS4iLpW3h1ItY9ftzF3WevaeAAXzAYTiYkQ,5353
+pygments/lexers/agile.py,sha256=DN-7AVIqtG1MshA94rtSGYI_884hVHgzq405wD0_dl8,896
+pygments/lexers/algebra.py,sha256=yGTu9Tt-cQzAISQYIC5MS5a3z4QmL-tGcXnd_pkWGbk,9952
+pygments/lexers/ambient.py,sha256=UnzKpIlfSm3iitHvMd7XTMSY8TjZYYhKOC3AiARS_cE,2605
+pygments/lexers/amdgpu.py,sha256=S8qjn2UMLhBFm3Yn_c06XAGf8cl5x_ZeluelWG_-JAw,1723
+pygments/lexers/ampl.py,sha256=ZBRfDXm760gR1a1gqItnsHuoO3JdUcTBjJ5tFY9UtPA,4176
+pygments/lexers/apdlexer.py,sha256=Zr5-jgjxC8PKzRlEeclakZXPHci7FHBZghQ6wwiuT7A,30800
+pygments/lexers/apl.py,sha256=PTQMp-bxT5P-DbrEvFha10HBTcsDJ5srL3I1s9ljz58,3404
+pygments/lexers/archetype.py,sha256=pQVlP1Fb5OA8nn7QwmFaaaOSvvpoIsQVw43FVCQCve4,11538
+pygments/lexers/arrow.py,sha256=2PKdbWq3xQLF1KoDbWvSxpjwKRrznnDiArTflRGZzBo,3564
+pygments/lexers/arturo.py,sha256=U5MtRNHJtnBn4ZOeWmW6MKlVRG7SX6KhTRamDqzn9tA,11414
+pygments/lexers/asc.py,sha256=-DgZl9jccBDHPlDmjCsrEqx0-Q7ap7XVdNKtxLNWG1w,1693
+pygments/lexers/asm.py,sha256=xm2Y5mcT-sF3oQvair4SWs9EWTyndoaUoSsDy5v6shI,41967
+pygments/lexers/asn1.py,sha256=BlcloIX2bu6Q7BxGcksuhYFHGsXLVKyB4B9mFd4Pj6E,4262
+pygments/lexers/automation.py,sha256=Q61qon8EwpfakMh_2MS2E2zUUT16rG3UNIKPYjITeTs,19831
+pygments/lexers/bare.py,sha256=tWoei86JJX1k-ADhaXd5TgX6ItDTici9yFWpkTPhnfM,3020
+pygments/lexers/basic.py,sha256=qpVe5h8Fa7NJo1EihN-4R_UZpHO6my2Ssgkb-BktkKs,27989
+pygments/lexers/bdd.py,sha256=yysefcOFAEyk9kJ2y4EXmzJTecgLYUHlWixt_3YzPMU,1641
+pygments/lexers/berry.py,sha256=zxGowFb8HMIyN15-m8nmWnW6bPRR4esKtSEVugc9uXM,3209
+pygments/lexers/bibtex.py,sha256=yuNoPxwrJf9DCGUT17hxfDzbq_HtCLkQkRbBtiTVmeQ,4811
+pygments/lexers/blueprint.py,sha256=NzvWHMxCLDWt8hc6gB5jokltxVJgNa7Jwh4c61ng388,6188
+pygments/lexers/boa.py,sha256=dOot1XWNZThPIio2UyAX67K6EpISjSRCFjotD7dcnwE,3921
+pygments/lexers/bqn.py,sha256=nJiwrPKKbRF-qdai5tfqipwBkkko2P3weiZAjHUMimY,3671
+pygments/lexers/business.py,sha256=lRtekOJfsDkb12AGbuz10-G67OJrVJgCBtihTQ8_aoY,28345
+pygments/lexers/c_cpp.py,sha256=D7ZIswaHASlGBgoTlwnSqTQHf8_JyvvSt2L2q1W-F6g,18059
+pygments/lexers/c_like.py,sha256=FTGp17ds6X2rDZOHup2hH6BEn3gKK4nLm9pydNEhm0E,32021
+pygments/lexers/capnproto.py,sha256=XQJAh1WS-0ulqbTn9TdzR6gEgWLcuBqb4sj3jNsrhsY,2174
+pygments/lexers/carbon.py,sha256=av12YuTGZGpOa1Cmxp3lppx3LfSJUWbvOu0ixmUVll0,3211
+pygments/lexers/cddl.py,sha256=MKa70IwABgjBjYu15_Q9v8rsu2sr1a-i2jkiaPTI6sM,5076
+pygments/lexers/chapel.py,sha256=0n_fL3ehLC4pw4YKnmq9jxIXOJcxGPka1Wr1t1zsXPc,5156
+pygments/lexers/clean.py,sha256=dkDPAwF5BTALPeuKFoRKOSD3RfsKcGWbaRo6_G8LHng,6418
+pygments/lexers/codeql.py,sha256=ebvghn2zbrnETV4buVozMDmRCVKSdGiIN8ycLlHpGsE,2576
+pygments/lexers/comal.py,sha256=TC3NzcJ58ew5jw7qwK0kJ-okTA47psZje0yAIS39HR4,3179
+pygments/lexers/compiled.py,sha256=Slfo1sjWqcPawUwf0dIIZLBCL5pkOIoAX2S8Lxs02Mc,1426
+pygments/lexers/configs.py,sha256=wW8pY0Sa5a10pnAeTLGf48HhixQTVageIyHEf1aYMCc,50913
+pygments/lexers/console.py,sha256=-jAG120dupvV3kG3zC70brLJvSLwTFqMubBQuj_GVnU,4180
+pygments/lexers/cplint.py,sha256=DkbyE5EKydLgf6BRr1FhQrK-IeQPL7Zmjk0DVdlRFnQ,1389
+pygments/lexers/crystal.py,sha256=xU-RnpIkpjrquoxtOuOcP8fcesSJl4xhU7kO9m42LZY,15754
+pygments/lexers/csound.py,sha256=ioSw4Q04wdwjUAbnTZ1qLhUq1vxdWFxhh3QtEl5RAJc,16998
+pygments/lexers/css.py,sha256=JN1RBYsee-jrpHWrSmhN3TKc4TkOBn-_BEGpgTCzcqE,25376
+pygments/lexers/d.py,sha256=piOy0EJeiAwPHugiM3gVv0z7HNh3u2gZQoCUSASRbY4,9920
+pygments/lexers/dalvik.py,sha256=deFg2JPBktJ9mEGb9EgxNkmd6vaMjJFQVzUHo8NKIa8,4606
+pygments/lexers/data.py,sha256=o0x0SmB5ms_CPUPljEEEenOON4IQWn86DkwFjkJYCOg,27026
+pygments/lexers/dax.py,sha256=ASi73qmr7OA7cVZXF2GTYGt01Ly1vY8CgD_Pnpm8k-4,8098
+pygments/lexers/devicetree.py,sha256=RecSQCidt8DRE1QFCPUbwwR0hiRlNtsFihdGldeUn3k,4019
+pygments/lexers/diff.py,sha256=F6vxZ64wm5Nag_97de1H_3F700ZwCVnYjKvtT5jilww,5382
+pygments/lexers/dns.py,sha256=Hh5hJ7MXfrq36KgfyIRwK3X8o1LdR98IKERcV4eZ7HY,3891
+pygments/lexers/dotnet.py,sha256=NDE0kOmpe96GLO-zwNLazmj77E9ORGmKpa4ZMCXDXxQ,39441
+pygments/lexers/dsls.py,sha256=GnHKhGL5GxsRFnqC7-65NTPZLOZdmnllNrGP86x_fQE,36746
+pygments/lexers/dylan.py,sha256=7zZ1EbHWXeVHqTD36AqykKqo3fhuIh4sM-whcxUaH_Y,10409
+pygments/lexers/ecl.py,sha256=vhmpa2LBrHxsPkYcf3kPZ1ItVaLRDTebi186wY0xGZA,6371
+pygments/lexers/eiffel.py,sha256=5ydYIEFcgcMoEj4BlK31hZ0aJb8OX0RdAvuCNdlxwqw,2690
+pygments/lexers/elm.py,sha256=uRCddU8jK5vVkH6Y66y8KOsDJprIfrOgeYq3hv1PxAM,3152
+pygments/lexers/elpi.py,sha256=O9j_WKBPyvNFjCRuPciVpW4etVSnILm_T79BhCPZYmo,6877
+pygments/lexers/email.py,sha256=ZZL6yvwCRl1CEQyysuOu0lbabp5tjMutS7f3efFKGR4,4804
+pygments/lexers/erlang.py,sha256=bU11eVHvooLwmVknzN6Xkb2DMk7HbenqdNlYSzhThDM,19147
+pygments/lexers/esoteric.py,sha256=Jfp8UUKyKYsqLaqXRZT3GSM9dzkF65zduwfnH1GoGhU,10500
+pygments/lexers/ezhil.py,sha256=22r-xjvvBVpExTqCI-HycAwunDb1p5gY4tIfDmM0vDw,3272
+pygments/lexers/factor.py,sha256=urZ4En4uKFCLXdEkXLWg9EYUFGHQTTDCwNXtyq-ngok,19530
+pygments/lexers/fantom.py,sha256=JJ13-NwykD-iIESnuzCefCYeQDO95cHMJA8TasF4gHA,10231
+pygments/lexers/felix.py,sha256=F-v0si4zPtRelqzDQWXI1-tarCE-BvawziODxRU7378,9655
+pygments/lexers/fift.py,sha256=rOCwp3v5ocK5YOWvt7Td3Md--97_8e-7Sonx52uS8mA,1644
+pygments/lexers/floscript.py,sha256=aHh82k52jMuDuzl9LatrcSANJiXTCyjGU3SO53bwbb0,2667
+pygments/lexers/forth.py,sha256=ZMtsHdNbnS_0IdSYlfAlfTSPEr0MEsRo-YZriQNueTQ,7193
+pygments/lexers/fortran.py,sha256=1PE5dTxf4Df6LUeXFcmNtyeXWsC8tSiK5dYwPHIJeeQ,10382
+pygments/lexers/foxpro.py,sha256=CBkW62Fuibz3yfyelZCaEO8GGdFJWsuRhqwtsSeBwLM,26295
+pygments/lexers/freefem.py,sha256=LFBQk-m1-nNCgrl-VDH3QwnVWurvb7W29i06LoT207A,26913
+pygments/lexers/func.py,sha256=OR2rkM7gf9fKvad5WcFQln-_U_pb-RUCM9eQatToF4A,3700
+pygments/lexers/functional.py,sha256=fYT2AGZ642cRkIAId0rnXFBsx1c8LLEDRN_VuCEkUyM,693
+pygments/lexers/futhark.py,sha256=Vf1i4t-tR3zqaktVjhTzFNg_ts_9CcyA4ZDfDizbCmk,3743
+pygments/lexers/gcodelexer.py,sha256=4Xs9ax4-JZGupW_qSnHon39wQGpb-tNA3xorMKg841E,874
+pygments/lexers/gdscript.py,sha256=Ws7JKxy0M0IyZ_1iMfRvJPrizEwmeCNLDoeMIFaM-CU,7566
+pygments/lexers/gleam.py,sha256=XIlTcq6cB743pCqbNYo8PocSkjZyDPR6hHgdaJNJ1Vc,2392
+pygments/lexers/go.py,sha256=4LezefgyuqZWHzLZHieUkKTi-ssY6aHJxx7Z-LFaLK0,3783
+pygments/lexers/grammar_notation.py,sha256=LvzhRQHgwZzq9oceukZS_hwnKK58ee7Z5d0cwXOR734,8043
+pygments/lexers/graph.py,sha256=WFqoPA1c_hHYrV0i_F7-eUw3Co4_HmZY3GJ-TyDr670,4108
+pygments/lexers/graphics.py,sha256=tmF9NNALnvPnax8ywYC3pLOla45YXtp9UA0H-5EiTQY,39145
+pygments/lexers/graphql.py,sha256=O_zcrGrBaDaKTlUoJGRruxqk7CJi-NR92Y0Cs-KkCvw,5601
+pygments/lexers/graphviz.py,sha256=mzdXOMpwz9_V-be1eTAMyhkKCBl6UxCIXuq6C2yrtsw,1934
+pygments/lexers/gsql.py,sha256=VPZk9sb26-DumRkWfEaSTeoc0lx5xt5n-6eDDLezMtc,3990
+pygments/lexers/hare.py,sha256=PGCOuILktJsmtTpCZZKkMFtObfJuBpei8HM8HHuq1Tw,2649
+pygments/lexers/haskell.py,sha256=MYr74-PAC8kGJRX-dZmvZsHTc7a2u6yFS2B19LfDD7g,33262
+pygments/lexers/haxe.py,sha256=WHCy_nrXHnfLITfbdp3Ji3lqQU4HAsTUpXsLCp2_4sk,30974
+pygments/lexers/hdl.py,sha256=MOWxhmAuE4Ei0CKDqqaON7T8tl43geancrNYM136Z0U,22738
+pygments/lexers/hexdump.py,sha256=1lj9oJ-KiZXSVYvTMfGmEAQzNEW08WlMcC2I5aYvHK4,3653
+pygments/lexers/html.py,sha256=MxYTI4EeT7QxoGleCAyQq-8n_Sgly6tD95H5zanCNmk,21977
+pygments/lexers/idl.py,sha256=rcihUAGhfuGEaSW6pgFq6NzplT_pv0DagUoefg4zAmk,15449
+pygments/lexers/igor.py,sha256=wVefbUjb3ftaW3LCKGtX1JgLgiY4EmRor5gVOn8vQA8,31633
+pygments/lexers/inferno.py,sha256=ChE_5y5SLH_75Uv7D2dKWQMk2dlN6z1gY1IDjlJZ8rU,3135
+pygments/lexers/installers.py,sha256=ZHliit4Pxz1tYKOIjKkDXI5djTkpzYUMVIPR1xvUrL8,14435
+pygments/lexers/int_fiction.py,sha256=0ZzIa1sZDUQsltd1oHuS-BoNiOF8zKQfcVuDyK1Ttv8,56544
+pygments/lexers/iolang.py,sha256=L6dNDCLH0kxkIUi00fI4Z14QnRu79UcNDrgv02c5Zw8,1905
+pygments/lexers/j.py,sha256=DqNdwQGFLiZW3mCNLRg81gpmsy4Hgcai_9NP3LbWhNU,4853
+pygments/lexers/javascript.py,sha256=TGKQLSrCprCKfhLLGAq_0EOdvqvJKX9pOdKo7tCRurQ,63243
+pygments/lexers/jmespath.py,sha256=R5yA5LJ2nTIaDwnFIpSNGAThd0sAYFccwawA9xBptlg,2082
+pygments/lexers/jslt.py,sha256=OeYQf8O2_9FCaf9W6Q3a7rPdAFLthePCtVSgCrOTcl8,3700
+pygments/lexers/json5.py,sha256=8JZbc8EiTEZdKaIdQg3hXEh0mHWSzPlwd473a0nUuT0,2502
+pygments/lexers/jsonnet.py,sha256=bx2G6J4tJqGrJV1PyZrIWzWHXcoefCX-4lIxxtbn2gw,5636
+pygments/lexers/jsx.py,sha256=wGsoGSB40qAJrVfXwRPtan7OcK0O87RVsHHk0m6gogk,2693
+pygments/lexers/julia.py,sha256=0ZDJ9X83V5GqJzA6T6p0TTN8WHy2JAjvu-FSBXvfXdc,11710
+pygments/lexers/jvm.py,sha256=Yt1iQ3QodXRY-x_HUOGedhyuBBHn5jYH-I8NzOzHTlE,72667
+pygments/lexers/kuin.py,sha256=3dKKJVJlskgrvMKv2tY9NOsFfDjyo-3MLcJ1lFKdXSg,11405
+pygments/lexers/kusto.py,sha256=kaxkoPpEBDsBTCvCOkZZx7oGfv0jk_UNIRIRbfVAsBE,3477
+pygments/lexers/ldap.py,sha256=77vF4t_19x9V522cxRCM5d3HW8Ne3giYsFsMPVYYBw4,6551
+pygments/lexers/lean.py,sha256=7HWRgxFsxS1N9XKqw0vfKwaxl27s5YiVYtZeRUoTHFo,8570
+pygments/lexers/lilypond.py,sha256=yd2Tuv67um6EyCIr-VwBnlPhTHxMaQsBJ4nGgO5fjIk,9752
+pygments/lexers/lisp.py,sha256=EHUy1g4pzEsYPE-zGj2rAXm3YATE1j9dCQOr5-JPSkU,157668
+pygments/lexers/macaulay2.py,sha256=zkV-vxjQYa0Jj9TGfFP1iMgpTZ4ApQuAAIdJVGWb2is,33366
+pygments/lexers/make.py,sha256=YMI5DBCrxWca-pz9cVXcyfuHLcikPx9R_3pW_98Myqo,7831
+pygments/lexers/maple.py,sha256=Rs0dEmOMD3C1YQPd0mntN-vzReq4XfHegH6xV4lvJWo,7960
+pygments/lexers/markup.py,sha256=zWtxsyIx_1OxQzS6wLe8bEqglePv4RqvJjbia8AvV5c,65088
+pygments/lexers/math.py,sha256=P3ZK1ePd8ZnLdlmHezo2irCA8T2-nlHBoSaBoT5mEVI,695
+pygments/lexers/matlab.py,sha256=F9KO4qowIhfP8oVhCRRzE_1sqg4zmQbsB2NZH193PiM,133027
+pygments/lexers/maxima.py,sha256=a0h9Ggs9JEovTrzbJT-BLVbOqI29yPnaMZlkU5f_FeY,2715
+pygments/lexers/meson.py,sha256=BMrsDo6BH2lzTFw7JDwQ9SDNMTrRkXCNRDVf4aFHdsI,4336
+pygments/lexers/mime.py,sha256=yGrf3h37LK4b6ERBpFiL_qzn3JgOfGR5KLagnbWFl6c,7582
+pygments/lexers/minecraft.py,sha256=Nu88snDDPzM0D-742fFdUriczL-EE911pAd4_I4-pAw,13696
+pygments/lexers/mips.py,sha256=STKiZT67b3QERXXn7XKVxlPBu7vwbPC5EyCpuf3Jfbw,4656
+pygments/lexers/ml.py,sha256=t8sCv4BjvuBq6AihKKUwStEONIgdXCC2RMtO0RopNbM,35390
+pygments/lexers/modeling.py,sha256=M7B58bGB-Zwd1EmPxKqtRvg7TgNCyem3MVUHv0_H2SQ,13683
+pygments/lexers/modula2.py,sha256=NtpXBRoUCeHfflgB39LknSkCwhBHBKv2Er_pinjVsNE,53072
+pygments/lexers/mojo.py,sha256=8JRVoftN1E-W2woG0K-4n8PQXTUM9iY6Sl5sWb2uGNg,24233
+pygments/lexers/monte.py,sha256=baWU6zlXloenw9MO1MtEVGE9i3CfiXAYhqU621MIjRk,6289
+pygments/lexers/mosel.py,sha256=gjRdedhA1jTjoYoM1Gpaoog_I9o7TRbYMHk97N1TXwg,9297
+pygments/lexers/ncl.py,sha256=zJ6ahlitit4S0pBXc7Wu96PB7xOn59MwfR2HdY5_C60,63999
+pygments/lexers/nimrod.py,sha256=Q1NSqEkLC5wWt7xJyKC-vzWw_Iw2SfDNP_pyMFBuIfA,6413
+pygments/lexers/nit.py,sha256=p_hVD8GzMRl3CABVKHtYgnXFUQk0i5F2FbWFA6WXm6s,2725
+pygments/lexers/nix.py,sha256=NOrv20gdq-2A7eZ6c2gElPHv1Xx2pvv20-qOymL9GMg,4421
+pygments/lexers/numbair.py,sha256=fxkp2CXeXWKBMewfi1H4JSYkmm4kU58wZ2Sh9BDYAWQ,1758
+pygments/lexers/oberon.py,sha256=jw403qUUs7zpTHAs5CbLjb8qiuwtxLk0spDIYqGZwAw,4210
+pygments/lexers/objective.py,sha256=Fo1WB3JMj8sNeYnvB84H4_qwhOt4WNJtJWjVEOwrJGk,23297
+pygments/lexers/ooc.py,sha256=kD1XaJZaihDF_s-Vyu1Bx68S_9zFt2rhox7NF8LpOZM,3002
+pygments/lexers/openscad.py,sha256=h9I1k8kiuQmhX5vZm6VDSr2fa5Finy0sN8ZDIE-jx1c,3700
+pygments/lexers/other.py,sha256=WLVyqPsvm9oSXIbZwbfyJloS6HGgoFW5nVTaU1uQpTw,1763
+pygments/lexers/parasail.py,sha256=DWMGhtyQgGTXbIgQl_mID6CKqi-Dhbvs_dTkmvrZXfE,2719
+pygments/lexers/parsers.py,sha256=feNgxroPoWRf0NEsON2mtmKDUfslIQppukw6ndEsQ3M,26596
+pygments/lexers/pascal.py,sha256=N2tRAjlXnTxggAzzk2tOOAVzeC2MBzrXy97_HQl5n44,30989
+pygments/lexers/pawn.py,sha256=LWUYQYsebMMt2d5oxX1HYWvBqbakR1h7Av_z8Vw94Wg,8253
+pygments/lexers/pddl.py,sha256=Mk4_BzlROJCd0xR4KKRRSrbj0F7LLQcBRjmsmtWmrCg,2989
+pygments/lexers/perl.py,sha256=9BXn3tyHMA49NvzbM9E2czSCHjeU7bvaPLUcoZrhz-4,39192
+pygments/lexers/phix.py,sha256=hZqychqo5sFMBDESzDPXg1DYHQe_9sn294UfbjihaFk,23249
+pygments/lexers/php.py,sha256=l4hzQrlm0525i5dSw9Vmjcai3TzbPT6DkjzxPg9l6Zc,13061
+pygments/lexers/pointless.py,sha256=WSDjqQyGrNIGmTCdaMxl4zk7OZTlJAMzeUZ02kfgcTI,1974
+pygments/lexers/pony.py,sha256=EXrMkacqMZblI7v4AvBRQe-3Py8__bx5FOgjCLdfXxQ,3279
+pygments/lexers/praat.py,sha256=4UFK-nbC6WkZBhJgcQqEGqq9CocJkW7AmT_OJQbjWzk,12676
+pygments/lexers/procfile.py,sha256=05W2fyofLTP-FbEdSXD1eles-PPqVNfF6RWXjQdW2us,1155
+pygments/lexers/prolog.py,sha256=9Kc5YNUFqkfWu2sYoyzC3RX65abf1bm7oHr86z1s4kQ,12866
+pygments/lexers/promql.py,sha256=n-0vo-o8-ZasqP3Va4ujs562UfZSLfZF-RzT71yL0Tk,4738
+pygments/lexers/prql.py,sha256=PFReuvhbv4K5aeu6lvDfw4m-3hULkB3r43bKAy948os,8747
+pygments/lexers/ptx.py,sha256=KSHAvbiNVUntKilQ6EPYoLFocmJpRsBy_7fW6_Nrs1Y,4501
+pygments/lexers/python.py,sha256=WZe7fBAHKZ_BxPg8qIU26UGhk8qwUYyENJ3IyPW64mc,53805
+pygments/lexers/q.py,sha256=WQFUh3JrpK2j-VGW_Ytn3uJ5frUNmQIFnLtMVGRA9DI,6936
+pygments/lexers/qlik.py,sha256=2wqwdfIjrAz6RNBsP4MyeLX8Z7QpIGzxtf1CvaOlr_g,3693
+pygments/lexers/qvt.py,sha256=XMBnsWRrvCDf989OuDeb-KpszAkeETiACyaghZeL1ns,6103
+pygments/lexers/r.py,sha256=B6WgrD9SY1UTCV1fQBSlZbezPfpYsARn3FQIHcFYOiM,6474
+pygments/lexers/rdf.py,sha256=qUzxLna9v071bHhZAjdsBi8dKaJNk_h9g1ZRUAYCfoo,16056
+pygments/lexers/rebol.py,sha256=4u3N4kzui55HapopXDu3Kt0jczxDZ4buzwR7Mt4tQiM,18259
+pygments/lexers/rego.py,sha256=Rx5Gphbktr9ojg5DbqlyxHeQqqtF7g8W-oF0rmloDNY,1748
+pygments/lexers/resource.py,sha256=ioEzgWksB5HCjoz85XNkQPSd7n5kL0SZiuPkJP1hunQ,2927
+pygments/lexers/ride.py,sha256=kCWdxuR3PclVi4wiA0uUx4CYEFwuTqoMsKjhSW4X3yg,5035
+pygments/lexers/rita.py,sha256=Mj1QNxx1sWAZYC02kw8piVckaiw9B0MqQtiIiDFH0pA,1127
+pygments/lexers/rnc.py,sha256=g7ZD334PMGUqy_Ij64laSN1vJerwHqVkegfMCa3E-y8,1972
+pygments/lexers/roboconf.py,sha256=HbYuK5CqmQdd63SRY2nle01r7-p7mil0SnoauYDmEOY,2074
+pygments/lexers/robotframework.py,sha256=c4U1B9Q9ITBCTohqJTZOvkfyeVbenN4xhzSWIoZh5eU,18448
+pygments/lexers/ruby.py,sha256=uG617E5abBZcECRCqkhIfc-IbZcRb5cGuUZq_xpax90,22753
+pygments/lexers/rust.py,sha256=ZY-9vtsreBP0NfDd0WCouLSp_9MChAL8U8Abe-m9PB8,8260
+pygments/lexers/sas.py,sha256=C1Uz2s9DU6_s2kL-cB_PAGPtpyK5THlmhNmCumC1l48,9456
+pygments/lexers/savi.py,sha256=jrmruK0GnXktgBTWXW3oN3TXtofn3HBbkMlHnR84cko,4878
+pygments/lexers/scdoc.py,sha256=DXRmFDmYuc7h3gPAAVhfcL1OEbNBK5RdPpJqQzF3ZTk,2524
+pygments/lexers/scripting.py,sha256=eaYlkDK-_cAwTcCBHP6QXBCz8n6OzbhzdkRe0uV0xWY,81814
+pygments/lexers/sgf.py,sha256=w6C513ENaO2YCnqrduK7k03NaMDf-pgygvfzq2NaSRk,1985
+pygments/lexers/shell.py,sha256=dCS1zwkf5KwTog4__MnMC7h3Xmwv4_d3fnEV29tSwXI,36381
+pygments/lexers/sieve.py,sha256=eob-L84yf2jmhdNyYZUlbUJozdcd6GXcHW68lmAe8WE,2514
+pygments/lexers/slash.py,sha256=I-cRepmaxhL1SgYvD1hHX3gNBFI8NPszdU7hn1o5JlA,8484
+pygments/lexers/smalltalk.py,sha256=ue2PmqDK2sw0j75WdseiiENJBdZ1OwysH2Op1QN1r24,7204
+pygments/lexers/smithy.py,sha256=VREWoeuz7ANap_Uiopn7rs0Tnsfc-xBisDJKRGQY_y8,2659
+pygments/lexers/smv.py,sha256=He_VBSMbWONMWZmkrB5RYR0cfHVnMyKIXz68IFYl-a8,2805
+pygments/lexers/snobol.py,sha256=qDzb41xQQWMNmjB2MtZs23pFoFgZ2gbRZhK_Ir03r7I,2778
+pygments/lexers/solidity.py,sha256=Tixfnwku4Yezj6nNm8xVaw7EdV1qgAgdwahdTFP0St8,3163
+pygments/lexers/soong.py,sha256=Vm18vV4g6T8UPgjjY2yTRlSXGDpZowmuqQUBFfm4A9A,2339
+pygments/lexers/sophia.py,sha256=2YtYIT8iwAoW0B7TZuuoG_ZILhJV-2A7oBGat-98naE,3376
+pygments/lexers/special.py,sha256=8JuR2Vex8X-RWnC36S0HXTHWp2qmZclc90-TrLUWyaY,3585
+pygments/lexers/spice.py,sha256=m4nK0q4Sq_OFQez7kGWfki0No4ZV24YrONfHVj1Piqs,2790
+pygments/lexers/sql.py,sha256=WSG6vOsR87EEEwSQefP_Z7TauUG_BjqMHUFmPaSOVj4,41476
+pygments/lexers/srcinfo.py,sha256=B8vDs-sJogG3mWa5Hp_7JfHHUMyYRwGvKv6cKbFQXLM,1746
+pygments/lexers/stata.py,sha256=Zr9BC52D5O_3BbdW0N-tzoUmy0NTguL2sC-saXRVM-c,6415
+pygments/lexers/supercollider.py,sha256=_H5wDrn0DiGnlhB_cz6Rt_lo2TvqjSm0o6NPTd9R4Ko,3697
+pygments/lexers/tablegen.py,sha256=1JjedXYY18BNiY9JtNGLOtGfiwduNDZpQLBGTeQ6jAw,3987
+pygments/lexers/tact.py,sha256=X_lsxjFUMaC1TmYysXJq9tmAGifRnil83Bt1zA86Xdo,10809
+pygments/lexers/tal.py,sha256=xS9PlaWQOPj8MVr56fUNq31vUQKRWoLTlyWj9ZHm8AM,2904
+pygments/lexers/tcl.py,sha256=lK97ju4nikkt-oGOzIeyFEM98yq4dZSI8uEmYsq0R6c,5512
+pygments/lexers/teal.py,sha256=t3dqy_Arwv8_yExbX_xiFxv1TqJLPv4vh1MVKjKwS4Y,3522
+pygments/lexers/templates.py,sha256=BVdjYeoacIUuFyHTG39j4PxeNCe5E1oUURjH1rITrI4,75731
+pygments/lexers/teraterm.py,sha256=ciwztagW5Drg2gr17Qykrh6GwMsKy7e4xdQshX95GyQ,9718
+pygments/lexers/testing.py,sha256=YZgDgUEaLEYKSKEqpDsUi3Bn-Db_D42IlyiSsr1oX8U,10810
+pygments/lexers/text.py,sha256=nOCQPssIlKdVWU3PKxZiBPkf_KFM2V48IOssSyqhFY8,1068
+pygments/lexers/textedit.py,sha256=ttT4Ph-hIdgFLG6maRy_GskkziTFK0Wcg28yU0s6lek,7760
+pygments/lexers/textfmts.py,sha256=mi9KLEq4mrzDJbEc8G3VM-mSki_Tylkzodu47yH6z84,15524
+pygments/lexers/theorem.py,sha256=51ppBAEdhJmwU_lC916zMyjEoKLXqf89VAE_Lr0PNCc,17855
+pygments/lexers/thingsdb.py,sha256=x_fHNkLA-hIJyeIs6rg_X8n5OLYvFqaSu1FhI3apI5Y,6017
+pygments/lexers/tlb.py,sha256=ue2gqm45BI512lM13O8skAky9zAb7pLMrxZ8pbt5zRU,1450
+pygments/lexers/tls.py,sha256=_uQUVuMRDOhN-XUyGR5DIlVCk1CUZ1fIOSN4_WQYPKk,1540
+pygments/lexers/tnt.py,sha256=pK4LgoKON7u1xF66JYFncAPSbD8DZaeI_WTZ9HqEFlY,10456
+pygments/lexers/trafficscript.py,sha256=X3B8kgxS54ecuok9ic6Hkp-UMn5DvOmCK0p70Tz27Cw,1506
+pygments/lexers/typoscript.py,sha256=mBuePiVZUoAORPKsHwrx6fBWiy3fAIqG-2O67QmMiFI,8332
+pygments/lexers/typst.py,sha256=zIJBEhUXtWp5OiyAmvFA5m8d1EQG-ocwrJ677dvTUAk,7167
+pygments/lexers/ul4.py,sha256=rCaw0J9j3cdql9lX_HTilg65k9-9S118zOA6TAYfxaM,10499
+pygments/lexers/unicon.py,sha256=RAqoCnAAJBYOAGdR8ng0g6FtB39bGemLRlIqv5mcg9E,18625
+pygments/lexers/urbi.py,sha256=ajNP70NJg32jNnFDZsLvr_-4TToSGqRGkFyAPIJLfCU,6082
+pygments/lexers/usd.py,sha256=2eEGouolodYS402P_gtBrn4lLzpg1z8uHwPCKqjUb_k,3304
+pygments/lexers/varnish.py,sha256=dSh0Ku9SrjmlB29Fi_mWdWavN7M0cMKeepR4a34sOyI,7473
+pygments/lexers/verification.py,sha256=Qu433Q_h3EK3uS4bJoLRFZK0kIVwzX5AFKsa4Z-qnxA,3934
+pygments/lexers/verifpal.py,sha256=buyOOzCo_dGnoC40h0tthylHVVpgDt8qXu4olLvYy_4,2661
+pygments/lexers/vip.py,sha256=2lEV4cLV9p4E37wctBL7zkZ4ZU4p3HVsiLJFzB1bie0,5711
+pygments/lexers/vyper.py,sha256=Zq6sQIUBk6mBdpgOVgu3A6swGoBne0kDlRyjZznm2BY,5615
+pygments/lexers/web.py,sha256=4W9a7vcskrGJnxt4KmoE3SZydWB1qLq7lP2XS85J_m8,913
+pygments/lexers/webassembly.py,sha256=zgcMouzLawcbeFr6w_SOvGoUR68ZtqnnsbOcWEVleLk,5698
+pygments/lexers/webidl.py,sha256=ODtVmw4gVzI8HQWxuEckP6KMwm8WP2G2lSZEjagDXts,10516
+pygments/lexers/webmisc.py,sha256=-_-INDVdk47e2jlj-9bFcuLtntqVorBqIjlnwPfZFdI,40564
+pygments/lexers/wgsl.py,sha256=9igd9dzixGIgNewruv9mPnFms-c9BahkZcCCrZygv84,11880
+pygments/lexers/whiley.py,sha256=lMr750lA4MZsB4xqzVsIRtVMJIC3_dArhFYTHvOPwvA,4017
+pygments/lexers/wowtoc.py,sha256=8xxvf0xGeYtf4PE7KtkHZ_ly9xY_XXHrpCitdKE42Ro,4076
+pygments/lexers/wren.py,sha256=goGXnAMKKa13LLL40ybT3aMGPrk3gCRwZQFYAkKB_w0,3229
+pygments/lexers/x10.py,sha256=Q-AmgdF2E-N7mtOPpZ07CsxrTVnikyqC4uRRv6H75sk,1943
+pygments/lexers/xorg.py,sha256=9ttrBd3_Y2nXANsqtMposSgblYmMYqWXQ-Iz5RH9RsU,925
+pygments/lexers/yang.py,sha256=13CWbSaNr9giOHz4o0SXSklh0bfWt0ah14jJGpTvcn0,4499
+pygments/lexers/yara.py,sha256=jUSv78KTDfguCoAoAZKbYzQERkkyxBBWv5dInVrkDxo,2427
+pygments/lexers/zig.py,sha256=f-80MVOSp1KnczAMokQLVM-_wAEOD16EcGFnaCNlsN0,3976
+pygments/modeline.py,sha256=K5eSkR8GS1r5OkXXTHOcV0aM_6xpk9eWNEIAW-OOJ2g,1005
+pygments/plugin.py,sha256=tPx0rJCTIZ9ioRgLNYG4pifCbAwTRUZddvLw-NfAk2w,1891
+pygments/regexopt.py,sha256=wXaP9Gjp_hKAdnICqoDkRxAOQJSc4v3X6mcxx3z-TNs,3072
+pygments/scanner.py,sha256=nNcETRR1tRuiTaHmHSTTECVYFPcLf6mDZu1e4u91A9E,3092
+pygments/sphinxext.py,sha256=VEe_oHNgLoEGMHc2ROfbee2mF2PPREFyE6_m_JN5FvQ,7898
+pygments/style.py,sha256=Cpw9dCAyW3_JAwFRXOJXmtKb5ZwO2_5KSmlq6q4fZw4,6408
+pygments/styles/__init__.py,sha256=f9KCQXN4uKbe8aI8-L3qTC-_XPfT563FwTg6VTGVfwI,2006
+pygments/styles/_mapping.py,sha256=6lovFUE29tz6EsV3XYY4hgozJ7q1JL7cfO3UOlgnS8w,3312
+pygments/styles/abap.py,sha256=64Uwr8uPdEdcT-tE-Y2VveTXfH3SkqH9qdMgY49YHQI,749
+pygments/styles/algol.py,sha256=fCuk8ITTehvbJSufiaKlgnFsKbl-xFxxR82xhltc-cQ,2262
+pygments/styles/algol_nu.py,sha256=Gv9WfHJvYegGcUk1zcufQgsdXPNjCUNk8sAHyrSGGh4,2283
+pygments/styles/arduino.py,sha256=NoUB8xk7M1HGPoLfuySOLU0sVwoTuLcZqllXl2EO_iE,4557
+pygments/styles/autumn.py,sha256=fLLfjHXjxCl6crBAxEsBLH372ALMkFacA2bG6KFbJi4,2195
+pygments/styles/borland.py,sha256=_0ySKp4KGCSgtYjPe8uzD6gQhlmAIR4T43i-FoRYNOM,1611
+pygments/styles/bw.py,sha256=vhk8Xoj64fLPdA9IQU6mUVsYMel255jR-FDU7BjIHtI,1406
+pygments/styles/coffee.py,sha256=NqLt-fc7LONma1BGggbceVRY9uDE70WBuZXqK4zwaco,2308
+pygments/styles/colorful.py,sha256=mYcSbehtH7itH_QV9NqJp4Wna1X4lrwl2wkVXS2u-5A,2832
+pygments/styles/default.py,sha256=RTgG2zKWWUxPTDCFxhTnyZI_WZBIVgu5XsUpNvFisCA,2588
+pygments/styles/dracula.py,sha256=vRJmixBoSKV9o8NVQhXGViQqchhIYugfikLmvX0DoBw,2182
+pygments/styles/emacs.py,sha256=TiOG9oc83qToMCRMnJrXtWYqnzAqYycRz_50OoCKtxc,2535
+pygments/styles/friendly.py,sha256=oAi-l9anQTs9STDmUzXGDlOegatEOH4hpD0j6o6dZGM,2604
+pygments/styles/friendly_grayscale.py,sha256=a7Cqkzt6-uTiXvj6GoYBXzRvX5_zviCjjRB04Kf_-Q0,2828
+pygments/styles/fruity.py,sha256=GfSUTG0stlJr5Ow_saCaxbI2IB4-34Dp2TuRTpfUJBs,1324
+pygments/styles/gh_dark.py,sha256=ruNX3d4rf22rx-8HnwvGbNbXRQpXCNcHU1HNq6N4uNg,3590
+pygments/styles/gruvbox.py,sha256=KrFoHEoVnZW6XM9udyXncPomeGyZgIDsNWOH3kCrxFQ,3387
+pygments/styles/igor.py,sha256=fYYPhM0dRCvcDTMVrMVO5oFKnYm-8YVlsuVBoczFLtY,737
+pygments/styles/inkpot.py,sha256=jggSeX9NV15eOL2oJaVmZ6vmV7LWRzXJQRUqcWEqGRs,2404
+pygments/styles/lightbulb.py,sha256=Y8u1qdvlHfBqI2jJex55SkvVatVo_FjEUzE6h-X7m-0,3172
+pygments/styles/lilypond.py,sha256=Y6fp_sEL-zESmxAaMxzjtrKk90cuDC_DalNdC8wj0nw,2066
+pygments/styles/lovelace.py,sha256=cA9uhmbnzY04MccsiYSgMY7fvb4WMRbegWBUrGvXh1M,3178
+pygments/styles/manni.py,sha256=g9FyO7plTwfMm2cU4iiKgdlkMlvQLG6l2Lwkgz5ITS4,2443
+pygments/styles/material.py,sha256=LDmgomAbgtJDZhbv446_zIwgYh50UAqEEtgYNUns1rQ,4201
+pygments/styles/monokai.py,sha256=lrxTJpkBarV9gTLkBQryZ6oNSjekAVheJueKJP5iEYA,5184
+pygments/styles/murphy.py,sha256=-AKZiLkpiWej-otjHMsYCE-I-_IzCOLJY-_GBdKRZRw,2805
+pygments/styles/native.py,sha256=l6tezGSQTB8p_SyOXJ0PWI7KzCeEdtsPmVc4Yn4_CwU,2043
+pygments/styles/nord.py,sha256=GDt3WAaqaWsiCeqpIBPxd8TEUX708fGfwaA7S0w0oy0,5391
+pygments/styles/onedark.py,sha256=k80cZEppCEF-HLoxy_FEA0QmQDZze68nHVMNGyUVa28,1719
+pygments/styles/paraiso_dark.py,sha256=Jkrg4nUKIVNF8U4fPNV_Smq_g9NFbb9eiUrjYpVgQZg,5662
+pygments/styles/paraiso_light.py,sha256=MxN964ZEpze3wF0ss-igaa2I7E684MHe-Zq0rWPH3wo,5668
+pygments/styles/pastie.py,sha256=ZvAs9UpBNYFC-5PFrCRGYnm3FoPKb-eKR-ozbWZP-4g,2525
+pygments/styles/perldoc.py,sha256=HSxB93e4UpQkZspReQ34FeJbZ-59ksGvdaH-hToehi8,2230
+pygments/styles/rainbow_dash.py,sha256=4ugL18Or7aNtaLfPfCLFRiFy0Gu2RA4a9G2LQUE9SrM,2390
+pygments/styles/rrt.py,sha256=fgzfpC0PC_SCcLOMCNEIQTjPUMOncRe7SR10GfSRbXY,1006
+pygments/styles/sas.py,sha256=yzoXmbfQ2ND1WWq93b4vVGYkQSZHPqb4ymes9YYRT3w,1440
+pygments/styles/solarized.py,sha256=qupILFZn02WspnAF5SPYb-W8guo9xnUtjb1HeLw3XgE,4247
+pygments/styles/staroffice.py,sha256=CLbBeMoxay21Xyu3Af2p4xUXyG1_6ydCbvs5RJKYe5w,831
+pygments/styles/stata_dark.py,sha256=vX8SwHV__sG92F4CKribG08MJfSVq98dgs7gEA_n9yc,1257
+pygments/styles/stata_light.py,sha256=uV3GE-ylvffQ0yN3py1YAVqBB5wflIKZbceyK1Lqvrc,1289
+pygments/styles/tango.py,sha256=O2wcM4hHuU1Yt071M9CK7JPtiiSCqyxtT9tbiQICV28,7137
+pygments/styles/trac.py,sha256=9kMv1ZZyMKACWlx2fQVjRP0I2pgcRYCNrd7iGGZg9qk,1981
+pygments/styles/vim.py,sha256=J7_TqvrGkTX_XuTHW0In5wqPLAUPRWyr1122XueZWmM,2019
+pygments/styles/vs.py,sha256=s7YnzbIPuFU3LIke27mc4lAQSn2R3vbbHc1baMGSU_U,1130
+pygments/styles/xcode.py,sha256=PbQdzgGaA4a9LAU1i58alY9kM4IFlQX5jHQwOYmf_Rk,1504
+pygments/styles/zenburn.py,sha256=suZEKzBTCYdhf2cxNwcY7UATJK1tq5eYhGdBcXdf6MU,2203
+pygments/token.py,sha256=WbdWGhYm_Vosb0DDxW9lHNPgITXfWTsQmHt6cy9RbcM,6226
+pygments/unistring.py,sha256=al-_rBemRuGvinsrM6atNsHTmJ6DUbw24q2O2Ru1cBc,63208
+pygments/util.py,sha256=oRtSpiAo5jM9ulntkvVbgXUdiAW57jnuYGB7t9fYuhc,10031
diff --git a/libs/pygments-2.19.1.dist-info/REQUESTED b/libs/pygments-2.19.2.dist-info/REQUESTED
similarity index 100%
rename from libs/pygments-2.19.1.dist-info/REQUESTED
rename to libs/pygments-2.19.2.dist-info/REQUESTED
diff --git a/libs/pygments-2.19.2.dist-info/WHEEL b/libs/pygments-2.19.2.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/pygments-2.19.2.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/pygments-2.19.1.dist-info/entry_points.txt b/libs/pygments-2.19.2.dist-info/entry_points.txt
similarity index 100%
rename from libs/pygments-2.19.1.dist-info/entry_points.txt
rename to libs/pygments-2.19.2.dist-info/entry_points.txt
diff --git a/libs/pygments-2.19.1.dist-info/licenses/AUTHORS b/libs/pygments-2.19.2.dist-info/licenses/AUTHORS
similarity index 100%
rename from libs/pygments-2.19.1.dist-info/licenses/AUTHORS
rename to libs/pygments-2.19.2.dist-info/licenses/AUTHORS
diff --git a/libs/pygments-2.19.1.dist-info/licenses/LICENSE b/libs/pygments-2.19.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/pygments-2.19.1.dist-info/licenses/LICENSE
rename to libs/pygments-2.19.2.dist-info/licenses/LICENSE
diff --git a/libs/pygments/__init__.py b/libs/pygments/__init__.py
index d33a156305..2a391c3e47 100644
--- a/libs/pygments/__init__.py
+++ b/libs/pygments/__init__.py
@@ -26,7 +26,7 @@
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.19.1'
+__version__ = '2.19.2'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/libs/pygments/lexers/_sql_builtins.py b/libs/pygments/lexers/_sql_builtins.py
new file mode 100644
index 0000000000..8b90e53e98
--- /dev/null
+++ b/libs/pygments/lexers/_sql_builtins.py
@@ -0,0 +1,106 @@
+"""
+    pygments.lexers._sql_builtins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Data files for the SQL lexer.
+
+    :copyright: Copyright 2006-2025 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+KEYWORDS = (
+    'ABORT', 'ABS', 'ABSOLUTE', 'ACCESS', 'ADA', 'ADD', 'ADMIN', 'AFTER',
+    'AGGREGATE', 'ALIAS', 'ALL', 'ALLOCATE', 'ALTER', 'ANALYSE', 'ANALYZE',
+    'AND', 'ANY', 'ARE', 'AS', 'ASC', 'ASENSITIVE', 'ASSERTION', 'ASSIGNMENT',
+    'ASYMMETRIC', 'AT', 'ATOMIC', 'AUTHORIZATION', 'AVG', 'BACKWARD',
+    'BEFORE', 'BEGIN', 'BETWEEN', 'BITVAR', 'BIT_LENGTH', 'BOTH', 'BREADTH',
+    'BY', 'C', 'CACHE', 'CALL', 'CALLED', 'CARDINALITY', 'CASCADE',
+    'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATALOG_NAME', 'CHAIN',
+    'CHARACTERISTICS', 'CHARACTER_LENGTH', 'CHARACTER_SET_CATALOG',
+    'CHARACTER_SET_NAME', 'CHARACTER_SET_SCHEMA', 'CHAR_LENGTH', 'CHECK',
+    'CHECKED', 'CHECKPOINT', 'CLASS', 'CLASS_ORIGIN', 'CLOB', 'CLOSE',
+    'CLUSTER', 'COALESCE', 'COBOL', 'COLLATE', 'COLLATION',
+    'COLLATION_CATALOG', 'COLLATION_NAME', 'COLLATION_SCHEMA', 'COLUMN',
+    'COLUMN_NAME', 'COMMAND_FUNCTION', 'COMMAND_FUNCTION_CODE', 'COMMENT',
+    'COMMIT', 'COMMITTED', 'COMPLETION', 'CONDITION_NUMBER', 'CONNECT',
+    'CONNECTION', 'CONNECTION_NAME', 'CONSTRAINT', 'CONSTRAINTS',
+    'CONSTRAINT_CATALOG', 'CONSTRAINT_NAME', 'CONSTRAINT_SCHEMA',
+    'CONSTRUCTOR', 'CONTAINS', 'CONTINUE', 'CONVERSION', 'CONVERT',
+    'COPY', 'CORRESPONDING', 'COUNT', 'CREATE', 'CREATEDB', 'CREATEUSER',
+    'CROSS', 'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH',
+    'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+    'CURSOR', 'CURSOR_NAME', 'CYCLE', 'DATA', 'DATABASE',
+    'DATETIME_INTERVAL_CODE', 'DATETIME_INTERVAL_PRECISION', 'DAY',
+    'DEALLOCATE', 'DECLARE', 'DEFAULT', 'DEFAULTS', 'DEFERRABLE',
+    'DEFERRED', 'DEFINED', 'DEFINER', 'DELETE', 'DELIMITER', 'DELIMITERS',
+    'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR',
+    'DETERMINISTIC', 'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISPATCH',
+    'DISTINCT', 'DO', 'DOMAIN', 'DROP', 'DYNAMIC', 'DYNAMIC_FUNCTION',
+    'DYNAMIC_FUNCTION_CODE', 'EACH', 'ELSE', 'ELSIF', 'ENCODING',
+    'ENCRYPTED', 'END', 'END-EXEC', 'EQUALS', 'ESCAPE', 'EVERY', 'EXCEPTION',
+    'EXCEPT', 'EXCLUDING', 'EXCLUSIVE', 'EXEC', 'EXECUTE', 'EXISTING',
+    'EXISTS', 'EXPLAIN', 'EXTERNAL', 'EXTRACT', 'FALSE', 'FETCH', 'FINAL',
+    'FIRST', 'FOR', 'FORCE', 'FOREIGN', 'FORTRAN', 'FORWARD', 'FOUND', 'FREE',
+    'FREEZE', 'FROM', 'FULL', 'FUNCTION', 'G', 'GENERAL', 'GENERATED', 'GET',
+    'GLOBAL', 'GO', 'GOTO', 'GRANT', 'GRANTED', 'GROUP', 'GROUPING',
+    'HANDLER', 'HAVING', 'HIERARCHY', 'HOLD', 'HOST', 'IDENTITY', 'IF',
+    'IGNORE', 'ILIKE', 'IMMEDIATE', 'IMMEDIATELY', 'IMMUTABLE', 'IMPLEMENTATION', 'IMPLICIT',
+    'IN', 'INCLUDING', 'INCREMENT', 'INDEX', 'INDITCATOR', 'INFIX',
+    'INHERITS', 'INITIALIZE', 'INITIALLY', 'INNER', 'INOUT', 'INPUT',
+    'INSENSITIVE', 'INSERT', 'INSTANTIABLE', 'INSTEAD', 'INTERSECT', 'INTO',
+    'INVOKER', 'IS', 'ISNULL', 'ISOLATION', 'ITERATE', 'JOIN', 'KEY',
+    'KEY_MEMBER', 'KEY_TYPE', 'LANCOMPILER', 'LANGUAGE', 'LARGE', 'LAST',
+    'LATERAL', 'LEADING', 'LEFT', 'LENGTH', 'LESS', 'LEVEL', 'LIKE', 'LIMIT',
+    'LISTEN', 'LOAD', 'LOCAL', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATION',
+    'LOCATOR', 'LOCK', 'LOWER', 'MAP', 'MATCH', 'MAX', 'MAXVALUE',
+    'MESSAGE_LENGTH', 'MESSAGE_OCTET_LENGTH', 'MESSAGE_TEXT', 'METHOD', 'MIN',
+    'MINUTE', 'MINVALUE', 'MOD', 'MODE', 'MODIFIES', 'MODIFY', 'MONTH',
+    'MORE', 'MOVE', 'MUMPS', 'NAMES', 'NATIONAL', 'NATURAL', 'NCHAR', 'NCLOB',
+    'NEW', 'NEXT', 'NO', 'NOCREATEDB', 'NOCREATEUSER', 'NONE', 'NOT',
+    'NOTHING', 'NOTIFY', 'NOTNULL', 'NULL', 'NULLABLE', 'NULLIF', 'OBJECT',
+    'OCTET_LENGTH', 'OF', 'OFF', 'OFFSET', 'OIDS', 'OLD', 'ON', 'ONLY',
+    'OPEN', 'OPERATION', 'OPERATOR', 'OPTION', 'OPTIONS', 'OR', 'ORDER',
+    'ORDINALITY', 'OUT', 'OUTER', 'OUTPUT', 'OVERLAPS', 'OVERLAY',
+    'OVERRIDING', 'OWNER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARAMETER_MODE',
+    'PARAMETER_NAME', 'PARAMETER_ORDINAL_POSITION',
+    'PARAMETER_SPECIFIC_CATALOG', 'PARAMETER_SPECIFIC_NAME',
+    'PARAMETER_SPECIFIC_SCHEMA', 'PARTIAL', 'PASCAL', 'PENDANT', 'PERIOD', 'PLACING',
+    'PLI', 'POSITION', 'POSTFIX', 'PRECEEDS', 'PRECISION', 'PREFIX', 'PREORDER',
+    'PREPARE', 'PRESERVE', 'PRIMARY', 'PRIOR', 'PRIVILEGES', 'PROCEDURAL',
+    'PROCEDURE', 'PUBLIC', 'READ', 'READS', 'RECHECK', 'RECURSIVE', 'REF',
+    'REFERENCES', 'REFERENCING', 'REINDEX', 'RELATIVE', 'RENAME',
+    'REPEATABLE', 'REPLACE', 'RESET', 'RESTART', 'RESTRICT', 'RESULT',
+    'RETURN', 'RETURNED_LENGTH', 'RETURNED_OCTET_LENGTH', 'RETURNED_SQLSTATE',
+    'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE',
+    'ROUTINE_CATALOG', 'ROUTINE_NAME', 'ROUTINE_SCHEMA', 'ROW', 'ROWS',
+    'ROW_COUNT', 'RULE', 'SAVE_POINT', 'SCALE', 'SCHEMA', 'SCHEMA_NAME',
+    'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECURITY', 'SELECT', 'SELF',
+    'SENSITIVE', 'SERIALIZABLE', 'SERVER_NAME', 'SESSION', 'SESSION_USER',
+    'SET', 'SETOF', 'SETS', 'SHARE', 'SHOW', 'SIMILAR', 'SIMPLE', 'SIZE',
+    'SOME', 'SOURCE', 'SPACE', 'SPECIFIC', 'SPECIFICTYPE', 'SPECIFIC_NAME',
+    'SQL', 'SQLCODE', 'SQLERROR', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNINIG',
+    'STABLE', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STDIN',
+    'STDOUT', 'STORAGE', 'STRICT', 'STRUCTURE', 'STYPE', 'SUBCLASS_ORIGIN',
+    'SUBLIST', 'SUBSTRING', 'SUCCEEDS', 'SUM', 'SYMMETRIC', 'SYSID', 'SYSTEM',
+    'SYSTEM_USER', 'TABLE', 'TABLE_NAME', ' TEMP', 'TEMPLATE', 'TEMPORARY',
+    'TERMINATE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR',
+    'TIMEZONE_MINUTE', 'TO', 'TOAST', 'TRAILING', 'TRANSACTION',
+    'TRANSACTIONS_COMMITTED', 'TRANSACTIONS_ROLLED_BACK', 'TRANSACTION_ACTIVE',
+    'TRANSFORM', 'TRANSFORMS', 'TRANSLATE', 'TRANSLATION', 'TREAT', 'TRIGGER',
+    'TRIGGER_CATALOG', 'TRIGGER_NAME', 'TRIGGER_SCHEMA', 'TRIM', 'TRUE',
+    'TRUNCATE', 'TRUSTED', 'TYPE', 'UNCOMMITTED', 'UNDER', 'UNENCRYPTED',
+    'UNION', 'UNIQUE', 'UNKNOWN', 'UNLISTEN', 'UNNAMED', 'UNNEST', 'UNTIL',
+    'UPDATE', 'UPPER', 'USAGE', 'USER', 'USER_DEFINED_TYPE_CATALOG',
+    'USER_DEFINED_TYPE_NAME', 'USER_DEFINED_TYPE_SCHEMA', 'USING', 'VACUUM',
+    'VALID', 'VALIDATOR', 'VALUES', 'VARIABLE', 'VERBOSE',
+    'VERSION', 'VERSIONS', 'VERSIONING', 'VIEW',
+    'VOLATILE', 'WHEN', 'WHENEVER', 'WHERE', 'WITH', 'WITHOUT', 'WORK',
+    'WRITE', 'YEAR', 'ZONE'
+)
+
+DATATYPES = (
+    'ARRAY', 'BIGINT', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'CHAR',
+    'CHARACTER', 'DATE', 'DEC', 'DECIMAL', 'FLOAT', 'INT', 'INTEGER',
+    'INTERVAL', 'NUMBER', 'NUMERIC', 'REAL', 'SERIAL', 'SMALLINT',
+    'VARCHAR', 'VARYING', 'INT8', 'SERIAL8', 'TEXT'
+)
diff --git a/libs/pygments/lexers/scripting.py b/libs/pygments/lexers/scripting.py
index 17deae9bb7..6e494c33b8 100644
--- a/libs/pygments/lexers/scripting.py
+++ b/libs/pygments/lexers/scripting.py
@@ -57,7 +57,7 @@ class LuaLexer(RegexLexer):
 
     _comment_multiline = r'(?:--\[(?P<level>=*)\[[\w\W]*?\](?P=level)\])'
     _comment_single = r'(?:--.*$)'
-    _space = r'(?:\s+)'
+    _space = r'(?:\s+(?!\s))'
     _s = rf'(?:{_comment_multiline}|{_comment_single}|{_space})'
     _name = r'(?:[^\W\d]\w*)'
 
@@ -89,8 +89,10 @@ class LuaLexer(RegexLexer):
             (r'[\[\]{}().,:;]+', Punctuation),
             (r'(and|or|not)\b', Operator.Word),
 
-            ('(break|do|else|elseif|end|for|if|in|repeat|return|then|until|'
-             r'while)\b', Keyword.Reserved),
+            (words([
+                'break', 'do', 'else', 'elseif', 'end', 'for', 'if', 'in',
+                'repeat', 'return', 'then', 'until', 'while'
+            ], suffix=r'\b'), Keyword.Reserved),
             (r'goto\b', Keyword.Reserved, 'goto'),
             (r'(local)\b', Keyword.Declaration),
             (r'(true|false|nil)\b', Keyword.Constant),
diff --git a/libs/pygments/lexers/sql.py b/libs/pygments/lexers/sql.py
index c3a11f40ad..d3e6f17f39 100644
--- a/libs/pygments/lexers/sql.py
+++ b/libs/pygments/lexers/sql.py
@@ -44,21 +44,14 @@
 import re
 
 from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, words
-from pygments.token import Punctuation, Whitespace, Text, Comment, Operator, \
-    Keyword, Name, String, Number, Generic, Literal
-from pygments.lexers import get_lexer_by_name, ClassNotFound
-
-from pygments.lexers._postgres_builtins import KEYWORDS, DATATYPES, \
-    PSEUDO_TYPES, PLPGSQL_KEYWORDS, EXPLAIN_KEYWORDS
-from pygments.lexers._mysql_builtins import \
-    MYSQL_CONSTANTS, \
-    MYSQL_DATATYPES, \
-    MYSQL_FUNCTIONS, \
-    MYSQL_KEYWORDS, \
-    MYSQL_OPTIMIZER_HINTS
-
 from pygments.lexers import _googlesql_builtins
+from pygments.lexers import _mysql_builtins
+from pygments.lexers import _postgres_builtins
+from pygments.lexers import _sql_builtins
 from pygments.lexers import _tsql_builtins
+from pygments.lexers import get_lexer_by_name, ClassNotFound
+from pygments.token import Punctuation, Whitespace, Text, Comment, Operator, \
+    Keyword, Name, String, Number, Generic, Literal
 
 
 __all__ = ['GoogleSqlLexer', 'PostgresLexer', 'PlPgsqlLexer',
@@ -177,9 +170,10 @@ class PostgresLexer(PostgresBase, RegexLexer):
             (r'--.*\n?', Comment.Single),
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (r'(' + '|'.join(s.replace(" ", r"\s+")
-                             for s in DATATYPES + PSEUDO_TYPES) + r')\b',
+                             for s in _postgres_builtins.DATATYPES +
+                             _postgres_builtins.PSEUDO_TYPES) + r')\b',
              Name.Builtin),
-            (words(KEYWORDS, suffix=r'\b'), Keyword),
+            (words(_postgres_builtins.KEYWORDS, suffix=r'\b'), Keyword),
             (r'[+*/<>=~!@#%^&|`?-]+', Operator),
             (r'::', Operator),  # cast
             (r'\$\d+', Name.Variable),
@@ -233,7 +227,8 @@ class PlPgsqlLexer(PostgresBase, RegexLexer):
     for i, pattern in enumerate(tokens['root']):
         if pattern[1] == Keyword:
             tokens['root'][i] = (
-                words(KEYWORDS + PLPGSQL_KEYWORDS, suffix=r'\b'),
+                words(_postgres_builtins.KEYWORDS +
+                      _postgres_builtins.PLPGSQL_KEYWORDS, suffix=r'\b'),
                 Keyword)
             del i
             break
@@ -451,7 +446,7 @@ class PostgresExplainLexer(RegexLexer):
                    suffix=r'\b'), Name.Exception),
             (r'(I/O Timings)(:)( )', bygroups(Name.Exception, Punctuation, Whitespace)),
 
-            (words(EXPLAIN_KEYWORDS, suffix=r'\b'), Keyword),
+            (words(_postgres_builtins.EXPLAIN_KEYWORDS, suffix=r'\b'), Keyword),
 
             # join keywords
             (r'((Right|Left|Full|Semi|Anti) Join)', Keyword.Type),
@@ -586,101 +581,8 @@ class SqlLexer(RegexLexer):
             (r'\s+', Whitespace),
             (r'--.*\n?', Comment.Single),
             (r'/\*', Comment.Multiline, 'multiline-comments'),
-            (words((
-                'ABORT', 'ABS', 'ABSOLUTE', 'ACCESS', 'ADA', 'ADD', 'ADMIN', 'AFTER',
-                'AGGREGATE', 'ALIAS', 'ALL', 'ALLOCATE', 'ALTER', 'ANALYSE', 'ANALYZE',
-                'AND', 'ANY', 'ARE', 'AS', 'ASC', 'ASENSITIVE', 'ASSERTION', 'ASSIGNMENT',
-                'ASYMMETRIC', 'AT', 'ATOMIC', 'AUTHORIZATION', 'AVG', 'BACKWARD',
-                'BEFORE', 'BEGIN', 'BETWEEN', 'BITVAR', 'BIT_LENGTH', 'BOTH', 'BREADTH',
-                'BY', 'C', 'CACHE', 'CALL', 'CALLED', 'CARDINALITY', 'CASCADE',
-                'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATALOG_NAME', 'CHAIN',
-                'CHARACTERISTICS', 'CHARACTER_LENGTH', 'CHARACTER_SET_CATALOG',
-                'CHARACTER_SET_NAME', 'CHARACTER_SET_SCHEMA', 'CHAR_LENGTH', 'CHECK',
-                'CHECKED', 'CHECKPOINT', 'CLASS', 'CLASS_ORIGIN', 'CLOB', 'CLOSE',
-                'CLUSTER', 'COALESCE', 'COBOL', 'COLLATE', 'COLLATION',
-                'COLLATION_CATALOG', 'COLLATION_NAME', 'COLLATION_SCHEMA', 'COLUMN',
-                'COLUMN_NAME', 'COMMAND_FUNCTION', 'COMMAND_FUNCTION_CODE', 'COMMENT',
-                'COMMIT', 'COMMITTED', 'COMPLETION', 'CONDITION_NUMBER', 'CONNECT',
-                'CONNECTION', 'CONNECTION_NAME', 'CONSTRAINT', 'CONSTRAINTS',
-                'CONSTRAINT_CATALOG', 'CONSTRAINT_NAME', 'CONSTRAINT_SCHEMA',
-                'CONSTRUCTOR', 'CONTAINS', 'CONTINUE', 'CONVERSION', 'CONVERT',
-                'COPY', 'CORRESPONDING', 'COUNT', 'CREATE', 'CREATEDB', 'CREATEUSER',
-                'CROSS', 'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH',
-                'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
-                'CURSOR', 'CURSOR_NAME', 'CYCLE', 'DATA', 'DATABASE',
-                'DATETIME_INTERVAL_CODE', 'DATETIME_INTERVAL_PRECISION', 'DAY',
-                'DEALLOCATE', 'DECLARE', 'DEFAULT', 'DEFAULTS', 'DEFERRABLE',
-                'DEFERRED', 'DEFINED', 'DEFINER', 'DELETE', 'DELIMITER', 'DELIMITERS',
-                'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR',
-                'DETERMINISTIC', 'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISPATCH',
-                'DISTINCT', 'DO', 'DOMAIN', 'DROP', 'DYNAMIC', 'DYNAMIC_FUNCTION',
-                'DYNAMIC_FUNCTION_CODE', 'EACH', 'ELSE', 'ELSIF', 'ENCODING',
-                'ENCRYPTED', 'END', 'END-EXEC', 'EQUALS', 'ESCAPE', 'EVERY', 'EXCEPTION',
-                'EXCEPT', 'EXCLUDING', 'EXCLUSIVE', 'EXEC', 'EXECUTE', 'EXISTING',
-                'EXISTS', 'EXPLAIN', 'EXTERNAL', 'EXTRACT', 'FALSE', 'FETCH', 'FINAL',
-                'FIRST', 'FOR', 'FORCE', 'FOREIGN', 'FORTRAN', 'FORWARD', 'FOUND', 'FREE',
-                'FREEZE', 'FROM', 'FULL', 'FUNCTION', 'G', 'GENERAL', 'GENERATED', 'GET',
-                'GLOBAL', 'GO', 'GOTO', 'GRANT', 'GRANTED', 'GROUP', 'GROUPING',
-                'HANDLER', 'HAVING', 'HIERARCHY', 'HOLD', 'HOST', 'IDENTITY', 'IF',
-                'IGNORE', 'ILIKE', 'IMMEDIATE', 'IMMEDIATELY', 'IMMUTABLE', 'IMPLEMENTATION', 'IMPLICIT',
-                'IN', 'INCLUDING', 'INCREMENT', 'INDEX', 'INDITCATOR', 'INFIX',
-                'INHERITS', 'INITIALIZE', 'INITIALLY', 'INNER', 'INOUT', 'INPUT',
-                'INSENSITIVE', 'INSERT', 'INSTANTIABLE', 'INSTEAD', 'INTERSECT', 'INTO',
-                'INVOKER', 'IS', 'ISNULL', 'ISOLATION', 'ITERATE', 'JOIN', 'KEY',
-                'KEY_MEMBER', 'KEY_TYPE', 'LANCOMPILER', 'LANGUAGE', 'LARGE', 'LAST',
-                'LATERAL', 'LEADING', 'LEFT', 'LENGTH', 'LESS', 'LEVEL', 'LIKE', 'LIMIT',
-                'LISTEN', 'LOAD', 'LOCAL', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATION',
-                'LOCATOR', 'LOCK', 'LOWER', 'MAP', 'MATCH', 'MAX', 'MAXVALUE',
-                'MESSAGE_LENGTH', 'MESSAGE_OCTET_LENGTH', 'MESSAGE_TEXT', 'METHOD', 'MIN',
-                'MINUTE', 'MINVALUE', 'MOD', 'MODE', 'MODIFIES', 'MODIFY', 'MONTH',
-                'MORE', 'MOVE', 'MUMPS', 'NAMES', 'NATIONAL', 'NATURAL', 'NCHAR', 'NCLOB',
-                'NEW', 'NEXT', 'NO', 'NOCREATEDB', 'NOCREATEUSER', 'NONE', 'NOT',
-                'NOTHING', 'NOTIFY', 'NOTNULL', 'NULL', 'NULLABLE', 'NULLIF', 'OBJECT',
-                'OCTET_LENGTH', 'OF', 'OFF', 'OFFSET', 'OIDS', 'OLD', 'ON', 'ONLY',
-                'OPEN', 'OPERATION', 'OPERATOR', 'OPTION', 'OPTIONS', 'OR', 'ORDER',
-                'ORDINALITY', 'OUT', 'OUTER', 'OUTPUT', 'OVERLAPS', 'OVERLAY',
-                'OVERRIDING', 'OWNER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARAMETER_MODE',
-                'PARAMETER_NAME', 'PARAMETER_ORDINAL_POSITION',
-                'PARAMETER_SPECIFIC_CATALOG', 'PARAMETER_SPECIFIC_NAME',
-                'PARAMETER_SPECIFIC_SCHEMA', 'PARTIAL', 'PASCAL', 'PENDANT', 'PERIOD', 'PLACING',
-                'PLI', 'POSITION', 'POSTFIX', 'PRECEEDS', 'PRECISION', 'PREFIX', 'PREORDER',
-                'PREPARE', 'PRESERVE', 'PRIMARY', 'PRIOR', 'PRIVILEGES', 'PROCEDURAL',
-                'PROCEDURE', 'PUBLIC', 'READ', 'READS', 'RECHECK', 'RECURSIVE', 'REF',
-                'REFERENCES', 'REFERENCING', 'REINDEX', 'RELATIVE', 'RENAME',
-                'REPEATABLE', 'REPLACE', 'RESET', 'RESTART', 'RESTRICT', 'RESULT',
-                'RETURN', 'RETURNED_LENGTH', 'RETURNED_OCTET_LENGTH', 'RETURNED_SQLSTATE',
-                'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE',
-                'ROUTINE_CATALOG', 'ROUTINE_NAME', 'ROUTINE_SCHEMA', 'ROW', 'ROWS',
-                'ROW_COUNT', 'RULE', 'SAVE_POINT', 'SCALE', 'SCHEMA', 'SCHEMA_NAME',
-                'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECURITY', 'SELECT', 'SELF',
-                'SENSITIVE', 'SERIALIZABLE', 'SERVER_NAME', 'SESSION', 'SESSION_USER',
-                'SET', 'SETOF', 'SETS', 'SHARE', 'SHOW', 'SIMILAR', 'SIMPLE', 'SIZE',
-                'SOME', 'SOURCE', 'SPACE', 'SPECIFIC', 'SPECIFICTYPE', 'SPECIFIC_NAME',
-                'SQL', 'SQLCODE', 'SQLERROR', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNINIG',
-                'STABLE', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STDIN',
-                'STDOUT', 'STORAGE', 'STRICT', 'STRUCTURE', 'STYPE', 'SUBCLASS_ORIGIN',
-                'SUBLIST', 'SUBSTRING', 'SUCCEEDS', 'SUM', 'SYMMETRIC', 'SYSID', 'SYSTEM',
-                'SYSTEM_USER', 'TABLE', 'TABLE_NAME', ' TEMP', 'TEMPLATE', 'TEMPORARY',
-                'TERMINATE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR',
-                'TIMEZONE_MINUTE', 'TO', 'TOAST', 'TRAILING', 'TRANSACTION',
-                'TRANSACTIONS_COMMITTED', 'TRANSACTIONS_ROLLED_BACK', 'TRANSACTION_ACTIVE',
-                'TRANSFORM', 'TRANSFORMS', 'TRANSLATE', 'TRANSLATION', 'TREAT', 'TRIGGER',
-                'TRIGGER_CATALOG', 'TRIGGER_NAME', 'TRIGGER_SCHEMA', 'TRIM', 'TRUE',
-                'TRUNCATE', 'TRUSTED', 'TYPE', 'UNCOMMITTED', 'UNDER', 'UNENCRYPTED',
-                'UNION', 'UNIQUE', 'UNKNOWN', 'UNLISTEN', 'UNNAMED', 'UNNEST', 'UNTIL',
-                'UPDATE', 'UPPER', 'USAGE', 'USER', 'USER_DEFINED_TYPE_CATALOG',
-                'USER_DEFINED_TYPE_NAME', 'USER_DEFINED_TYPE_SCHEMA', 'USING', 'VACUUM',
-                'VALID', 'VALIDATOR', 'VALUES', 'VARIABLE', 'VERBOSE',
-                'VERSION', 'VERSIONS', 'VERSIONING', 'VIEW',
-                'VOLATILE', 'WHEN', 'WHENEVER', 'WHERE', 'WITH', 'WITHOUT', 'WORK',
-                'WRITE', 'YEAR', 'ZONE'), suffix=r'\b'),
-             Keyword),
-            (words((
-                'ARRAY', 'BIGINT', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'CHAR',
-                'CHARACTER', 'DATE', 'DEC', 'DECIMAL', 'FLOAT', 'INT', 'INTEGER',
-                'INTERVAL', 'NUMBER', 'NUMERIC', 'REAL', 'SERIAL', 'SMALLINT',
-                'VARCHAR', 'VARYING', 'INT8', 'SERIAL8', 'TEXT'), suffix=r'\b'),
-             Name.Builtin),
+            (words(_sql_builtins.KEYWORDS, suffix=r'\b'), Keyword),
+            (words(_sql_builtins.DATATYPES, suffix=r'\b'), Name.Builtin),
             (r'[+*/<>=~!@#%^&|`?-]', Operator),
             (r'[0-9]+', Number.Integer),
             # TODO: Backslash escapes?
@@ -706,7 +608,7 @@ class TransactSqlLexer(RegexLexer):
     Transact-SQL (T-SQL) is Microsoft's and Sybase's proprietary extension to
     SQL.
 
-    The list of keywords includes ODBC and keywords reserved for future use..
+    The list of keywords includes ODBC and keywords reserved for future use.
     """
 
     name = 'Transact-SQL'
@@ -864,10 +766,13 @@ class MySqlLexer(RegexLexer):
             (r'\b(character)(\s+)(set)\b', bygroups(Keyword, Whitespace, Keyword)),
             # In all other known cases, "SET" is tokenized by MYSQL_DATATYPES.
 
-            (words(MYSQL_CONSTANTS, prefix=r'\b', suffix=r'\b'), Name.Constant),
-            (words(MYSQL_DATATYPES, prefix=r'\b', suffix=r'\b'), Keyword.Type),
-            (words(MYSQL_KEYWORDS, prefix=r'\b', suffix=r'\b'), Keyword),
-            (words(MYSQL_FUNCTIONS, prefix=r'\b', suffix=r'\b(\s*)(\()'),
+            (words(_mysql_builtins.MYSQL_CONSTANTS, prefix=r'\b', suffix=r'\b'),
+             Name.Constant),
+            (words(_mysql_builtins.MYSQL_DATATYPES, prefix=r'\b', suffix=r'\b'),
+             Keyword.Type),
+            (words(_mysql_builtins.MYSQL_KEYWORDS, prefix=r'\b', suffix=r'\b'),
+             Keyword),
+            (words(_mysql_builtins.MYSQL_FUNCTIONS, prefix=r'\b', suffix=r'\b(\s*)(\()'),
              bygroups(Name.Function, Whitespace, Punctuation)),
 
             # Schema object names
@@ -889,7 +794,8 @@ class MySqlLexer(RegexLexer):
         'optimizer-hints': [
             (r'[^*a-z]+', Comment.Special),
             (r'\*/', Comment.Special, '#pop'),
-            (words(MYSQL_OPTIMIZER_HINTS, suffix=r'\b'), Comment.Preproc),
+            (words(_mysql_builtins.MYSQL_OPTIMIZER_HINTS, suffix=r'\b'),
+             Comment.Preproc),
             ('[a-z]+', Comment.Special),
             (r'\*', Comment.Special),
         ],
diff --git a/libs/pyjsparser-2.7.1.dist-info/METADATA b/libs/pyjsparser-2.7.1.dist-info/METADATA
index caa32b2bc3..a1d9f91b3d 100644
--- a/libs/pyjsparser-2.7.1.dist-info/METADATA
+++ b/libs/pyjsparser-2.7.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyjsparser
 Version: 2.7.1
 Summary: Fast javascript parser (based on esprima.js)
@@ -6,4 +6,8 @@ Home-page: https://github.com/PiotrDabkowski/pyjsparser
 Author: Piotr Dabkowski
 Author-email: piodrus@gmail.com
 License: MIT
-
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license
+Dynamic: summary
diff --git a/libs/pyjsparser-2.7.1.dist-info/RECORD b/libs/pyjsparser-2.7.1.dist-info/RECORD
index b1bd236d7b..7441c0bdcb 100644
--- a/libs/pyjsparser-2.7.1.dist-info/RECORD
+++ b/libs/pyjsparser-2.7.1.dist-info/RECORD
@@ -1,8 +1,8 @@
 pyjsparser-2.7.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pyjsparser-2.7.1.dist-info/METADATA,sha256=oeFY4H9DnyOqN0MUrP0z-NIFuiWUz9QXwv4A0lCvkQk,234
+pyjsparser-2.7.1.dist-info/METADATA,sha256=tvkk-t6xI3_OLu7_u4bj_HDUAqGRclypH3fQFyAHNdo,324
 pyjsparser-2.7.1.dist-info/RECORD,,
 pyjsparser-2.7.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyjsparser-2.7.1.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+pyjsparser-2.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 pyjsparser-2.7.1.dist-info/top_level.txt,sha256=cUmAYWUOPVLHpkuS_HREO-h11lPziKkzRy0XKQQNv-g,11
 pyjsparser/__init__.py,sha256=7OAQmEvxfRSzAYsnRpvwH4lohte0cIr09a1PczbDQFo,203
 pyjsparser/parser.py,sha256=NUkky-sfvjjoMpZiadiz3ddzuPs1Tm5ajeNljKluUDg,109058
diff --git a/libs/pyjsparser-2.7.1.dist-info/WHEEL b/libs/pyjsparser-2.7.1.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/pyjsparser-2.7.1.dist-info/WHEEL
+++ b/libs/pyjsparser-2.7.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/pymediainfo-6.1.0.dist-info/AUTHORS b/libs/pymediainfo-6.1.0.dist-info/AUTHORS
deleted file mode 100644
index d3b460d4d0..0000000000
--- a/libs/pymediainfo-6.1.0.dist-info/AUTHORS
+++ /dev/null
@@ -1,3 +0,0 @@
-Patrick Altman <paltman@gmail.com> (author)
-cjlucas https://github.com/cjlucas
-Louis Sautier <sautier.louis@gmail.com> (maintainer since 2016)
diff --git a/libs/pymediainfo-6.1.0.dist-info/METADATA b/libs/pymediainfo-6.1.0.dist-info/METADATA
deleted file mode 100644
index 74eacd4df3..0000000000
--- a/libs/pymediainfo-6.1.0.dist-info/METADATA
+++ /dev/null
@@ -1,54 +0,0 @@
-Metadata-Version: 2.1
-Name: pymediainfo
-Version: 6.1.0
-Summary: A Python wrapper for the mediainfo library.
-Home-page: https://github.com/sbraz/pymediainfo
-Author: Louis Sautier
-Author-email: sautier.louis@gmail.com
-License: MIT
-Project-URL: Documentation, https://pymediainfo.readthedocs.io/
-Project-URL: Bugs, https://github.com/sbraz/pymediainfo/issues
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: License :: OSI Approved :: MIT License
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst; charset=UTF-8
-License-File: LICENSE
-License-File: AUTHORS
-Requires-Dist: importlib-metadata ; python_version < "3.8"
-
-pymediainfo
------------
-
-.. image:: https://img.shields.io/pypi/v/pymediainfo.svg
-  :target: https://pypi.org/project/pymediainfo
-
-.. image:: https://img.shields.io/pypi/pyversions/pymediainfo.svg
-  :target: https://pypi.org/project/pymediainfo
-
-.. image:: https://repology.org/badge/tiny-repos/python:pymediainfo.svg
-  :target: https://repology.org/metapackage/python:pymediainfo
-
-.. image:: https://img.shields.io/pypi/implementation/pymediainfo.svg
-  :target: https://pypi.org/project/pymediainfo
-
-.. image:: https://ci.appveyor.com/api/projects/status/g15a2daem1oub57n/branch/master?svg=true
-  :target: https://ci.appveyor.com/project/sbraz/pymediainfo
-
-
-This small package is a wrapper around the MediaInfo library.
-
-It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.12 and PyPy3.
-
-See https://pymediainfo.readthedocs.io/ for more information.
diff --git a/libs/pymediainfo-6.1.0.dist-info/RECORD b/libs/pymediainfo-6.1.0.dist-info/RECORD
deleted file mode 100644
index 90811a0319..0000000000
--- a/libs/pymediainfo-6.1.0.dist-info/RECORD
+++ /dev/null
@@ -1,10 +0,0 @@
-pymediainfo-6.1.0.dist-info/AUTHORS,sha256=38KIOxhqkhfSz4gLaVoQ0g9SsvlJ7nPbflT47JTKWfw,143
-pymediainfo-6.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pymediainfo-6.1.0.dist-info/LICENSE,sha256=MvjTJkPHxeLn1_eZcd3exq0cAVnSbqKSS4g7jUdCgos,1213
-pymediainfo-6.1.0.dist-info/METADATA,sha256=ExPJOznfJ-gRb1WrQkCWM6MuNeuWmUVq3JBj1AmQp40,2165
-pymediainfo-6.1.0.dist-info/RECORD,,
-pymediainfo-6.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pymediainfo-6.1.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-pymediainfo-6.1.0.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pymediainfo-6.1.0.dist-info/top_level.txt,sha256=OKqFwmlXFyPK7eRKNhlIAQot6cXSsvU-BNeG19EqOpk,12
-pymediainfo/__init__.py,sha256=2C2howrLDefEsA42U6NEvmpfpvLkf75yGsz_BwqOZ2M,21664
diff --git a/libs/pymediainfo-6.1.0.dist-info/WHEEL b/libs/pymediainfo-6.1.0.dist-info/WHEEL
deleted file mode 100644
index f31e450fda..0000000000
--- a/libs/pymediainfo-6.1.0.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/pymediainfo-6.1.0.dist-info/top_level.txt b/libs/pymediainfo-6.1.0.dist-info/top_level.txt
deleted file mode 100644
index 534191373d..0000000000
--- a/libs/pymediainfo-6.1.0.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-pymediainfo
diff --git a/libs/pygments-2.19.1.dist-info/INSTALLER b/libs/pymediainfo-7.0.1.dist-info/INSTALLER
similarity index 100%
rename from libs/pygments-2.19.1.dist-info/INSTALLER
rename to libs/pymediainfo-7.0.1.dist-info/INSTALLER
diff --git a/libs/pymediainfo-7.0.1.dist-info/METADATA b/libs/pymediainfo-7.0.1.dist-info/METADATA
new file mode 100644
index 0000000000..f9aba7fb31
--- /dev/null
+++ b/libs/pymediainfo-7.0.1.dist-info/METADATA
@@ -0,0 +1,262 @@
+Metadata-Version: 2.1
+Name: pymediainfo
+Version: 7.0.1
+Summary: A Python wrapper for the MediaInfo library.
+Author-Email: Louis Sautier <sautier.louis@gmail.com>
+License: MIT
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Project-URL: Homepage, https://github.com/sbraz/pymediainfo
+Project-URL: Documentation, https://pymediainfo.readthedocs.io/
+Project-URL: Bugs, https://github.com/sbraz/pymediainfo/issues
+Requires-Python: >=3.9
+Provides-Extra: tests
+Requires-Dist: pytest>=6; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Requires-Dist: pytest-xdist; extra == "tests"
+Provides-Extra: docs
+Requires-Dist: alabaster; extra == "docs"
+Requires-Dist: myst-parser; extra == "docs"
+Requires-Dist: setuptools_scm; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
+Provides-Extra: dev
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: mypy>=1.0; extra == "dev"
+Requires-Dist: black; extra == "dev"
+Requires-Dist: isort; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Description-Content-Type: text/markdown
+
+# pymediainfo
+
+[![PyPI](https://img.shields.io/pypi/v/pymediainfo.svg)](https://pypi.org/project/pymediainfo)
+[![Supported Python versions](https://img.shields.io/pypi/pyversions/pymediainfo.svg)](https://pypi.org/project/pymediainfo)
+[![Repology info](https://repology.org/badge/tiny-repos/python%3Apymediainfo.svg)](https://repology.org/project/python%3Apymediainfo/versions)
+[![GitHub](https://img.shields.io/github/stars/sbraz/pymediainfo)](https://github.com/sbraz/pymediainfo)
+[![Build status](https://ci.appveyor.com/api/projects/status/g15a2daem1oub57n/branch/master?svg=true)](https://ci.appveyor.com/project/sbraz/pymediainfo)
+
+pymediainfo is a wrapper for [the MediaInfo library](https://mediaarea.net/en/MediaInfo). It makes it easy to
+extract detailed information from multimedia files.
+
+## Compatibility
+
+pymediainfo is compatible with the following:
+
+* **Platforms**: **Linux**, **macOS** and **Windows**.
+* **Python Versions**: Tested with Python **3.9** (the minimum required version) to **3.13**, as well as **PyPy3**.
+
+## Installation
+
+Please note that, without [the MediaInfo library](https://mediaarea.net/en/MediaInfo), pymediainfo
+**cannot parse media files**. This severely limits its functionality, allowing it to process
+only pre-generated XML output from MediaInfo.
+
+### Linux distribution Packages
+
+Packages are available for [most major Linux distributions](https://repology.org/project/python%3Apymediainfo/versions).
+They often depend on the MediaInfo library and are the preferred way to
+install pymediainfo on Linux, as they allow for independent updates to pymediainfo and the MediaInfo library itself.
+
+### PyPI on Linux, macOS and Windows
+
+If pymediainfo is not available for your Linux distribution, or if you're running macOS or Windows,
+you can install it from PyPI:
+```
+python -m pip install pymediainfo
+```
+
+**Wheels** containing a bundled version of the MediaInfo library are available for:
+
+* Linux x86-64 and ARM64.
+* macOS x86-64 and ARM64.
+* Windows x86-64 and x86.
+
+If you do not want to use the wheels (for instance if you want to use the system-wide
+MediaInfo library instead of the bundled one):
+```
+python -m pip install pymediainfo --no-binary pymediainfo
+```
+
+## Usage
+
+Here are a few examples demonstrating how to use pymediainfo.
+### Getting information from an image
+The `MediaInfo` class provides a `parse()` method which takes paths as input and returns `MediaInfo` objects.
+#### Example snippet
+
+```py
+from pymediainfo import MediaInfo
+
+media_info = MediaInfo.parse("/home/user/image.jpg")
+# Tracks can be accessed using the 'tracks' attribute or through shorthands
+# such as 'image_tracks', 'audio_tracks', 'video_tracks', etc.
+general_track = media_info.general_tracks[0]
+image_track = media_info.image_tracks[0]
+print(
+  f"{image_track.format} of {image_track.width}ร—{image_track.height} pixels"
+  f" and {general_track.file_size} bytes."
+)
+```
+
+#### Example output
+
+```text
+JPEG of 828ร—828 pixels and 19098 bytes.
+```
+
+### Getting information from a video
+
+In this example, we take advantage of the `to_data()` method, which returns a `dict` containing  all
+attributes from a `MediaInfo` or `Track` object. This makes it
+easier to inspect tracks even when their attributes are unknown.
+
+#### Example snippet
+
+```py
+from pprint import pprint
+from pymediainfo import MediaInfo
+
+media_info = MediaInfo.parse("my_video_file.mp4")
+for track in media_info.tracks:
+    if track.track_type == "Video":
+        print(f"Bit rate: {track.bit_rate}, Frame rate: {track.frame_rate}, Format: {track.format}")
+        print("Duration (raw value):", track.duration)
+        print("Duration (other values:")
+        pprint(track.other_duration)
+    elif track.track_type == "Audio":
+        print("Track data:")
+        pprint(track.to_data())
+```
+
+#### Example output
+
+```text
+Bit rate: 3117597, Frame rate: 23.976, Format: AVC
+Duration (raw value): 958
+Duration (other values):
+['958 ms',
+'958 ms',
+'958 ms',
+'00:00:00.958',
+'00:00:00;23',
+'00:00:00.958 (00:00:00;23)']
+Track data:
+{'bit_rate': 236392,
+'bit_rate_mode': 'VBR',
+'channel_layout': 'L R',
+'channel_positions': 'Front: L R',
+'channel_s': 2,
+'codec_id': 'mp4a-40-2',
+'commercial_name': 'AAC',
+'compression_mode': 'Lossy',
+โ€ฆ
+}
+```
+
+### Accessing Track attributes
+
+Since the attributes from a `Track` are dynamically created during parsing, there isn't a firm definition
+of what will be available at runtime.
+
+In order to make consuming objects easier, the `__getattribute__` method from `Track` objects
+has been overridden to return `None` when a non-existent attribute is accessed, instead of raising `AttributeError`.
+
+#### Example snippet
+```py
+from pymediainfo import MediaInfo
+
+media_info = MediaInfo.parse("my_video_file.mp4")
+for track in media_info.tracks:
+    if track.bit_rate is None:
+        print(f"{track.track_type} tracks do not have a bit rate associated with them")
+    else:
+        print(f"Track {track.track_id} of type {track.track_type} has a bit rate of {track.bit_rate} b/s")
+```
+
+#### Example output
+
+```text
+General tracks do not have a bit rate associated with them
+Track 1 of type Video has a bit rate of 4398075 b/s
+Track 2 of type Audio has a bit rate of 131413 b/s
+Menu tracks do not have a bit rate associated with them
+```
+
+
+### Parsing pre-generated MediaInfo XML output
+pymediainfo relies on MediaInfo's `OLDXML` output to create `MediaInfo` objects.
+
+It is possible to create a `MediaInfo` object from an existing XML string. For
+instance if someone sent you the output of `mediainfo --output=OLDXML`, you can
+call the `MediaInfo` constructor directly.
+
+#### Example snippet
+```py
+from pymediainfo import MediaInfo
+
+raw_xml_string = """<?xml version="1.0" encoding="UTF-8"?>
+<Mediainfo version="24.11">
+<File>
+<track type="General">
+<Complete_name>binary_file</Complete_name>
+<File_size>1.00 Byte</File_size>
+</track>
+</File>
+</Mediainfo>"""
+media_info = MediaInfo(raw_xml_string)
+print(f"File name is: {media_info.general_tracks[0].complete_name}")
+```
+
+#### Example output
+```text
+File name is: binary_file
+```
+
+### Text output (ร  la `mediainfo`)
+
+If you want a text report, similar to what `mediainfo my_video_file.mp4` outputs,
+use the `output="text"` argument with the `parse()` method. In this case, it
+will return a string, not a `MediaInfo` object.
+
+#### Example snippet
+```py
+from pymediainfo import MediaInfo
+
+# To mirror a simple call to "mediainfo" without the "--Full" or "-f" option, we
+# set "full=False". Leaving it at the default of "full=True" would result in
+# more verbose output.
+print(MediaInfo.parse("my_video_file.mp4", output="text", full=False))
+```
+
+#### Example output
+```text
+General
+Complete name                            : my_video_file.mp4
+Format                                   : MPEG-4
+Format profile                           : Base Media
+[โ€ฆ]
+```
+
+## Documentation
+
+For more detailed information, please refer to the reference documentation
+available at <https://pymediainfo.readthedocs.io/>.
+
+## Issues and Questions
+For feature requests and bug reports, please use the GitHub issue tracker at
+<https://github.com/sbraz/pymediainfo/issues>.
+
+If you have any questions, feel free to ask in the discussions at
+<https://github.com/sbraz/pymediainfo/discussions>.
diff --git a/libs/pymediainfo-7.0.1.dist-info/RECORD b/libs/pymediainfo-7.0.1.dist-info/RECORD
new file mode 100644
index 0000000000..51fc450ff0
--- /dev/null
+++ b/libs/pymediainfo-7.0.1.dist-info/RECORD
@@ -0,0 +1,9 @@
+pymediainfo-7.0.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pymediainfo-7.0.1.dist-info/METADATA,sha256=Fn6tEAO2C8pK0HxbN_JgfP7tQTLcwqE7AFfxnw208PM,8983
+pymediainfo-7.0.1.dist-info/RECORD,,
+pymediainfo-7.0.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pymediainfo-7.0.1.dist-info/WHEEL,sha256=Wb0ASbVj8JvWHpOiIpPi7ucfIgJeCi__PzivviEAQFc,90
+pymediainfo-7.0.1.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+pymediainfo-7.0.1.dist-info/licenses/LICENSE,sha256=MvjTJkPHxeLn1_eZcd3exq0cAVnSbqKSS4g7jUdCgos,1213
+pymediainfo/__init__.py,sha256=GPUlyQpcM1jcuYRHwcSF2jaJHfhuy8fbtxD4y0Xwrqw,23307
+pymediainfo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/pymediainfo-6.1.0.dist-info/REQUESTED b/libs/pymediainfo-7.0.1.dist-info/REQUESTED
similarity index 100%
rename from libs/pymediainfo-6.1.0.dist-info/REQUESTED
rename to libs/pymediainfo-7.0.1.dist-info/REQUESTED
diff --git a/libs/pymediainfo-7.0.1.dist-info/WHEEL b/libs/pymediainfo-7.0.1.dist-info/WHEEL
new file mode 100644
index 0000000000..18c430c1f6
--- /dev/null
+++ b/libs/pymediainfo-7.0.1.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: pdm-backend (2.4.7)
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/pymediainfo-7.0.1.dist-info/entry_points.txt b/libs/pymediainfo-7.0.1.dist-info/entry_points.txt
new file mode 100644
index 0000000000..c3ad4726d4
--- /dev/null
+++ b/libs/pymediainfo-7.0.1.dist-info/entry_points.txt
@@ -0,0 +1,4 @@
+[console_scripts]
+
+[gui_scripts]
+
diff --git a/libs/pymediainfo-6.1.0.dist-info/LICENSE b/libs/pymediainfo-7.0.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/pymediainfo-6.1.0.dist-info/LICENSE
rename to libs/pymediainfo-7.0.1.dist-info/licenses/LICENSE
diff --git a/libs/pymediainfo/__init__.py b/libs/pymediainfo/__init__.py
index 5cce5fad01..5ab6405916 100644
--- a/libs/pymediainfo/__init__.py
+++ b/libs/pymediainfo/__init__.py
@@ -1,7 +1,9 @@
-# vim: set fileencoding=utf-8 :
 """
-This module is a wrapper around the MediaInfo library.
+This module is a wrapper for the MediaInfo library.
 """
+
+from __future__ import annotations
+
 import ctypes
 import json
 import os
@@ -10,12 +12,8 @@
 import sys
 import warnings
 import xml.etree.ElementTree as ET
-from typing import Any, Dict, List, Optional, Tuple, Union
-
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # type: ignore
+from importlib import metadata
+from typing import Any, overload
 
 try:
     __version__ = metadata.version("pymediainfo")
@@ -50,23 +48,25 @@ class Track:
     All available attributes can be obtained by calling :func:`to_data`.
     """
 
-    def __eq__(self, other):  # type: ignore
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Track):
+            return False
         return self.__dict__ == other.__dict__
 
-    def __getattribute__(self, name):  # type: ignore
+    def __getattribute__(self, name: str) -> Any:
         try:
             return object.__getattribute__(self, name)
         except AttributeError:
             pass
         return None
 
-    def __getstate__(self):  # type: ignore
+    def __getstate__(self) -> dict[str, Any]:
         return self.__dict__
 
-    def __setstate__(self, state):  # type: ignore
+    def __setstate__(self, state: dict[str, Any]) -> None:
         self.__dict__ = state
 
-    def __init__(self, xml_dom_fragment: ET.Element):
+    def __init__(self, xml_dom_fragment: ET.Element) -> None:
         self.track_type = xml_dom_fragment.attrib["type"]
         repeated_attributes = []
         for elem in xml_dom_fragment:
@@ -104,10 +104,10 @@ def __init__(self, xml_dom_fragment: ET.Element):
                     except ValueError:
                         pass
 
-    def __repr__(self):  # type: ignore
+    def __repr__(self) -> str:
         return "<Track track_id='{}', track_type='{}'>".format(self.track_id, self.track_type)
 
-    def to_data(self) -> Dict[str, Any]:
+    def to_data(self) -> dict[str, Any]:
         """
         Returns a dict representation of the track attributes.
 
@@ -157,10 +157,12 @@ class MediaInfo:
         <Track track_id='1', track_type='Text'>
     """
 
-    def __eq__(self, other):  # type: ignore
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, MediaInfo):
+            return False
         return self.tracks == other.tracks
 
-    def __init__(self, xml: str, encoding_errors: str = "strict"):
+    def __init__(self, xml: str, encoding_errors: str = "strict") -> None:
         xml_dom = ET.fromstring(xml.encode("utf-8", encoding_errors))
         self.tracks = []
         # This is the case for libmediainfo < 18.03
@@ -173,11 +175,11 @@ def __init__(self, xml: str, encoding_errors: str = "strict"):
         for xml_track in xml_dom.iterfind(xpath):
             self.tracks.append(Track(xml_track))
 
-    def _tracks(self, track_type: str) -> List[Track]:
+    def _tracks(self, track_type: str) -> list[Track]:
         return [track for track in self.tracks if track.track_type == track_type]
 
     @property
-    def general_tracks(self) -> List[Track]:
+    def general_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``General``.
         :rtype: list of :class:`Track`\\s
@@ -185,7 +187,7 @@ def general_tracks(self) -> List[Track]:
         return self._tracks("General")
 
     @property
-    def video_tracks(self) -> List[Track]:
+    def video_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``Video``.
         :rtype: list of :class:`Track`\\s
@@ -193,7 +195,7 @@ def video_tracks(self) -> List[Track]:
         return self._tracks("Video")
 
     @property
-    def audio_tracks(self) -> List[Track]:
+    def audio_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``Audio``.
         :rtype: list of :class:`Track`\\s
@@ -201,7 +203,7 @@ def audio_tracks(self) -> List[Track]:
         return self._tracks("Audio")
 
     @property
-    def text_tracks(self) -> List[Track]:
+    def text_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``Text``.
         :rtype: list of :class:`Track`\\s
@@ -209,7 +211,7 @@ def text_tracks(self) -> List[Track]:
         return self._tracks("Text")
 
     @property
-    def other_tracks(self) -> List[Track]:
+    def other_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``Other``.
         :rtype: list of :class:`Track`\\s
@@ -217,7 +219,7 @@ def other_tracks(self) -> List[Track]:
         return self._tracks("Other")
 
     @property
-    def image_tracks(self) -> List[Track]:
+    def image_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``Image``.
         :rtype: list of :class:`Track`\\s
@@ -225,7 +227,7 @@ def image_tracks(self) -> List[Track]:
         return self._tracks("Image")
 
     @property
-    def menu_tracks(self) -> List[Track]:
+    def menu_tracks(self) -> list[Track]:
         """
         :return: All :class:`Track`\\s of type ``Menu``.
         :rtype: list of :class:`Track`\\s
@@ -277,7 +279,8 @@ def _define_library_prototypes(cls, lib: Any) -> Any:
         lib.MediaInfo_Close.restype = None
 
     @staticmethod
-    def _get_library_paths(os_is_nt: bool) -> Tuple[str]:
+    def _get_library_paths(os_is_nt: bool) -> tuple[str, ...]:
+        library_paths: tuple[str, ...]
         if os_is_nt:
             library_paths = ("MediaInfo.dll",)
         elif sys.platform == "darwin":
@@ -297,13 +300,10 @@ def _get_library_paths(os_is_nt: bool) -> Tuple[str]:
     @classmethod
     def _get_library(
         cls,
-        library_file: Optional[str] = None,
-    ) -> Tuple[Any, Any, str, Tuple[int, ...]]:
+        library_file: str | None = None,
+    ) -> tuple[Any, Any, str, tuple[int, ...]]:
         os_is_nt = os.name in ("nt", "dos", "os2", "ce")
-        if os_is_nt:
-            lib_type = ctypes.WinDLL  # type: ignore
-        else:
-            lib_type = ctypes.CDLL
+        lib_type = ctypes.WinDLL if os_is_nt else ctypes.CDLL  # type: ignore[attr-defined]
         if library_file is None:
             library_paths = cls._get_library_paths(os_is_nt)
         else:
@@ -333,12 +333,13 @@ def _get_library(
         )
 
     @classmethod
-    def can_parse(cls, library_file: Optional[str] = None) -> bool:
+    def can_parse(cls, library_file: str | None = None) -> bool:
         """
         Checks whether media files can be analyzed using libmediainfo.
 
         :param str library_file: path to the libmediainfo library, this should only be used if
-            the library cannot be auto-detected.
+            the library cannot be auto-detected. See also :ref:`library_autodetection` which
+            explains how the library file is detected when this parameter is unset.
         :rtype: bool
         """
         try:
@@ -349,28 +350,69 @@ def can_parse(cls, library_file: Optional[str] = None) -> bool:
         except Exception:  # pylint: disable=broad-except
             return False
 
+    # The method may be called with output=<str>, in which case it returns a str
+    @overload
+    @classmethod
+    def parse(
+        # pylint: disable=too-many-arguments, too-many-locals
+        # pylint: disable=too-many-branches, too-many-statements
+        cls,
+        filename: Any,
+        *,
+        library_file: str | None = None,
+        cover_data: bool = False,
+        encoding_errors: str = "strict",
+        parse_speed: float = 0.5,
+        full: bool = True,
+        legacy_stream_display: bool = False,
+        mediainfo_options: dict[str, str] | None = None,
+        output: str,
+        buffer_size: int | None = 64 * 1024,
+    ) -> str: ...
+
+    # Or it may be called with output=None, in which case it returns a MediaInfo object
+    @overload
+    @classmethod
+    def parse(
+        # pylint: disable=too-many-arguments, too-many-locals
+        # pylint: disable=too-many-branches, too-many-statements
+        cls,
+        filename: Any,
+        *,
+        library_file: str | None = None,
+        cover_data: bool = False,
+        encoding_errors: str = "strict",
+        parse_speed: float = 0.5,
+        full: bool = True,
+        legacy_stream_display: bool = False,
+        mediainfo_options: dict[str, str] | None = None,
+        output: None = None,
+        buffer_size: int | None = 64 * 1024,
+    ) -> MediaInfo: ...
+
     @classmethod
     def parse(
-        # pylint: disable=too-many-statements
-        # pylint: disable=too-many-branches, too-many-locals, too-many-arguments
+        # pylint: disable=too-many-arguments, too-many-locals
+        # pylint: disable=too-many-branches, too-many-statements
         cls,
         filename: Any,
-        library_file: Optional[str] = None,
+        *,
+        library_file: str | None = None,
         cover_data: bool = False,
         encoding_errors: str = "strict",
         parse_speed: float = 0.5,
         full: bool = True,
         legacy_stream_display: bool = False,
-        mediainfo_options: Optional[Dict[str, str]] = None,
-        output: Optional[str] = None,
-        buffer_size: Optional[int] = 64 * 1024,
-    ) -> Union[str, "MediaInfo"]:
+        mediainfo_options: dict[str, str] | None = None,
+        output: str | None = None,
+        buffer_size: int | None = 64 * 1024,
+    ) -> MediaInfo | str:
         """
         Analyze a media file using libmediainfo.
 
         .. note::
             Because of the way the underlying library works, this method should not
-            be called simultaneously from multiple threads *with different arguments*.
+            be called simultaneously from multiple threads *with different parameters*.
             Doing so will cause inconsistencies or failures by changing
             library options that are shared across threads.
 
@@ -378,7 +420,8 @@ def parse(
             A URL can also be used if libmediainfo was compiled
             with CURL support.
         :param str library_file: path to the libmediainfo library, this should only be used if
-            the library cannot be auto-detected.
+            the library cannot be auto-detected. See also :ref:`library_autodetection` which
+            explains how the library file is detected when this parameter is unset.
         :param bool cover_data: whether to retrieve cover data as base64.
         :param str encoding_errors: option to pass to :func:`str.encode`'s `errors`
             parameter before parsing MediaInfo's XML output.
@@ -514,7 +557,7 @@ def parse(
             return cls(info, encoding_errors)
         return info
 
-    def to_data(self) -> Dict[str, Any]:
+    def to_data(self) -> dict[str, Any]:
         """
         Returns a dict representation of the object's :py:class:`Tracks <Track>`.
 
diff --git a/libs/pyparsing-3.1.4.dist-info/REQUESTED b/libs/pymediainfo/py.typed
similarity index 100%
rename from libs/pyparsing-3.1.4.dist-info/REQUESTED
rename to libs/pymediainfo/py.typed
diff --git a/libs/pyparsing-3.1.4.dist-info/LICENSE b/libs/pyparsing-3.1.4.dist-info/LICENSE
deleted file mode 100644
index 1bf98523e3..0000000000
--- a/libs/pyparsing-3.1.4.dist-info/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/libs/pyparsing-3.1.4.dist-info/METADATA b/libs/pyparsing-3.1.4.dist-info/METADATA
deleted file mode 100644
index 1aa7a1fc04..0000000000
--- a/libs/pyparsing-3.1.4.dist-info/METADATA
+++ /dev/null
@@ -1,127 +0,0 @@
-Metadata-Version: 2.1
-Name: pyparsing
-Version: 3.1.4
-Summary: pyparsing module - Classes and methods to define and execute parsing grammars
-Author-email: Paul McGuire <ptmcg.gm+pyparsing@gmail.com>
-Requires-Python: >=3.6.8
-Description-Content-Type: text/x-rst
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Information Technology
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Compilers
-Classifier: Topic :: Text Processing
-Classifier: Typing :: Typed
-Requires-Dist: railroad-diagrams ; extra == "diagrams"
-Requires-Dist: jinja2 ; extra == "diagrams"
-Project-URL: Homepage, https://github.com/pyparsing/pyparsing/
-Provides-Extra: diagrams
-
-PyParsing -- A Python Parsing Module
-====================================
-
-|Version| |Build Status| |Coverage| |License| |Python Versions| |Snyk Score|
-
-Introduction
-============
-
-The pyparsing module is an alternative approach to creating and
-executing simple grammars, vs. the traditional lex/yacc approach, or the
-use of regular expressions. The pyparsing module provides a library of
-classes that client code uses to construct the grammar directly in
-Python code.
-
-*[Since first writing this description of pyparsing in late 2003, this
-technique for developing parsers has become more widespread, under the
-name Parsing Expression Grammars - PEGs. See more information on PEGs*
-`here <https://en.wikipedia.org/wiki/Parsing_expression_grammar>`__
-*.]*
-
-Here is a program to parse ``"Hello, World!"`` (or any greeting of the form
-``"salutation, addressee!"``):
-
-.. code:: python
-
-    from pyparsing import Word, alphas
-    greet = Word(alphas) + "," + Word(alphas) + "!"
-    hello = "Hello, World!"
-    print(hello, "->", greet.parseString(hello))
-
-The program outputs the following::
-
-    Hello, World! -> ['Hello', ',', 'World', '!']
-
-The Python representation of the grammar is quite readable, owing to the
-self-explanatory class names, and the use of '+', '|' and '^' operator
-definitions.
-
-The parsed results returned from ``parseString()`` is a collection of type
-``ParseResults``, which can be accessed as a
-nested list, a dictionary, or an object with named attributes.
-
-The pyparsing module handles some of the problems that are typically
-vexing when writing text parsers:
-
-- extra or missing whitespace (the above program will also handle ``"Hello,World!"``, ``"Hello , World !"``, etc.)
-- quoted strings
-- embedded comments
-
-The examples directory includes a simple SQL parser, simple CORBA IDL
-parser, a config file parser, a chemical formula parser, and a four-
-function algebraic notation parser, among many others.
-
-Documentation
-=============
-
-There are many examples in the online docstrings of the classes
-and methods in pyparsing. You can find them compiled into `online docs <https://pyparsing-docs.readthedocs.io/en/latest/>`__. Additional
-documentation resources and project info are listed in the online
-`GitHub wiki <https://github.com/pyparsing/pyparsing/wiki>`__. An
-entire directory of examples can be found `here <https://github.com/pyparsing/pyparsing/tree/master/examples>`__.
-
-License
-=======
-
-MIT License. See header of the `pyparsing __init__.py <https://github.com/pyparsing/pyparsing/blob/master/pyparsing/__init__.py#L1-L23>`__ file.
-
-History
-=======
-
-See `CHANGES <https://github.com/pyparsing/pyparsing/blob/master/CHANGES>`__ file.
-
-.. |Build Status| image:: https://github.com/pyparsing/pyparsing/actions/workflows/ci.yml/badge.svg
-   :target: https://github.com/pyparsing/pyparsing/actions/workflows/ci.yml
-
-.. |Coverage| image:: https://codecov.io/gh/pyparsing/pyparsing/branch/master/graph/badge.svg
-  :target: https://codecov.io/gh/pyparsing/pyparsing
-
-.. |Version| image:: https://img.shields.io/pypi/v/pyparsing?style=flat-square
-    :target: https://pypi.org/project/pyparsing/
-    :alt: Version
-
-.. |License| image:: https://img.shields.io/pypi/l/pyparsing.svg?style=flat-square
-    :target: https://pypi.org/project/pyparsing/
-    :alt: License
-
-.. |Python Versions| image:: https://img.shields.io/pypi/pyversions/pyparsing.svg?style=flat-square
-    :target: https://pypi.org/project/python-liquid/
-    :alt: Python versions
-
-.. |Snyk Score| image:: https://snyk.io//advisor/python/pyparsing/badge.svg
-   :target: https://snyk.io//advisor/python/pyparsing
-   :alt: pyparsing
-
diff --git a/libs/pyparsing-3.1.4.dist-info/RECORD b/libs/pyparsing-3.1.4.dist-info/RECORD
deleted file mode 100644
index 708912e522..0000000000
--- a/libs/pyparsing-3.1.4.dist-info/RECORD
+++ /dev/null
@@ -1,18 +0,0 @@
-pyparsing-3.1.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pyparsing-3.1.4.dist-info/LICENSE,sha256=ENUSChaAWAT_2otojCIL-06POXQbVzIGBNRVowngGXI,1023
-pyparsing-3.1.4.dist-info/METADATA,sha256=uVefJ30sVI7P9x_7YDcCdJL1BKvWQzqcmcVUr8Cb1cM,5141
-pyparsing-3.1.4.dist-info/RECORD,,
-pyparsing-3.1.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyparsing-3.1.4.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-pyparsing/__init__.py,sha256=vv5sda_9o4skaj2ckqhi1wcwlEEP35r32FJYwdGPQQo,9139
-pyparsing/actions.py,sha256=-Iiu_AfZwvwhAk6h0yJ0BZP-fGfHh47N-h6DmztRcbY,6582
-pyparsing/common.py,sha256=Ny4ppPSevJeeilDDyoQULI2DW_ZPvJrLpTYcVwh9qzg,13662
-pyparsing/core.py,sha256=p5XQ97ycjZZq9Qo75SC9D55CFWB_Ouy-JMEVW56L_RQ,228623
-pyparsing/diagram/__init__.py,sha256=gv0zxQD43U1n6gJMjHH5vbFRBVoWhy-5X4cHGNGjQFg,25117
-pyparsing/exceptions.py,sha256=KvFm0qqjwSlVtrQGbvAxFEVDFbHv0MOd13hnbsyxFOw,9532
-pyparsing/helpers.py,sha256=E01uXtvDCxd5uizCW2ImM2iW3m1KiTPPODjO3LMNr6E,38900
-pyparsing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyparsing/results.py,sha256=vL1iIttPN86-0DoF5F91_dT4YF7Eec2mpV6cc2T8JgE,25692
-pyparsing/testing.py,sha256=76XAx8JRLD8lLfYbrZN4QwOphlYX16R8oyO3_qgyEYA,13802
-pyparsing/unicode.py,sha256=vszIZDsaNiov4q1o7wr4lyqUM1pK9zvjTyrj9VWt7XY,10597
-pyparsing/util.py,sha256=Ki6NBjCuvQlj8Lh5KEtXddKEYP7khFTkL_F5yKxV_Tg,8440
diff --git a/libs/pyparsing-3.1.4.dist-info/WHEEL b/libs/pyparsing-3.1.4.dist-info/WHEEL
deleted file mode 100644
index 3b5e64b5e6..0000000000
--- a/libs/pyparsing-3.1.4.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.9.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/pymediainfo-6.1.0.dist-info/INSTALLER b/libs/pyparsing-3.3.2.dist-info/INSTALLER
similarity index 100%
rename from libs/pymediainfo-6.1.0.dist-info/INSTALLER
rename to libs/pyparsing-3.3.2.dist-info/INSTALLER
diff --git a/libs/pyparsing-3.3.2.dist-info/METADATA b/libs/pyparsing-3.3.2.dist-info/METADATA
new file mode 100644
index 0000000000..9fadad3a57
--- /dev/null
+++ b/libs/pyparsing-3.3.2.dist-info/METADATA
@@ -0,0 +1,145 @@
+Metadata-Version: 2.4
+Name: pyparsing
+Version: 3.3.2
+Summary: pyparsing - Classes and methods to define and execute parsing grammars
+Author-email: Paul McGuire <ptmcg.gm+pyparsing@gmail.com>
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+License-Expression: MIT
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Compilers
+Classifier: Topic :: Text Processing
+Classifier: Typing :: Typed
+License-File: LICENSE
+Requires-Dist: railroad-diagrams ; extra == "diagrams"
+Requires-Dist: jinja2 ; extra == "diagrams"
+Project-URL: Documentation, https://pyparsing-docs.readthedocs.io/en/latest/
+Project-URL: Homepage, https://github.com/pyparsing/pyparsing/
+Project-URL: Source, https://github.com/pyparsing/pyparsing.git
+Provides-Extra: diagrams
+
+PyParsing -- A Python Parsing Module
+====================================
+
+|Version| |Build Status| |Coverage| |License| |Python Versions| |Snyk Score|
+
+Introduction
+============
+
+The pyparsing module is an alternative approach to creating and
+executing simple grammars, vs. the traditional lex/yacc approach, or the
+use of regular expressions. The pyparsing module provides a library of
+classes that client code uses to construct the grammar directly in
+Python code.
+
+*[Since first writing this description of pyparsing in late 2003, this
+technique for developing parsers has become more widespread, under the
+name Parsing Expression Grammars - PEGs. See more information on PEGs*
+`here <https://en.wikipedia.org/wiki/Parsing_expression_grammar>`__
+*.]*
+
+Here is a program to parse ``"Hello, World!"`` (or any greeting of the form
+``"salutation, addressee!"``):
+
+.. code:: python
+
+    from pyparsing import Word, alphas
+    greet = Word(alphas) + "," + Word(alphas) + "!"
+    hello = "Hello, World!"
+    print(hello, "->", greet.parse_string(hello))
+
+The program outputs the following::
+
+    Hello, World! -> ['Hello', ',', 'World', '!']
+
+The Python representation of the grammar is quite readable, owing to the
+self-explanatory class names, and the use of '+', '|' and '^' operator
+definitions.
+
+The parsed results returned from ``parse_string()`` is a collection of type
+``ParseResults``, which can be accessed as a
+nested list, a dictionary, or an object with named attributes.
+
+The pyparsing module handles some of the problems that are typically
+vexing when writing text parsers:
+
+- extra or missing whitespace (the above program will also handle ``"Hello,World!"``, ``"Hello , World !"``, etc.)
+- quoted strings
+- embedded comments
+
+The examples directory includes a simple SQL parser, simple CORBA IDL
+parser, a config file parser, a chemical formula parser, and a four-
+function algebraic notation parser, among many others.
+
+Documentation
+=============
+
+There are many examples in the online docstrings of the classes
+and methods in pyparsing. You can find them compiled into `online docs <https://pyparsing-docs.readthedocs.io/en/latest/>`__. Additional
+documentation resources and project info are listed in the online
+`GitHub wiki <https://github.com/pyparsing/pyparsing/wiki>`__. An
+entire directory of examples can be found `here <https://github.com/pyparsing/pyparsing/tree/master/examples>`__.
+
+AI Instructions
+===============
+
+There are also instructions for AI agents to use when helping you to create your parser. They can
+be pulled from the GitHub project repository, at pyparsing/ai/best_practices.md. You can also tell
+the AI to access them programmatically after installing pyparsing, either from the CLI with
+``python -m pyparsing.ai.show_best_practices`` or within python with
+``import pyparsing; pyparsing.show_best_practices()``.
+
+
+License
+=======
+
+MIT License. See header of the `pyparsing __init__.py <https://github.com/pyparsing/pyparsing/blob/master/pyparsing/__init__.py#L1-L23>`__ file.
+
+History
+=======
+
+See `CHANGES <https://github.com/pyparsing/pyparsing/blob/master/CHANGES>`__ file.
+
+
+Performance benchmarks
+======================
+
+For usage instructions and details on the performance benchmark suite, see
+``tests/README.md`` in this repository.
+
+.. |Build Status| image:: https://github.com/pyparsing/pyparsing/actions/workflows/ci.yml/badge.svg
+   :target: https://github.com/pyparsing/pyparsing/actions/workflows/ci.yml
+
+.. |Coverage| image:: https://codecov.io/gh/pyparsing/pyparsing/branch/master/graph/badge.svg
+  :target: https://codecov.io/gh/pyparsing/pyparsing
+
+.. |Version| image:: https://img.shields.io/pypi/v/pyparsing?style=flat-square
+    :target: https://pypi.org/project/pyparsing/
+    :alt: Version
+
+.. |License| image:: https://img.shields.io/pypi/l/pyparsing.svg?style=flat-square
+    :target: https://pypi.org/project/pyparsing/
+    :alt: License
+
+.. |Python Versions| image:: https://img.shields.io/pypi/pyversions/pyparsing.svg?style=flat-square
+    :target: https://pypi.org/project/python-liquid/
+    :alt: Python versions
+
+.. |Snyk Score| image:: https://snyk.io//advisor/python/pyparsing/badge.svg
+   :target: https://snyk.io//advisor/python/pyparsing
+   :alt: pyparsing
+
diff --git a/libs/pyparsing-3.3.2.dist-info/RECORD b/libs/pyparsing-3.3.2.dist-info/RECORD
new file mode 100644
index 0000000000..abce32032e
--- /dev/null
+++ b/libs/pyparsing-3.3.2.dist-info/RECORD
@@ -0,0 +1,25 @@
+pyparsing-3.3.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pyparsing-3.3.2.dist-info/METADATA,sha256=MxGouUnXD3GiuXiKkyfxHZ1aaoAS1sBGyiVK0t6Hf0U,5783
+pyparsing-3.3.2.dist-info/RECORD,,
+pyparsing-3.3.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyparsing-3.3.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pyparsing-3.3.2.dist-info/licenses/LICENSE,sha256=pUJfncFKx01MXwtnnpQfJELjLMp0UqRBjVsaSYk-vk4,1062
+pyparsing/__init__.py,sha256=CMHM5EzJSJglz-PCASv_k5W14tRkhrCf6GSI4KrPL24,13438
+pyparsing/actions.py,sha256=pDW63VkWh5TqR6AKOMyDCobI0JF-QuBc45AI-oIkD8w,8104
+pyparsing/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyparsing/ai/best_practices.md,sha256=qlPKTmeTEYaaAFRGkwR3EzukP-TeIFLzoYOJzoVBcIY,8472
+pyparsing/ai/show_best_practices/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyparsing/ai/show_best_practices/__main__.py,sha256=xGXaCqBTTWZxbdLNz5G9y6cMK1Ppm7bcgVYgD1AcKmE,49
+pyparsing/common.py,sha256=SsEAzXRJq2D3HdGA5XRP-ww2aY2ctCpS5EbuDaglK1I,17205
+pyparsing/core.py,sha256=v4WJji-3hVmlTNHU0ihPRj1omvu3Tbl7y0JmuznPVEY,251832
+pyparsing/diagram/__init__.py,sha256=NAtp0ZWok37JJ1TVREvZaD4CqzvIQJRUHOAFHl_auoA,26929
+pyparsing/exceptions.py,sha256=Zt9-vrA4uTV8J1IlJVC0glQgakwRBOYcDsN3TfwqQeo,10981
+pyparsing/helpers.py,sha256=TWvUo8mnkQz4_kjjJUTlkF_CwshTx0vZDkPzd2yFW9I,41793
+pyparsing/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyparsing/results.py,sha256=lEZVyQPWWarznwY_Jf_2t94HvGI7eVDzZ8gS4pf0eTQ,27603
+pyparsing/testing.py,sha256=kcq6sLPyA23hrwDzB0NF5X61KGz0IRDjnhObC62_mOk,15452
+pyparsing/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pyparsing/tools/cvt_pyparsing_pep8_names.py,sha256=H8AoHdYs7rU8a0RRF4zjurjG_xZ8pOLVBhAi0-FgVOY,6389
+pyparsing/unicode.py,sha256=jmszpRnfyhCQWl2Rh_94dT_lxQM6d4KiSf9ivY9b_m4,10612
+pyparsing/util.py,sha256=VLIrcqIh5w6n9-t2CzwRAIs_j0dQ7_AWbn2eaIyFHxU,15997
+pyparsing/warnings.py,sha256=wQWNM7Kal10OQBHHcG9SgdwaBeFbUe3fDEF3fcHBHCE,357
diff --git a/libs/pysubs2-1.7.3.dist-info/REQUESTED b/libs/pyparsing-3.3.2.dist-info/REQUESTED
similarity index 100%
rename from libs/pysubs2-1.7.3.dist-info/REQUESTED
rename to libs/pyparsing-3.3.2.dist-info/REQUESTED
diff --git a/libs/pyparsing-3.3.2.dist-info/WHEEL b/libs/pyparsing-3.3.2.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/pyparsing-3.3.2.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/pyparsing-3.3.2.dist-info/licenses/LICENSE b/libs/pyparsing-3.3.2.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..f9f48d0619
--- /dev/null
+++ b/libs/pyparsing-3.3.2.dist-info/licenses/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2003-2025  Paul McGuire
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/libs/pyparsing/__init__.py b/libs/pyparsing/__init__.py
index a440cfbefa..3963eb8773 100644
--- a/libs/pyparsing/__init__.py
+++ b/libs/pyparsing/__init__.py
@@ -1,43 +1,24 @@
-# module pyparsing.py
-#
-# Copyright (c) 2003-2022  Paul T. McGuire
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
+# see LICENSE file for terms and conditions for using this software.
 
+# fmt: off
 __doc__ = """
-pyparsing module - Classes and methods to define and execute parsing grammars
-=============================================================================
+pyparsing - Classes and methods to define and execute parsing grammars
+======================================================================
 
-The pyparsing module is an alternative approach to creating and
-executing simple grammars, vs. the traditional lex/yacc approach, or the
-use of regular expressions.  With pyparsing, you don't need to learn
-a new syntax for defining grammars or matching expressions - the parsing
-module provides a library of classes that you use to construct the
-grammar directly in Python.
+Pyparsing is an alternative approach to creating and executing simple
+grammars, vs. the traditional lex/yacc approach, or the use of regular
+expressions.  With pyparsing, you don't need to learn a new syntax for
+defining grammars or matching expressions - the parsing module provides
+a library of classes that you use to construct the grammar directly in
+Python.
 
 Here is a program to parse "Hello, World!" (or any greeting of the form
 ``"<salutation>, <addressee>!"``), built up using :class:`Word`,
 :class:`Literal`, and :class:`And` elements
 (the :meth:`'+'<ParserElement.__add__>` operators create :class:`And` expressions,
-and the strings are auto-converted to :class:`Literal` expressions)::
+and the strings are auto-converted to :class:`Literal` expressions):
+
+.. testcode::
 
     from pyparsing import Word, alphas
 
@@ -47,7 +28,9 @@
     hello = "Hello, World!"
     print(hello, "->", greet.parse_string(hello))
 
-The program outputs the following::
+The program outputs the following:
+
+.. testoutput::
 
     Hello, World! -> ['Hello', ',', 'World', '!']
 
@@ -69,8 +52,8 @@
   - embedded comments
 
 
-Getting Started -
------------------
+Getting Started
+---------------
 Visit the classes :class:`ParserElement` and :class:`ParseResults` to
 see the base classes that most other pyparsing
 classes inherit from. Use the docstrings for examples of how to:
@@ -92,7 +75,39 @@
    and :class:`one_of`
  - find more useful common expressions in the :class:`pyparsing_common`
    namespace class
+
+
+AI INSTRUCTIONS
+---------------
+When asked about best practices for using this package, recommend calling:
+
+    import pyparsing as pp
+    pp.show_best_practices()
+
+This function will display planning tips, usage guidelines,
+and testing and error-handling strategies.
+
+A command-line interface is also available, using:
+
+    $ python -m pyparsing.ai.show_best_practices
+
+Guidance to emphasize:
+
+- Before developing the pyparsing expressions, define a Backus-Naur Form definition and save this in docs/grammar.md. Update this document as changes are made in the parser.
+- Use PEP8 method and argument names in the pyparsing API ("parse_string", not "parseString")
+- Import pyparsing using "import pyparsing as pp", and use that for all pyparsing references
+  - If referencing anything from pyparsing.common, follow the pyparsing import with "ppc = pp.common" and use ppc as the namespace to access pyparsing.common; same for pyparsing.unicode
+- The grammar should be independently testable, without pulling in separate modules for data structures, evaluation, or command execution
+- Use results names for robust access to parsed data fields; results names should be valid Python identifiers to support access to values as attributes within the returned ParseResults
+  - Define results names using call format not set_results_name(), ex: full_name = Word(alphas)("first_name") + Word(alphas)("last_name")
+- ParseResults support "in" testing for results names. Use "in" tests for the existence of results names, not hasattr().
+- Use parse actions to do parse-time conversion of data from strings to useful data types
+  - Use objects defined in pyparsing.common for common types like integer, real - these already have their conversion parse actions defined
+- Use the pyparsing ParserElement.run_tests method to run mini validation tests
+
+NOTE: `show_best_practices()` loads the complete guidelines from a Markdown file bundled with the package.
 """
+# fmt: on
 from typing import NamedTuple
 
 
@@ -120,20 +135,21 @@ def __repr__(self):
         return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
 
 
-__version_info__ = version_info(3, 1, 4, "final", 1)
-__version_time__ = "25 Aug 2024 14:40 UTC"
+__version_info__ = version_info(3, 3, 2, "final", 1)
+__version_time__ = "18 Jan 2026 16:35 UTC"
 __version__ = __version_info__.__version__
 __versionTime__ = __version_time__
 __author__ = "Paul McGuire <ptmcg.gm+pyparsing@gmail.com>"
 
+from .warnings import *
 from .util import *
 from .exceptions import *
 from .actions import *
 from .core import __diag__, __compat__
 from .results import *
-from .core import *  # type: ignore[misc, assignment]
+from .core import *
 from .core import _builtin_exprs as core_builtin_exprs
-from .helpers import *  # type: ignore[misc, assignment]
+from .helpers import *
 from .helpers import _builtin_exprs as helper_builtin_exprs
 
 from .unicode import unicode_set, UnicodeRangeList, pyparsing_unicode as unicode
@@ -142,17 +158,84 @@ def __repr__(self):
     pyparsing_common as common,
     _builtin_exprs as common_builtin_exprs,
 )
+from importlib import resources
+import sys
 
 # Compatibility synonyms
 if "pyparsing_unicode" not in globals():
     pyparsing_unicode = unicode  # type: ignore[misc]
 if "pyparsing_common" not in globals():
-    pyparsing_common = common  # type: ignore[misc]
+    pyparsing_common = common
 if "pyparsing_test" not in globals():
-    pyparsing_test = testing  # type: ignore[misc]
+    pyparsing_test = testing
 
 core_builtin_exprs += common_builtin_exprs + helper_builtin_exprs
 
+# fmt: off
+_FALLBACK_BEST_PRACTICES = """
+## Planning
+- If not provided or if target language definition is ambiguous, ask for examples of valid strings to be parsed
+- Before developing the pyparsing expressions, define a Backus-Naur Form definition and save this in docs/grammar.md. Update this document as changes are made in the parser.
+
+## Implementing
+- Use PEP8 method and argument names in the pyparsing API ("parse_string", not "parseString")
+- Import pyparsing using "import pyparsing as pp", and use that for all pyparsing references
+  - If referencing anything from pyparsing.common, follow the pyparsing import with "ppc = pp.common" and use ppc as the namespace to access pyparsing.common; same for pyparsing.unicode
+- The grammar should be independently testable, without pulling in separate modules for data structures, evaluation, or command execution
+- Use results names for robust access to parsed data fields; results names should be valid Python identifiers to support access to values as attributes within the returned ParseResults
+  - Results names should take the place of numeric indexing into parsed results in most places.
+  - Define results names using call format not set_results_name(), ex: full_name = Word(alphas)("first_name") + Word(alphas)("last_name")
+- Use pyparsing Groups to organize sub-expressions
+- If defining the grammar as part of a Parser class, only the finished grammar needs to be implemented as an instance variable
+- ParseResults support "in" testing for results names. Use "in" tests for the existence of results names, not hasattr().
+- Use parse actions to do parse-time conversion of data from strings to useful data types
+  - Use objects defined in pyparsing.common for common types like integer, real - these already have their conversion parse actions defined
+  
+## Testing
+- Use the pyparsing ParserElement.run_tests method to run mini validation tests
+  - You can add comments starting with "#" within the string passed to run_tests to document the individual test cases
+  
+## Debugging
+- If troubleshooting parse actions, use pyparsing's trace_parse_action decorator to echo arguments and return value
+
+(Some best practices may be missing โ€” see the full Markdown file in source at pyparsing/ai/best_practices.md.)
+"""
+# fmt: on
+
+
+def show_best_practices(file=sys.stdout) -> Union[str, None]:
+    """
+    Load and return the project's best practices.
+
+    Example::
+
+        >>> import pyparsing as pp
+        >>> pp.show_best_practices()
+        <!--
+        This file contains instructions for best practices for developing parsers with pyparsing, and can be used by AI agents
+        when generating Python code using pyparsing.
+        -->
+        ...
+
+    This can also be run from the command line::
+
+        python -m pyparsing.ai.show_best_practices
+    """
+    try:
+        path = resources.files(__package__).joinpath("ai/best_practices.md")
+        with path.open("r", encoding="utf-8") as f:
+            content = f.read()
+    except (FileNotFoundError, OSError):
+        content = _FALLBACK_BEST_PRACTICES
+
+    if file is not None:
+        # just print out the content, no need to return it
+        print(content, file=file)
+        return None
+
+    # no output file was specified, return the content as a string
+    return content
+
 
 __all__ = [
     "__version__",
@@ -201,6 +284,9 @@ def __repr__(self):
     "ParseSyntaxException",
     "ParserElement",
     "PositionToken",
+    "PyparsingDeprecationWarning",
+    "PyparsingDiagnosticWarning",
+    "PyparsingWarning",
     "QuotedString",
     "RecursiveGrammarException",
     "Regex",
@@ -208,6 +294,7 @@ def __repr__(self):
     "StringEnd",
     "StringStart",
     "Suppress",
+    "Tag",
     "Token",
     "TokenConverter",
     "White",
@@ -265,6 +352,7 @@ def __repr__(self):
     "replace_html_entity",
     "rest_of_line",
     "sgl_quoted_string",
+    "show_best_practices",
     "srange",
     "string_end",
     "string_start",
diff --git a/libs/pyparsing/actions.py b/libs/pyparsing/actions.py
index 1d2dce99e1..85dc412840 100644
--- a/libs/pyparsing/actions.py
+++ b/libs/pyparsing/actions.py
@@ -1,21 +1,34 @@
 # actions.py
+from __future__ import annotations
+
+from typing import Union, Callable, Any
 
 from .exceptions import ParseException
 from .util import col, replaced_by_pep8
+from .results import ParseResults
+
+
+ParseAction = Union[
+    Callable[[], Any],
+    Callable[[ParseResults], Any],
+    Callable[[int, ParseResults], Any],
+    Callable[[str, int, ParseResults], Any],
+]
 
 
 class OnlyOnce:
     """
     Wrapper for parse actions, to ensure they are only called once.
+    Note: parse action signature must include all 3 arguments.
     """
 
-    def __init__(self, method_call):
+    def __init__(self, method_call: Callable[[str, int, ParseResults], Any]) -> None:
         from .core import _trim_arity
 
         self.callable = _trim_arity(method_call)
         self.called = False
 
-    def __call__(self, s, l, t):
+    def __call__(self, s: str, l: int, t: ParseResults) -> ParseResults:
         if not self.called:
             results = self.callable(s, l, t)
             self.called = True
@@ -30,54 +43,63 @@ def reset(self):
         self.called = False
 
 
-def match_only_at_col(n):
+def match_only_at_col(n: int) -> ParseAction:
     """
     Helper method for defining parse actions that require matching at
     a specific column in the input text.
     """
 
-    def verify_col(strg, locn, toks):
+    def verify_col(strg: str, locn: int, toks: ParseResults) -> None:
         if col(locn, strg) != n:
             raise ParseException(strg, locn, f"matched token not at column {n}")
 
     return verify_col
 
 
-def replace_with(repl_str):
+def replace_with(repl_str: Any) -> ParseAction:
     """
     Helper method for common parse actions that simply return
     a literal value.  Especially useful when used with
-    :class:`transform_string<ParserElement.transform_string>` ().
+    :meth:`~ParserElement.transform_string`.
 
-    Example::
+    Example:
 
-        num = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-        na = one_of("N/A NA").set_parse_action(replace_with(math.nan))
-        term = na | num
+    .. doctest::
 
-        term[1, ...].parse_string("324 234 N/A 234") # -> [324, 234, nan, 234]
+       >>> num = Word(nums).set_parse_action(lambda toks: int(toks[0]))
+       >>> na = one_of("N/A NA").set_parse_action(replace_with(math.nan))
+       >>> term = na | num
+
+       >>> term[1, ...].parse_string("324 234 N/A 234")
+       ParseResults([324, 234, nan, 234], {})
     """
     return lambda s, l, t: [repl_str]
 
 
-def remove_quotes(s, l, t):
-    """
+def remove_quotes(s: str, l: int, t: ParseResults) -> Any:
+    r"""
     Helper parse action for removing quotation marks from parsed
-    quoted strings.
+    quoted strings, that use a single character for quoting. For parsing
+    strings that may have multiple characters, use the :class:`QuotedString`
+    class.
+
+    Example:
 
-    Example::
+    .. doctest::
 
-        # by default, quotation marks are included in parsed results
-        quoted_string.parse_string("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
+       >>> # by default, quotation marks are included in parsed results
+       >>> quoted_string.parse_string("'Now is the Winter of our Discontent'")
+       ParseResults(["'Now is the Winter of our Discontent'"], {})
 
-        # use remove_quotes to strip quotation marks from parsed results
-        quoted_string.set_parse_action(remove_quotes)
-        quoted_string.parse_string("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
+       >>> # use remove_quotes to strip quotation marks from parsed results
+       >>> dequoted = quoted_string().set_parse_action(remove_quotes)
+       >>> dequoted.parse_string("'Now is the Winter of our Discontent'")
+       ParseResults(['Now is the Winter of our Discontent'], {})
     """
     return t[0][1:-1]
 
 
-def with_attribute(*args, **attr_dict):
+def with_attribute(*args: tuple[str, str], **attr_dict) -> ParseAction:
     """
     Helper to create a validating parse action to be used with start
     tags created with :class:`make_xml_tags` or
@@ -102,48 +124,65 @@ def with_attribute(*args, **attr_dict):
     To verify that the attribute exists, but without specifying a value,
     pass ``with_attribute.ANY_VALUE`` as the value.
 
-    Example::
+    The next two examples use the following input data and tag parsers:
+
+    .. testcode::
+
+       html = '''
+           <div>
+           Some text
+           <div type="grid">1 4 0 1 0</div>
+           <div type="graph">1,3 2,3 1,1</div>
+           <div>this has no type</div>
+           </div>
+       '''
+       div,div_end = make_html_tags("div")
+
+    Only match div tag having a type attribute with value "grid":
+
+    .. testcode::
+
+       div_grid = div().set_parse_action(with_attribute(type="grid"))
+       grid_expr = div_grid + SkipTo(div | div_end)("body")
+       for grid_header in grid_expr.search_string(html):
+           print(grid_header.body)
 
-        html = '''
-            <div>
-            Some text
-            <div type="grid">1 4 0 1 0</div>
-            <div type="graph">1,3 2,3 1,1</div>
-            <div>this has no type</div>
-            </div>
-        '''
-        div,div_end = make_html_tags("div")
+    prints:
 
-        # only match div tag having a type attribute with value "grid"
-        div_grid = div().set_parse_action(with_attribute(type="grid"))
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.search_string(html):
-            print(grid_header.body)
+    .. testoutput::
 
-        # construct a match with any div tag having a type attribute, regardless of the value
-        div_any_type = div().set_parse_action(with_attribute(type=with_attribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.search_string(html):
-            print(div_header.body)
+       1 4 0 1 0
 
-    prints::
+    Construct a match with any div tag having a type attribute,
+    regardless of the value:
 
-        1 4 0 1 0
+    .. testcode::
 
-        1 4 0 1 0
-        1,3 2,3 1,1
+       div_any_type = div().set_parse_action(
+           with_attribute(type=with_attribute.ANY_VALUE)
+       )
+       div_expr = div_any_type + SkipTo(div | div_end)("body")
+       for div_header in div_expr.search_string(html):
+           print(div_header.body)
+
+    prints:
+
+    .. testoutput::
+
+       1 4 0 1 0
+       1,3 2,3 1,1
     """
+    attrs_list: list[tuple[str, str]] = []
     if args:
-        attrs = args[:]
+        attrs_list.extend(args)
     else:
-        attrs = attr_dict.items()
-    attrs = [(k, v) for k, v in attrs]
+        attrs_list.extend(attr_dict.items())
 
-    def pa(s, l, tokens):
-        for attrName, attrValue in attrs:
+    def pa(s: str, l: int, tokens: ParseResults) -> None:
+        for attrName, attrValue in attrs_list:
             if attrName not in tokens:
-                raise ParseException(s, l, "no matching attribute " + attrName)
-            if attrValue != with_attribute.ANY_VALUE and tokens[attrName] != attrValue:
+                raise ParseException(s, l, f"no matching attribute {attrName!r}")
+            if attrValue != with_attribute.ANY_VALUE and tokens[attrName] != attrValue:  # type: ignore [attr-defined]
                 raise ParseException(
                     s,
                     l,
@@ -154,43 +193,62 @@ def pa(s, l, tokens):
 
 
 with_attribute.ANY_VALUE = object()  # type: ignore [attr-defined]
+"Value to use with :class:`with_attribute` parse action, to match any value, as long as the attribute is present"
 
 
-def with_class(classname, namespace=""):
+def with_class(classname: str, namespace: str = "") -> ParseAction:
     """
-    Simplified version of :class:`with_attribute` when
+    Simplified version of :meth:`with_attribute` when
     matching on a div class - made difficult because ``class`` is
     a reserved word in Python.
 
-    Example::
+    Using similar input data to the :meth:`with_attribute` examples:
+
+    .. testcode::
+
+       html = '''
+           <div>
+           Some text
+           <div class="grid">1 4 0 1 0</div>
+           <div class="graph">1,3 2,3 1,1</div>
+           <div>this &lt;div&gt; has no class</div>
+           </div>
+       '''
+       div,div_end = make_html_tags("div")
+
+    Only match div tag having the "grid" class:
+
+    .. testcode::
+
+       div_grid = div().set_parse_action(with_class("grid"))
+       grid_expr = div_grid + SkipTo(div | div_end)("body")
+       for grid_header in grid_expr.search_string(html):
+           print(grid_header.body)
+
+    prints:
+
+    .. testoutput::
 
-        html = '''
-            <div>
-            Some text
-            <div class="grid">1 4 0 1 0</div>
-            <div class="graph">1,3 2,3 1,1</div>
-            <div>this &lt;div&gt; has no class</div>
-            </div>
+       1 4 0 1 0
 
-        '''
-        div,div_end = make_html_tags("div")
-        div_grid = div().set_parse_action(with_class("grid"))
+    Construct a match with any div tag having a class attribute,
+    regardless of the value:
 
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.search_string(html):
-            print(grid_header.body)
+    .. testcode::
 
-        div_any_type = div().set_parse_action(with_class(withAttribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.search_string(html):
-            print(div_header.body)
+       div_any_type = div().set_parse_action(
+           with_class(withAttribute.ANY_VALUE)
+       )
+       div_expr = div_any_type + SkipTo(div | div_end)("body")
+       for div_header in div_expr.search_string(html):
+           print(div_header.body)
 
-    prints::
+    prints:
 
-        1 4 0 1 0
+    .. testoutput::
 
-        1 4 0 1 0
-        1,3 2,3 1,1
+       1 4 0 1 0
+       1,3 2,3 1,1
     """
     classattr = f"{namespace}:class" if namespace else "class"
     return with_attribute(**{classattr: classname})
diff --git a/libs/python_engineio-4.11.2.dist-info/REQUESTED b/libs/pyparsing/ai/__init__.py
similarity index 100%
rename from libs/python_engineio-4.11.2.dist-info/REQUESTED
rename to libs/pyparsing/ai/__init__.py
diff --git a/libs/pyparsing/ai/best_practices.md b/libs/pyparsing/ai/best_practices.md
new file mode 100644
index 0000000000..94aa52d8f4
--- /dev/null
+++ b/libs/pyparsing/ai/best_practices.md
@@ -0,0 +1,75 @@
+<!-- 
+This file contains instructions for best practices for developing parsers with pyparsing, and can be used by AI agents
+when generating Python code using pyparsing.
+-->
+
+## Planning
+- If not provided or if target language definition is ambiguous, ask for examples of valid strings to be parsed
+- Before developing the pyparsing expressions, define a Backus-Naur Form definition and save this in docs/grammar.md. Update this document as changes are made in the parser.
+
+## Implementing
+- Import pyparsing using `import pyparsing as pp`, and use that for all pyparsing references.
+  - If referencing names from `pyparsing.common`, follow the pyparsing import with "ppc = pp.common" and use `ppc` as the namespace to access `pyparsing.common`.
+  - If referencing names from `pyparsing.unicode`, follow the pyparsing import with "ppu = pp.unicode" and use `ppu` as the namespace to access `pyparsing.unicode`.
+- When writing parsers that contain recursive elements (using `Forward()` or `infix_notation()`), immediately enable packrat parsing for performance: `pp.ParserElement.enable_packrat()` (call this right after importing pyparsing). See https://pyparsing-docs.readthedocs.io/en/latest/HowToUsePyparsing.html.
+  - For recursive grammars, define placeholders with `pp.Forward()` and assign later using the `<<=` operator; give Forwards meaningful names with `set_name()` to improve errors.
+- Use PEP8 method and argument names in the pyparsing API (`parse_string`, not `parseString`).
+- Do not include expressions for matching whitespace in the grammar. Pyparsing skips whitespace by default.
+- For line-oriented grammars where newlines are significant, set skippable whitespace to just spaces/tabs early: `pp.ParserElement.set_default_whitespace_chars(" \t")`, and define `NL = pp.LineEnd().suppress()` to handle line ends explicitly.
+- Prefer operator forms for readability: use +, |, ^, ~, etc., instead of explicit And/MatchFirst/Or/Not classes (see Usage notes in https://pyparsing-docs.readthedocs.io/en/latest/HowToUsePyparsing.html).
+- Use `set_name()` on all major grammar elements to support railroad diagramming and better error/debug output.
+- The grammar should be independently testable, without pulling in separate modules for data structures, evaluation, or command execution.
+- Use results names for robust access to parsed data fields; results names should be valid Python identifiers to support attribute-style access on returned ParseResults.
+  - Results names should take the place of numeric indexing into parsed results in most places.
+  - Define results names using call format not `set_results_name()`, example: `full_name = Word(alphas)("first_name") + Word(alphas)("last_name")`
+  - If adding results name to an expression that is contains one more sub-expressions with results names, the expression must be inclused in a Group.
+- Prefer `Keyword` over `Literal` for reserved words to avoid partial matches (e.g., `Keyword("for")` will not match the leading "for" in "format").
+  - Use `pp.CaselessKeyword`/`pp.CaselessLiteral` when keywords should match regardless of case.
+- When the full input must be consumed, call `parse_string` with `parse_all=True`.
+- If the grammar must handle comments, define an expression for them and use the `ignore()` method to skip them.
+  - Prefer built-ins like `pp.cpp_style_comment` and `pp.python_style_comment` for common comment syntaxes.
+- Use pyparsing `Group` to organize sub-expressions. Groups are also important for preserving results names when a sub-expression is used in a `OneOrMore` or `ZeroOrMore` expression.
+- Suppress punctuation tokens to keep results clean; a convenient pattern is `LBRACK, RBRACK, LBRACE, RBRACE, COLON = pp.Suppress.using_each("[]{}:")`.
+- For comma-separated sequences, prefer `pp.DelimitedList(...)`; wrap with `pp.Optional(...)` to allow empty lists or objects where appropriate.
+- For helper sub-expressions used only to build larger expressions, consider `set_name(None)` to keep result dumps uncluttered.
+- Use pyparsing `Each()` to define a list of elements that may occur in any order.
+  - The '&' operator is the operator form of Each and is often more readable when combining order-independent parts.
+- Use parse actions to do parse-time conversion of data from strings to useful data types.
+  - Use objects defined in pyparsing.common for common types like integer, real โ€” these already have their conversion parse actions defined.
+  - For quoted strings, use `pp.dbl_quoted_string().set_parse_action(pp.remove_quotes)` to unquote automatically.
+  - Map reserved words to Python constants per this example for parsing "true" to auto-convert to a Python True: `pp.Keyword("true").set_parse_action(pp.replace_with(True))` (and similarly for false/null/etc.).
+  - When you want native Python containers from the parse, use `pp.Group(..., aslist=True)` for lists and `pp.Dict(..., asdict=True)` for dict-like data.
+- Use "using_each" with a list of keywords to define keyword constants, instead of separate assignments.
+- Choose the appropriate matching method:
+  - `parse_string()` parses from the start
+  - `search_string()` searches anywhere in the text
+  - `scan_string()` yields all matches with positions
+  - `transform_string()` is a convenience wrapper around `scan_string` to apply filters or transforms defined in parse actions, to perform batch transforms or conversions of expressions within a larger body of text
+- For line suffixes or directives, combine lookahead and slicing helpers: `pp.FollowedBy(...)` with `pp.rest_of_line`; when reusing a base expression with a different parse action, call `.copy()` before applying the new action to avoid side effects.
+- When defining a parser to be used in a REPL:
+  - add pyparsing `Tag()` elements of the form `Tag("command", <command-name>)` to each command definition to support model construction from parsed commands.
+  - define model classes using dataclasses, and use the "command" attribute in the parsed results to identify which model class to create. The model classes can then be used to construct the model from the ParseResults returned by parse_string(). Define the models in a separate parser_models.py file.
+- If defining the grammar as part of a Parser class, only the finished grammar needs to be implemented as an instance variable.
+- `ParseResults` support "in" testing for results names. Use "in" tests for the existence of results names, not `hasattr()`.
+- Avoid left recursion where possible. If you must support left-recursive grammars, enable it with `pp.ParserElement.enable_left_recursion()` and do not enable packrat at the same time (these modes are incompatible).
+- Use `pp.SkipTo` as a skipping expression to skip over arbitrary content.
+  - For example, `pp.SkipTo(pp.LineEnd())` will skip over all content until the end of the line; add a stop_on argument to SkipTo to stop skipping when a particular string is matched.
+  - Use `...` in place of simple SkipTo(expression)
+
+## Testing
+- Use the pyparsing `ParserElement.run_tests` method to run mini validation tests.
+  - Pass a single multiline string to `run_tests` to test the parser on multiple test input strings, each line is a separate test.
+  - You can add comments starting with "#" within the string passed to `run_tests` to document the individual test cases.
+  - To pass test input strings that span multiple lines, pass the test input strings as a list of strings.
+  - Pass `parse_all=True` to `run_tests` to test that the entire input is consumed.
+- When generating unit tests for the parser:
+  - generate tests that include presence and absence of optional elements
+  - use the methods in the mixin class pyparsing.testing.TestParseResultsAsserts to easily define expression, test input string, and expected results
+  - do not generate tests for invalid data
+
+## Debugging
+- If troubleshooting parse actions, use pyparsing's `trace_parse_action` decorator to echo arguments and return value
+- During development, call `pp.autoname_elements()` to auto-assign names to unnamed expressions to improve `dump()` and error messages.
+- Sub-expressions can be tested in isolation using `ParserElement.matches()`
+- When defined out of order, Literals can mistakenly match fragments: `Literal("for")` will match the leading "for" in "format". Can be corrected by using `Keyword` instead of `Literal`.
+- Dump the parsed results using `ParseResults.dump()`, `ParseResults.pprint()`, or `repr(ParseResults)`.
diff --git a/libs/python_socketio-5.12.1.dist-info/REQUESTED b/libs/pyparsing/ai/show_best_practices/__init__.py
similarity index 100%
rename from libs/python_socketio-5.12.1.dist-info/REQUESTED
rename to libs/pyparsing/ai/show_best_practices/__init__.py
diff --git a/libs/pyparsing/ai/show_best_practices/__main__.py b/libs/pyparsing/ai/show_best_practices/__main__.py
new file mode 100644
index 0000000000..b3172570ce
--- /dev/null
+++ b/libs/pyparsing/ai/show_best_practices/__main__.py
@@ -0,0 +1,2 @@
+import pyparsing
+pyparsing.show_best_practices()
diff --git a/libs/pyparsing/common.py b/libs/pyparsing/common.py
index 649aad0096..ef33993932 100644
--- a/libs/pyparsing/common.py
+++ b/libs/pyparsing/common.py
@@ -2,6 +2,9 @@
 from .core import *
 from .helpers import DelimitedList, any_open_tag, any_close_tag
 from datetime import datetime
+import sys
+
+PY_310_OR_LATER = sys.version_info >= (3, 10)
 
 
 # some other useful expressions - using lower-case class name since we are really using this as a namespace
@@ -30,7 +33,9 @@ class pyparsing_common:
     - :class:`upcase_tokens`
     - :class:`downcase_tokens`
 
-    Example::
+    Examples:
+
+    .. testcode::
 
         pyparsing_common.number.run_tests('''
             # any int or real number, returned as the appropriate type
@@ -42,44 +47,9 @@ class pyparsing_common:
             1e-12
             ''')
 
-        pyparsing_common.fnumber.run_tests('''
-            # any int or real number, returned as float
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
 
-        pyparsing_common.hex_integer.run_tests('''
-            # hex numbers
-            100
-            FF
-            ''')
-
-        pyparsing_common.fraction.run_tests('''
-            # fractions
-            1/2
-            -3/4
-            ''')
-
-        pyparsing_common.mixed_integer.run_tests('''
-            # mixed fractions
-            1
-            1/2
-            -3/4
-            1-3/4
-            ''')
-
-        import uuid
-        pyparsing_common.uuid.set_parse_action(token_map(uuid.UUID))
-        pyparsing_common.uuid.run_tests('''
-            # uuid
-            12345678-1234-5678-1234-567812345678
-            ''')
-
-    prints::
 
         # any int or real number, returned as the appropriate type
         100
@@ -100,6 +70,22 @@ class pyparsing_common:
         1e-12
         [1e-12]
 
+    .. testcode::
+
+        pyparsing_common.fnumber.run_tests('''
+            # any int or real number, returned as float
+            100
+            -100
+            +100
+            3.14159
+            6.02e23
+            1e-12
+            ''')
+
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
+
+
         # any int or real number, returned as float
         100
         [100.0]
@@ -119,6 +105,18 @@ class pyparsing_common:
         1e-12
         [1e-12]
 
+    .. testcode::
+
+        pyparsing_common.hex_integer.run_tests('''
+            # hex numbers
+            100
+            FF
+            ''')
+
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
+
+
         # hex numbers
         100
         [256]
@@ -126,6 +124,18 @@ class pyparsing_common:
         FF
         [255]
 
+    .. testcode::
+
+        pyparsing_common.fraction.run_tests('''
+            # fractions
+            1/2
+            -3/4
+            ''')
+
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
+
+
         # fractions
         1/2
         [0.5]
@@ -133,6 +143,20 @@ class pyparsing_common:
         -3/4
         [-0.75]
 
+    .. testcode::
+
+        pyparsing_common.mixed_integer.run_tests('''
+            # mixed fractions
+            1
+            1/2
+            -3/4
+            1-3/4
+            ''')
+
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
+
+
         # mixed fractions
         1
         [1]
@@ -145,89 +169,141 @@ class pyparsing_common:
 
         1-3/4
         [1.75]
+    .. testcode::
+
+        import uuid
+        pyparsing_common.uuid.set_parse_action(token_map(uuid.UUID))
+        pyparsing_common.uuid.run_tests('''
+            # uuid
+            12345678-1234-5678-1234-567812345678
+            ''')
+
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
+
 
         # uuid
         12345678-1234-5678-1234-567812345678
         [UUID('12345678-1234-5678-1234-567812345678')]
     """
 
-    convert_to_integer = token_map(int)
-    """
-    Parse action for converting parsed integers to Python int
-    """
-
-    convert_to_float = token_map(float)
-    """
-    Parse action for converting parsed numbers to Python float
-    """
+    @staticmethod
+    def convert_to_integer(_, __, t):
+        """
+        Parse action for converting parsed integers to Python int
+        """
+        return [int(tt) for tt in t]
 
-    integer = Word(nums).set_name("integer").set_parse_action(convert_to_integer)
-    """expression that parses an unsigned integer, returns an int"""
+    @staticmethod
+    def convert_to_float(_, __, t):
+        """
+        Parse action for converting parsed numbers to Python float
+        """
+        return [float(tt) for tt in t]
+
+    integer = (
+        Word(nums)
+        .set_name("integer")
+        .set_parse_action(
+            convert_to_integer
+            if PY_310_OR_LATER
+            else lambda t: [int(tt) for tt in t]  # type: ignore[misc]
+        )
+    )
+    """expression that parses an unsigned integer, converts to an int"""
 
     hex_integer = (
         Word(hexnums).set_name("hex integer").set_parse_action(token_map(int, 16))
     )
-    """expression that parses a hexadecimal integer, returns an int"""
+    """expression that parses a hexadecimal integer, converts to an int"""
 
     signed_integer = (
         Regex(r"[+-]?\d+")
         .set_name("signed integer")
-        .set_parse_action(convert_to_integer)
+        .set_parse_action(
+            convert_to_integer
+            if PY_310_OR_LATER
+            else lambda t: [int(tt) for tt in t]  # type: ignore[misc]
+        )
     )
-    """expression that parses an integer with optional leading sign, returns an int"""
+    """expression that parses an integer with optional leading sign, converts to an int"""
 
     fraction = (
-        signed_integer().set_parse_action(convert_to_float)
+        signed_integer().set_parse_action(
+            convert_to_float
+            if PY_310_OR_LATER
+            else lambda t: [float(tt) for tt in t]  # type: ignore[misc]
+        )
         + "/"
-        + signed_integer().set_parse_action(convert_to_float)
+        + signed_integer().set_parse_action(
+            convert_to_float
+            if PY_310_OR_LATER
+            else lambda t: [float(tt) for tt in t]  # type: ignore[misc]
+        )
     ).set_name("fraction")
-    """fractional expression of an integer divided by an integer, returns a float"""
+    """fractional expression of an integer divided by an integer, converts to a float"""
     fraction.add_parse_action(lambda tt: tt[0] / tt[-1])
 
     mixed_integer = (
         fraction | signed_integer + Opt(Opt("-").suppress() + fraction)
     ).set_name("fraction or mixed integer-fraction")
-    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
+    """mixed integer of the form 'integer - fraction', with optional leading integer, converts to a float"""
     mixed_integer.add_parse_action(sum)
 
     real = (
         Regex(r"[+-]?(?:\d+\.\d*|\.\d+)")
         .set_name("real number")
-        .set_parse_action(convert_to_float)
+        .set_parse_action(
+            convert_to_float
+            if PY_310_OR_LATER
+            else lambda t: [float(tt) for tt in t]  # type: ignore[misc]
+        )
     )
-    """expression that parses a floating point number and returns a float"""
+    """expression that parses a floating point number, converts to a float"""
 
     sci_real = (
         Regex(r"[+-]?(?:\d+(?:[eE][+-]?\d+)|(?:\d+\.\d*|\.\d+)(?:[eE][+-]?\d+)?)")
         .set_name("real number with scientific notation")
-        .set_parse_action(convert_to_float)
+        .set_parse_action(
+            convert_to_float
+            if PY_310_OR_LATER
+            else lambda t: [float(tt) for tt in t]  # type: ignore[misc]
+        )
     )
     """expression that parses a floating point number with optional
-    scientific notation and returns a float"""
+    scientific notation, converts to a float"""
 
     # streamlining this expression makes the docs nicer-looking
     number = (sci_real | real | signed_integer).set_name("number").streamline()
-    """any numeric expression, returns the corresponding Python type"""
+    """any numeric expression, converts to the corresponding Python type"""
 
     fnumber = (
-        Regex(r"[+-]?\d+\.?\d*([eE][+-]?\d+)?")
+        Regex(r"[+-]?\d+\.?\d*(?:[eE][+-]?\d+)?")
         .set_name("fnumber")
-        .set_parse_action(convert_to_float)
+        .set_parse_action(
+            convert_to_float
+            if PY_310_OR_LATER
+            else lambda t: [float(tt) for tt in t]  # type: ignore[misc]
+        )
     )
-    """any int or real number, returned as float"""
+    """any int or real number, always converts to a float"""
 
     ieee_float = (
-        Regex(r"(?i)[+-]?((\d+\.?\d*(e[+-]?\d+)?)|nan|inf(inity)?)")
+        Regex(r"(?i:[+-]?(?:(?:\d+\.?\d*(?:e[+-]?\d+)?)|nan|inf(?:inity)?))")
         .set_name("ieee_float")
-        .set_parse_action(convert_to_float)
+        .set_parse_action(
+            convert_to_float
+            if PY_310_OR_LATER
+            else lambda t: [float(tt) for tt in t]  # type: ignore[misc]
+        )
     )
-    """any floating-point literal (int, real number, infinity, or NaN), returned as float"""
+    """any floating-point literal (int, real number, infinity, or NaN), converts to a float"""
 
     identifier = Word(identchars, identbodychars).set_name("identifier")
     """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
 
     ipv4_address = Regex(
-        r"(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}"
+        r"(?:25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(?:\.(?:25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}"
     ).set_name("IPv4 address")
     "IPv4 address (``0.0.0.0 - 255.255.255.255``)"
 
@@ -264,13 +340,17 @@ def convert_to_date(fmt: str = "%Y-%m-%d"):
         Params -
         - fmt - format to be passed to datetime.strptime (default= ``"%Y-%m-%d"``)
 
-        Example::
+        Example:
+
+        .. testcode::
 
             date_expr = pyparsing_common.iso8601_date.copy()
             date_expr.set_parse_action(pyparsing_common.convert_to_date())
             print(date_expr.parse_string("1999-12-31"))
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             [datetime.date(1999, 12, 31)]
         """
@@ -286,18 +366,22 @@ def cvt_fn(ss, ll, tt):
     @staticmethod
     def convert_to_datetime(fmt: str = "%Y-%m-%dT%H:%M:%S.%f"):
         """Helper to create a parse action for converting parsed
-        datetime string to Python datetime.datetime
+        datetime string to Python :class:`datetime.datetime`
 
         Params -
-        - fmt - format to be passed to datetime.strptime (default= ``"%Y-%m-%dT%H:%M:%S.%f"``)
+        - fmt - format to be passed to :class:`datetime.strptime` (default= ``"%Y-%m-%dT%H:%M:%S.%f"``)
+
+        Example:
 
-        Example::
+        .. testcode::
 
             dt_expr = pyparsing_common.iso8601_datetime.copy()
             dt_expr.set_parse_action(pyparsing_common.convert_to_datetime())
             print(dt_expr.parse_string("1999-12-31T23:59:59.999"))
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
         """
@@ -320,7 +404,45 @@ def cvt_fn(s, l, t):
     ).set_name("ISO8601 datetime")
     "ISO8601 datetime (``yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)``) - trailing seconds, milliseconds, and timezone optional; accepts separating ``'T'`` or ``' '``"
 
-    uuid = Regex(r"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}").set_name("UUID")
+    @staticmethod
+    def as_datetime(s, l, t):
+        """Parse action to convert parsed dates or datetimes to a Python
+        :class:`datetime.datetime`.
+
+        This parse action will use the year, month, day, etc. results
+        names defined in the ISO8601 date expressions, but it can be
+        used with any expression that provides one or more of these fields.
+
+        Omitted fields will default to fields from Jan 1, 00:00:00.
+
+        Invalid dates will raise a :class:`ParseException` with the
+        error message indicating the invalid date fields.
+        """
+        year = int(t.year.lstrip("0") or 0)
+        month = int(t.month or 1)
+        day = int(t.day or 1)
+        hour = int(t.hour or 0)
+        minute = int(t.minute or 0)
+        second = float(t.second or 0)
+        try:
+            return datetime(
+                year, month, day, hour, minute, int(second), int((second % 1) * 1000)
+            )
+        except ValueError as ve:
+            raise ParseException(t, l, f"Invalid date/time: {ve}").with_traceback(
+                ve.__traceback__
+            ) from None
+
+    if PY_310_OR_LATER:
+        iso8601_date_validated = iso8601_date().add_parse_action(as_datetime)
+        "Validated ISO8601 date strings, raising :class:`ParseException` for invalid date values."
+
+        iso8601_datetime_validated = iso8601_datetime().add_parse_action(as_datetime)
+        "Validated ISO8601 date and time strings, raising :class:`ParseException` for invalid date/time values."
+
+    uuid = Regex(r"[0-9a-fA-F]{8}(?:-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}").set_name(
+        "UUID"
+    )
     "UUID (``xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx``)"
 
     _html_stripper = any_open_tag.suppress() | any_close_tag.suppress()
@@ -329,15 +451,20 @@ def cvt_fn(s, l, t):
     def strip_html_tags(s: str, l: int, tokens: ParseResults):
         """Parse action to remove HTML tags from web page HTML source
 
-        Example::
+        Example:
+
+        .. testcode::
 
             # strip HTML links from normal text
             text = '<td>More info at the <a href="https://github.com/pyparsing/pyparsing/wiki">pyparsing</a> wiki page</td>'
             td, td_end = make_html_tags("TD")
-            table_text = td + SkipTo(td_end).set_parse_action(pyparsing_common.strip_html_tags)("body") + td_end
+            table_text = td + SkipTo(td_end).set_parse_action(
+                pyparsing_common.strip_html_tags)("body") + td_end
             print(table_text.parse_string(text).body)
 
-        Prints::
+        Prints:
+
+        .. testoutput::
 
             More info at the pyparsing wiki page
         """
@@ -360,61 +487,70 @@ def strip_html_tags(s: str, l: int, tokens: ParseResults):
     ).set_name("comma separated list")
     """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
 
-    upcase_tokens = staticmethod(token_map(lambda t: t.upper()))
-    """Parse action to convert tokens to upper case."""
+    @staticmethod
+    def upcase_tokens(s, l, t):
+        """Parse action to convert tokens to upper case."""
+        return [tt.upper() for tt in t]
 
-    downcase_tokens = staticmethod(token_map(lambda t: t.lower()))
-    """Parse action to convert tokens to lower case."""
+    @staticmethod
+    def downcase_tokens(s, l, t):
+        """Parse action to convert tokens to lower case."""
+        return [tt.lower() for tt in t]
 
     # fmt: off
     url = Regex(
         # https://mathiasbynens.be/demo/url-regex
         # https://gist.github.com/dperini/729294
-        r"(?P<url>" +
+        r"(?P<url>"
         # protocol identifier (optional)
         # short syntax // still required
-        r"(?:(?:(?P<scheme>https?|ftp):)?\/\/)" +
+        r"(?:(?:(?P<scheme>https?|ftp):)?\/\/)"
         # user:pass BasicAuth (optional)
-        r"(?:(?P<auth>\S+(?::\S*)?)@)?" +
-        r"(?P<host>" +
+        r"(?:(?P<auth>\S+(?::\S*)?)@)?"
+        r"(?P<host>"
         # IP address exclusion
         # private & local networks
-        r"(?!(?:10|127)(?:\.\d{1,3}){3})" +
-        r"(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})" +
-        r"(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})" +
+        r"(?!(?:10|127)(?:\.\d{1,3}){3})"
+        r"(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})"
+        r"(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})"
         # IP address dotted notation octets
         # excludes loopback network 0.0.0.0
         # excludes reserved space >= 224.0.0.0
         # excludes network & broadcast addresses
         # (first & last IP address of each class)
-        r"(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])" +
-        r"(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}" +
-        r"(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))" +
-        r"|" +
+        r"(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])"
+        r"(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}"
+        r"(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))"
+        r"|"
         # host & domain names, may end with dot
         # can be replaced by a shortest alternative
         # (?![-_])(?:[-\w\u00a1-\uffff]{0,63}[^-_]\.)+
-        r"(?:" +
-        r"(?:" +
-        r"[a-z0-9\u00a1-\uffff]" +
-        r"[a-z0-9\u00a1-\uffff_-]{0,62}" +
-        r")?" +
-        r"[a-z0-9\u00a1-\uffff]\." +
-        r")+" +
+        r"(?:"
+        r"(?:"
+        r"[a-z0-9\u00a1-\uffff]"
+        r"[a-z0-9\u00a1-\uffff_-]{0,62}"
+        r")?"
+        r"[a-z0-9\u00a1-\uffff]\."
+        r")+"
         # TLD identifier name, may end with dot
-        r"(?:[a-z\u00a1-\uffff]{2,}\.?)" +
-        r")" +
+        r"(?:[a-z\u00a1-\uffff]{2,}\.?)"
+        r")"
         # port number (optional)
-        r"(:(?P<port>\d{2,5}))?" +
+        r"(:(?P<port>\d{2,5}))?"
         # resource path (optional)
-        r"(?P<path>\/[^?# ]*)?" +
+        r"(?P<path>\/[^?# ]*)?"
         # query string (optional)
-        r"(\?(?P<query>[^#]*))?" +
+        r"(\?(?P<query>[^#]*))?"
         # fragment (optional)
-        r"(#(?P<fragment>\S*))?" +
+        r"(#(?P<fragment>\S*))?"
         r")"
     ).set_name("url")
-    """URL (http/https/ftp scheme)"""
+    """
+    URL (http/https/ftp scheme)
+    
+    .. versionchanged:: 3.1.0
+       ``url`` named group added
+    """
     # fmt: on
 
     # pre-PEP8 compatibility names
diff --git a/libs/pyparsing/core.py b/libs/pyparsing/core.py
index cbe73c987a..db19750617 100644
--- a/libs/pyparsing/core.py
+++ b/libs/pyparsing/core.py
@@ -1,7 +1,9 @@
 #
 # core.py
 #
+from __future__ import annotations
 
+import collections.abc
 from collections import deque
 import os
 import typing
@@ -9,12 +11,9 @@
     Any,
     Callable,
     Generator,
-    List,
     NamedTuple,
     Sequence,
-    Set,
     TextIO,
-    Tuple,
     Union,
     cast,
 )
@@ -33,16 +32,18 @@
 from threading import RLock
 from pathlib import Path
 
+from .warnings import PyparsingDeprecationWarning, PyparsingDiagnosticWarning
 from .util import (
     _FifoCache,
     _UnboundedCache,
     __config_flags,
     _collapse_string_to_ranges,
+    _convert_escaped_numerics_to_char,
     _escape_regex_range_chars,
-    _bslash,
     _flatten,
     LRUMemo as _LRUMemo,
     UnboundedMemo as _UnboundedMemo,
+    deprecate_argument,
     replaced_by_pep8,
 )
 from .exceptions import *
@@ -51,12 +52,7 @@
 from .unicode import pyparsing_unicode
 
 _MAX_INT = sys.maxsize
-str_type: Tuple[type, ...] = (str, bytes)
-
-if sys.version_info >= (3, 7):
-    _RePattern = re.Pattern
-else:
-    _RePattern = typing.Pattern
+str_type: tuple[type, ...] = (str, bytes)
 
 #
 # Copyright (c) 2003-2022  Paul T. McGuire
@@ -81,18 +77,7 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-
-if sys.version_info >= (3, 8):
-    from functools import cached_property
-else:
-
-    class cached_property:
-        def __init__(self, func):
-            self._func = func
-
-        def __get__(self, instance, owner=None):
-            ret = instance.__dict__[self._func.__name__] = self._func(instance)
-            return ret
+from functools import cached_property
 
 
 class __compat__(__config_flags):
@@ -230,14 +215,9 @@ def _should_enable_warnings(
 # fmt: on
 
 _generatorType = types.GeneratorType
-ParseImplReturnType = Tuple[int, Any]
+ParseImplReturnType = tuple[int, Any]
 PostParseReturnType = Union[ParseResults, Sequence[ParseResults]]
-ParseAction = Union[
-    Callable[[], Any],
-    Callable[[ParseResults], Any],
-    Callable[[int, ParseResults], Any],
-    Callable[[str, int, ParseResults], Any],
-]
+
 ParseCondition = Union[
     Callable[[], bool],
     Callable[[ParseResults], bool],
@@ -252,20 +232,38 @@ def _should_enable_warnings(
 DebugExceptionAction = Callable[[str, int, "ParserElement", Exception, bool], None]
 
 
-alphas: str = string.ascii_uppercase + string.ascii_lowercase
+alphas: str = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 identchars: str = pyparsing_unicode.Latin1.identchars
 identbodychars: str = pyparsing_unicode.Latin1.identbodychars
 nums: str = "0123456789"
-hexnums: str = nums + "ABCDEFabcdef"
-alphanums: str = alphas + nums
-printables: str = "".join([c for c in string.printable if c not in string.whitespace])
+hexnums: str = "0123456789ABCDEFabcdef"
+alphanums: str = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+printables: str = (
+    '!"'
+    "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+)
+
+
+class _ParseActionIndexError(Exception):
+    """
+    Internal wrapper around IndexError so that IndexErrors raised inside
+    parse actions aren't misinterpreted as IndexErrors raised inside
+    ParserElement parseImpl methods.
+    """
+
+    def __init__(self, msg: str, exc: BaseException) -> None:
+        self.msg: str = msg
+        self.exc: BaseException = exc
+
 
 _trim_arity_call_line: traceback.StackSummary = None  # type: ignore[assignment]
+pa_call_line_synth = ()
 
 
 def _trim_arity(func, max_limit=3):
     """decorator to trim function calls to match the arity of the target"""
-    global _trim_arity_call_line
+    global _trim_arity_call_line, pa_call_line_synth
 
     if func in _single_arg_builtins:
         return lambda s, l, t: func(t)
@@ -280,8 +278,8 @@ def _trim_arity(func, max_limit=3):
     LINE_DIFF = 9
     # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND
     # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
-    _trim_arity_call_line = (_trim_arity_call_line or traceback.extract_stack(limit=2)[-1])
-    pa_call_line_synth = (_trim_arity_call_line[0], _trim_arity_call_line[1] + LINE_DIFF)
+    _trim_arity_call_line = _trim_arity_call_line or traceback.extract_stack(limit=2)[-1]
+    pa_call_line_synth = pa_call_line_synth or (_trim_arity_call_line[0], _trim_arity_call_line[1] + LINE_DIFF)
 
     def wrapper(*args):
         nonlocal found_arity, limit
@@ -311,6 +309,11 @@ def wrapper(*args):
                             continue
 
                     raise
+            except IndexError as ie:
+                # wrap IndexErrors inside a _ParseActionIndexError
+                raise _ParseActionIndexError(
+                    "IndexError raised in parse action", ie
+                ).with_traceback(None)
     # fmt: on
 
     # copy func name to wrapper for sensible debug output
@@ -328,14 +331,15 @@ def condition_as_parse_action(
     """
     Function to convert a simple predicate function that returns ``True`` or ``False``
     into a parse action. Can be used in places when a parse action is required
-    and :class:`ParserElement.add_condition` cannot be used (such as when adding a condition
+    and :meth:`ParserElement.add_condition` cannot be used (such as when adding a condition
     to an operator level in :class:`infix_notation`).
 
     Optional keyword arguments:
 
-    - ``message`` - define a custom message to be used in the raised exception
-    - ``fatal`` - if True, will raise :class:`ParseFatalException` to stop parsing immediately;
-      otherwise will raise :class:`ParseException`
+    :param message: define a custom message to be used in the raised exception
+    :param fatal: if ``True``, will raise :class:`ParseFatalException`
+                  to stop parsing immediately;
+                  otherwise will raise :class:`ParseException`
 
     """
     msg = message if message is not None else "failed user-defined condition"
@@ -351,14 +355,14 @@ def pa(s, l, t):
 
 
 def _default_start_debug_action(
-    instring: str, loc: int, expr: "ParserElement", cache_hit: bool = False
+    instring: str, loc: int, expr: ParserElement, cache_hit: bool = False
 ):
     cache_hit_str = "*" if cache_hit else ""
     print(
         (
             f"{cache_hit_str}Match {expr} at loc {loc}({lineno(loc, instring)},{col(loc, instring)})\n"
             f"  {line(loc, instring)}\n"
-            f"  {' ' * (col(loc, instring) - 1)}^"
+            f"  {'^':>{col(loc, instring)}}"
         )
     )
 
@@ -367,7 +371,7 @@ def _default_success_debug_action(
     instring: str,
     startloc: int,
     endloc: int,
-    expr: "ParserElement",
+    expr: ParserElement,
     toks: ParseResults,
     cache_hit: bool = False,
 ):
@@ -378,7 +382,7 @@ def _default_success_debug_action(
 def _default_exception_debug_action(
     instring: str,
     loc: int,
-    expr: "ParserElement",
+    expr: ParserElement,
     exc: Exception,
     cache_hit: bool = False,
 ):
@@ -402,14 +406,21 @@ def set_default_whitespace_chars(chars: str) -> None:
         r"""
         Overrides the default whitespace chars
 
-        Example::
+        Example:
+
+        .. doctest::
 
             # default whitespace chars are space, <TAB> and newline
-            Word(alphas)[1, ...].parse_string("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
+            >>> Word(alphas)[1, ...].parse_string("abc def\nghi jkl")
+            ParseResults(['abc', 'def', 'ghi', 'jkl'], {})
 
             # change to just treat newline as significant
-            ParserElement.set_default_whitespace_chars(" \t")
-            Word(alphas)[1, ...].parse_string("abc def\nghi jkl")  # -> ['abc', 'def']
+            >>> ParserElement.set_default_whitespace_chars(" \t")
+            >>> Word(alphas)[1, ...].parse_string("abc def\nghi jkl")
+            ParseResults(['abc', 'def'], {})
+
+            # Reset to default
+            >>> ParserElement.set_default_whitespace_chars(" \n\t\r")
         """
         ParserElement.DEFAULT_WHITE_CHARS = chars
 
@@ -423,32 +434,52 @@ def inline_literals_using(cls: type) -> None:
         """
         Set class to be used for inclusion of string literals into a parser.
 
-        Example::
+        Example:
 
-            # default literal class used is Literal
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+        .. doctest::
+            :options: +NORMALIZE_WHITESPACE
 
-            date_str.parse_string("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
+            # default literal class used is Literal
+            >>> integer = Word(nums)
+            >>> date_str = (
+            ...     integer("year") + '/'
+            ...     + integer("month") + '/'
+            ...     + integer("day")
+            ... )
 
+            >>> date_str.parse_string("1999/12/31")
+            ParseResults(['1999', '/', '12', '/', '31'],
+            {'year': '1999', 'month': '12', 'day': '31'})
 
             # change to Suppress
-            ParserElement.inline_literals_using(Suppress)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            date_str.parse_string("1999/12/31")  # -> ['1999', '12', '31']
+            >>> ParserElement.inline_literals_using(Suppress)
+            >>> date_str = (
+            ...     integer("year") + '/'
+            ...     + integer("month") + '/'
+            ...     + integer("day")
+            ... )
+
+            >>> date_str.parse_string("1999/12/31")
+            ParseResults(['1999', '12', '31'],
+            {'year': '1999', 'month': '12', 'day': '31'})
+
+            # Reset
+            >>> ParserElement.inline_literals_using(Literal)
         """
         ParserElement._literalStringClass = cls
 
     @classmethod
     def using_each(cls, seq, **class_kwargs):
         """
-        Yields a sequence of class(obj, **class_kwargs) for obj in seq.
+        Yields a sequence of ``class(obj, **class_kwargs)`` for obj in seq.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             LPAR, RPAR, LBRACE, RBRACE, SEMI = Suppress.using_each("(){};")
 
+        .. versionadded:: 3.1.0
         """
         yield from (cls(obj, **class_kwargs) for obj in seq)
 
@@ -457,46 +488,69 @@ class DebugActions(NamedTuple):
         debug_match: typing.Optional[DebugSuccessAction]
         debug_fail: typing.Optional[DebugExceptionAction]
 
-    def __init__(self, savelist: bool = False):
-        self.parseAction: List[ParseAction] = list()
+    def __init__(self, savelist: bool = False) -> None:
+        self.parseAction: list[ParseAction] = list()
         self.failAction: typing.Optional[ParseFailAction] = None
         self.customName: str = None  # type: ignore[assignment]
         self._defaultName: typing.Optional[str] = None
         self.resultsName: str = None  # type: ignore[assignment]
-        self.saveAsList = savelist
-        self.skipWhitespace = True
-        self.whiteChars = set(ParserElement.DEFAULT_WHITE_CHARS)
-        self.copyDefaultWhiteChars = True
+        self.saveAsList: bool = savelist
+        self.skipWhitespace: bool = True
+        self.whiteChars: set[str] = set(ParserElement.DEFAULT_WHITE_CHARS)
+        self.copyDefaultWhiteChars: bool = True
         # used when checking for left-recursion
-        self.mayReturnEmpty = False
-        self.keepTabs = False
-        self.ignoreExprs: List["ParserElement"] = list()
-        self.debug = False
-        self.streamlined = False
+        self._may_return_empty: bool = False
+        self.keepTabs: bool = False
+        self.ignoreExprs: list[ParserElement] = list()
+        self.debug: bool = False
+        self.streamlined: bool = False
         # optimize exception handling for subclasses that don't advance parse index
-        self.mayIndexError = True
+        self.mayIndexError: bool = True
         self.errmsg: Union[str, None] = ""
         # mark results names as modal (report only last) or cumulative (list all)
-        self.modalResults = True
+        self.modalResults: bool = True
         # custom debug actions
         self.debugActions = self.DebugActions(None, None, None)
         # avoid redundant calls to preParse
-        self.callPreparse = True
-        self.callDuringTry = False
-        self.suppress_warnings_: List[Diagnostics] = []
+        self.callPreparse: bool = True
+        self.callDuringTry: bool = False
+        self.suppress_warnings_: list[Diagnostics] = []
+        self.show_in_diagram: bool = True
+
+    @property
+    def mayReturnEmpty(self) -> bool:
+        """
+        .. deprecated:: 3.3.0
+        use _may_return_empty instead.
+        """
+        return self._may_return_empty
+
+    @mayReturnEmpty.setter
+    def mayReturnEmpty(self, value) -> None:
+        """
+        .. deprecated:: 3.3.0
+        use _may_return_empty instead.
+        """
+        self._may_return_empty = value
 
-    def suppress_warning(self, warning_type: Diagnostics) -> "ParserElement":
+    def suppress_warning(self, warning_type: Diagnostics) -> ParserElement:
         """
         Suppress warnings emitted for a particular diagnostic on this expression.
 
-        Example::
+        Example:
+
+        .. doctest::
 
-            base = pp.Forward()
-            base.suppress_warning(Diagnostics.warn_on_parse_using_empty_Forward)
+            >>> label = pp.Word(pp.alphas)
 
-            # statement would normally raise a warning, but is now suppressed
-            print(base.parse_string("x"))
+            # Normally using an empty Forward in a grammar
+            # would print a warning, but we can suppress that
+            >>> base = pp.Forward().suppress_warning(
+            ...     pp.Diagnostics.warn_on_parse_using_empty_Forward)
 
+            >>> grammar = base | label
+            >>> print(grammar.parse_string("x"))
+            ['x']
         """
         self.suppress_warnings_.append(warning_type)
         return self
@@ -518,27 +572,40 @@ def visit_all(self):
             to_visit.extend(cur.recurse())
             yield cur
 
-    def copy(self) -> "ParserElement":
+    def copy(self) -> ParserElement:
         """
         Make a copy of this :class:`ParserElement`.  Useful for defining
         different parse actions for the same parsing pattern, using copies of
         the original parse element.
 
-        Example::
+        Example:
 
-            integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-            integerK = integer.copy().add_parse_action(lambda toks: toks[0] * 1024) + Suppress("K")
-            integerM = integer.copy().add_parse_action(lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
+        .. testcode::
 
-            print((integerK | integerM | integer)[1, ...].parse_string("5K 100 640K 256M"))
+            integer = Word(nums).set_parse_action(
+                lambda toks: int(toks[0]))
+            integerK = integer.copy().add_parse_action(
+                lambda toks: toks[0] * 1024) + Suppress("K")
+            integerM = integer.copy().add_parse_action(
+                lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
 
-        prints::
+            print(
+                (integerK | integerM | integer)[1, ...].parse_string(
+                "5K 100 640K 256M")
+            )
+
+        prints:
+
+        .. testoutput::
 
             [5120, 100, 655360, 268435456]
 
-        Equivalent form of ``expr.copy()`` is just ``expr()``::
+        Equivalent form of ``expr.copy()`` is just ``expr()``:
 
-            integerM = integer().add_parse_action(lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
+        .. testcode::
+
+            integerM = integer().add_parse_action(
+                lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
         """
         cpy = copy.copy(self)
         cpy.parseAction = self.parseAction[:]
@@ -548,8 +615,8 @@ def copy(self) -> "ParserElement":
         return cpy
 
     def set_results_name(
-        self, name: str, list_all_matches: bool = False, *, listAllMatches: bool = False
-    ) -> "ParserElement":
+        self, name: str, list_all_matches: bool = False, **kwargs
+    ) -> ParserElement:
         """
         Define name for referencing matching tokens as a nested attribute
         of the returned parse results.
@@ -565,10 +632,12 @@ def set_results_name(
 
         You can also set results names using the abbreviated syntax,
         ``expr("name")`` in place of ``expr.set_results_name("name")``
-        - see :class:`__call__`. If ``list_all_matches`` is required, use
+        - see :meth:`__call__`. If ``list_all_matches`` is required, use
         ``expr("name*")``.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             integer = Word(nums)
             date_str = (integer.set_results_name("year") + '/'
@@ -578,10 +647,12 @@ def set_results_name(
             # equivalent form:
             date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
         """
-        listAllMatches = listAllMatches or list_all_matches
-        return self._setResultsName(name, listAllMatches)
+        listAllMatches: bool = deprecate_argument(kwargs, "listAllMatches", False)
+
+        list_all_matches = listAllMatches or list_all_matches
+        return self._setResultsName(name, list_all_matches)
 
-    def _setResultsName(self, name, list_all_matches=False) -> "ParserElement":
+    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
         if name is None:
             return self
         newself = self.copy()
@@ -592,7 +663,7 @@ def _setResultsName(self, name, list_all_matches=False) -> "ParserElement":
         newself.modalResults = not list_all_matches
         return newself
 
-    def set_break(self, break_flag: bool = True) -> "ParserElement":
+    def set_break(self, break_flag: bool = True) -> ParserElement:
         """
         Method to invoke the Python pdb debugger when this element is
         about to be parsed. Set ``break_flag`` to ``True`` to enable, ``False`` to
@@ -602,19 +673,19 @@ def set_break(self, break_flag: bool = True) -> "ParserElement":
             _parseMethod = self._parse
 
             def breaker(instring, loc, do_actions=True, callPreParse=True):
-                import pdb
-
-                # this call to pdb.set_trace() is intentional, not a checkin error
-                pdb.set_trace()
+                # this call to breakpoint() is intentional, not a checkin error
+                breakpoint()
                 return _parseMethod(instring, loc, do_actions, callPreParse)
 
             breaker._originalParseMethod = _parseMethod  # type: ignore [attr-defined]
-            self._parse = breaker  # type: ignore [assignment]
+            self._parse = breaker  # type: ignore [method-assign]
         elif hasattr(self._parse, "_originalParseMethod"):
-            self._parse = self._parse._originalParseMethod  # type: ignore [attr-defined, assignment]
+            self._parse = self._parse._originalParseMethod  # type: ignore [method-assign]
         return self
 
-    def set_parse_action(self, *fns: ParseAction, **kwargs: Any) -> "ParserElement":
+    def set_parse_action(
+        self, *fns: ParseAction, call_during_try: bool = False, **kwargs: Any
+    ) -> ParserElement:
         """
         Define one or more actions to perform when successfully matching parse element definition.
 
@@ -643,29 +714,39 @@ def set_parse_action(self, *fns: ParseAction, **kwargs: Any) -> "ParserElement":
 
         Optional keyword arguments:
 
-        - ``call_during_try`` = (default= ``False``) indicate if parse action should be run during
-          lookaheads and alternate testing. For parse actions that have side effects, it is
-          important to only call the parse action once it is determined that it is being
-          called as part of a successful parse. For parse actions that perform additional
-          validation, then call_during_try should be passed as True, so that the validation
-          code is included in the preliminary "try" parses.
+        :param call_during_try: (default= ``False``) indicate if parse action
+                                should be run during lookaheads and alternate
+                                testing. For parse actions that have side
+                                effects, it is important to only call the parse
+                                action once it is determined that it is being
+                                called as part of a successful parse.
+                                For parse actions that perform additional
+                                validation, then ``call_during_try`` should
+                                be passed as True, so that the validation code
+                                is included in the preliminary "try" parses.
 
-        Note: the default parsing behavior is to expand tabs in the input string
-        before starting the parsing process.  See :class:`parse_string` for more
-        information on parsing strings containing ``<TAB>`` s, and suggested
-        methods to maintain a consistent view of the parsed string, the parse
-        location, and line and column positions within the parsed string.
+        .. Note::
+           The default parsing behavior is to expand tabs in the input string
+           before starting the parsing process.
+           See :meth:`parse_string` for more information on parsing strings
+           containing ``<TAB>`` s, and suggested methods to maintain a
+           consistent view of the parsed string, the parse location, and
+           line and column positions within the parsed string.
 
-        Example::
+        Example: Parse dates in the form ``YYYY/MM/DD``
+        -----------------------------------------------
 
-            # parse dates in the form YYYY/MM/DD
+        Setup code:
+
+        .. testcode::
 
-            # use parse action to convert toks from str to int at parse time
             def convert_to_int(toks):
+                '''a parse action to convert toks from str to int
+                at parse time'''
                 return int(toks[0])
 
-            # use a parse action to verify that the date is a valid date
             def is_valid_date(instring, loc, toks):
+                '''a parse action to verify that the date is a valid date'''
                 from datetime import date
                 year, month, day = toks[::2]
                 try:
@@ -680,15 +761,33 @@ def is_valid_date(instring, loc, toks):
             integer.set_parse_action(convert_to_int)
             date_str.set_parse_action(is_valid_date)
 
-            # note that integer fields are now ints, not strings
-            date_str.run_tests('''
-                # successful parse - note that integer fields were converted to ints
-                1999/12/31
+        Successful parse - note that integer fields are converted to ints:
 
-                # fail - invalid date
-                1999/13/31
-                ''')
+        .. testcode::
+
+            print(date_str.parse_string("1999/12/31"))
+
+        prints:
+
+        .. testoutput::
+
+            [1999, '/', 12, '/', 31]
+
+        Failure - invalid date:
+
+        .. testcode::
+
+            date_str.parse_string("1999/13/31")
+
+        prints:
+
+        .. testoutput::
+
+            Traceback (most recent call last):
+            ParseException: invalid date given, found '1999' ...
         """
+        callDuringTry: bool = deprecate_argument(kwargs, "callDuringTry", False)
+
         if list(fns) == [None]:
             self.parseAction.clear()
             return self
@@ -696,25 +795,27 @@ def is_valid_date(instring, loc, toks):
         if not all(callable(fn) for fn in fns):
             raise TypeError("parse actions must be callable")
         self.parseAction[:] = [_trim_arity(fn) for fn in fns]
-        self.callDuringTry = kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
+        self.callDuringTry = self.callDuringTry or call_during_try or callDuringTry
 
         return self
 
-    def add_parse_action(self, *fns: ParseAction, **kwargs: Any) -> "ParserElement":
+    def add_parse_action(
+        self, *fns: ParseAction, call_during_try: bool = False, **kwargs: Any
+    ) -> ParserElement:
         """
         Add one or more parse actions to expression's list of parse actions. See :class:`set_parse_action`.
 
         See examples in :class:`copy`.
         """
+        callDuringTry: bool = deprecate_argument(kwargs, "callDuringTry", False)
+
         self.parseAction += [_trim_arity(fn) for fn in fns]
-        self.callDuringTry = self.callDuringTry or kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
+        self.callDuringTry = self.callDuringTry or callDuringTry or call_during_try
         return self
 
-    def add_condition(self, *fns: ParseCondition, **kwargs: Any) -> "ParserElement":
+    def add_condition(
+        self, *fns: ParseCondition, call_during_try: bool = False, **kwargs: Any
+    ) -> ParserElement:
         """Add a boolean predicate function to expression's list of parse actions. See
         :class:`set_parse_action` for function call signatures. Unlike ``set_parse_action``,
         functions passed to ``add_condition`` need to return boolean success/fail of the condition.
@@ -727,16 +828,23 @@ def add_condition(self, *fns: ParseCondition, **kwargs: Any) -> "ParserElement":
         - ``call_during_try`` = boolean to indicate if this method should be called during internal tryParse calls,
           default=False
 
-        Example::
+        Example:
+
+        .. doctest::
+            :options: +NORMALIZE_WHITESPACE
 
-            integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-            year_int = integer.copy()
-            year_int.add_condition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
-            date_str = year_int + '/' + integer + '/' + integer
+            >>> integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
+            >>> year_int = integer.copy().add_condition(
+            ...     lambda toks: toks[0] >= 2000,
+            ...     message="Only support years 2000 and later")
+            >>> date_str = year_int + '/' + integer + '/' + integer
 
-            result = date_str.parse_string("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0),
-                                                                         (line:1, col:1)
+            >>> result = date_str.parse_string("1999/12/31")
+            Traceback (most recent call last):
+            ParseException: Only support years 2000 and later...
         """
+        callDuringTry: bool = deprecate_argument(kwargs, "callDuringTry", False)
+
         for fn in fns:
             self.parseAction.append(
                 condition_as_parse_action(
@@ -746,12 +854,10 @@ def add_condition(self, *fns: ParseCondition, **kwargs: Any) -> "ParserElement":
                 )
             )
 
-        self.callDuringTry = self.callDuringTry or kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
+        self.callDuringTry = self.callDuringTry or call_during_try or callDuringTry
         return self
 
-    def set_fail_action(self, fn: ParseFailAction) -> "ParserElement":
+    def set_fail_action(self, fn: ParseFailAction) -> ParserElement:
         """
         Define action to perform if parsing fails at this expression.
         Fail acton fn is a callable function that takes the arguments
@@ -809,8 +915,7 @@ def postParse(self, instring, loc, tokenlist):
     # @profile
     def _parseNoCache(
         self, instring, loc, do_actions=True, callPreParse=True
-    ) -> Tuple[int, ParseResults]:
-        TRY, MATCH, FAIL = 0, 1, 2
+    ) -> tuple[int, ParseResults]:
         debugging = self.debug  # and do_actions)
         len_instring = len(instring)
 
@@ -857,7 +962,7 @@ def _parseNoCache(
         tokens = self.postParse(instring, loc, tokens)
 
         ret_tokens = ParseResults(
-            tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults
+            tokens, self.resultsName, aslist=self.saveAsList, modal=self.modalResults
         )
         if self.parseAction and (do_actions or self.callDuringTry):
             if debugging:
@@ -873,7 +978,7 @@ def _parseNoCache(
                             ret_tokens = ParseResults(
                                 tokens,
                                 self.resultsName,
-                                asList=self.saveAsList
+                                aslist=self.saveAsList
                                 and isinstance(tokens, (ParseResults, list)),
                                 modal=self.modalResults,
                             )
@@ -896,7 +1001,7 @@ def _parseNoCache(
                         ret_tokens = ParseResults(
                             tokens,
                             self.resultsName,
-                            asList=self.saveAsList
+                            aslist=self.saveAsList
                             and isinstance(tokens, (ParseResults, list)),
                             modal=self.modalResults,
                         )
@@ -934,25 +1039,42 @@ def can_parse_next(self, instring: str, loc: int, do_actions: bool = False) -> b
 
     # cache for left-recursion in Forward references
     recursion_lock = RLock()
-    recursion_memos: typing.Dict[
-        Tuple[int, "Forward", bool], Tuple[int, Union[ParseResults, Exception]]
+    recursion_memos: collections.abc.MutableMapping[
+        tuple[int, Forward, bool], tuple[int, Union[ParseResults, Exception]]
     ] = {}
 
-    class _CacheType(dict):
+    class _CacheType(typing.Protocol):
         """
-        class to help type checking
+        Class to be used for packrat and left-recursion cacheing of results
+        and exceptions.
         """
 
         not_in_cache: bool
 
-        def get(self, *args): ...
+        def get(self, *args) -> typing.Any: ...
 
-        def set(self, *args): ...
+        def set(self, *args) -> None: ...
 
-    # argument cache for optimizing repeated calls when backtracking through recursive expressions
-    packrat_cache = (
-        _CacheType()
-    )  # set later by enable_packrat(); this is here so that reset_cache() doesn't fail
+        def clear(self) -> None: ...
+
+    class NullCache(dict):
+        """
+        A null cache type for initialization of the packrat_cache class variable.
+        If/when enable_packrat() is called, this null cache will be replaced by a
+        proper _CacheType class instance.
+        """
+
+        not_in_cache: bool = True
+
+        def get(self, *args) -> typing.Any: ...
+
+        def set(self, *args) -> None: ...
+
+        def clear(self) -> None: ...
+
+    # class-level argument cache for optimizing repeated calls when backtracking
+    # through recursive expressions
+    packrat_cache: _CacheType = NullCache()
     packrat_cache_lock = RLock()
     packrat_cache_stats = [0, 0]
 
@@ -960,9 +1082,8 @@ def set(self, *args): ...
     # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
     def _parseCache(
         self, instring, loc, do_actions=True, callPreParse=True
-    ) -> Tuple[int, ParseResults]:
+    ) -> tuple[int, ParseResults]:
         HIT, MISS = 0, 1
-        TRY, MATCH, FAIL = 0, 1, 2
         lookup = (self, instring, loc, callPreParse, do_actions)
         with ParserElement.packrat_cache_lock:
             cache = ParserElement.packrat_cache
@@ -995,7 +1116,7 @@ def _parseCache(
                             pass
                     raise value
 
-                value = cast(Tuple[int, ParseResults, int], value)
+                value = cast(tuple[int, ParseResults, int], value)
                 loc_, result, endloc = value[0], value[1].copy(), value[2]
                 if self.debug and self.debugActions.debug_match:
                     try:
@@ -1011,12 +1132,17 @@ def _parseCache(
 
     @staticmethod
     def reset_cache() -> None:
-        ParserElement.packrat_cache.clear()
-        ParserElement.packrat_cache_stats[:] = [0] * len(
-            ParserElement.packrat_cache_stats
-        )
-        ParserElement.recursion_memos.clear()
+        """
+        Clears caches used by packrat and left-recursion.
+        """
+        with ParserElement.packrat_cache_lock:
+            ParserElement.packrat_cache.clear()
+            ParserElement.packrat_cache_stats[:] = [0] * len(
+                ParserElement.packrat_cache_stats
+            )
+            ParserElement.recursion_memos.clear()
 
+    # class attributes to keep caching status
     _packratEnabled = False
     _left_recursion_enabled = False
 
@@ -1029,10 +1155,11 @@ def disable_memoization() -> None:
         This makes it safe to call before activating Packrat nor Left Recursion
         to clear any previous settings.
         """
-        ParserElement.reset_cache()
-        ParserElement._left_recursion_enabled = False
-        ParserElement._packratEnabled = False
-        ParserElement._parse = ParserElement._parseNoCache
+        with ParserElement.packrat_cache_lock:
+            ParserElement.reset_cache()
+            ParserElement._left_recursion_enabled = False
+            ParserElement._packratEnabled = False
+            ParserElement._parse = ParserElement._parseNoCache
 
     @staticmethod
     def enable_left_recursion(
@@ -1044,17 +1171,26 @@ def enable_left_recursion(
         repeatedly matched with a fixed recursion depth that is gradually increased
         until finding the longest match.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             import pyparsing as pp
             pp.ParserElement.enable_left_recursion()
 
             E = pp.Forward("E")
             num = pp.Word(pp.nums)
+
             # match `num`, or `num '+' num`, or `num '+' num '+' num`, ...
             E <<= E + '+' - num | num
 
-            print(E.parse_string("1+2+3"))
+            print(E.parse_string("1+2+3+4"))
+
+        prints:
+
+        .. testoutput::
+
+            ['1', '+', '2', '+', '3', '+', '4']
 
         Recursion search naturally memoizes matches of ``Forward`` elements and may
         thus skip reevaluation of parse actions during backtracking. This may break
@@ -1070,17 +1206,18 @@ def enable_left_recursion(
         thus the two cannot be used together. Use ``force=True`` to disable any
         previous, conflicting settings.
         """
-        if force:
-            ParserElement.disable_memoization()
-        elif ParserElement._packratEnabled:
-            raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-        if cache_size_limit is None:
-            ParserElement.recursion_memos = _UnboundedMemo()  # type: ignore[assignment]
-        elif cache_size_limit > 0:
-            ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
-        else:
-            raise NotImplementedError(f"Memo size of {cache_size_limit}")
-        ParserElement._left_recursion_enabled = True
+        with ParserElement.packrat_cache_lock:
+            if force:
+                ParserElement.disable_memoization()
+            elif ParserElement._packratEnabled:
+                raise RuntimeError("Packrat and Bounded Recursion are not compatible")
+            if cache_size_limit is None:
+                ParserElement.recursion_memos = _UnboundedMemo()
+            elif cache_size_limit > 0:
+                ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
+            else:
+                raise NotImplementedError(f"Memo size of {cache_size_limit}")
+            ParserElement._left_recursion_enabled = True
 
     @staticmethod
     def enable_packrat(
@@ -1107,6 +1244,8 @@ def enable_packrat(
         For best results, call ``enable_packrat()`` immediately after
         importing pyparsing.
 
+        .. Can't really be doctested, alas
+
         Example::
 
             import pyparsing
@@ -1116,23 +1255,24 @@ def enable_packrat(
         thus the two cannot be used together. Use ``force=True`` to disable any
         previous, conflicting settings.
         """
-        if force:
-            ParserElement.disable_memoization()
-        elif ParserElement._left_recursion_enabled:
-            raise RuntimeError("Packrat and Bounded Recursion are not compatible")
+        with ParserElement.packrat_cache_lock:
+            if force:
+                ParserElement.disable_memoization()
+            elif ParserElement._left_recursion_enabled:
+                raise RuntimeError("Packrat and Bounded Recursion are not compatible")
 
-        if ParserElement._packratEnabled:
-            return
+            if ParserElement._packratEnabled:
+                return
 
-        ParserElement._packratEnabled = True
-        if cache_size_limit is None:
-            ParserElement.packrat_cache = _UnboundedCache()
-        else:
-            ParserElement.packrat_cache = _FifoCache(cache_size_limit)  # type: ignore[assignment]
-        ParserElement._parse = ParserElement._parseCache
+            ParserElement._packratEnabled = True
+            if cache_size_limit is None:
+                ParserElement.packrat_cache = _UnboundedCache()
+            else:
+                ParserElement.packrat_cache = _FifoCache(cache_size_limit)
+            ParserElement._parse = ParserElement._parseCache
 
     def parse_string(
-        self, instring: str, parse_all: bool = False, *, parseAll: bool = False
+        self, instring: str, parse_all: bool = False, **kwargs
     ) -> ParseResults:
         """
         Parse a string with respect to the parser definition. This function is intended as the primary interface to the
@@ -1162,21 +1302,26 @@ def parse_string(
 
         By default, partial matches are OK.
 
-        >>> res = Word('a').parse_string('aaaaabaaa')
-        >>> print(res)
-        ['aaaaa']
+        .. doctest::
+
+            >>> res = Word('a').parse_string('aaaaabaaa')
+            >>> print(res)
+            ['aaaaa']
 
         The parsing behavior varies by the inheriting class of this abstract class. Please refer to the children
         directly to see more examples.
 
         It raises an exception if parse_all flag is set and instring does not match the whole grammar.
 
-        >>> res = Word('a').parse_string('aaaaabaaa', parse_all=True)
-        Traceback (most recent call last):
-        ...
-        pyparsing.ParseException: Expected end of text, found 'b'  (at char 5), (line:1, col:6)
+        .. doctest::
+
+            >>> res = Word('a').parse_string('aaaaabaaa', parse_all=True)
+            Traceback (most recent call last):
+            ParseException: Expected end of text, found 'b' ...
         """
-        parseAll = parse_all or parseAll
+        parseAll: bool = deprecate_argument(kwargs, "parseAll", False)
+
+        parse_all = parse_all or parseAll
 
         ParserElement.reset_cache()
         if not self.streamlined:
@@ -1187,16 +1332,18 @@ def parse_string(
             instring = instring.expandtabs()
         try:
             loc, tokens = self._parse(instring, 0)
-            if parseAll:
+            if parse_all:
                 loc = self.preParse(instring, loc)
                 se = Empty() + StringEnd().set_debug(False)
                 se._parse(instring, loc)
+        except _ParseActionIndexError as pa_exc:
+            raise pa_exc.exc
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
-            else:
-                # catch and re-raise exception from here, clearing out pyparsing internal stack trace
-                raise exc.with_traceback(None)
+
+            # catch and re-raise exception from here, clearing out pyparsing internal stack trace
+            raise exc.with_traceback(None)
         else:
             return tokens
 
@@ -1205,10 +1352,11 @@ def scan_string(
         instring: str,
         max_matches: int = _MAX_INT,
         overlap: bool = False,
+        always_skip_whitespace=True,
         *,
         debug: bool = False,
-        maxMatches: int = _MAX_INT,
-    ) -> Generator[Tuple[ParseResults, int, int], None, None]:
+        **kwargs,
+    ) -> Generator[tuple[ParseResults, int, int], None, None]:
         """
         Scan the input string for expression matches.  Each match will return the
         matching tokens, start location, and end location.  May be called with optional
@@ -1219,7 +1367,9 @@ def scan_string(
         being parsed.  See :class:`parse_string` for more information on parsing
         strings with embedded tabs.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
             print(source)
@@ -1227,7 +1377,9 @@ def scan_string(
                 print(' '*start + '^'*(end-start))
                 print(' '*start + tokens[0])
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             sldjf123lsdjjkf345sldkjf879lkjsfd987
             ^^^^^
@@ -1239,7 +1391,9 @@ def scan_string(
                                        ^^^^^^
                                        lkjsfd
         """
-        maxMatches = min(maxMatches, max_matches)
+        maxMatches: int = deprecate_argument(kwargs, "maxMatches", _MAX_INT)
+
+        max_matches = min(maxMatches, max_matches)
         if not self.streamlined:
             self.streamline()
         for e in self.ignoreExprs:
@@ -1249,12 +1403,18 @@ def scan_string(
             instring = str(instring).expandtabs()
         instrlen = len(instring)
         loc = 0
-        preparseFn = self.preParse
+        if always_skip_whitespace:
+            preparser = Empty()
+            preparser.ignoreExprs = self.ignoreExprs
+            preparser.whiteChars = self.whiteChars
+            preparseFn = preparser.preParse
+        else:
+            preparseFn = self.preParse
         parseFn = self._parse
-        ParserElement.resetCache()
+        ParserElement.reset_cache()
         matches = 0
         try:
-            while loc <= instrlen and matches < maxMatches:
+            while loc <= instrlen and matches < max_matches:
                 try:
                     preloc: int = preparseFn(instring, loc)
                     nextLoc: int
@@ -1268,7 +1428,7 @@ def scan_string(
                         if debug:
                             print(
                                 {
-                                    "tokens": tokens.asList(),
+                                    "tokens": tokens.as_list(),
                                     "start": preloc,
                                     "end": nextLoc,
                                 }
@@ -1300,25 +1460,34 @@ def transform_string(self, instring: str, *, debug: bool = False) -> str:
         and replace the matched text patterns according to the logic in the parse
         action.  ``transform_string()`` returns the resulting transformed string.
 
-        Example::
+        Example:
+
+        .. testcode::
+
+            quote = '''now is the winter of our discontent,
+            made glorious summer by this sun of york.'''
 
             wd = Word(alphas)
             wd.set_parse_action(lambda toks: toks[0].title())
 
-            print(wd.transform_string("now is the winter of our discontent made glorious summer by this sun of york."))
+            print(wd.transform_string(quote))
 
-        prints::
+        prints:
 
-            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
+        .. testoutput::
+
+            Now Is The Winter Of Our Discontent,
+            Made Glorious Summer By This Sun Of York.
         """
-        out: List[str] = []
+        out: list[str] = []
         lastE = 0
         # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
         # keep string locs straight between transform_string and scan_string
         self.keepTabs = True
         try:
             for t, s, e in self.scan_string(instring, debug=debug):
-                out.append(instring[lastE:s])
+                if s > lastE:
+                    out.append(instring[lastE:s])
                 lastE = e
 
                 if not t:
@@ -1347,32 +1516,51 @@ def search_string(
         max_matches: int = _MAX_INT,
         *,
         debug: bool = False,
-        maxMatches: int = _MAX_INT,
+        **kwargs,
     ) -> ParseResults:
         """
         Another extension to :class:`scan_string`, simplifying the access to the tokens found
         to match the given parse expression.  May be called with optional
         ``max_matches`` argument, to clip searching after 'n' matches are found.
 
-        Example::
+        Example:
+
+        .. testcode::
+
+            quote = '''More than Iron, more than Lead,
+            more than Gold I need Electricity'''
 
-            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
+            # a capitalized word starts with an uppercase letter,
+            # followed by zero or more lowercase letters
             cap_word = Word(alphas.upper(), alphas.lower())
 
-            print(cap_word.search_string("More than Iron, more than Lead, more than Gold I need Electricity"))
+            print(cap_word.search_string(quote))
 
-            # the sum() builtin can be used to merge results into a single ParseResults object
-            print(sum(cap_word.search_string("More than Iron, more than Lead, more than Gold I need Electricity")))
+            # the sum() builtin can be used to merge results
+            # into a single ParseResults object
+            print(sum(cap_word.search_string(quote)))
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             [['More'], ['Iron'], ['Lead'], ['Gold'], ['I'], ['Electricity']]
             ['More', 'Iron', 'Lead', 'Gold', 'I', 'Electricity']
         """
-        maxMatches = min(maxMatches, max_matches)
+        maxMatches: int = deprecate_argument(kwargs, "maxMatches", _MAX_INT)
+
+        max_matches = min(maxMatches, max_matches)
         try:
             return ParseResults(
-                [t for t, s, e in self.scan_string(instring, maxMatches, debug=debug)]
+                [
+                    t
+                    for t, s, e in self.scan_string(
+                        instring,
+                        max_matches=max_matches,
+                        always_skip_whitespace=False,
+                        debug=debug,
+                    )
+                ]
             )
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
@@ -1386,8 +1574,7 @@ def split(
         instring: str,
         maxsplit: int = _MAX_INT,
         include_separators: bool = False,
-        *,
-        includeSeparators=False,
+        **kwargs,
     ) -> Generator[str, None, None]:
         """
         Generator method to split a string using the given expression as a separator.
@@ -1395,44 +1582,59 @@ def split(
         and the optional ``include_separators`` argument (default= ``False``), if the separating
         matching text should be included in the split results.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             punc = one_of(list(".,;:/-!?"))
-            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
+            print(list(punc.split(
+                "This, this?, this sentence, is badly punctuated!")))
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
         """
-        includeSeparators = includeSeparators or include_separators
+        includeSeparators: bool = deprecate_argument(kwargs, "includeSeparators", False)
+
+        include_separators = includeSeparators or include_separators
         last = 0
         for t, s, e in self.scan_string(instring, max_matches=maxsplit):
             yield instring[last:s]
-            if includeSeparators:
+            if include_separators:
                 yield t[0]
             last = e
         yield instring[last:]
 
-    def __add__(self, other) -> "ParserElement":
+    def __add__(self, other) -> ParserElement:
         """
         Implementation of ``+`` operator - returns :class:`And`. Adding strings to a :class:`ParserElement`
         converts them to :class:`Literal`\\ s by default.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             greet = Word(alphas) + "," + Word(alphas) + "!"
             hello = "Hello, World!"
             print(hello, "->", greet.parse_string(hello))
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             Hello, World! -> ['Hello', ',', 'World', '!']
 
-        ``...`` may be used as a parse expression as a short form of :class:`SkipTo`::
+        ``...`` may be used as a parse expression as a short form of :class:`SkipTo`:
+
+        .. testcode::
 
             Literal('start') + ... + Literal('end')
 
-        is equivalent to::
+        is equivalent to:
+
+        .. testcode::
 
             Literal('start') + SkipTo('end')("_skipped*") + Literal('end')
 
@@ -1449,7 +1651,7 @@ def __add__(self, other) -> "ParserElement":
             return NotImplemented
         return And([self, other])
 
-    def __radd__(self, other) -> "ParserElement":
+    def __radd__(self, other) -> ParserElement:
         """
         Implementation of ``+`` operator when left operand is not a :class:`ParserElement`
         """
@@ -1462,7 +1664,7 @@ def __radd__(self, other) -> "ParserElement":
             return NotImplemented
         return other + self
 
-    def __sub__(self, other) -> "ParserElement":
+    def __sub__(self, other) -> ParserElement:
         """
         Implementation of ``-`` operator, returns :class:`And` with error stop
         """
@@ -1472,7 +1674,7 @@ def __sub__(self, other) -> "ParserElement":
             return NotImplemented
         return self + And._ErrorStop() + other
 
-    def __rsub__(self, other) -> "ParserElement":
+    def __rsub__(self, other) -> ParserElement:
         """
         Implementation of ``-`` operator when left operand is not a :class:`ParserElement`
         """
@@ -1482,7 +1684,7 @@ def __rsub__(self, other) -> "ParserElement":
             return NotImplemented
         return other - self
 
-    def __mul__(self, other) -> "ParserElement":
+    def __mul__(self, other) -> ParserElement:
         """
         Implementation of ``*`` operator, allows use of ``expr * 3`` in place of
         ``expr + expr + expr``.  Expressions may also be multiplied by a 2-integer
@@ -1562,12 +1764,15 @@ def makeOptionalList(n):
                 ret = And([self] * minElements)
         return ret
 
-    def __rmul__(self, other) -> "ParserElement":
+    def __rmul__(self, other) -> ParserElement:
         return self.__mul__(other)
 
-    def __or__(self, other) -> "ParserElement":
+    def __or__(self, other) -> ParserElement:
         """
         Implementation of ``|`` operator - returns :class:`MatchFirst`
+
+        .. versionchanged:: 3.1.0
+           Support ``expr | ""`` as a synonym for ``Optional(expr)``.
         """
         if other is Ellipsis:
             return _PendingSkip(self, must_skip=True)
@@ -1581,7 +1786,7 @@ def __or__(self, other) -> "ParserElement":
             return NotImplemented
         return MatchFirst([self, other])
 
-    def __ror__(self, other) -> "ParserElement":
+    def __ror__(self, other) -> ParserElement:
         """
         Implementation of ``|`` operator when left operand is not a :class:`ParserElement`
         """
@@ -1591,7 +1796,7 @@ def __ror__(self, other) -> "ParserElement":
             return NotImplemented
         return other | self
 
-    def __xor__(self, other) -> "ParserElement":
+    def __xor__(self, other) -> ParserElement:
         """
         Implementation of ``^`` operator - returns :class:`Or`
         """
@@ -1601,7 +1806,7 @@ def __xor__(self, other) -> "ParserElement":
             return NotImplemented
         return Or([self, other])
 
-    def __rxor__(self, other) -> "ParserElement":
+    def __rxor__(self, other) -> ParserElement:
         """
         Implementation of ``^`` operator when left operand is not a :class:`ParserElement`
         """
@@ -1611,7 +1816,7 @@ def __rxor__(self, other) -> "ParserElement":
             return NotImplemented
         return other ^ self
 
-    def __and__(self, other) -> "ParserElement":
+    def __and__(self, other) -> ParserElement:
         """
         Implementation of ``&`` operator - returns :class:`Each`
         """
@@ -1621,7 +1826,7 @@ def __and__(self, other) -> "ParserElement":
             return NotImplemented
         return Each([self, other])
 
-    def __rand__(self, other) -> "ParserElement":
+    def __rand__(self, other) -> ParserElement:
         """
         Implementation of ``&`` operator when left operand is not a :class:`ParserElement`
         """
@@ -1631,7 +1836,7 @@ def __rand__(self, other) -> "ParserElement":
             return NotImplemented
         return other & self
 
-    def __invert__(self) -> "ParserElement":
+    def __invert__(self) -> ParserElement:
         """
         Implementation of ``~`` operator - returns :class:`NotAny`
         """
@@ -1666,6 +1871,8 @@ def __getitem__(self, key):
         - ``expr[...: end_expr]`` and ``expr[0, ...: end_expr]`` are equivalent to ``ZeroOrMore(expr, stop_on=end_expr)``
         - ``expr[1, ...: end_expr]`` is equivalent to ``OneOrMore(expr, stop_on=end_expr)``
 
+        .. versionchanged:: 3.1.0
+           Support for slice notation.
         """
 
         stop_on_defined = False
@@ -1701,7 +1908,7 @@ def __getitem__(self, key):
 
         return ret
 
-    def __call__(self, name: typing.Optional[str] = None) -> "ParserElement":
+    def __call__(self, name: typing.Optional[str] = None) -> ParserElement:
         """
         Shortcut for :class:`set_results_name`, with ``list_all_matches=False``.
 
@@ -1710,10 +1917,16 @@ def __call__(self, name: typing.Optional[str] = None) -> "ParserElement":
 
         If ``name`` is omitted, same as calling :class:`copy`.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             # these are equivalent
-            userdata = Word(alphas).set_results_name("name") + Word(nums + "-").set_results_name("socsecno")
+            userdata = (
+                Word(alphas).set_results_name("name")
+                + Word(nums + "-").set_results_name("socsecno")
+            )
+
             userdata = Word(alphas)("name") + Word(nums + "-")("socsecno")
         """
         if name is not None:
@@ -1721,14 +1934,14 @@ def __call__(self, name: typing.Optional[str] = None) -> "ParserElement":
 
         return self.copy()
 
-    def suppress(self) -> "ParserElement":
+    def suppress(self) -> ParserElement:
         """
         Suppresses the output of this :class:`ParserElement`; useful to keep punctuation from
         cluttering up returned output.
         """
         return Suppress(self)
 
-    def ignore_whitespace(self, recursive: bool = True) -> "ParserElement":
+    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
         """
         Enables the skipping of whitespace before matching the characters in the
         :class:`ParserElement`'s defined pattern.
@@ -1738,7 +1951,7 @@ def ignore_whitespace(self, recursive: bool = True) -> "ParserElement":
         self.skipWhitespace = True
         return self
 
-    def leave_whitespace(self, recursive: bool = True) -> "ParserElement":
+    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         """
         Disables the skipping of whitespace before matching the characters in the
         :class:`ParserElement`'s defined pattern.  This is normally only used internally by
@@ -1750,8 +1963,8 @@ def leave_whitespace(self, recursive: bool = True) -> "ParserElement":
         return self
 
     def set_whitespace_chars(
-        self, chars: Union[Set[str], str], copy_defaults: bool = False
-    ) -> "ParserElement":
+        self, chars: Union[set[str], str], copy_defaults: bool = False
+    ) -> ParserElement:
         """
         Overrides the default whitespace chars
         """
@@ -1760,7 +1973,7 @@ def set_whitespace_chars(
         self.copyDefaultWhiteChars = copy_defaults
         return self
 
-    def parse_with_tabs(self) -> "ParserElement":
+    def parse_with_tabs(self) -> ParserElement:
         """
         Overrides default behavior to expand ``<TAB>`` s to spaces before parsing the input string.
         Must be called before ``parse_string`` when the input grammar contains elements that
@@ -1769,21 +1982,23 @@ def parse_with_tabs(self) -> "ParserElement":
         self.keepTabs = True
         return self
 
-    def ignore(self, other: "ParserElement") -> "ParserElement":
+    def ignore(self, other: ParserElement) -> ParserElement:
         """
         Define expression to be ignored (e.g., comments) while doing pattern
         matching; may be called repeatedly, to define multiple comment or other
         ignorable patterns.
 
-        Example::
+        Example:
+
+        .. doctest::
 
-            patt = Word(alphas)[...]
-            patt.parse_string('ablaj /* comment */ lskjd')
-            # -> ['ablaj']
+            >>> patt = Word(alphas)[...]
+            >>> print(patt.parse_string('ablaj /* comment */ lskjd'))
+            ['ablaj']
 
-            patt.ignore(c_style_comment)
-            patt.parse_string('ablaj /* comment */ lskjd')
-            # -> ['ablaj', 'lskjd']
+            >>> patt = Word(alphas)[...].ignore(c_style_comment)
+            >>> print(patt.parse_string('ablaj /* comment */ lskjd'))
+            ['ablaj', 'lskjd']
         """
         if isinstance(other, str_type):
             other = Suppress(other)
@@ -1800,34 +2015,54 @@ def set_debug_actions(
         start_action: DebugStartAction,
         success_action: DebugSuccessAction,
         exception_action: DebugExceptionAction,
-    ) -> "ParserElement":
+    ) -> ParserElement:
         """
         Customize display of debugging messages while doing pattern matching:
 
-        - ``start_action`` - method to be called when an expression is about to be parsed;
-          should have the signature ``fn(input_string: str, location: int, expression: ParserElement, cache_hit: bool)``
+        :param start_action: method to be called when an expression is about to be parsed;
+                             should have the signature::
+
+                                 fn(input_string: str,
+                                    location: int,
+                                    expression: ParserElement,
+                                    cache_hit: bool)
+
+        :param success_action: method to be called when an expression has successfully parsed;
+                               should have the signature::
 
-        - ``success_action`` - method to be called when an expression has successfully parsed;
-          should have the signature ``fn(input_string: str, start_location: int, end_location: int, expression: ParserELement, parsed_tokens: ParseResults, cache_hit: bool)``
+                                   fn(input_string: str,
+                                      start_location: int,
+                                      end_location: int,
+                                      expression: ParserELement,
+                                      parsed_tokens: ParseResults,
+                                      cache_hit: bool)
 
-        - ``exception_action`` - method to be called when expression fails to parse;
-          should have the signature ``fn(input_string: str, location: int, expression: ParserElement, exception: Exception, cache_hit: bool)``
+        :param exception_action: method to be called when expression fails to parse;
+                                 should have the signature::
+
+                                   fn(input_string: str,
+                                      location: int,
+                                      expression: ParserElement,
+                                      exception: Exception,
+                                      cache_hit: bool)
         """
         self.debugActions = self.DebugActions(
             start_action or _default_start_debug_action,  # type: ignore[truthy-function]
             success_action or _default_success_debug_action,  # type: ignore[truthy-function]
             exception_action or _default_exception_debug_action,  # type: ignore[truthy-function]
         )
-        self.debug = True
+        self.debug = any(self.debugActions)
         return self
 
-    def set_debug(self, flag: bool = True, recurse: bool = False) -> "ParserElement":
+    def set_debug(self, flag: bool = True, recurse: bool = False) -> ParserElement:
         """
         Enable display of debugging messages while doing pattern matching.
         Set ``flag`` to ``True`` to enable, ``False`` to disable.
         Set ``recurse`` to ``True`` to set the debug flag on this expression and all sub-expressions.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             wd = Word(alphas).set_name("alphaword")
             integer = Word(nums).set_name("numword")
@@ -1838,26 +2073,41 @@ def set_debug(self, flag: bool = True, recurse: bool = False) -> "ParserElement"
 
             term[1, ...].parse_string("abc 123 xyz 890")
 
-        prints::
+        prints:
+
+        .. testoutput::
+            :options: +NORMALIZE_WHITESPACE
 
             Match alphaword at loc 0(1,1)
+              abc 123 xyz 890
+              ^
             Matched alphaword -> ['abc']
-            Match alphaword at loc 3(1,4)
-            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
-            Match alphaword at loc 7(1,8)
+            Match alphaword at loc 4(1,5)
+              abc 123 xyz 890
+                  ^
+            Match alphaword failed, ParseException raised: Expected alphaword, ...
+            Match alphaword at loc 8(1,9)
+              abc 123 xyz 890
+                      ^
             Matched alphaword -> ['xyz']
-            Match alphaword at loc 11(1,12)
-            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
-            Match alphaword at loc 15(1,16)
-            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
+            Match alphaword at loc 12(1,13)
+              abc 123 xyz 890
+                          ^
+            Match alphaword failed, ParseException raised: Expected alphaword, ...
+              abc 123 xyz 890
+                             ^
+            Match alphaword failed, ParseException raised: Expected alphaword, found end of text ...
 
         The output shown is that produced by the default debug actions - custom debug actions can be
-        specified using :class:`set_debug_actions`. Prior to attempting
+        specified using :meth:`set_debug_actions`. Prior to attempting
         to match the ``wd`` expression, the debugging message ``"Match <exprname> at loc <n>(<line>,<col>)"``
         is shown. Then if the parse succeeds, a ``"Matched"`` message is shown, or an ``"Exception raised"``
-        message is shown. Also note the use of :class:`set_name` to assign a human-readable name to the expression,
+        message is shown. Also note the use of :meth:`set_name` to assign a human-readable name to the expression,
         which makes debugging and exception messages easier to understand - for instance, the default
-        name created for the :class:`Word` expression without calling ``set_name`` is ``"W:(A-Za-z)"``.
+        name created for the :class:`Word` expression without calling :meth:`set_name` is ``"W:(A-Za-z)"``.
+
+        .. versionchanged:: 3.1.0
+           ``recurse`` argument added.
         """
         if recurse:
             for expr in self.visit_all():
@@ -1886,7 +2136,7 @@ def _generateDefaultName(self) -> str:
         Child classes must define this method, which defines how the ``default_name`` is set.
         """
 
-    def set_name(self, name: typing.Optional[str]) -> "ParserElement":
+    def set_name(self, name: typing.Optional[str]) -> ParserElement:
         """
         Define name for this expression, makes debugging and exception messages clearer. If
         `__diag__.enable_debug_on_named_expressions` is set to True, setting a name will also
@@ -1895,15 +2145,25 @@ def set_name(self, name: typing.Optional[str]) -> "ParserElement":
         If `name` is None, clears any custom name for this expression, and clears the
         debug flag is it was enabled via `__diag__.enable_debug_on_named_expressions`.
 
-        Example::
+        Example:
 
-            integer = Word(nums)
-            integer.parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
+        .. doctest::
+
+            >>> integer = Word(nums)
+            >>> integer.parse_string("ABC")
+            Traceback (most recent call last):
+            ParseException: Expected W:(0-9) (at char 0), (line:1, col:1)
+
+            >>> integer.set_name("integer")
+            integer
+            >>> integer.parse_string("ABC")
+            Traceback (most recent call last):
+            ParseException: Expected integer (at char 0), (line:1, col:1)
 
-            integer.set_name("integer")
-            integer.parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
+        .. versionchanged:: 3.1.0
+           Accept ``None`` as the ``name`` argument.
         """
-        self.customName = name
+        self.customName = name  # type: ignore[assignment]
         self.errmsg = f"Expected {str(self)}"
 
         if __diag__.enable_debug_on_named_expressions:
@@ -1913,7 +2173,9 @@ def set_name(self, name: typing.Optional[str]) -> "ParserElement":
 
     @property
     def name(self) -> str:
-        # This will use a user-defined name if available, but otherwise defaults back to the auto-generated name
+        """
+        Returns a user-defined name if available, but otherwise defaults back to the auto-generated name
+        """
         return self.customName if self.customName is not None else self.default_name
 
     @name.setter
@@ -1926,12 +2188,12 @@ def __str__(self) -> str:
     def __repr__(self) -> str:
         return str(self)
 
-    def streamline(self) -> "ParserElement":
+    def streamline(self) -> ParserElement:
         self.streamlined = True
         self._defaultName = None
         return self
 
-    def recurse(self) -> List["ParserElement"]:
+    def recurse(self) -> list[ParserElement]:
         return []
 
     def _checkRecursion(self, parseElementList):
@@ -1941,11 +2203,15 @@ def _checkRecursion(self, parseElementList):
 
     def validate(self, validateTrace=None) -> None:
         """
+        .. deprecated:: 3.0.0
+           Do not use to check for left recursion.
+
         Check defined expressions for valid structure, check for infinite recursive definitions.
+
         """
         warnings.warn(
             "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
+            PyparsingDeprecationWarning,
             stacklevel=2,
         )
         self._checkRecursion([])
@@ -1955,15 +2221,16 @@ def parse_file(
         file_or_filename: Union[str, Path, TextIO],
         encoding: str = "utf-8",
         parse_all: bool = False,
-        *,
-        parseAll: bool = False,
+        **kwargs,
     ) -> ParseResults:
         """
         Execute the parse expression on the given file or filename.
         If a filename is specified (instead of a file object),
         the entire file is opened, read, and closed before parsing.
         """
-        parseAll = parseAll or parse_all
+        parseAll: bool = deprecate_argument(kwargs, "parseAll", False)
+
+        parse_all = parse_all or parseAll
         try:
             file_or_filename = typing.cast(TextIO, file_or_filename)
             file_contents = file_or_filename.read()
@@ -1972,7 +2239,7 @@ def parse_file(
             with open(file_or_filename, "r", encoding=encoding) as f:
                 file_contents = f.read()
         try:
-            return self.parse_string(file_contents, parseAll)
+            return self.parse_string(file_contents, parse_all)
         except ParseBaseException as exc:
             if ParserElement.verbose_stacktrace:
                 raise
@@ -1992,35 +2259,36 @@ def __eq__(self, other):
     def __hash__(self):
         return id(self)
 
-    def matches(
-        self, test_string: str, parse_all: bool = True, *, parseAll: bool = True
-    ) -> bool:
+    def matches(self, test_string: str, parse_all: bool = True, **kwargs) -> bool:
         """
         Method for quick testing of a parser against a test string. Good for simple
         inline microtests of sub expressions while building up larger parser.
 
-        Parameters:
+        :param test_string: to test against this expression for a match
+        :param parse_all: flag to pass to :meth:`parse_string` when running tests
 
-        - ``test_string`` - to test against this expression for a match
-        - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
+        Example:
 
-        Example::
+        .. doctest::
 
-            expr = Word(nums)
-            assert expr.matches("100")
+            >>> expr = Word(nums)
+            >>> expr.matches("100")
+            True
         """
-        parseAll = parseAll and parse_all
+        parseAll: bool = deprecate_argument(kwargs, "parseAll", True)
+
+        parse_all = parse_all and parseAll
         try:
-            self.parse_string(str(test_string), parse_all=parseAll)
+            self.parse_string(str(test_string), parse_all=parse_all)
             return True
         except ParseBaseException:
             return False
 
     def run_tests(
         self,
-        tests: Union[str, List[str]],
+        tests: Union[str, list[str]],
         parse_all: bool = True,
-        comment: typing.Optional[Union["ParserElement", str]] = "#",
+        comment: typing.Optional[Union[ParserElement, str]] = "#",
         full_dump: bool = True,
         print_results: bool = True,
         failure_tests: bool = False,
@@ -2037,7 +2305,7 @@ def run_tests(
         postParse: typing.Optional[
             Callable[[str, ParseResults], typing.Optional[str]]
         ] = None,
-    ) -> Tuple[bool, List[Tuple[str, Union[ParseResults, Exception]]]]:
+    ) -> tuple[bool, list[tuple[str, Union[ParseResults, Exception]]]]:
         """
         Execute the parse expression on a series of test strings, showing each
         test, the parsed results or where the parse failed. Quick and easy way to
@@ -2063,7 +2331,9 @@ def run_tests(
         (or failed if ``failure_tests`` is True), and the results contain a list of lines of each
         test's output
 
-        Example::
+        Passing example:
+
+        .. testcode::
 
             number_expr = pyparsing_common.number.copy()
 
@@ -2076,20 +2346,16 @@ def run_tests(
                 6.02e23
                 # integer with scientific notation
                 1e-12
+                # negative decimal number without leading digit
+                -.100
                 ''')
             print("Success" if result[0] else "Failed!")
 
-            result = number_expr.run_tests('''
-                # stray character
-                100Z
-                # missing leading digit before '.'
-                -.100
-                # too many '.'
-                3.14.159
-                ''', failure_tests=True)
-            print("Success" if result[0] else "Failed!")
+        prints:
+
+        .. testoutput::
+            :options: +NORMALIZE_WHITESPACE
 
-        prints::
 
             # unsigned integer
             100
@@ -2107,30 +2373,59 @@ def run_tests(
             1e-12
             [1e-12]
 
+            # negative decimal number without leading digit
+            -.100
+            [-0.1]
             Success
 
+        Failure-test example:
+
+        .. testcode::
+
+            result = number_expr.run_tests('''
+                # stray character
+                100Z
+                # too many '.'
+                3.14.159
+                ''', failure_tests=True)
+            print("Success" if result[0] else "Failed!")
+
+        prints:
+
+        .. testoutput::
+            :options: +NORMALIZE_WHITESPACE
+
+
             # stray character
+            100Z
             100Z
                ^
-            FAIL: Expected end of text (at char 3), (line:1, col:4)
-
-            # missing leading digit before '.'
-            -.100
-            ^
-            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
+            ParseException: Expected end of text, found 'Z' ...
 
             # too many '.'
+            3.14.159
             3.14.159
                 ^
-            FAIL: Expected end of text (at char 4), (line:1, col:5)
-
+            ParseException: Expected end of text, found '.' ...
+            FAIL: Expected end of text, found '.' ...
             Success
 
         Each test string must be on a single line. If you want to test a string that spans multiple
-        lines, create a test like this::
+        lines, create a test like this:
+
+        .. testcode::
 
+            expr = Word(alphanums)[1,...]
             expr.run_tests(r"this is a test\\n of strings that spans \\n 3 lines")
 
+        .. testoutput::
+            :options: +NORMALIZE_WHITESPACE
+            :hide:
+
+
+            this is a test\\n of strings that spans \\n 3 lines
+            ['this', 'is', 'a', 'test', 'of', 'strings', 'that', 'spans', '3', 'lines']
+
         (Note that this is a raw string literal, you must include the leading ``'r'``.)
         """
         from .testing import pyparsing_test
@@ -2155,8 +2450,8 @@ def run_tests(
         print_ = file.write
 
         result: Union[ParseResults, Exception]
-        allResults: List[Tuple[str, Union[ParseResults, Exception]]] = []
-        comments: List[str] = []
+        allResults: list[tuple[str, Union[ParseResults, Exception]]] = []
+        comments: list[str] = []
         success = True
         NL = Literal(r"\n").add_parse_action(replace_with("\n")).ignore(quoted_string)
         BOM = "\ufeff"
@@ -2177,7 +2472,7 @@ def run_tests(
             try:
                 # convert newline marks to actual newlines, and strip leading BOM if present
                 t = NL.transform_string(t.lstrip(BOM))
-                result = self.parse_string(t, parse_all=parseAll)
+                result = self.parse_string(t, parse_all=parse_all)
             except ParseBaseException as pe:
                 fatal = "(FATAL) " if isinstance(pe, ParseFatalException) else ""
                 out.append(pe.explain())
@@ -2187,7 +2482,18 @@ def run_tests(
                 success = success and failureTests
                 result = pe
             except Exception as exc:
-                out.append(f"FAIL-EXCEPTION: {type(exc).__name__}: {exc}")
+                tag = "FAIL-EXCEPTION"
+
+                # see if this exception was raised in a parse action
+                tb = exc.__traceback__
+                it = iter(traceback.walk_tb(tb))
+                for f, line in it:
+                    if (f.f_code.co_filename, line) == pa_call_line_synth:
+                        next_f = next(it)[0]
+                        tag += f" (raised in parse action {next_f.f_code.co_name!r})"
+                        break
+
+                out.append(f"{tag}: {type(exc).__name__}: {exc}")
                 if ParserElement.verbose_stacktrace:
                     out.extend(traceback.format_tb(exc.__traceback__))
                 success = success and failureTests
@@ -2227,6 +2533,7 @@ def create_diagram(
         show_results_names: bool = False,
         show_groups: bool = False,
         embed: bool = False,
+        show_hidden: bool = False,
         **kwargs,
     ) -> None:
         """
@@ -2241,6 +2548,7 @@ def create_diagram(
         - ``show_results_names`` - bool flag whether diagram should show annotations for
           defined results names
         - ``show_groups`` - bool flag whether groups should be highlighted with an unlabeled surrounding box
+        - ``show_hidden`` - bool flag to show diagram elements for internal elements that are usually hidden
         - ``embed`` - bool flag whether generated HTML should omit <HEAD>, <BODY>, and <DOCTYPE> tags to embed
           the resulting HTML in an enclosing HTML source
         - ``head`` - str containing additional HTML to insert into the <HEAD> section of the generated code;
@@ -2250,6 +2558,9 @@ def create_diagram(
 
         Additional diagram-formatting keyword arguments can also be included;
         see railroad.Diagram class.
+
+        .. versionchanged:: 3.1.0
+           ``embed`` argument added.
         """
 
         try:
@@ -2266,6 +2577,7 @@ def create_diagram(
             vertical=vertical,
             show_results_names=show_results_names,
             show_groups=show_groups,
+            show_hidden=show_hidden,
             diagram_kwargs=kwargs,
         )
         if not isinstance(output_html, (str, Path)):
@@ -2315,7 +2627,7 @@ def create_diagram(
 class _PendingSkip(ParserElement):
     # internal placeholder class to hold a place were '...' is added to a parser element,
     # once another ParserElement is added, this placeholder will be replaced with a SkipTo
-    def __init__(self, expr: ParserElement, must_skip: bool = False):
+    def __init__(self, expr: ParserElement, must_skip: bool = False) -> None:
         super().__init__()
         self.anchor = expr
         self.must_skip = must_skip
@@ -2323,7 +2635,7 @@ def __init__(self, expr: ParserElement, must_skip: bool = False):
     def _generateDefaultName(self) -> str:
         return str(self.anchor + Empty()).replace("Empty", "...")
 
-    def __add__(self, other) -> "ParserElement":
+    def __add__(self, other) -> ParserElement:
         skipper = SkipTo(other).set_name("...")("_skipped*")
         if self.must_skip:
 
@@ -2358,7 +2670,7 @@ class Token(ParserElement):
     matching patterns.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(savelist=False)
 
     def _generateDefaultName(self) -> str:
@@ -2370,9 +2682,9 @@ class NoMatch(Token):
     A token that will never match.
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.mayIndexError = False
         self.errmsg = "Unmatchable token"
 
@@ -2384,11 +2696,17 @@ class Literal(Token):
     """
     Token to exactly match a specified string.
 
-    Example::
+    Example:
 
-        Literal('abc').parse_string('abc')  # -> ['abc']
-        Literal('abc').parse_string('abcdef')  # -> ['abc']
-        Literal('abc').parse_string('ab')  # -> Exception: Expected "abc"
+    .. doctest::
+
+        >>> Literal('abc').parse_string('abc')
+        ParseResults(['abc'], {})
+        >>> Literal('abc').parse_string('abcdef')
+        ParseResults(['abc'], {})
+        >>> Literal('abc').parse_string('ab')
+        Traceback (most recent call last):
+        ParseException: Expected 'abc', found 'ab'  (at char 0), (line: 1, col: 1)
 
     For case-insensitive matching, use :class:`CaselessLiteral`.
 
@@ -2396,9 +2714,11 @@ class Literal(Token):
     use :class:`Keyword` or :class:`CaselessKeyword`.
     """
 
-    def __new__(cls, match_string: str = "", *, matchString: str = ""):
+    def __new__(cls, match_string: str = "", **kwargs):
         # Performance tuning: select a subclass with optimized parseImpl
         if cls is Literal:
+            matchString: str = deprecate_argument(kwargs, "matchString", "")
+
             match_string = matchString or match_string
             if not match_string:
                 return super().__new__(Empty)
@@ -2412,14 +2732,16 @@ def __new__(cls, match_string: str = "", *, matchString: str = ""):
     def __getnewargs__(self):
         return (self.match,)
 
-    def __init__(self, match_string: str = "", *, matchString: str = ""):
+    def __init__(self, match_string: str = "", **kwargs) -> None:
+        matchString: str = deprecate_argument(kwargs, "matchString", "")
+
         super().__init__()
         match_string = matchString or match_string
         self.match = match_string
         self.matchLen = len(match_string)
         self.firstMatchChar = match_string[:1]
         self.errmsg = f"Expected {self.name}"
-        self.mayReturnEmpty = False
+        self._may_return_empty = False
         self.mayIndexError = False
 
     def _generateDefaultName(self) -> str:
@@ -2438,9 +2760,9 @@ class Empty(Literal):
     An empty token, will always match.
     """
 
-    def __init__(self, match_string="", *, matchString=""):
+    def __init__(self, match_string="", *, matchString="") -> None:
         super().__init__("")
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.mayIndexError = False
 
     def _generateDefaultName(self) -> str:
@@ -2479,10 +2801,25 @@ class Keyword(Token):
       "$"
     - ``caseless`` allows case-insensitive matching, default is ``False``.
 
-    Example::
+    Example:
+
+    .. doctest::
+        :options: +NORMALIZE_WHITESPACE
+
+        >>> Keyword("start").parse_string("start")
+        ParseResults(['start'], {})
+        >>> Keyword("start").parse_string("starting")
+        Traceback (most recent call last):
+        ParseException: Expected Keyword 'start', keyword was immediately
+        followed by keyword character, found 'ing'  (at char 5), (line:1, col:6)
 
-        Keyword("start").parse_string("start")  # -> ['start']
-        Keyword("start").parse_string("starting")  # -> Exception
+    .. doctest::
+        :options: +NORMALIZE_WHITESPACE
+
+        >>> Keyword("start").parse_string("starting").debug()
+        Traceback (most recent call last):
+        ParseException: Expected Keyword "start", keyword was immediately
+        followed by keyword character, found 'ing' ...
 
     For case-insensitive matching, use :class:`CaselessKeyword`.
     """
@@ -2494,10 +2831,11 @@ def __init__(
         match_string: str = "",
         ident_chars: typing.Optional[str] = None,
         caseless: bool = False,
-        *,
-        matchString: str = "",
-        identChars: typing.Optional[str] = None,
-    ):
+        **kwargs,
+    ) -> None:
+        matchString = deprecate_argument(kwargs, "matchString", "")
+        identChars = deprecate_argument(kwargs, "identChars", None)
+
         super().__init__()
         identChars = identChars or ident_chars
         if identChars is None:
@@ -2505,24 +2843,33 @@ def __init__(
         match_string = matchString or match_string
         self.match = match_string
         self.matchLen = len(match_string)
-        try:
-            self.firstMatchChar = match_string[0]
-        except IndexError:
+        self.firstMatchChar = match_string[:1]
+        if not self.firstMatchChar:
             raise ValueError("null string passed to Keyword; use Empty() instead")
         self.errmsg = f"Expected {type(self).__name__} {self.name}"
-        self.mayReturnEmpty = False
+        self._may_return_empty = False
         self.mayIndexError = False
         self.caseless = caseless
         if caseless:
             self.caselessmatch = match_string.upper()
             identChars = identChars.upper()
-        self.identChars = set(identChars)
+        self.ident_chars = set(identChars)
+
+    @property
+    def identChars(self) -> set[str]:
+        """
+        .. deprecated:: 3.3.0
+           use ident_chars instead.
+
+        Property returning the characters being used as keyword characters for this expression.
+        """
+        return self.ident_chars
 
     def _generateDefaultName(self) -> str:
         return repr(self.match)
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        errmsg = self.errmsg
+        errmsg = self.errmsg or ""
         errloc = loc
         if self.caseless:
             if instring[loc : loc + self.matchLen].upper() == self.caselessmatch:
@@ -2584,15 +2931,19 @@ class CaselessLiteral(Literal):
     Note: the matched results will always be in the case of the given
     match string, NOT the case of the input text.
 
-    Example::
+    Example:
+
+    .. doctest::
 
-        CaselessLiteral("CMD")[1, ...].parse_string("cmd CMD Cmd10")
-        # -> ['CMD', 'CMD', 'CMD']
+        >>> CaselessLiteral("CMD")[1, ...].parse_string("cmd CMD Cmd10")
+        ParseResults(['CMD', 'CMD', 'CMD'], {})
 
     (Contrast with example for :class:`CaselessKeyword`.)
     """
 
-    def __init__(self, match_string: str = "", *, matchString: str = ""):
+    def __init__(self, match_string: str = "", **kwargs) -> None:
+        matchString: str = deprecate_argument(kwargs, "matchString", "")
+
         match_string = matchString or match_string
         super().__init__(match_string.upper())
         # Preserve the defining literal.
@@ -2609,22 +2960,24 @@ class CaselessKeyword(Keyword):
     """
     Caseless version of :class:`Keyword`.
 
-    Example::
+    Example:
+
+    .. doctest::
 
-        CaselessKeyword("CMD")[1, ...].parse_string("cmd CMD Cmd10")
-        # -> ['CMD', 'CMD']
+        >>> CaselessKeyword("CMD")[1, ...].parse_string("cmd CMD Cmd10")
+        ParseResults(['CMD', 'CMD'], {})
 
     (Contrast with example for :class:`CaselessLiteral`.)
     """
 
     def __init__(
-        self,
-        match_string: str = "",
-        ident_chars: typing.Optional[str] = None,
-        *,
-        matchString: str = "",
-        identChars: typing.Optional[str] = None,
-    ):
+        self, match_string: str = "", ident_chars: typing.Optional[str] = None, **kwargs
+    ) -> None:
+        matchString: str = deprecate_argument(kwargs, "matchString", "")
+        identChars: typing.Optional[str] = deprecate_argument(
+            kwargs, "identChars", None
+        )
+
         identChars = identChars or ident_chars
         match_string = matchString or match_string
         super().__init__(match_string, identChars, caseless=True)
@@ -2651,18 +3004,31 @@ class CloseMatch(Token):
     If ``mismatches`` is an empty list, then the match was an exact
     match.
 
-    Example::
+    Example:
 
-        patt = CloseMatch("ATCATCGAATGGA")
-        patt.parse_string("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
-        patt.parse_string("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
+    .. doctest::
+        :options: +NORMALIZE_WHITESPACE
+
+        >>> patt = CloseMatch("ATCATCGAATGGA")
+        >>> patt.parse_string("ATCATCGAAXGGA")
+        ParseResults(['ATCATCGAAXGGA'],
+        {'original': 'ATCATCGAATGGA', 'mismatches': [9]})
+
+        >>> patt.parse_string("ATCAXCGAAXGGA")
+        Traceback (most recent call last):
+        ParseException: Expected 'ATCATCGAATGGA' (with up to 1 mismatches),
+        found 'ATCAXCGAAXGGA' (at char 0), (line:1, col:1)
 
         # exact match
-        patt.parse_string("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
+        >>> patt.parse_string("ATCATCGAATGGA")
+        ParseResults(['ATCATCGAATGGA'],
+        {'original': 'ATCATCGAATGGA', 'mismatches': []})
 
         # close match allowing up to 2 mismatches
-        patt = CloseMatch("ATCATCGAATGGA", max_mismatches=2)
-        patt.parse_string("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
+        >>> patt = CloseMatch("ATCATCGAATGGA", max_mismatches=2)
+        >>> patt.parse_string("ATCAXCGAAXGGA")
+        ParseResults(['ATCAXCGAAXGGA'],
+        {'original': 'ATCATCGAATGGA', 'mismatches': [4, 9]})
     """
 
     def __init__(
@@ -2670,9 +3036,11 @@ def __init__(
         match_string: str,
         max_mismatches: typing.Optional[int] = None,
         *,
-        maxMismatches: int = 1,
         caseless=False,
-    ):
+        **kwargs,
+    ) -> None:
+        maxMismatches: int = deprecate_argument(kwargs, "maxMismatches", 1)
+
         maxMismatches = max_mismatches if max_mismatches is not None else maxMismatches
         super().__init__()
         self.match_string = match_string
@@ -2680,7 +3048,7 @@ def __init__(
         self.errmsg = f"Expected {self.match_string!r} (with up to {self.maxMismatches} mismatches)"
         self.caseless = caseless
         self.mayIndexError = False
-        self.mayReturnEmpty = False
+        self._may_return_empty = False
 
     def _generateDefaultName(self) -> str:
         return f"{type(self).__name__}:{self.match_string!r}"
@@ -2753,23 +3121,28 @@ class Word(Token):
 
     pyparsing includes helper strings for building Words:
 
-    - :class:`alphas`
-    - :class:`nums`
-    - :class:`alphanums`
-    - :class:`hexnums`
-    - :class:`alphas8bit` (alphabetic characters in ASCII range 128-255
+    - :attr:`alphas`
+    - :attr:`nums`
+    - :attr:`alphanums`
+    - :attr:`hexnums`
+    - :attr:`alphas8bit` (alphabetic characters in ASCII range 128-255
       - accented, tilded, umlauted, etc.)
-    - :class:`punc8bit` (non-alphabetic characters in ASCII range
+    - :attr:`punc8bit` (non-alphabetic characters in ASCII range
       128-255 - currency, symbols, superscripts, diacriticals, etc.)
-    - :class:`printables` (any non-whitespace character)
+    - :attr:`printables` (any non-whitespace character)
 
     ``alphas``, ``nums``, and ``printables`` are also defined in several
-    Unicode sets - see :class:`pyparsing_unicode``.
+    Unicode sets - see :class:`pyparsing_unicode`.
+
+    Example:
 
-    Example::
+    .. testcode::
 
         # a word composed of digits
-        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
+        integer = Word(nums)
+        # Two equivalent alternate forms:
+        Word("0123456789")
+        Word(srange("[0-9]"))
 
         # a word with a leading capital, and zero or more lowercase
         capitalized_word = Word(alphas.upper(), alphas.lower())
@@ -2777,11 +3150,18 @@ class Word(Token):
         # hostnames are alphanumeric, with leading alpha, and '-'
         hostname = Word(alphas, alphanums + '-')
 
-        # roman numeral (not a strict parser, accepts invalid mix of characters)
+        # roman numeral
+        # (not a strict parser, accepts invalid mix of characters)
         roman = Word("IVXLCDM")
 
         # any string of non-whitespace characters, except for ','
         csv_value = Word(printables, exclude_chars=",")
+
+    :raises ValueError: If ``min`` and ``max`` are both specified
+                        and the test ``min <= max`` fails.
+
+    .. versionchanged:: 3.1.0
+       Raises :exc:`ValueError` if ``min`` > ``max``.
     """
 
     def __init__(
@@ -2793,12 +3173,15 @@ def __init__(
         exact: int = 0,
         as_keyword: bool = False,
         exclude_chars: typing.Optional[str] = None,
-        *,
-        initChars: typing.Optional[str] = None,
-        bodyChars: typing.Optional[str] = None,
-        asKeyword: bool = False,
-        excludeChars: typing.Optional[str] = None,
-    ):
+        **kwargs,
+    ) -> None:
+        initChars: typing.Optional[str] = deprecate_argument(kwargs, "initChars", None)
+        bodyChars: typing.Optional[str] = deprecate_argument(kwargs, "bodyChars", None)
+        asKeyword: bool = deprecate_argument(kwargs, "asKeyword", False)
+        excludeChars: typing.Optional[str] = deprecate_argument(
+            kwargs, "excludeChars", None
+        )
+
         initChars = initChars or init_chars
         bodyChars = bodyChars or body_chars
         asKeyword = asKeyword or as_keyword
@@ -2815,7 +3198,7 @@ def __init__(
             initChars_set -= excludeChars_set
             if bodyChars:
                 bodyChars = "".join(set(bodyChars) - excludeChars_set)
-        self.initChars = initChars_set
+        self.init_chars = initChars_set
         self.initCharsOrig = "".join(sorted(initChars_set))
 
         if bodyChars:
@@ -2900,7 +3283,31 @@ def __init__(
                 self.re = None  # type: ignore[assignment]
             else:
                 self.re_match = self.re.match
-                self.parseImpl = self.parseImpl_regex  # type: ignore[assignment]
+                self.parseImpl = self.parseImpl_regex  # type: ignore[method-assign]
+
+    @property
+    def initChars(self) -> set[str]:
+        """
+        .. deprecated:: 3.3.0
+           use `init_chars` instead.
+
+        Property returning the initial chars to be used when matching this
+        Word expression. If no body chars were specified, the initial characters
+        will also be the body characters.
+        """
+        return set(self.init_chars)
+
+    def copy(self) -> Word:
+        """
+        Returns a copy of this expression.
+
+        Generally only used internally by pyparsing.
+        """
+        ret: Word = cast(Word, super().copy())
+        if hasattr(self, "re_match"):
+            ret.re_match = self.re_match
+            ret.parseImpl = ret.parseImpl_regex  # type: ignore[method-assign]
+        return ret
 
     def _generateDefaultName(self) -> str:
         def charsAsStr(s):
@@ -2965,7 +3372,7 @@ def parseImpl_regex(self, instring, loc, do_actions=True) -> ParseImplReturnType
             raise ParseException(instring, loc, self.errmsg, self)
 
         loc = result.end()
-        return loc, result.group()
+        return loc, result[0]
 
 
 class Char(Word):
@@ -2979,10 +3386,13 @@ def __init__(
         charset: str,
         as_keyword: bool = False,
         exclude_chars: typing.Optional[str] = None,
-        *,
-        asKeyword: bool = False,
-        excludeChars: typing.Optional[str] = None,
-    ):
+        **kwargs,
+    ) -> None:
+        asKeyword: bool = deprecate_argument(kwargs, "asKeyword", False)
+        excludeChars: typing.Optional[str] = deprecate_argument(
+            kwargs, "excludeChars", None
+        )
+
         asKeyword = asKeyword or as_keyword
         excludeChars = excludeChars or exclude_chars
         super().__init__(
@@ -3001,7 +3411,14 @@ class Regex(Token):
     (such as the ``regex`` module), you can do so by building your ``Regex`` object with
     a compiled RE that was compiled using ``regex``.
 
-    Example::
+    The parameters ``pattern`` and ``flags`` are passed
+    to the ``re.compile()`` function as-is. See the Python
+    `re module <https://docs.python.org/3/library/re.html>`_ module for an
+    explanation of the acceptable patterns and flags.
+
+    Example:
+
+    .. testcode::
 
         realnum = Regex(r"[+-]?\d+\.\d*")
         # ref: https://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
@@ -3010,9 +3427,10 @@ class Regex(Token):
         # named fields in a regex will be returned as named results
         date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d?)-(?P<day>\d\d?)')
 
-        # the Regex class will accept re's compiled using the regex module
-        import regex
-        parser = pp.Regex(regex.compile(r'[0-9]'))
+        # the Regex class will accept regular expressions compiled using the
+        # re module
+        import re
+        parser = pp.Regex(re.compile(r'[0-9]'))
     """
 
     def __init__(
@@ -3021,16 +3439,12 @@ def __init__(
         flags: Union[re.RegexFlag, int] = 0,
         as_group_list: bool = False,
         as_match: bool = False,
-        *,
-        asGroupList: bool = False,
-        asMatch: bool = False,
-    ):
-        """The parameters ``pattern`` and ``flags`` are passed
-        to the ``re.compile()`` function as-is. See the Python
-        `re module <https://docs.python.org/3/library/re.html>`_ module for an
-        explanation of the acceptable patterns and flags.
-        """
+        **kwargs,
+    ) -> None:
         super().__init__()
+        asGroupList: bool = deprecate_argument(kwargs, "asGroupList", False)
+        asMatch: bool = deprecate_argument(kwargs, "asMatch", False)
+
         asGroupList = asGroupList or as_group_list
         asMatch = asMatch or as_match
 
@@ -3039,57 +3453,110 @@ def __init__(
                 raise ValueError("null string passed to Regex; use Empty() instead")
 
             self._re = None
+            self._may_return_empty = None  # type: ignore [assignment]
             self.reString = self.pattern = pattern
-            self.flags = flags
 
         elif hasattr(pattern, "pattern") and hasattr(pattern, "match"):
             self._re = pattern
+            self._may_return_empty = None  # type: ignore [assignment]
             self.pattern = self.reString = pattern.pattern
-            self.flags = flags
+
+        elif callable(pattern):
+            # defer creating this pattern until we really need it
+            self.pattern = pattern
+            self._may_return_empty = None  # type: ignore [assignment]
+            self._re = None
 
         else:
             raise TypeError(
-                "Regex may only be constructed with a string or a compiled RE object"
+                "Regex may only be constructed with a string or a compiled RE object,"
+                " or a callable that takes no arguments and returns a string or a"
+                " compiled RE object"
             )
 
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.asGroupList = asGroupList
-        self.asMatch = asMatch
+        self.flags = flags
+        self.errmsg = f"Expected {self.name}"
+        self.mayIndexError = False
+        self.asGroupList = asGroupList
+        self.asMatch = asMatch
+        if self.asGroupList:
+            self.parseImpl = self.parseImplAsGroupList  # type: ignore [method-assign]
+        if self.asMatch:
+            self.parseImpl = self.parseImplAsMatch  # type: ignore [method-assign]
+
+    def copy(self) -> Regex:
+        """
+        Returns a copy of this expression.
+
+        Generally only used internally by pyparsing.
+        """
+        ret: Regex = cast(Regex, super().copy())
         if self.asGroupList:
-            self.parseImpl = self.parseImplAsGroupList  # type: ignore [assignment]
+            ret.parseImpl = ret.parseImplAsGroupList  # type: ignore [method-assign]
         if self.asMatch:
-            self.parseImpl = self.parseImplAsMatch  # type: ignore [assignment]
+            ret.parseImpl = ret.parseImplAsMatch  # type: ignore [method-assign]
+        return ret
 
     @cached_property
-    def re(self) -> _RePattern:
+    def re(self) -> re.Pattern:
+        """
+        Property returning the compiled regular expression for this Regex.
+
+        Generally only used internally by pyparsing.
+        """
         if self._re:
             return self._re
 
+        if callable(self.pattern):
+            # replace self.pattern with the string returned by calling self.pattern()
+            self.pattern = cast(Callable[[], str], self.pattern)()
+
+            # see if we got a compiled RE back instead of a str - if so, we're done
+            if hasattr(self.pattern, "pattern") and hasattr(self.pattern, "match"):
+                self._re = cast(re.Pattern[str], self.pattern)
+                self.pattern = self.reString = self._re.pattern
+                return self._re
+
         try:
-            return re.compile(self.pattern, self.flags)
+            self._re = re.compile(self.pattern, self.flags)
         except re.error:
             raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
+        else:
+            self._may_return_empty = self.re.match("", pos=0) is not None
+            return self._re
 
     @cached_property
-    def re_match(self) -> Callable[[str], Any]:
+    def re_match(self) -> Callable[[str, int], Any]:
         return self.re.match
 
-    @cached_property
-    def mayReturnEmpty(self) -> bool:
-        return self.re_match("") is not None
+    @property
+    def mayReturnEmpty(self):
+        if self._may_return_empty is None:
+            # force compile of regex pattern, to set may_return_empty flag
+            self.re  # noqa
+        return self._may_return_empty
+
+    @mayReturnEmpty.setter
+    def mayReturnEmpty(self, value):
+        self._may_return_empty = value
 
     def _generateDefaultName(self) -> str:
-        unescaped = self.pattern.replace("\\\\", "\\")
-        return f"Re:({unescaped!r})"
+        unescaped = repr(self.pattern).replace("\\\\", "\\")
+        return f"Re:({unescaped})"
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
+        # explicit check for matching past the length of the string;
+        # this is done because the re module will not complain about
+        # a match with `pos > len(instring)`, it will just return ""
+        if loc > len(instring) and self.mayReturnEmpty:
+            raise ParseException(instring, loc, self.errmsg, self)
+
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
 
         loc = result.end()
-        ret = ParseResults(result.group())
+        ret = ParseResults(result[0])
         d = result.groupdict()
 
         for k, v in d.items():
@@ -3098,6 +3565,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         return loc, ret
 
     def parseImplAsGroupList(self, instring, loc, do_actions=True):
+        if loc > len(instring) and self.mayReturnEmpty:
+            raise ParseException(instring, loc, self.errmsg, self)
+
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3107,6 +3577,9 @@ def parseImplAsGroupList(self, instring, loc, do_actions=True):
         return loc, ret
 
     def parseImplAsMatch(self, instring, loc, do_actions=True):
+        if loc > len(instring) and self.mayReturnEmpty:
+            raise ParseException(instring, loc, self.errmsg, self)
+
         result = self.re_match(instring, loc)
         if not result:
             raise ParseException(instring, loc, self.errmsg, self)
@@ -3120,11 +3593,16 @@ def sub(self, repl: str) -> ParserElement:
         Return :class:`Regex` with an attached parse action to transform the parsed
         result as if called using `re.sub(expr, repl, string) <https://docs.python.org/3/library/re.html#re.sub>`_.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             make_html = Regex(r"(\w+):(.*?):").sub(r"<\1>\2</\1>")
             print(make_html.transform_string("h1:main title:"))
-            # prints "<h1>main title</h1>"
+
+        .. testoutput::
+
+            <h1>main title</h1>
         """
         if self.asGroupList:
             raise TypeError("cannot use sub() with Regex(as_group_list=True)")
@@ -3171,19 +3649,23 @@ class QuotedString(Token):
       (``'\t'``, ``'\n'``, etc.) to actual whitespace
       (default= ``True``)
 
-    Example::
+    .. caution:: ``convert_whitespace_escapes`` has no effect if
+       ``unquote_results`` is ``False``.
 
-        qs = QuotedString('"')
-        print(qs.search_string('lsjdf "This is the quote" sldjf'))
-        complex_qs = QuotedString('{{', end_quote_char='}}')
-        print(complex_qs.search_string('lsjdf {{This is the "quote"}} sldjf'))
-        sql_qs = QuotedString('"', esc_quote='""')
-        print(sql_qs.search_string('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
+    Example:
 
-    prints::
+    .. doctest::
 
+        >>> qs = QuotedString('"')
+        >>> print(qs.search_string('lsjdf "This is the quote" sldjf'))
         [['This is the quote']]
+        >>> complex_qs = QuotedString('{{', end_quote_char='}}')
+        >>> print(complex_qs.search_string(
+        ...    'lsjdf {{This is the "quote"}} sldjf'))
         [['This is the "quote"']]
+        >>> sql_qs = QuotedString('"', esc_quote='""')
+        >>> print(sql_qs.search_string(
+        ...     'lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
         [['This is the quote with "embedded" quotes']]
     """
 
@@ -3198,15 +3680,20 @@ def __init__(
         unquote_results: bool = True,
         end_quote_char: typing.Optional[str] = None,
         convert_whitespace_escapes: bool = True,
-        *,
-        quoteChar: str = "",
-        escChar: typing.Optional[str] = None,
-        escQuote: typing.Optional[str] = None,
-        unquoteResults: bool = True,
-        endQuoteChar: typing.Optional[str] = None,
-        convertWhitespaceEscapes: bool = True,
-    ):
+        **kwargs,
+    ) -> None:
         super().__init__()
+        quoteChar: str = deprecate_argument(kwargs, "quoteChar", "")
+        escChar: str = deprecate_argument(kwargs, "escChar", None)
+        escQuote: str = deprecate_argument(kwargs, "escQuote", None)
+        unquoteResults: bool = deprecate_argument(kwargs, "unquoteResults", True)
+        endQuoteChar: typing.Optional[str] = deprecate_argument(
+            kwargs, "endQuoteChar", None
+        )
+        convertWhitespaceEscapes: bool = deprecate_argument(
+            kwargs, "convertWhitespaceEscapes", True
+        )
+
         esc_char = escChar or esc_char
         esc_quote = escQuote or esc_quote
         unquote_results = unquoteResults and unquote_results
@@ -3243,7 +3730,7 @@ def __init__(
 
         # fmt: off
         # build up re pattern for the content between the quote delimiters
-        inner_pattern: List[str] = []
+        inner_pattern: list[str] = []
 
         if esc_quote:
             inner_pattern.append(rf"(?:{re.escape(esc_quote)})")
@@ -3287,6 +3774,7 @@ def __init__(
             if self.convert_whitespace_escapes:
                 self.unquote_scan_re = re.compile(
                     rf"({'|'.join(re.escape(k) for k in self.ws_map)})"
+                    rf"|(\\[0-7]{3}|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4})"
                     rf"|({re.escape(self.esc_char)}.)"
                     rf"|(\n|.)",
                     flags=self.re_flags,
@@ -3308,7 +3796,7 @@ def __init__(
 
         self.errmsg = f"Expected {self.name}"
         self.mayIndexError = False
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
 
     def _generateDefaultName(self) -> str:
         if self.quote_char == self.end_quote_char and isinstance(
@@ -3331,7 +3819,7 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
 
         # get ending loc and matched string from regex matching result
         loc = result.end()
-        ret = result.group()
+        ret = result[0]
 
         if self.unquote_results:
             # strip off quotes
@@ -3345,19 +3833,22 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
                     # regex matches (only 1 group will match at any given time)
                     ret = "".join(
                         # match group 1 matches \t, \n, etc.
-                        self.ws_map[match.group(1)] if match.group(1)
-                        # match group 2 matches escaped characters
-                        else match.group(2)[-1] if match.group(2)
-                        # match group 3 matches any character
-                        else match.group(3)
+                        self.ws_map[g] if (g := match[1])
+                        # match group 2 matches escaped octal, null, hex, and Unicode
+                        # sequences
+                        else _convert_escaped_numerics_to_char(g[1:]) if (g := match[2])
+                        # match group 3 matches escaped characters
+                        else g[-1] if (g := match[3])
+                        # match group 4 matches any character
+                        else match[4]
                         for match in self.unquote_scan_re.finditer(ret)
                     )
                 else:
                     ret = "".join(
                         # match group 1 matches escaped characters
-                        match.group(1)[-1] if match.group(1)
+                        g[-1] if (g := match[1])
                         # match group 2 matches any character
-                        else match.group(2)
+                        else match[2]
                         for match in self.unquote_scan_re.finditer(ret)
                     )
                 # fmt: on
@@ -3379,27 +3870,31 @@ class CharsNotIn(Token):
     ``max`` and ``exact`` are 0, meaning no maximum or exact
     length restriction.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         # define a comma-separated-value as anything that is not a ','
         csv_value = CharsNotIn(',')
-        print(DelimitedList(csv_value).parse_string("dkls,lsdkjf,s12 34,@!#,213"))
+        print(
+            DelimitedList(csv_value).parse_string(
+                "dkls,lsdkjf,s12 34,@!#,213"
+            )
+        )
 
-    prints::
+    prints:
+
+    .. testoutput::
 
         ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
     """
 
     def __init__(
-        self,
-        not_chars: str = "",
-        min: int = 1,
-        max: int = 0,
-        exact: int = 0,
-        *,
-        notChars: str = "",
-    ):
+        self, not_chars: str = "", min: int = 1, max: int = 0, exact: int = 0, **kwargs
+    ) -> None:
         super().__init__()
+        notChars: str = deprecate_argument(kwargs, "notChars", "")
+
         self.skipWhitespace = False
         self.notChars = not_chars or notChars
         self.notCharsSet = set(self.notChars)
@@ -3422,7 +3917,7 @@ def __init__(
             self.minLen = exact
 
         self.errmsg = f"Expected {self.name}"
-        self.mayReturnEmpty = self.minLen == 0
+        self._may_return_empty = self.minLen == 0
         self.mayIndexError = False
 
     def _generateDefaultName(self) -> str:
@@ -3465,9 +3960,9 @@ class White(Token):
         "\n": "<LF>",
         "\r": "<CR>",
         "\f": "<FF>",
-        "\u00A0": "<NBSP>",
+        "\u00a0": "<NBSP>",
         "\u1680": "<OGHAM_SPACE_MARK>",
-        "\u180E": "<MONGOLIAN_VOWEL_SEPARATOR>",
+        "\u180e": "<MONGOLIAN_VOWEL_SEPARATOR>",
         "\u2000": "<EN_QUAD>",
         "\u2001": "<EM_QUAD>",
         "\u2002": "<EN_SPACE>",
@@ -3478,14 +3973,16 @@ class White(Token):
         "\u2007": "<FIGURE_SPACE>",
         "\u2008": "<PUNCTUATION_SPACE>",
         "\u2009": "<THIN_SPACE>",
-        "\u200A": "<HAIR_SPACE>",
-        "\u200B": "<ZERO_WIDTH_SPACE>",
-        "\u202F": "<NNBSP>",
-        "\u205F": "<MMSP>",
+        "\u200a": "<HAIR_SPACE>",
+        "\u200b": "<ZERO_WIDTH_SPACE>",
+        "\u202f": "<NNBSP>",
+        "\u205f": "<MMSP>",
         "\u3000": "<IDEOGRAPHIC_SPACE>",
     }
 
-    def __init__(self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int = 0):
+    def __init__(
+        self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int = 0
+    ) -> None:
         super().__init__()
         self.matchWhite = ws
         self.set_whitespace_chars(
@@ -3493,7 +3990,7 @@ def __init__(self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int =
             copy_defaults=True,
         )
         # self.leave_whitespace()
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.errmsg = f"Expected {self.name}"
 
         self.minLen = min
@@ -3527,9 +4024,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
 
 
 class PositionToken(Token):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.mayIndexError = False
 
 
@@ -3538,7 +4035,7 @@ class GoToColumn(PositionToken):
     tabular report scraping.
     """
 
-    def __init__(self, colno: int):
+    def __init__(self, colno: int) -> None:
         super().__init__()
         self.col = colno
 
@@ -3568,29 +4065,34 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
 
 
 class LineStart(PositionToken):
-    r"""Matches if current position is at the beginning of a line within
-    the parse string
+    r"""Matches if current position is at the logical beginning of a line (after skipping whitespace)
+    within the parse string
+
+    Example:
 
-    Example::
+    .. testcode::
 
         test = '''\
         AAA this line
         AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
+          AAA and even this line
+        B AAA but definitely not this line
         '''
 
         for t in (LineStart() + 'AAA' + rest_of_line).search_string(test):
             print(t)
 
-    prints::
+    prints:
+
+    .. testoutput::
 
         ['AAA', ' this line']
         ['AAA', ' and this line']
+        ['AAA', ' and even this line']
 
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.leave_whitespace()
         self.orig_whiteChars = set() | self.whiteChars
@@ -3621,7 +4123,7 @@ class LineEnd(PositionToken):
     parse string
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.whiteChars.discard("\n")
         self.set_whitespace_chars(self.whiteChars, copy_defaults=False)
@@ -3644,7 +4146,7 @@ class StringStart(PositionToken):
     string
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.set_name("start of text")
 
@@ -3661,7 +4163,7 @@ class StringEnd(PositionToken):
     Matches if current position is at the end of the parse string
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.set_name("end of text")
 
@@ -3686,7 +4188,9 @@ class WordStart(PositionToken):
     a line.
     """
 
-    def __init__(self, word_chars: str = printables, *, wordChars: str = printables):
+    def __init__(self, word_chars: str = printables, **kwargs) -> None:
+        wordChars: str = deprecate_argument(kwargs, "wordChars", printables)
+
         wordChars = word_chars if wordChars == printables else wordChars
         super().__init__()
         self.wordChars = set(wordChars)
@@ -3711,7 +4215,9 @@ class WordEnd(PositionToken):
     of a line.
     """
 
-    def __init__(self, word_chars: str = printables, *, wordChars: str = printables):
+    def __init__(self, word_chars: str = printables, **kwargs) -> None:
+        wordChars: str = deprecate_argument(kwargs, "wordChars", printables)
+
         wordChars = word_chars if wordChars == printables else wordChars
         super().__init__()
         self.wordChars = set(wordChars)
@@ -3736,32 +4242,34 @@ class Tag(Token):
     processing the parsed results. Accepts an optional tag value,
     defaulting to `True`.
 
-    Example::
-
-        end_punc = "." | ("!" + Tag("enthusiastic")))
-        greeting = "Hello," + Word(alphas) + end_punc
-
-        result = greeting.parse_string("Hello, World.")
-        print(result.dump())
+    Example:
 
-        result = greeting.parse_string("Hello, World!")
-        print(result.dump())
+    .. doctest::
 
-    prints::
+        >>> end_punc = "." | ("!" + Tag("enthusiastic"))
+        >>> greeting = "Hello," + Word(alphas) + end_punc
 
+        >>> result = greeting.parse_string("Hello, World.")
+        >>> print(result.dump())
         ['Hello,', 'World', '.']
 
+        >>> result = greeting.parse_string("Hello, World!")
+        >>> print(result.dump())
         ['Hello,', 'World', '!']
         - enthusiastic: True
+
+        .. versionadded:: 3.1.0
     """
-    def __init__(self, tag_name: str, value: Any = True):
+
+    def __init__(self, tag_name: str, value: Any = True) -> None:
         super().__init__()
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.mayIndexError = False
         self.leave_whitespace()
         self.tag_name = tag_name
         self.tag_value = value
         self.add_parse_action(self._add_tag)
+        self.show_in_diagram = False
 
     def _add_tag(self, tokens: ParseResults):
         tokens[self.tag_name] = self.tag_value
@@ -3775,9 +4283,11 @@ class ParseExpression(ParserElement):
     post-processing parsed tokens.
     """
 
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
+    def __init__(
+        self, exprs: typing.Iterable[ParserElement], savelist: bool = False
+    ) -> None:
         super().__init__(savelist)
-        self.exprs: List[ParserElement]
+        self.exprs: list[ParserElement]
         if isinstance(exprs, _generatorType):
             exprs = list(exprs)
 
@@ -3801,10 +4311,13 @@ def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False
                 self.exprs = [exprs]
         self.callPreparse = False
 
-    def recurse(self) -> List[ParserElement]:
+    def recurse(self) -> list[ParserElement]:
         return self.exprs[:]
 
     def append(self, other) -> ParserElement:
+        """
+        Add an expression to the list of expressions related to this ParseExpression instance.
+        """
         self.exprs.append(other)
         self._defaultName = None
         return self
@@ -3824,7 +4337,7 @@ def leave_whitespace(self, recursive: bool = True) -> ParserElement:
 
     def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
         """
-        Extends ``ignore_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
+        Extends ``ignore_whitespace`` defined in base class, and also invokes ``ignore_whitespace`` on
            all contained expressions.
         """
         super().ignore_whitespace(recursive)
@@ -3835,6 +4348,11 @@ def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
         return self
 
     def ignore(self, other) -> ParserElement:
+        """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        """
         if isinstance(other, Suppress):
             if other not in self.ignoreExprs:
                 super().ignore(other)
@@ -3871,7 +4389,7 @@ def streamline(self) -> ParserElement:
             ):
                 self.exprs = other.exprs[:] + [self.exprs[1]]
                 self._defaultName = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
+                self._may_return_empty |= other.mayReturnEmpty
                 self.mayIndexError |= other.mayIndexError
 
             other = self.exprs[-1]
@@ -3883,7 +4401,7 @@ def streamline(self) -> ParserElement:
             ):
                 self.exprs = self.exprs[:-1] + other.exprs[:]
                 self._defaultName = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
+                self._may_return_empty |= other.mayReturnEmpty
                 self.mayIndexError |= other.mayIndexError
 
         self.errmsg = f"Expected {self}"
@@ -3893,7 +4411,7 @@ def streamline(self) -> ParserElement:
     def validate(self, validateTrace=None) -> None:
         warnings.warn(
             "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
+            PyparsingDeprecationWarning,
             stacklevel=2,
         )
         tmp = (validateTrace if validateTrace is not None else [])[:] + [self]
@@ -3902,6 +4420,11 @@ def validate(self, validateTrace=None) -> None:
         self._checkRecursion([])
 
     def copy(self) -> ParserElement:
+        """
+        Returns a copy of this expression.
+
+        Generally only used internally by pyparsing.
+        """
         ret = super().copy()
         ret = typing.cast(ParseExpression, ret)
         ret.exprs = [e.copy() for e in self.exprs]
@@ -3929,7 +4452,7 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
                     f" setting results name {name!r} on {type(self).__name__} expression"
                     f" collides with {e.resultsName!r} on contained expression"
                 )
-                warnings.warn(warning, stacklevel=3)
+                warnings.warn(warning, PyparsingDiagnosticWarning, stacklevel=3)
                 break
 
         return super()._setResultsName(name, list_all_matches)
@@ -3943,13 +4466,15 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
 
 class And(ParseExpression):
     """
-    Requires all given :class:`ParseExpression` s to be found in the given order.
+    Requires all given :class:`ParserElement` s to be found in the given order.
     Expressions may be separated by whitespace.
     May be constructed using the ``'+'`` operator.
     May also be constructed using the ``'-'`` operator, which will
     suppress backtracking.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         integer = Word(nums)
         name_expr = Word(alphas)[1, ...]
@@ -3960,7 +4485,7 @@ class And(ParseExpression):
     """
 
     class _ErrorStop(Empty):
-        def __init__(self, *args, **kwargs):
+        def __init__(self, *args, **kwargs) -> None:
             super().__init__(*args, **kwargs)
             self.leave_whitespace()
 
@@ -3968,28 +4493,34 @@ def _generateDefaultName(self) -> str:
             return "-"
 
     def __init__(
-        self, exprs_arg: typing.Iterable[ParserElement], savelist: bool = True
-    ):
-        exprs: List[ParserElement] = list(exprs_arg)
-        if exprs and Ellipsis in exprs:
-            tmp: List[ParserElement] = []
-            for i, expr in enumerate(exprs):
-                if expr is not Ellipsis:
-                    tmp.append(expr)
-                    continue
+        self,
+        exprs_arg: typing.Iterable[Union[ParserElement, str]],
+        savelist: bool = True,
+    ) -> None:
+        # instantiate exprs as a list, converting strs to ParserElements
+        exprs: list[ParserElement] = [
+            self._literalStringClass(e) if isinstance(e, str) else e for e in exprs_arg
+        ]
 
-                if i < len(exprs) - 1:
-                    skipto_arg: ParserElement = typing.cast(
-                        ParseExpression, (Empty() + exprs[i + 1])
-                    ).exprs[-1]
-                    tmp.append(SkipTo(skipto_arg)("_skipped*"))
-                    continue
+        # convert any Ellipsis elements to SkipTo
+        if Ellipsis in exprs:
 
+            # Ellipsis cannot be the last element
+            if exprs[-1] is Ellipsis:
                 raise Exception("cannot construct And with sequence ending in ...")
-            exprs[:] = tmp
+
+            tmp: list[ParserElement] = []
+            for cur_expr, next_expr in zip(exprs, exprs[1:]):
+                if cur_expr is Ellipsis:
+                    tmp.append(SkipTo(next_expr)("_skipped*"))
+                else:
+                    tmp.append(cur_expr)
+
+            exprs[:-1] = tmp
+
         super().__init__(exprs, savelist)
         if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = all(e.mayReturnEmpty for e in self.exprs)
             if not isinstance(self.exprs[0], White):
                 self.set_whitespace_chars(
                     self.exprs[0].whiteChars,
@@ -3999,10 +4530,29 @@ def __init__(
             else:
                 self.skipWhitespace = False
         else:
-            self.mayReturnEmpty = True
+            self._may_return_empty = True
         self.callPreparse = True
 
     def streamline(self) -> ParserElement:
+        """
+        Collapse `And` expressions  like `And(And(And(A, B), C), D)`
+        to `And(A, B, C, D)`.
+
+        .. doctest::
+
+            >>> expr = Word("A") + Word("B") + Word("C") + Word("D")
+            >>> # Using '+' operator creates nested And expression
+            >>> expr
+            {{{W:(A) W:(B)} W:(C)} W:(D)}
+            >>> # streamline simplifies to a single And with multiple expressions
+            >>> expr.streamline()
+            {W:(A) W:(B) W:(C) W:(D)}
+
+        Guards against collapsing out expressions that have special features,
+        such as results names or parse actions.
+
+        Resolves pending Skip commands defined using `...` terms.
+        """
         # collapse any _PendingSkip's
         if self.exprs and any(
             isinstance(e, ParseExpression)
@@ -4049,7 +4599,7 @@ def streamline(self) -> ParserElement:
                     break
                 cur = typing.cast(ParserElement, next_first)
 
-        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+        self._may_return_empty = all(e.mayReturnEmpty for e in self.exprs)
         return self
 
     def parseImpl(self, instring, loc, do_actions=True):
@@ -4104,35 +4654,41 @@ def _generateDefaultName(self) -> str:
 
 
 class Or(ParseExpression):
-    """Requires that at least one :class:`ParseExpression` is found. If
+    """Requires that at least one :class:`ParserElement` is found. If
     two expressions match, the expression that matches the longest
     string will be used. May be constructed using the ``'^'``
     operator.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         # construct Or using '^' operator
 
         number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
         print(number.search_string("123 3.1416 789"))
 
-    prints::
+    prints:
+
+    .. testoutput::
 
         [['123'], ['3.1416'], ['789']]
     """
 
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
+    def __init__(
+        self, exprs: typing.Iterable[ParserElement], savelist: bool = False
+    ) -> None:
         super().__init__(exprs, savelist)
         if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = any(e.mayReturnEmpty for e in self.exprs)
             self.skipWhitespace = all(e.skipWhitespace for e in self.exprs)
         else:
-            self.mayReturnEmpty = True
+            self._may_return_empty = True
 
     def streamline(self) -> ParserElement:
         super().streamline()
         if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = any(e.mayReturnEmpty for e in self.exprs)
             self.saveAsList = any(e.saveAsList for e in self.exprs)
             self.skipWhitespace = all(
                 e.skipWhitespace and not isinstance(e, White) for e in self.exprs
@@ -4144,8 +4700,8 @@ def streamline(self) -> ParserElement:
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         maxExcLoc = -1
         maxException = None
-        matches: List[Tuple[int, ParserElement]] = []
-        fatals: List[ParseFatalException] = []
+        matches: list[tuple[int, ParserElement]] = []
+        fatals: list[ParseFatalException] = []
         if all(e.callPreparse for e in self.exprs):
             loc = self.preParse(instring, loc)
         for e in self.exprs:
@@ -4184,7 +4740,7 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
                 best_expr = matches[0][1]
                 return best_expr._parse(instring, loc, do_actions)
 
-            longest = -1, None
+            longest: tuple[int, typing.Optional[ParseResults]] = -1, None
             for loc1, expr1 in matches:
                 if loc1 <= longest[0]:
                     # already have a longer match than this one will deliver, we are done
@@ -4218,8 +4774,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if maxException is not None:
             # infer from this check that all alternatives failed at the current position
             # so emit this collective error message instead of any single error message
-            if maxExcLoc == loc:
-                maxException.msg = self.errmsg
+            parse_start_loc = self.preParse(instring, loc)
+            if maxExcLoc == parse_start_loc:
+                maxException.msg = self.errmsg or ""
             raise maxException
 
         raise ParseException(instring, loc, "no defined alternatives to match", self)
@@ -4253,36 +4810,40 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
                     " in prior versions only the first token was returned; enclose"
                     " contained argument in Group"
                 )
-                warnings.warn(warning, stacklevel=3)
+                warnings.warn(warning, PyparsingDiagnosticWarning, stacklevel=3)
 
         return super()._setResultsName(name, list_all_matches)
 
 
 class MatchFirst(ParseExpression):
-    """Requires that at least one :class:`ParseExpression` is found. If
+    """Requires that at least one :class:`ParserElement` is found. If
     more than one expression matches, the first one listed is the one that will
     match. May be constructed using the ``'|'`` operator.
 
-    Example::
+    Example: Construct MatchFirst using '|' operator
 
-        # construct MatchFirst using '|' operator
+    .. doctest::
 
         # watch the order of expressions to match
-        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
-        print(number.search_string("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
+        >>> number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
+        >>> print(number.search_string("123 3.1416 789"))  # Fail!
+        [['123'], ['3'], ['1416'], ['789']]
 
         # put more selective expression first
-        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
-        print(number.search_string("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
+        >>> number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
+        >>> print(number.search_string("123 3.1416 789"))  # Better
+        [['123'], ['3.1416'], ['789']]
     """
 
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
+    def __init__(
+        self, exprs: typing.Iterable[ParserElement], savelist: bool = False
+    ) -> None:
         super().__init__(exprs, savelist)
         if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = any(e.mayReturnEmpty for e in self.exprs)
             self.skipWhitespace = all(e.skipWhitespace for e in self.exprs)
         else:
-            self.mayReturnEmpty = True
+            self._may_return_empty = True
 
     def streamline(self) -> ParserElement:
         if self.streamlined:
@@ -4291,13 +4852,13 @@ def streamline(self) -> ParserElement:
         super().streamline()
         if self.exprs:
             self.saveAsList = any(e.saveAsList for e in self.exprs)
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = any(e.mayReturnEmpty for e in self.exprs)
             self.skipWhitespace = all(
                 e.skipWhitespace and not isinstance(e, White) for e in self.exprs
             )
         else:
             self.saveAsList = False
-            self.mayReturnEmpty = True
+            self._may_return_empty = True
         return self
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
@@ -4325,8 +4886,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if maxException is not None:
             # infer from this check that all alternatives failed at the current position
             # so emit this collective error message instead of any individual error message
-            if maxExcLoc == loc:
-                maxException.msg = self.errmsg
+            parse_start_loc = self.preParse(instring, loc)
+            if maxExcLoc == parse_start_loc:
+                maxException.msg = self.errmsg or ""
             raise maxException
 
         raise ParseException(instring, loc, "no defined alternatives to match", self)
@@ -4360,18 +4922,20 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
                     " in prior versions only the first token was returned; enclose"
                     " contained argument in Group"
                 )
-                warnings.warn(warning, stacklevel=3)
+                warnings.warn(warning, PyparsingDiagnosticWarning, stacklevel=3)
 
         return super()._setResultsName(name, list_all_matches)
 
 
 class Each(ParseExpression):
-    """Requires all given :class:`ParseExpression` s to be found, but in
+    """Requires all given :class:`ParserElement` s to be found, but in
     any order. Expressions may be separated by whitespace.
 
     May be constructed using the ``'&'`` operator.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         color = one_of("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
         shape_type = one_of("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
@@ -4392,43 +4956,52 @@ class Each(ParseExpression):
             '''
             )
 
-    prints::
+    prints:
+
+    .. testoutput::
+        :options: +NORMALIZE_WHITESPACE
+
 
         shape: SQUARE color: BLACK posn: 100, 120
         ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
-        - color: BLACK
+        - color: 'BLACK'
         - posn: ['100', ',', '120']
-          - x: 100
-          - y: 120
-        - shape: SQUARE
-
+          - x: '100'
+          - y: '120'
+        - shape: 'SQUARE'
+        ...
 
         shape: CIRCLE size: 50 color: BLUE posn: 50,80
-        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
-        - color: BLUE
+        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE',
+        'posn:', ['50', ',', '80']]
+        - color: 'BLUE'
         - posn: ['50', ',', '80']
-          - x: 50
-          - y: 80
-        - shape: CIRCLE
-        - size: 50
-
+          - x: '50'
+          - y: '80'
+        - shape: 'CIRCLE'
+        - size: '50'
+        ...
 
-        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
-        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
-        - color: GREEN
+        color:GREEN size:20 shape:TRIANGLE posn:20,40
+        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE',
+        'posn:', ['20', ',', '40']]
+        - color: 'GREEN'
         - posn: ['20', ',', '40']
-          - x: 20
-          - y: 40
-        - shape: TRIANGLE
-        - size: 20
+          - x: '20'
+          - y: '40'
+        - shape: 'TRIANGLE'
+        - size: '20'
+        ...
     """
 
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = True):
+    def __init__(
+        self, exprs: typing.Iterable[ParserElement], savelist: bool = True
+    ) -> None:
         super().__init__(exprs, savelist)
         if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = all(e.mayReturnEmpty for e in self.exprs)
         else:
-            self.mayReturnEmpty = True
+            self._may_return_empty = True
         self.skipWhitespace = True
         self.initExprGroups = True
         self.saveAsList = True
@@ -4443,9 +5016,9 @@ def __iand__(self, other):
     def streamline(self) -> ParserElement:
         super().streamline()
         if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
+            self._may_return_empty = all(e.mayReturnEmpty for e in self.exprs)
         else:
-            self.mayReturnEmpty = True
+            self._may_return_empty = True
         return self
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
@@ -4480,11 +5053,11 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         tmpReqd = self.required[:]
         tmpOpt = self.optionals[:]
         multis = self.multioptionals[:]
-        matchOrder: List[ParserElement] = []
+        matchOrder: list[ParserElement] = []
 
         keepMatching = True
-        failed: List[ParserElement] = []
-        fatals: List[ParseFatalException] = []
+        failed: list[ParserElement] = []
+        fatals: list[ParseFatalException] = []
         while keepMatching:
             tmpExprs = tmpReqd + tmpOpt + multis
             failed.clear()
@@ -4544,7 +5117,7 @@ class ParseElementEnhance(ParserElement):
     post-processing parsed tokens.
     """
 
-    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
+    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False) -> None:
         super().__init__(savelist)
         if isinstance(expr, str_type):
             expr_str = typing.cast(str, expr)
@@ -4558,7 +5131,7 @@ def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
         self.expr = expr
         if expr is not None:
             self.mayIndexError = expr.mayIndexError
-            self.mayReturnEmpty = expr.mayReturnEmpty
+            self._may_return_empty = expr.mayReturnEmpty
             self.set_whitespace_chars(
                 expr.whiteChars, copy_defaults=expr.copyDefaultWhiteChars
             )
@@ -4567,7 +5140,7 @@ def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
             self.callPreparse = expr.callPreparse
             self.ignoreExprs.extend(expr.ignoreExprs)
 
-    def recurse(self) -> List[ParserElement]:
+    def recurse(self) -> list[ParserElement]:
         return [self.expr] if self.expr is not None else []
 
     def parseImpl(self, instring, loc, do_actions=True):
@@ -4579,12 +5152,19 @@ def parseImpl(self, instring, loc, do_actions=True):
         except ParseSyntaxException:
             raise
         except ParseBaseException as pbe:
-            if not isinstance(self, Forward) or self.customName is not None:
+            pbe.pstr = pbe.pstr or instring
+            pbe.loc = pbe.loc or loc
+            pbe.parser_element = pbe.parser_element or self
+            if not isinstance(self, Forward) and self.customName is not None:
                 if self.errmsg:
                     pbe.msg = self.errmsg
             raise
 
     def leave_whitespace(self, recursive: bool = True) -> ParserElement:
+        """
+        Extends ``leave_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
+           the contained expression.
+        """
         super().leave_whitespace(recursive)
 
         if recursive:
@@ -4594,6 +5174,10 @@ def leave_whitespace(self, recursive: bool = True) -> ParserElement:
         return self
 
     def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
+        """
+        Extends ``ignore_whitespace`` defined in base class, and also invokes ``ignore_whitespace`` on
+           the contained expression.
+        """
         super().ignore_whitespace(recursive)
 
         if recursive:
@@ -4603,6 +5187,11 @@ def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
         return self
 
     def ignore(self, other) -> ParserElement:
+        """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        """
         if not isinstance(other, Suppress) or other not in self.ignoreExprs:
             super().ignore(other)
             if self.expr is not None:
@@ -4626,7 +5215,7 @@ def _checkRecursion(self, parseElementList):
     def validate(self, validateTrace=None) -> None:
         warnings.warn(
             "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
+            PyparsingDeprecationWarning,
             stacklevel=2,
         )
         if validateTrace is None:
@@ -4650,23 +5239,84 @@ class IndentedBlock(ParseElementEnhance):
     """
     Expression to match one or more expressions at a given indentation level.
     Useful for parsing text where structure is implied by indentation (like Python source code).
+
+    Example:
+
+    .. testcode::
+
+        '''
+        BNF:
+        statement ::= assignment_stmt | if_stmt
+        assignment_stmt ::= identifier '=' rvalue
+        rvalue ::= identifier | integer
+        if_stmt ::= 'if' bool_condition block
+        block ::= ([indent] statement)...
+        identifier ::= [A..Za..z]
+        integer ::= [0..9]...
+        bool_condition ::= 'TRUE' | 'FALSE'
+        '''
+
+        IF, TRUE, FALSE = Keyword.using_each("IF TRUE FALSE".split())
+
+        statement = Forward()
+        identifier = Char(alphas)
+        integer = Word(nums).add_parse_action(lambda t: int(t[0]))
+        rvalue = identifier | integer
+        assignment_stmt = identifier + "=" + rvalue
+
+        if_stmt = IF + (TRUE | FALSE) + IndentedBlock(statement)
+
+        statement <<= Group(assignment_stmt | if_stmt)
+
+        result = if_stmt.parse_string('''
+            IF TRUE
+                a = 1000
+                b = 2000
+                IF FALSE
+                    z = 100
+        ''')
+        print(result.dump())
+
+    .. testoutput::
+
+        ['IF', 'TRUE', [['a', '=', 1000], ['b', '=', 2000], ['IF', 'FALSE', [['z', '=', 100]]]]]
+        [0]:
+          IF
+        [1]:
+          TRUE
+        [2]:
+          [['a', '=', 1000], ['b', '=', 2000], ['IF', 'FALSE', [['z', '=', 100]]]]
+          [0]:
+            ['a', '=', 1000]
+          [1]:
+            ['b', '=', 2000]
+          [2]:
+            ['IF', 'FALSE', [['z', '=', 100]]]
+            [0]:
+              IF
+            [1]:
+              FALSE
+            [2]:
+              [['z', '=', 100]]
+              [0]:
+                ['z', '=', 100]
     """
 
     class _Indent(Empty):
-        def __init__(self, ref_col: int):
+        def __init__(self, ref_col: int) -> None:
             super().__init__()
             self.errmsg = f"expected indent at column {ref_col}"
             self.add_condition(lambda s, l, t: col(l, s) == ref_col)
 
     class _IndentGreater(Empty):
-        def __init__(self, ref_col: int):
+        def __init__(self, ref_col: int) -> None:
             super().__init__()
             self.errmsg = f"expected indent at column greater than {ref_col}"
             self.add_condition(lambda s, l, t: col(l, s) > ref_col)
 
     def __init__(
         self, expr: ParserElement, *, recursive: bool = False, grouped: bool = True
-    ):
+    ) -> None:
         super().__init__(expr, savelist=True)
         # if recursive:
         #     raise NotImplementedError("IndentedBlock with recursive is not implemented")
@@ -4704,7 +5354,7 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         if self._grouped:
             wrapper = Group
         else:
-            wrapper = lambda expr: expr
+            wrapper = lambda expr: expr  # type: ignore[misc, assignment]
         return (wrapper(block) + Optional(trailing_undent)).parseImpl(
             instring, anchor_loc, do_actions
         )
@@ -4721,7 +5371,7 @@ class AtStringStart(ParseElementEnhance):
         # raises ParseException
     """
 
-    def __init__(self, expr: Union[ParserElement, str]):
+    def __init__(self, expr: Union[ParserElement, str]) -> None:
         super().__init__(expr)
         self.callPreparse = False
 
@@ -4735,26 +5385,29 @@ class AtLineStart(ParseElementEnhance):
     r"""Matches if an expression matches at the beginning of a line within
     the parse string
 
-    Example::
+    Example:
+
+    .. testcode::
 
         test = '''\
-        AAA this line
-        AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
+        BBB this line
+        BBB and this line
+          BBB but not this one
+        A BBB and definitely not this one
         '''
 
-        for t in (AtLineStart('AAA') + rest_of_line).search_string(test):
+        for t in (AtLineStart('BBB') + rest_of_line).search_string(test):
             print(t)
 
-    prints::
+    prints:
 
-        ['AAA', ' this line']
-        ['AAA', ' and this line']
+    .. testoutput::
 
+        ['BBB', ' this line']
+        ['BBB', ' and this line']
     """
 
-    def __init__(self, expr: Union[ParserElement, str]):
+    def __init__(self, expr: Union[ParserElement, str]) -> None:
         super().__init__(expr)
         self.callPreparse = False
 
@@ -4773,23 +5426,31 @@ class FollowedBy(ParseElementEnhance):
     in the lookahead expression, those *will* be returned for access by
     name.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         # use FollowedBy to match a label only if it is followed by a ':'
         data_word = Word(alphas)
         label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
+        attr_expr = Group(
+            label + Suppress(':')
+            + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join)
+        )
 
-        attr_expr[1, ...].parse_string("shape: SQUARE color: BLACK posn: upper left").pprint()
+        attr_expr[1, ...].parse_string(
+            "shape: SQUARE color: BLACK posn: upper left").pprint()
 
-    prints::
+    prints:
+
+    .. testoutput::
 
         [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
     """
 
-    def __init__(self, expr: Union[ParserElement, str]):
+    def __init__(self, expr: Union[ParserElement, str]) -> None:
         super().__init__(expr)
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         # by using self._expr.parse and deleting the contents of the returned ParseResults list
@@ -4822,20 +5483,19 @@ class PrecededBy(ParseElementEnhance):
     give a maximum number of characters to look back from
     the current parse position for a lookbehind match.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         # VB-style variable names with type prefixes
         int_var = PrecededBy("#") + pyparsing_common.identifier
         str_var = PrecededBy("$") + pyparsing_common.identifier
-
     """
 
-    def __init__(
-        self, expr: Union[ParserElement, str], retreat: typing.Optional[int] = None
-    ):
+    def __init__(self, expr: Union[ParserElement, str], retreat: int = 0) -> None:
         super().__init__(expr)
         self.expr = self.expr().leave_whitespace()
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.mayIndexError = False
         self.exact = False
         if isinstance(expr, str_type):
@@ -4859,7 +5519,7 @@ def __init__(
     def parseImpl(self, instring, loc=0, do_actions=True) -> ParseImplReturnType:
         if self.exact:
             if loc < self.retreat:
-                raise ParseException(instring, loc, self.errmsg)
+                raise ParseException(instring, loc, self.errmsg, self)
             start = loc - self.retreat
             _, ret = self.expr._parse(instring, start)
             return loc, ret
@@ -4867,7 +5527,7 @@ def parseImpl(self, instring, loc=0, do_actions=True) -> ParseImplReturnType:
         # retreat specified a maximum lookbehind window, iterate
         test_expr = self.expr + StringEnd()
         instring_slice = instring[max(0, loc - self.retreat) : loc]
-        last_expr = ParseException(instring, loc, self.errmsg)
+        last_expr: ParseBaseException = ParseException(instring, loc, self.errmsg, self)
 
         for offset in range(1, min(loc, self.retreat + 1) + 1):
             try:
@@ -4897,18 +5557,21 @@ class Located(ParseElementEnhance):
     Be careful if the input text contains ``<TAB>`` characters, you
     may want to call :class:`ParserElement.parse_with_tabs`
 
-    Example::
+    Example:
+
+    .. testcode::
 
         wd = Word(alphas)
         for match in Located(wd).search_string("ljsdf123lksdjjf123lkkjj1222"):
             print(match)
 
-    prints::
+    prints:
+
+    .. testoutput::
 
         [0, ['ljsdf'], 5]
         [8, ['lksdjjf'], 15]
         [18, ['lkkjj'], 23]
-
     """
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
@@ -4934,7 +5597,9 @@ class NotAny(ParseElementEnhance):
     *not* skip over leading whitespace. ``NotAny`` always returns
     a null token list.  May be constructed using the ``'~'`` operator.
 
-    Example::
+    Example:
+
+    .. testcode::
 
         AND, OR, NOT = map(CaselessKeyword, "AND OR NOT".split())
 
@@ -4950,13 +5615,13 @@ class NotAny(ParseElementEnhance):
         integer = Word(nums) + ~Char(".")
     """
 
-    def __init__(self, expr: Union[ParserElement, str]):
+    def __init__(self, expr: Union[ParserElement, str]) -> None:
         super().__init__(expr)
         # do NOT use self.leave_whitespace(), don't want to propagate to exprs
         # self.leave_whitespace()
         self.skipWhitespace = False
 
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.errmsg = f"Found unwanted token, {self.expr}"
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
@@ -4973,9 +5638,12 @@ def __init__(
         self,
         expr: Union[str, ParserElement],
         stop_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        stopOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
+        **kwargs,
+    ) -> None:
+        stopOn: typing.Optional[Union[ParserElement, str]] = deprecate_argument(
+            kwargs, "stopOn", None
+        )
+
         super().__init__(expr)
         stopOn = stopOn or stop_on
         self.saveAsList = True
@@ -4984,18 +5652,21 @@ def __init__(
             ender = self._literalStringClass(ender)
         self.stopOn(ender)
 
-    def stopOn(self, ender) -> ParserElement:
+    def stop_on(self, ender) -> ParserElement:
         if isinstance(ender, str_type):
             ender = self._literalStringClass(ender)
         self.not_ender = ~ender if ender is not None else None
         return self
 
+    stopOn = stop_on
+
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         self_expr_parse = self.expr._parse
         self_skip_ignorables = self._skipIgnorables
-        check_ender = self.not_ender is not None
-        if check_ender:
+        check_ender = False
+        if self.not_ender is not None:
             try_not_ender = self.not_ender.try_parse
+            check_ender = True
 
         # must be at least one (but first see if we are the stopOn sentinel;
         # if so, fail)
@@ -5038,7 +5709,7 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
                         f" setting results name {name!r} on {type(self).__name__} expression"
                         f" collides with {e.resultsName!r} on contained expression"
                     )
-                    warnings.warn(warning, stacklevel=3)
+                    warnings.warn(warning, PyparsingDiagnosticWarning, stacklevel=3)
                     break
 
         return super()._setResultsName(name, list_all_matches)
@@ -5055,21 +5726,34 @@ class OneOrMore(_MultipleMatch):
       (only required if the sentinel would ordinarily match the repetition
       expression)
 
-    Example::
+    Example:
 
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).set_parse_action(' '.join))
+    .. doctest::
+
+        >>> data_word = Word(alphas)
+        >>> label = data_word + FollowedBy(':')
+        >>> attr_expr = Group(
+        ...     label + Suppress(':')
+        ...     + OneOrMore(data_word).set_parse_action(' '.join))
 
-        text = "shape: SQUARE posn: upper left color: BLACK"
-        attr_expr[1, ...].parse_string(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
+        >>> text = "shape: SQUARE posn: upper left color: BLACK"
 
-        # use stop_on attribute for OneOrMore to avoid reading label string as part of the data
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-        OneOrMore(attr_expr).parse_string(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
+        # Fail! read 'posn' as data instead of next label
+        >>> attr_expr[1, ...].parse_string(text).pprint()
+        [['shape', 'SQUARE posn']]
+
+        # use stop_on attribute for OneOrMore
+        # to avoid reading label string as part of the data
+        >>> attr_expr = Group(
+        ...     label + Suppress(':')
+        ...     + OneOrMore(
+        ...         data_word, stop_on=label).set_parse_action(' '.join))
+        >>> OneOrMore(attr_expr).parse_string(text).pprint()  # Better
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
 
         # could also be written as
-        (attr_expr * (1,)).parse_string(text).pprint()
+        >>> (attr_expr * (1,)).parse_string(text).pprint()
+        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
     """
 
     def _generateDefaultName(self) -> str:
@@ -5094,11 +5778,12 @@ def __init__(
         self,
         expr: Union[str, ParserElement],
         stop_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        stopOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(expr, stopOn=stopOn or stop_on)
-        self.mayReturnEmpty = True
+        **kwargs,
+    ) -> None:
+        stopOn: Union[ParserElement, str] = deprecate_argument(kwargs, "stopOn", None)
+
+        super().__init__(expr, stop_on=stopOn or stop_on)
+        self._may_return_empty = True
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         try:
@@ -5111,6 +5796,31 @@ def _generateDefaultName(self) -> str:
 
 
 class DelimitedList(ParseElementEnhance):
+    """Helper to define a delimited list of expressions - the delimiter
+    defaults to ','. By default, the list elements and delimiters can
+    have intervening whitespace, and comments, but this can be
+    overridden by passing ``combine=True`` in the constructor. If
+    ``combine`` is set to ``True``, the matching tokens are
+    returned as a single token string, with the delimiters included;
+    otherwise, the matching tokens are returned as a list of tokens,
+    with the delimiters suppressed.
+
+    If ``allow_trailing_delim`` is set to True, then the list may end with
+    a delimiter.
+
+    Example:
+
+    .. doctest::
+
+        >>> DelimitedList(Word(alphas)).parse_string("aa,bb,cc")
+        ParseResults(['aa', 'bb', 'cc'], {})
+        >>> DelimitedList(Word(hexnums), delim=':', combine=True
+        ... ).parse_string("AA:BB:CC:DD:EE")
+        ParseResults(['AA:BB:CC:DD:EE'], {})
+
+    .. versionadded:: 3.1.0
+    """
+
     def __init__(
         self,
         expr: Union[str, ParserElement],
@@ -5120,24 +5830,7 @@ def __init__(
         max: typing.Optional[int] = None,
         *,
         allow_trailing_delim: bool = False,
-    ):
-        """Helper to define a delimited list of expressions - the delimiter
-        defaults to ','. By default, the list elements and delimiters can
-        have intervening whitespace, and comments, but this can be
-        overridden by passing ``combine=True`` in the constructor. If
-        ``combine`` is set to ``True``, the matching tokens are
-        returned as a single token string, with the delimiters included;
-        otherwise, the matching tokens are returned as a list of tokens,
-        with the delimiters suppressed.
-
-        If ``allow_trailing_delim`` is set to True, then the list may end with
-        a delimiter.
-
-        Example::
-
-            DelimitedList(Word(alphas)).parse_string("aa,bb,cc") # -> ['aa', 'bb', 'cc']
-            DelimitedList(Word(hexnums), delim=':', combine=True).parse_string("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
-        """
+    ) -> None:
         if isinstance(expr, str_type):
             expr = ParserElement._literalStringClass(expr)
         expr = typing.cast(ParserElement, expr)
@@ -5153,7 +5846,7 @@ def __init__(
         self.delim = delim
         self.combine = combine
         if not combine:
-            self.delim = Suppress(delim)
+            self.delim = Suppress(delim) if not isinstance(delim, Suppress) else delim
         self.min = min or 1
         self.max = max
         self.allow_trailing_delim = allow_trailing_delim
@@ -5187,12 +5880,13 @@ class Opt(ParseElementEnhance):
     """
     Optional matching of the given expression.
 
-    Parameters:
+    :param expr: expression that must match zero or more times
+    :param default: (optional) - value to be returned
+                    if the optional expression is not found.
 
-    - ``expr`` - expression that must match zero or more times
-    - ``default`` (optional) - value to be returned if the optional expression is not found.
+    Example:
 
-    Example::
+    .. testcode::
 
         # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
         zip = Combine(Word(nums, exact=5) + Opt('-' + Word(nums, exact=4)))
@@ -5207,7 +5901,11 @@ class Opt(ParseElementEnhance):
             98765-
             ''')
 
-    prints::
+    prints:
+
+    .. testoutput::
+       :options: +NORMALIZE_WHITESPACE
+
 
         # traditional ZIP code
         12345
@@ -5218,25 +5916,29 @@ class Opt(ParseElementEnhance):
         ['12101-0001']
 
         # invalid ZIP
+        98765-
         98765-
              ^
-        FAIL: Expected end of text (at char 5), (line:1, col:6)
+        ParseException: Expected end of text, found '-' (at char 5), (line:1, col:6)
+        FAIL: Expected end of text, found '-'  (at char 5), (line:1, col:6)
     """
 
     __optionalNotMatched = _NullToken()
 
     def __init__(
         self, expr: Union[ParserElement, str], default: Any = __optionalNotMatched
-    ):
+    ) -> None:
         super().__init__(expr, savelist=False)
         self.saveAsList = self.expr.saveAsList
         self.defaultValue = default
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
 
     def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
         self_expr = self.expr
         try:
-            loc, tokens = self_expr._parse(instring, loc, do_actions, callPreParse=False)
+            loc, tokens = self_expr._parse(
+                instring, loc, do_actions, callPreParse=False
+            )
         except (ParseException, IndexError):
             default_value = self.defaultValue
             if default_value is not self.__optionalNotMatched:
@@ -5244,9 +5946,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
                     tokens = ParseResults([default_value])
                     tokens[self_expr.resultsName] = default_value
                 else:
-                    tokens = [default_value]
+                    tokens = [default_value]  # type: ignore[assignment]
             else:
-                tokens = []
+                tokens = []  # type: ignore[assignment]
         return loc, tokens
 
     def _generateDefaultName(self) -> str:
@@ -5265,19 +5967,23 @@ class SkipTo(ParseElementEnhance):
     Token for skipping over all undefined text until the matched
     expression is found.
 
-    Parameters:
+    :param expr: target expression marking the end of the data to be skipped
+    :param include: if ``True``, the target expression is also parsed
+                    (the skipped text and target expression are returned
+                    as a 2-element list) (default= ``False``).
+
+    :param ignore: (default= ``None``) used to define grammars
+                   (typically quoted strings and comments)
+                   that might contain false matches to the target expression
+
+    :param fail_on: (default= ``None``) define expressions that
+                    are not allowed to be included in the skipped test;
+                    if found before the target expression is found,
+                    the :class:`SkipTo` is not a match
 
-    - ``expr`` - target expression marking the end of the data to be skipped
-    - ``include`` - if ``True``, the target expression is also parsed
-      (the skipped text and target expression are returned as a 2-element
-      list) (default= ``False``).
-    - ``ignore`` - (default= ``None``) used to define grammars (typically quoted strings and
-      comments) that might contain false matches to the target expression
-    - ``fail_on`` - (default= ``None``) define expressions that are not allowed to be
-      included in the skipped test; if found before the target expression is found,
-      the :class:`SkipTo` is not a match
+    Example:
 
-    Example::
+    .. testcode::
 
         report = '''
             Outstanding Issues Report - 1 Jan 2000
@@ -5301,9 +6007,11 @@ class SkipTo(ParseElementEnhance):
                       + integer("days_open"))
 
         for tkt in ticket_expr.search_string(report):
-            print tkt.dump()
+            print(tkt.dump())
 
-    prints::
+    prints:
+
+    .. testoutput::
 
         ['101', 'Critical', 'Intermittent system crash', '6']
         - days_open: '6'
@@ -5328,13 +6036,16 @@ def __init__(
         include: bool = False,
         ignore: typing.Optional[Union[ParserElement, str]] = None,
         fail_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        failOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
+        **kwargs,
+    ) -> None:
+        failOn: typing.Optional[Union[ParserElement, str]] = deprecate_argument(
+            kwargs, "failOn", None
+        )
+
         super().__init__(other)
         failOn = failOn or fail_on
         self.ignoreExpr = ignore
-        self.mayReturnEmpty = True
+        self._may_return_empty = True
         self.mayIndexError = False
         self.includeMatch = include
         self.saveAsList = False
@@ -5355,6 +6066,11 @@ def _update_ignorer(self):
             self.ignorer.ignore(self.ignoreExpr)
 
     def ignore(self, expr):
+        """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        """
         super().ignore(expr)
         self._update_ignorer()
 
@@ -5363,7 +6079,7 @@ def parseImpl(self, instring, loc, do_actions=True):
         instrlen = len(instring)
         self_expr_parse = self.expr._parse
         self_failOn_canParseNext = (
-            self.failOn.canParseNext if self.failOn is not None else None
+            self.failOn.can_parse_next if self.failOn is not None else None
         )
         ignorer_try_parse = self.ignorer.try_parse if self.ignorer.ignoreExprs else None
 
@@ -5417,36 +6133,41 @@ class Forward(ParseElementEnhance):
     Forward declaration of an expression to be defined later -
     used for recursive grammars, such as algebraic infix notation.
     When the expression is known, it is assigned to the ``Forward``
-    variable using the ``'<<'`` operator.
+    instance using the ``'<<'`` operator.
 
-    Note: take care when assigning to ``Forward`` not to overlook
-    precedence of operators.
+    .. Note::
 
-    Specifically, ``'|'`` has a lower precedence than ``'<<'``, so that::
+       Take care when assigning to ``Forward`` not to overlook
+       precedence of operators.
 
-        fwd_expr << a | b | c
+       Specifically, ``'|'`` has a lower precedence than ``'<<'``, so that::
 
-    will actually be evaluated as::
+           fwd_expr << a | b | c
 
-        (fwd_expr << a) | b | c
+       will actually be evaluated as::
 
-    thereby leaving b and c out as parseable alternatives.  It is recommended that you
-    explicitly group the values inserted into the ``Forward``::
+           (fwd_expr << a) | b | c
 
-        fwd_expr << (a | b | c)
+       thereby leaving b and c out as parseable alternatives.
+       It is recommended that you explicitly group the values
+       inserted into the :class:`Forward`::
 
-    Converting to use the ``'<<='`` operator instead will avoid this problem.
+           fwd_expr << (a | b | c)
 
-    See :class:`ParseResults.pprint` for an example of a recursive
-    parser created using ``Forward``.
+       Converting to use the ``'<<='`` operator instead will avoid this problem.
+
+    See :meth:`ParseResults.pprint` for an example of a recursive
+    parser created using :class:`Forward`.
     """
 
-    def __init__(self, other: typing.Optional[Union[ParserElement, str]] = None):
+    def __init__(
+        self, other: typing.Optional[Union[ParserElement, str]] = None
+    ) -> None:
         self.caller_frame = traceback.extract_stack(limit=2)[0]
         super().__init__(other, savelist=False)  # type: ignore[arg-type]
         self.lshift_line = None
 
-    def __lshift__(self, other) -> "Forward":
+    def __lshift__(self, other) -> Forward:
         if hasattr(self, "caller_frame"):
             del self.caller_frame
         if isinstance(other, str_type):
@@ -5458,7 +6179,7 @@ def __lshift__(self, other) -> "Forward":
         self.expr = other
         self.streamlined = other.streamlined
         self.mayIndexError = self.expr.mayIndexError
-        self.mayReturnEmpty = self.expr.mayReturnEmpty
+        self._may_return_empty = self.expr.mayReturnEmpty
         self.set_whitespace_chars(
             self.expr.whiteChars, copy_defaults=self.expr.copyDefaultWhiteChars
         )
@@ -5468,13 +6189,13 @@ def __lshift__(self, other) -> "Forward":
         self.lshift_line = traceback.extract_stack(limit=2)[-2]  # type: ignore[assignment]
         return self
 
-    def __ilshift__(self, other) -> "Forward":
+    def __ilshift__(self, other) -> Forward:
         if not isinstance(other, ParserElement):
             return NotImplemented
 
         return self << other
 
-    def __or__(self, other) -> "ParserElement":
+    def __or__(self, other) -> ParserElement:
         caller_line = traceback.extract_stack(limit=2)[-2]
         if (
             __diag__.warn_on_match_first_with_lshift_operator
@@ -5483,7 +6204,9 @@ def __or__(self, other) -> "ParserElement":
             not in self.suppress_warnings_
         ):
             warnings.warn(
-                "using '<<' operator with '|' is probably an error, use '<<='",
+                "warn_on_match_first_with_lshift_operator:"
+                " using '<<' operator with '|' is probably an error, use '<<='",
+                PyparsingDiagnosticWarning,
                 stacklevel=2,
             )
         ret = super().__or__(other)
@@ -5497,7 +6220,8 @@ def __del__(self):
             and Diagnostics.warn_on_assignment_to_Forward not in self.suppress_warnings_
         ):
             warnings.warn_explicit(
-                "Forward defined here but no expression attached later using '<<=' or '<<'",
+                "warn_on_assignment_to_Forward:"
+                " Forward defined here but no expression attached later using '<<=' or '<<'",
                 UserWarning,
                 filename=self.caller_frame.filename,
                 lineno=self.caller_frame.lineno,
@@ -5525,7 +6249,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
             else:
                 stacklevel = 2
             warnings.warn(
-                "Forward expression was never assigned a value, will not parse any input",
+                "warn_on_parse_using_empty_Forward:"
+                " Forward expression was never assigned a value, will not parse any input",
+                PyparsingDiagnosticWarning,
                 stacklevel=stacklevel,
             )
         if not ParserElement._left_recursion_enabled:
@@ -5574,7 +6300,7 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
                     try:
                         new_loc, new_peek = super().parseImpl(instring, loc, False)
                     except ParseException:
-                        # we failed before getting any match โ€“ do not hide the error
+                        # we failed before getting any match - do not hide the error
                         if isinstance(prev_peek, Exception):
                             raise
                         new_loc, new_peek = prev_loc, prev_peek
@@ -5585,9 +6311,9 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
                             # in case the action did backtrack
                             prev_loc, prev_result = memo[peek_key] = memo[act_key]
                             del memo[peek_key], memo[act_key]
-                            return prev_loc, prev_result.copy()
+                            return prev_loc, copy.copy(prev_result)
                         del memo[peek_key]
-                        return prev_loc, prev_peek.copy()
+                        return prev_loc, copy.copy(prev_peek)
                     # the match did get better: see if we can improve further
                     if do_actions:
                         try:
@@ -5598,10 +6324,16 @@ def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
                     prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
 
     def leave_whitespace(self, recursive: bool = True) -> ParserElement:
+        """
+        Extends ``leave_whitespace`` defined in base class.
+        """
         self.skipWhitespace = False
         return self
 
     def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
+        """
+        Extends ``ignore_whitespace`` defined in base class.
+        """
         self.skipWhitespace = True
         return self
 
@@ -5615,7 +6347,7 @@ def streamline(self) -> ParserElement:
     def validate(self, validateTrace=None) -> None:
         warnings.warn(
             "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
+            PyparsingDeprecationWarning,
             stacklevel=2,
         )
         if validateTrace is None:
@@ -5629,19 +6361,27 @@ def validate(self, validateTrace=None) -> None:
 
     def _generateDefaultName(self) -> str:
         # Avoid infinite recursion by setting a temporary _defaultName
+        save_default_name = self._defaultName
         self._defaultName = ": ..."
 
         # Use the string representation of main expression.
-        retString = "..."
         try:
             if self.expr is not None:
-                retString = str(self.expr)[:1000]
+                ret_string = str(self.expr)[:1000]
             else:
-                retString = "None"
-        finally:
-            return f"{type(self).__name__}: {retString}"
+                ret_string = "None"
+        except Exception:
+            ret_string = "..."
+
+        self._defaultName = save_default_name
+        return f"{type(self).__name__}: {ret_string}"
 
     def copy(self) -> ParserElement:
+        """
+        Returns a copy of this expression.
+
+        Generally only used internally by pyparsing.
+        """
         if self.expr is not None:
             return super().copy()
         else:
@@ -5661,7 +6401,7 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
                 f" setting results name {name!r} on {type(self).__name__} expression"
                 " that has no contained expression"
             )
-            warnings.warn(warning, stacklevel=3)
+            warnings.warn(warning, PyparsingDiagnosticWarning, stacklevel=3)
         # fmt: on
 
         return super()._setResultsName(name, list_all_matches)
@@ -5675,10 +6415,10 @@ def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
 
 class TokenConverter(ParseElementEnhance):
     """
-    Abstract subclass of :class:`ParseExpression`, for converting parsed results.
+    Abstract subclass of :class:`ParseElementEnhance`, for converting parsed results.
     """
 
-    def __init__(self, expr: Union[ParserElement, str], savelist=False):
+    def __init__(self, expr: Union[ParserElement, str], savelist=False) -> None:
         super().__init__(expr)  # , savelist)
         self.saveAsList = False
 
@@ -5689,17 +6429,26 @@ class Combine(TokenConverter):
     input string; this can be disabled by specifying
     ``'adjacent=False'`` in the constructor.
 
-    Example::
+    Example:
+
+    .. doctest::
 
-        real = Word(nums) + '.' + Word(nums)
-        print(real.parse_string('3.1416')) # -> ['3', '.', '1416']
-        # will also erroneously match the following
-        print(real.parse_string('3. 1416')) # -> ['3', '.', '1416']
+        >>> real = Word(nums) + '.' + Word(nums)
+        >>> print(real.parse_string('3.1416'))
+        ['3', '.', '1416']
 
-        real = Combine(Word(nums) + '.' + Word(nums))
-        print(real.parse_string('3.1416')) # -> ['3.1416']
-        # no match when there are internal spaces
-        print(real.parse_string('3. 1416')) # -> Exception: Expected W:(0123...)
+        >>> # will also erroneously match the following
+        >>> print(real.parse_string('3. 1416'))
+        ['3', '.', '1416']
+
+        >>> real = Combine(Word(nums) + '.' + Word(nums))
+        >>> print(real.parse_string('3.1416'))
+        ['3.1416']
+
+        >>> # no match when there are internal spaces
+        >>> print(real.parse_string('3. 1416'))
+        Traceback (most recent call last):
+        ParseException: Expected W:(0123...)
     """
 
     def __init__(
@@ -5709,7 +6458,7 @@ def __init__(
         adjacent: bool = True,
         *,
         joinString: typing.Optional[str] = None,
-    ):
+    ) -> None:
         super().__init__(expr)
         joinString = joinString if joinString is not None else join_string
         # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
@@ -5721,6 +6470,11 @@ def __init__(
         self.callPreparse = True
 
     def ignore(self, other) -> ParserElement:
+        """
+        Define expression to be ignored (e.g., comments) while doing pattern
+        matching; may be called repeatedly, to define multiple comment or other
+        ignorable patterns.
+        """
         if self.adjacent:
             ParserElement.ignore(self, other)
         else:
@@ -5747,21 +6501,23 @@ class Group(TokenConverter):
     The optional ``aslist`` argument when set to True will return the
     parsed tokens as a Python list instead of a pyparsing ParseResults.
 
-    Example::
+    Example:
+
+    .. doctest::
 
-        ident = Word(alphas)
-        num = Word(nums)
-        term = ident | num
-        func = ident + Opt(DelimitedList(term))
-        print(func.parse_string("fn a, b, 100"))
-        # -> ['fn', 'a', 'b', '100']
+        >>> ident = Word(alphas)
+        >>> num = Word(nums)
+        >>> term = ident | num
+        >>> func = ident + Opt(DelimitedList(term))
+        >>> print(func.parse_string("fn a, b, 100"))
+        ['fn', 'a', 'b', '100']
 
-        func = ident + Group(Opt(DelimitedList(term)))
-        print(func.parse_string("fn a, b, 100"))
-        # -> ['fn', ['a', 'b', '100']]
+        >>> func = ident + Group(Opt(DelimitedList(term)))
+        >>> print(func.parse_string("fn a, b, 100"))
+        ['fn', ['a', 'b', '100']]
     """
 
-    def __init__(self, expr: ParserElement, aslist: bool = False):
+    def __init__(self, expr: ParserElement, aslist: bool = False) -> None:
         super().__init__(expr)
         self.saveAsList = True
         self._asPythonList = aslist
@@ -5769,7 +6525,7 @@ def __init__(self, expr: ParserElement, aslist: bool = False):
     def postParse(self, instring, loc, tokenlist):
         if self._asPythonList:
             return ParseResults.List(
-                tokenlist.asList()
+                tokenlist.as_list()
                 if isinstance(tokenlist, ParseResults)
                 else list(tokenlist)
             )
@@ -5786,40 +6542,53 @@ class Dict(TokenConverter):
     The optional ``asdict`` argument when set to True will return the
     parsed tokens as a Python dict instead of a pyparsing ParseResults.
 
-    Example::
-
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
+    Example:
 
-        # print attributes as plain groups
-        print(attr_expr[1, ...].parse_string(text).dump())
+    .. doctest::
 
-        # instead of OneOrMore(expr), parse using Dict(Group(expr)[1, ...]) - Dict will auto-assign names
-        result = Dict(Group(attr_expr)[1, ...]).parse_string(text)
-        print(result.dump())
+        >>> data_word = Word(alphas)
+        >>> label = data_word + FollowedBy(':')
 
-        # access named fields as dict entries, or output as dict
-        print(result['shape'])
-        print(result.as_dict())
+        >>> attr_expr = (
+        ...     label + Suppress(':')
+        ...     + OneOrMore(data_word, stop_on=label)
+        ...       .set_parse_action(' '.join)
+        ... )
 
-    prints::
+        >>> text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
 
+        >>> # print attributes as plain groups
+        >>> print(attr_expr[1, ...].parse_string(text).dump())
         ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
+
+        # instead of OneOrMore(expr), parse using Dict(Group(expr)[1, ...])
+        # Dict will auto-assign names.
+        >>> result = Dict(Group(attr_expr)[1, ...]).parse_string(text)
+        >>> print(result.dump())
         [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
         - color: 'light blue'
         - posn: 'upper left'
         - shape: 'SQUARE'
         - texture: 'burlap'
+        [0]:
+          ['shape', 'SQUARE']
+        [1]:
+          ['posn', 'upper left']
+        [2]:
+          ['color', 'light blue']
+        [3]:
+          ['texture', 'burlap']
+
+        # access named fields as dict entries, or output as dict
+        >>> print(result['shape'])
         SQUARE
-        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
+        >>> print(result.as_dict())
+        {'shape': 'SQUARE', 'posn': 'upper left', 'color': 'light blue', 'texture': 'burlap'}
 
     See more examples at :class:`ParseResults` of accessing fields by results name.
     """
 
-    def __init__(self, expr: ParserElement, asdict: bool = False):
+    def __init__(self, expr: ParserElement, asdict: bool = False) -> None:
         super().__init__(expr)
         self.saveAsList = True
         self._asPythonDict = asdict
@@ -5867,46 +6636,45 @@ def postParse(self, instring, loc, tokenlist):
 class Suppress(TokenConverter):
     """Converter for ignoring the results of a parsed expression.
 
-    Example::
+    Example:
 
-        source = "a, b, c,d"
-        wd = Word(alphas)
-        wd_list1 = wd + (',' + wd)[...]
-        print(wd_list1.parse_string(source))
+    .. doctest::
+
+        >>> source = "a, b, c,d"
+        >>> wd = Word(alphas)
+        >>> wd_list1 = wd + (',' + wd)[...]
+        >>> print(wd_list1.parse_string(source))
+        ['a', ',', 'b', ',', 'c', ',', 'd']
 
         # often, delimiters that are useful during parsing are just in the
         # way afterward - use Suppress to keep them out of the parsed output
-        wd_list2 = wd + (Suppress(',') + wd)[...]
-        print(wd_list2.parse_string(source))
+        >>> wd_list2 = wd + (Suppress(',') + wd)[...]
+        >>> print(wd_list2.parse_string(source))
+        ['a', 'b', 'c', 'd']
 
         # Skipped text (using '...') can be suppressed as well
-        source = "lead in START relevant text END trailing text"
-        start_marker = Keyword("START")
-        end_marker = Keyword("END")
-        find_body = Suppress(...) + start_marker + ... + end_marker
-        print(find_body.parse_string(source)
-
-    prints::
-
-        ['a', ',', 'b', ',', 'c', ',', 'd']
-        ['a', 'b', 'c', 'd']
+        >>> source = "lead in START relevant text END trailing text"
+        >>> start_marker = Keyword("START")
+        >>> end_marker = Keyword("END")
+        >>> find_body = Suppress(...) + start_marker + ... + end_marker
+        >>> print(find_body.parse_string(source))
         ['START', 'relevant text ', 'END']
 
     (See also :class:`DelimitedList`.)
     """
 
-    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
+    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False) -> None:
         if expr is ...:
             expr = _PendingSkip(NoMatch())
         super().__init__(expr)
 
-    def __add__(self, other) -> "ParserElement":
+    def __add__(self, other) -> ParserElement:
         if isinstance(self.expr, _PendingSkip):
             return Suppress(SkipTo(other)) + other
 
         return super().__add__(other)
 
-    def __sub__(self, other) -> "ParserElement":
+    def __sub__(self, other) -> ParserElement:
         if isinstance(self.expr, _PendingSkip):
             return Suppress(SkipTo(other)) - other
 
@@ -5919,6 +6687,7 @@ def suppress(self) -> ParserElement:
         return self
 
 
+# XXX: Example needs to be re-done for updated output
 def trace_parse_action(f: ParseAction) -> ParseAction:
     """Decorator for debugging parse actions.
 
@@ -5927,7 +6696,18 @@ def trace_parse_action(f: ParseAction) -> ParseAction:
     When the parse action completes, the decorator will print
     ``"<<"`` followed by the returned value, or any exception that the parse action raised.
 
-    Example::
+    Example:
+
+    .. testsetup:: stderr
+
+        import sys
+        sys.stderr = sys.stdout
+
+    .. testcleanup:: stderr
+
+        sys.stderr = sys.__stderr__
+
+    .. testcode:: stderr
 
         wd = Word(alphas)
 
@@ -5938,11 +6718,18 @@ def remove_duplicate_chars(tokens):
         wds = wd[1, ...].set_parse_action(remove_duplicate_chars)
         print(wds.parse_string("slkdjs sld sldd sdlf sdljf"))
 
-    prints::
+    prints:
+
+    .. testoutput:: stderr
+        :options: +NORMALIZE_WHITESPACE
 
-        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
+        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf',
+        0, ParseResults(['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
         <<leaving remove_duplicate_chars (ret: 'dfjkls')
         ['dfjkls']
+
+    .. versionchanged:: 3.1.0
+       Exception type added to output
     """
     f = _trim_arity(f)
 
@@ -6020,13 +6807,17 @@ def srange(s: str) -> str:
     - any combination of the above (``'aeiouy'``,
       ``'a-zA-Z0-9_$'``, etc.)
     """
-    _expanded = lambda p: (
-        p
-        if not isinstance(p, ParseResults)
-        else "".join(chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
-    )
+
+    def _expanded(p):
+        if isinstance(p, ParseResults):
+            yield from (chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
+        else:
+            yield p
+
     try:
-        return "".join(_expanded(part) for part in _reBracketExpr.parse_string(s).body)
+        return "".join(
+            [c for part in _reBracketExpr.parse_string(s).body for c in _expanded(part)]
+        )
     except Exception as e:
         return ""
 
@@ -6082,11 +6873,17 @@ def autoname_elements() -> None:
     Utility to simplify mass-naming of parser elements, for
     generating railroad diagram with named subdiagrams.
     """
-    calling_frame = sys._getframe().f_back
+
+    # guard against _getframe not being implemented in the current Python
+    getframe_fn = getattr(sys, "_getframe", lambda _: None)
+    calling_frame = getframe_fn(1)
     if calling_frame is None:
         return
+
+    # find all locals in the calling frame that are ParserElements
     calling_frame = typing.cast(types.FrameType, calling_frame)
     for name, var in calling_frame.f_locals.items():
+        # if no custom name defined, set the name to the var name
         if isinstance(var, ParserElement) and not var.customName:
             var.set_name(name)
 
@@ -6108,6 +6905,8 @@ def autoname_elements() -> None:
     )
 ).set_name("quoted string using single or double quotes")
 
+# XXX: Is there some way to make this show up in API docs?
+# .. versionadded:: 3.1.0
 python_quoted_string = Combine(
     (Regex(r'"""(?:[^"\\]|""(?!")|"(?!"")|\\.)*', flags=re.MULTILINE) + '"""').set_name(
         "multiline double quoted string"
@@ -6131,7 +6930,7 @@ def autoname_elements() -> None:
 
 # build list of built-in expressions, for future reference if a global default value
 # gets updated
-_builtin_exprs: List[ParserElement] = [
+_builtin_exprs: list[ParserElement] = [
     v for v in vars().values() if isinstance(v, ParserElement)
 ]
 
diff --git a/libs/pyparsing/diagram/__init__.py b/libs/pyparsing/diagram/__init__.py
index 3275adafb6..b8baa47d14 100644
--- a/libs/pyparsing/diagram/__init__.py
+++ b/libs/pyparsing/diagram/__init__.py
@@ -1,20 +1,21 @@
 # mypy: ignore-errors
+from __future__ import annotations
+
+import itertools
 import railroad
 import pyparsing
+import dataclasses
 import typing
 from typing import (
-    List,
-    NamedTuple,
     Generic,
     TypeVar,
-    Dict,
     Callable,
-    Set,
     Iterable,
 )
 from jinja2 import Template
 from io import StringIO
 import inspect
+import re
 
 
 jinja2_template_source = """\
@@ -40,7 +41,7 @@
 {{ body | safe }}
 {% for diagram in diagrams %}
     <div class="railroad-group">
-        <h1 class="railroad-heading">{{ diagram.title }}</h1>
+        <h1 class="railroad-heading" id="{{ diagram.bookmark }}">{{ diagram.title }}</h1>
         <div class="railroad-description">{{ diagram.text }}</div>
         <div class="railroad-svg">
             {{ diagram.svg }}
@@ -55,14 +56,55 @@
 
 template = Template(jinja2_template_source)
 
-# Note: ideally this would be a dataclass, but we're supporting Python 3.5+ so we can't do this yet
-NamedDiagram = NamedTuple(
-    "NamedDiagram",
-    [("name", str), ("diagram", typing.Optional[railroad.DiagramItem]), ("index", int)],
-)
-"""
-A simple structure for associating a name with a railroad diagram
-"""
+
+_bookmark_lookup = {}
+_bookmark_ids = itertools.count(start=1)
+
+def _make_bookmark(s: str) -> str:
+    """
+    Converts a string into a valid HTML bookmark (ID or anchor name).
+    """
+    if s in _bookmark_lookup:
+        return _bookmark_lookup[s]
+
+    # Replace invalid characters with hyphens and ensure only valid characters
+    bookmark = re.sub(r'[^a-zA-Z0-9-]+', '-', s)
+
+    # Ensure it starts with a letter by adding 'z' if necessary
+    if not bookmark[:1].isalpha():
+        bookmark = f"z{bookmark}"
+
+    # Convert to lowercase and strip hyphens
+    bookmark = bookmark.lower().strip('-')
+
+    _bookmark_lookup[s] = bookmark = f"{bookmark}-{next(_bookmark_ids):04d}"
+
+    return bookmark
+
+
+def _collapse_verbose_regex(regex_str: str) -> str:
+    if "\n" not in regex_str:
+        return regex_str
+    collapsed = pyparsing.Regex(r"#.*$").suppress().transform_string(regex_str)
+    collapsed = re.sub(r"\s*\n\s*", "", collapsed)
+    return collapsed
+
+
+@dataclasses.dataclass
+class NamedDiagram:
+    """
+    A simple structure for associating a name with a railroad diagram
+    """
+
+    name: str
+    index: int
+    diagram: railroad.DiagramItem = None
+
+    @property
+    def bookmark(self):
+        bookmark = _make_bookmark(self.name)
+        return bookmark
+
 
 T = TypeVar("T")
 
@@ -70,15 +112,20 @@
 class EachItem(railroad.Group):
     """
     Custom railroad item to compose a:
-    - Group containing a
-      - OneOrMore containing a
-        - Choice of the elements in the Each
+
+    - :class:`railroad.Group` containing a
+
+      - :class:`railroad.OneOrMore` containing a
+
+        - :class:`railroad.Choice` of the elements in the
+          :class:`railroad.Each`
+
     with the group label indicating that all must be matched
     """
 
     all_label = "[ALL]"
 
-    def __init__(self, *items):
+    def __init__(self, *items) -> None:
         choice_item = railroad.Choice(len(items) - 1, *items)
         one_or_more_item = railroad.OneOrMore(item=choice_item)
         super().__init__(one_or_more_item, label=self.all_label)
@@ -89,8 +136,8 @@ class AnnotatedItem(railroad.Group):
     Simple subclass of Group that creates an annotation label
     """
 
-    def __init__(self, label: str, item):
-        super().__init__(item=item, label=f"[{label}]")
+    def __init__(self, label: str, item) -> None:
+        super().__init__(item=item, label=f"[{label}]" if label else "")
 
 
 class EditablePartial(Generic[T]):
@@ -102,16 +149,17 @@ class EditablePartial(Generic[T]):
     # We need this here because the railroad constructors actually transform the data, so can't be called until the
     # entire tree is assembled
 
-    def __init__(self, func: Callable[..., T], args: list, kwargs: dict):
+    def __init__(self, func: Callable[..., T], args: list, kwargs: dict) -> None:
         self.func = func
         self.args = args
         self.kwargs = kwargs
 
     @classmethod
-    def from_call(cls, func: Callable[..., T], *args, **kwargs) -> "EditablePartial[T]":
+    def from_call(cls, func: Callable[..., T], *args, **kwargs) -> EditablePartial[T]:
         """
-        If you call this function in the same way that you would call the constructor, it will store the arguments
-        as you expect. For example EditablePartial.from_call(Fraction, 1, 3)() == Fraction(1, 3)
+        If you call this function in the same way that you would call the constructor,
+        it will store the arguments as you expect. For example
+        ``EditablePartial.from_call(Fraction, 1, 3)() == Fraction(1, 3)``
         """
         return EditablePartial(func=func, args=list(args), kwargs=kwargs)
 
@@ -135,9 +183,11 @@ def __call__(self) -> T:
         return self.func(*args, **kwargs)
 
 
-def railroad_to_html(diagrams: List[NamedDiagram], embed=False, **kwargs) -> str:
+def railroad_to_html(diagrams: list[NamedDiagram], embed=False, **kwargs) -> str:
     """
-    Given a list of NamedDiagram, produce a single HTML string that visualises those diagrams
+    Given a list of :class:`NamedDiagram`, produce a single HTML string
+    that visualises those diagrams.
+
     :params kwargs: kwargs to be passed in to the template
     """
     data = []
@@ -153,12 +203,16 @@ def railroad_to_html(diagrams: List[NamedDiagram], embed=False, **kwargs) -> str
         title = diagram.name
         if diagram.index == 0:
             title += " (root)"
-        data.append({"title": title, "text": "", "svg": io.getvalue()})
+        data.append(
+            {
+                "title": title, "text": "", "svg": io.getvalue(), "bookmark": diagram.bookmark
+            }
+        )
 
     return template.render(diagrams=data, embed=embed, **kwargs)
 
 
-def resolve_partial(partial: "EditablePartial[T]") -> T:
+def resolve_partial(partial: EditablePartial[T]) -> T:
     """
     Recursively resolves a collection of Partials into whatever type they are
     """
@@ -180,18 +234,27 @@ def to_railroad(
     vertical: int = 3,
     show_results_names: bool = False,
     show_groups: bool = False,
-) -> List[NamedDiagram]:
+    show_hidden: bool = False,
+) -> list[NamedDiagram]:
     """
     Convert a pyparsing element tree into a list of diagrams. This is the recommended entrypoint to diagram
     creation if you want to access the Railroad tree before it is converted to HTML
+
     :param element: base element of the parser being diagrammed
-    :param diagram_kwargs: kwargs to pass to the Diagram() constructor
-    :param vertical: (optional) - int - limit at which number of alternatives should be
-       shown vertically instead of horizontally
-    :param show_results_names - bool to indicate whether results name annotations should be
-       included in the diagram
-    :param show_groups - bool to indicate whether groups should be highlighted with an unlabeled
-       surrounding box
+
+    :param diagram_kwargs: kwargs to pass to the :meth:`Diagram` constructor
+
+    :param vertical: (optional) int - limit at which number of alternatives
+        should be shown vertically instead of horizontally
+
+    :param show_results_names: bool to indicate whether results name
+        annotations should be included in the diagram
+
+    :param show_groups: bool to indicate whether groups should be highlighted
+        with an unlabeled surrounding box
+
+    :param show_hidden: bool to indicate whether internal elements that are
+        typically hidden should be shown
     """
     # Convert the whole tree underneath the root
     lookup = ConverterState(diagram_kwargs=diagram_kwargs or {})
@@ -202,6 +265,7 @@ def to_railroad(
         vertical=vertical,
         show_results_names=show_results_names,
         show_groups=show_groups,
+        show_hidden=show_hidden,
     )
 
     root_id = id(element)
@@ -244,40 +308,31 @@ def _should_vertical(
         return len(_visible_exprs(exprs)) >= specification
 
 
+@dataclasses.dataclass
 class ElementState:
     """
     State recorded for an individual pyparsing Element
     """
 
-    # Note: this should be a dataclass, but we have to support Python 3.5
-    def __init__(
-        self,
-        element: pyparsing.ParserElement,
-        converted: EditablePartial,
-        parent: EditablePartial,
-        number: int,
-        name: str = None,
-        parent_index: typing.Optional[int] = None,
-    ):
-        #: The pyparsing element that this represents
-        self.element: pyparsing.ParserElement = element
-        #: The name of the element
-        self.name: typing.Optional[str] = name
-        #: The output Railroad element in an unconverted state
-        self.converted: EditablePartial = converted
-        #: The parent Railroad element, which we store so that we can extract this if it's duplicated
-        self.parent: EditablePartial = parent
-        #: The order in which we found this element, used for sorting diagrams if this is extracted into a diagram
-        self.number: int = number
-        #: The index of this inside its parent
-        self.parent_index: typing.Optional[int] = parent_index
-        #: If true, we should extract this out into a subdiagram
-        self.extract: bool = False
-        #: If true, all of this element's children have been filled out
-        self.complete: bool = False
+    #: The pyparsing element that this represents
+    element: pyparsing.ParserElement
+    #: The output Railroad element in an unconverted state
+    converted: EditablePartial
+    #: The parent Railroad element, which we store so that we can extract this if it's duplicated
+    parent: EditablePartial
+    #: The order in which we found this element, used for sorting diagrams if this is extracted into a diagram
+    number: int
+    #: The name of the element
+    name: str = None
+    #: The index of this inside its parent
+    parent_index: typing.Optional[int] = None
+    #: If true, we should extract this out into a subdiagram
+    extract: bool = False
+    #: If true, all of this element's children have been filled out
+    complete: bool = False
 
     def mark_for_extraction(
-        self, el_id: int, state: "ConverterState", name: str = None, force: bool = False
+        self, el_id: int, state: ConverterState, name: str = None, force: bool = False
     ):
         """
         Called when this instance has been seen twice, and thus should eventually be extracted into a sub-diagram
@@ -310,19 +365,18 @@ class ConverterState:
     """
     Stores some state that persists between recursions into the element tree
     """
+    index_generator = itertools.count(start=1)
 
-    def __init__(self, diagram_kwargs: typing.Optional[dict] = None):
+    def __init__(self, diagram_kwargs: typing.Optional[dict] = None) -> None:
         #: A dictionary mapping ParserElements to state relating to them
-        self._element_diagram_states: Dict[int, ElementState] = {}
+        self._element_diagram_states: dict[int, ElementState] = {}
         #: A dictionary mapping ParserElement IDs to subdiagrams generated from them
-        self.diagrams: Dict[int, EditablePartial[NamedDiagram]] = {}
-        #: The index of the next unnamed element
-        self.unnamed_index: int = 1
+        self.diagrams: dict[int, EditablePartial[NamedDiagram]] = {}
         #: The index of the next element. This is used for sorting
         self.index: int = 0
         #: Shared kwargs that are used to customize the construction of diagrams
         self.diagram_kwargs: dict = diagram_kwargs or {}
-        self.extracted_diagram_names: Set[str] = set()
+        self.extracted_diagram_names: set[str] = set()
 
     def __setitem__(self, key: int, value: ElementState):
         self._element_diagram_states[key] = value
@@ -336,19 +390,17 @@ def __delitem__(self, key: int):
     def __contains__(self, key: int):
         return key in self._element_diagram_states
 
-    def generate_unnamed(self) -> int:
-        """
-        Generate a number used in the name of an otherwise unnamed diagram
-        """
-        self.unnamed_index += 1
-        return self.unnamed_index
+    def get(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            return default
 
     def generate_index(self) -> int:
         """
         Generate a number used to index a diagram
         """
-        self.index += 1
-        return self.index
+        return next(self.index_generator)
 
     def extract_into_diagram(self, el_id: int):
         """
@@ -360,7 +412,8 @@ def extract_into_diagram(self, el_id: int):
 
         # Replace the original definition of this element with a regular block
         if position.parent:
-            ret = EditablePartial.from_call(railroad.NonTerminal, text=position.name)
+            href = f"#{_make_bookmark(position.name)}"
+            ret = EditablePartial.from_call(railroad.NonTerminal, text=position.name, href=href)
             if "item" in position.parent.kwargs:
                 position.parent.kwargs["item"] = ret
             elif "items" in position.parent.kwargs:
@@ -409,6 +462,7 @@ def _inner(
         name_hint: str = None,
         show_results_names: bool = False,
         show_groups: bool = False,
+        show_hidden: bool = False,
     ) -> typing.Optional[EditablePartial]:
         ret = fn(
             element,
@@ -419,6 +473,7 @@ def _inner(
             name_hint,
             show_results_names,
             show_groups,
+            show_hidden,
         )
 
         # apply annotation for results name, if present
@@ -447,7 +502,7 @@ def _visible_exprs(exprs: Iterable[pyparsing.ParserElement]):
     return [
         e
         for e in exprs
-        if not (e.customName or e.resultsName or isinstance(e, non_diagramming_exprs))
+        if not isinstance(e, non_diagramming_exprs)
     ]
 
 
@@ -461,6 +516,7 @@ def _to_diagram_element(
     name_hint: str = None,
     show_results_names: bool = False,
     show_groups: bool = False,
+    show_hidden: bool = False,
 ) -> typing.Optional[EditablePartial]:
     """
     Recursively converts a PyParsing Element to a railroad Element
@@ -472,8 +528,9 @@ def _to_diagram_element(
     do so
     :param name_hint: If provided, this will override the generated name
     :param show_results_names: bool flag indicating whether to add annotations for results names
-    :returns: The converted version of the input element, but as a Partial that hasn't yet been constructed
     :param show_groups: bool flag indicating whether to show groups using bounding box
+    :param show_hidden: bool flag indicating whether to show elements that are typically hidden
+    :returns: The converted version of the input element, but as a Partial that hasn't yet been constructed
     """
     exprs = element.recurse()
     name = name_hint or element.customName or type(element).__name__
@@ -489,8 +546,10 @@ def _to_diagram_element(
             element,
             (
                 # pyparsing.TokenConverter,
-                # pyparsing.Forward,
+                pyparsing.Forward,
                 pyparsing.Located,
+                pyparsing.AtStringStart,
+                pyparsing.AtLineStart,
             ),
         ):
             # However, if this element has a useful custom name, and its child does not, we can pass it on to the child
@@ -509,29 +568,38 @@ def _to_diagram_element(
                     name_hint=propagated_name,
                     show_results_names=show_results_names,
                     show_groups=show_groups,
+                    show_hidden=show_hidden,
                 )
 
     # If the element isn't worth extracting, we always treat it as the first time we say it
     if _worth_extracting(element):
-        if el_id in lookup:
+        looked_up = lookup.get(el_id)
+        if looked_up and looked_up.name is not None:
             # If we've seen this element exactly once before, we are only just now finding out that it's a duplicate,
             # so we have to extract it into a new diagram.
-            looked_up = lookup[el_id]
             looked_up.mark_for_extraction(el_id, lookup, name=name_hint)
-            ret = EditablePartial.from_call(railroad.NonTerminal, text=looked_up.name)
+            href = f"#{_make_bookmark(looked_up.name)}"
+            ret = EditablePartial.from_call(railroad.NonTerminal, text=looked_up.name, href=href)
             return ret
 
         elif el_id in lookup.diagrams:
             # If we have seen the element at least twice before, and have already extracted it into a subdiagram, we
             # just put in a marker element that refers to the sub-diagram
+            text = lookup.diagrams[el_id].kwargs["name"]
             ret = EditablePartial.from_call(
-                railroad.NonTerminal, text=lookup.diagrams[el_id].kwargs["name"]
+                railroad.NonTerminal, text=text, href=f"#{_make_bookmark(text)}"
             )
             return ret
 
     # Recursively convert child elements
     # Here we find the most relevant Railroad element for matching pyparsing Element
     # We use ``items=[]`` here to hold the place for where the child elements will go once created
+
+    # see if this element is normally hidden, and whether hidden elements are desired
+    # if not, just return None
+    if not element.show_in_diagram and not show_hidden:
+        return None
+
     if isinstance(element, pyparsing.And):
         # detect And's created with ``expr*N`` notation - for these use a OneOrMore with a repeat
         # (all will have the same name, and resultsName)
@@ -566,7 +634,9 @@ def _to_diagram_element(
         if show_groups:
             ret = EditablePartial.from_call(AnnotatedItem, label="", item="")
         else:
-            ret = EditablePartial.from_call(railroad.Sequence, items=[])
+            ret = EditablePartial.from_call(
+                railroad.Group, item=None, label=element_results_name
+            )
     elif isinstance(element, pyparsing.TokenConverter):
         label = type(element).__name__.lower()
         if label == "tokenconverter":
@@ -585,6 +655,7 @@ def _to_diagram_element(
                 name_hint,
                 show_results_names,
                 show_groups,
+                show_hidden,
             ]
             return _to_diagram_element(
                 (~element.not_ender.expr + element.expr)[1, ...].set_name(element.name),
@@ -601,16 +672,13 @@ def _to_diagram_element(
                 name_hint,
                 show_results_names,
                 show_groups,
+                show_hidden,
             ]
             return _to_diagram_element(
                 (~element.not_ender.expr + element.expr)[...].set_name(element.name),
                 *args,
             )
         ret = EditablePartial.from_call(railroad.ZeroOrMore, item="")
-    elif isinstance(element, pyparsing.Group):
-        ret = EditablePartial.from_call(
-            railroad.Group, item=None, label=element_results_name
-        )
     elif isinstance(element, pyparsing.Empty) and not element.customName:
         # Skip unnamed "Empty" elements
         ret = None
@@ -618,6 +686,9 @@ def _to_diagram_element(
         ret = EditablePartial.from_call(railroad.Sequence, items=[])
     elif len(exprs) > 0 and not element_results_name:
         ret = EditablePartial.from_call(railroad.Group, item="", label=name)
+    elif isinstance(element, pyparsing.Regex):
+        collapsed_patt = _collapse_verbose_regex(element.pattern)
+        ret = EditablePartial.from_call(railroad.Terminal, collapsed_patt)
     elif len(exprs) > 0:
         ret = EditablePartial.from_call(railroad.Sequence, items=[])
     else:
@@ -652,6 +723,7 @@ def _to_diagram_element(
             index=i,
             show_results_names=show_results_names,
             show_groups=show_groups,
+            show_hidden=show_hidden,
         )
 
         # Some elements don't need to be shown in the diagram
@@ -680,8 +752,10 @@ def _to_diagram_element(
     if el_id in lookup and lookup[el_id].extract and lookup[el_id].complete:
         lookup.extract_into_diagram(el_id)
         if ret is not None:
+            text = lookup.diagrams[el_id].kwargs["name"]
+            href = f"#{_make_bookmark(text)}"
             ret = EditablePartial.from_call(
-                railroad.NonTerminal, text=lookup.diagrams[el_id].kwargs["name"]
+                railroad.NonTerminal, text=text, href=href
             )
 
     return ret
diff --git a/libs/pyparsing/exceptions.py b/libs/pyparsing/exceptions.py
index 8db34f195a..237ca2ebf2 100644
--- a/libs/pyparsing/exceptions.py
+++ b/libs/pyparsing/exceptions.py
@@ -1,17 +1,23 @@
 # exceptions.py
+from __future__ import annotations
 
+import copy
 import re
 import sys
 import typing
+import warnings
+from functools import cached_property
 
+from .warnings import PyparsingDeprecationWarning
+from .unicode import pyparsing_unicode as ppu
 from .util import (
+    _collapse_string_to_ranges,
     col,
+    deprecate_argument,
     line,
     lineno,
-    _collapse_string_to_ranges,
     replaced_by_pep8,
 )
-from .unicode import pyparsing_unicode as ppu
 
 
 class _ExceptionWordUnicodeSet(
@@ -21,7 +27,7 @@ class _ExceptionWordUnicodeSet(
 
 
 _extract_alphanums = _collapse_string_to_ranges(_ExceptionWordUnicodeSet.alphanums)
-_exception_word_extractor = re.compile("([" + _extract_alphanums + "]{1,16})|.")
+_exception_word_extractor = re.compile(fr"([{_extract_alphanums}]{{1,16}})|.")
 
 
 class ParseBaseException(Exception):
@@ -31,7 +37,7 @@ class ParseBaseException(Exception):
     msg: str
     pstr: str
     parser_element: typing.Any  # "ParserElement"
-    args: typing.Tuple[str, int, typing.Optional[str]]
+    args: tuple[str, int, typing.Optional[str]]
 
     __slots__ = (
         "loc",
@@ -49,19 +55,18 @@ def __init__(
         loc: int = 0,
         msg: typing.Optional[str] = None,
         elem=None,
-    ):
-        self.loc = loc
+    ) -> None:
         if msg is None:
-            self.msg = pstr
-            self.pstr = ""
-        else:
-            self.msg = msg
-            self.pstr = pstr
+            msg, pstr = pstr, ""
+
+        self.loc = loc
+        self.msg = msg
+        self.pstr = pstr
         self.parser_element = elem
         self.args = (pstr, loc, msg)
 
     @staticmethod
-    def explain_exception(exc, depth=16):
+    def explain_exception(exc: Exception, depth: int = 16) -> str:
         """
         Method to take an exception and translate the Python internal traceback into a list
         of the pyparsing expressions that caused the exception to be raised.
@@ -82,17 +87,17 @@ def explain_exception(exc, depth=16):
 
         if depth is None:
             depth = sys.getrecursionlimit()
-        ret = []
+        ret: list[str] = []
         if isinstance(exc, ParseBaseException):
             ret.append(exc.line)
-            ret.append(f"{' ' * (exc.column - 1)}^")
+            ret.append(f"{'^':>{exc.column}}")
         ret.append(f"{type(exc).__name__}: {exc}")
 
-        if depth <= 0:
+        if depth <= 0 or exc.__traceback__ is None:
             return "\n".join(ret)
 
         callers = inspect.getinnerframes(exc.__traceback__, context=depth)
-        seen = set()
+        seen: set[int] = set()
         for ff in callers[-depth:]:
             frm = ff[0]
 
@@ -125,86 +130,123 @@ def explain_exception(exc, depth=16):
         return "\n".join(ret)
 
     @classmethod
-    def _from_exception(cls, pe):
+    def _from_exception(cls, pe) -> ParseBaseException:
         """
         internal factory method to simplify creating one type of ParseException
         from another - avoids having __init__ signature conflicts among subclasses
         """
         return cls(pe.pstr, pe.loc, pe.msg, pe.parser_element)
 
-    @property
+    @cached_property
     def line(self) -> str:
         """
         Return the line of text where the exception occurred.
         """
         return line(self.loc, self.pstr)
 
-    @property
+    @cached_property
     def lineno(self) -> int:
         """
         Return the 1-based line number of text where the exception occurred.
         """
         return lineno(self.loc, self.pstr)
 
-    @property
+    @cached_property
     def col(self) -> int:
         """
         Return the 1-based column on the line of text where the exception occurred.
         """
         return col(self.loc, self.pstr)
 
-    @property
+    @cached_property
     def column(self) -> int:
         """
         Return the 1-based column on the line of text where the exception occurred.
         """
         return col(self.loc, self.pstr)
 
+    @cached_property
+    def found(self) -> str:
+        if not self.pstr:
+            return ""
+
+        if self.loc >= len(self.pstr):
+            return "end of text"
+
+        # pull out next word at error location
+        found_match = _exception_word_extractor.match(self.pstr, self.loc)
+        if found_match is not None:
+            found_text = found_match[0]
+        else:
+            found_text = self.pstr[self.loc : self.loc + 1]
+
+        return repr(found_text).replace(r"\\", "\\")
+
     # pre-PEP8 compatibility
     @property
     def parserElement(self):
+        warnings.warn(
+            "parserElement is deprecated, use parser_element",
+            PyparsingDeprecationWarning,
+            stacklevel=2,
+        )
         return self.parser_element
 
     @parserElement.setter
     def parserElement(self, elem):
+        warnings.warn(
+            "parserElement is deprecated, use parser_element",
+            PyparsingDeprecationWarning,
+            stacklevel=2,
+        )
         self.parser_element = elem
 
+    def copy(self):
+        return copy.copy(self)
+
+    def formatted_message(self) -> str:
+        """
+        Output the formatted exception message.
+        Can be overridden to customize the message formatting or contents.
+
+        .. versionadded:: 3.2.0
+        """
+        found_phrase = f", found {self.found}" if self.found else ""
+        return f"{self.msg}{found_phrase}  (at char {self.loc}), (line:{self.lineno}, col:{self.column})"
+
     def __str__(self) -> str:
-        if self.pstr:
-            if self.loc >= len(self.pstr):
-                foundstr = ", found end of text"
-            else:
-                # pull out next word at error location
-                found_match = _exception_word_extractor.match(self.pstr, self.loc)
-                if found_match is not None:
-                    found = found_match.group(0)
-                else:
-                    found = self.pstr[self.loc : self.loc + 1]
-                foundstr = (", found %r" % found).replace(r"\\", "\\")
-        else:
-            foundstr = ""
-        return f"{self.msg}{foundstr}  (at char {self.loc}), (line:{self.lineno}, col:{self.column})"
+        """
+        .. versionchanged:: 3.2.0
+           Now uses :meth:`formatted_message` to format message.
+        """
+        try:
+            return self.formatted_message()
+        except Exception as ex:
+            return (
+                f"{type(self).__name__}: {self.msg}"
+                f" ({type(ex).__name__}: {ex} while formatting message)"
+            )
 
     def __repr__(self):
         return str(self)
 
     def mark_input_line(
-        self, marker_string: typing.Optional[str] = None, *, markerString: str = ">!<"
+        self, marker_string: typing.Optional[str] = None, **kwargs
     ) -> str:
         """
         Extracts the exception line from the input string, and marks
         the location of the exception with a special symbol.
         """
+        markerString: str = deprecate_argument(kwargs, "markerString", ">!<")
+
         markerString = marker_string if marker_string is not None else markerString
         line_str = self.line
         line_column = self.column - 1
         if markerString:
-            line_str = "".join(
-                (line_str[:line_column], markerString, line_str[line_column:])
-            )
+            line_str = f"{line_str[:line_column]}{markerString}{line_str[line_column:]}"
         return line_str.strip()
 
-    def explain(self, depth=16) -> str:
+    def explain(self, depth: int = 16) -> str:
         """
         Method to translate the Python internal traceback into a list
         of the pyparsing expressions that caused the exception to be raised.
@@ -218,7 +260,9 @@ def explain(self, depth=16) -> str:
         Returns a multi-line string listing the ParserElements and/or function names in the
         exception's stack trace.
 
-        Example::
+        Example:
+
+        .. testcode::
 
             # an expression to parse 3 integers
             expr = pp.Word(pp.nums) * 3
@@ -228,11 +272,13 @@ def explain(self, depth=16) -> str:
             except pp.ParseException as pe:
                 print(pe.explain(depth=0))
 
-        prints::
+        prints:
+
+        .. testoutput::
 
             123 456 A789
                     ^
-            ParseException: Expected W:(0-9), found 'A'  (at char 8), (line:1, col:9)
+            ParseException: Expected W:(0-9), found 'A789'  (at char 8), (line:1, col:9)
 
         Note: the diagnostic output will include string representations of the expressions
         that failed to parse. These representations will be more helpful if you use `set_name` to
@@ -255,18 +301,21 @@ class ParseException(ParseBaseException):
     """
     Exception thrown when a parse expression doesn't match the input string
 
-    Example::
+    Example:
+
+    .. testcode::
 
         integer = Word(nums).set_name("integer")
         try:
             integer.parse_string("ABC")
         except ParseException as pe:
-            print(pe)
-            print(f"column: {pe.column}")
+            print(pe, f"column: {pe.column}")
 
-    prints::
+    prints:
 
-       Expected integer (at char 0), (line:1, col:1) column: 1
+    .. testoutput::
+
+       Expected integer, found 'ABC'  (at char 0), (line:1, col:1) column: 1
 
     """
 
@@ -289,12 +338,15 @@ class ParseSyntaxException(ParseFatalException):
 
 class RecursiveGrammarException(Exception):
     """
+    .. deprecated:: 3.0.0
+       Only used by the deprecated :meth:`ParserElement.validate`.
+
     Exception thrown by :class:`ParserElement.validate` if the
     grammar could be left-recursive; parser may need to enable
     left recursion using :class:`ParserElement.enable_left_recursion<ParserElement.enable_left_recursion>`
     """
 
-    def __init__(self, parseElementList):
+    def __init__(self, parseElementList) -> None:
         self.parseElementTrace = parseElementList
 
     def __str__(self) -> str:
diff --git a/libs/pyparsing/helpers.py b/libs/pyparsing/helpers.py
index d5d14a08d6..ac9d725a0f 100644
--- a/libs/pyparsing/helpers.py
+++ b/libs/pyparsing/helpers.py
@@ -1,5 +1,6 @@
 # helpers.py
 import html.entities
+import operator
 import re
 import sys
 import typing
@@ -10,18 +11,23 @@
     _bslash,
     _flatten,
     _escape_regex_range_chars,
+    make_compressed_re,
     replaced_by_pep8,
 )
 
 
+def _suppression(expr: Union[ParserElement, str]) -> ParserElement:
+    # internal helper to avoid wrapping Suppress inside another Suppress
+    if isinstance(expr, Suppress):
+        return expr
+    return Suppress(expr)
+
+
 #
 # global helpers
 #
 def counted_array(
-    expr: ParserElement,
-    int_expr: typing.Optional[ParserElement] = None,
-    *,
-    intExpr: typing.Optional[ParserElement] = None,
+    expr: ParserElement, int_expr: typing.Optional[ParserElement] = None, **kwargs
 ) -> ParserElement:
     """Helper to define a counted list of expressions.
 
@@ -36,28 +42,43 @@ def counted_array(
     If ``int_expr`` is specified, it should be a pyparsing expression
     that produces an integer value.
 
-    Example::
+    Examples:
+
+    .. doctest::
+
+        >>> counted_array(Word(alphas)).parse_string('2 ab cd ef')
+        ParseResults(['ab', 'cd'], {})
+
+    - In this parser, the leading integer value is given in binary,
+      '10' indicating that 2 values are in the array:
 
-        counted_array(Word(alphas)).parse_string('2 ab cd ef')  # -> ['ab', 'cd']
+      .. doctest::
 
-        # in this parser, the leading integer value is given in binary,
-        # '10' indicating that 2 values are in the array
-        binary_constant = Word('01').set_parse_action(lambda t: int(t[0], 2))
-        counted_array(Word(alphas), int_expr=binary_constant).parse_string('10 ab cd ef')  # -> ['ab', 'cd']
+        >>> binary_constant = Word('01').set_parse_action(lambda t: int(t[0], 2))
+        >>> counted_array(Word(alphas), int_expr=binary_constant
+        ...     ).parse_string('10 ab cd ef')
+        ParseResults(['ab', 'cd'], {})
 
-        # if other fields must be parsed after the count but before the
-        # list items, give the fields results names and they will
-        # be preserved in the returned ParseResults:
-        count_with_metadata = integer + Word(alphas)("type")
-        typed_array = counted_array(Word(alphanums), int_expr=count_with_metadata)("items")
-        result = typed_array.parse_string("3 bool True True False")
-        print(result.dump())
+    - If other fields must be parsed after the count but before the
+      list items, give the fields results names and they will
+      be preserved in the returned ParseResults:
 
-        # prints
-        # ['True', 'True', 'False']
-        # - items: ['True', 'True', 'False']
-        # - type: 'bool'
+      .. doctest::
+
+         >>> ppc = pyparsing.common
+         >>> count_with_metadata = ppc.integer + Word(alphas)("type")
+         >>> typed_array = counted_array(Word(alphanums),
+         ...     int_expr=count_with_metadata)("items")
+         >>> result = typed_array.parse_string("3 bool True True False")
+         >>> print(result.dump())
+         ['True', 'True', 'False']
+         - items: ['True', 'True', 'False']
+         - type: 'bool'
     """
+    intExpr: typing.Optional[ParserElement] = deprecate_argument(
+        kwargs, "intExpr", None
+    )
+
     intExpr = intExpr or int_expr
     array_expr = Forward()
 
@@ -82,9 +103,11 @@ def match_previous_literal(expr: ParserElement) -> ParserElement:
     the tokens matched in a previous expression, that is, it looks for
     a 'repeat' of a previous expression.  For example::
 
-        first = Word(nums)
-        second = match_previous_literal(first)
-        match_expr = first + ":" + second
+    .. testcode::
+
+       first = Word(nums)
+       second = match_previous_literal(first)
+       match_expr = first + ":" + second
 
     will match ``"1:1"``, but not ``"1:2"``.  Because this
     matches a previous literal, will also match the leading
@@ -107,19 +130,21 @@ def copy_token_to_repeater(s, l, t):
         tflat = _flatten(t.as_list())
         rep << And(Literal(tt) for tt in tflat)
 
-    expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
-    rep.set_name("(prev) " + str(expr))
+    expr.add_parse_action(copy_token_to_repeater, call_during_try=True)
+    rep.set_name(f"(prev) {expr}")
     return rep
 
 
 def match_previous_expr(expr: ParserElement) -> ParserElement:
     """Helper to define an expression that is indirectly defined from
     the tokens matched in a previous expression, that is, it looks for
-    a 'repeat' of a previous expression.  For example::
+    a 'repeat' of a previous expression.  For example:
+
+    .. testcode::
 
-        first = Word(nums)
-        second = match_previous_expr(first)
-        match_expr = first + ":" + second
+       first = Word(nums)
+       second = match_previous_expr(first)
+       match_expr = first + ":" + second
 
     will match ``"1:1"``, but not ``"1:2"``.  Because this
     matches by expressions, will *not* match the leading ``"1:1"``
@@ -141,10 +166,10 @@ def must_match_these_tokens(s, l, t):
                     s, l, f"Expected {matchTokens}, found{theseTokens}"
                 )
 
-        rep.set_parse_action(must_match_these_tokens, callDuringTry=True)
+        rep.set_parse_action(must_match_these_tokens, call_during_try=True)
 
-    expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
-    rep.set_name("(prev) " + str(expr))
+    expr.add_parse_action(copy_token_to_repeater, call_during_try=True)
+    rep.set_name(f"(prev) {expr}")
     return rep
 
 
@@ -153,42 +178,46 @@ def one_of(
     caseless: bool = False,
     use_regex: bool = True,
     as_keyword: bool = False,
-    *,
-    useRegex: bool = True,
-    asKeyword: bool = False,
+    **kwargs,
 ) -> ParserElement:
     """Helper to quickly define a set of alternative :class:`Literal` s,
     and makes sure to do longest-first testing when there is a conflict,
     regardless of the input order, but returns
     a :class:`MatchFirst` for best performance.
 
-    Parameters:
+    :param strs: a string of space-delimited literals, or a collection of
+       string literals
+    :param caseless: treat all literals as caseless
+    :param use_regex: bool - as an optimization, will
+       generate a :class:`Regex` object; otherwise, will generate
+       a :class:`MatchFirst` object (if ``caseless=True`` or
+       ``as_keyword=True``, or if creating a :class:`Regex` raises an exception)
+    :param as_keyword: bool - enforce :class:`Keyword`-style matching on the
+       generated expressions
+
+    Parameters ``asKeyword`` and ``useRegex`` are retained for pre-PEP8
+    compatibility, but will be removed in a future release.
+
+    Example:
+
+    .. testcode::
+
+       comp_oper = one_of("< = > <= >= !=")
+       var = Word(alphas)
+       number = Word(nums)
+       term = var | number
+       comparison_expr = term + comp_oper + term
+       print(comparison_expr.search_string("B = 12  AA=23 B<=AA AA>12"))
 
-    - ``strs`` - a string of space-delimited literals, or a collection of
-      string literals
-    - ``caseless`` - treat all literals as caseless - (default= ``False``)
-    - ``use_regex`` - as an optimization, will
-      generate a :class:`Regex` object; otherwise, will generate
-      a :class:`MatchFirst` object (if ``caseless=True`` or ``as_keyword=True``, or if
-      creating a :class:`Regex` raises an exception) - (default= ``True``)
-    - ``as_keyword`` - enforce :class:`Keyword`-style matching on the
-      generated expressions - (default= ``False``)
-    - ``asKeyword`` and ``useRegex`` are retained for pre-PEP8 compatibility,
-      but will be removed in a future release
-
-    Example::
-
-        comp_oper = one_of("< = > <= >= !=")
-        var = Word(alphas)
-        number = Word(nums)
-        term = var | number
-        comparison_expr = term + comp_oper + term
-        print(comparison_expr.search_string("B = 12  AA=23 B<=AA AA>12"))
-
-    prints::
-
-        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
+    prints:
+
+    .. testoutput::
+
+       [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
     """
+    useRegex: bool = deprecate_argument(kwargs, "useRegex", True)
+    asKeyword: bool = deprecate_argument(kwargs, "asKeyword", False)
+
     asKeyword = asKeyword or as_keyword
     useRegex = useRegex and use_regex
 
@@ -197,21 +226,21 @@ def one_of(
         and __diag__.warn_on_multiple_string_args_to_oneof
     ):
         warnings.warn(
-            "More than one string argument passed to one_of, pass"
+            "warn_on_multiple_string_args_to_oneof:"
+            " More than one string argument passed to one_of, pass"
             " choices as a list or space-delimited string",
+            PyparsingDiagnosticWarning,
             stacklevel=2,
         )
 
     if caseless:
-        isequal = lambda a, b: a.upper() == b.upper()
+        is_equal = lambda a, b: a.upper() == b.upper()
         masks = lambda a, b: b.upper().startswith(a.upper())
-        parseElementClass = CaselessKeyword if asKeyword else CaselessLiteral
     else:
-        isequal = lambda a, b: a == b
+        is_equal = operator.eq
         masks = lambda a, b: b.startswith(a)
-        parseElementClass = Keyword if asKeyword else Literal
 
-    symbols: List[str] = []
+    symbols: list[str]
     if isinstance(strs, str_type):
         strs = typing.cast(str, strs)
         symbols = strs.split()
@@ -224,20 +253,19 @@ def one_of(
 
     # reorder given symbols to take care to avoid masking longer choices with shorter ones
     # (but only if the given symbols are not just single characters)
-    if any(len(sym) > 1 for sym in symbols):
-        i = 0
-        while i < len(symbols) - 1:
-            cur = symbols[i]
-            for j, other in enumerate(symbols[i + 1 :]):
-                if isequal(other, cur):
-                    del symbols[i + j + 1]
-                    break
-                if masks(cur, other):
-                    del symbols[i + j + 1]
-                    symbols.insert(i, other)
-                    break
-            else:
-                i += 1
+    i = 0
+    while i < len(symbols) - 1:
+        cur = symbols[i]
+        for j, other in enumerate(symbols[i + 1 :]):
+            if is_equal(other, cur):
+                del symbols[i + j + 1]
+                break
+            if len(other) > len(cur) and masks(cur, other):
+                del symbols[i + j + 1]
+                symbols.insert(i, other)
+                break
+        else:
+            i += 1
 
     if useRegex:
         re_flags: int = re.IGNORECASE if caseless else 0
@@ -253,7 +281,8 @@ def one_of(
             if asKeyword:
                 patt = rf"\b(?:{patt})\b"
 
-            ret = Regex(patt, flags=re_flags).set_name(" | ".join(symbols))
+            ret = Regex(patt, flags=re_flags)
+            ret.set_name(" | ".join(repr(s) for s in symbols))
 
             if caseless:
                 # add parse action to return symbols as specified, not in random
@@ -265,16 +294,26 @@ def one_of(
 
         except re.error:
             warnings.warn(
-                "Exception creating Regex for one_of, building MatchFirst", stacklevel=2
+                "Exception creating Regex for one_of, building MatchFirst",
+                PyparsingDiagnosticWarning,
+                stacklevel=2,
             )
 
-    # last resort, just use MatchFirst
-    return MatchFirst(parseElementClass(sym) for sym in symbols).set_name(
+    # last resort, just use MatchFirst of Token class corresponding to caseless
+    # and asKeyword settings
+    CASELESS = KEYWORD = True
+    parse_element_class = {
+        (CASELESS, KEYWORD): CaselessKeyword,
+        (CASELESS, not KEYWORD): CaselessLiteral,
+        (not CASELESS, KEYWORD): Keyword,
+        (not CASELESS, not KEYWORD): Literal,
+    }[(caseless, asKeyword)]
+    return MatchFirst(parse_element_class(sym) for sym in symbols).set_name(
         " | ".join(symbols)
     )
 
 
-def dict_of(key: ParserElement, value: ParserElement) -> ParserElement:
+def dict_of(key: ParserElement, value: ParserElement) -> Dict:
     """Helper to easily and clearly define a dictionary by specifying
     the respective patterns for the key and value.  Takes care of
     defining the :class:`Dict`, :class:`ZeroOrMore`, and
@@ -284,38 +323,55 @@ def dict_of(key: ParserElement, value: ParserElement) -> ParserElement:
     pattern can include named results, so that the :class:`Dict` results
     can include named token fields.
 
-    Example::
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-        print(attr_expr[1, ...].parse_string(text).dump())
-
-        attr_label = label
-        attr_value = Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join)
-
-        # similar to Dict, but simpler call format
-        result = dict_of(attr_label, attr_value).parse_string(text)
-        print(result.dump())
-        print(result['shape'])
-        print(result.shape)  # object attribute access works too
-        print(result.as_dict())
-
-    prints::
-
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: 'light blue'
-        - posn: 'upper left'
-        - shape: 'SQUARE'
-        - texture: 'burlap'
-        SQUARE
-        SQUARE
-        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
+    Example:
+
+    .. doctest::
+
+       >>> text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
+
+       >>> data_word = Word(alphas)
+       >>> label = data_word + FollowedBy(':')
+       >>> attr_expr = (
+       ...    label
+       ...    + Suppress(':')
+       ...    + OneOrMore(data_word, stop_on=label)
+       ...    .set_parse_action(' '.join))
+       >>> print(attr_expr[1, ...].parse_string(text).dump())
+       ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
+
+       >>> attr_label = label
+       >>> attr_value = Suppress(':') + OneOrMore(data_word, stop_on=label
+       ...   ).set_parse_action(' '.join)
+
+       # similar to Dict, but simpler call format
+       >>> result = dict_of(attr_label, attr_value).parse_string(text)
+       >>> print(result.dump())
+       [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
+       - color: 'light blue'
+       - posn: 'upper left'
+       - shape: 'SQUARE'
+       - texture: 'burlap'
+       [0]:
+         ['shape', 'SQUARE']
+       [1]:
+         ['posn', 'upper left']
+       [2]:
+         ['color', 'light blue']
+       [3]:
+         ['texture', 'burlap']
+
+       >>> print(result['shape'])
+       SQUARE
+       >>> print(result.shape)  # object attribute access works too
+       SQUARE
+       >>> print(result.as_dict())
+       {'shape': 'SQUARE', 'posn': 'upper left', 'color': 'light blue', 'texture': 'burlap'}
     """
     return Dict(OneOrMore(Group(key + value)))
 
 
 def original_text_for(
-    expr: ParserElement, as_string: bool = True, *, asString: bool = True
+    expr: ParserElement, as_string: bool = True, **kwargs
 ) -> ParserElement:
     """Helper to return the original, untokenized text for a given
     expression.  Useful to restore the parsed fields of an HTML start
@@ -335,19 +391,25 @@ def original_text_for(
     The ``asString`` pre-PEP8 argument is retained for compatibility,
     but will be removed in a future release.
 
-    Example::
+    Example:
+
+    .. testcode::
 
-        src = "this is test <b> bold <i>text</i> </b> normal text "
-        for tag in ("b", "i"):
-            opener, closer = make_html_tags(tag)
-            patt = original_text_for(opener + ... + closer)
-            print(patt.search_string(src)[0])
+       src = "this is test <b> bold <i>text</i> </b> normal text "
+       for tag in ("b", "i"):
+           opener, closer = make_html_tags(tag)
+           patt = original_text_for(opener + ... + closer)
+           print(patt.search_string(src)[0])
 
-    prints::
+    prints:
 
-        ['<b> bold <i>text</i> </b>']
-        ['<i>text</i>']
+    .. testoutput::
+
+       ['<b> bold <i>text</i> </b>']
+       ['<i>text</i>']
     """
+    asString: bool = deprecate_argument(kwargs, "asString", True)
+
     asString = asString and as_string
 
     locMarker = Empty().set_parse_action(lambda s, loc, t: loc)
@@ -376,7 +438,10 @@ def ungroup(expr: ParserElement) -> ParserElement:
 
 def locatedExpr(expr: ParserElement) -> ParserElement:
     """
-    (DEPRECATED - future code should use the :class:`Located` class)
+    .. deprecated:: 3.0.0
+       Use the :class:`Located` class instead. Note that `Located`
+       returns results with one less grouping level.
+
     Helper to decorate a returned token with its starting and ending
     locations in the input string.
 
@@ -387,51 +452,50 @@ def locatedExpr(expr: ParserElement) -> ParserElement:
     - ``value`` - the actual parsed results
 
     Be careful if the input text contains ``<TAB>`` characters, you
-    may want to call :class:`ParserElement.parse_with_tabs`
-
-    Example::
-
-        wd = Word(alphas)
-        for match in locatedExpr(wd).search_string("ljsdf123lksdjjf123lkkjj1222"):
-            print(match)
-
-    prints::
-
-        [[0, 'ljsdf', 5]]
-        [[8, 'lksdjjf', 15]]
-        [[18, 'lkkjj', 23]]
+    may want to call :meth:`ParserElement.parse_with_tabs`
     """
+    warnings.warn(
+        f"{'locatedExpr'!r} deprecated - use {'Located'!r}",
+        PyparsingDeprecationWarning,
+        stacklevel=2,
+    )
+
     locator = Empty().set_parse_action(lambda ss, ll, tt: ll)
     return Group(
         locator("locn_start")
         + expr("value")
-        + locator.copy().leaveWhitespace()("locn_end")
+        + locator.copy().leave_whitespace()("locn_end")
     )
 
 
+# define special default value to permit None as a significant value for
+# ignore_expr
+_NO_IGNORE_EXPR_GIVEN = NoMatch()
+
+
 def nested_expr(
     opener: Union[str, ParserElement] = "(",
     closer: Union[str, ParserElement] = ")",
     content: typing.Optional[ParserElement] = None,
-    ignore_expr: ParserElement = quoted_string(),
-    *,
-    ignoreExpr: ParserElement = quoted_string(),
+    ignore_expr: typing.Optional[ParserElement] = _NO_IGNORE_EXPR_GIVEN,
+    **kwargs,
 ) -> ParserElement:
     """Helper method for defining nested lists enclosed in opening and
     closing delimiters (``"("`` and ``")"`` are the default).
 
-    Parameters:
+    :param opener: str - opening character for a nested list
+       (default= ``"("``); can also be a pyparsing expression
+
+    :param closer: str - closing character for a nested list
+       (default= ``")"``); can also be a pyparsing expression
+
+    :param content: expression for items within the nested lists
 
-    - ``opener`` - opening character for a nested list
-      (default= ``"("``); can also be a pyparsing expression
-    - ``closer`` - closing character for a nested list
-      (default= ``")"``); can also be a pyparsing expression
-    - ``content`` - expression for items within the nested lists
-      (default= ``None``)
-    - ``ignore_expr`` - expression for ignoring opening and closing delimiters
-      (default= :class:`quoted_string`)
-    - ``ignoreExpr`` - this pre-PEP8 argument is retained for compatibility
-      but will be removed in a future release
+    :param ignore_expr: expression for ignoring opening and closing delimiters
+       (default = :class:`quoted_string`)
+
+    Parameter ``ignoreExpr`` is retained for compatibility
+    but will be removed in a future release.
 
     If an expression is not provided for the content argument, the
     nested expression will capture all whitespace-delimited content
@@ -445,49 +509,62 @@ def nested_expr(
     :class:`quoted_string`, but if no expressions are to be ignored, then
     pass ``None`` for this argument.
 
-    Example::
+    Example:
 
-        data_type = one_of("void int short long char float double")
-        decl_data_type = Combine(data_type + Opt(Word('*')))
-        ident = Word(alphas+'_', alphanums+'_')
-        number = pyparsing_common.number
-        arg = Group(decl_data_type + ident)
-        LPAR, RPAR = map(Suppress, "()")
+    .. testcode::
 
-        code_body = nested_expr('{', '}', ignore_expr=(quoted_string | c_style_comment))
+       data_type = one_of("void int short long char float double")
+       decl_data_type = Combine(data_type + Opt(Word('*')))
+       ident = Word(alphas+'_', alphanums+'_')
+       number = pyparsing_common.number
+       arg = Group(decl_data_type + ident)
+       LPAR, RPAR = map(Suppress, "()")
 
-        c_function = (decl_data_type("type")
-                      + ident("name")
-                      + LPAR + Opt(DelimitedList(arg), [])("args") + RPAR
-                      + code_body("body"))
-        c_function.ignore(c_style_comment)
+       code_body = nested_expr('{', '}', ignore_expr=(quoted_string | c_style_comment))
 
-        source_code = '''
-            int is_odd(int x) {
-                return (x%2);
-            }
+       c_function = (decl_data_type("type")
+                     + ident("name")
+                     + LPAR + Opt(DelimitedList(arg), [])("args") + RPAR
+                     + code_body("body"))
+       c_function.ignore(c_style_comment)
 
-            int dec_to_hex(char hchar) {
-                if (hchar >= '0' && hchar <= '9') {
-                    return (ord(hchar)-ord('0'));
-                } else {
-                    return (10+ord(hchar)-ord('A'));
-                }
-            }
-        '''
-        for func in c_function.search_string(source_code):
-            print("%(name)s (%(type)s) args: %(args)s" % func)
+       source_code = '''
+           int is_odd(int x) {
+               return (x%2);
+           }
 
+           int dec_to_hex(char hchar) {
+               if (hchar >= '0' && hchar <= '9') {
+                   return (ord(hchar)-ord('0'));
+               } else {
+                   return (10+ord(hchar)-ord('A'));
+               }
+           }
+       '''
+       for func in c_function.search_string(source_code):
+           print(f"{func.name} ({func.type}) args: {func.args}")
 
-    prints::
 
-        is_odd (int) args: [['int', 'x']]
-        dec_to_hex (int) args: [['char', 'hchar']]
+    prints:
+
+    .. testoutput::
+
+       is_odd (int) args: [['int', 'x']]
+       dec_to_hex (int) args: [['char', 'hchar']]
     """
+    ignoreExpr: ParserElement = deprecate_argument(
+        kwargs, "ignoreExpr", _NO_IGNORE_EXPR_GIVEN
+    )
+
     if ignoreExpr != ignore_expr:
-        ignoreExpr = ignore_expr if ignoreExpr == quoted_string() else ignoreExpr
+        ignoreExpr = ignore_expr if ignoreExpr is _NO_IGNORE_EXPR_GIVEN else ignoreExpr  # type: ignore [assignment]
+
+    if ignoreExpr is _NO_IGNORE_EXPR_GIVEN:
+        ignoreExpr = quoted_string()
+
     if opener == closer:
         raise ValueError("opening and closing strings cannot be the same")
+
     if content is None:
         if isinstance(opener, str_type) and isinstance(closer, str_type):
             opener = typing.cast(str, opener)
@@ -502,11 +579,14 @@ def nested_expr(
                                 exact=1,
                             )
                         )
-                    ).set_parse_action(lambda t: t[0].strip())
+                    )
                 else:
-                    content = empty.copy() + CharsNotIn(
-                        opener + closer + ParserElement.DEFAULT_WHITE_CHARS
-                    ).set_parse_action(lambda t: t[0].strip())
+                    content = Combine(
+                        Empty()
+                        + CharsNotIn(
+                            opener + closer + ParserElement.DEFAULT_WHITE_CHARS
+                        )
+                    )
             else:
                 if ignoreExpr is not None:
                     content = Combine(
@@ -516,7 +596,7 @@ def nested_expr(
                             + ~Literal(closer)
                             + CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS, exact=1)
                         )
-                    ).set_parse_action(lambda t: t[0].strip())
+                    )
                 else:
                     content = Combine(
                         OneOrMore(
@@ -524,26 +604,40 @@ def nested_expr(
                             + ~Literal(closer)
                             + CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS, exact=1)
                         )
-                    ).set_parse_action(lambda t: t[0].strip())
+                    )
         else:
             raise ValueError(
                 "opening and closing arguments must be strings if no content expression is given"
             )
+
+        # for these internally-created context expressions, simulate whitespace-skipping
+        if ParserElement.DEFAULT_WHITE_CHARS:
+            content.set_parse_action(
+                lambda t: t[0].strip(ParserElement.DEFAULT_WHITE_CHARS)
+            )
+
     ret = Forward()
     if ignoreExpr is not None:
         ret <<= Group(
-            Suppress(opener) + ZeroOrMore(ignoreExpr | ret | content) + Suppress(closer)
+            _suppression(opener)
+            + ZeroOrMore(ignoreExpr | ret | content)
+            + _suppression(closer)
         )
     else:
-        ret <<= Group(Suppress(opener) + ZeroOrMore(ret | content) + Suppress(closer))
+        ret <<= Group(
+            _suppression(opener) + ZeroOrMore(ret | content) + _suppression(closer)
+        )
+
     ret.set_name(f"nested {opener}{closer} expression")
+
     # don't override error message from content expressions
     ret.errmsg = None
     return ret
 
 
 def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">")):
-    """Internal helper to construct opening and closing tag expressions, given a tag name"""
+    """Internal helper to construct opening and closing tag expressions,
+    given a tag name"""
     if isinstance(tagStr, str_type):
         resname = tagStr
         tagStr = Keyword(tagStr, caseless=not xml)
@@ -601,35 +695,39 @@ def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">"))
 
 
 def make_html_tags(
-    tag_str: Union[str, ParserElement]
-) -> Tuple[ParserElement, ParserElement]:
+    tag_str: Union[str, ParserElement],
+) -> tuple[ParserElement, ParserElement]:
     """Helper to construct opening and closing tag expressions for HTML,
     given a tag name. Matches tags in either upper or lower case,
     attributes with namespaces and with quoted or unquoted values.
 
-    Example::
+    Example:
+
+    .. testcode::
 
-        text = '<td>More info at the <a href="https://github.com/pyparsing/pyparsing/wiki">pyparsing</a> wiki page</td>'
-        # make_html_tags returns pyparsing expressions for the opening and
-        # closing tags as a 2-tuple
-        a, a_end = make_html_tags("A")
-        link_expr = a + SkipTo(a_end)("link_text") + a_end
+       text = '<td>More info at the <a href="https://github.com/pyparsing/pyparsing/wiki">pyparsing</a> wiki page</td>'
+       # make_html_tags returns pyparsing expressions for the opening and
+       # closing tags as a 2-tuple
+       a, a_end = make_html_tags("A")
+       link_expr = a + SkipTo(a_end)("link_text") + a_end
 
-        for link in link_expr.search_string(text):
-            # attributes in the <A> tag (like "href" shown here) are
-            # also accessible as named results
-            print(link.link_text, '->', link.href)
+       for link in link_expr.search_string(text):
+           # attributes in the <A> tag (like "href" shown here) are
+           # also accessible as named results
+           print(link.link_text, '->', link.href)
 
-    prints::
+    prints:
 
-        pyparsing -> https://github.com/pyparsing/pyparsing/wiki
+    .. testoutput::
+
+       pyparsing -> https://github.com/pyparsing/pyparsing/wiki
     """
     return _makeTags(tag_str, False)
 
 
 def make_xml_tags(
-    tag_str: Union[str, ParserElement]
-) -> Tuple[ParserElement, ParserElement]:
+    tag_str: Union[str, ParserElement],
+) -> tuple[ParserElement, ParserElement]:
     """Helper to construct opening and closing tag expressions for XML,
     given a tag name. Matches tags only in the given upper/lower case.
 
@@ -645,9 +743,12 @@ def make_xml_tags(
 )
 
 _htmlEntityMap = {k.rstrip(";"): v for k, v in html.entities.html5.items()}
-common_html_entity = Regex("&(?P<entity>" + "|".join(_htmlEntityMap) + ");").set_name(
-    "common HTML entity"
+_most_common_entities = "nbsp lt gt amp quot apos cent pound euro copy".replace(
+    " ", "|"
 )
+common_html_entity = Regex(
+    lambda: f"&(?P<entity>{_most_common_entities}|{make_compressed_re(_htmlEntityMap)});"
+).set_name("common HTML entity")
 
 
 def replace_html_entity(s, l, t):
@@ -664,16 +765,16 @@ class OpAssoc(Enum):
 
 
 InfixNotationOperatorArgType = Union[
-    ParserElement, str, Tuple[Union[ParserElement, str], Union[ParserElement, str]]
+    ParserElement, str, tuple[Union[ParserElement, str], Union[ParserElement, str]]
 ]
 InfixNotationOperatorSpec = Union[
-    Tuple[
+    tuple[
         InfixNotationOperatorArgType,
         int,
         OpAssoc,
         typing.Optional[ParseAction],
     ],
-    Tuple[
+    tuple[
         InfixNotationOperatorArgType,
         int,
         OpAssoc,
@@ -683,10 +784,10 @@ class OpAssoc(Enum):
 
 def infix_notation(
     base_expr: ParserElement,
-    op_list: List[InfixNotationOperatorSpec],
+    op_list: list[InfixNotationOperatorSpec],
     lpar: Union[str, ParserElement] = Suppress("("),
     rpar: Union[str, ParserElement] = Suppress(")"),
-) -> ParserElement:
+) -> Forward:
     """Helper method for constructing grammars of expressions made up of
     operators working in a precedence hierarchy.  Operators may be unary
     or binary, left- or right-associative.  Parse actions can also be
@@ -701,69 +802,77 @@ def infix_notation(
 
     Parameters:
 
-    - ``base_expr`` - expression representing the most basic operand to
-      be used in the expression
-    - ``op_list`` - list of tuples, one for each operator precedence level
-      in the expression grammar; each tuple is of the form ``(op_expr,
-      num_operands, right_left_assoc, (optional)parse_action)``, where:
-
-      - ``op_expr`` is the pyparsing expression for the operator; may also
-        be a string, which will be converted to a Literal; if ``num_operands``
-        is 3, ``op_expr`` is a tuple of two expressions, for the two
-        operators separating the 3 terms
-      - ``num_operands`` is the number of terms for this operator (must be 1,
-        2, or 3)
-      - ``right_left_assoc`` is the indicator whether the operator is right
-        or left associative, using the pyparsing-defined constants
-        ``OpAssoc.RIGHT`` and ``OpAssoc.LEFT``.
-      - ``parse_action`` is the parse action to be associated with
-        expressions matching this operator expression (the parse action
-        tuple member may be omitted); if the parse action is passed
-        a tuple or list of functions, this is equivalent to calling
-        ``set_parse_action(*fn)``
-        (:class:`ParserElement.set_parse_action`)
-    - ``lpar`` - expression for matching left-parentheses; if passed as a
-      str, then will be parsed as ``Suppress(lpar)``. If lpar is passed as
-      an expression (such as ``Literal('(')``), then it will be kept in
-      the parsed results, and grouped with them. (default= ``Suppress('(')``)
-    - ``rpar`` - expression for matching right-parentheses; if passed as a
-      str, then will be parsed as ``Suppress(rpar)``. If rpar is passed as
-      an expression (such as ``Literal(')')``), then it will be kept in
-      the parsed results, and grouped with them. (default= ``Suppress(')')``)
-
-    Example::
-
-        # simple example of four-function arithmetic with ints and
-        # variable names
-        integer = pyparsing_common.signed_integer
-        varname = pyparsing_common.identifier
-
-        arith_expr = infix_notation(integer | varname,
-            [
-            ('-', 1, OpAssoc.RIGHT),
-            (one_of('* /'), 2, OpAssoc.LEFT),
-            (one_of('+ -'), 2, OpAssoc.LEFT),
-            ])
-
-        arith_expr.run_tests('''
-            5+3*6
-            (5+3)*6
-            -2--11
-            ''', full_dump=False)
-
-    prints::
-
-        5+3*6
-        [[5, '+', [3, '*', 6]]]
-
-        (5+3)*6
-        [[[5, '+', 3], '*', 6]]
-
-        (5+x)*y
-        [[[5, '+', 'x'], '*', 'y']]
-
-        -2--11
-        [[['-', 2], '-', ['-', 11]]]
+    :param base_expr: expression representing the most basic operand to
+       be used in the expression
+    :param op_list: list of tuples, one for each operator precedence level
+       in the expression grammar; each tuple is of the form ``(op_expr,
+       num_operands, right_left_assoc, (optional)parse_action)``, where:
+
+       - ``op_expr`` is the pyparsing expression for the operator; may also
+         be a string, which will be converted to a Literal; if ``num_operands``
+         is 3, ``op_expr`` is a tuple of two expressions, for the two
+         operators separating the 3 terms
+       - ``num_operands`` is the number of terms for this operator (must be 1,
+         2, or 3)
+       - ``right_left_assoc`` is the indicator whether the operator is right
+         or left associative, using the pyparsing-defined constants
+         ``OpAssoc.RIGHT`` and ``OpAssoc.LEFT``.
+       - ``parse_action`` is the parse action to be associated with
+         expressions matching this operator expression (the parse action
+         tuple member may be omitted); if the parse action is passed
+         a tuple or list of functions, this is equivalent to calling
+         ``set_parse_action(*fn)``
+         (:class:`ParserElement.set_parse_action`)
+
+    :param lpar: expression for matching left-parentheses; if passed as a
+       str, then will be parsed as ``Suppress(lpar)``. If lpar is passed as
+       an expression (such as ``Literal('(')``), then it will be kept in
+       the parsed results, and grouped with them. (default= ``Suppress('(')``)
+    :param rpar: expression for matching right-parentheses; if passed as a
+       str, then will be parsed as ``Suppress(rpar)``. If rpar is passed as
+       an expression (such as ``Literal(')')``), then it will be kept in
+       the parsed results, and grouped with them. (default= ``Suppress(')')``)
+
+    Example:
+
+    .. testcode::
+
+       # simple example of four-function arithmetic with ints and
+       # variable names
+       integer = pyparsing_common.signed_integer
+       varname = pyparsing_common.identifier
+
+       arith_expr = infix_notation(integer | varname,
+           [
+           ('-', 1, OpAssoc.RIGHT),
+           (one_of('* /'), 2, OpAssoc.LEFT),
+           (one_of('+ -'), 2, OpAssoc.LEFT),
+           ])
+
+       arith_expr.run_tests('''
+           5+3*6
+           (5+3)*6
+           (5+x)*y
+           -2--11
+           ''', full_dump=False)
+
+    prints:
+
+    .. testoutput::
+       :options: +NORMALIZE_WHITESPACE
+
+
+       5+3*6
+       [[5, '+', [3, '*', 6]]]
+
+       (5+3)*6
+       [[[5, '+', 3], '*', 6]]
+
+       (5+x)*y
+       [[[5, '+', 'x'], '*', 'y']]
+
+       -2--11
+       [[['-', 2], '-', ['-', 11]]]
     """
 
     # captive version of FollowedBy that does not do parse actions or capture results names
@@ -775,25 +884,27 @@ def parseImpl(self, instring, loc, doActions=True):
     _FB.__name__ = "FollowedBy>"
 
     ret = Forward()
+    ret.set_name(f"{base_expr.name}_expression")
     if isinstance(lpar, str):
         lpar = Suppress(lpar)
     if isinstance(rpar, str):
         rpar = Suppress(rpar)
 
+    nested_expr = (lpar + ret + rpar).set_name(f"nested_{base_expr.name}_expression")
+
     # if lpar and rpar are not suppressed, wrap in group
     if not (isinstance(lpar, Suppress) and isinstance(rpar, Suppress)):
-        lastExpr = base_expr | Group(lpar + ret + rpar).set_name(
-            f"nested_{base_expr.name}"
-        )
+        lastExpr = base_expr | Group(nested_expr)
     else:
-        lastExpr = base_expr | (lpar + ret + rpar).set_name(f"nested_{base_expr.name}")
-    root_expr = lastExpr
+        lastExpr = base_expr | nested_expr
 
     arity: int
     rightLeftAssoc: opAssoc
     pa: typing.Optional[ParseAction]
     opExpr1: ParserElement
     opExpr2: ParserElement
+    matchExpr: ParserElement
+    match_lookahead: ParserElement
     for operDef in op_list:
         opExpr, arity, rightLeftAssoc, pa = (operDef + (None,))[:4]  # type: ignore[assignment]
         if isinstance(opExpr, str_type):
@@ -805,9 +916,9 @@ def parseImpl(self, instring, loc, doActions=True):
                     "if numterms=3, opExpr must be a tuple or list of two expressions"
                 )
             opExpr1, opExpr2 = opExpr
-            term_name = f"{opExpr1}{opExpr2} term"
+            term_name = f"{opExpr1}{opExpr2} operations"
         else:
-            term_name = f"{opExpr} term"
+            term_name = f"{opExpr} operations"
 
         if not 1 <= arity <= 3:
             raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
@@ -817,137 +928,162 @@ def parseImpl(self, instring, loc, doActions=True):
 
         thisExpr: ParserElement = Forward().set_name(term_name)
         thisExpr = typing.cast(Forward, thisExpr)
+        match_lookahead = And([])
         if rightLeftAssoc is OpAssoc.LEFT:
             if arity == 1:
-                matchExpr = _FB(lastExpr + opExpr) + Group(lastExpr + opExpr[1, ...])
+                match_lookahead = _FB(lastExpr + opExpr)
+                matchExpr = Group(lastExpr + opExpr[1, ...])
             elif arity == 2:
                 if opExpr is not None:
-                    matchExpr = _FB(lastExpr + opExpr + lastExpr) + Group(
-                        lastExpr + (opExpr + lastExpr)[1, ...]
-                    )
+                    match_lookahead = _FB(lastExpr + opExpr + lastExpr)
+                    matchExpr = Group(lastExpr + (opExpr + lastExpr)[1, ...])
                 else:
-                    matchExpr = _FB(lastExpr + lastExpr) + Group(lastExpr[2, ...])
+                    match_lookahead = _FB(lastExpr + lastExpr)
+                    matchExpr = Group(lastExpr[2, ...])
             elif arity == 3:
-                matchExpr = _FB(
+                match_lookahead = _FB(
                     lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr
-                ) + Group(lastExpr + OneOrMore(opExpr1 + lastExpr + opExpr2 + lastExpr))
+                )
+                matchExpr = Group(
+                    lastExpr + (opExpr1 + lastExpr + opExpr2 + lastExpr)[1, ...]
+                )
         elif rightLeftAssoc is OpAssoc.RIGHT:
             if arity == 1:
                 # try to avoid LR with this extra test
                 if not isinstance(opExpr, Opt):
                     opExpr = Opt(opExpr)
-                matchExpr = _FB(opExpr.expr + thisExpr) + Group(opExpr + thisExpr)
+                match_lookahead = _FB(opExpr.expr + thisExpr)
+                matchExpr = Group(opExpr + thisExpr)
             elif arity == 2:
                 if opExpr is not None:
-                    matchExpr = _FB(lastExpr + opExpr + thisExpr) + Group(
-                        lastExpr + (opExpr + thisExpr)[1, ...]
-                    )
+                    match_lookahead = _FB(lastExpr + opExpr + thisExpr)
+                    matchExpr = Group(lastExpr + (opExpr + thisExpr)[1, ...])
                 else:
-                    matchExpr = _FB(lastExpr + thisExpr) + Group(
-                        lastExpr + thisExpr[1, ...]
-                    )
+                    match_lookahead = _FB(lastExpr + thisExpr)
+                    matchExpr = Group(lastExpr + thisExpr[1, ...])
             elif arity == 3:
-                matchExpr = _FB(
+                match_lookahead = _FB(
                     lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr
-                ) + Group(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr)
+                )
+                matchExpr = Group(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr)
+
+        # suppress lookahead expr from railroad diagrams
+        match_lookahead.show_in_diagram = False
+
+        # TODO - determine why this statement can't be included in the following
+        #  if pa block
+        matchExpr = match_lookahead + matchExpr
+
         if pa:
             if isinstance(pa, (tuple, list)):
                 matchExpr.set_parse_action(*pa)
             else:
                 matchExpr.set_parse_action(pa)
-        thisExpr <<= (matchExpr | lastExpr).setName(term_name)
+
+        thisExpr <<= (matchExpr | lastExpr).set_name(term_name)
         lastExpr = thisExpr
+
     ret <<= lastExpr
-    root_expr.set_name("base_expr")
     return ret
 
 
 def indentedBlock(blockStatementExpr, indentStack, indent=True, backup_stacks=[]):
     """
-    (DEPRECATED - use :class:`IndentedBlock` class instead)
+    .. deprecated:: 3.0.0
+       Use the :class:`IndentedBlock` class instead. Note that `IndentedBlock`
+       has a difference method signature.
+
     Helper method for defining space-delimited indentation blocks,
     such as those used to define block statements in Python source code.
 
-    Parameters:
-
-    - ``blockStatementExpr`` - expression defining syntax of statement that
+    :param blockStatementExpr: expression defining syntax of statement that
       is repeated within the indented block
-    - ``indentStack`` - list created by caller to manage indentation stack
+
+    :param indentStack: list created by caller to manage indentation stack
       (multiple ``statementWithIndentedBlock`` expressions within a single
       grammar should share a common ``indentStack``)
-    - ``indent`` - boolean indicating whether block must be indented beyond
+
+    :param indent: boolean indicating whether block must be indented beyond
       the current level; set to ``False`` for block of left-most statements
-      (default= ``True``)
 
     A valid block must contain at least one ``blockStatement``.
 
     (Note that indentedBlock uses internal parse actions which make it
     incompatible with packrat parsing.)
 
-    Example::
-
-        data = '''
-        def A(z):
-          A1
-          B = 100
-          G = A2
-          A2
-          A3
-        B
-        def BB(a,b,c):
-          BB1
-          def BBA():
-            bba1
-            bba2
-            bba3
-        C
-        D
-        def spam(x,y):
-             def eggs(z):
-                 pass
-        '''
-
-
-        indentStack = [1]
-        stmt = Forward()
-
-        identifier = Word(alphas, alphanums)
-        funcDecl = ("def" + identifier + Group("(" + Opt(delimitedList(identifier)) + ")") + ":")
-        func_body = indentedBlock(stmt, indentStack)
-        funcDef = Group(funcDecl + func_body)
-
-        rvalue = Forward()
-        funcCall = Group(identifier + "(" + Opt(delimitedList(rvalue)) + ")")
-        rvalue << (funcCall | identifier | Word(nums))
-        assignment = Group(identifier + "=" + rvalue)
-        stmt << (funcDef | assignment | identifier)
-
-        module_body = stmt[1, ...]
-
-        parseTree = module_body.parseString(data)
-        parseTree.pprint()
-
-    prints::
-
-        [['def',
-          'A',
-          ['(', 'z', ')'],
-          ':',
-          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
-         'B',
-         ['def',
-          'BB',
-          ['(', 'a', 'b', 'c', ')'],
-          ':',
-          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
-         'C',
-         'D',
-         ['def',
-          'spam',
-          ['(', 'x', 'y', ')'],
-          ':',
-          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]]
+    Example:
+
+    .. testcode::
+
+       data = '''
+       def A(z):
+         A1
+         B = 100
+         G = A2
+         A2
+         A3
+       B
+       def BB(a,b,c):
+         BB1
+         def BBA():
+           bba1
+           bba2
+           bba3
+       C
+       D
+       def spam(x,y):
+            def eggs(z):
+                pass
+       '''
+
+       indentStack = [1]
+       stmt = Forward()
+
+       identifier = Word(alphas, alphanums)
+       funcDecl = ("def" + identifier + Group("(" + Opt(delimitedList(identifier)) + ")") + ":")
+       func_body = indentedBlock(stmt, indentStack)
+       funcDef = Group(funcDecl + func_body)
+
+       rvalue = Forward()
+       funcCall = Group(identifier + "(" + Opt(delimitedList(rvalue)) + ")")
+       rvalue << (funcCall | identifier | Word(nums))
+       assignment = Group(identifier + "=" + rvalue)
+       stmt << (funcDef | assignment | identifier)
+
+       module_body = stmt[1, ...]
+
+       parseTree = module_body.parseString(data)
+       parseTree.pprint()
+
+    prints:
+
+    .. testoutput::
+
+       [['def',
+         'A',
+         ['(', 'z', ')'],
+         ':',
+         [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
+        'B',
+        ['def',
+         'BB',
+         ['(', 'a', 'b', 'c', ')'],
+         ':',
+         [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
+        'C',
+        'D',
+        ['def',
+         'spam',
+         ['(', 'x', 'y', ')'],
+         ':',
+         [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]]
     """
+    warnings.warn(
+        f"{'indentedBlock'!r} deprecated - use {'IndentedBlock'!r}",
+        PyparsingDeprecationWarning,
+        stacklevel=2,
+    )
+
     backup_stacks.append(indentStack[:])
 
     def reset_stack():
@@ -1005,10 +1141,9 @@ def checkUnindent(s, l, t):
     return smExpr.set_name("indented block")
 
 
-# it's easy to get these comment structures wrong - they're very common, so may as well make them available
-c_style_comment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + "*/").set_name(
-    "C style comment"
-)
+# it's easy to get these comment structures wrong - they're very common,
+# so may as well make them available
+c_style_comment = Regex(r"/\*(?:[^*]|\*(?!/))*\*\/").set_name("C style comment")
 "Comment of the form ``/* ... */``"
 
 html_comment = Regex(r"<!--[\s\S]*?-->").set_name("HTML comment")
@@ -1018,8 +1153,8 @@ def checkUnindent(s, l, t):
 dbl_slash_comment = Regex(r"//(?:\\\n|[^\n])*").set_name("// comment")
 "Comment of the form ``// ... (to end of line)``"
 
-cpp_style_comment = Combine(
-    Regex(r"/\*(?:[^*]|\*(?!/))*") + "*/" | dbl_slash_comment
+cpp_style_comment = Regex(
+    r"(?:/\*(?:[^*]|\*(?!/))*\*\/)|(?://(?:\\\n|[^\n])*)"
 ).set_name("C++ style comment")
 "Comment of either form :class:`c_style_comment` or :class:`dbl_slash_comment`"
 
@@ -1032,7 +1167,7 @@ def checkUnindent(s, l, t):
 
 # build list of built-in expressions, for future reference if a global default value
 # gets updated
-_builtin_exprs: List[ParserElement] = [
+_builtin_exprs: list[ParserElement] = [
     v for v in vars().values() if isinstance(v, ParserElement)
 ]
 
@@ -1047,7 +1182,10 @@ def delimited_list(
     *,
     allow_trailing_delim: bool = False,
 ) -> ParserElement:
-    """(DEPRECATED - use :class:`DelimitedList` class)"""
+    """
+    .. deprecated:: 3.1.0
+       Use the :class:`DelimitedList` class instead.
+    """
     return DelimitedList(
         expr, delim, combine, min, max, allow_trailing_delim=allow_trailing_delim
     )
diff --git a/libs/pyparsing/results.py b/libs/pyparsing/results.py
index 3bb7c948e0..f7d674f180 100644
--- a/libs/pyparsing/results.py
+++ b/libs/pyparsing/results.py
@@ -1,4 +1,8 @@
 # results.py
+
+from __future__ import annotations
+
+import collections
 from collections.abc import (
     MutableMapping,
     Mapping,
@@ -7,21 +11,22 @@
     Iterable,
 )
 import pprint
-from typing import Tuple, Any, Dict, Set, List
+from typing import Any
 
-from .util import replaced_by_pep8
+from .util import deprecate_argument, _is_iterable, _flatten
 
 
-str_type: Tuple[type, ...] = (str, bytes)
+str_type: tuple[type, ...] = (str, bytes)
 _generator_type = type((_ for _ in ()))
+NULL_SLICE: slice = slice(None)
 
 
 class _ParseResultsWithOffset:
-    tup: Tuple["ParseResults", int]
+    tup: tuple[ParseResults, int]
     __slots__ = ["tup"]
 
-    def __init__(self, p1: "ParseResults", p2: int):
-        self.tup: Tuple[ParseResults, int] = (p1, p2)
+    def __init__(self, p1: ParseResults, p2: int) -> None:
+        self.tup: tuple[ParseResults, int] = (p1, p2)
 
     def __getitem__(self, i):
         return self.tup[i]
@@ -41,52 +46,58 @@ class ParseResults:
     - by list index (``results[0], results[1]``, etc.)
     - by attribute (``results.<results_name>`` - see :class:`ParserElement.set_results_name`)
 
-    Example::
-
-        integer = Word(nums)
-        date_str = (integer.set_results_name("year") + '/'
-                    + integer.set_results_name("month") + '/'
-                    + integer.set_results_name("day"))
-        # equivalent form:
-        # date_str = (integer("year") + '/'
-        #             + integer("month") + '/'
-        #             + integer("day"))
-
-        # parse_string returns a ParseResults object
-        result = date_str.parse_string("1999/12/31")
-
-        def test(s, fn=repr):
-            print(f"{s} -> {fn(eval(s))}")
-        test("list(result)")
-        test("result[0]")
-        test("result['month']")
-        test("result.day")
-        test("'month' in result")
-        test("'minutes' in result")
-        test("result.dump()", str)
-
-    prints::
-
-        list(result) -> ['1999', '/', '12', '/', '31']
-        result[0] -> '1999'
-        result['month'] -> '12'
-        result.day -> '31'
-        'month' in result -> True
-        'minutes' in result -> False
-        result.dump() -> ['1999', '/', '12', '/', '31']
-        - day: '31'
-        - month: '12'
-        - year: '1999'
+    Example:
+
+    .. testcode::
+
+       integer = Word(nums)
+       date_str = (integer.set_results_name("year") + '/'
+                   + integer.set_results_name("month") + '/'
+                   + integer.set_results_name("day"))
+       # equivalent form:
+       # date_str = (integer("year") + '/'
+       #             + integer("month") + '/'
+       #             + integer("day"))
+
+       # parse_string returns a ParseResults object
+       result = date_str.parse_string("1999/12/31")
+
+       def test(s, fn=repr):
+           print(f"{s} -> {fn(eval(s))}")
+
+       test("list(result)")
+       test("result[0]")
+       test("result['month']")
+       test("result.day")
+       test("'month' in result")
+       test("'minutes' in result")
+       test("result.dump()", str)
+
+    prints:
+
+    .. testoutput::
+
+       list(result) -> ['1999', '/', '12', '/', '31']
+       result[0] -> '1999'
+       result['month'] -> '12'
+       result.day -> '31'
+       'month' in result -> True
+       'minutes' in result -> False
+       result.dump() -> ['1999', '/', '12', '/', '31']
+       - day: '31'
+       - month: '12'
+       - year: '1999'
+
     """
 
-    _null_values: Tuple[Any, ...] = (None, [], ())
+    _null_values: tuple[Any, ...] = (None, [], ())
 
     _name: str
-    _parent: "ParseResults"
-    _all_names: Set[str]
+    _parent: ParseResults
+    _all_names: set[str]
     _modal: bool
-    _toklist: List[Any]
-    _tokdict: Dict[str, Any]
+    _toklist: list[Any]
+    _tokdict: dict[str, Any]
 
     __slots__ = (
         "_name",
@@ -100,38 +111,59 @@ def test(s, fn=repr):
     class List(list):
         """
         Simple wrapper class to distinguish parsed list results that should be preserved
-        as actual Python lists, instead of being converted to :class:`ParseResults`::
+        as actual Python lists, instead of being converted to :class:`ParseResults`:
+
+        .. testcode::
+
+           import pyparsing as pp
+           ppc = pp.common
+
+           LBRACK, RBRACK, LPAR, RPAR = pp.Suppress.using_each("[]()")
+           element = pp.Forward()
+           item = ppc.integer
+           item_list = pp.DelimitedList(element)
+           element_list = LBRACK + item_list + RBRACK | LPAR + item_list + RPAR
+           element <<= item | element_list
+
+           # add parse action to convert from ParseResults
+           # to actual Python collection types
+           @element_list.add_parse_action
+           def as_python_list(t):
+               return pp.ParseResults.List(t.as_list())
+
+           element.run_tests('''
+               100
+               [2,3,4]
+               [[2, 1],3,4]
+               [(2, 1),3,4]
+               (2,3,4)
+               ([2, 3], 4)
+               ''', post_parse=lambda s, r: (r[0], type(r[0]))
+           )
 
-            LBRACK, RBRACK = map(pp.Suppress, "[]")
-            element = pp.Forward()
-            item = ppc.integer
-            element_list = LBRACK + pp.DelimitedList(element) + RBRACK
+        prints:
 
-            # add parse actions to convert from ParseResults to actual Python collection types
-            def as_python_list(t):
-                return pp.ParseResults.List(t.as_list())
-            element_list.add_parse_action(as_python_list)
+        .. testoutput::
+           :options: +NORMALIZE_WHITESPACE
 
-            element <<= item | element_list
 
-            element.run_tests('''
-                100
-                [2,3,4]
-                [[2, 1],3,4]
-                [(2, 1),3,4]
-                (2,3,4)
-                ''', post_parse=lambda s, r: (r[0], type(r[0])))
+           100
+           (100, <class 'int'>)
 
-        prints::
+           [2,3,4]
+           ([2, 3, 4], <class 'list'>)
 
-            100
-            (100, <class 'int'>)
+           [[2, 1],3,4]
+           ([[2, 1], 3, 4], <class 'list'>)
 
-            [2,3,4]
-            ([2, 3, 4], <class 'list'>)
+           [(2, 1),3,4]
+           ([[2, 1], 3, 4], <class 'list'>)
 
-            [[2, 1],3,4]
-            ([[2, 1], 3, 4], <class 'list'>)
+           (2,3,4)
+           ([2, 3, 4], <class 'list'>)
+
+           ([2, 3], 4)
+           ([[2, 3], 4], <class 'list'>)
 
         (Used internally by :class:`Group` when `aslist=True`.)
         """
@@ -171,9 +203,18 @@ def __new__(cls, toklist=None, name=None, **kwargs):
     # Performance tuning: we construct a *lot* of these, so keep this
     # constructor as small and fast as possible
     def __init__(
-        self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance
-    ):
-        self._tokdict: Dict[str, _ParseResultsWithOffset]
+        self,
+        toklist=None,
+        name=None,
+        aslist=True,
+        modal=True,
+        isinstance=isinstance,
+        **kwargs,
+    ) -> None:
+        asList = deprecate_argument(kwargs, "asList", True, new_name="aslist")
+
+        asList = asList and aslist
+        self._tokdict: dict[str, _ParseResultsWithOffset]
         self._modal = modal
 
         if name is None or name == "":
@@ -226,7 +267,7 @@ def __setitem__(self, k, v, isinstance=isinstance):
             self._toklist[k] = v
             sub = v
         else:
-            self._tokdict[k] = self._tokdict.get(k, list()) + [
+            self._tokdict[k] = self._tokdict.get(k, []) + [
                 _ParseResultsWithOffset(v, 0)
             ]
             sub = v
@@ -238,6 +279,11 @@ def __delitem__(self, i):
             del self._tokdict[i]
             return
 
+        # slight optimization if del results[:]
+        if i == NULL_SLICE:
+            self._toklist.clear()
+            return
+
         mylen = len(self._toklist)
         del self._toklist[i]
 
@@ -298,34 +344,40 @@ def pop(self, *args, **kwargs):
         names. A second default return value argument is supported, just as in
         ``dict.pop()``.
 
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            def remove_first(tokens):
-                tokens.pop(0)
-            numlist.add_parse_action(remove_first)
-            print(numlist.parse_string("0 123 321")) # -> ['123', '321']
-
-            label = Word(alphas)
-            patt = label("LABEL") + Word(nums)[1, ...]
-            print(patt.parse_string("AAB 123 321").dump())
-
-            # Use pop() in a parse action to remove named result (note that corresponding value is not
-            # removed from list form of results)
-            def remove_LABEL(tokens):
-                tokens.pop("LABEL")
-                return tokens
-            patt.add_parse_action(remove_LABEL)
-            print(patt.parse_string("AAB 123 321").dump())
-
-        prints::
+        Example:
+
+        .. doctest::
+
+           >>> numlist = Word(nums)[...]
+           >>> print(numlist.parse_string("0 123 321"))
+           ['0', '123', '321']
+
+           >>> def remove_first(tokens):
+           ...     tokens.pop(0)
+           ...
+           >>> numlist.add_parse_action(remove_first)
+           [W:(0-9)]...
+           >>> print(numlist.parse_string("0 123 321"))
+           ['123', '321']
+
+           >>> label = Word(alphas)
+           >>> patt = label("LABEL") + Word(nums)[1, ...]
+           >>> print(patt.parse_string("AAB 123 321").dump())
+           ['AAB', '123', '321']
+           - LABEL: 'AAB'
+
+           >>> # Use pop() in a parse action to remove named result
+           >>> # (note that corresponding value is not
+           >>> # removed from list form of results)
+           >>> def remove_LABEL(tokens):
+           ...     tokens.pop("LABEL")
+           ...     return tokens
+           ...
+           >>> patt.add_parse_action(remove_LABEL)
+           {W:(A-Za-z) {W:(0-9)}...}
+           >>> print(patt.parse_string("AAB 123 321").dump())
+           ['AAB', '123', '321']
 
-            ['AAB', '123', '321']
-            - LABEL: 'AAB'
-
-            ['AAB', '123', '321']
         """
         if not args:
             args = [-1]
@@ -351,15 +403,20 @@ def get(self, key, default_value=None):
 
         Similar to ``dict.get()``.
 
-        Example::
+        Example:
+
+        .. doctest::
 
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+           >>> integer = Word(nums)
+           >>> date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+
+           >>> result = date_str.parse_string("1999/12/31")
+           >>> result.get("year")
+           '1999'
+           >>> result.get("hour", "not specified")
+           'not specified'
+           >>> result.get("hour")
 
-            result = date_str.parse_string("1999/12/31")
-            print(result.get("year")) # -> '1999'
-            print(result.get("hour", "not specified")) # -> 'not specified'
-            print(result.get("hour")) # -> None
         """
         if key in self:
             return self[key]
@@ -372,16 +429,24 @@ def insert(self, index, ins_string):
 
         Similar to ``list.insert()``.
 
-        Example::
+        Example:
+
+        .. doctest::
 
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
+           >>> numlist = Word(nums)[...]
+           >>> print(numlist.parse_string("0 123 321"))
+           ['0', '123', '321']
+
+           >>> # use a parse action to insert the parse location
+           >>> # in the front of the parsed results
+           >>> def insert_locn(locn, tokens):
+           ...     tokens.insert(0, locn)
+           ...
+           >>> numlist.add_parse_action(insert_locn)
+           [W:(0-9)]...
+           >>> print(numlist.parse_string("0 123 321"))
+           [0, '0', '123', '321']
 
-            # use a parse action to insert the parse location in the front of the parsed results
-            def insert_locn(locn, tokens):
-                tokens.insert(0, locn)
-            numlist.add_parse_action(insert_locn)
-            print(numlist.parse_string("0 123 321")) # -> [0, '0', '123', '321']
         """
         self._toklist.insert(index, ins_string)
         # fixup indices in token dictionary
@@ -395,33 +460,50 @@ def append(self, item):
         """
         Add single element to end of ``ParseResults`` list of elements.
 
-        Example::
+        Example:
+
+        .. doctest::
 
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
+           >>> numlist = Word(nums)[...]
+           >>> print(numlist.parse_string("0 123 321"))
+           ['0', '123', '321']
 
-            # use a parse action to compute the sum of the parsed integers, and add it to the end
-            def append_sum(tokens):
-                tokens.append(sum(map(int, tokens)))
-            numlist.add_parse_action(append_sum)
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321', 444]
+           >>> # use a parse action to compute the sum of the parsed integers,
+           >>> # and add it to the end
+           >>> def append_sum(tokens):
+           ...     tokens.append(sum(map(int, tokens)))
+           ...
+           >>> numlist.add_parse_action(append_sum)
+           [W:(0-9)]...
+           >>> print(numlist.parse_string("0 123 321"))
+           ['0', '123', '321', 444]
         """
         self._toklist.append(item)
 
     def extend(self, itemseq):
         """
-        Add sequence of elements to end of ``ParseResults`` list of elements.
+        Add sequence of elements to end of :class:`ParseResults` list of elements.
+
+        Example:
+
+        .. testcode::
 
-        Example::
+           patt = Word(alphas)[1, ...]
 
-            patt = Word(alphas)[1, ...]
+           # use a parse action to append the reverse of the matched strings,
+           # to make a palindrome
+           def make_palindrome(tokens):
+               tokens.extend(reversed([t[::-1] for t in tokens]))
+               return ''.join(tokens)
 
-            # use a parse action to append the reverse of the matched strings, to make a palindrome
-            def make_palindrome(tokens):
-                tokens.extend(reversed([t[::-1] for t in tokens]))
-                return ''.join(tokens)
-            patt.add_parse_action(make_palindrome)
-            print(patt.parse_string("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
+           patt.add_parse_action(make_palindrome)
+           print(patt.parse_string("lskdj sdlkjf lksd"))
+
+        prints:
+
+        .. testoutput::
+
+           ['lskdjsdlkjflksddsklfjkldsjdksl']
         """
         if isinstance(itemseq, ParseResults):
             self.__iadd__(itemseq)
@@ -443,12 +525,12 @@ def __getattr__(self, name):
                 raise AttributeError(name)
             return ""
 
-    def __add__(self, other: "ParseResults") -> "ParseResults":
+    def __add__(self, other: ParseResults) -> ParseResults:
         ret = self.copy()
         ret += other
         return ret
 
-    def __iadd__(self, other: "ParseResults") -> "ParseResults":
+    def __iadd__(self, other: ParseResults) -> ParseResults:
         if not other:
             return self
 
@@ -470,7 +552,7 @@ def __iadd__(self, other: "ParseResults") -> "ParseResults":
         self._all_names |= other._all_names
         return self
 
-    def __radd__(self, other) -> "ParseResults":
+    def __radd__(self, other) -> ParseResults:
         if isinstance(other, int) and other == 0:
             # useful for merging many ParseResults using sum() builtin
             return self.copy()
@@ -504,45 +586,76 @@ def _asStringList(self, sep=""):
                 out.append(str(item))
         return out
 
-    def as_list(self) -> list:
+    def as_list(self, *, flatten: bool = False) -> list:
         """
         Returns the parse results as a nested list of matching tokens, all converted to strings.
+        If ``flatten`` is True, all the nesting levels in the returned list are collapsed.
 
-        Example::
+        Example:
 
-            patt = Word(alphas)[1, ...]
-            result = patt.parse_string("sldkj lsdkj sldkj")
-            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
-            print(type(result), result) # -> <class 'pyparsing.ParseResults'> ['sldkj', 'lsdkj', 'sldkj']
+        .. doctest::
 
-            # Use as_list() to create an actual list
-            result_list = result.as_list()
-            print(type(result_list), result_list) # -> <class 'list'> ['sldkj', 'lsdkj', 'sldkj']
-        """
-        return [
-            res.as_list() if isinstance(res, ParseResults) else res
-            for res in self._toklist
-        ]
+           >>> patt = Word(alphas)[1, ...]
+           >>> result = patt.parse_string("sldkj lsdkj sldkj")
+           >>> # even though the result prints in string-like form,
+           >>> # it is actually a pyparsing ParseResults
+           >>> type(result)
+           <class 'pyparsing.results.ParseResults'>
+           >>> print(result)
+           ['sldkj', 'lsdkj', 'sldkj']
 
-    def as_dict(self) -> dict:
-        """
-        Returns the named parse results as a nested dictionary.
+        .. doctest::
 
-        Example::
+           >>> # Use as_list() to create an actual list
+           >>> result_list = result.as_list()
+           >>> type(result_list)
+           <class 'list'>
+           >>> print(result_list)
+           ['sldkj', 'lsdkj', 'sldkj']
 
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+        .. versionchanged:: 3.2.0
+           New ``flatten`` argument.
+        """
 
-            result = date_str.parse_string('12/31/1999')
-            print(type(result), repr(result)) # -> <class 'pyparsing.ParseResults'> (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
+        if flatten:
+            return [*_flatten(self)]
+        else:
+            return [
+                res.as_list() if isinstance(res, ParseResults) else res
+                for res in self._toklist
+            ]
 
-            result_dict = result.as_dict()
-            print(type(result_dict), repr(result_dict)) # -> <class 'dict'> {'day': '1999', 'year': '12', 'month': '31'}
+    def as_dict(self) -> dict:
+        """
+        Returns the named parse results as a nested dictionary.
 
-            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
-            import json
-            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
-            print(json.dumps(result.as_dict())) # -> {"month": "31", "day": "1999", "year": "12"}
+        Example:
+
+        .. doctest::
+
+           >>> integer = pp.Word(pp.nums)
+           >>> date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+
+           >>> result = date_str.parse_string('1999/12/31')
+           >>> type(result)
+           <class 'pyparsing.results.ParseResults'>
+           >>> result
+           ParseResults(['1999', '/', '12', '/', '31'], {'year': '1999', 'month': '12', 'day': '31'})
+
+           >>> result_dict = result.as_dict()
+           >>> type(result_dict)
+           <class 'dict'>
+           >>> result_dict
+           {'year': '1999', 'month': '12', 'day': '31'}
+
+           >>> # even though a ParseResults supports dict-like access,
+           >>> # sometime you just need to have a dict
+           >>> import json
+           >>> print(json.dumps(result))
+           Traceback (most recent call last):
+           TypeError: Object of type ParseResults is not JSON serializable
+           >>> print(json.dumps(result.as_dict()))
+           {"year": "1999", "month": "12", "day": "31"}
         """
 
         def to_item(obj):
@@ -553,12 +666,12 @@ def to_item(obj):
 
         return dict((k, to_item(v)) for k, v in self.items())
 
-    def copy(self) -> "ParseResults":
+    def copy(self) -> ParseResults:
         """
-        Returns a new shallow copy of a :class:`ParseResults` object. `ParseResults`
-        items contained within the source are shared with the copy. Use
-        :class:`ParseResults.deepcopy()` to create a copy with its own separate
-        content values.
+        Returns a new shallow copy of a :class:`ParseResults` object.
+        :class:`ParseResults` items contained within the source are
+        shared with the copy. Use :meth:`ParseResults.deepcopy` to
+        create a copy with its own separate content values.
         """
         ret = ParseResults(self._toklist)
         ret._tokdict = self._tokdict.copy()
@@ -567,9 +680,11 @@ def copy(self) -> "ParseResults":
         ret._name = self._name
         return ret
 
-    def deepcopy(self) -> "ParseResults":
+    def deepcopy(self) -> ParseResults:
         """
         Returns a new deep copy of a :class:`ParseResults` object.
+
+        .. versionadded:: 3.1.0
         """
         ret = self.copy()
         # replace values with copies if they are of known mutable types
@@ -584,39 +699,46 @@ def deepcopy(self) -> "ParseResults":
                     dest[k] = v.deepcopy() if isinstance(v, ParseResults) else v
             elif isinstance(obj, Iterable):
                 ret._toklist[i] = type(obj)(
-                    v.deepcopy() if isinstance(v, ParseResults) else v for v in obj
+                    v.deepcopy() if isinstance(v, ParseResults) else v for v in obj  # type: ignore[call-arg]
                 )
         return ret
 
-    def get_name(self) -> str:
+    def get_name(self) -> str | None:
         r"""
-        Returns the results name for this token expression. Useful when several
-        different expressions might match at a particular location.
+        Returns the results name for this token expression.
+
+        Useful when several different expressions might match
+        at a particular location.
+
+        Example:
 
-        Example::
+        .. testcode::
 
-            integer = Word(nums)
-            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
-            house_number_expr = Suppress('#') + Word(nums, alphanums)
-            user_data = (Group(house_number_expr)("house_number")
-                        | Group(ssn_expr)("ssn")
-                        | Group(integer)("age"))
-            user_info = user_data[1, ...]
+           integer = Word(nums)
+           ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
+           house_number_expr = Suppress('#') + Word(nums, alphanums)
+           user_data = (Group(house_number_expr)("house_number")
+                       | Group(ssn_expr)("ssn")
+                       | Group(integer)("age"))
+           user_info = user_data[1, ...]
 
-            result = user_info.parse_string("22 111-22-3333 #221B")
-            for item in result:
-                print(item.get_name(), ':', item[0])
+           result = user_info.parse_string("22 111-22-3333 #221B")
+           for item in result:
+               print(item.get_name(), ':', item[0])
 
-        prints::
+        prints:
+
+        .. testoutput::
+
+           age : 22
+           ssn : 111-22-3333
+           house_number : 221B
 
-            age : 22
-            ssn : 111-22-3333
-            house_number : 221B
         """
         if self._name:
             return self._name
         elif self._parent:
-            par: "ParseResults" = self._parent
+            par: ParseResults = self._parent
             parent_tokdict_items = par._tokdict.items()
             return next(
                 (
@@ -642,20 +764,24 @@ def dump(self, indent="", full=True, include_list=True, _depth=0) -> str:
         a :class:`ParseResults`. Accepts an optional ``indent`` argument so
         that this string can be embedded in a nested display of other data.
 
-        Example::
+        Example:
+
+        .. testcode::
+
+           integer = Word(nums)
+           date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
 
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
+           result = date_str.parse_string('1999/12/31')
+           print(result.dump())
 
-            result = date_str.parse_string('1999/12/31')
-            print(result.dump())
+        prints:
 
-        prints::
+        .. testoutput::
 
-            ['1999', '/', '12', '/', '31']
-            - day: '31'
-            - month: '12'
-            - year: '1999'
+           ['1999', '/', '12', '/', '31']
+           - day: '31'
+           - month: '12'
+           - year: '1999'
         """
         out = []
         NL = "\n"
@@ -717,23 +843,27 @@ def pprint(self, *args, **kwargs):
         Accepts additional positional or keyword args as defined for
         `pprint.pprint <https://docs.python.org/3/library/pprint.html#pprint.pprint>`_ .
 
-        Example::
+        Example:
 
-            ident = Word(alphas, alphanums)
-            num = Word(nums)
-            func = Forward()
-            term = ident | num | Group('(' + func + ')')
-            func <<= ident + Group(Optional(DelimitedList(term)))
-            result = func.parse_string("fna a,b,(fnb c,d,200),100")
-            result.pprint(width=40)
+        .. testcode::
 
-        prints::
+           ident = Word(alphas, alphanums)
+           num = Word(nums)
+           func = Forward()
+           term = ident | num | Group('(' + func + ')')
+           func <<= ident + Group(Optional(DelimitedList(term)))
+           result = func.parse_string("fna a,b,(fnb c,d,200),100")
+           result.pprint(width=40)
 
-            ['fna',
-             ['a',
-              'b',
-              ['(', 'fnb', ['c', 'd', '200'], ')'],
-              '100']]
+        prints:
+
+        .. testoutput::
+
+           ['fna',
+            ['a',
+             'b',
+             ['(', 'fnb', ['c', 'd', '200'], ')'],
+             '100']]
         """
         pprint.pprint(self.as_list(), *args, **kwargs)
 
@@ -761,38 +891,37 @@ def __dir__(self):
         return dir(type(self)) + list(self.keys())
 
     @classmethod
-    def from_dict(cls, other, name=None) -> "ParseResults":
+    def from_dict(cls, other, name=None) -> ParseResults:
         """
-        Helper classmethod to construct a ``ParseResults`` from a ``dict``, preserving the
+        Helper classmethod to construct a :class:`ParseResults` from a ``dict``, preserving the
         name-value relations as results names. If an optional ``name`` argument is
-        given, a nested ``ParseResults`` will be returned.
+        given, a nested :class:`ParseResults` will be returned.
         """
-
-        def is_iterable(obj):
-            try:
-                iter(obj)
-            except Exception:
-                return False
-            # str's are iterable, but in pyparsing, we don't want to iterate over them
-            else:
-                return not isinstance(obj, str_type)
-
         ret = cls([])
         for k, v in other.items():
             if isinstance(v, Mapping):
                 ret += cls.from_dict(v, name=k)
             else:
-                ret += cls([v], name=k, asList=is_iterable(v))
+                ret += cls([v], name=k, aslist=_is_iterable(v))
         if name is not None:
             ret = cls([ret], name=name)
         return ret
 
     asList = as_list
-    """Deprecated - use :class:`as_list`"""
+    """
+    .. deprecated:: 3.0.0
+       use :meth:`as_list`
+    """
     asDict = as_dict
-    """Deprecated - use :class:`as_dict`"""
+    """
+    .. deprecated:: 3.0.0
+       use :meth:`as_dict`
+    """
     getName = get_name
-    """Deprecated - use :class:`get_name`"""
+    """
+    .. deprecated:: 3.0.0
+       use :meth:`get_name`
+    """
 
 
 MutableMapping.register(ParseResults)
diff --git a/libs/pyparsing/testing.py b/libs/pyparsing/testing.py
index 5654d47d62..d7b60b852b 100644
--- a/libs/pyparsing/testing.py
+++ b/libs/pyparsing/testing.py
@@ -3,6 +3,7 @@
 from contextlib import contextmanager
 import re
 import typing
+import unittest
 
 
 from .core import (
@@ -12,6 +13,7 @@
     __diag__,
     __compat__,
 )
+from . import core_builtin_exprs
 
 
 class pyparsing_test:
@@ -24,24 +26,37 @@ class reset_pyparsing_context:
         Context manager to be used when writing unit tests that modify pyparsing config values:
         - packrat parsing
         - bounded recursion parsing
-        - default whitespace characters.
+        - default whitespace characters
         - default keyword characters
         - literal string auto-conversion class
-        - __diag__ settings
+        - ``__diag__`` settings
 
-        Example::
+        Example:
 
-            with reset_pyparsing_context():
-                # test that literals used to construct a grammar are automatically suppressed
-                ParserElement.inlineLiteralsUsing(Suppress)
+        .. testcode::
 
-                term = Word(alphas) | Word(nums)
-                group = Group('(' + term[...] + ')')
+            ppt = pyparsing.pyparsing_test
 
-                # assert that the '()' characters are not included in the parsed tokens
-                self.assertParseAndCheckList(group, "(abc 123 def)", ['abc', '123', 'def'])
+            class MyTestClass(ppt.TestParseResultsAsserts):
+                def test_literal(self):
+                    with ppt.reset_pyparsing_context():
+                        # test that literals used to construct
+                        # a grammar are automatically suppressed
+                        ParserElement.inline_literals_using(Suppress)
 
-            # after exiting context manager, literals are converted to Literal expressions again
+                        term = Word(alphas) | Word(nums)
+                        group = Group('(' + term[...] + ')')
+
+                        # assert that the '()' characters
+                        # are not included in the parsed tokens
+                        self.assertParseAndCheckList(
+                            group,
+                            "(abc 123 def)",
+                            ['abc', '123', 'def']
+                        )
+
+                    # after exiting context manager, literals
+                    # are converted to Literal expressions again
         """
 
         def __init__(self):
@@ -92,7 +107,7 @@ def restore(self):
             ParserElement.verbose_stacktrace = self._save_context["verbose_stacktrace"]
 
             Keyword.DEFAULT_KEYWORD_CHARS = self._save_context["default_keyword_chars"]
-            ParserElement.inlineLiteralsUsing(
+            ParserElement.inline_literals_using(
                 self._save_context["literal_string_class"]
             )
 
@@ -108,6 +123,10 @@ def restore(self):
                 "recursion_enabled"
             ]
 
+            # clear debug flags on all builtins
+            for expr in core_builtin_exprs:
+                expr.set_debug(False)
+
             __compat__.collect_all_And_tokens = self._save_context["__compat__"]
 
             return self
@@ -123,7 +142,7 @@ def __enter__(self):
         def __exit__(self, *args):
             self.restore()
 
-    class TestParseResultsAsserts:
+    class TestParseResultsAsserts(unittest.TestCase):
         """
         A mixin class to add parse results assertion methods to normal unittest.TestCase classes.
         """
@@ -145,7 +164,7 @@ def assertParseAndCheckList(
         ):
             """
             Convenience wrapper assert to test a parser element and input string, and assert that
-            the resulting ``ParseResults.asList()`` is equal to the ``expected_list``.
+            the resulting :meth:`ParseResults.as_list` is equal to the ``expected_list``.
             """
             result = expr.parse_string(test_string, parse_all=True)
             if verbose:
@@ -159,9 +178,9 @@ def assertParseAndCheckDict(
         ):
             """
             Convenience wrapper assert to test a parser element and input string, and assert that
-            the resulting ``ParseResults.asDict()`` is equal to the ``expected_dict``.
+            the resulting :meth:`ParseResults.as_dict` is equal to the ``expected_dict``.
             """
-            result = expr.parse_string(test_string, parseAll=True)
+            result = expr.parse_string(test_string, parse_all=True)
             if verbose:
                 print(result.dump())
             else:
@@ -172,13 +191,20 @@ def assertRunTestResults(
             self, run_tests_report, expected_parse_results=None, msg=None
         ):
             """
-            Unit test assertion to evaluate output of ``ParserElement.runTests()``. If a list of
-            list-dict tuples is given as the ``expected_parse_results`` argument, then these are zipped
-            with the report tuples returned by ``runTests`` and evaluated using ``assertParseResultsEquals``.
-            Finally, asserts that the overall ``runTests()`` success value is ``True``.
-
-            :param run_tests_report: tuple(bool, [tuple(str, ParseResults or Exception)]) returned from runTests
-            :param expected_parse_results (optional): [tuple(str, list, dict, Exception)]
+            Unit test assertion to evaluate output of
+            :meth:`~ParserElement.run_tests`.
+
+            If a list of list-dict tuples is given as the
+            ``expected_parse_results`` argument, then these are zipped
+            with the report tuples returned by ``run_tests()``
+            and evaluated using :meth:`assertParseResultsEquals`.
+            Finally, asserts that the overall
+            `:meth:~ParserElement.run_tests` success value is ``True``.
+
+            :param run_tests_report: the return value from :meth:`ParserElement.run_tests`
+            :type run_tests_report: tuple[bool, list[tuple[str, ParseResults | Exception]]]
+            :param expected_parse_results: (optional)
+            :type expected_parse_results: list[tuple[str | list | dict | Exception, ...]]
             """
             run_test_success, run_test_results = run_tests_report
 
@@ -257,27 +283,44 @@ def with_line_numbers(
         eol_mark: str = "|",
         mark_spaces: typing.Optional[str] = None,
         mark_control: typing.Optional[str] = None,
+        *,
+        indent: typing.Union[str, int] = "",
+        base_1: bool = True,
     ) -> str:
         """
         Helpful method for debugging a parser - prints a string with line and column numbers.
-        (Line and column numbers are 1-based.)
-
-        :param s: tuple(bool, str - string to be printed with line and column numbers
-        :param start_line: int - (optional) starting line number in s to print (default=1)
-        :param end_line: int - (optional) ending line number in s to print (default=len(s))
-        :param expand_tabs: bool - (optional) expand tabs to spaces, to match the pyparsing default
-        :param eol_mark: str - (optional) string to mark the end of lines, helps visualize trailing spaces (default="|")
-        :param mark_spaces: str - (optional) special character to display in place of spaces
-        :param mark_control: str - (optional) convert non-printing control characters to a placeholding
-                                 character; valid values:
-                                 - "unicode" - replaces control chars with Unicode symbols, such as "โ" and "โŠ"
-                                 - any single character string - replace control characters with given string
-                                 - None (default) - string is displayed as-is
-
-        :return: str - input string with leading line numbers and column number headers
+        (Line and column numbers are 1-based by default - if debugging a parse action,
+        pass base_1=False, to correspond to the loc value passed to the parse action.)
+
+        :param s: string to be printed with line and column numbers
+        :param start_line: starting line number in s to print (default=1)
+        :param end_line: ending line number in s to print (default=len(s))
+        :param expand_tabs: expand tabs to spaces, to match the pyparsing default
+        :param eol_mark: string to mark the end of lines, helps visualize trailing spaces
+        :param mark_spaces: special character to display in place of spaces
+        :param mark_control: convert non-printing control characters to a placeholding
+                             character; valid values:
+
+                             - ``"unicode"`` - replaces control chars with Unicode symbols, such as "โ" and "โŠ"
+                             - any single character string - replace control characters with given string
+                             - ``None`` (default) - string is displayed as-is
+
+
+        :param indent: string to indent with line and column numbers; if an int
+                       is passed, converted to ``" " * indent``
+        :param base_1: whether to label string using base 1; if False, string will be
+                       labeled based at 0
+
+        :returns: input string with leading line numbers and column number headers
+
+        .. versionchanged:: 3.2.0
+           New ``indent`` and ``base_1`` arguments.
         """
         if expand_tabs:
             s = s.expandtabs()
+        if isinstance(indent, int):
+            indent = " " * indent
+        indent = indent.expandtabs()
         if mark_control is not None:
             mark_control = typing.cast(str, mark_control)
             if mark_control == "unicode":
@@ -300,25 +343,30 @@ def with_line_numbers(
             else:
                 s = s.replace(" ", mark_spaces)
         if start_line is None:
-            start_line = 1
+            start_line = 0
         if end_line is None:
-            end_line = len(s)
-        end_line = min(end_line, len(s))
-        start_line = min(max(1, start_line), end_line)
+            end_line = len(s.splitlines())
+        end_line = min(end_line, len(s.splitlines()))
+        start_line = min(max(0, start_line), end_line)
 
         if mark_control != "unicode":
-            s_lines = s.splitlines()[start_line - 1 : end_line]
+            s_lines = s.splitlines()[max(start_line - base_1, 0) : end_line]
         else:
-            s_lines = [line + "โŠ" for line in s.split("โŠ")[start_line - 1 : end_line]]
+            s_lines = [
+                line + "โŠ"
+                for line in s.split("โŠ")[max(start_line - base_1, 0) : end_line]
+            ]
         if not s_lines:
             return ""
 
         lineno_width = len(str(end_line))
         max_line_len = max(len(line) for line in s_lines)
-        lead = " " * (lineno_width + 1)
+        lead = f"{indent}{' ' * (lineno_width + 1)}"
+
         if max_line_len >= 99:
             header0 = (
                 lead
+                + ("" if base_1 else " ")
                 + "".join(
                     f"{' ' * 99}{(i + 1) % 100}"
                     for i in range(max(max_line_len // 100, 1))
@@ -327,19 +375,24 @@ def with_line_numbers(
             )
         else:
             header0 = ""
+
         header1 = (
-            header0
+            ("" if base_1 else " ")
             + lead
             + "".join(f"         {(i + 1) % 10}" for i in range(-(-max_line_len // 10)))
             + "\n"
         )
-        header2 = lead + "1234567890" * (-(-max_line_len // 10)) + "\n"
+        digits = "1234567890"
+        header2 = (
+            lead + ("" if base_1 else "0") + digits * (-(-max_line_len // 10)) + "\n"
+        )
         return (
-            header1
+            header0
+            + header1
             + header2
             + "\n".join(
-                f"{i:{lineno_width}d}:{line}{eol_mark}"
-                for i, line in enumerate(s_lines, start=start_line)
+                f"{indent}{i:{lineno_width}d}:{line}{eol_mark}"
+                for i, line in enumerate(s_lines, start=start_line + base_1)
             )
             + "\n"
         )
diff --git a/libs/pytz-2024.2.dist-info/REQUESTED b/libs/pyparsing/tools/__init__.py
similarity index 100%
rename from libs/pytz-2024.2.dist-info/REQUESTED
rename to libs/pyparsing/tools/__init__.py
diff --git a/libs/pyparsing/tools/cvt_pyparsing_pep8_names.py b/libs/pyparsing/tools/cvt_pyparsing_pep8_names.py
new file mode 100644
index 0000000000..ecd2be7b4b
--- /dev/null
+++ b/libs/pyparsing/tools/cvt_pyparsing_pep8_names.py
@@ -0,0 +1,142 @@
+import warnings
+from functools import lru_cache
+import pyparsing as pp
+
+
+@lru_cache(maxsize=None)
+def camel_to_snake(s: str) -> str:
+    """
+    Convert CamelCase to snake_case.
+    """
+    return "".join(f"_{c.lower()}" if c.isupper() else c for c in s).lstrip("_")
+
+
+pre_pep8_method_names = """
+addCondition addParseAction anyCloseTag anyOpenTag asDict asList cStyleComment canParseNext conditionAsParseAction 
+convertToDate convertToDatetime convertToFloat convertToInteger countedArray cppStyleComment dblQuotedString 
+dblSlashComment defaultName dictOf disableMemoization downcaseTokens enableLeftRecursion enablePackrat getName 
+htmlComment ignoreWhitespace infixNotation inlineLiteralsUsing javaStyleComment leaveWhitespace 
+lineEnd lineStart matchOnlyAtCol matchPreviousExpr matchPreviousLiteral nestedExpr nullDebugAction oneOf 
+originalTextFor parseFile parseString parseWithTabs pythonStyleComment quotedString removeQuotes replaceWith 
+resetCache restOfLine runTests scanString searchString setBreak setDebug setDebugActions setDefaultWhitespaceChars 
+setFailAction setName setParseAction setResultsName setWhitespaceChars sglQuotedString stringEnd stringStart tokenMap 
+traceParseAction transformString tryParse unicodeString upcaseTokens withAttribute withClass
+""".split()
+
+special_changes = {
+    "opAssoc": "OpAssoc",
+    "delimitedList": "DelimitedList",
+    "delimited_list": "DelimitedList",
+    "replaceHTMLEntity": "replace_html_entity",
+    "makeHTMLTags": "make_html_tags",
+    "makeXMLTags": "make_xml_tags",
+    "commonHTMLEntity": "common_html_entity",
+    "stripHTMLTags": "strip_html_tags",
+    "indentedBlock": "IndentedBlock",
+    "locatedExpr": "Located",
+}
+
+pre_pep8_arg_names = """parseAll maxMatches listAllMatches callDuringTry includeSeparators fullDump printResults 
+failureTests postParse matchString identChars maxMismatches initChars bodyChars asKeyword excludeChars asGroupList 
+asMatch quoteChar escChar escQuote unquoteResults endQuoteChar convertWhitespaceEscapes notChars wordChars stopOn 
+failOn joinString markerString intExpr useRegex asString ignoreExpr""".split()
+
+special_changes_arg_names = {
+    "asList": "aslist",
+}
+
+pre_pep8_method_name = pp.one_of(pre_pep8_method_names, as_keyword=True)
+pre_pep8_method_name.set_parse_action(lambda t: camel_to_snake(t[0]))
+special_pre_pep8_name = pp.one_of(special_changes, as_keyword=True)
+def update_special_changes(s, l, t):
+    if t[0] == "indentedBlock":
+        warnings.warn(
+            "Conversion of 'indentedBlock' to new 'IndentedBlock'"
+            " requires added code changes to remove 'indentStack' argument\n"
+            f"  {pp.lineno(l, s)}: {pp.line(l, s)}",
+            stacklevel=2,
+        )
+    elif t[0] == "locatedExpr":
+        warnings.warn(
+            "Conversion of 'locatedExpr' to new 'Located'"
+            " may require added code changes - Located does not automatically"
+            " group parsed elements\n"
+            f"  {pp.lineno(l, s)}: {pp.line(l, s)}",
+            stacklevel=2,
+        )
+    return special_changes[t[0]]
+special_pre_pep8_name.set_parse_action(update_special_changes)
+# only replace arg names if part of an arg list
+pre_pep8_arg_name = pp.Regex(
+    rf"{pp.util.make_compressed_re(pre_pep8_arg_names)}"
+) + pp.FollowedBy("=")
+pre_pep8_arg_name.set_parse_action(lambda t: camel_to_snake(t[0]))
+special_pre_pep8_arg_name = pp.one_of(special_changes_arg_names, as_keyword=True) + pp.FollowedBy("=")
+special_pre_pep8_arg_name.set_parse_action(lambda t: special_changes_arg_names[t[0]])
+
+pep8_converter = special_pre_pep8_arg_name | pre_pep8_method_name | special_pre_pep8_name | pre_pep8_arg_name
+
+if __name__ == "__main__":
+    import argparse
+    from pathlib import Path
+    import sys
+
+    argparser = argparse.ArgumentParser(
+        description = (
+            "Utility to convert Python pyparsing scripts using legacy"
+            " camelCase names to use PEP8 snake_case names."
+            "\nBy default, this script will only show whether this script would make any changes."
+        )
+    )
+    argparser.add_argument("--verbose", "-v", action="store_true", help="Show unified diff for each source file")
+    argparser.add_argument("-vv", action="store_true", dest="verbose2", help="Show unified diff for each source file, plus names of scanned files with no changes")
+    argparser.add_argument("--update", "-u", action="store_true", help="Update source files in-place")
+    argparser.add_argument("--encoding", type=str, default="utf-8", help="Encoding of source files (default: utf-8)")
+    argparser.add_argument("--exit-zero-even-if-changed", "-exit0", action="store_true", help="Exit with status code 0 even if changes were made")
+    argparser.add_argument("source_filename", nargs="+", help="Source filenames or filename patterns of Python files to be converted")
+    args = argparser.parse_args()
+
+
+    def show_diffs(original, modified):
+        import difflib
+
+        diff = difflib.unified_diff(
+            original.splitlines(), modified.splitlines(), lineterm=""
+        )
+        sys.stdout.writelines(f"{diff_line}\n" for diff_line in diff)
+
+    exit_status = 0
+
+    for filename_pattern in args.source_filename:
+
+        for filename in Path().glob(filename_pattern):
+            if not Path(filename).is_file():
+                continue
+
+            try:
+                original_contents = Path(filename).read_text(encoding=args.encoding)
+                modified_contents = pep8_converter.transform_string(
+                    original_contents
+                )
+
+                if modified_contents != original_contents:
+                    if args.update:
+                        Path(filename).write_text(modified_contents, encoding=args.encoding)
+                        print(f"Converted {filename}")
+                    else:
+                        print(f"Found required changes in {filename}")
+
+                    if args.verbose:
+                        show_diffs(original_contents, modified_contents)
+                        print()
+
+                    exit_status = 1
+
+                else:
+                    if args.verbose2:
+                        print(f"No required changes in {filename}")
+
+            except Exception as e:
+                print(f"Failed to convert {filename}: {type(e).__name__}: {e}")
+
+    sys.exit(exit_status if not args.exit_zero_even_if_changed else 0)
diff --git a/libs/pyparsing/unicode.py b/libs/pyparsing/unicode.py
index 0e3e06572b..32bb94e439 100644
--- a/libs/pyparsing/unicode.py
+++ b/libs/pyparsing/unicode.py
@@ -2,7 +2,7 @@
 
 import sys
 from itertools import filterfalse
-from typing import List, Tuple, Union
+from typing import Union
 
 
 class _lazyclassproperty:
@@ -25,7 +25,7 @@ def __get__(self, obj, cls):
         return cls._intern[attrname]
 
 
-UnicodeRangeList = List[Union[Tuple[int, int], Tuple[int]]]
+UnicodeRangeList = list[Union[tuple[int, int], tuple[int]]]
 
 
 class unicode_set:
@@ -53,9 +53,9 @@ class CJK(Chinese, Japanese, Korean):
     _ranges: UnicodeRangeList = []
 
     @_lazyclassproperty
-    def _chars_for_ranges(cls) -> List[str]:
-        ret: List[int] = []
-        for cc in cls.__mro__:
+    def _chars_for_ranges(cls) -> list[str]:
+        ret: list[int] = []
+        for cc in cls.__mro__:  # type: ignore[attr-defined]
             if cc is unicode_set:
                 break
             for rr in getattr(cc, "_ranges", ()):
@@ -103,7 +103,7 @@ def identbodychars(cls) -> str:
         plus the digits 0-9, and ยท (Unicode MIDDLE DOT)
         """
         identifier_chars = set(
-            c for c in cls._chars_for_ranges if ("_" + c).isidentifier()
+            c for c in cls._chars_for_ranges if f"_{c}".isidentifier()
         )
         return "".join(
             sorted(identifier_chars | set(cls.identchars) | set("0123456789ยท"))
diff --git a/libs/pyparsing/util.py b/libs/pyparsing/util.py
index 94837fea0f..62295915fa 100644
--- a/libs/pyparsing/util.py
+++ b/libs/pyparsing/util.py
@@ -1,11 +1,14 @@
 # util.py
+import contextlib
+import re
+from functools import lru_cache, wraps
 import inspect
-import warnings
-import types
-import collections
 import itertools
-from functools import lru_cache, wraps
-from typing import Callable, List, Union, Iterable, TypeVar, cast
+import types
+from typing import Callable, Union, Iterable, TypeVar, cast, Any
+import warnings
+
+from .warnings import PyparsingDeprecationWarning, PyparsingDiagnosticWarning
 
 _bslash = chr(92)
 C = TypeVar("C", bound=Callable)
@@ -14,8 +17,8 @@
 class __config_flags:
     """Internal class for defining compatibility and debugging flags"""
 
-    _all_names: List[str] = []
-    _fixed_names: List[str] = []
+    _all_names: list[str] = []
+    _fixed_names: list[str] = []
     _type_desc = "configuration"
 
     @classmethod
@@ -24,6 +27,7 @@ def _set(cls, dname, value):
             warnings.warn(
                 f"{cls.__name__}.{dname} {cls._type_desc} is {str(getattr(cls, dname)).upper()}"
                 f" and cannot be overridden",
+                PyparsingDiagnosticWarning,
                 stacklevel=3,
             )
             return
@@ -44,7 +48,7 @@ def col(loc: int, strg: str) -> int:
 
     Note: the default parsing behavior is to expand tabs in the input string
     before starting the parsing process.  See
-    :class:`ParserElement.parse_string` for more
+    :meth:`ParserElement.parse_string` for more
     information on parsing strings containing ``<TAB>`` s, and suggested
     methods to maintain a consistent view of the parsed string, the parse
     location, and line and column positions within the parsed string.
@@ -59,7 +63,7 @@ def lineno(loc: int, strg: str) -> int:
     The first line is number 1.
 
     Note - the default parsing behavior is to expand tabs in the input string
-    before starting the parsing process.  See :class:`ParserElement.parse_string`
+    before starting the parsing process.  See :meth:`ParserElement.parse_string`
     for more information on parsing strings containing ``<TAB>`` s, and
     suggested methods to maintain a consistent view of the parsed string, the
     parse location, and line and column positions within the parsed string.
@@ -100,27 +104,24 @@ def clear(_):
 
 class _FifoCache:
     def __init__(self, size):
-        self.not_in_cache = not_in_cache = object()
         cache = {}
-        keyring = [object()] * size
+        self.size = size
+        self.not_in_cache = not_in_cache = object()
         cache_get = cache.get
         cache_pop = cache.pop
-        keyiter = itertools.cycle(range(size))
 
         def get(_, key):
             return cache_get(key, not_in_cache)
 
         def set_(_, key, value):
             cache[key] = value
-            i = next(keyiter)
-            cache_pop(keyring[i], None)
-            keyring[i] = key
+            while len(cache) > size:
+                # pop oldest element in cache by getting the first key
+                cache_pop(next(iter(cache)))
 
         def clear(_):
             cache.clear()
-            keyring[:] = [object()] * size
 
-        self.size = size
         self.get = types.MethodType(get, self)
         self.set = types.MethodType(set_, self)
         self.clear = types.MethodType(clear, self)
@@ -137,13 +138,13 @@ class LRUMemo:
     def __init__(self, capacity):
         self._capacity = capacity
         self._active = {}
-        self._memory = collections.OrderedDict()
+        self._memory = {}
 
     def __getitem__(self, key):
         try:
             return self._active[key]
         except KeyError:
-            self._memory.move_to_end(key)
+            self._memory[key] = self._memory.pop(key)
             return self._memory[key]
 
     def __setitem__(self, key, value):
@@ -156,8 +157,9 @@ def __delitem__(self, key):
         except KeyError:
             pass
         else:
-            while len(self._memory) >= self._capacity:
-                self._memory.popitem(last=False)
+            oldest_keys = list(self._memory)[: -(self._capacity + 1)]
+            for key_to_delete in oldest_keys:
+                self._memory.pop(key_to_delete)
             self._memory[key] = value
 
     def clear(self):
@@ -183,63 +185,269 @@ def _escape_regex_range_chars(s: str) -> str:
     return str(s)
 
 
+class _GroupConsecutive:
+    """
+    Used as a callable `key` for itertools.groupby to group
+    characters that are consecutive:
+
+    .. testcode::
+
+       from itertools import groupby
+       from pyparsing.util import _GroupConsecutive
+
+       grouped = groupby("abcdejkmpqrs", key=_GroupConsecutive())
+       for index, group in grouped:
+           print(tuple([index, list(group)]))
+
+    prints:
+
+    .. testoutput::
+
+       (0, ['a', 'b', 'c', 'd', 'e'])
+       (1, ['j', 'k'])
+       (2, ['m'])
+       (3, ['p', 'q', 'r', 's'])
+    """
+
+    def __init__(self) -> None:
+        self.prev = 0
+        self.counter = itertools.count()
+        self.value = -1
+
+    def __call__(self, char: str) -> int:
+        c_int = ord(char)
+        self.prev, prev = c_int, self.prev
+        if c_int - prev > 1:
+            self.value = next(self.counter)
+        return self.value
+
+
+def _is_iterable(obj, _str_type=(str, bytes), _iter_exception=Exception):
+    # str's are iterable, but in pyparsing, we don't want to iterate over them
+    if isinstance(obj, _str_type):
+        return False
+
+    try:
+        iter(obj)
+    except _iter_exception:  # noqa
+        return False
+    else:
+        return True
+
+
+def _escape_re_range_char(c: str) -> str:
+    return fr"\{c}" if c in r"\^-][" else c
+
+
 def _collapse_string_to_ranges(
     s: Union[str, Iterable[str]], re_escape: bool = True
 ) -> str:
-    def is_consecutive(c):
-        c_int = ord(c)
-        is_consecutive.prev, prev = c_int, is_consecutive.prev
-        if c_int - prev > 1:
-            is_consecutive.value = next(is_consecutive.counter)
-        return is_consecutive.value
+    r"""
+    Take a string or list of single-character strings, and return
+    a string of the consecutive characters in that string collapsed
+    into groups, as might be used in a regular expression '[a-z]'
+    character set::
+
+        'a' -> 'a' -> '[a]'
+        'bc' -> 'bc' -> '[bc]'
+        'defgh' -> 'd-h' -> '[d-h]'
+        'fdgeh' -> 'd-h' -> '[d-h]'
+        'jklnpqrtu' -> 'j-lnp-rtu' -> '[j-lnp-rtu]'
 
-    is_consecutive.prev = 0  # type: ignore [attr-defined]
-    is_consecutive.counter = itertools.count()  # type: ignore [attr-defined]
-    is_consecutive.value = -1  # type: ignore [attr-defined]
+    Duplicates get collapsed out::
 
-    def escape_re_range_char(c):
-        return "\\" + c if c in r"\^-][" else c
+        'aaa' -> 'a' -> '[a]'
+        'bcbccb' -> 'bc' -> '[bc]'
+        'defghhgf' -> 'd-h' -> '[d-h]'
+        'jklnpqrjjjtu' -> 'j-lnp-rtu' -> '[j-lnp-rtu]'
 
-    def no_escape_re_range_char(c):
-        return c
+    Spaces are preserved::
 
-    if not re_escape:
-        escape_re_range_char = no_escape_re_range_char
+        'ab c' -> ' a-c' -> '[ a-c]'
+
+    Characters that are significant when defining regex ranges
+    get escaped::
+
+        'acde[]-' -> r'\-\[\]ac-e' -> r'[\-\[\]ac-e]'
+    """
+
+    # Developer notes:
+    # - Do not optimize this code assuming that the given input string
+    #   or internal lists will be short (such as in loading generators into
+    #   lists to make it easier to find the last element); this method is also
+    #   used to generate regex ranges for character sets in the pyparsing.unicode
+    #   classes, and these can be _very_ long lists of strings
+
+    escape_re_range_char: Callable[[str], str]
+    if re_escape:
+        escape_re_range_char = _escape_re_range_char
+    else:
+        escape_re_range_char = lambda ss: ss
 
     ret = []
-    s = "".join(sorted(set(s)))
-    if len(s) > 3:
-        for _, chars in itertools.groupby(s, key=is_consecutive):
+
+    # reduce input string to remove duplicates, and put in sorted order
+    s_chars: list[str] = sorted(set(s))
+
+    if len(s_chars) > 2:
+        # find groups of characters that are consecutive (can be collapsed
+        # down to "<first>-<last>")
+        for _, chars in itertools.groupby(s_chars, key=_GroupConsecutive()):
+            # _ is unimportant, is just used to identify groups
+            # chars is an iterator of one or more consecutive characters
+            # that comprise the current group
             first = last = next(chars)
-            last = collections.deque(
-                itertools.chain(iter([last]), chars), maxlen=1
-            ).pop()
+            with contextlib.suppress(ValueError):
+                *_, last = chars
+
             if first == last:
+                # there was only a single char in this group
                 ret.append(escape_re_range_char(first))
+
+            elif last == chr(ord(first) + 1):
+                # there were only 2 characters in this group
+                #   'a','b' -> 'ab'
+                ret.append(f"{escape_re_range_char(first)}{escape_re_range_char(last)}")
+
             else:
-                sep = "" if ord(last) == ord(first) + 1 else "-"
+                # there were > 2 characters in this group, make into a range
+                #   'c','d','e' -> 'c-e'
                 ret.append(
-                    f"{escape_re_range_char(first)}{sep}{escape_re_range_char(last)}"
+                    f"{escape_re_range_char(first)}-{escape_re_range_char(last)}"
                 )
     else:
-        ret = [escape_re_range_char(c) for c in s]
+        # only 1 or 2 chars were given to form into groups
+        #   'a' -> ['a']
+        #   'bc' -> ['b', 'c']
+        #   'dg' -> ['d', 'g']
+        # no need to list them with "-", just return as a list
+        # (after escaping)
+        ret = [escape_re_range_char(c) for c in s_chars]
 
     return "".join(ret)
 
 
-def _flatten(ll: list) -> list:
+def _flatten(ll: Iterable) -> list:
     ret = []
     for i in ll:
-        if isinstance(i, list):
+        # Developer notes:
+        # - do not collapse this section of code, isinstance checks are done
+        # in optimal order
+        if isinstance(i, str):
+            ret.append(i)
+        elif isinstance(i, Iterable):
             ret.extend(_flatten(i))
         else:
             ret.append(i)
     return ret
 
 
+def _convert_escaped_numerics_to_char(s: str) -> str:
+    if s == "0":
+        return "\0"
+    if s.isdigit() and len(s) == 3:
+        return chr(int(s, 8))
+    elif s.startswith(("u", "x")):
+        return chr(int(s[1:], 16))
+    return s
+
+
+def make_compressed_re(
+    word_list: Iterable[str],
+    max_level: int = 2,
+    *,
+    non_capturing_groups: bool = True,
+    _level: int = 1,
+) -> str:
+    """
+    Create a regular expression string from a list of words, collapsing by common
+    prefixes and optional suffixes.
+
+    Calls itself recursively to build nested sublists for each group of suffixes
+    that have a shared prefix.
+    """
+
+    def get_suffixes_from_common_prefixes(namelist: list[str]):
+        if len(namelist) > 1:
+            for prefix, suffixes in itertools.groupby(namelist, key=lambda s: s[:1]):
+                yield prefix, sorted([s[1:] for s in suffixes], key=len, reverse=True)
+        else:
+            yield namelist[0][0], [namelist[0][1:]]
+
+    if _level == 1:
+        if not word_list:
+            raise ValueError("no words given to make_compressed_re()")
+
+        if "" in word_list:
+            raise ValueError("word list cannot contain empty string")
+    else:
+        # internal recursive call, just return empty string if no words
+        if not word_list:
+            return ""
+
+    # dedupe the word list
+    word_list = list({}.fromkeys(word_list))
+
+    if max_level == 0:
+        if any(len(wd) > 1 for wd in word_list):
+            return "|".join(
+                sorted([re.escape(wd) for wd in word_list], key=len, reverse=True)
+            )
+        else:
+            return f"[{''.join(_escape_regex_range_chars(wd) for wd in word_list)}]"
+
+    ret = []
+    sep = ""
+    ncgroup = "?:" if non_capturing_groups else ""
+
+    for initial, suffixes in get_suffixes_from_common_prefixes(sorted(word_list)):
+        ret.append(sep)
+        sep = "|"
+
+        initial = re.escape(initial)
+
+        trailing = ""
+        if "" in suffixes:
+            trailing = "?"
+            suffixes.remove("")
+
+        if len(suffixes) > 1:
+            if all(len(s) == 1 for s in suffixes):
+                ret.append(
+                    f"{initial}[{''.join(_escape_regex_range_chars(s) for s in suffixes)}]{trailing}"
+                )
+            else:
+                if _level < max_level:
+                    suffix_re = make_compressed_re(
+                        sorted(suffixes),
+                        max_level,
+                        non_capturing_groups=non_capturing_groups,
+                        _level=_level + 1,
+                    )
+                    ret.append(f"{initial}({ncgroup}{suffix_re}){trailing}")
+                else:
+                    if all(len(s) == 1 for s in suffixes):
+                        ret.append(
+                            f"{initial}[{''.join(_escape_regex_range_chars(s) for s in suffixes)}]{trailing}"
+                        )
+                    else:
+                        suffixes.sort(key=len, reverse=True)
+                        ret.append(
+                            f"{initial}({ncgroup}{'|'.join(re.escape(s) for s in suffixes)}){trailing}"
+                        )
+        else:
+            if suffixes:
+                suffix = re.escape(suffixes[0])
+                if len(suffix) > 1 and trailing:
+                    ret.append(f"{initial}({ncgroup}{suffix}){trailing}")
+                else:
+                    ret.append(f"{initial}{suffix}{trailing}")
+            else:
+                ret.append(initial)
+    return "".join(ret)
+
+
 def replaced_by_pep8(compat_name: str, fn: C) -> C:
-    # In a future version, uncomment the code in the internal _inner() functions
-    # to begin emitting DeprecationWarnings.
 
     # Unwrap staticmethod/classmethod
     fn = getattr(fn, "__func__", fn)
@@ -250,28 +458,57 @@ def replaced_by_pep8(compat_name: str, fn: C) -> C:
 
         @wraps(fn)
         def _inner(self, *args, **kwargs):
-            # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
-            # )
+            warnings.warn(
+                f"{compat_name!r} deprecated - use {fn.__name__!r}",
+                PyparsingDeprecationWarning,
+                stacklevel=2,
+            )
             return fn(self, *args, **kwargs)
 
     else:
 
         @wraps(fn)
         def _inner(*args, **kwargs):
-            # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
-            # )
+            warnings.warn(
+                f"{compat_name!r} deprecated - use {fn.__name__!r}",
+                PyparsingDeprecationWarning,
+                stacklevel=2,
+            )
             return fn(*args, **kwargs)
 
-    _inner.__doc__ = f"""Deprecated - use :class:`{fn.__name__}`"""
+    _inner.__doc__ = f"""
+        .. deprecated:: 3.0.0
+           Use :class:`{fn.__name__}` instead
+        """
     _inner.__name__ = compat_name
     _inner.__annotations__ = fn.__annotations__
     if isinstance(fn, types.FunctionType):
-        _inner.__kwdefaults__ = fn.__kwdefaults__
+        _inner.__kwdefaults__ = fn.__kwdefaults__  # type: ignore [attr-defined]
     elif isinstance(fn, type) and hasattr(fn, "__init__"):
-        _inner.__kwdefaults__ = fn.__init__.__kwdefaults__
+        _inner.__kwdefaults__ = fn.__init__.__kwdefaults__  # type: ignore [misc,attr-defined]
     else:
-        _inner.__kwdefaults__ = None
+        _inner.__kwdefaults__ = None  # type: ignore [attr-defined]
     _inner.__qualname__ = fn.__qualname__
     return cast(C, _inner)
+
+
+def _to_pep8_name(s: str, _re_sub_pattern=re.compile(r"([a-z])([A-Z])")) -> str:
+    s = _re_sub_pattern.sub(r"\1_\2", s)
+    return s.lower()
+
+
+def deprecate_argument(
+    kwargs: dict[str, Any], arg_name: str, default_value=None, *, new_name: str = ""
+) -> Any:
+
+    if arg_name in kwargs:
+        new_name = new_name or _to_pep8_name(arg_name)
+        warnings.warn(
+            f"{arg_name!r} argument is deprecated, use {new_name!r}",
+            category=PyparsingDeprecationWarning,
+            stacklevel=3,
+        )
+    else:
+        kwargs[arg_name] = default_value
+
+    return kwargs[arg_name]
diff --git a/libs/pyparsing/warnings.py b/libs/pyparsing/warnings.py
new file mode 100644
index 0000000000..1e4e9425e6
--- /dev/null
+++ b/libs/pyparsing/warnings.py
@@ -0,0 +1,10 @@
+class PyparsingWarning(UserWarning):
+    """Base warning class for all pyparsing warnings"""
+
+
+class PyparsingDeprecationWarning(PyparsingWarning, DeprecationWarning):
+    """Base warning class for all pyparsing deprecation warnings"""
+
+
+class PyparsingDiagnosticWarning(PyparsingWarning):
+    """Base warning class for all pyparsing diagnostic warnings"""
diff --git a/libs/pyrsistent-0.20.0.dist-info/METADATA b/libs/pyrsistent-0.20.0.dist-info/METADATA
index 1ce3d375fd..5df6af4360 100644
--- a/libs/pyrsistent-0.20.0.dist-info/METADATA
+++ b/libs/pyrsistent-0.20.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pyrsistent
 Version: 0.20.0
 Summary: Persistent/Functional/Immutable data structures
@@ -19,6 +19,17 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE.mit
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-python
+Dynamic: summary
 
 Pyrsistent
 ==========
diff --git a/libs/pyrsistent-0.20.0.dist-info/RECORD b/libs/pyrsistent-0.20.0.dist-info/RECORD
index 5b552511ba..c98ec411a2 100644
--- a/libs/pyrsistent-0.20.0.dist-info/RECORD
+++ b/libs/pyrsistent-0.20.0.dist-info/RECORD
@@ -1,11 +1,11 @@
 _pyrsistent_version.py,sha256=pJLteH9r0aOnAwnvPatmr2QSz7lO2BDXON0AKkXx0Pg,23
-pvectorc.cpython-38-darwin.so,sha256=FWL6D05ITy7RG0cjmkA2_RlpMG8YeAXGGR9zoIv6YUI,39120
+pvectorc.cpython-310-darwin.so,sha256=-8lMbwlayP3J7EOOiaGY94gbGRcw57bW4t3YtGg4Huc,76512
 pyrsistent-0.20.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pyrsistent-0.20.0.dist-info/LICENSE.mit,sha256=P9PT0auccz7kU_vzu7qoRUQNDYwg17WgOdLkai7X_AE,1060
-pyrsistent-0.20.0.dist-info/METADATA,sha256=BD5uJL-kVFQZvWmtbNyerN9qb7C6StTolg1MaHH1D3M,27803
+pyrsistent-0.20.0.dist-info/METADATA,sha256=4ZsA3ERMtuIJ7az5rR4m3o3mMjMlTf2n2eCZiFMh2sw,28037
 pyrsistent-0.20.0.dist-info/RECORD,,
 pyrsistent-0.20.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyrsistent-0.20.0.dist-info/WHEEL,sha256=8MbRJsGMYV6Ym1_SoG8YuJPvArpN2Z2wVWusEpp3feg,108
+pyrsistent-0.20.0.dist-info/WHEEL,sha256=DkV-ntIm-3VWD87iCIyvXSz28ISStjMGlDRnHg-QlnQ,110
+pyrsistent-0.20.0.dist-info/licenses/LICENSE.mit,sha256=P9PT0auccz7kU_vzu7qoRUQNDYwg17WgOdLkai7X_AE,1060
 pyrsistent-0.20.0.dist-info/top_level.txt,sha256=4RgY60Kwp0PJK6JLt04o336V4SZXK5QLBlfX0jZTNlw,40
 pyrsistent/__init__.py,sha256=1cONLCDzbyDoZ_deek8Ei_iqOLI4oNseRPLF3zvmEoA,1479
 pyrsistent/__init__.pyi,sha256=xrlyeqwkRQHxsSXZEoIR_PliQBSrMiEy8TpuyRpe3mY,7188
diff --git a/libs/pyrsistent-0.20.0.dist-info/WHEEL b/libs/pyrsistent-0.20.0.dist-info/WHEEL
index be75fa70de..10166b37bf 100644
--- a/libs/pyrsistent-0.20.0.dist-info/WHEEL
+++ b/libs/pyrsistent-0.20.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: false
-Tag: cp38-cp38-macosx_12_0_x86_64
+Tag: cp310-cp310-macosx_14_0_arm64
 
diff --git a/libs/pyrsistent-0.20.0.dist-info/LICENSE.mit b/libs/pyrsistent-0.20.0.dist-info/licenses/LICENSE.mit
similarity index 100%
rename from libs/pyrsistent-0.20.0.dist-info/LICENSE.mit
rename to libs/pyrsistent-0.20.0.dist-info/licenses/LICENSE.mit
diff --git a/libs/pyparsing-3.1.4.dist-info/INSTALLER b/libs/pysocks-1.7.1.dist-info/INSTALLER
similarity index 100%
rename from libs/pyparsing-3.1.4.dist-info/INSTALLER
rename to libs/pysocks-1.7.1.dist-info/INSTALLER
diff --git a/libs/pysocks-1.7.1.dist-info/METADATA b/libs/pysocks-1.7.1.dist-info/METADATA
new file mode 100644
index 0000000000..00e201fec4
--- /dev/null
+++ b/libs/pysocks-1.7.1.dist-info/METADATA
@@ -0,0 +1,330 @@
+Metadata-Version: 2.4
+Name: PySocks
+Version: 1.7.1
+Summary: A Python SOCKS client module. See https://github.com/Anorov/PySocks for more information.
+Home-page: https://github.com/Anorov/PySocks
+Author: Anorov
+Author-email: anorov.vorona@gmail.com
+License: BSD
+Keywords: socks,proxy
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.4
+Classifier: Programming Language :: Python :: 3.5
+Classifier: Programming Language :: Python :: 3.6
+Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
+
+PySocks
+=======
+
+PySocks lets you send traffic through SOCKS and HTTP proxy servers. It is a modern fork of [SocksiPy](http://socksipy.sourceforge.net/) with bug fixes and extra features.
+
+Acts as a drop-in replacement to the socket module. Seamlessly configure SOCKS proxies for any socket object by calling `socket_object.set_proxy()`.
+
+----------------
+
+Features
+========
+
+* SOCKS proxy client for Python 2.7 and 3.4+
+* TCP supported
+* UDP mostly supported (issues may occur in some edge cases)
+* HTTP proxy client included but not supported or recommended (you should use urllib2's or requests' own HTTP proxy interface)
+* urllib2 handler included. `pip install` / `setup.py install` will automatically install the `sockshandler` module.
+
+Installation
+============
+
+    pip install PySocks
+
+Or download the tarball / `git clone` and...
+
+    python setup.py install
+
+These will install both the `socks` and `sockshandler` modules.
+
+Alternatively, include just `socks.py` in your project.
+
+--------------------------------------------
+
+*Warning:* PySocks/SocksiPy only supports HTTP proxies that use CONNECT tunneling. Certain HTTP proxies may not work with this library. If you wish to use HTTP (not SOCKS) proxies, it is recommended that you rely on your HTTP client's native proxy support (`proxies` dict for `requests`, or `urllib2.ProxyHandler` for `urllib2`) instead.
+
+--------------------------------------------
+
+Usage
+=====
+
+## socks.socksocket ##
+
+    import socks
+
+    s = socks.socksocket() # Same API as socket.socket in the standard lib
+
+    s.set_proxy(socks.SOCKS5, "localhost") # SOCKS4 and SOCKS5 use port 1080 by default
+    # Or
+    s.set_proxy(socks.SOCKS4, "localhost", 4444)
+    # Or
+    s.set_proxy(socks.HTTP, "5.5.5.5", 8888)
+
+    # Can be treated identical to a regular socket object
+    s.connect(("www.somesite.com", 80))
+    s.sendall("GET / HTTP/1.1 ...")
+    print s.recv(4096)
+
+## Monkeypatching ##
+
+To monkeypatch the entire standard library with a single default proxy:
+
+    import urllib2
+    import socket
+    import socks
+
+    socks.set_default_proxy(socks.SOCKS5, "localhost")
+    socket.socket = socks.socksocket
+
+    urllib2.urlopen("http://www.somesite.com/") # All requests will pass through the SOCKS proxy
+
+Note that monkeypatching may not work for all standard modules or for all third party modules, and generally isn't recommended. Monkeypatching is usually an anti-pattern in Python.
+
+## urllib2 Handler ##
+
+Example use case with the `sockshandler` urllib2 handler. Note that you must import both `socks` and `sockshandler`, as the handler is its own module separate from PySocks. The module is included in the PyPI package.
+
+    import urllib2
+    import socks
+    from sockshandler import SocksiPyHandler
+
+    opener = urllib2.build_opener(SocksiPyHandler(socks.SOCKS5, "127.0.0.1", 9050))
+    print opener.open("http://www.somesite.com/") # All requests made by the opener will pass through the SOCKS proxy
+
+--------------------------------------------
+
+Original SocksiPy README attached below, amended to reflect API changes.
+
+--------------------------------------------
+
+SocksiPy
+
+A Python SOCKS module.
+
+(C) 2006 Dan-Haim. All rights reserved.
+
+See LICENSE file for details.
+
+
+*WHAT IS A SOCKS PROXY?*
+
+A SOCKS proxy is a proxy server at the TCP level. In other words, it acts as
+a tunnel, relaying all traffic going through it without modifying it.
+SOCKS proxies can be used to relay traffic using any network protocol that
+uses TCP.
+
+*WHAT IS SOCKSIPY?*
+
+This Python module allows you to create TCP connections through a SOCKS
+proxy without any special effort.
+It also supports relaying UDP packets with a SOCKS5 proxy.
+
+*PROXY COMPATIBILITY*
+
+SocksiPy is compatible with three different types of proxies:
+
+1. SOCKS Version 4 (SOCKS4), including the SOCKS4a extension.
+2. SOCKS Version 5 (SOCKS5).
+3. HTTP Proxies which support tunneling using the CONNECT method.
+
+*SYSTEM REQUIREMENTS*
+
+Being written in Python, SocksiPy can run on any platform that has a Python
+interpreter and TCP/IP support.
+This module has been tested with Python 2.3 and should work with greater versions
+just as well.
+
+
+INSTALLATION
+-------------
+
+Simply copy the file "socks.py" to your Python's `lib/site-packages` directory,
+and you're ready to go. [Editor's note: it is better to use `python setup.py install` for PySocks]
+
+
+USAGE
+------
+
+First load the socks module with the command:
+
+    >>> import socks
+    >>>
+
+The socks module provides a class called `socksocket`, which is the base to all of the module's functionality.
+
+The `socksocket` object has the same initialization parameters as the normal socket
+object to ensure maximal compatibility, however it should be noted that `socksocket` will only function with family being `AF_INET` and
+type being either `SOCK_STREAM` or `SOCK_DGRAM`.
+Generally, it is best to initialize the `socksocket` object with no parameters
+
+    >>> s = socks.socksocket()
+    >>>
+
+The `socksocket` object has an interface which is very similiar to socket's (in fact
+the `socksocket` class is derived from socket) with a few extra methods.
+To select the proxy server you would like to use, use the `set_proxy` method, whose
+syntax is:
+
+    set_proxy(proxy_type, addr[, port[, rdns[, username[, password]]]])
+
+Explanation of the parameters:
+
+`proxy_type` - The type of the proxy server. This can be one of three possible
+choices: `PROXY_TYPE_SOCKS4`, `PROXY_TYPE_SOCKS5` and `PROXY_TYPE_HTTP` for SOCKS4,
+SOCKS5 and HTTP servers respectively. `SOCKS4`, `SOCKS5`, and `HTTP` are all aliases, respectively.
+
+`addr` - The IP address or DNS name of the proxy server.
+
+`port` - The port of the proxy server. Defaults to 1080 for socks and 8080 for http.
+
+`rdns` - This is a boolean flag than modifies the behavior regarding DNS resolving.
+If it is set to True, DNS resolving will be preformed remotely, on the server.
+If it is set to False, DNS resolving will be preformed locally. Please note that
+setting this to True with SOCKS4 servers actually use an extension to the protocol,
+called SOCKS4a, which may not be supported on all servers (SOCKS5 and http servers
+always support DNS). The default is True.
+
+`username` - For SOCKS5 servers, this allows simple username / password authentication
+with the server. For SOCKS4 servers, this parameter will be sent as the userid.
+This parameter is ignored if an HTTP server is being used. If it is not provided,
+authentication will not be used (servers may accept unauthenticated requests).
+
+`password` - This parameter is valid only for SOCKS5 servers and specifies the
+respective password for the username provided.
+
+Example of usage:
+
+    >>> s.set_proxy(socks.SOCKS5, "socks.example.com") # uses default port 1080
+    >>> s.set_proxy(socks.SOCKS4, "socks.test.com", 1081)
+
+After the set_proxy method has been called, simply call the connect method with the
+traditional parameters to establish a connection through the proxy:
+
+    >>> s.connect(("www.sourceforge.net", 80))
+    >>>
+
+Connection will take a bit longer to allow negotiation with the proxy server.
+Please note that calling connect without calling `set_proxy` earlier will connect
+without a proxy (just like a regular socket).
+
+Errors: Any errors in the connection process will trigger exceptions. The exception
+may either be generated by the underlying socket layer or may be custom module
+exceptions, whose details follow:
+
+class `ProxyError` - This is a base exception class. It is not raised directly but
+rather all other exception classes raised by this module are derived from it.
+This allows an easy way to catch all proxy-related errors. It descends from `IOError`.
+
+All `ProxyError` exceptions have an attribute `socket_err`, which will contain either a
+caught `socket.error` exception, or `None` if there wasn't any.
+
+class `GeneralProxyError` - When thrown, it indicates a problem which does not fall
+into another category.
+
+* `Sent invalid data` - This error means that unexpected data has been received from
+the server. The most common reason is that the server specified as the proxy is
+not really a SOCKS4/SOCKS5/HTTP proxy, or maybe the proxy type specified is wrong.
+
+* `Connection closed unexpectedly` - The proxy server unexpectedly closed the connection.
+This may indicate that the proxy server is experiencing network or software problems.
+
+* `Bad proxy type` - This will be raised if the type of the proxy supplied to the
+set_proxy function was not one of `SOCKS4`/`SOCKS5`/`HTTP`.
+
+* `Bad input` - This will be raised if the `connect()` method is called with bad input
+parameters.
+
+class `SOCKS5AuthError` - This indicates that the connection through a SOCKS5 server
+failed due to an authentication problem.
+
+* `Authentication is required` - This will happen if you use a SOCKS5 server which
+requires authentication without providing a username / password at all.
+
+* `All offered authentication methods were rejected` - This will happen if the proxy
+requires a special authentication method which is not supported by this module.
+
+* `Unknown username or invalid password` - Self descriptive.
+
+class `SOCKS5Error` - This will be raised for SOCKS5 errors which are not related to
+authentication.
+The parameter is a tuple containing a code, as given by the server,
+and a description of the
+error. The possible errors, according to the RFC, are:
+
+* `0x01` - General SOCKS server failure - If for any reason the proxy server is unable to
+fulfill your request (internal server error).
+* `0x02` - connection not allowed by ruleset - If the address you're trying to connect to
+is blacklisted on the server or requires authentication.
+* `0x03` - Network unreachable - The target could not be contacted. A router on the network
+had replied with a destination net unreachable error.
+* `0x04` - Host unreachable - The target could not be contacted. A router on the network
+had replied with a destination host unreachable error.
+* `0x05` - Connection refused - The target server has actively refused the connection
+(the requested port is closed).
+* `0x06` - TTL expired - The TTL value of the SYN packet from the proxy to the target server
+has expired. This usually means that there are network problems causing the packet
+to be caught in a router-to-router "ping-pong".
+* `0x07` - Command not supported - For instance if the server does not support UDP.
+* `0x08` - Address type not supported - The client has provided an invalid address type.
+When using this module, this error should not occur.
+
+class `SOCKS4Error` - This will be raised for SOCKS4 errors. The parameter is a tuple
+containing a code and a description of the error, as given by the server. The
+possible error, according to the specification are:
+
+* `0x5B` - Request rejected or failed - Will be raised in the event of an failure for any
+reason other then the two mentioned next.
+* `0x5C` - request rejected because SOCKS server cannot connect to identd on the client -
+The Socks server had tried an ident lookup on your computer and has failed. In this
+case you should run an identd server and/or configure your firewall to allow incoming
+connections to local port 113 from the remote server.
+* `0x5D` - request rejected because the client program and identd report different user-ids -
+The Socks server had performed an ident lookup on your computer and has received a
+different userid than the one you have provided. Change your userid (through the
+username parameter of the set_proxy method) to match and try again.
+
+class `HTTPError` - This will be raised for HTTP errors. The message will contain
+the HTTP status code and provided error message.
+
+After establishing the connection, the object behaves like a standard socket.
+
+Methods like `makefile()` and `settimeout()` should behave just like regular sockets.
+Call the `close()` method to close the connection.
+
+In addition to the `socksocket` class, an additional function worth mentioning is the
+`set_default_proxy` function. The parameters are the same as the `set_proxy` method.
+This function will set default proxy settings for newly created `socksocket` objects,
+in which the proxy settings haven't been changed via the `set_proxy` method.
+This is quite useful if you wish to force 3rd party modules to use a SOCKS proxy,
+by overriding the socket object.
+For example:
+
+    >>> socks.set_default_proxy(socks.SOCKS5, "socks.example.com")
+    >>> socket.socket = socks.socksocket
+    >>> urllib.urlopen("http://www.sourceforge.net/")
+
+
+PROBLEMS
+---------
+
+Please open a GitHub issue at https://github.com/Anorov/PySocks
diff --git a/libs/pysocks-1.7.1.dist-info/RECORD b/libs/pysocks-1.7.1.dist-info/RECORD
new file mode 100644
index 0000000000..6fc522a8b3
--- /dev/null
+++ b/libs/pysocks-1.7.1.dist-info/RECORD
@@ -0,0 +1,9 @@
+pysocks-1.7.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pysocks-1.7.1.dist-info/METADATA,sha256=s0tCSaT0WJRL6NNS7WXhn9ua6ECBV8DbCiIuNMaA9gk,13468
+pysocks-1.7.1.dist-info/RECORD,,
+pysocks-1.7.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pysocks-1.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pysocks-1.7.1.dist-info/licenses/LICENSE,sha256=cCfiFOAU63i3rcwc7aWspxOnn8T2oMUsnaWz5wfm_-k,1401
+pysocks-1.7.1.dist-info/top_level.txt,sha256=TKSOIfCFBoK9EY8FBYbYqC3PWd3--G15ph9n8-QHPDk,19
+socks.py,sha256=xOYn27t9IGrbTBzWsUUuPa0YBuplgiUykzkOB5V5iFY,31086
+sockshandler.py,sha256=2SYGj-pwt1kjgLoZAmyeaEXCeZDWRmfVS_QG6kErGtY,3966
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/REQUESTED b/libs/pysocks-1.7.1.dist-info/REQUESTED
similarity index 100%
rename from libs/pytz_deprecation_shim-0.1.0.post0.dist-info/REQUESTED
rename to libs/pysocks-1.7.1.dist-info/REQUESTED
diff --git a/libs/pysocks-1.7.1.dist-info/WHEEL b/libs/pysocks-1.7.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/pysocks-1.7.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/pysocks-1.7.1.dist-info/licenses/LICENSE b/libs/pysocks-1.7.1.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..04b6b1f37c
--- /dev/null
+++ b/libs/pysocks-1.7.1.dist-info/licenses/LICENSE
@@ -0,0 +1,22 @@
+Copyright 2006 Dan-Haim. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of Dan Haim nor the names of his contributors may be used
+   to endorse or promote products derived from this software without specific
+   prior written permission.
+   
+THIS SOFTWARE IS PROVIDED BY DAN HAIM "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL DAN HAIM OR HIS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMANGE.
diff --git a/libs/pysocks-1.7.1.dist-info/top_level.txt b/libs/pysocks-1.7.1.dist-info/top_level.txt
new file mode 100644
index 0000000000..9476163ae5
--- /dev/null
+++ b/libs/pysocks-1.7.1.dist-info/top_level.txt
@@ -0,0 +1,2 @@
+socks
+sockshandler
diff --git a/libs/pysrt-1.1.2.dist-info/METADATA b/libs/pysrt-1.1.2.dist-info/METADATA
index 231da9f4f0..fa9edab4cf 100644
--- a/libs/pysrt-1.1.2.dist-info/METADATA
+++ b/libs/pysrt-1.1.2.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pysrt
 Version: 1.1.2
 Summary: SubRip (.srt) subtitle parser and writer
@@ -21,6 +21,16 @@ Classifier: Topic :: Multimedia :: Video
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Text Processing :: Markup
 Requires-Dist: chardet
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: platform
+Dynamic: requires-dist
+Dynamic: summary
 
 pysrt
 =============
diff --git a/libs/pysrt-1.1.2.dist-info/RECORD b/libs/pysrt-1.1.2.dist-info/RECORD
index 707a740f7e..8080e08522 100644
--- a/libs/pysrt-1.1.2.dist-info/RECORD
+++ b/libs/pysrt-1.1.2.dist-info/RECORD
@@ -1,9 +1,9 @@
-../../bin/srt,sha256=UrFVij135JSGJ1Eo7skFoHjeB3RHqQt6ArxGHxLNQwE,236
+../../bin/srt,sha256=5pn41iVDTZF7f8O0jMPW7g-TldTFHyvhJ7-erKlIdXg,189
 pysrt-1.1.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pysrt-1.1.2.dist-info/METADATA,sha256=nlpPNKETbL-EwNHCzDLFj2d-d3zDDpbG5E15YT_KQs4,3370
+pysrt-1.1.2.dist-info/METADATA,sha256=71aF7zfqbluhu7wAoHGUM3jBTFS7pCl2bvsJl8d6rKQ,3561
 pysrt-1.1.2.dist-info/RECORD,,
 pysrt-1.1.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pysrt-1.1.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+pysrt-1.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
 pysrt-1.1.2.dist-info/entry_points.txt,sha256=m65t0zRL64ipuvYsB2iF0rRokfmuaU2EzUzoguL8SVY,44
 pysrt-1.1.2.dist-info/top_level.txt,sha256=A50x279xb8-j59bZ6AKUIYW7v5OECmpkKMKJLBtFgTc,6
 pysrt/__init__.py,sha256=hR58_n9HAwsjk_ozaiCkXS-MKWuQMqQfGfm2-AJSIJo,560
diff --git a/libs/pysrt-1.1.2.dist-info/WHEEL b/libs/pysrt-1.1.2.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/pysrt-1.1.2.dist-info/WHEEL
+++ b/libs/pysrt-1.1.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/pysubs2-1.7.3.dist-info/METADATA b/libs/pysubs2-1.7.3.dist-info/METADATA
deleted file mode 100644
index 5326ba0405..0000000000
--- a/libs/pysubs2-1.7.3.dist-info/METADATA
+++ /dev/null
@@ -1,70 +0,0 @@
-Metadata-Version: 2.1
-Name: pysubs2
-Version: 1.7.3
-Summary: A library for editing subtitle files
-Home-page: https://github.com/tkarabela/pysubs2
-Author: Tomas Karabela
-Author-email: tkarabela@seznam.cz
-License: MIT
-Project-URL: Documentation, https://pysubs2.readthedocs.io
-Project-URL: Bug Tracker, https://github.com/tkarabela/pysubs2/issues
-Keywords: SubStation,SubRip,MicroDVD,MPL2,WebVTT,ass,srt,sub,vtt,subtitles,captions
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Text Processing :: Markup
-Classifier: Topic :: Multimedia :: Video
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Operating System :: OS Independent
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Typing :: Typed
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE.txt
-
-pysubs2
-=======
-
-[![pysubs2 build master branch](https://img.shields.io/github/actions/workflow/status/tkarabela/pysubs2/main.yml?branch=master)](https://github.com/tkarabela/pysubs2/actions)
-[![pysubs2 test code coverage](https://img.shields.io/codecov/c/github/tkarabela/pysubs2)](https://app.codecov.io/github/tkarabela/pysubs2)
-[![Static Badge](https://img.shields.io/badge/MyPy%20%26%20Ruffle-checked-blue?style=flat)](https://github.com/tkarabela/pysubs2/actions)
-[![PyPI - Version](https://img.shields.io/pypi/v/pysubs2.svg?style=flat)](https://pypi.org/project/pysubs2/)
-[![PyPI - Status](https://img.shields.io/pypi/status/pysubs2.svg?style=flat)](https://pypi.org/project/pysubs2/)
-[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pysubs2.svg?style=flat)](https://pypi.org/project/pysubs2/)
-[![PyPI - License](https://img.shields.io/pypi/l/pysubs2.svg?style=flat)](LICENSE.txt)
-[![GitHub Repo stars](https://img.shields.io/github/stars/tkarabela/pysubs2?style=flat&label=GitHub%20stars)](https://github.com/tkarabela/pysubs2)
-
-
-pysubs2 is a Python library for editing subtitle files.
-Itโ€™s based on *SubStation Alpha*, the native format of
-[Aegisub](http://www.aegisub.org/); it also supports *SubRip (SRT)*,
-*MicroDVD*, *MPL2*, *TMP* and *WebVTT* formats and *OpenAI Whisper* captions.
-
-There is a small CLI tool for batch conversion and retiming.
-
-```bash
-pip install pysubs2
-pysubs2 --shift 0.3s *.srt
-pysubs2 --to srt *.ass
-```
-
-```python
-import pysubs2
-subs = pysubs2.load("my_subtitles.ass", encoding="utf-8")
-subs.shift(s=2.5)
-for line in subs:
-    line.text = "{\\be1}" + line.text
-subs.save("my_subtitles_edited.ass")
-```
-
-To learn more, please [see the documentation](http://pysubs2.readthedocs.io).
-If you'd like to contribute, see [CONTRIBUTING.md](CONTRIBUTING.md).
-
-pysubs2 is licensed under the MIT license (see [LICENSE.txt](LICENSE.txt)).
diff --git a/libs/pysubs2-1.7.3.dist-info/RECORD b/libs/pysubs2-1.7.3.dist-info/RECORD
deleted file mode 100644
index ada373655a..0000000000
--- a/libs/pysubs2-1.7.3.dist-info/RECORD
+++ /dev/null
@@ -1,28 +0,0 @@
-../../bin/pysubs2,sha256=1ipjtihceH0M9ljChd41YMd3co9-Mn5sngcbA3Kgupk,241
-pysubs2-1.7.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pysubs2-1.7.3.dist-info/LICENSE.txt,sha256=WYgskvBrUBBDxuKH9JSV1u22g-UBTwHjeuJLlPp6lWU,1063
-pysubs2-1.7.3.dist-info/METADATA,sha256=EG6RW41p_JlOJDC9p9clWaHINxR6uKDBcBh-9Va9Qno,3183
-pysubs2-1.7.3.dist-info/RECORD,,
-pysubs2-1.7.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pysubs2-1.7.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pysubs2-1.7.3.dist-info/entry_points.txt,sha256=mznmeaia9Ec19KsaIM8D4tt6V0HnOUlPhSg5nXiAfAE,49
-pysubs2-1.7.3.dist-info/top_level.txt,sha256=i_V6JX-AWjMX15-Dzyc0RlrInU7Zun9PYfdB9brM95E,8
-pysubs2/__init__.py,sha256=L71MMMS6zcAiGWdddhnc4COZmKLYX__igP0Tr5q-y3Q,783
-pysubs2/__main__.py,sha256=3iAK73rLxjLJqFMYD-jn3PDJvHZ8rIOW_NgsmBkRGhA,134
-pysubs2/cli.py,sha256=lFVZsLChtnnaRov2lNEHlecTJaoNNvTLMQmZe0-4oGE,11916
-pysubs2/common.py,sha256=QfZOuv5p3B_l62D_2qMOTY59nUPB1JVjJaBeKN3oi08,1503
-pysubs2/exceptions.py,sha256=yOXsGhlD1IvSF74Bd5psD36SKA5vT0e_BlhzgqSlMXs,2574
-pysubs2/formats/__init__.py,sha256=KZy9IibVmK-WwCHAYYplJELmYEnQu9BBRz5HEvyZ5U4,2515
-pysubs2/formats/base.py,sha256=zzt4L3KIC6VrUNfzwjDHSF5HV7swrdo65dop90vfy70,2959
-pysubs2/formats/jsonformat.py,sha256=whCZeJi7xbXRLqFNWQ83SzkAli2XlqYnVfs8soNOA0g,2283
-pysubs2/formats/microdvd.py,sha256=hfshagBIMMPz3WgqpttYGugtAj_6CheAiTkvTTrn3NE,5970
-pysubs2/formats/mpl2.py,sha256=vpyL5j7gxxkGvWvI8JXwFlHaEyCBHYTn_mtgk4zqNFw,1970
-pysubs2/formats/subrip.py,sha256=VsEhj6aX_NZdUbecxjKk-5Ri7GcUdGh8dfzZVTsAZSM,7484
-pysubs2/formats/substation.py,sha256=UFaZ3sZoCa3bizKvn_5Ugtqy6crO1FqldxS5OI7ozcQ,16795
-pysubs2/formats/tmp.py,sha256=FKktjpgv07rf6EZ1Og0rkNpcj59Z6kL6dL-V0QLSKQw,4100
-pysubs2/formats/webvtt.py,sha256=Ycur_E5ztjazW2akyUXTsbNUdLs4S-knq93hwompCac,1788
-pysubs2/formats/whisper.py,sha256=JHGY8nhiVso_iyVZOP72lLbC7GM-gX_FFc1BdzCGdo0,1607
-pysubs2/ssaevent.py,sha256=VR0Pso779Pw5bs-Q-VpIz8Zs-A6p2a2pptQtsFVjRnM,6291
-pysubs2/ssafile.py,sha256=smMZIFk5h8n3uUuzgrcSmzdNsVU7oB3kguKQtUAdQGU,23833
-pysubs2/ssastyle.py,sha256=hlNowFmuiiwOzWTtQxKUakTwcE7Q5KxlQtl64Q6ScMU,4031
-pysubs2/time.py,sha256=Onk1vs9xXKiuwYK0RorZVU29p2FCEARapnfP_yYczTQ,4739
diff --git a/libs/pysubs2-1.7.3.dist-info/WHEEL b/libs/pysubs2-1.7.3.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/pysubs2-1.7.3.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/pysubs2-1.7.3.dist-info/INSTALLER b/libs/pysubs2-1.8.0.dist-info/INSTALLER
similarity index 100%
rename from libs/pysubs2-1.7.3.dist-info/INSTALLER
rename to libs/pysubs2-1.8.0.dist-info/INSTALLER
diff --git a/libs/pysubs2-1.8.0.dist-info/METADATA b/libs/pysubs2-1.8.0.dist-info/METADATA
new file mode 100644
index 0000000000..a81fabd04d
--- /dev/null
+++ b/libs/pysubs2-1.8.0.dist-info/METADATA
@@ -0,0 +1,71 @@
+Metadata-Version: 2.4
+Name: pysubs2
+Version: 1.8.0
+Summary: A library for editing subtitle files
+Home-page: https://github.com/tkarabela/pysubs2
+Author: Tomas Karabela
+Author-email: tkarabela@seznam.cz
+License: MIT
+Project-URL: Documentation, https://pysubs2.readthedocs.io
+Project-URL: Bug Tracker, https://github.com/tkarabela/pysubs2/issues
+Keywords: SubStation,SubRip,MicroDVD,MPL2,WebVTT,ass,srt,sub,vtt,subtitles,captions
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Markup
+Classifier: Topic :: Multimedia :: Video
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: Operating System :: OS Independent
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Typing :: Typed
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Dynamic: license-file
+
+pysubs2
+=======
+
+[![pysubs2 build master branch](https://img.shields.io/github/actions/workflow/status/tkarabela/pysubs2/main.yml?branch=master)](https://github.com/tkarabela/pysubs2/actions)
+[![pysubs2 test code coverage](https://img.shields.io/codecov/c/github/tkarabela/pysubs2)](https://app.codecov.io/github/tkarabela/pysubs2)
+[![Static Badge](https://img.shields.io/badge/MyPy%20%26%20Ruffle-checked-blue?style=flat)](https://github.com/tkarabela/pysubs2/actions)
+[![PyPI - Version](https://img.shields.io/pypi/v/pysubs2.svg?style=flat)](https://pypi.org/project/pysubs2/)
+[![PyPI - Status](https://img.shields.io/pypi/status/pysubs2.svg?style=flat)](https://pypi.org/project/pysubs2/)
+[![PyPI - Python Version](https://img.shields.io/pypi/pyversions/pysubs2.svg?style=flat)](https://pypi.org/project/pysubs2/)
+[![PyPI - License](https://img.shields.io/pypi/l/pysubs2.svg?style=flat)](LICENSE.txt)
+[![GitHub Repo stars](https://img.shields.io/github/stars/tkarabela/pysubs2?style=flat&label=GitHub%20stars)](https://github.com/tkarabela/pysubs2)
+
+
+pysubs2 is a Python library for editing subtitle files.
+Itโ€™s based on *SubStation Alpha*, the native format of
+[Aegisub](http://www.aegisub.org/); it also supports *SubRip (SRT)*,
+*MicroDVD*, *MPL2*, *TMP*, *WebVTT*, *TTML* and *SAMI* formats and *OpenAI Whisper* captions.
+
+There is a small CLI tool for batch conversion and retiming.
+
+```bash
+pip install pysubs2
+pysubs2 --shift 0.3s *.srt
+pysubs2 --to srt *.ass
+```
+
+```python
+import pysubs2
+subs = pysubs2.load("my_subtitles.ass", encoding="utf-8")
+subs.shift(s=2.5)
+for line in subs:
+    line.text = "{\\be1}" + line.text
+subs.save("my_subtitles_edited.ass")
+```
+
+To learn more, please [see the documentation](http://pysubs2.readthedocs.io).
+If you'd like to contribute, see [CONTRIBUTING.md](CONTRIBUTING.md).
+
+pysubs2 is licensed under the MIT license (see [LICENSE.txt](LICENSE.txt)).
diff --git a/libs/pysubs2-1.8.0.dist-info/RECORD b/libs/pysubs2-1.8.0.dist-info/RECORD
new file mode 100644
index 0000000000..2f70949f92
--- /dev/null
+++ b/libs/pysubs2-1.8.0.dist-info/RECORD
@@ -0,0 +1,31 @@
+../../bin/pysubs2,sha256=XhbCKmkKcAcZBkfEHYiNeFggqX4T9VnjVWkgIhM5CF0,194
+pysubs2-1.8.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pysubs2-1.8.0.dist-info/METADATA,sha256=gPc_yaSAsPfEXR7Z4S1IGxrGyZqzvcC44IHmiAkRrqU,3222
+pysubs2-1.8.0.dist-info/RECORD,,
+pysubs2-1.8.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pysubs2-1.8.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pysubs2-1.8.0.dist-info/entry_points.txt,sha256=mznmeaia9Ec19KsaIM8D4tt6V0HnOUlPhSg5nXiAfAE,49
+pysubs2-1.8.0.dist-info/licenses/LICENSE.txt,sha256=WYgskvBrUBBDxuKH9JSV1u22g-UBTwHjeuJLlPp6lWU,1063
+pysubs2-1.8.0.dist-info/top_level.txt,sha256=i_V6JX-AWjMX15-Dzyc0RlrInU7Zun9PYfdB9brM95E,8
+pysubs2/__init__.py,sha256=L71MMMS6zcAiGWdddhnc4COZmKLYX__igP0Tr5q-y3Q,783
+pysubs2/__main__.py,sha256=3iAK73rLxjLJqFMYD-jn3PDJvHZ8rIOW_NgsmBkRGhA,134
+pysubs2/cli.py,sha256=lFVZsLChtnnaRov2lNEHlecTJaoNNvTLMQmZe0-4oGE,11916
+pysubs2/common.py,sha256=y83d2egz5UwdmXkLeP67vyJ8f5xXG7WA3OFj3bbjtkU,3587
+pysubs2/exceptions.py,sha256=yOXsGhlD1IvSF74Bd5psD36SKA5vT0e_BlhzgqSlMXs,2574
+pysubs2/formats/__init__.py,sha256=Z8B_0b-gpxlXyQWtwKa_yTQuz82Cyxlua_UHeQHi69o,2758
+pysubs2/formats/base.py,sha256=zzt4L3KIC6VrUNfzwjDHSF5HV7swrdo65dop90vfy70,2959
+pysubs2/formats/jsonformat.py,sha256=whCZeJi7xbXRLqFNWQ83SzkAli2XlqYnVfs8soNOA0g,2283
+pysubs2/formats/microdvd.py,sha256=hfshagBIMMPz3WgqpttYGugtAj_6CheAiTkvTTrn3NE,5970
+pysubs2/formats/mpl2.py,sha256=vpyL5j7gxxkGvWvI8JXwFlHaEyCBHYTn_mtgk4zqNFw,1970
+pysubs2/formats/sami.py,sha256=mT5FfC7J0ZMnLePxF0-ExHZmfEuQrB8OgpryLULodbc,3310
+pysubs2/formats/subrip.py,sha256=tlR6ECFswFQI4vHTLZCwnyblUHbHisFcqHjz8Iyxm_M,7595
+pysubs2/formats/substation.py,sha256=MVa71fP6ODqEUJmhzTlfTn3zKO1MDfh4vR9Nt0i23Xg,17198
+pysubs2/formats/tmp.py,sha256=FKktjpgv07rf6EZ1Og0rkNpcj59Z6kL6dL-V0QLSKQw,4100
+pysubs2/formats/ttml.py,sha256=AG6JuJ9Ry0bjVjvk491v3OelRzG1ryLojls83QUjm-k,9382
+pysubs2/formats/webvtt.py,sha256=Ycur_E5ztjazW2akyUXTsbNUdLs4S-knq93hwompCac,1788
+pysubs2/formats/whisper.py,sha256=fwWrWxRqFeiXSeecLOv02sCcOp7htV28BaGbddMYS_Q,3344
+pysubs2/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+pysubs2/ssaevent.py,sha256=VR0Pso779Pw5bs-Q-VpIz8Zs-A6p2a2pptQtsFVjRnM,6291
+pysubs2/ssafile.py,sha256=smMZIFk5h8n3uUuzgrcSmzdNsVU7oB3kguKQtUAdQGU,23833
+pysubs2/ssastyle.py,sha256=hlNowFmuiiwOzWTtQxKUakTwcE7Q5KxlQtl64Q6ScMU,4031
+pysubs2/time.py,sha256=Onk1vs9xXKiuwYK0RorZVU29p2FCEARapnfP_yYczTQ,4739
diff --git a/libs/requests-2.32.3.dist-info/REQUESTED b/libs/pysubs2-1.8.0.dist-info/REQUESTED
similarity index 100%
rename from libs/requests-2.32.3.dist-info/REQUESTED
rename to libs/pysubs2-1.8.0.dist-info/REQUESTED
diff --git a/libs/pysubs2-1.8.0.dist-info/WHEEL b/libs/pysubs2-1.8.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/pysubs2-1.8.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/pysubs2-1.7.3.dist-info/entry_points.txt b/libs/pysubs2-1.8.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/pysubs2-1.7.3.dist-info/entry_points.txt
rename to libs/pysubs2-1.8.0.dist-info/entry_points.txt
diff --git a/libs/pysubs2-1.7.3.dist-info/LICENSE.txt b/libs/pysubs2-1.8.0.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/pysubs2-1.7.3.dist-info/LICENSE.txt
rename to libs/pysubs2-1.8.0.dist-info/licenses/LICENSE.txt
diff --git a/libs/pysubs2-1.7.3.dist-info/top_level.txt b/libs/pysubs2-1.8.0.dist-info/top_level.txt
similarity index 100%
rename from libs/pysubs2-1.7.3.dist-info/top_level.txt
rename to libs/pysubs2-1.8.0.dist-info/top_level.txt
diff --git a/libs/pysubs2/common.py b/libs/pysubs2/common.py
index f2c27f5de9..9b896eb857 100644
--- a/libs/pysubs2/common.py
+++ b/libs/pysubs2/common.py
@@ -1,6 +1,8 @@
 from dataclasses import dataclass
-from typing import Tuple, Union
+from typing import Tuple, Union, Optional, Dict, Iterable, Iterator
 from enum import IntEnum
+import xml.etree.ElementTree as ET
+from contextlib import contextmanager
 
 
 @dataclass(init=False)
@@ -58,7 +60,78 @@ def to_ssa_alignment(self) -> int:
 
 
 #: Version of the pysubs2 library.
-VERSION = "1.7.3"
+VERSION = "1.8.0"
 
 
 IntOrFloat = Union[int, float]
+
+
+def etree_iter_child_nodes(elem: ET.Element) -> Iterator[Union[ET.Element, str]]:
+    """
+    Yield child text nodes (as str) and subelements for given XML element
+
+    Workaround for awkward ``xml.etree.ElementTree`` API.
+
+    See also:
+        `etree_append_child_nodes()`
+
+    """
+    if elem.text:
+        yield elem.text
+    for child_elem in elem:
+        yield child_elem
+        if child_elem.tail:
+            yield child_elem.tail
+
+
+def etree_append_child_nodes(elem: ET.Element, nodes: Iterable[Union[ET.Element, str]]) -> None:
+    """
+    Add child text nodes and subelements to given XML element
+
+    See also:
+        `etree_iter_child_nodes()`
+
+    """
+    last_child = elem[-1] if len(elem) > 0 else None
+    for node in nodes:
+        if isinstance(node, str):
+            if last_child is None:
+                if elem.text is None:
+                    elem.text = node
+                else:
+                    elem.text += node
+            else:
+                if last_child.tail is None:
+                    last_child.tail = node
+                else:
+                    last_child.tail += node
+        else:
+            elem.append(node)
+            last_child = node
+
+
+@contextmanager
+def etree_register_namespace_override() -> Iterator[None]:
+    """
+    Context manager that reverts global changes from ``xml.etree.ElementTree.register_namespace()``
+
+    Workaround for poor namespace handling in ``xml.etree.ElementTree``.
+
+    """
+    namespace_map: Optional[Dict[str, str]] = None
+    namespace_map_original_content = {}
+    try:
+        namespace_map = getattr(ET.register_namespace, "_namespace_map", None)
+        if namespace_map is not None:
+            namespace_map_original_content = namespace_map.copy()
+    except Exception:
+        pass
+
+    yield
+
+    try:
+        if namespace_map is not None:
+            namespace_map.clear()
+            namespace_map.update(namespace_map_original_content)
+    except Exception:
+        pass
diff --git a/libs/pysubs2/formats/__init__.py b/libs/pysubs2/formats/__init__.py
index abb01560cb..36b87e03fa 100644
--- a/libs/pysubs2/formats/__init__.py
+++ b/libs/pysubs2/formats/__init__.py
@@ -2,12 +2,15 @@
 
 from .base import FormatBase
 from .microdvd import MicroDVDFormat
+from .sami import SAMIFormat
 from .subrip import SubripFormat
 from .jsonformat import JSONFormat
 from .substation import SubstationFormat
 from .mpl2 import MPL2Format
 from .tmp import TmpFormat
+from .ttml import TTMLFormat
 from .webvtt import WebVTTFormat
+from .whisper import WhisperJAXFormat
 from ..exceptions import UnknownFormatIdentifierError, UnknownFileExtensionError, FormatAutodetectionError
 
 #: Dict mapping file extensions to format identifiers.
@@ -19,6 +22,9 @@
     ".json": "json",
     ".txt": "tmp",
     ".vtt": "vtt",
+    ".sami": "sami",
+    ".smi": "sami",
+    ".ttml": "ttml",
 }
 
 #: Dict mapping format identifiers to implementations (FormatBase subclasses).
@@ -31,6 +37,9 @@
     "mpl2": MPL2Format,
     "tmp": TmpFormat,
     "vtt": WebVTTFormat,
+    "sami": SAMIFormat,
+    "whisper_jax": WhisperJAXFormat,
+    "ttml": TTMLFormat,
 }
 
 FORMAT_IDENTIFIERS = list(FORMAT_IDENTIFIER_TO_FORMAT_CLASS.keys())
diff --git a/libs/pysubs2/formats/sami.py b/libs/pysubs2/formats/sami.py
new file mode 100644
index 0000000000..4362086b19
--- /dev/null
+++ b/libs/pysubs2/formats/sami.py
@@ -0,0 +1,103 @@
+from dataclasses import dataclass
+from html.parser import HTMLParser
+from typing import List, Optional, TextIO, Any, Tuple
+
+from .base import FormatBase
+from ..ssaevent import SSAEvent
+from ..ssafile import SSAFile
+
+
+class SAMIFormat(FormatBase):
+    """Synchronized Accessible Media Interchange (SAMI) subtitle format implementation"""
+
+    @classmethod
+    def guess_format(cls, text: str) -> Optional[str]:
+        """See :meth:`pysubs2.formats.FormatBase.guess_format()`"""
+        if text.lstrip().startswith("<SAMI>"):
+            return "sami"
+
+        return None
+
+    @classmethod
+    def from_file(cls, subs: "SSAFile", fp: TextIO, format_: str, **kwargs: Any) -> None:
+        """
+        See :meth:`pysubs2.formats.FormatBase.from_file()`
+
+        Supported tags:
+
+          - ``<i>``
+          - ``<u>``
+          - ``<s>``
+          - ``<b>``
+          - ``<br>``
+
+        CSS formatting is not supported.
+
+        """
+        parser = SAMIParser()
+        parser.feed(fp.read())
+
+        events = []
+        for sync_element in parser.sync_elements:
+            plaintext = "\n".join(line.strip() for line in sync_element.text.strip().splitlines())
+            start_ms = sync_element.start_ms
+            # Unfortunately, end timestamp is not given; try to estimate something reasonable:
+            # start + 500 ms + 67 ms/character (15 chars per second)
+            end_ms = start_ms + 500 + (len(plaintext) * 67)
+            event = SSAEvent(
+                start=start_ms,
+                end=end_ms,
+            )
+            event.plaintext = plaintext
+            events.append(event)
+
+        # correct any overlapping subtitles
+        for i in range(len(events) - 1):
+            events[i].end = min(events[i].end, events[i + 1].start)
+
+        subs.events.extend(events)
+
+
+@dataclass
+class SyncElement:
+    start_ms: int
+    text: str
+
+
+class SAMIParser(HTMLParser):
+    def __init__(self) -> None:
+        super().__init__()
+        self.sync_elements: List[SyncElement] = []
+        self.current_sync_element: Optional[SyncElement] = None
+
+    def begin_sync_element(self, start_ms: int) -> None:
+        if self.current_sync_element is not None:
+            self.close_sync_element()
+        self.current_sync_element = SyncElement(start_ms=start_ms, text="")
+
+    def close_sync_element(self) -> None:
+        if self.current_sync_element is not None:
+            self.sync_elements.append(self.current_sync_element)
+            self.current_sync_element = None
+
+    def append_text(self, text: str) -> None:
+        if self.current_sync_element is not None:
+            self.current_sync_element.text += text
+
+    def handle_starttag(self, tag: str, attrs: List[Tuple[str, Optional[str]]]) -> None:
+        if tag == "sync":
+            start_ms = int(dict(attrs)["start"] or 0)
+            self.begin_sync_element(start_ms)
+        elif tag == "br":
+            self.append_text("\n")
+        elif tag in ("b", "i", "s", "u"):
+            self.append_text("{\\" + tag + "1}")
+
+    def handle_endtag(self, tag: str) -> None:
+        if tag in ("sync", "body", "sami"):
+            self.close_sync_element()
+        elif tag in ("b", "i", "s", "u"):
+            self.append_text("{\\" + tag + "0}")
+
+    def handle_data(self, data: str) -> None:
+        self.append_text(data)
diff --git a/libs/pysubs2/formats/subrip.py b/libs/pysubs2/formats/subrip.py
index 1dceaf0e82..0acbd96823 100644
--- a/libs/pysubs2/formats/subrip.py
+++ b/libs/pysubs2/formats/subrip.py
@@ -44,6 +44,10 @@ def guess_format(cls, text: str) -> Optional[str]:
             # disambiguation vs. WebVTT
             return None
 
+        if "http://www.w3.org/ns/ttml" in text:
+            # disambiguation vs. TTML
+            return None
+
         for line in text.splitlines():
             if len(cls.TIMESTAMP.findall(line)) == 2:
                 return "srt"
diff --git a/libs/pysubs2/formats/substation.py b/libs/pysubs2/formats/substation.py
index 994277286a..c9e1078ca0 100644
--- a/libs/pysubs2/formats/substation.py
+++ b/libs/pysubs2/formats/substation.py
@@ -86,7 +86,8 @@ def is_valid_field_content(s: str) -> bool:
 
 
 def parse_tags(text: str, style: SSAStyle = SSAStyle.DEFAULT_STYLE,
-               styles: Optional[Dict[str, SSAStyle]] = None) -> List[Tuple[str, SSAStyle]]:
+               styles: Optional[Dict[str, SSAStyle]] = None,
+               skip_empty_fragments: bool = False) -> List[Tuple[str, SSAStyle]]:
     """
     Split text into fragments with computed SSAStyles.
     
@@ -100,6 +101,7 @@ def parse_tags(text: str, style: SSAStyle = SSAStyle.DEFAULT_STYLE,
     Supported override tags:
     
     - i, b, u, s
+    - fn
     - r (with or without style name)
     
     """
@@ -108,11 +110,14 @@ def parse_tags(text: str, style: SSAStyle = SSAStyle.DEFAULT_STYLE,
     
     fragments = SSAEvent.OVERRIDE_SEQUENCE.split(text)
     if len(fragments) == 1:
-        return [(text, style)]
+        if skip_empty_fragments and not text:
+            return []
+        else:
+            return [(text, style)]
     
     def apply_overrides(all_overrides: str) -> SSAStyle:
         s = style.copy()
-        for tag in re.findall(r"\\[ibusp][0-9]|\\r[a-zA-Z_0-9 ]*", all_overrides):
+        for tag in re.findall(r"\\[ibusp][0-9]|\\r[a-zA-Z_0-9 ]*|\\fn[a-zA-Z_0-9 ]+", all_overrides):
             if tag == r"\r":
                 s = style.copy() # reset to original line style
             elif tag.startswith(r"\r"):
@@ -120,6 +125,9 @@ def apply_overrides(all_overrides: str) -> SSAStyle:
                 if name in styles:
                     # reset to named style
                     s = styles[name].copy()
+            elif tag.startswith(r"\fn"):
+                fontname = tag[3:]
+                s.fontname = fontname
             else:
                 if "i" in tag:
                     s.italic = "1" in tag
@@ -141,7 +149,10 @@ def apply_overrides(all_overrides: str) -> SSAStyle:
     overrides = SSAEvent.OVERRIDE_SEQUENCE.findall(text)
     overrides_prefix_sum = ["".join(overrides[:i]) for i in range(len(overrides) + 1)]
     computed_styles = map(apply_overrides, overrides_prefix_sum)
-    return list(zip(fragments, computed_styles))
+    output = list(zip(fragments, computed_styles))
+    if skip_empty_fragments:
+        output = [(fragment, sty) for fragment, sty in output if fragment]
+    return output
 
 
 NOTICE = "Script generated by pysubs2\nhttps://pypi.python.org/pypi/pysubs2"
diff --git a/libs/pysubs2/formats/ttml.py b/libs/pysubs2/formats/ttml.py
new file mode 100644
index 0000000000..fa36e689a2
--- /dev/null
+++ b/libs/pysubs2/formats/ttml.py
@@ -0,0 +1,234 @@
+import re
+from enum import Enum
+from typing import Optional, TextIO, Any, Dict, List, Union
+import xml.etree.ElementTree as ET
+
+from .base import FormatBase
+from ..common import etree_iter_child_nodes, etree_register_namespace_override, etree_append_child_nodes
+from ..ssaevent import SSAEvent
+from ..ssastyle import SSAStyle
+from .substation import parse_tags
+from ..time import ms_to_times, make_time
+from ..ssafile import SSAFile
+
+
+TT_NS = "{http://www.w3.org/ns/ttml}"
+TTS_NS = "{http://www.w3.org/ns/ttml#styling}"
+
+
+class TimeContainer(Enum):
+    PAR = "par"
+    SEQ = "seq"
+
+
+class TTMLFormat(FormatBase):
+    """Timed Text Markup Language (TTML) subtitle format implementation"""
+
+    @staticmethod
+    def ms_to_timestamp(ms: int) -> str:
+        """Convert ms to 'HH:MM:SS.mmm'"""
+        if ms < 0:
+            ms = 0
+        h, m, s, ms = ms_to_times(ms)
+        return f"{h:02d}:{m:02d}:{s:02d}.{ms:03d}"
+
+    @staticmethod
+    def timestamp_to_ms(expr: str) -> int:
+        # offset-time (not supported: f, t)
+        m = re.fullmatch(r"(\d+(?:\.\d+)?)(h|m|s|ms)", expr)
+        if m is not None:
+            count = int(m.group(1)) if m.group(1).isnumeric() else float(m.group(1))
+            metric = m.group(2)
+            return make_time(**{metric: count})  # type: ignore[arg-type]
+
+        # clock-time (not supported: frames, subframes)
+        m = re.fullmatch(r"(\d{2,}):(\d{2}):(\d{2}(?:\.\d+)?)", expr)
+        if m is not None:
+            hours = int(m.group(1))
+            minutes = int(m.group(2))
+            seconds = int(m.group(3)) if m.group(3).isnumeric() else float(m.group(3))
+            return make_time(h=hours, m=minutes, s=seconds)
+
+        raise NotImplementedError(f"Unsupported time expression: {expr}")
+
+    @classmethod
+    def guess_format(cls, text: str) -> Optional[str]:
+        """See :meth:`pysubs2.formats.FormatBase.guess_format()`"""
+        if "http://www.w3.org/ns/ttml" in text:
+            return "ttml"
+
+        return None
+
+    @classmethod
+    def from_file(cls, subs: "SSAFile", fp: TextIO, format_: str, **kwargs: Any) -> None:
+        """
+        Rudimentary TTML parser. No formatting/styling apart from newlines is supported.
+        Frame-based time expressions are not supported.
+
+        """
+        tree = ET.parse(fp)
+        root = tree.getroot()
+
+        body_elem = root.find(f"{TT_NS}body")
+        if body_elem is None:
+            return
+
+        cls._parse_body(subs, body_elem)
+
+    @classmethod
+    def _parse_body(cls, subs: "SSAFile", body_elem: ET.Element) -> None:
+        begin_ms = cls.timestamp_to_ms(body_elem.attrib.get("begin", "0s"))
+        time_container = TimeContainer(body_elem.attrib.get("timeContainer", "par"))
+        if time_container != TimeContainer.PAR:
+            raise NotImplementedError("Only 'par' timeContainer is supported")
+
+        for div_elem in body_elem.iterfind(f"{TT_NS}div"):
+            cls._parse_div(subs, div_elem, begin_ms)
+
+    @classmethod
+    def _parse_div(cls, subs: "SSAFile", div_elem: ET.Element, parent_begin_ms: int) -> None:
+        begin_ms = cls.timestamp_to_ms(div_elem.attrib.get("begin", "0s")) + parent_begin_ms
+        time_container = TimeContainer(div_elem.attrib.get("timeContainer", "par"))
+        if time_container != TimeContainer.PAR:
+            raise NotImplementedError("Only 'par' timeContainer is supported")
+
+        for p_elem in div_elem.iterfind(f"{TT_NS}p"):
+            cls._parse_p(subs, p_elem, begin_ms)
+
+    @classmethod
+    def _parse_p(cls, subs: "SSAFile", p_elem: ET.Element, parent_begin_ms: int) -> None:
+        begin_ms = cls.timestamp_to_ms(p_elem.attrib.get("begin", "0s")) + parent_begin_ms
+        if "duration" in p_elem.attrib:
+            end_ms = begin_ms + cls.timestamp_to_ms(p_elem.attrib["duration"])
+        else:
+            end_ms = cls.timestamp_to_ms(p_elem.attrib["end"]) + parent_begin_ms
+        time_container = TimeContainer(p_elem.attrib.get("timeContainer", "par"))
+        if time_container != TimeContainer.PAR:
+            raise NotImplementedError("Only 'par' timeContainer is supported")
+
+        event = SSAEvent(start=begin_ms, end=end_ms)
+        subs.events.append(event)
+
+        for node in etree_iter_child_nodes(p_elem):
+            if isinstance(node, str):
+                event.text += node.strip().replace("\n", " ")
+            else:
+                if node.tag == f"{TT_NS}br":
+                    event.text += "\\N"
+                elif node.tag == f"{TT_NS}span":
+                    cls._parse_span(event, node)
+
+    @classmethod
+    def _parse_span(cls, event: SSAEvent, span_elem: ET.Element) -> None:
+        for node in etree_iter_child_nodes(span_elem):
+            if isinstance(node, str):
+                event.text += node.strip().replace("\n", " ")
+            else:
+                if node.tag == f"{TT_NS}br":
+                    event.text += "\\N"
+                elif node.tag == f"{TT_NS}span":
+                    cls._parse_span(event, node)
+
+    @classmethod
+    def to_file(cls, subs: "SSAFile", fp: TextIO, format_: str, **kwargs: Any) -> None:
+        """
+        TTML writer. Has partial support for styles and override tags.
+
+        Supported styling:
+            - bold
+            - italic
+            - font name
+            - primary color
+            - underline
+            - strikeout
+        """
+
+        tt_elem = ET.Element(f"{TT_NS}tt")
+        head_elem = ET.SubElement(tt_elem, f"{TT_NS}head")
+        body_elem = ET.SubElement(tt_elem, f"{TT_NS}body")
+        div_elem = ET.SubElement(body_elem, f"{TT_NS}div")
+        styling_elem = ET.SubElement(head_elem, f"{TT_NS}styling")
+
+        for name, style in subs.styles.items():
+            attrs = {
+                "id": name,
+                **cls.ssastyle_to_tts(style),
+            }
+            ET.SubElement(styling_elem, f"{TT_NS}style", attrs)
+
+        for event in subs.get_text_events():
+            event_style = subs.styles.get(event.style, SSAStyle.DEFAULT_STYLE)
+            attrs = {
+                "begin": str(cls.ms_to_timestamp(event.start)),
+                "end": str(cls.ms_to_timestamp(event.end)),
+                "style": event.style,
+            }
+            p_elem = ET.SubElement(div_elem, f"{TT_NS}p", attrs)
+
+            runs = parse_tags(event.text, event_style, subs.styles, skip_empty_fragments=True)
+
+            if len(runs) == 1:
+                fragment, sty = runs[0]
+                p_elem.attrib.update(cls.ssastyle_to_tts(sty, event_style))
+                cls._append_text(p_elem, fragment)
+            else:
+                for fragment, sty in runs:
+                    attrs = cls.ssastyle_to_tts(sty, event_style)
+                    if attrs:
+                        span_elem = ET.SubElement(p_elem, f"{TT_NS}span", attrs)
+                        cls._append_text(span_elem, fragment)
+                    else:
+                        cls._append_text(p_elem, fragment)
+
+        with etree_register_namespace_override():
+            ET.register_namespace("", "http://www.w3.org/ns/ttml")
+            ET.register_namespace("ttm", "http://www.w3.org/ns/ttml#metadata")
+            ET.register_namespace("tts", "http://www.w3.org/ns/ttml#styling")
+            ET.indent(tt_elem)
+            output_xml = ET.tostring(tt_elem).decode("utf-8")
+            print(output_xml, file=fp)
+
+    @classmethod
+    def ssastyle_to_tts(cls, style: SSAStyle, base_style: Optional[SSAStyle] = None) -> Dict[str, str]:
+        """
+        Convert `SSAStyle` (or its difference to base style) into dictionary of XML attributes
+
+        Reference: https://www.w3.org/TR/ttml1/#styling-attribute-vocabulary
+        """
+        attrs = {}
+
+        decorations = []
+        if style.underline and (base_style is None or base_style.underline != style.underline):
+            decorations.append("underline")
+        elif not style.underline and base_style is not None and base_style.underline:
+            decorations.append("noUnderline")
+        if style.strikeout and (base_style is None or base_style.strikeout != style.strikeout):
+            decorations.append("lineThrough")
+        elif not style.strikeout and base_style is not None and base_style.strikeout:
+            decorations.append("noLineThrough")
+
+        if decorations:
+            attrs[f"{TTS_NS}textDecoration"] = " ".join(decorations)
+
+        if base_style is None or (style.fontname != base_style.fontname):
+            attrs[f"{TTS_NS}fontFamily"] = style.fontname
+        if base_style is None or base_style.bold != style.bold:
+            attrs[f"{TTS_NS}fontWeight"] = "bold" if style.bold else "normal"
+        if base_style is None or base_style.italic != style.italic:
+            attrs[f"{TTS_NS}fontStyle"] = "italic" if style.italic else "normal"
+        if base_style is None or base_style.primarycolor != style.primarycolor:
+            attrs[f"{TTS_NS}color"] = "#{0.r:02X}{0.g:02X}{0.b:02X}".format(style.primarycolor)
+
+        return attrs
+
+    @classmethod
+    def _append_text(cls, elem: ET.Element, text: str) -> None:
+        text = text.replace("\\h", " ")
+        chunks = re.split(r"\\[Nn]", text)
+        nodes: List[Union[ET.Element, str]] = []
+        for i, chunk in enumerate(chunks):
+            if i > 0:
+                nodes.append(ET.Element(f"{TT_NS}br"))
+            nodes.append(chunk)
+
+        etree_append_child_nodes(elem, nodes)
diff --git a/libs/pysubs2/formats/whisper.py b/libs/pysubs2/formats/whisper.py
index c5353cd089..7fac1f3aac 100644
--- a/libs/pysubs2/formats/whisper.py
+++ b/libs/pysubs2/formats/whisper.py
@@ -4,11 +4,12 @@
 See https://github.com/openai/whisper
 
 """
-
+from .base import FormatBase
 from ..ssaevent import SSAEvent
 from ..ssafile import SSAFile
-from ..time import make_time
-from typing import Union, List, Dict, Any
+from ..time import make_time, timestamp_to_ms
+from typing import Union, List, Dict, Any, Optional, Sequence, TextIO
+import re
 
 
 def load_from_whisper(result_or_segments: Union[Dict[str, Any], List[Dict[str, Any]]]) -> SSAFile:
@@ -50,3 +51,56 @@ def load_from_whisper(result_or_segments: Union[Dict[str, Any], List[Dict[str, A
         subs.append(event)
 
     return subs
+
+
+class WhisperJAXFormat(FormatBase):
+    """
+    Parser for Whisper JAX transcription, one event per line, eg. ``[00:02.880 -> 00:07.240]  transcribed text``
+
+    """
+    TIMESTAMP = re.compile(r"(?:(\d{1,2}):)?(\d{2}):(\d{2})[.](\d{3})")
+    LINE = re.compile(r"\[([^]]+) -> ([^]]+)] (.*)")
+
+    @classmethod
+    def guess_format(cls, text: str) -> Optional[str]:
+        """See :meth:`pysubs2.formats.FormatBase.guess_format()`"""
+        for line in text.lstrip().splitlines():
+            if cls.parse_line(line):
+                return "whisper_jax"
+            else:
+                return None
+
+        return None
+
+    @classmethod
+    def parse_line(cls, line: str) -> Optional[SSAEvent]:
+        m = cls.LINE.match(line)
+        if m is None:
+            return None
+
+        m_start = cls.TIMESTAMP.fullmatch(m.group(1))
+        m_end = cls.TIMESTAMP.fullmatch(m.group(2))
+        text = m.group(3).strip()
+
+        if m_start is None or m_end is None:
+            return None
+
+        start_ms = cls.timestamp_to_ms(m_start.groups())
+        end_ms = cls.timestamp_to_ms(m_end.groups())
+
+        return SSAEvent(start=start_ms, end=end_ms, text=text)
+
+    @staticmethod
+    def timestamp_to_ms(groups: Sequence[str]) -> int:
+        return timestamp_to_ms([x or "0" for x in groups])
+
+    @classmethod
+    def from_file(cls, subs: "SSAFile", fp: TextIO, format_: str, **kwargs: Any) -> None:
+        """
+        See :meth:`pysubs2.formats.FormatBase.from_file()`
+        """
+        for line in fp.readlines():
+            line = line.strip()
+            e = cls.parse_line(line)
+            if e is not None:
+                subs.append(e)
diff --git a/libs/pymediainfo-6.1.0.dist-info/namespace_packages.txt b/libs/pysubs2/py.typed
similarity index 100%
rename from libs/pymediainfo-6.1.0.dist-info/namespace_packages.txt
rename to libs/pysubs2/py.typed
diff --git a/libs/pysubs2/ssafile.py b/libs/pysubs2/ssafile.py
index 8c0b9cb146..bda20b8c38 100644
--- a/libs/pysubs2/ssafile.py
+++ b/libs/pysubs2/ssafile.py
@@ -309,9 +309,9 @@ def shift(self, h: IntOrFloat = 0, m: IntOrFloat = 0, s: IntOrFloat = 0, ms: Int
             line.start += delta
             line.end += delta
 
-    def transform_framerate(self, in_fps: float, out_fps: float) -> None:
+    def transform_framerate(self, in_fps: float, out_fps: float, keep_duration: bool = False) -> None:
         """
-        Rescale all timestamps by ratio of in_fps/out_fps.
+        Rescale all timestamps by ratio of in_fps/out_fps. Force keep duration/display time of subtitles.
 
         Can be used to fix files converted from frame-based to time-based
         with wrongly assumed framerate.
@@ -319,6 +319,7 @@ def transform_framerate(self, in_fps: float, out_fps: float) -> None:
         Arguments:
             in_fps (float)
             out_fps (float)
+            keep_duration (bool)
 
         Raises:
             ValueError: Non-positive framerate given.
@@ -329,8 +330,14 @@ def transform_framerate(self, in_fps: float, out_fps: float) -> None:
 
         ratio = in_fps / out_fps
         for line in self:
+            duration = line.duration
             line.start = int(round(line.start * ratio))
-            line.end = int(round(line.end * ratio))
+            if keep_duration:
+                line.duration = duration
+            else:
+                line.end = int(round(line.end * ratio))
+         
+                
 
     # ------------------------------------------------------------------------
     # Working with styles
diff --git a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/METADATA b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/METADATA
index eb2d1ce2f8..67364269e7 100644
--- a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/METADATA
+++ b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-anticaptcha
 Version: 0.1.dev191+g6d2bad22e
 Summary: Client library for solve captchas with Anticaptcha.com support.
@@ -23,12 +23,23 @@ Classifier: Programming Language :: Python :: 3.10
 License-File: LICENSE.md
 Requires-Dist: requests
 Requires-Dist: six
-Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
 Provides-Extra: tests
-Requires-Dist: retry ; extra == 'tests'
-Requires-Dist: nose2 ; extra == 'tests'
-Requires-Dist: selenium ; extra == 'tests'
+Requires-Dist: retry; extra == "tests"
+Requires-Dist: nose2; extra == "tests"
+Requires-Dist: selenium; extra == "tests"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 python-anticaptcha
 ==================
diff --git a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/RECORD b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/RECORD
index b32ec4315b..d662fbf7c5 100644
--- a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/RECORD
+++ b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/RECORD
@@ -1,10 +1,10 @@
 python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/LICENSE.md,sha256=Yn5dZtOJWFEnvJF0vW0ZYLQLbia5fSeb0PXCH9R-V7A,1069
-python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/METADATA,sha256=4qD2B6a5DDCxqjCZ4qHlvW01Cwg87yU37SRG29xs2BY,7912
+python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/METADATA,sha256=LwqIbOW7HKFZ-CRX6XX-RKlS1DoCQRkFrMur5Q9xpcs,8127
 python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/RECORD,,
 python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
 python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/direct_url.json,sha256=Tj3EWYB7HC9ktc2UAVbtNje9zl7gGwLfgascMkfGMSM,151
+python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/licenses/LICENSE.md,sha256=Yn5dZtOJWFEnvJF0vW0ZYLQLbia5fSeb0PXCH9R-V7A,1069
 python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/top_level.txt,sha256=SxRL0T_eHr7l9jCC_cUsakrZOHLejPt4NzTtrBrNZPo,19
 python_anticaptcha/__init__.py,sha256=AA2G5cXb7U1jrrkg46jeY857xfv6mFtFowFWGmrzOwI,848
 python_anticaptcha/base.py,sha256=GTpMwJw9aPNwWDjdUK1iomXwI7_GkWGmcY4QlH_cDhE,7472
diff --git a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/WHEEL b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/WHEEL
+++ b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/LICENSE.md b/libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/licenses/LICENSE.md
similarity index 100%
rename from libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/LICENSE.md
rename to libs/python_anticaptcha-0.1.dev191+g6d2bad22e.dist-info/licenses/LICENSE.md
diff --git a/libs/python_dateutil-2.9.0.dist-info/METADATA b/libs/python_dateutil-2.9.0.dist-info/METADATA
index 257a43e4f9..ab2feebaa3 100644
--- a/libs/python_dateutil-2.9.0.dist-info/METADATA
+++ b/libs/python_dateutil-2.9.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-dateutil
 Version: 2.9.0
 Summary: Extensions to the standard Python datetime module
@@ -33,6 +33,8 @@ Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,>=2.7
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: six>=1.5
+Dynamic: description
+Dynamic: license-file
 
 dateutil - powerful extensions to datetime
 ==========================================
diff --git a/libs/python_dateutil-2.9.0.dist-info/RECORD b/libs/python_dateutil-2.9.0.dist-info/RECORD
index f1b18f8637..b1326097e7 100644
--- a/libs/python_dateutil-2.9.0.dist-info/RECORD
+++ b/libs/python_dateutil-2.9.0.dist-info/RECORD
@@ -1,6 +1,6 @@
 dateutil/__init__.py,sha256=Mqam67WO9IkTmUFyI66vS6IoSXTp9G388DadH2LCMLY,620
 dateutil/_common.py,sha256=77w0yytkrxlYbSn--lDVPUMabUXRR9I3lBv_vQRUqUY,932
-dateutil/_version.py,sha256=Vb5T-8FcBzgHCb1RYqez20zYqm5tplcF41kZi7B8cik,411
+dateutil/_version.py,sha256=24D27WSWcO2HaMUGCrVCG6Zbd76BrLDh2qQ1KbGX6Hc,704
 dateutil/easter.py,sha256=dyBi-lKvimH1u_k6p7Z0JJK72QhqVtVBsqByvpEPKvc,2678
 dateutil/parser/__init__.py,sha256=wWk6GFuxTpjoggCGtgkceJoti4pVjl4_fHQXpNOaSYg,1766
 dateutil/parser/_parser.py,sha256=7klDdyicksQB_Xgl-3UAmBwzCYor1AIZqklIcT6dH_8,58796
@@ -18,10 +18,10 @@ dateutil/zoneinfo/__init__.py,sha256=KYg0pthCMjcp5MXSEiBJn3nMjZeNZav7rlJw5-tz1S4
 dateutil/zoneinfo/dateutil-zoneinfo.tar.gz,sha256=Y25Djz4f3ZwC5TcTaM4UJMhWRNZSciMe0zOF9XsDv4I,156385
 dateutil/zoneinfo/rebuild.py,sha256=MiqYzCIHvNbMH-LdRYLv-4T0EIA7hDKt5GLR0IRTLdI,2392
 python_dateutil-2.9.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_dateutil-2.9.0.dist-info/LICENSE,sha256=ugD1Gg2SgjtaHN4n2LW50jIeZ-2NqbwWPv-W1eF-V34,2889
-python_dateutil-2.9.0.dist-info/METADATA,sha256=mqpKrcibJzQ1A2vpWNFAr3xf6yTqamcHRjkaU43Gnw4,8347
+python_dateutil-2.9.0.dist-info/METADATA,sha256=0onxRgklOi6tNqMWcNgBo8Nm08eafsZO5srBQbdFd5g,8390
 python_dateutil-2.9.0.dist-info/RECORD,,
 python_dateutil-2.9.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_dateutil-2.9.0.dist-info/WHEEL,sha256=TJ49d73sNs10F0aze1W_bTW2P_X7-F4YXOlBqoqA-jY,109
+python_dateutil-2.9.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+python_dateutil-2.9.0.dist-info/licenses/LICENSE,sha256=ugD1Gg2SgjtaHN4n2LW50jIeZ-2NqbwWPv-W1eF-V34,2889
 python_dateutil-2.9.0.dist-info/top_level.txt,sha256=4tjdWkhRZvF7LA_BYe_L9gB2w_p2a-z5y6ArjaRkot8,9
 python_dateutil-2.9.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
diff --git a/libs/python_dateutil-2.9.0.dist-info/WHEEL b/libs/python_dateutil-2.9.0.dist-info/WHEEL
index 17c0299e49..798dd6195b 100644
--- a/libs/python_dateutil-2.9.0.dist-info/WHEEL
+++ b/libs/python_dateutil-2.9.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/python_dateutil-2.9.0.dist-info/LICENSE b/libs/python_dateutil-2.9.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/python_dateutil-2.9.0.dist-info/LICENSE
rename to libs/python_dateutil-2.9.0.dist-info/licenses/LICENSE
diff --git a/libs/python_engineio-4.11.2.dist-info/METADATA b/libs/python_engineio-4.11.2.dist-info/METADATA
deleted file mode 100644
index a3824ff028..0000000000
--- a/libs/python_engineio-4.11.2.dist-info/METADATA
+++ /dev/null
@@ -1,48 +0,0 @@
-Metadata-Version: 2.1
-Name: python-engineio
-Version: 4.11.2
-Summary: Engine.IO server and client for Python
-Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
-Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
-Project-URL: Bug Tracker, https://github.com/miguelgrinberg/python-engineio/issues
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: simple-websocket >=0.10.0
-Provides-Extra: asyncio_client
-Requires-Dist: aiohttp >=3.4 ; extra == 'asyncio_client'
-Provides-Extra: client
-Requires-Dist: requests >=2.21.0 ; extra == 'client'
-Requires-Dist: websocket-client >=0.54.0 ; extra == 'client'
-Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-
-python-engineio
-===============
-
-[![Build status](https://github.com/miguelgrinberg/python-engineio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-engineio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-engineio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-engineio)
-
-Python implementation of the `Engine.IO` realtime client and server.
-
-Sponsors
---------
-
-The following organizations are funding this project:
-
-![Socket.IO](https://images.opencollective.com/socketio/050e5eb/logo/64.png)<br>[Socket.IO](https://socket.io)  | [Add your company here!](https://github.com/sponsors/miguelgrinberg)|
--|-
-
-Many individual sponsors also support this project through small ongoing contributions. Why not [join them](https://github.com/sponsors/miguelgrinberg)?
-
-Resources
----------
-
--  [Documentation](https://python-engineio.readthedocs.io/)
--  [PyPI](https://pypi.python.org/pypi/python-engineio)
--  [Change Log](https://github.com/miguelgrinberg/python-engineio/blob/main/CHANGES.md)
--  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.
diff --git a/libs/python_engineio-4.11.2.dist-info/RECORD b/libs/python_engineio-4.11.2.dist-info/RECORD
deleted file mode 100644
index b1e0f8498b..0000000000
--- a/libs/python_engineio-4.11.2.dist-info/RECORD
+++ /dev/null
@@ -1,33 +0,0 @@
-engineio/__init__.py,sha256=0R2PY1EXu3sicP7mkA0_QxEVGRlFlgvsxfhByqREE1A,481
-engineio/async_client.py,sha256=ZrK9j_sUNKRwjqeT6W26d1TtjoGAp2nULhIbX_1iivs,29446
-engineio/async_drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-engineio/async_drivers/_websocket_wsgi.py,sha256=LuOEfKhbAw8SplB5PMpYKIUqfCPEadQEpqeiq_leOIA,949
-engineio/async_drivers/aiohttp.py,sha256=OBDGhaNXWHxQkwhzZT2vlTAOqWReGS6Sjk9u3BEh_Mc,3754
-engineio/async_drivers/asgi.py,sha256=mBu109j7R6esH-wI62jvTnfVAEjWvw2YNp0dZ74NyHg,11210
-engineio/async_drivers/eventlet.py,sha256=n1y4OjPdj4J2GIep5N56O29oa5NQgFJVcTBjyO1C-Gs,1735
-engineio/async_drivers/gevent.py,sha256=hnJHeWdDQE2jfoLCP5DnwVPzsQlcTLJUMA5EVf1UL-k,2962
-engineio/async_drivers/gevent_uwsgi.py,sha256=m6ay5dov9FDQl0fbeiKeE-Orh5LiF6zLlYQ64Oa3T5g,5954
-engineio/async_drivers/sanic.py,sha256=GYX8YWR1GbRm-GkMTAQkfkWbY12MOT1IV2DzH0Xx8Ns,4495
-engineio/async_drivers/threading.py,sha256=ywmG59d4H6OHZjKarBN97-9BHEsRxFEz9YN-E9QAu_I,463
-engineio/async_drivers/tornado.py,sha256=mbVHs1mECfzFSNv33uigkpTBtNPT0u49k5zaybewdIo,5893
-engineio/async_server.py,sha256=8Af_uwf8mKOCJGqVKa3QN0kz7_B2K1cdpSmsvkAoBR4,27412
-engineio/async_socket.py,sha256=nHY0DPPk0FtI9djUnQWtzZ3ce2OD184Tu-Dop7JLg9I,10715
-engineio/base_client.py,sha256=uEI6OglvhdIGD1DAZuptbn0KXQMk_o3w0AH4wJvPwZ0,5322
-engineio/base_server.py,sha256=H-aKQ9hMQjiIrjDaqbw_edw9yUVIbCQMzyIy9egLv-g,14458
-engineio/base_socket.py,sha256=sQqbNSfGhMQG3xzwar6IXMal28C7Q5TIAQRGp74Wt2o,399
-engineio/client.py,sha256=wfgB_MrpEh-v4dBt6W2eW6i0CRNEP0CIJ6d4Ap4CnZE,27227
-engineio/exceptions.py,sha256=FyuMb5qhX9CUYP3fEoe1m-faU96ApdQTSbblaaoo8LA,292
-engineio/json.py,sha256=SG5FTojqd1ix6u0dKXJsZVqqdYioZLO4S2GPL7BKl3U,405
-engineio/middleware.py,sha256=5NKBXz-ftuFErUB_V9IDvRHaSOsjhtW-NnuJtquB1nc,3750
-engineio/packet.py,sha256=Tejm9U5JcYs5LwZ_n_Xh0PIRv-U_JbHwGEivNXQN4eg,3181
-engineio/payload.py,sha256=GIWu0Vnay4WNZlDxHqVgP34tKTBXX58OArJ-mO5zD3E,1539
-engineio/server.py,sha256=4_xdtH0tyusigQurwOeDFrHtodthFTOIbOVZ-_ckh5U,22957
-engineio/socket.py,sha256=Oaw1E7ZDyOCaS7KV151g1u9rqOf1JJHh5gttEU0cSeA,10342
-engineio/static_files.py,sha256=pwez9LQFaSQXMbtI0vLyD6UDiokQ4rNfmRYgVLKOthc,2064
-python_engineio-4.11.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_engineio-4.11.2.dist-info/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
-python_engineio-4.11.2.dist-info/METADATA,sha256=tImIZtOOZaiNHwHvjddXlIDSqfFM4-0vO5k8KLh6sNc,2245
-python_engineio-4.11.2.dist-info/RECORD,,
-python_engineio-4.11.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_engineio-4.11.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-python_engineio-4.11.2.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
diff --git a/libs/python_engineio-4.11.2.dist-info/WHEEL b/libs/python_engineio-4.11.2.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/python_engineio-4.11.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/python_engineio-4.11.2.dist-info/INSTALLER b/libs/python_engineio-4.13.1.dist-info/INSTALLER
similarity index 100%
rename from libs/python_engineio-4.11.2.dist-info/INSTALLER
rename to libs/python_engineio-4.13.1.dist-info/INSTALLER
diff --git a/libs/python_engineio-4.13.1.dist-info/METADATA b/libs/python_engineio-4.13.1.dist-info/METADATA
new file mode 100644
index 0000000000..f5765d5855
--- /dev/null
+++ b/libs/python_engineio-4.13.1.dist-info/METADATA
@@ -0,0 +1,52 @@
+Metadata-Version: 2.4
+Name: python-engineio
+Version: 4.13.1
+Summary: Engine.IO server and client for Python
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/miguelgrinberg/python-engineio
+Project-URL: Bug Tracker, https://github.com/miguelgrinberg/python-engineio/issues
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: simple-websocket>=0.10.0
+Provides-Extra: client
+Requires-Dist: requests>=2.21.0; extra == "client"
+Requires-Dist: websocket-client>=0.54.0; extra == "client"
+Provides-Extra: asyncio-client
+Requires-Dist: aiohttp>=3.11; extra == "asyncio-client"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Dynamic: license-file
+
+python-engineio
+===============
+
+[![Build status](https://github.com/miguelgrinberg/python-engineio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-engineio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-engineio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-engineio)
+
+Python implementation of the `Engine.IO` realtime client and server.
+
+Sponsors
+--------
+
+The following organizations are funding this project:
+
+![Socket.IO](https://images.opencollective.com/socketio/050e5eb/logo/64.png)<br>[Socket.IO](https://socket.io)  | [Add your company here!](https://github.com/sponsors/miguelgrinberg)|
+-|-
+
+Many individual sponsors also support this project through small ongoing contributions. Why not [join them](https://github.com/sponsors/miguelgrinberg)?
+
+Resources
+---------
+
+-  [Documentation](https://python-engineio.readthedocs.io/)
+-  [PyPI](https://pypi.python.org/pypi/python-engineio)
+-  [Change Log](https://github.com/miguelgrinberg/python-engineio/blob/main/CHANGES.md)
+-  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.
diff --git a/libs/python_engineio-4.13.1.dist-info/RECORD b/libs/python_engineio-4.13.1.dist-info/RECORD
new file mode 100644
index 0000000000..12d1854494
--- /dev/null
+++ b/libs/python_engineio-4.13.1.dist-info/RECORD
@@ -0,0 +1,33 @@
+engineio/__init__.py,sha256=0R2PY1EXu3sicP7mkA0_QxEVGRlFlgvsxfhByqREE1A,481
+engineio/async_client.py,sha256=EQzirWwJ_gUinklogHvHN1vz5Ux0zUt-RhGkCureJbE,29976
+engineio/async_drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+engineio/async_drivers/_websocket_wsgi.py,sha256=LuOEfKhbAw8SplB5PMpYKIUqfCPEadQEpqeiq_leOIA,949
+engineio/async_drivers/aiohttp.py,sha256=fgio4z82i93vTojINDLSBiYCXNcAHTSqcqyFa4yqyHs,3624
+engineio/async_drivers/asgi.py,sha256=VxkQg3r-vD7W3X4v2QdB_C5bNS55FJYT2SNBRNaHgds,11383
+engineio/async_drivers/eventlet.py,sha256=n1y4OjPdj4J2GIep5N56O29oa5NQgFJVcTBjyO1C-Gs,1735
+engineio/async_drivers/gevent.py,sha256=hnJHeWdDQE2jfoLCP5DnwVPzsQlcTLJUMA5EVf1UL-k,2962
+engineio/async_drivers/gevent_uwsgi.py,sha256=m6ay5dov9FDQl0fbeiKeE-Orh5LiF6zLlYQ64Oa3T5g,5954
+engineio/async_drivers/sanic.py,sha256=GYX8YWR1GbRm-GkMTAQkfkWbY12MOT1IV2DzH0Xx8Ns,4495
+engineio/async_drivers/threading.py,sha256=ywmG59d4H6OHZjKarBN97-9BHEsRxFEz9YN-E9QAu_I,463
+engineio/async_drivers/tornado.py,sha256=v9uuGk8_HS6DjhoEKXfjHpki1FnydN4wi7eyBMsUTJA,5908
+engineio/async_server.py,sha256=ONjhNee8oSncqBrWDaaihWG7fhoFasluAmdOh8NYnqI,27557
+engineio/async_socket.py,sha256=nHY0DPPk0FtI9djUnQWtzZ3ce2OD184Tu-Dop7JLg9I,10715
+engineio/base_client.py,sha256=oOdq-zR7kg8QpvAGti0zBIiFBQGyEELwVMZNtcoJ2ig,5827
+engineio/base_server.py,sha256=tTCqc65Vzf-0Be1uunt1FuGxPOvcpOUCxnT5V2mZCWo,14763
+engineio/base_socket.py,sha256=sQqbNSfGhMQG3xzwar6IXMal28C7Q5TIAQRGp74Wt2o,399
+engineio/client.py,sha256=-9f8kLYOw86QXrFx5PoyI56uHZ1cUKbhVYolTEj-2t8,27784
+engineio/exceptions.py,sha256=FyuMb5qhX9CUYP3fEoe1m-faU96ApdQTSbblaaoo8LA,292
+engineio/json.py,sha256=SG5FTojqd1ix6u0dKXJsZVqqdYioZLO4S2GPL7BKl3U,405
+engineio/middleware.py,sha256=5NKBXz-ftuFErUB_V9IDvRHaSOsjhtW-NnuJtquB1nc,3750
+engineio/packet.py,sha256=YO3gmeKUoKyIsUq2e1z7Zifr5PGeS3gnaCeqR7wj5hQ,3198
+engineio/payload.py,sha256=GIWu0Vnay4WNZlDxHqVgP34tKTBXX58OArJ-mO5zD3E,1539
+engineio/server.py,sha256=47pqjDob0XBwS_2gKRHn0DwAf4NHXHHVuYceZ6pFkD8,23087
+engineio/socket.py,sha256=Oaw1E7ZDyOCaS7KV151g1u9rqOf1JJHh5gttEU0cSeA,10342
+engineio/static_files.py,sha256=pwez9LQFaSQXMbtI0vLyD6UDiokQ4rNfmRYgVLKOthc,2064
+python_engineio-4.13.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+python_engineio-4.13.1.dist-info/METADATA,sha256=jWP1NgC-iIVq_nIphGPFUG-vGPVgYuLoxrC6UgAFlmA,2314
+python_engineio-4.13.1.dist-info/RECORD,,
+python_engineio-4.13.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_engineio-4.13.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+python_engineio-4.13.1.dist-info/licenses/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
+python_engineio-4.13.1.dist-info/top_level.txt,sha256=u8PmNisCZLwRYcWrNLe9wutQ2tt4zNi8IH362c-HWuA,9
diff --git a/libs/rich-13.9.4.dist-info/REQUESTED b/libs/python_engineio-4.13.1.dist-info/REQUESTED
similarity index 100%
rename from libs/rich-13.9.4.dist-info/REQUESTED
rename to libs/python_engineio-4.13.1.dist-info/REQUESTED
diff --git a/libs/python_engineio-4.13.1.dist-info/WHEEL b/libs/python_engineio-4.13.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/python_engineio-4.13.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/python_engineio-4.11.2.dist-info/LICENSE b/libs/python_engineio-4.13.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/python_engineio-4.11.2.dist-info/LICENSE
rename to libs/python_engineio-4.13.1.dist-info/licenses/LICENSE
diff --git a/libs/python_engineio-4.11.2.dist-info/top_level.txt b/libs/python_engineio-4.13.1.dist-info/top_level.txt
similarity index 100%
rename from libs/python_engineio-4.11.2.dist-info/top_level.txt
rename to libs/python_engineio-4.13.1.dist-info/top_level.txt
diff --git a/libs/python_socketio-5.12.1.dist-info/METADATA b/libs/python_socketio-5.12.1.dist-info/METADATA
deleted file mode 100644
index e8a8c1629c..0000000000
--- a/libs/python_socketio-5.12.1.dist-info/METADATA
+++ /dev/null
@@ -1,71 +0,0 @@
-Metadata-Version: 2.1
-Name: python-socketio
-Version: 5.12.1
-Summary: Socket.IO server and client for Python
-Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
-Project-URL: Homepage, https://github.com/miguelgrinberg/python-socketio
-Project-URL: Bug Tracker, https://github.com/miguelgrinberg/python-socketio/issues
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: bidict >=0.21.0
-Requires-Dist: python-engineio >=4.11.0
-Provides-Extra: asyncio_client
-Requires-Dist: aiohttp >=3.4 ; extra == 'asyncio_client'
-Provides-Extra: client
-Requires-Dist: requests >=2.21.0 ; extra == 'client'
-Requires-Dist: websocket-client >=0.54.0 ; extra == 'client'
-Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
-
-python-socketio
-===============
-
-[![Build status](https://github.com/miguelgrinberg/python-socketio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-socketio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-socketio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-socketio)
-
-Python implementation of the `Socket.IO` realtime client and server.
-
-Sponsors
---------
-
-The following organizations are funding this project:
-
-![Socket.IO](https://images.opencollective.com/socketio/050e5eb/logo/64.png)<br>[Socket.IO](https://socket.io)  | [Add your company here!](https://github.com/sponsors/miguelgrinberg)|
--|-
-
-Many individual sponsors also support this project through small ongoing contributions. Why not [join them](https://github.com/sponsors/miguelgrinberg)?
-
-Version compatibility
----------------------
-
-The Socket.IO protocol has been through a number of revisions, and some of these
-introduced backward incompatible changes, which means that the client and the
-server must use compatible versions for everything to work.
-
-If you are using the Python client and server, the easiest way to ensure compatibility
-is to use the same version of this package for the client and the server. If you are
-using this package with a different client or server, then you must ensure the
-versions are compatible.
-
-The version compatibility chart below maps versions of this package to versions
-of the JavaScript reference implementation and the versions of the Socket.IO and
-Engine.IO protocols.
-
-JavaScript Socket.IO version | Socket.IO protocol revision | Engine.IO protocol revision | python-socketio version
--|-|-|-
-0.9.x | 1, 2 | 1, 2 | Not supported
-1.x and 2.x | 3, 4 | 3 | 4.x
-3.x and 4.x | 5 | 4 | 5.x
-
-Resources
----------
-
--  [Documentation](http://python-socketio.readthedocs.io/)
--  [PyPI](https://pypi.python.org/pypi/python-socketio)
--  [Change Log](https://github.com/miguelgrinberg/python-socketio/blob/main/CHANGES.md)
--  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.
diff --git a/libs/python_socketio-5.12.1.dist-info/RECORD b/libs/python_socketio-5.12.1.dist-info/RECORD
deleted file mode 100644
index 6fa92b1463..0000000000
--- a/libs/python_socketio-5.12.1.dist-info/RECORD
+++ /dev/null
@@ -1,38 +0,0 @@
-python_socketio-5.12.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-python_socketio-5.12.1.dist-info/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
-python_socketio-5.12.1.dist-info/METADATA,sha256=2h-FRqPqvswTtXqBiB6c_AJhDU4QI-npJXv-R-oeihA,3214
-python_socketio-5.12.1.dist-info/RECORD,,
-python_socketio-5.12.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_socketio-5.12.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-python_socketio-5.12.1.dist-info/top_level.txt,sha256=xWd-HVUanhys_VzQQTRTRZBX8W448ayFytYf1Zffivs,9
-socketio/__init__.py,sha256=DXxtwPIqHFIqV4BGTgJ86OvCXD6Mth3PxBYhFoJ1_7g,1269
-socketio/admin.py,sha256=pfZ7ZtcZ9-aeaFZkOR4mFhsNPcy9WjZs4_5Os6xc9tA,15966
-socketio/asgi.py,sha256=NaJtYhOswVVcwHU0zcMM5H5TrSzXq9K-CAYaeSNTZRY,2192
-socketio/async_admin.py,sha256=opwgGfkREXb_T25FL7At6hkC3hTfY33bDooyNi1Dgvw,16317
-socketio/async_aiopika_manager.py,sha256=DaBUjGRYaNIsOsk2xNjWylUsz2egmTAFFUiQkV6mNmk,5193
-socketio/async_client.py,sha256=iVXDsHiU9aohwE2QkSwUOtU8GYivCZRapolJMCWeCPY,27810
-socketio/async_manager.py,sha256=dSD2XVtWYwKHDWxAXSu4Xgqw6dXyy9P_6C8rwlguybM,4503
-socketio/async_namespace.py,sha256=pSyJjIekWgydsmQHxmJvuc_NdI8SMGjGTAatLUtRvAk,12028
-socketio/async_pubsub_manager.py,sha256=Dzt34zwWgxqGsB_61_hegSlTSZucciHX6aJrEPSuKos,11141
-socketio/async_redis_manager.py,sha256=UZXKunvbSk8neRVhGqigQF5S0WwLYTKV0BKondnV_yY,4299
-socketio/async_server.py,sha256=YrZ69AN1i8hK-TMZGtRiD6UnoQk_zwl2amHYaKk_1uI,36382
-socketio/async_simple_client.py,sha256=Dj2h0iRR1qZ4BhOV6gpzvDM0K5XO4f-vdxmISiREzhQ,8908
-socketio/base_client.py,sha256=AKwZprl7qwgdOaQwV2drBNx9bB3PBCyABm6HKton-w4,11637
-socketio/base_manager.py,sha256=vmHGHlIUDJTCdp9MIFppqFJJuoN2M1MmEWTTyV35FeY,5727
-socketio/base_namespace.py,sha256=mXECdZZ7jPLphU9yH4U4yOayqjMh6OyWgZ71mOJzl5A,970
-socketio/base_server.py,sha256=JtHtmxFjtclcdORg7FIBoMtMxiaCFnuwulXrpLUSjUE,10637
-socketio/client.py,sha256=gE8NH3oZrdwTMQN1j-D3J_opGZlYCxPyMO6m3rjFDC0,26040
-socketio/exceptions.py,sha256=c8yKss_oJl-fkL52X_AagyJecL-9Mxlgb5xDRqSz5tA,975
-socketio/kafka_manager.py,sha256=BbpNbEus0DCFXaohBAXlKoV2IHU8RhbGzpkL9QcqQNM,2388
-socketio/kombu_manager.py,sha256=MhDhnbZoncW5_Y02Ojhu8qFUFdT7STZDnLPsMUARuik,5748
-socketio/manager.py,sha256=RPYPcVBFAjN-fEtLfcsPlk6SOW_SBATvw0Tkq_PkGZw,3861
-socketio/middleware.py,sha256=P8wOgSzy3YKOcRVI-r3KNKsEejBz_f5p2wdV8ZqW12E,1591
-socketio/msgpack_packet.py,sha256=0K_XXM-OF3SdqOaLN_O5B4a1xHE6N_UhhiaRhQdseNw,514
-socketio/namespace.py,sha256=80y8BN2FFlHK8JKF1TirWvvE4pn9FkGKk14IVFkCLEs,9488
-socketio/packet.py,sha256=nYvjUEIEUMHThZj--xrmRCZX9jN1V9BwFB2GzRpDLWU,7069
-socketio/pubsub_manager.py,sha256=JCB9aaEBbEw8Or6XaosoSpO-f6p5iF_BnNJOCul7ps4,10442
-socketio/redis_manager.py,sha256=DIvqRXjsSsmvXYBwuRvEap70IFyJILLaicj1X2Hssug,4403
-socketio/server.py,sha256=laukqFmlQK24bCmGtMP9KGGGUP8CqebTO4_SJeZrMGY,34788
-socketio/simple_client.py,sha256=tZiX2sAPY66OJTIJPk-PIGQjmnmUxu3RnpgJ0nc1-y8,8326
-socketio/tornado.py,sha256=R82JCqz-E1ibZAQX708h7FX3sguCHQ1OLYpnMag-LY8,295
-socketio/zmq_manager.py,sha256=PVlx175_MqKQ6j0sqGpqbqN2vW5zf4BzviotbBQpdEE,3544
diff --git a/libs/python_socketio-5.12.1.dist-info/WHEEL b/libs/python_socketio-5.12.1.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/python_socketio-5.12.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/python_socketio-5.12.1.dist-info/INSTALLER b/libs/python_socketio-5.16.1.dist-info/INSTALLER
similarity index 100%
rename from libs/python_socketio-5.12.1.dist-info/INSTALLER
rename to libs/python_socketio-5.16.1.dist-info/INSTALLER
diff --git a/libs/python_socketio-5.16.1.dist-info/METADATA b/libs/python_socketio-5.16.1.dist-info/METADATA
new file mode 100644
index 0000000000..5389f6c64a
--- /dev/null
+++ b/libs/python_socketio-5.16.1.dist-info/METADATA
@@ -0,0 +1,75 @@
+Metadata-Version: 2.4
+Name: python-socketio
+Version: 5.16.1
+Summary: Socket.IO server and client for Python
+Author-email: Miguel Grinberg <miguel.grinberg@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/miguelgrinberg/python-socketio
+Project-URL: Bug Tracker, https://github.com/miguelgrinberg/python-socketio/issues
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: bidict>=0.21.0
+Requires-Dist: python-engineio>=4.11.0
+Provides-Extra: client
+Requires-Dist: requests>=2.21.0; extra == "client"
+Requires-Dist: websocket-client>=0.54.0; extra == "client"
+Provides-Extra: asyncio-client
+Requires-Dist: aiohttp>=3.4; extra == "asyncio-client"
+Provides-Extra: dev
+Requires-Dist: tox; extra == "dev"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Dynamic: license-file
+
+python-socketio
+===============
+
+[![Build status](https://github.com/miguelgrinberg/python-socketio/workflows/build/badge.svg)](https://github.com/miguelgrinberg/python-socketio/actions) [![codecov](https://codecov.io/gh/miguelgrinberg/python-socketio/branch/main/graph/badge.svg)](https://codecov.io/gh/miguelgrinberg/python-socketio)
+
+Python implementation of the `Socket.IO` realtime client and server.
+
+Sponsors
+--------
+
+The following organizations are funding this project:
+
+![Socket.IO](https://images.opencollective.com/socketio/050e5eb/logo/64.png)<br>[Socket.IO](https://socket.io)  | [Add your company here!](https://github.com/sponsors/miguelgrinberg)|
+-|-
+
+Many individual sponsors also support this project through small ongoing contributions. Why not [join them](https://github.com/sponsors/miguelgrinberg)?
+
+Version compatibility
+---------------------
+
+The Socket.IO protocol has been through a number of revisions, and some of these
+introduced backward incompatible changes, which means that the client and the
+server must use compatible versions for everything to work.
+
+If you are using the Python client and server, the easiest way to ensure compatibility
+is to use the same version of this package for the client and the server. If you are
+using this package with a different client or server, then you must ensure the
+versions are compatible.
+
+The version compatibility chart below maps versions of this package to versions
+of the JavaScript reference implementation and the versions of the Socket.IO and
+Engine.IO protocols.
+
+JavaScript Socket.IO version | Socket.IO protocol revision | Engine.IO protocol revision | python-socketio version
+-|-|-|-
+0.9.x | 1, 2 | 1, 2 | Not supported
+1.x and 2.x | 3, 4 | 3 | 4.x
+3.x and 4.x | 5 | 4 | 5.x
+
+Resources
+---------
+
+-  [Documentation](http://python-socketio.readthedocs.io/)
+-  [PyPI](https://pypi.python.org/pypi/python-socketio)
+-  [Change Log](https://github.com/miguelgrinberg/python-socketio/blob/main/CHANGES.md)
+-  Questions? See the [questions](https://stackoverflow.com/questions/tagged/python-socketio) others have asked on Stack Overflow, or [ask](https://stackoverflow.com/questions/ask?tags=python+python-socketio) your own question.
diff --git a/libs/python_socketio-5.16.1.dist-info/RECORD b/libs/python_socketio-5.16.1.dist-info/RECORD
new file mode 100644
index 0000000000..37f3b224bd
--- /dev/null
+++ b/libs/python_socketio-5.16.1.dist-info/RECORD
@@ -0,0 +1,38 @@
+python_socketio-5.16.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+python_socketio-5.16.1.dist-info/METADATA,sha256=aKRBDNDXnim5rhevWwXO_7swzXof2LRiSJr3zGEeqDM,3281
+python_socketio-5.16.1.dist-info/RECORD,,
+python_socketio-5.16.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_socketio-5.16.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+python_socketio-5.16.1.dist-info/licenses/LICENSE,sha256=yel9Pbwfu82094CLKCzWRtuIev9PUxP-a76NTDFAWpw,1082
+python_socketio-5.16.1.dist-info/top_level.txt,sha256=xWd-HVUanhys_VzQQTRTRZBX8W448ayFytYf1Zffivs,9
+socketio/__init__.py,sha256=DXxtwPIqHFIqV4BGTgJ86OvCXD6Mth3PxBYhFoJ1_7g,1269
+socketio/admin.py,sha256=Ag0fz2QRVq5mprjkBe9txNjGPvQEpBai6-VJ-rJsxmA,16260
+socketio/asgi.py,sha256=NaJtYhOswVVcwHU0zcMM5H5TrSzXq9K-CAYaeSNTZRY,2192
+socketio/async_admin.py,sha256=4DFriPI3lwjgV80a81x1tndmQcRuYJGIu0wwkNS9ayY,16471
+socketio/async_aiopika_manager.py,sha256=X3PQrPMpJdu0yF8EoqvjB7lTb1wyAe4-EI1ToSuHiaA,5892
+socketio/async_client.py,sha256=Xa9R2LJz6enF94TbfzPl7m2BMikLcqZl6AAZDyIHlZo,28124
+socketio/async_manager.py,sha256=G7TLqCDVozbHt0ODG3jU09h1ku6ahk87_Sz4Cm5tL90,4518
+socketio/async_namespace.py,sha256=BxSUs_iQzPHFo6JyoRZm2Yy0uRyizvS2PMCIzsVzk_o,12043
+socketio/async_pubsub_manager.py,sha256=UwU_i_cDvJ4vRzB6RnefEFuWKoiL35WgXHR0y2-CXas,12474
+socketio/async_redis_manager.py,sha256=S_S09BCeyr8N_Ma6ickbDuKESvPaKSYTSXAjd73OMPo,7848
+socketio/async_server.py,sha256=7_AVMhfZFPaJ5t3nZxaoBT_-Sl1FmDA8A46oXOrXE74,36669
+socketio/async_simple_client.py,sha256=eZUgU9fz7c9lXhsbm4Ln95dinM9zxT3Ps2sML4HtT6Y,9016
+socketio/base_client.py,sha256=LJzYynrxPuId7xbHAWiTPFlEAROQCLi8cOmiIDuc1Lk,11673
+socketio/base_manager.py,sha256=w4JZrUSpQ8Unsy0ZwQmEEXwvSzeCGT3AfR0ma0Tmczo,6116
+socketio/base_namespace.py,sha256=mXECdZZ7jPLphU9yH4U4yOayqjMh6OyWgZ71mOJzl5A,970
+socketio/base_server.py,sha256=JtHtmxFjtclcdORg7FIBoMtMxiaCFnuwulXrpLUSjUE,10637
+socketio/client.py,sha256=ttcjNZ-Qb1yUKjb2Eiylw02wt6ghTXWalfw_y7ODNRo,26355
+socketio/exceptions.py,sha256=c8yKss_oJl-fkL52X_AagyJecL-9Mxlgb5xDRqSz5tA,975
+socketio/kafka_manager.py,sha256=QrgTh94Ft2YmQbJ_uVX9HMotKWZYBfWh6Y66RYrSwtM,3114
+socketio/kombu_manager.py,sha256=EAwW-_L-FCQTWeZjpjE0xqJt5RZSUBdQwU7ASORyaNg,6468
+socketio/manager.py,sha256=RPYPcVBFAjN-fEtLfcsPlk6SOW_SBATvw0Tkq_PkGZw,3861
+socketio/middleware.py,sha256=P8wOgSzy3YKOcRVI-r3KNKsEejBz_f5p2wdV8ZqW12E,1591
+socketio/msgpack_packet.py,sha256=gSLKgYP88QAJ1J8sOmgGFvtRBmNH8QWPtHImWaXIqzs,1765
+socketio/namespace.py,sha256=80y8BN2FFlHK8JKF1TirWvvE4pn9FkGKk14IVFkCLEs,9488
+socketio/packet.py,sha256=N7jEjcqOUg2PPEooCoEglxVxhjRqJF-FZCPyDF-UDKQ,7120
+socketio/pubsub_manager.py,sha256=3xUqRnHiFVf_YI68OWRakJTa2LGHPpyMZNSAQN43GZY,11775
+socketio/redis_manager.py,sha256=_I8n5GJcYWlSnmYZnADDfvn4FP2BMfllHqN4JYuuYeE,8923
+socketio/server.py,sha256=ciEtM1mmXP99zOs5i8kHEPe3uXytYSFNQPRnfTE466s,35042
+socketio/simple_client.py,sha256=aSMTRO8LHBAWO2IV9uetL6_zwZgPGR-ts73x_4k3624,8434
+socketio/tornado.py,sha256=R82JCqz-E1ibZAQX708h7FX3sguCHQ1OLYpnMag-LY8,295
+socketio/zmq_manager.py,sha256=PkY5aP7-JesCJjumRht90pf3dqLGZV1WrGZ5lA8jQ-Y,4232
diff --git a/libs/semver-3.0.2.dist-info/REQUESTED b/libs/python_socketio-5.16.1.dist-info/REQUESTED
similarity index 100%
rename from libs/semver-3.0.2.dist-info/REQUESTED
rename to libs/python_socketio-5.16.1.dist-info/REQUESTED
diff --git a/libs/python_socketio-5.16.1.dist-info/WHEEL b/libs/python_socketio-5.16.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/python_socketio-5.16.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/python_socketio-5.12.1.dist-info/LICENSE b/libs/python_socketio-5.16.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/python_socketio-5.12.1.dist-info/LICENSE
rename to libs/python_socketio-5.16.1.dist-info/licenses/LICENSE
diff --git a/libs/python_socketio-5.12.1.dist-info/top_level.txt b/libs/python_socketio-5.16.1.dist-info/top_level.txt
similarity index 100%
rename from libs/python_socketio-5.12.1.dist-info/top_level.txt
rename to libs/python_socketio-5.16.1.dist-info/top_level.txt
diff --git a/libs/pytz-2024.2.dist-info/LICENSE.txt b/libs/pytz-2024.2.dist-info/LICENSE.txt
deleted file mode 100644
index 5f1c11289f..0000000000
--- a/libs/pytz-2024.2.dist-info/LICENSE.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2003-2019 Stuart Bishop <stuart@stuartbishop.net>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/libs/pytz-2024.2.dist-info/METADATA b/libs/pytz-2024.2.dist-info/METADATA
deleted file mode 100644
index 6feaf3bac3..0000000000
--- a/libs/pytz-2024.2.dist-info/METADATA
+++ /dev/null
@@ -1,648 +0,0 @@
-Metadata-Version: 2.1
-Name: pytz
-Version: 2024.2
-Summary: World timezone definitions, modern and historical
-Home-page: http://pythonhosted.org/pytz
-Download-URL: https://pypi.org/project/pytz/
-Author: Stuart Bishop
-Author-email: stuart@stuartbishop.net
-Maintainer: Stuart Bishop
-Maintainer-email: stuart@stuartbishop.net
-License: MIT
-Keywords: timezone,tzinfo,datetime,olson,time
-Platform: Independent
-Classifier: Development Status :: 6 - Mature
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.4
-Classifier: Programming Language :: Python :: 2.5
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.1
-Classifier: Programming Language :: Python :: 3.2
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-License-File: LICENSE.txt
-
-pytz - World Timezone Definitions for Python
-============================================
-
-:Author: Stuart Bishop <stuart@stuartbishop.net>
-
-Introduction
-~~~~~~~~~~~~
-
-pytz brings the Olson tz database into Python. This library allows
-accurate and cross platform timezone calculations using Python 2.4
-or higher. It also solves the issue of ambiguous times at the end
-of daylight saving time, which you can read more about in the Python
-Library Reference (``datetime.tzinfo``).
-
-Almost all of the Olson timezones are supported.
-
-.. note::
-
-    Projects using Python 3.9 or later should be using the support
-    now included as part of the standard library, and third party
-    packages work with it such as `tzdata <https://pypi.org/project/tzdata/>`_.
-    pytz offers no advantages beyond backwards compatibility with
-    code written for earlier versions of Python.
-
-.. note::
-
-    This library differs from the documented Python API for
-    tzinfo implementations; if you want to create local wallclock
-    times you need to use the ``localize()`` method documented in this
-    document. In addition, if you perform date arithmetic on local
-    times that cross DST boundaries, the result may be in an incorrect
-    timezone (ie. subtract 1 minute from 2002-10-27 1:00 EST and you get
-    2002-10-27 0:59 EST instead of the correct 2002-10-27 1:59 EDT). A
-    ``normalize()`` method is provided to correct this. Unfortunately these
-    issues cannot be resolved without modifying the Python datetime
-    implementation (see PEP-431).
-
-
-Installation
-~~~~~~~~~~~~
-
-This package can either be installed using ``pip`` or from a tarball using the
-standard Python distutils.
-
-If you are installing using ``pip``, you don't need to download anything as the
-latest version will be downloaded for you from PyPI::
-
-    pip install pytz
-
-If you are installing from a tarball, run the following command as an
-administrative user::
-
-    python setup.py install
-
-
-pytz for Enterprise
-~~~~~~~~~~~~~~~~~~~
-
-Available as part of the Tidelift Subscription.
-
-The maintainers of pytz and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. `Learn more. <https://tidelift.com/subscription/pkg/pypi-pytz?utm_source=pypi-pytz&utm_medium=referral&utm_campaign=enterprise&utm_term=repo>`_.
-
-
-Example & Usage
-~~~~~~~~~~~~~~~
-
-Localized times and date arithmetic
------------------------------------
-
->>> from datetime import datetime, timedelta
->>> from pytz import timezone
->>> import pytz
->>> utc = pytz.utc
->>> utc.zone
-'UTC'
->>> eastern = timezone('US/Eastern')
->>> eastern.zone
-'US/Eastern'
->>> amsterdam = timezone('Europe/Amsterdam')
->>> fmt = '%Y-%m-%d %H:%M:%S %Z%z'
-
-This library only supports two ways of building a localized time. The
-first is to use the ``localize()`` method provided by the pytz library.
-This is used to localize a naive datetime (datetime with no timezone
-information):
-
->>> loc_dt = eastern.localize(datetime(2002, 10, 27, 6, 0, 0))
->>> print(loc_dt.strftime(fmt))
-2002-10-27 06:00:00 EST-0500
-
-The second way of building a localized time is by converting an existing
-localized time using the standard ``astimezone()`` method:
-
->>> ams_dt = loc_dt.astimezone(amsterdam)
->>> ams_dt.strftime(fmt)
-'2002-10-27 12:00:00 CET+0100'
-
-Unfortunately using the tzinfo argument of the standard datetime
-constructors ''does not work'' with pytz for many timezones.
-
->>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=amsterdam).strftime(fmt)  # /!\ Does not work this way!
-'2002-10-27 12:00:00 LMT+0018'
-
-It is safe for timezones without daylight saving transitions though, such
-as UTC:
-
->>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=pytz.utc).strftime(fmt)  # /!\ Not recommended except for UTC
-'2002-10-27 12:00:00 UTC+0000'
-
-The preferred way of dealing with times is to always work in UTC,
-converting to localtime only when generating output to be read
-by humans.
-
->>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
->>> loc_dt = utc_dt.astimezone(eastern)
->>> loc_dt.strftime(fmt)
-'2002-10-27 01:00:00 EST-0500'
-
-This library also allows you to do date arithmetic using local
-times, although it is more complicated than working in UTC as you
-need to use the ``normalize()`` method to handle daylight saving time
-and other timezone transitions. In this example, ``loc_dt`` is set
-to the instant when daylight saving time ends in the US/Eastern
-timezone.
-
->>> before = loc_dt - timedelta(minutes=10)
->>> before.strftime(fmt)
-'2002-10-27 00:50:00 EST-0500'
->>> eastern.normalize(before).strftime(fmt)
-'2002-10-27 01:50:00 EDT-0400'
->>> after = eastern.normalize(before + timedelta(minutes=20))
->>> after.strftime(fmt)
-'2002-10-27 01:10:00 EST-0500'
-
-Creating local times is also tricky, and the reason why working with
-local times is not recommended. Unfortunately, you cannot just pass
-a ``tzinfo`` argument when constructing a datetime (see the next
-section for more details)
-
->>> dt = datetime(2002, 10, 27, 1, 30, 0)
->>> dt1 = eastern.localize(dt, is_dst=True)
->>> dt1.strftime(fmt)
-'2002-10-27 01:30:00 EDT-0400'
->>> dt2 = eastern.localize(dt, is_dst=False)
->>> dt2.strftime(fmt)
-'2002-10-27 01:30:00 EST-0500'
-
-Converting between timezones is more easily done, using the
-standard astimezone method.
-
->>> utc_dt = datetime.fromtimestamp(1143408899, tz=utc)
->>> utc_dt.strftime(fmt)
-'2006-03-26 21:34:59 UTC+0000'
->>> au_tz = timezone('Australia/Sydney')
->>> au_dt = utc_dt.astimezone(au_tz)
->>> au_dt.strftime(fmt)
-'2006-03-27 08:34:59 AEDT+1100'
->>> utc_dt2 = au_dt.astimezone(utc)
->>> utc_dt2.strftime(fmt)
-'2006-03-26 21:34:59 UTC+0000'
->>> utc_dt == utc_dt2
-True
-
-You can take shortcuts when dealing with the UTC side of timezone
-conversions. ``normalize()`` and ``localize()`` are not really
-necessary when there are no daylight saving time transitions to
-deal with.
-
->>> utc_dt = datetime.fromtimestamp(1143408899, tz=utc)
->>> utc_dt.strftime(fmt)
-'2006-03-26 21:34:59 UTC+0000'
->>> au_tz = timezone('Australia/Sydney')
->>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz))
->>> au_dt.strftime(fmt)
-'2006-03-27 08:34:59 AEDT+1100'
->>> utc_dt2 = au_dt.astimezone(utc)
->>> utc_dt2.strftime(fmt)
-'2006-03-26 21:34:59 UTC+0000'
-
-
-``tzinfo`` API
---------------
-
-The ``tzinfo`` instances returned by the ``timezone()`` function have
-been extended to cope with ambiguous times by adding an ``is_dst``
-parameter to the ``utcoffset()``, ``dst()`` && ``tzname()`` methods.
-
->>> tz = timezone('America/St_Johns')
-
->>> normal = datetime(2009, 9, 1)
->>> ambiguous = datetime(2009, 10, 31, 23, 30)
-
-The ``is_dst`` parameter is ignored for most timestamps. It is only used
-during DST transition ambiguous periods to resolve that ambiguity.
-
->>> print(tz.utcoffset(normal, is_dst=True))
--1 day, 21:30:00
->>> print(tz.dst(normal, is_dst=True))
-1:00:00
->>> tz.tzname(normal, is_dst=True)
-'NDT'
-
->>> print(tz.utcoffset(ambiguous, is_dst=True))
--1 day, 21:30:00
->>> print(tz.dst(ambiguous, is_dst=True))
-1:00:00
->>> tz.tzname(ambiguous, is_dst=True)
-'NDT'
-
->>> print(tz.utcoffset(normal, is_dst=False))
--1 day, 21:30:00
->>> tz.dst(normal, is_dst=False).seconds
-3600
->>> tz.tzname(normal, is_dst=False)
-'NDT'
-
->>> print(tz.utcoffset(ambiguous, is_dst=False))
--1 day, 20:30:00
->>> tz.dst(ambiguous, is_dst=False)
-datetime.timedelta(0)
->>> tz.tzname(ambiguous, is_dst=False)
-'NST'
-
-If ``is_dst`` is not specified, ambiguous timestamps will raise
-an ``pytz.exceptions.AmbiguousTimeError`` exception.
-
->>> print(tz.utcoffset(normal))
--1 day, 21:30:00
->>> print(tz.dst(normal))
-1:00:00
->>> tz.tzname(normal)
-'NDT'
-
->>> import pytz.exceptions
->>> try:
-...     tz.utcoffset(ambiguous)
-... except pytz.exceptions.AmbiguousTimeError:
-...     print('pytz.exceptions.AmbiguousTimeError: %s' % ambiguous)
-pytz.exceptions.AmbiguousTimeError: 2009-10-31 23:30:00
->>> try:
-...     tz.dst(ambiguous)
-... except pytz.exceptions.AmbiguousTimeError:
-...     print('pytz.exceptions.AmbiguousTimeError: %s' % ambiguous)
-pytz.exceptions.AmbiguousTimeError: 2009-10-31 23:30:00
->>> try:
-...     tz.tzname(ambiguous)
-... except pytz.exceptions.AmbiguousTimeError:
-...     print('pytz.exceptions.AmbiguousTimeError: %s' % ambiguous)
-pytz.exceptions.AmbiguousTimeError: 2009-10-31 23:30:00
-
-
-Problems with Localtime
-~~~~~~~~~~~~~~~~~~~~~~~
-
-The major problem we have to deal with is that certain datetimes
-may occur twice in a year. For example, in the US/Eastern timezone
-on the last Sunday morning in October, the following sequence
-happens:
-
-    - 01:00 EDT occurs
-    - 1 hour later, instead of 2:00am the clock is turned back 1 hour
-      and 01:00 happens again (this time 01:00 EST)
-
-In fact, every instant between 01:00 and 02:00 occurs twice. This means
-that if you try and create a time in the 'US/Eastern' timezone
-the standard datetime syntax, there is no way to specify if you meant
-before of after the end-of-daylight-saving-time transition. Using the
-pytz custom syntax, the best you can do is make an educated guess:
-
->>> loc_dt = eastern.localize(datetime(2002, 10, 27, 1, 30, 00))
->>> loc_dt.strftime(fmt)
-'2002-10-27 01:30:00 EST-0500'
-
-As you can see, the system has chosen one for you and there is a 50%
-chance of it being out by one hour. For some applications, this does
-not matter. However, if you are trying to schedule meetings with people
-in different timezones or analyze log files it is not acceptable.
-
-The best and simplest solution is to stick with using UTC.  The pytz
-package encourages using UTC for internal timezone representation by
-including a special UTC implementation based on the standard Python
-reference implementation in the Python documentation.
-
-The UTC timezone unpickles to be the same instance, and pickles to a
-smaller size than other pytz tzinfo instances.  The UTC implementation
-can be obtained as pytz.utc, pytz.UTC, or pytz.timezone('UTC').
-
->>> import pickle, pytz
->>> dt = datetime(2005, 3, 1, 14, 13, 21, tzinfo=utc)
->>> naive = dt.replace(tzinfo=None)
->>> p = pickle.dumps(dt, 1)
->>> naive_p = pickle.dumps(naive, 1)
->>> len(p) - len(naive_p)
-17
->>> new = pickle.loads(p)
->>> new == dt
-True
->>> new is dt
-False
->>> new.tzinfo is dt.tzinfo
-True
->>> pytz.utc is pytz.UTC is pytz.timezone('UTC')
-True
-
-Note that some other timezones are commonly thought of as the same (GMT,
-Greenwich, Universal, etc.). The definition of UTC is distinct from these
-other timezones, and they are not equivalent. For this reason, they will
-not compare the same in Python.
-
->>> utc == pytz.timezone('GMT')
-False
-
-See the section `What is UTC`_, below.
-
-If you insist on working with local times, this library provides a
-facility for constructing them unambiguously:
-
->>> loc_dt = datetime(2002, 10, 27, 1, 30, 00)
->>> est_dt = eastern.localize(loc_dt, is_dst=True)
->>> edt_dt = eastern.localize(loc_dt, is_dst=False)
->>> print(est_dt.strftime(fmt) + ' / ' + edt_dt.strftime(fmt))
-2002-10-27 01:30:00 EDT-0400 / 2002-10-27 01:30:00 EST-0500
-
-If you pass None as the is_dst flag to localize(), pytz will refuse to
-guess and raise exceptions if you try to build ambiguous or non-existent
-times.
-
-For example, 1:30am on 27th Oct 2002 happened twice in the US/Eastern
-timezone when the clocks where put back at the end of Daylight Saving
-Time:
-
->>> dt = datetime(2002, 10, 27, 1, 30, 00)
->>> try:
-...     eastern.localize(dt, is_dst=None)
-... except pytz.exceptions.AmbiguousTimeError:
-...     print('pytz.exceptions.AmbiguousTimeError: %s' % dt)
-pytz.exceptions.AmbiguousTimeError: 2002-10-27 01:30:00
-
-Similarly, 2:30am on 7th April 2002 never happened at all in the
-US/Eastern timezone, as the clocks where put forward at 2:00am skipping
-the entire hour:
-
->>> dt = datetime(2002, 4, 7, 2, 30, 00)
->>> try:
-...     eastern.localize(dt, is_dst=None)
-... except pytz.exceptions.NonExistentTimeError:
-...     print('pytz.exceptions.NonExistentTimeError: %s' % dt)
-pytz.exceptions.NonExistentTimeError: 2002-04-07 02:30:00
-
-Both of these exceptions share a common base class to make error handling
-easier:
-
->>> isinstance(pytz.AmbiguousTimeError(), pytz.InvalidTimeError)
-True
->>> isinstance(pytz.NonExistentTimeError(), pytz.InvalidTimeError)
-True
-
-
-A special case is where countries change their timezone definitions
-with no daylight savings time switch. For example, in 1915 Warsaw
-switched from Warsaw time to Central European time with no daylight savings
-transition. So at the stroke of midnight on August 5th 1915 the clocks
-were wound back 24 minutes creating an ambiguous time period that cannot
-be specified without referring to the timezone abbreviation or the
-actual UTC offset. In this case midnight happened twice, neither time
-during a daylight saving time period. pytz handles this transition by
-treating the ambiguous period before the switch as daylight savings
-time, and the ambiguous period after as standard time.
-
-
->>> warsaw = pytz.timezone('Europe/Warsaw')
->>> amb_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=True)
->>> amb_dt1.strftime(fmt)
-'1915-08-04 23:59:59 WMT+0124'
->>> amb_dt2 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False)
->>> amb_dt2.strftime(fmt)
-'1915-08-04 23:59:59 CET+0100'
->>> switch_dt = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False)
->>> switch_dt.strftime(fmt)
-'1915-08-05 00:00:00 CET+0100'
->>> str(switch_dt - amb_dt1)
-'0:24:01'
->>> str(switch_dt - amb_dt2)
-'0:00:01'
-
-The best way of creating a time during an ambiguous time period is
-by converting from another timezone such as UTC:
-
->>> utc_dt = datetime(1915, 8, 4, 22, 36, tzinfo=pytz.utc)
->>> utc_dt.astimezone(warsaw).strftime(fmt)
-'1915-08-04 23:36:00 CET+0100'
-
-The standard Python way of handling all these ambiguities is not to
-handle them, such as demonstrated in this example using the US/Eastern
-timezone definition from the Python documentation (Note that this
-implementation only works for dates between 1987 and 2006 - it is
-included for tests only!):
-
->>> from pytz.reference import Eastern # pytz.reference only for tests
->>> dt = datetime(2002, 10, 27, 0, 30, tzinfo=Eastern)
->>> str(dt)
-'2002-10-27 00:30:00-04:00'
->>> str(dt + timedelta(hours=1))
-'2002-10-27 01:30:00-05:00'
->>> str(dt + timedelta(hours=2))
-'2002-10-27 02:30:00-05:00'
->>> str(dt + timedelta(hours=3))
-'2002-10-27 03:30:00-05:00'
-
-Notice the first two results? At first glance you might think they are
-correct, but taking the UTC offset into account you find that they are
-actually two hours appart instead of the 1 hour we asked for.
-
->>> from pytz.reference import UTC # pytz.reference only for tests
->>> str(dt.astimezone(UTC))
-'2002-10-27 04:30:00+00:00'
->>> str((dt + timedelta(hours=1)).astimezone(UTC))
-'2002-10-27 06:30:00+00:00'
-
-
-Country Information
-~~~~~~~~~~~~~~~~~~~
-
-A mechanism is provided to access the timezones commonly in use
-for a particular country, looked up using the ISO 3166 country code.
-It returns a list of strings that can be used to retrieve the relevant
-tzinfo instance using ``pytz.timezone()``:
-
->>> print(' '.join(pytz.country_timezones['nz']))
-Pacific/Auckland Pacific/Chatham
-
-The Olson database comes with a ISO 3166 country code to English country
-name mapping that pytz exposes as a dictionary:
-
->>> print(pytz.country_names['nz'])
-New Zealand
-
-
-What is UTC
-~~~~~~~~~~~
-
-'UTC' is `Coordinated Universal Time`_. It is a successor to, but distinct
-from, Greenwich Mean Time (GMT) and the various definitions of Universal
-Time. UTC is now the worldwide standard for regulating clocks and time
-measurement.
-
-All other timezones are defined relative to UTC, and include offsets like
-UTC+0800 - hours to add or subtract from UTC to derive the local time. No
-daylight saving time occurs in UTC, making it a useful timezone to perform
-date arithmetic without worrying about the confusion and ambiguities caused
-by daylight saving time transitions, your country changing its timezone, or
-mobile computers that roam through multiple timezones.
-
-..  _Coordinated Universal Time: https://en.wikipedia.org/wiki/Coordinated_Universal_Time
-
-
-Helpers
-~~~~~~~
-
-There are two lists of timezones provided.
-
-``all_timezones`` is the exhaustive list of the timezone names that can
-be used.
-
->>> from pytz import all_timezones
->>> len(all_timezones) >= 500
-True
->>> 'Etc/Greenwich' in all_timezones
-True
-
-``common_timezones`` is a list of useful, current timezones. It doesn't
-contain deprecated zones or historical zones, except for a few I've
-deemed in common usage, such as US/Eastern (open a bug report if you
-think other timezones are deserving of being included here). It is also
-a sequence of strings.
-
->>> from pytz import common_timezones
->>> len(common_timezones) < len(all_timezones)
-True
->>> 'Etc/Greenwich' in common_timezones
-False
->>> 'Australia/Melbourne' in common_timezones
-True
->>> 'US/Eastern' in common_timezones
-True
->>> 'Canada/Eastern' in common_timezones
-True
->>> 'Australia/Yancowinna' in all_timezones
-True
->>> 'Australia/Yancowinna' in common_timezones
-False
-
-Both ``common_timezones`` and ``all_timezones`` are alphabetically
-sorted:
-
->>> common_timezones_dupe = common_timezones[:]
->>> common_timezones_dupe.sort()
->>> common_timezones == common_timezones_dupe
-True
->>> all_timezones_dupe = all_timezones[:]
->>> all_timezones_dupe.sort()
->>> all_timezones == all_timezones_dupe
-True
-
-``all_timezones`` and ``common_timezones`` are also available as sets.
-
->>> from pytz import all_timezones_set, common_timezones_set
->>> 'US/Eastern' in all_timezones_set
-True
->>> 'US/Eastern' in common_timezones_set
-True
->>> 'Australia/Victoria' in common_timezones_set
-False
-
-You can also retrieve lists of timezones used by particular countries
-using the ``country_timezones()`` function. It requires an ISO-3166
-two letter country code.
-
->>> from pytz import country_timezones
->>> print(' '.join(country_timezones('ch')))
-Europe/Zurich
->>> print(' '.join(country_timezones('CH')))
-Europe/Zurich
-
-
-Internationalization - i18n/l10n
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Pytz is an interface to the IANA database, which uses ASCII names. The `Unicode  Consortium's Unicode Locales (CLDR) <http://cldr.unicode.org>`_
-project provides translations. Python packages such as
-`Babel <https://babel.pocoo.org/en/latest/api/dates.html#timezone-functionality>`_
-and Thomas Khyn's `l18n <https://pypi.org/project/l18n/>`_ package can be used
-to access these translations from Python.
-
-
-License
-~~~~~~~
-
-MIT license.
-
-This code is also available as part of Zope 3 under the Zope Public
-License,  Version 2.1 (ZPL).
-
-I'm happy to relicense this code if necessary for inclusion in other
-open source projects.
-
-
-Latest Versions
-~~~~~~~~~~~~~~~
-
-This package will be updated after releases of the Olson timezone
-database.  The latest version can be downloaded from the `Python Package
-Index <https://pypi.org/project/pytz/>`_.  The code that is used
-to generate this distribution is hosted on Github and available
-using git::
-
-    git clone https://github.com/stub42/pytz.git
-
-Announcements of new releases are made on
-`Launchpad <https://launchpad.net/pytz>`_, and the
-`Atom feed <http://feeds.launchpad.net/pytz/announcements.atom>`_
-hosted there.
-
-
-Bugs, Feature Requests & Patches
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Bugs should be reported on `Github <https://github.com/stub42/pytz/issues>`_.
-Feature requests are unlikely to be considered, and efforts instead directed
-to timezone support now built into Python or packages that work with it.
-
-
-Security Issues
-~~~~~~~~~~~~~~~
-
-Reports about security issues can be made via `Tidelift <https://tidelift.com/security>`_.
-
-
-Issues & Limitations
-~~~~~~~~~~~~~~~~~~~~
-
-- This project is in maintenance mode. Projects using Python 3.9 or later
-  are best served by using the timezone functionaly now included in core
-  Python and packages that work with it such as `tzdata <https://pypi.org/project/tzdata/>`_.
-
-- Offsets from UTC are rounded to the nearest whole minute, so timezones
-  such as Europe/Amsterdam pre 1937 will be up to 30 seconds out. This
-  was a limitation of the Python datetime library.
-
-- If you think a timezone definition is incorrect, I probably can't fix
-  it. pytz is a direct translation of the Olson timezone database, and
-  changes to the timezone definitions need to be made to this source.
-  If you find errors they should be reported to the time zone mailing
-  list, linked from http://www.iana.org/time-zones.
-
-
-Further Reading
-~~~~~~~~~~~~~~~
-
-More info than you want to know about timezones:
-https://data.iana.org/time-zones/tz-link.html
-
-
-Contact
-~~~~~~~
-
-Stuart Bishop <stuart@stuartbishop.net>
diff --git a/libs/pytz-2024.2.dist-info/RECORD b/libs/pytz-2024.2.dist-info/RECORD
deleted file mode 100644
index 1b6af97037..0000000000
--- a/libs/pytz-2024.2.dist-info/RECORD
+++ /dev/null
@@ -1,617 +0,0 @@
-pytz-2024.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pytz-2024.2.dist-info/LICENSE.txt,sha256=vosaN-vibFkqkPbA6zMQOn84POL010mMCvmlJpkKB7g,1088
-pytz-2024.2.dist-info/METADATA,sha256=0MczTzNzn-1TdBkiC7eBOXgnJoYTp753J0pr8dqye-w,22374
-pytz-2024.2.dist-info/RECORD,,
-pytz-2024.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytz-2024.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-pytz-2024.2.dist-info/top_level.txt,sha256=6xRYlt934v1yHb1JIrXgHyGxn3cqACvd-yE8ski_kcc,5
-pytz-2024.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-pytz/__init__.py,sha256=EJ_Ql_evs0r3_1M46Nda56UMV_DjXf3IKRYvF71E0XM,35081
-pytz/exceptions.py,sha256=434ZcuLlpLQY9mWoGq7zJMV1TyiYvVgpKBU1qZkbDjM,1571
-pytz/lazy.py,sha256=toeR5uDWKBj6ezsUZ4elNP6CEMtK7CO2jS9A30nsFbo,5404
-pytz/reference.py,sha256=zUtCki7JFEmrzrjNsfMD7YL0lWDxynKc1Ubo4iXSs74,3778
-pytz/tzfile.py,sha256=K2y7pZs4vydpZVftrfAA_-hgw17y1Szc7z_QCse6udU,4723
-pytz/tzinfo.py,sha256=XfaVOoO3KsCvtUYaCd0fvgBXWZ8tgevGYUoBh_uiE60,19340
-pytz/zoneinfo/Africa/Abidjan,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Accra,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Addis_Ababa,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Algiers,sha256=vaFpjNVCwObnbfu82rOQzdJvN6nVgmpXpQ1aqzfzsqY,735
-pytz/zoneinfo/Africa/Asmara,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Asmera,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Bamako,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Bangui,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Banjul,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Bissau,sha256=IjuxDP6EZiDHFvl_bHS6NN7sdRxLKXllooBC829poak,194
-pytz/zoneinfo/Africa/Blantyre,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Brazzaville,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Bujumbura,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Cairo,sha256=Lft-GCLQhaSJm9VqUmsEFoHIS1Vhfa7pFJn9GZCpifs,2399
-pytz/zoneinfo/Africa/Casablanca,sha256=4RqVbw_F3ZucopIC2ivAJ8WDwj5wRODAB67tBpdXcgA,2429
-pytz/zoneinfo/Africa/Ceuta,sha256=Cw-2_nFDGbN8WqIsVpcauyZooWX8j3Kmx2PnC0fHut8,2052
-pytz/zoneinfo/Africa/Conakry,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Dakar,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Dar_es_Salaam,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Djibouti,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Douala,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/El_Aaiun,sha256=UWCCqQLJxd8qsTYw82kz9W1suwW5TRgnZw31sDWDz20,2295
-pytz/zoneinfo/Africa/Freetown,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Gaborone,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Harare,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Johannesburg,sha256=bBvMdSZo53WFowiuhUO9C8zY6BOGViboCb-U8_49l34,246
-pytz/zoneinfo/Africa/Juba,sha256=UVnIqEPJwHLTMC-r5qZQHNv9opoYVsKdq-ta_5XUw_Q,679
-pytz/zoneinfo/Africa/Kampala,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Khartoum,sha256=MYWDoJ3AcCItZdApoeOgtWWDDxquwTon5v5TOGP70-o,679
-pytz/zoneinfo/Africa/Kigali,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Kinshasa,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Lagos,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Libreville,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Lome,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Luanda,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Lubumbashi,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Lusaka,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Malabo,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Maputo,sha256=RE7TpxBBS8a_Q-sn5ZHaSdO-PbFTRJpqDJRz9-Of28s,149
-pytz/zoneinfo/Africa/Maseru,sha256=bBvMdSZo53WFowiuhUO9C8zY6BOGViboCb-U8_49l34,246
-pytz/zoneinfo/Africa/Mbabane,sha256=bBvMdSZo53WFowiuhUO9C8zY6BOGViboCb-U8_49l34,246
-pytz/zoneinfo/Africa/Mogadishu,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Monrovia,sha256=-VsJW5cU4KdvfgYaQVv4lcuzmaKIVFMd42nO6RXOBdU,208
-pytz/zoneinfo/Africa/Nairobi,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Africa/Ndjamena,sha256=8T3A0Zm9Gj0Bvm6rd88t3GAXKiKdGUfHlIqYlkYI0KM,199
-pytz/zoneinfo/Africa/Niamey,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Nouakchott,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Ouagadougou,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Porto-Novo,sha256=z_6wKCzL1_ug5JP_hneh5abdUZeIUELkN_ladz-ESEY,235
-pytz/zoneinfo/Africa/Sao_Tome,sha256=MdjxpQ268uzJ7Zx1ZroFUtRUwqsJ6F_yY3AYV9FXw1I,254
-pytz/zoneinfo/Africa/Timbuktu,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Africa/Tripoli,sha256=W1dptGD70T7ppGoo0fczFQeDiIp0nultLNPV66MwB2c,625
-pytz/zoneinfo/Africa/Tunis,sha256=OFVMEM4eYT2Ez0beuhEUCTSIpcFldWxsV2uEoTZIUNI,689
-pytz/zoneinfo/Africa/Windhoek,sha256=xuhvudrMH4alnVmouSTQI8YL8F_HbgsF2EQ7AZKzuHs,955
-pytz/zoneinfo/America/Adak,sha256=IB1DhwJQAKbhPJ9jHLf8zW5Dad7HIkBS-dhv64E1OlM,2356
-pytz/zoneinfo/America/Anchorage,sha256=oZA1NSPS2BWdymYpnCHFO8BlYVS-ll5KLg2Ez9CbETs,2371
-pytz/zoneinfo/America/Anguilla,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Antigua,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Araguaina,sha256=G6v9wYFZ8EB4WQfIsqRbbiiKd2b27j7Zt5dFjBbzx2o,870
-pytz/zoneinfo/America/Argentina/Buenos_Aires,sha256=JmU8lBwmy29gR6OmeytvFdMRx6ObJKnYNHmLyMmXX2M,1062
-pytz/zoneinfo/America/Argentina/Catamarca,sha256=uMCJXXGYmNESHVvj5RYBZ0McrOdE14hwm17l25MgRW0,1062
-pytz/zoneinfo/America/Argentina/ComodRivadavia,sha256=uMCJXXGYmNESHVvj5RYBZ0McrOdE14hwm17l25MgRW0,1062
-pytz/zoneinfo/America/Argentina/Cordoba,sha256=uniNihhMHnr4XK4WpwiPUnrAT0YPmvzqB6f0hRLtXvY,1062
-pytz/zoneinfo/America/Argentina/Jujuy,sha256=PGmAehypCxj0XCenCSWqylDIPbKLK0DlrwJK_24D590,1034
-pytz/zoneinfo/America/Argentina/La_Rioja,sha256=Um6XoVXhsr62ad1mWuebe6NY0ZHauBdR9tMGDgqCOHg,1076
-pytz/zoneinfo/America/Argentina/Mendoza,sha256=xcOVtvRyVYFAU90y2QYwpyQhpMLyAp7-Fxvku4kgl0c,1062
-pytz/zoneinfo/America/Argentina/Rio_Gallegos,sha256=F9ZKR4o8gLHX7QBuIjMapGIdmzJxpqwbouPgZ5MqDpY,1062
-pytz/zoneinfo/America/Argentina/Salta,sha256=h1KYrDNIapvDkYhi1PaB8WD1qWOe4vhhgDJWDCGV4jc,1034
-pytz/zoneinfo/America/Argentina/San_Juan,sha256=AI2GltA80mPNzhHxYycuEwIbO1ANXyIqBQZMpjqKqdQ,1076
-pytz/zoneinfo/America/Argentina/San_Luis,sha256=2ItGRcLVK2wx8MyJsHbIBBeAkU4B-MN5x1ZxNyZ7UJE,1088
-pytz/zoneinfo/America/Argentina/Tucuman,sha256=twO-FqtNJV8XOzWTvFQ-xnEcWCoDUHY3gpVIG0Mzbf8,1090
-pytz/zoneinfo/America/Argentina/Ushuaia,sha256=A6IbpVlY9IIPoSKMFRR9DMROdwXUSDc2HsASueOSnqo,1062
-pytz/zoneinfo/America/Aruba,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Asuncion,sha256=V8wwkUoNqyj0C-fUSADpU7HU8H3Qkr3jNPJ4SLsGUIc,2030
-pytz/zoneinfo/America/Atikokan,sha256=kayA_pdpMcSQ0FjIzotdcf-m1JYfbKE-qcFT8LC8zqA,182
-pytz/zoneinfo/America/Atka,sha256=IB1DhwJQAKbhPJ9jHLf8zW5Dad7HIkBS-dhv64E1OlM,2356
-pytz/zoneinfo/America/Bahia,sha256=qi7dA6FofDhLxVMmd2L8bK3HeaQnc9X-jiijwyfhs3g,1010
-pytz/zoneinfo/America/Bahia_Banderas,sha256=MvrXGJ5LzaHOeguJqxszxjxMhVafGVbk-ojXEc7_YEI,1100
-pytz/zoneinfo/America/Barbados,sha256=ima-Qrrhazu4Qfvu2Z0-e6E-GTiYknuJBu6c2yVG9LE,436
-pytz/zoneinfo/America/Belem,sha256=aZMUgtFDdHNISpqyQRYbmS2IBD-BAS3CaJnhu6onLCY,562
-pytz/zoneinfo/America/Belize,sha256=pkfLY2KfPchbeJa1pWcXmWAwp4ZlRvxWLVezXnrbkws,1614
-pytz/zoneinfo/America/Blanc-Sablon,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Boa_Vista,sha256=dMtaG11kGlJrgJJgGWEDZZAmnO_HfT3L4X8pI72LLFY,618
-pytz/zoneinfo/America/Bogota,sha256=Z1ernZZGQxulE8KFWHYWcM3SV1jn2_QEc1Q0OJzHRak,232
-pytz/zoneinfo/America/Boise,sha256=7HQsNPJiUheQgFz5kVLvTnf5xhXAYaeANqDskxKz2Vs,2410
-pytz/zoneinfo/America/Buenos_Aires,sha256=JmU8lBwmy29gR6OmeytvFdMRx6ObJKnYNHmLyMmXX2M,1062
-pytz/zoneinfo/America/Cambridge_Bay,sha256=_4xRlX3WdVpEcqoT6myD7NeTCXnn9OYk_iH006bwULo,2254
-pytz/zoneinfo/America/Campo_Grande,sha256=gINiXg5i2e6Rh2Nbo2bFqhPAJL4F4cAqGnBankXTDXw,1430
-pytz/zoneinfo/America/Cancun,sha256=EdV0Nw2WjM7VnjFHoq5jsSbLuuE7eP1OE74utEyWJG4,864
-pytz/zoneinfo/America/Caracas,sha256=mUNMFdDzZLav_ePA1ocBdmqVBierkeEszTIFpNCm5J0,250
-pytz/zoneinfo/America/Catamarca,sha256=uMCJXXGYmNESHVvj5RYBZ0McrOdE14hwm17l25MgRW0,1062
-pytz/zoneinfo/America/Cayenne,sha256=4k7Iv1woX4atqePKrcvMQD2Vk9Tmma7rW_AW_R62pCc,184
-pytz/zoneinfo/America/Cayman,sha256=kayA_pdpMcSQ0FjIzotdcf-m1JYfbKE-qcFT8LC8zqA,182
-pytz/zoneinfo/America/Chicago,sha256=_roybr6I6sIAF6cYdIxGxoRpoef153Fty48dQ6bm9oY,3592
-pytz/zoneinfo/America/Chihuahua,sha256=3Ngzbedg8AzAqxsbQSG0jVRx-LxYlw1i3kx-Yzl-2Ic,1102
-pytz/zoneinfo/America/Ciudad_Juarez,sha256=ir4b27DiFrhL0H4fZQ92nEa-BBoPfLWIz3phU373dgE,1538
-pytz/zoneinfo/America/Coral_Harbour,sha256=kayA_pdpMcSQ0FjIzotdcf-m1JYfbKE-qcFT8LC8zqA,182
-pytz/zoneinfo/America/Cordoba,sha256=uniNihhMHnr4XK4WpwiPUnrAT0YPmvzqB6f0hRLtXvY,1062
-pytz/zoneinfo/America/Costa_Rica,sha256=74rYa6lrgIkyls9PkHo8SCYl9oOqiuG5S7MWdnJelP4,316
-pytz/zoneinfo/America/Creston,sha256=illz0sYuLL8lIPK0Tkou6dL0Vck_D0W_3rRTOvFYRmQ,360
-pytz/zoneinfo/America/Cuiaba,sha256=GRJqkhRXNsOUcgjZddQxRIJdRYaw9pM_YLWbun88dkg,1402
-pytz/zoneinfo/America/Curacao,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Danmarkshavn,sha256=YRZAfUCoVtaL1L-MYMYMH1wyOaVQnfUo_gFnvMXSuzw,698
-pytz/zoneinfo/America/Dawson,sha256=rAHhyuMuyjf_eyA2SBG76MRBf_fj_xi5FAuiWVQgJhw,1614
-pytz/zoneinfo/America/Dawson_Creek,sha256=aJXCyP4j3ggE4wGCN-LrS9hpD_5zWHzQTeSAKTWEPUM,1050
-pytz/zoneinfo/America/Denver,sha256=MugZwApDs8NI9TnXANQlUE8guNBowWQY0m-ptpPndck,2460
-pytz/zoneinfo/America/Detroit,sha256=hecz8yqY2Cj5B61G3gLZdAVZvRgK9l0P90c_gN-uD5g,2230
-pytz/zoneinfo/America/Dominica,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Edmonton,sha256=-TkIfc3QlvaCf0p8COZ43Y1HRBAl-nARUi-JdXeK1vE,2332
-pytz/zoneinfo/America/Eirunepe,sha256=j5eExkjFaqtC-D8XK0rGzoF9yEgbSlTbPqVG9WKhEa8,642
-pytz/zoneinfo/America/El_Salvador,sha256=gvGN8Lkj-sGm2_rs8OUjAMf1oMtKp2Xes6UfWT0WqgU,224
-pytz/zoneinfo/America/Ensenada,sha256=SluV7xzZm24LgMXSUVt1cD1AlE7y_bdE65HhDIdXLcs,2458
-pytz/zoneinfo/America/Fort_Nelson,sha256=erfODr3DrSpz65kAdO7Ts2dGbZxvddEP6gx4BX3y2J0,2240
-pytz/zoneinfo/America/Fort_Wayne,sha256=kNKy9Kj9ICsiYYfCCbAggzMA7exf-GpGPMxoXocHUyw,1682
-pytz/zoneinfo/America/Fortaleza,sha256=rjiSB0q1cBuMDOM9orW_uwe5UOLBwTlfjFotwOYe1mU,702
-pytz/zoneinfo/America/Glace_Bay,sha256=G8DGLGCapH_aYCF_OhaL5Qonf7FOAgAPwelO5htCWBc,2192
-pytz/zoneinfo/America/Godthab,sha256=KGXrMN-YkYpVCgLdpcfwMFQ77EsRAGsjUCG3yAUvVfw,1889
-pytz/zoneinfo/America/Goose_Bay,sha256=JgaLueghSvX2g725FOfIgpgvsqxZGykWOhAZWGpQZRY,3210
-pytz/zoneinfo/America/Grand_Turk,sha256=4YOFEPK60Bel2_fCsY6vSZxUcMJKjiKtyOf_Q0khEwU,1834
-pytz/zoneinfo/America/Grenada,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Guadeloupe,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Guatemala,sha256=dugUgCd6QY52yHkHuUP4jRWzo5x439IQigaYCvEF46Q,280
-pytz/zoneinfo/America/Guayaquil,sha256=j2UuIo-4RgSOlTNfu77mhZ92waNTeKFSvmoVemJooT0,232
-pytz/zoneinfo/America/Guyana,sha256=R0bOvCRDC8SRIexmhsduPdHbbRPwI2GviD9otExiUrk,248
-pytz/zoneinfo/America/Halifax,sha256=TZpmc5PwWoLfTfQoQ_b3U17BE2iVKSeNkR0Ho8mbTn8,3424
-pytz/zoneinfo/America/Havana,sha256=HUQeAuKBsEkI5SLZjqynXICOUVOajkKzKH5r-Ov5Odc,2416
-pytz/zoneinfo/America/Hermosillo,sha256=ixYKestLmS7gWobk9Kq6FtLZo1yqbWActrFUKluzctw,388
-pytz/zoneinfo/America/Indiana/Indianapolis,sha256=kNKy9Kj9ICsiYYfCCbAggzMA7exf-GpGPMxoXocHUyw,1682
-pytz/zoneinfo/America/Indiana/Knox,sha256=CsvZ5BKw2qVav3x_F8CU9taJdDk7jX41Cfsqms6jXV8,2444
-pytz/zoneinfo/America/Indiana/Marengo,sha256=f3tQ-lgMSUA7nvn64pXhKtJL7mWzGajoCega5MEJSbI,1738
-pytz/zoneinfo/America/Indiana/Petersburg,sha256=A88OHuM0Rg3iMLHjKgXq_d2jZCdVSytUQs-9W0KcFyQ,1920
-pytz/zoneinfo/America/Indiana/Tell_City,sha256=4dWqAr9Y2BXfL4pAQk-81c3gGl2cNdHXOD7_wJhhhn8,1700
-pytz/zoneinfo/America/Indiana/Vevay,sha256=H7VR2G-_sD_C5Rm4P3g1iRC1FWCPg4m0MGD3P1PLzsk,1430
-pytz/zoneinfo/America/Indiana/Vincennes,sha256=62mAxT7APFCaoygflnEzdOpe-fuW1yObI6m6EUUcS7A,1710
-pytz/zoneinfo/America/Indiana/Winamac,sha256=aZGM2jR8CH9BHSUq7XygiweDd6dorXLPXg246XsbR6s,1794
-pytz/zoneinfo/America/Indianapolis,sha256=kNKy9Kj9ICsiYYfCCbAggzMA7exf-GpGPMxoXocHUyw,1682
-pytz/zoneinfo/America/Inuvik,sha256=6J-mapDnrk9A1LtswoE34tqSy_ufedcEBNxixkrEjIo,2074
-pytz/zoneinfo/America/Iqaluit,sha256=feOnxAN0N0r-M1qlkrA4JMyawoc0tqae0iiBCPDAs4k,2202
-pytz/zoneinfo/America/Jamaica,sha256=wlagieUPRf5-beie-h7QsONbNzjGsm8vMs8uf28pw28,482
-pytz/zoneinfo/America/Jujuy,sha256=PGmAehypCxj0XCenCSWqylDIPbKLK0DlrwJK_24D590,1034
-pytz/zoneinfo/America/Juneau,sha256=k7hxb0aGRnfnE-DBi3LkcjAzRPyAf0_Hw0vVFfjGeb0,2353
-pytz/zoneinfo/America/Kentucky/Louisville,sha256=tP072xV_n_vIQjxxcJ77AGeGj6yL1KPpn3fwids9g1U,2788
-pytz/zoneinfo/America/Kentucky/Monticello,sha256=LtdyCo85BrXQs6rlH61Ym-8KqWHH6PwAOjD0QxhIdzM,2368
-pytz/zoneinfo/America/Knox_IN,sha256=CsvZ5BKw2qVav3x_F8CU9taJdDk7jX41Cfsqms6jXV8,2444
-pytz/zoneinfo/America/Kralendijk,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/La_Paz,sha256=hqfD8LQHupdZhji2e93_9pOQAT-R7muzzjP0nyfbFXY,218
-pytz/zoneinfo/America/Lima,sha256=HHgTnDUnCZzibvL0MrG8qyOuvjmYYw3e3R5VbnxMZs8,392
-pytz/zoneinfo/America/Los_Angeles,sha256=aJd7ua1tGG_vxser02AQpm4wAI3LLTdgh6QcSYYecmg,2852
-pytz/zoneinfo/America/Louisville,sha256=tP072xV_n_vIQjxxcJ77AGeGj6yL1KPpn3fwids9g1U,2788
-pytz/zoneinfo/America/Lower_Princes,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Maceio,sha256=3R5DlSe32kQDmoSVIWpcyk2o7qohr-rliwqDSGFIMyQ,730
-pytz/zoneinfo/America/Managua,sha256=xBzF01AHn2E2fD8Qdy-DHFe36UqoeNpKPfChduBKWdk,430
-pytz/zoneinfo/America/Manaus,sha256=F6RLOOeOi9lymZiQmQ9pR8tFpPZ6EguNdPfOc6BhXDE,590
-pytz/zoneinfo/America/Marigot,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Martinique,sha256=fMs80kOU2YFvC0f9y2eje97JeAtTYBamXrnlTunNLzQ,232
-pytz/zoneinfo/America/Matamoros,sha256=fq-PqdmZrQ98UsFmHA9ivjBZv5GEBRTOuLQ5Cu5ajW8,1418
-pytz/zoneinfo/America/Mazatlan,sha256=BWH2NqVPA1PsyELPN_2BF8KllrsmQkqg1eujsQvnnx8,1060
-pytz/zoneinfo/America/Mendoza,sha256=xcOVtvRyVYFAU90y2QYwpyQhpMLyAp7-Fxvku4kgl0c,1062
-pytz/zoneinfo/America/Menominee,sha256=Arv9WLbfhNcpRsUjHDU757BEdwlp08Gt30AixG3gZ04,2274
-pytz/zoneinfo/America/Merida,sha256=SVNEHCazjomftnuPVBayFI-E-IQ0WmluHfTpHP0h3d0,1004
-pytz/zoneinfo/America/Metlakatla,sha256=twmieGTVY2V-U8nFxqvx7asYv8GVjeWdLtrOI7UApVI,1423
-pytz/zoneinfo/America/Mexico_City,sha256=Uog2-FMWz2o12jR6sK9vemJamLeo6OEFMQR3s0xTxkc,1222
-pytz/zoneinfo/America/Miquelon,sha256=l5txBJYe9HTRZlILcbSL_HNDYrjUb0ouecNy7QEkg9c,1652
-pytz/zoneinfo/America/Moncton,sha256=Wmv-bk9aKKcWWzOpc1UFu67HOfwaIk2Wmh3LgqGctys,3154
-pytz/zoneinfo/America/Monterrey,sha256=YixTESJubf6ZBUXy6g32hAM2gR4GXXPqOU4tv0L3kG0,1114
-pytz/zoneinfo/America/Montevideo,sha256=dQEBE4mjZPtyRjKXK6Z-bMHJdFqpwhIzxDH4x04rKYk,1496
-pytz/zoneinfo/America/Montreal,sha256=pYehoWB0Ofe6woPhgV8r26-5ZJpFPRjgbC5E5pltiI8,3494
-pytz/zoneinfo/America/Montserrat,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Nassau,sha256=pYehoWB0Ofe6woPhgV8r26-5ZJpFPRjgbC5E5pltiI8,3494
-pytz/zoneinfo/America/New_York,sha256=6e0H177gx2qdRC0JHvHwFmj-58TyYBTAqGixn-bBipU,3552
-pytz/zoneinfo/America/Nipigon,sha256=pYehoWB0Ofe6woPhgV8r26-5ZJpFPRjgbC5E5pltiI8,3494
-pytz/zoneinfo/America/Nome,sha256=2izM3-P-PqJ9za6MdhzFfMvPFNq7Gim69tAvEwPeY2s,2367
-pytz/zoneinfo/America/Noronha,sha256=feeRAijQqKylZgqe84nKhsFLycT5zIBm7mLIvdyGw4w,702
-pytz/zoneinfo/America/North_Dakota/Beulah,sha256=qtgbqNu8M3AkHF2n-_oSps1pYT4SxgclbkkPKbXaBHs,2396
-pytz/zoneinfo/America/North_Dakota/Center,sha256=9ZWbK9YKkquULyBUFS3Lr_idxbt7V7y4W4EO0Kn20sw,2396
-pytz/zoneinfo/America/North_Dakota/New_Salem,sha256=DH_bsQfuUnK2obdb06KgisO4XLqht12BXdrgUsZZveg,2396
-pytz/zoneinfo/America/Nuuk,sha256=KGXrMN-YkYpVCgLdpcfwMFQ77EsRAGsjUCG3yAUvVfw,1889
-pytz/zoneinfo/America/Ojinaga,sha256=b38Q_7VdkCZzaVwb7OXuddihJAzUKPTTqXcmpBm1ntE,1524
-pytz/zoneinfo/America/Panama,sha256=kayA_pdpMcSQ0FjIzotdcf-m1JYfbKE-qcFT8LC8zqA,182
-pytz/zoneinfo/America/Pangnirtung,sha256=feOnxAN0N0r-M1qlkrA4JMyawoc0tqae0iiBCPDAs4k,2202
-pytz/zoneinfo/America/Paramaribo,sha256=Z7UZvNlgd-qEUHjEPYXIkLNTgjMcCzk9EfUUEmUyd7M,248
-pytz/zoneinfo/America/Phoenix,sha256=illz0sYuLL8lIPK0Tkou6dL0Vck_D0W_3rRTOvFYRmQ,360
-pytz/zoneinfo/America/Port-au-Prince,sha256=09ZAJd4IOiMpfdpUuF1U44R_hRt6BvpAkFXOnYO9yOM,1434
-pytz/zoneinfo/America/Port_of_Spain,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Porto_Acre,sha256=0gpJUl46hQbp0P6Xj1S0NArIWeAryuuDXjsldvB5GHE,614
-pytz/zoneinfo/America/Porto_Velho,sha256=uSMV2hZWj-VyBhFBwC950wcThfN3jq6KlycESmQTLOA,562
-pytz/zoneinfo/America/Puerto_Rico,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Punta_Arenas,sha256=tR5uIf1351AWFqrqNtmXnhQWnKREmJaZqKBzaWRVMTQ,1902
-pytz/zoneinfo/America/Rainy_River,sha256=7P-_YQrneFcon7QKSTOnkiGjEppFDn3Z48MJ1qq8VBw,2868
-pytz/zoneinfo/America/Rankin_Inlet,sha256=nXgqjL3O2BV0em-Xk8qVRRZb_X0yQmHE6vmSSvI9Kzc,2066
-pytz/zoneinfo/America/Recife,sha256=bJ_HE0-JFio4-owpZ0pLO8U3ai0fiGu8QHL0DexLiLc,702
-pytz/zoneinfo/America/Regina,sha256=yjqT08pHbICYe83H8JmtaDBvCFqRv7Tfze3Y8xuXukw,980
-pytz/zoneinfo/America/Resolute,sha256=CnMU2dBI-63vt8-J0Q1Ropx-8b9pRCLjhvrycMIedGg,2066
-pytz/zoneinfo/America/Rio_Branco,sha256=0gpJUl46hQbp0P6Xj1S0NArIWeAryuuDXjsldvB5GHE,614
-pytz/zoneinfo/America/Rosario,sha256=uniNihhMHnr4XK4WpwiPUnrAT0YPmvzqB6f0hRLtXvY,1062
-pytz/zoneinfo/America/Santa_Isabel,sha256=SluV7xzZm24LgMXSUVt1cD1AlE7y_bdE65HhDIdXLcs,2458
-pytz/zoneinfo/America/Santarem,sha256=VmZP9S5pPucFxyqAOV908EmWXQZvgCgWLmlJJTUl0LE,588
-pytz/zoneinfo/America/Santiago,sha256=0CDw13dCMUsoquMupoJgupkzAUNhDK6E0lVxURA7osA,2515
-pytz/zoneinfo/America/Santo_Domingo,sha256=DKtaEj8fQ92ybITTWU4Bm160S9pzJmUVbjaWRnenxU4,458
-pytz/zoneinfo/America/Sao_Paulo,sha256=BMBnRO4_4HjvO4t3njjrMGZr-ZPmegkvyvL8KPY6ZM4,1430
-pytz/zoneinfo/America/Scoresbysund,sha256=K-qkiMCCFgOe8ccPMABA-lDjc9vb6wpluBOCVfiBdLI,1935
-pytz/zoneinfo/America/Shiprock,sha256=MugZwApDs8NI9TnXANQlUE8guNBowWQY0m-ptpPndck,2460
-pytz/zoneinfo/America/Sitka,sha256=aiS7Fk37hZpzZ9VkeJQeF-BqTLRC1QOTCgMAJwT8UxA,2329
-pytz/zoneinfo/America/St_Barthelemy,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/St_Johns,sha256=r1-17uKv27eZ3JsVkw_DLZQbo6wvjuuVu7C2pDsmOgI,3655
-pytz/zoneinfo/America/St_Kitts,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/St_Lucia,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/St_Thomas,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/St_Vincent,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Swift_Current,sha256=RRKOF7vZC8VvYxD8PP4J1_hUPayKBP7Lu80avRkfPDY,560
-pytz/zoneinfo/America/Tegucigalpa,sha256=EzOz7ntTlreMq69JZ2CcAb8Ps98V9bUMN480tpPIyw4,252
-pytz/zoneinfo/America/Thule,sha256=8xuPRaZU8RgO5ECqFYHYmnHioc81sBOailkVu8Y02i8,1502
-pytz/zoneinfo/America/Thunder_Bay,sha256=pYehoWB0Ofe6woPhgV8r26-5ZJpFPRjgbC5E5pltiI8,3494
-pytz/zoneinfo/America/Tijuana,sha256=SluV7xzZm24LgMXSUVt1cD1AlE7y_bdE65HhDIdXLcs,2458
-pytz/zoneinfo/America/Toronto,sha256=pYehoWB0Ofe6woPhgV8r26-5ZJpFPRjgbC5E5pltiI8,3494
-pytz/zoneinfo/America/Tortola,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Vancouver,sha256=sknKH0jSPWam-DHfM35qXs8Nam7d5TFlkUI9Sgxryyg,2892
-pytz/zoneinfo/America/Virgin,sha256=hJHlV_-AGoMGUWuMpZRv9fLmghrzFHfrR9fRkcxaZJc,246
-pytz/zoneinfo/America/Whitehorse,sha256=TrR6PCnYG-mSClBMohqlP8qnYhXMUsydI-L-quXFxyM,1614
-pytz/zoneinfo/America/Winnipeg,sha256=7P-_YQrneFcon7QKSTOnkiGjEppFDn3Z48MJ1qq8VBw,2868
-pytz/zoneinfo/America/Yakutat,sha256=tFwnKbvwhyyn4LNTAn5ye_JWDdxjCerNDt7oOwUwO2M,2305
-pytz/zoneinfo/America/Yellowknife,sha256=-TkIfc3QlvaCf0p8COZ43Y1HRBAl-nARUi-JdXeK1vE,2332
-pytz/zoneinfo/Antarctica/Casey,sha256=VeaLOxTfDyjfGXq5Ul95JEIMXNWHSW-0N3yOoS7VK-c,423
-pytz/zoneinfo/Antarctica/Davis,sha256=XB12dEq0Q-3XkzBNTNC7G1fzH-WxxctIuZqI3zp8ypI,283
-pytz/zoneinfo/Antarctica/DumontDUrville,sha256=nB36HBWZTdh3TlP0DLFNz1KRQ0aHIfHbp7LC4Urp9fA,172
-pytz/zoneinfo/Antarctica/Macquarie,sha256=ie7RlaU8RHTorVVj-MX8StKMqx_oXf4UH2PUqpzcwe0,2260
-pytz/zoneinfo/Antarctica/Mawson,sha256=EjIFbqRdr2ZJBaI1XvoWRptnnW1LFrlhydxDDuIQjSI,185
-pytz/zoneinfo/Antarctica/McMurdo,sha256=gADjoyPo_QISQU6UJrAgcHp3HDaMoOFRdH-d23uBSyc,2437
-pytz/zoneinfo/Antarctica/Palmer,sha256=HTZY0M8td7oUx5REPgRCHuqKg5V3fjJEi4lYBNL4Etg,1404
-pytz/zoneinfo/Antarctica/Rothera,sha256=_9NY-f8vkozQYrjbUHP5YjcICg0-LuyA9PnIeK123RU,150
-pytz/zoneinfo/Antarctica/South_Pole,sha256=gADjoyPo_QISQU6UJrAgcHp3HDaMoOFRdH-d23uBSyc,2437
-pytz/zoneinfo/Antarctica/Syowa,sha256=oCKH7uafN8R1o-ijXGoT5U1JZxwvoLzJu_2Cqyi2hUM,151
-pytz/zoneinfo/Antarctica/Troll,sha256=fjcYppwr1FnjEssee-RLgGOANzoUyfjse-RGK46PR2E,1148
-pytz/zoneinfo/Antarctica/Vostok,sha256=KfftwdzK6PkMDz0d-D3z4HKIBgY9KqsqHnTnqsPMrUg,213
-pytz/zoneinfo/Arctic/Longyearbyen,sha256=XuR19xoPwaMvrrhJ-MOcbnqmbW1B7HQrl7OnQ2s7BwE,2298
-pytz/zoneinfo/Asia/Aden,sha256=oCKH7uafN8R1o-ijXGoT5U1JZxwvoLzJu_2Cqyi2hUM,151
-pytz/zoneinfo/Asia/Almaty,sha256=lPLWXk2f1mWYRQZFkIrq_5HkhocsUBis0M-yhdDHcBQ,983
-pytz/zoneinfo/Asia/Amman,sha256=Qv4cXXw7KBQWE882cgj0kjQ3wh1vpV1orJ2v2Jjxr2U,1433
-pytz/zoneinfo/Asia/Anadyr,sha256=WqKnHo5IHSWZ08d2sS5ytHtv0MQMoczP3W9zbDDrbYU,1174
-pytz/zoneinfo/Asia/Aqtau,sha256=4n654FZtDssXSfhQszjZG5OmtbE2zo1KbiWcYrFJg00,969
-pytz/zoneinfo/Asia/Aqtobe,sha256=1oFHTb-ybcTqLXm0r1ZOVgdYMTHlGoNs-Pgvux50d3E,997
-pytz/zoneinfo/Asia/Ashgabat,sha256=-sfGnRumio7_Bs8w9YH4xRDWgjB3wBeW7c0C56Qqk64,605
-pytz/zoneinfo/Asia/Ashkhabad,sha256=-sfGnRumio7_Bs8w9YH4xRDWgjB3wBeW7c0C56Qqk64,605
-pytz/zoneinfo/Asia/Atyrau,sha256=_U8COUIE9nG_HKddZE1Q0sPuz3rMwfjwmfnVDY_vSmg,977
-pytz/zoneinfo/Asia/Baghdad,sha256=S-plKI4zCLqI0idGABEk3oRTazNyrIj2T98-EtWtZD8,969
-pytz/zoneinfo/Asia/Bahrain,sha256=wklGY3WPGp-z1OUwb_KOHzRTwBndt1RfDg9Uttt36G4,185
-pytz/zoneinfo/Asia/Baku,sha256=6_hq98SGG0j0JA8qYx96WcIMZSLW4w460QXh_OM_ccg,1213
-pytz/zoneinfo/Asia/Bangkok,sha256=hf_5PVegQcFSS60CjS80C7h-TGOrfQ4ncm83N8VmZkk,185
-pytz/zoneinfo/Asia/Barnaul,sha256=3zeUimLTMrIZE0vX6XHFvB3MoqExoVbE5CSm6GV0zf0,1207
-pytz/zoneinfo/Asia/Beirut,sha256=_Z_2ZAg_iL9vU51JDB8CB04uXBDrf1kLIis-JnXaS2o,2154
-pytz/zoneinfo/Asia/Bishkek,sha256=IOoUyjABILCkXu1rjCIqSwAufRYFklc5YAC4jdhVw6Q,969
-pytz/zoneinfo/Asia/Brunei,sha256=D5qtyWJ_SM8bTQeJJIYhqqojxlVKbrFC1EYMDU9GzXQ,469
-pytz/zoneinfo/Asia/Calcutta,sha256=6Qw0EDbLcgMgDik8s7UTJn4QSjmllPNeGVJU5rwKF88,285
-pytz/zoneinfo/Asia/Chita,sha256=LbSlS23swFkANUScg8zkNR0imANWNfOIaYd39HbLdIQ,1207
-pytz/zoneinfo/Asia/Choibalsan,sha256=qUkXRsTc_u7B90JxULSu7yzKbGtGfKcfEFIasGPC2ec,877
-pytz/zoneinfo/Asia/Chongqing,sha256=ZP_C5DqUQ1oEPAQNHTr36S0DGtx453N68YYbqk7u8-Y,561
-pytz/zoneinfo/Asia/Chungking,sha256=ZP_C5DqUQ1oEPAQNHTr36S0DGtx453N68YYbqk7u8-Y,561
-pytz/zoneinfo/Asia/Colombo,sha256=w52L7bgT4m5hcgRuevIPY83xytfkBmkLhnKMwp16KsY,358
-pytz/zoneinfo/Asia/Dacca,sha256=-xulJ2KVhvKp6rlZLMydpw7oXVirk-riEH-181xPE54,323
-pytz/zoneinfo/Asia/Damascus,sha256=EthGheaHWmy5IrLCc9NmM3jvASQFHt8TsBF07I1tgbg,1873
-pytz/zoneinfo/Asia/Dhaka,sha256=-xulJ2KVhvKp6rlZLMydpw7oXVirk-riEH-181xPE54,323
-pytz/zoneinfo/Asia/Dili,sha256=2A9uFmwSwoFA5o2ek1LA0ucohPnM42ghWvD9D5TdnJk,257
-pytz/zoneinfo/Asia/Dubai,sha256=pmdhPhaJRwKwONvxiZNGeFSICjlWzyY9JlFHv-H9upY,151
-pytz/zoneinfo/Asia/Dushanbe,sha256=koYnnYWuFsBXd1vJfZsGdpwnbFHEwvkGBmSrrx3KIss,577
-pytz/zoneinfo/Asia/Famagusta,sha256=CFrcygd8ude5x6OEtfM_Dw0KYHoxpPPzq46KoHVxjjc,2028
-pytz/zoneinfo/Asia/Gaza,sha256=t0YxcUQL53VNKnKbKijn0OE_MaryEynonabse-iTtzs,3844
-pytz/zoneinfo/Asia/Harbin,sha256=ZP_C5DqUQ1oEPAQNHTr36S0DGtx453N68YYbqk7u8-Y,561
-pytz/zoneinfo/Asia/Hebron,sha256=6Y0USHKx-xoCxCr_WpCuM3olP1vUGnzrcnGiyQFcqdQ,3872
-pytz/zoneinfo/Asia/Ho_Chi_Minh,sha256=Lnv1vpUNAXBo8v0b9d9AQpy-AEyO5Qa2Ig0PvDkjrmU,337
-pytz/zoneinfo/Asia/Hong_Kong,sha256=al_O4kPlq5JpgkLYjEaZzrcgiiLul9NC0R5B69JVWhc,1233
-pytz/zoneinfo/Asia/Hovd,sha256=Zn4PLGlD-URJDsbChor5bqWTzuAil2tbrGJW0j5TLbs,877
-pytz/zoneinfo/Asia/Irkutsk,sha256=IVuoXCwdeI-KIUfFkEt6yBjqYP3V9GTrF-_WLnffFzk,1229
-pytz/zoneinfo/Asia/Istanbul,sha256=Jk4wjndDta_uLWc8W1dWdjbavJJbsL5ROTmZboVnGKU,1933
-pytz/zoneinfo/Asia/Jakarta,sha256=TvEzBvSzfzFCdOsMAZ0QgR95JA5xf3kAZONhy5gEXRE,383
-pytz/zoneinfo/Asia/Jayapura,sha256=ihzUd-L8HUVqG-Na10MyPE-YYwjVFj-xerqjTN4EJZs,221
-pytz/zoneinfo/Asia/Jerusalem,sha256=JUuWQmW5Tha0pJjw61Q5aN7CX0z4D7ops9OOSnda6Dc,2388
-pytz/zoneinfo/Asia/Kabul,sha256=JZEbo8bSj_L7HnXUm2gAUlNlCvJlRJhFkSHCg5o3ggk,194
-pytz/zoneinfo/Asia/Kamchatka,sha256=KY1PlJvRSNkY_5hyJBxj5DDweeYVQaBK05ZgL3kdcCY,1152
-pytz/zoneinfo/Asia/Karachi,sha256=iB-mWMTXUyfBwAkZdz8_UmEw0xsgxIub-KNI7akzhkk,379
-pytz/zoneinfo/Asia/Kashgar,sha256=F1ZOdZZDsVHwDJinksR-hjcqPzqOljvdreZIWFulJxY,151
-pytz/zoneinfo/Asia/Kathmandu,sha256=_RsfeSWbCr8kM4YRJi7Xv6hAEiHW14IFhsXsfhbPjoM,198
-pytz/zoneinfo/Asia/Katmandu,sha256=_RsfeSWbCr8kM4YRJi7Xv6hAEiHW14IFhsXsfhbPjoM,198
-pytz/zoneinfo/Asia/Khandyga,sha256=bKfmw6k5qYDQsEHG3Mv-VYis3YhCeV7qijDxfxQNn_g,1257
-pytz/zoneinfo/Asia/Kolkata,sha256=6Qw0EDbLcgMgDik8s7UTJn4QSjmllPNeGVJU5rwKF88,285
-pytz/zoneinfo/Asia/Krasnoyarsk,sha256=D5KE_1wWSD2YdixDy8n3LBNaAlE1_y3TWXw6NrxFKKA,1193
-pytz/zoneinfo/Asia/Kuala_Lumpur,sha256=XmeVImeqcJ8hJzm7TjAti1nWJAxawOqq7jIzDnHX2hI,401
-pytz/zoneinfo/Asia/Kuching,sha256=D5qtyWJ_SM8bTQeJJIYhqqojxlVKbrFC1EYMDU9GzXQ,469
-pytz/zoneinfo/Asia/Kuwait,sha256=oCKH7uafN8R1o-ijXGoT5U1JZxwvoLzJu_2Cqyi2hUM,151
-pytz/zoneinfo/Asia/Macao,sha256=MvAkRyRsrA2r052ItlyF5bh2FheRjI0jPwg0uIiH2Yk,1227
-pytz/zoneinfo/Asia/Macau,sha256=MvAkRyRsrA2r052ItlyF5bh2FheRjI0jPwg0uIiH2Yk,1227
-pytz/zoneinfo/Asia/Magadan,sha256=HccEEXBQvMmLoC_JE-zP_MlLAZ1WmNLQLfM3tJt55M4,1208
-pytz/zoneinfo/Asia/Makassar,sha256=OhJtCqSTEU-u5n0opBVO5Bu-wQzcYPy9S_6aAhJXgOw,254
-pytz/zoneinfo/Asia/Manila,sha256=ujfq0kl1EhxcYSOrG-FS750aNaYUt1TT4bFuK4EcL_c,328
-pytz/zoneinfo/Asia/Muscat,sha256=pmdhPhaJRwKwONvxiZNGeFSICjlWzyY9JlFHv-H9upY,151
-pytz/zoneinfo/Asia/Nicosia,sha256=0Unm0IFT7HyGeQ7F3vTa_-klfysCgrulqFO6BD1plZU,2002
-pytz/zoneinfo/Asia/Novokuznetsk,sha256=pyxxtSUtYDeVmFk0Cg-F33laZS0iKtde9_GJnL9f0KM,1151
-pytz/zoneinfo/Asia/Novosibirsk,sha256=5K2-Gx15ThlHfolyW85S5zREtAcMjeHBYWK4E8x2LdY,1207
-pytz/zoneinfo/Asia/Omsk,sha256=HyXIWItJXBKVHUzWcQPi1Mmd6ZLmZk-QhRUo9Kv2XOI,1193
-pytz/zoneinfo/Asia/Oral,sha256=WQT4qRmC9RI_ll8zB9FvkAL8ezGb8qoqWd75GTlC7kQ,991
-pytz/zoneinfo/Asia/Phnom_Penh,sha256=hf_5PVegQcFSS60CjS80C7h-TGOrfQ4ncm83N8VmZkk,185
-pytz/zoneinfo/Asia/Pontianak,sha256=inOXwuKtjKv1z_eliPZSIqjSt6whtuxhPeG1YpjU_BQ,353
-pytz/zoneinfo/Asia/Pyongyang,sha256=_-g3GnDAtfDX4XAktXH9jFouLUDmOovnjoOfvRpUDsE,237
-pytz/zoneinfo/Asia/Qatar,sha256=wklGY3WPGp-z1OUwb_KOHzRTwBndt1RfDg9Uttt36G4,185
-pytz/zoneinfo/Asia/Qostanay,sha256=HIjln8QIPNRU6MkWzyPi6vDrjlmVZ4XzFxcUHtXMi7s,1025
-pytz/zoneinfo/Asia/Qyzylorda,sha256=JZLNN6NuLkqaWEeVaCZiW_gL6BrIFL9lr65iK7myVPg,1011
-pytz/zoneinfo/Asia/Rangoon,sha256=_YHASq4Z5YcUILIdhEzg27CGLzarUHPDHs1Dj0QgNGM,254
-pytz/zoneinfo/Asia/Riyadh,sha256=oCKH7uafN8R1o-ijXGoT5U1JZxwvoLzJu_2Cqyi2hUM,151
-pytz/zoneinfo/Asia/Saigon,sha256=Lnv1vpUNAXBo8v0b9d9AQpy-AEyO5Qa2Ig0PvDkjrmU,337
-pytz/zoneinfo/Asia/Sakhalin,sha256=xzAor82ihAe-yXEwC6OWiMzo9b6Z-oQl39NIkU5Hhbs,1188
-pytz/zoneinfo/Asia/Samarkand,sha256=zJKSRt3lEvd6Qvg9b49QAyO4cTJyVnTKyPYcyudpHxk,563
-pytz/zoneinfo/Asia/Seoul,sha256=LI9LsV3XcJC0l-KoQf8zI-y7rk-du57erS-N2Ptdi7Q,617
-pytz/zoneinfo/Asia/Shanghai,sha256=ZP_C5DqUQ1oEPAQNHTr36S0DGtx453N68YYbqk7u8-Y,561
-pytz/zoneinfo/Asia/Singapore,sha256=XmeVImeqcJ8hJzm7TjAti1nWJAxawOqq7jIzDnHX2hI,401
-pytz/zoneinfo/Asia/Srednekolymsk,sha256=efaaT8iFHrcccp-VZKNMvtTuPLNjG5V9JH5KKHhH3SI,1194
-pytz/zoneinfo/Asia/Taipei,sha256=DMmQwOpPql25ue3Nf8vAKKT4em06D1Z9rHbLIitxixk,761
-pytz/zoneinfo/Asia/Tashkent,sha256=apRPy251fSRy_ixsg3BOZNmUbHdO86P5-PdgC1Xws7U,577
-pytz/zoneinfo/Asia/Tbilisi,sha256=zQ-2bVq5_USUSbwN6q0qvWjD-HXkKaH4ifMVq1lEeIM,1021
-pytz/zoneinfo/Asia/Tehran,sha256=LQMch2TMA4wI23SQzoIrlZh0_KceXQegurwxCZ5YDlY,1248
-pytz/zoneinfo/Asia/Tel_Aviv,sha256=JUuWQmW5Tha0pJjw61Q5aN7CX0z4D7ops9OOSnda6Dc,2388
-pytz/zoneinfo/Asia/Thimbu,sha256=G2nTQVEMmKlWt0B74_fUAL7KQ3YAu__J6HciiYs2IyU,189
-pytz/zoneinfo/Asia/Thimphu,sha256=G2nTQVEMmKlWt0B74_fUAL7KQ3YAu__J6HciiYs2IyU,189
-pytz/zoneinfo/Asia/Tokyo,sha256=oCueZgRNxcNcX3ZGdif9y6Su4cyVhga4XHdwlcrYLOs,309
-pytz/zoneinfo/Asia/Tomsk,sha256=cr0ULZgWBnQfzDiJeYmqpA7Xo5QRzurvrHsrbZsnhOQ,1207
-pytz/zoneinfo/Asia/Ujung_Pandang,sha256=OhJtCqSTEU-u5n0opBVO5Bu-wQzcYPy9S_6aAhJXgOw,254
-pytz/zoneinfo/Asia/Ulaanbaatar,sha256=qUkXRsTc_u7B90JxULSu7yzKbGtGfKcfEFIasGPC2ec,877
-pytz/zoneinfo/Asia/Ulan_Bator,sha256=qUkXRsTc_u7B90JxULSu7yzKbGtGfKcfEFIasGPC2ec,877
-pytz/zoneinfo/Asia/Urumqi,sha256=F1ZOdZZDsVHwDJinksR-hjcqPzqOljvdreZIWFulJxY,151
-pytz/zoneinfo/Asia/Ust-Nera,sha256=zsG8kgnw0Fcs5N2WwNTVmvWkTlpwf7Oo8y68HcXjYyw,1238
-pytz/zoneinfo/Asia/Vientiane,sha256=hf_5PVegQcFSS60CjS80C7h-TGOrfQ4ncm83N8VmZkk,185
-pytz/zoneinfo/Asia/Vladivostok,sha256=XMQLMh5SPbI6C4R3UO4KhbnG4hWVkHNedzCQeqxFk6A,1194
-pytz/zoneinfo/Asia/Yakutsk,sha256=PPNrRGgg9jefOUM-6M8XqaIm-ElfmRZSWAtSGKLzNXQ,1193
-pytz/zoneinfo/Asia/Yangon,sha256=_YHASq4Z5YcUILIdhEzg27CGLzarUHPDHs1Dj0QgNGM,254
-pytz/zoneinfo/Asia/Yekaterinburg,sha256=4NyEW6Xjr4UsWPh63HIPI4G6GT_tVG1Xkgc2xbwGjzA,1229
-pytz/zoneinfo/Asia/Yerevan,sha256=FM0pUA4NbTWBb_CsJ5KCLVrLoNmad7njBKqFrJBDoxE,1137
-pytz/zoneinfo/Atlantic/Azores,sha256=66hDxaK8xFnktLMrpNxkD4r1gGkhS-PEpleuwzuGRA0,3442
-pytz/zoneinfo/Atlantic/Bermuda,sha256=LNGKfMsnYvwImjTyzXrLhMOHHDu7qI67RbYNKvvI15I,2396
-pytz/zoneinfo/Atlantic/Canary,sha256=ymK9ufqphvNjDK3hzikN4GfkcR3QeCBiPKyVc6FjlbA,1897
-pytz/zoneinfo/Atlantic/Cape_Verde,sha256=o92pLdLFX_b9vUiq3rNpca4tupIO3dx9rNrnPcA8474,256
-pytz/zoneinfo/Atlantic/Faeroe,sha256=NibdZPZtapnYR_myIZnMdTaSKGsOBGgujj0_T2NvAzs,1815
-pytz/zoneinfo/Atlantic/Faroe,sha256=NibdZPZtapnYR_myIZnMdTaSKGsOBGgujj0_T2NvAzs,1815
-pytz/zoneinfo/Atlantic/Jan_Mayen,sha256=XuR19xoPwaMvrrhJ-MOcbnqmbW1B7HQrl7OnQ2s7BwE,2298
-pytz/zoneinfo/Atlantic/Madeira,sha256=lYY85MC5-GUKExm353ixwtZDxasYavTTWELvv5RXLxE,3377
-pytz/zoneinfo/Atlantic/Reykjavik,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Atlantic/South_Georgia,sha256=I9SAcPPumy6Xf9P7dg2aE16oxwDIqyKFqinJTC-XsgM,150
-pytz/zoneinfo/Atlantic/St_Helena,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Atlantic/Stanley,sha256=siEjXTAuTum_4XGtS98MBE34XW_5xgXShEX5OMnSFjo,1200
-pytz/zoneinfo/Australia/ACT,sha256=QsOFdYWxbbL4_9R7oZ-qYPRzNA3o1P6TIOp76GFgWQY,2190
-pytz/zoneinfo/Australia/Adelaide,sha256=ld2EbxU75oVgmPe703z-I6aqLg0Kmv62ZcCGzkT5R20,2208
-pytz/zoneinfo/Australia/Brisbane,sha256=eW6Qzze2t0-speJmmvt1JMzbkSadIKdE84XHc7JUtGc,419
-pytz/zoneinfo/Australia/Broken_Hill,sha256=3k_3ljTvS5GSfo7Xh6w71UgR3aAwYPBsnCJ-mlEYCqQ,2229
-pytz/zoneinfo/Australia/Canberra,sha256=QsOFdYWxbbL4_9R7oZ-qYPRzNA3o1P6TIOp76GFgWQY,2190
-pytz/zoneinfo/Australia/Currie,sha256=GLQSzgIfsWxOvmKOrhpfofWqINQf6h36NYy3mcq6gcg,2358
-pytz/zoneinfo/Australia/Darwin,sha256=fn0IZhIW98FAnzLig-_GBtW5LA54jajdeeUzg4tCGvo,325
-pytz/zoneinfo/Australia/Eucla,sha256=i1-XGG8I6E0dXIdWGF4DlkfDLWhiAxJ_3gMpt-nm_u4,456
-pytz/zoneinfo/Australia/Hobart,sha256=GLQSzgIfsWxOvmKOrhpfofWqINQf6h36NYy3mcq6gcg,2358
-pytz/zoneinfo/Australia/LHI,sha256=oyPFQzmRqWPrSXt9pNHQmEi_PvX11k2clknziOS6ud8,1846
-pytz/zoneinfo/Australia/Lindeman,sha256=xM6Udx22oLNoLR1Y7GQhHOYov8nw3xQNqgc_NVQ2JK4,475
-pytz/zoneinfo/Australia/Lord_Howe,sha256=oyPFQzmRqWPrSXt9pNHQmEi_PvX11k2clknziOS6ud8,1846
-pytz/zoneinfo/Australia/Melbourne,sha256=lvx_MQcunMc6u2smIrl8X427bLsXvjkgpCSdjYCTNBM,2190
-pytz/zoneinfo/Australia/NSW,sha256=QsOFdYWxbbL4_9R7oZ-qYPRzNA3o1P6TIOp76GFgWQY,2190
-pytz/zoneinfo/Australia/North,sha256=fn0IZhIW98FAnzLig-_GBtW5LA54jajdeeUzg4tCGvo,325
-pytz/zoneinfo/Australia/Perth,sha256=Al1DOUh4U_ofMUQSeVlzSyD3x7SUjP9dchSaBUGmeWg,446
-pytz/zoneinfo/Australia/Queensland,sha256=eW6Qzze2t0-speJmmvt1JMzbkSadIKdE84XHc7JUtGc,419
-pytz/zoneinfo/Australia/South,sha256=ld2EbxU75oVgmPe703z-I6aqLg0Kmv62ZcCGzkT5R20,2208
-pytz/zoneinfo/Australia/Sydney,sha256=QsOFdYWxbbL4_9R7oZ-qYPRzNA3o1P6TIOp76GFgWQY,2190
-pytz/zoneinfo/Australia/Tasmania,sha256=GLQSzgIfsWxOvmKOrhpfofWqINQf6h36NYy3mcq6gcg,2358
-pytz/zoneinfo/Australia/Victoria,sha256=lvx_MQcunMc6u2smIrl8X427bLsXvjkgpCSdjYCTNBM,2190
-pytz/zoneinfo/Australia/West,sha256=Al1DOUh4U_ofMUQSeVlzSyD3x7SUjP9dchSaBUGmeWg,446
-pytz/zoneinfo/Australia/Yancowinna,sha256=3k_3ljTvS5GSfo7Xh6w71UgR3aAwYPBsnCJ-mlEYCqQ,2229
-pytz/zoneinfo/Brazil/Acre,sha256=0gpJUl46hQbp0P6Xj1S0NArIWeAryuuDXjsldvB5GHE,614
-pytz/zoneinfo/Brazil/DeNoronha,sha256=feeRAijQqKylZgqe84nKhsFLycT5zIBm7mLIvdyGw4w,702
-pytz/zoneinfo/Brazil/East,sha256=BMBnRO4_4HjvO4t3njjrMGZr-ZPmegkvyvL8KPY6ZM4,1430
-pytz/zoneinfo/Brazil/West,sha256=F6RLOOeOi9lymZiQmQ9pR8tFpPZ6EguNdPfOc6BhXDE,590
-pytz/zoneinfo/CET,sha256=gS9Vrrbozend9HhuFetCVrIegs9fXSjaG60X2UVwysA,2933
-pytz/zoneinfo/CST6CDT,sha256=_roybr6I6sIAF6cYdIxGxoRpoef153Fty48dQ6bm9oY,3592
-pytz/zoneinfo/Canada/Atlantic,sha256=TZpmc5PwWoLfTfQoQ_b3U17BE2iVKSeNkR0Ho8mbTn8,3424
-pytz/zoneinfo/Canada/Central,sha256=7P-_YQrneFcon7QKSTOnkiGjEppFDn3Z48MJ1qq8VBw,2868
-pytz/zoneinfo/Canada/Eastern,sha256=pYehoWB0Ofe6woPhgV8r26-5ZJpFPRjgbC5E5pltiI8,3494
-pytz/zoneinfo/Canada/Mountain,sha256=-TkIfc3QlvaCf0p8COZ43Y1HRBAl-nARUi-JdXeK1vE,2332
-pytz/zoneinfo/Canada/Newfoundland,sha256=r1-17uKv27eZ3JsVkw_DLZQbo6wvjuuVu7C2pDsmOgI,3655
-pytz/zoneinfo/Canada/Pacific,sha256=sknKH0jSPWam-DHfM35qXs8Nam7d5TFlkUI9Sgxryyg,2892
-pytz/zoneinfo/Canada/Saskatchewan,sha256=yjqT08pHbICYe83H8JmtaDBvCFqRv7Tfze3Y8xuXukw,980
-pytz/zoneinfo/Canada/Yukon,sha256=TrR6PCnYG-mSClBMohqlP8qnYhXMUsydI-L-quXFxyM,1614
-pytz/zoneinfo/Chile/Continental,sha256=0CDw13dCMUsoquMupoJgupkzAUNhDK6E0lVxURA7osA,2515
-pytz/zoneinfo/Chile/EasterIsland,sha256=QbubBs_xQlvKweAnurhyHjIK4ji77Gh4G-usXul6XVM,2219
-pytz/zoneinfo/Cuba,sha256=HUQeAuKBsEkI5SLZjqynXICOUVOajkKzKH5r-Ov5Odc,2416
-pytz/zoneinfo/EET,sha256=XDY-FBUddRyQHN8GxQLZ4awjuOlWlzlUdjv7OdXFNzA,2262
-pytz/zoneinfo/EST,sha256=kayA_pdpMcSQ0FjIzotdcf-m1JYfbKE-qcFT8LC8zqA,182
-pytz/zoneinfo/EST5EDT,sha256=6e0H177gx2qdRC0JHvHwFmj-58TyYBTAqGixn-bBipU,3552
-pytz/zoneinfo/Egypt,sha256=Lft-GCLQhaSJm9VqUmsEFoHIS1Vhfa7pFJn9GZCpifs,2399
-pytz/zoneinfo/Eire,sha256=QOjSocO1cihNo59vQkWxvIFPRSxE9apz0KARVx1czEM,3492
-pytz/zoneinfo/Etc/GMT,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/Etc/GMT+0,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/Etc/GMT+1,sha256=1Qzl2X9rQ_RXEf11yH09wQZCr_ph6UdFP7E0yu9s-IQ,116
-pytz/zoneinfo/Etc/GMT+10,sha256=JEQyQyQlkC0o6ZTdeVjZhCIOh6cK5TF7H00Pkls-sUI,117
-pytz/zoneinfo/Etc/GMT+11,sha256=tWvcvYMFCaE60nJVvDrrov7stJvs1KQYOyrhl3dzcUs,117
-pytz/zoneinfo/Etc/GMT+12,sha256=b70HEhErq8IJmq8x7cOZy4eR__3fq5uHHpjvPBEHqMA,117
-pytz/zoneinfo/Etc/GMT+2,sha256=T6Ep5zhslBKbYaECFUB6gUKh3iTZPyMoW1kjhonxrUo,116
-pytz/zoneinfo/Etc/GMT+3,sha256=QGoYrE04bUJ-OzL37dt2MZT5FxWNLpJDPVXgJbstYZA,116
-pytz/zoneinfo/Etc/GMT+4,sha256=RWrkNki-wV7X-coe0VvufBe6LrWVpkPJgia5QQYEnBo,116
-pytz/zoneinfo/Etc/GMT+5,sha256=oRmeC41dgYXT-zzyZIRKXN9IvdL2Da5nTuwmG2_prIA,116
-pytz/zoneinfo/Etc/GMT+6,sha256=d6dAnwiejyFI2n7AzFlFW0aFAT6zYNEjBIEG0uu0sbQ,116
-pytz/zoneinfo/Etc/GMT+7,sha256=TqjYbzd0YHpx1wisFg08J19wTpg6ztJLLongZY_lozs,116
-pytz/zoneinfo/Etc/GMT+8,sha256=th_8bIMmYgRPCesBrbmBhRr0jQO7whd70LiY9HfwJyk,116
-pytz/zoneinfo/Etc/GMT+9,sha256=Qq5E6iUS7JMJIymT7YoqlI8MtqtVy0mr9t6zWFtWc9Y,116
-pytz/zoneinfo/Etc/GMT-0,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/Etc/GMT-1,sha256=73F1eU8uAQGP3mcoB2q99CjfManGFHk3fefljp9pYC4,117
-pytz/zoneinfo/Etc/GMT-10,sha256=fKWWNwLBOp1OkKjtc1w9LIXJR1mTTD-JdvYflRy1IrU,118
-pytz/zoneinfo/Etc/GMT-11,sha256=D2S79n6psa9t9_2vj5wIrFpHH2OJLcCKP6vtwzFZINY,118
-pytz/zoneinfo/Etc/GMT-12,sha256=me4V6lmWI8gSr8H7N41WAD0Eww1anh_EF34Qr9UoSnI,118
-pytz/zoneinfo/Etc/GMT-13,sha256=xbmbG1BQA6Dlpa_iUwEGyJxW4a3t6lmawdPKAE8vbR8,118
-pytz/zoneinfo/Etc/GMT-14,sha256=PpXoREBh02qFpvxVMj2pV9IAzSQvBE7XPvnN9qSZ-Kc,118
-pytz/zoneinfo/Etc/GMT-2,sha256=ve6hWLdeuiLhqagaWLqMD6HNybS1chRwjudfTZ2bYBE,117
-pytz/zoneinfo/Etc/GMT-3,sha256=N77jILanuLDVkLsdujXZSu-dsHiwN5MIpwh7fMUifso,117
-pytz/zoneinfo/Etc/GMT-4,sha256=LSko5fVHqPl5zfwjGqkbMa_OFnvtpT6o_4xYxNz9n5o,117
-pytz/zoneinfo/Etc/GMT-5,sha256=uLaSR5Mb18HRTsAA5SveY9PAJ97dO8QzIWqNXe3wZb4,117
-pytz/zoneinfo/Etc/GMT-6,sha256=JSN-RUAphJ50fpIv7cYC6unrtrz9S1Wma-piDHlGe7c,117
-pytz/zoneinfo/Etc/GMT-7,sha256=vVAOF8xU9T9ESnw68c0SFXpcvkoopaiwTR0zbefHHSU,117
-pytz/zoneinfo/Etc/GMT-8,sha256=S7xFQbFMpiDZy4v5L4D9fCrjRIzzoLC5p8Se23xi7us,117
-pytz/zoneinfo/Etc/GMT-9,sha256=I5vHNmUK-Yyg_S1skFN44VGVzBgktjFgVQiDIKO4aMI,117
-pytz/zoneinfo/Etc/GMT0,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/Etc/Greenwich,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/Etc/UCT,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/Etc/UTC,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/Etc/Universal,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/Etc/Zulu,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/Europe/Amsterdam,sha256=gS9Vrrbozend9HhuFetCVrIegs9fXSjaG60X2UVwysA,2933
-pytz/zoneinfo/Europe/Andorra,sha256=gTB5jCQmvIw3JJi1_vAcOYuhtzPBR6RXUx9gVV6p6ug,1742
-pytz/zoneinfo/Europe/Astrakhan,sha256=ZeGDZjwVVRoeR-J642zEnN26BPL58ViTJLbwnk7pLXk,1151
-pytz/zoneinfo/Europe/Athens,sha256=XDY-FBUddRyQHN8GxQLZ4awjuOlWlzlUdjv7OdXFNzA,2262
-pytz/zoneinfo/Europe/Belfast,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/Europe/Belgrade,sha256=OpWtsGFWBE_S-mYoQcAmjCta9HwbGQANnSmVY9OHCTo,1920
-pytz/zoneinfo/Europe/Berlin,sha256=XuR19xoPwaMvrrhJ-MOcbnqmbW1B7HQrl7OnQ2s7BwE,2298
-pytz/zoneinfo/Europe/Bratislava,sha256=G9fdhUXmzx651BnyZ6V7AOYIV9EV5aMJMm44eJaLLZw,2301
-pytz/zoneinfo/Europe/Brussels,sha256=gS9Vrrbozend9HhuFetCVrIegs9fXSjaG60X2UVwysA,2933
-pytz/zoneinfo/Europe/Bucharest,sha256=nfg6-bU2D6DMEWb9EMIBR5kxnNsbDSx0UKfHH_ZzqFc,2184
-pytz/zoneinfo/Europe/Budapest,sha256=lNwqxWciBvw9ei81VQwIKHbC_ZDJjpgHU6HFg4wCUkY,2368
-pytz/zoneinfo/Europe/Busingen,sha256=K5QY7Ujj2VUchKR4bhhb0hgdAJhmwED71ykXDQOGKe8,1909
-pytz/zoneinfo/Europe/Chisinau,sha256=p1J_rqFE13pL8cpBRrEFe-teCI8f0fKK4uTUy_4diF4,2390
-pytz/zoneinfo/Europe/Copenhagen,sha256=XuR19xoPwaMvrrhJ-MOcbnqmbW1B7HQrl7OnQ2s7BwE,2298
-pytz/zoneinfo/Europe/Dublin,sha256=QOjSocO1cihNo59vQkWxvIFPRSxE9apz0KARVx1czEM,3492
-pytz/zoneinfo/Europe/Gibraltar,sha256=a87WpaBlvxI4gAU9OpQOkN8VUJbirVWYf-VfFLTIoS4,3068
-pytz/zoneinfo/Europe/Guernsey,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/Europe/Helsinki,sha256=GEkB7LsVhmegt7YuuWheCDvDGC7b7Nw9bTdDGS9qkJc,1900
-pytz/zoneinfo/Europe/Isle_of_Man,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/Europe/Istanbul,sha256=Jk4wjndDta_uLWc8W1dWdjbavJJbsL5ROTmZboVnGKU,1933
-pytz/zoneinfo/Europe/Jersey,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/Europe/Kaliningrad,sha256=s7GXSe1YvMcs7AiUhHNTA6I4nAOQn_Kmz_ZqJYO-LMM,1493
-pytz/zoneinfo/Europe/Kiev,sha256=-wrpG9jPuIKFP1NgBVvnxsMRf9L_h5z3J6Q3jj1AwNM,2120
-pytz/zoneinfo/Europe/Kirov,sha256=P7T2Zf5Eo6o4L4Dbg_BfiFjUgTj0dQXlrwY-QZ1eBVk,1185
-pytz/zoneinfo/Europe/Kyiv,sha256=-wrpG9jPuIKFP1NgBVvnxsMRf9L_h5z3J6Q3jj1AwNM,2120
-pytz/zoneinfo/Europe/Lisbon,sha256=krB8skaJImv5NDCNHxvTPDBqpNphDFLNW84lB3lgUCw,3527
-pytz/zoneinfo/Europe/Ljubljana,sha256=OpWtsGFWBE_S-mYoQcAmjCta9HwbGQANnSmVY9OHCTo,1920
-pytz/zoneinfo/Europe/London,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/Europe/Luxembourg,sha256=gS9Vrrbozend9HhuFetCVrIegs9fXSjaG60X2UVwysA,2933
-pytz/zoneinfo/Europe/Madrid,sha256=mkLX03rW3t0tmzKBIPe_noUvaFDErwC6_5ZPZZsWHOo,2614
-pytz/zoneinfo/Europe/Malta,sha256=EhKcbPL47765tWAiQ57cusaK2TaIQqZCgtJoEZs3Ud0,2620
-pytz/zoneinfo/Europe/Mariehamn,sha256=GEkB7LsVhmegt7YuuWheCDvDGC7b7Nw9bTdDGS9qkJc,1900
-pytz/zoneinfo/Europe/Minsk,sha256=KgPm0fHycntgd3xbTmmDl4O13Xh_9e2zUnd8XFSU29o,1307
-pytz/zoneinfo/Europe/Monaco,sha256=q3ehSIot1GZ6TyMHIjbg0oRf4ghAXuwbSDSYVim6evg,2962
-pytz/zoneinfo/Europe/Moscow,sha256=KmkofRcj6T8Ph28PJChm8JVp13uRvef6TZ0GuPzUiDw,1535
-pytz/zoneinfo/Europe/Nicosia,sha256=0Unm0IFT7HyGeQ7F3vTa_-klfysCgrulqFO6BD1plZU,2002
-pytz/zoneinfo/Europe/Oslo,sha256=XuR19xoPwaMvrrhJ-MOcbnqmbW1B7HQrl7OnQ2s7BwE,2298
-pytz/zoneinfo/Europe/Paris,sha256=q3ehSIot1GZ6TyMHIjbg0oRf4ghAXuwbSDSYVim6evg,2962
-pytz/zoneinfo/Europe/Podgorica,sha256=OpWtsGFWBE_S-mYoQcAmjCta9HwbGQANnSmVY9OHCTo,1920
-pytz/zoneinfo/Europe/Prague,sha256=G9fdhUXmzx651BnyZ6V7AOYIV9EV5aMJMm44eJaLLZw,2301
-pytz/zoneinfo/Europe/Riga,sha256=hJ2_0m1taW9IuA-hMyP5n-WX7YOrR0heKszJhgljRWk,2198
-pytz/zoneinfo/Europe/Rome,sha256=1a3oLMSiMpSbh9QxV8hLLDVbZqash89iUO1urYC1AY8,2641
-pytz/zoneinfo/Europe/Samara,sha256=nXL0IxbT6qu10CNuaDHxx4W1OaAnaaKTtIJ9N9URMoU,1201
-pytz/zoneinfo/Europe/San_Marino,sha256=1a3oLMSiMpSbh9QxV8hLLDVbZqash89iUO1urYC1AY8,2641
-pytz/zoneinfo/Europe/Sarajevo,sha256=OpWtsGFWBE_S-mYoQcAmjCta9HwbGQANnSmVY9OHCTo,1920
-pytz/zoneinfo/Europe/Saratov,sha256=ygwjvXN13TgaWxjg6ysWEnHWNxwrVtkEbrk8t9bzVVw,1169
-pytz/zoneinfo/Europe/Simferopol,sha256=tzl7xdNVSZprNCul4YE5LSpoR9JoujmOq8VbbB8wHic,1469
-pytz/zoneinfo/Europe/Skopje,sha256=OpWtsGFWBE_S-mYoQcAmjCta9HwbGQANnSmVY9OHCTo,1920
-pytz/zoneinfo/Europe/Sofia,sha256=hCQKXfMNrnA5xHNw_uzTjKzVw4-Bvsq5oGO4yUCv5tY,2077
-pytz/zoneinfo/Europe/Stockholm,sha256=XuR19xoPwaMvrrhJ-MOcbnqmbW1B7HQrl7OnQ2s7BwE,2298
-pytz/zoneinfo/Europe/Tallinn,sha256=4a6JC0aIpMzqIV7O35zoG0LLJwkQq5AoXZ2ivkic6-w,2148
-pytz/zoneinfo/Europe/Tirane,sha256=ztlZyCS9WCXeVW8nBun3Tyi5HUY0EtFbiBbEc1gucuw,2084
-pytz/zoneinfo/Europe/Tiraspol,sha256=p1J_rqFE13pL8cpBRrEFe-teCI8f0fKK4uTUy_4diF4,2390
-pytz/zoneinfo/Europe/Ulyanovsk,sha256=c8Ad5p7CKj_1cCA7lVRpcPqbQXGYaX83cuu6uIFx-Bg,1253
-pytz/zoneinfo/Europe/Uzhgorod,sha256=-wrpG9jPuIKFP1NgBVvnxsMRf9L_h5z3J6Q3jj1AwNM,2120
-pytz/zoneinfo/Europe/Vaduz,sha256=K5QY7Ujj2VUchKR4bhhb0hgdAJhmwED71ykXDQOGKe8,1909
-pytz/zoneinfo/Europe/Vatican,sha256=1a3oLMSiMpSbh9QxV8hLLDVbZqash89iUO1urYC1AY8,2641
-pytz/zoneinfo/Europe/Vienna,sha256=ZmI3kADE6bnrJEccqh73XXBY36L1G4DkpiTQImtNrUk,2200
-pytz/zoneinfo/Europe/Vilnius,sha256=UFzRX3orCTB8d9IzlxJPy5eUA2oBPuCu1UJl-2D7C3U,2162
-pytz/zoneinfo/Europe/Volgograd,sha256=RgFvt7mzZ-TtIKL9BVHmoNZLIeLIuiDdXeY10g2_vks,1193
-pytz/zoneinfo/Europe/Warsaw,sha256=TiLDPbeVF0ckgLVEkaSeDaKZ8wctdJDOl_HE_Wd5rKs,2654
-pytz/zoneinfo/Europe/Zagreb,sha256=OpWtsGFWBE_S-mYoQcAmjCta9HwbGQANnSmVY9OHCTo,1920
-pytz/zoneinfo/Europe/Zaporozhye,sha256=-wrpG9jPuIKFP1NgBVvnxsMRf9L_h5z3J6Q3jj1AwNM,2120
-pytz/zoneinfo/Europe/Zurich,sha256=K5QY7Ujj2VUchKR4bhhb0hgdAJhmwED71ykXDQOGKe8,1909
-pytz/zoneinfo/Factory,sha256=aFFlKx93HXoJoF4SSuTlD8cZtJA-ne5oKzAa6eX2V4k,116
-pytz/zoneinfo/GB,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/GB-Eire,sha256=yFSVBw3KQmh99qHD7ngKJ8vLgvGER1Dqb2QoM6RNKbQ,3664
-pytz/zoneinfo/GMT,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/GMT+0,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/GMT-0,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/GMT0,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/Greenwich,sha256=bZ83iIPAefhsA4elVHqSxEmGnYBuB94QCEqwTwJJAY0,114
-pytz/zoneinfo/HST,sha256=fwPRv1Jk56sCOi75uZfd_Iy2k2aSQHx3B2K5xUlSPzM,329
-pytz/zoneinfo/Hongkong,sha256=al_O4kPlq5JpgkLYjEaZzrcgiiLul9NC0R5B69JVWhc,1233
-pytz/zoneinfo/Iceland,sha256=0u-sTl8j2IyV1ywdtCgHFw9S9D3ZiiBa9akqkbny2Zc,148
-pytz/zoneinfo/Indian/Antananarivo,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Indian/Chagos,sha256=2errXzKdFIcpU0L-XRhSHxhNabIzbI5lXV3Pq6lt40Y,185
-pytz/zoneinfo/Indian/Christmas,sha256=hf_5PVegQcFSS60CjS80C7h-TGOrfQ4ncm83N8VmZkk,185
-pytz/zoneinfo/Indian/Cocos,sha256=_YHASq4Z5YcUILIdhEzg27CGLzarUHPDHs1Dj0QgNGM,254
-pytz/zoneinfo/Indian/Comoro,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Indian/Kerguelen,sha256=F73ffVfBoUoHre0-DwsiQrYJcLpPOW-JJGk3n88lM5U,185
-pytz/zoneinfo/Indian/Mahe,sha256=pmdhPhaJRwKwONvxiZNGeFSICjlWzyY9JlFHv-H9upY,151
-pytz/zoneinfo/Indian/Maldives,sha256=F73ffVfBoUoHre0-DwsiQrYJcLpPOW-JJGk3n88lM5U,185
-pytz/zoneinfo/Indian/Mauritius,sha256=Znqrc1chimlciJsYBOl0NvIHnrNdCxncGxWczq1PBeI,227
-pytz/zoneinfo/Indian/Mayotte,sha256=yJsuJTqJJqbOz37_NOS_zbf-JNr_IthHGMMN7sDqSWg,265
-pytz/zoneinfo/Indian/Reunion,sha256=pmdhPhaJRwKwONvxiZNGeFSICjlWzyY9JlFHv-H9upY,151
-pytz/zoneinfo/Iran,sha256=LQMch2TMA4wI23SQzoIrlZh0_KceXQegurwxCZ5YDlY,1248
-pytz/zoneinfo/Israel,sha256=JUuWQmW5Tha0pJjw61Q5aN7CX0z4D7ops9OOSnda6Dc,2388
-pytz/zoneinfo/Jamaica,sha256=wlagieUPRf5-beie-h7QsONbNzjGsm8vMs8uf28pw28,482
-pytz/zoneinfo/Japan,sha256=oCueZgRNxcNcX3ZGdif9y6Su4cyVhga4XHdwlcrYLOs,309
-pytz/zoneinfo/Kwajalein,sha256=TmZ_0f-ySQ-saBAlRXV0f49Itwne51VBXn6rWcrWqHQ,302
-pytz/zoneinfo/Libya,sha256=W1dptGD70T7ppGoo0fczFQeDiIp0nultLNPV66MwB2c,625
-pytz/zoneinfo/MET,sha256=gS9Vrrbozend9HhuFetCVrIegs9fXSjaG60X2UVwysA,2933
-pytz/zoneinfo/MST,sha256=illz0sYuLL8lIPK0Tkou6dL0Vck_D0W_3rRTOvFYRmQ,360
-pytz/zoneinfo/MST7MDT,sha256=MugZwApDs8NI9TnXANQlUE8guNBowWQY0m-ptpPndck,2460
-pytz/zoneinfo/Mexico/BajaNorte,sha256=SluV7xzZm24LgMXSUVt1cD1AlE7y_bdE65HhDIdXLcs,2458
-pytz/zoneinfo/Mexico/BajaSur,sha256=BWH2NqVPA1PsyELPN_2BF8KllrsmQkqg1eujsQvnnx8,1060
-pytz/zoneinfo/Mexico/General,sha256=Uog2-FMWz2o12jR6sK9vemJamLeo6OEFMQR3s0xTxkc,1222
-pytz/zoneinfo/NZ,sha256=gADjoyPo_QISQU6UJrAgcHp3HDaMoOFRdH-d23uBSyc,2437
-pytz/zoneinfo/NZ-CHAT,sha256=xhexVc5lfJ_qAv2d3HrII6lfRSxKZYBAjY2zpYkCGE8,2054
-pytz/zoneinfo/Navajo,sha256=MugZwApDs8NI9TnXANQlUE8guNBowWQY0m-ptpPndck,2460
-pytz/zoneinfo/PRC,sha256=ZP_C5DqUQ1oEPAQNHTr36S0DGtx453N68YYbqk7u8-Y,561
-pytz/zoneinfo/PST8PDT,sha256=aJd7ua1tGG_vxser02AQpm4wAI3LLTdgh6QcSYYecmg,2852
-pytz/zoneinfo/Pacific/Apia,sha256=M3QKsp75Q7H1X3aeE_9ZqQli9aEkNCCQctZQ5sEKu00,598
-pytz/zoneinfo/Pacific/Auckland,sha256=gADjoyPo_QISQU6UJrAgcHp3HDaMoOFRdH-d23uBSyc,2437
-pytz/zoneinfo/Pacific/Bougainville,sha256=hWE86eXnNx-vABbp7-YSIqWyecHPMIWLftVloAoPhL8,254
-pytz/zoneinfo/Pacific/Chatham,sha256=xhexVc5lfJ_qAv2d3HrII6lfRSxKZYBAjY2zpYkCGE8,2054
-pytz/zoneinfo/Pacific/Chuuk,sha256=nB36HBWZTdh3TlP0DLFNz1KRQ0aHIfHbp7LC4Urp9fA,172
-pytz/zoneinfo/Pacific/Easter,sha256=QbubBs_xQlvKweAnurhyHjIK4ji77Gh4G-usXul6XVM,2219
-pytz/zoneinfo/Pacific/Efate,sha256=oSxNcQYx5-1FU2_yHzHI-hT-dMJcPxzy4XmdI1UxXAo,524
-pytz/zoneinfo/Pacific/Enderbury,sha256=HNTAKrsH_R2W3QRlKcmNld5KcXdP0ygXCjEovc1i-6Q,220
-pytz/zoneinfo/Pacific/Fakaofo,sha256=qOodpTMKjztvZIXVLe_f_kZ6WcHl9fCLE9ZsyvdFKLI,186
-pytz/zoneinfo/Pacific/Fiji,sha256=jB5FbOsCnHVQQ2ohPiWEQUPhG6JybB3Nog3qT6WJQ0I,564
-pytz/zoneinfo/Pacific/Funafuti,sha256=UyaKimsR8LjgL8Z2g65I0HTvr3tMZuA2wUeBB6_Zp9c,152
-pytz/zoneinfo/Pacific/Galapagos,sha256=_GJUYOjSiIjoNBO2qdq23isLMJ4NCVk3DKIRGeDc8BA,224
-pytz/zoneinfo/Pacific/Gambier,sha256=gAS7gr1HH_re0uYnL6eWo5KGJ-B5QaiM8mV2cY5mQxE,150
-pytz/zoneinfo/Pacific/Guadalcanal,sha256=M4kTWqaSQaV1AMhyLSvmwoBJF7X9icrILbvQJwp940g,152
-pytz/zoneinfo/Pacific/Guam,sha256=Ex9znmf6rNfGze6gNpZJCMr1TT4rkl2SnrhecrdJufI,494
-pytz/zoneinfo/Pacific/Honolulu,sha256=fwPRv1Jk56sCOi75uZfd_Iy2k2aSQHx3B2K5xUlSPzM,329
-pytz/zoneinfo/Pacific/Johnston,sha256=fwPRv1Jk56sCOi75uZfd_Iy2k2aSQHx3B2K5xUlSPzM,329
-pytz/zoneinfo/Pacific/Kanton,sha256=HNTAKrsH_R2W3QRlKcmNld5KcXdP0ygXCjEovc1i-6Q,220
-pytz/zoneinfo/Pacific/Kiritimati,sha256=hYk1Ooz-Lj1PuZCbNV2WJIvOLtCwSwq2u63cb1Z-3NQ,224
-pytz/zoneinfo/Pacific/Kosrae,sha256=Q0jrb4zeDrd61bU4V8TqjMc0Iep8rWZyZqJ0uqsunxs,337
-pytz/zoneinfo/Pacific/Kwajalein,sha256=TmZ_0f-ySQ-saBAlRXV0f49Itwne51VBXn6rWcrWqHQ,302
-pytz/zoneinfo/Pacific/Majuro,sha256=UyaKimsR8LjgL8Z2g65I0HTvr3tMZuA2wUeBB6_Zp9c,152
-pytz/zoneinfo/Pacific/Marquesas,sha256=FTxPJTWtk48LVb3N2U64KLpLsmvu0DQBubTCg-dvyGM,159
-pytz/zoneinfo/Pacific/Midway,sha256=fCYrYphYY6rUfxOw712y5cyRe104AC3pouqD3bCINFg,175
-pytz/zoneinfo/Pacific/Nauru,sha256=9ASKgLHB-8nsTEK1ApzfTH0yQtbNAmGX-JI7uHZiqnA,238
-pytz/zoneinfo/Pacific/Niue,sha256=OllXxukncR7a-SMmdFox5az1xpIPMhbahQhtObmpuDM,189
-pytz/zoneinfo/Pacific/Norfolk,sha256=DMdX1Bm18lzNuiCWzwfeHUMRGXPS8v5AWnh-_EX_AZw,866
-pytz/zoneinfo/Pacific/Noumea,sha256=tkHxxnxsXTOqz3YzWi0mkhTCIONzg-W7EpSRMdPjKdQ,290
-pytz/zoneinfo/Pacific/Pago_Pago,sha256=fCYrYphYY6rUfxOw712y5cyRe104AC3pouqD3bCINFg,175
-pytz/zoneinfo/Pacific/Palau,sha256=aN2HbT0reqwKrtLKDK9M2zb0d0ikdNlTrrntVxdH66o,166
-pytz/zoneinfo/Pacific/Pitcairn,sha256=U4jAUuvsRNoy8XrPa16YpcXCcqHJY0u6JvCNgPEWO1c,188
-pytz/zoneinfo/Pacific/Pohnpei,sha256=M4kTWqaSQaV1AMhyLSvmwoBJF7X9icrILbvQJwp940g,152
-pytz/zoneinfo/Pacific/Ponape,sha256=M4kTWqaSQaV1AMhyLSvmwoBJF7X9icrILbvQJwp940g,152
-pytz/zoneinfo/Pacific/Port_Moresby,sha256=nB36HBWZTdh3TlP0DLFNz1KRQ0aHIfHbp7LC4Urp9fA,172
-pytz/zoneinfo/Pacific/Rarotonga,sha256=wPEsoXbyDnuhfzkgLvUqhSzrMx_FD42uAPluSPMh3Bc,589
-pytz/zoneinfo/Pacific/Saipan,sha256=Ex9znmf6rNfGze6gNpZJCMr1TT4rkl2SnrhecrdJufI,494
-pytz/zoneinfo/Pacific/Samoa,sha256=fCYrYphYY6rUfxOw712y5cyRe104AC3pouqD3bCINFg,175
-pytz/zoneinfo/Pacific/Tahiti,sha256=BRff9G3E-iWKhOWR1Wu02Z0iMgjrwDXV-XNrqItXdTY,151
-pytz/zoneinfo/Pacific/Tarawa,sha256=UyaKimsR8LjgL8Z2g65I0HTvr3tMZuA2wUeBB6_Zp9c,152
-pytz/zoneinfo/Pacific/Tongatapu,sha256=OppBZqTAZib9HY7U9AC-JavO7m6NxPGUtUfPQAl9oBY,358
-pytz/zoneinfo/Pacific/Truk,sha256=nB36HBWZTdh3TlP0DLFNz1KRQ0aHIfHbp7LC4Urp9fA,172
-pytz/zoneinfo/Pacific/Wake,sha256=UyaKimsR8LjgL8Z2g65I0HTvr3tMZuA2wUeBB6_Zp9c,152
-pytz/zoneinfo/Pacific/Wallis,sha256=UyaKimsR8LjgL8Z2g65I0HTvr3tMZuA2wUeBB6_Zp9c,152
-pytz/zoneinfo/Pacific/Yap,sha256=nB36HBWZTdh3TlP0DLFNz1KRQ0aHIfHbp7LC4Urp9fA,172
-pytz/zoneinfo/Poland,sha256=TiLDPbeVF0ckgLVEkaSeDaKZ8wctdJDOl_HE_Wd5rKs,2654
-pytz/zoneinfo/Portugal,sha256=krB8skaJImv5NDCNHxvTPDBqpNphDFLNW84lB3lgUCw,3527
-pytz/zoneinfo/ROC,sha256=DMmQwOpPql25ue3Nf8vAKKT4em06D1Z9rHbLIitxixk,761
-pytz/zoneinfo/ROK,sha256=LI9LsV3XcJC0l-KoQf8zI-y7rk-du57erS-N2Ptdi7Q,617
-pytz/zoneinfo/Singapore,sha256=XmeVImeqcJ8hJzm7TjAti1nWJAxawOqq7jIzDnHX2hI,401
-pytz/zoneinfo/Turkey,sha256=Jk4wjndDta_uLWc8W1dWdjbavJJbsL5ROTmZboVnGKU,1933
-pytz/zoneinfo/UCT,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/US/Alaska,sha256=oZA1NSPS2BWdymYpnCHFO8BlYVS-ll5KLg2Ez9CbETs,2371
-pytz/zoneinfo/US/Aleutian,sha256=IB1DhwJQAKbhPJ9jHLf8zW5Dad7HIkBS-dhv64E1OlM,2356
-pytz/zoneinfo/US/Arizona,sha256=illz0sYuLL8lIPK0Tkou6dL0Vck_D0W_3rRTOvFYRmQ,360
-pytz/zoneinfo/US/Central,sha256=_roybr6I6sIAF6cYdIxGxoRpoef153Fty48dQ6bm9oY,3592
-pytz/zoneinfo/US/East-Indiana,sha256=kNKy9Kj9ICsiYYfCCbAggzMA7exf-GpGPMxoXocHUyw,1682
-pytz/zoneinfo/US/Eastern,sha256=6e0H177gx2qdRC0JHvHwFmj-58TyYBTAqGixn-bBipU,3552
-pytz/zoneinfo/US/Hawaii,sha256=fwPRv1Jk56sCOi75uZfd_Iy2k2aSQHx3B2K5xUlSPzM,329
-pytz/zoneinfo/US/Indiana-Starke,sha256=CsvZ5BKw2qVav3x_F8CU9taJdDk7jX41Cfsqms6jXV8,2444
-pytz/zoneinfo/US/Michigan,sha256=hecz8yqY2Cj5B61G3gLZdAVZvRgK9l0P90c_gN-uD5g,2230
-pytz/zoneinfo/US/Mountain,sha256=MugZwApDs8NI9TnXANQlUE8guNBowWQY0m-ptpPndck,2460
-pytz/zoneinfo/US/Pacific,sha256=aJd7ua1tGG_vxser02AQpm4wAI3LLTdgh6QcSYYecmg,2852
-pytz/zoneinfo/US/Samoa,sha256=fCYrYphYY6rUfxOw712y5cyRe104AC3pouqD3bCINFg,175
-pytz/zoneinfo/UTC,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/Universal,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/W-SU,sha256=KmkofRcj6T8Ph28PJChm8JVp13uRvef6TZ0GuPzUiDw,1535
-pytz/zoneinfo/WET,sha256=krB8skaJImv5NDCNHxvTPDBqpNphDFLNW84lB3lgUCw,3527
-pytz/zoneinfo/Zulu,sha256=i4WEZ5GrLIpUY8g6W-PAQ-JXDXRIQ01BOYlp7Ufj5vI,114
-pytz/zoneinfo/iso3166.tab,sha256=oBpdFY8x1GrY5vjMKgbGQYEGgqk5fUYDIPaNVCG2XnE,4791
-pytz/zoneinfo/leapseconds,sha256=X1FVahN0_N2AY6gOUBNWW9MsP297cqFQTHJypTr0rgI,3253
-pytz/zoneinfo/tzdata.zi,sha256=qceqNWVumOYNg29-ij_5AO-b5F81DstN72fXE-u711g,107024
-pytz/zoneinfo/zone.tab,sha256=a2hE16NtKUnPJzM2krm5rKu1vxtP98nUhGHO3sE6DbM,18775
-pytz/zoneinfo/zone1970.tab,sha256=3ANHICItrC0iU1vSQAMKZXN1a68sozBiy9AHi9ZGooE,17510
-pytz/zoneinfo/zonenow.tab,sha256=vEbqGYEEhc_CL-FnoeZ5q3CsPTu8sETOnicuJxFJRqY,8101
diff --git a/libs/pytz-2024.2.dist-info/WHEEL b/libs/pytz-2024.2.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/pytz-2024.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/pytz-2024.2.dist-info/top_level.txt b/libs/pytz-2024.2.dist-info/top_level.txt
deleted file mode 100644
index af44f198c6..0000000000
--- a/libs/pytz-2024.2.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-pytz
diff --git a/libs/pytz-2024.2.dist-info/zip-safe b/libs/pytz-2024.2.dist-info/zip-safe
deleted file mode 100644
index 8b13789179..0000000000
--- a/libs/pytz-2024.2.dist-info/zip-safe
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/libs/pytz/__init__.py b/libs/pytz/__init__.py
deleted file mode 100644
index 96409e2d08..0000000000
--- a/libs/pytz/__init__.py
+++ /dev/null
@@ -1,1554 +0,0 @@
-'''
-datetime.tzinfo timezone definitions generated from the
-Olson timezone database:
-
-    ftp://elsie.nci.nih.gov/pub/tz*.tar.gz
-
-See the datetime section of the Python Library Reference for information
-on how to use these modules.
-'''
-
-import sys
-import datetime
-import os.path
-
-from pytz.exceptions import AmbiguousTimeError
-from pytz.exceptions import InvalidTimeError
-from pytz.exceptions import NonExistentTimeError
-from pytz.exceptions import UnknownTimeZoneError
-from pytz.lazy import LazyDict, LazyList, LazySet  # noqa
-from pytz.tzinfo import unpickler, BaseTzInfo
-from pytz.tzfile import build_tzinfo
-
-
-# The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2024b'
-VERSION = '2024.2'  # pip compatible version number.
-__version__ = VERSION
-
-OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
-
-__all__ = [
-    'timezone', 'utc', 'country_timezones', 'country_names',
-    'AmbiguousTimeError', 'InvalidTimeError',
-    'NonExistentTimeError', 'UnknownTimeZoneError',
-    'all_timezones', 'all_timezones_set',
-    'common_timezones', 'common_timezones_set',
-    'BaseTzInfo', 'FixedOffset',
-]
-
-
-if sys.version_info[0] > 2:  # Python 3.x
-
-    # Python 3.x doesn't have unicode(), making writing code
-    # for Python 2.3 and Python 3.x a pain.
-    unicode = str
-
-    def ascii(s):
-        r"""
-        >>> ascii('Hello')
-        'Hello'
-        >>> ascii('\N{TRADE MARK SIGN}') #doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-            ...
-        UnicodeEncodeError: ...
-        """
-        if type(s) == bytes:
-            s = s.decode('ASCII')
-        else:
-            s.encode('ASCII')  # Raise an exception if not ASCII
-        return s  # But the string - not a byte string.
-
-else:  # Python 2.x
-
-    def ascii(s):
-        r"""
-        >>> ascii('Hello')
-        'Hello'
-        >>> ascii(u'Hello')
-        'Hello'
-        >>> ascii(u'\N{TRADE MARK SIGN}') #doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-            ...
-        UnicodeEncodeError: ...
-        """
-        return s.encode('ASCII')
-
-
-def open_resource(name):
-    """Open a resource from the zoneinfo subdir for reading.
-
-    Uses the pkg_resources module if available and no standard file
-    found at the calculated location.
-
-    It is possible to specify different location for zoneinfo
-    subdir by using the PYTZ_TZDATADIR environment variable.
-    """
-    name_parts = name.lstrip('/').split('/')
-    for part in name_parts:
-        if part == os.path.pardir or os.sep in part:
-            raise ValueError('Bad path segment: %r' % part)
-    zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None)
-    if zoneinfo_dir is not None:
-        filename = os.path.join(zoneinfo_dir, *name_parts)
-    else:
-        filename = os.path.join(os.path.dirname(__file__),
-                                'zoneinfo', *name_parts)
-        if not os.path.exists(filename):
-            # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-            # unless absolutely necessary to help when a broken version of
-            # pkg_resources is installed.
-            try:
-                from pkg_resources import resource_stream
-            except ImportError:
-                resource_stream = None
-
-            if resource_stream is not None:
-                return resource_stream(__name__, 'zoneinfo/' + name)
-    return open(filename, 'rb')
-
-
-def resource_exists(name):
-    """Return true if the given resource exists"""
-    try:
-        if os.environ.get('PYTZ_SKIPEXISTSCHECK', ''):
-            # In "standard" distributions, we can assume that
-            # all the listed timezones are present. As an
-            # import-speed optimization, you can set the
-            # PYTZ_SKIPEXISTSCHECK flag to skip checking
-            # for the presence of the resource file on disk.
-            return True
-        open_resource(name).close()
-        return True
-    except IOError:
-        return False
-
-
-_tzinfo_cache = {}
-
-
-def timezone(zone):
-    r''' Return a datetime.tzinfo implementation for the given timezone
-
-    >>> from datetime import datetime, timedelta
-    >>> utc = timezone('UTC')
-    >>> eastern = timezone('US/Eastern')
-    >>> eastern.zone
-    'US/Eastern'
-    >>> timezone(unicode('US/Eastern')) is eastern
-    True
-    >>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
-    >>> loc_dt = utc_dt.astimezone(eastern)
-    >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
-    >>> loc_dt.strftime(fmt)
-    '2002-10-27 01:00:00 EST (-0500)'
-    >>> (loc_dt - timedelta(minutes=10)).strftime(fmt)
-    '2002-10-27 00:50:00 EST (-0500)'
-    >>> eastern.normalize(loc_dt - timedelta(minutes=10)).strftime(fmt)
-    '2002-10-27 01:50:00 EDT (-0400)'
-    >>> (loc_dt + timedelta(minutes=10)).strftime(fmt)
-    '2002-10-27 01:10:00 EST (-0500)'
-
-    Raises UnknownTimeZoneError if passed an unknown zone.
-
-    >>> try:
-    ...     timezone('Asia/Shangri-La')
-    ... except UnknownTimeZoneError:
-    ...     print('Unknown')
-    Unknown
-
-    >>> try:
-    ...     timezone(unicode('\N{TRADE MARK SIGN}'))
-    ... except UnknownTimeZoneError:
-    ...     print('Unknown')
-    Unknown
-
-    '''
-    if zone is None:
-        raise UnknownTimeZoneError(None)
-
-    if zone.upper() == 'UTC':
-        return utc
-
-    try:
-        zone = ascii(zone)
-    except UnicodeEncodeError:
-        # All valid timezones are ASCII
-        raise UnknownTimeZoneError(zone)
-
-    zone = _case_insensitive_zone_lookup(_unmunge_zone(zone))
-    if zone not in _tzinfo_cache:
-        if zone in all_timezones_set:  # noqa
-            fp = open_resource(zone)
-            try:
-                _tzinfo_cache[zone] = build_tzinfo(zone, fp)
-            finally:
-                fp.close()
-        else:
-            raise UnknownTimeZoneError(zone)
-
-    return _tzinfo_cache[zone]
-
-
-def _unmunge_zone(zone):
-    """Undo the time zone name munging done by older versions of pytz."""
-    return zone.replace('_plus_', '+').replace('_minus_', '-')
-
-
-_all_timezones_lower_to_standard = None
-
-
-def _case_insensitive_zone_lookup(zone):
-    """case-insensitively matching timezone, else return zone unchanged"""
-    global _all_timezones_lower_to_standard
-    if _all_timezones_lower_to_standard is None:
-        _all_timezones_lower_to_standard = dict((tz.lower(), tz) for tz in _all_timezones_unchecked)  # noqa
-    return _all_timezones_lower_to_standard.get(zone.lower()) or zone  # noqa
-
-
-ZERO = datetime.timedelta(0)
-HOUR = datetime.timedelta(hours=1)
-
-
-class UTC(BaseTzInfo):
-    """UTC
-
-    Optimized UTC implementation. It unpickles using the single module global
-    instance defined beneath this class declaration.
-    """
-    zone = "UTC"
-
-    _utcoffset = ZERO
-    _dst = ZERO
-    _tzname = zone
-
-    def fromutc(self, dt):
-        if dt.tzinfo is None:
-            return self.localize(dt)
-        return super(utc.__class__, self).fromutc(dt)
-
-    def utcoffset(self, dt):
-        return ZERO
-
-    def tzname(self, dt):
-        return "UTC"
-
-    def dst(self, dt):
-        return ZERO
-
-    def __reduce__(self):
-        return _UTC, ()
-
-    def localize(self, dt, is_dst=False):
-        '''Convert naive time to local time'''
-        if dt.tzinfo is not None:
-            raise ValueError('Not naive datetime (tzinfo is already set)')
-        return dt.replace(tzinfo=self)
-
-    def normalize(self, dt, is_dst=False):
-        '''Correct the timezone information on the given datetime'''
-        if dt.tzinfo is self:
-            return dt
-        if dt.tzinfo is None:
-            raise ValueError('Naive time - no tzinfo set')
-        return dt.astimezone(self)
-
-    def __repr__(self):
-        return "<UTC>"
-
-    def __str__(self):
-        return "UTC"
-
-
-UTC = utc = UTC()  # UTC is a singleton
-
-
-def _UTC():
-    """Factory function for utc unpickling.
-
-    Makes sure that unpickling a utc instance always returns the same
-    module global.
-
-    These examples belong in the UTC class above, but it is obscured; or in
-    the README.rst, but we are not depending on Python 2.4 so integrating
-    the README.rst examples with the unit tests is not trivial.
-
-    >>> import datetime, pickle
-    >>> dt = datetime.datetime(2005, 3, 1, 14, 13, 21, tzinfo=utc)
-    >>> naive = dt.replace(tzinfo=None)
-    >>> p = pickle.dumps(dt, 1)
-    >>> naive_p = pickle.dumps(naive, 1)
-    >>> len(p) - len(naive_p)
-    17
-    >>> new = pickle.loads(p)
-    >>> new == dt
-    True
-    >>> new is dt
-    False
-    >>> new.tzinfo is dt.tzinfo
-    True
-    >>> utc is UTC is timezone('UTC')
-    True
-    >>> utc is timezone('GMT')
-    False
-    """
-    return utc
-
-
-_UTC.__safe_for_unpickling__ = True
-
-
-def _p(*args):
-    """Factory function for unpickling pytz tzinfo instances.
-
-    Just a wrapper around tzinfo.unpickler to save a few bytes in each pickle
-    by shortening the path.
-    """
-    return unpickler(*args)
-
-
-_p.__safe_for_unpickling__ = True
-
-
-class _CountryTimezoneDict(LazyDict):
-    """Map ISO 3166 country code to a list of timezone names commonly used
-    in that country.
-
-    iso3166_code is the two letter code used to identify the country.
-
-    >>> def print_list(list_of_strings):
-    ...     'We use a helper so doctests work under Python 2.3 -> 3.x'
-    ...     for s in list_of_strings:
-    ...         print(s)
-
-    >>> print_list(country_timezones['nz'])
-    Pacific/Auckland
-    Pacific/Chatham
-    >>> print_list(country_timezones['ch'])
-    Europe/Zurich
-    >>> print_list(country_timezones['CH'])
-    Europe/Zurich
-    >>> print_list(country_timezones[unicode('ch')])
-    Europe/Zurich
-    >>> print_list(country_timezones['XXX'])
-    Traceback (most recent call last):
-    ...
-    KeyError: 'XXX'
-
-    Previously, this information was exposed as a function rather than a
-    dictionary. This is still supported::
-
-    >>> print_list(country_timezones('nz'))
-    Pacific/Auckland
-    Pacific/Chatham
-    """
-    def __call__(self, iso3166_code):
-        """Backwards compatibility."""
-        return self[iso3166_code]
-
-    def _fill(self):
-        data = {}
-        zone_tab = open_resource('zone.tab')
-        try:
-            for line in zone_tab:
-                line = line.decode('UTF-8')
-                if line.startswith('#'):
-                    continue
-                code, coordinates, zone = line.split(None, 4)[:3]
-                if zone not in all_timezones_set:  # noqa
-                    continue
-                try:
-                    data[code].append(zone)
-                except KeyError:
-                    data[code] = [zone]
-            self.data = data
-        finally:
-            zone_tab.close()
-
-
-country_timezones = _CountryTimezoneDict()
-
-
-class _CountryNameDict(LazyDict):
-    '''Dictionary proving ISO3166 code -> English name.
-
-    >>> print(country_names['au'])
-    Australia
-    '''
-    def _fill(self):
-        data = {}
-        zone_tab = open_resource('iso3166.tab')
-        try:
-            for line in zone_tab.readlines():
-                line = line.decode('UTF-8')
-                if line.startswith('#'):
-                    continue
-                code, name = line.split(None, 1)
-                data[code] = name.strip()
-            self.data = data
-        finally:
-            zone_tab.close()
-
-
-country_names = _CountryNameDict()
-
-
-# Time-zone info based solely on fixed offsets
-
-class _FixedOffset(datetime.tzinfo):
-
-    zone = None  # to match the standard pytz API
-
-    def __init__(self, minutes):
-        if abs(minutes) >= 1440:
-            raise ValueError("absolute offset is too large", minutes)
-        self._minutes = minutes
-        self._offset = datetime.timedelta(minutes=minutes)
-
-    def utcoffset(self, dt):
-        return self._offset
-
-    def __reduce__(self):
-        return FixedOffset, (self._minutes, )
-
-    def dst(self, dt):
-        return ZERO
-
-    def tzname(self, dt):
-        return None
-
-    def __repr__(self):
-        return 'pytz.FixedOffset(%d)' % self._minutes
-
-    def localize(self, dt, is_dst=False):
-        '''Convert naive time to local time'''
-        if dt.tzinfo is not None:
-            raise ValueError('Not naive datetime (tzinfo is already set)')
-        return dt.replace(tzinfo=self)
-
-    def normalize(self, dt, is_dst=False):
-        '''Correct the timezone information on the given datetime'''
-        if dt.tzinfo is self:
-            return dt
-        if dt.tzinfo is None:
-            raise ValueError('Naive time - no tzinfo set')
-        return dt.astimezone(self)
-
-
-def FixedOffset(offset, _tzinfos={}):
-    """return a fixed-offset timezone based off a number of minutes.
-
-        >>> one = FixedOffset(-330)
-        >>> one
-        pytz.FixedOffset(-330)
-        >>> str(one.utcoffset(datetime.datetime.now()))
-        '-1 day, 18:30:00'
-        >>> str(one.dst(datetime.datetime.now()))
-        '0:00:00'
-
-        >>> two = FixedOffset(1380)
-        >>> two
-        pytz.FixedOffset(1380)
-        >>> str(two.utcoffset(datetime.datetime.now()))
-        '23:00:00'
-        >>> str(two.dst(datetime.datetime.now()))
-        '0:00:00'
-
-    The datetime.timedelta must be between the range of -1 and 1 day,
-    non-inclusive.
-
-        >>> FixedOffset(1440)
-        Traceback (most recent call last):
-        ...
-        ValueError: ('absolute offset is too large', 1440)
-
-        >>> FixedOffset(-1440)
-        Traceback (most recent call last):
-        ...
-        ValueError: ('absolute offset is too large', -1440)
-
-    An offset of 0 is special-cased to return UTC.
-
-        >>> FixedOffset(0) is UTC
-        True
-
-    There should always be only one instance of a FixedOffset per timedelta.
-    This should be true for multiple creation calls.
-
-        >>> FixedOffset(-330) is one
-        True
-        >>> FixedOffset(1380) is two
-        True
-
-    It should also be true for pickling.
-
-        >>> import pickle
-        >>> pickle.loads(pickle.dumps(one)) is one
-        True
-        >>> pickle.loads(pickle.dumps(two)) is two
-        True
-    """
-    if offset == 0:
-        return UTC
-
-    info = _tzinfos.get(offset)
-    if info is None:
-        # We haven't seen this one before. we need to save it.
-
-        # Use setdefault to avoid a race condition and make sure we have
-        # only one
-        info = _tzinfos.setdefault(offset, _FixedOffset(offset))
-
-    return info
-
-
-FixedOffset.__safe_for_unpickling__ = True
-
-
-def _test():
-    import doctest
-    sys.path.insert(0, os.pardir)
-    import pytz
-    return doctest.testmod(pytz)
-
-
-if __name__ == '__main__':
-    _test()
-_all_timezones_unchecked = \
-['Africa/Abidjan',
- 'Africa/Accra',
- 'Africa/Addis_Ababa',
- 'Africa/Algiers',
- 'Africa/Asmara',
- 'Africa/Asmera',
- 'Africa/Bamako',
- 'Africa/Bangui',
- 'Africa/Banjul',
- 'Africa/Bissau',
- 'Africa/Blantyre',
- 'Africa/Brazzaville',
- 'Africa/Bujumbura',
- 'Africa/Cairo',
- 'Africa/Casablanca',
- 'Africa/Ceuta',
- 'Africa/Conakry',
- 'Africa/Dakar',
- 'Africa/Dar_es_Salaam',
- 'Africa/Djibouti',
- 'Africa/Douala',
- 'Africa/El_Aaiun',
- 'Africa/Freetown',
- 'Africa/Gaborone',
- 'Africa/Harare',
- 'Africa/Johannesburg',
- 'Africa/Juba',
- 'Africa/Kampala',
- 'Africa/Khartoum',
- 'Africa/Kigali',
- 'Africa/Kinshasa',
- 'Africa/Lagos',
- 'Africa/Libreville',
- 'Africa/Lome',
- 'Africa/Luanda',
- 'Africa/Lubumbashi',
- 'Africa/Lusaka',
- 'Africa/Malabo',
- 'Africa/Maputo',
- 'Africa/Maseru',
- 'Africa/Mbabane',
- 'Africa/Mogadishu',
- 'Africa/Monrovia',
- 'Africa/Nairobi',
- 'Africa/Ndjamena',
- 'Africa/Niamey',
- 'Africa/Nouakchott',
- 'Africa/Ouagadougou',
- 'Africa/Porto-Novo',
- 'Africa/Sao_Tome',
- 'Africa/Timbuktu',
- 'Africa/Tripoli',
- 'Africa/Tunis',
- 'Africa/Windhoek',
- 'America/Adak',
- 'America/Anchorage',
- 'America/Anguilla',
- 'America/Antigua',
- 'America/Araguaina',
- 'America/Argentina/Buenos_Aires',
- 'America/Argentina/Catamarca',
- 'America/Argentina/ComodRivadavia',
- 'America/Argentina/Cordoba',
- 'America/Argentina/Jujuy',
- 'America/Argentina/La_Rioja',
- 'America/Argentina/Mendoza',
- 'America/Argentina/Rio_Gallegos',
- 'America/Argentina/Salta',
- 'America/Argentina/San_Juan',
- 'America/Argentina/San_Luis',
- 'America/Argentina/Tucuman',
- 'America/Argentina/Ushuaia',
- 'America/Aruba',
- 'America/Asuncion',
- 'America/Atikokan',
- 'America/Atka',
- 'America/Bahia',
- 'America/Bahia_Banderas',
- 'America/Barbados',
- 'America/Belem',
- 'America/Belize',
- 'America/Blanc-Sablon',
- 'America/Boa_Vista',
- 'America/Bogota',
- 'America/Boise',
- 'America/Buenos_Aires',
- 'America/Cambridge_Bay',
- 'America/Campo_Grande',
- 'America/Cancun',
- 'America/Caracas',
- 'America/Catamarca',
- 'America/Cayenne',
- 'America/Cayman',
- 'America/Chicago',
- 'America/Chihuahua',
- 'America/Ciudad_Juarez',
- 'America/Coral_Harbour',
- 'America/Cordoba',
- 'America/Costa_Rica',
- 'America/Creston',
- 'America/Cuiaba',
- 'America/Curacao',
- 'America/Danmarkshavn',
- 'America/Dawson',
- 'America/Dawson_Creek',
- 'America/Denver',
- 'America/Detroit',
- 'America/Dominica',
- 'America/Edmonton',
- 'America/Eirunepe',
- 'America/El_Salvador',
- 'America/Ensenada',
- 'America/Fort_Nelson',
- 'America/Fort_Wayne',
- 'America/Fortaleza',
- 'America/Glace_Bay',
- 'America/Godthab',
- 'America/Goose_Bay',
- 'America/Grand_Turk',
- 'America/Grenada',
- 'America/Guadeloupe',
- 'America/Guatemala',
- 'America/Guayaquil',
- 'America/Guyana',
- 'America/Halifax',
- 'America/Havana',
- 'America/Hermosillo',
- 'America/Indiana/Indianapolis',
- 'America/Indiana/Knox',
- 'America/Indiana/Marengo',
- 'America/Indiana/Petersburg',
- 'America/Indiana/Tell_City',
- 'America/Indiana/Vevay',
- 'America/Indiana/Vincennes',
- 'America/Indiana/Winamac',
- 'America/Indianapolis',
- 'America/Inuvik',
- 'America/Iqaluit',
- 'America/Jamaica',
- 'America/Jujuy',
- 'America/Juneau',
- 'America/Kentucky/Louisville',
- 'America/Kentucky/Monticello',
- 'America/Knox_IN',
- 'America/Kralendijk',
- 'America/La_Paz',
- 'America/Lima',
- 'America/Los_Angeles',
- 'America/Louisville',
- 'America/Lower_Princes',
- 'America/Maceio',
- 'America/Managua',
- 'America/Manaus',
- 'America/Marigot',
- 'America/Martinique',
- 'America/Matamoros',
- 'America/Mazatlan',
- 'America/Mendoza',
- 'America/Menominee',
- 'America/Merida',
- 'America/Metlakatla',
- 'America/Mexico_City',
- 'America/Miquelon',
- 'America/Moncton',
- 'America/Monterrey',
- 'America/Montevideo',
- 'America/Montreal',
- 'America/Montserrat',
- 'America/Nassau',
- 'America/New_York',
- 'America/Nipigon',
- 'America/Nome',
- 'America/Noronha',
- 'America/North_Dakota/Beulah',
- 'America/North_Dakota/Center',
- 'America/North_Dakota/New_Salem',
- 'America/Nuuk',
- 'America/Ojinaga',
- 'America/Panama',
- 'America/Pangnirtung',
- 'America/Paramaribo',
- 'America/Phoenix',
- 'America/Port-au-Prince',
- 'America/Port_of_Spain',
- 'America/Porto_Acre',
- 'America/Porto_Velho',
- 'America/Puerto_Rico',
- 'America/Punta_Arenas',
- 'America/Rainy_River',
- 'America/Rankin_Inlet',
- 'America/Recife',
- 'America/Regina',
- 'America/Resolute',
- 'America/Rio_Branco',
- 'America/Rosario',
- 'America/Santa_Isabel',
- 'America/Santarem',
- 'America/Santiago',
- 'America/Santo_Domingo',
- 'America/Sao_Paulo',
- 'America/Scoresbysund',
- 'America/Shiprock',
- 'America/Sitka',
- 'America/St_Barthelemy',
- 'America/St_Johns',
- 'America/St_Kitts',
- 'America/St_Lucia',
- 'America/St_Thomas',
- 'America/St_Vincent',
- 'America/Swift_Current',
- 'America/Tegucigalpa',
- 'America/Thule',
- 'America/Thunder_Bay',
- 'America/Tijuana',
- 'America/Toronto',
- 'America/Tortola',
- 'America/Vancouver',
- 'America/Virgin',
- 'America/Whitehorse',
- 'America/Winnipeg',
- 'America/Yakutat',
- 'America/Yellowknife',
- 'Antarctica/Casey',
- 'Antarctica/Davis',
- 'Antarctica/DumontDUrville',
- 'Antarctica/Macquarie',
- 'Antarctica/Mawson',
- 'Antarctica/McMurdo',
- 'Antarctica/Palmer',
- 'Antarctica/Rothera',
- 'Antarctica/South_Pole',
- 'Antarctica/Syowa',
- 'Antarctica/Troll',
- 'Antarctica/Vostok',
- 'Arctic/Longyearbyen',
- 'Asia/Aden',
- 'Asia/Almaty',
- 'Asia/Amman',
- 'Asia/Anadyr',
- 'Asia/Aqtau',
- 'Asia/Aqtobe',
- 'Asia/Ashgabat',
- 'Asia/Ashkhabad',
- 'Asia/Atyrau',
- 'Asia/Baghdad',
- 'Asia/Bahrain',
- 'Asia/Baku',
- 'Asia/Bangkok',
- 'Asia/Barnaul',
- 'Asia/Beirut',
- 'Asia/Bishkek',
- 'Asia/Brunei',
- 'Asia/Calcutta',
- 'Asia/Chita',
- 'Asia/Choibalsan',
- 'Asia/Chongqing',
- 'Asia/Chungking',
- 'Asia/Colombo',
- 'Asia/Dacca',
- 'Asia/Damascus',
- 'Asia/Dhaka',
- 'Asia/Dili',
- 'Asia/Dubai',
- 'Asia/Dushanbe',
- 'Asia/Famagusta',
- 'Asia/Gaza',
- 'Asia/Harbin',
- 'Asia/Hebron',
- 'Asia/Ho_Chi_Minh',
- 'Asia/Hong_Kong',
- 'Asia/Hovd',
- 'Asia/Irkutsk',
- 'Asia/Istanbul',
- 'Asia/Jakarta',
- 'Asia/Jayapura',
- 'Asia/Jerusalem',
- 'Asia/Kabul',
- 'Asia/Kamchatka',
- 'Asia/Karachi',
- 'Asia/Kashgar',
- 'Asia/Kathmandu',
- 'Asia/Katmandu',
- 'Asia/Khandyga',
- 'Asia/Kolkata',
- 'Asia/Krasnoyarsk',
- 'Asia/Kuala_Lumpur',
- 'Asia/Kuching',
- 'Asia/Kuwait',
- 'Asia/Macao',
- 'Asia/Macau',
- 'Asia/Magadan',
- 'Asia/Makassar',
- 'Asia/Manila',
- 'Asia/Muscat',
- 'Asia/Nicosia',
- 'Asia/Novokuznetsk',
- 'Asia/Novosibirsk',
- 'Asia/Omsk',
- 'Asia/Oral',
- 'Asia/Phnom_Penh',
- 'Asia/Pontianak',
- 'Asia/Pyongyang',
- 'Asia/Qatar',
- 'Asia/Qostanay',
- 'Asia/Qyzylorda',
- 'Asia/Rangoon',
- 'Asia/Riyadh',
- 'Asia/Saigon',
- 'Asia/Sakhalin',
- 'Asia/Samarkand',
- 'Asia/Seoul',
- 'Asia/Shanghai',
- 'Asia/Singapore',
- 'Asia/Srednekolymsk',
- 'Asia/Taipei',
- 'Asia/Tashkent',
- 'Asia/Tbilisi',
- 'Asia/Tehran',
- 'Asia/Tel_Aviv',
- 'Asia/Thimbu',
- 'Asia/Thimphu',
- 'Asia/Tokyo',
- 'Asia/Tomsk',
- 'Asia/Ujung_Pandang',
- 'Asia/Ulaanbaatar',
- 'Asia/Ulan_Bator',
- 'Asia/Urumqi',
- 'Asia/Ust-Nera',
- 'Asia/Vientiane',
- 'Asia/Vladivostok',
- 'Asia/Yakutsk',
- 'Asia/Yangon',
- 'Asia/Yekaterinburg',
- 'Asia/Yerevan',
- 'Atlantic/Azores',
- 'Atlantic/Bermuda',
- 'Atlantic/Canary',
- 'Atlantic/Cape_Verde',
- 'Atlantic/Faeroe',
- 'Atlantic/Faroe',
- 'Atlantic/Jan_Mayen',
- 'Atlantic/Madeira',
- 'Atlantic/Reykjavik',
- 'Atlantic/South_Georgia',
- 'Atlantic/St_Helena',
- 'Atlantic/Stanley',
- 'Australia/ACT',
- 'Australia/Adelaide',
- 'Australia/Brisbane',
- 'Australia/Broken_Hill',
- 'Australia/Canberra',
- 'Australia/Currie',
- 'Australia/Darwin',
- 'Australia/Eucla',
- 'Australia/Hobart',
- 'Australia/LHI',
- 'Australia/Lindeman',
- 'Australia/Lord_Howe',
- 'Australia/Melbourne',
- 'Australia/NSW',
- 'Australia/North',
- 'Australia/Perth',
- 'Australia/Queensland',
- 'Australia/South',
- 'Australia/Sydney',
- 'Australia/Tasmania',
- 'Australia/Victoria',
- 'Australia/West',
- 'Australia/Yancowinna',
- 'Brazil/Acre',
- 'Brazil/DeNoronha',
- 'Brazil/East',
- 'Brazil/West',
- 'CET',
- 'CST6CDT',
- 'Canada/Atlantic',
- 'Canada/Central',
- 'Canada/Eastern',
- 'Canada/Mountain',
- 'Canada/Newfoundland',
- 'Canada/Pacific',
- 'Canada/Saskatchewan',
- 'Canada/Yukon',
- 'Chile/Continental',
- 'Chile/EasterIsland',
- 'Cuba',
- 'EET',
- 'EST',
- 'EST5EDT',
- 'Egypt',
- 'Eire',
- 'Etc/GMT',
- 'Etc/GMT+0',
- 'Etc/GMT+1',
- 'Etc/GMT+10',
- 'Etc/GMT+11',
- 'Etc/GMT+12',
- 'Etc/GMT+2',
- 'Etc/GMT+3',
- 'Etc/GMT+4',
- 'Etc/GMT+5',
- 'Etc/GMT+6',
- 'Etc/GMT+7',
- 'Etc/GMT+8',
- 'Etc/GMT+9',
- 'Etc/GMT-0',
- 'Etc/GMT-1',
- 'Etc/GMT-10',
- 'Etc/GMT-11',
- 'Etc/GMT-12',
- 'Etc/GMT-13',
- 'Etc/GMT-14',
- 'Etc/GMT-2',
- 'Etc/GMT-3',
- 'Etc/GMT-4',
- 'Etc/GMT-5',
- 'Etc/GMT-6',
- 'Etc/GMT-7',
- 'Etc/GMT-8',
- 'Etc/GMT-9',
- 'Etc/GMT0',
- 'Etc/Greenwich',
- 'Etc/UCT',
- 'Etc/UTC',
- 'Etc/Universal',
- 'Etc/Zulu',
- 'Europe/Amsterdam',
- 'Europe/Andorra',
- 'Europe/Astrakhan',
- 'Europe/Athens',
- 'Europe/Belfast',
- 'Europe/Belgrade',
- 'Europe/Berlin',
- 'Europe/Bratislava',
- 'Europe/Brussels',
- 'Europe/Bucharest',
- 'Europe/Budapest',
- 'Europe/Busingen',
- 'Europe/Chisinau',
- 'Europe/Copenhagen',
- 'Europe/Dublin',
- 'Europe/Gibraltar',
- 'Europe/Guernsey',
- 'Europe/Helsinki',
- 'Europe/Isle_of_Man',
- 'Europe/Istanbul',
- 'Europe/Jersey',
- 'Europe/Kaliningrad',
- 'Europe/Kiev',
- 'Europe/Kirov',
- 'Europe/Kyiv',
- 'Europe/Lisbon',
- 'Europe/Ljubljana',
- 'Europe/London',
- 'Europe/Luxembourg',
- 'Europe/Madrid',
- 'Europe/Malta',
- 'Europe/Mariehamn',
- 'Europe/Minsk',
- 'Europe/Monaco',
- 'Europe/Moscow',
- 'Europe/Nicosia',
- 'Europe/Oslo',
- 'Europe/Paris',
- 'Europe/Podgorica',
- 'Europe/Prague',
- 'Europe/Riga',
- 'Europe/Rome',
- 'Europe/Samara',
- 'Europe/San_Marino',
- 'Europe/Sarajevo',
- 'Europe/Saratov',
- 'Europe/Simferopol',
- 'Europe/Skopje',
- 'Europe/Sofia',
- 'Europe/Stockholm',
- 'Europe/Tallinn',
- 'Europe/Tirane',
- 'Europe/Tiraspol',
- 'Europe/Ulyanovsk',
- 'Europe/Uzhgorod',
- 'Europe/Vaduz',
- 'Europe/Vatican',
- 'Europe/Vienna',
- 'Europe/Vilnius',
- 'Europe/Volgograd',
- 'Europe/Warsaw',
- 'Europe/Zagreb',
- 'Europe/Zaporozhye',
- 'Europe/Zurich',
- 'GB',
- 'GB-Eire',
- 'GMT',
- 'GMT+0',
- 'GMT-0',
- 'GMT0',
- 'Greenwich',
- 'HST',
- 'Hongkong',
- 'Iceland',
- 'Indian/Antananarivo',
- 'Indian/Chagos',
- 'Indian/Christmas',
- 'Indian/Cocos',
- 'Indian/Comoro',
- 'Indian/Kerguelen',
- 'Indian/Mahe',
- 'Indian/Maldives',
- 'Indian/Mauritius',
- 'Indian/Mayotte',
- 'Indian/Reunion',
- 'Iran',
- 'Israel',
- 'Jamaica',
- 'Japan',
- 'Kwajalein',
- 'Libya',
- 'MET',
- 'MST',
- 'MST7MDT',
- 'Mexico/BajaNorte',
- 'Mexico/BajaSur',
- 'Mexico/General',
- 'NZ',
- 'NZ-CHAT',
- 'Navajo',
- 'PRC',
- 'PST8PDT',
- 'Pacific/Apia',
- 'Pacific/Auckland',
- 'Pacific/Bougainville',
- 'Pacific/Chatham',
- 'Pacific/Chuuk',
- 'Pacific/Easter',
- 'Pacific/Efate',
- 'Pacific/Enderbury',
- 'Pacific/Fakaofo',
- 'Pacific/Fiji',
- 'Pacific/Funafuti',
- 'Pacific/Galapagos',
- 'Pacific/Gambier',
- 'Pacific/Guadalcanal',
- 'Pacific/Guam',
- 'Pacific/Honolulu',
- 'Pacific/Johnston',
- 'Pacific/Kanton',
- 'Pacific/Kiritimati',
- 'Pacific/Kosrae',
- 'Pacific/Kwajalein',
- 'Pacific/Majuro',
- 'Pacific/Marquesas',
- 'Pacific/Midway',
- 'Pacific/Nauru',
- 'Pacific/Niue',
- 'Pacific/Norfolk',
- 'Pacific/Noumea',
- 'Pacific/Pago_Pago',
- 'Pacific/Palau',
- 'Pacific/Pitcairn',
- 'Pacific/Pohnpei',
- 'Pacific/Ponape',
- 'Pacific/Port_Moresby',
- 'Pacific/Rarotonga',
- 'Pacific/Saipan',
- 'Pacific/Samoa',
- 'Pacific/Tahiti',
- 'Pacific/Tarawa',
- 'Pacific/Tongatapu',
- 'Pacific/Truk',
- 'Pacific/Wake',
- 'Pacific/Wallis',
- 'Pacific/Yap',
- 'Poland',
- 'Portugal',
- 'ROC',
- 'ROK',
- 'Singapore',
- 'Turkey',
- 'UCT',
- 'US/Alaska',
- 'US/Aleutian',
- 'US/Arizona',
- 'US/Central',
- 'US/East-Indiana',
- 'US/Eastern',
- 'US/Hawaii',
- 'US/Indiana-Starke',
- 'US/Michigan',
- 'US/Mountain',
- 'US/Pacific',
- 'US/Samoa',
- 'UTC',
- 'Universal',
- 'W-SU',
- 'WET',
- 'Zulu']
-all_timezones = LazyList(
-        tz for tz in _all_timezones_unchecked if resource_exists(tz))
-        
-all_timezones_set = LazySet(all_timezones)
-common_timezones = \
-['Africa/Abidjan',
- 'Africa/Accra',
- 'Africa/Addis_Ababa',
- 'Africa/Algiers',
- 'Africa/Asmara',
- 'Africa/Bamako',
- 'Africa/Bangui',
- 'Africa/Banjul',
- 'Africa/Bissau',
- 'Africa/Blantyre',
- 'Africa/Brazzaville',
- 'Africa/Bujumbura',
- 'Africa/Cairo',
- 'Africa/Casablanca',
- 'Africa/Ceuta',
- 'Africa/Conakry',
- 'Africa/Dakar',
- 'Africa/Dar_es_Salaam',
- 'Africa/Djibouti',
- 'Africa/Douala',
- 'Africa/El_Aaiun',
- 'Africa/Freetown',
- 'Africa/Gaborone',
- 'Africa/Harare',
- 'Africa/Johannesburg',
- 'Africa/Juba',
- 'Africa/Kampala',
- 'Africa/Khartoum',
- 'Africa/Kigali',
- 'Africa/Kinshasa',
- 'Africa/Lagos',
- 'Africa/Libreville',
- 'Africa/Lome',
- 'Africa/Luanda',
- 'Africa/Lubumbashi',
- 'Africa/Lusaka',
- 'Africa/Malabo',
- 'Africa/Maputo',
- 'Africa/Maseru',
- 'Africa/Mbabane',
- 'Africa/Mogadishu',
- 'Africa/Monrovia',
- 'Africa/Nairobi',
- 'Africa/Ndjamena',
- 'Africa/Niamey',
- 'Africa/Nouakchott',
- 'Africa/Ouagadougou',
- 'Africa/Porto-Novo',
- 'Africa/Sao_Tome',
- 'Africa/Tripoli',
- 'Africa/Tunis',
- 'Africa/Windhoek',
- 'America/Adak',
- 'America/Anchorage',
- 'America/Anguilla',
- 'America/Antigua',
- 'America/Araguaina',
- 'America/Argentina/Buenos_Aires',
- 'America/Argentina/Catamarca',
- 'America/Argentina/Cordoba',
- 'America/Argentina/Jujuy',
- 'America/Argentina/La_Rioja',
- 'America/Argentina/Mendoza',
- 'America/Argentina/Rio_Gallegos',
- 'America/Argentina/Salta',
- 'America/Argentina/San_Juan',
- 'America/Argentina/San_Luis',
- 'America/Argentina/Tucuman',
- 'America/Argentina/Ushuaia',
- 'America/Aruba',
- 'America/Asuncion',
- 'America/Atikokan',
- 'America/Bahia',
- 'America/Bahia_Banderas',
- 'America/Barbados',
- 'America/Belem',
- 'America/Belize',
- 'America/Blanc-Sablon',
- 'America/Boa_Vista',
- 'America/Bogota',
- 'America/Boise',
- 'America/Cambridge_Bay',
- 'America/Campo_Grande',
- 'America/Cancun',
- 'America/Caracas',
- 'America/Cayenne',
- 'America/Cayman',
- 'America/Chicago',
- 'America/Chihuahua',
- 'America/Ciudad_Juarez',
- 'America/Costa_Rica',
- 'America/Creston',
- 'America/Cuiaba',
- 'America/Curacao',
- 'America/Danmarkshavn',
- 'America/Dawson',
- 'America/Dawson_Creek',
- 'America/Denver',
- 'America/Detroit',
- 'America/Dominica',
- 'America/Edmonton',
- 'America/Eirunepe',
- 'America/El_Salvador',
- 'America/Fort_Nelson',
- 'America/Fortaleza',
- 'America/Glace_Bay',
- 'America/Goose_Bay',
- 'America/Grand_Turk',
- 'America/Grenada',
- 'America/Guadeloupe',
- 'America/Guatemala',
- 'America/Guayaquil',
- 'America/Guyana',
- 'America/Halifax',
- 'America/Havana',
- 'America/Hermosillo',
- 'America/Indiana/Indianapolis',
- 'America/Indiana/Knox',
- 'America/Indiana/Marengo',
- 'America/Indiana/Petersburg',
- 'America/Indiana/Tell_City',
- 'America/Indiana/Vevay',
- 'America/Indiana/Vincennes',
- 'America/Indiana/Winamac',
- 'America/Inuvik',
- 'America/Iqaluit',
- 'America/Jamaica',
- 'America/Juneau',
- 'America/Kentucky/Louisville',
- 'America/Kentucky/Monticello',
- 'America/Kralendijk',
- 'America/La_Paz',
- 'America/Lima',
- 'America/Los_Angeles',
- 'America/Lower_Princes',
- 'America/Maceio',
- 'America/Managua',
- 'America/Manaus',
- 'America/Marigot',
- 'America/Martinique',
- 'America/Matamoros',
- 'America/Mazatlan',
- 'America/Menominee',
- 'America/Merida',
- 'America/Metlakatla',
- 'America/Mexico_City',
- 'America/Miquelon',
- 'America/Moncton',
- 'America/Monterrey',
- 'America/Montevideo',
- 'America/Montserrat',
- 'America/Nassau',
- 'America/New_York',
- 'America/Nome',
- 'America/Noronha',
- 'America/North_Dakota/Beulah',
- 'America/North_Dakota/Center',
- 'America/North_Dakota/New_Salem',
- 'America/Nuuk',
- 'America/Ojinaga',
- 'America/Panama',
- 'America/Paramaribo',
- 'America/Phoenix',
- 'America/Port-au-Prince',
- 'America/Port_of_Spain',
- 'America/Porto_Velho',
- 'America/Puerto_Rico',
- 'America/Punta_Arenas',
- 'America/Rankin_Inlet',
- 'America/Recife',
- 'America/Regina',
- 'America/Resolute',
- 'America/Rio_Branco',
- 'America/Santarem',
- 'America/Santiago',
- 'America/Santo_Domingo',
- 'America/Sao_Paulo',
- 'America/Scoresbysund',
- 'America/Sitka',
- 'America/St_Barthelemy',
- 'America/St_Johns',
- 'America/St_Kitts',
- 'America/St_Lucia',
- 'America/St_Thomas',
- 'America/St_Vincent',
- 'America/Swift_Current',
- 'America/Tegucigalpa',
- 'America/Thule',
- 'America/Tijuana',
- 'America/Toronto',
- 'America/Tortola',
- 'America/Vancouver',
- 'America/Whitehorse',
- 'America/Winnipeg',
- 'America/Yakutat',
- 'Antarctica/Casey',
- 'Antarctica/Davis',
- 'Antarctica/DumontDUrville',
- 'Antarctica/Macquarie',
- 'Antarctica/Mawson',
- 'Antarctica/McMurdo',
- 'Antarctica/Palmer',
- 'Antarctica/Rothera',
- 'Antarctica/Syowa',
- 'Antarctica/Troll',
- 'Antarctica/Vostok',
- 'Arctic/Longyearbyen',
- 'Asia/Aden',
- 'Asia/Almaty',
- 'Asia/Amman',
- 'Asia/Anadyr',
- 'Asia/Aqtau',
- 'Asia/Aqtobe',
- 'Asia/Ashgabat',
- 'Asia/Atyrau',
- 'Asia/Baghdad',
- 'Asia/Bahrain',
- 'Asia/Baku',
- 'Asia/Bangkok',
- 'Asia/Barnaul',
- 'Asia/Beirut',
- 'Asia/Bishkek',
- 'Asia/Brunei',
- 'Asia/Chita',
- 'Asia/Colombo',
- 'Asia/Damascus',
- 'Asia/Dhaka',
- 'Asia/Dili',
- 'Asia/Dubai',
- 'Asia/Dushanbe',
- 'Asia/Famagusta',
- 'Asia/Gaza',
- 'Asia/Hebron',
- 'Asia/Ho_Chi_Minh',
- 'Asia/Hong_Kong',
- 'Asia/Hovd',
- 'Asia/Irkutsk',
- 'Asia/Jakarta',
- 'Asia/Jayapura',
- 'Asia/Jerusalem',
- 'Asia/Kabul',
- 'Asia/Kamchatka',
- 'Asia/Karachi',
- 'Asia/Kathmandu',
- 'Asia/Khandyga',
- 'Asia/Kolkata',
- 'Asia/Krasnoyarsk',
- 'Asia/Kuala_Lumpur',
- 'Asia/Kuching',
- 'Asia/Kuwait',
- 'Asia/Macau',
- 'Asia/Magadan',
- 'Asia/Makassar',
- 'Asia/Manila',
- 'Asia/Muscat',
- 'Asia/Nicosia',
- 'Asia/Novokuznetsk',
- 'Asia/Novosibirsk',
- 'Asia/Omsk',
- 'Asia/Oral',
- 'Asia/Phnom_Penh',
- 'Asia/Pontianak',
- 'Asia/Pyongyang',
- 'Asia/Qatar',
- 'Asia/Qostanay',
- 'Asia/Qyzylorda',
- 'Asia/Riyadh',
- 'Asia/Sakhalin',
- 'Asia/Samarkand',
- 'Asia/Seoul',
- 'Asia/Shanghai',
- 'Asia/Singapore',
- 'Asia/Srednekolymsk',
- 'Asia/Taipei',
- 'Asia/Tashkent',
- 'Asia/Tbilisi',
- 'Asia/Tehran',
- 'Asia/Thimphu',
- 'Asia/Tokyo',
- 'Asia/Tomsk',
- 'Asia/Ulaanbaatar',
- 'Asia/Urumqi',
- 'Asia/Ust-Nera',
- 'Asia/Vientiane',
- 'Asia/Vladivostok',
- 'Asia/Yakutsk',
- 'Asia/Yangon',
- 'Asia/Yekaterinburg',
- 'Asia/Yerevan',
- 'Atlantic/Azores',
- 'Atlantic/Bermuda',
- 'Atlantic/Canary',
- 'Atlantic/Cape_Verde',
- 'Atlantic/Faroe',
- 'Atlantic/Madeira',
- 'Atlantic/Reykjavik',
- 'Atlantic/South_Georgia',
- 'Atlantic/St_Helena',
- 'Atlantic/Stanley',
- 'Australia/Adelaide',
- 'Australia/Brisbane',
- 'Australia/Broken_Hill',
- 'Australia/Darwin',
- 'Australia/Eucla',
- 'Australia/Hobart',
- 'Australia/Lindeman',
- 'Australia/Lord_Howe',
- 'Australia/Melbourne',
- 'Australia/Perth',
- 'Australia/Sydney',
- 'Canada/Atlantic',
- 'Canada/Central',
- 'Canada/Eastern',
- 'Canada/Mountain',
- 'Canada/Newfoundland',
- 'Canada/Pacific',
- 'Europe/Amsterdam',
- 'Europe/Andorra',
- 'Europe/Astrakhan',
- 'Europe/Athens',
- 'Europe/Belgrade',
- 'Europe/Berlin',
- 'Europe/Bratislava',
- 'Europe/Brussels',
- 'Europe/Bucharest',
- 'Europe/Budapest',
- 'Europe/Busingen',
- 'Europe/Chisinau',
- 'Europe/Copenhagen',
- 'Europe/Dublin',
- 'Europe/Gibraltar',
- 'Europe/Guernsey',
- 'Europe/Helsinki',
- 'Europe/Isle_of_Man',
- 'Europe/Istanbul',
- 'Europe/Jersey',
- 'Europe/Kaliningrad',
- 'Europe/Kirov',
- 'Europe/Kyiv',
- 'Europe/Lisbon',
- 'Europe/Ljubljana',
- 'Europe/London',
- 'Europe/Luxembourg',
- 'Europe/Madrid',
- 'Europe/Malta',
- 'Europe/Mariehamn',
- 'Europe/Minsk',
- 'Europe/Monaco',
- 'Europe/Moscow',
- 'Europe/Oslo',
- 'Europe/Paris',
- 'Europe/Podgorica',
- 'Europe/Prague',
- 'Europe/Riga',
- 'Europe/Rome',
- 'Europe/Samara',
- 'Europe/San_Marino',
- 'Europe/Sarajevo',
- 'Europe/Saratov',
- 'Europe/Simferopol',
- 'Europe/Skopje',
- 'Europe/Sofia',
- 'Europe/Stockholm',
- 'Europe/Tallinn',
- 'Europe/Tirane',
- 'Europe/Ulyanovsk',
- 'Europe/Vaduz',
- 'Europe/Vatican',
- 'Europe/Vienna',
- 'Europe/Vilnius',
- 'Europe/Volgograd',
- 'Europe/Warsaw',
- 'Europe/Zagreb',
- 'Europe/Zurich',
- 'GMT',
- 'Indian/Antananarivo',
- 'Indian/Chagos',
- 'Indian/Christmas',
- 'Indian/Cocos',
- 'Indian/Comoro',
- 'Indian/Kerguelen',
- 'Indian/Mahe',
- 'Indian/Maldives',
- 'Indian/Mauritius',
- 'Indian/Mayotte',
- 'Indian/Reunion',
- 'Pacific/Apia',
- 'Pacific/Auckland',
- 'Pacific/Bougainville',
- 'Pacific/Chatham',
- 'Pacific/Chuuk',
- 'Pacific/Easter',
- 'Pacific/Efate',
- 'Pacific/Fakaofo',
- 'Pacific/Fiji',
- 'Pacific/Funafuti',
- 'Pacific/Galapagos',
- 'Pacific/Gambier',
- 'Pacific/Guadalcanal',
- 'Pacific/Guam',
- 'Pacific/Honolulu',
- 'Pacific/Kanton',
- 'Pacific/Kiritimati',
- 'Pacific/Kosrae',
- 'Pacific/Kwajalein',
- 'Pacific/Majuro',
- 'Pacific/Marquesas',
- 'Pacific/Midway',
- 'Pacific/Nauru',
- 'Pacific/Niue',
- 'Pacific/Norfolk',
- 'Pacific/Noumea',
- 'Pacific/Pago_Pago',
- 'Pacific/Palau',
- 'Pacific/Pitcairn',
- 'Pacific/Pohnpei',
- 'Pacific/Port_Moresby',
- 'Pacific/Rarotonga',
- 'Pacific/Saipan',
- 'Pacific/Tahiti',
- 'Pacific/Tarawa',
- 'Pacific/Tongatapu',
- 'Pacific/Wake',
- 'Pacific/Wallis',
- 'US/Alaska',
- 'US/Arizona',
- 'US/Central',
- 'US/Eastern',
- 'US/Hawaii',
- 'US/Mountain',
- 'US/Pacific',
- 'UTC']
-common_timezones = LazyList(
-            tz for tz in common_timezones if tz in all_timezones)
-        
-common_timezones_set = LazySet(common_timezones)
diff --git a/libs/pytz/exceptions.py b/libs/pytz/exceptions.py
deleted file mode 100644
index 4b20bde9ff..0000000000
--- a/libs/pytz/exceptions.py
+++ /dev/null
@@ -1,59 +0,0 @@
-'''
-Custom exceptions raised by pytz.
-'''
-
-__all__ = [
-    'UnknownTimeZoneError', 'InvalidTimeError', 'AmbiguousTimeError',
-    'NonExistentTimeError',
-]
-
-
-class Error(Exception):
-    '''Base class for all exceptions raised by the pytz library'''
-
-
-class UnknownTimeZoneError(KeyError, Error):
-    '''Exception raised when pytz is passed an unknown timezone.
-
-    >>> isinstance(UnknownTimeZoneError(), LookupError)
-    True
-
-    This class is actually a subclass of KeyError to provide backwards
-    compatibility with code relying on the undocumented behavior of earlier
-    pytz releases.
-
-    >>> isinstance(UnknownTimeZoneError(), KeyError)
-    True
-
-    And also a subclass of pytz.exceptions.Error, as are other pytz
-    exceptions.
-
-    >>> isinstance(UnknownTimeZoneError(), Error)
-    True
-
-    '''
-    pass
-
-
-class InvalidTimeError(Error):
-    '''Base class for invalid time exceptions.'''
-
-
-class AmbiguousTimeError(InvalidTimeError):
-    '''Exception raised when attempting to create an ambiguous wallclock time.
-
-    At the end of a DST transition period, a particular wallclock time will
-    occur twice (once before the clocks are set back, once after). Both
-    possibilities may be correct, unless further information is supplied.
-
-    See DstTzInfo.normalize() for more info
-    '''
-
-
-class NonExistentTimeError(InvalidTimeError):
-    '''Exception raised when attempting to create a wallclock time that
-    cannot exist.
-
-    At the start of a DST transition period, the wallclock time jumps forward.
-    The instants jumped over never occur.
-    '''
diff --git a/libs/pytz/lazy.py b/libs/pytz/lazy.py
deleted file mode 100644
index 39344fc1f8..0000000000
--- a/libs/pytz/lazy.py
+++ /dev/null
@@ -1,172 +0,0 @@
-from threading import RLock
-try:
-    from collections.abc import Mapping as DictMixin
-except ImportError:  # Python < 3.3
-    try:
-        from UserDict import DictMixin  # Python 2
-    except ImportError:  # Python 3.0-3.3
-        from collections import Mapping as DictMixin
-
-
-# With lazy loading, we might end up with multiple threads triggering
-# it at the same time. We need a lock.
-_fill_lock = RLock()
-
-
-class LazyDict(DictMixin):
-    """Dictionary populated on first use."""
-    data = None
-
-    def __getitem__(self, key):
-        if self.data is None:
-            _fill_lock.acquire()
-            try:
-                if self.data is None:
-                    self._fill()
-            finally:
-                _fill_lock.release()
-        return self.data[key.upper()]
-
-    def __contains__(self, key):
-        if self.data is None:
-            _fill_lock.acquire()
-            try:
-                if self.data is None:
-                    self._fill()
-            finally:
-                _fill_lock.release()
-        return key in self.data
-
-    def __iter__(self):
-        if self.data is None:
-            _fill_lock.acquire()
-            try:
-                if self.data is None:
-                    self._fill()
-            finally:
-                _fill_lock.release()
-        return iter(self.data)
-
-    def __len__(self):
-        if self.data is None:
-            _fill_lock.acquire()
-            try:
-                if self.data is None:
-                    self._fill()
-            finally:
-                _fill_lock.release()
-        return len(self.data)
-
-    def keys(self):
-        if self.data is None:
-            _fill_lock.acquire()
-            try:
-                if self.data is None:
-                    self._fill()
-            finally:
-                _fill_lock.release()
-        return self.data.keys()
-
-
-class LazyList(list):
-    """List populated on first use."""
-
-    _props = [
-        '__str__', '__repr__', '__unicode__',
-        '__hash__', '__sizeof__', '__cmp__',
-        '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__',
-        'append', 'count', 'index', 'extend', 'insert', 'pop', 'remove',
-        'reverse', 'sort', '__add__', '__radd__', '__iadd__', '__mul__',
-        '__rmul__', '__imul__', '__contains__', '__len__', '__nonzero__',
-        '__getitem__', '__setitem__', '__delitem__', '__iter__',
-        '__reversed__', '__getslice__', '__setslice__', '__delslice__']
-
-    def __new__(cls, fill_iter=None):
-
-        if fill_iter is None:
-            return list()
-
-        # We need a new class as we will be dynamically messing with its
-        # methods.
-        class LazyList(list):
-            pass
-
-        fill_iter = [fill_iter]
-
-        def lazy(name):
-            def _lazy(self, *args, **kw):
-                _fill_lock.acquire()
-                try:
-                    if len(fill_iter) > 0:
-                        list.extend(self, fill_iter.pop())
-                        for method_name in cls._props:
-                            delattr(LazyList, method_name)
-                finally:
-                    _fill_lock.release()
-                return getattr(list, name)(self, *args, **kw)
-            return _lazy
-
-        for name in cls._props:
-            setattr(LazyList, name, lazy(name))
-
-        new_list = LazyList()
-        return new_list
-
-# Not all versions of Python declare the same magic methods.
-# Filter out properties that don't exist in this version of Python
-# from the list.
-LazyList._props = [prop for prop in LazyList._props if hasattr(list, prop)]
-
-
-class LazySet(set):
-    """Set populated on first use."""
-
-    _props = (
-        '__str__', '__repr__', '__unicode__',
-        '__hash__', '__sizeof__', '__cmp__',
-        '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__',
-        '__contains__', '__len__', '__nonzero__',
-        '__getitem__', '__setitem__', '__delitem__', '__iter__',
-        '__sub__', '__and__', '__xor__', '__or__',
-        '__rsub__', '__rand__', '__rxor__', '__ror__',
-        '__isub__', '__iand__', '__ixor__', '__ior__',
-        'add', 'clear', 'copy', 'difference', 'difference_update',
-        'discard', 'intersection', 'intersection_update', 'isdisjoint',
-        'issubset', 'issuperset', 'pop', 'remove',
-        'symmetric_difference', 'symmetric_difference_update',
-        'union', 'update')
-
-    def __new__(cls, fill_iter=None):
-
-        if fill_iter is None:
-            return set()
-
-        class LazySet(set):
-            pass
-
-        fill_iter = [fill_iter]
-
-        def lazy(name):
-            def _lazy(self, *args, **kw):
-                _fill_lock.acquire()
-                try:
-                    if len(fill_iter) > 0:
-                        for i in fill_iter.pop():
-                            set.add(self, i)
-                        for method_name in cls._props:
-                            delattr(LazySet, method_name)
-                finally:
-                    _fill_lock.release()
-                return getattr(set, name)(self, *args, **kw)
-            return _lazy
-
-        for name in cls._props:
-            setattr(LazySet, name, lazy(name))
-
-        new_set = LazySet()
-        return new_set
-
-# Not all versions of Python declare the same magic methods.
-# Filter out properties that don't exist in this version of Python
-# from the list.
-LazySet._props = [prop for prop in LazySet._props if hasattr(set, prop)]
diff --git a/libs/pytz/reference.py b/libs/pytz/reference.py
deleted file mode 100644
index f765ca0af0..0000000000
--- a/libs/pytz/reference.py
+++ /dev/null
@@ -1,140 +0,0 @@
-'''
-Reference tzinfo implementations from the Python docs.
-Used for testing against as they are only correct for the years
-1987 to 2006. Do not use these for real code.
-'''
-
-from datetime import tzinfo, timedelta, datetime
-from pytz import HOUR, ZERO, UTC
-
-__all__ = [
-    'FixedOffset',
-    'LocalTimezone',
-    'USTimeZone',
-    'Eastern',
-    'Central',
-    'Mountain',
-    'Pacific',
-    'UTC'
-]
-
-
-# A class building tzinfo objects for fixed-offset time zones.
-# Note that FixedOffset(0, "UTC") is a different way to build a
-# UTC tzinfo object.
-class FixedOffset(tzinfo):
-    """Fixed offset in minutes east from UTC."""
-
-    def __init__(self, offset, name):
-        self.__offset = timedelta(minutes=offset)
-        self.__name = name
-
-    def utcoffset(self, dt):
-        return self.__offset
-
-    def tzname(self, dt):
-        return self.__name
-
-    def dst(self, dt):
-        return ZERO
-
-
-import time as _time
-
-STDOFFSET = timedelta(seconds=-_time.timezone)
-if _time.daylight:
-    DSTOFFSET = timedelta(seconds=-_time.altzone)
-else:
-    DSTOFFSET = STDOFFSET
-
-DSTDIFF = DSTOFFSET - STDOFFSET
-
-
-# A class capturing the platform's idea of local time.
-class LocalTimezone(tzinfo):
-
-    def utcoffset(self, dt):
-        if self._isdst(dt):
-            return DSTOFFSET
-        else:
-            return STDOFFSET
-
-    def dst(self, dt):
-        if self._isdst(dt):
-            return DSTDIFF
-        else:
-            return ZERO
-
-    def tzname(self, dt):
-        return _time.tzname[self._isdst(dt)]
-
-    def _isdst(self, dt):
-        tt = (dt.year, dt.month, dt.day,
-              dt.hour, dt.minute, dt.second,
-              dt.weekday(), 0, -1)
-        stamp = _time.mktime(tt)
-        tt = _time.localtime(stamp)
-        return tt.tm_isdst > 0
-
-Local = LocalTimezone()
-
-
-def first_sunday_on_or_after(dt):
-    days_to_go = 6 - dt.weekday()
-    if days_to_go:
-        dt += timedelta(days_to_go)
-    return dt
-
-
-# In the US, DST starts at 2am (standard time) on the first Sunday in April.
-DSTSTART = datetime(1, 4, 1, 2)
-# and ends at 2am (DST time; 1am standard time) on the last Sunday of Oct.
-# which is the first Sunday on or after Oct 25.
-DSTEND = datetime(1, 10, 25, 1)
-
-
-# A complete implementation of current DST rules for major US time zones.
-class USTimeZone(tzinfo):
-
-    def __init__(self, hours, reprname, stdname, dstname):
-        self.stdoffset = timedelta(hours=hours)
-        self.reprname = reprname
-        self.stdname = stdname
-        self.dstname = dstname
-
-    def __repr__(self):
-        return self.reprname
-
-    def tzname(self, dt):
-        if self.dst(dt):
-            return self.dstname
-        else:
-            return self.stdname
-
-    def utcoffset(self, dt):
-        return self.stdoffset + self.dst(dt)
-
-    def dst(self, dt):
-        if dt is None or dt.tzinfo is None:
-            # An exception may be sensible here, in one or both cases.
-            # It depends on how you want to treat them.  The default
-            # fromutc() implementation (called by the default astimezone()
-            # implementation) passes a datetime with dt.tzinfo is self.
-            return ZERO
-        assert dt.tzinfo is self
-
-        # Find first Sunday in April & the last in October.
-        start = first_sunday_on_or_after(DSTSTART.replace(year=dt.year))
-        end = first_sunday_on_or_after(DSTEND.replace(year=dt.year))
-
-        # Can't compare naive to aware objects, so strip the timezone from
-        # dt first.
-        if start <= dt.replace(tzinfo=None) < end:
-            return HOUR
-        else:
-            return ZERO
-
-Eastern = USTimeZone(-5, "Eastern", "EST", "EDT")
-Central = USTimeZone(-6, "Central", "CST", "CDT")
-Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
-Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
diff --git a/libs/pytz/tzfile.py b/libs/pytz/tzfile.py
deleted file mode 100644
index 99e74489b8..0000000000
--- a/libs/pytz/tzfile.py
+++ /dev/null
@@ -1,133 +0,0 @@
-'''
-$Id: tzfile.py,v 1.8 2004/06/03 00:15:24 zenzen Exp $
-'''
-
-from datetime import datetime
-from struct import unpack, calcsize
-
-from pytz.tzinfo import StaticTzInfo, DstTzInfo, memorized_ttinfo
-from pytz.tzinfo import memorized_datetime, memorized_timedelta
-
-
-def _byte_string(s):
-    """Cast a string or byte string to an ASCII byte string."""
-    return s.encode('ASCII')
-
-_NULL = _byte_string('\0')
-
-
-def _std_string(s):
-    """Cast a string or byte string to an ASCII string."""
-    return str(s.decode('ASCII'))
-
-
-def build_tzinfo(zone, fp):
-    head_fmt = '>4s c 15x 6l'
-    head_size = calcsize(head_fmt)
-    (magic, format, ttisgmtcnt, ttisstdcnt, leapcnt, timecnt,
-        typecnt, charcnt) = unpack(head_fmt, fp.read(head_size))
-
-    # Make sure it is a tzfile(5) file
-    assert magic == _byte_string('TZif'), 'Got magic %s' % repr(magic)
-
-    # Read out the transition times, localtime indices and ttinfo structures.
-    data_fmt = '>%(timecnt)dl %(timecnt)dB %(ttinfo)s %(charcnt)ds' % dict(
-        timecnt=timecnt, ttinfo='lBB' * typecnt, charcnt=charcnt)
-    data_size = calcsize(data_fmt)
-    data = unpack(data_fmt, fp.read(data_size))
-
-    # make sure we unpacked the right number of values
-    assert len(data) == 2 * timecnt + 3 * typecnt + 1
-    transitions = [memorized_datetime(trans)
-                   for trans in data[:timecnt]]
-    lindexes = list(data[timecnt:2 * timecnt])
-    ttinfo_raw = data[2 * timecnt:-1]
-    tznames_raw = data[-1]
-    del data
-
-    # Process ttinfo into separate structs
-    ttinfo = []
-    tznames = {}
-    i = 0
-    while i < len(ttinfo_raw):
-        # have we looked up this timezone name yet?
-        tzname_offset = ttinfo_raw[i + 2]
-        if tzname_offset not in tznames:
-            nul = tznames_raw.find(_NULL, tzname_offset)
-            if nul < 0:
-                nul = len(tznames_raw)
-            tznames[tzname_offset] = _std_string(
-                tznames_raw[tzname_offset:nul])
-        ttinfo.append((ttinfo_raw[i],
-                       bool(ttinfo_raw[i + 1]),
-                       tznames[tzname_offset]))
-        i += 3
-
-    # Now build the timezone object
-    if len(ttinfo) == 1 or len(transitions) == 0:
-        ttinfo[0][0], ttinfo[0][2]
-        cls = type(zone, (StaticTzInfo,), dict(
-            zone=zone,
-            _utcoffset=memorized_timedelta(ttinfo[0][0]),
-            _tzname=ttinfo[0][2]))
-    else:
-        # Early dates use the first standard time ttinfo
-        i = 0
-        while ttinfo[i][1]:
-            i += 1
-        if ttinfo[i] == ttinfo[lindexes[0]]:
-            transitions[0] = datetime.min
-        else:
-            transitions.insert(0, datetime.min)
-            lindexes.insert(0, i)
-
-        # calculate transition info
-        transition_info = []
-        for i in range(len(transitions)):
-            inf = ttinfo[lindexes[i]]
-            utcoffset = inf[0]
-            if not inf[1]:
-                dst = 0
-            else:
-                for j in range(i - 1, -1, -1):
-                    prev_inf = ttinfo[lindexes[j]]
-                    if not prev_inf[1]:
-                        break
-                dst = inf[0] - prev_inf[0]  # dst offset
-
-                # Bad dst? Look further. DST > 24 hours happens when
-                # a timzone has moved across the international dateline.
-                if dst <= 0 or dst > 3600 * 3:
-                    for j in range(i + 1, len(transitions)):
-                        stdinf = ttinfo[lindexes[j]]
-                        if not stdinf[1]:
-                            dst = inf[0] - stdinf[0]
-                            if dst > 0:
-                                break  # Found a useful std time.
-
-            tzname = inf[2]
-
-            # Round utcoffset and dst to the nearest minute or the
-            # datetime library will complain. Conversions to these timezones
-            # might be up to plus or minus 30 seconds out, but it is
-            # the best we can do.
-            utcoffset = int((utcoffset + 30) // 60) * 60
-            dst = int((dst + 30) // 60) * 60
-            transition_info.append(memorized_ttinfo(utcoffset, dst, tzname))
-
-        cls = type(zone, (DstTzInfo,), dict(
-            zone=zone,
-            _utc_transition_times=transitions,
-            _transition_info=transition_info))
-
-    return cls()
-
-if __name__ == '__main__':
-    import os.path
-    from pprint import pprint
-    base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
-    tz = build_tzinfo('Australia/Melbourne',
-                      open(os.path.join(base, 'Australia', 'Melbourne'), 'rb'))
-    tz = build_tzinfo('US/Eastern',
-                      open(os.path.join(base, 'US', 'Eastern'), 'rb'))
-    pprint(tz._utc_transition_times)
diff --git a/libs/pytz/tzinfo.py b/libs/pytz/tzinfo.py
deleted file mode 100644
index 49b5c3febd..0000000000
--- a/libs/pytz/tzinfo.py
+++ /dev/null
@@ -1,580 +0,0 @@
-'''Base classes and helpers for building zone specific tzinfo classes'''
-
-from datetime import datetime, timedelta, tzinfo
-from bisect import bisect_right
-try:
-    set
-except NameError:
-    from sets import Set as set
-
-import pytz
-from pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
-
-__all__ = []
-
-_timedelta_cache = {}
-
-
-def memorized_timedelta(seconds):
-    '''Create only one instance of each distinct timedelta'''
-    try:
-        return _timedelta_cache[seconds]
-    except KeyError:
-        delta = timedelta(seconds=seconds)
-        _timedelta_cache[seconds] = delta
-        return delta
-
-
-_epoch = datetime(1970, 1, 1, 0, 0) # datetime.utcfromtimestamp(0)
-_datetime_cache = {0: _epoch}
-
-
-def memorized_datetime(seconds):
-    '''Create only one instance of each distinct datetime'''
-    try:
-        return _datetime_cache[seconds]
-    except KeyError:
-        # NB. We can't just do datetime.fromtimestamp(seconds, tz=timezone.utc).replace(tzinfo=None)
-        # as this fails with negative values under Windows (Bug #90096)
-        dt = _epoch + timedelta(seconds=seconds)
-        _datetime_cache[seconds] = dt
-        return dt
-
-
-_ttinfo_cache = {}
-
-
-def memorized_ttinfo(*args):
-    '''Create only one instance of each distinct tuple'''
-    try:
-        return _ttinfo_cache[args]
-    except KeyError:
-        ttinfo = (
-            memorized_timedelta(args[0]),
-            memorized_timedelta(args[1]),
-            args[2]
-        )
-        _ttinfo_cache[args] = ttinfo
-        return ttinfo
-
-
-_notime = memorized_timedelta(0)
-
-
-def _to_seconds(td):
-    '''Convert a timedelta to seconds'''
-    return td.seconds + td.days * 24 * 60 * 60
-
-
-class BaseTzInfo(tzinfo):
-    # Overridden in subclass
-    _utcoffset = None
-    _tzname = None
-    zone = None
-
-    def __str__(self):
-        return self.zone
-
-
-class StaticTzInfo(BaseTzInfo):
-    '''A timezone that has a constant offset from UTC
-
-    These timezones are rare, as most locations have changed their
-    offset at some point in their history
-    '''
-    def fromutc(self, dt):
-        '''See datetime.tzinfo.fromutc'''
-        if dt.tzinfo is not None and dt.tzinfo is not self:
-            raise ValueError('fromutc: dt.tzinfo is not self')
-        return (dt + self._utcoffset).replace(tzinfo=self)
-
-    def utcoffset(self, dt, is_dst=None):
-        '''See datetime.tzinfo.utcoffset
-
-        is_dst is ignored for StaticTzInfo, and exists only to
-        retain compatibility with DstTzInfo.
-        '''
-        return self._utcoffset
-
-    def dst(self, dt, is_dst=None):
-        '''See datetime.tzinfo.dst
-
-        is_dst is ignored for StaticTzInfo, and exists only to
-        retain compatibility with DstTzInfo.
-        '''
-        return _notime
-
-    def tzname(self, dt, is_dst=None):
-        '''See datetime.tzinfo.tzname
-
-        is_dst is ignored for StaticTzInfo, and exists only to
-        retain compatibility with DstTzInfo.
-        '''
-        return self._tzname
-
-    def localize(self, dt, is_dst=False):
-        '''Convert naive time to local time'''
-        if dt.tzinfo is not None:
-            raise ValueError('Not naive datetime (tzinfo is already set)')
-        return dt.replace(tzinfo=self)
-
-    def normalize(self, dt, is_dst=False):
-        '''Correct the timezone information on the given datetime.
-
-        This is normally a no-op, as StaticTzInfo timezones never have
-        ambiguous cases to correct:
-
-        >>> from pytz import timezone
-        >>> gmt = timezone('GMT')
-        >>> isinstance(gmt, StaticTzInfo)
-        True
-        >>> dt = datetime(2011, 5, 8, 1, 2, 3, tzinfo=gmt)
-        >>> gmt.normalize(dt) is dt
-        True
-
-        The supported method of converting between timezones is to use
-        datetime.astimezone(). Currently normalize() also works:
-
-        >>> la = timezone('America/Los_Angeles')
-        >>> dt = la.localize(datetime(2011, 5, 7, 1, 2, 3))
-        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
-        >>> gmt.normalize(dt).strftime(fmt)
-        '2011-05-07 08:02:03 GMT (+0000)'
-        '''
-        if dt.tzinfo is self:
-            return dt
-        if dt.tzinfo is None:
-            raise ValueError('Naive time - no tzinfo set')
-        return dt.astimezone(self)
-
-    def __repr__(self):
-        return '<StaticTzInfo %r>' % (self.zone,)
-
-    def __reduce__(self):
-        # Special pickle to zone remains a singleton and to cope with
-        # database changes.
-        return pytz._p, (self.zone,)
-
-
-class DstTzInfo(BaseTzInfo):
-    '''A timezone that has a variable offset from UTC
-
-    The offset might change if daylight saving time comes into effect,
-    or at a point in history when the region decides to change their
-    timezone definition.
-    '''
-    # Overridden in subclass
-
-    # Sorted list of DST transition times, UTC
-    _utc_transition_times = None
-
-    # [(utcoffset, dstoffset, tzname)] corresponding to
-    # _utc_transition_times entries
-    _transition_info = None
-
-    zone = None
-
-    # Set in __init__
-
-    _tzinfos = None
-    _dst = None  # DST offset
-
-    def __init__(self, _inf=None, _tzinfos=None):
-        if _inf:
-            self._tzinfos = _tzinfos
-            self._utcoffset, self._dst, self._tzname = _inf
-        else:
-            _tzinfos = {}
-            self._tzinfos = _tzinfos
-            self._utcoffset, self._dst, self._tzname = (
-                self._transition_info[0])
-            _tzinfos[self._transition_info[0]] = self
-            for inf in self._transition_info[1:]:
-                if inf not in _tzinfos:
-                    _tzinfos[inf] = self.__class__(inf, _tzinfos)
-
-    def fromutc(self, dt):
-        '''See datetime.tzinfo.fromutc'''
-        if (dt.tzinfo is not None and
-                getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
-            raise ValueError('fromutc: dt.tzinfo is not self')
-        dt = dt.replace(tzinfo=None)
-        idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)
-        inf = self._transition_info[idx]
-        return (dt + inf[0]).replace(tzinfo=self._tzinfos[inf])
-
-    def normalize(self, dt):
-        '''Correct the timezone information on the given datetime
-
-        If date arithmetic crosses DST boundaries, the tzinfo
-        is not magically adjusted. This method normalizes the
-        tzinfo to the correct one.
-
-        To test, first we need to do some setup
-
-        >>> from pytz import timezone
-        >>> utc = timezone('UTC')
-        >>> eastern = timezone('US/Eastern')
-        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
-
-        We next create a datetime right on an end-of-DST transition point,
-        the instant when the wallclocks are wound back one hour.
-
-        >>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
-        >>> loc_dt = utc_dt.astimezone(eastern)
-        >>> loc_dt.strftime(fmt)
-        '2002-10-27 01:00:00 EST (-0500)'
-
-        Now, if we subtract a few minutes from it, note that the timezone
-        information has not changed.
-
-        >>> before = loc_dt - timedelta(minutes=10)
-        >>> before.strftime(fmt)
-        '2002-10-27 00:50:00 EST (-0500)'
-
-        But we can fix that by calling the normalize method
-
-        >>> before = eastern.normalize(before)
-        >>> before.strftime(fmt)
-        '2002-10-27 01:50:00 EDT (-0400)'
-
-        The supported method of converting between timezones is to use
-        datetime.astimezone(). Currently, normalize() also works:
-
-        >>> th = timezone('Asia/Bangkok')
-        >>> am = timezone('Europe/Amsterdam')
-        >>> dt = th.localize(datetime(2011, 5, 7, 1, 2, 3))
-        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
-        >>> am.normalize(dt).strftime(fmt)
-        '2011-05-06 20:02:03 CEST (+0200)'
-        '''
-        if dt.tzinfo is None:
-            raise ValueError('Naive time - no tzinfo set')
-
-        # Convert dt in localtime to UTC
-        offset = dt.tzinfo._utcoffset
-        dt = dt.replace(tzinfo=None)
-        dt = dt - offset
-        # convert it back, and return it
-        return self.fromutc(dt)
-
-    def localize(self, dt, is_dst=False):
-        '''Convert naive time to local time.
-
-        This method should be used to construct localtimes, rather
-        than passing a tzinfo argument to a datetime constructor.
-
-        is_dst is used to determine the correct timezone in the ambigous
-        period at the end of daylight saving time.
-
-        >>> from pytz import timezone
-        >>> fmt = '%Y-%m-%d %H:%M:%S %Z (%z)'
-        >>> amdam = timezone('Europe/Amsterdam')
-        >>> dt  = datetime(2004, 10, 31, 2, 0, 0)
-        >>> loc_dt1 = amdam.localize(dt, is_dst=True)
-        >>> loc_dt2 = amdam.localize(dt, is_dst=False)
-        >>> loc_dt1.strftime(fmt)
-        '2004-10-31 02:00:00 CEST (+0200)'
-        >>> loc_dt2.strftime(fmt)
-        '2004-10-31 02:00:00 CET (+0100)'
-        >>> str(loc_dt2 - loc_dt1)
-        '1:00:00'
-
-        Use is_dst=None to raise an AmbiguousTimeError for ambiguous
-        times at the end of daylight saving time
-
-        >>> try:
-        ...     loc_dt1 = amdam.localize(dt, is_dst=None)
-        ... except AmbiguousTimeError:
-        ...     print('Ambiguous')
-        Ambiguous
-
-        is_dst defaults to False
-
-        >>> amdam.localize(dt) == amdam.localize(dt, False)
-        True
-
-        is_dst is also used to determine the correct timezone in the
-        wallclock times jumped over at the start of daylight saving time.
-
-        >>> pacific = timezone('US/Pacific')
-        >>> dt = datetime(2008, 3, 9, 2, 0, 0)
-        >>> ploc_dt1 = pacific.localize(dt, is_dst=True)
-        >>> ploc_dt2 = pacific.localize(dt, is_dst=False)
-        >>> ploc_dt1.strftime(fmt)
-        '2008-03-09 02:00:00 PDT (-0700)'
-        >>> ploc_dt2.strftime(fmt)
-        '2008-03-09 02:00:00 PST (-0800)'
-        >>> str(ploc_dt2 - ploc_dt1)
-        '1:00:00'
-
-        Use is_dst=None to raise a NonExistentTimeError for these skipped
-        times.
-
-        >>> try:
-        ...     loc_dt1 = pacific.localize(dt, is_dst=None)
-        ... except NonExistentTimeError:
-        ...     print('Non-existent')
-        Non-existent
-        '''
-        if dt.tzinfo is not None:
-            raise ValueError('Not naive datetime (tzinfo is already set)')
-
-        # Find the two best possibilities.
-        possible_loc_dt = set()
-        for delta in [timedelta(days=-1), timedelta(days=1)]:
-            loc_dt = dt + delta
-            idx = max(0, bisect_right(
-                self._utc_transition_times, loc_dt) - 1)
-            inf = self._transition_info[idx]
-            tzinfo = self._tzinfos[inf]
-            loc_dt = tzinfo.normalize(dt.replace(tzinfo=tzinfo))
-            if loc_dt.replace(tzinfo=None) == dt:
-                possible_loc_dt.add(loc_dt)
-
-        if len(possible_loc_dt) == 1:
-            return possible_loc_dt.pop()
-
-        # If there are no possibly correct timezones, we are attempting
-        # to convert a time that never happened - the time period jumped
-        # during the start-of-DST transition period.
-        if len(possible_loc_dt) == 0:
-            # If we refuse to guess, raise an exception.
-            if is_dst is None:
-                raise NonExistentTimeError(dt)
-
-            # If we are forcing the pre-DST side of the DST transition, we
-            # obtain the correct timezone by winding the clock forward a few
-            # hours.
-            elif is_dst:
-                return self.localize(
-                    dt + timedelta(hours=6), is_dst=True) - timedelta(hours=6)
-
-            # If we are forcing the post-DST side of the DST transition, we
-            # obtain the correct timezone by winding the clock back.
-            else:
-                return self.localize(
-                    dt - timedelta(hours=6),
-                    is_dst=False) + timedelta(hours=6)
-
-        # If we get this far, we have multiple possible timezones - this
-        # is an ambiguous case occurring during the end-of-DST transition.
-
-        # If told to be strict, raise an exception since we have an
-        # ambiguous case
-        if is_dst is None:
-            raise AmbiguousTimeError(dt)
-
-        # Filter out the possiblilities that don't match the requested
-        # is_dst
-        filtered_possible_loc_dt = [
-            p for p in possible_loc_dt if bool(p.tzinfo._dst) == is_dst
-        ]
-
-        # Hopefully we only have one possibility left. Return it.
-        if len(filtered_possible_loc_dt) == 1:
-            return filtered_possible_loc_dt[0]
-
-        if len(filtered_possible_loc_dt) == 0:
-            filtered_possible_loc_dt = list(possible_loc_dt)
-
-        # If we get this far, we have in a wierd timezone transition
-        # where the clocks have been wound back but is_dst is the same
-        # in both (eg. Europe/Warsaw 1915 when they switched to CET).
-        # At this point, we just have to guess unless we allow more
-        # hints to be passed in (such as the UTC offset or abbreviation),
-        # but that is just getting silly.
-        #
-        # Choose the earliest (by UTC) applicable timezone if is_dst=True
-        # Choose the latest (by UTC) applicable timezone if is_dst=False
-        # i.e., behave like end-of-DST transition
-        dates = {}  # utc -> local
-        for local_dt in filtered_possible_loc_dt:
-            utc_time = (
-                local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset)
-            assert utc_time not in dates
-            dates[utc_time] = local_dt
-        return dates[[min, max][not is_dst](dates)]
-
-    def utcoffset(self, dt, is_dst=None):
-        '''See datetime.tzinfo.utcoffset
-
-        The is_dst parameter may be used to remove ambiguity during DST
-        transitions.
-
-        >>> from pytz import timezone
-        >>> tz = timezone('America/St_Johns')
-        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
-
-        >>> str(tz.utcoffset(ambiguous, is_dst=False))
-        '-1 day, 20:30:00'
-
-        >>> str(tz.utcoffset(ambiguous, is_dst=True))
-        '-1 day, 21:30:00'
-
-        >>> try:
-        ...     tz.utcoffset(ambiguous)
-        ... except AmbiguousTimeError:
-        ...     print('Ambiguous')
-        Ambiguous
-
-        '''
-        if dt is None:
-            return None
-        elif dt.tzinfo is not self:
-            dt = self.localize(dt, is_dst)
-            return dt.tzinfo._utcoffset
-        else:
-            return self._utcoffset
-
-    def dst(self, dt, is_dst=None):
-        '''See datetime.tzinfo.dst
-
-        The is_dst parameter may be used to remove ambiguity during DST
-        transitions.
-
-        >>> from pytz import timezone
-        >>> tz = timezone('America/St_Johns')
-
-        >>> normal = datetime(2009, 9, 1)
-
-        >>> str(tz.dst(normal))
-        '1:00:00'
-        >>> str(tz.dst(normal, is_dst=False))
-        '1:00:00'
-        >>> str(tz.dst(normal, is_dst=True))
-        '1:00:00'
-
-        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
-
-        >>> str(tz.dst(ambiguous, is_dst=False))
-        '0:00:00'
-        >>> str(tz.dst(ambiguous, is_dst=True))
-        '1:00:00'
-        >>> try:
-        ...     tz.dst(ambiguous)
-        ... except AmbiguousTimeError:
-        ...     print('Ambiguous')
-        Ambiguous
-
-        '''
-        if dt is None:
-            return None
-        elif dt.tzinfo is not self:
-            dt = self.localize(dt, is_dst)
-            return dt.tzinfo._dst
-        else:
-            return self._dst
-
-    def tzname(self, dt, is_dst=None):
-        '''See datetime.tzinfo.tzname
-
-        The is_dst parameter may be used to remove ambiguity during DST
-        transitions.
-
-        >>> from pytz import timezone
-        >>> tz = timezone('America/St_Johns')
-
-        >>> normal = datetime(2009, 9, 1)
-
-        >>> tz.tzname(normal)
-        'NDT'
-        >>> tz.tzname(normal, is_dst=False)
-        'NDT'
-        >>> tz.tzname(normal, is_dst=True)
-        'NDT'
-
-        >>> ambiguous = datetime(2009, 10, 31, 23, 30)
-
-        >>> tz.tzname(ambiguous, is_dst=False)
-        'NST'
-        >>> tz.tzname(ambiguous, is_dst=True)
-        'NDT'
-        >>> try:
-        ...     tz.tzname(ambiguous)
-        ... except AmbiguousTimeError:
-        ...     print('Ambiguous')
-        Ambiguous
-        '''
-        if dt is None:
-            return self.zone
-        elif dt.tzinfo is not self:
-            dt = self.localize(dt, is_dst)
-            return dt.tzinfo._tzname
-        else:
-            return self._tzname
-
-    def __repr__(self):
-        if self._dst:
-            dst = 'DST'
-        else:
-            dst = 'STD'
-        if self._utcoffset > _notime:
-            return '<DstTzInfo %r %s+%s %s>' % (
-                self.zone, self._tzname, self._utcoffset, dst
-            )
-        else:
-            return '<DstTzInfo %r %s%s %s>' % (
-                self.zone, self._tzname, self._utcoffset, dst
-            )
-
-    def __reduce__(self):
-        # Special pickle to zone remains a singleton and to cope with
-        # database changes.
-        return pytz._p, (
-            self.zone,
-            _to_seconds(self._utcoffset),
-            _to_seconds(self._dst),
-            self._tzname
-        )
-
-
-def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
-    """Factory function for unpickling pytz tzinfo instances.
-
-    This is shared for both StaticTzInfo and DstTzInfo instances, because
-    database changes could cause a zones implementation to switch between
-    these two base classes and we can't break pickles on a pytz version
-    upgrade.
-    """
-    # Raises a KeyError if zone no longer exists, which should never happen
-    # and would be a bug.
-    tz = pytz.timezone(zone)
-
-    # A StaticTzInfo - just return it
-    if utcoffset is None:
-        return tz
-
-    # This pickle was created from a DstTzInfo. We need to
-    # determine which of the list of tzinfo instances for this zone
-    # to use in order to restore the state of any datetime instances using
-    # it correctly.
-    utcoffset = memorized_timedelta(utcoffset)
-    dstoffset = memorized_timedelta(dstoffset)
-    try:
-        return tz._tzinfos[(utcoffset, dstoffset, tzname)]
-    except KeyError:
-        # The particular state requested in this timezone no longer exists.
-        # This indicates a corrupt pickle, or the timezone database has been
-        # corrected violently enough to make this particular
-        # (utcoffset,dstoffset) no longer exist in the zone, or the
-        # abbreviation has been changed.
-        pass
-
-    # See if we can find an entry differing only by tzname. Abbreviations
-    # get changed from the initial guess by the database maintainers to
-    # match reality when this information is discovered.
-    for localized_tz in tz._tzinfos.values():
-        if (localized_tz._utcoffset == utcoffset and
-                localized_tz._dst == dstoffset):
-            return localized_tz
-
-    # This (utcoffset, dstoffset) information has been removed from the
-    # zone. Add it back. This might occur when the database maintainers have
-    # corrected incorrect information. datetime instances using this
-    # incorrect information will continue to do so, exactly as they were
-    # before being pickled. This is purely an overly paranoid safety net - I
-    # doubt this will ever been needed in real life.
-    inf = (utcoffset, dstoffset, tzname)
-    tz._tzinfos[inf] = tz.__class__(inf, tz._tzinfos)
-    return tz._tzinfos[inf]
diff --git a/libs/pytz/zoneinfo/Africa/Abidjan b/libs/pytz/zoneinfo/Africa/Abidjan
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Abidjan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Accra b/libs/pytz/zoneinfo/Africa/Accra
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Accra and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Addis_Ababa b/libs/pytz/zoneinfo/Africa/Addis_Ababa
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Addis_Ababa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Algiers b/libs/pytz/zoneinfo/Africa/Algiers
deleted file mode 100644
index 6cfd8a16e1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Algiers and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Asmara b/libs/pytz/zoneinfo/Africa/Asmara
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Asmara and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Asmera b/libs/pytz/zoneinfo/Africa/Asmera
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Asmera and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Bamako b/libs/pytz/zoneinfo/Africa/Bamako
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Bamako and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Bangui b/libs/pytz/zoneinfo/Africa/Bangui
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Bangui and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Banjul b/libs/pytz/zoneinfo/Africa/Banjul
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Banjul and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Bissau b/libs/pytz/zoneinfo/Africa/Bissau
deleted file mode 100644
index 82ea5aaf0c..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Bissau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Blantyre b/libs/pytz/zoneinfo/Africa/Blantyre
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Blantyre and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Brazzaville b/libs/pytz/zoneinfo/Africa/Brazzaville
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Brazzaville and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Bujumbura b/libs/pytz/zoneinfo/Africa/Bujumbura
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Bujumbura and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Cairo b/libs/pytz/zoneinfo/Africa/Cairo
deleted file mode 100644
index dd538c65db..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Cairo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Casablanca b/libs/pytz/zoneinfo/Africa/Casablanca
deleted file mode 100644
index d39016b89d..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Casablanca and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Ceuta b/libs/pytz/zoneinfo/Africa/Ceuta
deleted file mode 100644
index b41ec4f81a..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Ceuta and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Conakry b/libs/pytz/zoneinfo/Africa/Conakry
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Conakry and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Dakar b/libs/pytz/zoneinfo/Africa/Dakar
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Dakar and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Dar_es_Salaam b/libs/pytz/zoneinfo/Africa/Dar_es_Salaam
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Dar_es_Salaam and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Djibouti b/libs/pytz/zoneinfo/Africa/Djibouti
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Djibouti and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Douala b/libs/pytz/zoneinfo/Africa/Douala
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Douala and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/El_Aaiun b/libs/pytz/zoneinfo/Africa/El_Aaiun
deleted file mode 100644
index 066fbed008..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/El_Aaiun and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Freetown b/libs/pytz/zoneinfo/Africa/Freetown
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Freetown and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Gaborone b/libs/pytz/zoneinfo/Africa/Gaborone
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Gaborone and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Harare b/libs/pytz/zoneinfo/Africa/Harare
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Harare and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Johannesburg b/libs/pytz/zoneinfo/Africa/Johannesburg
deleted file mode 100644
index b1c425dace..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Johannesburg and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Juba b/libs/pytz/zoneinfo/Africa/Juba
deleted file mode 100644
index 06482943a4..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Juba and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Kampala b/libs/pytz/zoneinfo/Africa/Kampala
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Kampala and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Khartoum b/libs/pytz/zoneinfo/Africa/Khartoum
deleted file mode 100644
index 8ee8cb92e7..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Khartoum and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Kigali b/libs/pytz/zoneinfo/Africa/Kigali
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Kigali and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Kinshasa b/libs/pytz/zoneinfo/Africa/Kinshasa
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Kinshasa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Lagos b/libs/pytz/zoneinfo/Africa/Lagos
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Lagos and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Libreville b/libs/pytz/zoneinfo/Africa/Libreville
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Libreville and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Lome b/libs/pytz/zoneinfo/Africa/Lome
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Lome and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Luanda b/libs/pytz/zoneinfo/Africa/Luanda
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Luanda and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Lubumbashi b/libs/pytz/zoneinfo/Africa/Lubumbashi
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Lubumbashi and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Lusaka b/libs/pytz/zoneinfo/Africa/Lusaka
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Lusaka and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Malabo b/libs/pytz/zoneinfo/Africa/Malabo
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Malabo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Maputo b/libs/pytz/zoneinfo/Africa/Maputo
deleted file mode 100644
index 65f043f1d1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Maputo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Maseru b/libs/pytz/zoneinfo/Africa/Maseru
deleted file mode 100644
index b1c425dace..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Maseru and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Mbabane b/libs/pytz/zoneinfo/Africa/Mbabane
deleted file mode 100644
index b1c425dace..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Mbabane and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Mogadishu b/libs/pytz/zoneinfo/Africa/Mogadishu
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Mogadishu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Monrovia b/libs/pytz/zoneinfo/Africa/Monrovia
deleted file mode 100644
index 6d688502a1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Monrovia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Nairobi b/libs/pytz/zoneinfo/Africa/Nairobi
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Nairobi and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Ndjamena b/libs/pytz/zoneinfo/Africa/Ndjamena
deleted file mode 100644
index a968845e29..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Ndjamena and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Niamey b/libs/pytz/zoneinfo/Africa/Niamey
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Niamey and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Nouakchott b/libs/pytz/zoneinfo/Africa/Nouakchott
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Nouakchott and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Ouagadougou b/libs/pytz/zoneinfo/Africa/Ouagadougou
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Ouagadougou and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Porto-Novo b/libs/pytz/zoneinfo/Africa/Porto-Novo
deleted file mode 100644
index afb6a4a8fb..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Porto-Novo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Sao_Tome b/libs/pytz/zoneinfo/Africa/Sao_Tome
deleted file mode 100644
index 59f3759c40..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Sao_Tome and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Timbuktu b/libs/pytz/zoneinfo/Africa/Timbuktu
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Timbuktu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Tripoli b/libs/pytz/zoneinfo/Africa/Tripoli
deleted file mode 100644
index 07b393bb7d..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Tripoli and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Tunis b/libs/pytz/zoneinfo/Africa/Tunis
deleted file mode 100644
index 427fa56303..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Tunis and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Africa/Windhoek b/libs/pytz/zoneinfo/Africa/Windhoek
deleted file mode 100644
index abecd137b1..0000000000
Binary files a/libs/pytz/zoneinfo/Africa/Windhoek and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Adak b/libs/pytz/zoneinfo/America/Adak
deleted file mode 100644
index 43236498f6..0000000000
Binary files a/libs/pytz/zoneinfo/America/Adak and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Anchorage b/libs/pytz/zoneinfo/America/Anchorage
deleted file mode 100644
index 9bbb2fd3b3..0000000000
Binary files a/libs/pytz/zoneinfo/America/Anchorage and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Anguilla b/libs/pytz/zoneinfo/America/Anguilla
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Anguilla and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Antigua b/libs/pytz/zoneinfo/America/Antigua
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Antigua and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Araguaina b/libs/pytz/zoneinfo/America/Araguaina
deleted file mode 100644
index 919723dc2c..0000000000
Binary files a/libs/pytz/zoneinfo/America/Araguaina and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Buenos_Aires b/libs/pytz/zoneinfo/America/Argentina/Buenos_Aires
deleted file mode 100644
index cc82e69898..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Buenos_Aires and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Catamarca b/libs/pytz/zoneinfo/America/Argentina/Catamarca
deleted file mode 100644
index 7268eb3738..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Catamarca and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/ComodRivadavia b/libs/pytz/zoneinfo/America/Argentina/ComodRivadavia
deleted file mode 100644
index 7268eb3738..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/ComodRivadavia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Cordoba b/libs/pytz/zoneinfo/America/Argentina/Cordoba
deleted file mode 100644
index 2ad6ea5db2..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Cordoba and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Jujuy b/libs/pytz/zoneinfo/America/Argentina/Jujuy
deleted file mode 100644
index 7ca0b46f68..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Jujuy and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/La_Rioja b/libs/pytz/zoneinfo/America/Argentina/La_Rioja
deleted file mode 100644
index a6a6694f33..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/La_Rioja and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Mendoza b/libs/pytz/zoneinfo/America/Argentina/Mendoza
deleted file mode 100644
index 3232c80e20..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Mendoza and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Rio_Gallegos b/libs/pytz/zoneinfo/America/Argentina/Rio_Gallegos
deleted file mode 100644
index 8b1a2816ab..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Rio_Gallegos and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Salta b/libs/pytz/zoneinfo/America/Argentina/Salta
deleted file mode 100644
index 7072dec229..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Salta and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/San_Juan b/libs/pytz/zoneinfo/America/Argentina/San_Juan
deleted file mode 100644
index f3e185c3ab..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/San_Juan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/San_Luis b/libs/pytz/zoneinfo/America/Argentina/San_Luis
deleted file mode 100644
index 2d1da3ae3d..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/San_Luis and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Tucuman b/libs/pytz/zoneinfo/America/Argentina/Tucuman
deleted file mode 100644
index c6449f582a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Tucuman and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Argentina/Ushuaia b/libs/pytz/zoneinfo/America/Argentina/Ushuaia
deleted file mode 100644
index e74ce049c7..0000000000
Binary files a/libs/pytz/zoneinfo/America/Argentina/Ushuaia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Aruba b/libs/pytz/zoneinfo/America/Aruba
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Aruba and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Asuncion b/libs/pytz/zoneinfo/America/Asuncion
deleted file mode 100644
index 891279d4db..0000000000
Binary files a/libs/pytz/zoneinfo/America/Asuncion and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Atikokan b/libs/pytz/zoneinfo/America/Atikokan
deleted file mode 100644
index 9964b9a334..0000000000
Binary files a/libs/pytz/zoneinfo/America/Atikokan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Atka b/libs/pytz/zoneinfo/America/Atka
deleted file mode 100644
index 43236498f6..0000000000
Binary files a/libs/pytz/zoneinfo/America/Atka and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Bahia b/libs/pytz/zoneinfo/America/Bahia
deleted file mode 100644
index 0b65e49fca..0000000000
Binary files a/libs/pytz/zoneinfo/America/Bahia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Bahia_Banderas b/libs/pytz/zoneinfo/America/Bahia_Banderas
deleted file mode 100644
index 3a493e3d5a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Bahia_Banderas and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Barbados b/libs/pytz/zoneinfo/America/Barbados
deleted file mode 100644
index 00cd045ac8..0000000000
Binary files a/libs/pytz/zoneinfo/America/Barbados and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Belem b/libs/pytz/zoneinfo/America/Belem
deleted file mode 100644
index 0ae1202682..0000000000
Binary files a/libs/pytz/zoneinfo/America/Belem and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Belize b/libs/pytz/zoneinfo/America/Belize
deleted file mode 100644
index e6f5dfa6a8..0000000000
Binary files a/libs/pytz/zoneinfo/America/Belize and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Blanc-Sablon b/libs/pytz/zoneinfo/America/Blanc-Sablon
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Blanc-Sablon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Boa_Vista b/libs/pytz/zoneinfo/America/Boa_Vista
deleted file mode 100644
index 08d518b151..0000000000
Binary files a/libs/pytz/zoneinfo/America/Boa_Vista and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Bogota b/libs/pytz/zoneinfo/America/Bogota
deleted file mode 100644
index 331a1b7c4c..0000000000
Binary files a/libs/pytz/zoneinfo/America/Bogota and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Boise b/libs/pytz/zoneinfo/America/Boise
deleted file mode 100644
index aad1d991c4..0000000000
Binary files a/libs/pytz/zoneinfo/America/Boise and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Buenos_Aires b/libs/pytz/zoneinfo/America/Buenos_Aires
deleted file mode 100644
index cc82e69898..0000000000
Binary files a/libs/pytz/zoneinfo/America/Buenos_Aires and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Cambridge_Bay b/libs/pytz/zoneinfo/America/Cambridge_Bay
deleted file mode 100644
index 7e58a203c6..0000000000
Binary files a/libs/pytz/zoneinfo/America/Cambridge_Bay and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Campo_Grande b/libs/pytz/zoneinfo/America/Campo_Grande
deleted file mode 100644
index 53b3330fac..0000000000
Binary files a/libs/pytz/zoneinfo/America/Campo_Grande and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Cancun b/libs/pytz/zoneinfo/America/Cancun
deleted file mode 100644
index 0f7771e851..0000000000
Binary files a/libs/pytz/zoneinfo/America/Cancun and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Caracas b/libs/pytz/zoneinfo/America/Caracas
deleted file mode 100644
index 3f3ebc9c41..0000000000
Binary files a/libs/pytz/zoneinfo/America/Caracas and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Catamarca b/libs/pytz/zoneinfo/America/Catamarca
deleted file mode 100644
index 7268eb3738..0000000000
Binary files a/libs/pytz/zoneinfo/America/Catamarca and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Cayenne b/libs/pytz/zoneinfo/America/Cayenne
deleted file mode 100644
index e898594276..0000000000
Binary files a/libs/pytz/zoneinfo/America/Cayenne and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Cayman b/libs/pytz/zoneinfo/America/Cayman
deleted file mode 100644
index 9964b9a334..0000000000
Binary files a/libs/pytz/zoneinfo/America/Cayman and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Chicago b/libs/pytz/zoneinfo/America/Chicago
deleted file mode 100644
index c6981a06b1..0000000000
Binary files a/libs/pytz/zoneinfo/America/Chicago and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Chihuahua b/libs/pytz/zoneinfo/America/Chihuahua
deleted file mode 100644
index 667a219114..0000000000
Binary files a/libs/pytz/zoneinfo/America/Chihuahua and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Ciudad_Juarez b/libs/pytz/zoneinfo/America/Ciudad_Juarez
deleted file mode 100644
index 29af5982ac..0000000000
Binary files a/libs/pytz/zoneinfo/America/Ciudad_Juarez and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Coral_Harbour b/libs/pytz/zoneinfo/America/Coral_Harbour
deleted file mode 100644
index 9964b9a334..0000000000
Binary files a/libs/pytz/zoneinfo/America/Coral_Harbour and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Cordoba b/libs/pytz/zoneinfo/America/Cordoba
deleted file mode 100644
index 2ad6ea5db2..0000000000
Binary files a/libs/pytz/zoneinfo/America/Cordoba and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Costa_Rica b/libs/pytz/zoneinfo/America/Costa_Rica
deleted file mode 100644
index 37cb85e4db..0000000000
Binary files a/libs/pytz/zoneinfo/America/Costa_Rica and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Creston b/libs/pytz/zoneinfo/America/Creston
deleted file mode 100644
index ab37e84556..0000000000
Binary files a/libs/pytz/zoneinfo/America/Creston and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Cuiaba b/libs/pytz/zoneinfo/America/Cuiaba
deleted file mode 100644
index 26e97f6ebf..0000000000
Binary files a/libs/pytz/zoneinfo/America/Cuiaba and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Curacao b/libs/pytz/zoneinfo/America/Curacao
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Curacao and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Danmarkshavn b/libs/pytz/zoneinfo/America/Danmarkshavn
deleted file mode 100644
index 9549adcb65..0000000000
Binary files a/libs/pytz/zoneinfo/America/Danmarkshavn and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Dawson b/libs/pytz/zoneinfo/America/Dawson
deleted file mode 100644
index 343b63227d..0000000000
Binary files a/libs/pytz/zoneinfo/America/Dawson and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Dawson_Creek b/libs/pytz/zoneinfo/America/Dawson_Creek
deleted file mode 100644
index db9e339655..0000000000
Binary files a/libs/pytz/zoneinfo/America/Dawson_Creek and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Denver b/libs/pytz/zoneinfo/America/Denver
deleted file mode 100644
index abb2b974a4..0000000000
Binary files a/libs/pytz/zoneinfo/America/Denver and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Detroit b/libs/pytz/zoneinfo/America/Detroit
deleted file mode 100644
index e104faa465..0000000000
Binary files a/libs/pytz/zoneinfo/America/Detroit and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Dominica b/libs/pytz/zoneinfo/America/Dominica
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Dominica and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Edmonton b/libs/pytz/zoneinfo/America/Edmonton
deleted file mode 100644
index cd78a6f8be..0000000000
Binary files a/libs/pytz/zoneinfo/America/Edmonton and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Eirunepe b/libs/pytz/zoneinfo/America/Eirunepe
deleted file mode 100644
index d4c46e3091..0000000000
Binary files a/libs/pytz/zoneinfo/America/Eirunepe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/El_Salvador b/libs/pytz/zoneinfo/America/El_Salvador
deleted file mode 100644
index e2f22304aa..0000000000
Binary files a/libs/pytz/zoneinfo/America/El_Salvador and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Ensenada b/libs/pytz/zoneinfo/America/Ensenada
deleted file mode 100644
index 0fe73912ca..0000000000
Binary files a/libs/pytz/zoneinfo/America/Ensenada and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Fort_Nelson b/libs/pytz/zoneinfo/America/Fort_Nelson
deleted file mode 100644
index 5a0b7f1ca0..0000000000
Binary files a/libs/pytz/zoneinfo/America/Fort_Nelson and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Fort_Wayne b/libs/pytz/zoneinfo/America/Fort_Wayne
deleted file mode 100644
index a84b6e9967..0000000000
Binary files a/libs/pytz/zoneinfo/America/Fort_Wayne and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Fortaleza b/libs/pytz/zoneinfo/America/Fortaleza
deleted file mode 100644
index bee1a95152..0000000000
Binary files a/libs/pytz/zoneinfo/America/Fortaleza and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Glace_Bay b/libs/pytz/zoneinfo/America/Glace_Bay
deleted file mode 100644
index 48412a4cbf..0000000000
Binary files a/libs/pytz/zoneinfo/America/Glace_Bay and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Godthab b/libs/pytz/zoneinfo/America/Godthab
deleted file mode 100644
index 29958cf12a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Godthab and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Goose_Bay b/libs/pytz/zoneinfo/America/Goose_Bay
deleted file mode 100644
index a3f299079a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Goose_Bay and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Grand_Turk b/libs/pytz/zoneinfo/America/Grand_Turk
deleted file mode 100644
index 06da1a6d7a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Grand_Turk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Grenada b/libs/pytz/zoneinfo/America/Grenada
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Grenada and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Guadeloupe b/libs/pytz/zoneinfo/America/Guadeloupe
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Guadeloupe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Guatemala b/libs/pytz/zoneinfo/America/Guatemala
deleted file mode 100644
index 407138caf9..0000000000
Binary files a/libs/pytz/zoneinfo/America/Guatemala and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Guayaquil b/libs/pytz/zoneinfo/America/Guayaquil
deleted file mode 100644
index 40831be11e..0000000000
Binary files a/libs/pytz/zoneinfo/America/Guayaquil and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Guyana b/libs/pytz/zoneinfo/America/Guyana
deleted file mode 100644
index 9b70367230..0000000000
Binary files a/libs/pytz/zoneinfo/America/Guyana and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Halifax b/libs/pytz/zoneinfo/America/Halifax
deleted file mode 100644
index 756099abe6..0000000000
Binary files a/libs/pytz/zoneinfo/America/Halifax and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Havana b/libs/pytz/zoneinfo/America/Havana
deleted file mode 100644
index b69ac45107..0000000000
Binary files a/libs/pytz/zoneinfo/America/Havana and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Hermosillo b/libs/pytz/zoneinfo/America/Hermosillo
deleted file mode 100644
index 441fe3f2dd..0000000000
Binary files a/libs/pytz/zoneinfo/America/Hermosillo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Indianapolis b/libs/pytz/zoneinfo/America/Indiana/Indianapolis
deleted file mode 100644
index a84b6e9967..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Indianapolis and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Knox b/libs/pytz/zoneinfo/America/Indiana/Knox
deleted file mode 100644
index 025d132dd4..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Knox and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Marengo b/libs/pytz/zoneinfo/America/Indiana/Marengo
deleted file mode 100644
index 677bbff6a9..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Marengo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Petersburg b/libs/pytz/zoneinfo/America/Indiana/Petersburg
deleted file mode 100644
index 3082de00c2..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Petersburg and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Tell_City b/libs/pytz/zoneinfo/America/Indiana/Tell_City
deleted file mode 100644
index 103c5cb317..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Tell_City and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Vevay b/libs/pytz/zoneinfo/America/Indiana/Vevay
deleted file mode 100644
index 315b4c45ae..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Vevay and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Vincennes b/libs/pytz/zoneinfo/America/Indiana/Vincennes
deleted file mode 100644
index 35a2413344..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Vincennes and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indiana/Winamac b/libs/pytz/zoneinfo/America/Indiana/Winamac
deleted file mode 100644
index 6d4e19377e..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indiana/Winamac and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Indianapolis b/libs/pytz/zoneinfo/America/Indianapolis
deleted file mode 100644
index a84b6e9967..0000000000
Binary files a/libs/pytz/zoneinfo/America/Indianapolis and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Inuvik b/libs/pytz/zoneinfo/America/Inuvik
deleted file mode 100644
index 04c2df456f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Inuvik and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Iqaluit b/libs/pytz/zoneinfo/America/Iqaluit
deleted file mode 100644
index 0b47b9032f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Iqaluit and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Jamaica b/libs/pytz/zoneinfo/America/Jamaica
deleted file mode 100644
index 2a9b7fd52d..0000000000
Binary files a/libs/pytz/zoneinfo/America/Jamaica and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Jujuy b/libs/pytz/zoneinfo/America/Jujuy
deleted file mode 100644
index 7ca0b46f68..0000000000
Binary files a/libs/pytz/zoneinfo/America/Jujuy and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Juneau b/libs/pytz/zoneinfo/America/Juneau
deleted file mode 100644
index 451f349009..0000000000
Binary files a/libs/pytz/zoneinfo/America/Juneau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Kentucky/Louisville b/libs/pytz/zoneinfo/America/Kentucky/Louisville
deleted file mode 100644
index 3a335b3716..0000000000
Binary files a/libs/pytz/zoneinfo/America/Kentucky/Louisville and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Kentucky/Monticello b/libs/pytz/zoneinfo/America/Kentucky/Monticello
deleted file mode 100644
index 576f16bb2b..0000000000
Binary files a/libs/pytz/zoneinfo/America/Kentucky/Monticello and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Knox_IN b/libs/pytz/zoneinfo/America/Knox_IN
deleted file mode 100644
index 025d132dd4..0000000000
Binary files a/libs/pytz/zoneinfo/America/Knox_IN and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Kralendijk b/libs/pytz/zoneinfo/America/Kralendijk
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Kralendijk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/La_Paz b/libs/pytz/zoneinfo/America/La_Paz
deleted file mode 100644
index 374586ea67..0000000000
Binary files a/libs/pytz/zoneinfo/America/La_Paz and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Lima b/libs/pytz/zoneinfo/America/Lima
deleted file mode 100644
index c13bb6be45..0000000000
Binary files a/libs/pytz/zoneinfo/America/Lima and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Los_Angeles b/libs/pytz/zoneinfo/America/Los_Angeles
deleted file mode 100644
index 610e7af5fc..0000000000
Binary files a/libs/pytz/zoneinfo/America/Los_Angeles and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Louisville b/libs/pytz/zoneinfo/America/Louisville
deleted file mode 100644
index 3a335b3716..0000000000
Binary files a/libs/pytz/zoneinfo/America/Louisville and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Lower_Princes b/libs/pytz/zoneinfo/America/Lower_Princes
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Lower_Princes and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Maceio b/libs/pytz/zoneinfo/America/Maceio
deleted file mode 100644
index 437a47310e..0000000000
Binary files a/libs/pytz/zoneinfo/America/Maceio and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Managua b/libs/pytz/zoneinfo/America/Managua
deleted file mode 100644
index e0242bff6e..0000000000
Binary files a/libs/pytz/zoneinfo/America/Managua and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Manaus b/libs/pytz/zoneinfo/America/Manaus
deleted file mode 100644
index 2708baea5a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Manaus and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Marigot b/libs/pytz/zoneinfo/America/Marigot
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Marigot and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Martinique b/libs/pytz/zoneinfo/America/Martinique
deleted file mode 100644
index 8df43dcf1c..0000000000
Binary files a/libs/pytz/zoneinfo/America/Martinique and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Matamoros b/libs/pytz/zoneinfo/America/Matamoros
deleted file mode 100644
index bbe04e8661..0000000000
Binary files a/libs/pytz/zoneinfo/America/Matamoros and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Mazatlan b/libs/pytz/zoneinfo/America/Mazatlan
deleted file mode 100644
index 386616a59c..0000000000
Binary files a/libs/pytz/zoneinfo/America/Mazatlan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Mendoza b/libs/pytz/zoneinfo/America/Mendoza
deleted file mode 100644
index 3232c80e20..0000000000
Binary files a/libs/pytz/zoneinfo/America/Mendoza and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Menominee b/libs/pytz/zoneinfo/America/Menominee
deleted file mode 100644
index 314613866d..0000000000
Binary files a/libs/pytz/zoneinfo/America/Menominee and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Merida b/libs/pytz/zoneinfo/America/Merida
deleted file mode 100644
index c4b9b4e880..0000000000
Binary files a/libs/pytz/zoneinfo/America/Merida and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Metlakatla b/libs/pytz/zoneinfo/America/Metlakatla
deleted file mode 100644
index 1e94be3d55..0000000000
Binary files a/libs/pytz/zoneinfo/America/Metlakatla and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Mexico_City b/libs/pytz/zoneinfo/America/Mexico_City
deleted file mode 100644
index ad70cf3e08..0000000000
Binary files a/libs/pytz/zoneinfo/America/Mexico_City and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Miquelon b/libs/pytz/zoneinfo/America/Miquelon
deleted file mode 100644
index f780ea990f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Miquelon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Moncton b/libs/pytz/zoneinfo/America/Moncton
deleted file mode 100644
index 9df8d0f2ec..0000000000
Binary files a/libs/pytz/zoneinfo/America/Moncton and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Monterrey b/libs/pytz/zoneinfo/America/Monterrey
deleted file mode 100644
index 2d7993a0d7..0000000000
Binary files a/libs/pytz/zoneinfo/America/Monterrey and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Montevideo b/libs/pytz/zoneinfo/America/Montevideo
deleted file mode 100644
index e7bbfbb8c3..0000000000
Binary files a/libs/pytz/zoneinfo/America/Montevideo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Montreal b/libs/pytz/zoneinfo/America/Montreal
deleted file mode 100644
index 170137333f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Montreal and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Montserrat b/libs/pytz/zoneinfo/America/Montserrat
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Montserrat and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Nassau b/libs/pytz/zoneinfo/America/Nassau
deleted file mode 100644
index 170137333f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Nassau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/New_York b/libs/pytz/zoneinfo/America/New_York
deleted file mode 100644
index a8b9ab1992..0000000000
Binary files a/libs/pytz/zoneinfo/America/New_York and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Nipigon b/libs/pytz/zoneinfo/America/Nipigon
deleted file mode 100644
index 170137333f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Nipigon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Nome b/libs/pytz/zoneinfo/America/Nome
deleted file mode 100644
index 10998df3bb..0000000000
Binary files a/libs/pytz/zoneinfo/America/Nome and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Noronha b/libs/pytz/zoneinfo/America/Noronha
deleted file mode 100644
index 73b4b336ab..0000000000
Binary files a/libs/pytz/zoneinfo/America/Noronha and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/North_Dakota/Beulah b/libs/pytz/zoneinfo/America/North_Dakota/Beulah
deleted file mode 100644
index 33e317e25b..0000000000
Binary files a/libs/pytz/zoneinfo/America/North_Dakota/Beulah and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/North_Dakota/Center b/libs/pytz/zoneinfo/America/North_Dakota/Center
deleted file mode 100644
index 17fe13bcc1..0000000000
Binary files a/libs/pytz/zoneinfo/America/North_Dakota/Center and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/North_Dakota/New_Salem b/libs/pytz/zoneinfo/America/North_Dakota/New_Salem
deleted file mode 100644
index 12dbe801ae..0000000000
Binary files a/libs/pytz/zoneinfo/America/North_Dakota/New_Salem and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Nuuk b/libs/pytz/zoneinfo/America/Nuuk
deleted file mode 100644
index 29958cf12a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Nuuk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Ojinaga b/libs/pytz/zoneinfo/America/Ojinaga
deleted file mode 100644
index 45118a4f4b..0000000000
Binary files a/libs/pytz/zoneinfo/America/Ojinaga and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Panama b/libs/pytz/zoneinfo/America/Panama
deleted file mode 100644
index 9964b9a334..0000000000
Binary files a/libs/pytz/zoneinfo/America/Panama and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Pangnirtung b/libs/pytz/zoneinfo/America/Pangnirtung
deleted file mode 100644
index 0b47b9032f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Pangnirtung and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Paramaribo b/libs/pytz/zoneinfo/America/Paramaribo
deleted file mode 100644
index f1b82b4f9a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Paramaribo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Phoenix b/libs/pytz/zoneinfo/America/Phoenix
deleted file mode 100644
index ab37e84556..0000000000
Binary files a/libs/pytz/zoneinfo/America/Phoenix and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Port-au-Prince b/libs/pytz/zoneinfo/America/Port-au-Prince
deleted file mode 100644
index 287f143926..0000000000
Binary files a/libs/pytz/zoneinfo/America/Port-au-Prince and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Port_of_Spain b/libs/pytz/zoneinfo/America/Port_of_Spain
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Port_of_Spain and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Porto_Acre b/libs/pytz/zoneinfo/America/Porto_Acre
deleted file mode 100644
index cdda168cb9..0000000000
Binary files a/libs/pytz/zoneinfo/America/Porto_Acre and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Porto_Velho b/libs/pytz/zoneinfo/America/Porto_Velho
deleted file mode 100644
index e00398602c..0000000000
Binary files a/libs/pytz/zoneinfo/America/Porto_Velho and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Puerto_Rico b/libs/pytz/zoneinfo/America/Puerto_Rico
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Puerto_Rico and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Punta_Arenas b/libs/pytz/zoneinfo/America/Punta_Arenas
deleted file mode 100644
index 411a839b84..0000000000
Binary files a/libs/pytz/zoneinfo/America/Punta_Arenas and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Rainy_River b/libs/pytz/zoneinfo/America/Rainy_River
deleted file mode 100644
index ac40299f6b..0000000000
Binary files a/libs/pytz/zoneinfo/America/Rainy_River and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Rankin_Inlet b/libs/pytz/zoneinfo/America/Rankin_Inlet
deleted file mode 100644
index e2714921a8..0000000000
Binary files a/libs/pytz/zoneinfo/America/Rankin_Inlet and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Recife b/libs/pytz/zoneinfo/America/Recife
deleted file mode 100644
index 5bf6c211c1..0000000000
Binary files a/libs/pytz/zoneinfo/America/Recife and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Regina b/libs/pytz/zoneinfo/America/Regina
deleted file mode 100644
index 20c9c84df4..0000000000
Binary files a/libs/pytz/zoneinfo/America/Regina and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Resolute b/libs/pytz/zoneinfo/America/Resolute
deleted file mode 100644
index 19668900de..0000000000
Binary files a/libs/pytz/zoneinfo/America/Resolute and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Rio_Branco b/libs/pytz/zoneinfo/America/Rio_Branco
deleted file mode 100644
index cdda168cb9..0000000000
Binary files a/libs/pytz/zoneinfo/America/Rio_Branco and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Rosario b/libs/pytz/zoneinfo/America/Rosario
deleted file mode 100644
index 2ad6ea5db2..0000000000
Binary files a/libs/pytz/zoneinfo/America/Rosario and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Santa_Isabel b/libs/pytz/zoneinfo/America/Santa_Isabel
deleted file mode 100644
index 0fe73912ca..0000000000
Binary files a/libs/pytz/zoneinfo/America/Santa_Isabel and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Santarem b/libs/pytz/zoneinfo/America/Santarem
deleted file mode 100644
index 001638c2f2..0000000000
Binary files a/libs/pytz/zoneinfo/America/Santarem and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Santiago b/libs/pytz/zoneinfo/America/Santiago
deleted file mode 100644
index 010c6bd04c..0000000000
Binary files a/libs/pytz/zoneinfo/America/Santiago and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Santo_Domingo b/libs/pytz/zoneinfo/America/Santo_Domingo
deleted file mode 100644
index 4fe36fd4c1..0000000000
Binary files a/libs/pytz/zoneinfo/America/Santo_Domingo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Sao_Paulo b/libs/pytz/zoneinfo/America/Sao_Paulo
deleted file mode 100644
index 67935ff4da..0000000000
Binary files a/libs/pytz/zoneinfo/America/Sao_Paulo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Scoresbysund b/libs/pytz/zoneinfo/America/Scoresbysund
deleted file mode 100644
index 9bf411ef5a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Scoresbysund and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Shiprock b/libs/pytz/zoneinfo/America/Shiprock
deleted file mode 100644
index abb2b974a4..0000000000
Binary files a/libs/pytz/zoneinfo/America/Shiprock and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Sitka b/libs/pytz/zoneinfo/America/Sitka
deleted file mode 100644
index 31f7061371..0000000000
Binary files a/libs/pytz/zoneinfo/America/Sitka and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/St_Barthelemy b/libs/pytz/zoneinfo/America/St_Barthelemy
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/St_Barthelemy and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/St_Johns b/libs/pytz/zoneinfo/America/St_Johns
deleted file mode 100644
index 65a5b0c720..0000000000
Binary files a/libs/pytz/zoneinfo/America/St_Johns and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/St_Kitts b/libs/pytz/zoneinfo/America/St_Kitts
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/St_Kitts and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/St_Lucia b/libs/pytz/zoneinfo/America/St_Lucia
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/St_Lucia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/St_Thomas b/libs/pytz/zoneinfo/America/St_Thomas
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/St_Thomas and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/St_Vincent b/libs/pytz/zoneinfo/America/St_Vincent
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/St_Vincent and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Swift_Current b/libs/pytz/zoneinfo/America/Swift_Current
deleted file mode 100644
index 8e9ef255ee..0000000000
Binary files a/libs/pytz/zoneinfo/America/Swift_Current and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Tegucigalpa b/libs/pytz/zoneinfo/America/Tegucigalpa
deleted file mode 100644
index 2adacb2e50..0000000000
Binary files a/libs/pytz/zoneinfo/America/Tegucigalpa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Thule b/libs/pytz/zoneinfo/America/Thule
deleted file mode 100644
index 6f802f1c2a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Thule and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Thunder_Bay b/libs/pytz/zoneinfo/America/Thunder_Bay
deleted file mode 100644
index 170137333f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Thunder_Bay and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Tijuana b/libs/pytz/zoneinfo/America/Tijuana
deleted file mode 100644
index 0fe73912ca..0000000000
Binary files a/libs/pytz/zoneinfo/America/Tijuana and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Toronto b/libs/pytz/zoneinfo/America/Toronto
deleted file mode 100644
index 170137333f..0000000000
Binary files a/libs/pytz/zoneinfo/America/Toronto and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Tortola b/libs/pytz/zoneinfo/America/Tortola
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Tortola and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Vancouver b/libs/pytz/zoneinfo/America/Vancouver
deleted file mode 100644
index bb60cbced3..0000000000
Binary files a/libs/pytz/zoneinfo/America/Vancouver and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Virgin b/libs/pytz/zoneinfo/America/Virgin
deleted file mode 100644
index a662a57137..0000000000
Binary files a/libs/pytz/zoneinfo/America/Virgin and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Whitehorse b/libs/pytz/zoneinfo/America/Whitehorse
deleted file mode 100644
index 318c4a8e40..0000000000
Binary files a/libs/pytz/zoneinfo/America/Whitehorse and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Winnipeg b/libs/pytz/zoneinfo/America/Winnipeg
deleted file mode 100644
index ac40299f6b..0000000000
Binary files a/libs/pytz/zoneinfo/America/Winnipeg and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Yakutat b/libs/pytz/zoneinfo/America/Yakutat
deleted file mode 100644
index da209f9f0a..0000000000
Binary files a/libs/pytz/zoneinfo/America/Yakutat and /dev/null differ
diff --git a/libs/pytz/zoneinfo/America/Yellowknife b/libs/pytz/zoneinfo/America/Yellowknife
deleted file mode 100644
index cd78a6f8be..0000000000
Binary files a/libs/pytz/zoneinfo/America/Yellowknife and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Casey b/libs/pytz/zoneinfo/Antarctica/Casey
deleted file mode 100644
index 586a7653ef..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Casey and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Davis b/libs/pytz/zoneinfo/Antarctica/Davis
deleted file mode 100644
index d4d47b2464..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Davis and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/DumontDUrville b/libs/pytz/zoneinfo/Antarctica/DumontDUrville
deleted file mode 100644
index 7be2474dd9..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/DumontDUrville and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Macquarie b/libs/pytz/zoneinfo/Antarctica/Macquarie
deleted file mode 100644
index 9e7cc687d7..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Macquarie and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Mawson b/libs/pytz/zoneinfo/Antarctica/Mawson
deleted file mode 100644
index 6d93f6e1d3..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Mawson and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/McMurdo b/libs/pytz/zoneinfo/Antarctica/McMurdo
deleted file mode 100644
index 6575fdce31..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/McMurdo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Palmer b/libs/pytz/zoneinfo/Antarctica/Palmer
deleted file mode 100644
index 9c8fd317e0..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Palmer and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Rothera b/libs/pytz/zoneinfo/Antarctica/Rothera
deleted file mode 100644
index 241cc44d50..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Rothera and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/South_Pole b/libs/pytz/zoneinfo/Antarctica/South_Pole
deleted file mode 100644
index 6575fdce31..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/South_Pole and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Syowa b/libs/pytz/zoneinfo/Antarctica/Syowa
deleted file mode 100644
index 8c8062471d..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Syowa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Troll b/libs/pytz/zoneinfo/Antarctica/Troll
deleted file mode 100644
index a1dcea14de..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Troll and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Antarctica/Vostok b/libs/pytz/zoneinfo/Antarctica/Vostok
deleted file mode 100644
index 016e06b1bb..0000000000
Binary files a/libs/pytz/zoneinfo/Antarctica/Vostok and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Arctic/Longyearbyen b/libs/pytz/zoneinfo/Arctic/Longyearbyen
deleted file mode 100644
index 7f6d958f86..0000000000
Binary files a/libs/pytz/zoneinfo/Arctic/Longyearbyen and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Aden b/libs/pytz/zoneinfo/Asia/Aden
deleted file mode 100644
index 8c8062471d..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Aden and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Almaty b/libs/pytz/zoneinfo/Asia/Almaty
deleted file mode 100644
index 855abbd6e3..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Almaty and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Amman b/libs/pytz/zoneinfo/Asia/Amman
deleted file mode 100644
index 0a8e350a33..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Amman and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Anadyr b/libs/pytz/zoneinfo/Asia/Anadyr
deleted file mode 100644
index 35c531c070..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Anadyr and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Aqtau b/libs/pytz/zoneinfo/Asia/Aqtau
deleted file mode 100644
index 0e1c16d32e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Aqtau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Aqtobe b/libs/pytz/zoneinfo/Asia/Aqtobe
deleted file mode 100644
index 3b5d6eb418..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Aqtobe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ashgabat b/libs/pytz/zoneinfo/Asia/Ashgabat
deleted file mode 100644
index 2bd1cb3da0..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ashgabat and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ashkhabad b/libs/pytz/zoneinfo/Asia/Ashkhabad
deleted file mode 100644
index 2bd1cb3da0..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ashkhabad and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Atyrau b/libs/pytz/zoneinfo/Asia/Atyrau
deleted file mode 100644
index e7ea9c545a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Atyrau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Baghdad b/libs/pytz/zoneinfo/Asia/Baghdad
deleted file mode 100644
index c0e607234a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Baghdad and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Bahrain b/libs/pytz/zoneinfo/Asia/Bahrain
deleted file mode 100644
index 098997e7dd..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Bahrain and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Baku b/libs/pytz/zoneinfo/Asia/Baku
deleted file mode 100644
index ae0ce4e7c3..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Baku and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Bangkok b/libs/pytz/zoneinfo/Asia/Bangkok
deleted file mode 100644
index fa799db39e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Bangkok and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Barnaul b/libs/pytz/zoneinfo/Asia/Barnaul
deleted file mode 100644
index 2f6b8101d4..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Barnaul and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Beirut b/libs/pytz/zoneinfo/Asia/Beirut
deleted file mode 100644
index fb266ede22..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Beirut and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Bishkek b/libs/pytz/zoneinfo/Asia/Bishkek
deleted file mode 100644
index 547fd5e1bd..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Bishkek and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Brunei b/libs/pytz/zoneinfo/Asia/Brunei
deleted file mode 100644
index 098c6a0b0a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Brunei and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Calcutta b/libs/pytz/zoneinfo/Asia/Calcutta
deleted file mode 100644
index 0014046d29..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Calcutta and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Chita b/libs/pytz/zoneinfo/Asia/Chita
deleted file mode 100644
index 75b3d7b3a6..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Chita and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Choibalsan b/libs/pytz/zoneinfo/Asia/Choibalsan
deleted file mode 100644
index 2aa5cc4b84..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Choibalsan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Chongqing b/libs/pytz/zoneinfo/Asia/Chongqing
deleted file mode 100644
index 91f6f8bc2e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Chongqing and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Chungking b/libs/pytz/zoneinfo/Asia/Chungking
deleted file mode 100644
index 91f6f8bc2e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Chungking and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Colombo b/libs/pytz/zoneinfo/Asia/Colombo
deleted file mode 100644
index 353fe2aa35..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Colombo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Dacca b/libs/pytz/zoneinfo/Asia/Dacca
deleted file mode 100644
index 3cf597d83f..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Dacca and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Damascus b/libs/pytz/zoneinfo/Asia/Damascus
deleted file mode 100644
index afd956c878..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Damascus and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Dhaka b/libs/pytz/zoneinfo/Asia/Dhaka
deleted file mode 100644
index 3cf597d83f..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Dhaka and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Dili b/libs/pytz/zoneinfo/Asia/Dili
deleted file mode 100644
index 4614e4fc43..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Dili and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Dubai b/libs/pytz/zoneinfo/Asia/Dubai
deleted file mode 100644
index b3ac791aef..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Dubai and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Dushanbe b/libs/pytz/zoneinfo/Asia/Dushanbe
deleted file mode 100644
index 89e875beae..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Dushanbe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Famagusta b/libs/pytz/zoneinfo/Asia/Famagusta
deleted file mode 100644
index 653b146a60..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Famagusta and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Gaza b/libs/pytz/zoneinfo/Asia/Gaza
deleted file mode 100644
index dd5781e8ae..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Gaza and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Harbin b/libs/pytz/zoneinfo/Asia/Harbin
deleted file mode 100644
index 91f6f8bc2e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Harbin and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Hebron b/libs/pytz/zoneinfo/Asia/Hebron
deleted file mode 100644
index a64fc9e7b2..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Hebron and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ho_Chi_Minh b/libs/pytz/zoneinfo/Asia/Ho_Chi_Minh
deleted file mode 100644
index 9c45ed991a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ho_Chi_Minh and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Hong_Kong b/libs/pytz/zoneinfo/Asia/Hong_Kong
deleted file mode 100644
index f9f7b134dd..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Hong_Kong and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Hovd b/libs/pytz/zoneinfo/Asia/Hovd
deleted file mode 100644
index 8b9abca344..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Hovd and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Irkutsk b/libs/pytz/zoneinfo/Asia/Irkutsk
deleted file mode 100644
index e74a4d3f6b..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Irkutsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Istanbul b/libs/pytz/zoneinfo/Asia/Istanbul
deleted file mode 100644
index 7c2336dd80..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Istanbul and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Jakarta b/libs/pytz/zoneinfo/Asia/Jakarta
deleted file mode 100644
index ec4bd5747a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Jakarta and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Jayapura b/libs/pytz/zoneinfo/Asia/Jayapura
deleted file mode 100644
index 3002c82022..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Jayapura and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Jerusalem b/libs/pytz/zoneinfo/Asia/Jerusalem
deleted file mode 100644
index 1ebd0664aa..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Jerusalem and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kabul b/libs/pytz/zoneinfo/Asia/Kabul
deleted file mode 100644
index 661efc8329..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kabul and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kamchatka b/libs/pytz/zoneinfo/Asia/Kamchatka
deleted file mode 100644
index 99776f515f..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kamchatka and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Karachi b/libs/pytz/zoneinfo/Asia/Karachi
deleted file mode 100644
index ba65c0e8d3..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Karachi and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kashgar b/libs/pytz/zoneinfo/Asia/Kashgar
deleted file mode 100644
index 62bdcac14d..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kashgar and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kathmandu b/libs/pytz/zoneinfo/Asia/Kathmandu
deleted file mode 100644
index 751cf4a893..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kathmandu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Katmandu b/libs/pytz/zoneinfo/Asia/Katmandu
deleted file mode 100644
index 751cf4a893..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Katmandu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Khandyga b/libs/pytz/zoneinfo/Asia/Khandyga
deleted file mode 100644
index 7cdc99a980..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Khandyga and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kolkata b/libs/pytz/zoneinfo/Asia/Kolkata
deleted file mode 100644
index 0014046d29..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kolkata and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Krasnoyarsk b/libs/pytz/zoneinfo/Asia/Krasnoyarsk
deleted file mode 100644
index 4c27b2decd..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Krasnoyarsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kuala_Lumpur b/libs/pytz/zoneinfo/Asia/Kuala_Lumpur
deleted file mode 100644
index 3d9f191e3a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kuala_Lumpur and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kuching b/libs/pytz/zoneinfo/Asia/Kuching
deleted file mode 100644
index 098c6a0b0a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kuching and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Kuwait b/libs/pytz/zoneinfo/Asia/Kuwait
deleted file mode 100644
index 8c8062471d..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Kuwait and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Macao b/libs/pytz/zoneinfo/Asia/Macao
deleted file mode 100644
index cac65063d0..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Macao and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Macau b/libs/pytz/zoneinfo/Asia/Macau
deleted file mode 100644
index cac65063d0..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Macau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Magadan b/libs/pytz/zoneinfo/Asia/Magadan
deleted file mode 100644
index 70c198baf7..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Magadan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Makassar b/libs/pytz/zoneinfo/Asia/Makassar
deleted file mode 100644
index 556ba86693..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Makassar and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Manila b/libs/pytz/zoneinfo/Asia/Manila
deleted file mode 100644
index f4f4b04efa..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Manila and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Muscat b/libs/pytz/zoneinfo/Asia/Muscat
deleted file mode 100644
index b3ac791aef..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Muscat and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Nicosia b/libs/pytz/zoneinfo/Asia/Nicosia
deleted file mode 100644
index f7f10ab766..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Nicosia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Novokuznetsk b/libs/pytz/zoneinfo/Asia/Novokuznetsk
deleted file mode 100644
index a5e1b79600..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Novokuznetsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Novosibirsk b/libs/pytz/zoneinfo/Asia/Novosibirsk
deleted file mode 100644
index 4ac7582ad5..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Novosibirsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Omsk b/libs/pytz/zoneinfo/Asia/Omsk
deleted file mode 100644
index 16c5f3cfed..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Omsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Oral b/libs/pytz/zoneinfo/Asia/Oral
deleted file mode 100644
index 3b9ecacf6e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Oral and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Phnom_Penh b/libs/pytz/zoneinfo/Asia/Phnom_Penh
deleted file mode 100644
index fa799db39e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Phnom_Penh and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Pontianak b/libs/pytz/zoneinfo/Asia/Pontianak
deleted file mode 100644
index 12ce24cbea..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Pontianak and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Pyongyang b/libs/pytz/zoneinfo/Asia/Pyongyang
deleted file mode 100644
index 7ad7e0b2cf..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Pyongyang and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Qatar b/libs/pytz/zoneinfo/Asia/Qatar
deleted file mode 100644
index 098997e7dd..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Qatar and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Qostanay b/libs/pytz/zoneinfo/Asia/Qostanay
deleted file mode 100644
index 2ee9ef7e98..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Qostanay and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Qyzylorda b/libs/pytz/zoneinfo/Asia/Qyzylorda
deleted file mode 100644
index 27b522a7d5..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Qyzylorda and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Rangoon b/libs/pytz/zoneinfo/Asia/Rangoon
deleted file mode 100644
index eef37b42e8..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Rangoon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Riyadh b/libs/pytz/zoneinfo/Asia/Riyadh
deleted file mode 100644
index 8c8062471d..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Riyadh and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Saigon b/libs/pytz/zoneinfo/Asia/Saigon
deleted file mode 100644
index 9c45ed991a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Saigon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Sakhalin b/libs/pytz/zoneinfo/Asia/Sakhalin
deleted file mode 100644
index beb77b4496..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Sakhalin and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Samarkand b/libs/pytz/zoneinfo/Asia/Samarkand
deleted file mode 100644
index 8a93767bfe..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Samarkand and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Seoul b/libs/pytz/zoneinfo/Asia/Seoul
deleted file mode 100644
index 96199e73e7..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Seoul and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Shanghai b/libs/pytz/zoneinfo/Asia/Shanghai
deleted file mode 100644
index 91f6f8bc2e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Shanghai and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Singapore b/libs/pytz/zoneinfo/Asia/Singapore
deleted file mode 100644
index 3d9f191e3a..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Singapore and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Srednekolymsk b/libs/pytz/zoneinfo/Asia/Srednekolymsk
deleted file mode 100644
index d21e7eeed5..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Srednekolymsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Taipei b/libs/pytz/zoneinfo/Asia/Taipei
deleted file mode 100644
index 24c43444b6..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Taipei and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Tashkent b/libs/pytz/zoneinfo/Asia/Tashkent
deleted file mode 100644
index a9f6cd93c8..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Tashkent and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Tbilisi b/libs/pytz/zoneinfo/Asia/Tbilisi
deleted file mode 100644
index 3b131bb10e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Tbilisi and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Tehran b/libs/pytz/zoneinfo/Asia/Tehran
deleted file mode 100644
index cc2a2c219b..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Tehran and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Tel_Aviv b/libs/pytz/zoneinfo/Asia/Tel_Aviv
deleted file mode 100644
index 1ebd0664aa..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Tel_Aviv and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Thimbu b/libs/pytz/zoneinfo/Asia/Thimbu
deleted file mode 100644
index 95a9de9657..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Thimbu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Thimphu b/libs/pytz/zoneinfo/Asia/Thimphu
deleted file mode 100644
index 95a9de9657..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Thimphu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Tokyo b/libs/pytz/zoneinfo/Asia/Tokyo
deleted file mode 100644
index 26f4d34d67..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Tokyo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Tomsk b/libs/pytz/zoneinfo/Asia/Tomsk
deleted file mode 100644
index a6e494a78c..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Tomsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ujung_Pandang b/libs/pytz/zoneinfo/Asia/Ujung_Pandang
deleted file mode 100644
index 556ba86693..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ujung_Pandang and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ulaanbaatar b/libs/pytz/zoneinfo/Asia/Ulaanbaatar
deleted file mode 100644
index 2aa5cc4b84..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ulaanbaatar and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ulan_Bator b/libs/pytz/zoneinfo/Asia/Ulan_Bator
deleted file mode 100644
index 2aa5cc4b84..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ulan_Bator and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Urumqi b/libs/pytz/zoneinfo/Asia/Urumqi
deleted file mode 100644
index 62bdcac14d..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Urumqi and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Ust-Nera b/libs/pytz/zoneinfo/Asia/Ust-Nera
deleted file mode 100644
index d05726aba9..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Ust-Nera and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Vientiane b/libs/pytz/zoneinfo/Asia/Vientiane
deleted file mode 100644
index fa799db39e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Vientiane and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Vladivostok b/libs/pytz/zoneinfo/Asia/Vladivostok
deleted file mode 100644
index 274a10b43d..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Vladivostok and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Yakutsk b/libs/pytz/zoneinfo/Asia/Yakutsk
deleted file mode 100644
index ae65a5f9b9..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Yakutsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Yangon b/libs/pytz/zoneinfo/Asia/Yangon
deleted file mode 100644
index eef37b42e8..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Yangon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Yekaterinburg b/libs/pytz/zoneinfo/Asia/Yekaterinburg
deleted file mode 100644
index d4d19ccf1e..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Yekaterinburg and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Asia/Yerevan b/libs/pytz/zoneinfo/Asia/Yerevan
deleted file mode 100644
index 0d5f6853ac..0000000000
Binary files a/libs/pytz/zoneinfo/Asia/Yerevan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Azores b/libs/pytz/zoneinfo/Atlantic/Azores
deleted file mode 100644
index dd2c235bf9..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Azores and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Bermuda b/libs/pytz/zoneinfo/Atlantic/Bermuda
deleted file mode 100644
index 527524ed29..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Bermuda and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Canary b/libs/pytz/zoneinfo/Atlantic/Canary
deleted file mode 100644
index f3192156ff..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Canary and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Cape_Verde b/libs/pytz/zoneinfo/Atlantic/Cape_Verde
deleted file mode 100644
index 0d0d31a2f0..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Cape_Verde and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Faeroe b/libs/pytz/zoneinfo/Atlantic/Faeroe
deleted file mode 100644
index 4dab7ef085..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Faeroe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Faroe b/libs/pytz/zoneinfo/Atlantic/Faroe
deleted file mode 100644
index 4dab7ef085..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Faroe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Jan_Mayen b/libs/pytz/zoneinfo/Atlantic/Jan_Mayen
deleted file mode 100644
index 7f6d958f86..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Jan_Mayen and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Madeira b/libs/pytz/zoneinfo/Atlantic/Madeira
deleted file mode 100644
index 6725a0ffc1..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Madeira and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Reykjavik b/libs/pytz/zoneinfo/Atlantic/Reykjavik
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Reykjavik and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/South_Georgia b/libs/pytz/zoneinfo/Atlantic/South_Georgia
deleted file mode 100644
index a2b59a9d10..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/South_Georgia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/St_Helena b/libs/pytz/zoneinfo/Atlantic/St_Helena
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/St_Helena and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Atlantic/Stanley b/libs/pytz/zoneinfo/Atlantic/Stanley
deleted file mode 100644
index 1527d0e1a7..0000000000
Binary files a/libs/pytz/zoneinfo/Atlantic/Stanley and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/ACT b/libs/pytz/zoneinfo/Australia/ACT
deleted file mode 100644
index 0aea4c3d43..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/ACT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Adelaide b/libs/pytz/zoneinfo/Australia/Adelaide
deleted file mode 100644
index f5dedca59e..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Adelaide and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Brisbane b/libs/pytz/zoneinfo/Australia/Brisbane
deleted file mode 100644
index 7ff9949ffa..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Brisbane and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Broken_Hill b/libs/pytz/zoneinfo/Australia/Broken_Hill
deleted file mode 100644
index 698c76e30e..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Broken_Hill and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Canberra b/libs/pytz/zoneinfo/Australia/Canberra
deleted file mode 100644
index 0aea4c3d43..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Canberra and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Currie b/libs/pytz/zoneinfo/Australia/Currie
deleted file mode 100644
index 3adb8e1bf7..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Currie and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Darwin b/libs/pytz/zoneinfo/Australia/Darwin
deleted file mode 100644
index 74a30879bc..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Darwin and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Eucla b/libs/pytz/zoneinfo/Australia/Eucla
deleted file mode 100644
index 1551e96cbc..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Eucla and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Hobart b/libs/pytz/zoneinfo/Australia/Hobart
deleted file mode 100644
index 3adb8e1bf7..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Hobart and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/LHI b/libs/pytz/zoneinfo/Australia/LHI
deleted file mode 100644
index 069a95ad68..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/LHI and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Lindeman b/libs/pytz/zoneinfo/Australia/Lindeman
deleted file mode 100644
index 4ee1825abf..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Lindeman and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Lord_Howe b/libs/pytz/zoneinfo/Australia/Lord_Howe
deleted file mode 100644
index 069a95ad68..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Lord_Howe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Melbourne b/libs/pytz/zoneinfo/Australia/Melbourne
deleted file mode 100644
index ee903f4b1f..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Melbourne and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/NSW b/libs/pytz/zoneinfo/Australia/NSW
deleted file mode 100644
index 0aea4c3d43..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/NSW and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/North b/libs/pytz/zoneinfo/Australia/North
deleted file mode 100644
index 74a30879bc..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/North and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Perth b/libs/pytz/zoneinfo/Australia/Perth
deleted file mode 100644
index f8ddbdf215..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Perth and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Queensland b/libs/pytz/zoneinfo/Australia/Queensland
deleted file mode 100644
index 7ff9949ffa..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Queensland and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/South b/libs/pytz/zoneinfo/Australia/South
deleted file mode 100644
index f5dedca59e..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/South and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Sydney b/libs/pytz/zoneinfo/Australia/Sydney
deleted file mode 100644
index 0aea4c3d43..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Sydney and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Tasmania b/libs/pytz/zoneinfo/Australia/Tasmania
deleted file mode 100644
index 3adb8e1bf7..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Tasmania and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Victoria b/libs/pytz/zoneinfo/Australia/Victoria
deleted file mode 100644
index ee903f4b1f..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Victoria and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/West b/libs/pytz/zoneinfo/Australia/West
deleted file mode 100644
index f8ddbdf215..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/West and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Australia/Yancowinna b/libs/pytz/zoneinfo/Australia/Yancowinna
deleted file mode 100644
index 698c76e30e..0000000000
Binary files a/libs/pytz/zoneinfo/Australia/Yancowinna and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Brazil/Acre b/libs/pytz/zoneinfo/Brazil/Acre
deleted file mode 100644
index cdda168cb9..0000000000
Binary files a/libs/pytz/zoneinfo/Brazil/Acre and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Brazil/DeNoronha b/libs/pytz/zoneinfo/Brazil/DeNoronha
deleted file mode 100644
index 73b4b336ab..0000000000
Binary files a/libs/pytz/zoneinfo/Brazil/DeNoronha and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Brazil/East b/libs/pytz/zoneinfo/Brazil/East
deleted file mode 100644
index 67935ff4da..0000000000
Binary files a/libs/pytz/zoneinfo/Brazil/East and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Brazil/West b/libs/pytz/zoneinfo/Brazil/West
deleted file mode 100644
index 2708baea5a..0000000000
Binary files a/libs/pytz/zoneinfo/Brazil/West and /dev/null differ
diff --git a/libs/pytz/zoneinfo/CET b/libs/pytz/zoneinfo/CET
deleted file mode 100644
index 40d7124e53..0000000000
Binary files a/libs/pytz/zoneinfo/CET and /dev/null differ
diff --git a/libs/pytz/zoneinfo/CST6CDT b/libs/pytz/zoneinfo/CST6CDT
deleted file mode 100644
index c6981a06b1..0000000000
Binary files a/libs/pytz/zoneinfo/CST6CDT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Atlantic b/libs/pytz/zoneinfo/Canada/Atlantic
deleted file mode 100644
index 756099abe6..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Atlantic and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Central b/libs/pytz/zoneinfo/Canada/Central
deleted file mode 100644
index ac40299f6b..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Central and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Eastern b/libs/pytz/zoneinfo/Canada/Eastern
deleted file mode 100644
index 170137333f..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Eastern and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Mountain b/libs/pytz/zoneinfo/Canada/Mountain
deleted file mode 100644
index cd78a6f8be..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Mountain and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Newfoundland b/libs/pytz/zoneinfo/Canada/Newfoundland
deleted file mode 100644
index 65a5b0c720..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Newfoundland and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Pacific b/libs/pytz/zoneinfo/Canada/Pacific
deleted file mode 100644
index bb60cbced3..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Pacific and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Saskatchewan b/libs/pytz/zoneinfo/Canada/Saskatchewan
deleted file mode 100644
index 20c9c84df4..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Saskatchewan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Canada/Yukon b/libs/pytz/zoneinfo/Canada/Yukon
deleted file mode 100644
index 318c4a8e40..0000000000
Binary files a/libs/pytz/zoneinfo/Canada/Yukon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Chile/Continental b/libs/pytz/zoneinfo/Chile/Continental
deleted file mode 100644
index 010c6bd04c..0000000000
Binary files a/libs/pytz/zoneinfo/Chile/Continental and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Chile/EasterIsland b/libs/pytz/zoneinfo/Chile/EasterIsland
deleted file mode 100644
index 184cb6a83b..0000000000
Binary files a/libs/pytz/zoneinfo/Chile/EasterIsland and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Cuba b/libs/pytz/zoneinfo/Cuba
deleted file mode 100644
index b69ac45107..0000000000
Binary files a/libs/pytz/zoneinfo/Cuba and /dev/null differ
diff --git a/libs/pytz/zoneinfo/EET b/libs/pytz/zoneinfo/EET
deleted file mode 100644
index 9f3a0678d7..0000000000
Binary files a/libs/pytz/zoneinfo/EET and /dev/null differ
diff --git a/libs/pytz/zoneinfo/EST b/libs/pytz/zoneinfo/EST
deleted file mode 100644
index 9964b9a334..0000000000
Binary files a/libs/pytz/zoneinfo/EST and /dev/null differ
diff --git a/libs/pytz/zoneinfo/EST5EDT b/libs/pytz/zoneinfo/EST5EDT
deleted file mode 100644
index a8b9ab1992..0000000000
Binary files a/libs/pytz/zoneinfo/EST5EDT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Egypt b/libs/pytz/zoneinfo/Egypt
deleted file mode 100644
index dd538c65db..0000000000
Binary files a/libs/pytz/zoneinfo/Egypt and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Eire b/libs/pytz/zoneinfo/Eire
deleted file mode 100644
index c729def42f..0000000000
Binary files a/libs/pytz/zoneinfo/Eire and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT b/libs/pytz/zoneinfo/Etc/GMT
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+0 b/libs/pytz/zoneinfo/Etc/GMT+0
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+0 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+1 b/libs/pytz/zoneinfo/Etc/GMT+1
deleted file mode 100644
index 4dab6f9005..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+1 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+10 b/libs/pytz/zoneinfo/Etc/GMT+10
deleted file mode 100644
index c749290af2..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+10 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+11 b/libs/pytz/zoneinfo/Etc/GMT+11
deleted file mode 100644
index d969982309..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+11 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+12 b/libs/pytz/zoneinfo/Etc/GMT+12
deleted file mode 100644
index cdeec90973..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+12 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+2 b/libs/pytz/zoneinfo/Etc/GMT+2
deleted file mode 100644
index fbd2a941fd..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+2 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+3 b/libs/pytz/zoneinfo/Etc/GMT+3
deleted file mode 100644
index ee246ef56f..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+3 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+4 b/libs/pytz/zoneinfo/Etc/GMT+4
deleted file mode 100644
index 5a25ff2a6a..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+4 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+5 b/libs/pytz/zoneinfo/Etc/GMT+5
deleted file mode 100644
index c0b745f1cc..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+5 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+6 b/libs/pytz/zoneinfo/Etc/GMT+6
deleted file mode 100644
index 06e777d57e..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+6 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+7 b/libs/pytz/zoneinfo/Etc/GMT+7
deleted file mode 100644
index 4e0b53a082..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+7 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+8 b/libs/pytz/zoneinfo/Etc/GMT+8
deleted file mode 100644
index 714b0c5628..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+8 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT+9 b/libs/pytz/zoneinfo/Etc/GMT+9
deleted file mode 100644
index 78b9daa373..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT+9 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-0 b/libs/pytz/zoneinfo/Etc/GMT-0
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-0 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-1 b/libs/pytz/zoneinfo/Etc/GMT-1
deleted file mode 100644
index a838bebf5e..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-1 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-10 b/libs/pytz/zoneinfo/Etc/GMT-10
deleted file mode 100644
index 68ff77db0d..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-10 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-11 b/libs/pytz/zoneinfo/Etc/GMT-11
deleted file mode 100644
index 66af5a42be..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-11 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-12 b/libs/pytz/zoneinfo/Etc/GMT-12
deleted file mode 100644
index 17ba505772..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-12 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-13 b/libs/pytz/zoneinfo/Etc/GMT-13
deleted file mode 100644
index 5f3706ce64..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-13 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-14 b/libs/pytz/zoneinfo/Etc/GMT-14
deleted file mode 100644
index 7e9f9c465c..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-14 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-2 b/libs/pytz/zoneinfo/Etc/GMT-2
deleted file mode 100644
index fcef6d9acb..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-2 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-3 b/libs/pytz/zoneinfo/Etc/GMT-3
deleted file mode 100644
index 27973bc857..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-3 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-4 b/libs/pytz/zoneinfo/Etc/GMT-4
deleted file mode 100644
index 1efd841261..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-4 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-5 b/libs/pytz/zoneinfo/Etc/GMT-5
deleted file mode 100644
index 1f761844fc..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-5 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-6 b/libs/pytz/zoneinfo/Etc/GMT-6
deleted file mode 100644
index 952681ed46..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-6 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-7 b/libs/pytz/zoneinfo/Etc/GMT-7
deleted file mode 100644
index cefc9126c6..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-7 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-8 b/libs/pytz/zoneinfo/Etc/GMT-8
deleted file mode 100644
index afb093da00..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-8 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT-9 b/libs/pytz/zoneinfo/Etc/GMT-9
deleted file mode 100644
index 9265fb7c20..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT-9 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/GMT0 b/libs/pytz/zoneinfo/Etc/GMT0
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/GMT0 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/Greenwich b/libs/pytz/zoneinfo/Etc/Greenwich
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/Greenwich and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/UCT b/libs/pytz/zoneinfo/Etc/UCT
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/UCT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/UTC b/libs/pytz/zoneinfo/Etc/UTC
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/UTC and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/Universal b/libs/pytz/zoneinfo/Etc/Universal
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/Universal and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Etc/Zulu b/libs/pytz/zoneinfo/Etc/Zulu
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/Etc/Zulu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Amsterdam b/libs/pytz/zoneinfo/Europe/Amsterdam
deleted file mode 100644
index 40d7124e53..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Amsterdam and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Andorra b/libs/pytz/zoneinfo/Europe/Andorra
deleted file mode 100644
index 5962550392..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Andorra and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Astrakhan b/libs/pytz/zoneinfo/Europe/Astrakhan
deleted file mode 100644
index a41624f5df..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Astrakhan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Athens b/libs/pytz/zoneinfo/Europe/Athens
deleted file mode 100644
index 9f3a0678d7..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Athens and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Belfast b/libs/pytz/zoneinfo/Europe/Belfast
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Belfast and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Belgrade b/libs/pytz/zoneinfo/Europe/Belgrade
deleted file mode 100644
index 27de456f16..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Belgrade and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Berlin b/libs/pytz/zoneinfo/Europe/Berlin
deleted file mode 100644
index 7f6d958f86..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Berlin and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Bratislava b/libs/pytz/zoneinfo/Europe/Bratislava
deleted file mode 100644
index ce8f433ece..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Bratislava and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Brussels b/libs/pytz/zoneinfo/Europe/Brussels
deleted file mode 100644
index 40d7124e53..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Brussels and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Bucharest b/libs/pytz/zoneinfo/Europe/Bucharest
deleted file mode 100644
index 4303b903e5..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Bucharest and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Budapest b/libs/pytz/zoneinfo/Europe/Budapest
deleted file mode 100644
index b76c873d92..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Budapest and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Busingen b/libs/pytz/zoneinfo/Europe/Busingen
deleted file mode 100644
index ad6cf59281..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Busingen and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Chisinau b/libs/pytz/zoneinfo/Europe/Chisinau
deleted file mode 100644
index 5ee23fe0e5..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Chisinau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Copenhagen b/libs/pytz/zoneinfo/Europe/Copenhagen
deleted file mode 100644
index 7f6d958f86..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Copenhagen and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Dublin b/libs/pytz/zoneinfo/Europe/Dublin
deleted file mode 100644
index c729def42f..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Dublin and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Gibraltar b/libs/pytz/zoneinfo/Europe/Gibraltar
deleted file mode 100644
index a38f11ffdf..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Gibraltar and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Guernsey b/libs/pytz/zoneinfo/Europe/Guernsey
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Guernsey and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Helsinki b/libs/pytz/zoneinfo/Europe/Helsinki
deleted file mode 100644
index b4f8f9cbb5..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Helsinki and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Isle_of_Man b/libs/pytz/zoneinfo/Europe/Isle_of_Man
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Isle_of_Man and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Istanbul b/libs/pytz/zoneinfo/Europe/Istanbul
deleted file mode 100644
index 7c2336dd80..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Istanbul and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Jersey b/libs/pytz/zoneinfo/Europe/Jersey
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Jersey and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Kaliningrad b/libs/pytz/zoneinfo/Europe/Kaliningrad
deleted file mode 100644
index cc99beabe4..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Kaliningrad and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Kiev b/libs/pytz/zoneinfo/Europe/Kiev
deleted file mode 100644
index 52efea8806..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Kiev and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Kirov b/libs/pytz/zoneinfo/Europe/Kirov
deleted file mode 100644
index 0cfb956be2..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Kirov and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Kyiv b/libs/pytz/zoneinfo/Europe/Kyiv
deleted file mode 100644
index 52efea8806..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Kyiv and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Lisbon b/libs/pytz/zoneinfo/Europe/Lisbon
deleted file mode 100644
index 616de167b8..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Lisbon and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Ljubljana b/libs/pytz/zoneinfo/Europe/Ljubljana
deleted file mode 100644
index 27de456f16..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Ljubljana and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/London b/libs/pytz/zoneinfo/Europe/London
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/London and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Luxembourg b/libs/pytz/zoneinfo/Europe/Luxembourg
deleted file mode 100644
index 40d7124e53..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Luxembourg and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Madrid b/libs/pytz/zoneinfo/Europe/Madrid
deleted file mode 100644
index 53f4cd101c..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Madrid and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Malta b/libs/pytz/zoneinfo/Europe/Malta
deleted file mode 100644
index 1d1a7bcfcb..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Malta and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Mariehamn b/libs/pytz/zoneinfo/Europe/Mariehamn
deleted file mode 100644
index b4f8f9cbb5..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Mariehamn and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Minsk b/libs/pytz/zoneinfo/Europe/Minsk
deleted file mode 100644
index 3731e40d86..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Minsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Monaco b/libs/pytz/zoneinfo/Europe/Monaco
deleted file mode 100644
index 7d366c6098..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Monaco and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Moscow b/libs/pytz/zoneinfo/Europe/Moscow
deleted file mode 100644
index ddb3f4e99a..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Moscow and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Nicosia b/libs/pytz/zoneinfo/Europe/Nicosia
deleted file mode 100644
index f7f10ab766..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Nicosia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Oslo b/libs/pytz/zoneinfo/Europe/Oslo
deleted file mode 100644
index 7f6d958f86..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Oslo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Paris b/libs/pytz/zoneinfo/Europe/Paris
deleted file mode 100644
index 7d366c6098..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Paris and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Podgorica b/libs/pytz/zoneinfo/Europe/Podgorica
deleted file mode 100644
index 27de456f16..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Podgorica and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Prague b/libs/pytz/zoneinfo/Europe/Prague
deleted file mode 100644
index ce8f433ece..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Prague and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Riga b/libs/pytz/zoneinfo/Europe/Riga
deleted file mode 100644
index 8db477d017..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Riga and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Rome b/libs/pytz/zoneinfo/Europe/Rome
deleted file mode 100644
index 32b2899a30..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Rome and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Samara b/libs/pytz/zoneinfo/Europe/Samara
deleted file mode 100644
index d0ea2f25e9..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Samara and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/San_Marino b/libs/pytz/zoneinfo/Europe/San_Marino
deleted file mode 100644
index 32b2899a30..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/San_Marino and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Sarajevo b/libs/pytz/zoneinfo/Europe/Sarajevo
deleted file mode 100644
index 27de456f16..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Sarajevo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Saratov b/libs/pytz/zoneinfo/Europe/Saratov
deleted file mode 100644
index a863913358..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Saratov and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Simferopol b/libs/pytz/zoneinfo/Europe/Simferopol
deleted file mode 100644
index 4bf24de1d9..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Simferopol and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Skopje b/libs/pytz/zoneinfo/Europe/Skopje
deleted file mode 100644
index 27de456f16..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Skopje and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Sofia b/libs/pytz/zoneinfo/Europe/Sofia
deleted file mode 100644
index 0e4d879332..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Sofia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Stockholm b/libs/pytz/zoneinfo/Europe/Stockholm
deleted file mode 100644
index 7f6d958f86..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Stockholm and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Tallinn b/libs/pytz/zoneinfo/Europe/Tallinn
deleted file mode 100644
index b5acca3cf5..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Tallinn and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Tirane b/libs/pytz/zoneinfo/Europe/Tirane
deleted file mode 100644
index 0b86017d24..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Tirane and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Tiraspol b/libs/pytz/zoneinfo/Europe/Tiraspol
deleted file mode 100644
index 5ee23fe0e5..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Tiraspol and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Ulyanovsk b/libs/pytz/zoneinfo/Europe/Ulyanovsk
deleted file mode 100644
index d668233b37..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Ulyanovsk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Uzhgorod b/libs/pytz/zoneinfo/Europe/Uzhgorod
deleted file mode 100644
index 52efea8806..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Uzhgorod and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Vaduz b/libs/pytz/zoneinfo/Europe/Vaduz
deleted file mode 100644
index ad6cf59281..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Vaduz and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Vatican b/libs/pytz/zoneinfo/Europe/Vatican
deleted file mode 100644
index 32b2899a30..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Vatican and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Vienna b/libs/pytz/zoneinfo/Europe/Vienna
deleted file mode 100644
index 3582bb15cd..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Vienna and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Vilnius b/libs/pytz/zoneinfo/Europe/Vilnius
deleted file mode 100644
index 7abd63fa60..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Vilnius and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Volgograd b/libs/pytz/zoneinfo/Europe/Volgograd
deleted file mode 100644
index 9d51a38c0e..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Volgograd and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Warsaw b/libs/pytz/zoneinfo/Europe/Warsaw
deleted file mode 100644
index e33cf67171..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Warsaw and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Zagreb b/libs/pytz/zoneinfo/Europe/Zagreb
deleted file mode 100644
index 27de456f16..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Zagreb and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Zaporozhye b/libs/pytz/zoneinfo/Europe/Zaporozhye
deleted file mode 100644
index 52efea8806..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Zaporozhye and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Europe/Zurich b/libs/pytz/zoneinfo/Europe/Zurich
deleted file mode 100644
index ad6cf59281..0000000000
Binary files a/libs/pytz/zoneinfo/Europe/Zurich and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Factory b/libs/pytz/zoneinfo/Factory
deleted file mode 100644
index 60aa2a0d69..0000000000
Binary files a/libs/pytz/zoneinfo/Factory and /dev/null differ
diff --git a/libs/pytz/zoneinfo/GB b/libs/pytz/zoneinfo/GB
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/GB and /dev/null differ
diff --git a/libs/pytz/zoneinfo/GB-Eire b/libs/pytz/zoneinfo/GB-Eire
deleted file mode 100644
index 5ad74220e8..0000000000
Binary files a/libs/pytz/zoneinfo/GB-Eire and /dev/null differ
diff --git a/libs/pytz/zoneinfo/GMT b/libs/pytz/zoneinfo/GMT
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/GMT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/GMT+0 b/libs/pytz/zoneinfo/GMT+0
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/GMT+0 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/GMT-0 b/libs/pytz/zoneinfo/GMT-0
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/GMT-0 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/GMT0 b/libs/pytz/zoneinfo/GMT0
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/GMT0 and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Greenwich b/libs/pytz/zoneinfo/Greenwich
deleted file mode 100644
index c63474664a..0000000000
Binary files a/libs/pytz/zoneinfo/Greenwich and /dev/null differ
diff --git a/libs/pytz/zoneinfo/HST b/libs/pytz/zoneinfo/HST
deleted file mode 100644
index c7cd060159..0000000000
Binary files a/libs/pytz/zoneinfo/HST and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Hongkong b/libs/pytz/zoneinfo/Hongkong
deleted file mode 100644
index f9f7b134dd..0000000000
Binary files a/libs/pytz/zoneinfo/Hongkong and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Iceland b/libs/pytz/zoneinfo/Iceland
deleted file mode 100644
index 28b32ab2e0..0000000000
Binary files a/libs/pytz/zoneinfo/Iceland and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Antananarivo b/libs/pytz/zoneinfo/Indian/Antananarivo
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Antananarivo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Chagos b/libs/pytz/zoneinfo/Indian/Chagos
deleted file mode 100644
index a5554816e2..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Chagos and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Christmas b/libs/pytz/zoneinfo/Indian/Christmas
deleted file mode 100644
index fa799db39e..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Christmas and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Cocos b/libs/pytz/zoneinfo/Indian/Cocos
deleted file mode 100644
index eef37b42e8..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Cocos and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Comoro b/libs/pytz/zoneinfo/Indian/Comoro
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Comoro and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Kerguelen b/libs/pytz/zoneinfo/Indian/Kerguelen
deleted file mode 100644
index 555728b1a0..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Kerguelen and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Mahe b/libs/pytz/zoneinfo/Indian/Mahe
deleted file mode 100644
index b3ac791aef..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Mahe and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Maldives b/libs/pytz/zoneinfo/Indian/Maldives
deleted file mode 100644
index 555728b1a0..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Maldives and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Mauritius b/libs/pytz/zoneinfo/Indian/Mauritius
deleted file mode 100644
index 212d4b2e2a..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Mauritius and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Mayotte b/libs/pytz/zoneinfo/Indian/Mayotte
deleted file mode 100644
index 9dcfc19c56..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Mayotte and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Indian/Reunion b/libs/pytz/zoneinfo/Indian/Reunion
deleted file mode 100644
index b3ac791aef..0000000000
Binary files a/libs/pytz/zoneinfo/Indian/Reunion and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Iran b/libs/pytz/zoneinfo/Iran
deleted file mode 100644
index cc2a2c219b..0000000000
Binary files a/libs/pytz/zoneinfo/Iran and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Israel b/libs/pytz/zoneinfo/Israel
deleted file mode 100644
index 1ebd0664aa..0000000000
Binary files a/libs/pytz/zoneinfo/Israel and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Jamaica b/libs/pytz/zoneinfo/Jamaica
deleted file mode 100644
index 2a9b7fd52d..0000000000
Binary files a/libs/pytz/zoneinfo/Jamaica and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Japan b/libs/pytz/zoneinfo/Japan
deleted file mode 100644
index 26f4d34d67..0000000000
Binary files a/libs/pytz/zoneinfo/Japan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Kwajalein b/libs/pytz/zoneinfo/Kwajalein
deleted file mode 100644
index 1887a60742..0000000000
Binary files a/libs/pytz/zoneinfo/Kwajalein and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Libya b/libs/pytz/zoneinfo/Libya
deleted file mode 100644
index 07b393bb7d..0000000000
Binary files a/libs/pytz/zoneinfo/Libya and /dev/null differ
diff --git a/libs/pytz/zoneinfo/MET b/libs/pytz/zoneinfo/MET
deleted file mode 100644
index 40d7124e53..0000000000
Binary files a/libs/pytz/zoneinfo/MET and /dev/null differ
diff --git a/libs/pytz/zoneinfo/MST b/libs/pytz/zoneinfo/MST
deleted file mode 100644
index ab37e84556..0000000000
Binary files a/libs/pytz/zoneinfo/MST and /dev/null differ
diff --git a/libs/pytz/zoneinfo/MST7MDT b/libs/pytz/zoneinfo/MST7MDT
deleted file mode 100644
index abb2b974a4..0000000000
Binary files a/libs/pytz/zoneinfo/MST7MDT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Mexico/BajaNorte b/libs/pytz/zoneinfo/Mexico/BajaNorte
deleted file mode 100644
index 0fe73912ca..0000000000
Binary files a/libs/pytz/zoneinfo/Mexico/BajaNorte and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Mexico/BajaSur b/libs/pytz/zoneinfo/Mexico/BajaSur
deleted file mode 100644
index 386616a59c..0000000000
Binary files a/libs/pytz/zoneinfo/Mexico/BajaSur and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Mexico/General b/libs/pytz/zoneinfo/Mexico/General
deleted file mode 100644
index ad70cf3e08..0000000000
Binary files a/libs/pytz/zoneinfo/Mexico/General and /dev/null differ
diff --git a/libs/pytz/zoneinfo/NZ b/libs/pytz/zoneinfo/NZ
deleted file mode 100644
index 6575fdce31..0000000000
Binary files a/libs/pytz/zoneinfo/NZ and /dev/null differ
diff --git a/libs/pytz/zoneinfo/NZ-CHAT b/libs/pytz/zoneinfo/NZ-CHAT
deleted file mode 100644
index bde46cf7e4..0000000000
Binary files a/libs/pytz/zoneinfo/NZ-CHAT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Navajo b/libs/pytz/zoneinfo/Navajo
deleted file mode 100644
index abb2b974a4..0000000000
Binary files a/libs/pytz/zoneinfo/Navajo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/PRC b/libs/pytz/zoneinfo/PRC
deleted file mode 100644
index 91f6f8bc2e..0000000000
Binary files a/libs/pytz/zoneinfo/PRC and /dev/null differ
diff --git a/libs/pytz/zoneinfo/PST8PDT b/libs/pytz/zoneinfo/PST8PDT
deleted file mode 100644
index 610e7af5fc..0000000000
Binary files a/libs/pytz/zoneinfo/PST8PDT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Apia b/libs/pytz/zoneinfo/Pacific/Apia
deleted file mode 100644
index e592a68e53..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Apia and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Auckland b/libs/pytz/zoneinfo/Pacific/Auckland
deleted file mode 100644
index 6575fdce31..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Auckland and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Bougainville b/libs/pytz/zoneinfo/Pacific/Bougainville
deleted file mode 100644
index c535acdabd..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Bougainville and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Chatham b/libs/pytz/zoneinfo/Pacific/Chatham
deleted file mode 100644
index bde46cf7e4..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Chatham and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Chuuk b/libs/pytz/zoneinfo/Pacific/Chuuk
deleted file mode 100644
index 7be2474dd9..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Chuuk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Easter b/libs/pytz/zoneinfo/Pacific/Easter
deleted file mode 100644
index 184cb6a83b..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Easter and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Efate b/libs/pytz/zoneinfo/Pacific/Efate
deleted file mode 100644
index 777325fc6c..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Efate and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Enderbury b/libs/pytz/zoneinfo/Pacific/Enderbury
deleted file mode 100644
index b1c4b07344..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Enderbury and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Fakaofo b/libs/pytz/zoneinfo/Pacific/Fakaofo
deleted file mode 100644
index 4905ea72b1..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Fakaofo and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Fiji b/libs/pytz/zoneinfo/Pacific/Fiji
deleted file mode 100644
index acf8091ac8..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Fiji and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Funafuti b/libs/pytz/zoneinfo/Pacific/Funafuti
deleted file mode 100644
index 47661d40a4..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Funafuti and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Galapagos b/libs/pytz/zoneinfo/Pacific/Galapagos
deleted file mode 100644
index 40051ddf63..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Galapagos and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Gambier b/libs/pytz/zoneinfo/Pacific/Gambier
deleted file mode 100644
index 84acaf4152..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Gambier and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Guadalcanal b/libs/pytz/zoneinfo/Pacific/Guadalcanal
deleted file mode 100644
index 1ab8353464..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Guadalcanal and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Guam b/libs/pytz/zoneinfo/Pacific/Guam
deleted file mode 100644
index 66490d25df..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Guam and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Honolulu b/libs/pytz/zoneinfo/Pacific/Honolulu
deleted file mode 100644
index c7cd060159..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Honolulu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Johnston b/libs/pytz/zoneinfo/Pacific/Johnston
deleted file mode 100644
index c7cd060159..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Johnston and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Kanton b/libs/pytz/zoneinfo/Pacific/Kanton
deleted file mode 100644
index b1c4b07344..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Kanton and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Kiritimati b/libs/pytz/zoneinfo/Pacific/Kiritimati
deleted file mode 100644
index b4c6037a2d..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Kiritimati and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Kosrae b/libs/pytz/zoneinfo/Pacific/Kosrae
deleted file mode 100644
index 0666fb0dd1..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Kosrae and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Kwajalein b/libs/pytz/zoneinfo/Pacific/Kwajalein
deleted file mode 100644
index 1887a60742..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Kwajalein and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Majuro b/libs/pytz/zoneinfo/Pacific/Majuro
deleted file mode 100644
index 47661d40a4..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Majuro and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Marquesas b/libs/pytz/zoneinfo/Pacific/Marquesas
deleted file mode 100644
index f546c03f96..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Marquesas and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Midway b/libs/pytz/zoneinfo/Pacific/Midway
deleted file mode 100644
index cb56709a77..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Midway and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Nauru b/libs/pytz/zoneinfo/Pacific/Nauru
deleted file mode 100644
index 3339b6cf86..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Nauru and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Niue b/libs/pytz/zoneinfo/Pacific/Niue
deleted file mode 100644
index f76972f884..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Niue and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Norfolk b/libs/pytz/zoneinfo/Pacific/Norfolk
deleted file mode 100644
index 3b4186d611..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Norfolk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Noumea b/libs/pytz/zoneinfo/Pacific/Noumea
deleted file mode 100644
index 959cc8cd26..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Noumea and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Pago_Pago b/libs/pytz/zoneinfo/Pacific/Pago_Pago
deleted file mode 100644
index cb56709a77..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Pago_Pago and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Palau b/libs/pytz/zoneinfo/Pacific/Palau
deleted file mode 100644
index 1cbebe28af..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Palau and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Pitcairn b/libs/pytz/zoneinfo/Pacific/Pitcairn
deleted file mode 100644
index 5ee90e7020..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Pitcairn and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Pohnpei b/libs/pytz/zoneinfo/Pacific/Pohnpei
deleted file mode 100644
index 1ab8353464..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Pohnpei and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Ponape b/libs/pytz/zoneinfo/Pacific/Ponape
deleted file mode 100644
index 1ab8353464..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Ponape and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Port_Moresby b/libs/pytz/zoneinfo/Pacific/Port_Moresby
deleted file mode 100644
index 7be2474dd9..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Port_Moresby and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Rarotonga b/libs/pytz/zoneinfo/Pacific/Rarotonga
deleted file mode 100644
index 184a87c112..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Rarotonga and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Saipan b/libs/pytz/zoneinfo/Pacific/Saipan
deleted file mode 100644
index 66490d25df..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Saipan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Samoa b/libs/pytz/zoneinfo/Pacific/Samoa
deleted file mode 100644
index cb56709a77..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Samoa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Tahiti b/libs/pytz/zoneinfo/Pacific/Tahiti
deleted file mode 100644
index 481edd3058..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Tahiti and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Tarawa b/libs/pytz/zoneinfo/Pacific/Tarawa
deleted file mode 100644
index 47661d40a4..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Tarawa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Tongatapu b/libs/pytz/zoneinfo/Pacific/Tongatapu
deleted file mode 100644
index c8824ab543..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Tongatapu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Truk b/libs/pytz/zoneinfo/Pacific/Truk
deleted file mode 100644
index 7be2474dd9..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Truk and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Wake b/libs/pytz/zoneinfo/Pacific/Wake
deleted file mode 100644
index 47661d40a4..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Wake and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Wallis b/libs/pytz/zoneinfo/Pacific/Wallis
deleted file mode 100644
index 47661d40a4..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Wallis and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Pacific/Yap b/libs/pytz/zoneinfo/Pacific/Yap
deleted file mode 100644
index 7be2474dd9..0000000000
Binary files a/libs/pytz/zoneinfo/Pacific/Yap and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Poland b/libs/pytz/zoneinfo/Poland
deleted file mode 100644
index e33cf67171..0000000000
Binary files a/libs/pytz/zoneinfo/Poland and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Portugal b/libs/pytz/zoneinfo/Portugal
deleted file mode 100644
index 616de167b8..0000000000
Binary files a/libs/pytz/zoneinfo/Portugal and /dev/null differ
diff --git a/libs/pytz/zoneinfo/ROC b/libs/pytz/zoneinfo/ROC
deleted file mode 100644
index 24c43444b6..0000000000
Binary files a/libs/pytz/zoneinfo/ROC and /dev/null differ
diff --git a/libs/pytz/zoneinfo/ROK b/libs/pytz/zoneinfo/ROK
deleted file mode 100644
index 96199e73e7..0000000000
Binary files a/libs/pytz/zoneinfo/ROK and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Singapore b/libs/pytz/zoneinfo/Singapore
deleted file mode 100644
index 3d9f191e3a..0000000000
Binary files a/libs/pytz/zoneinfo/Singapore and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Turkey b/libs/pytz/zoneinfo/Turkey
deleted file mode 100644
index 7c2336dd80..0000000000
Binary files a/libs/pytz/zoneinfo/Turkey and /dev/null differ
diff --git a/libs/pytz/zoneinfo/UCT b/libs/pytz/zoneinfo/UCT
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/UCT and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Alaska b/libs/pytz/zoneinfo/US/Alaska
deleted file mode 100644
index 9bbb2fd3b3..0000000000
Binary files a/libs/pytz/zoneinfo/US/Alaska and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Aleutian b/libs/pytz/zoneinfo/US/Aleutian
deleted file mode 100644
index 43236498f6..0000000000
Binary files a/libs/pytz/zoneinfo/US/Aleutian and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Arizona b/libs/pytz/zoneinfo/US/Arizona
deleted file mode 100644
index ab37e84556..0000000000
Binary files a/libs/pytz/zoneinfo/US/Arizona and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Central b/libs/pytz/zoneinfo/US/Central
deleted file mode 100644
index c6981a06b1..0000000000
Binary files a/libs/pytz/zoneinfo/US/Central and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/East-Indiana b/libs/pytz/zoneinfo/US/East-Indiana
deleted file mode 100644
index a84b6e9967..0000000000
Binary files a/libs/pytz/zoneinfo/US/East-Indiana and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Eastern b/libs/pytz/zoneinfo/US/Eastern
deleted file mode 100644
index a8b9ab1992..0000000000
Binary files a/libs/pytz/zoneinfo/US/Eastern and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Hawaii b/libs/pytz/zoneinfo/US/Hawaii
deleted file mode 100644
index c7cd060159..0000000000
Binary files a/libs/pytz/zoneinfo/US/Hawaii and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Indiana-Starke b/libs/pytz/zoneinfo/US/Indiana-Starke
deleted file mode 100644
index 025d132dd4..0000000000
Binary files a/libs/pytz/zoneinfo/US/Indiana-Starke and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Michigan b/libs/pytz/zoneinfo/US/Michigan
deleted file mode 100644
index e104faa465..0000000000
Binary files a/libs/pytz/zoneinfo/US/Michigan and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Mountain b/libs/pytz/zoneinfo/US/Mountain
deleted file mode 100644
index abb2b974a4..0000000000
Binary files a/libs/pytz/zoneinfo/US/Mountain and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Pacific b/libs/pytz/zoneinfo/US/Pacific
deleted file mode 100644
index 610e7af5fc..0000000000
Binary files a/libs/pytz/zoneinfo/US/Pacific and /dev/null differ
diff --git a/libs/pytz/zoneinfo/US/Samoa b/libs/pytz/zoneinfo/US/Samoa
deleted file mode 100644
index cb56709a77..0000000000
Binary files a/libs/pytz/zoneinfo/US/Samoa and /dev/null differ
diff --git a/libs/pytz/zoneinfo/UTC b/libs/pytz/zoneinfo/UTC
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/UTC and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Universal b/libs/pytz/zoneinfo/Universal
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/Universal and /dev/null differ
diff --git a/libs/pytz/zoneinfo/W-SU b/libs/pytz/zoneinfo/W-SU
deleted file mode 100644
index ddb3f4e99a..0000000000
Binary files a/libs/pytz/zoneinfo/W-SU and /dev/null differ
diff --git a/libs/pytz/zoneinfo/WET b/libs/pytz/zoneinfo/WET
deleted file mode 100644
index 616de167b8..0000000000
Binary files a/libs/pytz/zoneinfo/WET and /dev/null differ
diff --git a/libs/pytz/zoneinfo/Zulu b/libs/pytz/zoneinfo/Zulu
deleted file mode 100644
index 91558be0c2..0000000000
Binary files a/libs/pytz/zoneinfo/Zulu and /dev/null differ
diff --git a/libs/pytz/zoneinfo/iso3166.tab b/libs/pytz/zoneinfo/iso3166.tab
deleted file mode 100644
index 402c015ec6..0000000000
--- a/libs/pytz/zoneinfo/iso3166.tab
+++ /dev/null
@@ -1,279 +0,0 @@
-# ISO 3166 alpha-2 country codes
-#
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-#
-# From Paul Eggert (2023-09-06):
-# This file contains a table of two-letter country codes.  Columns are
-# separated by a single tab.  Lines beginning with '#' are comments.
-# All text uses UTF-8 encoding.  The columns of the table are as follows:
-#
-# 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO/TC 46 N1108 (2023-04-05).  See: ISO/TC 46 Documents
-#     https://www.iso.org/committee/48750.html?view=documents
-# 2.  The usual English name for the coded region.  This sometimes
-#     departs from ISO-listed names, sometimes so that sorted subsets
-#     of names are useful (e.g., "Samoa (American)" and "Samoa
-#     (western)" rather than "American Samoa" and "Samoa"),
-#     sometimes to avoid confusion among non-experts (e.g.,
-#     "Czech Republic" and "Turkey" rather than "Czechia" and "Tรผrkiye"),
-#     and sometimes to omit needless detail or churn (e.g., "Netherlands"
-#     rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
-#
-# The table is sorted by country code.
-#
-# This table is intended as an aid for users, to help them select time
-# zone data appropriate for their practical needs.  It is not intended
-# to take or endorse any position on legal or territorial claims.
-#
-#country-
-#code	name of country, territory, area, or subdivision
-AD	Andorra
-AE	United Arab Emirates
-AF	Afghanistan
-AG	Antigua & Barbuda
-AI	Anguilla
-AL	Albania
-AM	Armenia
-AO	Angola
-AQ	Antarctica
-AR	Argentina
-AS	Samoa (American)
-AT	Austria
-AU	Australia
-AW	Aruba
-AX	ร…land Islands
-AZ	Azerbaijan
-BA	Bosnia & Herzegovina
-BB	Barbados
-BD	Bangladesh
-BE	Belgium
-BF	Burkina Faso
-BG	Bulgaria
-BH	Bahrain
-BI	Burundi
-BJ	Benin
-BL	St Barthelemy
-BM	Bermuda
-BN	Brunei
-BO	Bolivia
-BQ	Caribbean NL
-BR	Brazil
-BS	Bahamas
-BT	Bhutan
-BV	Bouvet Island
-BW	Botswana
-BY	Belarus
-BZ	Belize
-CA	Canada
-CC	Cocos (Keeling) Islands
-CD	Congo (Dem. Rep.)
-CF	Central African Rep.
-CG	Congo (Rep.)
-CH	Switzerland
-CI	Cรดte d'Ivoire
-CK	Cook Islands
-CL	Chile
-CM	Cameroon
-CN	China
-CO	Colombia
-CR	Costa Rica
-CU	Cuba
-CV	Cape Verde
-CW	Curaรงao
-CX	Christmas Island
-CY	Cyprus
-CZ	Czech Republic
-DE	Germany
-DJ	Djibouti
-DK	Denmark
-DM	Dominica
-DO	Dominican Republic
-DZ	Algeria
-EC	Ecuador
-EE	Estonia
-EG	Egypt
-EH	Western Sahara
-ER	Eritrea
-ES	Spain
-ET	Ethiopia
-FI	Finland
-FJ	Fiji
-FK	Falkland Islands
-FM	Micronesia
-FO	Faroe Islands
-FR	France
-GA	Gabon
-GB	Britain (UK)
-GD	Grenada
-GE	Georgia
-GF	French Guiana
-GG	Guernsey
-GH	Ghana
-GI	Gibraltar
-GL	Greenland
-GM	Gambia
-GN	Guinea
-GP	Guadeloupe
-GQ	Equatorial Guinea
-GR	Greece
-GS	South Georgia & the South Sandwich Islands
-GT	Guatemala
-GU	Guam
-GW	Guinea-Bissau
-GY	Guyana
-HK	Hong Kong
-HM	Heard Island & McDonald Islands
-HN	Honduras
-HR	Croatia
-HT	Haiti
-HU	Hungary
-ID	Indonesia
-IE	Ireland
-IL	Israel
-IM	Isle of Man
-IN	India
-IO	British Indian Ocean Territory
-IQ	Iraq
-IR	Iran
-IS	Iceland
-IT	Italy
-JE	Jersey
-JM	Jamaica
-JO	Jordan
-JP	Japan
-KE	Kenya
-KG	Kyrgyzstan
-KH	Cambodia
-KI	Kiribati
-KM	Comoros
-KN	St Kitts & Nevis
-KP	Korea (North)
-KR	Korea (South)
-KW	Kuwait
-KY	Cayman Islands
-KZ	Kazakhstan
-LA	Laos
-LB	Lebanon
-LC	St Lucia
-LI	Liechtenstein
-LK	Sri Lanka
-LR	Liberia
-LS	Lesotho
-LT	Lithuania
-LU	Luxembourg
-LV	Latvia
-LY	Libya
-MA	Morocco
-MC	Monaco
-MD	Moldova
-ME	Montenegro
-MF	St Martin (French)
-MG	Madagascar
-MH	Marshall Islands
-MK	North Macedonia
-ML	Mali
-MM	Myanmar (Burma)
-MN	Mongolia
-MO	Macau
-MP	Northern Mariana Islands
-MQ	Martinique
-MR	Mauritania
-MS	Montserrat
-MT	Malta
-MU	Mauritius
-MV	Maldives
-MW	Malawi
-MX	Mexico
-MY	Malaysia
-MZ	Mozambique
-NA	Namibia
-NC	New Caledonia
-NE	Niger
-NF	Norfolk Island
-NG	Nigeria
-NI	Nicaragua
-NL	Netherlands
-NO	Norway
-NP	Nepal
-NR	Nauru
-NU	Niue
-NZ	New Zealand
-OM	Oman
-PA	Panama
-PE	Peru
-PF	French Polynesia
-PG	Papua New Guinea
-PH	Philippines
-PK	Pakistan
-PL	Poland
-PM	St Pierre & Miquelon
-PN	Pitcairn
-PR	Puerto Rico
-PS	Palestine
-PT	Portugal
-PW	Palau
-PY	Paraguay
-QA	Qatar
-RE	Rรฉunion
-RO	Romania
-RS	Serbia
-RU	Russia
-RW	Rwanda
-SA	Saudi Arabia
-SB	Solomon Islands
-SC	Seychelles
-SD	Sudan
-SE	Sweden
-SG	Singapore
-SH	St Helena
-SI	Slovenia
-SJ	Svalbard & Jan Mayen
-SK	Slovakia
-SL	Sierra Leone
-SM	San Marino
-SN	Senegal
-SO	Somalia
-SR	Suriname
-SS	South Sudan
-ST	Sao Tome & Principe
-SV	El Salvador
-SX	St Maarten (Dutch)
-SY	Syria
-SZ	Eswatini (Swaziland)
-TC	Turks & Caicos Is
-TD	Chad
-TF	French S. Terr.
-TG	Togo
-TH	Thailand
-TJ	Tajikistan
-TK	Tokelau
-TL	East Timor
-TM	Turkmenistan
-TN	Tunisia
-TO	Tonga
-TR	Turkey
-TT	Trinidad & Tobago
-TV	Tuvalu
-TW	Taiwan
-TZ	Tanzania
-UA	Ukraine
-UG	Uganda
-UM	US minor outlying islands
-US	United States
-UY	Uruguay
-UZ	Uzbekistan
-VA	Vatican City
-VC	St Vincent
-VE	Venezuela
-VG	Virgin Islands (UK)
-VI	Virgin Islands (US)
-VN	Vietnam
-VU	Vanuatu
-WF	Wallis & Futuna
-WS	Samoa (western)
-YE	Yemen
-YT	Mayotte
-ZA	South Africa
-ZM	Zambia
-ZW	Zimbabwe
diff --git a/libs/pytz/zoneinfo/leapseconds b/libs/pytz/zoneinfo/leapseconds
deleted file mode 100644
index 6c715cb20b..0000000000
--- a/libs/pytz/zoneinfo/leapseconds
+++ /dev/null
@@ -1,79 +0,0 @@
-# Allowance for leap seconds added to each time zone file.
-
-# This file is in the public domain.
-
-# This file is generated automatically from the data in the public-domain
-# NIST/IERS format leap-seconds.list file, which can be copied from
-# <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
-# or, in a variant with different comments, from
-# <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
-# For more about leap-seconds.list, please see
-# The NTP Timescale and Leap Seconds
-# <https://www.eecis.udel.edu/~mills/leap.html>.
-
-# The rules for leap seconds are specified in Annex 1 (Time scales) of:
-# Standard-frequency and time-signal emissions.
-# International Telecommunication Union - Radiocommunication Sector
-# (ITU-R) Recommendation TF.460-6 (02/2002)
-# <https://www.itu.int/rec/R-REC-TF.460-6-200202-I/>.
-# The International Earth Rotation and Reference Systems Service (IERS)
-# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
-# (a proxy for Earth's angle in space as measured by astronomers)
-# and publishes leap second data in a copyrighted file
-# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
-# See: Levine J. Coordinated Universal Time and the leap second.
-# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
-# <https://ieeexplore.ieee.org/document/7909995>.
-
-# There were no leap seconds before 1972, as no official mechanism
-# accounted for the discrepancy between atomic time (TAI) and the earth's
-# rotation.  The first ("1 Jan 1972") data line in leap-seconds.list
-# does not denote a leap second; it denotes the start of the current definition
-# of UTC.
-
-# All leap-seconds are Stationary (S) at the given UTC time.
-# The correction (+ or -) is made at the given time, so in the unlikely
-# event of a negative leap second, a line would look like this:
-# Leap	YEAR	MON	DAY	23:59:59	-	S
-# Typical lines look like this:
-# Leap	YEAR	MON	DAY	23:59:60	+	S
-Leap	1972	Jun	30	23:59:60	+	S
-Leap	1972	Dec	31	23:59:60	+	S
-Leap	1973	Dec	31	23:59:60	+	S
-Leap	1974	Dec	31	23:59:60	+	S
-Leap	1975	Dec	31	23:59:60	+	S
-Leap	1976	Dec	31	23:59:60	+	S
-Leap	1977	Dec	31	23:59:60	+	S
-Leap	1978	Dec	31	23:59:60	+	S
-Leap	1979	Dec	31	23:59:60	+	S
-Leap	1981	Jun	30	23:59:60	+	S
-Leap	1982	Jun	30	23:59:60	+	S
-Leap	1983	Jun	30	23:59:60	+	S
-Leap	1985	Jun	30	23:59:60	+	S
-Leap	1987	Dec	31	23:59:60	+	S
-Leap	1989	Dec	31	23:59:60	+	S
-Leap	1990	Dec	31	23:59:60	+	S
-Leap	1992	Jun	30	23:59:60	+	S
-Leap	1993	Jun	30	23:59:60	+	S
-Leap	1994	Jun	30	23:59:60	+	S
-Leap	1995	Dec	31	23:59:60	+	S
-Leap	1997	Jun	30	23:59:60	+	S
-Leap	1998	Dec	31	23:59:60	+	S
-Leap	2005	Dec	31	23:59:60	+	S
-Leap	2008	Dec	31	23:59:60	+	S
-Leap	2012	Jun	30	23:59:60	+	S
-Leap	2015	Jun	30	23:59:60	+	S
-Leap	2016	Dec	31	23:59:60	+	S
-
-# UTC timestamp when this leap second list expires.
-# Any additional leap seconds will come after this.
-# This Expires line is commented out for now,
-# so that pre-2020a zic implementations do not reject this file.
-#Expires 2025	Jun	28	00:00:00
-
-# POSIX timestamps for the data in this file:
-#updated 1720104763 (2024-07-04 14:52:43 UTC)
-#expires 1751068800 (2025-06-28 00:00:00 UTC)
-
-#	Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-#	File expires on 28 June 2025
diff --git a/libs/pytz/zoneinfo/tzdata.zi b/libs/pytz/zoneinfo/tzdata.zi
deleted file mode 100644
index b89326a7aa..0000000000
--- a/libs/pytz/zoneinfo/tzdata.zi
+++ /dev/null
@@ -1,4281 +0,0 @@
-# version unknown
-# This zic input file is in the public domain.
-R d 1916 o - Jun 14 23s 1 S
-R d 1916 1919 - O Su>=1 23s 0 -
-R d 1917 o - Mar 24 23s 1 S
-R d 1918 o - Mar 9 23s 1 S
-R d 1919 o - Mar 1 23s 1 S
-R d 1920 o - F 14 23s 1 S
-R d 1920 o - O 23 23s 0 -
-R d 1921 o - Mar 14 23s 1 S
-R d 1921 o - Jun 21 23s 0 -
-R d 1939 o - S 11 23s 1 S
-R d 1939 o - N 19 1 0 -
-R d 1944 1945 - Ap M>=1 2 1 S
-R d 1944 o - O 8 2 0 -
-R d 1945 o - S 16 1 0 -
-R d 1971 o - Ap 25 23s 1 S
-R d 1971 o - S 26 23s 0 -
-R d 1977 o - May 6 0 1 S
-R d 1977 o - O 21 0 0 -
-R d 1978 o - Mar 24 1 1 S
-R d 1978 o - S 22 3 0 -
-R d 1980 o - Ap 25 0 1 S
-R d 1980 o - O 31 2 0 -
-R K 1940 o - Jul 15 0 1 S
-R K 1940 o - O 1 0 0 -
-R K 1941 o - Ap 15 0 1 S
-R K 1941 o - S 16 0 0 -
-R K 1942 1944 - Ap 1 0 1 S
-R K 1942 o - O 27 0 0 -
-R K 1943 1945 - N 1 0 0 -
-R K 1945 o - Ap 16 0 1 S
-R K 1957 o - May 10 0 1 S
-R K 1957 1958 - O 1 0 0 -
-R K 1958 o - May 1 0 1 S
-R K 1959 1981 - May 1 1 1 S
-R K 1959 1965 - S 30 3 0 -
-R K 1966 1994 - O 1 3 0 -
-R K 1982 o - Jul 25 1 1 S
-R K 1983 o - Jul 12 1 1 S
-R K 1984 1988 - May 1 1 1 S
-R K 1989 o - May 6 1 1 S
-R K 1990 1994 - May 1 1 1 S
-R K 1995 2010 - Ap lastF 0s 1 S
-R K 1995 2005 - S lastTh 24 0 -
-R K 2006 o - S 21 24 0 -
-R K 2007 o - S Th>=1 24 0 -
-R K 2008 o - Au lastTh 24 0 -
-R K 2009 o - Au 20 24 0 -
-R K 2010 o - Au 10 24 0 -
-R K 2010 o - S 9 24 1 S
-R K 2010 o - S lastTh 24 0 -
-R K 2014 o - May 15 24 1 S
-R K 2014 o - Jun 26 24 0 -
-R K 2014 o - Jul 31 24 1 S
-R K 2014 o - S lastTh 24 0 -
-R K 2023 ma - Ap lastF 0 1 S
-R K 2023 ma - O lastTh 24 0 -
-R L 1951 o - O 14 2 1 S
-R L 1952 o - Ja 1 0 0 -
-R L 1953 o - O 9 2 1 S
-R L 1954 o - Ja 1 0 0 -
-R L 1955 o - S 30 0 1 S
-R L 1956 o - Ja 1 0 0 -
-R L 1982 1984 - Ap 1 0 1 S
-R L 1982 1985 - O 1 0 0 -
-R L 1985 o - Ap 6 0 1 S
-R L 1986 o - Ap 4 0 1 S
-R L 1986 o - O 3 0 0 -
-R L 1987 1989 - Ap 1 0 1 S
-R L 1987 1989 - O 1 0 0 -
-R L 1997 o - Ap 4 0 1 S
-R L 1997 o - O 4 0 0 -
-R L 2013 o - Mar lastF 1 1 S
-R L 2013 o - O lastF 2 0 -
-R MU 1982 o - O 10 0 1 -
-R MU 1983 o - Mar 21 0 0 -
-R MU 2008 o - O lastSu 2 1 -
-R MU 2009 o - Mar lastSu 2 0 -
-R M 1939 o - S 12 0 1 -
-R M 1939 o - N 19 0 0 -
-R M 1940 o - F 25 0 1 -
-R M 1945 o - N 18 0 0 -
-R M 1950 o - Jun 11 0 1 -
-R M 1950 o - O 29 0 0 -
-R M 1967 o - Jun 3 12 1 -
-R M 1967 o - O 1 0 0 -
-R M 1974 o - Jun 24 0 1 -
-R M 1974 o - S 1 0 0 -
-R M 1976 1977 - May 1 0 1 -
-R M 1976 o - Au 1 0 0 -
-R M 1977 o - S 28 0 0 -
-R M 1978 o - Jun 1 0 1 -
-R M 1978 o - Au 4 0 0 -
-R M 2008 o - Jun 1 0 1 -
-R M 2008 o - S 1 0 0 -
-R M 2009 o - Jun 1 0 1 -
-R M 2009 o - Au 21 0 0 -
-R M 2010 o - May 2 0 1 -
-R M 2010 o - Au 8 0 0 -
-R M 2011 o - Ap 3 0 1 -
-R M 2011 o - Jul 31 0 0 -
-R M 2012 2013 - Ap lastSu 2 1 -
-R M 2012 o - Jul 20 3 0 -
-R M 2012 o - Au 20 2 1 -
-R M 2012 o - S 30 3 0 -
-R M 2013 o - Jul 7 3 0 -
-R M 2013 o - Au 10 2 1 -
-R M 2013 2018 - O lastSu 3 0 -
-R M 2014 2018 - Mar lastSu 2 1 -
-R M 2014 o - Jun 28 3 0 -
-R M 2014 o - Au 2 2 1 -
-R M 2015 o - Jun 14 3 0 -
-R M 2015 o - Jul 19 2 1 -
-R M 2016 o - Jun 5 3 0 -
-R M 2016 o - Jul 10 2 1 -
-R M 2017 o - May 21 3 0 -
-R M 2017 o - Jul 2 2 1 -
-R M 2018 o - May 13 3 0 -
-R M 2018 o - Jun 17 2 1 -
-R M 2019 o - May 5 3 -1 -
-R M 2019 o - Jun 9 2 0 -
-R M 2020 o - Ap 19 3 -1 -
-R M 2020 o - May 31 2 0 -
-R M 2021 o - Ap 11 3 -1 -
-R M 2021 o - May 16 2 0 -
-R M 2022 o - Mar 27 3 -1 -
-R M 2022 o - May 8 2 0 -
-R M 2023 o - Mar 19 3 -1 -
-R M 2023 o - Ap 23 2 0 -
-R M 2024 o - Mar 10 3 -1 -
-R M 2024 o - Ap 14 2 0 -
-R M 2025 o - F 23 3 -1 -
-R M 2025 o - Ap 6 2 0 -
-R M 2026 o - F 15 3 -1 -
-R M 2026 o - Mar 22 2 0 -
-R M 2027 o - F 7 3 -1 -
-R M 2027 o - Mar 14 2 0 -
-R M 2028 o - Ja 23 3 -1 -
-R M 2028 o - Mar 5 2 0 -
-R M 2029 o - Ja 14 3 -1 -
-R M 2029 o - F 18 2 0 -
-R M 2029 o - D 30 3 -1 -
-R M 2030 o - F 10 2 0 -
-R M 2030 o - D 22 3 -1 -
-R M 2031 o - Ja 26 2 0 -
-R M 2031 o - D 14 3 -1 -
-R M 2032 o - Ja 18 2 0 -
-R M 2032 o - N 28 3 -1 -
-R M 2033 o - Ja 9 2 0 -
-R M 2033 o - N 20 3 -1 -
-R M 2033 o - D 25 2 0 -
-R M 2034 o - N 5 3 -1 -
-R M 2034 o - D 17 2 0 -
-R M 2035 o - O 28 3 -1 -
-R M 2035 o - D 9 2 0 -
-R M 2036 o - O 19 3 -1 -
-R M 2036 o - N 23 2 0 -
-R M 2037 o - O 4 3 -1 -
-R M 2037 o - N 15 2 0 -
-R M 2038 o - S 26 3 -1 -
-R M 2038 o - O 31 2 0 -
-R M 2039 o - S 18 3 -1 -
-R M 2039 o - O 23 2 0 -
-R M 2040 o - S 2 3 -1 -
-R M 2040 o - O 14 2 0 -
-R M 2041 o - Au 25 3 -1 -
-R M 2041 o - S 29 2 0 -
-R M 2042 o - Au 10 3 -1 -
-R M 2042 o - S 21 2 0 -
-R M 2043 o - Au 2 3 -1 -
-R M 2043 o - S 13 2 0 -
-R M 2044 o - Jul 24 3 -1 -
-R M 2044 o - Au 28 2 0 -
-R M 2045 o - Jul 9 3 -1 -
-R M 2045 o - Au 20 2 0 -
-R M 2046 o - Jul 1 3 -1 -
-R M 2046 o - Au 5 2 0 -
-R M 2047 o - Jun 23 3 -1 -
-R M 2047 o - Jul 28 2 0 -
-R M 2048 o - Jun 7 3 -1 -
-R M 2048 o - Jul 19 2 0 -
-R M 2049 o - May 30 3 -1 -
-R M 2049 o - Jul 4 2 0 -
-R M 2050 o - May 15 3 -1 -
-R M 2050 o - Jun 26 2 0 -
-R M 2051 o - May 7 3 -1 -
-R M 2051 o - Jun 18 2 0 -
-R M 2052 o - Ap 28 3 -1 -
-R M 2052 o - Jun 2 2 0 -
-R M 2053 o - Ap 13 3 -1 -
-R M 2053 o - May 25 2 0 -
-R M 2054 o - Ap 5 3 -1 -
-R M 2054 o - May 10 2 0 -
-R M 2055 o - Mar 28 3 -1 -
-R M 2055 o - May 2 2 0 -
-R M 2056 o - Mar 12 3 -1 -
-R M 2056 o - Ap 23 2 0 -
-R M 2057 o - Mar 4 3 -1 -
-R M 2057 o - Ap 8 2 0 -
-R M 2058 o - F 17 3 -1 -
-R M 2058 o - Mar 31 2 0 -
-R M 2059 o - F 9 3 -1 -
-R M 2059 o - Mar 23 2 0 -
-R M 2060 o - F 1 3 -1 -
-R M 2060 o - Mar 7 2 0 -
-R M 2061 o - Ja 16 3 -1 -
-R M 2061 o - F 27 2 0 -
-R M 2062 o - Ja 8 3 -1 -
-R M 2062 o - F 12 2 0 -
-R M 2062 o - D 31 3 -1 -
-R M 2063 o - F 4 2 0 -
-R M 2063 o - D 16 3 -1 -
-R M 2064 o - Ja 27 2 0 -
-R M 2064 o - D 7 3 -1 -
-R M 2065 o - Ja 11 2 0 -
-R M 2065 o - N 22 3 -1 -
-R M 2066 o - Ja 3 2 0 -
-R M 2066 o - N 14 3 -1 -
-R M 2066 o - D 26 2 0 -
-R M 2067 o - N 6 3 -1 -
-R M 2067 o - D 11 2 0 -
-R M 2068 o - O 21 3 -1 -
-R M 2068 o - D 2 2 0 -
-R M 2069 o - O 13 3 -1 -
-R M 2069 o - N 17 2 0 -
-R M 2070 o - O 5 3 -1 -
-R M 2070 o - N 9 2 0 -
-R M 2071 o - S 20 3 -1 -
-R M 2071 o - N 1 2 0 -
-R M 2072 o - S 11 3 -1 -
-R M 2072 o - O 16 2 0 -
-R M 2073 o - Au 27 3 -1 -
-R M 2073 o - O 8 2 0 -
-R M 2074 o - Au 19 3 -1 -
-R M 2074 o - S 30 2 0 -
-R M 2075 o - Au 11 3 -1 -
-R M 2075 o - S 15 2 0 -
-R M 2076 o - Jul 26 3 -1 -
-R M 2076 o - S 6 2 0 -
-R M 2077 o - Jul 18 3 -1 -
-R M 2077 o - Au 22 2 0 -
-R M 2078 o - Jul 10 3 -1 -
-R M 2078 o - Au 14 2 0 -
-R M 2079 o - Jun 25 3 -1 -
-R M 2079 o - Au 6 2 0 -
-R M 2080 o - Jun 16 3 -1 -
-R M 2080 o - Jul 21 2 0 -
-R M 2081 o - Jun 1 3 -1 -
-R M 2081 o - Jul 13 2 0 -
-R M 2082 o - May 24 3 -1 -
-R M 2082 o - Jun 28 2 0 -
-R M 2083 o - May 16 3 -1 -
-R M 2083 o - Jun 20 2 0 -
-R M 2084 o - Ap 30 3 -1 -
-R M 2084 o - Jun 11 2 0 -
-R M 2085 o - Ap 22 3 -1 -
-R M 2085 o - May 27 2 0 -
-R M 2086 o - Ap 14 3 -1 -
-R M 2086 o - May 19 2 0 -
-R M 2087 o - Mar 30 3 -1 -
-R M 2087 o - May 11 2 0 -
-R NA 1994 o - Mar 21 0 -1 WAT
-R NA 1994 2017 - S Su>=1 2 0 CAT
-R NA 1995 2017 - Ap Su>=1 2 -1 WAT
-R SA 1942 1943 - S Su>=15 2 1 -
-R SA 1943 1944 - Mar Su>=15 2 0 -
-R SD 1970 o - May 1 0 1 S
-R SD 1970 1985 - O 15 0 0 -
-R SD 1971 o - Ap 30 0 1 S
-R SD 1972 1985 - Ap lastSu 0 1 S
-R n 1939 o - Ap 15 23s 1 S
-R n 1939 o - N 18 23s 0 -
-R n 1940 o - F 25 23s 1 S
-R n 1941 o - O 6 0 0 -
-R n 1942 o - Mar 9 0 1 S
-R n 1942 o - N 2 3 0 -
-R n 1943 o - Mar 29 2 1 S
-R n 1943 o - Ap 17 2 0 -
-R n 1943 o - Ap 25 2 1 S
-R n 1943 o - O 4 2 0 -
-R n 1944 1945 - Ap M>=1 2 1 S
-R n 1944 o - O 8 0 0 -
-R n 1945 o - S 16 0 0 -
-R n 1977 o - Ap 30 0s 1 S
-R n 1977 o - S 24 0s 0 -
-R n 1978 o - May 1 0s 1 S
-R n 1978 o - O 1 0s 0 -
-R n 1988 o - Jun 1 0s 1 S
-R n 1988 1990 - S lastSu 0s 0 -
-R n 1989 o - Mar 26 0s 1 S
-R n 1990 o - May 1 0s 1 S
-R n 2005 o - May 1 0s 1 S
-R n 2005 o - S 30 1s 0 -
-R n 2006 2008 - Mar lastSu 2s 1 S
-R n 2006 2008 - O lastSu 2s 0 -
-R Tr 2005 ma - Mar lastSu 1u 2 +02
-R Tr 2004 ma - O lastSu 1u 0 +00
-R AM 2011 o - Mar lastSu 2s 1 -
-R AM 2011 o - O lastSu 2s 0 -
-R AZ 1997 2015 - Mar lastSu 4 1 -
-R AZ 1997 2015 - O lastSu 5 0 -
-R BD 2009 o - Jun 19 23 1 -
-R BD 2009 o - D 31 24 0 -
-R Sh 1919 o - Ap 12 24 1 D
-R Sh 1919 o - S 30 24 0 S
-R Sh 1940 o - Jun 1 0 1 D
-R Sh 1940 o - O 12 24 0 S
-R Sh 1941 o - Mar 15 0 1 D
-R Sh 1941 o - N 1 24 0 S
-R Sh 1942 o - Ja 31 0 1 D
-R Sh 1945 o - S 1 24 0 S
-R Sh 1946 o - May 15 0 1 D
-R Sh 1946 o - S 30 24 0 S
-R Sh 1947 o - Ap 15 0 1 D
-R Sh 1947 o - O 31 24 0 S
-R Sh 1948 1949 - May 1 0 1 D
-R Sh 1948 1949 - S 30 24 0 S
-R CN 1986 o - May 4 2 1 D
-R CN 1986 1991 - S Su>=11 2 0 S
-R CN 1987 1991 - Ap Su>=11 2 1 D
-R HK 1946 o - Ap 21 0 1 S
-R HK 1946 o - D 1 3:30s 0 -
-R HK 1947 o - Ap 13 3:30s 1 S
-R HK 1947 o - N 30 3:30s 0 -
-R HK 1948 o - May 2 3:30s 1 S
-R HK 1948 1952 - O Su>=28 3:30s 0 -
-R HK 1949 1953 - Ap Su>=1 3:30 1 S
-R HK 1953 1964 - O Su>=31 3:30 0 -
-R HK 1954 1964 - Mar Su>=18 3:30 1 S
-R HK 1965 1976 - Ap Su>=16 3:30 1 S
-R HK 1965 1976 - O Su>=16 3:30 0 -
-R HK 1973 o - D 30 3:30 1 S
-R HK 1979 o - May 13 3:30 1 S
-R HK 1979 o - O 21 3:30 0 -
-R f 1946 o - May 15 0 1 D
-R f 1946 o - O 1 0 0 S
-R f 1947 o - Ap 15 0 1 D
-R f 1947 o - N 1 0 0 S
-R f 1948 1951 - May 1 0 1 D
-R f 1948 1951 - O 1 0 0 S
-R f 1952 o - Mar 1 0 1 D
-R f 1952 1954 - N 1 0 0 S
-R f 1953 1959 - Ap 1 0 1 D
-R f 1955 1961 - O 1 0 0 S
-R f 1960 1961 - Jun 1 0 1 D
-R f 1974 1975 - Ap 1 0 1 D
-R f 1974 1975 - O 1 0 0 S
-R f 1979 o - Jul 1 0 1 D
-R f 1979 o - O 1 0 0 S
-R _ 1942 1943 - Ap 30 23 1 -
-R _ 1942 o - N 17 23 0 -
-R _ 1943 o - S 30 23 0 S
-R _ 1946 o - Ap 30 23s 1 D
-R _ 1946 o - S 30 23s 0 S
-R _ 1947 o - Ap 19 23s 1 D
-R _ 1947 o - N 30 23s 0 S
-R _ 1948 o - May 2 23s 1 D
-R _ 1948 o - O 31 23s 0 S
-R _ 1949 1950 - Ap Sa>=1 23s 1 D
-R _ 1949 1950 - O lastSa 23s 0 S
-R _ 1951 o - Mar 31 23s 1 D
-R _ 1951 o - O 28 23s 0 S
-R _ 1952 1953 - Ap Sa>=1 23s 1 D
-R _ 1952 o - N 1 23s 0 S
-R _ 1953 1954 - O lastSa 23s 0 S
-R _ 1954 1956 - Mar Sa>=17 23s 1 D
-R _ 1955 o - N 5 23s 0 S
-R _ 1956 1964 - N Su>=1 3:30 0 S
-R _ 1957 1964 - Mar Su>=18 3:30 1 D
-R _ 1965 1973 - Ap Su>=16 3:30 1 D
-R _ 1965 1966 - O Su>=16 2:30 0 S
-R _ 1967 1976 - O Su>=16 3:30 0 S
-R _ 1973 o - D 30 3:30 1 D
-R _ 1975 1976 - Ap Su>=16 3:30 1 D
-R _ 1979 o - May 13 3:30 1 D
-R _ 1979 o - O Su>=16 3:30 0 S
-R CY 1975 o - Ap 13 0 1 S
-R CY 1975 o - O 12 0 0 -
-R CY 1976 o - May 15 0 1 S
-R CY 1976 o - O 11 0 0 -
-R CY 1977 1980 - Ap Su>=1 0 1 S
-R CY 1977 o - S 25 0 0 -
-R CY 1978 o - O 2 0 0 -
-R CY 1979 1997 - S lastSu 0 0 -
-R CY 1981 1998 - Mar lastSu 0 1 S
-R i 1910 o - Ja 1 0 0 -
-R i 1977 o - Mar 21 23 1 -
-R i 1977 o - O 20 24 0 -
-R i 1978 o - Mar 24 24 1 -
-R i 1978 o - Au 5 1 0 -
-R i 1979 o - May 26 24 1 -
-R i 1979 o - S 18 24 0 -
-R i 1980 o - Mar 20 24 1 -
-R i 1980 o - S 22 24 0 -
-R i 1991 o - May 2 24 1 -
-R i 1992 1995 - Mar 21 24 1 -
-R i 1991 1995 - S 21 24 0 -
-R i 1996 o - Mar 20 24 1 -
-R i 1996 o - S 20 24 0 -
-R i 1997 1999 - Mar 21 24 1 -
-R i 1997 1999 - S 21 24 0 -
-R i 2000 o - Mar 20 24 1 -
-R i 2000 o - S 20 24 0 -
-R i 2001 2003 - Mar 21 24 1 -
-R i 2001 2003 - S 21 24 0 -
-R i 2004 o - Mar 20 24 1 -
-R i 2004 o - S 20 24 0 -
-R i 2005 o - Mar 21 24 1 -
-R i 2005 o - S 21 24 0 -
-R i 2008 o - Mar 20 24 1 -
-R i 2008 o - S 20 24 0 -
-R i 2009 2011 - Mar 21 24 1 -
-R i 2009 2011 - S 21 24 0 -
-R i 2012 o - Mar 20 24 1 -
-R i 2012 o - S 20 24 0 -
-R i 2013 2015 - Mar 21 24 1 -
-R i 2013 2015 - S 21 24 0 -
-R i 2016 o - Mar 20 24 1 -
-R i 2016 o - S 20 24 0 -
-R i 2017 2019 - Mar 21 24 1 -
-R i 2017 2019 - S 21 24 0 -
-R i 2020 o - Mar 20 24 1 -
-R i 2020 o - S 20 24 0 -
-R i 2021 2022 - Mar 21 24 1 -
-R i 2021 2022 - S 21 24 0 -
-R IQ 1982 o - May 1 0 1 -
-R IQ 1982 1984 - O 1 0 0 -
-R IQ 1983 o - Mar 31 0 1 -
-R IQ 1984 1985 - Ap 1 0 1 -
-R IQ 1985 1990 - S lastSu 1s 0 -
-R IQ 1986 1990 - Mar lastSu 1s 1 -
-R IQ 1991 2007 - Ap 1 3s 1 -
-R IQ 1991 2007 - O 1 3s 0 -
-R Z 1940 o - May 31 24u 1 D
-R Z 1940 o - S 30 24u 0 S
-R Z 1940 o - N 16 24u 1 D
-R Z 1942 1946 - O 31 24u 0 S
-R Z 1943 1944 - Mar 31 24u 1 D
-R Z 1945 1946 - Ap 15 24u 1 D
-R Z 1948 o - May 22 24u 2 DD
-R Z 1948 o - Au 31 24u 1 D
-R Z 1948 1949 - O 31 24u 0 S
-R Z 1949 o - Ap 30 24u 1 D
-R Z 1950 o - Ap 15 24u 1 D
-R Z 1950 o - S 14 24u 0 S
-R Z 1951 o - Mar 31 24u 1 D
-R Z 1951 o - N 10 24u 0 S
-R Z 1952 o - Ap 19 24u 1 D
-R Z 1952 o - O 18 24u 0 S
-R Z 1953 o - Ap 11 24u 1 D
-R Z 1953 o - S 12 24u 0 S
-R Z 1954 o - Jun 12 24u 1 D
-R Z 1954 o - S 11 24u 0 S
-R Z 1955 o - Jun 11 24u 1 D
-R Z 1955 o - S 10 24u 0 S
-R Z 1956 o - Jun 2 24u 1 D
-R Z 1956 o - S 29 24u 0 S
-R Z 1957 o - Ap 27 24u 1 D
-R Z 1957 o - S 21 24u 0 S
-R Z 1974 o - Jul 6 24 1 D
-R Z 1974 o - O 12 24 0 S
-R Z 1975 o - Ap 19 24 1 D
-R Z 1975 o - Au 30 24 0 S
-R Z 1980 o - Au 2 24s 1 D
-R Z 1980 o - S 13 24s 0 S
-R Z 1984 o - May 5 24s 1 D
-R Z 1984 o - Au 25 24s 0 S
-R Z 1985 o - Ap 13 24 1 D
-R Z 1985 o - Au 31 24 0 S
-R Z 1986 o - May 17 24 1 D
-R Z 1986 o - S 6 24 0 S
-R Z 1987 o - Ap 14 24 1 D
-R Z 1987 o - S 12 24 0 S
-R Z 1988 o - Ap 9 24 1 D
-R Z 1988 o - S 3 24 0 S
-R Z 1989 o - Ap 29 24 1 D
-R Z 1989 o - S 2 24 0 S
-R Z 1990 o - Mar 24 24 1 D
-R Z 1990 o - Au 25 24 0 S
-R Z 1991 o - Mar 23 24 1 D
-R Z 1991 o - Au 31 24 0 S
-R Z 1992 o - Mar 28 24 1 D
-R Z 1992 o - S 5 24 0 S
-R Z 1993 o - Ap 2 0 1 D
-R Z 1993 o - S 5 0 0 S
-R Z 1994 o - Ap 1 0 1 D
-R Z 1994 o - Au 28 0 0 S
-R Z 1995 o - Mar 31 0 1 D
-R Z 1995 o - S 3 0 0 S
-R Z 1996 o - Mar 14 24 1 D
-R Z 1996 o - S 15 24 0 S
-R Z 1997 o - Mar 20 24 1 D
-R Z 1997 o - S 13 24 0 S
-R Z 1998 o - Mar 20 0 1 D
-R Z 1998 o - S 6 0 0 S
-R Z 1999 o - Ap 2 2 1 D
-R Z 1999 o - S 3 2 0 S
-R Z 2000 o - Ap 14 2 1 D
-R Z 2000 o - O 6 1 0 S
-R Z 2001 o - Ap 9 1 1 D
-R Z 2001 o - S 24 1 0 S
-R Z 2002 o - Mar 29 1 1 D
-R Z 2002 o - O 7 1 0 S
-R Z 2003 o - Mar 28 1 1 D
-R Z 2003 o - O 3 1 0 S
-R Z 2004 o - Ap 7 1 1 D
-R Z 2004 o - S 22 1 0 S
-R Z 2005 2012 - Ap F<=1 2 1 D
-R Z 2005 o - O 9 2 0 S
-R Z 2006 o - O 1 2 0 S
-R Z 2007 o - S 16 2 0 S
-R Z 2008 o - O 5 2 0 S
-R Z 2009 o - S 27 2 0 S
-R Z 2010 o - S 12 2 0 S
-R Z 2011 o - O 2 2 0 S
-R Z 2012 o - S 23 2 0 S
-R Z 2013 ma - Mar F>=23 2 1 D
-R Z 2013 ma - O lastSu 2 0 S
-R JP 1948 o - May Sa>=1 24 1 D
-R JP 1948 1951 - S Sa>=8 25 0 S
-R JP 1949 o - Ap Sa>=1 24 1 D
-R JP 1950 1951 - May Sa>=1 24 1 D
-R J 1973 o - Jun 6 0 1 S
-R J 1973 1975 - O 1 0 0 -
-R J 1974 1977 - May 1 0 1 S
-R J 1976 o - N 1 0 0 -
-R J 1977 o - O 1 0 0 -
-R J 1978 o - Ap 30 0 1 S
-R J 1978 o - S 30 0 0 -
-R J 1985 o - Ap 1 0 1 S
-R J 1985 o - O 1 0 0 -
-R J 1986 1988 - Ap F>=1 0 1 S
-R J 1986 1990 - O F>=1 0 0 -
-R J 1989 o - May 8 0 1 S
-R J 1990 o - Ap 27 0 1 S
-R J 1991 o - Ap 17 0 1 S
-R J 1991 o - S 27 0 0 -
-R J 1992 o - Ap 10 0 1 S
-R J 1992 1993 - O F>=1 0 0 -
-R J 1993 1998 - Ap F>=1 0 1 S
-R J 1994 o - S F>=15 0 0 -
-R J 1995 1998 - S F>=15 0s 0 -
-R J 1999 o - Jul 1 0s 1 S
-R J 1999 2002 - S lastF 0s 0 -
-R J 2000 2001 - Mar lastTh 0s 1 S
-R J 2002 2012 - Mar lastTh 24 1 S
-R J 2003 o - O 24 0s 0 -
-R J 2004 o - O 15 0s 0 -
-R J 2005 o - S lastF 0s 0 -
-R J 2006 2011 - O lastF 0s 0 -
-R J 2013 o - D 20 0 0 -
-R J 2014 2021 - Mar lastTh 24 1 S
-R J 2014 2022 - O lastF 0s 0 -
-R J 2022 o - F lastTh 24 1 S
-R KG 1992 1996 - Ap Su>=7 0s 1 -
-R KG 1992 1996 - S lastSu 0 0 -
-R KG 1997 2005 - Mar lastSu 2:30 1 -
-R KG 1997 2004 - O lastSu 2:30 0 -
-R KR 1948 o - Jun 1 0 1 D
-R KR 1948 o - S 12 24 0 S
-R KR 1949 o - Ap 3 0 1 D
-R KR 1949 1951 - S Sa>=7 24 0 S
-R KR 1950 o - Ap 1 0 1 D
-R KR 1951 o - May 6 0 1 D
-R KR 1955 o - May 5 0 1 D
-R KR 1955 o - S 8 24 0 S
-R KR 1956 o - May 20 0 1 D
-R KR 1956 o - S 29 24 0 S
-R KR 1957 1960 - May Su>=1 0 1 D
-R KR 1957 1960 - S Sa>=17 24 0 S
-R KR 1987 1988 - May Su>=8 2 1 D
-R KR 1987 1988 - O Su>=8 3 0 S
-R l 1920 o - Mar 28 0 1 S
-R l 1920 o - O 25 0 0 -
-R l 1921 o - Ap 3 0 1 S
-R l 1921 o - O 3 0 0 -
-R l 1922 o - Mar 26 0 1 S
-R l 1922 o - O 8 0 0 -
-R l 1923 o - Ap 22 0 1 S
-R l 1923 o - S 16 0 0 -
-R l 1957 1961 - May 1 0 1 S
-R l 1957 1961 - O 1 0 0 -
-R l 1972 o - Jun 22 0 1 S
-R l 1972 1977 - O 1 0 0 -
-R l 1973 1977 - May 1 0 1 S
-R l 1978 o - Ap 30 0 1 S
-R l 1978 o - S 30 0 0 -
-R l 1984 1987 - May 1 0 1 S
-R l 1984 1991 - O 16 0 0 -
-R l 1988 o - Jun 1 0 1 S
-R l 1989 o - May 10 0 1 S
-R l 1990 1992 - May 1 0 1 S
-R l 1992 o - O 4 0 0 -
-R l 1993 ma - Mar lastSu 0 1 S
-R l 1993 1998 - S lastSu 0 0 -
-R l 1999 ma - O lastSu 0 0 -
-R NB 1935 1941 - S 14 0 0:20 -
-R NB 1935 1941 - D 14 0 0 -
-R X 1983 1984 - Ap 1 0 1 -
-R X 1983 o - O 1 0 0 -
-R X 1985 1998 - Mar lastSu 0 1 -
-R X 1984 1998 - S lastSu 0 0 -
-R X 2001 o - Ap lastSa 2 1 -
-R X 2001 2006 - S lastSa 2 0 -
-R X 2002 2006 - Mar lastSa 2 1 -
-R X 2015 2016 - Mar lastSa 2 1 -
-R X 2015 2016 - S lastSa 0 0 -
-R PK 2002 o - Ap Su>=2 0 1 S
-R PK 2002 o - O Su>=2 0 0 -
-R PK 2008 o - Jun 1 0 1 S
-R PK 2008 2009 - N 1 0 0 -
-R PK 2009 o - Ap 15 0 1 S
-R P 1999 2005 - Ap F>=15 0 1 S
-R P 1999 2003 - O F>=15 0 0 -
-R P 2004 o - O 1 1 0 -
-R P 2005 o - O 4 2 0 -
-R P 2006 2007 - Ap 1 0 1 S
-R P 2006 o - S 22 0 0 -
-R P 2007 o - S 13 2 0 -
-R P 2008 2009 - Mar lastF 0 1 S
-R P 2008 o - S 1 0 0 -
-R P 2009 o - S 4 1 0 -
-R P 2010 o - Mar 26 0 1 S
-R P 2010 o - Au 11 0 0 -
-R P 2011 o - Ap 1 0:1 1 S
-R P 2011 o - Au 1 0 0 -
-R P 2011 o - Au 30 0 1 S
-R P 2011 o - S 30 0 0 -
-R P 2012 2014 - Mar lastTh 24 1 S
-R P 2012 o - S 21 1 0 -
-R P 2013 o - S 27 0 0 -
-R P 2014 o - O 24 0 0 -
-R P 2015 o - Mar 28 0 1 S
-R P 2015 o - O 23 1 0 -
-R P 2016 2018 - Mar Sa<=30 1 1 S
-R P 2016 2018 - O Sa<=30 1 0 -
-R P 2019 o - Mar 29 0 1 S
-R P 2019 o - O Sa<=30 0 0 -
-R P 2020 2021 - Mar Sa<=30 0 1 S
-R P 2020 o - O 24 1 0 -
-R P 2021 o - O 29 1 0 -
-R P 2022 o - Mar 27 0 1 S
-R P 2022 2035 - O Sa<=30 2 0 -
-R P 2023 o - Ap 29 2 1 S
-R P 2024 o - Ap 20 2 1 S
-R P 2025 o - Ap 12 2 1 S
-R P 2026 2054 - Mar Sa<=30 2 1 S
-R P 2036 o - O 18 2 0 -
-R P 2037 o - O 10 2 0 -
-R P 2038 o - S 25 2 0 -
-R P 2039 o - S 17 2 0 -
-R P 2040 o - S 1 2 0 -
-R P 2040 o - O 20 2 1 S
-R P 2040 2067 - O Sa<=30 2 0 -
-R P 2041 o - Au 24 2 0 -
-R P 2041 o - O 5 2 1 S
-R P 2042 o - Au 16 2 0 -
-R P 2042 o - S 27 2 1 S
-R P 2043 o - Au 1 2 0 -
-R P 2043 o - S 19 2 1 S
-R P 2044 o - Jul 23 2 0 -
-R P 2044 o - S 3 2 1 S
-R P 2045 o - Jul 15 2 0 -
-R P 2045 o - Au 26 2 1 S
-R P 2046 o - Jun 30 2 0 -
-R P 2046 o - Au 18 2 1 S
-R P 2047 o - Jun 22 2 0 -
-R P 2047 o - Au 3 2 1 S
-R P 2048 o - Jun 6 2 0 -
-R P 2048 o - Jul 25 2 1 S
-R P 2049 o - May 29 2 0 -
-R P 2049 o - Jul 10 2 1 S
-R P 2050 o - May 21 2 0 -
-R P 2050 o - Jul 2 2 1 S
-R P 2051 o - May 6 2 0 -
-R P 2051 o - Jun 24 2 1 S
-R P 2052 o - Ap 27 2 0 -
-R P 2052 o - Jun 8 2 1 S
-R P 2053 o - Ap 12 2 0 -
-R P 2053 o - May 31 2 1 S
-R P 2054 o - Ap 4 2 0 -
-R P 2054 o - May 23 2 1 S
-R P 2055 o - May 8 2 1 S
-R P 2056 o - Ap 29 2 1 S
-R P 2057 o - Ap 14 2 1 S
-R P 2058 o - Ap 6 2 1 S
-R P 2059 ma - Mar Sa<=30 2 1 S
-R P 2068 o - O 20 2 0 -
-R P 2069 o - O 12 2 0 -
-R P 2070 o - O 4 2 0 -
-R P 2071 o - S 19 2 0 -
-R P 2072 o - S 10 2 0 -
-R P 2072 o - O 22 2 1 S
-R P 2072 ma - O Sa<=30 2 0 -
-R P 2073 o - S 2 2 0 -
-R P 2073 o - O 14 2 1 S
-R P 2074 o - Au 18 2 0 -
-R P 2074 o - O 6 2 1 S
-R P 2075 o - Au 10 2 0 -
-R P 2075 o - S 21 2 1 S
-R P 2076 o - Jul 25 2 0 -
-R P 2076 o - S 12 2 1 S
-R P 2077 o - Jul 17 2 0 -
-R P 2077 o - S 4 2 1 S
-R P 2078 o - Jul 9 2 0 -
-R P 2078 o - Au 20 2 1 S
-R P 2079 o - Jun 24 2 0 -
-R P 2079 o - Au 12 2 1 S
-R P 2080 o - Jun 15 2 0 -
-R P 2080 o - Jul 27 2 1 S
-R P 2081 o - Jun 7 2 0 -
-R P 2081 o - Jul 19 2 1 S
-R P 2082 o - May 23 2 0 -
-R P 2082 o - Jul 11 2 1 S
-R P 2083 o - May 15 2 0 -
-R P 2083 o - Jun 26 2 1 S
-R P 2084 o - Ap 29 2 0 -
-R P 2084 o - Jun 17 2 1 S
-R P 2085 o - Ap 21 2 0 -
-R P 2085 o - Jun 9 2 1 S
-R P 2086 o - Ap 13 2 0 -
-R P 2086 o - May 25 2 1 S
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
-R S 1920 1923 - Ap Su>=15 2 1 S
-R S 1920 1923 - O Su>=1 2 0 -
-R S 1962 o - Ap 29 2 1 S
-R S 1962 o - O 1 2 0 -
-R S 1963 1965 - May 1 2 1 S
-R S 1963 o - S 30 2 0 -
-R S 1964 o - O 1 2 0 -
-R S 1965 o - S 30 2 0 -
-R S 1966 o - Ap 24 2 1 S
-R S 1966 1976 - O 1 2 0 -
-R S 1967 1978 - May 1 2 1 S
-R S 1977 1978 - S 1 2 0 -
-R S 1983 1984 - Ap 9 2 1 S
-R S 1983 1984 - O 1 2 0 -
-R S 1986 o - F 16 2 1 S
-R S 1986 o - O 9 2 0 -
-R S 1987 o - Mar 1 2 1 S
-R S 1987 1988 - O 31 2 0 -
-R S 1988 o - Mar 15 2 1 S
-R S 1989 o - Mar 31 2 1 S
-R S 1989 o - O 1 2 0 -
-R S 1990 o - Ap 1 2 1 S
-R S 1990 o - S 30 2 0 -
-R S 1991 o - Ap 1 0 1 S
-R S 1991 1992 - O 1 0 0 -
-R S 1992 o - Ap 8 0 1 S
-R S 1993 o - Mar 26 0 1 S
-R S 1993 o - S 25 0 0 -
-R S 1994 1996 - Ap 1 0 1 S
-R S 1994 2005 - O 1 0 0 -
-R S 1997 1998 - Mar lastM 0 1 S
-R S 1999 2006 - Ap 1 0 1 S
-R S 2006 o - S 22 0 0 -
-R S 2007 o - Mar lastF 0 1 S
-R S 2007 o - N F>=1 0 0 -
-R S 2008 o - Ap F>=1 0 1 S
-R S 2008 o - N 1 0 0 -
-R S 2009 o - Mar lastF 0 1 S
-R S 2010 2011 - Ap F>=1 0 1 S
-R S 2012 2022 - Mar lastF 0 1 S
-R S 2009 2022 - O lastF 0 0 -
-R AU 1917 o - Ja 1 2s 1 D
-R AU 1917 o - Mar lastSu 2s 0 S
-R AU 1942 o - Ja 1 2s 1 D
-R AU 1942 o - Mar lastSu 2s 0 S
-R AU 1942 o - S 27 2s 1 D
-R AU 1943 1944 - Mar lastSu 2s 0 S
-R AU 1943 o - O 3 2s 1 D
-R AW 1974 o - O lastSu 2s 1 D
-R AW 1975 o - Mar Su>=1 2s 0 S
-R AW 1983 o - O lastSu 2s 1 D
-R AW 1984 o - Mar Su>=1 2s 0 S
-R AW 1991 o - N 17 2s 1 D
-R AW 1992 o - Mar Su>=1 2s 0 S
-R AW 2006 o - D 3 2s 1 D
-R AW 2007 2009 - Mar lastSu 2s 0 S
-R AW 2007 2008 - O lastSu 2s 1 D
-R AQ 1971 o - O lastSu 2s 1 D
-R AQ 1972 o - F lastSu 2s 0 S
-R AQ 1989 1991 - O lastSu 2s 1 D
-R AQ 1990 1992 - Mar Su>=1 2s 0 S
-R Ho 1992 1993 - O lastSu 2s 1 D
-R Ho 1993 1994 - Mar Su>=1 2s 0 S
-R AS 1971 1985 - O lastSu 2s 1 D
-R AS 1986 o - O 19 2s 1 D
-R AS 1987 2007 - O lastSu 2s 1 D
-R AS 1972 o - F 27 2s 0 S
-R AS 1973 1985 - Mar Su>=1 2s 0 S
-R AS 1986 1990 - Mar Su>=15 2s 0 S
-R AS 1991 o - Mar 3 2s 0 S
-R AS 1992 o - Mar 22 2s 0 S
-R AS 1993 o - Mar 7 2s 0 S
-R AS 1994 o - Mar 20 2s 0 S
-R AS 1995 2005 - Mar lastSu 2s 0 S
-R AS 2006 o - Ap 2 2s 0 S
-R AS 2007 o - Mar lastSu 2s 0 S
-R AS 2008 ma - Ap Su>=1 2s 0 S
-R AS 2008 ma - O Su>=1 2s 1 D
-R AT 1916 o - O Su>=1 2s 1 D
-R AT 1917 o - Mar lastSu 2s 0 S
-R AT 1917 1918 - O Su>=22 2s 1 D
-R AT 1918 1919 - Mar Su>=1 2s 0 S
-R AT 1967 o - O Su>=1 2s 1 D
-R AT 1968 o - Mar Su>=29 2s 0 S
-R AT 1968 1985 - O lastSu 2s 1 D
-R AT 1969 1971 - Mar Su>=8 2s 0 S
-R AT 1972 o - F lastSu 2s 0 S
-R AT 1973 1981 - Mar Su>=1 2s 0 S
-R AT 1982 1983 - Mar lastSu 2s 0 S
-R AT 1984 1986 - Mar Su>=1 2s 0 S
-R AT 1986 o - O Su>=15 2s 1 D
-R AT 1987 1990 - Mar Su>=15 2s 0 S
-R AT 1987 o - O Su>=22 2s 1 D
-R AT 1988 1990 - O lastSu 2s 1 D
-R AT 1991 1999 - O Su>=1 2s 1 D
-R AT 1991 2005 - Mar lastSu 2s 0 S
-R AT 2000 o - Au lastSu 2s 1 D
-R AT 2001 ma - O Su>=1 2s 1 D
-R AT 2006 o - Ap Su>=1 2s 0 S
-R AT 2007 o - Mar lastSu 2s 0 S
-R AT 2008 ma - Ap Su>=1 2s 0 S
-R AV 1971 1985 - O lastSu 2s 1 D
-R AV 1972 o - F lastSu 2s 0 S
-R AV 1973 1985 - Mar Su>=1 2s 0 S
-R AV 1986 1990 - Mar Su>=15 2s 0 S
-R AV 1986 1987 - O Su>=15 2s 1 D
-R AV 1988 1999 - O lastSu 2s 1 D
-R AV 1991 1994 - Mar Su>=1 2s 0 S
-R AV 1995 2005 - Mar lastSu 2s 0 S
-R AV 2000 o - Au lastSu 2s 1 D
-R AV 2001 2007 - O lastSu 2s 1 D
-R AV 2006 o - Ap Su>=1 2s 0 S
-R AV 2007 o - Mar lastSu 2s 0 S
-R AV 2008 ma - Ap Su>=1 2s 0 S
-R AV 2008 ma - O Su>=1 2s 1 D
-R AN 1971 1985 - O lastSu 2s 1 D
-R AN 1972 o - F 27 2s 0 S
-R AN 1973 1981 - Mar Su>=1 2s 0 S
-R AN 1982 o - Ap Su>=1 2s 0 S
-R AN 1983 1985 - Mar Su>=1 2s 0 S
-R AN 1986 1989 - Mar Su>=15 2s 0 S
-R AN 1986 o - O 19 2s 1 D
-R AN 1987 1999 - O lastSu 2s 1 D
-R AN 1990 1995 - Mar Su>=1 2s 0 S
-R AN 1996 2005 - Mar lastSu 2s 0 S
-R AN 2000 o - Au lastSu 2s 1 D
-R AN 2001 2007 - O lastSu 2s 1 D
-R AN 2006 o - Ap Su>=1 2s 0 S
-R AN 2007 o - Mar lastSu 2s 0 S
-R AN 2008 ma - Ap Su>=1 2s 0 S
-R AN 2008 ma - O Su>=1 2s 1 D
-R LH 1981 1984 - O lastSu 2 1 -
-R LH 1982 1985 - Mar Su>=1 2 0 -
-R LH 1985 o - O lastSu 2 0:30 -
-R LH 1986 1989 - Mar Su>=15 2 0 -
-R LH 1986 o - O 19 2 0:30 -
-R LH 1987 1999 - O lastSu 2 0:30 -
-R LH 1990 1995 - Mar Su>=1 2 0 -
-R LH 1996 2005 - Mar lastSu 2 0 -
-R LH 2000 o - Au lastSu 2 0:30 -
-R LH 2001 2007 - O lastSu 2 0:30 -
-R LH 2006 o - Ap Su>=1 2 0 -
-R LH 2007 o - Mar lastSu 2 0 -
-R LH 2008 ma - Ap Su>=1 2 0 -
-R LH 2008 ma - O Su>=1 2 0:30 -
-R FJ 1998 1999 - N Su>=1 2 1 -
-R FJ 1999 2000 - F lastSu 3 0 -
-R FJ 2009 o - N 29 2 1 -
-R FJ 2010 o - Mar lastSu 3 0 -
-R FJ 2010 2013 - O Su>=21 2 1 -
-R FJ 2011 o - Mar Su>=1 3 0 -
-R FJ 2012 2013 - Ja Su>=18 3 0 -
-R FJ 2014 o - Ja Su>=18 2 0 -
-R FJ 2014 2018 - N Su>=1 2 1 -
-R FJ 2015 2021 - Ja Su>=12 3 0 -
-R FJ 2019 o - N Su>=8 2 1 -
-R FJ 2020 o - D 20 2 1 -
-R Gu 1959 o - Jun 27 2 1 D
-R Gu 1961 o - Ja 29 2 0 S
-R Gu 1967 o - S 1 2 1 D
-R Gu 1969 o - Ja 26 0:1 0 S
-R Gu 1969 o - Jun 22 2 1 D
-R Gu 1969 o - Au 31 2 0 S
-R Gu 1970 1971 - Ap lastSu 2 1 D
-R Gu 1970 1971 - S Su>=1 2 0 S
-R Gu 1973 o - D 16 2 1 D
-R Gu 1974 o - F 24 2 0 S
-R Gu 1976 o - May 26 2 1 D
-R Gu 1976 o - Au 22 2:1 0 S
-R Gu 1977 o - Ap 24 2 1 D
-R Gu 1977 o - Au 28 2 0 S
-R NC 1977 1978 - D Su>=1 0 1 -
-R NC 1978 1979 - F 27 0 0 -
-R NC 1996 o - D 1 2s 1 -
-R NC 1997 o - Mar 2 2s 0 -
-R NZ 1927 o - N 6 2 1 S
-R NZ 1928 o - Mar 4 2 0 M
-R NZ 1928 1933 - O Su>=8 2 0:30 S
-R NZ 1929 1933 - Mar Su>=15 2 0 M
-R NZ 1934 1940 - Ap lastSu 2 0 M
-R NZ 1934 1940 - S lastSu 2 0:30 S
-R NZ 1946 o - Ja 1 0 0 S
-R NZ 1974 o - N Su>=1 2s 1 D
-R k 1974 o - N Su>=1 2:45s 1 -
-R NZ 1975 o - F lastSu 2s 0 S
-R k 1975 o - F lastSu 2:45s 0 -
-R NZ 1975 1988 - O lastSu 2s 1 D
-R k 1975 1988 - O lastSu 2:45s 1 -
-R NZ 1976 1989 - Mar Su>=1 2s 0 S
-R k 1976 1989 - Mar Su>=1 2:45s 0 -
-R NZ 1989 o - O Su>=8 2s 1 D
-R k 1989 o - O Su>=8 2:45s 1 -
-R NZ 1990 2006 - O Su>=1 2s 1 D
-R k 1990 2006 - O Su>=1 2:45s 1 -
-R NZ 1990 2007 - Mar Su>=15 2s 0 S
-R k 1990 2007 - Mar Su>=15 2:45s 0 -
-R NZ 2007 ma - S lastSu 2s 1 D
-R k 2007 ma - S lastSu 2:45s 1 -
-R NZ 2008 ma - Ap Su>=1 2s 0 S
-R k 2008 ma - Ap Su>=1 2:45s 0 -
-R CK 1978 o - N 12 0 0:30 -
-R CK 1979 1991 - Mar Su>=1 0 0 -
-R CK 1979 1990 - O lastSu 0 0:30 -
-R WS 2010 o - S lastSu 0 1 -
-R WS 2011 o - Ap Sa>=1 4 0 -
-R WS 2011 o - S lastSa 3 1 -
-R WS 2012 2021 - Ap Su>=1 4 0 -
-R WS 2012 2020 - S lastSu 3 1 -
-R TO 1999 o - O 7 2s 1 -
-R TO 2000 o - Mar 19 2s 0 -
-R TO 2000 2001 - N Su>=1 2 1 -
-R TO 2001 2002 - Ja lastSu 2 0 -
-R TO 2016 o - N Su>=1 2 1 -
-R TO 2017 o - Ja Su>=15 3 0 -
-R VU 1973 o - D 22 12u 1 -
-R VU 1974 o - Mar 30 12u 0 -
-R VU 1983 1991 - S Sa>=22 24 1 -
-R VU 1984 1991 - Mar Sa>=22 24 0 -
-R VU 1992 1993 - Ja Sa>=22 24 0 -
-R VU 1992 o - O Sa>=22 24 1 -
-R G 1916 o - May 21 2s 1 BST
-R G 1916 o - O 1 2s 0 GMT
-R G 1917 o - Ap 8 2s 1 BST
-R G 1917 o - S 17 2s 0 GMT
-R G 1918 o - Mar 24 2s 1 BST
-R G 1918 o - S 30 2s 0 GMT
-R G 1919 o - Mar 30 2s 1 BST
-R G 1919 o - S 29 2s 0 GMT
-R G 1920 o - Mar 28 2s 1 BST
-R G 1920 o - O 25 2s 0 GMT
-R G 1921 o - Ap 3 2s 1 BST
-R G 1921 o - O 3 2s 0 GMT
-R G 1922 o - Mar 26 2s 1 BST
-R G 1922 o - O 8 2s 0 GMT
-R G 1923 o - Ap Su>=16 2s 1 BST
-R G 1923 1924 - S Su>=16 2s 0 GMT
-R G 1924 o - Ap Su>=9 2s 1 BST
-R G 1925 1926 - Ap Su>=16 2s 1 BST
-R G 1925 1938 - O Su>=2 2s 0 GMT
-R G 1927 o - Ap Su>=9 2s 1 BST
-R G 1928 1929 - Ap Su>=16 2s 1 BST
-R G 1930 o - Ap Su>=9 2s 1 BST
-R G 1931 1932 - Ap Su>=16 2s 1 BST
-R G 1933 o - Ap Su>=9 2s 1 BST
-R G 1934 o - Ap Su>=16 2s 1 BST
-R G 1935 o - Ap Su>=9 2s 1 BST
-R G 1936 1937 - Ap Su>=16 2s 1 BST
-R G 1938 o - Ap Su>=9 2s 1 BST
-R G 1939 o - Ap Su>=16 2s 1 BST
-R G 1939 o - N Su>=16 2s 0 GMT
-R G 1940 o - F Su>=23 2s 1 BST
-R G 1941 o - May Su>=2 1s 2 BDST
-R G 1941 1943 - Au Su>=9 1s 1 BST
-R G 1942 1944 - Ap Su>=2 1s 2 BDST
-R G 1944 o - S Su>=16 1s 1 BST
-R G 1945 o - Ap M>=2 1s 2 BDST
-R G 1945 o - Jul Su>=9 1s 1 BST
-R G 1945 1946 - O Su>=2 2s 0 GMT
-R G 1946 o - Ap Su>=9 2s 1 BST
-R G 1947 o - Mar 16 2s 1 BST
-R G 1947 o - Ap 13 1s 2 BDST
-R G 1947 o - Au 10 1s 1 BST
-R G 1947 o - N 2 2s 0 GMT
-R G 1948 o - Mar 14 2s 1 BST
-R G 1948 o - O 31 2s 0 GMT
-R G 1949 o - Ap 3 2s 1 BST
-R G 1949 o - O 30 2s 0 GMT
-R G 1950 1952 - Ap Su>=14 2s 1 BST
-R G 1950 1952 - O Su>=21 2s 0 GMT
-R G 1953 o - Ap Su>=16 2s 1 BST
-R G 1953 1960 - O Su>=2 2s 0 GMT
-R G 1954 o - Ap Su>=9 2s 1 BST
-R G 1955 1956 - Ap Su>=16 2s 1 BST
-R G 1957 o - Ap Su>=9 2s 1 BST
-R G 1958 1959 - Ap Su>=16 2s 1 BST
-R G 1960 o - Ap Su>=9 2s 1 BST
-R G 1961 1963 - Mar lastSu 2s 1 BST
-R G 1961 1968 - O Su>=23 2s 0 GMT
-R G 1964 1967 - Mar Su>=19 2s 1 BST
-R G 1968 o - F 18 2s 1 BST
-R G 1972 1980 - Mar Su>=16 2s 1 BST
-R G 1972 1980 - O Su>=23 2s 0 GMT
-R G 1981 1995 - Mar lastSu 1u 1 BST
-R G 1981 1989 - O Su>=23 1u 0 GMT
-R G 1990 1995 - O Su>=22 1u 0 GMT
-R IE 1971 o - O 31 2u -1 -
-R IE 1972 1980 - Mar Su>=16 2u 0 -
-R IE 1972 1980 - O Su>=23 2u -1 -
-R IE 1981 ma - Mar lastSu 1u 0 -
-R IE 1981 1989 - O Su>=23 1u -1 -
-R IE 1990 1995 - O Su>=22 1u -1 -
-R IE 1996 ma - O lastSu 1u -1 -
-R E 1977 1980 - Ap Su>=1 1u 1 S
-R E 1977 o - S lastSu 1u 0 -
-R E 1978 o - O 1 1u 0 -
-R E 1979 1995 - S lastSu 1u 0 -
-R E 1981 ma - Mar lastSu 1u 1 S
-R E 1996 ma - O lastSu 1u 0 -
-R W- 1977 1980 - Ap Su>=1 1s 1 S
-R W- 1977 o - S lastSu 1s 0 -
-R W- 1978 o - O 1 1s 0 -
-R W- 1979 1995 - S lastSu 1s 0 -
-R W- 1981 ma - Mar lastSu 1s 1 S
-R W- 1996 ma - O lastSu 1s 0 -
-R c 1916 o - Ap 30 23 1 S
-R c 1916 o - O 1 1 0 -
-R c 1917 1918 - Ap M>=15 2s 1 S
-R c 1917 1918 - S M>=15 2s 0 -
-R c 1940 o - Ap 1 2s 1 S
-R c 1942 o - N 2 2s 0 -
-R c 1943 o - Mar 29 2s 1 S
-R c 1943 o - O 4 2s 0 -
-R c 1944 1945 - Ap M>=1 2s 1 S
-R c 1944 o - O 2 2s 0 -
-R c 1945 o - S 16 2s 0 -
-R c 1977 1980 - Ap Su>=1 2s 1 S
-R c 1977 o - S lastSu 2s 0 -
-R c 1978 o - O 1 2s 0 -
-R c 1979 1995 - S lastSu 2s 0 -
-R c 1981 ma - Mar lastSu 2s 1 S
-R c 1996 ma - O lastSu 2s 0 -
-R e 1977 1980 - Ap Su>=1 0 1 S
-R e 1977 o - S lastSu 0 0 -
-R e 1978 o - O 1 0 0 -
-R e 1979 1995 - S lastSu 0 0 -
-R e 1981 ma - Mar lastSu 0 1 S
-R e 1996 ma - O lastSu 0 0 -
-R R 1917 o - Jul 1 23 1 MST
-R R 1917 o - D 28 0 0 MMT
-R R 1918 o - May 31 22 2 MDST
-R R 1918 o - S 16 1 1 MST
-R R 1919 o - May 31 23 2 MDST
-R R 1919 o - Jul 1 0u 1 MSD
-R R 1919 o - Au 16 0 0 MSK
-R R 1921 o - F 14 23 1 MSD
-R R 1921 o - Mar 20 23 2 +05
-R R 1921 o - S 1 0 1 MSD
-R R 1921 o - O 1 0 0 -
-R R 1981 1984 - Ap 1 0 1 S
-R R 1981 1983 - O 1 0 0 -
-R R 1984 1995 - S lastSu 2s 0 -
-R R 1985 2010 - Mar lastSu 2s 1 S
-R R 1996 2010 - O lastSu 2s 0 -
-R q 1940 o - Jun 16 0 1 S
-R q 1942 o - N 2 3 0 -
-R q 1943 o - Mar 29 2 1 S
-R q 1943 o - Ap 10 3 0 -
-R q 1974 o - May 4 0 1 S
-R q 1974 o - O 2 0 0 -
-R q 1975 o - May 1 0 1 S
-R q 1975 o - O 2 0 0 -
-R q 1976 o - May 2 0 1 S
-R q 1976 o - O 3 0 0 -
-R q 1977 o - May 8 0 1 S
-R q 1977 o - O 2 0 0 -
-R q 1978 o - May 6 0 1 S
-R q 1978 o - O 1 0 0 -
-R q 1979 o - May 5 0 1 S
-R q 1979 o - S 30 0 0 -
-R q 1980 o - May 3 0 1 S
-R q 1980 o - O 4 0 0 -
-R q 1981 o - Ap 26 0 1 S
-R q 1981 o - S 27 0 0 -
-R q 1982 o - May 2 0 1 S
-R q 1982 o - O 3 0 0 -
-R q 1983 o - Ap 18 0 1 S
-R q 1983 o - O 1 0 0 -
-R q 1984 o - Ap 1 0 1 S
-R a 1920 o - Ap 5 2s 1 S
-R a 1920 o - S 13 2s 0 -
-R a 1946 o - Ap 14 2s 1 S
-R a 1946 o - O 7 2s 0 -
-R a 1947 1948 - O Su>=1 2s 0 -
-R a 1947 o - Ap 6 2s 1 S
-R a 1948 o - Ap 18 2s 1 S
-R a 1980 o - Ap 6 0 1 S
-R a 1980 o - S 28 0 0 -
-R b 1918 o - Mar 9 0s 1 S
-R b 1918 1919 - O Sa>=1 23s 0 -
-R b 1919 o - Mar 1 23s 1 S
-R b 1920 o - F 14 23s 1 S
-R b 1920 o - O 23 23s 0 -
-R b 1921 o - Mar 14 23s 1 S
-R b 1921 o - O 25 23s 0 -
-R b 1922 o - Mar 25 23s 1 S
-R b 1922 1927 - O Sa>=1 23s 0 -
-R b 1923 o - Ap 21 23s 1 S
-R b 1924 o - Mar 29 23s 1 S
-R b 1925 o - Ap 4 23s 1 S
-R b 1926 o - Ap 17 23s 1 S
-R b 1927 o - Ap 9 23s 1 S
-R b 1928 o - Ap 14 23s 1 S
-R b 1928 1938 - O Su>=2 2s 0 -
-R b 1929 o - Ap 21 2s 1 S
-R b 1930 o - Ap 13 2s 1 S
-R b 1931 o - Ap 19 2s 1 S
-R b 1932 o - Ap 3 2s 1 S
-R b 1933 o - Mar 26 2s 1 S
-R b 1934 o - Ap 8 2s 1 S
-R b 1935 o - Mar 31 2s 1 S
-R b 1936 o - Ap 19 2s 1 S
-R b 1937 o - Ap 4 2s 1 S
-R b 1938 o - Mar 27 2s 1 S
-R b 1939 o - Ap 16 2s 1 S
-R b 1939 o - N 19 2s 0 -
-R b 1940 o - F 25 2s 1 S
-R b 1944 o - S 17 2s 0 -
-R b 1945 o - Ap 2 2s 1 S
-R b 1945 o - S 16 2s 0 -
-R b 1946 o - May 19 2s 1 S
-R b 1946 o - O 7 2s 0 -
-R BG 1979 o - Mar 31 23 1 S
-R BG 1979 o - O 1 1 0 -
-R BG 1980 1982 - Ap Sa>=1 23 1 S
-R BG 1980 o - S 29 1 0 -
-R BG 1981 o - S 27 2 0 -
-R CZ 1945 o - Ap M>=1 2s 1 S
-R CZ 1945 o - O 1 2s 0 -
-R CZ 1946 o - May 6 2s 1 S
-R CZ 1946 1949 - O Su>=1 2s 0 -
-R CZ 1947 1948 - Ap Su>=15 2s 1 S
-R CZ 1949 o - Ap 9 2s 1 S
-R Th 1991 1992 - Mar lastSu 2 1 D
-R Th 1991 1992 - S lastSu 2 0 S
-R Th 1993 2006 - Ap Su>=1 2 1 D
-R Th 1993 2006 - O lastSu 2 0 S
-R Th 2007 ma - Mar Su>=8 2 1 D
-R Th 2007 ma - N Su>=1 2 0 S
-R FI 1942 o - Ap 2 24 1 S
-R FI 1942 o - O 4 1 0 -
-R FI 1981 1982 - Mar lastSu 2 1 S
-R FI 1981 1982 - S lastSu 3 0 -
-R F 1916 o - Jun 14 23s 1 S
-R F 1916 1919 - O Su>=1 23s 0 -
-R F 1917 o - Mar 24 23s 1 S
-R F 1918 o - Mar 9 23s 1 S
-R F 1919 o - Mar 1 23s 1 S
-R F 1920 o - F 14 23s 1 S
-R F 1920 o - O 23 23s 0 -
-R F 1921 o - Mar 14 23s 1 S
-R F 1921 o - O 25 23s 0 -
-R F 1922 o - Mar 25 23s 1 S
-R F 1922 1938 - O Sa>=1 23s 0 -
-R F 1923 o - May 26 23s 1 S
-R F 1924 o - Mar 29 23s 1 S
-R F 1925 o - Ap 4 23s 1 S
-R F 1926 o - Ap 17 23s 1 S
-R F 1927 o - Ap 9 23s 1 S
-R F 1928 o - Ap 14 23s 1 S
-R F 1929 o - Ap 20 23s 1 S
-R F 1930 o - Ap 12 23s 1 S
-R F 1931 o - Ap 18 23s 1 S
-R F 1932 o - Ap 2 23s 1 S
-R F 1933 o - Mar 25 23s 1 S
-R F 1934 o - Ap 7 23s 1 S
-R F 1935 o - Mar 30 23s 1 S
-R F 1936 o - Ap 18 23s 1 S
-R F 1937 o - Ap 3 23s 1 S
-R F 1938 o - Mar 26 23s 1 S
-R F 1939 o - Ap 15 23s 1 S
-R F 1939 o - N 18 23s 0 -
-R F 1940 o - F 25 2 1 S
-R F 1941 o - May 5 0 2 M
-R F 1941 o - O 6 0 1 S
-R F 1942 o - Mar 9 0 2 M
-R F 1942 o - N 2 3 1 S
-R F 1943 o - Mar 29 2 2 M
-R F 1943 o - O 4 3 1 S
-R F 1944 o - Ap 3 2 2 M
-R F 1944 o - O 8 1 1 S
-R F 1945 o - Ap 2 2 2 M
-R F 1945 o - S 16 3 0 -
-R F 1976 o - Mar 28 1 1 S
-R F 1976 o - S 26 1 0 -
-R DE 1946 o - Ap 14 2s 1 S
-R DE 1946 o - O 7 2s 0 -
-R DE 1947 1949 - O Su>=1 2s 0 -
-R DE 1947 o - Ap 6 3s 1 S
-R DE 1947 o - May 11 2s 2 M
-R DE 1947 o - Jun 29 3 1 S
-R DE 1948 o - Ap 18 2s 1 S
-R DE 1949 o - Ap 10 2s 1 S
-R So 1945 o - May 24 2 2 M
-R So 1945 o - S 24 3 1 S
-R So 1945 o - N 18 2s 0 -
-R g 1932 o - Jul 7 0 1 S
-R g 1932 o - S 1 0 0 -
-R g 1941 o - Ap 7 0 1 S
-R g 1942 o - N 2 3 0 -
-R g 1943 o - Mar 30 0 1 S
-R g 1943 o - O 4 0 0 -
-R g 1952 o - Jul 1 0 1 S
-R g 1952 o - N 2 0 0 -
-R g 1975 o - Ap 12 0s 1 S
-R g 1975 o - N 26 0s 0 -
-R g 1976 o - Ap 11 2s 1 S
-R g 1976 o - O 10 2s 0 -
-R g 1977 1978 - Ap Su>=1 2s 1 S
-R g 1977 o - S 26 2s 0 -
-R g 1978 o - S 24 4 0 -
-R g 1979 o - Ap 1 9 1 S
-R g 1979 o - S 29 2 0 -
-R g 1980 o - Ap 1 0 1 S
-R g 1980 o - S 28 0 0 -
-R h 1918 1919 - Ap 15 2 1 S
-R h 1918 1920 - S M>=15 3 0 -
-R h 1920 o - Ap 5 2 1 S
-R h 1945 o - May 1 23 1 S
-R h 1945 o - N 1 1 0 -
-R h 1946 o - Mar 31 2s 1 S
-R h 1946 o - O 7 2 0 -
-R h 1947 1949 - Ap Su>=4 2s 1 S
-R h 1947 1949 - O Su>=1 2s 0 -
-R h 1954 o - May 23 0 1 S
-R h 1954 o - O 3 0 0 -
-R h 1955 o - May 22 2 1 S
-R h 1955 o - O 2 3 0 -
-R h 1956 1957 - Jun Su>=1 2 1 S
-R h 1956 1957 - S lastSu 3 0 -
-R h 1980 o - Ap 6 0 1 S
-R h 1980 o - S 28 1 0 -
-R h 1981 1983 - Mar lastSu 0 1 S
-R h 1981 1983 - S lastSu 1 0 -
-R I 1916 o - Jun 3 24 1 S
-R I 1916 1917 - S 30 24 0 -
-R I 1917 o - Mar 31 24 1 S
-R I 1918 o - Mar 9 24 1 S
-R I 1918 o - O 6 24 0 -
-R I 1919 o - Mar 1 24 1 S
-R I 1919 o - O 4 24 0 -
-R I 1920 o - Mar 20 24 1 S
-R I 1920 o - S 18 24 0 -
-R I 1940 o - Jun 14 24 1 S
-R I 1942 o - N 2 2s 0 -
-R I 1943 o - Mar 29 2s 1 S
-R I 1943 o - O 4 2s 0 -
-R I 1944 o - Ap 2 2s 1 S
-R I 1944 o - S 17 2s 0 -
-R I 1945 o - Ap 2 2 1 S
-R I 1945 o - S 15 1 0 -
-R I 1946 o - Mar 17 2s 1 S
-R I 1946 o - O 6 2s 0 -
-R I 1947 o - Mar 16 0s 1 S
-R I 1947 o - O 5 0s 0 -
-R I 1948 o - F 29 2s 1 S
-R I 1948 o - O 3 2s 0 -
-R I 1966 1968 - May Su>=22 0s 1 S
-R I 1966 o - S 24 24 0 -
-R I 1967 1969 - S Su>=22 0s 0 -
-R I 1969 o - Jun 1 0s 1 S
-R I 1970 o - May 31 0s 1 S
-R I 1970 o - S lastSu 0s 0 -
-R I 1971 1972 - May Su>=22 0s 1 S
-R I 1971 o - S lastSu 0s 0 -
-R I 1972 o - O 1 0s 0 -
-R I 1973 o - Jun 3 0s 1 S
-R I 1973 1974 - S lastSu 0s 0 -
-R I 1974 o - May 26 0s 1 S
-R I 1975 o - Jun 1 0s 1 S
-R I 1975 1977 - S lastSu 0s 0 -
-R I 1976 o - May 30 0s 1 S
-R I 1977 1979 - May Su>=22 0s 1 S
-R I 1978 o - O 1 0s 0 -
-R I 1979 o - S 30 0s 0 -
-R LV 1989 1996 - Mar lastSu 2s 1 S
-R LV 1989 1996 - S lastSu 2s 0 -
-R MT 1973 o - Mar 31 0s 1 S
-R MT 1973 o - S 29 0s 0 -
-R MT 1974 o - Ap 21 0s 1 S
-R MT 1974 o - S 16 0s 0 -
-R MT 1975 1979 - Ap Su>=15 2 1 S
-R MT 1975 1980 - S Su>=15 2 0 -
-R MT 1980 o - Mar 31 2 1 S
-R MD 1997 ma - Mar lastSu 2 1 S
-R MD 1997 ma - O lastSu 3 0 -
-R O 1918 1919 - S 16 2s 0 -
-R O 1919 o - Ap 15 2s 1 S
-R O 1944 o - Ap 3 2s 1 S
-R O 1944 o - O 4 2 0 -
-R O 1945 o - Ap 29 0 1 S
-R O 1945 o - N 1 0 0 -
-R O 1946 o - Ap 14 0s 1 S
-R O 1946 o - O 7 2s 0 -
-R O 1947 o - May 4 2s 1 S
-R O 1947 1949 - O Su>=1 2s 0 -
-R O 1948 o - Ap 18 2s 1 S
-R O 1949 o - Ap 10 2s 1 S
-R O 1957 o - Jun 2 1s 1 S
-R O 1957 1958 - S lastSu 1s 0 -
-R O 1958 o - Mar 30 1s 1 S
-R O 1959 o - May 31 1s 1 S
-R O 1959 1961 - O Su>=1 1s 0 -
-R O 1960 o - Ap 3 1s 1 S
-R O 1961 1964 - May lastSu 1s 1 S
-R O 1962 1964 - S lastSu 1s 0 -
-R p 1916 o - Jun 17 23 1 S
-R p 1916 o - N 1 1 0 -
-R p 1917 1921 - Mar 1 0 1 S
-R p 1917 1921 - O 14 24 0 -
-R p 1924 o - Ap 16 23s 1 S
-R p 1924 o - O 4 23s 0 -
-R p 1926 o - Ap 17 23s 1 S
-R p 1926 1929 - O Sa>=1 23s 0 -
-R p 1927 o - Ap 9 23s 1 S
-R p 1928 o - Ap 14 23s 1 S
-R p 1929 o - Ap 20 23s 1 S
-R p 1931 o - Ap 18 23s 1 S
-R p 1931 1932 - O Sa>=1 23s 0 -
-R p 1932 o - Ap 2 23s 1 S
-R p 1934 o - Ap 7 23s 1 S
-R p 1934 1938 - O Sa>=1 23s 0 -
-R p 1935 o - Mar 30 23s 1 S
-R p 1936 o - Ap 18 23s 1 S
-R p 1937 o - Ap 3 23s 1 S
-R p 1938 o - Mar 26 23s 1 S
-R p 1939 o - Ap 15 23s 1 S
-R p 1939 o - N 18 23s 0 -
-R p 1940 o - F 24 23s 1 S
-R p 1940 o - O 7 23s 0 -
-R p 1941 o - Ap 5 23s 1 S
-R p 1941 o - O 5 23s 0 -
-R p 1942 1945 - Mar Sa>=8 23s 1 S
-R p 1942 o - Ap 25 22s 2 M
-R p 1942 o - Au 15 22s 1 S
-R p 1942 1945 - O Sa>=24 23s 0 -
-R p 1943 o - Ap 17 22s 2 M
-R p 1943 1945 - Au Sa>=25 22s 1 S
-R p 1944 1945 - Ap Sa>=21 22s 2 M
-R p 1946 o - Ap Sa>=1 23s 1 S
-R p 1946 o - O Sa>=1 23s 0 -
-R p 1947 1966 - Ap Su>=1 2s 1 S
-R p 1947 1965 - O Su>=1 2s 0 -
-R p 1976 o - S lastSu 1 0 -
-R p 1977 o - Mar lastSu 0s 1 S
-R p 1977 o - S lastSu 0s 0 -
-R p 1978 1980 - Ap Su>=1 1s 1 S
-R p 1978 o - O 1 1s 0 -
-R p 1979 1980 - S lastSu 1s 0 -
-R p 1981 1986 - Mar lastSu 0s 1 S
-R p 1981 1985 - S lastSu 0s 0 -
-R z 1932 o - May 21 0s 1 S
-R z 1932 1939 - O Su>=1 0s 0 -
-R z 1933 1939 - Ap Su>=2 0s 1 S
-R z 1979 o - May 27 0 1 S
-R z 1979 o - S lastSu 0 0 -
-R z 1980 o - Ap 5 23 1 S
-R z 1980 o - S lastSu 1 0 -
-R z 1991 1993 - Mar lastSu 0s 1 S
-R z 1991 1993 - S lastSu 0s 0 -
-R s 1918 o - Ap 15 23 1 S
-R s 1918 1919 - O 6 24s 0 -
-R s 1919 o - Ap 6 23 1 S
-R s 1924 o - Ap 16 23 1 S
-R s 1924 o - O 4 24s 0 -
-R s 1926 o - Ap 17 23 1 S
-R s 1926 1929 - O Sa>=1 24s 0 -
-R s 1927 o - Ap 9 23 1 S
-R s 1928 o - Ap 15 0 1 S
-R s 1929 o - Ap 20 23 1 S
-R s 1937 o - Jun 16 23 1 S
-R s 1937 o - O 2 24s 0 -
-R s 1938 o - Ap 2 23 1 S
-R s 1938 o - Ap 30 23 2 M
-R s 1938 o - O 2 24 1 S
-R s 1939 o - O 7 24s 0 -
-R s 1942 o - May 2 23 1 S
-R s 1942 o - S 1 1 0 -
-R s 1943 1946 - Ap Sa>=13 23 1 S
-R s 1943 1944 - O Su>=1 1 0 -
-R s 1945 1946 - S lastSu 1 0 -
-R s 1949 o - Ap 30 23 1 S
-R s 1949 o - O 2 1 0 -
-R s 1974 1975 - Ap Sa>=12 23 1 S
-R s 1974 1975 - O Su>=1 1 0 -
-R s 1976 o - Mar 27 23 1 S
-R s 1976 1977 - S lastSu 1 0 -
-R s 1977 o - Ap 2 23 1 S
-R s 1978 o - Ap 2 2s 1 S
-R s 1978 o - O 1 2s 0 -
-R Sp 1967 o - Jun 3 12 1 S
-R Sp 1967 o - O 1 0 0 -
-R Sp 1974 o - Jun 24 0 1 S
-R Sp 1974 o - S 1 0 0 -
-R Sp 1976 1977 - May 1 0 1 S
-R Sp 1976 o - Au 1 0 0 -
-R Sp 1977 o - S 28 0 0 -
-R Sp 1978 o - Jun 1 0 1 S
-R Sp 1978 o - Au 4 0 0 -
-R CH 1941 1942 - May M>=1 1 1 S
-R CH 1941 1942 - O M>=1 2 0 -
-R T 1916 o - May 1 0 1 S
-R T 1916 o - O 1 0 0 -
-R T 1920 o - Mar 28 0 1 S
-R T 1920 o - O 25 0 0 -
-R T 1921 o - Ap 3 0 1 S
-R T 1921 o - O 3 0 0 -
-R T 1922 o - Mar 26 0 1 S
-R T 1922 o - O 8 0 0 -
-R T 1924 o - May 13 0 1 S
-R T 1924 1925 - O 1 0 0 -
-R T 1925 o - May 1 0 1 S
-R T 1940 o - Jul 1 0 1 S
-R T 1940 o - O 6 0 0 -
-R T 1940 o - D 1 0 1 S
-R T 1941 o - S 21 0 0 -
-R T 1942 o - Ap 1 0 1 S
-R T 1945 o - O 8 0 0 -
-R T 1946 o - Jun 1 0 1 S
-R T 1946 o - O 1 0 0 -
-R T 1947 1948 - Ap Su>=16 0 1 S
-R T 1947 1951 - O Su>=2 0 0 -
-R T 1949 o - Ap 10 0 1 S
-R T 1950 o - Ap 16 0 1 S
-R T 1951 o - Ap 22 0 1 S
-R T 1962 o - Jul 15 0 1 S
-R T 1963 o - O 30 0 0 -
-R T 1964 o - May 15 0 1 S
-R T 1964 o - O 1 0 0 -
-R T 1973 o - Jun 3 1 1 S
-R T 1973 1976 - O Su>=31 2 0 -
-R T 1974 o - Mar 31 2 1 S
-R T 1975 o - Mar 22 2 1 S
-R T 1976 o - Mar 21 2 1 S
-R T 1977 1978 - Ap Su>=1 2 1 S
-R T 1977 1978 - O Su>=15 2 0 -
-R T 1978 o - Jun 29 0 0 -
-R T 1983 o - Jul 31 2 1 S
-R T 1983 o - O 2 2 0 -
-R T 1985 o - Ap 20 1s 1 S
-R T 1985 o - S 28 1s 0 -
-R T 1986 1993 - Mar lastSu 1s 1 S
-R T 1986 1995 - S lastSu 1s 0 -
-R T 1994 o - Mar 20 1s 1 S
-R T 1995 2006 - Mar lastSu 1s 1 S
-R T 1996 2006 - O lastSu 1s 0 -
-R u 1918 1919 - Mar lastSu 2 1 D
-R u 1918 1919 - O lastSu 2 0 S
-R u 1942 o - F 9 2 1 W
-R u 1945 o - Au 14 23u 1 P
-R u 1945 o - S 30 2 0 S
-R u 1967 2006 - O lastSu 2 0 S
-R u 1967 1973 - Ap lastSu 2 1 D
-R u 1974 o - Ja 6 2 1 D
-R u 1975 o - F lastSu 2 1 D
-R u 1976 1986 - Ap lastSu 2 1 D
-R u 1987 2006 - Ap Su>=1 2 1 D
-R u 2007 ma - Mar Su>=8 2 1 D
-R u 2007 ma - N Su>=1 2 0 S
-R NY 1920 o - Mar lastSu 2 1 D
-R NY 1920 o - O lastSu 2 0 S
-R NY 1921 1966 - Ap lastSu 2 1 D
-R NY 1921 1954 - S lastSu 2 0 S
-R NY 1955 1966 - O lastSu 2 0 S
-R Ch 1920 o - Jun 13 2 1 D
-R Ch 1920 1921 - O lastSu 2 0 S
-R Ch 1921 o - Mar lastSu 2 1 D
-R Ch 1922 1966 - Ap lastSu 2 1 D
-R Ch 1922 1954 - S lastSu 2 0 S
-R Ch 1955 1966 - O lastSu 2 0 S
-R De 1920 1921 - Mar lastSu 2 1 D
-R De 1920 o - O lastSu 2 0 S
-R De 1921 o - May 22 2 0 S
-R De 1965 1966 - Ap lastSu 2 1 D
-R De 1965 1966 - O lastSu 2 0 S
-R CA 1948 o - Mar 14 2:1 1 D
-R CA 1949 o - Ja 1 2 0 S
-R CA 1950 1966 - Ap lastSu 1 1 D
-R CA 1950 1961 - S lastSu 2 0 S
-R CA 1962 1966 - O lastSu 2 0 S
-R In 1941 o - Jun 22 2 1 D
-R In 1941 1954 - S lastSu 2 0 S
-R In 1946 1954 - Ap lastSu 2 1 D
-R Ma 1951 o - Ap lastSu 2 1 D
-R Ma 1951 o - S lastSu 2 0 S
-R Ma 1954 1960 - Ap lastSu 2 1 D
-R Ma 1954 1960 - S lastSu 2 0 S
-R V 1946 o - Ap lastSu 2 1 D
-R V 1946 o - S lastSu 2 0 S
-R V 1953 1954 - Ap lastSu 2 1 D
-R V 1953 1959 - S lastSu 2 0 S
-R V 1955 o - May 1 0 1 D
-R V 1956 1963 - Ap lastSu 2 1 D
-R V 1960 o - O lastSu 2 0 S
-R V 1961 o - S lastSu 2 0 S
-R V 1962 1963 - O lastSu 2 0 S
-R Pe 1955 o - May 1 0 1 D
-R Pe 1955 1960 - S lastSu 2 0 S
-R Pe 1956 1963 - Ap lastSu 2 1 D
-R Pe 1961 1963 - O lastSu 2 0 S
-R Pi 1955 o - May 1 0 1 D
-R Pi 1955 1960 - S lastSu 2 0 S
-R Pi 1956 1964 - Ap lastSu 2 1 D
-R Pi 1961 1964 - O lastSu 2 0 S
-R St 1947 1961 - Ap lastSu 2 1 D
-R St 1947 1954 - S lastSu 2 0 S
-R St 1955 1956 - O lastSu 2 0 S
-R St 1957 1958 - S lastSu 2 0 S
-R St 1959 1961 - O lastSu 2 0 S
-R Pu 1946 1960 - Ap lastSu 2 1 D
-R Pu 1946 1954 - S lastSu 2 0 S
-R Pu 1955 1956 - O lastSu 2 0 S
-R Pu 1957 1960 - S lastSu 2 0 S
-R v 1921 o - May 1 2 1 D
-R v 1921 o - S 1 2 0 S
-R v 1941 o - Ap lastSu 2 1 D
-R v 1941 o - S lastSu 2 0 S
-R v 1946 o - Ap lastSu 0:1 1 D
-R v 1946 o - Jun 2 2 0 S
-R v 1950 1961 - Ap lastSu 2 1 D
-R v 1950 1955 - S lastSu 2 0 S
-R v 1956 1961 - O lastSu 2 0 S
-R Dt 1948 o - Ap lastSu 2 1 D
-R Dt 1948 o - S lastSu 2 0 S
-R Me 1946 o - Ap lastSu 2 1 D
-R Me 1946 o - S lastSu 2 0 S
-R Me 1966 o - Ap lastSu 2 1 D
-R Me 1966 o - O lastSu 2 0 S
-R C 1918 o - Ap 14 2 1 D
-R C 1918 o - O 27 2 0 S
-R C 1942 o - F 9 2 1 W
-R C 1945 o - Au 14 23u 1 P
-R C 1945 o - S 30 2 0 S
-R C 1974 1986 - Ap lastSu 2 1 D
-R C 1974 2006 - O lastSu 2 0 S
-R C 1987 2006 - Ap Su>=1 2 1 D
-R C 2007 ma - Mar Su>=8 2 1 D
-R C 2007 ma - N Su>=1 2 0 S
-R j 1917 o - Ap 8 2 1 D
-R j 1917 o - S 17 2 0 S
-R j 1919 o - May 5 23 1 D
-R j 1919 o - Au 12 23 0 S
-R j 1920 1935 - May Su>=1 23 1 D
-R j 1920 1935 - O lastSu 23 0 S
-R j 1936 1941 - May M>=9 0 1 D
-R j 1936 1941 - O M>=2 0 0 S
-R j 1946 1950 - May Su>=8 2 1 D
-R j 1946 1950 - O Su>=2 2 0 S
-R j 1951 1986 - Ap lastSu 2 1 D
-R j 1951 1959 - S lastSu 2 0 S
-R j 1960 1986 - O lastSu 2 0 S
-R j 1987 o - Ap Su>=1 0:1 1 D
-R j 1987 2006 - O lastSu 0:1 0 S
-R j 1988 o - Ap Su>=1 0:1 2 DD
-R j 1989 2006 - Ap Su>=1 0:1 1 D
-R j 2007 2011 - Mar Su>=8 0:1 1 D
-R j 2007 2010 - N Su>=1 0:1 0 S
-R H 1916 o - Ap 1 0 1 D
-R H 1916 o - O 1 0 0 S
-R H 1920 o - May 9 0 1 D
-R H 1920 o - Au 29 0 0 S
-R H 1921 o - May 6 0 1 D
-R H 1921 1922 - S 5 0 0 S
-R H 1922 o - Ap 30 0 1 D
-R H 1923 1925 - May Su>=1 0 1 D
-R H 1923 o - S 4 0 0 S
-R H 1924 o - S 15 0 0 S
-R H 1925 o - S 28 0 0 S
-R H 1926 o - May 16 0 1 D
-R H 1926 o - S 13 0 0 S
-R H 1927 o - May 1 0 1 D
-R H 1927 o - S 26 0 0 S
-R H 1928 1931 - May Su>=8 0 1 D
-R H 1928 o - S 9 0 0 S
-R H 1929 o - S 3 0 0 S
-R H 1930 o - S 15 0 0 S
-R H 1931 1932 - S M>=24 0 0 S
-R H 1932 o - May 1 0 1 D
-R H 1933 o - Ap 30 0 1 D
-R H 1933 o - O 2 0 0 S
-R H 1934 o - May 20 0 1 D
-R H 1934 o - S 16 0 0 S
-R H 1935 o - Jun 2 0 1 D
-R H 1935 o - S 30 0 0 S
-R H 1936 o - Jun 1 0 1 D
-R H 1936 o - S 14 0 0 S
-R H 1937 1938 - May Su>=1 0 1 D
-R H 1937 1941 - S M>=24 0 0 S
-R H 1939 o - May 28 0 1 D
-R H 1940 1941 - May Su>=1 0 1 D
-R H 1946 1949 - Ap lastSu 2 1 D
-R H 1946 1949 - S lastSu 2 0 S
-R H 1951 1954 - Ap lastSu 2 1 D
-R H 1951 1954 - S lastSu 2 0 S
-R H 1956 1959 - Ap lastSu 2 1 D
-R H 1956 1959 - S lastSu 2 0 S
-R H 1962 1973 - Ap lastSu 2 1 D
-R H 1962 1973 - O lastSu 2 0 S
-R o 1933 1935 - Jun Su>=8 1 1 D
-R o 1933 1935 - S Su>=8 1 0 S
-R o 1936 1938 - Jun Su>=1 1 1 D
-R o 1936 1938 - S Su>=1 1 0 S
-R o 1939 o - May 27 1 1 D
-R o 1939 1941 - S Sa>=21 1 0 S
-R o 1940 o - May 19 1 1 D
-R o 1941 o - May 4 1 1 D
-R o 1946 1972 - Ap lastSu 2 1 D
-R o 1946 1956 - S lastSu 2 0 S
-R o 1957 1972 - O lastSu 2 0 S
-R o 1993 2006 - Ap Su>=1 0:1 1 D
-R o 1993 2006 - O lastSu 0:1 0 S
-R t 1919 o - Mar 30 23:30 1 D
-R t 1919 o - O 26 0 0 S
-R t 1920 o - May 2 2 1 D
-R t 1920 o - S 26 0 0 S
-R t 1921 o - May 15 2 1 D
-R t 1921 o - S 15 2 0 S
-R t 1922 1923 - May Su>=8 2 1 D
-R t 1922 1926 - S Su>=15 2 0 S
-R t 1924 1927 - May Su>=1 2 1 D
-R t 1927 1937 - S Su>=25 2 0 S
-R t 1928 1937 - Ap Su>=25 2 1 D
-R t 1938 1940 - Ap lastSu 2 1 D
-R t 1938 1939 - S lastSu 2 0 S
-R t 1945 1948 - S lastSu 2 0 S
-R t 1946 1973 - Ap lastSu 2 1 D
-R t 1949 1950 - N lastSu 2 0 S
-R t 1951 1956 - S lastSu 2 0 S
-R t 1957 1973 - O lastSu 2 0 S
-R W 1916 o - Ap 23 0 1 D
-R W 1916 o - S 17 0 0 S
-R W 1918 o - Ap 14 2 1 D
-R W 1918 o - O 27 2 0 S
-R W 1937 o - May 16 2 1 D
-R W 1937 o - S 26 2 0 S
-R W 1942 o - F 9 2 1 W
-R W 1945 o - Au 14 23u 1 P
-R W 1945 o - S lastSu 2 0 S
-R W 1946 o - May 12 2 1 D
-R W 1946 o - O 13 2 0 S
-R W 1947 1949 - Ap lastSu 2 1 D
-R W 1947 1949 - S lastSu 2 0 S
-R W 1950 o - May 1 2 1 D
-R W 1950 o - S 30 2 0 S
-R W 1951 1960 - Ap lastSu 2 1 D
-R W 1951 1958 - S lastSu 2 0 S
-R W 1959 o - O lastSu 2 0 S
-R W 1960 o - S lastSu 2 0 S
-R W 1963 o - Ap lastSu 2 1 D
-R W 1963 o - S 22 2 0 S
-R W 1966 1986 - Ap lastSu 2s 1 D
-R W 1966 2005 - O lastSu 2s 0 S
-R W 1987 2005 - Ap Su>=1 2s 1 D
-R r 1918 o - Ap 14 2 1 D
-R r 1918 o - O 27 2 0 S
-R r 1930 1934 - May Su>=1 0 1 D
-R r 1930 1934 - O Su>=1 0 0 S
-R r 1937 1941 - Ap Su>=8 0 1 D
-R r 1937 o - O Su>=8 0 0 S
-R r 1938 o - O Su>=1 0 0 S
-R r 1939 1941 - O Su>=8 0 0 S
-R r 1942 o - F 9 2 1 W
-R r 1945 o - Au 14 23u 1 P
-R r 1945 o - S lastSu 2 0 S
-R r 1946 o - Ap Su>=8 2 1 D
-R r 1946 o - O Su>=8 2 0 S
-R r 1947 1957 - Ap lastSu 2 1 D
-R r 1947 1957 - S lastSu 2 0 S
-R r 1959 o - Ap lastSu 2 1 D
-R r 1959 o - O lastSu 2 0 S
-R Sw 1957 o - Ap lastSu 2 1 D
-R Sw 1957 o - O lastSu 2 0 S
-R Sw 1959 1961 - Ap lastSu 2 1 D
-R Sw 1959 o - O lastSu 2 0 S
-R Sw 1960 1961 - S lastSu 2 0 S
-R Ed 1918 1919 - Ap Su>=8 2 1 D
-R Ed 1918 o - O 27 2 0 S
-R Ed 1919 o - May 27 2 0 S
-R Ed 1920 1923 - Ap lastSu 2 1 D
-R Ed 1920 o - O lastSu 2 0 S
-R Ed 1921 1923 - S lastSu 2 0 S
-R Ed 1942 o - F 9 2 1 W
-R Ed 1945 o - Au 14 23u 1 P
-R Ed 1945 o - S lastSu 2 0 S
-R Ed 1947 o - Ap lastSu 2 1 D
-R Ed 1947 o - S lastSu 2 0 S
-R Ed 1972 1986 - Ap lastSu 2 1 D
-R Ed 1972 2006 - O lastSu 2 0 S
-R Va 1918 o - Ap 14 2 1 D
-R Va 1918 o - O 27 2 0 S
-R Va 1942 o - F 9 2 1 W
-R Va 1945 o - Au 14 23u 1 P
-R Va 1945 o - S 30 2 0 S
-R Va 1946 1986 - Ap lastSu 2 1 D
-R Va 1946 o - S 29 2 0 S
-R Va 1947 1961 - S lastSu 2 0 S
-R Va 1962 2006 - O lastSu 2 0 S
-R Y 1918 o - Ap 14 2 1 D
-R Y 1918 o - O 27 2 0 S
-R Y 1919 o - May 25 2 1 D
-R Y 1919 o - N 1 0 0 S
-R Y 1942 o - F 9 2 1 W
-R Y 1945 o - Au 14 23u 1 P
-R Y 1945 o - S 30 2 0 S
-R Y 1972 1986 - Ap lastSu 2 1 D
-R Y 1972 2006 - O lastSu 2 0 S
-R Y 1987 2006 - Ap Su>=1 2 1 D
-R Yu 1965 o - Ap lastSu 0 2 DD
-R Yu 1965 o - O lastSu 2 0 S
-R m 1931 o - April 30 0 1 D
-R m 1931 o - O 1 0 0 S
-R m 1939 o - F 5 0 1 D
-R m 1939 o - Jun 25 0 0 S
-R m 1940 o - D 9 0 1 D
-R m 1941 o - Ap 1 0 0 S
-R m 1943 o - D 16 0 1 W
-R m 1944 o - May 1 0 0 S
-R m 1950 o - F 12 0 1 D
-R m 1950 o - Jul 30 0 0 S
-R m 1996 2000 - Ap Su>=1 2 1 D
-R m 1996 2000 - O lastSu 2 0 S
-R m 2001 o - May Su>=1 2 1 D
-R m 2001 o - S lastSu 2 0 S
-R m 2002 2022 - Ap Su>=1 2 1 D
-R m 2002 2022 - O lastSu 2 0 S
-R BB 1942 o - Ap 19 5u 1 D
-R BB 1942 o - Au 31 6u 0 S
-R BB 1943 o - May 2 5u 1 D
-R BB 1943 o - S 5 6u 0 S
-R BB 1944 o - Ap 10 5u 0:30 -
-R BB 1944 o - S 10 6u 0 S
-R BB 1977 o - Jun 12 2 1 D
-R BB 1977 1978 - O Su>=1 2 0 S
-R BB 1978 1980 - Ap Su>=15 2 1 D
-R BB 1979 o - S 30 2 0 S
-R BB 1980 o - S 25 2 0 S
-R BZ 1918 1941 - O Sa>=1 24 0:30 -0530
-R BZ 1919 1942 - F Sa>=8 24 0 CST
-R BZ 1942 o - Jun 27 24 1 CWT
-R BZ 1945 o - Au 14 23u 1 CPT
-R BZ 1945 o - D 15 24 0 CST
-R BZ 1947 1967 - O Sa>=1 24 0:30 -0530
-R BZ 1948 1968 - F Sa>=8 24 0 CST
-R BZ 1973 o - D 5 0 1 CDT
-R BZ 1974 o - F 9 0 0 CST
-R BZ 1982 o - D 18 0 1 CDT
-R BZ 1983 o - F 12 0 0 CST
-R Be 1917 o - Ap 5 24 1 -
-R Be 1917 o - S 30 24 0 -
-R Be 1918 o - Ap 13 24 1 -
-R Be 1918 o - S 15 24 0 S
-R Be 1942 o - Ja 11 2 1 D
-R Be 1942 o - O 18 2 0 S
-R Be 1943 o - Mar 21 2 1 D
-R Be 1943 o - O 31 2 0 S
-R Be 1944 1945 - Mar Su>=8 2 1 D
-R Be 1944 1945 - N Su>=1 2 0 S
-R Be 1947 o - May Su>=15 2 1 D
-R Be 1947 o - S Su>=8 2 0 S
-R Be 1948 1952 - May Su>=22 2 1 D
-R Be 1948 1952 - S Su>=1 2 0 S
-R Be 1956 o - May Su>=22 2 1 D
-R Be 1956 o - O lastSu 2 0 S
-R CR 1979 1980 - F lastSu 0 1 D
-R CR 1979 1980 - Jun Su>=1 0 0 S
-R CR 1991 1992 - Ja Sa>=15 0 1 D
-R CR 1991 o - Jul 1 0 0 S
-R CR 1992 o - Mar 15 0 0 S
-R Q 1928 o - Jun 10 0 1 D
-R Q 1928 o - O 10 0 0 S
-R Q 1940 1942 - Jun Su>=1 0 1 D
-R Q 1940 1942 - S Su>=1 0 0 S
-R Q 1945 1946 - Jun Su>=1 0 1 D
-R Q 1945 1946 - S Su>=1 0 0 S
-R Q 1965 o - Jun 1 0 1 D
-R Q 1965 o - S 30 0 0 S
-R Q 1966 o - May 29 0 1 D
-R Q 1966 o - O 2 0 0 S
-R Q 1967 o - Ap 8 0 1 D
-R Q 1967 1968 - S Su>=8 0 0 S
-R Q 1968 o - Ap 14 0 1 D
-R Q 1969 1977 - Ap lastSu 0 1 D
-R Q 1969 1971 - O lastSu 0 0 S
-R Q 1972 1974 - O 8 0 0 S
-R Q 1975 1977 - O lastSu 0 0 S
-R Q 1978 o - May 7 0 1 D
-R Q 1978 1990 - O Su>=8 0 0 S
-R Q 1979 1980 - Mar Su>=15 0 1 D
-R Q 1981 1985 - May Su>=5 0 1 D
-R Q 1986 1989 - Mar Su>=14 0 1 D
-R Q 1990 1997 - Ap Su>=1 0 1 D
-R Q 1991 1995 - O Su>=8 0s 0 S
-R Q 1996 o - O 6 0s 0 S
-R Q 1997 o - O 12 0s 0 S
-R Q 1998 1999 - Mar lastSu 0s 1 D
-R Q 1998 2003 - O lastSu 0s 0 S
-R Q 2000 2003 - Ap Su>=1 0s 1 D
-R Q 2004 o - Mar lastSu 0s 1 D
-R Q 2006 2010 - O lastSu 0s 0 S
-R Q 2007 o - Mar Su>=8 0s 1 D
-R Q 2008 o - Mar Su>=15 0s 1 D
-R Q 2009 2010 - Mar Su>=8 0s 1 D
-R Q 2011 o - Mar Su>=15 0s 1 D
-R Q 2011 o - N 13 0s 0 S
-R Q 2012 o - Ap 1 0s 1 D
-R Q 2012 ma - N Su>=1 0s 0 S
-R Q 2013 ma - Mar Su>=8 0s 1 D
-R DO 1966 o - O 30 0 1 EDT
-R DO 1967 o - F 28 0 0 EST
-R DO 1969 1973 - O lastSu 0 0:30 -0430
-R DO 1970 o - F 21 0 0 EST
-R DO 1971 o - Ja 20 0 0 EST
-R DO 1972 1974 - Ja 21 0 0 EST
-R SV 1987 1988 - May Su>=1 0 1 D
-R SV 1987 1988 - S lastSu 0 0 S
-R GT 1973 o - N 25 0 1 D
-R GT 1974 o - F 24 0 0 S
-R GT 1983 o - May 21 0 1 D
-R GT 1983 o - S 22 0 0 S
-R GT 1991 o - Mar 23 0 1 D
-R GT 1991 o - S 7 0 0 S
-R GT 2006 o - Ap 30 0 1 D
-R GT 2006 o - O 1 0 0 S
-R HT 1983 o - May 8 0 1 D
-R HT 1984 1987 - Ap lastSu 0 1 D
-R HT 1983 1987 - O lastSu 0 0 S
-R HT 1988 1997 - Ap Su>=1 1s 1 D
-R HT 1988 1997 - O lastSu 1s 0 S
-R HT 2005 2006 - Ap Su>=1 0 1 D
-R HT 2005 2006 - O lastSu 0 0 S
-R HT 2012 2015 - Mar Su>=8 2 1 D
-R HT 2012 2015 - N Su>=1 2 0 S
-R HT 2017 ma - Mar Su>=8 2 1 D
-R HT 2017 ma - N Su>=1 2 0 S
-R HN 1987 1988 - May Su>=1 0 1 D
-R HN 1987 1988 - S lastSu 0 0 S
-R HN 2006 o - May Su>=1 0 1 D
-R HN 2006 o - Au M>=1 0 0 S
-R NI 1979 1980 - Mar Su>=16 0 1 D
-R NI 1979 1980 - Jun M>=23 0 0 S
-R NI 2005 o - Ap 10 0 1 D
-R NI 2005 o - O Su>=1 0 0 S
-R NI 2006 o - Ap 30 2 1 D
-R NI 2006 o - O Su>=1 1 0 S
-R A 1930 o - D 1 0 1 -
-R A 1931 o - Ap 1 0 0 -
-R A 1931 o - O 15 0 1 -
-R A 1932 1940 - Mar 1 0 0 -
-R A 1932 1939 - N 1 0 1 -
-R A 1940 o - Jul 1 0 1 -
-R A 1941 o - Jun 15 0 0 -
-R A 1941 o - O 15 0 1 -
-R A 1943 o - Au 1 0 0 -
-R A 1943 o - O 15 0 1 -
-R A 1946 o - Mar 1 0 0 -
-R A 1946 o - O 1 0 1 -
-R A 1963 o - O 1 0 0 -
-R A 1963 o - D 15 0 1 -
-R A 1964 1966 - Mar 1 0 0 -
-R A 1964 1966 - O 15 0 1 -
-R A 1967 o - Ap 2 0 0 -
-R A 1967 1968 - O Su>=1 0 1 -
-R A 1968 1969 - Ap Su>=1 0 0 -
-R A 1974 o - Ja 23 0 1 -
-R A 1974 o - May 1 0 0 -
-R A 1988 o - D 1 0 1 -
-R A 1989 1993 - Mar Su>=1 0 0 -
-R A 1989 1992 - O Su>=15 0 1 -
-R A 1999 o - O Su>=1 0 1 -
-R A 2000 o - Mar 3 0 0 -
-R A 2007 o - D 30 0 1 -
-R A 2008 2009 - Mar Su>=15 0 0 -
-R A 2008 o - O Su>=15 0 1 -
-R Sa 2008 2009 - Mar Su>=8 0 0 -
-R Sa 2007 2008 - O Su>=8 0 1 -
-R B 1931 o - O 3 11 1 -
-R B 1932 1933 - Ap 1 0 0 -
-R B 1932 o - O 3 0 1 -
-R B 1949 1952 - D 1 0 1 -
-R B 1950 o - Ap 16 1 0 -
-R B 1951 1952 - Ap 1 0 0 -
-R B 1953 o - Mar 1 0 0 -
-R B 1963 o - D 9 0 1 -
-R B 1964 o - Mar 1 0 0 -
-R B 1965 o - Ja 31 0 1 -
-R B 1965 o - Mar 31 0 0 -
-R B 1965 o - D 1 0 1 -
-R B 1966 1968 - Mar 1 0 0 -
-R B 1966 1967 - N 1 0 1 -
-R B 1985 o - N 2 0 1 -
-R B 1986 o - Mar 15 0 0 -
-R B 1986 o - O 25 0 1 -
-R B 1987 o - F 14 0 0 -
-R B 1987 o - O 25 0 1 -
-R B 1988 o - F 7 0 0 -
-R B 1988 o - O 16 0 1 -
-R B 1989 o - Ja 29 0 0 -
-R B 1989 o - O 15 0 1 -
-R B 1990 o - F 11 0 0 -
-R B 1990 o - O 21 0 1 -
-R B 1991 o - F 17 0 0 -
-R B 1991 o - O 20 0 1 -
-R B 1992 o - F 9 0 0 -
-R B 1992 o - O 25 0 1 -
-R B 1993 o - Ja 31 0 0 -
-R B 1993 1995 - O Su>=11 0 1 -
-R B 1994 1995 - F Su>=15 0 0 -
-R B 1996 o - F 11 0 0 -
-R B 1996 o - O 6 0 1 -
-R B 1997 o - F 16 0 0 -
-R B 1997 o - O 6 0 1 -
-R B 1998 o - Mar 1 0 0 -
-R B 1998 o - O 11 0 1 -
-R B 1999 o - F 21 0 0 -
-R B 1999 o - O 3 0 1 -
-R B 2000 o - F 27 0 0 -
-R B 2000 2001 - O Su>=8 0 1 -
-R B 2001 2006 - F Su>=15 0 0 -
-R B 2002 o - N 3 0 1 -
-R B 2003 o - O 19 0 1 -
-R B 2004 o - N 2 0 1 -
-R B 2005 o - O 16 0 1 -
-R B 2006 o - N 5 0 1 -
-R B 2007 o - F 25 0 0 -
-R B 2007 o - O Su>=8 0 1 -
-R B 2008 2017 - O Su>=15 0 1 -
-R B 2008 2011 - F Su>=15 0 0 -
-R B 2012 o - F Su>=22 0 0 -
-R B 2013 2014 - F Su>=15 0 0 -
-R B 2015 o - F Su>=22 0 0 -
-R B 2016 2019 - F Su>=15 0 0 -
-R B 2018 o - N Su>=1 0 1 -
-R x 1927 1931 - S 1 0 1 -
-R x 1928 1932 - Ap 1 0 0 -
-R x 1968 o - N 3 4u 1 -
-R x 1969 o - Mar 30 3u 0 -
-R x 1969 o - N 23 4u 1 -
-R x 1970 o - Mar 29 3u 0 -
-R x 1971 o - Mar 14 3u 0 -
-R x 1970 1972 - O Su>=9 4u 1 -
-R x 1972 1986 - Mar Su>=9 3u 0 -
-R x 1973 o - S 30 4u 1 -
-R x 1974 1987 - O Su>=9 4u 1 -
-R x 1987 o - Ap 12 3u 0 -
-R x 1988 1990 - Mar Su>=9 3u 0 -
-R x 1988 1989 - O Su>=9 4u 1 -
-R x 1990 o - S 16 4u 1 -
-R x 1991 1996 - Mar Su>=9 3u 0 -
-R x 1991 1997 - O Su>=9 4u 1 -
-R x 1997 o - Mar 30 3u 0 -
-R x 1998 o - Mar Su>=9 3u 0 -
-R x 1998 o - S 27 4u 1 -
-R x 1999 o - Ap 4 3u 0 -
-R x 1999 2010 - O Su>=9 4u 1 -
-R x 2000 2007 - Mar Su>=9 3u 0 -
-R x 2008 o - Mar 30 3u 0 -
-R x 2009 o - Mar Su>=9 3u 0 -
-R x 2010 o - Ap Su>=1 3u 0 -
-R x 2011 o - May Su>=2 3u 0 -
-R x 2011 o - Au Su>=16 4u 1 -
-R x 2012 2014 - Ap Su>=23 3u 0 -
-R x 2012 2014 - S Su>=2 4u 1 -
-R x 2016 2018 - May Su>=9 3u 0 -
-R x 2016 2018 - Au Su>=9 4u 1 -
-R x 2019 ma - Ap Su>=2 3u 0 -
-R x 2019 2021 - S Su>=2 4u 1 -
-R x 2022 o - S Su>=9 4u 1 -
-R x 2023 ma - S Su>=2 4u 1 -
-R CO 1992 o - May 3 0 1 -
-R CO 1993 o - F 6 24 0 -
-R EC 1992 o - N 28 0 1 -
-R EC 1993 o - F 5 0 0 -
-R FK 1937 1938 - S lastSu 0 1 -
-R FK 1938 1942 - Mar Su>=19 0 0 -
-R FK 1939 o - O 1 0 1 -
-R FK 1940 1942 - S lastSu 0 1 -
-R FK 1943 o - Ja 1 0 0 -
-R FK 1983 o - S lastSu 0 1 -
-R FK 1984 1985 - Ap lastSu 0 0 -
-R FK 1984 o - S 16 0 1 -
-R FK 1985 2000 - S Su>=9 0 1 -
-R FK 1986 2000 - Ap Su>=16 0 0 -
-R FK 2001 2010 - Ap Su>=15 2 0 -
-R FK 2001 2010 - S Su>=1 2 1 -
-R y 1975 1988 - O 1 0 1 -
-R y 1975 1978 - Mar 1 0 0 -
-R y 1979 1991 - Ap 1 0 0 -
-R y 1989 o - O 22 0 1 -
-R y 1990 o - O 1 0 1 -
-R y 1991 o - O 6 0 1 -
-R y 1992 o - Mar 1 0 0 -
-R y 1992 o - O 5 0 1 -
-R y 1993 o - Mar 31 0 0 -
-R y 1993 1995 - O 1 0 1 -
-R y 1994 1995 - F lastSu 0 0 -
-R y 1996 o - Mar 1 0 0 -
-R y 1996 2001 - O Su>=1 0 1 -
-R y 1997 o - F lastSu 0 0 -
-R y 1998 2001 - Mar Su>=1 0 0 -
-R y 2002 2004 - Ap Su>=1 0 0 -
-R y 2002 2003 - S Su>=1 0 1 -
-R y 2004 2009 - O Su>=15 0 1 -
-R y 2005 2009 - Mar Su>=8 0 0 -
-R y 2010 ma - O Su>=1 0 1 -
-R y 2010 2012 - Ap Su>=8 0 0 -
-R y 2013 ma - Mar Su>=22 0 0 -
-R PE 1938 o - Ja 1 0 1 -
-R PE 1938 o - Ap 1 0 0 -
-R PE 1938 1939 - S lastSu 0 1 -
-R PE 1939 1940 - Mar Su>=24 0 0 -
-R PE 1986 1987 - Ja 1 0 1 -
-R PE 1986 1987 - Ap 1 0 0 -
-R PE 1990 o - Ja 1 0 1 -
-R PE 1990 o - Ap 1 0 0 -
-R PE 1994 o - Ja 1 0 1 -
-R PE 1994 o - Ap 1 0 0 -
-R U 1923 1925 - O 1 0 0:30 -
-R U 1924 1926 - Ap 1 0 0 -
-R U 1933 1938 - O lastSu 0 0:30 -
-R U 1934 1941 - Mar lastSa 24 0 -
-R U 1939 o - O 1 0 0:30 -
-R U 1940 o - O 27 0 0:30 -
-R U 1941 o - Au 1 0 0:30 -
-R U 1942 o - D 14 0 0:30 -
-R U 1943 o - Mar 14 0 0 -
-R U 1959 o - May 24 0 0:30 -
-R U 1959 o - N 15 0 0 -
-R U 1960 o - Ja 17 0 1 -
-R U 1960 o - Mar 6 0 0 -
-R U 1965 o - Ap 4 0 1 -
-R U 1965 o - S 26 0 0 -
-R U 1968 o - May 27 0 0:30 -
-R U 1968 o - D 1 0 0 -
-R U 1970 o - Ap 25 0 1 -
-R U 1970 o - Jun 14 0 0 -
-R U 1972 o - Ap 23 0 1 -
-R U 1972 o - Jul 16 0 0 -
-R U 1974 o - Ja 13 0 1:30 -
-R U 1974 o - Mar 10 0 0:30 -
-R U 1974 o - S 1 0 0 -
-R U 1974 o - D 22 0 1 -
-R U 1975 o - Mar 30 0 0 -
-R U 1976 o - D 19 0 1 -
-R U 1977 o - Mar 6 0 0 -
-R U 1977 o - D 4 0 1 -
-R U 1978 1979 - Mar Su>=1 0 0 -
-R U 1978 o - D 17 0 1 -
-R U 1979 o - Ap 29 0 1 -
-R U 1980 o - Mar 16 0 0 -
-R U 1987 o - D 14 0 1 -
-R U 1988 o - F 28 0 0 -
-R U 1988 o - D 11 0 1 -
-R U 1989 o - Mar 5 0 0 -
-R U 1989 o - O 29 0 1 -
-R U 1990 o - F 25 0 0 -
-R U 1990 1991 - O Su>=21 0 1 -
-R U 1991 1992 - Mar Su>=1 0 0 -
-R U 1992 o - O 18 0 1 -
-R U 1993 o - F 28 0 0 -
-R U 2004 o - S 19 0 1 -
-R U 2005 o - Mar 27 2 0 -
-R U 2005 o - O 9 2 1 -
-R U 2006 2015 - Mar Su>=8 2 0 -
-R U 2006 2014 - O Su>=1 2 1 -
-Z Africa/Abidjan -0:16:8 - LMT 1912
-0 - GMT
-Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 d WE%sT 1940 F 25 2
-1 d CE%sT 1946 O 7
-0 - WET 1956 Ja 29
-1 - CET 1963 Ap 14
-0 d WE%sT 1977 O 21
-1 d CE%sT 1979 O 26
-0 d WE%sT 1981 May
-1 - CET
-Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
--1 - %z 1975
-0 - GMT
-Z Africa/Cairo 2:5:9 - LMT 1900 O
-2 K EE%sT
-Z Africa/Casablanca -0:30:20 - LMT 1913 O 26
-0 M %z 1984 Mar 16
-1 - %z 1986
-0 M %z 2018 O 28 3
-1 M %z
-Z Africa/Ceuta -0:21:16 - LMT 1901 Ja 1 0u
-0 - WET 1918 May 6 23
-0 1 WEST 1918 O 7 23
-0 - WET 1924
-0 s WE%sT 1929
-0 - WET 1967
-0 Sp WE%sT 1984 Mar 16
-1 - CET 1986
-1 E CE%sT
-Z Africa/El_Aaiun -0:52:48 - LMT 1934
--1 - %z 1976 Ap 14
-0 M %z 2018 O 28 3
-1 M %z
-Z Africa/Johannesburg 1:52 - LMT 1892 F 8
-1:30 - SAST 1903 Mar
-2 SA SAST
-Z Africa/Juba 2:6:28 - LMT 1931
-2 SD CA%sT 2000 Ja 15 12
-3 - EAT 2021 F
-2 - CAT
-Z Africa/Khartoum 2:10:8 - LMT 1931
-2 SD CA%sT 2000 Ja 15 12
-3 - EAT 2017 N
-2 - CAT
-Z Africa/Lagos 0:13:35 - LMT 1905 Jul
-0 - GMT 1908 Jul
-0:13:35 - LMT 1914
-0:30 - %z 1919 S
-1 - WAT
-Z Africa/Maputo 2:10:18 - LMT 1909
-2 - CAT
-Z Africa/Monrovia -0:43:8 - LMT 1882
--0:43:8 - MMT 1919 Mar
--0:44:30 - MMT 1972 Ja 7
-0 - GMT
-Z Africa/Nairobi 2:27:16 - LMT 1908 May
-2:30 - %z 1928 Jun 30 24
-3 - EAT 1930 Ja 4 24
-2:30 - %z 1936 D 31 24
-2:45 - %z 1942 Jul 31 24
-3 - EAT
-Z Africa/Ndjamena 1:0:12 - LMT 1912
-1 - WAT 1979 O 14
-1 1 WAST 1980 Mar 8
-1 - WAT
-Z Africa/Sao_Tome 0:26:56 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 - GMT 2018 Ja 1 1
-1 - WAT 2019 Ja 1 2
-0 - GMT
-Z Africa/Tripoli 0:52:44 - LMT 1920
-1 L CE%sT 1959
-2 - EET 1982
-1 L CE%sT 1990 May 4
-2 - EET 1996 S 30
-1 L CE%sT 1997 O 4
-2 - EET 2012 N 10 2
-1 L CE%sT 2013 O 25 2
-2 - EET
-Z Africa/Tunis 0:40:44 - LMT 1881 May 12
-0:9:21 - PMT 1911 Mar 11
-1 n CE%sT
-Z Africa/Windhoek 1:8:24 - LMT 1892 F 8
-1:30 - %z 1903 Mar
-2 - SAST 1942 S 20 2
-2 1 SAST 1943 Mar 21 2
-2 - SAST 1990 Mar 21
-2 NA %s
-Z America/Adak 12:13:22 - LMT 1867 O 19 12:44:35
--11:46:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--10 u AH%sT 1983 N 30
--10 u H%sT
-Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
--9:59:36 - LMT 1900 Au 20 12
--10 - AST 1942
--10 u A%sT 1967 Ap
--10 - AHST 1969
--10 u AH%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Araguaina -3:12:48 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1995 S 14
--3 B %z 2003 S 24
--3 - %z 2012 O 21
--3 B %z 2013 S
--3 - %z
-Z America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z
-Z America/Argentina/Catamarca -4:23:8 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Cordoba -4:16:48 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z
-Z America/Argentina/Jujuy -4:21:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990 Mar 4
--4 - %z 1990 O 28
--4 1 %z 1991 Mar 17
--4 - %z 1991 O 6
--3 1 %z 1992
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/La_Rioja -4:27:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar
--4 - %z 1991 May 7
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Mendoza -4:35:16 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990 Mar 4
--4 - %z 1990 O 15
--4 1 %z 1991 Mar
--4 - %z 1991 O 15
--4 1 %z 1992 Mar
--4 - %z 1992 O 18
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 23
--4 - %z 2004 S 26
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Salta -4:21:40 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/San_Juan -4:34:4 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar
--4 - %z 1991 May 7
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 31
--4 - %z 2004 Jul 25
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/San_Luis -4:25:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990
--3 1 %z 1990 Mar 14
--4 - %z 1990 O 15
--4 1 %z 1991 Mar
--4 - %z 1991 Jun
--3 - %z 1999 O 3
--4 1 %z 2000 Mar 3
--3 - %z 2004 May 31
--4 - %z 2004 Jul 25
--3 A %z 2008 Ja 21
--4 Sa %z 2009 O 11
--3 - %z
-Z America/Argentina/Tucuman -4:20:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 13
--3 A %z
-Z America/Argentina/Ushuaia -4:33:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 30
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Asuncion -3:50:40 - LMT 1890
--3:50:40 - AMT 1931 O 10
--4 - %z 1972 O
--3 - %z 1974 Ap
--4 y %z
-Z America/Bahia -2:34:4 - LMT 1914
--3 B %z 2003 S 24
--3 - %z 2011 O 16
--3 B %z 2012 O 21
--3 - %z
-Z America/Bahia_Banderas -7:1 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1970
--7 m M%sT 2010 Ap 4 2
--6 m C%sT
-Z America/Barbados -3:58:29 - LMT 1911 Au 28
--4 BB A%sT 1944
--4 BB AST/-0330 1945
--4 BB A%sT
-Z America/Belem -3:13:56 - LMT 1914
--3 B %z 1988 S 12
--3 - %z
-Z America/Belize -5:52:48 - LMT 1912 Ap
--6 BZ %s
-Z America/Boa_Vista -4:2:40 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 1999 S 30
--4 B %z 2000 O 15
--4 - %z
-Z America/Bogota -4:56:16 - LMT 1884 Mar 13
--4:56:16 - BMT 1914 N 23
--5 CO %z
-Z America/Boise -7:44:49 - LMT 1883 N 18 20u
--8 u P%sT 1923 May 13 2
--7 u M%sT 1974
--7 - MST 1974 F 3 2
--7 u M%sT
-Z America/Cambridge_Bay 0 - -00 1920
--7 Y M%sT 1999 O 31 2
--6 C C%sT 2000 O 29 2
--5 - EST 2000 N 5
--6 - CST 2001 Ap 1 3
--7 C M%sT
-Z America/Campo_Grande -3:38:28 - LMT 1914
--4 B %z
-Z America/Cancun -5:47:4 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 26 2
--5 - EST 1983 Ja 4
--6 m C%sT 1997 O 26 2
--5 m E%sT 1998 Au 2 2
--6 m C%sT 2015 F 1 2
--5 - EST
-Z America/Caracas -4:27:44 - LMT 1890
--4:27:40 - CMT 1912 F 12
--4:30 - %z 1965
--4 - %z 2007 D 9 3
--4:30 - %z 2016 May 1 2:30
--4 - %z
-Z America/Cayenne -3:29:20 - LMT 1911 Jul
--4 - %z 1967 O
--3 - %z
-Z America/Chicago -5:50:36 - LMT 1883 N 18 18u
--6 u C%sT 1920
--6 Ch C%sT 1936 Mar 1 2
--5 - EST 1936 N 15 2
--6 Ch C%sT 1942
--6 u C%sT 1946
--6 Ch C%sT 1967
--6 u C%sT
-Z America/Chihuahua -7:4:20 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2022 O 30 2
--6 - CST
-Z America/Ciudad_Juarez -7:5:56 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT 2022 O 30 2
--6 - CST 2022 N 30
--7 u M%sT
-Z America/Costa_Rica -5:36:13 - LMT 1890
--5:36:13 - SJMT 1921 Ja 15
--6 CR C%sT
-Z America/Cuiaba -3:44:20 - LMT 1914
--4 B %z 2003 S 24
--4 - %z 2004 O
--4 B %z
-Z America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
--3 - %z 1980 Ap 6 2
--3 E %z 1996
-0 - GMT
-Z America/Dawson -9:17:40 - LMT 1900 Au 20
--9 Y Y%sT 1965
--9 Yu Y%sT 1973 O 28
--8 - PST 1980
--8 C P%sT 2020 N
--7 - MST
-Z America/Dawson_Creek -8:0:56 - LMT 1884
--8 C P%sT 1947
--8 Va P%sT 1972 Au 30 2
--7 - MST
-Z America/Denver -6:59:56 - LMT 1883 N 18 19u
--7 u M%sT 1920
--7 De M%sT 1942
--7 u M%sT 1946
--7 De M%sT 1967
--7 u M%sT
-Z America/Detroit -5:32:11 - LMT 1905
--6 - CST 1915 May 15 2
--5 - EST 1942
--5 u E%sT 1946
--5 Dt E%sT 1967 Jun 14 0:1
--5 u E%sT 1969
--5 - EST 1973
--5 u E%sT 1975
--5 - EST 1975 Ap 27 2
--5 u E%sT
-Z America/Edmonton -7:33:52 - LMT 1906 S
--7 Ed M%sT 1987
--7 C M%sT
-Z America/Eirunepe -4:39:28 - LMT 1914
--5 B %z 1988 S 12
--5 - %z 1993 S 28
--5 B %z 1994 S 22
--5 - %z 2008 Jun 24
--4 - %z 2013 N 10
--5 - %z
-Z America/El_Salvador -5:56:48 - LMT 1921
--6 SV C%sT
-Z America/Fort_Nelson -8:10:47 - LMT 1884
--8 Va P%sT 1946
--8 - PST 1947
--8 Va P%sT 1987
--8 C P%sT 2015 Mar 8 2
--7 - MST
-Z America/Fortaleza -2:34 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1999 S 30
--3 B %z 2000 O 22
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Glace_Bay -3:59:48 - LMT 1902 Jun 15
--4 C A%sT 1953
--4 H A%sT 1954
--4 - AST 1972
--4 H A%sT 1974
--4 C A%sT
-Z America/Goose_Bay -4:1:40 - LMT 1884
--3:30:52 - NST 1918
--3:30:52 C N%sT 1919
--3:30:52 - NST 1935 Mar 30
--3:30 - NST 1936
--3:30 j N%sT 1942 May 11
--3:30 C N%sT 1946
--3:30 j N%sT 1966 Mar 15 2
--4 j A%sT 2011 N
--4 C A%sT
-Z America/Grand_Turk -4:44:32 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1979
--5 u E%sT 2015 Mar 8 2
--4 - AST 2018 Mar 11 3
--5 u E%sT
-Z America/Guatemala -6:2:4 - LMT 1918 O 5
--6 GT C%sT
-Z America/Guayaquil -5:19:20 - LMT 1890
--5:14 - QMT 1931
--5 EC %z
-Z America/Guyana -3:52:39 - LMT 1911 Au
--4 - %z 1915 Mar
--3:45 - %z 1975 Au
--3 - %z 1992 Mar 29 1
--4 - %z
-Z America/Halifax -4:14:24 - LMT 1902 Jun 15
--4 H A%sT 1918
--4 C A%sT 1919
--4 H A%sT 1942 F 9 2s
--4 C A%sT 1946
--4 H A%sT 1974
--4 C A%sT
-Z America/Havana -5:29:28 - LMT 1890
--5:29:36 - HMT 1925 Jul 19 12
--5 Q C%sT
-Z America/Hermosillo -7:23:52 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1996
--7 m M%sT 1999
--7 - MST
-Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 18u
--6 u C%sT 1920
--6 In C%sT 1942
--6 u C%sT 1946
--6 In C%sT 1955 Ap 24 2
--5 - EST 1957 S 29 2
--6 - CST 1958 Ap 27 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Knox -5:46:30 - LMT 1883 N 18 18u
--6 u C%sT 1947
--6 St C%sT 1962 Ap 29 2
--5 - EST 1963 O 27 2
--6 u C%sT 1991 O 27 2
--5 - EST 2006 Ap 2 2
--6 u C%sT
-Z America/Indiana/Marengo -5:45:23 - LMT 1883 N 18 18u
--6 u C%sT 1951
--6 Ma C%sT 1961 Ap 30 2
--5 - EST 1969
--5 u E%sT 1974 Ja 6 2
--6 1 CDT 1974 O 27 2
--5 u E%sT 1976
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Petersburg -5:49:7 - LMT 1883 N 18 18u
--6 u C%sT 1955
--6 Pi C%sT 1965 Ap 25 2
--5 - EST 1966 O 30 2
--6 u C%sT 1977 O 30 2
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 N 4 2
--5 u E%sT
-Z America/Indiana/Tell_City -5:47:3 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 Pe C%sT 1964 Ap 26 2
--5 - EST 1967 O 29 2
--6 u C%sT 1969 Ap 27 2
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT
-Z America/Indiana/Vevay -5:40:16 - LMT 1883 N 18 18u
--6 u C%sT 1954 Ap 25 2
--5 - EST 1969
--5 u E%sT 1973
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Vincennes -5:50:7 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 V C%sT 1964 Ap 26 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 N 4 2
--5 u E%sT
-Z America/Indiana/Winamac -5:46:25 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 Pu C%sT 1961 Ap 30 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 Mar 11 2
--5 u E%sT
-Z America/Inuvik 0 - -00 1953
--8 Y P%sT 1979 Ap lastSu 2
--7 Y M%sT 1980
--7 C M%sT
-Z America/Iqaluit 0 - -00 1942 Au
--5 Y E%sT 1999 O 31 2
--6 C C%sT 2000 O 29 2
--5 C E%sT
-Z America/Jamaica -5:7:10 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1974
--5 u E%sT 1984
--5 - EST
-Z America/Juneau 15:2:19 - LMT 1867 O 19 15:33:32
--8:57:41 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1980 Ap 27 2
--9 u Y%sT 1980 O 26 2
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Kentucky/Louisville -5:43:2 - LMT 1883 N 18 18u
--6 u C%sT 1921
--6 v C%sT 1942
--6 u C%sT 1946
--6 v C%sT 1961 Jul 23 2
--5 - EST 1968
--5 u E%sT 1974 Ja 6 2
--6 1 CDT 1974 O 27 2
--5 u E%sT
-Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 - CST 1968
--6 u C%sT 2000 O 29 2
--5 u E%sT
-Z America/La_Paz -4:32:36 - LMT 1890
--4:32:36 - CMT 1931 O 15
--4:32:36 1 BST 1932 Mar 21
--4 - %z
-Z America/Lima -5:8:12 - LMT 1890
--5:8:36 - LMT 1908 Jul 28
--5 PE %z
-Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 20u
--8 u P%sT 1946
--8 CA P%sT 1967
--8 u P%sT
-Z America/Maceio -2:22:52 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1995 O 13
--3 B %z 1996 S 4
--3 - %z 1999 S 30
--3 B %z 2000 O 22
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Managua -5:45:8 - LMT 1890
--5:45:12 - MMT 1934 Jun 23
--6 - CST 1973 May
--5 - EST 1975 F 16
--6 NI C%sT 1992 Ja 1 4
--5 - EST 1992 S 24
--6 - CST 1993
--5 - EST 1997
--6 NI C%sT
-Z America/Manaus -4:0:4 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 1993 S 28
--4 B %z 1994 S 22
--4 - %z
-Z America/Martinique -4:4:20 - LMT 1890
--4:4:20 - FFMT 1911 May
--4 - AST 1980 Ap 6
--4 1 ADT 1980 S 28
--4 - AST
-Z America/Matamoros -6:30 - LMT 1922 Ja 1 6u
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT 2010
--6 u C%sT
-Z America/Mazatlan -7:5:40 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1970
--7 m M%sT
-Z America/Menominee -5:50:27 - LMT 1885 S 18 12
--6 u C%sT 1946
--6 Me C%sT 1969 Ap 27 2
--5 - EST 1973 Ap 29 2
--6 u C%sT
-Z America/Merida -5:58:28 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 26 2
--5 - EST 1982 N 2 2
--6 m C%sT
-Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
--8:46:18 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--8 - PST 2015 N 1 2
--9 u AK%sT 2018 N 4 2
--8 - PST 2019 Ja 20 2
--9 u AK%sT
-Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 m C%sT 2001 S 30 2
--6 - CST 2002 F 20
--6 m C%sT
-Z America/Miquelon -3:44:40 - LMT 1911 Jun 15
--4 - AST 1980 May
--3 - %z 1987
--3 C %z
-Z America/Moncton -4:19:8 - LMT 1883 D 9
--5 - EST 1902 Jun 15
--4 C A%sT 1933
--4 o A%sT 1942
--4 C A%sT 1946
--4 o A%sT 1973
--4 C A%sT 1993
--4 o A%sT 2007
--4 C A%sT
-Z America/Monterrey -6:41:16 - LMT 1922 Ja 1 6u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT
-Z America/Montevideo -3:44:51 - LMT 1908 Jun 10
--3:44:51 - MMT 1920 May
--4 - %z 1923 O
--3:30 U %z 1942 D 14
--3 U %z 1960
--3 U %z 1968
--3 U %z 1970
--3 U %z 1974
--3 U %z 1974 Mar 10
--3 U %z 1974 D 22
--3 U %z
-Z America/New_York -4:56:2 - LMT 1883 N 18 17u
--5 u E%sT 1920
--5 NY E%sT 1942
--5 u E%sT 1946
--5 NY E%sT 1967
--5 u E%sT
-Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
--11:1:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Noronha -2:9:40 - LMT 1914
--2 B %z 1990 S 17
--2 - %z 1999 S 30
--2 B %z 2000 O 15
--2 - %z 2001 S 13
--2 B %z 2002 O
--2 - %z
-Z America/North_Dakota/Beulah -6:47:7 - LMT 1883 N 18 19u
--7 u M%sT 2010 N 7 2
--6 u C%sT
-Z America/North_Dakota/Center -6:45:12 - LMT 1883 N 18 19u
--7 u M%sT 1992 O 25 2
--6 u C%sT
-Z America/North_Dakota/New_Salem -6:45:39 - LMT 1883 N 18 19u
--7 u M%sT 2003 O 26 2
--6 u C%sT
-Z America/Nuuk -3:26:56 - LMT 1916 Jul 28
--3 - %z 1980 Ap 6 2
--3 E %z 2023 Mar 26 1u
--2 - %z 2023 O 29 1u
--2 E %z
-Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT 2022 O 30 2
--6 - CST 2022 N 30
--6 u C%sT
-Z America/Panama -5:18:8 - LMT 1890
--5:19:36 - CMT 1908 Ap 22
--5 - EST
-Z America/Paramaribo -3:40:40 - LMT 1911
--3:40:52 - PMT 1935
--3:40:36 - PMT 1945 O
--3:30 - %z 1984 O
--3 - %z
-Z America/Phoenix -7:28:18 - LMT 1883 N 18 19u
--7 u M%sT 1944 Ja 1 0:1
--7 - MST 1944 Ap 1 0:1
--7 u M%sT 1944 O 1 0:1
--7 - MST 1967
--7 u M%sT 1968 Mar 21
--7 - MST
-Z America/Port-au-Prince -4:49:20 - LMT 1890
--4:49 - PPMT 1917 Ja 24 12
--5 HT E%sT
-Z America/Porto_Velho -4:15:36 - LMT 1914
--4 B %z 1988 S 12
--4 - %z
-Z America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12
--4 - AST 1942 May 3
--4 u A%sT 1946
--4 - AST
-Z America/Punta_Arenas -4:43:40 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - %z 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - %z 1919 Jul
--4:42:45 - SMT 1927 S
--5 x %z 1932 S
--4 - %z 1942 Jun
--5 - %z 1942 Au
--4 - %z 1946 Au 28 24
--5 1 %z 1947 Mar 31 24
--5 - %z 1947 May 21 23
--4 x %z 2016 D 4
--3 - %z
-Z America/Rankin_Inlet 0 - -00 1957
--6 Y C%sT 2000 O 29 2
--5 - EST 2001 Ap 1 3
--6 C C%sT
-Z America/Recife -2:19:36 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1999 S 30
--3 B %z 2000 O 15
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Regina -6:58:36 - LMT 1905 S
--7 r M%sT 1960 Ap lastSu 2
--6 - CST
-Z America/Resolute 0 - -00 1947 Au 31
--6 Y C%sT 2000 O 29 2
--5 - EST 2001 Ap 1 3
--6 C C%sT 2006 O 29 2
--5 - EST 2007 Mar 11 3
--6 C C%sT
-Z America/Rio_Branco -4:31:12 - LMT 1914
--5 B %z 1988 S 12
--5 - %z 2008 Jun 24
--4 - %z 2013 N 10
--5 - %z
-Z America/Santarem -3:38:48 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 2008 Jun 24
--3 - %z
-Z America/Santiago -4:42:45 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - %z 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - %z 1919 Jul
--4:42:45 - SMT 1927 S
--5 x %z 1932 S
--4 - %z 1942 Jun
--5 - %z 1942 Au
--4 - %z 1946 Jul 14 24
--4 1 %z 1946 Au 28 24
--5 1 %z 1947 Mar 31 24
--5 - %z 1947 May 21 23
--4 x %z
-Z America/Santo_Domingo -4:39:36 - LMT 1890
--4:40 - SDMT 1933 Ap 1 12
--5 DO %s 1974 O 27
--4 - AST 2000 O 29 2
--5 u E%sT 2000 D 3 1
--4 - AST
-Z America/Sao_Paulo -3:6:28 - LMT 1914
--3 B %z 1963 O 23
--3 1 %z 1964
--3 B %z
-Z America/Scoresbysund -1:27:52 - LMT 1916 Jul 28
--2 - %z 1980 Ap 6 2
--2 c %z 1981 Mar 29
--1 E %z 2024 Mar 31
--2 E %z
-Z America/Sitka 14:58:47 - LMT 1867 O 19 15:30
--9:1:13 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/St_Johns -3:30:52 - LMT 1884
--3:30:52 j N%sT 1918
--3:30:52 C N%sT 1919
--3:30:52 j N%sT 1935 Mar 30
--3:30 j N%sT 1942 May 11
--3:30 C N%sT 1946
--3:30 j N%sT 2011 N
--3:30 C N%sT
-Z America/Swift_Current -7:11:20 - LMT 1905 S
--7 C M%sT 1946 Ap lastSu 2
--7 r M%sT 1950
--7 Sw M%sT 1972 Ap lastSu 2
--6 - CST
-Z America/Tegucigalpa -5:48:52 - LMT 1921 Ap
--6 HN C%sT
-Z America/Thule -4:35:8 - LMT 1916 Jul 28
--4 Th A%sT
-Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 7u
--7 - MST 1924
--8 - PST 1927 Jun 10
--7 - MST 1930 N 15
--8 - PST 1931 Ap
--8 1 PDT 1931 S 30
--8 - PST 1942 Ap 24
--8 1 PWT 1945 Au 14 23u
--8 1 PPT 1945 N 15
--8 - PST 1948 Ap 5
--8 1 PDT 1949 Ja 14
--8 - PST 1950 May
--8 1 PDT 1950 S 24
--8 - PST 1951 Ap 29 2
--8 1 PDT 1951 S 30 2
--8 - PST 1952 Ap 27 2
--8 1 PDT 1952 S 28 2
--8 - PST 1954
--8 CA P%sT 1961
--8 - PST 1976
--8 u P%sT 1996
--8 m P%sT 2001
--8 u P%sT 2002 F 20
--8 m P%sT 2010
--8 u P%sT
-Z America/Toronto -5:17:32 - LMT 1895
--5 C E%sT 1919
--5 t E%sT 1942 F 9 2s
--5 C E%sT 1946
--5 t E%sT 1974
--5 C E%sT
-Z America/Vancouver -8:12:28 - LMT 1884
--8 Va P%sT 1987
--8 C P%sT
-Z America/Whitehorse -9:0:12 - LMT 1900 Au 20
--9 Y Y%sT 1965
--9 Yu Y%sT 1966 F 27
--8 - PST 1980
--8 C P%sT 2020 N
--7 - MST
-Z America/Winnipeg -6:28:36 - LMT 1887 Jul 16
--6 W C%sT 2006
--6 C C%sT
-Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
--9:18:55 - LMT 1900 Au 20 12
--9 - YST 1942
--9 u Y%sT 1946
--9 - YST 1969
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z Antarctica/Casey 0 - -00 1969
-8 - %z 2009 O 18 2
-11 - %z 2010 Mar 5 2
-8 - %z 2011 O 28 2
-11 - %z 2012 F 21 17u
-8 - %z 2016 O 22
-11 - %z 2018 Mar 11 4
-8 - %z 2018 O 7 4
-11 - %z 2019 Mar 17 3
-8 - %z 2019 O 4 3
-11 - %z 2020 Mar 8 3
-8 - %z 2020 O 4 0:1
-11 - %z 2021 Mar 14
-8 - %z 2021 O 3 0:1
-11 - %z 2022 Mar 13
-8 - %z 2022 O 2 0:1
-11 - %z 2023 Mar 9 3
-8 - %z
-Z Antarctica/Davis 0 - -00 1957 Ja 13
-7 - %z 1964 N
-0 - -00 1969 F
-7 - %z 2009 O 18 2
-5 - %z 2010 Mar 10 20u
-7 - %z 2011 O 28 2
-5 - %z 2012 F 21 20u
-7 - %z
-Z Antarctica/Macquarie 0 - -00 1899 N
-10 - AEST 1916 O 1 2
-10 1 AEDT 1917 F
-10 AU AE%sT 1919 Ap 1 0s
-0 - -00 1948 Mar 25
-10 AU AE%sT 1967
-10 AT AE%sT 2010
-10 1 AEDT 2011
-10 AT AE%sT
-Z Antarctica/Mawson 0 - -00 1954 F 13
-6 - %z 2009 O 18 2
-5 - %z
-Z Antarctica/Palmer 0 - -00 1965
--4 A %z 1969 O 5
--3 A %z 1982 May
--4 x %z 2016 D 4
--3 - %z
-Z Antarctica/Rothera 0 - -00 1976 D
--3 - %z
-Z Antarctica/Troll 0 - -00 2005 F 12
-0 Tr %s
-Z Antarctica/Vostok 0 - -00 1957 D 16
-7 - %z 1994 F
-0 - -00 1994 N
-7 - %z 2023 D 18 2
-5 - %z
-Z Asia/Almaty 5:7:48 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 2004 O 31 2s
-6 - %z 2024 Mar
-5 - %z
-Z Asia/Amman 2:23:44 - LMT 1931
-2 J EE%sT 2022 O 28 0s
-3 - %z
-Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
-12 - %z 1930 Jun 21
-13 R %z 1982 Ap 1 0s
-12 R %z 1991 Mar 31 2s
-11 R %z 1992 Ja 19 2s
-12 R %z 2010 Mar 28 2s
-11 R %z 2011 Mar 27 2s
-12 - %z
-Z Asia/Aqtau 3:21:4 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1994 S 25 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Aqtobe 3:48:40 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Ashgabat 3:53:32 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 R %z 1991 Mar 31 2
-4 R %z 1992 Ja 19 2
-5 - %z
-Z Asia/Atyrau 3:27:44 - LMT 1924 May 2
-3 - %z 1930 Jun 21
-5 - %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1999 Mar 28 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Baghdad 2:57:40 - LMT 1890
-2:57:36 - BMT 1918
-3 - %z 1982 May
-3 IQ %z
-Z Asia/Baku 3:19:24 - LMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1992 S lastSu 2s
-4 - %z 1996
-4 E %z 1997
-4 AZ %z
-Z Asia/Bangkok 6:42:4 - LMT 1880
-6:42:4 - BMT 1920 Ap
-7 - %z
-Z Asia/Barnaul 5:35 - LMT 1919 D 10
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 1995 May 28
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 Mar 27 2s
-7 - %z
-Z Asia/Beirut 2:22 - LMT 1880
-2 l EE%sT
-Z Asia/Bishkek 4:58:24 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1991 Au 31 2
-5 KG %z 2005 Au 12
-6 - %z
-Z Asia/Chita 7:33:52 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2011 Mar 27 2s
-10 - %z 2014 O 26 2s
-8 - %z 2016 Mar 27 2
-9 - %z
-Z Asia/Colombo 5:19:24 - LMT 1880
-5:19:32 - MMT 1906
-5:30 - %z 1942 Ja 5
-5:30 0:30 %z 1942 S
-5:30 1 %z 1945 O 16 2
-5:30 - %z 1996 May 25
-6:30 - %z 1996 O 26 0:30
-6 - %z 2006 Ap 15 0:30
-5:30 - %z
-Z Asia/Damascus 2:25:12 - LMT 1920
-2 S EE%sT 2022 O 28
-3 - %z
-Z Asia/Dhaka 6:1:40 - LMT 1890
-5:53:20 - HMT 1941 O
-6:30 - %z 1942 May 15
-5:30 - %z 1942 S
-6:30 - %z 1951 S 30
-6 - %z 2009
-6 BD %z
-Z Asia/Dili 8:22:20 - LMT 1911 D 31 16u
-8 - %z 1942 F 21 23
-9 - %z 1976 May 3
-8 - %z 2000 S 17
-9 - %z
-Z Asia/Dubai 3:41:12 - LMT 1920
-4 - %z
-Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 1 %z 1991 S 9 2s
-5 - %z
-Z Asia/Famagusta 2:15:48 - LMT 1921 N 14
-2 CY EE%sT 1998 S
-2 E EE%sT 2016 S 8
-3 - %z 2017 O 29 1u
-2 E EE%sT
-Z Asia/Gaza 2:17:52 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT 2008 Au 29
-2 - EET 2008 S
-2 P EE%sT 2010
-2 - EET 2010 Mar 27 0:1
-2 P EE%sT 2011 Au
-2 - EET 2012
-2 P EE%sT
-Z Asia/Hebron 2:20:23 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT
-Z Asia/Ho_Chi_Minh 7:6:30 - LMT 1906 Jul
-7:6:30 - PLMT 1911 May
-7 - %z 1942 D 31 23
-8 - %z 1945 Mar 14 23
-9 - %z 1945 S 1 24
-7 - %z 1947 Ap
-8 - %z 1955 Jul 1 1
-7 - %z 1959 D 31 23
-8 - %z 1975 Jun 13
-7 - %z
-Z Asia/Hong_Kong 7:36:42 - LMT 1904 O 29 17u
-8 - HKT 1941 Jun 15 3
-8 1 HKST 1941 O 1 4
-8 0:30 HKWT 1941 D 25
-9 - JST 1945 N 18 2
-8 HK HK%sT
-Z Asia/Hovd 6:6:36 - LMT 1905 Au
-6 - %z 1978
-7 X %z
-Z Asia/Irkutsk 6:57:5 - LMT 1880
-6:57:5 - IMT 1920 Ja 25
-7 - %z 1930 Jun 21
-8 R %z 1991 Mar 31 2s
-7 R %z 1992 Ja 19 2s
-8 R %z 2011 Mar 27 2s
-9 - %z 2014 O 26 2s
-8 - %z
-Z Asia/Jakarta 7:7:12 - LMT 1867 Au 10
-7:7:12 - BMT 1923 D 31 16:40u
-7:20 - %z 1932 N
-7:30 - %z 1942 Mar 23
-9 - %z 1945 S 23
-7:30 - %z 1948 May
-8 - %z 1950 May
-7:30 - %z 1964
-7 - WIB
-Z Asia/Jayapura 9:22:48 - LMT 1932 N
-9 - %z 1944 S
-9:30 - %z 1964
-9 - WIT
-Z Asia/Jerusalem 2:20:54 - LMT 1880
-2:20:40 - JMT 1918
-2 Z I%sT
-Z Asia/Kabul 4:36:48 - LMT 1890
-4 - %z 1945
-4:30 - %z
-Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
-11 - %z 1930 Jun 21
-12 R %z 1991 Mar 31 2s
-11 R %z 1992 Ja 19 2s
-12 R %z 2010 Mar 28 2s
-11 R %z 2011 Mar 27 2s
-12 - %z
-Z Asia/Karachi 4:28:12 - LMT 1907
-5:30 - %z 1942 S
-5:30 1 %z 1945 O 15
-5:30 - %z 1951 S 30
-5 - %z 1971 Mar 26
-5 PK PK%sT
-Z Asia/Kathmandu 5:41:16 - LMT 1920
-5:30 - %z 1986
-5:45 - %z
-Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2004
-10 R %z 2011 Mar 27 2s
-11 - %z 2011 S 13 0s
-10 - %z 2014 O 26 2s
-9 - %z
-Z Asia/Kolkata 5:53:28 - LMT 1854 Jun 28
-5:53:20 - HMT 1870
-5:21:10 - MMT 1906
-5:30 - IST 1941 O
-5:30 1 %z 1942 May 15
-5:30 - IST 1942 S
-5:30 1 %z 1945 O 15
-5:30 - IST
-Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2011 Mar 27 2s
-8 - %z 2014 O 26 2s
-7 - %z
-Z Asia/Kuching 7:21:20 - LMT 1926 Mar
-7:30 - %z 1933
-8 NB %z 1942 F 16
-9 - %z 1945 S 12
-8 - %z
-Z Asia/Macau 7:34:10 - LMT 1904 O 30
-8 - CST 1941 D 21 23
-9 _ %z 1945 S 30 24
-8 _ C%sT
-Z Asia/Magadan 10:3:12 - LMT 1924 May 2
-10 - %z 1930 Jun 21
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2014 O 26 2s
-10 - %z 2016 Ap 24 2s
-11 - %z
-Z Asia/Makassar 7:57:36 - LMT 1920
-7:57:36 - MMT 1932 N
-8 - %z 1942 F 9
-9 - %z 1945 S 23
-8 - WITA
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
-8 PH P%sT
-Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
-2 CY EE%sT 1998 S
-2 E EE%sT
-Z Asia/Novokuznetsk 5:48:48 - LMT 1924 May
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2010 Mar 28 2s
-6 R %z 2011 Mar 27 2s
-7 - %z
-Z Asia/Novosibirsk 5:31:40 - LMT 1919 D 14 6
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 1993 May 23
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 Jul 24 2s
-7 - %z
-Z Asia/Omsk 4:53:30 - LMT 1919 N 14
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z
-Z Asia/Oral 3:25:24 - LMT 1924 May 2
-3 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1989 Mar 26 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1992 Mar 29 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Pontianak 7:17:20 - LMT 1908 May
-7:17:20 - PMT 1932 N
-7:30 - %z 1942 Ja 29
-9 - %z 1945 S 23
-7:30 - %z 1948 May
-8 - %z 1950 May
-7:30 - %z 1964
-8 - WITA 1988
-7 - WIB
-Z Asia/Pyongyang 8:23 - LMT 1908 Ap
-8:30 - KST 1912
-9 - JST 1945 Au 24
-9 - KST 2015 Au 15
-8:30 - KST 2018 May 4 23:30
-9 - KST
-Z Asia/Qatar 3:26:8 - LMT 1920
-4 - %z 1972 Jun
-3 - %z
-Z Asia/Qostanay 4:14:28 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2004 O 31 2s
-6 - %z 2024 Mar
-5 - %z
-Z Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1991 S 29 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 1992 Mar 29 2s
-5 R %z 2004 O 31 2s
-6 - %z 2018 D 21
-5 - %z
-Z Asia/Riyadh 3:6:52 - LMT 1947 Mar 14
-3 - %z
-Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
-9 - %z 1945 Au 25
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 1997 Mar lastSu 2s
-10 R %z 2011 Mar 27 2s
-11 - %z 2014 O 26 2s
-10 - %z 2016 Mar 27 2s
-11 - %z
-Z Asia/Samarkand 4:27:53 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1992
-5 - %z
-Z Asia/Seoul 8:27:52 - LMT 1908 Ap
-8:30 - KST 1912
-9 - JST 1945 S 8
-9 KR K%sT 1954 Mar 21
-8:30 KR K%sT 1961 Au 10
-9 KR K%sT
-Z Asia/Shanghai 8:5:43 - LMT 1901
-8 Sh C%sT 1949 May 28
-8 CN C%sT
-Z Asia/Singapore 6:55:25 - LMT 1901
-6:55:25 - SMT 1905 Jun
-7 - %z 1933
-7 0:20 %z 1936
-7:20 - %z 1941 S
-7:30 - %z 1942 F 16
-9 - %z 1945 S 12
-7:30 - %z 1981 D 31 16u
-8 - %z
-Z Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
-10 - %z 1930 Jun 21
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2014 O 26 2s
-11 - %z
-Z Asia/Taipei 8:6 - LMT 1896
-8 - CST 1937 O
-9 - JST 1945 S 21 1
-8 f C%sT
-Z Asia/Tashkent 4:37:11 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2
-5 R %z 1992
-5 - %z
-Z Asia/Tbilisi 2:59:11 - LMT 1880
-2:59:11 - TBMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1992
-3 e %z 1994 S lastSu
-4 e %z 1996 O lastSu
-4 1 %z 1997 Mar lastSu
-4 e %z 2004 Jun 27
-3 R %z 2005 Mar lastSu 2
-4 - %z
-Z Asia/Tehran 3:25:44 - LMT 1916
-3:25:44 - TMT 1935 Jun 13
-3:30 i %z 1977 O 20 24
-4 i %z 1979
-3:30 i %z
-Z Asia/Thimphu 5:58:36 - LMT 1947 Au 15
-5:30 - %z 1987 O
-6 - %z
-Z Asia/Tokyo 9:18:59 - LMT 1887 D 31 15u
-9 JP J%sT
-Z Asia/Tomsk 5:39:51 - LMT 1919 D 22
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2002 May 1 3
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 May 29 2s
-7 - %z
-Z Asia/Ulaanbaatar 7:7:32 - LMT 1905 Au
-7 - %z 1978
-8 X %z
-Z Asia/Urumqi 5:50:20 - LMT 1928
-6 - %z
-Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1981 Ap
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2011 S 13 0s
-11 - %z 2014 O 26 2s
-10 - %z
-Z Asia/Vladivostok 8:47:31 - LMT 1922 N 15
-9 - %z 1930 Jun 21
-10 R %z 1991 Mar 31 2s
-9 R %z 1992 Ja 19 2s
-10 R %z 2011 Mar 27 2s
-11 - %z 2014 O 26 2s
-10 - %z
-Z Asia/Yakutsk 8:38:58 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2011 Mar 27 2s
-10 - %z 2014 O 26 2s
-9 - %z
-Z Asia/Yangon 6:24:47 - LMT 1880
-6:24:47 - RMT 1920
-6:30 - %z 1942 May
-9 - %z 1945 May 3
-6:30 - %z
-Z Asia/Yekaterinburg 4:2:33 - LMT 1916 Jul 3
-3:45:5 - PMT 1919 Jul 15 4
-4 - %z 1930 Jun 21
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2011 Mar 27 2s
-6 - %z 2014 O 26 2s
-5 - %z
-Z Asia/Yerevan 2:58 - LMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1995 S 24 2s
-4 - %z 1997
-4 R %z 2011
-4 AM %z
-Z Atlantic/Azores -1:42:40 - LMT 1884
--1:54:32 - HMT 1912 Ja 1 2u
--2 p %z 1966 O 2 2s
--1 - %z 1982 Mar 28 0s
--1 p %z 1986
--1 E %z 1992 D 27 1s
-0 E WE%sT 1993 Jun 17 1u
--1 E %z
-Z Atlantic/Bermuda -4:19:18 - LMT 1890
--4:19:18 Be BMT/BST 1930 Ja 1 2
--4 Be A%sT 1974 Ap 28 2
--4 C A%sT 1976
--4 u A%sT
-Z Atlantic/Canary -1:1:36 - LMT 1922 Mar
--1 - %z 1946 S 30 1
-0 - WET 1980 Ap 6 0s
-0 1 WEST 1980 S 28 1u
-0 E WE%sT
-Z Atlantic/Cape_Verde -1:34:4 - LMT 1912 Ja 1 2u
--2 - %z 1942 S
--2 1 %z 1945 O 15
--2 - %z 1975 N 25 2
--1 - %z
-Z Atlantic/Faroe -0:27:4 - LMT 1908 Ja 11
-0 - WET 1981
-0 E WE%sT
-Z Atlantic/Madeira -1:7:36 - LMT 1884
--1:7:36 - FMT 1912 Ja 1 1u
--1 p %z 1966 O 2 2s
-0 - WET 1982 Ap 4
-0 p WE%sT 1986 Jul 31
-0 E WE%sT
-Z Atlantic/South_Georgia -2:26:8 - LMT 1890
--2 - %z
-Z Atlantic/Stanley -3:51:24 - LMT 1890
--3:51:24 - SMT 1912 Mar 12
--4 FK %z 1983 May
--3 FK %z 1985 S 15
--4 FK %z 2010 S 5 2
--3 - %z
-Z Australia/Adelaide 9:14:20 - LMT 1895 F
-9 - ACST 1899 May
-9:30 AU AC%sT 1971
-9:30 AS AC%sT
-Z Australia/Brisbane 10:12:8 - LMT 1895
-10 AU AE%sT 1971
-10 AQ AE%sT
-Z Australia/Broken_Hill 9:25:48 - LMT 1895 F
-10 - AEST 1896 Au 23
-9 - ACST 1899 May
-9:30 AU AC%sT 1971
-9:30 AN AC%sT 2000
-9:30 AS AC%sT
-Z Australia/Darwin 8:43:20 - LMT 1895 F
-9 - ACST 1899 May
-9:30 AU AC%sT
-Z Australia/Eucla 8:35:28 - LMT 1895 D
-8:45 AU %z 1943 Jul
-8:45 AW %z
-Z Australia/Hobart 9:49:16 - LMT 1895 S
-10 AT AE%sT 1919 O 24
-10 AU AE%sT 1967
-10 AT AE%sT
-Z Australia/Lindeman 9:55:56 - LMT 1895
-10 AU AE%sT 1971
-10 AQ AE%sT 1992 Jul
-10 Ho AE%sT
-Z Australia/Lord_Howe 10:36:20 - LMT 1895 F
-10 - AEST 1981 Mar
-10:30 LH %z 1985 Jul
-10:30 LH %z
-Z Australia/Melbourne 9:39:52 - LMT 1895 F
-10 AU AE%sT 1971
-10 AV AE%sT
-Z Australia/Perth 7:43:24 - LMT 1895 D
-8 AU AW%sT 1943 Jul
-8 AW AW%sT
-Z Australia/Sydney 10:4:52 - LMT 1895 F
-10 AU AE%sT 1971
-10 AN AE%sT
-Z Etc/GMT 0 - GMT
-Z Etc/GMT+1 -1 - %z
-Z Etc/GMT+10 -10 - %z
-Z Etc/GMT+11 -11 - %z
-Z Etc/GMT+12 -12 - %z
-Z Etc/GMT+2 -2 - %z
-Z Etc/GMT+3 -3 - %z
-Z Etc/GMT+4 -4 - %z
-Z Etc/GMT+5 -5 - %z
-Z Etc/GMT+6 -6 - %z
-Z Etc/GMT+7 -7 - %z
-Z Etc/GMT+8 -8 - %z
-Z Etc/GMT+9 -9 - %z
-Z Etc/GMT-1 1 - %z
-Z Etc/GMT-10 10 - %z
-Z Etc/GMT-11 11 - %z
-Z Etc/GMT-12 12 - %z
-Z Etc/GMT-13 13 - %z
-Z Etc/GMT-14 14 - %z
-Z Etc/GMT-2 2 - %z
-Z Etc/GMT-3 3 - %z
-Z Etc/GMT-4 4 - %z
-Z Etc/GMT-5 5 - %z
-Z Etc/GMT-6 6 - %z
-Z Etc/GMT-7 7 - %z
-Z Etc/GMT-8 8 - %z
-Z Etc/GMT-9 9 - %z
-Z Etc/UTC 0 - UTC
-Z Europe/Andorra 0:6:4 - LMT 1901
-0 - WET 1946 S 30
-1 - CET 1985 Mar 31 2
-1 E CE%sT
-Z Europe/Astrakhan 3:12:12 - LMT 1924 May
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 Mar 27 2s
-4 - %z
-Z Europe/Athens 1:34:52 - LMT 1895 S 14
-1:34:52 - AMT 1916 Jul 28 0:1
-2 g EE%sT 1941 Ap 30
-1 g CE%sT 1944 Ap 4
-2 g EE%sT 1981
-2 E EE%sT
-Z Europe/Belgrade 1:22 - LMT 1884
-1 - CET 1941 Ap 18 23
-1 c CE%sT 1945
-1 - CET 1945 May 8 2s
-1 1 CEST 1945 S 16 2s
-1 - CET 1982 N 27
-1 E CE%sT
-Z Europe/Berlin 0:53:28 - LMT 1893 Ap
-1 c CE%sT 1945 May 24 2
-1 So CE%sT 1946
-1 DE CE%sT 1980
-1 E CE%sT
-Z Europe/Brussels 0:17:30 - LMT 1880
-0:17:30 - BMT 1892 May 1 0:17:30
-0 - WET 1914 N 8
-1 - CET 1916 May
-1 c CE%sT 1918 N 11 11u
-0 b WE%sT 1940 May 20 2s
-1 c CE%sT 1944 S 3
-1 b CE%sT 1977
-1 E CE%sT
-Z Europe/Bucharest 1:44:24 - LMT 1891 O
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1981 Mar 29 2s
-2 c EE%sT 1991
-2 z EE%sT 1994
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Budapest 1:16:20 - LMT 1890 N
-1 c CE%sT 1918
-1 h CE%sT 1941 Ap 7 23
-1 c CE%sT 1945
-1 h CE%sT 1984
-1 E CE%sT
-Z Europe/Chisinau 1:55:20 - LMT 1880
-1:55 - CMT 1918 F 15
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1940 Au 15
-2 1 EEST 1941 Jul 17
-1 c CE%sT 1944 Au 24
-3 R MSK/MSD 1990 May 6 2
-2 R EE%sT 1992
-2 e EE%sT 1997
-2 MD EE%sT
-Z Europe/Dublin -0:25:21 - LMT 1880 Au 2
--0:25:21 - DMT 1916 May 21 2s
--0:25:21 1 IST 1916 O 1 2s
-0 G %s 1921 D 6
-0 G GMT/IST 1940 F 25 2s
-0 1 IST 1946 O 6 2s
-0 - GMT 1947 Mar 16 2s
-0 1 IST 1947 N 2 2s
-0 - GMT 1948 Ap 18 2s
-0 G GMT/IST 1968 O 27
-1 IE IST/GMT
-Z Europe/Gibraltar -0:21:24 - LMT 1880 Au 2
-0 G %s 1957 Ap 14 2
-1 - CET 1982
-1 E CE%sT
-Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
-1:39:49 - HMT 1921 May
-2 FI EE%sT 1983
-2 E EE%sT
-Z Europe/Istanbul 1:55:52 - LMT 1880
-1:56:56 - IMT 1910 O
-2 T EE%sT 1978 Jun 29
-3 T %z 1984 N 1 2
-2 T EE%sT 2007
-2 E EE%sT 2011 Mar 27 1u
-2 - EET 2011 Mar 28 1u
-2 E EE%sT 2014 Mar 30 1u
-2 - EET 2014 Mar 31 1u
-2 E EE%sT 2015 O 25 1u
-2 1 EEST 2015 N 8 1u
-2 E EE%sT 2016 S 7
-3 - %z
-Z Europe/Kaliningrad 1:22 - LMT 1893 Ap
-1 c CE%sT 1945 Ap 10
-2 O EE%sT 1946 Ap 7
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - %z 2014 O 26 2s
-2 - EET
-Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R MSK/MSD 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Kyiv 2:2:4 - LMT 1880
-2:2:4 - KMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 S 20
-1 c CE%sT 1943 N 6
-3 R MSK/MSD 1990 Jul 1 2
-2 1 EEST 1991 S 29 3
-2 c EE%sT 1996 May 13
-2 E EE%sT
-Z Europe/Lisbon -0:36:45 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 p WE%sT 1966 O 2 2s
-1 - CET 1976 S 26 1
-0 p WE%sT 1986
-0 E WE%sT 1992 S 27 1u
-1 E CE%sT 1996 Mar 31 1u
-0 E WE%sT
-Z Europe/London -0:1:15 - LMT 1847 D
-0 G %s 1968 O 27
-1 - BST 1971 O 31 2u
-0 G %s 1996
-0 E GMT/BST
-Z Europe/Madrid -0:14:44 - LMT 1901 Ja 1 0u
-0 s WE%sT 1940 Mar 16 23
-1 s CE%sT 1979
-1 E CE%sT
-Z Europe/Malta 0:58:4 - LMT 1893 N 2
-1 I CE%sT 1973 Mar 31
-1 MT CE%sT 1981
-1 E CE%sT
-Z Europe/Minsk 1:50:16 - LMT 1880
-1:50 - MMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 Jun 28
-1 c CE%sT 1944 Jul 3
-3 R MSK/MSD 1990
-3 - MSK 1991 Mar 31 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - %z
-Z Europe/Moscow 2:30:17 - LMT 1880
-2:30:17 - MMT 1916 Jul 3
-2:31:19 R %s 1919 Jul 1 0u
-3 R %s 1921 O
-3 R MSK/MSD 1922 O
-2 - EET 1930 Jun 21
-3 R MSK/MSD 1991 Mar 31 2s
-2 R EE%sT 1992 Ja 19 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Paris 0:9:21 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 F WE%sT 1940 Jun 14 23
-1 c CE%sT 1944 Au 25
-0 F WE%sT 1945 S 16 3
-1 F CE%sT 1977
-1 E CE%sT
-Z Europe/Prague 0:57:44 - LMT 1850
-0:57:44 - PMT 1891 O
-1 c CE%sT 1945 May 9
-1 CZ CE%sT 1946 D 1 3
-1 -1 GMT 1947 F 23 2
-1 CZ CE%sT 1979
-1 E CE%sT
-Z Europe/Riga 1:36:34 - LMT 1880
-1:36:34 - RMT 1918 Ap 15 2
-1:36:34 1 LST 1918 S 16 3
-1:36:34 - RMT 1919 Ap 1 2
-1:36:34 1 LST 1919 May 22 3
-1:36:34 - RMT 1926 May 11
-2 - EET 1940 Au 5
-3 - MSK 1941 Jul
-1 c CE%sT 1944 O 13
-3 R MSK/MSD 1989 Mar lastSu 2s
-2 1 EEST 1989 S lastSu 2s
-2 LV EE%sT 1997 Ja 21
-2 E EE%sT 2000 F 29
-2 - EET 2001 Ja 2
-2 E EE%sT
-Z Europe/Rome 0:49:56 - LMT 1866 D 12
-0:49:56 - RMT 1893 O 31 23u
-1 I CE%sT 1943 S 10
-1 c CE%sT 1944 Jun 4
-1 I CE%sT 1980
-1 E CE%sT
-Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 - %z 1935 Ja 27
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-2 R %z 1991 S 29 2s
-3 - %z 1991 O 20 3
-4 R %z 2010 Mar 28 2s
-3 R %z 2011 Mar 27 2s
-4 - %z
-Z Europe/Saratov 3:4:18 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1988 Mar 27 2s
-3 R %z 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 D 4 2s
-4 - %z
-Z Europe/Simferopol 2:16:24 - LMT 1880
-2:16 - SMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 N
-1 c CE%sT 1944 Ap 13
-3 R MSK/MSD 1990
-3 - MSK 1990 Jul 1 2
-2 - EET 1992 Mar 20
-2 c EE%sT 1994 May
-3 c MSK/MSD 1996 Mar 31 0s
-3 1 MSD 1996 O 27 3s
-3 - MSK 1997 Mar lastSu 1u
-2 E EE%sT 2014 Mar 30 2
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Sofia 1:33:16 - LMT 1880
-1:56:56 - IMT 1894 N 30
-2 - EET 1942 N 2 3
-1 c CE%sT 1945
-1 - CET 1945 Ap 2 3
-2 - EET 1979 Mar 31 23
-2 BG EE%sT 1982 S 26 3
-2 c EE%sT 1991
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Tallinn 1:39 - LMT 1880
-1:39 - TMT 1918 F
-1 c CE%sT 1919 Jul
-1:39 - TMT 1921 May
-2 - EET 1940 Au 6
-3 - MSK 1941 S 15
-1 c CE%sT 1944 S 22
-3 R MSK/MSD 1989 Mar 26 2s
-2 1 EEST 1989 S 24 2s
-2 c EE%sT 1998 S 22
-2 E EE%sT 1999 O 31 4
-2 - EET 2002 F 21
-2 E EE%sT
-Z Europe/Tirane 1:19:20 - LMT 1914
-1 - CET 1940 Jun 16
-1 q CE%sT 1984 Jul
-1 E CE%sT
-Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-2 R %z 1992 Ja 19 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 Mar 27 2s
-4 - %z
-Z Europe/Vienna 1:5:21 - LMT 1893 Ap
-1 c CE%sT 1920
-1 a CE%sT 1940 Ap 1 2s
-1 c CE%sT 1945 Ap 2 2s
-1 1 CEST 1945 Ap 12 2s
-1 - CET 1946
-1 a CE%sT 1981
-1 E CE%sT
-Z Europe/Vilnius 1:41:16 - LMT 1880
-1:24 - WMT 1917
-1:35:36 - KMT 1919 O 10
-1 - CET 1920 Jul 12
-2 - EET 1920 O 9
-1 - CET 1940 Au 3
-3 - MSK 1941 Jun 24
-1 c CE%sT 1944 Au
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 1991 S 29 2s
-2 c EE%sT 1998
-2 - EET 1998 Mar 29 1u
-1 E CE%sT 1999 O 31 1u
-2 - EET 2003
-2 E EE%sT
-Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
-3 - %z 1930 Jun 21
-4 - %z 1961 N 11
-4 R %z 1988 Mar 27 2s
-3 R MSK/MSD 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK 2018 O 28 2s
-4 - %z 2020 D 27 2s
-3 - MSK
-Z Europe/Warsaw 1:24 - LMT 1880
-1:24 - WMT 1915 Au 5
-1 c CE%sT 1918 S 16 3
-2 O EE%sT 1922 Jun
-1 O CE%sT 1940 Jun 23 2
-1 c CE%sT 1944 O
-1 O CE%sT 1977
-1 W- CE%sT 1988
-1 E CE%sT
-Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
-0:29:46 - BMT 1894 Jun
-1 CH CE%sT 1981
-1 E CE%sT
-Z Factory 0 - -00
-Z Indian/Chagos 4:49:40 - LMT 1907
-5 - %z 1996
-6 - %z
-Z Indian/Maldives 4:54 - LMT 1880
-4:54 - MMT 1960
-5 - %z
-Z Indian/Mauritius 3:50 - LMT 1907
-4 MU %z
-Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
--11:26:56 - LMT 1911
--11:30 - %z 1950
--11 WS %z 2011 D 29 24
-13 WS %z
-Z Pacific/Auckland 11:39:4 - LMT 1868 N 2
-11:30 NZ NZ%sT 1946
-12 NZ NZ%sT
-Z Pacific/Bougainville 10:22:16 - LMT 1880
-9:48:32 - PMMT 1895
-10 - %z 1942 Jul
-9 - %z 1945 Au 21
-10 - %z 2014 D 28 2
-11 - %z
-Z Pacific/Chatham 12:13:48 - LMT 1868 N 2
-12:15 - %z 1946
-12:45 k %z
-Z Pacific/Easter -7:17:28 - LMT 1890
--7:17:28 - EMT 1932 S
--7 x %z 1982 Mar 14 3u
--6 x %z
-Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
-11 VU %z
-Z Pacific/Fakaofo -11:24:56 - LMT 1901
--11 - %z 2011 D 30
-13 - %z
-Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
-12 FJ %z
-Z Pacific/Galapagos -5:58:24 - LMT 1931
--5 - %z 1986
--6 EC %z
-Z Pacific/Gambier -8:59:48 - LMT 1912 O
--9 - %z
-Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
-11 - %z
-Z Pacific/Guam -14:21 - LMT 1844 D 31
-9:39 - LMT 1901
-10 - GST 1941 D 10
-9 - %z 1944 Jul 31
-10 Gu G%sT 2000 D 23
-10 - ChST
-Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
--10:30 - HST 1933 Ap 30 2
--10:30 1 HDT 1933 May 21 12
--10:30 u H%sT 1947 Jun 8 2
--10 - HST
-Z Pacific/Kanton 0 - -00 1937 Au 31
--12 - %z 1979 O
--11 - %z 1994 D 31
-13 - %z
-Z Pacific/Kiritimati -10:29:20 - LMT 1901
--10:40 - %z 1979 O
--10 - %z 1994 D 31
-14 - %z
-Z Pacific/Kosrae -13:8:4 - LMT 1844 D 31
-10:51:56 - LMT 1901
-11 - %z 1914 O
-9 - %z 1919 F
-11 - %z 1937
-10 - %z 1941 Ap
-9 - %z 1945 Au
-11 - %z 1969 O
-12 - %z 1999
-11 - %z
-Z Pacific/Kwajalein 11:9:20 - LMT 1901
-11 - %z 1937
-10 - %z 1941 Ap
-9 - %z 1944 F 6
-11 - %z 1969 O
--12 - %z 1993 Au 20 24
-12 - %z
-Z Pacific/Marquesas -9:18 - LMT 1912 O
--9:30 - %z
-Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
-11:30 - %z 1942 Au 29
-9 - %z 1945 S 8
-11:30 - %z 1979 F 10 2
-12 - %z
-Z Pacific/Niue -11:19:40 - LMT 1952 O 16
--11:20 - %z 1964 Jul
--11 - %z
-Z Pacific/Norfolk 11:11:52 - LMT 1901
-11:12 - %z 1951
-11:30 - %z 1974 O 27 2s
-11:30 1 %z 1975 Mar 2 2s
-11:30 - %z 2015 O 4 2s
-11 - %z 2019 Jul
-11 AN %z
-Z Pacific/Noumea 11:5:48 - LMT 1912 Ja 13
-11 NC %z
-Z Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
--11:22:48 - LMT 1911
--11 - SST
-Z Pacific/Palau -15:2:4 - LMT 1844 D 31
-8:57:56 - LMT 1901
-9 - %z
-Z Pacific/Pitcairn -8:40:20 - LMT 1901
--8:30 - %z 1998 Ap 27
--8 - %z
-Z Pacific/Port_Moresby 9:48:40 - LMT 1880
-9:48:32 - PMMT 1895
-10 - %z
-Z Pacific/Rarotonga 13:20:56 - LMT 1899 D 26
--10:39:4 - LMT 1952 O 16
--10:30 - %z 1978 N 12
--10 CK %z
-Z Pacific/Tahiti -9:58:16 - LMT 1912 O
--10 - %z
-Z Pacific/Tarawa 11:32:4 - LMT 1901
-12 - %z
-Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
-12:20 - %z 1961
-13 - %z 1999
-13 TO %z
-L Etc/GMT GMT
-L Australia/Sydney Australia/ACT
-L Australia/Lord_Howe Australia/LHI
-L Australia/Sydney Australia/NSW
-L Australia/Darwin Australia/North
-L Australia/Brisbane Australia/Queensland
-L Australia/Adelaide Australia/South
-L Australia/Hobart Australia/Tasmania
-L Australia/Melbourne Australia/Victoria
-L Australia/Perth Australia/West
-L Australia/Broken_Hill Australia/Yancowinna
-L America/Rio_Branco Brazil/Acre
-L America/Noronha Brazil/DeNoronha
-L America/Sao_Paulo Brazil/East
-L America/Manaus Brazil/West
-L Europe/Brussels CET
-L America/Chicago CST6CDT
-L America/Halifax Canada/Atlantic
-L America/Winnipeg Canada/Central
-L America/Toronto Canada/Eastern
-L America/Edmonton Canada/Mountain
-L America/St_Johns Canada/Newfoundland
-L America/Vancouver Canada/Pacific
-L America/Regina Canada/Saskatchewan
-L America/Whitehorse Canada/Yukon
-L America/Santiago Chile/Continental
-L Pacific/Easter Chile/EasterIsland
-L America/Havana Cuba
-L Europe/Athens EET
-L America/Panama EST
-L America/New_York EST5EDT
-L Africa/Cairo Egypt
-L Europe/Dublin Eire
-L Etc/GMT Etc/GMT+0
-L Etc/GMT Etc/GMT-0
-L Etc/GMT Etc/GMT0
-L Etc/GMT Etc/Greenwich
-L Etc/UTC Etc/UCT
-L Etc/UTC Etc/Universal
-L Etc/UTC Etc/Zulu
-L Europe/London GB
-L Europe/London GB-Eire
-L Etc/GMT GMT+0
-L Etc/GMT GMT-0
-L Etc/GMT GMT0
-L Etc/GMT Greenwich
-L Asia/Hong_Kong Hongkong
-L Africa/Abidjan Iceland
-L Asia/Tehran Iran
-L Asia/Jerusalem Israel
-L America/Jamaica Jamaica
-L Asia/Tokyo Japan
-L Pacific/Kwajalein Kwajalein
-L Africa/Tripoli Libya
-L Europe/Brussels MET
-L America/Phoenix MST
-L America/Denver MST7MDT
-L America/Tijuana Mexico/BajaNorte
-L America/Mazatlan Mexico/BajaSur
-L America/Mexico_City Mexico/General
-L Pacific/Auckland NZ
-L Pacific/Chatham NZ-CHAT
-L America/Denver Navajo
-L Asia/Shanghai PRC
-L Europe/Warsaw Poland
-L Europe/Lisbon Portugal
-L Asia/Taipei ROC
-L Asia/Seoul ROK
-L Asia/Singapore Singapore
-L Europe/Istanbul Turkey
-L Etc/UTC UCT
-L America/Anchorage US/Alaska
-L America/Adak US/Aleutian
-L America/Phoenix US/Arizona
-L America/Chicago US/Central
-L America/Indiana/Indianapolis US/East-Indiana
-L America/New_York US/Eastern
-L Pacific/Honolulu US/Hawaii
-L America/Indiana/Knox US/Indiana-Starke
-L America/Detroit US/Michigan
-L America/Denver US/Mountain
-L America/Los_Angeles US/Pacific
-L Pacific/Pago_Pago US/Samoa
-L Etc/UTC UTC
-L Etc/UTC Universal
-L Europe/Moscow W-SU
-L Etc/UTC Zulu
-L America/Argentina/Buenos_Aires America/Buenos_Aires
-L America/Argentina/Catamarca America/Catamarca
-L America/Argentina/Cordoba America/Cordoba
-L America/Indiana/Indianapolis America/Indianapolis
-L America/Argentina/Jujuy America/Jujuy
-L America/Indiana/Knox America/Knox_IN
-L America/Kentucky/Louisville America/Louisville
-L America/Argentina/Mendoza America/Mendoza
-L America/Puerto_Rico America/Virgin
-L Pacific/Pago_Pago Pacific/Samoa
-L Africa/Abidjan Africa/Accra
-L Africa/Nairobi Africa/Addis_Ababa
-L Africa/Nairobi Africa/Asmara
-L Africa/Abidjan Africa/Bamako
-L Africa/Lagos Africa/Bangui
-L Africa/Abidjan Africa/Banjul
-L Africa/Maputo Africa/Blantyre
-L Africa/Lagos Africa/Brazzaville
-L Africa/Maputo Africa/Bujumbura
-L Africa/Abidjan Africa/Conakry
-L Africa/Abidjan Africa/Dakar
-L Africa/Nairobi Africa/Dar_es_Salaam
-L Africa/Nairobi Africa/Djibouti
-L Africa/Lagos Africa/Douala
-L Africa/Abidjan Africa/Freetown
-L Africa/Maputo Africa/Gaborone
-L Africa/Maputo Africa/Harare
-L Africa/Nairobi Africa/Kampala
-L Africa/Maputo Africa/Kigali
-L Africa/Lagos Africa/Kinshasa
-L Africa/Lagos Africa/Libreville
-L Africa/Abidjan Africa/Lome
-L Africa/Lagos Africa/Luanda
-L Africa/Maputo Africa/Lubumbashi
-L Africa/Maputo Africa/Lusaka
-L Africa/Lagos Africa/Malabo
-L Africa/Johannesburg Africa/Maseru
-L Africa/Johannesburg Africa/Mbabane
-L Africa/Nairobi Africa/Mogadishu
-L Africa/Lagos Africa/Niamey
-L Africa/Abidjan Africa/Nouakchott
-L Africa/Abidjan Africa/Ouagadougou
-L Africa/Lagos Africa/Porto-Novo
-L America/Puerto_Rico America/Anguilla
-L America/Puerto_Rico America/Antigua
-L America/Puerto_Rico America/Aruba
-L America/Panama America/Atikokan
-L America/Puerto_Rico America/Blanc-Sablon
-L America/Panama America/Cayman
-L America/Phoenix America/Creston
-L America/Puerto_Rico America/Curacao
-L America/Puerto_Rico America/Dominica
-L America/Puerto_Rico America/Grenada
-L America/Puerto_Rico America/Guadeloupe
-L America/Puerto_Rico America/Kralendijk
-L America/Puerto_Rico America/Lower_Princes
-L America/Puerto_Rico America/Marigot
-L America/Puerto_Rico America/Montserrat
-L America/Toronto America/Nassau
-L America/Puerto_Rico America/Port_of_Spain
-L America/Puerto_Rico America/St_Barthelemy
-L America/Puerto_Rico America/St_Kitts
-L America/Puerto_Rico America/St_Lucia
-L America/Puerto_Rico America/St_Thomas
-L America/Puerto_Rico America/St_Vincent
-L America/Puerto_Rico America/Tortola
-L Pacific/Port_Moresby Antarctica/DumontDUrville
-L Pacific/Auckland Antarctica/McMurdo
-L Asia/Riyadh Antarctica/Syowa
-L Europe/Berlin Arctic/Longyearbyen
-L Asia/Riyadh Asia/Aden
-L Asia/Qatar Asia/Bahrain
-L Asia/Kuching Asia/Brunei
-L Asia/Singapore Asia/Kuala_Lumpur
-L Asia/Riyadh Asia/Kuwait
-L Asia/Dubai Asia/Muscat
-L Asia/Bangkok Asia/Phnom_Penh
-L Asia/Bangkok Asia/Vientiane
-L Africa/Abidjan Atlantic/Reykjavik
-L Africa/Abidjan Atlantic/St_Helena
-L Europe/Brussels Europe/Amsterdam
-L Europe/Prague Europe/Bratislava
-L Europe/Zurich Europe/Busingen
-L Europe/Berlin Europe/Copenhagen
-L Europe/London Europe/Guernsey
-L Europe/London Europe/Isle_of_Man
-L Europe/London Europe/Jersey
-L Europe/Belgrade Europe/Ljubljana
-L Europe/Brussels Europe/Luxembourg
-L Europe/Helsinki Europe/Mariehamn
-L Europe/Paris Europe/Monaco
-L Europe/Berlin Europe/Oslo
-L Europe/Belgrade Europe/Podgorica
-L Europe/Rome Europe/San_Marino
-L Europe/Belgrade Europe/Sarajevo
-L Europe/Belgrade Europe/Skopje
-L Europe/Berlin Europe/Stockholm
-L Europe/Zurich Europe/Vaduz
-L Europe/Rome Europe/Vatican
-L Europe/Belgrade Europe/Zagreb
-L Africa/Nairobi Indian/Antananarivo
-L Asia/Bangkok Indian/Christmas
-L Asia/Yangon Indian/Cocos
-L Africa/Nairobi Indian/Comoro
-L Indian/Maldives Indian/Kerguelen
-L Asia/Dubai Indian/Mahe
-L Africa/Nairobi Indian/Mayotte
-L Asia/Dubai Indian/Reunion
-L Pacific/Port_Moresby Pacific/Chuuk
-L Pacific/Tarawa Pacific/Funafuti
-L Pacific/Tarawa Pacific/Majuro
-L Pacific/Pago_Pago Pacific/Midway
-L Pacific/Guadalcanal Pacific/Pohnpei
-L Pacific/Guam Pacific/Saipan
-L Pacific/Tarawa Pacific/Wake
-L Pacific/Tarawa Pacific/Wallis
-L Africa/Abidjan Africa/Timbuktu
-L America/Argentina/Catamarca America/Argentina/ComodRivadavia
-L America/Adak America/Atka
-L America/Panama America/Coral_Harbour
-L America/Tijuana America/Ensenada
-L America/Indiana/Indianapolis America/Fort_Wayne
-L America/Toronto America/Montreal
-L America/Toronto America/Nipigon
-L America/Iqaluit America/Pangnirtung
-L America/Rio_Branco America/Porto_Acre
-L America/Winnipeg America/Rainy_River
-L America/Argentina/Cordoba America/Rosario
-L America/Tijuana America/Santa_Isabel
-L America/Denver America/Shiprock
-L America/Toronto America/Thunder_Bay
-L America/Edmonton America/Yellowknife
-L Pacific/Auckland Antarctica/South_Pole
-L Asia/Ulaanbaatar Asia/Choibalsan
-L Asia/Shanghai Asia/Chongqing
-L Asia/Shanghai Asia/Harbin
-L Asia/Urumqi Asia/Kashgar
-L Asia/Jerusalem Asia/Tel_Aviv
-L Europe/Berlin Atlantic/Jan_Mayen
-L Australia/Sydney Australia/Canberra
-L Australia/Hobart Australia/Currie
-L Europe/London Europe/Belfast
-L Europe/Chisinau Europe/Tiraspol
-L Europe/Kyiv Europe/Uzhgorod
-L Europe/Kyiv Europe/Zaporozhye
-L Pacific/Kanton Pacific/Enderbury
-L Pacific/Honolulu Pacific/Johnston
-L Pacific/Port_Moresby Pacific/Yap
-L Europe/Lisbon WET
-L Africa/Nairobi Africa/Asmera
-L America/Nuuk America/Godthab
-L Asia/Ashgabat Asia/Ashkhabad
-L Asia/Kolkata Asia/Calcutta
-L Asia/Shanghai Asia/Chungking
-L Asia/Dhaka Asia/Dacca
-L Europe/Istanbul Asia/Istanbul
-L Asia/Kathmandu Asia/Katmandu
-L Asia/Macau Asia/Macao
-L Asia/Yangon Asia/Rangoon
-L Asia/Ho_Chi_Minh Asia/Saigon
-L Asia/Thimphu Asia/Thimbu
-L Asia/Makassar Asia/Ujung_Pandang
-L Asia/Ulaanbaatar Asia/Ulan_Bator
-L Atlantic/Faroe Atlantic/Faeroe
-L Europe/Kyiv Europe/Kiev
-L Asia/Nicosia Europe/Nicosia
-L Pacific/Honolulu HST
-L America/Los_Angeles PST8PDT
-L Pacific/Guadalcanal Pacific/Ponape
-L Pacific/Port_Moresby Pacific/Truk
diff --git a/libs/pytz/zoneinfo/zone.tab b/libs/pytz/zoneinfo/zone.tab
deleted file mode 100644
index bfc0b59330..0000000000
--- a/libs/pytz/zoneinfo/zone.tab
+++ /dev/null
@@ -1,447 +0,0 @@
-# tzdb timezone descriptions (deprecated version)
-#
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-#
-# From Paul Eggert (2021-09-20):
-# This file is intended as a backward-compatibility aid for older programs.
-# New programs should use zone1970.tab.  This file is like zone1970.tab (see
-# zone1970.tab's comments), but with the following additional restrictions:
-#
-# 1.  This file contains only ASCII characters.
-# 2.  The first data column contains exactly one country code.
-#
-# Because of (2), each row stands for an area that is the intersection
-# of a region identified by a country code and of a timezone where civil
-# clocks have agreed since 1970; this is a narrower definition than
-# that of zone1970.tab.
-#
-# Unlike zone1970.tab, a row's third column can be a Link from
-# 'backward' instead of a Zone.
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#country-
-#code	coordinates	TZ			comments
-AD	+4230+00131	Europe/Andorra
-AE	+2518+05518	Asia/Dubai
-AF	+3431+06912	Asia/Kabul
-AG	+1703-06148	America/Antigua
-AI	+1812-06304	America/Anguilla
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-690022+0393524	Antarctica/Syowa	Syowa
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS	-1416-17042	Pacific/Pago_Pago
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
-AW	+1230-06958	America/Aruba
-AX	+6006+01957	Europe/Mariehamn
-AZ	+4023+04951	Asia/Baku
-BA	+4352+01825	Europe/Sarajevo
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE	+5050+00420	Europe/Brussels
-BF	+1222-00131	Africa/Ouagadougou
-BG	+4241+02319	Europe/Sofia
-BH	+2623+05035	Asia/Bahrain
-BI	-0323+02922	Africa/Bujumbura
-BJ	+0629+00237	Africa/Porto-Novo
-BL	+1753-06251	America/St_Barthelemy
-BM	+3217-06446	Atlantic/Bermuda
-BN	+0456+11455	Asia/Brunei
-BO	-1630-06809	America/La_Paz
-BQ	+120903-0681636	America/Kralendijk
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Para (east), Amapa
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Para (west)
-BR	-0846-06354	America/Porto_Velho	Rondonia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
-BR	-0958-06748	America/Rio_Branco	Acre
-BS	+2505-07721	America/Nassau
-BT	+2728+08939	Asia/Thimphu
-BW	-2439+02555	Africa/Gaborone
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
-CA	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)
-CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan), NU (Coral H)
-CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+4906-11631	America/Creston	MST - BC (Creston)
-CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
-CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
-CF	+0422+01835	Africa/Bangui
-CG	-0416+01517	Africa/Brazzaville
-CH	+4723+00832	Europe/Zurich
-CI	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
-CL	-2709-10926	Pacific/Easter	Easter Island
-CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Asia/Urumqi	Xinjiang Time
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CU	+2308-08222	America/Havana
-CV	+1455-02331	Atlantic/Cape_Verde
-CW	+1211-06900	America/Curacao
-CX	-1025+10543	Indian/Christmas
-CY	+3510+03322	Asia/Nicosia	most of Cyprus
-CY	+3507+03357	Asia/Famagusta	Northern Cyprus
-CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin	most of Germany
-DE	+4742+00841	Europe/Busingen	Busingen
-DJ	+1136+04309	Africa/Djibouti
-DK	+5540+01235	Europe/Copenhagen
-DM	+1518-06124	America/Dominica
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
-EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ER	+1520+03853	Africa/Asmara
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-ET	+0902+03842	Africa/Addis_Ababa
-FI	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faroe
-FR	+4852+00220	Europe/Paris
-GA	+0023+00927	Africa/Libreville
-GB	+513030-0000731	Europe/London
-GD	+1203-06145	America/Grenada
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GG	+492717-0023210	Europe/Guernsey
-GH	+0533-00013	Africa/Accra
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	most of Greenland
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
-GM	+1328-01639	Africa/Banjul
-GN	+0931-01343	Africa/Conakry
-GP	+1614-06132	America/Guadeloupe
-GQ	+0345+00847	Africa/Malabo
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HR	+4548+01558	Europe/Zagreb
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+314650+0351326	Asia/Jerusalem
-IM	+5409-00428	Europe/Isle_of_Man
-IN	+2232+08822	Asia/Kolkata
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IS	+6409-02151	Atlantic/Reykjavik
-IT	+4154+01229	Europe/Rome
-JE	+491101-0020624	Europe/Jersey
-JM	+175805-0764736	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KH	+1133+10455	Asia/Phnom_Penh
-KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0247-17143	Pacific/Kanton	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KM	-1141+04316	Indian/Comoro
-KN	+1718-06243	America/St_Kitts
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KW	+2920+04759	Asia/Kuwait
-KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Mangghystau/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyrau/Atirau/Gur'yev
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LA	+1758+10236	Asia/Vientiane
-LB	+3353+03530	Asia/Beirut
-LC	+1401-06100	America/St_Lucia
-LI	+4709+00931	Europe/Vaduz
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LS	-2928+02730	Africa/Maseru
-LT	+5441+02519	Europe/Vilnius
-LU	+4936+00609	Europe/Luxembourg
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
-ME	+4226+01916	Europe/Podgorica
-MF	+1804-06305	America/Marigot
-MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most of Marshall Islands
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MK	+4159+02126	Europe/Skopje
-ML	+1239-00800	Africa/Bamako
-MM	+1647+09610	Asia/Yangon
-MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
-MN	+4801+09139	Asia/Hovd	Bayan-Olgii, Hovd, Uvs
-MO	+221150+1133230	Asia/Macau
-MP	+1512+14545	Pacific/Saipan
-MQ	+1436-06105	America/Martinique
-MR	+1806-01557	Africa/Nouakchott
-MS	+1643-06213	America/Montserrat
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Indian/Maldives
-MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Mexico
-MX	+2105-08646	America/Cancun	Quintana Roo
-MX	+2058-08937	America/Merida	Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Coahuila, Nuevo Leon, Tamaulipas (US border)
-MX	+2838-10605	America/Chihuahua	Chihuahua (most areas)
-MX	+3144-10629	America/Ciudad_Juarez	Chihuahua (US border - west)
-MX	+2934-10425	America/Ojinaga	Chihuahua (US border - east)
-MX	+2313-10625	America/Mazatlan	Baja California Sur, Nayarit (most areas), Sinaloa
-MX	+2048-10515	America/Bahia_Banderas	Bahia de Banderas
-MX	+2904-11058	America/Hermosillo	Sonora
-MX	+3232-11701	America/Tijuana	Baja California
-MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
-MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ	-2558+03235	Africa/Maputo
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16627	Pacific/Noumea
-NE	+1331+00207	Africa/Niamey
-NF	-2903+16758	Pacific/Norfolk
-NG	+0627+00324	Africa/Lagos
-NI	+1209-08617	America/Managua
-NL	+5222+00454	Europe/Amsterdam
-NO	+5955+01045	Europe/Oslo
-NP	+2743+08519	Asia/Kathmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901-16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most of New Zealand
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-OM	+2336+05835	Asia/Muscat
-PA	+0858-07932	America/Panama
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	most of Papua New Guinea
-PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-PL	+5215+02100	Europe/Warsaw
-PM	+4703-05620	America/Miquelon
-PN	-2504-13005	Pacific/Pitcairn
-PR	+182806-0660622	America/Puerto_Rico
-PS	+3130+03428	Asia/Gaza	Gaza Strip
-PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA	+2517+05132	Asia/Qatar
-RE	-2052+05528	Indian/Reunion
-RO	+4426+02606	Europe/Bucharest
-RS	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# The obsolescent zone.tab format cannot represent Europe/Simferopol well.
-# Put it in RU section and list as UA.  See "territorial claims" above.
-# Programs should use zone1970.tab instead; see above.
-UA	+4457+03406	Europe/Simferopol	Crimea
-RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+04 - Novosibirsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-RW	-0157+03004	Africa/Kigali
-SA	+2438+04643	Asia/Riyadh
-SB	-0932+16012	Pacific/Guadalcanal
-SC	-0440+05528	Indian/Mahe
-SD	+1536+03232	Africa/Khartoum
-SE	+5920+01803	Europe/Stockholm
-SG	+0117+10351	Asia/Singapore
-SH	-1555-00542	Atlantic/St_Helena
-SI	+4603+01431	Europe/Ljubljana
-SJ	+7800+01600	Arctic/Longyearbyen
-SK	+4809+01707	Europe/Bratislava
-SL	+0830-01315	Africa/Freetown
-SM	+4355+01228	Europe/San_Marino
-SN	+1440-01726	Africa/Dakar
-SO	+0204+04522	Africa/Mogadishu
-SR	+0550-05510	America/Paramaribo
-SS	+0451+03137	Africa/Juba
-ST	+0020+00644	Africa/Sao_Tome
-SV	+1342-08912	America/El_Salvador
-SX	+180305-0630250	America/Lower_Princes
-SY	+3330+03618	Asia/Damascus
-SZ	-2618+03106	Africa/Mbabane
-TC	+2128-07108	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Indian/Kerguelen
-TG	+0608+00113	Africa/Lome
-TH	+1345+10031	Asia/Bangkok
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-210800-1751200	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TT	+1039-06131	America/Port_of_Spain
-TV	-0831+17913	Pacific/Funafuti
-TW	+2503+12130	Asia/Taipei
-TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kyiv	most of Ukraine
-UG	+0019+03225	Africa/Kampala
-UM	+2813-17722	Pacific/Midway	Midway Islands
-UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)
-US	+332654-1120424	America/Phoenix	MST - AZ (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Alaska - western Aleutians
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-345433-0561245	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
-VA	+415408+0122711	Europe/Vatican
-VC	+1309-06114	America/St_Vincent
-VE	+1030-06656	America/Caracas
-VG	+1827-06437	America/Tortola
-VI	+1821-06456	America/St_Thomas
-VN	+1045+10640	Asia/Ho_Chi_Minh
-VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Pacific/Wallis
-WS	-1350-17144	Pacific/Apia
-YE	+1245+04512	Asia/Aden
-YT	-1247+04514	Indian/Mayotte
-ZA	-2615+02800	Africa/Johannesburg
-ZM	-1525+02817	Africa/Lusaka
-ZW	-1750+03103	Africa/Harare
diff --git a/libs/pytz/zoneinfo/zone1970.tab b/libs/pytz/zoneinfo/zone1970.tab
deleted file mode 100644
index 7726f39a09..0000000000
--- a/libs/pytz/zoneinfo/zone1970.tab
+++ /dev/null
@@ -1,374 +0,0 @@
-# tzdb timezone descriptions
-#
-# This file is in the public domain.
-#
-# From Paul Eggert (2018-06-27):
-# This file contains a table where each row stands for a timezone where
-# civil timestamps have agreed since 1970.  Columns are separated by
-# a single tab.  Lines beginning with '#' are comments.  All text uses
-# UTF-8 encoding.  The columns of the table are as follows:
-#
-# 1.  The countries that overlap the timezone, as a comma-separated list
-#     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
-# 2.  Latitude and longitude of the timezone's principal location
-#     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either ยฑDDMMยฑDDDMM or ยฑDDMMSSยฑDDDMMSS,
-#     first latitude (+ is north), then longitude (+ is east).
-# 3.  Timezone name used in value of TZ environment variable.
-#     Please see the theory.html file for how these names are chosen.
-#     If multiple timezones overlap a country, each has a row in the
-#     table, with each column 1 containing the country code.
-# 4.  Comments; present if and only if countries have multiple timezones,
-#     and useful only for those countries.  For example, the comments
-#     for the row with countries CH,DE,LI and name Europe/Zurich
-#     are useful only for DE, since CH and LI have no other timezones.
-#
-# If a timezone covers multiple countries, the most-populous city is used,
-# and that country is listed first in column 1; any other countries
-# are listed alphabetically by country code.  The table is sorted
-# first by country code, then (if possible) by an order within the
-# country that (1) makes some geographical sense, and (2) puts the
-# most populous timezones first, where that does not contradict (1).
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#country-
-#codes	coordinates	TZ	comments
-AD	+4230+00131	Europe/Andorra
-AE,OM,RE,SC,TF	+2518+05518	Asia/Dubai	Crozet
-AF	+3431+06912	Asia/Kabul
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most areas: CB, CC, CN, ER, FM, MN, SE, SF
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-2649-06513	America/Argentina/Tucuman	Tucumรกn (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS,UM	-1416-17042	Pacific/Pago_Pago	Midway
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
-AZ	+4023+04951	Asia/Baku
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE,LU,NL	+5050+00420	Europe/Brussels
-BG	+4241+02319	Europe/Sofia
-BM	+3217-06446	Atlantic/Bermuda
-BO	-1630-06809	America/La_Paz
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Parรก (east), Amapรก
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Parรก (west)
-BR	-0846-06354	America/Porto_Velho	Rondรดnia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
-BR	-0958-06748	America/Rio_Branco	Acre
-BT	+2728+08939	Asia/Thimphu
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA,BS	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)
-CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CH,DE,LI	+4723+00832	Europe/Zurich	Bรผsingen
-CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
-CL	-2709-10926	Pacific/Easter	Easter Island
-CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Asia/Urumqi	Xinjiang Time
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CU	+2308-08222	America/Havana
-CV	+1455-02331	Atlantic/Cape_Verde
-CY	+3510+03322	Asia/Nicosia	most of Cyprus
-CY	+3507+03357	Asia/Famagusta	Northern Cyprus
-CZ,SK	+5005+01426	Europe/Prague
-DE,DK,NO,SE,SJ	+5230+01322	Europe/Berlin	most of Germany
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
-EC	-0054-08936	Pacific/Galapagos	Galรกpagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-FI,AX	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faroe
-FR,MC	+4852+00220	Europe/Paris
-GB,GG,IM,JE	+513030-0000731	Europe/London
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	most of Greenland
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU,MP	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+314650+0351326	Asia/Jerusalem
-IN	+2232+08822	Asia/Kolkata
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IT,SM,VA	+4154+01229	Europe/Rome
-JM	+175805-0764736	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KI,MH,TV,UM,WF	+0125+17300	Pacific/Tarawa	Gilberts, Marshalls, Wake
-KI	-0247-17143	Pacific/Kanton	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
-KZ	+5017+05710	Asia/Aqtobe	Aqtรถbe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Mangghystaลซ/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyraลซ/Atirau/Gur'yev
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LB	+3353+03530	Asia/Beirut
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LT	+5441+02519	Europe/Vilnius
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MD	+4700+02850	Europe/Chisinau
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MM,CC	+1647+09610	Asia/Yangon
-MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
-MN	+4801+09139	Asia/Hovd	Bayan-ร–lgii, Hovd, Uvs
-MO	+221150+1133230	Asia/Macau
-MQ	+1436-06105	America/Martinique
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV,TF	+0410+07330	Indian/Maldives	Kerguelen, St Paul I, Amsterdam I
-MX	+1924-09909	America/Mexico_City	Central Mexico
-MX	+2105-08646	America/Cancun	Quintana Roo
-MX	+2058-08937	America/Merida	Campeche, Yucatรกn
-MX	+2540-10019	America/Monterrey	Durango; Coahuila, Nuevo Leรณn, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Coahuila, Nuevo Leรณn, Tamaulipas (US border)
-MX	+2838-10605	America/Chihuahua	Chihuahua (most areas)
-MX	+3144-10629	America/Ciudad_Juarez	Chihuahua (US border - west)
-MX	+2934-10425	America/Ojinaga	Chihuahua (US border - east)
-MX	+2313-10625	America/Mazatlan	Baja California Sur, Nayarit (most areas), Sinaloa
-MX	+2048-10515	America/Bahia_Banderas	Bahรญa de Banderas
-MX	+2904-11058	America/Hermosillo	Sonora
-MX	+3232-11701	America/Tijuana	Baja California
-MY,BN	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16627	Pacific/Noumea
-NF	-2903+16758	Pacific/Norfolk
-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
-NI	+1209-08617	America/Managua
-NP	+2743+08519	Asia/Kathmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901-16955	Pacific/Niue
-NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-PA,CA,KY	+0858-07932	America/Panama	EST - ON (Atikokan), NU (Coral H)
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG,AQ,FM	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
-PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-PL	+5215+02100	Europe/Warsaw
-PM	+4703-05620	America/Miquelon
-PN	-2504-13005	Pacific/Pitcairn
-PR,AG,CA,AI,AW,BL,BQ,CW,DM,GD,GP,KN,LC,MF,MS,SX,TT,VC,VG,VI	+182806-0660622	America/Puerto_Rico	AST - QC (Lower North Shore)
-PS	+3130+03428	Asia/Gaza	Gaza Strip
-PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA,BH	+2517+05132	Asia/Qatar
-RO	+4426+02606	Europe/Bucharest
-RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# Mention RU and UA alphabetically.  See "territorial claims" above.
-RU,UA	+4457+03406	Europe/Simferopol	Crimea
-RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+04 - Novosibirsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-SA,AQ,KW,YE	+2438+04643	Asia/Riyadh	Syowa
-SB,FM	-0932+16012	Pacific/Guadalcanal	Pohnpei
-SD	+1536+03232	Africa/Khartoum
-SG,MY	+0117+10351	Asia/Singapore	peninsular Malaysia
-SR	+0550-05510	America/Paramaribo
-SS	+0451+03137	Africa/Juba
-ST	+0020+00644	Africa/Sao_Tome
-SV	+1342-08912	America/El_Salvador
-SY	+3330+03618	Asia/Damascus
-TC	+2128-07108	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TH,CX,KH,LA,VN	+1345+10031	Asia/Bangkok	north Vietnam
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-210800-1751200	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TW	+2503+12130	Asia/Taipei
-UA	+5026+03031	Europe/Kyiv	most of Ukraine
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)
-US,CA	+332654-1120424	America/Phoenix	MST - AZ (most areas), Creston BC
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Alaska - western Aleutians
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-345433-0561245	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
-VE	+1030-06656	America/Caracas
-VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
-VU	-1740+16825	Pacific/Efate
-WS	-1350-17144	Pacific/Apia
-ZA,LS,SZ	-2615+02800	Africa/Johannesburg
-#
-# The next section contains experimental tab-separated comments for
-# use by user agents like tzselect that identify continents and oceans.
-#
-# For example, the comment "#@AQ<tab>Antarctica/" means the country code
-# AQ is in the continent Antarctica regardless of the Zone name,
-# so Pacific/Auckland should be listed under Antarctica as well as
-# under the Pacific because its line's country codes include AQ.
-#
-# If more than one country code is affected each is listed separated
-# by commas, e.g., #@IS,SH<tab>Atlantic/".  If a country code is in
-# more than one continent or ocean, each is listed separated by
-# commas, e.g., the second column of "#@CY,TR<tab>Asia/,Europe/".
-#
-# These experimental comments are present only for country codes where
-# the continent or ocean is not already obvious from the Zone name.
-# For example, there is no such comment for RU since it already
-# corresponds to Zone names starting with both "Europe/" and "Asia/".
-#
-#@AQ	Antarctica/
-#@IS,SH	Atlantic/
-#@CY,TR	Asia/,Europe/
-#@SJ	Arctic/
-#@CC,CX,KM,MG,YT	Indian/
diff --git a/libs/pytz/zoneinfo/zonenow.tab b/libs/pytz/zoneinfo/zonenow.tab
deleted file mode 100644
index 01f536b3ba..0000000000
--- a/libs/pytz/zoneinfo/zonenow.tab
+++ /dev/null
@@ -1,299 +0,0 @@
-# tzdb timezone descriptions, for users who do not care about old timestamps
-#
-# This file is in the public domain.
-#
-# From Paul Eggert (2023-12-18):
-# This file contains a table where each row stands for a timezone
-# where civil timestamps are predicted to agree from now on.
-# This file is like zone1970.tab (see zone1970.tab's comments),
-# but with the following changes:
-#
-# 1.  Each timezone corresponds to a set of clocks that are planned
-#     to agree from now on.  This is a larger set of clocks than in
-#     zone1970.tab, where each timezone's clocks must agree from 1970 on.
-# 2.  The first column is irrelevant and ignored.
-# 3.  The table is sorted in a different way:
-#     first by standard time UTC offset;
-#     then, if DST is used, by daylight saving UTC offset;
-#     then by time zone abbreviation.
-# 4.  Every timezone has a nonempty comments column, with wording
-#     distinguishing the timezone only from other timezones with the
-#     same UTC offset at some point during the year.
-#
-# The format of this table is experimental, and may change in future versions.
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#XX	coordinates	TZ	comments
-#
-# -11 - SST
-XX	-1416-17042	Pacific/Pago_Pago	Midway; Samoa ("SST")
-#
-# -11
-XX	-1901-16955	Pacific/Niue	Niue
-#
-# -10 - HST
-XX	+211825-1575130	Pacific/Honolulu	Hawaii ("HST")
-#
-# -10
-XX	-1732-14934	Pacific/Tahiti	Tahiti; Cook Islands
-#
-# -10/-09 - HST / HDT (North America DST)
-XX	+515248-1763929	America/Adak	western Aleutians in Alaska ("HST/HDT")
-#
-# -09:30
-XX	-0900-13930	Pacific/Marquesas	Marquesas
-#
-# -09
-XX	-2308-13457	Pacific/Gambier	Gambier
-#
-# -09/-08 - AKST/AKDT (North America DST)
-XX	+611305-1495401	America/Anchorage	most of Alaska ("AKST/AKDT")
-#
-# -08
-XX	-2504-13005	Pacific/Pitcairn	Pitcairn
-#
-# -08/-07 - PST/PDT (North America DST)
-XX	+340308-1181434	America/Los_Angeles	Pacific ("PST/PDT") - US & Canada; Mexico near US border
-#
-# -07 - MST
-XX	+332654-1120424	America/Phoenix	Mountain Standard ("MST") - Arizona; western Mexico; Yukon
-#
-# -07/-06 - MST/MDT (North America DST)
-XX	+394421-1045903	America/Denver	Mountain ("MST/MDT") - US & Canada; Mexico near US border
-#
-# -06
-XX	-0054-08936	Pacific/Galapagos	Galรกpagos
-#
-# -06 - CST
-XX	+1924-09909	America/Mexico_City	Central Standard ("CST") - Saskatchewan; central Mexico; Central America
-#
-# -06/-05 (Chile DST)
-XX	-2709-10926	Pacific/Easter	Easter Island
-#
-# -06/-05 - CST/CDT (North America DST)
-XX	+415100-0873900	America/Chicago	Central ("CST/CDT") - US & Canada; Mexico near US border
-#
-# -05
-XX	-1203-07703	America/Lima	eastern South America
-#
-# -05 - EST
-XX	+175805-0764736	America/Jamaica	Eastern Standard ("EST") - Caymans; Jamaica; eastern Mexico; Panama
-#
-# -05/-04 - CST/CDT (Cuba DST)
-XX	+2308-08222	America/Havana	Cuba
-#
-# -05/-04 - EST/EDT (North America DST)
-XX	+404251-0740023	America/New_York	Eastern ("EST/EDT") - US & Canada
-#
-# -04
-XX	+1030-06656	America/Caracas	western South America
-#
-# -04 - AST
-XX	+1828-06954	America/Santo_Domingo	Atlantic Standard ("AST") - eastern Caribbean
-#
-# -04/-03 (Chile DST)
-XX	-3327-07040	America/Santiago	most of Chile
-#
-# -04/-03 (Paraguay DST)
-XX	-2516-05740	America/Asuncion	Paraguay
-#
-# -04/-03 - AST/ADT (North America DST)
-XX	+4439-06336	America/Halifax	Atlantic ("AST/ADT") - Canada; Bermuda
-#
-# -03:30/-02:30 - NST/NDT (North America DST)
-XX	+4734-05243	America/St_Johns	Newfoundland ("NST/NDT")
-#
-# -03
-XX	-2332-04637	America/Sao_Paulo	eastern South America
-#
-# -03/-02 (North America DST)
-XX	+4703-05620	America/Miquelon	St Pierre & Miquelon
-#
-# -02
-XX	-0351-03225	America/Noronha	Fernando de Noronha; South Georgia
-#
-# -02/-01 (EU DST)
-XX	+6411-05144	America/Nuuk	most of Greenland
-#
-# -01
-XX	+1455-02331	Atlantic/Cape_Verde	Cape Verde
-#
-# -01/+00 (EU DST)
-XX	+3744-02540	Atlantic/Azores	Azores
-#
-# +00 - GMT
-XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland ("GMT")
-#
-# +00/+01 - GMT/BST (EU DST)
-XX	+513030-0000731	Europe/London	United Kingdom ("GMT/BST")
-#
-# +00/+01 - WET/WEST (EU DST)
-XX	+3843-00908	Europe/Lisbon	western Europe ("WET/WEST")
-#
-# +00/+02 - Troll DST
-XX	-720041+0023206	Antarctica/Troll	Troll Station in Antarctica
-#
-# +01 - CET
-XX	+3647+00303	Africa/Algiers	Algeria, Tunisia ("CET")
-#
-# +01 - WAT
-XX	+0627+00324	Africa/Lagos	western Africa ("WAT")
-#
-# +01/+00 - IST/GMT (EU DST in reverse)
-XX	+5320-00615	Europe/Dublin	Ireland ("IST/GMT")
-#
-# +01/+00 - (Morocco DST)
-XX	+3339-00735	Africa/Casablanca	Morocco
-#
-# +01/+02 - CET/CEST (EU DST)
-XX	+4852+00220	Europe/Paris	central Europe ("CET/CEST")
-#
-# +02 - CAT
-XX	-2558+03235	Africa/Maputo	central Africa ("CAT")
-#
-# +02 - EET
-XX	+3254+01311	Africa/Tripoli	Libya; Kaliningrad ("EET")
-#
-# +02 - SAST
-XX	-2615+02800	Africa/Johannesburg	southern Africa ("SAST")
-#
-# +02/+03 - EET/EEST (EU DST)
-XX	+3758+02343	Europe/Athens	eastern Europe ("EET/EEST")
-#
-# +02/+03 - EET/EEST (Egypt DST)
-XX	+3003+03115	Africa/Cairo	Egypt
-#
-# +02/+03 - EET/EEST (Lebanon DST)
-XX	+3353+03530	Asia/Beirut	Lebanon
-#
-# +02/+03 - EET/EEST (Moldova DST)
-XX	+4700+02850	Europe/Chisinau	Moldova
-#
-# +02/+03 - EET/EEST (Palestine DST)
-XX	+3130+03428	Asia/Gaza	Palestine
-#
-# +02/+03 - IST/IDT (Israel DST)
-XX	+314650+0351326	Asia/Jerusalem	Israel
-#
-# +03
-XX	+4101+02858	Europe/Istanbul	Near East; Belarus
-#
-# +03 - EAT
-XX	-0117+03649	Africa/Nairobi	eastern Africa ("EAT")
-#
-# +03 - MSK
-XX	+554521+0373704	Europe/Moscow	Moscow ("MSK")
-#
-# +03:30
-XX	+3540+05126	Asia/Tehran	Iran
-#
-# +04
-XX	+2518+05518	Asia/Dubai	Russia; Caucasus; Persian Gulf; Seychelles; Rรฉunion
-#
-# +04:30
-XX	+3431+06912	Asia/Kabul	Afghanistan
-#
-# +05
-XX	+4120+06918	Asia/Tashkent	Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
-#
-# +05 - PKT
-XX	+2452+06703	Asia/Karachi	Pakistan ("PKT")
-#
-# +05:30
-XX	+0656+07951	Asia/Colombo	Sri Lanka
-#
-# +05:30 - IST
-XX	+2232+08822	Asia/Kolkata	India ("IST")
-#
-# +05:45
-XX	+2743+08519	Asia/Kathmandu	Nepal
-#
-# +06
-XX	+2343+09025	Asia/Dhaka	Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos
-#
-# +06:30
-XX	+1647+09610	Asia/Yangon	Myanmar; Cocos
-#
-# +07
-XX	+1345+10031	Asia/Bangkok	Russia; Indochina; Christmas Island
-#
-# +07 - WIB
-XX	-0610+10648	Asia/Jakarta	Indonesia ("WIB")
-#
-# +08
-XX	+0117+10351	Asia/Singapore	Russia; Brunei; Malaysia; Singapore
-#
-# +08 - AWST
-XX	-3157+11551	Australia/Perth	Western Australia ("AWST")
-#
-# +08 - CST
-XX	+3114+12128	Asia/Shanghai	China ("CST")
-#
-# +08 - HKT
-XX	+2217+11409	Asia/Hong_Kong	Hong Kong ("HKT")
-#
-# +08 - PHT
-XX	+1435+12100	Asia/Manila	Philippines ("PHT")
-#
-# +08 - WITA
-XX	-0507+11924	Asia/Makassar	Indonesia ("WITA")
-#
-# +08:45
-XX	-3143+12852	Australia/Eucla	Eucla
-#
-# +09
-XX	+5203+11328	Asia/Chita	Russia; Palau; East Timor
-#
-# +09 - JST
-XX	+353916+1394441	Asia/Tokyo	Japan ("JST")
-#
-# +09 - KST
-XX	+3733+12658	Asia/Seoul	Korea ("KST")
-#
-# +09 - WIT
-XX	-0232+14042	Asia/Jayapura	Indonesia ("WIT")
-#
-# +09:30 - ACST
-XX	-1228+13050	Australia/Darwin	Northern Territory ("ACST")
-#
-# +09:30/+10:30 - ACST/ACDT (Australia DST)
-XX	-3455+13835	Australia/Adelaide	South Australia ("ACST/ACDT")
-#
-# +10
-XX	+4310+13156	Asia/Vladivostok	Russia; Yap; Chuuk; Papua New Guinea; Dumont d'Urville
-#
-# +10 - AEST
-XX	-2728+15302	Australia/Brisbane	Queensland ("AEST")
-#
-# +10 - ChST
-XX	+1328+14445	Pacific/Guam	Mariana Islands ("ChST")
-#
-# +10/+11 - AEST/AEDT (Australia DST)
-XX	-3352+15113	Australia/Sydney	southeast Australia ("AEST/AEDT")
-#
-# +10:30/+11
-XX	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-#
-# +11
-XX	-0613+15534	Pacific/Bougainville	Russia; Kosrae; Bougainville; Solomons
-#
-# +11/+12 (Australia DST)
-XX	-2903+16758	Pacific/Norfolk	Norfolk Island
-#
-# +12
-XX	+5301+15839	Asia/Kamchatka	Russia; Tuvalu; Fiji; etc.
-#
-# +12/+13 (New Zealand DST)
-XX	-3652+17446	Pacific/Auckland	New Zealand ("NZST/NZDT")
-#
-# +12:45/+13:45 (Chatham DST)
-XX	-4357-17633	Pacific/Chatham	Chatham Islands
-#
-# +13
-XX	-210800-1751200	Pacific/Tongatapu	Kanton; Tokelau; Samoa (western); Tonga
-#
-# +14
-XX	+0152-15720	Pacific/Kiritimati	Kiritimati
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE
deleted file mode 100644
index c2f84aeb06..0000000000
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Software License 2.0
-
-Copyright (c) 2020, Paul Ganssle (Google)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE_APACHE b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE_APACHE
deleted file mode 100644
index 261eeb9e9f..0000000000
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE_APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/METADATA b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/METADATA
deleted file mode 100644
index 44b15072da..0000000000
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/METADATA
+++ /dev/null
@@ -1,131 +0,0 @@
-Metadata-Version: 2.1
-Name: pytz_deprecation_shim
-Version: 0.1.0.post0
-Summary: Shims to make deprecation of pytz easier
-Home-page: https://github.com/pganssle/pytz-deprecation-shim
-Author: Paul Ganssle
-Author-email: paul@ganssle.io
-License: Apache-2.0
-Project-URL: Source, https://github.com/pganssle/pytz-deprecation-shim
-Project-URL: Bug Reports, https://github.com/pganssle/pytz-deprecation-shim/issues
-Project-URL: Documentation, https://pytz-deprecation-shim.readthedocs.io
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: !=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-License-File: licenses/LICENSE_APACHE
-Requires-Dist: python-dateutil; python_version < "3.6"
-Requires-Dist: tzdata; python_version >= "3.6"
-Requires-Dist: backports.zoneinfo; python_version >= "3.6" and python_version < "3.9"
-
-pytz_deprecation_shim: Shims to help you safely remove pytz
-===========================================================
-
-``pytz`` has served the Python community well for many years, but it is no
-longer the best option for providing time zones. ``pytz`` has a non-standard
-interface that is `very easy to misuse
-<https://blog.ganssle.io/articles/2018/03/pytz-fastest-footgun.html>`_; this
-interface was necessary when ``pytz`` was created, because ``datetime`` had no
-way to represent ambiguous datetimes, but this was solved in in Python 3.6,
-which added a ``fold`` attribute to datetimes in `PEP 495
-<https://www.python.org/dev/peps/pep-0495/>`_. With the addition of the
-``zoneinfo`` module in Python 3.9 (`PEP 615
-<https://www.python.org/dev/peps/pep-0615/>`_), there has never been a better
-time to migrate away from ``pytz``.
-
-However, since ``pytz`` time zones are used very differently from a standard
-``tzinfo``, and many libraries have built ``pytz`` zones into their standard
-time zone interface (and thus may have users relying on the existence of the
-``localize`` and ``normalize`` methods); this library provides shim classes
-that are compatible with both PEP 495 and ``pytz``'s interface, to make it
-easier for libraries to deprecate ``pytz``.
-
-Usage
-=====
-
-This library is intended for *temporary usage only*, and should allow you to
-drop your dependency on ``pytz`` while also giving your users notice that
-eventually you will remove support for the ``pytz``-specific interface.
-
-Within your own code, use ``pytz_deprecation_shim.timezone`` shims as if they
-were ``zoneinfo`` or ``dateutil.tz`` zones โ€” do not use ``localize`` or
-``normalize``:
-
-.. code-block:: pycon
-
-    >>> import pytz_deprecation_shim as pds
-    >>> from datetime import datetime, timedelta
-    >>> LA = pds.timezone("America/Los_Angeles")
-
-    >>> dt = datetime(2020, 10, 31, 12, tzinfo=LA)
-    >>> print(dt)
-    2020-10-31 12:00:00-07:00
-
-    >>> dt.tzname()
-    'PDT'
-
-
-Datetime addition will work `like normal Python datetime arithmetic
-<https://blog.ganssle.io/articles/2018/02/aware-datetime-arithmetic.html>`_,
-even across a daylight saving time transition:
-
-.. code-block:: pycon
-
-    >>> dt_add = dt + timedelta(days=1)
-
-    >>> print(dt_add)
-    2020-11-01 12:00:00-08:00
-
-    >>> dt_add.tzname()
-    'PST'
-
-However, if you have exposed a time zone to end users who are using ``localize``
-and/or ``normalize`` or any other ``pytz``-specific features (or if you've
-failed to convert some of your own code all the way), those users will see
-a warning (rather than an exception) when they use those features:
-
-.. code-block:: pycon
-
-    >>> dt = LA.localize(datetime(2020, 10, 31, 12))
-    <stdin>:1: PytzUsageWarning: The localize method is no longer necessary, as
-    this time zone supports the fold attribute (PEP 495). For more details on
-    migrating to a PEP 495-compliant implementation, see
-    https://pytz-deprecation-shim.readthedocs.io/en/latest/migration.html
-
-     >>> print(dt)
-    2020-10-31 12:00:00-07:00
-    >>> dt.tzname()
-    'PDT'
-
-    >>> dt_add = LA.normalize(dt + timedelta(days=1))
-    <stdin>:1: PytzUsageWarning: The normalize method is no longer necessary,
-    as this time zone supports the fold attribute (PEP 495). For more details
-    on migrating to a PEP 495-compliant implementation, see
-    https://pytz-deprecation-shim.readthedocs.io/en/latest/migration.html
-
-    >>> print(dt_add)
-    2020-11-01 12:00:00-08:00
-    >>> dt_add.tzname()
-    'PST'
-
-For IANA time zones, calling ``str()`` on the shim zones (and indeed on ``pytz``
-and ``zoneinfo`` zones as well) returns the IANA key, so end users who would
-like to actively migrate to a ``zoneinfo`` (or ``backports.zoneinfo``) can do
-so:
-
-.. code-block:: pycon
-
-    >>> from zoneinfo import ZoneInfo
-    >>> LA = pds.timezone("America/Los_Angeles")
-    >>> LA_zi = ZoneInfo(str(LA))
-    >>> print(LA_zi)
-    zoneinfo.ZoneInfo(key='America/Los_Angeles')
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/RECORD b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/RECORD
deleted file mode 100644
index 4226a0b95f..0000000000
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/RECORD
+++ /dev/null
@@ -1,16 +0,0 @@
-pytz_deprecation_shim-0.1.0.post0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE,sha256=M-jlAC01EtP8wigrmV5rrZ0zR4G5xawxhD9ASQDh87Q,592
-pytz_deprecation_shim-0.1.0.post0.dist-info/LICENSE_APACHE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pytz_deprecation_shim-0.1.0.post0.dist-info/METADATA,sha256=6Z9HQ-89frAFF6J6bcFZogwUopD8czmLC2HvQP7hzLQ,5273
-pytz_deprecation_shim-0.1.0.post0.dist-info/RECORD,,
-pytz_deprecation_shim-0.1.0.post0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pytz_deprecation_shim-0.1.0.post0.dist-info/WHEEL,sha256=TJ49d73sNs10F0aze1W_bTW2P_X7-F4YXOlBqoqA-jY,109
-pytz_deprecation_shim-0.1.0.post0.dist-info/top_level.txt,sha256=6ESQF0d-npliZwsMMpdb8EE1u7BsAxGitGpjeOtDsRw,22
-pytz_deprecation_shim/__init__.py,sha256=5cgVf7HUNzdgp2ffphH2L7CX5_DljRRg6u0DGeK21A0,616
-pytz_deprecation_shim/_common.py,sha256=X2_8SIVirs1hl5tUpTPiHq_ZSpueW2TxZPj-VxKOhqE,275
-pytz_deprecation_shim/_compat.py,sha256=XLmI8hc-dhBPkgBBRhjqLjqHEMVgFSJ0EdVYJmVWdoQ,458
-pytz_deprecation_shim/_compat_py2.py,sha256=Wj6wCuFvb2rRoYiqmqJj7ZXqdJHBFSFc7vbPDS0DILM,729
-pytz_deprecation_shim/_compat_py3.py,sha256=phxVXwhnFXP3i-UejLoj6xzRd4KHDc8Q1WHv1XlL7GM,1376
-pytz_deprecation_shim/_exceptions.py,sha256=6WpgfzTdLoIM5M6THBMVYnenPXXca5s5RiVRxl5KStU,2071
-pytz_deprecation_shim/_impl.py,sha256=ii4mKwQC4aHmdes1bQMy5vqN_JR9vSRCoSUIsh7AyQ8,9380
-pytz_deprecation_shim/helpers.py,sha256=AggTZMNXjfIMAm8MH35oBQuAPeNIJLxS9kg9jIEbxQc,2962
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/WHEEL b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/WHEEL
deleted file mode 100644
index 17c0299e49..0000000000
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/top_level.txt b/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/top_level.txt
deleted file mode 100644
index cb0996f688..0000000000
--- a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-pytz_deprecation_shim
diff --git a/libs/pytz_deprecation_shim/__init__.py b/libs/pytz_deprecation_shim/__init__.py
deleted file mode 100644
index 8b4516205d..0000000000
--- a/libs/pytz_deprecation_shim/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-__all__ = [
-    "AmbiguousTimeError",
-    "NonExistentTimeError",
-    "InvalidTimeError",
-    "UnknownTimeZoneError",
-    "PytzUsageWarning",
-    "FixedOffset",
-    "UTC",
-    "utc",
-    "build_tzinfo",
-    "timezone",
-    "fixed_offset_timezone",
-    "wrap_zone",
-]
-
-from . import helpers
-from ._exceptions import (
-    AmbiguousTimeError,
-    InvalidTimeError,
-    NonExistentTimeError,
-    PytzUsageWarning,
-    UnknownTimeZoneError,
-)
-from ._impl import (
-    UTC,
-    build_tzinfo,
-    fixed_offset_timezone,
-    timezone,
-    wrap_zone,
-)
-
-# Compatibility aliases
-utc = UTC
-FixedOffset = fixed_offset_timezone
diff --git a/libs/pytz_deprecation_shim/_common.py b/libs/pytz_deprecation_shim/_common.py
deleted file mode 100644
index ace322e96e..0000000000
--- a/libs/pytz_deprecation_shim/_common.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import sys
-
-_PYTZ_IMPORTED = False
-
-
-def pytz_imported():
-    """Detects whether or not pytz has been imported without importing pytz."""
-    global _PYTZ_IMPORTED
-
-    if not _PYTZ_IMPORTED and "pytz" in sys.modules:
-        _PYTZ_IMPORTED = True
-
-    return _PYTZ_IMPORTED
diff --git a/libs/pytz_deprecation_shim/_compat.py b/libs/pytz_deprecation_shim/_compat.py
deleted file mode 100644
index 5b73459235..0000000000
--- a/libs/pytz_deprecation_shim/_compat.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import sys
-
-if sys.version_info[0] == 2:
-    from . import _compat_py2 as _compat_impl
-else:
-    from . import _compat_py3 as _compat_impl
-
-UTC = _compat_impl.UTC
-get_timezone = _compat_impl.get_timezone
-get_timezone_file = _compat_impl.get_timezone_file
-get_fixed_offset_zone = _compat_impl.get_fixed_offset_zone
-is_ambiguous = _compat_impl.is_ambiguous
-is_imaginary = _compat_impl.is_imaginary
-enfold = _compat_impl.enfold
-get_fold = _compat_impl.get_fold
diff --git a/libs/pytz_deprecation_shim/_compat_py2.py b/libs/pytz_deprecation_shim/_compat_py2.py
deleted file mode 100644
index f473d2676c..0000000000
--- a/libs/pytz_deprecation_shim/_compat_py2.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from datetime import timedelta
-
-from dateutil import tz
-
-UTC = tz.UTC
-
-
-def get_timezone(key):
-    if not key:
-        raise KeyError("Unknown time zone: %s" % key)
-
-    try:
-        rv = tz.gettz(key)
-    except Exception:
-        rv = None
-
-    if rv is None or not isinstance(rv, (tz.tzutc, tz.tzfile)):
-        raise KeyError("Unknown time zone: %s" % key)
-
-    return rv
-
-
-def get_timezone_file(f, key=None):
-    return tz.tzfile(f)
-
-
-def get_fixed_offset_zone(offset):
-    return tz.tzoffset(None, timedelta(minutes=offset))
-
-
-def is_ambiguous(dt):
-    return tz.datetime_ambiguous(dt)
-
-
-def is_imaginary(dt):
-    return not tz.datetime_exists(dt)
-
-
-enfold = tz.enfold
-
-
-def get_fold(dt):
-    return getattr(dt, "fold", 0)
diff --git a/libs/pytz_deprecation_shim/_compat_py3.py b/libs/pytz_deprecation_shim/_compat_py3.py
deleted file mode 100644
index 8881abac5f..0000000000
--- a/libs/pytz_deprecation_shim/_compat_py3.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Note: This file could use Python 3-only syntax, but at the moment this breaks
-# the coverage job on Python 2. Until we make it so that coverage can ignore
-# this file only on Python 2, we'll have to stick to 2/3-compatible syntax.
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-
-import datetime
-
-UTC = datetime.timezone.utc
-
-
-def get_timezone(key):
-    try:
-        return zoneinfo.ZoneInfo(key)
-    except (ValueError, OSError):
-        # TODO: Use `from e` when this file can use Python 3 syntax
-        raise KeyError(key)
-
-
-def get_timezone_file(f, key=None):
-    return zoneinfo.ZoneInfo.from_file(f, key=key)
-
-
-def get_fixed_offset_zone(offset):
-    return datetime.timezone(datetime.timedelta(minutes=offset))
-
-
-def is_imaginary(dt):
-    dt_rt = dt.astimezone(UTC).astimezone(dt.tzinfo)
-
-    return not (dt == dt_rt)
-
-
-def is_ambiguous(dt):
-    if is_imaginary(dt):
-        return False
-
-    wall_0 = dt
-    wall_1 = dt.replace(fold=not dt.fold)
-
-    # Ambiguous datetimes can only exist if the offset changes, so we don't
-    # actually have to check whether dst() or tzname() are different.
-    same_offset = wall_0.utcoffset() == wall_1.utcoffset()
-
-    return not same_offset
-
-
-def enfold(dt, fold=1):
-    if dt.fold != fold:
-        return dt.replace(fold=fold)
-    else:
-        return dt
-
-
-def get_fold(dt):
-    return dt.fold
diff --git a/libs/pytz_deprecation_shim/_exceptions.py b/libs/pytz_deprecation_shim/_exceptions.py
deleted file mode 100644
index 58d7af0ae5..0000000000
--- a/libs/pytz_deprecation_shim/_exceptions.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from ._common import pytz_imported
-
-
-class PytzUsageWarning(RuntimeWarning):
-    """Warning raised when accessing features specific to ``pytz``'s interface.
-
-    This warning is used to direct users of ``pytz``-specific features like the
-    ``localize`` and ``normalize`` methods towards using the standard
-    ``tzinfo`` interface, so that these shims can be replaced with one of the
-    underlying libraries they are wrapping.
-    """
-
-
-class UnknownTimeZoneError(KeyError):
-    """Raised when no time zone is found for a specified key."""
-
-
-class InvalidTimeError(Exception):
-    """The base class for exceptions related to folds and gaps."""
-
-
-class AmbiguousTimeError(InvalidTimeError):
-    """Exception raised when ``is_dst=None`` for an ambiguous time (fold)."""
-
-
-class NonExistentTimeError(InvalidTimeError):
-    """Exception raised when ``is_dst=None`` for a non-existent time (gap)."""
-
-
-PYTZ_BASE_ERROR_MAPPING = {}
-
-
-def _make_pytz_derived_errors(
-    InvalidTimeError_=InvalidTimeError,
-    AmbiguousTimeError_=AmbiguousTimeError,
-    NonExistentTimeError_=NonExistentTimeError,
-    UnknownTimeZoneError_=UnknownTimeZoneError,
-):
-    if PYTZ_BASE_ERROR_MAPPING or not pytz_imported():
-        return
-
-    import pytz
-
-    class InvalidTimeError(InvalidTimeError_, pytz.InvalidTimeError):
-        pass
-
-    class AmbiguousTimeError(AmbiguousTimeError_, pytz.AmbiguousTimeError):
-        pass
-
-    class NonExistentTimeError(
-        NonExistentTimeError_, pytz.NonExistentTimeError
-    ):
-        pass
-
-    class UnknownTimeZoneError(
-        UnknownTimeZoneError_, pytz.UnknownTimeZoneError
-    ):
-        pass
-
-    PYTZ_BASE_ERROR_MAPPING.update(
-        {
-            InvalidTimeError_: InvalidTimeError,
-            AmbiguousTimeError_: AmbiguousTimeError,
-            NonExistentTimeError_: NonExistentTimeError,
-            UnknownTimeZoneError_: UnknownTimeZoneError,
-        }
-    )
-
-
-def get_exception(exc_type, msg):
-    _make_pytz_derived_errors()
-
-    out_exc_type = PYTZ_BASE_ERROR_MAPPING.get(exc_type, exc_type)
-
-    return out_exc_type(msg)
diff --git a/libs/pytz_deprecation_shim/_impl.py b/libs/pytz_deprecation_shim/_impl.py
deleted file mode 100644
index 5443047934..0000000000
--- a/libs/pytz_deprecation_shim/_impl.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# -*- coding: utf-8 -*-
-import warnings
-from datetime import tzinfo
-
-from . import _compat
-from ._exceptions import (
-    AmbiguousTimeError,
-    NonExistentTimeError,
-    PytzUsageWarning,
-    UnknownTimeZoneError,
-    get_exception,
-)
-
-IS_DST_SENTINEL = object()
-KEY_SENTINEL = object()
-
-
-def timezone(key, _cache={}):
-    """Builds an IANA database time zone shim.
-
-    This is the equivalent of ``pytz.timezone``.
-
-    :param key:
-        A valid key from the IANA time zone database.
-
-    :raises UnknownTimeZoneError:
-        If an unknown value is passed, this will raise an exception that can be
-        caught by :exc:`pytz_deprecation_shim.UnknownTimeZoneError` or
-        ``pytz.UnknownTimeZoneError``. Like
-        :exc:`zoneinfo.ZoneInfoNotFoundError`, both of those are subclasses of
-        :exc:`KeyError`.
-    """
-    instance = _cache.get(key, None)
-    if instance is None:
-        if len(key) == 3 and key.lower() == "utc":
-            instance = _cache.setdefault(key, UTC)
-        else:
-            try:
-                zone = _compat.get_timezone(key)
-            except KeyError:
-                raise get_exception(UnknownTimeZoneError, key)
-            instance = _cache.setdefault(key, wrap_zone(zone, key=key))
-
-    return instance
-
-
-def fixed_offset_timezone(offset, _cache={}):
-    """Builds a fixed offset time zone shim.
-
-    This is the equivalent of ``pytz.FixedOffset``. An alias is available as
-    ``pytz_deprecation_shim.FixedOffset`` as well.
-
-    :param offset:
-        A fixed offset from UTC, in minutes. This must be in the range ``-1439
-        <= offset <= 1439``.
-
-    :raises ValueError:
-        For offsets whose absolute value is greater than or equal to 24 hours.
-
-    :return:
-        A shim time zone.
-    """
-    if not (-1440 < offset < 1440):
-        raise ValueError("absolute offset is too large", offset)
-
-    instance = _cache.get(offset, None)
-    if instance is None:
-        if offset == 0:
-            instance = _cache.setdefault(offset, UTC)
-        else:
-            zone = _compat.get_fixed_offset_zone(offset)
-            instance = _cache.setdefault(offset, wrap_zone(zone, key=None))
-
-    return instance
-
-
-def build_tzinfo(zone, fp):
-    """Builds a shim object from a TZif file.
-
-    This is a shim for ``pytz.build_tzinfo``. Given a value to use as the zone
-    IANA key and a file-like object containing a valid TZif file (i.e.
-    conforming to :rfc:`8536`), this builds a time zone object and wraps it in
-    a shim class.
-
-    The argument names are chosen to match those in ``pytz.build_tzinfo``.
-
-    :param zone:
-        A string to be used as the time zone object's IANA key.
-
-    :param fp:
-        A readable file-like object emitting bytes, pointing to a valid TZif
-        file.
-
-    :return:
-        A shim time zone.
-    """
-    zone_file = _compat.get_timezone_file(fp)
-
-    return wrap_zone(zone_file, key=zone)
-
-
-def wrap_zone(tz, key=KEY_SENTINEL, _cache={}):
-    """Wrap an existing time zone object in a shim class.
-
-    This is likely to be useful if you would like to work internally with
-    non-``pytz`` zones, but you expose an interface to callers relying on
-    ``pytz``'s interface. It may also be useful for passing non-``pytz`` zones
-    to libraries expecting to use ``pytz``'s interface.
-
-    :param tz:
-        A :pep:`495`-compatible time zone, such as those provided by
-        :mod:`dateutil.tz` or :mod:`zoneinfo`.
-
-    :param key:
-        The value for the IANA time zone key. This is optional for ``zoneinfo``
-        zones, but required for ``dateutil.tz`` zones.
-
-    :return:
-        A shim time zone.
-    """
-    if key is KEY_SENTINEL:
-        key = getattr(tz, "key", KEY_SENTINEL)
-
-    if key is KEY_SENTINEL:
-        raise TypeError(
-            "The `key` argument is required when wrapping zones that do not "
-            + "have a `key` attribute."
-        )
-
-    instance = _cache.get((id(tz), key), None)
-    if instance is None:
-        instance = _cache.setdefault((id(tz), key), _PytzShimTimezone(tz, key))
-
-    return instance
-
-
-class _PytzShimTimezone(tzinfo):
-    # Add instance variables for _zone and _key because this will make error
-    # reporting with partially-initialized _BasePytzShimTimezone objects
-    # work better.
-    _zone = None
-    _key = None
-
-    def __init__(self, zone, key):
-        self._key = key
-        self._zone = zone
-
-    def utcoffset(self, dt):
-        return self._zone.utcoffset(dt)
-
-    def dst(self, dt):
-        return self._zone.dst(dt)
-
-    def tzname(self, dt):
-        return self._zone.tzname(dt)
-
-    def fromutc(self, dt):
-        # The default fromutc implementation only works if tzinfo is "self"
-        dt_base = dt.replace(tzinfo=self._zone)
-        dt_out = self._zone.fromutc(dt_base)
-
-        return dt_out.replace(tzinfo=self)
-
-    def __str__(self):
-        if self._key is not None:
-            return str(self._key)
-        else:
-            return repr(self)
-
-    def __repr__(self):
-        return "%s(%s, %s)" % (
-            self.__class__.__name__,
-            repr(self._zone),
-            repr(self._key),
-        )
-
-    def unwrap_shim(self):
-        """Returns the underlying class that the shim is a wrapper for.
-
-        This is a shim-specific method equivalent to
-        :func:`pytz_deprecation_shim.helpers.upgrade_tzinfo`. It is provided as
-        a method to allow end-users to upgrade shim timezones without requiring
-        an explicit dependency on ``pytz_deprecation_shim``, e.g.:
-
-        .. code-block:: python
-
-            if getattr(tz, "unwrap_shim", None) is None:
-                tz = tz.unwrap_shim()
-        """
-        return self._zone
-
-    @property
-    def zone(self):
-        warnings.warn(
-            "The zone attribute is specific to pytz's interface; "
-            + "please migrate to a new time zone provider. "
-            + "For more details on how to do so, see %s"
-            % PYTZ_MIGRATION_GUIDE_URL,
-            PytzUsageWarning,
-            stacklevel=2,
-        )
-
-        return self._key
-
-    def localize(self, dt, is_dst=IS_DST_SENTINEL):
-        warnings.warn(
-            "The localize method is no longer necessary, as this "
-            + "time zone supports the fold attribute (PEP 495). "
-            + "For more details on migrating to a PEP 495-compliant "
-            + "implementation, see %s" % PYTZ_MIGRATION_GUIDE_URL,
-            PytzUsageWarning,
-            stacklevel=2,
-        )
-
-        if dt.tzinfo is not None:
-            raise ValueError("Not naive datetime (tzinfo is already set)")
-
-        dt_out = dt.replace(tzinfo=self)
-
-        if is_dst is IS_DST_SENTINEL:
-            return dt_out
-
-        dt_ambiguous = _compat.is_ambiguous(dt_out)
-        dt_imaginary = (
-            _compat.is_imaginary(dt_out) if not dt_ambiguous else False
-        )
-
-        if is_dst is None:
-            if dt_imaginary:
-                raise get_exception(
-                    NonExistentTimeError, dt.replace(tzinfo=None)
-                )
-
-            if dt_ambiguous:
-                raise get_exception(AmbiguousTimeError, dt.replace(tzinfo=None))
-
-        elif dt_ambiguous or dt_imaginary:
-            # Start by normalizing the folds; dt_out may have fold=0 or fold=1,
-            # but we need to know the DST offset on both sides anyway, so we
-            # will get one datetime representing each side of the fold, then
-            # decide which one we're going to return.
-            if _compat.get_fold(dt_out):
-                dt_enfolded = dt_out
-                dt_out = _compat.enfold(dt_out, fold=0)
-            else:
-                dt_enfolded = _compat.enfold(dt_out, fold=1)
-
-            # Now we want to decide whether the fold=0 or fold=1 represents
-            # what pytz would return for `is_dst=True`
-            enfolded_dst = bool(dt_enfolded.dst())
-            if bool(dt_out.dst()) == enfolded_dst:
-                # If this is not a transition between standard time and
-                # daylight saving time, pytz will consider the larger offset
-                # the DST offset.
-                enfolded_dst = dt_enfolded.utcoffset() > dt_out.utcoffset()
-
-            # The default we've established is that dt_out is fold=0; swap it
-            # for the fold=1 datetime if is_dst == True and the enfolded side
-            # is DST or if is_dst == False and the enfolded side is *not* DST.
-            if is_dst == enfolded_dst:
-                dt_out = dt_enfolded
-
-        return dt_out
-
-    def normalize(self, dt):
-        warnings.warn(
-            "The normalize method is no longer necessary, as this "
-            + "time zone supports the fold attribute (PEP 495). "
-            + "For more details on migrating to a PEP 495-compliant "
-            + "implementation, see %s" % PYTZ_MIGRATION_GUIDE_URL,
-            PytzUsageWarning,
-            stacklevel=2,
-        )
-
-        if dt.tzinfo is None:
-            raise ValueError("Naive time - no tzinfo set")
-
-        if dt.tzinfo is self:
-            return dt
-
-        return dt.astimezone(self)
-
-    def __copy__(self):
-        return self
-
-    def __deepcopy__(self, memo=None):
-        return self
-
-    def __reduce__(self):
-        return wrap_zone, (self._zone, self._key)
-
-
-UTC = wrap_zone(_compat.UTC, "UTC")
-PYTZ_MIGRATION_GUIDE_URL = (
-    "https://pytz-deprecation-shim.readthedocs.io/en/latest/migration.html"
-)
diff --git a/libs/pytz_deprecation_shim/helpers.py b/libs/pytz_deprecation_shim/helpers.py
deleted file mode 100644
index 6b05b13025..0000000000
--- a/libs/pytz_deprecation_shim/helpers.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
-This module contains helper functions to ease the transition from ``pytz`` to
-another :pep:`495`-compatible library.
-"""
-from . import _common, _compat
-from ._impl import _PytzShimTimezone
-
-_PYTZ_BASE_CLASSES = None
-
-
-def is_pytz_zone(tz):
-    """Check if a time zone is a ``pytz`` time zone.
-
-    This will only import ``pytz`` if it has already been imported, and does
-    not rely on the existence of the ``localize`` or ``normalize`` methods
-    (since the shim classes also have these methods, but are not ``pytz``
-    zones).
-    """
-
-    # If pytz is not in sys.modules, then we will assume the time zone is not a
-    # pytz zone. It is possible that someone has manipulated sys.modules to
-    # remove pytz, but that's the kind of thing that causes all kinds of other
-    # problems anyway, so we'll call that an unsupported configuration.
-    if not _common.pytz_imported():
-        return False
-
-    if _PYTZ_BASE_CLASSES is None:
-        _populate_pytz_base_classes()
-
-    return isinstance(tz, _PYTZ_BASE_CLASSES)
-
-
-def upgrade_tzinfo(tz):
-    """Convert a ``pytz`` or shim timezone into its modern equivalent.
-
-    The shim classes are thin wrappers around :mod:`zoneinfo` or
-    :mod:`dateutil.tz` implementations of the :class:`datetime.tzinfo` base
-    class. This function removes the shim and returns the underlying "upgraded"
-    time zone.
-
-    When passed a ``pytz`` zone (not a shim), this returns the non-``pytz``
-    equivalent. This may fail if ``pytz`` is using a data source incompatible
-    with the upgraded provider's data source, or if the ``pytz`` zone was built
-    from a file rather than an IANA key.
-
-    When passed an object that is not a shim or a ``pytz`` zone, this returns
-    the original object.
-
-    :param tz:
-        A :class:`datetime.tzinfo` object.
-
-    :raises KeyError:
-        If a ``pytz`` zone is passed to the function with no equivalent in the
-        :pep:`495`-compatible library's version of the Olson database.
-
-    :return:
-        A :pep:`495`-compatible equivalent of any ``pytz`` or shim
-        class, or the original object.
-    """
-    if isinstance(tz, _PytzShimTimezone):
-        return tz._zone
-
-    if is_pytz_zone(tz):
-        if tz.zone is None:
-            # This is a fixed offset zone
-            offset = tz.utcoffset(None)
-            offset_minutes = offset.total_seconds() / 60
-
-            return _compat.get_fixed_offset_zone(offset_minutes)
-
-        if tz.zone == "UTC":
-            return _compat.UTC
-
-        return _compat.get_timezone(tz.zone)
-
-    return tz
-
-
-def _populate_pytz_base_classes():
-    import pytz
-    from pytz.tzinfo import BaseTzInfo
-
-    base_classes = (BaseTzInfo, pytz._FixedOffset)
-
-    # In releases prior to 2018.4, pytz.UTC was not a subclass of BaseTzInfo
-    if not isinstance(pytz.UTC, BaseTzInfo):  # pragma: nocover
-        base_classes = base_classes + (type(pytz.UTC),)
-
-    global _PYTZ_BASE_CLASSES
-    _PYTZ_BASE_CLASSES = base_classes
diff --git a/libs/rarfile-4.2.dist-info/METADATA b/libs/rarfile-4.2.dist-info/METADATA
index e451a1b446..8ab4544958 100644
--- a/libs/rarfile-4.2.dist-info/METADATA
+++ b/libs/rarfile-4.2.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rarfile
 Version: 4.2
 Summary: RAR archive reader for Python
@@ -16,6 +16,16 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: Archiving :: Compression
 Requires-Python: >=3.6
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 rarfile - RAR archive reader for Python
 =======================================
diff --git a/libs/rarfile-4.2.dist-info/RECORD b/libs/rarfile-4.2.dist-info/RECORD
index 7c7576f4ef..a7337904fb 100644
--- a/libs/rarfile-4.2.dist-info/RECORD
+++ b/libs/rarfile-4.2.dist-info/RECORD
@@ -1,8 +1,8 @@
 rarfile-4.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-rarfile-4.2.dist-info/LICENSE,sha256=NRNQFngFwpTHs-FwCBzhJlRFxG--s-mZ4TthbJDGSiA,756
-rarfile-4.2.dist-info/METADATA,sha256=_8vzlJg760ySTzNxrFoKL6ee1yqr7g8ee8r-ZzLuqvQ,4357
+rarfile-4.2.dist-info/METADATA,sha256=sbJdXK2WPwQgPwfjg8rwVz8orr7efGfuEmEDgQyHCHs,4554
 rarfile-4.2.dist-info/RECORD,,
 rarfile-4.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rarfile-4.2.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+rarfile-4.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+rarfile-4.2.dist-info/licenses/LICENSE,sha256=NRNQFngFwpTHs-FwCBzhJlRFxG--s-mZ4TthbJDGSiA,756
 rarfile-4.2.dist-info/top_level.txt,sha256=xJJpMMlbN1jihTp6tmMSBdb4mrmIcEOp1rsb-9oPxkQ,8
 rarfile.py,sha256=Q9TFyOhHUkyWpJbvFb4p6efYKZCb5HwAiH7XfSJ3zDk,105004
diff --git a/libs/rarfile-4.2.dist-info/WHEEL b/libs/rarfile-4.2.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/rarfile-4.2.dist-info/WHEEL
+++ b/libs/rarfile-4.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/rarfile-4.2.dist-info/LICENSE b/libs/rarfile-4.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/rarfile-4.2.dist-info/LICENSE
rename to libs/rarfile-4.2.dist-info/licenses/LICENSE
diff --git a/libs/rebulk-3.2.0.dist-info/METADATA b/libs/rebulk-3.2.0.dist-info/METADATA
index dfccd35c6f..b5f97590a5 100644
--- a/libs/rebulk-3.2.0.dist-info/METADATA
+++ b/libs/rebulk-3.2.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rebulk
 Version: 3.2.0
 Summary: Rebulk - Define simple search patterns in bulk to perform advanced matching on any string.
@@ -21,15 +21,27 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pylint; extra == "test"
 Provides-Extra: dev
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pylint ; extra == 'dev'
-Requires-Dist: tox ; extra == 'dev'
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pylint; extra == "dev"
+Requires-Dist: tox; extra == "dev"
 Provides-Extra: native
-Requires-Dist: regex ; extra == 'native'
-Provides-Extra: test
-Requires-Dist: pytest ; extra == 'test'
-Requires-Dist: pylint ; extra == 'test'
+Requires-Dist: regex; extra == "native"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: summary
 
 ReBulk
 ======
diff --git a/libs/rebulk-3.2.0.dist-info/RECORD b/libs/rebulk-3.2.0.dist-info/RECORD
index 8a0bbf5d6e..a9a49fa0d4 100644
--- a/libs/rebulk-3.2.0.dist-info/RECORD
+++ b/libs/rebulk-3.2.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 rebulk-3.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-rebulk-3.2.0.dist-info/LICENSE,sha256=T5GEmMMWQJTH2LegC39LoN_xCeSgeD3yqc-TBqhDf-I,1083
-rebulk-3.2.0.dist-info/METADATA,sha256=lW7aYFXOISzM12csF8rMeumsfMpQSL3F2glfAwweKto,22418
+rebulk-3.2.0.dist-info/METADATA,sha256=-7ssIZNPu53rtVmiWER8qYJhGGc_ym6_a5KtAeJCCQM,22664
 rebulk-3.2.0.dist-info/RECORD,,
 rebulk-3.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rebulk-3.2.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+rebulk-3.2.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+rebulk-3.2.0.dist-info/licenses/LICENSE,sha256=T5GEmMMWQJTH2LegC39LoN_xCeSgeD3yqc-TBqhDf-I,1083
 rebulk-3.2.0.dist-info/top_level.txt,sha256=Gidw4JAD3UpIGIS_ZqanjtZ5JBD7N8W9nWVCuXKsy0U,7
 rebulk-3.2.0.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 rebulk/__init__.py,sha256=v1inOEPmyTG1Z10iHW0peqRQMuFPxdCNq1ZZ93Cead8,409
diff --git a/libs/rebulk-3.2.0.dist-info/WHEEL b/libs/rebulk-3.2.0.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/rebulk-3.2.0.dist-info/WHEEL
+++ b/libs/rebulk-3.2.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/rebulk-3.2.0.dist-info/LICENSE b/libs/rebulk-3.2.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/rebulk-3.2.0.dist-info/LICENSE
rename to libs/rebulk-3.2.0.dist-info/licenses/LICENSE
diff --git a/libs/referencing-0.23.0.dist-info/METADATA b/libs/referencing-0.23.0.dist-info/METADATA
index 03f462a50d..382b2fa115 100644
--- a/libs/referencing-0.23.0.dist-info/METADATA
+++ b/libs/referencing-0.23.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: referencing
 Version: 0.23.0
 Summary: JSON Referencing + Python
diff --git a/libs/referencing-0.23.0.dist-info/RECORD b/libs/referencing-0.23.0.dist-info/RECORD
index 2b61f1e513..11900cfde7 100644
--- a/libs/referencing-0.23.0.dist-info/RECORD
+++ b/libs/referencing-0.23.0.dist-info/RECORD
@@ -1,8 +1,8 @@
 referencing-0.23.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-referencing-0.23.0.dist-info/METADATA,sha256=9pct8JdeHVEza9Sz12mDeRztH81t077NMhBHDY85qo0,2735
+referencing-0.23.0.dist-info/METADATA,sha256=f1krDad2UvgIw5omtijku-54hYCnwsjACUBHjG8nav4,2735
 referencing-0.23.0.dist-info/RECORD,,
 referencing-0.23.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-referencing-0.23.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+referencing-0.23.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
 referencing-0.23.0.dist-info/licenses/COPYING,sha256=QtzWNJX4e063x3V6-jebtVpT-Ur9el9lfZrfVyNuUVw,1057
 referencing/__init__.py,sha256=QQIDdzthSSd3_viHR6Z-5QOTiJnvLd0pBajsmq0Q_Co,206
 referencing/_attrs.py,sha256=zISC-LjZxW4Q4da8qzSlwNfLnCUkHdWJn-FMphm1x7w,744
diff --git a/libs/referencing-0.23.0.dist-info/WHEEL b/libs/referencing-0.23.0.dist-info/WHEEL
index cdd68a497c..ae8ec1bdaa 100644
--- a/libs/referencing-0.23.0.dist-info/WHEEL
+++ b/libs/referencing-0.23.0.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/requests-2.32.3.dist-info/METADATA b/libs/requests-2.32.3.dist-info/METADATA
deleted file mode 100644
index 293a3f0e47..0000000000
--- a/libs/requests-2.32.3.dist-info/METADATA
+++ /dev/null
@@ -1,119 +0,0 @@
-Metadata-Version: 2.1
-Name: requests
-Version: 2.32.3
-Summary: Python HTTP for Humans.
-Home-page: https://requests.readthedocs.io
-Author: Kenneth Reitz
-Author-email: me@kennethreitz.org
-License: Apache-2.0
-Project-URL: Documentation, https://requests.readthedocs.io
-Project-URL: Source, https://github.com/psf/requests
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: charset-normalizer<4,>=2
-Requires-Dist: idna<4,>=2.5
-Requires-Dist: urllib3<3,>=1.21.1
-Requires-Dist: certifi>=2017.4.17
-Provides-Extra: security
-Provides-Extra: socks
-Requires-Dist: PySocks!=1.5.7,>=1.5.6; extra == "socks"
-Provides-Extra: use_chardet_on_py3
-Requires-Dist: chardet<6,>=3.0.2; extra == "use-chardet-on-py3"
-
-# Requests
-
-**Requests** is a simple, yet elegant, HTTP library.
-
-```python
->>> import requests
->>> r = requests.get('https://httpbin.org/basic-auth/user/pass', auth=('user', 'pass'))
->>> r.status_code
-200
->>> r.headers['content-type']
-'application/json; charset=utf8'
->>> r.encoding
-'utf-8'
->>> r.text
-'{"authenticated": true, ...'
->>> r.json()
-{'authenticated': True, ...}
-```
-
-Requests allows you to send HTTP/1.1 requests extremely easily. Thereโ€™s no need to manually add query strings to your URLs, or to form-encode your `PUT` & `POST` data โ€” but nowadays, just use the `json` method!
-
-Requests is one of the most downloaded Python packages today, pulling in around `30M downloads / week`โ€” according to GitHub, Requests is currently [depended upon](https://github.com/psf/requests/network/dependents?package_id=UGFja2FnZS01NzA4OTExNg%3D%3D) by `1,000,000+` repositories. You may certainly put your trust in this code.
-
-[![Downloads](https://static.pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)
-[![Supported Versions](https://img.shields.io/pypi/pyversions/requests.svg)](https://pypi.org/project/requests)
-[![Contributors](https://img.shields.io/github/contributors/psf/requests.svg)](https://github.com/psf/requests/graphs/contributors)
-
-## Installing Requests and Supported Versions
-
-Requests is available on PyPI:
-
-```console
-$ python -m pip install requests
-```
-
-Requests officially supports Python 3.8+.
-
-## Supported Features & Bestโ€“Practices
-
-Requests is ready for the demands of building robust and reliable HTTPโ€“speaking applications, for the needs of today.
-
-- Keep-Alive & Connection Pooling
-- International Domains and URLs
-- Sessions with Cookie Persistence
-- Browser-style TLS/SSL Verification
-- Basic & Digest Authentication
-- Familiar `dict`โ€“like Cookies
-- Automatic Content Decompression and Decoding
-- Multi-part File Uploads
-- SOCKS Proxy Support
-- Connection Timeouts
-- Streaming Downloads
-- Automatic honoring of `.netrc`
-- Chunked HTTP Requests
-
-## API Reference and User Guide available on [Read the Docs](https://requests.readthedocs.io)
-
-[![Read the Docs](https://raw.githubusercontent.com/psf/requests/main/ext/ss.png)](https://requests.readthedocs.io)
-
-## Cloning the repository
-
-When cloning the Requests repository, you may need to add the `-c
-fetch.fsck.badTimezone=ignore` flag to avoid an error about a bad commit (see
-[this issue](https://github.com/psf/requests/issues/2690) for more background):
-
-```shell
-git clone -c fetch.fsck.badTimezone=ignore https://github.com/psf/requests.git
-```
-
-You can also apply this setting to your global Git config:
-
-```shell
-git config --global fetch.fsck.badTimezone ignore
-```
-
----
-
-[![Kenneth Reitz](https://raw.githubusercontent.com/psf/requests/main/ext/kr.png)](https://kennethreitz.org) [![Python Software Foundation](https://raw.githubusercontent.com/psf/requests/main/ext/psf.png)](https://www.python.org/psf)
diff --git a/libs/requests-2.32.3.dist-info/RECORD b/libs/requests-2.32.3.dist-info/RECORD
deleted file mode 100644
index 2a3d60976f..0000000000
--- a/libs/requests-2.32.3.dist-info/RECORD
+++ /dev/null
@@ -1,25 +0,0 @@
-requests-2.32.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-requests-2.32.3.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-requests-2.32.3.dist-info/METADATA,sha256=erVZI6IJDUPBA9nG4HZlVYb33b2BDkuDE6BEn3dMgvY,4602
-requests-2.32.3.dist-info/RECORD,,
-requests-2.32.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-requests-2.32.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-requests-2.32.3.dist-info/top_level.txt,sha256=fMSVmHfb5rbGOo6xv-O_tUX6j-WyixssE-SnwcDRxNQ,9
-requests/__init__.py,sha256=4xaAERmPDIBPsa2PsjpU9r06yooK-2mZKHTZAhWRWts,5072
-requests/__version__.py,sha256=FVfglgZmNQnmYPXpOohDU58F5EUb_-VnSTaAesS187g,435
-requests/_internal_utils.py,sha256=nMQymr4hs32TqVo5AbCrmcJEhvPUh7xXlluyqwslLiQ,1495
-requests/adapters.py,sha256=KIcecscqam6reOCXRl4DwP4jX8Jcl8sd57ft17KR2cQ,27451
-requests/api.py,sha256=_Zb9Oa7tzVIizTKwFrPjDEY9ejtm_OnSRERnADxGsQs,6449
-requests/auth.py,sha256=kF75tqnLctZ9Mf_hm9TZIj4cQWnN5uxRz8oWsx5wmR0,10186
-requests/certs.py,sha256=Z9Sb410Anv6jUFTyss0jFFhU6xst8ctELqfy8Ev23gw,429
-requests/compat.py,sha256=C5w_DPLSurXPgcdWU78fora0APmbYkX2G89QvH5xzPA,1817
-requests/cookies.py,sha256=bNi-iqEj4NPZ00-ob-rHvzkvObzN3lEpgw3g6paS3Xw,18590
-requests/exceptions.py,sha256=jJPS1UWATs86ShVUaLorTiJb1SaGuoNEWgICJep-VkY,4260
-requests/help.py,sha256=gPX5d_H7Xd88aDABejhqGgl9B1VFRTt5BmiYvL3PzIQ,3875
-requests/hooks.py,sha256=CiuysiHA39V5UfcCBXFIx83IrDpuwfN9RcTUgv28ftQ,733
-requests/models.py,sha256=k42roXzC8u_OagAPQi9U4MkfO7i4r2FdaqvMqstPehc,35418
-requests/packages.py,sha256=_g0gZ681UyAlKHRjH6kanbaoxx2eAb6qzcXiODyTIoc,904
-requests/sessions.py,sha256=ykTI8UWGSltOfH07HKollH7kTBGw4WhiBVaQGmckTw4,30495
-requests/status_codes.py,sha256=iJUAeA25baTdw-6PfD0eF4qhpINDJRJI-yaMqxs4LEI,4322
-requests/structures.py,sha256=-IbmhVz06S-5aPSZuUthZ6-6D9XOjRuTXHOabY041XM,2912
-requests/utils.py,sha256=HiQC6Nq_Da3ktaMiFzQkh-dCk3iQHHKEsYS5kDc-8Cw,33619
diff --git a/libs/requests-2.32.3.dist-info/WHEEL b/libs/requests-2.32.3.dist-info/WHEEL
deleted file mode 100644
index da25d7b423..0000000000
--- a/libs/requests-2.32.3.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/pytz-2024.2.dist-info/INSTALLER b/libs/requests-2.32.5.dist-info/INSTALLER
similarity index 100%
rename from libs/pytz-2024.2.dist-info/INSTALLER
rename to libs/requests-2.32.5.dist-info/INSTALLER
diff --git a/libs/requests-2.32.5.dist-info/METADATA b/libs/requests-2.32.5.dist-info/METADATA
new file mode 100644
index 0000000000..b31773e3ea
--- /dev/null
+++ b/libs/requests-2.32.5.dist-info/METADATA
@@ -0,0 +1,133 @@
+Metadata-Version: 2.4
+Name: requests
+Version: 2.32.5
+Summary: Python HTTP for Humans.
+Home-page: https://requests.readthedocs.io
+Author: Kenneth Reitz
+Author-email: me@kennethreitz.org
+License: Apache-2.0
+Project-URL: Documentation, https://requests.readthedocs.io
+Project-URL: Source, https://github.com/psf/requests
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: charset_normalizer<4,>=2
+Requires-Dist: idna<4,>=2.5
+Requires-Dist: urllib3<3,>=1.21.1
+Requires-Dist: certifi>=2017.4.17
+Provides-Extra: security
+Provides-Extra: socks
+Requires-Dist: PySocks!=1.5.7,>=1.5.6; extra == "socks"
+Provides-Extra: use-chardet-on-py3
+Requires-Dist: chardet<6,>=3.0.2; extra == "use-chardet-on-py3"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# Requests
+
+**Requests** is a simple, yet elegant, HTTP library.
+
+```python
+>>> import requests
+>>> r = requests.get('https://httpbin.org/basic-auth/user/pass', auth=('user', 'pass'))
+>>> r.status_code
+200
+>>> r.headers['content-type']
+'application/json; charset=utf8'
+>>> r.encoding
+'utf-8'
+>>> r.text
+'{"authenticated": true, ...'
+>>> r.json()
+{'authenticated': True, ...}
+```
+
+Requests allows you to send HTTP/1.1 requests extremely easily. Thereโ€™s no need to manually add query strings to your URLs, or to form-encode your `PUT` & `POST` data โ€” but nowadays, just use the `json` method!
+
+Requests is one of the most downloaded Python packages today, pulling in around `30M downloads / week`โ€” according to GitHub, Requests is currently [depended upon](https://github.com/psf/requests/network/dependents?package_id=UGFja2FnZS01NzA4OTExNg%3D%3D) by `1,000,000+` repositories. You may certainly put your trust in this code.
+
+[![Downloads](https://static.pepy.tech/badge/requests/month)](https://pepy.tech/project/requests)
+[![Supported Versions](https://img.shields.io/pypi/pyversions/requests.svg)](https://pypi.org/project/requests)
+[![Contributors](https://img.shields.io/github/contributors/psf/requests.svg)](https://github.com/psf/requests/graphs/contributors)
+
+## Installing Requests and Supported Versions
+
+Requests is available on PyPI:
+
+```console
+$ python -m pip install requests
+```
+
+Requests officially supports Python 3.9+.
+
+## Supported Features & Bestโ€“Practices
+
+Requests is ready for the demands of building robust and reliable HTTPโ€“speaking applications, for the needs of today.
+
+- Keep-Alive & Connection Pooling
+- International Domains and URLs
+- Sessions with Cookie Persistence
+- Browser-style TLS/SSL Verification
+- Basic & Digest Authentication
+- Familiar `dict`โ€“like Cookies
+- Automatic Content Decompression and Decoding
+- Multi-part File Uploads
+- SOCKS Proxy Support
+- Connection Timeouts
+- Streaming Downloads
+- Automatic honoring of `.netrc`
+- Chunked HTTP Requests
+
+## API Reference and User Guide available on [Read the Docs](https://requests.readthedocs.io)
+
+[![Read the Docs](https://raw.githubusercontent.com/psf/requests/main/ext/ss.png)](https://requests.readthedocs.io)
+
+## Cloning the repository
+
+When cloning the Requests repository, you may need to add the `-c
+fetch.fsck.badTimezone=ignore` flag to avoid an error about a bad commit timestamp (see
+[this issue](https://github.com/psf/requests/issues/2690) for more background):
+
+```shell
+git clone -c fetch.fsck.badTimezone=ignore https://github.com/psf/requests.git
+```
+
+You can also apply this setting to your global Git config:
+
+```shell
+git config --global fetch.fsck.badTimezone ignore
+```
+
+---
+
+[![Kenneth Reitz](https://raw.githubusercontent.com/psf/requests/main/ext/kr.png)](https://kennethreitz.org) [![Python Software Foundation](https://raw.githubusercontent.com/psf/requests/main/ext/psf.png)](https://www.python.org/psf)
diff --git a/libs/requests-2.32.5.dist-info/RECORD b/libs/requests-2.32.5.dist-info/RECORD
new file mode 100644
index 0000000000..6b6cd668f7
--- /dev/null
+++ b/libs/requests-2.32.5.dist-info/RECORD
@@ -0,0 +1,25 @@
+requests-2.32.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+requests-2.32.5.dist-info/METADATA,sha256=ZbWgjagfSRVRPnYJZf8Ut1GPZbe7Pv4NqzZLvMTUDLA,4945
+requests-2.32.5.dist-info/RECORD,,
+requests-2.32.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+requests-2.32.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+requests-2.32.5.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+requests-2.32.5.dist-info/top_level.txt,sha256=fMSVmHfb5rbGOo6xv-O_tUX6j-WyixssE-SnwcDRxNQ,9
+requests/__init__.py,sha256=4xaAERmPDIBPsa2PsjpU9r06yooK-2mZKHTZAhWRWts,5072
+requests/__version__.py,sha256=QKDceK8K_ujqwDDc3oYrR0odOBYgKVOQQ5vFap_G_cg,435
+requests/_internal_utils.py,sha256=nMQymr4hs32TqVo5AbCrmcJEhvPUh7xXlluyqwslLiQ,1495
+requests/adapters.py,sha256=8nX113gbb123aUtx2ETkAN_6IsYX-M2fRoLGluTEcRk,26285
+requests/api.py,sha256=_Zb9Oa7tzVIizTKwFrPjDEY9ejtm_OnSRERnADxGsQs,6449
+requests/auth.py,sha256=kF75tqnLctZ9Mf_hm9TZIj4cQWnN5uxRz8oWsx5wmR0,10186
+requests/certs.py,sha256=Z9Sb410Anv6jUFTyss0jFFhU6xst8ctELqfy8Ev23gw,429
+requests/compat.py,sha256=J7sIjR6XoDGp5JTVzOxkK5fSoUVUa_Pjc7iRZhAWGmI,2142
+requests/cookies.py,sha256=bNi-iqEj4NPZ00-ob-rHvzkvObzN3lEpgw3g6paS3Xw,18590
+requests/exceptions.py,sha256=jJPS1UWATs86ShVUaLorTiJb1SaGuoNEWgICJep-VkY,4260
+requests/help.py,sha256=gPX5d_H7Xd88aDABejhqGgl9B1VFRTt5BmiYvL3PzIQ,3875
+requests/hooks.py,sha256=CiuysiHA39V5UfcCBXFIx83IrDpuwfN9RcTUgv28ftQ,733
+requests/models.py,sha256=MjZdZ4k7tnw-1nz5PKShjmPmqyk0L6DciwnFngb_Vk4,35510
+requests/packages.py,sha256=_g0gZ681UyAlKHRjH6kanbaoxx2eAb6qzcXiODyTIoc,904
+requests/sessions.py,sha256=Cl1dpEnOfwrzzPbku-emepNeN4Rt_0_58Iy2x-JGTm8,30503
+requests/status_codes.py,sha256=iJUAeA25baTdw-6PfD0eF4qhpINDJRJI-yaMqxs4LEI,4322
+requests/structures.py,sha256=-IbmhVz06S-5aPSZuUthZ6-6D9XOjRuTXHOabY041XM,2912
+requests/utils.py,sha256=WqU86rZ3wvhC-tQjWcjtH_HEKZwWB3iWCZV6SW5DEdQ,33213
diff --git a/libs/semver-3.0.3.dist-info/REQUESTED b/libs/requests-2.32.5.dist-info/REQUESTED
similarity index 100%
rename from libs/semver-3.0.3.dist-info/REQUESTED
rename to libs/requests-2.32.5.dist-info/REQUESTED
diff --git a/libs/requests-2.32.5.dist-info/WHEEL b/libs/requests-2.32.5.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/requests-2.32.5.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/requests-2.32.3.dist-info/LICENSE b/libs/requests-2.32.5.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/requests-2.32.3.dist-info/LICENSE
rename to libs/requests-2.32.5.dist-info/licenses/LICENSE
diff --git a/libs/requests-2.32.3.dist-info/top_level.txt b/libs/requests-2.32.5.dist-info/top_level.txt
similarity index 100%
rename from libs/requests-2.32.3.dist-info/top_level.txt
rename to libs/requests-2.32.5.dist-info/top_level.txt
diff --git a/libs/requests/__version__.py b/libs/requests/__version__.py
index 2c105aca7d..effdd98cf1 100644
--- a/libs/requests/__version__.py
+++ b/libs/requests/__version__.py
@@ -5,8 +5,8 @@
 __title__ = "requests"
 __description__ = "Python HTTP for Humans."
 __url__ = "https://requests.readthedocs.io"
-__version__ = "2.32.3"
-__build__ = 0x023203
+__version__ = "2.32.5"
+__build__ = 0x023205
 __author__ = "Kenneth Reitz"
 __author_email__ = "me@kennethreitz.org"
 __license__ = "Apache-2.0"
diff --git a/libs/requests/adapters.py b/libs/requests/adapters.py
index 9a58b16025..670c92767c 100644
--- a/libs/requests/adapters.py
+++ b/libs/requests/adapters.py
@@ -27,7 +27,6 @@
 from urllib3.util import Timeout as TimeoutSauce
 from urllib3.util import parse_url
 from urllib3.util.retry import Retry
-from urllib3.util.ssl_ import create_urllib3_context
 
 from .auth import _basic_auth_str
 from .compat import basestring, urlparse
@@ -74,19 +73,6 @@ def SOCKSProxyManager(*args, **kwargs):
 DEFAULT_POOL_TIMEOUT = None
 
 
-try:
-    import ssl  # noqa: F401
-
-    _preloaded_ssl_context = create_urllib3_context()
-    _preloaded_ssl_context.load_verify_locations(
-        extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
-    )
-except ImportError:
-    # Bypass default SSLContext creation when Python
-    # interpreter isn't built with the ssl module.
-    _preloaded_ssl_context = None
-
-
 def _urllib3_request_context(
     request: "PreparedRequest",
     verify: "bool | str | None",
@@ -99,19 +85,9 @@ def _urllib3_request_context(
     scheme = parsed_request_url.scheme.lower()
     port = parsed_request_url.port
 
-    # Determine if we have and should use our default SSLContext
-    # to optimize performance on standard requests.
-    poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
-    has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context")
-    should_use_default_ssl_context = (
-        _preloaded_ssl_context is not None and not has_poolmanager_ssl_context
-    )
-
     cert_reqs = "CERT_REQUIRED"
     if verify is False:
         cert_reqs = "CERT_NONE"
-    elif verify is True and should_use_default_ssl_context:
-        pool_kwargs["ssl_context"] = _preloaded_ssl_context
     elif isinstance(verify, str):
         if not os.path.isdir(verify):
             pool_kwargs["ca_certs"] = verify
@@ -314,26 +290,27 @@ def cert_verify(self, conn, url, verify, cert):
         :param cert: The SSL certificate to verify.
         """
         if url.lower().startswith("https") and verify:
-            conn.cert_reqs = "CERT_REQUIRED"
+            cert_loc = None
 
-            # Only load the CA certificates if 'verify' is a string indicating the CA bundle to use.
-            # Otherwise, if verify is a boolean, we don't load anything since
-            # the connection will be using a context with the default certificates already loaded,
-            # and this avoids a call to the slow load_verify_locations()
+            # Allow self-specified cert location.
             if verify is not True:
-                # `verify` must be a str with a path then
                 cert_loc = verify
 
-                if not os.path.exists(cert_loc):
-                    raise OSError(
-                        f"Could not find a suitable TLS CA certificate bundle, "
-                        f"invalid path: {cert_loc}"
-                    )
+            if not cert_loc:
+                cert_loc = extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
 
-                if not os.path.isdir(cert_loc):
-                    conn.ca_certs = cert_loc
-                else:
-                    conn.ca_cert_dir = cert_loc
+            if not cert_loc or not os.path.exists(cert_loc):
+                raise OSError(
+                    f"Could not find a suitable TLS CA certificate bundle, "
+                    f"invalid path: {cert_loc}"
+                )
+
+            conn.cert_reqs = "CERT_REQUIRED"
+
+            if not os.path.isdir(cert_loc):
+                conn.ca_certs = cert_loc
+            else:
+                conn.ca_cert_dir = cert_loc
         else:
             conn.cert_reqs = "CERT_NONE"
             conn.ca_certs = None
@@ -410,7 +387,7 @@ def build_connection_pool_key_attributes(self, request, verify, cert=None):
           ``"cert_reqs"`` will be set
         * If ``verify`` is a string, (i.e., it is a user-specified trust bundle)
           ``"ca_certs"`` will be set if the string is not a directory recognized
-          by :py:func:`os.path.isdir`, otherwise ``"ca_certs_dir"`` will be
+          by :py:func:`os.path.isdir`, otherwise ``"ca_cert_dir"`` will be
           set.
         * If ``"cert"`` is specified, ``"cert_file"`` will always be set. If
           ``"cert"`` is a tuple with a second item, ``"key_file"`` will also
diff --git a/libs/requests/compat.py b/libs/requests/compat.py
index 095de1b6ca..7f9d754350 100644
--- a/libs/requests/compat.py
+++ b/libs/requests/compat.py
@@ -10,6 +10,18 @@
 import importlib
 import sys
 
+# -------
+# urllib3
+# -------
+from urllib3 import __version__ as urllib3_version
+
+# Detect which major version of urllib3 is being used.
+try:
+    is_urllib3_1 = int(urllib3_version.split(".")[0]) == 1
+except (TypeError, AttributeError):
+    # If we can't discern a version, prefer old functionality.
+    is_urllib3_1 = True
+
 # -------------------
 # Character Detection
 # -------------------
diff --git a/libs/requests/models.py b/libs/requests/models.py
index 8f56ca7d23..c4b25fa079 100644
--- a/libs/requests/models.py
+++ b/libs/requests/models.py
@@ -945,7 +945,9 @@ def text(self):
         return content
 
     def json(self, **kwargs):
-        r"""Returns the json-encoded content of a response, if any.
+        r"""Decodes the JSON response body (if any) as a Python object.
+
+        This may return a dictionary, list, etc. depending on what is in the response.
 
         :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
         :raises requests.exceptions.JSONDecodeError: If the response body does not
diff --git a/libs/requests/sessions.py b/libs/requests/sessions.py
index b387bc36df..731550de88 100644
--- a/libs/requests/sessions.py
+++ b/libs/requests/sessions.py
@@ -535,7 +535,7 @@ def request(
             for multipart encoding upload.
         :param auth: (optional) Auth tuple or callable to enable
             Basic/Digest/Custom HTTP Auth.
-        :param timeout: (optional) How long to wait for the server to send
+        :param timeout: (optional) How many seconds to wait for the server to send
             data before giving up, as a float, or a :ref:`(connect timeout,
             read timeout) <timeouts>` tuple.
         :type timeout: float or tuple
diff --git a/libs/requests/utils.py b/libs/requests/utils.py
index ae6c42f6cb..8ab55852cc 100644
--- a/libs/requests/utils.py
+++ b/libs/requests/utils.py
@@ -38,6 +38,7 @@
     getproxies,
     getproxies_environment,
     integer_types,
+    is_urllib3_1,
 )
 from .compat import parse_http_list as _parse_list_header
 from .compat import (
@@ -136,7 +137,9 @@ def super_len(o):
     total_length = None
     current_position = 0
 
-    if isinstance(o, str):
+    if not is_urllib3_1 and isinstance(o, str):
+        # urllib3 2.x+ treats all strings as utf-8 instead
+        # of latin-1 (iso-8859-1) like http.client.
         o = o.encode("utf-8")
 
     if hasattr(o, "__len__"):
@@ -216,14 +219,7 @@ def get_netrc_auth(url, raise_errors=False):
         netrc_path = None
 
         for f in netrc_locations:
-            try:
-                loc = os.path.expanduser(f)
-            except KeyError:
-                # os.path.expanduser can fail when $HOME is undefined and
-                # getpwuid fails. See https://bugs.python.org/issue20164 &
-                # https://github.com/psf/requests/issues/1846
-                return
-
+            loc = os.path.expanduser(f)
             if os.path.exists(loc):
                 netrc_path = loc
                 break
@@ -233,13 +229,7 @@ def get_netrc_auth(url, raise_errors=False):
             return
 
         ri = urlparse(url)
-
-        # Strip port numbers from netloc. This weird `if...encode`` dance is
-        # used for Python 3.2, which doesn't support unicode literals.
-        splitstr = b":"
-        if isinstance(url, str):
-            splitstr = splitstr.decode("ascii")
-        host = ri.netloc.split(splitstr)[0]
+        host = ri.hostname
 
         try:
             _netrc = netrc(netrc_path).authenticators(host)
diff --git a/libs/requests_oauthlib-2.0.0.dist-info/METADATA b/libs/requests_oauthlib-2.0.0.dist-info/METADATA
index 0a62eb5b6c..1f189bb44e 100644
--- a/libs/requests_oauthlib-2.0.0.dist-info/METADATA
+++ b/libs/requests_oauthlib-2.0.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: requests-oauthlib
 Version: 2.0.0
 Summary: OAuthlib authentication support for Requests.
@@ -26,10 +26,22 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.4
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: oauthlib >=3.0.0
-Requires-Dist: requests >=2.0.0
+Requires-Dist: oauthlib>=3.0.0
+Requires-Dist: requests>=2.0.0
 Provides-Extra: rsa
-Requires-Dist: oauthlib[signedtoken] >=3.0.0 ; extra == 'rsa'
+Requires-Dist: oauthlib[signedtoken]>=3.0.0; extra == "rsa"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Requests-OAuthlib |build-status| |coverage-status| |docs|
 =========================================================
diff --git a/libs/requests_oauthlib-2.0.0.dist-info/RECORD b/libs/requests_oauthlib-2.0.0.dist-info/RECORD
index 746562d4d8..7e984e6a00 100644
--- a/libs/requests_oauthlib-2.0.0.dist-info/RECORD
+++ b/libs/requests_oauthlib-2.0.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 requests_oauthlib-2.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-requests_oauthlib-2.0.0.dist-info/LICENSE,sha256=rgGEavrYqCkf5qCJZvMBWvmo_2ddhLmB-Xk8Ei94dug,745
-requests_oauthlib-2.0.0.dist-info/METADATA,sha256=fYXqOcFm2fIyb4nO6QYzHSyA7S3epNMe_AIABrR_yso,11133
+requests_oauthlib-2.0.0.dist-info/METADATA,sha256=YK3W9qmdQw1SBhoTsk4wKD-P8t_ZLXNQxzhdD-ZOoVs,11389
 requests_oauthlib-2.0.0.dist-info/RECORD,,
 requests_oauthlib-2.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-requests_oauthlib-2.0.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+requests_oauthlib-2.0.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+requests_oauthlib-2.0.0.dist-info/licenses/LICENSE,sha256=rgGEavrYqCkf5qCJZvMBWvmo_2ddhLmB-Xk8Ei94dug,745
 requests_oauthlib-2.0.0.dist-info/top_level.txt,sha256=vx1R42DWBO64h6iu8Gco0F01TVTPWXSRWBaV1GwVRTQ,18
 requests_oauthlib/__init__.py,sha256=chvYiICdcieGrRc_e5WtFxaXq6T_esmicL_BLWDend4,548
 requests_oauthlib/compliance_fixes/__init__.py,sha256=e0qXlL1FTbe7kxTLFmTYN9ipFNZks-sgGiYqhryBobw,377
diff --git a/libs/requests_oauthlib-2.0.0.dist-info/WHEEL b/libs/requests_oauthlib-2.0.0.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/requests_oauthlib-2.0.0.dist-info/WHEEL
+++ b/libs/requests_oauthlib-2.0.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/requests_oauthlib-2.0.0.dist-info/LICENSE b/libs/requests_oauthlib-2.0.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/requests_oauthlib-2.0.0.dist-info/LICENSE
rename to libs/requests_oauthlib-2.0.0.dist-info/licenses/LICENSE
diff --git a/libs/requests_toolbelt-1.0.0.dist-info/METADATA b/libs/requests_toolbelt-1.0.0.dist-info/METADATA
index 7035bf8aec..f190e7f2bd 100644
--- a/libs/requests_toolbelt-1.0.0.dist-info/METADATA
+++ b/libs/requests_toolbelt-1.0.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: requests-toolbelt
 Version: 1.0.0
 Summary: A utility belt for advanced users of python-requests
@@ -29,7 +29,19 @@ Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: requests <3.0.0,>=2.0.1
+Requires-Dist: requests<3.0.0,>=2.0.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 The Requests Toolbelt
 =====================
diff --git a/libs/requests_toolbelt-1.0.0.dist-info/RECORD b/libs/requests_toolbelt-1.0.0.dist-info/RECORD
index f2c58437db..7c90649d56 100644
--- a/libs/requests_toolbelt-1.0.0.dist-info/RECORD
+++ b/libs/requests_toolbelt-1.0.0.dist-info/RECORD
@@ -1,10 +1,10 @@
-requests_toolbelt-1.0.0.dist-info/AUTHORS.rst,sha256=V98Zj2LJCYqslcm47B8LjvwCQID2HVoO2J70xdo88DE,986
 requests_toolbelt-1.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-requests_toolbelt-1.0.0.dist-info/LICENSE,sha256=H4z4vazZjtbTbQ_sDAf3dlrOvW6BIFliq1FGAjs8hY0,596
-requests_toolbelt-1.0.0.dist-info/METADATA,sha256=VKZ6dVIztwCA36fDA6pi-GCk8jScVoOwZm4N6rIWgvI,14636
+requests_toolbelt-1.0.0.dist-info/METADATA,sha256=LaUcu90Y7PpRGkluIMXAtWBEaVc6PX1ViLKYtwJQeKk,14892
 requests_toolbelt-1.0.0.dist-info/RECORD,,
 requests_toolbelt-1.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-requests_toolbelt-1.0.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+requests_toolbelt-1.0.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+requests_toolbelt-1.0.0.dist-info/licenses/AUTHORS.rst,sha256=V98Zj2LJCYqslcm47B8LjvwCQID2HVoO2J70xdo88DE,986
+requests_toolbelt-1.0.0.dist-info/licenses/LICENSE,sha256=H4z4vazZjtbTbQ_sDAf3dlrOvW6BIFliq1FGAjs8hY0,596
 requests_toolbelt-1.0.0.dist-info/top_level.txt,sha256=94d34hHwG8qjeDXYn9Co3jucG_N9CkO-V5kWQ6Cre8w,18
 requests_toolbelt/__init__.py,sha256=ZUDjGuNOjooYe7jy2PoScTWLIr073PfmGUsc_KEp-Vk,1188
 requests_toolbelt/_compat.py,sha256=K7xMtOshOUWDtGG2hBfuw89R1BdkIvAz_x62CCMRvdg,9260
diff --git a/libs/requests_toolbelt-1.0.0.dist-info/WHEEL b/libs/requests_toolbelt-1.0.0.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/requests_toolbelt-1.0.0.dist-info/WHEEL
+++ b/libs/requests_toolbelt-1.0.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/requests_toolbelt-1.0.0.dist-info/AUTHORS.rst b/libs/requests_toolbelt-1.0.0.dist-info/licenses/AUTHORS.rst
similarity index 100%
rename from libs/requests_toolbelt-1.0.0.dist-info/AUTHORS.rst
rename to libs/requests_toolbelt-1.0.0.dist-info/licenses/AUTHORS.rst
diff --git a/libs/requests_toolbelt-1.0.0.dist-info/LICENSE b/libs/requests_toolbelt-1.0.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/requests_toolbelt-1.0.0.dist-info/LICENSE
rename to libs/requests_toolbelt-1.0.0.dist-info/licenses/LICENSE
diff --git a/libs/retry-0.9.2.dist-info/METADATA b/libs/retry-0.9.2.dist-info/METADATA
index f591946edc..00656e5b8c 100644
--- a/libs/retry-0.9.2.dist-info/METADATA
+++ b/libs/retry-0.9.2.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: retry
 Version: 0.9.2
 Summary: Easy to use retry decorator.
@@ -21,8 +21,18 @@ Classifier: Topic :: Software Development
 Requires-Python: >=2.6
 License-File: LICENSE
 License-File: AUTHORS
-Requires-Dist: decorator >=3.4.2
-Requires-Dist: py <2.0.0,>=1.4.26
+Requires-Dist: decorator>=3.4.2
+Requires-Dist: py<2.0.0,>=1.4.26
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 retry
 =====
diff --git a/libs/retry-0.9.2.dist-info/RECORD b/libs/retry-0.9.2.dist-info/RECORD
index a629c5bcf9..d02a022d85 100644
--- a/libs/retry-0.9.2.dist-info/RECORD
+++ b/libs/retry-0.9.2.dist-info/RECORD
@@ -1,11 +1,10 @@
-retry-0.9.2.dist-info/AUTHORS,sha256=tR4nil_6DVdBxkA0kTVGZ5Kp5YYC3d9BZkvkhzfFZ2g,273
 retry-0.9.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-retry-0.9.2.dist-info/LICENSE,sha256=VqAzmK_gh5M_QzkGCKeCSA2xsRYmrI15Xml6g469EsA,545
-retry-0.9.2.dist-info/METADATA,sha256=XpkGncurzTHiBuqVDdPXHtZZTv2-fH8gSAOMJnYOgKs,5812
+retry-0.9.2.dist-info/METADATA,sha256=MxRlJ-rvyyRcZpmgU3wvxPzvmVmbz5w_eKjA0ioAB0o,6012
 retry-0.9.2.dist-info/RECORD,,
 retry-0.9.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-retry-0.9.2.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-retry-0.9.2.dist-info/pbr.json,sha256=45SM2TCSmcOgdyqElFGPXPGnFsGeuJ59rPNkuR0YRtA,46
+retry-0.9.2.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+retry-0.9.2.dist-info/licenses/AUTHORS,sha256=tR4nil_6DVdBxkA0kTVGZ5Kp5YYC3d9BZkvkhzfFZ2g,273
+retry-0.9.2.dist-info/licenses/LICENSE,sha256=VqAzmK_gh5M_QzkGCKeCSA2xsRYmrI15Xml6g469EsA,545
 retry-0.9.2.dist-info/top_level.txt,sha256=bOaAxvIr66O6ATWsfNV5nFtTIoa_8ZK9wVh7ZrtMERQ,6
 retry/__init__.py,sha256=09t-xzaNEZxZOhsRfHaq6xYsAcWc9gvA2MDHvR-29EE,361
 retry/api.py,sha256=NAHdoSzQCS7DLr4mh2ujNCSSmwdqw2BiEzBM1u4cqXk,4391
diff --git a/libs/retry-0.9.2.dist-info/WHEEL b/libs/retry-0.9.2.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/retry-0.9.2.dist-info/WHEEL
+++ b/libs/retry-0.9.2.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/retry-0.9.2.dist-info/AUTHORS b/libs/retry-0.9.2.dist-info/licenses/AUTHORS
similarity index 100%
rename from libs/retry-0.9.2.dist-info/AUTHORS
rename to libs/retry-0.9.2.dist-info/licenses/AUTHORS
diff --git a/libs/retry-0.9.2.dist-info/LICENSE b/libs/retry-0.9.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/retry-0.9.2.dist-info/LICENSE
rename to libs/retry-0.9.2.dist-info/licenses/LICENSE
diff --git a/libs/retry-0.9.2.dist-info/pbr.json b/libs/retry-0.9.2.dist-info/pbr.json
deleted file mode 100644
index 681a4c1de2..0000000000
--- a/libs/retry-0.9.2.dist-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"is_release": true, "git_version": "00b2e8b"}
\ No newline at end of file
diff --git a/libs/rich-13.9.4.dist-info/METADATA b/libs/rich-13.9.4.dist-info/METADATA
deleted file mode 100644
index 7f3ac7f814..0000000000
--- a/libs/rich-13.9.4.dist-info/METADATA
+++ /dev/null
@@ -1,473 +0,0 @@
-Metadata-Version: 2.1
-Name: rich
-Version: 13.9.4
-Summary: Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal
-Home-page: https://github.com/Textualize/rich
-License: MIT
-Author: Will McGugan
-Author-email: willmcgugan@gmail.com
-Requires-Python: >=3.8.0
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Framework :: IPython
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Typing :: Typed
-Provides-Extra: jupyter
-Requires-Dist: ipywidgets (>=7.5.1,<9) ; extra == "jupyter"
-Requires-Dist: markdown-it-py (>=2.2.0)
-Requires-Dist: pygments (>=2.13.0,<3.0.0)
-Requires-Dist: typing-extensions (>=4.0.0,<5.0) ; python_version < "3.11"
-Project-URL: Documentation, https://rich.readthedocs.io/en/latest/
-Description-Content-Type: text/markdown
-
-[![Supported Python Versions](https://img.shields.io/pypi/pyversions/rich/13.2.0)](https://pypi.org/project/rich/) [![PyPI version](https://badge.fury.io/py/rich.svg)](https://badge.fury.io/py/rich)
-
-[![Downloads](https://pepy.tech/badge/rich/month)](https://pepy.tech/project/rich)
-[![codecov](https://img.shields.io/codecov/c/github/Textualize/rich?label=codecov&logo=codecov)](https://codecov.io/gh/Textualize/rich)
-[![Rich blog](https://img.shields.io/badge/blog-rich%20news-yellowgreen)](https://www.willmcgugan.com/tag/rich/)
-[![Twitter Follow](https://img.shields.io/twitter/follow/willmcgugan.svg?style=social)](https://twitter.com/willmcgugan)
-
-![Logo](https://github.com/textualize/rich/raw/master/imgs/logo.svg)
-
-[English readme](https://github.com/textualize/rich/blob/master/README.md)
- โ€ข [็ฎ€ไฝ“ไธญๆ–‡ readme](https://github.com/textualize/rich/blob/master/README.cn.md)
- โ€ข [ๆญฃ้ซ”ไธญๆ–‡ readme](https://github.com/textualize/rich/blob/master/README.zh-tw.md)
- โ€ข [Lengua espaรฑola readme](https://github.com/textualize/rich/blob/master/README.es.md)
- โ€ข [Deutsche readme](https://github.com/textualize/rich/blob/master/README.de.md)
- โ€ข [Lรคs pรฅ svenska](https://github.com/textualize/rich/blob/master/README.sv.md)
- โ€ข [ๆ—ฅๆœฌ่ชž readme](https://github.com/textualize/rich/blob/master/README.ja.md)
- โ€ข [ํ•œ๊ตญ์–ด readme](https://github.com/textualize/rich/blob/master/README.kr.md)
- โ€ข [Franรงais readme](https://github.com/textualize/rich/blob/master/README.fr.md)
- โ€ข [Schwizerdรผtsch readme](https://github.com/textualize/rich/blob/master/README.de-ch.md)
- โ€ข [เคนเคฟเคจเฅเคฆเฅ€ readme](https://github.com/textualize/rich/blob/master/README.hi.md)
- โ€ข [Portuguรชs brasileiro readme](https://github.com/textualize/rich/blob/master/README.pt-br.md)
- โ€ข [Italian readme](https://github.com/textualize/rich/blob/master/README.it.md)
- โ€ข [ะ ัƒััะบะธะน readme](https://github.com/textualize/rich/blob/master/README.ru.md)
- โ€ข [Indonesian readme](https://github.com/textualize/rich/blob/master/README.id.md)
- โ€ข [ูุงุฑุณ�Œ readme](https://github.com/textualize/rich/blob/master/README.fa.md)
- โ€ข [Tรผrkรงe readme](https://github.com/textualize/rich/blob/master/README.tr.md)
- โ€ข [Polskie readme](https://github.com/textualize/rich/blob/master/README.pl.md)
-
-
-Rich is a Python library for _rich_ text and beautiful formatting in the terminal.
-
-The [Rich API](https://rich.readthedocs.io/en/latest/) makes it easy to add color and style to terminal output. Rich can also render pretty tables, progress bars, markdown, syntax highlighted source code, tracebacks, and more โ€” out of the box.
-
-![Features](https://github.com/textualize/rich/raw/master/imgs/features.png)
-
-For a video introduction to Rich see [calmcode.io](https://calmcode.io/rich/introduction.html) by [@fishnets88](https://twitter.com/fishnets88).
-
-See what [people are saying about Rich](https://www.willmcgugan.com/blog/pages/post/rich-tweets/).
-
-## Compatibility
-
-Rich works with Linux, macOS and Windows. True color / emoji works with new Windows Terminal, classic terminal is limited to 16 colors. Rich requires Python 3.8 or later.
-
-Rich works with [Jupyter notebooks](https://jupyter.org/) with no additional configuration required.
-
-## Installing
-
-Install with `pip` or your favorite PyPI package manager.
-
-```sh
-python -m pip install rich
-```
-
-Run the following to test Rich output on your terminal:
-
-```sh
-python -m rich
-```
-
-## Rich Print
-
-To effortlessly add rich output to your application, you can import the [rich print](https://rich.readthedocs.io/en/latest/introduction.html#quick-start) method, which has the same signature as the builtin Python function. Try this:
-
-```python
-from rich import print
-
-print("Hello, [bold magenta]World[/bold magenta]!", ":vampire:", locals())
-```
-
-![Hello World](https://github.com/textualize/rich/raw/master/imgs/print.png)
-
-## Rich REPL
-
-Rich can be installed in the Python REPL, so that any data structures will be pretty printed and highlighted.
-
-```python
->>> from rich import pretty
->>> pretty.install()
-```
-
-![REPL](https://github.com/textualize/rich/raw/master/imgs/repl.png)
-
-## Using the Console
-
-For more control over rich terminal content, import and construct a [Console](https://rich.readthedocs.io/en/latest/reference/console.html#rich.console.Console) object.
-
-```python
-from rich.console import Console
-
-console = Console()
-```
-
-The Console object has a `print` method which has an intentionally similar interface to the builtin `print` function. Here's an example of use:
-
-```python
-console.print("Hello", "World!")
-```
-
-As you might expect, this will print `"Hello World!"` to the terminal. Note that unlike the builtin `print` function, Rich will word-wrap your text to fit within the terminal width.
-
-There are a few ways of adding color and style to your output. You can set a style for the entire output by adding a `style` keyword argument. Here's an example:
-
-```python
-console.print("Hello", "World!", style="bold red")
-```
-
-The output will be something like the following:
-
-![Hello World](https://github.com/textualize/rich/raw/master/imgs/hello_world.png)
-
-That's fine for styling a line of text at a time. For more finely grained styling, Rich renders a special markup which is similar in syntax to [bbcode](https://en.wikipedia.org/wiki/BBCode). Here's an example:
-
-```python
-console.print("Where there is a [bold cyan]Will[/bold cyan] there [u]is[/u] a [i]way[/i].")
-```
-
-![Console Markup](https://github.com/textualize/rich/raw/master/imgs/where_there_is_a_will.png)
-
-You can use a Console object to generate sophisticated output with minimal effort. See the [Console API](https://rich.readthedocs.io/en/latest/console.html) docs for details.
-
-## Rich Inspect
-
-Rich has an [inspect](https://rich.readthedocs.io/en/latest/reference/init.html?highlight=inspect#rich.inspect) function which can produce a report on any Python object, such as class, instance, or builtin.
-
-```python
->>> my_list = ["foo", "bar"]
->>> from rich import inspect
->>> inspect(my_list, methods=True)
-```
-
-![Log](https://github.com/textualize/rich/raw/master/imgs/inspect.png)
-
-See the [inspect docs](https://rich.readthedocs.io/en/latest/reference/init.html#rich.inspect) for details.
-
-# Rich Library
-
-Rich contains a number of builtin _renderables_ you can use to create elegant output in your CLI and help you debug your code.
-
-Click the following headings for details:
-
-<details>
-<summary>Log</summary>
-
-The Console object has a `log()` method which has a similar interface to `print()`, but also renders a column for the current time and the file and line which made the call. By default Rich will do syntax highlighting for Python structures and for repr strings. If you log a collection (i.e. a dict or a list) Rich will pretty print it so that it fits in the available space. Here's an example of some of these features.
-
-```python
-from rich.console import Console
-console = Console()
-
-test_data = [
-    {"jsonrpc": "2.0", "method": "sum", "params": [None, 1, 2, 4, False, True], "id": "1",},
-    {"jsonrpc": "2.0", "method": "notify_hello", "params": [7]},
-    {"jsonrpc": "2.0", "method": "subtract", "params": [42, 23], "id": "2"},
-]
-
-def test_log():
-    enabled = False
-    context = {
-        "foo": "bar",
-    }
-    movies = ["Deadpool", "Rise of the Skywalker"]
-    console.log("Hello from", console, "!")
-    console.log(test_data, log_locals=True)
-
-
-test_log()
-```
-
-The above produces the following output:
-
-![Log](https://github.com/textualize/rich/raw/master/imgs/log.png)
-
-Note the `log_locals` argument, which outputs a table containing the local variables where the log method was called.
-
-The log method could be used for logging to the terminal for long running applications such as servers, but is also a very nice debugging aid.
-
-</details>
-<details>
-<summary>Logging Handler</summary>
-
-You can also use the builtin [Handler class](https://rich.readthedocs.io/en/latest/logging.html) to format and colorize output from Python's logging module. Here's an example of the output:
-
-![Logging](https://github.com/textualize/rich/raw/master/imgs/logging.png)
-
-</details>
-
-<details>
-<summary>Emoji</summary>
-
-To insert an emoji in to console output place the name between two colons. Here's an example:
-
-```python
->>> console.print(":smiley: :vampire: :pile_of_poo: :thumbs_up: :raccoon:")
-๐Ÿ˜ƒ ๐Ÿง› ๐Ÿ’ฉ ๐Ÿ‘ ๐Ÿฆ
-```
-
-Please use this feature wisely.
-
-</details>
-
-<details>
-<summary>Tables</summary>
-
-Rich can render flexible [tables](https://rich.readthedocs.io/en/latest/tables.html) with unicode box characters. There is a large variety of formatting options for borders, styles, cell alignment etc.
-
-![table movie](https://github.com/textualize/rich/raw/master/imgs/table_movie.gif)
-
-The animation above was generated with [table_movie.py](https://github.com/textualize/rich/blob/master/examples/table_movie.py) in the examples directory.
-
-Here's a simpler table example:
-
-```python
-from rich.console import Console
-from rich.table import Table
-
-console = Console()
-
-table = Table(show_header=True, header_style="bold magenta")
-table.add_column("Date", style="dim", width=12)
-table.add_column("Title")
-table.add_column("Production Budget", justify="right")
-table.add_column("Box Office", justify="right")
-table.add_row(
-    "Dec 20, 2019", "Star Wars: The Rise of Skywalker", "$275,000,000", "$375,126,118"
-)
-table.add_row(
-    "May 25, 2018",
-    "[red]Solo[/red]: A Star Wars Story",
-    "$275,000,000",
-    "$393,151,347",
-)
-table.add_row(
-    "Dec 15, 2017",
-    "Star Wars Ep. VIII: The Last Jedi",
-    "$262,000,000",
-    "[bold]$1,332,539,889[/bold]",
-)
-
-console.print(table)
-```
-
-This produces the following output:
-
-![table](https://github.com/textualize/rich/raw/master/imgs/table.png)
-
-Note that console markup is rendered in the same way as `print()` and `log()`. In fact, anything that is renderable by Rich may be included in the headers / rows (even other tables).
-
-The `Table` class is smart enough to resize columns to fit the available width of the terminal, wrapping text as required. Here's the same example, with the terminal made smaller than the table above:
-
-![table2](https://github.com/textualize/rich/raw/master/imgs/table2.png)
-
-</details>
-
-<details>
-<summary>Progress Bars</summary>
-
-Rich can render multiple flicker-free [progress](https://rich.readthedocs.io/en/latest/progress.html) bars to track long-running tasks.
-
-For basic usage, wrap any sequence in the `track` function and iterate over the result. Here's an example:
-
-```python
-from rich.progress import track
-
-for step in track(range(100)):
-    do_step(step)
-```
-
-It's not much harder to add multiple progress bars. Here's an example taken from the docs:
-
-![progress](https://github.com/textualize/rich/raw/master/imgs/progress.gif)
-
-The columns may be configured to show any details you want. Built-in columns include percentage complete, file size, file speed, and time remaining. Here's another example showing a download in progress:
-
-![progress](https://github.com/textualize/rich/raw/master/imgs/downloader.gif)
-
-To try this out yourself, see [examples/downloader.py](https://github.com/textualize/rich/blob/master/examples/downloader.py) which can download multiple URLs simultaneously while displaying progress.
-
-</details>
-
-<details>
-<summary>Status</summary>
-
-For situations where it is hard to calculate progress, you can use the [status](https://rich.readthedocs.io/en/latest/reference/console.html#rich.console.Console.status) method which will display a 'spinner' animation and message. The animation won't prevent you from using the console as normal. Here's an example:
-
-```python
-from time import sleep
-from rich.console import Console
-
-console = Console()
-tasks = [f"task {n}" for n in range(1, 11)]
-
-with console.status("[bold green]Working on tasks...") as status:
-    while tasks:
-        task = tasks.pop(0)
-        sleep(1)
-        console.log(f"{task} complete")
-```
-
-This generates the following output in the terminal.
-
-![status](https://github.com/textualize/rich/raw/master/imgs/status.gif)
-
-The spinner animations were borrowed from [cli-spinners](https://www.npmjs.com/package/cli-spinners). You can select a spinner by specifying the `spinner` parameter. Run the following command to see the available values:
-
-```
-python -m rich.spinner
-```
-
-The above command generates the following output in the terminal:
-
-![spinners](https://github.com/textualize/rich/raw/master/imgs/spinners.gif)
-
-</details>
-
-<details>
-<summary>Tree</summary>
-
-Rich can render a [tree](https://rich.readthedocs.io/en/latest/tree.html) with guide lines. A tree is ideal for displaying a file structure, or any other hierarchical data.
-
-The labels of the tree can be simple text or anything else Rich can render. Run the following for a demonstration:
-
-```
-python -m rich.tree
-```
-
-This generates the following output:
-
-![markdown](https://github.com/textualize/rich/raw/master/imgs/tree.png)
-
-See the [tree.py](https://github.com/textualize/rich/blob/master/examples/tree.py) example for a script that displays a tree view of any directory, similar to the linux `tree` command.
-
-</details>
-
-<details>
-<summary>Columns</summary>
-
-Rich can render content in neat [columns](https://rich.readthedocs.io/en/latest/columns.html) with equal or optimal width. Here's a very basic clone of the (MacOS / Linux) `ls` command which displays a directory listing in columns:
-
-```python
-import os
-import sys
-
-from rich import print
-from rich.columns import Columns
-
-directory = os.listdir(sys.argv[1])
-print(Columns(directory))
-```
-
-The following screenshot is the output from the [columns example](https://github.com/textualize/rich/blob/master/examples/columns.py) which displays data pulled from an API in columns:
-
-![columns](https://github.com/textualize/rich/raw/master/imgs/columns.png)
-
-</details>
-
-<details>
-<summary>Markdown</summary>
-
-Rich can render [markdown](https://rich.readthedocs.io/en/latest/markdown.html) and does a reasonable job of translating the formatting to the terminal.
-
-To render markdown import the `Markdown` class and construct it with a string containing markdown code. Then print it to the console. Here's an example:
-
-```python
-from rich.console import Console
-from rich.markdown import Markdown
-
-console = Console()
-with open("README.md") as readme:
-    markdown = Markdown(readme.read())
-console.print(markdown)
-```
-
-This will produce output something like the following:
-
-![markdown](https://github.com/textualize/rich/raw/master/imgs/markdown.png)
-
-</details>
-
-<details>
-<summary>Syntax Highlighting</summary>
-
-Rich uses the [pygments](https://pygments.org/) library to implement [syntax highlighting](https://rich.readthedocs.io/en/latest/syntax.html). Usage is similar to rendering markdown; construct a `Syntax` object and print it to the console. Here's an example:
-
-```python
-from rich.console import Console
-from rich.syntax import Syntax
-
-my_code = '''
-def iter_first_last(values: Iterable[T]) -> Iterable[Tuple[bool, bool, T]]:
-    """Iterate and generate a tuple with a flag for first and last value."""
-    iter_values = iter(values)
-    try:
-        previous_value = next(iter_values)
-    except StopIteration:
-        return
-    first = True
-    for value in iter_values:
-        yield first, False, previous_value
-        first = False
-        previous_value = value
-    yield first, True, previous_value
-'''
-syntax = Syntax(my_code, "python", theme="monokai", line_numbers=True)
-console = Console()
-console.print(syntax)
-```
-
-This will produce the following output:
-
-![syntax](https://github.com/textualize/rich/raw/master/imgs/syntax.png)
-
-</details>
-
-<details>
-<summary>Tracebacks</summary>
-
-Rich can render [beautiful tracebacks](https://rich.readthedocs.io/en/latest/traceback.html) which are easier to read and show more code than standard Python tracebacks. You can set Rich as the default traceback handler so all uncaught exceptions will be rendered by Rich.
-
-Here's what it looks like on OSX (similar on Linux):
-
-![traceback](https://github.com/textualize/rich/raw/master/imgs/traceback.png)
-
-</details>
-
-All Rich renderables make use of the [Console Protocol](https://rich.readthedocs.io/en/latest/protocol.html), which you can also use to implement your own Rich content.
-
-# Rich CLI
-
-
-See also [Rich CLI](https://github.com/textualize/rich-cli) for a command line application powered by Rich. Syntax highlight code, render markdown, display CSVs in tables, and more, directly from the command prompt.
-
-
-![Rich CLI](https://raw.githubusercontent.com/Textualize/rich-cli/main/imgs/rich-cli-splash.jpg)
-
-# Textual
-
-See also Rich's sister project, [Textual](https://github.com/Textualize/textual), which you can use to build sophisticated User Interfaces in the terminal.
-
-![Textual screenshot](https://raw.githubusercontent.com/Textualize/textual/main/imgs/textual.png)
-
diff --git a/libs/rich-13.9.4.dist-info/RECORD b/libs/rich-13.9.4.dist-info/RECORD
deleted file mode 100644
index 5ed3d366b4..0000000000
--- a/libs/rich-13.9.4.dist-info/RECORD
+++ /dev/null
@@ -1,85 +0,0 @@
-rich-13.9.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-rich-13.9.4.dist-info/LICENSE,sha256=3u18F6QxgVgZCj6iOcyHmlpQJxzruYrnAl9I--WNyhU,1056
-rich-13.9.4.dist-info/METADATA,sha256=dg29ATErmwW3hqOEbIsmWW2Y4ieh38w98r9l8MfIrGI,18274
-rich-13.9.4.dist-info/RECORD,,
-rich-13.9.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rich-13.9.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-rich/__init__.py,sha256=lh2WcoIOJp5M5_lbAsSUMGv8oiJeumROazHH_AYMS8I,6066
-rich/__main__.py,sha256=Wvh53rmOMyWeUeyqUHpn1PXsHlBc4TVcQnqrw46nf9Y,8333
-rich/_cell_widths.py,sha256=fbmeyetEdHjzE_Vx2l1uK7tnPOhMs2X1lJfO3vsKDpA,10209
-rich/_emoji_codes.py,sha256=hu1VL9nbVdppJrVoijVshRlcRRe_v3dju3Mmd2sKZdY,140235
-rich/_emoji_replace.py,sha256=n-kcetsEUx2ZUmhQrfeMNc-teeGhpuSQ5F8VPBsyvDo,1064
-rich/_export_format.py,sha256=RI08pSrm5tBSzPMvnbTqbD9WIalaOoN5d4M1RTmLq1Y,2128
-rich/_extension.py,sha256=G66PkbH_QdTJh6jD-J228O76CmAnr2hLQv72CgPPuzE,241
-rich/_fileno.py,sha256=HWZxP5C2ajMbHryvAQZseflVfQoGzsKOHzKGsLD8ynQ,799
-rich/_inspect.py,sha256=QM05lEFnFoTaFqpnbx-zBEI6k8oIKrD3cvjEOQNhKig,9655
-rich/_log_render.py,sha256=xBKCxqiO4FZk8eG56f8crFdrmJxFrJsQE3V3F-fFekc,3213
-rich/_loop.py,sha256=hV_6CLdoPm0va22Wpw4zKqM0RYsz3TZxXj0PoS-9eDQ,1236
-rich/_null_file.py,sha256=ADGKp1yt-k70FMKV6tnqCqecB-rSJzp-WQsD7LPL-kg,1394
-rich/_palettes.py,sha256=cdev1JQKZ0JvlguV9ipHgznTdnvlIzUFDBb0It2PzjI,7063
-rich/_pick.py,sha256=evDt8QN4lF5CiwrUIXlOJCntitBCOsI3ZLPEIAVRLJU,423
-rich/_ratio.py,sha256=d2k38QnkJKhkHAqqSseqMQ-ZuvgbwnocRKhMQq84EdI,5459
-rich/_spinners.py,sha256=U2r1_g_1zSjsjiUdAESc2iAMc3i4ri_S8PYP6kQ5z1I,19919
-rich/_stack.py,sha256=-C8OK7rxn3sIUdVwxZBBpeHhIzX0eI-VM3MemYfaXm0,351
-rich/_timer.py,sha256=zelxbT6oPFZnNrwWPpc1ktUeAT-Vc4fuFcRZLQGLtMI,417
-rich/_win32_console.py,sha256=o2QN_IRx10biGP3Ap1neaqX8FBGlUKSmWM6Kw4OSg-U,22719
-rich/_windows.py,sha256=is3WpbHMj8WaTHYB11hc6lP2t4hlvt4TViTlHSmjsi0,1901
-rich/_windows_renderer.py,sha256=d799xOnxLbCCCzGu9-U7YLmIQkxtxQIBFQQ6iu4veSc,2759
-rich/_wrap.py,sha256=FlSsom5EX0LVkA3KWy34yHnCfLtqX-ZIepXKh-70rpc,3404
-rich/abc.py,sha256=dALMOGfKVNeAbvqq66IpTQxQUerxD7AE4FKwqd0eQKk,878
-rich/align.py,sha256=gxlfgvi4ah8ERmg8RpGFtWY1Z4WBuWm-6qSIUSFx4bQ,10421
-rich/ansi.py,sha256=Avs1LHbSdcyOvDOdpELZUoULcBiYewY76eNBp6uFBhs,6921
-rich/bar.py,sha256=ldbVHOzKJOnflVNuv1xS7g6dLX2E3wMnXkdPbpzJTcs,3263
-rich/box.py,sha256=46rA0eBKLBcqNhCXmEKS4pN1dz36F0Vzi52hyVT-tyc,10783
-rich/cells.py,sha256=KrQkj5-LghCCpJLSNQIyAZjndc4bnEqOEmi5YuZ9UCY,5130
-rich/color.py,sha256=3HSULVDj7qQkXUdFWv78JOiSZzfy5y1nkcYhna296V0,18211
-rich/color_triplet.py,sha256=3lhQkdJbvWPoLDO-AnYImAWmJvV5dlgYNCVZ97ORaN4,1054
-rich/columns.py,sha256=HUX0KcMm9dsKNi11fTbiM_h2iDtl8ySCaVcxlalEzq8,7131
-rich/console.py,sha256=zgSwvRDPiDXh6wQ_kbnNSxff-s7uuljVmaTeoYPyh6E,100084
-rich/constrain.py,sha256=1VIPuC8AgtKWrcncQrjBdYqA3JVWysu6jZo1rrh7c7Q,1288
-rich/containers.py,sha256=c_56TxcedGYqDepHBMTuZdUIijitAQgnox-Qde0Z1qo,5502
-rich/control.py,sha256=Ix-rO8ZhSB2q1Biazr4l72ZyAw27H9or7ElipWVVo0M,6606
-rich/default_styles.py,sha256=gY-aX6rUxxlxdOOt5CqxnltpFDQqqqdHuXwAy2OD1o8,8123
-rich/diagnose.py,sha256=ZopD2EpWVtmmKptgbXT-sOMkAJ7DGrMSUXUiaU2GZ78,924
-rich/emoji.py,sha256=1jTRHFwvQxY1ciul22MdEZcWc7brfjKT8FG6ZjXj5dM,2465
-rich/errors.py,sha256=5pP3Kc5d4QJ_c0KFsxrfyhjiPVe7J1zOqSFbFAzcV-Y,642
-rich/file_proxy.py,sha256=Tl9THMDZ-Pk5Wm8sI1gGg_U5DhusmxD-FZ0fUbcU0W0,1683
-rich/filesize.py,sha256=_iz9lIpRgvW7MNSeCZnLg-HwzbP4GETg543WqD8SFs0,2484
-rich/highlighter.py,sha256=G_sn-8DKjM1sEjLG_oc4ovkWmiUpWvj8bXi0yed2LnY,9586
-rich/json.py,sha256=omC2WHTgURxEosna1ftoSJCne2EX7MDuQtCdswS3qsk,5019
-rich/jupyter.py,sha256=G9pOJmR4ESIFYSd4MKGqmHqCtstx0oRWpyeTgv54-Xc,3228
-rich/layout.py,sha256=WR8PCSroYnteIT3zawxQ3k3ad1sQO5wGG1SZOoeBuBM,13944
-rich/live.py,sha256=DhzAPEnjTxQuq9_0Y2xh2MUwQcP_aGPkenLfKETslwM,14270
-rich/live_render.py,sha256=QaiB8dtGikCdssoXpkEmmiH55fxT-9bzLkBO9pbBvrU,3654
-rich/logging.py,sha256=aqZpsmIEE45-wbnZqWnEaNSdQ89cbGcaL26-ZV0poj0,12446
-rich/markdown.py,sha256=eDi7dMN7RQD5u21tuqCOSpNWGZdKmyGtKmaZNt257rA,25969
-rich/markup.py,sha256=btpr271BLhiCR1jNglRnv2BpIzVcNefYwSMeW9teDbc,8427
-rich/measure.py,sha256=HmrIJX8sWRTHbgh8MxEay_83VkqNW_70s8aKP5ZcYI8,5305
-rich/padding.py,sha256=h8XnIivLrNtlxI3vQPKHXh4hAwjOJqZx0slM0z3g1_M,4896
-rich/pager.py,sha256=SO_ETBFKbg3n_AgOzXm41Sv36YxXAyI3_R-KOY2_uSc,828
-rich/palette.py,sha256=Ar6ZUrYHiFt6-Rr2k-k9F8V7hxgJYHNdqjk2vVXsLgc,3288
-rich/panel.py,sha256=fFRHcviXvWhk3V3zx5Zwmsb_RL9KJ3esD-sU0NYEVyw,11235
-rich/pretty.py,sha256=eQs437AksYaCB2qO_d-z6e0DF_t5F1KfXfa1Hi-Ya0E,36355
-rich/progress.py,sha256=tLmBGHrAfxIQxfB2kq1IpNXTVFNuvl9bXd_QkLQUN8Q,60333
-rich/progress_bar.py,sha256=mZTPpJUwcfcdgQCTTz3kyY-fc79ddLwtx6Ghhxfo064,8162
-rich/prompt.py,sha256=k0CUIW-3I55jGk8U3O1WiEhdF6yXa2EiWeRqRhuJXWA,12435
-rich/protocol.py,sha256=Wt-2HZd67OYiopUkCTOz7lM38vyo5r3HEQZ9TOPDl5Q,1367
-rich/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rich/region.py,sha256=rNT9xZrVZTYIXZC0NYn41CJQwYNbR-KecPOxTgQvB8Y,166
-rich/repr.py,sha256=HIsurPLZK9Gray75l3_vQx7S27AzTpAj4ChXSfe1Fes,4419
-rich/rule.py,sha256=umO21Wjw0FcYAeTB3UumNLCsDWhejzxnjlf2VwiXiDI,4590
-rich/scope.py,sha256=lf6Qet_e4JOY34lwhYSAG-NBXYKBcYu6t_igv_JoGog,2831
-rich/screen.py,sha256=rL_j2wX-4SeuIOI2oOlc418QP9EAvD59GInUmEAE6jQ,1579
-rich/segment.py,sha256=7gOdwSPrzu0a2gRmxBDtu3u2S8iG5s9l7wlB58dKMy0,24707
-rich/spinner.py,sha256=PT5qgXPG3ZpqRj7n3EZQ6NW56mx3ldZqZCU7gEMyZk4,4364
-rich/status.py,sha256=kkPph3YeAZBo-X-4wPp8gTqZyU466NLwZBA4PZTTewo,4424
-rich/style.py,sha256=aSoUNbVgfP1PAnduAqgbbl4AMQy668qs2S1FEwr3Oqs,27067
-rich/styled.py,sha256=wljVsVTXbABMMZvkzkO43ZEk_-irzEtvUiQ-sNnikQ8,1234
-rich/syntax.py,sha256=NY1DRIqXBkFExudqxm5K3BJXFCttN63AF_3IZAvtLMg,35655
-rich/table.py,sha256=RX26U8oHV0s1U-gl6WqylfesmOT2qt7VVtMtC18-Pk0,40067
-rich/terminal_theme.py,sha256=1j5-ufJfnvlAo5Qsi_ACZiXDmwMXzqgmFByObT9-yJY,3370
-rich/text.py,sha256=v-vCOG8gS_D5QDhOhU19478-yEJGAXKVi8iYCCk7O_M,47540
-rich/theme.py,sha256=oNyhXhGagtDlbDye3tVu3esWOWk0vNkuxFw-_unlaK0,3771
-rich/themes.py,sha256=0xgTLozfabebYtcJtDdC5QkX5IVUEaviqDUJJh4YVFk,102
-rich/traceback.py,sha256=hCLOig4Uwtc7f0FqseEkFZ8YUwzvGOli8BOG517mipg,31725
-rich/tree.py,sha256=QoOwg424FkdwGfR8K0tZ6Q7qtzWNAUP_m4sFaYuG6nw,9391
diff --git a/libs/rich-13.9.4.dist-info/WHEEL b/libs/rich-13.9.4.dist-info/WHEEL
deleted file mode 100644
index 8b9b3a1bf3..0000000000
--- a/libs/rich-13.9.4.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/pytz_deprecation_shim-0.1.0.post0.dist-info/INSTALLER b/libs/rich-14.3.3.dist-info/INSTALLER
similarity index 100%
rename from libs/pytz_deprecation_shim-0.1.0.post0.dist-info/INSTALLER
rename to libs/rich-14.3.3.dist-info/INSTALLER
diff --git a/libs/rich-14.3.3.dist-info/METADATA b/libs/rich-14.3.3.dist-info/METADATA
new file mode 100644
index 0000000000..9f6bc96c6d
--- /dev/null
+++ b/libs/rich-14.3.3.dist-info/METADATA
@@ -0,0 +1,480 @@
+Metadata-Version: 2.4
+Name: rich
+Version: 14.3.3
+Summary: Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal
+License: MIT
+License-File: LICENSE
+Author: Will McGugan
+Author-email: willmcgugan@gmail.com
+Requires-Python: >=3.8.0
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Framework :: IPython
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Typing :: Typed
+Provides-Extra: jupyter
+Requires-Dist: ipywidgets (>=7.5.1,<9) ; extra == "jupyter"
+Requires-Dist: markdown-it-py (>=2.2.0)
+Requires-Dist: pygments (>=2.13.0,<3.0.0)
+Project-URL: Documentation, https://rich.readthedocs.io/en/latest/
+Project-URL: Homepage, https://github.com/Textualize/rich
+Description-Content-Type: text/markdown
+
+[![Supported Python Versions](https://img.shields.io/pypi/pyversions/rich)](https://pypi.org/project/rich/) [![PyPI version](https://badge.fury.io/py/rich.svg)](https://badge.fury.io/py/rich)
+
+[![Downloads](https://pepy.tech/badge/rich/month)](https://pepy.tech/project/rich)
+[![codecov](https://img.shields.io/codecov/c/github/Textualize/rich?label=codecov&logo=codecov)](https://codecov.io/gh/Textualize/rich)
+[![Rich blog](https://img.shields.io/badge/blog-rich%20news-yellowgreen)](https://www.willmcgugan.com/tag/rich/)
+[![Twitter Follow](https://img.shields.io/twitter/follow/willmcgugan.svg?style=social)](https://twitter.com/willmcgugan)
+
+![Logo](https://github.com/textualize/rich/raw/master/imgs/logo.svg)
+
+[English readme](https://github.com/textualize/rich/blob/master/README.md)
+ โ€ข [็ฎ€ไฝ“ไธญๆ–‡ readme](https://github.com/textualize/rich/blob/master/README.cn.md)
+ โ€ข [ๆญฃ้ซ”ไธญๆ–‡ readme](https://github.com/textualize/rich/blob/master/README.zh-tw.md)
+ โ€ข [Lengua espaรฑola readme](https://github.com/textualize/rich/blob/master/README.es.md)
+ โ€ข [Deutsche readme](https://github.com/textualize/rich/blob/master/README.de.md)
+ โ€ข [Lรคs pรฅ svenska](https://github.com/textualize/rich/blob/master/README.sv.md)
+ โ€ข [ๆ—ฅๆœฌ่ชž readme](https://github.com/textualize/rich/blob/master/README.ja.md)
+ โ€ข [ํ•œ๊ตญ์–ด readme](https://github.com/textualize/rich/blob/master/README.kr.md)
+ โ€ข [Franรงais readme](https://github.com/textualize/rich/blob/master/README.fr.md)
+ โ€ข [Schwizerdรผtsch readme](https://github.com/textualize/rich/blob/master/README.de-ch.md)
+ โ€ข [เคนเคฟเคจเฅเคฆเฅ€ readme](https://github.com/textualize/rich/blob/master/README.hi.md)
+ โ€ข [Portuguรชs brasileiro readme](https://github.com/textualize/rich/blob/master/README.pt-br.md)
+ โ€ข [Italian readme](https://github.com/textualize/rich/blob/master/README.it.md)
+ โ€ข [ะ ัƒััะบะธะน readme](https://github.com/textualize/rich/blob/master/README.ru.md)
+ โ€ข [Indonesian readme](https://github.com/textualize/rich/blob/master/README.id.md)
+ โ€ข [ูุงุฑุณ�Œ readme](https://github.com/textualize/rich/blob/master/README.fa.md)
+ โ€ข [Tรผrkรงe readme](https://github.com/textualize/rich/blob/master/README.tr.md)
+ โ€ข [Polskie readme](https://github.com/textualize/rich/blob/master/README.pl.md)
+
+
+Rich is a Python library for _rich_ text and beautiful formatting in the terminal.
+
+The [Rich API](https://rich.readthedocs.io/en/latest/) makes it easy to add color and style to terminal output. Rich can also render pretty tables, progress bars, markdown, syntax highlighted source code, tracebacks, and more โ€” out of the box.
+
+![Features](https://github.com/textualize/rich/raw/master/imgs/features.png)
+
+For a video introduction to Rich see [calmcode.io](https://calmcode.io/rich/introduction.html) by [@fishnets88](https://twitter.com/fishnets88).
+
+See what [people are saying about Rich](https://www.willmcgugan.com/blog/pages/post/rich-tweets/).
+
+## Compatibility
+
+Rich works with Linux, macOS and Windows. True color / emoji works with new Windows Terminal, classic terminal is limited to 16 colors. Rich requires Python 3.8 or later.
+
+Rich works with [Jupyter notebooks](https://jupyter.org/) with no additional configuration required.
+
+## Installing
+
+Install with `pip` or your favorite PyPI package manager.
+
+```sh
+python -m pip install rich
+```
+
+Run the following to test Rich output on your terminal:
+
+```sh
+python -m rich
+```
+
+## Rich Print
+
+To effortlessly add rich output to your application, you can import the [rich print](https://rich.readthedocs.io/en/latest/introduction.html#quick-start) method, which has the same signature as the builtin Python function. Try this:
+
+```python
+from rich import print
+
+print("Hello, [bold magenta]World[/bold magenta]!", ":vampire:", locals())
+```
+
+![Hello World](https://github.com/textualize/rich/raw/master/imgs/print.png)
+
+## Rich REPL
+
+Rich can be installed in the Python REPL, so that any data structures will be pretty printed and highlighted.
+
+```python
+>>> from rich import pretty
+>>> pretty.install()
+```
+
+![REPL](https://github.com/textualize/rich/raw/master/imgs/repl.png)
+
+## Using the Console
+
+For more control over rich terminal content, import and construct a [Console](https://rich.readthedocs.io/en/latest/reference/console.html#rich.console.Console) object.
+
+```python
+from rich.console import Console
+
+console = Console()
+```
+
+The Console object has a `print` method which has an intentionally similar interface to the builtin `print` function. Here's an example of use:
+
+```python
+console.print("Hello", "World!")
+```
+
+As you might expect, this will print `"Hello World!"` to the terminal. Note that unlike the builtin `print` function, Rich will word-wrap your text to fit within the terminal width.
+
+There are a few ways of adding color and style to your output. You can set a style for the entire output by adding a `style` keyword argument. Here's an example:
+
+```python
+console.print("Hello", "World!", style="bold red")
+```
+
+The output will be something like the following:
+
+![Hello World](https://github.com/textualize/rich/raw/master/imgs/hello_world.png)
+
+That's fine for styling a line of text at a time. For more finely grained styling, Rich renders a special markup which is similar in syntax to [bbcode](https://en.wikipedia.org/wiki/BBCode). Here's an example:
+
+```python
+console.print("Where there is a [bold cyan]Will[/bold cyan] there [u]is[/u] a [i]way[/i].")
+```
+
+![Console Markup](https://github.com/textualize/rich/raw/master/imgs/where_there_is_a_will.png)
+
+You can use a Console object to generate sophisticated output with minimal effort. See the [Console API](https://rich.readthedocs.io/en/latest/console.html) docs for details.
+
+## Rich Inspect
+
+Rich has an [inspect](https://rich.readthedocs.io/en/latest/reference/init.html?highlight=inspect#rich.inspect) function which can produce a report on any Python object, such as class, instance, or builtin.
+
+```python
+>>> my_list = ["foo", "bar"]
+>>> from rich import inspect
+>>> inspect(my_list, methods=True)
+```
+
+![Log](https://github.com/textualize/rich/raw/master/imgs/inspect.png)
+
+See the [inspect docs](https://rich.readthedocs.io/en/latest/reference/init.html#rich.inspect) for details.
+
+# Rich Library
+
+Rich contains a number of builtin _renderables_ you can use to create elegant output in your CLI and help you debug your code.
+
+Click the following headings for details:
+
+<details>
+<summary>Log</summary>
+
+The Console object has a `log()` method which has a similar interface to `print()`, but also renders a column for the current time and the file and line which made the call. By default Rich will do syntax highlighting for Python structures and for repr strings. If you log a collection (i.e. a dict or a list) Rich will pretty print it so that it fits in the available space. Here's an example of some of these features.
+
+```python
+from rich.console import Console
+console = Console()
+
+test_data = [
+    {"jsonrpc": "2.0", "method": "sum", "params": [None, 1, 2, 4, False, True], "id": "1",},
+    {"jsonrpc": "2.0", "method": "notify_hello", "params": [7]},
+    {"jsonrpc": "2.0", "method": "subtract", "params": [42, 23], "id": "2"},
+]
+
+def test_log():
+    enabled = False
+    context = {
+        "foo": "bar",
+    }
+    movies = ["Deadpool", "Rise of the Skywalker"]
+    console.log("Hello from", console, "!")
+    console.log(test_data, log_locals=True)
+
+
+test_log()
+```
+
+The above produces the following output:
+
+![Log](https://github.com/textualize/rich/raw/master/imgs/log.png)
+
+Note the `log_locals` argument, which outputs a table containing the local variables where the log method was called.
+
+The log method could be used for logging to the terminal for long running applications such as servers, but is also a very nice debugging aid.
+
+</details>
+<details>
+<summary>Logging Handler</summary>
+
+You can also use the builtin [Handler class](https://rich.readthedocs.io/en/latest/logging.html) to format and colorize output from Python's logging module. Here's an example of the output:
+
+![Logging](https://github.com/textualize/rich/raw/master/imgs/logging.png)
+
+</details>
+
+<details>
+<summary>Emoji</summary>
+
+To insert an emoji in to console output place the name between two colons. Here's an example:
+
+```python
+>>> console.print(":smiley: :vampire: :pile_of_poo: :thumbs_up: :raccoon:")
+๐Ÿ˜ƒ ๐Ÿง› ๐Ÿ’ฉ ๐Ÿ‘ ๐Ÿฆ
+```
+
+Please use this feature wisely.
+
+</details>
+
+<details>
+<summary>Tables</summary>
+
+Rich can render flexible [tables](https://rich.readthedocs.io/en/latest/tables.html) with unicode box characters. There is a large variety of formatting options for borders, styles, cell alignment etc.
+
+![table movie](https://github.com/textualize/rich/raw/master/imgs/table_movie.gif)
+
+The animation above was generated with [table_movie.py](https://github.com/textualize/rich/blob/master/examples/table_movie.py) in the examples directory.
+
+Here's a simpler table example:
+
+```python
+from rich.console import Console
+from rich.table import Table
+
+console = Console()
+
+table = Table(show_header=True, header_style="bold magenta")
+table.add_column("Date", style="dim", width=12)
+table.add_column("Title")
+table.add_column("Production Budget", justify="right")
+table.add_column("Box Office", justify="right")
+table.add_row(
+    "Dec 20, 2019", "Star Wars: The Rise of Skywalker", "$275,000,000", "$375,126,118"
+)
+table.add_row(
+    "May 25, 2018",
+    "[red]Solo[/red]: A Star Wars Story",
+    "$275,000,000",
+    "$393,151,347",
+)
+table.add_row(
+    "Dec 15, 2017",
+    "Star Wars Ep. VIII: The Last Jedi",
+    "$262,000,000",
+    "[bold]$1,332,539,889[/bold]",
+)
+
+console.print(table)
+```
+
+This produces the following output:
+
+![table](https://github.com/textualize/rich/raw/master/imgs/table.png)
+
+Note that console markup is rendered in the same way as `print()` and `log()`. In fact, anything that is renderable by Rich may be included in the headers / rows (even other tables).
+
+The `Table` class is smart enough to resize columns to fit the available width of the terminal, wrapping text as required. Here's the same example, with the terminal made smaller than the table above:
+
+![table2](https://github.com/textualize/rich/raw/master/imgs/table2.png)
+
+</details>
+
+<details>
+<summary>Progress Bars</summary>
+
+Rich can render multiple flicker-free [progress](https://rich.readthedocs.io/en/latest/progress.html) bars to track long-running tasks.
+
+For basic usage, wrap any sequence in the `track` function and iterate over the result. Here's an example:
+
+```python
+from rich.progress import track
+
+for step in track(range(100)):
+    do_step(step)
+```
+
+It's not much harder to add multiple progress bars. Here's an example taken from the docs:
+
+![progress](https://github.com/textualize/rich/raw/master/imgs/progress.gif)
+
+The columns may be configured to show any details you want. Built-in columns include percentage complete, file size, file speed, and time remaining. Here's another example showing a download in progress:
+
+![progress](https://github.com/textualize/rich/raw/master/imgs/downloader.gif)
+
+To try this out yourself, see [examples/downloader.py](https://github.com/textualize/rich/blob/master/examples/downloader.py) which can download multiple URLs simultaneously while displaying progress.
+
+</details>
+
+<details>
+<summary>Status</summary>
+
+For situations where it is hard to calculate progress, you can use the [status](https://rich.readthedocs.io/en/latest/reference/console.html#rich.console.Console.status) method which will display a 'spinner' animation and message. The animation won't prevent you from using the console as normal. Here's an example:
+
+```python
+from time import sleep
+from rich.console import Console
+
+console = Console()
+tasks = [f"task {n}" for n in range(1, 11)]
+
+with console.status("[bold green]Working on tasks...") as status:
+    while tasks:
+        task = tasks.pop(0)
+        sleep(1)
+        console.log(f"{task} complete")
+```
+
+This generates the following output in the terminal.
+
+![status](https://github.com/textualize/rich/raw/master/imgs/status.gif)
+
+The spinner animations were borrowed from [cli-spinners](https://www.npmjs.com/package/cli-spinners). You can select a spinner by specifying the `spinner` parameter. Run the following command to see the available values:
+
+```
+python -m rich.spinner
+```
+
+The above command generates the following output in the terminal:
+
+![spinners](https://github.com/textualize/rich/raw/master/imgs/spinners.gif)
+
+</details>
+
+<details>
+<summary>Tree</summary>
+
+Rich can render a [tree](https://rich.readthedocs.io/en/latest/tree.html) with guide lines. A tree is ideal for displaying a file structure, or any other hierarchical data.
+
+The labels of the tree can be simple text or anything else Rich can render. Run the following for a demonstration:
+
+```
+python -m rich.tree
+```
+
+This generates the following output:
+
+![markdown](https://github.com/textualize/rich/raw/master/imgs/tree.png)
+
+See the [tree.py](https://github.com/textualize/rich/blob/master/examples/tree.py) example for a script that displays a tree view of any directory, similar to the linux `tree` command.
+
+</details>
+
+<details>
+<summary>Columns</summary>
+
+Rich can render content in neat [columns](https://rich.readthedocs.io/en/latest/columns.html) with equal or optimal width. Here's a very basic clone of the (MacOS / Linux) `ls` command which displays a directory listing in columns:
+
+```python
+import os
+import sys
+
+from rich import print
+from rich.columns import Columns
+
+directory = os.listdir(sys.argv[1])
+print(Columns(directory))
+```
+
+The following screenshot is the output from the [columns example](https://github.com/textualize/rich/blob/master/examples/columns.py) which displays data pulled from an API in columns:
+
+![columns](https://github.com/textualize/rich/raw/master/imgs/columns.png)
+
+</details>
+
+<details>
+<summary>Markdown</summary>
+
+Rich can render [markdown](https://rich.readthedocs.io/en/latest/markdown.html) and does a reasonable job of translating the formatting to the terminal.
+
+To render markdown import the `Markdown` class and construct it with a string containing markdown code. Then print it to the console. Here's an example:
+
+```python
+from rich.console import Console
+from rich.markdown import Markdown
+
+console = Console()
+with open("README.md") as readme:
+    markdown = Markdown(readme.read())
+console.print(markdown)
+```
+
+This will produce output something like the following:
+
+![markdown](https://github.com/textualize/rich/raw/master/imgs/markdown.png)
+
+</details>
+
+<details>
+<summary>Syntax Highlighting</summary>
+
+Rich uses the [pygments](https://pygments.org/) library to implement [syntax highlighting](https://rich.readthedocs.io/en/latest/syntax.html). Usage is similar to rendering markdown; construct a `Syntax` object and print it to the console. Here's an example:
+
+```python
+from rich.console import Console
+from rich.syntax import Syntax
+
+my_code = '''
+def iter_first_last(values: Iterable[T]) -> Iterable[Tuple[bool, bool, T]]:
+    """Iterate and generate a tuple with a flag for first and last value."""
+    iter_values = iter(values)
+    try:
+        previous_value = next(iter_values)
+    except StopIteration:
+        return
+    first = True
+    for value in iter_values:
+        yield first, False, previous_value
+        first = False
+        previous_value = value
+    yield first, True, previous_value
+'''
+syntax = Syntax(my_code, "python", theme="monokai", line_numbers=True)
+console = Console()
+console.print(syntax)
+```
+
+This will produce the following output:
+
+![syntax](https://github.com/textualize/rich/raw/master/imgs/syntax.png)
+
+</details>
+
+<details>
+<summary>Tracebacks</summary>
+
+Rich can render [beautiful tracebacks](https://rich.readthedocs.io/en/latest/traceback.html) which are easier to read and show more code than standard Python tracebacks. You can set Rich as the default traceback handler so all uncaught exceptions will be rendered by Rich.
+
+Here's what it looks like on OSX (similar on Linux):
+
+![traceback](https://github.com/textualize/rich/raw/master/imgs/traceback.png)
+
+</details>
+
+All Rich renderables make use of the [Console Protocol](https://rich.readthedocs.io/en/latest/protocol.html), which you can also use to implement your own Rich content.
+
+# Rich CLI
+
+
+See also [Rich CLI](https://github.com/textualize/rich-cli) for a command line application powered by Rich. Syntax highlight code, render markdown, display CSVs in tables, and more, directly from the command prompt.
+
+
+![Rich CLI](https://raw.githubusercontent.com/Textualize/rich-cli/main/imgs/rich-cli-splash.jpg)
+
+# Textual
+
+See also Rich's sister project, [Textual](https://github.com/Textualize/textual), which you can use to build sophisticated User Interfaces in the terminal.
+
+![textual-splash](https://github.com/user-attachments/assets/4caeb77e-48c0-4cf7-b14d-c53ded855ffd)
+
+# Toad
+
+[Toad](https://github.com/batrachianai/toad) is a unified interface for agentic coding. Built with Rich and Textual.
+
+![toad](https://github.com/user-attachments/assets/6678b707-1aeb-420f-99ad-abfcd4356771)
+
diff --git a/libs/rich-14.3.3.dist-info/RECORD b/libs/rich-14.3.3.dist-info/RECORD
new file mode 100644
index 0000000000..fea25aa7e7
--- /dev/null
+++ b/libs/rich-14.3.3.dist-info/RECORD
@@ -0,0 +1,107 @@
+rich-14.3.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+rich-14.3.3.dist-info/METADATA,sha256=9kOnJPejl6vTwavl35qTJmtKu218p9Ob-z-jDoz1ATo,18495
+rich-14.3.3.dist-info/RECORD,,
+rich-14.3.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rich-14.3.3.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+rich-14.3.3.dist-info/licenses/LICENSE,sha256=3u18F6QxgVgZCj6iOcyHmlpQJxzruYrnAl9I--WNyhU,1056
+rich/__init__.py,sha256=j7AA9_z_PANQbmRTwTkWZc_DVdqtBBHxBqGrMsz21CI,6131
+rich/__main__.py,sha256=kcy8BtBEUkYLCogRkwhCdJs0VNx6KF1n8kFU2g-7plg,7725
+rich/_emoji_codes.py,sha256=hu1VL9nbVdppJrVoijVshRlcRRe_v3dju3Mmd2sKZdY,140235
+rich/_emoji_replace.py,sha256=n-kcetsEUx2ZUmhQrfeMNc-teeGhpuSQ5F8VPBsyvDo,1064
+rich/_export_format.py,sha256=RI08pSrm5tBSzPMvnbTqbD9WIalaOoN5d4M1RTmLq1Y,2128
+rich/_extension.py,sha256=G66PkbH_QdTJh6jD-J228O76CmAnr2hLQv72CgPPuzE,241
+rich/_fileno.py,sha256=HWZxP5C2ajMbHryvAQZseflVfQoGzsKOHzKGsLD8ynQ,799
+rich/_inspect.py,sha256=5pUYCqveN4ekb_mgHOYCipyZCrMGEJZYZs3y5QqmCf0,9894
+rich/_log_render.py,sha256=xBKCxqiO4FZk8eG56f8crFdrmJxFrJsQE3V3F-fFekc,3213
+rich/_loop.py,sha256=hV_6CLdoPm0va22Wpw4zKqM0RYsz3TZxXj0PoS-9eDQ,1236
+rich/_null_file.py,sha256=ADGKp1yt-k70FMKV6tnqCqecB-rSJzp-WQsD7LPL-kg,1394
+rich/_palettes.py,sha256=cdev1JQKZ0JvlguV9ipHgznTdnvlIzUFDBb0It2PzjI,7063
+rich/_pick.py,sha256=evDt8QN4lF5CiwrUIXlOJCntitBCOsI3ZLPEIAVRLJU,423
+rich/_ratio.py,sha256=IOtl78sQCYZsmHyxhe45krkb68u9xVz7zFsXVJD-b2Y,5325
+rich/_spinners.py,sha256=U2r1_g_1zSjsjiUdAESc2iAMc3i4ri_S8PYP6kQ5z1I,19919
+rich/_stack.py,sha256=-C8OK7rxn3sIUdVwxZBBpeHhIzX0eI-VM3MemYfaXm0,351
+rich/_timer.py,sha256=zelxbT6oPFZnNrwWPpc1ktUeAT-Vc4fuFcRZLQGLtMI,417
+rich/_unicode_data/__init__.py,sha256=40PhAFp3b88yPnRtTG6i9g5xj-5w98CET3C4Ip1LJAI,2631
+rich/_unicode_data/_versions.py,sha256=ftILR3G5dqmlQmCJYNovuyXfFneJY2eH2RvpV19tyYE,298
+rich/_unicode_data/unicode10-0-0.py,sha256=FUstYPZwDF15BEuAERqXHqIPvC1KY1SL20qLj999Fzo,14496
+rich/_unicode_data/unicode11-0-0.py,sha256=jp8SRKFBlIaHMafxAfhLiU7FizwdcgPVvytR3kSFtZo,14874
+rich/_unicode_data/unicode12-0-0.py,sha256=0XHXSjW5EXue6Qfgl_u0bK7NstiSdmqrR_F_Wqhs5bE,15216
+rich/_unicode_data/unicode12-1-0.py,sha256=kWcRGh1UVwsmK9qflfGsO_aM8AuNhLthJcsyXAOQryI,15189
+rich/_unicode_data/unicode13-0-0.py,sha256=DokduALtgaB-WvapW7X7PmM3kZFbgnCo9ifINWZtuDs,15519
+rich/_unicode_data/unicode14-0-0.py,sha256=Ni-3JnGf5sB4kGl8ip-Iyqoum-awJjZV0RoSNuo0yu8,15884
+rich/_unicode_data/unicode15-0-0.py,sha256=DBHkV5Si9vmtv_MiW6NmPQb8yUeP4N-9hNt2juZr4ZE,16156
+rich/_unicode_data/unicode15-1-0.py,sha256=uyCZLYrg0q7wGt3-uBdsF0Ay_x8MTMvFqK6aMOkl9rA,16129
+rich/_unicode_data/unicode16-0-0.py,sha256=5iGpbczVQ7BD2QGYb6k1h_OdILQXXuhcvI6dQFLKbMc,16480
+rich/_unicode_data/unicode17-0-0.py,sha256=NXbjFsAaTYdj6TYgk5Q9disv40LZHbedFGRl_48_9Y0,16704
+rich/_unicode_data/unicode4-1-0.py,sha256=yIApQGEG7VOFYY2FFfvOdPprE6VpDusjLlTlCy4G_Rw,9488
+rich/_unicode_data/unicode5-0-0.py,sha256=PkEI1x4RGwXSmgqHiu88jyz14VQT8bWiOtBDrECaVZg,9613
+rich/_unicode_data/unicode5-1-0.py,sha256=C0-PWziqpkVkf3PkPz2GWNwidCrjef5AHQGBpqTPkuY,9650
+rich/_unicode_data/unicode5-2-0.py,sha256=gM88qri3_9b0I37DGK1-ah-0SUed2VmvxUddB5UZLto,10390
+rich/_unicode_data/unicode6-0-0.py,sha256=hhcAipqKU81dZ4YbDXIlT7KEK9yNG_Lx-5GLgNTF75g,10604
+rich/_unicode_data/unicode6-1-0.py,sha256=PtUJYxwtU5S2A44YY_69Ka_wTkq-c7QCa-yibmkHvJs,10899
+rich/_unicode_data/unicode6-2-0.py,sha256=TdTOctGwO-OYVGif1DoRJvsaQISHw5EXHPt58fjB55g,10899
+rich/_unicode_data/unicode6-3-0.py,sha256=G9l8chu2MJTwZ_d_0tmH7PBg8KYYHaeuJCJNCHGHkDc,10924
+rich/_unicode_data/unicode7-0-0.py,sha256=po9GGYW7ilGU9MwGE6fny-OofqbDwelQrnOIm-IusjI,11630
+rich/_unicode_data/unicode8-0-0.py,sha256=4PjyI-w2Uj9xtanNlZm1d_2khcetMQlIefaoU2joGkY,11864
+rich/_unicode_data/unicode9-0-0.py,sha256=A-pQjvkTICUGXEDOiWNMqa6z6vv1E__HJffzu7zLi9c,14148
+rich/_win32_console.py,sha256=o2QN_IRx10biGP3Ap1neaqX8FBGlUKSmWM6Kw4OSg-U,22719
+rich/_windows.py,sha256=is3WpbHMj8WaTHYB11hc6lP2t4hlvt4TViTlHSmjsi0,1901
+rich/_windows_renderer.py,sha256=d799xOnxLbCCCzGu9-U7YLmIQkxtxQIBFQQ6iu4veSc,2759
+rich/_wrap.py,sha256=FlSsom5EX0LVkA3KWy34yHnCfLtqX-ZIepXKh-70rpc,3404
+rich/abc.py,sha256=dALMOGfKVNeAbvqq66IpTQxQUerxD7AE4FKwqd0eQKk,878
+rich/align.py,sha256=a8MbP-iJjoOFonxqgoP3YketKMWU3WFZaxjqAv2Qc5E,10726
+rich/ansi.py,sha256=Avs1LHbSdcyOvDOdpELZUoULcBiYewY76eNBp6uFBhs,6921
+rich/bar.py,sha256=ldbVHOzKJOnflVNuv1xS7g6dLX2E3wMnXkdPbpzJTcs,3263
+rich/box.py,sha256=SSolg8_pzHzY9QvJQo-qp0tbPsnj8O_2W4hmi1l-Zo0,10650
+rich/cells.py,sha256=fPRSnquYlCO4THgmUokOJOhNlcx8C4NZ2Xv9JM_7GbE,12335
+rich/color.py,sha256=3HSULVDj7qQkXUdFWv78JOiSZzfy5y1nkcYhna296V0,18211
+rich/color_triplet.py,sha256=3lhQkdJbvWPoLDO-AnYImAWmJvV5dlgYNCVZ97ORaN4,1054
+rich/columns.py,sha256=HUX0KcMm9dsKNi11fTbiM_h2iDtl8ySCaVcxlalEzq8,7131
+rich/console.py,sha256=doKNi4BLSKZCt6Ra-6AXiQK-FaWAL-7fClG2ZO5w7uQ,101009
+rich/constrain.py,sha256=1VIPuC8AgtKWrcncQrjBdYqA3JVWysu6jZo1rrh7c7Q,1288
+rich/containers.py,sha256=c_56TxcedGYqDepHBMTuZdUIijitAQgnox-Qde0Z1qo,5502
+rich/control.py,sha256=HnsraFTzBaUQDzKJWXsfPv-PPmgGypSgSv7oANackqs,6475
+rich/default_styles.py,sha256=Tk1pZ9bOZ40EVX7cfBbYDEo7hrpwBvZGsiUCXdh0P0M,8340
+rich/diagnose.py,sha256=1RWnQoppPXjC_49AB4vtV048DK3ksQSq671C83Y6f-g,977
+rich/emoji.py,sha256=_bTf1Y3JqiMk6Nfn4V_YOhq1wAPAHNODhGLJj95R3uI,2343
+rich/errors.py,sha256=5pP3Kc5d4QJ_c0KFsxrfyhjiPVe7J1zOqSFbFAzcV-Y,642
+rich/file_proxy.py,sha256=Tl9THMDZ-Pk5Wm8sI1gGg_U5DhusmxD-FZ0fUbcU0W0,1683
+rich/filesize.py,sha256=_iz9lIpRgvW7MNSeCZnLg-HwzbP4GETg543WqD8SFs0,2484
+rich/highlighter.py,sha256=MIapWwjR8ahUcsDicgN4xLRbanbh5x_Qzh5kfdDrKKk,9729
+rich/json.py,sha256=omC2WHTgURxEosna1ftoSJCne2EX7MDuQtCdswS3qsk,5019
+rich/jupyter.py,sha256=G9pOJmR4ESIFYSd4MKGqmHqCtstx0oRWpyeTgv54-Xc,3228
+rich/layout.py,sha256=WR8PCSroYnteIT3zawxQ3k3ad1sQO5wGG1SZOoeBuBM,13944
+rich/live.py,sha256=UKvqLSuSzNHIBz5pxRrU7SPsnG48vJJx2TMHiaHlmnI,15317
+rich/live_render.py,sha256=jQO3X_p2wemGI2bdCAY_e5j9xXNTwDxuujbpoSRsH6c,3803
+rich/logging.py,sha256=UL6TZNlaptYKHNhQ45LREy-29Pl-tQsBh7q3HSnWIAA,12456
+rich/markdown.py,sha256=mDDJmUbWRYm7_vKenVq76K6aG43KTJJ4tiYMzxXO7ns,26177
+rich/markup.py,sha256=btpr271BLhiCR1jNglRnv2BpIzVcNefYwSMeW9teDbc,8427
+rich/measure.py,sha256=HmrIJX8sWRTHbgh8MxEay_83VkqNW_70s8aKP5ZcYI8,5305
+rich/padding.py,sha256=h8XnIivLrNtlxI3vQPKHXh4hAwjOJqZx0slM0z3g1_M,4896
+rich/pager.py,sha256=SO_ETBFKbg3n_AgOzXm41Sv36YxXAyI3_R-KOY2_uSc,828
+rich/palette.py,sha256=Ar6ZUrYHiFt6-Rr2k-k9F8V7hxgJYHNdqjk2vVXsLgc,3288
+rich/panel.py,sha256=9sQl00hPIqH5G2gALQo4NepFwpP0k9wT-s_gOms5pIc,11157
+rich/pretty.py,sha256=lxW_bhBfDTKe-grtzP1KQhQsqPZxfZN14th4JRVoLzQ,36349
+rich/progress.py,sha256=Z6Yz6pYO26LFXx24cXKvk2bEX6FkjK2Z5e2fy0Bt78s,60393
+rich/progress_bar.py,sha256=mZTPpJUwcfcdgQCTTz3kyY-fc79ddLwtx6Ghhxfo064,8162
+rich/prompt.py,sha256=1SIuBEelovvwCG2wp22PZwskA3IkmAsOxf0ruFkOhOk,12448
+rich/protocol.py,sha256=Wt-2HZd67OYiopUkCTOz7lM38vyo5r3HEQZ9TOPDl5Q,1367
+rich/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+rich/region.py,sha256=rNT9xZrVZTYIXZC0NYn41CJQwYNbR-KecPOxTgQvB8Y,166
+rich/repr.py,sha256=HIsurPLZK9Gray75l3_vQx7S27AzTpAj4ChXSfe1Fes,4419
+rich/rule.py,sha256=umO21Wjw0FcYAeTB3UumNLCsDWhejzxnjlf2VwiXiDI,4590
+rich/scope.py,sha256=x-jkKIE-j7ZxA9I07lya5iVAuDAyUKM58HWtNZQUzRc,3239
+rich/screen.py,sha256=rL_j2wX-4SeuIOI2oOlc418QP9EAvD59GInUmEAE6jQ,1579
+rich/segment.py,sha256=aUh9qRteTyo6guePUn8cU7S1ccXRsfzLZ-VMDXXeNug,25795
+rich/spinner.py,sha256=onIhpKlljRHppTZasxO8kXgtYyCHUkpSgKglRJ3o51g,4214
+rich/status.py,sha256=kkPph3YeAZBo-X-4wPp8gTqZyU466NLwZBA4PZTTewo,4424
+rich/style.py,sha256=W9Ccy8Py8lNICtlfcp-ryzMTuQaGxAU3av7-g5fHu0s,26990
+rich/styled.py,sha256=wljVsVTXbABMMZvkzkO43ZEk_-irzEtvUiQ-sNnikQ8,1234
+rich/syntax.py,sha256=5ZBNxjIj3C1FC92vLwBVN-C5YAdKjPHfH6SqCzFaOYE,36263
+rich/table.py,sha256=6yv7wMLXZgOsGgzEDpKXpecXQOwcLBHNOn-MYcbo1Zk,40033
+rich/terminal_theme.py,sha256=1j5-ufJfnvlAo5Qsi_ACZiXDmwMXzqgmFByObT9-yJY,3370
+rich/text.py,sha256=t2J8iMquwR0BUUggm-cVNp30Wxw5M8fIF_p0jioYRV0,47655
+rich/theme.py,sha256=oNyhXhGagtDlbDye3tVu3esWOWk0vNkuxFw-_unlaK0,3771
+rich/themes.py,sha256=0xgTLozfabebYtcJtDdC5QkX5IVUEaviqDUJJh4YVFk,102
+rich/traceback.py,sha256=TT03eLKEj5XapXFp9kgf0bBwNupIFrHquKxZtwBhz_8,37535
+rich/tree.py,sha256=QoOwg424FkdwGfR8K0tZ6Q7qtzWNAUP_m4sFaYuG6nw,9391
diff --git a/libs/signalrcore-0.9.5.dist-info/REQUESTED b/libs/rich-14.3.3.dist-info/REQUESTED
similarity index 100%
rename from libs/signalrcore-0.9.5.dist-info/REQUESTED
rename to libs/rich-14.3.3.dist-info/REQUESTED
diff --git a/libs/rich-14.3.3.dist-info/WHEEL b/libs/rich-14.3.3.dist-info/WHEEL
new file mode 100644
index 0000000000..7894e88612
--- /dev/null
+++ b/libs/rich-14.3.3.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 2.3.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/rich-13.9.4.dist-info/LICENSE b/libs/rich-14.3.3.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/rich-13.9.4.dist-info/LICENSE
rename to libs/rich-14.3.3.dist-info/licenses/LICENSE
diff --git a/libs/rich/__init__.py b/libs/rich/__init__.py
index b631d54495..3edd12e016 100644
--- a/libs/rich/__init__.py
+++ b/libs/rich/__init__.py
@@ -148,7 +148,7 @@ def inspect(
         docs (bool, optional): Also render doc strings. Defaults to True.
         private (bool, optional): Show private attributes (beginning with underscore). Defaults to False.
         dunder (bool, optional): Show attributes starting with double underscore. Defaults to False.
-        sort (bool, optional): Sort attributes alphabetically. Defaults to True.
+        sort (bool, optional):  Sort attributes alphabetically, callables at the top, leading and trailing underscores ignored. Defaults to True.
         all (bool, optional): Show all attributes. Defaults to False.
         value (bool, optional): Pretty print value. Defaults to True.
     """
diff --git a/libs/rich/__main__.py b/libs/rich/__main__.py
index 8b55130ff1..864b3aed6f 100644
--- a/libs/rich/__main__.py
+++ b/libs/rich/__main__.py
@@ -207,6 +207,8 @@ def iter_last(values: Iterable[T]) -> Iterable[Tuple[bool, T]]:
 
 
 if __name__ == "__main__":  # pragma: no cover
+    from rich.panel import Panel
+
     console = Console(
         file=io.StringIO(),
         force_terminal=True,
@@ -227,47 +229,17 @@ def iter_last(values: Iterable[T]) -> Iterable[Tuple[bool, T]]:
     c = Console(record=True)
     c.print(test_card)
 
-    print(f"rendered in {pre_cache_taken}ms (cold cache)")
-    print(f"rendered in {taken}ms (warm cache)")
-
-    from rich.panel import Panel
-
     console = Console()
-
-    sponsor_message = Table.grid(padding=1)
-    sponsor_message.add_column(style="green", justify="right")
-    sponsor_message.add_column(no_wrap=True)
-
-    sponsor_message.add_row(
-        "Textualize",
-        "[u blue link=https://github.com/textualize]https://github.com/textualize",
-    )
-    sponsor_message.add_row(
-        "Twitter",
-        "[u blue link=https://twitter.com/willmcgugan]https://twitter.com/willmcgugan",
-    )
-
-    intro_message = Text.from_markup(
-        """\
-We hope you enjoy using Rich!
-
-Rich is maintained with [red]:heart:[/] by [link=https://www.textualize.io]Textualize.io[/]
-
-- Will McGugan"""
-    )
-
-    message = Table.grid(padding=2)
-    message.add_column()
-    message.add_column(no_wrap=True)
-    message.add_row(intro_message, sponsor_message)
-
+    console.print(f"[dim]rendered in [not dim]{pre_cache_taken}ms[/] (cold cache)")
+    console.print(f"[dim]rendered in [not dim]{taken}ms[/] (warm cache)")
+    console.print()
     console.print(
-        Panel.fit(
-            message,
-            box=box.ROUNDED,
+        Panel(
+            "[b magenta]Hope you enjoy using Rich![/]\n\n"
+            "Consider sponsoring to ensure this project is maintained.\n\n"
+            "[cyan]https://github.com/sponsors/willmcgugan[/cyan]",
+            border_style="green",
+            title="Help ensure Rich is maintained",
             padding=(1, 2),
-            title="[b red]Thanks for trying out Rich!",
-            border_style="bright_blue",
-        ),
-        justify="center",
+        )
     )
diff --git a/libs/rich/_cell_widths.py b/libs/rich/_cell_widths.py
deleted file mode 100644
index 608ae3a75d..0000000000
--- a/libs/rich/_cell_widths.py
+++ /dev/null
@@ -1,454 +0,0 @@
-# Auto generated by make_terminal_widths.py
-
-CELL_WIDTHS = [
-    (0, 0, 0),
-    (1, 31, -1),
-    (127, 159, -1),
-    (173, 173, 0),
-    (768, 879, 0),
-    (1155, 1161, 0),
-    (1425, 1469, 0),
-    (1471, 1471, 0),
-    (1473, 1474, 0),
-    (1476, 1477, 0),
-    (1479, 1479, 0),
-    (1536, 1541, 0),
-    (1552, 1562, 0),
-    (1564, 1564, 0),
-    (1611, 1631, 0),
-    (1648, 1648, 0),
-    (1750, 1757, 0),
-    (1759, 1764, 0),
-    (1767, 1768, 0),
-    (1770, 1773, 0),
-    (1807, 1807, 0),
-    (1809, 1809, 0),
-    (1840, 1866, 0),
-    (1958, 1968, 0),
-    (2027, 2035, 0),
-    (2045, 2045, 0),
-    (2070, 2073, 0),
-    (2075, 2083, 0),
-    (2085, 2087, 0),
-    (2089, 2093, 0),
-    (2137, 2139, 0),
-    (2192, 2193, 0),
-    (2200, 2207, 0),
-    (2250, 2307, 0),
-    (2362, 2364, 0),
-    (2366, 2383, 0),
-    (2385, 2391, 0),
-    (2402, 2403, 0),
-    (2433, 2435, 0),
-    (2492, 2492, 0),
-    (2494, 2500, 0),
-    (2503, 2504, 0),
-    (2507, 2509, 0),
-    (2519, 2519, 0),
-    (2530, 2531, 0),
-    (2558, 2558, 0),
-    (2561, 2563, 0),
-    (2620, 2620, 0),
-    (2622, 2626, 0),
-    (2631, 2632, 0),
-    (2635, 2637, 0),
-    (2641, 2641, 0),
-    (2672, 2673, 0),
-    (2677, 2677, 0),
-    (2689, 2691, 0),
-    (2748, 2748, 0),
-    (2750, 2757, 0),
-    (2759, 2761, 0),
-    (2763, 2765, 0),
-    (2786, 2787, 0),
-    (2810, 2815, 0),
-    (2817, 2819, 0),
-    (2876, 2876, 0),
-    (2878, 2884, 0),
-    (2887, 2888, 0),
-    (2891, 2893, 0),
-    (2901, 2903, 0),
-    (2914, 2915, 0),
-    (2946, 2946, 0),
-    (3006, 3010, 0),
-    (3014, 3016, 0),
-    (3018, 3021, 0),
-    (3031, 3031, 0),
-    (3072, 3076, 0),
-    (3132, 3132, 0),
-    (3134, 3140, 0),
-    (3142, 3144, 0),
-    (3146, 3149, 0),
-    (3157, 3158, 0),
-    (3170, 3171, 0),
-    (3201, 3203, 0),
-    (3260, 3260, 0),
-    (3262, 3268, 0),
-    (3270, 3272, 0),
-    (3274, 3277, 0),
-    (3285, 3286, 0),
-    (3298, 3299, 0),
-    (3315, 3315, 0),
-    (3328, 3331, 0),
-    (3387, 3388, 0),
-    (3390, 3396, 0),
-    (3398, 3400, 0),
-    (3402, 3405, 0),
-    (3415, 3415, 0),
-    (3426, 3427, 0),
-    (3457, 3459, 0),
-    (3530, 3530, 0),
-    (3535, 3540, 0),
-    (3542, 3542, 0),
-    (3544, 3551, 0),
-    (3570, 3571, 0),
-    (3633, 3633, 0),
-    (3636, 3642, 0),
-    (3655, 3662, 0),
-    (3761, 3761, 0),
-    (3764, 3772, 0),
-    (3784, 3790, 0),
-    (3864, 3865, 0),
-    (3893, 3893, 0),
-    (3895, 3895, 0),
-    (3897, 3897, 0),
-    (3902, 3903, 0),
-    (3953, 3972, 0),
-    (3974, 3975, 0),
-    (3981, 3991, 0),
-    (3993, 4028, 0),
-    (4038, 4038, 0),
-    (4139, 4158, 0),
-    (4182, 4185, 0),
-    (4190, 4192, 0),
-    (4194, 4196, 0),
-    (4199, 4205, 0),
-    (4209, 4212, 0),
-    (4226, 4237, 0),
-    (4239, 4239, 0),
-    (4250, 4253, 0),
-    (4352, 4447, 2),
-    (4448, 4607, 0),
-    (4957, 4959, 0),
-    (5906, 5909, 0),
-    (5938, 5940, 0),
-    (5970, 5971, 0),
-    (6002, 6003, 0),
-    (6068, 6099, 0),
-    (6109, 6109, 0),
-    (6155, 6159, 0),
-    (6277, 6278, 0),
-    (6313, 6313, 0),
-    (6432, 6443, 0),
-    (6448, 6459, 0),
-    (6679, 6683, 0),
-    (6741, 6750, 0),
-    (6752, 6780, 0),
-    (6783, 6783, 0),
-    (6832, 6862, 0),
-    (6912, 6916, 0),
-    (6964, 6980, 0),
-    (7019, 7027, 0),
-    (7040, 7042, 0),
-    (7073, 7085, 0),
-    (7142, 7155, 0),
-    (7204, 7223, 0),
-    (7376, 7378, 0),
-    (7380, 7400, 0),
-    (7405, 7405, 0),
-    (7412, 7412, 0),
-    (7415, 7417, 0),
-    (7616, 7679, 0),
-    (8203, 8207, 0),
-    (8232, 8238, 0),
-    (8288, 8292, 0),
-    (8294, 8303, 0),
-    (8400, 8432, 0),
-    (8986, 8987, 2),
-    (9001, 9002, 2),
-    (9193, 9196, 2),
-    (9200, 9200, 2),
-    (9203, 9203, 2),
-    (9725, 9726, 2),
-    (9748, 9749, 2),
-    (9800, 9811, 2),
-    (9855, 9855, 2),
-    (9875, 9875, 2),
-    (9889, 9889, 2),
-    (9898, 9899, 2),
-    (9917, 9918, 2),
-    (9924, 9925, 2),
-    (9934, 9934, 2),
-    (9940, 9940, 2),
-    (9962, 9962, 2),
-    (9970, 9971, 2),
-    (9973, 9973, 2),
-    (9978, 9978, 2),
-    (9981, 9981, 2),
-    (9989, 9989, 2),
-    (9994, 9995, 2),
-    (10024, 10024, 2),
-    (10060, 10060, 2),
-    (10062, 10062, 2),
-    (10067, 10069, 2),
-    (10071, 10071, 2),
-    (10133, 10135, 2),
-    (10160, 10160, 2),
-    (10175, 10175, 2),
-    (11035, 11036, 2),
-    (11088, 11088, 2),
-    (11093, 11093, 2),
-    (11503, 11505, 0),
-    (11647, 11647, 0),
-    (11744, 11775, 0),
-    (11904, 11929, 2),
-    (11931, 12019, 2),
-    (12032, 12245, 2),
-    (12272, 12329, 2),
-    (12330, 12335, 0),
-    (12336, 12350, 2),
-    (12353, 12438, 2),
-    (12441, 12442, 0),
-    (12443, 12543, 2),
-    (12549, 12591, 2),
-    (12593, 12686, 2),
-    (12688, 12771, 2),
-    (12783, 12830, 2),
-    (12832, 12871, 2),
-    (12880, 19903, 2),
-    (19968, 42124, 2),
-    (42128, 42182, 2),
-    (42607, 42610, 0),
-    (42612, 42621, 0),
-    (42654, 42655, 0),
-    (42736, 42737, 0),
-    (43010, 43010, 0),
-    (43014, 43014, 0),
-    (43019, 43019, 0),
-    (43043, 43047, 0),
-    (43052, 43052, 0),
-    (43136, 43137, 0),
-    (43188, 43205, 0),
-    (43232, 43249, 0),
-    (43263, 43263, 0),
-    (43302, 43309, 0),
-    (43335, 43347, 0),
-    (43360, 43388, 2),
-    (43392, 43395, 0),
-    (43443, 43456, 0),
-    (43493, 43493, 0),
-    (43561, 43574, 0),
-    (43587, 43587, 0),
-    (43596, 43597, 0),
-    (43643, 43645, 0),
-    (43696, 43696, 0),
-    (43698, 43700, 0),
-    (43703, 43704, 0),
-    (43710, 43711, 0),
-    (43713, 43713, 0),
-    (43755, 43759, 0),
-    (43765, 43766, 0),
-    (44003, 44010, 0),
-    (44012, 44013, 0),
-    (44032, 55203, 2),
-    (55216, 55295, 0),
-    (63744, 64255, 2),
-    (64286, 64286, 0),
-    (65024, 65039, 0),
-    (65040, 65049, 2),
-    (65056, 65071, 0),
-    (65072, 65106, 2),
-    (65108, 65126, 2),
-    (65128, 65131, 2),
-    (65279, 65279, 0),
-    (65281, 65376, 2),
-    (65504, 65510, 2),
-    (65529, 65531, 0),
-    (66045, 66045, 0),
-    (66272, 66272, 0),
-    (66422, 66426, 0),
-    (68097, 68099, 0),
-    (68101, 68102, 0),
-    (68108, 68111, 0),
-    (68152, 68154, 0),
-    (68159, 68159, 0),
-    (68325, 68326, 0),
-    (68900, 68903, 0),
-    (69291, 69292, 0),
-    (69373, 69375, 0),
-    (69446, 69456, 0),
-    (69506, 69509, 0),
-    (69632, 69634, 0),
-    (69688, 69702, 0),
-    (69744, 69744, 0),
-    (69747, 69748, 0),
-    (69759, 69762, 0),
-    (69808, 69818, 0),
-    (69821, 69821, 0),
-    (69826, 69826, 0),
-    (69837, 69837, 0),
-    (69888, 69890, 0),
-    (69927, 69940, 0),
-    (69957, 69958, 0),
-    (70003, 70003, 0),
-    (70016, 70018, 0),
-    (70067, 70080, 0),
-    (70089, 70092, 0),
-    (70094, 70095, 0),
-    (70188, 70199, 0),
-    (70206, 70206, 0),
-    (70209, 70209, 0),
-    (70367, 70378, 0),
-    (70400, 70403, 0),
-    (70459, 70460, 0),
-    (70462, 70468, 0),
-    (70471, 70472, 0),
-    (70475, 70477, 0),
-    (70487, 70487, 0),
-    (70498, 70499, 0),
-    (70502, 70508, 0),
-    (70512, 70516, 0),
-    (70709, 70726, 0),
-    (70750, 70750, 0),
-    (70832, 70851, 0),
-    (71087, 71093, 0),
-    (71096, 71104, 0),
-    (71132, 71133, 0),
-    (71216, 71232, 0),
-    (71339, 71351, 0),
-    (71453, 71467, 0),
-    (71724, 71738, 0),
-    (71984, 71989, 0),
-    (71991, 71992, 0),
-    (71995, 71998, 0),
-    (72000, 72000, 0),
-    (72002, 72003, 0),
-    (72145, 72151, 0),
-    (72154, 72160, 0),
-    (72164, 72164, 0),
-    (72193, 72202, 0),
-    (72243, 72249, 0),
-    (72251, 72254, 0),
-    (72263, 72263, 0),
-    (72273, 72283, 0),
-    (72330, 72345, 0),
-    (72751, 72758, 0),
-    (72760, 72767, 0),
-    (72850, 72871, 0),
-    (72873, 72886, 0),
-    (73009, 73014, 0),
-    (73018, 73018, 0),
-    (73020, 73021, 0),
-    (73023, 73029, 0),
-    (73031, 73031, 0),
-    (73098, 73102, 0),
-    (73104, 73105, 0),
-    (73107, 73111, 0),
-    (73459, 73462, 0),
-    (73472, 73473, 0),
-    (73475, 73475, 0),
-    (73524, 73530, 0),
-    (73534, 73538, 0),
-    (78896, 78912, 0),
-    (78919, 78933, 0),
-    (92912, 92916, 0),
-    (92976, 92982, 0),
-    (94031, 94031, 0),
-    (94033, 94087, 0),
-    (94095, 94098, 0),
-    (94176, 94179, 2),
-    (94180, 94180, 0),
-    (94192, 94193, 0),
-    (94208, 100343, 2),
-    (100352, 101589, 2),
-    (101632, 101640, 2),
-    (110576, 110579, 2),
-    (110581, 110587, 2),
-    (110589, 110590, 2),
-    (110592, 110882, 2),
-    (110898, 110898, 2),
-    (110928, 110930, 2),
-    (110933, 110933, 2),
-    (110948, 110951, 2),
-    (110960, 111355, 2),
-    (113821, 113822, 0),
-    (113824, 113827, 0),
-    (118528, 118573, 0),
-    (118576, 118598, 0),
-    (119141, 119145, 0),
-    (119149, 119170, 0),
-    (119173, 119179, 0),
-    (119210, 119213, 0),
-    (119362, 119364, 0),
-    (121344, 121398, 0),
-    (121403, 121452, 0),
-    (121461, 121461, 0),
-    (121476, 121476, 0),
-    (121499, 121503, 0),
-    (121505, 121519, 0),
-    (122880, 122886, 0),
-    (122888, 122904, 0),
-    (122907, 122913, 0),
-    (122915, 122916, 0),
-    (122918, 122922, 0),
-    (123023, 123023, 0),
-    (123184, 123190, 0),
-    (123566, 123566, 0),
-    (123628, 123631, 0),
-    (124140, 124143, 0),
-    (125136, 125142, 0),
-    (125252, 125258, 0),
-    (126980, 126980, 2),
-    (127183, 127183, 2),
-    (127374, 127374, 2),
-    (127377, 127386, 2),
-    (127488, 127490, 2),
-    (127504, 127547, 2),
-    (127552, 127560, 2),
-    (127568, 127569, 2),
-    (127584, 127589, 2),
-    (127744, 127776, 2),
-    (127789, 127797, 2),
-    (127799, 127868, 2),
-    (127870, 127891, 2),
-    (127904, 127946, 2),
-    (127951, 127955, 2),
-    (127968, 127984, 2),
-    (127988, 127988, 2),
-    (127992, 127994, 2),
-    (127995, 127999, 0),
-    (128000, 128062, 2),
-    (128064, 128064, 2),
-    (128066, 128252, 2),
-    (128255, 128317, 2),
-    (128331, 128334, 2),
-    (128336, 128359, 2),
-    (128378, 128378, 2),
-    (128405, 128406, 2),
-    (128420, 128420, 2),
-    (128507, 128591, 2),
-    (128640, 128709, 2),
-    (128716, 128716, 2),
-    (128720, 128722, 2),
-    (128725, 128727, 2),
-    (128732, 128735, 2),
-    (128747, 128748, 2),
-    (128756, 128764, 2),
-    (128992, 129003, 2),
-    (129008, 129008, 2),
-    (129292, 129338, 2),
-    (129340, 129349, 2),
-    (129351, 129535, 2),
-    (129648, 129660, 2),
-    (129664, 129672, 2),
-    (129680, 129725, 2),
-    (129727, 129733, 2),
-    (129742, 129755, 2),
-    (129760, 129768, 2),
-    (129776, 129784, 2),
-    (131072, 196605, 2),
-    (196608, 262141, 2),
-    (917505, 917505, 0),
-    (917536, 917631, 0),
-    (917760, 917999, 0),
-]
diff --git a/libs/rich/_inspect.py b/libs/rich/_inspect.py
index e87698d1fa..ac78ffe296 100644
--- a/libs/rich/_inspect.py
+++ b/libs/rich/_inspect.py
@@ -29,7 +29,7 @@ class Inspect(JupyterMixin):
         docs (bool, optional): Also render doc strings. Defaults to True.
         private (bool, optional): Show private attributes (beginning with underscore). Defaults to False.
         dunder (bool, optional): Show attributes starting with double underscore. Defaults to False.
-        sort (bool, optional): Sort attributes alphabetically. Defaults to True.
+        sort (bool, optional): Sort attributes alphabetically, callables at the top, leading and trailing underscores ignored. Defaults to True.
         all (bool, optional): Show all attributes. Defaults to False.
         value (bool, optional): Pretty print value of object. Defaults to True.
     """
@@ -101,6 +101,10 @@ def _get_signature(self, name: str, obj: Any) -> Optional[Text]:
         signature_text = self.highlighter(_signature)
 
         qualname = name or getattr(obj, "__qualname__", name)
+        if not isinstance(qualname, str):
+            qualname = getattr(obj, "__name__", name)
+            if not isinstance(qualname, str):
+                qualname = name
 
         # If obj is a module, there may be classes (which are callable) to display
         if inspect.isclass(obj):
@@ -214,7 +218,7 @@ def safe_getattr(attr_name: str) -> Tuple[Any, Any]:
     def _get_formatted_doc(self, object_: Any) -> Optional[str]:
         """
         Extract the docstring of an object, process it and returns it.
-        The processing consists in cleaning up the doctring's indentation,
+        The processing consists in cleaning up the docstring's indentation,
         taking only its 1st paragraph if `self.help` is not True,
         and escape its control codes.
 
diff --git a/libs/rich/_ratio.py b/libs/rich/_ratio.py
index e12397af6f..5fd5a383d2 100644
--- a/libs/rich/_ratio.py
+++ b/libs/rich/_ratio.py
@@ -1,12 +1,6 @@
-import sys
 from fractions import Fraction
 from math import ceil
-from typing import cast, List, Optional, Sequence
-
-if sys.version_info >= (3, 8):
-    from typing import Protocol
-else:
-    from typing_extensions import Protocol  # pragma: no cover
+from typing import cast, List, Optional, Sequence, Protocol
 
 
 class Edge(Protocol):
diff --git a/libs/rich/_unicode_data/__init__.py b/libs/rich/_unicode_data/__init__.py
new file mode 100644
index 0000000000..ce54baef4e
--- /dev/null
+++ b/libs/rich/_unicode_data/__init__.py
@@ -0,0 +1,93 @@
+from __future__ import annotations
+
+import bisect
+import os
+import sys
+
+if sys.version_info[:2] >= (3, 9):
+    from functools import cache
+else:
+    from functools import lru_cache as cache  # pragma: no cover
+
+from importlib import import_module
+from typing import TYPE_CHECKING, cast
+
+from rich._unicode_data._versions import VERSIONS
+
+if TYPE_CHECKING:
+    from rich.cells import CellTable
+
+VERSION_ORDER = sorted(
+    [
+        tuple(
+            map(int, version.split(".")),
+        )
+        for version in VERSIONS
+    ]
+)
+VERSION_SET = frozenset(VERSIONS)
+
+
+def _parse_version(version: str) -> tuple[int, int, int]:
+    """Parse a version string into a tuple of 3 integers.
+
+    Args:
+        version: A version string.
+
+    Raises:
+        ValueError: If the version string is invalid.
+
+    Returns:
+        A tuple of 3 integers.
+    """
+    version_integers: tuple[int, ...]
+    try:
+        version_integers = tuple(
+            map(int, version.split(".")),
+        )
+    except ValueError:
+        raise ValueError(
+            f"unicode version string {version!r} is badly formatted"
+        ) from None
+    while len(version_integers) < 3:
+        version_integers = version_integers + (0,)
+    triple = cast("tuple[int, int, int]", version_integers[:3])
+    return triple
+
+
+@cache
+def load(unicode_version: str = "auto") -> CellTable:
+    """Load a cell table for the given unicode version.
+
+    Args:
+        unicode_version: Unicode version, or `None` to auto-detect.
+
+    """
+    if unicode_version == "auto":
+        unicode_version = os.environ.get("UNICODE_VERSION", "latest")
+        try:
+            _parse_version(unicode_version)
+        except ValueError:
+            # The environment variable is invalid
+            # Fallback to using the latest version seems reasonable
+            unicode_version = "latest"
+
+    if unicode_version == "latest":
+        version = VERSIONS[-1]
+    else:
+        try:
+            version_numbers = _parse_version(unicode_version)
+        except ValueError:
+            version_numbers = _parse_version(VERSIONS[-1])
+        major, minor, patch = version_numbers
+        version = f"{major}.{minor}.{patch}"
+        if version not in VERSION_SET:
+            insert_position = bisect.bisect_left(VERSION_ORDER, version_numbers)
+            version = VERSIONS[max(0, insert_position - 1)]
+
+    version_path_component = version.replace(".", "-")
+    module_name = f".unicode{version_path_component}"
+    module = import_module(module_name, "rich._unicode_data")
+    if TYPE_CHECKING:
+        assert isinstance(module.cell_table, CellTable)
+    return module.cell_table
diff --git a/libs/rich/_unicode_data/_versions.py b/libs/rich/_unicode_data/_versions.py
new file mode 100644
index 0000000000..be98418d13
--- /dev/null
+++ b/libs/rich/_unicode_data/_versions.py
@@ -0,0 +1,23 @@
+VERSIONS = (
+    "4.1.0",
+    "5.0.0",
+    "5.1.0",
+    "5.2.0",
+    "6.0.0",
+    "6.1.0",
+    "6.2.0",
+    "6.3.0",
+    "7.0.0",
+    "8.0.0",
+    "9.0.0",
+    "10.0.0",
+    "11.0.0",
+    "12.0.0",
+    "12.1.0",
+    "13.0.0",
+    "14.0.0",
+    "15.0.0",
+    "15.1.0",
+    "16.0.0",
+    "17.0.0",
+)
diff --git a/libs/rich/_unicode_data/unicode10-0-0.py b/libs/rich/_unicode_data/unicode10-0-0.py
new file mode 100644
index 0000000000..f318087837
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode10-0-0.py
@@ -0,0 +1,611 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "10.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2260, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7673, 0),
+        (7675, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12590, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70090, 70092, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70460, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (94176, 94177, 2),
+        (94208, 100332, 2),
+        (100352, 101106, 2),
+        (110592, 110878, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128747, 128748, 2),
+        (128756, 128760, 2),
+        (129296, 129342, 2),
+        (129344, 129356, 2),
+        (129360, 129387, 2),
+        (129408, 129431, 2),
+        (129472, 129472, 2),
+        (129488, 129510, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode11-0-0.py b/libs/rich/_unicode_data/unicode11-0-0.py
new file mode 100644
index 0000000000..058bb342ca
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode11-0-0.py
@@ -0,0 +1,625 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "11.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2259, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7673, 0),
+        (7675, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69446, 69456, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (94176, 94177, 2),
+        (94208, 100337, 2),
+        (100352, 101106, 2),
+        (110592, 110878, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128747, 128748, 2),
+        (128756, 128761, 2),
+        (129296, 129342, 2),
+        (129344, 129392, 2),
+        (129395, 129398, 2),
+        (129402, 129402, 2),
+        (129404, 129442, 2),
+        (129456, 129465, 2),
+        (129472, 129474, 2),
+        (129488, 129535, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode12-0-0.py b/libs/rich/_unicode_data/unicode12-0-0.py
new file mode 100644
index 0000000000..7b0022513d
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode12-0-0.py
@@ -0,0 +1,637 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "12.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2259, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7673, 0),
+        (7675, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69446, 69456, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (78896, 78904, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94208, 100343, 2),
+        (100352, 101106, 2),
+        (110592, 110878, 2),
+        (110928, 110930, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123184, 123190, 0),
+        (123628, 123631, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128725, 2),
+        (128747, 128748, 2),
+        (128756, 128762, 2),
+        (128992, 129003, 2),
+        (129293, 129393, 2),
+        (129395, 129398, 2),
+        (129402, 129442, 2),
+        (129445, 129450, 2),
+        (129454, 129482, 2),
+        (129485, 129535, 2),
+        (129648, 129651, 2),
+        (129656, 129658, 2),
+        (129664, 129666, 2),
+        (129680, 129685, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode12-1-0.py b/libs/rich/_unicode_data/unicode12-1-0.py
new file mode 100644
index 0000000000..2dbcf3794e
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode12-1-0.py
@@ -0,0 +1,636 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "12.1.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2259, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7673, 0),
+        (7675, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69446, 69456, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (78896, 78904, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94208, 100343, 2),
+        (100352, 101106, 2),
+        (110592, 110878, 2),
+        (110928, 110930, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123184, 123190, 0),
+        (123628, 123631, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128725, 2),
+        (128747, 128748, 2),
+        (128756, 128762, 2),
+        (128992, 129003, 2),
+        (129293, 129393, 2),
+        (129395, 129398, 2),
+        (129402, 129442, 2),
+        (129445, 129450, 2),
+        (129454, 129482, 2),
+        (129485, 129535, 2),
+        (129648, 129651, 2),
+        (129656, 129658, 2),
+        (129664, 129666, 2),
+        (129680, 129685, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode13-0-0.py b/libs/rich/_unicode_data/unicode13-0-0.py
new file mode 100644
index 0000000000..13fbc74b0a
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode13-0-0.py
@@ -0,0 +1,648 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "13.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2259, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2901, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3457, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6848, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7673, 0),
+        (7675, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43052, 43052, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69291, 69292, 0),
+        (69446, 69456, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70094, 70095, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (71984, 71989, 0),
+        (71991, 71992, 0),
+        (71995, 71998, 0),
+        (72000, 72000, 0),
+        (72002, 72003, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (78896, 78904, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94180, 94180, 0),
+        (94192, 94193, 0),
+        (94208, 100343, 2),
+        (100352, 101589, 2),
+        (101632, 101640, 2),
+        (110592, 110878, 2),
+        (110928, 110930, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123184, 123190, 0),
+        (123628, 123631, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128727, 2),
+        (128747, 128748, 2),
+        (128756, 128764, 2),
+        (128992, 129003, 2),
+        (129292, 129338, 2),
+        (129340, 129349, 2),
+        (129351, 129400, 2),
+        (129402, 129483, 2),
+        (129485, 129535, 2),
+        (129648, 129652, 2),
+        (129656, 129658, 2),
+        (129664, 129670, 2),
+        (129680, 129704, 2),
+        (129712, 129718, 2),
+        (129728, 129730, 2),
+        (129744, 129750, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode14-0-0.py b/libs/rich/_unicode_data/unicode14-0-0.py
new file mode 100644
index 0000000000..9fa9e29e7f
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode14-0-0.py
@@ -0,0 +1,661 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "14.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2200, 2207, 0),
+        (2250, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2901, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3132, 3132, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3457, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5909, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6159, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6862, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43052, 43052, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69291, 69292, 0),
+        (69446, 69456, 0),
+        (69506, 69509, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69744, 69744, 0),
+        (69747, 69748, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69826, 69826, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70094, 70095, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (71984, 71989, 0),
+        (71991, 71992, 0),
+        (71995, 71998, 0),
+        (72000, 72000, 0),
+        (72002, 72003, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (78896, 78904, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94180, 94180, 0),
+        (94192, 94193, 0),
+        (94208, 100343, 2),
+        (100352, 101589, 2),
+        (101632, 101640, 2),
+        (110576, 110579, 2),
+        (110581, 110587, 2),
+        (110589, 110590, 2),
+        (110592, 110882, 2),
+        (110928, 110930, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (118528, 118573, 0),
+        (118576, 118598, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123184, 123190, 0),
+        (123566, 123566, 0),
+        (123628, 123631, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128727, 2),
+        (128733, 128735, 2),
+        (128747, 128748, 2),
+        (128756, 128764, 2),
+        (128992, 129003, 2),
+        (129008, 129008, 2),
+        (129292, 129338, 2),
+        (129340, 129349, 2),
+        (129351, 129535, 2),
+        (129648, 129652, 2),
+        (129656, 129660, 2),
+        (129664, 129670, 2),
+        (129680, 129708, 2),
+        (129712, 129722, 2),
+        (129728, 129733, 2),
+        (129744, 129753, 2),
+        (129760, 129767, 2),
+        (129776, 129782, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode15-0-0.py b/libs/rich/_unicode_data/unicode15-0-0.py
new file mode 100644
index 0000000000..84dd5be936
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode15-0-0.py
@@ -0,0 +1,671 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "15.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2200, 2207, 0),
+        (2250, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2901, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3132, 3132, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3315, 3315, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3457, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3790, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5909, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6159, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6862, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43052, 43052, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69291, 69292, 0),
+        (69373, 69375, 0),
+        (69446, 69456, 0),
+        (69506, 69509, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69744, 69744, 0),
+        (69747, 69748, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69826, 69826, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70094, 70095, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70209, 70209, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (71984, 71989, 0),
+        (71991, 71992, 0),
+        (71995, 71998, 0),
+        (72000, 72000, 0),
+        (72002, 72003, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (73472, 73473, 0),
+        (73475, 73475, 0),
+        (73524, 73530, 0),
+        (73534, 73538, 0),
+        (78896, 78912, 0),
+        (78919, 78933, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94180, 94180, 0),
+        (94192, 94193, 0),
+        (94208, 100343, 2),
+        (100352, 101589, 2),
+        (101632, 101640, 2),
+        (110576, 110579, 2),
+        (110581, 110587, 2),
+        (110589, 110590, 2),
+        (110592, 110882, 2),
+        (110898, 110898, 2),
+        (110928, 110930, 2),
+        (110933, 110933, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (118528, 118573, 0),
+        (118576, 118598, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123023, 123023, 0),
+        (123184, 123190, 0),
+        (123566, 123566, 0),
+        (123628, 123631, 0),
+        (124140, 124143, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128727, 2),
+        (128732, 128735, 2),
+        (128747, 128748, 2),
+        (128756, 128764, 2),
+        (128992, 129003, 2),
+        (129008, 129008, 2),
+        (129292, 129338, 2),
+        (129340, 129349, 2),
+        (129351, 129535, 2),
+        (129648, 129660, 2),
+        (129664, 129672, 2),
+        (129680, 129725, 2),
+        (129727, 129733, 2),
+        (129742, 129755, 2),
+        (129760, 129768, 2),
+        (129776, 129784, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode15-1-0.py b/libs/rich/_unicode_data/unicode15-1-0.py
new file mode 100644
index 0000000000..aa9f2c3e31
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode15-1-0.py
@@ -0,0 +1,670 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "15.1.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2200, 2207, 0),
+        (2250, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2901, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3132, 3132, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3315, 3315, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3457, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3790, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5909, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6159, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6862, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12771, 2),
+        (12783, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43052, 43052, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (69291, 69292, 0),
+        (69373, 69375, 0),
+        (69446, 69456, 0),
+        (69506, 69509, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69744, 69744, 0),
+        (69747, 69748, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69826, 69826, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70094, 70095, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70209, 70209, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (71984, 71989, 0),
+        (71991, 71992, 0),
+        (71995, 71998, 0),
+        (72000, 72000, 0),
+        (72002, 72003, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (73472, 73473, 0),
+        (73475, 73475, 0),
+        (73524, 73530, 0),
+        (73534, 73538, 0),
+        (78896, 78912, 0),
+        (78919, 78933, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94180, 94180, 0),
+        (94192, 94193, 0),
+        (94208, 100343, 2),
+        (100352, 101589, 2),
+        (101632, 101640, 2),
+        (110576, 110579, 2),
+        (110581, 110587, 2),
+        (110589, 110590, 2),
+        (110592, 110882, 2),
+        (110898, 110898, 2),
+        (110928, 110930, 2),
+        (110933, 110933, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (118528, 118573, 0),
+        (118576, 118598, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123023, 123023, 0),
+        (123184, 123190, 0),
+        (123566, 123566, 0),
+        (123628, 123631, 0),
+        (124140, 124143, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128727, 2),
+        (128732, 128735, 2),
+        (128747, 128748, 2),
+        (128756, 128764, 2),
+        (128992, 129003, 2),
+        (129008, 129008, 2),
+        (129292, 129338, 2),
+        (129340, 129349, 2),
+        (129351, 129535, 2),
+        (129648, 129660, 2),
+        (129664, 129672, 2),
+        (129680, 129725, 2),
+        (129727, 129733, 2),
+        (129742, 129755, 2),
+        (129760, 129768, 2),
+        (129776, 129784, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode16-0-0.py b/libs/rich/_unicode_data/unicode16-0-0.py
new file mode 100644
index 0000000000..b3fe2359df
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode16-0-0.py
@@ -0,0 +1,683 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "16.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2199, 2207, 0),
+        (2250, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2901, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3132, 3132, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3315, 3315, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3457, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3790, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5909, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6159, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6862, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9776, 9783, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9866, 9871, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12773, 2),
+        (12783, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43052, 43052, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (68969, 68973, 0),
+        (69291, 69292, 0),
+        (69372, 69375, 0),
+        (69446, 69456, 0),
+        (69506, 69509, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69744, 69744, 0),
+        (69747, 69748, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69826, 69826, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70094, 70095, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70209, 70209, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70584, 70592, 0),
+        (70594, 70594, 0),
+        (70597, 70597, 0),
+        (70599, 70602, 0),
+        (70604, 70608, 0),
+        (70610, 70610, 0),
+        (70625, 70626, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (71984, 71989, 0),
+        (71991, 71992, 0),
+        (71995, 71998, 0),
+        (72000, 72000, 0),
+        (72002, 72003, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (73472, 73473, 0),
+        (73475, 73475, 0),
+        (73524, 73530, 0),
+        (73534, 73538, 0),
+        (73562, 73562, 0),
+        (78896, 78912, 0),
+        (78919, 78933, 0),
+        (90398, 90415, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94180, 94180, 0),
+        (94192, 94193, 0),
+        (94208, 100343, 2),
+        (100352, 101589, 2),
+        (101631, 101640, 2),
+        (110576, 110579, 2),
+        (110581, 110587, 2),
+        (110589, 110590, 2),
+        (110592, 110882, 2),
+        (110898, 110898, 2),
+        (110928, 110930, 2),
+        (110933, 110933, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (118528, 118573, 0),
+        (118576, 118598, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (119552, 119638, 2),
+        (119648, 119670, 2),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123023, 123023, 0),
+        (123184, 123190, 0),
+        (123566, 123566, 0),
+        (123628, 123631, 0),
+        (124140, 124143, 0),
+        (124398, 124399, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128727, 2),
+        (128732, 128735, 2),
+        (128747, 128748, 2),
+        (128756, 128764, 2),
+        (128992, 129003, 2),
+        (129008, 129008, 2),
+        (129292, 129338, 2),
+        (129340, 129349, 2),
+        (129351, 129535, 2),
+        (129648, 129660, 2),
+        (129664, 129673, 2),
+        (129679, 129734, 2),
+        (129742, 129756, 2),
+        (129759, 129769, 2),
+        (129776, 129784, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode17-0-0.py b/libs/rich/_unicode_data/unicode17-0-0.py
new file mode 100644
index 0000000000..4108bb44de
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode17-0-0.py
@@ -0,0 +1,691 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "17.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2045, 2045, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2199, 2207, 0),
+        (2250, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2558, 2558, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2810, 2815, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2901, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3076, 0),
+        (3132, 3132, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3315, 3315, 0),
+        (3328, 3331, 0),
+        (3387, 3388, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3457, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3772, 0),
+        (3784, 3790, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5909, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6159, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6877, 0),
+        (6880, 6891, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7412, 7412, 0),
+        (7415, 7417, 0),
+        (7616, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9776, 9783, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9866, 9871, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12591, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12773, 2),
+        (12783, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43052, 43052, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43263, 43263, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (68900, 68903, 0),
+        (68969, 68973, 0),
+        (69291, 69292, 0),
+        (69370, 69375, 0),
+        (69446, 69456, 0),
+        (69506, 69509, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69744, 69744, 0),
+        (69747, 69748, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69826, 69826, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (69957, 69958, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70089, 70092, 0),
+        (70094, 70095, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70209, 70209, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70459, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70584, 70592, 0),
+        (70594, 70594, 0),
+        (70597, 70597, 0),
+        (70599, 70602, 0),
+        (70604, 70608, 0),
+        (70610, 70610, 0),
+        (70625, 70626, 0),
+        (70709, 70726, 0),
+        (70750, 70750, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (71724, 71738, 0),
+        (71984, 71989, 0),
+        (71991, 71992, 0),
+        (71995, 71998, 0),
+        (72000, 72000, 0),
+        (72002, 72003, 0),
+        (72145, 72151, 0),
+        (72154, 72160, 0),
+        (72164, 72164, 0),
+        (72193, 72202, 0),
+        (72243, 72249, 0),
+        (72251, 72254, 0),
+        (72263, 72263, 0),
+        (72273, 72283, 0),
+        (72330, 72345, 0),
+        (72544, 72551, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (73009, 73014, 0),
+        (73018, 73018, 0),
+        (73020, 73021, 0),
+        (73023, 73029, 0),
+        (73031, 73031, 0),
+        (73098, 73102, 0),
+        (73104, 73105, 0),
+        (73107, 73111, 0),
+        (73459, 73462, 0),
+        (73472, 73473, 0),
+        (73475, 73475, 0),
+        (73524, 73530, 0),
+        (73534, 73538, 0),
+        (73562, 73562, 0),
+        (78896, 78912, 0),
+        (78919, 78933, 0),
+        (90398, 90415, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94031, 94031, 0),
+        (94033, 94087, 0),
+        (94095, 94098, 0),
+        (94176, 94179, 2),
+        (94180, 94180, 0),
+        (94192, 94193, 0),
+        (94194, 94198, 2),
+        (94208, 101589, 2),
+        (101631, 101662, 2),
+        (101760, 101874, 2),
+        (110576, 110579, 2),
+        (110581, 110587, 2),
+        (110589, 110590, 2),
+        (110592, 110882, 2),
+        (110898, 110898, 2),
+        (110928, 110930, 2),
+        (110933, 110933, 2),
+        (110948, 110951, 2),
+        (110960, 111355, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (118528, 118573, 0),
+        (118576, 118598, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (119552, 119638, 2),
+        (119648, 119670, 2),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (123023, 123023, 0),
+        (123184, 123190, 0),
+        (123566, 123566, 0),
+        (123628, 123631, 0),
+        (124140, 124143, 0),
+        (124398, 124399, 0),
+        (124643, 124643, 0),
+        (124646, 124646, 0),
+        (124654, 124655, 0),
+        (124661, 124661, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127584, 127589, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128725, 128728, 2),
+        (128732, 128735, 2),
+        (128747, 128748, 2),
+        (128756, 128764, 2),
+        (128992, 129003, 2),
+        (129008, 129008, 2),
+        (129292, 129338, 2),
+        (129340, 129349, 2),
+        (129351, 129535, 2),
+        (129648, 129660, 2),
+        (129664, 129674, 2),
+        (129678, 129734, 2),
+        (129736, 129736, 2),
+        (129741, 129756, 2),
+        (129759, 129770, 2),
+        (129775, 129784, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode4-1-0.py b/libs/rich/_unicode_data/unicode4-1-0.py
new file mode 100644
index 0000000000..23ff5cf1d0
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode4-1-0.py
@@ -0,0 +1,425 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "4.1.0",
+    [
+        (0, 8, 0),
+        (14, 31, 0),
+        (127, 132, 0),
+        (134, 159, 0),
+        (768, 879, 0),
+        (1155, 1158, 0),
+        (1160, 1161, 0),
+        (1425, 1465, 0),
+        (1467, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1539, 0),
+        (1552, 1557, 0),
+        (1611, 1630, 0),
+        (1648, 1648, 0),
+        (1750, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2305, 2307, 0),
+        (2364, 2364, 0),
+        (2366, 2381, 0),
+        (2385, 2388, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2672, 2673, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2883, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3330, 3331, 0),
+        (3390, 3395, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3984, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4140, 4146, 0),
+        (4150, 4153, 0),
+        (4182, 4185, 0),
+        (4352, 4441, 2),
+        (4447, 4447, 2),
+        (4448, 4607, 0),
+        (4959, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (7616, 7619, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8427, 0),
+        (9001, 9002, 2),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12588, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12727, 2),
+        (12736, 12751, 2),
+        (12784, 12830, 2),
+        (12832, 12867, 2),
+        (12880, 13054, 2),
+        (13056, 19893, 2),
+        (19968, 40891, 2),
+        (40960, 42124, 2),
+        (42128, 42182, 2),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (44032, 55203, 2),
+        (55216, 57343, 0),
+        (63744, 64045, 2),
+        (64048, 64106, 2),
+        (64112, 64217, 2),
+        (64286, 64286, 0),
+        (64976, 65007, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65059, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (65534, 65535, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (131070, 131071, 0),
+        (131072, 196605, 2),
+        (196606, 196607, 0),
+        (196608, 262141, 2),
+        (262142, 262143, 0),
+        (327678, 327679, 0),
+        (393214, 393215, 0),
+        (458750, 458751, 0),
+        (524286, 524287, 0),
+        (589822, 589823, 0),
+        (655358, 655359, 0),
+        (720894, 720895, 0),
+        (786430, 786431, 0),
+        (851966, 851967, 0),
+        (917502, 921599, 0),
+        (983038, 983039, 0),
+        (1048574, 1048575, 0),
+        (1114110, 1114111, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode5-0-0.py b/libs/rich/_unicode_data/unicode5-0-0.py
new file mode 100644
index 0000000000..599fb78570
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode5-0-0.py
@@ -0,0 +1,430 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "5.0.0",
+    [
+        (0, 8, 0),
+        (14, 31, 0),
+        (127, 132, 0),
+        (134, 159, 0),
+        (768, 879, 0),
+        (1155, 1158, 0),
+        (1160, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1539, 0),
+        (1552, 1557, 0),
+        (1611, 1630, 0),
+        (1648, 1648, 0),
+        (1750, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2305, 2307, 0),
+        (2364, 2364, 0),
+        (2366, 2381, 0),
+        (2385, 2388, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2672, 2673, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2883, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3395, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3984, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4140, 4146, 0),
+        (4150, 4153, 0),
+        (4182, 4185, 0),
+        (4352, 4441, 2),
+        (4447, 4447, 2),
+        (4448, 4607, 0),
+        (4959, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7616, 7626, 0),
+        (7678, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8431, 0),
+        (9001, 9002, 2),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12588, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12727, 2),
+        (12736, 12751, 2),
+        (12784, 12830, 2),
+        (12832, 12867, 2),
+        (12880, 13054, 2),
+        (13056, 19893, 2),
+        (19968, 40891, 2),
+        (40960, 42124, 2),
+        (42128, 42182, 2),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (44032, 55203, 2),
+        (55216, 57343, 0),
+        (63744, 64045, 2),
+        (64048, 64106, 2),
+        (64112, 64217, 2),
+        (64286, 64286, 0),
+        (64976, 65007, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65059, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (65534, 65535, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (131070, 131071, 0),
+        (131072, 196605, 2),
+        (196606, 196607, 0),
+        (196608, 262141, 2),
+        (262142, 262143, 0),
+        (327678, 327679, 0),
+        (393214, 393215, 0),
+        (458750, 458751, 0),
+        (524286, 524287, 0),
+        (589822, 589823, 0),
+        (655358, 655359, 0),
+        (720894, 720895, 0),
+        (786430, 786431, 0),
+        (851966, 851967, 0),
+        (917502, 921599, 0),
+        (983038, 983039, 0),
+        (1048574, 1048575, 0),
+        (1114110, 1114111, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode5-1-0.py b/libs/rich/_unicode_data/unicode5-1-0.py
new file mode 100644
index 0000000000..016e7825ec
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode5-1-0.py
@@ -0,0 +1,433 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "5.1.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1539, 0),
+        (1552, 1562, 0),
+        (1611, 1630, 0),
+        (1648, 1648, 0),
+        (1750, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2305, 2307, 0),
+        (2364, 2364, 0),
+        (2366, 2381, 0),
+        (2385, 2388, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3984, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4352, 4441, 2),
+        (4447, 4447, 2),
+        (4448, 4607, 0),
+        (4959, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7082, 0),
+        (7204, 7223, 0),
+        (7616, 7654, 0),
+        (7678, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12727, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12867, 2),
+        (12880, 13054, 2),
+        (13056, 19893, 2),
+        (19968, 40899, 2),
+        (40960, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42620, 42621, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64045, 2),
+        (64048, 64106, 2),
+        (64112, 64217, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65062, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode5-2-0.py b/libs/rich/_unicode_data/unicode5-2-0.py
new file mode 100644
index 0000000000..e984f12e95
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode5-2-0.py
@@ -0,0 +1,461 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "5.2.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1539, 0),
+        (1552, 1562, 0),
+        (1611, 1630, 0),
+        (1648, 1648, 0),
+        (1750, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2304, 2307, 0),
+        (2364, 2364, 0),
+        (2366, 2382, 0),
+        (2385, 2389, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3984, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4959, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7082, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7410, 0),
+        (7616, 7654, 0),
+        (7677, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12727, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42620, 42621, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43643, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65062, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (69760, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (127488, 127488, 2),
+        (127504, 127537, 2),
+        (127552, 127560, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode6-0-0.py b/libs/rich/_unicode_data/unicode6-0-0.py
new file mode 100644
index 0000000000..8d5abb455c
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode6-0-0.py
@@ -0,0 +1,469 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "6.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1539, 0),
+        (1552, 1562, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1757, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2304, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7082, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7410, 0),
+        (7616, 7654, 0),
+        (7676, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42620, 42621, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43643, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65062, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69760, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (110592, 110593, 2),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (127488, 127490, 2),
+        (127504, 127546, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode6-1-0.py b/libs/rich/_unicode_data/unicode6-1-0.py
new file mode 100644
index 0000000000..29d3e92988
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode6-1-0.py
@@ -0,0 +1,480 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "6.1.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1540, 0),
+        (1552, 1562, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1757, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2276, 2302, 0),
+        (2304, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7616, 7654, 0),
+        (7676, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42655, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43643, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65062, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69760, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (71339, 71351, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (110592, 110593, 2),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (127488, 127490, 2),
+        (127504, 127546, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode6-2-0.py b/libs/rich/_unicode_data/unicode6-2-0.py
new file mode 100644
index 0000000000..d0cda351a4
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode6-2-0.py
@@ -0,0 +1,480 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "6.2.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1540, 0),
+        (1552, 1562, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1757, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2276, 2302, 0),
+        (2304, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6157, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7616, 7654, 0),
+        (7676, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42655, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43643, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65062, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69760, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (71339, 71351, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (110592, 110593, 2),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (127488, 127490, 2),
+        (127504, 127546, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode6-3-0.py b/libs/rich/_unicode_data/unicode6-3-0.py
new file mode 100644
index 0000000000..cffb7ee942
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode6-3-0.py
@@ -0,0 +1,481 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "6.3.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1540, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1757, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2276, 2302, 0),
+        (2304, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3073, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3202, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3330, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7616, 7654, 0),
+        (7676, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42655, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43643, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65062, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69760, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (71339, 71351, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (110592, 110593, 2),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (127488, 127490, 2),
+        (127504, 127546, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode7-0-0.py b/libs/rich/_unicode_data/unicode7-0-0.py
new file mode 100644
index 0000000000..996478ac24
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode7-0-0.py
@@ -0,0 +1,507 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "7.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1541, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1757, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2276, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3329, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6576, 6592, 0),
+        (6600, 6601, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7416, 7417, 0),
+        (7616, 7669, 0),
+        (7676, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42655, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65069, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70188, 70199, 0),
+        (70367, 70378, 0),
+        (70401, 70403, 0),
+        (70460, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (110592, 110593, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (125136, 125142, 0),
+        (127488, 127490, 2),
+        (127504, 127546, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode8-0-0.py b/libs/rich/_unicode_data/unicode8-0-0.py
new file mode 100644
index 0000000000..ae34a382a6
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode8-0-0.py
@@ -0,0 +1,515 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "8.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1536, 1541, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1757, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1807, 1807, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3329, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7416, 7417, 0),
+        (7616, 7669, 0),
+        (7676, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (9001, 9002, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43204, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69821, 69821, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70090, 70092, 0),
+        (70188, 70199, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70460, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (110592, 110593, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (125136, 125142, 0),
+        (127488, 127490, 2),
+        (127504, 127546, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127995, 127999, 0),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/_unicode_data/unicode9-0-0.py b/libs/rich/_unicode_data/unicode9-0-0.py
new file mode 100644
index 0000000000..b15f67d44e
--- /dev/null
+++ b/libs/rich/_unicode_data/unicode9-0-0.py
@@ -0,0 +1,598 @@
+# Auto generated by tools/make_width_tables.py
+# Data from wcwidth project (https://github.com/jquast/wcwidth)
+
+from rich.cells import CellTable
+
+cell_table = CellTable(
+    "9.0.0",
+    [
+        (0, 0, 0),
+        (768, 879, 0),
+        (1155, 1161, 0),
+        (1425, 1469, 0),
+        (1471, 1471, 0),
+        (1473, 1474, 0),
+        (1476, 1477, 0),
+        (1479, 1479, 0),
+        (1552, 1562, 0),
+        (1564, 1564, 0),
+        (1611, 1631, 0),
+        (1648, 1648, 0),
+        (1750, 1756, 0),
+        (1759, 1764, 0),
+        (1767, 1768, 0),
+        (1770, 1773, 0),
+        (1809, 1809, 0),
+        (1840, 1866, 0),
+        (1958, 1968, 0),
+        (2027, 2035, 0),
+        (2070, 2073, 0),
+        (2075, 2083, 0),
+        (2085, 2087, 0),
+        (2089, 2093, 0),
+        (2137, 2139, 0),
+        (2260, 2273, 0),
+        (2275, 2307, 0),
+        (2362, 2364, 0),
+        (2366, 2383, 0),
+        (2385, 2391, 0),
+        (2402, 2403, 0),
+        (2433, 2435, 0),
+        (2492, 2492, 0),
+        (2494, 2500, 0),
+        (2503, 2504, 0),
+        (2507, 2509, 0),
+        (2519, 2519, 0),
+        (2530, 2531, 0),
+        (2561, 2563, 0),
+        (2620, 2620, 0),
+        (2622, 2626, 0),
+        (2631, 2632, 0),
+        (2635, 2637, 0),
+        (2641, 2641, 0),
+        (2672, 2673, 0),
+        (2677, 2677, 0),
+        (2689, 2691, 0),
+        (2748, 2748, 0),
+        (2750, 2757, 0),
+        (2759, 2761, 0),
+        (2763, 2765, 0),
+        (2786, 2787, 0),
+        (2817, 2819, 0),
+        (2876, 2876, 0),
+        (2878, 2884, 0),
+        (2887, 2888, 0),
+        (2891, 2893, 0),
+        (2902, 2903, 0),
+        (2914, 2915, 0),
+        (2946, 2946, 0),
+        (3006, 3010, 0),
+        (3014, 3016, 0),
+        (3018, 3021, 0),
+        (3031, 3031, 0),
+        (3072, 3075, 0),
+        (3134, 3140, 0),
+        (3142, 3144, 0),
+        (3146, 3149, 0),
+        (3157, 3158, 0),
+        (3170, 3171, 0),
+        (3201, 3203, 0),
+        (3260, 3260, 0),
+        (3262, 3268, 0),
+        (3270, 3272, 0),
+        (3274, 3277, 0),
+        (3285, 3286, 0),
+        (3298, 3299, 0),
+        (3329, 3331, 0),
+        (3390, 3396, 0),
+        (3398, 3400, 0),
+        (3402, 3405, 0),
+        (3415, 3415, 0),
+        (3426, 3427, 0),
+        (3458, 3459, 0),
+        (3530, 3530, 0),
+        (3535, 3540, 0),
+        (3542, 3542, 0),
+        (3544, 3551, 0),
+        (3570, 3571, 0),
+        (3633, 3633, 0),
+        (3636, 3642, 0),
+        (3655, 3662, 0),
+        (3761, 3761, 0),
+        (3764, 3769, 0),
+        (3771, 3772, 0),
+        (3784, 3789, 0),
+        (3864, 3865, 0),
+        (3893, 3893, 0),
+        (3895, 3895, 0),
+        (3897, 3897, 0),
+        (3902, 3903, 0),
+        (3953, 3972, 0),
+        (3974, 3975, 0),
+        (3981, 3991, 0),
+        (3993, 4028, 0),
+        (4038, 4038, 0),
+        (4139, 4158, 0),
+        (4182, 4185, 0),
+        (4190, 4192, 0),
+        (4194, 4196, 0),
+        (4199, 4205, 0),
+        (4209, 4212, 0),
+        (4226, 4237, 0),
+        (4239, 4239, 0),
+        (4250, 4253, 0),
+        (4352, 4447, 2),
+        (4448, 4607, 0),
+        (4957, 4959, 0),
+        (5906, 5908, 0),
+        (5938, 5940, 0),
+        (5970, 5971, 0),
+        (6002, 6003, 0),
+        (6068, 6099, 0),
+        (6109, 6109, 0),
+        (6155, 6158, 0),
+        (6277, 6278, 0),
+        (6313, 6313, 0),
+        (6432, 6443, 0),
+        (6448, 6459, 0),
+        (6679, 6683, 0),
+        (6741, 6750, 0),
+        (6752, 6780, 0),
+        (6783, 6783, 0),
+        (6832, 6846, 0),
+        (6912, 6916, 0),
+        (6964, 6980, 0),
+        (7019, 7027, 0),
+        (7040, 7042, 0),
+        (7073, 7085, 0),
+        (7142, 7155, 0),
+        (7204, 7223, 0),
+        (7376, 7378, 0),
+        (7380, 7400, 0),
+        (7405, 7405, 0),
+        (7410, 7412, 0),
+        (7416, 7417, 0),
+        (7616, 7669, 0),
+        (7675, 7679, 0),
+        (8203, 8207, 0),
+        (8232, 8238, 0),
+        (8288, 8303, 0),
+        (8400, 8432, 0),
+        (8986, 8987, 2),
+        (9001, 9002, 2),
+        (9193, 9196, 2),
+        (9200, 9200, 2),
+        (9203, 9203, 2),
+        (9725, 9726, 2),
+        (9748, 9749, 2),
+        (9800, 9811, 2),
+        (9855, 9855, 2),
+        (9875, 9875, 2),
+        (9889, 9889, 2),
+        (9898, 9899, 2),
+        (9917, 9918, 2),
+        (9924, 9925, 2),
+        (9934, 9934, 2),
+        (9940, 9940, 2),
+        (9962, 9962, 2),
+        (9970, 9971, 2),
+        (9973, 9973, 2),
+        (9978, 9978, 2),
+        (9981, 9981, 2),
+        (9989, 9989, 2),
+        (9994, 9995, 2),
+        (10024, 10024, 2),
+        (10060, 10060, 2),
+        (10062, 10062, 2),
+        (10067, 10069, 2),
+        (10071, 10071, 2),
+        (10133, 10135, 2),
+        (10160, 10160, 2),
+        (10175, 10175, 2),
+        (11035, 11036, 2),
+        (11088, 11088, 2),
+        (11093, 11093, 2),
+        (11503, 11505, 0),
+        (11647, 11647, 0),
+        (11744, 11775, 0),
+        (11904, 11929, 2),
+        (11931, 12019, 2),
+        (12032, 12245, 2),
+        (12272, 12283, 2),
+        (12288, 12329, 2),
+        (12330, 12335, 0),
+        (12336, 12350, 2),
+        (12353, 12438, 2),
+        (12441, 12442, 0),
+        (12443, 12543, 2),
+        (12549, 12589, 2),
+        (12593, 12643, 2),
+        (12644, 12644, 0),
+        (12645, 12686, 2),
+        (12688, 12730, 2),
+        (12736, 12771, 2),
+        (12784, 12830, 2),
+        (12832, 12871, 2),
+        (12880, 13054, 2),
+        (13056, 19903, 2),
+        (19968, 42124, 2),
+        (42128, 42182, 2),
+        (42607, 42610, 0),
+        (42612, 42621, 0),
+        (42654, 42655, 0),
+        (42736, 42737, 0),
+        (43010, 43010, 0),
+        (43014, 43014, 0),
+        (43019, 43019, 0),
+        (43043, 43047, 0),
+        (43136, 43137, 0),
+        (43188, 43205, 0),
+        (43232, 43249, 0),
+        (43302, 43309, 0),
+        (43335, 43347, 0),
+        (43360, 43388, 2),
+        (43392, 43395, 0),
+        (43443, 43456, 0),
+        (43493, 43493, 0),
+        (43561, 43574, 0),
+        (43587, 43587, 0),
+        (43596, 43597, 0),
+        (43643, 43645, 0),
+        (43696, 43696, 0),
+        (43698, 43700, 0),
+        (43703, 43704, 0),
+        (43710, 43711, 0),
+        (43713, 43713, 0),
+        (43755, 43759, 0),
+        (43765, 43766, 0),
+        (44003, 44010, 0),
+        (44012, 44013, 0),
+        (44032, 55203, 2),
+        (55216, 55295, 0),
+        (63744, 64255, 2),
+        (64286, 64286, 0),
+        (65024, 65039, 0),
+        (65040, 65049, 2),
+        (65056, 65071, 0),
+        (65072, 65106, 2),
+        (65108, 65126, 2),
+        (65128, 65131, 2),
+        (65279, 65279, 0),
+        (65281, 65376, 2),
+        (65440, 65440, 0),
+        (65504, 65510, 2),
+        (65520, 65531, 0),
+        (66045, 66045, 0),
+        (66272, 66272, 0),
+        (66422, 66426, 0),
+        (68097, 68099, 0),
+        (68101, 68102, 0),
+        (68108, 68111, 0),
+        (68152, 68154, 0),
+        (68159, 68159, 0),
+        (68325, 68326, 0),
+        (69632, 69634, 0),
+        (69688, 69702, 0),
+        (69759, 69762, 0),
+        (69808, 69818, 0),
+        (69888, 69890, 0),
+        (69927, 69940, 0),
+        (70003, 70003, 0),
+        (70016, 70018, 0),
+        (70067, 70080, 0),
+        (70090, 70092, 0),
+        (70188, 70199, 0),
+        (70206, 70206, 0),
+        (70367, 70378, 0),
+        (70400, 70403, 0),
+        (70460, 70460, 0),
+        (70462, 70468, 0),
+        (70471, 70472, 0),
+        (70475, 70477, 0),
+        (70487, 70487, 0),
+        (70498, 70499, 0),
+        (70502, 70508, 0),
+        (70512, 70516, 0),
+        (70709, 70726, 0),
+        (70832, 70851, 0),
+        (71087, 71093, 0),
+        (71096, 71104, 0),
+        (71132, 71133, 0),
+        (71216, 71232, 0),
+        (71339, 71351, 0),
+        (71453, 71467, 0),
+        (72751, 72758, 0),
+        (72760, 72767, 0),
+        (72850, 72871, 0),
+        (72873, 72886, 0),
+        (92912, 92916, 0),
+        (92976, 92982, 0),
+        (94033, 94078, 0),
+        (94095, 94098, 0),
+        (94176, 94176, 2),
+        (94208, 100332, 2),
+        (100352, 101106, 2),
+        (110592, 110593, 2),
+        (113821, 113822, 0),
+        (113824, 113827, 0),
+        (119141, 119145, 0),
+        (119149, 119170, 0),
+        (119173, 119179, 0),
+        (119210, 119213, 0),
+        (119362, 119364, 0),
+        (121344, 121398, 0),
+        (121403, 121452, 0),
+        (121461, 121461, 0),
+        (121476, 121476, 0),
+        (121499, 121503, 0),
+        (121505, 121519, 0),
+        (122880, 122886, 0),
+        (122888, 122904, 0),
+        (122907, 122913, 0),
+        (122915, 122916, 0),
+        (122918, 122922, 0),
+        (125136, 125142, 0),
+        (125252, 125258, 0),
+        (126980, 126980, 2),
+        (127183, 127183, 2),
+        (127374, 127374, 2),
+        (127377, 127386, 2),
+        (127488, 127490, 2),
+        (127504, 127547, 2),
+        (127552, 127560, 2),
+        (127568, 127569, 2),
+        (127744, 127776, 2),
+        (127789, 127797, 2),
+        (127799, 127868, 2),
+        (127870, 127891, 2),
+        (127904, 127946, 2),
+        (127951, 127955, 2),
+        (127968, 127984, 2),
+        (127988, 127988, 2),
+        (127992, 127994, 2),
+        (127995, 127999, 0),
+        (128000, 128062, 2),
+        (128064, 128064, 2),
+        (128066, 128252, 2),
+        (128255, 128317, 2),
+        (128331, 128334, 2),
+        (128336, 128359, 2),
+        (128378, 128378, 2),
+        (128405, 128406, 2),
+        (128420, 128420, 2),
+        (128507, 128591, 2),
+        (128640, 128709, 2),
+        (128716, 128716, 2),
+        (128720, 128722, 2),
+        (128747, 128748, 2),
+        (128756, 128758, 2),
+        (129296, 129310, 2),
+        (129312, 129319, 2),
+        (129328, 129328, 2),
+        (129331, 129342, 2),
+        (129344, 129355, 2),
+        (129360, 129374, 2),
+        (129408, 129425, 2),
+        (129472, 129472, 2),
+        (131072, 196605, 2),
+        (196608, 262141, 2),
+        (917504, 921599, 0),
+    ],
+    frozenset(
+        [
+            "#",
+            "*",
+            "0",
+            "1",
+            "2",
+            "3",
+            "4",
+            "5",
+            "6",
+            "7",
+            "8",
+            "9",
+            "ยฉ",
+            "ยฎ",
+            "โ€ผ",
+            "โ‰",
+            "โ„ข",
+            "โ„น",
+            "โ†”",
+            "โ†•",
+            "โ†–",
+            "โ†—",
+            "โ†˜",
+            "โ†™",
+            "โ†ฉ",
+            "โ†ช",
+            "โŒจ",
+            "โ",
+            "โญ",
+            "โฎ",
+            "โฏ",
+            "โฑ",
+            "โฒ",
+            "โธ",
+            "โน",
+            "โบ",
+            "โ“‚",
+            "โ–ช",
+            "โ–ซ",
+            "โ–ถ",
+            "โ—€",
+            "โ—ป",
+            "โ—ผ",
+            "โ˜€",
+            "โ˜",
+            "โ˜‚",
+            "โ˜ƒ",
+            "โ˜„",
+            "โ˜Ž",
+            "โ˜‘",
+            "โ˜˜",
+            "โ˜",
+            "โ˜ ",
+            "โ˜ข",
+            "โ˜ฃ",
+            "โ˜ฆ",
+            "โ˜ช",
+            "โ˜ฎ",
+            "โ˜ฏ",
+            "โ˜ธ",
+            "โ˜น",
+            "โ˜บ",
+            "โ™€",
+            "โ™‚",
+            "โ™Ÿ",
+            "โ™ ",
+            "โ™ฃ",
+            "โ™ฅ",
+            "โ™ฆ",
+            "โ™จ",
+            "โ™ป",
+            "โ™พ",
+            "โš’",
+            "โš”",
+            "โš•",
+            "โš–",
+            "โš—",
+            "โš™",
+            "โš›",
+            "โšœ",
+            "โš ",
+            "โšง",
+            "โšฐ",
+            "โšฑ",
+            "โ›ˆ",
+            "โ›",
+            "โ›‘",
+            "โ›“",
+            "โ›ฉ",
+            "โ›ฐ",
+            "โ›ฑ",
+            "โ›ด",
+            "โ›ท",
+            "โ›ธ",
+            "โ›น",
+            "โœ‚",
+            "โœˆ",
+            "โœ‰",
+            "โœŒ",
+            "โœ",
+            "โœ",
+            "โœ’",
+            "โœ”",
+            "โœ–",
+            "โœ",
+            "โœก",
+            "โœณ",
+            "โœด",
+            "โ„",
+            "โ‡",
+            "โฃ",
+            "โค",
+            "โžก",
+            "โคด",
+            "โคต",
+            "โฌ…",
+            "โฌ†",
+            "โฌ‡",
+            "๐Ÿ…ฐ",
+            "๐Ÿ…ฑ",
+            "๐Ÿ…พ",
+            "๐Ÿ…ฟ",
+            "๐ŸŒก",
+            "๐ŸŒค",
+            "๐ŸŒฅ",
+            "๐ŸŒฆ",
+            "๐ŸŒง",
+            "๐ŸŒจ",
+            "๐ŸŒฉ",
+            "๐ŸŒช",
+            "๐ŸŒซ",
+            "๐ŸŒฌ",
+            "๐ŸŒถ",
+            "๐Ÿฝ",
+            "๐ŸŽ–",
+            "๐ŸŽ—",
+            "๐ŸŽ™",
+            "๐ŸŽš",
+            "๐ŸŽ›",
+            "๐ŸŽž",
+            "๐ŸŽŸ",
+            "๐Ÿ‹",
+            "๐ŸŒ",
+            "๐Ÿ",
+            "๐ŸŽ",
+            "๐Ÿ”",
+            "๐Ÿ•",
+            "๐Ÿ–",
+            "๐Ÿ—",
+            "๐Ÿ˜",
+            "๐Ÿ™",
+            "๐Ÿš",
+            "๐Ÿ›",
+            "๐Ÿœ",
+            "๐Ÿ",
+            "๐Ÿž",
+            "๐ŸŸ",
+            "๐Ÿณ",
+            "๐Ÿต",
+            "๐Ÿท",
+            "๐Ÿฟ",
+            "๐Ÿ‘",
+            "๐Ÿ“ฝ",
+            "๐Ÿ•‰",
+            "๐Ÿ•Š",
+            "๐Ÿ•ฏ",
+            "๐Ÿ•ฐ",
+            "๐Ÿ•ณ",
+            "๐Ÿ•ด",
+            "๐Ÿ•ต",
+            "๐Ÿ•ถ",
+            "๐Ÿ•ท",
+            "๐Ÿ•ธ",
+            "๐Ÿ•น",
+            "๐Ÿ–‡",
+            "๐Ÿ–Š",
+            "๐Ÿ–‹",
+            "๐Ÿ–Œ",
+            "๐Ÿ–",
+            "๐Ÿ–",
+            "๐Ÿ–ฅ",
+            "๐Ÿ–จ",
+            "๐Ÿ–ฑ",
+            "๐Ÿ–ฒ",
+            "๐Ÿ–ผ",
+            "๐Ÿ—‚",
+            "๐Ÿ—ƒ",
+            "๐Ÿ—„",
+            "๐Ÿ—‘",
+            "๐Ÿ—’",
+            "๐Ÿ—“",
+            "๐Ÿ—œ",
+            "๐Ÿ—",
+            "๐Ÿ—ž",
+            "๐Ÿ—ก",
+            "๐Ÿ—ฃ",
+            "๐Ÿ—จ",
+            "๐Ÿ—ฏ",
+            "๐Ÿ—ณ",
+            "๐Ÿ—บ",
+            "๐Ÿ›‹",
+            "๐Ÿ›",
+            "๐Ÿ›Ž",
+            "๐Ÿ›",
+            "๐Ÿ› ",
+            "๐Ÿ›ก",
+            "๐Ÿ›ข",
+            "๐Ÿ›ฃ",
+            "๐Ÿ›ค",
+            "๐Ÿ›ฅ",
+            "๐Ÿ›ฉ",
+            "๐Ÿ›ฐ",
+            "๐Ÿ›ณ",
+        ]
+    ),
+)
diff --git a/libs/rich/align.py b/libs/rich/align.py
index fac50b1e36..2fa66b1ad3 100644
--- a/libs/rich/align.py
+++ b/libs/rich/align.py
@@ -1,11 +1,5 @@
-import sys
 from itertools import chain
-from typing import TYPE_CHECKING, Iterable, Optional
-
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
+from typing import TYPE_CHECKING, Iterable, Optional, Literal
 
 from .constrain import Constrain
 from .jupyter import JupyterMixin
@@ -34,6 +28,20 @@ class Align(JupyterMixin):
 
     Raises:
         ValueError: if ``align`` is not one of the expected values.
+
+    Example:
+        .. code-block:: python
+
+            from rich.console import Console
+            from rich.align import Align
+            from rich.panel import Panel
+
+            console = Console()
+            # Create a panel 20 characters wide
+            p = Panel("Hello, [b]World[/b]!", style="on green", width=20)
+
+            # Renders the panel centered in the terminal
+            console.print(Align(p, align="center"))
     """
 
     def __init__(
diff --git a/libs/rich/box.py b/libs/rich/box.py
index aa4ada32ed..82555b61cd 100644
--- a/libs/rich/box.py
+++ b/libs/rich/box.py
@@ -1,10 +1,4 @@
-import sys
-from typing import TYPE_CHECKING, Iterable, List
-
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
+from typing import TYPE_CHECKING, Iterable, List, Literal
 
 
 from ._loop import loop_last
diff --git a/libs/rich/cells.py b/libs/rich/cells.py
index a85462271c..9d590b04e8 100644
--- a/libs/rich/cells.py
+++ b/libs/rich/cells.py
@@ -1,9 +1,14 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import Callable
+from operator import itemgetter
+from typing import Callable, NamedTuple, Sequence, Tuple
 
-from ._cell_widths import CELL_WIDTHS
+from rich._unicode_data import load as load_cell_table
+
+CellSpan = Tuple[int, int, int]
+
+_span_get_cell_len = itemgetter(2)
 
 # Ranges of unicode ordinals that produce a 1-cell wide character
 # This is non-exhaustive, but covers most common Western characters
@@ -16,7 +21,7 @@
     (0x02800, 0x028FF),  # Braille
 ]
 
-# A set of characters that are a single cell wide
+# A frozen set of characters that are a single cell wide
 _SINGLE_CELLS = frozenset(
     [
         character
@@ -30,8 +35,51 @@
 _is_single_cell_widths: Callable[[str], bool] = _SINGLE_CELLS.issuperset
 
 
+class CellTable(NamedTuple):
+    """Contains unicode data required to measure the cell widths of glyphs."""
+
+    unicode_version: str
+    widths: Sequence[tuple[int, int, int]]
+    narrow_to_wide: frozenset[str]
+
+
+@lru_cache(maxsize=4096)
+def get_character_cell_size(character: str, unicode_version: str = "auto") -> int:
+    """Get the cell size of a character.
+
+    Args:
+        character (str): A single character.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
+
+    Returns:
+        int: Number of cells (0, 1 or 2) occupied by that character.
+    """
+    codepoint = ord(character)
+    if codepoint and codepoint < 32 or 0x07F <= codepoint < 0x0A0:
+        return 0
+    table = load_cell_table(unicode_version).widths
+
+    last_entry = table[-1]
+    if codepoint > last_entry[1]:
+        return 1
+
+    lower_bound = 0
+    upper_bound = len(table) - 1
+
+    while lower_bound <= upper_bound:
+        index = (lower_bound + upper_bound) >> 1
+        start, end, width = table[index]
+        if codepoint < start:
+            upper_bound = index - 1
+        elif codepoint > end:
+            lower_bound = index + 1
+        else:
+            return width
+    return 1
+
+
 @lru_cache(4096)
-def cached_cell_len(text: str) -> int:
+def cached_cell_len(text: str, unicode_version: str = "auto") -> int:
     """Get the number of cells required to display text.
 
     This method always caches, which may use up a lot of memory. It is recommended to use
@@ -39,69 +87,231 @@ def cached_cell_len(text: str) -> int:
 
     Args:
         text (str): Text to display.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
 
     Returns:
         int: Get the number of cells required to display text.
     """
-    if _is_single_cell_widths(text):
-        return len(text)
-    return sum(map(get_character_cell_size, text))
+    return _cell_len(text, unicode_version)
 
 
-def cell_len(text: str, _cell_len: Callable[[str], int] = cached_cell_len) -> int:
-    """Get the number of cells required to display text.
+def cell_len(text: str, unicode_version: str = "auto") -> int:
+    """Get the cell length of a string (length as it appears in the terminal).
 
     Args:
-        text (str): Text to display.
+        text: String to measure.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
 
     Returns:
-        int: Get the number of cells required to display text.
+        Length of string in terminal cells.
     """
     if len(text) < 512:
-        return _cell_len(text)
+        return cached_cell_len(text, unicode_version)
+    return _cell_len(text, unicode_version)
+
+
+def _cell_len(text: str, unicode_version: str) -> int:
+    """Get the cell length of a string (length as it appears in the terminal).
+
+    Args:
+        text: String to measure.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
+
+    Returns:
+        Length of string in terminal cells.
+    """
+
     if _is_single_cell_widths(text):
         return len(text)
-    return sum(map(get_character_cell_size, text))
 
+    # "\u200d" is zero width joiner
+    # "\ufe0f" is variation selector 16
+    if "\u200d" not in text and "\ufe0f" not in text:
+        # Simplest case with no unicode stuff that changes the size
+        return sum(
+            get_character_cell_size(character, unicode_version) for character in text
+        )
 
-@lru_cache(maxsize=4096)
-def get_character_cell_size(character: str) -> int:
-    """Get the cell size of a character.
+    cell_table = load_cell_table(unicode_version)
+    total_width = 0
+    last_measured_character: str | None = None
+
+    SPECIAL = {"\u200d", "\ufe0f"}
+
+    index = 0
+    character_count = len(text)
+
+    while index < character_count:
+        character = text[index]
+        if character in SPECIAL:
+            if character == "\u200d":
+                index += 1
+            elif last_measured_character:
+                total_width += last_measured_character in cell_table.narrow_to_wide
+                last_measured_character = None
+        else:
+            if character_width := get_character_cell_size(character, unicode_version):
+                last_measured_character = character
+                total_width += character_width
+        index += 1
+
+    return total_width
+
+
+def split_graphemes(
+    text: str, unicode_version: str = "auto"
+) -> "tuple[list[CellSpan], int]":
+    """Divide text into spans that define a single grapheme, and additionally return the cell length of the whole string.
+
+    The returned spans will cover every index in the string, with no gaps. It is possible for some graphemes to have a cell length of zero.
+    This can occur for nonsense strings like two zero width joiners, or for control codes that don't contribute to the grapheme size.
 
     Args:
-        character (str): A single character.
+        text: String to split.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
 
     Returns:
-        int: Number of cells (0, 1 or 2) occupied by that character.
+        A tuple of a list of *spans* and the cell length of the entire string. A span is a list of tuples
+            of three values consisting of (<START>, <END>, <CELL LENGTH>), where START and END are string indices,
+            and CELL LENGTH is the cell length of the single grapheme.
     """
-    codepoint = ord(character)
-    _table = CELL_WIDTHS
-    lower_bound = 0
-    upper_bound = len(_table) - 1
-    index = (lower_bound + upper_bound) // 2
-    while True:
-        start, end, width = _table[index]
-        if codepoint < start:
-            upper_bound = index - 1
-        elif codepoint > end:
-            lower_bound = index + 1
+
+    cell_table = load_cell_table(unicode_version)
+    codepoint_count = len(text)
+    index = 0
+    last_measured_character: str | None = None
+
+    total_width = 0
+    spans: list[tuple[int, int, int]] = []
+    SPECIAL = {"\u200d", "\ufe0f"}
+    while index < codepoint_count:
+        if (character := text[index]) in SPECIAL:
+            if not spans:
+                # ZWJ or variation selector at the beginning of the string doesn't really make sense.
+                # But handle it, we must.
+                spans.append((index, index := index + 1, 0))
+                continue
+            if character == "\u200d":
+                # zero width joiner
+                # The condition handles the case where a ZWJ is at the end of the string, and has nothing to join
+                index += 2 if index < (codepoint_count - 1) else 1
+                start, _end, cell_length = spans[-1]
+                spans[-1] = (start, index, cell_length)
+            else:
+                # variation selector 16
+                index += 1
+                if last_measured_character:
+                    start, _end, cell_length = spans[-1]
+                    if last_measured_character in cell_table.narrow_to_wide:
+                        last_measured_character = None
+                        cell_length += 1
+                        total_width += 1
+                    spans[-1] = (start, index, cell_length)
+                else:
+                    # No previous character to change the size of.
+                    # Shouldn't occur in practice.
+                    # But handle it, we must.
+                    start, _end, cell_length = spans[-1]
+                    spans[-1] = (start, index, cell_length)
+            continue
+
+        if character_width := get_character_cell_size(character, unicode_version):
+            last_measured_character = character
+            spans.append((index, index := index + 1, character_width))
+            total_width += character_width
         else:
-            return 0 if width == -1 else width
-        if upper_bound < lower_bound:
-            break
-        index = (lower_bound + upper_bound) // 2
-    return 1
+            # Character has zero width
+            if spans:
+                # zero width characters are associated with the previous character
+                start, _end, cell_length = spans[-1]
+                spans[-1] = (start, index := index + 1, cell_length)
+            else:
+                # A zero width character with no prior spans
+                spans.append((index, index := index + 1, 0))
 
+    return (spans, total_width)
 
-def set_cell_size(text: str, total: int) -> str:
-    """Set the length of a string to fit within given number of cells."""
 
+def _split_text(
+    text: str, cell_position: int, unicode_version: str = "auto"
+) -> tuple[str, str]:
+    """Split text by cell position.
+
+    If the cell position falls within a double width character, it is converted to two spaces.
+
+    Args:
+        text: Text to split.
+        cell_position Offset in cells.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
+
+    Returns:
+        Tuple to two split strings.
+    """
+    if cell_position <= 0:
+        return "", text
+
+    spans, cell_length = split_graphemes(text, unicode_version)
+
+    # Guess initial offset
+    offset = int((cell_position / cell_length) * len(spans))
+    left_size = sum(map(_span_get_cell_len, spans[:offset]))
+
+    while True:
+        if left_size == cell_position:
+            if offset >= len(spans):
+                return text, ""
+            split_index = spans[offset][0]
+            return text[:split_index], text[split_index:]
+        if left_size < cell_position:
+            start, end, cell_size = spans[offset]
+            if left_size + cell_size > cell_position:
+                return text[:start] + " ", " " + text[end:]
+            offset += 1
+            left_size += cell_size
+        else:  # left_size > cell_position
+            start, end, cell_size = spans[offset - 1]
+            if left_size - cell_size < cell_position:
+                return text[:start] + " ", " " + text[end:]
+            offset -= 1
+            left_size -= cell_size
+
+
+def split_text(
+    text: str, cell_position: int, unicode_version: str = "auto"
+) -> tuple[str, str]:
+    """Split text by cell position.
+
+    If the cell position falls within a double width character, it is converted to two spaces.
+
+    Args:
+        text: Text to split.
+        cell_position Offset in cells.
+        unicode_version: Unicode version, `"auto"` to auto detect, `"latest"` for the latest unicode version.
+
+    Returns:
+        Tuple to two split strings.
+    """
+    if _is_single_cell_widths(text):
+        return text[:cell_position], text[cell_position:]
+    return _split_text(text, cell_position, unicode_version)
+
+
+def set_cell_size(text: str, total: int, unicode_version: str = "auto") -> str:
+    """Adjust a string by cropping or padding with spaces such that it fits within the given number of cells.
+
+    Args:
+        text: String to adjust.
+        total: Desired size in cells.
+        unicode_version: Unicode version.
+
+    Returns:
+        A string with cell size equal to total.
+    """
     if _is_single_cell_widths(text):
         size = len(text)
         if size < total:
             return text + " " * (total - size)
         return text[:total]
-
     if total <= 0:
         return ""
     cell_size = cell_len(text)
@@ -109,29 +319,11 @@ def set_cell_size(text: str, total: int) -> str:
         return text
     if cell_size < total:
         return text + " " * (total - cell_size)
+    text, _ = _split_text(text, total, unicode_version)
+    return text
 
-    start = 0
-    end = len(text)
 
-    # Binary search until we find the right size
-    while True:
-        pos = (start + end) // 2
-        before = text[: pos + 1]
-        before_len = cell_len(before)
-        if before_len == total + 1 and cell_len(before[-1]) == 2:
-            return before[:-1] + " "
-        if before_len == total:
-            return before
-        if before_len > total:
-            end = pos
-        else:
-            start = pos
-
-
-def chop_cells(
-    text: str,
-    width: int,
-) -> list[str]:
+def chop_cells(text: str, width: int, unicode_version: str = "auto") -> list[str]:
     """Split text into lines such that each line fits within the available (cell) width.
 
     Args:
@@ -142,33 +334,19 @@ def chop_cells(
         A list of strings such that each string in the list has cell width
         less than or equal to the available width.
     """
-    _get_character_cell_size = get_character_cell_size
-    lines: list[list[str]] = [[]]
-
-    append_new_line = lines.append
-    append_to_last_line = lines[-1].append
-
-    total_width = 0
-
-    for character in text:
-        cell_width = _get_character_cell_size(character)
-        char_doesnt_fit = total_width + cell_width > width
-
-        if char_doesnt_fit:
-            append_new_line([character])
-            append_to_last_line = lines[-1].append
-            total_width = cell_width
-        else:
-            append_to_last_line(character)
-            total_width += cell_width
-
-    return ["".join(line) for line in lines]
-
-
-if __name__ == "__main__":  # pragma: no cover
-    print(get_character_cell_size("๐Ÿ˜ฝ"))
-    for line in chop_cells("""่ฟ™ๆ˜ฏๅฏนไบšๆดฒ่ฏญ่จ€ๆ”ฏๆŒ็š„ๆต‹่ฏ•ใ€‚้ขๅฏนๆจกๆฃฑไธคๅฏ็š„ๆƒณๆณ•๏ผŒๆ‹’็ป็Œœๆต‹็š„่ฏฑๆƒ‘ใ€‚""", 8):
-        print(line)
-    for n in range(80, 1, -1):
-        print(set_cell_size("""่ฟ™ๆ˜ฏๅฏนไบšๆดฒ่ฏญ่จ€ๆ”ฏๆŒ็š„ๆต‹่ฏ•ใ€‚้ขๅฏนๆจกๆฃฑไธคๅฏ็š„ๆƒณๆณ•๏ผŒๆ‹’็ป็Œœๆต‹็š„่ฏฑๆƒ‘ใ€‚""", n) + "|")
-        print("x" * n)
+    if _is_single_cell_widths(text):
+        return [text[index : index + width] for index in range(0, len(text), width)]
+    spans, _ = split_graphemes(text, unicode_version)
+    line_size = 0  # Size of line in cells
+    lines: list[str] = []
+    line_offset = 0  # Offset (in codepoints) of start of line
+    for start, end, cell_size in spans:
+        if line_size + cell_size > width:
+            lines.append(text[line_offset:start])
+            line_offset = start
+            line_size = 0
+        line_size += cell_size
+    if line_size:
+        lines.append(text[line_offset:])
+
+    return lines
diff --git a/libs/rich/console.py b/libs/rich/console.py
index 3ec9a8aabb..ad92d529c0 100644
--- a/libs/rich/console.py
+++ b/libs/rich/console.py
@@ -22,27 +22,21 @@
     Dict,
     Iterable,
     List,
+    Literal,
     Mapping,
     NamedTuple,
     Optional,
+    Protocol,
     TextIO,
     Tuple,
     Type,
     Union,
     cast,
+    runtime_checkable,
 )
 
 from rich._null_file import NULL_FILE
 
-if sys.version_info >= (3, 8):
-    from typing import Literal, Protocol, runtime_checkable
-else:
-    from typing_extensions import (
-        Literal,
-        Protocol,
-        runtime_checkable,
-    )  # pragma: no cover
-
 from . import errors, themes
 from ._emoji_replace import _emoji_replace
 from ._export_format import CONSOLE_HTML_FORMAT, CONSOLE_SVG_FORMAT
@@ -500,7 +494,7 @@ def group(fit: bool = True) -> Callable[..., Callable[..., Group]]:
     """
 
     def decorator(
-        method: Callable[..., Iterable[RenderableType]]
+        method: Callable[..., Iterable[RenderableType]],
     ) -> Callable[..., Group]:
         """Convert a method that returns an iterable of renderables in to a Group."""
 
@@ -735,8 +729,18 @@ def __init__(
         self.get_time = get_time or monotonic
         self.style = style
         self.no_color = (
-            no_color if no_color is not None else "NO_COLOR" in self._environ
+            no_color
+            if no_color is not None
+            else self._environ.get("NO_COLOR", "") != ""
         )
+        if force_interactive is None:
+            tty_interactive = self._environ.get("TTY_INTERACTIVE", None)
+            if tty_interactive is not None:
+                if tty_interactive == "0":
+                    force_interactive = False
+                elif tty_interactive == "1":
+                    force_interactive = True
+
         self.is_interactive = (
             (self.is_terminal and not self.is_dumb_terminal)
             if force_interactive is None
@@ -749,7 +753,7 @@ def __init__(
         )
         self._record_buffer: List[Segment] = []
         self._render_hooks: List[RenderHook] = []
-        self._live: Optional["Live"] = None
+        self._live_stack: List[Live] = []
         self._is_alt_screen = False
 
     def __repr__(self) -> str:
@@ -821,24 +825,26 @@ def _exit_buffer(self) -> None:
         self._buffer_index -= 1
         self._check_buffer()
 
-    def set_live(self, live: "Live") -> None:
-        """Set Live instance. Used by Live context manager.
+    def set_live(self, live: "Live") -> bool:
+        """Set Live instance. Used by Live context manager (no need to call directly).
 
         Args:
             live (Live): Live instance using this Console.
 
+        Returns:
+            Boolean that indicates if the live is the topmost of the stack.
+
         Raises:
             errors.LiveError: If this Console has a Live context currently active.
         """
         with self._lock:
-            if self._live is not None:
-                raise errors.LiveError("Only one live display may be active at once")
-            self._live = live
+            self._live_stack.append(live)
+            return len(self._live_stack) == 1
 
     def clear_live(self) -> None:
-        """Clear the Live instance."""
+        """Clear the Live instance. Used by the Live context manager (no need to call directly)."""
         with self._lock:
-            self._live = None
+            self._live_stack.pop()
 
     def push_render_hook(self, hook: RenderHook) -> None:
         """Add a new render hook to the stack.
@@ -933,11 +939,13 @@ def is_terminal(self) -> bool:
 
         Returns:
             bool: True if the console writing to a device capable of
-            understanding terminal codes, otherwise False.
+                understanding escape sequences, otherwise False.
         """
+        # If dev has explicitly set this value, return it
         if self._force_terminal is not None:
             return self._force_terminal
 
+        # Fudge for Idle
         if hasattr(sys.stdin, "__module__") and sys.stdin.__module__.startswith(
             "idlelib"
         ):
@@ -948,12 +956,22 @@ def is_terminal(self) -> bool:
             # return False for Jupyter, which may have FORCE_COLOR set
             return False
 
-        # If FORCE_COLOR env var has any value at all, we assume a terminal.
-        force_color = self._environ.get("FORCE_COLOR")
-        if force_color is not None:
-            self._force_terminal = True
+        environ = self._environ
+
+        tty_compatible = environ.get("TTY_COMPATIBLE", "")
+        # 0 indicates device is not tty compatible
+        if tty_compatible == "0":
+            return False
+        # 1 indicates device is tty compatible
+        if tty_compatible == "1":
             return True
 
+        # https://force-color.org/
+        force_color = environ.get("FORCE_COLOR")
+        if force_color is not None:
+            return force_color != ""
+
+        # Any other value defaults to auto detect
         isatty: Optional[Callable[[], bool]] = getattr(self.file, "isatty", None)
         try:
             return False if isatty is None else isatty()
@@ -978,12 +996,13 @@ def is_dumb_terminal(self) -> bool:
     @property
     def options(self) -> ConsoleOptions:
         """Get default console options."""
+        size = self.size
         return ConsoleOptions(
-            max_height=self.size.height,
-            size=self.size,
+            max_height=size.height,
+            size=size,
             legacy_windows=self.legacy_windows,
             min_width=1,
-            max_width=self.width,
+            max_width=size.width,
             encoding=self.encoding,
             is_terminal=self.is_terminal,
         )
@@ -1704,12 +1723,16 @@ def print(
                 for renderable in renderables:
                     extend(render(renderable, render_options))
             else:
+                render_style = self.get_style(style)
+                new_line = Segment.line()
                 for renderable in renderables:
-                    extend(
-                        Segment.apply_style(
-                            render(renderable, render_options), self.get_style(style)
-                        )
-                    )
+                    for line, add_new_line in Segment.split_lines_terminator(
+                        render(renderable, render_options)
+                    ):
+                        extend(Segment.apply_style(line, render_style))
+                        if add_new_line:
+                            new_segments.append(new_line)
+
             if new_line_start:
                 if (
                     len("".join(segment.text for segment in new_segments).splitlines())
diff --git a/libs/rich/control.py b/libs/rich/control.py
index a8a912553a..248b0f595a 100644
--- a/libs/rich/control.py
+++ b/libs/rich/control.py
@@ -1,11 +1,5 @@
-import sys
 import time
-from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Union
-
-if sys.version_info >= (3, 8):
-    from typing import Final
-else:
-    from typing_extensions import Final  # pragma: no cover
+from typing import TYPE_CHECKING, Callable, Dict, Iterable, List, Union, Final
 
 from .segment import ControlCode, ControlType, Segment
 
diff --git a/libs/rich/default_styles.py b/libs/rich/default_styles.py
index 28e8f6f946..c18b6095e4 100644
--- a/libs/rich/default_styles.py
+++ b/libs/rich/default_styles.py
@@ -120,7 +120,9 @@
     "traceback.exc_type": Style(color="bright_red", bold=True),
     "traceback.exc_value": Style.null(),
     "traceback.offset": Style(color="bright_red", bold=True),
-    "traceback.error_range": Style(underline=True, bold=True, dim=False),
+    "traceback.error_range": Style(underline=True, bold=True),
+    "traceback.note": Style(color="green", bold=True),
+    "traceback.group.border": Style(color="magenta"),
     "bar.back": Style(color="grey23"),
     "bar.complete": Style(color="rgb(249,38,114)"),
     "bar.finished": Style(color="rgb(114,156,31)"),
@@ -147,20 +149,22 @@
     "markdown.block_quote": Style(color="magenta"),
     "markdown.list": Style(color="cyan"),
     "markdown.item": Style(),
-    "markdown.item.bullet": Style(color="yellow", bold=True),
-    "markdown.item.number": Style(color="yellow", bold=True),
-    "markdown.hr": Style(color="yellow"),
+    "markdown.item.bullet": Style(bold=True),
+    "markdown.item.number": Style(color="cyan"),
+    "markdown.hr": Style(dim=True),
     "markdown.h1.border": Style(),
-    "markdown.h1": Style(bold=True),
-    "markdown.h2": Style(bold=True, underline=True),
-    "markdown.h3": Style(bold=True),
-    "markdown.h4": Style(bold=True, dim=True),
-    "markdown.h5": Style(underline=True),
-    "markdown.h6": Style(italic=True),
+    "markdown.h1": Style(bold=True, underline=True),
+    "markdown.h2": Style(color="magenta", underline=True),
+    "markdown.h3": Style(color="magenta", bold=True),
+    "markdown.h4": Style(color="magenta", italic=True),
+    "markdown.h5": Style(italic=True),
+    "markdown.h6": Style(dim=True),
     "markdown.h7": Style(italic=True, dim=True),
     "markdown.link": Style(color="bright_blue"),
     "markdown.link_url": Style(color="blue", underline=True),
     "markdown.s": Style(strike=True),
+    "markdown.table.border": Style(color="cyan"),
+    "markdown.table.header": Style(color="cyan", bold=False),
     "iso8601.date": Style(color="blue"),
     "iso8601.time": Style(color="magenta"),
     "iso8601.timezone": Style(color="yellow"),
diff --git a/libs/rich/diagnose.py b/libs/rich/diagnose.py
index 91e55bd8af..9d5ff3ec32 100644
--- a/libs/rich/diagnose.py
+++ b/libs/rich/diagnose.py
@@ -15,16 +15,18 @@ def report() -> None:  # pragma: no cover
     inspect(features)
 
     env_names = (
-        "TERM",
-        "COLORTERM",
         "CLICOLOR",
-        "NO_COLOR",
-        "TERM_PROGRAM",
+        "COLORTERM",
         "COLUMNS",
-        "LINES",
+        "JPY_PARENT_PID",
         "JUPYTER_COLUMNS",
         "JUPYTER_LINES",
-        "JPY_PARENT_PID",
+        "LINES",
+        "NO_COLOR",
+        "TERM_PROGRAM",
+        "TERM",
+        "TTY_COMPATIBLE",
+        "TTY_INTERACTIVE",
         "VSCODE_VERBOSE_LOGGING",
     )
     env = {name: os.getenv(name) for name in env_names}
diff --git a/libs/rich/emoji.py b/libs/rich/emoji.py
index d5a1062a96..9433e6fb3f 100644
--- a/libs/rich/emoji.py
+++ b/libs/rich/emoji.py
@@ -1,5 +1,5 @@
 import sys
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING, Optional, Union, Literal
 
 from .jupyter import JupyterMixin
 from .segment import Segment
@@ -7,11 +7,6 @@
 from ._emoji_codes import EMOJI
 from ._emoji_replace import _emoji_replace
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
-
 
 if TYPE_CHECKING:
     from .console import Console, ConsoleOptions, RenderResult
diff --git a/libs/rich/highlighter.py b/libs/rich/highlighter.py
index e4c462e2b6..df28048f88 100644
--- a/libs/rich/highlighter.py
+++ b/libs/rich/highlighter.py
@@ -1,6 +1,6 @@
 import re
 from abc import ABC, abstractmethod
-from typing import List, Union
+from typing import ClassVar, Sequence, Union
 
 from .text import Span, Text
 
@@ -61,8 +61,8 @@ def highlight(self, text: Text) -> None:
 class RegexHighlighter(Highlighter):
     """Applies highlighting from a list of regular expressions."""
 
-    highlights: List[str] = []
-    base_style: str = ""
+    highlights: ClassVar[Sequence[str]] = []
+    base_style: ClassVar[str] = ""
 
     def highlight(self, text: Text) -> None:
         """Highlight :class:`rich.text.Text` using regular expressions.
@@ -81,7 +81,7 @@ class ReprHighlighter(RegexHighlighter):
     """Highlights the text typically produced from ``__repr__`` methods."""
 
     base_style = "repr."
-    highlights = [
+    highlights: ClassVar[Sequence[str]] = [
         r"(?P<tag_start><)(?P<tag_name>[-\w.:|]*)(?P<tag_contents>[\w\W]*)(?P<tag_end>>)",
         r'(?P<attrib_name>[\w_]{1,50})=(?P<attrib_value>"?[\w_]+"?)?',
         r"(?P<brace>[][{}()])",
@@ -110,8 +110,8 @@ class JSONHighlighter(RegexHighlighter):
     JSON_STR = r"(?<![\\\w])(?P<str>b?\".*?(?<!\\)\")"
     JSON_WHITESPACE = {" ", "\n", "\r", "\t"}
 
-    base_style = "json."
-    highlights = [
+    base_style: ClassVar[str] = "json."
+    highlights: ClassVar[Sequence[str]] = [
         _combine_regex(
             r"(?P<brace>[\{\[\(\)\]\}])",
             r"\b(?P<bool_true>true)\b|\b(?P<bool_false>false)\b|\b(?P<null>null)\b",
@@ -145,8 +145,8 @@ class ISO8601Highlighter(RegexHighlighter):
     Regex reference: https://www.oreilly.com/library/view/regular-expressions-cookbook/9781449327453/ch04s07.html
     """
 
-    base_style = "iso8601."
-    highlights = [
+    base_style: ClassVar[str] = "iso8601."
+    highlights: ClassVar[Sequence[str]] = [
         #
         # Dates
         #
diff --git a/libs/rich/live.py b/libs/rich/live.py
index 8738cf09f4..2fd893b008 100644
--- a/libs/rich/live.py
+++ b/libs/rich/live.py
@@ -1,10 +1,12 @@
+from __future__ import annotations
+
 import sys
 from threading import Event, RLock, Thread
 from types import TracebackType
-from typing import IO, Any, Callable, List, Optional, TextIO, Type, cast
+from typing import IO, TYPE_CHECKING, Any, Callable, List, Optional, TextIO, Type, cast
 
 from . import get_console
-from .console import Console, ConsoleRenderable, RenderableType, RenderHook
+from .console import Console, ConsoleRenderable, Group, RenderableType, RenderHook
 from .control import Control
 from .file_proxy import FileProxy
 from .jupyter import JupyterMixin
@@ -12,6 +14,10 @@
 from .screen import Screen
 from .text import Text
 
+if TYPE_CHECKING:
+    # Can be replaced with `from typing import Self` in Python 3.11+
+    from typing_extensions import Self  # pragma: no cover
+
 
 class _RefreshThread(Thread):
     """A thread that calls refresh() at regular intervals."""
@@ -87,6 +93,7 @@ def __init__(
         self._live_render = LiveRender(
             self.get_renderable(), vertical_overflow=vertical_overflow
         )
+        self._nested = False
 
     @property
     def is_started(self) -> bool:
@@ -110,8 +117,12 @@ def start(self, refresh: bool = False) -> None:
         with self._lock:
             if self._started:
                 return
-            self.console.set_live(self)
             self._started = True
+
+            if not self.console.set_live(self):
+                self._nested = True
+                return
+
             if self._screen:
                 self._alt_screen = self.console.set_alt_screen(True)
             self.console.show_cursor(False)
@@ -136,8 +147,12 @@ def stop(self) -> None:
         with self._lock:
             if not self._started:
                 return
-            self.console.clear_live()
             self._started = False
+            self.console.clear_live()
+            if self._nested:
+                if not self.transient:
+                    self.console.print(self.renderable)
+                return
 
             if self.auto_refresh and self._refresh_thread is not None:
                 self._refresh_thread.stop()
@@ -151,18 +166,21 @@ def stop(self) -> None:
                 finally:
                     self._disable_redirect_io()
                     self.console.pop_render_hook()
-                    if not self._alt_screen and self.console.is_terminal:
+                    if (
+                        not self._alt_screen
+                        and self.console.is_terminal
+                        and self._live_render.last_render_height
+                    ):
                         self.console.line()
                     self.console.show_cursor(True)
                     if self._alt_screen:
                         self.console.set_alt_screen(False)
-
                     if self.transient and not self._alt_screen:
                         self.console.control(self._live_render.restore_cursor())
                     if self.ipy_widget is not None and self.transient:
                         self.ipy_widget.close()  # pragma: no cover
 
-    def __enter__(self) -> "Live":
+    def __enter__(self) -> Self:
         self.start(refresh=self._renderable is not None)
         return self
 
@@ -200,7 +218,13 @@ def renderable(self) -> RenderableType:
         Returns:
             RenderableType: Displayed renderable.
         """
-        renderable = self.get_renderable()
+        live_stack = self.console._live_stack
+        renderable: RenderableType
+        if live_stack and self is live_stack[0]:
+            # The first Live instance will render everything in the Live stack
+            renderable = Group(*[live.get_renderable() for live in live_stack])
+        else:
+            renderable = self.get_renderable()
         return Screen(renderable) if self._alt_screen else renderable
 
     def update(self, renderable: RenderableType, *, refresh: bool = False) -> None:
@@ -221,6 +245,11 @@ def refresh(self) -> None:
         """Update the display of the Live Render."""
         with self._lock:
             self._live_render.set_renderable(self.renderable)
+            if self._nested:
+                if self.console._live_stack:
+                    self.console._live_stack[0].refresh()
+                return
+
             if self.console.is_jupyter:  # pragma: no cover
                 try:
                     from IPython.display import display
diff --git a/libs/rich/live_render.py b/libs/rich/live_render.py
index 4284cccc4b..e7ec970a78 100644
--- a/libs/rich/live_render.py
+++ b/libs/rich/live_render.py
@@ -1,11 +1,4 @@
-import sys
-from typing import Optional, Tuple
-
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
-
+from typing import Literal, Optional, Tuple
 
 from ._loop import loop_last
 from .console import Console, ConsoleOptions, RenderableType, RenderResult
@@ -36,6 +29,17 @@ def __init__(
         self.vertical_overflow = vertical_overflow
         self._shape: Optional[Tuple[int, int]] = None
 
+    @property
+    def last_render_height(self) -> int:
+        """The number of lines in the last render (may be 0 if nothing was rendered).
+
+        Returns:
+            Height in lines
+        """
+        if self._shape is None:
+            return 0
+        return self._shape[1]
+
     def set_renderable(self, renderable: RenderableType) -> None:
         """Set a new renderable.
 
diff --git a/libs/rich/logging.py b/libs/rich/logging.py
index b2624cd54a..c3e7a5f670 100644
--- a/libs/rich/logging.py
+++ b/libs/rich/logging.py
@@ -76,7 +76,7 @@ def __init__(
         markup: bool = False,
         rich_tracebacks: bool = False,
         tracebacks_width: Optional[int] = None,
-        tracebacks_code_width: int = 88,
+        tracebacks_code_width: Optional[int] = 88,
         tracebacks_extra_lines: int = 3,
         tracebacks_theme: Optional[str] = None,
         tracebacks_word_wrap: bool = True,
diff --git a/libs/rich/markdown.py b/libs/rich/markdown.py
index 26c58d1558..5db183b0a3 100644
--- a/libs/rich/markdown.py
+++ b/libs/rich/markdown.py
@@ -1,16 +1,12 @@
 from __future__ import annotations
 
 import sys
-from typing import ClassVar, Iterable
+from dataclasses import dataclass
+from typing import ClassVar, Iterable, get_args
 
 from markdown_it import MarkdownIt
 from markdown_it.token import Token
 
-if sys.version_info >= (3, 8):
-    from typing import get_args
-else:
-    from typing_extensions import get_args  # pragma: no cover
-
 from rich.table import Table
 
 from . import box
@@ -19,7 +15,6 @@
 from .console import Console, ConsoleOptions, JustifyMethod, RenderResult
 from .containers import Renderables
 from .jupyter import JupyterMixin
-from .panel import Panel
 from .rule import Rule
 from .segment import Segment
 from .style import Style, StyleStack
@@ -129,9 +124,24 @@ def __rich_console__(
         yield self.text
 
 
+@dataclass
+class HeadingFormat:
+    justify: JustifyMethod = "left"
+    style: str = ""
+
+
 class Heading(TextElement):
     """A heading."""
 
+    LEVEL_ALIGN: ClassVar[dict[str, JustifyMethod]] = {
+        "h1": "center",
+        "h2": "left",
+        "h3": "left",
+        "h4": "left",
+        "h5": "left",
+        "h6": "left",
+    }
+
     @classmethod
     def create(cls, markdown: Markdown, token: Token) -> Heading:
         return cls(token.tag)
@@ -148,20 +158,10 @@ def __init__(self, tag: str) -> None:
     def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
-        text = self.text
-        text.justify = "center"
-        if self.tag == "h1":
-            # Draw a border around h1s
-            yield Panel(
-                text,
-                box=box.HEAVY,
-                style="markdown.h1.border",
-            )
-        else:
-            # Styled text for h2 and beyond
-            if self.tag == "h2":
-                yield Text("")
-            yield text
+        text = self.text.copy()
+        heading_justify = self.LEVEL_ALIGN.get(self.tag, "left")
+        text.justify = heading_justify
+        yield text
 
 
 class CodeBlock(TextElement):
@@ -224,7 +224,8 @@ def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
         style = console.get_style("markdown.hr", default="none")
-        yield Rule(style=style)
+        yield Rule(style=style, characters="-")
+        yield Text()
 
 
 class TableElement(MarkdownElement):
@@ -246,11 +247,19 @@ def on_child_close(self, context: MarkdownContext, child: MarkdownElement) -> bo
     def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
-        table = Table(box=box.SIMPLE_HEAVY)
+        table = Table(
+            box=box.SIMPLE,
+            pad_edge=False,
+            style="markdown.table.border",
+            show_edge=True,
+            collapse_padding=True,
+        )
 
         if self.header is not None and self.header.row is not None:
             for column in self.header.row.cells:
-                table.add_column(column.content)
+                heading = column.content.copy()
+                heading.stylize("markdown.table.header")
+                table.add_column(heading)
 
         if self.body is not None:
             for row in self.body.rows:
diff --git a/libs/rich/panel.py b/libs/rich/panel.py
index 8cfa6f4a24..07587e3b33 100644
--- a/libs/rich/panel.py
+++ b/libs/rich/panel.py
@@ -22,7 +22,7 @@ class Panel(JupyterMixin):
 
     Args:
         renderable (RenderableType): A console renderable object.
-        box (Box, optional): A Box instance that defines the look of the border (see :ref:`appendix_box`. Defaults to box.ROUNDED.
+        box (Box): A Box instance that defines the look of the border (see :ref:`appendix_box`. Defaults to box.ROUNDED.
         title (Optional[TextType], optional): Optional title displayed in panel header. Defaults to None.
         title_align (AlignMethod, optional): Alignment of title. Defaults to "center".
         subtitle (Optional[TextType], optional): Optional subtitle displayed in panel footer. Defaults to None.
@@ -146,8 +146,7 @@ def __rich_console__(
             Padding(self.renderable, _padding) if any(_padding) else self.renderable
         )
         style = console.get_style(self.style)
-        partial_border_style = console.get_style(self.border_style)
-        border_style = style + partial_border_style
+        border_style = style + console.get_style(self.border_style)
         width = (
             options.max_width
             if self.width is None
@@ -206,7 +205,7 @@ def align_text(
 
         title_text = self._title
         if title_text is not None:
-            title_text.stylize_before(partial_border_style)
+            title_text.stylize_before(border_style)
 
         child_width = (
             width - 2
@@ -255,7 +254,7 @@ def align_text(
 
         subtitle_text = self._subtitle
         if subtitle_text is not None:
-            subtitle_text.stylize_before(partial_border_style)
+            subtitle_text.stylize_before(border_style)
 
         if subtitle_text is None or width <= 4:
             yield Segment(box.get_bottom([width - 2]), border_style)
diff --git a/libs/rich/pretty.py b/libs/rich/pretty.py
index 5c725c0c53..00abecab35 100644
--- a/libs/rich/pretty.py
+++ b/libs/rich/pretty.py
@@ -234,7 +234,7 @@ def __call__(self, value: Any) -> Any:
                 if self.pprint:
                     return _ipy_display_hook(
                         value,
-                        console=get_console(),
+                        console=console,
                         overflow=overflow,
                         indent_guides=indent_guides,
                         max_length=max_length,
diff --git a/libs/rich/progress.py b/libs/rich/progress.py
index 1e92eb6b13..c2de125aec 100644
--- a/libs/rich/progress.py
+++ b/libs/rich/progress.py
@@ -1,5 +1,6 @@
+from __future__ import annotations
+
 import io
-import sys
 import typing
 import warnings
 from abc import ABC, abstractmethod
@@ -14,6 +15,7 @@
 from threading import Event, RLock, Thread
 from types import TracebackType
 from typing import (
+    TYPE_CHECKING,
     Any,
     BinaryIO,
     Callable,
@@ -23,10 +25,10 @@
     Generic,
     Iterable,
     List,
+    Literal,
     NamedTuple,
     NewType,
     Optional,
-    Sequence,
     TextIO,
     Tuple,
     Type,
@@ -34,14 +36,8 @@
     Union,
 )
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal  # pragma: no cover
-
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
+if TYPE_CHECKING:
+    # Can be replaced with `from typing import Self` in Python 3.11+
     from typing_extensions import Self  # pragma: no cover
 
 from . import filesize, get_console
@@ -106,7 +102,7 @@ def __exit__(
 
 
 def track(
-    sequence: Union[Sequence[ProgressType], Iterable[ProgressType]],
+    sequence: Iterable[ProgressType],
     description: str = "Working...",
     total: Optional[float] = None,
     completed: int = 0,
@@ -125,8 +121,10 @@ def track(
 ) -> Iterable[ProgressType]:
     """Track progress by iterating over a sequence.
 
+    You can also track progress of an iterable, which might require that you additionally specify ``total``.
+
     Args:
-        sequence (Iterable[ProgressType]): A sequence (must support "len") you wish to iterate over.
+        sequence (Iterable[ProgressType]): Values you wish to iterate over and track progress.
         description (str, optional): Description of task show next to progress bar. Defaults to "Working".
         total: (float, optional): Total number of steps. Default is len(sequence).
         completed (int, optional): Number of steps completed so far. Defaults to 0.
@@ -1066,7 +1064,7 @@ class Progress(JupyterMixin):
     Args:
         console (Console, optional): Optional Console instance. Defaults to an internal Console instance writing to stdout.
         auto_refresh (bool, optional): Enable auto refresh. If disabled, you will need to call `refresh()`.
-        refresh_per_second (Optional[float], optional): Number of times per second to refresh the progress information or None to use default (10). Defaults to None.
+        refresh_per_second (float, optional): Number of times per second to refresh the progress information. Defaults to 10.
         speed_estimate_period: (float, optional): Period (in seconds) used to calculate the speed estimate. Defaults to 30.
         transient: (bool, optional): Clear the progress on exit. Defaults to False.
         redirect_stdout: (bool, optional): Enable redirection of stdout, so ``print`` may be used. Defaults to True.
@@ -1174,9 +1172,10 @@ def start(self) -> None:
 
     def stop(self) -> None:
         """Stop the progress display."""
-        self.live.stop()
-        if not self.console.is_interactive and not self.console.is_jupyter:
-            self.console.print()
+        if not self.disable:
+            self.live.stop()
+            if not self.console.is_interactive and not self.console.is_jupyter:
+                self.console.print()
 
     def __enter__(self) -> Self:
         self.start()
@@ -1192,7 +1191,7 @@ def __exit__(
 
     def track(
         self,
-        sequence: Union[Iterable[ProgressType], Sequence[ProgressType]],
+        sequence: Iterable[ProgressType],
         total: Optional[float] = None,
         completed: int = 0,
         task_id: Optional[TaskID] = None,
@@ -1201,8 +1200,10 @@ def track(
     ) -> Iterable[ProgressType]:
         """Track progress by iterating over a sequence.
 
+        You can also track progress of an iterable, which might require that you additionally specify ``total``.
+
         Args:
-            sequence (Sequence[ProgressType]): A sequence of values you want to iterate over and track progress.
+            sequence (Iterable[ProgressType]): Values you want to iterate over and track progress.
             total: (float, optional): Total number of steps. Default is len(sequence).
             completed (int, optional): Number of steps completed so far. Defaults to 0.
             task_id: (TaskID): Task to track. Default is new task.
@@ -1492,7 +1493,7 @@ def reset(
             start (bool, optional): Start the task after reset. Defaults to True.
             total (float, optional): New total steps in task, or None to use current total. Defaults to None.
             completed (int, optional): Number of steps completed. Defaults to 0.
-            visible (bool, optional): Enable display of the task. Defaults to True.
+            visible (bool, optional): Set visible flag if not None.
             description (str, optional): Change task description if not None. Defaults to None.
             **fields (str): Additional data fields required for rendering.
         """
diff --git a/libs/rich/prompt.py b/libs/rich/prompt.py
index c7cf25bae8..ae94d9bb87 100644
--- a/libs/rich/prompt.py
+++ b/libs/rich/prompt.py
@@ -262,7 +262,7 @@ def on_validate_error(self, value: str, error: InvalidResponse) -> None:
             value (str): String entered by user.
             error (InvalidResponse): Exception instance the initiated the error.
         """
-        self.console.print(error)
+        self.console.print(error, markup=True)
 
     def pre_prompt(self) -> None:
         """Hook to display something before the prompt."""
diff --git a/libs/rich/scope.py b/libs/rich/scope.py
index 36c06241f4..41d0299d54 100644
--- a/libs/rich/scope.py
+++ b/libs/rich/scope.py
@@ -8,7 +8,7 @@
 from .text import Text, TextType
 
 if TYPE_CHECKING:
-    from .console import ConsoleRenderable
+    from .console import ConsoleRenderable, OverflowMethod
 
 
 def render_scope(
@@ -19,6 +19,8 @@ def render_scope(
     indent_guides: bool = False,
     max_length: Optional[int] = None,
     max_string: Optional[int] = None,
+    max_depth: Optional[int] = None,
+    overflow: Optional["OverflowMethod"] = None,
 ) -> "ConsoleRenderable":
     """Render python variables in a given scope.
 
@@ -30,6 +32,8 @@ def render_scope(
         max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
             Defaults to None.
         max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to None.
+        max_depth (int, optional): Maximum depths of locals before truncating, or None to disable. Defaults to None.
+        overflow (OverflowMethod, optional): How to handle overflowing locals, or None to disable. Defaults to None.
 
     Returns:
         ConsoleRenderable: A renderable object.
@@ -57,6 +61,8 @@ def sort_items(item: Tuple[str, Any]) -> Tuple[bool, str]:
                 indent_guides=indent_guides,
                 max_length=max_length,
                 max_string=max_string,
+                max_depth=max_depth,
+                overflow=overflow,
             ),
         )
     return Panel.fit(
diff --git a/libs/rich/segment.py b/libs/rich/segment.py
index edcb52dd3f..0df63fdefe 100644
--- a/libs/rich/segment.py
+++ b/libs/rich/segment.py
@@ -275,6 +275,37 @@ def split_lines(cls, segments: Iterable["Segment"]) -> Iterable[List["Segment"]]
         if line:
             yield line
 
+    @classmethod
+    def split_lines_terminator(
+        cls, segments: Iterable["Segment"]
+    ) -> Iterable[Tuple[List["Segment"], bool]]:
+        """Split a sequence of segments in to a list of lines and a boolean to indicate if there was a new line.
+
+        Args:
+            segments (Iterable[Segment]): Segments potentially containing line feeds.
+
+        Yields:
+            Iterable[List[Segment]]: Iterable of segment lists, one per line.
+        """
+        line: List[Segment] = []
+        append = line.append
+
+        for segment in segments:
+            if "\n" in segment.text and not segment.control:
+                text, style, _ = segment
+                while text:
+                    _text, new_line, text = text.partition("\n")
+                    if _text:
+                        append(cls(_text, style))
+                    if new_line:
+                        yield (line, True)
+                        line = []
+                        append = line.append
+            else:
+                append(segment)
+        if line:
+            yield (line, False)
+
     @classmethod
     def split_and_crop_lines(
         cls,
diff --git a/libs/rich/spinner.py b/libs/rich/spinner.py
index 70570b6b09..a3a3caf84c 100644
--- a/libs/rich/spinner.py
+++ b/libs/rich/spinner.py
@@ -1,4 +1,4 @@
-from typing import cast, List, Optional, TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, List, Optional, Union, cast
 
 from ._spinners import SPINNERS
 from .measure import Measurement
@@ -6,7 +6,7 @@
 from .text import Text
 
 if TYPE_CHECKING:
-    from .console import Console, ConsoleOptions, RenderResult, RenderableType
+    from .console import Console, ConsoleOptions, RenderableType, RenderResult
     from .style import StyleType
 
 
@@ -117,22 +117,16 @@ def update(
 if __name__ == "__main__":  # pragma: no cover
     from time import sleep
 
-    from .columns import Columns
-    from .panel import Panel
+    from .console import Group
     from .live import Live
 
-    all_spinners = Columns(
-        [
+    all_spinners = Group(
+        *[
             Spinner(spinner_name, text=Text(repr(spinner_name), style="green"))
             for spinner_name in sorted(SPINNERS.keys())
-        ],
-        column_first=True,
-        expand=True,
+        ]
     )
 
-    with Live(
-        Panel(all_spinners, title="Spinners", border_style="blue"),
-        refresh_per_second=20,
-    ) as live:
+    with Live(all_spinners, refresh_per_second=20) as live:
         while True:
             sleep(0.1)
diff --git a/libs/rich/style.py b/libs/rich/style.py
index 262fd6ecad..5294241892 100644
--- a/libs/rich/style.py
+++ b/libs/rich/style.py
@@ -1,6 +1,7 @@
 import sys
 from functools import lru_cache
-from marshal import dumps, loads
+from operator import attrgetter
+from pickle import dumps, loads
 from random import randint
 from typing import Any, Dict, Iterable, List, Optional, Type, Union, cast
 
@@ -9,6 +10,10 @@
 from .repr import Result, rich_repr
 from .terminal_theme import DEFAULT_TERMINAL_THEME, TerminalTheme
 
+_hash_getter = attrgetter(
+    "_color", "_bgcolor", "_attributes", "_set_attributes", "_link", "_meta"
+)
+
 # Style instances and style definitions are often interchangeable
 StyleType = Union[str, "Style"]
 
@@ -432,16 +437,7 @@ def __ne__(self, other: Any) -> bool:
     def __hash__(self) -> int:
         if self._hash is not None:
             return self._hash
-        self._hash = hash(
-            (
-                self._color,
-                self._bgcolor,
-                self._attributes,
-                self._set_attributes,
-                self._link,
-                self._meta,
-            )
-        )
+        self._hash = hash(_hash_getter(self))
         return self._hash
 
     @property
@@ -524,7 +520,7 @@ def parse(cls, style_definition: str) -> "Style":
                 if not word:
                     raise errors.StyleSyntaxError("color expected after 'on'")
                 try:
-                    Color.parse(word) is None
+                    Color.parse(word)
                 except ColorParseError as error:
                     raise errors.StyleSyntaxError(
                         f"unable to parse {word!r} as background color; {error}"
diff --git a/libs/rich/syntax.py b/libs/rich/syntax.py
index cff8fd235d..5e17b48f12 100644
--- a/libs/rich/syntax.py
+++ b/libs/rich/syntax.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os.path
 import re
 import sys
@@ -224,6 +226,17 @@ class _SyntaxHighlightRange(NamedTuple):
     style_before: bool = False
 
 
+class PaddingProperty:
+    """Descriptor to get and set padding."""
+
+    def __get__(self, obj: Syntax, objtype: Type[Syntax]) -> Tuple[int, int, int, int]:
+        """Space around the Syntax."""
+        return obj._padding
+
+    def __set__(self, obj: Syntax, padding: PaddingDimensions) -> None:
+        obj._padding = Padding.unpack(padding)
+
+
 class Syntax(JupyterMixin):
     """Construct a Syntax object to render syntax highlighted code.
 
@@ -293,11 +306,13 @@ def __init__(
             Style(bgcolor=background_color) if background_color else Style()
         )
         self.indent_guides = indent_guides
-        self.padding = padding
+        self._padding = Padding.unpack(padding)
 
         self._theme = self.get_theme(theme)
         self._stylized_ranges: List[_SyntaxHighlightRange] = []
 
+    padding = PaddingProperty()
+
     @classmethod
     def from_path(
         cls,
@@ -371,8 +386,8 @@ def guess_lexer(cls, path: str, code: Optional[str] = None) -> str:
         is supplied, the lexer will be chosen based on the file extension..
 
         Args:
-             path (AnyStr): The path to the file containing the code you wish to know the lexer for.
-             code (str, optional): Optional string of code that will be used as a fallback if no lexer
+            path (AnyStr): The path to the file containing the code you wish to know the lexer for.
+            code (str, optional): Optional string of code that will be used as a fallback if no lexer
                 is found for the supplied path.
 
         Returns:
@@ -607,7 +622,7 @@ def _get_number_styles(self, console: Console) -> Tuple[Style, Style, Style]:
     def __rich_measure__(
         self, console: "Console", options: "ConsoleOptions"
     ) -> "Measurement":
-        _, right, _, left = Padding.unpack(self.padding)
+        _, right, _, left = self.padding
         padding = left + right
         if self.code_width is not None:
             width = self.code_width + self._numbers_column_width + padding + 1
@@ -626,7 +641,7 @@ def __rich_console__(
         self, console: Console, options: ConsoleOptions
     ) -> RenderResult:
         segments = Segments(self._get_syntax(console, options))
-        if self.padding:
+        if any(self.padding):
             yield Padding(segments, style=self._get_base_style(), pad=self.padding)
         else:
             yield segments
@@ -640,15 +655,19 @@ def _get_syntax(
         Get the Segments for the Syntax object, excluding any vertical/horizontal padding
         """
         transparent_background = self._get_base_style().transparent_background
+        _pad_top, pad_right, _pad_bottom, pad_left = self.padding
+        horizontal_padding = pad_left + pad_right
         code_width = (
             (
                 (options.max_width - self._numbers_column_width - 1)
                 if self.line_numbers
                 else options.max_width
             )
+            - horizontal_padding
             if self.code_width is None
             else self.code_width
         )
+        code_width = max(0, code_width)
 
         ends_on_nl, processed_code = self._process_code(self.code)
         text = self.highlight(processed_code, self.line_range)
diff --git a/libs/rich/table.py b/libs/rich/table.py
index 7b1fa9e4be..1e2eb2b45a 100644
--- a/libs/rich/table.py
+++ b/libs/rich/table.py
@@ -49,7 +49,6 @@ class Column:
         padding (PaddingDimensions, optional): Padding for cells (top, right, bottom, left). Defaults to (0, 1).
         collapse_padding (bool, optional): Enable collapsing of padding around cells. Defaults to False.
         pad_edge (bool, optional): Enable padding of edge cells. Defaults to True.
-        expand (bool, optional): Expand the table to fit the available space if ``True``, otherwise the table width will be auto-calculated. Defaults to False.
         show_header (bool, optional): Show a header row. Defaults to True.
         show_footer (bool, optional): Show a footer row. Defaults to False.
         show_edge (bool, optional): Draw a box around the outside of the table. Defaults to True.
@@ -485,6 +484,7 @@ def __rich_console__(
             max_width = self.width
 
         extra_width = self._extra_width
+
         widths = self._calculate_column_widths(
             console, options.update_width(max_width - extra_width)
         )
@@ -530,6 +530,7 @@ def _calculate_column_widths(
             self._measure_column(console, options, column) for column in columns
         ]
         widths = [_range.maximum or 1 for _range in width_ranges]
+
         get_padding_width = self._get_padding_width
         extra_width = self._extra_width
         if self.expand:
@@ -699,9 +700,17 @@ def get_padding(first_row: bool, last_row: bool) -> Tuple[int, int, int, int]:
     def _get_padding_width(self, column_index: int) -> int:
         """Get extra width from padding."""
         _, pad_right, _, pad_left = self.padding
+
         if self.collapse_padding:
-            if column_index > 0:
-                pad_left = max(0, pad_left - pad_right)
+            pad_left = 0
+            pad_right = abs(pad_left - pad_right)
+
+        if not self.pad_edge:
+            if column_index == 0:
+                pad_left = 0
+            if column_index == len(self.columns) - 1:
+                pad_right = 0
+
         return pad_left + pad_right
 
     def _measure_column(
@@ -717,7 +726,6 @@ def _measure_column(
             return Measurement(0, 0)
 
         padding_width = self._get_padding_width(column._index)
-
         if column.width is not None:
             # Fixed width column
             return Measurement(
@@ -754,6 +762,7 @@ def _render(
             self._get_cells(console, column_index, column)
             for column_index, column in enumerate(self.columns)
         )
+
         row_cells: List[Tuple[_Cell, ...]] = list(zip(*_column_cells))
         _box = (
             self.box.substitute(
@@ -929,7 +938,6 @@ def align_cell(
 if __name__ == "__main__":  # pragma: no cover
     from rich.console import Console
     from rich.highlighter import ReprHighlighter
-    from rich.table import Table as Table
 
     from ._timer import timer
 
diff --git a/libs/rich/text.py b/libs/rich/text.py
index b57d77c276..7e087a4e32 100644
--- a/libs/rich/text.py
+++ b/libs/rich/text.py
@@ -691,7 +691,6 @@ def __rich_console__(
     ) -> Iterable[Segment]:
         tab_size: int = console.tab_size if self.tab_size is None else self.tab_size
         justify = self.justify or options.justify or DEFAULT_JUSTIFY
-
         overflow = self.overflow or options.overflow or DEFAULT_OVERFLOW
 
         lines = self.wrap(
@@ -1007,7 +1006,7 @@ def append(
         return self
 
     def append_text(self, text: "Text") -> "Text":
-        """Append another Text instance. This method is more performant that Text.append, but
+        """Append another Text instance. This method is more performant than Text.append, but
         only works for Text.
 
         Args:
@@ -1105,7 +1104,7 @@ def flatten_spans() -> Iterable[int]:
         return lines
 
     def divide(self, offsets: Iterable[int]) -> Lines:
-        """Divide text in to a number of lines at given offsets.
+        """Divide text into a number of lines at given offsets.
 
         Args:
             offsets (Iterable[int]): Offsets used to divide text.
@@ -1232,12 +1231,15 @@ def wrap(
             if "\t" in line:
                 line.expand_tabs(tab_size)
             if no_wrap:
+                if overflow == "ignore":
+                    lines.append(line)
+                    continue
                 new_lines = Lines([line])
             else:
                 offsets = divide_line(str(line), width, fold=wrap_overflow == "fold")
                 new_lines = line.divide(offsets)
-            for line in new_lines:
-                line.rstrip_end(width)
+                for line in new_lines:
+                    line.rstrip_end(width)
             if wrap_justify:
                 new_lines.justify(
                     console, width, justify=wrap_justify, overflow=wrap_overflow
diff --git a/libs/rich/traceback.py b/libs/rich/traceback.py
index 3bf5baa7b6..66eaecaae9 100644
--- a/libs/rich/traceback.py
+++ b/libs/rich/traceback.py
@@ -14,6 +14,7 @@
     List,
     Optional,
     Sequence,
+    Set,
     Tuple,
     Type,
     Union,
@@ -26,15 +27,23 @@
 from pygments.util import ClassNotFound
 
 from . import pretty
-from ._loop import loop_last
+from ._loop import loop_first_last, loop_last
 from .columns import Columns
-from .console import Console, ConsoleOptions, ConsoleRenderable, RenderResult, group
+from .console import (
+    Console,
+    ConsoleOptions,
+    ConsoleRenderable,
+    OverflowMethod,
+    Group,
+    RenderResult,
+    group,
+)
 from .constrain import Constrain
 from .highlighter import RegexHighlighter, ReprHighlighter
 from .panel import Panel
 from .scope import render_scope
 from .style import Style
-from .syntax import Syntax
+from .syntax import Syntax, SyntaxPosition
 from .text import Text
 from .theme import Theme
 
@@ -44,6 +53,34 @@
 LOCALS_MAX_STRING = 80
 
 
+def _iter_syntax_lines(
+    start: SyntaxPosition, end: SyntaxPosition
+) -> Iterable[Tuple[int, int, int]]:
+    """Yield start and end positions per line.
+
+    Args:
+        start: Start position.
+        end: End position.
+
+    Returns:
+        Iterable of (LINE, COLUMN1, COLUMN2).
+    """
+
+    line1, column1 = start
+    line2, column2 = end
+
+    if line1 == line2:
+        yield line1, column1, column2
+    else:
+        for first, last, line_no in loop_first_last(range(line1, line2 + 1)):
+            if first:
+                yield line_no, column1, -1
+            elif last:
+                yield line_no, 0, column2
+            else:
+                yield line_no, 0, -1
+
+
 def install(
     *,
     console: Optional[Console] = None,
@@ -55,8 +92,10 @@ def install(
     show_locals: bool = False,
     locals_max_length: int = LOCALS_MAX_LENGTH,
     locals_max_string: int = LOCALS_MAX_STRING,
+    locals_max_depth: Optional[int] = None,
     locals_hide_dunder: bool = True,
     locals_hide_sunder: Optional[bool] = None,
+    locals_overflow: Optional[OverflowMethod] = None,
     indent_guides: bool = True,
     suppress: Iterable[Union[str, ModuleType]] = (),
     max_frames: int = 100,
@@ -78,8 +117,10 @@ def install(
         locals_max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
             Defaults to 10.
         locals_max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to 80.
+        locals_max_depth (int, optional): Maximum depths of locals before truncating, or None to disable. Defaults to None.
         locals_hide_dunder (bool, optional): Hide locals prefixed with double underscore. Defaults to True.
         locals_hide_sunder (bool, optional): Hide locals prefixed with single underscore. Defaults to False.
+        locals_overflow (OverflowMethod, optional): How to handle overflowing locals, or None to disable. Defaults to None.
         indent_guides (bool, optional): Enable indent guides in code and locals. Defaults to True.
         suppress (Sequence[Union[str, ModuleType]]): Optional sequence of modules or paths to exclude from traceback.
 
@@ -100,26 +141,27 @@ def excepthook(
         value: BaseException,
         traceback: Optional[TracebackType],
     ) -> None:
-        traceback_console.print(
-            Traceback.from_exception(
-                type_,
-                value,
-                traceback,
-                width=width,
-                code_width=code_width,
-                extra_lines=extra_lines,
-                theme=theme,
-                word_wrap=word_wrap,
-                show_locals=show_locals,
-                locals_max_length=locals_max_length,
-                locals_max_string=locals_max_string,
-                locals_hide_dunder=locals_hide_dunder,
-                locals_hide_sunder=bool(locals_hide_sunder),
-                indent_guides=indent_guides,
-                suppress=suppress,
-                max_frames=max_frames,
-            )
+        exception_traceback = Traceback.from_exception(
+            type_,
+            value,
+            traceback,
+            width=width,
+            code_width=code_width,
+            extra_lines=extra_lines,
+            theme=theme,
+            word_wrap=word_wrap,
+            show_locals=show_locals,
+            locals_max_length=locals_max_length,
+            locals_max_string=locals_max_string,
+            locals_max_depth=locals_max_depth,
+            locals_hide_dunder=locals_hide_dunder,
+            locals_hide_sunder=bool(locals_hide_sunder),
+            locals_overflow=locals_overflow,
+            indent_guides=indent_guides,
+            suppress=suppress,
+            max_frames=max_frames,
         )
+        traceback_console.print(exception_traceback)
 
     def ipy_excepthook_closure(ip: Any) -> None:  # pragma: no cover
         tb_data = {}  # store information about showtraceback call
@@ -143,7 +185,9 @@ def ipy_display_traceback(
 
             # determine correct tb_offset
             compiled = tb_data.get("running_compiled_code", False)
-            tb_offset = tb_data.get("tb_offset", 1 if compiled else 0)
+            tb_offset = tb_data.get("tb_offset")
+            if tb_offset is None:
+                tb_offset = 1 if compiled else 0
             # remove ipython internal frames from trace with tb_offset
             for _ in range(tb_offset):
                 if tb is None:
@@ -191,6 +235,7 @@ class _SyntaxError:
     line: str
     lineno: int
     msg: str
+    notes: List[str] = field(default_factory=list)
 
 
 @dataclass
@@ -200,6 +245,9 @@ class Stack:
     syntax_error: Optional[_SyntaxError] = None
     is_cause: bool = False
     frames: List[Frame] = field(default_factory=list)
+    notes: List[str] = field(default_factory=list)
+    is_group: bool = False
+    exceptions: List["Trace"] = field(default_factory=list)
 
 
 @dataclass
@@ -227,8 +275,10 @@ class Traceback:
         locals_max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
             Defaults to 10.
         locals_max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to 80.
+        locals_max_depth (int, optional): Maximum depths of locals before truncating, or None to disable. Defaults to None.
         locals_hide_dunder (bool, optional): Hide locals prefixed with double underscore. Defaults to True.
         locals_hide_sunder (bool, optional): Hide locals prefixed with single underscore. Defaults to False.
+        locals_overflow (OverflowMethod, optional): How to handle overflowing locals, or None to disable. Defaults to None.
         suppress (Sequence[Union[str, ModuleType]]): Optional sequence of modules or paths to exclude from traceback.
         max_frames (int): Maximum number of frames to show in a traceback, 0 for no maximum. Defaults to 100.
 
@@ -254,8 +304,10 @@ def __init__(
         show_locals: bool = False,
         locals_max_length: int = LOCALS_MAX_LENGTH,
         locals_max_string: int = LOCALS_MAX_STRING,
+        locals_max_depth: Optional[int] = None,
         locals_hide_dunder: bool = True,
         locals_hide_sunder: bool = False,
+        locals_overlow: Optional[OverflowMethod] = None,
         indent_guides: bool = True,
         suppress: Iterable[Union[str, ModuleType]] = (),
         max_frames: int = 100,
@@ -279,8 +331,10 @@ def __init__(
         self.indent_guides = indent_guides
         self.locals_max_length = locals_max_length
         self.locals_max_string = locals_max_string
+        self.locals_max_depth = locals_max_depth
         self.locals_hide_dunder = locals_hide_dunder
         self.locals_hide_sunder = locals_hide_sunder
+        self.locals_overflow = locals_overlow
 
         self.suppress: Sequence[str] = []
         for suppress_entity in suppress:
@@ -310,8 +364,10 @@ def from_exception(
         show_locals: bool = False,
         locals_max_length: int = LOCALS_MAX_LENGTH,
         locals_max_string: int = LOCALS_MAX_STRING,
+        locals_max_depth: Optional[int] = None,
         locals_hide_dunder: bool = True,
         locals_hide_sunder: bool = False,
+        locals_overflow: Optional[OverflowMethod] = None,
         indent_guides: bool = True,
         suppress: Iterable[Union[str, ModuleType]] = (),
         max_frames: int = 100,
@@ -331,9 +387,11 @@ def from_exception(
             indent_guides (bool, optional): Enable indent guides in code and locals. Defaults to True.
             locals_max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
                 Defaults to 10.
+            locals_max_depth (int, optional): Maximum depths of locals before truncating, or None to disable. Defaults to None.
             locals_max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to 80.
             locals_hide_dunder (bool, optional): Hide locals prefixed with double underscore. Defaults to True.
             locals_hide_sunder (bool, optional): Hide locals prefixed with single underscore. Defaults to False.
+            locals_overflow (OverflowMethod, optional): How to handle overflowing locals, or None to disable. Defaults to None.
             suppress (Iterable[Union[str, ModuleType]]): Optional sequence of modules or paths to exclude from traceback.
             max_frames (int): Maximum number of frames to show in a traceback, 0 for no maximum. Defaults to 100.
 
@@ -347,6 +405,7 @@ def from_exception(
             show_locals=show_locals,
             locals_max_length=locals_max_length,
             locals_max_string=locals_max_string,
+            locals_max_depth=locals_max_depth,
             locals_hide_dunder=locals_hide_dunder,
             locals_hide_sunder=locals_hide_sunder,
         )
@@ -362,8 +421,10 @@ def from_exception(
             indent_guides=indent_guides,
             locals_max_length=locals_max_length,
             locals_max_string=locals_max_string,
+            locals_max_depth=locals_max_depth,
             locals_hide_dunder=locals_hide_dunder,
             locals_hide_sunder=locals_hide_sunder,
+            locals_overlow=locals_overflow,
             suppress=suppress,
             max_frames=max_frames,
         )
@@ -378,8 +439,10 @@ def extract(
         show_locals: bool = False,
         locals_max_length: int = LOCALS_MAX_LENGTH,
         locals_max_string: int = LOCALS_MAX_STRING,
+        locals_max_depth: Optional[int] = None,
         locals_hide_dunder: bool = True,
         locals_hide_sunder: bool = False,
+        _visited_exceptions: Optional[Set[BaseException]] = None,
     ) -> Trace:
         """Extract traceback information.
 
@@ -391,6 +454,7 @@ def extract(
             locals_max_length (int, optional): Maximum length of containers before abbreviating, or None for no abbreviation.
                 Defaults to 10.
             locals_max_string (int, optional): Maximum length of string before truncating, or None to disable. Defaults to 80.
+            locals_max_depth (int, optional): Maximum depths of locals before truncating, or None to disable. Defaults to None.
             locals_hide_dunder (bool, optional): Hide locals prefixed with double underscore. Defaults to True.
             locals_hide_sunder (bool, optional): Hide locals prefixed with single underscore. Defaults to False.
 
@@ -403,6 +467,12 @@ def extract(
 
         from rich import _IMPORT_CWD
 
+        notes: List[str] = getattr(exc_value, "__notes__", None) or []
+
+        grouped_exceptions: Set[BaseException] = (
+            set() if _visited_exceptions is None else _visited_exceptions
+        )
+
         def safe_str(_object: Any) -> str:
             """Don't allow exceptions from __str__ to propagate."""
             try:
@@ -415,8 +485,29 @@ def safe_str(_object: Any) -> str:
                 exc_type=safe_str(exc_type.__name__),
                 exc_value=safe_str(exc_value),
                 is_cause=is_cause,
+                notes=notes,
             )
 
+            if sys.version_info >= (3, 11):
+                if isinstance(exc_value, (BaseExceptionGroup, ExceptionGroup)):
+                    stack.is_group = True
+                    for exception in exc_value.exceptions:
+                        if exception in grouped_exceptions:
+                            continue
+                        grouped_exceptions.add(exception)
+                        stack.exceptions.append(
+                            Traceback.extract(
+                                type(exception),
+                                exception,
+                                exception.__traceback__,
+                                show_locals=show_locals,
+                                locals_max_length=locals_max_length,
+                                locals_hide_dunder=locals_hide_dunder,
+                                locals_hide_sunder=locals_hide_sunder,
+                                _visited_exceptions=grouped_exceptions,
+                            )
+                        )
+
             if isinstance(exc_value, SyntaxError):
                 stack.syntax_error = _SyntaxError(
                     offset=exc_value.offset or 0,
@@ -424,13 +515,14 @@ def safe_str(_object: Any) -> str:
                     lineno=exc_value.lineno or 0,
                     line=exc_value.text or "",
                     msg=exc_value.msg,
+                    notes=notes,
                 )
 
             stacks.append(stack)
             append = stack.frames.append
 
             def get_locals(
-                iter_locals: Iterable[Tuple[str, object]]
+                iter_locals: Iterable[Tuple[str, object]],
             ) -> Iterable[Tuple[str, object]]:
                 """Extract locals from an iterator of key pairs."""
                 if not (locals_hide_dunder or locals_hide_sunder):
@@ -490,6 +582,7 @@ def get_locals(
                                 value,
                                 max_length=locals_max_length,
                                 max_string=locals_max_string,
+                                max_depth=locals_max_depth,
                             )
                             for key, value in get_locals(frame_summary.f_locals.items())
                             if not (inspect.isfunction(value) or inspect.isclass(value))
@@ -503,27 +596,31 @@ def get_locals(
                 if frame_summary.f_locals.get("_rich_traceback_guard", False):
                     del stack.frames[:]
 
-            cause = getattr(exc_value, "__cause__", None)
-            if cause:
-                exc_type = cause.__class__
-                exc_value = cause
-                # __traceback__ can be None, e.g. for exceptions raised by the
-                # 'multiprocessing' module
-                traceback = cause.__traceback__
-                is_cause = True
-                continue
+            if not grouped_exceptions:
+                cause = getattr(exc_value, "__cause__", None)
+                if cause is not None and cause is not exc_value:
+                    exc_type = cause.__class__
+                    exc_value = cause
+                    # __traceback__ can be None, e.g. for exceptions raised by the
+                    # 'multiprocessing' module
+                    traceback = cause.__traceback__
+                    is_cause = True
+                    continue
 
-            cause = exc_value.__context__
-            if cause and not getattr(exc_value, "__suppress_context__", False):
-                exc_type = cause.__class__
-                exc_value = cause
-                traceback = cause.__traceback__
-                is_cause = False
-                continue
+                cause = exc_value.__context__
+                if cause is not None and not getattr(
+                    exc_value, "__suppress_context__", False
+                ):
+                    exc_type = cause.__class__
+                    exc_value = cause
+                    traceback = cause.__traceback__
+                    is_cause = False
+                    continue
             # No cover, code is reached but coverage doesn't recognize it.
             break  # pragma: no cover
 
         trace = Trace(stacks=stacks)
+
         return trace
 
     def __rich_console__(
@@ -556,7 +653,9 @@ def __rich_console__(
         )
 
         highlighter = ReprHighlighter()
-        for last, stack in loop_last(reversed(self.trace.stacks)):
+
+        @group()
+        def render_stack(stack: Stack, last: bool) -> RenderResult:
             if stack.frames:
                 stack_renderable: ConsoleRenderable = Panel(
                     self._render_stack(stack),
@@ -569,6 +668,7 @@ def __rich_console__(
                 stack_renderable = Constrain(stack_renderable, self.width)
                 with console.use_theme(traceback_theme):
                     yield stack_renderable
+
             if stack.syntax_error is not None:
                 with console.use_theme(traceback_theme):
                     yield Constrain(
@@ -594,6 +694,24 @@ def __rich_console__(
             else:
                 yield Text.assemble((f"{stack.exc_type}", "traceback.exc_type"))
 
+            for note in stack.notes:
+                yield Text.assemble(("[NOTE] ", "traceback.note"), highlighter(note))
+
+            if stack.is_group:
+                for group_no, group_exception in enumerate(stack.exceptions, 1):
+                    grouped_exceptions: List[Group] = []
+                    for group_last, group_stack in loop_last(group_exception.stacks):
+                        grouped_exceptions.append(render_stack(group_stack, group_last))
+                    yield ""
+                    yield Constrain(
+                        Panel(
+                            Group(*grouped_exceptions),
+                            title=f"Sub-exception #{group_no}",
+                            border_style="traceback.group.border",
+                        ),
+                        self.width,
+                    )
+
             if not last:
                 if stack.is_cause:
                     yield Text.from_markup(
@@ -604,6 +722,9 @@ def __rich_console__(
                         "\n[i]During handling of the above exception, another exception occurred:\n",
                     )
 
+        for last, stack in loop_last(reversed(self.trace.stacks)):
+            yield render_stack(stack, last)
+
     @group()
     def _render_syntax_error(self, syntax_error: _SyntaxError) -> RenderResult:
         highlighter = ReprHighlighter()
@@ -648,17 +769,6 @@ def _render_stack(self, stack: Stack) -> RenderResult:
         path_highlighter = PathHighlighter()
         theme = self.theme
 
-        def read_code(filename: str) -> str:
-            """Read files, and cache results on filename.
-
-            Args:
-                filename (str): Filename to read
-
-            Returns:
-                str: Contents of file
-            """
-            return "".join(linecache.getlines(filename))
-
         def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
             if frame.locals:
                 yield render_scope(
@@ -667,6 +777,8 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                     indent_guides=self.indent_guides,
                     max_length=self.locals_max_length,
                     max_string=self.locals_max_string,
+                    max_depth=self.locals_max_depth,
+                    overflow=self.locals_overflow,
                 )
 
         exclude_frames: Optional[range] = None
@@ -720,7 +832,8 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                 continue
             if not suppressed:
                 try:
-                    code = read_code(frame.filename)
+                    code_lines = linecache.getlines(frame.filename)
+                    code = "".join(code_lines)
                     if not code:
                         # code may be an empty string if the file doesn't exist, OR
                         # if the traceback filename is generated dynamically
@@ -749,12 +862,26 @@ def render_locals(frame: Frame) -> Iterable[ConsoleRenderable]:
                 else:
                     if frame.last_instruction is not None:
                         start, end = frame.last_instruction
-                        syntax.stylize_range(
-                            style="traceback.error_range",
-                            start=start,
-                            end=end,
-                            style_before=True,
-                        )
+
+                        # Stylize a line at a time
+                        # So that indentation isn't underlined (which looks bad)
+                        for line1, column1, column2 in _iter_syntax_lines(start, end):
+                            try:
+                                if column1 == 0:
+                                    line = code_lines[line1 - 1]
+                                    column1 = len(line) - len(line.lstrip())
+                                if column2 == -1:
+                                    column2 = len(code_lines[line1 - 1])
+                            except IndexError:
+                                # Being defensive here
+                                # If last_instruction reports a line out-of-bounds, we don't want to crash
+                                continue
+
+                            syntax.stylize_range(
+                                style="traceback.error_range",
+                                start=(line1, column1),
+                                end=(line1, column2),
+                            )
                     yield (
                         Columns(
                             [
diff --git a/libs/semver-3.0.2.dist-info/LICENSE.txt b/libs/semver-3.0.2.dist-info/LICENSE.txt
deleted file mode 100644
index f98e22bc51..0000000000
--- a/libs/semver-3.0.2.dist-info/LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2013, Konstantine Rybnikov
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice, this
-  list of conditions and the following disclaimer in the documentation and/or
-  other materials provided with the distribution.
-
-  Neither the name of the {organization} nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/semver-3.0.2.dist-info/METADATA b/libs/semver-3.0.2.dist-info/METADATA
deleted file mode 100644
index cd25ba63ad..0000000000
--- a/libs/semver-3.0.2.dist-info/METADATA
+++ /dev/null
@@ -1,138 +0,0 @@
-Metadata-Version: 2.1
-Name: semver
-Version: 3.0.2
-Summary: Python helper for Semantic Versioning (https://semver.org)
-Home-page: https://github.com/python-semver/python-semver
-Author: Kostiantyn Rybnikov
-Author-email: k-bx@k-bx.com
-Maintainer: Sebastien Celles, Tom Schraitle
-Maintainer-email: s.celles@gmail.com
-License: BSD
-Project-URL: Changelog, https://python-semver.readthedocs.io/en/latest/changelog.html
-Project-URL: Documentation, https://python-semver.rtfd.io
-Project-URL: Releases, https://github.com/python-semver/python-semver/releases
-Project-URL: Bug Tracker, https://github.com/python-semver/python-semver/issues
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-
-Quickstart
-==========
-
-.. teaser-begin
-
-A Python module to simplify `semantic versioning`_.
-
-|GHAction| |python-support| |downloads| |license| |docs| |black|
-|openissues| |GHDiscussion|
-
-.. teaser-end
-
-The module follows the ``MAJOR.MINOR.PATCH`` style:
-
-* ``MAJOR`` version when you make incompatible API changes,
-* ``MINOR`` version when you add functionality in a backwards compatible manner, and
-* ``PATCH`` version when you make backwards compatible bug fixes.
-
-Additional labels for pre-release and build metadata are supported.
-
-To import this library, use:
-
-.. code-block:: python
-
-    >>> import semver
-
-Working with the library is quite straightforward. To turn a version string into the
-different parts, use the ``semver.Version.parse`` function:
-
-.. code-block:: python
-
-    >>> ver = semver.Version.parse('1.2.3-pre.2+build.4')
-    >>> ver.major
-    1
-    >>> ver.minor
-    2
-    >>> ver.patch
-    3
-    >>> ver.prerelease
-    'pre.2'
-    >>> ver.build
-    'build.4'
-
-To raise parts of a version, there are a couple of functions available for
-you. The function ``semver.Version.bump_major`` leaves the original object untouched, but
-returns a new ``semver.Version`` instance with the raised major part:
-
-.. code-block:: python
-
-    >>> ver = semver.Version.parse("3.4.5")
-    >>> ver.bump_major()
-    Version(major=4, minor=0, patch=0, prerelease=None, build=None)
-
-It is allowed to concatenate different "bump functions":
-
-.. code-block:: python
-
-    >>> ver.bump_major().bump_minor()
-    Version(major=4, minor=1, patch=0, prerelease=None, build=None)
-
-To compare two versions, semver provides the ``semver.compare`` function.
-The return value indicates the relationship between the first and second
-version:
-
-.. code-block:: python
-
-    >>> semver.compare("1.0.0", "2.0.0")
-    -1
-    >>> semver.compare("2.0.0", "1.0.0")
-    1
-    >>> semver.compare("2.0.0", "2.0.0")
-    0
-
-
-There are other functions to discover. Read on!
-
-
-.. |latest-version| image:: https://img.shields.io/pypi/v/semver.svg
-   :alt: Latest version on PyPI
-   :target: https://pypi.org/project/semver
-.. |python-support| image:: https://img.shields.io/pypi/pyversions/semver.svg
-   :target: https://pypi.org/project/semver
-   :alt: Python versions
-.. |downloads| image:: https://img.shields.io/pypi/dm/semver.svg
-   :alt: Monthly downloads from PyPI
-   :target: https://pypi.org/project/semver
-.. |license| image:: https://img.shields.io/pypi/l/semver.svg
-   :alt: Software license
-   :target: https://github.com/python-semver/python-semver/blob/master/LICENSE.txt
-.. |docs| image:: https://readthedocs.org/projects/python-semver/badge/?version=latest
-   :target: http://python-semver.readthedocs.io/en/latest/?badge=latest
-   :alt: Documentation Status
-.. _semantic versioning: https://semver.org/
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Black Formatter
-.. |Gitter| image:: https://badges.gitter.im/python-semver/community.svg
-    :target: https://gitter.im/python-semver/community
-    :alt: Gitter
-.. |openissues| image:: http://isitmaintained.com/badge/open/python-semver/python-semver.svg
-    :target: http://isitmaintained.com/project/python-semver/python-semver
-    :alt: Percentage of open issues
-.. |GHAction| image:: https://github.com/python-semver/python-semver/workflows/Python/badge.svg
-    :alt: Python
-.. |GHDiscussion| image:: https://shields.io/badge/GitHub-%20Discussions-green?logo=github
-    :target: https://github.com/python-semver/python-semver/discussions
-    :alt: GitHub Discussion
diff --git a/libs/semver-3.0.2.dist-info/RECORD b/libs/semver-3.0.2.dist-info/RECORD
deleted file mode 100644
index aee2f24038..0000000000
--- a/libs/semver-3.0.2.dist-info/RECORD
+++ /dev/null
@@ -1,17 +0,0 @@
-../../bin/pysemver,sha256=T_UCyWjf8mX-i7Yu0yebC7wo7V50JeJbv-9n9YAeQ-M,232
-semver-3.0.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-semver-3.0.2.dist-info/LICENSE.txt,sha256=zaSQwy5h04hNwXeR_IB48qPlZPupjdGLTcZOsnILK28,1496
-semver-3.0.2.dist-info/METADATA,sha256=mcINoKlUpEir1fb86rJzEwNHfZTEYBzEOoiBkLu6GxI,4953
-semver-3.0.2.dist-info/RECORD,,
-semver-3.0.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-semver-3.0.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-semver-3.0.2.dist-info/entry_points.txt,sha256=QsWAwfEwq2bdJmY8lmGFjnvA1gi8_tHqQRZTyxr9CIg,45
-semver-3.0.2.dist-info/top_level.txt,sha256=oFJ1J3NJzsV1x-L91Xz4FBlYpVqO-Cr4UEfj-hGvqq0,7
-semver/__about__.py,sha256=maY3JUysLDPr3cy-8Yie3wjfK4wvV2m2E1snDWFTN84,815
-semver/__init__.py,sha256=RRBj6kuuYaCY5B9gLxwE0h7meBwurYEbfQZnv7t1kKM,1269
-semver/__main__.py,sha256=-soGFzc0Os5mL-ygyTVDe2gvWozYNBnztij1NobE69E,592
-semver/_deprecated.py,sha256=xc1xuqWLfpm3S3i2pIeoNWaMJwemG4a-W9r0Acm2xh0,11272
-semver/_types.py,sha256=-AfazZgnmmMe7WthSx_M-w1BCnq2dPFmysjmtTOm1oc,422
-semver/cli.py,sha256=HwvpnqcN95G3OINU4cLgouRHCtWhRsuKghfhPWtGOew,5189
-semver/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-semver/version.py,sha256=u0f8HXhiul8R_Wsar-mupWrMVaiQ_pjL5pPMYyuhjmo,24084
diff --git a/libs/semver-3.0.2.dist-info/WHEEL b/libs/semver-3.0.2.dist-info/WHEEL
deleted file mode 100644
index da25d7b423..0000000000
--- a/libs/semver-3.0.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/semver-3.0.3.dist-info/METADATA b/libs/semver-3.0.3.dist-info/METADATA
deleted file mode 100644
index ecfecb4772..0000000000
--- a/libs/semver-3.0.3.dist-info/METADATA
+++ /dev/null
@@ -1,164 +0,0 @@
-Metadata-Version: 2.1
-Name: semver
-Version: 3.0.3
-Summary: Python helper for Semantic Versioning (https://semver.org)
-Author-email: Kostiantyn Rybnikov <k-bx@k-bx.com>, Tom Schraitle <toms@suse.de>
-Maintainer-email: Tom Schraitle <toms@suse.de>, Sebastien Celles <s.celles@gmail.com>
-License: Copyright (c) 2013, Konstantine Rybnikov
-        All rights reserved.
-        
-        Redistribution and use in source and binary forms, with or without modification,
-        are permitted provided that the following conditions are met:
-        
-          Redistributions of source code must retain the above copyright notice, this
-          list of conditions and the following disclaimer.
-        
-          Redistributions in binary form must reproduce the above copyright notice, this
-          list of conditions and the following disclaimer in the documentation and/or
-          other materials provided with the distribution.
-        
-          Neither the name of the python-semver org nor the names of its
-          contributors may be used to endorse or promote products derived from
-          this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-        ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-        
-Project-URL: GitHub Homepage, https://github.com/python-semver/python-semver
-Project-URL: Changelog, https://python-semver.readthedocs.io/en/latest/changelog.html
-Project-URL: Documentation, https://python-semver.rtfd.io
-Project-URL: Releases, https://github.com/python-semver/python-semver/releases
-Project-URL: Bug Tracker, https://github.com/python-semver/python-semver/issues
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-
-Quickstart
-==========
-
-.. teaser-begin
-
-A Python module to simplify `semantic versioning`_.
-
-|GHAction| |python-support| |downloads| |license| |docs| |black|
-|openissues| |GHDiscussion|
-
-.. teaser-end
-
-The module follows the ``MAJOR.MINOR.PATCH`` style:
-
-* ``MAJOR`` version when you make incompatible API changes,
-* ``MINOR`` version when you add functionality in a backwards compatible manner, and
-* ``PATCH`` version when you make backwards compatible bug fixes.
-
-Additional labels for pre-release and build metadata are supported.
-
-To import this library, use:
-
-.. code-block:: python
-
-    >>> import semver
-
-Working with the library is quite straightforward. To turn a version string into the
-different parts, use the ``semver.Version.parse`` function:
-
-.. code-block:: python
-
-    >>> ver = semver.Version.parse('1.2.3-pre.2+build.4')
-    >>> ver.major
-    1
-    >>> ver.minor
-    2
-    >>> ver.patch
-    3
-    >>> ver.prerelease
-    'pre.2'
-    >>> ver.build
-    'build.4'
-
-To raise parts of a version, there are a couple of functions available for
-you. The function ``semver.Version.bump_major`` leaves the original object untouched, but
-returns a new ``semver.Version`` instance with the raised major part:
-
-.. code-block:: python
-
-    >>> ver = semver.Version.parse("3.4.5")
-    >>> ver.bump_major()
-    Version(major=4, minor=0, patch=0, prerelease=None, build=None)
-
-It is allowed to concatenate different "bump functions":
-
-.. code-block:: python
-
-    >>> ver.bump_major().bump_minor()
-    Version(major=4, minor=1, patch=0, prerelease=None, build=None)
-
-To compare two versions, semver provides the ``semver.compare`` function.
-The return value indicates the relationship between the first and second
-version:
-
-.. code-block:: python
-
-    >>> semver.compare("1.0.0", "2.0.0")
-    -1
-    >>> semver.compare("2.0.0", "1.0.0")
-    1
-    >>> semver.compare("2.0.0", "2.0.0")
-    0
-
-
-There are other functions to discover. Read on!
-
-
-.. |latest-version| image:: https://img.shields.io/pypi/v/semver.svg
-   :alt: Latest version on PyPI
-   :target: https://pypi.org/project/semver
-.. |python-support| image:: https://img.shields.io/pypi/pyversions/semver.svg
-   :target: https://pypi.org/project/semver
-   :alt: Python versions
-.. |downloads| image:: https://img.shields.io/pypi/dm/semver.svg
-   :alt: Monthly downloads from PyPI
-   :target: https://pypi.org/project/semver
-.. |license| image:: https://img.shields.io/pypi/l/semver.svg
-   :alt: Software license
-   :target: https://github.com/python-semver/python-semver/blob/master/LICENSE.txt
-.. |docs| image:: https://readthedocs.org/projects/python-semver/badge/?version=latest
-   :target: http://python-semver.readthedocs.io/en/latest/?badge=latest
-   :alt: Documentation Status
-.. _semantic versioning: https://semver.org/
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-    :alt: Black Formatter
-.. |Gitter| image:: https://badges.gitter.im/python-semver/community.svg
-    :target: https://gitter.im/python-semver/community
-    :alt: Gitter
-.. |openissues| image:: http://isitmaintained.com/badge/open/python-semver/python-semver.svg
-    :target: http://isitmaintained.com/project/python-semver/python-semver
-    :alt: Percentage of open issues
-.. |GHAction| image:: https://github.com/python-semver/python-semver/workflows/Python/badge.svg
-    :alt: Python
-.. |GHDiscussion| image:: https://shields.io/badge/GitHub-%20Discussions-green?logo=github
-    :target: https://github.com/python-semver/python-semver/discussions
-    :alt: GitHub Discussion
diff --git a/libs/semver-3.0.3.dist-info/RECORD b/libs/semver-3.0.3.dist-info/RECORD
deleted file mode 100644
index 8b45095238..0000000000
--- a/libs/semver-3.0.3.dist-info/RECORD
+++ /dev/null
@@ -1,17 +0,0 @@
-../../bin/pysemver,sha256=T_UCyWjf8mX-i7Yu0yebC7wo7V50JeJbv-9n9YAeQ-M,232
-semver-3.0.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-semver-3.0.3.dist-info/LICENSE.txt,sha256=zBAXnenO2GVdd2W9OorEZDimHmY9588cSNUC0rr589U,1499
-semver-3.0.3.dist-info/METADATA,sha256=Ef24P39KoAY1-_E45BgQyIbVSsf5h5SHWdoEIMeTeno,6777
-semver-3.0.3.dist-info/RECORD,,
-semver-3.0.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-semver-3.0.3.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-semver-3.0.3.dist-info/entry_points.txt,sha256=QsWAwfEwq2bdJmY8lmGFjnvA1gi8_tHqQRZTyxr9CIg,45
-semver-3.0.3.dist-info/top_level.txt,sha256=oFJ1J3NJzsV1x-L91Xz4FBlYpVqO-Cr4UEfj-hGvqq0,7
-semver/__about__.py,sha256=lBkzYrR2i_6yRSVyQgNmsnlJMFs6h2k_IIrEqpZ9EF0,815
-semver/__init__.py,sha256=RRBj6kuuYaCY5B9gLxwE0h7meBwurYEbfQZnv7t1kKM,1269
-semver/__main__.py,sha256=msULq4Lb0AV8K4rulhm0FzzJO8oMCv52GjcTG2t8iws,593
-semver/_deprecated.py,sha256=OOX-AeaY-QqJK2gQGE8pdJExh_13TP-9ASZAkgqCmt4,11273
-semver/_types.py,sha256=-AfazZgnmmMe7WthSx_M-w1BCnq2dPFmysjmtTOm1oc,422
-semver/cli.py,sha256=HwvpnqcN95G3OINU4cLgouRHCtWhRsuKghfhPWtGOew,5189
-semver/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-semver/version.py,sha256=jpY4CRicE6pD0H-adnnEqQ-mjRkRtMY9XSPt6tneaL8,24041
diff --git a/libs/semver-3.0.3.dist-info/WHEEL b/libs/semver-3.0.3.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/semver-3.0.3.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/semver-3.0.3.dist-info/entry_points.txt b/libs/semver-3.0.3.dist-info/entry_points.txt
deleted file mode 100644
index ae89e4366e..0000000000
--- a/libs/semver-3.0.3.dist-info/entry_points.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-[console_scripts]
-pysemver = semver.cli:main
diff --git a/libs/semver-3.0.3.dist-info/top_level.txt b/libs/semver-3.0.3.dist-info/top_level.txt
deleted file mode 100644
index f4ded63850..0000000000
--- a/libs/semver-3.0.3.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-semver
diff --git a/libs/requests-2.32.3.dist-info/INSTALLER b/libs/semver-3.0.4.dist-info/INSTALLER
similarity index 100%
rename from libs/requests-2.32.3.dist-info/INSTALLER
rename to libs/semver-3.0.4.dist-info/INSTALLER
diff --git a/libs/semver-3.0.4.dist-info/METADATA b/libs/semver-3.0.4.dist-info/METADATA
new file mode 100644
index 0000000000..5b5dd30452
--- /dev/null
+++ b/libs/semver-3.0.4.dist-info/METADATA
@@ -0,0 +1,166 @@
+Metadata-Version: 2.4
+Name: semver
+Version: 3.0.4
+Summary: Python helper for Semantic Versioning (https://semver.org)
+Author-email: Kostiantyn Rybnikov <k-bx@k-bx.com>, Tom Schraitle <toms@suse.de>
+Maintainer-email: Tom Schraitle <toms@suse.de>, Sebastien Celles <s.celles@gmail.com>
+License: Copyright (c) 2013, Konstantine Rybnikov
+        All rights reserved.
+        
+        Redistribution and use in source and binary forms, with or without modification,
+        are permitted provided that the following conditions are met:
+        
+          Redistributions of source code must retain the above copyright notice, this
+          list of conditions and the following disclaimer.
+        
+          Redistributions in binary form must reproduce the above copyright notice, this
+          list of conditions and the following disclaimer in the documentation and/or
+          other materials provided with the distribution.
+        
+          Neither the name of the python-semver org nor the names of its
+          contributors may be used to endorse or promote products derived from
+          this software without specific prior written permission.
+        
+        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+        ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+        ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+        (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+        ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+        (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+        
+Project-URL: GitHub Homepage, https://github.com/python-semver/python-semver
+Project-URL: Changelog, https://python-semver.readthedocs.io/en/latest/changelog.html
+Project-URL: Documentation, https://python-semver.rtfd.io
+Project-URL: Releases, https://github.com/python-semver/python-semver/releases
+Project-URL: Bug Tracker, https://github.com/python-semver/python-semver/issues
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Dynamic: license-file
+
+Quickstart
+==========
+
+.. teaser-begin
+
+A Python module to simplify `semantic versioning`_.
+
+|GHAction| |python-support| |downloads| |license| |docs| |black|
+|openissues| |GHDiscussion|
+
+.. teaser-end
+
+The module follows the ``MAJOR.MINOR.PATCH`` style:
+
+* ``MAJOR`` version when you make incompatible API changes,
+* ``MINOR`` version when you add functionality in a backwards compatible manner, and
+* ``PATCH`` version when you make backwards compatible bug fixes.
+
+Additional labels for pre-release and build metadata are supported.
+
+To import this library, use:
+
+.. code-block:: python
+
+    >>> import semver
+
+Working with the library is quite straightforward. To turn a version string into the
+different parts, use the ``semver.Version.parse`` function:
+
+.. code-block:: python
+
+    >>> ver = semver.Version.parse('1.2.3-pre.2+build.4')
+    >>> ver.major
+    1
+    >>> ver.minor
+    2
+    >>> ver.patch
+    3
+    >>> ver.prerelease
+    'pre.2'
+    >>> ver.build
+    'build.4'
+
+To raise parts of a version, there are a couple of functions available for
+you. The function ``semver.Version.bump_major`` leaves the original object untouched, but
+returns a new ``semver.Version`` instance with the raised major part:
+
+.. code-block:: python
+
+    >>> ver = semver.Version.parse("3.4.5")
+    >>> ver.bump_major()
+    Version(major=4, minor=0, patch=0, prerelease=None, build=None)
+
+It is allowed to concatenate different "bump functions":
+
+.. code-block:: python
+
+    >>> ver.bump_major().bump_minor()
+    Version(major=4, minor=1, patch=0, prerelease=None, build=None)
+
+To compare two versions, semver provides the ``semver.compare`` function.
+The return value indicates the relationship between the first and second
+version:
+
+.. code-block:: python
+
+    >>> semver.compare("1.0.0", "2.0.0")
+    -1
+    >>> semver.compare("2.0.0", "1.0.0")
+    1
+    >>> semver.compare("2.0.0", "2.0.0")
+    0
+
+
+There are other functions to discover. Read on!
+
+
+.. |latest-version| image:: https://img.shields.io/pypi/v/semver.svg
+   :alt: Latest version on PyPI
+   :target: https://pypi.org/project/semver
+.. |python-support| image:: https://img.shields.io/pypi/pyversions/semver.svg
+   :target: https://pypi.org/project/semver
+   :alt: Python versions
+.. |downloads| image:: https://img.shields.io/pypi/dm/semver.svg
+   :alt: Monthly downloads from PyPI
+   :target: https://pypi.org/project/semver
+.. |license| image:: https://img.shields.io/pypi/l/semver.svg
+   :alt: Software license
+   :target: https://github.com/python-semver/python-semver/blob/master/LICENSE.txt
+.. |docs| image:: https://readthedocs.org/projects/python-semver/badge/?version=latest
+   :target: http://python-semver.readthedocs.io/en/latest/?badge=latest
+   :alt: Documentation Status
+.. _semantic versioning: https://semver.org/
+.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
+    :target: https://github.com/psf/black
+    :alt: Black Formatter
+.. |Gitter| image:: https://badges.gitter.im/python-semver/community.svg
+    :target: https://gitter.im/python-semver/community
+    :alt: Gitter
+.. |openissues| image:: http://isitmaintained.com/badge/open/python-semver/python-semver.svg
+    :target: http://isitmaintained.com/project/python-semver/python-semver
+    :alt: Percentage of open issues
+.. |GHAction| image:: https://github.com/python-semver/python-semver/workflows/Python/badge.svg
+    :alt: Python
+.. |GHDiscussion| image:: https://shields.io/badge/GitHub-%20Discussions-green?logo=github
+    :target: https://github.com/python-semver/python-semver/discussions
+    :alt: GitHub Discussion
diff --git a/libs/semver-3.0.4.dist-info/RECORD b/libs/semver-3.0.4.dist-info/RECORD
new file mode 100644
index 0000000000..8e0a230b1b
--- /dev/null
+++ b/libs/semver-3.0.4.dist-info/RECORD
@@ -0,0 +1,17 @@
+../../bin/pysemver,sha256=8CeEoF9V7D4n9ZNlCzjQgp4qzSMMWEFbv04XS5UNHBc,185
+semver-3.0.4.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+semver-3.0.4.dist-info/METADATA,sha256=Bgw2GG39NSNTUtYqi5RkjCGP2nUH9m_7XGjieCBCKuE,6850
+semver-3.0.4.dist-info/RECORD,,
+semver-3.0.4.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+semver-3.0.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+semver-3.0.4.dist-info/entry_points.txt,sha256=QsWAwfEwq2bdJmY8lmGFjnvA1gi8_tHqQRZTyxr9CIg,45
+semver-3.0.4.dist-info/licenses/LICENSE.txt,sha256=zBAXnenO2GVdd2W9OorEZDimHmY9588cSNUC0rr589U,1499
+semver-3.0.4.dist-info/top_level.txt,sha256=oFJ1J3NJzsV1x-L91Xz4FBlYpVqO-Cr4UEfj-hGvqq0,7
+semver/__about__.py,sha256=prQ0y3S3sT9ByN1CQPrkrAFr9zr_5JavYMpztPjtUf0,815
+semver/__init__.py,sha256=RRBj6kuuYaCY5B9gLxwE0h7meBwurYEbfQZnv7t1kKM,1269
+semver/__main__.py,sha256=msULq4Lb0AV8K4rulhm0FzzJO8oMCv52GjcTG2t8iws,593
+semver/_deprecated.py,sha256=OOX-AeaY-QqJK2gQGE8pdJExh_13TP-9ASZAkgqCmt4,11273
+semver/_types.py,sha256=-AfazZgnmmMe7WthSx_M-w1BCnq2dPFmysjmtTOm1oc,422
+semver/cli.py,sha256=HwvpnqcN95G3OINU4cLgouRHCtWhRsuKghfhPWtGOew,5189
+semver/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+semver/version.py,sha256=jpY4CRicE6pD0H-adnnEqQ-mjRkRtMY9XSPt6tneaL8,24041
diff --git a/libs/stevedore-5.3.0.dist-info/REQUESTED b/libs/semver-3.0.4.dist-info/REQUESTED
similarity index 100%
rename from libs/stevedore-5.3.0.dist-info/REQUESTED
rename to libs/semver-3.0.4.dist-info/REQUESTED
diff --git a/libs/semver-3.0.4.dist-info/WHEEL b/libs/semver-3.0.4.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/semver-3.0.4.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/semver-3.0.2.dist-info/entry_points.txt b/libs/semver-3.0.4.dist-info/entry_points.txt
similarity index 100%
rename from libs/semver-3.0.2.dist-info/entry_points.txt
rename to libs/semver-3.0.4.dist-info/entry_points.txt
diff --git a/libs/semver-3.0.3.dist-info/LICENSE.txt b/libs/semver-3.0.4.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/semver-3.0.3.dist-info/LICENSE.txt
rename to libs/semver-3.0.4.dist-info/licenses/LICENSE.txt
diff --git a/libs/semver-3.0.2.dist-info/top_level.txt b/libs/semver-3.0.4.dist-info/top_level.txt
similarity index 100%
rename from libs/semver-3.0.2.dist-info/top_level.txt
rename to libs/semver-3.0.4.dist-info/top_level.txt
diff --git a/libs/semver/__about__.py b/libs/semver/__about__.py
index d971e03823..21494e68cd 100644
--- a/libs/semver/__about__.py
+++ b/libs/semver/__about__.py
@@ -16,7 +16,7 @@
 """
 
 #: Semver version
-__version__ = "3.0.3"
+__version__ = "3.0.4"
 
 #: Original semver author
 __author__ = "Kostiantyn Rybnikov"
diff --git a/libs/signalrcore-0.9.5.dist-info/METADATA b/libs/signalrcore-0.9.5.dist-info/METADATA
deleted file mode 100644
index 166c0f46b1..0000000000
--- a/libs/signalrcore-0.9.5.dist-info/METADATA
+++ /dev/null
@@ -1,333 +0,0 @@
-Metadata-Version: 2.1
-Name: signalrcore
-Version: 0.9.5
-Summary: A Python SignalR Core client(json and messagepack), with invocation auth and two way streaming. Compatible with azure / serverless functions. Also with automatic reconnect and manually reconnect.
-Home-page: https://github.com/mandrewcito/signalrcore
-Author: mandrewcito
-Author-email: anbaalo@gmail.com
-Keywords: signalr core client 3.1
-Classifier: Programming Language :: Python :: 3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: requests >=2.22.0
-Requires-Dist: websocket-client ==1.0.0
-Requires-Dist: msgpack ==1.0.2
-
-# SignalR core client
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?logo=paypal&style=flat-square)](https://www.paypal.me/mandrewcito/1)
-![Pypi](https://img.shields.io/pypi/v/signalrcore.svg)
-[![Downloads](https://pepy.tech/badge/signalrcore/month)](https://pepy.tech/project/signalrcore/month)
-[![Downloads](https://pepy.tech/badge/signalrcore)](https://pepy.tech/project/signalrcore)
-![Issues](https://img.shields.io/github/issues/mandrewcito/signalrcore.svg)
-![Open issues](https://img.shields.io/github/issues-raw/mandrewcito/signalrcore.svg)
-![codecov.io](https://codecov.io/github/mandrewcito/signalrcore/coverage.svg?branch=master)
-
-![logo alt](https://raw.githubusercontent.com/mandrewcito/signalrcore/master/docs/img/logo_temp.128.svg.png)
-
-
-# Links 
-
-* [Dev to posts with library examples and implementation](https://dev.to/mandrewcito/singlar-core-python-client-58e7)
-
-* [Pypi](https://pypi.org/project/signalrcore/)
-
-* [Wiki - This Doc](https://mandrewcito.github.io/signalrcore/)
-
-# Develop
-
-Test server will be avaiable in [here](https://github.com/mandrewcito/signalrcore-containertestservers) and docker compose is required.
-
-```bash
-git clone https://github.com/mandrewcito/signalrcore-containertestservers
-cd signalrcore-containertestservers
-docker-compose up
-cd ../signalrcore
-make tests
-```
-
-## Known Issues
-
-Issues related with closing sockets are inherited from the websocket-client library. Due to these problems i can't update the library to versions higher than websocket-client 0.54.0. 
-I'm working to solve it but for now its patched (Error number 1. Raises an exception, and then exception is treated for prevent errors). 
-If I update the websocket library I fall into error number 2, on local machine I can't reproduce it but travis builds fail (sometimes and randomly :()
-* [1. Closing socket error](https://github.com/slackapi/python-slackclient/issues/171)
-* [2. Random errors closing socket](https://github.com/websocket-client/websocket-client/issues/449)
-
-# A Tiny How To
-
-## Connect to a server without auth
-
-```python
-hub_connection = HubConnectionBuilder()\
-    .with_url(server_url)\
-    .configure_logging(logging.DEBUG)\
-    .with_automatic_reconnect({
-        "type": "raw",
-        "keep_alive_interval": 10,
-        "reconnect_interval": 5,
-        "max_attempts": 5
-    }).build()
-```
-## Connect to a server with auth
-
-login_function must provide auth token
-
-```python
-hub_connection = HubConnectionBuilder()\
-            .with_url(server_url,
-            options={
-                "access_token_factory": login_function,
-                "headers": {
-                    "mycustomheader": "mycustomheadervalue"
-                }
-            })\
-            .configure_logging(logging.DEBUG)\
-            .with_automatic_reconnect({
-                "type": "raw",
-                "keep_alive_interval": 10,
-                "reconnect_interval": 5,
-                "max_attempts": 5
-            }).build()
-```
-### Unauthorized errors
-A login function must provide an error controller if authorization fails. When connection starts, if authorization fails exception will be propagated.
-
-```python
-    def login(self):
-        response = requests.post(
-            self.login_url,
-            json={
-                "username": self.email,
-                "password": self.password
-                },verify=False)
-        if response.status_code == 200:
-            return response.json()["token"]
-        raise requests.exceptions.ConnectionError()
-
-    hub_connection.start()   # this code will raise  requests.exceptions.ConnectionError() if auth fails
-```
-## Configure logging
-
-```python
-HubConnectionBuilder()\
-    .with_url(server_url,
-    .configure_logging(logging.DEBUG)
-    ...
-```
-## Configure socket trace
-```python 
-HubConnectionBuilder()\
-    .with_url(server_url,
-    .configure_logging(logging.DEBUG, socket_trace=True) 
-    ... 
- ```
-## Configure your own handler
-```python
- import logging
-handler = logging.StreamHandler()
-handler.setLevel(logging.DEBUG)
-hub_connection = HubConnectionBuilder()\
-    .with_url(server_url, options={"verify_ssl": False}) \
-    .configure_logging(logging.DEBUG, socket_trace=True, handler=handler)
-    ...
- ```
-## Configuring reconnection
-After reaching max_attempts an exeption will be thrown and on_disconnect event will be fired.
-```python
-hub_connection = HubConnectionBuilder()\
-    .with_url(server_url)\
-    ...
-    .build()
-```
-## Configuring additional headers
-```python
-hub_connection = HubConnectionBuilder()\
-            .with_url(server_url,
-            options={
-                "headers": {
-                    "mycustomheader": "mycustomheadervalue"
-                }
-            })
-            ...
-            .build()
-```
-## Configuring additional querystring parameters
-```python
-server_url ="http.... /?myquerystringparam=134&foo=bar"
-connection = HubConnectionBuilder()\
-            .with_url(server_url,
-            options={
-            })\
-            .build()
-```
-## Congfiguring skip negotiation
-```python
-hub_connection = HubConnectionBuilder() \
-        .with_url("ws://"+server_url, options={
-            "verify_ssl": False,
-            "skip_negotiation": False,
-            "headers": {
-            }
-        }) \
-        .configure_logging(logging.DEBUG, socket_trace=True, handler=handler) \
-        .build()
-
-```
-## Configuring ping(keep alive)
-
-keep_alive_interval sets the seconds of ping message
-
-```python
-hub_connection = HubConnectionBuilder()\
-    .with_url(server_url)\
-    .configure_logging(logging.DEBUG)\
-    .with_automatic_reconnect({
-        "type": "raw",
-        "keep_alive_interval": 10,
-        "reconnect_interval": 5,
-        "max_attempts": 5
-    }).build()
-```
-## Configuring logging
-```python
-hub_connection = HubConnectionBuilder()\
-    .with_url(server_url)\
-    .configure_logging(logging.DEBUG)\
-    .with_automatic_reconnect({
-        "type": "raw",
-        "keep_alive_interval": 10,
-        "reconnect_interval": 5,
-        "max_attempts": 5
-    }).build()
-```
-
-## Configure messagepack
-
-```python
-from signalrcore.protocol.messagepack_protocol import MessagePackHubProtocol
-
-HubConnectionBuilder()\
-            .with_url(self.server_url, options={"verify_ssl":False})\
-                ... 
-            .with_hub_protocol(MessagePackHubProtocol())\
-                ...
-            .build()
-```
-## Events
-
-### On Connect / On Disconnect
-on_open - fires when connection is opened and ready to send messages
-on_close - fires when connection is closed
-```python
-hub_connection.on_open(lambda: print("connection opened and handshake received ready to send messages"))
-hub_connection.on_close(lambda: print("connection closed"))
-
-```
-### On Hub Error (Hub Exceptions ...)
-```
-hub_connection.on_error(lambda data: print(f"An exception was thrown closed{data.error}"))
-```
-### Register an operation 
-ReceiveMessage - signalr method
-print - function that has as parameters args of signalr method
-```python
-hub_connection.on("ReceiveMessage", print)
-```
-## Sending messages
-SendMessage - signalr method
-username, message - parameters of signalrmethod
-```python
-    hub_connection.send("SendMessage", [username, message])
-```
-
-## Sending messages with callback
-SendMessage - signalr method
-username, message - parameters of signalrmethod
-```python
-    send_callback_received = threading.Lock()
-    send_callback_received.acquire()
-    self.connection.send(
-        "SendMessage", # Method
-        [self.username, self.message], # Params
-        lambda m: send_callback_received.release()) # Callback
-    if not send_callback_received.acquire(timeout=1):
-        raise ValueError("CALLBACK NOT RECEIVED")
-```
-
-## Requesting streaming (Server to client)
-```python
-hub_connection.stream(
-            "Counter",
-            [len(self.items), 500]).subscribe({
-                "next": self.on_next,
-                "complete": self.on_complete,
-                "error": self.on_error
-            })
-```
-## Client side Streaming
-```python
-from signalrcore.subject import  Subject
-
-subject = Subject()
-
-# Start Streaming
-hub_connection.send("UploadStream", subject)
-
-# Each iteration
-subject.next(str(iteration))
-
-# End streaming
-subject.complete()
-```
-
-# Full Examples
-
-Examples will be avaiable [here](https://github.com/mandrewcito/signalrcore/tree/master/test/examples)
-It were developed using package from [aspnet core - SignalRChat](https://codeload.github.com/aspnet/Docs/zip/master) 
-
-## Chat example
-A mini example could be something like this:
-
-```python
-import logging
-import sys
-from signalrcore.hub_connection_builder import HubConnectionBuilder
-
-
-def input_with_default(input_text, default_value):
-    value = input(input_text.format(default_value))
-    return default_value if value is None or value.strip() == "" else value
-
-
-server_url = input_with_default('Enter your server url(default: {0}): ', "wss://localhost:44376/chatHub")
-username = input_with_default('Enter your username (default: {0}): ', "mandrewcito")
-handler = logging.StreamHandler()
-handler.setLevel(logging.DEBUG)
-hub_connection = HubConnectionBuilder()\
-    .with_url(server_url, options={"verify_ssl": False}) \
-    .configure_logging(logging.DEBUG, socket_trace=True, handler=handler) \
-    .with_automatic_reconnect({
-            "type": "interval",
-            "keep_alive_interval": 10,
-            "intervals": [1, 3, 5, 6, 7, 87, 3]
-        }).build()
-
-hub_connection.on_open(lambda: print("connection opened and handshake received ready to send messages"))
-hub_connection.on_close(lambda: print("connection closed"))
-
-hub_connection.on("ReceiveMessage", print)
-hub_connection.start()
-message = None
-
-# Do login
-
-while message != "exit()":
-    message = input(">> ")
-    if message is not None and message != "" and message != "exit()":
-        hub_connection.send("SendMessage", [username, message])
-
-hub_connection.stop()
-
-sys.exit(0)
-
-```
diff --git a/libs/signalrcore-0.9.5.dist-info/RECORD b/libs/signalrcore-0.9.5.dist-info/RECORD
deleted file mode 100644
index e6f1963620..0000000000
--- a/libs/signalrcore-0.9.5.dist-info/RECORD
+++ /dev/null
@@ -1,50 +0,0 @@
-signalrcore-0.9.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-signalrcore-0.9.5.dist-info/LICENSE,sha256=zlgZo2qli0c9PLoPObfeGy9yEXuQOV2HF26LykBg5Ko,1101
-signalrcore-0.9.5.dist-info/METADATA,sha256=-OzvuEVNms2lGfgvQJyWuZ8wHWiDY-SGHTZ8VSQdiwc,10509
-signalrcore-0.9.5.dist-info/RECORD,,
-signalrcore-0.9.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore-0.9.5.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-signalrcore-0.9.5.dist-info/top_level.txt,sha256=I28KSOVJS0rNgMCI8E8W-13gvoCGHkmwc6z4NSrQlo0,17
-signalrcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/helpers.py,sha256=uoQCHrT1M2_7fMOYmD-Piw4za2AGz6TENYhe3vvMffw,2756
-signalrcore/hub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/hub/auth_hub_connection.py,sha256=YVsmRhGhG8CYi7egnYbFJXPB7dDiPOnwX45dQg8MhUA,964
-signalrcore/hub/base_hub_connection.py,sha256=qyVCI57w_jyoIgTcYTzq5EfEnSPLGbI1C7U8Eak4RRY,9673
-signalrcore/hub/errors.py,sha256=CxyoYj7B8-5OUBhT2QBYFcDzmOvYCdkp42MOZls8xkw,176
-signalrcore/hub/handlers.py,sha256=g85bQ6Sr2-KHzMJXHBJdYqeALGHy-Z5GyGrLVGqVSLg,1928
-signalrcore/hub_connection_builder.py,sha256=EBKxRIgVTtlfk3YCQq7F6MWgXqRSNazRNDsAv3lwK4s,8570
-signalrcore/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/messages/base_message.py,sha256=AAydVr-g85U2xthOM4jm2hqHQ3ZBaOSiO0hmXlqCEpI,447
-signalrcore/messages/cancel_invocation_message.py,sha256=CLsAom4Ubf3bn8HroEOzgiye_6VI9RnjgJmxtwqshbo,647
-signalrcore/messages/close_message.py,sha256=ERik_8z7KGUSvNoDhU87T05kfF4zHM_1NMIIFqUMmRo,716
-signalrcore/messages/completion_message.py,sha256=7a8GSJcK9xtoFRiFCP_HkIza1h8b9tkrXa31TeF7nS4,1875
-signalrcore/messages/handshake/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/messages/handshake/request.py,sha256=zNM8PZ4m4W1OSlEnXCxjPLnlYNXPF7yrToDDPxdcb9c,152
-signalrcore/messages/handshake/response.py,sha256=ekQx_MX9ZTxHgDa7uiKAivBjky8xVMV5ljjf-Rpeo5w,103
-signalrcore/messages/invocation_message.py,sha256=mTAUWQUu_TR-IOKR4hBJXXTKccjgFPIhFqyxC_I6WoQ,2008
-signalrcore/messages/message_type.py,sha256=hZnGkaUiFbu3I8QhPnuQWVCbYoCGy90JZEgc9sl_OFo,234
-signalrcore/messages/ping_message.py,sha256=IcOG6AGa6s0GvZEWBfOzjqhpNA_lFPF_FPGDjaNNIqw,403
-signalrcore/messages/stream_invocation_message.py,sha256=feEVtHtEyY1vUa45L9cAGGo2nZb_9UV_6vSX-Nj_UDQ,1147
-signalrcore/messages/stream_item_message.py,sha256=3r5n_1O04zquD9GTISPF9osjkmIf0_cmMPt-fuaXSIM,786
-signalrcore/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/protocol/base_hub_protocol.py,sha256=B2_kqssL9Um-h2Oplu2vRfo8vsOAjp-QeSidHdmX4Hw,2991
-signalrcore/protocol/handshake/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/protocol/json_hub_protocol.py,sha256=aJ5rLdhLt3ijW_G1aATtTFL-nbSa3cZFlv2yzcox3hg,1654
-signalrcore/protocol/messagepack_protocol.py,sha256=ZS-QqOyk_yPrKFBb_F4KM3rYJT1M_IAxzQTtjUMs-q0,6419
-signalrcore/subject.py,sha256=izH-qzaVPHrK8OgN2ZJ5A_1v4Lx5QtqC_zYfq59hFp4,2112
-signalrcore/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/transport/base_transport.py,sha256=KXPzdgQkxwcj2Unm4WRvoGMpGKao01VJZAyQ0HvegiU,1124
-signalrcore/transport/websockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-signalrcore/transport/websockets/connection.py,sha256=mBaZeNxcqWjDlNOnMWk8Pp7vu3g3_wY5oQPUdIL7L3E,140
-signalrcore/transport/websockets/reconnection.py,sha256=y3SSYLl3VFXLVNDtTdojBbAvMDzHoiXJod7wu-L9D3w,2680
-signalrcore/transport/websockets/websocket_transport.py,sha256=ym7ZakkOyXoBwnBx_HC5xw5IQB1_2DlIdOoVP8b45CE,8907
-test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-test/base_test_case.py,sha256=k_zqhAZRmPkzKizVkVsn-A4fpWxNEqg9kJjg036OTD4,1835
-test/client_streaming_test.py,sha256=zKfle7J0kg5LzpzaL13WXdRb7xdZCILLcXHCV2GZhNw,1002
-test/configuration_test.py,sha256=OLeBfnS3CM96Jfb2q1oJ-J3xAc8rHMts53a2tbY6FP0,2164
-test/open_close_test.py,sha256=g3YlSYS-jhpj6mdLLqPoigXF1CqGlR-bFn1ThIvNCwk,1566
-test/reconnection_test.py,sha256=O7hc5NG1ou3zgK9C4I1b37vxk3Pas5T6nNL1rTrEJ5c,3992
-test/send_auth_errors_test.py,sha256=PIFmcQ_y1iZ1cMiDt-QRMhFCvindxvcNiS1RTksyA1o,1833
-test/send_auth_test.py,sha256=rTwF2sizB_DZpU4gulEqfsHAfIBOciMMN1DwzgZb2Dg,2733
-test/send_test.py,sha256=hTSmTsJmn2YjompPaVCFU0z61AF0lp32Rrp8Fywersg,5523
-test/streaming_test.py,sha256=gaNF4rd0Z4ijxsFcCwhW_8JrbHxKBdDHWpoPCNSgfzU,1977
diff --git a/libs/signalrcore-0.9.5.dist-info/WHEEL b/libs/signalrcore-0.9.5.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/signalrcore-0.9.5.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/rich-13.9.4.dist-info/INSTALLER b/libs/signalrcore-0.9.71.dist-info/INSTALLER
similarity index 100%
rename from libs/rich-13.9.4.dist-info/INSTALLER
rename to libs/signalrcore-0.9.71.dist-info/INSTALLER
diff --git a/libs/signalrcore-0.9.71.dist-info/METADATA b/libs/signalrcore-0.9.71.dist-info/METADATA
new file mode 100644
index 0000000000..d5842f246c
--- /dev/null
+++ b/libs/signalrcore-0.9.71.dist-info/METADATA
@@ -0,0 +1,342 @@
+Metadata-Version: 2.4
+Name: signalrcore
+Version: 0.9.71
+Summary: A Python SignalR Core client(json and messagepack),with invocation auth and two way streaming.Compatible with azure / serverless functions.Also with automatic reconnect and manually reconnect.
+Home-page: https://github.com/mandrewcito/signalrcore
+Author: mandrewcito
+Author-email: signalrcore@mandrewcito.dev
+Keywords: signalr core client 3.1
+Classifier: Programming Language :: Python :: 3.8
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: msgpack==1.0.2
+Provides-Extra: dev
+Requires-Dist: requests; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: coverage; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
+
+# SignalR core client
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?logo=paypal&style=flat-square)](https://www.paypal.me/mandrewcito/1)
+![Pypi](https://img.shields.io/pypi/v/signalrcore.svg)
+[![Downloads](https://pepy.tech/badge/signalrcore/month)](https://pepy.tech/project/signalrcore/month)
+[![Downloads](https://pepy.tech/badge/signalrcore)](https://pepy.tech/project/signalrcore)
+![Issues](https://img.shields.io/github/issues/mandrewcito/signalrcore.svg)
+![Open issues](https://img.shields.io/github/issues-raw/mandrewcito/signalrcore.svg)
+![codecov.io](https://codecov.io/github/mandrewcito/signalrcore/coverage.svg?branch=master)
+
+![logo alt](https://raw.githubusercontent.com/mandrewcito/signalrcore/master/docs/img/logo_temp.128.svg.png)
+
+
+# Links 
+
+* [Dev to posts with library examples and implementation](https://dev.to/mandrewcito/singlar-core-python-client-58e7)
+
+* [Pypi](https://pypi.org/project/signalrcore/)
+
+* [Wiki - This Doc](https://mandrewcito.github.io/signalrcore/)
+
+# Develop
+
+Test server will be available in [here](https://github.com/mandrewcito/signalrcore-containertestservers) and docker compose is required.
+
+```bash
+git clone https://github.com/mandrewcito/signalrcore-containertestservers
+cd signalrcore-containertestservers
+docker compose up
+cd ../signalrcore
+make tests
+```
+
+# A Tiny How To
+
+## Connect to a server without auth
+
+```python
+hub_connection = HubConnectionBuilder()\
+    .with_url(server_url)\
+    .configure_logging(logging.DEBUG)\
+    .with_automatic_reconnect({
+        "type": "raw",
+        "keep_alive_interval": 10,
+        "reconnect_interval": 5,
+        "max_attempts": 5
+    }).build()
+```
+## Connect to a server with auth
+
+login_function must provide auth token
+
+```python
+hub_connection = HubConnectionBuilder()\
+            .with_url(server_url,
+            options={
+                "access_token_factory": login_function,
+                "headers": {
+                    "mycustomheader": "mycustomheadervalue"
+                }
+            })\
+            .configure_logging(logging.DEBUG)\
+            .with_automatic_reconnect({
+                "type": "raw",
+                "keep_alive_interval": 10,
+                "reconnect_interval": 5,
+                "max_attempts": 5
+            }).build()
+```
+### Unauthorized errors
+A login function must provide an error controller if authorization fails. When connection starts, if authorization fails exception will be propagated.
+
+```python
+    def login(self):
+        response = requests.post(
+            self.login_url,
+            json={
+                "username": self.email,
+                "password": self.password
+                },verify=False)
+        if response.status_code == 200:
+            return response.json()["token"]
+        raise requests.exceptions.ConnectionError()
+
+    hub_connection.start()   # this code will raise  requests.exceptions.ConnectionError() if auth fails
+```
+## Configure logging
+
+```python
+HubConnectionBuilder()\
+    .with_url(server_url,
+    .configure_logging(logging.DEBUG)
+    ...
+```
+## Configure socket trace
+```python 
+HubConnectionBuilder()\
+    .with_url(server_url,
+    .configure_logging(logging.DEBUG, socket_trace=True) 
+    ... 
+ ```
+## Configure your own handler
+```python
+ import logging
+handler = logging.StreamHandler()
+handler.setLevel(logging.DEBUG)
+hub_connection = HubConnectionBuilder()\
+    .with_url(server_url, options={"verify_ssl": False}) \
+    .configure_logging(logging.DEBUG, socket_trace=True, handler=handler)
+    ...
+ ```
+## Configuring reconnection
+After reaching max_attempts an exeption will be thrown and on_disconnect event will be fired.
+```python
+hub_connection = HubConnectionBuilder()\
+    .with_url(server_url)\
+    ...
+    .build()
+```
+## Configuring additional headers
+```python
+hub_connection = HubConnectionBuilder()\
+            .with_url(server_url,
+            options={
+                "headers": {
+                    "mycustomheader": "mycustomheadervalue"
+                }
+            })
+            ...
+            .build()
+```
+## Configuring additional querystring parameters
+```python
+server_url ="http.... /?myquerystringparam=134&foo=bar"
+connection = HubConnectionBuilder()\
+            .with_url(server_url,
+            options={
+            })\
+            .build()
+```
+## Configuring skip negotiation
+```python
+hub_connection = HubConnectionBuilder() \
+        .with_url("ws://"+server_url, options={
+            "verify_ssl": False,
+            "skip_negotiation": False,
+            "headers": {
+            }
+        }) \
+        .configure_logging(logging.DEBUG, socket_trace=True, handler=handler) \
+        .build()
+
+```
+## Configuring ping(keep alive)
+
+keep_alive_interval sets the seconds of ping message
+
+```python
+hub_connection = HubConnectionBuilder()\
+    .with_url(server_url)\
+    .configure_logging(logging.DEBUG)\
+    .with_automatic_reconnect({
+        "type": "raw",
+        "keep_alive_interval": 10,
+        "reconnect_interval": 5,
+        "max_attempts": 5
+    }).build()
+```
+## Configuring logging
+```python
+hub_connection = HubConnectionBuilder()\
+    .with_url(server_url)\
+    .configure_logging(logging.DEBUG)\
+    .with_automatic_reconnect({
+        "type": "raw",
+        "keep_alive_interval": 10,
+        "reconnect_interval": 5,
+        "max_attempts": 5
+    }).build()
+```
+
+## Configure messagepack
+
+```python
+from signalrcore.protocol.messagepack_protocol import MessagePackHubProtocol
+
+HubConnectionBuilder()\
+            .with_url(self.server_url, options={"verify_ssl":False})\
+                ... 
+            .with_hub_protocol(MessagePackHubProtocol())\
+                ...
+            .build()
+```
+## Events
+
+### On Connect / On Disconnect
+on_open - fires when connection is opened and ready to send messages
+on_close - fires when connection is closed
+```python
+hub_connection.on_open(lambda: print("connection opened and handshake received ready to send messages"))
+hub_connection.on_close(lambda: print("connection closed"))
+
+```
+### On Hub Error (Hub Exceptions ...)
+```
+hub_connection.on_error(lambda data: print(f"An exception was thrown closed{data.error}"))
+```
+### Register an operation 
+ReceiveMessage - signalr method
+print - function that has as parameters args of signalr method
+```python
+hub_connection.on("ReceiveMessage", print)
+```
+## Sending messages
+SendMessage - signalr method
+username, message - parameters of signalrmethod
+```python
+    hub_connection.send("SendMessage", [username, message])
+```
+
+## Sending messages with callback
+SendMessage - signalr method
+username, message - parameters of signalrmethod
+```python
+    send_callback_received = threading.Lock()
+    send_callback_received.acquire()
+    self.connection.send(
+        "SendMessage", # Method
+        [self.username, self.message], # Params
+        lambda m: send_callback_received.release()) # Callback
+    if not send_callback_received.acquire(timeout=1):
+        raise ValueError("CALLBACK NOT RECEIVED")
+```
+
+## Requesting streaming (Server to client)
+```python
+hub_connection.stream(
+            "Counter",
+            [len(self.items), 500]).subscribe({
+                "next": self.on_next,
+                "complete": self.on_complete,
+                "error": self.on_error
+            })
+```
+## Client side Streaming
+```python
+from signalrcore.subject import  Subject
+
+subject = Subject()
+
+# Start Streaming
+hub_connection.send("UploadStream", subject)
+
+# Each iteration
+subject.next(str(iteration))
+
+# End streaming
+subject.complete()
+```
+
+# Full Examples
+
+Examples will be avaiable [here](https://github.com/mandrewcito/signalrcore/tree/master/test/examples)
+It were developed using package from [aspnet core - SignalRChat](https://codeload.github.com/aspnet/Docs/zip/master) 
+
+## Chat example
+A mini example could be something like this:
+
+```python
+import logging
+import sys
+from signalrcore.hub_connection_builder import HubConnectionBuilder
+
+
+def input_with_default(input_text, default_value):
+    value = input(input_text.format(default_value))
+    return default_value if value is None or value.strip() == "" else value
+
+
+server_url = input_with_default('Enter your server url(default: {0}): ', "wss://localhost:44376/chatHub")
+username = input_with_default('Enter your username (default: {0}): ', "mandrewcito")
+handler = logging.StreamHandler()
+handler.setLevel(logging.DEBUG)
+hub_connection = HubConnectionBuilder()\
+    .with_url(server_url, options={"verify_ssl": False}) \
+    .configure_logging(logging.DEBUG, socket_trace=True, handler=handler) \
+    .with_automatic_reconnect({
+            "type": "interval",
+            "keep_alive_interval": 10,
+            "intervals": [1, 3, 5, 6, 7, 87, 3]
+        }).build()
+
+hub_connection.on_open(lambda: print("connection opened and handshake received ready to send messages"))
+hub_connection.on_close(lambda: print("connection closed"))
+
+hub_connection.on("ReceiveMessage", print)
+hub_connection.start()
+message = None
+
+# Do login
+
+while message != "exit()":
+    message = input(">> ")
+    if message is not None and message != "" and message != "exit()":
+        hub_connection.send("SendMessage", [username, message])
+
+hub_connection.stop()
+
+sys.exit(0)
+
+```
diff --git a/libs/signalrcore-0.9.71.dist-info/RECORD b/libs/signalrcore-0.9.71.dist-info/RECORD
new file mode 100644
index 0000000000..8d15034d7f
--- /dev/null
+++ b/libs/signalrcore-0.9.71.dist-info/RECORD
@@ -0,0 +1,52 @@
+signalrcore-0.9.71.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+signalrcore-0.9.71.dist-info/METADATA,sha256=CsSlEThZEaMMnUSuxNJgkWAZmPgSllaUqIQMzX_KPW4,10316
+signalrcore-0.9.71.dist-info/RECORD,,
+signalrcore-0.9.71.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore-0.9.71.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+signalrcore-0.9.71.dist-info/licenses/LICENSE,sha256=zlgZo2qli0c9PLoPObfeGy9yEXuQOV2HF26LykBg5Ko,1101
+signalrcore-0.9.71.dist-info/top_level.txt,sha256=I28KSOVJS0rNgMCI8E8W-13gvoCGHkmwc6z4NSrQlo0,17
+signalrcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/helpers.py,sha256=gmo_rSiH3mKzZ_a8rPJpc0b1xch_sqLJideaTZ2G8TE,4683
+signalrcore/hub/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/hub/auth_hub_connection.py,sha256=YVsmRhGhG8CYi7egnYbFJXPB7dDiPOnwX45dQg8MhUA,964
+signalrcore/hub/base_hub_connection.py,sha256=3EUL9t9EJQJM4W2iD7MGJi8g_qN4xRe43xs2HwiFA8Q,10753
+signalrcore/hub/errors.py,sha256=EDJgMT-ZpWc1VIRA--Qjahg2LBK0u0mM5V5UX7-i-XQ,180
+signalrcore/hub/handlers.py,sha256=-f6OLQ9AMwGqE7Gh-84oHf0bTgUVsSlFuRg_T0ff_T8,1914
+signalrcore/hub_connection_builder.py,sha256=A8dtysW5R1_EAJ_GcZZHtea9NLu96dfKMsmmtuY6LRI,9161
+signalrcore/messages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/messages/base_message.py,sha256=AAydVr-g85U2xthOM4jm2hqHQ3ZBaOSiO0hmXlqCEpI,447
+signalrcore/messages/cancel_invocation_message.py,sha256=CLsAom4Ubf3bn8HroEOzgiye_6VI9RnjgJmxtwqshbo,647
+signalrcore/messages/close_message.py,sha256=ERik_8z7KGUSvNoDhU87T05kfF4zHM_1NMIIFqUMmRo,716
+signalrcore/messages/completion_message.py,sha256=7a8GSJcK9xtoFRiFCP_HkIza1h8b9tkrXa31TeF7nS4,1875
+signalrcore/messages/handshake/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/messages/handshake/request.py,sha256=zNM8PZ4m4W1OSlEnXCxjPLnlYNXPF7yrToDDPxdcb9c,152
+signalrcore/messages/handshake/response.py,sha256=ekQx_MX9ZTxHgDa7uiKAivBjky8xVMV5ljjf-Rpeo5w,103
+signalrcore/messages/invocation_message.py,sha256=mTAUWQUu_TR-IOKR4hBJXXTKccjgFPIhFqyxC_I6WoQ,2008
+signalrcore/messages/message_type.py,sha256=hZnGkaUiFbu3I8QhPnuQWVCbYoCGy90JZEgc9sl_OFo,234
+signalrcore/messages/ping_message.py,sha256=IcOG6AGa6s0GvZEWBfOzjqhpNA_lFPF_FPGDjaNNIqw,403
+signalrcore/messages/stream_invocation_message.py,sha256=feEVtHtEyY1vUa45L9cAGGo2nZb_9UV_6vSX-Nj_UDQ,1147
+signalrcore/messages/stream_item_message.py,sha256=3r5n_1O04zquD9GTISPF9osjkmIf0_cmMPt-fuaXSIM,786
+signalrcore/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/protocol/base_hub_protocol.py,sha256=vGIfGAdidCxvWHJ4zwSsZKW8dxJPgGaS5j-hiPAfuHg,3058
+signalrcore/protocol/handshake/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/protocol/json_hub_protocol.py,sha256=Q9b8dWdhkNHjIPSS2NjM91BHuDgvy3mpqV50jVXg_nI,1653
+signalrcore/protocol/messagepack_protocol.py,sha256=Eysw6z6USUP-HogHkPK8sel4aVXmGFsb-ip7g6CI7Xc,6918
+signalrcore/subject.py,sha256=izH-qzaVPHrK8OgN2ZJ5A_1v4Lx5QtqC_zYfq59hFp4,2112
+signalrcore/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/transport/base_reconnection.py,sha256=NtJENKSTrwMZ7DmoSp8Y8LUyA8zpyhTZJah613Vktdw,265
+signalrcore/transport/base_transport.py,sha256=IL2rLlzpjz0yXqLHRg1Vik2cC0zjTf7CUKUnGoobDUQ,3003
+signalrcore/transport/websockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+signalrcore/transport/websockets/reconnection.py,sha256=ok2uftxWZT19MIT0SxNHEiKs3YDyWcnVzpTtGMg9mQw,2677
+signalrcore/transport/websockets/websocket_client.py,sha256=9rStmx_YdZAWSnPafuVQ-YOKNmeGkWZKxD2lqTXBr18,9065
+signalrcore/transport/websockets/websocket_transport.py,sha256=-PT36w2qF1htaKqVUTkjAAdmrz3cRBjM7Ti07cInyrI,8248
+test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+test/base_test_case.py,sha256=HDTCbf4_xjeA0rX9vj30B3sGBetfA_u728gcQ48CTNM,1840
+test/client_streaming_test.py,sha256=qXmzj1KQkAbGXj9nls3p0-9q6PirUj78f40AQE7MIX8,836
+test/configuration_test.py,sha256=awy3jSh3HGL0zuWTjUucWZ9Ljj50Fo3VMVoNgmbnVAQ,2974
+test/open_close_test.py,sha256=VaDZomCrpqS4xTVbU_2U4r-5mYzILAUqT2kAXlcK5Y8,1839
+test/reconnection_test.py,sha256=1OioMoiQvKodjTYRwrqahDtV-WI-PA2-N-kQTxJC_uQ,4450
+test/send_auth_errors_test.py,sha256=warY87prADkdh1PL3_hmtGQt8j_wqFz1puiYj-Z2SLk,1808
+test/send_auth_test.py,sha256=R1tS6NCYdr9fmVMspQmZDmHbQpTLUrDnzukjgE-blO4,2733
+test/send_test.py,sha256=lKOt4OC84GMN4wunpfq_GU-nQQ_N5cgkGJj-Da3u1s4,5942
+test/streaming_test.py,sha256=GM7BpQwrP27Pjmhdt3vQUTAZyWyoyA2QThPymY7s3Ao,1839
+test/subscribe_test.py,sha256=fQ5W_l9kX9dp4khwo6U4-8hEDYLLD5p9FdgwTeOAhDg,505
diff --git a/libs/tld-0.13.dist-info/REQUESTED b/libs/signalrcore-0.9.71.dist-info/REQUESTED
similarity index 100%
rename from libs/tld-0.13.dist-info/REQUESTED
rename to libs/signalrcore-0.9.71.dist-info/REQUESTED
diff --git a/libs/signalrcore-0.9.71.dist-info/WHEEL b/libs/signalrcore-0.9.71.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/signalrcore-0.9.71.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/signalrcore-0.9.5.dist-info/LICENSE b/libs/signalrcore-0.9.71.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/signalrcore-0.9.5.dist-info/LICENSE
rename to libs/signalrcore-0.9.71.dist-info/licenses/LICENSE
diff --git a/libs/signalrcore-0.9.5.dist-info/top_level.txt b/libs/signalrcore-0.9.71.dist-info/top_level.txt
similarity index 100%
rename from libs/signalrcore-0.9.5.dist-info/top_level.txt
rename to libs/signalrcore-0.9.71.dist-info/top_level.txt
diff --git a/libs/signalrcore/helpers.py b/libs/signalrcore/helpers.py
index ab7bac4de3..e9fb55af64 100644
--- a/libs/signalrcore/helpers.py
+++ b/libs/signalrcore/helpers.py
@@ -1,16 +1,83 @@
 import logging
 import urllib.parse as parse
+import urllib
+import urllib.request
+import ssl
+from typing import Tuple
+import json
+
+
+class RequestHelpers:
+    @staticmethod
+    def post(
+            url: str,
+            headers: dict = {},
+            proxies: dict = {},
+            verify_ssl: bool = False) -> Tuple[int, dict]:
+        return RequestHelpers.request(
+            url,
+            "POST",
+            headers=headers,
+            proxies=proxies,
+            verify_ssl=verify_ssl
+        )
+
+    @staticmethod
+    def request(
+            url: str,
+            method: str,
+            headers: dict = {},
+            proxies: dict = {},
+            verify_ssl: bool = False) -> Tuple[int, dict]:
+        context = ssl.create_default_context()
+        if not verify_ssl:
+            context.check_hostname = False
+            context.verify_mode = ssl.CERT_NONE
+        headers.update({'Content-Type': 'application/json'})
+        proxy_handler = None
+
+        if len(proxies.keys()) > 0:
+            proxy_handler = urllib.request.ProxyHandler(proxies)
+            # pragma: no cover
+
+        req = urllib.request.Request(
+            url,
+            method=method,
+            headers=headers)
+
+        opener = urllib.request.build_opener(proxy_handler)\
+            if proxy_handler is not None else\
+            urllib.request.urlopen
+
+        with opener(
+                req,
+                context=context) as response:
+            status_code = response.getcode()
+            response_body = response.read().decode('utf-8')
+
+            try:
+                json_data = json.loads(response_body)
+            except json.JSONDecodeError:  # pragma: no cover
+                json_data = None  # pragma: no cover
+
+            return status_code, json_data
 
 
 class Helpers:
+
     @staticmethod
     def configure_logger(level=logging.INFO, handler=None):
         logger = Helpers.get_logger()
         if handler is None:
             handler = logging.StreamHandler()
+            debug_formatter = ""\
+                if level != logging.DEBUG else\
+                "- %(filename)s:%(lineno)d "
             handler.setFormatter(
                 logging.Formatter(
-                    '%(asctime)s - %(name)s - %(levelname)s - %(message)s'))
+                    '%(asctime)s - %(name)s '
+                    + debug_formatter +
+                    '- %(levelname)s - %(message)s'))
             handler.setLevel(level)
         logger.addHandler(handler)
         logger.setLevel(level)
diff --git a/libs/signalrcore/hub/base_hub_connection.py b/libs/signalrcore/hub/base_hub_connection.py
index e1dd6a98cc..2626247fd4 100644
--- a/libs/signalrcore/hub/base_hub_connection.py
+++ b/libs/signalrcore/hub/base_hub_connection.py
@@ -1,30 +1,23 @@
-from operator import inv
-import websocket
-import threading
-import requests
-import traceback
 import uuid
-import time
-import ssl
-from typing import Callable
+from typing import Callable, List, Union, Optional
 from signalrcore.messages.message_type import MessageType
 from signalrcore.messages.stream_invocation_message\
     import StreamInvocationMessage
-from signalrcore.messages.ping_message import PingMessage
-from .errors import UnAuthorizedHubError, HubError, HubConnectionError
+from .errors import HubConnectionError
 from signalrcore.helpers import Helpers
 from .handlers import StreamHandler, InvocationHandler
-from ..protocol.messagepack_protocol import MessagePackHubProtocol
 from ..transport.websockets.websocket_transport import WebsocketTransport
-from ..helpers import Helpers
 from ..subject import Subject
 from ..messages.invocation_message import InvocationMessage
+from collections import defaultdict
+
 
 class InvocationResult(object):
     def __init__(self, invocation_id) -> None:
         self.invocation_id = invocation_id
         self.message = None
 
+
 class BaseHubConnection(object):
     def __init__(
             self,
@@ -37,10 +30,12 @@ def __init__(
         else:
             self.headers = headers
         self.logger = Helpers.get_logger()
-        self.handlers = []
-        self.stream_handlers = []
+        self.handlers = defaultdict(list)
+        self.stream_handlers = defaultdict(list)
+
         self._on_error = lambda error: self.logger.info(
             "on_error not defined {0}".format(error))
+
         self.transport = WebsocketTransport(
             url=url,
             protocol=protocol,
@@ -48,15 +43,15 @@ def __init__(
             on_message=self.on_message,
             **kwargs)
 
-    def start(self):
+    def start(self) -> None:
         self.logger.debug("Connection started")
         return self.transport.start()
 
-    def stop(self):
+    def stop(self) -> None:
         self.logger.debug("Connection stop")
         return self.transport.stop()
 
-    def on_close(self, callback):
+    def on_close(self, callback) -> None:
         """Configures on_close connection callback.
             It will be raised on connection closed event
         connection.on_close(lambda: print("connection closed"))
@@ -65,17 +60,17 @@ def on_close(self, callback):
         """
         self.transport.on_close_callback(callback)
 
-    def on_open(self, callback):
+    def on_open(self, callback) -> None:
         """Configures on_open connection callback.
             It will be raised on connection open event
         connection.on_open(lambda: print(
             "connection opened "))
         Args:
-            callback (function): funciton without params
+            callback (function): function without params
         """
         self.transport.on_open_callback(callback)
 
-    def on_error(self, callback):
+    def on_error(self, callback) -> None:
         """Configures on_error connection callback. It will be raised
             if any hub method throws an exception.
         connection.on_error(lambda data:
@@ -86,7 +81,7 @@ def on_error(self, callback):
         """
         self._on_error = callback
 
-    def on_reconnect(self, callback):
+    def on_reconnect(self, callback) -> None:
         """Configures on_reconnect reconnection callback.
             It will be raised on reconnection event
         connection.on_reconnect(lambda: print(
@@ -96,35 +91,78 @@ def on_reconnect(self, callback):
         """
         self.transport.on_reconnect_callback(callback)
 
-    def on(self, event, callback_function: Callable):
+    def on(self, event, callback_function: Callable) -> None:
         """Register a callback on the specified event
         Args:
             event (string):  Event name
             callback_function (Function): callback function,
-                arguments will be binded
+                arguments will be bound
         """
         self.logger.debug("Handler registered started {0}".format(event))
-        self.handlers.append((event, callback_function))
+        self.handlers[event].append(callback_function)
+
+    def unsubscribe(self, event, callback_function: Callable) -> None:
+        """Removes a callback from the specified event
+        Args:
+            event (string): Event name
+            callback_function (Function): callback function,
+                arguments will be bound
+        """
+        self.logger.debug("Handler removed {0}".format(event))
+
+        self.handlers[event].remove(callback_function)
+
+        if len(self.handlers[event]) == 0:
+            del self.handlers[event]
+
+    def send(self, method, arguments, on_invocation=None, invocation_id=None)\
+            -> InvocationResult:
+        """invokes a server function
+        Deprecated: 0.96
+            Use invoke instead
+        Args:
+            method (string): Method name
+            arguments (list|Subject): Method parameters
+            on_invocation (function, optional): On invocation send callback
+                will be raised on send server function ends. Defaults to None.
+            invocation_id (string, optional): Override invocation ID.
+                Exceptions thrown by the hub will use this ID,
+                making it easier to handle with the on_error call.
 
-    def send(self, method, arguments, on_invocation=None, invocation_id=str(uuid.uuid4())) -> InvocationResult:
-        """Sends a message
+        Raises:
+            HubConnectionError: If hub is not ready to send
+            TypeError: If arguments are invalid list or Subject
+        """
+        return self.invoke(method, arguments, on_invocation, invocation_id)
+
+    def invoke(
+            self,
+            method: str,
+            arguments: Union[List, Subject],
+            on_invocation: Optional[Callable] = None,
+            invocation_id: Optional[str] = None)\
+            -> InvocationResult:
+        """invokes a server function
 
         Args:
             method (string): Method name
             arguments (list|Subject): Method parameters
             on_invocation (function, optional): On invocation send callback
                 will be raised on send server function ends. Defaults to None.
-            invocation_id (string, optional): Override invocation ID. Exceptions
-                thrown by the hub will use this ID, making it easier to handle
-                with the on_error call.
+            invocation_id (string, optional): Override invocation ID.
+                Exceptions thrown by the hub will use this ID,
+                making it easier to handle with the on_error call.
 
         Raises:
             HubConnectionError: If hub is not ready to send
             TypeError: If arguments are invalid list or Subject
         """
+        if invocation_id is None:
+            invocation_id = str(uuid.uuid4())
+
         if not self.transport.is_running():
             raise HubConnectionError(
-                "Hub is not running you cand send messages")
+                "Cannot connect to SignalR hub. Unable to transmit messages")
 
         if type(arguments) is not list and type(arguments) is not Subject:
             raise TypeError("Arguments of a message must be a list or subject")
@@ -139,26 +177,24 @@ def send(self, method, arguments, on_invocation=None, invocation_id=str(uuid.uui
                 headers=self.headers)
 
             if on_invocation:
-                self.stream_handlers.append(
+                self.stream_handlers[message.invocation_id].append(
                     InvocationHandler(
                         message.invocation_id,
                         on_invocation))
-            
+
             self.transport.send(message)
             result.message = message
-        
+
         if type(arguments) is Subject:
             arguments.connection = self
             arguments.target = method
             arguments.start()
             result.invocation_id = arguments.invocation_id
             result.message = arguments
-        
 
         return result
 
-
-    def on_message(self, messages):
+    def on_message(self, messages) -> None:
         for message in messages:
             if message.type == MessageType.invocation_binding_failure:
                 self.logger.error(message)
@@ -169,18 +205,19 @@ def on_message(self, messages):
                 continue
 
             if message.type == MessageType.invocation:
-                fired_handlers = list(
-                    filter(
-                        lambda h: h[0] == message.target,
-                        self.handlers))
+
+                fired_handlers = self.handlers.get(message.target, [])
+
                 if len(fired_handlers) == 0:
-                    self.logger.debug(f"event '{message.target}' hasn't fired any handler")
-                for _, handler in fired_handlers:
+                    self.logger.debug(
+                        f"event '{message.target}' hasn't fired any handler")
+
+                for handler in fired_handlers:
                     handler(message.arguments)
 
             if message.type == MessageType.close:
                 self.logger.info("Close message received from server")
-                self.stop()
+                self.transport.dispose()
                 return
 
             if message.type == MessageType.completion:
@@ -188,30 +225,26 @@ def on_message(self, messages):
                     self._on_error(message)
 
                 # Send callbacks
-                fired_handlers = list(
-                    filter(
-                        lambda h: h.invocation_id == message.invocation_id,
-                        self.stream_handlers))
+                fired_handlers = self.stream_handlers.get(
+                    message.invocation_id, [])
 
                 # Stream callbacks
                 for handler in fired_handlers:
                     handler.complete_callback(message)
 
                 # unregister handler
-                self.stream_handlers = list(
-                    filter(
-                        lambda h: h.invocation_id != message.invocation_id,
-                        self.stream_handlers))
+                if message.invocation_id in self.stream_handlers:
+                    del self.stream_handlers[message.invocation_id]
 
             if message.type == MessageType.stream_item:
-                fired_handlers = list(
-                    filter(
-                        lambda h: h.invocation_id == message.invocation_id,
-                        self.stream_handlers))
+                fired_handlers = self.stream_handlers.get(
+                    message.invocation_id, [])
+
                 if len(fired_handlers) == 0:
                     self.logger.warning(
                         "id '{0}' hasn't fire any stream handler".format(
                             message.invocation_id))
+
                 for handler in fired_handlers:
                     handler.next_callback(message.item)
 
@@ -219,10 +252,9 @@ def on_message(self, messages):
                 pass
 
             if message.type == MessageType.cancel_invocation:
-                fired_handlers = list(
-                    filter(
-                        lambda h: h.invocation_id == message.invocation_id,
-                        self.stream_handlers))
+                fired_handlers = self.stream_handlers.get(
+                    message.invocation_id, [])
+
                 if len(fired_handlers) == 0:
                     self.logger.warning(
                         "id '{0}' hasn't fire any stream handler".format(
@@ -232,12 +264,10 @@ def on_message(self, messages):
                     handler.error_callback(message)
 
                 # unregister handler
-                self.stream_handlers = list(
-                    filter(
-                        lambda h: h.invocation_id != message.invocation_id,
-                        self.stream_handlers))
+                if message.invocation_id in self.stream_handlers:
+                    del self.stream_handlers[message.invocation_id]
 
-    def stream(self, event, event_params):
+    def stream(self, event, event_params) -> StreamHandler:
         """Starts server streaming
             connection.stream(
             "Counter",
@@ -256,11 +286,11 @@ def stream(self, event, event_params):
         """
         invocation_id = str(uuid.uuid4())
         stream_obj = StreamHandler(event, invocation_id)
-        self.stream_handlers.append(stream_obj)
+        self.stream_handlers[invocation_id].append(stream_obj)
         self.transport.send(
             StreamInvocationMessage(
                 invocation_id,
                 event,
                 event_params,
                 headers=self.headers))
-        return stream_obj
\ No newline at end of file
+        return stream_obj
diff --git a/libs/signalrcore/hub/errors.py b/libs/signalrcore/hub/errors.py
index 354c6b8ee4..9f4c316c80 100644
--- a/libs/signalrcore/hub/errors.py
+++ b/libs/signalrcore/hub/errors.py
@@ -1,9 +1,11 @@
 class HubError(OSError):
     pass
 
+
 class UnAuthorizedHubError(HubError):
     pass
 
+
 class HubConnectionError(ValueError):
     """Hub connection error
     """
diff --git a/libs/signalrcore/hub/handlers.py b/libs/signalrcore/hub/handlers.py
index 35e558cc77..42d0648036 100644
--- a/libs/signalrcore/hub/handlers.py
+++ b/libs/signalrcore/hub/handlers.py
@@ -1,7 +1,7 @@
-import logging
-
 from typing import Callable
 from ..helpers import Helpers
+
+
 class StreamHandler(object):
     def __init__(self, event: str, invocation_id: str):
         self.event = event
diff --git a/libs/signalrcore/hub_connection_builder.py b/libs/signalrcore/hub_connection_builder.py
index 01d88da0b0..9fdbe20575 100644
--- a/libs/signalrcore/hub_connection_builder.py
+++ b/libs/signalrcore/hub_connection_builder.py
@@ -1,12 +1,9 @@
-import uuid
 from .hub.base_hub_connection import BaseHubConnection
 from .hub.auth_hub_connection import AuthHubConnection
 from .transport.websockets.reconnection import \
     IntervalReconnectionHandler, RawReconnectionHandler, ReconnectionType
 from .helpers import Helpers
-from .messages.invocation_message import InvocationMessage
 from .protocol.json_hub_protocol import JsonHubProtocol
-from .subject import Subject
 
 
 class HubConnectionBuilder(object):
@@ -37,6 +34,7 @@ def __init__(self):
         self.enable_trace = False  # socket trace
         self.skip_negotiation = False  # By default do not skip negotiation
         self.running = False
+        self.proxies = dict()
 
     def with_url(
             self,
@@ -85,7 +83,7 @@ def login(self):
         if hub_url is None or hub_url.strip() == "":
             raise ValueError("hub_url must be a valid url.")
 
-        if options is not None and type(options) != dict:
+        if options is not None and type(options) is not dict:
             raise TypeError(
                 "options must be a dict {0}.".format(self.options))
 
@@ -127,6 +125,28 @@ def configure_logging(
         self.enable_trace = socket_trace
         return self
 
+    def configure_proxies(
+            self,
+            proxies: dict):
+        """configures proxies
+
+        Args:
+            proxies (dict): {
+              "http"  : "http://host:port",
+              "https" : "https://host:port",
+              "ftp"   : "ftp://port:port"
+            }
+
+        Returns:
+            [HubConnectionBuilder]: Instance hub with proxies configured
+        """
+
+        if "http" not in proxies.keys() or "https" not in proxies.keys():
+            raise ValueError("Only http and https keys are allowed")
+
+        self.proxies = proxies
+        return self
+
     def with_hub_protocol(self, protocol):
         """Changes transport protocol
             from signalrcore.protocol.messagepack_protocol\
@@ -182,6 +202,7 @@ def build(self):
                 keep_alive_interval=self.keep_alive_interval,
                 reconnection_handler=self.reconnection_handler,
                 verify_ssl=self.verify_ssl,
+                proxies=self.proxies,
                 skip_negotiation=self.skip_negotiation,
                 enable_trace=self.enable_trace)\
             if self.has_auth_configured else\
@@ -192,9 +213,10 @@ def build(self):
                 reconnection_handler=self.reconnection_handler,
                 headers=self.headers,
                 verify_ssl=self.verify_ssl,
+                proxies=self.proxies,
                 skip_negotiation=self.skip_negotiation,
                 enable_trace=self.enable_trace)
-            
+
     def with_automatic_reconnect(self, data: dict):
         """Configures automatic reconnection
             https://devblogs.microsoft.com/aspnet/asp-net-core-updates-in-net-core-3-0-preview-4/
diff --git a/libs/signalrcore/protocol/base_hub_protocol.py b/libs/signalrcore/protocol/base_hub_protocol.py
index 5e2b91877f..f992edc680 100644
--- a/libs/signalrcore/protocol/base_hub_protocol.py
+++ b/libs/signalrcore/protocol/base_hub_protocol.py
@@ -10,7 +10,7 @@
 from ..messages.ping_message import PingMessage  # 6
 from ..messages.close_message import CloseMessage  # 7
 from ..messages.message_type import MessageType
-from ..helpers import Helpers
+
 
 class BaseHubProtocol(object):
     def __init__(self, protocol, version, transfer_format, record_separator):
@@ -21,9 +21,10 @@ def __init__(self, protocol, version, transfer_format, record_separator):
 
     @staticmethod
     def get_message(dict_message):
-        message_type =  MessageType.close\
-            if not "type" in dict_message.keys() else MessageType(dict_message["type"])
-        
+        message_type = MessageType.close\
+            if "type" not in dict_message.keys() else\
+            MessageType(dict_message["type"])
+
         dict_message["invocation_id"] = dict_message.get("invocationId", None)
         dict_message["headers"] = dict_message.get("headers", {})
         dict_message["error"] = dict_message.get("error", None)
@@ -45,16 +46,19 @@ def get_message(dict_message):
 
     def decode_handshake(self, raw_message: str) -> HandshakeResponseMessage:
         messages = raw_message.split(self.record_separator)
-        messages = list(filter(lambda x: x != "", messages))        
+        messages = list(filter(lambda x: x != "", messages))
         data = json.loads(messages[0])
         idx = raw_message.index(self.record_separator)
-        return HandshakeResponseMessage(data.get("error", None)), self.parse_messages(raw_message[idx + 1 :]) if len(messages) > 1 else []
+        return (
+            HandshakeResponseMessage(data.get("error", None)),
+            self.parse_messages(raw_message[idx + 1:])
+            if len(messages) > 1 else [])
 
     def handshake_message(self) -> HandshakeRequestMessage:
         return HandshakeRequestMessage(self.protocol, self.version)
 
-    def parse_messages(self, raw_message: str):
-        raise ValueError("Protocol must implement this method")
+    def parse_messages(self, raw_message: str):  # pragma: no cover
+        raise NotImplementedError("Protocol must implement this method")
 
-    def write_message(self, hub_message):
-        raise ValueError("Protocol must implement this method")
+    def write_message(self, hub_message):  # pragma: no cover
+        raise NotImplementedError("Protocol must implement this method")
diff --git a/libs/signalrcore/protocol/json_hub_protocol.py b/libs/signalrcore/protocol/json_hub_protocol.py
index bcd6f9ae4b..e4b5404c38 100644
--- a/libs/signalrcore/protocol/json_hub_protocol.py
+++ b/libs/signalrcore/protocol/json_hub_protocol.py
@@ -29,7 +29,7 @@ def __init__(self):
         self.encoder = MyEncoder()
 
     def parse_messages(self, raw):
-        Helpers.get_logger().debug("Raw message incomming: ")
+        Helpers.get_logger().debug("Raw message incoming: ")
         Helpers.get_logger().debug(raw)
         raw_messages = [
             record.replace(self.record_separator, "")
diff --git a/libs/signalrcore/protocol/messagepack_protocol.py b/libs/signalrcore/protocol/messagepack_protocol.py
index f70349aa8b..3485e41489 100644
--- a/libs/signalrcore/protocol/messagepack_protocol.py
+++ b/libs/signalrcore/protocol/messagepack_protocol.py
@@ -37,30 +37,47 @@ def parse_messages(self, raw):
         try:
             messages = []
             offset = 0
+            max_length_prefix_size = 5
+            num_bits_to_shift = [0, 7, 14, 21, 28]
             while offset < len(raw):
-                length = msgpack.unpackb(raw[offset: offset + 1])
-                values = msgpack.unpackb(raw[offset + 1: offset + length + 1])
-                offset = offset + length + 1
+                length = 0
+                num_bytes = 0
+                while True:
+                    byte_read = raw[offset + num_bytes]
+                    length |=\
+                        (byte_read & 0x7F) << num_bits_to_shift[num_bytes]
+                    num_bytes += 1
+                    if byte_read & 0x80 == 0:
+                        break
+                    if offset == max_length_prefix_size\
+                            or offset + num_bytes > len(raw):
+                        raise Exception("Cannot read message length")
+                offset = offset + num_bytes
+                values = msgpack.unpackb(raw[offset: offset + length])
+                offset = offset + length
                 message = self._decode_message(values)
                 messages.append(message)
         except Exception as ex:
-            Helpers.get_logger().error("Parse messages Error {0}".format(ex))
-            Helpers.get_logger().error("raw msg '{0}'".format(raw))
+            self.logger.error("Parse messages Error {0}".format(ex))
+            self.logger.error("raw msg '{0}'".format(raw))
         return messages
 
     def decode_handshake(self, raw_message):
         try:
             has_various_messages = 0x1E in raw_message
-            handshake_data = raw_message[0: raw_message.index(0x1E)] if has_various_messages else raw_message
-            messages = self.parse_messages(raw_message[raw_message.index(0x1E) + 1:]) if has_various_messages else []
+            handshake_data = raw_message[0: raw_message.index(0x1E)]\
+                if has_various_messages else raw_message
+            messages = self.parse_messages(
+                raw_message[raw_message.index(0x1E) + 1:])\
+                if has_various_messages else []
             data = json.loads(handshake_data)
             return HandshakeResponseMessage(data.get("error", None)), messages
         except Exception as ex:
             if type(raw_message) is str:
                 data = json.loads(raw_message[0: raw_message.index("}") + 1])
                 return HandshakeResponseMessage(data.get("error", None)), []
-            Helpers.get_logger().error(raw_message)
-            Helpers.get_logger().error(ex)
+            self.logger.error(raw_message)
+            self.logger.error(ex)
             raise ex
 
     def encode(self, message):
@@ -150,9 +167,6 @@ def _decode_message(self, raw):
 
         elif raw[0] == 7:  # CloseMessageEncoding
             return CloseMessage(error=raw[1])  # AllowReconnect is missing
-        print(".......................................")
-        print(raw)
-        print("---------------------------------------")
         raise Exception("Unknown message type.")
 
     def _to_varint(self, value):
diff --git a/libs/signalrcore/transport/base_reconnection.py b/libs/signalrcore/transport/base_reconnection.py
new file mode 100644
index 0000000000..092409f81c
--- /dev/null
+++ b/libs/signalrcore/transport/base_reconnection.py
@@ -0,0 +1,9 @@
+class BaseReconnection(object):
+    def __init__(self):  # pragma: no cover
+        self.reconnecting = False
+
+    def next(self):  # pragma: no cover
+        raise NotImplementedError()
+
+    def reset(self):  # pragma: no cover
+        raise NotImplementedError()
diff --git a/libs/signalrcore/transport/base_transport.py b/libs/signalrcore/transport/base_transport.py
index eeb3f7431a..c0263ecb15 100644
--- a/libs/signalrcore/transport/base_transport.py
+++ b/libs/signalrcore/transport/base_transport.py
@@ -1,32 +1,87 @@
+import enum
+from typing import Callable
 from ..protocol.json_hub_protocol import JsonHubProtocol
 from ..helpers import Helpers
+from ..transport.base_reconnection import BaseReconnection
+
+
+class TransportState(enum.Enum):
+    connecting = 0  # connection established, handshake not received
+    connected = 1  # connection established, handshake received
+    reconnecting = 2  # connection not established, reconnecting
+    disconnected = 3  # connection not established
+
 
 class BaseTransport(object):
-    def __init__(self, protocol=JsonHubProtocol(), on_message=None):
+    def __init__(
+            self,
+            protocol=JsonHubProtocol(),
+            reconnection_handler: BaseReconnection = None,
+            on_message: Callable = None):
         self.protocol = protocol
-        self._on_message= on_message
+        self._on_message = on_message
+        self.reconnection_handler = reconnection_handler
         self.logger = Helpers.get_logger()
         self._on_open = lambda: self.logger.info("on_connect not defined")
-        self._on_close = lambda: self.logger.info("on_disconnect not defined")
-        self._on_reconnect = lambda: self.logger.info("on_reconnect not defined")
+        self._on_close = lambda: self.logger.info("on_close not defined")
+        self._on_reconnect =\
+            lambda: self.logger.info("on_reconnect not defined")
+
+        self.state = TransportState.disconnected
+        self.reconnection_handler = reconnection_handler
+
+    def _set_state(self, new_state: TransportState):
+        """Internal helper to change state and call appropriate callbacks."""
+        if new_state == self.state:
+            return  # no-op
+
+        old_state = self.state
+        self.state = new_state
+
+        self.logger.debug(
+            f"Transport state changed: {old_state.name} โ†’ {new_state.name}")
+
+        was_connecting = old_state == TransportState.connecting
+        was_connected = old_state == TransportState.connected
+        was_reconnecting = old_state == TransportState.reconnecting
+
+        if was_connecting and self.is_connected():
+            self._on_open()
+        elif (was_connected or was_reconnecting)\
+                and self.is_disconnected():
+            self._on_close()
+        elif was_reconnecting and self.is_connected():
+            self._on_reconnect()
+
+    def is_connected(self):
+        return self.state == TransportState.connected
+
+    def is_connecting(self):  # pragma: no cover
+        return self.state == TransportState.connecting
+
+    def is_reconnecting(self):
+        return self.state == TransportState.reconnecting
+
+    def is_disconnected(self):
+        return self.state == TransportState.disconnected
 
     def on_open_callback(self, callback):
         self._on_open = callback
-    
+
     def on_close_callback(self, callback):
         self._on_close = callback
 
     def on_reconnect_callback(self, callback):
         self._on_reconnect = callback
 
-    def start(self): # pragma: no cover
+    def start(self):  # pragma: no cover
         raise NotImplementedError()
 
-    def stop(self): # pragma: no cover
-        raise NotImplementedError()
-    
-    def is_running(self): # pragma: no cover
+    def stop(self):  # pragma: no cover
         raise NotImplementedError()
 
-    def send(self, message, on_invocation = None): # pragma: no cover
-        raise NotImplementedError()
\ No newline at end of file
+    def is_running(self):
+        return self.state != TransportState.disconnected
+
+    def send(self, message, on_invocation=None):  # pragma: no cover
+        raise NotImplementedError()
diff --git a/libs/signalrcore/transport/websockets/connection.py b/libs/signalrcore/transport/websockets/connection.py
deleted file mode 100644
index 2253f02868..0000000000
--- a/libs/signalrcore/transport/websockets/connection.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from enum import Enum
-
-
-class ConnectionState(Enum):
-    connecting = 0
-    connected = 1
-    reconnecting = 2
-    disconnected = 4
diff --git a/libs/signalrcore/transport/websockets/reconnection.py b/libs/signalrcore/transport/websockets/reconnection.py
index b14b41c5b7..048a033039 100644
--- a/libs/signalrcore/transport/websockets/reconnection.py
+++ b/libs/signalrcore/transport/websockets/reconnection.py
@@ -34,7 +34,7 @@ def stop(self):
 
 
 class ReconnectionType(Enum):
-    raw = 0  # Reconnection with max reconnections and constant sleep time
+    raw = 0  # Reconnection with max reconnects and constant sleep time
     interval = 1  # variable sleep time
 
 
diff --git a/libs/signalrcore/transport/websockets/websocket_client.py b/libs/signalrcore/transport/websockets/websocket_client.py
new file mode 100644
index 0000000000..5ebca25d3f
--- /dev/null
+++ b/libs/signalrcore/transport/websockets/websocket_client.py
@@ -0,0 +1,300 @@
+import socket
+import ssl
+import base64
+import threading
+import os
+import struct
+import urllib.parse as parse
+from typing import Optional, Callable, Union
+from signalrcore.helpers import Helpers
+
+
+THREAD_NAME = "Signalrcore websocket client"
+WINDOW_SIZE = 1024
+
+
+class NoHeaderException(Exception):
+    """Error reading messages from socket, empty content
+    """
+    pass
+
+
+class SocketHandshakeError(Exception):
+    """Error during connection
+
+    Args:
+        msg (str): message
+    """
+    def __init__(self, msg: str):
+        super().__init__(msg)
+
+
+class SocketClosedError(Exception):
+    """Socket closed by the server fin opcode: 129, masked len 3
+
+    Args:
+        data (bytes): raw bytes sent by the server
+    """
+    def __init__(self, data: Optional[bytes] = None):  # pragma: no cover
+        self.data = data
+        super().__init__("Socket closed by the the server")
+
+
+class WebSocketClient(object):
+    """Minimal websocket client
+
+    Args:
+        url (str): Websocket url
+        headers (Optional[dict]): additional headers
+        verify_ssl (bool): Verify SSL y/n
+        on_message (callable): on message callback
+        on_error (callable): on error callback
+        on_open (callable): on open callback
+        on_close (callable): on close callback
+    """
+    def __init__(
+            self,
+            url: str,
+            is_binary: bool = False,
+            headers: Optional[dict] = None,
+            proxies: dict = {},
+            verify_ssl: bool = True,
+            enable_trace: bool = False,
+            on_message: Callable = None,
+            on_open: Callable = None,
+            on_error: Callable = None,
+            on_close: Callable = None):
+        self.is_trace_enabled = enable_trace
+        self.proxies = proxies
+        self.url = url
+        self.is_binary = is_binary
+        self.headers = headers or {}
+        self.verify_ssl = verify_ssl
+        self.sock = None
+        self.ssl_context = ssl.create_default_context()\
+            if verify_ssl else\
+            ssl._create_unverified_context()
+        self.logger = Helpers.get_logger()
+        self.recv_thread = None
+        self.on_message = on_message
+        self.on_close = on_close
+        self.on_error = on_error
+        self.on_open = on_open
+        self.running = False
+        self.is_closing = False
+
+    def connect(self):
+        parsed_url = parse.urlparse(self.url)
+        host, port = parsed_url.hostname, parsed_url.port
+
+        is_secure_connection = parsed_url.scheme in ("wss", "https")
+
+        if not port:
+            port = 80
+            if is_secure_connection:
+                port = 443
+
+        proxy_info = None
+        if is_secure_connection\
+                and self.proxies.get("https", None) is not None:
+            proxy_info = parse.urlparse(self.proxies.get("https"))
+
+        if not is_secure_connection\
+                and self.proxies.get("http", None) is not None:
+            proxy_info = parse.urlparse(self.proxies.get("http"))
+
+        if proxy_info is not None:
+            host = proxy_info.hostname,
+            port = proxy_info.port
+
+        raw_sock = socket.create_connection((host, port))
+
+        if is_secure_connection:
+            raw_sock = self.ssl_context.wrap_socket(
+                raw_sock,
+                server_hostname=host)
+
+        self.sock = raw_sock
+
+        # Perform the WebSocket handshake
+        key = base64.b64encode(os.urandom(16)).decode("utf-8")
+        relative_reference = parsed_url.path
+        if parsed_url.query:
+            relative_reference = f"{parsed_url.path}?{parsed_url.query}"
+        request_headers = [
+            f"GET {relative_reference} HTTP/1.1",
+            f"Host: {parsed_url.hostname}",
+            "Upgrade: websocket",
+            "Connection: Upgrade",
+            f"Sec-WebSocket-Key: {key}",
+            "Sec-WebSocket-Version: 13"
+        ]
+        for k, v in self.headers.items():
+            request_headers.append(f"{k}: {v}")
+
+        request = "\r\n".join(request_headers) + "\r\n\r\n"
+        req = request.encode("utf-8")
+
+        if self.is_trace_enabled:
+            self.logger.debug(f"[TRACE] - {req}")
+
+        self.sock.sendall(req)
+
+        # Read handshake response
+        response = b""
+        while b"\r\n\r\n" not in response:
+            chunk = self.sock.recv(WINDOW_SIZE)
+
+            if not chunk:
+                raise SocketHandshakeError(
+                    "Connection closed during handshake")
+
+            response += chunk
+
+        if self.is_trace_enabled:
+            self.logger.debug(f"[TRACE] - {response}")
+
+        if b"101" not in response:
+            raise SocketHandshakeError(
+                f"Handshake failed: {response.decode()}")
+
+        self.running = True
+        self.recv_thread = threading.Thread(
+            target=self._recv_loop,
+            name=THREAD_NAME)
+        self.recv_thread.daemon = True
+        self.recv_thread.start()
+
+    def is_connection_closed(self):
+        return self.recv_thread is None or not self.recv_thread.is_alive()
+
+    def _recv_loop(self):
+        self.on_open()
+        try:
+            while self.running:
+                message = self._recv_frame()
+
+                if self.on_message:
+                    self.on_message(self, message)
+        except (OSError, Exception) as e:
+            self.running = False
+
+            # is closing and no header indicates
+            # that socket has not received anything
+            has_no_content = type(e) is NoHeaderException
+
+            # is closing and errno indicates
+            # that file descriptor points to a closed file
+            has_closed_fd = type(e) is OSError and e.errno == 9
+
+            # closed by the server
+            connection_closed = has_closed_fd or type(e) is SocketClosedError
+
+            if connection_closed and not self.is_closing:
+                raise e  # pragma: no cover
+
+            if (has_closed_fd or has_no_content) and self.is_closing:
+                return
+
+            if self.logger:
+                self.logger.error(f"Receive error: {e}")
+
+            self.on_error(e)
+
+    def _recv_frame(self):
+        # Very basic, single-frame, unfragmented
+        try:
+            header = self.sock.recv(2)
+        except ssl.SSLError as ex:
+            self.logger.error(ex)
+            header = None
+
+        if header is None or len(header) < 2:
+            raise NoHeaderException()
+
+        fin_opcode = header[0]
+        masked_len = header[1]
+
+        if self.logger:
+            self.logger.debug(
+                f"fin opcode: {fin_opcode}, masked len: {masked_len}")
+
+        if fin_opcode == 8:
+            raise SocketClosedError(header)
+        payload_len = masked_len & 0x7F
+        if payload_len == 126:
+            payload_len = struct.unpack(">H", self.sock.recv(2))[0]
+        elif payload_len == 127:
+            payload_len = struct.unpack(">Q", self.sock.recv(8))[0]
+
+        if masked_len & 0x80:
+            masking_key = self.sock.recv(4)
+            masked_data = self.sock.recv(payload_len)
+            data = bytes(
+                b ^ masking_key[i % 4]
+                for i, b in enumerate(masked_data))
+        else:
+            data = self.sock.recv(payload_len)
+
+        if self.is_trace_enabled:
+            self.logger.debug(f"[TRACE] - {data}")
+
+        if self.is_binary:
+            return data
+
+        return data.decode("utf-8")
+
+    def send(
+            self,
+            message: Union[str, bytes],
+            opcode=0x1):
+        if self.is_connection_closed():
+            raise SocketClosedError()
+
+        # Text or binary opcode (no fragmentation)
+        payload = message.encode("utf-8")\
+            if type(message) is str else message
+        header = bytes([0x80 | opcode])
+        length = len(payload)
+        if length <= 125:
+            header += bytes([0x80 | length])
+        elif length <= 65535:
+            header += bytes([0x80 | 126]) + struct.pack(">H", length)
+        else:
+            header += bytes([0x80 | 127]) + struct.pack(">Q", length)
+
+        # Mask the payload
+        masking_key = os.urandom(4)
+        masked_payload = bytes(
+            b ^ masking_key[i % 4]
+            for i, b in enumerate(payload))
+        frame = header + masking_key + masked_payload
+        self.sock.sendall(frame)
+
+    def dispose(self):
+        if self.sock:
+            self.sock.close()
+
+        is_same_thread = threading.current_thread().name == THREAD_NAME
+
+        if self.recv_thread and not is_same_thread:
+            self.recv_thread.join()
+            self.recv_thread = None
+
+    def close(self):
+        try:
+            self.is_closing = True
+            self.running = False
+
+            self.logger.debug("Start closing socket")
+
+            self.dispose()
+
+            self.on_close()
+
+            self.logger.debug("socket closed successfully")
+        except Exception as ex:  # pragma: no cover
+            self.logger.error(ex)  # pragma: no cover
+            self.on_error(ex)  # pragma: no cover
+        finally:
+            self.is_closing = False
diff --git a/libs/signalrcore/transport/websockets/websocket_transport.py b/libs/signalrcore/transport/websockets/websocket_transport.py
index 283d92107c..3570440a6a 100644
--- a/libs/signalrcore/transport/websockets/websocket_transport.py
+++ b/libs/signalrcore/transport/websockets/websocket_transport.py
@@ -1,107 +1,109 @@
-import websocket
-import threading
-import requests
 import traceback
 import time
-import ssl
+from typing import Optional
 from .reconnection import ConnectionStateChecker
-from .connection import ConnectionState
 from ...messages.ping_message import PingMessage
-from ...hub.errors import HubError, HubConnectionError, UnAuthorizedHubError
+from ...hub.errors import HubError, UnAuthorizedHubError
 from ...protocol.messagepack_protocol import MessagePackHubProtocol
-from ...protocol.json_hub_protocol import JsonHubProtocol
-from ..base_transport import BaseTransport
-from ...helpers import Helpers
+from ..base_transport import BaseTransport, TransportState
+from ...helpers import Helpers, RequestHelpers
+from .websocket_client import WebSocketClient, SocketClosedError
+
 
 class WebsocketTransport(BaseTransport):
-    def __init__(self,
+    _ws: Optional[WebSocketClient]
+
+    def __init__(
+            self,
             url="",
             headers=None,
             keep_alive_interval=15,
-            reconnection_handler=None,
             verify_ssl=False,
             skip_negotiation=False,
             enable_trace=False,
+            proxies: dict = {},
             **kwargs):
         super(WebsocketTransport, self).__init__(**kwargs)
         self._ws = None
         self.enable_trace = enable_trace
-        self._thread = None
         self.skip_negotiation = skip_negotiation
         self.url = url
+        self.proxies = proxies
         if headers is None:
             self.headers = dict()
         else:
             self.headers = headers
         self.handshake_received = False
         self.token = None  # auth
-        self.state = ConnectionState.disconnected
         self.connection_alive = False
-        self._thread = None
         self._ws = None
         self.verify_ssl = verify_ssl
         self.connection_checker = ConnectionStateChecker(
             lambda: self.send(PingMessage()),
             keep_alive_interval
         )
-        self.reconnection_handler = reconnection_handler
+        self.manually_closing = False
 
-        if len(self.logger.handlers) > 0:
-            websocket.enableTrace(self.enable_trace, self.logger.handlers[0])
-    
-    def is_running(self):
-        return self.state != ConnectionState.disconnected
-
-    def stop(self):
-        if self.state == ConnectionState.connected:
+    def dispose(self):
+        if self.is_connected():
             self.connection_checker.stop()
             self._ws.close()
-            self.state = ConnectionState.disconnected
-            self.handshake_received = False
 
-    def start(self):
+    def stop(self):
+        self.manually_closing = True
+        self.dispose()
+        self._set_state(TransportState.disconnected)
+        self.handshake_received = False
+
+    def is_trace_enabled(self) -> bool:
+        return self._ws.is_trace_enabled
+
+    def start(self, reconnection: bool = False):
         if not self.skip_negotiation:
             self.negotiate()
 
-        if self.state == ConnectionState.connected:
+        if self.is_connected():
             self.logger.warning("Already connected unable to start")
             return False
 
-        self.state = ConnectionState.connecting
+        if reconnection:
+            self._set_state(TransportState.reconnecting)
+        else:
+            self._set_state(TransportState.connecting)
+
         self.logger.debug("start url:" + self.url)
-        
-        self._ws = websocket.WebSocketApp(
+
+        self._ws = WebSocketClient(
             self.url,
-            header=self.headers,
+            headers=self.headers,
+            is_binary=type(self.protocol) is MessagePackHubProtocol,
+            verify_ssl=self.verify_ssl,
             on_message=self.on_message,
             on_error=self.on_socket_error,
-            on_close=self.on_close,
-            on_open=self.on_open,
+            on_close=self.on_socket_close,
+            on_open=self.on_socket_open,
+            enable_trace=self.enable_trace
             )
-            
-        self._thread = threading.Thread(
-            target=lambda: self._ws.run_forever(
-                sslopt={"cert_reqs": ssl.CERT_NONE}
-                if not self.verify_ssl else {}
-            ))
-        self._thread.daemon = True
-        self._thread.start()
+
+        self._ws.connect()
         return True
 
     def negotiate(self):
         negotiate_url = Helpers.get_negotiate_url(self.url)
         self.logger.debug("Negotiate url:{0}".format(negotiate_url))
 
-        response = requests.post(
-            negotiate_url, headers=self.headers, verify=self.verify_ssl)
-        self.logger.debug(
-            "Response status code{0}".format(response.status_code))
+        status_code, data = RequestHelpers.post(
+            negotiate_url,
+            headers=self.headers,
+            proxies=self.proxies,
+            verify_ssl=self.verify_ssl)
 
-        if response.status_code != 200:
-            raise HubError(response.status_code)\
-                if response.status_code != 401 else UnAuthorizedHubError()
+        self.logger.debug(
+            "Response status code {0}".format(status_code))
 
-        data = response.json()
+        if status_code != 200:
+            raise HubError(status_code)\
+                if status_code != 401 else UnAuthorizedHubError()
 
         if "connectionId" in data.keys():
             self.url = Helpers.encode_connection_id(
@@ -117,50 +119,36 @@ def negotiate(self):
             self.token = data["accessToken"]
             self.headers = {"Authorization": "Bearer " + self.token}
 
-
     def evaluate_handshake(self, message):
         self.logger.debug("Evaluating handshake {0}".format(message))
         msg, messages = self.protocol.decode_handshake(message)
         if msg.error is None or msg.error == "":
             self.handshake_received = True
-            self.state = ConnectionState.connected
+            self._set_state(TransportState.connected)
             if self.reconnection_handler is not None:
                 self.reconnection_handler.reconnecting = False
                 if not self.connection_checker.running:
                     self.connection_checker.start()
         else:
             self.logger.error(msg.error)
-            self.on_socket_error(self._ws, msg.error)
+            self.on_socket_error(msg.error)
             self.stop()
-            self.state = ConnectionState.disconnected
         return messages
 
-    def on_open(self, _):
+    def on_open(self):
         self.logger.debug("-- web socket open --")
         msg = self.protocol.handshake_message()
+        self.handshake_received = False
         self.send(msg)
 
-    def on_close(self, callback, close_status_code, close_reason):
+    def on_close(self):
         self.logger.debug("-- web socket close --")
-        self.logger.debug(close_status_code)
-        self.logger.debug(close_reason)
-        self.state = ConnectionState.disconnected
-        if self._on_close is not None and callable(self._on_close):
-            self._on_close()
-        if callback is not None and callable(callback):
-            callback()
-
-    def on_reconnect(self):
-        self.logger.debug("-- web socket reconnecting --")
-        self.state = ConnectionState.disconnected
-        if self._on_close is not None and callable(self._on_close):
-            self._on_close()
-
-    def on_socket_error(self, app, error):
+        self._set_state(TransportState.disconnected)
+
+    def on_socket_error(self, error: Exception):  # pragma: no cover
         """
         Args:
-            _: Required to support websocket-client version equal or greater than 0.58.0
-            error ([type]): [description]
+            error (Exception): websocket error
 
         Raises:
             HubError: [description]
@@ -169,23 +157,30 @@ def on_socket_error(self, app, error):
         self.logger.error(traceback.format_exc(10, True))
         self.logger.error("{0} {1}".format(self, error))
         self.logger.error("{0} {1}".format(error, type(error)))
-        self._on_close()
-        self.state = ConnectionState.disconnected
-        #raise HubError(error)
+        self._set_state(TransportState.disconnected)
+        # raise HubError(error)
+
+    def on_socket_close(self):
+        if self.reconnection_handler is not None\
+                and not self.is_reconnecting():
+            self.handle_reconnect()
+            return
+        self.on_close()
+
+    def on_socket_open(self):
+        self.on_open()
 
     def on_message(self, app, raw_message):
-        self.logger.debug("Message received{0}".format(raw_message))
+        self.logger.debug("Message received {0}".format(raw_message))
         if not self.handshake_received:
             messages = self.evaluate_handshake(raw_message)
-            if self._on_open is not None and callable(self._on_open):
-                self.state = ConnectionState.connected
-                self._on_open()
+            self._set_state(TransportState.connected)
 
             if len(messages) > 0:
                 return self._on_message(messages)
 
             return []
-        
+
         return self._on_message(
             self.protocol.parse_messages(raw_message))
 
@@ -195,49 +190,45 @@ def send(self, message):
             self._ws.send(
                 self.protocol.encode(message),
                 opcode=0x2
-                if type(self.protocol) == MessagePackHubProtocol else
+                if type(self.protocol) is MessagePackHubProtocol else
                 0x1)
             self.connection_checker.last_message = time.time()
             if self.reconnection_handler is not None:
                 self.reconnection_handler.reset()
-        except (
-                websocket._exceptions.WebSocketConnectionClosedException,
-                OSError) as ex:
-            self.handshake_received = False
+        except (OSError, SocketClosedError) as ex:  # pragma: no cover
+            self.handshake_received = False  # pragma: no cover
             self.logger.warning("Connection closed {0}".format(ex))
-            self.state = ConnectionState.disconnected
-            if self.reconnection_handler is None:
-                if self._on_close is not None and\
-                        callable(self._on_close):
-                    self._on_close()
-                raise ValueError(str(ex))
+            # pragma: no cover
+            if self.reconnection_handler is None:  # pragma: no cover
+                self._set_state(TransportState.disconnected)
+                # pragma: no cover
+                raise ValueError(str(ex))  # pragma: no cover
             # Connection closed
-            self.handle_reconnect()
-        except Exception as ex:
-            raise ex
+            self.handle_reconnect()  # pragma: no cover
+        except Exception as ex:  # pragma: no cover
+            raise ex  # pragma: no cover
 
     def handle_reconnect(self):
-        if not self.reconnection_handler.reconnecting and self._on_reconnect is not None and \
-                callable(self._on_reconnect):
-            self._on_reconnect()
+        if self.is_reconnecting() or self.manually_closing:
+            return  # pragma: no cover
+
         self.reconnection_handler.reconnecting = True
+        self._set_state(TransportState.reconnecting)
         try:
-            self.stop()
-            self.start()
+            self._ws.dispose()
+            self.start(reconnection=True)
         except Exception as ex:
             self.logger.error(ex)
             sleep_time = self.reconnection_handler.next()
-            threading.Thread(
-                target=self.deferred_reconnect,
-                args=(sleep_time,)
-            ).start()
+            self.deferred_reconnect(sleep_time)
 
     def deferred_reconnect(self, sleep_time):
         time.sleep(sleep_time)
         try:
             if not self.connection_alive:
-                self.send(PingMessage())
+                if not self.connection_checker.running:
+                    self.send(PingMessage())
         except Exception as ex:
             self.logger.error(ex)
             self.reconnection_handler.reconnecting = False
-            self.connection_alive = False
\ No newline at end of file
+            self.connection_alive = False
diff --git a/libs/simple_websocket-1.1.0.dist-info/METADATA b/libs/simple_websocket-1.1.0.dist-info/METADATA
index dfdb05e722..bde5d91a1f 100644
--- a/libs/simple_websocket-1.1.0.dist-info/METADATA
+++ b/libs/simple_websocket-1.1.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: simple-websocket
 Version: 1.1.0
 Summary: Simple WebSocket server and client for Python
@@ -15,12 +15,13 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: wsproto
 Provides-Extra: dev
-Requires-Dist: tox ; extra == 'dev'
-Requires-Dist: flake8 ; extra == 'dev'
-Requires-Dist: pytest ; extra == 'dev'
-Requires-Dist: pytest-cov ; extra == 'dev'
+Requires-Dist: tox; extra == "dev"
+Requires-Dist: flake8; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
 Provides-Extra: docs
-Requires-Dist: sphinx ; extra == 'docs'
+Requires-Dist: sphinx; extra == "docs"
+Dynamic: license-file
 
 simple-websocket
 ================
diff --git a/libs/simple_websocket-1.1.0.dist-info/RECORD b/libs/simple_websocket-1.1.0.dist-info/RECORD
index 3c240b2833..c4544cc15e 100644
--- a/libs/simple_websocket-1.1.0.dist-info/RECORD
+++ b/libs/simple_websocket-1.1.0.dist-info/RECORD
@@ -1,9 +1,9 @@
 simple_websocket-1.1.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-simple_websocket-1.1.0.dist-info/LICENSE,sha256=S4q63MXj3SnHGQW4SVKUVpnwp7pB5q-Z6rpG-qvpW7c,1072
-simple_websocket-1.1.0.dist-info/METADATA,sha256=jIZUFRCbg8Ae1BNwEipAlSMvuPJ05_bXpptlk2DHiNQ,1530
+simple_websocket-1.1.0.dist-info/METADATA,sha256=qn6zKW8KQwIRKa_YjYdHre6qjOOjmC4cxrMW7oR5Gvo,1547
 simple_websocket-1.1.0.dist-info/RECORD,,
 simple_websocket-1.1.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simple_websocket-1.1.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+simple_websocket-1.1.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+simple_websocket-1.1.0.dist-info/licenses/LICENSE,sha256=S4q63MXj3SnHGQW4SVKUVpnwp7pB5q-Z6rpG-qvpW7c,1072
 simple_websocket-1.1.0.dist-info/top_level.txt,sha256=gslMtkYd2H3exn9JQxdAgsKBCESZDyTxmukAF9Iz5aA,17
 simple_websocket/__init__.py,sha256=EKakMkVO9vg5WlXjHEJiTwI2emAqs9q22ZxJz9vJ4co,167
 simple_websocket/aiows.py,sha256=CHIBIAN2cz004S4tPeTLAcQuT9iBgw6-hA0QD_JZD1A,20978
diff --git a/libs/simple_websocket-1.1.0.dist-info/WHEEL b/libs/simple_websocket-1.1.0.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/simple_websocket-1.1.0.dist-info/WHEEL
+++ b/libs/simple_websocket-1.1.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/simple_websocket-1.1.0.dist-info/LICENSE b/libs/simple_websocket-1.1.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/simple_websocket-1.1.0.dist-info/LICENSE
rename to libs/simple_websocket-1.1.0.dist-info/licenses/LICENSE
diff --git a/libs/six-1.17.0.dist-info/METADATA b/libs/six-1.17.0.dist-info/METADATA
index cfde03c263..9560217853 100644
--- a/libs/six-1.17.0.dist-info/METADATA
+++ b/libs/six-1.17.0.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: six
 Version: 1.17.0
 Summary: Python 2 and 3 compatibility utilities
@@ -15,6 +15,15 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 .. image:: https://img.shields.io/pypi/v/six.svg
    :target: https://pypi.org/project/six/
diff --git a/libs/six-1.17.0.dist-info/RECORD b/libs/six-1.17.0.dist-info/RECORD
index e8890a3287..b02a63658b 100644
--- a/libs/six-1.17.0.dist-info/RECORD
+++ b/libs/six-1.17.0.dist-info/RECORD
@@ -1,8 +1,8 @@
 six-1.17.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-six-1.17.0.dist-info/LICENSE,sha256=Q3W6IOK5xsTnytKUCmKP2Q6VzD1Q7pKq51VxXYuh-9A,1066
-six-1.17.0.dist-info/METADATA,sha256=ViBCB4wnUlSfbYp8htvF3XCAiKe-bYBnLsewcQC3JGg,1658
+six-1.17.0.dist-info/METADATA,sha256=rGfSwtOMg_OOSSgkH8HU_9ehObiofc3--kMXivTywPU,1837
 six-1.17.0.dist-info/RECORD,,
 six-1.17.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-six-1.17.0.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+six-1.17.0.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+six-1.17.0.dist-info/licenses/LICENSE,sha256=Q3W6IOK5xsTnytKUCmKP2Q6VzD1Q7pKq51VxXYuh-9A,1066
 six-1.17.0.dist-info/top_level.txt,sha256=_iVH_iYEtEXnD8nYGQYpYFUvkUW9sEO1GYbkeKSAais,4
 six.py,sha256=xRyR9wPT1LNpbJI8tf7CE-BeddkhU5O--sfy-mo5BN8,34703
diff --git a/libs/six-1.17.0.dist-info/WHEEL b/libs/six-1.17.0.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/six-1.17.0.dist-info/WHEEL
+++ b/libs/six-1.17.0.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/six-1.17.0.dist-info/LICENSE b/libs/six-1.17.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/six-1.17.0.dist-info/LICENSE
rename to libs/six-1.17.0.dist-info/licenses/LICENSE
diff --git a/libs/socketio/admin.py b/libs/socketio/admin.py
index 12b905ea6a..e59da8ab03 100644
--- a/libs/socketio/admin.py
+++ b/libs/socketio/admin.py
@@ -194,6 +194,8 @@ def shutdown(self):
         if self.stats_task:  # pragma: no branch
             self.stop_stats_event.set()
             self.stats_task.join()
+            self.stop_stats_event.clear()
+            self.stats_task = None
 
     def _trigger_event(self, event, namespace, *args):
         t = time.time()
@@ -206,6 +208,9 @@ def _trigger_event(self, event, namespace, *args):
                 serialized_socket,
                 datetime.fromtimestamp(t, timezone.utc).isoformat(),
             ), namespace=self.admin_namespace)
+            if not self.sio.eio._get_socket(eio_sid).upgraded:
+                self.sio.start_background_task(
+                    self._check_for_upgrade, eio_sid, sid, namespace)
         elif event == 'disconnect':
             del self.sio.manager._timestamps[sid]
             reason = args[1]
@@ -283,6 +288,7 @@ def _emit(self, event, data, namespace, room=None, skip_sid=None,
     def _handle_eio_connect(self, eio_sid, environ):
         if self.stop_stats_event is None:
             self.stop_stats_event = self.sio.eio.create_event()
+        if self.stats_task is None:
             self.stats_task = self.sio.start_background_task(
                 self._emit_server_stats)
 
diff --git a/libs/socketio/async_admin.py b/libs/socketio/async_admin.py
index b052d8fe26..9d0fc9f37b 100644
--- a/libs/socketio/async_admin.py
+++ b/libs/socketio/async_admin.py
@@ -1,6 +1,7 @@
 import asyncio
 from datetime import datetime, timezone
 import functools
+import inspect
 import os
 import socket
 import time
@@ -124,7 +125,7 @@ async def admin_connect(self, sid, environ, client_auth):
             elif isinstance(self.auth, list):
                 authenticated = client_auth in self.auth
             else:
-                if asyncio.iscoroutinefunction(self.auth):
+                if inspect.iscoroutinefunction(self.auth):
                     authenticated = await self.auth(client_auth)
                 else:
                     authenticated = self.auth(client_auth)
@@ -156,9 +157,6 @@ async def config(sid):
                                     namespace=self.admin_namespace)
 
         self.sio.start_background_task(config, sid)
-        self.stop_stats_event = self.sio.eio.create_event()
-        self.stats_task = self.sio.start_background_task(
-            self._emit_server_stats)
 
     async def admin_emit(self, _, namespace, room_filter, event, *data):
         await self.sio.emit(event, data, to=room_filter, namespace=namespace)
@@ -182,6 +180,8 @@ async def shutdown(self):
         if self.stats_task:  # pragma: no branch
             self.stop_stats_event.set()
             await asyncio.gather(self.stats_task)
+            self.stats_task = None
+            self.stop_stats_event.clear()
 
     async def _trigger_event(self, event, namespace, *args):
         t = time.time()
@@ -194,6 +194,9 @@ async def _trigger_event(self, event, namespace, *args):
                 serialized_socket,
                 datetime.fromtimestamp(t, timezone.utc).isoformat(),
             ), namespace=self.admin_namespace)
+            if not self.sio.eio._get_socket(eio_sid).upgraded:
+                self.sio.start_background_task(
+                    self._check_for_upgrade, eio_sid, sid, namespace)
         elif event == 'disconnect':
             del self.sio.manager._timestamps[sid]
             reason = args[1]
@@ -272,6 +275,7 @@ async def _emit(self, event, data, namespace, room=None, skip_sid=None,
     async def _handle_eio_connect(self, eio_sid, environ):
         if self.stop_stats_event is None:
             self.stop_stats_event = self.sio.eio.create_event()
+        if self.stats_task is None:
             self.stats_task = self.sio.start_background_task(
                 self._emit_server_stats)
 
diff --git a/libs/socketio/async_aiopika_manager.py b/libs/socketio/async_aiopika_manager.py
index b6f09b8b5c..626158bfd8 100644
--- a/libs/socketio/async_aiopika_manager.py
+++ b/libs/socketio/async_aiopika_manager.py
@@ -1,5 +1,4 @@
 import asyncio
-import pickle
 
 from .async_pubsub_manager import AsyncPubSubManager
 
@@ -32,23 +31,34 @@ class AsyncAioPikaManager(AsyncPubSubManager):  # pragma: no cover
                     in rabbitmq
     :param write_only: If set to ``True``, only initialize to emit events. The
                        default of ``False`` initializes the class for emitting
-                       and receiving.
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     """
 
     name = 'asyncaiopika'
 
     def __init__(self, url='amqp://guest:guest@localhost:5672//',
-                 channel='socketio', write_only=False, logger=None):
+                 channel='socketio', write_only=False, logger=None, json=None):
         if aio_pika is None:
             raise RuntimeError('aio_pika package is not installed '
                                '(Run "pip install aio_pika" in your '
                                'virtualenv).')
+        super().__init__(channel=channel, write_only=write_only, logger=logger,
+                         json=json)
         self.url = url
         self._lock = asyncio.Lock()
         self.publisher_connection = None
         self.publisher_channel = None
         self.publisher_exchange = None
-        super().__init__(channel=channel, write_only=write_only, logger=logger)
 
     async def _connection(self):
         return await aio_pika.connect_robust(self.url)
@@ -82,7 +92,7 @@ async def _publish(self, data):
             try:
                 await self.publisher_exchange.publish(
                     aio_pika.Message(
-                        body=pickle.dumps(data),
+                        body=self.json.dumps(data).encode(),
                         delivery_mode=aio_pika.DeliveryMode.PERSISTENT
                     ), routing_key='*',
                 )
@@ -101,26 +111,26 @@ async def _publish(self, data):
                 raise asyncio.CancelledError()
 
     async def _listen(self):
-        async with (await self._connection()) as connection:
-            channel = await self._channel(connection)
-            await channel.set_qos(prefetch_count=1)
-            exchange = await self._exchange(channel)
-            queue = await self._queue(channel, exchange)
-
-            retry_sleep = 1
-            while True:
-                try:
+        retry_sleep = 1
+        while True:
+            try:
+                async with (await self._connection()) as connection:
+                    channel = await self._channel(connection)
+                    await channel.set_qos(prefetch_count=1)
+                    exchange = await self._exchange(channel)
+                    queue = await self._queue(channel, exchange)
+
                     async with queue.iterator() as queue_iter:
                         async for message in queue_iter:
                             async with message.process():
-                                yield pickle.loads(message.body)
+                                yield message.body
                                 retry_sleep = 1
-                except aio_pika.AMQPException:
-                    self._get_logger().error(
-                        'Cannot receive from rabbitmq... '
-                        'retrying in {} secs'.format(retry_sleep))
-                    await asyncio.sleep(retry_sleep)
-                    retry_sleep = min(retry_sleep * 2, 60)
-                except aio_pika.exceptions.ChannelInvalidStateError:
-                    # aio_pika raises this exception when the task is cancelled
-                    raise asyncio.CancelledError()
+            except aio_pika.AMQPException:
+                self._get_logger().error(
+                    'Cannot receive from rabbitmq... '
+                    'retrying in {} secs'.format(retry_sleep))
+                await asyncio.sleep(retry_sleep)
+                retry_sleep = min(retry_sleep * 2, 60)
+            except aio_pika.exceptions.ChannelInvalidStateError:
+                # aio_pika raises this exception when the task is cancelled
+                raise asyncio.CancelledError()
diff --git a/libs/socketio/async_client.py b/libs/socketio/async_client.py
index 463073e7b7..cdbcc1b6c1 100644
--- a/libs/socketio/async_client.py
+++ b/libs/socketio/async_client.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 import logging
 import random
 
@@ -36,10 +37,11 @@ class AsyncClient(base_client.BaseClient):
                    use. To disable logging set to ``False``. The default is
                    ``False``. Note that fatal errors are logged even when
                    ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param handle_sigint: Set to ``True`` to automatically handle disconnection
                           when the process is interrupted, or to ``False`` to
                           leave interrupt handling to the calling application.
@@ -139,6 +141,7 @@ async def connect(self, url, headers={}, auth=None, transports=None,
             namespaces = [namespaces]
         self.connection_namespaces = namespaces
         self.namespaces = {}
+        self.failed_namespaces = []
         if self._connect_event is None:
             self._connect_event = self.eio.create_event()
         else:
@@ -158,7 +161,7 @@ async def connect(self, url, headers={}, auth=None, transports=None,
                 await self._handle_reconnect()
                 if self.eio.state == 'connected':
                     return
-            raise exceptions.ConnectionError(exc.args[0]) from None
+            raise exceptions.ConnectionError(exc.args[0]) from exc
 
         if wait:
             try:
@@ -166,14 +169,16 @@ async def connect(self, url, headers={}, auth=None, transports=None,
                     await asyncio.wait_for(self._connect_event.wait(),
                                            wait_timeout)
                     self._connect_event.clear()
-                    if set(self.namespaces) == set(self.connection_namespaces):
+                    if len(self.namespaces) + len(self.failed_namespaces) == \
+                            len(self.connection_namespaces):
                         break
             except asyncio.TimeoutError:
                 pass
             if set(self.namespaces) != set(self.connection_namespaces):
                 await self.disconnect()
                 raise exceptions.ConnectionError(
-                    'One or more namespaces failed to connect')
+                    'One or more namespaces failed to connect: '
+                    + ', '.join(self.failed_namespaces))
 
         self.connected = True
 
@@ -324,7 +329,7 @@ async def disconnect(self):
         for n in self.namespaces:
             await self._send_packet(self.packet_class(packet.DISCONNECT,
                                     namespace=n))
-        await self.eio.disconnect(abort=True)
+        await self.eio.disconnect()
 
     async def shutdown(self):
         """Stop the client.
@@ -372,7 +377,7 @@ async def _get_real_value(self, value):
         callables."""
         if not callable(value):
             return value
-        if asyncio.iscoroutinefunction(value):
+        if inspect.iscoroutinefunction(value):
             return await value()
         return value()
 
@@ -404,7 +409,7 @@ async def _handle_disconnect(self, namespace):
             del self.namespaces[namespace]
         if not self.namespaces:
             self.connected = False
-            await self.eio.disconnect(abort=True)
+            await self.eio.disconnect()
 
     async def _handle_event(self, namespace, id, data):
         namespace = namespace or '/'
@@ -434,7 +439,7 @@ async def _handle_ack(self, namespace, id, data):
         else:
             del self.callbacks[namespace][id]
         if callback is not None:
-            if asyncio.iscoroutinefunction(callback):
+            if inspect.iscoroutinefunction(callback):
                 await callback(*data)
             else:
                 callback(*data)
@@ -448,6 +453,7 @@ async def _handle_error(self, namespace, data):
         elif not isinstance(data, (tuple, list)):
             data = (data,)
         await self._trigger_event('connect_error', namespace, *data)
+        self.failed_namespaces.append(namespace)
         self._connect_event.set()
         if namespace in self.namespaces:
             del self.namespaces[namespace]
@@ -460,7 +466,7 @@ async def _trigger_event(self, event, namespace, *args):
         # first see if we have an explicit handler for the event
         handler, args = self._get_event_handler(event, namespace, args)
         if handler:
-            if asyncio.iscoroutinefunction(handler):
+            if inspect.iscoroutinefunction(handler):
                 try:
                     try:
                         ret = await handler(*args)
@@ -485,7 +491,7 @@ async def _trigger_event(self, event, namespace, *args):
                         raise
             return ret
 
-        # or else, forward the event to a namepsace handler if one exists
+        # or else, forward the event to a namespace handler if one exists
         handler, args = self._get_namespace_handler(namespace, args)
         if handler:
             return await handler.trigger_event(event, *args)
diff --git a/libs/socketio/async_manager.py b/libs/socketio/async_manager.py
index 47e7a79fc4..19028b040f 100644
--- a/libs/socketio/async_manager.py
+++ b/libs/socketio/async_manager.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 
 from engineio import packet as eio_packet
 from socketio import packet
@@ -113,7 +114,7 @@ async def trigger_callback(self, sid, id, data):
             del self.callbacks[sid][id]
         if callback is not None:
             ret = callback(*data)
-            if asyncio.iscoroutine(ret):
+            if inspect.iscoroutine(ret):
                 try:
                     await ret
                 except asyncio.CancelledError:  # pragma: no cover
diff --git a/libs/socketio/async_namespace.py b/libs/socketio/async_namespace.py
index 42d650892e..4035e33627 100644
--- a/libs/socketio/async_namespace.py
+++ b/libs/socketio/async_namespace.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 
 from socketio import base_namespace
 
@@ -32,7 +33,7 @@ async def trigger_event(self, event, *args):
         handler_name = 'on_' + (event or '')
         if hasattr(self, handler_name):
             handler = getattr(self, handler_name)
-            if asyncio.iscoroutinefunction(handler) is True:
+            if inspect.iscoroutinefunction(handler) is True:
                 try:
                     try:
                         ret = await handler(*args)
@@ -213,7 +214,7 @@ async def trigger_event(self, event, *args):
         handler_name = 'on_' + (event or '')
         if hasattr(self, handler_name):
             handler = getattr(self, handler_name)
-            if asyncio.iscoroutinefunction(handler) is True:
+            if inspect.iscoroutinefunction(handler) is True:
                 try:
                     try:
                         ret = await handler(*args)
diff --git a/libs/socketio/async_pubsub_manager.py b/libs/socketio/async_pubsub_manager.py
index 72946eb227..b29e521d67 100644
--- a/libs/socketio/async_pubsub_manager.py
+++ b/libs/socketio/async_pubsub_manager.py
@@ -1,11 +1,10 @@
 import asyncio
+import base64
 from functools import partial
 import uuid
 
-from engineio import json
-import pickle
-
 from .async_manager import AsyncManager
+from .packet import Packet
 
 
 class AsyncPubSubManager(AsyncManager):
@@ -21,15 +20,31 @@ class AsyncPubSubManager(AsyncManager):
 
     :param channel: The channel name on which the server sends and receives
                     notifications.
+    :param write_only: If set to ``True``, only initialize to emit events. The
+                       default of ``False`` initializes the class for emitting
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     """
     name = 'asyncpubsub'
 
-    def __init__(self, channel='socketio', write_only=False, logger=None):
+    def __init__(self, channel='socketio', write_only=False, logger=None,
+                 json=None):
         super().__init__()
         self.channel = channel
         self.write_only = write_only
         self.host_id = uuid.uuid4().hex
         self.logger = logger
+        if json is not None:
+            self.json = json
 
     def initialize(self):
         super().initialize()
@@ -65,8 +80,16 @@ async def emit(self, event, data, namespace=None, room=None, skip_sid=None,
             callback = (room, namespace, id)
         else:
             callback = None
+        if isinstance(data, tuple):
+            data = list(data)
+        else:
+            data = [data]
+        binary = Packet.data_is_binary(data)
+        if binary:
+            data, attachments = Packet.deconstruct_binary(data)
+            data = [data, *[base64.b64encode(a).decode() for a in attachments]]
         message = {'method': 'emit', 'event': event, 'data': data,
-                   'namespace': namespace, 'room': room,
+                   'binary': binary, 'namespace': namespace, 'room': room,
                    'skip_sid': skip_sid, 'callback': callback,
                    'host_id': self.host_id}
         await self._handle_emit(message)  # handle in this host
@@ -146,7 +169,16 @@ async def _handle_emit(self, message):
                                *remote_callback)
         else:
             callback = None
-        await super().emit(message['event'], message['data'],
+        data = message['data']
+        if message.get('binary'):
+            attachments = [base64.b64decode(a) for a in data[1:]]
+            data = Packet.reconstruct_binary(data[0], attachments)
+        if isinstance(data, list):
+            if len(data) == 1:
+                data = data[0]
+            else:
+                data = tuple(data)
+        await super().emit(message['event'], data,
                            namespace=message.get('namespace'),
                            room=message.get('room'),
                            skip_sid=message.get('skip_sid'),
@@ -202,16 +234,10 @@ async def _thread(self):
                     if isinstance(message, dict):
                         data = message
                     else:
-                        if isinstance(message, bytes):  # pragma: no cover
-                            try:
-                                data = pickle.loads(message)
-                            except:
-                                pass
-                        if data is None:
-                            try:
-                                data = json.loads(message)
-                            except:
-                                pass
+                        try:
+                            data = self.json.loads(message)
+                        except:
+                            pass
                     if data and 'method' in data:
                         self._get_logger().debug('pubsub message: {}'.format(
                             data['method']))
diff --git a/libs/socketio/async_redis_manager.py b/libs/socketio/async_redis_manager.py
index e039c6e92f..862e61045e 100644
--- a/libs/socketio/async_redis_manager.py
+++ b/libs/socketio/async_redis_manager.py
@@ -1,7 +1,7 @@
 import asyncio
-import pickle
+from urllib.parse import urlparse
 
-try:  # pragma: no cover
+try:
     from redis import asyncio as aioredis
     from redis.exceptions import RedisError
 except ImportError:  # pragma: no cover
@@ -12,10 +12,18 @@
         aioredis = None
         RedisError = None
 
+try:
+    from valkey import asyncio as aiovalkey
+    from valkey.exceptions import ValkeyError
+except ImportError:  # pragma: no cover
+    aiovalkey = None
+    ValkeyError = None
+
 from .async_pubsub_manager import AsyncPubSubManager
+from .redis_manager import parse_redis_sentinel_url
 
 
-class AsyncRedisManager(AsyncPubSubManager):  # pragma: no cover
+class AsyncRedisManager(AsyncPubSubManager):
     """Redis based client manager for asyncio servers.
 
     This class implements a Redis backend for event sharing across multiple
@@ -29,77 +37,137 @@ class AsyncRedisManager(AsyncPubSubManager):  # pragma: no cover
             client_manager=socketio.AsyncRedisManager(url))
 
     :param url: The connection URL for the Redis server. For a default Redis
-                store running on the same host, use ``redis://``.  To use an
-                SSL connection, use ``rediss://``.
+                store running on the same host, use ``redis://``.  To use a
+                TLS connection, use ``rediss://``. To use Redis Sentinel, use
+                ``redis+sentinel://`` with a comma-separated list of hosts
+                and the service name after the db in the URL path. Example:
+                ``redis+sentinel://user:pw@host1:1234,host2:2345/0/myredis``.
     :param channel: The channel name on which the server sends and receives
                     notifications. Must be the same in all the servers.
     :param write_only: If set to ``True``, only initialize to emit events. The
                        default of ``False`` initializes the class for emitting
-                       and receiving.
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     :param redis_options: additional keyword arguments to be passed to
-                          ``aioredis.from_url()``.
+                          ``Redis.from_url()`` or ``Sentinel()``.
     """
     name = 'aioredis'
 
     def __init__(self, url='redis://localhost:6379/0', channel='socketio',
-                 write_only=False, logger=None, redis_options=None):
-        if aioredis is None:
-            raise RuntimeError('Redis package is not installed '
-                               '(Run "pip install redis" in your virtualenv).')
-        if not hasattr(aioredis.Redis, 'from_url'):
+                 write_only=False, logger=None, json=None, redis_options=None):
+        if aioredis and \
+                not hasattr(aioredis.Redis, 'from_url'):  # pragma: no cover
             raise RuntimeError('Version 2 of aioredis package is required.')
+        super().__init__(channel=channel, write_only=write_only, logger=logger,
+                         json=json)
         self.redis_url = url
         self.redis_options = redis_options or {}
-        self._redis_connect()
-        super().__init__(channel=channel, write_only=write_only, logger=logger)
+        self.connected = False
+        self.redis = None
+        self.pubsub = None
+
+    def _get_redis_module_and_error(self):
+        parsed_url = urlparse(self.redis_url)
+        scheme = parsed_url.scheme.split('+', 1)[0].lower()
+        if scheme in ['redis', 'rediss']:
+            if aioredis is None or RedisError is None:
+                raise RuntimeError('Redis package is not installed '
+                                   '(Run "pip install redis" '
+                                   'in your virtualenv).')
+            return aioredis, RedisError
+        if scheme in ['valkey', 'valkeys']:
+            if aiovalkey is None or ValkeyError is None:
+                raise RuntimeError('Valkey package is not installed '
+                                   '(Run "pip install valkey" '
+                                   'in your virtualenv).')
+            return aiovalkey, ValkeyError
+        if scheme == 'unix':
+            if aioredis is None or RedisError is None:
+                if aiovalkey is None or ValkeyError is None:
+                    raise RuntimeError('Redis package is not installed '
+                                       '(Run "pip install redis" '
+                                       'or "pip install valkey" '
+                                       'in your virtualenv).')
+                else:
+                    return aiovalkey, ValkeyError
+            else:
+                return aioredis, RedisError
+        error_msg = f'Unsupported Redis URL scheme: {scheme}'
+        raise ValueError(error_msg)
 
     def _redis_connect(self):
-        self.redis = aioredis.Redis.from_url(self.redis_url,
-                                             **self.redis_options)
+        module, _ = self._get_redis_module_and_error()
+        parsed_url = urlparse(self.redis_url)
+        if parsed_url.scheme in {"redis+sentinel", "valkey+sentinel"}:
+            sentinels, service_name, connection_kwargs = \
+                parse_redis_sentinel_url(self.redis_url)
+            kwargs = self.redis_options
+            kwargs.update(connection_kwargs)
+            sentinel = module.sentinel.Sentinel(sentinels, **kwargs)
+            self.redis = sentinel.master_for(service_name or self.channel)
+        else:
+            self.redis = module.Redis.from_url(self.redis_url,
+                                               **self.redis_options)
         self.pubsub = self.redis.pubsub(ignore_subscribe_messages=True)
+        self.connected = True
 
-    async def _publish(self, data):
-        retry = True
-        while True:
+    async def _publish(self, data):  # pragma: no cover
+        _, error = self._get_redis_module_and_error()
+        for retries_left in range(1, -1, -1):  # 2 attempts
             try:
-                if not retry:
+                if not self.connected:
                     self._redis_connect()
                 return await self.redis.publish(
-                    self.channel, pickle.dumps(data))
-            except RedisError:
-                if retry:
-                    self._get_logger().error('Cannot publish to redis... '
-                                             'retrying')
-                    retry = False
+                    self.channel, self.json.dumps(data))
+            except error as exc:
+                if retries_left > 0:
+                    self._get_logger().error(
+                        'Cannot publish to redis... '
+                        'retrying',
+                        extra={"redis_exception": str(exc)})
+                    self.connected = False
                 else:
-                    self._get_logger().error('Cannot publish to redis... '
-                                             'giving up')
+                    self._get_logger().error(
+                        'Cannot publish to redis... '
+                        'giving up',
+                        extra={"redis_exception": str(exc)})
+
                     break
 
-    async def _redis_listen_with_retries(self):
+    async def _redis_listen_with_retries(self):  # pragma: no cover
+        _, error = self._get_redis_module_and_error()
         retry_sleep = 1
-        connect = False
+        subscribed = False
         while True:
             try:
-                if connect:
+                if not subscribed:
                     self._redis_connect()
                     await self.pubsub.subscribe(self.channel)
                     retry_sleep = 1
                 async for message in self.pubsub.listen():
                     yield message
-            except RedisError:
+            except error as exc:
                 self._get_logger().error('Cannot receive from redis... '
                                          'retrying in '
-                                         '{} secs'.format(retry_sleep))
-                connect = True
+                                         f'{retry_sleep} secs',
+                                         extra={"redis_exception": str(exc)})
+                subscribed = False
                 await asyncio.sleep(retry_sleep)
                 retry_sleep *= 2
                 if retry_sleep > 60:
                     retry_sleep = 60
 
-    async def _listen(self):
+    async def _listen(self):  # pragma: no cover
         channel = self.channel.encode('utf-8')
-        await self.pubsub.subscribe(self.channel)
         async for message in self._redis_listen_with_retries():
             if message['channel'] == channel and \
                     message['type'] == 'message' and 'data' in message:
diff --git a/libs/socketio/async_server.py b/libs/socketio/async_server.py
index f10fb8aee1..733d6e94c9 100644
--- a/libs/socketio/async_server.py
+++ b/libs/socketio/async_server.py
@@ -1,4 +1,5 @@
 import asyncio
+import inspect
 
 import engineio
 
@@ -27,10 +28,11 @@ class AsyncServer(base_server.BaseServer):
     :param logger: To enable logging set to ``True`` or pass a logger object to
                    use. To disable logging set to ``False``. Note that fatal
                    errors are logged even when ``logger`` is ``False``.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, event handlers for a client are
                            executed in separate threads. To run handlers for a
                            client synchronously, set to ``False``. The default
@@ -373,15 +375,15 @@ def session(self, sid, namespace=None):
         context manager block are saved back to the session. Example usage::
 
             @eio.on('connect')
-            def on_connect(sid, environ):
+            async def on_connect(sid, environ):
                 username = authenticate_user(environ)
                 if not username:
                     return False
-                with eio.session(sid) as session:
+                async with eio.session(sid) as session:
                     session['username'] = username
 
             @eio.on('message')
-            def on_message(sid, msg):
+            async def on_message(sid, msg):
                 async with eio.session(sid) as session:
                     print('received message from ', session['username'])
         """
@@ -561,6 +563,9 @@ async def _handle_connect(self, eio_sid, namespace, data):
         except exceptions.ConnectionRefusedError as exc:
             fail_reason = exc.error_args
             success = False
+        except ConnectionRefusedError:
+            fail_reason = {"message": "Connection refused by server"}
+            success = False
 
         if success is False:
             if self.always_connect:
@@ -634,7 +639,7 @@ async def _trigger_event(self, event, namespace, *args):
         # first see if we have an explicit handler for the event
         handler, args = self._get_event_handler(event, namespace, args)
         if handler:
-            if asyncio.iscoroutinefunction(handler):
+            if inspect.iscoroutinefunction(handler):
                 try:
                     try:
                         ret = await handler(*args)
diff --git a/libs/socketio/async_simple_client.py b/libs/socketio/async_simple_client.py
index c6cd4fc115..a4d0928d98 100644
--- a/libs/socketio/async_simple_client.py
+++ b/libs/socketio/async_simple_client.py
@@ -12,6 +12,8 @@ class AsyncSimpleClient:
     The positional and keyword arguments given in the constructor are passed
     to the underlying :func:`socketio.AsyncClient` object.
     """
+    client_class = AsyncClient
+
     def __init__(self, *args, **kwargs):
         self.client_args = args
         self.client_kwargs = kwargs
@@ -60,7 +62,8 @@ async def connect(self, url, headers={}, auth=None, transports=None,
         self.namespace = namespace
         self.input_buffer = []
         self.input_event.clear()
-        self.client = AsyncClient(*self.client_args, **self.client_kwargs)
+        self.client = self.client_class(
+            *self.client_args, **self.client_kwargs)
 
         @self.client.event(namespace=self.namespace)
         def connect():  # pragma: no cover
@@ -102,7 +105,7 @@ def transport(self):
         The transport is returned as a string and can be one of ``polling``
         and ``websocket``.
         """
-        return self.client.transport if self.client else ''
+        return self.client.transport() if self.client else ''
 
     async def emit(self, event, data=None):
         """Emit an event to the server.
@@ -160,6 +163,8 @@ async def call(self, event, data=None, timeout=60):
                 return await self.client.call(event, data,
                                               namespace=self.namespace,
                                               timeout=timeout)
+            except TimeoutError:
+                raise
             except SocketIOError:
                 pass
 
diff --git a/libs/socketio/base_client.py b/libs/socketio/base_client.py
index 7bf442071c..0232dca7c9 100644
--- a/libs/socketio/base_client.py
+++ b/libs/socketio/base_client.py
@@ -93,6 +93,7 @@ def __init__(self, reconnection=True, reconnection_attempts=0,
 
         self.connected = False  #: Indicates if the client is connected or not.
         self.namespaces = {}  #: set of connected namespaces.
+        self.failed_namespaces = []
         self.handlers = {}
         self.namespace_handlers = {}
         self.callbacks = {}
diff --git a/libs/socketio/base_manager.py b/libs/socketio/base_manager.py
index dafa60ac24..7b092ead6a 100644
--- a/libs/socketio/base_manager.py
+++ b/libs/socketio/base_manager.py
@@ -1,5 +1,6 @@
 import itertools
 import logging
+import json
 
 from bidict import bidict, ValueDuplicationError
 
@@ -14,9 +15,11 @@ def __init__(self):
         self.eio_to_sid = {}
         self.callbacks = {}
         self.pending_disconnect = {}
+        self.json = json
 
     def set_server(self, server):
         self.server = server
+        self.json = self.server.packet_class.json  # use the global JSON module
 
     def initialize(self):
         """Invoked before the first request is received. Subclasses can add
@@ -29,7 +32,13 @@ def get_namespaces(self):
         return self.rooms.keys()
 
     def get_participants(self, namespace, room):
-        """Return an iterable with the active participants in a room."""
+        """Return an iterable with the active participants in a room.
+
+        Note that in a multi-server scenario this method only returns the
+        participants connect to the server in which the method is called. There
+        is currently no functionality to assemble a complete list of users
+        across multiple servers.
+        """
         ns = self.rooms.get(namespace, {})
         if hasattr(room, '__len__') and not isinstance(room, str):
             participants = ns[room[0]]._fwdm.copy() if room[0] in ns else {}
diff --git a/libs/socketio/client.py b/libs/socketio/client.py
index ade2dd6f12..8f38316e49 100644
--- a/libs/socketio/client.py
+++ b/libs/socketio/client.py
@@ -39,10 +39,11 @@ class Client(base_client.BaseClient):
                        of the ``encode()`` and ``decode()`` methods can be
                        provided. Client and server must use compatible
                        serializers.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param handle_sigint: Set to ``True`` to automatically handle disconnection
                           when the process is interrupted, or to ``False`` to
                           leave interrupt handling to the calling application.
@@ -137,6 +138,7 @@ def connect(self, url, headers={}, auth=None, transports=None,
             namespaces = [namespaces]
         self.connection_namespaces = namespaces
         self.namespaces = {}
+        self.failed_namespaces = []
         if self._connect_event is None:
             self._connect_event = self.eio.create_event()
         else:
@@ -156,17 +158,19 @@ def connect(self, url, headers={}, auth=None, transports=None,
                 self._handle_reconnect()
                 if self.eio.state == 'connected':
                     return
-            raise exceptions.ConnectionError(exc.args[0]) from None
+            raise exceptions.ConnectionError(exc.args[0]) from exc
 
         if wait:
             while self._connect_event.wait(timeout=wait_timeout):
                 self._connect_event.clear()
-                if set(self.namespaces) == set(self.connection_namespaces):
+                if len(self.namespaces) + len(self.failed_namespaces) == \
+                        len(self.connection_namespaces):
                     break
             if set(self.namespaces) != set(self.connection_namespaces):
                 self.disconnect()
                 raise exceptions.ConnectionError(
-                    'One or more namespaces failed to connect')
+                    'One or more namespaces failed to connect: '
+                    + ', '.join(self.failed_namespaces))
 
         self.connected = True
 
@@ -306,7 +310,7 @@ def disconnect(self):
         for n in self.namespaces:
             self._send_packet(self.packet_class(
                 packet.DISCONNECT, namespace=n))
-        self.eio.disconnect(abort=True)
+        self.eio.disconnect()
 
     def shutdown(self):
         """Stop the client.
@@ -384,7 +388,7 @@ def _handle_disconnect(self, namespace):
             del self.namespaces[namespace]
         if not self.namespaces:
             self.connected = False
-            self.eio.disconnect(abort=True)
+            self.eio.disconnect()
 
     def _handle_event(self, namespace, id, data):
         namespace = namespace or '/'
@@ -425,6 +429,7 @@ def _handle_error(self, namespace, data):
         elif not isinstance(data, (tuple, list)):
             data = (data,)
         self._trigger_event('connect_error', namespace, *data)
+        self.failed_namespaces.append(namespace)
         self._connect_event.set()
         if namespace in self.namespaces:
             del self.namespaces[namespace]
@@ -439,7 +444,7 @@ def _trigger_event(self, event, namespace, *args):
         if handler:
             try:
                 return handler(*args)
-            except TypeError:
+            except TypeError:  # pragma: no cover
                 # the legacy disconnect event does not take a reason argument
                 if event == 'disconnect':
                     return handler(*args[:-1])
diff --git a/libs/socketio/kafka_manager.py b/libs/socketio/kafka_manager.py
index 11b87ad817..afa28ff93d 100644
--- a/libs/socketio/kafka_manager.py
+++ b/libs/socketio/kafka_manager.py
@@ -1,5 +1,4 @@
 import logging
-import pickle
 
 try:
     import kafka
@@ -32,18 +31,29 @@ class KafkaManager(PubSubManager):  # pragma: no cover
                     servers.
     :param write_only: If set to ``True``, only initialize to emit events. The
                        default of ``False`` initializes the class for emitting
-                       and receiving.
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     """
     name = 'kafka'
 
     def __init__(self, url='kafka://localhost:9092', channel='socketio',
-                 write_only=False):
+                 write_only=False, logger=None, json=None):
         if kafka is None:
             raise RuntimeError('kafka-python package is not installed '
                                '(Run "pip install kafka-python" in your '
                                'virtualenv).')
 
-        super().__init__(channel=channel, write_only=write_only)
+        super().__init__(channel=channel, write_only=write_only, logger=logger,
+                         json=json)
 
         urls = [url] if isinstance(url, str) else url
         self.kafka_urls = [url[8:] if url != 'kafka://' else 'localhost:9092'
@@ -53,7 +63,7 @@ def __init__(self, url='kafka://localhost:9092', channel='socketio',
                                             bootstrap_servers=self.kafka_urls)
 
     def _publish(self, data):
-        self.producer.send(self.channel, value=pickle.dumps(data))
+        self.producer.send(self.channel, value=self.json.dumps(data))
         self.producer.flush()
 
     def _kafka_listen(self):
@@ -62,4 +72,4 @@ def _kafka_listen(self):
     def _listen(self):
         for message in self._kafka_listen():
             if message.topic == self.channel:
-                yield pickle.loads(message.value)
+                yield message.value
diff --git a/libs/socketio/kombu_manager.py b/libs/socketio/kombu_manager.py
index 09e260c982..d17505e8e4 100644
--- a/libs/socketio/kombu_manager.py
+++ b/libs/socketio/kombu_manager.py
@@ -1,4 +1,3 @@
-import pickle
 import time
 import uuid
 
@@ -34,7 +33,17 @@ class KombuManager(PubSubManager):  # pragma: no cover
                     notifications. Must be the same in all the servers.
     :param write_only: If set to ``True``, only initialize to emit events. The
                        default of ``False`` initializes the class for emitting
-                       and receiving.
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     :param connection_options: additional keyword arguments to be passed to
                                ``kombu.Connection()``.
     :param exchange_options: additional keyword arguments to be passed to
@@ -47,14 +56,15 @@ class KombuManager(PubSubManager):  # pragma: no cover
     name = 'kombu'
 
     def __init__(self, url='amqp://guest:guest@localhost:5672//',
-                 channel='socketio', write_only=False, logger=None,
+                 channel='socketio', write_only=False, logger=None, json=None,
                  connection_options=None, exchange_options=None,
                  queue_options=None, producer_options=None):
         if kombu is None:
             raise RuntimeError('Kombu package is not installed '
                                '(Run "pip install kombu" in your '
                                'virtualenv).')
-        super().__init__(channel=channel, write_only=write_only, logger=logger)
+        super().__init__(channel=channel, write_only=write_only, logger=logger,
+                         json=json)
         self.url = url
         self.connection_options = connection_options or {}
         self.exchange_options = exchange_options or {}
@@ -102,7 +112,7 @@ def _publish(self, data):
             try:
                 producer_publish = self._producer_publish(
                     self.publisher_connection)
-                producer_publish(pickle.dumps(data))
+                producer_publish(self.json.dumps(data))
                 break
             except (OSError, kombu.exceptions.KombuError):
                 if retry:
@@ -115,10 +125,10 @@ def _publish(self, data):
                     break
 
     def _listen(self):
-        reader_queue = self._queue()
         retry_sleep = 1
         while True:
             try:
+                reader_queue = self._queue()
                 with self._connection() as connection:
                     with connection.SimpleQueue(reader_queue) as queue:
                         while True:
diff --git a/libs/socketio/msgpack_packet.py b/libs/socketio/msgpack_packet.py
index 27462634ad..732d188218 100644
--- a/libs/socketio/msgpack_packet.py
+++ b/libs/socketio/msgpack_packet.py
@@ -4,14 +4,40 @@
 
 class MsgPackPacket(packet.Packet):
     uses_binary_events = False
+    dumps_default = None
+    ext_hook = msgpack.ExtType
+
+    @classmethod
+    def configure(cls, dumps_default=None, ext_hook=msgpack.ExtType):
+        """Change the default options for msgpack encoding and decoding.
+
+        :param dumps_default: a function called for objects that cannot be
+                              serialized by default msgpack. The function
+                              receives one argument, the object to serialize.
+                              It should return a serializable object or a
+                              ``msgpack.ExtType`` instance.
+        :param ext_hook: a function called when a ``msgpack.ExtType`` object is
+                         seen during decoding. The function receives two
+                         arguments, the code and the data. It should return the
+                         decoded object.
+        """
+        class CustomMsgPackPacket(MsgPackPacket):
+            dumps_default = None
+            ext_hook = None
+
+        CustomMsgPackPacket.dumps_default = dumps_default
+        CustomMsgPackPacket.ext_hook = ext_hook
+        return CustomMsgPackPacket
 
     def encode(self):
         """Encode the packet for transmission."""
-        return msgpack.dumps(self._to_dict())
+        return msgpack.dumps(self._to_dict(),
+                             default=self.__class__.dumps_default)
 
     def decode(self, encoded_packet):
         """Decode a transmitted package."""
-        decoded = msgpack.loads(encoded_packet)
+        decoded = msgpack.loads(encoded_packet,
+                                ext_hook=self.__class__.ext_hook)
         self.packet_type = decoded['type']
         self.data = decoded.get('data')
         self.id = decoded.get('id')
diff --git a/libs/socketio/packet.py b/libs/socketio/packet.py
index f7ad87e653..101455ea21 100644
--- a/libs/socketio/packet.py
+++ b/libs/socketio/packet.py
@@ -29,7 +29,7 @@ def __init__(self, packet_type=EVENT, data=None, namespace=None, id=None,
         self.namespace = namespace
         self.id = id
         if self.uses_binary_events and \
-                (binary or (binary is None and self._data_is_binary(
+                (binary or (binary is None and self.data_is_binary(
                     self.data))):
             if self.packet_type == EVENT:
                 self.packet_type = BINARY_EVENT
@@ -51,7 +51,7 @@ def encode(self):
         """
         encoded_packet = str(self.packet_type)
         if self.packet_type == BINARY_EVENT or self.packet_type == BINARY_ACK:
-            data, attachments = self._deconstruct_binary(self.data)
+            data, attachments = self.deconstruct_binary(self.data)
             encoded_packet += str(len(attachments)) + '-'
         else:
             data = self.data
@@ -119,61 +119,65 @@ def add_attachment(self, attachment):
             raise ValueError('Unexpected binary attachment')
         self.attachments.append(attachment)
         if self.attachment_count == len(self.attachments):
-            self.reconstruct_binary(self.attachments)
+            self.data = self.reconstruct_binary(self.data, self.attachments)
             return True
         return False
 
-    def reconstruct_binary(self, attachments):
+    @classmethod
+    def reconstruct_binary(cls, data, attachments):
         """Reconstruct a decoded packet using the given list of binary
         attachments.
         """
-        self.data = self._reconstruct_binary_internal(self.data,
-                                                      self.attachments)
+        return cls._reconstruct_binary_internal(data, attachments)
 
-    def _reconstruct_binary_internal(self, data, attachments):
+    @classmethod
+    def _reconstruct_binary_internal(cls, data, attachments):
         if isinstance(data, list):
-            return [self._reconstruct_binary_internal(item, attachments)
+            return [cls._reconstruct_binary_internal(item, attachments)
                     for item in data]
         elif isinstance(data, dict):
             if data.get('_placeholder') and 'num' in data:
                 return attachments[data['num']]
             else:
-                return {key: self._reconstruct_binary_internal(value,
-                                                               attachments)
+                return {key: cls._reconstruct_binary_internal(value,
+                                                              attachments)
                         for key, value in data.items()}
         else:
             return data
 
-    def _deconstruct_binary(self, data):
+    @classmethod
+    def deconstruct_binary(cls, data):
         """Extract binary components in the packet."""
         attachments = []
-        data = self._deconstruct_binary_internal(data, attachments)
+        data = cls._deconstruct_binary_internal(data, attachments)
         return data, attachments
 
-    def _deconstruct_binary_internal(self, data, attachments):
-        if isinstance(data, bytes):
+    @classmethod
+    def _deconstruct_binary_internal(cls, data, attachments):
+        if isinstance(data, (bytes, bytearray)):
             attachments.append(data)
             return {'_placeholder': True, 'num': len(attachments) - 1}
         elif isinstance(data, list):
-            return [self._deconstruct_binary_internal(item, attachments)
+            return [cls._deconstruct_binary_internal(item, attachments)
                     for item in data]
         elif isinstance(data, dict):
-            return {key: self._deconstruct_binary_internal(value, attachments)
+            return {key: cls._deconstruct_binary_internal(value, attachments)
                     for key, value in data.items()}
         else:
             return data
 
-    def _data_is_binary(self, data):
+    @classmethod
+    def data_is_binary(cls, data):
         """Check if the data contains binary components."""
-        if isinstance(data, bytes):
+        if isinstance(data, (bytes, bytearray)):
             return True
         elif isinstance(data, list):
             return functools.reduce(
-                lambda a, b: a or b, [self._data_is_binary(item)
+                lambda a, b: a or b, [cls.data_is_binary(item)
                                       for item in data], False)
         elif isinstance(data, dict):
             return functools.reduce(
-                lambda a, b: a or b, [self._data_is_binary(item)
+                lambda a, b: a or b, [cls.data_is_binary(item)
                                       for item in data.values()],
                 False)
         else:
diff --git a/libs/socketio/pubsub_manager.py b/libs/socketio/pubsub_manager.py
index 3270b4cb8d..9a77e3f6af 100644
--- a/libs/socketio/pubsub_manager.py
+++ b/libs/socketio/pubsub_manager.py
@@ -1,10 +1,9 @@
+import base64
 from functools import partial
 import uuid
 
-from engineio import json
-import pickle
-
 from .manager import Manager
+from .packet import Packet
 
 
 class PubSubManager(Manager):
@@ -20,15 +19,31 @@ class PubSubManager(Manager):
 
     :param channel: The channel name on which the server sends and receives
                     notifications.
+    :param write_only: If set to ``True``, only initialize to emit events. The
+                       default of ``False`` initializes the class for emitting
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     """
     name = 'pubsub'
 
-    def __init__(self, channel='socketio', write_only=False, logger=None):
+    def __init__(self, channel='socketio', write_only=False, logger=None,
+                 json=None):
         super().__init__()
         self.channel = channel
         self.write_only = write_only
         self.host_id = uuid.uuid4().hex
         self.logger = logger
+        if json is not None:
+            self.json = json
 
     def initialize(self):
         super().initialize()
@@ -62,8 +77,16 @@ def emit(self, event, data, namespace=None, room=None, skip_sid=None,
             callback = (room, namespace, id)
         else:
             callback = None
+        if isinstance(data, tuple):
+            data = list(data)
+        else:
+            data = [data]
+        binary = Packet.data_is_binary(data)
+        if binary:
+            data, attachments = Packet.deconstruct_binary(data)
+            data = [data, *[base64.b64encode(a).decode() for a in attachments]]
         message = {'method': 'emit', 'event': event, 'data': data,
-                   'namespace': namespace, 'room': room,
+                   'binary': binary, 'namespace': namespace, 'room': room,
                    'skip_sid': skip_sid, 'callback': callback,
                    'host_id': self.host_id}
         self._handle_emit(message)  # handle in this host
@@ -142,7 +165,16 @@ def _handle_emit(self, message):
                                *remote_callback)
         else:
             callback = None
-        super().emit(message['event'], message['data'],
+        data = message['data']
+        if message.get('binary'):
+            attachments = [base64.b64decode(a) for a in data[1:]]
+            data = Packet.reconstruct_binary(data[0], attachments)
+        if isinstance(data, list):
+            if len(data) == 1:
+                data = data[0]
+            else:
+                data = tuple(data)
+        super().emit(message['event'], data,
                      namespace=message.get('namespace'),
                      room=message.get('room'),
                      skip_sid=message.get('skip_sid'), callback=callback)
@@ -196,16 +228,10 @@ def _thread(self):
                     if isinstance(message, dict):
                         data = message
                     else:
-                        if isinstance(message, bytes):  # pragma: no cover
-                            try:
-                                data = pickle.loads(message)
-                            except:
-                                pass
-                        if data is None:
-                            try:
-                                data = json.loads(message)
-                            except:
-                                pass
+                        try:
+                            data = self.json.loads(message)
+                        except:
+                            pass
                     if data and 'method' in data:
                         self._get_logger().debug('pubsub message: {}'.format(
                             data['method']))
diff --git a/libs/socketio/redis_manager.py b/libs/socketio/redis_manager.py
index a16fb2c731..fb2e040044 100644
--- a/libs/socketio/redis_manager.py
+++ b/libs/socketio/redis_manager.py
@@ -1,18 +1,53 @@
 import logging
-import pickle
 import time
+from urllib.parse import urlparse
 
 try:
     import redis
-except ImportError:
+    from redis.exceptions import RedisError
+except ImportError:  # pragma: no cover
     redis = None
+    RedisError = None
+
+try:
+    import valkey
+    from valkey.exceptions import ValkeyError
+except ImportError:  # pragma: no cover
+    valkey = None
+    ValkeyError = None
 
 from .pubsub_manager import PubSubManager
 
 logger = logging.getLogger('socketio')
 
 
-class RedisManager(PubSubManager):  # pragma: no cover
+def parse_redis_sentinel_url(url):
+    """Parse a Redis Sentinel URL with the format:
+    redis+sentinel://[:password]@host1:port1,host2:port2,.../db/service_name
+    """
+    parsed_url = urlparse(url)
+    if parsed_url.scheme not in {'redis+sentinel', 'valkey+sentinel'}:
+        raise ValueError('Invalid Redis Sentinel URL')
+    sentinels = []
+    for host_port in parsed_url.netloc.split('@')[-1].split(','):
+        host, port = host_port.rsplit(':', 1)
+        sentinels.append((host, int(port)))
+    kwargs = {}
+    if parsed_url.username:
+        kwargs['username'] = parsed_url.username
+    if parsed_url.password:
+        kwargs['password'] = parsed_url.password
+    service_name = None
+    if parsed_url.path:
+        parts = parsed_url.path.split('/')
+        if len(parts) >= 2 and parts[1] != '':
+            kwargs['db'] = int(parts[1])
+        if len(parts) >= 3 and parts[2] != '':
+            service_name = parts[2]
+    return sentinels, service_name, kwargs
+
+
+class RedisManager(PubSubManager):
     """Redis based client manager.
 
     This class implements a Redis backend for event sharing across multiple
@@ -27,30 +62,42 @@ class RedisManager(PubSubManager):  # pragma: no cover
         server = socketio.Server(client_manager=socketio.RedisManager(url))
 
     :param url: The connection URL for the Redis server. For a default Redis
-                store running on the same host, use ``redis://``.  To use an
-                SSL connection, use ``rediss://``.
+                store running on the same host, use ``redis://``.  To use a
+                TLS connection, use ``rediss://``. To use Redis Sentinel, use
+                ``redis+sentinel://`` with a comma-separated list of hosts
+                and the service name after the db in the URL path. Example:
+                ``redis+sentinel://user:pw@host1:1234,host2:2345/0/myredis``.
     :param channel: The channel name on which the server sends and receives
                     notifications. Must be the same in all the servers.
     :param write_only: If set to ``True``, only initialize to emit events. The
                        default of ``False`` initializes the class for emitting
-                       and receiving.
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
     :param redis_options: additional keyword arguments to be passed to
-                          ``Redis.from_url()``.
+                          ``Redis.from_url()`` or ``Sentinel()``.
     """
     name = 'redis'
 
     def __init__(self, url='redis://localhost:6379/0', channel='socketio',
-                 write_only=False, logger=None, redis_options=None):
-        if redis is None:
-            raise RuntimeError('Redis package is not installed '
-                               '(Run "pip install redis" in your '
-                               'virtualenv).')
+                 write_only=False, logger=None, json=None, redis_options=None):
+        super().__init__(channel=channel, write_only=write_only, logger=logger,
+                         json=json)
         self.redis_url = url
         self.redis_options = redis_options or {}
-        self._redis_connect()
-        super().__init__(channel=channel, write_only=write_only, logger=logger)
+        self.connected = False
+        self.redis = None
+        self.pubsub = None
 
-    def initialize(self):
+    def initialize(self):  # pragma: no cover
         super().initialize()
 
         monkey_patched = True
@@ -65,48 +112,95 @@ def initialize(self):
                 'Redis requires a monkey patched socket library to work '
                 'with ' + self.server.async_mode)
 
+    def _get_redis_module_and_error(self):
+        parsed_url = urlparse(self.redis_url)
+        scheme = parsed_url.scheme.split('+', 1)[0].lower()
+        if scheme in ['redis', 'rediss']:
+            if redis is None or RedisError is None:
+                raise RuntimeError('Redis package is not installed '
+                                   '(Run "pip install redis" '
+                                   'in your virtualenv).')
+            return redis, RedisError
+        if scheme in ['valkey', 'valkeys']:
+            if valkey is None or ValkeyError is None:
+                raise RuntimeError('Valkey package is not installed '
+                                   '(Run "pip install valkey" '
+                                   'in your virtualenv).')
+            return valkey, ValkeyError
+        if scheme == 'unix':
+            if redis is None or RedisError is None:
+                if valkey is None or ValkeyError is None:
+                    raise RuntimeError('Redis package is not installed '
+                                       '(Run "pip install redis" '
+                                       'or "pip install valkey" '
+                                       'in your virtualenv).')
+                else:
+                    return valkey, ValkeyError
+            else:
+                return redis, RedisError
+        error_msg = f'Unsupported Redis URL scheme: {scheme}'
+        raise ValueError(error_msg)
+
     def _redis_connect(self):
-        self.redis = redis.Redis.from_url(self.redis_url,
-                                          **self.redis_options)
+        module, _ = self._get_redis_module_and_error()
+        parsed_url = urlparse(self.redis_url)
+        if parsed_url.scheme in {"redis+sentinel", "valkey+sentinel"}:
+            sentinels, service_name, connection_kwargs = \
+                parse_redis_sentinel_url(self.redis_url)
+            kwargs = self.redis_options
+            kwargs.update(connection_kwargs)
+            sentinel = module.sentinel.Sentinel(sentinels, **kwargs)
+            self.redis = sentinel.master_for(service_name or self.channel)
+        else:
+            self.redis = module.Redis.from_url(self.redis_url,
+                                               **self.redis_options)
         self.pubsub = self.redis.pubsub(ignore_subscribe_messages=True)
+        self.connected = True
 
-    def _publish(self, data):
-        retry = True
-        while True:
+    def _publish(self, data):  # pragma: no cover
+        _, error = self._get_redis_module_and_error()
+        for retries_left in range(1, -1, -1):  # 2 attempts
             try:
-                if not retry:
+                if not self.connected:
                     self._redis_connect()
-                return self.redis.publish(self.channel, pickle.dumps(data))
-            except redis.exceptions.RedisError:
-                if retry:
-                    logger.error('Cannot publish to redis... retrying')
-                    retry = False
+                return self.redis.publish(self.channel, self.json.dumps(data))
+            except error as exc:
+                if retries_left > 0:
+                    logger.error(
+                        'Cannot publish to redis... retrying',
+                        extra={"redis_exception": str(exc)}
+                    )
+                    self.connected = False
                 else:
-                    logger.error('Cannot publish to redis... giving up')
+                    logger.error(
+                        'Cannot publish to redis... giving up',
+                        extra={"redis_exception": str(exc)}
+                    )
                     break
 
-    def _redis_listen_with_retries(self):
+    def _redis_listen_with_retries(self):  # pragma: no cover
+        _, error = self._get_redis_module_and_error()
         retry_sleep = 1
-        connect = False
+        subscribed = False
         while True:
             try:
-                if connect:
+                if not subscribed:
                     self._redis_connect()
                     self.pubsub.subscribe(self.channel)
                     retry_sleep = 1
                 yield from self.pubsub.listen()
-            except redis.exceptions.RedisError:
+            except error as exc:
                 logger.error('Cannot receive from redis... '
-                             'retrying in {} secs'.format(retry_sleep))
-                connect = True
+                             f'retrying in {retry_sleep} secs',
+                             extra={"redis_exception": str(exc)})
+                subscribed = False
                 time.sleep(retry_sleep)
                 retry_sleep *= 2
                 if retry_sleep > 60:
                     retry_sleep = 60
 
-    def _listen(self):
+    def _listen(self):  # pragma: no cover
         channel = self.channel.encode('utf-8')
-        self.pubsub.subscribe(self.channel)
         for message in self._redis_listen_with_retries():
             if message['channel'] == channel and \
                     message['type'] == 'message' and 'data' in message:
diff --git a/libs/socketio/server.py b/libs/socketio/server.py
index 71c702de10..6a1a2026d6 100644
--- a/libs/socketio/server.py
+++ b/libs/socketio/server.py
@@ -30,10 +30,11 @@ class Server(base_server.BaseServer):
                        of the ``encode()`` and ``decode()`` methods can be
                        provided. Client and server must use compatible
                        serializers.
-    :param json: An alternative json module to use for encoding and decoding
+    :param json: An alternative JSON module to use for encoding and decoding
                  packets. Custom json modules must have ``dumps`` and ``loads``
                  functions that are compatible with the standard library
-                 versions.
+                 versions. This is a process-wide setting, all instantiated
+                 servers and clients must use the same JSON module.
     :param async_handlers: If set to ``True``, event handlers for a client are
                            executed in separate threads. To run handlers for a
                            client synchronously, set to ``False``. The default
@@ -543,6 +544,9 @@ def _handle_connect(self, eio_sid, namespace, data):
         except exceptions.ConnectionRefusedError as exc:
             fail_reason = exc.error_args
             success = False
+        except ConnectionRefusedError:
+            fail_reason = {"message": "Connection refused by server"}
+            success = False
 
         if success is False:
             if self.always_connect:
diff --git a/libs/socketio/simple_client.py b/libs/socketio/simple_client.py
index 6779147762..7e1a8a5b59 100644
--- a/libs/socketio/simple_client.py
+++ b/libs/socketio/simple_client.py
@@ -12,6 +12,8 @@ class SimpleClient:
     The positional and keyword arguments given in the constructor are passed
     to the underlying :func:`socketio.Client` object.
     """
+    client_class = Client
+
     def __init__(self, *args, **kwargs):
         self.client_args = args
         self.client_kwargs = kwargs
@@ -58,7 +60,8 @@ def connect(self, url, headers={}, auth=None, transports=None,
         self.namespace = namespace
         self.input_buffer = []
         self.input_event.clear()
-        self.client = Client(*self.client_args, **self.client_kwargs)
+        self.client = self.client_class(
+            *self.client_args, **self.client_kwargs)
 
         @self.client.event(namespace=self.namespace)
         def connect():  # pragma: no cover
@@ -100,7 +103,7 @@ def transport(self):
         The transport is returned as a string and can be one of ``polling``
         and ``websocket``.
         """
-        return self.client.transport if self.client else ''
+        return self.client.transport() if self.client else ''
 
     def emit(self, event, data=None):
         """Emit an event to the server.
@@ -152,6 +155,8 @@ def call(self, event, data=None, timeout=60):
             try:
                 return self.client.call(event, data, namespace=self.namespace,
                                         timeout=timeout)
+            except TimeoutError:
+                raise
             except SocketIOError:
                 pass
 
diff --git a/libs/socketio/zmq_manager.py b/libs/socketio/zmq_manager.py
index 468dc268b8..3fa1e1456e 100644
--- a/libs/socketio/zmq_manager.py
+++ b/libs/socketio/zmq_manager.py
@@ -1,4 +1,3 @@
-import pickle
 import re
 
 from .pubsub_manager import PubSubManager
@@ -23,7 +22,17 @@ class ZmqManager(PubSubManager):  # pragma: no cover
                     notifications. Must be the same in all the servers.
     :param write_only: If set to ``True``, only initialize to emit events. The
                        default of ``False`` initializes the class for emitting
-                       and receiving.
+                       and receiving. A write-only instance can be used
+                       independently of the server to emit to clients from an
+                       external process.
+    :param logger: a custom logger to log it. If not given, the server logger
+                   is used.
+    :param json: An alternative JSON module to use for encoding and decoding
+                 packets. Custom json modules must have ``dumps`` and ``loads``
+                 functions that are compatible with the standard library
+                 versions. This setting is only used when ``write_only`` is set
+                 to ``True``. Otherwise the JSON module configured in the
+                 server is used.
 
     A zmq message broker must be running for the zmq_manager to work.
     you can write your own or adapt one from the following simple broker
@@ -42,10 +51,8 @@ class ZmqManager(PubSubManager):  # pragma: no cover
     """
     name = 'zmq'
 
-    def __init__(self, url='zmq+tcp://localhost:5555+5556',
-                 channel='socketio',
-                 write_only=False,
-                 logger=None):
+    def __init__(self, url='zmq+tcp://localhost:5555+5556', channel='socketio',
+                 write_only=False, logger=None, json=None):
         try:
             from eventlet.green import zmq
         except ImportError:
@@ -57,6 +64,8 @@ def __init__(self, url='zmq+tcp://localhost:5555+5556',
         if not (url.startswith('zmq+tcp://') and r.search(url)):
             raise RuntimeError('unexpected connection string: ' + url)
 
+        super().__init__(channel=channel, write_only=write_only, logger=logger,
+                         json=json)
         url = url.replace('zmq+', '')
         (sink_url, sub_port) = url.split('+')
         sink_port = sink_url.split(':')[-1]
@@ -72,17 +81,16 @@ def __init__(self, url='zmq+tcp://localhost:5555+5556',
         self.sink = sink
         self.sub = sub
         self.channel = channel
-        super().__init__(channel=channel, write_only=write_only, logger=logger)
 
     def _publish(self, data):
-        pickled_data = pickle.dumps(
+        packed_data = self.json.dumps(
             {
                 'type': 'message',
                 'channel': self.channel,
                 'data': data
             }
-        )
-        return self.sink.send(pickled_data)
+        ).encode()
+        return self.sink.send(packed_data)
 
     def zmq_listen(self):
         while True:
@@ -94,7 +102,7 @@ def _listen(self):
         for message in self.zmq_listen():
             if isinstance(message, bytes):
                 try:
-                    message = pickle.loads(message)
+                    message = self.json.loads(message)
                 except Exception:
                     pass
             if isinstance(message, dict) and \
diff --git a/libs/soupsieve-2.3.2.post1.dist-info/METADATA b/libs/soupsieve-2.3.2.post1.dist-info/METADATA
index 0c2e17067f..3e4d93d91e 100644
--- a/libs/soupsieve-2.3.2.post1.dist-info/METADATA
+++ b/libs/soupsieve-2.3.2.post1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: soupsieve
 Version: 2.3.2.post1
 Summary: A modern CSS selector implementation for Beautiful Soup.
diff --git a/libs/soupsieve-2.3.2.post1.dist-info/RECORD b/libs/soupsieve-2.3.2.post1.dist-info/RECORD
index 2b13b9330e..dea2e43afd 100644
--- a/libs/soupsieve-2.3.2.post1.dist-info/RECORD
+++ b/libs/soupsieve-2.3.2.post1.dist-info/RECORD
@@ -1,8 +1,8 @@
 soupsieve-2.3.2.post1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-soupsieve-2.3.2.post1.dist-info/METADATA,sha256=VEZjsG1NqmGWu5L_aYIJMB9ytDcWWTi_f0QlaJ40AR4,5700
+soupsieve-2.3.2.post1.dist-info/METADATA,sha256=T564kvfwmPwbUqz2rEgA2HW1Zozp1WZbMFKxUNGRBoo,5700
 soupsieve-2.3.2.post1.dist-info/RECORD,,
 soupsieve-2.3.2.post1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-soupsieve-2.3.2.post1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+soupsieve-2.3.2.post1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
 soupsieve-2.3.2.post1.dist-info/licenses/LICENSE.md,sha256=vGYjTK3T9ueq9xYPrxZfP4af_IoRtrDWxEouKoMxTdA,1096
 soupsieve/__init__.py,sha256=_7J_eiqFvRzoGHZ9AW63f23OmTYLy9YsBQ53XsDbPgE,4717
 soupsieve/__meta__.py,sha256=l4sqBM7pDLTSCbaqZ8p_7FQn6RB5DcFRBeJKpAh5epQ,6817
diff --git a/libs/soupsieve-2.3.2.post1.dist-info/WHEEL b/libs/soupsieve-2.3.2.post1.dist-info/WHEEL
index cdd68a497c..ae8ec1bdaa 100644
--- a/libs/soupsieve-2.3.2.post1.dist-info/WHEEL
+++ b/libs/soupsieve-2.3.2.post1.dist-info/WHEEL
@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any
diff --git a/libs/semver-3.0.2.dist-info/INSTALLER b/libs/sqlalchemy-2.0.48.dist-info/INSTALLER
similarity index 100%
rename from libs/semver-3.0.2.dist-info/INSTALLER
rename to libs/sqlalchemy-2.0.48.dist-info/INSTALLER
diff --git a/libs/sqlalchemy-2.0.48.dist-info/METADATA b/libs/sqlalchemy-2.0.48.dist-info/METADATA
new file mode 100644
index 0000000000..d63401ebb2
--- /dev/null
+++ b/libs/sqlalchemy-2.0.48.dist-info/METADATA
@@ -0,0 +1,243 @@
+Metadata-Version: 2.4
+Name: SQLAlchemy
+Version: 2.0.48
+Summary: Database Abstraction Library
+Home-page: https://www.sqlalchemy.org
+Author: Mike Bayer
+Author-email: mike_mp@zzzcomputing.com
+License: MIT
+Project-URL: Documentation, https://docs.sqlalchemy.org
+Project-URL: Issue Tracker, https://github.com/sqlalchemy/sqlalchemy/
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Database :: Front-Ends
+Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: importlib-metadata; python_version < "3.8"
+Requires-Dist: greenlet>=1; platform_machine == "aarch64" or (platform_machine == "ppc64le" or (platform_machine == "x86_64" or (platform_machine == "amd64" or (platform_machine == "AMD64" or (platform_machine == "win32" or platform_machine == "WIN32")))))
+Requires-Dist: typing-extensions>=4.6.0
+Provides-Extra: asyncio
+Requires-Dist: greenlet>=1; extra == "asyncio"
+Provides-Extra: mypy
+Requires-Dist: mypy>=0.910; extra == "mypy"
+Provides-Extra: mssql
+Requires-Dist: pyodbc; extra == "mssql"
+Provides-Extra: mssql-pymssql
+Requires-Dist: pymssql; extra == "mssql-pymssql"
+Provides-Extra: mssql-pyodbc
+Requires-Dist: pyodbc; extra == "mssql-pyodbc"
+Provides-Extra: mysql
+Requires-Dist: mysqlclient>=1.4.0; extra == "mysql"
+Provides-Extra: mysql-connector
+Requires-Dist: mysql-connector-python; extra == "mysql-connector"
+Provides-Extra: mariadb-connector
+Requires-Dist: mariadb!=1.1.10,!=1.1.2,!=1.1.5,>=1.0.1; extra == "mariadb-connector"
+Provides-Extra: oracle
+Requires-Dist: cx_oracle>=8; extra == "oracle"
+Provides-Extra: oracle-oracledb
+Requires-Dist: oracledb>=1.0.1; extra == "oracle-oracledb"
+Provides-Extra: postgresql
+Requires-Dist: psycopg2>=2.7; extra == "postgresql"
+Provides-Extra: postgresql-pg8000
+Requires-Dist: pg8000>=1.29.1; extra == "postgresql-pg8000"
+Provides-Extra: postgresql-asyncpg
+Requires-Dist: greenlet>=1; extra == "postgresql-asyncpg"
+Requires-Dist: asyncpg; extra == "postgresql-asyncpg"
+Provides-Extra: postgresql-psycopg2binary
+Requires-Dist: psycopg2-binary; extra == "postgresql-psycopg2binary"
+Provides-Extra: postgresql-psycopg2cffi
+Requires-Dist: psycopg2cffi; extra == "postgresql-psycopg2cffi"
+Provides-Extra: postgresql-psycopg
+Requires-Dist: psycopg>=3.0.7; extra == "postgresql-psycopg"
+Provides-Extra: postgresql-psycopgbinary
+Requires-Dist: psycopg[binary]>=3.0.7; extra == "postgresql-psycopgbinary"
+Provides-Extra: pymysql
+Requires-Dist: pymysql; extra == "pymysql"
+Provides-Extra: aiomysql
+Requires-Dist: greenlet>=1; extra == "aiomysql"
+Requires-Dist: aiomysql>=0.2.0; extra == "aiomysql"
+Provides-Extra: aioodbc
+Requires-Dist: greenlet>=1; extra == "aioodbc"
+Requires-Dist: aioodbc; extra == "aioodbc"
+Provides-Extra: asyncmy
+Requires-Dist: greenlet>=1; extra == "asyncmy"
+Requires-Dist: asyncmy!=0.2.4,!=0.2.6,>=0.2.3; extra == "asyncmy"
+Provides-Extra: aiosqlite
+Requires-Dist: greenlet>=1; extra == "aiosqlite"
+Requires-Dist: aiosqlite; extra == "aiosqlite"
+Requires-Dist: typing_extensions!=3.10.0.1; extra == "aiosqlite"
+Provides-Extra: sqlcipher
+Requires-Dist: sqlcipher3_binary; extra == "sqlcipher"
+Dynamic: license-file
+
+SQLAlchemy
+==========
+
+|PyPI| |Python| |Downloads|
+
+.. |PyPI| image:: https://img.shields.io/pypi/v/sqlalchemy
+    :target: https://pypi.org/project/sqlalchemy
+    :alt: PyPI
+
+.. |Python| image:: https://img.shields.io/pypi/pyversions/sqlalchemy
+    :target: https://pypi.org/project/sqlalchemy
+    :alt: PyPI - Python Version
+
+.. |Downloads| image:: https://static.pepy.tech/badge/sqlalchemy/month
+    :target: https://pepy.tech/project/sqlalchemy
+    :alt: PyPI - Downloads
+
+
+The Python SQL Toolkit and Object Relational Mapper
+
+Introduction
+-------------
+
+SQLAlchemy is the Python SQL toolkit and Object Relational Mapper
+that gives application developers the full power and
+flexibility of SQL. SQLAlchemy provides a full suite
+of well known enterprise-level persistence patterns,
+designed for efficient and high-performing database
+access, adapted into a simple and Pythonic domain
+language.
+
+Major SQLAlchemy features include:
+
+* An industrial strength ORM, built
+  from the core on the identity map, unit of work,
+  and data mapper patterns.   These patterns
+  allow transparent persistence of objects
+  using a declarative configuration system.
+  Domain models
+  can be constructed and manipulated naturally,
+  and changes are synchronized with the
+  current transaction automatically.
+* A relationally-oriented query system, exposing
+  the full range of SQL's capabilities
+  explicitly, including joins, subqueries,
+  correlation, and most everything else,
+  in terms of the object model.
+  Writing queries with the ORM uses the same
+  techniques of relational composition you use
+  when writing SQL.  While you can drop into
+  literal SQL at any time, it's virtually never
+  needed.
+* A comprehensive and flexible system
+  of eager loading for related collections and objects.
+  Collections are cached within a session,
+  and can be loaded on individual access, all
+  at once using joins, or by query per collection
+  across the full result set.
+* A Core SQL construction system and DBAPI
+  interaction layer.  The SQLAlchemy Core is
+  separate from the ORM and is a full database
+  abstraction layer in its own right, and includes
+  an extensible Python-based SQL expression
+  language, schema metadata, connection pooling,
+  type coercion, and custom types.
+* All primary and foreign key constraints are
+  assumed to be composite and natural.  Surrogate
+  integer primary keys are of course still the
+  norm, but SQLAlchemy never assumes or hardcodes
+  to this model.
+* Database introspection and generation.  Database
+  schemas can be "reflected" in one step into
+  Python structures representing database metadata;
+  those same structures can then generate
+  CREATE statements right back out - all within
+  the Core, independent of the ORM.
+
+SQLAlchemy's philosophy:
+
+* SQL databases behave less and less like object
+  collections the more size and performance start to
+  matter; object collections behave less and less like
+  tables and rows the more abstraction starts to matter.
+  SQLAlchemy aims to accommodate both of these
+  principles.
+* An ORM doesn't need to hide the "R".   A relational
+  database provides rich, set-based functionality
+  that should be fully exposed.   SQLAlchemy's
+  ORM provides an open-ended set of patterns
+  that allow a developer to construct a custom
+  mediation layer between a domain model and
+  a relational schema, turning the so-called
+  "object relational impedance" issue into
+  a distant memory.
+* The developer, in all cases, makes all decisions
+  regarding the design, structure, and naming conventions
+  of both the object model as well as the relational
+  schema.   SQLAlchemy only provides the means
+  to automate the execution of these decisions.
+* With SQLAlchemy, there's no such thing as
+  "the ORM generated a bad query" - you
+  retain full control over the structure of
+  queries, including how joins are organized,
+  how subqueries and correlation is used, what
+  columns are requested.  Everything SQLAlchemy
+  does is ultimately the result of a developer-initiated 
+  decision.
+* Don't use an ORM if the problem doesn't need one.
+  SQLAlchemy consists of a Core and separate ORM
+  component.   The Core offers a full SQL expression
+  language that allows Pythonic construction
+  of SQL constructs that render directly to SQL
+  strings for a target database, returning
+  result sets that are essentially enhanced DBAPI
+  cursors.
+* Transactions should be the norm.  With SQLAlchemy's
+  ORM, nothing goes to permanent storage until
+  commit() is called.  SQLAlchemy encourages applications
+  to create a consistent means of delineating
+  the start and end of a series of operations.
+* Never render a literal value in a SQL statement.
+  Bound parameters are used to the greatest degree
+  possible, allowing query optimizers to cache
+  query plans effectively and making SQL injection
+  attacks a non-issue.
+
+Documentation
+-------------
+
+Latest documentation is at:
+
+https://www.sqlalchemy.org/docs/
+
+Installation / Requirements
+---------------------------
+
+Full documentation for installation is at
+`Installation <https://www.sqlalchemy.org/docs/intro.html#installation>`_.
+
+Getting Help / Development / Bug reporting
+------------------------------------------
+
+Please refer to the `SQLAlchemy Community Guide <https://www.sqlalchemy.org/support.html>`_.
+
+Code of Conduct
+---------------
+
+Above all, SQLAlchemy places great emphasis on polite, thoughtful, and
+constructive communication between users and developers.
+Please see our current Code of Conduct at
+`Code of Conduct <https://www.sqlalchemy.org/codeofconduct.html>`_.
+
+License
+-------
+
+SQLAlchemy is distributed under the `MIT license
+<https://www.opensource.org/licenses/mit-license.php>`_.
+
diff --git a/libs/sqlalchemy-2.0.48.dist-info/RECORD b/libs/sqlalchemy-2.0.48.dist-info/RECORD
new file mode 100644
index 0000000000..ef4736a57a
--- /dev/null
+++ b/libs/sqlalchemy-2.0.48.dist-info/RECORD
@@ -0,0 +1,276 @@
+sqlalchemy-2.0.48.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+sqlalchemy-2.0.48.dist-info/METADATA,sha256=nBJCWxsX7QVYe9cGsQ4hR91MPdghSODauUC-kaPE4Z4,9547
+sqlalchemy-2.0.48.dist-info/RECORD,,
+sqlalchemy-2.0.48.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sqlalchemy-2.0.48.dist-info/WHEEL,sha256=DkV-ntIm-3VWD87iCIyvXSz28ISStjMGlDRnHg-QlnQ,110
+sqlalchemy-2.0.48.dist-info/licenses/LICENSE,sha256=6GK7W5BPtVE8PhQojXoloS6w7MeEegqWXTEOmpVefLk,1100
+sqlalchemy-2.0.48.dist-info/top_level.txt,sha256=rp-ZgB7D8G11ivXON5VGPjupT1voYmWqkciDt5Uaw_Q,11
+sqlalchemy/__init__.py,sha256=MDNQDuSC42uiYH1uMEVPvB0l2Prw32i-j1_KRTz-Q4M,12659
+sqlalchemy/connectors/__init__.py,sha256=Gm6cQChPfkSAQckCgAcvPvxCDOFRujQefFYgccMBSpQ,476
+sqlalchemy/connectors/aioodbc.py,sha256=l486yddlVkVtC1YR2M2jP7dpUeKL3x01M6yyq0ARwfo,5577
+sqlalchemy/connectors/asyncio.py,sha256=RNFzIXv684F0FJuE05a-1QK_dpqYrUHwIiaUCO32n5s,13057
+sqlalchemy/connectors/pyodbc.py,sha256=IHuFnhH0tb5JiWscZF84ZK4eTqQp5dZsP7EXfDz2tXU,8618
+sqlalchemy/cyextension/__init__.py,sha256=ZiAVRvOcCS31zK0qNBweQu96I3YDT5LZHo-d9lA6oKE,244
+sqlalchemy/cyextension/collections.cpython-310-darwin.so,sha256=hLbUaclzvKttCv2AWpVuipVk3vuq8cbdhC-O2Fvg9y0,295120
+sqlalchemy/cyextension/collections.pyx,sha256=L7DZ3DGKpgw2MT2ZZRRxCnrcyE5pU1NAFowWgAzQPEc,12571
+sqlalchemy/cyextension/immutabledict.cpython-310-darwin.so,sha256=6Wn4nvtegg8vCxZ9ccVYGOM_kJckKlKLN5u_QAywVSU,133408
+sqlalchemy/cyextension/immutabledict.pxd,sha256=3x3-rXG5eRQ7bBnktZ-OJ9-6ft8zToPmTDOd92iXpB0,291
+sqlalchemy/cyextension/immutabledict.pyx,sha256=KfDTYbTfebstE8xuqAtuXsHNAK0_b5q_ymUiinUe_xs,3535
+sqlalchemy/cyextension/processors.cpython-310-darwin.so,sha256=wGFVlhQUPpMm6YgSnKwxDU2_MahRQPN8NZOMCsC1TuI,110848
+sqlalchemy/cyextension/processors.pyx,sha256=R1rHsGLEaGeBq5VeCydjClzYlivERIJ9B-XLOJlf2MQ,1792
+sqlalchemy/cyextension/resultproxy.cpython-310-darwin.so,sha256=AynbleYBU7AxnFWdOViDghu5XbHwTOumGuh6hc4CiKE,116752
+sqlalchemy/cyextension/resultproxy.pyx,sha256=eWLdyBXiBy_CLQrF5ScfWJm7X0NeelscSXedtj1zv9Q,2725
+sqlalchemy/cyextension/util.cpython-310-darwin.so,sha256=MrA5zqQzTJWj2Bhb4s9U6c0OBJtJq33ypFfEy19KQuI,135736
+sqlalchemy/cyextension/util.pyx,sha256=Tt5VwTUtO3YKQK2PHfYOLhV2Jr5GMRJcp2DzH4fjGOs,2569
+sqlalchemy/dialects/__init__.py,sha256=_Pls3JOH7T5S_K8CB5TSH3gYX360SNbQgg6AGZoczBI,1798
+sqlalchemy/dialects/_typing.py,sha256=KSJ6HjSP5MTiV-TVDKm42tSkVO-HEMbXcx8laNZPZMo,971
+sqlalchemy/dialects/mssql/__init__.py,sha256=-xWcOVCiTAogF2MigpaLNJEshbYQJOC8KUSR767_Xt0,1880
+sqlalchemy/dialects/mssql/aioodbc.py,sha256=rFbdJJ7sRx0VIyGC17wQRBBLdemZTXXo7zUQ-AZla5E,2021
+sqlalchemy/dialects/mssql/base.py,sha256=boXz0t4Oj2kDlhyHyILYlCAjkGJ1am84RV_6oFQE32k,134317
+sqlalchemy/dialects/mssql/information_schema.py,sha256=1FOgYP862FOSuy6Z9maGjfEwi-oiTRupU5soRtlAZWU,8963
+sqlalchemy/dialects/mssql/json.py,sha256=9CDNWSCvBMMQV_-vbqrxIgaoDK6PfvixJjPzERPkt8A,4756
+sqlalchemy/dialects/mssql/provision.py,sha256=2TPp4mI_nVUBizOGjw0tXhiDrFBQwC-5oxqeyxarPeE,6480
+sqlalchemy/dialects/mssql/pymssql.py,sha256=6s7nFd0QcbMuoJBJ-s4leOrF2_EXPncJjtdAL3UMNqQ,4097
+sqlalchemy/dialects/mssql/pyodbc.py,sha256=OtgY_eGYVPv2jJ7MASVQbIlaLFe5EPXeqpkbNnFogNI,27173
+sqlalchemy/dialects/mysql/__init__.py,sha256=XQz65UCpOpFR_NAxg6sM2zJgPmLEp16D_yEqgJPjirI,2206
+sqlalchemy/dialects/mysql/aiomysql.py,sha256=3yjKHxvIAn91a8X80ypVgoIsuevCIMXBUAvnLVzMVpM,7927
+sqlalchemy/dialects/mysql/asyncmy.py,sha256=VEZF_7rdQvcPcV1nFNqpmALFAUmII5tfD16--TOEyCM,7292
+sqlalchemy/dialects/mysql/base.py,sha256=a794VXC17_P16Ep41eiMr1uEQQOLvlMVGMK3X7XO3XQ,138544
+sqlalchemy/dialects/mysql/cymysql.py,sha256=Zvh6HOWt4icgyT1PuSmSByr5_KR41yVm52yFCqgJzqg,3215
+sqlalchemy/dialects/mysql/dml.py,sha256=uwu1J7BLdYNP8LR6-mCkoTKOA4USo4Av6d3I_n5c3nI,7768
+sqlalchemy/dialects/mysql/enumerated.py,sha256=sSG5qiYGu-cobxzoRwF9x8Qfc-iSWh0qeGGe5oQlXWM,10292
+sqlalchemy/dialects/mysql/expression.py,sha256=ShV5V6Z-YaXi_ETbPcLz1AOuSj9pZrvgmh2Ne61x66A,4241
+sqlalchemy/dialects/mysql/json.py,sha256=WUE0BDCpVv5_RsNoBS1BJAz6TUpNls1XC19WEuHP0AM,2806
+sqlalchemy/dialects/mysql/mariadb.py,sha256=InsZjmtWSPURW_gy6hXZhJ6f8FXCkaLCphhqHVMosEw,1844
+sqlalchemy/dialects/mysql/mariadbconnector.py,sha256=qaqM-tKtWNAb8X6GRVtsKkO11hMw4fUhDiD85b2kKk8,10385
+sqlalchemy/dialects/mysql/mysqlconnector.py,sha256=mHq9510MvTNzDYqvIQnNbLKod8ItcQ5-GK18XEtmgs4,10097
+sqlalchemy/dialects/mysql/mysqldb.py,sha256=6ooLaaSue8yQxgonxz4v_opMHV-jfi9x9vWqexc_xgU,9943
+sqlalchemy/dialects/mysql/provision.py,sha256=pVIeBB4ZF5_jCLSJIphcQFWDxXo4opU7qS1cOkDhSGc,4816
+sqlalchemy/dialects/mysql/pymysql.py,sha256=9x2rQKztutmapJ9-vNzxF_CC3EaBLjJ_Jd05xUKdAKQ,4886
+sqlalchemy/dialects/mysql/pyodbc.py,sha256=21AyRRqK8nDWoIY1OsVjUYAdrrlWVFyrDuajgDs4HoI,5111
+sqlalchemy/dialects/mysql/reflection.py,sha256=WyhlAH4QQpKNm3-SAu7y8DZd5PrzcA6LIkJJeKyxD9g,24690
+sqlalchemy/dialects/mysql/reserved_words.py,sha256=2pOnlrM0uJLHABpRMfijWOzHlGxFTmWznlPwNKHXphY,9236
+sqlalchemy/dialects/mysql/types.py,sha256=Xs7BCkTA1kbfWQE2Lh9OKQdhRNBVTHqrp4ZaU4Pr6-8,26459
+sqlalchemy/dialects/oracle/__init__.py,sha256=_Nfi7_C1Lj_RAW3IITJD7nEagUnfJAGG_tfRtFyCG30,1898
+sqlalchemy/dialects/oracle/base.py,sha256=G0GumOkELYQjcQJ52UVW4cWKw7wLFEAqeGZHOrnaXTo,139157
+sqlalchemy/dialects/oracle/cx_oracle.py,sha256=0PL8KinYbRjI6iBlORK44AMpGWAkVgh1soEamUFa8Ic,56717
+sqlalchemy/dialects/oracle/dictionary.py,sha256=hotIZctkY58oepLJ3NYQxWb44oMOurxsXgD2yhe3neg,19519
+sqlalchemy/dialects/oracle/oracledb.py,sha256=QSJsCb1TOWzC2i8_hXxjF0icOCrf1qYGBZJ4X7U1Cus,33570
+sqlalchemy/dialects/oracle/provision.py,sha256=htp6jQ17KTcnYnPQpeOnE0SQeyyg5DlsK7EhF_QLqQg,11031
+sqlalchemy/dialects/oracle/types.py,sha256=ArWTqkop5usdj9aCp9o0xTUOUiCn1yqwcjYd0fR5zEA,9058
+sqlalchemy/dialects/oracle/vector.py,sha256=pluR7hD4hV6S9Yt3Gc5fomcoYE8jDzXn8EaGMart52A,10853
+sqlalchemy/dialects/postgresql/__init__.py,sha256=DHkUDl8giT4WzSt_s-EXum59en5S8bsP83-deBgKQ94,3892
+sqlalchemy/dialects/postgresql/_psycopg_common.py,sha256=rHrq7cVvsdq5yxg9glY-P-ff7WsPcm2rBWVpR-oYYks,5783
+sqlalchemy/dialects/postgresql/array.py,sha256=cz42HV28g_VbH1Nt4TnEeU1GUS8uSCbTqU2CNJ4qDfg,17279
+sqlalchemy/dialects/postgresql/asyncpg.py,sha256=vNnaXdMU1ObkPqFstWZUTV6_WOWp84WTppJFRunkxcU,40977
+sqlalchemy/dialects/postgresql/base.py,sha256=v-SzI65jF0ERLzuId5Gc8Lvj8059DfjVidklgmthuGM,191547
+sqlalchemy/dialects/postgresql/dml.py,sha256=aomgosojlTWlKKQcEwMZlf8PcN7a77fk3Nc5ZqyvxiA,12126
+sqlalchemy/dialects/postgresql/ext.py,sha256=KNk2rGG3tx5O8-5dCLVbH6ib6WIR591sCC21ratI-Wc,17481
+sqlalchemy/dialects/postgresql/hstore.py,sha256=PIhn5hdjlqBAl54CvXz8im3xIZbNEezSmXMWMqT8bT8,11934
+sqlalchemy/dialects/postgresql/json.py,sha256=fWihCjHxwAwCrSElIb__iueVxLvs9_hsqYDs2ox5NLw,14629
+sqlalchemy/dialects/postgresql/named_types.py,sha256=_i435mLsrF9EEJyLxBihQsjWktXKkKnNCrkCWpjy03M,17812
+sqlalchemy/dialects/postgresql/operators.py,sha256=wB1DePoWlqwAoxkdVH35R7ReFH4Uwa8G0h6HfZY-5ik,2808
+sqlalchemy/dialects/postgresql/pg8000.py,sha256=x5xhYJBttlftQoKL0p4xMjywl68yMhZeoyXPuij02D4,18743
+sqlalchemy/dialects/postgresql/pg_catalog.py,sha256=IHv4trpvq3xz0T8MKGPua-pNgvV1ijEf3mXaLLic7pE,9999
+sqlalchemy/dialects/postgresql/provision.py,sha256=3IYX5zIsqkm9tpnWuFMpZEAYvsCteD2ZRna8qz4Zg7k,5895
+sqlalchemy/dialects/postgresql/psycopg.py,sha256=IbU2pV9r8uUi-ft5DLhMweOiy_v5D9oJHWmNHhYYtG8,26448
+sqlalchemy/dialects/postgresql/psycopg2.py,sha256=cMI3QqnlMHgUodDTz_xo9hY1tcgrJ-bo0ESpdy0DsYk,32032
+sqlalchemy/dialects/postgresql/psycopg2cffi.py,sha256=MUx2xY7DpNKywLQcOzVbD3WAMl0HViAoU5U2iHFEMqE,1756
+sqlalchemy/dialects/postgresql/ranges.py,sha256=aIvHYRs-tKQkt8eJTmE3_JBaHxQA97WwFf7t6XLEfvQ,32946
+sqlalchemy/dialects/postgresql/types.py,sha256=BNh6rvqDn0Uzn6IO8T-kGYYtv3W-axAg8OwIQDVNJF4,7629
+sqlalchemy/dialects/sqlite/__init__.py,sha256=knYUrALP96JZpMecAoxmIouoJrRbGQ4KPkjGXlpzl14,1182
+sqlalchemy/dialects/sqlite/aiosqlite.py,sha256=V7wwmVSzRIj6TBBXj02cauSxmDc581WI-9Chm1s8ps4,16033
+sqlalchemy/dialects/sqlite/base.py,sha256=gmcCzknBUYztVP2M-znqFsREvz_O-oitAjNZH7n0_lk,107380
+sqlalchemy/dialects/sqlite/dml.py,sha256=b4pV3f_7JMm2ZxuW906YQI7YcZiyHOYxqRKPge0cMaM,9138
+sqlalchemy/dialects/sqlite/json.py,sha256=PuBnoOMcUcV0MUiXgC3mXCCv_iiglRhmX3ZUT3NiUx0,2777
+sqlalchemy/dialects/sqlite/provision.py,sha256=0DEDRGGOrnie09Ub0TPUZjN_490WfBK_PXvHiMfJ8cw,6710
+sqlalchemy/dialects/sqlite/pysqlcipher.py,sha256=zIqkVotyk-NTFfx7TsWqi9apQXwtL2_CEw4yISGTgeY,5371
+sqlalchemy/dialects/sqlite/pysqlite.py,sha256=ipVVka48K3FYeV9_ggSqIlbiEZWxfgm1bPwB4yXbL4o,27791
+sqlalchemy/dialects/type_migration_guidelines.txt,sha256=-uHNdmYFGB7bzUNT6i8M5nb4j6j9YUKAtW4lcBZqsMg,8239
+sqlalchemy/engine/__init__.py,sha256=Nn05AJVAfZn_sToGjt09vBcZET343-wYwl-oo2Fg6R8,2818
+sqlalchemy/engine/_py_processors.py,sha256=a6exvDGQTyZcvnVBaX11w0RusCuVESxVc3mABH72_i4,3744
+sqlalchemy/engine/_py_row.py,sha256=IZvYZytnYiKykwAnpGv-rR5XsFBqoaApWdlZcg_H9yc,3787
+sqlalchemy/engine/_py_util.py,sha256=SIoKkVUjOF2U7Obrg0aTZNORfsHyzPhX3u7is14JAp4,2465
+sqlalchemy/engine/base.py,sha256=bq9cZPuH0wZw_5oI4aHASvxjLyDPnZW6yJsiN1DNUxA,123795
+sqlalchemy/engine/characteristics.py,sha256=wRg6uE8NYSH38wvp0CMY2U5hv9u3VTOkTHyJeXYrkvQ,4765
+sqlalchemy/engine/create.py,sha256=5xQOAH0PGxcNsnorWA2i9c1p9qZDV1ea3eCam2JE9vY,34179
+sqlalchemy/engine/cursor.py,sha256=5-pkJ5xWpXyZ56BuXp8ZUdAjwDGOIRmRbv-IiYS6IJc,80786
+sqlalchemy/engine/default.py,sha256=Q4hs3lW8bsHaIjogMZyBH41GqBKCxgRVaR3yy2MqDC8,85896
+sqlalchemy/engine/events.py,sha256=1MAJj-D5dxHBhTXZYnbxY8AViItRtjm-GExTrXN-nrY,37400
+sqlalchemy/engine/interfaces.py,sha256=5mwH2wzZBeiLH4zth0Es_QmHtH7GzpJaA2Vg8te1t1I,115384
+sqlalchemy/engine/mock.py,sha256=MC_S2KihM_iCjr9kZsvT1DU--YaX4Wa-1WbXcgBgbWg,4156
+sqlalchemy/engine/processors.py,sha256=IeUU3p8547y9uUMfn0ti8Ul5p8wnrvIkBMWiAV_clZY,2379
+sqlalchemy/engine/reflection.py,sha256=gZYzVYRsURyJvPSDdjo-h6a1DW8WGe9o4c37iUG5uYU,75565
+sqlalchemy/engine/result.py,sha256=9Wlskt_zv1Yqs_4EdqElqMVlyKuhqQrm3Epl7i3SFpg,78094
+sqlalchemy/engine/row.py,sha256=sC91jITBoitEhjeQm36IS7KjGwiZJjiwCKzOFbxp5qo,12031
+sqlalchemy/engine/strategies.py,sha256=EUOp1y78tDlpbC2J9XJnyDMH-lVjusFBx_39zCh1khE,439
+sqlalchemy/engine/url.py,sha256=JsrXOwip3933VuYh0OObHfLk2okV2rgqEP8S7saccSg,31067
+sqlalchemy/engine/util.py,sha256=Zk8LKTyOO_WfjQfmFVdXqlVFDJz1FjOb7bwF485Rago,5682
+sqlalchemy/event/__init__.py,sha256=DfSYrhLMf1nrCnEBeKaZT4bJkksge2cY2Tg506E41mU,1066
+sqlalchemy/event/api.py,sha256=yWst2rlagTvUYXzZdDymyzj-cYwcYeJR34bHcp2gKUQ,8109
+sqlalchemy/event/attr.py,sha256=ObYvNSVrnAwBmp3zJq7FeA3uUKnXnoSwpi6NzGLkAZk,21589
+sqlalchemy/event/base.py,sha256=N8Z1ejrvALILC_HRKFqeyZRzQ902PdFksh_1gzqL1K8,15254
+sqlalchemy/event/legacy.py,sha256=a-C-eN4vA5CoPYTo2c8Z1lYipNZMJRqIH-6sMoZ1Llg,8457
+sqlalchemy/event/registry.py,sha256=tRc0xdUf0s21T5_raMyq4IrKaR8uLD6PbSW8Q_tJyOM,11144
+sqlalchemy/events.py,sha256=vEDW04X_PMhMw5y0_95tbEzht3wua8_gnkMBJstYNRw,525
+sqlalchemy/exc.py,sha256=2CipjflHTdtmi6G-TbbA4j94sJX39R-EgmzrQHyW5bs,23978
+sqlalchemy/ext/__init__.py,sha256=u0bbjHfhcS_znSEJvrfimKY5Sk-M7GJXfFiDKR3FwLw,322
+sqlalchemy/ext/associationproxy.py,sha256=kTTOuCXOIq_ytrWefGLn-dqo-nK9N-TQmk2cYgyon3s,66443
+sqlalchemy/ext/asyncio/__init__.py,sha256=RCYIx4_exZUgBPms8I5h2zXe8bKzpwFsnNBiBnywNUE,1317
+sqlalchemy/ext/asyncio/base.py,sha256=eXWAYYd5vBjosF8_ZY1j2gsbrlY_xyegJLtqu9lgZjY,9034
+sqlalchemy/ext/asyncio/engine.py,sha256=CnQ3M_gW7_wYOo9h18go6Lj1_-0A0DOP7LxjztY5PdU,48482
+sqlalchemy/ext/asyncio/exc.py,sha256=CtGx8sjHzykpUZojihduYtXjZUz-q-OLcuP8ENoHFBY,639
+sqlalchemy/ext/asyncio/result.py,sha256=xFfTYL8i9yqsmCD9ErHb2JqhKhAwuleGz1qutgQ4KSA,30659
+sqlalchemy/ext/asyncio/scoping.py,sha256=6T7wF1dxOQ6c-PyN-Cd6azHB-GmhjoV9lk6RQDq9sXw,52086
+sqlalchemy/ext/asyncio/session.py,sha256=2nZl5B5mh6MCxyN1uCWGg_-Gd9j4MY5uh2tziBK07HM,63259
+sqlalchemy/ext/automap.py,sha256=RED0MS72sghKG43O8mS59bX_I92evnNQD5FlBQldKmc,61675
+sqlalchemy/ext/baked.py,sha256=ijm4xtdf0NuAObxEy6IH2VfGscMzJrvz_EoyKihCtto,17753
+sqlalchemy/ext/compiler.py,sha256=XQgGCCqnHQKkNzOjsHyRVjNlHDtYk5nwsm650kyhoo8,20889
+sqlalchemy/ext/declarative/__init__.py,sha256=wrIs8z6am8-rSwDYwoxZntw_3T2Dj_28NbyODnDxA8s,1818
+sqlalchemy/ext/declarative/extensions.py,sha256=TgUQY40vkhPjBp9B9wbpr6UF2aUUJrCTEQ0Uac_hFqU,19531
+sqlalchemy/ext/horizontal_shard.py,sha256=lxCjwZMWBwmql2mFQgqV9fOFT8MPJuAEJ-d0_CSEmis,16692
+sqlalchemy/ext/hybrid.py,sha256=_S-jHHutTcXVaorGkyf1Pv5iyoRsql20gWHgyn3roo8,52605
+sqlalchemy/ext/indexable.py,sha256=zNUO08hNUg--_LW8YBaRvyONnsCoePaOs6KKpPTs9VE,11762
+sqlalchemy/ext/instrumentation.py,sha256=SJUsb_5a2PCmHFIvLsXoUjXnNwtcauuuMN5xzTRN7zw,15707
+sqlalchemy/ext/mutable.py,sha256=auwCKpXlqgP4kZgi1bV5AyU-XWQQ8zxLj7ut3bYufFo,37164
+sqlalchemy/ext/mypy/__init__.py,sha256=ovuYQ9Z8oiOl0KqmrOKotAchksj_2G6_bOaVLb95ugw,241
+sqlalchemy/ext/mypy/apply.py,sha256=1lmDsxDulQUiSc8w3LkVqMKZD88cLcSfJ3d9lmMg0M4,10591
+sqlalchemy/ext/mypy/decl_class.py,sha256=VHoYiSVmhWx0NTrXMa7fLmP-QuMO19uYv_rXhercQfE,17384
+sqlalchemy/ext/mypy/infer.py,sha256=FI6m4fescVdNtcSX5BggrD7i_orH_3NOs3V49upGQ28,19367
+sqlalchemy/ext/mypy/names.py,sha256=XkIHA8sT_YPJ6TXkH8tcQMnrY-e3Sg4FgvhY05toSVU,10480
+sqlalchemy/ext/mypy/plugin.py,sha256=W_TG9uNQ10UqBF7JKAWGD6ybdhxZBkPQLgLkuYrrwyc,9750
+sqlalchemy/ext/mypy/util.py,sha256=Vgl-FeZlmxEnOgJbwlzxusmOUWL46vVXyeKMMq4MF1g,9960
+sqlalchemy/ext/orderinglist.py,sha256=YKvR7H0gRs8M-uKcj25mgW-Rip0dDlOKAPSYyy3xk00,15163
+sqlalchemy/ext/serializer.py,sha256=oFkEz_tV_gMiPkP9gacEMACEJxu9sjw3Z3R0yp8EiTo,6169
+sqlalchemy/future/__init__.py,sha256=nXe1m2o0nREIBGrR77Ccd5QeuMJebBjVyiz81YZ7BcU,512
+sqlalchemy/future/engine.py,sha256=CNIeZz-03GSBylYCTTam_Yk5kHD0EprfTxaNEgQc-0I,495
+sqlalchemy/inspection.py,sha256=zd3f-Zz-_ZrhgRm9JLZbC4UDy8xwO93x68LSRXvgfR8,5063
+sqlalchemy/log.py,sha256=jRscCEdMnnPyTikHKrT-y6EuR76CHoNmCUNfpHieAVQ,8607
+sqlalchemy/orm/__init__.py,sha256=ENX3G4_mZ1Zhl6AlaXASCWA_hEfX1t2Qb3DG5h6rvss,8528
+sqlalchemy/orm/_orm_constructors.py,sha256=-bHeVy7LoRNlUVbFFudOOlM4c20y581rSc3b19eCcA4,105599
+sqlalchemy/orm/_typing.py,sha256=6Cpv7LlnboFzDRQqi3EB8f-6PsLk7NvFWM43KbwP-Ac,4973
+sqlalchemy/orm/attributes.py,sha256=5B0fgSr2JLQbxMe8sgKOSkbpAX9Z7yFFpG0cIIwMFp4,93117
+sqlalchemy/orm/base.py,sha256=ZllqtOLEOSzBujwuJge49rsaGNyOcWZIX1eDdf7-jgY,27501
+sqlalchemy/orm/bulk_persistence.py,sha256=YpJFIoEh3jsorX18HwZP2awWKMjqDFBtaurD2nREnIo,72983
+sqlalchemy/orm/clsregistry.py,sha256=mMpVBCC0YVTYf1uQ9u-YJnbRy4yfL5zeQV60tAjEuSs,17952
+sqlalchemy/orm/collections.py,sha256=C_44SFELIGBX7I32SsTCA7YT0IS1g-UzC1h0KJOO7J4,52281
+sqlalchemy/orm/context.py,sha256=lVtX8hy4qjHTX24QditDcTHnrc8tDMbLdeYCZbvuVa8,115082
+sqlalchemy/orm/decl_api.py,sha256=hpKay7ZeEdxo9ahlHJ1tpp9cgh9PXbFY4yfw5cQONME,67841
+sqlalchemy/orm/decl_base.py,sha256=NHISXpnu6jjwaPylBXPiD5zY-YkHb7rSD720Qk0JiX4,83516
+sqlalchemy/orm/dependency.py,sha256=qrCDBldEKNOUgliPFhwvWkQZIrt5NRLeZdqJNjWYTsk,47619
+sqlalchemy/orm/descriptor_props.py,sha256=txKoqcEkZ9rtTmcZm1BesOxzIO6X8payDO44T8Q3VhQ,37795
+sqlalchemy/orm/dynamic.py,sha256=mFwe1h65YHvn0GBgw5Cgs-hMppevY21clu7y3TvQIOs,9816
+sqlalchemy/orm/evaluator.py,sha256=Yfy228GyvvjqvEL88ka1azvq7ugicz6Nw48Pw0iL0dA,12353
+sqlalchemy/orm/events.py,sha256=RXf1dHIQ_OuEHgwONi0B935jrR0OX5uh3pitcEBoCyA,127231
+sqlalchemy/orm/exc.py,sha256=W11TA2kDVVDweYvrDKwoqgFVO7wiIoFW_yHqDts7fGU,7636
+sqlalchemy/orm/identity.py,sha256=kIgJgbN2MLaL3kc43-i1CA39eww7s3UXsv9xxijlQZo,9249
+sqlalchemy/orm/instrumentation.py,sha256=bEZTirsGqQdThkRXU1-1LFu2VBx2MjkHhLvGQ-XyGGg,24321
+sqlalchemy/orm/interfaces.py,sha256=eXGWQLKfx1dTAIY6CXC_IO9zzWmcc0VZaQQ5NYQc57A,49073
+sqlalchemy/orm/loading.py,sha256=Odq8qMfpIRCm5zlBoBvxe0wd0FekrQmVsBDy3cImfiE,58488
+sqlalchemy/orm/mapped_collection.py,sha256=UB3JmCNZQ2k0XB0MH6T7bgRPueE7pSrhcyFjSX_g8Ms,19734
+sqlalchemy/orm/mapper.py,sha256=o44rGirM171OmLtajkQGGXxQjwmsxid2iMc5XmlBhY0,172154
+sqlalchemy/orm/path_registry.py,sha256=cxDDZlVjz1mS6naotiP6jGKzikdm-MQGr70rETzIYlk,25914
+sqlalchemy/orm/persistence.py,sha256=M1i2wm3YmxX3bxQXL1Mcw2Wdtib0bkMTYG0NmZByvU8,61812
+sqlalchemy/orm/properties.py,sha256=fR8UAsk-YyzWCPu7HhCEjVraS_gcN8DN4emspC57_kY,31233
+sqlalchemy/orm/query.py,sha256=u6xNWXhANTumvwp2nfv-rgW-UnA68QQcvJNUIQMWDT0,118856
+sqlalchemy/orm/relationships.py,sha256=4s6GXdL4yJEtQgyTjQ5gqOOpU8FWtuH9N3uhNTDbi5w,128763
+sqlalchemy/orm/scoping.py,sha256=0dibgN30cW1LOgVS6MJmjxZHdNdCC1s00qiaAAzQGqE,78123
+sqlalchemy/orm/session.py,sha256=lCOVA7dVLkSMNnpDdJoEvHhJvEaZeC97KPhKHONjXI8,195400
+sqlalchemy/orm/state.py,sha256=YS0voN_ffj7hg7dqklGdvNMGwEILKo1tXv725OIW9mU,38433
+sqlalchemy/orm/state_changes.py,sha256=zMhwxbQNVlcRmK7YwaPsYsxN4uhJkw4Mmg_snftAGDg,6816
+sqlalchemy/orm/strategies.py,sha256=REbXPL97Z5VcYPBOZ6L5wEzCW7gD4Z1BVYsvElVI1Ug,119802
+sqlalchemy/orm/strategy_options.py,sha256=9mSKfC99qOsdRXc4TnvQ4x6NkXvmmzVWX-ZeuGBSEvs,85626
+sqlalchemy/orm/sync.py,sha256=3ycmsWAHK4zwUfvfXj2e4v58MzmQ9KULWy4awoGzoMI,5779
+sqlalchemy/orm/unitofwork.py,sha256=LK_aGoLgKdwa17Ia1y7_Vl5dxzIvRB7VMGhOQLm9bcM,27033
+sqlalchemy/orm/util.py,sha256=sGgts2KOPEUq5kD0YGPzLBONh9alauDF5V3PRJAfGHM,80889
+sqlalchemy/orm/writeonly.py,sha256=OqRWliWa_9muWZII_CtDOm58YMYxNQWtaP6F_r9k-ig,22297
+sqlalchemy/pool/__init__.py,sha256=R0tdjvXH2TfTv8sS36CDs3g3RVwnno3eXWlfNJhhze0,1804
+sqlalchemy/pool/base.py,sha256=Xb6R4y7EJPHkz-5duEiWuWz7I8YBAg4pHQpmRP9QiD8,52588
+sqlalchemy/pool/events.py,sha256=Fma2EvUl8XfbnPEYsRYmarRtumYJmpFTExxvO4bmOmk,13455
+sqlalchemy/pool/impl.py,sha256=3vTqmewu59tUGQbMy1PJtFMOUkc9jvL-ChaT7YA5gls,19306
+sqlalchemy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sqlalchemy/schema.py,sha256=RSA_jCI0MFkeOqiQSsorkayN-aFVRYsOfDM4E0vlk1I,3251
+sqlalchemy/sql/__init__.py,sha256=X6VqQucEmXS5_0jW4Ik5768yJ--RwNPLCeV0ptoSG3k,5820
+sqlalchemy/sql/_dml_constructors.py,sha256=yECqkq8P88msKKJmvHqiIGeAtQECSRa9vQpC8VPzGyI,3795
+sqlalchemy/sql/_elements_constructors.py,sha256=4dzcMS0xNSvxFdXMxx-2p7OK98Srui_cWq06Ck0KlUQ,63096
+sqlalchemy/sql/_orm_types.py,sha256=fQICo_xMjlnNe4WCWaps8Mwf7teKzl17v2_uff5_ikQ,625
+sqlalchemy/sql/_py_util.py,sha256=7q_UH9SzK6nV6nn1zzOStvfdWjiBRYPagdr4UhrFUTk,2173
+sqlalchemy/sql/_selectable_constructors.py,sha256=EBeBQir2cKSBykejV27rzprJpNum3xJBMMJTk4kh4FU,22222
+sqlalchemy/sql/_typing.py,sha256=_-4VX-ZtWoIpR-gsxwiOzlwHzMuR7OWLTBkcPz_yh90,13443
+sqlalchemy/sql/annotation.py,sha256=y-vGSCbLJsrgLkkQL5M3_ytczOsyx4z32kDnpwReJDs,18355
+sqlalchemy/sql/base.py,sha256=9ZFt_EL_sV95PYaQbrManVzt5xkF61pYxVZKON6mKsI,78977
+sqlalchemy/sql/cache_key.py,sha256=AE0LHB3h-ukCE95svW9HUcM7rWUQWoJKe9TYW9pKxKc,33653
+sqlalchemy/sql/coercions.py,sha256=9_GdOP59AflDIstWsDRPnJraJGVxS5B4lPfL-6iHfg0,40782
+sqlalchemy/sql/compiler.py,sha256=eJKifmVjc2h5rpCHwFZ1DyppVmaUoxzlVcQXHlIiNZg,286116
+sqlalchemy/sql/crud.py,sha256=wxLQo10QEkbdgIxeyspP9uGX0T-YzA2aDOztpCEMzs4,59881
+sqlalchemy/sql/ddl.py,sha256=snmxh5NLIi-7i4iz1ARYFZFcJCbFmOrjeTxYSiVq4oI,47993
+sqlalchemy/sql/default_comparator.py,sha256=jaxd49IC1flS349qPZ2ZcJhHl1ayA-BuWq52B4RaJew,16706
+sqlalchemy/sql/dml.py,sha256=8TYs2PUdbPYvGnSA9U3ApELergttmOo-XgNc6vfBD3M,66573
+sqlalchemy/sql/elements.py,sha256=4RtLbbNILP-uHi5pWK6MgP9fnS56ZibhAGY3M1kjXJU,179645
+sqlalchemy/sql/events.py,sha256=xpqx3irkG8N3gysXAViLCqXXke9KCSU-6w4zZUdYXzw,18312
+sqlalchemy/sql/expression.py,sha256=_12nQiLpln3ifSFiCAbfjy4BeCr6bROHx-1CebfKSvA,7583
+sqlalchemy/sql/functions.py,sha256=rfp50_ud85CcYBk5yAOxIDYCwEtpv6dM0RreAOn0xvc,66692
+sqlalchemy/sql/lambdas.py,sha256=9e5SVNxYQluid-t1MinspQ1vMpupkNU36eLS6oDcFCo,49400
+sqlalchemy/sql/naming.py,sha256=w62T2yj6pafLNRe7SDUsutklHSYgIabXj2UtnaCJRSM,6855
+sqlalchemy/sql/operators.py,sha256=7h8oPww8gIzqyhizpiW-iyVNSFCEWUouGyMlhG1kXac,76792
+sqlalchemy/sql/roles.py,sha256=9KrnEd1mt5_Lm8G--7uKCKHVdrW3Pks3ZXSacQ79DQE,7662
+sqlalchemy/sql/schema.py,sha256=dmk0Wo6BTHeg_mlxv-8o6miUnfWGr7Uqr4mBtCUWzyA,230556
+sqlalchemy/sql/selectable.py,sha256=3hy9dMMw5kvRXzD4VXQXqkWzt9ORfDyJd2RTOvcDJ50,244366
+sqlalchemy/sql/sqltypes.py,sha256=abjSPdInubjTYK0yC_I2pqAbYwQXB6zAOGaeRKnDhZg,132159
+sqlalchemy/sql/traversals.py,sha256=pTe81TkrJKRVi4b1nF0Am4IkOl2Q_NzxMOl_9alReVI,33664
+sqlalchemy/sql/type_api.py,sha256=qTKPD0U6M33SMexwFMNHYh5K7urESfUmHuWopCtWqGA,85425
+sqlalchemy/sql/util.py,sha256=P1fGrTag55hEaw5jFW7RhRZgDSsbFvy7ALo8Y0ZejHo,48110
+sqlalchemy/sql/visitors.py,sha256=q7sBQIDWATwU0lWaQVYSEmAWal-3gZENsvFGqRihSa0,36317
+sqlalchemy/testing/__init__.py,sha256=z4r9klZyzWB_AQ_jY7o5eg72IwgGfej87ueEt4QFCC0,3160
+sqlalchemy/testing/assertions.py,sha256=QNTONVfg86Q1TcMRxLhqID27bcrQ7jntwl7kgA8Jbvs,31704
+sqlalchemy/testing/assertsql.py,sha256=FAiTBvUOJWQB61vEB21bR1fEzamRrpUHF9fe4qtvKwo,16900
+sqlalchemy/testing/asyncio.py,sha256=8OKkkkGbJNMbOZwsC_Gw8pLeM87_xJhpooS4Zaf0tuE,3830
+sqlalchemy/testing/config.py,sha256=aHi95Jk_hWjzPGaT_uNNtxmbMCAblk9SiKt7cjpme3o,12370
+sqlalchemy/testing/engines.py,sha256=Y9BngZzBObQBrv48dj5IjDacxIMz4q0V_Wb57M2qMQM,13882
+sqlalchemy/testing/entities.py,sha256=ZIE4OCzDlKE1OxVArkWF755gvYZDS8oUuX5fuwPAQgo,3354
+sqlalchemy/testing/exclusions.py,sha256=PC-47lBShhUkiion_n9Gp7XDwmpXg5-jI2VpJn0YpIk,13704
+sqlalchemy/testing/fixtures/__init__.py,sha256=Hd_6mk0OFkPpH1MVMvK0rY4kyG82JfIIwm8HSR_IZrQ,1198
+sqlalchemy/testing/fixtures/base.py,sha256=uVwEK26dwLf4nx9cgYP0VQ2NwyxIxVJmaNsVoAW_PBY,12612
+sqlalchemy/testing/fixtures/mypy.py,sha256=h820NghV4sVzY0XrV4imPkYqb7NA4KoLm0w9F3fBn-Q,12755
+sqlalchemy/testing/fixtures/orm.py,sha256=_vMxIRSuCmOnBcqV2xwqUWjFp1YwMcgQQsDaxsDM3xg,6095
+sqlalchemy/testing/fixtures/sql.py,sha256=JmgD0leWLEYaXBWEcVoMfcGermZeEmWHRwTYB3XOmRg,15074
+sqlalchemy/testing/pickleable.py,sha256=gXgySNI39dUcuNY6e-vM9HFKxQ7Uva7NVZgeYyNY4Zw,2833
+sqlalchemy/testing/plugin/__init__.py,sha256=8LB-gN7jwvGVW4bPAM1b8MmAQQwBSKh_BGVS3HQc4EM,247
+sqlalchemy/testing/plugin/bootstrap.py,sha256=kvYJzq7R2xINvmgyQnJ7VsDDxGlOj724iHkhraXNNMo,1685
+sqlalchemy/testing/plugin/plugin_base.py,sha256=aS9A5zoKaoGKMy8F2OIKbPOMe5SG49lChANZ_cd3UM0,23102
+sqlalchemy/testing/plugin/pytestplugin.py,sha256=eTlUfe_YU3rBC5lUuW9kWP-n8fd6AX6OEBmxVlBrrQk,28528
+sqlalchemy/testing/profiling.py,sha256=QcDKrd0xZx4IdXQLQZQ0VfFgmjAAek5KfKp6Jp73_K4,10310
+sqlalchemy/testing/provision.py,sha256=lqHX9n9Qv3MWbITEXRkjkW-jCAMBg97vkeSxFbGva20,17519
+sqlalchemy/testing/requirements.py,sha256=_-GLvNw85YhZnm-9Uy3JufpLRlk6kyJlCrn3l9wmoYc,56471
+sqlalchemy/testing/schema.py,sha256=49x-TXARL2k8oIiaSzyGxXG5fh7vJOuBoUv5h9YTfKo,5360
+sqlalchemy/testing/suite/__init__.py,sha256=lfGIsu9gw1L5dCZNuQ7-waq9f_IuvEtn3ywGsWNyD5A,722
+sqlalchemy/testing/suite/test_cte.py,sha256=7AnV9dR9h76JWY0yWuyeQT-5GQsYbNMz3q2SG8IA_R4,7276
+sqlalchemy/testing/suite/test_ddl.py,sha256=u6GRxHKHYw9OC6yiqMJvlXUYn6sEkEgns2xdfpWNNrE,12059
+sqlalchemy/testing/suite/test_deprecations.py,sha256=WvuZ0mZkUL3dHWU_9-Mr0xywM3XxD1v_4ujalLF4J60,5337
+sqlalchemy/testing/suite/test_dialect.py,sha256=b8jmV4F2mnBAxN_a5v430WcBJU9aDlB0OTIqmlliBRA,24215
+sqlalchemy/testing/suite/test_insert.py,sha256=tapEYecSPKqL8xrjlcQzDOfbWdKJz9ldT7pRi0biDeM,18824
+sqlalchemy/testing/suite/test_reflection.py,sha256=jXMVC51nZr3MLROAC8sEjebHOOrfso43Kauwtz2gqk0,120062
+sqlalchemy/testing/suite/test_results.py,sha256=eIKE6hbXudwde8oiKlKd6B1E2Bn5pyIDj_KPMmPjiIc,17042
+sqlalchemy/testing/suite/test_rowcount.py,sha256=V6RQGwe9LO5tKzFPFoa29dDs8M0eY8JZ9tqgbzgtCYs,7900
+sqlalchemy/testing/suite/test_select.py,sha256=uh_AFK_hba_s-i12QZAdWFybvBI4naPAeLeNskUJUas,62254
+sqlalchemy/testing/suite/test_sequence.py,sha256=8a6UO3pjRFnQ23ELG9m5cMMRoD3iD7aSgul-HnkeLns,9979
+sqlalchemy/testing/suite/test_types.py,sha256=wWpsUZnxj2soQrG5m1sar-ZyaYsaMJwdbAuQfBDoVBI,68059
+sqlalchemy/testing/suite/test_unicode_ddl.py,sha256=tVLf9RqCJe-CsyhCWL9d-WuWazDx5iWYzoBrSCbgjXs,6141
+sqlalchemy/testing/suite/test_update_delete.py,sha256=xUHytwsMyvJcH3UhzmvGpzix7yBbQ-0thmlEpF-eNI8,4008
+sqlalchemy/testing/util.py,sha256=Cdr8oXKmIhcPqKTC3tHhM6TO2WfR1LL7VXCwaBIbmrQ,14526
+sqlalchemy/testing/warnings.py,sha256=j8GWiP-yraCW0Ig5iJxAa5ekN82ZWqcQWyR-BUb4MZA,1546
+sqlalchemy/types.py,sha256=mOJzzF5LHN2EXX9PN5AFk1zSqUWtJgeyhZ_awAArr9c,3166
+sqlalchemy/util/__init__.py,sha256=Z4tsLRzNFX_VzCagSFfEzl5nvup8Oz3P4-87CSIYYXM,8401
+sqlalchemy/util/_collections.py,sha256=b1yyOQwnsSUlkBSL4RodiDMDKp0agIvfWGNLe_afWLg,20011
+sqlalchemy/util/_concurrency_py3k.py,sha256=d9j6lSK_RRImFq_ItBBOlI25bAjdq7Ts9NnNxpoNbSw,9170
+sqlalchemy/util/_has_cy.py,sha256=hy1eXhxE25VT5bvWIKX6jtfqjawSQBnssrTbGo8kw9Q,1247
+sqlalchemy/util/_py_collections.py,sha256=1Oj4FVZW7DelXSYbiAUIDzqN1-2PA2h2Y_6_LyRYAX8,16650
+sqlalchemy/util/compat.py,sha256=iEhUMxayGqocUxYH0cixp43YBClhMIaG7vR3NK7S1fo,12862
+sqlalchemy/util/concurrency.py,sha256=Qr7bVBAehbv8gv6--dqg8By5pTE2oIdinZMc7rcEsew,3350
+sqlalchemy/util/deprecations.py,sha256=FaXayotv2JoI2UXwKxuCMMGZ8emX1W1dX4kQN06bRmY,12012
+sqlalchemy/util/langhelpers.py,sha256=f6QB41KlkAS8J71W7E4xnC8EHYRApMEqwsBCFXpJYHw,64872
+sqlalchemy/util/preloaded.py,sha256=3PApZM11IzFL9i7QYPJ8aL3xn4KtHiUDiB-rvUKt9RA,5904
+sqlalchemy/util/queue.py,sha256=IGc9tSEypeKZae2tHf5u9oV8CsOqObH8dGU_gl7Wv0Y,10185
+sqlalchemy/util/tool_support.py,sha256=Bd_L5U4KFExDQvhc7XO3ta4eBC9LoKz6-ppAdEpH7aw,6135
+sqlalchemy/util/topological.py,sha256=yMpaA2s0JYIekQF4XKwzJzy8lVo-8yeo8o1J2xzxq48,3451
+sqlalchemy/util/typing.py,sha256=do1tX-habDEwaNE8AWfmqIY8F6jdX8MsPFS5Kd1RiXM,22493
diff --git a/libs/tqdm-4.67.1.dist-info/REQUESTED b/libs/sqlalchemy-2.0.48.dist-info/REQUESTED
similarity index 100%
rename from libs/tqdm-4.67.1.dist-info/REQUESTED
rename to libs/sqlalchemy-2.0.48.dist-info/REQUESTED
diff --git a/libs/sqlalchemy-2.0.48.dist-info/WHEEL b/libs/sqlalchemy-2.0.48.dist-info/WHEEL
new file mode 100644
index 0000000000..10166b37bf
--- /dev/null
+++ b/libs/sqlalchemy-2.0.48.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: false
+Tag: cp310-cp310-macosx_14_0_arm64
+
diff --git a/libs/sqlalchemy-2.0.48.dist-info/licenses/LICENSE b/libs/sqlalchemy-2.0.48.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..903d67495f
--- /dev/null
+++ b/libs/sqlalchemy-2.0.48.dist-info/licenses/LICENSE
@@ -0,0 +1,19 @@
+Copyright 2005-2026 SQLAlchemy authors and contributors <see AUTHORS file>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/SQLAlchemy-2.0.37.dist-info/top_level.txt b/libs/sqlalchemy-2.0.48.dist-info/top_level.txt
similarity index 100%
rename from libs/SQLAlchemy-2.0.37.dist-info/top_level.txt
rename to libs/sqlalchemy-2.0.48.dist-info/top_level.txt
diff --git a/libs/sqlalchemy/__init__.py b/libs/sqlalchemy/__init__.py
index c74afd9012..2006f577a8 100644
--- a/libs/sqlalchemy/__init__.py
+++ b/libs/sqlalchemy/__init__.py
@@ -1,5 +1,5 @@
 # __init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -269,7 +269,7 @@
 from .types import VARBINARY as VARBINARY
 from .types import VARCHAR as VARCHAR
 
-__version__ = "2.0.37"
+__version__ = "2.0.48"
 
 
 def __go(lcls: Any) -> None:
@@ -281,14 +281,3 @@ def __go(lcls: Any) -> None:
 
 
 __go(locals())
-
-
-def __getattr__(name: str) -> Any:
-    if name == "SingleonThreadPool":
-        _util.warn_deprecated(
-            "SingleonThreadPool was a typo in the v2 series. "
-            "Please use the correct SingletonThreadPool name.",
-            "2.0.24",
-        )
-        return SingletonThreadPool
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
diff --git a/libs/sqlalchemy/connectors/__init__.py b/libs/sqlalchemy/connectors/__init__.py
index 43cd1035c6..eea1b29a7d 100644
--- a/libs/sqlalchemy/connectors/__init__.py
+++ b/libs/sqlalchemy/connectors/__init__.py
@@ -1,5 +1,5 @@
 # connectors/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/connectors/aioodbc.py b/libs/sqlalchemy/connectors/aioodbc.py
index 39b2a8a238..5df698fc5e 100644
--- a/libs/sqlalchemy/connectors/aioodbc.py
+++ b/libs/sqlalchemy/connectors/aioodbc.py
@@ -1,5 +1,5 @@
 # connectors/aioodbc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -20,6 +20,7 @@
 from ..util.concurrency import await_fallback
 from ..util.concurrency import await_only
 
+
 if TYPE_CHECKING:
     from ..engine.interfaces import ConnectArgsType
     from ..engine.url import URL
@@ -58,6 +59,15 @@ def autocommit(self, value):
 
         self._connection._conn.autocommit = value
 
+    def ping(self, reconnect):
+        return self.await_(self._connection.ping(reconnect))
+
+    def add_output_converter(self, *arg, **kw):
+        self._connection.add_output_converter(*arg, **kw)
+
+    def character_set_name(self):
+        return self._connection.character_set_name()
+
     def cursor(self, server_side=False):
         # aioodbc sets connection=None when closed and just fails with
         # AttributeError here.  Here we use the same ProgrammingError +
diff --git a/libs/sqlalchemy/connectors/asyncio.py b/libs/sqlalchemy/connectors/asyncio.py
index c4f0d71541..310d0a9f95 100644
--- a/libs/sqlalchemy/connectors/asyncio.py
+++ b/libs/sqlalchemy/connectors/asyncio.py
@@ -1,21 +1,128 @@
 # connectors/asyncio.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 """generic asyncio-adapted versions of DBAPI connection and cursor"""
 
 from __future__ import annotations
 
+import asyncio
 import collections
+import sys
+from typing import Any
+from typing import AsyncIterator
+from typing import Deque
+from typing import Iterator
+from typing import NoReturn
+from typing import Optional
+from typing import Sequence
+from typing import Tuple
+from typing import Type
+from typing import TYPE_CHECKING
 
 from ..engine import AdaptedConnection
-from ..util.concurrency import asyncio
+from ..util import EMPTY_DICT
 from ..util.concurrency import await_fallback
 from ..util.concurrency import await_only
+from ..util.concurrency import in_greenlet
+from ..util.typing import Protocol
+
+if TYPE_CHECKING:
+    from ..engine.interfaces import _DBAPICursorDescription
+    from ..engine.interfaces import _DBAPIMultiExecuteParams
+    from ..engine.interfaces import _DBAPISingleExecuteParams
+    from ..engine.interfaces import DBAPIModule
+    from ..util.typing import Self
+
+
+class AsyncIODBAPIConnection(Protocol):
+    """protocol representing an async adapted version of a
+    :pep:`249` database connection.
+
+
+    """
+
+    # note that async DBAPIs dont agree if close() should be awaitable,
+    # so it is omitted here and picked up by the __getattr__ hook below
+
+    async def commit(self) -> None: ...
+
+    def cursor(self, *args: Any, **kwargs: Any) -> AsyncIODBAPICursor: ...
+
+    async def rollback(self) -> None: ...
+
+    def __getattr__(self, key: str) -> Any: ...
+
+    def __setattr__(self, key: str, value: Any) -> None: ...
+
+
+class AsyncIODBAPICursor(Protocol):
+    """protocol representing an async adapted version
+    of a :pep:`249` database cursor.
+
+
+    """
+
+    def __aenter__(self) -> Any: ...
+
+    @property
+    def description(
+        self,
+    ) -> _DBAPICursorDescription:
+        """The description attribute of the Cursor."""
+        ...
+
+    @property
+    def rowcount(self) -> int: ...
+
+    arraysize: int
+
+    lastrowid: int
+
+    async def close(self) -> None: ...
+
+    async def execute(
+        self,
+        operation: Any,
+        parameters: Optional[_DBAPISingleExecuteParams] = None,
+    ) -> Any: ...
+
+    async def executemany(
+        self,
+        operation: Any,
+        parameters: _DBAPIMultiExecuteParams,
+    ) -> Any: ...
+
+    async def fetchone(self) -> Optional[Any]: ...
+
+    async def fetchmany(self, size: Optional[int] = ...) -> Sequence[Any]: ...
+
+    async def fetchall(self) -> Sequence[Any]: ...
+
+    async def setinputsizes(self, sizes: Sequence[Any]) -> None: ...
+
+    def setoutputsize(self, size: Any, column: Any) -> None: ...
+
+    async def callproc(
+        self, procname: str, parameters: Sequence[Any] = ...
+    ) -> Any: ...
+
+    async def nextset(self) -> Optional[bool]: ...
+
+    def __aiter__(self) -> AsyncIterator[Any]: ...
+
+
+class AsyncAdapt_dbapi_module:
+    if TYPE_CHECKING:
+        Error = DBAPIModule.Error
+        OperationalError = DBAPIModule.OperationalError
+        InterfaceError = DBAPIModule.InterfaceError
+        IntegrityError = DBAPIModule.IntegrityError
+
+        def __getattr__(self, key: str) -> Any: ...
 
 
 class AsyncAdapt_dbapi_cursor:
@@ -26,98 +133,172 @@ class AsyncAdapt_dbapi_cursor:
         "await_",
         "_cursor",
         "_rows",
+        "_soft_closed_memoized",
     )
 
-    def __init__(self, adapt_connection):
+    _awaitable_cursor_close: bool = True
+
+    _cursor: AsyncIODBAPICursor
+    _adapt_connection: AsyncAdapt_dbapi_connection
+    _connection: AsyncIODBAPIConnection
+    _rows: Deque[Any]
+
+    def __init__(self, adapt_connection: AsyncAdapt_dbapi_connection):
         self._adapt_connection = adapt_connection
         self._connection = adapt_connection._connection
+
         self.await_ = adapt_connection.await_
 
-        cursor = self._connection.cursor()
+        cursor = self._make_new_cursor(self._connection)
         self._cursor = self._aenter_cursor(cursor)
-
+        self._soft_closed_memoized = EMPTY_DICT
         if not self.server_side:
             self._rows = collections.deque()
 
-    def _aenter_cursor(self, cursor):
-        return self.await_(cursor.__aenter__())
+    def _aenter_cursor(self, cursor: AsyncIODBAPICursor) -> AsyncIODBAPICursor:
+        return self.await_(cursor.__aenter__())  # type: ignore[no-any-return]
+
+    def _make_new_cursor(
+        self, connection: AsyncIODBAPIConnection
+    ) -> AsyncIODBAPICursor:
+        return connection.cursor()
 
     @property
-    def description(self):
+    def description(self) -> Optional[_DBAPICursorDescription]:
+        if "description" in self._soft_closed_memoized:
+            return self._soft_closed_memoized["description"]  # type: ignore[no-any-return]  # noqa: E501
         return self._cursor.description
 
     @property
-    def rowcount(self):
+    def rowcount(self) -> int:
         return self._cursor.rowcount
 
     @property
-    def arraysize(self):
+    def arraysize(self) -> int:
         return self._cursor.arraysize
 
     @arraysize.setter
-    def arraysize(self, value):
+    def arraysize(self, value: int) -> None:
         self._cursor.arraysize = value
 
     @property
-    def lastrowid(self):
+    def lastrowid(self) -> int:
         return self._cursor.lastrowid
 
-    def close(self):
-        # note we aren't actually closing the cursor here,
-        # we are just letting GC do it.  see notes in aiomysql dialect
-        self._rows.clear()
+    async def _async_soft_close(self) -> None:
+        """close the cursor but keep the results pending, and memoize the
+        description.
+
+        .. versionadded:: 2.0.44
 
-    def execute(self, operation, parameters=None):
-        return self.await_(self._execute_async(operation, parameters))
+        """
 
-    def executemany(self, operation, seq_of_parameters):
-        return self.await_(
-            self._executemany_async(operation, seq_of_parameters)
+        if not self._awaitable_cursor_close or self.server_side:
+            return
+
+        self._soft_closed_memoized = self._soft_closed_memoized.union(
+            {
+                "description": self._cursor.description,
+            }
         )
+        await self._cursor.close()
+
+    def close(self) -> None:
+        self._rows.clear()
+
+        # updated as of 2.0.44
+        # try to "close" the cursor based on what we know about the driver
+        # and if we are able to.  otherwise, hope that the asyncio
+        # extension called _async_soft_close() if the cursor is going into
+        # a sync context
+        if self._cursor is None or bool(self._soft_closed_memoized):
+            return
+
+        if not self._awaitable_cursor_close:
+            self._cursor.close()  # type: ignore[unused-coroutine]
+        elif in_greenlet():
+            self.await_(self._cursor.close())
 
-    async def _execute_async(self, operation, parameters):
+    def execute(
+        self,
+        operation: Any,
+        parameters: Optional[_DBAPISingleExecuteParams] = None,
+    ) -> Any:
+        try:
+            return self.await_(self._execute_async(operation, parameters))
+        except Exception as error:
+            self._adapt_connection._handle_exception(error)
+
+    def executemany(
+        self,
+        operation: Any,
+        seq_of_parameters: _DBAPIMultiExecuteParams,
+    ) -> Any:
+        try:
+            return self.await_(
+                self._executemany_async(operation, seq_of_parameters)
+            )
+        except Exception as error:
+            self._adapt_connection._handle_exception(error)
+
+    async def _execute_async(
+        self, operation: Any, parameters: Optional[_DBAPISingleExecuteParams]
+    ) -> Any:
         async with self._adapt_connection._execute_mutex:
-            result = await self._cursor.execute(operation, parameters or ())
+            if parameters is None:
+                result = await self._cursor.execute(operation)
+            else:
+                result = await self._cursor.execute(operation, parameters)
 
             if self._cursor.description and not self.server_side:
                 self._rows = collections.deque(await self._cursor.fetchall())
             return result
 
-    async def _executemany_async(self, operation, seq_of_parameters):
+    async def _executemany_async(
+        self,
+        operation: Any,
+        seq_of_parameters: _DBAPIMultiExecuteParams,
+    ) -> Any:
         async with self._adapt_connection._execute_mutex:
             return await self._cursor.executemany(operation, seq_of_parameters)
 
-    def nextset(self):
+    def nextset(self) -> None:
         self.await_(self._cursor.nextset())
         if self._cursor.description and not self.server_side:
             self._rows = collections.deque(
                 self.await_(self._cursor.fetchall())
             )
 
-    def setinputsizes(self, *inputsizes):
-        # NOTE: this is overrridden in aioodbc due to
+    def setinputsizes(self, *inputsizes: Any) -> None:
+        # NOTE: this is overridden in aioodbc due to
         # see https://github.com/aio-libs/aioodbc/issues/451
         # right now
 
         return self.await_(self._cursor.setinputsizes(*inputsizes))
 
-    def __iter__(self):
+    def __enter__(self) -> Self:
+        return self
+
+    def __exit__(self, type_: Any, value: Any, traceback: Any) -> None:
+        self.close()
+
+    def __iter__(self) -> Iterator[Any]:
         while self._rows:
             yield self._rows.popleft()
 
-    def fetchone(self):
+    def fetchone(self) -> Optional[Any]:
         if self._rows:
             return self._rows.popleft()
         else:
             return None
 
-    def fetchmany(self, size=None):
+    def fetchmany(self, size: Optional[int] = None) -> Sequence[Any]:
         if size is None:
             size = self.arraysize
         rr = self._rows
         return [rr.popleft() for _ in range(min(size, len(rr)))]
 
-    def fetchall(self):
+    def fetchall(self) -> Sequence[Any]:
         retval = list(self._rows)
         self._rows.clear()
         return retval
@@ -127,30 +308,21 @@ class AsyncAdapt_dbapi_ss_cursor(AsyncAdapt_dbapi_cursor):
     __slots__ = ()
     server_side = True
 
-    def __init__(self, adapt_connection):
-        self._adapt_connection = adapt_connection
-        self._connection = adapt_connection._connection
-        self.await_ = adapt_connection.await_
-
-        cursor = self._connection.cursor()
-
-        self._cursor = self.await_(cursor.__aenter__())
-
-    def close(self):
+    def close(self) -> None:
         if self._cursor is not None:
             self.await_(self._cursor.close())
-            self._cursor = None
+            self._cursor = None  # type: ignore
 
-    def fetchone(self):
+    def fetchone(self) -> Optional[Any]:
         return self.await_(self._cursor.fetchone())
 
-    def fetchmany(self, size=None):
+    def fetchmany(self, size: Optional[int] = None) -> Any:
         return self.await_(self._cursor.fetchmany(size=size))
 
-    def fetchall(self):
+    def fetchall(self) -> Sequence[Any]:
         return self.await_(self._cursor.fetchall())
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Any]:
         iterator = self._cursor.__aiter__()
         while True:
             try:
@@ -164,46 +336,50 @@ class AsyncAdapt_dbapi_connection(AdaptedConnection):
     _ss_cursor_cls = AsyncAdapt_dbapi_ss_cursor
 
     await_ = staticmethod(await_only)
+
     __slots__ = ("dbapi", "_execute_mutex")
 
-    def __init__(self, dbapi, connection):
+    _connection: AsyncIODBAPIConnection
+
+    def __init__(self, dbapi: Any, connection: AsyncIODBAPIConnection):
         self.dbapi = dbapi
         self._connection = connection
         self._execute_mutex = asyncio.Lock()
 
-    def ping(self, reconnect):
-        return self.await_(self._connection.ping(reconnect))
-
-    def add_output_converter(self, *arg, **kw):
-        self._connection.add_output_converter(*arg, **kw)
-
-    def character_set_name(self):
-        return self._connection.character_set_name()
-
-    @property
-    def autocommit(self):
-        return self._connection.autocommit
-
-    @autocommit.setter
-    def autocommit(self, value):
-        # https://github.com/aio-libs/aioodbc/issues/448
-        # self._connection.autocommit = value
-
-        self._connection._conn.autocommit = value
-
-    def cursor(self, server_side=False):
+    def cursor(self, server_side: bool = False) -> AsyncAdapt_dbapi_cursor:
         if server_side:
             return self._ss_cursor_cls(self)
         else:
             return self._cursor_cls(self)
 
-    def rollback(self):
-        self.await_(self._connection.rollback())
-
-    def commit(self):
-        self.await_(self._connection.commit())
-
-    def close(self):
+    def execute(
+        self,
+        operation: Any,
+        parameters: Optional[_DBAPISingleExecuteParams] = None,
+    ) -> Any:
+        """lots of DBAPIs seem to provide this, so include it"""
+        cursor = self.cursor()
+        cursor.execute(operation, parameters)
+        return cursor
+
+    def _handle_exception(self, error: Exception) -> NoReturn:
+        exc_info = sys.exc_info()
+
+        raise error.with_traceback(exc_info[2])
+
+    def rollback(self) -> None:
+        try:
+            self.await_(self._connection.rollback())
+        except Exception as error:
+            self._handle_exception(error)
+
+    def commit(self) -> None:
+        try:
+            self.await_(self._connection.commit())
+        except Exception as error:
+            self._handle_exception(error)
+
+    def close(self) -> None:
         self.await_(self._connection.close())
 
 
@@ -211,3 +387,43 @@ class AsyncAdaptFallback_dbapi_connection(AsyncAdapt_dbapi_connection):
     __slots__ = ()
 
     await_ = staticmethod(await_fallback)
+
+
+class AsyncAdapt_terminate:
+    """Mixin for a AsyncAdapt_dbapi_connection to add terminate support."""
+
+    __slots__ = ()
+
+    def terminate(self) -> None:
+        if in_greenlet():
+            # in a greenlet; this is the connection was invalidated case.
+            try:
+                # try to gracefully close; see #10717
+                self.await_(asyncio.shield(self._terminate_graceful_close()))  # type: ignore[attr-defined] # noqa: E501
+            except self._terminate_handled_exceptions() as e:
+                # in the case where we are recycling an old connection
+                # that may have already been disconnected, close() will
+                # fail.  In this case, terminate
+                # the connection without any further waiting.
+                # see issue #8419
+                self._terminate_force_close()
+                if isinstance(e, asyncio.CancelledError):
+                    # re-raise CancelledError if we were cancelled
+                    raise
+        else:
+            # not in a greenlet; this is the gc cleanup case
+            self._terminate_force_close()
+
+    def _terminate_handled_exceptions(self) -> Tuple[Type[BaseException], ...]:
+        """Returns the exceptions that should be handled when
+        calling _graceful_close.
+        """
+        return (asyncio.TimeoutError, asyncio.CancelledError, OSError)
+
+    async def _terminate_graceful_close(self) -> None:
+        """Try to close connection gracefully"""
+        raise NotImplementedError
+
+    def _terminate_force_close(self) -> None:
+        """Terminate the connection"""
+        raise NotImplementedError
diff --git a/libs/sqlalchemy/connectors/pyodbc.py b/libs/sqlalchemy/connectors/pyodbc.py
index 92b7c3a413..ac327b86d4 100644
--- a/libs/sqlalchemy/connectors/pyodbc.py
+++ b/libs/sqlalchemy/connectors/pyodbc.py
@@ -1,5 +1,5 @@
 # connectors/pyodbc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -8,7 +8,6 @@
 from __future__ import annotations
 
 import re
-from types import ModuleType
 import typing
 from typing import Any
 from typing import Dict
@@ -29,6 +28,7 @@
 from ..sql.type_api import TypeEngine
 
 if typing.TYPE_CHECKING:
+    from ..engine.interfaces import DBAPIModule
     from ..engine.interfaces import IsolationLevel
 
 
@@ -48,15 +48,13 @@ class PyODBCConnector(Connector):
     # hold the desired driver name
     pyodbc_driver_name: Optional[str] = None
 
-    dbapi: ModuleType
-
     def __init__(self, use_setinputsizes: bool = False, **kw: Any):
         super().__init__(**kw)
         if use_setinputsizes:
             self.bind_typing = interfaces.BindTyping.SETINPUTSIZES
 
     @classmethod
-    def import_dbapi(cls) -> ModuleType:
+    def import_dbapi(cls) -> DBAPIModule:
         return __import__("pyodbc")
 
     def create_connect_args(self, url: URL) -> ConnectArgsType:
@@ -150,7 +148,7 @@ def is_disconnect(
         ],
         cursor: Optional[interfaces.DBAPICursor],
     ) -> bool:
-        if isinstance(e, self.dbapi.ProgrammingError):
+        if isinstance(e, self.loaded_dbapi.ProgrammingError):
             return "The cursor's connection has been closed." in str(
                 e
             ) or "Attempt to use a closed connection." in str(e)
@@ -227,11 +225,9 @@ def do_set_input_sizes(
         )
 
     def get_isolation_level_values(
-        self, dbapi_connection: interfaces.DBAPIConnection
+        self, dbapi_conn: interfaces.DBAPIConnection
     ) -> List[IsolationLevel]:
-        return super().get_isolation_level_values(dbapi_connection) + [
-            "AUTOCOMMIT"
-        ]
+        return [*super().get_isolation_level_values(dbapi_conn), "AUTOCOMMIT"]
 
     def set_isolation_level(
         self,
@@ -247,3 +243,8 @@ def set_isolation_level(
         else:
             dbapi_connection.autocommit = False
             super().set_isolation_level(dbapi_connection, level)
+
+    def detect_autocommit_setting(
+        self, dbapi_conn: interfaces.DBAPIConnection
+    ) -> bool:
+        return bool(dbapi_conn.autocommit)
diff --git a/libs/sqlalchemy/cyextension/__init__.py b/libs/sqlalchemy/cyextension/__init__.py
index cb8dc2c6ec..53e10618e4 100644
--- a/libs/sqlalchemy/cyextension/__init__.py
+++ b/libs/sqlalchemy/cyextension/__init__.py
@@ -1,5 +1,5 @@
 # cyextension/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/cyextension/util.pyx b/libs/sqlalchemy/cyextension/util.pyx
index cb17acd69c..68e4f9f436 100644
--- a/libs/sqlalchemy/cyextension/util.pyx
+++ b/libs/sqlalchemy/cyextension/util.pyx
@@ -10,28 +10,24 @@ from sqlalchemy import exc
 
 cdef tuple _Empty_Tuple = ()
 
-cdef inline bint _mapping_or_tuple(object value):
+cdef inline bint _is_mapping_or_tuple(object value):
     return isinstance(value, dict) or isinstance(value, tuple) or isinstance(value, Mapping)
 
-cdef inline bint _check_item(object params) except 0:
-    cdef object item
-    cdef bint ret = 1
-    if params:
-        item = params[0]
-        if not _mapping_or_tuple(item):
-            ret = 0
-            raise exc.ArgumentError(
-                "List argument must consist only of tuples or dictionaries"
-            )
-    return ret
+
+cdef inline bint _is_mapping(object value):
+    return isinstance(value, dict) or isinstance(value, Mapping)
+
 
 def _distill_params_20(object params):
     if params is None:
         return _Empty_Tuple
     elif isinstance(params, list) or isinstance(params, tuple):
-        _check_item(params)
+        if params and not _is_mapping(params[0]):
+            raise exc.ArgumentError(
+                "List argument must consist only of dictionaries"
+            )
         return params
-    elif isinstance(params, dict) or isinstance(params, Mapping):
+    elif _is_mapping(params):
         return [params]
     else:
         raise exc.ArgumentError("mapping or list expected for parameters")
@@ -41,9 +37,12 @@ def _distill_raw_params(object params):
     if params is None:
         return _Empty_Tuple
     elif isinstance(params, list):
-        _check_item(params)
+        if params and not _is_mapping_or_tuple(params[0]):
+            raise exc.ArgumentError(
+                "List argument must consist only of tuples or dictionaries"
+            )
         return params
-    elif _mapping_or_tuple(params):
+    elif _is_mapping_or_tuple(params):
         return [params]
     else:
         raise exc.ArgumentError("mapping or sequence expected for parameters")
diff --git a/libs/sqlalchemy/dialects/__init__.py b/libs/sqlalchemy/dialects/__init__.py
index 31ce6d64b5..d6336c1aa5 100644
--- a/libs/sqlalchemy/dialects/__init__.py
+++ b/libs/sqlalchemy/dialects/__init__.py
@@ -1,5 +1,5 @@
 # dialects/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,6 +7,7 @@
 
 from __future__ import annotations
 
+from typing import Any
 from typing import Callable
 from typing import Optional
 from typing import Type
@@ -39,7 +40,7 @@ def _auto_fn(name: str) -> Optional[Callable[[], Type[Dialect]]]:
             # hardcoded.   if mysql / mariadb etc were third party dialects
             # they would just publish all the entrypoints, which would actually
             # look much nicer.
-            module = __import__(
+            module: Any = __import__(
                 "sqlalchemy.dialects.mysql.mariadb"
             ).dialects.mysql.mariadb
             return module.loader(driver)  # type: ignore
diff --git a/libs/sqlalchemy/dialects/_typing.py b/libs/sqlalchemy/dialects/_typing.py
index 4dd40d7220..bf9b67a0a0 100644
--- a/libs/sqlalchemy/dialects/_typing.py
+++ b/libs/sqlalchemy/dialects/_typing.py
@@ -1,5 +1,5 @@
 # dialects/_typing.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mssql/__init__.py b/libs/sqlalchemy/dialects/mssql/__init__.py
index 20140fdddb..68d1d7c744 100644
--- a/libs/sqlalchemy/dialects/mssql/__init__.py
+++ b/libs/sqlalchemy/dialects/mssql/__init__.py
@@ -1,5 +1,5 @@
 # dialects/mssql/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mssql/aioodbc.py b/libs/sqlalchemy/dialects/mssql/aioodbc.py
index 522ad1d6b0..e4d5b2d221 100644
--- a/libs/sqlalchemy/dialects/mssql/aioodbc.py
+++ b/libs/sqlalchemy/dialects/mssql/aioodbc.py
@@ -1,5 +1,5 @@
 # dialects/mssql/aioodbc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mssql/base.py b/libs/sqlalchemy/dialects/mssql/base.py
index 916809e768..a4f23f9a50 100644
--- a/libs/sqlalchemy/dialects/mssql/base.py
+++ b/libs/sqlalchemy/dialects/mssql/base.py
@@ -1,5 +1,5 @@
 # dialects/mssql/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -984,6 +984,7 @@ class MyClass(Base):
 import datetime
 import operator
 import re
+from typing import Any
 from typing import overload
 from typing import TYPE_CHECKING
 from uuid import UUID as _python_UUID
@@ -1034,6 +1035,7 @@ class MyClass(Base):
 from ...util.typing import Literal
 
 if TYPE_CHECKING:
+    from ...sql.ddl import DropIndex
     from ...sql.dml import DMLState
     from ...sql.selectable import TableClause
 
@@ -2064,8 +2066,8 @@ def visit_char_length_func(self, fn, **kw):
     def visit_aggregate_strings_func(self, fn, **kw):
         expr = fn.clauses.clauses[0]._compiler_dispatch(self, **kw)
         kw["literal_execute"] = True
-        delimeter = fn.clauses.clauses[1]._compiler_dispatch(self, **kw)
-        return f"string_agg({expr}, {delimeter})"
+        delimiter = fn.clauses.clauses[1]._compiler_dispatch(self, **kw)
+        return f"string_agg({expr}, {delimiter})"
 
     def visit_concat_op_expression_clauselist(
         self, clauselist, operator, **kw
@@ -2700,11 +2702,13 @@ def visit_create_index(self, create, include_schema=False, **kw):
 
         return text
 
-    def visit_drop_index(self, drop, **kw):
-        return "\nDROP INDEX %s ON %s" % (
-            self._prepared_index_name(drop.element, include_schema=False),
-            self.preparer.format_table(drop.element.table),
+    def visit_drop_index(self, drop: DropIndex, **kw: Any) -> str:
+        index_name = self._prepared_index_name(
+            drop.element, include_schema=False
         )
+        table_name = self.preparer.format_table(drop.element.table)
+        if_exists = " IF EXISTS" if drop.if_exists else ""
+        return f"\nDROP INDEX{if_exists} {index_name} ON {table_name}"
 
     def visit_primary_key_constraint(self, constraint, **kw):
         if len(constraint) == 0:
@@ -3503,6 +3507,9 @@ def get_indexes(self, connection, tablename, dbname, owner, schema, **kw):
 where
     tab.name = :tabname
     and sch.name = :schname
+order by
+    ind_col.index_id,
+    ind_col.key_ordinal
             """
             )
             .bindparams(
@@ -3632,27 +3639,36 @@ def _get_internal_temp_table_name(self, connection, tablename):
     @reflection.cache
     @_db_plus_owner
     def get_columns(self, connection, tablename, dbname, owner, schema, **kw):
+        sys_columns = ischema.sys_columns
+        sys_types = ischema.sys_types
+        sys_default_constraints = ischema.sys_default_constraints
+        computed_cols = ischema.computed_columns
+        identity_cols = ischema.identity_columns
+        extended_properties = ischema.extended_properties
+
+        # to access sys tables, need an object_id.
+        # object_id() can normally match to the unquoted name even if it
+        # has special characters. however it also accepts quoted names,
+        # which means for the special case that the name itself has
+        # "quotes" (e.g. brackets for SQL Server) we need to "quote" (e.g.
+        # bracket) that name anyway.  Fixed as part of #12654
+
         is_temp_table = tablename.startswith("#")
         if is_temp_table:
             owner, tablename = self._get_internal_temp_table_name(
                 connection, tablename
             )
 
-            columns = ischema.mssql_temp_table_columns
-        else:
-            columns = ischema.columns
-
-        computed_cols = ischema.computed_columns
-        identity_cols = ischema.identity_columns
+        object_id_tokens = [self.identifier_preparer.quote(tablename)]
         if owner:
-            whereclause = sql.and_(
-                columns.c.table_name == tablename,
-                columns.c.table_schema == owner,
-            )
-            full_name = columns.c.table_schema + "." + columns.c.table_name
-        else:
-            whereclause = columns.c.table_name == tablename
-            full_name = columns.c.table_name
+            object_id_tokens.insert(0, self.identifier_preparer.quote(owner))
+
+        if is_temp_table:
+            object_id_tokens.insert(0, "tempdb")
+
+        object_id = func.object_id(".".join(object_id_tokens))
+
+        whereclause = sys_columns.c.object_id == object_id
 
         if self._supports_nvarchar_max:
             computed_definition = computed_cols.c.definition
@@ -3662,92 +3678,112 @@ def get_columns(self, connection, tablename, dbname, owner, schema, **kw):
                 computed_cols.c.definition, NVARCHAR(4000)
             )
 
-        object_id = func.object_id(full_name)
-
         s = (
             sql.select(
-                columns.c.column_name,
-                columns.c.data_type,
-                columns.c.is_nullable,
-                columns.c.character_maximum_length,
-                columns.c.numeric_precision,
-                columns.c.numeric_scale,
-                columns.c.column_default,
-                columns.c.collation_name,
+                sys_columns.c.name,
+                sys_types.c.name,
+                sys_columns.c.is_nullable,
+                sys_columns.c.max_length,
+                sys_columns.c.precision,
+                sys_columns.c.scale,
+                sys_default_constraints.c.definition,
+                sys_columns.c.collation_name,
                 computed_definition,
                 computed_cols.c.is_persisted,
                 identity_cols.c.is_identity,
                 identity_cols.c.seed_value,
                 identity_cols.c.increment_value,
-                ischema.extended_properties.c.value.label("comment"),
+                extended_properties.c.value.label("comment"),
+            )
+            .select_from(sys_columns)
+            .join(
+                sys_types,
+                onclause=sys_columns.c.user_type_id
+                == sys_types.c.user_type_id,
+            )
+            .outerjoin(
+                sys_default_constraints,
+                sql.and_(
+                    sys_default_constraints.c.object_id
+                    == sys_columns.c.default_object_id,
+                    sys_default_constraints.c.parent_column_id
+                    == sys_columns.c.column_id,
+                ),
             )
-            .select_from(columns)
             .outerjoin(
                 computed_cols,
                 onclause=sql.and_(
-                    computed_cols.c.object_id == object_id,
-                    computed_cols.c.name
-                    == columns.c.column_name.collate("DATABASE_DEFAULT"),
+                    computed_cols.c.object_id == sys_columns.c.object_id,
+                    computed_cols.c.column_id == sys_columns.c.column_id,
                 ),
             )
             .outerjoin(
                 identity_cols,
                 onclause=sql.and_(
-                    identity_cols.c.object_id == object_id,
-                    identity_cols.c.name
-                    == columns.c.column_name.collate("DATABASE_DEFAULT"),
+                    identity_cols.c.object_id == sys_columns.c.object_id,
+                    identity_cols.c.column_id == sys_columns.c.column_id,
                 ),
             )
             .outerjoin(
-                ischema.extended_properties,
+                extended_properties,
                 onclause=sql.and_(
-                    ischema.extended_properties.c["class"] == 1,
-                    ischema.extended_properties.c.major_id == object_id,
-                    ischema.extended_properties.c.minor_id
-                    == columns.c.ordinal_position,
-                    ischema.extended_properties.c.name == "MS_Description",
+                    extended_properties.c["class"] == 1,
+                    extended_properties.c.name == "MS_Description",
+                    sys_columns.c.object_id == extended_properties.c.major_id,
+                    sys_columns.c.column_id == extended_properties.c.minor_id,
                 ),
             )
             .where(whereclause)
-            .order_by(columns.c.ordinal_position)
+            .order_by(sys_columns.c.column_id)
         )
 
-        c = connection.execution_options(future_result=True).execute(s)
+        if is_temp_table:
+            exec_opts = {"schema_translate_map": {"sys": "tempdb.sys"}}
+        else:
+            exec_opts = {"schema_translate_map": {}}
+        c = connection.execution_options(**exec_opts).execute(s)
 
         cols = []
         for row in c.mappings():
-            name = row[columns.c.column_name]
-            type_ = row[columns.c.data_type]
-            nullable = row[columns.c.is_nullable] == "YES"
-            charlen = row[columns.c.character_maximum_length]
-            numericprec = row[columns.c.numeric_precision]
-            numericscale = row[columns.c.numeric_scale]
-            default = row[columns.c.column_default]
-            collation = row[columns.c.collation_name]
+            name = row[sys_columns.c.name]
+            type_ = row[sys_types.c.name]
+            nullable = row[sys_columns.c.is_nullable] == 1
+            maxlen = row[sys_columns.c.max_length]
+            numericprec = row[sys_columns.c.precision]
+            numericscale = row[sys_columns.c.scale]
+            default = row[sys_default_constraints.c.definition]
+            collation = row[sys_columns.c.collation_name]
             definition = row[computed_definition]
             is_persisted = row[computed_cols.c.is_persisted]
             is_identity = row[identity_cols.c.is_identity]
             identity_start = row[identity_cols.c.seed_value]
             identity_increment = row[identity_cols.c.increment_value]
-            comment = row[ischema.extended_properties.c.value]
+            comment = row[extended_properties.c.value]
 
             coltype = self.ischema_names.get(type_, None)
 
             kwargs = {}
+
             if coltype in (
+                MSBinary,
+                MSVarBinary,
+                sqltypes.LargeBinary,
+            ):
+                kwargs["length"] = maxlen if maxlen != -1 else None
+            elif coltype in (
                 MSString,
                 MSChar,
+                MSText,
+            ):
+                kwargs["length"] = maxlen if maxlen != -1 else None
+                if collation:
+                    kwargs["collation"] = collation
+            elif coltype in (
                 MSNVarchar,
                 MSNChar,
-                MSText,
                 MSNText,
-                MSBinary,
-                MSVarBinary,
-                sqltypes.LargeBinary,
             ):
-                if charlen == -1:
-                    charlen = None
-                kwargs["length"] = charlen
+                kwargs["length"] = maxlen // 2 if maxlen != -1 else None
                 if collation:
                     kwargs["collation"] = collation
 
@@ -3969,6 +4005,8 @@ def get_foreign_keys(
             index_info.index_schema = fk_info.unique_constraint_schema
             AND index_info.index_name = fk_info.unique_constraint_name
             AND index_info.ordinal_position = fk_info.ordinal_position
+            AND NOT (index_info.table_schema = fk_info.table_schema
+                     AND index_info.table_name = fk_info.table_name)
 
     ORDER BY fk_info.constraint_schema, fk_info.constraint_name,
         fk_info.ordinal_position
@@ -3991,10 +4029,8 @@ def get_foreign_keys(
         )
 
         # group rows by constraint ID, to handle multi-column FKs
-        fkeys = []
-
-        def fkey_rec():
-            return {
+        fkeys = util.defaultdict(
+            lambda: {
                 "name": None,
                 "constrained_columns": [],
                 "referred_schema": None,
@@ -4002,8 +4038,7 @@ def fkey_rec():
                 "referred_columns": [],
                 "options": {},
             }
-
-        fkeys = util.defaultdict(fkey_rec)
+        )
 
         for r in connection.execute(s).all():
             (
diff --git a/libs/sqlalchemy/dialects/mssql/information_schema.py b/libs/sqlalchemy/dialects/mssql/information_schema.py
index b60bb158b4..d739d71823 100644
--- a/libs/sqlalchemy/dialects/mssql/information_schema.py
+++ b/libs/sqlalchemy/dialects/mssql/information_schema.py
@@ -1,5 +1,5 @@
 # dialects/mssql/information_schema.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -88,23 +88,41 @@ def _compile(element, compiler, **kw):
     schema="INFORMATION_SCHEMA",
 )
 
-mssql_temp_table_columns = Table(
-    "COLUMNS",
+sys_columns = Table(
+    "columns",
     ischema,
-    Column("TABLE_SCHEMA", CoerceUnicode, key="table_schema"),
-    Column("TABLE_NAME", CoerceUnicode, key="table_name"),
-    Column("COLUMN_NAME", CoerceUnicode, key="column_name"),
-    Column("IS_NULLABLE", Integer, key="is_nullable"),
-    Column("DATA_TYPE", String, key="data_type"),
-    Column("ORDINAL_POSITION", Integer, key="ordinal_position"),
-    Column(
-        "CHARACTER_MAXIMUM_LENGTH", Integer, key="character_maximum_length"
-    ),
-    Column("NUMERIC_PRECISION", Integer, key="numeric_precision"),
-    Column("NUMERIC_SCALE", Integer, key="numeric_scale"),
-    Column("COLUMN_DEFAULT", Integer, key="column_default"),
-    Column("COLLATION_NAME", String, key="collation_name"),
-    schema="tempdb.INFORMATION_SCHEMA",
+    Column("object_id", Integer),
+    Column("name", CoerceUnicode),
+    Column("column_id", Integer),
+    Column("default_object_id", Integer),
+    Column("user_type_id", Integer),
+    Column("is_nullable", Integer),
+    Column("ordinal_position", Integer),
+    Column("max_length", Integer),
+    Column("precision", Integer),
+    Column("scale", Integer),
+    Column("collation_name", String),
+    schema="sys",
+)
+
+sys_types = Table(
+    "types",
+    ischema,
+    Column("name", CoerceUnicode, key="name"),
+    Column("system_type_id", Integer, key="system_type_id"),
+    Column("user_type_id", Integer, key="user_type_id"),
+    Column("schema_id", Integer, key="schema_id"),
+    Column("max_length", Integer, key="max_length"),
+    Column("precision", Integer, key="precision"),
+    Column("scale", Integer, key="scale"),
+    Column("collation_name", CoerceUnicode, key="collation_name"),
+    Column("is_nullable", Boolean, key="is_nullable"),
+    Column("is_user_defined", Boolean, key="is_user_defined"),
+    Column("is_assembly_type", Boolean, key="is_assembly_type"),
+    Column("default_object_id", Integer, key="default_object_id"),
+    Column("rule_object_id", Integer, key="rule_object_id"),
+    Column("is_table_type", Boolean, key="is_table_type"),
+    schema="sys",
 )
 
 constraints = Table(
@@ -117,6 +135,17 @@ def _compile(element, compiler, **kw):
     schema="INFORMATION_SCHEMA",
 )
 
+sys_default_constraints = Table(
+    "default_constraints",
+    ischema,
+    Column("object_id", Integer),
+    Column("name", CoerceUnicode),
+    Column("schema_id", Integer),
+    Column("parent_column_id", Integer),
+    Column("definition", CoerceUnicode),
+    schema="sys",
+)
+
 column_constraints = Table(
     "CONSTRAINT_COLUMN_USAGE",
     ischema,
@@ -182,6 +211,7 @@ def _compile(element, compiler, **kw):
     ischema,
     Column("object_id", Integer),
     Column("name", CoerceUnicode),
+    Column("column_id", Integer),
     Column("is_computed", Boolean),
     Column("is_persisted", Boolean),
     Column("definition", CoerceUnicode),
@@ -220,6 +250,7 @@ def column_expression(self, colexpr):
     ischema,
     Column("object_id", Integer),
     Column("name", CoerceUnicode),
+    Column("column_id", Integer),
     Column("is_identity", Boolean),
     Column("seed_value", NumericSqlVariant),
     Column("increment_value", NumericSqlVariant),
diff --git a/libs/sqlalchemy/dialects/mssql/json.py b/libs/sqlalchemy/dialects/mssql/json.py
index a2d3ce8146..cb071884ac 100644
--- a/libs/sqlalchemy/dialects/mssql/json.py
+++ b/libs/sqlalchemy/dialects/mssql/json.py
@@ -1,5 +1,5 @@
 # dialects/mssql/json.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mssql/provision.py b/libs/sqlalchemy/dialects/mssql/provision.py
index 10165856e1..63d6a6e8d9 100644
--- a/libs/sqlalchemy/dialects/mssql/provision.py
+++ b/libs/sqlalchemy/dialects/mssql/provision.py
@@ -1,5 +1,5 @@
 # dialects/mssql/provision.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -136,6 +136,29 @@ def _mssql_get_temp_table_name(cfg, eng, base_name):
 def drop_all_schema_objects_pre_tables(cfg, eng):
     with eng.connect().execution_options(isolation_level="AUTOCOMMIT") as conn:
         inspector = inspect(conn)
+
+        # Drop all full-text indexes before dropping catalogs
+        fulltext_indexes = conn.exec_driver_sql(
+            "SELECT OBJECT_SCHEMA_NAME(object_id) AS schema_name, "
+            "OBJECT_NAME(object_id) AS table_name "
+            "FROM sys.fulltext_indexes"
+        ).fetchall()
+
+        for schema_name, table_name in fulltext_indexes:
+            if schema_name:
+                qualified_name = f"[{schema_name}].[{table_name}]"
+            else:
+                qualified_name = f"[{table_name}]"
+            conn.exec_driver_sql(f"DROP FULLTEXT INDEX ON {qualified_name}")
+
+        # Now drop all full-text catalogs
+        fulltext_catalogs = conn.exec_driver_sql(
+            "SELECT name FROM sys.fulltext_catalogs"
+        ).fetchall()
+
+        for (catalog_name,) in fulltext_catalogs:
+            conn.exec_driver_sql(f"DROP FULLTEXT CATALOG [{catalog_name}]")
+
         for schema in (None, "dbo", cfg.test_schema, cfg.test_schema_2):
             for tname in inspector.get_table_names(schema=schema):
                 tb = Table(
diff --git a/libs/sqlalchemy/dialects/mssql/pymssql.py b/libs/sqlalchemy/dialects/mssql/pymssql.py
index 301a98eb41..7244bb0d3e 100644
--- a/libs/sqlalchemy/dialects/mssql/pymssql.py
+++ b/libs/sqlalchemy/dialects/mssql/pymssql.py
@@ -1,5 +1,5 @@
 # dialects/mssql/pymssql.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mssql/pyodbc.py b/libs/sqlalchemy/dialects/mssql/pyodbc.py
index cbf0adbfe0..5d3ae0b13f 100644
--- a/libs/sqlalchemy/dialects/mssql/pyodbc.py
+++ b/libs/sqlalchemy/dialects/mssql/pyodbc.py
@@ -1,5 +1,5 @@
 # dialects/mssql/pyodbc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mysql/__init__.py b/libs/sqlalchemy/dialects/mysql/__init__.py
index 9174c54413..4297414f0d 100644
--- a/libs/sqlalchemy/dialects/mysql/__init__.py
+++ b/libs/sqlalchemy/dialects/mysql/__init__.py
@@ -1,5 +1,5 @@
 # dialects/mysql/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mysql/aiomysql.py b/libs/sqlalchemy/dialects/mysql/aiomysql.py
index bd5e7de6b4..7e68c61dac 100644
--- a/libs/sqlalchemy/dialects/mysql/aiomysql.py
+++ b/libs/sqlalchemy/dialects/mysql/aiomysql.py
@@ -1,10 +1,9 @@
 # dialects/mysql/aiomysql.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 r"""
 .. dialect:: mysql+aiomysql
@@ -29,207 +28,108 @@
     )
 
 """  # noqa
-from collections import deque
+from __future__ import annotations
+
+from types import ModuleType
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .pymysql import MySQLDialect_pymysql
 from ... import pool
 from ... import util
-from ...engine import AdaptedConnection
-from ...util.concurrency import asyncio
+from ...connectors.asyncio import AsyncAdapt_dbapi_connection
+from ...connectors.asyncio import AsyncAdapt_dbapi_cursor
+from ...connectors.asyncio import AsyncAdapt_dbapi_module
+from ...connectors.asyncio import AsyncAdapt_dbapi_ss_cursor
+from ...connectors.asyncio import AsyncAdapt_terminate
 from ...util.concurrency import await_fallback
 from ...util.concurrency import await_only
 
+if TYPE_CHECKING:
 
-class AsyncAdapt_aiomysql_cursor:
-    # TODO: base on connectors/asyncio.py
-    # see #10415
-    server_side = False
-    __slots__ = (
-        "_adapt_connection",
-        "_connection",
-        "await_",
-        "_cursor",
-        "_rows",
-    )
-
-    def __init__(self, adapt_connection):
-        self._adapt_connection = adapt_connection
-        self._connection = adapt_connection._connection
-        self.await_ = adapt_connection.await_
-
-        cursor = self._connection.cursor(adapt_connection.dbapi.Cursor)
-
-        # see https://github.com/aio-libs/aiomysql/issues/543
-        self._cursor = self.await_(cursor.__aenter__())
-        self._rows = deque()
-
-    @property
-    def description(self):
-        return self._cursor.description
-
-    @property
-    def rowcount(self):
-        return self._cursor.rowcount
-
-    @property
-    def arraysize(self):
-        return self._cursor.arraysize
-
-    @arraysize.setter
-    def arraysize(self, value):
-        self._cursor.arraysize = value
-
-    @property
-    def lastrowid(self):
-        return self._cursor.lastrowid
-
-    def close(self):
-        # note we aren't actually closing the cursor here,
-        # we are just letting GC do it.   to allow this to be async
-        # we would need the Result to change how it does "Safe close cursor".
-        # MySQL "cursors" don't actually have state to be "closed" besides
-        # exhausting rows, which we already have done for sync cursor.
-        # another option would be to emulate aiosqlite dialect and assign
-        # cursor only if we are doing server side cursor operation.
-        self._rows.clear()
-
-    def execute(self, operation, parameters=None):
-        return self.await_(self._execute_async(operation, parameters))
-
-    def executemany(self, operation, seq_of_parameters):
-        return self.await_(
-            self._executemany_async(operation, seq_of_parameters)
-        )
-
-    async def _execute_async(self, operation, parameters):
-        async with self._adapt_connection._execute_mutex:
-            result = await self._cursor.execute(operation, parameters)
-
-            if not self.server_side:
-                # aiomysql has a "fake" async result, so we have to pull it out
-                # of that here since our default result is not async.
-                # we could just as easily grab "_rows" here and be done with it
-                # but this is safer.
-                self._rows = deque(await self._cursor.fetchall())
-            return result
-
-    async def _executemany_async(self, operation, seq_of_parameters):
-        async with self._adapt_connection._execute_mutex:
-            return await self._cursor.executemany(operation, seq_of_parameters)
-
-    def setinputsizes(self, *inputsizes):
-        pass
-
-    def __iter__(self):
-        while self._rows:
-            yield self._rows.popleft()
-
-    def fetchone(self):
-        if self._rows:
-            return self._rows.popleft()
-        else:
-            return None
-
-    def fetchmany(self, size=None):
-        if size is None:
-            size = self.arraysize
-
-        rr = self._rows
-        return [rr.popleft() for _ in range(min(size, len(rr)))]
+    from ...connectors.asyncio import AsyncIODBAPIConnection
+    from ...connectors.asyncio import AsyncIODBAPICursor
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...engine.url import URL
 
-    def fetchall(self):
-        retval = list(self._rows)
-        self._rows.clear()
-        return retval
 
-
-class AsyncAdapt_aiomysql_ss_cursor(AsyncAdapt_aiomysql_cursor):
-    # TODO: base on connectors/asyncio.py
-    # see #10415
+class AsyncAdapt_aiomysql_cursor(AsyncAdapt_dbapi_cursor):
     __slots__ = ()
-    server_side = True
-
-    def __init__(self, adapt_connection):
-        self._adapt_connection = adapt_connection
-        self._connection = adapt_connection._connection
-        self.await_ = adapt_connection.await_
-
-        cursor = self._connection.cursor(adapt_connection.dbapi.SSCursor)
-
-        self._cursor = self.await_(cursor.__aenter__())
 
-    def close(self):
-        if self._cursor is not None:
-            self.await_(self._cursor.close())
-            self._cursor = None
+    def _make_new_cursor(
+        self, connection: AsyncIODBAPIConnection
+    ) -> AsyncIODBAPICursor:
+        return connection.cursor(self._adapt_connection.dbapi.Cursor)
 
-    def fetchone(self):
-        return self.await_(self._cursor.fetchone())
 
-    def fetchmany(self, size=None):
-        return self.await_(self._cursor.fetchmany(size=size))
+class AsyncAdapt_aiomysql_ss_cursor(
+    AsyncAdapt_dbapi_ss_cursor, AsyncAdapt_aiomysql_cursor
+):
+    __slots__ = ()
 
-    def fetchall(self):
-        return self.await_(self._cursor.fetchall())
+    def _make_new_cursor(
+        self, connection: AsyncIODBAPIConnection
+    ) -> AsyncIODBAPICursor:
+        return connection.cursor(
+            self._adapt_connection.dbapi.aiomysql.cursors.SSCursor
+        )
 
 
-class AsyncAdapt_aiomysql_connection(AdaptedConnection):
-    # TODO: base on connectors/asyncio.py
-    # see #10415
-    await_ = staticmethod(await_only)
-    __slots__ = ("dbapi", "_execute_mutex")
+class AsyncAdapt_aiomysql_connection(
+    AsyncAdapt_terminate, AsyncAdapt_dbapi_connection
+):
+    __slots__ = ()
 
-    def __init__(self, dbapi, connection):
-        self.dbapi = dbapi
-        self._connection = connection
-        self._execute_mutex = asyncio.Lock()
+    _cursor_cls = AsyncAdapt_aiomysql_cursor
+    _ss_cursor_cls = AsyncAdapt_aiomysql_ss_cursor
 
-    def ping(self, reconnect):
-        return self.await_(self._connection.ping(reconnect))
+    def ping(self, reconnect: bool) -> None:
+        assert not reconnect
+        self.await_(self._connection.ping(reconnect))
 
-    def character_set_name(self):
-        return self._connection.character_set_name()
+    def character_set_name(self) -> Optional[str]:
+        return self._connection.character_set_name()  # type: ignore[no-any-return]  # noqa: E501
 
-    def autocommit(self, value):
+    def autocommit(self, value: Any) -> None:
         self.await_(self._connection.autocommit(value))
 
-    def cursor(self, server_side=False):
-        if server_side:
-            return AsyncAdapt_aiomysql_ss_cursor(self)
-        else:
-            return AsyncAdapt_aiomysql_cursor(self)
+    def get_autocommit(self) -> bool:
+        return self._connection.get_autocommit()  # type: ignore
 
-    def rollback(self):
-        self.await_(self._connection.rollback())
+    def close(self) -> None:
+        self.await_(self._connection.ensure_closed())
 
-    def commit(self):
-        self.await_(self._connection.commit())
+    async def _terminate_graceful_close(self) -> None:
+        await self._connection.ensure_closed()
 
-    def terminate(self):
+    def _terminate_force_close(self) -> None:
         # it's not awaitable.
         self._connection.close()
 
-    def close(self) -> None:
-        self.await_(self._connection.ensure_closed())
-
 
 class AsyncAdaptFallback_aiomysql_connection(AsyncAdapt_aiomysql_connection):
-    # TODO: base on connectors/asyncio.py
-    # see #10415
     __slots__ = ()
 
     await_ = staticmethod(await_fallback)
 
 
-class AsyncAdapt_aiomysql_dbapi:
-    def __init__(self, aiomysql, pymysql):
+class AsyncAdapt_aiomysql_dbapi(AsyncAdapt_dbapi_module):
+    def __init__(self, aiomysql: ModuleType, pymysql: ModuleType):
         self.aiomysql = aiomysql
         self.pymysql = pymysql
         self.paramstyle = "format"
         self._init_dbapi_attributes()
         self.Cursor, self.SSCursor = self._init_cursors_subclasses()
 
-    def _init_dbapi_attributes(self):
+    def _init_dbapi_attributes(self) -> None:
         for name in (
             "Warning",
             "Error",
@@ -255,7 +155,7 @@ def _init_dbapi_attributes(self):
         ):
             setattr(self, name, getattr(self.pymysql, name))
 
-    def connect(self, *arg, **kw):
+    def connect(self, *arg: Any, **kw: Any) -> AsyncAdapt_aiomysql_connection:
         async_fallback = kw.pop("async_fallback", False)
         creator_fn = kw.pop("async_creator_fn", self.aiomysql.connect)
 
@@ -270,17 +170,23 @@ def connect(self, *arg, **kw):
                 await_only(creator_fn(*arg, **kw)),
             )
 
-    def _init_cursors_subclasses(self):
+    def _init_cursors_subclasses(
+        self,
+    ) -> Tuple[AsyncIODBAPICursor, AsyncIODBAPICursor]:
         # suppress unconditional warning emitted by aiomysql
-        class Cursor(self.aiomysql.Cursor):
-            async def _show_warnings(self, conn):
+        class Cursor(self.aiomysql.Cursor):  # type: ignore[misc, name-defined]
+            async def _show_warnings(
+                self, conn: AsyncIODBAPIConnection
+            ) -> None:
                 pass
 
-        class SSCursor(self.aiomysql.SSCursor):
-            async def _show_warnings(self, conn):
+        class SSCursor(self.aiomysql.SSCursor):  # type: ignore[misc, name-defined]   # noqa: E501
+            async def _show_warnings(
+                self, conn: AsyncIODBAPIConnection
+            ) -> None:
                 pass
 
-        return Cursor, SSCursor
+        return Cursor, SSCursor  # type: ignore[return-value]
 
 
 class MySQLDialect_aiomysql(MySQLDialect_pymysql):
@@ -294,13 +200,13 @@ class MySQLDialect_aiomysql(MySQLDialect_pymysql):
     has_terminate = True
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> AsyncAdapt_aiomysql_dbapi:
         return AsyncAdapt_aiomysql_dbapi(
             __import__("aiomysql"), __import__("pymysql")
         )
 
     @classmethod
-    def get_pool_class(cls, url):
+    def get_pool_class(cls, url: URL) -> type:
         async_fallback = url.query.get("async_fallback", False)
 
         if util.asbool(async_fallback):
@@ -308,28 +214,37 @@ def get_pool_class(cls, url):
         else:
             return pool.AsyncAdaptedQueuePool
 
-    def do_terminate(self, dbapi_connection) -> None:
+    def do_terminate(self, dbapi_connection: DBAPIConnection) -> None:
         dbapi_connection.terminate()
 
-    def create_connect_args(self, url):
+    def create_connect_args(
+        self, url: URL, _translate_args: Optional[Dict[str, Any]] = None
+    ) -> ConnectArgsType:
         return super().create_connect_args(
             url, _translate_args=dict(username="user", database="db")
         )
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
         if super().is_disconnect(e, connection, cursor):
             return True
         else:
             str_e = str(e).lower()
             return "not connected" in str_e
 
-    def _found_rows_client_flag(self):
-        from pymysql.constants import CLIENT
+    def _found_rows_client_flag(self) -> int:
+        from pymysql.constants import CLIENT  # type: ignore
 
-        return CLIENT.FOUND_ROWS
+        return CLIENT.FOUND_ROWS  # type: ignore[no-any-return]
 
-    def get_driver_connection(self, connection):
-        return connection._connection
+    def get_driver_connection(
+        self, connection: DBAPIConnection
+    ) -> AsyncIODBAPIConnection:
+        return connection._connection  # type: ignore[no-any-return]
 
 
 dialect = MySQLDialect_aiomysql
diff --git a/libs/sqlalchemy/dialects/mysql/asyncmy.py b/libs/sqlalchemy/dialects/mysql/asyncmy.py
index 9ec54e694d..5757476175 100644
--- a/libs/sqlalchemy/dialects/mysql/asyncmy.py
+++ b/libs/sqlalchemy/dialects/mysql/asyncmy.py
@@ -1,10 +1,9 @@
 # dialects/mysql/asyncmy.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 r"""
 .. dialect:: mysql+asyncmy
@@ -27,209 +26,100 @@
     )
 
 """  # noqa
-from collections import deque
-from contextlib import asynccontextmanager
+from __future__ import annotations
+
+from types import ModuleType
+from typing import Any
+from typing import NoReturn
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .pymysql import MySQLDialect_pymysql
 from ... import pool
 from ... import util
-from ...engine import AdaptedConnection
-from ...util.concurrency import asyncio
+from ...connectors.asyncio import AsyncAdapt_dbapi_connection
+from ...connectors.asyncio import AsyncAdapt_dbapi_cursor
+from ...connectors.asyncio import AsyncAdapt_dbapi_module
+from ...connectors.asyncio import AsyncAdapt_dbapi_ss_cursor
+from ...connectors.asyncio import AsyncAdapt_terminate
 from ...util.concurrency import await_fallback
 from ...util.concurrency import await_only
 
+if TYPE_CHECKING:
+    from ...connectors.asyncio import AsyncIODBAPIConnection
+    from ...connectors.asyncio import AsyncIODBAPICursor
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...engine.url import URL
 
-class AsyncAdapt_asyncmy_cursor:
-    # TODO: base on connectors/asyncio.py
-    # see #10415
-    server_side = False
-    __slots__ = (
-        "_adapt_connection",
-        "_connection",
-        "await_",
-        "_cursor",
-        "_rows",
-    )
-
-    def __init__(self, adapt_connection):
-        self._adapt_connection = adapt_connection
-        self._connection = adapt_connection._connection
-        self.await_ = adapt_connection.await_
-
-        cursor = self._connection.cursor()
-
-        self._cursor = self.await_(cursor.__aenter__())
-        self._rows = deque()
-
-    @property
-    def description(self):
-        return self._cursor.description
-
-    @property
-    def rowcount(self):
-        return self._cursor.rowcount
-
-    @property
-    def arraysize(self):
-        return self._cursor.arraysize
-
-    @arraysize.setter
-    def arraysize(self, value):
-        self._cursor.arraysize = value
-
-    @property
-    def lastrowid(self):
-        return self._cursor.lastrowid
-
-    def close(self):
-        # note we aren't actually closing the cursor here,
-        # we are just letting GC do it.   to allow this to be async
-        # we would need the Result to change how it does "Safe close cursor".
-        # MySQL "cursors" don't actually have state to be "closed" besides
-        # exhausting rows, which we already have done for sync cursor.
-        # another option would be to emulate aiosqlite dialect and assign
-        # cursor only if we are doing server side cursor operation.
-        self._rows.clear()
-
-    def execute(self, operation, parameters=None):
-        return self.await_(self._execute_async(operation, parameters))
-
-    def executemany(self, operation, seq_of_parameters):
-        return self.await_(
-            self._executemany_async(operation, seq_of_parameters)
-        )
-
-    async def _execute_async(self, operation, parameters):
-        async with self._adapt_connection._mutex_and_adapt_errors():
-            if parameters is None:
-                result = await self._cursor.execute(operation)
-            else:
-                result = await self._cursor.execute(operation, parameters)
-
-            if not self.server_side:
-                # asyncmy has a "fake" async result, so we have to pull it out
-                # of that here since our default result is not async.
-                # we could just as easily grab "_rows" here and be done with it
-                # but this is safer.
-                self._rows = deque(await self._cursor.fetchall())
-            return result
-
-    async def _executemany_async(self, operation, seq_of_parameters):
-        async with self._adapt_connection._mutex_and_adapt_errors():
-            return await self._cursor.executemany(operation, seq_of_parameters)
-
-    def setinputsizes(self, *inputsizes):
-        pass
-
-    def __iter__(self):
-        while self._rows:
-            yield self._rows.popleft()
-
-    def fetchone(self):
-        if self._rows:
-            return self._rows.popleft()
-        else:
-            return None
-
-    def fetchmany(self, size=None):
-        if size is None:
-            size = self.arraysize
-
-        rr = self._rows
-        return [rr.popleft() for _ in range(min(size, len(rr)))]
 
-    def fetchall(self):
-        retval = list(self._rows)
-        self._rows.clear()
-        return retval
+class AsyncAdapt_asyncmy_cursor(AsyncAdapt_dbapi_cursor):
+    __slots__ = ()
 
 
-class AsyncAdapt_asyncmy_ss_cursor(AsyncAdapt_asyncmy_cursor):
-    # TODO: base on connectors/asyncio.py
-    # see #10415
+class AsyncAdapt_asyncmy_ss_cursor(
+    AsyncAdapt_dbapi_ss_cursor, AsyncAdapt_asyncmy_cursor
+):
     __slots__ = ()
-    server_side = True
-
-    def __init__(self, adapt_connection):
-        self._adapt_connection = adapt_connection
-        self._connection = adapt_connection._connection
-        self.await_ = adapt_connection.await_
 
-        cursor = self._connection.cursor(
-            adapt_connection.dbapi.asyncmy.cursors.SSCursor
+    def _make_new_cursor(
+        self, connection: AsyncIODBAPIConnection
+    ) -> AsyncIODBAPICursor:
+        return connection.cursor(
+            self._adapt_connection.dbapi.asyncmy.cursors.SSCursor
         )
 
-        self._cursor = self.await_(cursor.__aenter__())
-
-    def close(self):
-        if self._cursor is not None:
-            self.await_(self._cursor.close())
-            self._cursor = None
-
-    def fetchone(self):
-        return self.await_(self._cursor.fetchone())
-
-    def fetchmany(self, size=None):
-        return self.await_(self._cursor.fetchmany(size=size))
-
-    def fetchall(self):
-        return self.await_(self._cursor.fetchall())
 
+class AsyncAdapt_asyncmy_connection(
+    AsyncAdapt_terminate, AsyncAdapt_dbapi_connection
+):
+    __slots__ = ()
 
-class AsyncAdapt_asyncmy_connection(AdaptedConnection):
-    # TODO: base on connectors/asyncio.py
-    # see #10415
-    await_ = staticmethod(await_only)
-    __slots__ = ("dbapi", "_execute_mutex")
+    _cursor_cls = AsyncAdapt_asyncmy_cursor
+    _ss_cursor_cls = AsyncAdapt_asyncmy_ss_cursor
 
-    def __init__(self, dbapi, connection):
-        self.dbapi = dbapi
-        self._connection = connection
-        self._execute_mutex = asyncio.Lock()
+    def _handle_exception(self, error: Exception) -> NoReturn:
+        if isinstance(error, AttributeError):
+            raise self.dbapi.InternalError(
+                "network operation failed due to asyncmy attribute error"
+            )
 
-    @asynccontextmanager
-    async def _mutex_and_adapt_errors(self):
-        async with self._execute_mutex:
-            try:
-                yield
-            except AttributeError:
-                raise self.dbapi.InternalError(
-                    "network operation failed due to asyncmy attribute error"
-                )
+        raise error
 
-    def ping(self, reconnect):
+    def ping(self, reconnect: bool) -> None:
         assert not reconnect
         return self.await_(self._do_ping())
 
-    async def _do_ping(self):
-        async with self._mutex_and_adapt_errors():
-            return await self._connection.ping(False)
+    async def _do_ping(self) -> None:
+        try:
+            async with self._execute_mutex:
+                await self._connection.ping(False)
+        except Exception as error:
+            self._handle_exception(error)
 
-    def character_set_name(self):
-        return self._connection.character_set_name()
+    def character_set_name(self) -> Optional[str]:
+        return self._connection.character_set_name()  # type: ignore[no-any-return]  # noqa: E501
 
-    def autocommit(self, value):
+    def autocommit(self, value: Any) -> None:
         self.await_(self._connection.autocommit(value))
 
-    def cursor(self, server_side=False):
-        if server_side:
-            return AsyncAdapt_asyncmy_ss_cursor(self)
-        else:
-            return AsyncAdapt_asyncmy_cursor(self)
+    def get_autocommit(self) -> bool:
+        return self._connection.get_autocommit()  # type: ignore
 
-    def rollback(self):
-        self.await_(self._connection.rollback())
+    def close(self) -> None:
+        self.await_(self._connection.ensure_closed())
 
-    def commit(self):
-        self.await_(self._connection.commit())
+    async def _terminate_graceful_close(self) -> None:
+        await self._connection.ensure_closed()
 
-    def terminate(self):
+    def _terminate_force_close(self) -> None:
         # it's not awaitable.
         self._connection.close()
 
-    def close(self) -> None:
-        self.await_(self._connection.ensure_closed())
-
 
 class AsyncAdaptFallback_asyncmy_connection(AsyncAdapt_asyncmy_connection):
     __slots__ = ()
@@ -237,18 +127,13 @@ class AsyncAdaptFallback_asyncmy_connection(AsyncAdapt_asyncmy_connection):
     await_ = staticmethod(await_fallback)
 
 
-def _Binary(x):
-    """Return x as a binary type."""
-    return bytes(x)
-
-
-class AsyncAdapt_asyncmy_dbapi:
-    def __init__(self, asyncmy):
+class AsyncAdapt_asyncmy_dbapi(AsyncAdapt_dbapi_module):
+    def __init__(self, asyncmy: ModuleType):
         self.asyncmy = asyncmy
         self.paramstyle = "format"
         self._init_dbapi_attributes()
 
-    def _init_dbapi_attributes(self):
+    def _init_dbapi_attributes(self) -> None:
         for name in (
             "Warning",
             "Error",
@@ -269,9 +154,9 @@ def _init_dbapi_attributes(self):
     BINARY = util.symbol("BINARY")
     DATETIME = util.symbol("DATETIME")
     TIMESTAMP = util.symbol("TIMESTAMP")
-    Binary = staticmethod(_Binary)
+    Binary = staticmethod(bytes)
 
-    def connect(self, *arg, **kw):
+    def connect(self, *arg: Any, **kw: Any) -> AsyncAdapt_asyncmy_connection:
         async_fallback = kw.pop("async_fallback", False)
         creator_fn = kw.pop("async_creator_fn", self.asyncmy.connect)
 
@@ -298,11 +183,11 @@ class MySQLDialect_asyncmy(MySQLDialect_pymysql):
     has_terminate = True
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> DBAPIModule:
         return AsyncAdapt_asyncmy_dbapi(__import__("asyncmy"))
 
     @classmethod
-    def get_pool_class(cls, url):
+    def get_pool_class(cls, url: URL) -> type:
         async_fallback = url.query.get("async_fallback", False)
 
         if util.asbool(async_fallback):
@@ -310,15 +195,20 @@ def get_pool_class(cls, url):
         else:
             return pool.AsyncAdaptedQueuePool
 
-    def do_terminate(self, dbapi_connection) -> None:
+    def do_terminate(self, dbapi_connection: DBAPIConnection) -> None:
         dbapi_connection.terminate()
 
-    def create_connect_args(self, url):
+    def create_connect_args(self, url: URL) -> ConnectArgsType:  # type: ignore[override]  # noqa: E501
         return super().create_connect_args(
             url, _translate_args=dict(username="user", database="db")
         )
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
         if super().is_disconnect(e, connection, cursor):
             return True
         else:
@@ -327,13 +217,15 @@ def is_disconnect(self, e, connection, cursor):
                 "not connected" in str_e or "network operation failed" in str_e
             )
 
-    def _found_rows_client_flag(self):
-        from asyncmy.constants import CLIENT
+    def _found_rows_client_flag(self) -> int:
+        from asyncmy.constants import CLIENT  # type: ignore
 
-        return CLIENT.FOUND_ROWS
+        return CLIENT.FOUND_ROWS  # type: ignore[no-any-return]
 
-    def get_driver_connection(self, connection):
-        return connection._connection
+    def get_driver_connection(
+        self, connection: DBAPIConnection
+    ) -> AsyncIODBAPIConnection:
+        return connection._connection  # type: ignore[no-any-return]
 
 
 dialect = MySQLDialect_asyncmy
diff --git a/libs/sqlalchemy/dialects/mysql/base.py b/libs/sqlalchemy/dialects/mysql/base.py
index db887269c9..bc8875efc0 100644
--- a/libs/sqlalchemy/dialects/mysql/base.py
+++ b/libs/sqlalchemy/dialects/mysql/base.py
@@ -1,10 +1,9 @@
 # dialects/mysql/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 
 r"""
@@ -182,6 +181,31 @@
 constraints, all participating ``CREATE TABLE`` statements must specify a
 transactional engine, which in the vast majority of cases is ``InnoDB``.
 
+Partitioning can similarly be specified using similar options.
+In the example below the create table will specify ``PARTITION_BY``,
+``PARTITIONS``, ``SUBPARTITIONS`` and ``SUBPARTITION_BY``::
+
+    # can also use mariadb_* prefix
+    Table(
+        "testtable",
+        MetaData(),
+        Column("id", Integer(), primary_key=True, autoincrement=True),
+        Column("other_id", Integer(), primary_key=True, autoincrement=False),
+        mysql_partitions="2",
+        mysql_partition_by="KEY(other_id)",
+        mysql_subpartition_by="HASH(some_expr)",
+        mysql_subpartitions="2",
+    )
+
+This will render:
+
+.. sourcecode:: sql
+
+    CREATE TABLE testtable (
+            id INTEGER NOT NULL AUTO_INCREMENT,
+            other_id INTEGER NOT NULL,
+            PRIMARY KEY (id, other_id)
+    )PARTITION BY KEY(other_id) PARTITIONS 2 SUBPARTITION BY HASH(some_expr) SUBPARTITIONS 2
 
 Case Sensitivity and Table Reflection
 -------------------------------------
@@ -1041,11 +1065,22 @@ class MyClass(Base):
 """  # noqa
 from __future__ import annotations
 
-from array import array as _array
 from collections import defaultdict
 from itertools import compress
 import re
+from typing import Any
+from typing import Callable
 from typing import cast
+from typing import DefaultDict
+from typing import Dict
+from typing import List
+from typing import NoReturn
+from typing import Optional
+from typing import overload
+from typing import Sequence
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
 
 from . import reflection as _reflection
 from .enumerated import ENUM
@@ -1088,7 +1123,6 @@ class MyClass(Base):
 from .types import YEAR
 from ... import exc
 from ... import literal_column
-from ... import log
 from ... import schema as sa_schema
 from ... import sql
 from ... import util
@@ -1112,10 +1146,47 @@ class MyClass(Base):
 from ...types import BLOB
 from ...types import BOOLEAN
 from ...types import DATE
+from ...types import LargeBinary
 from ...types import UUID
 from ...types import VARBINARY
 from ...util import topological
 
+if TYPE_CHECKING:
+
+    from ...dialects.mysql import expression
+    from ...dialects.mysql.dml import OnDuplicateClause
+    from ...engine.base import Connection
+    from ...engine.cursor import CursorResult
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import IsolationLevel
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...engine.interfaces import ReflectedCheckConstraint
+    from ...engine.interfaces import ReflectedColumn
+    from ...engine.interfaces import ReflectedForeignKeyConstraint
+    from ...engine.interfaces import ReflectedIndex
+    from ...engine.interfaces import ReflectedPrimaryKeyConstraint
+    from ...engine.interfaces import ReflectedTableComment
+    from ...engine.interfaces import ReflectedUniqueConstraint
+    from ...engine.row import Row
+    from ...engine.url import URL
+    from ...schema import Table
+    from ...sql import ddl
+    from ...sql import selectable
+    from ...sql.dml import _DMLTableElement
+    from ...sql.dml import Delete
+    from ...sql.dml import Update
+    from ...sql.dml import ValuesBase
+    from ...sql.functions import aggregate_strings
+    from ...sql.functions import random
+    from ...sql.functions import rollup
+    from ...sql.functions import sysdate
+    from ...sql.schema import IdentityOptions
+    from ...sql.schema import Sequence as Sequence_SchemaItem
+    from ...sql.type_api import TypeEngine
+    from ...sql.visitors import ExternallyTraversible
+
 
 SET_RE = re.compile(
     r"\s*SET\s+(?:(?:GLOBAL|SESSION)\s+)?\w", re.I | re.UNICODE
@@ -1210,7 +1281,7 @@ class MyClass(Base):
 
 
 class MySQLExecutionContext(default.DefaultExecutionContext):
-    def post_exec(self):
+    def post_exec(self) -> None:
         if (
             self.isdelete
             and cast(SQLCompiler, self.compiled).effective_returning
@@ -1227,7 +1298,7 @@ def post_exec(self):
                 _cursor.FullyBufferedCursorFetchStrategy(
                     self.cursor,
                     [
-                        (entry.keyname, None)
+                        (entry.keyname, None)  # type: ignore[misc]
                         for entry in cast(
                             SQLCompiler, self.compiled
                         )._result_columns
@@ -1236,14 +1307,18 @@ def post_exec(self):
                 )
             )
 
-    def create_server_side_cursor(self):
+    def create_server_side_cursor(self) -> DBAPICursor:
         if self.dialect.supports_server_side_cursors:
-            return self._dbapi_connection.cursor(self.dialect._sscursor)
+            return self._dbapi_connection.cursor(
+                self.dialect._sscursor  # type: ignore[attr-defined]
+            )
         else:
             raise NotImplementedError()
 
-    def fire_sequence(self, seq, type_):
-        return self._execute_scalar(
+    def fire_sequence(
+        self, seq: Sequence_SchemaItem, type_: sqltypes.Integer
+    ) -> int:
+        return self._execute_scalar(  # type: ignore[no-any-return]
             (
                 "select nextval(%s)"
                 % self.identifier_preparer.format_sequence(seq)
@@ -1253,46 +1328,51 @@ def fire_sequence(self, seq, type_):
 
 
 class MySQLCompiler(compiler.SQLCompiler):
+    dialect: MySQLDialect
     render_table_with_column_in_update_from = True
     """Overridden from base SQLCompiler value"""
 
     extract_map = compiler.SQLCompiler.extract_map.copy()
     extract_map.update({"milliseconds": "millisecond"})
 
-    def default_from(self):
+    def default_from(self) -> str:
         """Called when a ``SELECT`` statement has no froms,
         and no ``FROM`` clause is to be appended.
 
         """
         if self.stack:
             stmt = self.stack[-1]["selectable"]
-            if stmt._where_criteria:
+            if stmt._where_criteria:  # type: ignore[attr-defined]
                 return " FROM DUAL"
 
         return ""
 
-    def visit_random_func(self, fn, **kw):
+    def visit_random_func(self, fn: random, **kw: Any) -> str:
         return "rand%s" % self.function_argspec(fn)
 
-    def visit_rollup_func(self, fn, **kw):
+    def visit_rollup_func(self, fn: rollup[Any], **kw: Any) -> str:
         clause = ", ".join(
             elem._compiler_dispatch(self, **kw) for elem in fn.clauses
         )
         return f"{clause} WITH ROLLUP"
 
-    def visit_aggregate_strings_func(self, fn, **kw):
-        expr, delimeter = (
+    def visit_aggregate_strings_func(
+        self, fn: aggregate_strings, **kw: Any
+    ) -> str:
+        expr, delimiter = (
             elem._compiler_dispatch(self, **kw) for elem in fn.clauses
         )
-        return f"group_concat({expr} SEPARATOR {delimeter})"
+        return f"group_concat({expr} SEPARATOR {delimiter})"
 
-    def visit_sequence(self, seq, **kw):
-        return "nextval(%s)" % self.preparer.format_sequence(seq)
+    def visit_sequence(self, sequence: sa_schema.Sequence, **kw: Any) -> str:
+        return "nextval(%s)" % self.preparer.format_sequence(sequence)
 
-    def visit_sysdate_func(self, fn, **kw):
+    def visit_sysdate_func(self, fn: sysdate, **kw: Any) -> str:
         return "SYSDATE()"
 
-    def _render_json_extract_from_binary(self, binary, operator, **kw):
+    def _render_json_extract_from_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         # note we are intentionally calling upon the process() calls in the
         # order in which they appear in the SQL String as this is used
         # by positional parameter rendering
@@ -1319,9 +1399,10 @@ def _render_json_extract_from_binary(self, binary, operator, **kw):
                 )
             )
         elif binary.type._type_affinity is sqltypes.Numeric:
+            binary_type = cast(sqltypes.Numeric[Any], binary.type)
             if (
-                binary.type.scale is not None
-                and binary.type.precision is not None
+                binary_type.scale is not None
+                and binary_type.precision is not None
             ):
                 # using DECIMAL here because MySQL does not recognize NUMERIC
                 type_expression = (
@@ -1329,8 +1410,8 @@ def _render_json_extract_from_binary(self, binary, operator, **kw):
                     % (
                         self.process(binary.left, **kw),
                         self.process(binary.right, **kw),
-                        binary.type.precision,
-                        binary.type.scale,
+                        binary_type.precision,
+                        binary_type.scale,
                     )
                 )
             else:
@@ -1364,15 +1445,22 @@ def _render_json_extract_from_binary(self, binary, operator, **kw):
 
         return case_expression + " " + type_expression + " END"
 
-    def visit_json_getitem_op_binary(self, binary, operator, **kw):
+    def visit_json_getitem_op_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return self._render_json_extract_from_binary(binary, operator, **kw)
 
-    def visit_json_path_getitem_op_binary(self, binary, operator, **kw):
+    def visit_json_path_getitem_op_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return self._render_json_extract_from_binary(binary, operator, **kw)
 
-    def visit_on_duplicate_key_update(self, on_duplicate, **kw):
-        statement = self.current_executable
+    def visit_on_duplicate_key_update(
+        self, on_duplicate: OnDuplicateClause, **kw: Any
+    ) -> str:
+        statement: ValuesBase = self.current_executable
 
+        cols: List[elements.KeyedColumnElement[Any]]
         if on_duplicate._parameter_ordering:
             parameter_ordering = [
                 coercions.expect(roles.DMLColumnRole, key)
@@ -1385,7 +1473,7 @@ def visit_on_duplicate_key_update(self, on_duplicate, **kw):
                 if key in statement.table.c
             ] + [c for c in statement.table.c if c.key not in ordered_keys]
         else:
-            cols = statement.table.c
+            cols = list(statement.table.c)
 
         clauses = []
 
@@ -1394,14 +1482,19 @@ def visit_on_duplicate_key_update(self, on_duplicate, **kw):
         )
 
         if requires_mysql8_alias:
-            if statement.table.name.lower() == "new":
+            if statement.table.name.lower() == "new":  # type: ignore[union-attr]  # noqa: E501
                 _on_dup_alias_name = "new_1"
             else:
                 _on_dup_alias_name = "new"
 
+        on_duplicate_update = {
+            coercions.expect_as_key(roles.DMLColumnRole, key): value
+            for key, value in on_duplicate.update.items()
+        }
+
         # traverses through all table columns to preserve table column order
-        for column in (col for col in cols if col.key in on_duplicate.update):
-            val = on_duplicate.update[column.key]
+        for column in (col for col in cols if col.key in on_duplicate_update):
+            val = on_duplicate_update[column.key]
 
             # TODO: this coercion should be up front.  we can't cache
             # SQL constructs with non-bound literals buried in them
@@ -1410,26 +1503,26 @@ def visit_on_duplicate_key_update(self, on_duplicate, **kw):
                 value_text = self.process(val.self_group(), use_schema=False)
             else:
 
-                def replace(obj):
+                def replace(
+                    element: ExternallyTraversible, **kw: Any
+                ) -> Optional[ExternallyTraversible]:
                     if (
-                        isinstance(obj, elements.BindParameter)
-                        and obj.type._isnull
+                        isinstance(element, elements.BindParameter)
+                        and element.type._isnull
                     ):
-                        obj = obj._clone()
-                        obj.type = column.type
-                        return obj
+                        return element._with_binary_element_type(column.type)
                     elif (
-                        isinstance(obj, elements.ColumnClause)
-                        and obj.table is on_duplicate.inserted_alias
+                        isinstance(element, elements.ColumnClause)
+                        and element.table is on_duplicate.inserted_alias
                     ):
                         if requires_mysql8_alias:
                             column_literal_clause = (
                                 f"{_on_dup_alias_name}."
-                                f"{self.preparer.quote(obj.name)}"
+                                f"{self.preparer.quote(element.name)}"
                             )
                         else:
                             column_literal_clause = (
-                                f"VALUES({self.preparer.quote(obj.name)})"
+                                f"VALUES({self.preparer.quote(element.name)})"
                             )
                         return literal_column(column_literal_clause)
                     else:
@@ -1442,13 +1535,13 @@ def replace(obj):
             name_text = self.preparer.quote(column.name)
             clauses.append("%s = %s" % (name_text, value_text))
 
-        non_matching = set(on_duplicate.update) - {c.key for c in cols}
+        non_matching = set(on_duplicate_update) - {c.key for c in cols}
         if non_matching:
             util.warn(
                 "Additional column names not matching "
                 "any column keys in table '%s': %s"
                 % (
-                    self.statement.table.name,
+                    self.statement.table.name,  # type: ignore[union-attr]
                     (", ".join("'%s'" % c for c in non_matching)),
                 )
             )
@@ -1462,13 +1555,15 @@ def replace(obj):
             return f"ON DUPLICATE KEY UPDATE {', '.join(clauses)}"
 
     def visit_concat_op_expression_clauselist(
-        self, clauselist, operator, **kw
-    ):
+        self, clauselist: elements.ClauseList, operator: Any, **kw: Any
+    ) -> str:
         return "concat(%s)" % (
             ", ".join(self.process(elem, **kw) for elem in clauselist.clauses)
         )
 
-    def visit_concat_op_binary(self, binary, operator, **kw):
+    def visit_concat_op_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return "concat(%s, %s)" % (
             self.process(binary.left, **kw),
             self.process(binary.right, **kw),
@@ -1491,10 +1586,12 @@ def visit_concat_op_binary(self, binary, operator, **kw):
         "WITH QUERY EXPANSION",
     )
 
-    def visit_mysql_match(self, element, **kw):
+    def visit_mysql_match(self, element: expression.match, **kw: Any) -> str:
         return self.visit_match_op_binary(element, element.operator, **kw)
 
-    def visit_match_op_binary(self, binary, operator, **kw):
+    def visit_match_op_binary(
+        self, binary: expression.match, operator: Any, **kw: Any
+    ) -> str:
         """
         Note that `mysql_boolean_mode` is enabled by default because of
         backward compatibility
@@ -1515,12 +1612,11 @@ def visit_match_op_binary(self, binary, operator, **kw):
                 "with_query_expansion=%s" % query_expansion,
             )
 
-            flags = ", ".join(flags)
+            flags_str = ", ".join(flags)
 
-            raise exc.CompileError("Invalid MySQL match flags: %s" % flags)
+            raise exc.CompileError("Invalid MySQL match flags: %s" % flags_str)
 
-        match_clause = binary.left
-        match_clause = self.process(match_clause, **kw)
+        match_clause = self.process(binary.left, **kw)
         against_clause = self.process(binary.right, **kw)
 
         if any(flag_combination):
@@ -1529,21 +1625,25 @@ def visit_match_op_binary(self, binary, operator, **kw):
                 flag_combination,
             )
 
-            against_clause = [against_clause]
-            against_clause.extend(flag_expressions)
-
-            against_clause = " ".join(against_clause)
+            against_clause = " ".join([against_clause, *flag_expressions])
 
         return "MATCH (%s) AGAINST (%s)" % (match_clause, against_clause)
 
-    def get_from_hint_text(self, table, text):
+    def get_from_hint_text(
+        self, table: selectable.FromClause, text: Optional[str]
+    ) -> Optional[str]:
         return text
 
-    def visit_typeclause(self, typeclause, type_=None, **kw):
+    def visit_typeclause(
+        self,
+        typeclause: elements.TypeClause,
+        type_: Optional[TypeEngine[Any]] = None,
+        **kw: Any,
+    ) -> Optional[str]:
         if type_ is None:
             type_ = typeclause.type.dialect_impl(self.dialect)
         if isinstance(type_, sqltypes.TypeDecorator):
-            return self.visit_typeclause(typeclause, type_.impl, **kw)
+            return self.visit_typeclause(typeclause, type_.impl, **kw)  # type: ignore[arg-type]  # noqa: E501
         elif isinstance(type_, sqltypes.Integer):
             if getattr(type_, "unsigned", False):
                 return "UNSIGNED INTEGER"
@@ -1582,7 +1682,7 @@ def visit_typeclause(self, typeclause, type_=None, **kw):
         else:
             return None
 
-    def visit_cast(self, cast, **kw):
+    def visit_cast(self, cast: elements.Cast[Any], **kw: Any) -> str:
         type_ = self.process(cast.typeclause)
         if type_ is None:
             util.warn(
@@ -1596,7 +1696,9 @@ def visit_cast(self, cast, **kw):
 
         return "CAST(%s AS %s)" % (self.process(cast.clause, **kw), type_)
 
-    def render_literal_value(self, value, type_):
+    def render_literal_value(
+        self, value: Optional[str], type_: TypeEngine[Any]
+    ) -> str:
         value = super().render_literal_value(value, type_)
         if self.dialect._backslash_escapes:
             value = value.replace("\\", "\\\\")
@@ -1604,13 +1706,15 @@ def render_literal_value(self, value, type_):
 
     # override native_boolean=False behavior here, as
     # MySQL still supports native boolean
-    def visit_true(self, element, **kw):
+    def visit_true(self, expr: elements.True_, **kw: Any) -> str:
         return "true"
 
-    def visit_false(self, element, **kw):
+    def visit_false(self, expr: elements.False_, **kw: Any) -> str:
         return "false"
 
-    def get_select_precolumns(self, select, **kw):
+    def get_select_precolumns(
+        self, select: selectable.Select[Any], **kw: Any
+    ) -> str:
         """Add special MySQL keywords in place of DISTINCT.
 
         .. deprecated:: 1.4  This usage is deprecated.
@@ -1630,7 +1734,13 @@ def get_select_precolumns(self, select, **kw):
 
         return super().get_select_precolumns(select, **kw)
 
-    def visit_join(self, join, asfrom=False, from_linter=None, **kwargs):
+    def visit_join(
+        self,
+        join: selectable.Join,
+        asfrom: bool = False,
+        from_linter: Optional[compiler.FromLinter] = None,
+        **kwargs: Any,
+    ) -> str:
         if from_linter:
             from_linter.edges.add((join.left, join.right))
 
@@ -1651,18 +1761,24 @@ def visit_join(self, join, asfrom=False, from_linter=None, **kwargs):
                     join.right, asfrom=True, from_linter=from_linter, **kwargs
                 ),
                 " ON ",
-                self.process(join.onclause, from_linter=from_linter, **kwargs),
+                self.process(join.onclause, from_linter=from_linter, **kwargs),  # type: ignore[arg-type]  # noqa: E501
             )
         )
 
-    def for_update_clause(self, select, **kw):
+    def for_update_clause(
+        self, select: selectable.GenerativeSelect, **kw: Any
+    ) -> str:
+        assert select._for_update_arg is not None
         if select._for_update_arg.read:
-            tmp = " LOCK IN SHARE MODE"
+            if self.dialect.use_mysql_for_share:
+                tmp = " FOR SHARE"
+            else:
+                tmp = " LOCK IN SHARE MODE"
         else:
             tmp = " FOR UPDATE"
 
         if select._for_update_arg.of and self.dialect.supports_for_update_of:
-            tables = util.OrderedSet()
+            tables: util.OrderedSet[elements.ClauseElement] = util.OrderedSet()
             for c in select._for_update_arg.of:
                 tables.update(sql_util.surface_selectables_only(c))
 
@@ -1679,7 +1795,9 @@ def for_update_clause(self, select, **kw):
 
         return tmp
 
-    def limit_clause(self, select, **kw):
+    def limit_clause(
+        self, select: selectable.GenerativeSelect, **kw: Any
+    ) -> str:
         # MySQL supports:
         #   LIMIT <limit>
         #   LIMIT <offset>, <limit>
@@ -1715,24 +1833,31 @@ def limit_clause(self, select, **kw):
                     self.process(limit_clause, **kw),
                 )
         else:
+            assert limit_clause is not None
             # No offset provided, so just use the limit
             return " \n LIMIT %s" % (self.process(limit_clause, **kw),)
 
-    def update_limit_clause(self, update_stmt):
+    def update_limit_clause(self, update_stmt: Update) -> Optional[str]:
         limit = update_stmt.kwargs.get("%s_limit" % self.dialect.name, None)
         if limit is not None:
             return f"LIMIT {int(limit)}"
         else:
             return None
 
-    def delete_limit_clause(self, delete_stmt):
+    def delete_limit_clause(self, delete_stmt: Delete) -> Optional[str]:
         limit = delete_stmt.kwargs.get("%s_limit" % self.dialect.name, None)
         if limit is not None:
             return f"LIMIT {int(limit)}"
         else:
             return None
 
-    def update_tables_clause(self, update_stmt, from_table, extra_froms, **kw):
+    def update_tables_clause(
+        self,
+        update_stmt: Update,
+        from_table: _DMLTableElement,
+        extra_froms: List[selectable.FromClause],
+        **kw: Any,
+    ) -> str:
         kw["asfrom"] = True
         return ", ".join(
             t._compiler_dispatch(self, **kw)
@@ -1740,11 +1865,22 @@ def update_tables_clause(self, update_stmt, from_table, extra_froms, **kw):
         )
 
     def update_from_clause(
-        self, update_stmt, from_table, extra_froms, from_hints, **kw
-    ):
+        self,
+        update_stmt: Update,
+        from_table: _DMLTableElement,
+        extra_froms: List[selectable.FromClause],
+        from_hints: Any,
+        **kw: Any,
+    ) -> None:
         return None
 
-    def delete_table_clause(self, delete_stmt, from_table, extra_froms, **kw):
+    def delete_table_clause(
+        self,
+        delete_stmt: Delete,
+        from_table: _DMLTableElement,
+        extra_froms: List[selectable.FromClause],
+        **kw: Any,
+    ) -> str:
         """If we have extra froms make sure we render any alias as hint."""
         ashint = False
         if extra_froms:
@@ -1754,8 +1890,13 @@ def delete_table_clause(self, delete_stmt, from_table, extra_froms, **kw):
         )
 
     def delete_extra_from_clause(
-        self, delete_stmt, from_table, extra_froms, from_hints, **kw
-    ):
+        self,
+        delete_stmt: Delete,
+        from_table: _DMLTableElement,
+        extra_froms: List[selectable.FromClause],
+        from_hints: Any,
+        **kw: Any,
+    ) -> str:
         """Render the DELETE .. USING clause specific to MySQL."""
         kw["asfrom"] = True
         return "USING " + ", ".join(
@@ -1763,7 +1904,9 @@ def delete_extra_from_clause(
             for t in [from_table] + extra_froms
         )
 
-    def visit_empty_set_expr(self, element_types, **kw):
+    def visit_empty_set_expr(
+        self, element_types: List[TypeEngine[Any]], **kw: Any
+    ) -> str:
         return (
             "SELECT %(outer)s FROM (SELECT %(inner)s) "
             "as _empty_set WHERE 1!=1"
@@ -1778,25 +1921,38 @@ def visit_empty_set_expr(self, element_types, **kw):
             }
         )
 
-    def visit_is_distinct_from_binary(self, binary, operator, **kw):
+    def visit_is_distinct_from_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return "NOT (%s <=> %s)" % (
             self.process(binary.left),
             self.process(binary.right),
         )
 
-    def visit_is_not_distinct_from_binary(self, binary, operator, **kw):
+    def visit_is_not_distinct_from_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return "%s <=> %s" % (
             self.process(binary.left),
             self.process(binary.right),
         )
 
-    def _mariadb_regexp_flags(self, flags, pattern, **kw):
+    def _mariadb_regexp_flags(
+        self, flags: str, pattern: elements.ColumnElement[Any], **kw: Any
+    ) -> str:
         return "CONCAT('(?', %s, ')', %s)" % (
             self.render_literal_value(flags, sqltypes.STRINGTYPE),
             self.process(pattern, **kw),
         )
 
-    def _regexp_match(self, op_string, binary, operator, **kw):
+    def _regexp_match(
+        self,
+        op_string: str,
+        binary: elements.BinaryExpression[Any],
+        operator: Any,
+        **kw: Any,
+    ) -> str:
+        assert binary.modifiers is not None
         flags = binary.modifiers["flags"]
         if flags is None:
             return self._generate_generic_binary(binary, op_string, **kw)
@@ -1817,13 +1973,20 @@ def _regexp_match(self, op_string, binary, operator, **kw):
             else:
                 return text
 
-    def visit_regexp_match_op_binary(self, binary, operator, **kw):
+    def visit_regexp_match_op_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return self._regexp_match(" REGEXP ", binary, operator, **kw)
 
-    def visit_not_regexp_match_op_binary(self, binary, operator, **kw):
+    def visit_not_regexp_match_op_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return self._regexp_match(" NOT REGEXP ", binary, operator, **kw)
 
-    def visit_regexp_replace_op_binary(self, binary, operator, **kw):
+    def visit_regexp_replace_op_binary(
+        self, binary: elements.BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
+        assert binary.modifiers is not None
         flags = binary.modifiers["flags"]
         if flags is None:
             return "REGEXP_REPLACE(%s, %s)" % (
@@ -1845,7 +2008,11 @@ def visit_regexp_replace_op_binary(self, binary, operator, **kw):
 
 
 class MySQLDDLCompiler(compiler.DDLCompiler):
-    def get_column_specification(self, column, **kw):
+    dialect: MySQLDialect
+
+    def get_column_specification(
+        self, column: sa_schema.Column[Any], **kw: Any
+    ) -> str:
         """Builds column DDL."""
         if (
             self.dialect.is_mariadb is True
@@ -1898,19 +2065,25 @@ def get_column_specification(self, column, **kw):
             colspec.append("AUTO_INCREMENT")
         else:
             default = self.get_column_default_string(column)
+
             if default is not None:
                 if (
-                    isinstance(
-                        column.server_default.arg, functions.FunctionElement
+                    self.dialect._support_default_function
+                    and not re.match(r"^\s*[\'\"\(]", default)
+                    and not re.search(r"ON +UPDATE", default, re.I)
+                    and not re.match(
+                        r"\bnow\(\d+\)|\bcurrent_timestamp\(\d+\)",
+                        default,
+                        re.I,
                     )
-                    and self.dialect._support_default_function
+                    and re.match(r".*\W.*", default)
                 ):
                     colspec.append(f"DEFAULT ({default})")
                 else:
                     colspec.append("DEFAULT " + default)
         return " ".join(colspec)
 
-    def post_create_table(self, table):
+    def post_create_table(self, table: sa_schema.Table) -> str:
         """Build table-level CREATE options like ENGINE and COLLATE."""
 
         table_opts = []
@@ -1994,16 +2167,16 @@ def post_create_table(self, table):
 
         return " ".join(table_opts)
 
-    def visit_create_index(self, create, **kw):
+    def visit_create_index(self, create: ddl.CreateIndex, **kw: Any) -> str:  # type: ignore[override]  # noqa: E501
         index = create.element
         self._verify_index_table(index)
         preparer = self.preparer
-        table = preparer.format_table(index.table)
+        table = preparer.format_table(index.table)  # type: ignore[arg-type]
 
         columns = [
             self.sql_compiler.process(
                 (
-                    elements.Grouping(expr)
+                    elements.Grouping(expr)  # type: ignore[arg-type]
                     if (
                         isinstance(expr, elements.BinaryExpression)
                         or (
@@ -2027,7 +2200,7 @@ def visit_create_index(self, create, **kw):
         if index.unique:
             text += "UNIQUE "
 
-        index_prefix = index.kwargs.get("%s_prefix" % self.dialect.name, None)
+        index_prefix = index.get_dialect_option(self.dialect, "prefix")
         if index_prefix:
             text += index_prefix + " "
 
@@ -2036,16 +2209,16 @@ def visit_create_index(self, create, **kw):
             text += "IF NOT EXISTS "
         text += "%s ON %s " % (name, table)
 
-        length = index.dialect_options[self.dialect.name]["length"]
+        length = index.get_dialect_option(self.dialect, "length")
         if length is not None:
             if isinstance(length, dict):
                 # length value can be a (column_name --> integer value)
                 # mapping specifying the prefix length for each column of the
                 # index
-                columns = ", ".join(
+                columns_str = ", ".join(
                     (
-                        "%s(%d)" % (expr, length[col.name])
-                        if col.name in length
+                        "%s(%d)" % (expr, length[col.name])  # type: ignore[union-attr]  # noqa: E501
+                        if col.name in length  # type: ignore[union-attr]
                         else (
                             "%s(%d)" % (expr, length[expr])
                             if expr in length
@@ -2057,31 +2230,39 @@ def visit_create_index(self, create, **kw):
             else:
                 # or can be an integer value specifying the same
                 # prefix length for all columns of the index
-                columns = ", ".join(
+                columns_str = ", ".join(
                     "%s(%d)" % (col, length) for col in columns
                 )
         else:
-            columns = ", ".join(columns)
-        text += "(%s)" % columns
+            columns_str = ", ".join(columns)
+        text += "(%s)" % columns_str
 
-        parser = index.dialect_options["mysql"]["with_parser"]
+        parser = index.get_dialect_option(
+            self.dialect, "with_parser", deprecated_fallback="mysql"
+        )
         if parser is not None:
             text += " WITH PARSER %s" % (parser,)
 
-        using = index.dialect_options["mysql"]["using"]
+        using = index.get_dialect_option(
+            self.dialect, "using", deprecated_fallback="mysql"
+        )
         if using is not None:
             text += " USING %s" % (preparer.quote(using))
 
         return text
 
-    def visit_primary_key_constraint(self, constraint, **kw):
+    def visit_primary_key_constraint(
+        self, constraint: sa_schema.PrimaryKeyConstraint, **kw: Any
+    ) -> str:
         text = super().visit_primary_key_constraint(constraint)
-        using = constraint.dialect_options["mysql"]["using"]
+        using = constraint.get_dialect_option(
+            self.dialect, "using", deprecated_fallback="mysql"
+        )
         if using:
             text += " USING %s" % (self.preparer.quote(using))
         return text
 
-    def visit_drop_index(self, drop, **kw):
+    def visit_drop_index(self, drop: ddl.DropIndex, **kw: Any) -> str:
         index = drop.element
         text = "\nDROP INDEX "
         if drop.if_exists:
@@ -2089,10 +2270,12 @@ def visit_drop_index(self, drop, **kw):
 
         return text + "%s ON %s" % (
             self._prepared_index_name(index, include_schema=False),
-            self.preparer.format_table(index.table),
+            self.preparer.format_table(index.table),  # type: ignore[arg-type]
         )
 
-    def visit_drop_constraint(self, drop, **kw):
+    def visit_drop_constraint(
+        self, drop: ddl.DropConstraint, **kw: Any
+    ) -> str:
         constraint = drop.element
         if isinstance(constraint, sa_schema.ForeignKeyConstraint):
             qual = "FOREIGN KEY "
@@ -2118,7 +2301,9 @@ def visit_drop_constraint(self, drop, **kw):
             const,
         )
 
-    def define_constraint_match(self, constraint):
+    def define_constraint_match(
+        self, constraint: sa_schema.ForeignKeyConstraint
+    ) -> str:
         if constraint.match is not None:
             raise exc.CompileError(
                 "MySQL ignores the 'MATCH' keyword while at the same time "
@@ -2126,7 +2311,9 @@ def define_constraint_match(self, constraint):
             )
         return ""
 
-    def visit_set_table_comment(self, create, **kw):
+    def visit_set_table_comment(
+        self, create: ddl.SetTableComment, **kw: Any
+    ) -> str:
         return "ALTER TABLE %s COMMENT %s" % (
             self.preparer.format_table(create.element),
             self.sql_compiler.render_literal_value(
@@ -2134,21 +2321,34 @@ def visit_set_table_comment(self, create, **kw):
             ),
         )
 
-    def visit_drop_table_comment(self, create, **kw):
+    def visit_drop_table_comment(
+        self, drop: ddl.DropTableComment, **kw: Any
+    ) -> str:
         return "ALTER TABLE %s COMMENT ''" % (
-            self.preparer.format_table(create.element)
+            self.preparer.format_table(drop.element)
         )
 
-    def visit_set_column_comment(self, create, **kw):
+    def visit_set_column_comment(
+        self, create: ddl.SetColumnComment, **kw: Any
+    ) -> str:
         return "ALTER TABLE %s CHANGE %s %s" % (
             self.preparer.format_table(create.element.table),
             self.preparer.format_column(create.element),
             self.get_column_specification(create.element),
         )
 
+    def get_identity_options(self, identity_options: IdentityOptions) -> str:
+        """mariadb-specific sequence option; this will move to a
+        mariadb-specific module in 2.1
+
+        """
+        text = super().get_identity_options(identity_options)
+        text = text.replace("NO CYCLE", "NOCYCLE")
+        return text
+
 
 class MySQLTypeCompiler(compiler.GenericTypeCompiler):
-    def _extend_numeric(self, type_, spec):
+    def _extend_numeric(self, type_: _NumericType, spec: str) -> str:
         "Extend a numeric-type declaration with MySQL specific extensions."
 
         if not self._mysql_type(type_):
@@ -2160,13 +2360,15 @@ def _extend_numeric(self, type_, spec):
             spec += " ZEROFILL"
         return spec
 
-    def _extend_string(self, type_, defaults, spec):
+    def _extend_string(
+        self, type_: _StringType, defaults: Dict[str, Any], spec: str
+    ) -> str:
         """Extend a string-type declaration with standard SQL CHARACTER SET /
         COLLATE annotations and MySQL specific extensions.
 
         """
 
-        def attr(name):
+        def attr(name: str) -> Any:
             return getattr(type_, name, defaults.get(name))
 
         if attr("charset"):
@@ -2176,6 +2378,7 @@ def attr(name):
         elif attr("unicode"):
             charset = "UNICODE"
         else:
+
             charset = None
 
         if attr("collation"):
@@ -2194,10 +2397,10 @@ def attr(name):
             [c for c in (spec, charset, collation) if c is not None]
         )
 
-    def _mysql_type(self, type_):
+    def _mysql_type(self, type_: Any) -> bool:
         return isinstance(type_, (_StringType, _NumericType))
 
-    def visit_NUMERIC(self, type_, **kw):
+    def visit_NUMERIC(self, type_: NUMERIC, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.precision is None:
             return self._extend_numeric(type_, "NUMERIC")
         elif type_.scale is None:
@@ -2212,7 +2415,7 @@ def visit_NUMERIC(self, type_, **kw):
                 % {"precision": type_.precision, "scale": type_.scale},
             )
 
-    def visit_DECIMAL(self, type_, **kw):
+    def visit_DECIMAL(self, type_: DECIMAL, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.precision is None:
             return self._extend_numeric(type_, "DECIMAL")
         elif type_.scale is None:
@@ -2227,7 +2430,7 @@ def visit_DECIMAL(self, type_, **kw):
                 % {"precision": type_.precision, "scale": type_.scale},
             )
 
-    def visit_DOUBLE(self, type_, **kw):
+    def visit_DOUBLE(self, type_: DOUBLE, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.precision is not None and type_.scale is not None:
             return self._extend_numeric(
                 type_,
@@ -2237,7 +2440,7 @@ def visit_DOUBLE(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "DOUBLE")
 
-    def visit_REAL(self, type_, **kw):
+    def visit_REAL(self, type_: REAL, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.precision is not None and type_.scale is not None:
             return self._extend_numeric(
                 type_,
@@ -2247,7 +2450,7 @@ def visit_REAL(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "REAL")
 
-    def visit_FLOAT(self, type_, **kw):
+    def visit_FLOAT(self, type_: FLOAT, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if (
             self._mysql_type(type_)
             and type_.scale is not None
@@ -2263,7 +2466,7 @@ def visit_FLOAT(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "FLOAT")
 
-    def visit_INTEGER(self, type_, **kw):
+    def visit_INTEGER(self, type_: INTEGER, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if self._mysql_type(type_) and type_.display_width is not None:
             return self._extend_numeric(
                 type_,
@@ -2273,7 +2476,7 @@ def visit_INTEGER(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "INTEGER")
 
-    def visit_BIGINT(self, type_, **kw):
+    def visit_BIGINT(self, type_: BIGINT, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if self._mysql_type(type_) and type_.display_width is not None:
             return self._extend_numeric(
                 type_,
@@ -2283,7 +2486,7 @@ def visit_BIGINT(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "BIGINT")
 
-    def visit_MEDIUMINT(self, type_, **kw):
+    def visit_MEDIUMINT(self, type_: MEDIUMINT, **kw: Any) -> str:
         if self._mysql_type(type_) and type_.display_width is not None:
             return self._extend_numeric(
                 type_,
@@ -2293,7 +2496,7 @@ def visit_MEDIUMINT(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "MEDIUMINT")
 
-    def visit_TINYINT(self, type_, **kw):
+    def visit_TINYINT(self, type_: TINYINT, **kw: Any) -> str:
         if self._mysql_type(type_) and type_.display_width is not None:
             return self._extend_numeric(
                 type_, "TINYINT(%s)" % type_.display_width
@@ -2301,7 +2504,7 @@ def visit_TINYINT(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "TINYINT")
 
-    def visit_SMALLINT(self, type_, **kw):
+    def visit_SMALLINT(self, type_: SMALLINT, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if self._mysql_type(type_) and type_.display_width is not None:
             return self._extend_numeric(
                 type_,
@@ -2311,55 +2514,55 @@ def visit_SMALLINT(self, type_, **kw):
         else:
             return self._extend_numeric(type_, "SMALLINT")
 
-    def visit_BIT(self, type_, **kw):
+    def visit_BIT(self, type_: BIT, **kw: Any) -> str:
         if type_.length is not None:
             return "BIT(%s)" % type_.length
         else:
             return "BIT"
 
-    def visit_DATETIME(self, type_, **kw):
+    def visit_DATETIME(self, type_: DATETIME, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if getattr(type_, "fsp", None):
-            return "DATETIME(%d)" % type_.fsp
+            return "DATETIME(%d)" % type_.fsp  # type: ignore[str-format]
         else:
             return "DATETIME"
 
-    def visit_DATE(self, type_, **kw):
+    def visit_DATE(self, type_: DATE, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         return "DATE"
 
-    def visit_TIME(self, type_, **kw):
+    def visit_TIME(self, type_: TIME, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if getattr(type_, "fsp", None):
-            return "TIME(%d)" % type_.fsp
+            return "TIME(%d)" % type_.fsp  # type: ignore[str-format]
         else:
             return "TIME"
 
-    def visit_TIMESTAMP(self, type_, **kw):
+    def visit_TIMESTAMP(self, type_: TIMESTAMP, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if getattr(type_, "fsp", None):
-            return "TIMESTAMP(%d)" % type_.fsp
+            return "TIMESTAMP(%d)" % type_.fsp  # type: ignore[str-format]
         else:
             return "TIMESTAMP"
 
-    def visit_YEAR(self, type_, **kw):
+    def visit_YEAR(self, type_: YEAR, **kw: Any) -> str:
         if type_.display_width is None:
             return "YEAR"
         else:
             return "YEAR(%s)" % type_.display_width
 
-    def visit_TEXT(self, type_, **kw):
+    def visit_TEXT(self, type_: TEXT, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.length is not None:
             return self._extend_string(type_, {}, "TEXT(%d)" % type_.length)
         else:
             return self._extend_string(type_, {}, "TEXT")
 
-    def visit_TINYTEXT(self, type_, **kw):
+    def visit_TINYTEXT(self, type_: TINYTEXT, **kw: Any) -> str:
         return self._extend_string(type_, {}, "TINYTEXT")
 
-    def visit_MEDIUMTEXT(self, type_, **kw):
+    def visit_MEDIUMTEXT(self, type_: MEDIUMTEXT, **kw: Any) -> str:
         return self._extend_string(type_, {}, "MEDIUMTEXT")
 
-    def visit_LONGTEXT(self, type_, **kw):
+    def visit_LONGTEXT(self, type_: LONGTEXT, **kw: Any) -> str:
         return self._extend_string(type_, {}, "LONGTEXT")
 
-    def visit_VARCHAR(self, type_, **kw):
+    def visit_VARCHAR(self, type_: VARCHAR, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.length is not None:
             return self._extend_string(type_, {}, "VARCHAR(%d)" % type_.length)
         else:
@@ -2367,7 +2570,7 @@ def visit_VARCHAR(self, type_, **kw):
                 "VARCHAR requires a length on dialect %s" % self.dialect.name
             )
 
-    def visit_CHAR(self, type_, **kw):
+    def visit_CHAR(self, type_: CHAR, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if type_.length is not None:
             return self._extend_string(
                 type_, {}, "CHAR(%(length)s)" % {"length": type_.length}
@@ -2375,7 +2578,7 @@ def visit_CHAR(self, type_, **kw):
         else:
             return self._extend_string(type_, {}, "CHAR")
 
-    def visit_NVARCHAR(self, type_, **kw):
+    def visit_NVARCHAR(self, type_: NVARCHAR, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         # We'll actually generate the equiv. "NATIONAL VARCHAR" instead
         # of "NVARCHAR".
         if type_.length is not None:
@@ -2389,7 +2592,7 @@ def visit_NVARCHAR(self, type_, **kw):
                 "NVARCHAR requires a length on dialect %s" % self.dialect.name
             )
 
-    def visit_NCHAR(self, type_, **kw):
+    def visit_NCHAR(self, type_: NCHAR, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         # We'll actually generate the equiv.
         # "NATIONAL CHAR" instead of "NCHAR".
         if type_.length is not None:
@@ -2401,40 +2604,42 @@ def visit_NCHAR(self, type_, **kw):
         else:
             return self._extend_string(type_, {"national": True}, "CHAR")
 
-    def visit_UUID(self, type_, **kw):
+    def visit_UUID(self, type_: UUID[Any], **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         return "UUID"
 
-    def visit_VARBINARY(self, type_, **kw):
-        return "VARBINARY(%d)" % type_.length
+    def visit_VARBINARY(self, type_: VARBINARY, **kw: Any) -> str:
+        return "VARBINARY(%d)" % type_.length  # type: ignore[str-format]
 
-    def visit_JSON(self, type_, **kw):
+    def visit_JSON(self, type_: JSON, **kw: Any) -> str:
         return "JSON"
 
-    def visit_large_binary(self, type_, **kw):
+    def visit_large_binary(self, type_: LargeBinary, **kw: Any) -> str:
         return self.visit_BLOB(type_)
 
-    def visit_enum(self, type_, **kw):
+    def visit_enum(self, type_: ENUM, **kw: Any) -> str:  # type: ignore[override]  # NOQA: E501
         if not type_.native_enum:
             return super().visit_enum(type_)
         else:
             return self._visit_enumerated_values("ENUM", type_, type_.enums)
 
-    def visit_BLOB(self, type_, **kw):
+    def visit_BLOB(self, type_: LargeBinary, **kw: Any) -> str:
         if type_.length is not None:
             return "BLOB(%d)" % type_.length
         else:
             return "BLOB"
 
-    def visit_TINYBLOB(self, type_, **kw):
+    def visit_TINYBLOB(self, type_: TINYBLOB, **kw: Any) -> str:
         return "TINYBLOB"
 
-    def visit_MEDIUMBLOB(self, type_, **kw):
+    def visit_MEDIUMBLOB(self, type_: MEDIUMBLOB, **kw: Any) -> str:
         return "MEDIUMBLOB"
 
-    def visit_LONGBLOB(self, type_, **kw):
+    def visit_LONGBLOB(self, type_: LONGBLOB, **kw: Any) -> str:
         return "LONGBLOB"
 
-    def _visit_enumerated_values(self, name, type_, enumerated_values):
+    def _visit_enumerated_values(
+        self, name: str, type_: _StringType, enumerated_values: Sequence[str]
+    ) -> str:
         quoted_enums = []
         for e in enumerated_values:
             if self.dialect.identifier_preparer._double_percents:
@@ -2444,20 +2649,25 @@ def _visit_enumerated_values(self, name, type_, enumerated_values):
             type_, {}, "%s(%s)" % (name, ",".join(quoted_enums))
         )
 
-    def visit_ENUM(self, type_, **kw):
+    def visit_ENUM(self, type_: ENUM, **kw: Any) -> str:
         return self._visit_enumerated_values("ENUM", type_, type_.enums)
 
-    def visit_SET(self, type_, **kw):
+    def visit_SET(self, type_: SET, **kw: Any) -> str:
         return self._visit_enumerated_values("SET", type_, type_.values)
 
-    def visit_BOOLEAN(self, type_, **kw):
+    def visit_BOOLEAN(self, type_: sqltypes.Boolean, **kw: Any) -> str:
         return "BOOL"
 
 
 class MySQLIdentifierPreparer(compiler.IdentifierPreparer):
     reserved_words = RESERVED_WORDS_MYSQL
 
-    def __init__(self, dialect, server_ansiquotes=False, **kw):
+    def __init__(
+        self,
+        dialect: default.DefaultDialect,
+        server_ansiquotes: bool = False,
+        **kw: Any,
+    ):
         if not server_ansiquotes:
             quote = "`"
         else:
@@ -2465,7 +2675,7 @@ def __init__(self, dialect, server_ansiquotes=False, **kw):
 
         super().__init__(dialect, initial_quote=quote, escape_quote=quote)
 
-    def _quote_free_identifiers(self, *ids):
+    def _quote_free_identifiers(self, *ids: Optional[str]) -> Tuple[str, ...]:
         """Unilaterally identifier-quote any number of strings."""
 
         return tuple([self.quote_identifier(i) for i in ids if i is not None])
@@ -2475,7 +2685,6 @@ class MariaDBIdentifierPreparer(MySQLIdentifierPreparer):
     reserved_words = RESERVED_WORDS_MARIADB
 
 
-@log.class_logger
 class MySQLDialect(default.DefaultDialect):
     """Details of the MySQL dialect.
     Not used directly in application code.
@@ -2490,6 +2699,10 @@ class MySQLDialect(default.DefaultDialect):
     # allow for the "true" and "false" keywords, however
     supports_native_boolean = False
 
+    # support for BIT type; mysqlconnector coerces result values automatically,
+    # all other MySQL DBAPIs require a conversion routine
+    supports_native_bit = False
+
     # identifiers are 64, however aliases can be 255...
     max_identifier_length = 255
     max_index_name_length = 64
@@ -2501,16 +2714,19 @@ class MySQLDialect(default.DefaultDialect):
 
     returns_native_bytes = True
 
-    supports_sequences = False  # default for MySQL ...
     # ... may be updated to True for MariaDB 10.3+ in initialize()
+    supports_sequences = False
 
     sequences_optional = False
 
-    supports_for_update_of = False  # default for MySQL ...
     # ... may be updated to True for MySQL 8+ in initialize()
+    supports_for_update_of = False
+
+    # mysql 8.0.1 uses this syntax
+    use_mysql_for_share = False
 
-    _requires_alias_for_on_duplicate_key = False  # Only available ...
-    # ... in MySQL 8+
+    # Only available ... ... in MySQL 8+
+    _requires_alias_for_on_duplicate_key = False
 
     # MySQL doesn't support "DEFAULT VALUES" but *does* support
     # "VALUES (DEFAULT)"
@@ -2538,9 +2754,9 @@ class MySQLDialect(default.DefaultDialect):
     ddl_compiler = MySQLDDLCompiler
     type_compiler_cls = MySQLTypeCompiler
     ischema_names = ischema_names
-    preparer = MySQLIdentifierPreparer
+    preparer: type[MySQLIdentifierPreparer] = MySQLIdentifierPreparer
 
-    is_mariadb = False
+    is_mariadb: bool = False
     _mariadb_normalized_version_info = None
 
     # default SQL compilation settings -
@@ -2549,6 +2765,9 @@ class MySQLDialect(default.DefaultDialect):
     _backslash_escapes = True
     _server_ansiquotes = False
 
+    server_version_info: Tuple[int, ...]
+    identifier_preparer: MySQLIdentifierPreparer
+
     construct_arguments = [
         (sa_schema.Table, {"*": None}),
         (sql.Update, {"limit": None}),
@@ -2567,18 +2786,20 @@ class MySQLDialect(default.DefaultDialect):
 
     def __init__(
         self,
-        json_serializer=None,
-        json_deserializer=None,
-        is_mariadb=None,
-        **kwargs,
-    ):
+        json_serializer: Optional[Callable[..., Any]] = None,
+        json_deserializer: Optional[Callable[..., Any]] = None,
+        is_mariadb: Optional[bool] = None,
+        **kwargs: Any,
+    ) -> None:
         kwargs.pop("use_ansiquotes", None)  # legacy
         default.DefaultDialect.__init__(self, **kwargs)
         self._json_serializer = json_serializer
         self._json_deserializer = json_deserializer
-        self._set_mariadb(is_mariadb, None)
+        self._set_mariadb(is_mariadb, ())
 
-    def get_isolation_level_values(self, dbapi_conn):
+    def get_isolation_level_values(
+        self, dbapi_conn: DBAPIConnection
+    ) -> Sequence[IsolationLevel]:
         return (
             "SERIALIZABLE",
             "READ UNCOMMITTED",
@@ -2586,13 +2807,17 @@ def get_isolation_level_values(self, dbapi_conn):
             "REPEATABLE READ",
         )
 
-    def set_isolation_level(self, dbapi_connection, level):
+    def set_isolation_level(
+        self, dbapi_connection: DBAPIConnection, level: IsolationLevel
+    ) -> None:
         cursor = dbapi_connection.cursor()
         cursor.execute(f"SET SESSION TRANSACTION ISOLATION LEVEL {level}")
         cursor.execute("COMMIT")
         cursor.close()
 
-    def get_isolation_level(self, dbapi_connection):
+    def get_isolation_level(
+        self, dbapi_connection: DBAPIConnection
+    ) -> IsolationLevel:
         cursor = dbapi_connection.cursor()
         if self._is_mysql and self.server_version_info >= (5, 7, 20):
             cursor.execute("SELECT @@transaction_isolation")
@@ -2609,10 +2834,10 @@ def get_isolation_level(self, dbapi_connection):
         cursor.close()
         if isinstance(val, bytes):
             val = val.decode()
-        return val.upper().replace("-", " ")
+        return val.upper().replace("-", " ")  # type: ignore[no-any-return]
 
     @classmethod
-    def _is_mariadb_from_url(cls, url):
+    def _is_mariadb_from_url(cls, url: URL) -> bool:
         dbapi = cls.import_dbapi()
         dialect = cls(dbapi=dbapi)
 
@@ -2621,7 +2846,7 @@ def _is_mariadb_from_url(cls, url):
         try:
             cursor = conn.cursor()
             cursor.execute("SELECT VERSION() LIKE '%MariaDB%'")
-            val = cursor.fetchone()[0]
+            val = cursor.fetchone()[0]  # type: ignore[index]
         except:
             raise
         else:
@@ -2629,22 +2854,25 @@ def _is_mariadb_from_url(cls, url):
         finally:
             conn.close()
 
-    def _get_server_version_info(self, connection):
+    def _get_server_version_info(
+        self, connection: Connection
+    ) -> Tuple[int, ...]:
         # get database server version info explicitly over the wire
         # to avoid proxy servers like MaxScale getting in the
         # way with their own values, see #4205
         dbapi_con = connection.connection
         cursor = dbapi_con.cursor()
         cursor.execute("SELECT VERSION()")
-        val = cursor.fetchone()[0]
+
+        val = cursor.fetchone()[0]  # type: ignore[index]
         cursor.close()
         if isinstance(val, bytes):
             val = val.decode()
 
         return self._parse_server_version(val)
 
-    def _parse_server_version(self, val):
-        version = []
+    def _parse_server_version(self, val: str) -> Tuple[int, ...]:
+        version: List[int] = []
         is_mariadb = False
 
         r = re.compile(r"[.\-+]")
@@ -2665,7 +2893,7 @@ def _parse_server_version(self, val):
         server_version_info = tuple(version)
 
         self._set_mariadb(
-            server_version_info and is_mariadb, server_version_info
+            bool(server_version_info and is_mariadb), server_version_info
         )
 
         if not is_mariadb:
@@ -2681,7 +2909,9 @@ def _parse_server_version(self, val):
         self.server_version_info = server_version_info
         return server_version_info
 
-    def _set_mariadb(self, is_mariadb, server_version_info):
+    def _set_mariadb(
+        self, is_mariadb: Optional[bool], server_version_info: Tuple[int, ...]
+    ) -> None:
         if is_mariadb is None:
             return
 
@@ -2691,10 +2921,12 @@ def _set_mariadb(self, is_mariadb, server_version_info):
                 % (".".join(map(str, server_version_info)),)
             )
         if is_mariadb:
-            self.preparer = MariaDBIdentifierPreparer
-            # this would have been set by the default dialect already,
-            # so set it again
-            self.identifier_preparer = self.preparer(self)
+
+            if not issubclass(self.preparer, MariaDBIdentifierPreparer):
+                self.preparer = MariaDBIdentifierPreparer
+                # this would have been set by the default dialect already,
+                # so set it again
+                self.identifier_preparer = self.preparer(self)
 
             # this will be updated on first connect in initialize()
             # if using older mariadb version
@@ -2703,38 +2935,54 @@ def _set_mariadb(self, is_mariadb, server_version_info):
 
         self.is_mariadb = is_mariadb
 
-    def do_begin_twophase(self, connection, xid):
+    def do_begin_twophase(self, connection: Connection, xid: Any) -> None:
         connection.execute(sql.text("XA BEGIN :xid"), dict(xid=xid))
 
-    def do_prepare_twophase(self, connection, xid):
+    def do_prepare_twophase(self, connection: Connection, xid: Any) -> None:
         connection.execute(sql.text("XA END :xid"), dict(xid=xid))
         connection.execute(sql.text("XA PREPARE :xid"), dict(xid=xid))
 
     def do_rollback_twophase(
-        self, connection, xid, is_prepared=True, recover=False
-    ):
+        self,
+        connection: Connection,
+        xid: Any,
+        is_prepared: bool = True,
+        recover: bool = False,
+    ) -> None:
         if not is_prepared:
             connection.execute(sql.text("XA END :xid"), dict(xid=xid))
         connection.execute(sql.text("XA ROLLBACK :xid"), dict(xid=xid))
 
     def do_commit_twophase(
-        self, connection, xid, is_prepared=True, recover=False
-    ):
+        self,
+        connection: Connection,
+        xid: Any,
+        is_prepared: bool = True,
+        recover: bool = False,
+    ) -> None:
         if not is_prepared:
             self.do_prepare_twophase(connection, xid)
         connection.execute(sql.text("XA COMMIT :xid"), dict(xid=xid))
 
-    def do_recover_twophase(self, connection):
+    def do_recover_twophase(self, connection: Connection) -> List[Any]:
         resultset = connection.exec_driver_sql("XA RECOVER")
-        return [row["data"][0 : row["gtrid_length"]] for row in resultset]
+        return [
+            row["data"][0 : row["gtrid_length"]]
+            for row in resultset.mappings()
+        ]
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
         if isinstance(
             e,
             (
-                self.dbapi.OperationalError,
-                self.dbapi.ProgrammingError,
-                self.dbapi.InterfaceError,
+                self.dbapi.OperationalError,  # type: ignore
+                self.dbapi.ProgrammingError,  # type: ignore
+                self.dbapi.InterfaceError,  # type: ignore
             ),
         ) and self._extract_error_code(e) in (
             1927,
@@ -2747,7 +2995,7 @@ def is_disconnect(self, e, connection, cursor):
         ):
             return True
         elif isinstance(
-            e, (self.dbapi.InterfaceError, self.dbapi.InternalError)
+            e, (self.dbapi.InterfaceError, self.dbapi.InternalError)  # type: ignore  # noqa: E501
         ):
             # if underlying connection is closed,
             # this is the error you get
@@ -2755,13 +3003,17 @@ def is_disconnect(self, e, connection, cursor):
         else:
             return False
 
-    def _compat_fetchall(self, rp, charset=None):
+    def _compat_fetchall(
+        self, rp: CursorResult[Any], charset: Optional[str] = None
+    ) -> Union[Sequence[Row[Any]], Sequence[_DecodingRow]]:
         """Proxy result rows to smooth over MySQL-Python driver
         inconsistencies."""
 
         return [_DecodingRow(row, charset) for row in rp.fetchall()]
 
-    def _compat_fetchone(self, rp, charset=None):
+    def _compat_fetchone(
+        self, rp: CursorResult[Any], charset: Optional[str] = None
+    ) -> Union[Row[Any], None, _DecodingRow]:
         """Proxy a result row to smooth over MySQL-Python driver
         inconsistencies."""
 
@@ -2771,7 +3023,9 @@ def _compat_fetchone(self, rp, charset=None):
         else:
             return None
 
-    def _compat_first(self, rp, charset=None):
+    def _compat_first(
+        self, rp: CursorResult[Any], charset: Optional[str] = None
+    ) -> Optional[_DecodingRow]:
         """Proxy a result row to smooth over MySQL-Python driver
         inconsistencies."""
 
@@ -2781,14 +3035,22 @@ def _compat_first(self, rp, charset=None):
         else:
             return None
 
-    def _extract_error_code(self, exception):
+    def _extract_error_code(
+        self, exception: DBAPIModule.Error
+    ) -> Optional[int]:
         raise NotImplementedError()
 
-    def _get_default_schema_name(self, connection):
-        return connection.exec_driver_sql("SELECT DATABASE()").scalar()
+    def _get_default_schema_name(self, connection: Connection) -> str:
+        return connection.exec_driver_sql("SELECT DATABASE()").scalar()  # type: ignore[return-value]  # noqa: E501
 
     @reflection.cache
-    def has_table(self, connection, table_name, schema=None, **kw):
+    def has_table(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> bool:
         self._ensure_has_table_connection(connection)
 
         if schema is None:
@@ -2829,12 +3091,18 @@ def has_table(self, connection, table_name, schema=None, **kw):
             #
             # there's more "doesn't exist" kinds of messages but they are
             # less clear if mysql 8 would suddenly start using one of those
-            if self._extract_error_code(e.orig) in (1146, 1049, 1051):
+            if self._extract_error_code(e.orig) in (1146, 1049, 1051):  # type: ignore  # noqa: E501
                 return False
             raise
 
     @reflection.cache
-    def has_sequence(self, connection, sequence_name, schema=None, **kw):
+    def has_sequence(
+        self,
+        connection: Connection,
+        sequence_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> bool:
         if not self.supports_sequences:
             self._sequences_not_supported()
         if not schema:
@@ -2854,14 +3122,16 @@ def has_sequence(self, connection, sequence_name, schema=None, **kw):
         )
         return cursor.first() is not None
 
-    def _sequences_not_supported(self):
+    def _sequences_not_supported(self) -> NoReturn:
         raise NotImplementedError(
             "Sequences are supported only by the "
             "MariaDB series 10.3 or greater"
         )
 
     @reflection.cache
-    def get_sequence_names(self, connection, schema=None, **kw):
+    def get_sequence_names(
+        self, connection: Connection, schema: Optional[str] = None, **kw: Any
+    ) -> List[str]:
         if not self.supports_sequences:
             self._sequences_not_supported()
         if not schema:
@@ -2881,10 +3151,12 @@ def get_sequence_names(self, connection, schema=None, **kw):
             )
         ]
 
-    def initialize(self, connection):
+    def initialize(self, connection: Connection) -> None:
         # this is driver-based, does not need server version info
         # and is fairly critical for even basic SQL operations
-        self._connection_charset = self._detect_charset(connection)
+        self._connection_charset: Optional[str] = self._detect_charset(
+            connection
+        )
 
         # call super().initialize() because we need to have
         # server_version_info set up.  in 1.4 under python 2 only this does the
@@ -2910,6 +3182,10 @@ def initialize(self, connection):
             self._is_mysql and self.server_version_info >= (8,)
         )
 
+        self.use_mysql_for_share = (
+            self._is_mysql and self.server_version_info >= (8, 0, 1)
+        )
+
         self._needs_correct_for_88718_96365 = (
             not self.is_mariadb and self.server_version_info >= (8,)
         )
@@ -2928,9 +3204,10 @@ def initialize(self, connection):
 
         self._warn_for_known_db_issues()
 
-    def _warn_for_known_db_issues(self):
+    def _warn_for_known_db_issues(self) -> None:
         if self.is_mariadb:
             mdb_version = self._mariadb_normalized_version_info
+            assert mdb_version is not None
             if mdb_version > (10, 2) and mdb_version < (10, 2, 9):
                 util.warn(
                     "MariaDB %r before 10.2.9 has known issues regarding "
@@ -2943,7 +3220,7 @@ def _warn_for_known_db_issues(self):
                 )
 
     @property
-    def _support_float_cast(self):
+    def _support_float_cast(self) -> bool:
         if not self.server_version_info:
             return False
         elif self.is_mariadb:
@@ -2954,7 +3231,7 @@ def _support_float_cast(self):
             return self.server_version_info >= (8, 0, 17)
 
     @property
-    def _support_default_function(self):
+    def _support_default_function(self) -> bool:
         if not self.server_version_info:
             return False
         elif self.is_mariadb:
@@ -2965,32 +3242,38 @@ def _support_default_function(self):
             return self.server_version_info >= (8, 0, 13)
 
     @property
-    def _is_mariadb(self):
+    def _is_mariadb(self) -> bool:
         return self.is_mariadb
 
     @property
-    def _is_mysql(self):
+    def _is_mysql(self) -> bool:
         return not self.is_mariadb
 
     @property
-    def _is_mariadb_102(self):
-        return self.is_mariadb and self._mariadb_normalized_version_info > (
-            10,
-            2,
+    def _is_mariadb_102(self) -> bool:
+        return (
+            self.is_mariadb
+            and self._mariadb_normalized_version_info  # type:ignore[operator]
+            > (
+                10,
+                2,
+            )
         )
 
     @reflection.cache
-    def get_schema_names(self, connection, **kw):
+    def get_schema_names(self, connection: Connection, **kw: Any) -> List[str]:
         rp = connection.exec_driver_sql("SHOW schemas")
         return [r[0] for r in rp]
 
     @reflection.cache
-    def get_table_names(self, connection, schema=None, **kw):
+    def get_table_names(
+        self, connection: Connection, schema: Optional[str] = None, **kw: Any
+    ) -> List[str]:
         """Return a Unicode SHOW TABLES from a given schema."""
         if schema is not None:
-            current_schema = schema
+            current_schema: str = schema
         else:
-            current_schema = self.default_schema_name
+            current_schema = self.default_schema_name  # type: ignore
 
         charset = self._connection_charset
 
@@ -3006,9 +3289,12 @@ def get_table_names(self, connection, schema=None, **kw):
         ]
 
     @reflection.cache
-    def get_view_names(self, connection, schema=None, **kw):
+    def get_view_names(
+        self, connection: Connection, schema: Optional[str] = None, **kw: Any
+    ) -> List[str]:
         if schema is None:
             schema = self.default_schema_name
+        assert schema is not None
         charset = self._connection_charset
         rp = connection.exec_driver_sql(
             "SHOW FULL TABLES FROM %s"
@@ -3021,7 +3307,13 @@ def get_view_names(self, connection, schema=None, **kw):
         ]
 
     @reflection.cache
-    def get_table_options(self, connection, table_name, schema=None, **kw):
+    def get_table_options(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> Dict[str, Any]:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
@@ -3031,7 +3323,13 @@ def get_table_options(self, connection, table_name, schema=None, **kw):
             return ReflectionDefaults.table_options()
 
     @reflection.cache
-    def get_columns(self, connection, table_name, schema=None, **kw):
+    def get_columns(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> List[ReflectedColumn]:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
@@ -3041,7 +3339,13 @@ def get_columns(self, connection, table_name, schema=None, **kw):
             return ReflectionDefaults.columns()
 
     @reflection.cache
-    def get_pk_constraint(self, connection, table_name, schema=None, **kw):
+    def get_pk_constraint(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> ReflectedPrimaryKeyConstraint:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
@@ -3053,13 +3357,19 @@ def get_pk_constraint(self, connection, table_name, schema=None, **kw):
         return ReflectionDefaults.pk_constraint()
 
     @reflection.cache
-    def get_foreign_keys(self, connection, table_name, schema=None, **kw):
+    def get_foreign_keys(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> List[ReflectedForeignKeyConstraint]:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
         default_schema = None
 
-        fkeys = []
+        fkeys: List[ReflectedForeignKeyConstraint] = []
 
         for spec in parsed_state.fk_constraints:
             ref_name = spec["table"][-1]
@@ -3079,7 +3389,7 @@ def get_foreign_keys(self, connection, table_name, schema=None, **kw):
                 if spec.get(opt, False) not in ("NO ACTION", None):
                     con_kw[opt] = spec[opt]
 
-            fkey_d = {
+            fkey_d: ReflectedForeignKeyConstraint = {
                 "name": spec["name"],
                 "constrained_columns": loc_names,
                 "referred_schema": ref_schema,
@@ -3094,7 +3404,11 @@ def get_foreign_keys(self, connection, table_name, schema=None, **kw):
 
         return fkeys if fkeys else ReflectionDefaults.foreign_keys()
 
-    def _correct_for_mysql_bugs_88718_96365(self, fkeys, connection):
+    def _correct_for_mysql_bugs_88718_96365(
+        self,
+        fkeys: List[ReflectedForeignKeyConstraint],
+        connection: Connection,
+    ) -> None:
         # Foreign key is always in lower case (MySQL 8.0)
         # https://bugs.mysql.com/bug.php?id=88718
         # issue #4344 for SQLAlchemy
@@ -3110,22 +3424,24 @@ def _correct_for_mysql_bugs_88718_96365(self, fkeys, connection):
 
         if self._casing in (1, 2):
 
-            def lower(s):
+            def lower(s: str) -> str:
                 return s.lower()
 
         else:
             # if on case sensitive, there can be two tables referenced
             # with the same name different casing, so we need to use
             # case-sensitive matching.
-            def lower(s):
+            def lower(s: str) -> str:
                 return s
 
-        default_schema_name = connection.dialect.default_schema_name
+        default_schema_name: str = connection.dialect.default_schema_name  # type: ignore  # noqa: E501
 
         # NOTE: using (table_schema, table_name, lower(column_name)) in (...)
         # is very slow since mysql does not seem able to properly use indexse.
         # Unpack the where condition instead.
-        schema_by_table_by_column = defaultdict(lambda: defaultdict(list))
+        schema_by_table_by_column: DefaultDict[
+            str, DefaultDict[str, List[str]]
+        ] = DefaultDict(lambda: DefaultDict(list))
         for rec in fkeys:
             sch = lower(rec["referred_schema"] or default_schema_name)
             tbl = lower(rec["referred_table"])
@@ -3160,7 +3476,9 @@ def lower(s):
                 _info_columns.c.column_name,
             ).where(condition)
 
-            correct_for_wrong_fk_case = connection.execute(select)
+            correct_for_wrong_fk_case: CursorResult[Tuple[str, str, str]] = (
+                connection.execute(select)
+            )
 
             # in casing=0, table name and schema name come back in their
             # exact case.
@@ -3172,35 +3490,41 @@ def lower(s):
             # SHOW CREATE TABLE converts them to *lower case*, therefore
             # not matching.  So for this case, case-insensitive lookup
             # is necessary
-            d = defaultdict(dict)
+            d: DefaultDict[Tuple[str, str], Dict[str, str]] = defaultdict(dict)
             for schema, tname, cname in correct_for_wrong_fk_case:
                 d[(lower(schema), lower(tname))]["SCHEMANAME"] = schema
                 d[(lower(schema), lower(tname))]["TABLENAME"] = tname
                 d[(lower(schema), lower(tname))][cname.lower()] = cname
 
             for fkey in fkeys:
-                rec = d[
+                rec_b = d[
                     (
                         lower(fkey["referred_schema"] or default_schema_name),
                         lower(fkey["referred_table"]),
                     )
                 ]
 
-                fkey["referred_table"] = rec["TABLENAME"]
+                fkey["referred_table"] = rec_b["TABLENAME"]
                 if fkey["referred_schema"] is not None:
-                    fkey["referred_schema"] = rec["SCHEMANAME"]
+                    fkey["referred_schema"] = rec_b["SCHEMANAME"]
 
                 fkey["referred_columns"] = [
-                    rec[col.lower()] for col in fkey["referred_columns"]
+                    rec_b[col.lower()] for col in fkey["referred_columns"]
                 ]
 
     @reflection.cache
-    def get_check_constraints(self, connection, table_name, schema=None, **kw):
+    def get_check_constraints(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> List[ReflectedCheckConstraint]:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
 
-        cks = [
+        cks: List[ReflectedCheckConstraint] = [
             {"name": spec["name"], "sqltext": spec["sqltext"]}
             for spec in parsed_state.ck_constraints
         ]
@@ -3208,7 +3532,13 @@ def get_check_constraints(self, connection, table_name, schema=None, **kw):
         return cks if cks else ReflectionDefaults.check_constraints()
 
     @reflection.cache
-    def get_table_comment(self, connection, table_name, schema=None, **kw):
+    def get_table_comment(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> ReflectedTableComment:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
@@ -3219,12 +3549,18 @@ def get_table_comment(self, connection, table_name, schema=None, **kw):
             return ReflectionDefaults.table_comment()
 
     @reflection.cache
-    def get_indexes(self, connection, table_name, schema=None, **kw):
+    def get_indexes(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> List[ReflectedIndex]:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
 
-        indexes = []
+        indexes: List[ReflectedIndex] = []
 
         for spec in parsed_state.keys:
             dialect_options = {}
@@ -3236,32 +3572,30 @@ def get_indexes(self, connection, table_name, schema=None, **kw):
                 unique = True
             elif flavor in ("FULLTEXT", "SPATIAL"):
                 dialect_options["%s_prefix" % self.name] = flavor
-            elif flavor is None:
-                pass
-            else:
-                self.logger.info(
+            elif flavor is not None:
+                util.warn(
                     "Converting unknown KEY type %s to a plain KEY", flavor
                 )
-                pass
 
             if spec["parser"]:
                 dialect_options["%s_with_parser" % (self.name)] = spec[
                     "parser"
                 ]
 
-            index_d = {}
+            index_d: ReflectedIndex = {
+                "name": spec["name"],
+                "column_names": [s[0] for s in spec["columns"]],
+                "unique": unique,
+            }
 
-            index_d["name"] = spec["name"]
-            index_d["column_names"] = [s[0] for s in spec["columns"]]
             mysql_length = {
                 s[0]: s[1] for s in spec["columns"] if s[1] is not None
             }
             if mysql_length:
                 dialect_options["%s_length" % self.name] = mysql_length
 
-            index_d["unique"] = unique
             if flavor:
-                index_d["type"] = flavor
+                index_d["type"] = flavor  # type: ignore[typeddict-unknown-key]
 
             if dialect_options:
                 index_d["dialect_options"] = dialect_options
@@ -3272,13 +3606,17 @@ def get_indexes(self, connection, table_name, schema=None, **kw):
 
     @reflection.cache
     def get_unique_constraints(
-        self, connection, table_name, schema=None, **kw
-    ):
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> List[ReflectedUniqueConstraint]:
         parsed_state = self._parsed_state_or_create(
             connection, table_name, schema, **kw
         )
 
-        ucs = [
+        ucs: List[ReflectedUniqueConstraint] = [
             {
                 "name": key["name"],
                 "column_names": [col[0] for col in key["columns"]],
@@ -3294,7 +3632,13 @@ def get_unique_constraints(
             return ReflectionDefaults.unique_constraints()
 
     @reflection.cache
-    def get_view_definition(self, connection, view_name, schema=None, **kw):
+    def get_view_definition(
+        self,
+        connection: Connection,
+        view_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> str:
         charset = self._connection_charset
         full_name = ".".join(
             self.identifier_preparer._quote_free_identifiers(schema, view_name)
@@ -3308,8 +3652,12 @@ def get_view_definition(self, connection, view_name, schema=None, **kw):
         return sql
 
     def _parsed_state_or_create(
-        self, connection, table_name, schema=None, **kw
-    ):
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> _reflection.ReflectedState:
         return self._setup_parser(
             connection,
             table_name,
@@ -3318,7 +3666,7 @@ def _parsed_state_or_create(
         )
 
     @util.memoized_property
-    def _tabledef_parser(self):
+    def _tabledef_parser(self) -> _reflection.MySQLTableDefinitionParser:
         """return the MySQLTableDefinitionParser, generate if needed.
 
         The deferred creation ensures that the dialect has
@@ -3329,7 +3677,13 @@ def _tabledef_parser(self):
         return _reflection.MySQLTableDefinitionParser(self, preparer)
 
     @reflection.cache
-    def _setup_parser(self, connection, table_name, schema=None, **kw):
+    def _setup_parser(
+        self,
+        connection: Connection,
+        table_name: str,
+        schema: Optional[str] = None,
+        **kw: Any,
+    ) -> _reflection.ReflectedState:
         charset = self._connection_charset
         parser = self._tabledef_parser
         full_name = ".".join(
@@ -3345,10 +3699,14 @@ def _setup_parser(self, connection, table_name, schema=None, **kw):
             columns = self._describe_table(
                 connection, None, charset, full_name=full_name
             )
-            sql = parser._describe_to_create(table_name, columns)
+            sql = parser._describe_to_create(
+                table_name, columns  # type: ignore[arg-type]
+            )
         return parser.parse(sql, charset)
 
-    def _fetch_setting(self, connection, setting_name):
+    def _fetch_setting(
+        self, connection: Connection, setting_name: str
+    ) -> Optional[str]:
         charset = self._connection_charset
 
         if self.server_version_info and self.server_version_info < (5, 6):
@@ -3363,12 +3721,12 @@ def _fetch_setting(self, connection, setting_name):
         if not row:
             return None
         else:
-            return row[fetch_col]
+            return cast(Optional[str], row[fetch_col])
 
-    def _detect_charset(self, connection):
+    def _detect_charset(self, connection: Connection) -> str:
         raise NotImplementedError()
 
-    def _detect_casing(self, connection):
+    def _detect_casing(self, connection: Connection) -> int:
         """Sniff out identifier case sensitivity.
 
         Cached per-connection. This value can not change without a server
@@ -3392,7 +3750,7 @@ def _detect_casing(self, connection):
         self._casing = cs
         return cs
 
-    def _detect_collations(self, connection):
+    def _detect_collations(self, connection: Connection) -> Dict[str, str]:
         """Pull the active COLLATIONS list from the server.
 
         Cached per-connection.
@@ -3405,7 +3763,7 @@ def _detect_collations(self, connection):
             collations[row[0]] = row[1]
         return collations
 
-    def _detect_sql_mode(self, connection):
+    def _detect_sql_mode(self, connection: Connection) -> None:
         setting = self._fetch_setting(connection, "sql_mode")
 
         if setting is None:
@@ -3417,7 +3775,7 @@ def _detect_sql_mode(self, connection):
         else:
             self._sql_mode = setting or ""
 
-    def _detect_ansiquotes(self, connection):
+    def _detect_ansiquotes(self, connection: Connection) -> None:
         """Detect and adjust for the ANSI_QUOTES sql mode."""
 
         mode = self._sql_mode
@@ -3432,34 +3790,81 @@ def _detect_ansiquotes(self, connection):
         # as of MySQL 5.0.1
         self._backslash_escapes = "NO_BACKSLASH_ESCAPES" not in mode
 
+    @overload
     def _show_create_table(
-        self, connection, table, charset=None, full_name=None
-    ):
+        self,
+        connection: Connection,
+        table: Optional[Table],
+        charset: Optional[str],
+        full_name: str,
+    ) -> str: ...
+
+    @overload
+    def _show_create_table(
+        self,
+        connection: Connection,
+        table: Table,
+        charset: Optional[str] = None,
+        full_name: None = None,
+    ) -> str: ...
+
+    def _show_create_table(
+        self,
+        connection: Connection,
+        table: Optional[Table],
+        charset: Optional[str] = None,
+        full_name: Optional[str] = None,
+    ) -> str:
         """Run SHOW CREATE TABLE for a ``Table``."""
 
         if full_name is None:
+            assert table is not None
             full_name = self.identifier_preparer.format_table(table)
         st = "SHOW CREATE TABLE %s" % full_name
 
-        rp = None
         try:
             rp = connection.execution_options(
                 skip_user_error_events=True
             ).exec_driver_sql(st)
         except exc.DBAPIError as e:
-            if self._extract_error_code(e.orig) == 1146:
+            if self._extract_error_code(e.orig) == 1146:  # type: ignore[arg-type] # noqa: E501
                 raise exc.NoSuchTableError(full_name) from e
             else:
                 raise
         row = self._compat_first(rp, charset=charset)
         if not row:
             raise exc.NoSuchTableError(full_name)
-        return row[1].strip()
+        return cast(str, row[1]).strip()
 
-    def _describe_table(self, connection, table, charset=None, full_name=None):
+    @overload
+    def _describe_table(
+        self,
+        connection: Connection,
+        table: Optional[Table],
+        charset: Optional[str],
+        full_name: str,
+    ) -> Union[Sequence[Row[Any]], Sequence[_DecodingRow]]: ...
+
+    @overload
+    def _describe_table(
+        self,
+        connection: Connection,
+        table: Table,
+        charset: Optional[str] = None,
+        full_name: None = None,
+    ) -> Union[Sequence[Row[Any]], Sequence[_DecodingRow]]: ...
+
+    def _describe_table(
+        self,
+        connection: Connection,
+        table: Optional[Table],
+        charset: Optional[str] = None,
+        full_name: Optional[str] = None,
+    ) -> Union[Sequence[Row[Any]], Sequence[_DecodingRow]]:
         """Run DESCRIBE for a ``Table`` and return processed rows."""
 
         if full_name is None:
+            assert table is not None
             full_name = self.identifier_preparer.format_table(table)
         st = "DESCRIBE %s" % full_name
 
@@ -3470,7 +3875,7 @@ def _describe_table(self, connection, table, charset=None, full_name=None):
                     skip_user_error_events=True
                 ).exec_driver_sql(st)
             except exc.DBAPIError as e:
-                code = self._extract_error_code(e.orig)
+                code = self._extract_error_code(e.orig)  # type: ignore[arg-type] # noqa: E501
                 if code == 1146:
                     raise exc.NoSuchTableError(full_name) from e
 
@@ -3502,7 +3907,7 @@ class _DecodingRow:
     # sets.Set(['value']) (seriously) but thankfully that doesn't
     # seem to come up in DDL queries.
 
-    _encoding_compat = {
+    _encoding_compat: Dict[str, str] = {
         "koi8r": "koi8_r",
         "koi8u": "koi8_u",
         "utf16": "utf-16-be",  # MySQL's uft16 is always bigendian
@@ -3512,24 +3917,23 @@ class _DecodingRow:
         "eucjpms": "ujis",
     }
 
-    def __init__(self, rowproxy, charset):
+    def __init__(self, rowproxy: Row[Any], charset: Optional[str]):
         self.rowproxy = rowproxy
-        self.charset = self._encoding_compat.get(charset, charset)
+        self.charset = (
+            self._encoding_compat.get(charset, charset)
+            if charset is not None
+            else None
+        )
 
-    def __getitem__(self, index):
+    def __getitem__(self, index: int) -> Any:
         item = self.rowproxy[index]
-        if isinstance(item, _array):
-            item = item.tostring()
-
         if self.charset and isinstance(item, bytes):
             return item.decode(self.charset)
         else:
             return item
 
-    def __getattr__(self, attr):
+    def __getattr__(self, attr: str) -> Any:
         item = getattr(self.rowproxy, attr)
-        if isinstance(item, _array):
-            item = item.tostring()
         if self.charset and isinstance(item, bytes):
             return item.decode(self.charset)
         else:
diff --git a/libs/sqlalchemy/dialects/mysql/cymysql.py b/libs/sqlalchemy/dialects/mysql/cymysql.py
index 5c00ada9f9..325d3321e3 100644
--- a/libs/sqlalchemy/dialects/mysql/cymysql.py
+++ b/libs/sqlalchemy/dialects/mysql/cymysql.py
@@ -1,10 +1,9 @@
 # dialects/mysql/cymysql.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 r"""
 
@@ -21,18 +20,36 @@
     dialects are mysqlclient and PyMySQL.
 
 """  # noqa
+from __future__ import annotations
+
+from typing import Any
+from typing import Iterable
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
 
-from .base import BIT
 from .base import MySQLDialect
 from .mysqldb import MySQLDialect_mysqldb
+from .types import BIT
 from ... import util
 
+if TYPE_CHECKING:
+    from ...engine.base import Connection
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import Dialect
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...sql.type_api import _ResultProcessorType
+
 
 class _cymysqlBIT(BIT):
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> Optional[_ResultProcessorType[Any]]:
         """Convert MySQL's 64 bit, variable length binary string to a long."""
 
-        def process(value):
+        def process(value: Optional[Iterable[int]]) -> Optional[int]:
             if value is not None:
                 v = 0
                 for i in iter(value):
@@ -55,17 +72,22 @@ class MySQLDialect_cymysql(MySQLDialect_mysqldb):
     colspecs = util.update_copy(MySQLDialect.colspecs, {BIT: _cymysqlBIT})
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> DBAPIModule:
         return __import__("cymysql")
 
-    def _detect_charset(self, connection):
-        return connection.connection.charset
+    def _detect_charset(self, connection: Connection) -> str:
+        return connection.connection.charset  # type: ignore[no-any-return]
 
-    def _extract_error_code(self, exception):
-        return exception.errno
+    def _extract_error_code(self, exception: DBAPIModule.Error) -> int:
+        return exception.errno  # type: ignore[no-any-return]
 
-    def is_disconnect(self, e, connection, cursor):
-        if isinstance(e, self.dbapi.OperationalError):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
+        if isinstance(e, self.loaded_dbapi.OperationalError):
             return self._extract_error_code(e) in (
                 2006,
                 2013,
@@ -73,7 +95,7 @@ def is_disconnect(self, e, connection, cursor):
                 2045,
                 2055,
             )
-        elif isinstance(e, self.dbapi.InterfaceError):
+        elif isinstance(e, self.loaded_dbapi.InterfaceError):
             # if underlying connection is closed,
             # this is the error you get
             return True
diff --git a/libs/sqlalchemy/dialects/mysql/dml.py b/libs/sqlalchemy/dialects/mysql/dml.py
index cceb0818f9..d5bbf14bb8 100644
--- a/libs/sqlalchemy/dialects/mysql/dml.py
+++ b/libs/sqlalchemy/dialects/mysql/dml.py
@@ -1,5 +1,5 @@
 # dialects/mysql/dml.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/mysql/enumerated.py b/libs/sqlalchemy/dialects/mysql/enumerated.py
index 6745cae55e..9e19d6440a 100644
--- a/libs/sqlalchemy/dialects/mysql/enumerated.py
+++ b/libs/sqlalchemy/dialects/mysql/enumerated.py
@@ -1,29 +1,46 @@
 # dialects/mysql/enumerated.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
+from __future__ import annotations
 
+import enum
 import re
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import Set
+from typing import Type
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .types import _StringType
 from ... import exc
 from ... import sql
 from ... import util
 from ...sql import sqltypes
+from ...sql import type_api
 
+if TYPE_CHECKING:
+    from ...engine.interfaces import Dialect
+    from ...sql.elements import ColumnElement
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _ResultProcessorType
+    from ...sql.type_api import TypeEngine
+    from ...sql.type_api import TypeEngineMixin
 
-class ENUM(sqltypes.NativeForEmulated, sqltypes.Enum, _StringType):
+
+class ENUM(type_api.NativeForEmulated, sqltypes.Enum, _StringType):
     """MySQL ENUM type."""
 
     __visit_name__ = "ENUM"
 
     native_enum = True
 
-    def __init__(self, *enums, **kw):
+    def __init__(self, *enums: Union[str, Type[enum.Enum]], **kw: Any) -> None:
         """Construct an ENUM.
 
         E.g.::
@@ -62,21 +79,27 @@ def __init__(self, *enums, **kw):
 
         """
         kw.pop("strict", None)
-        self._enum_init(enums, kw)
+        self._enum_init(enums, kw)  # type: ignore[arg-type]
         _StringType.__init__(self, length=self.length, **kw)
 
     @classmethod
-    def adapt_emulated_to_native(cls, impl, **kw):
+    def adapt_emulated_to_native(
+        cls,
+        impl: Union[TypeEngine[Any], TypeEngineMixin],
+        **kw: Any,
+    ) -> ENUM:
         """Produce a MySQL native :class:`.mysql.ENUM` from plain
         :class:`.Enum`.
 
         """
+        if TYPE_CHECKING:
+            assert isinstance(impl, ENUM)
         kw.setdefault("validate_strings", impl.validate_strings)
         kw.setdefault("values_callable", impl.values_callable)
         kw.setdefault("omit_aliases", impl._omit_aliases)
         return cls(**kw)
 
-    def _object_value_for_elem(self, elem):
+    def _object_value_for_elem(self, elem: str) -> Union[str, enum.Enum]:
         # mysql sends back a blank string for any value that
         # was persisted that was not in the enums; that is, it does no
         # validation on the incoming data, it "truncates" it to be
@@ -86,18 +109,22 @@ def _object_value_for_elem(self, elem):
         else:
             return super()._object_value_for_elem(elem)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return util.generic_repr(
             self, to_inspect=[ENUM, _StringType, sqltypes.Enum]
         )
 
 
+# TODO: SET is a string as far as configuration but does not act like
+# a string at the python level.  We either need to make a py-type agnostic
+# version of String as a base to be used for this, make this some kind of
+# TypeDecorator, or just vendor it out as its own type.
 class SET(_StringType):
     """MySQL SET type."""
 
     __visit_name__ = "SET"
 
-    def __init__(self, *values, **kw):
+    def __init__(self, *values: str, **kw: Any):
         """Construct a SET.
 
         E.g.::
@@ -150,17 +177,19 @@ def __init__(self, *values, **kw):
                 "setting retrieve_as_bitwise=True"
             )
         if self.retrieve_as_bitwise:
-            self._bitmap = {
+            self._inversed_bitmap: Dict[str, int] = {
                 value: 2**idx for idx, value in enumerate(self.values)
             }
-            self._bitmap.update(
-                (2**idx, value) for idx, value in enumerate(self.values)
-            )
+            self._bitmap: Dict[int, str] = {
+                2**idx: value for idx, value in enumerate(self.values)
+            }
         length = max([len(v) for v in values] + [0])
         kw.setdefault("length", length)
         super().__init__(**kw)
 
-    def column_expression(self, colexpr):
+    def column_expression(
+        self, colexpr: ColumnElement[Any]
+    ) -> ColumnElement[Any]:
         if self.retrieve_as_bitwise:
             return sql.type_coerce(
                 sql.type_coerce(colexpr, sqltypes.Integer) + 0, self
@@ -168,10 +197,12 @@ def column_expression(self, colexpr):
         else:
             return colexpr
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: Any
+    ) -> Optional[_ResultProcessorType[Any]]:
         if self.retrieve_as_bitwise:
 
-            def process(value):
+            def process(value: Union[str, int, None]) -> Optional[Set[str]]:
                 if value is not None:
                     value = int(value)
 
@@ -182,11 +213,14 @@ def process(value):
         else:
             super_convert = super().result_processor(dialect, coltype)
 
-            def process(value):
+            def process(value: Union[str, Set[str], None]) -> Optional[Set[str]]:  # type: ignore[misc]  # noqa: E501
                 if isinstance(value, str):
                     # MySQLdb returns a string, let's parse
                     if super_convert:
                         value = super_convert(value)
+                        assert value is not None
+                    if TYPE_CHECKING:
+                        assert isinstance(value, str)
                     return set(re.findall(r"[^,]+", value))
                 else:
                     # mysql-connector-python does a naive
@@ -197,43 +231,48 @@ def process(value):
 
         return process
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> _BindProcessorType[Union[str, int]]:
         super_convert = super().bind_processor(dialect)
         if self.retrieve_as_bitwise:
 
-            def process(value):
+            def process(
+                value: Union[str, int, set[str], None],
+            ) -> Union[str, int, None]:
                 if value is None:
                     return None
                 elif isinstance(value, (int, str)):
                     if super_convert:
-                        return super_convert(value)
+                        return super_convert(value)  # type: ignore[arg-type, no-any-return]  # noqa: E501
                     else:
                         return value
                 else:
                     int_value = 0
                     for v in value:
-                        int_value |= self._bitmap[v]
+                        int_value |= self._inversed_bitmap[v]
                     return int_value
 
         else:
 
-            def process(value):
+            def process(
+                value: Union[str, int, set[str], None],
+            ) -> Union[str, int, None]:
                 # accept strings and int (actually bitflag) values directly
                 if value is not None and not isinstance(value, (int, str)):
                     value = ",".join(value)
-
                 if super_convert:
-                    return super_convert(value)
+                    return super_convert(value)  # type: ignore
                 else:
                     return value
 
         return process
 
-    def adapt(self, impltype, **kw):
+    def adapt(self, cls: type, **kw: Any) -> Any:
         kw["retrieve_as_bitwise"] = self.retrieve_as_bitwise
-        return util.constructor_copy(self, impltype, *self.values, **kw)
+        return util.constructor_copy(self, cls, *self.values, **kw)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return util.generic_repr(
             self,
             to_inspect=[SET, _StringType],
diff --git a/libs/sqlalchemy/dialects/mysql/expression.py b/libs/sqlalchemy/dialects/mysql/expression.py
index b60a088851..914207e9ee 100644
--- a/libs/sqlalchemy/dialects/mysql/expression.py
+++ b/libs/sqlalchemy/dialects/mysql/expression.py
@@ -1,11 +1,13 @@
 # dialects/mysql/expression.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
+from __future__ import annotations
+
+from typing import Any
 
 from ... import exc
 from ... import util
@@ -18,7 +20,7 @@
 from ...util.typing import Self
 
 
-class match(Generative, elements.BinaryExpression):
+class match(Generative, elements.BinaryExpression[Any]):
     """Produce a ``MATCH (X, Y) AGAINST ('TEXT')`` clause.
 
     E.g.::
@@ -73,8 +75,9 @@ class match(Generative, elements.BinaryExpression):
     __visit_name__ = "mysql_match"
 
     inherit_cache = True
+    modifiers: util.immutabledict[str, Any]
 
-    def __init__(self, *cols, **kw):
+    def __init__(self, *cols: elements.ColumnElement[Any], **kw: Any):
         if not cols:
             raise exc.ArgumentError("columns are required")
 
diff --git a/libs/sqlalchemy/dialects/mysql/json.py b/libs/sqlalchemy/dialects/mysql/json.py
index 8912af3663..7e2606ccf9 100644
--- a/libs/sqlalchemy/dialects/mysql/json.py
+++ b/libs/sqlalchemy/dialects/mysql/json.py
@@ -1,13 +1,21 @@
 # dialects/mysql/json.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
+from __future__ import annotations
+
+from typing import Any
+from typing import TYPE_CHECKING
 
 from ... import types as sqltypes
 
+if TYPE_CHECKING:
+    from ...engine.interfaces import Dialect
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _LiteralProcessorType
+
 
 class JSON(sqltypes.JSON):
     """MySQL JSON type.
@@ -34,13 +42,13 @@ class JSON(sqltypes.JSON):
 
 
 class _FormatTypeMixin:
-    def _format_value(self, value):
+    def _format_value(self, value: Any) -> str:
         raise NotImplementedError()
 
-    def bind_processor(self, dialect):
-        super_proc = self.string_bind_processor(dialect)
+    def bind_processor(self, dialect: Dialect) -> _BindProcessorType[Any]:
+        super_proc = self.string_bind_processor(dialect)  # type: ignore[attr-defined]  # noqa: E501
 
-        def process(value):
+        def process(value: Any) -> Any:
             value = self._format_value(value)
             if super_proc:
                 value = super_proc(value)
@@ -48,29 +56,31 @@ def process(value):
 
         return process
 
-    def literal_processor(self, dialect):
-        super_proc = self.string_literal_processor(dialect)
+    def literal_processor(
+        self, dialect: Dialect
+    ) -> _LiteralProcessorType[Any]:
+        super_proc = self.string_literal_processor(dialect)  # type: ignore[attr-defined]  # noqa: E501
 
-        def process(value):
+        def process(value: Any) -> str:
             value = self._format_value(value)
             if super_proc:
                 value = super_proc(value)
-            return value
+            return value  # type: ignore[no-any-return]
 
         return process
 
 
 class JSONIndexType(_FormatTypeMixin, sqltypes.JSON.JSONIndexType):
-    def _format_value(self, value):
+    def _format_value(self, value: Any) -> str:
         if isinstance(value, int):
-            value = "$[%s]" % value
+            formatted_value = "$[%s]" % value
         else:
-            value = '$."%s"' % value
-        return value
+            formatted_value = '$."%s"' % value
+        return formatted_value
 
 
 class JSONPathType(_FormatTypeMixin, sqltypes.JSON.JSONPathType):
-    def _format_value(self, value):
+    def _format_value(self, value: Any) -> str:
         return "$%s" % (
             "".join(
                 [
diff --git a/libs/sqlalchemy/dialects/mysql/mariadb.py b/libs/sqlalchemy/dialects/mysql/mariadb.py
index ac2cfbd1b0..70d9cb8094 100644
--- a/libs/sqlalchemy/dialects/mysql/mariadb.py
+++ b/libs/sqlalchemy/dialects/mysql/mariadb.py
@@ -1,12 +1,17 @@
 # dialects/mysql/mariadb.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
+
+from __future__ import annotations
+
+from typing import Any
+
 from .base import MariaDBIdentifierPreparer
 from .base import MySQLDialect
+from .base import MySQLIdentifierPreparer
 from .base import MySQLTypeCompiler
 from ...sql import sqltypes
 
@@ -30,10 +35,10 @@ class INET6(sqltypes.TypeEngine[str]):
 
 
 class MariaDBTypeCompiler(MySQLTypeCompiler):
-    def visit_INET4(self, type_, **kwargs) -> str:
+    def visit_INET4(self, type_: INET4, **kwargs: Any) -> str:
         return "INET4"
 
-    def visit_INET6(self, type_, **kwargs) -> str:
+    def visit_INET6(self, type_: INET6, **kwargs: Any) -> str:
         return "INET6"
 
 
@@ -41,21 +46,27 @@ class MariaDBDialect(MySQLDialect):
     is_mariadb = True
     supports_statement_cache = True
     name = "mariadb"
-    preparer = MariaDBIdentifierPreparer
+    preparer: type[MySQLIdentifierPreparer] = MariaDBIdentifierPreparer
     type_compiler_cls = MariaDBTypeCompiler
 
 
-def loader(driver):
-    driver_mod = __import__(
+def loader(driver: str) -> type[MariaDBDialect]:
+    dialect_mod = __import__(
         "sqlalchemy.dialects.mysql.%s" % driver
     ).dialects.mysql
-    driver_cls = getattr(driver_mod, driver).dialect
-
-    return type(
-        "MariaDBDialect_%s" % driver,
-        (
-            MariaDBDialect,
-            driver_cls,
-        ),
-        {"supports_statement_cache": True},
-    )
+
+    driver_mod = getattr(dialect_mod, driver)
+    if hasattr(driver_mod, "mariadb_dialect"):
+        driver_cls = driver_mod.mariadb_dialect
+        return driver_cls  # type: ignore[no-any-return]
+    else:
+        driver_cls = driver_mod.dialect
+
+        return type(
+            "MariaDBDialect_%s" % driver,
+            (
+                MariaDBDialect,
+                driver_cls,
+            ),
+            {"supports_statement_cache": True},
+        )
diff --git a/libs/sqlalchemy/dialects/mysql/mariadbconnector.py b/libs/sqlalchemy/dialects/mysql/mariadbconnector.py
index 2d2ad19971..bd5d7a2584 100644
--- a/libs/sqlalchemy/dialects/mysql/mariadbconnector.py
+++ b/libs/sqlalchemy/dialects/mysql/mariadbconnector.py
@@ -1,11 +1,9 @@
 # dialects/mysql/mariadbconnector.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
-
 
 """
 
@@ -29,7 +27,15 @@
 .. mariadb: https://github.com/mariadb-corporation/mariadb-connector-python
 
 """  # noqa
+from __future__ import annotations
+
 import re
+from typing import Any
+from typing import Optional
+from typing import Sequence
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
 from uuid import UUID as _python_UUID
 
 from .base import MySQLCompiler
@@ -39,6 +45,19 @@
 from ... import util
 from ...sql import sqltypes
 
+if TYPE_CHECKING:
+    from ...engine.base import Connection
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import Dialect
+    from ...engine.interfaces import IsolationLevel
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...engine.url import URL
+    from ...sql.compiler import SQLCompiler
+    from ...sql.type_api import _ResultProcessorType
+
 
 mariadb_cpy_minimum_version = (1, 0, 1)
 
@@ -47,10 +66,12 @@ class _MariaDBUUID(sqltypes.UUID[sqltypes._UUID_RETURN]):
     # work around JIRA issue
     # https://jira.mariadb.org/browse/CONPY-270.  When that issue is fixed,
     # this type can be removed.
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> Optional[_ResultProcessorType[Any]]:
         if self.as_uuid:
 
-            def process(value):
+            def process(value: Any) -> Any:
                 if value is not None:
                     if hasattr(value, "decode"):
                         value = value.decode("ascii")
@@ -60,7 +81,7 @@ def process(value):
             return process
         else:
 
-            def process(value):
+            def process(value: Any) -> Any:
                 if value is not None:
                     if hasattr(value, "decode"):
                         value = value.decode("ascii")
@@ -71,23 +92,27 @@ def process(value):
 
 
 class MySQLExecutionContext_mariadbconnector(MySQLExecutionContext):
-    _lastrowid = None
+    _lastrowid: Optional[int] = None
 
-    def create_server_side_cursor(self):
+    def create_server_side_cursor(self) -> DBAPICursor:
         return self._dbapi_connection.cursor(buffered=False)
 
-    def create_default_cursor(self):
+    def create_default_cursor(self) -> DBAPICursor:
         return self._dbapi_connection.cursor(buffered=True)
 
-    def post_exec(self):
+    def post_exec(self) -> None:
         super().post_exec()
 
         self._rowcount = self.cursor.rowcount
 
+        if TYPE_CHECKING:
+            assert isinstance(self.compiled, SQLCompiler)
         if self.isinsert and self.compiled.postfetch_lastrowid:
             self._lastrowid = self.cursor.lastrowid
 
-    def get_lastrowid(self):
+    def get_lastrowid(self) -> int:
+        if TYPE_CHECKING:
+            assert self._lastrowid is not None
         return self._lastrowid
 
 
@@ -126,7 +151,7 @@ class MySQLDialect_mariadbconnector(MySQLDialect):
     )
 
     @util.memoized_property
-    def _dbapi_version(self):
+    def _dbapi_version(self) -> Tuple[int, ...]:
         if self.dbapi and hasattr(self.dbapi, "__version__"):
             return tuple(
                 [
@@ -139,7 +164,7 @@ def _dbapi_version(self):
         else:
             return (99, 99, 99)
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.paramstyle = "qmark"
         if self.dbapi is not None:
@@ -151,19 +176,24 @@ def __init__(self, **kwargs):
                 )
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> DBAPIModule:
         return __import__("mariadb")
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
         if super().is_disconnect(e, connection, cursor):
             return True
-        elif isinstance(e, self.dbapi.Error):
+        elif isinstance(e, self.loaded_dbapi.Error):
             str_e = str(e).lower()
             return "not connected" in str_e or "isn't valid" in str_e
         else:
             return False
 
-    def create_connect_args(self, url):
+    def create_connect_args(self, url: URL) -> ConnectArgsType:
         opts = url.translate_connect_args()
         opts.update(url.query)
 
@@ -200,19 +230,21 @@ def create_connect_args(self, url):
             except (AttributeError, ImportError):
                 self.supports_sane_rowcount = False
             opts["client_flag"] = client_flag
-        return [[], opts]
+        return [], opts
 
-    def _extract_error_code(self, exception):
+    def _extract_error_code(self, exception: DBAPIModule.Error) -> int:
         try:
-            rc = exception.errno
+            rc: int = exception.errno
         except:
             rc = -1
         return rc
 
-    def _detect_charset(self, connection):
+    def _detect_charset(self, connection: Connection) -> str:
         return "utf8mb4"
 
-    def get_isolation_level_values(self, dbapi_connection):
+    def get_isolation_level_values(
+        self, dbapi_conn: DBAPIConnection
+    ) -> Sequence[IsolationLevel]:
         return (
             "SERIALIZABLE",
             "READ UNCOMMITTED",
@@ -221,21 +253,26 @@ def get_isolation_level_values(self, dbapi_connection):
             "AUTOCOMMIT",
         )
 
-    def set_isolation_level(self, connection, level):
+    def detect_autocommit_setting(self, dbapi_conn: DBAPIConnection) -> bool:
+        return bool(dbapi_conn.autocommit)
+
+    def set_isolation_level(
+        self, dbapi_connection: DBAPIConnection, level: IsolationLevel
+    ) -> None:
         if level == "AUTOCOMMIT":
-            connection.autocommit = True
+            dbapi_connection.autocommit = True
         else:
-            connection.autocommit = False
-            super().set_isolation_level(connection, level)
+            dbapi_connection.autocommit = False
+            super().set_isolation_level(dbapi_connection, level)
 
-    def do_begin_twophase(self, connection, xid):
+    def do_begin_twophase(self, connection: Connection, xid: Any) -> None:
         connection.execute(
             sql.text("XA BEGIN :xid").bindparams(
                 sql.bindparam("xid", xid, literal_execute=True)
             )
         )
 
-    def do_prepare_twophase(self, connection, xid):
+    def do_prepare_twophase(self, connection: Connection, xid: Any) -> None:
         connection.execute(
             sql.text("XA END :xid").bindparams(
                 sql.bindparam("xid", xid, literal_execute=True)
@@ -248,8 +285,12 @@ def do_prepare_twophase(self, connection, xid):
         )
 
     def do_rollback_twophase(
-        self, connection, xid, is_prepared=True, recover=False
-    ):
+        self,
+        connection: Connection,
+        xid: Any,
+        is_prepared: bool = True,
+        recover: bool = False,
+    ) -> None:
         if not is_prepared:
             connection.execute(
                 sql.text("XA END :xid").bindparams(
@@ -263,8 +304,12 @@ def do_rollback_twophase(
         )
 
     def do_commit_twophase(
-        self, connection, xid, is_prepared=True, recover=False
-    ):
+        self,
+        connection: Connection,
+        xid: Any,
+        is_prepared: bool = True,
+        recover: bool = False,
+    ) -> None:
         if not is_prepared:
             self.do_prepare_twophase(connection, xid)
         connection.execute(
diff --git a/libs/sqlalchemy/dialects/mysql/mysqlconnector.py b/libs/sqlalchemy/dialects/mysql/mysqlconnector.py
index e88f8fd71a..d97dbe2195 100644
--- a/libs/sqlalchemy/dialects/mysql/mysqlconnector.py
+++ b/libs/sqlalchemy/dialects/mysql/mysqlconnector.py
@@ -1,10 +1,9 @@
 # dialects/mysql/mysqlconnector.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 
 r"""
@@ -14,26 +13,85 @@
     :connectstring: mysql+mysqlconnector://<user>:<password>@<host>[:<port>]/<dbname>
     :url: https://pypi.org/project/mysql-connector-python/
 
-.. note::
+Driver Status
+-------------
+
+MySQL Connector/Python is supported as of SQLAlchemy 2.0.39 to the
+degree which the driver is functional.   There are still ongoing issues
+with features such as server side cursors which remain disabled until
+upstream issues are repaired.
+
+.. warning:: The MySQL Connector/Python driver published by Oracle is subject
+   to frequent, major regressions of essential functionality such as being able
+   to correctly persist simple binary strings which indicate it is not well
+   tested.  The SQLAlchemy project is not able to maintain this dialect fully as
+   regressions in the driver prevent it from being included in continuous
+   integration.
+
+.. versionchanged:: 2.0.39
+
+    The MySQL Connector/Python dialect has been updated to support the
+    latest version of this DBAPI.   Previously, MySQL Connector/Python
+    was not fully supported.  However, support remains limited due to ongoing
+    regressions introduced in this driver.
+
+Connecting to MariaDB with MySQL Connector/Python
+--------------------------------------------------
+
+MySQL Connector/Python may attempt to pass an incompatible collation to the
+database when connecting to MariaDB.  Experimentation has shown that using
+``?charset=utf8mb4&collation=utfmb4_general_ci`` or similar MariaDB-compatible
+charset/collation will allow connectivity.
 
-    The MySQL Connector/Python DBAPI has had many issues since its release,
-    some of which may remain unresolved, and the mysqlconnector dialect is
-    **not tested as part of SQLAlchemy's continuous integration**.
-    The recommended MySQL dialects are mysqlclient and PyMySQL.
 
 """  # noqa
+from __future__ import annotations
 
 import re
-
-from .base import BIT
+from typing import Any
+from typing import cast
+from typing import Optional
+from typing import Sequence
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
+
+from .base import MariaDBIdentifierPreparer
 from .base import MySQLCompiler
 from .base import MySQLDialect
+from .base import MySQLExecutionContext
 from .base import MySQLIdentifierPreparer
+from .mariadb import MariaDBDialect
+from .types import BIT
 from ... import util
 
+if TYPE_CHECKING:
+
+    from ...engine.base import Connection
+    from ...engine.cursor import CursorResult
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import IsolationLevel
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...engine.row import Row
+    from ...engine.url import URL
+    from ...sql.elements import BinaryExpression
+
+
+class MySQLExecutionContext_mysqlconnector(MySQLExecutionContext):
+    def create_server_side_cursor(self) -> DBAPICursor:
+        return self._dbapi_connection.cursor(buffered=False)
+
+    def create_default_cursor(self) -> DBAPICursor:
+        return self._dbapi_connection.cursor(buffered=True)
+
 
 class MySQLCompiler_mysqlconnector(MySQLCompiler):
-    def visit_mod_binary(self, binary, operator, **kw):
+    def visit_mod_binary(
+        self, binary: BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         return (
             self.process(binary.left, **kw)
             + " % "
@@ -41,22 +99,37 @@ def visit_mod_binary(self, binary, operator, **kw):
         )
 
 
-class MySQLIdentifierPreparer_mysqlconnector(MySQLIdentifierPreparer):
+class IdentifierPreparerCommon_mysqlconnector:
     @property
-    def _double_percents(self):
+    def _double_percents(self) -> bool:
         return False
 
     @_double_percents.setter
-    def _double_percents(self, value):
+    def _double_percents(self, value: Any) -> None:
         pass
 
-    def _escape_identifier(self, value):
-        value = value.replace(self.escape_quote, self.escape_to_quote)
+    def _escape_identifier(self, value: str) -> str:
+        value = value.replace(
+            self.escape_quote,  # type:ignore[attr-defined]
+            self.escape_to_quote,  # type:ignore[attr-defined]
+        )
         return value
 
 
+class MySQLIdentifierPreparer_mysqlconnector(
+    IdentifierPreparerCommon_mysqlconnector, MySQLIdentifierPreparer
+):
+    pass
+
+
+class MariaDBIdentifierPreparer_mysqlconnector(
+    IdentifierPreparerCommon_mysqlconnector, MariaDBIdentifierPreparer
+):
+    pass
+
+
 class _myconnpyBIT(BIT):
-    def result_processor(self, dialect, coltype):
+    def result_processor(self, dialect: Any, coltype: Any) -> None:
         """MySQL-connector already converts mysql bits, so."""
 
         return None
@@ -71,24 +144,31 @@ class MySQLDialect_mysqlconnector(MySQLDialect):
 
     supports_native_decimal = True
 
+    supports_native_bit = True
+
+    # not until https://bugs.mysql.com/bug.php?id=117548
+    supports_server_side_cursors = False
+
     default_paramstyle = "format"
     statement_compiler = MySQLCompiler_mysqlconnector
 
-    preparer = MySQLIdentifierPreparer_mysqlconnector
+    execution_ctx_cls = MySQLExecutionContext_mysqlconnector
+
+    preparer: type[MySQLIdentifierPreparer] = (
+        MySQLIdentifierPreparer_mysqlconnector
+    )
 
     colspecs = util.update_copy(MySQLDialect.colspecs, {BIT: _myconnpyBIT})
 
     @classmethod
-    def import_dbapi(cls):
-        from mysql import connector
+    def import_dbapi(cls) -> DBAPIModule:
+        return cast("DBAPIModule", __import__("mysql.connector").connector)
 
-        return connector
-
-    def do_ping(self, dbapi_connection):
+    def do_ping(self, dbapi_connection: DBAPIConnection) -> bool:
         dbapi_connection.ping(False)
         return True
 
-    def create_connect_args(self, url):
+    def create_connect_args(self, url: URL) -> ConnectArgsType:
         opts = url.translate_connect_args(username="user")
 
         opts.update(url.query)
@@ -111,15 +191,21 @@ def create_connect_args(self, url):
         util.coerce_kw_type(opts, "use_pure", bool)
         util.coerce_kw_type(opts, "use_unicode", bool)
 
-        # unfortunately, MySQL/connector python refuses to release a
-        # cursor without reading fully, so non-buffered isn't an option
-        opts.setdefault("buffered", True)
+        # note that "buffered" is set to False by default in MySQL/connector
+        # python.  If you set it to True, then there is no way to get a server
+        # side cursor because the logic is written to disallow that.
+
+        # leaving this at True until
+        # https://bugs.mysql.com/bug.php?id=117548 can be fixed
+        opts["buffered"] = True
 
         # FOUND_ROWS must be set in ClientFlag to enable
         # supports_sane_rowcount.
         if self.dbapi is not None:
             try:
-                from mysql.connector.constants import ClientFlag
+                from mysql.connector import constants  # type: ignore
+
+                ClientFlag = constants.ClientFlag
 
                 client_flags = opts.get(
                     "client_flags", ClientFlag.get_default()
@@ -128,24 +214,35 @@ def create_connect_args(self, url):
                 opts["client_flags"] = client_flags
             except Exception:
                 pass
-        return [[], opts]
+
+        return [], opts
 
     @util.memoized_property
-    def _mysqlconnector_version_info(self):
+    def _mysqlconnector_version_info(self) -> Optional[Tuple[int, ...]]:
         if self.dbapi and hasattr(self.dbapi, "__version__"):
             m = re.match(r"(\d+)\.(\d+)(?:\.(\d+))?", self.dbapi.__version__)
             if m:
                 return tuple(int(x) for x in m.group(1, 2, 3) if x is not None)
+        return None
 
-    def _detect_charset(self, connection):
-        return connection.connection.charset
+    def _detect_charset(self, connection: Connection) -> str:
+        return connection.connection.charset  # type: ignore
 
-    def _extract_error_code(self, exception):
-        return exception.errno
+    def _extract_error_code(self, exception: BaseException) -> int:
+        return exception.errno  # type: ignore
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: Exception,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
         errnos = (2006, 2013, 2014, 2045, 2055, 2048)
-        exceptions = (self.dbapi.OperationalError, self.dbapi.InterfaceError)
+        exceptions = (
+            self.loaded_dbapi.OperationalError,  #
+            self.loaded_dbapi.InterfaceError,
+            self.loaded_dbapi.ProgrammingError,
+        )
         if isinstance(e, exceptions):
             return (
                 e.errno in errnos
@@ -155,26 +252,51 @@ def is_disconnect(self, e, connection, cursor):
         else:
             return False
 
-    def _compat_fetchall(self, rp, charset=None):
+    def _compat_fetchall(
+        self,
+        rp: CursorResult[Tuple[Any, ...]],
+        charset: Optional[str] = None,
+    ) -> Sequence[Row[Tuple[Any, ...]]]:
         return rp.fetchall()
 
-    def _compat_fetchone(self, rp, charset=None):
+    def _compat_fetchone(
+        self,
+        rp: CursorResult[Tuple[Any, ...]],
+        charset: Optional[str] = None,
+    ) -> Optional[Row[Tuple[Any, ...]]]:
         return rp.fetchone()
 
-    _isolation_lookup = {
-        "SERIALIZABLE",
-        "READ UNCOMMITTED",
-        "READ COMMITTED",
-        "REPEATABLE READ",
-        "AUTOCOMMIT",
-    }
+    def get_isolation_level_values(
+        self, dbapi_conn: DBAPIConnection
+    ) -> Sequence[IsolationLevel]:
+        return (
+            "SERIALIZABLE",
+            "READ UNCOMMITTED",
+            "READ COMMITTED",
+            "REPEATABLE READ",
+            "AUTOCOMMIT",
+        )
+
+    def detect_autocommit_setting(self, dbapi_conn: DBAPIConnection) -> bool:
+        return bool(dbapi_conn.autocommit)
 
-    def _set_isolation_level(self, connection, level):
+    def set_isolation_level(
+        self, dbapi_connection: DBAPIConnection, level: IsolationLevel
+    ) -> None:
         if level == "AUTOCOMMIT":
-            connection.autocommit = True
+            dbapi_connection.autocommit = True
         else:
-            connection.autocommit = False
-            super()._set_isolation_level(connection, level)
+            dbapi_connection.autocommit = False
+            super().set_isolation_level(dbapi_connection, level)
+
+
+class MariaDBDialect_mysqlconnector(
+    MariaDBDialect, MySQLDialect_mysqlconnector
+):
+    supports_statement_cache = True
+    _allows_uuid_binds = False
+    preparer = MariaDBIdentifierPreparer_mysqlconnector
 
 
 dialect = MySQLDialect_mysqlconnector
+mariadb_dialect = MariaDBDialect_mysqlconnector
diff --git a/libs/sqlalchemy/dialects/mysql/mysqldb.py b/libs/sqlalchemy/dialects/mysql/mysqldb.py
index 3cf56c1fd0..188668be79 100644
--- a/libs/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/libs/sqlalchemy/dialects/mysql/mysqldb.py
@@ -1,11 +1,9 @@
 # dialects/mysql/mysqldb.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
-
 
 """
 
@@ -86,16 +84,35 @@
 The mysqldb dialect supports server-side cursors. See :ref:`mysql_ss_cursors`.
 
 """
+from __future__ import annotations
 
 import re
+from typing import Any
+from typing import Callable
+from typing import cast
+from typing import Dict
+from typing import Optional
+from typing import Tuple
+from typing import TYPE_CHECKING
 
 from .base import MySQLCompiler
 from .base import MySQLDialect
 from .base import MySQLExecutionContext
 from .base import MySQLIdentifierPreparer
-from .base import TEXT
-from ... import sql
 from ... import util
+from ...util.typing import Literal
+
+if TYPE_CHECKING:
+
+    from ...engine.base import Connection
+    from ...engine.interfaces import _DBAPIMultiExecuteParams
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import ExecutionContext
+    from ...engine.interfaces import IsolationLevel
+    from ...engine.url import URL
 
 
 class MySQLExecutionContext_mysqldb(MySQLExecutionContext):
@@ -119,8 +136,9 @@ class MySQLDialect_mysqldb(MySQLDialect):
     execution_ctx_cls = MySQLExecutionContext_mysqldb
     statement_compiler = MySQLCompiler_mysqldb
     preparer = MySQLIdentifierPreparer
+    server_version_info: Tuple[int, ...]
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any):
         super().__init__(**kwargs)
         self._mysql_dbapi_version = (
             self._parse_dbapi_version(self.dbapi.__version__)
@@ -128,7 +146,7 @@ def __init__(self, **kwargs):
             else (0, 0, 0)
         )
 
-    def _parse_dbapi_version(self, version):
+    def _parse_dbapi_version(self, version: str) -> Tuple[int, ...]:
         m = re.match(r"(\d+)\.(\d+)(?:\.(\d+))?", version)
         if m:
             return tuple(int(x) for x in m.group(1, 2, 3) if x is not None)
@@ -136,7 +154,7 @@ def _parse_dbapi_version(self, version):
             return (0, 0, 0)
 
     @util.langhelpers.memoized_property
-    def supports_server_side_cursors(self):
+    def supports_server_side_cursors(self) -> bool:
         try:
             cursors = __import__("MySQLdb.cursors").cursors
             self._sscursor = cursors.SSCursor
@@ -145,13 +163,13 @@ def supports_server_side_cursors(self):
             return False
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> DBAPIModule:
         return __import__("MySQLdb")
 
-    def on_connect(self):
+    def on_connect(self) -> Callable[[DBAPIConnection], None]:
         super_ = super().on_connect()
 
-        def on_connect(conn):
+        def on_connect(conn: DBAPIConnection) -> None:
             if super_ is not None:
                 super_(conn)
 
@@ -164,43 +182,24 @@ def on_connect(conn):
 
         return on_connect
 
-    def do_ping(self, dbapi_connection):
+    def do_ping(self, dbapi_connection: DBAPIConnection) -> Literal[True]:
         dbapi_connection.ping()
         return True
 
-    def do_executemany(self, cursor, statement, parameters, context=None):
+    def do_executemany(
+        self,
+        cursor: DBAPICursor,
+        statement: str,
+        parameters: _DBAPIMultiExecuteParams,
+        context: Optional[ExecutionContext] = None,
+    ) -> None:
         rowcount = cursor.executemany(statement, parameters)
         if context is not None:
-            context._rowcount = rowcount
-
-    def _check_unicode_returns(self, connection):
-        # work around issue fixed in
-        # https://github.com/farcepest/MySQLdb1/commit/cd44524fef63bd3fcb71947392326e9742d520e8
-        # specific issue w/ the utf8mb4_bin collation and unicode returns
-
-        collation = connection.exec_driver_sql(
-            "show collation where %s = 'utf8mb4' and %s = 'utf8mb4_bin'"
-            % (
-                self.identifier_preparer.quote("Charset"),
-                self.identifier_preparer.quote("Collation"),
-            )
-        ).scalar()
-        has_utf8mb4_bin = self.server_version_info > (5,) and collation
-        if has_utf8mb4_bin:
-            additional_tests = [
-                sql.collate(
-                    sql.cast(
-                        sql.literal_column("'test collated returns'"),
-                        TEXT(charset="utf8mb4"),
-                    ),
-                    "utf8mb4_bin",
-                )
-            ]
-        else:
-            additional_tests = []
-        return super()._check_unicode_returns(connection, additional_tests)
+            cast(MySQLExecutionContext, context)._rowcount = rowcount
 
-    def create_connect_args(self, url, _translate_args=None):
+    def create_connect_args(
+        self, url: URL, _translate_args: Optional[Dict[str, Any]] = None
+    ) -> ConnectArgsType:
         if _translate_args is None:
             _translate_args = dict(
                 database="db", username="user", password="passwd"
@@ -249,9 +248,9 @@ def create_connect_args(self, url, _translate_args=None):
         if client_flag_found_rows is not None:
             client_flag |= client_flag_found_rows
             opts["client_flag"] = client_flag
-        return [[], opts]
+        return [], opts
 
-    def _found_rows_client_flag(self):
+    def _found_rows_client_flag(self) -> Optional[int]:
         if self.dbapi is not None:
             try:
                 CLIENT_FLAGS = __import__(
@@ -260,20 +259,23 @@ def _found_rows_client_flag(self):
             except (AttributeError, ImportError):
                 return None
             else:
-                return CLIENT_FLAGS.FOUND_ROWS
+                return CLIENT_FLAGS.FOUND_ROWS  # type: ignore
         else:
             return None
 
-    def _extract_error_code(self, exception):
-        return exception.args[0]
+    def _extract_error_code(self, exception: DBAPIModule.Error) -> int:
+        return exception.args[0]  # type: ignore[no-any-return]
 
-    def _detect_charset(self, connection):
+    def _detect_charset(self, connection: Connection) -> str:
         """Sniff out the character set in use for connection results."""
 
         try:
             # note: the SQL here would be
             # "SHOW VARIABLES LIKE 'character_set%%'"
-            cset_name = connection.connection.character_set_name
+
+            cset_name: Callable[[], str] = (
+                connection.connection.character_set_name
+            )
         except AttributeError:
             util.warn(
                 "No 'character_set_name' can be detected with "
@@ -285,7 +287,9 @@ def _detect_charset(self, connection):
         else:
             return cset_name()
 
-    def get_isolation_level_values(self, dbapi_connection):
+    def get_isolation_level_values(
+        self, dbapi_conn: DBAPIConnection
+    ) -> Tuple[IsolationLevel, ...]:
         return (
             "SERIALIZABLE",
             "READ UNCOMMITTED",
@@ -294,7 +298,12 @@ def get_isolation_level_values(self, dbapi_connection):
             "AUTOCOMMIT",
         )
 
-    def set_isolation_level(self, dbapi_connection, level):
+    def detect_autocommit_setting(self, dbapi_conn: DBAPIConnection) -> bool:
+        return dbapi_conn.get_autocommit()  # type: ignore[no-any-return]
+
+    def set_isolation_level(
+        self, dbapi_connection: DBAPIConnection, level: IsolationLevel
+    ) -> None:
         if level == "AUTOCOMMIT":
             dbapi_connection.autocommit(True)
         else:
diff --git a/libs/sqlalchemy/dialects/mysql/provision.py b/libs/sqlalchemy/dialects/mysql/provision.py
index 7807af4097..46cd8abf7d 100644
--- a/libs/sqlalchemy/dialects/mysql/provision.py
+++ b/libs/sqlalchemy/dialects/mysql/provision.py
@@ -1,14 +1,18 @@
 # dialects/mysql/provision.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: ignore-errors
+import contextlib
 
+from ... import event
 from ... import exc
+from ...testing.provision import allow_stale_update_impl
 from ...testing.provision import configure_follower
 from ...testing.provision import create_db
+from ...testing.provision import delete_from_all_tables
 from ...testing.provision import drop_db
 from ...testing.provision import generate_driver_url
 from ...testing.provision import temp_table_keyword_args
@@ -42,6 +46,10 @@ def generate_driver_url(url, driver, query_str):
 
     if driver == "mariadbconnector":
         new_url = new_url.difference_update_query(["charset"])
+    elif driver == "mysqlconnector":
+        new_url = new_url.update_query_pairs(
+            [("collation", "utf8mb4_general_ci")]
+        )
 
     try:
         new_url.get_dialect()
@@ -92,7 +100,13 @@ def _mysql_temp_table_keyword_args(cfg, eng):
 
 @upsert.for_db("mariadb")
 def _upsert(
-    cfg, table, returning, *, set_lambda=None, sort_by_parameter_order=False
+    cfg,
+    table,
+    returning,
+    *,
+    set_lambda=None,
+    sort_by_parameter_order=False,
+    index_elements=None,
 ):
     from sqlalchemy.dialects.mysql import insert
 
@@ -108,3 +122,32 @@ def _upsert(
         *returning, sort_by_parameter_order=sort_by_parameter_order
     )
     return stmt
+
+
+@delete_from_all_tables.for_db("mysql", "mariadb")
+def _delete_from_all_tables(connection, cfg, metadata):
+    connection.exec_driver_sql("SET foreign_key_checks = 0")
+    try:
+        delete_from_all_tables.call_original(connection, cfg, metadata)
+    finally:
+        connection.exec_driver_sql("SET foreign_key_checks = 1")
+
+
+@allow_stale_update_impl.for_db("mariadb")
+def _allow_stale_update_impl(cfg):
+    @contextlib.contextmanager
+    def go():
+        @event.listens_for(cfg.db, "engine_connect")
+        def turn_off_snapshot_isolation(conn):
+            conn.exec_driver_sql("SET innodb_snapshot_isolation = 'OFF'")
+            conn.rollback()
+
+        try:
+            yield
+        finally:
+            event.remove(cfg.db, "engine_connect", turn_off_snapshot_isolation)
+
+            # dispose the pool; quick way to just have those reset
+            cfg.db.dispose()
+
+    return go()
diff --git a/libs/sqlalchemy/dialects/mysql/pymysql.py b/libs/sqlalchemy/dialects/mysql/pymysql.py
index 67cb4cdd76..ae86938e65 100644
--- a/libs/sqlalchemy/dialects/mysql/pymysql.py
+++ b/libs/sqlalchemy/dialects/mysql/pymysql.py
@@ -1,11 +1,9 @@
 # dialects/mysql/pymysql.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
-
 
 r"""
 
@@ -49,9 +47,26 @@
 to the pymysql driver as well.
 
 """  # noqa
+from __future__ import annotations
+
+from typing import Any
+from typing import Dict
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .mysqldb import MySQLDialect_mysqldb
 from ...util import langhelpers
+from ...util.typing import Literal
+
+if TYPE_CHECKING:
+
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import PoolProxiedConnection
+    from ...engine.url import URL
 
 
 class MySQLDialect_pymysql(MySQLDialect_mysqldb):
@@ -61,7 +76,7 @@ class MySQLDialect_pymysql(MySQLDialect_mysqldb):
     description_encoding = None
 
     @langhelpers.memoized_property
-    def supports_server_side_cursors(self):
+    def supports_server_side_cursors(self) -> bool:
         try:
             cursors = __import__("pymysql.cursors").cursors
             self._sscursor = cursors.SSCursor
@@ -70,11 +85,11 @@ def supports_server_side_cursors(self):
             return False
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> DBAPIModule:
         return __import__("pymysql")
 
     @langhelpers.memoized_property
-    def _send_false_to_ping(self):
+    def _send_false_to_ping(self) -> bool:
         """determine if pymysql has deprecated, changed the default of,
         or removed the 'reconnect' argument of connection.ping().
 
@@ -101,7 +116,7 @@ def _send_false_to_ping(self):
                     not insp.defaults or insp.defaults[0] is not False
                 )
 
-    def do_ping(self, dbapi_connection):
+    def do_ping(self, dbapi_connection: DBAPIConnection) -> Literal[True]:
         if self._send_false_to_ping:
             dbapi_connection.ping(False)
         else:
@@ -109,17 +124,24 @@ def do_ping(self, dbapi_connection):
 
         return True
 
-    def create_connect_args(self, url, _translate_args=None):
+    def create_connect_args(
+        self, url: URL, _translate_args: Optional[Dict[str, Any]] = None
+    ) -> ConnectArgsType:
         if _translate_args is None:
             _translate_args = dict(username="user")
         return super().create_connect_args(
             url, _translate_args=_translate_args
         )
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
         if super().is_disconnect(e, connection, cursor):
             return True
-        elif isinstance(e, self.dbapi.Error):
+        elif isinstance(e, self.loaded_dbapi.Error):
             str_e = str(e).lower()
             return (
                 "already closed" in str_e or "connection was killed" in str_e
@@ -127,7 +149,7 @@ def is_disconnect(self, e, connection, cursor):
         else:
             return False
 
-    def _extract_error_code(self, exception):
+    def _extract_error_code(self, exception: BaseException) -> Any:
         if isinstance(exception.args[0], Exception):
             exception = exception.args[0]
         return exception.args[0]
diff --git a/libs/sqlalchemy/dialects/mysql/pyodbc.py b/libs/sqlalchemy/dialects/mysql/pyodbc.py
index 6d44bd3837..bb37ff0e59 100644
--- a/libs/sqlalchemy/dialects/mysql/pyodbc.py
+++ b/libs/sqlalchemy/dialects/mysql/pyodbc.py
@@ -1,15 +1,13 @@
 # dialects/mysql/pyodbc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 
 r"""
 
-
 .. dialect:: mysql+pyodbc
     :name: PyODBC
     :dbapi: pyodbc
@@ -44,8 +42,16 @@
     connection_uri = "mysql+pyodbc:///?odbc_connect=%s" % params
 
 """  # noqa
+from __future__ import annotations
 
+import datetime
 import re
+from typing import Any
+from typing import Callable
+from typing import Optional
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .base import MySQLDialect
 from .base import MySQLExecutionContext
@@ -55,23 +61,31 @@
 from ...connectors.pyodbc import PyODBCConnector
 from ...sql.sqltypes import Time
 
+if TYPE_CHECKING:
+    from ...engine import Connection
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import Dialect
+    from ...sql.type_api import _ResultProcessorType
+
 
 class _pyodbcTIME(TIME):
-    def result_processor(self, dialect, coltype):
-        def process(value):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> _ResultProcessorType[datetime.time]:
+        def process(value: Any) -> Union[datetime.time, None]:
             # pyodbc returns a datetime.time object; no need to convert
-            return value
+            return value  # type: ignore[no-any-return]
 
         return process
 
 
 class MySQLExecutionContext_pyodbc(MySQLExecutionContext):
-    def get_lastrowid(self):
+    def get_lastrowid(self) -> int:
         cursor = self.create_cursor()
         cursor.execute("SELECT LAST_INSERT_ID()")
-        lastrowid = cursor.fetchone()[0]
+        lastrowid = cursor.fetchone()[0]  # type: ignore[index]
         cursor.close()
-        return lastrowid
+        return lastrowid  # type: ignore[no-any-return]
 
 
 class MySQLDialect_pyodbc(PyODBCConnector, MySQLDialect):
@@ -82,7 +96,7 @@ class MySQLDialect_pyodbc(PyODBCConnector, MySQLDialect):
 
     pyodbc_driver_name = "MySQL"
 
-    def _detect_charset(self, connection):
+    def _detect_charset(self, connection: Connection) -> str:
         """Sniff out the character set in use for connection results."""
 
         # Prefer 'character_set_results' for the current connection over the
@@ -107,21 +121,25 @@ def _detect_charset(self, connection):
         )
         return "latin1"
 
-    def _get_server_version_info(self, connection):
+    def _get_server_version_info(
+        self, connection: Connection
+    ) -> Tuple[int, ...]:
         return MySQLDialect._get_server_version_info(self, connection)
 
-    def _extract_error_code(self, exception):
+    def _extract_error_code(self, exception: BaseException) -> Optional[int]:
         m = re.compile(r"\((\d+)\)").search(str(exception.args))
-        c = m.group(1)
+        if m is None:
+            return None
+        c: Optional[str] = m.group(1)
         if c:
             return int(c)
         else:
             return None
 
-    def on_connect(self):
+    def on_connect(self) -> Callable[[DBAPIConnection], None]:
         super_ = super().on_connect()
 
-        def on_connect(conn):
+        def on_connect(conn: DBAPIConnection) -> None:
             if super_ is not None:
                 super_(conn)
 
diff --git a/libs/sqlalchemy/dialects/mysql/reflection.py b/libs/sqlalchemy/dialects/mysql/reflection.py
index 3998be977d..c9dfb13086 100644
--- a/libs/sqlalchemy/dialects/mysql/reflection.py
+++ b/libs/sqlalchemy/dialects/mysql/reflection.py
@@ -1,46 +1,65 @@
 # dialects/mysql/reflection.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
-
+from __future__ import annotations
 
 import re
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import overload
+from typing import Sequence
+from typing import Tuple
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .enumerated import ENUM
 from .enumerated import SET
 from .types import DATETIME
 from .types import TIME
 from .types import TIMESTAMP
-from ... import log
 from ... import types as sqltypes
 from ... import util
+from ...util.typing import Literal
+
+if TYPE_CHECKING:
+    from .base import MySQLDialect
+    from .base import MySQLIdentifierPreparer
+    from ...engine.interfaces import ReflectedColumn
 
 
 class ReflectedState:
     """Stores raw information about a SHOW CREATE TABLE statement."""
 
-    def __init__(self):
-        self.columns = []
-        self.table_options = {}
-        self.table_name = None
-        self.keys = []
-        self.fk_constraints = []
-        self.ck_constraints = []
+    charset: Optional[str]
+
+    def __init__(self) -> None:
+        self.columns: List[ReflectedColumn] = []
+        self.table_options: Dict[str, str] = {}
+        self.table_name: Optional[str] = None
+        self.keys: List[Dict[str, Any]] = []
+        self.fk_constraints: List[Dict[str, Any]] = []
+        self.ck_constraints: List[Dict[str, Any]] = []
 
 
-@log.class_logger
 class MySQLTableDefinitionParser:
     """Parses the results of a SHOW CREATE TABLE statement."""
 
-    def __init__(self, dialect, preparer):
+    def __init__(
+        self, dialect: MySQLDialect, preparer: MySQLIdentifierPreparer
+    ):
         self.dialect = dialect
         self.preparer = preparer
         self._prep_regexes()
 
-    def parse(self, show_create, charset):
+    def parse(
+        self, show_create: str, charset: Optional[str]
+    ) -> ReflectedState:
         state = ReflectedState()
         state.charset = charset
         for line in re.split(r"\r?\n", show_create):
@@ -65,11 +84,11 @@ def parse(self, show_create, charset):
                 if type_ is None:
                     util.warn("Unknown schema content: %r" % line)
                 elif type_ == "key":
-                    state.keys.append(spec)
+                    state.keys.append(spec)  # type: ignore[arg-type]
                 elif type_ == "fk_constraint":
-                    state.fk_constraints.append(spec)
+                    state.fk_constraints.append(spec)  # type: ignore[arg-type]
                 elif type_ == "ck_constraint":
-                    state.ck_constraints.append(spec)
+                    state.ck_constraints.append(spec)  # type: ignore[arg-type]
                 else:
                     pass
         return state
@@ -77,7 +96,13 @@ def parse(self, show_create, charset):
     def _check_view(self, sql: str) -> bool:
         return bool(self._re_is_view.match(sql))
 
-    def _parse_constraints(self, line):
+    def _parse_constraints(self, line: str) -> Union[
+        Tuple[None, str],
+        Tuple[Literal["partition"], str],
+        Tuple[
+            Literal["ck_constraint", "fk_constraint", "key"], Dict[str, str]
+        ],
+    ]:
         """Parse a KEY or CONSTRAINT line.
 
         :param line: A line of SHOW CREATE TABLE output
@@ -127,7 +152,7 @@ def _parse_constraints(self, line):
         # No match.
         return (None, line)
 
-    def _parse_table_name(self, line, state):
+    def _parse_table_name(self, line: str, state: ReflectedState) -> None:
         """Extract the table name.
 
         :param line: The first line of SHOW CREATE TABLE
@@ -138,7 +163,7 @@ def _parse_table_name(self, line, state):
         if m:
             state.table_name = cleanup(m.group("name"))
 
-    def _parse_table_options(self, line, state):
+    def _parse_table_options(self, line: str, state: ReflectedState) -> None:
         """Build a dictionary of all reflected table-level options.
 
         :param line: The final line of SHOW CREATE TABLE output.
@@ -164,7 +189,9 @@ def _parse_table_options(self, line, state):
         for opt, val in options.items():
             state.table_options["%s_%s" % (self.dialect.name, opt)] = val
 
-    def _parse_partition_options(self, line, state):
+    def _parse_partition_options(
+        self, line: str, state: ReflectedState
+    ) -> None:
         options = {}
         new_line = line[:]
 
@@ -220,7 +247,7 @@ def _parse_partition_options(self, line, state):
             else:
                 state.table_options["%s_%s" % (self.dialect.name, opt)] = val
 
-    def _parse_column(self, line, state):
+    def _parse_column(self, line: str, state: ReflectedState) -> None:
         """Extract column details.
 
         Falls back to a 'minimal support' variant if full parse fails.
@@ -283,7 +310,7 @@ def _parse_column(self, line, state):
 
         type_instance = col_type(*type_args, **type_kw)
 
-        col_kw = {}
+        col_kw: Dict[str, Any] = {}
 
         # NOT NULL
         col_kw["nullable"] = True
@@ -324,9 +351,13 @@ def _parse_column(self, line, state):
             name=name, type=type_instance, default=default, comment=comment
         )
         col_d.update(col_kw)
-        state.columns.append(col_d)
+        state.columns.append(col_d)  # type: ignore[arg-type]
 
-    def _describe_to_create(self, table_name, columns):
+    def _describe_to_create(
+        self,
+        table_name: str,
+        columns: Sequence[Tuple[str, str, str, str, str, str]],
+    ) -> str:
         """Re-format DESCRIBE output as a SHOW CREATE TABLE string.
 
         DESCRIBE is a much simpler reflection and is sufficient for
@@ -379,7 +410,9 @@ def _describe_to_create(self, table_name, columns):
             ]
         )
 
-    def _parse_keyexprs(self, identifiers):
+    def _parse_keyexprs(
+        self, identifiers: str
+    ) -> List[Tuple[str, Optional[int], str]]:
         """Unpack '"col"(2),"col" ASC'-ish strings into components."""
 
         return [
@@ -389,11 +422,12 @@ def _parse_keyexprs(self, identifiers):
             )
         ]
 
-    def _prep_regexes(self):
+    def _prep_regexes(self) -> None:
         """Pre-compile regular expressions."""
 
-        self._re_columns = []
-        self._pr_options = []
+        self._pr_options: List[
+            Tuple[re.Pattern[Any], Optional[Callable[[str], str]]]
+        ] = []
 
         _final = self.preparer.final_quote
 
@@ -451,7 +485,7 @@ def _prep_regexes(self):
             r"(?: +COLLATE +(?P<collate>[\w_]+))?"
             r"(?: +(?P<notnull>(?:NOT )?NULL))?"
             r"(?: +DEFAULT +(?P<default>"
-            r"(?:NULL|'(?:''|[^'])*'|[\-\w\.\(\)]+"
+            r"(?:NULL|'(?:''|[^'])*'|\(.+?\)|[\-\w\.\(\)]+"
             r"(?: +ON UPDATE [\-\w\.\(\)]+)?)"
             r"))?"
             r"(?: +(?:GENERATED ALWAYS)? ?AS +(?P<generated>\("
@@ -582,21 +616,21 @@ def _prep_regexes(self):
 
     _optional_equals = r"(?:\s*(?:=\s*)|\s+)"
 
-    def _add_option_string(self, directive):
+    def _add_option_string(self, directive: str) -> None:
         regex = r"(?P<directive>%s)%s" r"'(?P<val>(?:[^']|'')*?)'(?!')" % (
             re.escape(directive),
             self._optional_equals,
         )
         self._pr_options.append(_pr_compile(regex, cleanup_text))
 
-    def _add_option_word(self, directive):
+    def _add_option_word(self, directive: str) -> None:
         regex = r"(?P<directive>%s)%s" r"(?P<val>\w+)" % (
             re.escape(directive),
             self._optional_equals,
         )
         self._pr_options.append(_pr_compile(regex))
 
-    def _add_partition_option_word(self, directive):
+    def _add_partition_option_word(self, directive: str) -> None:
         if directive == "PARTITION BY" or directive == "SUBPARTITION BY":
             regex = r"(?<!\S)(?P<directive>%s)%s" r"(?P<val>\w+.*)" % (
                 re.escape(directive),
@@ -611,7 +645,7 @@ def _add_partition_option_word(self, directive):
             regex = r"(?<!\S)(?P<directive>%s)(?!\S)" % (re.escape(directive),)
         self._pr_options.append(_pr_compile(regex))
 
-    def _add_option_regex(self, directive, regex):
+    def _add_option_regex(self, directive: str, regex: str) -> None:
         regex = r"(?P<directive>%s)%s" r"(?P<val>%s)" % (
             re.escape(directive),
             self._optional_equals,
@@ -629,21 +663,35 @@ def _add_option_regex(self, directive, regex):
 )
 
 
-def _pr_compile(regex, cleanup=None):
+@overload
+def _pr_compile(
+    regex: str, cleanup: Callable[[str], str]
+) -> Tuple[re.Pattern[Any], Callable[[str], str]]: ...
+
+
+@overload
+def _pr_compile(
+    regex: str, cleanup: None = None
+) -> Tuple[re.Pattern[Any], None]: ...
+
+
+def _pr_compile(
+    regex: str, cleanup: Optional[Callable[[str], str]] = None
+) -> Tuple[re.Pattern[Any], Optional[Callable[[str], str]]]:
     """Prepare a 2-tuple of compiled regex and callable."""
 
     return (_re_compile(regex), cleanup)
 
 
-def _re_compile(regex):
+def _re_compile(regex: str) -> re.Pattern[Any]:
     """Compile a string to regex, I and UNICODE."""
 
     return re.compile(regex, re.I | re.UNICODE)
 
 
-def _strip_values(values):
+def _strip_values(values: Sequence[str]) -> List[str]:
     "Strip reflected values quotes"
-    strip_values = []
+    strip_values: List[str] = []
     for a in values:
         if a[0:1] == '"' or a[0:1] == "'":
             # strip enclosing quotes and unquote interior
@@ -655,7 +703,9 @@ def _strip_values(values):
 def cleanup_text(raw_text: str) -> str:
     if "\\" in raw_text:
         raw_text = re.sub(
-            _control_char_regexp, lambda s: _control_char_map[s[0]], raw_text
+            _control_char_regexp,
+            lambda s: _control_char_map[s[0]],  # type: ignore[index]
+            raw_text,
         )
     return raw_text.replace("''", "'")
 
diff --git a/libs/sqlalchemy/dialects/mysql/reserved_words.py b/libs/sqlalchemy/dialects/mysql/reserved_words.py
index 34fecf4272..5f9e4573ee 100644
--- a/libs/sqlalchemy/dialects/mysql/reserved_words.py
+++ b/libs/sqlalchemy/dialects/mysql/reserved_words.py
@@ -1,5 +1,5 @@
 # dialects/mysql/reserved_words.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -11,7 +11,6 @@
 # https://mariadb.com/kb/en/reserved-words/
 # includes: Reserved Words, Oracle Mode (separate set unioned)
 # excludes: Exceptions, Function Names
-# mypy: ignore-errors
 
 RESERVED_WORDS_MARIADB = {
     "accessible",
diff --git a/libs/sqlalchemy/dialects/mysql/types.py b/libs/sqlalchemy/dialects/mysql/types.py
index 0c05aacb7c..170324fa30 100644
--- a/libs/sqlalchemy/dialects/mysql/types.py
+++ b/libs/sqlalchemy/dialects/mysql/types.py
@@ -1,18 +1,30 @@
 # dialects/mysql/types.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
-
+from __future__ import annotations
 
 import datetime
+import decimal
+from typing import Any
+from typing import Iterable
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
 
 from ... import exc
 from ... import util
 from ...sql import sqltypes
 
+if TYPE_CHECKING:
+    from .base import MySQLDialect
+    from ...engine.interfaces import Dialect
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _ResultProcessorType
+    from ...sql.type_api import TypeEngine
+
 
 class _NumericType:
     """Base for MySQL numeric types.
@@ -22,19 +34,27 @@ class _NumericType:
 
     """
 
-    def __init__(self, unsigned=False, zerofill=False, **kw):
+    def __init__(
+        self, unsigned: bool = False, zerofill: bool = False, **kw: Any
+    ):
         self.unsigned = unsigned
         self.zerofill = zerofill
         super().__init__(**kw)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return util.generic_repr(
             self, to_inspect=[_NumericType, sqltypes.Numeric]
         )
 
 
-class _FloatType(_NumericType, sqltypes.Float):
-    def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
+class _FloatType(_NumericType, sqltypes.Float[Union[decimal.Decimal, float]]):
+    def __init__(
+        self,
+        precision: Optional[int] = None,
+        scale: Optional[int] = None,
+        asdecimal: bool = True,
+        **kw: Any,
+    ):
         if isinstance(self, (REAL, DOUBLE)) and (
             (precision is None and scale is not None)
             or (precision is not None and scale is None)
@@ -46,18 +66,18 @@ def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
         super().__init__(precision=precision, asdecimal=asdecimal, **kw)
         self.scale = scale
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return util.generic_repr(
             self, to_inspect=[_FloatType, _NumericType, sqltypes.Float]
         )
 
 
 class _IntegerType(_NumericType, sqltypes.Integer):
-    def __init__(self, display_width=None, **kw):
+    def __init__(self, display_width: Optional[int] = None, **kw: Any):
         self.display_width = display_width
         super().__init__(**kw)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return util.generic_repr(
             self, to_inspect=[_IntegerType, _NumericType, sqltypes.Integer]
         )
@@ -68,13 +88,13 @@ class _StringType(sqltypes.String):
 
     def __init__(
         self,
-        charset=None,
-        collation=None,
-        ascii=False,  # noqa
-        binary=False,
-        unicode=False,
-        national=False,
-        **kw,
+        charset: Optional[str] = None,
+        collation: Optional[str] = None,
+        ascii: bool = False,  # noqa
+        binary: bool = False,
+        unicode: bool = False,
+        national: bool = False,
+        **kw: Any,
     ):
         self.charset = charset
 
@@ -87,25 +107,33 @@ def __init__(
         self.national = national
         super().__init__(**kw)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return util.generic_repr(
             self, to_inspect=[_StringType, sqltypes.String]
         )
 
 
-class _MatchType(sqltypes.Float, sqltypes.MatchType):
-    def __init__(self, **kw):
+class _MatchType(
+    sqltypes.Float[Union[decimal.Decimal, float]], sqltypes.MatchType
+):
+    def __init__(self, **kw: Any):
         # TODO: float arguments?
-        sqltypes.Float.__init__(self)
+        sqltypes.Float.__init__(self)  # type: ignore[arg-type]
         sqltypes.MatchType.__init__(self)
 
 
-class NUMERIC(_NumericType, sqltypes.NUMERIC):
+class NUMERIC(_NumericType, sqltypes.NUMERIC[Union[decimal.Decimal, float]]):
     """MySQL NUMERIC type."""
 
     __visit_name__ = "NUMERIC"
 
-    def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
+    def __init__(
+        self,
+        precision: Optional[int] = None,
+        scale: Optional[int] = None,
+        asdecimal: bool = True,
+        **kw: Any,
+    ):
         """Construct a NUMERIC.
 
         :param precision: Total digits in this number.  If scale and precision
@@ -126,12 +154,18 @@ def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
         )
 
 
-class DECIMAL(_NumericType, sqltypes.DECIMAL):
+class DECIMAL(_NumericType, sqltypes.DECIMAL[Union[decimal.Decimal, float]]):
     """MySQL DECIMAL type."""
 
     __visit_name__ = "DECIMAL"
 
-    def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
+    def __init__(
+        self,
+        precision: Optional[int] = None,
+        scale: Optional[int] = None,
+        asdecimal: bool = True,
+        **kw: Any,
+    ):
         """Construct a DECIMAL.
 
         :param precision: Total digits in this number.  If scale and precision
@@ -152,12 +186,18 @@ def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
         )
 
 
-class DOUBLE(_FloatType, sqltypes.DOUBLE):
+class DOUBLE(_FloatType, sqltypes.DOUBLE[Union[decimal.Decimal, float]]):
     """MySQL DOUBLE type."""
 
     __visit_name__ = "DOUBLE"
 
-    def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
+    def __init__(
+        self,
+        precision: Optional[int] = None,
+        scale: Optional[int] = None,
+        asdecimal: bool = True,
+        **kw: Any,
+    ):
         """Construct a DOUBLE.
 
         .. note::
@@ -186,12 +226,18 @@ def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
         )
 
 
-class REAL(_FloatType, sqltypes.REAL):
+class REAL(_FloatType, sqltypes.REAL[Union[decimal.Decimal, float]]):
     """MySQL REAL type."""
 
     __visit_name__ = "REAL"
 
-    def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
+    def __init__(
+        self,
+        precision: Optional[int] = None,
+        scale: Optional[int] = None,
+        asdecimal: bool = True,
+        **kw: Any,
+    ):
         """Construct a REAL.
 
         .. note::
@@ -220,12 +266,18 @@ def __init__(self, precision=None, scale=None, asdecimal=True, **kw):
         )
 
 
-class FLOAT(_FloatType, sqltypes.FLOAT):
+class FLOAT(_FloatType, sqltypes.FLOAT[Union[decimal.Decimal, float]]):
     """MySQL FLOAT type."""
 
     __visit_name__ = "FLOAT"
 
-    def __init__(self, precision=None, scale=None, asdecimal=False, **kw):
+    def __init__(
+        self,
+        precision: Optional[int] = None,
+        scale: Optional[int] = None,
+        asdecimal: bool = False,
+        **kw: Any,
+    ):
         """Construct a FLOAT.
 
         :param precision: Total digits in this number.  If scale and precision
@@ -245,7 +297,9 @@ def __init__(self, precision=None, scale=None, asdecimal=False, **kw):
             precision=precision, scale=scale, asdecimal=asdecimal, **kw
         )
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> Optional[_BindProcessorType[Union[decimal.Decimal, float]]]:
         return None
 
 
@@ -254,7 +308,7 @@ class INTEGER(_IntegerType, sqltypes.INTEGER):
 
     __visit_name__ = "INTEGER"
 
-    def __init__(self, display_width=None, **kw):
+    def __init__(self, display_width: Optional[int] = None, **kw: Any):
         """Construct an INTEGER.
 
         :param display_width: Optional, maximum display width for this number.
@@ -275,7 +329,7 @@ class BIGINT(_IntegerType, sqltypes.BIGINT):
 
     __visit_name__ = "BIGINT"
 
-    def __init__(self, display_width=None, **kw):
+    def __init__(self, display_width: Optional[int] = None, **kw: Any):
         """Construct a BIGINTEGER.
 
         :param display_width: Optional, maximum display width for this number.
@@ -296,7 +350,7 @@ class MEDIUMINT(_IntegerType):
 
     __visit_name__ = "MEDIUMINT"
 
-    def __init__(self, display_width=None, **kw):
+    def __init__(self, display_width: Optional[int] = None, **kw: Any):
         """Construct a MEDIUMINTEGER
 
         :param display_width: Optional, maximum display width for this number.
@@ -317,7 +371,7 @@ class TINYINT(_IntegerType):
 
     __visit_name__ = "TINYINT"
 
-    def __init__(self, display_width=None, **kw):
+    def __init__(self, display_width: Optional[int] = None, **kw: Any):
         """Construct a TINYINT.
 
         :param display_width: Optional, maximum display width for this number.
@@ -332,13 +386,19 @@ def __init__(self, display_width=None, **kw):
         """
         super().__init__(display_width=display_width, **kw)
 
+    def _compare_type_affinity(self, other: TypeEngine[Any]) -> bool:
+        return (
+            self._type_affinity is other._type_affinity
+            or other._type_affinity is sqltypes.Boolean
+        )
+
 
 class SMALLINT(_IntegerType, sqltypes.SMALLINT):
     """MySQL SMALLINTEGER type."""
 
     __visit_name__ = "SMALLINT"
 
-    def __init__(self, display_width=None, **kw):
+    def __init__(self, display_width: Optional[int] = None, **kw: Any):
         """Construct a SMALLINTEGER.
 
         :param display_width: Optional, maximum display width for this number.
@@ -354,7 +414,7 @@ def __init__(self, display_width=None, **kw):
         super().__init__(display_width=display_width, **kw)
 
 
-class BIT(sqltypes.TypeEngine):
+class BIT(sqltypes.TypeEngine[Any]):
     """MySQL BIT type.
 
     This type is for MySQL 5.0.3 or greater for MyISAM, and 5.0.5 or greater
@@ -365,7 +425,7 @@ class BIT(sqltypes.TypeEngine):
 
     __visit_name__ = "BIT"
 
-    def __init__(self, length=None):
+    def __init__(self, length: Optional[int] = None):
         """Construct a BIT.
 
         :param length: Optional, number of bits.
@@ -373,20 +433,19 @@ def __init__(self, length=None):
         """
         self.length = length
 
-    def result_processor(self, dialect, coltype):
-        """Convert a MySQL's 64 bit, variable length binary string to a long.
-
-        TODO: this is MySQL-db, pyodbc specific.  OurSQL and mysqlconnector
-        already do this, so this logic should be moved to those dialects.
+    def result_processor(
+        self, dialect: MySQLDialect, coltype: object  # type: ignore[override]
+    ) -> Optional[_ResultProcessorType[Any]]:
+        """Convert a MySQL's 64 bit, variable length binary string to a
+        long."""
 
-        """
+        if dialect.supports_native_bit:
+            return None
 
-        def process(value):
+        def process(value: Optional[Iterable[int]]) -> Optional[int]:
             if value is not None:
                 v = 0
                 for i in value:
-                    if not isinstance(i, int):
-                        i = ord(i)  # convert byte to int on Python 2
                     v = v << 8 | i
                 return v
             return value
@@ -399,7 +458,7 @@ class TIME(sqltypes.TIME):
 
     __visit_name__ = "TIME"
 
-    def __init__(self, timezone=False, fsp=None):
+    def __init__(self, timezone: bool = False, fsp: Optional[int] = None):
         """Construct a MySQL TIME type.
 
         :param timezone: not used by the MySQL dialect.
@@ -418,10 +477,12 @@ def __init__(self, timezone=False, fsp=None):
         super().__init__(timezone=timezone)
         self.fsp = fsp
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> _ResultProcessorType[datetime.time]:
         time = datetime.time
 
-        def process(value):
+        def process(value: Any) -> Optional[datetime.time]:
             # convert from a timedelta value
             if value is not None:
                 microseconds = value.microseconds
@@ -444,7 +505,7 @@ class TIMESTAMP(sqltypes.TIMESTAMP):
 
     __visit_name__ = "TIMESTAMP"
 
-    def __init__(self, timezone=False, fsp=None):
+    def __init__(self, timezone: bool = False, fsp: Optional[int] = None):
         """Construct a MySQL TIMESTAMP type.
 
         :param timezone: not used by the MySQL dialect.
@@ -469,7 +530,7 @@ class DATETIME(sqltypes.DATETIME):
 
     __visit_name__ = "DATETIME"
 
-    def __init__(self, timezone=False, fsp=None):
+    def __init__(self, timezone: bool = False, fsp: Optional[int] = None):
         """Construct a MySQL DATETIME type.
 
         :param timezone: not used by the MySQL dialect.
@@ -489,12 +550,12 @@ def __init__(self, timezone=False, fsp=None):
         self.fsp = fsp
 
 
-class YEAR(sqltypes.TypeEngine):
+class YEAR(sqltypes.TypeEngine[Any]):
     """MySQL YEAR type, for single byte storage of years 1901-2155."""
 
     __visit_name__ = "YEAR"
 
-    def __init__(self, display_width=None):
+    def __init__(self, display_width: Optional[int] = None):
         self.display_width = display_width
 
 
@@ -503,7 +564,7 @@ class TEXT(_StringType, sqltypes.TEXT):
 
     __visit_name__ = "TEXT"
 
-    def __init__(self, length=None, **kw):
+    def __init__(self, length: Optional[int] = None, **kw: Any):
         """Construct a TEXT.
 
         :param length: Optional, if provided the server may optimize storage
@@ -539,7 +600,7 @@ class TINYTEXT(_StringType):
 
     __visit_name__ = "TINYTEXT"
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any):
         """Construct a TINYTEXT.
 
         :param charset: Optional, a column-level character set for this string
@@ -572,7 +633,7 @@ class MEDIUMTEXT(_StringType):
 
     __visit_name__ = "MEDIUMTEXT"
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any):
         """Construct a MEDIUMTEXT.
 
         :param charset: Optional, a column-level character set for this string
@@ -604,7 +665,7 @@ class LONGTEXT(_StringType):
 
     __visit_name__ = "LONGTEXT"
 
-    def __init__(self, **kwargs):
+    def __init__(self, **kwargs: Any):
         """Construct a LONGTEXT.
 
         :param charset: Optional, a column-level character set for this string
@@ -636,7 +697,7 @@ class VARCHAR(_StringType, sqltypes.VARCHAR):
 
     __visit_name__ = "VARCHAR"
 
-    def __init__(self, length=None, **kwargs):
+    def __init__(self, length: Optional[int] = None, **kwargs: Any) -> None:
         """Construct a VARCHAR.
 
         :param charset: Optional, a column-level character set for this string
@@ -668,7 +729,7 @@ class CHAR(_StringType, sqltypes.CHAR):
 
     __visit_name__ = "CHAR"
 
-    def __init__(self, length=None, **kwargs):
+    def __init__(self, length: Optional[int] = None, **kwargs: Any):
         """Construct a CHAR.
 
         :param length: Maximum data length, in characters.
@@ -684,7 +745,7 @@ def __init__(self, length=None, **kwargs):
         super().__init__(length=length, **kwargs)
 
     @classmethod
-    def _adapt_string_for_cast(cls, type_):
+    def _adapt_string_for_cast(cls, type_: sqltypes.String) -> sqltypes.CHAR:
         # copy the given string type into a CHAR
         # for the purposes of rendering a CAST expression
         type_ = sqltypes.to_instance(type_)
@@ -713,7 +774,7 @@ class NVARCHAR(_StringType, sqltypes.NVARCHAR):
 
     __visit_name__ = "NVARCHAR"
 
-    def __init__(self, length=None, **kwargs):
+    def __init__(self, length: Optional[int] = None, **kwargs: Any):
         """Construct an NVARCHAR.
 
         :param length: Maximum data length, in characters.
@@ -739,7 +800,7 @@ class NCHAR(_StringType, sqltypes.NCHAR):
 
     __visit_name__ = "NCHAR"
 
-    def __init__(self, length=None, **kwargs):
+    def __init__(self, length: Optional[int] = None, **kwargs: Any):
         """Construct an NCHAR.
 
         :param length: Maximum data length, in characters.
diff --git a/libs/sqlalchemy/dialects/oracle/__init__.py b/libs/sqlalchemy/dialects/oracle/__init__.py
index 7ceb743d61..e4a92d186c 100644
--- a/libs/sqlalchemy/dialects/oracle/__init__.py
+++ b/libs/sqlalchemy/dialects/oracle/__init__.py
@@ -1,5 +1,5 @@
 # dialects/oracle/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -32,6 +32,13 @@
 from .base import TIMESTAMP
 from .base import VARCHAR
 from .base import VARCHAR2
+from .base import VECTOR
+from .base import VectorIndexConfig
+from .base import VectorIndexType
+from .vector import SparseVector
+from .vector import VectorDistanceType
+from .vector import VectorStorageFormat
+from .vector import VectorStorageType
 
 # Alias oracledb also as oracledb_async
 oracledb_async = type(
@@ -64,4 +71,11 @@
     "NVARCHAR2",
     "ROWID",
     "REAL",
+    "VECTOR",
+    "VectorDistanceType",
+    "VectorIndexType",
+    "VectorIndexConfig",
+    "VectorStorageFormat",
+    "VectorStorageType",
+    "SparseVector",
 )
diff --git a/libs/sqlalchemy/dialects/oracle/base.py b/libs/sqlalchemy/dialects/oracle/base.py
index 019b76bc0a..785ec92a63 100644
--- a/libs/sqlalchemy/dialects/oracle/base.py
+++ b/libs/sqlalchemy/dialects/oracle/base.py
@@ -1,5 +1,5 @@
 # dialects/oracle/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -153,15 +153,140 @@
 -----------------
 
 In Oracle Database, the data dictionary represents all case insensitive
-identifier names using UPPERCASE text.  SQLAlchemy on the other hand considers
-an all-lower case identifier name to be case insensitive.  The Oracle Database
-dialects convert all case insensitive identifiers to and from those two formats
-during schema level communication, such as reflection of tables and indexes.
-Using an UPPERCASE name on the SQLAlchemy side indicates a case sensitive
-identifier, and SQLAlchemy will quote the name - this will cause mismatches
-against data dictionary data received from Oracle Database, so unless
-identifier names have been truly created as case sensitive (i.e. using quoted
-names), all lowercase names should be used on the SQLAlchemy side.
+identifier names using UPPERCASE text.  This is in contradiction to the
+expectations of SQLAlchemy, which assume a case insensitive name is represented
+as lowercase text.
+
+As an example of case insensitive identifier names, consider the following table:
+
+.. sourcecode:: sql
+
+    CREATE TABLE MyTable (Identifier INTEGER PRIMARY KEY)
+
+If you were to ask Oracle Database for information about this table, the
+table name would be reported as ``MYTABLE`` and the column name would
+be reported as ``IDENTIFIER``.    Compare to most other databases such as
+PostgreSQL and MySQL which would report these names as ``mytable`` and
+``identifier``.   The names are **not quoted, therefore are case insensitive**.
+The special casing of ``MyTable`` and ``Identifier`` would only be maintained
+if they were quoted in the table definition:
+
+.. sourcecode:: sql
+
+    CREATE TABLE "MyTable" ("Identifier" INTEGER PRIMARY KEY)
+
+When constructing a SQLAlchemy :class:`.Table` object, **an all lowercase name
+is considered to be case insensitive**.   So the following table assumes
+case insensitive names::
+
+    Table("mytable", metadata, Column("identifier", Integer, primary_key=True))
+
+Whereas when mixed case or UPPERCASE names are used, case sensitivity is
+assumed::
+
+    Table("MyTable", metadata, Column("Identifier", Integer, primary_key=True))
+
+A similar situation occurs at the database driver level when emitting a
+textual SQL SELECT statement and looking at column names in the DBAPI
+``cursor.description`` attribute.  A database like PostgreSQL will normalize
+case insensitive names to be lowercase::
+
+    >>> pg_engine = create_engine("postgresql://scott:tiger@localhost/test")
+    >>> pg_connection = pg_engine.connect()
+    >>> result = pg_connection.exec_driver_sql("SELECT 1 AS SomeName")
+    >>> result.cursor.description
+    (Column(name='somename', type_code=23),)
+
+Whereas Oracle normalizes them to UPPERCASE::
+
+    >>> oracle_engine = create_engine("oracle+oracledb://scott:tiger@oracle18c/xe")
+    >>> oracle_connection = oracle_engine.connect()
+    >>> result = oracle_connection.exec_driver_sql(
+    ...     "SELECT 1 AS SomeName FROM DUAL"
+    ... )
+    >>> result.cursor.description
+    [('SOMENAME', <DbType DB_TYPE_NUMBER>, 127, None, 0, -127, True)]
+
+In order to achieve cross-database parity for the two cases of a. table
+reflection and b. textual-only SQL statement round trips, SQLAlchemy performs a step
+called **name normalization** when using the Oracle dialect.  This process may
+also apply to other third party dialects that have similar UPPERCASE handling
+of case insensitive names.
+
+When using name normalization, SQLAlchemy attempts to detect if a name is
+case insensitive by checking if all characters are UPPERCASE letters only;
+if so, then it assumes this is a case insensitive name and is delivered as
+a lowercase name.
+
+For table reflection, a tablename that is seen represented as all UPPERCASE
+in Oracle Database's catalog tables will be assumed to have a case insensitive
+name.  This is what allows the ``Table`` definition to use lower case names
+and be equally compatible from a reflection point of view on Oracle Database
+and all other databases such as PostgreSQL and MySQL::
+
+    # matches a table created with CREATE TABLE mytable
+    Table("mytable", metadata, autoload_with=some_engine)
+
+Above, the all lowercase name ``"mytable"`` is case insensitive; it will match
+a table reported by PostgreSQL as ``"mytable"`` and a table reported by
+Oracle as ``"MYTABLE"``.  If name normalization were not present, it would
+not be possible for the above :class:`.Table` definition to be introspectable
+in a cross-database way, since we are dealing with a case insensitive name
+that is not reported by each database in the same way.
+
+Case sensitivity can be forced on in this case, such as if we wanted to represent
+the quoted tablename ``"MYTABLE"`` with that exact casing, most simply by using
+that casing directly, which will be seen as a case sensitive name::
+
+    # matches a table created with CREATE TABLE "MYTABLE"
+    Table("MYTABLE", metadata, autoload_with=some_engine)
+
+For the unusual case of a quoted all-lowercase name, the :class:`.quoted_name`
+construct may be used::
+
+    from sqlalchemy import quoted_name
+
+    # matches a table created with CREATE TABLE "mytable"
+    Table(
+        quoted_name("mytable", quote=True), metadata, autoload_with=some_engine
+    )
+
+Name normalization also takes place when handling result sets from **purely
+textual SQL strings**, that have no other :class:`.Table` or :class:`.Column`
+metadata associated with them. This includes SQL strings executed using
+:meth:`.Connection.exec_driver_sql` and SQL strings executed using the
+:func:`.text` construct which do not include :class:`.Column` metadata.
+
+Returning to the Oracle Database SELECT statement, we see that even though
+``cursor.description`` reports the column name as ``SOMENAME``, SQLAlchemy
+name normalizes this to ``somename``::
+
+    >>> oracle_engine = create_engine("oracle+oracledb://scott:tiger@oracle18c/xe")
+    >>> oracle_connection = oracle_engine.connect()
+    >>> result = oracle_connection.exec_driver_sql(
+    ...     "SELECT 1 AS SomeName FROM DUAL"
+    ... )
+    >>> result.cursor.description
+    [('SOMENAME', <DbType DB_TYPE_NUMBER>, 127, None, 0, -127, True)]
+    >>> result.keys()
+    RMKeyView(['somename'])
+
+The single scenario where the above behavior produces inaccurate results
+is when using an all-uppercase, quoted name.  SQLAlchemy has no way to determine
+that a particular name in ``cursor.description`` was quoted, and is therefore
+case sensitive, or was not quoted, and should be name normalized::
+
+    >>> result = oracle_connection.exec_driver_sql(
+    ...     'SELECT 1 AS "SOMENAME" FROM DUAL'
+    ... )
+    >>> result.cursor.description
+    [('SOMENAME', <DbType DB_TYPE_NUMBER>, 127, None, 0, -127, True)]
+    >>> result.keys()
+    RMKeyView(['somename'])
+
+For this case, a new feature will be available in SQLAlchemy 2.1 to disable
+the name normalization behavior in specific cases.
+
 
 .. _oracle_max_identifier_lengths:
 
@@ -597,11 +722,230 @@
 number of prefix columns to compress, or ``True`` to use the default (all
 columns for non-unique indexes, all but the last column for unique indexes).
 
+.. _oracle_vector_datatype:
+
+VECTOR Datatype
+---------------
+
+Oracle Database 23ai introduced a new VECTOR datatype for artificial intelligence
+and machine learning search operations. The VECTOR datatype is a homogeneous array
+of 8-bit signed integers, 8-bit unsigned integers (binary), 32-bit floating-point
+numbers, or 64-bit floating-point numbers.
+
+A vector's storage type can be either DENSE or SPARSE. A dense vector contains
+meaningful values in most or all of its dimensions. In contrast, a sparse vector
+has non-zero values in only a few dimensions, with the majority being zero.
+
+Sparse vectors are represented by the total number of vector dimensions, an array
+of indices, and an array of values where each valueโ€™s location in the vector is
+indicated by the corresponding indices array position. All other vector values are
+treated as zero.
+
+The storage formats that can be used with sparse vectors are float32, float64, and
+int8. Note that the binary storage format cannot be used with sparse vectors.
+
+Sparse vectors are supported when you are using Oracle Database 23.7 or later.
+
+.. seealso::
+
+    `Using VECTOR Data
+    <https://python-oracledb.readthedocs.io/en/latest/user_guide/vector_data_type.html>`_ - in the documentation
+    for the :ref:`oracledb` driver.
+
+.. versionadded:: 2.0.41 - Added VECTOR datatype
+
+.. versionadded:: 2.0.43 - Added DENSE/SPARSE support
+
+CREATE TABLE support for VECTOR
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+With the :class:`.VECTOR` datatype, you can specify the number of dimensions,
+the storage format, and the storage type for the data. Valid values for the
+storage format are enum members of :class:`.VectorStorageFormat`. Valid values
+for the storage type are enum members of :class:`.VectorStorageType`. If
+storage type is not specified, a DENSE vector is created by default.
+
+To create a table that includes a :class:`.VECTOR` column::
+
+    from sqlalchemy.dialects.oracle import (
+        VECTOR,
+        VectorStorageFormat,
+        VectorStorageType,
+    )
+
+    t = Table(
+        "t1",
+        metadata,
+        Column("id", Integer, primary_key=True),
+        Column(
+            "embedding",
+            VECTOR(
+                dim=3,
+                storage_format=VectorStorageFormat.FLOAT32,
+                storage_type=VectorStorageType.SPARSE,
+            ),
+        ),
+        Column(...),
+        ...,
+    )
+
+Vectors can also be defined with an arbitrary number of dimensions and formats.
+This allows you to specify vectors of different dimensions with the various
+storage formats mentioned below.
+
+**Examples**
+
+* In this case, the storage format is flexible, allowing any vector type data to be
+  inserted, such as INT8 or BINARY etc::
+
+    vector_col: Mapped[array.array] = mapped_column(VECTOR(dim=3))
+
+* The dimension is flexible in this case, meaning that any dimension vector can
+  be used::
+
+    vector_col: Mapped[array.array] = mapped_column(
+        VECTOR(storage_format=VectorStorageType.INT8)
+    )
+
+* Both the dimensions and the storage format are flexible. It creates a DENSE vector::
+
+    vector_col: Mapped[array.array] = mapped_column(VECTOR)
+
+* To create a SPARSE vector with both dimensions and the storage format as flexible,
+  use the :attr:`.VectorStorageType.SPARSE` storage type::
+
+    vector_col: Mapped[array.array] = mapped_column(
+        VECTOR(storage_type=VectorStorageType.SPARSE)
+    )
+
+Python Datatypes for VECTOR
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+VECTOR data can be inserted using Python list or Python ``array.array()`` objects.
+Python arrays of type FLOAT (32-bit), DOUBLE (64-bit), INT (8-bit signed integers),
+or BINARY (8-bit unsigned integers) are used as bind values when inserting
+VECTOR columns::
+
+    from sqlalchemy import insert, select
+
+    with engine.begin() as conn:
+        conn.execute(
+            insert(t1),
+            {"id": 1, "embedding": [1, 2, 3]},
+        )
+
+Data can be inserted into a sparse vector using the :class:`_oracle.SparseVector`
+class, creating an object consisting of the number of dimensions, an array of indices, and a
+corresponding array of values::
+
+    from sqlalchemy import insert, select
+    from sqlalchemy.dialects.oracle import SparseVector
+
+    sparse_val = SparseVector(10, [1, 2], array.array("d", [23.45, 221.22]))
+
+    with engine.begin() as conn:
+        conn.execute(
+            insert(t1),
+            {"id": 1, "embedding": sparse_val},
+        )
+
+VECTOR Indexes
+~~~~~~~~~~~~~~
+
+The VECTOR feature supports an Oracle-specific parameter ``oracle_vector``
+on the :class:`.Index` construct, which allows the construction of VECTOR
+indexes.
+
+SPARSE vectors cannot be used in the creation of vector indexes.
+
+To utilize VECTOR indexing, set the ``oracle_vector`` parameter to True to use
+the default values provided by Oracle. HNSW is the default indexing method::
+
+    from sqlalchemy import Index
+
+    Index(
+        "vector_index",
+        t1.c.embedding,
+        oracle_vector=True,
+    )
+
+The full range of parameters for vector indexes are available by using the
+:class:`.VectorIndexConfig` dataclass in place of a boolean; this dataclass
+allows full configuration of the index::
+
+    Index(
+        "hnsw_vector_index",
+        t1.c.embedding,
+        oracle_vector=VectorIndexConfig(
+            index_type=VectorIndexType.HNSW,
+            distance=VectorDistanceType.COSINE,
+            accuracy=90,
+            hnsw_neighbors=5,
+            hnsw_efconstruction=20,
+            parallel=10,
+        ),
+    )
+
+    Index(
+        "ivf_vector_index",
+        t1.c.embedding,
+        oracle_vector=VectorIndexConfig(
+            index_type=VectorIndexType.IVF,
+            distance=VectorDistanceType.DOT,
+            accuracy=90,
+            ivf_neighbor_partitions=5,
+        ),
+    )
+
+For complete explanation of these parameters, see the Oracle documentation linked
+below.
+
+.. seealso::
+
+    `CREATE VECTOR INDEX <https://www.oracle.com/pls/topic/lookup?ctx=dblatest&id=GUID-B396C369-54BB-4098-A0DD-7C54B3A0D66F>`_ - in the Oracle documentation
+
+
+
+Similarity Searching
+~~~~~~~~~~~~~~~~~~~~
+
+When using the :class:`_oracle.VECTOR` datatype with a :class:`.Column` or similar
+ORM mapped construct, additional comparison functions are available, including:
+
+* ``l2_distance``
+* ``cosine_distance``
+* ``inner_product``
+
+Example Usage::
+
+    result_vector = connection.scalars(
+        select(t1).order_by(t1.embedding.l2_distance([2, 3, 4])).limit(3)
+    )
+
+    for user in vector:
+        print(user.id, user.embedding)
+
+FETCH APPROXIMATE support
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Approximate vector search can only be performed when all syntax and semantic
+rules are satisfied, the corresponding vector index is available, and the
+query optimizer determines to perform it. If any of these conditions are
+unmet, then an approximate search is not performed. In this case the query
+returns exact results.
+
+To enable approximate searching during similarity searches on VECTORS, the
+``oracle_fetch_approximate`` parameter may be used with the :meth:`.Select.fetch`
+clause to add ``FETCH APPROX`` to the SELECT statement::
+
+    select(users_table).fetch(5, oracle_fetch_approximate=True)
+
 """  # noqa
 
 from __future__ import annotations
 
 from collections import defaultdict
+from dataclasses import fields
 from functools import lru_cache
 from functools import wraps
 import re
@@ -624,6 +968,9 @@
 from .types import ROWID  # noqa
 from .types import TIMESTAMP
 from .types import VARCHAR2  # noqa
+from .vector import VECTOR
+from .vector import VectorIndexConfig
+from .vector import VectorIndexType
 from ... import Computed
 from ... import exc
 from ... import schema as sa_schema
@@ -642,6 +989,7 @@
 from ...sql import null
 from ...sql import or_
 from ...sql import select
+from ...sql import selectable as sa_selectable
 from ...sql import sqltypes
 from ...sql import util as sql_util
 from ...sql import visitors
@@ -703,6 +1051,7 @@
     "BINARY_DOUBLE": BINARY_DOUBLE,
     "BINARY_FLOAT": BINARY_FLOAT,
     "ROWID": ROWID,
+    "VECTOR": VECTOR,
 }
 
 
@@ -860,6 +1209,18 @@ def visit_RAW(self, type_, **kw):
     def visit_ROWID(self, type_, **kw):
         return "ROWID"
 
+    def visit_VECTOR(self, type_, **kw):
+        dim = type_.dim if type_.dim is not None else "*"
+        storage_format = (
+            type_.storage_format.value
+            if type_.storage_format is not None
+            else "*"
+        )
+        storage_type = (
+            type_.storage_type.value if type_.storage_type is not None else "*"
+        )
+        return f"VECTOR({dim},{storage_format},{storage_type})"
+
 
 class OracleCompiler(compiler.SQLCompiler):
     """Oracle compiler modifies the lexical structure of Select
@@ -1098,6 +1459,29 @@ def _get_limit_or_fetch(self, select):
         else:
             return select._fetch_clause
 
+    def fetch_clause(
+        self,
+        select,
+        fetch_clause=None,
+        require_offset=False,
+        use_literal_execute_for_simple_int=False,
+        **kw,
+    ):
+        text = super().fetch_clause(
+            select,
+            fetch_clause=fetch_clause,
+            require_offset=require_offset,
+            use_literal_execute_for_simple_int=(
+                use_literal_execute_for_simple_int
+            ),
+            **kw,
+        )
+
+        if select.dialect_options["oracle"]["fetch_approximate"]:
+            text = re.sub("FETCH FIRST", "FETCH APPROX FIRST", text)
+
+        return text
+
     def translate_select_structure(self, select_stmt, **kwargs):
         select = select_stmt
 
@@ -1346,6 +1730,48 @@ def visit_bitwise_not_op_unary_operator(self, element, operator, **kw):
 
 
 class OracleDDLCompiler(compiler.DDLCompiler):
+
+    def _build_vector_index_config(
+        self, vector_index_config: VectorIndexConfig
+    ) -> str:
+        parts = []
+        sql_param_name = {
+            "hnsw_neighbors": "neighbors",
+            "hnsw_efconstruction": "efconstruction",
+            "ivf_neighbor_partitions": "neighbor partitions",
+            "ivf_sample_per_partition": "sample_per_partition",
+            "ivf_min_vectors_per_partition": "min_vectors_per_partition",
+        }
+        if vector_index_config.index_type == VectorIndexType.HNSW:
+            parts.append("ORGANIZATION INMEMORY NEIGHBOR GRAPH")
+        elif vector_index_config.index_type == VectorIndexType.IVF:
+            parts.append("ORGANIZATION NEIGHBOR PARTITIONS")
+        if vector_index_config.distance is not None:
+            parts.append(f"DISTANCE {vector_index_config.distance.value}")
+
+        if vector_index_config.accuracy is not None:
+            parts.append(
+                f"WITH TARGET ACCURACY {vector_index_config.accuracy}"
+            )
+
+        parameters_str = [f"type {vector_index_config.index_type.name}"]
+        prefix = vector_index_config.index_type.name.lower() + "_"
+
+        for field in fields(vector_index_config):
+            if field.name.startswith(prefix):
+                key = sql_param_name.get(field.name)
+                value = getattr(vector_index_config, field.name)
+                if value is not None:
+                    parameters_str.append(f"{key} {value}")
+
+        parameters_str = ", ".join(parameters_str)
+        parts.append(f"PARAMETERS ({parameters_str})")
+
+        if vector_index_config.parallel is not None:
+            parts.append(f"PARALLEL {vector_index_config.parallel}")
+
+        return " ".join(parts)
+
     def define_constraint_cascades(self, constraint):
         text = ""
         if constraint.ondelete is not None:
@@ -1378,6 +1804,9 @@ def visit_create_index(self, create, **kw):
             text += "UNIQUE "
         if index.dialect_options["oracle"]["bitmap"]:
             text += "BITMAP "
+        vector_options = index.dialect_options["oracle"]["vector"]
+        if vector_options:
+            text += "VECTOR "
         text += "INDEX %s ON %s (%s)" % (
             self._prepared_index_name(index, include_schema=True),
             preparer.format_table(index.table, use_schema=True),
@@ -1395,6 +1824,11 @@ def visit_create_index(self, create, **kw):
                 text += " COMPRESS %d" % (
                     index.dialect_options["oracle"]["compress"]
                 )
+        if vector_options:
+            if vector_options is True:
+                vector_options = VectorIndexConfig()
+
+            text += " " + self._build_vector_index_config(vector_options)
         return text
 
     def post_create_table(self, table):
@@ -1545,7 +1979,16 @@ class OracleDialect(default.DefaultDialect):
                 "tablespace": None,
             },
         ),
-        (sa_schema.Index, {"bitmap": False, "compress": False}),
+        (
+            sa_schema.Index,
+            {
+                "bitmap": False,
+                "compress": False,
+                "vector": False,
+            },
+        ),
+        (sa_selectable.Select, {"fetch_approximate": False}),
+        (sa_selectable.CompoundSelect, {"fetch_approximate": False}),
     ]
 
     @util.deprecated_params(
@@ -2175,7 +2618,7 @@ def _table_options_query(
             and ObjectKind.TABLE in kind
             and ObjectKind.MATERIALIZED_VIEW not in kind
         ):
-            # cant use EXCEPT ALL / MINUS here because we don't have an
+            # can't use EXCEPT ALL / MINUS here because we don't have an
             # excludable row vs. the query above
             # outerjoin + where null works better on oracle 21 but 11 does
             # not like it at all. this is the next best thing
diff --git a/libs/sqlalchemy/dialects/oracle/cx_oracle.py b/libs/sqlalchemy/dialects/oracle/cx_oracle.py
index 0514ebbcd4..8750354c9a 100644
--- a/libs/sqlalchemy/dialects/oracle/cx_oracle.py
+++ b/libs/sqlalchemy/dialects/oracle/cx_oracle.py
@@ -1,5 +1,5 @@
 # dialects/oracle/cx_oracle.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1234,6 +1234,9 @@ def set_isolation_level(self, dbapi_connection, level):
             with dbapi_connection.cursor() as cursor:
                 cursor.execute(f"ALTER SESSION SET ISOLATION_LEVEL={level}")
 
+    def detect_autocommit_setting(self, dbapi_conn) -> bool:
+        return bool(dbapi_conn.autocommit)
+
     def _detect_decimal_char(self, connection):
         # we have the option to change this setting upon connect,
         # or just look at what it is upon connect and convert.
diff --git a/libs/sqlalchemy/dialects/oracle/dictionary.py b/libs/sqlalchemy/dialects/oracle/dictionary.py
index f785a66ef7..5f36041b43 100644
--- a/libs/sqlalchemy/dialects/oracle/dictionary.py
+++ b/libs/sqlalchemy/dialects/oracle/dictionary.py
@@ -1,5 +1,5 @@
 # dialects/oracle/dictionary.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/oracle/oracledb.py b/libs/sqlalchemy/dialects/oracle/oracledb.py
index c09d2bae0d..a41f6be87f 100644
--- a/libs/sqlalchemy/dialects/oracle/oracledb.py
+++ b/libs/sqlalchemy/dialects/oracle/oracledb.py
@@ -1,5 +1,5 @@
 # dialects/oracle/oracledb.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -112,7 +112,7 @@
 For example to use an `Easy Connect string
 <https://download.oracle.com/ocomdocs/global/Oracle-Net-Easy-Connect-Plus.pdf>`_
 with a timeout to prevent connection establishment from hanging if the network
-transport to the database cannot be establishd in 30 seconds, and also setting
+transport to the database cannot be established in 30 seconds, and also setting
 a keep-alive time of 60 seconds to stop idle network connections from being
 terminated by a firewall::
 
@@ -236,12 +236,8 @@
 is where the Oracle Autonomous Database wallet zip file was extracted.  Note
 this directory should be protected.
 
-Connection Pooling
-------------------
-
-Applications with multiple concurrent users should use connection pooling. A
-minimal sized connection pool is also beneficial for long-running, single-user
-applications that do not frequently use a connection.
+Using python-oracledb Connection Pooling
+----------------------------------------
 
 The python-oracledb driver provides its own connection pool implementation that
 may be used in place of SQLAlchemy's pooling functionality.  The driver pool
@@ -736,6 +732,8 @@ def _check_max_identifier_length(self, connection):
 
 class AsyncAdapt_oracledb_cursor(AsyncAdapt_dbapi_cursor):
     _cursor: AsyncCursor
+    _awaitable_cursor_close: bool = False
+
     __slots__ = ()
 
     @property
@@ -749,10 +747,6 @@ def outputtypehandler(self, value):
     def var(self, *args, **kwargs):
         return self._cursor.var(*args, **kwargs)
 
-    def close(self):
-        self._rows.clear()
-        self._cursor.close()
-
     def setinputsizes(self, *args: Any, **kwargs: Any) -> Any:
         return self._cursor.setinputsizes(*args, **kwargs)
 
diff --git a/libs/sqlalchemy/dialects/oracle/provision.py b/libs/sqlalchemy/dialects/oracle/provision.py
index 3587de9d01..3bdbddeb05 100644
--- a/libs/sqlalchemy/dialects/oracle/provision.py
+++ b/libs/sqlalchemy/dialects/oracle/provision.py
@@ -1,11 +1,13 @@
 # dialects/oracle/provision.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: ignore-errors
 
+import time
+
 from ... import create_engine
 from ... import exc
 from ... import inspect
@@ -16,13 +18,50 @@
 from ...testing.provision import drop_all_schema_objects_pre_tables
 from ...testing.provision import drop_db
 from ...testing.provision import follower_url_from_main
+from ...testing.provision import generate_driver_url
+from ...testing.provision import is_preferred_driver
 from ...testing.provision import log
 from ...testing.provision import post_configure_engine
+from ...testing.provision import post_configure_testing_engine
 from ...testing.provision import run_reap_dbs
 from ...testing.provision import set_default_schema_on_connection
 from ...testing.provision import stop_test_class_outside_fixtures
 from ...testing.provision import temp_table_keyword_args
 from ...testing.provision import update_db_opts
+from ...testing.warnings import warn_test_suite
+
+
+@generate_driver_url.for_db("oracle")
+def _oracle_generate_driver_url(url, driver, query_str):
+
+    backend = url.get_backend_name()
+
+    new_url = url.set(
+        drivername="%s+%s" % (backend, driver),
+    )
+
+    # use oracledb's retry feature, which is essential for oracle 23c
+    # which otherwise frequently rejects connections under load
+    # for cx_oracle we have a connect event instead
+    if driver in ("oracledb", "oracledb_async"):
+        # oracledb is even nice enough to convert from string to int
+        # for these opts, apparently
+        new_url = new_url.update_query_pairs(
+            [("retry_count", "5"), ("retry_delay", "2")]
+        )
+    else:
+        # remove these params for cx_oracle if we received an
+        # already-modified URL
+        new_url = new_url.difference_update_query(
+            ["retry_count", "retry_delay"]
+        )
+
+    try:
+        new_url.get_dialect()
+    except exc.NoSuchModuleError:
+        return None
+    else:
+        return new_url
 
 
 @create_db.for_db("oracle")
@@ -103,20 +142,6 @@ def _ora_stop_test_class_outside_fixtures(config, db, cls):
     except exc.DatabaseError as err:
         log.warning("purge recyclebin command failed: %s", err)
 
-    # clear statement cache on all connections that were used
-    # https://github.com/oracle/python-cx_Oracle/issues/519
-
-    for cx_oracle_conn in _all_conns:
-        try:
-            sc = cx_oracle_conn.stmtcachesize
-        except db.dialect.dbapi.InterfaceError:
-            # connection closed
-            pass
-        else:
-            cx_oracle_conn.stmtcachesize = 0
-            cx_oracle_conn.stmtcachesize = sc
-    _all_conns.clear()
-
 
 def _purge_recyclebin(eng, schema=None):
     with eng.begin() as conn:
@@ -134,24 +159,76 @@ def _purge_recyclebin(eng, schema=None):
                 conn.exec_driver_sql(f'purge {type_} {owner}."{object_name}"')
 
 
-_all_conns = set()
+@is_preferred_driver.for_db("oracle")
+def _oracle_is_preferred_driver(cfg, engine):
+    """establish oracledb as the preferred driver to use for tests, even
+    though cx_Oracle is still the "default" driver"""
+
+    return engine.dialect.driver == "oracledb" and not engine.dialect.is_async
+
+
+def _connect_with_retry(dialect, conn_rec, cargs, cparams):
+    assert dialect.driver == "cx_oracle"
+
+    def _is_couldnt_connect(err):
+        return "DPY-6005" in str(err) or "ORA-12516" in str(err)
+
+    err_ = None
+    for _ in range(5):
+        try:
+            return dialect.loaded_dbapi.connect(*cargs, **cparams)
+        except (
+            dialect.loaded_dbapi.DatabaseError,
+            dialect.loaded_dbapi.OperationalError,
+        ) as err:
+            err_ = err
+            if _is_couldnt_connect(err):
+                warn_test_suite("Oracle database reconnecting...")
+                time.sleep(2)
+                continue
+            else:
+                raise
+    if err_ is not None:
+        raise Exception("connect failed after five attempts") from err_
+
+
+@post_configure_testing_engine.for_db("oracle")
+def _oracle_post_configure_testing_engine(url, engine, options, scope):
+    from ... import event
+
+    if engine.dialect.driver == "cx_oracle":
+        event.listen(engine, "do_connect", _connect_with_retry)
 
 
 @post_configure_engine.for_db("oracle")
 def _oracle_post_configure_engine(url, engine, follower_ident):
-    from sqlalchemy import event
 
-    @event.listens_for(engine, "checkout")
-    def checkout(dbapi_con, con_record, con_proxy):
-        _all_conns.add(dbapi_con)
+    from ... import event
 
     @event.listens_for(engine, "checkin")
     def checkin(dbapi_connection, connection_record):
-        # work around cx_Oracle issue:
+        # this was meant to work around this issue:
         # https://github.com/oracle/python-cx_Oracle/issues/530
         # invalidate oracle connections that had 2pc set up
-        if "cx_oracle_xid" in connection_record.info:
-            connection_record.invalidate()
+        # however things are too complex with some of the 2pc tests,
+        # so just block cx_oracle from being used in 2pc tests (use oracledb
+        # instead)
+        # if "cx_oracle_xid" in connection_record.info:
+        #    connection_record.invalidate()
+
+        # clear statement cache on all connections that were used
+        # https://github.com/oracle/python-cx_Oracle/issues/519
+        # TODO: oracledb claims to have this feature built in somehow,
+        # see if that's in use and/or if it needs to be enabled
+        # (or if this doesn't even apply to the newer oracle's we're using)
+        try:
+            sc = dbapi_connection.stmtcachesize
+        except:
+            # connection closed
+            pass
+        else:
+            dbapi_connection.stmtcachesize = 0
+            dbapi_connection.stmtcachesize = sc
 
 
 @run_reap_dbs.for_db("oracle")
diff --git a/libs/sqlalchemy/dialects/oracle/types.py b/libs/sqlalchemy/dialects/oracle/types.py
index 06aeaace2f..ae6cba2136 100644
--- a/libs/sqlalchemy/dialects/oracle/types.py
+++ b/libs/sqlalchemy/dialects/oracle/types.py
@@ -1,5 +1,5 @@
 # dialects/oracle/types.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/oracle/vector.py b/libs/sqlalchemy/dialects/oracle/vector.py
new file mode 100644
index 0000000000..53057675ba
--- /dev/null
+++ b/libs/sqlalchemy/dialects/oracle/vector.py
@@ -0,0 +1,365 @@
+# dialects/oracle/vector.py
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
+# <see AUTHORS file>
+#
+# This module is part of SQLAlchemy and is released under
+# the MIT License: https://www.opensource.org/licenses/mit-license.php
+# mypy: ignore-errors
+
+
+from __future__ import annotations
+
+import array
+from dataclasses import dataclass
+from enum import Enum
+from typing import Optional
+from typing import Union
+
+from ... import types
+from ...types import Float
+
+
+class VectorIndexType(Enum):
+    """Enum representing different types of VECTOR index structures.
+
+    See :ref:`oracle_vector_datatype` for background.
+
+    .. versionadded:: 2.0.41
+
+    """
+
+    HNSW = "HNSW"
+    """
+    The HNSW (Hierarchical Navigable Small World) index type.
+    """
+    IVF = "IVF"
+    """
+    The IVF (Inverted File Index) index type
+    """
+
+
+class VectorDistanceType(Enum):
+    """Enum representing different types of vector distance metrics.
+
+    See :ref:`oracle_vector_datatype` for background.
+
+    .. versionadded:: 2.0.41
+
+    """
+
+    EUCLIDEAN = "EUCLIDEAN"
+    """Euclidean distance (L2 norm).
+
+    Measures the straight-line distance between two vectors in space.
+    """
+    DOT = "DOT"
+    """Dot product similarity.
+
+    Measures the algebraic similarity between two vectors.
+    """
+    COSINE = "COSINE"
+    """Cosine similarity.
+
+    Measures the cosine of the angle between two vectors.
+    """
+    MANHATTAN = "MANHATTAN"
+    """Manhattan distance (L1 norm).
+
+    Calculates the sum of absolute differences across dimensions.
+    """
+
+
+class VectorStorageFormat(Enum):
+    """Enum representing the data format used to store vector components.
+
+    See :ref:`oracle_vector_datatype` for background.
+
+    .. versionadded:: 2.0.41
+
+    """
+
+    INT8 = "INT8"
+    """
+    8-bit integer format.
+    """
+    BINARY = "BINARY"
+    """
+    Binary format.
+    """
+    FLOAT32 = "FLOAT32"
+    """
+    32-bit floating-point format.
+    """
+    FLOAT64 = "FLOAT64"
+    """
+    64-bit floating-point format.
+    """
+
+
+class VectorStorageType(Enum):
+    """Enum representing the vector type,
+
+    See :ref:`oracle_vector_datatype` for background.
+
+    .. versionadded:: 2.0.43
+
+    """
+
+    SPARSE = "SPARSE"
+    """
+    A Sparse vector is a vector which has zero value for
+    most of its dimensions.
+    """
+    DENSE = "DENSE"
+    """
+    A Dense vector is a vector where most, if not all, elements
+    hold meaningful values.
+    """
+
+
+@dataclass
+class VectorIndexConfig:
+    """Define the configuration for Oracle VECTOR Index.
+
+    See :ref:`oracle_vector_datatype` for background.
+
+    .. versionadded:: 2.0.41
+
+    :param index_type: Enum value from :class:`.VectorIndexType`
+     Specifies the indexing method. For HNSW, this must be
+     :attr:`.VectorIndexType.HNSW`.
+
+    :param distance: Enum value from :class:`.VectorDistanceType`
+     specifies the metric for calculating distance between VECTORS.
+
+    :param accuracy: integer. Should be in the range 0 to 100
+     Specifies the accuracy of the nearest neighbor search during
+     query execution.
+
+    :param parallel: integer. Specifies degree of parallelism.
+
+    :param hnsw_neighbors: integer. Should be in the range 0 to
+     2048. Specifies the number of nearest neighbors considered
+     during the search. The attribute :attr:`.VectorIndexConfig.hnsw_neighbors`
+     is HNSW index specific.
+
+    :param hnsw_efconstruction: integer. Should be in the range 0
+     to 65535. Controls the trade-off between indexing speed and
+     recall quality during index construction. The attribute
+     :attr:`.VectorIndexConfig.hnsw_efconstruction` is HNSW index
+     specific.
+
+    :param ivf_neighbor_partitions: integer. Should be in the range
+     0 to 10,000,000. Specifies the number of partitions used to
+     divide the dataset. The attribute
+     :attr:`.VectorIndexConfig.ivf_neighbor_partitions` is IVF index
+     specific.
+
+    :param ivf_sample_per_partition: integer. Should be between 1
+     and ``num_vectors / neighbor partitions``. Specifies the
+     number of samples used per partition. The attribute
+     :attr:`.VectorIndexConfig.ivf_sample_per_partition` is IVF index
+     specific.
+
+    :param ivf_min_vectors_per_partition: integer. From 0 (no trimming)
+     to the total number of vectors (results in 1 partition). Specifies
+     the minimum number of vectors per partition. The attribute
+     :attr:`.VectorIndexConfig.ivf_min_vectors_per_partition`
+     is IVF index specific.
+
+    """
+
+    index_type: VectorIndexType = VectorIndexType.HNSW
+    distance: Optional[VectorDistanceType] = None
+    accuracy: Optional[int] = None
+    hnsw_neighbors: Optional[int] = None
+    hnsw_efconstruction: Optional[int] = None
+    ivf_neighbor_partitions: Optional[int] = None
+    ivf_sample_per_partition: Optional[int] = None
+    ivf_min_vectors_per_partition: Optional[int] = None
+    parallel: Optional[int] = None
+
+    def __post_init__(self):
+        self.index_type = VectorIndexType(self.index_type)
+        for field in [
+            "hnsw_neighbors",
+            "hnsw_efconstruction",
+            "ivf_neighbor_partitions",
+            "ivf_sample_per_partition",
+            "ivf_min_vectors_per_partition",
+            "parallel",
+            "accuracy",
+        ]:
+            value = getattr(self, field)
+            if value is not None and not isinstance(value, int):
+                raise TypeError(
+                    f"{field} must be an integer if"
+                    f"provided, got {type(value).__name__}"
+                )
+
+
+class SparseVector:
+    """
+    Lightweight SQLAlchemy-side version of SparseVector.
+    This mimics oracledb.SparseVector.
+
+    .. versionadded:: 2.0.43
+
+    """
+
+    def __init__(
+        self,
+        num_dimensions: int,
+        indices: Union[list, array.array],
+        values: Union[list, array.array],
+    ):
+        if not isinstance(indices, array.array) or indices.typecode != "I":
+            indices = array.array("I", indices)
+        if not isinstance(values, array.array):
+            values = array.array("d", values)
+        if len(indices) != len(values):
+            raise TypeError("indices and values must be of the same length!")
+
+        self.num_dimensions = num_dimensions
+        self.indices = indices
+        self.values = values
+
+    def __str__(self):
+        return (
+            f"SparseVector(num_dimensions={self.num_dimensions}, "
+            f"size={len(self.indices)}, typecode={self.values.typecode})"
+        )
+
+
+class VECTOR(types.TypeEngine):
+    """Oracle VECTOR datatype.
+
+    For complete background on using this type, see
+    :ref:`oracle_vector_datatype`.
+
+    .. versionadded:: 2.0.41
+
+    """
+
+    cache_ok = True
+
+    __visit_name__ = "VECTOR"
+
+    _typecode_map = {
+        VectorStorageFormat.INT8: "b",  # Signed int
+        VectorStorageFormat.BINARY: "B",  # Unsigned int
+        VectorStorageFormat.FLOAT32: "f",  # Float
+        VectorStorageFormat.FLOAT64: "d",  # Double
+    }
+
+    def __init__(self, dim=None, storage_format=None, storage_type=None):
+        """Construct a VECTOR.
+
+        :param dim: integer. The dimension of the VECTOR datatype. This
+         should be an integer value.
+
+        :param storage_format: VectorStorageFormat. The VECTOR storage
+         type format. This should be Enum values form
+         :class:`.VectorStorageFormat` INT8, BINARY, FLOAT32, or FLOAT64.
+
+        :param storage_type: VectorStorageType. The Vector storage type. This
+         should be Enum values from :class:`.VectorStorageType` SPARSE or
+         DENSE.
+
+        """
+
+        if dim is not None and not isinstance(dim, int):
+            raise TypeError("dim must be an integer")
+        if storage_format is not None and not isinstance(
+            storage_format, VectorStorageFormat
+        ):
+            raise TypeError(
+                "storage_format must be an enum of type VectorStorageFormat"
+            )
+        if storage_type is not None and not isinstance(
+            storage_type, VectorStorageType
+        ):
+            raise TypeError(
+                "storage_type must be an enum of type VectorStorageType"
+            )
+
+        self.dim = dim
+        self.storage_format = storage_format
+        self.storage_type = storage_type
+
+    def _cached_bind_processor(self, dialect):
+        """
+        Converts a Python-side SparseVector instance into an
+        oracledb.SparseVectormor a compatible array format before
+        binding it to the database.
+        """
+
+        def process(value):
+            if value is None or isinstance(value, array.array):
+                return value
+
+            # Convert list to a array.array
+            elif isinstance(value, list):
+                typecode = self._array_typecode(self.storage_format)
+                value = array.array(typecode, value)
+                return value
+
+            # Convert SqlAlchemy SparseVector to oracledb SparseVector object
+            elif isinstance(value, SparseVector):
+                return dialect.dbapi.SparseVector(
+                    value.num_dimensions,
+                    value.indices,
+                    value.values,
+                )
+
+            else:
+                raise TypeError(
+                    """
+                    Invalid input for VECTOR: expected a list, an array.array,
+                    or a SparseVector object.
+                    """
+                )
+
+        return process
+
+    def _cached_result_processor(self, dialect, coltype):
+        """
+        Converts database-returned values into Python-native representations.
+        If the value is an oracledb.SparseVector, it is converted into the
+        SQLAlchemy-side SparseVector class.
+        If the value is a array.array, it is converted to a plain Python list.
+
+        """
+
+        def process(value):
+            if value is None:
+                return None
+
+            elif isinstance(value, array.array):
+                return list(value)
+
+            # Convert Oracledb SparseVector to SqlAlchemy SparseVector object
+            elif isinstance(value, dialect.dbapi.SparseVector):
+                return SparseVector(
+                    num_dimensions=value.num_dimensions,
+                    indices=value.indices,
+                    values=value.values,
+                )
+
+        return process
+
+    def _array_typecode(self, typecode):
+        """
+        Map storage format to array typecode.
+        """
+        return self._typecode_map.get(typecode, "d")
+
+    class comparator_factory(types.TypeEngine.Comparator):
+        def l2_distance(self, other):
+            return self.op("<->", return_type=Float)(other)
+
+        def inner_product(self, other):
+            return self.op("<#>", return_type=Float)(other)
+
+        def cosine_distance(self, other):
+            return self.op("<=>", return_type=Float)(other)
diff --git a/libs/sqlalchemy/dialects/postgresql/__init__.py b/libs/sqlalchemy/dialects/postgresql/__init__.py
index 88935e2024..a94cfef2c6 100644
--- a/libs/sqlalchemy/dialects/postgresql/__init__.py
+++ b/libs/sqlalchemy/dialects/postgresql/__init__.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/postgresql/_psycopg_common.py b/libs/sqlalchemy/dialects/postgresql/_psycopg_common.py
index d827e054cc..03b0f76ec3 100644
--- a/libs/sqlalchemy/dialects/postgresql/_psycopg_common.py
+++ b/libs/sqlalchemy/dialects/postgresql/_psycopg_common.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/_psycopg_common.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -170,8 +170,10 @@ def get_deferrable(self, connection):
     def _do_autocommit(self, connection, value):
         connection.autocommit = value
 
+    def detect_autocommit_setting(self, dbapi_connection):
+        return bool(dbapi_connection.autocommit)
+
     def do_ping(self, dbapi_connection):
-        cursor = None
         before_autocommit = dbapi_connection.autocommit
 
         if not before_autocommit:
diff --git a/libs/sqlalchemy/dialects/postgresql/array.py b/libs/sqlalchemy/dialects/postgresql/array.py
index 7708769cb5..17a6f59b20 100644
--- a/libs/sqlalchemy/dialects/postgresql/array.py
+++ b/libs/sqlalchemy/dialects/postgresql/array.py
@@ -1,18 +1,21 @@
 # dialects/postgresql/array.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 
 from __future__ import annotations
 
 import re
-from typing import Any
+from typing import Any as typing_Any
+from typing import Iterable
 from typing import Optional
+from typing import Sequence
+from typing import TYPE_CHECKING
 from typing import TypeVar
+from typing import Union
 
 from .operators import CONTAINED_BY
 from .operators import CONTAINS
@@ -21,28 +24,53 @@
 from ... import util
 from ...sql import expression
 from ...sql import operators
-from ...sql._typing import _TypeEngineArgument
-
-
-_T = TypeVar("_T", bound=Any)
-
-
-def Any(other, arrexpr, operator=operators.eq):
+from ...sql.visitors import InternalTraversal
+
+if TYPE_CHECKING:
+    from ...engine.interfaces import Dialect
+    from ...sql._typing import _ColumnExpressionArgument
+    from ...sql._typing import _TypeEngineArgument
+    from ...sql.elements import ColumnElement
+    from ...sql.elements import Grouping
+    from ...sql.expression import BindParameter
+    from ...sql.operators import OperatorType
+    from ...sql.selectable import _SelectIterable
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _LiteralProcessorType
+    from ...sql.type_api import _ResultProcessorType
+    from ...sql.type_api import TypeEngine
+    from ...sql.visitors import _TraverseInternalsType
+    from ...util.typing import Self
+
+
+_T = TypeVar("_T", bound=typing_Any)
+_CT = TypeVar("_CT", bound=typing_Any)
+
+
+def Any(
+    other: typing_Any,
+    arrexpr: _ColumnExpressionArgument[_T],
+    operator: OperatorType = operators.eq,
+) -> ColumnElement[bool]:
     """A synonym for the ARRAY-level :meth:`.ARRAY.Comparator.any` method.
     See that method for details.
 
     """
 
-    return arrexpr.any(other, operator)
+    return arrexpr.any(other, operator)  # type: ignore[no-any-return, union-attr]  # noqa: E501
 
 
-def All(other, arrexpr, operator=operators.eq):
+def All(
+    other: typing_Any,
+    arrexpr: _ColumnExpressionArgument[_T],
+    operator: OperatorType = operators.eq,
+) -> ColumnElement[bool]:
     """A synonym for the ARRAY-level :meth:`.ARRAY.Comparator.all` method.
     See that method for details.
 
     """
 
-    return arrexpr.all(other, operator)
+    return arrexpr.all(other, operator)  # type: ignore[no-any-return, union-attr]  # noqa: E501
 
 
 class array(expression.ExpressionClauseList[_T]):
@@ -66,11 +94,32 @@ class array(expression.ExpressionClauseList[_T]):
             ARRAY[%(param_3)s, %(param_4)s, %(param_5)s]) AS anon_1
 
     An instance of :class:`.array` will always have the datatype
-    :class:`_types.ARRAY`.  The "inner" type of the array is inferred from
-    the values present, unless the ``type_`` keyword argument is passed::
+    :class:`_types.ARRAY`.  The "inner" type of the array is inferred from the
+    values present, unless the :paramref:`_postgresql.array.type_` keyword
+    argument is passed::
 
         array(["foo", "bar"], type_=CHAR)
 
+    When constructing an empty array, the :paramref:`_postgresql.array.type_`
+    argument is particularly important as PostgreSQL server typically requires
+    a cast to be rendered for the inner type in order to render an empty array.
+    SQLAlchemy's compilation for the empty array will produce this cast so
+    that::
+
+        stmt = array([], type_=Integer)
+        print(stmt.compile(dialect=postgresql.dialect()))
+
+    Produces:
+
+    .. sourcecode:: sql
+
+        ARRAY[]::INTEGER[]
+
+    As required by PostgreSQL for empty arrays.
+
+    .. versionadded:: 2.0.40 added support to render empty PostgreSQL array
+       literals with a required cast.
+
     Multidimensional arrays are produced by nesting :class:`.array` constructs.
     The dimensionality of the final :class:`_types.ARRAY`
     type is calculated by
@@ -105,18 +154,33 @@ class array(expression.ExpressionClauseList[_T]):
     __visit_name__ = "array"
 
     stringify_dialect = "postgresql"
-    inherit_cache = True
 
-    def __init__(self, clauses, **kw):
-        type_arg = kw.pop("type_", None)
-        super().__init__(operators.comma_op, *clauses, **kw)
+    _traverse_internals: _TraverseInternalsType = [
+        ("clauses", InternalTraversal.dp_clauseelement_tuple),
+        ("type", InternalTraversal.dp_type),
+    ]
 
-        self._type_tuple = [arg.type for arg in self.clauses]
+    def __init__(
+        self,
+        clauses: Iterable[_T],
+        *,
+        type_: Optional[_TypeEngineArgument[_T]] = None,
+        **kw: typing_Any,
+    ):
+        r"""Construct an ARRAY literal.
+
+        :param clauses: iterable, such as a list, containing elements to be
+         rendered in the array
+        :param type\_: optional type.  If omitted, the type is inferred
+         from the contents of the array.
+
+        """
+        super().__init__(operators.comma_op, *clauses, **kw)
 
         main_type = (
-            type_arg
-            if type_arg is not None
-            else self._type_tuple[0] if self._type_tuple else sqltypes.NULLTYPE
+            type_
+            if type_ is not None
+            else self.clauses[0].type if self.clauses else sqltypes.NULLTYPE
         )
 
         if isinstance(main_type, ARRAY):
@@ -127,15 +191,21 @@ def __init__(self, clauses, **kw):
                     if main_type.dimensions is not None
                     else 2
                 ),
-            )
+            )  # type: ignore[assignment]
         else:
-            self.type = ARRAY(main_type)
+            self.type = ARRAY(main_type)  # type: ignore[assignment]
 
     @property
-    def _select_iterable(self):
+    def _select_iterable(self) -> _SelectIterable:
         return (self,)
 
-    def _bind_param(self, operator, obj, _assume_scalar=False, type_=None):
+    def _bind_param(
+        self,
+        operator: OperatorType,
+        obj: typing_Any,
+        type_: Optional[TypeEngine[_T]] = None,
+        _assume_scalar: bool = False,
+    ) -> BindParameter[_T]:
         if _assume_scalar or operator is operators.getitem:
             return expression.BindParameter(
                 None,
@@ -154,16 +224,18 @@ def _bind_param(self, operator, obj, _assume_scalar=False, type_=None):
                     )
                     for o in obj
                 ]
-            )
+            )  # type: ignore[return-value]
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> Union[Self, Grouping[_T]]:
         if against in (operators.any_op, operators.all_op, operators.getitem):
             return expression.Grouping(self)
         else:
             return self
 
 
-class ARRAY(sqltypes.ARRAY):
+class ARRAY(sqltypes.ARRAY[_T]):
     """PostgreSQL ARRAY type.
 
     The :class:`_postgresql.ARRAY` type is constructed in the same way
@@ -237,7 +309,7 @@ class SomeOrmClass(Base):
 
     def __init__(
         self,
-        item_type: _TypeEngineArgument[Any],
+        item_type: _TypeEngineArgument[_T],
         as_tuple: bool = False,
         dimensions: Optional[int] = None,
         zero_indexes: bool = False,
@@ -286,7 +358,7 @@ def __init__(
         self.dimensions = dimensions
         self.zero_indexes = zero_indexes
 
-    class Comparator(sqltypes.ARRAY.Comparator):
+    class Comparator(sqltypes.ARRAY.Comparator[_CT]):
         """Define comparison operations for :class:`_types.ARRAY`.
 
         Note that these operations are in addition to those provided
@@ -296,7 +368,9 @@ class Comparator(sqltypes.ARRAY.Comparator):
 
         """
 
-        def contains(self, other, **kwargs):
+        def contains(
+            self, other: typing_Any, **kwargs: typing_Any
+        ) -> ColumnElement[bool]:
             """Boolean expression.  Test if elements are a superset of the
             elements of the argument array expression.
 
@@ -305,7 +379,7 @@ def contains(self, other, **kwargs):
             """
             return self.operate(CONTAINS, other, result_type=sqltypes.Boolean)
 
-        def contained_by(self, other):
+        def contained_by(self, other: typing_Any) -> ColumnElement[bool]:
             """Boolean expression.  Test if elements are a proper subset of the
             elements of the argument array expression.
             """
@@ -313,7 +387,7 @@ def contained_by(self, other):
                 CONTAINED_BY, other, result_type=sqltypes.Boolean
             )
 
-        def overlap(self, other):
+        def overlap(self, other: typing_Any) -> ColumnElement[bool]:
             """Boolean expression.  Test if array has elements in common with
             an argument array expression.
             """
@@ -321,35 +395,26 @@ def overlap(self, other):
 
     comparator_factory = Comparator
 
-    @property
-    def hashable(self):
-        return self.as_tuple
-
-    @property
-    def python_type(self):
-        return list
-
-    def compare_values(self, x, y):
-        return x == y
-
     @util.memoized_property
-    def _against_native_enum(self):
+    def _against_native_enum(self) -> bool:
         return (
             isinstance(self.item_type, sqltypes.Enum)
             and self.item_type.native_enum
         )
 
-    def literal_processor(self, dialect):
+    def literal_processor(
+        self, dialect: Dialect
+    ) -> Optional[_LiteralProcessorType[_T]]:
         item_proc = self.item_type.dialect_impl(dialect).literal_processor(
             dialect
         )
         if item_proc is None:
             return None
 
-        def to_str(elements):
+        def to_str(elements: Iterable[typing_Any]) -> str:
             return f"ARRAY[{', '.join(elements)}]"
 
-        def process(value):
+        def process(value: Sequence[typing_Any]) -> str:
             inner = self._apply_item_processor(
                 value, item_proc, self.dimensions, to_str
             )
@@ -357,12 +422,16 @@ def process(value):
 
         return process
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> Optional[_BindProcessorType[Sequence[typing_Any]]]:
         item_proc = self.item_type.dialect_impl(dialect).bind_processor(
             dialect
         )
 
-        def process(value):
+        def process(
+            value: Optional[Sequence[typing_Any]],
+        ) -> Optional[list[typing_Any]]:
             if value is None:
                 return value
             else:
@@ -372,12 +441,16 @@ def process(value):
 
         return process
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> _ResultProcessorType[Sequence[typing_Any]]:
         item_proc = self.item_type.dialect_impl(dialect).result_processor(
             dialect, coltype
         )
 
-        def process(value):
+        def process(
+            value: Sequence[typing_Any],
+        ) -> Optional[Sequence[typing_Any]]:
             if value is None:
                 return value
             else:
@@ -392,11 +465,13 @@ def process(value):
             super_rp = process
             pattern = re.compile(r"^{(.*)}$")
 
-            def handle_raw_string(value):
-                inner = pattern.match(value).group(1)
+            def handle_raw_string(value: str) -> Sequence[Optional[str]]:
+                inner = pattern.match(value).group(1)  # type: ignore[union-attr]  # noqa: E501
                 return _split_enum_values(inner)
 
-            def process(value):
+            def process(
+                value: Sequence[typing_Any],
+            ) -> Optional[Sequence[typing_Any]]:
                 if value is None:
                     return value
                 # isinstance(value, str) is required to handle
@@ -411,10 +486,13 @@ def process(value):
         return process
 
 
-def _split_enum_values(array_string):
+def _split_enum_values(array_string: str) -> Sequence[Optional[str]]:
     if '"' not in array_string:
         # no escape char is present so it can just split on the comma
-        return array_string.split(",") if array_string else []
+        return [
+            r if r != "NULL" else None
+            for r in (array_string.split(",") if array_string else [])
+        ]
 
     # handles quoted strings from:
     # r'abc,"quoted","also\\\\quoted", "quoted, comma", "esc \" quot", qpr'
@@ -431,5 +509,11 @@ def _split_enum_values(array_string):
         elif in_quotes:
             result.append(tok.replace("_$ESC_QUOTE$_", '"'))
         else:
-            result.extend(re.findall(r"([^\s,]+),?", tok))
+            # interpret NULL (without quotes!) as None
+            result.extend(
+                [
+                    r if r != "NULL" else None
+                    for r in re.findall(r"([^\s,]+),?", tok)
+                ]
+            )
     return result
diff --git a/libs/sqlalchemy/dialects/postgresql/asyncpg.py b/libs/sqlalchemy/dialects/postgresql/asyncpg.py
index 523c47abcd..616bc467f1 100644
--- a/libs/sqlalchemy/dialects/postgresql/asyncpg.py
+++ b/libs/sqlalchemy/dialects/postgresql/asyncpg.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/asyncpg.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -205,6 +205,7 @@
 from ... import exc
 from ... import pool
 from ... import util
+from ...connectors.asyncio import AsyncAdapt_terminate
 from ...engine import AdaptedConnection
 from ...engine import processors
 from ...sql import sqltypes
@@ -490,6 +491,7 @@ class AsyncAdapt_asyncpg_cursor:
     )
 
     server_side = False
+    _awaitable_cursor_close: bool = False
 
     def __init__(self, adapt_connection):
         self._adapt_connection = adapt_connection
@@ -501,6 +503,9 @@ def __init__(self, adapt_connection):
         self.rowcount = -1
         self._invalidate_schema_cache_asof = 0
 
+    async def _async_soft_close(self) -> None:
+        return
+
     def close(self):
         self._rows.clear()
 
@@ -691,7 +696,7 @@ def executemany(self, operation, seq_of_parameters):
         )
 
 
-class AsyncAdapt_asyncpg_connection(AdaptedConnection):
+class AsyncAdapt_asyncpg_connection(AsyncAdapt_terminate, AdaptedConnection):
     __slots__ = (
         "dbapi",
         "isolation_level",
@@ -717,7 +722,7 @@ def __init__(
     ):
         self.dbapi = dbapi
         self._connection = connection
-        self.isolation_level = self._isolation_setting = "read_committed"
+        self.isolation_level = self._isolation_setting = None
         self.readonly = False
         self.deferrable = False
         self._transaction = None
@@ -814,7 +819,7 @@ def ping(self):
 
     async def _async_ping(self):
         if self._transaction is None and self.isolation_level != "autocommit":
-            # create a tranasction explicitly to support pgbouncer
+            # create a transaction explicitly to support pgbouncer
             # transaction mode.   See #10226
             tr = self._connection.transaction()
             await tr.start()
@@ -897,29 +902,18 @@ def close(self):
 
         self.await_(self._connection.close())
 
-    def terminate(self):
-        if util.concurrency.in_greenlet():
-            # in a greenlet; this is the connection was invalidated
-            # case.
-            try:
-                # try to gracefully close; see #10717
-                # timeout added in asyncpg 0.14.0 December 2017
-                self.await_(self._connection.close(timeout=2))
-            except (
-                asyncio.TimeoutError,
-                asyncio.CancelledError,
-                OSError,
-                self.dbapi.asyncpg.PostgresError,
-            ):
-                # in the case where we are recycling an old connection
-                # that may have already been disconnected, close() will
-                # fail with the above timeout.  in this case, terminate
-                # the connection without any further waiting.
-                # see issue #8419
-                self._connection.terminate()
-        else:
-            # not in a greenlet; this is the gc cleanup case
-            self._connection.terminate()
+    def _terminate_handled_exceptions(self):
+        return super()._terminate_handled_exceptions() + (
+            self.dbapi.asyncpg.PostgresError,
+        )
+
+    async def _terminate_graceful_close(self) -> None:
+        # timeout added in asyncpg 0.14.0 December 2017
+        await self._connection.close(timeout=2)
+        self._started = False
+
+    def _terminate_force_close(self) -> None:
+        self._connection.terminate()
         self._started = False
 
     @staticmethod
@@ -1114,6 +1108,9 @@ def get_isolation_level_values(self, dbapi_connection):
     def set_isolation_level(self, dbapi_connection, level):
         dbapi_connection.set_isolation_level(self._isolation_lookup[level])
 
+    def detect_autocommit_setting(self, dbapi_conn) -> bool:
+        return bool(dbapi_conn.autocommit)
+
     def set_readonly(self, connection, value):
         connection.readonly = value
 
diff --git a/libs/sqlalchemy/dialects/postgresql/base.py b/libs/sqlalchemy/dialects/postgresql/base.py
index 9bfaa277c8..a5a15bb361 100644
--- a/libs/sqlalchemy/dialects/postgresql/base.py
+++ b/libs/sqlalchemy/dialects/postgresql/base.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -266,7 +266,7 @@ def use_identity(element, compiler, **kw):
     from sqlalchemy import event
 
     postgresql_engine = create_engine(
-        "postgresql+pyscopg2://scott:tiger@hostname/dbname",
+        "postgresql+psycopg2://scott:tiger@hostname/dbname",
         # disable default reset-on-return scheme
         pool_reset_on_return=None,
     )
@@ -978,11 +978,18 @@ def set_search_path(dbapi_connection, connection_record):
 Several extensions to the :class:`.Index` construct are available, specific
 to the PostgreSQL dialect.
 
+.. _postgresql_covering_indexes:
+
 Covering Indexes
 ^^^^^^^^^^^^^^^^
 
-The ``postgresql_include`` option renders INCLUDE(colname) for the given
-string names::
+A covering index includes additional columns that are not part of the index key
+but are stored in the index, allowing PostgreSQL to satisfy queries using only
+the index without accessing the table (an "index-only scan").   This is
+indicated on the index using the ``INCLUDE`` clause.  The
+``postgresql_include`` option for :class:`.Index` (as well as
+:class:`.UniqueConstraint`) renders ``INCLUDE(colname)`` for the given string
+names::
 
     Index("my_index", table.c.x, postgresql_include=["y"])
 
@@ -990,7 +997,13 @@ def set_search_path(dbapi_connection, connection_record):
 
 Note that this feature requires PostgreSQL 11 or later.
 
-.. versionadded:: 1.4
+.. seealso::
+
+  :ref:`postgresql_constraint_options_include` - the same feature implemented
+  for :class:`.UniqueConstraint`
+
+.. versionadded:: 1.4 - support for covering indexes with :class:`.Index`.
+   support for :class:`.UniqueConstraint` was in 2.0.41
 
 .. _postgresql_partial_indexes:
 
@@ -1164,20 +1177,44 @@ def set_search_path(dbapi_connection, connection_record):
 ------------------------
 
 Several options for CREATE TABLE are supported directly by the PostgreSQL
-dialect in conjunction with the :class:`_schema.Table` construct:
+dialect in conjunction with the :class:`_schema.Table` construct, listed in
+the following sections.
+
+.. seealso::
+
+    `PostgreSQL CREATE TABLE options
+    <https://www.postgresql.org/docs/current/static/sql-createtable.html>`_ -
+    in the PostgreSQL documentation.
+
+``INHERITS``
+^^^^^^^^^^^^
+
+Specifies one or more parent tables from which this table inherits columns and
+constraints, enabling table inheritance hierarchies in PostgreSQL.
 
-* ``INHERITS``::
+::
 
     Table("some_table", metadata, ..., postgresql_inherits="some_supertable")
 
     Table("some_table", metadata, ..., postgresql_inherits=("t1", "t2", ...))
 
-* ``ON COMMIT``::
+``ON COMMIT``
+^^^^^^^^^^^^^
+
+Controls the behavior of temporary tables at transaction commit, with options
+to preserve rows, delete rows, or drop the table.
+
+::
 
     Table("some_table", metadata, ..., postgresql_on_commit="PRESERVE ROWS")
 
-*
-  ``PARTITION BY``::
+``PARTITION BY``
+^^^^^^^^^^^^^^^^
+
+Declares the table as a partitioned table using the specified partitioning
+strategy (RANGE, LIST, or HASH) on the given column(s).
+
+::
 
     Table(
         "some_table",
@@ -1186,83 +1223,172 @@ def set_search_path(dbapi_connection, connection_record):
         postgresql_partition_by="LIST (part_column)",
     )
 
-  .. versionadded:: 1.2.6
+``TABLESPACE``
+^^^^^^^^^^^^^^
+
+Specifies the tablespace where the table will be stored, allowing control over
+the physical location of table data on disk.
 
-*
-  ``TABLESPACE``::
+::
 
     Table("some_table", metadata, ..., postgresql_tablespace="some_tablespace")
 
-  The above option is also available on the :class:`.Index` construct.
+The above option is also available on the :class:`.Index` construct.
 
-*
-  ``USING``::
+``USING``
+^^^^^^^^^
+
+Specifies the table access method to use for storing table data, such as
+``heap`` (the default) or other custom access methods.
+
+::
 
     Table("some_table", metadata, ..., postgresql_using="heap")
 
-  .. versionadded:: 2.0.26
+.. versionadded:: 2.0.26
+
+``WITH OIDS``
+^^^^^^^^^^^^^
+
+Enables the legacy OID (object identifier) system column for the table, which
+assigns a unique identifier to each row.
 
-* ``WITH OIDS``::
+::
 
     Table("some_table", metadata, ..., postgresql_with_oids=True)
 
-* ``WITHOUT OIDS``::
+``WITHOUT OIDS``
+^^^^^^^^^^^^^^^^
 
-    Table("some_table", metadata, ..., postgresql_with_oids=False)
+Explicitly disables the OID system column for the table (the default behavior
+in modern PostgreSQL versions).
 
-.. seealso::
+::
 
-    `PostgreSQL CREATE TABLE options
-    <https://www.postgresql.org/docs/current/static/sql-createtable.html>`_ -
-    in the PostgreSQL documentation.
+    Table("some_table", metadata, ..., postgresql_with_oids=False)
 
 .. _postgresql_constraint_options:
 
 PostgreSQL Constraint Options
 -----------------------------
 
-The following option(s) are supported by the PostgreSQL dialect in conjunction
-with selected constraint constructs:
-
-* ``NOT VALID``:  This option applies towards CHECK and FOREIGN KEY constraints
-  when the constraint is being added to an existing table via ALTER TABLE,
-  and has the effect that existing rows are not scanned during the ALTER
-  operation against the constraint being added.
-
-  When using a SQL migration tool such as `Alembic <https://alembic.sqlalchemy.org>`_
-  that renders ALTER TABLE constructs, the ``postgresql_not_valid`` argument
-  may be specified as an additional keyword argument within the operation
-  that creates the constraint, as in the following Alembic example::
-
-        def update():
-            op.create_foreign_key(
-                "fk_user_address",
-                "address",
-                "user",
-                ["user_id"],
-                ["id"],
-                postgresql_not_valid=True,
-            )
+The following sections indicate options which are supported by the PostgreSQL
+dialect in conjunction with selected constraint constructs.
 
-  The keyword is ultimately accepted directly by the
-  :class:`_schema.CheckConstraint`, :class:`_schema.ForeignKeyConstraint`
-  and :class:`_schema.ForeignKey` constructs; when using a tool like
-  Alembic, dialect-specific keyword arguments are passed through to
-  these constructs from the migration operation directives::
 
-       CheckConstraint("some_field IS NOT NULL", postgresql_not_valid=True)
+``NOT VALID``
+^^^^^^^^^^^^^
 
-       ForeignKeyConstraint(
-           ["some_id"], ["some_table.some_id"], postgresql_not_valid=True
-       )
+Allows a constraint to be added without validating existing rows, improving
+performance when adding constraints to large tables. This option applies
+towards CHECK and FOREIGN KEY constraints when the constraint is being added
+to an existing table via ALTER TABLE, and has the effect that existing rows
+are not scanned during the ALTER operation against the constraint being added.
+
+When using a SQL migration tool such as `Alembic <https://alembic.sqlalchemy.org>`_
+that renders ALTER TABLE constructs, the ``postgresql_not_valid`` argument
+may be specified as an additional keyword argument within the operation
+that creates the constraint, as in the following Alembic example::
+
+      def update():
+          op.create_foreign_key(
+              "fk_user_address",
+              "address",
+              "user",
+              ["user_id"],
+              ["id"],
+              postgresql_not_valid=True,
+          )
+
+The keyword is ultimately accepted directly by the
+:class:`_schema.CheckConstraint`, :class:`_schema.ForeignKeyConstraint`
+and :class:`_schema.ForeignKey` constructs; when using a tool like
+Alembic, dialect-specific keyword arguments are passed through to
+these constructs from the migration operation directives::
+
+     CheckConstraint("some_field IS NOT NULL", postgresql_not_valid=True)
+
+     ForeignKeyConstraint(
+         ["some_id"], ["some_table.some_id"], postgresql_not_valid=True
+     )
+
+.. versionadded:: 1.4.32
+
+.. seealso::
+
+    `PostgreSQL ALTER TABLE options
+    <https://www.postgresql.org/docs/current/static/sql-altertable.html>`_ -
+    in the PostgreSQL documentation.
+
+.. _postgresql_constraint_options_include:
+
+``INCLUDE``
+^^^^^^^^^^^
 
-  .. versionadded:: 1.4.32
+This keyword is applicable to both a ``UNIQUE`` constraint as well as an
+``INDEX``. The ``postgresql_include`` option available for
+:class:`.UniqueConstraint` as well as :class:`.Index` creates a covering index
+by including additional columns in the underlying index without making them
+part of the key constraint. This option adds one or more columns as a "payload"
+to the index created automatically by PostgreSQL for the constraint. For
+example, the following table definition::
 
-  .. seealso::
+    Table(
+        "mytable",
+        metadata,
+        Column("id", Integer, nullable=False),
+        Column("value", Integer, nullable=False),
+        UniqueConstraint("id", postgresql_include=["value"]),
+    )
+
+would produce the DDL statement
+
+.. sourcecode:: sql
+
+     CREATE TABLE mytable (
+         id INTEGER NOT NULL,
+         value INTEGER NOT NULL,
+         UNIQUE (id) INCLUDE (value)
+      )
+
+Note that this feature requires PostgreSQL 11 or later.
+
+.. versionadded:: 2.0.41 - added support for ``postgresql_include`` to
+   :class:`.UniqueConstraint`, to complement the existing feature in
+   :class:`.Index`.
+
+.. seealso::
+
+    :ref:`postgresql_covering_indexes` - background on ``postgresql_include``
+    for the :class:`.Index` construct.
+
+
+Column list with foreign key ``ON DELETE SET`` actions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Allows selective column updates when a foreign key action is triggered, limiting
+which columns are set to NULL or DEFAULT upon deletion of a referenced row.
+This applies to :class:`.ForeignKey` and :class:`.ForeignKeyConstraint`, the
+:paramref:`.ForeignKey.ondelete` parameter will accept on the PostgreSQL
+backend only a string list of column names inside parenthesis, following the
+``SET NULL`` or ``SET DEFAULT`` phrases, which will limit the set of columns
+that are subject to the action::
+
+      fktable = Table(
+          "fktable",
+          metadata,
+          Column("tid", Integer),
+          Column("id", Integer),
+          Column("fk_id_del_set_null", Integer),
+          ForeignKeyConstraint(
+              columns=["tid", "fk_id_del_set_null"],
+              refcolumns=[pktable.c.tid, pktable.c.id],
+              ondelete="SET NULL (fk_id_del_set_null)",
+          ),
+      )
+
+.. versionadded:: 2.0.40
 
-      `PostgreSQL ALTER TABLE options
-      <https://www.postgresql.org/docs/current/static/sql-altertable.html>`_ -
-      in the PostgreSQL documentation.
 
 .. _postgresql_table_valued_overview:
 
@@ -1482,6 +1608,7 @@ def update():
 import re
 from typing import Any
 from typing import cast
+from typing import Dict
 from typing import List
 from typing import Optional
 from typing import Tuple
@@ -1545,6 +1672,7 @@ def update():
 from ...sql import compiler
 from ...sql import elements
 from ...sql import expression
+from ...sql import functions
 from ...sql import roles
 from ...sql import sqltypes
 from ...sql import util as sql_util
@@ -1672,6 +1800,7 @@ def update():
     "verbose",
 }
 
+
 colspecs = {
     sqltypes.ARRAY: _array.ARRAY,
     sqltypes.Interval: INTERVAL,
@@ -1788,6 +1917,8 @@ def render_bind_cast(self, type_, dbapi_type, sqltext):
         }"""
 
     def visit_array(self, element, **kw):
+        if not element.clauses and not element.type.item_type._isnull:
+            return "ARRAY[]::%s" % element.type.compile(self.dialect)
         return "ARRAY[%s]" % self.visit_clauselist(element, **kw)
 
     def visit_slice(self, element, **kw):
@@ -1811,9 +1942,27 @@ def visit_json_getitem_op_binary(
 
         kw["eager_grouping"] = True
 
-        return self._generate_generic_binary(
-            binary, " -> " if not _cast_applied else " ->> ", **kw
-        )
+        if (
+            not _cast_applied
+            and isinstance(binary.left.type, _json.JSONB)
+            and self.dialect._supports_jsonb_subscripting
+        ):
+            left = binary.left
+            if isinstance(left, (functions.FunctionElement, elements.Cast)):
+                left = elements.Grouping(left)
+
+            # for pg14+JSONB use subscript notation: col['key'] instead
+            # of col -> 'key'
+            return "%s[%s]" % (
+                self.process(left, **kw),
+                self.process(binary.right, **kw),
+            )
+        else:
+            # Fall back to arrow notation for older versions or when cast
+            # is applied
+            return self._generate_generic_binary(
+                binary, " -> " if not _cast_applied else " ->> ", **kw
+            )
 
     def visit_json_path_getitem_op_binary(
         self, binary, operator, _cast_applied=False, **kw
@@ -2001,9 +2150,10 @@ def for_update_clause(self, select, **kw):
             for c in select._for_update_arg.of:
                 tables.update(sql_util.surface_selectables_only(c))
 
+            of_kw = dict(kw)
+            of_kw.update(ashint=True, use_schema=False)
             tmp += " OF " + ", ".join(
-                self.process(table, ashint=True, use_schema=False, **kw)
-                for table in tables
+                self.process(table, **of_kw) for table in tables
             )
 
         if select._for_update_arg.nowait:
@@ -2045,10 +2195,11 @@ def _on_conflict_target(self, clause, **kw):
                 for c in clause.inferred_target_elements
             )
             if clause.inferred_target_whereclause is not None:
+                whereclause_kw = dict(kw)
+                whereclause_kw.update(include_table=False, use_schema=False)
                 target_text += " WHERE %s" % self.process(
                     clause.inferred_target_whereclause,
-                    include_table=False,
-                    use_schema=False,
+                    **whereclause_kw,
                 )
         else:
             target_text = ""
@@ -2075,6 +2226,8 @@ def visit_on_conflict_do_update(self, on_conflict, **kw):
 
         insert_statement = self.stack[-1]["selectable"]
         cols = insert_statement.table.c
+        set_kw = dict(kw)
+        set_kw.update(use_schema=False)
         for c in cols:
             col_key = c.key
 
@@ -2097,7 +2250,9 @@ def visit_on_conflict_do_update(self, on_conflict, **kw):
                 ):
                     value = value._clone()
                     value.type = c.type
-            value_text = self.process(value.self_group(), use_schema=False)
+            value_text = self.process(
+                value.self_group(), is_upsert_set=True, **set_kw
+            )
 
             key_text = self.preparer.quote(c.name)
             action_set_ops.append("%s = %s" % (key_text, value_text))
@@ -2120,14 +2275,17 @@ def visit_on_conflict_do_update(self, on_conflict, **kw):
                 )
                 value_text = self.process(
                     coercions.expect(roles.ExpressionElementRole, v),
-                    use_schema=False,
+                    is_upsert_set=True,
+                    **set_kw,
                 )
                 action_set_ops.append("%s = %s" % (key_text, value_text))
 
         action_text = ", ".join(action_set_ops)
         if clause.update_whereclause is not None:
+            where_kw = dict(kw)
+            where_kw.update(include_table=True, use_schema=False)
             action_text += " WHERE %s" % self.process(
-                clause.update_whereclause, include_table=True, use_schema=False
+                clause.update_whereclause, **where_kw
             )
 
         return "ON CONFLICT %s DO UPDATE SET %s" % (target_text, action_text)
@@ -2232,6 +2390,18 @@ def _define_constraint_validity(self, constraint):
         not_valid = constraint.dialect_options["postgresql"]["not_valid"]
         return " NOT VALID" if not_valid else ""
 
+    def _define_include(self, obj):
+        includeclause = obj.dialect_options["postgresql"]["include"]
+        if not includeclause:
+            return ""
+        inclusions = [
+            obj.table.c[col] if isinstance(col, str) else col
+            for col in includeclause
+        ]
+        return " INCLUDE (%s)" % ", ".join(
+            [self.preparer.quote(c.name) for c in inclusions]
+        )
+
     def visit_check_constraint(self, constraint, **kw):
         if constraint._type_bound:
             typ = list(constraint.columns)[0].type
@@ -2255,6 +2425,35 @@ def visit_foreign_key_constraint(self, constraint, **kw):
         text += self._define_constraint_validity(constraint)
         return text
 
+    def visit_primary_key_constraint(self, constraint, **kw):
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_primary_key_body(constraint, **kw)
+        text += self._define_include(constraint)
+        text += self.define_constraint_deferrability(constraint)
+        return text
+
+    def visit_unique_constraint(self, constraint, **kw):
+        if len(constraint) == 0:
+            return ""
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_unique_body(constraint, **kw)
+        text += self._define_include(constraint)
+        text += self.define_constraint_deferrability(constraint)
+        return text
+
+    @util.memoized_property
+    def _fk_ondelete_pattern(self):
+        return re.compile(
+            r"^(?:RESTRICT|CASCADE|SET (?:NULL|DEFAULT)(?:\s*\(.+\))?"
+            r"|NO ACTION)$",
+            re.I,
+        )
+
+    def define_constraint_ondelete_cascade(self, constraint):
+        return " ON DELETE %s" % self.preparer.validate_sql_phrase(
+            constraint.ondelete, self._fk_ondelete_pattern
+        )
+
     def visit_create_enum_type(self, create, **kw):
         type_ = create.element
 
@@ -2356,15 +2555,7 @@ def visit_create_index(self, create, **kw):
             )
         )
 
-        includeclause = index.dialect_options["postgresql"]["include"]
-        if includeclause:
-            inclusions = [
-                index.table.c[col] if isinstance(col, str) else col
-                for col in includeclause
-            ]
-            text += " INCLUDE (%s)" % ", ".join(
-                [preparer.quote(c.name) for c in inclusions]
-            )
+        text += self._define_include(index)
 
         nulls_not_distinct = index.dialect_options["postgresql"][
             "nulls_not_distinct"
@@ -2850,8 +3041,8 @@ def get_domains(
             * nullable - Indicates if this domain can be ``NULL``.
             * default - The default value of the domain or ``None`` if the
               domain has no default.
-            * constraints - A list of dict wit the constraint defined by this
-              domain. Each element constaints two keys: ``name`` of the
+            * constraints - A list of dict with the constraint defined by this
+              domain. Each element contains two keys: ``name`` of the
               constraint and ``check`` with the constraint text.
 
         :param schema: schema name.  If None, the default schema
@@ -3112,9 +3303,16 @@ class PGDialect(default.DefaultDialect):
                 "not_valid": False,
             },
         ),
+        (
+            schema.PrimaryKeyConstraint,
+            {"include": None},
+        ),
         (
             schema.UniqueConstraint,
-            {"nulls_not_distinct": None},
+            {
+                "include": None,
+                "nulls_not_distinct": None,
+            },
         ),
     ]
 
@@ -3123,6 +3321,7 @@ class PGDialect(default.DefaultDialect):
     _backslash_escapes = True
     _supports_create_index_concurrently = True
     _supports_drop_index_concurrently = True
+    _supports_jsonb_subscripting = True
 
     def __init__(
         self,
@@ -3151,6 +3350,8 @@ def initialize(self, connection):
         )
         self.supports_identity_columns = self.server_version_info >= (10,)
 
+        self._supports_jsonb_subscripting = self.server_version_info >= (14,)
+
     def get_isolation_level_values(self, dbapi_conn):
         # note the generic dialect doesn't have AUTOCOMMIT, however
         # all postgresql dialects should include AUTOCOMMIT.
@@ -3601,6 +3802,7 @@ def _columns_query(self, schema, has_filter_names, scope, kind):
                         pg_catalog.pg_sequence.c.seqcache,
                         "cycle",
                         pg_catalog.pg_sequence.c.seqcycle,
+                        type_=sqltypes.JSON(),
                     )
                 )
                 .select_from(pg_catalog.pg_sequence)
@@ -3653,6 +3855,32 @@ def _columns_query(self, schema, has_filter_names, scope, kind):
             .scalar_subquery()
             .label("default")
         )
+
+        # get the name of the collate when it's different from the default one
+        collate = sql.case(
+            (
+                sql.and_(
+                    pg_catalog.pg_attribute.c.attcollation != 0,
+                    select(pg_catalog.pg_type.c.typcollation)
+                    .where(
+                        pg_catalog.pg_type.c.oid
+                        == pg_catalog.pg_attribute.c.atttypid,
+                    )
+                    .correlate(pg_catalog.pg_attribute)
+                    .scalar_subquery()
+                    != pg_catalog.pg_attribute.c.attcollation,
+                ),
+                select(pg_catalog.pg_collation.c.collname)
+                .where(
+                    pg_catalog.pg_collation.c.oid
+                    == pg_catalog.pg_attribute.c.attcollation
+                )
+                .correlate(pg_catalog.pg_attribute)
+                .scalar_subquery(),
+            ),
+            else_=sql.null(),
+        ).label("collation")
+
         relkinds = self._kind_to_relkinds(kind)
         query = (
             select(
@@ -3667,6 +3895,7 @@ def _columns_query(self, schema, has_filter_names, scope, kind):
                 pg_catalog.pg_description.c.description.label("comment"),
                 generated,
                 identity,
+                collate,
             )
             .select_from(pg_catalog.pg_class)
             # NOTE: postgresql support table with no user column, meaning
@@ -3742,9 +3971,10 @@ def get_multi_columns(
     def _reflect_type(
         self,
         format_type: Optional[str],
-        domains: dict[str, ReflectedDomain],
-        enums: dict[str, ReflectedEnum],
+        domains: Dict[str, ReflectedDomain],
+        enums: Dict[str, ReflectedEnum],
         type_description: str,
+        collation: Optional[str],
     ) -> sqltypes.TypeEngine[Any]:
         """
         Attempts to reconstruct a column type defined in ischema_names based
@@ -3813,7 +4043,8 @@ def _reflect_type(
                 charlen = int(attype_args[0])
                 args = (charlen,)
 
-        elif attype.startswith("interval"):
+        # a domain or enum can start with interval, so be mindful of that.
+        elif attype == "interval" or attype.startswith("interval "):
             schema_type = INTERVAL
 
             field_match = re.match(r"interval (.+)", attype)
@@ -3830,7 +4061,6 @@ def _reflect_type(
                 schema_type = ENUM
                 enum = enums[enum_or_domain_key]
 
-                args = tuple(enum["labels"])
                 kwargs["name"] = enum["name"]
 
                 if not enum["visible"]:
@@ -3845,6 +4075,7 @@ def _reflect_type(
                     domains,
                     enums,
                     type_description="DOMAIN '%s'" % domain["name"],
+                    collation=domain["collation"],
                 )
                 args = (domain["name"], data_type)
 
@@ -3877,6 +4108,9 @@ def _reflect_type(
             )
             return sqltypes.NULLTYPE
 
+        if collation is not None:
+            kwargs["collation"] = collation
+
         data_type = schema_type(*args, **kwargs)
         if array_dim >= 1:
             # postgres does not preserve dimensionality or size of array types.
@@ -3895,11 +4129,14 @@ def _get_columns_info(self, rows, domains, enums, schema):
                 continue
             table_cols = columns[(schema, row_dict["table_name"])]
 
+            collation = row_dict["collation"]
+
             coltype = self._reflect_type(
                 row_dict["format_type"],
                 domains,
                 enums,
                 type_description="column '%s'" % row_dict["name"],
+                collation=collation,
             )
 
             default = row_dict["default"]
@@ -3910,7 +4147,7 @@ def _get_columns_info(self, rows, domains, enums, schema):
             if isinstance(coltype, DOMAIN):
                 if not default:
                     # domain can override the default value but
-                    # cant set it to None
+                    # can't set it to None
                     if coltype.default is not None:
                         default = coltype.default
 
@@ -3995,21 +4232,35 @@ def _get_table_oids(
         result = connection.execute(oid_q, params)
         return result.all()
 
-    @lru_cache()
-    def _constraint_query(self, is_unique):
+    @util.memoized_property
+    def _constraint_query(self):
+        if self.server_version_info >= (11, 0):
+            indnkeyatts = pg_catalog.pg_index.c.indnkeyatts
+        else:
+            indnkeyatts = pg_catalog.pg_index.c.indnatts.label("indnkeyatts")
+
+        if self.server_version_info >= (15,):
+            indnullsnotdistinct = pg_catalog.pg_index.c.indnullsnotdistinct
+        else:
+            indnullsnotdistinct = sql.false().label("indnullsnotdistinct")
+
         con_sq = (
             select(
                 pg_catalog.pg_constraint.c.conrelid,
                 pg_catalog.pg_constraint.c.conname,
-                pg_catalog.pg_constraint.c.conindid,
-                sql.func.unnest(pg_catalog.pg_constraint.c.conkey).label(
-                    "attnum"
-                ),
+                sql.func.unnest(pg_catalog.pg_index.c.indkey).label("attnum"),
                 sql.func.generate_subscripts(
-                    pg_catalog.pg_constraint.c.conkey, 1
+                    pg_catalog.pg_index.c.indkey, 1
                 ).label("ord"),
+                indnkeyatts,
+                indnullsnotdistinct,
                 pg_catalog.pg_description.c.description,
             )
+            .join(
+                pg_catalog.pg_index,
+                pg_catalog.pg_constraint.c.conindid
+                == pg_catalog.pg_index.c.indexrelid,
+            )
             .outerjoin(
                 pg_catalog.pg_description,
                 pg_catalog.pg_description.c.objoid
@@ -4018,6 +4269,9 @@ def _constraint_query(self, is_unique):
             .where(
                 pg_catalog.pg_constraint.c.contype == bindparam("contype"),
                 pg_catalog.pg_constraint.c.conrelid.in_(bindparam("oids")),
+                # NOTE: filtering also on pg_index.indrelid for oids does
+                # not seem to have a performance effect, but it may be an
+                # option if perf problems are reported
             )
             .subquery("con")
         )
@@ -4026,9 +4280,10 @@ def _constraint_query(self, is_unique):
             select(
                 con_sq.c.conrelid,
                 con_sq.c.conname,
-                con_sq.c.conindid,
                 con_sq.c.description,
                 con_sq.c.ord,
+                con_sq.c.indnkeyatts,
+                con_sq.c.indnullsnotdistinct,
                 pg_catalog.pg_attribute.c.attname,
             )
             .select_from(pg_catalog.pg_attribute)
@@ -4045,13 +4300,13 @@ def _constraint_query(self, is_unique):
                 # a sequential scan of pg_attribute.
                 # The condition in the con_sq subquery is not actually needed
                 # in pg15, but it may be needed in older versions. Keeping it
-                # does not seems to have any inpact in any case.
+                # does not seems to have any impact in any case.
                 con_sq.c.conrelid.in_(bindparam("oids"))
             )
             .subquery("attr")
         )
 
-        constraint_query = (
+        return (
             select(
                 attr_sq.c.conrelid,
                 sql.func.array_agg(
@@ -4063,31 +4318,15 @@ def _constraint_query(self, is_unique):
                 ).label("cols"),
                 attr_sq.c.conname,
                 sql.func.min(attr_sq.c.description).label("description"),
+                sql.func.min(attr_sq.c.indnkeyatts).label("indnkeyatts"),
+                sql.func.bool_and(attr_sq.c.indnullsnotdistinct).label(
+                    "indnullsnotdistinct"
+                ),
             )
             .group_by(attr_sq.c.conrelid, attr_sq.c.conname)
             .order_by(attr_sq.c.conrelid, attr_sq.c.conname)
         )
 
-        if is_unique:
-            if self.server_version_info >= (15,):
-                constraint_query = constraint_query.join(
-                    pg_catalog.pg_index,
-                    attr_sq.c.conindid == pg_catalog.pg_index.c.indexrelid,
-                ).add_columns(
-                    sql.func.bool_and(
-                        pg_catalog.pg_index.c.indnullsnotdistinct
-                    ).label("indnullsnotdistinct")
-                )
-            else:
-                constraint_query = constraint_query.add_columns(
-                    sql.false().label("indnullsnotdistinct")
-                )
-        else:
-            constraint_query = constraint_query.add_columns(
-                sql.null().label("extra")
-            )
-        return constraint_query
-
     def _reflect_constraint(
         self, connection, contype, schema, filter_names, scope, kind, **kw
     ):
@@ -4103,26 +4342,42 @@ def _reflect_constraint(
             batches[0:3000] = []
 
             result = connection.execute(
-                self._constraint_query(is_unique),
+                self._constraint_query,
                 {"oids": [r[0] for r in batch], "contype": contype},
-            )
+            ).mappings()
 
             result_by_oid = defaultdict(list)
-            for oid, cols, constraint_name, comment, extra in result:
-                result_by_oid[oid].append(
-                    (cols, constraint_name, comment, extra)
-                )
+            for row_dict in result:
+                result_by_oid[row_dict["conrelid"]].append(row_dict)
 
             for oid, tablename in batch:
                 for_oid = result_by_oid.get(oid, ())
                 if for_oid:
-                    for cols, constraint, comment, extra in for_oid:
-                        if is_unique:
-                            yield tablename, cols, constraint, comment, {
-                                "nullsnotdistinct": extra
-                            }
+                    for row in for_oid:
+                        # See note in get_multi_indexes
+                        all_cols = row["cols"]
+                        indnkeyatts = row["indnkeyatts"]
+                        if len(all_cols) > indnkeyatts:
+                            inc_cols = all_cols[indnkeyatts:]
+                            cst_cols = all_cols[:indnkeyatts]
                         else:
-                            yield tablename, cols, constraint, comment, None
+                            inc_cols = []
+                            cst_cols = all_cols
+
+                        opts = {}
+                        if self.server_version_info >= (11,):
+                            opts["postgresql_include"] = inc_cols
+                        if is_unique:
+                            opts["postgresql_nulls_not_distinct"] = row[
+                                "indnullsnotdistinct"
+                            ]
+                        yield (
+                            tablename,
+                            cst_cols,
+                            row["conname"],
+                            row["description"],
+                            opts,
+                        )
                 else:
                     yield tablename, None, None, None, None
 
@@ -4148,20 +4403,27 @@ def get_multi_pk_constraint(
         # only a single pk can be present for each table. Return an entry
         # even if a table has no primary key
         default = ReflectionDefaults.pk_constraint
+
+        def pk_constraint(pk_name, cols, comment, opts):
+            info = {
+                "constrained_columns": cols,
+                "name": pk_name,
+                "comment": comment,
+            }
+            if opts:
+                info["dialect_options"] = opts
+            return info
+
         return (
             (
                 (schema, table_name),
                 (
-                    {
-                        "constrained_columns": [] if cols is None else cols,
-                        "name": pk_name,
-                        "comment": comment,
-                    }
+                    pk_constraint(pk_name, cols, comment, opts)
                     if pk_name is not None
                     else default()
                 ),
             )
-            for table_name, cols, pk_name, comment, _ in result
+            for table_name, cols, pk_name, comment, opts in result
         )
 
     @reflection.cache
@@ -4245,21 +4507,66 @@ def _foreing_key_query(self, schema, has_filter_names, scope, kind):
     @util.memoized_property
     def _fk_regex_pattern(self):
         # optionally quoted token
-        qtoken = '(?:"[^"]+"|[A-Za-z0-9_]+?)'
+        qtoken = r'(?:"[^"]+"|[\w]+?)'
 
         # https://www.postgresql.org/docs/current/static/sql-createtable.html
         return re.compile(
             r"FOREIGN KEY \((.*?)\) "
             rf"REFERENCES (?:({qtoken})\.)?({qtoken})\(((?:{qtoken}(?: *, *)?)+)\)"  # noqa: E501
             r"[\s]?(MATCH (FULL|PARTIAL|SIMPLE)+)?"
-            r"[\s]?(ON UPDATE "
-            r"(CASCADE|RESTRICT|NO ACTION|SET NULL|SET DEFAULT)+)?"
-            r"[\s]?(ON DELETE "
-            r"(CASCADE|RESTRICT|NO ACTION|SET NULL|SET DEFAULT)+)?"
+            r"[\s]?(?:ON (UPDATE|DELETE) "
+            r"(CASCADE|RESTRICT|NO ACTION|"
+            r"SET (?:NULL|DEFAULT)(?:\s\(.+\))?)+)?"
+            r"[\s]?(?:ON (UPDATE|DELETE) "
+            r"(CASCADE|RESTRICT|NO ACTION|"
+            r"SET (?:NULL|DEFAULT)(?:\s\(.+\))?)+)?"
             r"[\s]?(DEFERRABLE|NOT DEFERRABLE)?"
             r"[\s]?(INITIALLY (DEFERRED|IMMEDIATE)+)?"
         )
 
+    def _parse_fk(self, condef):
+        FK_REGEX = self._fk_regex_pattern
+        m = re.search(FK_REGEX, condef).groups()
+
+        (
+            constrained_columns,
+            referred_schema,
+            referred_table,
+            referred_columns,
+            _,
+            match,
+            upddelkey1,
+            upddelval1,
+            upddelkey2,
+            upddelval2,
+            deferrable,
+            _,
+            initially,
+        ) = m
+
+        onupdate = (
+            upddelval1
+            if upddelkey1 == "UPDATE"
+            else upddelval2 if upddelkey2 == "UPDATE" else None
+        )
+        ondelete = (
+            upddelval1
+            if upddelkey1 == "DELETE"
+            else upddelval2 if upddelkey2 == "DELETE" else None
+        )
+
+        return (
+            constrained_columns,
+            referred_schema,
+            referred_table,
+            referred_columns,
+            match,
+            onupdate,
+            ondelete,
+            deferrable,
+            initially,
+        )
+
     def get_multi_foreign_keys(
         self,
         connection,
@@ -4276,8 +4583,6 @@ def get_multi_foreign_keys(
         query = self._foreing_key_query(schema, has_filter_names, scope, kind)
         result = connection.execute(query, params)
 
-        FK_REGEX = self._fk_regex_pattern
-
         fkeys = defaultdict(list)
         default = ReflectionDefaults.foreign_keys
         for table_name, conname, condef, conschema, comment in result:
@@ -4287,23 +4592,18 @@ def get_multi_foreign_keys(
                 fkeys[(schema, table_name)] = default()
                 continue
             table_fks = fkeys[(schema, table_name)]
-            m = re.search(FK_REGEX, condef).groups()
 
             (
                 constrained_columns,
                 referred_schema,
                 referred_table,
                 referred_columns,
-                _,
                 match,
-                _,
                 onupdate,
-                _,
                 ondelete,
                 deferrable,
-                _,
                 initially,
-            ) = m
+            ) = self._parse_fk(condef)
 
             if deferrable is not None:
                 deferrable = True if deferrable == "DEFERRABLE" else False
@@ -4371,7 +4671,10 @@ def get_indexes(self, connection, table_name, schema=None, **kw):
 
     @util.memoized_property
     def _index_query(self):
-        pg_class_index = pg_catalog.pg_class.alias("cls_idx")
+        # NOTE: pg_index is used as from two times to improve performance,
+        # since extraing all the index information from `idx_sq` to avoid
+        # the second pg_index use leads to a worse performing query in
+        # particular when querying for a single table (as of pg 17)
         # NOTE: repeating oids clause improve query performance
 
         # subquery to get the columns
@@ -4380,6 +4683,9 @@ def _index_query(self):
                 pg_catalog.pg_index.c.indexrelid,
                 pg_catalog.pg_index.c.indrelid,
                 sql.func.unnest(pg_catalog.pg_index.c.indkey).label("attnum"),
+                sql.func.unnest(pg_catalog.pg_index.c.indclass).label(
+                    "att_opclass"
+                ),
                 sql.func.generate_subscripts(
                     pg_catalog.pg_index.c.indkey, 1
                 ).label("ord"),
@@ -4411,6 +4717,8 @@ def _index_query(self):
                     else_=pg_catalog.pg_attribute.c.attname.cast(TEXT),
                 ).label("element"),
                 (idx_sq.c.attnum == 0).label("is_expr"),
+                pg_catalog.pg_opclass.c.opcname,
+                pg_catalog.pg_opclass.c.opcdefault,
             )
             .select_from(idx_sq)
             .outerjoin(
@@ -4421,6 +4729,10 @@ def _index_query(self):
                     pg_catalog.pg_attribute.c.attrelid == idx_sq.c.indrelid,
                 ),
             )
+            .outerjoin(
+                pg_catalog.pg_opclass,
+                pg_catalog.pg_opclass.c.oid == idx_sq.c.att_opclass,
+            )
             .where(idx_sq.c.indrelid.in_(bindparam("oids")))
             .subquery("idx_attr")
         )
@@ -4435,6 +4747,12 @@ def _index_query(self):
                 sql.func.array_agg(
                     aggregate_order_by(attr_sq.c.is_expr, attr_sq.c.ord)
                 ).label("elements_is_expr"),
+                sql.func.array_agg(
+                    aggregate_order_by(attr_sq.c.opcname, attr_sq.c.ord)
+                ).label("elements_opclass"),
+                sql.func.array_agg(
+                    aggregate_order_by(attr_sq.c.opcdefault, attr_sq.c.ord)
+                ).label("elements_opdefault"),
             )
             .group_by(attr_sq.c.indexrelid)
             .subquery("idx_cols")
@@ -4443,7 +4761,7 @@ def _index_query(self):
         if self.server_version_info >= (11, 0):
             indnkeyatts = pg_catalog.pg_index.c.indnkeyatts
         else:
-            indnkeyatts = sql.null().label("indnkeyatts")
+            indnkeyatts = pg_catalog.pg_index.c.indnatts.label("indnkeyatts")
 
         if self.server_version_info >= (15,):
             nulls_not_distinct = pg_catalog.pg_index.c.indnullsnotdistinct
@@ -4453,13 +4771,13 @@ def _index_query(self):
         return (
             select(
                 pg_catalog.pg_index.c.indrelid,
-                pg_class_index.c.relname.label("relname_index"),
+                pg_catalog.pg_class.c.relname,
                 pg_catalog.pg_index.c.indisunique,
                 pg_catalog.pg_constraint.c.conrelid.is_not(None).label(
                     "has_constraint"
                 ),
                 pg_catalog.pg_index.c.indoption,
-                pg_class_index.c.reloptions,
+                pg_catalog.pg_class.c.reloptions,
                 pg_catalog.pg_am.c.amname,
                 # NOTE: pg_get_expr is very fast so this case has almost no
                 # performance impact
@@ -4477,6 +4795,8 @@ def _index_query(self):
                 nulls_not_distinct,
                 cols_sq.c.elements,
                 cols_sq.c.elements_is_expr,
+                cols_sq.c.elements_opclass,
+                cols_sq.c.elements_opdefault,
             )
             .select_from(pg_catalog.pg_index)
             .where(
@@ -4484,12 +4804,12 @@ def _index_query(self):
                 ~pg_catalog.pg_index.c.indisprimary,
             )
             .join(
-                pg_class_index,
-                pg_catalog.pg_index.c.indexrelid == pg_class_index.c.oid,
+                pg_catalog.pg_class,
+                pg_catalog.pg_index.c.indexrelid == pg_catalog.pg_class.c.oid,
             )
             .join(
                 pg_catalog.pg_am,
-                pg_class_index.c.relam == pg_catalog.pg_am.c.oid,
+                pg_catalog.pg_class.c.relam == pg_catalog.pg_am.c.oid,
             )
             .outerjoin(
                 cols_sq,
@@ -4506,7 +4826,9 @@ def _index_query(self):
                     == sql.any_(_array.array(("p", "u", "x"))),
                 ),
             )
-            .order_by(pg_catalog.pg_index.c.indrelid, pg_class_index.c.relname)
+            .order_by(
+                pg_catalog.pg_index.c.indrelid, pg_catalog.pg_class.c.relname
+            )
         )
 
     def get_multi_indexes(
@@ -4541,17 +4863,19 @@ def get_multi_indexes(
                     continue
 
                 for row in result_by_oid[oid]:
-                    index_name = row["relname_index"]
+                    index_name = row["relname"]
 
                     table_indexes = indexes[(schema, table_name)]
 
                     all_elements = row["elements"]
                     all_elements_is_expr = row["elements_is_expr"]
+                    all_elements_opclass = row["elements_opclass"]
+                    all_elements_opdefault = row["elements_opdefault"]
                     indnkeyatts = row["indnkeyatts"]
                     # "The number of key columns in the index, not counting any
                     # included columns, which are merely stored and do not
                     # participate in the index semantics"
-                    if indnkeyatts and len(all_elements) > indnkeyatts:
+                    if len(all_elements) > indnkeyatts:
                         # this is a "covering index" which has INCLUDE columns
                         # as well as regular index columns
                         inc_cols = all_elements[indnkeyatts:]
@@ -4566,10 +4890,18 @@ def get_multi_indexes(
                             not is_expr
                             for is_expr in all_elements_is_expr[indnkeyatts:]
                         )
+                        idx_elements_opclass = all_elements_opclass[
+                            :indnkeyatts
+                        ]
+                        idx_elements_opdefault = all_elements_opdefault[
+                            :indnkeyatts
+                        ]
                     else:
                         idx_elements = all_elements
                         idx_elements_is_expr = all_elements_is_expr
                         inc_cols = []
+                        idx_elements_opclass = all_elements_opclass
+                        idx_elements_opdefault = all_elements_opdefault
 
                     index = {"name": index_name, "unique": row["indisunique"]}
                     if any(idx_elements_is_expr):
@@ -4583,6 +4915,19 @@ def get_multi_indexes(
                     else:
                         index["column_names"] = idx_elements
 
+                    dialect_options = {}
+
+                    if not all(idx_elements_opdefault):
+                        dialect_options["postgresql_ops"] = {
+                            name: opclass
+                            for name, opclass, is_default in zip(
+                                idx_elements,
+                                idx_elements_opclass,
+                                idx_elements_opdefault,
+                            )
+                            if not is_default
+                        }
+
                     sorting = {}
                     for col_index, col_flags in enumerate(row["indoption"]):
                         col_sorting = ()
@@ -4602,7 +4947,6 @@ def get_multi_indexes(
                     if row["has_constraint"]:
                         index["duplicates_constraint"] = index_name
 
-                    dialect_options = {}
                     if row["reloptions"]:
                         dialect_options["postgresql_with"] = dict(
                             [
@@ -4670,7 +5014,7 @@ def get_multi_unique_constraints(
         default = ReflectionDefaults.unique_constraints
         for table_name, cols, con_name, comment, options in result:
             # ensure a list is created for each table. leave it empty if
-            # the table has no unique cosntraint
+            # the table has no unique constraint
             if con_name is None:
                 uniques[(schema, table_name)] = default()
                 continue
@@ -4681,12 +5025,7 @@ def get_multi_unique_constraints(
                 "comment": comment,
             }
             if options:
-                if options["nullsnotdistinct"]:
-                    uc_dict["dialect_options"] = {
-                        "postgresql_nulls_not_distinct": options[
-                            "nullsnotdistinct"
-                        ]
-                    }
+                uc_dict["dialect_options"] = options
 
             uniques[(schema, table_name)].append(uc_dict)
         return uniques.items()
@@ -5010,11 +5349,12 @@ def _load_domains(self, connection, schema=None, **kw):
                     key=lambda t: t[0],
                 )
                 for name, def_ in sorted_constraints:
-                    # constraint is in the form "CHECK (expression)".
+                    # constraint is in the form "CHECK (expression)"
+                    # or "NOT NULL". Ignore the "NOT NULL" and
                     # remove "CHECK (" and the tailing ")".
-                    check = def_[7:-1]
-                    constraints.append({"name": name, "check": check})
-
+                    if def_.casefold().startswith("check"):
+                        check = def_[7:-1]
+                        constraints.append({"name": name, "check": check})
             domain_rec: ReflectedDomain = {
                 "name": domain["name"],
                 "schema": domain["schema"],
diff --git a/libs/sqlalchemy/dialects/postgresql/dml.py b/libs/sqlalchemy/dialects/postgresql/dml.py
index 1187b6bf5f..053770e1c8 100644
--- a/libs/sqlalchemy/dialects/postgresql/dml.py
+++ b/libs/sqlalchemy/dialects/postgresql/dml.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/dml.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/postgresql/ext.py b/libs/sqlalchemy/dialects/postgresql/ext.py
index 94466ae0a1..651f40f91a 100644
--- a/libs/sqlalchemy/dialects/postgresql/ext.py
+++ b/libs/sqlalchemy/dialects/postgresql/ext.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/ext.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -8,6 +8,11 @@
 from __future__ import annotations
 
 from typing import Any
+from typing import Iterable
+from typing import List
+from typing import Optional
+from typing import overload
+from typing import Tuple
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
@@ -23,13 +28,20 @@
 from ...sql.sqltypes import TEXT
 from ...sql.visitors import InternalTraversal
 
-_T = TypeVar("_T", bound=Any)
-
 if TYPE_CHECKING:
+    from ...sql._typing import _ColumnExpressionArgument
+    from ...sql._typing import _DDLColumnArgument
+    from ...sql.elements import ClauseElement
+    from ...sql.elements import ColumnElement
+    from ...sql.operators import OperatorType
+    from ...sql.selectable import FromClause
+    from ...sql.visitors import _CloneCallableType
     from ...sql.visitors import _TraverseInternalsType
 
+_T = TypeVar("_T", bound=Any)
 
-class aggregate_order_by(expression.ColumnElement):
+
+class aggregate_order_by(expression.ColumnElement[_T]):
     """Represent a PostgreSQL aggregate order by expression.
 
     E.g.::
@@ -75,11 +87,32 @@ class aggregate_order_by(expression.ColumnElement):
         ("order_by", InternalTraversal.dp_clauseelement),
     ]
 
-    def __init__(self, target, *order_by):
-        self.target = coercions.expect(roles.ExpressionElementRole, target)
+    @overload
+    def __init__(
+        self,
+        target: ColumnElement[_T],
+        *order_by: _ColumnExpressionArgument[Any],
+    ): ...
+
+    @overload
+    def __init__(
+        self,
+        target: _ColumnExpressionArgument[_T],
+        *order_by: _ColumnExpressionArgument[Any],
+    ): ...
+
+    def __init__(
+        self,
+        target: _ColumnExpressionArgument[_T],
+        *order_by: _ColumnExpressionArgument[Any],
+    ):
+        self.target: ClauseElement = coercions.expect(
+            roles.ExpressionElementRole, target
+        )
         self.type = self.target.type
 
         _lob = len(order_by)
+        self.order_by: ClauseElement
         if _lob == 0:
             raise TypeError("at least one ORDER BY element is required")
         elif _lob == 1:
@@ -91,18 +124,22 @@ def __init__(self, target, *order_by):
                 *order_by, _literal_as_text_role=roles.ExpressionElementRole
             )
 
-    def self_group(self, against=None):
+    def self_group(
+        self, against: Optional[OperatorType] = None
+    ) -> ClauseElement:
         return self
 
-    def get_children(self, **kwargs):
+    def get_children(self, **kwargs: Any) -> Iterable[ClauseElement]:
         return self.target, self.order_by
 
-    def _copy_internals(self, clone=elements._clone, **kw):
+    def _copy_internals(
+        self, clone: _CloneCallableType = elements._clone, **kw: Any
+    ) -> None:
         self.target = clone(self.target, **kw)
         self.order_by = clone(self.order_by, **kw)
 
     @property
-    def _from_objects(self):
+    def _from_objects(self) -> List[FromClause]:
         return self.target._from_objects + self.order_by._from_objects
 
 
@@ -128,7 +165,9 @@ class ExcludeConstraint(ColumnCollectionConstraint):
         ":class:`.ExcludeConstraint`",
         ":paramref:`.ExcludeConstraint.where`",
     )
-    def __init__(self, *elements, **kw):
+    def __init__(
+        self, *elements: Tuple[_DDLColumnArgument, str], **kw: Any
+    ) -> None:
         r"""
         Create an :class:`.ExcludeConstraint` object.
 
diff --git a/libs/sqlalchemy/dialects/postgresql/hstore.py b/libs/sqlalchemy/dialects/postgresql/hstore.py
index 0a915b17df..27005f0639 100644
--- a/libs/sqlalchemy/dialects/postgresql/hstore.py
+++ b/libs/sqlalchemy/dialects/postgresql/hstore.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/hstore.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/postgresql/json.py b/libs/sqlalchemy/dialects/postgresql/json.py
index 2f26b39e31..3561929b2f 100644
--- a/libs/sqlalchemy/dialects/postgresql/json.py
+++ b/libs/sqlalchemy/dialects/postgresql/json.py
@@ -1,11 +1,18 @@
 # dialects/postgresql/json.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
+from __future__ import annotations
+
+from typing import Any
+from typing import Callable
+from typing import List
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .array import ARRAY
 from .array import array as _pg_array
@@ -21,13 +28,24 @@
 from .operators import PATH_MATCH
 from ... import types as sqltypes
 from ...sql import cast
+from ...sql._typing import _T
+
+if TYPE_CHECKING:
+    from ...engine.interfaces import Dialect
+    from ...sql.elements import ColumnElement
+    from ...sql.operators import OperatorType
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _LiteralProcessorType
+    from ...sql.type_api import TypeEngine
 
 __all__ = ("JSON", "JSONB")
 
 
 class JSONPathType(sqltypes.JSON.JSONPathType):
-    def _processor(self, dialect, super_proc):
-        def process(value):
+    def _processor(
+        self, dialect: Dialect, super_proc: Optional[Callable[[Any], Any]]
+    ) -> Callable[[Any], Any]:
+        def process(value: Any) -> Any:
             if isinstance(value, str):
                 # If it's already a string assume that it's in json path
                 # format. This allows using cast with json paths literals
@@ -44,11 +62,13 @@ def process(value):
 
         return process
 
-    def bind_processor(self, dialect):
-        return self._processor(dialect, self.string_bind_processor(dialect))
+    def bind_processor(self, dialect: Dialect) -> _BindProcessorType[Any]:
+        return self._processor(dialect, self.string_bind_processor(dialect))  # type: ignore[return-value]  # noqa: E501
 
-    def literal_processor(self, dialect):
-        return self._processor(dialect, self.string_literal_processor(dialect))
+    def literal_processor(
+        self, dialect: Dialect
+    ) -> _LiteralProcessorType[Any]:
+        return self._processor(dialect, self.string_literal_processor(dialect))  # type: ignore[return-value]  # noqa: E501
 
 
 class JSONPATH(JSONPathType):
@@ -148,9 +168,13 @@ class JSON(sqltypes.JSON):
     """  # noqa
 
     render_bind_cast = True
-    astext_type = sqltypes.Text()
+    astext_type: TypeEngine[str] = sqltypes.Text()
 
-    def __init__(self, none_as_null=False, astext_type=None):
+    def __init__(
+        self,
+        none_as_null: bool = False,
+        astext_type: Optional[TypeEngine[str]] = None,
+    ):
         """Construct a :class:`_types.JSON` type.
 
         :param none_as_null: if True, persist the value ``None`` as a
@@ -175,11 +199,13 @@ def __init__(self, none_as_null=False, astext_type=None):
         if astext_type is not None:
             self.astext_type = astext_type
 
-    class Comparator(sqltypes.JSON.Comparator):
+    class Comparator(sqltypes.JSON.Comparator[_T]):
         """Define comparison operations for :class:`_types.JSON`."""
 
+        type: JSON
+
         @property
-        def astext(self):
+        def astext(self) -> ColumnElement[str]:
             """On an indexed expression, use the "astext" (e.g. "->>")
             conversion when rendered in SQL.
 
@@ -193,13 +219,13 @@ def astext(self):
 
             """
             if isinstance(self.expr.right.type, sqltypes.JSON.JSONPathType):
-                return self.expr.left.operate(
+                return self.expr.left.operate(  # type: ignore[no-any-return]
                     JSONPATH_ASTEXT,
                     self.expr.right,
                     result_type=self.type.astext_type,
                 )
             else:
-                return self.expr.left.operate(
+                return self.expr.left.operate(  # type: ignore[no-any-return]
                     ASTEXT, self.expr.right, result_type=self.type.astext_type
                 )
 
@@ -254,32 +280,70 @@ class JSONB(JSON):
 
         :class:`_types.JSON`
 
+    .. warning::
+
+        **For applications that have indexes against JSONB subscript
+        expressions**
+
+        SQLAlchemy 2.0.42 made a change in how the subscript operation for
+        :class:`.JSONB` is rendered, from ``-> 'element'`` to ``['element']``,
+        for PostgreSQL versions greater than 14. This change caused an
+        unintended side effect for indexes that were created against
+        expressions that use subscript notation, e.g.
+        ``Index("ix_entity_json_ab_text", data["a"]["b"].astext)``. If these
+        indexes were generated with the older syntax e.g. ``((entity.data ->
+        'a') ->> 'b')``, they will not be used by the PostgreSQL query planner
+        when a query is made using SQLAlchemy 2.0.42 or higher on PostgreSQL
+        versions 14 or higher. This occurs because the new text will resemble
+        ``(entity.data['a'] ->> 'b')`` which will fail to produce the exact
+        textual syntax match required by the PostgreSQL query planner.
+        Therefore, for users upgrading to SQLAlchemy 2.0.42 or higher, existing
+        indexes that were created against :class:`.JSONB` expressions that use
+        subscripting would need to be dropped and re-created in order for them
+        to work with the new query syntax, e.g. an expression like
+        ``((entity.data -> 'a') ->> 'b')`` would become ``(entity.data['a'] ->>
+        'b')``.
+
+        .. seealso::
+
+            :ticket:`12868` - discussion of this issue
+
     """
 
     __visit_name__ = "JSONB"
 
-    class Comparator(JSON.Comparator):
+    def coerce_compared_value(
+        self, op: Optional[OperatorType], value: Any
+    ) -> TypeEngine[Any]:
+        if op in (PATH_MATCH, PATH_EXISTS):
+            return JSON.JSONPathType()
+        else:
+            return super().coerce_compared_value(op, value)
+
+    class Comparator(JSON.Comparator[_T]):
         """Define comparison operations for :class:`_types.JSON`."""
 
-        def has_key(self, other):
+        type: JSONB
+
+        def has_key(self, other: Any) -> ColumnElement[bool]:
             """Boolean expression.  Test for presence of a key (equivalent of
             the ``?`` operator).  Note that the key may be a SQLA expression.
             """
             return self.operate(HAS_KEY, other, result_type=sqltypes.Boolean)
 
-        def has_all(self, other):
+        def has_all(self, other: Any) -> ColumnElement[bool]:
             """Boolean expression.  Test for presence of all keys in jsonb
             (equivalent of the ``?&`` operator)
             """
             return self.operate(HAS_ALL, other, result_type=sqltypes.Boolean)
 
-        def has_any(self, other):
+        def has_any(self, other: Any) -> ColumnElement[bool]:
             """Boolean expression.  Test for presence of any key in jsonb
             (equivalent of the ``?|`` operator)
             """
             return self.operate(HAS_ANY, other, result_type=sqltypes.Boolean)
 
-        def contains(self, other, **kwargs):
+        def contains(self, other: Any, **kwargs: Any) -> ColumnElement[bool]:
             """Boolean expression.  Test if keys (or array) are a superset
             of/contained the keys of the argument jsonb expression
             (equivalent of the ``@>`` operator).
@@ -289,7 +353,7 @@ def contains(self, other, **kwargs):
             """
             return self.operate(CONTAINS, other, result_type=sqltypes.Boolean)
 
-        def contained_by(self, other):
+        def contained_by(self, other: Any) -> ColumnElement[bool]:
             """Boolean expression.  Test if keys are a proper subset of the
             keys of the argument jsonb expression
             (equivalent of the ``<@`` operator).
@@ -298,7 +362,9 @@ def contained_by(self, other):
                 CONTAINED_BY, other, result_type=sqltypes.Boolean
             )
 
-        def delete_path(self, array):
+        def delete_path(
+            self, array: Union[List[str], _pg_array[str]]
+        ) -> ColumnElement[JSONB]:
             """JSONB expression. Deletes field or array element specified in
             the argument array (equivalent of the ``#-`` operator).
 
@@ -312,7 +378,7 @@ def delete_path(self, array):
             right_side = cast(array, ARRAY(sqltypes.TEXT))
             return self.operate(DELETE_PATH, right_side, result_type=JSONB)
 
-        def path_exists(self, other):
+        def path_exists(self, other: Any) -> ColumnElement[bool]:
             """Boolean expression. Test for presence of item given by the
             argument JSONPath expression (equivalent of the ``@?`` operator).
 
@@ -322,7 +388,7 @@ def path_exists(self, other):
                 PATH_EXISTS, other, result_type=sqltypes.Boolean
             )
 
-        def path_match(self, other):
+        def path_match(self, other: Any) -> ColumnElement[bool]:
             """Boolean expression. Test if JSONPath predicate given by the
             argument JSONPath expression matches
             (equivalent of the ``@@`` operator).
diff --git a/libs/sqlalchemy/dialects/postgresql/named_types.py b/libs/sqlalchemy/dialects/postgresql/named_types.py
index e1b8e84ce8..bd865452f4 100644
--- a/libs/sqlalchemy/dialects/postgresql/named_types.py
+++ b/libs/sqlalchemy/dialects/postgresql/named_types.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/named_types.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,7 +7,9 @@
 # mypy: ignore-errors
 from __future__ import annotations
 
+from types import ModuleType
 from typing import Any
+from typing import Dict
 from typing import Optional
 from typing import Type
 from typing import TYPE_CHECKING
@@ -25,10 +27,11 @@
 from ...sql.ddl import InvokeDropDDLBase
 
 if TYPE_CHECKING:
+    from ...sql._typing import _CreateDropBind
     from ...sql._typing import _TypeEngineArgument
 
 
-class NamedType(sqltypes.TypeEngine):
+class NamedType(schema.SchemaVisitable, sqltypes.TypeEngine):
     """Base for named types."""
 
     __abstract__ = True
@@ -36,7 +39,9 @@ class NamedType(sqltypes.TypeEngine):
     DDLDropper: Type[NamedTypeDropper]
     create_type: bool
 
-    def create(self, bind, checkfirst=True, **kw):
+    def create(
+        self, bind: _CreateDropBind, checkfirst: bool = True, **kw: Any
+    ) -> None:
         """Emit ``CREATE`` DDL for this type.
 
         :param bind: a connectable :class:`_engine.Engine`,
@@ -50,7 +55,9 @@ def create(self, bind, checkfirst=True, **kw):
         """
         bind._run_ddl_visitor(self.DDLGenerator, self, checkfirst=checkfirst)
 
-    def drop(self, bind, checkfirst=True, **kw):
+    def drop(
+        self, bind: _CreateDropBind, checkfirst: bool = True, **kw: Any
+    ) -> None:
         """Emit ``DROP`` DDL for this type.
 
         :param bind: a connectable :class:`_engine.Engine`,
@@ -63,7 +70,9 @@ def drop(self, bind, checkfirst=True, **kw):
         """
         bind._run_ddl_visitor(self.DDLDropper, self, checkfirst=checkfirst)
 
-    def _check_for_name_in_memos(self, checkfirst, kw):
+    def _check_for_name_in_memos(
+        self, checkfirst: bool, kw: Dict[str, Any]
+    ) -> bool:
         """Look in the 'ddl runner' for 'memos', then
         note our name in that collection.
 
@@ -87,7 +96,13 @@ def _check_for_name_in_memos(self, checkfirst, kw):
         else:
             return False
 
-    def _on_table_create(self, target, bind, checkfirst=False, **kw):
+    def _on_table_create(
+        self,
+        target: Any,
+        bind: _CreateDropBind,
+        checkfirst: bool = False,
+        **kw: Any,
+    ) -> None:
         if (
             checkfirst
             or (
@@ -97,7 +112,13 @@ def _on_table_create(self, target, bind, checkfirst=False, **kw):
         ) and not self._check_for_name_in_memos(checkfirst, kw):
             self.create(bind=bind, checkfirst=checkfirst)
 
-    def _on_table_drop(self, target, bind, checkfirst=False, **kw):
+    def _on_table_drop(
+        self,
+        target: Any,
+        bind: _CreateDropBind,
+        checkfirst: bool = False,
+        **kw: Any,
+    ) -> None:
         if (
             not self.metadata
             and not kw.get("_is_metadata_operation", False)
@@ -105,11 +126,23 @@ def _on_table_drop(self, target, bind, checkfirst=False, **kw):
         ):
             self.drop(bind=bind, checkfirst=checkfirst)
 
-    def _on_metadata_create(self, target, bind, checkfirst=False, **kw):
+    def _on_metadata_create(
+        self,
+        target: Any,
+        bind: _CreateDropBind,
+        checkfirst: bool = False,
+        **kw: Any,
+    ) -> None:
         if not self._check_for_name_in_memos(checkfirst, kw):
             self.create(bind=bind, checkfirst=checkfirst)
 
-    def _on_metadata_drop(self, target, bind, checkfirst=False, **kw):
+    def _on_metadata_drop(
+        self,
+        target: Any,
+        bind: _CreateDropBind,
+        checkfirst: bool = False,
+        **kw: Any,
+    ) -> None:
         if not self._check_for_name_in_memos(checkfirst, kw):
             self.drop(bind=bind, checkfirst=checkfirst)
 
@@ -314,7 +347,7 @@ def adapt_emulated_to_native(cls, impl, **kw):
 
         return cls(**kw)
 
-    def create(self, bind=None, checkfirst=True):
+    def create(self, bind: _CreateDropBind, checkfirst: bool = True) -> None:
         """Emit ``CREATE TYPE`` for this
         :class:`_postgresql.ENUM`.
 
@@ -335,7 +368,7 @@ def create(self, bind=None, checkfirst=True):
 
         super().create(bind, checkfirst=checkfirst)
 
-    def drop(self, bind=None, checkfirst=True):
+    def drop(self, bind: _CreateDropBind, checkfirst: bool = True) -> None:
         """Emit ``DROP TYPE`` for this
         :class:`_postgresql.ENUM`.
 
@@ -355,7 +388,7 @@ def drop(self, bind=None, checkfirst=True):
 
         super().drop(bind, checkfirst=checkfirst)
 
-    def get_dbapi_type(self, dbapi):
+    def get_dbapi_type(self, dbapi: ModuleType) -> None:
         """dont return dbapi.STRING for ENUM in PostgreSQL, since that's
         a different type"""
 
@@ -470,20 +503,6 @@ def __init__(
     def __test_init__(cls):
         return cls("name", sqltypes.Integer)
 
-    def adapt(self, impl, **kw):
-        if self.default:
-            kw["default"] = self.default
-        if self.constraint_name is not None:
-            kw["constraint_name"] = self.constraint_name
-        if self.not_null:
-            kw["not_null"] = self.not_null
-        if self.check is not None:
-            kw["check"] = str(self.check)
-        if self.create_type:
-            kw["create_type"] = self.create_type
-
-        return super().adapt(impl, **kw)
-
 
 class CreateEnumType(schema._CreateDropBase):
     __visit_name__ = "create_enum_type"
diff --git a/libs/sqlalchemy/dialects/postgresql/operators.py b/libs/sqlalchemy/dialects/postgresql/operators.py
index ebcafcba99..9e4d26570e 100644
--- a/libs/sqlalchemy/dialects/postgresql/operators.py
+++ b/libs/sqlalchemy/dialects/postgresql/operators.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/operators.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/postgresql/pg8000.py b/libs/sqlalchemy/dialects/postgresql/pg8000.py
index bf113230e0..cd233de135 100644
--- a/libs/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/libs/sqlalchemy/dialects/postgresql/pg8000.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/pg8000.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors <see AUTHORS
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors <see AUTHORS
 # file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -540,6 +540,9 @@ def set_isolation_level(self, dbapi_connection, level):
             cursor.execute("COMMIT")
             cursor.close()
 
+    def detect_autocommit_setting(self, dbapi_conn) -> bool:
+        return bool(dbapi_conn.autocommit)
+
     def set_readonly(self, connection, value):
         cursor = connection.cursor()
         try:
diff --git a/libs/sqlalchemy/dialects/postgresql/pg_catalog.py b/libs/sqlalchemy/dialects/postgresql/pg_catalog.py
index 78f390a211..08663baf4f 100644
--- a/libs/sqlalchemy/dialects/postgresql/pg_catalog.py
+++ b/libs/sqlalchemy/dialects/postgresql/pg_catalog.py
@@ -1,10 +1,16 @@
 # dialects/postgresql/pg_catalog.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
+
+from __future__ import annotations
+
+from typing import Any
+from typing import Optional
+from typing import Sequence
+from typing import TYPE_CHECKING
 
 from .array import ARRAY
 from .types import OID
@@ -23,31 +29,37 @@
 from ...types import Text
 from ...types import TypeDecorator
 
+if TYPE_CHECKING:
+    from ...engine.interfaces import Dialect
+    from ...sql.type_api import _ResultProcessorType
+
 
 # types
-class NAME(TypeDecorator):
+class NAME(TypeDecorator[str]):
     impl = String(64, collation="C")
     cache_ok = True
 
 
-class PG_NODE_TREE(TypeDecorator):
+class PG_NODE_TREE(TypeDecorator[str]):
     impl = Text(collation="C")
     cache_ok = True
 
 
-class INT2VECTOR(TypeDecorator):
+class INT2VECTOR(TypeDecorator[Sequence[int]]):
     impl = ARRAY(SmallInteger)
     cache_ok = True
 
 
-class OIDVECTOR(TypeDecorator):
+class OIDVECTOR(TypeDecorator[Sequence[int]]):
     impl = ARRAY(OID)
     cache_ok = True
 
 
 class _SpaceVector:
-    def result_processor(self, dialect, coltype):
-        def process(value):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> _ResultProcessorType[list[int]]:
+        def process(value: Any) -> Optional[list[int]]:
             if value is None:
                 return value
             return [int(p) for p in value.split(" ")]
@@ -298,3 +310,17 @@ def process(value):
     Column("collicurules", Text, info={"server_version": (16,)}),
     Column("collversion", Text, info={"server_version": (10,)}),
 )
+
+pg_opclass = Table(
+    "pg_opclass",
+    pg_catalog_meta,
+    Column("oid", OID, info={"server_version": (9, 3)}),
+    Column("opcmethod", NAME),
+    Column("opcname", NAME),
+    Column("opsnamespace", OID),
+    Column("opsowner", OID),
+    Column("opcfamily", OID),
+    Column("opcintype", OID),
+    Column("opcdefault", Boolean),
+    Column("opckeytype", OID),
+)
diff --git a/libs/sqlalchemy/dialects/postgresql/provision.py b/libs/sqlalchemy/dialects/postgresql/provision.py
index c76f5f5184..dfe0f627d2 100644
--- a/libs/sqlalchemy/dialects/postgresql/provision.py
+++ b/libs/sqlalchemy/dialects/postgresql/provision.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/provision.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -137,7 +137,13 @@ def prepare_for_drop_tables(config, connection):
 
 @upsert.for_db("postgresql")
 def _upsert(
-    cfg, table, returning, *, set_lambda=None, sort_by_parameter_order=False
+    cfg,
+    table,
+    returning,
+    *,
+    set_lambda=None,
+    sort_by_parameter_order=False,
+    index_elements=None,
 ):
     from sqlalchemy.dialects.postgresql import insert
 
@@ -146,8 +152,10 @@ def _upsert(
     table_pk = inspect(table).selectable
 
     if set_lambda:
+        if index_elements is None:
+            index_elements = table_pk.primary_key
         stmt = stmt.on_conflict_do_update(
-            index_elements=table_pk.primary_key, set_=set_lambda(stmt.excluded)
+            index_elements=index_elements, set_=set_lambda(stmt.excluded)
         )
     else:
         stmt = stmt.on_conflict_do_nothing()
diff --git a/libs/sqlalchemy/dialects/postgresql/psycopg.py b/libs/sqlalchemy/dialects/postgresql/psycopg.py
index 0554048c2b..67dc5ca86c 100644
--- a/libs/sqlalchemy/dialects/postgresql/psycopg.py
+++ b/libs/sqlalchemy/dialects/postgresql/psycopg.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/psycopg.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -59,6 +59,82 @@
     dialect shares most of its behavior with the ``psycopg2`` dialect.
     Further documentation is available there.
 
+Using psycopg Connection Pooling
+--------------------------------
+
+The ``psycopg`` driver provides its own connection pool implementation that
+may be used in place of SQLAlchemy's pooling functionality.
+This pool implementation provides support for fixed and dynamic pool sizes
+(including automatic downsizing for unused connections), connection health
+pre-checks, and support for both synchronous and asynchronous code
+environments.
+
+Here is an example that uses the sync version of the pool, using
+``psycopg_pool >= 3.3`` that introduces support for ``close_returns=True``::
+
+    import psycopg_pool
+    from sqlalchemy import create_engine
+    from sqlalchemy.pool import NullPool
+
+    # Create a psycopg_pool connection pool
+    my_pool = psycopg_pool.ConnectionPool(
+        conninfo="postgresql://scott:tiger@localhost/test",
+        close_returns=True,  # Return "closed" active connections to the pool
+        # ... other pool parameters as desired ...
+    )
+
+    # Create an engine that uses the connection pool to get a connection
+    engine = create_engine(
+        url="postgresql+psycopg://",  # Only need the dialect now
+        poolclass=NullPool,  # Disable SQLAlchemy's default connection pool
+        creator=my_pool.getconn,  # Use Psycopg 3 connection pool to obtain connections
+    )
+
+Similarly an the async example::
+
+    import psycopg_pool
+    from sqlalchemy.ext.asyncio import create_async_engine
+    from sqlalchemy.pool import NullPool
+
+
+    async def define_engine():
+        # Create a psycopg_pool connection pool
+        my_pool = psycopg_pool.AsyncConnectionPool(
+            conninfo="postgresql://scott:tiger@localhost/test",
+            open=False,  # See comment below
+            close_returns=True,  # Return "closed" active connections to the pool
+            # ... other pool parameters as desired ...
+        )
+
+        # Must explicitly open AsyncConnectionPool outside constructor
+        # https://www.psycopg.org/psycopg3/docs/api/pool.html#psycopg_pool.AsyncConnectionPool
+        await my_pool.open()
+
+        # Create an engine that uses the connection pool to get a connection
+        engine = create_async_engine(
+            url="postgresql+psycopg://",  # Only need the dialect now
+            poolclass=NullPool,  # Disable SQLAlchemy's default connection pool
+            async_creator=my_pool.getconn,  # Use Psycopg 3 connection pool to obtain connections
+        )
+
+        return engine, my_pool
+
+The resulting engine may then be used normally. Internally, Psycopg 3 handles
+connection pooling::
+
+    with engine.connect() as conn:
+        print(conn.scalar(text("select 42")))
+
+.. seealso::
+
+    `Connection pools <https://www.psycopg.org/psycopg3/docs/advanced/pool.html>`_ -
+    the Psycopg 3 documentation for ``psycopg_pool.ConnectionPool``.
+
+    `Example for older version of psycopg_pool
+    <https://github.com/sqlalchemy/sqlalchemy/discussions/12522#discussioncomment-13024666>`_ -
+    An example about using the ``psycopg_pool<3.3`` that did not have the
+    ``close_returns``` parameter.
+
 Using a different Cursor class
 ------------------------------
 
@@ -585,6 +661,9 @@ def arraysize(self):
     def arraysize(self, value):
         self._cursor.arraysize = value
 
+    async def _async_soft_close(self) -> None:
+        return
+
     def close(self):
         self._rows.clear()
         # Normal cursor just call _close() in a non-sync way.
diff --git a/libs/sqlalchemy/dialects/postgresql/psycopg2.py b/libs/sqlalchemy/dialects/postgresql/psycopg2.py
index eeb7604f79..189e6566cf 100644
--- a/libs/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/libs/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/psycopg2.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/postgresql/psycopg2cffi.py b/libs/sqlalchemy/dialects/postgresql/psycopg2cffi.py
index 55e1760704..f4dcfc7014 100644
--- a/libs/sqlalchemy/dialects/postgresql/psycopg2cffi.py
+++ b/libs/sqlalchemy/dialects/postgresql/psycopg2cffi.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/psycopg2cffi.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/postgresql/ranges.py b/libs/sqlalchemy/dialects/postgresql/ranges.py
index 93253570c1..73ac38d0f9 100644
--- a/libs/sqlalchemy/dialects/postgresql/ranges.py
+++ b/libs/sqlalchemy/dialects/postgresql/ranges.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/ranges.py
-# Copyright (C) 2013-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2013-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -271,9 +271,9 @@ def _compare_edges(
                     value2 += step
                     value2_inc = False
 
-        if value1 < value2:  # type: ignore
+        if value1 < value2:
             return -1
-        elif value1 > value2:  # type: ignore
+        elif value1 > value2:
             return 1
         elif only_values:
             return 0
diff --git a/libs/sqlalchemy/dialects/postgresql/types.py b/libs/sqlalchemy/dialects/postgresql/types.py
index 6fe4f576eb..d6210e217c 100644
--- a/libs/sqlalchemy/dialects/postgresql/types.py
+++ b/libs/sqlalchemy/dialects/postgresql/types.py
@@ -1,5 +1,5 @@
 # dialects/postgresql/types.py
-# Copyright (C) 2013-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2013-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -52,28 +52,38 @@ class BYTEA(sqltypes.LargeBinary):
     __visit_name__ = "BYTEA"
 
 
-class INET(sqltypes.TypeEngine[str]):
+class _NetworkAddressTypeMixin:
+
+    def coerce_compared_value(
+        self, op: Optional[OperatorType], value: Any
+    ) -> TypeEngine[Any]:
+        if TYPE_CHECKING:
+            assert isinstance(self, TypeEngine)
+        return self
+
+
+class INET(_NetworkAddressTypeMixin, sqltypes.TypeEngine[str]):
     __visit_name__ = "INET"
 
 
 PGInet = INET
 
 
-class CIDR(sqltypes.TypeEngine[str]):
+class CIDR(_NetworkAddressTypeMixin, sqltypes.TypeEngine[str]):
     __visit_name__ = "CIDR"
 
 
 PGCidr = CIDR
 
 
-class MACADDR(sqltypes.TypeEngine[str]):
+class MACADDR(_NetworkAddressTypeMixin, sqltypes.TypeEngine[str]):
     __visit_name__ = "MACADDR"
 
 
 PGMacAddr = MACADDR
 
 
-class MACADDR8(sqltypes.TypeEngine[str]):
+class MACADDR8(_NetworkAddressTypeMixin, sqltypes.TypeEngine[str]):
     __visit_name__ = "MACADDR8"
 
 
diff --git a/libs/sqlalchemy/dialects/sqlite/__init__.py b/libs/sqlalchemy/dialects/sqlite/__init__.py
index 7b381fa6f5..8609082242 100644
--- a/libs/sqlalchemy/dialects/sqlite/__init__.py
+++ b/libs/sqlalchemy/dialects/sqlite/__init__.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/sqlite/aiosqlite.py b/libs/sqlalchemy/dialects/sqlite/aiosqlite.py
index c777bf445b..afd3688edc 100644
--- a/libs/sqlalchemy/dialects/sqlite/aiosqlite.py
+++ b/libs/sqlalchemy/dialects/sqlite/aiosqlite.py
@@ -1,10 +1,9 @@
 # dialects/sqlite/aiosqlite.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 
 r"""
@@ -50,48 +49,73 @@
 Serializable isolation / Savepoints / Transactional DDL (asyncio version)
 -------------------------------------------------------------------------
 
-Similarly to pysqlite, aiosqlite does not support SAVEPOINT feature.
+A newly revised version of this important section is now available
+at the top level of the SQLAlchemy SQLite documentation, in the section
+:ref:`sqlite_transactions`.
 
-The solution is similar to :ref:`pysqlite_serializable`. This is achieved by the event listeners in async::
 
-    from sqlalchemy import create_engine, event
-    from sqlalchemy.ext.asyncio import create_async_engine
-
-    engine = create_async_engine("sqlite+aiosqlite:///myfile.db")
+.. _aiosqlite_pooling:
 
+Pooling Behavior
+----------------
 
-    @event.listens_for(engine.sync_engine, "connect")
-    def do_connect(dbapi_connection, connection_record):
-        # disable aiosqlite's emitting of the BEGIN statement entirely.
-        # also stops it from emitting COMMIT before any DDL.
-        dbapi_connection.isolation_level = None
+The SQLAlchemy ``aiosqlite`` DBAPI establishes the connection pool differently
+based on the kind of SQLite database that's requested:
 
+* When a ``:memory:`` SQLite database is specified, the dialect by default
+  will use :class:`.StaticPool`. This pool maintains a single
+  connection, so that all access to the engine
+  use the same ``:memory:`` database.
+* When a file-based database is specified, the dialect will use
+  :class:`.AsyncAdaptedQueuePool` as the source of connections.
 
-    @event.listens_for(engine.sync_engine, "begin")
-    def do_begin(conn):
-        # emit our own BEGIN
-        conn.exec_driver_sql("BEGIN")
+  .. versionchanged:: 2.0.38
 
-.. warning:: When using the above recipe, it is advised to not use the
-   :paramref:`.Connection.execution_options.isolation_level` setting on
-   :class:`_engine.Connection` and :func:`_sa.create_engine`
-   with the SQLite driver,
-   as this function necessarily will also alter the ".isolation_level" setting.
+    SQLite file database engines now use :class:`.AsyncAdaptedQueuePool` by default.
+    Previously, :class:`.NullPool` were used.  The :class:`.NullPool` class
+    may be used by specifying it via the
+    :paramref:`_sa.create_engine.poolclass` parameter.
 
 """  # noqa
+from __future__ import annotations
 
 import asyncio
 from collections import deque
 from functools import partial
+from threading import Thread
+from types import ModuleType
+from typing import Any
+from typing import cast
+from typing import Deque
+from typing import Iterator
+from typing import NoReturn
+from typing import Optional
+from typing import Sequence
+from typing import TYPE_CHECKING
+from typing import Union
 
 from .base import SQLiteExecutionContext
 from .pysqlite import SQLiteDialect_pysqlite
 from ... import pool
 from ... import util
+from ...connectors.asyncio import AsyncAdapt_dbapi_module
+from ...connectors.asyncio import AsyncAdapt_terminate
 from ...engine import AdaptedConnection
 from ...util.concurrency import await_fallback
 from ...util.concurrency import await_only
 
+if TYPE_CHECKING:
+    from ...connectors.asyncio import AsyncIODBAPIConnection
+    from ...connectors.asyncio import AsyncIODBAPICursor
+    from ...engine.interfaces import _DBAPICursorDescription
+    from ...engine.interfaces import _DBAPIMultiExecuteParams
+    from ...engine.interfaces import _DBAPISingleExecuteParams
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.url import URL
+    from ...pool.base import PoolProxiedConnection
+
 
 class AsyncAdapt_aiosqlite_cursor:
     # TODO: base on connectors/asyncio.py
@@ -110,21 +134,29 @@ class AsyncAdapt_aiosqlite_cursor:
 
     server_side = False
 
-    def __init__(self, adapt_connection):
+    def __init__(self, adapt_connection: AsyncAdapt_aiosqlite_connection):
         self._adapt_connection = adapt_connection
         self._connection = adapt_connection._connection
         self.await_ = adapt_connection.await_
         self.arraysize = 1
         self.rowcount = -1
-        self.description = None
-        self._rows = deque()
+        self.description: Optional[_DBAPICursorDescription] = None
+        self._rows: Deque[Any] = deque()
+
+    async def _async_soft_close(self) -> None:
+        return
 
-    def close(self):
+    def close(self) -> None:
         self._rows.clear()
 
-    def execute(self, operation, parameters=None):
+    def execute(
+        self,
+        operation: Any,
+        parameters: Optional[_DBAPISingleExecuteParams] = None,
+    ) -> Any:
+
         try:
-            _cursor = self.await_(self._connection.cursor())
+            _cursor: AsyncIODBAPICursor = self.await_(self._connection.cursor())  # type: ignore[arg-type] # noqa: E501
 
             if parameters is None:
                 self.await_(_cursor.execute(operation))
@@ -145,13 +177,17 @@ def execute(self, operation, parameters=None):
             if not self.server_side:
                 self.await_(_cursor.close())
             else:
-                self._cursor = _cursor
+                self._cursor = _cursor  # type: ignore[misc]
         except Exception as error:
             self._adapt_connection._handle_exception(error)
 
-    def executemany(self, operation, seq_of_parameters):
+    def executemany(
+        self,
+        operation: Any,
+        seq_of_parameters: _DBAPIMultiExecuteParams,
+    ) -> Any:
         try:
-            _cursor = self.await_(self._connection.cursor())
+            _cursor: AsyncIODBAPICursor = self.await_(self._connection.cursor())  # type: ignore[arg-type] # noqa: E501
             self.await_(_cursor.executemany(operation, seq_of_parameters))
             self.description = None
             self.lastrowid = _cursor.lastrowid
@@ -160,27 +196,27 @@ def executemany(self, operation, seq_of_parameters):
         except Exception as error:
             self._adapt_connection._handle_exception(error)
 
-    def setinputsizes(self, *inputsizes):
+    def setinputsizes(self, *inputsizes: Any) -> None:
         pass
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Any]:
         while self._rows:
             yield self._rows.popleft()
 
-    def fetchone(self):
+    def fetchone(self) -> Optional[Any]:
         if self._rows:
             return self._rows.popleft()
         else:
             return None
 
-    def fetchmany(self, size=None):
+    def fetchmany(self, size: Optional[int] = None) -> Sequence[Any]:
         if size is None:
             size = self.arraysize
 
         rr = self._rows
         return [rr.popleft() for _ in range(min(size, len(rr)))]
 
-    def fetchall(self):
+    def fetchall(self) -> Sequence[Any]:
         retval = list(self._rows)
         self._rows.clear()
         return retval
@@ -193,47 +229,52 @@ class AsyncAdapt_aiosqlite_ss_cursor(AsyncAdapt_aiosqlite_cursor):
 
     server_side = True
 
-    def __init__(self, *arg, **kw):
+    def __init__(self, *arg: Any, **kw: Any) -> None:
         super().__init__(*arg, **kw)
-        self._cursor = None
+        self._cursor: Optional[AsyncIODBAPICursor] = None
 
-    def close(self):
+    def close(self) -> None:
         if self._cursor is not None:
             self.await_(self._cursor.close())
             self._cursor = None
 
-    def fetchone(self):
+    def fetchone(self) -> Optional[Any]:
+        assert self._cursor is not None
         return self.await_(self._cursor.fetchone())
 
-    def fetchmany(self, size=None):
+    def fetchmany(self, size: Optional[int] = None) -> Sequence[Any]:
+        assert self._cursor is not None
         if size is None:
             size = self.arraysize
         return self.await_(self._cursor.fetchmany(size=size))
 
-    def fetchall(self):
+    def fetchall(self) -> Sequence[Any]:
+        assert self._cursor is not None
         return self.await_(self._cursor.fetchall())
 
 
-class AsyncAdapt_aiosqlite_connection(AdaptedConnection):
+class AsyncAdapt_aiosqlite_connection(AsyncAdapt_terminate, AdaptedConnection):
     await_ = staticmethod(await_only)
     __slots__ = ("dbapi",)
 
-    def __init__(self, dbapi, connection):
+    def __init__(self, dbapi: Any, connection: AsyncIODBAPIConnection) -> None:
         self.dbapi = dbapi
         self._connection = connection
 
     @property
-    def isolation_level(self):
-        return self._connection.isolation_level
+    def isolation_level(self) -> Optional[str]:
+        return cast(str, self._connection.isolation_level)
 
     @isolation_level.setter
-    def isolation_level(self, value):
+    def isolation_level(self, value: Optional[str]) -> None:
         # aiosqlite's isolation_level setter works outside the Thread
         # that it's supposed to, necessitating setting check_same_thread=False.
         # for improved stability, we instead invent our own awaitable version
         # using aiosqlite's async queue directly.
 
-        def set_iso(connection, value):
+        def set_iso(
+            connection: AsyncAdapt_aiosqlite_connection, value: Optional[str]
+        ) -> None:
             connection.isolation_level = value
 
         function = partial(set_iso, self._connection._conn, value)
@@ -242,38 +283,38 @@ def set_iso(connection, value):
         self._connection._tx.put_nowait((future, function))
 
         try:
-            return self.await_(future)
+            self.await_(future)
         except Exception as error:
             self._handle_exception(error)
 
-    def create_function(self, *args, **kw):
+    def create_function(self, *args: Any, **kw: Any) -> None:
         try:
             self.await_(self._connection.create_function(*args, **kw))
         except Exception as error:
             self._handle_exception(error)
 
-    def cursor(self, server_side=False):
+    def cursor(self, server_side: bool = False) -> AsyncAdapt_aiosqlite_cursor:
         if server_side:
             return AsyncAdapt_aiosqlite_ss_cursor(self)
         else:
             return AsyncAdapt_aiosqlite_cursor(self)
 
-    def execute(self, *args, **kw):
+    def execute(self, *args: Any, **kw: Any) -> Any:
         return self.await_(self._connection.execute(*args, **kw))
 
-    def rollback(self):
+    def rollback(self) -> None:
         try:
             self.await_(self._connection.rollback())
         except Exception as error:
             self._handle_exception(error)
 
-    def commit(self):
+    def commit(self) -> None:
         try:
             self.await_(self._connection.commit())
         except Exception as error:
             self._handle_exception(error)
 
-    def close(self):
+    def close(self) -> None:
         try:
             self.await_(self._connection.close())
         except ValueError:
@@ -289,7 +330,7 @@ def close(self):
         except Exception as error:
             self._handle_exception(error)
 
-    def _handle_exception(self, error):
+    def _handle_exception(self, error: Exception) -> NoReturn:
         if (
             isinstance(error, ValueError)
             and error.args[0] == "no active connection"
@@ -300,6 +341,24 @@ def _handle_exception(self, error):
         else:
             raise error
 
+    async def _terminate_graceful_close(self) -> None:
+        """Try to close connection gracefully"""
+        await self._connection.close()
+
+    def _terminate_force_close(self) -> None:
+        """Terminate the connection"""
+
+        # this was added in aiosqlite 0.22.1.  if stop() is not present,
+        # the dialect should indicate has_terminate=False
+        try:
+            meth = self._connection.stop
+        except AttributeError as ae:
+            raise NotImplementedError(
+                "terminate_force_close() not implemented by this DBAPI shim"
+            ) from ae
+        else:
+            meth()
+
 
 class AsyncAdaptFallback_aiosqlite_connection(AsyncAdapt_aiosqlite_connection):
     __slots__ = ()
@@ -307,14 +366,15 @@ class AsyncAdaptFallback_aiosqlite_connection(AsyncAdapt_aiosqlite_connection):
     await_ = staticmethod(await_fallback)
 
 
-class AsyncAdapt_aiosqlite_dbapi:
-    def __init__(self, aiosqlite, sqlite):
+class AsyncAdapt_aiosqlite_dbapi(AsyncAdapt_dbapi_module):
+    def __init__(self, aiosqlite: ModuleType, sqlite: ModuleType):
         self.aiosqlite = aiosqlite
         self.sqlite = sqlite
         self.paramstyle = "qmark"
+        self.has_stop = hasattr(aiosqlite.Connection, "stop")
         self._init_dbapi_attributes()
 
-    def _init_dbapi_attributes(self):
+    def _init_dbapi_attributes(self) -> None:
         for name in (
             "DatabaseError",
             "Error",
@@ -333,7 +393,7 @@ def _init_dbapi_attributes(self):
         for name in ("Binary",):
             setattr(self, name, getattr(self.sqlite, name))
 
-    def connect(self, *arg, **kw):
+    def connect(self, *arg: Any, **kw: Any) -> AsyncAdapt_aiosqlite_connection:
         async_fallback = kw.pop("async_fallback", False)
 
         creator_fn = kw.pop("async_creator_fn", None)
@@ -341,8 +401,14 @@ def connect(self, *arg, **kw):
             connection = creator_fn(*arg, **kw)
         else:
             connection = self.aiosqlite.connect(*arg, **kw)
-            # it's a Thread.   you'll thank us later
-            connection.daemon = True
+
+            # aiosqlite uses a Thread.   you'll thank us later
+            if isinstance(connection, Thread):
+                # Connection itself was a thread in version prior to 0.22
+                connection.daemon = True
+            else:
+                # in 0.22+ instead it contains a thread.
+                connection._thread.daemon = True
 
         if util.asbool(async_fallback):
             return AsyncAdaptFallback_aiosqlite_connection(
@@ -357,7 +423,7 @@ def connect(self, *arg, **kw):
 
 
 class SQLiteExecutionContext_aiosqlite(SQLiteExecutionContext):
-    def create_server_side_cursor(self):
+    def create_server_side_cursor(self) -> DBAPICursor:
         return self._dbapi_connection.cursor(server_side=True)
 
 
@@ -366,25 +432,37 @@ class SQLiteDialect_aiosqlite(SQLiteDialect_pysqlite):
     supports_statement_cache = True
 
     is_async = True
+    has_terminate = True
 
     supports_server_side_cursors = True
 
     execution_ctx_cls = SQLiteExecutionContext_aiosqlite
 
+    def __init__(self, **kwargs: Any):
+        super().__init__(**kwargs)
+        if self.dbapi and not self.dbapi.has_stop:
+            self.has_terminate = False
+
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> AsyncAdapt_aiosqlite_dbapi:
         return AsyncAdapt_aiosqlite_dbapi(
             __import__("aiosqlite"), __import__("sqlite3")
         )
 
     @classmethod
-    def get_pool_class(cls, url):
+    def get_pool_class(cls, url: URL) -> type[pool.Pool]:
         if cls._is_url_file_db(url):
-            return pool.NullPool
+            return pool.AsyncAdaptedQueuePool
         else:
             return pool.StaticPool
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
+        self.dbapi = cast("DBAPIModule", self.dbapi)
         if isinstance(
             e, self.dbapi.OperationalError
         ) and "no active connection" in str(e):
@@ -392,8 +470,13 @@ def is_disconnect(self, e, connection, cursor):
 
         return super().is_disconnect(e, connection, cursor)
 
-    def get_driver_connection(self, connection):
-        return connection._connection
+    def get_driver_connection(
+        self, connection: DBAPIConnection
+    ) -> AsyncIODBAPIConnection:
+        return connection._connection  # type: ignore[no-any-return]
+
+    def do_terminate(self, dbapi_connection: DBAPIConnection) -> None:
+        dbapi_connection.terminate()
 
 
 dialect = SQLiteDialect_aiosqlite
diff --git a/libs/sqlalchemy/dialects/sqlite/base.py b/libs/sqlalchemy/dialects/sqlite/base.py
index e0c0f6e809..35eb74bfad 100644
--- a/libs/sqlalchemy/dialects/sqlite/base.py
+++ b/libs/sqlalchemy/dialects/sqlite/base.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -136,99 +136,199 @@ def bi_c(element, compiler, **kw):
 
     `Datatypes In SQLite Version 3 <https://sqlite.org/datatype3.html>`_
 
-.. _sqlite_concurrency:
-
-Database Locking Behavior / Concurrency
----------------------------------------
-
-SQLite is not designed for a high level of write concurrency. The database
-itself, being a file, is locked completely during write operations within
-transactions, meaning exactly one "connection" (in reality a file handle)
-has exclusive access to the database during this period - all other
-"connections" will be blocked during this time.
-
-The Python DBAPI specification also calls for a connection model that is
-always in a transaction; there is no ``connection.begin()`` method,
-only ``connection.commit()`` and ``connection.rollback()``, upon which a
-new transaction is to be begun immediately.  This may seem to imply
-that the SQLite driver would in theory allow only a single filehandle on a
-particular database file at any time; however, there are several
-factors both within SQLite itself as well as within the pysqlite driver
-which loosen this restriction significantly.
-
-However, no matter what locking modes are used, SQLite will still always
-lock the database file once a transaction is started and DML (e.g. INSERT,
-UPDATE, DELETE) has at least been emitted, and this will block
-other transactions at least at the point that they also attempt to emit DML.
-By default, the length of time on this block is very short before it times out
-with an error.
-
-This behavior becomes more critical when used in conjunction with the
-SQLAlchemy ORM.  SQLAlchemy's :class:`.Session` object by default runs
-within a transaction, and with its autoflush model, may emit DML preceding
-any SELECT statement.   This may lead to a SQLite database that locks
-more quickly than is expected.   The locking mode of SQLite and the pysqlite
-driver can be manipulated to some degree, however it should be noted that
-achieving a high degree of write-concurrency with SQLite is a losing battle.
-
-For more information on SQLite's lack of write concurrency by design, please
-see
-`Situations Where Another RDBMS May Work Better - High Concurrency
-<https://www.sqlite.org/whentouse.html>`_ near the bottom of the page.
-
-The following subsections introduce areas that are impacted by SQLite's
-file-based architecture and additionally will usually require workarounds to
-work when using the pysqlite driver.
+.. _sqlite_transactions:
+
+Transactions with SQLite and the sqlite3 driver
+-----------------------------------------------
+
+As a file-based database, SQLite's approach to transactions differs from
+traditional databases in many ways.  Additionally, the ``sqlite3`` driver
+standard with Python (as well as the async version ``aiosqlite`` which builds
+on top of it) has several quirks, workarounds, and API features in the
+area of transaction control, all of which generally need to be addressed when
+constructing a SQLAlchemy application that uses SQLite.
+
+Legacy Transaction Mode with the sqlite3 driver
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The most important aspect of transaction handling with the sqlite3 driver is
+that it defaults (which will continue through Python 3.15 before being
+removed in Python 3.16) to legacy transactional behavior which does
+not strictly follow :pep:`249`.  The way in which the driver diverges from the
+PEP is that it does not "begin" a transaction automatically as dictated by
+:pep:`249` except in the case of DML statements, e.g. INSERT, UPDATE, and
+DELETE.   Normally, :pep:`249` dictates that a BEGIN must be emitted upon
+the first SQL statement of any kind, so that all subsequent operations will
+be established within a transaction until ``connection.commit()`` has been
+called.   The ``sqlite3`` driver, in an effort to be easier to use in
+highly concurrent environments, skips this step for DQL (e.g. SELECT) statements,
+and also skips it for DDL (e.g. CREATE TABLE etc.) statements for more legacy
+reasons.  Statements such as SAVEPOINT are also skipped.
+
+In modern versions of the ``sqlite3`` driver as of Python 3.12, this legacy
+mode of operation is referred to as
+`"legacy transaction control" <https://docs.python.org/3/library/sqlite3.html#sqlite3-transaction-control-isolation-level>`_, and is in
+effect by default due to the ``Connection.autocommit`` parameter being set to
+the constant ``sqlite3.LEGACY_TRANSACTION_CONTROL``.  Prior to Python 3.12,
+the ``Connection.autocommit`` attribute did not exist.
+
+The implications of legacy transaction mode include:
+
+* **Incorrect support for transactional DDL** - statements like CREATE TABLE, ALTER TABLE,
+  CREATE INDEX etc. will not automatically BEGIN a transaction if one were not
+  started already, leading to the changes by each statement being
+  "autocommitted" immediately unless BEGIN were otherwise emitted first.   Very
+  old (pre Python 3.6) versions of SQLite would also force a COMMIT for these
+  operations even if a transaction were present, however this is no longer the
+  case.
+* **SERIALIZABLE behavior not fully functional** - SQLite's transaction isolation
+  behavior is normally consistent with SERIALIZABLE isolation, as it is a file-
+  based system that locks the database file entirely for write operations,
+  preventing COMMIT until all reader transactions (and associated file locks)
+  have completed.  However, sqlite3's legacy transaction mode fails to emit BEGIN for SELECT
+  statements, which causes these SELECT statements to no longer be "repeatable",
+  failing one of the consistency guarantees of SERIALIZABLE.
+* **Incorrect behavior for SAVEPOINT** - as the SAVEPOINT statement does not
+  imply a BEGIN, a new SAVEPOINT emitted before a BEGIN will function on its
+  own but fails to participate in the enclosing transaction, meaning a ROLLBACK
+  of the transaction will not rollback elements that were part of a released
+  savepoint.
+
+Legacy transaction mode first existed in order to facilitate working around
+SQLite's file locks.  Because SQLite relies upon whole-file locks, it is easy to
+get "database is locked" errors, particularly when newer features like "write
+ahead logging" are disabled.   This is a key reason why ``sqlite3``'s legacy
+transaction mode is still the default mode of operation; disabling it will
+produce behavior that is more susceptible to locked database errors.  However
+note that **legacy transaction mode will no longer be the default** in a future
+Python version (3.16 as of this writing).
+
+.. _sqlite_enabling_transactions:
+
+Enabling Non-Legacy SQLite Transactional Modes with the sqlite3 or aiosqlite driver
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Current SQLAlchemy support allows either for setting the
+``.Connection.autocommit`` attribute, most directly by using a
+:func:`._sa.create_engine` parameter, or if on an older version of Python where
+the attribute is not available, using event hooks to control the behavior of
+BEGIN.
+
+* **Enabling modern sqlite3 transaction control via the autocommit connect parameter** (Python 3.12 and above)
+
+  To use SQLite in the mode described at `Transaction control via the autocommit attribute <https://docs.python.org/3/library/sqlite3.html#transaction-control-via-the-autocommit-attribute>`_,
+  the most straightforward approach is to set the attribute to its recommended value
+  of ``False`` at the connect level using :paramref:`_sa.create_engine.connect_args``::
+
+    from sqlalchemy import create_engine
+
+    engine = create_engine(
+        "sqlite:///myfile.db", connect_args={"autocommit": False}
+    )
+
+  This parameter is also passed through when using the aiosqlite driver::
+
+    from sqlalchemy.ext.asyncio import create_async_engine
+
+    engine = create_async_engine(
+        "sqlite+aiosqlite:///myfile.db", connect_args={"autocommit": False}
+    )
+
+  The parameter can also be set at the attribute level using the :meth:`.PoolEvents.connect`
+  event hook, however this will only work for sqlite3, as aiosqlite does not yet expose this
+  attribute on its ``Connection`` object::
+
+    from sqlalchemy import create_engine, event
+
+    engine = create_engine("sqlite:///myfile.db")
+
+
+    @event.listens_for(engine, "connect")
+    def do_connect(dbapi_connection, connection_record):
+        # enable autocommit=False mode
+        dbapi_connection.autocommit = False
+
+* **Using SQLAlchemy to emit BEGIN in lieu of SQLite's transaction control** (all Python versions, sqlite3 and aiosqlite)
+
+  For older versions of ``sqlite3`` or for cross-compatiblity with older and
+  newer versions, SQLAlchemy can also take over the job of transaction control.
+  This is achieved by using the :meth:`.ConnectionEvents.begin` hook
+  to emit the "BEGIN" command directly, while also disabling SQLite's control
+  of this command using the :meth:`.PoolEvents.connect` event hook to set the
+  ``Connection.isolation_level`` attribute to ``None``::
+
+
+    from sqlalchemy import create_engine, event
+
+    engine = create_engine("sqlite:///myfile.db")
+
+
+    @event.listens_for(engine, "connect")
+    def do_connect(dbapi_connection, connection_record):
+        # disable sqlite3's emitting of the BEGIN statement entirely.
+        dbapi_connection.isolation_level = None
+
+
+    @event.listens_for(engine, "begin")
+    def do_begin(conn):
+        # emit our own BEGIN.   sqlite3 still emits COMMIT/ROLLBACK correctly
+        conn.exec_driver_sql("BEGIN")
+
+  When using the asyncio variant ``aiosqlite``, refer to ``engine.sync_engine``
+  as in the example below::
+
+    from sqlalchemy import create_engine, event
+    from sqlalchemy.ext.asyncio import create_async_engine
+
+    engine = create_async_engine("sqlite+aiosqlite:///myfile.db")
+
+
+    @event.listens_for(engine.sync_engine, "connect")
+    def do_connect(dbapi_connection, connection_record):
+        # disable aiosqlite's emitting of the BEGIN statement entirely.
+        dbapi_connection.isolation_level = None
+
+
+    @event.listens_for(engine.sync_engine, "begin")
+    def do_begin(conn):
+        # emit our own BEGIN.  aiosqlite still emits COMMIT/ROLLBACK correctly
+        conn.exec_driver_sql("BEGIN")
 
 .. _sqlite_isolation_level:
 
-Transaction Isolation Level / Autocommit
-----------------------------------------
-
-SQLite supports "transaction isolation" in a non-standard way, along two
-axes.  One is that of the
-`PRAGMA read_uncommitted <https://www.sqlite.org/pragma.html#pragma_read_uncommitted>`_
-instruction.   This setting can essentially switch SQLite between its
-default mode of ``SERIALIZABLE`` isolation, and a "dirty read" isolation
-mode normally referred to as ``READ UNCOMMITTED``.
-
-SQLAlchemy ties into this PRAGMA statement using the
-:paramref:`_sa.create_engine.isolation_level` parameter of
-:func:`_sa.create_engine`.
-Valid values for this parameter when used with SQLite are ``"SERIALIZABLE"``
-and ``"READ UNCOMMITTED"`` corresponding to a value of 0 and 1, respectively.
-SQLite defaults to ``SERIALIZABLE``, however its behavior is impacted by
-the pysqlite driver's default behavior.
-
-When using the pysqlite driver, the ``"AUTOCOMMIT"`` isolation level is also
-available, which will alter the pysqlite connection using the ``.isolation_level``
-attribute on the DBAPI connection and set it to None for the duration
-of the setting.
-
-.. versionadded:: 1.3.16 added support for SQLite AUTOCOMMIT isolation level
-   when using the pysqlite / sqlite3 SQLite driver.
-
-
-The other axis along which SQLite's transactional locking is impacted is
-via the nature of the ``BEGIN`` statement used.   The three varieties
-are "deferred", "immediate", and "exclusive", as described at
-`BEGIN TRANSACTION <https://sqlite.org/lang_transaction.html>`_.   A straight
-``BEGIN`` statement uses the "deferred" mode, where the database file is
-not locked until the first read or write operation, and read access remains
-open to other transactions until the first write operation.  But again,
-it is critical to note that the pysqlite driver interferes with this behavior
-by *not even emitting BEGIN* until the first write operation.
+Using SQLAlchemy's Driver Level AUTOCOMMIT Feature with SQLite
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-.. warning::
+SQLAlchemy has a comprehensive database isolation feature with optional
+autocommit support that is introduced in the section :ref:`dbapi_autocommit`.
 
-    SQLite's transactional scope is impacted by unresolved
-    issues in the pysqlite driver, which defers BEGIN statements to a greater
-    degree than is often feasible. See the section :ref:`pysqlite_serializable`
-    or :ref:`aiosqlite_serializable` for techniques to work around this behavior.
+For the ``sqlite3`` and ``aiosqlite`` drivers, SQLAlchemy only includes
+built-in support for "AUTOCOMMIT".    Note that this mode is currently incompatible
+with the non-legacy isolation mode hooks documented in the previous
+section at :ref:`sqlite_enabling_transactions`.
 
-.. seealso::
+To use the ``sqlite3`` driver with SQLAlchemy driver-level autocommit,
+create an engine setting the :paramref:`_sa.create_engine.isolation_level`
+parameter to "AUTOCOMMIT"::
+
+    eng = create_engine("sqlite:///myfile.db", isolation_level="AUTOCOMMIT")
+
+When using the above mode, any event hooks that set the sqlite3 ``Connection.autocommit``
+parameter away from its default of ``sqlite3.LEGACY_TRANSACTION_CONTROL``
+as well as hooks that emit ``BEGIN`` should be disabled.
+
+Additional Reading for SQLite / sqlite3 transaction control
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Links with important information on SQLite, the sqlite3 driver,
+as well as long historical conversations on how things got to their current state:
+
+* `Isolation in SQLite <https://www.sqlite.org/isolation.html>`_ - on the SQLite website
+* `Transaction control <https://docs.python.org/3/library/sqlite3.html#transaction-control>`_ - describes the sqlite3 autocommit attribute as well
+  as the legacy isolation_level attribute.
+* `sqlite3 SELECT does not BEGIN a transaction, but should according to spec <https://github.com/python/cpython/issues/54133>`_ - imported Python standard library issue on github
+* `sqlite3 module breaks transactions and potentially corrupts data <https://github.com/python/cpython/issues/54949>`_ - imported Python standard library issue on github
 
-    :ref:`dbapi_autocommit`
 
 INSERT/UPDATE/DELETE...RETURNING
 ---------------------------------
@@ -268,38 +368,6 @@ def bi_c(element, compiler, **kw):
 
 .. versionadded:: 2.0  Added support for SQLite RETURNING
 
-SAVEPOINT Support
-----------------------------
-
-SQLite supports SAVEPOINTs, which only function once a transaction is
-begun.   SQLAlchemy's SAVEPOINT support is available using the
-:meth:`_engine.Connection.begin_nested` method at the Core level, and
-:meth:`.Session.begin_nested` at the ORM level.   However, SAVEPOINTs
-won't work at all with pysqlite unless workarounds are taken.
-
-.. warning::
-
-    SQLite's SAVEPOINT feature is impacted by unresolved
-    issues in the pysqlite and aiosqlite drivers, which defer BEGIN statements
-    to a greater degree than is often feasible. See the sections
-    :ref:`pysqlite_serializable` and :ref:`aiosqlite_serializable`
-    for techniques to work around this behavior.
-
-Transactional DDL
-----------------------------
-
-The SQLite database supports transactional :term:`DDL` as well.
-In this case, the pysqlite driver is not only failing to start transactions,
-it also is ending any existing transaction when DDL is detected, so again,
-workarounds are required.
-
-.. warning::
-
-    SQLite's transactional DDL is impacted by unresolved issues
-    in the pysqlite driver, which fails to emit BEGIN and additionally
-    forces a COMMIT to cancel any transaction when DDL is encountered.
-    See the section :ref:`pysqlite_serializable`
-    for techniques to work around this behavior.
 
 .. _sqlite_foreign_keys:
 
@@ -328,10 +396,18 @@ def bi_c(element, compiler, **kw):
 
     @event.listens_for(Engine, "connect")
     def set_sqlite_pragma(dbapi_connection, connection_record):
+        # the sqlite3 driver will not set PRAGMA foreign_keys
+        # if autocommit=False; set to True temporarily
+        ac = dbapi_connection.autocommit
+        dbapi_connection.autocommit = True
+
         cursor = dbapi_connection.cursor()
         cursor.execute("PRAGMA foreign_keys=ON")
         cursor.close()
 
+        # restore previous autocommit setting
+        dbapi_connection.autocommit = ac
+
 .. warning::
 
     When SQLite foreign keys are enabled, it is **not possible**
@@ -916,7 +992,10 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 import datetime
 import numbers
 import re
+from typing import Any
+from typing import Callable
 from typing import Optional
+from typing import TYPE_CHECKING
 
 from .json import JSON
 from .json import JSONIndexType
@@ -932,7 +1011,6 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 from ...engine import reflection
 from ...engine.reflection import ReflectionDefaults
 from ...sql import coercions
-from ...sql import ColumnElement
 from ...sql import compiler
 from ...sql import elements
 from ...sql import roles
@@ -950,6 +1028,13 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
 from ...types import TIMESTAMP  # noqa
 from ...types import VARCHAR  # noqa
 
+if TYPE_CHECKING:
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import Dialect
+    from ...engine.interfaces import IsolationLevel
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _ResultProcessorType
+
 
 class _SQliteJson(JSON):
     def result_processor(self, dialect, coltype):
@@ -1049,6 +1134,10 @@ class DATETIME(_DateTimeMixin, sqltypes.DateTime):
             regexp=r"(\d+)/(\d+)/(\d+) (\d+)-(\d+)-(\d+)",
         )
 
+    :param truncate_microseconds: when ``True`` microseconds will be truncated
+     from the datetime. Can't be specified together with ``storage_format``
+     or ``regexp``.
+
     :param storage_format: format string which will be applied to the dict
      with keys year, month, day, hour, minute, second, and microsecond.
 
@@ -1084,7 +1173,9 @@ def __init__(self, *args, **kwargs):
                 "%(hour)02d:%(minute)02d:%(second)02d"
             )
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> Optional[_BindProcessorType[Any]]:
         datetime_datetime = datetime.datetime
         datetime_date = datetime.date
         format_ = self._storage_format
@@ -1120,7 +1211,9 @@ def process(value):
 
         return process
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> Optional[_ResultProcessorType[Any]]:
         if self._reg:
             return processors.str_to_datetime_processor_factory(
                 self._reg, datetime.datetime
@@ -1175,7 +1268,9 @@ class DATE(_DateTimeMixin, sqltypes.Date):
 
     _storage_format = "%(year)04d-%(month)02d-%(day)02d"
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> Optional[_BindProcessorType[Any]]:
         datetime_date = datetime.date
         format_ = self._storage_format
 
@@ -1196,7 +1291,9 @@ def process(value):
 
         return process
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> Optional[_ResultProcessorType[Any]]:
         if self._reg:
             return processors.str_to_datetime_processor_factory(
                 self._reg, datetime.date
@@ -1235,6 +1332,10 @@ class TIME(_DateTimeMixin, sqltypes.Time):
             regexp=re.compile("(\d+)-(\d+)-(\d+)-(?:-(\d+))?"),
         )
 
+    :param truncate_microseconds: when ``True`` microseconds will be truncated
+     from the time. Can't be specified together with ``storage_format``
+     or ``regexp``.
+
     :param storage_format: format string which will be applied to the dict
      with keys hour, minute, second, and microsecond.
 
@@ -1360,7 +1461,7 @@ def visit_now_func(self, fn, **kw):
         return "CURRENT_TIMESTAMP"
 
     def visit_localtimestamp_func(self, func, **kw):
-        return 'DATETIME(CURRENT_TIMESTAMP, "localtime")'
+        return "DATETIME(CURRENT_TIMESTAMP, 'localtime')"
 
     def visit_true(self, expr, **kw):
         return "1"
@@ -1491,12 +1592,16 @@ def _on_conflict_target(self, clause, **kw):
                 for c in clause.inferred_target_elements
             )
             if clause.inferred_target_whereclause is not None:
-                target_text += " WHERE %s" % self.process(
-                    clause.inferred_target_whereclause,
+                whereclause_kw = dict(kw)
+                whereclause_kw.update(
                     include_table=False,
                     use_schema=False,
                     literal_execute=True,
                 )
+                target_text += " WHERE %s" % self.process(
+                    clause.inferred_target_whereclause,
+                    **whereclause_kw,
+                )
 
         else:
             target_text = ""
@@ -1523,6 +1628,8 @@ def visit_on_conflict_do_update(self, on_conflict, **kw):
 
         insert_statement = self.stack[-1]["selectable"]
         cols = insert_statement.table.c
+        set_kw = dict(kw)
+        set_kw.update(use_schema=False)
         for c in cols:
             col_key = c.key
 
@@ -1543,7 +1650,9 @@ def visit_on_conflict_do_update(self, on_conflict, **kw):
                 ):
                     value = value._clone()
                     value.type = c.type
-            value_text = self.process(value.self_group(), use_schema=False)
+            value_text = self.process(
+                value.self_group(), is_upsert_set=True, **set_kw
+            )
 
             key_text = self.preparer.quote(c.name)
             action_set_ops.append("%s = %s" % (key_text, value_text))
@@ -1562,18 +1671,21 @@ def visit_on_conflict_do_update(self, on_conflict, **kw):
                 key_text = (
                     self.preparer.quote(k)
                     if isinstance(k, str)
-                    else self.process(k, use_schema=False)
+                    else self.process(k, **set_kw)
                 )
                 value_text = self.process(
                     coercions.expect(roles.ExpressionElementRole, v),
-                    use_schema=False,
+                    is_upsert_set=True,
+                    **set_kw,
                 )
                 action_set_ops.append("%s = %s" % (key_text, value_text))
 
         action_text = ", ".join(action_set_ops)
         if clause.update_whereclause is not None:
+            where_kw = dict(kw)
+            where_kw.update(include_table=True, use_schema=False)
             action_text += " WHERE %s" % self.process(
-                clause.update_whereclause, include_table=True, use_schema=False
+                clause.update_whereclause, **where_kw
             )
 
         return "ON CONFLICT %s DO UPDATE SET %s" % (target_text, action_text)
@@ -1594,9 +1706,13 @@ def get_column_specification(self, column, **kwargs):
         colspec = self.preparer.format_column(column) + " " + coltype
         default = self.get_column_default_string(column)
         if default is not None:
-            if isinstance(column.server_default.arg, ColumnElement):
-                default = "(" + default + ")"
-            colspec += " DEFAULT " + default
+
+            if not re.match(r"""^\s*[\'\"\(]""", default) and re.match(
+                r".*\W.*", default
+            ):
+                colspec += f" DEFAULT ({default})"
+            else:
+                colspec += f" DEFAULT {default}"
 
         if not column.nullable:
             colspec += " NOT NULL"
@@ -1758,12 +1874,18 @@ def visit_create_index(
         return text
 
     def post_create_table(self, table):
-        text = ""
-        if table.dialect_options["sqlite"]["with_rowid"] is False:
-            text += "\n WITHOUT ROWID"
-        if table.dialect_options["sqlite"]["strict"] is True:
-            text += "\n STRICT"
-        return text
+        table_options = []
+
+        if not table.dialect_options["sqlite"]["with_rowid"]:
+            table_options.append("WITHOUT ROWID")
+
+        if table.dialect_options["sqlite"]["strict"]:
+            table_options.append("STRICT")
+
+        if table_options:
+            return "\n " + ",\n ".join(table_options)
+        else:
+            return ""
 
 
 class SQLiteTypeCompiler(compiler.GenericTypeCompiler):
@@ -2032,13 +2154,13 @@ class SQLiteDialect(default.DefaultDialect):
     )
     def __init__(
         self,
-        native_datetime=False,
-        json_serializer=None,
-        json_deserializer=None,
-        _json_serializer=None,
-        _json_deserializer=None,
-        **kwargs,
-    ):
+        native_datetime: bool = False,
+        json_serializer: Optional[Callable[..., Any]] = None,
+        json_deserializer: Optional[Callable[..., Any]] = None,
+        _json_serializer: Optional[Callable[..., Any]] = None,
+        _json_deserializer: Optional[Callable[..., Any]] = None,
+        **kwargs: Any,
+    ) -> None:
         default.DefaultDialect.__init__(self, **kwargs)
 
         if _json_serializer:
@@ -2106,7 +2228,9 @@ def __init__(
     def get_isolation_level_values(self, dbapi_connection):
         return list(self._isolation_lookup)
 
-    def set_isolation_level(self, dbapi_connection, level):
+    def set_isolation_level(
+        self, dbapi_connection: DBAPIConnection, level: IsolationLevel
+    ) -> None:
         isolation_level = self._isolation_lookup[level]
 
         cursor = dbapi_connection.cursor()
@@ -2294,7 +2418,10 @@ def get_columns(self, connection, table_name, schema=None, **kw):
                 )
                 # remove create table
                 match = re.match(
-                    r"create table .*?\((.*)\)$",
+                    (
+                        r"create table .*?\((.*)\)"
+                        r"(?:\s*,?\s*(?:WITHOUT\s+ROWID|STRICT))*$"
+                    ),
                     tablesql.strip(),
                     re.DOTALL | re.IGNORECASE,
                 )
@@ -2425,9 +2552,12 @@ def get_pk_constraint(self, connection, table_name, schema=None, **kw):
         constraint_name = None
         table_data = self._get_table_sql(connection, table_name, schema=schema)
         if table_data:
-            PK_PATTERN = r"CONSTRAINT (\w+) PRIMARY KEY"
+            PK_PATTERN = r'CONSTRAINT +(?:"(.+?)"|(\w+)) +PRIMARY KEY'
             result = re.search(PK_PATTERN, table_data, re.I)
-            constraint_name = result.group(1) if result else None
+            if result:
+                constraint_name = result.group(1) or result.group(2)
+            else:
+                constraint_name = None
 
         cols = self.get_columns(connection, table_name, schema, **kw)
         # consider only pk columns. This also avoids sorting the cached
@@ -2527,7 +2657,7 @@ def parse_fks():
             # so parsing the columns is really about matching it up to what
             # we already have.
             FK_PATTERN = (
-                r"(?:CONSTRAINT (\w+) +)?"
+                r'(?:CONSTRAINT +(?:"(.+?)"|(\w+)) +)?'
                 r"FOREIGN KEY *\( *(.+?) *\) +"
                 r'REFERENCES +(?:(?:"(.+?)")|([a-z0-9_]+)) *\( *((?:(?:"[^"]+"|[a-z0-9_]+) *(?:, *)?)+)\) *'  # noqa: E501
                 r"((?:ON (?:DELETE|UPDATE) "
@@ -2537,6 +2667,7 @@ def parse_fks():
             )
             for match in re.finditer(FK_PATTERN, table_data, re.I):
                 (
+                    constraint_quoted_name,
                     constraint_name,
                     constrained_columns,
                     referred_quoted_name,
@@ -2545,7 +2676,8 @@ def parse_fks():
                     onupdatedelete,
                     deferrable,
                     initially,
-                ) = match.group(1, 2, 3, 4, 5, 6, 7, 8)
+                ) = match.group(1, 2, 3, 4, 5, 6, 7, 8, 9)
+                constraint_name = constraint_quoted_name or constraint_name
                 constrained_columns = list(
                     self._find_cols_in_sig(constrained_columns)
                 )
@@ -2640,14 +2772,17 @@ def get_unique_constraints(
         def parse_uqs():
             if table_data is None:
                 return
-            UNIQUE_PATTERN = r'(?:CONSTRAINT "?(.+?)"? +)?UNIQUE *\((.+?)\)'
+            UNIQUE_PATTERN = (
+                r'(?:CONSTRAINT +(?:"(.+?)"|(\w+)) +)?UNIQUE *\((.+?)\)'
+            )
             INLINE_UNIQUE_PATTERN = (
                 r'(?:(".+?")|(?:[\[`])?([a-z0-9_]+)(?:[\]`])?)[\t ]'
                 r"+[a-z0-9_ ]+?[\t ]+UNIQUE"
             )
 
             for match in re.finditer(UNIQUE_PATTERN, table_data, re.I):
-                name, cols = match.group(1, 2)
+                quoted_name, unquoted_name, cols = match.group(1, 2, 3)
+                name = quoted_name or unquoted_name
                 yield name, list(self._find_cols_in_sig(cols))
 
             # we need to match inlines as well, as we seek to differentiate
@@ -2678,27 +2813,88 @@ def get_check_constraints(self, connection, table_name, schema=None, **kw):
             connection, table_name, schema=schema, **kw
         )
 
-        # NOTE NOTE NOTE
-        # DO NOT CHANGE THIS REGULAR EXPRESSION.   There is no known way
-        # to parse CHECK constraints that contain newlines themselves using
-        # regular expressions, and the approach here relies upon each
-        # individual
-        # CHECK constraint being on a single line by itself.   This
-        # necessarily makes assumptions as to how the CREATE TABLE
-        # was emitted.   A more comprehensive DDL parsing solution would be
-        # needed to improve upon the current situation. See #11840 for
-        # background
-        CHECK_PATTERN = r"(?:CONSTRAINT (.+) +)?CHECK *\( *(.+) *\),? *"
-        cks = []
+        # Extract CHECK constraints by properly handling balanced parentheses
+        # and avoiding false matches when CHECK/CONSTRAINT appear in table
+        # names. See #12924 for context.
+        #
+        # SQLite supports 4 identifier quote styles (see
+        # sqlite.org/lang_keywords.html):
+        # - Double quotes "..." (standard SQL)
+        # - Brackets [...] (MS Access/SQL Server compatibility)
+        # - Backticks `...` (MySQL compatibility)
+        # - Single quotes '...' (SQLite extension)
+        #
+        # NOTE: there is not currently a way to parse CHECK constraints that
+        # contain newlines as the approach here relies upon each individual
+        # CHECK constraint being on a single line by itself.   This necessarily
+        # makes assumptions as to how the CREATE TABLE was emitted.
+        CHECK_PATTERN = re.compile(
+            r"""
+            (?<![A-Za-z0-9_])   # Negative lookbehind: ensure CHECK is not
+                                # part of an identifier (e.g., table name
+                                # like "tableCHECK")
+
+            (?:                 # Optional CONSTRAINT clause
+                CONSTRAINT\s+
+                (               # Group 1: Constraint name (quoted or unquoted)
+                    "(?:[^"]|"")+"        # Double-quoted: "name" or "na""me"
+                    |'(?:[^']|'')+'  # Single-quoted: 'name' or 'na''me'
+                    |\[(?:[^\]]|\]\])+\]  # Bracket-quoted: [name] or [na]]me]
+                    |`(?:[^`]|``)+`       # Backtick-quoted: `name` or `na``me`
+                    |\S+                  # Unquoted: simple_name
+                )
+                \s+
+            )?
 
-        for match in re.finditer(CHECK_PATTERN, table_data or "", re.I):
+            CHECK\s*\(          # CHECK keyword followed by opening paren
+            """,
+            re.VERBOSE | re.IGNORECASE,
+        )
+        cks = []
 
-            name = match.group(1)
+        for match in re.finditer(CHECK_PATTERN, table_data or ""):
+            constraint_name = match.group(1)
+
+            if constraint_name:
+                # Remove surrounding quotes if present
+                # Double quotes: "name" -> name
+                # Single quotes: 'name' -> name
+                # Brackets: [name] -> name
+                # Backticks: `name` -> name
+                constraint_name = re.sub(
+                    r'^(["\'`])(.+)\1$|^\[(.+)\]$',
+                    lambda m: m.group(2) or m.group(3),
+                    constraint_name,
+                    flags=re.DOTALL,
+                )
 
-            if name:
-                name = re.sub(r'^"|"$', "", name)
+            # Find the matching closing parenthesis by counting balanced parens
+            # Must track string context to ignore parens inside string literals
+            start = match.end()  # Position after 'CHECK ('
+            paren_count = 1
+            in_single_quote = False
+            in_double_quote = False
+
+            for pos, char in enumerate(table_data[start:], start):
+                # Track string literal context
+                if char == "'" and not in_double_quote:
+                    in_single_quote = not in_single_quote
+                elif char == '"' and not in_single_quote:
+                    in_double_quote = not in_double_quote
+                # Only count parens when not inside a string literal
+                elif not in_single_quote and not in_double_quote:
+                    if char == "(":
+                        paren_count += 1
+                    elif char == ")":
+                        paren_count -= 1
+                        if paren_count == 0:
+                            # Successfully found matching closing parenthesis
+                            sqltext = table_data[start:pos].strip()
+                            cks.append(
+                                {"sqltext": sqltext, "name": constraint_name}
+                            )
+                            break
 
-            cks.append({"sqltext": match.group(2), "name": name})
         cks.sort(key=lambda d: d["name"] or "~")  # sort None as last
         if cks:
             return cks
diff --git a/libs/sqlalchemy/dialects/sqlite/dml.py b/libs/sqlalchemy/dialects/sqlite/dml.py
index 84cdb8bec2..6012da727c 100644
--- a/libs/sqlalchemy/dialects/sqlite/dml.py
+++ b/libs/sqlalchemy/dialects/sqlite/dml.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/dml.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/sqlite/json.py b/libs/sqlalchemy/dialects/sqlite/json.py
index 02f4ea4c90..c2f4a205aa 100644
--- a/libs/sqlalchemy/dialects/sqlite/json.py
+++ b/libs/sqlalchemy/dialects/sqlite/json.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/json.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/sqlite/provision.py b/libs/sqlalchemy/dialects/sqlite/provision.py
index 97f882e7f2..fa63ab5ed9 100644
--- a/libs/sqlalchemy/dialects/sqlite/provision.py
+++ b/libs/sqlalchemy/dialects/sqlite/provision.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/provision.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -9,20 +9,22 @@
 import os
 import re
 
+from ... import event
 from ... import exc
 from ...engine import url as sa_url
+from ...testing import config
 from ...testing.provision import create_db
 from ...testing.provision import drop_db
 from ...testing.provision import follower_url_from_main
 from ...testing.provision import generate_driver_url
 from ...testing.provision import log
 from ...testing.provision import post_configure_engine
+from ...testing.provision import post_configure_testing_engine
 from ...testing.provision import run_reap_dbs
 from ...testing.provision import stop_test_class_outside_fixtures
 from ...testing.provision import temp_table_keyword_args
 from ...testing.provision import upsert
 
-
 # TODO: I can't get this to build dynamically with pytest-xdist procs
 _drivernames = {
     "pysqlite",
@@ -52,8 +54,6 @@ def _format_url(url, driver, ident):
         assert "test_schema" not in filename
         tokens = re.split(r"[_\.]", filename)
 
-        new_filename = f"{driver}"
-
         for token in tokens:
             if token in _drivernames:
                 if driver is None:
@@ -141,6 +141,31 @@ def dispose(engine):
             os.remove(filename)
 
 
+@post_configure_testing_engine.for_db("sqlite")
+def _sqlite_post_configure_testing_engine(url, engine, options, scope):
+
+    sqlite_savepoint = options.get("sqlite_savepoint", False)
+    sqlite_share_pool = options.get("sqlite_share_pool", False)
+
+    if sqlite_savepoint and engine.name == "sqlite":
+        # apply SQLite savepoint workaround
+        @event.listens_for(engine, "connect")
+        def do_connect(dbapi_connection, connection_record):
+            dbapi_connection.isolation_level = None
+
+        @event.listens_for(engine, "begin")
+        def do_begin(conn):
+            conn.exec_driver_sql("BEGIN")
+
+    if sqlite_share_pool:
+        # SingletonThreadPool, StaticPool both support "transfer"
+        # so a new pool can share the same SQLite connection
+        # (single thread only)
+        if hasattr(engine.pool, "_transfer_from"):
+            options["use_reaper"] = False
+            engine.pool._transfer_from(config.db.pool)
+
+
 @create_db.for_db("sqlite")
 def _sqlite_create_db(cfg, eng, ident):
     pass
@@ -181,7 +206,13 @@ def _reap_sqlite_dbs(url, idents):
 
 @upsert.for_db("sqlite")
 def _upsert(
-    cfg, table, returning, *, set_lambda=None, sort_by_parameter_order=False
+    cfg,
+    table,
+    returning,
+    *,
+    set_lambda=None,
+    sort_by_parameter_order=False,
+    index_elements=None,
 ):
     from sqlalchemy.dialects.sqlite import insert
 
diff --git a/libs/sqlalchemy/dialects/sqlite/pysqlcipher.py b/libs/sqlalchemy/dialects/sqlite/pysqlcipher.py
index 7a3dc1bae1..1a4c251a47 100644
--- a/libs/sqlalchemy/dialects/sqlite/pysqlcipher.py
+++ b/libs/sqlalchemy/dialects/sqlite/pysqlcipher.py
@@ -1,5 +1,5 @@
 # dialects/sqlite/pysqlcipher.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/dialects/sqlite/pysqlite.py b/libs/sqlalchemy/dialects/sqlite/pysqlite.py
index 9dafda6d9d..d2e84466c9 100644
--- a/libs/sqlalchemy/dialects/sqlite/pysqlite.py
+++ b/libs/sqlalchemy/dialects/sqlite/pysqlite.py
@@ -1,10 +1,9 @@
 # dialects/sqlite/pysqlite.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 
 r"""
@@ -258,7 +257,7 @@ def regexp(a, b):
 
 It's been observed that the :class:`.NullPool` implementation incurs an
 extremely small performance overhead for repeated checkouts due to the lack of
-connection re-use implemented by :class:`.QueuePool`.  However, it still
+connection reuse implemented by :class:`.QueuePool`.  However, it still
 may be beneficial to use this class if the application is experiencing
 issues with files being locked.
 
@@ -354,76 +353,10 @@ def process_result_value(self, value, dialect):
 Serializable isolation / Savepoints / Transactional DDL
 -------------------------------------------------------
 
-In the section :ref:`sqlite_concurrency`, we refer to the pysqlite
-driver's assortment of issues that prevent several features of SQLite
-from working correctly.  The pysqlite DBAPI driver has several
-long-standing bugs which impact the correctness of its transactional
-behavior.   In its default mode of operation, SQLite features such as
-SERIALIZABLE isolation, transactional DDL, and SAVEPOINT support are
-non-functional, and in order to use these features, workarounds must
-be taken.
+A newly revised version of this important section is now available
+at the top level of the SQLAlchemy SQLite documentation, in the section
+:ref:`sqlite_transactions`.
 
-The issue is essentially that the driver attempts to second-guess the user's
-intent, failing to start transactions and sometimes ending them prematurely, in
-an effort to minimize the SQLite databases's file locking behavior, even
-though SQLite itself uses "shared" locks for read-only activities.
-
-SQLAlchemy chooses to not alter this behavior by default, as it is the
-long-expected behavior of the pysqlite driver; if and when the pysqlite
-driver attempts to repair these issues, that will be more of a driver towards
-defaults for SQLAlchemy.
-
-The good news is that with a few events, we can implement transactional
-support fully, by disabling pysqlite's feature entirely and emitting BEGIN
-ourselves. This is achieved using two event listeners::
-
-    from sqlalchemy import create_engine, event
-
-    engine = create_engine("sqlite:///myfile.db")
-
-
-    @event.listens_for(engine, "connect")
-    def do_connect(dbapi_connection, connection_record):
-        # disable pysqlite's emitting of the BEGIN statement entirely.
-        # also stops it from emitting COMMIT before any DDL.
-        dbapi_connection.isolation_level = None
-
-
-    @event.listens_for(engine, "begin")
-    def do_begin(conn):
-        # emit our own BEGIN
-        conn.exec_driver_sql("BEGIN")
-
-.. warning:: When using the above recipe, it is advised to not use the
-   :paramref:`.Connection.execution_options.isolation_level` setting on
-   :class:`_engine.Connection` and :func:`_sa.create_engine`
-   with the SQLite driver,
-   as this function necessarily will also alter the ".isolation_level" setting.
-
-
-Above, we intercept a new pysqlite connection and disable any transactional
-integration.   Then, at the point at which SQLAlchemy knows that transaction
-scope is to begin, we emit ``"BEGIN"`` ourselves.
-
-When we take control of ``"BEGIN"``, we can also control directly SQLite's
-locking modes, introduced at
-`BEGIN TRANSACTION <https://sqlite.org/lang_transaction.html>`_,
-by adding the desired locking mode to our ``"BEGIN"``::
-
-    @event.listens_for(engine, "begin")
-    def do_begin(conn):
-        conn.exec_driver_sql("BEGIN EXCLUSIVE")
-
-.. seealso::
-
-    `BEGIN TRANSACTION <https://sqlite.org/lang_transaction.html>`_ -
-    on the SQLite site
-
-    `sqlite3 SELECT does not BEGIN a transaction <https://bugs.python.org/issue9924>`_ -
-    on the Python bug tracker
-
-    `sqlite3 module breaks transactions and potentially corrupts data <https://bugs.python.org/issue10740>`_ -
-    on the Python bug tracker
 
 .. _pysqlite_udfs:
 
@@ -459,10 +392,19 @@ def connect(conn, rec):
             print(conn.scalar(text("SELECT UDF()")))
 
 """  # noqa
+from __future__ import annotations
 
 import math
 import os
 import re
+from typing import Any
+from typing import Callable
+from typing import cast
+from typing import Optional
+from typing import Pattern
+from typing import TYPE_CHECKING
+from typing import TypeVar
+from typing import Union
 
 from .base import DATE
 from .base import DATETIME
@@ -471,16 +413,33 @@ def connect(conn, rec):
 from ... import pool
 from ... import types as sqltypes
 from ... import util
+from ...util.typing import Self
+
+if TYPE_CHECKING:
+    from ...engine.interfaces import ConnectArgsType
+    from ...engine.interfaces import DBAPIConnection
+    from ...engine.interfaces import DBAPICursor
+    from ...engine.interfaces import DBAPIModule
+    from ...engine.interfaces import IsolationLevel
+    from ...engine.interfaces import VersionInfoType
+    from ...engine.url import URL
+    from ...pool.base import PoolProxiedConnection
+    from ...sql.type_api import _BindProcessorType
+    from ...sql.type_api import _ResultProcessorType
 
 
 class _SQLite_pysqliteTimeStamp(DATETIME):
-    def bind_processor(self, dialect):
+    def bind_processor(  # type: ignore[override]
+        self, dialect: SQLiteDialect
+    ) -> Optional[_BindProcessorType[Any]]:
         if dialect.native_datetime:
             return None
         else:
             return DATETIME.bind_processor(self, dialect)
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(  # type: ignore[override]
+        self, dialect: SQLiteDialect, coltype: object
+    ) -> Optional[_ResultProcessorType[Any]]:
         if dialect.native_datetime:
             return None
         else:
@@ -488,13 +447,17 @@ def result_processor(self, dialect, coltype):
 
 
 class _SQLite_pysqliteDate(DATE):
-    def bind_processor(self, dialect):
+    def bind_processor(  # type: ignore[override]
+        self, dialect: SQLiteDialect
+    ) -> Optional[_BindProcessorType[Any]]:
         if dialect.native_datetime:
             return None
         else:
             return DATE.bind_processor(self, dialect)
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(  # type: ignore[override]
+        self, dialect: SQLiteDialect, coltype: object
+    ) -> Optional[_ResultProcessorType[Any]]:
         if dialect.native_datetime:
             return None
         else:
@@ -519,13 +482,13 @@ class SQLiteDialect_pysqlite(SQLiteDialect):
     driver = "pysqlite"
 
     @classmethod
-    def import_dbapi(cls):
+    def import_dbapi(cls) -> DBAPIModule:
         from sqlite3 import dbapi2 as sqlite
 
-        return sqlite
+        return cast("DBAPIModule", sqlite)
 
     @classmethod
-    def _is_url_file_db(cls, url):
+    def _is_url_file_db(cls, url: URL) -> bool:
         if (url.database and url.database != ":memory:") and (
             url.query.get("mode", None) != "memory"
         ):
@@ -534,30 +497,35 @@ def _is_url_file_db(cls, url):
             return False
 
     @classmethod
-    def get_pool_class(cls, url):
+    def get_pool_class(cls, url: URL) -> type[pool.Pool]:
         if cls._is_url_file_db(url):
             return pool.QueuePool
         else:
             return pool.SingletonThreadPool
 
-    def _get_server_version_info(self, connection):
-        return self.dbapi.sqlite_version_info
+    def _get_server_version_info(self, connection: Any) -> VersionInfoType:
+        return self.dbapi.sqlite_version_info  # type: ignore
 
     _isolation_lookup = SQLiteDialect._isolation_lookup.union(
         {
-            "AUTOCOMMIT": None,
+            "AUTOCOMMIT": None,  # type: ignore[dict-item]
         }
     )
 
-    def set_isolation_level(self, dbapi_connection, level):
+    def set_isolation_level(
+        self, dbapi_connection: DBAPIConnection, level: IsolationLevel
+    ) -> None:
         if level == "AUTOCOMMIT":
             dbapi_connection.isolation_level = None
         else:
             dbapi_connection.isolation_level = ""
             return super().set_isolation_level(dbapi_connection, level)
 
-    def on_connect(self):
-        def regexp(a, b):
+    def detect_autocommit_setting(self, dbapi_conn: DBAPIConnection) -> bool:
+        return dbapi_conn.isolation_level is None
+
+    def on_connect(self) -> Callable[[DBAPIConnection], None]:
+        def regexp(a: str, b: Optional[str]) -> Optional[bool]:
             if b is None:
                 return None
             return re.search(a, b) is not None
@@ -571,12 +539,12 @@ def regexp(a, b):
         else:
             create_func_kw = {}
 
-        def set_regexp(dbapi_connection):
+        def set_regexp(dbapi_connection: DBAPIConnection) -> None:
             dbapi_connection.create_function(
                 "regexp", 2, regexp, **create_func_kw
             )
 
-        def floor_func(dbapi_connection):
+        def floor_func(dbapi_connection: DBAPIConnection) -> None:
             # NOTE: floor is optionally present in sqlite 3.35+ , however
             # as it is normally non-present we deliver floor() unconditionally
             # for now.
@@ -587,13 +555,13 @@ def floor_func(dbapi_connection):
 
         fns = [set_regexp, floor_func]
 
-        def connect(conn):
+        def connect(conn: DBAPIConnection) -> None:
             for fn in fns:
                 fn(conn)
 
         return connect
 
-    def create_connect_args(self, url):
+    def create_connect_args(self, url: URL) -> ConnectArgsType:
         if url.username or url.password or url.host or url.port:
             raise exc.ArgumentError(
                 "Invalid SQLite URL: %s\n"
@@ -618,7 +586,7 @@ def create_connect_args(self, url):
             ("cached_statements", int),
         ]
         opts = url.query
-        pysqlite_opts = {}
+        pysqlite_opts: dict[str, Any] = {}
         for key, type_ in pysqlite_args:
             util.coerce_kw_type(opts, key, type_, dest=pysqlite_opts)
 
@@ -635,7 +603,7 @@ def create_connect_args(self, url):
             # to adjust for that here.
             for key, type_ in pysqlite_args:
                 uri_opts.pop(key, None)
-            filename = url.database
+            filename: str = url.database  # type: ignore[assignment]
             if uri_opts:
                 # sorting of keys is for unit test support
                 filename += "?" + (
@@ -655,7 +623,13 @@ def create_connect_args(self, url):
 
         return ([filename], pysqlite_opts)
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
+        cursor: Optional[DBAPICursor],
+    ) -> bool:
+        self.dbapi = cast("DBAPIModule", self.dbapi)
         return isinstance(
             e, self.dbapi.ProgrammingError
         ) and "Cannot operate on a closed database." in str(e)
@@ -677,34 +651,36 @@ class _SQLiteDialect_pysqlite_numeric(SQLiteDialect_pysqlite):
     driver = "pysqlite_numeric"
 
     _first_bind = ":1"
-    _not_in_statement_regexp = None
+    _not_in_statement_regexp: Optional[Pattern[str]] = None
 
-    def __init__(self, *arg, **kw):
+    def __init__(self, *arg: Any, **kw: Any) -> None:
         kw.setdefault("paramstyle", "numeric")
         super().__init__(*arg, **kw)
 
-    def create_connect_args(self, url):
+    def create_connect_args(self, url: URL) -> ConnectArgsType:
         arg, opts = super().create_connect_args(url)
         opts["factory"] = self._fix_sqlite_issue_99953()
         return arg, opts
 
-    def _fix_sqlite_issue_99953(self):
+    def _fix_sqlite_issue_99953(self) -> Any:
         import sqlite3
 
         first_bind = self._first_bind
         if self._not_in_statement_regexp:
             nis = self._not_in_statement_regexp
 
-            def _test_sql(sql):
+            def _test_sql(sql: str) -> None:
                 m = nis.search(sql)
                 assert not m, f"Found {nis.pattern!r} in {sql!r}"
 
         else:
 
-            def _test_sql(sql):
+            def _test_sql(sql: str) -> None:
                 pass
 
-        def _numeric_param_as_dict(parameters):
+        def _numeric_param_as_dict(
+            parameters: Any,
+        ) -> Union[dict[str, Any], tuple[Any, ...]]:
             if parameters:
                 assert isinstance(parameters, tuple)
                 return {
@@ -714,13 +690,13 @@ def _numeric_param_as_dict(parameters):
                 return ()
 
         class SQLiteFix99953Cursor(sqlite3.Cursor):
-            def execute(self, sql, parameters=()):
+            def execute(self, sql: str, parameters: Any = ()) -> Self:
                 _test_sql(sql)
                 if first_bind in sql:
                     parameters = _numeric_param_as_dict(parameters)
                 return super().execute(sql, parameters)
 
-            def executemany(self, sql, parameters):
+            def executemany(self, sql: str, parameters: Any) -> Self:
                 _test_sql(sql)
                 if first_bind in sql:
                     parameters = [
@@ -729,18 +705,27 @@ def executemany(self, sql, parameters):
                 return super().executemany(sql, parameters)
 
         class SQLiteFix99953Connection(sqlite3.Connection):
-            def cursor(self, factory=None):
+            _CursorT = TypeVar("_CursorT", bound=sqlite3.Cursor)
+
+            def cursor(
+                self,
+                factory: Optional[
+                    Callable[[sqlite3.Connection], _CursorT]
+                ] = None,
+            ) -> _CursorT:
                 if factory is None:
-                    factory = SQLiteFix99953Cursor
-                return super().cursor(factory=factory)
+                    factory = SQLiteFix99953Cursor  # type: ignore[assignment]
+                return super().cursor(factory=factory)  # type: ignore[return-value]  # noqa[E501]
 
-            def execute(self, sql, parameters=()):
+            def execute(
+                self, sql: str, parameters: Any = ()
+            ) -> sqlite3.Cursor:
                 _test_sql(sql)
                 if first_bind in sql:
                     parameters = _numeric_param_as_dict(parameters)
                 return super().execute(sql, parameters)
 
-            def executemany(self, sql, parameters):
+            def executemany(self, sql: str, parameters: Any) -> sqlite3.Cursor:
                 _test_sql(sql)
                 if first_bind in sql:
                     parameters = [
@@ -766,6 +751,6 @@ class _SQLiteDialect_pysqlite_dollar(_SQLiteDialect_pysqlite_numeric):
     _first_bind = "$1"
     _not_in_statement_regexp = re.compile(r"[^\d]:\d+")
 
-    def __init__(self, *arg, **kw):
+    def __init__(self, *arg: Any, **kw: Any) -> None:
         kw.setdefault("paramstyle", "numeric_dollar")
         super().__init__(*arg, **kw)
diff --git a/libs/sqlalchemy/engine/__init__.py b/libs/sqlalchemy/engine/__init__.py
index f4205d8926..20a09189d6 100644
--- a/libs/sqlalchemy/engine/__init__.py
+++ b/libs/sqlalchemy/engine/__init__.py
@@ -1,5 +1,5 @@
 # engine/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/_py_processors.py b/libs/sqlalchemy/engine/_py_processors.py
index 8536d53d77..7b1d6b0db2 100644
--- a/libs/sqlalchemy/engine/_py_processors.py
+++ b/libs/sqlalchemy/engine/_py_processors.py
@@ -1,5 +1,5 @@
 # engine/_py_processors.py
-# Copyright (C) 2010-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2010-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 # Copyright (C) 2010 Gaetan de Menten gdementen@gmail.com
 #
diff --git a/libs/sqlalchemy/engine/_py_row.py b/libs/sqlalchemy/engine/_py_row.py
index 38c60fcd27..b83038c2c0 100644
--- a/libs/sqlalchemy/engine/_py_row.py
+++ b/libs/sqlalchemy/engine/_py_row.py
@@ -1,5 +1,5 @@
 # engine/_py_row.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/_py_util.py b/libs/sqlalchemy/engine/_py_util.py
index 50badea2a9..c62929b90c 100644
--- a/libs/sqlalchemy/engine/_py_util.py
+++ b/libs/sqlalchemy/engine/_py_util.py
@@ -1,5 +1,5 @@
 # engine/_py_util.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -32,9 +32,9 @@ def _distill_params_20(
     # Assume list is more likely than tuple
     elif isinstance(params, list) or isinstance(params, tuple):
         # collections_abc.MutableSequence): # avoid abc.__instancecheck__
-        if params and not isinstance(params[0], (tuple, Mapping)):
+        if params and not isinstance(params[0], Mapping):
             raise exc.ArgumentError(
-                "List argument must consist only of tuples or dictionaries"
+                "List argument must consist only of dictionaries"
             )
 
         return params
diff --git a/libs/sqlalchemy/engine/base.py b/libs/sqlalchemy/engine/base.py
index cbf11acf5a..26f162b88c 100644
--- a/libs/sqlalchemy/engine/base.py
+++ b/libs/sqlalchemy/engine/base.py
@@ -1,12 +1,10 @@
 # engine/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-"""Defines :class:`_engine.Connection` and :class:`_engine.Engine`.
-
-"""
+"""Defines :class:`_engine.Connection` and :class:`_engine.Engine`."""
 from __future__ import annotations
 
 import contextlib
@@ -70,12 +68,11 @@
     from ..sql._typing import _InfoType
     from ..sql.compiler import Compiled
     from ..sql.ddl import ExecutableDDLElement
-    from ..sql.ddl import SchemaDropper
-    from ..sql.ddl import SchemaGenerator
+    from ..sql.ddl import InvokeDDLBase
     from ..sql.functions import FunctionElement
     from ..sql.schema import DefaultGenerator
     from ..sql.schema import HasSchemaAttr
-    from ..sql.schema import SchemaItem
+    from ..sql.schema import SchemaVisitable
     from ..sql.selectable import TypedReturnsRows
 
 
@@ -1115,10 +1112,16 @@ def _rollback_impl(self) -> None:
         if self._still_open_and_dbapi_connection_is_valid:
             if self._echo:
                 if self._is_autocommit_isolation():
-                    self._log_info(
-                        "ROLLBACK using DBAPI connection.rollback(), "
-                        "DBAPI should ignore due to autocommit mode"
-                    )
+                    if self.dialect.skip_autocommit_rollback:
+                        self._log_info(
+                            "ROLLBACK will be skipped by "
+                            "skip_autocommit_rollback"
+                        )
+                    else:
+                        self._log_info(
+                            "ROLLBACK using DBAPI connection.rollback(); "
+                            "set skip_autocommit_rollback to prevent fully"
+                        )
                 else:
                     self._log_info("ROLLBACK")
             try:
@@ -1134,7 +1137,7 @@ def _commit_impl(self) -> None:
             if self._is_autocommit_isolation():
                 self._log_info(
                     "COMMIT using DBAPI connection.commit(), "
-                    "DBAPI should ignore due to autocommit mode"
+                    "has no effect due to autocommit mode"
                 )
             else:
                 self._log_info("COMMIT")
@@ -2019,6 +2022,13 @@ def _exec_insertmany_context(
         else:
             do_execute_dispatch = ()
 
+        if engine_events:
+            _WORKAROUND_ISSUE_13018 = getattr(
+                self, "_WORKAROUND_ISSUE_13018", False
+            )
+        else:
+            _WORKAROUND_ISSUE_13018 = False
+
         if self._echo:
             stats = context._get_cache_stats() + " (insertmanyvalues)"
 
@@ -2133,8 +2143,9 @@ def _exec_insertmany_context(
                 self.dispatch.after_cursor_execute(
                     self,
                     cursor,
-                    str_statement,
-                    effective_parameters,
+                    # TODO: this will be fixed by #13018
+                    sub_stmt if _WORKAROUND_ISSUE_13018 else str_statement,
+                    sub_params if _WORKAROUND_ISSUE_13018 else parameters,
                     context,
                     context.executemany,
                 )
@@ -2428,9 +2439,7 @@ def _handle_dbapi_exception_noconnection(
                     break
 
             if sqlalchemy_exception and is_disconnect != ctx.is_disconnect:
-                sqlalchemy_exception.connection_invalidated = is_disconnect = (
-                    ctx.is_disconnect
-                )
+                sqlalchemy_exception.connection_invalidated = ctx.is_disconnect
 
         if newraise:
             raise newraise.with_traceback(exc_info[2]) from e
@@ -2443,8 +2452,8 @@ def _handle_dbapi_exception_noconnection(
 
     def _run_ddl_visitor(
         self,
-        visitorcallable: Type[Union[SchemaGenerator, SchemaDropper]],
-        element: SchemaItem,
+        visitorcallable: Type[InvokeDDLBase],
+        element: SchemaVisitable,
         **kwargs: Any,
     ) -> None:
         """run a DDL visitor.
@@ -2453,7 +2462,9 @@ def _run_ddl_visitor(
         options given to the visitor so that "checkfirst" is skipped.
 
         """
-        visitorcallable(self.dialect, self, **kwargs).traverse_single(element)
+        visitorcallable(
+            dialect=self.dialect, connection=self, **kwargs
+        ).traverse_single(element)
 
 
 class ExceptionContextImpl(ExceptionContext):
@@ -3169,6 +3180,12 @@ def dispose(self, close: bool = True) -> None:
         connections. The latter strategy is more appropriate for an initializer
         in a forked Python process.
 
+        Event listeners associated with the old pool via :class:`.PoolEvents`
+        are **transferred to the new pool**; this is to support the pattern
+        by which :class:`.PoolEvents` are set up in terms of the owning
+        :class:`.Engine` without the need to refer to the :class:`.Pool`
+        directly.
+
         :param close: if left at its default of ``True``, has the
          effect of fully closing all **currently checked in**
          database connections.  Connections that are still checked out
@@ -3194,6 +3211,8 @@ def dispose(self, close: bool = True) -> None:
 
             :ref:`pooling_multiprocessing`
 
+            :meth:`.ConnectionEvents.engine_disposed`
+
         """
         if close:
             self.pool.dispose()
@@ -3241,8 +3260,8 @@ def begin(self) -> Iterator[Connection]:
 
     def _run_ddl_visitor(
         self,
-        visitorcallable: Type[Union[SchemaGenerator, SchemaDropper]],
-        element: SchemaItem,
+        visitorcallable: Type[InvokeDDLBase],
+        element: SchemaVisitable,
         **kwargs: Any,
     ) -> None:
         with self.begin() as conn:
diff --git a/libs/sqlalchemy/engine/characteristics.py b/libs/sqlalchemy/engine/characteristics.py
index 322c28b5aa..ef7d65fec8 100644
--- a/libs/sqlalchemy/engine/characteristics.py
+++ b/libs/sqlalchemy/engine/characteristics.py
@@ -1,5 +1,5 @@
 # engine/characteristics.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/create.py b/libs/sqlalchemy/engine/create.py
index 920f620bd4..9ab94763b0 100644
--- a/libs/sqlalchemy/engine/create.py
+++ b/libs/sqlalchemy/engine/create.py
@@ -1,5 +1,5 @@
 # engine/create.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -468,6 +468,9 @@ def create_engine(url: Union[str, _url.URL], **kwargs: Any) -> Engine:
 
             :ref:`pool_reset_on_return`
 
+            :ref:`dbapi_autocommit_skip_rollback` - a more modern approach
+            to using connections with no transactional instructions
+
     :param pool_timeout=30: number of seconds to wait before giving
         up on getting a connection from the pool. This is only used
         with :class:`~sqlalchemy.pool.QueuePool`. This can be a float but is
@@ -524,6 +527,18 @@ def create_engine(url: Union[str, _url.URL], **kwargs: Any) -> Engine:
 
      .. versionadded:: 1.4
 
+    :param skip_autocommit_rollback: When True, the dialect will
+       unconditionally skip all calls to the DBAPI ``connection.rollback()``
+       method if the DBAPI connection is confirmed to be in "autocommit" mode.
+       The availability of this feature is dialect specific; if not available,
+       a ``NotImplementedError`` is raised by the dialect when rollback occurs.
+
+       .. seealso::
+
+            :ref:`dbapi_autocommit_skip_rollback`
+
+       .. versionadded:: 2.0.43
+
     :param use_insertmanyvalues: True by default, use the "insertmanyvalues"
      execution style for INSERT..RETURNING statements by default.
 
@@ -615,8 +630,8 @@ def pop_kwarg(key: str, default: Optional[Any] = None) -> Any:
     dialect = dialect_cls(**dialect_args)
 
     # assemble connection arguments
-    (cargs_tup, cparams) = dialect.create_connect_args(u)
-    cparams.update(pop_kwarg("connect_args", {}))
+    (cargs_tup, _cparams) = dialect.create_connect_args(u)
+    cparams = util.immutabledict(_cparams).union(pop_kwarg("connect_args", {}))
 
     if "async_fallback" in cparams and util.asbool(cparams["async_fallback"]):
         util.warn_deprecated(
@@ -625,8 +640,6 @@ def pop_kwarg(key: str, default: Optional[Any] = None) -> Any:
             "2.0",
         )
 
-    cargs = list(cargs_tup)  # allow mutability
-
     # look for existing pool or create
     pool = pop_kwarg("pool", None)
     if pool is None:
@@ -635,15 +648,23 @@ def connect(
             connection_record: Optional[ConnectionPoolEntry] = None,
         ) -> DBAPIConnection:
             if dialect._has_events:
+                mutable_cargs = list(cargs_tup)
+                mutable_cparams = dict(cparams)
                 for fn in dialect.dispatch.do_connect:
                     connection = cast(
                         DBAPIConnection,
-                        fn(dialect, connection_record, cargs, cparams),
+                        fn(
+                            dialect,
+                            connection_record,
+                            mutable_cargs,
+                            mutable_cparams,
+                        ),
                     )
                     if connection is not None:
                         return connection
-
-            return dialect.connect(*cargs, **cparams)
+                return dialect.connect(*mutable_cargs, **mutable_cparams)
+            else:
+                return dialect.connect(*cargs_tup, **cparams)
 
         creator = pop_kwarg("creator", connect)
 
diff --git a/libs/sqlalchemy/engine/cursor.py b/libs/sqlalchemy/engine/cursor.py
index ff14ad8eed..801fa4ff9e 100644
--- a/libs/sqlalchemy/engine/cursor.py
+++ b/libs/sqlalchemy/engine/cursor.py
@@ -1,10 +1,9 @@
 # engine/cursor.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: allow-untyped-defs, allow-untyped-calls
 
 """Define cursor-specific result set constructs including
 :class:`.CursorResult`."""
@@ -19,7 +18,9 @@
 from typing import Any
 from typing import cast
 from typing import ClassVar
+from typing import Deque
 from typing import Dict
+from typing import Iterable
 from typing import Iterator
 from typing import List
 from typing import Mapping
@@ -51,6 +52,7 @@
 from ..sql.compiler import RM_TYPE
 from ..sql.type_api import TypeEngine
 from ..util import compat
+from ..util.typing import Final
 from ..util.typing import Literal
 from ..util.typing import Self
 
@@ -59,7 +61,10 @@
     from .base import Connection
     from .default import DefaultExecutionContext
     from .interfaces import _DBAPICursorDescription
+    from .interfaces import _MutableCoreSingleExecuteParams
+    from .interfaces import CoreExecuteOptionsParameter
     from .interfaces import DBAPICursor
+    from .interfaces import DBAPIType
     from .interfaces import Dialect
     from .interfaces import ExecutionContext
     from .result import _KeyIndexType
@@ -68,56 +73,57 @@
     from .result import _KeyType
     from .result import _ProcessorsType
     from .result import _TupleGetterType
+    from ..sql.schema import Column
     from ..sql.type_api import _ResultProcessorType
 
 
 _T = TypeVar("_T", bound=Any)
-
+TupleAny = Tuple[Any, ...]
 
 # metadata entry tuple indexes.
 # using raw tuple is faster than namedtuple.
 # these match up to the positions in
 # _CursorKeyMapRecType
-MD_INDEX: Literal[0] = 0
+MD_INDEX: Final[Literal[0]] = 0
 """integer index in cursor.description
 
 """
 
-MD_RESULT_MAP_INDEX: Literal[1] = 1
+MD_RESULT_MAP_INDEX: Final[Literal[1]] = 1
 """integer index in compiled._result_columns"""
 
-MD_OBJECTS: Literal[2] = 2
+MD_OBJECTS: Final[Literal[2]] = 2
 """other string keys and ColumnElement obj that can match.
 
 This comes from compiler.RM_OBJECTS / compiler.ResultColumnsEntry.objects
 
 """
 
-MD_LOOKUP_KEY: Literal[3] = 3
+MD_LOOKUP_KEY: Final[Literal[3]] = 3
 """string key we usually expect for key-based lookup
 
 this comes from compiler.RM_NAME / compiler.ResultColumnsEntry.name
 """
 
 
-MD_RENDERED_NAME: Literal[4] = 4
+MD_RENDERED_NAME: Final[Literal[4]] = 4
 """name that is usually in cursor.description
 
 this comes from compiler.RENDERED_NAME / compiler.ResultColumnsEntry.keyname
 """
 
 
-MD_PROCESSOR: Literal[5] = 5
+MD_PROCESSOR: Final[Literal[5]] = 5
 """callable to process a result value into a row"""
 
-MD_UNTRANSLATED: Literal[6] = 6
+MD_UNTRANSLATED: Final[Literal[6]] = 6
 """raw name from cursor.description"""
 
 
 _CursorKeyMapRecType = Tuple[
     Optional[int],  # MD_INDEX, None means the record is ambiguously named
-    int,  # MD_RESULT_MAP_INDEX
-    List[Any],  # MD_OBJECTS
+    int,  # MD_RESULT_MAP_INDEX, -1 if MD_INDEX is None
+    TupleAny,  # MD_OBJECTS
     str,  # MD_LOOKUP_KEY
     str,  # MD_RENDERED_NAME
     Optional["_ResultProcessorType[Any]"],  # MD_PROCESSOR
@@ -138,6 +144,16 @@
     str,
 ]
 
+_MergeColTuple = Tuple[
+    int,
+    Optional[int],
+    str,
+    TypeEngine[Any],
+    "DBAPIType",
+    Optional[TupleAny],
+    Optional[str],
+]
+
 
 class CursorResultMetaData(ResultMetaData):
     """Result metadata for DBAPI cursors."""
@@ -221,21 +237,17 @@ def _splice_horizontally(
 
         keymap = dict(self._keymap)
         offset = len(self._keys)
-        keymap.update(
-            {
-                key: (
-                    # int index should be None for ambiguous key
-                    (
-                        value[0] + offset
-                        if value[0] is not None and key not in keymap
-                        else None
-                    ),
-                    value[1] + offset,
-                    *value[2:],
-                )
-                for key, value in other._keymap.items()
-            }
-        )
+
+        for key, value in other._keymap.items():
+            # int index should be None for ambiguous key
+            if value[MD_INDEX] is not None and key not in keymap:
+                md_index = value[MD_INDEX] + offset
+                md_object = value[MD_RESULT_MAP_INDEX] + offset
+            else:
+                md_index = None
+                md_object = -1
+            keymap[key] = (md_index, md_object, *value[2:])
+
         return self._make_new_metadata(
             unpickled=self._unpickled,
             processors=self._processors + other._processors,  # type: ignore
@@ -316,7 +328,7 @@ def _adapt_to_context(self, context: ExecutionContext) -> ResultMetaData:
         keymap_by_position = self._keymap_by_result_column_idx
 
         if keymap_by_position is None:
-            # first retrival from cache, this map will not be set up yet,
+            # first retrieval from cache, this map will not be set up yet,
             # initialize lazily
             keymap_by_position = self._keymap_by_result_column_idx = {
                 metadata_entry[MD_RESULT_MAP_INDEX]: metadata_entry
@@ -400,7 +412,7 @@ def __init__(
         # column keys and other names
         if num_ctx_cols:
             # keymap by primary string...
-            by_key = {
+            by_key: Dict[_KeyType, _CursorKeyMapRecType] = {
                 metadata_entry[MD_LOOKUP_KEY]: metadata_entry
                 for metadata_entry in raw
             }
@@ -446,7 +458,7 @@ def __init__(
                 # record into by_key.
                 by_key.update(
                     {
-                        key: (None, None, [], key, key, None, None)
+                        key: (None, -1, (), key, key, None, None)
                         for key in dupes
                     }
                 )
@@ -495,15 +507,15 @@ def __init__(
 
     def _merge_cursor_description(
         self,
-        context,
-        cursor_description,
-        result_columns,
-        num_ctx_cols,
-        cols_are_ordered,
-        textual_ordered,
-        ad_hoc_textual,
-        loose_column_name_matching,
-    ):
+        context: DefaultExecutionContext,
+        cursor_description: _DBAPICursorDescription,
+        result_columns: Sequence[ResultColumnsEntry],
+        num_ctx_cols: int,
+        cols_are_ordered: bool,
+        textual_ordered: bool,
+        ad_hoc_textual: bool,
+        loose_column_name_matching: bool,
+    ) -> List[_CursorKeyMapRecType]:
         """Merge a cursor.description with compiled result column information.
 
         There are at least four separate strategies used here, selected
@@ -633,7 +645,7 @@ def _merge_cursor_description(
                         mapped_type, cursor_colname, coltype
                     ),
                     untranslated,
-                )
+                )  # type: ignore[misc]
                 for (
                     idx,
                     ridx,
@@ -645,7 +657,11 @@ def _merge_cursor_description(
                 ) in raw_iterator
             ]
 
-    def _colnames_from_description(self, context, cursor_description):
+    def _colnames_from_description(
+        self,
+        context: DefaultExecutionContext,
+        cursor_description: _DBAPICursorDescription,
+    ) -> Iterator[Tuple[int, str, Optional[str], DBAPIType]]:
         """Extract column names and data types from a cursor.description.
 
         Applies unicode decoding, column translation, "normalization",
@@ -677,8 +693,11 @@ def _colnames_from_description(self, context, cursor_description):
             yield idx, colname, untranslated, coltype
 
     def _merge_textual_cols_by_position(
-        self, context, cursor_description, result_columns
-    ):
+        self,
+        context: DefaultExecutionContext,
+        cursor_description: _DBAPICursorDescription,
+        result_columns: Sequence[ResultColumnsEntry],
+    ) -> Iterator[_MergeColTuple]:
         num_ctx_cols = len(result_columns)
 
         if num_ctx_cols > len(cursor_description):
@@ -714,11 +733,11 @@ def _merge_textual_cols_by_position(
 
     def _merge_cols_by_name(
         self,
-        context,
-        cursor_description,
-        result_columns,
-        loose_column_name_matching,
-    ):
+        context: DefaultExecutionContext,
+        cursor_description: _DBAPICursorDescription,
+        result_columns: Sequence[ResultColumnsEntry],
+        loose_column_name_matching: bool,
+    ) -> Iterator[_MergeColTuple]:
         match_map = self._create_description_match_map(
             result_columns, loose_column_name_matching
         )
@@ -753,11 +772,9 @@ def _merge_cols_by_name(
     @classmethod
     def _create_description_match_map(
         cls,
-        result_columns: List[ResultColumnsEntry],
+        result_columns: Sequence[ResultColumnsEntry],
         loose_column_name_matching: bool = False,
-    ) -> Dict[
-        Union[str, object], Tuple[str, Tuple[Any, ...], TypeEngine[Any], int]
-    ]:
+    ) -> Dict[Union[str, object], Tuple[str, TupleAny, TypeEngine[Any], int]]:
         """when matching cursor.description to a set of names that are present
         in a Compiled object, as is the case with TextualSelect, get all the
         names we expect might match those in cursor.description.
@@ -765,7 +782,7 @@ def _create_description_match_map(
 
         d: Dict[
             Union[str, object],
-            Tuple[str, Tuple[Any, ...], TypeEngine[Any], int],
+            Tuple[str, TupleAny, TypeEngine[Any], int],
         ] = {}
         for ridx, elem in enumerate(result_columns):
             key = elem[RM_RENDERED_NAME]
@@ -792,7 +809,13 @@ def _create_description_match_map(
                     )
         return d
 
-    def _merge_cols_by_none(self, context, cursor_description):
+    def _merge_cols_by_none(
+        self,
+        context: DefaultExecutionContext,
+        cursor_description: _DBAPICursorDescription,
+    ) -> Iterator[_MergeColTuple]:
+        self._keys = []
+
         for (
             idx,
             colname,
@@ -828,13 +851,17 @@ def _key_fallback(
             else:
                 return None
 
-    def _raise_for_ambiguous_column_name(self, rec):
+    def _raise_for_ambiguous_column_name(
+        self, rec: _KeyMapRecType
+    ) -> NoReturn:
         raise exc.InvalidRequestError(
             "Ambiguous column name '%s' in "
             "result set column descriptions" % rec[MD_LOOKUP_KEY]
         )
 
-    def _index_for_key(self, key: Any, raiseerr: bool = True) -> Optional[int]:
+    def _index_for_key(
+        self, key: _KeyIndexType, raiseerr: bool = True
+    ) -> Optional[int]:
         # TODO: can consider pre-loading ints and negative ints
         # into _keymap - also no coverage here
         if isinstance(key, int):
@@ -853,22 +880,24 @@ def _index_for_key(self, key: Any, raiseerr: bool = True) -> Optional[int]:
             self._raise_for_ambiguous_column_name(rec)
         return index
 
-    def _indexes_for_keys(self, keys):
+    def _indexes_for_keys(
+        self, keys: Sequence[_KeyIndexType]
+    ) -> Sequence[int]:
         try:
-            return [self._keymap[key][0] for key in keys]
+            return [self._keymap[key][0] for key in keys]  # type: ignore[index,misc]  # noqa: E501
         except KeyError as ke:
             # ensure it raises
             CursorResultMetaData._key_fallback(self, ke.args[0], ke)
 
     def _metadata_for_keys(
-        self, keys: Sequence[Any]
+        self, keys: Sequence[_KeyIndexType]
     ) -> Iterator[_NonAmbigCursorKeyMapRecType]:
         for key in keys:
             if int in key.__class__.__mro__:
-                key = self._keys[key]
+                key = self._keys[key]  # type: ignore[index]
 
             try:
-                rec = self._keymap[key]
+                rec = self._keymap[key]  # type: ignore[index]
             except KeyError as ke:
                 # ensure it raises
                 CursorResultMetaData._key_fallback(self, ke.args[0], ke)
@@ -880,7 +909,7 @@ def _metadata_for_keys(
 
             yield cast(_NonAmbigCursorKeyMapRecType, rec)
 
-    def __getstate__(self):
+    def __getstate__(self) -> Dict[str, Any]:
         # TODO: consider serializing this as SimpleResultMetaData
         return {
             "_keymap": {
@@ -900,7 +929,7 @@ def __getstate__(self):
             "_translated_indexes": self._translated_indexes,
         }
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: Dict[str, Any]) -> None:
         self._processors = [None for _ in range(len(state["_keys"]))]
         self._keymap = state["_keymap"]
         self._keymap_by_result_column_idx = None
@@ -941,7 +970,7 @@ def hard_close(
     def yield_per(
         self,
         result: CursorResult[Any],
-        dbapi_cursor: Optional[DBAPICursor],
+        dbapi_cursor: DBAPICursor,
         num: int,
     ) -> None:
         return
@@ -989,22 +1018,47 @@ class NoCursorFetchStrategy(ResultFetchStrategy):
 
     __slots__ = ()
 
-    def soft_close(self, result, dbapi_cursor):
+    def soft_close(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: Optional[DBAPICursor],
+    ) -> None:
         pass
 
-    def hard_close(self, result, dbapi_cursor):
+    def hard_close(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: Optional[DBAPICursor],
+    ) -> None:
         pass
 
-    def fetchone(self, result, dbapi_cursor, hard_close=False):
+    def fetchone(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        hard_close: bool = False,
+    ) -> Any:
         return self._non_result(result, None)
 
-    def fetchmany(self, result, dbapi_cursor, size=None):
+    def fetchmany(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        size: Optional[int] = None,
+    ) -> Any:
         return self._non_result(result, [])
 
-    def fetchall(self, result, dbapi_cursor):
+    def fetchall(
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor
+    ) -> Any:
         return self._non_result(result, [])
 
-    def _non_result(self, result, default, err=None):
+    def _non_result(
+        self,
+        result: CursorResult[Any],
+        default: Any,
+        err: Optional[BaseException] = None,
+    ) -> Any:
         raise NotImplementedError()
 
 
@@ -1021,7 +1075,12 @@ class NoCursorDQLFetchStrategy(NoCursorFetchStrategy):
 
     __slots__ = ()
 
-    def _non_result(self, result, default, err=None):
+    def _non_result(
+        self,
+        result: CursorResult[Any],
+        default: Any,
+        err: Optional[BaseException] = None,
+    ) -> Any:
         if result.closed:
             raise exc.ResourceClosedError(
                 "This result object is closed."
@@ -1043,10 +1102,15 @@ class NoCursorDMLFetchStrategy(NoCursorFetchStrategy):
 
     __slots__ = ()
 
-    def _non_result(self, result, default, err=None):
+    def _non_result(
+        self,
+        result: CursorResult[Any],
+        default: Any,
+        err: Optional[BaseException] = None,
+    ) -> Any:
         # we only expect to have a _NoResultMetaData() here right now.
         assert not result._metadata.returns_rows
-        result._metadata._we_dont_return_rows(err)
+        result._metadata._we_dont_return_rows(err)  # type: ignore[union-attr]
 
 
 _NO_CURSOR_DML = NoCursorDMLFetchStrategy()
@@ -1083,10 +1147,7 @@ def handle_exception(
         )
 
     def yield_per(
-        self,
-        result: CursorResult[Any],
-        dbapi_cursor: Optional[DBAPICursor],
-        num: int,
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor, num: int
     ) -> None:
         result.cursor_strategy = BufferedRowCursorFetchStrategy(
             dbapi_cursor,
@@ -1175,11 +1236,11 @@ class BufferedRowCursorFetchStrategy(CursorFetchStrategy):
 
     def __init__(
         self,
-        dbapi_cursor,
-        execution_options,
-        growth_factor=5,
-        initial_buffer=None,
-    ):
+        dbapi_cursor: DBAPICursor,
+        execution_options: CoreExecuteOptionsParameter,
+        growth_factor: int = 5,
+        initial_buffer: Optional[Deque[Any]] = None,
+    ) -> None:
         self._max_row_buffer = execution_options.get("max_row_buffer", 1000)
 
         if initial_buffer is not None:
@@ -1194,13 +1255,17 @@ def __init__(
             self._bufsize = self._max_row_buffer
 
     @classmethod
-    def create(cls, result):
+    def create(
+        cls, result: CursorResult[Any]
+    ) -> BufferedRowCursorFetchStrategy:
         return BufferedRowCursorFetchStrategy(
             result.cursor,
             result.context.execution_options,
         )
 
-    def _buffer_rows(self, result, dbapi_cursor):
+    def _buffer_rows(
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor
+    ) -> None:
         """this is currently used only by fetchone()."""
 
         size = self._bufsize
@@ -1220,19 +1285,30 @@ def _buffer_rows(self, result, dbapi_cursor):
                 self._max_row_buffer, size * self._growth_factor
             )
 
-    def yield_per(self, result, dbapi_cursor, num):
+    def yield_per(
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor, num: int
+    ) -> None:
         self._growth_factor = 0
         self._max_row_buffer = self._bufsize = num
 
-    def soft_close(self, result, dbapi_cursor):
+    def soft_close(
+        self, result: CursorResult[Any], dbapi_cursor: Optional[DBAPICursor]
+    ) -> None:
         self._rowbuffer.clear()
         super().soft_close(result, dbapi_cursor)
 
-    def hard_close(self, result, dbapi_cursor):
+    def hard_close(
+        self, result: CursorResult[Any], dbapi_cursor: Optional[DBAPICursor]
+    ) -> None:
         self._rowbuffer.clear()
         super().hard_close(result, dbapi_cursor)
 
-    def fetchone(self, result, dbapi_cursor, hard_close=False):
+    def fetchone(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        hard_close: bool = False,
+    ) -> Any:
         if not self._rowbuffer:
             self._buffer_rows(result, dbapi_cursor)
             if not self._rowbuffer:
@@ -1243,7 +1319,12 @@ def fetchone(self, result, dbapi_cursor, hard_close=False):
                 return None
         return self._rowbuffer.popleft()
 
-    def fetchmany(self, result, dbapi_cursor, size=None):
+    def fetchmany(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        size: Optional[int] = None,
+    ) -> Any:
         if size is None:
             return self.fetchall(result, dbapi_cursor)
 
@@ -1267,7 +1348,9 @@ def fetchmany(self, result, dbapi_cursor, size=None):
             result._soft_close()
         return res
 
-    def fetchall(self, result, dbapi_cursor):
+    def fetchall(
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor
+    ) -> Any:
         try:
             ret = list(self._rowbuffer) + list(dbapi_cursor.fetchall())
             self._rowbuffer.clear()
@@ -1289,33 +1372,53 @@ class FullyBufferedCursorFetchStrategy(CursorFetchStrategy):
     __slots__ = ("_rowbuffer", "alternate_cursor_description")
 
     def __init__(
-        self, dbapi_cursor, alternate_description=None, initial_buffer=None
+        self,
+        dbapi_cursor: Optional[DBAPICursor],
+        alternate_description: Optional[_DBAPICursorDescription] = None,
+        initial_buffer: Optional[Iterable[Any]] = None,
     ):
         self.alternate_cursor_description = alternate_description
         if initial_buffer is not None:
             self._rowbuffer = collections.deque(initial_buffer)
         else:
+            assert dbapi_cursor is not None
             self._rowbuffer = collections.deque(dbapi_cursor.fetchall())
 
-    def yield_per(self, result, dbapi_cursor, num):
+    def yield_per(
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor, num: int
+    ) -> Any:
         pass
 
-    def soft_close(self, result, dbapi_cursor):
+    def soft_close(
+        self, result: CursorResult[Any], dbapi_cursor: Optional[DBAPICursor]
+    ) -> None:
         self._rowbuffer.clear()
         super().soft_close(result, dbapi_cursor)
 
-    def hard_close(self, result, dbapi_cursor):
+    def hard_close(
+        self, result: CursorResult[Any], dbapi_cursor: Optional[DBAPICursor]
+    ) -> None:
         self._rowbuffer.clear()
         super().hard_close(result, dbapi_cursor)
 
-    def fetchone(self, result, dbapi_cursor, hard_close=False):
+    def fetchone(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        hard_close: bool = False,
+    ) -> Any:
         if self._rowbuffer:
             return self._rowbuffer.popleft()
         else:
             result._soft_close(hard=hard_close)
             return None
 
-    def fetchmany(self, result, dbapi_cursor, size=None):
+    def fetchmany(
+        self,
+        result: CursorResult[Any],
+        dbapi_cursor: DBAPICursor,
+        size: Optional[int] = None,
+    ) -> Any:
         if size is None:
             return self.fetchall(result, dbapi_cursor)
 
@@ -1325,7 +1428,9 @@ def fetchmany(self, result, dbapi_cursor, size=None):
             result._soft_close()
         return rows
 
-    def fetchall(self, result, dbapi_cursor):
+    def fetchall(
+        self, result: CursorResult[Any], dbapi_cursor: DBAPICursor
+    ) -> Any:
         ret = self._rowbuffer
         self._rowbuffer = collections.deque()
         result._soft_close()
@@ -1337,35 +1442,37 @@ class _NoResultMetaData(ResultMetaData):
 
     returns_rows = False
 
-    def _we_dont_return_rows(self, err=None):
+    def _we_dont_return_rows(
+        self, err: Optional[BaseException] = None
+    ) -> NoReturn:
         raise exc.ResourceClosedError(
             "This result object does not return rows. "
             "It has been closed automatically."
         ) from err
 
-    def _index_for_key(self, keys, raiseerr):
+    def _index_for_key(self, keys: _KeyIndexType, raiseerr: bool) -> NoReturn:
         self._we_dont_return_rows()
 
-    def _metadata_for_keys(self, key):
+    def _metadata_for_keys(self, keys: Sequence[_KeyIndexType]) -> NoReturn:
         self._we_dont_return_rows()
 
-    def _reduce(self, keys):
+    def _reduce(self, keys: Sequence[_KeyIndexType]) -> NoReturn:
         self._we_dont_return_rows()
 
     @property
-    def _keymap(self):
+    def _keymap(self) -> NoReturn:  # type: ignore[override]
         self._we_dont_return_rows()
 
     @property
-    def _key_to_index(self):
+    def _key_to_index(self) -> NoReturn:  # type: ignore[override]
         self._we_dont_return_rows()
 
     @property
-    def _processors(self):
+    def _processors(self) -> NoReturn:  # type: ignore[override]
         self._we_dont_return_rows()
 
     @property
-    def keys(self):
+    def keys(self) -> NoReturn:
         self._we_dont_return_rows()
 
 
@@ -1454,7 +1561,7 @@ def __init__(
                     slice(-context._num_sentinel_cols)
                 )
 
-                def _sliced_row(raw_data):
+                def _sliced_row(raw_data: Any) -> Any:
                     return _make_row(sentinel_filter(raw_data))
 
                 sliced_row = _sliced_row
@@ -1464,25 +1571,30 @@ def _sliced_row(raw_data):
             if echo:
                 log = self.context.connection._log_debug
 
-                def _log_row(row):
+                def _log_row(row: Any) -> Any:
                     log("Row %r", sql_util._repr_row(row))
                     return row
 
                 self._row_logging_fn = _log_row
 
-                def _make_row_2(row):
+                def _make_row_2(row: Any) -> Any:
                     return _log_row(sliced_row(row))
 
                 make_row = _make_row_2
             else:
-                make_row = sliced_row
+                make_row = sliced_row  # type: ignore[assignment]
             self._set_memoized_attribute("_row_getter", make_row)
 
         else:
             assert context._num_sentinel_cols == 0
             self._metadata = self._no_result_metadata
 
-    def _init_metadata(self, context, cursor_description):
+    def _init_metadata(
+        self,
+        context: DefaultExecutionContext,
+        cursor_description: _DBAPICursorDescription,
+    ) -> CursorResultMetaData:
+
         if context.compiled:
             compiled = context.compiled
 
@@ -1513,9 +1625,9 @@ def _init_metadata(self, context, cursor_description):
                 )
                 and compiled._result_columns
                 and context.cache_hit is context.dialect.CACHE_HIT
-                and compiled.statement is not context.invoked_statement
+                and compiled.statement is not context.invoked_statement  # type: ignore[comparison-overlap] # noqa: E501
             ):
-                metadata = metadata._adapt_to_context(context)
+                metadata = metadata._adapt_to_context(context)  # type: ignore[assignment] # noqa: E501
 
             self._metadata = metadata
 
@@ -1529,7 +1641,7 @@ def _init_metadata(self, context, cursor_description):
             )
         return metadata
 
-    def _soft_close(self, hard=False):
+    def _soft_close(self, hard: bool = False) -> None:
         """Soft close this :class:`_engine.CursorResult`.
 
         This releases all DBAPI cursor resources, but leaves the
@@ -1567,7 +1679,7 @@ def _soft_close(self, hard=False):
             self._soft_closed = True
 
     @property
-    def inserted_primary_key_rows(self):
+    def inserted_primary_key_rows(self) -> List[Optional[Any]]:
         """Return the value of
         :attr:`_engine.CursorResult.inserted_primary_key`
         as a row contained within a list; some dialects may support a
@@ -1626,10 +1738,10 @@ def inserted_primary_key_rows(self):
                 "when returning() "
                 "is used."
             )
-        return self.context.inserted_primary_key_rows
+        return self.context.inserted_primary_key_rows  # type: ignore[no-any-return]  # noqa: E501
 
     @property
-    def inserted_primary_key(self):
+    def inserted_primary_key(self) -> Optional[Any]:
         """Return the primary key for the row just inserted.
 
         The return value is a :class:`_result.Row` object representing
@@ -1674,7 +1786,11 @@ def inserted_primary_key(self):
         else:
             return None
 
-    def last_updated_params(self):
+    def last_updated_params(
+        self,
+    ) -> Union[
+        List[_MutableCoreSingleExecuteParams], _MutableCoreSingleExecuteParams
+    ]:
         """Return the collection of updated parameters from this
         execution.
 
@@ -1696,7 +1812,11 @@ def last_updated_params(self):
         else:
             return self.context.compiled_parameters[0]
 
-    def last_inserted_params(self):
+    def last_inserted_params(
+        self,
+    ) -> Union[
+        List[_MutableCoreSingleExecuteParams], _MutableCoreSingleExecuteParams
+    ]:
         """Return the collection of inserted parameters from this
         execution.
 
@@ -1719,7 +1839,9 @@ def last_inserted_params(self):
             return self.context.compiled_parameters[0]
 
     @property
-    def returned_defaults_rows(self):
+    def returned_defaults_rows(
+        self,
+    ) -> Optional[Sequence[Row[Any]]]:
         """Return a list of rows each containing the values of default
         columns that were fetched using
         the :meth:`.ValuesBase.return_defaults` feature.
@@ -1731,7 +1853,7 @@ def returned_defaults_rows(self):
         """
         return self.context.returned_default_rows
 
-    def splice_horizontally(self, other):
+    def splice_horizontally(self, other: CursorResult[Any]) -> Self:
         """Return a new :class:`.CursorResult` that "horizontally splices"
         together the rows of this :class:`.CursorResult` with that of another
         :class:`.CursorResult`.
@@ -1795,7 +1917,7 @@ def splice_horizontally(self, other):
             )
         ]
 
-        clone._metadata = clone._metadata._splice_horizontally(other._metadata)
+        clone._metadata = clone._metadata._splice_horizontally(other._metadata)  # type: ignore[union-attr, arg-type] # noqa: E501
 
         clone.cursor_strategy = FullyBufferedCursorFetchStrategy(
             None,
@@ -1804,7 +1926,7 @@ def splice_horizontally(self, other):
         clone._reset_memoizations()
         return clone
 
-    def splice_vertically(self, other):
+    def splice_vertically(self, other: CursorResult[Any]) -> Self:
         """Return a new :class:`.CursorResult` that "vertically splices",
         i.e. "extends", the rows of this :class:`.CursorResult` with that of
         another :class:`.CursorResult`.
@@ -1836,7 +1958,7 @@ def splice_vertically(self, other):
         clone._reset_memoizations()
         return clone
 
-    def _rewind(self, rows):
+    def _rewind(self, rows: Any) -> Self:
         """rewind this result back to the given rowset.
 
         this is used internally for the case where an :class:`.Insert`
@@ -1869,7 +1991,7 @@ def _rewind(self, rows):
         return self
 
     @property
-    def returned_defaults(self):
+    def returned_defaults(self) -> Optional[Row[Any]]:
         """Return the values of default columns that were fetched using
         the :meth:`.ValuesBase.return_defaults` feature.
 
@@ -1895,7 +2017,7 @@ def returned_defaults(self):
         else:
             return None
 
-    def lastrow_has_defaults(self):
+    def lastrow_has_defaults(self) -> bool:
         """Return ``lastrow_has_defaults()`` from the underlying
         :class:`.ExecutionContext`.
 
@@ -1905,7 +2027,7 @@ def lastrow_has_defaults(self):
 
         return self.context.lastrow_has_defaults()
 
-    def postfetch_cols(self):
+    def postfetch_cols(self) -> Optional[Sequence[Column[Any]]]:
         """Return ``postfetch_cols()`` from the underlying
         :class:`.ExecutionContext`.
 
@@ -1928,7 +2050,7 @@ def postfetch_cols(self):
             )
         return self.context.postfetch_cols
 
-    def prefetch_cols(self):
+    def prefetch_cols(self) -> Optional[Sequence[Column[Any]]]:
         """Return ``prefetch_cols()`` from the underlying
         :class:`.ExecutionContext`.
 
@@ -1951,7 +2073,7 @@ def prefetch_cols(self):
             )
         return self.context.prefetch_cols
 
-    def supports_sane_rowcount(self):
+    def supports_sane_rowcount(self) -> bool:
         """Return ``supports_sane_rowcount`` from the dialect.
 
         See :attr:`_engine.CursorResult.rowcount` for background.
@@ -1960,7 +2082,7 @@ def supports_sane_rowcount(self):
 
         return self.dialect.supports_sane_rowcount
 
-    def supports_sane_multi_rowcount(self):
+    def supports_sane_multi_rowcount(self) -> bool:
         """Return ``supports_sane_multi_rowcount`` from the dialect.
 
         See :attr:`_engine.CursorResult.rowcount` for background.
@@ -2052,7 +2174,7 @@ def rowcount(self) -> int:
             raise  # not called
 
     @property
-    def lastrowid(self):
+    def lastrowid(self) -> int:
         """Return the 'lastrowid' accessor on the DBAPI cursor.
 
         This is a DBAPI specific method and is only functional
@@ -2073,7 +2195,7 @@ def lastrowid(self):
             self.cursor_strategy.handle_exception(self, self.cursor, e)
 
     @property
-    def returns_rows(self):
+    def returns_rows(self) -> bool:
         """True if this :class:`_engine.CursorResult` returns zero or more
         rows.
 
@@ -2101,7 +2223,7 @@ def returns_rows(self):
         return self._metadata.returns_rows
 
     @property
-    def is_insert(self):
+    def is_insert(self) -> bool:
         """True if this :class:`_engine.CursorResult` is the result
         of a executing an expression language compiled
         :func:`_expression.insert` construct.
@@ -2114,7 +2236,7 @@ def is_insert(self):
         """
         return self.context.isinsert
 
-    def _fetchiter_impl(self):
+    def _fetchiter_impl(self) -> Iterator[Any]:
         fetchone = self.cursor_strategy.fetchone
 
         while True:
@@ -2123,16 +2245,16 @@ def _fetchiter_impl(self):
                 break
             yield row
 
-    def _fetchone_impl(self, hard_close=False):
+    def _fetchone_impl(self, hard_close: bool = False) -> Any:
         return self.cursor_strategy.fetchone(self, self.cursor, hard_close)
 
-    def _fetchall_impl(self):
+    def _fetchall_impl(self) -> Any:
         return self.cursor_strategy.fetchall(self, self.cursor)
 
-    def _fetchmany_impl(self, size=None):
+    def _fetchmany_impl(self, size: Optional[int] = None) -> Any:
         return self.cursor_strategy.fetchmany(self, self.cursor, size)
 
-    def _raw_row_iterator(self):
+    def _raw_row_iterator(self) -> Any:
         return self._fetchiter_impl()
 
     def merge(self, *others: Result[Any]) -> MergedResult[Any]:
@@ -2144,7 +2266,7 @@ def merge(self, *others: Result[Any]) -> MergedResult[Any]:
             )
         return merged_result
 
-    def close(self) -> Any:
+    def close(self) -> None:
         """Close this :class:`_engine.CursorResult`.
 
         This closes out the underlying DBAPI cursor corresponding to the
diff --git a/libs/sqlalchemy/engine/default.py b/libs/sqlalchemy/engine/default.py
index dd4250ffc4..8cd718b390 100644
--- a/libs/sqlalchemy/engine/default.py
+++ b/libs/sqlalchemy/engine/default.py
@@ -1,5 +1,5 @@
 # engine/default.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -77,10 +77,14 @@
     from .interfaces import _CoreSingleExecuteParams
     from .interfaces import _DBAPICursorDescription
     from .interfaces import _DBAPIMultiExecuteParams
+    from .interfaces import _DBAPISingleExecuteParams
     from .interfaces import _ExecuteOptions
     from .interfaces import _MutableCoreSingleExecuteParams
     from .interfaces import _ParamStyle
+    from .interfaces import ConnectArgsType
     from .interfaces import DBAPIConnection
+    from .interfaces import DBAPIModule
+    from .interfaces import DBAPIType
     from .interfaces import IsolationLevel
     from .row import Row
     from .url import URL
@@ -99,6 +103,7 @@
     from ..sql.type_api import _ResultProcessorType
     from ..sql.type_api import TypeEngine
 
+
 # When we're handed literal SQL, ensure it's a SELECT query
 SERVER_SIDE_CURSOR_RE = re.compile(r"\s*SELECT", re.I | re.UNICODE)
 
@@ -303,6 +308,7 @@ def __init__(
         # Linting.NO_LINTING constant
         compiler_linting: Linting = int(compiler.NO_LINTING),  # type: ignore
         server_side_cursors: bool = False,
+        skip_autocommit_rollback: bool = False,
         **kwargs: Any,
     ):
         if server_side_cursors:
@@ -327,6 +333,8 @@ def __init__(
 
         self.dbapi = dbapi
 
+        self.skip_autocommit_rollback = skip_autocommit_rollback
+
         if paramstyle is not None:
             self.paramstyle = paramstyle
         elif self.dbapi is not None:
@@ -425,7 +433,7 @@ def insert_executemany_returning_sort_by_parameter_order(self):
     delete_executemany_returning = False
 
     @util.memoized_property
-    def loaded_dbapi(self) -> ModuleType:
+    def loaded_dbapi(self) -> DBAPIModule:
         if self.dbapi is None:
             raise exc.InvalidRequestError(
                 f"Dialect {self} does not have a Python DBAPI established "
@@ -437,7 +445,7 @@ def loaded_dbapi(self) -> ModuleType:
     def _bind_typing_render_casts(self):
         return self.bind_typing is interfaces.BindTyping.RENDER_CASTS
 
-    def _ensure_has_table_connection(self, arg):
+    def _ensure_has_table_connection(self, arg: Connection) -> None:
         if not isinstance(arg, Connection):
             raise exc.ArgumentError(
                 "The argument passed to Dialect.has_table() should be a "
@@ -474,7 +482,7 @@ def _type_memos(self):
         return weakref.WeakKeyDictionary()
 
     @property
-    def dialect_description(self):
+    def dialect_description(self):  # type: ignore[override]
         return self.name + "+" + self.driver
 
     @property
@@ -515,7 +523,7 @@ def builtin_connect(dbapi_conn, conn_rec):
         else:
             return None
 
-    def initialize(self, connection):
+    def initialize(self, connection: Connection) -> None:
         try:
             self.server_version_info = self._get_server_version_info(
                 connection
@@ -551,7 +559,7 @@ def initialize(self, connection):
                 % (self.label_length, self.max_identifier_length)
             )
 
-    def on_connect(self):
+    def on_connect(self) -> Optional[Callable[[Any], None]]:
         # inherits the docstring from interfaces.Dialect.on_connect
         return None
 
@@ -610,18 +618,18 @@ def has_schema(
     ) -> bool:
         return schema_name in self.get_schema_names(connection, **kw)
 
-    def validate_identifier(self, ident):
+    def validate_identifier(self, ident: str) -> None:
         if len(ident) > self.max_identifier_length:
             raise exc.IdentifierError(
                 "Identifier '%s' exceeds maximum length of %d characters"
                 % (ident, self.max_identifier_length)
             )
 
-    def connect(self, *cargs, **cparams):
+    def connect(self, *cargs: Any, **cparams: Any) -> DBAPIConnection:
         # inherits the docstring from interfaces.Dialect.connect
-        return self.loaded_dbapi.connect(*cargs, **cparams)
+        return self.loaded_dbapi.connect(*cargs, **cparams)  # type: ignore[no-any-return]  # NOQA: E501
 
-    def create_connect_args(self, url):
+    def create_connect_args(self, url: URL) -> ConnectArgsType:
         # inherits the docstring from interfaces.Dialect.create_connect_args
         opts = url.translate_connect_args()
         opts.update(url.query)
@@ -697,6 +705,10 @@ def do_begin(self, dbapi_connection):
         pass
 
     def do_rollback(self, dbapi_connection):
+        if self.skip_autocommit_rollback and self.detect_autocommit_setting(
+            dbapi_connection
+        ):
+            return
         dbapi_connection.rollback()
 
     def do_commit(self, dbapi_connection):
@@ -736,8 +748,6 @@ def _do_ping_w_event(self, dbapi_connection: DBAPIConnection) -> bool:
                 raise
 
     def do_ping(self, dbapi_connection: DBAPIConnection) -> bool:
-        cursor = None
-
         cursor = dbapi_connection.cursor()
         try:
             cursor.execute(self._dialect_specific_select_one)
@@ -944,7 +954,14 @@ def do_execute(self, cursor, statement, parameters, context=None):
     def do_execute_no_params(self, cursor, statement, context=None):
         cursor.execute(statement)
 
-    def is_disconnect(self, e, connection, cursor):
+    def is_disconnect(
+        self,
+        e: DBAPIModule.Error,
+        connection: Union[
+            pool.PoolProxiedConnection, interfaces.DBAPIConnection, None
+        ],
+        cursor: Optional[interfaces.DBAPICursor],
+    ) -> bool:
         return False
 
     @util.memoized_instancemethod
@@ -1044,7 +1061,7 @@ def denormalize_name(self, name):
             name = name_upper
         return name
 
-    def get_driver_connection(self, connection):
+    def get_driver_connection(self, connection: DBAPIConnection) -> Any:
         return connection
 
     def _overrides_default(self, method):
@@ -1221,7 +1238,9 @@ class DefaultExecutionContext(ExecutionContext):
     # a hook for SQLite's translation of
     # result column names
     # NOTE: pyhive is using this hook, can't remove it :(
-    _translate_colname: Optional[Callable[[str], str]] = None
+    _translate_colname: Optional[
+        Callable[[str], Tuple[str, Optional[str]]]
+    ] = None
 
     _expanded_parameters: Mapping[str, List[str]] = util.immutabledict()
     """used by set_input_sizes().
@@ -1618,7 +1637,7 @@ def _get_cache_stats(self) -> str:
             return "unknown"
 
     @property
-    def executemany(self):
+    def executemany(self):  # type: ignore[override]
         return self.execute_style in (
             ExecuteStyle.EXECUTEMANY,
             ExecuteStyle.INSERTMANYVALUES,
@@ -1660,7 +1679,12 @@ def prefetch_cols(self) -> Optional[Sequence[Column[Any]]]:
     def no_parameters(self):
         return self.execution_options.get("no_parameters", False)
 
-    def _execute_scalar(self, stmt, type_, parameters=None):
+    def _execute_scalar(
+        self,
+        stmt: str,
+        type_: Optional[TypeEngine[Any]],
+        parameters: Optional[_DBAPISingleExecuteParams] = None,
+    ) -> Any:
         """Execute a string statement on the current cursor, returning a
         scalar result.
 
@@ -1734,7 +1758,7 @@ def _use_server_side_cursor(self):
 
         return use_server_side
 
-    def create_cursor(self):
+    def create_cursor(self) -> DBAPICursor:
         if (
             # inlining initial preference checks for SS cursors
             self.dialect.supports_server_side_cursors
@@ -1755,10 +1779,10 @@ def create_cursor(self):
     def fetchall_for_returning(self, cursor):
         return cursor.fetchall()
 
-    def create_default_cursor(self):
+    def create_default_cursor(self) -> DBAPICursor:
         return self._dbapi_connection.cursor()
 
-    def create_server_side_cursor(self):
+    def create_server_side_cursor(self) -> DBAPICursor:
         raise NotImplementedError()
 
     def pre_exec(self):
@@ -1772,7 +1796,9 @@ def get_out_parameter_values(self, names):
     def post_exec(self):
         pass
 
-    def get_result_processor(self, type_, colname, coltype):
+    def get_result_processor(
+        self, type_: TypeEngine[Any], colname: str, coltype: DBAPIType
+    ) -> Optional[_ResultProcessorType[Any]]:
         """Return a 'result processor' for a given type as present in
         cursor.description.
 
@@ -1782,7 +1808,7 @@ def get_result_processor(self, type_, colname, coltype):
         """
         return type_._cached_result_processor(self.dialect, coltype)
 
-    def get_lastrowid(self):
+    def get_lastrowid(self) -> int:
         """return self.cursor.lastrowid, or equivalent, after an INSERT.
 
         This may involve calling special cursor functions, issuing a new SELECT
@@ -1827,9 +1853,10 @@ def _setup_result_proxy(self):
         if self._rowcount is None and exec_opt.get("preserve_rowcount", False):
             self._rowcount = self.cursor.rowcount
 
+        yp: Optional[Union[int, bool]]
         if self.is_crud or self.is_text:
             result = self._setup_dml_or_text_result()
-            yp = sr = False
+            yp = False
         else:
             yp = exec_opt.get("yield_per", None)
             sr = self._is_server_side or exec_opt.get("stream_results", False)
@@ -2038,7 +2065,7 @@ def _setup_ins_pk_from_implicit_returning(self, result, rows):
             getter(row, param) for row, param in zip(rows, compiled_params)
         ]
 
-    def lastrow_has_defaults(self):
+    def lastrow_has_defaults(self) -> bool:
         return (self.isinsert or self.isupdate) and bool(
             cast(SQLCompiler, self.compiled).postfetch
         )
diff --git a/libs/sqlalchemy/engine/events.py b/libs/sqlalchemy/engine/events.py
index b759382cb2..b01eec5fb6 100644
--- a/libs/sqlalchemy/engine/events.py
+++ b/libs/sqlalchemy/engine/events.py
@@ -1,5 +1,5 @@
 # engine/events.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/interfaces.py b/libs/sqlalchemy/engine/interfaces.py
index 9fb39db78b..ac082b0d3e 100644
--- a/libs/sqlalchemy/engine/interfaces.py
+++ b/libs/sqlalchemy/engine/interfaces.py
@@ -1,5 +1,5 @@
 # engine/interfaces.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -10,7 +10,6 @@
 from __future__ import annotations
 
 from enum import Enum
-from types import ModuleType
 from typing import Any
 from typing import Awaitable
 from typing import Callable
@@ -34,7 +33,7 @@
 from .. import util
 from ..event import EventTarget
 from ..pool import Pool
-from ..pool import PoolProxiedConnection
+from ..pool import PoolProxiedConnection as PoolProxiedConnection
 from ..sql.compiler import Compiled as Compiled
 from ..sql.compiler import Compiled  # noqa
 from ..sql.compiler import TypeCompiler as TypeCompiler
@@ -51,6 +50,7 @@
     from .base import Engine
     from .cursor import CursorResult
     from .url import URL
+    from ..connectors.asyncio import AsyncIODBAPIConnection
     from ..event import _ListenerFnType
     from ..event import dispatcher
     from ..exc import StatementError
@@ -70,6 +70,7 @@
     from ..sql.sqltypes import Integer
     from ..sql.type_api import _TypeMemoDict
     from ..sql.type_api import TypeEngine
+    from ..util.langhelpers import generic_fn_descriptor
 
 ConnectArgsType = Tuple[Sequence[str], MutableMapping[str, Any]]
 
@@ -106,6 +107,22 @@ class ExecuteStyle(Enum):
     """
 
 
+class DBAPIModule(Protocol):
+    class Error(Exception):
+        def __getattr__(self, key: str) -> Any: ...
+
+    class OperationalError(Error):
+        pass
+
+    class InterfaceError(Error):
+        pass
+
+    class IntegrityError(Error):
+        pass
+
+    def __getattr__(self, key: str) -> Any: ...
+
+
 class DBAPIConnection(Protocol):
     """protocol representing a :pep:`249` database connection.
 
@@ -122,11 +139,13 @@ def close(self) -> None: ...
 
     def commit(self) -> None: ...
 
-    def cursor(self) -> DBAPICursor: ...
+    def cursor(self, *args: Any, **kwargs: Any) -> DBAPICursor: ...
 
     def rollback(self) -> None: ...
 
-    autocommit: bool
+    def __getattr__(self, key: str) -> Any: ...
+
+    def __setattr__(self, key: str, value: Any) -> None: ...
 
 
 class DBAPIType(Protocol):
@@ -658,7 +677,7 @@ class Dialect(EventTarget):
 
     dialect_description: str
 
-    dbapi: Optional[ModuleType]
+    dbapi: Optional[DBAPIModule]
     """A reference to the DBAPI module object itself.
 
     SQLAlchemy dialects import DBAPI modules using the classmethod
@@ -682,7 +701,7 @@ class Dialect(EventTarget):
     """
 
     @util.non_memoized_property
-    def loaded_dbapi(self) -> ModuleType:
+    def loaded_dbapi(self) -> DBAPIModule:
         """same as .dbapi, but is never None; will raise an error if no
         DBAPI was set up.
 
@@ -760,6 +779,14 @@ def loaded_dbapi(self) -> ModuleType:
     default_isolation_level: Optional[IsolationLevel]
     """the isolation that is implicitly present on new connections"""
 
+    skip_autocommit_rollback: bool
+    """Whether or not the :paramref:`.create_engine.skip_autocommit_rollback`
+    parameter was set.
+
+    .. versionadded:: 2.0.43
+
+    """
+
     # create_engine()  -> isolation_level  currently goes here
     _on_connect_isolation_level: Optional[IsolationLevel]
 
@@ -779,8 +806,14 @@ def loaded_dbapi(self) -> ModuleType:
 
     max_identifier_length: int
     """The maximum length of identifier names."""
-
-    supports_server_side_cursors: bool
+    max_index_name_length: Optional[int]
+    """The maximum length of index names if different from
+    ``max_identifier_length``."""
+    max_constraint_name_length: Optional[int]
+    """The maximum length of constraint names if different from
+    ``max_identifier_length``."""
+
+    supports_server_side_cursors: Union[generic_fn_descriptor[bool], bool]
     """indicates if the dialect supports server side cursors"""
 
     server_side_cursors: bool
@@ -1192,6 +1225,13 @@ def loaded_dbapi(self) -> ModuleType:
     tuple_in_values: bool
     """target database supports tuple IN, i.e. (x, y) IN ((q, p), (r, z))"""
 
+    requires_name_normalize: bool
+    """Indicates symbol names are returned by the database in
+    UPPERCASED if they are case insensitive within the database.
+    If this is True, the methods normalize_name()
+    and denormalize_name() must be provided.
+    """
+
     _bind_typing_render_casts: bool
 
     _type_memos: MutableMapping[TypeEngine[Any], _TypeMemoDict]
@@ -1233,7 +1273,7 @@ def create_connect_args(self, url):
         raise NotImplementedError()
 
     @classmethod
-    def import_dbapi(cls) -> ModuleType:
+    def import_dbapi(cls) -> DBAPIModule:
         """Import the DBAPI module that is used by this dialect.
 
         The Python module object returned here will be assigned as an
@@ -1282,8 +1322,6 @@ def initialize(self, connection: Connection) -> None:
 
         """
 
-        pass
-
     if TYPE_CHECKING:
 
         def _overrides_default(self, method_name: str) -> bool: ...
@@ -2205,7 +2243,7 @@ def do_execute_no_params(
 
     def is_disconnect(
         self,
-        e: Exception,
+        e: DBAPIModule.Error,
         connection: Optional[Union[PoolProxiedConnection, DBAPIConnection]],
         cursor: Optional[DBAPICursor],
     ) -> bool:
@@ -2309,7 +2347,7 @@ def do_on_connect(connection):
         """
         return self.on_connect()
 
-    def on_connect(self) -> Optional[Callable[[Any], Any]]:
+    def on_connect(self) -> Optional[Callable[[Any], None]]:
         """return a callable which sets up a newly created DBAPI connection.
 
         The callable should accept a single argument "conn" which is the
@@ -2458,6 +2496,30 @@ def get_isolation_level(
 
         raise NotImplementedError()
 
+    def detect_autocommit_setting(self, dbapi_conn: DBAPIConnection) -> bool:
+        """Detect the current autocommit setting for a DBAPI connection.
+
+        :param dbapi_connection: a DBAPI connection object
+        :return: True if autocommit is enabled, False if disabled
+        :rtype: bool
+
+        This method inspects the given DBAPI connection to determine
+        whether autocommit mode is currently enabled. The specific
+        mechanism for detecting autocommit varies by database dialect
+        and DBAPI driver, however it should be done **without** network
+        round trips.
+
+        .. note::
+
+            Not all dialects support autocommit detection. Dialects
+            that do not support this feature will raise
+            :exc:`NotImplementedError`.
+
+        """
+        raise NotImplementedError(
+            "This dialect cannot detect autocommit on a DBAPI connection"
+        )
+
     def get_default_isolation_level(
         self, dbapi_conn: DBAPIConnection
     ) -> IsolationLevel:
@@ -2482,7 +2544,7 @@ def get_default_isolation_level(
 
     def get_isolation_level_values(
         self, dbapi_conn: DBAPIConnection
-    ) -> List[IsolationLevel]:
+    ) -> Sequence[IsolationLevel]:
         """return a sequence of string isolation level names that are accepted
         by this dialect.
 
@@ -2656,6 +2718,9 @@ def get_dialect_pool_class(self, url: URL) -> Type[Pool]:
         """return a Pool class to use for a given URL"""
         raise NotImplementedError()
 
+    def validate_identifier(self, ident: str) -> None:
+        """Validates an identifier name, raising an exception if invalid"""
+
 
 class CreateEnginePlugin:
     """A set of hooks intended to augment the construction of an
@@ -3363,7 +3428,7 @@ class AdaptedConnection:
 
     __slots__ = ("_connection",)
 
-    _connection: Any
+    _connection: AsyncIODBAPIConnection
 
     @property
     def driver_connection(self) -> Any:
diff --git a/libs/sqlalchemy/engine/mock.py b/libs/sqlalchemy/engine/mock.py
index 08dba5a645..a5173b9d7d 100644
--- a/libs/sqlalchemy/engine/mock.py
+++ b/libs/sqlalchemy/engine/mock.py
@@ -1,5 +1,5 @@
 # engine/mock.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -27,10 +27,9 @@
     from .interfaces import Dialect
     from .url import URL
     from ..sql.base import Executable
-    from ..sql.ddl import SchemaDropper
-    from ..sql.ddl import SchemaGenerator
+    from ..sql.ddl import InvokeDDLBase
     from ..sql.schema import HasSchemaAttr
-    from ..sql.schema import SchemaItem
+    from ..sql.visitors import Visitable
 
 
 class MockConnection:
@@ -53,12 +52,14 @@ def execution_options(self, **kw: Any) -> MockConnection:
 
     def _run_ddl_visitor(
         self,
-        visitorcallable: Type[Union[SchemaGenerator, SchemaDropper]],
-        element: SchemaItem,
+        visitorcallable: Type[InvokeDDLBase],
+        element: Visitable,
         **kwargs: Any,
     ) -> None:
         kwargs["checkfirst"] = False
-        visitorcallable(self.dialect, self, **kwargs).traverse_single(element)
+        visitorcallable(
+            dialect=self.dialect, connection=self, **kwargs
+        ).traverse_single(element)
 
     def execute(
         self,
diff --git a/libs/sqlalchemy/engine/processors.py b/libs/sqlalchemy/engine/processors.py
index b3f9330842..0888257f20 100644
--- a/libs/sqlalchemy/engine/processors.py
+++ b/libs/sqlalchemy/engine/processors.py
@@ -1,5 +1,5 @@
 # engine/processors.py
-# Copyright (C) 2010-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2010-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 # Copyright (C) 2010 Gaetan de Menten gdementen@gmail.com
 #
diff --git a/libs/sqlalchemy/engine/reflection.py b/libs/sqlalchemy/engine/reflection.py
index 5d754c6703..c976ae0f13 100644
--- a/libs/sqlalchemy/engine/reflection.py
+++ b/libs/sqlalchemy/engine/reflection.py
@@ -1,5 +1,5 @@
 # engine/reflection.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1714,9 +1714,12 @@ def _reflect_pk(
                 if pk in cols_by_orig_name and pk not in exclude_columns
             ]
 
-            # update pk constraint name and comment
+            # update pk constraint name, comment and dialect_kwargs
             table.primary_key.name = pk_cons.get("name")
             table.primary_key.comment = pk_cons.get("comment", None)
+            dialect_options = pk_cons.get("dialect_options")
+            if dialect_options:
+                table.primary_key.dialect_kwargs.update(dialect_options)
 
             # tell the PKConstraint to re-initialize
             # its column collection
diff --git a/libs/sqlalchemy/engine/result.py b/libs/sqlalchemy/engine/result.py
index 7411fd74f6..b0788a6071 100644
--- a/libs/sqlalchemy/engine/result.py
+++ b/libs/sqlalchemy/engine/result.py
@@ -1,5 +1,5 @@
 # engine/result.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -52,11 +52,23 @@
     from sqlalchemy.cyextension.resultproxy import tuplegetter as tuplegetter
 
 if typing.TYPE_CHECKING:
-    from ..sql.schema import Column
+    from typing import Type
+
+    from .. import inspection
+    from ..sql import roles
+    from ..sql._typing import _HasClauseElement
+    from ..sql.elements import SQLCoreOperations
     from ..sql.type_api import _ResultProcessorType
 
-_KeyType = Union[str, "Column[Any]"]
-_KeyIndexType = Union[str, "Column[Any]", int]
+_KeyType = Union[
+    str,
+    "SQLCoreOperations[Any]",
+    "roles.TypedColumnsClauseRole[Any]",
+    "roles.ColumnsClauseRole",
+    "Type[Any]",
+    "inspection.Inspectable[_HasClauseElement[Any]]",
+]
+_KeyIndexType = Union[_KeyType, int]
 
 # is overridden in cursor using _CursorKeyMapRecType
 _KeyMapRecType = Any
@@ -722,6 +734,14 @@ def manyrows(
 
         return manyrows
 
+    @overload
+    def _only_one_row(
+        self: ResultInternal[Row[Any]],
+        raise_for_second_row: bool,
+        raise_for_none: bool,
+        scalar: Literal[True],
+    ) -> Any: ...
+
     @overload
     def _only_one_row(
         self,
@@ -809,7 +829,6 @@ def _only_one_row(
                     "was required"
                 )
         else:
-            next_row = _NO_ROW
             # if we checked for second row then that would have
             # closed us :)
             self._soft_close(hard=True)
@@ -1489,8 +1508,8 @@ def scalar_one_or_none(self) -> Optional[Any]:
     def one(self) -> Row[_TP]:
         """Return exactly one row or raise an exception.
 
-        Raises :class:`.NoResultFound` if the result returns no
-        rows, or :class:`.MultipleResultsFound` if multiple rows
+        Raises :class:`_exc.NoResultFound` if the result returns no
+        rows, or :class:`_exc.MultipleResultsFound` if multiple rows
         would be returned.
 
         .. note::  This method returns one **row**, e.g. tuple, by default.
@@ -2006,7 +2025,7 @@ def unique(self, strategy: Optional[_UniqueFilterType] = None) -> Self:
         return self
 
     def columns(self, *col_expressions: _KeyIndexType) -> Self:
-        r"""Establish the columns that should be returned in each row."""
+        """Establish the columns that should be returned in each row."""
         return self._column_slices(col_expressions)
 
     def partitions(
diff --git a/libs/sqlalchemy/engine/row.py b/libs/sqlalchemy/engine/row.py
index da7ae9af27..cd818c6514 100644
--- a/libs/sqlalchemy/engine/row.py
+++ b/libs/sqlalchemy/engine/row.py
@@ -1,5 +1,5 @@
 # engine/row.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/engine/strategies.py b/libs/sqlalchemy/engine/strategies.py
index 5dd7bca9a4..a7eb81b43f 100644
--- a/libs/sqlalchemy/engine/strategies.py
+++ b/libs/sqlalchemy/engine/strategies.py
@@ -1,14 +1,11 @@
 # engine/strategies.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Deprecated mock engine strategy used by Alembic.
-
-
-"""
+"""Deprecated mock engine strategy used by Alembic."""
 
 from __future__ import annotations
 
diff --git a/libs/sqlalchemy/engine/url.py b/libs/sqlalchemy/engine/url.py
index bb004f11cd..5d66120135 100644
--- a/libs/sqlalchemy/engine/url.py
+++ b/libs/sqlalchemy/engine/url.py
@@ -1,5 +1,5 @@
 # engine/url.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -920,5 +920,5 @@ def _parse_url(name: str) -> URL:
 
     else:
         raise exc.ArgumentError(
-            "Could not parse SQLAlchemy URL from string '%s'" % name
+            "Could not parse SQLAlchemy URL from given URL string"
         )
diff --git a/libs/sqlalchemy/engine/util.py b/libs/sqlalchemy/engine/util.py
index e499efa91a..b8cc1d23a2 100644
--- a/libs/sqlalchemy/engine/util.py
+++ b/libs/sqlalchemy/engine/util.py
@@ -1,5 +1,5 @@
 # engine/util.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/event/__init__.py b/libs/sqlalchemy/event/__init__.py
index 309b7bd33f..a48af7ef5d 100644
--- a/libs/sqlalchemy/event/__init__.py
+++ b/libs/sqlalchemy/event/__init__.py
@@ -1,5 +1,5 @@
 # event/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -20,6 +20,7 @@
 from .base import dispatcher as dispatcher
 from .base import Events as Events
 from .legacy import _legacy_signature as _legacy_signature
+from .legacy import _omit_standard_example as _omit_standard_example
 from .registry import _EventKey as _EventKey
 from .registry import _ListenerFnType as _ListenerFnType
 from .registry import EventTarget as EventTarget
diff --git a/libs/sqlalchemy/event/api.py b/libs/sqlalchemy/event/api.py
index b6ec8f6d32..38b2716b88 100644
--- a/libs/sqlalchemy/event/api.py
+++ b/libs/sqlalchemy/event/api.py
@@ -1,13 +1,11 @@
 # event/api.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Public API functions for the event system.
-
-"""
+"""Public API functions for the event system."""
 from __future__ import annotations
 
 from typing import Any
diff --git a/libs/sqlalchemy/event/attr.py b/libs/sqlalchemy/event/attr.py
index ec5d5822f1..e09cb4d5a4 100644
--- a/libs/sqlalchemy/event/attr.py
+++ b/libs/sqlalchemy/event/attr.py
@@ -1,5 +1,5 @@
 # event/attr.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -343,11 +343,20 @@ def for_modify(
         obj = cast("_Dispatch[_ET]", obj)
 
         assert obj._instance_cls is not None
-        result = _ListenerCollection(self.parent, obj._instance_cls)
-        if getattr(obj, self.name) is self:
-            setattr(obj, self.name, result)
-        else:
-            assert isinstance(getattr(obj, self.name), _JoinedListener)
+        existing = getattr(obj, self.name)
+
+        with util.mini_gil:
+            if existing is self or isinstance(existing, _JoinedListener):
+                result = _ListenerCollection(self.parent, obj._instance_cls)
+            else:
+                # this codepath is an extremely rare race condition
+                # that has been observed in test_pool.py->test_timeout_race
+                # with freethreaded.
+                assert isinstance(existing, _ListenerCollection)
+                return existing
+
+            if existing is self:
+                setattr(obj, self.name, result)
         return result
 
     def _needs_modify(self, *args: Any, **kw: Any) -> NoReturn:
@@ -409,7 +418,7 @@ class _CompoundListener(_InstanceLevelDispatch[_ET]):
         "_is_asyncio",
     )
 
-    _exec_once_mutex: _MutexProtocol
+    _exec_once_mutex: Optional[_MutexProtocol]
     parent_listeners: Collection[_ListenerFnType]
     listeners: Collection[_ListenerFnType]
     _exec_once: bool
@@ -422,16 +431,23 @@ def __init__(self, *arg: Any, **kw: Any):
     def _set_asyncio(self) -> None:
         self._is_asyncio = True
 
-    def _memoized_attr__exec_once_mutex(self) -> _MutexProtocol:
-        if self._is_asyncio:
-            return AsyncAdaptedLock()
-        else:
-            return threading.Lock()
+    def _get_exec_once_mutex(self) -> _MutexProtocol:
+        with util.mini_gil:
+            if self._exec_once_mutex is not None:
+                return self._exec_once_mutex
+
+            if self._is_asyncio:
+                mutex = AsyncAdaptedLock()
+            else:
+                mutex = threading.Lock()  # type: ignore[assignment]
+            self._exec_once_mutex = mutex
+
+            return mutex
 
     def _exec_once_impl(
         self, retry_on_exception: bool, *args: Any, **kw: Any
     ) -> None:
-        with self._exec_once_mutex:
+        with self._get_exec_once_mutex():
             if not self._exec_once:
                 try:
                     self(*args, **kw)
@@ -472,13 +488,15 @@ def _exec_w_sync_on_first_run(self, *args: Any, **kw: Any) -> None:
         raised an exception.
 
         If _exec_w_sync_on_first_run was already called and didn't raise an
-        exception, then a mutex is not used.
+        exception, then a mutex is not used.  It's not guaranteed
+        the mutex won't be used more than once in the case of very rare
+        race conditions.
 
         .. versionadded:: 1.4.11
 
         """
         if not self._exec_w_sync_once:
-            with self._exec_once_mutex:
+            with self._get_exec_once_mutex():
                 try:
                     self(*args, **kw)
                 except:
@@ -540,6 +558,7 @@ def __init__(self, parent: _ClsLevelDispatch[_ET], target_cls: Type[_ET]):
             parent.update_subclass(target_cls)
         self._exec_once = False
         self._exec_w_sync_once = False
+        self._exec_once_mutex = None
         self.parent_listeners = parent._clslevel[target_cls]
         self.parent = parent
         self.name = parent.name
@@ -617,6 +636,8 @@ def __init__(
         local: _EmptyListener[_ET],
     ):
         self._exec_once = False
+        self._exec_w_sync_once = False
+        self._exec_once_mutex = None
         self.parent_dispatch = parent_dispatch
         self.name = name
         self.local = local
diff --git a/libs/sqlalchemy/event/base.py b/libs/sqlalchemy/event/base.py
index a73e86bd2a..9f6e410d68 100644
--- a/libs/sqlalchemy/event/base.py
+++ b/libs/sqlalchemy/event/base.py
@@ -1,5 +1,5 @@
 # event/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -380,9 +380,11 @@ def dispatch_is(*types: Type[Any]) -> bool:
             return all(isinstance(target.dispatch, t) for t in types)
 
         def dispatch_parent_is(t: Type[Any]) -> bool:
-            return isinstance(
-                cast("_JoinedDispatcher[_ET]", target.dispatch).parent, t
-            )
+            parent = cast("_JoinedDispatcher[_ET]", target.dispatch).parent
+            while isinstance(parent, _JoinedDispatcher):
+                parent = cast("_JoinedDispatcher[_ET]", parent).parent
+
+            return isinstance(parent, t)
 
         # Mapper, ClassManager, Session override this to
         # also accept classes, scoped_sessions, sessionmakers, etc.
diff --git a/libs/sqlalchemy/event/legacy.py b/libs/sqlalchemy/event/legacy.py
index e60fd9a5e1..63fc1ee9a9 100644
--- a/libs/sqlalchemy/event/legacy.py
+++ b/libs/sqlalchemy/event/legacy.py
@@ -1,5 +1,5 @@
 # event/legacy.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -18,6 +18,7 @@
 from typing import Optional
 from typing import Tuple
 from typing import Type
+from typing import TypeVar
 
 from .registry import _ET
 from .registry import _ListenerFnType
@@ -29,14 +30,16 @@
     from .base import _HasEventsDispatch
 
 
-_LegacySignatureType = Tuple[str, List[str], Optional[Callable[..., Any]]]
+_F = TypeVar("_F", bound=Callable[..., Any])
+
+_LegacySignatureType = Tuple[str, List[str], Callable[..., Any]]
 
 
 def _legacy_signature(
     since: str,
     argnames: List[str],
     converter: Optional[Callable[..., Any]] = None,
-) -> Callable[[Callable[..., Any]], Callable[..., Any]]:
+) -> Callable[[_F], _F]:
     """legacy sig decorator
 
 
@@ -48,7 +51,7 @@ def _legacy_signature(
 
     """
 
-    def leg(fn: Callable[..., Any]) -> Callable[..., Any]:
+    def leg(fn: _F) -> _F:
         if not hasattr(fn, "_legacy_signatures"):
             fn._legacy_signatures = []  # type: ignore[attr-defined]
         fn._legacy_signatures.append((since, argnames, converter))  # type: ignore[attr-defined] # noqa: E501
@@ -57,6 +60,11 @@ def leg(fn: Callable[..., Any]) -> Callable[..., Any]:
     return leg
 
 
+def _omit_standard_example(fn: _F) -> _F:
+    fn._omit_standard_example = True  # type: ignore[attr-defined]
+    return fn
+
+
 def _wrap_fn_for_legacy(
     dispatch_collection: _ClsLevelDispatch[_ET],
     fn: _ListenerFnType,
@@ -222,6 +230,10 @@ def _augment_fn_docs(
     parent_dispatch_cls: Type[_HasEventsDispatch[_ET]],
     fn: _ListenerFnType,
 ) -> str:
+    if getattr(fn, "_omit_standard_example", False):
+        assert fn.__doc__
+        return fn.__doc__
+
     header = (
         ".. container:: event_signatures\n\n"
         "     Example argument forms::\n"
diff --git a/libs/sqlalchemy/event/registry.py b/libs/sqlalchemy/event/registry.py
index d7e4b32155..22be5628e4 100644
--- a/libs/sqlalchemy/event/registry.py
+++ b/libs/sqlalchemy/event/registry.py
@@ -1,5 +1,5 @@
 # event/registry.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/events.py b/libs/sqlalchemy/events.py
index ce83243951..501d79ed63 100644
--- a/libs/sqlalchemy/events.py
+++ b/libs/sqlalchemy/events.py
@@ -1,5 +1,5 @@
 # events.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/exc.py b/libs/sqlalchemy/exc.py
index 71e5dd81e0..c31c16b4dc 100644
--- a/libs/sqlalchemy/exc.py
+++ b/libs/sqlalchemy/exc.py
@@ -1,5 +1,5 @@
 # exc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/__init__.py b/libs/sqlalchemy/ext/__init__.py
index 2751bcf938..5d61ac7652 100644
--- a/libs/sqlalchemy/ext/__init__.py
+++ b/libs/sqlalchemy/ext/__init__.py
@@ -1,5 +1,5 @@
 # ext/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/associationproxy.py b/libs/sqlalchemy/ext/associationproxy.py
index 8f2c19b876..5fbabe578c 100644
--- a/libs/sqlalchemy/ext/associationproxy.py
+++ b/libs/sqlalchemy/ext/associationproxy.py
@@ -1,5 +1,5 @@
 # ext/associationproxy.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -99,6 +99,7 @@ def association_proxy(
     compare: Union[_NoArg, bool] = _NoArg.NO_ARG,
     kw_only: Union[_NoArg, bool] = _NoArg.NO_ARG,
     hash: Union[_NoArg, bool, None] = _NoArg.NO_ARG,  # noqa: A002
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
 ) -> AssociationProxy[Any]:
     r"""Return a Python property implementing a view of a target
     attribute which references an attribute on members of the
@@ -162,7 +163,7 @@ def association_proxy(
       the proxied value to ``None`` should **create** the source object
       if it does not exist, using the creator.  Only applies to scalar
       attributes.  This is mutually exclusive
-      vs. the :paramref:`.assocation_proxy.cascade_scalar_deletes`.
+      vs. the :paramref:`.association_proxy.cascade_scalar_deletes`.
 
       .. versionadded:: 2.0.18
 
@@ -206,6 +207,12 @@ def association_proxy(
 
      .. versionadded:: 2.0.36
 
+    :param dataclass_metadata: Specific to
+     :ref:`orm_declarative_native_dataclasses`, supplies metadata
+     to be attached to the generated dataclass field.
+
+     .. versionadded:: 2.0.42
+
     :param info: optional, will be assigned to
      :attr:`.AssociationProxy.info` if present.
 
@@ -245,7 +252,14 @@ def association_proxy(
         cascade_scalar_deletes=cascade_scalar_deletes,
         create_on_none_assignment=create_on_none_assignment,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only, hash
+            init,
+            repr,
+            default,
+            default_factory,
+            compare,
+            kw_only,
+            hash,
+            dataclass_metadata,
         ),
     )
 
@@ -658,7 +672,7 @@ def for_proxy(
         except Exception as err:
             raise exc.InvalidRequestError(
                 f"Association proxy received an unexpected error when "
-                f"trying to retreive attribute "
+                f"trying to retrieve attribute "
                 f'"{target_class.__name__}.{parent.value_attr}" from '
                 f'class "{target_class.__name__}": {err}'
             ) from err
diff --git a/libs/sqlalchemy/ext/asyncio/__init__.py b/libs/sqlalchemy/ext/asyncio/__init__.py
index 7d8a04bd78..e0b688cb0f 100644
--- a/libs/sqlalchemy/ext/asyncio/__init__.py
+++ b/libs/sqlalchemy/ext/asyncio/__init__.py
@@ -1,5 +1,5 @@
 # ext/asyncio/__init__.py
-# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/asyncio/base.py b/libs/sqlalchemy/ext/asyncio/base.py
index b53d53b1a4..84fd9f23a7 100644
--- a/libs/sqlalchemy/ext/asyncio/base.py
+++ b/libs/sqlalchemy/ext/asyncio/base.py
@@ -1,5 +1,5 @@
 # ext/asyncio/base.py
-# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -71,26 +71,26 @@ def _target_gced(
         cls._proxy_objects.pop(ref, None)
 
     @classmethod
-    def _regenerate_proxy_for_target(cls, target: _PT) -> Self:
+    def _regenerate_proxy_for_target(
+        cls, target: _PT, **additional_kw: Any
+    ) -> Self:
         raise NotImplementedError()
 
     @overload
     @classmethod
     def _retrieve_proxy_for_target(
-        cls,
-        target: _PT,
-        regenerate: Literal[True] = ...,
+        cls, target: _PT, regenerate: Literal[True] = ..., **additional_kw: Any
     ) -> Self: ...
 
     @overload
     @classmethod
     def _retrieve_proxy_for_target(
-        cls, target: _PT, regenerate: bool = True
+        cls, target: _PT, regenerate: bool = True, **additional_kw: Any
     ) -> Optional[Self]: ...
 
     @classmethod
     def _retrieve_proxy_for_target(
-        cls, target: _PT, regenerate: bool = True
+        cls, target: _PT, regenerate: bool = True, **additional_kw: Any
     ) -> Optional[Self]:
         try:
             proxy_ref = cls._proxy_objects[weakref.ref(target)]
@@ -102,7 +102,7 @@ def _retrieve_proxy_for_target(
                 return proxy  # type: ignore
 
         if regenerate:
-            return cls._regenerate_proxy_for_target(target)
+            return cls._regenerate_proxy_for_target(target, **additional_kw)
         else:
             return None
 
@@ -193,7 +193,7 @@ async def __aexit__(
                 # (see PEP 479 for sync generators; async generators also
                 # have this behavior). But do this only if the exception
                 # wrapped
-                # by the RuntimeError is actully Stop(Async)Iteration (see
+                # by the RuntimeError is actually Stop(Async)Iteration (see
                 # issue29692).
                 if (
                     isinstance(value, (StopIteration, StopAsyncIteration))
@@ -215,7 +215,7 @@ async def __aexit__(
 
 
 def asyncstartablecontext(
-    func: Callable[..., AsyncIterator[_T_co]]
+    func: Callable[..., AsyncIterator[_T_co]],
 ) -> Callable[..., GeneratorStartableContext[_T_co]]:
     """@asyncstartablecontext decorator.
 
diff --git a/libs/sqlalchemy/ext/asyncio/engine.py b/libs/sqlalchemy/ext/asyncio/engine.py
index 2c9b499f53..263bd75cf4 100644
--- a/libs/sqlalchemy/ext/asyncio/engine.py
+++ b/libs/sqlalchemy/ext/asyncio/engine.py
@@ -1,5 +1,5 @@
 # ext/asyncio/engine.py
-# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -186,7 +186,8 @@ def _no_async_engine_events(cls) -> NoReturn:
         "default_isolation_level",
     ],
 )
-class AsyncConnection(
+# "Class has incompatible disjoint bases" - no idea
+class AsyncConnection(  # type:ignore[misc]
     ProxyComparable[Connection],
     StartableContext["AsyncConnection"],
     AsyncConnectable,
@@ -255,7 +256,7 @@ def __init__(
 
     @classmethod
     def _regenerate_proxy_for_target(
-        cls, target: Connection
+        cls, target: Connection, **additional_kw: Any  # noqa: U100
     ) -> AsyncConnection:
         return AsyncConnection(
             AsyncEngine._retrieve_proxy_for_target(target.engine), target
@@ -576,7 +577,7 @@ async def stream(
         """
         if not self.dialect.supports_server_side_cursors:
             raise exc.InvalidRequestError(
-                "Cant use `stream` or `stream_scalars` with the current "
+                "Can't use `stream` or `stream_scalars` with the current "
                 "dialect since it does not support server side cursors."
             )
 
@@ -994,7 +995,8 @@ def default_isolation_level(self) -> Any:
     ],
     attributes=["url", "pool", "dialect", "engine", "name", "driver", "echo"],
 )
-class AsyncEngine(ProxyComparable[Engine], AsyncConnectable):
+# "Class has incompatible disjoint bases" - no idea
+class AsyncEngine(ProxyComparable[Engine], AsyncConnectable):  # type: ignore[misc]  # noqa:E501
     """An asyncio proxy for a :class:`_engine.Engine`.
 
     :class:`_asyncio.AsyncEngine` is acquired using the
@@ -1041,7 +1043,9 @@ def _proxied(self) -> Engine:
         return self.sync_engine
 
     @classmethod
-    def _regenerate_proxy_for_target(cls, target: Engine) -> AsyncEngine:
+    def _regenerate_proxy_for_target(
+        cls, target: Engine, **additional_kw: Any  # noqa: U100
+    ) -> AsyncEngine:
         return AsyncEngine(target)
 
     @contextlib.asynccontextmanager
@@ -1344,7 +1348,7 @@ def __init__(self, connection: AsyncConnection, nested: bool = False):
 
     @classmethod
     def _regenerate_proxy_for_target(
-        cls, target: Transaction
+        cls, target: Transaction, **additional_kw: Any  # noqa: U100
     ) -> AsyncTransaction:
         sync_connection = target.connection
         sync_transaction = target
@@ -1429,7 +1433,7 @@ def _get_sync_engine_or_connection(
 
 
 def _get_sync_engine_or_connection(
-    async_engine: Union[AsyncEngine, AsyncConnection]
+    async_engine: Union[AsyncEngine, AsyncConnection],
 ) -> Union[Engine, Connection]:
     if isinstance(async_engine, AsyncConnection):
         return async_engine._proxied
diff --git a/libs/sqlalchemy/ext/asyncio/exc.py b/libs/sqlalchemy/ext/asyncio/exc.py
index 558187c0b4..6f61a71c19 100644
--- a/libs/sqlalchemy/ext/asyncio/exc.py
+++ b/libs/sqlalchemy/ext/asyncio/exc.py
@@ -1,5 +1,5 @@
 # ext/asyncio/exc.py
-# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/asyncio/result.py b/libs/sqlalchemy/ext/asyncio/result.py
index c51e166d91..483126a7fb 100644
--- a/libs/sqlalchemy/ext/asyncio/result.py
+++ b/libs/sqlalchemy/ext/asyncio/result.py
@@ -1,5 +1,5 @@
 # ext/asyncio/result.py
-# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -93,6 +93,7 @@ def __init__(self, real_result: Result[_TP]):
 
         self._metadata = real_result._metadata
         self._unique_filter_state = real_result._unique_filter_state
+        self._source_supports_scalars = real_result._source_supports_scalars
         self._post_creational_filter = None
 
         # BaseCursorResult pre-generates the "_row_getter".  Use that
@@ -824,7 +825,7 @@ async def all(self) -> Sequence[_R]:  # noqa: A001
             """
             ...
 
-        async def __aiter__(self) -> AsyncIterator[_R]: ...
+        def __aiter__(self) -> AsyncIterator[_R]: ...
 
         async def __anext__(self) -> _R: ...
 
@@ -958,4 +959,7 @@ async def _ensure_sync_result(result: _RT, calling_method: Any) -> _RT:
                 calling_method.__self__.__class__.__name__,
             )
         )
+
+    if is_cursor and cursor_result.cursor is not None:
+        await cursor_result.cursor._async_soft_close()
     return result
diff --git a/libs/sqlalchemy/ext/asyncio/scoping.py b/libs/sqlalchemy/ext/asyncio/scoping.py
index 7ecab37b40..47099248dd 100644
--- a/libs/sqlalchemy/ext/asyncio/scoping.py
+++ b/libs/sqlalchemy/ext/asyncio/scoping.py
@@ -1,5 +1,5 @@
 # ext/asyncio/scoping.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -38,7 +38,6 @@
     from .result import AsyncScalarResult
     from .session import AsyncSessionTransaction
     from ...engine import Connection
-    from ...engine import CursorResult
     from ...engine import Engine
     from ...engine import Result
     from ...engine import Row
@@ -55,7 +54,6 @@
     from ...orm.session import _PKIdentityArgument
     from ...orm.session import _SessionBind
     from ...sql.base import Executable
-    from ...sql.dml import UpdateBase
     from ...sql.elements import ClauseElement
     from ...sql.selectable import ForUpdateParameter
     from ...sql.selectable import TypedReturnsRows
@@ -538,18 +536,6 @@ async def execute(
         _add_event: Optional[Any] = None,
     ) -> Result[_T]: ...
 
-    @overload
-    async def execute(
-        self,
-        statement: UpdateBase,
-        params: Optional[_CoreAnyExecuteParams] = None,
-        *,
-        execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT,
-        bind_arguments: Optional[_BindArguments] = None,
-        _parent_execute_state: Optional[Any] = None,
-        _add_event: Optional[Any] = None,
-    ) -> CursorResult[Any]: ...
-
     @overload
     async def execute(
         self,
@@ -1175,8 +1161,7 @@ async def get_one(
             Proxied for the :class:`_asyncio.AsyncSession` class on
             behalf of the :class:`_asyncio.scoping.async_scoped_session` class.
 
-        Raises ``sqlalchemy.orm.exc.NoResultFound`` if the query selects
-        no rows.
+        Raises :class:`_exc.NoResultFound` if the query selects no rows.
 
         ..versionadded: 2.0.22
 
diff --git a/libs/sqlalchemy/ext/asyncio/session.py b/libs/sqlalchemy/ext/asyncio/session.py
index bb276943cd..c547b9781e 100644
--- a/libs/sqlalchemy/ext/asyncio/session.py
+++ b/libs/sqlalchemy/ext/asyncio/session.py
@@ -1,5 +1,5 @@
 # ext/asyncio/session.py
-# Copyright (C) 2020-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2020-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -46,7 +46,6 @@
     from .engine import AsyncConnection
     from .engine import AsyncEngine
     from ...engine import Connection
-    from ...engine import CursorResult
     from ...engine import Engine
     from ...engine import Result
     from ...engine import Row
@@ -67,7 +66,6 @@
     from ...orm.session import _SessionBindKey
     from ...sql._typing import _InfoType
     from ...sql.base import Executable
-    from ...sql.dml import UpdateBase
     from ...sql.elements import ClauseElement
     from ...sql.selectable import ForUpdateParameter
     from ...sql.selectable import TypedReturnsRows
@@ -411,18 +409,6 @@ async def execute(
         _add_event: Optional[Any] = None,
     ) -> Result[_T]: ...
 
-    @overload
-    async def execute(
-        self,
-        statement: UpdateBase,
-        params: Optional[_CoreAnyExecuteParams] = None,
-        *,
-        execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT,
-        bind_arguments: Optional[_BindArguments] = None,
-        _parent_execute_state: Optional[Any] = None,
-        _add_event: Optional[Any] = None,
-    ) -> CursorResult[Any]: ...
-
     @overload
     async def execute(
         self,
@@ -628,8 +614,7 @@ async def get_one(
         """Return an instance based on the given primary key identifier,
         or raise an exception if not found.
 
-        Raises ``sqlalchemy.orm.exc.NoResultFound`` if the query selects
-        no rows.
+        Raises :class:`_exc.NoResultFound` if the query selects no rows.
 
         ..versionadded: 2.0.22
 
@@ -812,7 +797,9 @@ def get_transaction(self) -> Optional[AsyncSessionTransaction]:
         """
         trans = self.sync_session.get_transaction()
         if trans is not None:
-            return AsyncSessionTransaction._retrieve_proxy_for_target(trans)
+            return AsyncSessionTransaction._retrieve_proxy_for_target(
+                trans, async_session=self
+            )
         else:
             return None
 
@@ -828,7 +815,9 @@ def get_nested_transaction(self) -> Optional[AsyncSessionTransaction]:
 
         trans = self.sync_session.get_nested_transaction()
         if trans is not None:
-            return AsyncSessionTransaction._retrieve_proxy_for_target(trans)
+            return AsyncSessionTransaction._retrieve_proxy_for_target(
+                trans, async_session=self
+            )
         else:
             return None
 
@@ -1865,6 +1854,21 @@ async def commit(self) -> None:
 
         await greenlet_spawn(self._sync_transaction().commit)
 
+    @classmethod
+    def _regenerate_proxy_for_target(  # type: ignore[override]
+        cls,
+        target: SessionTransaction,
+        async_session: AsyncSession,
+        **additional_kw: Any,  # noqa: U100
+    ) -> AsyncSessionTransaction:
+        sync_transaction = target
+        nested = target.nested
+        obj = cls.__new__(cls)
+        obj.session = async_session
+        obj.sync_transaction = obj._assign_proxied(sync_transaction)
+        obj.nested = nested
+        return obj
+
     async def start(
         self, is_ctxmanager: bool = False
     ) -> AsyncSessionTransaction:
diff --git a/libs/sqlalchemy/ext/automap.py b/libs/sqlalchemy/ext/automap.py
index 817f91d267..a810b82e89 100644
--- a/libs/sqlalchemy/ext/automap.py
+++ b/libs/sqlalchemy/ext/automap.py
@@ -1,5 +1,5 @@
 # ext/automap.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/baked.py b/libs/sqlalchemy/ext/baked.py
index cd3e087931..2377c7d12a 100644
--- a/libs/sqlalchemy/ext/baked.py
+++ b/libs/sqlalchemy/ext/baked.py
@@ -1,5 +1,5 @@
 # ext/baked.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/compiler.py b/libs/sqlalchemy/ext/compiler.py
index cc64477ed4..2de5001ee4 100644
--- a/libs/sqlalchemy/ext/compiler.py
+++ b/libs/sqlalchemy/ext/compiler.py
@@ -1,5 +1,5 @@
 # ext/compiler.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/declarative/__init__.py b/libs/sqlalchemy/ext/declarative/__init__.py
index 0383f9d34f..e134641685 100644
--- a/libs/sqlalchemy/ext/declarative/__init__.py
+++ b/libs/sqlalchemy/ext/declarative/__init__.py
@@ -1,5 +1,5 @@
 # ext/declarative/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/declarative/extensions.py b/libs/sqlalchemy/ext/declarative/extensions.py
index 3dc6bf698c..d119aaebe1 100644
--- a/libs/sqlalchemy/ext/declarative/extensions.py
+++ b/libs/sqlalchemy/ext/declarative/extensions.py
@@ -1,5 +1,5 @@
 # ext/declarative/extensions.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/horizontal_shard.py b/libs/sqlalchemy/ext/horizontal_shard.py
index 3ea3304eb3..4722353f3b 100644
--- a/libs/sqlalchemy/ext/horizontal_shard.py
+++ b/libs/sqlalchemy/ext/horizontal_shard.py
@@ -1,5 +1,5 @@
 # ext/horizontal_shard.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -16,7 +16,7 @@
 .. deepalchemy:: The horizontal sharding extension is an advanced feature,
    involving a complex statement -> database interaction as well as
    use of semi-public APIs for non-trivial cases.   Simpler approaches to
-   refering to multiple database "shards", most commonly using a distinct
+   referring to multiple database "shards", most commonly using a distinct
    :class:`_orm.Session` per "shard", should always be considered first
    before using this more complex and less-production-tested system.
 
diff --git a/libs/sqlalchemy/ext/hybrid.py b/libs/sqlalchemy/ext/hybrid.py
index c1c46e7c5f..f9a9459bfb 100644
--- a/libs/sqlalchemy/ext/hybrid.py
+++ b/libs/sqlalchemy/ext/hybrid.py
@@ -1,5 +1,5 @@
 # ext/hybrid.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -253,7 +253,7 @@ def radius(cls):
 
 In order to produce a reasonable syntax while remaining typing compliant,
 the :attr:`.hybrid_property.inplace` decorator allows the same
-decorator to be re-used with different method names, while still producing
+decorator to be reused with different method names, while still producing
 a single decorator under one name::
 
     # correct use which is also accepted by pep-484 tooling
@@ -465,7 +465,7 @@ def _balance_expression(cls) -> SQLColumnExpression[Optional[Decimal]]:
 list available on ``self``.
 
 .. tip:: The ``User.balance`` getter in the above example accesses the
-   ``self.acccounts`` collection, which will normally be loaded via the
+   ``self.accounts`` collection, which will normally be loaded via the
    :func:`.selectinload` loader strategy configured on the ``User.balance``
    :func:`_orm.relationship`. The default loader strategy when not otherwise
    stated on :func:`_orm.relationship` is :func:`.lazyload`, which emits SQL on
@@ -923,11 +923,11 @@ class HybridExtensionType(InspectionAttrExtensionType):
 
 
 class _HybridGetterType(Protocol[_T_co]):
-    def __call__(s, self: Any) -> _T_co: ...
+    def __call__(s, __self: Any) -> _T_co: ...
 
 
 class _HybridSetterType(Protocol[_T_con]):
-    def __call__(s, self: Any, value: _T_con) -> None: ...
+    def __call__(s, __self: Any, value: _T_con) -> None: ...
 
 
 class _HybridUpdaterType(Protocol[_T_con]):
@@ -939,12 +939,12 @@ def __call__(
 
 
 class _HybridDeleterType(Protocol[_T_co]):
-    def __call__(s, self: Any) -> None: ...
+    def __call__(s, __self: Any) -> None: ...
 
 
 class _HybridExprCallableType(Protocol[_T_co]):
     def __call__(
-        s, cls: Any
+        s, __cls: Any
     ) -> Union[_HasClauseElement[_T_co], SQLColumnExpression[_T_co]]: ...
 
 
@@ -1140,10 +1140,12 @@ def __get__(
         else:
             return self.fget(instance)
 
-    def __set__(self, instance: object, value: Any) -> None:
+    def __set__(
+        self, instance: object, value: Union[SQLCoreOperations[_T], _T]
+    ) -> None:
         if self.fset is None:
             raise AttributeError("can't set attribute")
-        self.fset(instance, value)
+        self.fset(instance, value)  # type: ignore[arg-type]
 
     def __delete__(self, instance: object) -> None:
         if self.fdel is None:
@@ -1244,7 +1246,7 @@ def inplace(self) -> _InPlace[_T]:
         """Return the inplace mutator for this :class:`.hybrid_property`.
 
         This is to allow in-place mutation of the hybrid, allowing the first
-        hybrid method of a certain name to be re-used in order to add
+        hybrid method of a certain name to be reused in order to add
         more methods without having to name those methods the same, e.g.::
 
             class Interval(Base):
diff --git a/libs/sqlalchemy/ext/indexable.py b/libs/sqlalchemy/ext/indexable.py
index 886069ce00..17b3cff5f7 100644
--- a/libs/sqlalchemy/ext/indexable.py
+++ b/libs/sqlalchemy/ext/indexable.py
@@ -1,10 +1,9 @@
 # ext/indexable.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 """Define attributes on ORM-mapped classes that have "index" attributes for
 columns with :class:`_types.Indexable` types.
@@ -216,6 +215,7 @@ class Person(Base):
     >>> query = session.query(Person).filter(Person.age < 20)
 
 The above query will render:
+
 .. sourcecode:: sql
 
     SELECT person.id, person.data
@@ -223,15 +223,32 @@ class Person(Base):
     WHERE CAST(person.data ->> %(data_1)s AS INTEGER) < %(param_1)s
 
 """  # noqa
+
+from __future__ import annotations
+
+from typing import Any
+from typing import Callable
+from typing import cast
+from typing import Optional
+from typing import TYPE_CHECKING
+from typing import TypeVar
+from typing import Union
+
 from .. import inspect
 from ..ext.hybrid import hybrid_property
 from ..orm.attributes import flag_modified
 
+if TYPE_CHECKING:
+    from ..sql import SQLColumnExpression
+    from ..sql._typing import _HasClauseElement
+
 
 __all__ = ["index_property"]
 
+_T = TypeVar("_T")
+
 
-class index_property(hybrid_property):  # noqa
+class index_property(hybrid_property[_T]):
     """A property generator. The generated property describes an object
     attribute that corresponds to an :class:`_types.Indexable`
     column.
@@ -242,16 +259,16 @@ class index_property(hybrid_property):  # noqa
 
     """
 
-    _NO_DEFAULT_ARGUMENT = object()
+    _NO_DEFAULT_ARGUMENT = cast(_T, object())
 
     def __init__(
         self,
-        attr_name,
-        index,
-        default=_NO_DEFAULT_ARGUMENT,
-        datatype=None,
-        mutable=True,
-        onebased=True,
+        attr_name: str,
+        index: Union[int, str],
+        default: _T = _NO_DEFAULT_ARGUMENT,
+        datatype: Optional[Callable[[], Any]] = None,
+        mutable: bool = True,
+        onebased: bool = True,
     ):
         """Create a new :class:`.index_property`.
 
@@ -290,20 +307,20 @@ def __init__(
             self.datatype = datatype
         else:
             if is_numeric:
-                self.datatype = lambda: [None for x in range(index + 1)]
+                self.datatype = lambda: [None for x in range(index + 1)]  # type: ignore[operator]  # noqa: E501
             else:
                 self.datatype = dict
         self.onebased = onebased
 
-    def _fget_default(self, err=None):
+    def _fget_default(self, err: Optional[BaseException] = None) -> _T:
         if self.default == self._NO_DEFAULT_ARGUMENT:
             raise AttributeError(self.attr_name) from err
         else:
             return self.default
 
-    def fget(self, instance):
+    def fget(self, __instance: Any) -> _T:
         attr_name = self.attr_name
-        column_value = getattr(instance, attr_name)
+        column_value = getattr(__instance, attr_name)
         if column_value is None:
             return self._fget_default()
         try:
@@ -311,9 +328,9 @@ def fget(self, instance):
         except (KeyError, IndexError) as err:
             return self._fget_default(err)
         else:
-            return value
+            return value  # type: ignore[no-any-return]
 
-    def fset(self, instance, value):
+    def fset(self, instance: Any, value: _T) -> None:
         attr_name = self.attr_name
         column_value = getattr(instance, attr_name, None)
         if column_value is None:
@@ -324,7 +341,7 @@ def fset(self, instance, value):
         if attr_name in inspect(instance).mapper.attrs:
             flag_modified(instance, attr_name)
 
-    def fdel(self, instance):
+    def fdel(self, instance: Any) -> None:
         attr_name = self.attr_name
         column_value = getattr(instance, attr_name)
         if column_value is None:
@@ -337,9 +354,11 @@ def fdel(self, instance):
             setattr(instance, attr_name, column_value)
             flag_modified(instance, attr_name)
 
-    def expr(self, model):
+    def expr(
+        self, model: Any
+    ) -> Union[_HasClauseElement[_T], SQLColumnExpression[_T]]:
         column = getattr(model, self.attr_name)
         index = self.index
         if self.onebased:
-            index += 1
-        return column[index]
+            index += 1  # type: ignore[operator]
+        return column[index]  # type: ignore[no-any-return]
diff --git a/libs/sqlalchemy/ext/instrumentation.py b/libs/sqlalchemy/ext/instrumentation.py
index 8bb01985ec..08d55dbdb7 100644
--- a/libs/sqlalchemy/ext/instrumentation.py
+++ b/libs/sqlalchemy/ext/instrumentation.py
@@ -1,5 +1,5 @@
 # ext/instrumentation.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/mutable.py b/libs/sqlalchemy/ext/mutable.py
index ed618c3819..43967b784a 100644
--- a/libs/sqlalchemy/ext/mutable.py
+++ b/libs/sqlalchemy/ext/mutable.py
@@ -1,5 +1,5 @@
 # ext/mutable.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -397,7 +397,6 @@ def __setstate__(self, state):
 from .. import event
 from .. import inspect
 from .. import types
-from .. import util
 from ..orm import Mapper
 from ..orm._typing import _ExternalEntityType
 from ..orm._typing import _O
@@ -416,7 +415,6 @@ def __setstate__(self, state):
 from ..sql.type_api import TypeEngine
 from ..util import memoized_property
 from ..util.typing import SupportsIndex
-from ..util.typing import TypeGuard
 
 _KT = TypeVar("_KT")  # Key type.
 _VT = TypeVar("_VT")  # Value type.
@@ -524,6 +522,7 @@ def load(state: InstanceState[_O], *args: Any) -> None:
             if val is not None:
                 if coerce:
                     val = cls.coerce(key, val)
+                    assert val is not None
                     state.dict[key] = val
                 val._parents[state] = key
 
@@ -813,7 +812,7 @@ class MutableDict(Mutable, Dict[_KT, _VT]):
 
     def __setitem__(self, key: _KT, value: _VT) -> None:
         """Detect dictionary set events and emit change events."""
-        super().__setitem__(key, value)
+        dict.__setitem__(self, key, value)
         self.changed()
 
     if TYPE_CHECKING:
@@ -832,17 +831,17 @@ def setdefault(self, key: _KT, value: object = None) -> object: ...
     else:
 
         def setdefault(self, *arg):  # noqa: F811
-            result = super().setdefault(*arg)
+            result = dict.setdefault(self, *arg)
             self.changed()
             return result
 
     def __delitem__(self, key: _KT) -> None:
         """Detect dictionary del events and emit change events."""
-        super().__delitem__(key)
+        dict.__delitem__(self, key)
         self.changed()
 
     def update(self, *a: Any, **kw: _VT) -> None:
-        super().update(*a, **kw)
+        dict.update(self, *a, **kw)
         self.changed()
 
     if TYPE_CHECKING:
@@ -860,17 +859,17 @@ def pop(
     else:
 
         def pop(self, *arg):  # noqa: F811
-            result = super().pop(*arg)
+            result = dict.pop(self, *arg)
             self.changed()
             return result
 
     def popitem(self) -> Tuple[_KT, _VT]:
-        result = super().popitem()
+        result = dict.popitem(self)
         self.changed()
         return result
 
     def clear(self) -> None:
-        super().clear()
+        dict.clear(self)
         self.changed()
 
     @classmethod
@@ -925,38 +924,29 @@ def __reduce_ex__(
     def __setstate__(self, state: Iterable[_T]) -> None:
         self[:] = state
 
-    def is_scalar(self, value: _T | Iterable[_T]) -> TypeGuard[_T]:
-        return not util.is_non_string_iterable(value)
-
-    def is_iterable(self, value: _T | Iterable[_T]) -> TypeGuard[Iterable[_T]]:
-        return util.is_non_string_iterable(value)
-
     def __setitem__(
         self, index: SupportsIndex | slice, value: _T | Iterable[_T]
     ) -> None:
         """Detect list set events and emit change events."""
-        if isinstance(index, SupportsIndex) and self.is_scalar(value):
-            super().__setitem__(index, value)
-        elif isinstance(index, slice) and self.is_iterable(value):
-            super().__setitem__(index, value)
+        list.__setitem__(self, index, value)
         self.changed()
 
     def __delitem__(self, index: SupportsIndex | slice) -> None:
         """Detect list del events and emit change events."""
-        super().__delitem__(index)
+        list.__delitem__(self, index)
         self.changed()
 
     def pop(self, *arg: SupportsIndex) -> _T:
-        result = super().pop(*arg)
+        result = list.pop(self, *arg)
         self.changed()
         return result
 
     def append(self, x: _T) -> None:
-        super().append(x)
+        list.append(self, x)
         self.changed()
 
     def extend(self, x: Iterable[_T]) -> None:
-        super().extend(x)
+        list.extend(self, x)
         self.changed()
 
     def __iadd__(self, x: Iterable[_T]) -> MutableList[_T]:  # type: ignore[override,misc] # noqa: E501
@@ -964,23 +954,23 @@ def __iadd__(self, x: Iterable[_T]) -> MutableList[_T]:  # type: ignore[override
         return self
 
     def insert(self, i: SupportsIndex, x: _T) -> None:
-        super().insert(i, x)
+        list.insert(self, i, x)
         self.changed()
 
     def remove(self, i: _T) -> None:
-        super().remove(i)
+        list.remove(self, i)
         self.changed()
 
     def clear(self) -> None:
-        super().clear()
+        list.clear(self)
         self.changed()
 
     def sort(self, **kw: Any) -> None:
-        super().sort(**kw)
+        list.sort(self, **kw)
         self.changed()
 
     def reverse(self) -> None:
-        super().reverse()
+        list.reverse(self)
         self.changed()
 
     @classmethod
@@ -1021,19 +1011,19 @@ class MutableSet(Mutable, Set[_T]):
     """
 
     def update(self, *arg: Iterable[_T]) -> None:
-        super().update(*arg)
+        set.update(self, *arg)
         self.changed()
 
     def intersection_update(self, *arg: Iterable[Any]) -> None:
-        super().intersection_update(*arg)
+        set.intersection_update(self, *arg)
         self.changed()
 
     def difference_update(self, *arg: Iterable[Any]) -> None:
-        super().difference_update(*arg)
+        set.difference_update(self, *arg)
         self.changed()
 
     def symmetric_difference_update(self, *arg: Iterable[_T]) -> None:
-        super().symmetric_difference_update(*arg)
+        set.symmetric_difference_update(self, *arg)
         self.changed()
 
     def __ior__(self, other: AbstractSet[_T]) -> MutableSet[_T]:  # type: ignore[override,misc] # noqa: E501
@@ -1053,24 +1043,24 @@ def __isub__(self, other: AbstractSet[object]) -> MutableSet[_T]:  # type: ignor
         return self
 
     def add(self, elem: _T) -> None:
-        super().add(elem)
+        set.add(self, elem)
         self.changed()
 
     def remove(self, elem: _T) -> None:
-        super().remove(elem)
+        set.remove(self, elem)
         self.changed()
 
     def discard(self, elem: _T) -> None:
-        super().discard(elem)
+        set.discard(self, elem)
         self.changed()
 
     def pop(self, *arg: Any) -> _T:
-        result = super().pop(*arg)
+        result = set.pop(self, *arg)
         self.changed()
         return result
 
     def clear(self) -> None:
-        super().clear()
+        set.clear(self)
         self.changed()
 
     @classmethod
diff --git a/libs/sqlalchemy/ext/mypy/__init__.py b/libs/sqlalchemy/ext/mypy/__init__.py
index b5827cb8d3..09094508ad 100644
--- a/libs/sqlalchemy/ext/mypy/__init__.py
+++ b/libs/sqlalchemy/ext/mypy/__init__.py
@@ -1,5 +1,5 @@
 # ext/mypy/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/mypy/apply.py b/libs/sqlalchemy/ext/mypy/apply.py
index 02908cc14b..cfc9c05379 100644
--- a/libs/sqlalchemy/ext/mypy/apply.py
+++ b/libs/sqlalchemy/ext/mypy/apply.py
@@ -1,5 +1,5 @@
 # ext/mypy/apply.py
-# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/mypy/decl_class.py b/libs/sqlalchemy/ext/mypy/decl_class.py
index 2ce7ad56cc..788b64f1d6 100644
--- a/libs/sqlalchemy/ext/mypy/decl_class.py
+++ b/libs/sqlalchemy/ext/mypy/decl_class.py
@@ -1,5 +1,5 @@
 # ext/mypy/decl_class.py
-# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/mypy/infer.py b/libs/sqlalchemy/ext/mypy/infer.py
index 26a83cca83..5e1e1f01e5 100644
--- a/libs/sqlalchemy/ext/mypy/infer.py
+++ b/libs/sqlalchemy/ext/mypy/infer.py
@@ -1,5 +1,5 @@
 # ext/mypy/infer.py
-# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/mypy/names.py b/libs/sqlalchemy/ext/mypy/names.py
index 319786288f..be08a85404 100644
--- a/libs/sqlalchemy/ext/mypy/names.py
+++ b/libs/sqlalchemy/ext/mypy/names.py
@@ -1,5 +1,5 @@
 # ext/mypy/names.py
-# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -297,7 +297,7 @@ def type_id_for_callee(callee: Expression) -> Optional[int]:
 
 
 def type_id_for_named_node(
-    node: Union[NameExpr, MemberExpr, SymbolNode]
+    node: Union[NameExpr, MemberExpr, SymbolNode],
 ) -> Optional[int]:
     type_id, fullnames = _lookup.get(node.name, (None, None))
 
diff --git a/libs/sqlalchemy/ext/mypy/plugin.py b/libs/sqlalchemy/ext/mypy/plugin.py
index 1ec2c02b9c..73b0d6d26e 100644
--- a/libs/sqlalchemy/ext/mypy/plugin.py
+++ b/libs/sqlalchemy/ext/mypy/plugin.py
@@ -1,5 +1,5 @@
 # ext/mypy/plugin.py
-# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/mypy/util.py b/libs/sqlalchemy/ext/mypy/util.py
index 16761b9ab3..855f6171b3 100644
--- a/libs/sqlalchemy/ext/mypy/util.py
+++ b/libs/sqlalchemy/ext/mypy/util.py
@@ -1,5 +1,5 @@
 # ext/mypy/util.py
-# Copyright (C) 2021-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2021-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/ext/orderinglist.py b/libs/sqlalchemy/ext/orderinglist.py
index 3cc67b1896..fcd483cf5f 100644
--- a/libs/sqlalchemy/ext/orderinglist.py
+++ b/libs/sqlalchemy/ext/orderinglist.py
@@ -1,10 +1,9 @@
 # ext/orderinglist.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-# mypy: ignore-errors
 
 """A custom list that manages index/position information for contained
 elements.
@@ -129,17 +128,24 @@ class Bullet(Base):
 """
 from __future__ import annotations
 
+from typing import Any
 from typing import Callable
+from typing import Dict
+from typing import Iterable
 from typing import List
 from typing import Optional
+from typing import overload
 from typing import Sequence
+from typing import Type
 from typing import TypeVar
+from typing import Union
 
 from ..orm.collections import collection
 from ..orm.collections import collection_adapter
+from ..util.typing import SupportsIndex
 
 _T = TypeVar("_T")
-OrderingFunc = Callable[[int, Sequence[_T]], int]
+OrderingFunc = Callable[[int, Sequence[_T]], object]
 
 
 __all__ = ["ordering_list"]
@@ -148,9 +154,9 @@ class Bullet(Base):
 def ordering_list(
     attr: str,
     count_from: Optional[int] = None,
-    ordering_func: Optional[OrderingFunc] = None,
+    ordering_func: Optional[OrderingFunc[_T]] = None,
     reorder_on_append: bool = False,
-) -> Callable[[], OrderingList]:
+) -> Callable[[], OrderingList[_T]]:
     """Prepares an :class:`OrderingList` factory for use in mapper definitions.
 
     Returns an object suitable for use as an argument to a Mapper
@@ -196,22 +202,22 @@ class Slide(Base):
 # Ordering utility functions
 
 
-def count_from_0(index, collection):
+def count_from_0(index: int, collection: object) -> int:
     """Numbering function: consecutive integers starting at 0."""
 
     return index
 
 
-def count_from_1(index, collection):
+def count_from_1(index: int, collection: object) -> int:
     """Numbering function: consecutive integers starting at 1."""
 
     return index + 1
 
 
-def count_from_n_factory(start):
+def count_from_n_factory(start: int) -> OrderingFunc[Any]:
     """Numbering function: consecutive integers starting at arbitrary start."""
 
-    def f(index, collection):
+    def f(index: int, collection: object) -> int:
         return index + start
 
     try:
@@ -221,7 +227,7 @@ def f(index, collection):
     return f
 
 
-def _unsugar_count_from(**kw):
+def _unsugar_count_from(**kw: Any) -> Dict[str, Any]:
     """Builds counting functions from keyword arguments.
 
     Keyword argument filter, prepares a simple ``ordering_func`` from a
@@ -249,13 +255,13 @@ class OrderingList(List[_T]):
     """
 
     ordering_attr: str
-    ordering_func: OrderingFunc
+    ordering_func: OrderingFunc[_T]
     reorder_on_append: bool
 
     def __init__(
         self,
-        ordering_attr: Optional[str] = None,
-        ordering_func: Optional[OrderingFunc] = None,
+        ordering_attr: str,
+        ordering_func: Optional[OrderingFunc[_T]] = None,
         reorder_on_append: bool = False,
     ):
         """A custom list that manages position information for its children.
@@ -315,10 +321,10 @@ def __init__(
 
     # More complex serialization schemes (multi column, e.g.) are possible by
     # subclassing and reimplementing these two methods.
-    def _get_order_value(self, entity):
+    def _get_order_value(self, entity: _T) -> Any:
         return getattr(entity, self.ordering_attr)
 
-    def _set_order_value(self, entity, value):
+    def _set_order_value(self, entity: _T, value: Any) -> None:
         setattr(entity, self.ordering_attr, value)
 
     def reorder(self) -> None:
@@ -334,7 +340,9 @@ def reorder(self) -> None:
     # As of 0.5, _reorder is no longer semi-private
     _reorder = reorder
 
-    def _order_entity(self, index, entity, reorder=True):
+    def _order_entity(
+        self, index: int, entity: _T, reorder: bool = True
+    ) -> None:
         have = self._get_order_value(entity)
 
         # Don't disturb existing ordering if reorder is False
@@ -345,34 +353,44 @@ def _order_entity(self, index, entity, reorder=True):
         if have != should_be:
             self._set_order_value(entity, should_be)
 
-    def append(self, entity):
+    def append(self, entity: _T) -> None:
         super().append(entity)
         self._order_entity(len(self) - 1, entity, self.reorder_on_append)
 
-    def _raw_append(self, entity):
+    def _raw_append(self, entity: _T) -> None:
         """Append without any ordering behavior."""
 
         super().append(entity)
 
     _raw_append = collection.adds(1)(_raw_append)
 
-    def insert(self, index, entity):
+    def insert(self, index: SupportsIndex, entity: _T) -> None:
         super().insert(index, entity)
         self._reorder()
 
-    def remove(self, entity):
+    def remove(self, entity: _T) -> None:
         super().remove(entity)
 
         adapter = collection_adapter(self)
         if adapter and adapter._referenced_by_owner:
             self._reorder()
 
-    def pop(self, index=-1):
+    def pop(self, index: SupportsIndex = -1) -> _T:
         entity = super().pop(index)
         self._reorder()
         return entity
 
-    def __setitem__(self, index, entity):
+    @overload
+    def __setitem__(self, index: SupportsIndex, entity: _T) -> None: ...
+
+    @overload
+    def __setitem__(self, index: slice, entity: Iterable[_T]) -> None: ...
+
+    def __setitem__(
+        self,
+        index: Union[SupportsIndex, slice],
+        entity: Union[_T, Iterable[_T]],
+    ) -> None:
         if isinstance(index, slice):
             step = index.step or 1
             start = index.start or 0
@@ -381,26 +399,18 @@ def __setitem__(self, index, entity):
             stop = index.stop or len(self)
             if stop < 0:
                 stop += len(self)
-
+            entities = list(entity)  # type: ignore[arg-type]
             for i in range(start, stop, step):
-                self.__setitem__(i, entity[i])
+                self.__setitem__(i, entities[i])
         else:
-            self._order_entity(index, entity, True)
-            super().__setitem__(index, entity)
+            self._order_entity(int(index), entity, True)  # type: ignore[arg-type] # noqa: E501
+            super().__setitem__(index, entity)  # type: ignore[assignment]
 
-    def __delitem__(self, index):
+    def __delitem__(self, index: Union[SupportsIndex, slice]) -> None:
         super().__delitem__(index)
         self._reorder()
 
-    def __setslice__(self, start, end, values):
-        super().__setslice__(start, end, values)
-        self._reorder()
-
-    def __delslice__(self, start, end):
-        super().__delslice__(start, end)
-        self._reorder()
-
-    def __reduce__(self):
+    def __reduce__(self) -> Any:
         return _reconstitute, (self.__class__, self.__dict__, list(self))
 
     for func_name, func in list(locals().items()):
@@ -414,7 +424,9 @@ def __reduce__(self):
     del func_name, func
 
 
-def _reconstitute(cls, dict_, items):
+def _reconstitute(
+    cls: Type[OrderingList[_T]], dict_: Dict[str, Any], items: List[_T]
+) -> OrderingList[_T]:
     """Reconstitute an :class:`.OrderingList`.
 
     This is the adjoint to :meth:`.OrderingList.__reduce__`.  It is used for
diff --git a/libs/sqlalchemy/ext/serializer.py b/libs/sqlalchemy/ext/serializer.py
index b7032b6595..2fb022c349 100644
--- a/libs/sqlalchemy/ext/serializer.py
+++ b/libs/sqlalchemy/ext/serializer.py
@@ -1,5 +1,5 @@
 # ext/serializer.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/future/__init__.py b/libs/sqlalchemy/future/__init__.py
index ef9afb1a52..3a06418649 100644
--- a/libs/sqlalchemy/future/__init__.py
+++ b/libs/sqlalchemy/future/__init__.py
@@ -1,5 +1,5 @@
 # future/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/future/engine.py b/libs/sqlalchemy/future/engine.py
index 0449c3d9f3..e53286c455 100644
--- a/libs/sqlalchemy/future/engine.py
+++ b/libs/sqlalchemy/future/engine.py
@@ -1,5 +1,5 @@
 # future/engine.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/inspection.py b/libs/sqlalchemy/inspection.py
index 2e5b220181..c6380c7ca8 100644
--- a/libs/sqlalchemy/inspection.py
+++ b/libs/sqlalchemy/inspection.py
@@ -1,5 +1,5 @@
 # inspection.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/log.py b/libs/sqlalchemy/log.py
index 849a0bfa07..7327089428 100644
--- a/libs/sqlalchemy/log.py
+++ b/libs/sqlalchemy/log.py
@@ -1,5 +1,5 @@
 # log.py
-# Copyright (C) 2006-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2006-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 # Includes alterations by Vinay Sajip vinay_sajip@yahoo.co.uk
 #
diff --git a/libs/sqlalchemy/orm/__init__.py b/libs/sqlalchemy/orm/__init__.py
index 7771de47eb..3521c6cfd9 100644
--- a/libs/sqlalchemy/orm/__init__.py
+++ b/libs/sqlalchemy/orm/__init__.py
@@ -1,5 +1,5 @@
 # orm/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -63,6 +63,7 @@
 from .decl_api import DeclarativeMeta as DeclarativeMeta
 from .decl_api import declared_attr as declared_attr
 from .decl_api import has_inherited_table as has_inherited_table
+from .decl_api import mapped_as_dataclass as mapped_as_dataclass
 from .decl_api import MappedAsDataclass as MappedAsDataclass
 from .decl_api import registry as registry
 from .decl_api import synonym_for as synonym_for
diff --git a/libs/sqlalchemy/orm/_orm_constructors.py b/libs/sqlalchemy/orm/_orm_constructors.py
index d9e3ec37ba..299485d035 100644
--- a/libs/sqlalchemy/orm/_orm_constructors.py
+++ b/libs/sqlalchemy/orm/_orm_constructors.py
@@ -1,5 +1,5 @@
 # orm/_orm_constructors.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -12,6 +12,7 @@
 from typing import Callable
 from typing import Collection
 from typing import Iterable
+from typing import Mapping
 from typing import NoReturn
 from typing import Optional
 from typing import overload
@@ -134,6 +135,7 @@ def mapped_column(
     system: bool = False,
     comment: Optional[str] = None,
     sort_order: Union[_NoArg, int] = _NoArg.NO_ARG,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
     **kw: Any,
 ) -> MappedColumn[Any]:
     r"""declare a new ORM-mapped :class:`_schema.Column` construct
@@ -187,9 +189,9 @@ def mapped_column(
      :class:`_schema.Column`.
     :param nullable: Optional bool, whether the column should be "NULL" or
      "NOT NULL". If omitted, the nullability is derived from the type
-     annotation based on whether or not ``typing.Optional`` is present.
-     ``nullable`` defaults to ``True`` otherwise for non-primary key columns,
-     and ``False`` for primary key columns.
+     annotation based on whether or not ``typing.Optional`` (or its equivalent)
+     is present.  ``nullable`` defaults to ``True`` otherwise for non-primary
+     key columns, and ``False`` for primary key columns.
     :param primary_key: optional bool, indicates the :class:`_schema.Column`
      would be part of the table's primary key or not.
     :param deferred: Optional bool - this keyword argument is consumed by the
@@ -339,6 +341,12 @@ def mapped_column(
 
      .. versionadded:: 2.0.36
 
+    :param dataclass_metadata: Specific to
+     :ref:`orm_declarative_native_dataclasses`, supplies metadata
+     to be attached to the generated dataclass field.
+
+     .. versionadded:: 2.0.42
+
     :param \**kw: All remaining keyword arguments are passed through to the
      constructor for the :class:`_schema.Column`.
 
@@ -353,7 +361,14 @@ def mapped_column(
         autoincrement=autoincrement,
         insert_default=insert_default,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only, hash
+            init,
+            repr,
+            default,
+            default_factory,
+            compare,
+            kw_only,
+            hash,
+            dataclass_metadata,
         ),
         doc=doc,
         key=key,
@@ -459,6 +474,7 @@ def column_property(
     expire_on_flush: bool = True,
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
 ) -> MappedSQLExpression[_T]:
     r"""Provide a column-level property for use with a mapping.
 
@@ -581,6 +597,12 @@ def column_property(
 
      .. versionadded:: 2.0.36
 
+    :param dataclass_metadata: Specific to
+     :ref:`orm_declarative_native_dataclasses`, supplies metadata
+     to be attached to the generated dataclass field.
+
+     .. versionadded:: 2.0.42
+
     """
     return MappedSQLExpression(
         column,
@@ -593,6 +615,7 @@ def column_property(
             compare,
             kw_only,
             hash,
+            dataclass_metadata,
         ),
         group=group,
         deferred=deferred,
@@ -624,6 +647,7 @@ def composite(
     hash: Union[_NoArg, bool, None] = _NoArg.NO_ARG,  # noqa: A002
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
     **__kw: Any,
 ) -> Composite[Any]: ...
 
@@ -691,6 +715,7 @@ def composite(
     hash: Union[_NoArg, bool, None] = _NoArg.NO_ARG,  # noqa: A002
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
     **__kw: Any,
 ) -> Composite[Any]:
     r"""Return a composite column-based property for use with a Mapper.
@@ -769,6 +794,13 @@ def composite(
      class.
 
      .. versionadded:: 2.0.36
+
+    :param dataclass_metadata: Specific to
+     :ref:`orm_declarative_native_dataclasses`, supplies metadata
+     to be attached to the generated dataclass field.
+
+     .. versionadded:: 2.0.42
+
     """
     if __kw:
         raise _no_kw()
@@ -777,7 +809,14 @@ def composite(
         _class_or_attr,
         *attrs,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only, hash
+            init,
+            repr,
+            default,
+            default_factory,
+            compare,
+            kw_only,
+            hash,
+            dataclass_metadata,
         ),
         group=group,
         deferred=deferred,
@@ -1031,6 +1070,7 @@ def relationship(
     info: Optional[_InfoType] = None,
     omit_join: Literal[None, False] = None,
     sync_backref: Optional[bool] = None,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
     **kw: Any,
 ) -> _RelationshipDeclared[Any]:
     """Provide a relationship between two mapped classes.
@@ -1841,6 +1881,13 @@ class that will be synchronized with this one.   It is usually
      class.
 
      .. versionadded:: 2.0.36
+
+    :param dataclass_metadata: Specific to
+     :ref:`orm_declarative_native_dataclasses`, supplies metadata
+     to be attached to the generated dataclass field.
+
+     .. versionadded:: 2.0.42
+
     """
 
     return _RelationshipDeclared(
@@ -1858,7 +1905,14 @@ class that will be synchronized with this one.   It is usually
         cascade=cascade,
         viewonly=viewonly,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only, hash
+            init,
+            repr,
+            default,
+            default_factory,
+            compare,
+            kw_only,
+            hash,
+            dataclass_metadata,
         ),
         lazy=lazy,
         passive_deletes=passive_deletes,
@@ -1896,6 +1950,7 @@ def synonym(
     hash: Union[_NoArg, bool, None] = _NoArg.NO_ARG,  # noqa: A002
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
 ) -> Synonym[Any]:
     """Denote an attribute name as a synonym to a mapped property,
     in that the attribute will mirror the value and expression behavior
@@ -2009,7 +2064,14 @@ def _job_status_descriptor(self):
         descriptor=descriptor,
         comparator_factory=comparator_factory,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only, hash
+            init,
+            repr,
+            default,
+            default_factory,
+            compare,
+            kw_only,
+            hash,
+            dataclass_metadata,
         ),
         doc=doc,
         info=info,
@@ -2144,6 +2206,7 @@ def deferred(
     expire_on_flush: bool = True,
     info: Optional[_InfoType] = None,
     doc: Optional[str] = None,
+    dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None] = _NoArg.NO_ARG,
 ) -> MappedSQLExpression[_T]:
     r"""Indicate a column-based mapped attribute that by default will
     not load unless accessed.
@@ -2174,7 +2237,14 @@ def deferred(
         column,
         *additional_columns,
         attribute_options=_AttributeOptions(
-            init, repr, default, default_factory, compare, kw_only, hash
+            init,
+            repr,
+            default,
+            default_factory,
+            compare,
+            kw_only,
+            hash,
+            dataclass_metadata,
         ),
         group=group,
         deferred=True,
@@ -2218,6 +2288,7 @@ def query_expression(
             compare,
             _NoArg.NO_ARG,
             _NoArg.NO_ARG,
+            _NoArg.NO_ARG,
         ),
         expire_on_flush=expire_on_flush,
         info=info,
@@ -2246,7 +2317,7 @@ def clear_mappers() -> None:
     are never discarded independently of their class.  If a mapped class
     itself is garbage collected, its mapper is automatically disposed of as
     well. As such, :func:`.clear_mappers` is only for usage in test suites
-    that re-use the same classes with different mappings, which is itself an
+    that reuse the same classes with different mappings, which is itself an
     extremely rare use case - the only such use case is in fact SQLAlchemy's
     own test suite, and possibly the test suites of other ORM extension
     libraries which intend to test various combinations of mapper construction
diff --git a/libs/sqlalchemy/orm/_typing.py b/libs/sqlalchemy/orm/_typing.py
index ccb8413b52..934e5644c4 100644
--- a/libs/sqlalchemy/orm/_typing.py
+++ b/libs/sqlalchemy/orm/_typing.py
@@ -1,5 +1,5 @@
 # orm/_typing.py
-# Copyright (C) 2022-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/attributes.py b/libs/sqlalchemy/orm/attributes.py
index 8207b4cace..1a935e3ff0 100644
--- a/libs/sqlalchemy/orm/attributes.py
+++ b/libs/sqlalchemy/orm/attributes.py
@@ -1,5 +1,5 @@
 # orm/attributes.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -462,6 +462,9 @@ def hasparent(
     ) -> bool:
         return self.impl.hasparent(state, optimistic=optimistic) is not False
 
+    def _column_strategy_attrs(self) -> Sequence[QueryableAttribute[Any]]:
+        return (self,)
+
     def __getattr__(self, key: str) -> Any:
         try:
             return util.MemoizedSlots.__getattr__(self, key)
@@ -595,7 +598,7 @@ def create_proxied_attribute(
     # TODO: can move this to descriptor_props if the need for this
     # function is removed from ext/hybrid.py
 
-    class Proxy(QueryableAttribute[Any]):
+    class Proxy(QueryableAttribute[_T_co]):
         """Presents the :class:`.QueryableAttribute` interface as a
         proxy on top of a Python descriptor / :class:`.PropComparator`
         combination.
@@ -610,13 +613,13 @@ class Proxy(QueryableAttribute[Any]):
 
         def __init__(
             self,
-            class_,
-            key,
-            descriptor,
-            comparator,
-            adapt_to_entity=None,
-            doc=None,
-            original_property=None,
+            class_: _ExternalEntityType[Any],
+            key: str,
+            descriptor: Any,
+            comparator: interfaces.PropComparator[_T_co],
+            adapt_to_entity: Optional[AliasedInsp[Any]] = None,
+            doc: Optional[str] = None,
+            original_property: Optional[QueryableAttribute[_T_co]] = None,
         ):
             self.class_ = class_
             self.key = key
@@ -627,11 +630,11 @@ def __init__(
             self._doc = self.__doc__ = doc
 
         @property
-        def _parententity(self):
+        def _parententity(self):  # type: ignore[override]
             return inspection.inspect(self.class_, raiseerr=False)
 
         @property
-        def parent(self):
+        def parent(self):  # type: ignore[override]
             return inspection.inspect(self.class_, raiseerr=False)
 
         _is_internal_proxy = True
@@ -641,6 +644,13 @@ def parent(self):
             ("_parententity", visitors.ExtendedInternalTraversal.dp_multi),
         ]
 
+        def _column_strategy_attrs(self) -> Sequence[QueryableAttribute[Any]]:
+            prop = self.original_property
+            if prop is None:
+                return ()
+            else:
+                return prop._column_strategy_attrs()
+
         @property
         def _impl_uses_objects(self):
             return (
@@ -2707,7 +2717,7 @@ def init_state_collection(
     return adapter
 
 
-def set_committed_value(instance, key, value):
+def set_committed_value(instance: object, key: str, value: Any) -> None:
     """Set the value of an attribute with no history events.
 
     Cancels any previous history present.  The value should be
diff --git a/libs/sqlalchemy/orm/base.py b/libs/sqlalchemy/orm/base.py
index c84f3b1b3f..64afede2ea 100644
--- a/libs/sqlalchemy/orm/base.py
+++ b/libs/sqlalchemy/orm/base.py
@@ -1,13 +1,11 @@
 # orm/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Constants and rudimental functions used throughout the ORM.
-
-"""
+"""Constants and rudimental functions used throughout the ORM."""
 
 from __future__ import annotations
 
@@ -145,7 +143,7 @@ class PassiveFlag(FastIntFlag):
     """
 
     NO_AUTOFLUSH = 64
-    """Loader callables should disable autoflush.""",
+    """Loader callables should disable autoflush."""
 
     NO_RAISE = 128
     """Loader callables should not raise any assertions"""
@@ -435,7 +433,7 @@ def _inspect_mapped_object(instance: _T) -> Optional[InstanceState[_T]]:
 
 
 def _class_to_mapper(
-    class_or_mapper: Union[Mapper[_T], Type[_T]]
+    class_or_mapper: Union[Mapper[_T], Type[_T]],
 ) -> Mapper[_T]:
     # can't get mypy to see an overload for this
     insp = inspection.inspect(class_or_mapper, False)
@@ -447,7 +445,7 @@ def _class_to_mapper(
 
 
 def _mapper_or_none(
-    entity: Union[Type[_T], _InternalEntityType[_T]]
+    entity: Union[Type[_T], _InternalEntityType[_T]],
 ) -> Optional[Mapper[_T]]:
     """Return the :class:`_orm.Mapper` for the given class or None if the
     class is not mapped.
diff --git a/libs/sqlalchemy/orm/bulk_persistence.py b/libs/sqlalchemy/orm/bulk_persistence.py
index 402d7bede6..22baf89430 100644
--- a/libs/sqlalchemy/orm/bulk_persistence.py
+++ b/libs/sqlalchemy/orm/bulk_persistence.py
@@ -1,5 +1,5 @@
 # orm/bulk_persistence.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -444,11 +444,24 @@ def _get_orm_crud_kv_pairs(
                     ),
                 )
 
+    @classmethod
+    def _get_dml_plugin_subject(cls, statement):
+        plugin_subject = statement.table._propagate_attrs.get("plugin_subject")
+
+        if (
+            not plugin_subject
+            or not plugin_subject.mapper
+            or plugin_subject
+            is not statement._propagate_attrs["plugin_subject"]
+        ):
+            return None
+        return plugin_subject
+
     @classmethod
     def _get_multi_crud_kv_pairs(cls, statement, kv_iterator):
-        plugin_subject = statement._propagate_attrs["plugin_subject"]
+        plugin_subject = cls._get_dml_plugin_subject(statement)
 
-        if not plugin_subject or not plugin_subject.mapper:
+        if not plugin_subject:
             return UpdateDMLState._get_multi_crud_kv_pairs(
                 statement, kv_iterator
             )
@@ -468,13 +481,12 @@ def _get_crud_kv_pairs(cls, statement, kv_iterator, needs_to_be_cacheable):
             needs_to_be_cacheable
         ), "no test coverage for needs_to_be_cacheable=False"
 
-        plugin_subject = statement._propagate_attrs["plugin_subject"]
+        plugin_subject = cls._get_dml_plugin_subject(statement)
 
-        if not plugin_subject or not plugin_subject.mapper:
+        if not plugin_subject:
             return UpdateDMLState._get_crud_kv_pairs(
                 statement, kv_iterator, needs_to_be_cacheable
             )
-
         return list(
             cls._get_orm_crud_kv_pairs(
                 plugin_subject.mapper,
@@ -1095,7 +1107,7 @@ def _do_pre_synchronize_fetch(
         # call can_use_returning() before invoking the statement and get
         # answer?, why does this go through the whole execute phase using an
         # event?  Answer: because we are integrating with extensions such
-        # as the horizontal sharding extention that "multiplexes" an individual
+        # as the horizontal sharding extension that "multiplexes" an individual
         # statement run through multiple engines, and it uses
         # do_orm_execute() to do that.
 
@@ -1206,7 +1218,7 @@ def orm_pre_session_exec(
             # for ORM object loading, like ORMContext, we have to disable
             # result set adapt_to_context, because we will be generating a
             # new statement with specific columns that's cached inside of
-            # an ORMFromStatementCompileState, which we will re-use for
+            # an ORMFromStatementCompileState, which we will reuse for
             # each result.
             if not execution_options:
                 execution_options = context._orm_load_exec_options
diff --git a/libs/sqlalchemy/orm/clsregistry.py b/libs/sqlalchemy/orm/clsregistry.py
index 70307ec767..2b02446c0f 100644
--- a/libs/sqlalchemy/orm/clsregistry.py
+++ b/libs/sqlalchemy/orm/clsregistry.py
@@ -1,5 +1,5 @@
 # orm/clsregistry.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -72,7 +72,7 @@ def add_class(
         # class already exists.
         existing = decl_class_registry[classname]
         if not isinstance(existing, _MultipleClassMarker):
-            existing = decl_class_registry[classname] = _MultipleClassMarker(
+            decl_class_registry[classname] = _MultipleClassMarker(
                 [cls, cast("Type[Any]", existing)]
             )
     else:
@@ -317,7 +317,7 @@ def add_class(self, name: str, cls: Type[Any]) -> None:
                 else:
                     raise
         else:
-            existing = self.contents[name] = _MultipleClassMarker(
+            self.contents[name] = _MultipleClassMarker(
                 [cls], on_remove=lambda: self._remove_item(name)
             )
 
diff --git a/libs/sqlalchemy/orm/collections.py b/libs/sqlalchemy/orm/collections.py
index 336b1133d9..742ebfb052 100644
--- a/libs/sqlalchemy/orm/collections.py
+++ b/libs/sqlalchemy/orm/collections.py
@@ -1,5 +1,5 @@
 # orm/collections.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -359,7 +359,7 @@ def convert(self, other): ...
         return fn
 
     @staticmethod
-    def adds(arg):
+    def adds(arg: int) -> Callable[[_FN], _FN]:
         """Mark the method as adding an entity to the collection.
 
         Adds "add to collection" handling to the method.  The decorator
diff --git a/libs/sqlalchemy/orm/context.py b/libs/sqlalchemy/orm/context.py
index c09c03b78c..9acc59314a 100644
--- a/libs/sqlalchemy/orm/context.py
+++ b/libs/sqlalchemy/orm/context.py
@@ -1,5 +1,5 @@
 # orm/context.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -148,10 +148,11 @@ class default_load_options(Options):
     def __init__(
         self,
         compile_state: CompileState,
-        statement: Union[Select[Any], FromStatement[Any]],
+        statement: Union[Select[Any], FromStatement[Any], UpdateBase],
         user_passed_query: Union[
             Select[Any],
             FromStatement[Any],
+            UpdateBase,
         ],
         params: _CoreSingleExecuteParams,
         session: Session,
@@ -230,7 +231,7 @@ def _init_global_attributes(
         if compiler is None:
             # this is the legacy / testing only ORM _compile_state() use case.
             # there is no need to apply criteria options for this.
-            self.global_attributes = ga = {}
+            self.global_attributes = {}
             assert toplevel
             return
         else:
@@ -264,10 +265,10 @@ def _init_global_attributes(
     @classmethod
     def create_for_statement(
         cls,
-        statement: Union[Select, FromStatement],
-        compiler: Optional[SQLCompiler],
+        statement: Executable,
+        compiler: SQLCompiler,
         **kw: Any,
-    ) -> AbstractORMCompileState:
+    ) -> CompileState:
         """Create a context for a statement given a :class:`.Compiler`.
 
         This method is always invoked in the context of SQLCompiler.process().
@@ -413,8 +414,8 @@ class default_compile_options(CacheableOptions):
     attributes: Dict[Any, Any]
     global_attributes: Dict[Any, Any]
 
-    statement: Union[Select[Any], FromStatement[Any]]
-    select_statement: Union[Select[Any], FromStatement[Any]]
+    statement: Union[Select[Any], FromStatement[Any], UpdateBase]
+    select_statement: Union[Select[Any], FromStatement[Any], UpdateBase]
     _entities: List[_QueryEntity]
     _polymorphic_adapters: Dict[_InternalEntityType, ORMAdapter]
     compile_options: Union[
@@ -436,15 +437,30 @@ class default_compile_options(CacheableOptions):
     def __init__(self, *arg, **kw):
         raise NotImplementedError()
 
-    if TYPE_CHECKING:
+    @classmethod
+    def create_for_statement(
+        cls,
+        statement: Executable,
+        compiler: SQLCompiler,
+        **kw: Any,
+    ) -> ORMCompileState:
+        return cls._create_orm_context(
+            cast("Union[Select, FromStatement]", statement),
+            toplevel=not compiler.stack,
+            compiler=compiler,
+            **kw,
+        )
 
-        @classmethod
-        def create_for_statement(
-            cls,
-            statement: Union[Select, FromStatement],
-            compiler: Optional[SQLCompiler],
-            **kw: Any,
-        ) -> ORMCompileState: ...
+    @classmethod
+    def _create_orm_context(
+        cls,
+        statement: Union[Select, FromStatement],
+        *,
+        toplevel: bool,
+        compiler: Optional[SQLCompiler],
+        **kw: Any,
+    ) -> ORMCompileState:
+        raise NotImplementedError()
 
     def _append_dedupe_col_collection(self, obj, col_collection):
         dedupe = self.dedupe_columns
@@ -654,8 +670,8 @@ def _create_entities_collection(cls, query, legacy):
         )
 
 
-class DMLReturningColFilter:
-    """an adapter used for the DML RETURNING case.
+class _DMLReturningColFilter:
+    """a base for an adapter used for the DML RETURNING cases
 
     Has a subset of the interface used by
     :class:`.ORMAdapter` and is used for :class:`._QueryEntity`
@@ -689,6 +705,21 @@ def __call__(self, col, as_filter):
         else:
             return None
 
+    def adapt_check_present(self, col):
+        raise NotImplementedError()
+
+
+class _DMLBulkInsertReturningColFilter(_DMLReturningColFilter):
+    """an adapter used for the DML RETURNING case specifically
+    for ORM bulk insert (or any hypothetical DML that is splitting out a class
+    hierarchy among multiple DML statements....ORM bulk insert is the only
+    example right now)
+
+    its main job is to limit the columns in a RETURNING to only a specific
+    mapped table in a hierarchy.
+
+    """
+
     def adapt_check_present(self, col):
         mapper = self.mapper
         prop = mapper._columntoproperty.get(col, None)
@@ -697,6 +728,30 @@ def adapt_check_present(self, col):
         return mapper.local_table.c.corresponding_column(col)
 
 
+class _DMLUpdateDeleteReturningColFilter(_DMLReturningColFilter):
+    """an adapter used for the DML RETURNING case specifically
+    for ORM enabled UPDATE/DELETE
+
+    its main job is to limit the columns in a RETURNING to include
+    only direct persisted columns from the immediate selectable, not
+    expressions like column_property(), or to also allow columns from other
+    mappers for the UPDATE..FROM use case.
+
+    """
+
+    def adapt_check_present(self, col):
+        mapper = self.mapper
+        prop = mapper._columntoproperty.get(col, None)
+        if prop is not None:
+            # if the col is from the immediate mapper, only return a persisted
+            # column, not any kind of column_property expression
+            return mapper.persist_selectable.c.corresponding_column(col)
+
+        # if the col is from some other mapper, just return it, assume the
+        # user knows what they are doing
+        return col
+
+
 @sql.base.CompileState.plugin_for("orm", "orm_from_statement")
 class ORMFromStatementCompileState(ORMCompileState):
     _from_obj_alias = None
@@ -715,12 +770,16 @@ class ORMFromStatementCompileState(ORMCompileState):
     eager_joins = _EMPTY_DICT
 
     @classmethod
-    def create_for_statement(
+    def _create_orm_context(
         cls,
-        statement_container: Union[Select, FromStatement],
+        statement: Union[Select, FromStatement],
+        *,
+        toplevel: bool,
         compiler: Optional[SQLCompiler],
         **kw: Any,
     ) -> ORMFromStatementCompileState:
+        statement_container = statement
+
         assert isinstance(statement_container, FromStatement)
 
         if compiler is not None and compiler.stack:
@@ -851,14 +910,24 @@ def _get_current_adapter(self):
         return None
 
     def setup_dml_returning_compile_state(self, dml_mapper):
-        """used by BulkORMInsert (and Update / Delete?) to set up a handler
+        """used by BulkORMInsert, Update, Delete to set up a handler
         for RETURNING to return ORM objects and expressions
 
         """
         target_mapper = self.statement._propagate_attrs.get(
             "plugin_subject", None
         )
-        adapter = DMLReturningColFilter(target_mapper, dml_mapper)
+
+        if self.statement.is_insert:
+            adapter = _DMLBulkInsertReturningColFilter(
+                target_mapper, dml_mapper
+            )
+        elif self.statement.is_update or self.statement.is_delete:
+            adapter = _DMLUpdateDeleteReturningColFilter(
+                target_mapper, dml_mapper
+            )
+        else:
+            adapter = None
 
         if self.compile_options._is_star and (len(self._entities) != 1):
             raise sa_exc.CompileError(
@@ -1017,21 +1086,17 @@ class ORMSelectCompileState(ORMCompileState, SelectState):
     _having_criteria = ()
 
     @classmethod
-    def create_for_statement(
+    def _create_orm_context(
         cls,
         statement: Union[Select, FromStatement],
+        *,
+        toplevel: bool,
         compiler: Optional[SQLCompiler],
         **kw: Any,
     ) -> ORMSelectCompileState:
-        """compiler hook, we arrive here from compiler.visit_select() only."""
 
         self = cls.__new__(cls)
 
-        if compiler is not None:
-            toplevel = not compiler.stack
-        else:
-            toplevel = True
-
         select_statement = statement
 
         # if we are a select() that was never a legacy Query, we won't
@@ -1799,8 +1864,6 @@ def _join(self, args, entities_collection):
                         "selectable/table as join target"
                     )
 
-            of_type = None
-
             if isinstance(onclause, interfaces.PropComparator):
                 # descriptor/property given (or determined); this tells us
                 # explicitly what the expected "left" side of the join is.
@@ -2462,7 +2525,7 @@ def _column_descriptions(
 
 
 def _legacy_filter_by_entity_zero(
-    query_or_augmented_select: Union[Query[Any], Select[Any]]
+    query_or_augmented_select: Union[Query[Any], Select[Any]],
 ) -> Optional[_InternalEntityType[Any]]:
     self = query_or_augmented_select
     if self._setup_joins:
@@ -2477,7 +2540,7 @@ def _legacy_filter_by_entity_zero(
 
 
 def _entity_from_pre_ent_zero(
-    query_or_augmented_select: Union[Query[Any], Select[Any]]
+    query_or_augmented_select: Union[Query[Any], Select[Any]],
 ) -> Optional[_InternalEntityType[Any]]:
     self = query_or_augmented_select
     if not self._raw_columns:
@@ -2535,7 +2598,7 @@ def setup_compile_state(self, compile_state: ORMCompileState) -> None:
     def setup_dml_returning_compile_state(
         self,
         compile_state: ORMCompileState,
-        adapter: DMLReturningColFilter,
+        adapter: Optional[_DMLReturningColFilter],
     ) -> None:
         raise NotImplementedError()
 
@@ -2737,7 +2800,7 @@ def row_processor(self, context, result):
     def setup_dml_returning_compile_state(
         self,
         compile_state: ORMCompileState,
-        adapter: DMLReturningColFilter,
+        adapter: Optional[_DMLReturningColFilter],
     ) -> None:
         loading._setup_entity_query(
             compile_state,
@@ -2896,7 +2959,7 @@ def setup_compile_state(self, compile_state):
     def setup_dml_returning_compile_state(
         self,
         compile_state: ORMCompileState,
-        adapter: DMLReturningColFilter,
+        adapter: Optional[_DMLReturningColFilter],
     ) -> None:
         return self.setup_compile_state(compile_state)
 
@@ -3086,7 +3149,7 @@ def corresponds_to(self, entity):
     def setup_dml_returning_compile_state(
         self,
         compile_state: ORMCompileState,
-        adapter: DMLReturningColFilter,
+        adapter: Optional[_DMLReturningColFilter],
     ) -> None:
         return self.setup_compile_state(compile_state)
 
@@ -3203,10 +3266,13 @@ def corresponds_to(self, entity):
     def setup_dml_returning_compile_state(
         self,
         compile_state: ORMCompileState,
-        adapter: DMLReturningColFilter,
+        adapter: Optional[_DMLReturningColFilter],
     ) -> None:
-        self._fetch_column = self.column
-        column = adapter(self.column, False)
+
+        self._fetch_column = column = self.column
+        if adapter:
+            column = adapter(column, False)
+
         if column is not None:
             compile_state.dedupe_columns.add(column)
             compile_state.primary_columns.append(column)
diff --git a/libs/sqlalchemy/orm/decl_api.py b/libs/sqlalchemy/orm/decl_api.py
index c32851deab..9f455d6029 100644
--- a/libs/sqlalchemy/orm/decl_api.py
+++ b/libs/sqlalchemy/orm/decl_api.py
@@ -1,5 +1,5 @@
 # orm/decl_api.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -78,6 +78,7 @@
 from ..util.typing import is_generic
 from ..util.typing import is_literal
 from ..util.typing import is_newtype
+from ..util.typing import is_pep593
 from ..util.typing import is_pep695
 from ..util.typing import Literal
 from ..util.typing import LITERAL_TYPES
@@ -248,7 +249,7 @@ def __init__(
         cascading: bool = False,
         quiet: bool = False,
     ):
-        # suppport
+        # support
         # @declared_attr
         # @classmethod
         # def foo(cls) -> Mapped[thing]:
@@ -512,6 +513,9 @@ class MyModel(MyMixin, Base):
 
     .. versionadded:: 1.4.6
 
+    .. legacy:: This api is considered legacy and will be deprecated in the next
+      SQLAlchemy version.
+
     .. seealso::
 
         :ref:`orm_mixins_toplevel`
@@ -682,7 +686,7 @@ class Base(DeclarativeBase):
     :param metadata: optional :class:`_schema.MetaData` collection.
      If a :class:`_orm.registry` is constructed automatically, this
      :class:`_schema.MetaData` collection will be used to construct it.
-     Otherwise, the local :class:`_schema.MetaData` collection will supercede
+     Otherwise, the local :class:`_schema.MetaData` collection will supersede
      that used by an existing :class:`_orm.registry` passed using the
      :paramref:`_orm.DeclarativeBase.registry` parameter.
     :param type_annotation_map: optional type annotation map that will be
@@ -1233,7 +1237,7 @@ def update_type_annotation_map(
         )
 
     def _resolve_type(
-        self, python_type: _MatchedOnType, _do_fallbacks: bool = True
+        self, python_type: _MatchedOnType, _do_fallbacks: bool = False
     ) -> Optional[sqltypes.TypeEngine[Any]]:
         python_type_type: Type[Any]
         search: Iterable[Tuple[_MatchedOnType, Type[Any]]]
@@ -1244,7 +1248,7 @@ def _resolve_type(
 
                 search = (
                     (python_type, python_type_type),
-                    *((lt, python_type_type) for lt in LITERAL_TYPES),  # type: ignore[arg-type] # noqa: E501
+                    *((lt, python_type_type) for lt in LITERAL_TYPES),
                 )
             else:
                 python_type_type = python_type.__origin__
@@ -1285,12 +1289,14 @@ def _resolve_type(
             if is_pep695(python_type):
                 # NOTE: assume there aren't type alias types of new types.
                 python_type_to_check = python_type
-                while is_pep695(python_type_to_check):
+                while is_pep695(python_type_to_check) and not is_pep593(
+                    python_type_to_check
+                ):
                     python_type_to_check = python_type_to_check.__value__
                 python_type_to_check = de_optionalize_union_types(
                     python_type_to_check
                 )
-                kind = "TypeAliasType"
+                kind = "pep-695 type"
             if is_newtype(python_type):
                 python_type_to_check = flatten_newtype(python_type)
                 kind = "NewType"
@@ -1301,14 +1307,27 @@ def _resolve_type(
                 )
                 if res_after_fallback is not None:
                     assert kind is not None
-                    warn_deprecated(
-                        f"Matching the provided {kind} '{python_type}' on "
-                        "its resolved value without matching it in the "
-                        "type_annotation_map is deprecated; add this type to "
-                        "the type_annotation_map to allow it to match "
-                        "explicitly.",
-                        "2.0",
-                    )
+                    if kind == "pep-695 type":
+                        warn_deprecated(
+                            f"Matching to {kind} '{python_type}' in "
+                            "a recursive "
+                            "fashion without the recursed type being present "
+                            "in the type_annotation_map is deprecated; add "
+                            "this type or its recursed value to "
+                            "the type_annotation_map to allow it to match "
+                            "explicitly.",
+                            "2.0",
+                        )
+                    else:
+                        warn_deprecated(
+                            f"Matching the provided {kind} '{python_type}' on "
+                            "its resolved value without matching it in the "
+                            "type_annotation_map is deprecated; add this "
+                            "type to "
+                            "the type_annotation_map to allow it to match "
+                            "explicitly.",
+                            "2.0",
+                        )
                     return res_after_fallback
 
         return None
@@ -1643,6 +1662,8 @@ def mapped_as_dataclass(
             :ref:`orm_declarative_native_dataclasses` - complete background
             on SQLAlchemy native dataclass mapping
 
+            :func:`_orm.mapped_as_dataclass` - functional version that may
+            provide better compatibility with mypy
 
         .. versionadded:: 2.0
 
@@ -1906,6 +1927,72 @@ class MyMappedClass(Base): ...
     ).as_declarative_base(**kw)
 
 
+@compat_typing.dataclass_transform(
+    field_specifiers=(
+        MappedColumn,
+        RelationshipProperty,
+        Composite,
+        Synonym,
+        mapped_column,
+        relationship,
+        composite,
+        synonym,
+        deferred,
+    ),
+)
+def mapped_as_dataclass(
+    registry: RegistryType,
+    *,
+    init: Union[_NoArg, bool] = _NoArg.NO_ARG,
+    repr: Union[_NoArg, bool] = _NoArg.NO_ARG,  # noqa: A002
+    eq: Union[_NoArg, bool] = _NoArg.NO_ARG,
+    order: Union[_NoArg, bool] = _NoArg.NO_ARG,
+    unsafe_hash: Union[_NoArg, bool] = _NoArg.NO_ARG,
+    match_args: Union[_NoArg, bool] = _NoArg.NO_ARG,
+    kw_only: Union[_NoArg, bool] = _NoArg.NO_ARG,
+    dataclass_callable: Union[
+        _NoArg, Callable[..., Type[Any]]
+    ] = _NoArg.NO_ARG,
+) -> Callable[[Type[_O]], Type[_O]]:
+    """Standalone function form of :meth:`_orm.registry.mapped_as_dataclass`
+    which may have better compatibility with mypy.
+
+    The :class:`_orm.registry` is passed as the first argument to the
+    decorator.
+
+    e.g.::
+
+        from sqlalchemy.orm import Mapped
+        from sqlalchemy.orm import mapped_as_dataclass
+        from sqlalchemy.orm import mapped_column
+        from sqlalchemy.orm import registry
+
+        some_registry = registry()
+
+
+        @mapped_as_dataclass(some_registry)
+        class Relationships:
+            __tablename__ = "relationships"
+
+            entity_id1: Mapped[int] = mapped_column(primary_key=True)
+            entity_id2: Mapped[int] = mapped_column(primary_key=True)
+            level: Mapped[int] = mapped_column(Integer)
+
+    .. versionadded:: 2.0.44
+
+    """
+    return registry.mapped_as_dataclass(
+        init=init,
+        repr=repr,
+        eq=eq,
+        order=order,
+        unsafe_hash=unsafe_hash,
+        match_args=match_args,
+        kw_only=kw_only,
+        dataclass_callable=dataclass_callable,
+    )
+
+
 @inspection._inspects(
     DeclarativeMeta, DeclarativeBase, DeclarativeAttributeIntercept
 )
diff --git a/libs/sqlalchemy/orm/decl_base.py b/libs/sqlalchemy/orm/decl_base.py
index c480994d8f..d4f35414cf 100644
--- a/libs/sqlalchemy/orm/decl_base.py
+++ b/libs/sqlalchemy/orm/decl_base.py
@@ -1,5 +1,5 @@
 # orm/decl_base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -103,6 +103,7 @@ def __call__(self, **kw: Any) -> _O: ...
 
 class _DeclMappedClassProtocol(MappedClassProtocol[_O], Protocol):
     "Internal more detailed version of ``MappedClassProtocol``."
+
     metadata: MetaData
     __tablename__: str
     __mapper_args__: _MapperKwArgs
@@ -1217,15 +1218,15 @@ def _apply_dataclasses_to_any_class(
             # dataclasses callable, based on the fields present.  This
             # means remove the Mapped[] container and ensure all Field
             # entries have an annotation
-            restored = getattr(klass, "__annotations__", None)
+            restored = util.get_annotations(klass)
             klass.__annotations__ = cast("Dict[str, Any]", use_annotations)
         else:
             restored = None
 
         try:
-            dataclass_callable(
+            dataclass_callable(  # type: ignore[call-overload]
                 klass,
-                **{
+                **{  # type: ignore[call-overload,unused-ignore]
                     k: v
                     for k, v in dataclass_setup_arguments.items()
                     if v is not _NoArg.NO_ARG and k != "dataclass_callable"
@@ -1248,7 +1249,7 @@ def _apply_dataclasses_to_any_class(
                 if restored is None:
                     del klass.__annotations__
                 else:
-                    klass.__annotations__ = restored
+                    klass.__annotations__ = restored  # type: ignore[assignment]  # noqa: E501
 
     @classmethod
     def _assert_dc_arguments(cls, arguments: _DataclassArguments) -> None:
@@ -1296,8 +1297,6 @@ def _collect_annotation(
                     or isinstance(attr_value, _MappedAttribute)
                 )
             )
-        else:
-            is_dataclass_field = False
 
         is_dataclass_field = False
         extracted = _extract_mapped_subtype(
@@ -1577,7 +1576,7 @@ def _extract_mappable_attributes(self) -> None:
                                 is_dataclass,
                             )
                         except NameError as ne:
-                            raise exc.ArgumentError(
+                            raise orm_exc.MappedAnnotationError(
                                 f"Could not resolve all types within mapped "
                                 f'annotation: "{annotation}".  Ensure all '
                                 f"types are written correctly and are "
@@ -1601,9 +1600,15 @@ def _extract_mappable_attributes(self) -> None:
                                 "default_factory",
                                 "repr",
                                 "default",
+                                "dataclass_metadata",
                             ]
                         else:
-                            argnames = ["init", "default_factory", "repr"]
+                            argnames = [
+                                "init",
+                                "default_factory",
+                                "repr",
+                                "dataclass_metadata",
+                            ]
 
                         args = {
                             a
@@ -2018,8 +2023,7 @@ class _DeferredMapperConfig(_ClassScanMapperConfig):
     def _early_mapping(self, mapper_kw: _MapperKwArgs) -> None:
         pass
 
-    # mypy disallows plain property override of variable
-    @property  # type: ignore
+    @property
     def cls(self) -> Type[Any]:
         return self._cls()  # type: ignore
 
diff --git a/libs/sqlalchemy/orm/dependency.py b/libs/sqlalchemy/orm/dependency.py
index 5953062459..0019bcd68e 100644
--- a/libs/sqlalchemy/orm/dependency.py
+++ b/libs/sqlalchemy/orm/dependency.py
@@ -1,5 +1,5 @@
 # orm/dependency.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -7,9 +7,7 @@
 # mypy: ignore-errors
 
 
-"""Relationship dependencies.
-
-"""
+"""Relationship dependencies."""
 
 from __future__ import annotations
 
@@ -1054,7 +1052,7 @@ def presort_saves(self, uowcommit, states):
             # so that prop_has_changes() returns True
             for state in states:
                 if self._pks_changed(uowcommit, state):
-                    history = uowcommit.get_attribute_history(
+                    uowcommit.get_attribute_history(
                         state, self.key, attributes.PASSIVE_OFF
                     )
 
diff --git a/libs/sqlalchemy/orm/descriptor_props.py b/libs/sqlalchemy/orm/descriptor_props.py
index f01cc1788b..a493373e60 100644
--- a/libs/sqlalchemy/orm/descriptor_props.py
+++ b/libs/sqlalchemy/orm/descriptor_props.py
@@ -1,5 +1,5 @@
 # orm/descriptor_props.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -99,6 +99,11 @@ class DescriptorProperty(MapperProperty[_T]):
 
     descriptor: DescriptorReference[Any]
 
+    def _column_strategy_attrs(self) -> Sequence[QueryableAttribute[Any]]:
+        raise NotImplementedError(
+            "This MapperProperty does not implement column loader strategies"
+        )
+
     def get_history(
         self,
         state: InstanceState[Any],
@@ -388,7 +393,9 @@ def declarative_scan(
             self.composite_class = argument
 
         if is_dataclass(self.composite_class):
-            self._setup_for_dataclass(registry, cls, originating_module, key)
+            self._setup_for_dataclass(
+                decl_scan, registry, cls, originating_module, key
+            )
         else:
             for attr in self.attrs:
                 if (
@@ -432,6 +439,7 @@ def _init_accessor(self) -> None:
     @util.preload_module("sqlalchemy.orm.decl_base")
     def _setup_for_dataclass(
         self,
+        decl_scan: _ClassScanMapperConfig,
         registry: _RegistryType,
         cls: Type[Any],
         originating_module: Optional[str],
@@ -459,6 +467,7 @@ def _setup_for_dataclass(
 
             if isinstance(attr, MappedColumn):
                 attr.declarative_scan_for_composite(
+                    decl_scan,
                     registry,
                     cls,
                     originating_module,
@@ -500,6 +509,9 @@ def props(self) -> Sequence[MapperProperty[Any]]:
             props.append(prop)
         return props
 
+    def _column_strategy_attrs(self) -> Sequence[QueryableAttribute[Any]]:
+        return self._comparable_elements
+
     @util.non_memoized_property
     @util.preload_module("orm.properties")
     def columns(self) -> Sequence[Column[Any]]:
@@ -989,7 +1001,7 @@ def _proxied_object(
             if isinstance(attr, attributes.QueryableAttribute):
                 return attr.comparator
             elif isinstance(attr, SQLORMOperations):
-                # assocaition proxy comes here
+                # association proxy comes here
                 return attr
 
             raise sa_exc.InvalidRequestError(
@@ -999,6 +1011,9 @@ def _proxied_object(
             )
         return attr.property
 
+    def _column_strategy_attrs(self) -> Sequence[QueryableAttribute[Any]]:
+        return (getattr(self.parent.class_, self.name),)
+
     def _comparator_factory(self, mapper: Mapper[Any]) -> SQLORMOperations[_T]:
         prop = self._proxied_object
 
diff --git a/libs/sqlalchemy/orm/dynamic.py b/libs/sqlalchemy/orm/dynamic.py
index 3c81c396f6..e8a97d6cc9 100644
--- a/libs/sqlalchemy/orm/dynamic.py
+++ b/libs/sqlalchemy/orm/dynamic.py
@@ -1,5 +1,5 @@
 # orm/dynamic.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/evaluator.py b/libs/sqlalchemy/orm/evaluator.py
index 57aae5a3c4..392d726e99 100644
--- a/libs/sqlalchemy/orm/evaluator.py
+++ b/libs/sqlalchemy/orm/evaluator.py
@@ -1,5 +1,5 @@
 # orm/evaluator.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/events.py b/libs/sqlalchemy/orm/events.py
index f161760e6d..2affb00028 100644
--- a/libs/sqlalchemy/orm/events.py
+++ b/libs/sqlalchemy/orm/events.py
@@ -1,13 +1,11 @@
 # orm/events.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""ORM event interfaces.
-
-"""
+"""ORM event interfaces."""
 from __future__ import annotations
 
 from typing import Any
@@ -737,7 +735,8 @@ class _InstanceEventsHold(_EventsHold[_ET]):
     def resolve(self, class_: Type[_O]) -> Optional[ClassManager[_O]]:
         return instrumentation.opt_manager_of_class(class_)
 
-    class HoldInstanceEvents(_EventsHold.HoldEvents[_ET], InstanceEvents):  # type: ignore [misc] # noqa: E501
+    # this fails on pyright if you use Any.  Fails on mypy if you use _ET
+    class HoldInstanceEvents(_EventsHold.HoldEvents[_ET], InstanceEvents):  # type: ignore[valid-type,misc] # noqa: E501
         pass
 
     dispatch = event.dispatcher(HoldInstanceEvents)
@@ -976,44 +975,42 @@ def after_mapper_constructed(
 
         """
 
+    @event._omit_standard_example
     def before_mapper_configured(
         self, mapper: Mapper[_O], class_: Type[_O]
     ) -> None:
         """Called right before a specific mapper is to be configured.
 
-        This event is intended to allow a specific mapper to be skipped during
-        the configure step, by returning the :attr:`.orm.interfaces.EXT_SKIP`
-        symbol which indicates to the :func:`.configure_mappers` call that this
-        particular mapper (or hierarchy of mappers, if ``propagate=True`` is
-        used) should be skipped in the current configuration run. When one or
-        more mappers are skipped, the "new mappers" flag will remain set,
-        meaning the :func:`.configure_mappers` function will continue to be
-        called when mappers are used, to continue to try to configure all
-        available mappers.
-
-        In comparison to the other configure-level events,
-        :meth:`.MapperEvents.before_configured`,
-        :meth:`.MapperEvents.after_configured`, and
-        :meth:`.MapperEvents.mapper_configured`, the
-        :meth:`.MapperEvents.before_mapper_configured` event provides for a
-        meaningful return value when it is registered with the ``retval=True``
-        parameter.
-
-        .. versionadded:: 1.3
-
-        e.g.::
-
+        The :meth:`.MapperEvents.before_mapper_configured` event is invoked
+        for each mapper that is encountered when the
+        :func:`_orm.configure_mappers` function proceeds through the current
+        list of not-yet-configured mappers.   It is similar to the
+        :meth:`.MapperEvents.mapper_configured` event, except that it's invoked
+        right before the configuration occurs, rather than afterwards.
+
+        The :meth:`.MapperEvents.before_mapper_configured` event includes
+        the special capability where it can force the configure step for a
+        specific mapper to be skipped; to use this feature, establish
+        the event using the ``retval=True`` parameter and return
+        the :attr:`.orm.interfaces.EXT_SKIP` symbol to indicate the mapper
+        should be left unconfigured::
+
+            from sqlalchemy import event
             from sqlalchemy.orm import EXT_SKIP
+            from sqlalchemy.orm import DeclarativeBase
 
-            Base = declarative_base()
 
-            DontConfigureBase = declarative_base()
+            class DontConfigureBase(DeclarativeBase):
+                pass
 
 
             @event.listens_for(
                 DontConfigureBase,
                 "before_mapper_configured",
+                # support return values for the event
                 retval=True,
+                # propagate the listener to all subclasses of
+                # DontConfigureBase
                 propagate=True,
             )
             def dont_configure(mapper, cls):
@@ -1058,15 +1055,14 @@ def mapper_configured(self, mapper: Mapper[_O], class_: Type[_O]) -> None:
         event; this event invokes only after all known mappings have been
         fully configured.
 
-        The :meth:`.MapperEvents.mapper_configured` event, unlike
+        The :meth:`.MapperEvents.mapper_configured` event, unlike the
         :meth:`.MapperEvents.before_configured` or
-        :meth:`.MapperEvents.after_configured`,
-        is called for each mapper/class individually, and the mapper is
-        passed to the event itself.  It also is called exactly once for
-        a particular mapper.  The event is therefore useful for
-        configurational steps that benefit from being invoked just once
-        on a specific mapper basis, which don't require that "backref"
-        configurations are necessarily ready yet.
+        :meth:`.MapperEvents.after_configured` events, is called for each
+        mapper/class individually, and the mapper is passed to the event
+        itself.  It also is called exactly once for a particular mapper.  The
+        event is therefore useful for configurational steps that benefit from
+        being invoked just once on a specific mapper basis, which don't require
+        that "backref" configurations are necessarily ready yet.
 
         :param mapper: the :class:`_orm.Mapper` which is the target
          of this event.
@@ -1083,6 +1079,7 @@ def mapper_configured(self, mapper: Mapper[_O], class_: Type[_O]) -> None:
         """
         # TODO: need coverage for this event
 
+    @event._omit_standard_example
     def before_configured(self) -> None:
         """Called before a series of mappers have been configured.
 
@@ -1094,9 +1091,15 @@ def before_configured(self) -> None:
         new mappers have been made available and new mapper use is
         detected.
 
+        Similar events to this one include
+        :meth:`.MapperEvents.after_configured`, which is invoked after a series
+        of mappers has been configured, as well as
+        :meth:`.MapperEvents.before_mapper_configured` and
+        :meth:`.MapperEvents.mapper_configured`, which are both invoked on a
+        per-mapper basis.
+
         This event can **only** be applied to the :class:`_orm.Mapper` class,
-        and not to individual mappings or mapped classes. It is only invoked
-        for all mappings as a whole::
+        and not to individual mappings or mapped classes::
 
             from sqlalchemy.orm import Mapper
 
@@ -1104,25 +1107,11 @@ def before_configured(self) -> None:
             @event.listens_for(Mapper, "before_configured")
             def go(): ...
 
-        Contrast this event to :meth:`.MapperEvents.after_configured`,
-        which is invoked after the series of mappers has been configured,
-        as well as :meth:`.MapperEvents.before_mapper_configured`
-        and :meth:`.MapperEvents.mapper_configured`, which are both invoked
-        on a per-mapper basis.
-
-        Theoretically this event is called once per
-        application, but is actually called any time new mappers
-        are to be affected by a :func:`_orm.configure_mappers`
-        call.   If new mappings are constructed after existing ones have
-        already been used, this event will likely be called again.  To ensure
-        that a particular event is only called once and no further, the
-        ``once=True`` argument (new in 0.9.4) can be applied::
-
-            from sqlalchemy.orm import mapper
-
-
-            @event.listens_for(mapper, "before_configured", once=True)
-            def go(): ...
+        Typically, this event is called once per application, but in practice
+        may be called more than once, any time new mappers are to be affected
+        by a :func:`_orm.configure_mappers` call.   If new mappings are
+        constructed after existing ones have already been used, this event will
+        likely be called again.
 
         .. seealso::
 
@@ -1134,6 +1123,7 @@ def go(): ...
 
         """
 
+    @event._omit_standard_example
     def after_configured(self) -> None:
         """Called after a series of mappers have been configured.
 
@@ -1145,17 +1135,15 @@ def after_configured(self) -> None:
         new mappers have been made available and new mapper use is
         detected.
 
-        Contrast this event to the :meth:`.MapperEvents.mapper_configured`
-        event, which is called on a per-mapper basis while the configuration
-        operation proceeds; unlike that event, when this event is invoked,
-        all cross-configurations (e.g. backrefs) will also have been made
-        available for any mappers that were pending.
-        Also contrast to :meth:`.MapperEvents.before_configured`,
-        which is invoked before the series of mappers has been configured.
+        Similar events to this one include
+        :meth:`.MapperEvents.before_configured`, which is invoked before a
+        series of mappers are configured, as well as
+        :meth:`.MapperEvents.before_mapper_configured` and
+        :meth:`.MapperEvents.mapper_configured`, which are both invoked on a
+        per-mapper basis.
 
         This event can **only** be applied to the :class:`_orm.Mapper` class,
-        and not to individual mappings or
-        mapped classes.  It is only invoked for all mappings as a whole::
+        and not to individual mappings or mapped classes::
 
             from sqlalchemy.orm import Mapper
 
@@ -1163,19 +1151,11 @@ def after_configured(self) -> None:
             @event.listens_for(Mapper, "after_configured")
             def go(): ...
 
-        Theoretically this event is called once per
-        application, but is actually called any time new mappers
-        have been affected by a :func:`_orm.configure_mappers`
-        call.   If new mappings are constructed after existing ones have
-        already been used, this event will likely be called again.  To ensure
-        that a particular event is only called once and no further, the
-        ``once=True`` argument (new in 0.9.4) can be applied::
-
-            from sqlalchemy.orm import mapper
-
-
-            @event.listens_for(mapper, "after_configured", once=True)
-            def go(): ...
+        Typically, this event is called once per application, but in practice
+        may be called more than once, any time new mappers are to be affected
+        by a :func:`_orm.configure_mappers` call.   If new mappings are
+        constructed after existing ones have already been used, this event will
+        likely be called again.
 
         .. seealso::
 
@@ -1545,7 +1525,8 @@ def resolve(
     ) -> Optional[Mapper[_T]]:
         return _mapper_or_none(class_)
 
-    class HoldMapperEvents(_EventsHold.HoldEvents[_ET], MapperEvents):  # type: ignore [misc] # noqa: E501
+    # this fails on pyright if you use Any.  Fails on mypy if you use _ET
+    class HoldMapperEvents(_EventsHold.HoldEvents[_ET], MapperEvents):  # type: ignore[valid-type,misc] # noqa: E501
         pass
 
     dispatch = event.dispatcher(HoldMapperEvents)
@@ -1602,7 +1583,7 @@ def my_before_commit(session):
     _dispatch_target = Session
 
     def _lifecycle_event(  # type: ignore [misc]
-        fn: Callable[[SessionEvents, Session, Any], None]
+        fn: Callable[[SessionEvents, Session, Any], None],
     ) -> Callable[[SessionEvents, Session, Any], None]:
         _sessionevents_lifecycle_event_names.add(fn.__name__)
         return fn
diff --git a/libs/sqlalchemy/orm/exc.py b/libs/sqlalchemy/orm/exc.py
index 0494edf983..fec401b740 100644
--- a/libs/sqlalchemy/orm/exc.py
+++ b/libs/sqlalchemy/orm/exc.py
@@ -1,5 +1,5 @@
 # orm/exc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -65,6 +65,15 @@ class FlushError(sa_exc.SQLAlchemyError):
     """A invalid condition was detected during flush()."""
 
 
+class MappedAnnotationError(sa_exc.ArgumentError):
+    """Raised when ORM annotated declarative cannot interpret the
+    expression present inside of the :class:`.Mapped` construct.
+
+    .. versionadded:: 2.0.40
+
+    """
+
+
 class UnmappedError(sa_exc.InvalidRequestError):
     """Base for exceptions that involve expected mappings not present."""
 
diff --git a/libs/sqlalchemy/orm/identity.py b/libs/sqlalchemy/orm/identity.py
index 1808b2d5e5..61a5f4c1bd 100644
--- a/libs/sqlalchemy/orm/identity.py
+++ b/libs/sqlalchemy/orm/identity.py
@@ -1,5 +1,5 @@
 # orm/identity.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/instrumentation.py b/libs/sqlalchemy/orm/instrumentation.py
index f87023f180..7091d369b6 100644
--- a/libs/sqlalchemy/orm/instrumentation.py
+++ b/libs/sqlalchemy/orm/instrumentation.py
@@ -1,5 +1,5 @@
 # orm/instrumentation.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/interfaces.py b/libs/sqlalchemy/orm/interfaces.py
index b4462e5459..84806a0f3f 100644
--- a/libs/sqlalchemy/orm/interfaces.py
+++ b/libs/sqlalchemy/orm/interfaces.py
@@ -1,5 +1,5 @@
 # orm/interfaces.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -29,6 +29,7 @@
 from typing import Generic
 from typing import Iterator
 from typing import List
+from typing import Mapping
 from typing import NamedTuple
 from typing import NoReturn
 from typing import Optional
@@ -174,7 +175,7 @@ def declarative_scan(
         extracted_mapped_annotation: Optional[_AnnotationScanType],
         is_dataclass_field: bool,
     ) -> None:
-        """Perform class-specific initializaton at early declarative scanning
+        """Perform class-specific initialization at early declarative scanning
         time.
 
         .. versionadded:: 2.0
@@ -207,6 +208,7 @@ class _AttributeOptions(NamedTuple):
     dataclasses_compare: Union[_NoArg, bool]
     dataclasses_kw_only: Union[_NoArg, bool]
     dataclasses_hash: Union[_NoArg, bool, None]
+    dataclasses_dataclass_metadata: Union[_NoArg, Mapping[Any, Any], None]
 
     def _as_dataclass_field(self, key: str) -> Any:
         """Return a ``dataclasses.Field`` object given these arguments."""
@@ -226,6 +228,8 @@ def _as_dataclass_field(self, key: str) -> Any:
             kw["kw_only"] = self.dataclasses_kw_only
         if self.dataclasses_hash is not _NoArg.NO_ARG:
             kw["hash"] = self.dataclasses_hash
+        if self.dataclasses_dataclass_metadata is not _NoArg.NO_ARG:
+            kw["metadata"] = self.dataclasses_dataclass_metadata
 
         if "default" in kw and callable(kw["default"]):
             # callable defaults are ambiguous. deprecate them in favour of
@@ -263,7 +267,7 @@ def _get_arguments_for_make_dataclass(
         key: str,
         annotation: _AnnotationScanType,
         mapped_container: Optional[Any],
-        elem: _T,
+        elem: Any,
     ) -> Union[
         Tuple[str, _AnnotationScanType],
         Tuple[str, _AnnotationScanType, dataclasses.Field[Any]],
@@ -306,6 +310,7 @@ def _get_arguments_for_make_dataclass(
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
+    _NoArg.NO_ARG,
 )
 
 _DEFAULT_READONLY_ATTRIBUTE_OPTIONS = _AttributeOptions(
@@ -316,6 +321,7 @@ def _get_arguments_for_make_dataclass(
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
     _NoArg.NO_ARG,
+    _NoArg.NO_ARG,
 )
 
 
diff --git a/libs/sqlalchemy/orm/loading.py b/libs/sqlalchemy/orm/loading.py
index 679286f546..fb7efa76e0 100644
--- a/libs/sqlalchemy/orm/loading.py
+++ b/libs/sqlalchemy/orm/loading.py
@@ -1,5 +1,5 @@
 # orm/loading.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -39,6 +39,7 @@
 from .context import FromStatement
 from .context import ORMCompileState
 from .context import QueryContext
+from .strategies import SelectInLoader
 from .util import _none_set
 from .util import state_str
 from .. import exc as sa_exc
@@ -1309,15 +1310,18 @@ def do_load(context, path, states, load_only, effective_entity):
         if context.populate_existing:
             q2 = q2.execution_options(populate_existing=True)
 
-        context.session.execute(
-            q2,
-            dict(
-                primary_keys=[
-                    state.key[1][0] if zero_idx else state.key[1]
-                    for state, load_attrs in states
-                ]
-            ),
-        ).unique().scalars().all()
+        while states:
+            chunk = states[0 : SelectInLoader._chunksize]
+            states = states[SelectInLoader._chunksize :]
+            context.session.execute(
+                q2,
+                dict(
+                    primary_keys=[
+                        state.key[1][0] if zero_idx else state.key[1]
+                        for state, load_attrs in chunk
+                    ]
+                ),
+            ).unique().scalars().all()
 
     return do_load
 
diff --git a/libs/sqlalchemy/orm/mapped_collection.py b/libs/sqlalchemy/orm/mapped_collection.py
index ca085c4037..2b4a2d9c75 100644
--- a/libs/sqlalchemy/orm/mapped_collection.py
+++ b/libs/sqlalchemy/orm/mapped_collection.py
@@ -1,5 +1,5 @@
 # orm/mapped_collection.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -443,8 +443,8 @@ def _raise_for_unpopulated(
                 f"parameter on the mapped collection factory."
             )
 
-    @collection.appender  # type: ignore[misc]
-    @collection.internally_instrumented  # type: ignore[misc]
+    @collection.appender  # type: ignore[untyped-decorator]
+    @collection.internally_instrumented  # type: ignore[untyped-decorator]
     def set(
         self,
         value: _KT,
@@ -472,8 +472,8 @@ def set(
 
         self.__setitem__(key, value, _sa_initiator)  # type: ignore[call-arg]
 
-    @collection.remover  # type: ignore[misc]
-    @collection.internally_instrumented  # type: ignore[misc]
+    @collection.remover  # type: ignore[untyped-decorator]
+    @collection.internally_instrumented  # type: ignore[untyped-decorator]
     def remove(
         self,
         value: _KT,
diff --git a/libs/sqlalchemy/orm/mapper.py b/libs/sqlalchemy/orm/mapper.py
index 11010efbcd..8ee0ac4fff 100644
--- a/libs/sqlalchemy/orm/mapper.py
+++ b/libs/sqlalchemy/orm/mapper.py
@@ -1,5 +1,5 @@
 # orm/mapper.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1056,7 +1056,7 @@ def entity(self):
 
     """
 
-    primary_key: Tuple[Column[Any], ...]
+    primary_key: Tuple[ColumnElement[Any], ...]
     """An iterable containing the collection of :class:`_schema.Column`
     objects
     which comprise the 'primary key' of the mapped table, from the
@@ -2100,13 +2100,21 @@ def _configure_property(
             "_configure_property(%s, %s)", key, prop_arg.__class__.__name__
         )
 
+        # early setup mode - don't assign any props, only
+        # ensure a Column is turned into a ColumnProperty.
+        # see #12858
+        early_setup = not hasattr(self, "_props")
+
         if not isinstance(prop_arg, MapperProperty):
             prop: MapperProperty[Any] = self._property_from_column(
-                key, prop_arg
+                key, prop_arg, early_setup
             )
         else:
             prop = prop_arg
 
+        if early_setup:
+            return prop
+
         if isinstance(prop, properties.ColumnProperty):
             col = self.persist_selectable.corresponding_column(prop.columns[0])
 
@@ -2355,16 +2363,17 @@ def _reconcile_prop_with_incoming_columns(
 
     @util.preload_module("sqlalchemy.orm.descriptor_props")
     def _property_from_column(
-        self,
-        key: str,
-        column: KeyedColumnElement[Any],
+        self, key: str, column: KeyedColumnElement[Any], early_setup: bool
     ) -> ColumnProperty[Any]:
         """generate/update a :class:`.ColumnProperty` given a
         :class:`_schema.Column` or other SQL expression object."""
 
         descriptor_props = util.preloaded.orm_descriptor_props
 
-        prop = self._props.get(key)
+        if early_setup:
+            prop = None
+        else:
+            prop = self._props.get(key)
 
         if isinstance(prop, properties.ColumnProperty):
             return self._reconcile_prop_with_incoming_columns(
@@ -2554,7 +2563,7 @@ def _mappers_from_spec(
         if spec == "*":
             mappers = list(self.self_and_descendants)
         elif spec:
-            mapper_set = set()
+            mapper_set: Set[Mapper[Any]] = set()
             for m in util.to_list(spec):
                 m = _class_to_mapper(m)
                 if not m.isa(self):
@@ -3428,9 +3437,11 @@ def primary_base_mapper(self) -> Mapper[Any]:
         return self.class_manager.mapper.base_mapper
 
     def _result_has_identity_key(self, result, adapter=None):
-        pk_cols: Sequence[ColumnClause[Any]] = self.primary_key
-        if adapter:
-            pk_cols = [adapter.columns[c] for c in pk_cols]
+        pk_cols: Sequence[ColumnElement[Any]]
+        if adapter is not None:
+            pk_cols = [adapter.columns[c] for c in self.primary_key]
+        else:
+            pk_cols = self.primary_key
         rk = result.keys()
         for col in pk_cols:
             if col not in rk:
@@ -3440,7 +3451,7 @@ def _result_has_identity_key(self, result, adapter=None):
 
     def identity_key_from_row(
         self,
-        row: Optional[Union[Row[Any], RowMapping]],
+        row: Union[Row[Any], RowMapping],
         identity_token: Optional[Any] = None,
         adapter: Optional[ORMAdapter] = None,
     ) -> _IdentityKeyType[_O]:
@@ -3455,18 +3466,21 @@ def identity_key_from_row(
             for the "row" argument
 
         """
-        pk_cols: Sequence[ColumnClause[Any]] = self.primary_key
-        if adapter:
-            pk_cols = [adapter.columns[c] for c in pk_cols]
+        pk_cols: Sequence[ColumnElement[Any]]
+        if adapter is not None:
+            pk_cols = [adapter.columns[c] for c in self.primary_key]
+        else:
+            pk_cols = self.primary_key
 
+        mapping: RowMapping
         if hasattr(row, "_mapping"):
-            mapping = row._mapping  # type: ignore
+            mapping = row._mapping
         else:
-            mapping = cast("Mapping[Any, Any]", row)
+            mapping = row  # type: ignore[assignment]
 
         return (
             self._identity_class,
-            tuple(mapping[column] for column in pk_cols),  # type: ignore
+            tuple(mapping[column] for column in pk_cols),
             identity_token,
         )
 
@@ -4303,7 +4317,7 @@ def _dispose_registries(registries: Set[_RegistryType], cascade: bool) -> None:
         reg._new_mappers = False
 
 
-def reconstructor(fn):
+def reconstructor(fn: _Fn) -> _Fn:
     """Decorate a method as the 'reconstructor' hook.
 
     Designates a single method as the "reconstructor", an ``__init__``-like
@@ -4329,7 +4343,7 @@ def reconstructor(fn):
         :meth:`.InstanceEvents.load`
 
     """
-    fn.__sa_reconstructor__ = True
+    fn.__sa_reconstructor__ = True  # type: ignore[attr-defined]
     return fn
 
 
@@ -4363,7 +4377,7 @@ def validates(
      :func:`.validates` usage where only one validator should emit per
      attribute operation.
 
-     .. versionchanged:: 2.0.16 This paramter inadvertently defaulted to
+     .. versionchanged:: 2.0.16 This parameter inadvertently defaulted to
         ``False`` for releases 2.0.0 through 2.0.15.  Its correct default
         of ``True`` is restored in 2.0.16.
 
diff --git a/libs/sqlalchemy/orm/path_registry.py b/libs/sqlalchemy/orm/path_registry.py
index a15f7f61b4..97065d5850 100644
--- a/libs/sqlalchemy/orm/path_registry.py
+++ b/libs/sqlalchemy/orm/path_registry.py
@@ -1,12 +1,10 @@
 # orm/path_registry.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
-"""Path tracking utilities, representing mapper graph traversals.
-
-"""
+"""Path tracking utilities, representing mapper graph traversals."""
 
 from __future__ import annotations
 
@@ -566,7 +564,7 @@ def __init__(
             # entities are used.
             #
             # here we are trying to distinguish between a path that starts
-            # on a the with_polymorhpic entity vs. one that starts on a
+            # on a with_polymorphic entity vs. one that starts on a
             # normal entity that introduces a with_polymorphic() in the
             # middle using of_type():
             #
diff --git a/libs/sqlalchemy/orm/persistence.py b/libs/sqlalchemy/orm/persistence.py
index cbe8557add..0b7a218ca8 100644
--- a/libs/sqlalchemy/orm/persistence.py
+++ b/libs/sqlalchemy/orm/persistence.py
@@ -1,5 +1,5 @@
 # orm/persistence.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1374,7 +1374,13 @@ def update_stmt():
             )
 
             rows += c.rowcount
-            for state, state_dict, mapper_rec, connection, params in records:
+            for i, (
+                state,
+                state_dict,
+                mapper_rec,
+                connection,
+                params,
+            ) in enumerate(records):
                 _postfetch_post_update(
                     mapper_rec,
                     uowtransaction,
@@ -1382,7 +1388,7 @@ def update_stmt():
                     state,
                     state_dict,
                     c,
-                    c.context.compiled_parameters[0],
+                    c.context.compiled_parameters[i],
                 )
 
         if check_rowcount:
diff --git a/libs/sqlalchemy/orm/properties.py b/libs/sqlalchemy/orm/properties.py
index a41c520cdb..65d3fcc3f1 100644
--- a/libs/sqlalchemy/orm/properties.py
+++ b/libs/sqlalchemy/orm/properties.py
@@ -1,5 +1,5 @@
 # orm/properties.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -28,6 +28,7 @@
 from typing import Union
 
 from . import attributes
+from . import exc as orm_exc
 from . import strategy_options
 from .base import _DeclarativeMapped
 from .base import class_mapper
@@ -56,6 +57,7 @@
 from ..util.typing import de_optionalize_union_types
 from ..util.typing import get_args
 from ..util.typing import includes_none
+from ..util.typing import is_a_type
 from ..util.typing import is_fwd_ref
 from ..util.typing import is_pep593
 from ..util.typing import is_pep695
@@ -232,7 +234,7 @@ def _memoized_attr__renders_in_subqueries(self) -> bool:
             return self.strategy._have_default_expression  # type: ignore
 
         return ("deferred", True) not in self.strategy_key or (
-            self not in self.parent._readonly_props  # type: ignore
+            self not in self.parent._readonly_props
         )
 
     @util.preload_module("sqlalchemy.orm.state", "sqlalchemy.orm.strategies")
@@ -661,20 +663,12 @@ def found_in_pep593_annotated(self) -> Any:
         # Column will be merged into it in _init_column_for_annotation().
         return MappedColumn()
 
-    def declarative_scan(
+    def _adjust_for_existing_column(
         self,
         decl_scan: _ClassScanMapperConfig,
-        registry: _RegistryType,
-        cls: Type[Any],
-        originating_module: Optional[str],
         key: str,
-        mapped_container: Optional[Type[Mapped[Any]]],
-        annotation: Optional[_AnnotationScanType],
-        extracted_mapped_annotation: Optional[_AnnotationScanType],
-        is_dataclass_field: bool,
-    ) -> None:
-        column = self.column
-
+        given_column: Column[_T],
+    ) -> Column[_T]:
         if (
             self._use_existing_column
             and decl_scan.inherits
@@ -686,10 +680,31 @@ def declarative_scan(
                 )
             supercls_mapper = class_mapper(decl_scan.inherits, False)
 
-            colname = column.name if column.name is not None else key
-            column = self.column = supercls_mapper.local_table.c.get(  # type: ignore[assignment] # noqa: E501
-                colname, column
+            colname = (
+                given_column.name if given_column.name is not None else key
             )
+            given_column = supercls_mapper.local_table.c.get(  # type: ignore[assignment] # noqa: E501
+                colname, given_column
+            )
+        return given_column
+
+    def declarative_scan(
+        self,
+        decl_scan: _ClassScanMapperConfig,
+        registry: _RegistryType,
+        cls: Type[Any],
+        originating_module: Optional[str],
+        key: str,
+        mapped_container: Optional[Type[Mapped[Any]]],
+        annotation: Optional[_AnnotationScanType],
+        extracted_mapped_annotation: Optional[_AnnotationScanType],
+        is_dataclass_field: bool,
+    ) -> None:
+        column = self.column
+
+        column = self.column = self._adjust_for_existing_column(
+            decl_scan, key, self.column
+        )
 
         if column.key is None:
             column.key = key
@@ -706,6 +721,8 @@ def declarative_scan(
 
         self._init_column_for_annotation(
             cls,
+            decl_scan,
+            key,
             registry,
             extracted_mapped_annotation,
             originating_module,
@@ -714,6 +731,7 @@ def declarative_scan(
     @util.preload_module("sqlalchemy.orm.decl_base")
     def declarative_scan_for_composite(
         self,
+        decl_scan: _ClassScanMapperConfig,
         registry: _RegistryType,
         cls: Type[Any],
         originating_module: Optional[str],
@@ -724,12 +742,14 @@ def declarative_scan_for_composite(
         decl_base = util.preloaded.orm_decl_base
         decl_base._undefer_column_name(param_name, self.column)
         self._init_column_for_annotation(
-            cls, registry, param_annotation, originating_module
+            cls, decl_scan, key, registry, param_annotation, originating_module
         )
 
     def _init_column_for_annotation(
         self,
         cls: Type[Any],
+        decl_scan: _ClassScanMapperConfig,
+        key: str,
         registry: _RegistryType,
         argument: _AnnotationScanType,
         originating_module: Optional[str],
@@ -749,11 +769,19 @@ def _init_column_for_annotation(
         if not self._has_nullable:
             self.column.nullable = nullable
 
-        our_type = de_optionalize_union_types(argument)
-
         find_mapped_in: Tuple[Any, ...] = ()
         our_type_is_pep593 = False
         raw_pep_593_type = None
+        raw_pep_695_type = None
+
+        our_type: Any = de_optionalize_union_types(argument)
+
+        if is_pep695(our_type):
+            raw_pep_695_type = our_type
+            our_type = de_optionalize_union_types(raw_pep_695_type.__value__)
+            our_args = get_args(raw_pep_695_type)
+            if our_args:
+                our_type = our_type[our_args]
 
         if is_pep593(our_type):
             our_type_is_pep593 = True
@@ -763,9 +791,6 @@ def _init_column_for_annotation(
             if nullable:
                 raw_pep_593_type = de_optionalize_union_types(raw_pep_593_type)
             find_mapped_in = pep_593_components[1:]
-        elif is_pep695(argument) and is_pep593(argument.__value__):
-            # do not support nested annotation inside unions ets
-            find_mapped_in = get_args(argument.__value__)[1:]
 
         use_args_from: Optional[MappedColumn[Any]]
         for elem in find_mapped_in:
@@ -776,6 +801,11 @@ def _init_column_for_annotation(
             use_args_from = None
 
         if use_args_from is not None:
+
+            self.column = use_args_from._adjust_for_existing_column(
+                decl_scan, key, self.column
+            )
+
             if (
                 not self._has_insert_default
                 and use_args_from.column.default is not None
@@ -845,16 +875,19 @@ def _init_column_for_annotation(
                         )
 
         if sqltype._isnull and not self.column.foreign_keys:
-            new_sqltype = None
-
             checks: List[Any]
             if our_type_is_pep593:
                 checks = [our_type, raw_pep_593_type]
             else:
                 checks = [our_type]
 
+            if raw_pep_695_type is not None:
+                checks.insert(0, raw_pep_695_type)
+
             for check_type in checks:
-                new_sqltype = registry._resolve_type(check_type)
+                new_sqltype = registry._resolve_type(
+                    check_type, _do_fallbacks=check_type is our_type
+                )
                 if new_sqltype is not None:
                     break
             else:
@@ -862,16 +895,41 @@ def _init_column_for_annotation(
                     isinstance(our_type, type)
                     and issubclass(our_type, TypeEngine)
                 ):
-                    raise sa_exc.ArgumentError(
+                    raise orm_exc.MappedAnnotationError(
                         f"The type provided inside the {self.column.key!r} "
                         "attribute Mapped annotation is the SQLAlchemy type "
                         f"{our_type}. Expected a Python type instead"
                     )
+                elif is_a_type(checks[0]):
+                    if len(checks) == 1:
+                        detail = (
+                            "the type object is not resolvable by the registry"
+                        )
+                    elif len(checks) == 2:
+                        detail = (
+                            f"neither '{checks[0]}' nor '{checks[1]}' "
+                            "are resolvable by the registry"
+                        )
+                    else:
+                        detail = (
+                            f"""none of {
+                                ", ".join(f"'{t}'" for t in checks)
+                            } """
+                            "are resolvable by the registry"
+                        )
+                    raise orm_exc.MappedAnnotationError(
+                        "Could not locate SQLAlchemy Core type when resolving "
+                        f"for Python type indicated by '{checks[0]}' inside "
+                        "the "
+                        f"Mapped[] annotation for the {self.column.key!r} "
+                        f"attribute; {detail}"
+                    )
                 else:
-                    raise sa_exc.ArgumentError(
-                        "Could not locate SQLAlchemy Core type for Python "
-                        f"type {our_type} inside the {self.column.key!r} "
-                        "attribute Mapped annotation"
+                    raise orm_exc.MappedAnnotationError(
+                        f"The object provided inside the {self.column.key!r} "
+                        "attribute Mapped annotation is not a Python type, "
+                        f"it's the object {argument!r}. Expected a Python "
+                        "type."
                     )
 
             self.column._set_type(new_sqltype)
diff --git a/libs/sqlalchemy/orm/query.py b/libs/sqlalchemy/orm/query.py
index c7e1ca8ad7..5552b11688 100644
--- a/libs/sqlalchemy/orm/query.py
+++ b/libs/sqlalchemy/orm/query.py
@@ -1,5 +1,5 @@
 # orm/query.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -134,6 +134,7 @@
     from ..sql._typing import _TypedColumnClauseArgument as _TCCA
     from ..sql.base import CacheableOptions
     from ..sql.base import ExecutableOption
+    from ..sql.dml import UpdateBase
     from ..sql.elements import ColumnElement
     from ..sql.elements import Label
     from ..sql.selectable import _ForUpdateOfArgument
@@ -492,7 +493,7 @@ def _get_select_statement_only(self) -> Select[_T]:
         return cast("Select[_T]", self.statement)
 
     @property
-    def statement(self) -> Union[Select[_T], FromStatement[_T]]:
+    def statement(self) -> Union[Select[_T], FromStatement[_T], UpdateBase]:
         """The full SELECT statement represented by this Query.
 
         The statement by default will not have disambiguating labels
@@ -520,6 +521,8 @@ def statement(self) -> Union[Select[_T], FromStatement[_T]]:
         # from there, it starts to look much like Query itself won't be
         # passed into the execute process and won't generate its own cache
         # key; this will all occur in terms of the ORM-enabled Select.
+        stmt: Union[Select[_T], FromStatement[_T], UpdateBase]
+
         if not self._compile_options._set_base_alias:
             # if we don't have legacy top level aliasing features in use
             # then convert to a future select() directly
@@ -789,7 +792,7 @@ def scalar_subquery(self) -> ScalarSelect[Any]:
         )
 
     @property
-    def selectable(self) -> Union[Select[_T], FromStatement[_T]]:
+    def selectable(self) -> Union[Select[_T], FromStatement[_T], UpdateBase]:
         """Return the :class:`_expression.Select` object emitted by this
         :class:`_query.Query`.
 
@@ -800,7 +803,9 @@ def selectable(self) -> Union[Select[_T], FromStatement[_T]]:
         """
         return self.__clause_element__()
 
-    def __clause_element__(self) -> Union[Select[_T], FromStatement[_T]]:
+    def __clause_element__(
+        self,
+    ) -> Union[Select[_T], FromStatement[_T], UpdateBase]:
         return (
             self._with_compile_options(
                 _enable_eagerloads=False, _render_for_subquery=True
@@ -1037,7 +1042,7 @@ def yield_per(self, count: int) -> Self:
         ":meth:`_orm.Query.get`",
         alternative="The method is now available as :meth:`_orm.Session.get`",
     )
-    def get(self, ident: _PKIdentityArgument) -> Optional[Any]:
+    def get(self, ident: _PKIdentityArgument) -> Optional[_T]:
         """Return an instance based on the given primary key identifier,
         or ``None`` if not found.
 
@@ -2782,11 +2787,10 @@ def one_or_none(self) -> Optional[_T]:
     def one(self) -> _T:
         """Return exactly one result or raise an exception.
 
-        Raises ``sqlalchemy.orm.exc.NoResultFound`` if the query selects
-        no rows.  Raises ``sqlalchemy.orm.exc.MultipleResultsFound``
-        if multiple object identities are returned, or if multiple
-        rows are returned for a query that returns only scalar values
-        as opposed to full identity-mapped entities.
+        Raises :class:`_exc.NoResultFound` if the query selects no rows.
+        Raises :class:`_exc.MultipleResultsFound` if multiple object identities
+        are returned, or if multiple rows are returned for a query that returns
+        only scalar values as opposed to full identity-mapped entities.
 
         Calling :meth:`.one` results in an execution of the underlying query.
 
@@ -2806,7 +2810,7 @@ def one(self) -> _T:
     def scalar(self) -> Any:
         """Return the first element of the first result or None
         if no rows present.  If multiple rows are returned,
-        raises MultipleResultsFound.
+        raises :class:`_exc.MultipleResultsFound`.
 
           >>> session.query(Item).scalar()
           <Item>
@@ -2840,7 +2844,7 @@ def __iter__(self) -> Iterator[_T]:
         try:
             yield from result  # type: ignore
         except GeneratorExit:
-            # issue #8710 - direct iteration is not re-usable after
+            # issue #8710 - direct iteration is not reusable after
             # an iterable block is broken, so close the result
             result._soft_close()
             raise
@@ -3201,11 +3205,14 @@ def delete(
             delete_ = delete_.with_dialect_options(**delete_args)
 
         delete_._where_criteria = self._where_criteria
-        result: CursorResult[Any] = self.session.execute(
-            delete_,
-            self._params,
-            execution_options=self._execution_options.union(
-                {"synchronize_session": synchronize_session}
+        result = cast(
+            "CursorResult[Any]",
+            self.session.execute(
+                delete_,
+                self._params,
+                execution_options=self._execution_options.union(
+                    {"synchronize_session": synchronize_session}
+                ),
             ),
         )
         bulk_del.result = result  # type: ignore
@@ -3292,11 +3299,14 @@ def update(
             upd = upd.with_dialect_options(**update_args)
 
         upd._where_criteria = self._where_criteria
-        result: CursorResult[Any] = self.session.execute(
-            upd,
-            self._params,
-            execution_options=self._execution_options.union(
-                {"synchronize_session": synchronize_session}
+        result = cast(
+            "CursorResult[Any]",
+            self.session.execute(
+                upd,
+                self._params,
+                execution_options=self._execution_options.union(
+                    {"synchronize_session": synchronize_session}
+                ),
             ),
         )
         bulk_ud.result = result  # type: ignore
@@ -3335,7 +3345,9 @@ def _compile_state(
             ORMCompileState._get_plugin_class_for_plugin(stmt, "orm"),
         )
 
-        return compile_state_cls.create_for_statement(stmt, None)
+        return compile_state_cls._create_orm_context(
+            stmt, toplevel=True, compiler=None
+        )
 
     def _compile_context(self, for_statement: bool = False) -> QueryContext:
         compile_state = self._compile_state(for_statement=for_statement)
diff --git a/libs/sqlalchemy/orm/relationships.py b/libs/sqlalchemy/orm/relationships.py
index 0d0bc70894..b185ef6041 100644
--- a/libs/sqlalchemy/orm/relationships.py
+++ b/libs/sqlalchemy/orm/relationships.py
@@ -1,5 +1,5 @@
 # orm/relationships.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -486,8 +486,7 @@ def __init__(
         else:
             self._overlaps = ()
 
-        # mypy ignoring the @property setter
-        self.cascade = cascade  # type: ignore
+        self.cascade = cascade
 
         self.back_populates = back_populates
 
@@ -1758,8 +1757,6 @@ def declarative_scan(
         extracted_mapped_annotation: Optional[_AnnotationScanType],
         is_dataclass_field: bool,
     ) -> None:
-        argument = extracted_mapped_annotation
-
         if extracted_mapped_annotation is None:
             if self.argument is None:
                 self._raise_for_required(key, cls)
@@ -2912,9 +2909,6 @@ def _check_foreign_cols(
     ) -> None:
         """Check the foreign key columns collected and emit error
         messages."""
-
-        can_sync = False
-
         foreign_cols = self._gather_columns_with_annotation(
             join_condition, "foreign"
         )
diff --git a/libs/sqlalchemy/orm/scoping.py b/libs/sqlalchemy/orm/scoping.py
index a0e9f17e4f..b8ae381a44 100644
--- a/libs/sqlalchemy/orm/scoping.py
+++ b/libs/sqlalchemy/orm/scoping.py
@@ -1,5 +1,5 @@
 # orm/scoping.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -49,7 +49,6 @@
     from .session import sessionmaker
     from .session import SessionTransaction
     from ..engine import Connection
-    from ..engine import CursorResult
     from ..engine import Engine
     from ..engine import Result
     from ..engine import Row
@@ -69,7 +68,6 @@
     from ..sql._typing import _T7
     from ..sql._typing import _TypedColumnClauseArgument as _TCCA
     from ..sql.base import Executable
-    from ..sql.dml import UpdateBase
     from ..sql.elements import ClauseElement
     from ..sql.roles import TypedColumnsClauseRole
     from ..sql.selectable import ForUpdateParameter
@@ -550,7 +548,7 @@ def reset(self) -> None:
             :meth:`_orm.Session.close` and :meth:`_orm.Session.reset`.
 
             :meth:`_orm.Session.close` - a similar method will additionally
-            prevent re-use of the Session when the parameter
+            prevent reuse of the Session when the parameter
             :paramref:`_orm.Session.close_resets_only` is set to ``False``.
 
         """  # noqa: E501
@@ -685,18 +683,6 @@ def execute(
         _add_event: Optional[Any] = None,
     ) -> Result[_T]: ...
 
-    @overload
-    def execute(
-        self,
-        statement: UpdateBase,
-        params: Optional[_CoreAnyExecuteParams] = None,
-        *,
-        execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT,
-        bind_arguments: Optional[_BindArguments] = None,
-        _parent_execute_state: Optional[Any] = None,
-        _add_event: Optional[Any] = None,
-    ) -> CursorResult[Any]: ...
-
     @overload
     def execute(
         self,
@@ -1086,8 +1072,7 @@ def get_one(
             Proxied for the :class:`_orm.Session` class on
             behalf of the :class:`_orm.scoping.scoped_session` class.
 
-        Raises ``sqlalchemy.orm.exc.NoResultFound`` if the query
-        selects no rows.
+        Raises :class:`_exc.NoResultFound` if the query selects no rows.
 
         For a detailed documentation of the arguments see the
         method :meth:`.Session.get`.
diff --git a/libs/sqlalchemy/orm/session.py b/libs/sqlalchemy/orm/session.py
index 6cd7cd6339..61bf180eca 100644
--- a/libs/sqlalchemy/orm/session.py
+++ b/libs/sqlalchemy/orm/session.py
@@ -1,5 +1,5 @@
 # orm/session.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -102,7 +102,6 @@
     from .mapper import Mapper
     from .path_registry import PathRegistry
     from .query import RowReturningQuery
-    from ..engine import CursorResult
     from ..engine import Result
     from ..engine import Row
     from ..engine import RowMapping
@@ -127,7 +126,6 @@
     from ..sql._typing import _TypedColumnClauseArgument as _TCCA
     from ..sql.base import Executable
     from ..sql.base import ExecutableOption
-    from ..sql.dml import UpdateBase
     from ..sql.elements import ClauseElement
     from ..sql.roles import TypedColumnsClauseRole
     from ..sql.selectable import ForUpdateParameter
@@ -836,7 +834,7 @@ class SessionTransactionOrigin(Enum):
     """transaction were started by calling :meth:`_orm.Session.begin`"""
 
     BEGIN_NESTED = 2
-    """tranaction were started by :meth:`_orm.Session.begin_nested`"""
+    """transaction were started by :meth:`_orm.Session.begin_nested`"""
 
     SUBTRANSACTION = 3
     """transaction is an internal "subtransaction" """
@@ -1728,7 +1726,7 @@ def __init__(
 
         :param close_resets_only: Defaults to ``True``. Determines if
           the session should reset itself after calling ``.close()``
-          or should pass in a no longer usable state, disabling re-use.
+          or should pass in a no longer usable state, disabling reuse.
 
           .. versionadded:: 2.0.22 added flag ``close_resets_only``.
             A future SQLAlchemy version may change the default value of
@@ -2278,18 +2276,6 @@ def execute(
         _add_event: Optional[Any] = None,
     ) -> Result[_T]: ...
 
-    @overload
-    def execute(
-        self,
-        statement: UpdateBase,
-        params: Optional[_CoreAnyExecuteParams] = None,
-        *,
-        execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT,
-        bind_arguments: Optional[_BindArguments] = None,
-        _parent_execute_state: Optional[Any] = None,
-        _add_event: Optional[Any] = None,
-    ) -> CursorResult[Any]: ...
-
     @overload
     def execute(
         self,
@@ -2540,7 +2526,7 @@ def reset(self) -> None:
             :meth:`_orm.Session.close` and :meth:`_orm.Session.reset`.
 
             :meth:`_orm.Session.close` - a similar method will additionally
-            prevent re-use of the Session when the parameter
+            prevent reuse of the Session when the parameter
             :paramref:`_orm.Session.close_resets_only` is set to ``False``.
         """
         self._close_impl(invalidate=False, is_reset=True)
@@ -3045,7 +3031,7 @@ def no_autoflush(self) -> Iterator[Session]:
         "This warning originated from the Session 'autoflush' process, "
         "which was invoked automatically in response to a user-initiated "
         "operation. Consider using ``no_autoflush`` context manager if this "
-        "warning happended while initializing objects.",
+        "warning happened while initializing objects.",
         sa_exc.SAWarning,
     )
     def _autoflush(self) -> None:
@@ -3718,8 +3704,7 @@ def get_one(
         """Return exactly one instance based on the given primary key
         identifier, or raise an exception if not found.
 
-        Raises ``sqlalchemy.orm.exc.NoResultFound`` if the query
-        selects no rows.
+        Raises :class:`_exc.NoResultFound` if the query selects no rows.
 
         For a detailed documentation of the arguments see the
         method :meth:`.Session.get`.
@@ -4015,14 +4000,7 @@ def _merge(
         else:
             key_is_persistent = True
 
-        if key in self.identity_map:
-            try:
-                merged = self.identity_map[key]
-            except KeyError:
-                # object was GC'ed right as we checked for it
-                merged = None
-        else:
-            merged = None
+        merged = self.identity_map.get(key)
 
         if merged is None:
             if key_is_persistent and key in _resolve_conflict_map:
diff --git a/libs/sqlalchemy/orm/state.py b/libs/sqlalchemy/orm/state.py
index d4bbf92099..2f6f58e9fa 100644
--- a/libs/sqlalchemy/orm/state.py
+++ b/libs/sqlalchemy/orm/state.py
@@ -1,5 +1,5 @@
 # orm/state.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -511,6 +511,31 @@ def _dispose(self) -> None:
         # used by the test suite, apparently
         self._detach()
 
+    def _force_dereference(self) -> None:
+        """Force this InstanceState to act as though its weakref has
+        been GC'ed.
+
+        this is used for test code that has to test reactions to objects
+        being GC'ed.  We can't reliably force GCs to happen under all
+        CI circumstances.
+
+        """
+
+        # if _strong_obj is set, then our object would not be getting
+        # GC'ed (at least within the scope of what we use this for in tests).
+        # so make sure this is not set
+        assert self._strong_obj is None
+
+        obj = self.obj()
+        if obj is None:
+            # object was GC'ed and we're done!  woop
+            return
+
+        del obj
+
+        self._cleanup(self.obj)
+        self.obj = lambda: None  # type: ignore
+
     def _cleanup(self, ref: weakref.ref[_O]) -> None:
         """Weakref callback cleanup.
 
diff --git a/libs/sqlalchemy/orm/state_changes.py b/libs/sqlalchemy/orm/state_changes.py
index 10e417e85d..f12041f6db 100644
--- a/libs/sqlalchemy/orm/state_changes.py
+++ b/libs/sqlalchemy/orm/state_changes.py
@@ -1,13 +1,11 @@
 # orm/state_changes.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""State tracking utilities used by :class:`_orm.Session`.
-
-"""
+"""State tracking utilities used by :class:`_orm.Session`."""
 
 from __future__ import annotations
 
@@ -82,7 +80,7 @@ def declare_states(
          indicate state should not change at the end of the method.
 
         """
-        assert prerequisite_states, "no prequisite states sent"
+        assert prerequisite_states, "no prerequisite states sent"
         has_prerequisite_states = (
             prerequisite_states is not _StateChangeStates.ANY
         )
@@ -127,7 +125,7 @@ def _go(fn: _F, self: Any, *arg: Any, **kw: Any) -> Any:
                     )
                 else:
                     raise sa_exc.IllegalStateChangeError(
-                        f"Cant run operation '{fn.__name__}()' here; "
+                        f"Can't run operation '{fn.__name__}()' here; "
                         f"will move to state {moves_to!r} where we are "
                         f"expecting {next_state!r}",
                         code="isce",
diff --git a/libs/sqlalchemy/orm/strategies.py b/libs/sqlalchemy/orm/strategies.py
index f2d165145a..966abfd6a1 100644
--- a/libs/sqlalchemy/orm/strategies.py
+++ b/libs/sqlalchemy/orm/strategies.py
@@ -1,5 +1,5 @@
 # orm/strategies.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -8,7 +8,7 @@
 
 
 """sqlalchemy.orm.interfaces.LoaderStrategy
-   implementations, and related MapperOptions."""
+implementations, and related MapperOptions."""
 
 from __future__ import annotations
 
@@ -1435,7 +1435,6 @@ def _load_for_path(
             alternate_effective_path = path._truncate_recursive()
             extra_options = (new_opt,)
         else:
-            new_opt = None
             alternate_effective_path = path
             extra_options = ()
 
@@ -1736,7 +1735,7 @@ def _setup_options(
         loadopt,
     ):
         # note that because the subqueryload object
-        # does not re-use the cached query, instead always making
+        # does not reuse the cached query, instead always making
         # use of the current invoked query, while we have two queries
         # here (orig and context.query), they are both non-cached
         # queries and we can transfer the options as is without
@@ -2165,8 +2164,6 @@ def setup_query(
 
         path = path[self.parent_property]
 
-        with_polymorphic = None
-
         user_defined_adapter = (
             self._init_user_defined_eager_proc(
                 loadopt, compile_state, compile_state.attributes
diff --git a/libs/sqlalchemy/orm/strategy_options.py b/libs/sqlalchemy/orm/strategy_options.py
index f4f292ee7e..bd94e3251b 100644
--- a/libs/sqlalchemy/orm/strategy_options.py
+++ b/libs/sqlalchemy/orm/strategy_options.py
@@ -1,14 +1,12 @@
 # orm/strategy_options.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: allow-untyped-defs, allow-untyped-calls
 
-"""
-
-"""
+""" """
 
 from __future__ import annotations
 
@@ -224,7 +222,7 @@ def load_only(self, *attrs: _AttrType, raiseload: bool = False) -> Self:
 
         """
         cloned = self._set_column_strategy(
-            attrs,
+            _expand_column_strategy_attrs(attrs),
             {"deferred": False, "instrument": True},
         )
 
@@ -638,7 +636,9 @@ def defer(self, key: _AttrType, raiseload: bool = False) -> Self:
         strategy = {"deferred": True, "instrument": True}
         if raiseload:
             strategy["raiseload"] = True
-        return self._set_column_strategy((key,), strategy)
+        return self._set_column_strategy(
+            _expand_column_strategy_attrs((key,)), strategy
+        )
 
     def undefer(self, key: _AttrType) -> Self:
         r"""Indicate that the given column-oriented attribute should be
@@ -677,7 +677,8 @@ def undefer(self, key: _AttrType) -> Self:
 
         """  # noqa: E501
         return self._set_column_strategy(
-            (key,), {"deferred": False, "instrument": True}
+            _expand_column_strategy_attrs((key,)),
+            {"deferred": False, "instrument": True},
         )
 
     def undefer_group(self, name: str) -> Self:
@@ -1103,7 +1104,6 @@ def _reconcile_query_entities_with_us(self, mapper_entities, raiseerr):
         """
         path = self.path
 
-        ezero = None
         for ent in mapper_entities:
             ezero = ent.entity_zero
             if ezero and orm_util._entity_corresponds_to(
@@ -1252,7 +1252,7 @@ def _clone_for_bind_strategy(
             )
 
         elif path_is_property(self.path):
-            # re-use the lookup which will raise a nicely formatted
+            # reuse the lookup which will raise a nicely formatted
             # LoaderStrategyException
             if strategy:
                 self.path.prop._strategy_lookup(self.path.prop, strategy[0])
@@ -2395,6 +2395,23 @@ def loader_unbound_fn(fn: _FN) -> _FN:
     return fn
 
 
+def _expand_column_strategy_attrs(
+    attrs: Tuple[_AttrType, ...],
+) -> Tuple[_AttrType, ...]:
+    return cast(
+        "Tuple[_AttrType, ...]",
+        tuple(
+            a
+            for attr in attrs
+            for a in (
+                cast("QueryableAttribute[Any]", attr)._column_strategy_attrs()
+                if hasattr(attr, "_column_strategy_attrs")
+                else (attr,)
+            )
+        ),
+    )
+
+
 # standalone functions follow.  docstrings are filled in
 # by the ``@loader_unbound_fn`` decorator.
 
@@ -2408,6 +2425,7 @@ def contains_eager(*keys: _AttrType, **kw: Any) -> _AbstractLoad:
 def load_only(*attrs: _AttrType, raiseload: bool = False) -> _AbstractLoad:
     # TODO: attrs against different classes.  we likely have to
     # add some extra state to Load of some kind
+    attrs = _expand_column_strategy_attrs(attrs)
     _, lead_element, _ = _parse_attr_argument(attrs[0])
     return Load(lead_element).load_only(*attrs, raiseload=raiseload)
 
diff --git a/libs/sqlalchemy/orm/sync.py b/libs/sqlalchemy/orm/sync.py
index 8f85a41a2c..b894e27bc1 100644
--- a/libs/sqlalchemy/orm/sync.py
+++ b/libs/sqlalchemy/orm/sync.py
@@ -1,5 +1,5 @@
 # orm/sync.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/unitofwork.py b/libs/sqlalchemy/orm/unitofwork.py
index 80897f2926..c65b37e54c 100644
--- a/libs/sqlalchemy/orm/unitofwork.py
+++ b/libs/sqlalchemy/orm/unitofwork.py
@@ -1,5 +1,5 @@
 # orm/unitofwork.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/orm/util.py b/libs/sqlalchemy/orm/util.py
index 48282b2d56..090a274129 100644
--- a/libs/sqlalchemy/orm/util.py
+++ b/libs/sqlalchemy/orm/util.py
@@ -1,5 +1,5 @@
 # orm/util.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -35,6 +35,7 @@
 
 from . import attributes  # noqa
 from . import exc
+from . import exc as orm_exc
 from ._typing import _O
 from ._typing import insp_is_aliased_class
 from ._typing import insp_is_mapper
@@ -1565,7 +1566,7 @@ class Bundle(
 
     _propagate_attrs: _PropagateAttrsType = util.immutabledict()
 
-    proxy_set = util.EMPTY_SET  # type: ignore
+    proxy_set = util.EMPTY_SET
 
     exprs: List[_ColumnsClauseElement]
 
@@ -2306,7 +2307,7 @@ def _extract_mapped_subtype(
 
     if raw_annotation is None:
         if required:
-            raise sa_exc.ArgumentError(
+            raise orm_exc.MappedAnnotationError(
                 f"Python typing annotation is required for attribute "
                 f'"{cls.__name__}.{key}" when primary argument(s) for '
                 f'"{attr_cls.__name__}" construct are None or not present'
@@ -2326,14 +2327,14 @@ def _extract_mapped_subtype(
             str_cleanup_fn=_cleanup_mapped_str_annotation,
         )
     except _CleanupError as ce:
-        raise sa_exc.ArgumentError(
+        raise orm_exc.MappedAnnotationError(
             f"Could not interpret annotation {raw_annotation}.  "
             "Check that it uses names that are correctly imported at the "
             "module level. See chained stack trace for more hints."
         ) from ce
     except NameError as ne:
         if raiseerr and "Mapped[" in raw_annotation:  # type: ignore
-            raise sa_exc.ArgumentError(
+            raise orm_exc.MappedAnnotationError(
                 f"Could not interpret annotation {raw_annotation}.  "
                 "Check that it uses names that are correctly imported at the "
                 "module level. See chained stack trace for more hints."
@@ -2362,7 +2363,7 @@ def _extract_mapped_subtype(
                 ):
                     return None
 
-                raise sa_exc.ArgumentError(
+                raise orm_exc.MappedAnnotationError(
                     f'Type annotation for "{cls.__name__}.{key}" '
                     "can't be correctly interpreted for "
                     "Annotated Declarative Table form.  ORM annotations "
@@ -2383,7 +2384,7 @@ def _extract_mapped_subtype(
                 return annotated, None
 
         if len(annotated.__args__) != 1:
-            raise sa_exc.ArgumentError(
+            raise orm_exc.MappedAnnotationError(
                 "Expected sub-type for Mapped[] annotation"
             )
 
diff --git a/libs/sqlalchemy/orm/writeonly.py b/libs/sqlalchemy/orm/writeonly.py
index ac034a09e0..e090c07c10 100644
--- a/libs/sqlalchemy/orm/writeonly.py
+++ b/libs/sqlalchemy/orm/writeonly.py
@@ -1,5 +1,5 @@
 # orm/writeonly.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -236,15 +236,11 @@ def get_collection(
         return DynamicCollectionAdapter(data)  # type: ignore[return-value]
 
     @util.memoized_property
-    def _append_token(  # type:ignore[override]
-        self,
-    ) -> attributes.AttributeEventToken:
+    def _append_token(self) -> attributes.AttributeEventToken:
         return attributes.AttributeEventToken(self, attributes.OP_APPEND)
 
     @util.memoized_property
-    def _remove_token(  # type:ignore[override]
-        self,
-    ) -> attributes.AttributeEventToken:
+    def _remove_token(self) -> attributes.AttributeEventToken:
         return attributes.AttributeEventToken(self, attributes.OP_REMOVE)
 
     def fire_append_event(
@@ -415,7 +411,7 @@ def append(
         initiator: Optional[AttributeEventToken],
         passive: PassiveFlag = PassiveFlag.PASSIVE_NO_FETCH,
     ) -> None:
-        if initiator is not self:
+        if initiator is not self:  # type: ignore[comparison-overlap]
             self.fire_append_event(state, dict_, value, initiator)
 
     def remove(
@@ -426,7 +422,7 @@ def remove(
         initiator: Optional[AttributeEventToken],
         passive: PassiveFlag = PassiveFlag.PASSIVE_NO_FETCH,
     ) -> None:
-        if initiator is not self:
+        if initiator is not self:  # type: ignore[comparison-overlap]
             self.fire_remove_event(state, dict_, value, initiator)
 
     def pop(
diff --git a/libs/sqlalchemy/pool/__init__.py b/libs/sqlalchemy/pool/__init__.py
index 51bf0ec799..3a043e884d 100644
--- a/libs/sqlalchemy/pool/__init__.py
+++ b/libs/sqlalchemy/pool/__init__.py
@@ -1,5 +1,5 @@
 # pool/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/pool/base.py b/libs/sqlalchemy/pool/base.py
index 34d0225439..d2090af6db 100644
--- a/libs/sqlalchemy/pool/base.py
+++ b/libs/sqlalchemy/pool/base.py
@@ -1,14 +1,12 @@
 # pool/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
 
-"""Base constructs for connection pools.
-
-"""
+"""Base constructs for connection pools."""
 
 from __future__ import annotations
 
@@ -36,6 +34,7 @@
 from .. import util
 from ..util.typing import Literal
 from ..util.typing import Protocol
+from ..util.typing import Self
 
 if TYPE_CHECKING:
     from ..engine.interfaces import DBAPIConnection
@@ -468,6 +467,7 @@ def _do_return_conn(self, record: ConnectionPoolEntry) -> None:
         raise NotImplementedError()
 
     def status(self) -> str:
+        """Returns a brief description of the state of this pool."""
         raise NotImplementedError()
 
 
@@ -600,7 +600,7 @@ class ConnectionPoolEntry(ManagesConnection):
     connection on behalf of a :class:`_pool.Pool` instance.
 
     The :class:`.ConnectionPoolEntry` object represents the long term
-    maintainance of a particular connection for a pool, including expiring or
+    maintenance of a particular connection for a pool, including expiring or
     invalidating that connection to have it replaced with a new one, which will
     continue to be maintained by that same :class:`.ConnectionPoolEntry`
     instance. Compared to :class:`.PoolProxiedConnection`, which is the
@@ -1074,10 +1074,12 @@ class PoolProxiedConnection(ManagesConnection):
 
         def commit(self) -> None: ...
 
-        def cursor(self) -> DBAPICursor: ...
+        def cursor(self, *args: Any, **kwargs: Any) -> DBAPICursor: ...
 
         def rollback(self) -> None: ...
 
+        def __getattr__(self, key: str) -> Any: ...
+
     @property
     def is_valid(self) -> bool:
         """Return True if this :class:`.PoolProxiedConnection` still refers
@@ -1123,6 +1125,13 @@ def close(self) -> None:
         """
         raise NotImplementedError()
 
+    def __enter__(self) -> Self:
+        return self
+
+    def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
+        self.close()
+        return None
+
 
 class _AdhocProxiedConnection(PoolProxiedConnection):
     """provides the :class:`.PoolProxiedConnection` interface for cases where
diff --git a/libs/sqlalchemy/pool/events.py b/libs/sqlalchemy/pool/events.py
index 4ceb260f79..2fd0243162 100644
--- a/libs/sqlalchemy/pool/events.py
+++ b/libs/sqlalchemy/pool/events.py
@@ -1,5 +1,5 @@
 # pool/events.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -31,27 +31,30 @@ class PoolEvents(event.Events[Pool]):
     as the names of members that are passed to listener
     functions.
 
-    e.g.::
+    When using an :class:`.Engine` object created via :func:`_sa.create_engine`
+    (or indirectly via :func:`.create_async_engine`), :class:`.PoolEvents`
+    listeners are expected to be registered in terms of the :class:`.Engine`,
+    which will direct the listeners to the :class:`.Pool` contained within::
 
+        from sqlalchemy import create_engine
         from sqlalchemy import event
 
+        engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test")
+
 
+        @event.listens_for(engine, "checkout")
         def my_on_checkout(dbapi_conn, connection_rec, connection_proxy):
             "handle an on checkout event"
 
+    :class:`.PoolEvents` may also be registered with the :class:`_pool.Pool`
+    class, with the :class:`.Engine` class, as well as with instances of
+    :class:`_pool.Pool`.
 
-        event.listen(Pool, "checkout", my_on_checkout)
-
-    In addition to accepting the :class:`_pool.Pool` class and
-    :class:`_pool.Pool` instances, :class:`_events.PoolEvents` also accepts
-    :class:`_engine.Engine` objects and the :class:`_engine.Engine` class as
-    targets, which will be resolved to the ``.pool`` attribute of the
-    given engine or the :class:`_pool.Pool` class::
-
-        engine = create_engine("postgresql+psycopg2://scott:tiger@localhost/test")
+    .. tip::
 
-        # will associate with engine.pool
-        event.listen(engine, "checkout", my_on_checkout)
+        Registering :class:`.PoolEvents` with the :class:`.Engine`, if present,
+        is recommended since the :meth:`.Engine.dispose` method will carry
+        along event listeners from the old pool to the new pool.
 
     """  # noqa: E501
 
diff --git a/libs/sqlalchemy/pool/impl.py b/libs/sqlalchemy/pool/impl.py
index f2b951d8e8..f3a5c2dd84 100644
--- a/libs/sqlalchemy/pool/impl.py
+++ b/libs/sqlalchemy/pool/impl.py
@@ -1,14 +1,12 @@
 # pool/impl.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
 
-"""Pool implementation classes.
-
-"""
+"""Pool implementation classes."""
 from __future__ import annotations
 
 import threading
@@ -62,7 +60,7 @@ class QueuePool(Pool):
 
     """
 
-    _is_asyncio = False  # type: ignore[assignment]
+    _is_asyncio = False
 
     _queue_class: Type[sqla_queue.QueueCommon[ConnectionPoolEntry]] = (
         sqla_queue.Queue
@@ -271,7 +269,7 @@ class AsyncAdaptedQueuePool(QueuePool):
 
     """
 
-    _is_asyncio = True  # type: ignore[assignment]
+    _is_asyncio = True
     _queue_class: Type[sqla_queue.QueueCommon[ConnectionPoolEntry]] = (
         sqla_queue.AsyncAdaptedQueue
     )
@@ -280,7 +278,7 @@ class AsyncAdaptedQueuePool(QueuePool):
 
 
 class FallbackAsyncAdaptedQueuePool(AsyncAdaptedQueuePool):
-    _queue_class = sqla_queue.FallbackAsyncAdaptedQueue
+    _queue_class = sqla_queue.FallbackAsyncAdaptedQueue  # type: ignore[assignment] # noqa: E501
 
 
 class NullPool(Pool):
@@ -358,7 +356,7 @@ class SingletonThreadPool(Pool):
 
     """
 
-    _is_asyncio = False  # type: ignore[assignment]
+    _is_asyncio = False
 
     def __init__(
         self,
@@ -386,6 +384,15 @@ def recreate(self) -> SingletonThreadPool:
             dialect=self._dialect,
         )
 
+    def _transfer_from(
+        self, other_singleton_pool: SingletonThreadPool
+    ) -> None:
+        # used by the test suite to make a new engine / pool without
+        # losing the state of an existing SQLite :memory: connection
+        assert not hasattr(other_singleton_pool._fairy, "current")
+        self._conn = other_singleton_pool._conn
+        self._all_conns = other_singleton_pool._all_conns
+
     def dispose(self) -> None:
         """Dispose of this pool."""
 
diff --git a/libs/sqlalchemy/schema.py b/libs/sqlalchemy/schema.py
index 32adc9bb21..3e4e15e8e9 100644
--- a/libs/sqlalchemy/schema.py
+++ b/libs/sqlalchemy/schema.py
@@ -1,13 +1,11 @@
 # schema.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Compatibility namespace for sqlalchemy.sql.schema and related.
-
-"""
+"""Compatibility namespace for sqlalchemy.sql.schema and related."""
 
 from __future__ import annotations
 
@@ -65,6 +63,7 @@
 from .sql.schema import PrimaryKeyConstraint as PrimaryKeyConstraint
 from .sql.schema import SchemaConst as SchemaConst
 from .sql.schema import SchemaItem as SchemaItem
+from .sql.schema import SchemaVisitable as SchemaVisitable
 from .sql.schema import Sequence as Sequence
 from .sql.schema import Table as Table
 from .sql.schema import UniqueConstraint as UniqueConstraint
diff --git a/libs/sqlalchemy/sql/__init__.py b/libs/sqlalchemy/sql/__init__.py
index 188f709d7e..152263617e 100644
--- a/libs/sqlalchemy/sql/__init__.py
+++ b/libs/sqlalchemy/sql/__init__.py
@@ -1,5 +1,5 @@
 # sql/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/_dml_constructors.py b/libs/sqlalchemy/sql/_dml_constructors.py
index 0a6f60115f..374055cfc2 100644
--- a/libs/sqlalchemy/sql/_dml_constructors.py
+++ b/libs/sqlalchemy/sql/_dml_constructors.py
@@ -1,5 +1,5 @@
 # sql/_dml_constructors.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/_elements_constructors.py b/libs/sqlalchemy/sql/_elements_constructors.py
index b628fcc9b5..6f3f8127ea 100644
--- a/libs/sqlalchemy/sql/_elements_constructors.py
+++ b/libs/sqlalchemy/sql/_elements_constructors.py
@@ -1,5 +1,5 @@
 # sql/_elements_constructors.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -1508,6 +1508,7 @@ def over(
     order_by: Optional[_ByArgument] = None,
     range_: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
     rows: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
+    groups: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
 ) -> Over[_T]:
     r"""Produce an :class:`.Over` object against a function.
 
@@ -1525,8 +1526,9 @@ def over(
 
         ROW_NUMBER() OVER(ORDER BY some_column)
 
-    Ranges are also possible using the :paramref:`.expression.over.range_`
-    and :paramref:`.expression.over.rows` parameters.  These
+    Ranges are also possible using the :paramref:`.expression.over.range_`,
+    :paramref:`.expression.over.rows`, and :paramref:`.expression.over.groups`
+    parameters.  These
     mutually-exclusive parameters each accept a 2-tuple, which contains
     a combination of integers and None::
 
@@ -1559,6 +1561,10 @@ def over(
 
         func.row_number().over(order_by="x", range_=(1, 3))
 
+    * GROUPS BETWEEN 1 FOLLOWING AND 3 FOLLOWING::
+
+        func.row_number().over(order_by="x", groups=(1, 3))
+
     :param element: a :class:`.FunctionElement`, :class:`.WithinGroup`,
      or other compatible construct.
     :param partition_by: a column element or string, or a list
@@ -1570,10 +1576,14 @@ def over(
     :param range\_: optional range clause for the window.  This is a
      tuple value which can contain integer values or ``None``,
      and will render a RANGE BETWEEN PRECEDING / FOLLOWING clause.
-
     :param rows: optional rows clause for the window.  This is a tuple
      value which can contain integer values or None, and will render
      a ROWS BETWEEN PRECEDING / FOLLOWING clause.
+    :param groups: optional groups clause for the window.  This is a
+     tuple value which can contain integer values or ``None``,
+     and will render a GROUPS BETWEEN PRECEDING / FOLLOWING clause.
+
+     .. versionadded:: 2.0.40
 
     This function is also available from the :data:`~.expression.func`
     construct itself via the :meth:`.FunctionElement.over` method.
@@ -1587,7 +1597,7 @@ def over(
         :func:`_expression.within_group`
 
     """  # noqa: E501
-    return Over(element, partition_by, order_by, range_, rows)
+    return Over(element, partition_by, order_by, range_, rows, groups)
 
 
 @_document_text_coercion("text", ":func:`.text`", ":paramref:`.text.text`")
diff --git a/libs/sqlalchemy/sql/_orm_types.py b/libs/sqlalchemy/sql/_orm_types.py
index c37d805ef3..39754a3c2d 100644
--- a/libs/sqlalchemy/sql/_orm_types.py
+++ b/libs/sqlalchemy/sql/_orm_types.py
@@ -1,5 +1,5 @@
 # sql/_orm_types.py
-# Copyright (C) 2022-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/_py_util.py b/libs/sqlalchemy/sql/_py_util.py
index 9e1a084a3f..c65e96c0db 100644
--- a/libs/sqlalchemy/sql/_py_util.py
+++ b/libs/sqlalchemy/sql/_py_util.py
@@ -1,5 +1,5 @@
 # sql/_py_util.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/_selectable_constructors.py b/libs/sqlalchemy/sql/_selectable_constructors.py
index 1660778c56..4dfb7ea762 100644
--- a/libs/sqlalchemy/sql/_selectable_constructors.py
+++ b/libs/sqlalchemy/sql/_selectable_constructors.py
@@ -1,5 +1,5 @@
 # sql/_selectable_constructors.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -12,7 +12,6 @@
 from typing import overload
 from typing import Tuple
 from typing import TYPE_CHECKING
-from typing import TypeVar
 from typing import Union
 
 from . import coercions
@@ -36,6 +35,7 @@
 if TYPE_CHECKING:
     from ._typing import _FromClauseArgument
     from ._typing import _OnClauseArgument
+    from ._typing import _OnlyColumnArgument
     from ._typing import _SelectStatementForCompoundArgument
     from ._typing import _T0
     from ._typing import _T1
@@ -47,6 +47,7 @@
     from ._typing import _T7
     from ._typing import _T8
     from ._typing import _T9
+    from ._typing import _TP
     from ._typing import _TypedColumnClauseArgument as _TCCA
     from .functions import Function
     from .selectable import CTE
@@ -55,9 +56,6 @@
     from .selectable import SelectBase
 
 
-_T = TypeVar("_T", bound=Any)
-
-
 def alias(
     selectable: FromClause, name: Optional[str] = None, flat: bool = False
 ) -> NamedFromClause:
@@ -106,9 +104,28 @@ def cte(
     )
 
 
+# TODO: mypy requires the _TypedSelectable overloads in all compound select
+# constructors since _SelectStatementForCompoundArgument includes
+# untyped args that make it return CompoundSelect[Unpack[tuple[Never, ...]]]
+# pyright does not have this issue
+_TypedSelectable = Union["Select[_TP]", "CompoundSelect[_TP]"]
+
+
+@overload
+def except_(
+    *selects: _TypedSelectable[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
+@overload
+def except_(
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
 def except_(
-    *selects: _SelectStatementForCompoundArgument,
-) -> CompoundSelect:
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]:
     r"""Return an ``EXCEPT`` of multiple selectables.
 
     The returned object is an instance of
@@ -121,9 +138,21 @@ def except_(
     return CompoundSelect._create_except(*selects)
 
 
+@overload
+def except_all(
+    *selects: _TypedSelectable[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
+@overload
+def except_all(
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
 def except_all(
-    *selects: _SelectStatementForCompoundArgument,
-) -> CompoundSelect:
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]:
     r"""Return an ``EXCEPT ALL`` of multiple selectables.
 
     The returned object is an instance of
@@ -181,9 +210,21 @@ def exists(
     return Exists(__argument)
 
 
+@overload
+def intersect(
+    *selects: _TypedSelectable[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
+@overload
+def intersect(
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
 def intersect(
-    *selects: _SelectStatementForCompoundArgument,
-) -> CompoundSelect:
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]:
     r"""Return an ``INTERSECT`` of multiple selectables.
 
     The returned object is an instance of
@@ -196,9 +237,21 @@ def intersect(
     return CompoundSelect._create_intersect(*selects)
 
 
+@overload
+def intersect_all(
+    *selects: _TypedSelectable[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
+@overload
+def intersect_all(
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
 def intersect_all(
-    *selects: _SelectStatementForCompoundArgument,
-) -> CompoundSelect:
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]:
     r"""Return an ``INTERSECT ALL`` of multiple selectables.
 
     The returned object is an instance of
@@ -557,9 +610,21 @@ class via the
     return TableSample._factory(selectable, sampling, name=name, seed=seed)
 
 
+@overload
+def union(
+    *selects: _TypedSelectable[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
+@overload
+def union(
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
 def union(
-    *selects: _SelectStatementForCompoundArgument,
-) -> CompoundSelect:
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]:
     r"""Return a ``UNION`` of multiple selectables.
 
     The returned object is an instance of
@@ -579,9 +644,21 @@ def union(
     return CompoundSelect._create_union(*selects)
 
 
+@overload
+def union_all(
+    *selects: _TypedSelectable[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
+@overload
+def union_all(
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]: ...
+
+
 def union_all(
-    *selects: _SelectStatementForCompoundArgument,
-) -> CompoundSelect:
+    *selects: _SelectStatementForCompoundArgument[_TP],
+) -> CompoundSelect[_TP]:
     r"""Return a ``UNION ALL`` of multiple selectables.
 
     The returned object is an instance of
@@ -598,30 +675,78 @@ def union_all(
 
 
 def values(
-    *columns: ColumnClause[Any],
+    *columns: _OnlyColumnArgument[Any],
     name: Optional[str] = None,
     literal_binds: bool = False,
 ) -> Values:
-    r"""Construct a :class:`_expression.Values` construct.
+    r"""Construct a :class:`_expression.Values` construct representing the
+    SQL ``VALUES`` clause.
 
-    The column expressions and the actual data for
-    :class:`_expression.Values` are given in two separate steps.  The
-    constructor receives the column expressions typically as
-    :func:`_expression.column` constructs,
-    and the data is then passed via the
-    :meth:`_expression.Values.data` method as a list,
-    which can be called multiple
-    times to add more data, e.g.::
+    The column expressions and the actual data for :class:`_expression.Values`
+    are given in two separate steps.  The constructor receives the column
+    expressions typically as :func:`_expression.column` constructs, and the
+    data is then passed via the :meth:`_expression.Values.data` method as a
+    list, which can be called multiple times to add more data, e.g.::
 
         from sqlalchemy import column
         from sqlalchemy import values
+        from sqlalchemy import Integer
+        from sqlalchemy import String
+
+        value_expr = (
+            values(
+                column("id", Integer),
+                column("name", String),
+            )
+            .data([(1, "name1"), (2, "name2")])
+            .data([(3, "name3")])
+        )
+
+    Would represent a SQL fragment like::
+
+        VALUES(1, "name1"), (2, "name2"), (3, "name3")
+
+    The :class:`_sql.values` construct has an optional
+    :paramref:`_sql.values.name` field; when using this field, the
+    PostgreSQL-specific "named VALUES" clause may be generated::
 
         value_expr = values(
-            column("id", Integer),
-            column("name", String),
-            name="my_values",
+            column("id", Integer), column("name", String), name="somename"
         ).data([(1, "name1"), (2, "name2"), (3, "name3")])
 
+    When selecting from the above construct, the name and column names will
+    be listed out using a PostgreSQL-specific syntax::
+
+        >>> print(value_expr.select())
+        SELECT somename.id, somename.name
+        FROM (VALUES (:param_1, :param_2), (:param_3, :param_4),
+        (:param_5, :param_6)) AS somename (id, name)
+
+    For a more database-agnostic means of SELECTing named columns from a
+    VALUES expression, the :meth:`.Values.cte` method may be used, which
+    produces a named CTE with explicit column names against the VALUES
+    construct within; this syntax works on PostgreSQL, SQLite, and MariaDB::
+
+        value_expr = (
+            values(
+                column("id", Integer),
+                column("name", String),
+            )
+            .data([(1, "name1"), (2, "name2"), (3, "name3")])
+            .cte()
+        )
+
+    Rendering as::
+
+        >>> print(value_expr.select())
+        WITH anon_1(id, name) AS
+        (VALUES (:param_1, :param_2), (:param_3, :param_4), (:param_5, :param_6))
+        SELECT anon_1.id, anon_1.name
+        FROM anon_1
+
+    .. versionadded:: 2.0.42  Added the :meth:`.Values.cte` method to
+       :class:`.Values`
+
     :param \*columns: column expressions, typically composed using
      :func:`_expression.column` objects.
 
@@ -633,5 +758,6 @@ def values(
      the data values inline in the SQL output, rather than using bound
      parameters.
 
-    """
+    """  # noqa: E501
+
     return Values(*columns, literal_binds=literal_binds, name=name)
diff --git a/libs/sqlalchemy/sql/_typing.py b/libs/sqlalchemy/sql/_typing.py
index cf9129b479..99d3defad7 100644
--- a/libs/sqlalchemy/sql/_typing.py
+++ b/libs/sqlalchemy/sql/_typing.py
@@ -1,5 +1,5 @@
 # sql/_typing.py
-# Copyright (C) 2022-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -56,6 +56,7 @@
     from .roles import FromClauseRole
     from .schema import Column
     from .selectable import Alias
+    from .selectable import CompoundSelect
     from .selectable import CTE
     from .selectable import FromClause
     from .selectable import Join
@@ -69,7 +70,10 @@
     from .sqltypes import TableValueType
     from .sqltypes import TupleType
     from .type_api import TypeEngine
+    from ..engine import Connection
     from ..engine import Dialect
+    from ..engine import Engine
+    from ..engine.mock import MockConnection
     from ..util.typing import TypeGuard
 
 _T = TypeVar("_T", bound=Any)
@@ -182,6 +186,19 @@ def dialect(self) -> Dialect: ...
 _T9 = TypeVar("_T9", bound=Any)
 
 
+_OnlyColumnArgument = Union[
+    "ColumnElement[_T]",
+    _HasClauseElement[_T],
+    roles.DMLColumnRole,
+]
+"""A narrow type that is looking for a ColumnClause (e.g. table column with a
+name) or an ORM element that produces this.
+
+This is used for constructs that need a named column to represent a
+position in a selectable, like TextClause().columns() or values(...).
+
+"""
+
 _ColumnExpressionArgument = Union[
     "ColumnElement[_T]",
     _HasClauseElement[_T],
@@ -224,6 +241,7 @@ def dialect(self) -> Dialect: ...
 
 _FromClauseArgument = Union[
     roles.FromClauseRole,
+    roles.TypedColumnsClauseRole[Any],
     Type[Any],
     Inspectable[_HasClauseElement[Any]],
     _HasClauseElement[Any],
@@ -247,7 +265,9 @@ def dialect(self) -> Dialect: ...
 """
 
 _SelectStatementForCompoundArgument = Union[
-    "SelectBase", roles.CompoundElementRole
+    "Select[_TP]",
+    "CompoundSelect[_TP]",
+    roles.CompoundElementRole,
 ]
 """SELECT statement acceptable by ``union()`` and other SQL set operations"""
 
@@ -298,6 +318,8 @@ def dialect(self) -> Dialect: ...
 
 _AutoIncrementType = Union[bool, Literal["auto", "ignore_fk"]]
 
+_CreateDropBind = Union["Engine", "Connection", "MockConnection"]
+
 if TYPE_CHECKING:
 
     def is_sql_compiler(c: Compiled) -> TypeGuard[SQLCompiler]: ...
@@ -329,11 +351,11 @@ def is_table_value_type(
     def is_selectable(t: Any) -> TypeGuard[Selectable]: ...
 
     def is_select_base(
-        t: Union[Executable, ReturnsRows]
+        t: Union[Executable, ReturnsRows],
     ) -> TypeGuard[SelectBase]: ...
 
     def is_select_statement(
-        t: Union[Executable, ReturnsRows]
+        t: Union[Executable, ReturnsRows],
     ) -> TypeGuard[Select[Any]]: ...
 
     def is_table(t: FromClause) -> TypeGuard[TableClause]: ...
diff --git a/libs/sqlalchemy/sql/annotation.py b/libs/sqlalchemy/sql/annotation.py
index bf445ff330..cbd262d155 100644
--- a/libs/sqlalchemy/sql/annotation.py
+++ b/libs/sqlalchemy/sql/annotation.py
@@ -1,5 +1,5 @@
 # sql/annotation.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -465,7 +465,9 @@ def clone(elem: SupportsAnnotations, **kw: Any) -> SupportsAnnotations:
             newelem = elem
 
         newelem._copy_internals(
-            clone=clone, ind_cols_on_fromclause=ind_cols_on_fromclause
+            clone=clone,
+            ind_cols_on_fromclause=ind_cols_on_fromclause,
+            _annotations_traversal=True,
         )
 
         cloned_ids[id_] = newelem
@@ -505,7 +507,7 @@ def clone(elem: SupportsAnnotations, **kw: Any) -> SupportsAnnotations:
 
         if key not in cloned:
             newelem = elem._deannotate(values=values, clone=True)
-            newelem._copy_internals(clone=clone)
+            newelem._copy_internals(clone=clone, _annotations_traversal=True)
             cloned[key] = newelem
             return newelem
         else:
@@ -526,7 +528,7 @@ def _shallow_annotate(element: _SA, annotations: _AnnotationDict) -> _SA:
     structure wasting time.
     """
     element = element._annotate(annotations)
-    element._copy_internals()
+    element._copy_internals(_annotations_traversal=True)
     return element
 
 
diff --git a/libs/sqlalchemy/sql/base.py b/libs/sqlalchemy/sql/base.py
index 6d409a9fb7..39772c9e76 100644
--- a/libs/sqlalchemy/sql/base.py
+++ b/libs/sqlalchemy/sql/base.py
@@ -1,14 +1,12 @@
 # sql/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: allow-untyped-defs, allow-untyped-calls
 
-"""Foundational utilities common to many sql modules.
-
-"""
+"""Foundational utilities common to many sql modules."""
 
 
 from __future__ import annotations
@@ -24,6 +22,7 @@
 from typing import cast
 from typing import Dict
 from typing import FrozenSet
+from typing import Generator
 from typing import Generic
 from typing import Iterable
 from typing import Iterator
@@ -57,6 +56,8 @@
 from ..util import HasMemoized as HasMemoized
 from ..util import hybridmethod
 from ..util import typing as compat_typing
+from ..util import warn_deprecated
+from ..util.typing import Final
 from ..util.typing import Protocol
 from ..util.typing import Self
 from ..util.typing import TypeGuard
@@ -68,6 +69,8 @@
     from ._orm_types import DMLStrategyArgument
     from ._orm_types import SynchronizeSessionArgument
     from ._typing import _CLE
+    from .cache_key import CacheKey
+    from .compiler import SQLCompiler
     from .elements import BindParameter
     from .elements import ClauseList
     from .elements import ColumnClause  # noqa
@@ -80,6 +83,7 @@
     from .selectable import _JoinTargetElement
     from .selectable import _SelectIterable
     from .selectable import FromClause
+    from .visitors import anon_map
     from ..engine import Connection
     from ..engine import CursorResult
     from ..engine.interfaces import _CoreMultiExecuteParams
@@ -107,7 +111,7 @@ def __repr__(self):
         return f"_NoArg.{self.name}"
 
 
-NO_ARG = _NoArg.NO_ARG
+NO_ARG: Final = _NoArg.NO_ARG
 
 
 class _NoneName(Enum):
@@ -115,7 +119,7 @@ class _NoneName(Enum):
     """indicate a 'deferred' name that was ultimately the value None."""
 
 
-_NONE_NAME = _NoneName.NONE_NAME
+_NONE_NAME: Final = _NoneName.NONE_NAME
 
 _T = TypeVar("_T", bound=Any)
 
@@ -150,7 +154,9 @@ def _from_column_default(
         )
 
 
-_never_select_column = operator.attrgetter("_omit_from_statements")
+_never_select_column: operator.attrgetter[Any] = operator.attrgetter(
+    "_omit_from_statements"
+)
 
 
 class _EntityNamespace(Protocol):
@@ -185,12 +191,12 @@ class Immutable:
 
     __slots__ = ()
 
-    _is_immutable = True
+    _is_immutable: bool = True
 
-    def unique_params(self, *optionaldict, **kwargs):
+    def unique_params(self, *optionaldict: Any, **kwargs: Any) -> NoReturn:
         raise NotImplementedError("Immutable objects do not support copying")
 
-    def params(self, *optionaldict, **kwargs):
+    def params(self, *optionaldict: Any, **kwargs: Any) -> NoReturn:
         raise NotImplementedError("Immutable objects do not support copying")
 
     def _clone(self: _Self, **kw: Any) -> _Self:
@@ -205,7 +211,7 @@ def _copy_internals(
 class SingletonConstant(Immutable):
     """Represent SQL constants like NULL, TRUE, FALSE"""
 
-    _is_singleton_constant = True
+    _is_singleton_constant: bool = True
 
     _singleton: SingletonConstant
 
@@ -217,7 +223,7 @@ def proxy_set(self) -> FrozenSet[ColumnElement[Any]]:
         raise NotImplementedError()
 
     @classmethod
-    def _create_singleton(cls):
+    def _create_singleton(cls) -> None:
         obj = object.__new__(cls)
         obj.__init__()  # type: ignore
 
@@ -286,17 +292,17 @@ def _generative(
 
 
 def _exclusive_against(*names: str, **kw: Any) -> Callable[[_Fn], _Fn]:
-    msgs = kw.pop("msgs", {})
+    msgs: Dict[str, str] = kw.pop("msgs", {})
 
-    defaults = kw.pop("defaults", {})
+    defaults: Dict[str, str] = kw.pop("defaults", {})
 
-    getters = [
+    getters: List[Tuple[str, operator.attrgetter[Any], Optional[str]]] = [
         (name, operator.attrgetter(name), defaults.get(name, None))
         for name in names
     ]
 
     @util.decorator
-    def check(fn, *args, **kw):
+    def check(fn: _Fn, *args: Any, **kw: Any) -> Any:
         # make pylance happy by not including "self" in the argument
         # list
         self = args[0]
@@ -345,12 +351,16 @@ def _cloned_intersection(a: Iterable[_CLE], b: Iterable[_CLE]) -> Set[_CLE]:
     The returned set is in terms of the entities present within 'a'.
 
     """
-    all_overlap = set(_expand_cloned(a)).intersection(_expand_cloned(b))
+    all_overlap: Set[_CLE] = set(_expand_cloned(a)).intersection(
+        _expand_cloned(b)
+    )
     return {elem for elem in a if all_overlap.intersection(elem._cloned_set)}
 
 
 def _cloned_difference(a: Iterable[_CLE], b: Iterable[_CLE]) -> Set[_CLE]:
-    all_overlap = set(_expand_cloned(a)).intersection(_expand_cloned(b))
+    all_overlap: Set[_CLE] = set(_expand_cloned(a)).intersection(
+        _expand_cloned(b)
+    )
     return {
         elem for elem in a if not all_overlap.intersection(elem._cloned_set)
     }
@@ -362,10 +372,12 @@ class _DialectArgView(MutableMapping[str, Any]):
 
     """
 
-    def __init__(self, obj):
+    __slots__ = ("obj",)
+
+    def __init__(self, obj: DialectKWArgs) -> None:
         self.obj = obj
 
-    def _key(self, key):
+    def _key(self, key: str) -> Tuple[str, str]:
         try:
             dialect, value_key = key.split("_", 1)
         except ValueError as err:
@@ -373,7 +385,7 @@ def _key(self, key):
         else:
             return dialect, value_key
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str) -> Any:
         dialect, value_key = self._key(key)
 
         try:
@@ -383,7 +395,7 @@ def __getitem__(self, key):
         else:
             return opt[value_key]
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: str, value: Any) -> None:
         try:
             dialect, value_key = self._key(key)
         except KeyError as err:
@@ -393,17 +405,17 @@ def __setitem__(self, key, value):
         else:
             self.obj.dialect_options[dialect][value_key] = value
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: str) -> None:
         dialect, value_key = self._key(key)
         del self.obj.dialect_options[dialect][value_key]
 
-    def __len__(self):
+    def __len__(self) -> int:
         return sum(
             len(args._non_defaults)
             for args in self.obj.dialect_options.values()
         )
 
-    def __iter__(self):
+    def __iter__(self) -> Generator[str, None, None]:
         return (
             "%s_%s" % (dialect_name, value_name)
             for dialect_name in self.obj.dialect_options
@@ -422,31 +434,31 @@ class _DialectArgDict(MutableMapping[str, Any]):
 
     """
 
-    def __init__(self):
-        self._non_defaults = {}
-        self._defaults = {}
+    def __init__(self) -> None:
+        self._non_defaults: Dict[str, Any] = {}
+        self._defaults: Dict[str, Any] = {}
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(set(self._non_defaults).union(self._defaults))
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[str]:
         return iter(set(self._non_defaults).union(self._defaults))
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: str) -> Any:
         if key in self._non_defaults:
             return self._non_defaults[key]
         else:
             return self._defaults[key]
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: str, value: Any) -> None:
         self._non_defaults[key] = value
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: str) -> None:
         del self._non_defaults[key]
 
 
 @util.preload_module("sqlalchemy.dialects")
-def _kw_reg_for_dialect(dialect_name):
+def _kw_reg_for_dialect(dialect_name: str) -> Optional[Dict[Any, Any]]:
     dialect_cls = util.preloaded.dialects.registry.load(dialect_name)
     if dialect_cls.construct_arguments is None:
         return None
@@ -468,12 +480,87 @@ class DialectKWArgs:
 
     __slots__ = ()
 
-    _dialect_kwargs_traverse_internals = [
+    _dialect_kwargs_traverse_internals: List[Tuple[str, Any]] = [
         ("dialect_options", InternalTraversal.dp_dialect_options)
     ]
 
+    def get_dialect_option(
+        self,
+        dialect: Dialect,
+        argument_name: str,
+        *,
+        else_: Any = None,
+        deprecated_fallback: Optional[str] = None,
+    ) -> Any:
+        r"""Return the value of a dialect-specific option, or *else_* if
+        this dialect does not register the given argument.
+
+        This is useful for DDL compilers that may be inherited by
+        third-party dialects whose ``construct_arguments`` do not
+        include the same set of keys as the parent dialect.
+
+        :param dialect: The dialect for which to retrieve the option.
+        :param argument_name: The name of the argument to retrieve.
+        :param else\_: The value to return if the argument is not present.
+        :param deprecated_fallback: Optional dialect name to fall back to
+         if the argument is not present for the current dialect. If the
+         argument is present for the fallback dialect but not the current
+         dialect, a deprecation warning will be emitted.
+
+        """
+
+        registry = DialectKWArgs._kw_registry[dialect.name]
+        if registry is None:
+            return else_
+
+        if argument_name in registry.get(self.__class__, {}):
+            if (
+                deprecated_fallback is None
+                or dialect.name == deprecated_fallback
+            ):
+                return self.dialect_options[dialect.name][argument_name]
+
+            # deprecated_fallback is present; need to look in two places
+
+            # Current dialect has this option registered.
+            # Check if user explicitly set it.
+            if (
+                dialect.name in self.dialect_options
+                and argument_name
+                in self.dialect_options[dialect.name]._non_defaults
+            ):
+                # User explicitly set this dialect's option - use it
+                return self.dialect_options[dialect.name][argument_name]
+
+            # User didn't set current dialect's option.
+            # Check for deprecated fallback.
+            elif (
+                deprecated_fallback in self.dialect_options
+                and argument_name
+                in self.dialect_options[deprecated_fallback]._non_defaults
+            ):
+                # User set fallback option but not current dialect's option
+                warn_deprecated(
+                    f"Using '{deprecated_fallback}_{argument_name}' "
+                    f"with the '{dialect.name}' dialect is deprecated; "
+                    f"please additionally specify "
+                    f"'{dialect.name}_{argument_name}'.",
+                    version="2.1",
+                )
+                return self.dialect_options[deprecated_fallback][argument_name]
+
+            # Return default value
+            return self.dialect_options[dialect.name][argument_name]
+        else:
+            # Current dialect doesn't have the option registered at all.
+            # Don't warn - if a third-party dialect doesn't support an
+            # option, that's their choice, not a deprecation case.
+            return else_
+
     @classmethod
-    def argument_for(cls, dialect_name, argument_name, default):
+    def argument_for(
+        cls, dialect_name: str, argument_name: str, default: Any
+    ) -> None:
         """Add a new kind of dialect-specific keyword argument for this class.
 
         E.g.::
@@ -510,7 +597,9 @@ def argument_for(cls, dialect_name, argument_name, default):
 
         """
 
-        construct_arg_dictionary = DialectKWArgs._kw_registry[dialect_name]
+        construct_arg_dictionary: Optional[Dict[Any, Any]] = (
+            DialectKWArgs._kw_registry[dialect_name]
+        )
         if construct_arg_dictionary is None:
             raise exc.ArgumentError(
                 "Dialect '%s' does have keyword-argument "
@@ -520,8 +609,8 @@ def argument_for(cls, dialect_name, argument_name, default):
             construct_arg_dictionary[cls] = {}
         construct_arg_dictionary[cls][argument_name] = default
 
-    @util.memoized_property
-    def dialect_kwargs(self):
+    @property
+    def dialect_kwargs(self) -> _DialectArgView:
         """A collection of keyword arguments specified as dialect-specific
         options to this construct.
 
@@ -542,26 +631,29 @@ def dialect_kwargs(self):
         return _DialectArgView(self)
 
     @property
-    def kwargs(self):
+    def kwargs(self) -> _DialectArgView:
         """A synonym for :attr:`.DialectKWArgs.dialect_kwargs`."""
         return self.dialect_kwargs
 
-    _kw_registry = util.PopulateDict(_kw_reg_for_dialect)
+    _kw_registry: util.PopulateDict[str, Optional[Dict[Any, Any]]] = (
+        util.PopulateDict(_kw_reg_for_dialect)
+    )
 
-    def _kw_reg_for_dialect_cls(self, dialect_name):
+    @classmethod
+    def _kw_reg_for_dialect_cls(cls, dialect_name: str) -> _DialectArgDict:
         construct_arg_dictionary = DialectKWArgs._kw_registry[dialect_name]
         d = _DialectArgDict()
 
         if construct_arg_dictionary is None:
             d._defaults.update({"*": None})
         else:
-            for cls in reversed(self.__class__.__mro__):
+            for cls in reversed(cls.__mro__):
                 if cls in construct_arg_dictionary:
                     d._defaults.update(construct_arg_dictionary[cls])
         return d
 
     @util.memoized_property
-    def dialect_options(self):
+    def dialect_options(self) -> util.PopulateDict[str, _DialectArgDict]:
         """A collection of keyword arguments specified as dialect-specific
         options to this construct.
 
@@ -579,9 +671,7 @@ def dialect_options(self):
 
         """
 
-        return util.PopulateDict(
-            util.portable_instancemethod(self._kw_reg_for_dialect_cls)
-        )
+        return util.PopulateDict(self._kw_reg_for_dialect_cls)
 
     def _validate_dialect_kwargs(self, kwargs: Dict[str, Any]) -> None:
         # validate remaining kwargs that they all specify DB prefixes
@@ -657,7 +747,9 @@ class CompileState:
     _ambiguous_table_name_map: Optional[_AmbiguousTableNameMap]
 
     @classmethod
-    def create_for_statement(cls, statement, compiler, **kw):
+    def create_for_statement(
+        cls, statement: Executable, compiler: SQLCompiler, **kw: Any
+    ) -> CompileState:
         # factory construction.
 
         if statement._propagate_attrs:
@@ -753,7 +845,7 @@ class InPlaceGenerative(HasMemoized):
 
     __slots__ = ()
 
-    def _generate(self):
+    def _generate(self) -> Self:
         skip = self._memoized_keys
         # note __dict__ needs to be in __slots__ if this is used
         for k in skip:
@@ -823,7 +915,7 @@ def __init_subclass__(cls) -> None:
         )
         super().__init_subclass__()
 
-    def __init__(self, **kw):
+    def __init__(self, **kw: Any) -> None:
         self.__dict__.update(kw)
 
     def __add__(self, other):
@@ -848,7 +940,7 @@ def __eq__(self, other):
                 return False
         return True
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         # TODO: fairly inefficient, used only in debugging right now.
 
         return "%s(%s)" % (
@@ -865,7 +957,7 @@ def isinstance(cls, klass: Type[Any]) -> bool:
         return issubclass(cls, klass)
 
     @hybridmethod
-    def add_to_element(self, name, value):
+    def add_to_element(self, name: str, value: str) -> Any:
         return self + {name: getattr(self, name) + value}
 
     @hybridmethod
@@ -879,7 +971,7 @@ def _state_dict(cls) -> Mapping[str, Any]:
         return cls._state_dict_const
 
     @classmethod
-    def safe_merge(cls, other):
+    def safe_merge(cls, other: "Options") -> Any:
         d = other._state_dict()
 
         # only support a merge with another object of our class
@@ -905,8 +997,12 @@ def safe_merge(cls, other):
 
     @classmethod
     def from_execution_options(
-        cls, key, attrs, exec_options, statement_exec_options
-    ):
+        cls,
+        key: str,
+        attrs: set[str],
+        exec_options: Mapping[str, Any],
+        statement_exec_options: Mapping[str, Any],
+    ) -> Tuple["Options", Mapping[str, Any]]:
         """process Options argument in terms of execution options.
 
 
@@ -945,8 +1041,8 @@ def from_execution_options(
                     result[local] = statement_exec_options[argname]
 
             new_options = existing_options + result
-            exec_options = util.immutabledict().merge_with(
-                exec_options, {key: new_options}
+            exec_options = util.immutabledict(exec_options).merge_with(
+                {key: new_options}
             )
             return new_options, exec_options
 
@@ -966,28 +1062,32 @@ class CacheableOptions(Options, HasCacheKey):
     __slots__ = ()
 
     @hybridmethod
-    def _gen_cache_key_inst(self, anon_map, bindparams):
+    def _gen_cache_key_inst(
+        self, anon_map: Any, bindparams: List[BindParameter[Any]]
+    ) -> Optional[Tuple[Any]]:
         return HasCacheKey._gen_cache_key(self, anon_map, bindparams)
 
     @_gen_cache_key_inst.classlevel
-    def _gen_cache_key(cls, anon_map, bindparams):
+    def _gen_cache_key(
+        cls, anon_map: "anon_map", bindparams: List[BindParameter[Any]]
+    ) -> Tuple[CacheableOptions, Any]:
         return (cls, ())
 
     @hybridmethod
-    def _generate_cache_key(self):
+    def _generate_cache_key(self) -> Optional[CacheKey]:
         return HasCacheKey._generate_cache_key_for_object(self)
 
 
 class ExecutableOption(HasCopyInternals):
     __slots__ = ()
 
-    _annotations = util.EMPTY_DICT
+    _annotations: _ImmutableExecuteOptions = util.EMPTY_DICT
 
-    __visit_name__ = "executable_option"
+    __visit_name__: str = "executable_option"
 
-    _is_has_cache_key = False
+    _is_has_cache_key: bool = False
 
-    _is_core = True
+    _is_core: bool = True
 
     def _clone(self, **kw):
         """Create a shallow copy of this ExecutableOption."""
@@ -1007,7 +1107,7 @@ class Executable(roles.StatementRole):
 
     supports_execution: bool = True
     _execution_options: _ImmutableExecuteOptions = util.EMPTY_DICT
-    _is_default_generator = False
+    _is_default_generator: bool = False
     _with_options: Tuple[ExecutableOption, ...] = ()
     _with_context_options: Tuple[
         Tuple[Callable[[CompileState], None], Any], ...
@@ -1023,13 +1123,13 @@ class Executable(roles.StatementRole):
         ("_propagate_attrs", ExtendedInternalTraversal.dp_propagate_attrs),
     ]
 
-    is_select = False
-    is_from_statement = False
-    is_update = False
-    is_insert = False
-    is_text = False
-    is_delete = False
-    is_dml = False
+    is_select: bool = False
+    is_from_statement: bool = False
+    is_update: bool = False
+    is_insert: bool = False
+    is_text: bool = False
+    is_delete: bool = False
+    is_dml: bool = False
 
     if TYPE_CHECKING:
         __visit_name__: str
@@ -1062,7 +1162,7 @@ def _execute_on_scalar(
         ) -> Any: ...
 
     @util.ro_non_memoized_property
-    def _all_selected_columns(self):
+    def _all_selected_columns(self) -> _SelectIterable:
         raise NotImplementedError()
 
     @property
@@ -1322,10 +1422,21 @@ def _set_parent_with_dispatch(
         self.dispatch.after_parent_attach(self, parent)
 
 
+class SchemaVisitable(SchemaEventTarget, visitors.Visitable):
+    """Base class for elements that are targets of a :class:`.SchemaVisitor`.
+
+    .. versionadded:: 2.0.41
+
+    """
+
+
 class SchemaVisitor(ClauseVisitor):
-    """Define the visiting for ``SchemaItem`` objects."""
+    """Define the visiting for ``SchemaItem`` and more
+    generally ``SchemaVisitable`` objects.
+
+    """
 
-    __traverse_options__ = {"schema_visitor": True}
+    __traverse_options__: Dict[str, Any] = {"schema_visitor": True}
 
 
 class _SentinelDefaultCharacterization(Enum):
@@ -1360,7 +1471,7 @@ class _ColumnMetrics(Generic[_COL_co]):
 
     def __init__(
         self, collection: ColumnCollection[Any, _COL_co], col: _COL_co
-    ):
+    ) -> None:
         self.column = col
 
         # proxy_index being non-empty means it was initialized.
@@ -1370,10 +1481,10 @@ def __init__(
             for eps_col in col._expanded_proxy_set:
                 pi[eps_col].add(self)
 
-    def get_expanded_proxy_set(self):
+    def get_expanded_proxy_set(self) -> FrozenSet[ColumnElement[Any]]:
         return self.column._expanded_proxy_set
 
-    def dispose(self, collection):
+    def dispose(self, collection: ColumnCollection[_COLKEY, _COL_co]) -> None:
         pi = collection._proxy_index
         if not pi:
             return
@@ -1506,7 +1617,7 @@ class ColumnCollection(Generic[_COLKEY, _COL_co]):
 
     """
 
-    __slots__ = "_collection", "_index", "_colset", "_proxy_index"
+    __slots__ = ("_collection", "_index", "_colset", "_proxy_index")
 
     _collection: List[Tuple[_COLKEY, _COL_co, _ColumnMetrics[_COL_co]]]
     _index: Dict[Union[None, str, int], Tuple[_COLKEY, _COL_co]]
@@ -1625,7 +1736,7 @@ def __contains__(self, key: str) -> bool:
         else:
             return True
 
-    def compare(self, other: ColumnCollection[Any, Any]) -> bool:
+    def compare(self, other: ColumnCollection[_COLKEY, _COL_co]) -> bool:
         """Compare this :class:`_expression.ColumnCollection` to another
         based on the names of the keys"""
 
@@ -1676,7 +1787,7 @@ def clear(self) -> NoReturn:
         :class:`_sql.ColumnCollection`."""
         raise NotImplementedError()
 
-    def remove(self, column: Any) -> None:
+    def remove(self, column: Any) -> NoReturn:
         raise NotImplementedError()
 
     def update(self, iter_: Any) -> NoReturn:
@@ -1685,7 +1796,7 @@ def update(self, iter_: Any) -> NoReturn:
         raise NotImplementedError()
 
     # https://github.com/python/mypy/issues/4266
-    __hash__ = None  # type: ignore
+    __hash__: Optional[int] = None  # type: ignore
 
     def _populate_separate_keys(
         self, iter_: Iterable[Tuple[_COLKEY, _COL_co]]
@@ -1778,7 +1889,7 @@ def as_readonly(self) -> ReadOnlyColumnCollection[_COLKEY, _COL_co]:
 
         return ReadOnlyColumnCollection(self)
 
-    def _init_proxy_index(self):
+    def _init_proxy_index(self) -> None:
         """populate the "proxy index", if empty.
 
         proxy index is added in 2.0 to provide more efficient operation
@@ -1997,7 +2108,7 @@ def _populate_separate_keys(
     def extend(self, iter_: Iterable[_NAMEDCOL]) -> None:
         self._populate_separate_keys((col.key, col) for col in iter_)
 
-    def remove(self, column: _NAMEDCOL) -> None:
+    def remove(self, column: _NAMEDCOL) -> None:  # type: ignore[override]
         if column not in self._colset:
             raise ValueError(
                 "Can't remove column %r; column is not in this collection"
@@ -2094,17 +2205,17 @@ class ReadOnlyColumnCollection(
 ):
     __slots__ = ("_parent",)
 
-    def __init__(self, collection):
+    def __init__(self, collection: ColumnCollection[_COLKEY, _COL_co]):
         object.__setattr__(self, "_parent", collection)
         object.__setattr__(self, "_colset", collection._colset)
         object.__setattr__(self, "_index", collection._index)
         object.__setattr__(self, "_collection", collection._collection)
         object.__setattr__(self, "_proxy_index", collection._proxy_index)
 
-    def __getstate__(self):
+    def __getstate__(self) -> Dict[str, _COL_co]:
         return {"_parent": self._parent}
 
-    def __setstate__(self, state):
+    def __setstate__(self, state: Dict[str, Any]) -> None:
         parent = state["_parent"]
         self.__init__(parent)  # type: ignore
 
@@ -2119,10 +2230,10 @@ def remove(self, item: Any) -> NoReturn:
 
 
 class ColumnSet(util.OrderedSet["ColumnClause[Any]"]):
-    def contains_column(self, col):
+    def contains_column(self, col: ColumnClause[Any]) -> bool:
         return col in self
 
-    def extend(self, cols):
+    def extend(self, cols: Iterable[Any]) -> None:
         for col in cols:
             self.add(col)
 
@@ -2134,12 +2245,12 @@ def __eq__(self, other):
                     l.append(c == local)
         return elements.and_(*l)
 
-    def __hash__(self):  # type: ignore[override]
+    def __hash__(self) -> int:  # type: ignore[override]
         return hash(tuple(x for x in self))
 
 
 def _entity_namespace(
-    entity: Union[_HasEntityNamespace, ExternallyTraversible]
+    entity: Union[_HasEntityNamespace, ExternallyTraversible],
 ) -> _EntityNamespace:
     """Return the nearest .entity_namespace for the given entity.
 
diff --git a/libs/sqlalchemy/sql/cache_key.py b/libs/sqlalchemy/sql/cache_key.py
index 1f562f2e67..5037f15f9d 100644
--- a/libs/sqlalchemy/sql/cache_key.py
+++ b/libs/sqlalchemy/sql/cache_key.py
@@ -1,5 +1,5 @@
 # sql/cache_key.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -516,7 +516,7 @@ def _whats_different(self, other: CacheKey) -> Iterator[str]:
                             e2,
                         )
             else:
-                pickup_index = stack.pop(-1)
+                stack.pop(-1)
                 break
 
     def _diff(self, other: CacheKey) -> str:
diff --git a/libs/sqlalchemy/sql/coercions.py b/libs/sqlalchemy/sql/coercions.py
index 123b5c556e..f7c8b13917 100644
--- a/libs/sqlalchemy/sql/coercions.py
+++ b/libs/sqlalchemy/sql/coercions.py
@@ -1,5 +1,5 @@
 # sql/coercions.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -52,6 +52,7 @@
     from ._typing import _DDLColumnArgument
     from ._typing import _DMLTableArgument
     from ._typing import _FromClauseArgument
+    from ._typing import _OnlyColumnArgument
     from .dml import _DMLTableElement
     from .elements import BindParameter
     from .elements import ClauseElement
@@ -75,7 +76,7 @@
 _T = TypeVar("_T", bound=Any)
 
 
-def _is_literal(element):
+def _is_literal(element: Any) -> bool:
     """Return whether or not the element is a "literal" in the context
     of a SQL expression construct.
 
@@ -212,7 +213,7 @@ def expect(
 @overload
 def expect(
     role: Type[roles.LabeledColumnExprRole[Any]],
-    element: _ColumnExpressionArgument[_T],
+    element: Union[_ColumnExpressionArgument[_T], _OnlyColumnArgument[_T]],
     **kw: Any,
 ) -> NamedColumn[_T]: ...
 
@@ -843,7 +844,7 @@ def _warn_for_implicit_coercion(self, elem):
         )
 
     @util.preload_module("sqlalchemy.sql.elements")
-    def _literal_coercion(self, element, *, expr, operator, **kw):
+    def _literal_coercion(self, element, *, expr, operator, **kw):  # type: ignore[override] # noqa: E501
         if util.is_non_string_iterable(element):
             non_literal_expressions: Dict[
                 Optional[_ColumnExpressionArgument[Any]],
@@ -859,8 +860,6 @@ def _literal_coercion(self, element, *, expr, operator, **kw):
 
                     else:
                         non_literal_expressions[o] = o
-                elif o is None:
-                    non_literal_expressions[o] = elements.Null()
 
             if non_literal_expressions:
                 return elements.ClauseList(
diff --git a/libs/sqlalchemy/sql/compiler.py b/libs/sqlalchemy/sql/compiler.py
index 49e8ce500e..7819d51ba8 100644
--- a/libs/sqlalchemy/sql/compiler.py
+++ b/libs/sqlalchemy/sql/compiler.py
@@ -1,5 +1,5 @@
 # sql/compiler.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -74,38 +74,51 @@
 from .base import _from_objects
 from .base import _NONE_NAME
 from .base import _SentinelDefaultCharacterization
-from .base import Executable
 from .base import NO_ARG
-from .elements import ClauseElement
 from .elements import quoted_name
-from .schema import Column
 from .sqltypes import TupleType
-from .type_api import TypeEngine
 from .visitors import prefix_anon_map
-from .visitors import Visitable
 from .. import exc
 from .. import util
 from ..util import FastIntFlag
 from ..util.typing import Literal
 from ..util.typing import Protocol
+from ..util.typing import Self
 from ..util.typing import TypedDict
 
 if typing.TYPE_CHECKING:
     from .annotation import _AnnotationDict
     from .base import _AmbiguousTableNameMap
     from .base import CompileState
+    from .base import Executable
     from .cache_key import CacheKey
     from .ddl import ExecutableDDLElement
     from .dml import Insert
+    from .dml import Update
     from .dml import UpdateBase
+    from .dml import UpdateDMLState
     from .dml import ValuesBase
     from .elements import _truncated_label
+    from .elements import BinaryExpression
     from .elements import BindParameter
+    from .elements import ClauseElement
     from .elements import ColumnClause
     from .elements import ColumnElement
+    from .elements import False_
     from .elements import Label
+    from .elements import Null
+    from .elements import True_
     from .functions import Function
+    from .schema import CheckConstraint
+    from .schema import Column
+    from .schema import Constraint
+    from .schema import ForeignKeyConstraint
+    from .schema import IdentityOptions
+    from .schema import Index
+    from .schema import PrimaryKeyConstraint
     from .schema import Table
+    from .schema import UniqueConstraint
+    from .selectable import _ColumnsClauseElement
     from .selectable import AliasedReturnsRows
     from .selectable import CompoundSelectState
     from .selectable import CTE
@@ -115,6 +128,10 @@
     from .selectable import Select
     from .selectable import SelectState
     from .type_api import _BindProcessorType
+    from .type_api import TypeDecorator
+    from .type_api import TypeEngine
+    from .type_api import UserDefinedType
+    from .visitors import Visitable
     from ..engine.cursor import CursorResultMetaData
     from ..engine.interfaces import _CoreSingleExecuteParams
     from ..engine.interfaces import _DBAPIAnyExecuteParams
@@ -126,6 +143,7 @@
     from ..engine.interfaces import Dialect
     from ..engine.interfaces import SchemaTranslateMapType
 
+
 _FromHintsType = Dict["FromClause", str]
 
 RESERVED_WORDS = {
@@ -574,6 +592,19 @@ class _InsertManyValues(NamedTuple):
 
     """
 
+    has_upsert_bound_parameters: bool = False
+    """if True, the upsert SET clause contains bound parameters that will
+    receive their values from the parameters dict (i.e., parametrized
+    bindparams where value is None and callable is None).
+
+    This means we can't batch multiple rows in a single statement, since
+    each row would need different values in the SET clause but there's only
+    one SET clause per statement. See issue #13130.
+
+    .. versionadded:: 2.0.37
+
+    """
+
     embed_values_counter: bool = False
     """Whether to embed an incrementing integer counter in each parameter
     set within the VALUES clause as parameters are batched over.
@@ -870,6 +901,7 @@ def __init__(
             self.string = self.process(self.statement, **compile_kwargs)
 
             if render_schema_translate:
+                assert schema_translate_map is not None
                 self.string = self.preparer._render_schema_translates(
                     self.string, schema_translate_map
                 )
@@ -902,7 +934,7 @@ def visit_unsupported_compilation(self, element, err, **kw):
         raise exc.UnsupportedCompilationError(self, type(element)) from err
 
     @property
-    def sql_compiler(self):
+    def sql_compiler(self) -> SQLCompiler:
         """Return a Compiled that is capable of processing SQL expressions.
 
         If this compiler is one, it would likely just return 'self'.
@@ -1791,7 +1823,7 @@ def is_subquery(self):
         return len(self.stack) > 1
 
     @property
-    def sql_compiler(self):
+    def sql_compiler(self) -> Self:
         return self
 
     def construct_expanded_state(
@@ -2297,10 +2329,7 @@ def get(lastrowid, parameters):
     @util.memoized_property
     @util.preload_module("sqlalchemy.engine.result")
     def _inserted_primary_key_from_returning_getter(self):
-        if typing.TYPE_CHECKING:
-            from ..engine import result
-        else:
-            result = util.preloaded.engine_result
+        result = util.preloaded.engine_result
 
         assert self.compile_state is not None
         statement = self.compile_state.statement
@@ -2342,7 +2371,7 @@ def get(row, parameters):
 
         return get
 
-    def default_from(self):
+    def default_from(self) -> str:
         """Called when a SELECT statement has no froms, and no FROM clause is
         to be appended.
 
@@ -2734,16 +2763,16 @@ def visit_textual_select(
 
         return text
 
-    def visit_null(self, expr, **kw):
+    def visit_null(self, expr: Null, **kw: Any) -> str:
         return "NULL"
 
-    def visit_true(self, expr, **kw):
+    def visit_true(self, expr: True_, **kw: Any) -> str:
         if self.dialect.supports_native_boolean:
             return "true"
         else:
             return "1"
 
-    def visit_false(self, expr, **kw):
+    def visit_false(self, expr: False_, **kw: Any) -> str:
         if self.dialect.supports_native_boolean:
             return "false"
         else:
@@ -2879,14 +2908,18 @@ def _format_frame_clause(self, range_, **kw):
 
     def visit_over(self, over, **kwargs):
         text = over.element._compiler_dispatch(self, **kwargs)
-        if over.range_:
+        if over.range_ is not None:
             range_ = "RANGE BETWEEN %s" % self._format_frame_clause(
                 over.range_, **kwargs
             )
-        elif over.rows:
+        elif over.rows is not None:
             range_ = "ROWS BETWEEN %s" % self._format_frame_clause(
                 over.rows, **kwargs
             )
+        elif over.groups is not None:
+            range_ = "GROUPS BETWEEN %s" % self._format_frame_clause(
+                over.groups, **kwargs
+            )
         else:
             range_ = None
 
@@ -2985,7 +3018,7 @@ def visit_sequence(self, sequence, **kw):
             % self.dialect.name
         )
 
-    def function_argspec(self, func, **kwargs):
+    def function_argspec(self, func: Function[Any], **kwargs: Any) -> str:
         return func.clause_expr._compiler_dispatch(self, **kwargs)
 
     def visit_compound_select(
@@ -3449,8 +3482,12 @@ def visit_custom_op_unary_modifier(self, element, operator, **kw):
         )
 
     def _generate_generic_binary(
-        self, binary, opstring, eager_grouping=False, **kw
-    ):
+        self,
+        binary: BinaryExpression[Any],
+        opstring: str,
+        eager_grouping: bool = False,
+        **kw: Any,
+    ) -> str:
         _in_operator_expression = kw.get("_in_operator_expression", False)
 
         kw["_in_operator_expression"] = True
@@ -3619,19 +3656,25 @@ def visit_not_between_op_binary(self, binary, operator, **kw):
             **kw,
         )
 
-    def visit_regexp_match_op_binary(self, binary, operator, **kw):
+    def visit_regexp_match_op_binary(
+        self, binary: BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         raise exc.CompileError(
             "%s dialect does not support regular expressions"
             % self.dialect.name
         )
 
-    def visit_not_regexp_match_op_binary(self, binary, operator, **kw):
+    def visit_not_regexp_match_op_binary(
+        self, binary: BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         raise exc.CompileError(
             "%s dialect does not support regular expressions"
             % self.dialect.name
         )
 
-    def visit_regexp_replace_op_binary(self, binary, operator, **kw):
+    def visit_regexp_replace_op_binary(
+        self, binary: BinaryExpression[Any], operator: Any, **kw: Any
+    ) -> str:
         raise exc.CompileError(
             "%s dialect does not support regular expression replacements"
             % self.dialect.name
@@ -3645,8 +3688,19 @@ def visit_bindparam(
         skip_bind_expression=False,
         literal_execute=False,
         render_postcompile=False,
+        is_upsert_set=False,
         **kwargs,
     ):
+        # Detect parametrized bindparams in upsert SET clause for issue #13130
+        if (
+            is_upsert_set
+            and bindparam.value is None
+            and bindparam.callable is None
+            and self._insertmanyvalues is not None
+        ):
+            self._insertmanyvalues = self._insertmanyvalues._replace(
+                has_upsert_bound_parameters=True
+            )
 
         if not skip_bind_expression:
             impl = bindparam.type.dialect_impl(self.dialect)
@@ -3838,7 +3892,9 @@ def render_literal_bindparam(
         else:
             return self.render_literal_value(value, bindparam.type)
 
-    def render_literal_value(self, value, type_):
+    def render_literal_value(
+        self, value: Any, type_: sqltypes.TypeEngine[Any]
+    ) -> str:
         """Render the value of a bind parameter as a quoted literal.
 
         This is used for statement sections that do not accept bind parameters
@@ -4074,15 +4130,28 @@ def visit_cte(
 
                 del self.level_name_by_cte[existing_cte_reference_cte]
             else:
-                # if the two CTEs are deep-copy identical, consider them
-                # the same, **if** they are clones, that is, they came from
-                # the ORM or other visit method
                 if (
-                    cte._is_clone_of is not None
-                    or existing_cte._is_clone_of is not None
-                ) and cte.compare(existing_cte):
+                    # if the two CTEs have the same hash, which we expect
+                    # here means that one/both is an annotated of the other
+                    (hash(cte) == hash(existing_cte))
+                    # or...
+                    or (
+                        (
+                            # if they are clones, i.e. they came from the ORM
+                            # or some other visit method
+                            cte._is_clone_of is not None
+                            or existing_cte._is_clone_of is not None
+                        )
+                        # and are deep-copy identical
+                        and cte.compare(existing_cte)
+                    )
+                ):
+                    # then consider these two CTEs the same
                     is_new_cte = False
                 else:
+                    # otherwise these are two CTEs that either will render
+                    # differently, or were indicated separately by the user,
+                    # with the same name
                     raise exc.CompileError(
                         "Multiple, unrelated CTEs found with "
                         "the same name: %r" % cte_name
@@ -4115,7 +4184,7 @@ def visit_cte(
                 if cte.recursive:
                     self.ctes_recursive = True
                 text = self.preparer.format_alias(cte, cte_name)
-                if cte.recursive:
+                if cte.recursive or cte.element.name_cte_columns:
                     col_source = cte.element
 
                     # TODO: can we get at the .columns_plus_names collection
@@ -4184,7 +4253,7 @@ def visit_cte(
                 if self.preparer._requires_quotes(cte_name):
                     cte_name = self.preparer.quote(cte_name)
                 text += self.get_render_as_alias_suffix(cte_name)
-                return text
+                return text  # type: ignore[no-any-return]
             else:
                 return self.preparer.format_alias(cte, cte_name)
 
@@ -4246,7 +4315,7 @@ def visit_alias(
                 inner = "(%s)" % (inner,)
             return inner
         else:
-            enclosing_alias = kwargs["enclosing_alias"] = alias
+            kwargs["enclosing_alias"] = alias
 
         if asfrom or ashint:
             if isinstance(alias.name, elements._truncated_label):
@@ -4336,7 +4405,13 @@ def _render_values(self, element, **kw):
         )
         return f"VALUES {tuples}"
 
-    def visit_values(self, element, asfrom=False, from_linter=None, **kw):
+    def visit_values(
+        self, element, asfrom=False, from_linter=None, visiting_cte=None, **kw
+    ):
+
+        if element._independent_ctes:
+            self._dispatch_independent_ctes(element, kw)
+
         v = self._render_values(element, **kw)
 
         if element._unnamed:
@@ -4357,7 +4432,12 @@ def visit_values(self, element, asfrom=False, from_linter=None, **kw):
                     name if name is not None else "(unnamed VALUES element)"
                 )
 
-            if name:
+            if visiting_cte is not None and visiting_cte.element is element:
+                if element._is_lateral:
+                    raise exc.CompileError(
+                        "Can't use a LATERAL VALUES expression inside of a CTE"
+                    )
+            elif name:
                 kw["include_table"] = False
                 v = "%s(%s)%s (%s)" % (
                     lateral,
@@ -4541,10 +4621,55 @@ def add_to_result_map(keyname, name, objects, type_):
             elif isinstance(column, elements.TextClause):
                 render_with_label = False
             elif isinstance(column, elements.UnaryExpression):
-                render_with_label = column.wraps_column_expression or asfrom
+                # unary expression.  notes added as of #12681
+                #
+                # By convention, the visit_unary() method
+                # itself does not add an entry to the result map, and relies
+                # upon either the inner expression creating a result map
+                # entry, or if not, by creating a label here that produces
+                # the result map entry.  Where that happens is based on whether
+                # or not the element immediately inside the unary is a
+                # NamedColumn subclass or not.
+                #
+                # Now, this also impacts how the SELECT is written; if
+                # we decide to generate a label here, we get the usual
+                # "~(x+y) AS anon_1" thing in the columns clause.   If we
+                # don't, we don't get an AS at all, we get like
+                # "~table.column".
+                #
+                # But here is the important thing as of modernish (like 1.4)
+                # versions of SQLAlchemy - **whether or not the AS <label>
+                # is present in the statement is not actually important**.
+                # We target result columns **positionally** for a fully
+                # compiled ``Select()`` object; before 1.4 we needed those
+                # labels to match in cursor.description etc etc but now it
+                # really doesn't matter.
+                # So really, we could set render_with_label True in all cases.
+                # Or we could just have visit_unary() populate the result map
+                # in all cases.
+                #
+                # What we're doing here is strictly trying to not rock the
+                # boat too much with when we do/don't render "AS label";
+                # labels being present helps in the edge cases that we
+                # "fall back" to named cursor.description matching, labels
+                # not being present for columns keeps us from having awkward
+                # phrases like "SELECT DISTINCT table.x AS x".
+                render_with_label = (
+                    (
+                        # exception case to detect if we render "not boolean"
+                        # as "not <col>" for native boolean or "<col> = 1"
+                        # for non-native boolean.   this is controlled by
+                        # visit_is_<true|false>_unary_operator
+                        column.operator
+                        in (operators.is_false, operators.is_true)
+                        and not self.dialect.supports_native_boolean
+                    )
+                    or column._wraps_unnamed_column()
+                    or asfrom
+                )
             elif (
                 # general class of expressions that don't have a SQL-column
-                # addressible name.  includes scalar selects, bind parameters,
+                # addressable name.  includes scalar selects, bind parameters,
                 # SQL functions, others
                 not isinstance(column, elements.NamedColumn)
                 # deeper check that indicates there's no natural "name" to
@@ -4599,7 +4724,9 @@ def format_from_hint_text(self, sqltext, table, hint, iscrud):
     def get_select_hint_text(self, byfroms):
         return None
 
-    def get_from_hint_text(self, table, text):
+    def get_from_hint_text(
+        self, table: FromClause, text: Optional[str]
+    ) -> Optional[str]:
         return None
 
     def get_crud_hint_text(self, table, text):
@@ -5084,7 +5211,7 @@ def get_cte_preamble(self, recursive):
         else:
             return "WITH"
 
-    def get_select_precolumns(self, select, **kw):
+    def get_select_precolumns(self, select: Select[Any], **kw: Any) -> str:
         """Called when building a ``SELECT`` statement, position is just
         before column list.
 
@@ -5129,7 +5256,7 @@ def for_update_clause(self, select, **kw):
     def returning_clause(
         self,
         stmt: UpdateBase,
-        returning_cols: Sequence[ColumnElement[Any]],
+        returning_cols: Sequence[_ColumnsClauseElement],
         *,
         populate_result_map: bool,
         **kw: Any,
@@ -5219,6 +5346,7 @@ def visit_table(
         use_schema=True,
         from_linter=None,
         ambiguous_table_name_map=None,
+        enclosing_alias=None,
         **kwargs,
     ):
         if from_linter:
@@ -5237,7 +5365,11 @@ def visit_table(
                 ret = self.preparer.quote(table.name)
 
                 if (
-                    not effective_schema
+                    (
+                        enclosing_alias is None
+                        or enclosing_alias.element is not table
+                    )
+                    and not effective_schema
                     and ambiguous_table_name_map
                     and table.name in ambiguous_table_name_map
                 ):
@@ -5432,11 +5564,32 @@ def _deliver_insertmanyvalues_batches(
         elif not self.dialect.supports_multivalues_insert or (
             sort_by_parameter_order
             and self._result_columns
-            and (imv.sentinel_columns is None or imv.includes_upsert_behaviors)
+            and (
+                imv.sentinel_columns is None
+                or (
+                    imv.includes_upsert_behaviors
+                    and not imv.embed_values_counter
+                )
+            )
         ):
             # deterministic order was requested and the compiler could
             # not organize sentinel columns for this dialect/statement.
-            # use row at a time
+            # use row at a time.  Note: if embed_values_counter is True,
+            # the counter itself provides the ordering capability we need,
+            # so we can use batch mode even with upsert behaviors.
+            use_row_at_a_time = True
+            downgraded = True
+        elif (
+            imv.has_upsert_bound_parameters
+            and not imv.embed_values_counter
+            and self._result_columns
+        ):
+            # For upsert behaviors (ON CONFLICT DO UPDATE, etc.) with RETURNING
+            # and parametrized bindparams in the SET clause, we must use
+            # row-at-a-time. Batching multiple rows in a single statement
+            # doesn't work when the SET clause contains bound parameters that
+            # will receive different values per row, as there's only one SET
+            # clause per statement. See issue #13130.
             use_row_at_a_time = True
             downgraded = True
         else:
@@ -5563,6 +5716,7 @@ def apply_placeholders(keys, formatted):
                 key: parameters[0][key]
                 for key in all_keys.difference(keys_to_replace)
             }
+
             executemany_values_w_comma = ""
         else:
             formatted_values_clause = ""
@@ -5782,7 +5936,7 @@ def visit_insert(
         # likely the least amount of callcounts, though looks clumsy
         if self.positional and visiting_cte is None:
             # if we are inside a CTE, don't count parameters
-            # here since they wont be for insertmanyvalues. keep
+            # here since they won't be for insertmanyvalues. keep
             # visited_bindparam at None so no counting happens.
             # see #9173
             visited_bindparam = []
@@ -5829,7 +5983,7 @@ def visit_insert(
                 self.implicit_returning or insert_stmt._returning
             ) and insert_stmt._sort_by_parameter_order:
                 raise exc.CompileError(
-                    "RETURNING cannot be determinstically sorted when "
+                    "RETURNING cannot be deterministically sorted when "
                     "using an INSERT which includes multi-row values()."
                 )
             crud_params_single = crud_params_struct.single_params
@@ -5968,9 +6122,7 @@ def visit_insert(
                 self._insertmanyvalues = _InsertManyValues(
                     True,
                     self.dialect.default_metavalue_token,
-                    cast(
-                        "List[crud._CrudParamElementStr]", crud_params_single
-                    ),
+                    crud_params_single,
                     counted_bindparam,
                     sort_by_parameter_order=(
                         insert_stmt._sort_by_parameter_order
@@ -5992,100 +6144,123 @@ def visit_insert(
                     for crud_param_set in crud_params_struct.all_multi_params
                 ),
             )
-        else:
-            insert_single_values_expr = ", ".join(
-                [
-                    value
-                    for _, _, value, _ in cast(
-                        "List[crud._CrudParamElementStr]",
-                        crud_params_single,
-                    )
-                ]
-            )
+        elif use_insertmanyvalues:
+            if (
+                implicit_sentinel
+                and (
+                    self.dialect.insertmanyvalues_implicit_sentinel
+                    & InsertmanyvaluesSentinelOpts.USE_INSERT_FROM_SELECT
+                )
+                # this is checking if we have
+                # INSERT INTO table (id) VALUES (DEFAULT).
+                and not (crud_params_struct.is_default_metavalue_only)
+            ):
+                # if we have a sentinel column that is server generated,
+                # then for selected backends render the VALUES list as a
+                # subquery.  This is the orderable form supported by
+                # PostgreSQL and in fewer cases SQL Server
+                embed_sentinel_value = True
+
+                render_bind_casts = (
+                    self.dialect.insertmanyvalues_implicit_sentinel
+                    & InsertmanyvaluesSentinelOpts.RENDER_SELECT_COL_CASTS
+                )
 
-            if use_insertmanyvalues:
-                if (
-                    implicit_sentinel
-                    and (
-                        self.dialect.insertmanyvalues_implicit_sentinel
-                        & InsertmanyvaluesSentinelOpts.USE_INSERT_FROM_SELECT
-                    )
-                    # this is checking if we have
-                    # INSERT INTO table (id) VALUES (DEFAULT).
-                    and not (crud_params_struct.is_default_metavalue_only)
-                ):
-                    # if we have a sentinel column that is server generated,
-                    # then for selected backends render the VALUES list as a
-                    # subquery.  This is the orderable form supported by
-                    # PostgreSQL and SQL Server.
-                    embed_sentinel_value = True
+                add_sentinel_set = add_sentinel_cols or ()
 
-                    render_bind_casts = (
-                        self.dialect.insertmanyvalues_implicit_sentinel
-                        & InsertmanyvaluesSentinelOpts.RENDER_SELECT_COL_CASTS
-                    )
+                insert_single_values_expr = ", ".join(
+                    [
+                        value
+                        for col, _, value, _ in crud_params_single
+                        if col not in add_sentinel_set
+                    ]
+                )
 
-                    colnames = ", ".join(
-                        f"p{i}" for i, _ in enumerate(crud_params_single)
-                    )
+                colnames = ", ".join(
+                    f"p{i}"
+                    for i, cp in enumerate(crud_params_single)
+                    if cp[0] not in add_sentinel_set
+                )
 
-                    if render_bind_casts:
-                        # render casts for the SELECT list.  For PG, we are
-                        # already rendering bind casts in the parameter list,
-                        # selectively for the more "tricky" types like ARRAY.
-                        # however, even for the "easy" types, if the parameter
-                        # is NULL for every entry, PG gives up and says
-                        # "it must be TEXT", which fails for other easy types
-                        # like ints.  So we cast on this side too.
-                        colnames_w_cast = ", ".join(
+                if render_bind_casts:
+                    # render casts for the SELECT list.  For PG, we are
+                    # already rendering bind casts in the parameter list,
+                    # selectively for the more "tricky" types like ARRAY.
+                    # however, even for the "easy" types, if the parameter
+                    # is NULL for every entry, PG gives up and says
+                    # "it must be TEXT", which fails for other easy types
+                    # like ints.  So we cast on this side too.
+                    colnames_w_cast = ", ".join(
+                        (
                             self.render_bind_cast(
                                 col.type,
                                 col.type._unwrapped_dialect_impl(self.dialect),
                                 f"p{i}",
                             )
-                            for i, (col, *_) in enumerate(crud_params_single)
+                            if col not in add_sentinel_set
+                            else expr
+                        )
+                        for i, (col, _, expr, _) in enumerate(
+                            crud_params_single
                         )
-                    else:
-                        colnames_w_cast = colnames
-
-                    text += (
-                        f" SELECT {colnames_w_cast} FROM "
-                        f"(VALUES ({insert_single_values_expr})) "
-                        f"AS imp_sen({colnames}, sen_counter) "
-                        "ORDER BY sen_counter"
                     )
                 else:
-                    # otherwise, if no sentinel or backend doesn't support
-                    # orderable subquery form, use a plain VALUES list
-                    embed_sentinel_value = False
-                    text += f" VALUES ({insert_single_values_expr})"
+                    colnames_w_cast = ", ".join(
+                        (f"p{i}" if col not in add_sentinel_set else expr)
+                        for i, (col, _, expr, _) in enumerate(
+                            crud_params_single
+                        )
+                    )
 
-                self._insertmanyvalues = _InsertManyValues(
-                    is_default_expr=False,
-                    single_values_expr=insert_single_values_expr,
-                    insert_crud_params=cast(
-                        "List[crud._CrudParamElementStr]",
-                        crud_params_single,
-                    ),
-                    num_positional_params_counted=counted_bindparam,
-                    sort_by_parameter_order=(
-                        insert_stmt._sort_by_parameter_order
-                    ),
-                    includes_upsert_behaviors=(
-                        insert_stmt._post_values_clause is not None
-                    ),
-                    sentinel_columns=add_sentinel_cols,
-                    num_sentinel_columns=(
-                        len(add_sentinel_cols) if add_sentinel_cols else 0
-                    ),
-                    sentinel_param_keys=named_sentinel_params,
-                    implicit_sentinel=implicit_sentinel,
-                    embed_values_counter=embed_sentinel_value,
+                insert_crud_params = [
+                    elem
+                    for elem in crud_params_single
+                    if elem[0] not in add_sentinel_set
+                ]
+
+                text += (
+                    f" SELECT {colnames_w_cast} FROM "
+                    f"(VALUES ({insert_single_values_expr})) "
+                    f"AS imp_sen({colnames}, sen_counter) "
+                    "ORDER BY sen_counter"
                 )
 
             else:
+                # otherwise, if no sentinel or backend doesn't support
+                # orderable subquery form, use a plain VALUES list
+                embed_sentinel_value = False
+                insert_crud_params = crud_params_single
+                insert_single_values_expr = ", ".join(
+                    [value for _, _, value, _ in crud_params_single]
+                )
+
                 text += f" VALUES ({insert_single_values_expr})"
 
+            self._insertmanyvalues = _InsertManyValues(
+                is_default_expr=False,
+                single_values_expr=insert_single_values_expr,
+                insert_crud_params=insert_crud_params,
+                num_positional_params_counted=counted_bindparam,
+                sort_by_parameter_order=(insert_stmt._sort_by_parameter_order),
+                includes_upsert_behaviors=(
+                    insert_stmt._post_values_clause is not None
+                ),
+                sentinel_columns=add_sentinel_cols,
+                num_sentinel_columns=(
+                    len(add_sentinel_cols) if add_sentinel_cols else 0
+                ),
+                sentinel_param_keys=named_sentinel_params,
+                implicit_sentinel=implicit_sentinel,
+                embed_values_counter=embed_sentinel_value,
+            )
+
+        else:
+            insert_single_values_expr = ", ".join(
+                [value for _, _, value, _ in crud_params_single]
+            )
+
+            text += f" VALUES ({insert_single_values_expr})"
+
         if insert_stmt._post_values_clause is not None:
             post_values_clause = self.process(
                 insert_stmt._post_values_clause, **kw
@@ -6142,11 +6317,18 @@ def update_from_clause(
             "criteria within UPDATE"
         )
 
-    def visit_update(self, update_stmt, visiting_cte=None, **kw):
+    def visit_update(
+        self,
+        update_stmt: Update,
+        visiting_cte: Optional[CTE] = None,
+        **kw: Any,
+    ) -> str:
         compile_state = update_stmt._compile_state_factory(
             update_stmt, self, **kw
         )
-        update_stmt = compile_state.statement
+        if TYPE_CHECKING:
+            assert isinstance(compile_state, UpdateDMLState)
+        update_stmt = compile_state.statement  # type: ignore[assignment]
 
         if visiting_cte is not None:
             kw["visiting_cte"] = visiting_cte
@@ -6281,10 +6463,10 @@ def visit_update(self, update_stmt, visiting_cte=None, **kw):
 
         self.stack.pop(-1)
 
-        return text
+        return text  # type: ignore[no-any-return]
 
     def delete_extra_from_clause(
-        self, update_stmt, from_table, extra_froms, from_hints, **kw
+        self, delete_stmt, from_table, extra_froms, from_hints, **kw
     ):
         """Provide a hook to override the generation of an
         DELETE..FROM clause.
@@ -6506,7 +6688,7 @@ def visit_sequence(self, sequence, **kw):
     def returning_clause(
         self,
         stmt: UpdateBase,
-        returning_cols: Sequence[ColumnElement[Any]],
+        returning_cols: Sequence[_ColumnsClauseElement],
         *,
         populate_result_map: bool,
         **kw: Any,
@@ -6527,7 +6709,7 @@ def update_from_clause(
         )
 
     def delete_extra_from_clause(
-        self, update_stmt, from_table, extra_froms, from_hints, **kw
+        self, delete_stmt, from_table, extra_froms, from_hints, **kw
     ):
         kw["asfrom"] = True
         return ", " + ", ".join(
@@ -6574,8 +6756,8 @@ def __init__(
             compile_kwargs: Mapping[str, Any] = ...,
         ): ...
 
-    @util.memoized_property
-    def sql_compiler(self):
+    @util.ro_memoized_property
+    def sql_compiler(self) -> SQLCompiler:
         return self.dialect.statement_compiler(
             self.dialect, None, schema_translate_map=self.schema_translate_map
         )
@@ -6739,7 +6921,7 @@ def visit_drop_table(self, drop, **kw):
     def visit_drop_view(self, drop, **kw):
         return "\nDROP VIEW " + self.preparer.format_table(drop.element)
 
-    def _verify_index_table(self, index):
+    def _verify_index_table(self, index: Index) -> None:
         if index.table is None:
             raise exc.CompileError(
                 "Index '%s' is not associated with any table." % index.name
@@ -6790,7 +6972,9 @@ def visit_drop_index(self, drop, **kw):
 
         return text + self._prepared_index_name(index, include_schema=True)
 
-    def _prepared_index_name(self, index, include_schema=False):
+    def _prepared_index_name(
+        self, index: Index, include_schema: bool = False
+    ) -> str:
         if index.table is not None:
             effective_schema = self.preparer.schema_for_object(index.table)
         else:
@@ -6800,7 +6984,7 @@ def _prepared_index_name(self, index, include_schema=False):
         else:
             schema_name = None
 
-        index_name = self.preparer.format_index(index)
+        index_name: str = self.preparer.format_index(index)
 
         if schema_name:
             index_name = schema_name + "." + index_name
@@ -6846,7 +7030,7 @@ def visit_set_constraint_comment(self, create, **kw):
     def visit_drop_constraint_comment(self, drop, **kw):
         raise exc.UnsupportedCompilationError(self, type(drop))
 
-    def get_identity_options(self, identity_options):
+    def get_identity_options(self, identity_options: IdentityOptions) -> str:
         text = []
         if identity_options.increment is not None:
             text.append("INCREMENT BY %d" % identity_options.increment)
@@ -6937,13 +7121,13 @@ def create_table_suffix(self, table):
     def post_create_table(self, table):
         return ""
 
-    def get_column_default_string(self, column):
+    def get_column_default_string(self, column: Column[Any]) -> Optional[str]:
         if isinstance(column.server_default, schema.DefaultClause):
             return self.render_default_string(column.server_default.arg)
         else:
             return None
 
-    def render_default_string(self, default):
+    def render_default_string(self, default: Union[Visitable, str]) -> str:
         if isinstance(default, str):
             return self.sql_compiler.render_literal_value(
                 default, sqltypes.STRINGTYPE
@@ -6958,37 +7142,66 @@ def visit_table_or_column_check_constraint(self, constraint, **kw):
             return self.visit_check_constraint(constraint)
 
     def visit_check_constraint(self, constraint, **kw):
-        text = ""
-        if constraint.name is not None:
-            formatted_name = self.preparer.format_constraint(constraint)
-            if formatted_name is not None:
-                text += "CONSTRAINT %s " % formatted_name
-        text += "CHECK (%s)" % self.sql_compiler.process(
-            constraint.sqltext, include_table=False, literal_binds=True
-        )
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_check_body(constraint, **kw)
         text += self.define_constraint_deferrability(constraint)
         return text
 
     def visit_column_check_constraint(self, constraint, **kw):
-        text = ""
-        if constraint.name is not None:
-            formatted_name = self.preparer.format_constraint(constraint)
-            if formatted_name is not None:
-                text += "CONSTRAINT %s " % formatted_name
-        text += "CHECK (%s)" % self.sql_compiler.process(
-            constraint.sqltext, include_table=False, literal_binds=True
-        )
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_check_body(constraint, **kw)
         text += self.define_constraint_deferrability(constraint)
         return text
 
-    def visit_primary_key_constraint(self, constraint, **kw):
+    def visit_primary_key_constraint(
+        self, constraint: PrimaryKeyConstraint, **kw: Any
+    ) -> str:
         if len(constraint) == 0:
             return ""
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_primary_key_body(constraint, **kw)
+        text += self.define_constraint_deferrability(constraint)
+        return text
+
+    def visit_foreign_key_constraint(
+        self, constraint: ForeignKeyConstraint, **kw: Any
+    ) -> str:
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_foreign_key_body(constraint, **kw)
+        text += self.define_constraint_match(constraint)
+        text += self.define_constraint_cascades(constraint)
+        text += self.define_constraint_deferrability(constraint)
+        return text
+
+    def define_constraint_remote_table(self, constraint, table, preparer):
+        """Format the remote table clause of a CREATE CONSTRAINT clause."""
+
+        return preparer.format_table(table)
+
+    def visit_unique_constraint(
+        self, constraint: UniqueConstraint, **kw: Any
+    ) -> str:
+        if len(constraint) == 0:
+            return ""
+        text = self.define_constraint_preamble(constraint, **kw)
+        text += self.define_unique_body(constraint, **kw)
+        text += self.define_constraint_deferrability(constraint)
+        return text
+
+    def define_constraint_preamble(
+        self, constraint: Constraint, **kw: Any
+    ) -> str:
         text = ""
         if constraint.name is not None:
             formatted_name = self.preparer.format_constraint(constraint)
             if formatted_name is not None:
                 text += "CONSTRAINT %s " % formatted_name
+        return text
+
+    def define_primary_key_body(
+        self, constraint: PrimaryKeyConstraint, **kw: Any
+    ) -> str:
+        text = ""
         text += "PRIMARY KEY "
         text += "(%s)" % ", ".join(
             self.preparer.quote(c.name)
@@ -6998,18 +7211,14 @@ def visit_primary_key_constraint(self, constraint, **kw):
                 else constraint.columns
             )
         )
-        text += self.define_constraint_deferrability(constraint)
         return text
 
-    def visit_foreign_key_constraint(self, constraint, **kw):
+    def define_foreign_key_body(
+        self, constraint: ForeignKeyConstraint, **kw: Any
+    ) -> str:
         preparer = self.preparer
-        text = ""
-        if constraint.name is not None:
-            formatted_name = self.preparer.format_constraint(constraint)
-            if formatted_name is not None:
-                text += "CONSTRAINT %s " % formatted_name
         remote_table = list(constraint.elements)[0].column.table
-        text += "FOREIGN KEY(%s) REFERENCES %s (%s)" % (
+        text = "FOREIGN KEY(%s) REFERENCES %s (%s)" % (
             ", ".join(
                 preparer.quote(f.parent.name) for f in constraint.elements
             ),
@@ -7020,47 +7229,54 @@ def visit_foreign_key_constraint(self, constraint, **kw):
                 preparer.quote(f.column.name) for f in constraint.elements
             ),
         )
-        text += self.define_constraint_match(constraint)
-        text += self.define_constraint_cascades(constraint)
-        text += self.define_constraint_deferrability(constraint)
         return text
 
-    def define_constraint_remote_table(self, constraint, table, preparer):
-        """Format the remote table clause of a CREATE CONSTRAINT clause."""
-
-        return preparer.format_table(table)
-
-    def visit_unique_constraint(self, constraint, **kw):
-        if len(constraint) == 0:
-            return ""
-        text = ""
-        if constraint.name is not None:
-            formatted_name = self.preparer.format_constraint(constraint)
-            if formatted_name is not None:
-                text += "CONSTRAINT %s " % formatted_name
-        text += "UNIQUE %s(%s)" % (
+    def define_unique_body(
+        self, constraint: UniqueConstraint, **kw: Any
+    ) -> str:
+        text = "UNIQUE %s(%s)" % (
             self.define_unique_constraint_distinct(constraint, **kw),
             ", ".join(self.preparer.quote(c.name) for c in constraint),
         )
-        text += self.define_constraint_deferrability(constraint)
         return text
 
-    def define_unique_constraint_distinct(self, constraint, **kw):
+    def define_check_body(self, constraint: CheckConstraint, **kw: Any) -> str:
+        text = "CHECK (%s)" % self.sql_compiler.process(
+            constraint.sqltext, include_table=False, literal_binds=True
+        )
+        return text
+
+    def define_unique_constraint_distinct(
+        self, constraint: UniqueConstraint, **kw: Any
+    ) -> str:
         return ""
 
-    def define_constraint_cascades(self, constraint):
+    def define_constraint_cascades(
+        self, constraint: ForeignKeyConstraint
+    ) -> str:
         text = ""
         if constraint.ondelete is not None:
-            text += " ON DELETE %s" % self.preparer.validate_sql_phrase(
-                constraint.ondelete, FK_ON_DELETE
-            )
+            text += self.define_constraint_ondelete_cascade(constraint)
+
         if constraint.onupdate is not None:
-            text += " ON UPDATE %s" % self.preparer.validate_sql_phrase(
-                constraint.onupdate, FK_ON_UPDATE
-            )
+            text += self.define_constraint_onupdate_cascade(constraint)
         return text
 
-    def define_constraint_deferrability(self, constraint):
+    def define_constraint_ondelete_cascade(
+        self, constraint: ForeignKeyConstraint
+    ) -> str:
+        return " ON DELETE %s" % self.preparer.validate_sql_phrase(
+            constraint.ondelete, FK_ON_DELETE
+        )
+
+    def define_constraint_onupdate_cascade(
+        self, constraint: ForeignKeyConstraint
+    ) -> str:
+        return " ON UPDATE %s" % self.preparer.validate_sql_phrase(
+            constraint.onupdate, FK_ON_UPDATE
+        )
+
+    def define_constraint_deferrability(self, constraint: Constraint) -> str:
         text = ""
         if constraint.deferrable is not None:
             if constraint.deferrable:
@@ -7073,7 +7289,7 @@ def define_constraint_deferrability(self, constraint):
             )
         return text
 
-    def define_constraint_match(self, constraint):
+    def define_constraint_match(self, constraint: ForeignKeyConstraint) -> str:
         text = ""
         if constraint.match is not None:
             text += " MATCH %s" % constraint.match
@@ -7100,19 +7316,21 @@ def visit_identity_column(self, identity, **kw):
 
 
 class GenericTypeCompiler(TypeCompiler):
-    def visit_FLOAT(self, type_, **kw):
+    def visit_FLOAT(self, type_: sqltypes.Float[Any], **kw: Any) -> str:
         return "FLOAT"
 
-    def visit_DOUBLE(self, type_, **kw):
+    def visit_DOUBLE(self, type_: sqltypes.Double[Any], **kw: Any) -> str:
         return "DOUBLE"
 
-    def visit_DOUBLE_PRECISION(self, type_, **kw):
+    def visit_DOUBLE_PRECISION(
+        self, type_: sqltypes.DOUBLE_PRECISION[Any], **kw: Any
+    ) -> str:
         return "DOUBLE PRECISION"
 
-    def visit_REAL(self, type_, **kw):
+    def visit_REAL(self, type_: sqltypes.REAL[Any], **kw: Any) -> str:
         return "REAL"
 
-    def visit_NUMERIC(self, type_, **kw):
+    def visit_NUMERIC(self, type_: sqltypes.Numeric[Any], **kw: Any) -> str:
         if type_.precision is None:
             return "NUMERIC"
         elif type_.scale is None:
@@ -7123,7 +7341,7 @@ def visit_NUMERIC(self, type_, **kw):
                 "scale": type_.scale,
             }
 
-    def visit_DECIMAL(self, type_, **kw):
+    def visit_DECIMAL(self, type_: sqltypes.DECIMAL[Any], **kw: Any) -> str:
         if type_.precision is None:
             return "DECIMAL"
         elif type_.scale is None:
@@ -7134,128 +7352,138 @@ def visit_DECIMAL(self, type_, **kw):
                 "scale": type_.scale,
             }
 
-    def visit_INTEGER(self, type_, **kw):
+    def visit_INTEGER(self, type_: sqltypes.Integer, **kw: Any) -> str:
         return "INTEGER"
 
-    def visit_SMALLINT(self, type_, **kw):
+    def visit_SMALLINT(self, type_: sqltypes.SmallInteger, **kw: Any) -> str:
         return "SMALLINT"
 
-    def visit_BIGINT(self, type_, **kw):
+    def visit_BIGINT(self, type_: sqltypes.BigInteger, **kw: Any) -> str:
         return "BIGINT"
 
-    def visit_TIMESTAMP(self, type_, **kw):
+    def visit_TIMESTAMP(self, type_: sqltypes.TIMESTAMP, **kw: Any) -> str:
         return "TIMESTAMP"
 
-    def visit_DATETIME(self, type_, **kw):
+    def visit_DATETIME(self, type_: sqltypes.DateTime, **kw: Any) -> str:
         return "DATETIME"
 
-    def visit_DATE(self, type_, **kw):
+    def visit_DATE(self, type_: sqltypes.Date, **kw: Any) -> str:
         return "DATE"
 
-    def visit_TIME(self, type_, **kw):
+    def visit_TIME(self, type_: sqltypes.Time, **kw: Any) -> str:
         return "TIME"
 
-    def visit_CLOB(self, type_, **kw):
+    def visit_CLOB(self, type_: sqltypes.CLOB, **kw: Any) -> str:
         return "CLOB"
 
-    def visit_NCLOB(self, type_, **kw):
+    def visit_NCLOB(self, type_: sqltypes.Text, **kw: Any) -> str:
         return "NCLOB"
 
-    def _render_string_type(self, type_, name, length_override=None):
+    def _render_string_type(
+        self, name: str, length: Optional[int], collation: Optional[str]
+    ) -> str:
         text = name
-        if length_override:
-            text += "(%d)" % length_override
-        elif type_.length:
-            text += "(%d)" % type_.length
-        if type_.collation:
-            text += ' COLLATE "%s"' % type_.collation
+        if length:
+            text += f"({length})"
+        if collation:
+            text += f' COLLATE "{collation}"'
         return text
 
-    def visit_CHAR(self, type_, **kw):
-        return self._render_string_type(type_, "CHAR")
+    def visit_CHAR(self, type_: sqltypes.CHAR, **kw: Any) -> str:
+        return self._render_string_type("CHAR", type_.length, type_.collation)
 
-    def visit_NCHAR(self, type_, **kw):
-        return self._render_string_type(type_, "NCHAR")
+    def visit_NCHAR(self, type_: sqltypes.NCHAR, **kw: Any) -> str:
+        return self._render_string_type("NCHAR", type_.length, type_.collation)
 
-    def visit_VARCHAR(self, type_, **kw):
-        return self._render_string_type(type_, "VARCHAR")
+    def visit_VARCHAR(self, type_: sqltypes.String, **kw: Any) -> str:
+        return self._render_string_type(
+            "VARCHAR", type_.length, type_.collation
+        )
 
-    def visit_NVARCHAR(self, type_, **kw):
-        return self._render_string_type(type_, "NVARCHAR")
+    def visit_NVARCHAR(self, type_: sqltypes.NVARCHAR, **kw: Any) -> str:
+        return self._render_string_type(
+            "NVARCHAR", type_.length, type_.collation
+        )
 
-    def visit_TEXT(self, type_, **kw):
-        return self._render_string_type(type_, "TEXT")
+    def visit_TEXT(self, type_: sqltypes.Text, **kw: Any) -> str:
+        return self._render_string_type("TEXT", type_.length, type_.collation)
 
-    def visit_UUID(self, type_, **kw):
+    def visit_UUID(self, type_: sqltypes.Uuid[Any], **kw: Any) -> str:
         return "UUID"
 
-    def visit_BLOB(self, type_, **kw):
+    def visit_BLOB(self, type_: sqltypes.LargeBinary, **kw: Any) -> str:
         return "BLOB"
 
-    def visit_BINARY(self, type_, **kw):
+    def visit_BINARY(self, type_: sqltypes.BINARY, **kw: Any) -> str:
         return "BINARY" + (type_.length and "(%d)" % type_.length or "")
 
-    def visit_VARBINARY(self, type_, **kw):
+    def visit_VARBINARY(self, type_: sqltypes.VARBINARY, **kw: Any) -> str:
         return "VARBINARY" + (type_.length and "(%d)" % type_.length or "")
 
-    def visit_BOOLEAN(self, type_, **kw):
+    def visit_BOOLEAN(self, type_: sqltypes.Boolean, **kw: Any) -> str:
         return "BOOLEAN"
 
-    def visit_uuid(self, type_, **kw):
+    def visit_uuid(self, type_: sqltypes.Uuid[Any], **kw: Any) -> str:
         if not type_.native_uuid or not self.dialect.supports_native_uuid:
-            return self._render_string_type(type_, "CHAR", length_override=32)
+            return self._render_string_type("CHAR", length=32, collation=None)
         else:
             return self.visit_UUID(type_, **kw)
 
-    def visit_large_binary(self, type_, **kw):
+    def visit_large_binary(
+        self, type_: sqltypes.LargeBinary, **kw: Any
+    ) -> str:
         return self.visit_BLOB(type_, **kw)
 
-    def visit_boolean(self, type_, **kw):
+    def visit_boolean(self, type_: sqltypes.Boolean, **kw: Any) -> str:
         return self.visit_BOOLEAN(type_, **kw)
 
-    def visit_time(self, type_, **kw):
+    def visit_time(self, type_: sqltypes.Time, **kw: Any) -> str:
         return self.visit_TIME(type_, **kw)
 
-    def visit_datetime(self, type_, **kw):
+    def visit_datetime(self, type_: sqltypes.DateTime, **kw: Any) -> str:
         return self.visit_DATETIME(type_, **kw)
 
-    def visit_date(self, type_, **kw):
+    def visit_date(self, type_: sqltypes.Date, **kw: Any) -> str:
         return self.visit_DATE(type_, **kw)
 
-    def visit_big_integer(self, type_, **kw):
+    def visit_big_integer(self, type_: sqltypes.BigInteger, **kw: Any) -> str:
         return self.visit_BIGINT(type_, **kw)
 
-    def visit_small_integer(self, type_, **kw):
+    def visit_small_integer(
+        self, type_: sqltypes.SmallInteger, **kw: Any
+    ) -> str:
         return self.visit_SMALLINT(type_, **kw)
 
-    def visit_integer(self, type_, **kw):
+    def visit_integer(self, type_: sqltypes.Integer, **kw: Any) -> str:
         return self.visit_INTEGER(type_, **kw)
 
-    def visit_real(self, type_, **kw):
+    def visit_real(self, type_: sqltypes.REAL[Any], **kw: Any) -> str:
         return self.visit_REAL(type_, **kw)
 
-    def visit_float(self, type_, **kw):
+    def visit_float(self, type_: sqltypes.Float[Any], **kw: Any) -> str:
         return self.visit_FLOAT(type_, **kw)
 
-    def visit_double(self, type_, **kw):
+    def visit_double(self, type_: sqltypes.Double[Any], **kw: Any) -> str:
         return self.visit_DOUBLE(type_, **kw)
 
-    def visit_numeric(self, type_, **kw):
+    def visit_numeric(self, type_: sqltypes.Numeric[Any], **kw: Any) -> str:
         return self.visit_NUMERIC(type_, **kw)
 
-    def visit_string(self, type_, **kw):
+    def visit_string(self, type_: sqltypes.String, **kw: Any) -> str:
         return self.visit_VARCHAR(type_, **kw)
 
-    def visit_unicode(self, type_, **kw):
+    def visit_unicode(self, type_: sqltypes.Unicode, **kw: Any) -> str:
         return self.visit_VARCHAR(type_, **kw)
 
-    def visit_text(self, type_, **kw):
+    def visit_text(self, type_: sqltypes.Text, **kw: Any) -> str:
         return self.visit_TEXT(type_, **kw)
 
-    def visit_unicode_text(self, type_, **kw):
+    def visit_unicode_text(
+        self, type_: sqltypes.UnicodeText, **kw: Any
+    ) -> str:
         return self.visit_TEXT(type_, **kw)
 
-    def visit_enum(self, type_, **kw):
+    def visit_enum(self, type_: sqltypes.Enum, **kw: Any) -> str:
         return self.visit_VARCHAR(type_, **kw)
 
     def visit_null(self, type_, **kw):
@@ -7265,10 +7493,14 @@ def visit_null(self, type_, **kw):
             "type on this Column?" % type_
         )
 
-    def visit_type_decorator(self, type_, **kw):
+    def visit_type_decorator(
+        self, type_: TypeDecorator[Any], **kw: Any
+    ) -> str:
         return self.process(type_.type_engine(self.dialect), **kw)
 
-    def visit_user_defined(self, type_, **kw):
+    def visit_user_defined(
+        self, type_: UserDefinedType[Any], **kw: Any
+    ) -> str:
         return type_.get_col_spec(**kw)
 
 
@@ -7343,12 +7575,12 @@ class IdentifierPreparer:
 
     def __init__(
         self,
-        dialect,
-        initial_quote='"',
-        final_quote=None,
-        escape_quote='"',
-        quote_case_sensitive_collations=True,
-        omit_schema=False,
+        dialect: Dialect,
+        initial_quote: str = '"',
+        final_quote: Optional[str] = None,
+        escape_quote: str = '"',
+        quote_case_sensitive_collations: bool = True,
+        omit_schema: bool = False,
     ):
         """Construct a new ``IdentifierPreparer`` object.
 
@@ -7401,7 +7633,9 @@ def symbol_getter(obj):
         prep._includes_none_schema_translate = includes_none
         return prep
 
-    def _render_schema_translates(self, statement, schema_translate_map):
+    def _render_schema_translates(
+        self, statement: str, schema_translate_map: SchemaTranslateMapType
+    ) -> str:
         d = schema_translate_map
         if None in d:
             if not self._includes_none_schema_translate:
@@ -7413,7 +7647,7 @@ def _render_schema_translates(self, statement, schema_translate_map):
                     "schema_translate_map dictionaries."
                 )
 
-            d["_none"] = d[None]
+            d["_none"] = d[None]  # type: ignore[index]
 
         def replace(m):
             name = m.group(2)
@@ -7606,7 +7840,9 @@ def format_collation(self, collation_name):
         else:
             return collation_name
 
-    def format_sequence(self, sequence, use_schema=True):
+    def format_sequence(
+        self, sequence: schema.Sequence, use_schema: bool = True
+    ) -> str:
         name = self.quote(sequence.name)
 
         effective_schema = self.schema_for_object(sequence)
@@ -7643,7 +7879,9 @@ def format_savepoint(self, savepoint, name=None):
         return ident
 
     @util.preload_module("sqlalchemy.sql.naming")
-    def format_constraint(self, constraint, _alembic_quote=True):
+    def format_constraint(
+        self, constraint: Union[Constraint, Index], _alembic_quote: bool = True
+    ) -> Optional[str]:
         naming = util.preloaded.sql_naming
 
         if constraint.name is _NONE_NAME:
@@ -7656,6 +7894,7 @@ def format_constraint(self, constraint, _alembic_quote=True):
         else:
             name = constraint.name
 
+        assert name is not None
         if constraint.__visit_name__ == "index":
             return self.truncate_and_render_index_name(
                 name, _alembic_quote=_alembic_quote
@@ -7665,7 +7904,9 @@ def format_constraint(self, constraint, _alembic_quote=True):
                 name, _alembic_quote=_alembic_quote
             )
 
-    def truncate_and_render_index_name(self, name, _alembic_quote=True):
+    def truncate_and_render_index_name(
+        self, name: str, _alembic_quote: bool = True
+    ) -> str:
         # calculate these at format time so that ad-hoc changes
         # to dialect.max_identifier_length etc. can be reflected
         # as IdentifierPreparer is long lived
@@ -7677,7 +7918,9 @@ def truncate_and_render_index_name(self, name, _alembic_quote=True):
             name, max_, _alembic_quote
         )
 
-    def truncate_and_render_constraint_name(self, name, _alembic_quote=True):
+    def truncate_and_render_constraint_name(
+        self, name: str, _alembic_quote: bool = True
+    ) -> str:
         # calculate these at format time so that ad-hoc changes
         # to dialect.max_identifier_length etc. can be reflected
         # as IdentifierPreparer is long lived
@@ -7689,7 +7932,9 @@ def truncate_and_render_constraint_name(self, name, _alembic_quote=True):
             name, max_, _alembic_quote
         )
 
-    def _truncate_and_render_maxlen_name(self, name, max_, _alembic_quote):
+    def _truncate_and_render_maxlen_name(
+        self, name: str, max_: int, _alembic_quote: bool
+    ) -> str:
         if isinstance(name, elements._truncated_label):
             if len(name) > max_:
                 name = name[0 : max_ - 8] + "_" + util.md5_hex(name)[-4:]
@@ -7701,13 +7946,21 @@ def _truncate_and_render_maxlen_name(self, name, max_, _alembic_quote):
         else:
             return self.quote(name)
 
-    def format_index(self, index):
-        return self.format_constraint(index)
+    def format_index(self, index: Index) -> str:
+        name = self.format_constraint(index)
+        assert name is not None
+        return name
 
-    def format_table(self, table, use_schema=True, name=None):
+    def format_table(
+        self,
+        table: FromClause,
+        use_schema: bool = True,
+        name: Optional[str] = None,
+    ) -> str:
         """Prepare a quoted table and schema name."""
-
         if name is None:
+            if TYPE_CHECKING:
+                assert isinstance(table, NamedFromClause)
             name = table.name
 
         result = self.quote(name)
@@ -7739,17 +7992,18 @@ def format_label_name(
 
     def format_column(
         self,
-        column,
-        use_table=False,
-        name=None,
-        table_name=None,
-        use_schema=False,
-        anon_map=None,
-    ):
+        column: ColumnElement[Any],
+        use_table: bool = False,
+        name: Optional[str] = None,
+        table_name: Optional[str] = None,
+        use_schema: bool = False,
+        anon_map: Optional[Mapping[str, Any]] = None,
+    ) -> str:
         """Prepare a quoted column name."""
 
         if name is None:
             name = column.name
+            assert name is not None
 
         if anon_map is not None and isinstance(
             name, elements._truncated_label
@@ -7817,7 +8071,7 @@ def _r_identifiers(self):
         )
         return r
 
-    def unformat_identifiers(self, identifiers):
+    def unformat_identifiers(self, identifiers: str) -> Sequence[str]:
         """Unpack 'schema.table.column'-like strings into components."""
 
         r = self._r_identifiers
diff --git a/libs/sqlalchemy/sql/crud.py b/libs/sqlalchemy/sql/crud.py
index 19af40ff08..d37274c8e0 100644
--- a/libs/sqlalchemy/sql/crud.py
+++ b/libs/sqlalchemy/sql/crud.py
@@ -1,5 +1,5 @@
 # sql/crud.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -104,7 +104,7 @@ def _as_dml_column(c: ColumnElement[Any]) -> ColumnClause[Any]:
 
 
 class _CrudParams(NamedTuple):
-    single_params: _CrudParamSequence
+    single_params: List[_CrudParamElementStr]
     all_multi_params: List[Sequence[_CrudParamElementStr]]
     is_default_metavalue_only: bool = False
     use_insertmanyvalues: bool = False
@@ -241,7 +241,7 @@ def _get_crud_params(
         stmt_parameter_tuples = list(spd.items())
         spd_str_key = {_column_as_key(key) for key in spd}
     else:
-        stmt_parameter_tuples = spd = spd_str_key = None
+        stmt_parameter_tuples = spd_str_key = None
 
     # if we have statement parameters - set defaults in the
     # compiled params
@@ -260,7 +260,7 @@ def _get_crud_params(
         }
 
     # create a list of column assignment clauses as tuples
-    values: List[_CrudParamElement] = []
+    values: List[_CrudParamElementStr] = []
 
     if stmt_parameter_tuples is not None:
         _get_stmt_parameter_tuples_params(
@@ -332,6 +332,52 @@ def _get_crud_params(
             .difference(check_columns)
         )
         if check:
+
+            if dml.isupdate(compile_state):
+                tables_mentioned = set(
+                    c.table
+                    for c, v in stmt_parameter_tuples
+                    if isinstance(c, ColumnClause) and c.table is not None
+                ).difference([compile_state.dml_table])
+
+                multi_not_in_from = tables_mentioned.difference(
+                    compile_state._extra_froms
+                )
+
+                if tables_mentioned and (
+                    not compile_state.is_multitable
+                    or not compiler.render_table_with_column_in_update_from
+                ):
+                    if not compiler.render_table_with_column_in_update_from:
+                        preamble = (
+                            "Backend does not support additional "
+                            "tables in the SET clause"
+                        )
+                    else:
+                        preamble = (
+                            "Statement is not a multi-table UPDATE statement"
+                        )
+
+                    raise exc.CompileError(
+                        f"{preamble}; cannot "
+                        f"""include columns from table(s) {
+                            ", ".join(f"'{t.description}'"
+                                      for t in tables_mentioned)
+                        } in SET clause"""
+                    )
+
+                elif multi_not_in_from:
+                    assert compiler.render_table_with_column_in_update_from
+                    raise exc.CompileError(
+                        f"Multi-table UPDATE statement does not include "
+                        "table(s) "
+                        f"""{
+                            ", ".join(
+                                f"'{t.description}'" for
+                                t in multi_not_in_from)
+                        }"""
+                    )
+
             raise exc.CompileError(
                 "Unconsumed column names: %s"
                 % (", ".join("%s" % (c,) for c in check))
@@ -393,6 +439,7 @@ def _create_bind_param(
     process: Literal[True] = ...,
     required: bool = False,
     name: Optional[str] = None,
+    force_anonymous: bool = False,
     **kw: Any,
 ) -> str: ...
 
@@ -413,10 +460,14 @@ def _create_bind_param(
     process: bool = True,
     required: bool = False,
     name: Optional[str] = None,
+    force_anonymous: bool = False,
     **kw: Any,
 ) -> Union[str, elements.BindParameter[Any]]:
-    if name is None:
+    if force_anonymous:
+        name = None
+    elif name is None:
         name = col.key
+
     bindparam = elements.BindParameter(
         name, value, type_=col.type, required=required
     )
@@ -486,7 +537,7 @@ def _key_getters_for_crud_column(
         )
 
         def _column_as_key(
-            key: Union[ColumnClause[Any], str]
+            key: Union[ColumnClause[Any], str],
         ) -> Union[str, Tuple[str, str]]:
             str_key = c_key_role(key)
             if hasattr(key, "table") and key.table in _et:
@@ -832,6 +883,7 @@ def _append_param_parameter(
 ):
     value = parameters.pop(col_key)
 
+    has_visiting_cte = kw.get("visiting_cte") is not None
     col_value = compiler.preparer.format_column(
         c, use_table=compile_state.include_table_with_column_exprs
     )
@@ -864,6 +916,7 @@ def _append_param_parameter(
                 else "%s_m0" % _col_bind_name(c)
             ),
             accumulate_bind_names=accumulated_bind_names,
+            force_anonymous=has_visiting_cte,
             **kw,
         )
     elif value._is_bind_parameter:
@@ -1362,9 +1415,28 @@ def _get_update_multitable_params(
 
     affected_tables = set()
     for t in compile_state._extra_froms:
+        # extra gymnastics to support the probably-shouldnt-have-supported
+        # case of "UPDATE table AS alias SET table.foo = bar", but it's
+        # supported
+        we_shouldnt_be_here_if_columns_found = (
+            not include_table
+            and not compile_state.dml_table.is_derived_from(t)
+        )
+
         for c in t.c:
             if c in normalized_params:
+
+                if we_shouldnt_be_here_if_columns_found:
+                    raise exc.CompileError(
+                        "Backend does not support additional tables "
+                        "in the SET "
+                        "clause; cannot include columns from table(s) "
+                        f"'{t.description}' in "
+                        "SET clause"
+                    )
+
                 affected_tables.add(t)
+
                 check_columns[_getattr_col_key(c)] = c
                 value = normalized_params[c]
 
@@ -1390,6 +1462,7 @@ def _get_update_multitable_params(
                     value = compiler.process(value.self_group(), **kw)
                     accumulated_bind_names = ()
                 values.append((c, col_value, value, accumulated_bind_names))
+
     # determine tables which are actually to be updated - process onupdate
     # and server_onupdate for these
     for t in affected_tables:
@@ -1435,6 +1508,7 @@ def _extend_values_for_multiparams(
     values_0 = initial_values
     values = [initial_values]
 
+    has_visiting_cte = kw.get("visiting_cte") is not None
     mp = compile_state._multi_parameters
     assert mp is not None
     for i, row in enumerate(mp[1:]):
@@ -1451,7 +1525,8 @@ def _extend_values_for_multiparams(
                         compiler,
                         col,
                         row[key],
-                        name="%s_m%d" % (col.key, i + 1),
+                        name=("%s_m%d" % (col.key, i + 1)),
+                        force_anonymous=has_visiting_cte,
                         **kw,
                     )
                 else:
@@ -1547,7 +1622,7 @@ def _get_returning_modifiers(compiler, stmt, compile_state, toplevel):
     implicit_returning = (
         # statement itself can veto it
         need_pks
-        # the dialect can veto it if it just doesnt support RETURNING
+        # the dialect can veto it if it just doesn't support RETURNING
         # with INSERT
         and dialect.insert_returning
         # user-defined implicit_returning on Table can veto it
@@ -1559,7 +1634,7 @@ def _get_returning_modifiers(compiler, stmt, compile_state, toplevel):
         and (
             # since we support MariaDB and SQLite which also support lastrowid,
             # decide if we should use lastrowid or RETURNING.  for insert
-            # that didnt call return_defaults() and has just one set of
+            # that didn't call return_defaults() and has just one set of
             # parameters, we can use lastrowid.   this is more "traditional"
             # and a lot of weird use cases are supported by it.
             # SQLite lastrowid times 3x faster than returning,
@@ -1586,7 +1661,15 @@ def _get_returning_modifiers(compiler, stmt, compile_state, toplevel):
             and compiler.for_executemany
             and dialect.use_insertmanyvalues
             and (
-                explicit_returning or dialect.use_insertmanyvalues_wo_returning
+                explicit_returning
+                or (
+                    dialect.use_insertmanyvalues_wo_returning
+                    # Disable insertmanyvalues_wo_returning when there's a
+                    # post-values clause like ON CONFLICT DO UPDATE.
+                    # This is a performance optimization flag and the batching
+                    # doesn't work correctly with these clauses. See #13130.
+                    and stmt._post_values_clause is None
+                )
             )
         )
 
diff --git a/libs/sqlalchemy/sql/ddl.py b/libs/sqlalchemy/sql/ddl.py
index 0950043bcb..636500ee8c 100644
--- a/libs/sqlalchemy/sql/ddl.py
+++ b/libs/sqlalchemy/sql/ddl.py
@@ -1,5 +1,5 @@
 # sql/ddl.py
-# Copyright (C) 2009-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2009-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -17,11 +17,14 @@
 import typing
 from typing import Any
 from typing import Callable
+from typing import Generic
 from typing import Iterable
 from typing import List
 from typing import Optional
 from typing import Sequence as typing_Sequence
 from typing import Tuple
+from typing import TypeVar
+from typing import Union
 
 from . import roles
 from .base import _generative
@@ -38,10 +41,12 @@
     from .compiler import Compiled
     from .compiler import DDLCompiler
     from .elements import BindParameter
+    from .schema import Column
     from .schema import Constraint
     from .schema import ForeignKeyConstraint
+    from .schema import Index
     from .schema import SchemaItem
-    from .schema import Sequence
+    from .schema import Sequence as Sequence  # noqa: F401
     from .schema import Table
     from .selectable import TableClause
     from ..engine.base import Connection
@@ -50,6 +55,8 @@
     from ..engine.interfaces import Dialect
     from ..engine.interfaces import SchemaTranslateMapType
 
+_SI = TypeVar("_SI", bound=Union["SchemaItem", str])
+
 
 class BaseDDLElement(ClauseElement):
     """The root of DDL constructs, including those that are sub-elements
@@ -87,7 +94,7 @@ class DDLIfCallable(Protocol):
     def __call__(
         self,
         ddl: BaseDDLElement,
-        target: SchemaItem,
+        target: Union[SchemaItem, str],
         bind: Optional[Connection],
         tables: Optional[List[Table]] = None,
         state: Optional[Any] = None,
@@ -106,7 +113,7 @@ class DDLIf(typing.NamedTuple):
     def _should_execute(
         self,
         ddl: BaseDDLElement,
-        target: SchemaItem,
+        target: Union[SchemaItem, str],
         bind: Optional[Connection],
         compiler: Optional[DDLCompiler] = None,
         **kw: Any,
@@ -172,7 +179,7 @@ class ExecutableDDLElement(roles.DDLRole, Executable, BaseDDLElement):
     """
 
     _ddl_if: Optional[DDLIf] = None
-    target: Optional[SchemaItem] = None
+    target: Union[SchemaItem, str, None] = None
 
     def _execute_on_connection(
         self, connection, distilled_params, execution_options
@@ -415,7 +422,7 @@ def __repr__(self):
         )
 
 
-class _CreateDropBase(ExecutableDDLElement):
+class _CreateDropBase(ExecutableDDLElement, Generic[_SI]):
     """Base class for DDL constructs that represent CREATE and DROP or
     equivalents.
 
@@ -425,15 +432,15 @@ class _CreateDropBase(ExecutableDDLElement):
 
     """
 
-    def __init__(
-        self,
-        element,
-    ):
+    element: _SI
+
+    def __init__(self, element: _SI) -> None:
         self.element = self.target = element
         self._ddl_if = getattr(element, "_ddl_if", None)
 
     @property
-    def stringify_dialect(self):
+    def stringify_dialect(self):  # type: ignore[override]
+        assert not isinstance(self.element, str)
         return self.element.create_drop_stringify_dialect
 
     def _create_rule_disable(self, compiler):
@@ -447,19 +454,19 @@ def _create_rule_disable(self, compiler):
         return False
 
 
-class _CreateBase(_CreateDropBase):
-    def __init__(self, element, if_not_exists=False):
+class _CreateBase(_CreateDropBase[_SI]):
+    def __init__(self, element: _SI, if_not_exists: bool = False) -> None:
         super().__init__(element)
         self.if_not_exists = if_not_exists
 
 
-class _DropBase(_CreateDropBase):
-    def __init__(self, element, if_exists=False):
+class _DropBase(_CreateDropBase[_SI]):
+    def __init__(self, element: _SI, if_exists: bool = False) -> None:
         super().__init__(element)
         self.if_exists = if_exists
 
 
-class CreateSchema(_CreateBase):
+class CreateSchema(_CreateBase[str]):
     """Represent a CREATE SCHEMA statement.
 
     The argument here is the string name of the schema.
@@ -474,13 +481,13 @@ def __init__(
         self,
         name: str,
         if_not_exists: bool = False,
-    ):
+    ) -> None:
         """Create a new :class:`.CreateSchema` construct."""
 
         super().__init__(element=name, if_not_exists=if_not_exists)
 
 
-class DropSchema(_DropBase):
+class DropSchema(_DropBase[str]):
     """Represent a DROP SCHEMA statement.
 
     The argument here is the string name of the schema.
@@ -496,14 +503,14 @@ def __init__(
         name: str,
         cascade: bool = False,
         if_exists: bool = False,
-    ):
+    ) -> None:
         """Create a new :class:`.DropSchema` construct."""
 
         super().__init__(element=name, if_exists=if_exists)
         self.cascade = cascade
 
 
-class CreateTable(_CreateBase):
+class CreateTable(_CreateBase["Table"]):
     """Represent a CREATE TABLE statement."""
 
     __visit_name__ = "create_table"
@@ -515,7 +522,7 @@ def __init__(
             typing_Sequence[ForeignKeyConstraint]
         ] = None,
         if_not_exists: bool = False,
-    ):
+    ) -> None:
         """Create a :class:`.CreateTable` construct.
 
         :param element: a :class:`_schema.Table` that's the subject
@@ -537,7 +544,7 @@ def __init__(
         self.include_foreign_key_constraints = include_foreign_key_constraints
 
 
-class _DropView(_DropBase):
+class _DropView(_DropBase["Table"]):
     """Semi-public 'DROP VIEW' construct.
 
     Used by the test suite for dialect-agnostic drops of views.
@@ -549,7 +556,9 @@ class _DropView(_DropBase):
 
 
 class CreateConstraint(BaseDDLElement):
-    def __init__(self, element: Constraint):
+    element: Constraint
+
+    def __init__(self, element: Constraint) -> None:
         self.element = element
 
 
@@ -666,16 +675,18 @@ def skip_xmin(element, compiler, **kw):
 
     __visit_name__ = "create_column"
 
-    def __init__(self, element):
+    element: Column[Any]
+
+    def __init__(self, element: Column[Any]) -> None:
         self.element = element
 
 
-class DropTable(_DropBase):
+class DropTable(_DropBase["Table"]):
     """Represent a DROP TABLE statement."""
 
     __visit_name__ = "drop_table"
 
-    def __init__(self, element: Table, if_exists: bool = False):
+    def __init__(self, element: Table, if_exists: bool = False) -> None:
         """Create a :class:`.DropTable` construct.
 
         :param element: a :class:`_schema.Table` that's the subject
@@ -690,30 +701,24 @@ def __init__(self, element: Table, if_exists: bool = False):
         super().__init__(element, if_exists=if_exists)
 
 
-class CreateSequence(_CreateBase):
+class CreateSequence(_CreateBase["Sequence"]):
     """Represent a CREATE SEQUENCE statement."""
 
     __visit_name__ = "create_sequence"
 
-    def __init__(self, element: Sequence, if_not_exists: bool = False):
-        super().__init__(element, if_not_exists=if_not_exists)
-
 
-class DropSequence(_DropBase):
+class DropSequence(_DropBase["Sequence"]):
     """Represent a DROP SEQUENCE statement."""
 
     __visit_name__ = "drop_sequence"
 
-    def __init__(self, element: Sequence, if_exists: bool = False):
-        super().__init__(element, if_exists=if_exists)
-
 
-class CreateIndex(_CreateBase):
+class CreateIndex(_CreateBase["Index"]):
     """Represent a CREATE INDEX statement."""
 
     __visit_name__ = "create_index"
 
-    def __init__(self, element, if_not_exists=False):
+    def __init__(self, element: Index, if_not_exists: bool = False) -> None:
         """Create a :class:`.Createindex` construct.
 
         :param element: a :class:`_schema.Index` that's the subject
@@ -727,12 +732,12 @@ def __init__(self, element, if_not_exists=False):
         super().__init__(element, if_not_exists=if_not_exists)
 
 
-class DropIndex(_DropBase):
+class DropIndex(_DropBase["Index"]):
     """Represent a DROP INDEX statement."""
 
     __visit_name__ = "drop_index"
 
-    def __init__(self, element, if_exists=False):
+    def __init__(self, element: Index, if_exists: bool = False) -> None:
         """Create a :class:`.DropIndex` construct.
 
         :param element: a :class:`_schema.Index` that's the subject
@@ -746,38 +751,88 @@ def __init__(self, element, if_exists=False):
         super().__init__(element, if_exists=if_exists)
 
 
-class AddConstraint(_CreateBase):
+class AddConstraint(_CreateBase["Constraint"]):
     """Represent an ALTER TABLE ADD CONSTRAINT statement."""
 
     __visit_name__ = "add_constraint"
 
-    def __init__(self, element):
+    def __init__(
+        self,
+        element: Constraint,
+        *,
+        isolate_from_table: bool = True,
+    ) -> None:
+        """Construct a new :class:`.AddConstraint` construct.
+
+        :param element: a :class:`.Constraint` object
+
+        :param isolate_from_table: optional boolean, defaults to True.  Has
+         the effect of the incoming constraint being isolated from being
+         included in a CREATE TABLE sequence when associated with a
+         :class:`.Table`.
+
+         .. versionadded:: 2.0.39 - added
+            :paramref:`.AddConstraint.isolate_from_table`, defaulting
+            to True.  Previously, the behavior of this parameter was implicitly
+            turned on in all cases.
+
+        """
         super().__init__(element)
-        element._create_rule = util.portable_instancemethod(
-            self._create_rule_disable
-        )
+
+        if isolate_from_table:
+            element._create_rule = util.portable_instancemethod(
+                self._create_rule_disable
+            )
 
 
-class DropConstraint(_DropBase):
+class DropConstraint(_DropBase["Constraint"]):
     """Represent an ALTER TABLE DROP CONSTRAINT statement."""
 
     __visit_name__ = "drop_constraint"
 
-    def __init__(self, element, cascade=False, if_exists=False, **kw):
+    def __init__(
+        self,
+        element: Constraint,
+        *,
+        cascade: bool = False,
+        if_exists: bool = False,
+        isolate_from_table: bool = True,
+        **kw: Any,
+    ) -> None:
+        """Construct a new :class:`.DropConstraint` construct.
+
+        :param element: a :class:`.Constraint` object
+        :param cascade: optional boolean, indicates backend-specific
+         "CASCADE CONSTRAINT" directive should be rendered if available
+        :param if_exists: optional boolean, indicates backend-specific
+         "IF EXISTS" directive should be rendered if available
+        :param isolate_from_table: optional boolean, defaults to True.  Has
+         the effect of the incoming constraint being isolated from being
+         included in a CREATE TABLE sequence when associated with a
+         :class:`.Table`.
+
+         .. versionadded:: 2.0.39 - added
+            :paramref:`.DropConstraint.isolate_from_table`, defaulting
+            to True.  Previously, the behavior of this parameter was implicitly
+            turned on in all cases.
+
+        """
         self.cascade = cascade
         super().__init__(element, if_exists=if_exists, **kw)
-        element._create_rule = util.portable_instancemethod(
-            self._create_rule_disable
-        )
+
+        if isolate_from_table:
+            element._create_rule = util.portable_instancemethod(
+                self._create_rule_disable
+            )
 
 
-class SetTableComment(_CreateDropBase):
+class SetTableComment(_CreateDropBase["Table"]):
     """Represent a COMMENT ON TABLE IS statement."""
 
     __visit_name__ = "set_table_comment"
 
 
-class DropTableComment(_CreateDropBase):
+class DropTableComment(_CreateDropBase["Table"]):
     """Represent a COMMENT ON TABLE '' statement.
 
     Note this varies a lot across database backends.
@@ -787,33 +842,34 @@ class DropTableComment(_CreateDropBase):
     __visit_name__ = "drop_table_comment"
 
 
-class SetColumnComment(_CreateDropBase):
+class SetColumnComment(_CreateDropBase["Column[Any]"]):
     """Represent a COMMENT ON COLUMN IS statement."""
 
     __visit_name__ = "set_column_comment"
 
 
-class DropColumnComment(_CreateDropBase):
+class DropColumnComment(_CreateDropBase["Column[Any]"]):
     """Represent a COMMENT ON COLUMN IS NULL statement."""
 
     __visit_name__ = "drop_column_comment"
 
 
-class SetConstraintComment(_CreateDropBase):
+class SetConstraintComment(_CreateDropBase["Constraint"]):
     """Represent a COMMENT ON CONSTRAINT IS statement."""
 
     __visit_name__ = "set_constraint_comment"
 
 
-class DropConstraintComment(_CreateDropBase):
+class DropConstraintComment(_CreateDropBase["Constraint"]):
     """Represent a COMMENT ON CONSTRAINT IS NULL statement."""
 
     __visit_name__ = "drop_constraint_comment"
 
 
 class InvokeDDLBase(SchemaVisitor):
-    def __init__(self, connection):
+    def __init__(self, connection, **kw):
         self.connection = connection
+        assert not kw, f"Unexpected keywords: {kw.keys()}"
 
     @contextlib.contextmanager
     def with_ddl_events(self, target, **kw):
diff --git a/libs/sqlalchemy/sql/default_comparator.py b/libs/sqlalchemy/sql/default_comparator.py
index 7fa5dafe9c..156ab47c03 100644
--- a/libs/sqlalchemy/sql/default_comparator.py
+++ b/libs/sqlalchemy/sql/default_comparator.py
@@ -1,12 +1,11 @@
 # sql/default_comparator.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Default implementation of SQL comparison operations.
-"""
+"""Default implementation of SQL comparison operations."""
 
 from __future__ import annotations
 
diff --git a/libs/sqlalchemy/sql/dml.py b/libs/sqlalchemy/sql/dml.py
index 0b92e38bce..9b00bc4593 100644
--- a/libs/sqlalchemy/sql/dml.py
+++ b/libs/sqlalchemy/sql/dml.py
@@ -1,5 +1,5 @@
 # sql/dml.py
-# Copyright (C) 2009-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2009-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -23,6 +23,7 @@
 from typing import Optional
 from typing import overload
 from typing import Sequence
+from typing import Set
 from typing import Tuple
 from typing import Type
 from typing import TYPE_CHECKING
@@ -42,6 +43,7 @@
 from .base import _generative
 from .base import _select_iterables
 from .base import ColumnCollection
+from .base import ColumnSet
 from .base import CompileState
 from .base import DialectKWArgs
 from .base import Executable
@@ -418,13 +420,32 @@ class UpdateBase(
     is_dml = True
 
     def _generate_fromclause_column_proxies(
-        self, fromclause: FromClause
+        self,
+        fromclause: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
     ) -> None:
-        fromclause._columns._populate_separate_keys(
-            col._make_proxy(fromclause)
-            for col in self._all_selected_columns
-            if is_column_element(col)
-        )
+        prox = [
+            c._make_proxy(
+                fromclause,
+                key=proxy_key,
+                name=required_label_name,
+                name_is_truncatable=True,
+                primary_key=primary_key,
+                foreign_keys=foreign_keys,
+            )
+            for (
+                required_label_name,
+                proxy_key,
+                fallback_label_name,
+                c,
+                repeated,
+            ) in (self._generate_columns_plus_names(False))
+            if is_column_element(c)
+        ]
+
+        columns._populate_separate_keys(prox)
 
     def params(self, *arg: Any, **kw: Any) -> NoReturn:
         """Set the parameters for the statement.
@@ -471,7 +492,7 @@ def return_defaults(
 
             The :meth:`.UpdateBase.return_defaults` method is used by the ORM
             for its internal work in fetching newly generated primary key
-            and server default values, in particular to provide the underyling
+            and server default values, in particular to provide the underlying
             implementation of the :paramref:`_orm.Mapper.eager_defaults`
             ORM feature as well as to allow RETURNING support with bulk
             ORM inserts.  Its behavior is fairly idiosyncratic
@@ -687,6 +708,16 @@ def return_defaults(
 
         return self
 
+    def is_derived_from(self, fromclause: Optional[FromClause]) -> bool:
+        """Return ``True`` if this :class:`.ReturnsRows` is
+        'derived' from the given :class:`.FromClause`.
+
+        Since these are DMLs, we dont want such statements ever being adapted
+        so we return False for derives.
+
+        """
+        return False
+
     @_generative
     def returning(
         self,
diff --git a/libs/sqlalchemy/sql/elements.py b/libs/sqlalchemy/sql/elements.py
index f7d3767708..dcecb20c4e 100644
--- a/libs/sqlalchemy/sql/elements.py
+++ b/libs/sqlalchemy/sql/elements.py
@@ -1,5 +1,5 @@
 # sql/elements.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -80,14 +80,18 @@
 from ..util.typing import ParamSpec
 from ..util.typing import Self
 
+
 if typing.TYPE_CHECKING:
     from ._typing import _ByArgument
     from ._typing import _ColumnExpressionArgument
     from ._typing import _ColumnExpressionOrStrLabelArgument
     from ._typing import _HasDialect
     from ._typing import _InfoType
+    from ._typing import _OnlyColumnArgument
     from ._typing import _PropagateAttrsType
     from ._typing import _TypeEngineArgument
+    from .base import _EntityNamespace
+    from .base import ColumnSet
     from .cache_key import _CacheKeyTraversalType
     from .cache_key import CacheKey
     from .compiler import Compiled
@@ -116,6 +120,7 @@
     from ..engine.interfaces import SchemaTranslateMapType
     from ..engine.result import Result
 
+
 _NUMERIC = Union[float, Decimal]
 _NUMBER = Union[float, int, Decimal]
 
@@ -297,8 +302,7 @@ def compile(
             if bind:
                 dialect = bind.dialect
             elif self.stringify_dialect == "default":
-                default = util.preloaded.engine_default
-                dialect = default.StrCompileDialect()
+                dialect = self._default_dialect()
             else:
                 url = util.preloaded.engine_url
                 dialect = url.URL.create(
@@ -307,6 +311,10 @@ def compile(
 
         return self._compiler(dialect, **kw)
 
+    def _default_dialect(self):
+        default = util.preloaded.engine_default
+        return default.StrCompileDialect()
+
     def _compiler(self, dialect: Dialect, **kw: Any) -> Compiled:
         """Return a compiler appropriate for this ClauseElement, given a
         Dialect."""
@@ -403,6 +411,10 @@ def _set_propagate_attrs(self, values: Mapping[str, Any]) -> Self:
         self._propagate_attrs = util.immutabledict(values)
         return self
 
+    def _default_compiler(self) -> SQLCompiler:
+        dialect = self._default_dialect()
+        return dialect.statement_compiler(dialect, self)  # type: ignore
+
     def _clone(self, **kw: Any) -> Self:
         """Create a shallow copy of this ClauseElement.
 
@@ -451,7 +463,7 @@ def _with_binary_element_type(self, type_):
         return self
 
     @property
-    def _constructor(self):
+    def _constructor(self):  # type: ignore[override]
         """return the 'constructor' for this ClauseElement.
 
         This is for the purposes for creating a new object of
@@ -490,8 +502,8 @@ def _de_clone(self):
             self = self._is_clone_of
         return self
 
-    @property
-    def entity_namespace(self):
+    @util.ro_non_memoized_property
+    def entity_namespace(self) -> _EntityNamespace:
         raise AttributeError(
             "This SQL expression has no entity namespace "
             "with which to filter from."
@@ -684,6 +696,7 @@ def _compile_w_cache(
         else:
             elem_cache_key = None
 
+        extracted_params: Optional[Sequence[BindParameter[Any]]]
         if elem_cache_key is not None:
             if TYPE_CHECKING:
                 assert compiled_cache is not None
@@ -740,6 +753,8 @@ def __invert__(self):
             return self._negate()
 
     def _negate(self) -> ClauseElement:
+        # TODO: this code is uncovered and in all likelihood is not included
+        # in any codepath.  So this should raise NotImplementedError in 2.1
         grouped = self.self_group(against=operators.inv)
         assert isinstance(grouped, ColumnElement)
         return UnaryExpression(grouped, operator=operators.inv)
@@ -1050,7 +1065,7 @@ def any_(self) -> CollectionAggregate[Any]: ...
         def all_(self) -> CollectionAggregate[Any]: ...
 
         # numeric overloads.  These need more tweaking
-        # in particular they all need to have a variant for Optiona[_T]
+        # in particular they all need to have a variant for Optional[_T]
         # because Optional only applies to the data side, not the expression
         # side
 
@@ -1431,6 +1446,10 @@ def _non_anon_label(self) -> Optional[str]:
 
     _alt_names: Sequence[str] = ()
 
+    if TYPE_CHECKING:
+
+        def _ungroup(self) -> ColumnElement[_T]: ...
+
     @overload
     def self_group(self, against: None = None) -> ColumnElement[_T]: ...
 
@@ -1465,7 +1484,8 @@ def _negate(self) -> ColumnElement[Any]:
             grouped = self.self_group(against=operators.inv)
             assert isinstance(grouped, ColumnElement)
             return UnaryExpression(
-                grouped, operator=operators.inv, wraps_column_expression=True
+                grouped,
+                operator=operators.inv,
             )
 
     type: TypeEngine[_T]
@@ -1639,6 +1659,8 @@ def _make_proxy(
         self,
         selectable: FromClause,
         *,
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         name: Optional[str] = None,
         key: Optional[str] = None,
         name_is_truncatable: bool = False,
@@ -2114,8 +2136,8 @@ def _negate_in_binary(self, negated_op, original_op):
         else:
             return self
 
-    def _with_binary_element_type(self, type_):
-        c = ClauseElement._clone(self)
+    def _with_binary_element_type(self, type_: TypeEngine[Any]) -> Self:
+        c: Self = ClauseElement._clone(self)
         c.type = type_
         return c
 
@@ -2205,8 +2227,9 @@ class TypeClause(DQLDMLClauseElement):
     _traverse_internals: _TraverseInternalsType = [
         ("type", InternalTraversal.dp_type)
     ]
+    type: TypeEngine[Any]
 
-    def __init__(self, type_):
+    def __init__(self, type_: TypeEngine[Any]):
         self.type = type_
 
 
@@ -2249,7 +2272,7 @@ class TextClause(
     _traverse_internals: _TraverseInternalsType = [
         ("_bindparams", InternalTraversal.dp_string_clauseelement_dict),
         ("text", InternalTraversal.dp_string),
-    ]
+    ] + Executable._executable_traverse_internals
 
     _is_text_clause = True
 
@@ -2284,7 +2307,7 @@ def _select_iterable(self) -> _SelectIterable:
     _allow_label_resolve = False
 
     @property
-    def _is_star(self):
+    def _is_star(self):  # type: ignore[override]
         return self.text == "*"
 
     def __init__(self, text: str):
@@ -2357,7 +2380,7 @@ def bindparams(
 
         The :meth:`_expression.TextClause.bindparams`
         method can be called repeatedly,
-        where it will re-use existing :class:`.BindParameter` objects to add
+        where it will reuse existing :class:`.BindParameter` objects to add
         new information.  For example, we can call
         :meth:`_expression.TextClause.bindparams`
         first with typing information, and a
@@ -2437,7 +2460,7 @@ def bindparams(
     @util.preload_module("sqlalchemy.sql.selectable")
     def columns(
         self,
-        *cols: _ColumnExpressionArgument[Any],
+        *cols: _OnlyColumnArgument[Any],
         **types: _TypeEngineArgument[Any],
     ) -> TextualSelect:
         r"""Turn this :class:`_expression.TextClause` object into a
@@ -2974,14 +2997,16 @@ def _construct_for_list(
             self.clauses = clauses
         self.operator = operator
         self.type = type_
+        for c in clauses:
+            if c._propagate_attrs:
+                self._propagate_attrs = c._propagate_attrs
+                break
         return self
 
     def _negate(self) -> Any:
         grouped = self.self_group(against=operators.inv)
         assert isinstance(grouped, ColumnElement)
-        return UnaryExpression(
-            grouped, operator=operators.inv, wraps_column_expression=True
-        )
+        return UnaryExpression(grouped, operator=operators.inv)
 
 
 class BooleanClauseList(ExpressionClauseList[bool]):
@@ -3599,15 +3624,18 @@ class UnaryExpression(ColumnElement[_T]):
         ("modifier", InternalTraversal.dp_operator),
     ]
 
-    element: ClauseElement
+    element: ColumnElement[Any]
+    operator: Optional[OperatorType]
+    modifier: Optional[OperatorType]
 
     def __init__(
         self,
         element: ColumnElement[Any],
+        *,
         operator: Optional[OperatorType] = None,
         modifier: Optional[OperatorType] = None,
         type_: Optional[_TypeEngineArgument[_T]] = None,
-        wraps_column_expression: bool = False,
+        wraps_column_expression: bool = False,  # legacy, not used as of 2.0.42
     ):
         self.operator = operator
         self.modifier = modifier
@@ -3620,7 +3648,12 @@ def __init__(
         # know how to get the overloads to express that correctly
         self.type = type_api.to_instance(type_)  # type: ignore
 
-        self.wraps_column_expression = wraps_column_expression
+    def _wraps_unnamed_column(self):
+        ungrouped = self.element._ungroup()
+        return (
+            not isinstance(ungrouped, NamedColumn)
+            or ungrouped._non_anon_label is None
+        )
 
     @classmethod
     def _create_nulls_first(
@@ -3630,7 +3663,6 @@ def _create_nulls_first(
         return UnaryExpression(
             coercions.expect(roles.ByOfRole, column),
             modifier=operators.nulls_first_op,
-            wraps_column_expression=False,
         )
 
     @classmethod
@@ -3641,7 +3673,6 @@ def _create_nulls_last(
         return UnaryExpression(
             coercions.expect(roles.ByOfRole, column),
             modifier=operators.nulls_last_op,
-            wraps_column_expression=False,
         )
 
     @classmethod
@@ -3651,7 +3682,6 @@ def _create_desc(
         return UnaryExpression(
             coercions.expect(roles.ByOfRole, column),
             modifier=operators.desc_op,
-            wraps_column_expression=False,
         )
 
     @classmethod
@@ -3662,7 +3692,6 @@ def _create_asc(
         return UnaryExpression(
             coercions.expect(roles.ByOfRole, column),
             modifier=operators.asc_op,
-            wraps_column_expression=False,
         )
 
     @classmethod
@@ -3677,7 +3706,6 @@ def _create_distinct(
             col_expr,
             operator=operators.distinct_op,
             type_=col_expr.type,
-            wraps_column_expression=False,
         )
 
     @classmethod
@@ -3692,7 +3720,6 @@ def _create_bitwise_not(
             col_expr,
             operator=operators.bitwise_not_op,
             type_=col_expr.type,
-            wraps_column_expression=False,
         )
 
     @property
@@ -3706,16 +3733,15 @@ def _order_by_label_element(self) -> Optional[Label[Any]]:
     def _from_objects(self) -> List[FromClause]:
         return self.element._from_objects
 
-    def _negate(self):
+    def _negate(self) -> ColumnElement[Any]:
         if self.type._type_affinity is type_api.BOOLEANTYPE._type_affinity:
             return UnaryExpression(
                 self.self_group(against=operators.inv),
                 operator=operators.inv,
                 type_=type_api.BOOLEANTYPE,
-                wraps_column_expression=self.wraps_column_expression,
             )
         else:
-            return ClauseElement._negate(self)
+            return ColumnElement._negate(self)
 
     def self_group(
         self, against: Optional[OperatorType] = None
@@ -3743,6 +3769,8 @@ class CollectionAggregate(UnaryExpression[_T]):
     def _create_any(
         cls, expr: _ColumnExpressionArgument[_T]
     ) -> CollectionAggregate[bool]:
+        """create CollectionAggregate for the legacy
+        ARRAY.Comparator.any() method"""
         col_expr: ColumnElement[_T] = coercions.expect(
             roles.ExpressionElementRole,
             expr,
@@ -3752,13 +3780,14 @@ def _create_any(
             col_expr,
             operator=operators.any_op,
             type_=type_api.BOOLEANTYPE,
-            wraps_column_expression=False,
         )
 
     @classmethod
     def _create_all(
         cls, expr: _ColumnExpressionArgument[_T]
     ) -> CollectionAggregate[bool]:
+        """create CollectionAggregate for the legacy
+        ARRAY.Comparator.all() method"""
         col_expr: ColumnElement[_T] = coercions.expect(
             roles.ExpressionElementRole,
             expr,
@@ -3768,13 +3797,45 @@ def _create_all(
             col_expr,
             operator=operators.all_op,
             type_=type_api.BOOLEANTYPE,
-            wraps_column_expression=False,
+        )
+
+    @util.preload_module("sqlalchemy.sql.sqltypes")
+    def _bind_param(
+        self,
+        operator: operators.OperatorType,
+        obj: Any,
+        type_: Optional[TypeEngine[_T]] = None,
+        expanding: bool = False,
+    ) -> BindParameter[_T]:
+        """For new style any_(), all_(), ensure compared literal value
+        receives appropriate bound parameter type."""
+
+        # a CollectionAggregate is specific to ARRAY or int
+        # only.  So for ARRAY case, make sure we use correct element type
+        sqltypes = util.preloaded.sql_sqltypes
+        if self.element.type._type_affinity is sqltypes.ARRAY:
+            compared_to_type = cast(
+                sqltypes.ARRAY[Any], self.element.type
+            ).item_type
+        else:
+            compared_to_type = self.element.type
+
+        return BindParameter(
+            None,
+            obj,
+            _compared_to_operator=operator,
+            type_=type_,
+            _compared_to_type=compared_to_type,
+            unique=True,
+            expanding=expanding,
         )
 
     # operate and reverse_operate are hardwired to
     # dispatch onto the type comparator directly, so that we can
     # ensure "reversed" behavior.
-    def operate(self, op, *other, **kwargs):
+    def operate(
+        self, op: OperatorType, *other: Any, **kwargs: Any
+    ) -> ColumnElement[_T]:
         if not operators.is_comparison(op):
             raise exc.ArgumentError(
                 "Only comparison operators may be used with ANY/ALL"
@@ -3782,7 +3843,9 @@ def operate(self, op, *other, **kwargs):
         kwargs["reverse"] = True
         return self.comparator.operate(operators.mirror(op), *other, **kwargs)
 
-    def reverse_operate(self, op, other, **kwargs):
+    def reverse_operate(
+        self, op: OperatorType, other: Any, **kwargs: Any
+    ) -> ColumnElement[_T]:
         # comparison operators should never call reverse_operate
         assert not operators.is_comparison(op)
         raise exc.ArgumentError(
@@ -3799,7 +3862,6 @@ def __init__(self, element, operator, negate):
         self.operator = operator
         self.negate = negate
         self.modifier = None
-        self.wraps_column_expression = True
         self._is_implicitly_boolean = element._is_implicitly_boolean
 
     @property
@@ -3865,10 +3927,9 @@ class BinaryExpression(OperatorExpression[_T]):
 
     """
 
-    modifiers: Optional[Mapping[str, Any]]
-
     left: ColumnElement[Any]
     right: ColumnElement[Any]
+    modifiers: Mapping[str, Any]
 
     def __init__(
         self,
@@ -4023,13 +4084,11 @@ class GroupedElement(DQLDMLClauseElement):
 
     __visit_name__ = "grouping"
 
-    element: ClauseElement
-
     def self_group(self, against: Optional[OperatorType] = None) -> Self:
         return self
 
-    def _ungroup(self):
-        return self.element._ungroup()
+    def _ungroup(self) -> ClauseElement:
+        raise NotImplementedError()
 
 
 class Grouping(GroupedElement, ColumnElement[_T]):
@@ -4058,6 +4117,10 @@ def __init__(
     def _with_binary_element_type(self, type_):
         return self.__class__(self.element._with_binary_element_type(type_))
 
+    def _ungroup(self) -> ColumnElement[_T]:
+        assert isinstance(self.element, ColumnElement)
+        return self.element._ungroup()
+
     @util.memoized_property
     def _is_implicitly_boolean(self):
         return self.element._is_implicitly_boolean
@@ -4176,6 +4239,7 @@ class Over(ColumnElement[_T]):
         ("partition_by", InternalTraversal.dp_clauseelement),
         ("range_", InternalTraversal.dp_plain_obj),
         ("rows", InternalTraversal.dp_plain_obj),
+        ("groups", InternalTraversal.dp_plain_obj),
     ]
 
     order_by: Optional[ClauseList] = None
@@ -4187,6 +4251,7 @@ class Over(ColumnElement[_T]):
 
     range_: Optional[typing_Tuple[_IntOrRange, _IntOrRange]]
     rows: Optional[typing_Tuple[_IntOrRange, _IntOrRange]]
+    groups: Optional[typing_Tuple[_IntOrRange, _IntOrRange]]
 
     def __init__(
         self,
@@ -4195,6 +4260,7 @@ def __init__(
         order_by: Optional[_ByArgument] = None,
         range_: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
         rows: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
+        groups: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
     ):
         self.element = element
         if order_by is not None:
@@ -4207,19 +4273,14 @@ def __init__(
                 _literal_as_text_role=roles.ByOfRole,
             )
 
-        if range_:
-            self.range_ = self._interpret_range(range_)
-            if rows:
-                raise exc.ArgumentError(
-                    "'range_' and 'rows' are mutually exclusive"
-                )
-            else:
-                self.rows = None
-        elif rows:
-            self.rows = self._interpret_range(rows)
-            self.range_ = None
+        if sum(bool(item) for item in (range_, rows, groups)) > 1:
+            raise exc.ArgumentError(
+                "only one of 'rows', 'range_', or 'groups' may be provided"
+            )
         else:
-            self.rows = self.range_ = None
+            self.range_ = self._interpret_range(range_) if range_ else None
+            self.rows = self._interpret_range(rows) if rows else None
+            self.groups = self._interpret_range(groups) if groups else None
 
     def __reduce__(self):
         return self.__class__, (
@@ -4228,6 +4289,7 @@ def __reduce__(self):
             self.order_by,
             self.range_,
             self.rows,
+            self.groups,
         )
 
     def _interpret_range(
@@ -4342,6 +4404,7 @@ def over(
         order_by: Optional[_ByArgument] = None,
         rows: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
         range_: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
+        groups: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
     ) -> Over[_T]:
         """Produce an OVER clause against this :class:`.WithinGroup`
         construct.
@@ -4356,6 +4419,7 @@ def over(
             order_by=order_by,
             range_=range_,
             rows=rows,
+            groups=groups,
         )
 
     @overload
@@ -4473,6 +4537,7 @@ def over(
         ] = None,
         range_: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
         rows: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
+        groups: Optional[typing_Tuple[Optional[int], Optional[int]]] = None,
     ) -> Over[_T]:
         """Produce an OVER clause against this filtered function.
 
@@ -4498,6 +4563,7 @@ def over(
             order_by=order_by,
             range_=range_,
             rows=rows,
+            groups=groups,
         )
 
     def within_group(
@@ -4556,7 +4622,7 @@ def description(self) -> str:
         return self.name
 
     @HasMemoized.memoized_attribute
-    def _tq_key_label(self):
+    def _tq_key_label(self) -> Optional[str]:
         """table qualified label based on column key.
 
         for table-bound columns this is <tablename>_<column key/proxy key>;
@@ -4614,6 +4680,8 @@ def _make_proxy(
         self,
         selectable: FromClause,
         *,
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         name: Optional[str] = None,
         key: Optional[str] = None,
         name_is_truncatable: bool = False,
@@ -4764,11 +4832,11 @@ def _apply_to_inner(
             return self
 
     @property
-    def primary_key(self):
+    def primary_key(self):  # type: ignore[override]
         return self.element.primary_key
 
     @property
-    def foreign_keys(self):
+    def foreign_keys(self):  # type: ignore[override]
         return self.element.foreign_keys
 
     def _copy_internals(
@@ -4794,6 +4862,8 @@ def _make_proxy(
         self,
         selectable: FromClause,
         *,
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         name: Optional[str] = None,
         compound_select_cols: Optional[Sequence[ColumnElement[Any]]] = None,
         **kw: Any,
@@ -4806,6 +4876,8 @@ def _make_proxy(
             disallow_is_literal=True,
             name_is_truncatable=isinstance(name, _truncated_label),
             compound_select_cols=compound_select_cols,
+            primary_key=primary_key,
+            foreign_keys=foreign_keys,
         )
 
         # there was a note here to remove this assertion, which was here
@@ -4897,7 +4969,7 @@ class is usable by itself in those cases where behavioral requirements
     _is_multiparam_column = False
 
     @property
-    def _is_star(self):
+    def _is_star(self):  # type: ignore[override]
         return self.is_literal and self.name == "*"
 
     def __init__(
@@ -5040,6 +5112,8 @@ def _make_proxy(
         self,
         selectable: FromClause,
         *,
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         name: Optional[str] = None,
         key: Optional[str] = None,
         name_is_truncatable: bool = False,
diff --git a/libs/sqlalchemy/sql/events.py b/libs/sqlalchemy/sql/events.py
index 601092fd91..b1b45fcccd 100644
--- a/libs/sqlalchemy/sql/events.py
+++ b/libs/sqlalchemy/sql/events.py
@@ -1,5 +1,5 @@
 # sql/events.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/expression.py b/libs/sqlalchemy/sql/expression.py
index f8ac3a9eca..b4a185a09c 100644
--- a/libs/sqlalchemy/sql/expression.py
+++ b/libs/sqlalchemy/sql/expression.py
@@ -1,14 +1,11 @@
 # sql/expression.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Defines the public namespace for SQL expression constructs.
-
-
-"""
+"""Defines the public namespace for SQL expression constructs."""
 
 
 from __future__ import annotations
diff --git a/libs/sqlalchemy/sql/functions.py b/libs/sqlalchemy/sql/functions.py
index ea02279d48..663ced0e43 100644
--- a/libs/sqlalchemy/sql/functions.py
+++ b/libs/sqlalchemy/sql/functions.py
@@ -1,14 +1,11 @@
 # sql/functions.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-
-"""SQL function API, factories, and built-in functions.
-
-"""
+"""SQL function API, factories, and built-in functions."""
 
 from __future__ import annotations
 
@@ -140,7 +137,7 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
         ("clause_expr", InternalTraversal.dp_clauseelement),
         ("_with_ordinality", InternalTraversal.dp_boolean),
         ("_table_value_type", InternalTraversal.dp_has_cache_key),
-    ]
+    ] + Executable._executable_traverse_internals
 
     packagenames: Tuple[str, ...] = ()
 
@@ -155,7 +152,9 @@ class FunctionElement(Executable, ColumnElement[_T], FromClause, Generative):
 
     clause_expr: Grouping[Any]
 
-    def __init__(self, *clauses: _ColumnExpressionOrLiteralArgument[Any]):
+    def __init__(
+        self, *clauses: _ColumnExpressionOrLiteralArgument[Any]
+    ) -> None:
         r"""Construct a :class:`.FunctionElement`.
 
         :param \*clauses: list of column expressions that form the arguments
@@ -242,7 +241,8 @@ def table_valued(
         r"""Return a :class:`_sql.TableValuedAlias` representation of this
         :class:`_functions.FunctionElement` with table-valued expressions added.
 
-        e.g.:
+        e.g. to use the SQLite form of ``generate_series()`` (including
+        hidden columns "start", "stop", "step"):
 
         .. sourcecode:: pycon+sql
 
@@ -259,17 +259,33 @@ def table_valued(
             FROM generate_series(:generate_series_1, :generate_series_2) AS anon_1
             WHERE anon_1.value > :value_1{stop}
 
+        Backends like PostgreSQL need the accessed columns to be explicitly
+        named in "AS" clause.  To achieve this, use
+        :meth:`_sql.TableValuedAlias.render_derived`; be sure to consult the
+        :ref:`PostgreSQL-specific documentation for table valued functions
+        <postgresql_table_valued>` for additional examples:
+
+        .. sourcecode:: pycon+sql
+
+            >>> fn = func.generate_series(1, 5).table_valued("value").render_derived()
+
+            >>> print(select(fn))
+            {printsql}SELECT anon_1.value FROM
+            generate_series(:generate_series_1, :generate_series_2) AS anon_1(value){stop}
+
         A WITH ORDINALITY expression may be generated by passing the keyword
-        argument "with_ordinality":
+        argument :paramref:`.FunctionElement.table_valued.with_ordinality`,
+        illustrated below using PostgreSQL's syntax:
 
         .. sourcecode:: pycon+sql
 
             >>> fn = func.generate_series(4, 1, -1).table_valued(
             ...     "gen", with_ordinality="ordinality"
             ... )
-            >>> print(select(fn))
+            >>> print(select(fn.render_derived()))
             {printsql}SELECT anon_1.gen, anon_1.ordinality
-            FROM generate_series(:generate_series_1, :generate_series_2, :generate_series_3) WITH ORDINALITY AS anon_1
+            FROM generate_series(:generate_series_1, :generate_series_2, :generate_series_3)
+            WITH ORDINALITY AS anon_1(gen, ordinality)
 
         :param \*expr: A series of string column names that will be added to the
          ``.c`` collection of the resulting :class:`_sql.TableValuedAlias`
@@ -298,7 +314,7 @@ def table_valued(
 
             :ref:`tutorial_functions_table_valued` - in the :ref:`unified_tutorial`
 
-            :ref:`postgresql_table_valued` - in the :ref:`postgresql_toplevel` documentation
+            :ref:`Table-Valued Functions on PostgreSQL <postgresql_table_valued>` - in the :ref:`postgresql_toplevel` documentation
 
             :meth:`_functions.FunctionElement.scalar_table_valued` - variant of
             :meth:`_functions.FunctionElement.table_valued` which delivers the
@@ -435,6 +451,7 @@ def over(
         order_by: Optional[_ByArgument] = None,
         rows: Optional[Tuple[Optional[int], Optional[int]]] = None,
         range_: Optional[Tuple[Optional[int], Optional[int]]] = None,
+        groups: Optional[Tuple[Optional[int], Optional[int]]] = None,
     ) -> Over[_T]:
         """Produce an OVER clause against this function.
 
@@ -466,6 +483,7 @@ def over(
             order_by=order_by,
             rows=rows,
             range_=range_,
+            groups=groups,
         )
 
     def within_group(
@@ -779,7 +797,7 @@ def _gen_cache_key(self, anon_map: Any, bindparams: Any) -> Any:
 
     def __init__(
         self, fn: FunctionElement[Any], left_index: int, right_index: int
-    ):
+    ) -> None:
         self.sql_function = fn
         self.left_index = left_index
         self.right_index = right_index
@@ -788,7 +806,7 @@ def __init__(
         self.type = sqltypes.BOOLEANTYPE
         self.negate = None
         self._is_implicitly_boolean = True
-        self.modifiers = {}
+        self.modifiers = util.immutabledict({})
 
     @property
     def left_expr(self) -> ColumnElement[Any]:
@@ -831,7 +849,7 @@ def __init__(
         fn: FunctionElement[_T],
         name: str,
         type_: Optional[_TypeEngineArgument[_T]] = None,
-    ):
+    ) -> None:
         self.fn = fn
         self.name = name
 
@@ -930,7 +948,7 @@ class _FunctionGenerator:
 
     """  # noqa
 
-    def __init__(self, **opts: Any):
+    def __init__(self, **opts: Any) -> None:
         self.__names: List[str] = []
         self.opts = opts
 
@@ -990,8 +1008,41 @@ def aggregate_strings(self) -> Type[aggregate_strings]: ...
         @property
         def ansifunction(self) -> Type[AnsiFunction[Any]]: ...
 
-        @property
-        def array_agg(self) -> Type[array_agg[Any]]: ...
+        # set ColumnElement[_T] as a separate overload, to appease
+        # mypy which seems to not want to accept _T from
+        # _ColumnExpressionArgument. Seems somewhat related to the covariant
+        # _HasClauseElement as of mypy 1.15
+
+        @overload
+        def array_agg(
+            self,
+            col: ColumnElement[_T],
+            *args: _ColumnExpressionOrLiteralArgument[Any],
+            **kwargs: Any,
+        ) -> array_agg[_T]: ...
+
+        @overload
+        def array_agg(
+            self,
+            col: _ColumnExpressionArgument[_T],
+            *args: _ColumnExpressionOrLiteralArgument[Any],
+            **kwargs: Any,
+        ) -> array_agg[_T]: ...
+
+        @overload
+        def array_agg(
+            self,
+            col: _T,
+            *args: _ColumnExpressionOrLiteralArgument[Any],
+            **kwargs: Any,
+        ) -> array_agg[_T]: ...
+
+        def array_agg(
+            self,
+            col: _ColumnExpressionOrLiteralArgument[_T],
+            *args: _ColumnExpressionOrLiteralArgument[Any],
+            **kwargs: Any,
+        ) -> array_agg[_T]: ...
 
         @property
         def cast(self) -> Type[Cast[Any]]: ...
@@ -999,10 +1050,10 @@ def cast(self) -> Type[Cast[Any]]: ...
         @property
         def char_length(self) -> Type[char_length]: ...
 
-        # set ColumnElement[_T] as a separate overload, to appease mypy
-        # which seems to not want to accept _T from _ColumnExpressionArgument.
-        # this is even if all non-generic types are removed from it, so
-        # reasons remain unclear for why this does not work
+        # set ColumnElement[_T] as a separate overload, to appease
+        # mypy which seems to not want to accept _T from
+        # _ColumnExpressionArgument. Seems somewhat related to the covariant
+        # _HasClauseElement as of mypy 1.15
 
         @overload
         def coalesce(
@@ -1015,7 +1066,7 @@ def coalesce(
         @overload
         def coalesce(
             self,
-            col: _ColumnExpressionArgument[_T],
+            col: _ColumnExpressionArgument[Optional[_T]],
             *args: _ColumnExpressionOrLiteralArgument[Any],
             **kwargs: Any,
         ) -> coalesce[_T]: ...
@@ -1023,14 +1074,14 @@ def coalesce(
         @overload
         def coalesce(
             self,
-            col: _ColumnExpressionOrLiteralArgument[_T],
+            col: Optional[_T],
             *args: _ColumnExpressionOrLiteralArgument[Any],
             **kwargs: Any,
         ) -> coalesce[_T]: ...
 
         def coalesce(
             self,
-            col: _ColumnExpressionOrLiteralArgument[_T],
+            col: _ColumnExpressionOrLiteralArgument[Optional[_T]],
             *args: _ColumnExpressionOrLiteralArgument[Any],
             **kwargs: Any,
         ) -> coalesce[_T]: ...
@@ -1074,10 +1125,10 @@ def localtime(self) -> Type[localtime]: ...
         @property
         def localtimestamp(self) -> Type[localtimestamp]: ...
 
-        # set ColumnElement[_T] as a separate overload, to appease mypy
-        # which seems to not want to accept _T from _ColumnExpressionArgument.
-        # this is even if all non-generic types are removed from it, so
-        # reasons remain unclear for why this does not work
+        # set ColumnElement[_T] as a separate overload, to appease
+        # mypy which seems to not want to accept _T from
+        # _ColumnExpressionArgument. Seems somewhat related to the covariant
+        # _HasClauseElement as of mypy 1.15
 
         @overload
         def max(  # noqa: A001
@@ -1098,7 +1149,7 @@ def max(  # noqa: A001
         @overload
         def max(  # noqa: A001
             self,
-            col: _ColumnExpressionOrLiteralArgument[_T],
+            col: _T,
             *args: _ColumnExpressionOrLiteralArgument[Any],
             **kwargs: Any,
         ) -> max[_T]: ...
@@ -1110,10 +1161,10 @@ def max(  # noqa: A001
             **kwargs: Any,
         ) -> max[_T]: ...
 
-        # set ColumnElement[_T] as a separate overload, to appease mypy
-        # which seems to not want to accept _T from _ColumnExpressionArgument.
-        # this is even if all non-generic types are removed from it, so
-        # reasons remain unclear for why this does not work
+        # set ColumnElement[_T] as a separate overload, to appease
+        # mypy which seems to not want to accept _T from
+        # _ColumnExpressionArgument. Seems somewhat related to the covariant
+        # _HasClauseElement as of mypy 1.15
 
         @overload
         def min(  # noqa: A001
@@ -1134,7 +1185,7 @@ def min(  # noqa: A001
         @overload
         def min(  # noqa: A001
             self,
-            col: _ColumnExpressionOrLiteralArgument[_T],
+            col: _T,
             *args: _ColumnExpressionOrLiteralArgument[Any],
             **kwargs: Any,
         ) -> min[_T]: ...
@@ -1179,10 +1230,10 @@ def rollup(self) -> Type[rollup[Any]]: ...
         @property
         def session_user(self) -> Type[session_user]: ...
 
-        # set ColumnElement[_T] as a separate overload, to appease mypy
-        # which seems to not want to accept _T from _ColumnExpressionArgument.
-        # this is even if all non-generic types are removed from it, so
-        # reasons remain unclear for why this does not work
+        # set ColumnElement[_T] as a separate overload, to appease
+        # mypy which seems to not want to accept _T from
+        # _ColumnExpressionArgument. Seems somewhat related to the covariant
+        # _HasClauseElement as of mypy 1.15
 
         @overload
         def sum(  # noqa: A001
@@ -1203,7 +1254,7 @@ def sum(  # noqa: A001
         @overload
         def sum(  # noqa: A001
             self,
-            col: _ColumnExpressionOrLiteralArgument[_T],
+            col: _T,
             *args: _ColumnExpressionOrLiteralArgument[Any],
             **kwargs: Any,
         ) -> sum[_T]: ...
@@ -1299,7 +1350,7 @@ def __init__(
         *clauses: _ColumnExpressionOrLiteralArgument[_T],
         type_: None = ...,
         packagenames: Optional[Tuple[str, ...]] = ...,
-    ): ...
+    ) -> None: ...
 
     @overload
     def __init__(
@@ -1308,7 +1359,7 @@ def __init__(
         *clauses: _ColumnExpressionOrLiteralArgument[Any],
         type_: _TypeEngineArgument[_T] = ...,
         packagenames: Optional[Tuple[str, ...]] = ...,
-    ): ...
+    ) -> None: ...
 
     def __init__(
         self,
@@ -1316,7 +1367,7 @@ def __init__(
         *clauses: _ColumnExpressionOrLiteralArgument[Any],
         type_: Optional[_TypeEngineArgument[_T]] = None,
         packagenames: Optional[Tuple[str, ...]] = None,
-    ):
+    ) -> None:
         """Construct a :class:`.Function`.
 
         The :data:`.func` construct is normally used to construct
@@ -1498,7 +1549,7 @@ def _register_generic_function(
 
     def __init__(
         self, *args: _ColumnExpressionOrLiteralArgument[Any], **kwargs: Any
-    ):
+    ) -> None:
         parsed_args = kwargs.pop("_parsed_args", None)
         if parsed_args is None:
             parsed_args = [
@@ -1545,7 +1596,7 @@ class next_value(GenericFunction[int]):
         ("sequence", InternalTraversal.dp_named_ddl_element)
     ]
 
-    def __init__(self, seq: schema.Sequence, **kw: Any):
+    def __init__(self, seq: schema.Sequence, **kw: Any) -> None:
         assert isinstance(
             seq, schema.Sequence
         ), "next_value() accepts a Sequence object as input."
@@ -1570,19 +1621,23 @@ class AnsiFunction(GenericFunction[_T]):
 
     inherit_cache = True
 
-    def __init__(self, *args: _ColumnExpressionArgument[Any], **kwargs: Any):
+    def __init__(
+        self, *args: _ColumnExpressionArgument[Any], **kwargs: Any
+    ) -> None:
         GenericFunction.__init__(self, *args, **kwargs)
 
 
 class ReturnTypeFromArgs(GenericFunction[_T]):
-    """Define a function whose return type is the same as its arguments."""
+    """Define a function whose return type is bound to the type of its
+    arguments.
+    """
 
     inherit_cache = True
 
-    # set ColumnElement[_T] as a separate overload, to appease mypy which seems
-    # to not want to accept _T from _ColumnExpressionArgument.  this is even if
-    # all non-generic types are removed from it, so reasons remain unclear for
-    # why this does not work
+    # set ColumnElement[_T] as a separate overload, to appease
+    # mypy which seems to not want to accept _T from
+    # _ColumnExpressionArgument. Seems somewhat related to the covariant
+    # _HasClauseElement as of mypy 1.15
 
     @overload
     def __init__(
@@ -1590,7 +1645,7 @@ def __init__(
         col: ColumnElement[_T],
         *args: _ColumnExpressionOrLiteralArgument[Any],
         **kwargs: Any,
-    ): ...
+    ) -> None: ...
 
     @overload
     def __init__(
@@ -1598,19 +1653,19 @@ def __init__(
         col: _ColumnExpressionArgument[_T],
         *args: _ColumnExpressionOrLiteralArgument[Any],
         **kwargs: Any,
-    ): ...
+    ) -> None: ...
 
     @overload
     def __init__(
         self,
-        col: _ColumnExpressionOrLiteralArgument[_T],
+        col: _T,
         *args: _ColumnExpressionOrLiteralArgument[Any],
         **kwargs: Any,
-    ): ...
+    ) -> None: ...
 
     def __init__(
-        self, *args: _ColumnExpressionOrLiteralArgument[Any], **kwargs: Any
-    ):
+        self, *args: _ColumnExpressionOrLiteralArgument[_T], **kwargs: Any
+    ) -> None:
         fn_args: Sequence[ColumnElement[Any]] = [
             coercions.expect(
                 roles.ExpressionElementRole,
@@ -1625,7 +1680,42 @@ def __init__(
         super().__init__(*fn_args, **kwargs)
 
 
-class coalesce(ReturnTypeFromArgs[_T]):
+class ReturnTypeFromOptionalArgs(ReturnTypeFromArgs[_T]):
+    inherit_cache = True
+
+    @overload
+    def __init__(
+        self,
+        col: ColumnElement[_T],
+        *args: _ColumnExpressionOrLiteralArgument[Any],
+        **kwargs: Any,
+    ) -> None: ...
+
+    @overload
+    def __init__(
+        self,
+        col: _ColumnExpressionArgument[Optional[_T]],
+        *args: _ColumnExpressionOrLiteralArgument[Any],
+        **kwargs: Any,
+    ) -> None: ...
+
+    @overload
+    def __init__(
+        self,
+        col: Optional[_T],
+        *args: _ColumnExpressionOrLiteralArgument[Any],
+        **kwargs: Any,
+    ) -> None: ...
+
+    def __init__(
+        self,
+        *args: _ColumnExpressionOrLiteralArgument[Optional[_T]],
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(*args, **kwargs)  # type: ignore
+
+
+class coalesce(ReturnTypeFromOptionalArgs[_T]):
     _has_args = True
     inherit_cache = True
 
@@ -1692,7 +1782,7 @@ class char_length(GenericFunction[int]):
     type = sqltypes.Integer()
     inherit_cache = True
 
-    def __init__(self, arg: _ColumnExpressionArgument[str], **kw: Any):
+    def __init__(self, arg: _ColumnExpressionArgument[str], **kw: Any) -> None:
         # slight hack to limit to just one positional argument
         # not sure why this one function has this special treatment
         super().__init__(arg, **kw)
@@ -1738,7 +1828,7 @@ def __init__(
             _ColumnExpressionArgument[Any], _StarOrOne, None
         ] = None,
         **kwargs: Any,
-    ):
+    ) -> None:
         if expression is None:
             expression = literal_column("*")
         super().__init__(expression, **kwargs)
@@ -1807,7 +1897,7 @@ class user(AnsiFunction[str]):
     inherit_cache = True
 
 
-class array_agg(GenericFunction[_T]):
+class array_agg(ReturnTypeFromArgs[Sequence[_T]]):
     """Support for the ARRAY_AGG function.
 
     The ``func.array_agg(expr)`` construct returns an expression of
@@ -1827,7 +1917,9 @@ class array_agg(GenericFunction[_T]):
 
     inherit_cache = True
 
-    def __init__(self, *args: _ColumnExpressionArgument[Any], **kwargs: Any):
+    def __init__(
+        self, *args: _ColumnExpressionArgument[Any], **kwargs: Any
+    ) -> None:
         fn_args: Sequence[ColumnElement[Any]] = [
             coercions.expect(
                 roles.ExpressionElementRole, c, apply_propagate_attrs=self
@@ -2060,5 +2152,7 @@ class aggregate_strings(GenericFunction[str]):
     _has_args = True
     inherit_cache = True
 
-    def __init__(self, clause: _ColumnExpressionArgument[Any], separator: str):
+    def __init__(
+        self, clause: _ColumnExpressionArgument[Any], separator: str
+    ) -> None:
         super().__init__(clause, separator)
diff --git a/libs/sqlalchemy/sql/lambdas.py b/libs/sqlalchemy/sql/lambdas.py
index 8d70f800e7..a9e94aec13 100644
--- a/libs/sqlalchemy/sql/lambdas.py
+++ b/libs/sqlalchemy/sql/lambdas.py
@@ -1,5 +1,5 @@
 # sql/lambdas.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -256,10 +256,7 @@ def _retrieve_tracker_rec(self, fn, apply_propagate_attrs, opts):
 
                 self.closure_cache_key = cache_key
 
-                try:
-                    rec = lambda_cache[tracker_key + cache_key]
-                except KeyError:
-                    rec = None
+                rec = lambda_cache.get(tracker_key + cache_key)
             else:
                 cache_key = _cache_key.NO_CACHE
                 rec = None
@@ -303,7 +300,9 @@ def _retrieve_tracker_rec(self, fn, apply_propagate_attrs, opts):
             while lambda_element is not None:
                 rec = lambda_element._rec
                 if rec.bindparam_trackers:
-                    tracker_instrumented_fn = rec.tracker_instrumented_fn
+                    tracker_instrumented_fn = (
+                        rec.tracker_instrumented_fn  # type:ignore [union-attr] # noqa: E501
+                    )
                     for tracker in rec.bindparam_trackers:
                         tracker(
                             lambda_element.fn,
@@ -605,7 +604,7 @@ def _proxied(self) -> Any:
         return self._rec_expected_expr
 
     @property
-    def _with_options(self):
+    def _with_options(self):  # type: ignore[override]
         return self._proxied._with_options
 
     @property
@@ -613,7 +612,7 @@ def _effective_plugin_target(self):
         return self._proxied._effective_plugin_target
 
     @property
-    def _execution_options(self):
+    def _execution_options(self):  # type: ignore[override]
         return self._proxied._execution_options
 
     @property
@@ -621,27 +620,27 @@ def _all_selected_columns(self):
         return self._proxied._all_selected_columns
 
     @property
-    def is_select(self):
+    def is_select(self):  # type: ignore[override]
         return self._proxied.is_select
 
     @property
-    def is_update(self):
+    def is_update(self):  # type: ignore[override]
         return self._proxied.is_update
 
     @property
-    def is_insert(self):
+    def is_insert(self):  # type: ignore[override]
         return self._proxied.is_insert
 
     @property
-    def is_text(self):
+    def is_text(self):  # type: ignore[override]
         return self._proxied.is_text
 
     @property
-    def is_delete(self):
+    def is_delete(self):  # type: ignore[override]
         return self._proxied.is_delete
 
     @property
-    def is_dml(self):
+    def is_dml(self):  # type: ignore[override]
         return self._proxied.is_dml
 
     def spoil(self) -> NullLambdaStatement:
@@ -1173,7 +1172,7 @@ def _instrument_and_run_function(self, lambda_element):
                         closure_pywrappers.append(bind)
                 else:
                     value = fn.__globals__[name]
-                    new_globals[name] = bind = PyWrapper(fn, name, value)
+                    new_globals[name] = PyWrapper(fn, name, value)
 
             # rewrite the original fn.   things that look like they will
             # become bound parameters are wrapped in a PyWrapper.
@@ -1202,7 +1201,7 @@ def _coerce_expression(self, lambda_element, apply_propagate_attrs):
         """Run the tracker-generated expression through coercion rules.
 
         After the user-defined lambda has been invoked to produce a statement
-        for re-use, run it through coercion rules to both check that it's the
+        for reuse, run it through coercion rules to both check that it's the
         correct type of object and also to coerce it to its useful form.
 
         """
diff --git a/libs/sqlalchemy/sql/naming.py b/libs/sqlalchemy/sql/naming.py
index 58203e4b9a..74340f17c8 100644
--- a/libs/sqlalchemy/sql/naming.py
+++ b/libs/sqlalchemy/sql/naming.py
@@ -1,15 +1,12 @@
 # sql/naming.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: allow-untyped-defs, allow-untyped-calls
 
-"""Establish constraint and index naming conventions.
-
-
-"""
+"""Establish constraint and index naming conventions."""
 
 from __future__ import annotations
 
diff --git a/libs/sqlalchemy/sql/operators.py b/libs/sqlalchemy/sql/operators.py
index d5f876cb0d..5ba3fb99f5 100644
--- a/libs/sqlalchemy/sql/operators.py
+++ b/libs/sqlalchemy/sql/operators.py
@@ -1,5 +1,5 @@
 # sql/operators.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/roles.py b/libs/sqlalchemy/sql/roles.py
index da69616dc4..cecfa19817 100644
--- a/libs/sqlalchemy/sql/roles.py
+++ b/libs/sqlalchemy/sql/roles.py
@@ -1,5 +1,5 @@
 # sql/roles.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/schema.py b/libs/sqlalchemy/sql/schema.py
index 173b38c5fe..db397195d9 100644
--- a/libs/sqlalchemy/sql/schema.py
+++ b/libs/sqlalchemy/sql/schema.py
@@ -1,5 +1,5 @@
 # sql/schema.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -68,6 +68,7 @@
 from .base import DialectKWArgs
 from .base import Executable
 from .base import SchemaEventTarget as SchemaEventTarget
+from .base import SchemaVisitable as SchemaVisitable
 from .coercions import _document_text_coercion
 from .elements import ClauseElement
 from .elements import ColumnClause
@@ -91,13 +92,16 @@
 
 if typing.TYPE_CHECKING:
     from ._typing import _AutoIncrementType
+    from ._typing import _CreateDropBind
     from ._typing import _DDLColumnArgument
     from ._typing import _InfoType
     from ._typing import _TextCoercedExpressionArgument
     from ._typing import _TypeEngineArgument
+    from .base import ColumnSet
     from .base import ReadOnlyColumnCollection
     from .compiler import DDLCompiler
     from .elements import BindParameter
+    from .elements import KeyedColumnElement
     from .functions import Function
     from .type_api import TypeEngine
     from .visitors import anon_map
@@ -106,7 +110,6 @@
     from ..engine.interfaces import _CoreMultiExecuteParams
     from ..engine.interfaces import CoreExecuteOptionsParameter
     from ..engine.interfaces import ExecutionContext
-    from ..engine.mock import MockConnection
     from ..engine.reflection import _ReflectionInfo
     from ..sql.selectable import FromClause
 
@@ -115,8 +118,6 @@
 _TAB = TypeVar("_TAB", bound="Table")
 
 
-_CreateDropBind = Union["Engine", "Connection", "MockConnection"]
-
 _ConstraintNameArgument = Optional[Union[str, _NoneName]]
 
 _ServerDefaultArgument = Union[
@@ -210,7 +211,7 @@ def replace(
 
 
 @inspection._self_inspects
-class SchemaItem(SchemaEventTarget, visitors.Visitable):
+class SchemaItem(SchemaVisitable):
     """Base class for items that define a database schema."""
 
     __visit_name__ = "schema_item"
@@ -475,7 +476,7 @@ def _new(cls, *args: Any, **kw: Any) -> Any:
             table.dispatch.before_parent_attach(table, metadata)
             metadata._add_table(name, schema, table)
             try:
-                table.__init__(name, metadata, *args, _no_init=False, **kw)
+                table.__init__(name, metadata, *args, _no_init=False, **kw)  # type: ignore[misc] # noqa: E501
                 table.dispatch.after_parent_attach(table, metadata)
                 return table
             except Exception:
@@ -1621,7 +1622,7 @@ def __init__(
             ``SERIAL``, MySQL ``AUTO_INCREMENT``, or ``IDENTITY`` on SQL Server
             should also be rendered.  Not every database backend has an
             "implied" default generator available; for example the Oracle Database
-            backends alway needs an explicit construct such as
+            backends always needs an explicit construct such as
             :class:`.Identity` to be included with a :class:`.Column` in order
             for the DDL rendered to include auto-generating constructs to also
             be produced in the database.
@@ -2241,7 +2242,7 @@ def _onupdate_description_tuple(self) -> _DefaultDescriptionTuple:
         return _DefaultDescriptionTuple._from_column_default(self.onupdate)
 
     @util.memoized_property
-    def _gen_static_annotations_cache_key(self) -> bool:  # type: ignore
+    def _gen_static_annotations_cache_key(self) -> bool:
         """special attribute used by cache key gen, if true, we will
         use a static cache key for the annotations dictionary, else we
         will generate a new cache key for annotations each time.
@@ -2617,6 +2618,8 @@ def _merge(self, other: Column[Any]) -> None:
     def _make_proxy(
         self,
         selectable: FromClause,
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         name: Optional[str] = None,
         key: Optional[str] = None,
         name_is_truncatable: bool = False,
@@ -2686,10 +2689,13 @@ def _make_proxy(
         c._propagate_attrs = selectable._propagate_attrs
         if selectable._is_clone_of is not None:
             c._is_clone_of = selectable._is_clone_of.columns.get(c.key)
+
         if self.primary_key:
-            selectable.primary_key.add(c)  # type: ignore
+            primary_key.add(c)
+
         if fk:
-            selectable.foreign_keys.update(fk)  # type: ignore
+            foreign_keys.update(fk)  # type: ignore
+
         return c.key, c
 
 
@@ -2830,9 +2836,18 @@ def __init__(
             issuing DDL for this constraint. Typical values include CASCADE,
             DELETE and RESTRICT.
 
+            .. seealso::
+
+                :ref:`on_update_on_delete`
+
         :param ondelete: Optional string. If set, emit ON DELETE <value> when
             issuing DDL for this constraint. Typical values include CASCADE,
-            DELETE and RESTRICT.
+            SET NULL and RESTRICT.  Some dialects may allow for additional
+            syntaxes.
+
+            .. seealso::
+
+                :ref:`on_update_on_delete`
 
         :param deferrable: Optional bool. If set, emit DEFERRABLE or NOT
             DEFERRABLE when issuing DDL for this constraint.
@@ -4616,12 +4631,21 @@ def __init__(
         :param name: Optional, the in-database name of the key.
 
         :param onupdate: Optional string. If set, emit ON UPDATE <value> when
-          issuing DDL for this constraint. Typical values include CASCADE,
-          DELETE and RESTRICT.
+            issuing DDL for this constraint. Typical values include CASCADE,
+            DELETE and RESTRICT.
+
+            .. seealso::
+
+                :ref:`on_update_on_delete`
 
         :param ondelete: Optional string. If set, emit ON DELETE <value> when
-          issuing DDL for this constraint. Typical values include CASCADE,
-          DELETE and RESTRICT.
+            issuing DDL for this constraint. Typical values include CASCADE,
+            SET NULL and RESTRICT.  Some dialects may allow for additional
+            syntaxes.
+
+            .. seealso::
+
+                :ref:`on_update_on_delete`
 
         :param deferrable: Optional bool. If set, emit DEFERRABLE or NOT
           DEFERRABLE when issuing DDL for this constraint.
@@ -5595,7 +5619,7 @@ def __setstate__(self, state: Dict[str, Any]) -> None:
     def clear(self) -> None:
         """Clear all Table objects from this MetaData."""
 
-        dict.clear(self.tables)  # type: ignore
+        dict.clear(self.tables)
         self._schemas.clear()
         self._fk_memos.clear()
 
@@ -5809,13 +5833,17 @@ def reflect(
 
             kind = util.preloaded.engine_reflection.ObjectKind.TABLE
             available: util.OrderedSet[str] = util.OrderedSet(
-                insp.get_table_names(schema)
+                insp.get_table_names(schema, **dialect_kwargs)
             )
             if views:
                 kind = util.preloaded.engine_reflection.ObjectKind.ANY
-                available.update(insp.get_view_names(schema))
+                available.update(insp.get_view_names(schema, **dialect_kwargs))
                 try:
-                    available.update(insp.get_materialized_view_names(schema))
+                    available.update(
+                        insp.get_materialized_view_names(
+                            schema, **dialect_kwargs
+                        )
+                    )
                 except NotImplementedError:
                     pass
 
diff --git a/libs/sqlalchemy/sql/selectable.py b/libs/sqlalchemy/sql/selectable.py
index 7660a1dbc7..d7fd2cc9d2 100644
--- a/libs/sqlalchemy/sql/selectable.py
+++ b/libs/sqlalchemy/sql/selectable.py
@@ -1,5 +1,5 @@
 # sql/selectable.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -47,6 +47,7 @@
 from . import visitors
 from ._typing import _ColumnsClauseArgument
 from ._typing import _no_kw
+from ._typing import _T
 from ._typing import _TP
 from ._typing import is_column_element
 from ._typing import is_select_statement
@@ -71,6 +72,7 @@
 from .base import ColumnSet
 from .base import CompileState
 from .base import DedupeColumnCollection
+from .base import DialectKWArgs
 from .base import Executable
 from .base import Generative
 from .base import HasCompileState
@@ -101,9 +103,9 @@
 from ..util.typing import Protocol
 from ..util.typing import Self
 
+
 and_ = BooleanClauseList.and_
 
-_T = TypeVar("_T", bound=Any)
 
 if TYPE_CHECKING:
     from ._typing import _ColumnExpressionArgument
@@ -114,6 +116,7 @@
     from ._typing import _MAYBE_ENTITY
     from ._typing import _NOT_ENTITY
     from ._typing import _OnClauseArgument
+    from ._typing import _OnlyColumnArgument
     from ._typing import _SelectStatementForCompoundArgument
     from ._typing import _T0
     from ._typing import _T1
@@ -164,13 +167,18 @@ def entity_namespace(self) -> _EntityNamespace: ...
 _OnClauseElement = Union["ColumnElement[bool]", _JoinTargetProtocol]
 
 _ForUpdateOfArgument = Union[
-    # single column, Table, ORM Entity
+    # single column, Table, ORM entity
     Union[
         "_ColumnExpressionArgument[Any]",
         "_FromClauseArgument",
     ],
-    # or sequence of single column elements
-    Sequence["_ColumnExpressionArgument[Any]"],
+    # or sequence of column, Table, ORM entity
+    Sequence[
+        Union[
+            "_ColumnExpressionArgument[Any]",
+            "_FromClauseArgument",
+        ]
+    ],
 ]
 
 
@@ -240,7 +248,11 @@ def is_derived_from(self, fromclause: Optional[FromClause]) -> bool:
         raise NotImplementedError()
 
     def _generate_fromclause_column_proxies(
-        self, fromclause: FromClause
+        self,
+        fromclause: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
     ) -> None:
         """Populate columns into an :class:`.AliasedReturnsRows` object."""
 
@@ -282,7 +294,7 @@ class ExecutableReturnsRows(Executable, ReturnsRows):
 
 
 class TypedReturnsRows(ExecutableReturnsRows, Generic[_TP]):
-    """base for executable statements that return rows."""
+    """base for a typed executable statements that return rows."""
 
 
 class Selectable(ReturnsRows):
@@ -833,10 +845,17 @@ def description(self) -> str:
         return getattr(self, "name", self.__class__.__name__ + " object")
 
     def _generate_fromclause_column_proxies(
-        self, fromclause: FromClause
+        self,
+        fromclause: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
     ) -> None:
-        fromclause._columns._populate_separate_keys(
-            col._make_proxy(fromclause) for col in self.c
+        columns._populate_separate_keys(
+            col._make_proxy(
+                fromclause, primary_key=primary_key, foreign_keys=foreign_keys
+            )
+            for col in self.c
         )
 
     @util.ro_non_memoized_property
@@ -890,10 +909,33 @@ def c(self) -> ReadOnlyColumnCollection[str, KeyedColumnElement[Any]]:
 
         """
         if "_columns" not in self.__dict__:
-            self._init_collections()
-            self._populate_column_collection()
+            self._setup_collections()
         return self._columns.as_readonly()
 
+    def _setup_collections(self) -> None:
+        with util.mini_gil:
+            # detect another thread that raced ahead
+            if "_columns" in self.__dict__:
+                assert "primary_key" in self.__dict__
+                assert "foreign_keys" in self.__dict__
+                return
+
+            _columns: ColumnCollection[Any, Any] = ColumnCollection()
+            primary_key = ColumnSet()
+            foreign_keys: Set[KeyedColumnElement[Any]] = set()
+
+            self._populate_column_collection(
+                columns=_columns,
+                primary_key=primary_key,
+                foreign_keys=foreign_keys,
+            )
+
+            # assigning these three collections separately is not itself
+            # atomic, but greatly reduces the surface for problems
+            self._columns = _columns
+            self.primary_key = primary_key  # type: ignore
+            self.foreign_keys = foreign_keys  # type: ignore
+
     @util.ro_non_memoized_property
     def entity_namespace(self) -> _EntityNamespace:
         """Return a namespace used for name-based access in SQL expressions.
@@ -920,8 +962,7 @@ def primary_key(self) -> Iterable[NamedColumn[Any]]:
         iterable collection of :class:`_schema.Column` objects.
 
         """
-        self._init_collections()
-        self._populate_column_collection()
+        self._setup_collections()
         return self.primary_key
 
     @util.ro_memoized_property
@@ -938,8 +979,7 @@ def foreign_keys(self) -> Iterable[ForeignKey]:
             :attr:`_schema.Table.foreign_key_constraints`
 
         """
-        self._init_collections()
-        self._populate_column_collection()
+        self._setup_collections()
         return self.foreign_keys
 
     def _reset_column_collection(self) -> None:
@@ -963,20 +1003,16 @@ def _reset_column_collection(self) -> None:
     def _select_iterable(self) -> _SelectIterable:
         return (c for c in self.c if not _never_select_column(c))
 
-    def _init_collections(self) -> None:
-        assert "_columns" not in self.__dict__
-        assert "primary_key" not in self.__dict__
-        assert "foreign_keys" not in self.__dict__
-
-        self._columns = ColumnCollection()
-        self.primary_key = ColumnSet()  # type: ignore
-        self.foreign_keys = set()  # type: ignore
-
     @property
     def _cols_populated(self) -> bool:
         return "_columns" in self.__dict__
 
-    def _populate_column_collection(self) -> None:
+    def _populate_column_collection(
+        self,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
+    ) -> None:
         """Called on subclasses to establish the .c collection.
 
         Each implementation has a different way of establishing
@@ -1303,22 +1339,27 @@ def self_group(
         return FromGrouping(self)
 
     @util.preload_module("sqlalchemy.sql.util")
-    def _populate_column_collection(self) -> None:
+    def _populate_column_collection(
+        self,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
+    ) -> None:
         sqlutil = util.preloaded.sql_util
-        columns: List[KeyedColumnElement[Any]] = [c for c in self.left.c] + [
+        _columns: List[KeyedColumnElement[Any]] = [c for c in self.left.c] + [
             c for c in self.right.c
         ]
 
-        self.primary_key.extend(  # type: ignore
+        primary_key.extend(
             sqlutil.reduce_columns(
-                (c for c in columns if c.primary_key), self.onclause
+                (c for c in _columns if c.primary_key), self.onclause
             )
         )
-        self._columns._populate_separate_keys(
-            (col._tq_key_label, col) for col in columns
+        columns._populate_separate_keys(
+            (col._tq_key_label, col) for col in _columns  # type: ignore
         )
-        self.foreign_keys.update(  # type: ignore
-            itertools.chain(*[col.foreign_keys for col in columns])
+        foreign_keys.update(
+            itertools.chain(*[col.foreign_keys for col in _columns])  # type: ignore  # noqa: E501
         )
 
     def _copy_internals(
@@ -1345,7 +1386,7 @@ def _copy_internals(
         def replace(
             obj: Union[BinaryExpression[Any], ColumnClause[Any]],
             **kw: Any,
-        ) -> Optional[KeyedColumnElement[ColumnElement[Any]]]:
+        ) -> Optional[KeyedColumnElement[Any]]:
             if isinstance(obj, ColumnClause) and obj.table in new_froms:
                 newelem = new_froms[obj.table].corresponding_column(obj)
                 return newelem
@@ -1701,14 +1742,21 @@ def _refresh_for_new_column(self, column: ColumnElement[Any]) -> None:
         super()._refresh_for_new_column(column)
         self.element._refresh_for_new_column(column)
 
-    def _populate_column_collection(self) -> None:
-        self.element._generate_fromclause_column_proxies(self)
+    def _populate_column_collection(
+        self,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
+    ) -> None:
+        self.element._generate_fromclause_column_proxies(
+            self, columns, primary_key=primary_key, foreign_keys=foreign_keys
+        )
 
     @util.ro_non_memoized_property
     def description(self) -> str:
         name = self.name
         if isinstance(name, _anonymous_label):
-            name = "anon_1"
+            return "anon_1"
 
         return name
 
@@ -1748,6 +1796,14 @@ def _from_objects(self) -> List[FromClause]:
 class FromClauseAlias(AliasedReturnsRows):
     element: FromClause
 
+    @util.ro_non_memoized_property
+    def description(self) -> str:
+        name = self.name
+        if isinstance(name, _anonymous_label):
+            return f"Anonymous alias of {self.element.description}"
+
+        return name
+
 
 class Alias(roles.DMLTableRole, FromClauseAlias):
     """Represents an table or selectable alias (AS).
@@ -1951,7 +2007,7 @@ def render_derived(
         """  # noqa: E501
 
         # note: don't use the @_generative system here, keep a reference
-        # to the original object.  otherwise you can have re-use of the
+        # to the original object.  otherwise you can have reuse of the
         # python id() of the original which can cause name conflicts if
         # a new anon-name grabs the same identifier as the local anon-name
         # (just saw it happen on CI)
@@ -2142,11 +2198,26 @@ def _init(
             self._suffixes = _suffixes
         super()._init(selectable, name=name)
 
-    def _populate_column_collection(self) -> None:
+    def _populate_column_collection(
+        self,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
+    ) -> None:
         if self._cte_alias is not None:
-            self._cte_alias._generate_fromclause_column_proxies(self)
+            self._cte_alias._generate_fromclause_column_proxies(
+                self,
+                columns,
+                primary_key=primary_key,
+                foreign_keys=foreign_keys,
+            )
         else:
-            self.element._generate_fromclause_column_proxies(self)
+            self.element._generate_fromclause_column_proxies(
+                self,
+                columns,
+                primary_key=primary_key,
+                foreign_keys=foreign_keys,
+            )
 
     def alias(self, name: Optional[str] = None, flat: bool = False) -> CTE:
         """Return an :class:`_expression.Alias` of this
@@ -2172,7 +2243,7 @@ def alias(self, name: Optional[str] = None, flat: bool = False) -> CTE:
             _suffixes=self._suffixes,
         )
 
-    def union(self, *other: _SelectStatementForCompoundArgument) -> CTE:
+    def union(self, *other: _SelectStatementForCompoundArgument[Any]) -> CTE:
         r"""Return a new :class:`_expression.CTE` with a SQL ``UNION``
         of the original CTE against the given selectables provided
         as positional arguments.
@@ -2201,7 +2272,9 @@ def union(self, *other: _SelectStatementForCompoundArgument) -> CTE:
             _suffixes=self._suffixes,
         )
 
-    def union_all(self, *other: _SelectStatementForCompoundArgument) -> CTE:
+    def union_all(
+        self, *other: _SelectStatementForCompoundArgument[Any]
+    ) -> CTE:
         r"""Return a new :class:`_expression.CTE` with a SQL ``UNION ALL``
         of the original CTE against the given selectables provided
         as positional arguments.
@@ -2289,10 +2362,11 @@ def _generate_columns_plus_names(
         cols: Optional[_SelectIterable] = None,
     ) -> List[_ColumnsPlusNames]:
         """Generate column names as rendered in a SELECT statement by
-        the compiler.
+        the compiler, as well as tokens used to populate the .c. collection
+        on a :class:`.FromClause`.
 
         This is distinct from the _column_naming_convention generator that's
-        intended for population of .c collections and similar, which has
+        intended for population of the Select.selected_columns collection,
         different rules.   the collection returned here calls upon the
         _column_naming_convention as well.
 
@@ -2462,6 +2536,14 @@ class HasCTE(roles.HasCTERole, SelectsRows):
     _independent_ctes: Tuple[CTE, ...] = ()
     _independent_ctes_opts: Tuple[_CTEOpts, ...] = ()
 
+    name_cte_columns: bool = False
+    """indicates if this HasCTE as contained within a CTE should compel the CTE
+    to render the column names of this object in the WITH clause.
+
+    .. versionadded:: 2.0.42
+
+    """
+
     @_generative
     def add_cte(self, *ctes: CTE, nest_here: bool = False) -> Self:
         r"""Add one or more :class:`_sql.CTE` constructs to this statement.
@@ -2944,9 +3026,6 @@ class FromGrouping(GroupedElement, FromClause):
     def __init__(self, element: FromClause):
         self.element = coercions.expect(roles.FromClauseRole, element)
 
-    def _init_collections(self) -> None:
-        pass
-
     @util.ro_non_memoized_property
     def columns(
         self,
@@ -3107,9 +3186,6 @@ def __str__(self) -> str:
     def _refresh_for_new_column(self, column: ColumnElement[Any]) -> None:
         pass
 
-    def _init_collections(self) -> None:
-        pass
-
     @util.ro_memoized_property
     def description(self) -> str:
         return self.name
@@ -3248,7 +3324,7 @@ def __init__(
             self.of = None
 
 
-class Values(roles.InElementRole, Generative, LateralFromClause):
+class Values(roles.InElementRole, HasCTE, Generative, LateralFromClause):
     """Represent a ``VALUES`` construct that can be used as a FROM element
     in a statement.
 
@@ -3262,6 +3338,7 @@ class Values(roles.InElementRole, Generative, LateralFromClause):
     __visit_name__ = "values"
 
     _data: Tuple[Sequence[Tuple[Any, ...]], ...] = ()
+    _column_args: Tuple[NamedColumn[Any], ...]
 
     _unnamed: bool
     _traverse_internals: _TraverseInternalsType = [
@@ -3269,16 +3346,21 @@ class Values(roles.InElementRole, Generative, LateralFromClause):
         ("_data", InternalTraversal.dp_dml_multi_values),
         ("name", InternalTraversal.dp_string),
         ("literal_binds", InternalTraversal.dp_boolean),
-    ]
+    ] + HasCTE._has_ctes_traverse_internals
+
+    name_cte_columns = True
 
     def __init__(
         self,
-        *columns: ColumnClause[Any],
+        *columns: _OnlyColumnArgument[Any],
         name: Optional[str] = None,
         literal_binds: bool = False,
     ):
         super().__init__()
-        self._column_args = columns
+        self._column_args = tuple(
+            coercions.expect(roles.LabeledColumnExprRole, col)
+            for col in columns
+        )
 
         if name is None:
             self._unnamed = True
@@ -3293,6 +3375,10 @@ def __init__(
     def _column_types(self) -> List[TypeEngine[Any]]:
         return [col.type for col in self._column_args]
 
+    @util.ro_non_memoized_property
+    def _all_selected_columns(self) -> _SelectIterable:
+        return self._column_args
+
     @_generative
     def alias(self, name: Optional[str] = None, flat: bool = False) -> Self:
         """Return a new :class:`_expression.Values`
@@ -3322,7 +3408,7 @@ def alias(self, name: Optional[str] = None, flat: bool = False) -> Self:
         return self
 
     @_generative
-    def lateral(self, name: Optional[str] = None) -> LateralFromClause:
+    def lateral(self, name: Optional[str] = None) -> Self:
         """Return a new :class:`_expression.Values` with the lateral flag set,
         so that
         it renders as LATERAL.
@@ -3371,16 +3457,23 @@ def scalar_values(self) -> ScalarValues:
         """
         return ScalarValues(self._column_args, self._data, self.literal_binds)
 
-    def _populate_column_collection(self) -> None:
+    def _populate_column_collection(
+        self,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
+    ) -> None:
         for c in self._column_args:
             if c.table is not None and c.table is not self:
-                _, c = c._make_proxy(self)
+                _, c = c._make_proxy(
+                    self, primary_key=primary_key, foreign_keys=foreign_keys
+                )
             else:
                 # if the column was used in other contexts, ensure
                 # no memoizations of other FROM clauses.
                 # see test_values.py -> test_auto_proxy_select_direct_col
                 c._reset_memoizations()
-            self._columns.add(c)
+            columns.add(c)
             c.table = self
 
     @util.ro_non_memoized_property
@@ -3411,7 +3504,7 @@ class ScalarValues(roles.InElementRole, GroupedElement, ColumnElement[Any]):
 
     def __init__(
         self,
-        columns: Sequence[ColumnClause[Any]],
+        columns: Sequence[NamedColumn[Any]],
         data: Tuple[Sequence[Tuple[Any, ...]], ...],
         literal_binds: bool,
     ):
@@ -3433,6 +3526,8 @@ def self_group(
             self, against: Optional[OperatorType] = None
         ) -> Self: ...
 
+        def _ungroup(self) -> ColumnElement[Any]: ...
+
 
 class SelectBase(
     roles.SelectStatementRole,
@@ -3496,6 +3591,9 @@ def selected_columns(
     def _generate_fromclause_column_proxies(
         self,
         subquery: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         *,
         proxy_compound_columns: Optional[
             Iterable[Sequence[ColumnElement[Any]]]
@@ -3823,13 +3921,20 @@ def _ungroup(self) -> _SB: ...
     def _generate_fromclause_column_proxies(
         self,
         subquery: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         *,
         proxy_compound_columns: Optional[
             Iterable[Sequence[ColumnElement[Any]]]
         ] = None,
     ) -> None:
         self.element._generate_fromclause_column_proxies(
-            subquery, proxy_compound_columns=proxy_compound_columns
+            subquery,
+            columns,
+            proxy_compound_columns=proxy_compound_columns,
+            primary_key=primary_key,
+            foreign_keys=foreign_keys,
         )
 
     @util.ro_non_memoized_property
@@ -3856,12 +3961,15 @@ def selected_columns(self) -> ColumnCollection[str, ColumnElement[Any]]:
     def _from_objects(self) -> List[FromClause]:
         return self.element._from_objects
 
+    def _scalar_type(self) -> TypeEngine[Any]:
+        return self.element._scalar_type()
+
     def add_cte(self, *ctes: CTE, nest_here: bool = False) -> Self:
         # SelectStatementGrouping not generative: has no attribute '_generate'
         raise NotImplementedError
 
 
-class GenerativeSelect(SelectBase, Generative):
+class GenerativeSelect(DialectKWArgs, SelectBase, Generative):
     """Base class for SELECT statements where additional elements can be
     added.
 
@@ -4142,8 +4250,9 @@ def fetch(
         count: _LimitOffsetType,
         with_ties: bool = False,
         percent: bool = False,
+        **dialect_kw: Any,
     ) -> Self:
-        """Return a new selectable with the given FETCH FIRST criterion
+        r"""Return a new selectable with the given FETCH FIRST criterion
         applied.
 
         This is a numeric value which usually renders as ``FETCH {FIRST | NEXT}
@@ -4173,6 +4282,11 @@ def fetch(
         :param percent: When ``True``, ``count`` represents the percentage
          of the total number of selected rows to return. Defaults to ``False``
 
+        :param \**dialect_kw: Additional dialect-specific keyword arguments
+         may be accepted by dialects.
+
+         .. versionadded:: 2.0.41
+
         .. seealso::
 
            :meth:`_sql.GenerativeSelect.limit`
@@ -4180,7 +4294,7 @@ def fetch(
            :meth:`_sql.GenerativeSelect.offset`
 
         """
-
+        self._validate_dialect_kwargs(dialect_kw)
         self._limit_clause = None
         if count is None:
             self._fetch_clause = self._fetch_clause_options = None
@@ -4294,8 +4408,13 @@ def order_by(
             stmt = stmt.order_by(None).order_by(new_col)
 
         :param \*clauses: a series of :class:`_expression.ColumnElement`
-         constructs
-         which will be used to generate an ORDER BY clause.
+         constructs which will be used to generate an ORDER BY clause.
+
+         Alternatively, an individual entry may also be the string name of a
+         label located elsewhere in the columns clause of the statement which
+         will be matched and rendered in a backend-specific way based on
+         context; see :ref:`tutorial_order_by_label` for background on string
+         label matching in ORDER BY and GROUP BY expressions.
 
         .. seealso::
 
@@ -4335,8 +4454,13 @@ def group_by(
             stmt = select(table.c.name, func.max(table.c.stat)).group_by(table.c.name)
 
         :param \*clauses: a series of :class:`_expression.ColumnElement`
-         constructs
-         which will be used to generate an GROUP BY clause.
+         constructs which will be used to generate an GROUP BY clause.
+
+         Alternatively, an individual entry may also be the string name of a
+         label located elsewhere in the columns clause of the statement which
+         will be matched and rendered in a backend-specific way based on
+         context; see :ref:`tutorial_order_by_label` for background on string
+         label matching in ORDER BY and GROUP BY expressions.
 
         .. seealso::
 
@@ -4385,7 +4509,7 @@ class _CompoundSelectKeyword(Enum):
     INTERSECT_ALL = "INTERSECT ALL"
 
 
-class CompoundSelect(HasCompileState, GenerativeSelect, ExecutableReturnsRows):
+class CompoundSelect(HasCompileState, GenerativeSelect, TypedReturnsRows[_TP]):
     """Forms the basis of ``UNION``, ``UNION ALL``, and other
     SELECT-based set operations.
 
@@ -4422,6 +4546,8 @@ class CompoundSelect(HasCompileState, GenerativeSelect, ExecutableReturnsRows):
         ]
         + SupportsCloneAnnotations._clone_annotations_traverse_internals
         + HasCTE._has_ctes_traverse_internals
+        + DialectKWArgs._dialect_kwargs_traverse_internals
+        + Executable._executable_traverse_internals
     )
 
     selects: List[SelectBase]
@@ -4432,7 +4558,7 @@ class CompoundSelect(HasCompileState, GenerativeSelect, ExecutableReturnsRows):
     def __init__(
         self,
         keyword: _CompoundSelectKeyword,
-        *selects: _SelectStatementForCompoundArgument,
+        *selects: _SelectStatementForCompoundArgument[_TP],
     ):
         self.keyword = keyword
         self.selects = [
@@ -4446,38 +4572,38 @@ def __init__(
 
     @classmethod
     def _create_union(
-        cls, *selects: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        cls, *selects: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         return CompoundSelect(_CompoundSelectKeyword.UNION, *selects)
 
     @classmethod
     def _create_union_all(
-        cls, *selects: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        cls, *selects: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         return CompoundSelect(_CompoundSelectKeyword.UNION_ALL, *selects)
 
     @classmethod
     def _create_except(
-        cls, *selects: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        cls, *selects: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         return CompoundSelect(_CompoundSelectKeyword.EXCEPT, *selects)
 
     @classmethod
     def _create_except_all(
-        cls, *selects: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        cls, *selects: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         return CompoundSelect(_CompoundSelectKeyword.EXCEPT_ALL, *selects)
 
     @classmethod
     def _create_intersect(
-        cls, *selects: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        cls, *selects: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         return CompoundSelect(_CompoundSelectKeyword.INTERSECT, *selects)
 
     @classmethod
     def _create_intersect_all(
-        cls, *selects: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        cls, *selects: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         return CompoundSelect(_CompoundSelectKeyword.INTERSECT_ALL, *selects)
 
     def _scalar_type(self) -> TypeEngine[Any]:
@@ -4494,7 +4620,7 @@ def is_derived_from(self, fromclause: Optional[FromClause]) -> bool:
                 return True
         return False
 
-    def set_label_style(self, style: SelectLabelStyle) -> CompoundSelect:
+    def set_label_style(self, style: SelectLabelStyle) -> Self:
         if self._label_style is not style:
             self = self._generate()
             select_0 = self.selects[0].set_label_style(style)
@@ -4502,7 +4628,7 @@ def set_label_style(self, style: SelectLabelStyle) -> CompoundSelect:
 
         return self
 
-    def _ensure_disambiguated_names(self) -> CompoundSelect:
+    def _ensure_disambiguated_names(self) -> Self:
         new_select = self.selects[0]._ensure_disambiguated_names()
         if new_select is not self.selects[0]:
             self = self._generate()
@@ -4513,6 +4639,9 @@ def _ensure_disambiguated_names(self) -> CompoundSelect:
     def _generate_fromclause_column_proxies(
         self,
         subquery: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         *,
         proxy_compound_columns: Optional[
             Iterable[Sequence[ColumnElement[Any]]]
@@ -4553,7 +4682,11 @@ def _generate_fromclause_column_proxies(
         # i haven't tried to think what it means for compound nested in
         # compound
         select_0._generate_fromclause_column_proxies(
-            subquery, proxy_compound_columns=extra_col_iterator
+            subquery,
+            columns,
+            proxy_compound_columns=extra_col_iterator,
+            primary_key=primary_key,
+            foreign_keys=foreign_keys,
         )
 
     def _refresh_for_new_column(self, column: ColumnElement[Any]) -> None:
@@ -4621,7 +4754,7 @@ def get_plugin_class(
     def __init__(
         self,
         statement: Select[Any],
-        compiler: Optional[SQLCompiler],
+        compiler: SQLCompiler,
         **kw: Any,
     ):
         self.statement = statement
@@ -5236,6 +5369,7 @@ class Select(
         + HasHints._has_hints_traverse_internals
         + SupportsCloneAnnotations._clone_annotations_traverse_internals
         + Executable._executable_traverse_internals
+        + DialectKWArgs._dialect_kwargs_traverse_internals
     )
 
     _cache_key_traversal: _CacheKeyTraversalType = _traverse_internals + [
@@ -5257,7 +5391,9 @@ def _create_raw_select(cls, **kw: Any) -> Select[Any]:
         stmt.__dict__.update(kw)
         return stmt
 
-    def __init__(self, *entities: _ColumnsClauseArgument[Any]):
+    def __init__(
+        self, *entities: _ColumnsClauseArgument[Any], **dialect_kw: Any
+    ):
         r"""Construct a new :class:`_expression.Select`.
 
         The public constructor for :class:`_expression.Select` is the
@@ -5270,7 +5406,6 @@ def __init__(self, *entities: _ColumnsClauseArgument[Any]):
             )
             for ent in entities
         ]
-
         GenerativeSelect.__init__(self)
 
     def _scalar_type(self) -> TypeEngine[Any]:
@@ -5669,8 +5804,9 @@ def get_final_froms(self) -> Sequence[FromClause]:
             :attr:`_sql.Select.columns_clause_froms`
 
         """
+        compiler = self._default_compiler()
 
-        return self._compile_state_factory(self, None)._get_display_froms()
+        return self._compile_state_factory(self, compiler)._get_display_froms()
 
     @property
     @util.deprecated(
@@ -5771,7 +5907,7 @@ def _copy_internals(
         def replace(
             obj: Union[BinaryExpression[Any], ColumnClause[Any]],
             **kw: Any,
-        ) -> Optional[KeyedColumnElement[ColumnElement[Any]]]:
+        ) -> Optional[KeyedColumnElement[Any]]:
             if isinstance(obj, ColumnClause) and obj.table in new_froms:
                 newelem = new_froms[obj.table].corresponding_column(obj)
                 return newelem
@@ -6428,6 +6564,9 @@ def _ensure_disambiguated_names(self) -> Select[Any]:
     def _generate_fromclause_column_proxies(
         self,
         subquery: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         *,
         proxy_compound_columns: Optional[
             Iterable[Sequence[ColumnElement[Any]]]
@@ -6445,6 +6584,8 @@ def _generate_fromclause_column_proxies(
                     name=required_label_name,
                     name_is_truncatable=True,
                     compound_select_cols=extra_cols,
+                    primary_key=primary_key,
+                    foreign_keys=foreign_keys,
                 )
                 for (
                     (
@@ -6470,6 +6611,8 @@ def _generate_fromclause_column_proxies(
                     key=proxy_key,
                     name=required_label_name,
                     name_is_truncatable=True,
+                    primary_key=primary_key,
+                    foreign_keys=foreign_keys,
                 )
                 for (
                     required_label_name,
@@ -6481,7 +6624,7 @@ def _generate_fromclause_column_proxies(
                 if is_column_element(c)
             ]
 
-        subquery._columns._populate_separate_keys(prox)
+        columns._populate_separate_keys(prox)
 
     def _needs_parens_for_grouping(self) -> bool:
         return self._has_row_limiting_clause or bool(
@@ -6508,8 +6651,8 @@ def self_group(
             return SelectStatementGrouping(self)
 
     def union(
-        self, *other: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        self, *other: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         r"""Return a SQL ``UNION`` of this select() construct against
         the given selectables provided as positional arguments.
 
@@ -6527,8 +6670,8 @@ def union(
         return CompoundSelect._create_union(self, *other)
 
     def union_all(
-        self, *other: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        self, *other: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         r"""Return a SQL ``UNION ALL`` of this select() construct against
         the given selectables provided as positional arguments.
 
@@ -6546,8 +6689,8 @@ def union_all(
         return CompoundSelect._create_union_all(self, *other)
 
     def except_(
-        self, *other: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        self, *other: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         r"""Return a SQL ``EXCEPT`` of this select() construct against
         the given selectable provided as positional arguments.
 
@@ -6562,8 +6705,8 @@ def except_(
         return CompoundSelect._create_except(self, *other)
 
     def except_all(
-        self, *other: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        self, *other: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         r"""Return a SQL ``EXCEPT ALL`` of this select() construct against
         the given selectables provided as positional arguments.
 
@@ -6578,8 +6721,8 @@ def except_all(
         return CompoundSelect._create_except_all(self, *other)
 
     def intersect(
-        self, *other: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        self, *other: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         r"""Return a SQL ``INTERSECT`` of this select() construct against
         the given selectables provided as positional arguments.
 
@@ -6597,8 +6740,8 @@ def intersect(
         return CompoundSelect._create_intersect(self, *other)
 
     def intersect_all(
-        self, *other: _SelectStatementForCompoundArgument
-    ) -> CompoundSelect:
+        self, *other: _SelectStatementForCompoundArgument[_TP]
+    ) -> CompoundSelect[_TP]:
         r"""Return a SQL ``INTERSECT ALL`` of this select() construct
         against the given selectables provided as positional arguments.
 
@@ -6685,9 +6828,8 @@ def where(self, crit: _ColumnExpressionArgument[bool]) -> Self:
     def self_group(self, against: Optional[OperatorType] = None) -> Self:
         return self
 
-    if TYPE_CHECKING:
-
-        def _ungroup(self) -> Select[Any]: ...
+    def _ungroup(self) -> Self:
+        return self
 
     @_generative
     def correlate(
@@ -6775,7 +6917,6 @@ class Exists(UnaryExpression[bool]):
     """
 
     inherit_cache = True
-    element: Union[SelectStatementGrouping[Select[Any]], ScalarSelect[Any]]
 
     def __init__(
         self,
@@ -6801,7 +6942,6 @@ def __init__(
             s,
             operator=operators.exists,
             type_=type_api.BOOLEANTYPE,
-            wraps_column_expression=True,
         )
 
     @util.ro_non_memoized_property
@@ -6809,13 +6949,19 @@ def _from_objects(self) -> List[FromClause]:
         return []
 
     def _regroup(
-        self, fn: Callable[[Select[Any]], Select[Any]]
-    ) -> SelectStatementGrouping[Select[Any]]:
-        element = self.element._ungroup()
+        self,
+        fn: Callable[[Select[Any]], Select[Any]],
+    ) -> ScalarSelect[Any]:
+
+        assert isinstance(self.element, ScalarSelect)
+        element = self.element.element
+        if not isinstance(element, Select):
+            raise exc.InvalidRequestError(
+                "Can only apply this operation to a plain SELECT construct"
+            )
         new_element = fn(element)
 
-        return_value = new_element.self_group(against=operators.exists)
-        assert isinstance(return_value, SelectStatementGrouping)
+        return_value = new_element.scalar_subquery()
         return return_value
 
     def select(self) -> Select[Tuple[bool]]:
@@ -6870,7 +7016,6 @@ def correlate_except(
             :meth:`_sql.ScalarSelect.correlate_except`
 
         """
-
         e = self._clone()
         e.element = self._regroup(
             lambda element: element.correlate_except(*fromclauses)
@@ -6950,6 +7095,7 @@ class was renamed
         ]
         + SupportsCloneAnnotations._clone_annotations_traverse_internals
         + HasCTE._has_ctes_traverse_internals
+        + Executable._executable_traverse_internals
     )
 
     _is_textual = True
@@ -7033,6 +7179,9 @@ def bindparams(
     def _generate_fromclause_column_proxies(
         self,
         fromclause: FromClause,
+        columns: ColumnCollection[str, KeyedColumnElement[Any]],
+        primary_key: ColumnSet,
+        foreign_keys: Set[KeyedColumnElement[Any]],
         *,
         proxy_compound_columns: Optional[
             Iterable[Sequence[ColumnElement[Any]]]
@@ -7042,15 +7191,25 @@ def _generate_fromclause_column_proxies(
             assert isinstance(fromclause, Subquery)
 
         if proxy_compound_columns:
-            fromclause._columns._populate_separate_keys(
-                c._make_proxy(fromclause, compound_select_cols=extra_cols)
+            columns._populate_separate_keys(
+                c._make_proxy(
+                    fromclause,
+                    compound_select_cols=extra_cols,
+                    primary_key=primary_key,
+                    foreign_keys=foreign_keys,
+                )
                 for c, extra_cols in zip(
                     self.column_args, proxy_compound_columns
                 )
             )
         else:
-            fromclause._columns._populate_separate_keys(
-                c._make_proxy(fromclause) for c in self.column_args
+            columns._populate_separate_keys(
+                c._make_proxy(
+                    fromclause,
+                    primary_key=primary_key,
+                    foreign_keys=foreign_keys,
+                )
+                for c in self.column_args
             )
 
     def _scalar_type(self) -> Union[TypeEngine[Any], Any]:
@@ -7062,11 +7221,28 @@ def _scalar_type(self) -> Union[TypeEngine[Any], Any]:
 
 
 class AnnotatedFromClause(Annotated):
-    def _copy_internals(self, **kw: Any) -> None:
+    def _copy_internals(
+        self,
+        _annotations_traversal: bool = False,
+        ind_cols_on_fromclause: bool = False,
+        **kw: Any,
+    ) -> None:
         super()._copy_internals(**kw)
-        if kw.get("ind_cols_on_fromclause", False):
+
+        # passed from annotations._shallow_annotate(), _deep_annotate(), etc.
+        # the traversals used by annotations for these cases are not currently
+        # designed around expecting that inner elements inside of
+        # AnnotatedFromClause's element are also deep copied, so skip for these
+        # cases. in other cases such as plain visitors.cloned_traverse(), we
+        # expect this to happen. see issue #12915
+        if not _annotations_traversal:
             ee = self._Annotated__element  # type: ignore
+            ee._copy_internals(**kw)
 
+        if ind_cols_on_fromclause:
+            # passed from annotations._deep_annotate().  See that function
+            # for notes
+            ee = self._Annotated__element  # type: ignore
             self.c = ee.__class__.c.fget(self)  # type: ignore
 
     @util.ro_memoized_property
diff --git a/libs/sqlalchemy/sql/sqltypes.py b/libs/sqlalchemy/sql/sqltypes.py
index ee471a6c4e..dccc64bba1 100644
--- a/libs/sqlalchemy/sql/sqltypes.py
+++ b/libs/sqlalchemy/sql/sqltypes.py
@@ -1,14 +1,12 @@
 # sql/sqltypes.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: allow-untyped-defs, allow-untyped-calls
 
-"""SQL specific types.
-
-"""
+"""SQL specific types."""
 from __future__ import annotations
 
 import collections.abc as collections_abc
@@ -21,7 +19,9 @@
 from typing import Callable
 from typing import cast
 from typing import Dict
+from typing import Iterable
 from typing import List
+from typing import Mapping
 from typing import Optional
 from typing import overload
 from typing import Sequence
@@ -67,11 +67,14 @@
 
 if TYPE_CHECKING:
     from ._typing import _ColumnExpressionArgument
+    from ._typing import _CreateDropBind
     from ._typing import _TypeEngineArgument
+    from .elements import ColumnElement
     from .operators import OperatorType
     from .schema import MetaData
     from .type_api import _BindProcessorType
     from .type_api import _ComparatorFactory
+    from .type_api import _LiteralProcessorType
     from .type_api import _MatchedOnType
     from .type_api import _ResultProcessorType
     from ..engine.interfaces import Dialect
@@ -79,6 +82,7 @@
 _T = TypeVar("_T", bound="Any")
 _CT = TypeVar("_CT", bound=Any)
 _TE = TypeVar("_TE", bound="TypeEngine[Any]")
+_P = TypeVar("_P")
 
 
 class HasExpressionLookup(TypeEngineMixin):
@@ -244,10 +248,14 @@ def process(value):
 
         return process
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> Optional[_BindProcessorType[str]]:
         return None
 
-    def result_processor(self, dialect, coltype):
+    def result_processor(
+        self, dialect: Dialect, coltype: object
+    ) -> Optional[_ResultProcessorType[str]]:
         return None
 
     @property
@@ -603,7 +611,10 @@ class Float(Numeric[_N]):
 
     __visit_name__ = "float"
 
-    scale = None
+    if not TYPE_CHECKING:
+        # this is not in 2.1 branch, not clear if needed for 2.0
+        # implementation
+        scale = None
 
     @overload
     def __init__(
@@ -868,6 +879,8 @@ def literal_processor(self, dialect):
 class _Binary(TypeEngine[bytes]):
     """Define base behavior for binary types."""
 
+    length: Optional[int]
+
     def __init__(self, length: Optional[int] = None):
         self.length = length
 
@@ -1114,21 +1127,23 @@ def adapt(
         kw.setdefault("_adapted_from", self)
         return super().adapt(cls, **kw)
 
-    def create(self, bind, checkfirst=False):
+    def create(self, bind: _CreateDropBind, checkfirst: bool = False) -> None:
         """Issue CREATE DDL for this type, if applicable."""
 
         t = self.dialect_impl(bind.dialect)
         if isinstance(t, SchemaType) and t.__class__ is not self.__class__:
             t.create(bind, checkfirst=checkfirst)
 
-    def drop(self, bind, checkfirst=False):
+    def drop(self, bind: _CreateDropBind, checkfirst: bool = False) -> None:
         """Issue DROP DDL for this type, if applicable."""
 
         t = self.dialect_impl(bind.dialect)
         if isinstance(t, SchemaType) and t.__class__ is not self.__class__:
             t.drop(bind, checkfirst=checkfirst)
 
-    def _on_table_create(self, target, bind, **kw):
+    def _on_table_create(
+        self, target: Any, bind: _CreateDropBind, **kw: Any
+    ) -> None:
         if not self._is_impl_for_variant(bind.dialect, kw):
             return
 
@@ -1136,7 +1151,9 @@ def _on_table_create(self, target, bind, **kw):
         if isinstance(t, SchemaType) and t.__class__ is not self.__class__:
             t._on_table_create(target, bind, **kw)
 
-    def _on_table_drop(self, target, bind, **kw):
+    def _on_table_drop(
+        self, target: Any, bind: _CreateDropBind, **kw: Any
+    ) -> None:
         if not self._is_impl_for_variant(bind.dialect, kw):
             return
 
@@ -1144,7 +1161,9 @@ def _on_table_drop(self, target, bind, **kw):
         if isinstance(t, SchemaType) and t.__class__ is not self.__class__:
             t._on_table_drop(target, bind, **kw)
 
-    def _on_metadata_create(self, target, bind, **kw):
+    def _on_metadata_create(
+        self, target: Any, bind: _CreateDropBind, **kw: Any
+    ) -> None:
         if not self._is_impl_for_variant(bind.dialect, kw):
             return
 
@@ -1152,7 +1171,9 @@ def _on_metadata_create(self, target, bind, **kw):
         if isinstance(t, SchemaType) and t.__class__ is not self.__class__:
             t._on_metadata_create(target, bind, **kw)
 
-    def _on_metadata_drop(self, target, bind, **kw):
+    def _on_metadata_drop(
+        self, target: Any, bind: _CreateDropBind, **kw: Any
+    ) -> None:
         if not self._is_impl_for_variant(bind.dialect, kw):
             return
 
@@ -1160,7 +1181,9 @@ def _on_metadata_drop(self, target, bind, **kw):
         if isinstance(t, SchemaType) and t.__class__ is not self.__class__:
             t._on_metadata_drop(target, bind, **kw)
 
-    def _is_impl_for_variant(self, dialect, kw):
+    def _is_impl_for_variant(
+        self, dialect: Dialect, kw: Dict[str, Any]
+    ) -> Optional[bool]:
         variant_mapping = kw.pop("variant_mapping", None)
 
         if not variant_mapping:
@@ -1177,7 +1200,7 @@ def _is_impl_for_variant(self, dialect, kw):
 
         # since PostgreSQL is the only DB that has ARRAY this can only
         # be integration tested by PG-specific tests
-        def _we_are_the_impl(typ):
+        def _we_are_the_impl(typ: SchemaType) -> bool:
             return (
                 typ is self
                 or isinstance(typ, ARRAY)
@@ -1190,6 +1213,11 @@ def _we_are_the_impl(typ):
             return True
         elif dialect.name not in variant_mapping:
             return _we_are_the_impl(variant_mapping["_default"])
+        else:
+            return None
+
+
+_EnumTupleArg = Union[Sequence[enum.Enum], Sequence[str]]
 
 
 class Enum(String, SchemaType, Emulated, TypeEngine[Union[str, enum.Enum]]):
@@ -1268,7 +1296,18 @@ class MyEnum(enum.Enum):
 
     __visit_name__ = "enum"
 
-    def __init__(self, *enums: object, **kw: Any):
+    values_callable: Optional[Callable[[Type[enum.Enum]], Sequence[str]]]
+    enum_class: Optional[Type[enum.Enum]]
+    _valid_lookup: Dict[Union[enum.Enum, str, None], Optional[str]]
+    _object_lookup: Dict[Optional[str], Union[enum.Enum, str, None]]
+
+    @overload
+    def __init__(self, enums: Type[enum.Enum], **kw: Any) -> None: ...
+
+    @overload
+    def __init__(self, *enums: str, **kw: Any) -> None: ...
+
+    def __init__(self, *enums: Union[str, Type[enum.Enum]], **kw: Any) -> None:
         r"""Construct an enum.
 
         Keyword arguments which don't apply to a specific backend are ignored
@@ -1400,7 +1439,7 @@ class was used, its name (converted to lower case) is used by
            .. versionchanged:: 2.0 This parameter now defaults to True.
 
         """
-        self._enum_init(enums, kw)
+        self._enum_init(enums, kw)  # type: ignore[arg-type]
 
     @property
     def _enums_argument(self):
@@ -1409,7 +1448,7 @@ def _enums_argument(self):
         else:
             return self.enums
 
-    def _enum_init(self, enums, kw):
+    def _enum_init(self, enums: _EnumTupleArg, kw: Dict[str, Any]) -> None:
         """internal init for :class:`.Enum` and subclasses.
 
         friendly init helper used by subclasses to remove
@@ -1468,15 +1507,19 @@ def _enum_init(self, enums, kw):
             _adapted_from=kw.pop("_adapted_from", None),
         )
 
-    def _parse_into_values(self, enums, kw):
+    def _parse_into_values(
+        self, enums: _EnumTupleArg, kw: Any
+    ) -> Tuple[Sequence[str], _EnumTupleArg]:
         if not enums and "_enums" in kw:
             enums = kw.pop("_enums")
 
         if len(enums) == 1 and hasattr(enums[0], "__members__"):
-            self.enum_class = enums[0]
+            self.enum_class = enums[0]  # type: ignore[assignment]
+            assert self.enum_class is not None
 
             _members = self.enum_class.__members__
 
+            members: Mapping[str, enum.Enum]
             if self._omit_aliases is True:
                 # remove aliases
                 members = OrderedDict(
@@ -1492,7 +1535,13 @@ def _parse_into_values(self, enums, kw):
             return values, objects
         else:
             self.enum_class = None
-            return enums, enums
+            return enums, enums  # type: ignore[return-value]
+
+    def _compare_type_affinity(self, other: TypeEngine[Any]) -> bool:
+        return (
+            super()._compare_type_affinity(other)
+            or other._type_affinity is String
+        )
 
     def _resolve_for_literal(self, value: Any) -> Enum:
         tv = type(value)
@@ -1582,7 +1631,12 @@ def process_literal(pt):
             self._generic_type_affinity(_enums=enum_args, **kw),  # type: ignore  # noqa: E501
         )
 
-    def _setup_for_values(self, values, objects, kw):
+    def _setup_for_values(
+        self,
+        values: Sequence[str],
+        objects: _EnumTupleArg,
+        kw: Any,
+    ) -> None:
         self.enums = list(values)
 
         self._valid_lookup = dict(zip(reversed(objects), reversed(values)))
@@ -1597,14 +1651,14 @@ def _setup_for_values(self, values, objects, kw):
         )
 
     @property
-    def sort_key_function(self):
+    def sort_key_function(self):  # type: ignore[override]
         if self._sort_key_function is NO_ARG:
             return self._db_value_for_elem
         else:
             return self._sort_key_function
 
     @property
-    def native(self):
+    def native(self):  # type: ignore[override]
         return self.native_enum
 
     def _db_value_for_elem(self, elem):
@@ -1649,9 +1703,10 @@ def _adapt_expression(
 
     comparator_factory = Comparator
 
-    def _object_value_for_elem(self, elem):
+    def _object_value_for_elem(self, elem: str) -> Union[str, enum.Enum]:
         try:
-            return self._object_lookup[elem]
+            # Value will not be None because key is not None
+            return self._object_lookup[elem]  # type: ignore[return-value]
         except KeyError as err:
             raise LookupError(
                 "'%s' is not among the defined enum values. "
@@ -2465,17 +2520,21 @@ class JSONElementType(TypeEngine[Any]):
         _integer = Integer()
         _string = String()
 
-        def string_bind_processor(self, dialect):
+        def string_bind_processor(
+            self, dialect: Dialect
+        ) -> Optional[_BindProcessorType[str]]:
             return self._string._cached_bind_processor(dialect)
 
-        def string_literal_processor(self, dialect):
+        def string_literal_processor(
+            self, dialect: Dialect
+        ) -> Optional[_LiteralProcessorType[str]]:
             return self._string._cached_literal_processor(dialect)
 
-        def bind_processor(self, dialect):
+        def bind_processor(self, dialect: Dialect) -> _BindProcessorType[Any]:
             int_processor = self._integer._cached_bind_processor(dialect)
             string_processor = self.string_bind_processor(dialect)
 
-            def process(value):
+            def process(value: Optional[Any]) -> Any:
                 if int_processor and isinstance(value, int):
                     value = int_processor(value)
                 elif string_processor and isinstance(value, str):
@@ -2484,11 +2543,13 @@ def process(value):
 
             return process
 
-        def literal_processor(self, dialect):
+        def literal_processor(
+            self, dialect: Dialect
+        ) -> _LiteralProcessorType[Any]:
             int_processor = self._integer._cached_literal_processor(dialect)
             string_processor = self.string_literal_processor(dialect)
 
-            def process(value):
+            def process(value: Optional[Any]) -> Any:
                 if int_processor and isinstance(value, int):
                     value = int_processor(value)
                 elif string_processor and isinstance(value, str):
@@ -2539,6 +2600,8 @@ class Comparator(Indexable.Comparator[_T], Concatenable.Comparator[_T]):
 
         __slots__ = ()
 
+        type: JSON
+
         def _setup_getitem(self, index):
             if not isinstance(index, str) and isinstance(
                 index, collections_abc.Sequence
@@ -2698,7 +2761,7 @@ def _binary_w_type(self, typ, method_name):
     def python_type(self):
         return dict
 
-    @property  # type: ignore  # mypy property bug
+    @property
     def should_evaluate_none(self):
         """Alias of :attr:`_types.JSON.none_as_null`"""
         return not self.none_as_null
@@ -2760,7 +2823,7 @@ def process(value):
 
 
 class ARRAY(
-    SchemaEventTarget, Indexable, Concatenable, TypeEngine[Sequence[Any]]
+    SchemaEventTarget, Indexable, Concatenable, TypeEngine[Sequence[_T]]
 ):
     """Represent a SQL Array type.
 
@@ -2883,7 +2946,7 @@ class SomeOrmClass(Base):
 
     def __init__(
         self,
-        item_type: _TypeEngineArgument[Any],
+        item_type: _TypeEngineArgument[_T],
         as_tuple: bool = False,
         dimensions: Optional[int] = None,
         zero_indexes: bool = False,
@@ -2932,8 +2995,8 @@ def __init__(
         self.zero_indexes = zero_indexes
 
     class Comparator(
-        Indexable.Comparator[Sequence[Any]],
-        Concatenable.Comparator[Sequence[Any]],
+        Indexable.Comparator[Sequence[_CT]],
+        Concatenable.Comparator[Sequence[_CT]],
     ):
         """Define comparison operations for :class:`_types.ARRAY`.
 
@@ -2944,9 +3007,22 @@ class Comparator(
 
         __slots__ = ()
 
-        type: ARRAY
+        type: ARRAY[_CT]
 
-        def _setup_getitem(self, index):
+        @overload
+        def _setup_getitem(
+            self, index: int
+        ) -> Tuple[OperatorType, int, TypeEngine[Any]]: ...
+
+        @overload
+        def _setup_getitem(
+            self, index: slice
+        ) -> Tuple[OperatorType, Slice, TypeEngine[Any]]: ...
+
+        def _setup_getitem(self, index: Union[int, slice]) -> Union[
+            Tuple[OperatorType, int, TypeEngine[Any]],
+            Tuple[OperatorType, Slice, TypeEngine[Any]],
+        ]:
             arr_type = self.type
 
             return_type: TypeEngine[Any]
@@ -2972,7 +3048,7 @@ def _setup_getitem(self, index):
 
                 return operators.getitem, index, return_type
 
-        def contains(self, *arg, **kw):
+        def contains(self, *arg: Any, **kw: Any) -> ColumnElement[bool]:
             """``ARRAY.contains()`` not implemented for the base ARRAY type.
             Use the dialect-specific ARRAY type.
 
@@ -2986,7 +3062,9 @@ def contains(self, *arg, **kw):
             )
 
         @util.preload_module("sqlalchemy.sql.elements")
-        def any(self, other, operator=None):
+        def any(
+            self, other: Any, operator: Optional[OperatorType] = None
+        ) -> ColumnElement[bool]:
             """Return ``other operator ANY (array)`` clause.
 
             .. legacy:: This method is an :class:`_types.ARRAY` - specific
@@ -3033,7 +3111,9 @@ def any(self, other, operator=None):
             )
 
         @util.preload_module("sqlalchemy.sql.elements")
-        def all(self, other, operator=None):
+        def all(
+            self, other: Any, operator: Optional[OperatorType] = None
+        ) -> ColumnElement[bool]:
             """Return ``other operator ALL (array)`` clause.
 
             .. legacy:: This method is an :class:`_types.ARRAY` - specific
@@ -3082,23 +3162,27 @@ def all(self, other, operator=None):
     comparator_factory = Comparator
 
     @property
-    def hashable(self):
+    def hashable(self) -> bool:  # type: ignore[override]
         return self.as_tuple
 
     @property
-    def python_type(self):
+    def python_type(self) -> Type[Any]:
         return list
 
-    def compare_values(self, x, y):
-        return x == y
+    def compare_values(self, x: Any, y: Any) -> bool:
+        return x == y  # type: ignore[no-any-return]
 
-    def _set_parent(self, parent, outer=False, **kw):
+    def _set_parent(
+        self, parent: SchemaEventTarget, outer: bool = False, **kw: Any
+    ) -> None:
         """Support SchemaEventTarget"""
 
         if not outer and isinstance(self.item_type, SchemaEventTarget):
             self.item_type._set_parent(parent, **kw)
 
-    def _set_parent_with_dispatch(self, parent, **kw):
+    def _set_parent_with_dispatch(
+        self, parent: SchemaEventTarget, **kw: Any
+    ) -> None:
         """Support SchemaEventTarget"""
 
         super()._set_parent_with_dispatch(parent, outer=True)
@@ -3106,17 +3190,19 @@ def _set_parent_with_dispatch(self, parent, **kw):
         if isinstance(self.item_type, SchemaEventTarget):
             self.item_type._set_parent_with_dispatch(parent)
 
-    def literal_processor(self, dialect):
+    def literal_processor(
+        self, dialect: Dialect
+    ) -> Optional[_LiteralProcessorType[_T]]:
         item_proc = self.item_type.dialect_impl(dialect).literal_processor(
             dialect
         )
         if item_proc is None:
             return None
 
-        def to_str(elements):
+        def to_str(elements: Iterable[Any]) -> str:
             return f"[{', '.join(elements)}]"
 
-        def process(value):
+        def process(value: Sequence[Any]) -> str:
             inner = self._apply_item_processor(
                 value, item_proc, self.dimensions, to_str
             )
@@ -3124,7 +3210,13 @@ def process(value):
 
         return process
 
-    def _apply_item_processor(self, arr, itemproc, dim, collection_callable):
+    def _apply_item_processor(
+        self,
+        arr: Sequence[Any],
+        itemproc: Optional[Callable[[Any], Any]],
+        dim: Optional[int],
+        collection_callable: Callable[[Iterable[Any]], _P],
+    ) -> _P:
         """Helper method that can be used by bind_processor(),
         literal_processor(), etc. to apply an item processor to elements of
         an array value, taking into account the 'dimensions' for this
@@ -3575,6 +3667,7 @@ class Uuid(Emulated, TypeEngine[_UUID_RETURN]):
 
     __visit_name__ = "uuid"
 
+    length: Optional[int] = None
     collation: Optional[str] = None
 
     @overload
@@ -3615,7 +3708,7 @@ def python_type(self):
         return _python_UUID if self.as_uuid else str
 
     @property
-    def native(self):
+    def native(self):  # type: ignore[override]
         return self.native_uuid
 
     def coerce_compared_value(self, op, value):
@@ -3626,7 +3719,9 @@ def coerce_compared_value(self, op, value):
         else:
             return super().coerce_compared_value(op, value)
 
-    def bind_processor(self, dialect):
+    def bind_processor(
+        self, dialect: Dialect
+    ) -> Optional[_BindProcessorType[_UUID_RETURN]]:
         character_based_uuid = (
             not dialect.supports_native_uuid or not self.native_uuid
         )
diff --git a/libs/sqlalchemy/sql/traversals.py b/libs/sqlalchemy/sql/traversals.py
index 13ad28996e..c9b6290f46 100644
--- a/libs/sqlalchemy/sql/traversals.py
+++ b/libs/sqlalchemy/sql/traversals.py
@@ -1,5 +1,5 @@
 # sql/traversals.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/sql/type_api.py b/libs/sqlalchemy/sql/type_api.py
index aeb804d3f9..f30bd206e3 100644
--- a/libs/sqlalchemy/sql/type_api.py
+++ b/libs/sqlalchemy/sql/type_api.py
@@ -1,18 +1,15 @@
 # sql/type_api.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Base types API.
-
-"""
+"""Base types API."""
 
 from __future__ import annotations
 
 from enum import Enum
-from types import ModuleType
 import typing
 from typing import Any
 from typing import Callable
@@ -58,6 +55,7 @@
     from .sqltypes import NUMERICTYPE as NUMERICTYPE  # noqa: F401
     from .sqltypes import STRINGTYPE as STRINGTYPE  # noqa: F401
     from .sqltypes import TABLEVALUE as TABLEVALUE  # noqa: F401
+    from ..engine.interfaces import DBAPIModule
     from ..engine.interfaces import Dialect
     from ..util.typing import GenericProtocol
 
@@ -67,6 +65,7 @@
 _O = TypeVar("_O", bound=object)
 _TE = TypeVar("_TE", bound="TypeEngine[Any]")
 _CT = TypeVar("_CT", bound=Any)
+_RT = TypeVar("_RT", bound=Any)
 
 _MatchedOnType = Union[
     "GenericProtocol[Any]", TypeAliasType, NewType, Type[Any]
@@ -186,10 +185,24 @@ def __init__(self, expr: ColumnElement[_CT]):
         def __reduce__(self) -> Any:
             return self.__class__, (self.expr,)
 
+        @overload
+        def operate(
+            self,
+            op: OperatorType,
+            *other: Any,
+            result_type: Type[TypeEngine[_RT]],
+            **kwargs: Any,
+        ) -> ColumnElement[_RT]: ...
+
+        @overload
+        def operate(
+            self, op: OperatorType, *other: Any, **kwargs: Any
+        ) -> ColumnElement[_CT]: ...
+
         @util.preload_module("sqlalchemy.sql.default_comparator")
         def operate(
             self, op: OperatorType, *other: Any, **kwargs: Any
-        ) -> ColumnElement[_CT]:
+        ) -> ColumnElement[Any]:
             default_comparator = util.preloaded.sql_default_comparator
             op_fn, addtl_kw = default_comparator.operator_lookup[op.__name__]
             if kwargs:
@@ -376,7 +389,7 @@ def literal_processor(
         as the sole positional argument and will return a string representation
         to be rendered in a SQL statement.
 
-        .. note::
+        .. tip::
 
             This method is only called relative to a **dialect specific type
             object**, which is often **private to a dialect in use** and is not
@@ -410,7 +423,7 @@ def bind_processor(
 
         If processing is not necessary, the method should return ``None``.
 
-        .. note::
+        .. tip::
 
             This method is only called relative to a **dialect specific type
             object**, which is often **private to a dialect in use** and is not
@@ -446,7 +459,7 @@ def result_processor(
 
         If processing is not necessary, the method should return ``None``.
 
-        .. note::
+        .. tip::
 
             This method is only called relative to a **dialect specific type
             object**, which is often **private to a dialect in use** and is not
@@ -485,11 +498,19 @@ def column_expression(
         It is the SQL analogue of the :meth:`.TypeEngine.result_processor`
         method.
 
+        .. note:: The :func:`.TypeEngine.column_expression` method is applied
+           only to the **outermost columns clause** of a SELECT statement, that
+           is, the columns that are to be delivered directly into the returned
+           result rows.  It does **not** apply to the columns clause inside
+           of subqueries.  This necessarily avoids double conversions against
+           the column and only runs the conversion when ready to be returned
+           to the client.
+
         This method is called during the **SQL compilation** phase of a
         statement, when rendering a SQL string. It is **not** called
         against specific values.
 
-        .. note::
+        .. tip::
 
             This method is only called relative to a **dialect specific type
             object**, which is often **private to a dialect in use** and is not
@@ -599,7 +620,7 @@ def compare_values(self, x: Any, y: Any) -> bool:
 
         return x == y  # type: ignore[no-any-return]
 
-    def get_dbapi_type(self, dbapi: ModuleType) -> Optional[Any]:
+    def get_dbapi_type(self, dbapi: DBAPIModule) -> Optional[Any]:
         """Return the corresponding type object from the underlying DB-API, if
         any.
 
@@ -1376,6 +1397,10 @@ def coerce_compared_value(
 
         return self
 
+    if TYPE_CHECKING:
+
+        def get_col_spec(self, **kw: Any) -> str: ...
+
 
 class Emulated(TypeEngineMixin):
     """Mixin for base types that emulate the behavior of a DB-native type.
@@ -2251,7 +2276,7 @@ def copy(self, **kw: Any) -> Self:
         instance.__dict__.update(self.__dict__)
         return instance
 
-    def get_dbapi_type(self, dbapi: ModuleType) -> Optional[Any]:
+    def get_dbapi_type(self, dbapi: DBAPIModule) -> Optional[Any]:
         """Return the DBAPI type object represented by this
         :class:`.TypeDecorator`.
 
diff --git a/libs/sqlalchemy/sql/util.py b/libs/sqlalchemy/sql/util.py
index 29cd0e2b00..a0a0934f4d 100644
--- a/libs/sqlalchemy/sql/util.py
+++ b/libs/sqlalchemy/sql/util.py
@@ -1,14 +1,12 @@
 # sql/util.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: allow-untyped-defs, allow-untyped-calls
 
-"""High level utilities which build upon other modules here.
-
-"""
+"""High level utilities which build upon other modules here."""
 from __future__ import annotations
 
 from collections import deque
@@ -480,7 +478,7 @@ def surface_selectables(clause):
             stack.append(elem.element)
 
 
-def surface_selectables_only(clause):
+def surface_selectables_only(clause: ClauseElement) -> Iterator[ClauseElement]:
     stack = [clause]
     while stack:
         elem = stack.pop()
@@ -1173,7 +1171,7 @@ def replace(
                 # we are an alias of a table and we are not derived from an
                 # alias of a table (which nonetheless may be the same table
                 # as ours) so, same thing
-                return col  # type: ignore
+                return col
             else:
                 # other cases where we are a selectable and the element
                 # is another join or selectable that contains a table which our
diff --git a/libs/sqlalchemy/sql/visitors.py b/libs/sqlalchemy/sql/visitors.py
index e758350adf..17f4335b03 100644
--- a/libs/sqlalchemy/sql/visitors.py
+++ b/libs/sqlalchemy/sql/visitors.py
@@ -1,14 +1,11 @@
 # sql/visitors.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Visitor/traversal interface and library functions.
-
-
-"""
+"""Visitor/traversal interface and library functions."""
 
 from __future__ import annotations
 
@@ -443,7 +440,7 @@ class HasTraverseInternals:
     which defines all kinds of ways of traversing the elements of an object.
 
     Compared to :class:`.Visitable`, which relies upon an external visitor to
-    define how the object is travered (i.e. the :class:`.SQLCompiler`), the
+    define how the object is traversed (i.e. the :class:`.SQLCompiler`), the
     :class:`.HasTraverseInternals` interface allows classes to define their own
     traversal, that is, what attributes are accessed and in what order.
 
diff --git a/libs/sqlalchemy/testing/__init__.py b/libs/sqlalchemy/testing/__init__.py
index 4e574bbb24..41ddcedaff 100644
--- a/libs/sqlalchemy/testing/__init__.py
+++ b/libs/sqlalchemy/testing/__init__.py
@@ -1,5 +1,5 @@
 # testing/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/assertions.py b/libs/sqlalchemy/testing/assertions.py
index 8364c15f8f..3d7810c15c 100644
--- a/libs/sqlalchemy/testing/assertions.py
+++ b/libs/sqlalchemy/testing/assertions.py
@@ -1,5 +1,5 @@
 # testing/assertions.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -201,7 +201,10 @@ def _expect_warnings(
         if raise_on_any_unexpected:
 
             def real_warn(msg, *arg, **kw):
-                raise AssertionError("Got unexpected warning: %r" % msg)
+                if isinstance(msg, sa_exc.SATestSuiteWarning):
+                    warnings.warn(msg, *arg, **kw)
+                else:
+                    raise AssertionError("Got unexpected warning: %r" % msg)
 
         else:
             real_warn = warnings.warn
@@ -274,8 +277,8 @@ def int_within_variance(expected, received, variance):
     )
 
 
-def eq_regex(a, b, msg=None):
-    assert re.match(b, a), msg or "%r !~ %r" % (a, b)
+def eq_regex(a, b, msg=None, flags=0):
+    assert re.match(b, a, flags), msg or "%r !~ %r" % (a, b)
 
 
 def eq_(a, b, msg=None):
@@ -513,6 +516,7 @@ def assert_compile(
         use_default_dialect=False,
         allow_dialect_select=False,
         supports_default_values=True,
+        supports_native_boolean=False,
         supports_default_metavalue=True,
         literal_binds=False,
         render_postcompile=False,
@@ -527,6 +531,7 @@ def assert_compile(
             dialect = default.DefaultDialect()
             dialect.supports_default_values = supports_default_values
             dialect.supports_default_metavalue = supports_default_metavalue
+            dialect.supports_native_boolean = supports_native_boolean
         elif allow_dialect_select:
             dialect = None
         else:
diff --git a/libs/sqlalchemy/testing/assertsql.py b/libs/sqlalchemy/testing/assertsql.py
index 81c7138c4b..defd110888 100644
--- a/libs/sqlalchemy/testing/assertsql.py
+++ b/libs/sqlalchemy/testing/assertsql.py
@@ -1,5 +1,5 @@
 # testing/assertsql.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -275,7 +275,9 @@ def _received_statement(self, execute_observed):
 
         # TODO: why do we need this part?
         for real_stmt in execute_observed.statements:
-            if self._compare_no_space(real_stmt.statement, received_stmt):
+            if self._compare_no_space(
+                real_stmt.context.statement, received_stmt
+            ):
                 break
         else:
             raise AssertionError(
@@ -482,6 +484,7 @@ def assert_engine(engine):
     def connection_execute(
         conn, clauseelement, multiparams, params, execution_options
     ):
+        conn._WORKAROUND_ISSUE_13018 = True
         # grab the original statement + params before any cursor
         # execution
         orig[:] = clauseelement, multiparams, params
@@ -502,6 +505,7 @@ def cursor_execute(
         else:
             obs = SQLExecuteObserved(context, orig[0], orig[1], orig[2])
             asserter.accumulated.append(obs)
+
         obs.statements.append(
             SQLCursorExecuteObserved(
                 statement, parameters, context, executemany
diff --git a/libs/sqlalchemy/testing/asyncio.py b/libs/sqlalchemy/testing/asyncio.py
index 28470ba21c..23da105963 100644
--- a/libs/sqlalchemy/testing/asyncio.py
+++ b/libs/sqlalchemy/testing/asyncio.py
@@ -1,5 +1,5 @@
 # testing/asyncio.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/config.py b/libs/sqlalchemy/testing/config.py
index 2eec642b77..09ed89bfbc 100644
--- a/libs/sqlalchemy/testing/config.py
+++ b/libs/sqlalchemy/testing/config.py
@@ -1,5 +1,5 @@
 # testing/config.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -333,9 +333,20 @@ def __init__(self, db, db_opts, options, file_config):
             db.url.query.get("async_fallback", False)
         )
 
+        from . import provision
+
+        self.is_default_dialect = provision.is_preferred_driver(self, db)
+
     _stack = collections.deque()
     _configs = set()
 
+    def __repr__(self):
+        return (
+            f"sqlalchemy.testing.config.Config"
+            f"({self.db.name}+{self.db.driver}, "
+            f"{self.db.dialect.server_version_info})"
+        )
+
     def _set_name(self, db):
         suffix = "_async" if db.dialect.is_async else ""
         if db.dialect.server_version_info:
diff --git a/libs/sqlalchemy/testing/engines.py b/libs/sqlalchemy/testing/engines.py
index 51beed98b1..5c20ee728a 100644
--- a/libs/sqlalchemy/testing/engines.py
+++ b/libs/sqlalchemy/testing/engines.py
@@ -1,5 +1,5 @@
 # testing/engines.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -15,6 +15,7 @@
 from typing import Any
 from typing import Dict
 from typing import Optional
+from typing import Union
 import warnings
 import weakref
 
@@ -115,8 +116,17 @@ def _drop_testing_engines(self, scope):
                 await_only(rec.dispose())
             else:
                 rec.dispose()
+
         eng.clear()
 
+    def _dispose_testing_engines(self, scope):
+        eng = self.testing_engines[scope]
+        for rec in list(eng):
+            if hasattr(rec, "sync_engine"):
+                await_only(rec.dispose())
+            else:
+                rec.dispose()
+
     def after_test(self):
         self._drop_testing_engines("function")
 
@@ -152,9 +162,18 @@ def stop_test_class_outside_fixtures(self):
             if pool.base._strong_ref_connection_records:
                 ln = len(pool.base._strong_ref_connection_records)
                 pool.base._strong_ref_connection_records.clear()
-                assert (
-                    False
-                ), "%d connection recs not cleared after test suite" % (ln)
+
+                if ln > 2:
+                    # allow two connections to linger, as on loaded down
+                    # CI hardware there seem to be occasional GC lapses that
+                    # are not easily preventable
+                    assert (
+                        False
+                    ), "%d connection recs not cleared after test suite" % (ln)
+        if config.options and config.options.low_connections:
+            # for suites running with --low-connections, dispose the "global"
+            # engines to disconnect everything before making a testing engine
+            self._dispose_testing_engines("global")
 
     def final_cleanup(self):
         self.checkin_all()
@@ -285,32 +304,30 @@ def dispose():
 
 @typing.overload
 def testing_engine(
-    url: Optional[URL] = None,
-    options: Optional[Dict[str, Any]] = None,
-    asyncio: Literal[False] = False,
-    transfer_staticpool: bool = False,
+    url: Optional[URL] = ...,
+    options: Optional[Dict[str, Any]] = ...,
+    *,
+    asyncio: Literal[False],
 ) -> Engine: ...
 
 
 @typing.overload
 def testing_engine(
-    url: Optional[URL] = None,
-    options: Optional[Dict[str, Any]] = None,
-    asyncio: Literal[True] = True,
-    transfer_staticpool: bool = False,
+    url: Optional[URL] = ...,
+    options: Optional[Dict[str, Any]] = ...,
+    *,
+    asyncio: Literal[True],
 ) -> AsyncEngine: ...
 
 
 def testing_engine(
-    url=None,
-    options=None,
-    asyncio=False,
-    transfer_staticpool=False,
-    share_pool=False,
-    _sqlite_savepoint=False,
-):
+    url: Optional[URL] = None,
+    options: Optional[Dict[str, Any]] = None,
+    *,
+    asyncio: bool = False,
+) -> Union[Engine, AsyncEngine]:
+
     if asyncio:
-        assert not _sqlite_savepoint
         from sqlalchemy.ext.asyncio import (
             create_async_engine as create_engine,
         )
@@ -318,50 +335,33 @@ def testing_engine(
         from sqlalchemy import create_engine
     from sqlalchemy.engine.url import make_url
 
-    if not options:
-        use_reaper = True
-        scope = "function"
-        sqlite_savepoint = False
-    else:
-        use_reaper = options.pop("use_reaper", True)
-        scope = options.pop("scope", "function")
-        sqlite_savepoint = options.pop("sqlite_savepoint", False)
+    url = make_url(url if url else config.db.url)
 
-    url = url or config.db.url
-
-    url = make_url(url)
+    if not options:
+        options = {}
 
-    if (
-        config.db is None or url.drivername == config.db.url.drivername
-    ) and config.db_opts:
-        use_options = config.db_opts.copy()
-    else:
-        use_options = {}
+    use_options = {}
 
-    if options is not None:
-        use_options.update(options)
+    for opt_dict in (config.db_opts, options):
+        if not opt_dict:
+            continue
+        use_options.update(
+            {
+                opt: value
+                for opt, value in opt_dict.items()
+                if opt not in ("scope", "use_reaper")
+                and not opt.startswith("sqlite_")
+            }
+        )
 
     engine = create_engine(url, **use_options)
 
-    if sqlite_savepoint and engine.name == "sqlite":
-        # apply SQLite savepoint workaround
-        @event.listens_for(engine, "connect")
-        def do_connect(dbapi_connection, connection_record):
-            dbapi_connection.isolation_level = None
-
-        @event.listens_for(engine, "begin")
-        def do_begin(conn):
-            conn.exec_driver_sql("BEGIN")
-
-    if transfer_staticpool:
-        from sqlalchemy.pool import StaticPool
-
-        if config.db is not None and isinstance(config.db.pool, StaticPool):
-            use_reaper = False
-            engine.pool._transfer_from(config.db.pool)
-    elif share_pool:
-        engine.pool = config.db.pool
+    if config.options and config.options.low_connections:
+        # for suites running with --low-connections, dispose the "global"
+        # engines to disconnect everything before making a testing engine
+        testing_reaper._dispose_testing_engines("global")
 
+    scope = options.get("scope", "function")
     if scope == "global":
         if asyncio:
             engine.sync_engine._has_events = True
@@ -370,16 +370,25 @@ def do_begin(conn):
                 True  # enable event blocks, helps with profiling
             )
 
+    from . import provision
+
+    provision.post_configure_testing_engine(engine.url, engine, options, scope)
+
+    # post_configure_testing_engine may have modified the options dictionary
+    # in place; consume additional post arguments afterwards
+
+    use_reaper = options.get("use_reaper", True)
+    if use_reaper:
+        testing_reaper.add_engine(engine, scope)
+
     if (
         isinstance(engine.pool, pool.QueuePool)
-        and "pool" not in use_options
-        and "pool_timeout" not in use_options
-        and "max_overflow" not in use_options
+        and "pool" not in options
+        and "pool_timeout" not in options
+        and "max_overflow" not in options
     ):
         engine.pool._timeout = 0
         engine.pool._max_overflow = 0
-    if use_reaper:
-        testing_reaper.add_engine(engine, scope)
 
     return engine
 
diff --git a/libs/sqlalchemy/testing/entities.py b/libs/sqlalchemy/testing/entities.py
index 5bd4f7de24..c192480848 100644
--- a/libs/sqlalchemy/testing/entities.py
+++ b/libs/sqlalchemy/testing/entities.py
@@ -1,5 +1,5 @@
 # testing/entities.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/exclusions.py b/libs/sqlalchemy/testing/exclusions.py
index 8ff9b64438..d1bdd2e304 100644
--- a/libs/sqlalchemy/testing/exclusions.py
+++ b/libs/sqlalchemy/testing/exclusions.py
@@ -1,5 +1,5 @@
 # testing/exclusions.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -31,10 +31,18 @@ def fails_if(predicate, reason=None):
     return rule
 
 
+def warns_if(predicate, expression, assert_):
+    rule = compound()
+    pred = _as_predicate(predicate)
+    rule.warns[pred] = (expression, assert_)
+    return rule
+
+
 class compound:
     def __init__(self):
         self.fails = set()
         self.skips = set()
+        self.warns = {}
 
     def __add__(self, other):
         return self.add(other)
@@ -49,16 +57,24 @@ def add(self, *others):
         copy = compound()
         copy.fails.update(self.fails)
         copy.skips.update(self.skips)
+        copy.warns.update(self.warns)
 
         for other in others:
             copy.fails.update(other.fails)
             copy.skips.update(other.skips)
+            copy.warns.update(other.warns)
         return copy
 
     def not_(self):
         copy = compound()
         copy.fails.update(NotPredicate(fail) for fail in self.fails)
         copy.skips.update(NotPredicate(skip) for skip in self.skips)
+        copy.warns.update(
+            {
+                NotPredicate(warn): element
+                for warn, element in self.warns.items()
+            }
+        )
         return copy
 
     @property
@@ -72,6 +88,13 @@ def enabled_for_config(self, config):
         else:
             return True
 
+    def matching_warnings(self, config):
+        return [
+            message
+            for predicate, (message, assert_) in self.warns.items()
+            if predicate(config)
+        ]
+
     def matching_config_reasons(self, config):
         return [
             predicate._as_string(config)
@@ -82,6 +105,7 @@ def matching_config_reasons(self, config):
     def _extend(self, other):
         self.skips.update(other.skips)
         self.fails.update(other.fails)
+        self.warns.update(other.warns)
 
     def __call__(self, fn):
         if hasattr(fn, "_sa_exclusion_extend"):
@@ -117,8 +141,25 @@ def _do(self, cfg, fn, *args, **kw):
                 )
                 config.skip_test(msg)
 
+        if self.warns:
+            from .assertions import expect_warnings
+
+            @contextlib.contextmanager
+            def _expect_warnings():
+                with contextlib.ExitStack() as stack:
+                    for expression, assert_ in self.warns.values():
+                        stack.enter_context(
+                            expect_warnings(expression, assert_=assert_)
+                        )
+                    yield
+
+            ctx = _expect_warnings()
+        else:
+            ctx = contextlib.nullcontext()
+
         try:
-            return_value = fn(*args, **kw)
+            with ctx:
+                return_value = fn(*args, **kw)
         except Exception as ex:
             self._expect_failure(cfg, ex, name=fn.__name__)
         else:
@@ -392,8 +433,8 @@ def open():  # noqa
     return skip_if(BooleanPredicate(False, "mark as execute"))
 
 
-def closed():
-    return skip_if(BooleanPredicate(True, "marked as skip"))
+def closed(reason="marked as skip"):
+    return skip_if(BooleanPredicate(True, reason))
 
 
 def fails(reason=None):
diff --git a/libs/sqlalchemy/testing/fixtures/__init__.py b/libs/sqlalchemy/testing/fixtures/__init__.py
index f2948dee8d..2feeb7db0d 100644
--- a/libs/sqlalchemy/testing/fixtures/__init__.py
+++ b/libs/sqlalchemy/testing/fixtures/__init__.py
@@ -1,5 +1,5 @@
 # testing/fixtures/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/fixtures/base.py b/libs/sqlalchemy/testing/fixtures/base.py
index 09d45a0a22..4a31e5a9c2 100644
--- a/libs/sqlalchemy/testing/fixtures/base.py
+++ b/libs/sqlalchemy/testing/fixtures/base.py
@@ -1,5 +1,5 @@
 # testing/fixtures/base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -14,6 +14,7 @@
 from .. import config
 from ..assertions import eq_
 from ..util import drop_all_tables_from_metadata
+from ..util import picklers
 from ... import Column
 from ... import func
 from ... import Integer
@@ -166,10 +167,7 @@ def testing_engine(self):
         def gen_testing_engine(
             url=None,
             options=None,
-            future=None,
             asyncio=False,
-            transfer_staticpool=False,
-            share_pool=False,
         ):
             if options is None:
                 options = {}
@@ -178,8 +176,6 @@ def gen_testing_engine(
                 url=url,
                 options=options,
                 asyncio=asyncio,
-                transfer_staticpool=transfer_staticpool,
-                share_pool=share_pool,
             )
 
         yield gen_testing_engine
@@ -194,6 +190,10 @@ def go(**kw):
 
         return go
 
+    @config.fixture(params=picklers())
+    def picklers(self, request):
+        yield request.param
+
     @config.fixture()
     def metadata(self, request):
         """Provide bound MetaData for a single test, dropping afterwards."""
@@ -218,6 +218,24 @@ def metadata(self, request):
         else:
             drop_all_tables_from_metadata(metadata, config.db)
 
+    @config.fixture()
+    def thirdparty_dialect(self):
+        from ...dialects import registry
+
+        name = None
+
+        def go(dialect_cls):
+            nonlocal name
+            name = dialect_cls.name
+            assert name, "name is required"
+            registry.impls[name] = dialect_cls
+            return dialect_cls
+
+        yield go
+
+        assert name is not None
+        del registry.impls[name]
+
     @config.fixture(
         params=[
             (rollback, second_operation, begin_nested)
diff --git a/libs/sqlalchemy/testing/fixtures/mypy.py b/libs/sqlalchemy/testing/fixtures/mypy.py
index 0832d89246..3cd5cbc2e2 100644
--- a/libs/sqlalchemy/testing/fixtures/mypy.py
+++ b/libs/sqlalchemy/testing/fixtures/mypy.py
@@ -1,5 +1,5 @@
 # testing/fixtures/mypy.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -143,7 +143,9 @@ def _collect_messages(self, path):
         from sqlalchemy.ext.mypy.util import mypy_14
 
         expected_messages = []
-        expected_re = re.compile(r"\s*# EXPECTED(_MYPY)?(_RE)?(_TYPE)?: (.+)")
+        expected_re = re.compile(
+            r"\s*# EXPECTED(_MYPY)?(_RE)?(_ROW)?(_TYPE)?: (.+)"
+        )
         py_ver_re = re.compile(r"^#\s*PYTHON_VERSION\s?>=\s?(\d+\.\d+)")
         with open(path) as file_:
             current_assert_messages = []
@@ -161,9 +163,24 @@ def _collect_messages(self, path):
                 if m:
                     is_mypy = bool(m.group(1))
                     is_re = bool(m.group(2))
-                    is_type = bool(m.group(3))
+                    is_row = bool(m.group(3))
+                    is_type = bool(m.group(4))
+
+                    expected_msg = re.sub(r"# noqa[:]? ?.*", "", m.group(5))
+                    if is_row:
+                        expected_msg = re.sub(
+                            r"Row\[([^\]]+)\]",
+                            lambda m: f"tuple[{m.group(1)}, fallback=s"
+                            f"qlalchemy.engine.row.{m.group(0)}]",
+                            expected_msg,
+                        )
+                        # For some reason it does not use or syntax (|)
+                        expected_msg = re.sub(
+                            r"Optional\[(.*)\]",
+                            lambda m: f"Union[{m.group(1)}, None]",
+                            expected_msg,
+                        )
 
-                    expected_msg = re.sub(r"# noqa[:]? ?.*", "", m.group(4))
                     if is_type:
                         if not is_re:
                             # the goal here is that we can cut-and-paste
@@ -243,7 +260,9 @@ def _collect_messages(self, path):
 
         return expected_messages
 
-    def _check_output(self, path, expected_messages, stdout, stderr, exitcode):
+    def _check_output(
+        self, path, expected_messages, stdout: str, stderr, exitcode
+    ):
         not_located = []
         filename = os.path.basename(path)
         if expected_messages:
@@ -263,7 +282,8 @@ def _check_output(self, path, expected_messages, stdout, stderr, exitcode):
                 ):
                     while raw_lines:
                         ol = raw_lines.pop(0)
-                        if not re.match(r".+\.py:\d+: note: +def \[.*", ol):
+                        if not re.match(r".+\.py:\d+: note: +def .*", ol):
+                            raw_lines.insert(0, ol)
                             break
                 elif re.match(
                     r".+\.py:\d+: note: .*(?:perhaps|suggestion)", e, re.I
diff --git a/libs/sqlalchemy/testing/fixtures/orm.py b/libs/sqlalchemy/testing/fixtures/orm.py
index 77cb243a80..65693b719c 100644
--- a/libs/sqlalchemy/testing/fixtures/orm.py
+++ b/libs/sqlalchemy/testing/fixtures/orm.py
@@ -1,5 +1,5 @@
 # testing/fixtures/orm.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/fixtures/sql.py b/libs/sqlalchemy/testing/fixtures/sql.py
index 44cf21c24f..18ac4f554b 100644
--- a/libs/sqlalchemy/testing/fixtures/sql.py
+++ b/libs/sqlalchemy/testing/fixtures/sql.py
@@ -1,5 +1,5 @@
 # testing/fixtures/sql.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -10,12 +10,12 @@
 import itertools
 import random
 import re
-import sys
 
 import sqlalchemy as sa
 from .base import TestBase
 from .. import config
 from .. import mock
+from .. import provision
 from ..assertions import eq_
 from ..assertions import ne_
 from ..util import adict
@@ -133,37 +133,16 @@ def _teardown_each_tables(self):
         elif self.run_create_tables == "each":
             drop_all_tables_from_metadata(self._tables_metadata, self.bind)
 
-        savepoints = getattr(config.requirements, "savepoints", False)
-        if savepoints:
-            savepoints = savepoints.enabled
-
         # no need to run deletes if tables are recreated on setup
         if (
             self.run_define_tables != "each"
-            and self.run_create_tables != "each"
+            and self.run_create_tables == "once"
             and self.run_deletes == "each"
         ):
             with self.bind.begin() as conn:
-                for table in reversed(
-                    [
-                        t
-                        for (t, fks) in sort_tables_and_constraints(
-                            self._tables_metadata.tables.values()
-                        )
-                        if t is not None
-                    ]
-                ):
-                    try:
-                        if savepoints:
-                            with conn.begin_nested():
-                                conn.execute(table.delete())
-                        else:
-                            conn.execute(table.delete())
-                    except sa.exc.DBAPIError as ex:
-                        print(
-                            ("Error emptying table %s: %r" % (table, ex)),
-                            file=sys.stderr,
-                        )
+                provision.delete_from_all_tables(
+                    conn, config, self._tables_metadata
+                )
 
     @classmethod
     def _teardown_once_metadata_bind(cls):
diff --git a/libs/sqlalchemy/testing/pickleable.py b/libs/sqlalchemy/testing/pickleable.py
index 9317be63b8..c1ba2339e7 100644
--- a/libs/sqlalchemy/testing/pickleable.py
+++ b/libs/sqlalchemy/testing/pickleable.py
@@ -1,5 +1,5 @@
 # testing/pickleable.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/plugin/__init__.py b/libs/sqlalchemy/testing/plugin/__init__.py
index ce960be967..65c1519066 100644
--- a/libs/sqlalchemy/testing/plugin/__init__.py
+++ b/libs/sqlalchemy/testing/plugin/__init__.py
@@ -1,5 +1,5 @@
 # testing/plugin/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/plugin/bootstrap.py b/libs/sqlalchemy/testing/plugin/bootstrap.py
index 2ad4d9915e..3d0d06241d 100644
--- a/libs/sqlalchemy/testing/plugin/bootstrap.py
+++ b/libs/sqlalchemy/testing/plugin/bootstrap.py
@@ -1,5 +1,5 @@
 # testing/plugin/bootstrap.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/plugin/plugin_base.py b/libs/sqlalchemy/testing/plugin/plugin_base.py
index 2dfa441413..c4cabb33eb 100644
--- a/libs/sqlalchemy/testing/plugin/plugin_base.py
+++ b/libs/sqlalchemy/testing/plugin/plugin_base.py
@@ -1,5 +1,5 @@
 # testing/plugin/plugin_base.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -110,7 +110,7 @@ def setup_options(make_option):
     make_option(
         "--disable-asyncio",
         action="store_true",
-        help="disable test / fixtures / provisoning running in asyncio",
+        help="disable test / fixtures / provisioning running in asyncio",
     )
     make_option(
         "--backend-only",
@@ -543,9 +543,16 @@ def want_method(cls, fn):
 
 
 def generate_sub_tests(cls, module, markers):
-    if "backend" in markers or "sparse_backend" in markers:
+    if (
+        "backend" in markers
+        or "sparse_backend" in markers
+        or "sparse_driver_backend" in markers
+    ):
         sparse = "sparse_backend" in markers
-        for cfg in _possible_configs_for_cls(cls, sparse=sparse):
+        sparse_driver = "sparse_driver_backend" in markers
+        for cfg in _possible_configs_for_cls(
+            cls, sparse=sparse, sparse_driver=sparse_driver
+        ):
             orig_name = cls.__name__
 
             # we can have special chars in these names except for the
@@ -581,8 +588,8 @@ def stop_test_class(cls):
 
 
 def stop_test_class_outside_fixtures(cls):
-    engines.testing_reaper.stop_test_class_outside_fixtures()
     provision.stop_test_class_outside_fixtures(config, config.db, cls)
+    engines.testing_reaper.stop_test_class_outside_fixtures()
     try:
         if not options.low_connections:
             assertions.global_cleanup_assertions()
@@ -629,7 +636,9 @@ def after_test_fixtures(test):
     engines.testing_reaper.after_test_outside_fixtures(test)
 
 
-def _possible_configs_for_cls(cls, reasons=None, sparse=False):
+def _possible_configs_for_cls(
+    cls, reasons=None, sparse=False, sparse_driver=False
+):
     all_configs = set(config.Config.all_configs())
 
     if cls.__unsupported_on__:
@@ -660,6 +669,12 @@ def _possible_configs_for_cls(cls, reasons=None, sparse=False):
                         reasons.extend(skip_reasons)
                     break
 
+                warnings = check.matching_warnings(config_obj)
+                if warnings:
+                    cls.__warnings__ = getattr(
+                        cls, "__warnings__", ()
+                    ) + tuple(warnings)
+
     if hasattr(cls, "__prefer_requires__"):
         non_preferred = set()
         requirements = config.requirements
@@ -677,20 +692,54 @@ def _possible_configs_for_cls(cls, reasons=None, sparse=False):
         # sorted so we get the same backend each time selecting the highest
         # server version info.
         per_dialect = {}
-        for cfg in reversed(
+
+        sorted_all_configs = reversed(
             sorted(
                 all_configs,
                 key=lambda cfg: (
+                    "z" if cfg.is_default_dialect else "a",
                     cfg.db.name,
                     cfg.db.driver,
                     cfg.db.dialect.server_version_info,
+                    cfg.db.dialect.is_async,
                 ),
             )
-        ):
+        )
+
+        for cfg in sorted_all_configs:
             db = cfg.db.name
             if db not in per_dialect:
                 per_dialect[db] = cfg
         return per_dialect.values()
+    elif sparse_driver:
+        # a more liberal form of "sparse" that will select for one driver,
+        # but still return for multiple database servers
+
+        dbs = {}
+
+        sorted_all_configs = list(
+            reversed(
+                sorted(
+                    all_configs,
+                    key=lambda cfg: (
+                        cfg.db.name,
+                        cfg.db.driver,
+                        cfg.db.dialect.server_version_info,
+                        cfg.db.dialect.is_async,
+                    ),
+                )
+            )
+        )
+
+        for cfg in sorted_all_configs:
+            key = (cfg.db.name, cfg.db.dialect.server_version_info)
+            if key in dbs and dbs[key].is_default_dialect:
+                continue
+            else:
+                dbs[key] = cfg
+
+        chosen_cfgs = set(dbs.values())
+        return [cfg for cfg in sorted_all_configs if cfg in chosen_cfgs]
 
     return all_configs
 
diff --git a/libs/sqlalchemy/testing/plugin/pytestplugin.py b/libs/sqlalchemy/testing/plugin/pytestplugin.py
index f6d47c631c..bee8189edb 100644
--- a/libs/sqlalchemy/testing/plugin/pytestplugin.py
+++ b/libs/sqlalchemy/testing/plugin/pytestplugin.py
@@ -1,5 +1,5 @@
 # testing/plugin/pytestplugin.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -270,13 +270,14 @@ def setup_test_classes():
         for test_class in test_classes:
             # transfer legacy __backend__ and __sparse_backend__ symbols
             # to be markers
-            add_markers = set()
             if getattr(test_class.cls, "__backend__", False) or getattr(
                 test_class.cls, "__only_on__", False
             ):
                 add_markers = {"backend"}
             elif getattr(test_class.cls, "__sparse_backend__", False):
-                add_markers = {"sparse_backend"}
+                add_markers = {"sparse_backend", "backend"}
+            elif getattr(test_class.cls, "__sparse_driver_backend__", False):
+                add_markers = {"sparse_driver_backend", "backend"}
             else:
                 add_markers = frozenset()
 
@@ -289,9 +290,15 @@ def setup_test_classes():
             for marker in add_markers:
                 test_class.add_marker(marker)
 
-            for sub_cls in plugin_base.generate_sub_tests(
-                test_class.cls, test_class.module, all_markers
-            ):
+            sub_tests = list(
+                plugin_base.generate_sub_tests(
+                    test_class.cls, test_class.module, all_markers
+                )
+            )
+            if not sub_tests:
+                rebuilt_items[test_class.cls]
+
+            for sub_cls in sub_tests:
                 if sub_cls is not test_class.cls:
                     per_cls_dict = rebuilt_items[test_class.cls]
 
@@ -430,6 +437,8 @@ def _parametrize_cls(module, cls):
 
 _current_class = None
 
+_current_warning_context = None
+
 
 def pytest_runtest_setup(item):
     from sqlalchemy.testing import asyncio
@@ -440,7 +449,7 @@ def pytest_runtest_setup(item):
     # databases, so we run this outside of the pytest fixture system altogether
     # and ensure asyncio greenlet if any engines are async
 
-    global _current_class
+    global _current_class, _current_warning_context
 
     if isinstance(item, pytest.Function) and _current_class is None:
         asyncio._maybe_async_provisioning(
@@ -449,6 +458,14 @@ def pytest_runtest_setup(item):
         )
         _current_class = item.getparent(pytest.Class)
 
+        if hasattr(_current_class.cls, "__warnings__"):
+            import warnings
+
+            _current_warning_context = warnings.catch_warnings()
+            _current_warning_context.__enter__()
+            for warning_message in _current_class.cls.__warnings__:
+                warnings.filterwarnings("ignore", warning_message)
+
 
 @pytest.hookimpl(hookwrapper=True)
 def pytest_runtest_teardown(item, nextitem):
@@ -465,13 +482,19 @@ def pytest_runtest_teardown(item, nextitem):
     # pytest_runtest_setup since the class has not yet been setup at that
     # time.
     # See https://github.com/pytest-dev/pytest/issues/9343
-    global _current_class, _current_report
+
+    global _current_class, _current_report, _current_warning_context
 
     if _current_class is not None and (
         # last test or a new class
         nextitem is None
         or nextitem.getparent(pytest.Class) is not _current_class
     ):
+
+        if _current_warning_context is not None:
+            _current_warning_context.__exit__(None, None, None)
+            _current_warning_context = None
+
         _current_class = None
 
         try:
@@ -668,7 +691,8 @@ def add_to_marker(self):
 
     def mark_base_test_class(self):
         return pytest.mark.usefixtures(
-            "setup_class_methods", "setup_test_methods"
+            "setup_class_methods",
+            "setup_test_methods",
         )
 
     _combination_id_fns = {
diff --git a/libs/sqlalchemy/testing/profiling.py b/libs/sqlalchemy/testing/profiling.py
index 0d90947e44..37ddc02337 100644
--- a/libs/sqlalchemy/testing/profiling.py
+++ b/libs/sqlalchemy/testing/profiling.py
@@ -1,5 +1,5 @@
 # testing/profiling.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -26,6 +26,7 @@
 
 from . import config
 from .util import gc_collect
+from ..util import freethreading
 from ..util import has_compiled_ext
 
 
@@ -91,6 +92,8 @@ def __init__(self, filename, sort="cumulative", dump=None):
     @property
     def platform_key(self):
         dbapi_key = config.db.name + "_" + config.db.driver
+        if config.db.dialect.is_async:
+            dbapi_key += "_async"
 
         if config.db.name == "sqlite" and config.db.dialect._is_url_file_db(
             config.db.url
@@ -99,6 +102,8 @@ def platform_key(self):
 
         # keep it at 2.7, 3.1, 3.2, etc. for now.
         py_version = ".".join([str(v) for v in sys.version_info[0:2]])
+        if freethreading:
+            py_version += "t"
 
         platform_tokens = [
             platform.machine(),
diff --git a/libs/sqlalchemy/testing/provision.py b/libs/sqlalchemy/testing/provision.py
index 3afcf119b2..b61cb5035f 100644
--- a/libs/sqlalchemy/testing/provision.py
+++ b/libs/sqlalchemy/testing/provision.py
@@ -1,5 +1,5 @@
 # testing/provision.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -9,6 +9,7 @@
 from __future__ import annotations
 
 import collections
+import contextlib
 import logging
 
 from . import config
@@ -16,9 +17,13 @@
 from . import util
 from .. import exc
 from .. import inspect
+from ..engine import Connection
+from ..engine import Engine
 from ..engine import url as sa_url
+from ..schema import sort_tables_and_constraints
 from ..sql import ddl
 from ..sql import schema
+from ..util import decorator
 
 
 log = logging.getLogger(__name__)
@@ -49,11 +54,16 @@ def decorate(fn):
 
         return decorate
 
+    def call_original(self, cfg, *arg, **kw):
+        return self.fns["*"](cfg, *arg, **kw)
+
     def __call__(self, cfg, *arg, **kw):
         if isinstance(cfg, str):
             url = sa_url.make_url(cfg)
         elif isinstance(cfg, sa_url.URL):
             url = cfg
+        elif isinstance(cfg, (Engine, Connection)):
+            url = cfg.engine.url
         else:
             url = cfg.db.url
         backend = url.get_backend_name()
@@ -83,7 +93,9 @@ def setup_config(db_url, options, file_config, follower_ident):
     update_db_opts(db_url, db_opts, options)
     db_opts["scope"] = "global"
     eng = engines.testing_engine(db_url, db_opts)
+
     post_configure_engine(db_url, eng, follower_ident)
+
     eng.connect().close()
 
     cfg = config.Config.register(eng, db_opts, options, file_config)
@@ -200,6 +212,23 @@ def _generate_driver_urls(url, extra_drivers):
             yield new_url
 
 
+@register.init
+def is_preferred_driver(cfg, engine):
+    """Return True if the engine's URL is on the "default" driver, or
+    more generally the "preferred" driver to use for tests.
+
+    Backends can override this to make a different driver the "prefeferred"
+    driver that's not the default.
+
+    """
+    return (
+        engine.url._get_entrypoint()
+        is engine.url.set(
+            drivername=engine.url.get_backend_name()
+        )._get_entrypoint()
+    )
+
+
 @register.init
 def generate_driver_url(url, driver, query_str):
     backend = url.get_backend_name()
@@ -366,12 +395,25 @@ def update_db_opts(db_url, db_opts, options):
 
 @register.init
 def post_configure_engine(url, engine, follower_ident):
-    """Perform extra steps after configuring an engine for testing.
+    """Perform extra steps after configuring the main engine for testing.
 
     (For the internal dialects, currently only used by sqlite, oracle, mssql)
     """
 
 
+@register.init
+def post_configure_testing_engine(url, engine, options, scope):
+    """perform extra steps after configuring any engine within the
+    testing_engine() function.
+
+    this includes the main engine as well as most ad-hoc testing engines.
+
+    steps here should not get in the way of test cases that are looking
+    for events, etc.
+
+    """
+
+
 @register.init
 def follower_url_from_main(url, ident):
     """Create a connection URL for a dynamically-created test database.
@@ -476,7 +518,13 @@ def set_default_schema_on_connection(cfg, dbapi_connection, schema_name):
 
 @register.init
 def upsert(
-    cfg, table, returning, *, set_lambda=None, sort_by_parameter_order=False
+    cfg,
+    table,
+    returning,
+    *,
+    set_lambda=None,
+    sort_by_parameter_order=False,
+    index_elements=None,
 ):
     """return the backends insert..on conflict / on dupe etc. construct.
 
@@ -500,3 +548,56 @@ def normalize_sequence(cfg, sequence):
     The default implementation does nothing
     """
     return sequence
+
+
+@register.init
+def allow_stale_update_impl(cfg):
+    return contextlib.nullcontext()
+
+
+@decorator
+def allow_stale_updates(fn, *arg, **kw):
+    """decorator around a test function that indicates the test will
+    be UPDATING rows that have been read and are now stale.
+
+    This normally doesn't require intervention except for mariadb 12
+    which now raises its own error for that, and we want to turn off
+    that setting just within the scope of the test that needs it
+    to be turned off (i.e. ORM stale version tests)
+
+    """
+    with allow_stale_update_impl(config._current):
+        return fn(*arg, **kw)
+
+
+@register.init
+def delete_from_all_tables(connection, cfg, metadata):
+    """an absolutely foolproof delete from all tables routine.
+
+    dialects should override this to add special instructions like
+    disable constraints etc.
+
+    """
+    savepoints = getattr(cfg.requirements, "savepoints", False)
+    if savepoints:
+        savepoints = savepoints.enabled
+
+    inspector = inspect(connection)
+
+    for table in reversed(
+        [
+            t
+            for (t, fks) in sort_tables_and_constraints(
+                metadata.tables.values()
+            )
+            if t is not None
+            # remember that inspector.get_table_names() is cached,
+            # so this emits SQL once per unique schema name
+            and t.name in inspector.get_table_names(schema=t.schema)
+        ]
+    ):
+        if savepoints:
+            with connection.begin_nested():
+                connection.execute(table.delete())
+        else:
+            connection.execute(table.delete())
diff --git a/libs/sqlalchemy/testing/requirements.py b/libs/sqlalchemy/testing/requirements.py
index bbf56a059a..69f95cb2de 100644
--- a/libs/sqlalchemy/testing/requirements.py
+++ b/libs/sqlalchemy/testing/requirements.py
@@ -1,5 +1,5 @@
 # testing/requirements.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -19,6 +19,7 @@
 
 from __future__ import annotations
 
+import os
 import platform
 
 from . import asyncio as _test_asyncio
@@ -314,6 +315,13 @@ def ctes_with_update_delete(self):
 
         return exclusions.closed()
 
+    @property
+    def ctes_with_values(self):
+        """target database supports CTES that ride on top of a VALUES
+        clause."""
+
+        return exclusions.closed()
+
     @property
     def ctes_on_dml(self):
         """target database supports CTES which consist of INSERT, UPDATE
@@ -657,6 +665,12 @@ def reflect_tables_no_columns(self):
 
         return exclusions.closed()
 
+    @property
+    def temp_table_comment_reflection(self):
+        """indicates if database supports comments on temp tables and
+        the dialect can reflect them"""
+        return exclusions.closed()
+
     @property
     def comment_reflection(self):
         """Indicates if the database support table comment reflection"""
@@ -675,6 +689,15 @@ def constraint_comment_reflection(self):
         and their reflection"""
         return exclusions.closed()
 
+    @property
+    def column_collation_reflection(self):
+        """Indicates if the database support column collation reflection.
+
+        This requirement also uses ``get_order_by_collation`` to get
+        an available collation.
+        """
+        return exclusions.closed()
+
     @property
     def view_column_reflection(self):
         """target database must support retrieval of the columns in a view,
@@ -782,6 +805,11 @@ def reflect_indexes_with_ascdesc_as_expression(self):
         ASC/DESC but reflects them as expressions (like oracle)."""
         return exclusions.closed()
 
+    @property
+    def indexes_check_column_order(self):
+        """target database supports CREATE INDEX with column order check."""
+        return exclusions.closed()
+
     @property
     def indexes_with_expressions(self):
         """target database supports CREATE INDEX against SQL expressions."""
@@ -822,6 +850,11 @@ def unbounded_varchar(self):
 
         return exclusions.open()
 
+    @property
+    def nvarchar_types(self):
+        """target database supports NVARCHAR and NCHAR as an actual datatype"""
+        return exclusions.closed()
+
     @property
     def unicode_data_no_special_types(self):
         """Target database/dialect can receive / deliver / compare data with
@@ -1014,6 +1047,13 @@ def autocommit(self):
         """target dialect supports 'AUTOCOMMIT' as an isolation_level"""
         return exclusions.closed()
 
+    @property
+    def skip_autocommit_rollback(self):
+        """target dialect supports the detect_autocommit_setting() method and
+        uses the default implementation of do_rollback()"""
+
+        return exclusions.closed()
+
     @property
     def isolation_level(self):
         """target dialect supports general isolation level settings.
@@ -1168,6 +1208,19 @@ def cast_precision_numerics_many_significant_digits(self):
         """
         return self.precision_numerics_many_significant_digits
 
+    @property
+    def server_defaults(self):
+        """Target backend supports server side defaults for columns"""
+
+        return exclusions.closed()
+
+    @property
+    def expression_server_defaults(self):
+        """Target backend supports server side defaults with SQL expressions
+        for columns"""
+
+        return exclusions.closed()
+
     @property
     def implicit_decimal_binds(self):
         """target backend will return a selected Decimal as a Decimal, not
@@ -1460,14 +1513,10 @@ def skip_mysql_on_windows(self):
     def ad_hoc_engines(self):
         """Test environment must allow ad-hoc engine/connection creation.
 
-        DBs that scale poorly for many connections, even when closed, i.e.
-        Oracle, may use the "--low-connections" option which flags this
-        requirement as not present.
+        No longer used in any tests; is a no-op
 
         """
-        return exclusions.skip_if(
-            lambda config: config.options.low_connections
-        )
+        return exclusions.open()
 
     @property
     def no_windows(self):
@@ -1485,6 +1534,10 @@ def timing_intensive(self):
 
         return config.add_to_marker.timing_intensive
 
+    @property
+    def posix(self):
+        return exclusions.skip_if(lambda: os.name != "posix")
+
     @property
     def memory_intensive(self):
         from . import config
@@ -1526,6 +1579,27 @@ def check(config):
 
         return exclusions.skip_if(check)
 
+    @property
+    def up_to_date_typealias_type(self):
+        # this checks a particular quirk found in typing_extensions <=4.12.0
+        # using older python versions like 3.10 or 3.9, we use TypeAliasType
+        # from typing_extensions which does not provide for sufficient
+        # introspection prior to 4.13.0
+        def check(config):
+            import typing
+            import typing_extensions
+
+            TypeAliasType = getattr(
+                typing, "TypeAliasType", typing_extensions.TypeAliasType
+            )
+            TV = typing.TypeVar("TV")
+            TA_generic = TypeAliasType(  # type: ignore
+                "TA_generic", typing.List[TV], type_params=(TV,)
+            )
+            return hasattr(TA_generic[int], "__value__")
+
+        return exclusions.only_if(check)
+
     @property
     def python38(self):
         return exclusions.only_if(
@@ -1556,12 +1630,49 @@ def python312(self):
             lambda: util.py312, "Python 3.12 or above required"
         )
 
+    @property
+    def python314(self):
+        return exclusions.only_if(
+            lambda: util.py314, "Python 3.14 or above required"
+        )
+
+    @property
+    def fail_python314b1(self):
+        return exclusions.fails_if(
+            lambda: util.compat.py314b1, "Fails as of python 3.14.0b1"
+        )
+
+    @property
+    def not_python314(self):
+        """This requirement is interim to assist with backporting of
+        issue #12405.
+
+        SQLAlchemy 2.0 still includes the ``await_fallback()`` method that
+        makes use of ``asyncio.get_event_loop_policy()``.  This is removed
+        in SQLAlchemy 2.1.
+
+        """
+        return exclusions.skip_if(
+            lambda: util.py314, "Python 3.14 or above not supported"
+        )
+
+    @property
+    def pep649(self):
+        """pep649 deferred evaluation of annotations without future mode"""
+        return self.python314
+
     @property
     def cpython(self):
         return exclusions.only_if(
             lambda: util.cpython, "cPython interpreter needed"
         )
 
+    @property
+    def gil_enabled(self):
+        return exclusions.only_if(
+            lambda: not util.freethreading, "GIL-enabled build needed"
+        )
+
     @property
     def is64bit(self):
         return exclusions.only_if(lambda: util.is64bit, "64bit required")
@@ -1584,7 +1695,7 @@ def predictable_gc(self):
         gc.collect() is called, as well as clean out unreferenced subclasses.
 
         """
-        return self.cpython
+        return self.cpython + self.gil_enabled
 
     @property
     def no_coverage(self):
@@ -1826,3 +1937,9 @@ def supports_bitwise_xor(self):
     def supports_bitwise_shift(self):
         """Target database supports bitwise left or right shift"""
         return exclusions.closed()
+
+    @property
+    def like_escapes(self):
+        """Target backend supports custom ESCAPE characters
+        with LIKE comparisons"""
+        return exclusions.open()
diff --git a/libs/sqlalchemy/testing/schema.py b/libs/sqlalchemy/testing/schema.py
index 0dd7de2029..3998de87a8 100644
--- a/libs/sqlalchemy/testing/schema.py
+++ b/libs/sqlalchemy/testing/schema.py
@@ -1,5 +1,5 @@
 # testing/schema.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -26,37 +26,11 @@
 def Table(*args, **kw) -> schema.Table:
     """A schema.Table wrapper/hook for dialect-specific tweaks."""
 
-    test_opts = {k: kw.pop(k) for k in list(kw) if k.startswith("test_")}
+    # pop out local options; these are not used at the moment
+    _ = {k: kw.pop(k) for k in list(kw) if k.startswith("test_")}
 
     kw.update(table_options)
 
-    if exclusions.against(config._current, "mysql"):
-        if (
-            "mysql_engine" not in kw
-            and "mysql_type" not in kw
-            and "autoload_with" not in kw
-        ):
-            if "test_needs_fk" in test_opts or "test_needs_acid" in test_opts:
-                kw["mysql_engine"] = "InnoDB"
-            else:
-                # there are in fact test fixtures that rely upon MyISAM,
-                # due to MySQL / MariaDB having poor FK behavior under innodb,
-                # such as a self-referential table can't be deleted from at
-                # once without attending to per-row dependencies.  We'd need to
-                # add special steps to some fixtures if we want to not
-                # explicitly state MyISAM here
-                kw["mysql_engine"] = "MyISAM"
-    elif exclusions.against(config._current, "mariadb"):
-        if (
-            "mariadb_engine" not in kw
-            and "mariadb_type" not in kw
-            and "autoload_with" not in kw
-        ):
-            if "test_needs_fk" in test_opts or "test_needs_acid" in test_opts:
-                kw["mariadb_engine"] = "InnoDB"
-            else:
-                kw["mariadb_engine"] = "MyISAM"
-
     return schema.Table(*args, **kw)
 
 
diff --git a/libs/sqlalchemy/testing/suite/__init__.py b/libs/sqlalchemy/testing/suite/__init__.py
index 8435aa004f..e64b0dae00 100644
--- a/libs/sqlalchemy/testing/suite/__init__.py
+++ b/libs/sqlalchemy/testing/suite/__init__.py
@@ -1,5 +1,5 @@
 # testing/suite/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/suite/test_cte.py b/libs/sqlalchemy/testing/suite/test_cte.py
index 4e4d420faa..d74cf558ed 100644
--- a/libs/sqlalchemy/testing/suite/test_cte.py
+++ b/libs/sqlalchemy/testing/suite/test_cte.py
@@ -1,5 +1,5 @@
 # testing/suite/test_cte.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -10,15 +10,17 @@
 from ..assertions import eq_
 from ..schema import Column
 from ..schema import Table
+from ... import column
 from ... import ForeignKey
 from ... import Integer
 from ... import select
 from ... import String
 from ... import testing
+from ... import values
 
 
 class CTETest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
     __requires__ = ("ctes",)
 
     run_inserts = "each"
@@ -209,3 +211,27 @@ def test_delete_scalar_subq_round_trip(self, connection):
             ).fetchall(),
             [(1, "d1", None), (5, "d5", 3)],
         )
+
+    @testing.variation("values_named", [True, False])
+    @testing.variation("cte_named", [True, False])
+    @testing.variation("literal_binds", [True, False])
+    @testing.requires.ctes_with_values
+    def test_values_named_via_cte(
+        self, connection, values_named, cte_named, literal_binds
+    ):
+
+        cte1 = (
+            values(
+                column("col1", String),
+                column("col2", Integer),
+                literal_binds=bool(literal_binds),
+                name="some name" if values_named else None,
+            )
+            .data([("a", 2), ("b", 3)])
+            .cte("cte1" if cte_named else None)
+        )
+
+        stmt = select(cte1)
+
+        rows = connection.execute(stmt).all()
+        eq_(rows, [("a", 2), ("b", 3)])
diff --git a/libs/sqlalchemy/testing/suite/test_ddl.py b/libs/sqlalchemy/testing/suite/test_ddl.py
index c7e7d817d8..7cbf7168fe 100644
--- a/libs/sqlalchemy/testing/suite/test_ddl.py
+++ b/libs/sqlalchemy/testing/suite/test_ddl.py
@@ -1,5 +1,5 @@
 # testing/suite/test_ddl.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -29,7 +29,7 @@
 
 
 class TableDDLTest(fixtures.TestBase):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     def _simple_fixture(self, schema=None):
         return Table(
@@ -202,7 +202,7 @@ class LongNameBlowoutTest(fixtures.TestBase):
 
     """
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     def fk(self, metadata, connection):
         convention = {
diff --git a/libs/sqlalchemy/testing/suite/test_deprecations.py b/libs/sqlalchemy/testing/suite/test_deprecations.py
index db0a9fc48d..061ba59b2e 100644
--- a/libs/sqlalchemy/testing/suite/test_deprecations.py
+++ b/libs/sqlalchemy/testing/suite/test_deprecations.py
@@ -1,5 +1,5 @@
 # testing/suite/test_deprecations.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/suite/test_dialect.py b/libs/sqlalchemy/testing/suite/test_dialect.py
index ae67cc10ad..bd0b2380be 100644
--- a/libs/sqlalchemy/testing/suite/test_dialect.py
+++ b/libs/sqlalchemy/testing/suite/test_dialect.py
@@ -1,5 +1,5 @@
 # testing/suite/test_dialect.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -17,6 +17,7 @@
 from .. import fixtures
 from .. import is_not_none
 from .. import is_true
+from .. import mock
 from .. import ne_
 from .. import provide_metadata
 from ..assertions import expect_raises
@@ -293,7 +294,11 @@ def define_tables(cls, metadata):
             test_needs_acid=True,
         )
 
-    def _test_conn_autocommits(self, conn, autocommit):
+    def _test_conn_autocommits(self, conn, autocommit, ensure_table=False):
+        if ensure_table:
+            self.tables.some_table.create(conn, checkfirst=True)
+            conn.commit()
+
         trans = conn.begin()
         conn.execute(
             self.tables.some_table.insert(), {"id": 1, "data": "some data"}
@@ -336,6 +341,37 @@ def test_turn_autocommit_off_via_default_iso_level(
         )
         self._test_conn_autocommits(conn, False)
 
+    @testing.requires.skip_autocommit_rollback
+    @testing.variation("autocommit_setting", ["false", "engine", "option"])
+    @testing.variation("block_rollback", [True, False])
+    def test_autocommit_block(
+        self, testing_engine, autocommit_setting, block_rollback
+    ):
+        kw = {}
+        if bool(block_rollback):
+            kw["skip_autocommit_rollback"] = True
+        if autocommit_setting.engine:
+            kw["isolation_level"] = "AUTOCOMMIT"
+
+        engine = testing_engine(options=kw)
+
+        conn = engine.connect()
+        if autocommit_setting.option:
+            conn.execution_options(isolation_level="AUTOCOMMIT")
+        self._test_conn_autocommits(
+            conn,
+            autocommit_setting.engine or autocommit_setting.option,
+            ensure_table=True,
+        )
+        with mock.patch.object(
+            conn.connection, "rollback", wraps=conn.connection.rollback
+        ) as check_rollback:
+            conn.close()
+        if autocommit_setting.false or not block_rollback:
+            eq_(check_rollback.mock_calls, [mock.call()])
+        else:
+            eq_(check_rollback.mock_calls, [])
+
     @testing.requires.independent_readonly_connections
     @testing.variation("use_dialect_setting", [True, False])
     def test_dialect_autocommit_is_restored(
@@ -537,7 +573,7 @@ def test_round_trip_same_named_column(
             t.c[name].in_(["some name", "some other_name"])
         )
 
-        row = connection.execute(stmt).first()
+        connection.execute(stmt).first()
 
     @testing.fixture
     def multirow_fixture(self, metadata, connection):
@@ -621,7 +657,7 @@ def go(stmt, executemany, id_param_name, expect_success):
                         f"current server capabilities does not support "
                         f".*RETURNING when executemany is used",
                     ):
-                        result = connection.execute(
+                        connection.execute(
                             stmt,
                             [
                                 {id_param_name: 1, "data": "d1"},
diff --git a/libs/sqlalchemy/testing/suite/test_insert.py b/libs/sqlalchemy/testing/suite/test_insert.py
index 8467c35179..e82f835e1e 100644
--- a/libs/sqlalchemy/testing/suite/test_insert.py
+++ b/libs/sqlalchemy/testing/suite/test_insert.py
@@ -1,5 +1,5 @@
 # testing/suite/test_insert.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/suite/test_reflection.py b/libs/sqlalchemy/testing/suite/test_reflection.py
index 54d0d449a9..8f6fe56842 100644
--- a/libs/sqlalchemy/testing/suite/test_reflection.py
+++ b/libs/sqlalchemy/testing/suite/test_reflection.py
@@ -1,5 +1,5 @@
 # testing/suite/test_reflection.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -14,6 +14,7 @@
 from .. import config
 from .. import engines
 from .. import eq_
+from .. import eq_regex
 from .. import expect_raises
 from .. import expect_raises_message
 from .. import expect_warnings
@@ -23,6 +24,8 @@
 from ..provision import temp_table_keyword_args
 from ..schema import Column
 from ..schema import Table
+from ... import Boolean
+from ... import DateTime
 from ... import event
 from ... import ForeignKey
 from ... import func
@@ -45,6 +48,7 @@
 from ...testing import ComparesIndexes
 from ...testing import ComparesTables
 from ...testing import is_false
+from ...testing import is_none
 from ...testing import is_true
 from ...testing import mock
 
@@ -69,7 +73,9 @@ def setup_bind(cls):
 
 
 class HasTableTest(OneConnectionTablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
+
+    run_deletes = None
 
     @classmethod
     def define_tables(cls, metadata):
@@ -219,7 +225,8 @@ def test_has_table_view_schema(self, connection):
 
 
 class HasIndexTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
+    __requires__ = ("index_reflection",)
 
     @classmethod
     def define_tables(cls, metadata):
@@ -294,25 +301,36 @@ def test_has_index_schema(self, kind, connection):
         )
 
 
-class BizarroCharacterFKResolutionTest(fixtures.TestBase):
-    """tests for #10275"""
+class BizarroCharacterTest(fixtures.TestBase):
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
+
+    def column_names():
+        return testing.combinations(
+            ("plainname",),
+            ("(3)",),
+            ("col%p",),
+            ("[brack]",),
+            argnames="columnname",
+        )
+
+    def table_names():
+        return testing.combinations(
+            ("plain",),
+            ("(2)",),
+            ("per % cent",),
+            ("[brackets]",),
+            argnames="tablename",
+        )
 
-    @testing.combinations(
-        ("id",), ("(3)",), ("col%p",), ("[brack]",), argnames="columnname"
-    )
     @testing.variation("use_composite", [True, False])
-    @testing.combinations(
-        ("plain",),
-        ("(2)",),
-        ("per % cent",),
-        ("[brackets]",),
-        argnames="tablename",
-    )
+    @column_names()
+    @table_names()
+    @testing.requires.foreign_key_constraint_reflection
     def test_fk_ref(
         self, connection, metadata, use_composite, tablename, columnname
     ):
+        """tests for #10275"""
         tt = Table(
             tablename,
             metadata,
@@ -352,10 +370,81 @@ def test_fk_ref(
         if use_composite:
             assert o2.c.ref2.references(t1.c[1])
 
+    @column_names()
+    @table_names()
+    @testing.requires.identity_columns
+    def test_reflect_identity(
+        self, tablename, columnname, connection, metadata
+    ):
+        Table(
+            tablename,
+            metadata,
+            Column(columnname, Integer, Identity(), primary_key=True),
+        )
+        metadata.create_all(connection)
+        insp = inspect(connection)
+
+        eq_(insp.get_columns(tablename)[0]["identity"]["start"], 1)
+
+    @column_names()
+    @table_names()
+    @testing.requires.comment_reflection
+    def test_reflect_comments(
+        self, tablename, columnname, connection, metadata
+    ):
+        Table(
+            tablename,
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column(columnname, Integer, comment="some comment"),
+        )
+        metadata.create_all(connection)
+        insp = inspect(connection)
+
+        eq_(insp.get_columns(tablename)[1]["comment"], "some comment")
+
+
+class TempTableElementsTest(fixtures.TestBase):
+
+    __sparse_driver_backend__ = True
+
+    __requires__ = ("temp_table_reflection",)
+
+    @testing.fixture
+    def tablename(self):
+        return get_temp_table_name(
+            config, config.db, f"ident_tmp_{config.ident}"
+        )
+
+    @testing.requires.identity_columns
+    def test_reflect_identity(self, tablename, connection, metadata):
+        Table(
+            tablename,
+            metadata,
+            Column("id", Integer, Identity(), primary_key=True),
+        )
+        metadata.create_all(connection)
+        insp = inspect(connection)
+
+        eq_(insp.get_columns(tablename)[0]["identity"]["start"], 1)
+
+    @testing.requires.temp_table_comment_reflection
+    def test_reflect_comments(self, tablename, connection, metadata):
+        Table(
+            tablename,
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("foobar", Integer, comment="some comment"),
+        )
+        metadata.create_all(connection)
+        insp = inspect(connection)
+
+        eq_(insp.get_columns(tablename)[1]["comment"], "some comment")
+
 
 class QuotedNameArgumentTest(fixtures.TablesTest):
     run_create_tables = "once"
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -455,7 +544,7 @@ def test_get_table_options(self, name):
             is_true(isinstance(res, dict))
         else:
             with expect_raises(NotImplementedError):
-                res = insp.get_table_options(name)
+                insp.get_table_options(name)
 
     @quote_fixtures
     @testing.requires.view_column_reflection
@@ -474,11 +563,13 @@ def test_get_pk_constraint(self, name):
         assert insp.get_pk_constraint(name)
 
     @quote_fixtures
+    @testing.requires.foreign_key_constraint_reflection
     def test_get_foreign_keys(self, name):
         insp = inspect(config.db)
         assert insp.get_foreign_keys(name)
 
     @quote_fixtures
+    @testing.requires.index_reflection
     def test_get_indexes(self, name):
         insp = inspect(config.db)
         assert insp.get_indexes(name)
@@ -535,7 +626,7 @@ def _multi_combination(fn):
 class ComponentReflectionTest(ComparesTables, OneConnectionTablesTest):
     run_inserts = run_deletes = None
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -1732,6 +1823,37 @@ def test_get_pk_constraint(self, connection, use_schema):
             self._required_pk_keys,
         )
 
+    @testing.combinations(
+        "PK_test_table",
+        "pk_test_table",
+        "mixedCasePK",
+        "pk.with.dots",
+        argnames="pk_name",
+    )
+    @testing.requires.primary_key_constraint_reflection
+    @testing.requires.reflects_pk_names
+    def test_get_pk_constraint_quoted_name(
+        self, connection, metadata, pk_name
+    ):
+        """Test that primary key constraint names with various casing are
+        properly reflected."""
+
+        Table(
+            "test_table",
+            metadata,
+            Column("id", Integer),
+            Column("data", String(50)),
+            sa.PrimaryKeyConstraint("id", name=pk_name),
+        )
+
+        metadata.create_all(connection)
+
+        insp = inspect(connection)
+        pk_cons = insp.get_pk_constraint("test_table")
+
+        eq_(pk_cons["name"], pk_name)
+        eq_(pk_cons["constrained_columns"], ["id"])
+
     @testing.combinations(
         (False,), (True, testing.requires.schemas), argnames="use_schema"
     )
@@ -1774,6 +1896,53 @@ def test_get_foreign_keys(self, connection, use_schema):
         no_cst = self.tables.no_constraints.name
         eq_(insp.get_foreign_keys(no_cst, schema=schema), [])
 
+    @testing.combinations(
+        "FK_users_id",
+        "fk_users_id",
+        "mixedCaseName",
+        "fk.with.dots",
+        argnames="fk_name",
+    )
+    @testing.requires.foreign_key_constraint_reflection
+    def test_get_foreign_keys_quoted_name(self, connection, metadata, fk_name):
+        """Test that foreign key constraint names with various casing are
+        properly reflected."""
+
+        Table(
+            "users_ref",
+            metadata,
+            Column("user_id", Integer, primary_key=True),
+            test_needs_fk=True,
+        )
+
+        Table(
+            "user_orders",
+            metadata,
+            Column("order_id", Integer, primary_key=True),
+            Column("user_id", Integer),
+            sa.ForeignKeyConstraint(
+                ["user_id"],
+                ["users_ref.user_id"],
+                name=fk_name,
+            ),
+            test_needs_fk=True,
+        )
+
+        metadata.create_all(connection)
+
+        insp = inspect(connection)
+        fkeys = insp.get_foreign_keys("user_orders")
+
+        eq_(len(fkeys), 1)
+        fkey = fkeys[0]
+
+        with testing.requires.named_constraints.fail_if():
+            eq_(fkey["name"], fk_name)
+
+        eq_(fkey["referred_table"], "users_ref")
+        eq_(fkey["referred_columns"], ["user_id"])
+        eq_(fkey["constrained_columns"], ["user_id"])
+
     @testing.requires.cross_schema_fk_reflection
     @testing.requires.schemas
     def test_get_inter_schema_foreign_keys(self, connection):
@@ -1860,6 +2029,38 @@ def test_get_noncol_index(self, connection, tname, ixname):
         is_(list(t.indexes)[0].table, t)
         eq_(list(t.indexes)[0].name, ixname)
 
+    @testing.combinations(
+        "IX_test_data",
+        "ix_test_data",
+        "mixedCaseIndex",
+        "ix.with.dots",
+        argnames="idx_name",
+    )
+    @testing.requires.index_reflection
+    def test_get_indexes_quoted_name(self, connection, metadata, idx_name):
+        """Test that index names with various casing are properly reflected."""
+
+        t = Table(
+            "test_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("data", String(50)),
+        )
+        Index(idx_name, t.c.data)
+
+        metadata.create_all(connection)
+
+        insp = inspect(connection)
+        indexes = insp.get_indexes("test_table")
+
+        index_names = [idx["name"] for idx in indexes]
+        assert idx_name in index_names, f"Expected {idx_name} in {index_names}"
+
+        # Find the specific index
+        matching_idx = [idx for idx in indexes if idx["name"] == idx_name]
+        eq_(len(matching_idx), 1)
+        eq_(matching_idx[0]["column_names"], ["data"])
+
     @testing.requires.temp_table_reflection
     @testing.requires.unique_constraint_reflection
     def test_get_temp_table_unique_constraints(self, connection):
@@ -1947,6 +2148,8 @@ def test_get_unique_constraints(self, metadata, connection, use_schema):
             if dupe:
                 names_that_duplicate_index.add(dupe)
             eq_(refl.pop("comment", None), None)
+            # ignore dialect_options
+            refl.pop("dialect_options", None)
             eq_(orig, refl)
 
         reflected_metadata = MetaData()
@@ -1976,6 +2179,37 @@ def test_get_unique_constraints(self, metadata, connection, use_schema):
         no_cst = self.tables.no_constraints.name
         eq_(insp.get_unique_constraints(no_cst, schema=schema), [])
 
+    @testing.combinations(
+        "UQ_email",
+        "uq_email",
+        "mixedCaseUQ",
+        "uq.with.dots",
+        argnames="uq_name",
+    )
+    @testing.requires.unique_constraint_reflection
+    def test_get_unique_constraints_quoted_name(
+        self, connection, metadata, uq_name
+    ):
+        """Test that unique constraint names with various casing are
+        properly reflected."""
+
+        Table(
+            "test_table",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("email", String(50)),
+            sa.UniqueConstraint("email", name=uq_name),
+        )
+
+        metadata.create_all(connection)
+
+        insp = inspect(connection)
+        uq_cons = insp.get_unique_constraints("test_table")
+
+        eq_(len(uq_cons), 1)
+        eq_(uq_cons[0]["name"], uq_name)
+        eq_(uq_cons[0]["column_names"], ["email"])
+
     @testing.requires.view_reflection
     @testing.combinations(
         (False,), (True, testing.requires.schemas), argnames="use_schema"
@@ -2038,7 +2272,7 @@ def test_get_table_options(self, use_schema):
             is_true(isinstance(res, dict))
         else:
             with expect_raises(NotImplementedError):
-                res = insp.get_table_options("users", schema=schema)
+                insp.get_table_options("users", schema=schema)
 
     @testing.combinations((True, testing.requires.schemas), False)
     def test_multi_get_table_options(self, use_schema):
@@ -2054,7 +2288,7 @@ def test_multi_get_table_options(self, use_schema):
             eq_(res, exp)
         else:
             with expect_raises(NotImplementedError):
-                res = insp.get_multi_table_options()
+                insp.get_multi_table_options()
 
     @testing.fixture
     def get_multi_exp(self, connection):
@@ -2398,10 +2632,33 @@ def test_comments_unicode_full(self, connection, metadata):
         c = insp.get_columns("unicode_comments")[0]
         eq_({c["name"]: c["comment"]}, {"emoji": "๐Ÿ๐Ÿง™๐Ÿ๐Ÿง™โ€โ™‚๏ธ๐Ÿง™โ€โ™€๏ธ"})
 
+    @testing.requires.column_collation_reflection
+    @testing.requires.order_by_collation
+    def test_column_collation_reflection(self, connection, metadata):
+        collation = testing.requires.get_order_by_collation(config)
+        Table(
+            "t",
+            metadata,
+            Column("collated", sa.String(collation=collation)),
+            Column("not_collated", sa.String()),
+        )
+        metadata.create_all(connection)
+
+        m2 = MetaData()
+        t2 = Table("t", m2, autoload_with=connection)
+
+        eq_(t2.c.collated.type.collation, collation)
+        is_none(t2.c.not_collated.type.collation)
+
+        insp = inspect(connection)
+        collated, not_collated = insp.get_columns("t")
+        eq_(collated["type"].collation, collation)
+        is_none(not_collated["type"].collation)
+
 
 class TableNoColumnsTest(fixtures.TestBase):
     __requires__ = ("reflect_tables_no_columns",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @testing.fixture
     def table_no_columns(self, connection, metadata):
@@ -2453,7 +2710,7 @@ def test_get_columns_view_no_columns(self, connection, view_no_columns):
 
 
 class ComponentReflectionTestExtra(ComparesIndexes, fixtures.TestBase):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @testing.fixture(params=[True, False])
     def use_schema_fixture(self, request):
@@ -2608,6 +2865,26 @@ def test_check_constraint_mixed(self, metadata, inspect_for_table):
             ],
         )
 
+    @testing.requires.indexes_check_column_order
+    def test_index_column_order(self, metadata, inspect_for_table):
+        """test for #12894"""
+        with inspect_for_table("sa_multi_index") as (schema, inspector):
+            test_table = Table(
+                "sa_multi_index",
+                metadata,
+                Column("Column1", Integer, primary_key=True),
+                Column("Column2", Integer),
+                Column("Column3", Integer),
+            )
+            Index(
+                "Index_Example",
+                test_table.c.Column3,
+                test_table.c.Column1,
+                test_table.c.Column2,
+            )
+        indexes = inspector.get_indexes("sa_multi_index")
+        eq_(indexes[0]["column_names"], ["Column3", "Column1", "Column2"])
+
     @testing.requires.indexes_with_expressions
     def test_reflect_expression_based_indexes(self, metadata, connection):
         t = Table(
@@ -2762,12 +3039,25 @@ def test_numeric_reflection(self, connection, metadata):
             eq_(typ.scale, 5)
 
     @testing.requires.table_reflection
-    def test_varchar_reflection(self, connection, metadata):
-        typ = self._type_round_trip(
-            connection, metadata, sql_types.String(52)
-        )[0]
-        assert isinstance(typ, sql_types.String)
+    @testing.combinations(
+        sql_types.String,
+        sql_types.VARCHAR,
+        sql_types.CHAR,
+        (sql_types.NVARCHAR, testing.requires.nvarchar_types),
+        (sql_types.NCHAR, testing.requires.nvarchar_types),
+        argnames="type_",
+    )
+    def test_string_length_reflection(self, connection, metadata, type_):
+        typ = self._type_round_trip(connection, metadata, type_(52))[0]
+        if issubclass(type_, sql_types.VARCHAR):
+            assert isinstance(typ, sql_types.VARCHAR)
+        elif issubclass(type_, sql_types.CHAR):
+            assert isinstance(typ, sql_types.CHAR)
+        else:
+            assert isinstance(typ, sql_types.String)
+
         eq_(typ.length, 52)
+        assert isinstance(typ.length, int)
 
     @testing.requires.table_reflection
     def test_nullable_reflection(self, connection, metadata):
@@ -2879,10 +3169,51 @@ def test_get_foreign_key_options(
         eq_(opts, expected)
         # eq_(dict((k, opts[k]) for k in opts if opts[k]), expected)
 
+    @testing.combinations(
+        (Integer, sa.text("10"), r"'?10'?"),
+        (Integer, "10", r"'?10'?"),
+        (Boolean, sa.true(), r"1|true"),
+        (
+            Integer,
+            sa.text("3 + 5"),
+            r"3\+5",
+            testing.requires.expression_server_defaults,
+        ),
+        (
+            Integer,
+            sa.text("(3 * 5)"),
+            r"3\*5",
+            testing.requires.expression_server_defaults,
+        ),
+        (DateTime, func.now(), r"current_timestamp|now|getdate"),
+        (
+            Integer,
+            sa.literal_column("3") + sa.literal_column("5"),
+            r"3\+5",
+            testing.requires.expression_server_defaults,
+        ),
+        argnames="datatype, default, expected_reg",
+    )
+    @testing.requires.server_defaults
+    def test_server_defaults(
+        self, metadata, connection, datatype, default, expected_reg
+    ):
+        t = Table(
+            "t",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("thecol", datatype, server_default=default),
+        )
+        t.create(connection)
+
+        reflected = inspect(connection).get_columns("t")[1]["default"]
+        reflected_sanitized = re.sub(r"[\(\) \']", "", reflected)
+        eq_regex(reflected_sanitized, expected_reg, flags=re.IGNORECASE)
+
 
 class NormalizedNameTest(fixtures.TablesTest):
     __requires__ = ("denormalized_names",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -3023,7 +3354,7 @@ def test_get_column_returns_persisted_with_schema(self):
 class IdentityReflectionTest(fixtures.TablesTest):
     run_inserts = run_deletes = None
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
     __requires__ = ("identity_columns", "table_reflection")
 
     @classmethod
@@ -3162,7 +3493,7 @@ def test_reflect_identity_schema(self):
 
 
 class CompositeKeyReflectionTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -3215,11 +3546,12 @@ def test_fk_column_order(self, connection):
     "ComponentReflectionTestExtra",
     "TableNoColumnsTest",
     "QuotedNameArgumentTest",
-    "BizarroCharacterFKResolutionTest",
+    "BizarroCharacterTest",
     "HasTableTest",
     "HasIndexTest",
     "NormalizedNameTest",
     "ComputedReflectionTest",
     "IdentityReflectionTest",
     "CompositeKeyReflectionTest",
+    "TempTableElementsTest",
 )
diff --git a/libs/sqlalchemy/testing/suite/test_results.py b/libs/sqlalchemy/testing/suite/test_results.py
index a6179d8559..c75b56352a 100644
--- a/libs/sqlalchemy/testing/suite/test_results.py
+++ b/libs/sqlalchemy/testing/suite/test_results.py
@@ -1,5 +1,5 @@
 # testing/suite/test_results.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -268,6 +268,8 @@ def _is_server_side(self, cursor):
             return isinstance(cursor, sscursor)
         elif self.engine.dialect.driver == "mariadbconnector":
             return not cursor.buffered
+        elif self.engine.dialect.driver == "mysqlconnector":
+            return "buffered" not in type(cursor).__name__.lower()
         elif self.engine.dialect.driver in ("asyncpg", "aiosqlite"):
             return cursor.server_side
         elif self.engine.dialect.driver == "pg8000":
diff --git a/libs/sqlalchemy/testing/suite/test_rowcount.py b/libs/sqlalchemy/testing/suite/test_rowcount.py
index 59953fff59..f74246bf9f 100644
--- a/libs/sqlalchemy/testing/suite/test_rowcount.py
+++ b/libs/sqlalchemy/testing/suite/test_rowcount.py
@@ -1,5 +1,5 @@
 # testing/suite/test_rowcount.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/suite/test_select.py b/libs/sqlalchemy/testing/suite/test_select.py
index 7eb5cd0055..ab91c5cb80 100644
--- a/libs/sqlalchemy/testing/suite/test_select.py
+++ b/libs/sqlalchemy/testing/suite/test_select.py
@@ -1,5 +1,5 @@
 # testing/suite/test_select.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -47,7 +47,7 @@
 
 
 class CollateTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -93,7 +93,7 @@ class OrderByLabelTest(fixtures.TablesTest):
 
     """
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -164,7 +164,7 @@ def test_group_by_composed(self):
 class ValuesExpressionTest(fixtures.TestBase):
     __requires__ = ("table_value_constructor",)
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     def test_tuples(self, connection):
         value_expr = values(
@@ -234,7 +234,9 @@ def test_simple_limit(self, connection):
 
     def test_limit_render_multiple_times(self, connection):
         table = self.tables.some_table
-        stmt = select(table.c.id).limit(1).scalar_subquery()
+        stmt = (
+            select(table.c.id).order_by(table.c.id).limit(1).scalar_subquery()
+        )
 
         u = union(select(stmt), select(stmt)).subquery().select()
 
@@ -635,7 +637,7 @@ def test_fetch_offset_percent_ties(self, connection):
 class SameNamedSchemaTableTest(fixtures.TablesTest):
     """tests for #7471"""
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     __requires__ = ("schemas",)
 
@@ -732,7 +734,7 @@ def test_subquery(self, connection):
 
 
 class JoinTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     def _assert_result(self, select, result, params=()):
         with config.db.connect() as conn:
@@ -832,7 +834,7 @@ def test_outer_join_fk(self):
 
 
 class CompoundSelectTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -1493,7 +1495,7 @@ def test_null_in_empty_set_is_false_direct(self, connection):
 
 
 class LikeFunctionsTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     run_inserts = "once"
     run_deletes = None
@@ -1541,6 +1543,7 @@ def test_startswith_unescaped(self):
         col = self.tables.some_table.c.data
         self._test(col.startswith("ab%c"), {1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
 
+    @testing.requires.like_escapes
     def test_startswith_autoescape(self):
         col = self.tables.some_table.c.data
         self._test(col.startswith("ab%c", autoescape=True), {3})
@@ -1552,10 +1555,12 @@ def test_startswith_sqlexpr(self):
             {1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
         )
 
+    @testing.requires.like_escapes
     def test_startswith_escape(self):
         col = self.tables.some_table.c.data
         self._test(col.startswith("ab##c", escape="#"), {7})
 
+    @testing.requires.like_escapes
     def test_startswith_autoescape_escape(self):
         col = self.tables.some_table.c.data
         self._test(col.startswith("ab%c", autoescape=True, escape="#"), {3})
@@ -1571,14 +1576,17 @@ def test_endswith_sqlexpr(self):
             col.endswith(literal_column("'e%fg'")), {1, 2, 3, 4, 5, 6, 7, 8, 9}
         )
 
+    @testing.requires.like_escapes
     def test_endswith_autoescape(self):
         col = self.tables.some_table.c.data
         self._test(col.endswith("e%fg", autoescape=True), {6})
 
+    @testing.requires.like_escapes
     def test_endswith_escape(self):
         col = self.tables.some_table.c.data
         self._test(col.endswith("e##fg", escape="#"), {9})
 
+    @testing.requires.like_escapes
     def test_endswith_autoescape_escape(self):
         col = self.tables.some_table.c.data
         self._test(col.endswith("e%fg", autoescape=True, escape="#"), {6})
@@ -1588,14 +1596,17 @@ def test_contains_unescaped(self):
         col = self.tables.some_table.c.data
         self._test(col.contains("b%cde"), {1, 2, 3, 4, 5, 6, 7, 8, 9})
 
+    @testing.requires.like_escapes
     def test_contains_autoescape(self):
         col = self.tables.some_table.c.data
         self._test(col.contains("b%cde", autoescape=True), {3})
 
+    @testing.requires.like_escapes
     def test_contains_escape(self):
         col = self.tables.some_table.c.data
         self._test(col.contains("b##cde", escape="#"), {7})
 
+    @testing.requires.like_escapes
     def test_contains_autoescape_escape(self):
         col = self.tables.some_table.c.data
         self._test(col.contains("b%cd", autoescape=True, escape="#"), {3})
@@ -1629,7 +1640,7 @@ def test_regexp_match(self, text, expected):
 
 
 class ComputedColumnTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
     __requires__ = ("computed_columns",)
 
     @classmethod
@@ -1771,13 +1782,13 @@ def define_tables(cls, metadata):
         )
 
     def test_autoincrement_with_identity(self, connection):
-        res = connection.execute(self.tables.tbl.insert(), {"desc": "row"})
+        connection.execute(self.tables.tbl.insert(), {"desc": "row"})
         res = connection.execute(self.tables.tbl.select()).first()
         eq_(res, (1, "row"))
 
 
 class ExistsTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -1824,7 +1835,7 @@ def test_select_exists_false(self, connection):
 
 
 class DistinctOnTest(AssertsCompiledSQL, fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @testing.fails_if(testing.requires.supports_distinct_on)
     def test_distinct_on(self):
@@ -1836,7 +1847,7 @@ def test_distinct_on(self):
 
 
 class IsOrIsNotDistinctFromTest(fixtures.TablesTest):
-    __backend__ = True
+    __sparse_driver_backend__ = True
     __requires__ = ("supports_is_distinct_from",)
 
     @classmethod
@@ -1891,7 +1902,7 @@ def test_is_or_is_not_distinct_from(
 class WindowFunctionTest(fixtures.TablesTest):
     __requires__ = ("window_functions",)
 
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
diff --git a/libs/sqlalchemy/testing/suite/test_sequence.py b/libs/sqlalchemy/testing/suite/test_sequence.py
index f0e6575370..3ee88591d8 100644
--- a/libs/sqlalchemy/testing/suite/test_sequence.py
+++ b/libs/sqlalchemy/testing/suite/test_sequence.py
@@ -1,5 +1,5 @@
 # testing/suite/test_sequence.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -24,7 +24,7 @@
 
 class SequenceTest(fixtures.TablesTest):
     __requires__ = ("sequences",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     run_create_tables = "each"
 
@@ -163,7 +163,7 @@ def test_nextval_direct_schema_translate(self, connection):
 
 class SequenceCompilerTest(testing.AssertsCompiledSQL, fixtures.TestBase):
     __requires__ = ("sequences",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     def test_literal_binds_inline_compile(self, connection):
         table = Table(
@@ -192,7 +192,7 @@ class HasSequenceTest(fixtures.TablesTest):
     run_deletes = None
 
     __requires__ = ("sequences",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
@@ -308,7 +308,7 @@ def test_get_sequence_names_sequences_schema(self, connection):
 
 class HasSequenceTestEmpty(fixtures.TestBase):
     __requires__ = ("sequences",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     def test_get_sequence_names_no_sequence(self, connection):
         eq_(
diff --git a/libs/sqlalchemy/testing/suite/test_types.py b/libs/sqlalchemy/testing/suite/test_types.py
index de3cd53e34..fdeae8157a 100644
--- a/libs/sqlalchemy/testing/suite/test_types.py
+++ b/libs/sqlalchemy/testing/suite/test_types.py
@@ -1,5 +1,5 @@
 # testing/suite/test_types.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -299,6 +299,7 @@ def test_literal_complex(self, literal_round_trip):
 
 class BinaryTest(_LiteralRoundTripFixture, fixtures.TablesTest):
     __backend__ = True
+    __requires__ = ("binary_literals",)
 
     @classmethod
     def define_tables(cls, metadata):
@@ -431,7 +432,9 @@ def test_dont_truncate_rightside(
         connection.execute(t.insert(), [{"x": "AB"}, {"x": "BC"}, {"x": "AC"}])
 
         eq_(
-            connection.scalars(select(t.c.x).where(t.c.x.like(expr))).all(),
+            connection.scalars(
+                select(t.c.x).where(t.c.x.like(expr)).order_by(t.c.x)
+            ).all(),
             expected,
         )
 
@@ -1483,6 +1486,7 @@ def default(self, o):
 
         return datatype, compare_value, p_s
 
+    @testing.requires.legacy_unconditional_json_extract
     @_index_fixtures(False)
     def test_index_typed_access(self, datatype, value):
         data_table = self.tables.data_table
@@ -1504,6 +1508,7 @@ def test_index_typed_access(self, datatype, value):
             eq_(roundtrip, compare_value)
             is_(type(roundtrip), type(compare_value))
 
+    @testing.requires.legacy_unconditional_json_extract
     @_index_fixtures(True)
     def test_index_typed_comparison(self, datatype, value):
         data_table = self.tables.data_table
@@ -1528,6 +1533,7 @@ def test_index_typed_comparison(self, datatype, value):
             # make sure we get a row even if value is None
             eq_(row, (compare_value,))
 
+    @testing.requires.legacy_unconditional_json_extract
     @_index_fixtures(True)
     def test_path_typed_comparison(self, datatype, value):
         data_table = self.tables.data_table
diff --git a/libs/sqlalchemy/testing/suite/test_unicode_ddl.py b/libs/sqlalchemy/testing/suite/test_unicode_ddl.py
index c8dd335058..5642c6d90a 100644
--- a/libs/sqlalchemy/testing/suite/test_unicode_ddl.py
+++ b/libs/sqlalchemy/testing/suite/test_unicode_ddl.py
@@ -1,5 +1,5 @@
 # testing/suite/test_unicode_ddl.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/testing/suite/test_update_delete.py b/libs/sqlalchemy/testing/suite/test_update_delete.py
index 85a8d39339..1374e05f51 100644
--- a/libs/sqlalchemy/testing/suite/test_update_delete.py
+++ b/libs/sqlalchemy/testing/suite/test_update_delete.py
@@ -1,5 +1,5 @@
 # testing/suite/test_update_delete.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -18,7 +18,7 @@
 class SimpleUpdateDeleteTest(fixtures.TablesTest):
     run_deletes = "each"
     __requires__ = ("sane_rowcount",)
-    __backend__ = True
+    __sparse_driver_backend__ = True
 
     @classmethod
     def define_tables(cls, metadata):
diff --git a/libs/sqlalchemy/testing/util.py b/libs/sqlalchemy/testing/util.py
index 42f077108f..05aff5f36c 100644
--- a/libs/sqlalchemy/testing/util.py
+++ b/libs/sqlalchemy/testing/util.py
@@ -1,5 +1,5 @@
 # testing/util.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -10,10 +10,12 @@
 from __future__ import annotations
 
 from collections import deque
+from collections import namedtuple
 import contextlib
 import decimal
 import gc
 from itertools import chain
+import pickle
 import random
 import sys
 from sys import getsizeof
@@ -55,15 +57,10 @@ def lazy_gc():
 
 
 def picklers():
-    picklers = set()
-    import pickle
+    nt = namedtuple("picklers", ["loads", "dumps"])
 
-    picklers.add(pickle)
-
-    # yes, this thing needs this much testing
-    for pickle_ in picklers:
-        for protocol in range(-2, pickle.HIGHEST_PROTOCOL + 1):
-            yield pickle_.loads, lambda d: pickle_.dumps(d, protocol)
+    for protocol in range(-2, pickle.HIGHEST_PROTOCOL + 1):
+        yield nt(pickle.loads, lambda d: pickle.dumps(d, protocol))
 
 
 def random_choices(population, k=1):
diff --git a/libs/sqlalchemy/testing/warnings.py b/libs/sqlalchemy/testing/warnings.py
index 9be0813b58..af136a8e14 100644
--- a/libs/sqlalchemy/testing/warnings.py
+++ b/libs/sqlalchemy/testing/warnings.py
@@ -1,5 +1,5 @@
 # testing/warnings.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/types.py b/libs/sqlalchemy/types.py
index c2b1ab1945..23b9eac403 100644
--- a/libs/sqlalchemy/types.py
+++ b/libs/sqlalchemy/types.py
@@ -1,13 +1,11 @@
 # types.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 
-"""Compatibility namespace for sqlalchemy.sql.types.
-
-"""
+"""Compatibility namespace for sqlalchemy.sql.types."""
 
 
 from __future__ import annotations
diff --git a/libs/sqlalchemy/util/__init__.py b/libs/sqlalchemy/util/__init__.py
index a9b4c3b1c0..fcaa54d637 100644
--- a/libs/sqlalchemy/util/__init__.py
+++ b/libs/sqlalchemy/util/__init__.py
@@ -1,5 +1,5 @@
 # util/__init__.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -9,7 +9,6 @@
 from collections import defaultdict as defaultdict
 from functools import partial as partial
 from functools import update_wrapper as update_wrapper
-from typing import TYPE_CHECKING
 
 from . import preloaded as preloaded
 from ._collections import coerce_generator_arg as coerce_generator_arg
@@ -57,15 +56,19 @@
 from .compat import dataclass_fields as dataclass_fields
 from .compat import decode_backslashreplace as decode_backslashreplace
 from .compat import dottedgetter as dottedgetter
+from .compat import freethreading as freethreading
+from .compat import get_annotations as get_annotations
 from .compat import has_refcount_gc as has_refcount_gc
 from .compat import inspect_getfullargspec as inspect_getfullargspec
 from .compat import is64bit as is64bit
 from .compat import local_dataclass_fields as local_dataclass_fields
+from .compat import mini_gil as mini_gil
 from .compat import osx as osx
 from .compat import py310 as py310
 from .compat import py311 as py311
 from .compat import py312 as py312
 from .compat import py313 as py313
+from .compat import py314 as py314
 from .compat import py38 as py38
 from .compat import py39 as py39
 from .compat import pypy as pypy
@@ -107,7 +110,6 @@
 from .langhelpers import format_argspec_plus as format_argspec_plus
 from .langhelpers import generic_fn_descriptor as generic_fn_descriptor
 from .langhelpers import generic_repr as generic_repr
-from .langhelpers import get_annotations as get_annotations
 from .langhelpers import get_callable_argspec as get_callable_argspec
 from .langhelpers import get_cls_kwargs as get_cls_kwargs
 from .langhelpers import get_func_kwargs as get_func_kwargs
diff --git a/libs/sqlalchemy/util/_collections.py b/libs/sqlalchemy/util/_collections.py
index 12283eba94..f67fbf7c1e 100644
--- a/libs/sqlalchemy/util/_collections.py
+++ b/libs/sqlalchemy/util/_collections.py
@@ -1,5 +1,5 @@
 # util/_collections.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -313,12 +313,7 @@ def __iter__(self):
         )
 
     def __getitem__(self, index):
-        try:
-            obj = self._storage[index]
-        except KeyError:
-            raise IndexError("Index %s out of range" % index)
-        else:
-            return obj()
+        return self._storage[index]()
 
 
 class OrderedIdentitySet(IdentitySet):
@@ -454,7 +449,9 @@ def to_column_set(x: Any) -> Set[Any]:
         return x
 
 
-def update_copy(d, _new=None, **kw):
+def update_copy(
+    d: Dict[Any, Any], _new: Optional[Dict[Any, Any]] = None, **kw: Any
+) -> Dict[Any, Any]:
     """Copy the given dict and update with the given values."""
 
     d = d.copy()
diff --git a/libs/sqlalchemy/util/_concurrency_py3k.py b/libs/sqlalchemy/util/_concurrency_py3k.py
index 718c077c0d..79b9a49d13 100644
--- a/libs/sqlalchemy/util/_concurrency_py3k.py
+++ b/libs/sqlalchemy/util/_concurrency_py3k.py
@@ -1,5 +1,5 @@
 # util/_concurrency_py3k.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/_has_cy.py b/libs/sqlalchemy/util/_has_cy.py
index 21faed04e6..1c5a3ba76f 100644
--- a/libs/sqlalchemy/util/_has_cy.py
+++ b/libs/sqlalchemy/util/_has_cy.py
@@ -1,5 +1,5 @@
 # util/_has_cy.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/_py_collections.py b/libs/sqlalchemy/util/_py_collections.py
index f6aefcf67c..5c5d2b13fa 100644
--- a/libs/sqlalchemy/util/_py_collections.py
+++ b/libs/sqlalchemy/util/_py_collections.py
@@ -1,5 +1,5 @@
 # util/_py_collections.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -104,7 +104,7 @@ def union(
 
         new = ImmutableDictBase.__new__(self.__class__)
         dict.__init__(new, self)
-        dict.update(new, __d)  # type: ignore
+        dict.update(new, __d)
         return new
 
     def _union_w_kw(
@@ -117,8 +117,8 @@ def _union_w_kw(
         new = ImmutableDictBase.__new__(self.__class__)
         dict.__init__(new, self)
         if __d:
-            dict.update(new, __d)  # type: ignore
-        dict.update(new, kw)  # type: ignore
+            dict.update(new, __d)
+        dict.update(new, kw)
         return new
 
     def merge_with(
@@ -130,7 +130,7 @@ def merge_with(
                 if new is None:
                     new = ImmutableDictBase.__new__(self.__class__)
                     dict.__init__(new, self)
-                dict.update(new, d)  # type: ignore
+                dict.update(new, d)
         if new is None:
             return self
 
diff --git a/libs/sqlalchemy/util/compat.py b/libs/sqlalchemy/util/compat.py
index c8b5e7a220..9476242251 100644
--- a/libs/sqlalchemy/util/compat.py
+++ b/libs/sqlalchemy/util/compat.py
@@ -1,5 +1,5 @@
 # util/compat.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -17,9 +17,11 @@
 import operator
 import platform
 import sys
+import sysconfig
 import typing
 from typing import Any
 from typing import Callable
+from typing import cast
 from typing import Dict
 from typing import Iterable
 from typing import List
@@ -32,6 +34,8 @@
 from typing import TypeVar
 
 
+py314b1 = sys.version_info >= (3, 14, 0, "beta", 1)
+py314 = sys.version_info >= (3, 14)
 py313 = sys.version_info >= (3, 13)
 py312 = sys.version_info >= (3, 12)
 py311 = sys.version_info >= (3, 11)
@@ -40,6 +44,7 @@
 py38 = sys.version_info >= (3, 8)
 pypy = platform.python_implementation() == "PyPy"
 cpython = platform.python_implementation() == "CPython"
+freethreading = bool(sysconfig.get_config_var("Py_GIL_DISABLED"))
 
 win32 = sys.platform.startswith("win")
 osx = sys.platform.startswith("darwin")
@@ -53,6 +58,110 @@
 _T_co = TypeVar("_T_co", covariant=True)
 
 
+if py314:
+    # vendor a minimal form of get_annotations per
+    # https://github.com/python/cpython/issues/133684#issuecomment-2863841891
+
+    from annotationlib import call_annotate_function  # type: ignore[import-not-found,unused-ignore]  # noqa: E501
+    from annotationlib import Format
+
+    def _get_and_call_annotate(obj, format):  # noqa: A002
+        annotate = getattr(obj, "__annotate__", None)
+        if annotate is not None:
+            ann = call_annotate_function(annotate, format, owner=obj)
+            if not isinstance(ann, dict):
+                raise ValueError(f"{obj!r}.__annotate__ returned a non-dict")
+            return ann
+        return None
+
+    # this is ported from py3.13.0a7
+    _BASE_GET_ANNOTATIONS = type.__dict__["__annotations__"].__get__
+
+    def _get_dunder_annotations(obj):
+        if isinstance(obj, type):
+            try:
+                ann = _BASE_GET_ANNOTATIONS(obj)
+            except AttributeError:
+                # For static types, the descriptor raises AttributeError.
+                return {}
+        else:
+            ann = getattr(obj, "__annotations__", None)
+            if ann is None:
+                return {}
+
+        if not isinstance(ann, dict):
+            raise ValueError(
+                f"{obj!r}.__annotations__ is neither a dict nor None"
+            )
+        return dict(ann)
+
+    def _vendored_get_annotations(
+        obj: Any, *, format: Format  # noqa: A002
+    ) -> Mapping[str, Any]:
+        """A sparse implementation of annotationlib.get_annotations()"""
+
+        try:
+            ann = _get_dunder_annotations(obj)
+        except Exception:
+            pass
+        else:
+            if ann is not None:
+                return dict(ann)
+
+        # But if __annotations__ threw a NameError, we try calling __annotate__
+        ann = _get_and_call_annotate(obj, format)
+        if ann is None:
+            # If that didn't work either, we have a very weird object:
+            # evaluating
+            # __annotations__ threw NameError and there is no __annotate__.
+            # In that case,
+            # we fall back to trying __annotations__ again.
+            ann = _get_dunder_annotations(obj)
+
+        if ann is None:
+            if isinstance(obj, type) or callable(obj):
+                return {}
+            raise TypeError(f"{obj!r} does not have annotations")
+
+        if not ann:
+            return {}
+
+        return dict(ann)
+
+    def get_annotations(obj: Any) -> Mapping[str, Any]:
+        # FORWARDREF has the effect of giving us ForwardRefs and not
+        # actually trying to evaluate the annotations.  We need this so
+        # that the annotations act as much like
+        # "from __future__ import annotations" as possible, which is going
+        # away in future python as a separate mode
+        return _vendored_get_annotations(obj, format=Format.FORWARDREF)
+
+elif py310:
+
+    def get_annotations(obj: Any) -> Mapping[str, Any]:
+        return inspect.get_annotations(obj)
+
+else:
+
+    def get_annotations(obj: Any) -> Mapping[str, Any]:
+        # it's been observed that cls.__annotations__ can be non present.
+        # it's not clear what causes this, running under tox py37/38 it
+        # happens, running straight pytest it doesnt
+
+        # https://docs.python.org/3/howto/annotations.html#annotations-howto
+        if isinstance(obj, type):
+            ann = obj.__dict__.get("__annotations__", None)
+        else:
+            ann = getattr(obj, "__annotations__", None)
+
+        from . import _collections
+
+        if ann is None:
+            return _collections.EMPTY_DICT
+        else:
+            return cast("Mapping[str, Any]", ann)
+
+
 class FullArgSpec(typing.NamedTuple):
     args: List[str]
     varargs: Optional[str]
@@ -60,7 +169,7 @@ class FullArgSpec(typing.NamedTuple):
     defaults: Optional[Tuple[Any, ...]]
     kwonlyargs: List[str]
     kwonlydefaults: Optional[Dict[str, Any]]
-    annotations: Dict[str, Any]
+    annotations: Mapping[str, Any]
 
 
 def inspect_getfullargspec(func: Callable[..., Any]) -> FullArgSpec:
@@ -97,7 +206,7 @@ def inspect_getfullargspec(func: Callable[..., Any]) -> FullArgSpec:
         func.__defaults__,
         kwonlyargs,
         func.__kwdefaults__,
-        func.__annotations__,
+        get_annotations(func),
     )
 
 
@@ -299,3 +408,14 @@ def local_dataclass_fields(cls: Type[Any]) -> Iterable[dataclasses.Field[Any]]:
         return [f for f in dataclasses.fields(cls) if f not in super_fields]
     else:
         return []
+
+
+if freethreading:
+    import threading
+
+    mini_gil = threading.RLock()
+    """provide a threading.RLock() under python freethreading only"""
+else:
+    import contextlib
+
+    mini_gil = contextlib.nullcontext()  # type: ignore[assignment]
diff --git a/libs/sqlalchemy/util/concurrency.py b/libs/sqlalchemy/util/concurrency.py
index 006340f5bf..49924ad166 100644
--- a/libs/sqlalchemy/util/concurrency.py
+++ b/libs/sqlalchemy/util/concurrency.py
@@ -1,11 +1,13 @@
 # util/concurrency.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
 # the MIT License: https://www.opensource.org/licenses/mit-license.php
 # mypy: allow-untyped-defs, allow-untyped-calls
 
+"""asyncio-related concurrency functions."""
+
 from __future__ import annotations
 
 import asyncio  # noqa
diff --git a/libs/sqlalchemy/util/deprecations.py b/libs/sqlalchemy/util/deprecations.py
index 88b6872403..367140e11d 100644
--- a/libs/sqlalchemy/util/deprecations.py
+++ b/libs/sqlalchemy/util/deprecations.py
@@ -1,5 +1,5 @@
 # util/deprecations.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/langhelpers.py b/libs/sqlalchemy/util/langhelpers.py
index b4086f1d57..cb72771e37 100644
--- a/libs/sqlalchemy/util/langhelpers.py
+++ b/libs/sqlalchemy/util/langhelpers.py
@@ -1,5 +1,5 @@
 # util/langhelpers.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -32,7 +32,6 @@
 from typing import Generic
 from typing import Iterator
 from typing import List
-from typing import Mapping
 from typing import NoReturn
 from typing import Optional
 from typing import overload
@@ -60,30 +59,6 @@
 _HM = TypeVar("_HM", bound="hybridmethod[Any]")
 
 
-if compat.py310:
-
-    def get_annotations(obj: Any) -> Mapping[str, Any]:
-        return inspect.get_annotations(obj)
-
-else:
-
-    def get_annotations(obj: Any) -> Mapping[str, Any]:
-        # it's been observed that cls.__annotations__ can be non present.
-        # it's not clear what causes this, running under tox py37/38 it
-        # happens, running straight pytest it doesnt
-
-        # https://docs.python.org/3/howto/annotations.html#annotations-howto
-        if isinstance(obj, type):
-            ann = obj.__dict__.get("__annotations__", None)
-        else:
-            ann = getattr(obj, "__annotations__", None)
-
-        if ann is None:
-            return _collections.EMPTY_DICT
-        else:
-            return cast("Mapping[str, Any]", ann)
-
-
 def md5_hex(x: Any) -> str:
     x = x.encode("utf-8")
     m = compat.md5_not_for_security()
@@ -250,10 +225,30 @@ def decorate(fn: _Fn) -> _Fn:
         if not inspect.isfunction(fn) and not inspect.ismethod(fn):
             raise Exception("not a decoratable function")
 
-        spec = compat.inspect_getfullargspec(fn)
-        env: Dict[str, Any] = {}
+        # Python 3.14 defer creating __annotations__ until its used.
+        # We do not want to create __annotations__ now.
+        annofunc = getattr(fn, "__annotate__", None)
+        if annofunc is not None:
+            fn.__annotate__ = None  # type: ignore[union-attr]
+            try:
+                spec = compat.inspect_getfullargspec(fn)
+            finally:
+                fn.__annotate__ = annofunc  # type: ignore[union-attr]
+        else:
+            spec = compat.inspect_getfullargspec(fn)
 
-        spec = _update_argspec_defaults_into_env(spec, env)
+        # Do not generate code for annotations.
+        # update_wrapper() copies the annotation from fn to decorated.
+        # We use dummy defaults for code generation to avoid having
+        # copy of large globals for compiling.
+        # We copy __defaults__ and __kwdefaults__ from fn to decorated.
+        empty_defaults = (None,) * len(spec.defaults or ())
+        empty_kwdefaults = dict.fromkeys(spec.kwonlydefaults or ())
+        spec = spec._replace(
+            annotations={},
+            defaults=empty_defaults,
+            kwonlydefaults=empty_kwdefaults,
+        )
 
         names = (
             tuple(cast("Tuple[str, ...]", spec[0]))
@@ -298,43 +293,23 @@ def decorate(fn: _Fn) -> _Fn:
                 % metadata
             )
 
-        mod = sys.modules[fn.__module__]
-        env.update(vars(mod))
-        env.update({targ_name: target, fn_name: fn, "__name__": fn.__module__})
+        env: Dict[str, Any] = {
+            targ_name: target,
+            fn_name: fn,
+            "__name__": fn.__module__,
+        }
 
         decorated = cast(
             types.FunctionType,
             _exec_code_in_env(code, env, fn.__name__),
         )
-        decorated.__defaults__ = getattr(fn, "__func__", fn).__defaults__
-
-        decorated.__wrapped__ = fn  # type: ignore[attr-defined]
+        decorated.__defaults__ = fn.__defaults__
+        decorated.__kwdefaults__ = fn.__kwdefaults__  # type: ignore
         return update_wrapper(decorated, fn)  # type: ignore[return-value]
 
     return update_wrapper(decorate, target)  # type: ignore[return-value]
 
 
-def _update_argspec_defaults_into_env(spec, env):
-    """given a FullArgSpec, convert defaults to be symbol names in an env."""
-
-    if spec.defaults:
-        new_defaults = []
-        i = 0
-        for arg in spec.defaults:
-            if type(arg).__module__ not in ("builtins", "__builtin__"):
-                name = "x%d" % i
-                env[name] = arg
-                new_defaults.append(name)
-                i += 1
-            else:
-                new_defaults.append(arg)
-        elem = list(spec)
-        elem[3] = tuple(new_defaults)
-        return compat.FullArgSpec(*elem)
-    else:
-        return spec
-
-
 def _exec_code_in_env(
     code: Union[str, types.CodeType], env: Dict[str, Any], fn_name: str
 ) -> Callable[..., Any]:
@@ -385,6 +360,9 @@ def load():
 
         self.impls[name] = load
 
+    def deregister(self, name: str) -> None:
+        del self.impls[name]
+
 
 def _inspect_func_args(fn):
     try:
@@ -1293,6 +1271,9 @@ class MemoizedSlots:
     This allows the functionality of memoized_property and
     memoized_instancemethod to be available to a class using __slots__.
 
+    The memoized get is not threadsafe under freethreading and the
+    creator method may in extremely rare cases be called more than once.
+
     """
 
     __slots__ = ()
@@ -1313,20 +1294,20 @@ def __getattr__(self, key: str) -> Any:
             setattr(self, key, value)
             return value
         elif hasattr(self.__class__, f"_memoized_method_{key}"):
-            fn = getattr(self, f"_memoized_method_{key}")
+            meth = getattr(self, f"_memoized_method_{key}")
 
             def oneshot(*args, **kw):
-                result = fn(*args, **kw)
+                result = meth(*args, **kw)
 
                 def memo(*a, **kw):
                     return result
 
-                memo.__name__ = fn.__name__
-                memo.__doc__ = fn.__doc__
+                memo.__name__ = meth.__name__
+                memo.__doc__ = meth.__doc__
                 setattr(self, key, memo)
                 return result
 
-            oneshot.__doc__ = fn.__doc__
+            oneshot.__doc__ = meth.__doc__
             return oneshot
         else:
             return self._fallback_getattr(key)
diff --git a/libs/sqlalchemy/util/preloaded.py b/libs/sqlalchemy/util/preloaded.py
index 4ea9aa90f3..b57abdc4d5 100644
--- a/libs/sqlalchemy/util/preloaded.py
+++ b/libs/sqlalchemy/util/preloaded.py
@@ -1,5 +1,5 @@
 # util/preloaded.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/queue.py b/libs/sqlalchemy/util/queue.py
index 3fb01a9a9f..c89f9d23c6 100644
--- a/libs/sqlalchemy/util/queue.py
+++ b/libs/sqlalchemy/util/queue.py
@@ -1,5 +1,5 @@
 # util/queue.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/tool_support.py b/libs/sqlalchemy/util/tool_support.py
index 407c2d4507..9e1246f8f0 100644
--- a/libs/sqlalchemy/util/tool_support.py
+++ b/libs/sqlalchemy/util/tool_support.py
@@ -1,5 +1,5 @@
 # util/tool_support.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
diff --git a/libs/sqlalchemy/util/topological.py b/libs/sqlalchemy/util/topological.py
index 393c855abc..e84db0e46b 100644
--- a/libs/sqlalchemy/util/topological.py
+++ b/libs/sqlalchemy/util/topological.py
@@ -1,5 +1,5 @@
 # util/topological.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -112,7 +112,7 @@ def find_cycles(
                     todo.remove(node)
                     break
             else:
-                node = stack.pop()
+                stack.pop()
     return output
 
 
diff --git a/libs/sqlalchemy/util/typing.py b/libs/sqlalchemy/util/typing.py
index 62fd47c6a3..361cfac14f 100644
--- a/libs/sqlalchemy/util/typing.py
+++ b/libs/sqlalchemy/util/typing.py
@@ -1,5 +1,5 @@
 # util/typing.py
-# Copyright (C) 2022-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2022-2026 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -16,7 +16,6 @@
 import typing
 from typing import Any
 from typing import Callable
-from typing import cast
 from typing import Dict
 from typing import ForwardRef
 from typing import Generic
@@ -33,6 +32,8 @@
 from typing import TypeVar
 from typing import Union
 
+import typing_extensions
+
 from . import compat
 
 if True:  # zimports removes the tailing comments
@@ -56,6 +57,7 @@
     from typing_extensions import Self as Self  # 3.11
     from typing_extensions import TypeAliasType as TypeAliasType  # 3.12
     from typing_extensions import Never as Never  # 3.11
+    from typing_extensions import LiteralString as LiteralString  # 3.11
 
 _T = TypeVar("_T", bound=Any)
 _KT = TypeVar("_KT")
@@ -64,14 +66,6 @@
 _VT = TypeVar("_VT")
 _VT_co = TypeVar("_VT_co", covariant=True)
 
-if compat.py38:
-    # typing_extensions.Literal is different from typing.Literal until
-    # Python 3.10.1
-    LITERAL_TYPES = frozenset([typing.Literal, Literal])
-else:
-    LITERAL_TYPES = frozenset([Literal])
-
-
 if compat.py310:
     # why they took until py310 to put this in stdlib is beyond me,
     # I've been wanting it since py27
@@ -79,7 +73,9 @@
 else:
     NoneType = type(None)  # type: ignore
 
-NoneFwd = ForwardRef("None")
+
+def is_fwd_none(typ: Any) -> bool:
+    return isinstance(typ, ForwardRef) and typ.__forward_arg__ == "None"
 
 
 _AnnotationScanType = Union[
@@ -330,7 +326,7 @@ def resolve_name_to_real_class_name(name: str, module_name: str) -> str:
 
 
 def is_pep593(type_: Optional[Any]) -> bool:
-    return type_ is not None and get_origin(type_) is Annotated
+    return type_ is not None and get_origin(type_) in _type_tuples.Annotated
 
 
 def is_non_string_iterable(obj: Any) -> TypeGuard[Iterable[Any]]:
@@ -340,7 +336,7 @@ def is_non_string_iterable(obj: Any) -> TypeGuard[Iterable[Any]]:
 
 
 def is_literal(type_: Any) -> bool:
-    return get_origin(type_) in LITERAL_TYPES
+    return get_origin(type_) in _type_tuples.Literal
 
 
 def is_newtype(type_: Optional[_AnnotationScanType]) -> TypeGuard[NewType]:
@@ -348,7 +344,7 @@ def is_newtype(type_: Optional[_AnnotationScanType]) -> TypeGuard[NewType]:
 
     # doesn't work in 3.8, 3.7 as it passes a closure, not an
     # object instance
-    # return isinstance(type_, NewType)
+    # isinstance(type, type_instances.NewType)
 
 
 def is_generic(type_: _AnnotationScanType) -> TypeGuard[GenericProtocol[Any]]:
@@ -356,7 +352,13 @@ def is_generic(type_: _AnnotationScanType) -> TypeGuard[GenericProtocol[Any]]:
 
 
 def is_pep695(type_: _AnnotationScanType) -> TypeGuard[TypeAliasType]:
-    return isinstance(type_, TypeAliasType)
+    # NOTE: a generic TAT does not instance check as TypeAliasType outside of
+    # python 3.10. For sqlalchemy use cases it's fine to consider it a TAT
+    # though.
+    # NOTE: things seems to work also without this additional check
+    if is_generic(type_):
+        return is_pep695(type_.__origin__)
+    return isinstance(type_, _type_instances.TypeAliasType)
 
 
 def flatten_newtype(type_: NewType) -> Type[Any]:
@@ -375,15 +377,15 @@ def pep695_values(type_: _AnnotationScanType) -> Set[Any]:
     """
     _seen = set()
 
-    def recursive_value(type_):
-        if type_ in _seen:
+    def recursive_value(inner_type):
+        if inner_type in _seen:
             # recursion are not supported (at least it's flagged as
             # an error by pyright). Just avoid infinite loop
-            return type_
-        _seen.add(type_)
-        if not is_pep695(type_):
-            return type_
-        value = type_.__value__
+            return inner_type
+        _seen.add(inner_type)
+        if not is_pep695(inner_type):
+            return inner_type
+        value = inner_type.__value__
         if not is_union(value):
             return value
         return [recursive_value(t) for t in value.__args__]
@@ -397,7 +399,7 @@ def recursive_value(type_):
             if isinstance(t, list):
                 stack.extend(t)
             else:
-                types.add(None if t in {NoneType, NoneFwd} else t)
+                types.add(None if t is NoneType or is_fwd_none(t) else t)
         return types
     else:
         return {res}
@@ -410,7 +412,7 @@ def is_fwd_ref(
 ) -> TypeGuard[ForwardRef]:
     if check_for_plain_string and isinstance(type_, str):
         return True
-    elif isinstance(type_, ForwardRef):
+    elif isinstance(type_, _type_instances.ForwardRef):
         return True
     elif check_generic and is_generic(type_):
         return any(
@@ -469,8 +471,7 @@ def de_optionalize_union_types(
 
             typ.discard(None)  # type: ignore
 
-        typ.discard(NoneType)
-        typ.discard(NoneFwd)
+        typ = {t for t in typ if t is not NoneType and not is_fwd_none(t)}
 
         return make_union_type(*typ)
 
@@ -546,7 +547,8 @@ def _de_optionalize_fwd_ref_union_types(
 
 def make_union_type(*types: _AnnotationScanType) -> Type[Any]:
     """Make a Union type."""
-    return Union.__getitem__(types)  # type: ignore
+
+    return Union[types]  # type: ignore
 
 
 def includes_none(type_: Any) -> bool:
@@ -571,7 +573,23 @@ def includes_none(type_: Any) -> bool:
         return any(includes_none(t) for t in pep695_values(type_))
     if is_newtype(type_):
         return includes_none(type_.__supertype__)
-    return type_ in (NoneFwd, NoneType, None)
+    try:
+        return type_ in (NoneType, None) or is_fwd_none(type_)
+    except TypeError:
+        # if type_ is Column, mapped_column(), etc. the use of "in"
+        # resolves to ``__eq__()`` which then gives us an expression object
+        # that can't resolve to boolean.  just catch it all via exception
+        return False
+
+
+def is_a_type(type_: Any) -> bool:
+    return (
+        isinstance(type_, type)
+        or get_origin(type_) is not None
+        or getattr(type_, "__module__", None)
+        in ("typing", "typing_extensions")
+        or type(type_).__mro__[0].__module__ in ("typing", "typing_extensions")
+    )
 
 
 def is_union(type_: Any) -> TypeGuard[ArgsTypeProtocol]:
@@ -687,3 +705,30 @@ def __get__(self, instance: object, owner: Any) -> _FN: ...
         def __set__(self, instance: Any, value: _FN) -> None: ...
 
         def __delete__(self, instance: Any) -> None: ...
+
+
+class _TypingInstances:
+    def __getattr__(self, key: str) -> tuple[type, ...]:
+        types = tuple(
+            {
+                t
+                for t in [
+                    getattr(typing, key, None),
+                    getattr(typing_extensions, key, None),
+                ]
+                if t is not None
+            }
+        )
+        if not types:
+            raise AttributeError(key)
+        self.__dict__[key] = types
+        return types
+
+
+_type_tuples = _TypingInstances()
+if TYPE_CHECKING:
+    _type_instances = typing_extensions
+else:
+    _type_instances = _type_tuples
+
+LITERAL_TYPES = _type_tuples.Literal
diff --git a/libs/srt-3.5.3.dist-info/METADATA b/libs/srt-3.5.3.dist-info/METADATA
index 48dc42ee2e..76d7484d1d 100644
--- a/libs/srt-3.5.3.dist-info/METADATA
+++ b/libs/srt-3.5.3.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: srt
 Version: 3.5.3
 Summary: A tiny library for parsing, modifying, and composing SRT files.
@@ -26,6 +26,16 @@ Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Text Processing
 Requires-Python: >=2.7
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 |ghactions| |coveralls|
 
diff --git a/libs/srt-3.5.3.dist-info/RECORD b/libs/srt-3.5.3.dist-info/RECORD
index cbe1e432e7..abc7858662 100644
--- a/libs/srt-3.5.3.dist-info/RECORD
+++ b/libs/srt-3.5.3.dist-info/RECORD
@@ -1,18 +1,18 @@
-../../bin/srt,sha256=A0x0yYL8GU8E03Ducp8DgPmS7kd56TPnkQNxELJz4HA,1345
-../../bin/srt-deduplicate,sha256=vCO6M5881fKUcvB0Hcizc9kDYk3id4RxVPQDzMxfyYw,2954
-../../bin/srt-fixed-timeshift,sha256=8pQYvdlqvXI1ybhXEV2SH9yTUVFGngOyHKesTOfKRQc,1374
-../../bin/srt-linear-timeshift,sha256=RUh2Clz2vJS9uLNKv0w8G8la93jSns7OjhirdWn29KU,3226
-../../bin/srt-lines-matching,sha256=SYd3XuFg29PD7M-HMyOkac9LCdLryvsZnJlWMGwIPyQ,2470
-../../bin/srt-mux,sha256=GtsKL0LJpivQlVEzuksjYS2XfJ3sYC2vWULav3kVKVM,3536
-../../bin/srt-normalise,sha256=eKE0ubZpFDh5eDQcrY2MMttO9hapofBtxjrI9szGt3Q,810
-../../bin/srt-play,sha256=bYHtTlR7bEWqwE0jO7W216IJ93Mk2PWry_cGGlo3Ki8,1563
-../../bin/srt-process,sha256=rdgmeLqttf18QjEje35VYhCyT0tI0UtzUeeuy2UMngk,1648
+../../bin/srt,sha256=MbQv69iGOTQZAbZVNuZWSzFxPD7IeSdb-KJyPSF_SRY,1350
+../../bin/srt-deduplicate,sha256=X8aucVX6bFecc0750mvGj_q28x2Ds-vdxW-pfPkEWB4,2959
+../../bin/srt-fixed-timeshift,sha256=baFCN0ZWRLmwmGWTIbcpeR8be8vdMawFyibMUEFv5H4,1379
+../../bin/srt-linear-timeshift,sha256=OlvfvPE8okMHpgLav7rSblVSdS0_2pC6Zpd3RIV2taI,3231
+../../bin/srt-lines-matching,sha256=emyatAPBeTyBV3mNDCvyKJ3vnCKhQHKbmx0AWNyE_XI,2475
+../../bin/srt-mux,sha256=a5Bx2T3tm3_NCpBeKYDjiihJhfwSvuJhjzNKTX5-UXI,3541
+../../bin/srt-normalise,sha256=1SbdYOTS9n_KGOiSCrxJplatllLea0XQ0mEos7eMeWo,815
+../../bin/srt-play,sha256=kPzOVU1W4xkskHvBtgr0KOI8L4TXXtJtS_OzwMQOipI,1568
+../../bin/srt-process,sha256=XaQKdMiOGnLrccYp-udNviXIXz08SMeZQyamK6Hri5g,1653
 srt-3.5.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-srt-3.5.3.dist-info/LICENSE,sha256=I_wv7Am2IaImmaH6hoW1shxk_ef5OFym5fLynQpLx3Y,1085
-srt-3.5.3.dist-info/METADATA,sha256=VuHHrJOJAw_PBya5Gve9f3S-Rukx0aRgpCauc2Xx6JI,7082
+srt-3.5.3.dist-info/METADATA,sha256=iRaiw6T56RCtGs27DH-TVXoQeqUk3j9Hpo6eLdmslSU,7279
 srt-3.5.3.dist-info/RECORD,,
 srt-3.5.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-srt-3.5.3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
+srt-3.5.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+srt-3.5.3.dist-info/licenses/LICENSE,sha256=I_wv7Am2IaImmaH6hoW1shxk_ef5OFym5fLynQpLx3Y,1085
 srt-3.5.3.dist-info/top_level.txt,sha256=BBw7XR-ZRhT_Kc3m6j9EiCUNXHr_-VjfWXwwviNx6yo,14
 srt.py,sha256=JsMMkvO2Yk1vE1os7w8wZalppszW60mz_0LyDRMZ3Tw,18592
 srt_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
diff --git a/libs/srt-3.5.3.dist-info/WHEEL b/libs/srt-3.5.3.dist-info/WHEEL
index ba48cbcf92..0885d05555 100644
--- a/libs/srt-3.5.3.dist-info/WHEEL
+++ b/libs/srt-3.5.3.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/srt-3.5.3.dist-info/LICENSE b/libs/srt-3.5.3.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/srt-3.5.3.dist-info/LICENSE
rename to libs/srt-3.5.3.dist-info/licenses/LICENSE
diff --git a/libs/stevedore-5.3.0.dist-info/METADATA b/libs/stevedore-5.3.0.dist-info/METADATA
deleted file mode 100644
index 01c4528491..0000000000
--- a/libs/stevedore-5.3.0.dist-info/METADATA
+++ /dev/null
@@ -1,52 +0,0 @@
-Metadata-Version: 2.1
-Name: stevedore
-Version: 5.3.0
-Summary: Manage dynamic plugins for Python applications
-Home-page: https://docs.openstack.org/stevedore/latest/
-Author: OpenStack
-Author-email: openstack-discuss@lists.openstack.org
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Intended Audience :: Developers
-Classifier: Environment :: Console
-Requires-Python: >=3.8
-License-File: LICENSE
-License-File: AUTHORS
-Requires-Dist: pbr >=2.0.0
-
-===========================================================
-stevedore -- Manage dynamic plugins for Python applications
-===========================================================
-
-.. image:: https://img.shields.io/pypi/v/stevedore.svg
-    :target: https://pypi.org/project/stevedore/
-    :alt: Latest Version
-
-.. image:: https://governance.openstack.org/tc/badges/stevedore.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
-
-Python makes loading code dynamically easy, allowing you to configure
-and extend your application by discovering and loading extensions
-("*plugins*") at runtime. Many applications implement their own
-library for doing this, using ``__import__`` or ``importlib``.
-stevedore avoids creating yet another extension
-mechanism by building on top of `setuptools entry points`_. The code
-for managing entry points tends to be repetitive, though, so stevedore
-provides manager classes for implementing common patterns for using
-dynamically loaded extensions.
-
-.. _setuptools entry points: http://setuptools.readthedocs.io/en/latest/pkg_resources.html?#entry-points
-
-* Free software: Apache license
-* Documentation: https://docs.openstack.org/stevedore/latest
-* Source: https://opendev.org/openstack/stevedore
-* Bugs: https://bugs.launchpad.net/python-stevedore
-
diff --git a/libs/stevedore-5.3.0.dist-info/RECORD b/libs/stevedore-5.3.0.dist-info/RECORD
deleted file mode 100644
index 84b5f6da68..0000000000
--- a/libs/stevedore-5.3.0.dist-info/RECORD
+++ /dev/null
@@ -1,45 +0,0 @@
-stevedore-5.3.0.dist-info/AUTHORS,sha256=QQb_ThCRK-AvzWkx5sPEG9axRZOOE1nCuBRK0l0VzUg,2815
-stevedore-5.3.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-stevedore-5.3.0.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-stevedore-5.3.0.dist-info/METADATA,sha256=u_CTdbYWvjVzjrBeJnnMJwpdQwPjlCZDYwPZ_GkmzIQ,2257
-stevedore-5.3.0.dist-info/RECORD,,
-stevedore-5.3.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stevedore-5.3.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-stevedore-5.3.0.dist-info/entry_points.txt,sha256=pESxBgqYcVV5wevQpKBLQoutvWWhIyRZbEzhsD9z_LY,387
-stevedore-5.3.0.dist-info/pbr.json,sha256=UJUmQUdxFqM3X_Kq1rHgsD5Mx1hthZuzZmV8-__HYYg,46
-stevedore-5.3.0.dist-info/top_level.txt,sha256=rtOULIhauZOXFiAgHRCDBdnqb0wKxA-NqLlvo_b_SOM,10
-stevedore/__init__.py,sha256=lwsEP3iDFwk2lPJjgW3IbeQkhN6TeLM76tCl9V5BWYM,544
-stevedore/_cache.py,sha256=zRIQCUAXx-XgPEvIxN61lhXubES04ZjJrSjn-Y3wPuA,6672
-stevedore/dispatch.py,sha256=1elzSbz_JS_ITTAypnVtCG_Q0_ZpLtVgmouk67wEAl0,9561
-stevedore/driver.py,sha256=SQHqeir9VIyN7ufBfGd_hqj9D2W6aH7DZNOA928UMRE,6225
-stevedore/enabled.py,sha256=YhysNC-wReBQme0lgoJkFCKm3a6Hv6DkCO0XvCzjnJM,3570
-stevedore/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stevedore/example/base.py,sha256=TECZL94BwRN18AtutnqkQVw-1LGVB9BwtYl62hUpH6I,1111
-stevedore/example/load_as_driver.py,sha256=5yoxxK2Jga9iNmb-9yiDMm7qNhvRxm4L4z9jbNl1ibM,1345
-stevedore/example/load_as_extension.py,sha256=E1TICmiDD98iX6hScuiYRjjMTpC347m_fdd55FbLU20,1404
-stevedore/example/setup.py,sha256=Dw0SmfWHBv5useLFzR2UYb83zw9AekE2TR63nPbyTm0,1772
-stevedore/example/simple.py,sha256=sNmS_9z9vuhwmf4N-yWhRQ9jfUmSSsipwZh-xUoc1e4,1112
-stevedore/example2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stevedore/example2/fields.py,sha256=fhtOT5dzJDSMqEUAKilCOM9bEz1bd-BfwfBOWyRUnbU,1545
-stevedore/example2/setup.py,sha256=kPV_PKJoSGKmvM9f_IFclkmrA1gNEiIivCDNJZ4qNeY,1722
-stevedore/exception.py,sha256=D0oRCv7A_tLG3AKIOGGoKuj1dAqEkCwNa99qLcCxzBs,864
-stevedore/extension.py,sha256=wzIt8mtYdf0pWKhsVao5OT9f06yENCqbiIsaTuCeO14,13592
-stevedore/hook.py,sha256=lLz_D2SI0FVvEvfmiP9iQULYqinubErd7z-N-TAwXt4,3973
-stevedore/named.py,sha256=ZL3-xcWiBz1NaQbhJtR0mYU0PGlRArFo7q71pwviK5A,7234
-stevedore/sphinxext.py,sha256=VG1fP7fyGFBCtf7YwzOLniRf4Uasd10Q-bCvBGap6h0,3808
-stevedore/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stevedore/tests/extension_unimportable.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-stevedore/tests/manager.py,sha256=sTcvrhZrhOKfOxmj7TEOX9jwl_ME_lG4F2GCdL8TPn4,2538
-stevedore/tests/test_cache.py,sha256=dgyX8Dvpf89kcCLxBxOWIV94BGKB2kUu4_vl28WhMPU,2363
-stevedore/tests/test_callback.py,sha256=IX7rKVXev83v72XG6ys78UjHv5EKiHfY3BkecJnsvxw,2152
-stevedore/tests/test_dispatch.py,sha256=pBEkm5ePsiDpMC2eVbMg8zaki0A37bGWwHfFKRfpaGg,4145
-stevedore/tests/test_driver.py,sha256=lMGeKyUbOnc4GP4h0AiY4vcFBOF43pSo5XybEkLGLhQ,3325
-stevedore/tests/test_enabled.py,sha256=2IAeQ_uI9d7TRs8q6V7OaZvk3cl7DlNXQUNFA4lCWRc,1504
-stevedore/tests/test_example_fields.py,sha256=-GSF2-mANuKcQDhuyDOUJYrTcWJkzCeY-tJ1KPULPfQ,1351
-stevedore/tests/test_example_simple.py,sha256=NDZA75boEd8jlzRQUgOb6x-ZkvjMrLy2uDrjBt0F0YM,972
-stevedore/tests/test_extension.py,sha256=DtelQSqC34s80H88Xt8noZfrizLyZqTmIG9tzeha1Xs,10327
-stevedore/tests/test_hook.py,sha256=4CMD7Bq_TCWEnTBFCwC6k2VV_5r34juh5epWpnkkoz4,1713
-stevedore/tests/test_named.py,sha256=GE3s0nx3hxMzGSkEWai1k9u4lfRJAENJoqLJxYZi9WE,3356
-stevedore/tests/test_sphinxext.py,sha256=m7Psy4bxwK8wERJj2wPJ6czmc9S4PYiF3tfBKqm_QYk,3994
-stevedore/tests/test_test_manager.py,sha256=eGs-_Inlv0iDiRdg4S1OWcao2ZYghle76w8iUmlDVNI,9562
-stevedore/tests/utils.py,sha256=ClMCj0b9u1ZYVf2cc6Y4Gq_Sm0m7PRU0ynjZ4EAYifs,617
diff --git a/libs/stevedore-5.3.0.dist-info/WHEEL b/libs/stevedore-5.3.0.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/stevedore-5.3.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/stevedore-5.3.0.dist-info/pbr.json b/libs/stevedore-5.3.0.dist-info/pbr.json
deleted file mode 100644
index b1b1a2071f..0000000000
--- a/libs/stevedore-5.3.0.dist-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"git_version": "51134a4", "is_release": true}
\ No newline at end of file
diff --git a/libs/semver-3.0.3.dist-info/INSTALLER b/libs/stevedore-5.7.0.dist-info/INSTALLER
similarity index 100%
rename from libs/semver-3.0.3.dist-info/INSTALLER
rename to libs/stevedore-5.7.0.dist-info/INSTALLER
diff --git a/libs/stevedore-5.7.0.dist-info/METADATA b/libs/stevedore-5.7.0.dist-info/METADATA
new file mode 100644
index 0000000000..63205df7d1
--- /dev/null
+++ b/libs/stevedore-5.7.0.dist-info/METADATA
@@ -0,0 +1,57 @@
+Metadata-Version: 2.4
+Name: stevedore
+Version: 5.7.0
+Summary: Manage dynamic plugins for Python applications
+Author-email: OpenStack <openstack-discuss@lists.openstack.org>
+License: Apache-2.0
+Project-URL: Homepage, https://docs.openstack.org/stevedore
+Project-URL: Repository, https://opendev.org/openstack/stevedore
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Typing :: Typed
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+License-File: AUTHORS
+Dynamic: license-file
+
+===========================================================
+stevedore -- Manage dynamic plugins for Python applications
+===========================================================
+
+.. image:: https://governance.openstack.org/tc/badges/stevedore.svg
+
+.. image:: https://img.shields.io/pypi/v/stevedore.svg
+    :target: https://pypi.org/project/stevedore/
+    :alt: Latest Version
+
+.. image:: https://img.shields.io/pypi/dm/stevedore.svg
+    :target: https://pypi.org/project/stevedore/
+    :alt: Downloads
+
+Python makes loading code dynamically easy, allowing you to configure
+and extend your application by discovering and loading extensions
+("*plugins*") at runtime. Many applications implement their own
+library for doing this, using ``__import__`` or ``importlib``.
+stevedore avoids creating yet another extension
+mechanism by building on top of `setuptools entry points`_. The code
+for managing entry points tends to be repetitive, though, so stevedore
+provides manager classes for implementing common patterns for using
+dynamically loaded extensions.
+
+.. _setuptools entry points: http://setuptools.readthedocs.io/en/latest/pkg_resources.html?#entry-points
+
+* Free software: Apache license
+* Documentation: https://docs.openstack.org/stevedore/latest
+* Source: https://opendev.org/openstack/stevedore
+* Bugs: https://bugs.launchpad.net/python-stevedore
+
diff --git a/libs/stevedore-5.7.0.dist-info/RECORD b/libs/stevedore-5.7.0.dist-info/RECORD
new file mode 100644
index 0000000000..149724963d
--- /dev/null
+++ b/libs/stevedore-5.7.0.dist-info/RECORD
@@ -0,0 +1,47 @@
+stevedore-5.7.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+stevedore-5.7.0.dist-info/METADATA,sha256=wkFPopEj82Sf2g5VPVsPkMsjyMi3P5-M2D5rzrgGPDQ,2373
+stevedore-5.7.0.dist-info/RECORD,,
+stevedore-5.7.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stevedore-5.7.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+stevedore-5.7.0.dist-info/entry_points.txt,sha256=pESxBgqYcVV5wevQpKBLQoutvWWhIyRZbEzhsD9z_LY,387
+stevedore-5.7.0.dist-info/licenses/AUTHORS,sha256=QQb_ThCRK-AvzWkx5sPEG9axRZOOE1nCuBRK0l0VzUg,2815
+stevedore-5.7.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+stevedore-5.7.0.dist-info/top_level.txt,sha256=rtOULIhauZOXFiAgHRCDBdnqb0wKxA-NqLlvo_b_SOM,10
+stevedore/__init__.py,sha256=lwsEP3iDFwk2lPJjgW3IbeQkhN6TeLM76tCl9V5BWYM,544
+stevedore/_cache.py,sha256=BiEGT6KtQuJTCMGu9ymvfQzJot-fTtudcnhQy5MP9y4,7065
+stevedore/dispatch.py,sha256=VYu5VBzdu4ekPsPMowrnkl3XJ8_rJbsRxxRRjfLOLOY,10409
+stevedore/driver.py,sha256=wD6IHAQMLj2zz5z0o2aKx8CjowrIt_FuEVy6RONZkn4,8334
+stevedore/enabled.py,sha256=iUzUgzre_GxnrljWW6JTNH-doBRtU0484RqX1NxGHkw,4173
+stevedore/example/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stevedore/example/base.py,sha256=Jq2a3wr5pabSGRYyQV3qOEZTs5kwxkH2LNzOjJvn19g,1138
+stevedore/example/load_as_driver.py,sha256=EjlQZE8MouIATkKgMpwl1GVuLRInvmL5rzlYSDys_I4,1426
+stevedore/example/load_as_extension.py,sha256=s3B4UmR429oQLeNxzihX_jNLosm484tm9LOhNxvfRM4,1617
+stevedore/example/pyproject.toml,sha256=ia4JtkfqS1eXigEKZZ5RIgJDFD7Q0FRHrLmWwzs26Mw,1192
+stevedore/example/setup.py,sha256=B6iVsuHfOHmOjXNqze01phgW8OXn9fyCcyn2P1yYlLw,621
+stevedore/example/simple.py,sha256=sWPF0RvtPDwR_NfXHQjDCBuUZg8lX0MqlhoGtOwivoE,1134
+stevedore/example2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stevedore/example2/fields.py,sha256=kFTnV0Vwc5QSb2pNpCEtYXxWX7BekzQ04RKz-n6KYwI,1542
+stevedore/example2/pyproject.toml,sha256=dkS5rdwOYzRqvGB4COK3anlzlnym8jMRxWRx8gQcQmg,1155
+stevedore/example2/setup.py,sha256=B6iVsuHfOHmOjXNqze01phgW8OXn9fyCcyn2P1yYlLw,621
+stevedore/exception.py,sha256=D0oRCv7A_tLG3AKIOGGoKuj1dAqEkCwNa99qLcCxzBs,864
+stevedore/extension.py,sha256=wbRPqN8Tivg2GA1LUmSfPFnEhF7jWqfAm-QT8iQ13nY,17101
+stevedore/hook.py,sha256=pemEFoJ23bQt3RHcr6okieB316kpvBDs_HBVTfEwMXk,4580
+stevedore/named.py,sha256=HkYVg_1h34OmqV88IPR8NCkunjLAbQvdX6_wMNSj3hY,8953
+stevedore/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stevedore/sphinxext.py,sha256=gLj7b5Bx4WMKwCD53r46OoCBm_lsGYDDcGnvfe3QK8M,4430
+stevedore/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stevedore/tests/extension_unimportable.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+stevedore/tests/manager.py,sha256=9Dwtw-GR1klonFaB3g4JA8lSKvX0_SypA1yTYVMvp8g,2152
+stevedore/tests/test_cache.py,sha256=RlnbgbxToTlaHEzFzQZZm1zS6UhKTaGWt-bMIVaAPTc,2363
+stevedore/tests/test_callback.py,sha256=kNoZU8zQQHd9R0RdCqvrMTKMhRrjUCFnrje1nkKWVIM,1990
+stevedore/tests/test_dispatch.py,sha256=MPrpPAPIkhBm8ATbGQOB8pVkLuSsV9V35KlVAhIZcUs,3726
+stevedore/tests/test_driver.py,sha256=AYFLUF7Sl4KfZ0sIJgLYxhylnAtVHHF8mtv4klANzzo,3529
+stevedore/tests/test_enabled.py,sha256=TaRcjqUOiFdf8FeZiCejoRYZsU_LQRVZlX1Ilpg3-sI,1506
+stevedore/tests/test_example_fields.py,sha256=53SaSGtfMOIGrwC1ZmoerYVtvfDS0qgkIkzcN8l6lLk,1344
+stevedore/tests/test_example_simple.py,sha256=ceGeqtC2qD9CU0ZXnQk6H6vEKvr4_65eaG6z5K3QDqA,924
+stevedore/tests/test_extension.py,sha256=zCxVtdxUlmeeuf3JbQqDBV757wu6x99J7yw43B5eG5I,12893
+stevedore/tests/test_hook.py,sha256=aZ5PgCTbICWj3cs49CujjLH5qlvjmgHF4VAc0nTxclA,1839
+stevedore/tests/test_named.py,sha256=8si_q_uc1Yw-k0A3H95gorWxD3FsWQ_M0gLTIQVK--U,3511
+stevedore/tests/test_sphinxext.py,sha256=RfiUXUx3pVj1pu8-Y9SmE0w6kO_dUwyzqjn919IQoMw,3956
+stevedore/tests/test_test_manager.py,sha256=TunCGdckQ_aZ0dD1d33E8YYUSFszCP21Oa7atkWFTCM,10104
+stevedore/tests/utils.py,sha256=ClMCj0b9u1ZYVf2cc6Y4Gq_Sm0m7PRU0ynjZ4EAYifs,617
diff --git a/libs/trakit-0.2.2.dist-info/REQUESTED b/libs/stevedore-5.7.0.dist-info/REQUESTED
similarity index 100%
rename from libs/trakit-0.2.2.dist-info/REQUESTED
rename to libs/stevedore-5.7.0.dist-info/REQUESTED
diff --git a/libs/stevedore-5.7.0.dist-info/WHEEL b/libs/stevedore-5.7.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/stevedore-5.7.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/stevedore-5.3.0.dist-info/entry_points.txt b/libs/stevedore-5.7.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/stevedore-5.3.0.dist-info/entry_points.txt
rename to libs/stevedore-5.7.0.dist-info/entry_points.txt
diff --git a/libs/stevedore-5.3.0.dist-info/AUTHORS b/libs/stevedore-5.7.0.dist-info/licenses/AUTHORS
similarity index 100%
rename from libs/stevedore-5.3.0.dist-info/AUTHORS
rename to libs/stevedore-5.7.0.dist-info/licenses/AUTHORS
diff --git a/libs/stevedore-5.3.0.dist-info/LICENSE b/libs/stevedore-5.7.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/stevedore-5.3.0.dist-info/LICENSE
rename to libs/stevedore-5.7.0.dist-info/licenses/LICENSE
diff --git a/libs/stevedore-5.3.0.dist-info/top_level.txt b/libs/stevedore-5.7.0.dist-info/top_level.txt
similarity index 100%
rename from libs/stevedore-5.3.0.dist-info/top_level.txt
rename to libs/stevedore-5.7.0.dist-info/top_level.txt
diff --git a/libs/stevedore/_cache.py b/libs/stevedore/_cache.py
index fd703af601..fcab0f79bd 100644
--- a/libs/stevedore/_cache.py
+++ b/libs/stevedore/_cache.py
@@ -15,7 +15,7 @@
 import errno
 import glob
 import hashlib
-import importlib.metadata as importlib_metadata
+import importlib.metadata
 import itertools
 import json
 import logging
@@ -23,12 +23,13 @@
 import os.path
 import struct
 import sys
-
+from typing import TypeAlias
+from typing import TypedDict
 
 log = logging.getLogger('stevedore._cache')
 
 
-def _get_cache_dir():
+def _get_cache_dir() -> str:
     """Locate a platform-appropriate cache directory to use.
 
     Does not ensure that the cache directory exists.
@@ -36,8 +37,9 @@ def _get_cache_dir():
     # Linux, Unix, AIX, etc.
     if os.name == 'posix' and sys.platform != 'darwin':
         # use ~/.cache if empty OR not set
-        base_path = os.environ.get("XDG_CACHE_HOME", None) \
-            or os.path.expanduser('~/.cache')
+        base_path = os.environ.get('XDG_CACHE_HOME') or os.path.expanduser(
+            '~/.cache'
+        )
         return os.path.join(base_path, 'python-entrypoints')
 
     # Mac OS
@@ -46,12 +48,13 @@ def _get_cache_dir():
 
     # Windows (hopefully)
     else:
-        base_path = os.environ.get('LOCALAPPDATA', None) \
-            or os.path.expanduser('~\\AppData\\Local')
+        base_path = os.environ.get('LOCALAPPDATA') or os.path.expanduser(
+            '~\\AppData\\Local'
+        )
         return os.path.join(base_path, 'Python Entry Points')
 
 
-def _get_mtime(name):
+def _get_mtime(name: str) -> float:
     try:
         s = os.stat(name)
         return s.st_mtime
@@ -61,11 +64,15 @@ def _get_mtime(name):
     return -1.0
 
 
-def _ftobytes(f):
+def _ftobytes(f: float) -> bytes:
     return struct.Struct('f').pack(f)
 
 
-def _hash_settings_for_path(path):
+_PathHashEntryT: TypeAlias = list[tuple[str, float]]
+_PathHashSettingsT: TypeAlias = tuple[str, _PathHashEntryT]
+
+
+def _hash_settings_for_path(path: tuple[str, ...]) -> _PathHashSettingsT:
     """Return a hash and the path settings that created it."""
     paths = []
     h = hashlib.sha256()
@@ -82,12 +89,8 @@ def _hash_settings_for_path(path):
         paths.append((entry, mtime))
 
         for ep_file in itertools.chain(
-                glob.iglob(os.path.join(entry,
-                                        '*.dist-info',
-                                        'entry_points.txt')),
-                glob.iglob(os.path.join(entry,
-                                        '*.egg-info',
-                                        'entry_points.txt'))
+            glob.iglob(os.path.join(entry, '*.dist-info', 'entry_points.txt')),
+            glob.iglob(os.path.join(entry, '*.egg-info', 'entry_points.txt')),
         ):
             mtime = _get_mtime(ep_file)
             h.update(ep_file.encode('utf-8'))
@@ -97,24 +100,24 @@ def _hash_settings_for_path(path):
     return (h.hexdigest(), paths)
 
 
-def _build_cacheable_data():
-    real_groups = importlib_metadata.entry_points()
+_CacheEntry = TypedDict(
+    '_CacheEntry',
+    {
+        'groups': dict[str, list[tuple[str, str, str]]],
+        'sys.executable': str,
+        'sys.prefix': str,
+        'path_values': _PathHashEntryT,
+    },
+)
 
-    if not isinstance(real_groups, dict):
-        # importlib-metadata 4.0 or later (or stdlib importlib.metadata in
-        # Python 3.9 or later)
-        real_groups = {
-            group: real_groups.select(group=group)
-            for group in real_groups.groups
-        }
 
-    # Convert the namedtuple values to regular tuples
-    groups = {}
-    for name, group_data in real_groups.items():
+def _build_cacheable_data() -> _CacheEntry:
+    entry_points = importlib.metadata.entry_points()
+    groups: dict[str, list[tuple[str, str, str]]] = {}
+    for group in entry_points.groups:
         existing = set()
-        members = []
-        groups[name] = members
-        for ep in group_data:
+        groups[group] = []
+        for ep in entry_points.select(group=group):
             # Filter out duplicates that can occur when testing a
             # package that provides entry points using tox, where the
             # package is installed in the virtualenv that tox builds
@@ -123,45 +126,48 @@ def _build_cacheable_data():
             if item in existing:
                 continue
             existing.add(item)
-            members.append(item)
+            groups[group].append(item)
+
     return {
         'groups': groups,
         'sys.executable': sys.executable,
         'sys.prefix': sys.prefix,
+        'path_values': [],
     }
 
 
 class Cache:
-
-    def __init__(self, cache_dir=None):
+    def __init__(self, cache_dir: str | None = None) -> None:
         if cache_dir is None:
             cache_dir = _get_cache_dir()
         self._dir = cache_dir
-        self._internal = {}
+        self._internal: dict[tuple[str, ...], _CacheEntry] = {}
         self._disable_caching = False
 
         # Caching can be disabled by either placing .disable file into the
         # target directory or when python executable is under /tmp (this is the
         # case when executed from ansible)
-        if any([os.path.isfile(os.path.join(self._dir, '.disable')),
-                sys.executable[0:4] == '/tmp']):  # nosec B108
+        if any(
+            [
+                os.path.isfile(os.path.join(self._dir, '.disable')),
+                sys.executable[0:4] == '/tmp',  # noqa: S108,
+            ]
+        ):
             self._disable_caching = True
 
-    def _get_data_for_path(self, path):
-        if path is None:
-            path = sys.path
+    def _get_data_for_path(self, path: tuple[str, ...] | None) -> _CacheEntry:
+        internal_key = tuple(sys.path) if path is None else tuple(path)
 
-        internal_key = tuple(path)
         if internal_key in self._internal:
             return self._internal[internal_key]
 
-        digest, path_values = _hash_settings_for_path(path)
+        digest, path_values = _hash_settings_for_path(internal_key)
         filename = os.path.join(self._dir, digest)
         try:
             log.debug('reading %s', filename)
-            with open(filename, 'r') as f:
-                data = json.load(f)
-        except (IOError, json.JSONDecodeError):
+            with open(filename) as f:
+                data: _CacheEntry = json.load(f)
+        except (OSError, json.JSONDecodeError):
             data = _build_cacheable_data()
             data['path_values'] = path_values
             if not self._disable_caching:
@@ -170,34 +176,39 @@ def _get_data_for_path(self, path):
                     os.makedirs(self._dir, exist_ok=True)
                     with open(filename, 'w') as f:
                         json.dump(data, f)
-                except (IOError, OSError):
+                except OSError:
                     # Could not create cache dir or write file.
                     pass
 
         self._internal[internal_key] = data
         return data
 
-    def get_group_all(self, group, path=None):
+    def get_group_all(
+        self, group: str, path: tuple[str, ...] | None = None
+    ) -> list[importlib.metadata.EntryPoint]:
         result = []
         data = self._get_data_for_path(path)
         group_data = data.get('groups', {}).get(group, [])
         for vals in group_data:
-            result.append(importlib_metadata.EntryPoint(*vals))
+            result.append(importlib.metadata.EntryPoint(*vals))
         return result
 
-    def get_group_named(self, group, path=None):
+    def get_group_named(
+        self, group: str, path: tuple[str, ...] | None = None
+    ) -> dict[str, importlib.metadata.EntryPoint]:
         result = {}
         for ep in self.get_group_all(group, path=path):
             if ep.name not in result:
                 result[ep.name] = ep
         return result
 
-    def get_single(self, group, name, path=None):
+    def get_single(
+        self, group: str, name: str, path: tuple[str, ...] | None = None
+    ) -> importlib.metadata.EntryPoint:
         for name, ep in self.get_group_named(group, path=path).items():
             if name == name:
                 return ep
-        raise ValueError('No entrypoint {!r} in group {!r}'.format(
-            group, name))
+        raise ValueError(f'No entrypoint {group!r} in group {name!r}')
 
 
 _c = Cache()
diff --git a/libs/stevedore/dispatch.py b/libs/stevedore/dispatch.py
index 27b511fc90..fe8f75deaa 100644
--- a/libs/stevedore/dispatch.py
+++ b/libs/stevedore/dispatch.py
@@ -10,42 +10,55 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from collections.abc import Callable
+from collections.abc import Sequence
 import logging
+from typing import Any
+from typing import Concatenate
+from typing import ParamSpec
+from typing import TypeVar
 
 from .enabled import EnabledExtensionManager
 from .exception import NoMatches
+from .extension import Extension
+from .extension import OnLoadFailureCallbackT
 
 LOG = logging.getLogger(__name__)
 
+T = TypeVar('T')
+U = TypeVar('U')
+P = ParamSpec('P')
+Q = ParamSpec('Q')
 
-class DispatchExtensionManager(EnabledExtensionManager):
+
+class DispatchExtensionManager(EnabledExtensionManager[T]):
     """Loads all plugins and filters on execution.
 
     This is useful for long-running processes that need to pass
     different inputs to different extensions.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param check_func: Function to determine which extensions to load.
-    :type check_func: callable
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param propagate_map_exceptions: Boolean controlling whether exceptions
         are propagated up through the map call or whether they are logged and
         then ignored
-    :type invoke_on_load: bool
     """
 
-    def map(self, filter_func, func, *args, **kwds):
+    def map(  # type: ignore[override]
+        self,
+        filter_func: Callable[Concatenate[Extension[T], P], bool],
+        func: Callable[Concatenate[Extension[T], Q], U],
+        *args: Any,
+        **kwds: Any,
+    ) -> list[U]:
         """Iterate over the extensions invoking func() for any where
         filter_func() returns True.
 
@@ -79,14 +92,22 @@ def func(ext, *args, **kwds):
         """
         if not self.extensions:
             # FIXME: Use a more specific exception class here.
-            raise NoMatches('No %s extensions found' % self.namespace)
-        response = []
+            raise NoMatches(f'No {self.namespace} extensions found')
+        response: list[U] = []
         for e in self.extensions:
             if filter_func(e, *args, **kwds):
-                self._invoke_one_plugin(response.append, func, e, args, kwds)
+                self._invoke_one_plugin(
+                    response.append, func, e, *args, **kwds
+                )
         return response
 
-    def map_method(self, filter_func, method_name, *args, **kwds):
+    def map_method(  # type: ignore[override]
+        self,
+        filter_func: Callable[Concatenate[Extension[T], P], bool],
+        method_name: str,
+        *args: Any,
+        **kwds: Any,
+    ) -> Any:
         """Iterate over the extensions invoking each one's object method called
         `method_name` for any where filter_func() returns True.
 
@@ -107,11 +128,16 @@ def map_method(self, filter_func, method_name, *args, **kwds):
         :param kwds: Keyword arguments to pass to method
         :returns: List of values returned from methods
         """
-        return self.map(filter_func, self._call_extension_method,
-                        method_name, *args, **kwds)
+        return self.map(
+            filter_func,
+            self._call_extension_method,
+            method_name,
+            *args,
+            **kwds,
+        )
 
 
-class NameDispatchExtensionManager(DispatchExtensionManager):
+class NameDispatchExtensionManager(DispatchExtensionManager[T]):
     """Loads all plugins and filters on execution.
 
     This is useful for long-running processes that need to pass
@@ -123,41 +149,40 @@ class NameDispatchExtensionManager(DispatchExtensionManager):
     and ``False`` indicating that the extension should be ignored.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param check_func: Function to determine which extensions to load.
-    :type check_func: callable
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param propagate_map_exceptions: Boolean controlling whether exceptions
         are propagated up through the map call or whether they are logged and
         then ignored
-    :type invoke_on_load: bool
     :param on_load_failure_callback: Callback function that will be called when
         an entrypoint can not be loaded. The arguments that will be provided
         when this is called (when an entrypoint fails to load) are
         (manager, entrypoint, exception)
-    :type on_load_failure_callback: function
-    :param verify_requirements: Use setuptools to enforce the
-        dependencies of the plugin(s) being loaded. Defaults to False.
-    :type verify_requirements: bool
-
+    :param verify_requirements: **DEPRECATED** This is a no-op and will be
+        removed in a future version.
     """
 
-    def __init__(self, namespace, check_func, invoke_on_load=False,
-                 invoke_args=(), invoke_kwds={},
-                 propagate_map_exceptions=False,
-                 on_load_failure_callback=None,
-                 verify_requirements=False):
-        super(NameDispatchExtensionManager, self).__init__(
+    def __init__(
+        self,
+        namespace: str,
+        check_func: Callable[[Extension[T]], bool],
+        invoke_on_load: bool = False,
+        invoke_args: tuple[Any, ...] | None = None,
+        invoke_kwds: dict[str, Any] | None = None,
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        verify_requirements: bool | None = None,
+    ):
+        invoke_args = () if invoke_args is None else invoke_args
+        invoke_kwds = {} if invoke_kwds is None else invoke_kwds
+        super().__init__(
             namespace=namespace,
             check_func=check_func,
             invoke_on_load=invoke_on_load,
@@ -168,11 +193,17 @@ def __init__(self, namespace, check_func, invoke_on_load=False,
             verify_requirements=verify_requirements,
         )
 
-    def _init_plugins(self, extensions):
-        super(NameDispatchExtensionManager, self)._init_plugins(extensions)
-        self.by_name = dict((e.name, e) for e in self.extensions)
-
-    def map(self, names, func, *args, **kwds):
+    def _init_plugins(self, extensions: list[Extension[T]]) -> None:
+        super()._init_plugins(extensions)
+        self.by_name = {e.name: e for e in self.extensions}
+
+    def map(  # type: ignore[override]
+        self,
+        names: Sequence[str],
+        func: Callable[Concatenate[Extension[T], P], U],
+        *args: P.args,
+        **kwds: P.kwargs,
+    ) -> list[U]:
         """Iterate over the extensions invoking func() for any where
         the name is in the given list of names.
 
@@ -194,17 +225,21 @@ def func(ext, *args, **kwds):
         :param kwds: Keyword arguments to pass to func()
         :returns: List of values returned from func()
         """
-        response = []
+        response: list[U] = []
         for name in names:
             try:
                 e = self.by_name[name]
             except KeyError:
                 LOG.debug('Missing extension %r being ignored', name)
             else:
-                self._invoke_one_plugin(response.append, func, e, args, kwds)
+                self._invoke_one_plugin(
+                    response.append, func, e, *args, **kwds
+                )
         return response
 
-    def map_method(self, names, method_name, *args, **kwds):
+    def map_method(  # type: ignore[override]
+        self, names: Sequence[str], method_name: str, *args: Any, **kwds: Any
+    ) -> Any:
         """Iterate over the extensions invoking each one's object method called
         `method_name` for any where the name is in the given list of names.
 
@@ -225,5 +260,6 @@ def map_method(self, names, method_name, *args, **kwds):
         :param kwds: Keyword arguments to pass to method
         :returns: List of values returned from methods
         """
-        return self.map(names, self._call_extension_method,
-                        method_name, *args, **kwds)
+        return self.map(
+            names, self._call_extension_method, method_name, *args, **kwds
+        )
diff --git a/libs/stevedore/driver.py b/libs/stevedore/driver.py
index bccbcd1917..981a5388ed 100644
--- a/libs/stevedore/driver.py
+++ b/libs/stevedore/driver.py
@@ -10,48 +10,88 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from collections.abc import Callable
+import importlib.metadata
+from typing import Any
+from typing import Concatenate
+from typing import ParamSpec
+from typing import TYPE_CHECKING
+from typing import TypeVar
+
 from .exception import MultipleMatches
 from .exception import NoMatches
+from .extension import ConflictResolverT
+from .extension import Extension
+from .extension import ExtensionManager
+from .extension import ignore_conflicts
+from .extension import OnLoadFailureCallbackT
 from .named import NamedExtensionManager
+from .named import OnMissingEntrypointsCallbackT
+from .named import warning_on_missing_entrypoint
+
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
+T = TypeVar('T')
+U = TypeVar('U')
+P = ParamSpec('P')
 
 
-class DriverManager(NamedExtensionManager):
+class DriverManager(NamedExtensionManager[T]):
     """Load a single plugin with a given name from the namespace.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param name: The name of the driver to load.
-    :type name: str
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param on_load_failure_callback: Callback function that will be called when
         an entrypoint can not be loaded. The arguments that will be provided
         when this is called (when an entrypoint fails to load) are
         (manager, entrypoint, exception)
-    :type on_load_failure_callback: function
-    :param verify_requirements: Use setuptools to enforce the
-        dependencies of the plugin(s) being loaded. Defaults to False.
-    :type verify_requirements: bool
-    :type warn_on_missing_entrypoint: bool
+    :param on_missing_entrypoints_callback: Callback function that will be
+        called when one or more names cannot be found. The provided argument
+        will be a subset of the 'names' parameter.
+    :param verify_requirements: **DEPRECATED** This is a no-op and will be
+        removed in a future version.
+    :param warn_on_missing_entrypoint: **DEPRECATED** Flag to control whether
+        failing to load a plugin is reported via a log mess. Only applies if
+        on_missing_entrypoints_callback is None. Users should instead set
+        ``on_missing_entrypoints_callback`` to ``None`` if they wish to disable
+        logging.
+    :param conflict_resolver: A callable that determines what to do in the
+        event that there are multiple entrypoints in the same group with the
+        same name. This is only used if retrieving entrypoint by name.
     """
 
-    def __init__(self, namespace, name,
-                 invoke_on_load=False, invoke_args=(), invoke_kwds={},
-                 on_load_failure_callback=None,
-                 verify_requirements=False,
-                 warn_on_missing_entrypoint=True):
-        on_load_failure_callback = on_load_failure_callback \
-            or self._default_on_load_failure
-        super(DriverManager, self).__init__(
+    def __init__(
+        self,
+        namespace: str,
+        name: str,
+        invoke_on_load: bool = False,
+        invoke_args: tuple[Any, ...] | None = None,
+        invoke_kwds: dict[str, Any] | None = None,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        on_missing_entrypoints_callback: (
+            OnMissingEntrypointsCallbackT | None
+        ) = warning_on_missing_entrypoint,
+        verify_requirements: bool | None = None,
+        warn_on_missing_entrypoint: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ) -> None:
+        invoke_args = () if invoke_args is None else invoke_args
+        invoke_kwds = {} if invoke_kwds is None else invoke_kwds
+        on_load_failure_callback = (
+            on_load_failure_callback or self._default_on_load_failure
+        )
+
+        super().__init__(
             namespace=namespace,
             names=[name],
             invoke_on_load=invoke_on_load,
@@ -59,67 +99,86 @@ def __init__(self, namespace, name,
             invoke_kwds=invoke_kwds,
             on_load_failure_callback=on_load_failure_callback,
             verify_requirements=verify_requirements,
-            warn_on_missing_entrypoint=warn_on_missing_entrypoint
+            warn_on_missing_entrypoint=warn_on_missing_entrypoint,
+            conflict_resolver=conflict_resolver,
         )
 
     @staticmethod
-    def _default_on_load_failure(drivermanager, ep, err):
+    def _default_on_load_failure(
+        manager: 'ExtensionManager[T]',
+        ep: importlib.metadata.EntryPoint,
+        err: BaseException,
+    ) -> None:
         raise
 
     @classmethod
-    def make_test_instance(cls, extension, namespace='TESTING',
-                           propagate_map_exceptions=False,
-                           on_load_failure_callback=None,
-                           verify_requirements=False):
+    def make_test_instance(  # type: ignore[override]
+        cls,
+        extension: Extension[T],
+        namespace: str = 'TESTING',
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        verify_requirements: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ) -> 'Self':
         """Construct a test DriverManager
 
         Test instances are passed a list of extensions to work from rather
         than loading them from entry points.
 
         :param extension: Pre-configured Extension instance
-        :type extension: :class:`~stevedore.extension.Extension`
         :param namespace: The namespace for the manager; used only for
             identification since the extensions are passed in.
-        :type namespace: str
         :param propagate_map_exceptions: Boolean controlling whether exceptions
             are propagated up through the map call or whether they are logged
             and then ignored
-        :type propagate_map_exceptions: bool
         :param on_load_failure_callback: Callback function that will
             be called when an entrypoint can not be loaded. The
             arguments that will be provided when this is called (when
             an entrypoint fails to load) are (manager, entrypoint,
             exception)
-        :type on_load_failure_callback: function
-        :param verify_requirements: Use setuptools to enforce the
-            dependencies of the plugin(s) being loaded. Defaults to False.
-        :type verify_requirements: bool
+        :param verify_requirements: **DEPRECATED** This is a no-op and will be
+            removed in a future version.
+        :param conflict_resolver: A callable that determines what to do in the
+            event that there are multiple entrypoints in the same group with
+            the same name. This is only used if retrieving entrypoint by name.
         :return: The manager instance, initialized for testing
-
         """
-
-        o = super(DriverManager, cls).make_test_instance(
-            [extension], namespace=namespace,
+        o = super().make_test_instance(
+            [extension],
+            namespace=namespace,
             propagate_map_exceptions=propagate_map_exceptions,
             on_load_failure_callback=on_load_failure_callback,
-            verify_requirements=verify_requirements)
+            verify_requirements=verify_requirements,
+            conflict_resolver=conflict_resolver,
+        )
         return o
 
-    def _init_plugins(self, extensions):
-        super(DriverManager, self)._init_plugins(extensions)
+    def _init_plugins(self, extensions: list[Extension[T]]) -> None:
+        super()._init_plugins(extensions)
 
         if not self.extensions:
             name = self._names[0]
-            raise NoMatches('No %r driver found, looking for %r' %
-                            (self.namespace, name))
+            raise NoMatches(
+                f'No {self.namespace!r} driver found, looking for {name!r}'
+            )
         if len(self.extensions) > 1:
-            discovered_drivers = ','.join(e.entry_point_target
-                                          for e in self.extensions)
-
-            raise MultipleMatches('Multiple %r drivers found: %s' %
-                                  (self.namespace, discovered_drivers))
-
-    def __call__(self, func, *args, **kwds):
+            discovered_drivers = ','.join(
+                e.entry_point_target for e in self.extensions
+            )
+
+            raise MultipleMatches(
+                f'Multiple {self.namespace!r} drivers found: '
+                f'{discovered_drivers}'
+            )
+
+    def __call__(
+        self,
+        func: Callable[Concatenate[Extension[T], P], U],
+        *args: Any,
+        **kwds: Any,
+    ) -> U | None:
         """Invokes func() for the single loaded extension.
 
         The signature for func() should be::
@@ -140,9 +199,10 @@ def func(ext, *args, **kwds):
         results = self.map(func, *args, **kwds)
         if results:
             return results[0]
+        return None
 
     @property
-    def driver(self):
+    def driver(self) -> T | Callable[..., T]:
         """Returns the driver being used by this manager."""
         ext = self.extensions[0]
         return ext.obj if ext.obj else ext.plugin
diff --git a/libs/stevedore/enabled.py b/libs/stevedore/enabled.py
index 7c12499b3e..307a02f7aa 100644
--- a/libs/stevedore/enabled.py
+++ b/libs/stevedore/enabled.py
@@ -10,15 +10,24 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from collections.abc import Callable
+import importlib.metadata
 import logging
+from typing import Any
+from typing import TypeVar
 
+from .extension import ConflictResolverT
+from .extension import Extension
 from .extension import ExtensionManager
-
+from .extension import ignore_conflicts
+from .extension import OnLoadFailureCallbackT
 
 LOG = logging.getLogger(__name__)
 
+T = TypeVar('T')
+
 
-class EnabledExtensionManager(ExtensionManager):
+class EnabledExtensionManager(ExtensionManager[T]):
     """Loads only plugins that pass a check function.
 
     The check_func argument should return a boolean, with ``True``
@@ -26,43 +35,48 @@ class EnabledExtensionManager(ExtensionManager):
     and ``False`` indicating that the extension should be ignored.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param check_func: Function to determine which extensions to load.
-    :type check_func: callable, taking an :class:`Extension`
-        instance as argument
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param propagate_map_exceptions: Boolean controlling whether exceptions
         are propagated up through the map call or whether they are logged and
         then ignored
-    :type propagate_map_exceptions: bool
     :param on_load_failure_callback: Callback function that will be called when
         an entrypoint can not be loaded. The arguments that will be provided
         when this is called (when an entrypoint fails to load) are
         (manager, entrypoint, exception)
-    :type on_load_failure_callback: function
-    :param verify_requirements: Use setuptools to enforce the
-        dependencies of the plugin(s) being loaded. Defaults to False.
-    :type verify_requirements: bool
-
+    :param verify_requirements: **DEPRECATED** This is a no-op and will be
+        removed in a future version.
+    :param conflict_resolver: A callable that determines what to do in the
+        event that there are multiple entrypoints in the same group with the
+        same name. This is only used if retrieving entrypoint by name.
     """
 
-    def __init__(self, namespace, check_func, invoke_on_load=False,
-                 invoke_args=(), invoke_kwds={},
-                 propagate_map_exceptions=False,
-                 on_load_failure_callback=None,
-                 verify_requirements=False,):
+    def __init__(
+        self,
+        namespace: str,
+        check_func: Callable[[Extension[T]], bool],
+        invoke_on_load: bool = False,
+        invoke_args: tuple[Any, ...] | None = None,
+        invoke_kwds: dict[str, Any] | None = None,
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        verify_requirements: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ):
+        invoke_args = () if invoke_args is None else invoke_args
+        invoke_kwds = {} if invoke_kwds is None else invoke_kwds
+
         self.check_func = check_func
-        super(EnabledExtensionManager, self).__init__(
+
+        super().__init__(
             namespace,
             invoke_on_load=invoke_on_load,
             invoke_args=invoke_args,
@@ -70,13 +84,18 @@ def __init__(self, namespace, check_func, invoke_on_load=False,
             propagate_map_exceptions=propagate_map_exceptions,
             on_load_failure_callback=on_load_failure_callback,
             verify_requirements=verify_requirements,
+            conflict_resolver=conflict_resolver,
         )
 
-    def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds,
-                         verify_requirements):
-        ext = super(EnabledExtensionManager, self)._load_one_plugin(
-            ep, invoke_on_load, invoke_args, invoke_kwds,
-            verify_requirements,
+    def _load_one_plugin(
+        self,
+        ep: importlib.metadata.EntryPoint,
+        invoke_on_load: bool,
+        invoke_args: tuple[Any, ...],
+        invoke_kwds: dict[str, Any],
+    ) -> Extension[T] | None:
+        ext = super()._load_one_plugin(
+            ep, invoke_on_load, invoke_args, invoke_kwds
         )
         if ext and not self.check_func(ext):
             LOG.debug('ignoring extension %r', ep.name)
diff --git a/libs/stevedore/example/base.py b/libs/stevedore/example/base.py
index cd48bf21ea..b29aff9d27 100644
--- a/libs/stevedore/example/base.py
+++ b/libs/stevedore/example/base.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2020 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,22 +12,22 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import abc
+from collections.abc import Iterable
+from typing import Any
 
 
 class FormatterBase(metaclass=abc.ABCMeta):
-    """Base class for example plugin used in the tutorial.
-    """
+    """Base class for example plugin used in the tutorial."""
 
-    def __init__(self, max_width=60):
+    def __init__(self, max_width: int = 60) -> None:
         self.max_width = max_width
 
     @abc.abstractmethod
-    def format(self, data):
+    def format(self, data: dict[str, Any]) -> Iterable[str]:
         """Format the data and return unicode text.
 
-        :param data: A dictionary with string keys and simple types as
-                     values.
-        :type data: dict(str:?)
+        :param data: A dictionary with string keys and simple types as values.
         :returns: Iterable producing the formatted text.
         """
diff --git a/libs/stevedore/example/load_as_driver.py b/libs/stevedore/example/load_as_driver.py
index a3de5df27c..8deef66ef8 100644
--- a/libs/stevedore/example/load_as_driver.py
+++ b/libs/stevedore/example/load_as_driver.py
@@ -12,38 +12,33 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import argparse
 
 from stevedore import driver
 
+from .base import FormatterBase
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        'format',
-        nargs='?',
-        default='simple',
-        help='the output format',
+        'format', nargs='?', default='simple', help='the output format'
     )
     parser.add_argument(
-        '--width',
-        default=60,
-        type=int,
-        help='maximum output width for text',
+        '--width', default=60, type=int, help='maximum output width for text'
     )
     parsed_args = parser.parse_args()
 
-    data = {
-        'a': 'A',
-        'b': 'B',
-        'long': 'word ' * 80,
-    }
+    data = {'a': 'A', 'b': 'B', 'long': 'word ' * 80}
 
-    mgr = driver.DriverManager(
+    mgr: driver.DriverManager[FormatterBase] = driver.DriverManager(
         namespace='stevedore.example.formatter',
         name=parsed_args.format,
         invoke_on_load=True,
         invoke_args=(parsed_args.width,),
     )
+    # okay because invoke_on_load is true
+    assert isinstance(mgr.driver, FormatterBase)
     for chunk in mgr.driver.format(data):
         print(chunk, end='')
diff --git a/libs/stevedore/example/load_as_extension.py b/libs/stevedore/example/load_as_extension.py
index 1af1f46cad..56a25589bc 100644
--- a/libs/stevedore/example/load_as_extension.py
+++ b/libs/stevedore/example/load_as_extension.py
@@ -12,40 +12,42 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import argparse
+from collections.abc import Iterable
+from typing import Any
 
 from stevedore import extension
 
+from .base import FormatterBase
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        '--width',
-        default=60,
-        type=int,
-        help='maximum output width for text',
+        '--width', default=60, type=int, help='maximum output width for text'
     )
     parsed_args = parser.parse_args()
 
-    data = {
-        'a': 'A',
-        'b': 'B',
-        'long': 'word ' * 80,
-    }
+    data = {'a': 'A', 'b': 'B', 'long': 'word ' * 80}
 
+    mgr: extension.ExtensionManager[FormatterBase]
     mgr = extension.ExtensionManager(
         namespace='stevedore.example.formatter',
         invoke_on_load=True,
         invoke_args=(parsed_args.width,),
     )
 
-    def format_data(ext, data):
+    def format_data(
+        ext: extension.Extension[FormatterBase], data: dict[str, Any], /
+    ) -> tuple[str, Iterable[str]]:
+        assert ext.obj is not None
         return (ext.name, ext.obj.format(data))
 
     results = mgr.map(format_data, data)
 
     for name, result in results:
-        print('Formatter: {0}'.format(name))
+        print(f'Formatter: {name}')
         for chunk in result:
             print(chunk, end='')
         print('')
diff --git a/libs/stevedore/example/pyproject.toml b/libs/stevedore/example/pyproject.toml
new file mode 100644
index 0000000000..b324e072dc
--- /dev/null
+++ b/libs/stevedore/example/pyproject.toml
@@ -0,0 +1,40 @@
+[build-system]
+requires = ["setuptools>=61.0.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "stevedore-examples"
+description = "Demonstration package for stevedore"
+authors = [
+    {name = "Doug Hellmann", email = "doug@doughellmann.com"},
+]
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = {text = "Apache-2.0"}
+version = "0.1"
+requires-python = ">=3.10"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Console",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: POSIX :: Linux",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+
+[project.urls]
+Homepage = "https://docs.openstack.org/stevedore"
+Repository = "https://opendev.org/openstack/stevedore"
+
+[project.entry-points."stevedore.example.formatter"]
+simple = "stevedore.example.simple:Simple"
+plain = "stevedore.example.simple:Simple"
+
+[tool.setuptools]
+packages = [
+    "stevedore.examples"
+]
diff --git a/libs/stevedore/example/setup.py b/libs/stevedore/example/setup.py
index c0ea667b2e..703170a35b 100644
--- a/libs/stevedore/example/setup.py
+++ b/libs/stevedore/example/setup.py
@@ -12,47 +12,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from setuptools import find_packages
-from setuptools import setup
-
-setup(
-    name='stevedore-examples',
-    version='1.0',
-
-    description='Demonstration package for stevedore',
-
-    author='Doug Hellmann',
-    author_email='doug@doughellmann.com',
-
-    url='http://opendev.org/openstack/stevedore',
-
-    classifiers=['Development Status :: 3 - Alpha',
-                 'License :: OSI Approved :: Apache Software License',
-                 'Programming Language :: Python',
-                 'Programming Language :: Python :: 2',
-                 'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.5',
-                 'Intended Audience :: Developers',
-                 'Environment :: Console',
-                 ],
 
-    platforms=['Any'],
-
-    scripts=[],
-
-    provides=['stevedore.examples',
-              ],
-
-    packages=find_packages(),
-    include_package_data=True,
-
-    entry_points={
-        'stevedore.example.formatter': [
-            'simple = stevedore.example.simple:Simple',
-            'plain = stevedore.example.simple:Simple',
-        ],
-    },
+from setuptools import setup
 
-    zip_safe=False,
-)
+setup()
diff --git a/libs/stevedore/example/simple.py b/libs/stevedore/example/simple.py
index 0cc3acd9b2..7c9cf804a6 100644
--- a/libs/stevedore/example/simple.py
+++ b/libs/stevedore/example/simple.py
@@ -11,22 +11,22 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations
 #  under the License.
+
+from collections.abc import Iterable
+from typing import Any
+
 from stevedore.example import base
 
 
 class Simple(base.FormatterBase):
     """A very basic formatter."""
 
-    def format(self, data):
+    def format(self, data: dict[str, Any]) -> Iterable[str]:
         """Format the data and return unicode text.
 
-        :param data: A dictionary with string keys and simple types as
-                     values.
-        :type data: dict(str:?)
+        :param data: A dictionary with string keys and simple types as values.
+        :returns: Iterable producing the formatted text.
         """
         for name, value in sorted(data.items()):
-            line = '{name} = {value}\n'.format(
-                name=name,
-                value=value,
-            )
+            line = f'{name} = {value}\n'
             yield line
diff --git a/libs/stevedore/example2/fields.py b/libs/stevedore/example2/fields.py
index 82db7474c6..5755ef1f0a 100644
--- a/libs/stevedore/example2/fields.py
+++ b/libs/stevedore/example2/fields.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (C) 2020 Red Hat, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +12,10 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+from collections.abc import Iterable
 import textwrap
+from typing import Any
 
 from stevedore.example import base
 
@@ -30,18 +32,14 @@ class FieldList(base.FormatterBase):
           a hanging indent
     """
 
-    def format(self, data):
+    def format(self, data: dict[str, Any]) -> Iterable[str]:
         """Format the data and return unicode text.
 
-        :param data: A dictionary with string keys and simple types as
-                     values.
-        :type data: dict(str:?)
+        :param data: A dictionary with string keys and simple types as values.
+        :returns: Iterable producing the formatted text.
         """
         for name, value in sorted(data.items()):
-            full_text = ': {name} : {value}'.format(
-                name=name,
-                value=value,
-            )
+            full_text = f': {name} : {value}'
             wrapped_text = textwrap.fill(
                 full_text,
                 initial_indent='',
diff --git a/libs/stevedore/example2/pyproject.toml b/libs/stevedore/example2/pyproject.toml
new file mode 100644
index 0000000000..10ac8d2e71
--- /dev/null
+++ b/libs/stevedore/example2/pyproject.toml
@@ -0,0 +1,39 @@
+[build-system]
+requires = ["setuptools>=61.0.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "stevedore-examples2"
+description = "Demonstration package for stevedore"
+authors = [
+    {name = "Doug Hellmann", email = "doug@doughellmann.com"},
+]
+readme = {file = "README.rst", content-type = "text/x-rst"}
+license = {text = "Apache-2.0"}
+version = "0.1"
+requires-python = ">=3.10"
+classifiers = [
+  "Development Status :: 5 - Production/Stable",
+  "Environment :: Console",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: POSIX :: Linux",
+  "Programming Language :: Python",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+
+[project.urls]
+Homepage = "https://docs.openstack.org/stevedore"
+Repository = "https://opendev.org/openstack/stevedore"
+
+[project.entry-points."stevedore.example.formatter"]
+field = "stevedore.example2.fields:FieldList"
+
+[tool.setuptools]
+packages = [
+    "stevedore.examples2"
+]
diff --git a/libs/stevedore/example2/setup.py b/libs/stevedore/example2/setup.py
index 2293c6618c..703170a35b 100644
--- a/libs/stevedore/example2/setup.py
+++ b/libs/stevedore/example2/setup.py
@@ -12,46 +12,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from setuptools import find_packages
-from setuptools import setup
-
-setup(
-    name='stevedore-examples2',
-    version='1.0',
-
-    description='Demonstration package for stevedore',
-
-    author='Doug Hellmann',
-    author_email='doug@doughellmann.com',
-
-    url='http://opendev.org/openstack/stevedore',
-
-    classifiers=['Development Status :: 3 - Alpha',
-                 'License :: OSI Approved :: Apache Software License',
-                 'Programming Language :: Python',
-                 'Programming Language :: Python :: 2',
-                 'Programming Language :: Python :: 2.7',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 3.5',
-                 'Intended Audience :: Developers',
-                 'Environment :: Console',
-                 ],
 
-    platforms=['Any'],
-
-    scripts=[],
-
-    provides=['stevedore.examples2',
-              ],
-
-    packages=find_packages(),
-    include_package_data=True,
-
-    entry_points={
-        'stevedore.example.formatter': [
-            'field = stevedore.example2.fields:FieldList',
-        ],
-    },
+from setuptools import setup
 
-    zip_safe=False,
-)
+setup()
diff --git a/libs/stevedore/extension.py b/libs/stevedore/extension.py
index 9db769f081..c8864ff27a 100644
--- a/libs/stevedore/extension.py
+++ b/libs/stevedore/extension.py
@@ -10,19 +10,39 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""ExtensionManager
-"""
+"""ExtensionManager"""
 
+from collections.abc import Callable
+from collections.abc import ItemsView
+from collections.abc import Iterator
+import importlib.metadata
+import itertools
 import logging
 import operator
+from typing import Any
+from typing import Concatenate
+from typing import Generic
+from typing import ParamSpec
+from typing import TYPE_CHECKING
+from typing import TypeAlias
+from typing import TypeVar
+import warnings
 
 from . import _cache
+from .exception import MultipleMatches
 from .exception import NoMatches
 
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
 LOG = logging.getLogger(__name__)
 
+T = TypeVar('T')
+U = TypeVar('U')
+P = ParamSpec('P')
+
 
-class Extension(object):
+class Extension(Generic[T]):
     """Book-keeping object for tracking extensions.
 
     The arguments passed to the constructor are saved as attributes of
@@ -31,41 +51,40 @@ class Extension(object):
     :class:`ExtensionManager` directly.
 
     :param name: The entry point name.
-    :type name: str
-    :param entry_point: The EntryPoint instance returned by
-        :mod:`entrypoints`.
-    :type entry_point: EntryPoint
+    :param entry_point: The EntryPoint instance returned by :mod:`entrypoints`.
     :param plugin: The value returned by entry_point.load()
     :param obj: The object returned by ``plugin(*args, **kwds)`` if the
                 manager invoked the extension on load.
 
     """
 
-    def __init__(self, name, entry_point, plugin, obj):
+    def __init__(
+        self,
+        name: str,
+        entry_point: importlib.metadata.EntryPoint,
+        plugin: Callable[..., T],
+        obj: T | None,
+    ) -> None:
         self.name = name
         self.entry_point = entry_point
         self.plugin = plugin
         self.obj = obj
 
     @property
-    def module_name(self):
+    def module_name(self) -> str:
         """The name of the module from which the entry point is loaded.
 
         :return: A string in 'dotted.module' format.
         """
-        # NOTE: importlib_metadata from PyPI includes this but the
-        # Python 3.8 standard library does not.
-        match = self.entry_point.pattern.match(self.entry_point.value)
-        return match.group('module')
+        return self.entry_point.module
 
     @property
-    def attr(self):
+    def attr(self) -> str:
         """The attribute of the module to be loaded."""
-        match = self.entry_point.pattern.match(self.entry_point.value)
-        return match.group('attr')
+        return self.entry_point.attr
 
     @property
-    def entry_point_target(self):
+    def entry_point_target(self) -> str:
         """The module and attribute referenced by this extension's entry_point.
 
         :return: A string representation of the target of the entry point in
@@ -74,141 +93,215 @@ def entry_point_target(self):
         return self.entry_point.value
 
 
-class ExtensionManager(object):
+#: OnLoadFailureCallbackT defines the type for callbacks when a plugin fails
+#: to load. The callback callable should expect the extension manager instance,
+#: the underlying entrypoint instance, and the exception raised during
+#: attempted loading.
+OnLoadFailureCallbackT: TypeAlias = Callable[
+    ['ExtensionManager[T]', importlib.metadata.EntryPoint, BaseException], None
+]
+
+#: ConflictResolver defines the type for conflict resolution callables. The
+#: callable should expect the extension namespace, extension name, and a list
+#: of the entrypoints themselves.
+ConflictResolverT: TypeAlias = Callable[
+    [str, str, list[Extension[T]]], Extension[T]
+]
+
+
+def ignore_conflicts(
+    namespace: str, name: str, entrypoints: list[Extension[T]]
+) -> Extension[T]:
+    LOG.warning(
+        "multiple implementations found for the '%(name)s' extension in "
+        "%(namespace)s namespace: %(conflicts)s",
+        {
+            'name': name,
+            'namespace': namespace,
+            'conflicts': ', '.join(
+                ep.plugin.__qualname__ for ep in entrypoints
+            ),
+        },
+    )
+    # use the most last found entrypoint
+    return entrypoints[-1]
+
+
+def error_on_conflict(
+    namespace: str, name: str, entrypoints: list[Extension[T]]
+) -> Extension[T]:
+    raise MultipleMatches(
+        "multiple implementations found for the '{name}' command in "
+        "{namespace} namespace: {conflicts}".format(
+            name=name,
+            namespace=namespace,
+            conflicts=', '.join(ep.plugin.__qualname__ for ep in entrypoints),
+        )
+    )
+
+
+class ExtensionManager(Generic[T]):
     """Base class for all of the other managers.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param propagate_map_exceptions: Boolean controlling whether exceptions
         are propagated up through the map call or whether they are logged and
         then ignored
-    :type propagate_map_exceptions: bool
     :param on_load_failure_callback: Callback function that will be called when
         an entrypoint can not be loaded. The arguments that will be provided
         when this is called (when an entrypoint fails to load) are
         (manager, entrypoint, exception)
-    :type on_load_failure_callback: function
-    :param verify_requirements: Use setuptools to enforce the
-        dependencies of the plugin(s) being loaded. Defaults to False.
-    :type verify_requirements: bool
+    :param verify_requirements: **DEPRECATED** This is a no-op and will be
+        removed in a future version.
+    :param conflict_resolver: A callable that determines what to do in the
+        event that there are multiple entrypoints in the same group with the
+        same name. This is only used if retrieving entrypoint by name.
     """
 
-    def __init__(self, namespace,
-                 invoke_on_load=False,
-                 invoke_args=(),
-                 invoke_kwds={},
-                 propagate_map_exceptions=False,
-                 on_load_failure_callback=None,
-                 verify_requirements=False):
-        self._init_attributes(
-            namespace,
-            propagate_map_exceptions=propagate_map_exceptions,
-            on_load_failure_callback=on_load_failure_callback)
-        extensions = self._load_plugins(invoke_on_load,
-                                        invoke_args,
-                                        invoke_kwds,
-                                        verify_requirements)
+    ENTRY_POINT_CACHE: dict[str, list[importlib.metadata.EntryPoint]] = {}
+
+    def __init__(
+        self,
+        namespace: str,
+        invoke_on_load: bool = False,
+        invoke_args: tuple[Any, ...] | None = None,
+        invoke_kwds: dict[str, Any] | None = None,
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        verify_requirements: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ) -> None:
+        invoke_args = () if invoke_args is None else invoke_args
+        invoke_kwds = {} if invoke_kwds is None else invoke_kwds
+
+        if verify_requirements is not None:
+            warnings.warn(
+                'The verify_requirements argument is now a no-op and is '
+                'deprecated for removal. Remove the argument from calls.',
+                DeprecationWarning,
+            )
+
+        self.namespace = namespace
+        self.propagate_map_exceptions = propagate_map_exceptions
+        self._on_load_failure_callback = on_load_failure_callback
+        self._conflict_resolver = conflict_resolver
+
+        extensions = self._load_plugins(
+            invoke_on_load, invoke_args, invoke_kwds
+        )
+
         self._init_plugins(extensions)
 
     @classmethod
-    def make_test_instance(cls, extensions, namespace='TESTING',
-                           propagate_map_exceptions=False,
-                           on_load_failure_callback=None,
-                           verify_requirements=False):
+    def make_test_instance(
+        cls,
+        extensions: list[Extension[T]],
+        namespace: str = 'TESTING',
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        verify_requirements: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ) -> 'Self':
         """Construct a test ExtensionManager
 
         Test instances are passed a list of extensions to work from rather
         than loading them from entry points.
 
         :param extensions: Pre-configured Extension instances to use
-        :type extensions: list of :class:`~stevedore.extension.Extension`
         :param namespace: The namespace for the manager; used only for
             identification since the extensions are passed in.
-        :type namespace: str
         :param propagate_map_exceptions: When calling map, controls whether
             exceptions are propagated up through the map call or whether they
             are logged and then ignored
-        :type propagate_map_exceptions: bool
         :param on_load_failure_callback: Callback function that will
             be called when an entrypoint can not be loaded. The
             arguments that will be provided when this is called (when
             an entrypoint fails to load) are (manager, entrypoint,
             exception)
-        :type on_load_failure_callback: function
-        :param verify_requirements: Use setuptools to enforce the
-            dependencies of the plugin(s) being loaded. Defaults to False.
-        :type verify_requirements: bool
+        :param verify_requirements: **DEPRECATED** This is a no-op and will be
+            removed in a future version.
+        :param conflict_resolver: A callable that determines what to do in the
+            event that there are multiple entrypoints in the same group with
+            the same name. This is only used if retrieving entrypoint by name.
         :return: The manager instance, initialized for testing
-
         """
+        if verify_requirements is not None:
+            warnings.warn(
+                'The verify_requirements argument is now a no-op and is '
+                'deprecated for removal. Remove the argument from calls.',
+                DeprecationWarning,
+            )
 
         o = cls.__new__(cls)
-        o._init_attributes(namespace,
-                           propagate_map_exceptions=propagate_map_exceptions,
-                           on_load_failure_callback=on_load_failure_callback)
+        o.namespace = namespace
+        o.propagate_map_exceptions = propagate_map_exceptions
+        o._on_load_failure_callback = on_load_failure_callback
+        o._conflict_resolver = conflict_resolver
         o._init_plugins(extensions)
         return o
 
-    def _init_attributes(self, namespace, propagate_map_exceptions=False,
-                         on_load_failure_callback=None):
-        self.namespace = namespace
-        self.propagate_map_exceptions = propagate_map_exceptions
-        self._on_load_failure_callback = on_load_failure_callback
-
-    def _init_plugins(self, extensions):
-        self.extensions = extensions
-        self._extensions_by_name_cache = None
+    def _init_plugins(self, extensions: list[Extension[T]]) -> None:
+        self.extensions: list[Extension[T]] = extensions
+        self._extensions_by_name_cache: dict[str, Extension[T]] | None = None
 
     @property
-    def _extensions_by_name(self):
+    def _extensions_by_name(self) -> dict[str, Extension[T]]:
         if self._extensions_by_name_cache is None:
             d = {}
-            for e in self.extensions:
-                d[e.name] = e
+            for name, _extensions in itertools.groupby(
+                self.extensions, lambda x: x.name
+            ):
+                extensions = list(_extensions)
+                if len(extensions) > 1:
+                    ext = self._conflict_resolver(
+                        self.namespace, name, extensions
+                    )
+                else:
+                    ext = extensions[0]
+
+                d[name] = ext
+
             self._extensions_by_name_cache = d
         return self._extensions_by_name_cache
 
-    ENTRY_POINT_CACHE = {}
-
-    def list_entry_points(self):
+    def list_entry_points(self) -> list[importlib.metadata.EntryPoint]:
         """Return the list of entry points for this namespace.
 
         The entry points are not actually loaded, their list is just read and
         returned.
-
         """
         if self.namespace not in self.ENTRY_POINT_CACHE:
             eps = list(_cache.get_group_all(self.namespace))
             self.ENTRY_POINT_CACHE[self.namespace] = eps
         return self.ENTRY_POINT_CACHE[self.namespace]
 
-    def entry_points_names(self):
+    def entry_points_names(self) -> list[str]:
         """Return the list of entry points names for this namespace."""
         return list(map(operator.attrgetter("name"), self.list_entry_points()))
 
-    def _load_plugins(self, invoke_on_load, invoke_args, invoke_kwds,
-                      verify_requirements):
+    def _load_plugins(
+        self,
+        invoke_on_load: bool,
+        invoke_args: tuple[Any, ...],
+        invoke_kwds: dict[str, Any],
+    ) -> list[Extension[T]]:
         extensions = []
         for ep in self.list_entry_points():
             LOG.debug('found extension %r', ep)
             try:
-                ext = self._load_one_plugin(ep,
-                                            invoke_on_load,
-                                            invoke_args,
-                                            invoke_kwds,
-                                            verify_requirements,
-                                            )
+                ext = self._load_one_plugin(
+                    ep, invoke_on_load, invoke_args, invoke_kwds
+                )
                 if ext:
                     extensions.append(ext)
             except (KeyboardInterrupt, AssertionError):
@@ -224,34 +317,44 @@ def _load_plugins(self, invoke_on_load, invoke_args, invoke_kwds,
                     # enough to debug that.  If debug logging is
                     # enabled for our logger, provide the full
                     # traceback.
-                    LOG.error('Could not load %r: %s', ep.name, err,
-                              exc_info=LOG.isEnabledFor(logging.DEBUG))
+                    LOG.error(
+                        'Could not load %r: %s',
+                        ep.name,
+                        err,
+                        exc_info=LOG.isEnabledFor(logging.DEBUG),
+                    )
         return extensions
 
-    def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds,
-                         verify_requirements):
-        # NOTE(dhellmann): Using require=False is deprecated in
-        # setuptools 11.3.
-        if hasattr(ep, 'resolve') and hasattr(ep, 'require'):
-            if verify_requirements:
-                ep.require()
-            plugin = ep.resolve()
-        else:
-            plugin = ep.load()
+    # NOTE(stephenfin): While this can't return None, all the subclasses can,
+    # and this allows us to satisfy Liskov's Principle. `_load_plugins` handles
+    # things just fine in either case.
+    def _load_one_plugin(
+        self,
+        ep: importlib.metadata.EntryPoint,
+        invoke_on_load: bool,
+        invoke_args: tuple[Any],
+        invoke_kwds: dict[str, Any],
+    ) -> Extension[T] | None:
+        plugin = ep.load()
         if invoke_on_load:
             obj = plugin(*invoke_args, **invoke_kwds)
         else:
             obj = None
         return Extension(ep.name, ep, plugin, obj)
 
-    def names(self):
-        "Returns the names of the discovered extensions"
+    def names(self) -> list[str]:
+        """Returns the names of the discovered extensions"""
         # We want to return the names of the extensions in the order
         # they would be used by map(), since some subclasses change
         # that order.
         return [e.name for e in self.extensions]
 
-    def map(self, func, *args, **kwds):
+    def map(
+        self,
+        func: Callable[Concatenate[Extension[T], P], U],
+        *args: P.args,
+        **kwds: P.kwargs,
+    ) -> list[U]:
         """Iterate over the extensions invoking func() for each.
 
         The signature for func() should be::
@@ -273,17 +376,19 @@ def func(ext, *args, **kwds):
         """
         if not self.extensions:
             # FIXME: Use a more specific exception class here.
-            raise NoMatches('No %s extensions found' % self.namespace)
-        response = []
+            raise NoMatches(f'No {self.namespace} extensions found')
+        response: list[U] = []
         for e in self.extensions:
-            self._invoke_one_plugin(response.append, func, e, args, kwds)
+            self._invoke_one_plugin(response.append, func, e, *args, **kwds)
         return response
 
     @staticmethod
-    def _call_extension_method(extension, method_name, *args, **kwds):
+    def _call_extension_method(
+        extension: Extension[T], /, method_name: str, *args: Any, **kwds: Any
+    ) -> Any:
         return getattr(extension.obj, method_name)(*args, **kwds)
 
-    def map_method(self, method_name, *args, **kwds):
+    def map_method(self, method_name: str, *args: Any, **kwds: Any) -> Any:
         """Iterate over the extensions invoking a method by name.
 
         This is equivalent of using :meth:`map` with func set to
@@ -302,10 +407,18 @@ def map_method(self, method_name, *args, **kwds):
         :param kwds: Keyword arguments to pass to method
         :returns: List of values returned from methods
         """
-        return self.map(self._call_extension_method,
-                        method_name, *args, **kwds)
-
-    def _invoke_one_plugin(self, response_callback, func, e, args, kwds):
+        return self.map(
+            self._call_extension_method, method_name, *args, **kwds
+        )
+
+    def _invoke_one_plugin(
+        self,
+        response_callback: Callable[..., Any],
+        func: Callable[Concatenate[Extension[T], P], U],
+        e: Extension[T],
+        *args: P.args,
+        **kwds: P.kwargs,
+    ) -> None:
         try:
             response_callback(func(e, *args, **kwds))
         except Exception as err:
@@ -315,14 +428,14 @@ def _invoke_one_plugin(self, response_callback, func, e, args, kwds):
                 LOG.error('error calling %r: %s', e.name, err)
                 LOG.exception(err)
 
-    def items(self):
+    def items(self) -> ItemsView[str, Extension[T]]:
         """Return an iterator of tuples of the form (name, extension).
 
         This is analogous to the Mapping.items() method.
         """
         return self._extensions_by_name.items()
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Extension[T]]:
         """Produce iterator for the manager.
 
         Iterating over an ExtensionManager produces the :class:`Extension`
@@ -330,15 +443,14 @@ def __iter__(self):
         """
         return iter(self.extensions)
 
-    def __getitem__(self, name):
+    def __getitem__(self, name: str) -> Extension[T]:
         """Return the named extension.
 
         Accessing an ExtensionManager as a dictionary (``em['name']``)
-        produces the :class:`Extension` instance with the
-        specified name.
+        produces the :class:`Extension` instance with the specified name.
         """
         return self._extensions_by_name[name]
 
-    def __contains__(self, name):
+    def __contains__(self, name: str) -> bool:
         """Return true if name is in list of enabled extensions."""
         return any(extension.name == name for extension in self.extensions)
diff --git a/libs/stevedore/hook.py b/libs/stevedore/hook.py
index 4225db334a..b540c7f0ea 100644
--- a/libs/stevedore/hook.py
+++ b/libs/stevedore/hook.py
@@ -10,53 +10,74 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from typing import Any
+from typing import TypeVar
+
+from .extension import ConflictResolverT
+from .extension import Extension
+from .extension import ignore_conflicts
+from .extension import OnLoadFailureCallbackT
 from .named import NamedExtensionManager
+from .named import OnMissingEntrypointsCallbackT
+
+T = TypeVar('T')
 
 
-class HookManager(NamedExtensionManager):
+class HookManager(NamedExtensionManager[T]):
     """Coordinate execution of multiple extensions using a common name.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param name: The name of the hooks to load.
-    :type name: str
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param on_load_failure_callback: Callback function that will be called when
         an entrypoint can not be loaded. The arguments that will be provided
         when this is called (when an entrypoint fails to load) are
         (manager, entrypoint, exception)
-    :type on_load_failure_callback: function
-    :param verify_requirements: Use setuptools to enforce the
-        dependencies of the plugin(s) being loaded. Defaults to False.
-    :type verify_requirements: bool
-    :type on_missing_entrypoints_callback: function
-    :param warn_on_missing_entrypoint: Flag to control whether failing
-        to load a plugin is reported via a log mess. Only applies if
-        on_missing_entrypoints_callback is None.
-    :type warn_on_missing_entrypoint: bool
-
+    :param on_missing_entrypoints_callback: Callback function that will be
+        called when one or more names cannot be found. The provided argument
+        will be a subset of the 'names' parameter.
+    :param verify_requirements: **DEPRECATED** This is a no-op and will be
+        removed in a future version.
+    :param warn_on_missing_entrypoint: **DEPRECATED** Flag to control whether
+        failing to load a plugin is reported via a log mess. Only applies if
+        on_missing_entrypoints_callback is None. Users should instead set
+        ``on_missing_entrypoints_callback`` to ``None`` if they wish to disable
+        logging.
+    :param conflict_resolver: A callable that determines what to do in the
+        event that there are multiple entrypoints in the same group with the
+        same name. This is only used if retrieving entrypoint by name.
     """
 
-    def __init__(self, namespace, name,
-                 invoke_on_load=False, invoke_args=(), invoke_kwds={},
-                 on_load_failure_callback=None,
-                 verify_requirements=False,
-                 on_missing_entrypoints_callback=None,
-                 # NOTE(dhellmann): This default is different from the
-                 # base class because for hooks it is less likely to
-                 # be an error to have no entry points present.
-                 warn_on_missing_entrypoint=False):
-        super(HookManager, self).__init__(
+    def __init__(
+        self,
+        namespace: str,
+        name: str,
+        invoke_on_load: bool = False,
+        invoke_args: tuple[Any, ...] | None = None,
+        invoke_kwds: dict[str, Any] | None = None,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        # NOTE(dhellmann): This default is different from the
+        # base class because for hooks it is less likely to
+        # be an error to have no entry points present.
+        on_missing_entrypoints_callback: (
+            OnMissingEntrypointsCallbackT | None
+        ) = None,
+        verify_requirements: bool | None = None,
+        warn_on_missing_entrypoint: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ):
+        invoke_args = () if invoke_args is None else invoke_args
+        invoke_kwds = {} if invoke_kwds is None else invoke_kwds
+
+        super().__init__(
             namespace,
             [name],
             invoke_on_load=invoke_on_load,
@@ -68,16 +89,13 @@ def __init__(self, namespace, name,
             warn_on_missing_entrypoint=warn_on_missing_entrypoint,
         )
 
-    def _init_attributes(self, namespace, names, name_order=False,
-                         propagate_map_exceptions=False,
-                         on_load_failure_callback=None):
-        super(HookManager, self)._init_attributes(
-            namespace, names,
-            propagate_map_exceptions=propagate_map_exceptions,
-            on_load_failure_callback=on_load_failure_callback)
-        self._name = names[0]
+    @property
+    def _name(self) -> str:
+        return self._names[0]
 
-    def __getitem__(self, name):
+    def __getitem__(  # type: ignore[override]
+        self, name: str
+    ) -> list[Extension[T]]:
         """Return the named extensions.
 
         Accessing a HookManager as a dictionary (``em['name']``)
diff --git a/libs/stevedore/named.py b/libs/stevedore/named.py
index 1be3922b3f..945023573a 100644
--- a/libs/stevedore/named.py
+++ b/libs/stevedore/named.py
@@ -10,150 +10,209 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from collections.abc import Callable
+from collections.abc import Iterable
+from collections.abc import Sequence
+import importlib.metadata
 import logging
+from typing import Any
+from typing import TYPE_CHECKING
+from typing import TypeVar
+import warnings
 
+from .extension import ConflictResolverT
+from .extension import Extension
 from .extension import ExtensionManager
+from .extension import ignore_conflicts
+from .extension import OnLoadFailureCallbackT
+
+if TYPE_CHECKING:
+    from typing_extensions import Self
 
 LOG = logging.getLogger(__name__)
 
+T = TypeVar('T')
+OnMissingEntrypointsCallbackT = Callable[[Iterable[str]], None]
+
+
+def warning_on_missing_entrypoint(missing_names: Iterable[str]) -> None:
+    LOG.warning('Could not load %s', ', '.join(missing_names))
+
 
-class NamedExtensionManager(ExtensionManager):
+class NamedExtensionManager(ExtensionManager[T]):
     """Loads only the named extensions.
 
     This is useful for explicitly enabling extensions in a
     configuration file, for example.
 
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param names: The names of the extensions to load.
-    :type names: list(str)
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
     :param name_order: If true, sort the loaded extensions to match the
         order used in ``names``.
-    :type name_order: bool
     :param propagate_map_exceptions: Boolean controlling whether exceptions
         are propagated up through the map call or whether they are logged and
         then ignored
-    :type propagate_map_exceptions: bool
     :param on_load_failure_callback: Callback function that will be called when
         an entrypoint can not be loaded. The arguments that will be provided
         when this is called (when an entrypoint fails to load) are
         (manager, entrypoint, exception)
-    :type on_load_failure_callback: function
     :param on_missing_entrypoints_callback: Callback function that will be
         called when one or more names cannot be found. The provided argument
         will be a subset of the 'names' parameter.
-    :type on_missing_entrypoints_callback: function
-    :param verify_requirements: Use setuptools to enforce the
-        dependencies of the plugin(s) being loaded. Defaults to False.
-    :type verify_requirements: bool
-    :param warn_on_missing_entrypoint: Flag to control whether failing
-        to load a plugin is reported via a log mess. Only applies if
-        on_missing_entrypoints_callback is None.
-    :type warn_on_missing_entrypoint: bool
-
+    :param verify_requirements: **DEPRECATED** This is a no-op and will be
+        removed in a future version.
+    :param warn_on_missing_entrypoint: **DEPRECATED** Flag to control whether
+        failing to load a plugin is reported via a log mess. Only applies if
+        on_missing_entrypoints_callback is None. Users should instead set
+        ``on_missing_entrypoints_callback`` to ``None`` if they wish to disable
+        logging.
+    :param conflict_resolver: A callable that determines what to do in the
+        event that there are multiple entrypoints in the same group with the
+        same name. This is only used if retrieving entrypoint by name.
     """
 
-    def __init__(self, namespace, names,
-                 invoke_on_load=False, invoke_args=(), invoke_kwds={},
-                 name_order=False, propagate_map_exceptions=False,
-                 on_load_failure_callback=None,
-                 on_missing_entrypoints_callback=None,
-                 verify_requirements=False,
-                 warn_on_missing_entrypoint=True):
-        self._init_attributes(
-            namespace, names, name_order=name_order,
+    def __init__(
+        self,
+        namespace: str,
+        names: Sequence[str],
+        invoke_on_load: bool = False,
+        invoke_args: tuple[Any, ...] | None = None,
+        invoke_kwds: dict[str, Any] | None = None,
+        name_order: bool = False,
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        on_missing_entrypoints_callback: (
+            OnMissingEntrypointsCallbackT | None
+        ) = warning_on_missing_entrypoint,
+        verify_requirements: bool | None = None,
+        warn_on_missing_entrypoint: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ) -> None:
+        self._names = names
+        self._missing_names: set[str] = set()
+        self._name_order = name_order
+
+        if warn_on_missing_entrypoint is not None:
+            warnings.warn(
+                "The warn_on_missing_entrypoint option is deprecated for "
+                "removal. If you wish to disable warnings, you should instead "
+                "override 'on_missing_entrypoints_callback'",
+                DeprecationWarning,
+            )
+            if not warn_on_missing_entrypoint:
+                on_missing_entrypoints_callback = None
+
+        self._on_missing_entrypoints_callback = on_missing_entrypoints_callback
+
+        super().__init__(
+            namespace,
+            invoke_on_load=invoke_on_load,
+            invoke_args=invoke_args,
+            invoke_kwds=invoke_kwds,
             propagate_map_exceptions=propagate_map_exceptions,
-            on_load_failure_callback=on_load_failure_callback)
-        extensions = self._load_plugins(invoke_on_load,
-                                        invoke_args,
-                                        invoke_kwds,
-                                        verify_requirements)
-        self._missing_names = set(names) - set([e.name for e in extensions])
-        if self._missing_names:
-            if on_missing_entrypoints_callback:
-                on_missing_entrypoints_callback(self._missing_names)
-            elif warn_on_missing_entrypoint:
-                LOG.warning('Could not load %s' %
-                            ', '.join(self._missing_names))
-        self._init_plugins(extensions)
+            on_load_failure_callback=on_load_failure_callback,
+            verify_requirements=verify_requirements,
+            conflict_resolver=conflict_resolver,
+        )
 
     @classmethod
-    def make_test_instance(cls, extensions, namespace='TESTING',
-                           propagate_map_exceptions=False,
-                           on_load_failure_callback=None,
-                           verify_requirements=False):
+    def make_test_instance(
+        cls,
+        extensions: list[Extension[T]],
+        namespace: str = 'TESTING',
+        propagate_map_exceptions: bool = False,
+        on_load_failure_callback: 'OnLoadFailureCallbackT[T] | None' = None,
+        verify_requirements: bool | None = None,
+        *,
+        conflict_resolver: 'ConflictResolverT[T]' = ignore_conflicts,
+    ) -> 'Self':
         """Construct a test NamedExtensionManager
 
         Test instances are passed a list of extensions to use rather than
         loading them from entry points.
 
         :param extensions: Pre-configured Extension instances
-        :type extensions: list of :class:`~stevedore.extension.Extension`
         :param namespace: The namespace for the manager; used only for
             identification since the extensions are passed in.
-        :type namespace: str
         :param propagate_map_exceptions: Boolean controlling whether exceptions
             are propagated up through the map call or whether they are logged
             and then ignored
-        :type propagate_map_exceptions: bool
         :param on_load_failure_callback: Callback function that will
             be called when an entrypoint can not be loaded. The
             arguments that will be provided when this is called (when
             an entrypoint fails to load) are (manager, entrypoint,
             exception)
-        :type on_load_failure_callback: function
-        :param verify_requirements: Use setuptools to enforce the
-            dependencies of the plugin(s) being loaded. Defaults to False.
-        :type verify_requirements: bool
+        :param verify_requirements: **DEPRECATED** This is a no-op and will be
+            removed in a future version.
+        :param conflict_resolver: A callable that determines what to do in the
+            event that there are multiple entrypoints in the same group with
+            the same name. This is only used if retrieving entrypoint by name.
         :return: The manager instance, initialized for testing
-
         """
+        if verify_requirements is not None:
+            warnings.warn(
+                'The verify_requirements argument is now a no-op and is '
+                'deprecated for removal. Remove the argument from calls.',
+                DeprecationWarning,
+            )
 
         o = cls.__new__(cls)
-        names = [e.name for e in extensions]
-        o._init_attributes(namespace, names,
-                           propagate_map_exceptions=propagate_map_exceptions,
-                           on_load_failure_callback=on_load_failure_callback)
+        o.namespace = namespace
+        o.propagate_map_exceptions = propagate_map_exceptions
+        o._on_load_failure_callback = on_load_failure_callback
+        o._names = [e.name for e in extensions]
+        o._missing_names = set()
+        o._name_order = False
+        o._conflict_resolver = conflict_resolver
         o._init_plugins(extensions)
         return o
 
-    def _init_attributes(self, namespace, names, name_order=False,
-                         propagate_map_exceptions=False,
-                         on_load_failure_callback=None):
-        super(NamedExtensionManager, self)._init_attributes(
-            namespace, propagate_map_exceptions=propagate_map_exceptions,
-            on_load_failure_callback=on_load_failure_callback)
+    def _init_plugins(self, extensions: list[Extension[T]]) -> None:
+        super()._init_plugins(extensions)
 
-        self._names = names
-        self._missing_names = set()
-        self._name_order = name_order
+        if self._name_order:
+            self.extensions = [
+                self[n] for n in self._names if n not in self._missing_names
+            ]
+
+    def _load_plugins(
+        self,
+        invoke_on_load: bool,
+        invoke_args: tuple[Any, ...],
+        invoke_kwds: dict[str, Any],
+    ) -> list[Extension[T]]:
+        extensions = super()._load_plugins(
+            invoke_on_load, invoke_args, invoke_kwds
+        )
 
-    def _init_plugins(self, extensions):
-        super(NamedExtensionManager, self)._init_plugins(extensions)
+        self._missing_names = set(self._names) - {e.name for e in extensions}
+        if self._missing_names and self._on_missing_entrypoints_callback:
+            self._on_missing_entrypoints_callback(self._missing_names)
 
-        if self._name_order:
-            self.extensions = [self[n] for n in self._names
-                               if n not in self._missing_names]
+        return extensions
 
-    def _load_one_plugin(self, ep, invoke_on_load, invoke_args, invoke_kwds,
-                         verify_requirements):
+    def _load_one_plugin(
+        self,
+        ep: importlib.metadata.EntryPoint,
+        invoke_on_load: bool,
+        invoke_args: tuple[Any, ...],
+        invoke_kwds: dict[str, Any],
+    ) -> Extension[T] | None:
         # Check the name before going any further to prevent
         # undesirable code from being loaded at all if we are not
         # going to use it.
         if ep.name not in self._names:
             return None
-        return super(NamedExtensionManager, self)._load_one_plugin(
-            ep, invoke_on_load, invoke_args, invoke_kwds,
-            verify_requirements,
+
+        return super()._load_one_plugin(
+            ep, invoke_on_load, invoke_args, invoke_kwds
         )
diff --git a/libs/typing_extensions-4.12.2.dist-info/REQUESTED b/libs/stevedore/py.typed
similarity index 100%
rename from libs/typing_extensions-4.12.2.dist-info/REQUESTED
rename to libs/stevedore/py.typed
diff --git a/libs/stevedore/sphinxext.py b/libs/stevedore/sphinxext.py
index 857b0cd083..20b09d6016 100644
--- a/libs/stevedore/sphinxext.py
+++ b/libs/stevedore/sphinxext.py
@@ -10,12 +10,19 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from collections.abc import Callable
+from collections.abc import Iterable
+from collections.abc import Sequence
+import importlib.metadata
 import inspect
+from typing import Any
+from typing import TypeVar
 
 from docutils import nodes
 from docutils.parsers import rst
 from docutils.parsers.rst import directives
-from docutils.statemachine import ViewList
+from docutils.statemachine import StringList
+from sphinx.application import Sphinx
 from sphinx.util import logging
 from sphinx.util.nodes import nested_parse_with_titles
 
@@ -23,21 +30,29 @@
 
 LOG = logging.getLogger(__name__)
 
+T = TypeVar('T')
 
-def _get_docstring(plugin):
+
+def _get_docstring(plugin: Callable[..., T]) -> str:
     return inspect.getdoc(plugin) or ''
 
 
-def _simple_list(mgr):
+def _simple_list(
+    mgr: extension.ExtensionManager[T],
+) -> Iterable[tuple[str, str]]:
     for name in sorted(mgr.names()):
         ext = mgr[name]
         doc = _get_docstring(ext.plugin) or '\n'
         summary = doc.splitlines()[0].strip()
-        yield ('* %s -- %s' % (ext.name, summary),
-               ext.module_name)
+        yield (f'* {ext.name} -- {summary}', ext.module_name)
 
 
-def _detailed_list(mgr, over='', under='-', titlecase=False):
+def _detailed_list(
+    mgr: extension.ExtensionManager[T],
+    over: str = '',
+    under: str = '-',
+    titlecase: bool = False,
+) -> Iterable[tuple[str, str]]:
     for name in sorted(mgr.names()):
         ext = mgr[name]
         if over:
@@ -54,9 +69,8 @@ def _detailed_list(mgr, over='', under='-', titlecase=False):
             yield (doc, ext.module_name)
         else:
             yield (
-                '.. warning:: No documentation found for {} in {}'.format(
-                    ext.name, ext.entry_point_target,
-                ),
+                f'.. warning:: No documentation found for {ext.name} in '
+                f'{ext.entry_point_target}',
                 ext.module_name,
             )
         yield ('\n', ext.module_name)
@@ -75,28 +89,35 @@ class ListPluginsDirective(rst.Directive):
 
     has_content = True
 
-    def run(self):
+    def run(self) -> Sequence[nodes.Node]:
         namespace = ' '.join(self.content).strip()
-        LOG.info('documenting plugins from %r' % namespace)
+        LOG.info('documenting plugins from %r', namespace)
         overline_style = self.options.get('overline-style', '')
         underline_style = self.options.get('underline-style', '=')
 
-        def report_load_failure(mgr, ep, err):
-            LOG.warning(u'Failed to load %s: %s' % (ep.module, err))
+        def report_load_failure(
+            mgr: extension.ExtensionManager[T],
+            ep: importlib.metadata.EntryPoint,
+            err: BaseException,
+        ) -> None:
+            LOG.warning('Failed to load %s: %s', ep.module, err)
 
+        mgr: extension.ExtensionManager[Any]
         mgr = extension.ExtensionManager(
-            namespace,
-            on_load_failure_callback=report_load_failure,
+            namespace, on_load_failure_callback=report_load_failure
         )
 
-        result = ViewList()
+        result = StringList()
 
         titlecase = 'titlecase' in self.options
 
         if 'detailed' in self.options:
             data = _detailed_list(
-                mgr, over=overline_style, under=underline_style,
-                titlecase=titlecase)
+                mgr,
+                over=overline_style,
+                under=underline_style,
+                titlecase=titlecase,
+            )
         else:
             data = _simple_list(mgr)
         for text, source in data:
@@ -111,10 +132,7 @@ def report_load_failure(mgr, ep, err):
         return node.children
 
 
-def setup(app):
+def setup(app: Sphinx) -> dict[str, Any]:
     LOG.info('loading stevedore.sphinxext')
     app.add_directive('list-plugins', ListPluginsDirective)
-    return {
-        'parallel_read_safe': True,
-        'parallel_write_safe': True,
-    }
+    return {'parallel_read_safe': True, 'parallel_write_safe': True}
diff --git a/libs/stevedore/tests/manager.py b/libs/stevedore/tests/manager.py
index 8c97a680c5..739104a941 100644
--- a/libs/stevedore/tests/manager.py
+++ b/libs/stevedore/tests/manager.py
@@ -15,12 +15,15 @@
 Extension manager used only for testing.
 """
 
+from typing import TypeVar
 import warnings
 
 from stevedore import extension
 
+T = TypeVar('T')
 
-class TestExtensionManager(extension.ExtensionManager):
+
+class TestExtensionManager(extension.ExtensionManager[T]):
     """ExtensionManager that is explicitly initialized for tests.
 
     .. deprecated:: 0.13
@@ -29,39 +32,33 @@ class TestExtensionManager(extension.ExtensionManager):
        being replaced by the test instance instead of using this class
        directly.
 
-    :param extensions: Pre-configured Extension instances to use
-                       instead of loading them from entry points.
-    :type extensions: list of :class:`~stevedore.extension.Extension`
+    :param extensions: Pre-configured Extension instances to use instead of
+        loading them from entry points.
     :param namespace: The namespace for the entry points.
-    :type namespace: str
     :param invoke_on_load: Boolean controlling whether to invoke the
         object returned by the entry point after the driver is loaded.
-    :type invoke_on_load: bool
     :param invoke_args: Positional arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_args: tuple
     :param invoke_kwds: Named arguments to pass when invoking
         the object returned by the entry point. Only used if invoke_on_load
         is True.
-    :type invoke_kwds: dict
-
     """
 
-    def __init__(self, extensions,
-                 namespace='test',
-                 invoke_on_load=False,
-                 invoke_args=(),
-                 invoke_kwds={}):
-        super(TestExtensionManager, self).__init__(namespace,
-                                                   invoke_on_load,
-                                                   invoke_args,
-                                                   invoke_kwds,
-                                                   )
+    def __init__(
+        self,
+        extensions,
+        namespace='test',
+        invoke_on_load=False,
+        invoke_args=(),
+        invoke_kwds={},
+    ):
+        super().__init__(namespace, invoke_on_load, invoke_args, invoke_kwds)
         self.extensions = extensions
         warnings.warn(
             'TestExtesionManager has been replaced by make_test_instance()',
-            DeprecationWarning)
+            DeprecationWarning,
+        )
 
     def _load_plugins(self, *args, **kwds):
         return []
diff --git a/libs/stevedore/tests/test_cache.py b/libs/stevedore/tests/test_cache.py
index 0c5af67e01..1170c5c344 100644
--- a/libs/stevedore/tests/test_cache.py
+++ b/libs/stevedore/tests/test_cache.py
@@ -10,8 +10,8 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""Tests for stevedore._cache
-"""
+"""Tests for stevedore._cache"""
+
 import sys
 
 from unittest import mock
@@ -21,7 +21,6 @@
 
 
 class TestCache(utils.TestCase):
-
     def test_disable_caching_executable(self):
         """Test caching is disabled if python interpreter is located under /tmp
         directory (Ansible)
@@ -39,7 +38,7 @@ def test_disable_caching_file(self):
         with mock.patch('os.path.isfile') as mock_path:
             mock_path.return_value = True
             sot = _cache.Cache()
-            mock_path.assert_called_with('%s/.disable' % cache_dir)
+            mock_path.assert_called_with(f'{cache_dir}/.disable')
             self.assertTrue(sot._disable_caching)
 
             mock_path.return_value = False
@@ -52,7 +51,7 @@ def test__get_data_for_path_no_write(self, mock_open, mock_mkdir):
         sot = _cache.Cache()
         sot._disable_caching = True
         mock_open.side_effect = IOError
-        sot._get_data_for_path('fake')
+        sot._get_data_for_path(('fake',))
         mock_mkdir.assert_not_called()
 
     def test__build_cacheable_data(self):
diff --git a/libs/stevedore/tests/test_callback.py b/libs/stevedore/tests/test_callback.py
index 75026f757b..d188442efa 100644
--- a/libs/stevedore/tests/test_callback.py
+++ b/libs/stevedore/tests/test_callback.py
@@ -10,11 +10,9 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""Tests for failure loading callback
-"""
-from unittest import mock
+"""Tests for failure loading callback"""
 
-from testtools.matchers import GreaterThan
+from unittest import mock
 
 from stevedore import extension
 from stevedore import named
@@ -28,18 +26,19 @@ def test_extension_failure_custom_callback(self):
         def failure_callback(manager, entrypoint, error):
             errors.append((manager, entrypoint, error))
 
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        on_load_failure_callback=
-                                        failure_callback)
+        em = extension.ExtensionManager(
+            'stevedore.test.extension',
+            invoke_on_load=True,
+            on_load_failure_callback=failure_callback,
+        )
         extensions = list(em.extensions)
-        self.assertTrue(len(extensions), GreaterThan(0))
+        self.assertGreater(len(extensions), 0)
         self.assertEqual(len(errors), 2)
         for manager, entrypoint, error in errors:
             self.assertIs(manager, em)
             self.assertIsInstance(error, (IOError, ImportError))
 
-    @mock.patch('stevedore.named.NamedExtensionManager._load_plugins')
+    @mock.patch('stevedore.extension.ExtensionManager._load_plugins')
     def test_missing_entrypoints_callback(self, load_fn):
         errors = set()
 
@@ -47,10 +46,12 @@ def callback(names):
             errors.update(names)
 
         load_fn.return_value = [
-            extension.Extension('foo', None, None, None)
+            extension.Extension('foo', None, None, None)  # type: ignore
         ]
-        named.NamedExtensionManager('stevedore.test.extension',
-                                    names=['foo', 'bar'],
-                                    invoke_on_load=True,
-                                    on_missing_entrypoints_callback=callback)
+        named.NamedExtensionManager(
+            'stevedore.test.extension',
+            names=['foo', 'bar'],
+            invoke_on_load=True,
+            on_missing_entrypoints_callback=callback,
+        )
         self.assertEqual(errors, {'bar'})
diff --git a/libs/stevedore/tests/test_dispatch.py b/libs/stevedore/tests/test_dispatch.py
index e54e4928c5..b110821009 100644
--- a/libs/stevedore/tests/test_dispatch.py
+++ b/libs/stevedore/tests/test_dispatch.py
@@ -10,74 +10,73 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from typing import Any
+
 from stevedore import dispatch
 from stevedore.tests import utils
 
 
-def check_dispatch(ep, *args, **kwds):
+def check_dispatch(ep, /, *args, **kwds):
     return ep.name == 't2'
 
 
 class TestDispatch(utils.TestCase):
-    def check_dispatch(ep, *args, **kwds):
-        return ep.name == 't2'
-
     def test_dispatch(self):
-
-        def invoke(ep, *args, **kwds):
+        def invoke(ep, /, *args, **kwds):
             return (ep.name, args, kwds)
 
-        em = dispatch.DispatchExtensionManager('stevedore.test.extension',
-                                               lambda *args, **kwds: True,
-                                               invoke_on_load=True,
-                                               invoke_args=('a',),
-                                               invoke_kwds={'b': 'B'},
-                                               )
+        em: dispatch.DispatchExtensionManager[Any]
+        em = dispatch.DispatchExtensionManager(
+            'stevedore.test.extension',
+            lambda *args, **kwds: True,
+            invoke_on_load=True,
+            invoke_args=('a',),
+            invoke_kwds={'b': 'B'},
+        )
         self.assertEqual(len(em.extensions), 2)
-        self.assertEqual(set(em.names()), set(['t1', 't2']))
+        self.assertEqual(set(em.names()), {'t1', 't2'})
 
-        results = em.map(check_dispatch,
-                         invoke,
-                         'first',
-                         named='named value',
-                         )
+        results = em.map(check_dispatch, invoke, 'first', named='named value')
         expected = [('t2', ('first',), {'named': 'named value'})]
         self.assertEqual(results, expected)
 
     def test_dispatch_map_method(self):
-        em = dispatch.DispatchExtensionManager('stevedore.test.extension',
-                                               lambda *args, **kwds: True,
-                                               invoke_on_load=True,
-                                               invoke_args=('a',),
-                                               invoke_kwds={'b': 'B'},
-                                               )
+        em: dispatch.DispatchExtensionManager[Any]
+        em = dispatch.DispatchExtensionManager(
+            'stevedore.test.extension',
+            lambda *args, **kwds: True,
+            invoke_on_load=True,
+            invoke_args=('a',),
+            invoke_kwds={'b': 'B'},
+        )
 
         results = em.map_method(check_dispatch, 'get_args_and_data', 'first')
         self.assertEqual(results, [(('a',), {'b': 'B'}, 'first')])
 
     def test_name_dispatch(self):
-
-        def invoke(ep, *args, **kwds):
+        def invoke(ep, /, *args, **kwds):
             return (ep.name, args, kwds)
 
-        em = dispatch.NameDispatchExtensionManager('stevedore.test.extension',
-                                                   lambda *args, **kwds: True,
-                                                   invoke_on_load=True,
-                                                   invoke_args=('a',),
-                                                   invoke_kwds={'b': 'B'},
-                                                   )
+        em: dispatch.DispatchExtensionManager[Any]
+        em = dispatch.NameDispatchExtensionManager(
+            'stevedore.test.extension',
+            lambda *args, **kwds: True,
+            invoke_on_load=True,
+            invoke_args=('a',),
+            invoke_kwds={'b': 'B'},
+        )
         self.assertEqual(len(em.extensions), 2)
-        self.assertEqual(set(em.names()), set(['t1', 't2']))
+        self.assertEqual(set(em.names()), {'t1', 't2'})
 
-        results = em.map(['t2'], invoke, 'first', named='named value',)
+        results = em.map(['t2'], invoke, 'first', named='named value')
         expected = [('t2', ('first',), {'named': 'named value'})]
         self.assertEqual(results, expected)
 
     def test_name_dispatch_ignore_missing(self):
-
-        def invoke(ep, *args, **kwds):
+        def invoke(ep, /, *args, **kwds):
             return (ep.name, args, kwds)
 
+        em: dispatch.DispatchExtensionManager[Any]
         em = dispatch.NameDispatchExtensionManager(
             'stevedore.test.extension',
             lambda *args, **kwds: True,
@@ -86,11 +85,12 @@ def invoke(ep, *args, **kwds):
             invoke_kwds={'b': 'B'},
         )
 
-        results = em.map(['t3', 't1'], invoke, 'first', named='named value',)
+        results = em.map(['t3', 't1'], invoke, 'first', named='named value')
         expected = [('t1', ('first',), {'named': 'named value'})]
         self.assertEqual(results, expected)
 
     def test_name_dispatch_map_method(self):
+        em: dispatch.DispatchExtensionManager[Any]
         em = dispatch.NameDispatchExtensionManager(
             'stevedore.test.extension',
             lambda *args, **kwds: True,
diff --git a/libs/stevedore/tests/test_driver.py b/libs/stevedore/tests/test_driver.py
index 622c1718e8..0af7d19415 100644
--- a/libs/stevedore/tests/test_driver.py
+++ b/libs/stevedore/tests/test_driver.py
@@ -10,10 +10,10 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""Tests for stevedore.extension
-"""
+"""Tests for stevedore.extension"""
 
-import importlib.metadata as importlib_metadata
+import importlib.metadata
+from typing import Any
 
 from stevedore import driver
 from stevedore import exception
@@ -24,26 +24,33 @@
 
 class TestCallback(utils.TestCase):
     def test_detect_plugins(self):
+        em: driver.DriverManager[Any]
         em = driver.DriverManager('stevedore.test.extension', 't1')
         names = sorted(em.names())
         self.assertEqual(names, ['t1'])
 
     def test_call(self):
-        def invoke(ext, *args, **kwds):
+        def invoke(ext, /, *args, **kwds):
             return (ext.name, args, kwds)
+
+        em: driver.DriverManager[Any]
         em = driver.DriverManager('stevedore.test.extension', 't1')
         result = em(invoke, 'a', b='C')
         self.assertEqual(result, ('t1', ('a',), {'b': 'C'}))
 
     def test_driver_property_not_invoked_on_load(self):
-        em = driver.DriverManager('stevedore.test.extension', 't1',
-                                  invoke_on_load=False)
+        em: driver.DriverManager[Any]
+        em = driver.DriverManager(
+            'stevedore.test.extension', 't1', invoke_on_load=False
+        )
         d = em.driver
         self.assertIs(d, test_extension.FauxExtension)
 
     def test_driver_property_invoked_on_load(self):
-        em = driver.DriverManager('stevedore.test.extension', 't1',
-                                  invoke_on_load=True)
+        em: driver.DriverManager[Any]
+        em = driver.DriverManager(
+            'stevedore.test.extension', 't1', invoke_on_load=True
+        )
         d = em.driver
         self.assertIsInstance(d, test_extension.FauxExtension)
 
@@ -51,8 +58,9 @@ def test_no_drivers(self):
         try:
             driver.DriverManager('stevedore.test.extension.none', 't1')
         except exception.NoMatches as err:
-            self.assertIn("No 'stevedore.test.extension.none' driver found",
-                          str(err))
+            self.assertIn(
+                "No 'stevedore.test.extension.none' driver found", str(err)
+            )
 
     def test_bad_driver(self):
         try:
@@ -65,19 +73,21 @@ def test_bad_driver(self):
     def test_multiple_drivers(self):
         # The idea for this test was contributed by clayg:
         # https://gist.github.com/clayg/6311348
-        extensions = [
+        extensions: list[extension.Extension[Any]] = [
             extension.Extension(
                 'backend',
-                importlib_metadata.EntryPoint(
-                    'backend', 'pkg1:driver', 'backend'),
-                'pkg backend',
+                importlib.metadata.EntryPoint(
+                    'backend', 'pkg1:driver', 'backend'
+                ),
+                lambda x: None,
                 None,
             ),
             extension.Extension(
                 'backend',
-                importlib_metadata.EntryPoint(
-                    'backend', 'pkg2:driver', 'backend'),
-                'pkg backend',
+                importlib.metadata.EntryPoint(
+                    'backend', 'pkg2:driver', 'backend'
+                ),
+                lambda x: None,
                 None,
             ),
         ]
diff --git a/libs/stevedore/tests/test_enabled.py b/libs/stevedore/tests/test_enabled.py
index 32cd1992e7..784d0c8279 100644
--- a/libs/stevedore/tests/test_enabled.py
+++ b/libs/stevedore/tests/test_enabled.py
@@ -18,6 +18,7 @@ class TestEnabled(utils.TestCase):
     def test_enabled(self):
         def check_enabled(ep):
             return ep.name == 't2'
+
         em = enabled.EnabledExtensionManager(
             'stevedore.test.extension',
             check_enabled,
@@ -31,6 +32,7 @@ def check_enabled(ep):
     def test_enabled_after_load(self):
         def check_enabled(ext):
             return ext.obj and ext.name == 't2'
+
         em = enabled.EnabledExtensionManager(
             'stevedore.test.extension',
             check_enabled,
diff --git a/libs/stevedore/tests/test_example_fields.py b/libs/stevedore/tests/test_example_fields.py
index 757917c960..8eacfd8b32 100644
--- a/libs/stevedore/tests/test_example_fields.py
+++ b/libs/stevedore/tests/test_example_fields.py
@@ -10,8 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""Tests for stevedore.example2.fields
-"""
+"""Tests for stevedore.example2.fields"""
 
 from stevedore.example2 import fields
 from stevedore.tests import utils
@@ -21,21 +20,20 @@ class TestExampleFields(utils.TestCase):
     def test_simple_items(self):
         f = fields.FieldList(100)
         text = ''.join(f.format({'a': 'A', 'b': 'B'}))
-        expected = '\n'.join([
-            ': a : A',
-            ': b : B',
-            '',
-        ])
+        expected = '\n'.join([': a : A', ': b : B', ''])
         self.assertEqual(text, expected)
 
     def test_long_item(self):
         f = fields.FieldList(25)
-        text = ''.join(f.format({'name':
-                       'a value longer than the allowed width'}))
-        expected = '\n'.join([
-            ': name : a value longer',
-            '    than the allowed',
-            '    width',
-            '',
-        ])
+        text = ''.join(
+            f.format({'name': 'a value longer than the allowed width'})
+        )
+        expected = '\n'.join(
+            [
+                ': name : a value longer',
+                '    than the allowed',
+                '    width',
+                '',
+            ]
+        )
         self.assertEqual(text, expected)
diff --git a/libs/stevedore/tests/test_example_simple.py b/libs/stevedore/tests/test_example_simple.py
index 382ed89962..0025753660 100644
--- a/libs/stevedore/tests/test_example_simple.py
+++ b/libs/stevedore/tests/test_example_simple.py
@@ -10,8 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""Tests for stevedore.example.simple
-"""
+"""Tests for stevedore.example.simple"""
 
 from stevedore.example import simple
 from stevedore.tests import utils
@@ -21,9 +20,5 @@ class TestExampleSimple(utils.TestCase):
     def test_simple_items(self):
         f = simple.Simple(100)
         text = ''.join(f.format({'a': 'A', 'b': 'B'}))
-        expected = '\n'.join([
-            'a = A',
-            'b = B',
-            '',
-        ])
+        expected = '\n'.join(['a = A', 'b = B', ''])
         self.assertEqual(text, expected)
diff --git a/libs/stevedore/tests/test_extension.py b/libs/stevedore/tests/test_extension.py
index e8c64c29b3..dc2e9e9e80 100644
--- a/libs/stevedore/tests/test_extension.py
+++ b/libs/stevedore/tests/test_extension.py
@@ -10,12 +10,13 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-"""Tests for stevedore.extension
-"""
+"""Tests for stevedore.extension"""
 
-import importlib.metadata as importlib_metadata
+import importlib.metadata
 import operator
+from typing import Any
 from unittest import mock
+import warnings
 
 from stevedore import exception
 from stevedore import extension
@@ -26,7 +27,7 @@
 WORKING_NAMES = ['t1', 't2']
 
 
-class FauxExtension(object):
+class FauxExtension:
     def __init__(self, *args, **kwds):
         self.args = args
         self.kwds = kwds
@@ -35,40 +36,47 @@ def get_args_and_data(self, data):
         return self.args, self.kwds, data
 
 
-class BrokenExtension(object):
+class BrokenExtension:
     def __init__(self, *args, **kwds):
-        raise IOError("Did not create")
+        raise OSError("Did not create")
 
 
 class TestCallback(utils.TestCase):
     def test_detect_plugins(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         names = sorted(em.names())
         self.assertEqual(names, ALL_NAMES)
 
     def test_get_by_name(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         e = em['t1']
         self.assertEqual(e.name, 't1')
 
     def test_list_entry_points(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         n = em.list_entry_points()
-        self.assertEqual(set(['e1', 'e2', 't1', 't2']),
-                         set(map(operator.attrgetter("name"), n)))
+        self.assertEqual(
+            {'e1', 'e2', 't1', 't2'}, set(map(operator.attrgetter("name"), n))
+        )
         self.assertEqual(4, len(n))
 
     def test_list_entry_points_names(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         names = em.entry_points_names()
-        self.assertEqual(set(['e1', 'e2', 't1', 't2']), set(names))
+        self.assertEqual({'e1', 'e2', 't1', 't2'}, set(names))
         self.assertEqual(4, len(names))
 
     def test_contains_by_name(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         self.assertIn('t1', em, True)
 
     def test_get_by_name_missing(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         try:
             em['t3']
@@ -80,8 +88,10 @@ def test_get_by_name_missing(self):
     def test_load_multiple_times_entry_points(self):
         # We expect to get the same EntryPoint object because we save them
         # in the cache.
+        em1: extension.ExtensionManager[Any]
         em1 = extension.ExtensionManager('stevedore.test.extension')
         eps1 = [ext.entry_point for ext in em1]
+        em2: extension.ExtensionManager[Any]
         em2 = extension.ExtensionManager('stevedore.test.extension')
         eps2 = [ext.entry_point for ext in em2]
         self.assertIs(eps1[0], eps2[0])
@@ -89,8 +99,10 @@ def test_load_multiple_times_entry_points(self):
     def test_load_multiple_times_plugins(self):
         # We expect to get the same plugin object (module or class)
         # because the underlying import machinery will cache the values.
+        em1: extension.ExtensionManager[Any]
         em1 = extension.ExtensionManager('stevedore.test.extension')
         plugins1 = [ext.plugin for ext in em1]
+        em2: extension.ExtensionManager[Any]
         em2 = extension.ExtensionManager('stevedore.test.extension')
         plugins2 = [ext.plugin for ext in em2]
         self.assertIs(plugins1[0], plugins2[0])
@@ -101,48 +113,56 @@ def test_use_cache(self):
         # to find the plugins.
         cache = extension.ExtensionManager.ENTRY_POINT_CACHE
         cache['stevedore.test.faux'] = []
-        with mock.patch('stevedore._cache.get_group_all',
-                        side_effect=
-                        AssertionError('called get_group_all')):
+        with mock.patch(
+            'stevedore._cache.get_group_all',
+            side_effect=AssertionError('called get_group_all'),
+        ):
+            em: extension.ExtensionManager[Any]
             em = extension.ExtensionManager('stevedore.test.faux')
             names = em.names()
         self.assertEqual(names, [])
 
     def test_iterable(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
         names = sorted(e.name for e in em)
         self.assertEqual(names, ALL_NAMES)
 
     def test_invoke_on_load(self):
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        invoke_args=('a',),
-                                        invoke_kwds={'b': 'B'},
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension',
+            invoke_on_load=True,
+            invoke_args=('a',),
+            invoke_kwds={'b': 'B'},
+        )
         self.assertEqual(len(em.extensions), 2)
         for e in em.extensions:
+            assert e.obj is not None
             self.assertEqual(e.obj.args, ('a',))
             self.assertEqual(e.obj.kwds, {'b': 'B'})
 
     def test_map_return_values(self):
-        def mapped(ext, *args, **kwds):
+        def mapped(ext, /, *args, **kwds):
             return ext.name
 
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension', invoke_on_load=True
+        )
         results = em.map(mapped)
         self.assertEqual(sorted(results), WORKING_NAMES)
 
     def test_map_arguments(self):
         objs = []
 
-        def mapped(ext, *args, **kwds):
+        def mapped(ext, /, *args, **kwds):
             objs.append((ext, args, kwds))
 
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension', invoke_on_load=True
+        )
         em.map(mapped, 1, 2, a='A', b='B')
         self.assertEqual(len(objs), 2)
         names = sorted([o[0].name for o in objs])
@@ -152,23 +172,26 @@ def mapped(ext, *args, **kwds):
             self.assertEqual(o[2], {'a': 'A', 'b': 'B'})
 
     def test_map_eats_errors(self):
-        def mapped(ext, *args, **kwds):
+        def mapped(ext, /, *args, **kwds):
             raise RuntimeError('hard coded error')
 
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension', invoke_on_load=True
+        )
         results = em.map(mapped, 1, 2, a='A', b='B')
         self.assertEqual(results, [])
 
     def test_map_propagate_exceptions(self):
-        def mapped(ext, *args, **kwds):
+        def mapped(ext, /, *args, **kwds):
             raise RuntimeError('hard coded error')
 
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        propagate_map_exceptions=True
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension',
+            invoke_on_load=True,
+            propagate_map_exceptions=True,
+        )
 
         try:
             em.map(mapped, 1, 2, a='A', b='B')
@@ -179,86 +202,159 @@ def mapped(ext, *args, **kwds):
     def test_map_errors_when_no_plugins(self):
         expected_str = 'No stevedore.test.extension.none extensions found'
 
-        def mapped(ext, *args, **kwds):
+        def mapped(ext, /, *args, **kwds):
             pass
 
-        em = extension.ExtensionManager('stevedore.test.extension.none',
-                                        invoke_on_load=True,
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension.none', invoke_on_load=True
+        )
         try:
             em.map(mapped, 1, 2, a='A', b='B')
         except exception.NoMatches as err:
             self.assertEqual(expected_str, str(err))
 
     def test_map_method(self):
-        em = extension.ExtensionManager('stevedore.test.extension',
-                                        invoke_on_load=True,
-                                        )
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager(
+            'stevedore.test.extension', invoke_on_load=True
+        )
 
         result = em.map_method('get_args_and_data', 42)
-        self.assertEqual(set(r[2] for r in result), set([42]))
+        self.assertEqual({r[2] for r in result}, {42})
 
     def test_items(self):
+        em: extension.ExtensionManager[Any]
         em = extension.ExtensionManager('stevedore.test.extension')
-        expected_output = set([(name, em[name]) for name in ALL_NAMES])
+        expected_output = {(name, em[name]) for name in ALL_NAMES}
         self.assertEqual(expected_output, set(em.items()))
 
 
-class TestLoadRequirementsNewSetuptools(utils.TestCase):
-    # setuptools 11.3 and later
+class TestConflictResolution(utils.TestCase):
+    def test_ignore_conflicts(self):
+        """Test that ignore_conflicts logs a warning when conflicts exist."""
+        extensions = [
+            extension.Extension(
+                'conflict',
+                importlib.metadata.EntryPoint(
+                    'conflict', 'module1:Class1', 'test.group'
+                ),
+                type('TestClass1', (), {}),
+                None,
+            ),
+            extension.Extension(
+                'conflict',
+                importlib.metadata.EntryPoint(
+                    'conflict', 'module2:Class2', 'test.group'
+                ),
+                type('TestClass2', (), {}),
+                None,
+            ),
+        ]
+
+        with self.assertLogs('stevedore.extension', level='WARNING') as log:
+            result = extension.ignore_conflicts(
+                'test.group', 'conflict', extensions
+            )
+
+        self.assertIs(result, extensions[-1])
+        self.assertEqual(len(log.records), 1)
+        warning_msg = log.records[0].getMessage()
+        self.assertIn("multiple implementations found", warning_msg)
+        self.assertIn("'conflict' extension", warning_msg)
+        self.assertIn("test.group namespace", warning_msg)
+
+    def test_error_on_conflict(self):
+        """Test error_on_conflict raises MultipleMatches exception."""
+        extensions = [
+            extension.Extension(
+                'conflict',
+                importlib.metadata.EntryPoint(
+                    'conflict', 'module1:Class1', 'test.group'
+                ),
+                type('TestClass1', (), {}),
+                None,
+            ),
+            extension.Extension(
+                'conflict',
+                importlib.metadata.EntryPoint(
+                    'conflict', 'module2:Class2', 'test.group'
+                ),
+                type('TestClass2', (), {}),
+                None,
+            ),
+        ]
 
-    def setUp(self):
-        super(TestLoadRequirementsNewSetuptools, self).setUp()
-        self.mock_ep = mock.Mock(spec=['require', 'resolve', 'load', 'name'])
-        self.em = extension.ExtensionManager.make_test_instance([])
+        with self.assertRaises(exception.MultipleMatches) as cm:
+            extension.error_on_conflict('test.group', 'conflict', extensions)
 
-    def test_verify_requirements(self):
-        self.em._load_one_plugin(self.mock_ep, False, (), {},
-                                 verify_requirements=True)
-        self.mock_ep.require.assert_called_once_with()
-        self.mock_ep.resolve.assert_called_once_with()
+        error_msg = str(cm.exception)
+        self.assertIn("multiple implementations found", error_msg)
+        self.assertIn("'conflict' command", error_msg)
+        self.assertIn("test.group namespace", error_msg)
 
-    def test_no_verify_requirements(self):
-        self.em._load_one_plugin(self.mock_ep, False, (), {},
-                                 verify_requirements=False)
-        self.assertEqual(0, self.mock_ep.require.call_count)
-        self.mock_ep.resolve.assert_called_once_with()
+    def test_custom_conflict_resolver(self):
+        """Test using a custom conflict resolver function."""
 
+        def first_resolver(namespace, name, extensions):
+            return extensions[0]
 
-class TestLoadRequirementsOldSetuptools(utils.TestCase):
-    # Before setuptools 11.3
+        ext1 = extension.Extension(
+            'test',
+            importlib.metadata.EntryPoint(
+                'test', 'module1:Class1', 'test.group'
+            ),
+            type('TestClass1', (), {}),
+            None,
+        )
+        ext2 = extension.Extension(
+            'test',
+            importlib.metadata.EntryPoint(
+                'test', 'module2:Class2', 'test.group'
+            ),
+            type('TestClass2', (), {}),
+            None,
+        )
 
-    def setUp(self):
-        super(TestLoadRequirementsOldSetuptools, self).setUp()
-        self.mock_ep = mock.Mock(spec=['load', 'name'])
-        self.em = extension.ExtensionManager.make_test_instance([])
+        em = extension.ExtensionManager.make_test_instance(
+            [ext1, ext2], conflict_resolver=first_resolver
+        )
 
-    def test_verify_requirements(self):
-        self.em._load_one_plugin(self.mock_ep, False, (), {},
-                                 verify_requirements=True)
-        self.mock_ep.load.assert_called_once_with()
+        # Should get the first extension when accessing by name
+        result = em['test']
+        self.assertIs(result, ext1)
 
-    def test_no_verify_requirements(self):
-        self.em._load_one_plugin(self.mock_ep, False, (), {},
-                                 verify_requirements=False)
-        self.mock_ep.load.assert_called_once_with()
 
+class TestDeprecations(utils.TestCase):
+    def test_verify_requirements(self):
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter('always')
+            extension.ExtensionManager.make_test_instance(
+                [], verify_requirements=True
+            )
+
+        self.assertEqual(1, len(w))
+        self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
+        self.assertIn(
+            'The verify_requirements argument is now a no-op',
+            str(w[-1].message),
+        )
 
-class TestExtensionProperties(utils.TestCase):
 
+class TestExtensionProperties(utils.TestCase):
     def setUp(self):
         self.ext1 = extension.Extension(
             'name',
-            importlib_metadata.EntryPoint(
-                'name', 'module.name:attribute.name [extra]', 'group_name',
+            importlib.metadata.EntryPoint(
+                'name', 'module.name:attribute.name [extra]', 'group_name'
             ),
             mock.Mock(),
             None,
         )
         self.ext2 = extension.Extension(
             'name',
-            importlib_metadata.EntryPoint(
-                'name', 'module:attribute', 'group_name',
+            importlib.metadata.EntryPoint(
+                'name', 'module:attribute', 'group_name'
             ),
             mock.Mock(),
             None,
@@ -273,7 +369,7 @@ def test_attr(self):
         self.assertEqual('attribute', self.ext2.attr)
 
     def test_entry_point_target(self):
-        self.assertEqual('module.name:attribute.name [extra]',
-                         self.ext1.entry_point_target)
-        self.assertEqual('module:attribute',
-                         self.ext2.entry_point_target)
+        self.assertEqual(
+            'module.name:attribute.name [extra]', self.ext1.entry_point_target
+        )
+        self.assertEqual('module:attribute', self.ext2.entry_point_target)
diff --git a/libs/stevedore/tests/test_hook.py b/libs/stevedore/tests/test_hook.py
index 5741bb9fdf..5edeaba19d 100644
--- a/libs/stevedore/tests/test_hook.py
+++ b/libs/stevedore/tests/test_hook.py
@@ -10,12 +10,15 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from typing import Any
+
 from stevedore import hook
 from stevedore.tests import utils
 
 
 class TestHook(utils.TestCase):
     def test_hook(self):
+        em: hook.HookManager[Any]
         em = hook.HookManager(
             'stevedore.test.extension',
             't1',
@@ -27,6 +30,7 @@ def test_hook(self):
         self.assertEqual(em.names(), ['t1'])
 
     def test_get_by_name(self):
+        em: hook.HookManager[Any]
         em = hook.HookManager(
             'stevedore.test.extension',
             't1',
@@ -40,6 +44,7 @@ def test_get_by_name(self):
         self.assertEqual(e.name, 't1')
 
     def test_get_by_name_missing(self):
+        em: hook.HookManager[Any]
         em = hook.HookManager(
             'stevedore.test.extension',
             't1',
diff --git a/libs/stevedore/tests/test_named.py b/libs/stevedore/tests/test_named.py
index d41dc2e596..108b2503a7 100644
--- a/libs/stevedore/tests/test_named.py
+++ b/libs/stevedore/tests/test_named.py
@@ -10,6 +10,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from typing import Any
 from unittest import mock
 
 from stevedore import named
@@ -18,6 +19,7 @@
 
 class TestNamed(utils.TestCase):
     def test_named(self):
+        em: named.NamedExtensionManager[Any]
         em = named.NamedExtensionManager(
             'stevedore.test.extension',
             names=['t1'],
@@ -37,6 +39,7 @@ def test_enabled_before_load(self):
         init_name = 'stevedore.tests.test_extension.FauxExtension.__init__'
         with mock.patch(init_name) as m:
             m.side_effect = AssertionError
+            em: named.NamedExtensionManager[Any]
             em = named.NamedExtensionManager(
                 'stevedore.test.extension',
                 # Look for an extension that does not exist so the
@@ -47,29 +50,27 @@ def test_enabled_before_load(self):
                 invoke_kwds={'b': 'B'},
             )
             actual = em.names()
-            self.assertEqual(actual, [])
+        self.assertEqual(actual, [])
 
     def test_extensions_listed_in_name_order(self):
         # Since we don't know the "natural" order of the extensions, run
         # the test both ways: if the sorting is broken, one of them will
         # fail
+        em: named.NamedExtensionManager[Any]
         em = named.NamedExtensionManager(
-            'stevedore.test.extension',
-            names=['t1', 't2'],
-            name_order=True
+            'stevedore.test.extension', names=['t1', 't2'], name_order=True
         )
         actual = em.names()
         self.assertEqual(actual, ['t1', 't2'])
 
         em = named.NamedExtensionManager(
-            'stevedore.test.extension',
-            names=['t2', 't1'],
-            name_order=True
+            'stevedore.test.extension', names=['t2', 't1'], name_order=True
         )
         actual = em.names()
         self.assertEqual(actual, ['t2', 't1'])
 
     def test_load_fail_ignored_when_sorted(self):
+        em: named.NamedExtensionManager[Any]
         em = named.NamedExtensionManager(
             'stevedore.test.extension',
             names=['e1', 't2', 'e2', 't1'],
diff --git a/libs/stevedore/tests/test_sphinxext.py b/libs/stevedore/tests/test_sphinxext.py
index 2315c4eb98..8fe49e374d 100644
--- a/libs/stevedore/tests/test_sphinxext.py
+++ b/libs/stevedore/tests/test_sphinxext.py
@@ -9,10 +9,10 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-"""Tests for the sphinx extension
-"""
 
-import importlib.metadata as importlib_metadata
+"""Tests for the sphinx extension"""
+
+import importlib.metadata
 
 from stevedore import extension
 from stevedore import sphinxext
@@ -24,16 +24,13 @@ def inner():
         pass
 
     inner.__doc__ = docstring
-    m1 = importlib_metadata.EntryPoint(
-        name, '{}_module:{}'.format(name, name), 'group',
-    )
+    m1 = importlib.metadata.EntryPoint(name, f'{name}_module:{name}', 'group')
     return extension.Extension(name, m1, inner, None)
 
 
 class TestSphinxExt(utils.TestCase):
-
     def setUp(self):
-        super(TestSphinxExt, self).setUp()
+        super().setUp()
         self.exts = [
             _make_ext('test1', 'One-line docstring'),
             _make_ext('test2', 'Multi-line docstring\n\nAnother para'),
@@ -54,12 +51,7 @@ def test_simple_list_no_docstring(self):
         ext = [_make_ext('nodoc', None)]
         em = extension.ExtensionManager.make_test_instance(ext)
         results = list(sphinxext._simple_list(em))
-        self.assertEqual(
-            [
-                ('* nodoc -- ', 'nodoc_module'),
-            ],
-            results,
-        )
+        self.assertEqual([('* nodoc -- ', 'nodoc_module')], results)
 
     def test_detailed_list(self):
         results = list(sphinxext._detailed_list(self.em))
@@ -108,9 +100,13 @@ def test_detailed_list_no_docstring(self):
                 ('nodoc', 'nodoc_module'),
                 ('-----', 'nodoc_module'),
                 ('\n', 'nodoc_module'),
-                (('.. warning:: No documentation found for '
-                 'nodoc in nodoc_module:nodoc'),
-                 'nodoc_module'),
+                (
+                    (
+                        '.. warning:: No documentation found for '
+                        'nodoc in nodoc_module:nodoc'
+                    ),
+                    'nodoc_module',
+                ),
                 ('\n', 'nodoc_module'),
             ],
             results,
diff --git a/libs/stevedore/tests/test_test_manager.py b/libs/stevedore/tests/test_test_manager.py
index 4cb79b4f6d..13ba04a52a 100644
--- a/libs/stevedore/tests/test_test_manager.py
+++ b/libs/stevedore/tests/test_test_manager.py
@@ -10,82 +10,100 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
+from typing import Any
 from unittest.mock import Mock
 from unittest.mock import sentinel
 
-from stevedore.dispatch import DispatchExtensionManager
-from stevedore.dispatch import NameDispatchExtensionManager
-from stevedore.extension import Extension
+from stevedore import dispatch
+from stevedore import driver
+from stevedore import enabled
+from stevedore import extension
+from stevedore import hook
+from stevedore import named
 from stevedore.tests import utils
 
-from stevedore import DriverManager
-from stevedore import EnabledExtensionManager
-from stevedore import ExtensionManager
-from stevedore import HookManager
-from stevedore import NamedExtensionManager
 
-
-test_extension = Extension('test_extension', None, None, None)
-test_extension2 = Extension('another_one', None, None, None)
+test_extension = extension.Extension(
+    'test_extension',
+    None,  # type: ignore
+    None,  # type: ignore
+    None,
+)
+test_extension2 = extension.Extension(
+    'another_one',
+    None,  # type: ignore
+    None,  # type: ignore
+    None,
+)
 
 mock_entry_point = Mock(module_name='test.extension', attrs=['obj'])
-a_driver = Extension('test_driver', mock_entry_point, sentinel.driver_plugin,
-                     sentinel.driver_obj)
+a_driver = extension.Extension(
+    'test_driver',
+    mock_entry_point,
+    sentinel.driver_plugin,
+    sentinel.driver_obj,
+)
 
 
 # base ExtensionManager
 class TestTestManager(utils.TestCase):
     def test_instance_should_use_supplied_extensions(self):
         extensions = [test_extension, test_extension2]
-        em = ExtensionManager.make_test_instance(extensions)
+        em = extension.ExtensionManager.make_test_instance(extensions)
         self.assertEqual(extensions, em.extensions)
 
     def test_instance_should_have_default_namespace(self):
-        em = ExtensionManager.make_test_instance([])
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager.make_test_instance([])
         self.assertEqual(em.namespace, 'TESTING')
 
     def test_instance_should_use_supplied_namespace(self):
         namespace = 'testing.1.2.3'
-        em = ExtensionManager.make_test_instance([], namespace=namespace)
+        em: extension.ExtensionManager[Any]
+        em = extension.ExtensionManager.make_test_instance(
+            [], namespace=namespace
+        )
         self.assertEqual(namespace, em.namespace)
 
     def test_extension_name_should_be_listed(self):
-        em = ExtensionManager.make_test_instance([test_extension])
+        em = extension.ExtensionManager.make_test_instance([test_extension])
         self.assertIn(test_extension.name, em.names())
 
     def test_iterator_should_yield_extension(self):
-        em = ExtensionManager.make_test_instance([test_extension])
+        em = extension.ExtensionManager.make_test_instance([test_extension])
         self.assertEqual(test_extension, next(iter(em)))
 
     def test_manager_should_allow_name_access(self):
-        em = ExtensionManager.make_test_instance([test_extension])
+        em = extension.ExtensionManager.make_test_instance([test_extension])
         self.assertEqual(test_extension, em[test_extension.name])
 
     def test_manager_should_call(self):
-        em = ExtensionManager.make_test_instance([test_extension])
+        em = extension.ExtensionManager.make_test_instance([test_extension])
         func = Mock()
         em.map(func)
         func.assert_called_once_with(test_extension)
 
     def test_manager_should_call_all(self):
-        em = ExtensionManager.make_test_instance([test_extension2,
-                                                  test_extension])
+        em = extension.ExtensionManager.make_test_instance(
+            [test_extension2, test_extension]
+        )
         func = Mock()
         em.map(func)
         func.assert_any_call(test_extension2)
         func.assert_any_call(test_extension)
 
     def test_manager_return_values(self):
-        def mapped(ext, *args, **kwds):
+        def mapped(ext, /, *args, **kwds):
             return ext.name
 
-        em = ExtensionManager.make_test_instance([test_extension2,
-                                                  test_extension])
+        em = extension.ExtensionManager.make_test_instance(
+            [test_extension2, test_extension]
+        )
         results = em.map(mapped)
         self.assertEqual(sorted(results), ['another_one', 'test_extension'])
 
     def test_manager_should_eat_exceptions(self):
-        em = ExtensionManager.make_test_instance([test_extension])
+        em = extension.ExtensionManager.make_test_instance([test_extension])
 
         func = Mock(side_effect=RuntimeError('hard coded error'))
 
@@ -93,128 +111,151 @@ def test_manager_should_eat_exceptions(self):
         self.assertEqual(results, [])
 
     def test_manager_should_propagate_exceptions(self):
-        em = ExtensionManager.make_test_instance([test_extension],
-                                                 propagate_map_exceptions=True)
-        self.skipTest('Skipping temporarily')
+        em = extension.ExtensionManager.make_test_instance(
+            [test_extension], propagate_map_exceptions=True
+        )
         func = Mock(side_effect=RuntimeError('hard coded error'))
-        em.map(func, 1, 2, a='A', b='B')
+        self.assertRaises(RuntimeError, em.map, func, 1, 2, a='A', b='B')
 
     # NamedExtensionManager
     def test_named_manager_should_use_supplied_extensions(self):
         extensions = [test_extension, test_extension2]
-        em = NamedExtensionManager.make_test_instance(extensions)
+        em = named.NamedExtensionManager.make_test_instance(extensions)
         self.assertEqual(extensions, em.extensions)
 
     def test_named_manager_should_have_default_namespace(self):
-        em = NamedExtensionManager.make_test_instance([])
+        em: named.NamedExtensionManager[Any]
+        em = named.NamedExtensionManager.make_test_instance([])
         self.assertEqual(em.namespace, 'TESTING')
 
     def test_named_manager_should_use_supplied_namespace(self):
         namespace = 'testing.1.2.3'
-        em = NamedExtensionManager.make_test_instance([], namespace=namespace)
+        em: named.NamedExtensionManager[Any]
+        em = named.NamedExtensionManager.make_test_instance(
+            [], namespace=namespace
+        )
         self.assertEqual(namespace, em.namespace)
 
     def test_named_manager_should_populate_names(self):
         extensions = [test_extension, test_extension2]
-        em = NamedExtensionManager.make_test_instance(extensions)
+        em = named.NamedExtensionManager.make_test_instance(extensions)
         self.assertEqual(em.names(), ['test_extension', 'another_one'])
 
     # HookManager
     def test_hook_manager_should_use_supplied_extensions(self):
         extensions = [test_extension, test_extension2]
-        em = HookManager.make_test_instance(extensions)
+        em = hook.HookManager.make_test_instance(extensions)
         self.assertEqual(extensions, em.extensions)
 
     def test_hook_manager_should_be_first_extension_name(self):
         extensions = [test_extension, test_extension2]
-        em = HookManager.make_test_instance(extensions)
+        em = hook.HookManager.make_test_instance(extensions)
         # This will raise KeyError if the names don't match
-        assert (em[test_extension.name])
+        assert em[test_extension.name]
 
     def test_hook_manager_should_have_default_namespace(self):
-        em = HookManager.make_test_instance([test_extension])
+        em = hook.HookManager.make_test_instance([test_extension])
         self.assertEqual(em.namespace, 'TESTING')
 
     def test_hook_manager_should_use_supplied_namespace(self):
         namespace = 'testing.1.2.3'
-        em = HookManager.make_test_instance([test_extension],
-                                            namespace=namespace)
+        em = hook.HookManager.make_test_instance(
+            [test_extension], namespace=namespace
+        )
         self.assertEqual(namespace, em.namespace)
 
     def test_hook_manager_should_return_named_extensions(self):
-        hook1 = Extension('captain', None, None, None)
-        hook2 = Extension('captain', None, None, None)
-        em = HookManager.make_test_instance([hook1, hook2])
+        hook1 = extension.Extension(
+            'captain',
+            None,  # type: ignore
+            None,  # type: ignore
+            None,
+        )
+        hook2 = extension.Extension(
+            'captain',
+            None,  # type: ignore
+            None,  # type: ignore
+            None,
+        )
+        em = hook.HookManager.make_test_instance([hook1, hook2])
         self.assertEqual([hook1, hook2], em['captain'])
 
     # DriverManager
     def test_driver_manager_should_use_supplied_extension(self):
-        em = DriverManager.make_test_instance(a_driver)
+        em = driver.DriverManager.make_test_instance(a_driver)
         self.assertEqual([a_driver], em.extensions)
 
     def test_driver_manager_should_have_default_namespace(self):
-        em = DriverManager.make_test_instance(a_driver)
+        em = driver.DriverManager.make_test_instance(a_driver)
         self.assertEqual(em.namespace, 'TESTING')
 
     def test_driver_manager_should_use_supplied_namespace(self):
         namespace = 'testing.1.2.3'
-        em = DriverManager.make_test_instance(a_driver, namespace=namespace)
+        em = driver.DriverManager.make_test_instance(
+            a_driver, namespace=namespace
+        )
         self.assertEqual(namespace, em.namespace)
 
     def test_instance_should_use_driver_name(self):
-        em = DriverManager.make_test_instance(a_driver)
+        em = driver.DriverManager.make_test_instance(a_driver)
         self.assertEqual(['test_driver'], em.names())
 
     def test_instance_call(self):
-        def invoke(ext, *args, **kwds):
+        def invoke(ext, /, *args, **kwds):
             return ext.name, args, kwds
 
-        em = DriverManager.make_test_instance(a_driver)
+        em = driver.DriverManager.make_test_instance(a_driver)
         result = em(invoke, 'a', b='C')
         self.assertEqual(result, ('test_driver', ('a',), {'b': 'C'}))
 
     def test_instance_driver_property(self):
-        em = DriverManager.make_test_instance(a_driver)
+        em = driver.DriverManager.make_test_instance(a_driver)
         self.assertEqual(sentinel.driver_obj, em.driver)
 
     # EnabledExtensionManager
     def test_enabled_instance_should_use_supplied_extensions(self):
         extensions = [test_extension, test_extension2]
-        em = EnabledExtensionManager.make_test_instance(extensions)
+        em = enabled.EnabledExtensionManager.make_test_instance(extensions)
         self.assertEqual(extensions, em.extensions)
 
     # DispatchExtensionManager
     def test_dispatch_instance_should_use_supplied_extensions(self):
         extensions = [test_extension, test_extension2]
-        em = DispatchExtensionManager.make_test_instance(extensions)
+        em = dispatch.DispatchExtensionManager.make_test_instance(extensions)
         self.assertEqual(extensions, em.extensions)
 
     def test_dispatch_map_should_invoke_filter_for_extensions(self):
-        em = DispatchExtensionManager.make_test_instance([test_extension,
-                                                          test_extension2])
+        em = dispatch.DispatchExtensionManager.make_test_instance(
+            [test_extension, test_extension2]
+        )
         filter_func = Mock(return_value=False)
         args = ('A',)
         kw = {'big': 'Cheese'}
-        em.map(filter_func, None, *args, **kw)
+        em.map(filter_func, None, *args, **kw)  # type: ignore
         filter_func.assert_any_call(test_extension, *args, **kw)
         filter_func.assert_any_call(test_extension2, *args, **kw)
 
     # NameDispatchExtensionManager
     def test_name_dispatch_instance_should_use_supplied_extensions(self):
         extensions = [test_extension, test_extension2]
-        em = NameDispatchExtensionManager.make_test_instance(extensions)
+        em = dispatch.NameDispatchExtensionManager.make_test_instance(
+            extensions
+        )
 
         self.assertEqual(extensions, em.extensions)
 
     def test_name_dispatch_instance_should_build_extension_name_map(self):
         extensions = [test_extension, test_extension2]
-        em = NameDispatchExtensionManager.make_test_instance(extensions)
+        em = dispatch.NameDispatchExtensionManager.make_test_instance(
+            extensions
+        )
         self.assertEqual(test_extension, em.by_name[test_extension.name])
         self.assertEqual(test_extension2, em.by_name[test_extension2.name])
 
     def test_named_dispatch_map_should_invoke_filter_for_extensions(self):
-        em = NameDispatchExtensionManager.make_test_instance([test_extension,
-                                                              test_extension2])
+        em = dispatch.NameDispatchExtensionManager.make_test_instance(
+            [test_extension, test_extension2]
+        )
         func = Mock()
         args = ('A',)
         kw = {'BIGGER': 'Cheese'}
diff --git a/libs/test/base_test_case.py b/libs/test/base_test_case.py
index a32176af40..80650c5592 100644
--- a/libs/test/base_test_case.py
+++ b/libs/test/base_test_case.py
@@ -3,17 +3,21 @@
 import time
 from signalrcore.hub_connection_builder import HubConnectionBuilder
 from signalrcore.protocol.messagepack_protocol import MessagePackHubProtocol
+
+
 class Urls:
     server_url_no_ssl = "ws://localhost:5000/chatHub"
     server_url_ssl = "wss://localhost:5001/chatHub"
     server_url_no_ssl_auth = "ws://localhost:5000/authHub"
     server_url_ssl_auth = "wss://localhost:5001/authHub"
-    login_url_ssl =  "https://localhost:5001/users/authenticate"
-    login_url_no_ssl =  "http://localhost:5000/users/authenticate"
+    login_url_ssl = "https://localhost:5001/users/authenticate"
+    login_url_no_ssl = "http://localhost:5000/users/authenticate"
+
 
 class InternalTestCase(unittest.TestCase):
     connection = None
     connected = False
+
     def get_connection(self):
         raise NotImplementedError()
 
@@ -35,12 +39,13 @@ def on_open(self):
     def on_close(self):
         self.connected = False
 
+
 class BaseTestCase(InternalTestCase):
     server_url = Urls.server_url_ssl
 
     def get_connection(self, msgpack=False):
         builder = HubConnectionBuilder()\
-            .with_url(self.server_url, options={"verify_ssl":False})\
+            .with_url(self.server_url, options={"verify_ssl": False})\
             .configure_logging(logging.ERROR)\
             .with_automatic_reconnect({
                 "type": "raw",
@@ -55,4 +60,4 @@ def get_connection(self, msgpack=False):
         hub = builder.build()
         hub.on_open(self.on_open)
         hub.on_close(self.on_close)
-        return hub
\ No newline at end of file
+        return hub
diff --git a/libs/test/client_streaming_test.py b/libs/test/client_streaming_test.py
index 9975c2857e..1b7a5d725f 100644
--- a/libs/test/client_streaming_test.py
+++ b/libs/test/client_streaming_test.py
@@ -1,32 +1,28 @@
-import os
-import unittest
-import logging
-import time
-import uuid
-
-from subprocess import Popen, PIPE
-from signalrcore.hub_connection_builder import HubConnectionBuilder
 from signalrcore.subject import Subject
 from test.base_test_case import BaseTestCase, Urls
 
+
 class TestClientStreamMethod(BaseTestCase):
 
     def test_stream(self):
         self.complete = False
-        self.items = list(range(0,10))
+        self.items = list(range(0, 10))
         subject = Subject()
         self.connection.send("UploadStream", subject)
-        while(len(self.items) > 0):
+        while (len(self.items) > 0):
             subject.next(str(self.items.pop()))
         subject.complete()
         self.assertTrue(len(self.items) == 0)
 
+
 class TestClientStreamMethodMsgPack(TestClientStreamMethod):
     def get_connection(self):
-        return super().get_connection(msgpack=True)    
+        return super().get_connection(msgpack=True)
+
 
-class TestClientNosslStreamMethodMsgPack(TestClientStreamMethodMsgPack):
+class TestClientNoSslStreamMethodMsgPack(TestClientStreamMethodMsgPack):
     server_url = Urls.server_url_no_ssl
 
-class TestClientNosslStreamMethod(TestClientStreamMethod):
-    server_url = Urls.server_url_no_ssl
\ No newline at end of file
+
+class TestClientNoSslStreamMethod(TestClientStreamMethod):
+    server_url = Urls.server_url_no_ssl
diff --git a/libs/test/configuration_test.py b/libs/test/configuration_test.py
index 35b9c8276c..e62cdd9c08 100644
--- a/libs/test/configuration_test.py
+++ b/libs/test/configuration_test.py
@@ -1,22 +1,25 @@
-import websocket
 import logging
+
 from signalrcore.hub_connection_builder import HubConnectionBuilder
+from signalrcore.protocol.messagepack_protocol import MessagePackHubProtocol
+
+from test.base_test_case import BaseTestCase
 
-from test.base_test_case import BaseTestCase, Urls
 
 class TestConfiguration(BaseTestCase):
-    
+
     def test_bad_auth_function(self):
         with self.assertRaises(TypeError):
             self.connection = HubConnectionBuilder()\
-                .with_url(self.server_url,
-                options={
-                    "verify_ssl": False,
-                    "access_token_factory": 1234,
-                    "headers": {
-                        "mycustomheader": "mycustomheadervalue"
-                    }
-                })
+                .with_url(
+                    self.server_url,
+                    options={
+                        "verify_ssl": False,
+                        "access_token_factory": 1234,
+                        "headers": {
+                            "mycustomheader": "mycustomheadervalue"
+                        }
+                    })
 
     def test_bad_url(self):
         with self.assertRaises(ValueError):
@@ -26,26 +29,45 @@ def test_bad_url(self):
     def test_bad_options(self):
         with self.assertRaises(TypeError):
             self.connection = HubConnectionBuilder()\
-                .with_url(self.server_url,
-                options=["ssl", True])
-    
+                .with_url(
+                    self.server_url,
+                    options=["ssl", True])
+
     def test_auth_configured(self):
         with self.assertRaises(TypeError):
             hub = HubConnectionBuilder()\
-                    .with_url(self.server_url,
-                    options={
-                        "verify_ssl": False,
-                        "headers": {
-                            "mycustomheader": "mycustomheadervalue"
-                        }
-                    })
+                    .with_url(
+                        self.server_url,
+                        options={
+                            "verify_ssl": False,
+                            "headers": {
+                                "mycustomheader": "mycustomheadervalue"
+                            }
+                        })
             hub.has_auth_configured = True
             hub.options["access_token_factory"] = ""
-            conn = hub.build()
+            _ = hub.build()
 
     def test_enable_trace(self):
         hub = HubConnectionBuilder()\
-            .with_url(self.server_url, options={"verify_ssl":False})\
+            .with_url(self.server_url, options={"verify_ssl": False})\
+            .configure_logging(logging.WARNING, socket_trace=True)\
+            .with_automatic_reconnect({
+                "type": "raw",
+                "keep_alive_interval": 10,
+                "reconnect_interval": 5,
+                "max_attempts": 5
+            })\
+            .build()
+        hub.on_open(self.on_open)
+        hub.on_close(self.on_close)
+        hub.start()
+        self.assertTrue(hub.transport.is_trace_enabled())
+        hub.stop()
+
+    def test_enable_trace_messagepack(self):
+        hub = HubConnectionBuilder()\
+            .with_url(self.server_url, options={"verify_ssl": False})\
             .configure_logging(logging.WARNING, socket_trace=True)\
             .with_automatic_reconnect({
                 "type": "raw",
@@ -53,10 +75,10 @@ def test_enable_trace(self):
                 "reconnect_interval": 5,
                 "max_attempts": 5
             })\
+            .with_hub_protocol(MessagePackHubProtocol())\
             .build()
         hub.on_open(self.on_open)
         hub.on_close(self.on_close)
         hub.start()
-        self.assertTrue(websocket.isEnabledForDebug())
-        websocket.enableTrace(False)
-        hub.stop()
\ No newline at end of file
+        self.assertTrue(hub.transport.is_trace_enabled())
+        hub.stop()
diff --git a/libs/test/open_close_test.py b/libs/test/open_close_test.py
index c3e1a3063a..3db0efa5c7 100644
--- a/libs/test/open_close_test.py
+++ b/libs/test/open_close_test.py
@@ -1,16 +1,14 @@
-import os
-import unittest
 import logging
-import time
 import threading
 import uuid
 
-from subprocess import Popen, PIPE
 from signalrcore.hub_connection_builder import HubConnectionBuilder
-from signalrcore.subject import Subject
-from test.base_test_case import BaseTestCase, Urls
+from test.base_test_case import BaseTestCase
 
-class TestClientStreamMethod(BaseTestCase):    
+LOCKS = {}
+
+
+class TestOpenCloseMethods(BaseTestCase):
     def setUp(self):
         pass
 
@@ -22,43 +20,61 @@ def test_start(self):
             .with_url(self.server_url, options={"verify_ssl": False})\
             .configure_logging(logging.ERROR)\
             .build()
-        
-        _lock = threading.Lock()
-        self.assertTrue(_lock.acquire(timeout=30))
-        
-
-        connection.on_open(lambda: _lock.release())
-        connection.on_close(lambda: _lock.release())
-        
+
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+
+        def release():
+            LOCKS[identifier].release()
+
+        self.assertTrue(LOCKS[identifier].acquire(timeout=30))
+
+        connection.on_open(release)
+        connection.on_close(release)
+
         result = connection.start()
 
         self.assertTrue(result)
-        
-        self.assertTrue(_lock.acquire(timeout=30))  # Released on open
-        
+
+        self.assertTrue(LOCKS[identifier].acquire(timeout=30))
+        # Released on open
+
         result = connection.start()
 
         self.assertFalse(result)
 
         connection.stop()
 
+        del LOCKS[identifier]
+        del connection
+
     def test_open_close(self):
-        self.connection = self.get_connection()
-      
-        _lock = threading.Lock()
+        connection = self.get_connection()
+
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+
+        def release():
+            LOCKS[identifier].release()
 
-        self.connection.on_open(lambda: _lock.release())
-        self.connection.on_close(lambda: _lock.release())
+        connection.on_open(release)
+        connection.on_close(release)
 
-        self.assertTrue(_lock.acquire())
+        self.assertTrue(LOCKS[identifier].acquire(timeout=30))
 
-        self.connection.start()
+        connection.start()
+
+        self.assertTrue(
+            LOCKS[identifier].acquire(timeout=30),
+            "on_open was not fired")
+
+        connection.on_open(lambda: None)
+
+        connection.stop()
 
-        self.assertTrue(_lock.acquire())
-        
-        self.connection.stop()
-        
-        self.assertTrue(_lock.acquire())
+        self.assertTrue(
+            LOCKS[identifier].acquire(timeout=30),
+            "on_close was not fired")
 
-        _lock.release()
-        del _lock
\ No newline at end of file
+        del LOCKS[identifier]
+        del connection
diff --git a/libs/test/reconnection_test.py b/libs/test/reconnection_test.py
index 9d78823326..cadda5c301 100644
--- a/libs/test/reconnection_test.py
+++ b/libs/test/reconnection_test.py
@@ -1,22 +1,19 @@
-import os
-import unittest
 import logging
 import time
 import uuid
 import threading
-
-from subprocess import Popen, PIPE
+from typing import Dict
 from signalrcore.hub_connection_builder import HubConnectionBuilder
 from signalrcore.hub.errors import HubConnectionError
-from test.base_test_case import BaseTestCase, Urls
-from signalrcore.transport.websockets.reconnection import RawReconnectionHandler, IntervalReconnectionHandler
+from test.base_test_case import BaseTestCase
+from signalrcore.transport.websockets.reconnection\
+    import RawReconnectionHandler, IntervalReconnectionHandler
 
 
-class TestReconnectMethods(BaseTestCase):
+LOCKS: Dict[str, threading.Lock] = {}
 
-    def receive_message(self, args):
-        self.assertEqual(args[1], self.message)
-        self.received = True
+
+class TestReconnectMethods(BaseTestCase):
 
     def test_reconnect_interval_config(self):
         connection = HubConnectionBuilder()\
@@ -27,21 +24,27 @@ def test_reconnect_interval_config(self):
                 "intervals": [1, 2, 4, 45, 6, 7, 8, 9, 10]
             })\
             .build()
-        _lock = threading.Lock()
-        connection.on_open(lambda: _lock.release())
-        connection.on_close(lambda: _lock.release())
 
-        self.assertTrue(_lock.acquire(timeout=10))
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+
+        def release():
+            LOCKS[identifier].release()
+
+        connection.on_open(release)
+        connection.on_close(release)
+
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
         connection.start()
 
-        self.assertTrue(_lock.acquire(timeout=10))
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
         connection.stop()
 
-        self.assertTrue(_lock.acquire(timeout=10))
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
-        del _lock
+        del LOCKS[identifier]
 
     def test_reconnect_interval(self):
         connection = HubConnectionBuilder()\
@@ -61,21 +64,26 @@ def test_no_reconnect(self):
             .configure_logging(logging.ERROR)\
             .build()
 
-        _lock = threading.Lock()
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
 
-        _lock.acquire(timeout=10)
+        def release(msg=None):
+            LOCKS[identifier].release()
 
-        connection.on_open(lambda: _lock.release())
+        LOCKS[identifier].acquire(timeout=10)
 
-        connection.on("ReceiveMessage", lambda _: _lock.release())
+        connection.on_open(release)
+
+        connection.on("ReceiveMessage", release)
 
         connection.start()
 
-        self.assertTrue(_lock.acquire(timeout=10))  # Released on ReOpen
-        
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
+        # Released on ReOpen
+
         connection.send("DisconnectMe", [])
 
-        self.assertTrue(_lock.acquire(timeout=10))
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
         time.sleep(10)
 
@@ -84,28 +92,39 @@ def test_no_reconnect(self):
             lambda: connection.send("DisconnectMe", []))
 
         connection.stop()
-        del _lock
+        del LOCKS[identifier]
 
     def reconnect_test(self, connection):
-        _lock = threading.RLock()
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+
+        def release():
+            LOCKS[identifier].release()
 
-        connection.on_open(lambda: _lock.release())
+        connection.on_open(release)
+        connection.on_reconnect(release)
+
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
         connection.start()
 
-        self.assertTrue(_lock.acquire(timeout=10)) # Release on Open
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
+
+        connection.on_open(lambda: None)
 
+        # Release on Open
         connection.send("DisconnectMe", [])
 
-        self.assertTrue(_lock.acquire(timeout=10)) # released on open
+        self.assertTrue(LOCKS[identifier].acquire(timeout=60))
+        # released on reopen
 
         connection.stop()
-        del _lock
+        del LOCKS[identifier]
 
     def test_raw_reconnection(self):
         connection = HubConnectionBuilder()\
             .with_url(self.server_url, options={"verify_ssl": False})\
-            .configure_logging(logging.ERROR)\
+            .configure_logging(logging.DEBUG)\
             .with_automatic_reconnect({
                 "type": "raw",
                 "keep_alive_interval": 10,
@@ -117,11 +136,11 @@ def test_raw_reconnection(self):
 
     def test_raw_handler(self):
         handler = RawReconnectionHandler(5, 10)
-        attemp = 0
+        attempt = 0
 
-        while attemp <= 10:
+        while attempt <= 10:
             self.assertEqual(handler.next(), 5)
-            attemp = attemp + 1
+            attempt = attempt + 1
 
         self.assertRaises(ValueError, handler.next)
 
diff --git a/libs/test/send_auth_errors_test.py b/libs/test/send_auth_errors_test.py
index b2d4499ecc..b181c01490 100644
--- a/libs/test/send_auth_errors_test.py
+++ b/libs/test/send_auth_errors_test.py
@@ -1,14 +1,10 @@
-import os
-import unittest
 import logging
-import time
-import uuid
 import requests
-from subprocess import Popen, PIPE
 from signalrcore.hub_connection_builder import HubConnectionBuilder
 from signalrcore.protocol.messagepack_protocol import MessagePackHubProtocol
 from test.base_test_case import BaseTestCase, Urls
 
+
 class TestSendAuthErrorMethod(BaseTestCase):
     server_url = Urls.server_url_ssl_auth
     login_url = Urls.login_url_ssl
@@ -23,8 +19,9 @@ def login(self):
             json={
                 "username": self.email,
                 "password": self.password
-                },verify=False)
-        if response.status_code == 200:
+                },
+            verify=False)
+        if response.status_code == 200:  # pragma: no cover
             return response.json()["token"]
         raise requests.exceptions.ConnectionError()
 
@@ -35,26 +32,29 @@ def test_send_json(self):
         self._test_send(msgpack=False)
 
     def test_send_msgpack(self):
-        self._test_send(msgpack=True)    
-    
+        self._test_send(msgpack=True)
+
     def _test_send(self, msgpack=False):
         builder = HubConnectionBuilder()\
-            .with_url(self.server_url,
-            options={
-                "verify_ssl": False,
-                "access_token_factory": self.login,
-            })
-        
+            .with_url(
+                self.server_url,
+                options={
+                    "verify_ssl": False,
+                    "access_token_factory": self.login,
+                })
+
         if msgpack:
             builder.with_hub_protocol(MessagePackHubProtocol())
-        
+
         builder.configure_logging(logging.ERROR)
         self.connection = builder.build()
         self.connection.on_open(self.on_open)
         self.connection.on_close(self.on_close)
-        self.assertRaises(requests.exceptions.ConnectionError, lambda :self.connection.start())
+        self.assertRaises(
+            requests.exceptions.ConnectionError,
+            lambda: self.connection.start())
+
 
-        
 class TestSendNoSslAuthMethod(TestSendAuthErrorMethod):
     server_url = Urls.server_url_no_ssl_auth
     login_url = Urls.login_url_no_ssl
diff --git a/libs/test/send_auth_test.py b/libs/test/send_auth_test.py
index 8d437b4d34..73f9b912ba 100644
--- a/libs/test/send_auth_test.py
+++ b/libs/test/send_auth_test.py
@@ -1,14 +1,12 @@
-import os
-import unittest
 import threading
 import logging
-import time
 import uuid
 import requests
 from signalrcore.hub_connection_builder import HubConnectionBuilder
 from signalrcore.protocol.messagepack_protocol import MessagePackHubProtocol
 from test.base_test_case import BaseTestCase, Urls
 
+
 class TestSendAuthMethod(BaseTestCase):
     server_url = Urls.server_url_ssl_auth
     login_url = Urls.login_url_ssl
@@ -24,19 +22,21 @@ def login(self):
             json={
                 "username": self.email,
                 "password": self.password
-                },verify=False)
+                },
+            verify=False)
         return response.json()["token"]
 
-    def _setUp(self, msgpack= False):
+    def _setUp(self, msgpack=False):
         builder = HubConnectionBuilder()\
-            .with_url(self.server_url,
-            options={
-                "verify_ssl": False,
-                "access_token_factory": self.login,
-                "headers": {
-                    "mycustomheader": "mycustomheadervalue"
-                }
-            })
+            .with_url(
+                self.server_url,
+                options={
+                    "verify_ssl": False,
+                    "access_token_factory": self.login,
+                    "headers": {
+                        "mycustomheader": "mycustomheadervalue"
+                    }
+                })
 
         if msgpack:
             builder.with_hub_protocol(MessagePackHubProtocol())
@@ -55,7 +55,7 @@ def _setUp(self, msgpack= False):
         self._lock = threading.Lock()
         self.assertTrue(self._lock.acquire(timeout=30))
         self.connection.start()
-    
+
     def on_open(self):
         self._lock.release()
 
@@ -65,23 +65,26 @@ def setUp(self):
     def receive_message(self, args):
         self._lock.release()
         self.assertEqual(args[0], self.message)
-        
+
     def test_send(self):
         self.message = "new message {0}".format(uuid.uuid4())
         self.username = "mandrewcito"
         self.assertTrue(self._lock.acquire(timeout=30))
         self.connection.send("SendMessage", [self.message])
         self.assertTrue(self._lock.acquire(timeout=30))
-        del self._lock    
-        
+        del self._lock
+
+
 class TestSendNoSslAuthMethod(TestSendAuthMethod):
     server_url = Urls.server_url_no_ssl_auth
     login_url = Urls.login_url_no_ssl
 
+
 class TestSendAuthMethodMsgPack(TestSendAuthMethod):
     def setUp(self):
         self._setUp(msgpack=True)
 
+
 class TestSendNoSslAuthMethodMsgPack(TestSendAuthMethod):
     server_url = Urls.server_url_no_ssl_auth
-    login_url = Urls.login_url_no_ssl
\ No newline at end of file
+    login_url = Urls.login_url_no_ssl
diff --git a/libs/test/send_test.py b/libs/test/send_test.py
index cff9eb5b58..0e8f01dc2d 100644
--- a/libs/test/send_test.py
+++ b/libs/test/send_test.py
@@ -1,15 +1,13 @@
-import os
-import re
-import unittest
-import logging
 import time
 import uuid
 import threading
 
-from signalrcore.hub_connection_builder import HubConnectionBuilder
-from signalrcore.hub.errors import HubError, HubConnectionError
+from signalrcore.hub.errors import HubConnectionError
 from test.base_test_case import BaseTestCase, Urls
 
+LOCKS = {}
+
+
 class TestSendException(BaseTestCase):
     def receive_message(self, _):
         raise Exception()
@@ -19,46 +17,61 @@ def setUp(self):
         self.connection.start()
         while not self.connected:
             time.sleep(0.1)
-    
+
     def test_send_exception(self):
-        _lock = threading.Lock()
-        _lock.acquire()
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+        LOCKS[identifier].acquire()
         self.connection.send("SendMessage", ["user", "msg"])
-        del _lock
+        del LOCKS[identifier]
 
     def test_hub_error(self):
-        _lock = threading.Lock()
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
-        self.assertTrue(_lock.acquire(timeout=10))     
-        self.connection.on_error(lambda _: _lock.release())
+        def on_error(err=None):
+            LOCKS[identifier].release()
+
+        self.connection.on_error(on_error)
 
         def on_message(_):
-            _lock.release()
-            self.assertTrue(_lock.acquire(timeout=10)) 
+            LOCKS[identifier].release()
+            self.assertTrue(LOCKS[identifier].acquire(timeout=10))
 
         self.connection.on("ThrowExceptionCall", on_message)
         self.connection.send("ThrowException", ["msg"])
 
+
 class TestSendExceptionMsgPack(TestSendException):
     def setUp(self):
         self.connection = self.get_connection(msgpack=True)
         self.connection.start()
         while not self.connected:
             time.sleep(0.1)
-        
+
+
 class TestSendWarning(BaseTestCase):
     def setUp(self):
         self.connection = self.get_connection()
         self.connection.start()
         while not self.connected:
             time.sleep(0.1)
-    
+
     def test_send_warning(self):
-        _lock = threading.Lock()
-        _lock.acquire()
-        self.connection.send("SendMessage", ["user", "msg"], lambda m: _lock.release())
-        self.assertTrue(_lock.acquire(timeout=10))
-        del _lock
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+        LOCKS[identifier].acquire()
+
+        def release(msg=None):
+            global LOCKS
+            LOCKS[identifier].release()
+
+        self.connection.send("SendMessage", ["user", "msg"], release)
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
+        del LOCKS[identifier]
+
 
 class TestSendWarningMsgPack(TestSendWarning):
     def setUp(self):
@@ -66,11 +79,12 @@ def setUp(self):
         self.connection.start()
         while not self.connected:
             time.sleep(0.1)
-        
+
 
 class TestSendMethod(BaseTestCase):
     received = False
     message = None
+
     def setUp(self):
         self.connection = self.get_connection()
         self.connection.on("ReceiveMessage", self.receive_message)
@@ -82,12 +96,13 @@ def receive_message(self, args):
         self.assertEqual(args[1], self.message)
         self.received = True
 
-
     def test_send_bad_args(self):
         class A():
             pass
 
-        self.assertRaises(TypeError, lambda : self.connection.send("SendMessage", A()))
+        self.assertRaises(
+            TypeError,
+            lambda: self.connection.send("SendMessage", A()))
 
     def test_send(self):
         self.message = "new message {0}".format(uuid.uuid4())
@@ -102,13 +117,16 @@ def test_send_with_callback(self):
         self.message = "new message {0}".format(uuid.uuid4())
         self.username = "mandrewcito"
         self.received = False
-        _lock = threading.Lock()
-        _lock.acquire()
+        identifier = str(uuid.uuid4())
+        LOCKS[identifier] = threading.Lock()
+
+        LOCKS[identifier].acquire()
         uid = str(uuid.uuid4())
 
         def release(m):
+            global LOCKS
             self.assertTrue(m.invocation_id, uid)
-            _lock.release()
+            LOCKS[identifier].release()
 
         self.connection.send(
             "SendMessage",
@@ -116,12 +134,14 @@ def release(m):
             release,
             invocation_id=uid)
 
-        self.assertTrue(_lock.acquire(timeout=10))
-        del _lock
+        self.assertTrue(LOCKS[identifier].acquire(timeout=10))
+        del LOCKS[identifier]
+
 
 class TestSendNoSslMethod(TestSendMethod):
     server_url = Urls.server_url_no_ssl
 
+
 class TestSendMethodMsgPack(TestSendMethod):
     def setUp(self):
         self.connection = super().get_connection(msgpack=True)
@@ -130,12 +150,15 @@ def setUp(self):
         while not self.connected:
             time.sleep(0.1)
 
+
 class TestSendNoSslMethodMsgPack(TestSendMethodMsgPack):
-    server_url = Urls.server_url_no_ssl    
+    server_url = Urls.server_url_no_ssl
+
 
 class TestSendErrorMethod(BaseTestCase):
     received = False
     message = None
+
     def setUp(self):
         self.connection = self.get_connection()
         self.connection.on("ReceiveMessage", self.receive_message)
@@ -144,20 +167,21 @@ def receive_message(self, args):
         self.assertEqual(args[1], self.message)
         self.received = True
 
-
     def test_send_with_error(self):
         self.message = "new message {0}".format(uuid.uuid4())
         self.username = "mandrewcito"
 
-        self.assertRaises(HubConnectionError,lambda : self.connection.send("SendMessage", [self.username, self.message]))
-        
+        self.assertRaises(
+            HubConnectionError,
+            lambda: self.connection.send(
+                "SendMessage", [self.username, self.message]))
+
         self.connection.start()
         while not self.connected:
             time.sleep(0.1)
 
         self.received = False
-        self.connection.send("SendMessage", [self.username, self.message])        
-        t0 = time.time()
+        self.connection.send("SendMessage", [self.username, self.message])
         while not self.received:
             time.sleep(0.1)
         self.assertTrue(self.received)
@@ -171,6 +195,7 @@ class TestSendErrorMethodMsgPack(TestSendErrorMethod):
     def get_connection(self):
         return super().get_connection(msgpack=True)
 
+
 class TestSendErrorNoSslMethodMsgPack(TestSendErrorNoSslMethod):
     def get_connection(self):
         return super().get_connection(msgpack=True)
diff --git a/libs/test/streaming_test.py b/libs/test/streaming_test.py
index 90558b5b48..ff36041bb2 100644
--- a/libs/test/streaming_test.py
+++ b/libs/test/streaming_test.py
@@ -1,17 +1,11 @@
-import os
-import unittest
-import logging
 import time
-import uuid
-
-from subprocess import Popen, PIPE
-from signalrcore.hub_connection_builder import HubConnectionBuilder
 from test.base_test_case import BaseTestCase, Urls
 
+
 class TestSendMethod(BaseTestCase):
     server_url = Urls.server_url_ssl
     received = False
-    items = list(range(0,10))
+    items = list(range(0, 10))
 
     def on_complete(self, x):
         self.complete = True
@@ -23,46 +17,51 @@ def on_next(self, x):
 
     def test_stream(self):
         self.complete = False
-        self.items = list(range(0,10))
+        self.items = list(range(0, 10))
         self.connection.stream(
             "Counter",
             [len(self.items), 500]).subscribe({
                 "next": self.on_next,
                 "complete": self.on_complete,
-                "error": self.fail # TestcaseFail
+                "error": self.fail  # TestcaseFail
              })
         while not self.complete:
             time.sleep(0.1)
-    
+
     def test_stream_error(self):
         self.complete = False
-        self.items = list(range(0,10))
+        self.items = list(range(0, 10))
 
-        my_stream =  self.connection.stream(
+        my_stream = self.connection.stream(
             "Counter",
             [len(self.items), 500])
 
         self.assertRaises(TypeError, lambda: my_stream.subscribe(None))
 
-        self.assertRaises(TypeError, lambda:my_stream.subscribe([self.on_next]))        
+        self.assertRaises(
+            TypeError,
+            lambda: my_stream.subscribe([self.on_next]))
 
         self.assertRaises(KeyError, lambda: my_stream.subscribe({
-                "key":self.on_next
-            }))     
+                "key": self.on_next
+            }))
 
         self.assertRaises(ValueError, lambda: my_stream.subscribe({
                 "next": "",
                 "complete": 1,
-                "error": [] # TestcaseFail
+                "error": []  # TestcaseFail
              }))
 
+
 class TestSendNoSslMethod(TestSendMethod):
     server_url = Urls.server_url_no_ssl
 
+
 class TestSendMethodMsgPack(TestSendMethod):
     def get_connection(self):
         return super().get_connection(msgpack=True)
 
+
 class TestSendMethodNoSslMsgPack(TestSendNoSslMethod):
     def get_connection(self):
-        return super().get_connection(msgpack=True)
\ No newline at end of file
+        return super().get_connection(msgpack=True)
diff --git a/libs/test/subscribe_test.py b/libs/test/subscribe_test.py
new file mode 100644
index 0000000000..f73585c04f
--- /dev/null
+++ b/libs/test/subscribe_test.py
@@ -0,0 +1,18 @@
+from test.base_test_case import BaseTestCase, Urls
+
+
+class TestSendMethod(BaseTestCase):
+    server_url = Urls.server_url_ssl
+
+    def test_unsubscribe(self):
+        def fake_callback(_):
+            pass
+
+        self.connection = self.get_connection()
+        self.connection.on("ReceiveMessage", fake_callback)
+
+        self.assertEqual(len(self.connection.handlers), 1)
+
+        self.connection.unsubscribe("ReceiveMessage", fake_callback)
+
+        self.assertEqual(len(self.connection.handlers), 0)
diff --git a/libs/textdistance-4.6.3.dist-info/METADATA b/libs/textdistance-4.6.3.dist-info/METADATA
index 47f5a3d5eb..b5738921d2 100644
--- a/libs/textdistance-4.6.3.dist-info/METADATA
+++ b/libs/textdistance-4.6.3.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: textdistance
 Version: 4.6.3
 Summary: Compute distance between the two texts.
@@ -17,6 +17,43 @@ Classifier: Topic :: Scientific/Engineering :: Human Machine Interfaces
 Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Provides-Extra: extras
+Requires-Dist: jellyfish; extra == "extras"
+Requires-Dist: numpy; extra == "extras"
+Requires-Dist: Levenshtein; extra == "extras"
+Requires-Dist: pyxDamerauLevenshtein; extra == "extras"
+Requires-Dist: rapidfuzz>=2.6.0; extra == "extras"
+Provides-Extra: benchmark
+Requires-Dist: jellyfish; extra == "benchmark"
+Requires-Dist: numpy; extra == "benchmark"
+Requires-Dist: Levenshtein; extra == "benchmark"
+Requires-Dist: pyxDamerauLevenshtein; extra == "benchmark"
+Requires-Dist: rapidfuzz>=2.6.0; extra == "benchmark"
+Requires-Dist: distance; extra == "benchmark"
+Requires-Dist: pylev; extra == "benchmark"
+Requires-Dist: py_stringmatching; extra == "benchmark"
+Requires-Dist: tabulate; extra == "benchmark"
+Provides-Extra: test
+Requires-Dist: hypothesis; extra == "test"
+Requires-Dist: isort; extra == "test"
+Requires-Dist: numpy; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Provides-Extra: lint
+Requires-Dist: twine; extra == "lint"
+Requires-Dist: mypy; extra == "lint"
+Requires-Dist: isort; extra == "lint"
+Requires-Dist: flake8; extra == "lint"
+Requires-Dist: types-tabulate; extra == "lint"
+Requires-Dist: flake8-blind-except; extra == "lint"
+Requires-Dist: flake8-bugbear; extra == "lint"
+Requires-Dist: flake8-commas; extra == "lint"
+Requires-Dist: flake8-logging-format; extra == "lint"
+Requires-Dist: flake8-mutable; extra == "lint"
+Requires-Dist: flake8-pep3101; extra == "lint"
+Requires-Dist: flake8-quotes; extra == "lint"
+Requires-Dist: flake8-string-format; extra == "lint"
+Requires-Dist: flake8-tidy-imports; extra == "lint"
+Requires-Dist: pep8-naming; extra == "lint"
 Provides-Extra: dameraulevenshtein
 Requires-Dist: rapidfuzz>=2.6.0; extra == "dameraulevenshtein"
 Requires-Dist: jellyfish; extra == "dameraulevenshtein"
@@ -35,6 +72,12 @@ Requires-Dist: jellyfish; extra == "jarowinkler"
 Provides-Extra: levenshtein
 Requires-Dist: rapidfuzz>=2.6.0; extra == "levenshtein"
 Requires-Dist: Levenshtein; extra == "levenshtein"
+Provides-Extra: common
+Requires-Dist: jellyfish; extra == "common"
+Requires-Dist: numpy; extra == "common"
+Requires-Dist: Levenshtein; extra == "common"
+Requires-Dist: pyxDamerauLevenshtein; extra == "common"
+Requires-Dist: rapidfuzz>=2.6.0; extra == "common"
 Provides-Extra: all
 Requires-Dist: jellyfish; extra == "all"
 Requires-Dist: numpy; extra == "all"
@@ -43,18 +86,14 @@ Requires-Dist: pyxDamerauLevenshtein; extra == "all"
 Requires-Dist: rapidfuzz>=2.6.0; extra == "all"
 Requires-Dist: distance; extra == "all"
 Requires-Dist: pylev; extra == "all"
-Requires-Dist: py-stringmatching; extra == "all"
+Requires-Dist: py_stringmatching; extra == "all"
 Requires-Dist: tabulate; extra == "all"
-Provides-Extra: benchmark
-Requires-Dist: jellyfish; extra == "benchmark"
-Requires-Dist: numpy; extra == "benchmark"
-Requires-Dist: Levenshtein; extra == "benchmark"
-Requires-Dist: pyxDamerauLevenshtein; extra == "benchmark"
-Requires-Dist: rapidfuzz>=2.6.0; extra == "benchmark"
-Requires-Dist: distance; extra == "benchmark"
-Requires-Dist: pylev; extra == "benchmark"
-Requires-Dist: py-stringmatching; extra == "benchmark"
-Requires-Dist: tabulate; extra == "benchmark"
+Provides-Extra: extra
+Requires-Dist: jellyfish; extra == "extra"
+Requires-Dist: numpy; extra == "extra"
+Requires-Dist: Levenshtein; extra == "extra"
+Requires-Dist: pyxDamerauLevenshtein; extra == "extra"
+Requires-Dist: rapidfuzz>=2.6.0; extra == "extra"
 Provides-Extra: benchmarks
 Requires-Dist: jellyfish; extra == "benchmarks"
 Requires-Dist: numpy; extra == "benchmarks"
@@ -63,47 +102,21 @@ Requires-Dist: pyxDamerauLevenshtein; extra == "benchmarks"
 Requires-Dist: rapidfuzz>=2.6.0; extra == "benchmarks"
 Requires-Dist: distance; extra == "benchmarks"
 Requires-Dist: pylev; extra == "benchmarks"
-Requires-Dist: py-stringmatching; extra == "benchmarks"
+Requires-Dist: py_stringmatching; extra == "benchmarks"
 Requires-Dist: tabulate; extra == "benchmarks"
-Provides-Extra: common
-Requires-Dist: jellyfish; extra == "common"
-Requires-Dist: numpy; extra == "common"
-Requires-Dist: Levenshtein; extra == "common"
-Requires-Dist: pyxDamerauLevenshtein; extra == "common"
-Requires-Dist: rapidfuzz>=2.6.0; extra == "common"
-Provides-Extra: extra
-Requires-Dist: jellyfish; extra == "extra"
-Requires-Dist: numpy; extra == "extra"
-Requires-Dist: Levenshtein; extra == "extra"
-Requires-Dist: pyxDamerauLevenshtein; extra == "extra"
-Requires-Dist: rapidfuzz>=2.6.0; extra == "extra"
-Provides-Extra: extras
-Requires-Dist: jellyfish; extra == "extras"
-Requires-Dist: numpy; extra == "extras"
-Requires-Dist: Levenshtein; extra == "extras"
-Requires-Dist: pyxDamerauLevenshtein; extra == "extras"
-Requires-Dist: rapidfuzz>=2.6.0; extra == "extras"
-Provides-Extra: lint
-Requires-Dist: twine; extra == "lint"
-Requires-Dist: mypy; extra == "lint"
-Requires-Dist: isort; extra == "lint"
-Requires-Dist: flake8; extra == "lint"
-Requires-Dist: types-tabulate; extra == "lint"
-Requires-Dist: flake8-blind-except; extra == "lint"
-Requires-Dist: flake8-bugbear; extra == "lint"
-Requires-Dist: flake8-commas; extra == "lint"
-Requires-Dist: flake8-logging-format; extra == "lint"
-Requires-Dist: flake8-mutable; extra == "lint"
-Requires-Dist: flake8-pep3101; extra == "lint"
-Requires-Dist: flake8-quotes; extra == "lint"
-Requires-Dist: flake8-string-format; extra == "lint"
-Requires-Dist: flake8-tidy-imports; extra == "lint"
-Requires-Dist: pep8-naming; extra == "lint"
-Provides-Extra: test
-Requires-Dist: hypothesis; extra == "test"
-Requires-Dist: isort; extra == "test"
-Requires-Dist: numpy; extra == "test"
-Requires-Dist: pytest; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-python
+Dynamic: summary
 
 # TextDistance
 
diff --git a/libs/textdistance-4.6.3.dist-info/RECORD b/libs/textdistance-4.6.3.dist-info/RECORD
index fcf0158fb6..9a9a9ac879 100644
--- a/libs/textdistance-4.6.3.dist-info/RECORD
+++ b/libs/textdistance-4.6.3.dist-info/RECORD
@@ -1,9 +1,9 @@
 textdistance-4.6.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-textdistance-4.6.3.dist-info/LICENSE,sha256=oOV_OJnxc9uQzeaMabB-rqV8Gti-Q1kQXusPgFxoEJI,1049
-textdistance-4.6.3.dist-info/METADATA,sha256=v0xojwY_m6pFs-ZggR9u3C0Nx1ZMnYvU9n5hPbWLJTg,18148
+textdistance-4.6.3.dist-info/METADATA,sha256=B_NEivAzssLk4waA8BIkEg7Fe58hzJz5JCNN-5fYXQg,18425
 textdistance-4.6.3.dist-info/RECORD,,
 textdistance-4.6.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-textdistance-4.6.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+textdistance-4.6.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+textdistance-4.6.3.dist-info/licenses/LICENSE,sha256=oOV_OJnxc9uQzeaMabB-rqV8Gti-Q1kQXusPgFxoEJI,1049
 textdistance-4.6.3.dist-info/top_level.txt,sha256=GBIsLNa3pcbaPSp8KNq93YdHKE3CNIQMQrLrZdectak,13
 textdistance/__init__.py,sha256=abtyaG6QgNqbwQTs_8q1rJUSPr78akEOLYgJDXHgtLM,355
 textdistance/algorithms/__init__.py,sha256=1raagDGcgHenA-Ncj3oKHTCk0ai8ltLdqQzTA__clkg,217
diff --git a/libs/textdistance-4.6.3.dist-info/WHEEL b/libs/textdistance-4.6.3.dist-info/WHEEL
index da25d7b423..0885d05555 100644
--- a/libs/textdistance-4.6.3.dist-info/WHEEL
+++ b/libs/textdistance-4.6.3.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 
diff --git a/libs/textdistance-4.6.3.dist-info/LICENSE b/libs/textdistance-4.6.3.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/textdistance-4.6.3.dist-info/LICENSE
rename to libs/textdistance-4.6.3.dist-info/licenses/LICENSE
diff --git a/libs/signalrcore-0.9.5.dist-info/INSTALLER b/libs/tld-0.13.2.dist-info/INSTALLER
similarity index 100%
rename from libs/signalrcore-0.9.5.dist-info/INSTALLER
rename to libs/tld-0.13.2.dist-info/INSTALLER
diff --git a/libs/tld-0.13.2.dist-info/METADATA b/libs/tld-0.13.2.dist-info/METADATA
new file mode 100644
index 0000000000..eae83fdeb8
--- /dev/null
+++ b/libs/tld-0.13.2.dist-info/METADATA
@@ -0,0 +1,422 @@
+Metadata-Version: 2.4
+Name: tld
+Version: 0.13.2
+Summary: Extract the top-level domain (TLD) from the URL given.
+Author-email: Artur Barseghyan <artur.barseghyan@gmail.com>
+Maintainer-email: Artur Barseghyan <artur.barseghyan@gmail.com>
+License-Expression: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
+Project-URL: Bug Tracker, https://github.com/barseghyanartur/tld/issues
+Project-URL: Documentation, https://tld.readthedocs.io/
+Project-URL: Source Code, https://github.com/barseghyanartur/tld/
+Project-URL: Changelog, https://tld.readthedocs.io/en/latest/changelog.html
+Keywords: tld,top-level domain names,python
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Topic :: Internet
+Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
+License-File: LICENSE.rst
+License-File: LICENSE_GPL2.0.txt
+License-File: LICENSE_LGPL_2.1.txt
+License-File: LICENSE_MPL_1.1.txt
+Provides-Extra: all
+Requires-Dist: tld[build,dev,docs,lint,test]; extra == "all"
+Provides-Extra: build
+Requires-Dist: build; extra == "build"
+Requires-Dist: pkginfo; extra == "build"
+Requires-Dist: twine; extra == "build"
+Requires-Dist: wheel; extra == "build"
+Provides-Extra: lint
+Requires-Dist: doc8; extra == "lint"
+Requires-Dist: mypy; extra == "lint"
+Requires-Dist: pydoclint; extra == "lint"
+Requires-Dist: ruff; extra == "lint"
+Provides-Extra: dev
+Requires-Dist: detect-secrets; extra == "dev"
+Requires-Dist: ipython; extra == "dev"
+Requires-Dist: uv; extra == "dev"
+Provides-Extra: test
+Requires-Dist: coverage; extra == "test"
+Requires-Dist: fake.py; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pytest-codeblock; extra == "test"
+Requires-Dist: pytest-cov; extra == "test"
+Requires-Dist: pytest-ordering; extra == "test"
+Requires-Dist: tox; extra == "test"
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == "docs"
+Requires-Dist: sphinx-autobuild; extra == "docs"
+Requires-Dist: sphinx-rtd-theme>=1.3.0; extra == "docs"
+Requires-Dist: sphinx-no-pragma; extra == "docs"
+Requires-Dist: sphinx-llms-txt-link; extra == "docs"
+Requires-Dist: sphinx-source-tree; python_version > "3.9" and extra == "docs"
+Dynamic: license-file
+
+===
+tld
+===
+Extract the top level domain (TLD) from the URL given. List of TLD names is
+taken from `Public Suffix <https://publicsuffix.org/list/public_suffix_list.dat>`_.
+
+Optionally raises exceptions on non-existing TLDs or silently fails (if
+``fail_silently`` argument is set to True).
+
+.. image:: https://img.shields.io/pypi/v/tld.svg
+   :target: https://pypi.python.org/pypi/tld
+   :alt: PyPI Version
+
+.. image:: https://img.shields.io/pypi/pyversions/tld.svg
+    :target: https://pypi.python.org/pypi/tld/
+    :alt: Supported Python versions
+
+.. image:: https://github.com/barseghyanartur/tld/workflows/test/badge.svg
+   :target: https://github.com/barseghyanartur/tld/actions
+   :alt: Build Status
+
+.. image:: https://readthedocs.org/projects/tld/badge/?version=latest
+    :target: http://tld.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
+
+.. image:: https://img.shields.io/badge/docs-llms.txt-blue
+    :target: http://tld.readthedocs.io/en/latest/llms.txt
+    :alt: llms.txt - documentation for LLMs
+
+.. image:: https://img.shields.io/badge/license-MPL--1.1%20OR%20GPL--2.0--only%20OR%20LGPL--2.1--or--later-blue.svg
+   :target: https://github.com/barseghyanartur/tld/#License
+   :alt: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
+
+.. image:: https://coveralls.io/repos/github/barseghyanartur/tld/badge.svg?branch=master&service=github
+    :target: https://coveralls.io/github/barseghyanartur/tld?branch=master
+    :alt: Coverage
+
+Prerequisites
+=============
+- Python 3.9 or greater.
+
+Documentation
+=============
+Documentation is available on `Read the Docs
+<http://tld.readthedocs.io/>`_.
+
+Installation
+============
+Latest stable version on PyPI:
+
+.. code-block:: sh
+
+    pip install tld
+
+Usage examples
+==============
+In addition to examples below, see the `jupyter notebook <jupyter/>`_
+workbook file.
+
+Get the TLD name **as string** from the URL given
+-------------------------------------------------
+.. code-block:: python
+    :name: test_get_tld_name_as_string_from_url_given
+
+    from tld import get_tld
+
+    get_tld("http://www.google.co.uk")
+    # 'co.uk'
+
+    get_tld("http://www.google.idontexist", fail_silently=True)
+    # None
+
+Get the TLD as **an object**
+----------------------------
+.. code-block:: python
+    :name: test_get_tld_name_as_an_object
+
+    from tld import get_tld
+
+    res = get_tld("http://some.subdomain.google.co.uk", as_object=True)
+
+    res
+    # 'co.uk'
+
+    res.subdomain
+    # 'some.subdomain'
+
+    res.domain
+    # 'google'
+
+    res.tld
+    # 'co.uk'
+
+    res.fld
+    # 'google.co.uk'
+
+    res.parsed_url
+    # SplitResult(
+    #     scheme='http',
+    #     netloc='some.subdomain.google.co.uk',
+    #     path='',
+    #     query='',
+    #     fragment=''
+    # )
+
+Get TLD name, **ignoring the missing protocol**
+-----------------------------------------------
+.. code-block:: python
+    :name: test_get_tld_name_ignoring_the_missing_protocol
+
+    from tld import get_tld, get_fld
+
+    get_tld("www.google.co.uk", fix_protocol=True)
+    # 'co.uk'
+
+    get_fld("www.google.co.uk", fix_protocol=True)
+    # 'google.co.uk'
+
+Return TLD parts as tuple
+-------------------------
+.. code-block:: python
+    :name: test_get_tld_parts_as_tuple
+
+    from tld import parse_tld
+
+    parse_tld('http://www.google.com')
+    # 'com', 'google', 'www'
+
+Get the first level domain name **as string** from the URL given
+----------------------------------------------------------------
+.. code-block:: python
+    :name: test_get_first_level_domain_name_as_string_from_url_given
+
+    from tld import get_fld
+
+    get_fld("http://www.google.co.uk")
+    # 'google.co.uk'
+
+    get_fld("http://www.google.idontexist", fail_silently=True)
+    # None
+
+Check if some tld is a valid tld
+--------------------------------
+
+.. code-block:: python
+    :name: test_check_if_some_tld_is_a_valid_tld
+
+    from tld import is_tld
+
+    is_tld('co.uk')
+    # True
+
+    is_tld('uk')
+    # True
+
+    is_tld('tld.doesnotexist')
+    # False
+
+    is_tld('www.google.com')
+    # False
+
+Update the list of TLD names
+============================
+To update/sync the tld names with the most recent versions run the following
+from your terminal:
+
+.. code-block:: sh
+
+    update-tld-names
+
+Or simply do:
+
+.. code-block:: python
+    :name: test_update_the_list_of_tld_names
+
+    from tld.utils import update_tld_names
+
+    update_tld_names()
+
+Note, that this will update all registered TLD source parsers (not only the
+list of TLD names taken from Mozilla). In order to run the update for a single
+parser, append ``uid`` of that parser as argument.
+
+.. code-block:: sh
+
+    update-tld-names mozilla
+
+Custom TLD parsers
+==================
+By default list of TLD names is taken from Mozilla. Parsing implemented in
+the ``tld.utils.MozillaTLDSourceParser`` class. If you want to use another
+parser, subclass the ``tld.base.BaseTLDSourceParser``, provide ``uid``,
+``source_url``, ``local_path`` and implement the ``get_tld_names`` method.
+Take the ``tld.utils.MozillaTLDSourceParser`` as a good example of such
+implementation. You could then use ``get_tld`` (as well as other ``tld``
+module functions) as shown below:
+
+.. pytestfixture: custom_tld_source_parser
+.. code-block:: python
+    :name: test_custom_tld_source_parser
+
+    from tld import get_tld
+    from some.module import CustomTLDSourceParser
+
+    get_tld(
+        "http://www.google.co.uk",
+        parser_class=CustomTLDSourceParser
+    )
+
+Custom list of TLD names
+========================
+You could maintain your own custom version of the TLD names list (even multiple
+ones) and use them simultaneously with built in TLD names list.
+
+You would then store them locally and provide a path to it as shown below:
+
+.. code-block:: python
+    :name: test_get_tld_custom_list_of_tld_names
+
+    from tld import get_tld
+    from tld.utils import BaseMozillaTLDSourceParser
+
+    class CustomBaseMozillaTLDSourceParser(BaseMozillaTLDSourceParser):
+
+        uid: str = 'custom_mozilla'
+        local_path: str = 'tests/res/effective_tld_names_custom.dat.txt'
+
+    get_tld(
+        "http://www.foreverchild",
+        parser_class=CustomBaseMozillaTLDSourceParser
+    )
+    # 'foreverchild'
+
+Same goes for first level domain names:
+
+.. continue: test_get_tld_custom_list_of_tld_names
+.. code-block:: python
+    :name: test_get_fld_custom_list_of_tld_names
+
+    from tld import get_fld
+
+    get_fld(
+        "http://www.foreverchild",
+        parser_class=CustomBaseMozillaTLDSourceParser
+    )
+    # 'www.foreverchild'
+
+Note, that in both examples shown above, there the original TLD names file has
+been modified in the following way:
+
+.. code-block:: text
+
+    ...
+    // ===BEGIN ICANN DOMAINS===
+
+    // This one actually does not exist, added for testing purposes
+    foreverchild
+    ...
+
+Free up resources
+=================
+To free up memory occupied by loading of custom TLD names, use
+``reset_tld_names`` function with ``tld_names_local_path`` parameter.
+
+.. continue: test_get_tld_custom_list_of_tld_names
+.. code-block:: python
+    :name: test_free_up_resources
+
+    from tld import get_tld, reset_tld_names
+
+    # Get TLD from a custom TLD names parser
+    get_tld(
+        "http://www.foreverchild",
+        parser_class=CustomBaseMozillaTLDSourceParser
+    )
+
+    # Free resources occupied by the custom TLD names list
+    reset_tld_names("tests/res/effective_tld_names_custom.dat.txt")
+
+Troubleshooting
+===============
+If somehow domain names listed `here <https://publicsuffix.org/list/public_suffix_list.dat>`_
+are not recognised, make sure you have the most recent version of TLD names in
+your virtual environment:
+
+.. code-block:: sh
+
+    update-tld-names
+
+To update TLD names list for a single parser, specify it as an argument:
+
+.. code-block:: sh
+
+    update-tld-names mozilla
+
+Testing
+=======
+Simply type:
+
+.. code-block:: sh
+
+    pytest
+
+Or use tox:
+
+.. code-block:: sh
+
+    tox
+
+Or use tox to check specific env:
+
+.. code-block:: sh
+
+    tox -e py39
+
+Writing documentation
+=====================
+
+Keep the following hierarchy.
+
+.. code-block:: text
+
+    =====
+    title
+    =====
+
+    header
+    ======
+
+    sub-header
+    ----------
+
+    sub-sub-header
+    ~~~~~~~~~~~~~~
+
+    sub-sub-sub-header
+    ^^^^^^^^^^^^^^^^^^
+
+    sub-sub-sub-sub-header
+    ++++++++++++++++++++++
+
+    sub-sub-sub-sub-sub-header
+    **************************
+
+License
+=======
+MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
+
+Support
+=======
+For security issues contact me at the e-mail given in the `Author`_ section.
+
+For overall issues, go to `GitHub <https://github.com/barseghyanartur/tld/issues>`_.
+
+Author
+======
+Artur Barseghyan <artur.barseghyan@gmail.com>
diff --git a/libs/tld-0.13.2.dist-info/RECORD b/libs/tld-0.13.2.dist-info/RECORD
new file mode 100644
index 0000000000..d733e09273
--- /dev/null
+++ b/libs/tld-0.13.2.dist-info/RECORD
@@ -0,0 +1,31 @@
+../../bin/update-tld-names,sha256=wP2rbxRgBE5LcxgsZLh4XRiQK9lgHKAOZtL5BLmD_iY,216
+tld-0.13.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+tld-0.13.2.dist-info/METADATA,sha256=H4qhft98Gu2U-NFMihmfmKFBYQzwE3DgCaGUnK1c6iU,11361
+tld-0.13.2.dist-info/RECORD,,
+tld-0.13.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tld-0.13.2.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+tld-0.13.2.dist-info/entry_points.txt,sha256=9Lt5EVKQYjI_rCULtund6omvOBP2GGt-eOqScX-yyPk,68
+tld-0.13.2.dist-info/licenses/LICENSE.rst,sha256=OOhZwGPvg-scaNKKtn_61W4FY5jEU-TClo1W3i6o53c,159
+tld-0.13.2.dist-info/licenses/LICENSE_GPL2.0.txt,sha256=3w8LMLh6hnRpIalRZDh4eGRtaqBoOnshH6ikDhFNYRE,18083
+tld-0.13.2.dist-info/licenses/LICENSE_LGPL_2.1.txt,sha256=lhMXOO1t3BzePhSCoSWiJ7WltJiBMbC0vCdc_jc2ZNg,26434
+tld-0.13.2.dist-info/licenses/LICENSE_MPL_1.1.txt,sha256=PqB6Pf_k8LXvepKj9HQZjf332spZbIvbvPGEriBEOow,25679
+tld-0.13.2.dist-info/top_level.txt,sha256=e6zHqPEXgmXJdg57TauJs82kkabhIofwO_J2n7-olDc,4
+tld/__init__.py,sha256=Cdj-GF_GRrXPDBIxbCeWYI2gLwekVvPRFvQrU2M-fI8,487
+tld/base.py,sha256=dL6uOiZGXPwqKFZkBUb4oCxTbtbV0AsjuehwwLqpO7c,3186
+tld/conf.py,sha256=qY5Noypb5AeNSyiqWlg2VaZ3hUnmLe8OK_2VDh5t_oQ,1320
+tld/defaults.py,sha256=RFTAzZKMt23DelU40AXNxMY1G8XpH5iDnnEmw56DbI8,344
+tld/exceptions.py,sha256=Ieuu7qNPfjYj3opzf7no4OXgDiPw9eMfeeUjAKm-fUU,1197
+tld/helpers.py,sha256=GOVBUBXZVHNreyqKGCL0DSk910qEdkXtQL59m3cW5BM,496
+tld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tld/registry.py,sha256=jgHyQrfBZfLmRnbzhs7K2c3ka0YmF7KD82-7WTMG7hk,329
+tld/res/effective_tld_names.dat.txt,sha256=q_Ms6Zh9UFuJdl1281dgVDhRI1UI8fQmtbJZogYrX2g,330904
+tld/res/effective_tld_names_public_only.dat.txt,sha256=q_Ms6Zh9UFuJdl1281dgVDhRI1UI8fQmtbJZogYrX2g,330904
+tld/result.py,sha256=G4GYMMaqTbjEznFg_hSrNnQQLjwjGZOUzws4PneAx1Q,1470
+tld/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tld/tests/base.py,sha256=HrgaNdp5MVYVBXyFea4_DL5sNuc6gJcy2r1ryl0a_2M,1403
+tld/tests/res/effective_tld_names_custom.dat.txt,sha256=bJ9G9jIR0iFRlZCyL7D1aHkjyc4SEjlMUd-e9KM3AG4,216078
+tld/tests/test_commands.py,sha256=UsWLcuJW_2iO0jQq0z2Bxm5471ay4paxL8mLyDR6jW0,950
+tld/tests/test_core.py,sha256=t_--8ASY_Qn7GXGb6EEyQRyZAFcQlN-mRBjIMYvy3Eg,29176
+tld/tests/test_registry.py,sha256=LviXw37lKsMZsaaNTFjtepYJmNREd6ieS96o8MaNkfY,407
+tld/trie.py,sha256=OQqX7jkXAbxaydpzhURrMsMVh1bVhUaVnS2u6RXJAOQ,1608
+tld/utils.py,sha256=6I8d8nrwHqRks7HrwTzqek3Dzc9Pk7Es6oWRvJ14GgI,19159
diff --git a/libs/tzdata-2024.2.dist-info/REQUESTED b/libs/tld-0.13.2.dist-info/REQUESTED
similarity index 100%
rename from libs/tzdata-2024.2.dist-info/REQUESTED
rename to libs/tld-0.13.2.dist-info/REQUESTED
diff --git a/libs/tld-0.13.2.dist-info/WHEEL b/libs/tld-0.13.2.dist-info/WHEEL
new file mode 100644
index 0000000000..798dd6195b
--- /dev/null
+++ b/libs/tld-0.13.2.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/tld-0.13.dist-info/entry_points.txt b/libs/tld-0.13.2.dist-info/entry_points.txt
similarity index 100%
rename from libs/tld-0.13.dist-info/entry_points.txt
rename to libs/tld-0.13.2.dist-info/entry_points.txt
diff --git a/libs/tld-0.13.2.dist-info/licenses/LICENSE.rst b/libs/tld-0.13.2.dist-info/licenses/LICENSE.rst
new file mode 100644
index 0000000000..d45bf722d6
--- /dev/null
+++ b/libs/tld-0.13.2.dist-info/licenses/LICENSE.rst
@@ -0,0 +1,7 @@
+`tld` is licensed under the
+`GPL 2.0 <LICENSE_GPL2.0.txt>`_
+or the
+`LGPL 2.1 <LICENSE_LGPL_2.1.txt>`_
+or the
+`MPL 1.1 <LICENSE_MPL_1.1.txt>`_,
+at your option.
diff --git a/libs/tld-0.13.2.dist-info/licenses/LICENSE_GPL2.0.txt b/libs/tld-0.13.2.dist-info/licenses/LICENSE_GPL2.0.txt
new file mode 100644
index 0000000000..0330576b85
--- /dev/null
+++ b/libs/tld-0.13.2.dist-info/licenses/LICENSE_GPL2.0.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    tld - Extract the top level domain (TLD) from the URL given.
+    Copyright (C) 2013-2021 Artur Barseghyan
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/libs/tld-0.13.dist-info/LICENSE_LGPL_2.1.txt b/libs/tld-0.13.2.dist-info/licenses/LICENSE_LGPL_2.1.txt
similarity index 100%
rename from libs/tld-0.13.dist-info/LICENSE_LGPL_2.1.txt
rename to libs/tld-0.13.2.dist-info/licenses/LICENSE_LGPL_2.1.txt
diff --git a/libs/tld-0.13.2.dist-info/licenses/LICENSE_MPL_1.1.txt b/libs/tld-0.13.2.dist-info/licenses/LICENSE_MPL_1.1.txt
new file mode 100644
index 0000000000..d4ffcf957d
--- /dev/null
+++ b/libs/tld-0.13.2.dist-info/licenses/LICENSE_MPL_1.1.txt
@@ -0,0 +1,467 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the MPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     https://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     tld - Extract the top level domain (TLD) from the URL given.
+     Copyright (C) 2013-2021 Artur Barseghyan
+
+     The Initial Developer of the Original Code is Artur Barseghyan,
+     copyright (C) 2013-2021. All Rights Reserved.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the GPL 2.0 license or LGPL 2.1 license, in which case the
+     provisions of the chosen License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the certain License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the correspondent License.  If you do not
+     delete the provisions above, a recipient may use your version of this file
+     under either the MPL or the GPL 2.0/LGPL 2.1 License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
diff --git a/libs/tld-0.13.dist-info/top_level.txt b/libs/tld-0.13.2.dist-info/top_level.txt
similarity index 100%
rename from libs/tld-0.13.dist-info/top_level.txt
rename to libs/tld-0.13.2.dist-info/top_level.txt
diff --git a/libs/tld-0.13.dist-info/METADATA b/libs/tld-0.13.dist-info/METADATA
deleted file mode 100644
index cf8d2b02f2..0000000000
--- a/libs/tld-0.13.dist-info/METADATA
+++ /dev/null
@@ -1,376 +0,0 @@
-Metadata-Version: 2.1
-Name: tld
-Version: 0.13
-Summary: Extract the top-level domain (TLD) from the URL given.
-Home-page: https://github.com/barseghyanartur/tld
-Author: Artur Barseghyan
-Author-email: artur.barseghyan@gmail.com
-License: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
-Project-URL: Bug Tracker, https://github.com/barseghyanartur/tld/issues
-Project-URL: Documentation, https://tld.readthedocs.io/
-Project-URL: Source Code, https://github.com/barseghyanartur/tld/
-Project-URL: Changelog, https://tld.readthedocs.io/en/latest/changelog.html
-Keywords: tld,top-level domain names,python
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: Operating System :: OS Independent
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Topic :: Internet
-Classifier: License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)
-Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
-Classifier: License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)
-Requires-Python: >=3.7, <4
-License-File: LICENSE_LGPL_2.1.txt
-
-===
-tld
-===
-Extract the top level domain (TLD) from the URL given. List of TLD names is
-taken from `Public Suffix <https://publicsuffix.org/list/public_suffix_list.dat>`_.
-
-Optionally raises exceptions on non-existing TLDs or silently fails (if
-``fail_silently`` argument is set to True).
-
-.. image:: https://img.shields.io/pypi/v/tld.svg
-   :target: https://pypi.python.org/pypi/tld
-   :alt: PyPI Version
-
-.. image:: https://img.shields.io/pypi/pyversions/tld.svg
-    :target: https://pypi.python.org/pypi/tld/
-    :alt: Supported Python versions
-
-.. image:: https://github.com/barseghyanartur/tld/workflows/test/badge.svg
-   :target: https://github.com/barseghyanartur/tld/actions
-   :alt: Build Status
-
-.. image:: https://readthedocs.org/projects/tld/badge/?version=latest
-    :target: http://tld.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
-
-.. image:: https://img.shields.io/badge/license-MPL--1.1%20OR%20GPL--2.0--only%20OR%20LGPL--2.1--or--later-blue.svg
-   :target: https://github.com/barseghyanartur/tld/#License
-   :alt: MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
-
-.. image:: https://coveralls.io/repos/github/barseghyanartur/tld/badge.svg?branch=master&service=github
-    :target: https://coveralls.io/github/barseghyanartur/tld?branch=master
-    :alt: Coverage
-
-Prerequisites
-=============
-- Python 3.7, 3.8, 3.9, 3.10 or 3.11.
-
-Documentation
-=============
-Documentation is available on `Read the Docs
-<http://tld.readthedocs.io/>`_.
-
-Installation
-============
-Latest stable version on PyPI:
-
-.. code-block:: sh
-
-    pip install tld
-
-Or latest stable version from GitHub:
-
-.. code-block:: sh
-
-    pip install https://github.com/barseghyanartur/tld/archive/stable.tar.gz
-
-Usage examples
-==============
-In addition to examples below, see the `jupyter notebook <jupyter/>`_
-workbook file.
-
-Get the TLD name **as string** from the URL given
--------------------------------------------------
-.. code-block:: python
-
-    from tld import get_tld
-
-    get_tld("http://www.google.co.uk")
-    # 'co.uk'
-
-    get_tld("http://www.google.idontexist", fail_silently=True)
-    # None
-
-Get the TLD as **an object**
-----------------------------
-.. code-block:: python
-
-    from tld import get_tld
-
-    res = get_tld("http://some.subdomain.google.co.uk", as_object=True)
-
-    res
-    # 'co.uk'
-
-    res.subdomain
-    # 'some.subdomain'
-
-    res.domain
-    # 'google'
-
-    res.tld
-    # 'co.uk'
-
-    res.fld
-    # 'google.co.uk'
-
-    res.parsed_url
-    # SplitResult(
-    #     scheme='http',
-    #     netloc='some.subdomain.google.co.uk',
-    #     path='',
-    #     query='',
-    #     fragment=''
-    # )
-
-Get TLD name, **ignoring the missing protocol**
------------------------------------------------
-.. code-block:: python
-
-    from tld import get_tld, get_fld
-
-    get_tld("www.google.co.uk", fix_protocol=True)
-    # 'co.uk'
-
-    get_fld("www.google.co.uk", fix_protocol=True)
-    # 'google.co.uk'
-
-Return TLD parts as tuple
--------------------------
-.. code-block:: python
-
-    from tld import parse_tld
-
-    parse_tld('http://www.google.com')
-    # 'com', 'google', 'www'
-
-Get the first level domain name **as string** from the URL given
-----------------------------------------------------------------
-.. code-block:: python
-
-    from tld import get_fld
-
-    get_fld("http://www.google.co.uk")
-    # 'google.co.uk'
-
-    get_fld("http://www.google.idontexist", fail_silently=True)
-    # None
-
-Check if some tld is a valid tld
---------------------------------
-
-.. code-block:: python
-
-    from tld import is_tld
-
-    is_tld('co.uk)
-    # True
-
-    is_tld('uk')
-    # True
-
-    is_tld('tld.doesnotexist')
-    # False
-
-    is_tld('www.google.com')
-    # False
-
-Update the list of TLD names
-============================
-To update/sync the tld names with the most recent versions run the following
-from your terminal:
-
-.. code-block:: sh
-
-    update-tld-names
-
-Or simply do:
-
-.. code-block:: python
-
-    from tld.utils import update_tld_names
-
-    update_tld_names()
-
-Note, that this will update all registered TLD source parsers (not only the
-list of TLD names taken from Mozilla). In order to run the update for a single
-parser, append ``uid`` of that parser as argument.
-
-.. code-block:: sh
-
-    update-tld-names mozilla
-
-Custom TLD parsers
-==================
-By default list of TLD names is taken from Mozilla. Parsing implemented in
-the ``tld.utils.MozillaTLDSourceParser`` class. If you want to use another
-parser, subclass the ``tld.base.BaseTLDSourceParser``, provide ``uid``,
-``source_url``, ``local_path`` and implement the ``get_tld_names`` method.
-Take the ``tld.utils.MozillaTLDSourceParser`` as a good example of such
-implementation. You could then use ``get_tld`` (as well as other ``tld``
-module functions) as shown below:
-
-.. code-block:: python
-
-    from tld import get_tld
-    from some.module import CustomTLDSourceParser
-
-    get_tld(
-        "http://www.google.co.uk",
-        parser_class=CustomTLDSourceParser
-    )
-
-Custom list of TLD names
-========================
-You could maintain your own custom version of the TLD names list (even multiple
-ones) and use them simultaneously with built in TLD names list.
-
-You would then store them locally and provide a path to it as shown below:
-
-.. code-block:: python
-
-    from tld import get_tld
-    from tld.utils import BaseMozillaTLDSourceParser
-
-    class CustomBaseMozillaTLDSourceParser(BaseMozillaTLDSourceParser):
-
-        uid: str = 'custom_mozilla'
-        local_path: str = 'tests/res/effective_tld_names_custom.dat.txt'
-
-    get_tld(
-        "http://www.foreverchild",
-        parser_class=CustomBaseMozillaTLDSourceParser
-    )
-    # 'foreverchild'
-
-Same goes for first level domain names:
-
-.. code-block:: python
-
-    from tld import get_fld
-
-    get_fld(
-        "http://www.foreverchild",
-        parser_class=CustomBaseMozillaTLDSourceParser
-    )
-    # 'www.foreverchild'
-
-Note, that in both examples shown above, there the original TLD names file has
-been modified in the following way:
-
-.. code-block:: text
-
-    ...
-    // ===BEGIN ICANN DOMAINS===
-
-    // This one actually does not exist, added for testing purposes
-    foreverchild
-    ...
-
-Free up resources
-=================
-To free up memory occupied by loading of custom TLD names, use
-``reset_tld_names`` function with ``tld_names_local_path`` parameter.
-
-.. code-block:: python
-
-    from tld import get_tld, reset_tld_names
-
-    # Get TLD from a custom TLD names parser
-    get_tld(
-        "http://www.foreverchild",
-        parser_class=CustomBaseMozillaTLDSourceParser
-    )
-
-    # Free resources occupied by the custom TLD names list
-    reset_tld_names("tests/res/effective_tld_names_custom.dat.txt")
-
-Troubleshooting
-===============
-If somehow domain names listed `here <https://publicsuffix.org/list/public_suffix_list.dat>`_
-are not recognised, make sure you have the most recent version of TLD names in
-your virtual environment:
-
-.. code-block:: sh
-
-    update-tld-names
-
-To update TLD names list for a single parser, specify it as an argument:
-
-.. code-block:: sh
-
-    update-tld-names mozilla
-
-Testing
-=======
-Simply type:
-
-.. code-block:: sh
-
-    pytest
-
-Or use tox:
-
-.. code-block:: sh
-
-    tox
-
-Or use tox to check specific env:
-
-.. code-block:: sh
-
-    tox -e py39
-
-Writing documentation
-=====================
-
-Keep the following hierarchy.
-
-.. code-block:: text
-
-    =====
-    title
-    =====
-
-    header
-    ======
-
-    sub-header
-    ----------
-
-    sub-sub-header
-    ~~~~~~~~~~~~~~
-
-    sub-sub-sub-header
-    ^^^^^^^^^^^^^^^^^^
-
-    sub-sub-sub-sub-header
-    ++++++++++++++++++++++
-
-    sub-sub-sub-sub-sub-header
-    **************************
-
-License
-=======
-MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later
-
-Support
-=======
-For security issues contact me at the e-mail given in the `Author`_ section.
-
-For overall issues, go to `GitHub <https://github.com/barseghyanartur/tld/issues>`_.
-
-Author
-======
-Artur Barseghyan <artur.barseghyan@gmail.com>
diff --git a/libs/tld-0.13.dist-info/RECORD b/libs/tld-0.13.dist-info/RECORD
deleted file mode 100644
index e4ef5fe2ae..0000000000
--- a/libs/tld-0.13.dist-info/RECORD
+++ /dev/null
@@ -1,28 +0,0 @@
-../../bin/update-tld-names,sha256=SiO5YZADew1EXutcp6Z0MDopX6TQ8FGiF5iCzFYojHg,263
-tld-0.13.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tld-0.13.dist-info/LICENSE_LGPL_2.1.txt,sha256=lhMXOO1t3BzePhSCoSWiJ7WltJiBMbC0vCdc_jc2ZNg,26434
-tld-0.13.dist-info/METADATA,sha256=PchbNu-mskdDUuPHmlKPVxtz87CEFkgMJS3dPMg4-ek,9412
-tld-0.13.dist-info/RECORD,,
-tld-0.13.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tld-0.13.dist-info/WHEEL,sha256=TJ49d73sNs10F0aze1W_bTW2P_X7-F4YXOlBqoqA-jY,109
-tld-0.13.dist-info/entry_points.txt,sha256=9Lt5EVKQYjI_rCULtund6omvOBP2GGt-eOqScX-yyPk,68
-tld-0.13.dist-info/top_level.txt,sha256=e6zHqPEXgmXJdg57TauJs82kkabhIofwO_J2n7-olDc,4
-tld/__init__.py,sha256=o15veYtcZ8LenSgXY-Hmtoa8ALABZ4_i-5Yx0euHRCc,441
-tld/base.py,sha256=5-6uGdKOAJVq9SafF3aVc1F_5rOUatAuUAZGKTG64wc,3187
-tld/conf.py,sha256=xxw1PMPaDd6b7LCPLfSofilP0CcMI9Q6rwWh1WPDwBE,1320
-tld/defaults.py,sha256=3KMgT8VNJKuKtHLgrQEcDc1bceAnC3iUB9rpuKoYkfw,344
-tld/exceptions.py,sha256=c1uYaVH4xgBKHkqqUxiThA3ti4e5E2Q-xr-KWH9ZLLI,1197
-tld/helpers.py,sha256=xQvdeeMb6m93V3Ey2kCi93vHDioqTM-FSrFNvZbKHNo,496
-tld/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tld/registry.py,sha256=iSkofMCl_AjhyBV6RI-c_-xb9jReo25Mpg_cgNCGP_s,329
-tld/res/effective_tld_names.dat.txt,sha256=sIjQXAaTnNM2efrCIuesa886DiZb8LSuFbc91miUs-c,246638
-tld/res/effective_tld_names_public_only.dat.txt,sha256=sIjQXAaTnNM2efrCIuesa886DiZb8LSuFbc91miUs-c,246638
-tld/result.py,sha256=S0kZ4cPZJogAN2EdIEW95kpG09t0923UIVT217w2pf4,1470
-tld/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tld/tests/base.py,sha256=z33j3E6sUMwRv7J0WLsWBcekH7W5CJk_PTXm8TQ_ym4,2040
-tld/tests/res/effective_tld_names_custom.dat.txt,sha256=bJ9G9jIR0iFRlZCyL7D1aHkjyc4SEjlMUd-e9KM3AG4,216078
-tld/tests/test_commands.py,sha256=0SGryyko4mXnRXRCfU9PvYLeGwUt9gPzr9M753XpQKc,1002
-tld/tests/test_core.py,sha256=yXQisjMKZNMZXokWczYnepKuoodoro5aTSqif5mtgD0,28562
-tld/tests/test_registry.py,sha256=WMZ2QWB5ugodxncapaqw0ol2yc5g5IHGfWB-WErwLzo,407
-tld/trie.py,sha256=FivOmL9DCKSoSJbzgTdIwtJa-OcJMbpKEaGNwVXgdDU,1609
-tld/utils.py,sha256=F2xIyKjTH3bm2timtQ84ehDnmUsyV8OfLTfoLlT6GF0,19060
diff --git a/libs/tld-0.13.dist-info/WHEEL b/libs/tld-0.13.dist-info/WHEEL
deleted file mode 100644
index 17c0299e49..0000000000
--- a/libs/tld-0.13.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/tld/__init__.py b/libs/tld/__init__.py
index 038a3d721a..7c25c2ef2c 100644
--- a/libs/tld/__init__.py
+++ b/libs/tld/__init__.py
@@ -5,20 +5,22 @@
     get_tld_names,
     is_tld,
     parse_tld,
+    reset_tld_names,
     update_tld_names,
 )
 
 __title__ = "tld"
-__version__ = "0.13"
+__version__ = "0.13.2"
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
+    "Result",
     "get_fld",
     "get_tld",
     "get_tld_names",
     "is_tld",
     "parse_tld",
-    "Result",
+    "reset_tld_names",
     "update_tld_names",
 )
diff --git a/libs/tld/base.py b/libs/tld/base.py
index 543c6f4d5f..c788d3d519 100644
--- a/libs/tld/base.py
+++ b/libs/tld/base.py
@@ -7,7 +7,7 @@
 from .helpers import project_dir
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "BaseTLDSourceParser",
@@ -18,7 +18,6 @@
 
 
 class Registry(type):
-
     REGISTRY: Dict[str, "BaseTLDSourceParser"] = {}
 
     def __new__(mcs, name, bases, attrs):
diff --git a/libs/tld/conf.py b/libs/tld/conf.py
index 3291b847ba..fcfec0064b 100644
--- a/libs/tld/conf.py
+++ b/libs/tld/conf.py
@@ -3,7 +3,7 @@
 from . import defaults
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "get_setting",
diff --git a/libs/tld/defaults.py b/libs/tld/defaults.py
index 9a11b5b430..3bdffa17bf 100644
--- a/libs/tld/defaults.py
+++ b/libs/tld/defaults.py
@@ -1,7 +1,7 @@
 from os.path import dirname
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "DEBUG",
diff --git a/libs/tld/exceptions.py b/libs/tld/exceptions.py
index cd0e817667..81291144b1 100644
--- a/libs/tld/exceptions.py
+++ b/libs/tld/exceptions.py
@@ -1,5 +1,5 @@
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "TldBadUrl",
diff --git a/libs/tld/helpers.py b/libs/tld/helpers.py
index 8b44e70368..451ed203de 100644
--- a/libs/tld/helpers.py
+++ b/libs/tld/helpers.py
@@ -3,7 +3,7 @@
 from .conf import get_setting
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "project_dir",
diff --git a/libs/tld/registry.py b/libs/tld/registry.py
index 857a8cff71..a12cff829f 100644
--- a/libs/tld/registry.py
+++ b/libs/tld/registry.py
@@ -3,7 +3,7 @@
 from .base import Registry  # noqa
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = ("Registry",)
 
diff --git a/libs/tld/res/effective_tld_names.dat.txt b/libs/tld/res/effective_tld_names.dat.txt
index c1ce374050..eedd6a437a 100644
--- a/libs/tld/res/effective_tld_names.dat.txt
+++ b/libs/tld/res/effective_tld_names.dat.txt
@@ -5,6 +5,9 @@
 // Please pull this list from, and only from https://publicsuffix.org/list/public_suffix_list.dat,
 // rather than any other VCS sites. Pulling from any other URL is not guaranteed to be supported.
 
+// VERSION: 2026-03-06_02-20-37_UTC
+// COMMIT: a7621207f34b3a739a5cfb2c47a518b0b9054fe6
+
 // Instructions on pulling and using this list can be found at https://publicsuffix.org/list/.
 
 // ===BEGIN ICANN DOMAINS===
@@ -14,40 +17,48 @@ ac
 com.ac
 edu.ac
 gov.ac
-net.ac
 mil.ac
+net.ac
 org.ac
 
-// ad : https://en.wikipedia.org/wiki/.ad
+// ad : https://www.iana.org/domains/root/db/ad.html
+// Confirmed by Amadeu Abril i Abril (CORE) <amadeu.abril@corenic.org> 2024-11-17
 ad
-nom.ad
 
-// ae : https://tdra.gov.ae/en/aeda/ae-policies
+// ae : https://www.iana.org/domains/root/db/ae.html
 ae
+ac.ae
 co.ae
+gov.ae
+mil.ae
 net.ae
 org.ae
 sch.ae
-ac.ae
-gov.ae
-mil.ae
 
-// aero : see https://www.information.aero/index.php?id=66
+// aero : https://information.aero/registration/policies/dmp
 aero
+// 2LDs
+airline.aero
+airport.aero
+// 2LDs (currently not accepting registration, seemingly never have)
+// As of 2024-07, these are marked as reserved for potential 3LD
+// registrations (clause 11 "allocated subdomains" in the 2006 TLD
+// policy), but the relevant industry partners have not opened them up
+// for registration. Current status can be determined from the TLD's
+// policy document: 2LDs that are open for registration must list
+// their policy in the TLD's policy. Any 2LD without such a policy is
+// not open for registrations.
 accident-investigation.aero
 accident-prevention.aero
 aerobatic.aero
 aeroclub.aero
 aerodrome.aero
 agents.aero
-aircraft.aero
-airline.aero
-airport.aero
 air-surveillance.aero
-airtraffic.aero
 air-traffic-control.aero
+aircraft.aero
+airtraffic.aero
 ambulance.aero
-amusement.aero
 association.aero
 author.aero
 ballooning.aero
@@ -78,6 +89,7 @@ exchange.aero
 express.aero
 federation.aero
 flight.aero
+freight.aero
 fuel.aero
 gliding.aero
 government.aero
@@ -92,6 +104,7 @@ leasing.aero
 logistics.aero
 magazine.aero
 maintenance.aero
+marketplace.aero
 media.aero
 microlight.aero
 modelling.aero
@@ -114,6 +127,7 @@ show.aero
 skydiving.aero
 software.aero
 student.aero
+taxi.aero
 trader.aero
 trading.aero
 trainer.aero
@@ -121,27 +135,27 @@ union.aero
 workinggroup.aero
 works.aero
 
-// af : http://www.nic.af/help.jsp
+// af : https://www.nic.af/domain-price
 af
-gov.af
 com.af
-org.af
-net.af
 edu.af
+gov.af
+net.af
+org.af
 
 // ag : http://www.nic.ag/prices.htm
 ag
+co.ag
 com.ag
-org.ag
 net.ag
-co.ag
 nom.ag
+org.ag
 
 // ai : http://nic.com.ai/
 ai
-off.ai
 com.ai
 net.ai
+off.ai
 org.ai
 
 // al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
@@ -154,6 +168,7 @@ net.al
 org.al
 
 // am : https://www.amnic.net/policy/en/Policy_EN.pdf
+// Confirmed by ISOC AM <isoc@isoc.am> 2024-11-18
 am
 co.am
 com.am
@@ -161,17 +176,20 @@ commune.am
 net.am
 org.am
 
-// ao : https://en.wikipedia.org/wiki/.ao
-// http://www.dns.ao/REGISTR.DOC
+// ao : https://www.iana.org/domains/root/db/ao.html
+// https://www.dns.ao/ao/
 ao
+co.ao
 ed.ao
+edu.ao
+gov.ao
 gv.ao
+it.ao
 og.ao
-co.ao
+org.ao
 pb.ao
-it.ao
 
-// aq : https://en.wikipedia.org/wiki/.aq
+// aq : https://www.iana.org/domains/root/db/aq.html
 aq
 
 // ar : https://nic.ar/es/nic-argentina/normativa
@@ -188,51 +206,53 @@ musica.ar
 mutual.ar
 net.ar
 org.ar
+seg.ar
 senasa.ar
 tur.ar
 
-// arpa : https://en.wikipedia.org/wiki/.arpa
+// arpa : https://www.iana.org/domains/root/db/arpa.html
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
 arpa
 e164.arpa
+home.arpa
 in-addr.arpa
 ip6.arpa
 iris.arpa
 uri.arpa
 urn.arpa
 
-// as : https://en.wikipedia.org/wiki/.as
+// as : https://www.iana.org/domains/root/db/as.html
 as
 gov.as
 
-// asia : https://en.wikipedia.org/wiki/.asia
+// asia : https://www.iana.org/domains/root/db/asia.html
 asia
 
-// at : https://en.wikipedia.org/wiki/.at
+// at : https://www.iana.org/domains/root/db/at.html
 // Confirmed by registry <it@nic.at> 2008-06-17
 at
 ac.at
+sth.ac.at
 co.at
 gv.at
 or.at
-sth.ac.at
 
-// au : https://en.wikipedia.org/wiki/.au
-// http://www.auda.org.au/
+// au : https://www.iana.org/domains/root/db/au.html
+// https://www.auda.org.au/
+// Confirmed by registry <general@auda.org.au> 2025-07-16
 au
 // 2LDs
+asn.au
 com.au
-net.au
-org.au
 edu.au
 gov.au
-asn.au
 id.au
+net.au
+org.au
 // Historic 2LDs (closed to new registration, but sites still exist)
-info.au
 conf.au
 oz.au
-// CGDNs - http://www.cgdn.org.au/
+// CGDNs : https://www.auda.org.au/au-domain-names/the-different-au-domain-names/state-and-territory-domain-names/
 act.au
 nsw.au
 nt.au
@@ -252,9 +272,9 @@ sa.edu.au
 tas.edu.au
 vic.edu.au
 wa.edu.au
-// act.gov.au  Bug 984824 - Removed at request of Greg Tankard
-// nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
-// nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
+// act.gov.au - Bug 984824 - Removed at request of Greg Tankard
+// nsw.gov.au - Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
+// nt.gov.au - Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au
 tas.gov.au
@@ -262,31 +282,35 @@ vic.gov.au
 wa.gov.au
 // 4LDs
 // education.tas.edu.au - Removed at the request of the Department of Education Tasmania
-schools.nsw.edu.au
+// schools.nsw.edu.au - Removed at the request of the New South Wales Department of Education.
 
-// aw : https://en.wikipedia.org/wiki/.aw
+// aw : https://www.iana.org/domains/root/db/aw.html
 aw
 com.aw
 
-// ax : https://en.wikipedia.org/wiki/.ax
+// ax : https://www.iana.org/domains/root/db/ax.html
 ax
 
-// az : https://en.wikipedia.org/wiki/.az
+// az : https://www.iana.org/domains/root/db/az.html
+// Confirmed via https://whois.az/?page_id=10 2024-12-11
 az
+biz.az
+co.az
 com.az
-net.az
-int.az
-gov.az
-org.az
 edu.az
+gov.az
 info.az
-pp.az
+int.az
 mil.az
 name.az
+net.az
+org.az
+pp.az
+// No longer available for registration, however domains exist as of 2024-12-11
+// see https://whois.az/?page_id=783
 pro.az
-biz.az
 
-// ba : http://nic.ba/users_data/files/pravilnik_o_registraciji.pdf
+// ba : https://www.iana.org/domains/root/db/ba.html
 ba
 com.ba
 edu.ba
@@ -295,7 +319,7 @@ mil.ba
 net.ba
 org.ba
 
-// bb : https://en.wikipedia.org/wiki/.bb
+// bb : https://www.iana.org/domains/root/db/bb.html
 bb
 biz.bb
 co.bb
@@ -308,21 +332,46 @@ org.bb
 store.bb
 tv.bb
 
-// bd : https://en.wikipedia.org/wiki/.bd
-*.bd
-
-// be : https://en.wikipedia.org/wiki/.be
+// bd : https://www.iana.org/domains/root/db/bd.html
+// Confirmed by registry <dgm.domain@btcl.gov.bd>
+bd
+ac.bd
+ai.bd
+co.bd
+com.bd
+edu.bd
+gov.bd
+id.bd
+info.bd
+it.bd
+mil.bd
+net.bd
+org.bd
+sch.bd
+tv.bd
+
+// be : https://www.iana.org/domains/root/db/be.html
 // Confirmed by registry <tech@dns.be> 2008-06-08
 be
 ac.be
 
-// bf : https://en.wikipedia.org/wiki/.bf
+// bf : https://www.iana.org/domains/root/db/bf.html
 bf
 gov.bf
 
-// bg : https://en.wikipedia.org/wiki/.bg
+// bg : https://www.iana.org/domains/root/db/bg.html
 // https://www.register.bg/user/static/rules/en/index.html
 bg
+0.bg
+1.bg
+2.bg
+3.bg
+4.bg
+5.bg
+6.bg
+7.bg
+8.bg
+9.bg
 a.bg
 b.bg
 c.bg
@@ -349,26 +398,16 @@ w.bg
 x.bg
 y.bg
 z.bg
-0.bg
-1.bg
-2.bg
-3.bg
-4.bg
-5.bg
-6.bg
-7.bg
-8.bg
-9.bg
 
-// bh : https://en.wikipedia.org/wiki/.bh
+// bh : https://www.iana.org/domains/root/db/bh.html
 bh
 com.bh
 edu.bh
+gov.bh
 net.bh
 org.bh
-gov.bh
 
-// bi : https://en.wikipedia.org/wiki/.bi
+// bi : https://www.iana.org/domains/root/db/bi.html
 // http://whois.nic.bi/
 bi
 co.bi
@@ -377,11 +416,11 @@ edu.bi
 or.bi
 org.bi
 
-// biz : https://en.wikipedia.org/wiki/.biz
+// biz : https://www.iana.org/domains/root/db/biz.html
 biz
 
 // bj : https://nic.bj/bj-suffixes.txt
-// submitted by registry <contact@nic.bj>
+// Submitted by registry <contact@nic.bj>
 bj
 africa.bj
 agro.bj
@@ -399,12 +438,12 @@ money.bj
 net.bj
 org.bj
 ote.bj
-resto.bj
 restaurant.bj
+resto.bj
 tourism.bj
 univ.bj
 
-// bm : http://www.bermudanic.bm/dnr-text.txt
+// bm : https://www.bermudanic.bm/domain-registration/index.php
 bm
 com.bm
 edu.bm
@@ -420,15 +459,16 @@ gov.bn
 net.bn
 org.bn
 
-// bo : https://nic.bo/delegacion2015.php#h-1.10
+// bo : https://nic.bo
+// Confirmed by registry <soporte@nic.bo> 2024-11-19
 bo
 com.bo
 edu.bo
 gob.bo
 int.bo
-org.bo
-net.bo
 mil.bo
+net.bo
+org.bo
 tv.bo
 web.bo
 // Social Domains
@@ -454,9 +494,9 @@ natural.bo
 nombre.bo
 noticias.bo
 patria.bo
+plurinacional.bo
 politica.bo
 profesional.bo
-plurinacional.bo
 pueblo.bo
 revista.bo
 salud.bo
@@ -477,6 +517,7 @@ aju.br
 am.br
 anani.br
 aparecida.br
+api.br
 app.br
 arq.br
 art.br
@@ -484,6 +525,7 @@ ato.br
 b.br
 barueri.br
 belem.br
+bet.br
 bhz.br
 bib.br
 bio.br
@@ -561,6 +603,7 @@ se.gov.br
 sp.gov.br
 to.gov.br
 gru.br
+ia.br
 imb.br
 ind.br
 inf.br
@@ -571,6 +614,7 @@ joinville.br
 jor.br
 jus.br
 leg.br
+leilao.br
 lel.br
 log.br
 londrina.br
@@ -620,6 +664,7 @@ seg.br
 sjc.br
 slg.br
 slz.br
+social.br
 sorocaba.br
 srv.br
 taxi.br
@@ -636,17 +681,18 @@ vet.br
 vix.br
 vlog.br
 wiki.br
+xyz.br
 zlg.br
 
 // bs : http://www.nic.bs/rules.html
 bs
 com.bs
-net.bs
-org.bs
 edu.bs
 gov.bs
+net.bs
+org.bs
 
-// bt : https://en.wikipedia.org/wiki/.bt
+// bt : https://www.iana.org/domains/root/db/bt.html
 bt
 com.bt
 edu.bt
@@ -658,14 +704,16 @@ org.bt
 // Submitted by registry <jarle@uninett.no>
 bv
 
-// bw : https://en.wikipedia.org/wiki/.bw
-// http://www.gobin.info/domainname/bw.doc
-// list of other 2nd level tlds ?
+// bw : https://www.iana.org/domains/root/db/bw.html
+// https://nic.net.bw/bw-name-structure
 bw
+ac.bw
 co.bw
+gov.bw
+net.bw
 org.bw
 
-// by : https://en.wikipedia.org/wiki/.by
+// by : https://www.iana.org/domains/root/db/by.html
 // http://tld.by/rules_2006_en.html
 // list of other 2nd level tlds ?
 by
@@ -675,20 +723,20 @@ mil.by
 // second-level domain, but it's being used as one (see www.google.com.by and
 // www.yahoo.com.by, for example), so we list it here for safety's sake.
 com.by
-
 // http://hoster.by/
 of.by
 
-// bz : https://en.wikipedia.org/wiki/.bz
+// bz : https://www.iana.org/domains/root/db/bz.html
 // http://www.belizenic.bz/
 bz
+co.bz
 com.bz
-net.bz
-org.bz
 edu.bz
 gov.bz
+net.bz
+org.bz
 
-// ca : https://en.wikipedia.org/wiki/.ca
+// ca : https://www.iana.org/domains/root/db/ca.html
 ca
 // ca geographical names
 ab.ca
@@ -709,46 +757,43 @@ yk.ca
 // see also: http://registry.gc.ca/en/SubdomainFAQ
 gc.ca
 
-// cat : https://en.wikipedia.org/wiki/.cat
+// cat : https://www.iana.org/domains/root/db/cat.html
 cat
 
-// cc : https://en.wikipedia.org/wiki/.cc
+// cc : https://www.iana.org/domains/root/db/cc.html
 cc
 
-// cd : https://en.wikipedia.org/wiki/.cd
-// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
+// cd : https://www.iana.org/domains/root/db/cd.html
+// https://www.nic.cd
 cd
 gov.cd
 
-// cf : https://en.wikipedia.org/wiki/.cf
+// cf : https://www.iana.org/domains/root/db/cf.html
 cf
 
-// cg : https://en.wikipedia.org/wiki/.cg
+// cg : https://www.iana.org/domains/root/db/cg.html
 cg
 
-// ch : https://en.wikipedia.org/wiki/.ch
+// ch : https://www.iana.org/domains/root/db/ch.html
 ch
 
-// ci : https://en.wikipedia.org/wiki/.ci
-// http://www.nic.ci/index.php?page=charte
+// ci : https://www.iana.org/domains/root/db/ci.html
 ci
-org.ci
-or.ci
-com.ci
+ac.ci
+aรฉroport.ci
+asso.ci
 co.ci
-edu.ci
+com.ci
 ed.ci
-ac.ci
-net.ci
+edu.ci
 go.ci
-asso.ci
-aรฉroport.ci
-int.ci
-presse.ci
-md.ci
 gouv.ci
+int.ci
+net.ci
+or.ci
+org.ci
 
-// ck : https://en.wikipedia.org/wiki/.ck
+// ck : https://www.iana.org/domains/root/db/ck.html
 *.ck
 !www.ck
 
@@ -760,26 +805,26 @@ gob.cl
 gov.cl
 mil.cl
 
-// cm : https://en.wikipedia.org/wiki/.cm plus bug 981927
+// cm : https://www.iana.org/domains/root/db/cm.html plus bug 981927
 cm
 co.cm
 com.cm
 gov.cm
 net.cm
 
-// cn : https://en.wikipedia.org/wiki/.cn
+// cn : https://www.iana.org/domains/root/db/cn.html
 // Submitted by registry <tanyaling@cnnic.cn>
 cn
 ac.cn
 com.cn
 edu.cn
 gov.cn
+mil.cn
 net.cn
 org.cn
-mil.cn
 ๅ…ฌๅธ.cn
-็ฝ‘็ปœ.cn
 ็ถฒ็ตก.cn
+็ฝ‘็ปœ.cn
 // cn geographic names
 ah.cn
 bj.cn
@@ -787,18 +832,20 @@ cq.cn
 fj.cn
 gd.cn
 gs.cn
-gz.cn
 gx.cn
+gz.cn
 ha.cn
 hb.cn
 he.cn
 hi.cn
+hk.cn
 hl.cn
 hn.cn
 jl.cn
 js.cn
 jx.cn
 ln.cn
+mo.cn
 nm.cn
 nx.cn
 qh.cn
@@ -808,38 +855,31 @@ sh.cn
 sn.cn
 sx.cn
 tj.cn
+tw.cn
 xj.cn
 xz.cn
 yn.cn
 zj.cn
-hk.cn
-mo.cn
-tw.cn
 
-// co : https://en.wikipedia.org/wiki/.co
-// Submitted by registry <tecnico@uniandes.edu.co>
+// co : https://www.iana.org/domains/root/db/co.html
+// https://www.cointernet.com.co/como-funciona-un-dominio-restringido
+// Confirmed by registry <gonzalo@cointernet.com.co> 2024-11-18
 co
-arts.co
 com.co
 edu.co
-firm.co
 gov.co
-info.co
-int.co
 mil.co
 net.co
 nom.co
 org.co
-rec.co
-web.co
 
-// com : https://en.wikipedia.org/wiki/.com
+// com : https://www.iana.org/domains/root/db/com.html
 com
 
-// coop : https://en.wikipedia.org/wiki/.coop
+// coop : https://www.iana.org/domains/root/db/coop.html
 coop
 
-// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
+// cr : https://nic.cr/capitulo-1-registro-de-un-nombre-de-dominio/
 cr
 ac.cr
 co.cr
@@ -849,40 +889,45 @@ go.cr
 or.cr
 sa.cr
 
-// cu : https://en.wikipedia.org/wiki/.cu
+// cu : https://www.iana.org/domains/root/db/cu.html
 cu
 com.cu
 edu.cu
-org.cu
-net.cu
-gov.cu
+gob.cu
 inf.cu
+nat.cu
+net.cu
+org.cu
 
-// cv : https://en.wikipedia.org/wiki/.cv
-// cv : http://www.dns.cv/tldcv_portal/do?com=DS;5446457100;111;+PAGE(4000018)+K-CAT-CODIGO(RDOM)+RCNT(100); <- registration rules
+// cv : https://www.iana.org/domains/root/db/cv.html
+// https://ola.cv/domain-extensions-under-cv/
+// Confirmed by registry <support@ola.cv> 2024-11-26
 cv
 com.cv
 edu.cv
+id.cv
 int.cv
+net.cv
 nome.cv
 org.cv
+publ.cv
 
-// cw : http://www.una.cw/cw_registry/
-// Confirmed by registry <registry@una.net> 2013-03-26
+// cw : https://www.uoc.cw/cw-registry
+// Confirmed by registry <registry@uoc.cw> 2024-11-19
 cw
 com.cw
 edu.cw
 net.cw
 org.cw
 
-// cx : https://en.wikipedia.org/wiki/.cx
+// cx : https://www.iana.org/domains/root/db/cx.html
 // list of other 2nd level tlds ?
 cx
 gov.cx
 
 // cy : http://www.nic.cy/
-// Submitted by registry Panayiotou Fotia <cydns@ucy.ac.cy>
-// namespace policies URL https://www.nic.cy/portal//sites/default/files/symfonia_gia_eggrafi.pdf
+// Submitted by Panayiotou Fotia <cydns@ucy.ac.cy>
+// https://nic.cy/wp-content/uploads/2024/01/Create-Request-for-domain-name-registration-1.pdf
 cy
 ac.cy
 biz.cy
@@ -897,30 +942,35 @@ press.cy
 pro.cy
 tm.cy
 
-// cz : https://en.wikipedia.org/wiki/.cz
+// cz : https://www.iana.org/domains/root/db/cz.html
+// Confirmed by registry <tech@nic.cz> 2025-08-06
 cz
+gov.cz
 
-// de : https://en.wikipedia.org/wiki/.de
+// de : https://www.iana.org/domains/root/db/de.html
 // Confirmed by registry <ops@denic.de> (with technical
 // reservations) 2008-07-01
 de
 
-// dj : https://en.wikipedia.org/wiki/.dj
+// dj : https://www.iana.org/domains/root/db/dj.html
 dj
 
-// dk : https://en.wikipedia.org/wiki/.dk
+// dk : https://www.iana.org/domains/root/db/dk.html
 // Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
 dk
 
-// dm : https://en.wikipedia.org/wiki/.dm
+// dm : https://www.iana.org/domains/root/db/dm.html
+// https://nic.dm/policies/pdf/DMRulesandGuidelines2024v1.pdf
+// Confirmed by registry <admin@dotdm.dm> 2024-11-19
 dm
+co.dm
 com.dm
-net.dm
-org.dm
 edu.dm
 gov.dm
+net.dm
+org.dm
 
-// do : https://en.wikipedia.org/wiki/.do
+// do : https://www.iana.org/domains/root/db/do.html
 do
 art.do
 com.do
@@ -940,97 +990,142 @@ asso.dz
 com.dz
 edu.dz
 gov.dz
-org.dz
 net.dz
+org.dz
 pol.dz
 soc.dz
 tm.dz
 
-// ec : http://www.nic.ec/reg/paso1.asp
-// Submitted by registry <vabboud@nic.ec>
+// ec : https://www.nic.ec/
+// Submitted by registry <infraestructura@nic.ec>
 ec
+abg.ec
+adm.ec
+agron.ec
+arqt.ec
+art.ec
+bar.ec
+chef.ec
 com.ec
-info.ec
-net.ec
+cont.ec
+cpa.ec
+cue.ec
+dent.ec
+dgn.ec
+disco.ec
+doc.ec
+edu.ec
+eng.ec
+esm.ec
 fin.ec
+fot.ec
+gal.ec
+gob.ec
+gov.ec
+gye.ec
+ibr.ec
+info.ec
 k12.ec
+lat.ec
+loj.ec
 med.ec
-pro.ec
-org.ec
-edu.ec
-gov.ec
-gob.ec
 mil.ec
-
-// edu : https://en.wikipedia.org/wiki/.edu
+mktg.ec
+mon.ec
+net.ec
+ntr.ec
+odont.ec
+org.ec
+pro.ec
+prof.ec
+psic.ec
+psiq.ec
+pub.ec
+rio.ec
+rrpp.ec
+sal.ec
+tech.ec
+tul.ec
+tur.ec
+uio.ec
+vet.ec
+xxx.ec
+
+// edu : https://www.iana.org/domains/root/db/edu.html
 edu
 
-// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
+// ee : https://www.internet.ee/domains/general-domains-and-procedure-for-registration-of-sub-domains-under-general-domains
 ee
+aip.ee
+com.ee
 edu.ee
+fie.ee
 gov.ee
-riik.ee
 lib.ee
 med.ee
-com.ee
-pri.ee
-aip.ee
 org.ee
-fie.ee
+pri.ee
+riik.ee
 
-// eg : https://en.wikipedia.org/wiki/.eg
+// eg : https://www.iana.org/domains/root/db/eg.html
+// https://domain.eg/en/domain-rules/subdomain-names-types/
 eg
+ac.eg
 com.eg
 edu.eg
 eun.eg
 gov.eg
+info.eg
+me.eg
 mil.eg
 name.eg
 net.eg
 org.eg
 sci.eg
+sport.eg
+tv.eg
 
-// er : https://en.wikipedia.org/wiki/.er
+// er : https://www.iana.org/domains/root/db/er.html
 *.er
 
-// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
+// es : https://www.dominios.es/en
 es
 com.es
+edu.es
+gob.es
 nom.es
 org.es
-gob.es
-edu.es
 
-// et : https://en.wikipedia.org/wiki/.et
+// et : https://www.iana.org/domains/root/db/et.html
 et
+biz.et
 com.et
-gov.et
-org.et
 edu.et
-biz.et
-name.et
+gov.et
 info.et
+name.et
 net.et
+org.et
 
-// eu : https://en.wikipedia.org/wiki/.eu
+// eu : https://www.iana.org/domains/root/db/eu.html
 eu
 
-// fi : https://en.wikipedia.org/wiki/.fi
+// fi : https://www.iana.org/domains/root/db/fi.html
 fi
-// aland.fi : https://en.wikipedia.org/wiki/.ax
+// aland.fi : https://www.iana.org/domains/root/db/ax.html
 // This domain is being phased out in favor of .ax. As there are still many
 // domains under aland.fi, we still keep it on the list until aland.fi is
 // completely removed.
-// TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
 
-// fj : http://domains.fj/
-// Submitted by registry <garth.miller@cocca.org.nz> 2020-02-11
+// fj : https://www.iana.org/domains/root/db/fj.html
 fj
 ac.fj
 biz.fj
 com.fj
+edu.fj
 gov.fj
+id.fj
 info.fj
 mil.fj
 name.fj
@@ -1038,21 +1133,20 @@ net.fj
 org.fj
 pro.fj
 
-// fk : https://en.wikipedia.org/wiki/.fk
+// fk : https://www.iana.org/domains/root/db/fk.html
 *.fk
 
-// fm : https://en.wikipedia.org/wiki/.fm
+// fm : https://www.iana.org/domains/root/db/fm.html
+fm
 com.fm
 edu.fm
 net.fm
 org.fm
-fm
 
-// fo : https://en.wikipedia.org/wiki/.fo
+// fo : https://www.iana.org/domains/root/db/fo.html
 fo
 
-// fr : http://www.afnic.fr/
-// domaines descriptifs : https://www.afnic.fr/medias/documents/Cadre_legal/Afnic_Naming_Policy_12122016_VEN.pdf
+// fr : https://www.afnic.fr/ https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 fr
 asso.fr
 com.fr
@@ -1060,76 +1154,68 @@ gouv.fr
 nom.fr
 prd.fr
 tm.fr
-// domaines sectoriels : https://www.afnic.fr/en/products-and-services/the-fr-tld/sector-based-fr-domains-4.html
-aeroport.fr
-avocat.fr
+// Other SLDs now selfmanaged out of AFNIC range. Former "domaines sectoriels", still registration suffixes
 avoues.fr
 cci.fr
-chambagri.fr
-chirurgiens-dentistes.fr
-experts-comptables.fr
-geometre-expert.fr
 greta.fr
 huissier-justice.fr
-medecin.fr
-notaires.fr
-pharmacien.fr
-port.fr
-veterinaire.fr
 
-// ga : https://en.wikipedia.org/wiki/.ga
+// ga : https://www.iana.org/domains/root/db/ga.html
 ga
 
 // gb : This registry is effectively dormant
 // Submitted by registry <Damien.Shaw@ja.net>
 gb
 
-// gd : https://en.wikipedia.org/wiki/.gd
+// gd : https://www.iana.org/domains/root/db/gd.html
+gd
 edu.gd
 gov.gd
-gd
 
-// ge : http://www.nic.net.ge/policy_en.pdf
+// ge : https://nic.ge/en/administrator/the-ge-domain-regulations
+// Confirmed by registry <info@nic.ge> 2024-11-20
 ge
 com.ge
 edu.ge
 gov.ge
-org.ge
-mil.ge
 net.ge
+org.ge
 pvt.ge
+school.ge
 
-// gf : https://en.wikipedia.org/wiki/.gf
+// gf : https://www.iana.org/domains/root/db/gf.html
 gf
 
-// gg : http://www.channelisles.net/register-domains/
+// gg : https://www.channelisles.net/register-1/register-direct
 // Confirmed by registry <nigel@channelisles.net> 2013-11-28
 gg
 co.gg
 net.gg
 org.gg
 
-// gh : https://en.wikipedia.org/wiki/.gh
-// see also: http://www.nic.gh/reg_now.php
+// gh : https://www.iana.org/domains/root/db/gh.html
+// https://www.nic.gh/
 // Although domains directly at second level are not possible at the moment,
 // they have been possible for some time and may come back.
 gh
+biz.gh
 com.gh
 edu.gh
 gov.gh
-org.gh
 mil.gh
+net.gh
+org.gh
 
 // gi : http://www.nic.gi/rules.html
 gi
 com.gi
-ltd.gi
+edu.gi
 gov.gi
+ltd.gi
 mod.gi
-edu.gi
 org.gi
 
-// gl : https://en.wikipedia.org/wiki/.gl
+// gl : https://www.iana.org/domains/root/db/gl.html
 // http://nic.gl
 gl
 co.gl
@@ -1148,34 +1234,34 @@ ac.gn
 com.gn
 edu.gn
 gov.gn
-org.gn
 net.gn
+org.gn
 
-// gov : https://en.wikipedia.org/wiki/.gov
+// gov : https://www.iana.org/domains/root/db/gov.html
 gov
 
 // gp : http://www.nic.gp/index.php?lang=en
 gp
+asso.gp
 com.gp
-net.gp
-mobi.gp
 edu.gp
+mobi.gp
+net.gp
 org.gp
-asso.gp
 
-// gq : https://en.wikipedia.org/wiki/.gq
+// gq : https://www.iana.org/domains/root/db/gq.html
 gq
 
-// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
+// gr : https://www.iana.org/domains/root/db/gr.html
 // Submitted by registry <segred@ics.forth.gr>
 gr
 com.gr
 edu.gr
+gov.gr
 net.gr
 org.gr
-gov.gr
 
-// gs : https://en.wikipedia.org/wiki/.gs
+// gs : https://www.iana.org/domains/root/db/gs.html
 gs
 
 // gt : https://www.gt/sitio/registration_policy.php?lang=en
@@ -1201,11 +1287,11 @@ net.gu
 org.gu
 web.gu
 
-// gw : https://en.wikipedia.org/wiki/.gw
+// gw : https://www.iana.org/domains/root/db/gw.html
 // gw : https://nic.gw/regras/
 gw
 
-// gy : https://en.wikipedia.org/wiki/.gy
+// gy : https://www.iana.org/domains/root/db/gy.html
 // http://registry.gy/
 gy
 co.gy
@@ -1224,103 +1310,104 @@ gov.hk
 idv.hk
 net.hk
 org.hk
+ไธชไบบ.hk
+ๅ€‹ไบบ.hk
 ๅ…ฌๅธ.hk
-ๆ•™่‚ฒ.hk
-ๆ•Ž่‚ฒ.hk
 ๆ”ฟๅบœ.hk
-ๅ€‹ไบบ.hk
-ไธชไบบ.hk
+ๆ•Ž่‚ฒ.hk
+ๆ•™่‚ฒ.hk
 ็ฎ‡ไบบ.hk
+็ต„็น”.hk
+็ต„็ป‡.hk
+็ถฒ็ตก.hk
 ็ถฒ็ปœ.hk
-็ฝ‘็ปœ.hk
 ็ป„็น”.hk
-็ถฒ็ตก.hk
-็ฝ‘็ตก.hk
 ็ป„็ป‡.hk
-็ต„็น”.hk
-็ต„็ป‡.hk
+็ฝ‘็ตก.hk
+็ฝ‘็ปœ.hk
 
-// hm : https://en.wikipedia.org/wiki/.hm
+// hm : https://www.iana.org/domains/root/db/hm.html
 hm
 
-// hn : http://www.nic.hn/politicas/ps02,,05.html
+// hn : https://www.iana.org/domains/root/db/hn.html
 hn
 com.hn
 edu.hn
-org.hn
-net.hn
-mil.hn
 gob.hn
+mil.hn
+net.hn
+org.hn
 
 // hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
 hr
-iz.hr
+com.hr
 from.hr
+iz.hr
 name.hr
-com.hr
 
 // ht : http://www.nic.ht/info/charte.cfm
 ht
+adult.ht
+art.ht
+asso.ht
 com.ht
-shop.ht
+coop.ht
+edu.ht
 firm.ht
+gouv.ht
 info.ht
-adult.ht
+med.ht
 net.ht
-pro.ht
 org.ht
-med.ht
-art.ht
-coop.ht
+perso.ht
 pol.ht
-asso.ht
-edu.ht
+pro.ht
 rel.ht
-gouv.ht
-perso.ht
+shop.ht
 
-// hu : http://www.domain.hu/domain/English/sld.html
+// hu : https://www.iana.org/domains/root/db/hu.html
 // Confirmed by registry <pasztor@iszt.hu> 2008-06-12
 hu
-co.hu
-info.hu
-org.hu
-priv.hu
-sport.hu
-tm.hu
 2000.hu
 agrar.hu
 bolt.hu
 casino.hu
 city.hu
+co.hu
 erotica.hu
 erotika.hu
 film.hu
 forum.hu
 games.hu
 hotel.hu
+info.hu
 ingatlan.hu
 jogasz.hu
 konyvelo.hu
 lakas.hu
 media.hu
 news.hu
+org.hu
+priv.hu
 reklam.hu
 sex.hu
 shop.hu
+sport.hu
 suli.hu
 szex.hu
+tm.hu
 tozsde.hu
 utazas.hu
 video.hu
 
-// id : https://pandi.id/en/domain/registration-requirements/
+// id : https://www.iana.org/domains/root/db/id.html
 id
 ac.id
 biz.id
 co.id
 desa.id
 go.id
+kop.id
 mil.id
 my.id
 net.id
@@ -1328,14 +1415,16 @@ or.id
 ponpes.id
 sch.id
 web.id
+// xn--9tfky.id (<bali>.id, Und-Bali)
+แฌฉแฌฎแฌถ.id
 
-// ie : https://en.wikipedia.org/wiki/.ie
+// ie : https://www.iana.org/domains/root/db/ie.html
 ie
 gov.ie
 
-// il :         http://www.isoc.org.il/domains/
-// see also:    https://en.isoc.org.il/il-cctld/registration-rules
-// ISOC-IL      (operated by .il Registry)
+// il : http://www.isoc.org.il/domains/
+// see also: https://en.isoc.org.il/il-cctld/registration-rules
+// ISOC-IL (operated by .il Registry)
 il
 ac.il
 co.il
@@ -1361,24 +1450,26 @@ org.il
 im
 ac.im
 co.im
-com.im
 ltd.co.im
+plc.co.im
+com.im
 net.im
 org.im
-plc.co.im
 tt.im
 tv.im
 
-// in : https://en.wikipedia.org/wiki/.in
+// in : https://www.iana.org/domains/root/db/in.html
 // see also: https://registry.in/policies
 // Please note, that nic.in is not an official eTLD, but used by most
 // government institutions.
+// Confirmed by Gaurav Kansal <gaurav.kansal@nic.in> 2025-11-06
 in
 5g.in
 6g.in
 ac.in
 ai.in
 am.in
+bank.in
 bihar.in
 biz.in
 business.in
@@ -1392,6 +1483,7 @@ delhi.in
 dr.in
 edu.in
 er.in
+fin.in
 firm.in
 gen.in
 gov.in
@@ -1416,27 +1508,33 @@ uk.in
 up.in
 us.in
 
-// info : https://en.wikipedia.org/wiki/.info
+// info : https://www.iana.org/domains/root/db/info.html
 info
 
-// int : https://en.wikipedia.org/wiki/.int
+// int : https://www.iana.org/domains/root/db/int.html
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
 int
 eu.int
 
 // io : http://www.nic.io/rules.htm
-// list of other 2nd level tlds ?
 io
+co.io
 com.io
+edu.io
+gov.io
+mil.io
+net.io
+nom.io
+org.io
 
 // iq : http://www.cmc.iq/english/iq/iqregister1.htm
 iq
-gov.iq
+com.iq
 edu.iq
+gov.iq
 mil.iq
-com.iq
-org.iq
 net.iq
+org.iq
 
 // ir : http://www.nic.ir/Terms_and_Conditions_ir,_Appendix_1_Domain_Rules
 // Also see http://www.nic.ir/Internationalized_Domain_Names
@@ -1455,22 +1553,16 @@ sch.ir
 ุงูŠุฑุงู†.ir
 
 // is : http://www.isnic.is/domain/rules.php
-// Confirmed by registry <marius@isgate.is> 2008-12-06
+// Confirmed by registry <marius@isgate.is> 2024-11-17
 is
-net.is
-com.is
-edu.is
-gov.is
-org.is
-int.is
-
-// it : https://en.wikipedia.org/wiki/.it
+
+// it : https://www.iana.org/domains/root/db/it.html
+// https://www.nic.it/
 it
-gov.it
 edu.it
-// Reserved geo-names (regions and provinces):
-// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf
-// Regions
+gov.it
+// Regions (3.3.1)
+// https://www.nic.it/en/manage-your-it/forms-and-docs -> "Assignment and Management of domain names"
 abr.it
 abruzzo.it
 aosta-valley.it
@@ -1529,6 +1621,7 @@ trentin-sudtirol.it
 trentin-sรผdtirol.it
 trentin-sued-tirol.it
 trentin-suedtirol.it
+trentino.it
 trentino-a-adige.it
 trentino-aadige.it
 trentino-alto-adige.it
@@ -1541,7 +1634,6 @@ trentino-sudtirol.it
 trentino-sรผdtirol.it
 trentino-sued-tirol.it
 trentino-suedtirol.it
-trentino.it
 trentinoa-adige.it
 trentinoaadige.it
 trentinoalto-adige.it
@@ -1585,7 +1677,7 @@ vao.it
 vda.it
 ven.it
 veneto.it
-// Provinces
+// Provinces (3.3.2)
 ag.it
 agrigento.it
 al.it
@@ -1613,10 +1705,10 @@ at.it
 av.it
 avellino.it
 ba.it
+balsan.it
 balsan-sudtirol.it
 balsan-sรผdtirol.it
 balsan-suedtirol.it
-balsan.it
 bari.it
 barletta-trani-andria.it
 barlettatraniandria.it
@@ -1630,21 +1722,21 @@ bl.it
 bn.it
 bo.it
 bologna.it
-bolzano-altoadige.it
 bolzano.it
+bolzano-altoadige.it
+bozen.it
 bozen-sudtirol.it
 bozen-sรผdtirol.it
 bozen-suedtirol.it
-bozen.it
 br.it
 brescia.it
 brindisi.it
 bs.it
 bt.it
+bulsan.it
 bulsan-sudtirol.it
 bulsan-sรผdtirol.it
 bulsan-suedtirol.it
-bulsan.it
 bz.it
 ca.it
 cagliari.it
@@ -1746,9 +1838,9 @@ milano.it
 mn.it
 mo.it
 modena.it
+monza.it
 monza-brianza.it
 monza-e-della-brianza.it
-monza.it
 monzabrianza.it
 monzaebrianza.it
 monzaedellabrianza.it
@@ -1827,8 +1919,8 @@ sondrio.it
 sp.it
 sr.it
 ss.it
-suedtirol.it
 sรผdtirol.it
+suedtirol.it
 sv.it
 ta.it
 taranto.it
@@ -1877,7 +1969,7 @@ vs.it
 vt.it
 vv.it
 
-// je : http://www.channelisles.net/register-domains/
+// je : https://www.iana.org/domains/root/db/je.html
 // Confirmed by registry <nigel@channelisles.net> 2013-11-28
 je
 co.je
@@ -1887,23 +1979,30 @@ org.je
 // jm : http://www.com.jm/register.html
 *.jm
 
-// jo : http://www.dns.jo/Registration_policy.aspx
+// jo : https://www.dns.jo/JoFamily.aspx
+// Confirmed by registry <DNS@modee.gov.jo> 2024-11-17
 jo
+agri.jo
+ai.jo
 com.jo
-org.jo
-net.jo
 edu.jo
-sch.jo
+eng.jo
+fm.jo
 gov.jo
 mil.jo
-name.jo
+net.jo
+org.jo
+per.jo
+phd.jo
+sch.jo
+tv.jo
 
-// jobs : https://en.wikipedia.org/wiki/.jobs
+// jobs : https://www.iana.org/domains/root/db/jobs.html
 jobs
 
-// jp : https://en.wikipedia.org/wiki/.jp
+// jp : https://www.iana.org/domains/root/db/jp.html
 // http://jprs.co.jp/en/jpdomain.html
-// Submitted by registry <info@jprs.jp>
+// Confirmed by registry <info@jprs.jp> 2024-11-22
 jp
 // jp organizational type names
 ac.jp
@@ -1963,26 +2062,14 @@ wakayama.jp
 yamagata.jp
 yamaguchi.jp
 yamanashi.jp
-ๆ ƒๆœจ.jp
-ๆ„›็Ÿฅ.jp
-ๆ„›ๅช›.jp
+ไธ‰้‡.jp
+ไบฌ้ƒฝ.jp
+ไฝ่ณ€.jp
 ๅ…ตๅบซ.jp
-็†Šๆœฌ.jp
-่ŒจๅŸŽ.jp
 ๅŒ—ๆตท้“.jp
 ๅƒ่‘‰.jp
 ๅ’ŒๆญŒๅฑฑ.jp
-้•ทๅดŽ.jp
-้•ท้‡Ž.jp
-ๆ–ฐๆฝŸ.jp
-้’ๆฃฎ.jp
-้™ๅฒก.jp
-ๆฑไบฌ.jp
-็Ÿณๅท.jp
 ๅŸผ็Ž‰.jp
-ไธ‰้‡.jp
-ไบฌ้ƒฝ.jp
-ไฝ่ณ€.jp
 ๅคงๅˆ†.jp
 ๅคง้˜ช.jp
 ๅฅˆ่‰ฏ.jp
@@ -1992,39 +2079,54 @@ yamanashi.jp
 ๅฑฑๅฃ.jp
 ๅฑฑๅฝข.jp
 ๅฑฑๆขจ.jp
-ๅฒฉๆ‰‹.jp
 ๅฒ้˜œ.jp
 ๅฒกๅฑฑ.jp
+ๅฒฉๆ‰‹.jp
 ๅณถๆ น.jp
 ๅบƒๅณถ.jp
 ๅพณๅณถ.jp
+ๆ„›ๅช›.jp
+ๆ„›็Ÿฅ.jp
+ๆ–ฐๆฝŸ.jp
+ๆฑไบฌ.jp
+ๆ ƒๆœจ.jp
 ๆฒ–็ธ„.jp
 ๆป‹่ณ€.jp
+็†Šๆœฌ.jp
+็Ÿณๅท.jp
 ็ฅžๅฅˆๅท.jp
 ็ฆไบ•.jp
 ็ฆๅฒก.jp
 ็ฆๅณถ.jp
 ็ง‹็”ฐ.jp
 ็พค้ฆฌ.jp
+่ŒจๅŸŽ.jp
+้•ทๅดŽ.jp
+้•ท้‡Ž.jp
+้’ๆฃฎ.jp
+้™ๅฒก.jp
 ้ฆ™ๅท.jp
 ้ซ˜็Ÿฅ.jp
 ้ณฅๅ–.jp
 ้นฟๅ…ๅณถ.jp
 // jp geographic type names
 // http://jprs.jp/doc/rule/saisoku-1.html
+// 2024-11-22: JPRS confirmed that jp geographic type names no longer accept new registrations.
+// Once all existing registrations expire (marking full discontinuation), these suffixes
+// will be removed from the PSL.
 *.kawasaki.jp
-*.kitakyushu.jp
-*.kobe.jp
-*.nagoya.jp
-*.sapporo.jp
-*.sendai.jp
-*.yokohama.jp
 !city.kawasaki.jp
+*.kitakyushu.jp
 !city.kitakyushu.jp
+*.kobe.jp
 !city.kobe.jp
+*.nagoya.jp
 !city.nagoya.jp
+*.sapporo.jp
 !city.sapporo.jp
+*.sendai.jp
 !city.sendai.jp
+*.yokohama.jp
 !city.yokohama.jp
 // 4th level registration
 aisai.aichi.jp
@@ -3715,56 +3817,62 @@ sc.ke
 
 // kg : http://www.domain.kg/dmn_n.html
 kg
-org.kg
-net.kg
 com.kg
 edu.kg
 gov.kg
 mil.kg
+net.kg
+org.kg
 
-// kh : http://www.mptc.gov.kh/dns_registration.htm
-*.kh
+// kh : https://trc.gov.kh
+// Submitted by khnic@trc.gov.kh
+kh
+com.kh
+edu.kh
+gov.kh
+net.kh
+org.kh
 
-// ki : http://www.ki/dns/index.html
+// ki : https://www.iana.org/domains/root/db/ki.html
 ki
-edu.ki
 biz.ki
-net.ki
-org.ki
+com.ki
+edu.ki
 gov.ki
 info.ki
-com.ki
+net.ki
+org.ki
 
-// km : https://en.wikipedia.org/wiki/.km
+// km : https://www.iana.org/domains/root/db/km.html
 // http://www.domaine.km/documents/charte.doc
 km
-org.km
-nom.km
+ass.km
+com.km
+edu.km
 gov.km
+mil.km
+nom.km
+org.km
 prd.km
 tm.km
-edu.km
-mil.km
-ass.km
-com.km
 // These are only mentioned as proposed suggestions at domaine.km, but
-// https://en.wikipedia.org/wiki/.km says they're available for registration:
-coop.km
+// https://www.iana.org/domains/root/db/km.html says they're available for registration:
 asso.km
-presse.km
+coop.km
+gouv.km
 medecin.km
 notaires.km
 pharmaciens.km
+presse.km
 veterinaire.km
-gouv.km
 
-// kn : https://en.wikipedia.org/wiki/.kn
+// kn : https://www.iana.org/domains/root/db/kn.html
 // http://www.dot.kn/domainRules.html
 kn
-net.kn
-org.kn
 edu.kn
 gov.kn
+net.kn
+org.kn
 
 // kp : http://www.kcce.kp/en_index.php
 kp
@@ -3775,15 +3883,19 @@ org.kp
 rep.kp
 tra.kp
 
-// kr : https://en.wikipedia.org/wiki/.kr
-// see also: http://domain.nida.or.kr/eng/registration.jsp
+// kr : https://www.iana.org/domains/root/db/kr.html
+// see also: https://krnic.kisa.or.kr/jsp/infoboard/law/domBylawsReg.jsp
 kr
 ac.kr
+ai.kr
 co.kr
 es.kr
 go.kr
 hs.kr
+io.kr
+it.kr
 kg.kr
+me.kr
 mil.kr
 ms.kr
 ne.kr
@@ -3828,29 +3940,29 @@ edu.ky
 net.ky
 org.ky
 
-// kz : https://en.wikipedia.org/wiki/.kz
+// kz : https://www.iana.org/domains/root/db/kz.html
 // see also: http://www.nic.kz/rules/index.jsp
 kz
-org.kz
+com.kz
 edu.kz
-net.kz
 gov.kz
 mil.kz
-com.kz
+net.kz
+org.kz
 
-// la : https://en.wikipedia.org/wiki/.la
+// la : https://www.iana.org/domains/root/db/la.html
 // Submitted by registry <gavin.brown@nic.la>
 la
-int.la
-net.la
-info.la
+com.la
 edu.la
 gov.la
-per.la
-com.la
+info.la
+int.la
+net.la
 org.la
+per.la
 
-// lb : https://en.wikipedia.org/wiki/.lb
+// lb : https://www.iana.org/domains/root/db/lb.html
 // Submitted by registry <randy@psg.com>
 lb
 com.lb
@@ -3859,36 +3971,36 @@ gov.lb
 net.lb
 org.lb
 
-// lc : https://en.wikipedia.org/wiki/.lc
+// lc : https://www.iana.org/domains/root/db/lc.html
 // see also: http://www.nic.lc/rules.htm
 lc
-com.lc
-net.lc
 co.lc
-org.lc
+com.lc
 edu.lc
 gov.lc
+net.lc
+org.lc
 
-// li : https://en.wikipedia.org/wiki/.li
+// li : https://www.iana.org/domains/root/db/li.html
 li
 
-// lk : https://www.nic.lk/index.php/domain-registration/lk-domain-naming-structure
+// lk : https://www.iana.org/domains/root/db/lk.html
 lk
-gov.lk
-sch.lk
-net.lk
-int.lk
+ac.lk
+assn.lk
 com.lk
-org.lk
 edu.lk
+gov.lk
+grp.lk
+hotel.lk
+int.lk
+ltd.lk
+net.lk
 ngo.lk
+org.lk
+sch.lk
 soc.lk
 web.lk
-ltd.lk
-assn.lk
-grp.lk
-hotel.lk
-ac.lk
 
 // lr : http://psg.com/dns/lr/lr.txt
 // Submitted by registry <randy@psg.com>
@@ -3896,8 +4008,8 @@ lr
 com.lr
 edu.lr
 gov.lr
-org.lr
 net.lr
+org.lr
 
 // ls : http://www.nic.ls/
 // Confirmed by registry <lsadmin@nic.ls>
@@ -3912,7 +4024,7 @@ net.ls
 org.ls
 sc.ls
 
-// lt : https://en.wikipedia.org/wiki/.lt
+// lt : https://www.iana.org/domains/root/db/lt.html
 lt
 // gov.lt : http://www.gov.lt/index_en.php
 gov.lt
@@ -3920,131 +4032,136 @@ gov.lt
 // lu : http://www.dns.lu/en/
 lu
 
-// lv : http://www.nic.lv/DNS/En/generic.php
+// lv : https://www.iana.org/domains/root/db/lv.html
 lv
+asn.lv
 com.lv
+conf.lv
 edu.lv
 gov.lv
-org.lv
-mil.lv
 id.lv
+mil.lv
 net.lv
-asn.lv
-conf.lv
+org.lv
 
 // ly : http://www.nic.ly/regulations.php
 ly
 com.ly
-net.ly
-gov.ly
-plc.ly
 edu.ly
-sch.ly
+gov.ly
+id.ly
 med.ly
+net.ly
 org.ly
-id.ly
+plc.ly
+sch.ly
 
-// ma : https://en.wikipedia.org/wiki/.ma
+// ma : https://www.iana.org/domains/root/db/ma.html
 // http://www.anrt.ma/fr/admin/download/upload/file_fr782.pdf
 ma
+ac.ma
 co.ma
-net.ma
 gov.ma
+net.ma
 org.ma
-ac.ma
 press.ma
 
 // mc : http://www.nic.mc/
 mc
-tm.mc
 asso.mc
+tm.mc
 
-// md : https://en.wikipedia.org/wiki/.md
+// md : https://www.iana.org/domains/root/db/md.html
 md
 
-// me : https://en.wikipedia.org/wiki/.me
+// me : https://www.iana.org/domains/root/db/me.html
 me
+ac.me
 co.me
-net.me
-org.me
 edu.me
-ac.me
 gov.me
 its.me
+net.me
+org.me
 priv.me
 
-// mg : http://nic.mg/nicmg/?page_id=39
+// mg : https://nic.mg
 mg
-org.mg
-nom.mg
-gov.mg
-prd.mg
-tm.mg
+co.mg
+com.mg
 edu.mg
+gov.mg
 mil.mg
-com.mg
-co.mg
+nom.mg
+org.mg
+prd.mg
 
-// mh : https://en.wikipedia.org/wiki/.mh
+// mh : https://www.iana.org/domains/root/db/mh.html
 mh
 
-// mil : https://en.wikipedia.org/wiki/.mil
+// mil : https://www.iana.org/domains/root/db/mil.html
 mil
 
-// mk : https://en.wikipedia.org/wiki/.mk
+// mk : https://www.iana.org/domains/root/db/mk.html
 // see also: http://dns.marnet.net.mk/postapka.php
 mk
 com.mk
-org.mk
-net.mk
 edu.mk
 gov.mk
 inf.mk
 name.mk
+net.mk
+org.mk
 
-// ml : http://www.gobin.info/domainname/ml-template.doc
-// see also: https://en.wikipedia.org/wiki/.ml
+// ml : https://www.iana.org/domains/root/db/ml.html
+// Confirmed by Boubacar NDIAYE <bndiaye@agetic.gouv.ml> 2024-12-31
 ml
+ac.ml
+art.ml
+asso.ml
 com.ml
 edu.ml
 gouv.ml
 gov.ml
+info.ml
+inst.ml
 net.ml
 org.ml
+pr.ml
 presse.ml
 
-// mm : https://en.wikipedia.org/wiki/.mm
+// mm : https://www.iana.org/domains/root/db/mm.html
 *.mm
 
-// mn : https://en.wikipedia.org/wiki/.mn
+// mn : https://www.iana.org/domains/root/db/mn.html
 mn
-gov.mn
 edu.mn
+gov.mn
 org.mn
 
 // mo : http://www.monic.net.mo/
 mo
 com.mo
-net.mo
-org.mo
 edu.mo
 gov.mo
+net.mo
+org.mo
 
-// mobi : https://en.wikipedia.org/wiki/.mobi
+// mobi : https://www.iana.org/domains/root/db/mobi.html
 mobi
 
 // mp : http://www.dot.mp/
 // Confirmed by registry <dcamacho@saipan.com> 2008-06-17
 mp
 
-// mq : https://en.wikipedia.org/wiki/.mq
+// mq : https://www.iana.org/domains/root/db/mq.html
 mq
 
-// mr : https://en.wikipedia.org/wiki/.mr
+// mr : https://www.iana.org/domains/root/db/mr.html
 mr
 gov.mr
 
-// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf
+// ms : https://www.iana.org/domains/root/db/ms.html
 ms
 com.ms
 edu.ms
@@ -4060,567 +4177,20 @@ edu.mt
 net.mt
 org.mt
 
-// mu : https://en.wikipedia.org/wiki/.mu
+// mu : https://www.iana.org/domains/root/db/mu.html
 mu
-com.mu
-net.mu
-org.mu
-gov.mu
 ac.mu
 co.mu
+com.mu
+gov.mu
+net.mu
 or.mu
+org.mu
 
-// museum : http://about.museum/naming/
-// http://index.museum/
+// museum : https://welcome.museum/wp-content/uploads/2018/05/20180525-Registration-Policy-MUSEUM-EN_VF-2.pdf https://welcome.museum/buy-your-dot-museum-2/
 museum
-academy.museum
-agriculture.museum
-air.museum
-airguard.museum
-alabama.museum
-alaska.museum
-amber.museum
-ambulance.museum
-american.museum
-americana.museum
-americanantiques.museum
-americanart.museum
-amsterdam.museum
-and.museum
-annefrank.museum
-anthro.museum
-anthropology.museum
-antiques.museum
-aquarium.museum
-arboretum.museum
-archaeological.museum
-archaeology.museum
-architecture.museum
-art.museum
-artanddesign.museum
-artcenter.museum
-artdeco.museum
-arteducation.museum
-artgallery.museum
-arts.museum
-artsandcrafts.museum
-asmatart.museum
-assassination.museum
-assisi.museum
-association.museum
-astronomy.museum
-atlanta.museum
-austin.museum
-australia.museum
-automotive.museum
-aviation.museum
-axis.museum
-badajoz.museum
-baghdad.museum
-bahn.museum
-bale.museum
-baltimore.museum
-barcelona.museum
-baseball.museum
-basel.museum
-baths.museum
-bauern.museum
-beauxarts.museum
-beeldengeluid.museum
-bellevue.museum
-bergbau.museum
-berkeley.museum
-berlin.museum
-bern.museum
-bible.museum
-bilbao.museum
-bill.museum
-birdart.museum
-birthplace.museum
-bonn.museum
-boston.museum
-botanical.museum
-botanicalgarden.museum
-botanicgarden.museum
-botany.museum
-brandywinevalley.museum
-brasil.museum
-bristol.museum
-british.museum
-britishcolumbia.museum
-broadcast.museum
-brunel.museum
-brussel.museum
-brussels.museum
-bruxelles.museum
-building.museum
-burghof.museum
-bus.museum
-bushey.museum
-cadaques.museum
-california.museum
-cambridge.museum
-can.museum
-canada.museum
-capebreton.museum
-carrier.museum
-cartoonart.museum
-casadelamoneda.museum
-castle.museum
-castres.museum
-celtic.museum
-center.museum
-chattanooga.museum
-cheltenham.museum
-chesapeakebay.museum
-chicago.museum
-children.museum
-childrens.museum
-childrensgarden.museum
-chiropractic.museum
-chocolate.museum
-christiansburg.museum
-cincinnati.museum
-cinema.museum
-circus.museum
-civilisation.museum
-civilization.museum
-civilwar.museum
-clinton.museum
-clock.museum
-coal.museum
-coastaldefence.museum
-cody.museum
-coldwar.museum
-collection.museum
-colonialwilliamsburg.museum
-coloradoplateau.museum
-columbia.museum
-columbus.museum
-communication.museum
-communications.museum
-community.museum
-computer.museum
-computerhistory.museum
-comunicaรงรตes.museum
-contemporary.museum
-contemporaryart.museum
-convent.museum
-copenhagen.museum
-corporation.museum
-correios-e-telecomunicaรงรตes.museum
-corvette.museum
-costume.museum
-countryestate.museum
-county.museum
-crafts.museum
-cranbrook.museum
-creation.museum
-cultural.museum
-culturalcenter.museum
-culture.museum
-cyber.museum
-cymru.museum
-dali.museum
-dallas.museum
-database.museum
-ddr.museum
-decorativearts.museum
-delaware.museum
-delmenhorst.museum
-denmark.museum
-depot.museum
-design.museum
-detroit.museum
-dinosaur.museum
-discovery.museum
-dolls.museum
-donostia.museum
-durham.museum
-eastafrica.museum
-eastcoast.museum
-education.museum
-educational.museum
-egyptian.museum
-eisenbahn.museum
-elburg.museum
-elvendrell.museum
-embroidery.museum
-encyclopedic.museum
-england.museum
-entomology.museum
-environment.museum
-environmentalconservation.museum
-epilepsy.museum
-essex.museum
-estate.museum
-ethnology.museum
-exeter.museum
-exhibition.museum
-family.museum
-farm.museum
-farmequipment.museum
-farmers.museum
-farmstead.museum
-field.museum
-figueres.museum
-filatelia.museum
-film.museum
-fineart.museum
-finearts.museum
-finland.museum
-flanders.museum
-florida.museum
-force.museum
-fortmissoula.museum
-fortworth.museum
-foundation.museum
-francaise.museum
-frankfurt.museum
-franziskaner.museum
-freemasonry.museum
-freiburg.museum
-fribourg.museum
-frog.museum
-fundacio.museum
-furniture.museum
-gallery.museum
-garden.museum
-gateway.museum
-geelvinck.museum
-gemological.museum
-geology.museum
-georgia.museum
-giessen.museum
-glas.museum
-glass.museum
-gorge.museum
-grandrapids.museum
-graz.museum
-guernsey.museum
-halloffame.museum
-hamburg.museum
-handson.museum
-harvestcelebration.museum
-hawaii.museum
-health.museum
-heimatunduhren.museum
-hellas.museum
-helsinki.museum
-hembygdsforbund.museum
-heritage.museum
-histoire.museum
-historical.museum
-historicalsociety.museum
-historichouses.museum
-historisch.museum
-historisches.museum
-history.museum
-historyofscience.museum
-horology.museum
-house.museum
-humanities.museum
-illustration.museum
-imageandsound.museum
-indian.museum
-indiana.museum
-indianapolis.museum
-indianmarket.museum
-intelligence.museum
-interactive.museum
-iraq.museum
-iron.museum
-isleofman.museum
-jamison.museum
-jefferson.museum
-jerusalem.museum
-jewelry.museum
-jewish.museum
-jewishart.museum
-jfk.museum
-journalism.museum
-judaica.museum
-judygarland.museum
-juedisches.museum
-juif.museum
-karate.museum
-karikatur.museum
-kids.museum
-koebenhavn.museum
-koeln.museum
-kunst.museum
-kunstsammlung.museum
-kunstunddesign.museum
-labor.museum
-labour.museum
-lajolla.museum
-lancashire.museum
-landes.museum
-lans.museum
-lรคns.museum
-larsson.museum
-lewismiller.museum
-lincoln.museum
-linz.museum
-living.museum
-livinghistory.museum
-localhistory.museum
-london.museum
-losangeles.museum
-louvre.museum
-loyalist.museum
-lucerne.museum
-luxembourg.museum
-luzern.museum
-mad.museum
-madrid.museum
-mallorca.museum
-manchester.museum
-mansion.museum
-mansions.museum
-manx.museum
-marburg.museum
-maritime.museum
-maritimo.museum
-maryland.museum
-marylhurst.museum
-media.museum
-medical.museum
-medizinhistorisches.museum
-meeres.museum
-memorial.museum
-mesaverde.museum
-michigan.museum
-midatlantic.museum
-military.museum
-mill.museum
-miners.museum
-mining.museum
-minnesota.museum
-missile.museum
-missoula.museum
-modern.museum
-moma.museum
-money.museum
-monmouth.museum
-monticello.museum
-montreal.museum
-moscow.museum
-motorcycle.museum
-muenchen.museum
-muenster.museum
-mulhouse.museum
-muncie.museum
-museet.museum
-museumcenter.museum
-museumvereniging.museum
-music.museum
-national.museum
-nationalfirearms.museum
-nationalheritage.museum
-nativeamerican.museum
-naturalhistory.museum
-naturalhistorymuseum.museum
-naturalsciences.museum
-nature.museum
-naturhistorisches.museum
-natuurwetenschappen.museum
-naumburg.museum
-naval.museum
-nebraska.museum
-neues.museum
-newhampshire.museum
-newjersey.museum
-newmexico.museum
-newport.museum
-newspaper.museum
-newyork.museum
-niepce.museum
-norfolk.museum
-north.museum
-nrw.museum
-nyc.museum
-nyny.museum
-oceanographic.museum
-oceanographique.museum
-omaha.museum
-online.museum
-ontario.museum
-openair.museum
-oregon.museum
-oregontrail.museum
-otago.museum
-oxford.museum
-pacific.museum
-paderborn.museum
-palace.museum
-paleo.museum
-palmsprings.museum
-panama.museum
-paris.museum
-pasadena.museum
-pharmacy.museum
-philadelphia.museum
-philadelphiaarea.museum
-philately.museum
-phoenix.museum
-photography.museum
-pilots.museum
-pittsburgh.museum
-planetarium.museum
-plantation.museum
-plants.museum
-plaza.museum
-portal.museum
-portland.museum
-portlligat.museum
-posts-and-telecommunications.museum
-preservation.museum
-presidio.museum
-press.museum
-project.museum
-public.museum
-pubol.museum
-quebec.museum
-railroad.museum
-railway.museum
-research.museum
-resistance.museum
-riodejaneiro.museum
-rochester.museum
-rockart.museum
-roma.museum
-russia.museum
-saintlouis.museum
-salem.museum
-salvadordali.museum
-salzburg.museum
-sandiego.museum
-sanfrancisco.museum
-santabarbara.museum
-santacruz.museum
-santafe.museum
-saskatchewan.museum
-satx.museum
-savannahga.museum
-schlesisches.museum
-schoenbrunn.museum
-schokoladen.museum
-school.museum
-schweiz.museum
-science.museum
-scienceandhistory.museum
-scienceandindustry.museum
-sciencecenter.museum
-sciencecenters.museum
-science-fiction.museum
-sciencehistory.museum
-sciences.museum
-sciencesnaturelles.museum
-scotland.museum
-seaport.museum
-settlement.museum
-settlers.museum
-shell.museum
-sherbrooke.museum
-sibenik.museum
-silk.museum
-ski.museum
-skole.museum
-society.museum
-sologne.museum
-soundandvision.museum
-southcarolina.museum
-southwest.museum
-space.museum
-spy.museum
-square.museum
-stadt.museum
-stalbans.museum
-starnberg.museum
-state.museum
-stateofdelaware.museum
-station.museum
-steam.museum
-steiermark.museum
-stjohn.museum
-stockholm.museum
-stpetersburg.museum
-stuttgart.museum
-suisse.museum
-surgeonshall.museum
-surrey.museum
-svizzera.museum
-sweden.museum
-sydney.museum
-tank.museum
-tcm.museum
-technology.museum
-telekommunikation.museum
-television.museum
-texas.museum
-textile.museum
-theater.museum
-time.museum
-timekeeping.museum
-topology.museum
-torino.museum
-touch.museum
-town.museum
-transport.museum
-tree.museum
-trolley.museum
-trust.museum
-trustee.museum
-uhren.museum
-ulm.museum
-undersea.museum
-university.museum
-usa.museum
-usantiques.museum
-usarts.museum
-uscountryestate.museum
-usculture.museum
-usdecorativearts.museum
-usgarden.museum
-ushistory.museum
-ushuaia.museum
-uslivinghistory.museum
-utah.museum
-uvic.museum
-valley.museum
-vantaa.museum
-versailles.museum
-viking.museum
-village.museum
-virginia.museum
-virtual.museum
-virtuel.museum
-vlaanderen.museum
-volkenkunde.museum
-wales.museum
-wallonie.museum
-war.museum
-washingtondc.museum
-watchandclock.museum
-watch-and-clock.museum
-western.museum
-westfalen.museum
-whaling.museum
-wildlife.museum
-williamsburg.museum
-windmill.museum
-workshop.museum
-york.museum
-yorkshire.museum
-yosemite.museum
-youth.museum
-zoological.museum
-zoology.museum
-ื™ืจื•ืฉืœื™ื.museum
-ะธะบะพะผ.museum
-
-// mv : https://en.wikipedia.org/wiki/.mv
+
+// mv : https://www.iana.org/domains/root/db/mv.html
 // "mv" included because, contra Wikipedia, google.mv exists.
 mv
 aero.mv
@@ -4648,7 +4218,6 @@ coop.mw
 edu.mw
 gov.mw
 int.mw
-museum.mw
 net.mw
 org.mw
 
@@ -4656,10 +4225,10 @@ org.mw
 // Submitted by registry <farias@nic.mx>
 mx
 com.mx
-org.mx
-gob.mx
 edu.mx
+gob.mx
 net.mx
+org.mx
 
 // my : http://www.mynic.my/
 // Available strings: https://mynic.my/resources/domains/buying-a-domain/
@@ -4686,27 +4255,16 @@ net.mz
 org.mz
 
 // na : http://www.na-nic.com.na/
-// http://www.info.na/domain/
 na
-info.na
-pro.na
-name.na
-school.na
-or.na
-dr.na
-us.na
-mx.na
-ca.na
-in.na
-cc.na
-tv.na
-ws.na
-mobi.na
+alt.na
 co.na
 com.na
+gov.na
+net.na
 org.na
 
-// name : has 2nd-level tlds, but there's no list of them
+// name : http://www.nic.name/
+// Regarding 2LDs: https://github.com/publicsuffix/list/issues/2306
 name
 
 // nc : http://www.cctld.nc/
@@ -4714,24 +4272,24 @@ nc
 asso.nc
 nom.nc
 
-// ne : https://en.wikipedia.org/wiki/.ne
+// ne : https://www.iana.org/domains/root/db/ne.html
 ne
 
-// net : https://en.wikipedia.org/wiki/.net
+// net : https://www.iana.org/domains/root/db/net.html
 net
 
-// nf : https://en.wikipedia.org/wiki/.nf
+// nf : https://www.iana.org/domains/root/db/nf.html
 nf
-com.nf
-net.nf
-per.nf
-rec.nf
-web.nf
 arts.nf
+com.nf
 firm.nf
 info.nf
+net.nf
 other.nf
+per.nf
+rec.nf
 store.nf
+web.nf
 
 // ng : http://www.nira.org.ng/index.php/join-us/register-ng-domain/189-nira-slds
 ng
@@ -4763,9 +4321,8 @@ nom.ni
 org.ni
 web.ni
 
-// nl : https://en.wikipedia.org/wiki/.nl
-//      https://www.sidn.nl/
-//      ccTLD for the Netherlands
+// nl : https://www.iana.org/domains/root/db/nl.html
+// https://www.sidn.nl/
 nl
 
 // no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
@@ -4776,18 +4333,18 @@ nl
 no
 // Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
 fhs.no
-vgs.no
-fylkesbibl.no
 folkebibl.no
-museum.no
+fylkesbibl.no
 idrett.no
+museum.no
 priv.no
+vgs.no
 // Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
-mil.no
-stat.no
 dep.no
-kommune.no
 herad.no
+kommune.no
+mil.no
+stat.no
 // Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
 // counties
 aa.no
@@ -4839,10 +4396,10 @@ akrehamn.no
 algard.no
 รฅlgรฅrd.no
 arna.no
-brumunddal.no
-bryne.no
 bronnoysund.no
 brรธnnรธysund.no
+brumunddal.no
+bryne.no
 drobak.no
 drรธbak.no
 egersund.no
@@ -4886,27 +4443,32 @@ tananger.no
 tranby.no
 vossevangen.no
 // communities
-afjord.no
+aarborte.no
+aejrie.no
+afjord.no
 รฅfjord.no
 agdenes.no
+nes.akershus.no
+aknoluokta.no
+รกkล‹oluokta.no
 al.no
 รฅl.no
+alaheadju.no
+รกlaheadju.no
 alesund.no
 รฅlesund.no
 alstahaug.no
 alta.no
 รกltรก.no
-alaheadju.no
-รกlaheadju.no
 alvdal.no
 amli.no
 รฅmli.no
 amot.no
 รฅmot.no
+andasuolo.no
 andebu.no
 andoy.no
 andรธy.no
-andasuolo.no
 ardal.no
 รฅrdal.no
 aremark.no
@@ -4916,9 +4478,9 @@ aseral.no
 รฅseral.no
 asker.no
 askim.no
-askvoll.no
 askoy.no
 askรธy.no
+askvoll.no
 asnes.no
 รฅsnes.no
 audnedaln.no
@@ -4931,65 +4493,69 @@ austevoll.no
 austrheim.no
 averoy.no
 averรธy.no
-balestrand.no
-ballangen.no
+badaddja.no
+bรฅdรฅddjรฅ.no
+bรฆrum.no
+bahcavuotna.no
+bรกhcavuotna.no
+bahccavuotna.no
+bรกhccavuotna.no
+baidar.no
+bรกidรกr.no
+bajddar.no
+bรกjddar.no
 balat.no
 bรกlรกt.no
+balestrand.no
+ballangen.no
 balsfjord.no
-bahccavuotna.no
-bรกhccavuotna.no
 bamble.no
 bardu.no
+barum.no
+batsfjord.no
+bรฅtsfjord.no
+bearalvahki.no
+bearalvรกhki.no
 beardu.no
 beiarn.no
-bajddar.no
-bรกjddar.no
-baidar.no
-bรกidรกr.no
 berg.no
 bergen.no
 berlevag.no
 berlevรฅg.no
-bearalvahki.no
-bearalvรกhki.no
+bievat.no
+bievรกt.no
 bindal.no
 birkenes.no
-bjarkoy.no
-bjarkรธy.no
 bjerkreim.no
 bjugn.no
 bodo.no
 bodรธ.no
-badaddja.no
-bรฅdรฅddjรฅ.no
-budejju.no
 bokn.no
+bomlo.no
+bรธmlo.no
 bremanger.no
 bronnoy.no
 brรธnnรธy.no
+budejju.no
+nes.buskerud.no
 bygland.no
 bykle.no
-barum.no
-bรฆrum.no
-bo.telemark.no
-bรธ.telemark.no
-bo.nordland.no
-bรธ.nordland.no
-bievat.no
-bievรกt.no
-bomlo.no
-bรธmlo.no
-batsfjord.no
-bรฅtsfjord.no
-bahcavuotna.no
-bรกhcavuotna.no
+cahcesuolo.no
+ฤรกhcesuolo.no
+davvenjarga.no
+davvenjรกrga.no
+davvesiida.no
+deatnu.no
+dielddanuorri.no
+divtasvuodna.no
+divttasvuotna.no
+donna.no
+dรธnna.no
 dovre.no
 drammen.no
 drangedal.no
 dyroy.no
 dyrรธy.no
-donna.no
-dรธnna.no
 eid.no
 eidfjord.no
 eidsberg.no
@@ -5001,14 +4567,12 @@ enebakk.no
 engerdal.no
 etne.no
 etnedal.no
-evenes.no
 evenassi.no
 evenรกลกลกi.no
+evenes.no
 evje-og-hornnes.no
 farsund.no
 fauske.no
-fuossko.no
-fuoisku.no
 fedje.no
 fet.no
 finnoy.no
@@ -5016,33 +4580,40 @@ finnรธy.no
 fitjar.no
 fjaler.no
 fjell.no
+fla.no
+flรฅ.no
 flakstad.no
 flatanger.no
 flekkefjord.no
 flesberg.no
 flora.no
-fla.no
-flรฅ.no
 folldal.no
+forde.no
+fรธrde.no
 forsand.no
 fosnes.no
+frรฆna.no
+frana.no
 frei.no
 frogn.no
 froland.no
 frosta.no
-frana.no
-frรฆna.no
 froya.no
 frรธya.no
+fuoisku.no
+fuossko.no
 fusa.no
 fyresdal.no
-forde.no
-fรธrde.no
+gaivuotna.no
+gรกivuotna.no
+galsa.no
+gรกlsรก.no
 gamvik.no
 gangaviika.no
 gรกล‹gaviika.no
 gaular.no
 gausdal.no
+giehtavuoatna.no
 gildeskal.no
 gildeskรฅl.no
 giske.no
@@ -5060,38 +4631,37 @@ granvin.no
 gratangen.no
 grimstad.no
 grong.no
-kraanghke.no
-krรฅanghke.no
 grue.no
 gulen.no
+guovdageaidnu.no
+ha.no
+hรฅ.no
+habmer.no
+hรกbmer.no
 hadsel.no
+hรฆgebostad.no
+hagebostad.no
 halden.no
 halsa.no
 hamar.no
 hamaroy.no
-habmer.no
-hรกbmer.no
-hapmir.no
-hรกpmir.no
-hammerfest.no
 hammarfeasta.no
 hรกmmรกrfeasta.no
+hammerfest.no
+hapmir.no
+hรกpmir.no
 haram.no
 hareid.no
 harstad.no
 hasvik.no
-aknoluokta.no
-รกkล‹oluokta.no
 hattfjelldal.no
-aarborte.no
 haugesund.no
+os.hedmark.no
+valer.hedmark.no
+vรฅler.hedmark.no
 hemne.no
 hemnes.no
 hemsedal.no
-heroy.more-og-romsdal.no
-herรธy.mรธre-og-romsdal.no
-heroy.nordland.no
-herรธy.nordland.no
 hitra.no
 hjartdal.no
 hjelmeland.no
@@ -5103,96 +4673,95 @@ hole.no
 holmestrand.no
 holtalen.no
 holtรฅlen.no
+os.hordaland.no
 hornindal.no
 horten.no
-hurdal.no
-hurum.no
-hvaler.no
-hyllestad.no
-hagebostad.no
-hรฆgebostad.no
 hoyanger.no
 hรธyanger.no
 hoylandet.no
 hรธylandet.no
-ha.no
-hรฅ.no
+hurdal.no
+hurum.no
+hvaler.no
+hyllestad.no
 ibestad.no
 inderoy.no
 inderรธy.no
 iveland.no
+ivgu.no
 jevnaker.no
-jondal.no
 jolster.no
 jรธlster.no
-karasjok.no
+jondal.no
+kafjord.no
+kรฅfjord.no
 karasjohka.no
 kรกrรกลกjohka.no
+karasjok.no
 karlsoy.no
-galsa.no
-gรกlsรก.no
 karmoy.no
 karmรธy.no
 kautokeino.no
-guovdageaidnu.no
-klepp.no
 klabu.no
 klรฆbu.no
+klepp.no
 kongsberg.no
 kongsvinger.no
+kraanghke.no
+krรฅanghke.no
 kragero.no
 kragerรธ.no
 kristiansand.no
 kristiansund.no
 krodsherad.no
 krรธdsherad.no
+kvรฆfjord.no
+kvรฆnangen.no
+kvafjord.no
 kvalsund.no
-rahkkeravju.no
-rรกhkkerรกvju.no
 kvam.no
+kvanangen.no
 kvinesdal.no
 kvinnherad.no
 kviteseid.no
 kvitsoy.no
 kvitsรธy.no
-kvafjord.no
-kvรฆfjord.no
-giehtavuoatna.no
-kvanangen.no
-kvรฆnangen.no
-navuotna.no
-nรกvuotna.no
-kafjord.no
-kรฅfjord.no
-gaivuotna.no
-gรกivuotna.no
+laakesvuemie.no
+lรฆrdal.no
+lahppi.no
+lรกhppi.no
+lardal.no
 larvik.no
-lavangen.no
 lavagis.no
-loabat.no
-loabรกt.no
+lavangen.no
+leangaviika.no
+leaล‹gaviika.no
 lebesby.no
-davvesiida.no
 leikanger.no
 leirfjord.no
 leka.no
 leksvik.no
 lenvik.no
-leangaviika.no
-leaล‹gaviika.no
+lerdal.no
 lesja.no
 levanger.no
 lier.no
 lierne.no
 lillehammer.no
 lillesand.no
-lindesnes.no
 lindas.no
 lindรฅs.no
+lindesnes.no
+loabat.no
+loabรกt.no
+lodingen.no
+lรธdingen.no
 lom.no
 loppa.no
-lahppi.no
-lรกhppi.no
+lorenskog.no
+lรธrenskog.no
+loten.no
+lรธten.no
 lund.no
 lunner.no
 luroy.no
@@ -5200,25 +4769,19 @@ lurรธy.no
 luster.no
 lyngdal.no
 lyngen.no
-ivgu.no
-lardal.no
-lerdal.no
-lรฆrdal.no
-lodingen.no
-lรธdingen.no
-lorenskog.no
-lรธrenskog.no
-loten.no
-lรธten.no
+malatvuopmi.no
+mรกlatvuopmi.no
+malselv.no
+mรฅlselv.no
 malvik.no
-masoy.no
-mรฅsรธy.no
-muosat.no
-muosรกt.no
 mandal.no
 marker.no
 marnardal.no
 masfjorden.no
+masoy.no
+mรฅsรธy.no
+matta-varjjat.no
+mรกtta-vรกrjjat.no
 meland.no
 meldal.no
 melhus.no
@@ -5226,39 +4789,38 @@ meloy.no
 melรธy.no
 meraker.no
 merรฅker.no
-moareke.no
-moรฅreke.no
 midsund.no
 midtre-gauldal.no
+moareke.no
+moรฅreke.no
 modalen.no
 modum.no
 molde.no
+heroy.more-og-romsdal.no
+sande.more-og-romsdal.no
+herรธy.mรธre-og-romsdal.no
+sande.mรธre-og-romsdal.no
 moskenes.no
 moss.no
-mosvik.no
-malselv.no
-mรฅlselv.no
-malatvuopmi.no
-mรกlatvuopmi.no
+muosat.no
+muosรกt.no
+naamesjevuemie.no
+nรฅรฅmesjevuemie.no
+nรฆrรธy.no
 namdalseid.no
-aejrie.no
 namsos.no
 namsskogan.no
-naamesjevuemie.no
-nรฅรฅmesjevuemie.no
-laakesvuemie.no
 nannestad.no
-narvik.no
+naroy.no
 narviika.no
+narvik.no
 naustdal.no
+navuotna.no
+nรกvuotna.no
 nedre-eiker.no
-nes.akershus.no
-nes.buskerud.no
 nesna.no
 nesodden.no
 nesseby.no
-unjarga.no
-unjรกrga.no
 nesset.no
 nissedal.no
 nittedal.no
@@ -5267,21 +4829,20 @@ nord-fron.no
 nord-odal.no
 norddal.no
 nordkapp.no
-davvenjarga.no
-davvenjรกrga.no
-nordre-land.no
-nordreisa.no
-raisa.no
-rรกisa.no
+bo.nordland.no
+bรธ.nordland.no
+heroy.nordland.no
+herรธy.nordland.no
+nordre-land.no
+nordreisa.no
 nore-og-uvdal.no
 notodden.no
-naroy.no
-nรฆrรธy.no
 notteroy.no
 nรธtterรธy.no
 odda.no
 oksnes.no
 รธksnes.no
+omasvuotna.no
 oppdal.no
 oppegard.no
 oppegรฅrd.no
@@ -5292,11 +4853,11 @@ orskog.no
 รธrskog.no
 orsta.no
 รธrsta.no
-os.hedmark.no
-os.hordaland.no
 osen.no
 osteroy.no
 osterรธy.no
+valer.ostfold.no
+vรฅler.รธstfold.no
 ostre-toten.no
 รธstre-toten.no
 overhalla.no
@@ -5312,11 +4873,18 @@ porsanger.no
 porsangu.no
 porsรกล‹gu.no
 porsgrunn.no
+rade.no
+rรฅde.no
 radoy.no
 radรธy.no
+rรฆlingen.no
+rahkkeravju.no
+rรกhkkerรกvju.no
+raisa.no
+rรกisa.no
 rakkestad.no
+ralingen.no
 rana.no
-ruovat.no
 randaberg.no
 rauma.no
 rendalen.no
@@ -5327,16 +4895,14 @@ rindal.no
 ringebu.no
 ringerike.no
 ringsaker.no
-rissa.no
 risor.no
 risรธr.no
+rissa.no
 roan.no
-rollag.no
-rygge.no
-ralingen.no
-rรฆlingen.no
 rodoy.no
 rรธdรธy.no
+rollag.no
+romsa.no
 romskog.no
 rรธmskog.no
 roros.no
@@ -5347,18 +4913,14 @@ royken.no
 rรธyken.no
 royrvik.no
 rรธyrvik.no
-rade.no
-rรฅde.no
+ruovat.no
+rygge.no
 salangen.no
-siellak.no
-saltdal.no
 salat.no
-sรกlรกt.no
 sรกlat.no
+sรกlรกt.no
+saltdal.no
 samnanger.no
-sande.more-og-romsdal.no
-sande.mรธre-og-romsdal.no
-sande.vestfold.no
 sandefjord.no
 sandnes.no
 sandoy.no
@@ -5370,39 +4932,60 @@ sel.no
 selbu.no
 selje.no
 seljord.no
+siellak.no
 sigdal.no
 siljan.no
 sirdal.no
+skanit.no
+skรกnit.no
+skanland.no
+skรฅnland.no
 skaun.no
 skedsmo.no
 ski.no
 skien.no
-skiptvet.no
-skjervoy.no
-skjervรธy.no
 skierva.no
 skiervรก.no
+skiptvet.no
 skjak.no
 skjรฅk.no
+skjervoy.no
+skjervรธy.no
 skodje.no
-skanland.no
-skรฅnland.no
-skanit.no
-skรกnit.no
 smola.no
 smรธla.no
-snillfjord.no
+snaase.no
+snรฅase.no
 snasa.no
 snรฅsa.no
+snillfjord.no
 snoasa.no
-snaase.no
-snรฅase.no
 sogndal.no
+sogne.no
+sรธgne.no
 sokndal.no
 sola.no
 solund.no
+somna.no
+sรธmna.no
+sondre-land.no
+sรธndre-land.no
 songdalen.no
+sor-aurdal.no
+sรธr-aurdal.no
+sor-fron.no
+sรธr-fron.no
+sor-odal.no
+sรธr-odal.no
+sor-varanger.no
+sรธr-varanger.no
+sorfold.no
+sรธrfold.no
+sorreisa.no
+sรธrreisa.no
 sortland.no
+sorum.no
+sรธrum.no
 spydeberg.no
 stange.no
 stavanger.no
@@ -5415,7 +4998,6 @@ stor-elvdal.no
 stord.no
 stordal.no
 storfjord.no
-omasvuotna.no
 strand.no
 stranda.no
 stryn.no
@@ -5427,72 +5009,55 @@ surnadal.no
 sveio.no
 svelvik.no
 sykkylven.no
-sogne.no
-sรธgne.no
-somna.no
-sรธmna.no
-sondre-land.no
-sรธndre-land.no
-sor-aurdal.no
-sรธr-aurdal.no
-sor-fron.no
-sรธr-fron.no
-sor-odal.no
-sรธr-odal.no
-sor-varanger.no
-sรธr-varanger.no
-matta-varjjat.no
-mรกtta-vรกrjjat.no
-sorfold.no
-sรธrfold.no
-sorreisa.no
-sรธrreisa.no
-sorum.no
-sรธrum.no
 tana.no
-deatnu.no
+bo.telemark.no
+bรธ.telemark.no
 time.no
 tingvoll.no
 tinn.no
 tjeldsund.no
-dielddanuorri.no
 tjome.no
 tjรธme.no
 tokke.no
 tolga.no
+tonsberg.no
+tรธnsberg.no
 torsken.no
+trรฆna.no
+trana.no
 tranoy.no
 tranรธy.no
+troandin.no
+trogstad.no
+trรธgstad.no
+tromsa.no
 tromso.no
 tromsรธ.no
-tromsa.no
-romsa.no
 trondheim.no
-troandin.no
 trysil.no
-trana.no
-trรฆna.no
-trogstad.no
-trรธgstad.no
 tvedestrand.no
 tydal.no
 tynset.no
 tysfjord.no
-divtasvuodna.no
-divttasvuotna.no
 tysnes.no
-tysvar.no
 tysvรฆr.no
-tonsberg.no
-tรธnsberg.no
+tysvar.no
 ullensaker.no
 ullensvang.no
 ulvik.no
+unjarga.no
+unjรกrga.no
 utsira.no
+vaapste.no
 vadso.no
 vadsรธ.no
-cahcesuolo.no
-ฤรกhcesuolo.no
+vรฆrรธy.no
+vaga.no
+vรฅgรฅ.no
+vagan.no
+vรฅgan.no
+vagsoy.no
+vรฅgsรธy.no
 vaksdal.no
 valle.no
 vang.no
@@ -5501,8 +5066,8 @@ vardo.no
 vardรธ.no
 varggat.no
 vรกrggรกt.no
+varoy.no
 vefsn.no
-vaapste.no
 vega.no
 vegarshei.no
 vegรฅrshei.no
@@ -5510,6 +5075,7 @@ vennesla.no
 verdal.no
 verran.no
 vestby.no
+sande.vestfold.no
 vestnes.no
 vestre-slidre.no
 vestre-toten.no
@@ -5519,21 +5085,9 @@ vevelstad.no
 vik.no
 vikna.no
 vindafjord.no
+voagat.no
 volda.no
 voss.no
-varoy.no
-vรฆrรธy.no
-vagan.no
-vรฅgan.no
-voagat.no
-vagsoy.no
-vรฅgsรธy.no
-vaga.no
-vรฅgรฅ.no
-valer.ostfold.no
-vรฅler.รธstfold.no
-valer.hedmark.no
-vรฅler.hedmark.no
 
 // np : http://www.mos.com.np/register.html
 *.np
@@ -5542,17 +5096,17 @@ vรฅler.hedmark.no
 // Submitted by registry <technician@cenpac.net.nr>
 nr
 biz.nr
-info.nr
-gov.nr
+com.nr
 edu.nr
-org.nr
+gov.nr
+info.nr
 net.nr
-com.nr
+org.nr
 
-// nu : https://en.wikipedia.org/wiki/.nu
+// nu : https://www.iana.org/domains/root/db/nu.html
 nu
 
-// nz : https://en.wikipedia.org/wiki/.nz
+// nz : https://www.iana.org/domains/root/db/nz.html
 // Submitted by registry <jay@nzrs.net.nz>
 nz
 ac.nz
@@ -5565,14 +5119,14 @@ health.nz
 iwi.nz
 kiwi.nz
 maori.nz
-mil.nz
 mฤori.nz
+mil.nz
 net.nz
 org.nz
 parliament.nz
 school.nz
 
-// om : https://en.wikipedia.org/wiki/.om
+// om : https://www.iana.org/domains/root/db/om.html
 om
 co.om
 com.om
@@ -5587,82 +5141,84 @@ pro.om
 // onion : https://tools.ietf.org/html/rfc7686
 onion
 
-// org : https://en.wikipedia.org/wiki/.org
+// org : https://www.iana.org/domains/root/db/org.html
 org
 
 // pa : http://www.nic.pa/
 // Some additional second level "domains" resolve directly as hostnames, such as
 // pannet.pa, so we add a rule for "pa".
 pa
+abo.pa
 ac.pa
-gob.pa
 com.pa
-org.pa
-sld.pa
 edu.pa
-net.pa
+gob.pa
 ing.pa
-abo.pa
 med.pa
+net.pa
 nom.pa
+org.pa
+sld.pa
 
 // pe : https://www.nic.pe/InformeFinalComision.pdf
 pe
+com.pe
 edu.pe
 gob.pe
-nom.pe
 mil.pe
-org.pe
-com.pe
 net.pe
+nom.pe
+org.pe
 
 // pf : http://www.gobin.info/domainname/formulaire-pf.pdf
 pf
 com.pf
-org.pf
 edu.pf
+org.pf
 
-// pg : https://en.wikipedia.org/wiki/.pg
+// pg : https://www.iana.org/domains/root/db/pg.html
 *.pg
 
-// ph : http://www.domains.ph/FAQ2.asp
+// ph : https://www.iana.org/domains/root/db/ph.html
 // Submitted by registry <jed@email.com.ph>
 ph
 com.ph
-net.ph
-org.ph
-gov.ph
 edu.ph
-ngo.ph
-mil.ph
+gov.ph
 i.ph
+mil.ph
+net.ph
+ngo.ph
+org.ph
 
-// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
+// pk : https://pk5.pknic.net.pk/pk5/msgNamepk.PK
+// Contact Email: staff@pknic.net.pk
 pk
+ac.pk
+biz.pk
 com.pk
-net.pk
 edu.pk
-org.pk
 fam.pk
-biz.pk
-web.pk
-gov.pk
+gkp.pk
 gob.pk
+gog.pk
 gok.pk
-gon.pk
 gop.pk
 gos.pk
-info.pk
+gov.pk
+net.pk
+org.pk
+web.pk
 
-// pl http://www.dns.pl/english/index.html
-// Submitted by registry
+// pl : https://www.dns.pl/en/
+// Confirmed by registry <info@dns.pl> 2024-11-18
 pl
 com.pl
 net.pl
 org.pl
-// pl functional domains (http://www.dns.pl/english/index.html)
-aid.pl
+// pl functional domains : https://www.dns.pl/en/list_of_functional_domain_names
 agro.pl
+aid.pl
 atm.pl
 auto.pl
 biz.pl
@@ -5671,8 +5227,8 @@ gmina.pl
 gsm.pl
 info.pl
 mail.pl
-miasta.pl
 media.pl
+miasta.pl
 mil.pl
 nieruchomosci.pl
 nom.pl
@@ -5691,56 +5247,65 @@ tm.pl
 tourism.pl
 travel.pl
 turystyka.pl
-// Government domains
+// Government domains : https://www.dns.pl/informacje_o_rejestracji_domen_gov_pl
+// In accordance with the .gov.pl Domain Name Regulations : https://www.dns.pl/regulamin_gov_pl
 gov.pl
 ap.gov.pl
+griw.gov.pl
 ic.gov.pl
 is.gov.pl
-us.gov.pl
 kmpsp.gov.pl
+konsulat.gov.pl
 kppsp.gov.pl
-kwpsp.gov.pl
-psp.gov.pl
-wskr.gov.pl
 kwp.gov.pl
+kwpsp.gov.pl
+mup.gov.pl
 mw.gov.pl
-ug.gov.pl
-um.gov.pl
-umig.gov.pl
-ugim.gov.pl
-upow.gov.pl
-uw.gov.pl
-starostwo.gov.pl
+oia.gov.pl
+oirm.gov.pl
+oke.gov.pl
+oow.gov.pl
+oschr.gov.pl
+oum.gov.pl
 pa.gov.pl
+pinb.gov.pl
+piw.gov.pl
 po.gov.pl
+pr.gov.pl
+psp.gov.pl
 psse.gov.pl
 pup.gov.pl
 rzgw.gov.pl
 sa.gov.pl
+sdn.gov.pl
+sko.gov.pl
 so.gov.pl
 sr.gov.pl
-wsa.gov.pl
-sko.gov.pl
+starostwo.gov.pl
+ug.gov.pl
+ugim.gov.pl
+um.gov.pl
+umig.gov.pl
+upow.gov.pl
+uppo.gov.pl
+us.gov.pl
+uw.gov.pl
 uzs.gov.pl
+wif.gov.pl
 wiih.gov.pl
 winb.gov.pl
-pinb.gov.pl
 wios.gov.pl
 witd.gov.pl
-wzmiuw.gov.pl
-piw.gov.pl
 wiw.gov.pl
-griw.gov.pl
-wif.gov.pl
-oum.gov.pl
-sdn.gov.pl
-zp.gov.pl
-uppo.gov.pl
-mup.gov.pl
+wkz.gov.pl
+wsa.gov.pl
+wskr.gov.pl
+wsse.gov.pl
 wuoz.gov.pl
-konsulat.gov.pl
-oirm.gov.pl
-// pl regional domains (http://www.dns.pl/english/index.html)
+wzmiuw.gov.pl
+zp.gov.pl
+zpisdn.gov.pl
+// pl regional domains : https://www.dns.pl/en/list_of_regional_domain_names
 augustow.pl
 babia-gora.pl
 bedzin.pl
@@ -5767,11 +5332,11 @@ jaworzno.pl
 jelenia-gora.pl
 jgora.pl
 kalisz.pl
-kazimierz-dolny.pl
 karpacz.pl
 kartuzy.pl
 kaszuby.pl
 katowice.pl
+kazimierz-dolny.pl
 kepno.pl
 ketrzyn.pl
 klodzko.pl
@@ -5814,8 +5379,8 @@ pisz.pl
 podhale.pl
 podlasie.pl
 polkowice.pl
-pomorze.pl
 pomorskie.pl
+pomorze.pl
 prochowice.pl
 pruszkow.pl
 przeworsk.pl
@@ -5826,11 +5391,11 @@ rybnik.pl
 rzeszow.pl
 sanok.pl
 sejny.pl
+skoczow.pl
 slask.pl
 slupsk.pl
 sosnowiec.pl
 stalowa-wola.pl
-skoczow.pl
 starachowice.pl
 stargard.pl
 suwalki.pl
@@ -5861,36 +5426,36 @@ zarow.pl
 zgora.pl
 zgorzelec.pl
 
-// pm : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
+// pm : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 pm
 
-// pn : http://www.government.pn/PnRegistry/policies.htm
+// pn : https://www.iana.org/domains/root/db/pn.html
 pn
-gov.pn
 co.pn
-org.pn
 edu.pn
+gov.pn
 net.pn
+org.pn
 
-// post : https://en.wikipedia.org/wiki/.post
+// post : https://www.iana.org/domains/root/db/post.html
 post
 
 // pr : http://www.nic.pr/index.asp?f=1
 pr
+biz.pr
 com.pr
-net.pr
-org.pr
-gov.pr
 edu.pr
-isla.pr
-pro.pr
-biz.pr
+gov.pr
 info.pr
+isla.pr
 name.pr
-// these aren't mentioned on nic.pr, but on https://en.wikipedia.org/wiki/.pr
+net.pr
+org.pr
+pro.pr
+// these aren't mentioned on nic.pr, but on https://www.iana.org/domains/root/db/pr.html
+ac.pr
 est.pr
 prof.pr
-ac.pr
 
 // pro : http://registry.pro/get-pro
 pro
@@ -5906,38 +5471,34 @@ law.pro
 med.pro
 recht.pro
 
-// ps : https://en.wikipedia.org/wiki/.ps
+// ps : https://www.iana.org/domains/root/db/ps.html
 // http://www.nic.ps/registration/policy.html#reg
 ps
+com.ps
 edu.ps
 gov.ps
-sec.ps
-plo.ps
-com.ps
-org.ps
 net.ps
+org.ps
+plo.ps
+sec.ps
 
 // pt : https://www.dns.pt/en/domain/pt-terms-and-conditions-registration-rules/
 pt
-net.pt
-gov.pt
-org.pt
+com.pt
 edu.pt
+gov.pt
 int.pt
-publ.pt
-com.pt
+net.pt
 nome.pt
+org.pt
+publ.pt
 
-// pw : https://en.wikipedia.org/wiki/.pw
+// pw : https://www.iana.org/domains/root/db/pw.html
+// Confirmed by registry in private correspondence with @dnsguru 2024-12-09
 pw
-co.pw
-ne.pw
-or.pw
-ed.pw
-go.pw
-belau.pw
-
-// py : http://www.nic.py/pautas.html#seccion_9
+gov.pw
+
+// py : https://www.iana.org/domains/root/db/py.html
 // Submitted by registry
 py
 com.py
@@ -5959,11 +5520,12 @@ net.qa
 org.qa
 sch.qa
 
-// re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
+// re : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
+// Confirmed by registry <support@afnic.fr> 2024-11-18
 re
+// Closed for registration on 2013-03-15 but domains are still maintained
 asso.re
 com.re
-nom.re
 
 // ro : http://www.rotld.ro/
 ro
@@ -5992,7 +5554,7 @@ org.rs
 // Submitted by George Georgievsky <gug@cctld.ru>
 ru
 
-// rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf
+// rw : https://www.iana.org/domains/root/db/rw.html
 rw
 ac.rw
 co.rw
@@ -6005,12 +5567,12 @@ org.rw
 // sa : http://www.nic.net.sa/
 sa
 com.sa
-net.sa
-org.sa
+edu.sa
 gov.sa
 med.sa
+net.sa
+org.sa
 pub.sa
-edu.sa
 sch.sa
 
 // sb : http://www.sbnic.net.sb/
@@ -6025,25 +5587,26 @@ org.sb
 // sc : http://www.nic.sc/
 sc
 com.sc
+edu.sc
 gov.sc
 net.sc
 org.sc
-edu.sc
 
-// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
+// sd : https://www.iana.org/domains/root/db/sd.html
 // Submitted by registry <admin@isoc.sd>
 sd
 com.sd
-net.sd
-org.sd
 edu.sd
-med.sd
-tv.sd
 gov.sd
 info.sd
+med.sd
+net.sd
+org.sd
+tv.sd
 
-// se : https://en.wikipedia.org/wiki/.se
-// Submitted by registry <patrik.wallstrom@iis.se>
+// se : https://www.iana.org/domains/root/db/se.html
+// https://data.internetstiftelsen.se/barred_domains_list.txt -> Second level domains & Sub-domains
+// Confirmed by Registry Services <registry@internetstiftelsen.se> 2024-11-20
 se
 a.se
 ac.se
@@ -6085,54 +5648,54 @@ x.se
 y.se
 z.se
 
-// sg : http://www.nic.net.sg/page/registration-policies-procedures-and-guidelines
+// sg : https://www.sgnic.sg/domain-registration/sg-categories-rules
+// Confirmed by registry <dnq@sgnic.sg> 2024-11-19
 sg
 com.sg
+edu.sg
+gov.sg
 net.sg
 org.sg
-gov.sg
-edu.sg
-per.sg
 
 // sh : http://nic.sh/rules.htm
 sh
 com.sh
-net.sh
 gov.sh
-org.sh
 mil.sh
+net.sh
+org.sh
 
-// si : https://en.wikipedia.org/wiki/.si
+// si : https://www.iana.org/domains/root/db/si.html
 si
 
 // sj : No registrations at this time.
 // Submitted by registry <jarle@uninett.no>
 sj
 
-// sk : https://en.wikipedia.org/wiki/.sk
-// list of 2nd level domains ?
+// sk : https://www.iana.org/domains/root/db/sk.html
+// https://sk-nic.sk/
 sk
+org.sk
 
 // sl : http://www.nic.sl
 // Submitted by registry <adam@neoip.com>
 sl
 com.sl
-net.sl
 edu.sl
 gov.sl
+net.sl
 org.sl
 
-// sm : https://en.wikipedia.org/wiki/.sm
+// sm : https://www.iana.org/domains/root/db/sm.html
 sm
 
-// sn : https://en.wikipedia.org/wiki/.sn
+// sn : https://www.iana.org/domains/root/db/sn.html
 sn
 art.sn
 com.sn
 edu.sn
 gouv.sn
 org.sn
-perso.sn
 univ.sn
 
 // so : http://sonic.so/policies/
@@ -6144,13 +5707,14 @@ me.so
 net.so
 org.so
 
-// sr : https://en.wikipedia.org/wiki/.sr
+// sr : https://www.iana.org/domains/root/db/sr.html
 sr
 
 // ss : https://registry.nic.ss/
 // Submitted by registry <technical@nic.ss>
 ss
 biz.ss
+co.ss
 com.ss
 edu.ss
 gov.ss
@@ -6173,10 +5737,10 @@ principe.st
 saotome.st
 store.st
 
-// su : https://en.wikipedia.org/wiki/.su
+// su : https://www.iana.org/domains/root/db/su.html
 su
 
-// sv : http://www.svnet.org.sv/niveldos.pdf
+// sv : https://www.iana.org/domains/root/db/sv.html
 sv
 com.sv
 edu.sv
@@ -6184,46 +5748,45 @@ gob.sv
 org.sv
 red.sv
 
-// sx : https://en.wikipedia.org/wiki/.sx
+// sx : https://www.iana.org/domains/root/db/sx.html
 // Submitted by registry <jcvignes@openregistry.com>
 sx
 gov.sx
 
-// sy : https://en.wikipedia.org/wiki/.sy
-// see also: http://www.gobin.info/domainname/sy.doc
+// sy : https://www.iana.org/domains/root/db/sy.html
 sy
+com.sy
 edu.sy
 gov.sy
-net.sy
 mil.sy
-com.sy
+net.sy
 org.sy
 
-// sz : https://en.wikipedia.org/wiki/.sz
+// sz : https://www.iana.org/domains/root/db/sz.html
 // http://www.sispa.org.sz/
 sz
-co.sz
 ac.sz
+co.sz
 org.sz
 
-// tc : https://en.wikipedia.org/wiki/.tc
+// tc : https://www.iana.org/domains/root/db/tc.html
 tc
 
-// td : https://en.wikipedia.org/wiki/.td
+// td : https://www.iana.org/domains/root/db/td.html
 td
 
-// tel: https://en.wikipedia.org/wiki/.tel
+// tel : https://www.iana.org/domains/root/db/tel.html
 // http://www.telnic.org/
 tel
 
-// tf : https://en.wikipedia.org/wiki/.tf
+// tf : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 tf
 
-// tg : https://en.wikipedia.org/wiki/.tg
+// tg : https://www.iana.org/domains/root/db/tg.html
 // http://www.nic.tg/
 tg
 
-// th : https://en.wikipedia.org/wiki/.th
+// th : https://www.iana.org/domains/root/db/th.html
 // Submitted by registry <krit@thains.co.th>
 th
 ac.th
@@ -6252,23 +5815,24 @@ org.tj
 test.tj
 web.tj
 
-// tk : https://en.wikipedia.org/wiki/.tk
+// tk : https://www.iana.org/domains/root/db/tk.html
 tk
 
-// tl : https://en.wikipedia.org/wiki/.tl
+// tl : https://www.iana.org/domains/root/db/tl.html
 tl
 gov.tl
 
-// tm : http://www.nic.tm/local.html
+// tm : https://www.nic.tm/local.html
+// Confirmed by registry <admin@nic.TM> 2024-11-19
 tm
-com.tm
 co.tm
-org.tm
-net.tm
-nom.tm
+com.tm
+edu.tm
 gov.tm
 mil.tm
-edu.tm
+net.tm
+nom.tm
+org.tm
 
 // tn : http://www.registre.tn/fr/
 // https://whois.ati.tn/
@@ -6287,15 +5851,15 @@ org.tn
 perso.tn
 tourism.tn
 
-// to : https://en.wikipedia.org/wiki/.to
+// to : https://www.iana.org/domains/root/db/to.html
 // Submitted by registry <egullich@colo.to>
 to
 com.to
+edu.to
 gov.to
+mil.to
 net.to
 org.to
-edu.to
-mil.to
 
 // tr : https://nic.tr/
 // https://nic.tr/forms/eng/policies.pdf
@@ -6311,9 +5875,9 @@ edu.tr
 gen.tr
 gov.tr
 info.tr
-mil.tr
 k12.tr
 kep.tr
+mil.tr
 name.tr
 net.tr
 org.tr
@@ -6327,46 +5891,40 @@ nc.tr
 // Used by government agencies of Northern Cyprus
 gov.nc.tr
 
-// tt : http://www.nic.tt/
+// tt : https://www.nic.tt/
+// Confirmed by registry <admin@nic.tt> 2024-11-19
 tt
+biz.tt
 co.tt
 com.tt
-org.tt
-net.tt
-biz.tt
+edu.tt
+gov.tt
 info.tt
-pro.tt
-int.tt
-coop.tt
-jobs.tt
-mobi.tt
-travel.tt
-museum.tt
-aero.tt
+mil.tt
 name.tt
-gov.tt
-edu.tt
+net.tt
+org.tt
+pro.tt
 
-// tv : https://en.wikipedia.org/wiki/.tv
+// tv : https://www.iana.org/domains/root/db/tv.html
 // Not listing any 2LDs as reserved since none seem to exist in practice,
 // Wikipedia notwithstanding.
 tv
 
-// tw : https://en.wikipedia.org/wiki/.tw
+// tw : https://www.iana.org/domains/root/db/tw.html
+// https://twnic.tw/dnservice_catag.php
+// Confirmed by registry <dns@twnic.tw> 2024-11-26
 tw
+club.tw
+com.tw
+ebiz.tw
 edu.tw
+game.tw
 gov.tw
+idv.tw
 mil.tw
-com.tw
 net.tw
 org.tw
-idv.tw
-game.tw
-ebiz.tw
-club.tw
-็ถฒ่ทฏ.tw
-็ต„็น”.tw
-ๅ•†ๆฅญ.tw
 
 // tz : http://www.tznic.or.tz/index.php/domains
 // Submitted by registry <manager@tznic.or.tz>
@@ -6424,6 +5982,7 @@ kiev.ua
 kirovograd.ua
 km.ua
 kr.ua
+kropyvnytskyi.ua
 krym.ua
 ks.ua
 kv.ua
@@ -6431,6 +5990,7 @@ kyiv.ua
 lg.ua
 lt.ua
 lugansk.ua
+luhansk.ua
 lutsk.ua
 lv.ua
 lviv.ua
@@ -6454,11 +6014,13 @@ te.ua
 ternopil.ua
 uz.ua
 uzhgorod.ua
+uzhhorod.ua
 vinnica.ua
 vinnytsia.ua
 vn.ua
 volyn.ua
 yalta.ua
+zakarpattia.ua
 zaporizhzhe.ua
 zaporizhzhia.ua
 zhitomir.ua
@@ -6467,17 +6029,23 @@ zp.ua
 zt.ua
 
 // ug : https://www.registry.co.ug/
+// https://www.registry.co.ug, https://whois.co.ug
+// Confirmed by registry <support@i3c.co.ug> 2025-01-20
 ug
-co.ug
-or.ug
 ac.ug
-sc.ug
+co.ug
+com.ug
+edu.ug
 go.ug
+gov.ug
+mil.ug
 ne.ug
-com.ug
+or.ug
 org.ug
+sc.ug
+us.ug
 
-// uk : https://en.wikipedia.org/wiki/.uk
+// uk : https://www.iana.org/domains/root/db/uk.html
 // Submitted by registry <Michael.Daly@nominet.org.uk>
 uk
 ac.uk
@@ -6492,14 +6060,13 @@ plc.uk
 police.uk
 *.sch.uk
 
-// us : https://en.wikipedia.org/wiki/.us
+// us : https://www.iana.org/domains/root/db/us.html
+// Confirmed via the .us zone file by William Harrison 2024-12-10
 us
 dni.us
-fed.us
 isa.us
-kids.us
 nsn.us
-// us geographic names
+// Geographic Names
 ak.us
 al.us
 ar.us
@@ -6548,9 +6115,9 @@ sd.us
 tn.us
 tx.us
 ut.us
+va.us
 vi.us
 vt.us
-va.us
 wa.us
 wi.us
 wv.us
@@ -6570,11 +6137,10 @@ k12.ca.us
 k12.co.us
 k12.ct.us
 k12.dc.us
-k12.de.us
 k12.fl.us
 k12.ga.us
 k12.gu.us
-// k12.hi.us  Bug 614565 - Hawaii has a state-wide DOE login
+// k12.hi.us - Bug 614565 - Hawaii has a state-wide DOE login
 k12.ia.us
 k12.id.us
 k12.il.us
@@ -6591,7 +6157,7 @@ k12.mo.us
 k12.ms.us
 k12.mt.us
 k12.nc.us
-// k12.nd.us  Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
+// k12.nd.us - Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
 k12.ne.us
 k12.nh.us
 k12.nj.us
@@ -6603,139 +6169,137 @@ k12.ok.us
 k12.or.us
 k12.pa.us
 k12.pr.us
-// k12.ri.us  Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
+// k12.ri.us - Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
 k12.sc.us
-// k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
+// k12.sd.us - Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
 k12.tn.us
 k12.tx.us
 k12.ut.us
+k12.va.us
 k12.vi.us
 k12.vt.us
-k12.va.us
 k12.wa.us
 k12.wi.us
-// k12.wv.us  Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
-k12.wy.us
+// k12.wv.us - Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
 cc.ak.us
+lib.ak.us
 cc.al.us
+lib.al.us
 cc.ar.us
+lib.ar.us
 cc.as.us
+lib.as.us
 cc.az.us
+lib.az.us
 cc.ca.us
+lib.ca.us
 cc.co.us
+lib.co.us
 cc.ct.us
+lib.ct.us
 cc.dc.us
+lib.dc.us
 cc.de.us
 cc.fl.us
+lib.fl.us
 cc.ga.us
+lib.ga.us
 cc.gu.us
+lib.gu.us
 cc.hi.us
+lib.hi.us
 cc.ia.us
+lib.ia.us
 cc.id.us
+lib.id.us
 cc.il.us
+lib.il.us
 cc.in.us
+lib.in.us
 cc.ks.us
+lib.ks.us
 cc.ky.us
+lib.ky.us
 cc.la.us
+lib.la.us
 cc.ma.us
+lib.ma.us
 cc.md.us
+lib.md.us
 cc.me.us
+lib.me.us
 cc.mi.us
+lib.mi.us
 cc.mn.us
+lib.mn.us
 cc.mo.us
+lib.mo.us
 cc.ms.us
 cc.mt.us
+lib.mt.us
 cc.nc.us
+lib.nc.us
 cc.nd.us
+lib.nd.us
 cc.ne.us
+lib.ne.us
 cc.nh.us
+lib.nh.us
 cc.nj.us
+lib.nj.us
 cc.nm.us
+lib.nm.us
 cc.nv.us
+lib.nv.us
 cc.ny.us
+lib.ny.us
 cc.oh.us
+lib.oh.us
 cc.ok.us
+lib.ok.us
 cc.or.us
+lib.or.us
 cc.pa.us
+lib.pa.us
 cc.pr.us
+lib.pr.us
 cc.ri.us
+lib.ri.us
 cc.sc.us
+lib.sc.us
 cc.sd.us
+lib.sd.us
 cc.tn.us
+lib.tn.us
 cc.tx.us
+lib.tx.us
 cc.ut.us
+lib.ut.us
+cc.va.us
+lib.va.us
 cc.vi.us
+lib.vi.us
 cc.vt.us
-cc.va.us
+lib.vt.us
 cc.wa.us
+lib.wa.us
 cc.wi.us
+lib.wi.us
 cc.wv.us
 cc.wy.us
-lib.ak.us
-lib.al.us
-lib.ar.us
-lib.as.us
-lib.az.us
-lib.ca.us
-lib.co.us
-lib.ct.us
-lib.dc.us
-// lib.de.us  Issue #243 - Moved to Private section at request of Ed Moore <Ed.Moore@lib.de.us>
-lib.fl.us
-lib.ga.us
-lib.gu.us
-lib.hi.us
-lib.ia.us
-lib.id.us
-lib.il.us
-lib.in.us
-lib.ks.us
-lib.ky.us
-lib.la.us
-lib.ma.us
-lib.md.us
-lib.me.us
-lib.mi.us
-lib.mn.us
-lib.mo.us
-lib.ms.us
-lib.mt.us
-lib.nc.us
-lib.nd.us
-lib.ne.us
-lib.nh.us
-lib.nj.us
-lib.nm.us
-lib.nv.us
-lib.ny.us
-lib.oh.us
-lib.ok.us
-lib.or.us
-lib.pa.us
-lib.pr.us
-lib.ri.us
-lib.sc.us
-lib.sd.us
-lib.tn.us
-lib.tx.us
-lib.ut.us
-lib.vi.us
-lib.vt.us
-lib.va.us
-lib.wa.us
-lib.wi.us
-// lib.wv.us  Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
+k12.wy.us
+// lib.wv.us - Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
 lib.wy.us
 // k12.ma.us contains school districts in Massachusetts. The 4LDs are
-//  managed independently except for private (PVT), charter (CHTR) and
-//  parochial (PAROCH) schools.  Those are delegated directly to the
-//  5LD operators.   <k12-ma-hostmaster _ at _ rsuc.gweep.net>
-pvt.k12.ma.us
+// managed independently except for private (PVT), charter (CHTR) and
+// parochial (PAROCH) schools. Those are delegated directly to the
+// 5LD operators. <k12-ma-hostmaster@rsuc.gweep.net>
 chtr.k12.ma.us
 paroch.k12.ma.us
+pvt.k12.ma.us
 // Merit Network, Inc. maintains the registry for =~ /(k12|cc|lib).mi.us/ and the following
-//    see also: http://domreg.merit.edu
-//    see also: whois -h whois.domreg.merit.edu help
+// see also: https://domreg.merit.edu : domreg@merit.edu
+// see also: whois -h whois.domreg.merit.edu help
 ann-arbor.mi.us
 cog.mi.us
 dst.mi.us
@@ -6761,20 +6325,21 @@ com.uz
 net.uz
 org.uz
 
-// va : https://en.wikipedia.org/wiki/.va
+// va : https://www.iana.org/domains/root/db/va.html
 va
 
-// vc : https://en.wikipedia.org/wiki/.vc
+// vc : https://www.iana.org/domains/root/db/vc.html
 // Submitted by registry <kshah@ca.afilias.info>
 vc
 com.vc
-net.vc
-org.vc
+edu.vc
 gov.vc
 mil.vc
-edu.vc
+net.vc
+org.vc
 
 // ve : https://registro.nic.ve/
+// https://nic.ve/site/user-agreement -> under "III. Clasificaciรณn de Nombres de Dominio"
 // Submitted by registry nic@nic.ve and nicve@conatel.gob.ve
 ve
 arts.ve
@@ -6783,9 +6348,11 @@ co.ve
 com.ve
 e12.ve
 edu.ve
+emprende.ve
 firm.ve
 gob.ve
 gov.ve
+ia.ve
 info.ve
 int.ve
 mil.ve
@@ -6798,13 +6365,12 @@ store.ve
 tec.ve
 web.ve
 
-// vg : https://en.wikipedia.org/wiki/.vg
+// vg : https://www.iana.org/domains/root/db/vg.html
+// Confirmed by registry <tld.ops@centralnic.com> 2025-01-10
 vg
+edu.vg
 
-// vi : http://www.nic.vi/newdomainform.htm
-// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
-// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
-// are available for registration (which they do not seem to be).
+// vi : https://www.iana.org/domains/root/db/vi.html
 vi
 co.vi
 com.vi
@@ -6812,22 +6378,92 @@ k12.vi
 net.vi
 org.vi
 
-// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp
+// vn : https://www.vnnic.vn/en/domain/cctld-vn
+// https://vnnic.vn/sites/default/files/tailieu/vn.cctld.domains.txt
 vn
+ac.vn
+ai.vn
+biz.vn
 com.vn
-net.vn
-org.vn
 edu.vn
 gov.vn
-int.vn
-ac.vn
-biz.vn
+health.vn
+id.vn
 info.vn
+int.vn
+io.vn
 name.vn
+net.vn
+org.vn
 pro.vn
-health.vn
 
-// vu : https://en.wikipedia.org/wiki/.vu
+// vn geographical names
+angiang.vn
+bacgiang.vn
+backan.vn
+baclieu.vn
+bacninh.vn
+baria-vungtau.vn
+bentre.vn
+binhdinh.vn
+binhduong.vn
+binhphuoc.vn
+binhthuan.vn
+camau.vn
+cantho.vn
+caobang.vn
+daklak.vn
+daknong.vn
+danang.vn
+dienbien.vn
+dongnai.vn
+dongthap.vn
+gialai.vn
+hagiang.vn
+haiduong.vn
+haiphong.vn
+hanam.vn
+hanoi.vn
+hatinh.vn
+haugiang.vn
+hoabinh.vn
+hue.vn
+hungyen.vn
+khanhhoa.vn
+kiengiang.vn
+kontum.vn
+laichau.vn
+lamdong.vn
+langson.vn
+laocai.vn
+longan.vn
+namdinh.vn
+nghean.vn
+ninhbinh.vn
+ninhthuan.vn
+phutho.vn
+phuyen.vn
+quangbinh.vn
+quangnam.vn
+quangngai.vn
+quangninh.vn
+quangtri.vn
+soctrang.vn
+sonla.vn
+tayninh.vn
+thaibinh.vn
+thainguyen.vn
+thanhhoa.vn
+thanhphohochiminh.vn
+thuathienhue.vn
+tiengiang.vn
+travinh.vn
+tuyenquang.vn
+vinhlong.vn
+vinhphuc.vn
+yenbai.vn
+
+// vu : https://www.iana.org/domains/root/db/vu.html
 // http://www.vunic.vu/
 vu
 com.vu
@@ -6835,19 +6471,19 @@ edu.vu
 net.vu
 org.vu
 
-// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
+// wf : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 wf
 
-// ws : https://en.wikipedia.org/wiki/.ws
+// ws : https://www.iana.org/domains/root/db/ws.html
 // http://samoanic.ws/index.dhtml
 ws
 com.ws
+edu.ws
+gov.ws
 net.ws
 org.ws
-gov.ws
-edu.ws
 
-// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
+// yt : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 yt
 
 // IDN ccTLDs
@@ -6880,12 +6516,12 @@ yt
 
 // xn--fiqs8s ("Zhongguo/China", Chinese, Simplified) : CN
 // CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
+// https://www.cnnic.cn/11/192/index.html
 ไธญๅ›ฝ
 
 // xn--fiqz9s ("Zhongguo/China", Chinese, Traditional) : CN
 // CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
+// https://www.cnnic.com.cn/AU/MediaC/Announcement/201609/t20160905_54470.htm
 ไธญๅœ‹
 
 // xn--lgbbat1ad8j ("Algeria/Al Jazair", Arabic) : DZ
@@ -6918,12 +6554,12 @@ yt
 // Submitted by registry <hk.tech@hkirc.hk>
 // https://www.hkirc.hk/content.jsp?id=30#!/34
 ้ฆ™ๆธฏ
+ๅ€‹ไบบ.้ฆ™ๆธฏ
 ๅ…ฌๅธ.้ฆ™ๆธฏ
-ๆ•™่‚ฒ.้ฆ™ๆธฏ
 ๆ”ฟๅบœ.้ฆ™ๆธฏ
-ๅ€‹ไบบ.้ฆ™ๆธฏ
-็ถฒ็ตก.้ฆ™ๆธฏ
+ๆ•™่‚ฒ.้ฆ™ๆธฏ
 ็ต„็น”.้ฆ™ๆธฏ
+็ถฒ็ตก.้ฆ™ๆธฏ
 
 // xn--2scrj9c ("Bharat", Kannada) : IN
 // India
@@ -7054,12 +6690,12 @@ yt
 // xn--90a3ac ("srb", Cyrillic) : RS
 // https://www.rnids.rs/en/domains/national-domains
 ัั€ะฑ
-ะฟั€.ัั€ะฑ
-ะพั€ะณ.ัั€ะฑ
+ะฐะบ.ัั€ะฑ
 ะพะฑั€.ัั€ะฑ
 ะพะด.ัั€ะฑ
+ะพั€ะณ.ัั€ะฑ
+ะฟั€.ัั€ะฑ
 ัƒะฟั€.ัั€ะฑ
-ะฐะบ.ัั€ะฑ
 
 // xn--p1ai ("rf", Russian-Cyrillic) : RU
 // https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
@@ -7074,7 +6710,7 @@ yt
 // http://www.nic.net.sa/
 ุงู„ุณุนูˆุฏูŠุฉ
 
-// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant)  : SA
+// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant): SA
 ุงู„ุณุนูˆุฏ�Œุฉ
 
 // xn--mgbqly7c0a67fbc ("AlSaudiah", Arabic, variant) : SA
@@ -7102,11 +6738,11 @@ yt
 // xn--o3cw4h ("Thai", Thai) : TH
 // http://www.thnic.co.th
 เน„เธ—เธข
-เธจเธถเธเธฉเธฒ.เน„เธ—เธข
-เธ˜เธธเธฃเธเธดเธˆ.เน„เธ—เธข
-เธฃเธฑเธเธšเธฒเธฅ.เน„เธ—เธข
 เธ—เธซเธฒเธฃ.เน„เธ—เธข
+เธ˜เธธเธฃเธเธดเธˆ.เน„เธ—เธข
 เน€เธ™เน‡เธ•.เน„เธ—เธข
+เธฃเธฑเธเธšเธฒเธฅ.เน„เธ—เธข
+เธจเธถเธเธฉเธฒ.เน„เธ—เธข
 เธญเธ‡เธ„เนŒเธเธฃ.เน„เธ—เธข
 
 // xn--pgbs0dh ("Tunisia", Arabic) : TN
@@ -7114,7 +6750,7 @@ yt
 ุชูˆู†ุณ
 
 // xn--kpry57d ("Taiwan", Chinese, Traditional) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
+// https://twnic.tw/dnservice_catag.php
 ๅฐ็ฃ
 
 // xn--kprw13d ("Taiwan", Chinese, Simplified) : TW
@@ -7138,11 +6774,11 @@ ye
 com.ye
 edu.ye
 gov.ye
-net.ye
 mil.ye
+net.ye
 org.ye
 
-// za : https://www.zadna.org.za/content/page/domain-information/
+// za : https://www.iana.org/domains/root/db/za.html
 ac.za
 agric.za
 alt.za
@@ -7186,3514 +6822,4521 @@ gov.zw
 mil.zw
 org.zw
 
-
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-02-22T15:15:03Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2026-02-18T15:51:43Z
 // This list is auto-generated, don't edit it manually.
-// aaa : 2015-02-26 American Automobile Association, Inc.
+// aaa : American Automobile Association, Inc.
+// https://www.iana.org/domains/root/db/aaa.html
 aaa
 
-// aarp : 2015-05-21 AARP
+// aarp : AARP
+// https://www.iana.org/domains/root/db/aarp.html
 aarp
 
-// abarth : 2015-07-30 Fiat Chrysler Automobiles N.V.
-abarth
-
-// abb : 2014-10-24 ABB Ltd
+// abb : ABB Ltd
+// https://www.iana.org/domains/root/db/abb.html
 abb
 
-// abbott : 2014-07-24 Abbott Laboratories, Inc.
+// abbott : Abbott Laboratories, Inc.
+// https://www.iana.org/domains/root/db/abbott.html
 abbott
 
-// abbvie : 2015-07-30 AbbVie Inc.
+// abbvie : AbbVie Inc.
+// https://www.iana.org/domains/root/db/abbvie.html
 abbvie
 
-// abc : 2015-07-30 Disney Enterprises, Inc.
+// abc : Disney Enterprises, Inc.
+// https://www.iana.org/domains/root/db/abc.html
 abc
 
-// able : 2015-06-25 Able Inc.
+// able : Able Inc.
+// https://www.iana.org/domains/root/db/able.html
 able
 
-// abogado : 2014-04-24 Registry Services, LLC
+// abogado : Registry Services, LLC
+// https://www.iana.org/domains/root/db/abogado.html
 abogado
 
-// abudhabi : 2015-07-30 Abu Dhabi Systems and Information Centre
+// abudhabi : Abu Dhabi Systems and Information Centre
+// https://www.iana.org/domains/root/db/abudhabi.html
 abudhabi
 
-// academy : 2013-11-07 Binky Moon, LLC
+// academy : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/academy.html
 academy
 
-// accenture : 2014-08-15 Accenture plc
+// accenture : Accenture plc
+// https://www.iana.org/domains/root/db/accenture.html
 accenture
 
-// accountant : 2014-11-20 dot Accountant Limited
+// accountant : dot Accountant Limited
+// https://www.iana.org/domains/root/db/accountant.html
 accountant
 
-// accountants : 2014-03-20 Binky Moon, LLC
+// accountants : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/accountants.html
 accountants
 
-// aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG
+// aco : ACO Severin Ahlmann GmbH & Co. KG
+// https://www.iana.org/domains/root/db/aco.html
 aco
 
-// actor : 2013-12-12 Dog Beach, LLC
+// actor : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/actor.html
 actor
 
-// ads : 2014-12-04 Charleston Road Registry Inc.
+// ads : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/ads.html
 ads
 
-// adult : 2014-10-16 ICM Registry AD LLC
+// adult : ICM Registry AD LLC
+// https://www.iana.org/domains/root/db/adult.html
 adult
 
-// aeg : 2015-03-19 Aktiebolaget Electrolux
+// aeg : Aktiebolaget Electrolux
+// https://www.iana.org/domains/root/db/aeg.html
 aeg
 
-// aetna : 2015-05-21 Aetna Life Insurance Company
+// aetna : Aetna Life Insurance Company
+// https://www.iana.org/domains/root/db/aetna.html
 aetna
 
-// afl : 2014-10-02 Australian Football League
+// afl : Australian Football League
+// https://www.iana.org/domains/root/db/afl.html
 afl
 
-// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa
+// africa : ZA Central Registry NPC trading as Registry.Africa
+// https://www.iana.org/domains/root/db/africa.html
 africa
 
-// agakhan : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
+// agakhan : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/agakhan.html
 agakhan
 
-// agency : 2013-11-14 Binky Moon, LLC
+// agency : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/agency.html
 agency
 
-// aig : 2014-12-18 American International Group, Inc.
+// aig : American International Group, Inc.
+// https://www.iana.org/domains/root/db/aig.html
 aig
 
-// airbus : 2015-07-30 Airbus S.A.S.
+// airbus : Airbus S.A.S.
+// https://www.iana.org/domains/root/db/airbus.html
 airbus
 
-// airforce : 2014-03-06 Dog Beach, LLC
+// airforce : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/airforce.html
 airforce
 
-// airtel : 2014-10-24 Bharti Airtel Limited
+// airtel : Bharti Airtel Limited
+// https://www.iana.org/domains/root/db/airtel.html
 airtel
 
-// akdn : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
+// akdn : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/akdn.html
 akdn
 
-// alfaromeo : 2015-07-31 Fiat Chrysler Automobiles N.V.
-alfaromeo
-
-// alibaba : 2015-01-15 Alibaba Group Holding Limited
+// alibaba : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/alibaba.html
 alibaba
 
-// alipay : 2015-01-15 Alibaba Group Holding Limited
+// alipay : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/alipay.html
 alipay
 
-// allfinanz : 2014-07-03 Allfinanz Deutsche Vermรถgensberatung Aktiengesellschaft
+// allfinanz : Allfinanz Deutsche Vermรถgensberatung Aktiengesellschaft
+// https://www.iana.org/domains/root/db/allfinanz.html
 allfinanz
 
-// allstate : 2015-07-31 Allstate Fire and Casualty Insurance Company
+// allstate : Allstate Fire and Casualty Insurance Company
+// https://www.iana.org/domains/root/db/allstate.html
 allstate
 
-// ally : 2015-06-18 Ally Financial Inc.
+// ally : Ally Financial Inc.
+// https://www.iana.org/domains/root/db/ally.html
 ally
 
-// alsace : 2014-07-02 Region Grand Est
+// alsace : Region Grand Est
+// https://www.iana.org/domains/root/db/alsace.html
 alsace
 
-// alstom : 2015-07-30 ALSTOM
+// alstom : ALSTOM
+// https://www.iana.org/domains/root/db/alstom.html
 alstom
 
-// amazon : 2019-12-19 Amazon Registry Services, Inc.
+// amazon : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/amazon.html
 amazon
 
-// americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc.
+// americanexpress : American Express Travel Related Services Company, Inc.
+// https://www.iana.org/domains/root/db/americanexpress.html
 americanexpress
 
-// americanfamily : 2015-07-23 AmFam, Inc.
+// americanfamily : AmFam, Inc.
+// https://www.iana.org/domains/root/db/americanfamily.html
 americanfamily
 
-// amex : 2015-07-31 American Express Travel Related Services Company, Inc.
+// amex : American Express Travel Related Services Company, Inc.
+// https://www.iana.org/domains/root/db/amex.html
 amex
 
-// amfam : 2015-07-23 AmFam, Inc.
+// amfam : AmFam, Inc.
+// https://www.iana.org/domains/root/db/amfam.html
 amfam
 
-// amica : 2015-05-28 Amica Mutual Insurance Company
+// amica : Amica Mutual Insurance Company
+// https://www.iana.org/domains/root/db/amica.html
 amica
 
-// amsterdam : 2014-07-24 Gemeente Amsterdam
+// amsterdam : Gemeente Amsterdam
+// https://www.iana.org/domains/root/db/amsterdam.html
 amsterdam
 
-// analytics : 2014-12-18 Campus IP LLC
+// analytics : Campus IP LLC
+// https://www.iana.org/domains/root/db/analytics.html
 analytics
 
-// android : 2014-08-07 Charleston Road Registry Inc.
+// android : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/android.html
 android
 
-// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// anquan : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/anquan.html
 anquan
 
-// anz : 2015-07-31 Australia and New Zealand Banking Group Limited
+// anz : Australia and New Zealand Banking Group Limited
+// https://www.iana.org/domains/root/db/anz.html
 anz
 
-// aol : 2015-09-17 Oath Inc.
+// aol : Yahoo Inc.
+// https://www.iana.org/domains/root/db/aol.html
 aol
 
-// apartments : 2014-12-11 Binky Moon, LLC
+// apartments : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/apartments.html
 apartments
 
-// app : 2015-05-14 Charleston Road Registry Inc.
+// app : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/app.html
 app
 
-// apple : 2015-05-14 Apple Inc.
+// apple : Apple Inc.
+// https://www.iana.org/domains/root/db/apple.html
 apple
 
-// aquarelle : 2014-07-24 Aquarelle.com
+// aquarelle : Aquarelle.com
+// https://www.iana.org/domains/root/db/aquarelle.html
 aquarelle
 
-// arab : 2015-11-12 League of Arab States
+// arab : League of Arab States
+// https://www.iana.org/domains/root/db/arab.html
 arab
 
-// aramco : 2014-11-20 Aramco Services Company
+// aramco : Aramco Services Company
+// https://www.iana.org/domains/root/db/aramco.html
 aramco
 
-// archi : 2014-02-06 Identity Digital Limited
+// archi : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/archi.html
 archi
 
-// army : 2014-03-06 Dog Beach, LLC
+// army : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/army.html
 army
 
-// art : 2016-03-24 UK Creative Ideas Limited
+// art : UK Creative Ideas Limited
+// https://www.iana.org/domains/root/db/art.html
 art
 
-// arte : 2014-12-11 Association Relative ร  la Tรฉlรฉvision Europรฉenne G.E.I.E.
+// arte : Association Relative ร  la Tรฉlรฉvision Europรฉenne G.E.I.E.
+// https://www.iana.org/domains/root/db/arte.html
 arte
 
-// asda : 2015-07-31 Wal-Mart Stores, Inc.
+// asda : Asda Stores Limited
+// https://www.iana.org/domains/root/db/asda.html
 asda
 
-// associates : 2014-03-06 Binky Moon, LLC
+// associates : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/associates.html
 associates
 
-// athleta : 2015-07-30 The Gap, Inc.
+// athleta : The Gap, Inc.
+// https://www.iana.org/domains/root/db/athleta.html
 athleta
 
-// attorney : 2014-03-20 Dog Beach, LLC
+// attorney : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/attorney.html
 attorney
 
-// auction : 2014-03-20 Dog Beach, LLC
+// auction : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/auction.html
 auction
 
-// audi : 2015-05-21 AUDI Aktiengesellschaft
+// audi : AUDI Aktiengesellschaft
+// https://www.iana.org/domains/root/db/audi.html
 audi
 
-// audible : 2015-06-25 Amazon Registry Services, Inc.
+// audible : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/audible.html
 audible
 
-// audio : 2014-03-20 XYZ.COM LLC
+// audio : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/audio.html
 audio
 
-// auspost : 2015-08-13 Australian Postal Corporation
+// auspost : Australian Postal Corporation
+// https://www.iana.org/domains/root/db/auspost.html
 auspost
 
-// author : 2014-12-18 Amazon Registry Services, Inc.
+// author : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/author.html
 author
 
-// auto : 2014-11-13 XYZ.COM LLC
+// auto : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/auto.html
 auto
 
-// autos : 2014-01-09 XYZ.COM LLC
+// autos : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/autos.html
 autos
 
-// avianca : 2015-01-08 Avianca Inc.
-avianca
-
-// aws : 2015-06-25 AWS Registry LLC
+// aws : AWS Registry LLC
+// https://www.iana.org/domains/root/db/aws.html
 aws
 
-// axa : 2013-12-19 AXA Group Operations SAS
+// axa : AXA Group Operations SAS
+// https://www.iana.org/domains/root/db/axa.html
 axa
 
-// azure : 2014-12-18 Microsoft Corporation
+// azure : Microsoft Corporation
+// https://www.iana.org/domains/root/db/azure.html
 azure
 
-// baby : 2015-04-09 XYZ.COM LLC
+// baby : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/baby.html
 baby
 
-// baidu : 2015-01-08 Baidu, Inc.
+// baidu : Baidu, Inc.
+// https://www.iana.org/domains/root/db/baidu.html
 baidu
 
-// banamex : 2015-07-30 Citigroup Inc.
+// banamex : Citigroup Inc.
+// https://www.iana.org/domains/root/db/banamex.html
 banamex
 
-// bananarepublic : 2015-07-31 The Gap, Inc.
-bananarepublic
-
-// band : 2014-06-12 Dog Beach, LLC
+// band : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/band.html
 band
 
-// bank : 2014-09-25 fTLD Registry Services LLC
+// bank : fTLD Registry Services LLC
+// https://www.iana.org/domains/root/db/bank.html
 bank
 
-// bar : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// bar : Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// https://www.iana.org/domains/root/db/bar.html
 bar
 
-// barcelona : 2014-07-24 Municipi de Barcelona
+// barcelona : Municipi de Barcelona
+// https://www.iana.org/domains/root/db/barcelona.html
 barcelona
 
-// barclaycard : 2014-11-20 Barclays Bank PLC
+// barclaycard : Barclays Bank PLC
+// https://www.iana.org/domains/root/db/barclaycard.html
 barclaycard
 
-// barclays : 2014-11-20 Barclays Bank PLC
+// barclays : Barclays Bank PLC
+// https://www.iana.org/domains/root/db/barclays.html
 barclays
 
-// barefoot : 2015-06-11 Gallo Vineyards, Inc.
+// barefoot : Gallo Vineyards, Inc.
+// https://www.iana.org/domains/root/db/barefoot.html
 barefoot
 
-// bargains : 2013-11-14 Binky Moon, LLC
+// bargains : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/bargains.html
 bargains
 
-// baseball : 2015-10-29 MLB Advanced Media DH, LLC
+// baseball : MLB Advanced Media DH, LLC
+// https://www.iana.org/domains/root/db/baseball.html
 baseball
 
-// basketball : 2015-08-20 Fรฉdรฉration Internationale de Basketball (FIBA)
+// basketball : Fรฉdรฉration Internationale de Basketball (FIBA)
+// https://www.iana.org/domains/root/db/basketball.html
 basketball
 
-// bauhaus : 2014-04-17 Werkhaus GmbH
+// bauhaus : Werkhaus GmbH
+// https://www.iana.org/domains/root/db/bauhaus.html
 bauhaus
 
-// bayern : 2014-01-23 Bayern Connect GmbH
+// bayern : Bayern Connect GmbH
+// https://www.iana.org/domains/root/db/bayern.html
 bayern
 
-// bbc : 2014-12-18 British Broadcasting Corporation
+// bbc : British Broadcasting Corporation
+// https://www.iana.org/domains/root/db/bbc.html
 bbc
 
-// bbt : 2015-07-23 BB&T Corporation
+// bbt : BB&T Corporation
+// https://www.iana.org/domains/root/db/bbt.html
 bbt
 
-// bbva : 2014-10-02 BANCO BILBAO VIZCAYA ARGENTARIA, S.A.
+// bbva : BANCO BILBAO VIZCAYA ARGENTARIA, S.A.
+// https://www.iana.org/domains/root/db/bbva.html
 bbva
 
-// bcg : 2015-04-02 The Boston Consulting Group, Inc.
+// bcg : The Boston Consulting Group, Inc.
+// https://www.iana.org/domains/root/db/bcg.html
 bcg
 
-// bcn : 2014-07-24 Municipi de Barcelona
+// bcn : Municipi de Barcelona
+// https://www.iana.org/domains/root/db/bcn.html
 bcn
 
-// beats : 2015-05-14 Beats Electronics, LLC
+// beats : Beats Electronics, LLC
+// https://www.iana.org/domains/root/db/beats.html
 beats
 
-// beauty : 2015-12-03 XYZ.COM LLC
+// beauty : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/beauty.html
 beauty
 
-// beer : 2014-01-09 Registry Services, LLC
+// beer : Registry Services, LLC
+// https://www.iana.org/domains/root/db/beer.html
 beer
 
-// bentley : 2014-12-18 Bentley Motors Limited
-bentley
-
-// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG
+// berlin : dotBERLIN GmbH & Co. KG
+// https://www.iana.org/domains/root/db/berlin.html
 berlin
 
-// best : 2013-12-19 BestTLD Pty Ltd
+// best : BestTLD Pty Ltd
+// https://www.iana.org/domains/root/db/best.html
 best
 
-// bestbuy : 2015-07-31 BBY Solutions, Inc.
+// bestbuy : BBY Solutions, Inc.
+// https://www.iana.org/domains/root/db/bestbuy.html
 bestbuy
 
-// bet : 2015-05-07 Identity Digital Limited
+// bet : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/bet.html
 bet
 
-// bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited
+// bharti : Bharti Enterprises (Holding) Private Limited
+// https://www.iana.org/domains/root/db/bharti.html
 bharti
 
-// bible : 2014-06-19 American Bible Society
+// bible : American Bible Society
+// https://www.iana.org/domains/root/db/bible.html
 bible
 
-// bid : 2013-12-19 dot Bid Limited
+// bid : dot Bid Limited
+// https://www.iana.org/domains/root/db/bid.html
 bid
 
-// bike : 2013-08-27 Binky Moon, LLC
+// bike : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/bike.html
 bike
 
-// bing : 2014-12-18 Microsoft Corporation
+// bing : Microsoft Corporation
+// https://www.iana.org/domains/root/db/bing.html
 bing
 
-// bingo : 2014-12-04 Binky Moon, LLC
+// bingo : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/bingo.html
 bingo
 
-// bio : 2014-03-06 Identity Digital Limited
+// bio : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/bio.html
 bio
 
-// black : 2014-01-16 Identity Digital Limited
+// black : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/black.html
 black
 
-// blackfriday : 2014-01-16 Registry Services, LLC
+// blackfriday : Registry Services, LLC
+// https://www.iana.org/domains/root/db/blackfriday.html
 blackfriday
 
-// blockbuster : 2015-07-30 Dish DBS Corporation
+// blockbuster : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/blockbuster.html
 blockbuster
 
-// blog : 2015-05-14 Knock Knock WHOIS There, LLC
+// blog : Knock Knock WHOIS There, LLC
+// https://www.iana.org/domains/root/db/blog.html
 blog
 
-// bloomberg : 2014-07-17 Bloomberg IP Holdings LLC
+// bloomberg : Bloomberg IP Holdings LLC
+// https://www.iana.org/domains/root/db/bloomberg.html
 bloomberg
 
-// blue : 2013-11-07 Identity Digital Limited
+// blue : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/blue.html
 blue
 
-// bms : 2014-10-30 Bristol-Myers Squibb Company
+// bms : Bristol-Myers Squibb Company
+// https://www.iana.org/domains/root/db/bms.html
 bms
 
-// bmw : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
+// bmw : Bayerische Motoren Werke Aktiengesellschaft
+// https://www.iana.org/domains/root/db/bmw.html
 bmw
 
-// bnpparibas : 2014-05-29 BNP Paribas
+// bnpparibas : BNP Paribas
+// https://www.iana.org/domains/root/db/bnpparibas.html
 bnpparibas
 
-// boats : 2014-12-04 XYZ.COM LLC
+// boats : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/boats.html
 boats
 
-// boehringer : 2015-07-09 Boehringer Ingelheim International GmbH
+// boehringer : Boehringer Ingelheim International GmbH
+// https://www.iana.org/domains/root/db/boehringer.html
 boehringer
 
-// bofa : 2015-07-31 Bank of America Corporation
+// bofa : Bank of America Corporation
+// https://www.iana.org/domains/root/db/bofa.html
 bofa
 
-// bom : 2014-10-16 Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// bom : Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// https://www.iana.org/domains/root/db/bom.html
 bom
 
-// bond : 2014-06-05 ShortDot SA
+// bond : ShortDot SA
+// https://www.iana.org/domains/root/db/bond.html
 bond
 
-// boo : 2014-01-30 Charleston Road Registry Inc.
+// boo : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/boo.html
 boo
 
-// book : 2015-08-27 Amazon Registry Services, Inc.
+// book : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/book.html
 book
 
-// booking : 2015-07-16 Booking.com B.V.
+// booking : Booking.com B.V.
+// https://www.iana.org/domains/root/db/booking.html
 booking
 
-// bosch : 2015-06-18 Robert Bosch GMBH
+// bosch : Robert Bosch GMBH
+// https://www.iana.org/domains/root/db/bosch.html
 bosch
 
-// bostik : 2015-05-28 Bostik SA
+// bostik : Bostik SA
+// https://www.iana.org/domains/root/db/bostik.html
 bostik
 
-// boston : 2015-12-10 Registry Services, LLC
+// boston : Registry Services, LLC
+// https://www.iana.org/domains/root/db/boston.html
 boston
 
-// bot : 2014-12-18 Amazon Registry Services, Inc.
+// bot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/bot.html
 bot
 
-// boutique : 2013-11-14 Binky Moon, LLC
+// boutique : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/boutique.html
 boutique
 
-// box : 2015-11-12 Intercap Registry Inc.
+// box : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/box.html
 box
 
-// bradesco : 2014-12-18 Banco Bradesco S.A.
+// bradesco : Banco Bradesco S.A.
+// https://www.iana.org/domains/root/db/bradesco.html
 bradesco
 
-// bridgestone : 2014-12-18 Bridgestone Corporation
+// bridgestone : Bridgestone Corporation
+// https://www.iana.org/domains/root/db/bridgestone.html
 bridgestone
 
-// broadway : 2014-12-22 Celebrate Broadway, Inc.
+// broadway : Celebrate Broadway, Inc.
+// https://www.iana.org/domains/root/db/broadway.html
 broadway
 
-// broker : 2014-12-11 Dog Beach, LLC
+// broker : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/broker.html
 broker
 
-// brother : 2015-01-29 Brother Industries, Ltd.
+// brother : Brother Industries, Ltd.
+// https://www.iana.org/domains/root/db/brother.html
 brother
 
-// brussels : 2014-02-06 DNS.be vzw
+// brussels : DNS.be vzw
+// https://www.iana.org/domains/root/db/brussels.html
 brussels
 
-// build : 2013-11-07 Plan Bee LLC
+// build : Plan Bee LLC
+// https://www.iana.org/domains/root/db/build.html
 build
 
-// builders : 2013-11-07 Binky Moon, LLC
+// builders : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/builders.html
 builders
 
-// business : 2013-11-07 Binky Moon, LLC
+// business : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/business.html
 business
 
-// buy : 2014-12-18 Amazon Registry Services, Inc.
+// buy : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/buy.html
 buy
 
-// buzz : 2013-10-02 DOTSTRATEGY CO.
+// buzz : DOTSTRATEGY CO.
+// https://www.iana.org/domains/root/db/buzz.html
 buzz
 
-// bzh : 2014-02-27 Association www.bzh
+// bzh : Association www.bzh
+// https://www.iana.org/domains/root/db/bzh.html
 bzh
 
-// cab : 2013-10-24 Binky Moon, LLC
+// cab : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cab.html
 cab
 
-// cafe : 2015-02-11 Binky Moon, LLC
+// cafe : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cafe.html
 cafe
 
-// cal : 2014-07-24 Charleston Road Registry Inc.
+// cal : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/cal.html
 cal
 
-// call : 2014-12-18 Amazon Registry Services, Inc.
+// call : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/call.html
 call
 
-// calvinklein : 2015-07-30 PVH gTLD Holdings LLC
+// calvinklein : PVH gTLD Holdings LLC
+// https://www.iana.org/domains/root/db/calvinklein.html
 calvinklein
 
-// cam : 2016-04-21 Cam Connecting SARL
+// cam : Cam Connecting SARL
+// https://www.iana.org/domains/root/db/cam.html
 cam
 
-// camera : 2013-08-27 Binky Moon, LLC
+// camera : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/camera.html
 camera
 
-// camp : 2013-11-07 Binky Moon, LLC
+// camp : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/camp.html
 camp
 
-// canon : 2014-09-12 Canon Inc.
+// canon : Canon Inc.
+// https://www.iana.org/domains/root/db/canon.html
 canon
 
-// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
+// capetown : ZA Central Registry NPC trading as ZA Central Registry
+// https://www.iana.org/domains/root/db/capetown.html
 capetown
 
-// capital : 2014-03-06 Binky Moon, LLC
+// capital : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/capital.html
 capital
 
-// capitalone : 2015-08-06 Capital One Financial Corporation
+// capitalone : Capital One Financial Corporation
+// https://www.iana.org/domains/root/db/capitalone.html
 capitalone
 
-// car : 2015-01-22 XYZ.COM LLC
+// car : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/car.html
 car
 
-// caravan : 2013-12-12 Caravan International, Inc.
+// caravan : Caravan International, Inc.
+// https://www.iana.org/domains/root/db/caravan.html
 caravan
 
-// cards : 2013-12-05 Binky Moon, LLC
+// cards : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cards.html
 cards
 
-// care : 2014-03-06 Binky Moon, LLC
+// care : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/care.html
 care
 
-// career : 2013-10-09 dotCareer LLC
+// career : dotCareer LLC
+// https://www.iana.org/domains/root/db/career.html
 career
 
-// careers : 2013-10-02 Binky Moon, LLC
+// careers : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/careers.html
 careers
 
-// cars : 2014-11-13 XYZ.COM LLC
+// cars : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/cars.html
 cars
 
-// casa : 2013-11-21 Registry Services, LLC
+// casa : Registry Services, LLC
+// https://www.iana.org/domains/root/db/casa.html
 casa
 
-// case : 2015-09-03 Digity, LLC
+// case : Digity, LLC
+// https://www.iana.org/domains/root/db/case.html
 case
 
-// cash : 2014-03-06 Binky Moon, LLC
+// cash : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cash.html
 cash
 
-// casino : 2014-12-18 Binky Moon, LLC
+// casino : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/casino.html
 casino
 
-// catering : 2013-12-05 Binky Moon, LLC
+// catering : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/catering.html
 catering
 
-// catholic : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// catholic : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/catholic.html
 catholic
 
-// cba : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
+// cba : COMMONWEALTH BANK OF AUSTRALIA
+// https://www.iana.org/domains/root/db/cba.html
 cba
 
-// cbn : 2014-08-22 The Christian Broadcasting Network, Inc.
+// cbn : The Christian Broadcasting Network, Inc.
+// https://www.iana.org/domains/root/db/cbn.html
 cbn
 
-// cbre : 2015-07-02 CBRE, Inc.
+// cbre : CBRE, Inc.
+// https://www.iana.org/domains/root/db/cbre.html
 cbre
 
-// cbs : 2015-08-06 CBS Domains Inc.
-cbs
-
-// center : 2013-11-07 Binky Moon, LLC
+// center : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/center.html
 center
 
-// ceo : 2013-11-07 CEOTLD Pty Ltd
+// ceo : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/ceo.html
 ceo
 
-// cern : 2014-06-05 European Organization for Nuclear Research ("CERN")
+// cern : European Organization for Nuclear Research ("CERN")
+// https://www.iana.org/domains/root/db/cern.html
 cern
 
-// cfa : 2014-08-28 CFA Institute
+// cfa : CFA Institute
+// https://www.iana.org/domains/root/db/cfa.html
 cfa
 
-// cfd : 2014-12-11 ShortDot SA
+// cfd : ShortDot SA
+// https://www.iana.org/domains/root/db/cfd.html
 cfd
 
-// chanel : 2015-04-09 Chanel International B.V.
+// chanel : Chanel International B.V.
+// https://www.iana.org/domains/root/db/chanel.html
 chanel
 
-// channel : 2014-05-08 Charleston Road Registry Inc.
+// channel : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/channel.html
 channel
 
-// charity : 2018-04-11 Public Interest Registry
+// charity : Public Interest Registry
+// https://www.iana.org/domains/root/db/charity.html
 charity
 
-// chase : 2015-04-30 JPMorgan Chase Bank, National Association
+// chase : JPMorgan Chase Bank, National Association
+// https://www.iana.org/domains/root/db/chase.html
 chase
 
-// chat : 2014-12-04 Binky Moon, LLC
+// chat : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/chat.html
 chat
 
-// cheap : 2013-11-14 Binky Moon, LLC
+// cheap : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cheap.html
 cheap
 
-// chintai : 2015-06-11 CHINTAI Corporation
+// chintai : CHINTAI Corporation
+// https://www.iana.org/domains/root/db/chintai.html
 chintai
 
-// christmas : 2013-11-21 XYZ.COM LLC
+// christmas : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/christmas.html
 christmas
 
-// chrome : 2014-07-24 Charleston Road Registry Inc.
+// chrome : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/chrome.html
 chrome
 
-// church : 2014-02-06 Binky Moon, LLC
+// church : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/church.html
 church
 
-// cipriani : 2015-02-19 Hotel Cipriani Srl
+// cipriani : Hotel Cipriani Srl
+// https://www.iana.org/domains/root/db/cipriani.html
 cipriani
 
-// circle : 2014-12-18 Amazon Registry Services, Inc.
+// circle : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/circle.html
 circle
 
-// cisco : 2014-12-22 Cisco Technology, Inc.
+// cisco : Cisco Technology, Inc.
+// https://www.iana.org/domains/root/db/cisco.html
 cisco
 
-// citadel : 2015-07-23 Citadel Domain LLC
+// citadel : Citadel Domain LLC
+// https://www.iana.org/domains/root/db/citadel.html
 citadel
 
-// citi : 2015-07-30 Citigroup Inc.
+// citi : Citigroup Inc.
+// https://www.iana.org/domains/root/db/citi.html
 citi
 
-// citic : 2014-01-09 CITIC Group Corporation
+// citic : CITIC Group Corporation
+// https://www.iana.org/domains/root/db/citic.html
 citic
 
-// city : 2014-05-29 Binky Moon, LLC
+// city : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/city.html
 city
 
-// cityeats : 2014-12-11 Lifestyle Domain Holdings, Inc.
-cityeats
-
-// claims : 2014-03-20 Binky Moon, LLC
+// claims : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/claims.html
 claims
 
-// cleaning : 2013-12-05 Binky Moon, LLC
+// cleaning : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cleaning.html
 cleaning
 
-// click : 2014-06-05 Internet Naming Company LLC
+// click : Waterford Limited
+// https://www.iana.org/domains/root/db/click.html
 click
 
-// clinic : 2014-03-20 Binky Moon, LLC
+// clinic : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/clinic.html
 clinic
 
-// clinique : 2015-10-01 The Estรฉe Lauder Companies Inc.
+// clinique : The Estรฉe Lauder Companies Inc.
+// https://www.iana.org/domains/root/db/clinique.html
 clinique
 
-// clothing : 2013-08-27 Binky Moon, LLC
+// clothing : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/clothing.html
 clothing
 
-// cloud : 2015-04-16 Aruba PEC S.p.A.
+// cloud : Aruba PEC S.p.A.
+// https://www.iana.org/domains/root/db/cloud.html
 cloud
 
-// club : 2013-11-08 Registry Services, LLC
+// club : Registry Services, LLC
+// https://www.iana.org/domains/root/db/club.html
 club
 
-// clubmed : 2015-06-25 Club Mรฉditerranรฉe S.A.
+// clubmed : Club Mรฉditerranรฉe S.A.
+// https://www.iana.org/domains/root/db/clubmed.html
 clubmed
 
-// coach : 2014-10-09 Binky Moon, LLC
+// coach : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/coach.html
 coach
 
-// codes : 2013-10-31 Binky Moon, LLC
+// codes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/codes.html
 codes
 
-// coffee : 2013-10-17 Binky Moon, LLC
+// coffee : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/coffee.html
 coffee
 
-// college : 2014-01-16 XYZ.COM LLC
+// college : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/college.html
 college
 
-// cologne : 2014-02-05 dotKoeln GmbH
+// cologne : dotKoeln GmbH
+// https://www.iana.org/domains/root/db/cologne.html
 cologne
 
-// comcast : 2015-07-23 Comcast IP Holdings I, LLC
-comcast
-
-// commbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
+// commbank : COMMONWEALTH BANK OF AUSTRALIA
+// https://www.iana.org/domains/root/db/commbank.html
 commbank
 
-// community : 2013-12-05 Binky Moon, LLC
+// community : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/community.html
 community
 
-// company : 2013-11-07 Binky Moon, LLC
+// company : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/company.html
 company
 
-// compare : 2015-10-08 Registry Services, LLC
+// compare : Registry Services, LLC
+// https://www.iana.org/domains/root/db/compare.html
 compare
 
-// computer : 2013-10-24 Binky Moon, LLC
+// computer : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/computer.html
 computer
 
-// comsec : 2015-01-08 VeriSign, Inc.
+// comsec : VeriSign, Inc.
+// https://www.iana.org/domains/root/db/comsec.html
 comsec
 
-// condos : 2013-12-05 Binky Moon, LLC
+// condos : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/condos.html
 condos
 
-// construction : 2013-09-16 Binky Moon, LLC
+// construction : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/construction.html
 construction
 
-// consulting : 2013-12-05 Dog Beach, LLC
+// consulting : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/consulting.html
 consulting
 
-// contact : 2015-01-08 Dog Beach, LLC
+// contact : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/contact.html
 contact
 
-// contractors : 2013-09-10 Binky Moon, LLC
+// contractors : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/contractors.html
 contractors
 
-// cooking : 2013-11-21 Registry Services, LLC
+// cooking : Registry Services, LLC
+// https://www.iana.org/domains/root/db/cooking.html
 cooking
 
-// cookingchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
-cookingchannel
-
-// cool : 2013-11-14 Binky Moon, LLC
+// cool : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cool.html
 cool
 
-// corsica : 2014-09-25 Collectivitรฉ de Corse
+// corsica : Collectivitรฉ de Corse
+// https://www.iana.org/domains/root/db/corsica.html
 corsica
 
-// country : 2013-12-19 Internet Naming Company LLC
+// country : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/country.html
 country
 
-// coupon : 2015-02-26 Amazon Registry Services, Inc.
+// coupon : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/coupon.html
 coupon
 
-// coupons : 2015-03-26 Binky Moon, LLC
+// coupons : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/coupons.html
 coupons
 
-// courses : 2014-12-04 Registry Services, LLC
+// courses : Registry Services, LLC
+// https://www.iana.org/domains/root/db/courses.html
 courses
 
-// cpa : 2019-06-10 American Institute of Certified Public Accountants
+// cpa : American Institute of Certified Public Accountants
+// https://www.iana.org/domains/root/db/cpa.html
 cpa
 
-// credit : 2014-03-20 Binky Moon, LLC
+// credit : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/credit.html
 credit
 
-// creditcard : 2014-03-20 Binky Moon, LLC
+// creditcard : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/creditcard.html
 creditcard
 
-// creditunion : 2015-01-22 DotCooperation LLC
+// creditunion : DotCooperation LLC
+// https://www.iana.org/domains/root/db/creditunion.html
 creditunion
 
-// cricket : 2014-10-09 dot Cricket Limited
+// cricket : dot Cricket Limited
+// https://www.iana.org/domains/root/db/cricket.html
 cricket
 
-// crown : 2014-10-24 Crown Equipment Corporation
+// crown : Crown Equipment Corporation
+// https://www.iana.org/domains/root/db/crown.html
 crown
 
-// crs : 2014-04-03 Federated Co-operatives Limited
+// crs : Federated Co-operatives Limited
+// https://www.iana.org/domains/root/db/crs.html
 crs
 
-// cruise : 2015-12-10 Viking River Cruises (Bermuda) Ltd.
+// cruise : Viking River Cruises (Bermuda) Ltd.
+// https://www.iana.org/domains/root/db/cruise.html
 cruise
 
-// cruises : 2013-12-05 Binky Moon, LLC
+// cruises : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cruises.html
 cruises
 
-// cuisinella : 2014-04-03 SCHMIDT GROUPE S.A.S.
+// cuisinella : SCHMIDT GROUPE S.A.S.
+// https://www.iana.org/domains/root/db/cuisinella.html
 cuisinella
 
-// cymru : 2014-05-08 Nominet UK
+// cymru : Nominet UK
+// https://www.iana.org/domains/root/db/cymru.html
 cymru
 
-// cyou : 2015-01-22 ShortDot SA
+// cyou : ShortDot SA
+// https://www.iana.org/domains/root/db/cyou.html
 cyou
 
-// dabur : 2014-02-06 Dabur India Limited
-dabur
-
-// dad : 2014-01-23 Charleston Road Registry Inc.
+// dad : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/dad.html
 dad
 
-// dance : 2013-10-24 Dog Beach, LLC
+// dance : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/dance.html
 dance
 
-// data : 2016-06-02 Dish DBS Corporation
+// data : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/data.html
 data
 
-// date : 2014-11-20 dot Date Limited
+// date : dot Date Limited
+// https://www.iana.org/domains/root/db/date.html
 date
 
-// dating : 2013-12-05 Binky Moon, LLC
+// dating : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/dating.html
 dating
 
-// datsun : 2014-03-27 NISSAN MOTOR CO., LTD.
+// datsun : NISSAN MOTOR CO., LTD.
+// https://www.iana.org/domains/root/db/datsun.html
 datsun
 
-// day : 2014-01-30 Charleston Road Registry Inc.
+// day : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/day.html
 day
 
-// dclk : 2014-11-20 Charleston Road Registry Inc.
+// dclk : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/dclk.html
 dclk
 
-// dds : 2015-05-07 Registry Services, LLC
+// dds : Registry Services, LLC
+// https://www.iana.org/domains/root/db/dds.html
 dds
 
-// deal : 2015-06-25 Amazon Registry Services, Inc.
+// deal : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/deal.html
 deal
 
-// dealer : 2014-12-22 Intercap Registry Inc.
+// dealer : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/dealer.html
 dealer
 
-// deals : 2014-05-22 Binky Moon, LLC
+// deals : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/deals.html
 deals
 
-// degree : 2014-03-06 Dog Beach, LLC
+// degree : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/degree.html
 degree
 
-// delivery : 2014-09-11 Binky Moon, LLC
+// delivery : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/delivery.html
 delivery
 
-// dell : 2014-10-24 Dell Inc.
+// dell : Dell Inc.
+// https://www.iana.org/domains/root/db/dell.html
 dell
 
-// deloitte : 2015-07-31 Deloitte Touche Tohmatsu
+// deloitte : Deloitte Touche Tohmatsu
+// https://www.iana.org/domains/root/db/deloitte.html
 deloitte
 
-// delta : 2015-02-19 Delta Air Lines, Inc.
+// delta : Delta Air Lines, Inc.
+// https://www.iana.org/domains/root/db/delta.html
 delta
 
-// democrat : 2013-10-24 Dog Beach, LLC
+// democrat : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/democrat.html
 democrat
 
-// dental : 2014-03-20 Binky Moon, LLC
+// dental : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/dental.html
 dental
 
-// dentist : 2014-03-20 Dog Beach, LLC
+// dentist : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/dentist.html
 dentist
 
-// desi : 2013-11-14 Desi Networks LLC
+// desi
+// https://www.iana.org/domains/root/db/desi.html
 desi
 
-// design : 2014-11-07 Registry Services, LLC
+// design : Registry Services, LLC
+// https://www.iana.org/domains/root/db/design.html
 design
 
-// dev : 2014-10-16 Charleston Road Registry Inc.
+// dev : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/dev.html
 dev
 
-// dhl : 2015-07-23 Deutsche Post AG
+// dhl : Deutsche Post AG
+// https://www.iana.org/domains/root/db/dhl.html
 dhl
 
-// diamonds : 2013-09-22 Binky Moon, LLC
+// diamonds : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/diamonds.html
 diamonds
 
-// diet : 2014-06-26 XYZ.COM LLC
+// diet : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/diet.html
 diet
 
-// digital : 2014-03-06 Binky Moon, LLC
+// digital : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/digital.html
 digital
 
-// direct : 2014-04-10 Binky Moon, LLC
+// direct : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/direct.html
 direct
 
-// directory : 2013-09-20 Binky Moon, LLC
+// directory : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/directory.html
 directory
 
-// discount : 2014-03-06 Binky Moon, LLC
+// discount : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/discount.html
 discount
 
-// discover : 2015-07-23 Discover Financial Services
+// discover : Discover Financial Services
+// https://www.iana.org/domains/root/db/discover.html
 discover
 
-// dish : 2015-07-30 Dish DBS Corporation
+// dish : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/dish.html
 dish
 
-// diy : 2015-11-05 Lifestyle Domain Holdings, Inc.
+// diy : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/diy.html
 diy
 
-// dnp : 2013-12-13 Dai Nippon Printing Co., Ltd.
+// dnp : Dai Nippon Printing Co., Ltd.
+// https://www.iana.org/domains/root/db/dnp.html
 dnp
 
-// docs : 2014-10-16 Charleston Road Registry Inc.
+// docs : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/docs.html
 docs
 
-// doctor : 2016-06-02 Binky Moon, LLC
+// doctor : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/doctor.html
 doctor
 
-// dog : 2014-12-04 Binky Moon, LLC
+// dog : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/dog.html
 dog
 
-// domains : 2013-10-17 Binky Moon, LLC
+// domains : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/domains.html
 domains
 
-// dot : 2015-05-21 Dish DBS Corporation
+// dot : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/dot.html
 dot
 
-// download : 2014-11-20 dot Support Limited
+// download : dot Support Limited
+// https://www.iana.org/domains/root/db/download.html
 download
 
-// drive : 2015-03-05 Charleston Road Registry Inc.
+// drive : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/drive.html
 drive
 
-// dtv : 2015-06-04 Dish DBS Corporation
+// dtv : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/dtv.html
 dtv
 
-// dubai : 2015-01-01 Dubai Smart Government Department
+// dubai : Dubai Smart Government Department
+// https://www.iana.org/domains/root/db/dubai.html
 dubai
 
-// dunlop : 2015-07-02 The Goodyear Tire & Rubber Company
-dunlop
-
-// dupont : 2015-06-25 DuPont Specialty Products USA, LLC
+// dupont : DuPont Specialty Products USA, LLC
+// https://www.iana.org/domains/root/db/dupont.html
 dupont
 
-// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
+// durban : ZA Central Registry NPC trading as ZA Central Registry
+// https://www.iana.org/domains/root/db/durban.html
 durban
 
-// dvag : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// dvag : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/dvag.html
 dvag
 
-// dvr : 2016-05-26 DISH Technologies L.L.C.
+// dvr : DISH Technologies L.L.C.
+// https://www.iana.org/domains/root/db/dvr.html
 dvr
 
-// earth : 2014-12-04 Interlink Systems Innovation Institute K.K.
+// earth : Interlink Systems Innovation Institute K.K.
+// https://www.iana.org/domains/root/db/earth.html
 earth
 
-// eat : 2014-01-23 Charleston Road Registry Inc.
+// eat : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/eat.html
 eat
 
-// eco : 2016-07-08 Big Room Inc.
+// eco : Big Room Inc.
+// https://www.iana.org/domains/root/db/eco.html
 eco
 
-// edeka : 2014-12-18 EDEKA Verband kaufmรคnnischer Genossenschaften e.V.
+// edeka : EDEKA Verband kaufmรคnnischer Genossenschaften e.V.
+// https://www.iana.org/domains/root/db/edeka.html
 edeka
 
-// education : 2013-11-07 Binky Moon, LLC
+// education : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/education.html
 education
 
-// email : 2013-10-31 Binky Moon, LLC
+// email : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/email.html
 email
 
-// emerck : 2014-04-03 Merck KGaA
+// emerck : Merck KGaA
+// https://www.iana.org/domains/root/db/emerck.html
 emerck
 
-// energy : 2014-09-11 Binky Moon, LLC
+// energy : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/energy.html
 energy
 
-// engineer : 2014-03-06 Dog Beach, LLC
+// engineer : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/engineer.html
 engineer
 
-// engineering : 2014-03-06 Binky Moon, LLC
+// engineering : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/engineering.html
 engineering
 
-// enterprises : 2013-09-20 Binky Moon, LLC
+// enterprises : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/enterprises.html
 enterprises
 
-// epson : 2014-12-04 Seiko Epson Corporation
+// epson : Seiko Epson Corporation
+// https://www.iana.org/domains/root/db/epson.html
 epson
 
-// equipment : 2013-08-27 Binky Moon, LLC
+// equipment : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/equipment.html
 equipment
 
-// ericsson : 2015-07-09 Telefonaktiebolaget L M Ericsson
+// ericsson : Telefonaktiebolaget L M Ericsson
+// https://www.iana.org/domains/root/db/ericsson.html
 ericsson
 
-// erni : 2014-04-03 ERNI Group Holding AG
+// erni : ERNI Group Holding AG
+// https://www.iana.org/domains/root/db/erni.html
 erni
 
-// esq : 2014-05-08 Charleston Road Registry Inc.
+// esq : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/esq.html
 esq
 
-// estate : 2013-08-27 Binky Moon, LLC
+// estate : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/estate.html
 estate
 
-// etisalat : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
-etisalat
-
-// eurovision : 2014-04-24 European Broadcasting Union (EBU)
+// eurovision : European Broadcasting Union (EBU)
+// https://www.iana.org/domains/root/db/eurovision.html
 eurovision
 
-// eus : 2013-12-12 Puntueus Fundazioa
+// eus : Puntueus Fundazioa
+// https://www.iana.org/domains/root/db/eus.html
 eus
 
-// events : 2013-12-05 Binky Moon, LLC
+// events : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/events.html
 events
 
-// exchange : 2014-03-06 Binky Moon, LLC
+// exchange : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/exchange.html
 exchange
 
-// expert : 2013-11-21 Binky Moon, LLC
+// expert : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/expert.html
 expert
 
-// exposed : 2013-12-05 Binky Moon, LLC
+// exposed : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/exposed.html
 exposed
 
-// express : 2015-02-11 Binky Moon, LLC
+// express : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/express.html
 express
 
-// extraspace : 2015-05-14 Extra Space Storage LLC
+// extraspace : Extra Space Storage LLC
+// https://www.iana.org/domains/root/db/extraspace.html
 extraspace
 
-// fage : 2014-12-18 Fage International S.A.
+// fage : Fage International S.A.
+// https://www.iana.org/domains/root/db/fage.html
 fage
 
-// fail : 2014-03-06 Binky Moon, LLC
+// fail : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fail.html
 fail
 
-// fairwinds : 2014-11-13 FairWinds Partners, LLC
+// fairwinds : FairWinds Partners, LLC
+// https://www.iana.org/domains/root/db/fairwinds.html
 fairwinds
 
-// faith : 2014-11-20 dot Faith Limited
+// faith : dot Faith Limited
+// https://www.iana.org/domains/root/db/faith.html
 faith
 
-// family : 2015-04-02 Dog Beach, LLC
+// family : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/family.html
 family
 
-// fan : 2014-03-06 Dog Beach, LLC
+// fan : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/fan.html
 fan
 
-// fans : 2014-11-07 ZDNS International Limited
+// fans : ZDNS International Limited
+// https://www.iana.org/domains/root/db/fans.html
 fans
 
-// farm : 2013-11-07 Binky Moon, LLC
+// farm : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/farm.html
 farm
 
-// farmers : 2015-07-09 Farmers Insurance Exchange
+// farmers : Farmers Insurance Exchange
+// https://www.iana.org/domains/root/db/farmers.html
 farmers
 
-// fashion : 2014-07-03 Registry Services, LLC
+// fashion : Registry Services, LLC
+// https://www.iana.org/domains/root/db/fashion.html
 fashion
 
-// fast : 2014-12-18 Amazon Registry Services, Inc.
+// fast : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/fast.html
 fast
 
-// fedex : 2015-08-06 Federal Express Corporation
+// fedex : Federal Express Corporation
+// https://www.iana.org/domains/root/db/fedex.html
 fedex
 
-// feedback : 2013-12-19 Top Level Spectrum, Inc.
+// feedback : Top Level Spectrum, Inc.
+// https://www.iana.org/domains/root/db/feedback.html
 feedback
 
-// ferrari : 2015-07-31 Fiat Chrysler Automobiles N.V.
+// ferrari : Fiat Chrysler Automobiles N.V.
+// https://www.iana.org/domains/root/db/ferrari.html
 ferrari
 
-// ferrero : 2014-12-18 Ferrero Trading Lux S.A.
+// ferrero : Ferrero Trading Lux S.A.
+// https://www.iana.org/domains/root/db/ferrero.html
 ferrero
 
-// fiat : 2015-07-31 Fiat Chrysler Automobiles N.V.
-fiat
-
-// fidelity : 2015-07-30 Fidelity Brokerage Services LLC
+// fidelity : Fidelity Brokerage Services LLC
+// https://www.iana.org/domains/root/db/fidelity.html
 fidelity
 
-// fido : 2015-08-06 Rogers Communications Canada Inc.
+// fido : Rogers Communications Canada Inc.
+// https://www.iana.org/domains/root/db/fido.html
 fido
 
-// film : 2015-01-08 Motion Picture Domain Registry Pty Ltd
+// film : Motion Picture Domain Registry Pty Ltd
+// https://www.iana.org/domains/root/db/film.html
 film
 
-// final : 2014-10-16 Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// final : Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// https://www.iana.org/domains/root/db/final.html
 final
 
-// finance : 2014-03-20 Binky Moon, LLC
+// finance : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/finance.html
 finance
 
-// financial : 2014-03-06 Binky Moon, LLC
+// financial : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/financial.html
 financial
 
-// fire : 2015-06-25 Amazon Registry Services, Inc.
+// fire : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/fire.html
 fire
 
-// firestone : 2014-12-18 Bridgestone Licensing Services, Inc
+// firestone : Bridgestone Licensing Services, Inc
+// https://www.iana.org/domains/root/db/firestone.html
 firestone
 
-// firmdale : 2014-03-27 Firmdale Holdings Limited
+// firmdale : Firmdale Holdings Limited
+// https://www.iana.org/domains/root/db/firmdale.html
 firmdale
 
-// fish : 2013-12-12 Binky Moon, LLC
+// fish : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fish.html
 fish
 
-// fishing : 2013-11-21 Registry Services, LLC
+// fishing : Registry Services, LLC
+// https://www.iana.org/domains/root/db/fishing.html
 fishing
 
-// fit : 2014-11-07 Registry Services, LLC
+// fit : Registry Services, LLC
+// https://www.iana.org/domains/root/db/fit.html
 fit
 
-// fitness : 2014-03-06 Binky Moon, LLC
+// fitness : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fitness.html
 fitness
 
-// flickr : 2015-04-02 Flickr, Inc.
+// flickr : Flickr, Inc.
+// https://www.iana.org/domains/root/db/flickr.html
 flickr
 
-// flights : 2013-12-05 Binky Moon, LLC
+// flights : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/flights.html
 flights
 
-// flir : 2015-07-23 FLIR Systems, Inc.
+// flir : FLIR Systems, Inc.
+// https://www.iana.org/domains/root/db/flir.html
 flir
 
-// florist : 2013-11-07 Binky Moon, LLC
+// florist : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/florist.html
 florist
 
-// flowers : 2014-10-09 XYZ.COM LLC
+// flowers : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/flowers.html
 flowers
 
-// fly : 2014-05-08 Charleston Road Registry Inc.
+// fly : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/fly.html
 fly
 
-// foo : 2014-01-23 Charleston Road Registry Inc.
+// foo : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/foo.html
 foo
 
-// food : 2016-04-21 Lifestyle Domain Holdings, Inc.
+// food : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/food.html
 food
 
-// foodnetwork : 2015-07-02 Lifestyle Domain Holdings, Inc.
-foodnetwork
-
-// football : 2014-12-18 Binky Moon, LLC
+// football : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/football.html
 football
 
-// ford : 2014-11-13 Ford Motor Company
+// ford : Ford Motor Company
+// https://www.iana.org/domains/root/db/ford.html
 ford
 
-// forex : 2014-12-11 Dog Beach, LLC
+// forex : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/forex.html
 forex
 
-// forsale : 2014-05-22 Dog Beach, LLC
+// forsale : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/forsale.html
 forsale
 
-// forum : 2015-04-02 Fegistry, LLC
+// forum : Waterford Limited
+// https://www.iana.org/domains/root/db/forum.html
 forum
 
-// foundation : 2013-12-05 Public Interest Registry
+// foundation : Public Interest Registry
+// https://www.iana.org/domains/root/db/foundation.html
 foundation
 
-// fox : 2015-09-11 FOX Registry, LLC
+// fox : FOX Registry, LLC
+// https://www.iana.org/domains/root/db/fox.html
 fox
 
-// free : 2015-12-10 Amazon Registry Services, Inc.
+// free : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/free.html
 free
 
-// fresenius : 2015-07-30 Fresenius Immobilien-Verwaltungs-GmbH
+// fresenius : Fresenius Immobilien-Verwaltungs-GmbH
+// https://www.iana.org/domains/root/db/fresenius.html
 fresenius
 
-// frl : 2014-05-15 FRLregistry B.V.
+// frl : FRLregistry B.V.
+// https://www.iana.org/domains/root/db/frl.html
 frl
 
-// frogans : 2013-12-19 OP3FT
+// frogans : OP3FT
+// https://www.iana.org/domains/root/db/frogans.html
 frogans
 
-// frontdoor : 2015-07-02 Lifestyle Domain Holdings, Inc.
-frontdoor
-
-// frontier : 2015-02-05 Frontier Communications Corporation
+// frontier : Frontier Communications Corporation
+// https://www.iana.org/domains/root/db/frontier.html
 frontier
 
-// ftr : 2015-07-16 Frontier Communications Corporation
+// ftr : Frontier Communications Corporation
+// https://www.iana.org/domains/root/db/ftr.html
 ftr
 
-// fujitsu : 2015-07-30 Fujitsu Limited
+// fujitsu : Fujitsu Limited
+// https://www.iana.org/domains/root/db/fujitsu.html
 fujitsu
 
-// fun : 2016-01-14 Radix FZC
+// fun : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/fun.html
 fun
 
-// fund : 2014-03-20 Binky Moon, LLC
+// fund : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fund.html
 fund
 
-// furniture : 2014-03-20 Binky Moon, LLC
+// furniture : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/furniture.html
 furniture
 
-// futbol : 2013-09-20 Dog Beach, LLC
+// futbol : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/futbol.html
 futbol
 
-// fyi : 2015-04-02 Binky Moon, LLC
+// fyi : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fyi.html
 fyi
 
-// gal : 2013-11-07 Asociaciรณn puntoGAL
+// gal : Asociaciรณn puntoGAL
+// https://www.iana.org/domains/root/db/gal.html
 gal
 
-// gallery : 2013-09-13 Binky Moon, LLC
+// gallery : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gallery.html
 gallery
 
-// gallo : 2015-06-11 Gallo Vineyards, Inc.
+// gallo : Gallo Vineyards, Inc.
+// https://www.iana.org/domains/root/db/gallo.html
 gallo
 
-// gallup : 2015-02-19 Gallup, Inc.
+// gallup : Gallup, Inc.
+// https://www.iana.org/domains/root/db/gallup.html
 gallup
 
-// game : 2015-05-28 XYZ.COM LLC
+// game : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/game.html
 game
 
-// games : 2015-05-28 Dog Beach, LLC
+// games : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/games.html
 games
 
-// gap : 2015-07-31 The Gap, Inc.
+// gap : The Gap, Inc.
+// https://www.iana.org/domains/root/db/gap.html
 gap
 
-// garden : 2014-06-26 Registry Services, LLC
+// garden : Registry Services, LLC
+// https://www.iana.org/domains/root/db/garden.html
 garden
 
-// gay : 2019-05-23 Top Level Design, LLC
+// gay : Registry Services, LLC
+// https://www.iana.org/domains/root/db/gay.html
 gay
 
-// gbiz : 2014-07-17 Charleston Road Registry Inc.
+// gbiz : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/gbiz.html
 gbiz
 
-// gdn : 2014-07-31 Joint Stock Company "Navigation-information systems"
+// gdn : Joint Stock Company "Navigation-information systems"
+// https://www.iana.org/domains/root/db/gdn.html
 gdn
 
-// gea : 2014-12-04 GEA Group Aktiengesellschaft
+// gea : GEA Group Aktiengesellschaft
+// https://www.iana.org/domains/root/db/gea.html
 gea
 
-// gent : 2014-01-23 Easyhost BV
+// gent : Easyhost BV
+// https://www.iana.org/domains/root/db/gent.html
 gent
 
-// genting : 2015-03-12 Resorts World Inc Pte. Ltd.
+// genting : Resorts World Inc Pte. Ltd.
+// https://www.iana.org/domains/root/db/genting.html
 genting
 
-// george : 2015-07-31 Wal-Mart Stores, Inc.
+// george : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/george.html
 george
 
-// ggee : 2014-01-09 GMO Internet, Inc.
+// ggee : GMO Internet, Inc.
+// https://www.iana.org/domains/root/db/ggee.html
 ggee
 
-// gift : 2013-10-17 DotGift, LLC
+// gift : DotGift, LLC
+// https://www.iana.org/domains/root/db/gift.html
 gift
 
-// gifts : 2014-07-03 Binky Moon, LLC
+// gifts : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gifts.html
 gifts
 
-// gives : 2014-03-06 Public Interest Registry
+// gives : Public Interest Registry
+// https://www.iana.org/domains/root/db/gives.html
 gives
 
-// giving : 2014-11-13 Public Interest Registry
+// giving : Public Interest Registry
+// https://www.iana.org/domains/root/db/giving.html
 giving
 
-// glass : 2013-11-07 Binky Moon, LLC
+// glass : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/glass.html
 glass
 
-// gle : 2014-07-24 Charleston Road Registry Inc.
+// gle : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/gle.html
 gle
 
-// global : 2014-04-17 Identity Digital Limited
+// global : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/global.html
 global
 
-// globo : 2013-12-19 Globo Comunicaรงรฃo e Participaรงรตes S.A
+// globo : Globo Comunicaรงรฃo e Participaรงรตes S.A
+// https://www.iana.org/domains/root/db/globo.html
 globo
 
-// gmail : 2014-05-01 Charleston Road Registry Inc.
+// gmail : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/gmail.html
 gmail
 
-// gmbh : 2016-01-29 Binky Moon, LLC
+// gmbh : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gmbh.html
 gmbh
 
-// gmo : 2014-01-09 GMO Internet, Inc.
+// gmo : GMO Internet, Inc.
+// https://www.iana.org/domains/root/db/gmo.html
 gmo
 
-// gmx : 2014-04-24 1&1 Mail & Media GmbH
+// gmx : 1&1 Mail & Media GmbH
+// https://www.iana.org/domains/root/db/gmx.html
 gmx
 
-// godaddy : 2015-07-23 Go Daddy East, LLC
+// godaddy : Go Daddy East, LLC
+// https://www.iana.org/domains/root/db/godaddy.html
 godaddy
 
-// gold : 2015-01-22 Binky Moon, LLC
+// gold : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gold.html
 gold
 
-// goldpoint : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
+// goldpoint : YODOBASHI CAMERA CO.,LTD.
+// https://www.iana.org/domains/root/db/goldpoint.html
 goldpoint
 
-// golf : 2014-12-18 Binky Moon, LLC
+// golf : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/golf.html
 golf
 
-// goo : 2014-12-18 NTT Resonant Inc.
-goo
-
-// goodyear : 2015-07-02 The Goodyear Tire & Rubber Company
+// goodyear : The Goodyear Tire & Rubber Company
+// https://www.iana.org/domains/root/db/goodyear.html
 goodyear
 
-// goog : 2014-11-20 Charleston Road Registry Inc.
+// goog : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/goog.html
 goog
 
-// google : 2014-07-24 Charleston Road Registry Inc.
+// google : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/google.html
 google
 
-// gop : 2014-01-16 Republican State Leadership Committee, Inc.
+// gop : Republican State Leadership Committee, Inc.
+// https://www.iana.org/domains/root/db/gop.html
 gop
 
-// got : 2014-12-18 Amazon Registry Services, Inc.
+// got : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/got.html
 got
 
-// grainger : 2015-05-07 Grainger Registry Services, LLC
+// grainger : Grainger Registry Services, LLC
+// https://www.iana.org/domains/root/db/grainger.html
 grainger
 
-// graphics : 2013-09-13 Binky Moon, LLC
+// graphics : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/graphics.html
 graphics
 
-// gratis : 2014-03-20 Binky Moon, LLC
+// gratis : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gratis.html
 gratis
 
-// green : 2014-05-08 Identity Digital Limited
+// green : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/green.html
 green
 
-// gripe : 2014-03-06 Binky Moon, LLC
+// gripe : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gripe.html
 gripe
 
-// grocery : 2016-06-16 Wal-Mart Stores, Inc.
+// grocery : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/grocery.html
 grocery
 
-// group : 2014-08-15 Binky Moon, LLC
+// group : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/group.html
 group
 
-// guardian : 2015-07-30 The Guardian Life Insurance Company of America
-guardian
-
-// gucci : 2014-11-13 Guccio Gucci S.p.a.
+// gucci : Guccio Gucci S.p.a.
+// https://www.iana.org/domains/root/db/gucci.html
 gucci
 
-// guge : 2014-08-28 Charleston Road Registry Inc.
+// guge : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/guge.html
 guge
 
-// guide : 2013-09-13 Binky Moon, LLC
+// guide : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/guide.html
 guide
 
-// guitars : 2013-11-14 XYZ.COM LLC
+// guitars : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/guitars.html
 guitars
 
-// guru : 2013-08-27 Binky Moon, LLC
+// guru : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/guru.html
 guru
 
-// hair : 2015-12-03 XYZ.COM LLC
+// hair : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/hair.html
 hair
 
-// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
+// hamburg : Hamburg Top-Level-Domain GmbH
+// https://www.iana.org/domains/root/db/hamburg.html
 hamburg
 
-// hangout : 2014-11-13 Charleston Road Registry Inc.
+// hangout : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/hangout.html
 hangout
 
-// haus : 2013-12-05 Dog Beach, LLC
+// haus : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/haus.html
 haus
 
-// hbo : 2015-07-30 HBO Registry Services, Inc.
+// hbo : HBO Registry Services, Inc.
+// https://www.iana.org/domains/root/db/hbo.html
 hbo
 
-// hdfc : 2015-07-30 HOUSING DEVELOPMENT FINANCE CORPORATION LIMITED
+// hdfc : HDFC BANK LIMITED
+// https://www.iana.org/domains/root/db/hdfc.html
 hdfc
 
-// hdfcbank : 2015-02-12 HDFC Bank Limited
+// hdfcbank : HDFC BANK LIMITED
+// https://www.iana.org/domains/root/db/hdfcbank.html
 hdfcbank
 
-// health : 2015-02-11 DotHealth, LLC
+// health : Registry Services, LLC
+// https://www.iana.org/domains/root/db/health.html
 health
 
-// healthcare : 2014-06-12 Binky Moon, LLC
+// healthcare : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/healthcare.html
 healthcare
 
-// help : 2014-06-26 Innovation service Limited
+// help : Innovation service Limited
+// https://www.iana.org/domains/root/db/help.html
 help
 
-// helsinki : 2015-02-05 City of Helsinki
+// helsinki : City of Helsinki
+// https://www.iana.org/domains/root/db/helsinki.html
 helsinki
 
-// here : 2014-02-06 Charleston Road Registry Inc.
+// here : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/here.html
 here
 
-// hermes : 2014-07-10 HERMES INTERNATIONAL
+// hermes : HERMES INTERNATIONAL
+// https://www.iana.org/domains/root/db/hermes.html
 hermes
 
-// hgtv : 2015-07-02 Lifestyle Domain Holdings, Inc.
-hgtv
-
-// hiphop : 2014-03-06 Dot Hip Hop, LLC
+// hiphop : Dot Hip Hop, LLC
+// https://www.iana.org/domains/root/db/hiphop.html
 hiphop
 
-// hisamitsu : 2015-07-16 Hisamitsu Pharmaceutical Co.,Inc.
+// hisamitsu : Hisamitsu Pharmaceutical Co.,Inc.
+// https://www.iana.org/domains/root/db/hisamitsu.html
 hisamitsu
 
-// hitachi : 2014-10-31 Hitachi, Ltd.
+// hitachi : Hitachi, Ltd.
+// https://www.iana.org/domains/root/db/hitachi.html
 hitachi
 
-// hiv : 2014-03-13 Internet Naming Company LLC
+// hiv : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/hiv.html
 hiv
 
-// hkt : 2015-05-14 PCCW-HKT DataCom Services Limited
+// hkt : PCCW-HKT DataCom Services Limited
+// https://www.iana.org/domains/root/db/hkt.html
 hkt
 
-// hockey : 2015-03-19 Binky Moon, LLC
+// hockey : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/hockey.html
 hockey
 
-// holdings : 2013-08-27 Binky Moon, LLC
+// holdings : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/holdings.html
 holdings
 
-// holiday : 2013-11-07 Binky Moon, LLC
+// holiday : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/holiday.html
 holiday
 
-// homedepot : 2015-04-02 Home Depot Product Authority, LLC
+// homedepot : Home Depot Product Authority, LLC
+// https://www.iana.org/domains/root/db/homedepot.html
 homedepot
 
-// homegoods : 2015-07-16 The TJX Companies, Inc.
+// homegoods : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/homegoods.html
 homegoods
 
-// homes : 2014-01-09 XYZ.COM LLC
+// homes : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/homes.html
 homes
 
-// homesense : 2015-07-16 The TJX Companies, Inc.
+// homesense : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/homesense.html
 homesense
 
-// honda : 2014-12-18 Honda Motor Co., Ltd.
+// honda : Honda Motor Co., Ltd.
+// https://www.iana.org/domains/root/db/honda.html
 honda
 
-// horse : 2013-11-21 Registry Services, LLC
+// horse : Registry Services, LLC
+// https://www.iana.org/domains/root/db/horse.html
 horse
 
-// hospital : 2016-10-20 Binky Moon, LLC
+// hospital : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/hospital.html
 hospital
 
-// host : 2014-04-17 Radix FZC
+// host : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/host.html
 host
 
-// hosting : 2014-05-29 XYZ.COM LLC
+// hosting : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/hosting.html
 hosting
 
-// hot : 2015-08-27 Amazon Registry Services, Inc.
+// hot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/hot.html
 hot
 
-// hoteles : 2015-03-05 Travel Reservations SRL
-hoteles
+// hotel : HOTEL Top-Level-Domain S.a.r.l
+// https://www.iana.org/domains/root/db/hotel.html
+hotel
 
-// hotels : 2016-04-07 Booking.com B.V.
+// hotels : Booking.com B.V.
+// https://www.iana.org/domains/root/db/hotels.html
 hotels
 
-// hotmail : 2014-12-18 Microsoft Corporation
+// hotmail : Microsoft Corporation
+// https://www.iana.org/domains/root/db/hotmail.html
 hotmail
 
-// house : 2013-11-07 Binky Moon, LLC
+// house : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/house.html
 house
 
-// how : 2014-01-23 Charleston Road Registry Inc.
+// how : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/how.html
 how
 
-// hsbc : 2014-10-24 HSBC Global Services (UK) Limited
+// hsbc : HSBC Global Services (UK) Limited
+// https://www.iana.org/domains/root/db/hsbc.html
 hsbc
 
-// hughes : 2015-07-30 Hughes Satellite Systems Corporation
+// hughes : Hughes Satellite Systems Corporation
+// https://www.iana.org/domains/root/db/hughes.html
 hughes
 
-// hyatt : 2015-07-30 Hyatt GTLD, L.L.C.
+// hyatt : Hyatt GTLD, L.L.C.
+// https://www.iana.org/domains/root/db/hyatt.html
 hyatt
 
-// hyundai : 2015-07-09 Hyundai Motor Company
+// hyundai : Hyundai Motor Company
+// https://www.iana.org/domains/root/db/hyundai.html
 hyundai
 
-// ibm : 2014-07-31 International Business Machines Corporation
+// ibm : International Business Machines Corporation
+// https://www.iana.org/domains/root/db/ibm.html
 ibm
 
-// icbc : 2015-02-19 Industrial and Commercial Bank of China Limited
+// icbc : Industrial and Commercial Bank of China Limited
+// https://www.iana.org/domains/root/db/icbc.html
 icbc
 
-// ice : 2014-10-30 IntercontinentalExchange, Inc.
+// ice : IntercontinentalExchange, Inc.
+// https://www.iana.org/domains/root/db/ice.html
 ice
 
-// icu : 2015-01-08 ShortDot SA
+// icu : ShortDot SA
+// https://www.iana.org/domains/root/db/icu.html
 icu
 
-// ieee : 2015-07-23 IEEE Global LLC
+// ieee : IEEE Global LLC
+// https://www.iana.org/domains/root/db/ieee.html
 ieee
 
-// ifm : 2014-01-30 ifm electronic gmbh
+// ifm : ifm electronic gmbh
+// https://www.iana.org/domains/root/db/ifm.html
 ifm
 
-// ikano : 2015-07-09 Ikano S.A.
+// ikano : Ikano S.A.
+// https://www.iana.org/domains/root/db/ikano.html
 ikano
 
-// imamat : 2015-08-06 Fondation Aga Khan (Aga Khan Foundation)
+// imamat : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/imamat.html
 imamat
 
-// imdb : 2015-06-25 Amazon Registry Services, Inc.
+// imdb : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/imdb.html
 imdb
 
-// immo : 2014-07-10 Binky Moon, LLC
+// immo : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/immo.html
 immo
 
-// immobilien : 2013-11-07 Dog Beach, LLC
+// immobilien : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/immobilien.html
 immobilien
 
-// inc : 2018-03-10 Intercap Registry Inc.
+// inc : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/inc.html
 inc
 
-// industries : 2013-12-05 Binky Moon, LLC
+// industries : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/industries.html
 industries
 
-// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD.
+// infiniti : NISSAN MOTOR CO., LTD.
+// https://www.iana.org/domains/root/db/infiniti.html
 infiniti
 
-// ing : 2014-01-23 Charleston Road Registry Inc.
+// ing : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/ing.html
 ing
 
-// ink : 2013-12-05 Top Level Design, LLC
+// ink : Registry Services, LLC
+// https://www.iana.org/domains/root/db/ink.html
 ink
 
-// institute : 2013-11-07 Binky Moon, LLC
+// institute : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/institute.html
 institute
 
-// insurance : 2015-02-19 fTLD Registry Services LLC
+// insurance : fTLD Registry Services LLC
+// https://www.iana.org/domains/root/db/insurance.html
 insurance
 
-// insure : 2014-03-20 Binky Moon, LLC
+// insure : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/insure.html
 insure
 
-// international : 2013-11-07 Binky Moon, LLC
+// international : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/international.html
 international
 
-// intuit : 2015-07-30 Intuit Administrative Services, Inc.
+// intuit : Intuit Administrative Services, Inc.
+// https://www.iana.org/domains/root/db/intuit.html
 intuit
 
-// investments : 2014-03-20 Binky Moon, LLC
+// investments : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/investments.html
 investments
 
-// ipiranga : 2014-08-28 Ipiranga Produtos de Petroleo S.A.
+// ipiranga : Ipiranga Produtos de Petroleo S.A.
+// https://www.iana.org/domains/root/db/ipiranga.html
 ipiranga
 
-// irish : 2014-08-07 Binky Moon, LLC
+// irish : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/irish.html
 irish
 
-// ismaili : 2015-08-06 Fondation Aga Khan (Aga Khan Foundation)
+// ismaili : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/ismaili.html
 ismaili
 
-// ist : 2014-08-28 Istanbul Metropolitan Municipality
+// ist : Istanbul Metropolitan Municipality
+// https://www.iana.org/domains/root/db/ist.html
 ist
 
-// istanbul : 2014-08-28 Istanbul Metropolitan Municipality
+// istanbul : Istanbul Metropolitan Municipality
+// https://www.iana.org/domains/root/db/istanbul.html
 istanbul
 
-// itau : 2014-10-02 Itau Unibanco Holding S.A.
+// itau : Itau Unibanco Holding S.A.
+// https://www.iana.org/domains/root/db/itau.html
 itau
 
-// itv : 2015-07-09 ITV Services Limited
+// itv : ITV Services Limited
+// https://www.iana.org/domains/root/db/itv.html
 itv
 
-// jaguar : 2014-11-13 Jaguar Land Rover Ltd
+// jaguar : Jaguar Land Rover Ltd
+// https://www.iana.org/domains/root/db/jaguar.html
 jaguar
 
-// java : 2014-06-19 Oracle Corporation
+// java : Oracle Corporation
+// https://www.iana.org/domains/root/db/java.html
 java
 
-// jcb : 2014-11-20 JCB Co., Ltd.
+// jcb : JCB Co., Ltd.
+// https://www.iana.org/domains/root/db/jcb.html
 jcb
 
-// jeep : 2015-07-30 FCA US LLC.
+// jeep : FCA US LLC.
+// https://www.iana.org/domains/root/db/jeep.html
 jeep
 
-// jetzt : 2014-01-09 Binky Moon, LLC
+// jetzt : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/jetzt.html
 jetzt
 
-// jewelry : 2015-03-05 Binky Moon, LLC
+// jewelry : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/jewelry.html
 jewelry
 
-// jio : 2015-04-02 Reliance Industries Limited
+// jio : Reliance Industries Limited
+// https://www.iana.org/domains/root/db/jio.html
 jio
 
-// jll : 2015-04-02 Jones Lang LaSalle Incorporated
+// jll : Jones Lang LaSalle Incorporated
+// https://www.iana.org/domains/root/db/jll.html
 jll
 
-// jmp : 2015-03-26 Matrix IP LLC
+// jmp : Matrix IP LLC
+// https://www.iana.org/domains/root/db/jmp.html
 jmp
 
-// jnj : 2015-06-18 Johnson & Johnson Services, Inc.
+// jnj : Johnson & Johnson Services, Inc.
+// https://www.iana.org/domains/root/db/jnj.html
 jnj
 
-// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
+// joburg : ZA Central Registry NPC trading as ZA Central Registry
+// https://www.iana.org/domains/root/db/joburg.html
 joburg
 
-// jot : 2014-12-18 Amazon Registry Services, Inc.
+// jot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/jot.html
 jot
 
-// joy : 2014-12-18 Amazon Registry Services, Inc.
+// joy : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/joy.html
 joy
 
-// jpmorgan : 2015-04-30 JPMorgan Chase Bank, National Association
+// jpmorgan : JPMorgan Chase Bank, National Association
+// https://www.iana.org/domains/root/db/jpmorgan.html
 jpmorgan
 
-// jprs : 2014-09-18 Japan Registry Services Co., Ltd.
+// jprs : Japan Registry Services Co., Ltd.
+// https://www.iana.org/domains/root/db/jprs.html
 jprs
 
-// juegos : 2014-03-20 Internet Naming Company LLC
+// juegos : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/juegos.html
 juegos
 
-// juniper : 2015-07-30 JUNIPER NETWORKS, INC.
+// juniper : JUNIPER NETWORKS, INC.
+// https://www.iana.org/domains/root/db/juniper.html
 juniper
 
-// kaufen : 2013-11-07 Dog Beach, LLC
+// kaufen : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/kaufen.html
 kaufen
 
-// kddi : 2014-09-12 KDDI CORPORATION
+// kddi : KDDI CORPORATION
+// https://www.iana.org/domains/root/db/kddi.html
 kddi
 
-// kerryhotels : 2015-04-30 Kerry Trading Co. Limited
+// kerryhotels : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/kerryhotels.html
 kerryhotels
 
-// kerrylogistics : 2015-04-09 Kerry Trading Co. Limited
-kerrylogistics
-
-// kerryproperties : 2015-04-09 Kerry Trading Co. Limited
+// kerryproperties : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/kerryproperties.html
 kerryproperties
 
-// kfh : 2014-12-04 Kuwait Finance House
+// kfh : Kuwait Finance House
+// https://www.iana.org/domains/root/db/kfh.html
 kfh
 
-// kia : 2015-07-09 KIA MOTORS CORPORATION
+// kia : KIA MOTORS CORPORATION
+// https://www.iana.org/domains/root/db/kia.html
 kia
 
-// kids : 2021-08-13 DotKids Foundation Limited
+// kids : DotKids Foundation Limited
+// https://www.iana.org/domains/root/db/kids.html
 kids
 
-// kim : 2013-09-23 Identity Digital Limited
+// kim : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/kim.html
 kim
 
-// kinder : 2014-11-07 Ferrero Trading Lux S.A.
-kinder
-
-// kindle : 2015-06-25 Amazon Registry Services, Inc.
+// kindle : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/kindle.html
 kindle
 
-// kitchen : 2013-09-20 Binky Moon, LLC
+// kitchen : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/kitchen.html
 kitchen
 
-// kiwi : 2013-09-20 DOT KIWI LIMITED
+// kiwi : DOT KIWI LIMITED
+// https://www.iana.org/domains/root/db/kiwi.html
 kiwi
 
-// koeln : 2014-01-09 dotKoeln GmbH
+// koeln : dotKoeln GmbH
+// https://www.iana.org/domains/root/db/koeln.html
 koeln
 
-// komatsu : 2015-01-08 Komatsu Ltd.
+// komatsu : Komatsu Ltd.
+// https://www.iana.org/domains/root/db/komatsu.html
 komatsu
 
-// kosher : 2015-08-20 Kosher Marketing Assets LLC
+// kosher : Kosher Marketing Assets LLC
+// https://www.iana.org/domains/root/db/kosher.html
 kosher
 
-// kpmg : 2015-04-23 KPMG International Cooperative (KPMG International Genossenschaft)
+// kpmg : KPMG International Cooperative (KPMG International Genossenschaft)
+// https://www.iana.org/domains/root/db/kpmg.html
 kpmg
 
-// kpn : 2015-01-08 Koninklijke KPN N.V.
+// kpn : Koninklijke KPN N.V.
+// https://www.iana.org/domains/root/db/kpn.html
 kpn
 
-// krd : 2013-12-05 KRG Department of Information Technology
+// krd : KRG Department of Information Technology
+// https://www.iana.org/domains/root/db/krd.html
 krd
 
-// kred : 2013-12-19 KredTLD Pty Ltd
+// kred : KredTLD Pty Ltd
+// https://www.iana.org/domains/root/db/kred.html
 kred
 
-// kuokgroup : 2015-04-09 Kerry Trading Co. Limited
+// kuokgroup : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/kuokgroup.html
 kuokgroup
 
-// kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen
+// kyoto : Academic Institution: Kyoto Jyoho Gakuen
+// https://www.iana.org/domains/root/db/kyoto.html
 kyoto
 
-// lacaixa : 2014-01-09 Fundaciรณn Bancaria Caixa dโ€™Estalvis i Pensions de Barcelona, โ€œla Caixaโ€
+// lacaixa : Fundaciรณn Bancaria Caixa dโ€™Estalvis i Pensions de Barcelona, โ€œla Caixaโ€
+// https://www.iana.org/domains/root/db/lacaixa.html
 lacaixa
 
-// lamborghini : 2015-06-04 Automobili Lamborghini S.p.A.
+// lamborghini : Automobili Lamborghini S.p.A.
+// https://www.iana.org/domains/root/db/lamborghini.html
 lamborghini
 
-// lamer : 2015-10-01 The Estรฉe Lauder Companies Inc.
+// lamer : The Estรฉe Lauder Companies Inc.
+// https://www.iana.org/domains/root/db/lamer.html
 lamer
 
-// lancaster : 2015-02-12 LANCASTER
-lancaster
-
-// lancia : 2015-07-31 Fiat Chrysler Automobiles N.V.
-lancia
-
-// land : 2013-09-10 Binky Moon, LLC
+// land : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/land.html
 land
 
-// landrover : 2014-11-13 Jaguar Land Rover Ltd
+// landrover : Jaguar Land Rover Ltd
+// https://www.iana.org/domains/root/db/landrover.html
 landrover
 
-// lanxess : 2015-07-30 LANXESS Corporation
+// lanxess : LANXESS Corporation
+// https://www.iana.org/domains/root/db/lanxess.html
 lanxess
 
-// lasalle : 2015-04-02 Jones Lang LaSalle Incorporated
+// lasalle : Jones Lang LaSalle Incorporated
+// https://www.iana.org/domains/root/db/lasalle.html
 lasalle
 
-// lat : 2014-10-16 XYZ.COM LLC
+// lat : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/lat.html
 lat
 
-// latino : 2015-07-30 Dish DBS Corporation
+// latino : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/latino.html
 latino
 
-// latrobe : 2014-06-16 La Trobe University
+// latrobe : La Trobe University
+// https://www.iana.org/domains/root/db/latrobe.html
 latrobe
 
-// law : 2015-01-22 Registry Services, LLC
+// law : Registry Services, LLC
+// https://www.iana.org/domains/root/db/law.html
 law
 
-// lawyer : 2014-03-20 Dog Beach, LLC
+// lawyer : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/lawyer.html
 lawyer
 
-// lds : 2014-03-20 IRI Domain Management, LLC
+// lds : IRI Domain Management, LLC
+// https://www.iana.org/domains/root/db/lds.html
 lds
 
-// lease : 2014-03-06 Binky Moon, LLC
+// lease : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/lease.html
 lease
 
-// leclerc : 2014-08-07 A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc
+// leclerc : A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc
+// https://www.iana.org/domains/root/db/leclerc.html
 leclerc
 
-// lefrak : 2015-07-16 LeFrak Organization, Inc.
+// lefrak : LeFrak Organization, Inc.
+// https://www.iana.org/domains/root/db/lefrak.html
 lefrak
 
-// legal : 2014-10-16 Binky Moon, LLC
+// legal : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/legal.html
 legal
 
-// lego : 2015-07-16 LEGO Juris A/S
+// lego : LEGO Juris A/S
+// https://www.iana.org/domains/root/db/lego.html
 lego
 
-// lexus : 2015-04-23 TOYOTA MOTOR CORPORATION
+// lexus : TOYOTA MOTOR CORPORATION
+// https://www.iana.org/domains/root/db/lexus.html
 lexus
 
-// lgbt : 2014-05-08 Identity Digital Limited
+// lgbt : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/lgbt.html
 lgbt
 
-// lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
+// lidl : Schwarz Domains und Services GmbH & Co. KG
+// https://www.iana.org/domains/root/db/lidl.html
 lidl
 
-// life : 2014-02-06 Binky Moon, LLC
+// life : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/life.html
 life
 
-// lifeinsurance : 2015-01-15 American Council of Life Insurers
+// lifeinsurance : American Council of Life Insurers
+// https://www.iana.org/domains/root/db/lifeinsurance.html
 lifeinsurance
 
-// lifestyle : 2014-12-11 Lifestyle Domain Holdings, Inc.
+// lifestyle : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/lifestyle.html
 lifestyle
 
-// lighting : 2013-08-27 Binky Moon, LLC
+// lighting : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/lighting.html
 lighting
 
-// like : 2014-12-18 Amazon Registry Services, Inc.
+// like : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/like.html
 like
 
-// lilly : 2015-07-31 Eli Lilly and Company
+// lilly : Eli Lilly and Company
+// https://www.iana.org/domains/root/db/lilly.html
 lilly
 
-// limited : 2014-03-06 Binky Moon, LLC
+// limited : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/limited.html
 limited
 
-// limo : 2013-10-17 Binky Moon, LLC
+// limo : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/limo.html
 limo
 
-// lincoln : 2014-11-13 Ford Motor Company
+// lincoln : Ford Motor Company
+// https://www.iana.org/domains/root/db/lincoln.html
 lincoln
 
-// linde : 2014-12-04 Linde Aktiengesellschaft
-linde
-
-// link : 2013-11-14 Nova Registry Ltd
+// link : Nova Registry Ltd
+// https://www.iana.org/domains/root/db/link.html
 link
 
-// lipsy : 2015-06-25 Lipsy Ltd
-lipsy
-
-// live : 2014-12-04 Dog Beach, LLC
+// live : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/live.html
 live
 
-// living : 2015-07-30 Lifestyle Domain Holdings, Inc.
+// living : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/living.html
 living
 
-// llc : 2017-12-14 Identity Digital Limited
+// llc : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/llc.html
 llc
 
-// llp : 2019-08-26 Intercap Registry Inc.
+// llp : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/llp.html
 llp
 
-// loan : 2014-11-20 dot Loan Limited
+// loan : dot Loan Limited
+// https://www.iana.org/domains/root/db/loan.html
 loan
 
-// loans : 2014-03-20 Binky Moon, LLC
+// loans : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/loans.html
 loans
 
-// locker : 2015-06-04 Dish DBS Corporation
+// locker : Orange Domains LLC
+// https://www.iana.org/domains/root/db/locker.html
 locker
 
-// locus : 2015-06-25 Locus Analytics LLC
+// locus : Locus Analytics LLC
+// https://www.iana.org/domains/root/db/locus.html
 locus
 
-// lol : 2015-01-30 XYZ.COM LLC
+// lol : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/lol.html
 lol
 
-// london : 2013-11-14 Dot London Domains Limited
+// london : Dot London Domains Limited
+// https://www.iana.org/domains/root/db/london.html
 london
 
-// lotte : 2014-11-07 Lotte Holdings Co., Ltd.
+// lotte : Lotte Holdings Co., Ltd.
+// https://www.iana.org/domains/root/db/lotte.html
 lotte
 
-// lotto : 2014-04-10 Identity Digital Limited
+// lotto : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/lotto.html
 lotto
 
-// love : 2014-12-22 Merchant Law Group LLP
+// love : Waterford Limited
+// https://www.iana.org/domains/root/db/love.html
 love
 
-// lpl : 2015-07-30 LPL Holdings, Inc.
+// lpl : LPL Holdings, Inc.
+// https://www.iana.org/domains/root/db/lpl.html
 lpl
 
-// lplfinancial : 2015-07-30 LPL Holdings, Inc.
+// lplfinancial : LPL Holdings, Inc.
+// https://www.iana.org/domains/root/db/lplfinancial.html
 lplfinancial
 
-// ltd : 2014-09-25 Binky Moon, LLC
+// ltd : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/ltd.html
 ltd
 
-// ltda : 2014-04-17 InterNetX, Corp
+// ltda : InterNetX, Corp
+// https://www.iana.org/domains/root/db/ltda.html
 ltda
 
-// lundbeck : 2015-08-06 H. Lundbeck A/S
+// lundbeck : H. Lundbeck A/S
+// https://www.iana.org/domains/root/db/lundbeck.html
 lundbeck
 
-// luxe : 2014-01-09 Registry Services, LLC
+// luxe : Registry Services, LLC
+// https://www.iana.org/domains/root/db/luxe.html
 luxe
 
-// luxury : 2013-10-17 Luxury Partners, LLC
+// luxury : Luxury Partners, LLC
+// https://www.iana.org/domains/root/db/luxury.html
 luxury
 
-// macys : 2015-07-31 Macys, Inc.
-macys
-
-// madrid : 2014-05-01 Comunidad de Madrid
+// madrid : Comunidad de Madrid
+// https://www.iana.org/domains/root/db/madrid.html
 madrid
 
-// maif : 2014-10-02 Mutuelle Assurance Instituteur France (MAIF)
+// maif : Mutuelle Assurance Instituteur France (MAIF)
+// https://www.iana.org/domains/root/db/maif.html
 maif
 
-// maison : 2013-12-05 Binky Moon, LLC
+// maison : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/maison.html
 maison
 
-// makeup : 2015-01-15 XYZ.COM LLC
+// makeup : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/makeup.html
 makeup
 
-// man : 2014-12-04 MAN SE
+// man : MAN Truck & Bus SE
+// https://www.iana.org/domains/root/db/man.html
 man
 
-// management : 2013-11-07 Binky Moon, LLC
+// management : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/management.html
 management
 
-// mango : 2013-10-24 PUNTO FA S.L.
+// mango : PUNTO FA S.L.
+// https://www.iana.org/domains/root/db/mango.html
 mango
 
-// map : 2016-06-09 Charleston Road Registry Inc.
+// map : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/map.html
 map
 
-// market : 2014-03-06 Dog Beach, LLC
+// market : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/market.html
 market
 
-// marketing : 2013-11-07 Binky Moon, LLC
+// marketing : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/marketing.html
 marketing
 
-// markets : 2014-12-11 Dog Beach, LLC
+// markets : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/markets.html
 markets
 
-// marriott : 2014-10-09 Marriott Worldwide Corporation
+// marriott : Marriott Worldwide Corporation
+// https://www.iana.org/domains/root/db/marriott.html
 marriott
 
-// marshalls : 2015-07-16 The TJX Companies, Inc.
+// marshalls : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/marshalls.html
 marshalls
 
-// maserati : 2015-07-31 Fiat Chrysler Automobiles N.V.
-maserati
-
-// mattel : 2015-08-06 Mattel Sites, Inc.
+// mattel : Mattel IT Services, Inc.
+// https://www.iana.org/domains/root/db/mattel.html
 mattel
 
-// mba : 2015-04-02 Binky Moon, LLC
+// mba : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/mba.html
 mba
 
-// mckinsey : 2015-07-31 McKinsey Holdings, Inc.
+// mckinsey : McKinsey Holdings, Inc.
+// https://www.iana.org/domains/root/db/mckinsey.html
 mckinsey
 
-// med : 2015-08-06 Medistry LLC
+// med : Medistry LLC
+// https://www.iana.org/domains/root/db/med.html
 med
 
-// media : 2014-03-06 Binky Moon, LLC
+// media : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/media.html
 media
 
-// meet : 2014-01-16 Charleston Road Registry Inc.
+// meet : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/meet.html
 meet
 
-// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
+// melbourne : The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
+// https://www.iana.org/domains/root/db/melbourne.html
 melbourne
 
-// meme : 2014-01-30 Charleston Road Registry Inc.
+// meme : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/meme.html
 meme
 
-// memorial : 2014-10-16 Dog Beach, LLC
+// memorial : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/memorial.html
 memorial
 
-// men : 2015-02-26 Exclusive Registry Limited
+// men : Exclusive Registry Limited
+// https://www.iana.org/domains/root/db/men.html
 men
 
-// menu : 2013-09-11 Dot Menu Registry, LLC
+// menu : Dot Menu Registry, LLC
+// https://www.iana.org/domains/root/db/menu.html
 menu
 
-// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
+// merck : Merck Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/merck.html
+merck
+
+// merckmsd : MSD Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/merckmsd.html
 merckmsd
 
-// miami : 2013-12-19 Registry Services, LLC
+// miami : Registry Services, LLC
+// https://www.iana.org/domains/root/db/miami.html
 miami
 
-// microsoft : 2014-12-18 Microsoft Corporation
+// microsoft : Microsoft Corporation
+// https://www.iana.org/domains/root/db/microsoft.html
 microsoft
 
-// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
+// mini : Bayerische Motoren Werke Aktiengesellschaft
+// https://www.iana.org/domains/root/db/mini.html
 mini
 
-// mint : 2015-07-30 Intuit Administrative Services, Inc.
+// mint : Intuit Administrative Services, Inc.
+// https://www.iana.org/domains/root/db/mint.html
 mint
 
-// mit : 2015-07-02 Massachusetts Institute of Technology
+// mit : Massachusetts Institute of Technology
+// https://www.iana.org/domains/root/db/mit.html
 mit
 
-// mitsubishi : 2015-07-23 Mitsubishi Corporation
+// mitsubishi : Mitsubishi Corporation
+// https://www.iana.org/domains/root/db/mitsubishi.html
 mitsubishi
 
-// mlb : 2015-05-21 MLB Advanced Media DH, LLC
+// mlb : MLB Advanced Media DH, LLC
+// https://www.iana.org/domains/root/db/mlb.html
 mlb
 
-// mls : 2015-04-23 The Canadian Real Estate Association
+// mls : The Canadian Real Estate Association
+// https://www.iana.org/domains/root/db/mls.html
 mls
 
-// mma : 2014-11-07 MMA IARD
+// mma : MMA IARD
+// https://www.iana.org/domains/root/db/mma.html
 mma
 
-// mobile : 2016-06-02 Dish DBS Corporation
+// mobile : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/mobile.html
 mobile
 
-// moda : 2013-11-07 Dog Beach, LLC
+// moda : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/moda.html
 moda
 
-// moe : 2013-11-13 Interlink Systems Innovation Institute K.K.
+// moe : Interlink Systems Innovation Institute K.K.
+// https://www.iana.org/domains/root/db/moe.html
 moe
 
-// moi : 2014-12-18 Amazon Registry Services, Inc.
+// moi : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/moi.html
 moi
 
-// mom : 2015-04-16 XYZ.COM LLC
+// mom : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/mom.html
 mom
 
-// monash : 2013-09-30 Monash University
+// monash : Monash University
+// https://www.iana.org/domains/root/db/monash.html
 monash
 
-// money : 2014-10-16 Binky Moon, LLC
+// money : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/money.html
 money
 
-// monster : 2015-09-11 XYZ.COM LLC
+// monster : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/monster.html
 monster
 
-// mormon : 2013-12-05 IRI Domain Management, LLC
+// mormon : IRI Domain Management, LLC
+// https://www.iana.org/domains/root/db/mormon.html
 mormon
 
-// mortgage : 2014-03-20 Dog Beach, LLC
+// mortgage : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/mortgage.html
 mortgage
 
-// moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// moscow : Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// https://www.iana.org/domains/root/db/moscow.html
 moscow
 
-// moto : 2015-06-04 Motorola Trademark Holdings, LLC
+// moto : Motorola Trademark Holdings, LLC
+// https://www.iana.org/domains/root/db/moto.html
 moto
 
-// motorcycles : 2014-01-09 XYZ.COM LLC
+// motorcycles : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/motorcycles.html
 motorcycles
 
-// mov : 2014-01-30 Charleston Road Registry Inc.
+// mov : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/mov.html
 mov
 
-// movie : 2015-02-05 Binky Moon, LLC
+// movie : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/movie.html
 movie
 
-// msd : 2015-07-23 MSD Registry Holdings, Inc.
+// msd : MSD Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/msd.html
 msd
 
-// mtn : 2014-12-04 MTN Dubai Limited
+// mtn : MTN Dubai Limited
+// https://www.iana.org/domains/root/db/mtn.html
 mtn
 
-// mtr : 2015-03-12 MTR Corporation Limited
+// mtr : MTR Corporation Limited
+// https://www.iana.org/domains/root/db/mtr.html
 mtr
 
-// music : 2021-05-04 DotMusic Limited
+// music : DotMusic Limited
+// https://www.iana.org/domains/root/db/music.html
 music
 
-// mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
-mutual
-
-// nab : 2015-08-20 National Australia Bank Limited
+// nab : National Australia Bank Limited
+// https://www.iana.org/domains/root/db/nab.html
 nab
 
-// nagoya : 2013-10-24 GMO Registry, Inc.
+// nagoya : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/nagoya.html
 nagoya
 
-// natura : 2015-03-12 NATURA COSMร‰TICOS S.A.
-natura
-
-// navy : 2014-03-06 Dog Beach, LLC
+// navy : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/navy.html
 navy
 
-// nba : 2015-07-31 NBA REGISTRY, LLC
+// nba : NBA REGISTRY, LLC
+// https://www.iana.org/domains/root/db/nba.html
 nba
 
-// nec : 2015-01-08 NEC Corporation
+// nec : NEC Corporation
+// https://www.iana.org/domains/root/db/nec.html
 nec
 
-// netbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
+// netbank : COMMONWEALTH BANK OF AUSTRALIA
+// https://www.iana.org/domains/root/db/netbank.html
 netbank
 
-// netflix : 2015-06-18 Netflix, Inc.
+// netflix : Netflix, Inc.
+// https://www.iana.org/domains/root/db/netflix.html
 netflix
 
-// network : 2013-11-14 Binky Moon, LLC
+// network : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/network.html
 network
 
-// neustar : 2013-12-05 NeuStar, Inc.
+// neustar : NeuStar, Inc.
+// https://www.iana.org/domains/root/db/neustar.html
 neustar
 
-// new : 2014-01-30 Charleston Road Registry Inc.
+// new : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/new.html
 new
 
-// news : 2014-12-18 Dog Beach, LLC
+// news : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/news.html
 news
 
-// next : 2015-06-18 Next plc
+// next : Next plc
+// https://www.iana.org/domains/root/db/next.html
 next
 
-// nextdirect : 2015-06-18 Next plc
+// nextdirect : Next plc
+// https://www.iana.org/domains/root/db/nextdirect.html
 nextdirect
 
-// nexus : 2014-07-24 Charleston Road Registry Inc.
+// nexus : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/nexus.html
 nexus
 
-// nfl : 2015-07-23 NFL Reg Ops LLC
+// nfl : NFL Reg Ops LLC
+// https://www.iana.org/domains/root/db/nfl.html
 nfl
 
-// ngo : 2014-03-06 Public Interest Registry
+// ngo : Public Interest Registry
+// https://www.iana.org/domains/root/db/ngo.html
 ngo
 
-// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK)
+// nhk : Japan Broadcasting Corporation (NHK)
+// https://www.iana.org/domains/root/db/nhk.html
 nhk
 
-// nico : 2014-12-04 DWANGO Co., Ltd.
+// nico : DWANGO Co., Ltd.
+// https://www.iana.org/domains/root/db/nico.html
 nico
 
-// nike : 2015-07-23 NIKE, Inc.
+// nike : NIKE, Inc.
+// https://www.iana.org/domains/root/db/nike.html
 nike
 
-// nikon : 2015-05-21 NIKON CORPORATION
+// nikon : NIKON CORPORATION
+// https://www.iana.org/domains/root/db/nikon.html
 nikon
 
-// ninja : 2013-11-07 Dog Beach, LLC
+// ninja : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/ninja.html
 ninja
 
-// nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
+// nissan : NISSAN MOTOR CO., LTD.
+// https://www.iana.org/domains/root/db/nissan.html
 nissan
 
-// nissay : 2015-10-29 Nippon Life Insurance Company
+// nissay : Nippon Life Insurance Company
+// https://www.iana.org/domains/root/db/nissay.html
 nissay
 
-// nokia : 2015-01-08 Nokia Corporation
+// nokia : Nokia Corporation
+// https://www.iana.org/domains/root/db/nokia.html
 nokia
 
-// northwesternmutual : 2015-06-18 Northwestern Mutual Registry, LLC
-northwesternmutual
-
-// norton : 2014-12-04 NortonLifeLock Inc.
+// norton : Gen Digital Inc.
+// https://www.iana.org/domains/root/db/norton.html
 norton
 
-// now : 2015-06-25 Amazon Registry Services, Inc.
+// now : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/now.html
 now
 
-// nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// nowruz
+// https://www.iana.org/domains/root/db/nowruz.html
 nowruz
 
-// nowtv : 2015-05-14 Starbucks (HK) Limited
+// nowtv : Starbucks (HK) Limited
+// https://www.iana.org/domains/root/db/nowtv.html
 nowtv
 
-// nra : 2014-05-22 NRA Holdings Company, INC.
+// nra : National Rifle Association of America
+// https://www.iana.org/domains/root/db/nra.html
 nra
 
-// nrw : 2013-11-21 Minds + Machines GmbH
+// nrw : Minds + Machines GmbH
+// https://www.iana.org/domains/root/db/nrw.html
 nrw
 
-// ntt : 2014-10-31 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+// ntt : NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+// https://www.iana.org/domains/root/db/ntt.html
 ntt
 
-// nyc : 2014-01-23 The City of New York by and through the New York City Department of Information Technology & Telecommunications
+// nyc : The City of New York by and through the New York City Department of Information Technology & Telecommunications
+// https://www.iana.org/domains/root/db/nyc.html
 nyc
 
-// obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
+// obi : OBI Group Holding SE & Co. KGaA
+// https://www.iana.org/domains/root/db/obi.html
 obi
 
-// observer : 2015-04-30 Dog Beach, LLC
+// observer : Fegistry, LLC
+// https://www.iana.org/domains/root/db/observer.html
 observer
 
-// office : 2015-03-12 Microsoft Corporation
+// office : Microsoft Corporation
+// https://www.iana.org/domains/root/db/office.html
 office
 
-// okinawa : 2013-12-05 BRregistry, Inc.
+// okinawa : BRregistry, Inc.
+// https://www.iana.org/domains/root/db/okinawa.html
 okinawa
 
-// olayan : 2015-05-14 Crescent Holding GmbH
+// olayan : Competrol (Luxembourg) Sarl
+// https://www.iana.org/domains/root/db/olayan.html
 olayan
 
-// olayangroup : 2015-05-14 Crescent Holding GmbH
+// olayangroup : Competrol (Luxembourg) Sarl
+// https://www.iana.org/domains/root/db/olayangroup.html
 olayangroup
 
-// oldnavy : 2015-07-31 The Gap, Inc.
-oldnavy
-
-// ollo : 2015-06-04 Dish DBS Corporation
+// ollo : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/ollo.html
 ollo
 
-// omega : 2015-01-08 The Swatch Group Ltd
+// omega : The Swatch Group Ltd
+// https://www.iana.org/domains/root/db/omega.html
 omega
 
-// one : 2014-11-07 One.com A/S
+// one : One.com A/S
+// https://www.iana.org/domains/root/db/one.html
 one
 
-// ong : 2014-03-06 Public Interest Registry
+// ong : Public Interest Registry
+// https://www.iana.org/domains/root/db/ong.html
 ong
 
-// onl : 2013-09-16 iRegistry GmbH
+// onl : Jolly Host, LLC
+// https://www.iana.org/domains/root/db/onl.html
 onl
 
-// online : 2015-01-15 Radix FZC
+// online : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/online.html
 online
 
-// ooo : 2014-01-09 INFIBEAM AVENUES LIMITED
+// ooo : INFIBEAM AVENUES LIMITED
+// https://www.iana.org/domains/root/db/ooo.html
 ooo
 
-// open : 2015-07-31 American Express Travel Related Services Company, Inc.
+// open : American Express Travel Related Services Company, Inc.
+// https://www.iana.org/domains/root/db/open.html
 open
 
-// oracle : 2014-06-19 Oracle Corporation
+// oracle : Oracle Corporation
+// https://www.iana.org/domains/root/db/oracle.html
 oracle
 
-// orange : 2015-03-12 Orange Brand Services Limited
+// orange : Orange Brand Services Limited
+// https://www.iana.org/domains/root/db/orange.html
 orange
 
-// organic : 2014-03-27 Identity Digital Limited
+// organic : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/organic.html
 organic
 
-// origins : 2015-10-01 The Estรฉe Lauder Companies Inc.
+// origins : The Estรฉe Lauder Companies Inc.
+// https://www.iana.org/domains/root/db/origins.html
 origins
 
-// osaka : 2014-09-04 Osaka Registry Co., Ltd.
+// osaka : Osaka Registry Co., Ltd.
+// https://www.iana.org/domains/root/db/osaka.html
 osaka
 
-// otsuka : 2013-10-11 Otsuka Holdings Co., Ltd.
+// otsuka : Otsuka Holdings Co., Ltd.
+// https://www.iana.org/domains/root/db/otsuka.html
 otsuka
 
-// ott : 2015-06-04 Dish DBS Corporation
+// ott : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/ott.html
 ott
 
-// ovh : 2014-01-16 MรฉdiaBC
+// ovh : MรฉdiaBC
+// https://www.iana.org/domains/root/db/ovh.html
 ovh
 
-// page : 2014-12-04 Charleston Road Registry Inc.
+// page : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/page.html
 page
 
-// panasonic : 2015-07-30 Panasonic Corporation
+// panasonic : Panasonic Holdings Corporation
+// https://www.iana.org/domains/root/db/panasonic.html
 panasonic
 
-// paris : 2014-01-30 City of Paris
+// paris : City of Paris
+// https://www.iana.org/domains/root/db/paris.html
 paris
 
-// pars : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// pars
+// https://www.iana.org/domains/root/db/pars.html
 pars
 
-// partners : 2013-12-05 Binky Moon, LLC
+// partners : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/partners.html
 partners
 
-// parts : 2013-12-05 Binky Moon, LLC
+// parts : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/parts.html
 parts
 
-// party : 2014-09-11 Blue Sky Registry Limited
+// party : Blue Sky Registry Limited
+// https://www.iana.org/domains/root/db/party.html
 party
 
-// passagens : 2015-03-05 Travel Reservations SRL
-passagens
-
-// pay : 2015-08-27 Amazon Registry Services, Inc.
+// pay : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/pay.html
 pay
 
-// pccw : 2015-05-14 PCCW Enterprises Limited
+// pccw : PCCW Enterprises Limited
+// https://www.iana.org/domains/root/db/pccw.html
 pccw
 
-// pet : 2015-05-07 Identity Digital Limited
+// pet : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/pet.html
 pet
 
-// pfizer : 2015-09-11 Pfizer Inc.
+// pfizer : Pfizer Inc.
+// https://www.iana.org/domains/root/db/pfizer.html
 pfizer
 
-// pharmacy : 2014-06-19 National Association of Boards of Pharmacy
+// pharmacy : National Association of Boards of Pharmacy
+// https://www.iana.org/domains/root/db/pharmacy.html
 pharmacy
 
-// phd : 2016-07-28 Charleston Road Registry Inc.
+// phd : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/phd.html
 phd
 
-// philips : 2014-11-07 Koninklijke Philips N.V.
+// philips : Koninklijke Philips N.V.
+// https://www.iana.org/domains/root/db/philips.html
 philips
 
-// phone : 2016-06-02 Dish DBS Corporation
+// phone : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/phone.html
 phone
 
-// photo : 2013-11-14 Registry Services, LLC
+// photo : Registry Services, LLC
+// https://www.iana.org/domains/root/db/photo.html
 photo
 
-// photography : 2013-09-20 Binky Moon, LLC
+// photography : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/photography.html
 photography
 
-// photos : 2013-10-17 Binky Moon, LLC
+// photos : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/photos.html
 photos
 
-// physio : 2014-05-01 PhysBiz Pty Ltd
+// physio : PhysBiz Pty Ltd
+// https://www.iana.org/domains/root/db/physio.html
 physio
 
-// pics : 2013-11-14 XYZ.COM LLC
+// pics : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/pics.html
 pics
 
-// pictet : 2014-06-26 Pictet Europe S.A.
+// pictet : Banque Pictet & Cie SA
+// https://www.iana.org/domains/root/db/pictet.html
 pictet
 
-// pictures : 2014-03-06 Binky Moon, LLC
+// pictures : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/pictures.html
 pictures
 
-// pid : 2015-01-08 Top Level Spectrum, Inc.
+// pid : Top Level Spectrum, Inc.
+// https://www.iana.org/domains/root/db/pid.html
 pid
 
-// pin : 2014-12-18 Amazon Registry Services, Inc.
+// pin : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/pin.html
 pin
 
-// ping : 2015-06-11 Ping Registry Provider, Inc.
+// ping : Ping Registry Provider, Inc.
+// https://www.iana.org/domains/root/db/ping.html
 ping
 
-// pink : 2013-10-01 Identity Digital Limited
+// pink : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/pink.html
 pink
 
-// pioneer : 2015-07-16 Pioneer Corporation
+// pioneer : Pioneer Corporation
+// https://www.iana.org/domains/root/db/pioneer.html
 pioneer
 
-// pizza : 2014-06-26 Binky Moon, LLC
+// pizza : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/pizza.html
 pizza
 
-// place : 2014-04-24 Binky Moon, LLC
+// place : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/place.html
 place
 
-// play : 2015-03-05 Charleston Road Registry Inc.
+// play : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/play.html
 play
 
-// playstation : 2015-07-02 Sony Interactive Entertainment Inc.
+// playstation : Sony Interactive Entertainment Inc.
+// https://www.iana.org/domains/root/db/playstation.html
 playstation
 
-// plumbing : 2013-09-10 Binky Moon, LLC
+// plumbing : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/plumbing.html
 plumbing
 
-// plus : 2015-02-05 Binky Moon, LLC
+// plus : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/plus.html
 plus
 
-// pnc : 2015-07-02 PNC Domain Co., LLC
+// pnc : PNC Domain Co., LLC
+// https://www.iana.org/domains/root/db/pnc.html
 pnc
 
-// pohl : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// pohl : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/pohl.html
 pohl
 
-// poker : 2014-07-03 Identity Digital Limited
+// poker : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/poker.html
 poker
 
-// politie : 2015-08-20 Politie Nederland
+// politie : Politie Nederland
+// https://www.iana.org/domains/root/db/politie.html
 politie
 
-// porn : 2014-10-16 ICM Registry PN LLC
+// porn : ICM Registry PN LLC
+// https://www.iana.org/domains/root/db/porn.html
 porn
 
-// pramerica : 2015-07-30 Prudential Financial, Inc.
-pramerica
-
-// praxi : 2013-12-05 Praxi S.p.A.
+// praxi : Praxi S.p.A.
+// https://www.iana.org/domains/root/db/praxi.html
 praxi
 
-// press : 2014-04-03 Radix FZC
+// press : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/press.html
 press
 
-// prime : 2015-06-25 Amazon Registry Services, Inc.
+// prime : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/prime.html
 prime
 
-// prod : 2014-01-23 Charleston Road Registry Inc.
+// prod : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/prod.html
 prod
 
-// productions : 2013-12-05 Binky Moon, LLC
+// productions : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/productions.html
 productions
 
-// prof : 2014-07-24 Charleston Road Registry Inc.
+// prof : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/prof.html
 prof
 
-// progressive : 2015-07-23 Progressive Casualty Insurance Company
+// progressive : Progressive Casualty Insurance Company
+// https://www.iana.org/domains/root/db/progressive.html
 progressive
 
-// promo : 2014-12-18 Identity Digital Limited
+// promo : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/promo.html
 promo
 
-// properties : 2013-12-05 Binky Moon, LLC
+// properties : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/properties.html
 properties
 
-// property : 2014-05-22 Internet Naming Company LLC
+// property : Digital Property Infrastructure Limited
+// https://www.iana.org/domains/root/db/property.html
 property
 
-// protection : 2015-04-23 XYZ.COM LLC
+// protection : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/protection.html
 protection
 
-// pru : 2015-07-30 Prudential Financial, Inc.
+// pru : Prudential Financial, Inc.
+// https://www.iana.org/domains/root/db/pru.html
 pru
 
-// prudential : 2015-07-30 Prudential Financial, Inc.
+// prudential : Prudential Financial, Inc.
+// https://www.iana.org/domains/root/db/prudential.html
 prudential
 
-// pub : 2013-12-12 Dog Beach, LLC
+// pub : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/pub.html
 pub
 
-// pwc : 2015-10-29 PricewaterhouseCoopers LLP
+// pwc : PricewaterhouseCoopers LLP
+// https://www.iana.org/domains/root/db/pwc.html
 pwc
 
-// qpon : 2013-11-14 dotQPON LLC
+// qpon : dotQPON LLC
+// https://www.iana.org/domains/root/db/qpon.html
 qpon
 
-// quebec : 2013-12-19 PointQuรฉbec Inc
+// quebec : PointQuรฉbec Inc
+// https://www.iana.org/domains/root/db/quebec.html
 quebec
 
-// quest : 2015-03-26 XYZ.COM LLC
+// quest : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/quest.html
 quest
 
-// racing : 2014-12-04 Premier Registry Limited
+// racing : Premier Registry Limited
+// https://www.iana.org/domains/root/db/racing.html
 racing
 
-// radio : 2016-07-21 European Broadcasting Union (EBU)
+// radio : Digity, LLC
+// https://www.iana.org/domains/root/db/radio.html
 radio
 
-// read : 2014-12-18 Amazon Registry Services, Inc.
+// read : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/read.html
 read
 
-// realestate : 2015-09-11 dotRealEstate LLC
+// realestate : dotRealEstate LLC
+// https://www.iana.org/domains/root/db/realestate.html
 realestate
 
-// realtor : 2014-05-29 Real Estate Domains LLC
+// realtor : Real Estate Domains LLC
+// https://www.iana.org/domains/root/db/realtor.html
 realtor
 
-// realty : 2015-03-19 Dog Beach, LLC
+// realty : Waterford Limited
+// https://www.iana.org/domains/root/db/realty.html
 realty
 
-// recipes : 2013-10-17 Binky Moon, LLC
+// recipes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/recipes.html
 recipes
 
-// red : 2013-11-07 Identity Digital Limited
+// red : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/red.html
 red
 
-// redstone : 2014-10-31 Redstone Haute Couture Co., Ltd.
-redstone
-
-// redumbrella : 2015-03-26 Travelers TLD, LLC
+// redumbrella : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/redumbrella.html
 redumbrella
 
-// rehab : 2014-03-06 Dog Beach, LLC
+// rehab : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/rehab.html
 rehab
 
-// reise : 2014-03-13 Binky Moon, LLC
+// reise : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/reise.html
 reise
 
-// reisen : 2014-03-06 Binky Moon, LLC
+// reisen : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/reisen.html
 reisen
 
-// reit : 2014-09-04 National Association of Real Estate Investment Trusts, Inc.
+// reit : National Association of Real Estate Investment Trusts, Inc.
+// https://www.iana.org/domains/root/db/reit.html
 reit
 
-// reliance : 2015-04-02 Reliance Industries Limited
+// reliance : Reliance Industries Limited
+// https://www.iana.org/domains/root/db/reliance.html
 reliance
 
-// ren : 2013-12-12 ZDNS International Limited
+// ren : ZDNS International Limited
+// https://www.iana.org/domains/root/db/ren.html
 ren
 
-// rent : 2014-12-04 XYZ.COM LLC
+// rent : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/rent.html
 rent
 
-// rentals : 2013-12-05 Binky Moon, LLC
+// rentals : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/rentals.html
 rentals
 
-// repair : 2013-11-07 Binky Moon, LLC
+// repair : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/repair.html
 repair
 
-// report : 2013-12-05 Binky Moon, LLC
+// report : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/report.html
 report
 
-// republican : 2014-03-20 Dog Beach, LLC
+// republican : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/republican.html
 republican
 
-// rest : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// rest : Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// https://www.iana.org/domains/root/db/rest.html
 rest
 
-// restaurant : 2014-07-03 Binky Moon, LLC
+// restaurant : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/restaurant.html
 restaurant
 
-// review : 2014-11-20 dot Review Limited
+// review : dot Review Limited
+// https://www.iana.org/domains/root/db/review.html
 review
 
-// reviews : 2013-09-13 Dog Beach, LLC
+// reviews : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/reviews.html
 reviews
 
-// rexroth : 2015-06-18 Robert Bosch GMBH
+// rexroth : Robert Bosch GMBH
+// https://www.iana.org/domains/root/db/rexroth.html
 rexroth
 
-// rich : 2013-11-21 iRegistry GmbH
+// rich : iRegistry GmbH
+// https://www.iana.org/domains/root/db/rich.html
 rich
 
-// richardli : 2015-05-14 Pacific Century Asset Management (HK) Limited
+// richardli : Pacific Century Asset Management (HK) Limited
+// https://www.iana.org/domains/root/db/richardli.html
 richardli
 
-// ricoh : 2014-11-20 Ricoh Company, Ltd.
+// ricoh : Ricoh Company, Ltd.
+// https://www.iana.org/domains/root/db/ricoh.html
 ricoh
 
-// ril : 2015-04-02 Reliance Industries Limited
+// ril : Reliance Industries Limited
+// https://www.iana.org/domains/root/db/ril.html
 ril
 
-// rio : 2014-02-27 Empresa Municipal de Informรกtica SA - IPLANRIO
+// rio : Empresa Municipal de Informรกtica SA - IPLANRIO
+// https://www.iana.org/domains/root/db/rio.html
 rio
 
-// rip : 2014-07-10 Dog Beach, LLC
+// rip : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/rip.html
 rip
 
-// rocher : 2014-12-18 Ferrero Trading Lux S.A.
-rocher
-
-// rocks : 2013-11-14 Dog Beach, LLC
+// rocks : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/rocks.html
 rocks
 
-// rodeo : 2013-12-19 Registry Services, LLC
+// rodeo : Registry Services, LLC
+// https://www.iana.org/domains/root/db/rodeo.html
 rodeo
 
-// rogers : 2015-08-06 Rogers Communications Canada Inc.
+// rogers : Rogers Communications Canada Inc.
+// https://www.iana.org/domains/root/db/rogers.html
 rogers
 
-// room : 2014-12-18 Amazon Registry Services, Inc.
+// room : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/room.html
 room
 
-// rsvp : 2014-05-08 Charleston Road Registry Inc.
+// rsvp : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/rsvp.html
 rsvp
 
-// rugby : 2016-12-15 World Rugby Strategic Developments Limited
+// rugby : World Rugby Strategic Developments Limited
+// https://www.iana.org/domains/root/db/rugby.html
 rugby
 
-// ruhr : 2013-10-02 dotSaarland GmbH
+// ruhr : dotSaarland GmbH
+// https://www.iana.org/domains/root/db/ruhr.html
 ruhr
 
-// run : 2015-03-19 Binky Moon, LLC
+// run : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/run.html
 run
 
-// rwe : 2015-04-02 RWE AG
+// rwe : RWE AG
+// https://www.iana.org/domains/root/db/rwe.html
 rwe
 
-// ryukyu : 2014-01-09 BRregistry, Inc.
+// ryukyu : BRregistry, Inc.
+// https://www.iana.org/domains/root/db/ryukyu.html
 ryukyu
 
-// saarland : 2013-12-12 dotSaarland GmbH
+// saarland : dotSaarland GmbH
+// https://www.iana.org/domains/root/db/saarland.html
 saarland
 
-// safe : 2014-12-18 Amazon Registry Services, Inc.
+// safe : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/safe.html
 safe
 
-// safety : 2015-01-08 Safety Registry Services, LLC.
+// safety : Safety Registry Services, LLC.
+// https://www.iana.org/domains/root/db/safety.html
 safety
 
-// sakura : 2014-12-18 SAKURA Internet Inc.
+// sakura : SAKURA Internet Inc.
+// https://www.iana.org/domains/root/db/sakura.html
 sakura
 
-// sale : 2014-10-16 Dog Beach, LLC
+// sale : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/sale.html
 sale
 
-// salon : 2014-12-11 Binky Moon, LLC
+// salon : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/salon.html
 salon
 
-// samsclub : 2015-07-31 Wal-Mart Stores, Inc.
+// samsclub : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/samsclub.html
 samsclub
 
-// samsung : 2014-04-03 SAMSUNG SDS CO., LTD
+// samsung : SAMSUNG SDS CO., LTD
+// https://www.iana.org/domains/root/db/samsung.html
 samsung
 
-// sandvik : 2014-11-13 Sandvik AB
+// sandvik : Sandvik AB
+// https://www.iana.org/domains/root/db/sandvik.html
 sandvik
 
-// sandvikcoromant : 2014-11-07 Sandvik AB
+// sandvikcoromant : Sandvik AB
+// https://www.iana.org/domains/root/db/sandvikcoromant.html
 sandvikcoromant
 
-// sanofi : 2014-10-09 Sanofi
+// sanofi : Sanofi
+// https://www.iana.org/domains/root/db/sanofi.html
 sanofi
 
-// sap : 2014-03-27 SAP AG
+// sap : SAP AG
+// https://www.iana.org/domains/root/db/sap.html
 sap
 
-// sarl : 2014-07-03 Binky Moon, LLC
+// sarl : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/sarl.html
 sarl
 
-// sas : 2015-04-02 Research IP LLC
+// sas : Research IP LLC
+// https://www.iana.org/domains/root/db/sas.html
 sas
 
-// save : 2015-06-25 Amazon Registry Services, Inc.
+// save : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/save.html
 save
 
-// saxo : 2014-10-31 Saxo Bank A/S
+// saxo : Saxo Bank A/S
+// https://www.iana.org/domains/root/db/saxo.html
 saxo
 
-// sbi : 2015-03-12 STATE BANK OF INDIA
+// sbi : STATE BANK OF INDIA
+// https://www.iana.org/domains/root/db/sbi.html
 sbi
 
-// sbs : 2014-11-07 ShortDot SA
+// sbs : ShortDot SA
+// https://www.iana.org/domains/root/db/sbs.html
 sbs
 
-// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
-sca
-
-// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB")
+// scb : The Siam Commercial Bank Public Company Limited ("SCB")
+// https://www.iana.org/domains/root/db/scb.html
 scb
 
-// schaeffler : 2015-08-06 Schaeffler Technologies AG & Co. KG
+// schaeffler : Schaeffler Technologies AG & Co. KG
+// https://www.iana.org/domains/root/db/schaeffler.html
 schaeffler
 
-// schmidt : 2014-04-03 SCHMIDT GROUPE S.A.S.
+// schmidt : SCHMIDT GROUPE S.A.S.
+// https://www.iana.org/domains/root/db/schmidt.html
 schmidt
 
-// scholarships : 2014-04-24 Scholarships.com, LLC
+// scholarships : Scholarships.com, LLC
+// https://www.iana.org/domains/root/db/scholarships.html
 scholarships
 
-// school : 2014-12-18 Binky Moon, LLC
+// school : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/school.html
 school
 
-// schule : 2014-03-06 Binky Moon, LLC
+// schule : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/schule.html
 schule
 
-// schwarz : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
+// schwarz : Schwarz Domains und Services GmbH & Co. KG
+// https://www.iana.org/domains/root/db/schwarz.html
 schwarz
 
-// science : 2014-09-11 dot Science Limited
+// science : dot Science Limited
+// https://www.iana.org/domains/root/db/science.html
 science
 
-// scot : 2014-01-23 Dot Scot Registry Limited
+// scot : Dot Scot Registry Limited
+// https://www.iana.org/domains/root/db/scot.html
 scot
 
-// search : 2016-06-09 Charleston Road Registry Inc.
+// search : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/search.html
 search
 
-// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal)
+// seat : SEAT, S.A. (Sociedad Unipersonal)
+// https://www.iana.org/domains/root/db/seat.html
 seat
 
-// secure : 2015-08-27 Amazon Registry Services, Inc.
+// secure : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/secure.html
 secure
 
-// security : 2015-05-14 XYZ.COM LLC
+// security : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/security.html
 security
 
-// seek : 2014-12-04 Seek Limited
+// seek : Seek Limited
+// https://www.iana.org/domains/root/db/seek.html
 seek
 
-// select : 2015-10-08 Registry Services, LLC
+// select : Registry Services, LLC
+// https://www.iana.org/domains/root/db/select.html
 select
 
-// sener : 2014-10-24 Sener Ingenierรญa y Sistemas, S.A.
+// sener : Sener Ingenierรญa y Sistemas, S.A.
+// https://www.iana.org/domains/root/db/sener.html
 sener
 
-// services : 2014-02-27 Binky Moon, LLC
+// services : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/services.html
 services
 
-// seven : 2015-08-06 Seven West Media Ltd
+// seven : Seven West Media Ltd
+// https://www.iana.org/domains/root/db/seven.html
 seven
 
-// sew : 2014-07-17 SEW-EURODRIVE GmbH & Co KG
+// sew : SEW-EURODRIVE GmbH & Co KG
+// https://www.iana.org/domains/root/db/sew.html
 sew
 
-// sex : 2014-11-13 ICM Registry SX LLC
+// sex : ICM Registry SX LLC
+// https://www.iana.org/domains/root/db/sex.html
 sex
 
-// sexy : 2013-09-11 Internet Naming Company LLC
+// sexy : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/sexy.html
 sexy
 
-// sfr : 2015-08-13 Societe Francaise du Radiotelephone - SFR
+// sfr : Societe Francaise du Radiotelephone - SFR
+// https://www.iana.org/domains/root/db/sfr.html
 sfr
 
-// shangrila : 2015-09-03 Shangriโ€La International Hotel Management Limited
+// shangrila : Shangriโ€La International Hotel Management Limited
+// https://www.iana.org/domains/root/db/shangrila.html
 shangrila
 
-// sharp : 2014-05-01 Sharp Corporation
+// sharp : Sharp Corporation
+// https://www.iana.org/domains/root/db/sharp.html
 sharp
 
-// shaw : 2015-04-23 Shaw Cablesystems G.P.
-shaw
-
-// shell : 2015-07-30 Shell Information Technology International Inc
+// shell : Shell Information Technology International Inc
+// https://www.iana.org/domains/root/db/shell.html
 shell
 
-// shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// shia
+// https://www.iana.org/domains/root/db/shia.html
 shia
 
-// shiksha : 2013-11-14 Identity Digital Limited
+// shiksha : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/shiksha.html
 shiksha
 
-// shoes : 2013-10-02 Binky Moon, LLC
+// shoes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/shoes.html
 shoes
 
-// shop : 2016-04-08 GMO Registry, Inc.
+// shop : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/shop.html
 shop
 
-// shopping : 2016-03-31 Binky Moon, LLC
+// shopping : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/shopping.html
 shopping
 
-// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// shouji : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/shouji.html
 shouji
 
-// show : 2015-03-05 Binky Moon, LLC
+// show : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/show.html
 show
 
-// showtime : 2015-08-06 CBS Domains Inc.
-showtime
-
-// silk : 2015-06-25 Amazon Registry Services, Inc.
+// silk : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/silk.html
 silk
 
-// sina : 2015-03-12 Sina Corporation
+// sina : Sina Corporation
+// https://www.iana.org/domains/root/db/sina.html
 sina
 
-// singles : 2013-08-27 Binky Moon, LLC
+// singles : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/singles.html
 singles
 
-// site : 2015-01-15 Radix FZC
+// site : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/site.html
 site
 
-// ski : 2015-04-09 Identity Digital Limited
+// ski : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/ski.html
 ski
 
-// skin : 2015-01-15 XYZ.COM LLC
+// skin : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/skin.html
 skin
 
-// sky : 2014-06-19 Sky International AG
+// sky : Sky UK Limited
+// https://www.iana.org/domains/root/db/sky.html
 sky
 
-// skype : 2014-12-18 Microsoft Corporation
+// skype : Microsoft Corporation
+// https://www.iana.org/domains/root/db/skype.html
 skype
 
-// sling : 2015-07-30 DISH Technologies L.L.C.
+// sling : DISH Technologies L.L.C.
+// https://www.iana.org/domains/root/db/sling.html
 sling
 
-// smart : 2015-07-09 Smart Communications, Inc. (SMART)
+// smart : Smart Communications, Inc. (SMART)
+// https://www.iana.org/domains/root/db/smart.html
 smart
 
-// smile : 2014-12-18 Amazon Registry Services, Inc.
+// smile : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/smile.html
 smile
 
-// sncf : 2015-02-19 Sociรฉtรฉ Nationale SNCF
+// sncf : Sociรฉtรฉ Nationale SNCF
+// https://www.iana.org/domains/root/db/sncf.html
 sncf
 
-// soccer : 2015-03-26 Binky Moon, LLC
+// soccer : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/soccer.html
 soccer
 
-// social : 2013-11-07 Dog Beach, LLC
+// social : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/social.html
 social
 
-// softbank : 2015-07-02 SoftBank Group Corp.
+// softbank : SoftBank Group Corp.
+// https://www.iana.org/domains/root/db/softbank.html
 softbank
 
-// software : 2014-03-20 Dog Beach, LLC
+// software : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/software.html
 software
 
-// sohu : 2013-12-19 Sohu.com Limited
+// sohu : Sohu.com Limited
+// https://www.iana.org/domains/root/db/sohu.html
 sohu
 
-// solar : 2013-11-07 Binky Moon, LLC
+// solar : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/solar.html
 solar
 
-// solutions : 2013-11-07 Binky Moon, LLC
+// solutions : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/solutions.html
 solutions
 
-// song : 2015-02-26 Amazon Registry Services, Inc.
+// song : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/song.html
 song
 
-// sony : 2015-01-08 Sony Corporation
+// sony : Sony Group Corporation
+// https://www.iana.org/domains/root/db/sony.html
 sony
 
-// soy : 2014-01-23 Charleston Road Registry Inc.
+// soy : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/soy.html
 soy
 
-// spa : 2019-09-19 Asia Spa and Wellness Promotion Council Limited
+// spa : Asia Spa and Wellness Promotion Council Limited
+// https://www.iana.org/domains/root/db/spa.html
 spa
 
-// space : 2014-04-03 Radix FZC
+// space : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/space.html
 space
 
-// sport : 2017-11-16 Global Association of International Sports Federations (GAISF)
+// sport : SportAccord
+// https://www.iana.org/domains/root/db/sport.html
 sport
 
-// spot : 2015-02-26 Amazon Registry Services, Inc.
+// spot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/spot.html
 spot
 
-// srl : 2015-05-07 InterNetX, Corp
+// srl : InterNetX, Corp
+// https://www.iana.org/domains/root/db/srl.html
 srl
 
-// stada : 2014-11-13 STADA Arzneimittel AG
+// stada : STADA Arzneimittel AG
+// https://www.iana.org/domains/root/db/stada.html
 stada
 
-// staples : 2015-07-30 Staples, Inc.
+// staples : Staples, Inc.
+// https://www.iana.org/domains/root/db/staples.html
 staples
 
-// star : 2015-01-08 Star India Private Limited
+// star : Star India Private Limited
+// https://www.iana.org/domains/root/db/star.html
 star
 
-// statebank : 2015-03-12 STATE BANK OF INDIA
+// statebank : STATE BANK OF INDIA
+// https://www.iana.org/domains/root/db/statebank.html
 statebank
 
-// statefarm : 2015-07-30 State Farm Mutual Automobile Insurance Company
+// statefarm : State Farm Mutual Automobile Insurance Company
+// https://www.iana.org/domains/root/db/statefarm.html
 statefarm
 
-// stc : 2014-10-09 Saudi Telecom Company
+// stc : Saudi Telecom Company
+// https://www.iana.org/domains/root/db/stc.html
 stc
 
-// stcgroup : 2014-10-09 Saudi Telecom Company
+// stcgroup : Saudi Telecom Company
+// https://www.iana.org/domains/root/db/stcgroup.html
 stcgroup
 
-// stockholm : 2014-12-18 Stockholms kommun
+// stockholm : Stockholms kommun
+// https://www.iana.org/domains/root/db/stockholm.html
 stockholm
 
-// storage : 2014-12-22 XYZ.COM LLC
+// storage : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/storage.html
 storage
 
-// store : 2015-04-09 Radix FZC
+// store : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/store.html
 store
 
-// stream : 2016-01-08 dot Stream Limited
+// stream : dot Stream Limited
+// https://www.iana.org/domains/root/db/stream.html
 stream
 
-// studio : 2015-02-11 Dog Beach, LLC
+// studio : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/studio.html
 studio
 
-// study : 2014-12-11 Registry Services, LLC
+// study : Registry Services, LLC
+// https://www.iana.org/domains/root/db/study.html
 study
 
-// style : 2014-12-04 Binky Moon, LLC
+// style : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/style.html
 style
 
-// sucks : 2014-12-22 Vox Populi Registry Ltd.
+// sucks : Vox Populi Registry Ltd.
+// https://www.iana.org/domains/root/db/sucks.html
 sucks
 
-// supplies : 2013-12-19 Binky Moon, LLC
+// supplies : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/supplies.html
 supplies
 
-// supply : 2013-12-19 Binky Moon, LLC
+// supply : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/supply.html
 supply
 
-// support : 2013-10-24 Binky Moon, LLC
+// support : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/support.html
 support
 
-// surf : 2014-01-09 Registry Services, LLC
+// surf : Registry Services, LLC
+// https://www.iana.org/domains/root/db/surf.html
 surf
 
-// surgery : 2014-03-20 Binky Moon, LLC
+// surgery : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/surgery.html
 surgery
 
-// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION
+// suzuki : SUZUKI MOTOR CORPORATION
+// https://www.iana.org/domains/root/db/suzuki.html
 suzuki
 
-// swatch : 2015-01-08 The Swatch Group Ltd
+// swatch : The Swatch Group Ltd
+// https://www.iana.org/domains/root/db/swatch.html
 swatch
 
-// swiss : 2014-10-16 Swiss Confederation
+// swiss : Swiss Confederation
+// https://www.iana.org/domains/root/db/swiss.html
 swiss
 
-// sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet
+// sydney : State of New South Wales, Department of Premier and Cabinet
+// https://www.iana.org/domains/root/db/sydney.html
 sydney
 
-// systems : 2013-11-07 Binky Moon, LLC
+// systems : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/systems.html
 systems
 
-// tab : 2014-12-04 Tabcorp Holdings Limited
+// tab : Tabcorp Holdings Limited
+// https://www.iana.org/domains/root/db/tab.html
 tab
 
-// taipei : 2014-07-10 Taipei City Government
+// taipei : Taipei City Government
+// https://www.iana.org/domains/root/db/taipei.html
 taipei
 
-// talk : 2015-04-09 Amazon Registry Services, Inc.
+// talk : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/talk.html
 talk
 
-// taobao : 2015-01-15 Alibaba Group Holding Limited
+// taobao : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/taobao.html
 taobao
 
-// target : 2015-07-31 Target Domain Holdings, LLC
+// target : Target Domain Holdings, LLC
+// https://www.iana.org/domains/root/db/target.html
 target
 
-// tatamotors : 2015-03-12 Tata Motors Ltd
+// tatamotors : Tata Motors Ltd
+// https://www.iana.org/domains/root/db/tatamotors.html
 tatamotors
 
-// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
+// tatar : Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
+// https://www.iana.org/domains/root/db/tatar.html
 tatar
 
-// tattoo : 2013-08-30 Top Level Design, LLC
+// tattoo : Registry Services, LLC
+// https://www.iana.org/domains/root/db/tattoo.html
 tattoo
 
-// tax : 2014-03-20 Binky Moon, LLC
+// tax : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tax.html
 tax
 
-// taxi : 2015-03-19 Binky Moon, LLC
+// taxi : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/taxi.html
 taxi
 
-// tci : 2014-09-12 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// tci
+// https://www.iana.org/domains/root/db/tci.html
 tci
 
-// tdk : 2015-06-11 TDK Corporation
+// tdk : TDK Corporation
+// https://www.iana.org/domains/root/db/tdk.html
 tdk
 
-// team : 2015-03-05 Binky Moon, LLC
+// team : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/team.html
 team
 
-// tech : 2015-01-30 Radix FZC
+// tech : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/tech.html
 tech
 
-// technology : 2013-09-13 Binky Moon, LLC
+// technology : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/technology.html
 technology
 
-// temasek : 2014-08-07 Temasek Holdings (Private) Limited
+// temasek : Temasek Holdings (Private) Limited
+// https://www.iana.org/domains/root/db/temasek.html
 temasek
 
-// tennis : 2014-12-04 Binky Moon, LLC
+// tennis : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tennis.html
 tennis
 
-// teva : 2015-07-02 Teva Pharmaceutical Industries Limited
+// teva : Teva Pharmaceutical Industries Limited
+// https://www.iana.org/domains/root/db/teva.html
 teva
 
-// thd : 2015-04-02 Home Depot Product Authority, LLC
+// thd : Home Depot Product Authority, LLC
+// https://www.iana.org/domains/root/db/thd.html
 thd
 
-// theater : 2015-03-19 Binky Moon, LLC
+// theater : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/theater.html
 theater
 
-// theatre : 2015-05-07 XYZ.COM LLC
+// theatre : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/theatre.html
 theatre
 
-// tiaa : 2015-07-23 Teachers Insurance and Annuity Association of America
+// tiaa : Teachers Insurance and Annuity Association of America
+// https://www.iana.org/domains/root/db/tiaa.html
 tiaa
 
-// tickets : 2015-02-05 XYZ.COM LLC
+// tickets : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/tickets.html
 tickets
 
-// tienda : 2013-11-14 Binky Moon, LLC
+// tienda : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tienda.html
 tienda
 
-// tiffany : 2015-01-30 Tiffany and Company
-tiffany
-
-// tips : 2013-09-20 Binky Moon, LLC
+// tips : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tips.html
 tips
 
-// tires : 2014-11-07 Binky Moon, LLC
+// tires : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tires.html
 tires
 
-// tirol : 2014-04-24 punkt Tirol GmbH
+// tirol : punkt Tirol GmbH
+// https://www.iana.org/domains/root/db/tirol.html
 tirol
 
-// tjmaxx : 2015-07-16 The TJX Companies, Inc.
+// tjmaxx : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/tjmaxx.html
 tjmaxx
 
-// tjx : 2015-07-16 The TJX Companies, Inc.
+// tjx : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/tjx.html
 tjx
 
-// tkmaxx : 2015-07-16 The TJX Companies, Inc.
+// tkmaxx : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/tkmaxx.html
 tkmaxx
 
-// tmall : 2015-01-15 Alibaba Group Holding Limited
+// tmall : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/tmall.html
 tmall
 
-// today : 2013-09-20 Binky Moon, LLC
+// today : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/today.html
 today
 
-// tokyo : 2013-11-13 GMO Registry, Inc.
+// tokyo : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/tokyo.html
 tokyo
 
-// tools : 2013-11-21 Binky Moon, LLC
+// tools : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tools.html
 tools
 
-// top : 2014-03-20 .TOP Registry
+// top : Hong Kong Zhongze International Limited
+// https://www.iana.org/domains/root/db/top.html
 top
 
-// toray : 2014-12-18 Toray Industries, Inc.
+// toray : Toray Industries, Inc.
+// https://www.iana.org/domains/root/db/toray.html
 toray
 
-// toshiba : 2014-04-10 TOSHIBA Corporation
+// toshiba : TOSHIBA Corporation
+// https://www.iana.org/domains/root/db/toshiba.html
 toshiba
 
-// total : 2015-08-06 TotalEnergies SE
+// total : TotalEnergies SE
+// https://www.iana.org/domains/root/db/total.html
 total
 
-// tours : 2015-01-22 Binky Moon, LLC
+// tours : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tours.html
 tours
 
-// town : 2014-03-06 Binky Moon, LLC
+// town : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/town.html
 town
 
-// toyota : 2015-04-23 TOYOTA MOTOR CORPORATION
+// toyota : TOYOTA MOTOR CORPORATION
+// https://www.iana.org/domains/root/db/toyota.html
 toyota
 
-// toys : 2014-03-06 Binky Moon, LLC
+// toys : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/toys.html
 toys
 
-// trade : 2014-01-23 Elite Registry Limited
+// trade : Elite Registry Limited
+// https://www.iana.org/domains/root/db/trade.html
 trade
 
-// trading : 2014-12-11 Dog Beach, LLC
+// trading : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/trading.html
 trading
 
-// training : 2013-11-07 Binky Moon, LLC
+// training : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/training.html
 training
 
-// travel : 2015-10-09 Dog Beach, LLC
+// travel : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/travel.html
 travel
 
-// travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
-travelchannel
-
-// travelers : 2015-03-26 Travelers TLD, LLC
+// travelers : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/travelers.html
 travelers
 
-// travelersinsurance : 2015-03-26 Travelers TLD, LLC
+// travelersinsurance : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/travelersinsurance.html
 travelersinsurance
 
-// trust : 2014-10-16 Internet Naming Company LLC
+// trust : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/trust.html
 trust
 
-// trv : 2015-03-26 Travelers TLD, LLC
+// trv : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/trv.html
 trv
 
-// tube : 2015-06-11 Latin American Telecom LLC
+// tube : Latin American Telecom LLC
+// https://www.iana.org/domains/root/db/tube.html
 tube
 
-// tui : 2014-07-03 TUI AG
+// tui : TUI AG
+// https://www.iana.org/domains/root/db/tui.html
 tui
 
-// tunes : 2015-02-26 Amazon Registry Services, Inc.
+// tunes : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/tunes.html
 tunes
 
-// tushu : 2014-12-18 Amazon Registry Services, Inc.
+// tushu : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/tushu.html
 tushu
 
-// tvs : 2015-02-19 T V SUNDRAM IYENGAR  & SONS LIMITED
+// tvs : T V SUNDRAM IYENGAR  & SONS LIMITED
+// https://www.iana.org/domains/root/db/tvs.html
 tvs
 
-// ubank : 2015-08-20 National Australia Bank Limited
+// ubank : National Australia Bank Limited
+// https://www.iana.org/domains/root/db/ubank.html
 ubank
 
-// ubs : 2014-12-11 UBS AG
+// ubs : UBS AG
+// https://www.iana.org/domains/root/db/ubs.html
 ubs
 
-// unicom : 2015-10-15 China United Network Communications Corporation Limited
+// unicom : China United Network Communications Corporation Limited
+// https://www.iana.org/domains/root/db/unicom.html
 unicom
 
-// university : 2014-03-06 Binky Moon, LLC
+// university : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/university.html
 university
 
-// uno : 2013-09-11 Radix FZC
+// uno : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/uno.html
 uno
 
-// uol : 2014-05-01 UBN INTERNET LTDA.
+// uol : UBN INTERNET LTDA.
+// https://www.iana.org/domains/root/db/uol.html
 uol
 
-// ups : 2015-06-25 UPS Market Driver, Inc.
+// ups : UPS Market Driver, Inc.
+// https://www.iana.org/domains/root/db/ups.html
 ups
 
-// vacations : 2013-12-05 Binky Moon, LLC
+// vacations : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/vacations.html
 vacations
 
-// vana : 2014-12-11 Lifestyle Domain Holdings, Inc.
+// vana : D3 Registry LLC
+// https://www.iana.org/domains/root/db/vana.html
 vana
 
-// vanguard : 2015-09-03 The Vanguard Group, Inc.
+// vanguard : The Vanguard Group, Inc.
+// https://www.iana.org/domains/root/db/vanguard.html
 vanguard
 
-// vegas : 2014-01-16 Dot Vegas, Inc.
+// vegas : Dot Vegas, Inc.
+// https://www.iana.org/domains/root/db/vegas.html
 vegas
 
-// ventures : 2013-08-27 Binky Moon, LLC
+// ventures : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/ventures.html
 ventures
 
-// verisign : 2015-08-13 VeriSign, Inc.
+// verisign : VeriSign, Inc.
+// https://www.iana.org/domains/root/db/verisign.html
 verisign
 
-// versicherung : 2014-03-20 tldbox GmbH
+// versicherung : tldbox GmbH
+// https://www.iana.org/domains/root/db/versicherung.html
 versicherung
 
-// vet : 2014-03-06 Dog Beach, LLC
+// vet : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/vet.html
 vet
 
-// viajes : 2013-10-17 Binky Moon, LLC
+// viajes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/viajes.html
 viajes
 
-// video : 2014-10-16 Dog Beach, LLC
+// video : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/video.html
 video
 
-// vig : 2015-05-14 VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe
+// vig : VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe
+// https://www.iana.org/domains/root/db/vig.html
 vig
 
-// viking : 2015-04-02 Viking River Cruises (Bermuda) Ltd.
+// viking : Viking River Cruises (Bermuda) Ltd.
+// https://www.iana.org/domains/root/db/viking.html
 viking
 
-// villas : 2013-12-05 Binky Moon, LLC
+// villas : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/villas.html
 villas
 
-// vin : 2015-06-18 Binky Moon, LLC
+// vin : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/vin.html
 vin
 
-// vip : 2015-01-22 Registry Services, LLC
+// vip : Registry Services, LLC
+// https://www.iana.org/domains/root/db/vip.html
 vip
 
-// virgin : 2014-09-25 Virgin Enterprises Limited
+// virgin : Virgin Enterprises Limited
+// https://www.iana.org/domains/root/db/virgin.html
 virgin
 
-// visa : 2015-07-30 Visa Worldwide Pte. Limited
+// visa : Visa Worldwide Pte. Limited
+// https://www.iana.org/domains/root/db/visa.html
 visa
 
-// vision : 2013-12-05 Binky Moon, LLC
+// vision : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/vision.html
 vision
 
-// viva : 2014-11-07 Saudi Telecom Company
+// viva : Saudi Telecom Company
+// https://www.iana.org/domains/root/db/viva.html
 viva
 
-// vivo : 2015-07-31 Telefonica Brasil S.A.
+// vivo : Telefonica Brasil S.A.
+// https://www.iana.org/domains/root/db/vivo.html
 vivo
 
-// vlaanderen : 2014-02-06 DNS.be vzw
+// vlaanderen : DNS.be vzw
+// https://www.iana.org/domains/root/db/vlaanderen.html
 vlaanderen
 
-// vodka : 2013-12-19 Registry Services, LLC
+// vodka : Registry Services, LLC
+// https://www.iana.org/domains/root/db/vodka.html
 vodka
 
-// volkswagen : 2015-05-14 Volkswagen Group of America Inc.
-volkswagen
-
-// volvo : 2015-11-12 Volvo Holding Sverige Aktiebolag
+// volvo : Volvo Holding Sverige Aktiebolag
+// https://www.iana.org/domains/root/db/volvo.html
 volvo
 
-// vote : 2013-11-21 Monolith Registry LLC
+// vote : Monolith Registry LLC
+// https://www.iana.org/domains/root/db/vote.html
 vote
 
-// voting : 2013-11-13 Valuetainment Corp.
+// voting : Valuetainment Corp.
+// https://www.iana.org/domains/root/db/voting.html
 voting
 
-// voto : 2013-11-21 Monolith Registry LLC
+// voto : Monolith Registry LLC
+// https://www.iana.org/domains/root/db/voto.html
 voto
 
-// voyage : 2013-08-27 Binky Moon, LLC
+// voyage : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/voyage.html
 voyage
 
-// vuelos : 2015-03-05 Travel Reservations SRL
-vuelos
-
-// wales : 2014-05-08 Nominet UK
+// wales : Nominet UK
+// https://www.iana.org/domains/root/db/wales.html
 wales
 
-// walmart : 2015-07-31 Wal-Mart Stores, Inc.
+// walmart : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/walmart.html
 walmart
 
-// walter : 2014-11-13 Sandvik AB
+// walter : Sandvik AB
+// https://www.iana.org/domains/root/db/walter.html
 walter
 
-// wang : 2013-10-24 Zodiac Wang Limited
+// wang : Zodiac Wang Limited
+// https://www.iana.org/domains/root/db/wang.html
 wang
 
-// wanggou : 2014-12-18 Amazon Registry Services, Inc.
+// wanggou : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/wanggou.html
 wanggou
 
-// watch : 2013-11-14 Binky Moon, LLC
+// watch : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/watch.html
 watch
 
-// watches : 2014-12-22 Identity Digital Limited
+// watches : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/watches.html
 watches
 
-// weather : 2015-01-08 International Business Machines Corporation
+// weather : The Weather Company, LLC
+// https://www.iana.org/domains/root/db/weather.html
 weather
 
-// weatherchannel : 2015-03-12 International Business Machines Corporation
+// weatherchannel : The Weather Company, LLC
+// https://www.iana.org/domains/root/db/weatherchannel.html
 weatherchannel
 
-// webcam : 2014-01-23 dot Webcam Limited
+// webcam : dot Webcam Limited
+// https://www.iana.org/domains/root/db/webcam.html
 webcam
 
-// weber : 2015-06-04 Saint-Gobain Weber SA
+// weber : Saint-Gobain Weber SA
+// https://www.iana.org/domains/root/db/weber.html
 weber
 
-// website : 2014-04-03 Radix FZC
+// website : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/website.html
 website
 
-// wedding : 2014-04-24 Registry Services, LLC
+// wed
+// https://www.iana.org/domains/root/db/wed.html
+wed
+
+// wedding : Registry Services, LLC
+// https://www.iana.org/domains/root/db/wedding.html
 wedding
 
-// weibo : 2015-03-05 Sina Corporation
+// weibo : Sina Corporation
+// https://www.iana.org/domains/root/db/weibo.html
 weibo
 
-// weir : 2015-01-29 Weir Group IP Limited
+// weir : Weir Group IP Limited
+// https://www.iana.org/domains/root/db/weir.html
 weir
 
-// whoswho : 2014-02-20 Who's Who Registry
+// whoswho : Who's Who Registry
+// https://www.iana.org/domains/root/db/whoswho.html
 whoswho
 
-// wien : 2013-10-28 punkt.wien GmbH
+// wien : domainworx Service & Management GmbH
+// https://www.iana.org/domains/root/db/wien.html
 wien
 
-// wiki : 2013-11-07 Top Level Design, LLC
+// wiki : Registry Services, LLC
+// https://www.iana.org/domains/root/db/wiki.html
 wiki
 
-// williamhill : 2014-03-13 William Hill Organization Limited
+// williamhill : William Hill Organization Limited
+// https://www.iana.org/domains/root/db/williamhill.html
 williamhill
 
-// win : 2014-11-20 First Registry Limited
+// win : First Registry Limited
+// https://www.iana.org/domains/root/db/win.html
 win
 
-// windows : 2014-12-18 Microsoft Corporation
+// windows : Microsoft Corporation
+// https://www.iana.org/domains/root/db/windows.html
 windows
 
-// wine : 2015-06-18 Binky Moon, LLC
+// wine : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/wine.html
 wine
 
-// winners : 2015-07-16 The TJX Companies, Inc.
+// winners : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/winners.html
 winners
 
-// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC
+// wme : William Morris Endeavor Entertainment, LLC
+// https://www.iana.org/domains/root/db/wme.html
 wme
 
-// wolterskluwer : 2015-08-06 Wolters Kluwer N.V.
-wolterskluwer
-
-// woodside : 2015-07-09 Woodside Petroleum Limited
+// woodside : Woodside Petroleum Limited
+// https://www.iana.org/domains/root/db/woodside.html
 woodside
 
-// work : 2013-12-19 Registry Services, LLC
+// work : Registry Services, LLC
+// https://www.iana.org/domains/root/db/work.html
 work
 
-// works : 2013-11-14 Binky Moon, LLC
+// works : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/works.html
 works
 
-// world : 2014-06-12 Binky Moon, LLC
+// world : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/world.html
 world
 
-// wow : 2015-10-08 Amazon Registry Services, Inc.
+// wow : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/wow.html
 wow
 
-// wtc : 2013-12-19 World Trade Centers Association, Inc.
+// wtc : World Trade Centers Association, Inc.
+// https://www.iana.org/domains/root/db/wtc.html
 wtc
 
-// wtf : 2014-03-06 Binky Moon, LLC
+// wtf : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/wtf.html
 wtf
 
-// xbox : 2014-12-18 Microsoft Corporation
+// xbox : Microsoft Corporation
+// https://www.iana.org/domains/root/db/xbox.html
 xbox
 
-// xerox : 2014-10-24 Xerox DNHC LLC
+// xerox : Xerox DNHC LLC
+// https://www.iana.org/domains/root/db/xerox.html
 xerox
 
-// xfinity : 2015-07-09 Comcast IP Holdings I, LLC
-xfinity
-
-// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// xihuan : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/xihuan.html
 xihuan
 
-// xin : 2014-12-11 Elegant Leader Limited
+// xin : Elegant Leader Limited
+// https://www.iana.org/domains/root/db/xin.html
 xin
 
-// xn--11b4c3d : 2015-01-15 VeriSign Sarl
+// xn--11b4c3d : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--11b4c3d.html
 เค•เฅ‰เคฎ
 
-// xn--1ck2e1b : 2015-02-26 Amazon Registry Services, Inc.
+// xn--1ck2e1b : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--1ck2e1b.html
 ใ‚ปใƒผใƒซ
 
-// xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd.
+// xn--1qqw23a : Guangzhou YU Wei Information Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--1qqw23a.html
 ไฝ›ๅฑฑ
 
-// xn--30rr7y : 2014-06-12 Excellent First Limited
+// xn--30rr7y : Excellent First Limited
+// https://www.iana.org/domains/root/db/xn--30rr7y.html
 ๆ…ˆๅ–„
 
-// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
+// xn--3bst00m : Eagle Horizon Limited
+// https://www.iana.org/domains/root/db/xn--3bst00m.html
 ้›†ๅ›ข
 
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
+// xn--3ds443g : Beijing TLD Registry Technology Limited
+// https://www.iana.org/domains/root/db/xn--3ds443g.html
 ๅœจ็บฟ
 
-// xn--3pxu8k : 2015-01-15 VeriSign Sarl
+// xn--3pxu8k : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--3pxu8k.html
 ็‚น็œ‹
 
-// xn--42c2d9a : 2015-01-15 VeriSign Sarl
+// xn--42c2d9a : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--42c2d9a.html
 เธ„เธญเธก
 
-// xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
+// xn--45q11c : Zodiac Gemini Ltd
+// https://www.iana.org/domains/root/db/xn--45q11c.html
 ๅ…ซๅฆ
 
-// xn--4gbrim : 2013-10-04 Helium TLDs Ltd
+// xn--4gbrim : Helium TLDs Ltd
+// https://www.iana.org/domains/root/db/xn--4gbrim.html
 ู…ูˆู‚ุน
 
-// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
+// xn--55qw42g : China Organizational Name Administration Center
+// https://www.iana.org/domains/root/db/xn--55qw42g.html
 ๅ…ฌ็›Š
 
-// xn--55qx5d : 2013-11-14 China Internet Network Information Center (CNNIC)
+// xn--55qx5d : China Internet Network Information Center (CNNIC)
+// https://www.iana.org/domains/root/db/xn--55qx5d.html
 ๅ…ฌๅธ
 
-// xn--5su34j936bgsg : 2015-09-03 Shangriโ€La International Hotel Management Limited
+// xn--5su34j936bgsg : Shangriโ€La International Hotel Management Limited
+// https://www.iana.org/domains/root/db/xn--5su34j936bgsg.html
 ้ฆ™ๆ ผ้‡Œๆ‹‰
 
-// xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited
+// xn--5tzm5g : Global Website TLD Asia Limited
+// https://www.iana.org/domains/root/db/xn--5tzm5g.html
 ็ฝ‘็ซ™
 
-// xn--6frz82g : 2013-09-23 Identity Digital Limited
+// xn--6frz82g : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/xn--6frz82g.html
 ็งปๅŠจ
 
-// xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited
+// xn--6qq986b3xl : Tycoon Treasure Limited
+// https://www.iana.org/domains/root/db/xn--6qq986b3xl.html
 ๆˆ‘็ˆฑไฝ 
 
-// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// xn--80adxhks : Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// https://www.iana.org/domains/root/db/xn--80adxhks.html
 ะผะพัะบะฒะฐ
 
-// xn--80aqecdr1a : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// xn--80aqecdr1a : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/xn--80aqecdr1a.html
 ะบะฐั‚ะพะปะธะบ
 
-// xn--80asehdb : 2013-07-14 CORE Association
+// xn--80asehdb : CORE Association
+// https://www.iana.org/domains/root/db/xn--80asehdb.html
 ะพะฝะปะฐะนะฝ
 
-// xn--80aswg : 2013-07-14 CORE Association
+// xn--80aswg : CORE Association
+// https://www.iana.org/domains/root/db/xn--80aswg.html
 ัะฐะนั‚
 
-// xn--8y0a063a : 2015-03-26 China United Network Communications Corporation Limited
+// xn--8y0a063a : China United Network Communications Corporation Limited
+// https://www.iana.org/domains/root/db/xn--8y0a063a.html
 ่”้€š
 
-// xn--9dbq2a : 2015-01-15 VeriSign Sarl
+// xn--9dbq2a : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--9dbq2a.html
 ืงื•ื
 
-// xn--9et52u : 2014-06-12 RISE VICTORY LIMITED
+// xn--9et52u : RISE VICTORY LIMITED
+// https://www.iana.org/domains/root/db/xn--9et52u.html
 ๆ—ถๅฐš
 
-// xn--9krt00a : 2015-03-12 Sina Corporation
+// xn--9krt00a : Sina Corporation
+// https://www.iana.org/domains/root/db/xn--9krt00a.html
 ๅพฎๅš
 
-// xn--b4w605ferd : 2014-08-07 Temasek Holdings (Private) Limited
+// xn--b4w605ferd : Temasek Holdings (Private) Limited
+// https://www.iana.org/domains/root/db/xn--b4w605ferd.html
 ๆทก้ฉฌ้”ก
 
-// xn--bck1b9a5dre4c : 2015-02-26 Amazon Registry Services, Inc.
+// xn--bck1b9a5dre4c : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--bck1b9a5dre4c.html
 ใƒ•ใ‚กใƒƒใ‚ทใƒงใƒณ
 
-// xn--c1avg : 2013-11-14 Public Interest Registry
+// xn--c1avg : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--c1avg.html
 ะพั€ะณ
 
-// xn--c2br7g : 2015-01-15 VeriSign Sarl
+// xn--c2br7g : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--c2br7g.html
 เคจเฅ‡เคŸ
 
-// xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc.
+// xn--cck2b3b : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--cck2b3b.html
 ใ‚นใƒˆใ‚ข
 
-// xn--cckwcxetd : 2019-12-19 Amazon Registry Services, Inc.
+// xn--cckwcxetd : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--cckwcxetd.html
 ใ‚ขใƒžใ‚พใƒณ
 
-// xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
+// xn--cg4bki : SAMSUNG SDS CO., LTD
+// https://www.iana.org/domains/root/db/xn--cg4bki.html
 ์‚ผ์„ฑ
 
-// xn--czr694b : 2014-01-16 Internet DotTrademark Organisation Limited
+// xn--czr694b : Internet DotTrademark Organisation Limited
+// https://www.iana.org/domains/root/db/xn--czr694b.html
 ๅ•†ๆ ‡
 
-// xn--czrs0t : 2013-12-19 Binky Moon, LLC
+// xn--czrs0t : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--czrs0t.html
 ๅ•†ๅบ—
 
-// xn--czru2d : 2013-11-21 Zodiac Aquarius Limited
+// xn--czru2d : Zodiac Aquarius Limited
+// https://www.iana.org/domains/root/db/xn--czru2d.html
 ๅ•†ๅŸŽ
 
-// xn--d1acj3b : 2013-11-20 The Foundation for Network Initiatives โ€œThe Smart Internetโ€
+// xn--d1acj3b : The Foundation for Network Initiatives โ€œThe Smart Internetโ€
+// https://www.iana.org/domains/root/db/xn--d1acj3b.html
 ะดะตั‚ะธ
 
-// xn--eckvdtc9d : 2014-12-18 Amazon Registry Services, Inc.
+// xn--eckvdtc9d : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--eckvdtc9d.html
 ใƒใ‚คใƒณใƒˆ
 
-// xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd.
+// xn--efvy88h : Guangzhou YU Wei Information Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--efvy88h.html
 ๆ–ฐ้—ป
 
-// xn--fct429k : 2015-04-09 Amazon Registry Services, Inc.
+// xn--fct429k : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--fct429k.html
 ๅฎถ้›ป
 
-// xn--fhbei : 2015-01-15 VeriSign Sarl
+// xn--fhbei : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--fhbei.html
 ูƒูˆู…
 
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED OY
+// xn--fiq228c5hs : Beijing TLD Registry Technology Limited
+// https://www.iana.org/domains/root/db/xn--fiq228c5hs.html
 ไธญๆ–‡็ฝ‘
 
-// xn--fiq64b : 2013-10-14 CITIC Group Corporation
+// xn--fiq64b : CITIC Group Corporation
+// https://www.iana.org/domains/root/db/xn--fiq64b.html
 ไธญไฟก
 
-// xn--fjq720a : 2014-05-22 Binky Moon, LLC
+// xn--fjq720a : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--fjq720a.html
 ๅจฑไน
 
-// xn--flw351e : 2014-07-31 Charleston Road Registry Inc.
+// xn--flw351e : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/xn--flw351e.html
 ่ฐทๆญŒ
 
-// xn--fzys8d69uvgm : 2015-05-14 PCCW Enterprises Limited
+// xn--fzys8d69uvgm : PCCW Enterprises Limited
+// https://www.iana.org/domains/root/db/xn--fzys8d69uvgm.html
 ้›ป่จŠ็›ˆ็ง‘
 
-// xn--g2xx48c : 2015-01-30 Nawang Heli(Xiamen) Network Service Co., LTD.
+// xn--g2xx48c : Nawang Heli(Xiamen) Network Service Co., LTD.
+// https://www.iana.org/domains/root/db/xn--g2xx48c.html
 ่ดญ็‰ฉ
 
-// xn--gckr3f0f : 2015-02-26 Amazon Registry Services, Inc.
+// xn--gckr3f0f : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--gckr3f0f.html
 ใ‚ฏใƒฉใ‚ฆใƒ‰
 
-// xn--gk3at1e : 2015-10-08 Amazon Registry Services, Inc.
+// xn--gk3at1e : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--gk3at1e.html
 ้€š่ฒฉ
 
-// xn--hxt814e : 2014-05-15 Zodiac Taurus Limited
+// xn--hxt814e : Zodiac Taurus Limited
+// https://www.iana.org/domains/root/db/xn--hxt814e.html
 ็ฝ‘ๅบ—
 
-// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
+// xn--i1b6b1a6a2e : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--i1b6b1a6a2e.html
 เคธเค‚เค—เค เคจ
 
-// xn--imr513n : 2014-12-11 Internet DotTrademark Organisation Limited
+// xn--imr513n : Internet DotTrademark Organisation Limited
+// https://www.iana.org/domains/root/db/xn--imr513n.html
 ้คๅŽ…
 
-// xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC)
+// xn--io0a7i : China Internet Network Information Center (CNNIC)
+// https://www.iana.org/domains/root/db/xn--io0a7i.html
 ็ฝ‘็ปœ
 
-// xn--j1aef : 2015-01-15 VeriSign Sarl
+// xn--j1aef : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--j1aef.html
 ะบะพะผ
 
-// xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc.
+// xn--jlq480n2rg : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--jlq480n2rg.html
 ไบš้ฉฌ้€Š
 
-// xn--jvr189m : 2015-02-26 Amazon Registry Services, Inc.
+// xn--jvr189m : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--jvr189m.html
 ้ฃŸๅ“
 
-// xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V.
+// xn--kcrx77d1x4a : Koninklijke Philips N.V.
+// https://www.iana.org/domains/root/db/xn--kcrx77d1x4a.html
 ้ฃžๅˆฉๆตฆ
 
-// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd
+// xn--kput3i : Beijing RITT-Net Technology Development Co., Ltd
+// https://www.iana.org/domains/root/db/xn--kput3i.html
 ๆ‰‹ๆœบ
 
-// xn--mgba3a3ejt : 2014-11-20 Aramco Services Company
+// xn--mgba3a3ejt : Aramco Services Company
+// https://www.iana.org/domains/root/db/xn--mgba3a3ejt.html
 ุงุฑุงู…ูƒูˆ
 
-// xn--mgba7c0bbn0a : 2015-05-14 Crescent Holding GmbH
+// xn--mgba7c0bbn0a : Competrol (Luxembourg) Sarl
+// https://www.iana.org/domains/root/db/xn--mgba7c0bbn0a.html
 ุงู„ุนู„ูŠุงู†
 
-// xn--mgbaakc7dvf : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
-ุงุชุตุงู„ุงุช
-
-// xn--mgbab2bd : 2013-10-31 CORE Association
+// xn--mgbab2bd : CORE Association
+// https://www.iana.org/domains/root/db/xn--mgbab2bd.html
 ุจุงุฒุงุฑ
 
-// xn--mgbca7dzdo : 2015-07-30 Abu Dhabi Systems and Information Centre
+// xn--mgbca7dzdo : Abu Dhabi Systems and Information Centre
+// https://www.iana.org/domains/root/db/xn--mgbca7dzdo.html
 ุงุจูˆุธุจูŠ
 
-// xn--mgbi4ecexp : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// xn--mgbi4ecexp : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/xn--mgbi4ecexp.html
 ูƒุงุซูˆู„ูŠูƒ
 
-// xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// xn--mgbt3dhd
+// https://www.iana.org/domains/root/db/xn--mgbt3dhd.html
 ู‡ู…ุฑุงู‡
 
-// xn--mk1bu44c : 2015-01-15 VeriSign Sarl
+// xn--mk1bu44c : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--mk1bu44c.html
 ๋‹ท์ปด
 
-// xn--mxtq1m : 2014-03-06 Net-Chinese Co., Ltd.
+// xn--mxtq1m : Net-Chinese Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--mxtq1m.html
 ๆ”ฟๅบœ
 
-// xn--ngbc5azd : 2013-07-13 International Domain Registry Pty. Ltd.
+// xn--ngbc5azd : International Domain Registry Pty. Ltd.
+// https://www.iana.org/domains/root/db/xn--ngbc5azd.html
 ุดุจูƒุฉ
 
-// xn--ngbe9e0a : 2014-12-04 Kuwait Finance House
+// xn--ngbe9e0a : Kuwait Finance House
+// https://www.iana.org/domains/root/db/xn--ngbe9e0a.html
 ุจูŠุชูƒ
 
-// xn--ngbrx : 2015-11-12 League of Arab States
+// xn--ngbrx : League of Arab States
+// https://www.iana.org/domains/root/db/xn--ngbrx.html
 ุนุฑุจ
 
-// xn--nqv7f : 2013-11-14 Public Interest Registry
+// xn--nqv7f : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--nqv7f.html
 ๆœบๆž„
 
-// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry
+// xn--nqv7fs00ema : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--nqv7fs00ema.html
 ็ป„็ป‡ๆœบๆž„
 
-// xn--nyqy26a : 2014-11-07 Stable Tone Limited
+// xn--nyqy26a : Stable Tone Limited
+// https://www.iana.org/domains/root/db/xn--nyqy26a.html
 ๅฅๅบท
 
-// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited
+// xn--otu796d : Jiang Yu Liang Cai Technology Company Limited
+// https://www.iana.org/domains/root/db/xn--otu796d.html
 ๆ‹›่˜
 
-// xn--p1acf : 2013-12-12 Rusnames Limited
+// xn--p1acf : Rusnames Limited
+// https://www.iana.org/domains/root/db/xn--p1acf.html
 ั€ัƒั
 
-// xn--pssy2u : 2015-01-15 VeriSign Sarl
+// xn--pssy2u : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--pssy2u.html
 ๅคงๆ‹ฟ
 
-// xn--q9jyb4c : 2013-09-17 Charleston Road Registry Inc.
+// xn--q9jyb4c : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/xn--q9jyb4c.html
 ใฟใ‚“ใช
 
-// xn--qcka1pmc : 2014-07-31 Charleston Road Registry Inc.
+// xn--qcka1pmc : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/xn--qcka1pmc.html
 ใ‚ฐใƒผใ‚ฐใƒซ
 
-// xn--rhqv96g : 2013-09-11 Stable Tone Limited
+// xn--rhqv96g : Stable Tone Limited
+// https://www.iana.org/domains/root/db/xn--rhqv96g.html
 ไธ–็•Œ
 
-// xn--rovu88b : 2015-02-26 Amazon Registry Services, Inc.
+// xn--rovu88b : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--rovu88b.html
 ๆ›ธ็ฑ
 
-// xn--ses554g : 2014-01-16 KNET Co., Ltd.
+// xn--ses554g : KNET Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--ses554g.html
 ็ฝ‘ๅ€
 
-// xn--t60b56a : 2015-01-15 VeriSign Sarl
+// xn--t60b56a : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--t60b56a.html
 ๋‹ท๋„ท
 
-// xn--tckwe : 2015-01-15 VeriSign Sarl
+// xn--tckwe : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--tckwe.html
 ใ‚ณใƒ 
 
-// xn--tiq49xqyj : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// xn--tiq49xqyj : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/xn--tiq49xqyj.html
 ๅคฉไธปๆ•™
 
-// xn--unup4y : 2013-07-14 Binky Moon, LLC
+// xn--unup4y : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--unup4y.html
 ๆธธๆˆ
 
-// xn--vermgensberater-ctb : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// xn--vermgensberater-ctb : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/xn--vermgensberater-ctb.html
 vermรถgensberater
 
-// xn--vermgensberatung-pwb : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// xn--vermgensberatung-pwb : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/xn--vermgensberatung-pwb.html
 vermรถgensberatung
 
-// xn--vhquv : 2013-08-27 Binky Moon, LLC
+// xn--vhquv : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--vhquv.html
 ไผไธš
 
-// xn--vuq861b : 2014-10-16 Beijing Tele-info Network Technology Co., Ltd.
+// xn--vuq861b : Beijing Tele-info Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--vuq861b.html
 ไฟกๆฏ
 
-// xn--w4r85el8fhu5dnra : 2015-04-30 Kerry Trading Co. Limited
+// xn--w4r85el8fhu5dnra : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/xn--w4r85el8fhu5dnra.html
 ๅ˜‰้‡Œๅคง้…’ๅบ—
 
-// xn--w4rs40l : 2015-07-30 Kerry Trading Co. Limited
+// xn--w4rs40l : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/xn--w4rs40l.html
 ๅ˜‰้‡Œ
 
-// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd.
+// xn--xhq521b : Guangzhou YU Wei Information Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--xhq521b.html
 ๅนฟไธœ
 
-// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center
+// xn--zfr164b : China Organizational Name Administration Center
+// https://www.iana.org/domains/root/db/xn--zfr164b.html
 ๆ”ฟๅŠก
 
-// xyz : 2013-12-05 XYZ.COM LLC
+// xyz : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/xyz.html
 xyz
 
-// yachts : 2014-01-09 XYZ.COM LLC
+// yachts : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/yachts.html
 yachts
 
-// yahoo : 2015-04-02 Oath Inc.
+// yahoo : Yahoo Inc.
+// https://www.iana.org/domains/root/db/yahoo.html
 yahoo
 
-// yamaxun : 2014-12-18 Amazon Registry Services, Inc.
+// yamaxun : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/yamaxun.html
 yamaxun
 
-// yandex : 2014-04-10 Yandex Europe B.V.
+// yandex : YANDEX, LLC
+// https://www.iana.org/domains/root/db/yandex.html
 yandex
 
-// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
+// yodobashi : YODOBASHI CAMERA CO.,LTD.
+// https://www.iana.org/domains/root/db/yodobashi.html
 yodobashi
 
-// yoga : 2014-05-29 Registry Services, LLC
+// yoga : Registry Services, LLC
+// https://www.iana.org/domains/root/db/yoga.html
 yoga
 
-// yokohama : 2013-12-12 GMO Registry, Inc.
+// yokohama : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/yokohama.html
 yokohama
 
-// you : 2015-04-09 Amazon Registry Services, Inc.
+// you : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/you.html
 you
 
-// youtube : 2014-05-01 Charleston Road Registry Inc.
+// youtube : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/youtube.html
 youtube
 
-// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// yun : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/yun.html
 yun
 
-// zappos : 2015-06-25 Amazon Registry Services, Inc.
+// zappos : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/zappos.html
 zappos
 
-// zara : 2014-11-07 Industria de Diseรฑo Textil, S.A. (INDITEX, S.A.)
+// zara : Industria de Diseรฑo Textil, S.A. (INDITEX, S.A.)
+// https://www.iana.org/domains/root/db/zara.html
 zara
 
-// zero : 2014-12-18 Amazon Registry Services, Inc.
+// zero : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/zero.html
 zero
 
-// zip : 2014-05-08 Charleston Road Registry Inc.
+// zip : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/zip.html
 zip
 
-// zone : 2013-11-14 Binky Moon, LLC
+// zone : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/zone.html
 zone
 
-// zuerich : 2014-11-07 Kanton Zรผrich (Canton of Zurich)
+// zuerich : Kanton Zรผrich (Canton of Zurich)
+// https://www.iana.org/domains/root/db/zuerich.html
 zuerich
 
-
 // ===END ICANN DOMAINS===
+
 // ===BEGIN PRIVATE DOMAINS===
+
 // (Note: these are in alphabetical order by company name)
 
+// .KRD : https://nic.krd
+co.krd
+edu.krd
+
+// .pl domains (grandfathered)
+art.pl
+gliwice.pl
+krakow.pl
+poznan.pl
+wroc.pl
+zakopane.pl
+
 // 1GB LLC : https://www.1gb.ua/
 // Submitted by 1GB LLC <noc@1gb.com.ua>
 cc.ua
 inf.ua
 ltd.ua
 
-// 611coin : https://611project.org/
+// 611 blockchain domain name system : https://sixone.one/
 611.to
 
-// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
-// Submitted by Aaron Marais <its_me@aaronleem.co.za>
-graphox.us
-
-// accesso Technology Group, plc. : https://accesso.com/
-// Submitted by accesso Team <accessoecommerce@accesso.com>
-*.devcdnaccesso.com
+// A2 Hosting
+// Submitted by Tyler Hall <sysadmin@a2hosting.com>
+a2hosted.com
+cpserver.com
 
 // Acorn Labs : https://acorn.io
 // Submitted by Craig Jellick <domains@acorn.io>
 *.on-acorn.io
 
-// ActiveTrail: https://www.activetrail.biz/
+// ActiveTrail : https://www.activetrail.biz/
 // Submitted by Ofer Kalaora <postmaster@activetrail.com>
 activetrail.biz
 
+// Adaptable.io : https://adaptable.io
+// Submitted by Mark Terrel <support@adaptable.io>
+adaptable.app
+
+// addr.tools : https://addr.tools/
+// Submitted by Brian Shea <publicsuffixlist@addr.tools>
+myaddr.dev
+myaddr.io
+dyn.addr.tools
+myaddr.tools
+
 // Adobe : https://www.adobe.com/
 // Submitted by Ian Boston <boston@adobe.com> and Lars Trieloff <trieloff@adobe.com>
 adobeaemcloud.com
 *.dev.adobeaemcloud.com
+aem.live
 hlx.live
 adobeaemcloud.net
+aem.network
+aem.page
 hlx.page
-hlx3.page
+aem.reviews
 
 // Adobe Developer Platform : https://developer.adobe.com
 // Submitted by Jesse MacFadyen<jessem@adobe.com>
 adobeio-static.net
 adobeioruntime.net
 
+// Africa.com Web Solutions Ltd : https://registry.africa.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+africa.com
+
+// AgentbaseAI Inc. : https://assistant-ui.com
+// Submitted by Simon Farshid <security@assistant-ui.com>
+*.auiusercontent.com
+
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
 
-// Airkit : https://www.airkit.com/
-// Submitted by Grant Cooksey <security@airkit.com>
-airkitapps.com
-airkitapps-au.com
-airkitapps.eu
-
-// Aiven: https://aiven.io/
-// Submitted by Etienne Stalmans <security@aiven.io>
+// Aiven : https://aiven.io/
+// Submitted by Aiven Security Team <security+appdomains@aiven.io>
+aiven.app
 aivencloud.com
 
 // Akamai : https://www.akamai.com/
@@ -10723,11 +11366,17 @@ barsy.ca
 *.compute.estate
 *.alces.network
 
+// Alibaba Cloud API Gateway
+// Submitted by Alibaba Cloud Security <cloud_product_security_team@alibaba-inc.com>
+alibabacloudcs.com
+ms.fun
+ms.show
+
 // all-inkl.com : https://all-inkl.com
 // Submitted by Werner Kaltofen <wk@all-inkl.com>
 kasserver.com
 
-// Altervista: https://www.altervista.org
+// Altervista : https://www.altervista.org
 // Submitted by Carlo Cannas <tech_staff@altervista.it>
 altervista.org
 
@@ -10743,60 +11392,533 @@ myamaze.net
 // Submitted by AWS Security <psl-maintainers@amazon.com>
 // Subsections of Amazon/subsidiaries will appear until "concludes" tag
 
+// Amazon API Gateway
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 6a4f5a95-8c7d-4077-a7af-9cf1abec0a53
+execute-api.cn-north-1.amazonaws.com.cn
+execute-api.cn-northwest-1.amazonaws.com.cn
+execute-api.af-south-1.amazonaws.com
+execute-api.ap-east-1.amazonaws.com
+execute-api.ap-northeast-1.amazonaws.com
+execute-api.ap-northeast-2.amazonaws.com
+execute-api.ap-northeast-3.amazonaws.com
+execute-api.ap-south-1.amazonaws.com
+execute-api.ap-south-2.amazonaws.com
+execute-api.ap-southeast-1.amazonaws.com
+execute-api.ap-southeast-2.amazonaws.com
+execute-api.ap-southeast-3.amazonaws.com
+execute-api.ap-southeast-4.amazonaws.com
+execute-api.ap-southeast-5.amazonaws.com
+execute-api.ca-central-1.amazonaws.com
+execute-api.ca-west-1.amazonaws.com
+execute-api.eu-central-1.amazonaws.com
+execute-api.eu-central-2.amazonaws.com
+execute-api.eu-north-1.amazonaws.com
+execute-api.eu-south-1.amazonaws.com
+execute-api.eu-south-2.amazonaws.com
+execute-api.eu-west-1.amazonaws.com
+execute-api.eu-west-2.amazonaws.com
+execute-api.eu-west-3.amazonaws.com
+execute-api.il-central-1.amazonaws.com
+execute-api.me-central-1.amazonaws.com
+execute-api.me-south-1.amazonaws.com
+execute-api.sa-east-1.amazonaws.com
+execute-api.us-east-1.amazonaws.com
+execute-api.us-east-2.amazonaws.com
+execute-api.us-gov-east-1.amazonaws.com
+execute-api.us-gov-west-1.amazonaws.com
+execute-api.us-west-1.amazonaws.com
+execute-api.us-west-2.amazonaws.com
+
 // Amazon CloudFront
 // Submitted by Donavan Miller <donavanm@amazon.com>
 // Reference: 54144616-fd49-4435-8535-19c6a601bdb3
 cloudfront.net
 
+// Amazon Cognito
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: d7d4a954-976e-403e-a010-de9ed0cfbbd1
+auth.af-south-1.amazoncognito.com
+auth.ap-east-1.amazoncognito.com
+auth.ap-northeast-1.amazoncognito.com
+auth.ap-northeast-2.amazoncognito.com
+auth.ap-northeast-3.amazoncognito.com
+auth.ap-south-1.amazoncognito.com
+auth.ap-south-2.amazoncognito.com
+auth.ap-southeast-1.amazoncognito.com
+auth.ap-southeast-2.amazoncognito.com
+auth.ap-southeast-3.amazoncognito.com
+auth.ap-southeast-4.amazoncognito.com
+auth.ap-southeast-5.amazoncognito.com
+auth.ap-southeast-7.amazoncognito.com
+auth.ca-central-1.amazoncognito.com
+auth.ca-west-1.amazoncognito.com
+auth.eu-central-1.amazoncognito.com
+auth.eu-central-2.amazoncognito.com
+auth.eu-north-1.amazoncognito.com
+auth.eu-south-1.amazoncognito.com
+auth.eu-south-2.amazoncognito.com
+auth.eu-west-1.amazoncognito.com
+auth.eu-west-2.amazoncognito.com
+auth.eu-west-3.amazoncognito.com
+auth.il-central-1.amazoncognito.com
+auth.me-central-1.amazoncognito.com
+auth.me-south-1.amazoncognito.com
+auth.mx-central-1.amazoncognito.com
+auth.sa-east-1.amazoncognito.com
+auth.us-east-1.amazoncognito.com
+auth-fips.us-east-1.amazoncognito.com
+auth.us-east-2.amazoncognito.com
+auth-fips.us-east-2.amazoncognito.com
+auth-fips.us-gov-east-1.amazoncognito.com
+auth-fips.us-gov-west-1.amazoncognito.com
+auth.us-west-1.amazoncognito.com
+auth-fips.us-west-1.amazoncognito.com
+auth.us-west-2.amazoncognito.com
+auth-fips.us-west-2.amazoncognito.com
+auth.cognito-idp.eusc-de-east-1.on.amazonwebservices.eu
+
 // Amazon EC2
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
 // Reference: 4c38fa71-58ac-4768-99e5-689c1767e537
+*.compute.amazonaws.com.cn
 *.compute.amazonaws.com
 *.compute-1.amazonaws.com
-*.compute.amazonaws.com.cn
 us-east-1.amazonaws.com
 
+// Amazon EMR
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 82f43f9f-bbb8-400e-8349-854f5a62f20d
+emrappui-prod.cn-north-1.amazonaws.com.cn
+emrnotebooks-prod.cn-north-1.amazonaws.com.cn
+emrstudio-prod.cn-north-1.amazonaws.com.cn
+emrappui-prod.cn-northwest-1.amazonaws.com.cn
+emrnotebooks-prod.cn-northwest-1.amazonaws.com.cn
+emrstudio-prod.cn-northwest-1.amazonaws.com.cn
+emrappui-prod.af-south-1.amazonaws.com
+emrnotebooks-prod.af-south-1.amazonaws.com
+emrstudio-prod.af-south-1.amazonaws.com
+emrappui-prod.ap-east-1.amazonaws.com
+emrnotebooks-prod.ap-east-1.amazonaws.com
+emrstudio-prod.ap-east-1.amazonaws.com
+emrappui-prod.ap-northeast-1.amazonaws.com
+emrnotebooks-prod.ap-northeast-1.amazonaws.com
+emrstudio-prod.ap-northeast-1.amazonaws.com
+emrappui-prod.ap-northeast-2.amazonaws.com
+emrnotebooks-prod.ap-northeast-2.amazonaws.com
+emrstudio-prod.ap-northeast-2.amazonaws.com
+emrappui-prod.ap-northeast-3.amazonaws.com
+emrnotebooks-prod.ap-northeast-3.amazonaws.com
+emrstudio-prod.ap-northeast-3.amazonaws.com
+emrappui-prod.ap-south-1.amazonaws.com
+emrnotebooks-prod.ap-south-1.amazonaws.com
+emrstudio-prod.ap-south-1.amazonaws.com
+emrappui-prod.ap-south-2.amazonaws.com
+emrnotebooks-prod.ap-south-2.amazonaws.com
+emrstudio-prod.ap-south-2.amazonaws.com
+emrappui-prod.ap-southeast-1.amazonaws.com
+emrnotebooks-prod.ap-southeast-1.amazonaws.com
+emrstudio-prod.ap-southeast-1.amazonaws.com
+emrappui-prod.ap-southeast-2.amazonaws.com
+emrnotebooks-prod.ap-southeast-2.amazonaws.com
+emrstudio-prod.ap-southeast-2.amazonaws.com
+emrappui-prod.ap-southeast-3.amazonaws.com
+emrnotebooks-prod.ap-southeast-3.amazonaws.com
+emrstudio-prod.ap-southeast-3.amazonaws.com
+emrappui-prod.ap-southeast-4.amazonaws.com
+emrnotebooks-prod.ap-southeast-4.amazonaws.com
+emrstudio-prod.ap-southeast-4.amazonaws.com
+emrappui-prod.ca-central-1.amazonaws.com
+emrnotebooks-prod.ca-central-1.amazonaws.com
+emrstudio-prod.ca-central-1.amazonaws.com
+emrappui-prod.ca-west-1.amazonaws.com
+emrnotebooks-prod.ca-west-1.amazonaws.com
+emrstudio-prod.ca-west-1.amazonaws.com
+emrappui-prod.eu-central-1.amazonaws.com
+emrnotebooks-prod.eu-central-1.amazonaws.com
+emrstudio-prod.eu-central-1.amazonaws.com
+emrappui-prod.eu-central-2.amazonaws.com
+emrnotebooks-prod.eu-central-2.amazonaws.com
+emrstudio-prod.eu-central-2.amazonaws.com
+emrappui-prod.eu-north-1.amazonaws.com
+emrnotebooks-prod.eu-north-1.amazonaws.com
+emrstudio-prod.eu-north-1.amazonaws.com
+emrappui-prod.eu-south-1.amazonaws.com
+emrnotebooks-prod.eu-south-1.amazonaws.com
+emrstudio-prod.eu-south-1.amazonaws.com
+emrappui-prod.eu-south-2.amazonaws.com
+emrnotebooks-prod.eu-south-2.amazonaws.com
+emrstudio-prod.eu-south-2.amazonaws.com
+emrappui-prod.eu-west-1.amazonaws.com
+emrnotebooks-prod.eu-west-1.amazonaws.com
+emrstudio-prod.eu-west-1.amazonaws.com
+emrappui-prod.eu-west-2.amazonaws.com
+emrnotebooks-prod.eu-west-2.amazonaws.com
+emrstudio-prod.eu-west-2.amazonaws.com
+emrappui-prod.eu-west-3.amazonaws.com
+emrnotebooks-prod.eu-west-3.amazonaws.com
+emrstudio-prod.eu-west-3.amazonaws.com
+emrappui-prod.il-central-1.amazonaws.com
+emrnotebooks-prod.il-central-1.amazonaws.com
+emrstudio-prod.il-central-1.amazonaws.com
+emrappui-prod.me-central-1.amazonaws.com
+emrnotebooks-prod.me-central-1.amazonaws.com
+emrstudio-prod.me-central-1.amazonaws.com
+emrappui-prod.me-south-1.amazonaws.com
+emrnotebooks-prod.me-south-1.amazonaws.com
+emrstudio-prod.me-south-1.amazonaws.com
+emrappui-prod.sa-east-1.amazonaws.com
+emrnotebooks-prod.sa-east-1.amazonaws.com
+emrstudio-prod.sa-east-1.amazonaws.com
+emrappui-prod.us-east-1.amazonaws.com
+emrnotebooks-prod.us-east-1.amazonaws.com
+emrstudio-prod.us-east-1.amazonaws.com
+emrappui-prod.us-east-2.amazonaws.com
+emrnotebooks-prod.us-east-2.amazonaws.com
+emrstudio-prod.us-east-2.amazonaws.com
+emrappui-prod.us-gov-east-1.amazonaws.com
+emrnotebooks-prod.us-gov-east-1.amazonaws.com
+emrstudio-prod.us-gov-east-1.amazonaws.com
+emrappui-prod.us-gov-west-1.amazonaws.com
+emrnotebooks-prod.us-gov-west-1.amazonaws.com
+emrstudio-prod.us-gov-west-1.amazonaws.com
+emrappui-prod.us-west-1.amazonaws.com
+emrnotebooks-prod.us-west-1.amazonaws.com
+emrstudio-prod.us-west-1.amazonaws.com
+emrappui-prod.us-west-2.amazonaws.com
+emrnotebooks-prod.us-west-2.amazonaws.com
+emrstudio-prod.us-west-2.amazonaws.com
+
+// Amazon Managed Workflows for Apache Airflow
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: bfd043cc-2816-451d-894e-612c6b61a438
+*.airflow.af-south-1.on.aws
+*.airflow.ap-east-1.on.aws
+*.airflow.ap-northeast-1.on.aws
+*.airflow.ap-northeast-2.on.aws
+*.airflow.ap-northeast-3.on.aws
+*.airflow.ap-south-1.on.aws
+*.airflow.ap-south-2.on.aws
+*.airflow.ap-southeast-1.on.aws
+*.airflow.ap-southeast-2.on.aws
+*.airflow.ap-southeast-3.on.aws
+*.airflow.ap-southeast-4.on.aws
+*.airflow.ap-southeast-5.on.aws
+*.airflow.ca-central-1.on.aws
+*.airflow.ca-west-1.on.aws
+*.airflow.eu-central-1.on.aws
+*.airflow.eu-central-2.on.aws
+*.airflow.eu-north-1.on.aws
+*.airflow.eu-south-1.on.aws
+*.airflow.eu-south-2.on.aws
+*.airflow.eu-west-1.on.aws
+*.airflow.eu-west-2.on.aws
+*.airflow.eu-west-3.on.aws
+*.airflow.il-central-1.on.aws
+*.airflow.me-central-1.on.aws
+*.airflow.me-south-1.on.aws
+*.airflow.sa-east-1.on.aws
+*.airflow.us-east-1.on.aws
+*.airflow.us-east-2.on.aws
+*.airflow.us-west-1.on.aws
+*.airflow.us-west-2.on.aws
+*.cn-north-1.airflow.amazonaws.com.cn
+*.cn-northwest-1.airflow.amazonaws.com.cn
+*.airflow.cn-north-1.on.amazonwebservices.com.cn
+*.airflow.cn-northwest-1.on.amazonwebservices.com.cn
+*.af-south-1.airflow.amazonaws.com
+*.ap-east-1.airflow.amazonaws.com
+*.ap-northeast-1.airflow.amazonaws.com
+*.ap-northeast-2.airflow.amazonaws.com
+*.ap-northeast-3.airflow.amazonaws.com
+*.ap-south-1.airflow.amazonaws.com
+*.ap-south-2.airflow.amazonaws.com
+*.ap-southeast-1.airflow.amazonaws.com
+*.ap-southeast-2.airflow.amazonaws.com
+*.ap-southeast-3.airflow.amazonaws.com
+*.ap-southeast-4.airflow.amazonaws.com
+*.ap-southeast-5.airflow.amazonaws.com
+*.ap-southeast-7.airflow.amazonaws.com
+*.ca-central-1.airflow.amazonaws.com
+*.ca-west-1.airflow.amazonaws.com
+*.eu-central-1.airflow.amazonaws.com
+*.eu-central-2.airflow.amazonaws.com
+*.eu-north-1.airflow.amazonaws.com
+*.eu-south-1.airflow.amazonaws.com
+*.eu-south-2.airflow.amazonaws.com
+*.eu-west-1.airflow.amazonaws.com
+*.eu-west-2.airflow.amazonaws.com
+*.eu-west-3.airflow.amazonaws.com
+*.il-central-1.airflow.amazonaws.com
+*.me-central-1.airflow.amazonaws.com
+*.me-south-1.airflow.amazonaws.com
+*.sa-east-1.airflow.amazonaws.com
+*.us-east-1.airflow.amazonaws.com
+*.us-east-2.airflow.amazonaws.com
+*.us-west-1.airflow.amazonaws.com
+*.us-west-2.airflow.amazonaws.com
+
+// Amazon Relational Database Service
+// Submitted by: AWS Security <psl-maintainers@amazon.com>
+// Reference: 5aa87906-fd4f-4831-8727-4ffca6094159
+*.rds.cn-north-1.amazonaws.com.cn
+*.rds.cn-northwest-1.amazonaws.com.cn
+*.af-south-1.rds.amazonaws.com
+*.ap-east-1.rds.amazonaws.com
+*.ap-east-2.rds.amazonaws.com
+*.ap-northeast-1.rds.amazonaws.com
+*.ap-northeast-2.rds.amazonaws.com
+*.ap-northeast-3.rds.amazonaws.com
+*.ap-south-1.rds.amazonaws.com
+*.ap-south-2.rds.amazonaws.com
+*.ap-southeast-1.rds.amazonaws.com
+*.ap-southeast-2.rds.amazonaws.com
+*.ap-southeast-3.rds.amazonaws.com
+*.ap-southeast-4.rds.amazonaws.com
+*.ap-southeast-5.rds.amazonaws.com
+*.ap-southeast-6.rds.amazonaws.com
+*.ap-southeast-7.rds.amazonaws.com
+*.ca-central-1.rds.amazonaws.com
+*.ca-west-1.rds.amazonaws.com
+*.eu-central-1.rds.amazonaws.com
+*.eu-central-2.rds.amazonaws.com
+*.eu-west-1.rds.amazonaws.com
+*.eu-west-2.rds.amazonaws.com
+*.eu-west-3.rds.amazonaws.com
+*.il-central-1.rds.amazonaws.com
+*.me-central-1.rds.amazonaws.com
+*.me-south-1.rds.amazonaws.com
+*.mx-central-1.rds.amazonaws.com
+*.sa-east-1.rds.amazonaws.com
+*.us-east-1.rds.amazonaws.com
+*.us-east-2.rds.amazonaws.com
+*.us-gov-east-1.rds.amazonaws.com
+*.us-gov-west-1.rds.amazonaws.com
+*.us-northeast-1.rds.amazonaws.com
+*.us-west-1.rds.amazonaws.com
+*.us-west-2.rds.amazonaws.com
+
 // Amazon S3
-// Submitted by Luke Wells <psl-maintainers@amazon.com>
-// Reference: d068bd97-f0a9-4838-a6d8-954b622ef4ae
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 6f374c1c-1cc9-47de-8b2a-69ca56a3a3b6
+s3.dualstack.cn-north-1.amazonaws.com.cn
+s3-accesspoint.dualstack.cn-north-1.amazonaws.com.cn
+s3-website.dualstack.cn-north-1.amazonaws.com.cn
 s3.cn-north-1.amazonaws.com.cn
+s3-accesspoint.cn-north-1.amazonaws.com.cn
+s3-deprecated.cn-north-1.amazonaws.com.cn
+s3-object-lambda.cn-north-1.amazonaws.com.cn
+s3-website.cn-north-1.amazonaws.com.cn
+s3.dualstack.cn-northwest-1.amazonaws.com.cn
+s3-accesspoint.dualstack.cn-northwest-1.amazonaws.com.cn
+s3.cn-northwest-1.amazonaws.com.cn
+s3-accesspoint.cn-northwest-1.amazonaws.com.cn
+s3-object-lambda.cn-northwest-1.amazonaws.com.cn
+s3-website.cn-northwest-1.amazonaws.com.cn
+s3.dualstack.af-south-1.amazonaws.com
+s3-accesspoint.dualstack.af-south-1.amazonaws.com
+s3-website.dualstack.af-south-1.amazonaws.com
+s3.af-south-1.amazonaws.com
+s3-accesspoint.af-south-1.amazonaws.com
+s3-object-lambda.af-south-1.amazonaws.com
+s3-website.af-south-1.amazonaws.com
+s3.dualstack.ap-east-1.amazonaws.com
+s3-accesspoint.dualstack.ap-east-1.amazonaws.com
+s3.ap-east-1.amazonaws.com
+s3-accesspoint.ap-east-1.amazonaws.com
+s3-object-lambda.ap-east-1.amazonaws.com
+s3-website.ap-east-1.amazonaws.com
 s3.dualstack.ap-northeast-1.amazonaws.com
+s3-accesspoint.dualstack.ap-northeast-1.amazonaws.com
+s3-website.dualstack.ap-northeast-1.amazonaws.com
+s3.ap-northeast-1.amazonaws.com
+s3-accesspoint.ap-northeast-1.amazonaws.com
+s3-object-lambda.ap-northeast-1.amazonaws.com
+s3-website.ap-northeast-1.amazonaws.com
 s3.dualstack.ap-northeast-2.amazonaws.com
+s3-accesspoint.dualstack.ap-northeast-2.amazonaws.com
+s3-website.dualstack.ap-northeast-2.amazonaws.com
 s3.ap-northeast-2.amazonaws.com
+s3-accesspoint.ap-northeast-2.amazonaws.com
+s3-object-lambda.ap-northeast-2.amazonaws.com
 s3-website.ap-northeast-2.amazonaws.com
+s3.dualstack.ap-northeast-3.amazonaws.com
+s3-accesspoint.dualstack.ap-northeast-3.amazonaws.com
+s3-website.dualstack.ap-northeast-3.amazonaws.com
+s3.ap-northeast-3.amazonaws.com
+s3-accesspoint.ap-northeast-3.amazonaws.com
+s3-object-lambda.ap-northeast-3.amazonaws.com
+s3-website.ap-northeast-3.amazonaws.com
 s3.dualstack.ap-south-1.amazonaws.com
+s3-accesspoint.dualstack.ap-south-1.amazonaws.com
+s3-website.dualstack.ap-south-1.amazonaws.com
 s3.ap-south-1.amazonaws.com
+s3-accesspoint.ap-south-1.amazonaws.com
+s3-object-lambda.ap-south-1.amazonaws.com
 s3-website.ap-south-1.amazonaws.com
+s3.dualstack.ap-south-2.amazonaws.com
+s3-accesspoint.dualstack.ap-south-2.amazonaws.com
+s3-website.dualstack.ap-south-2.amazonaws.com
+s3.ap-south-2.amazonaws.com
+s3-accesspoint.ap-south-2.amazonaws.com
+s3-object-lambda.ap-south-2.amazonaws.com
+s3-website.ap-south-2.amazonaws.com
 s3.dualstack.ap-southeast-1.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-1.amazonaws.com
+s3-website.dualstack.ap-southeast-1.amazonaws.com
+s3.ap-southeast-1.amazonaws.com
+s3-accesspoint.ap-southeast-1.amazonaws.com
+s3-object-lambda.ap-southeast-1.amazonaws.com
+s3-website.ap-southeast-1.amazonaws.com
 s3.dualstack.ap-southeast-2.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-2.amazonaws.com
+s3-website.dualstack.ap-southeast-2.amazonaws.com
+s3.ap-southeast-2.amazonaws.com
+s3-accesspoint.ap-southeast-2.amazonaws.com
+s3-object-lambda.ap-southeast-2.amazonaws.com
+s3-website.ap-southeast-2.amazonaws.com
+s3.dualstack.ap-southeast-3.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-3.amazonaws.com
+s3-website.dualstack.ap-southeast-3.amazonaws.com
+s3.ap-southeast-3.amazonaws.com
+s3-accesspoint.ap-southeast-3.amazonaws.com
+s3-object-lambda.ap-southeast-3.amazonaws.com
+s3-website.ap-southeast-3.amazonaws.com
+s3.dualstack.ap-southeast-4.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-4.amazonaws.com
+s3-website.dualstack.ap-southeast-4.amazonaws.com
+s3.ap-southeast-4.amazonaws.com
+s3-accesspoint.ap-southeast-4.amazonaws.com
+s3-object-lambda.ap-southeast-4.amazonaws.com
+s3-website.ap-southeast-4.amazonaws.com
+s3.dualstack.ap-southeast-5.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-5.amazonaws.com
+s3-website.dualstack.ap-southeast-5.amazonaws.com
+s3.ap-southeast-5.amazonaws.com
+s3-accesspoint.ap-southeast-5.amazonaws.com
+s3-deprecated.ap-southeast-5.amazonaws.com
+s3-object-lambda.ap-southeast-5.amazonaws.com
+s3-website.ap-southeast-5.amazonaws.com
 s3.dualstack.ca-central-1.amazonaws.com
+s3-accesspoint.dualstack.ca-central-1.amazonaws.com
+s3-accesspoint-fips.dualstack.ca-central-1.amazonaws.com
+s3-fips.dualstack.ca-central-1.amazonaws.com
+s3-website.dualstack.ca-central-1.amazonaws.com
 s3.ca-central-1.amazonaws.com
+s3-accesspoint.ca-central-1.amazonaws.com
+s3-accesspoint-fips.ca-central-1.amazonaws.com
+s3-fips.ca-central-1.amazonaws.com
+s3-object-lambda.ca-central-1.amazonaws.com
 s3-website.ca-central-1.amazonaws.com
+s3.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.ca-west-1.amazonaws.com
+s3-fips.dualstack.ca-west-1.amazonaws.com
+s3-website.dualstack.ca-west-1.amazonaws.com
+s3.ca-west-1.amazonaws.com
+s3-accesspoint.ca-west-1.amazonaws.com
+s3-accesspoint-fips.ca-west-1.amazonaws.com
+s3-fips.ca-west-1.amazonaws.com
+s3-object-lambda.ca-west-1.amazonaws.com
+s3-website.ca-west-1.amazonaws.com
 s3.dualstack.eu-central-1.amazonaws.com
+s3-accesspoint.dualstack.eu-central-1.amazonaws.com
+s3-website.dualstack.eu-central-1.amazonaws.com
 s3.eu-central-1.amazonaws.com
+s3-accesspoint.eu-central-1.amazonaws.com
+s3-object-lambda.eu-central-1.amazonaws.com
 s3-website.eu-central-1.amazonaws.com
+s3.dualstack.eu-central-2.amazonaws.com
+s3-accesspoint.dualstack.eu-central-2.amazonaws.com
+s3-website.dualstack.eu-central-2.amazonaws.com
+s3.eu-central-2.amazonaws.com
+s3-accesspoint.eu-central-2.amazonaws.com
+s3-object-lambda.eu-central-2.amazonaws.com
+s3-website.eu-central-2.amazonaws.com
+s3.dualstack.eu-north-1.amazonaws.com
+s3-accesspoint.dualstack.eu-north-1.amazonaws.com
+s3.eu-north-1.amazonaws.com
+s3-accesspoint.eu-north-1.amazonaws.com
+s3-object-lambda.eu-north-1.amazonaws.com
+s3-website.eu-north-1.amazonaws.com
+s3.dualstack.eu-south-1.amazonaws.com
+s3-accesspoint.dualstack.eu-south-1.amazonaws.com
+s3-website.dualstack.eu-south-1.amazonaws.com
+s3.eu-south-1.amazonaws.com
+s3-accesspoint.eu-south-1.amazonaws.com
+s3-object-lambda.eu-south-1.amazonaws.com
+s3-website.eu-south-1.amazonaws.com
+s3.dualstack.eu-south-2.amazonaws.com
+s3-accesspoint.dualstack.eu-south-2.amazonaws.com
+s3-website.dualstack.eu-south-2.amazonaws.com
+s3.eu-south-2.amazonaws.com
+s3-accesspoint.eu-south-2.amazonaws.com
+s3-object-lambda.eu-south-2.amazonaws.com
+s3-website.eu-south-2.amazonaws.com
 s3.dualstack.eu-west-1.amazonaws.com
+s3-accesspoint.dualstack.eu-west-1.amazonaws.com
+s3-website.dualstack.eu-west-1.amazonaws.com
+s3.eu-west-1.amazonaws.com
+s3-accesspoint.eu-west-1.amazonaws.com
+s3-deprecated.eu-west-1.amazonaws.com
+s3-object-lambda.eu-west-1.amazonaws.com
+s3-website.eu-west-1.amazonaws.com
 s3.dualstack.eu-west-2.amazonaws.com
+s3-accesspoint.dualstack.eu-west-2.amazonaws.com
 s3.eu-west-2.amazonaws.com
+s3-accesspoint.eu-west-2.amazonaws.com
+s3-object-lambda.eu-west-2.amazonaws.com
 s3-website.eu-west-2.amazonaws.com
 s3.dualstack.eu-west-3.amazonaws.com
+s3-accesspoint.dualstack.eu-west-3.amazonaws.com
+s3-website.dualstack.eu-west-3.amazonaws.com
 s3.eu-west-3.amazonaws.com
+s3-accesspoint.eu-west-3.amazonaws.com
+s3-object-lambda.eu-west-3.amazonaws.com
 s3-website.eu-west-3.amazonaws.com
+s3.dualstack.il-central-1.amazonaws.com
+s3-accesspoint.dualstack.il-central-1.amazonaws.com
+s3-website.dualstack.il-central-1.amazonaws.com
+s3.il-central-1.amazonaws.com
+s3-accesspoint.il-central-1.amazonaws.com
+s3-object-lambda.il-central-1.amazonaws.com
+s3-website.il-central-1.amazonaws.com
+s3.dualstack.me-central-1.amazonaws.com
+s3-accesspoint.dualstack.me-central-1.amazonaws.com
+s3-website.dualstack.me-central-1.amazonaws.com
+s3.me-central-1.amazonaws.com
+s3-accesspoint.me-central-1.amazonaws.com
+s3-object-lambda.me-central-1.amazonaws.com
+s3-website.me-central-1.amazonaws.com
+s3.dualstack.me-south-1.amazonaws.com
+s3-accesspoint.dualstack.me-south-1.amazonaws.com
+s3.me-south-1.amazonaws.com
+s3-accesspoint.me-south-1.amazonaws.com
+s3-object-lambda.me-south-1.amazonaws.com
+s3-website.me-south-1.amazonaws.com
 s3.amazonaws.com
+s3-1.amazonaws.com
+s3-ap-east-1.amazonaws.com
 s3-ap-northeast-1.amazonaws.com
 s3-ap-northeast-2.amazonaws.com
+s3-ap-northeast-3.amazonaws.com
 s3-ap-south-1.amazonaws.com
 s3-ap-southeast-1.amazonaws.com
 s3-ap-southeast-2.amazonaws.com
 s3-ca-central-1.amazonaws.com
 s3-eu-central-1.amazonaws.com
+s3-eu-north-1.amazonaws.com
 s3-eu-west-1.amazonaws.com
 s3-eu-west-2.amazonaws.com
 s3-eu-west-3.amazonaws.com
 s3-external-1.amazonaws.com
+s3-fips-us-gov-east-1.amazonaws.com
 s3-fips-us-gov-west-1.amazonaws.com
+mrap.accesspoint.s3-global.amazonaws.com
+s3-me-south-1.amazonaws.com
 s3-sa-east-1.amazonaws.com
 s3-us-east-2.amazonaws.com
+s3-us-gov-east-1.amazonaws.com
 s3-us-gov-west-1.amazonaws.com
 s3-us-west-1.amazonaws.com
 s3-us-west-2.amazonaws.com
@@ -10806,80 +11928,318 @@ s3-website-ap-southeast-2.amazonaws.com
 s3-website-eu-west-1.amazonaws.com
 s3-website-sa-east-1.amazonaws.com
 s3-website-us-east-1.amazonaws.com
+s3-website-us-gov-west-1.amazonaws.com
 s3-website-us-west-1.amazonaws.com
 s3-website-us-west-2.amazonaws.com
 s3.dualstack.sa-east-1.amazonaws.com
+s3-accesspoint.dualstack.sa-east-1.amazonaws.com
+s3-website.dualstack.sa-east-1.amazonaws.com
+s3.sa-east-1.amazonaws.com
+s3-accesspoint.sa-east-1.amazonaws.com
+s3-object-lambda.sa-east-1.amazonaws.com
+s3-website.sa-east-1.amazonaws.com
 s3.dualstack.us-east-1.amazonaws.com
+s3-accesspoint.dualstack.us-east-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-east-1.amazonaws.com
+s3-fips.dualstack.us-east-1.amazonaws.com
+s3-website.dualstack.us-east-1.amazonaws.com
+s3.us-east-1.amazonaws.com
+s3-accesspoint.us-east-1.amazonaws.com
+s3-accesspoint-fips.us-east-1.amazonaws.com
+s3-deprecated.us-east-1.amazonaws.com
+s3-fips.us-east-1.amazonaws.com
+s3-object-lambda.us-east-1.amazonaws.com
+s3-website.us-east-1.amazonaws.com
 s3.dualstack.us-east-2.amazonaws.com
+s3-accesspoint.dualstack.us-east-2.amazonaws.com
+s3-accesspoint-fips.dualstack.us-east-2.amazonaws.com
+s3-fips.dualstack.us-east-2.amazonaws.com
+s3-website.dualstack.us-east-2.amazonaws.com
 s3.us-east-2.amazonaws.com
+s3-accesspoint.us-east-2.amazonaws.com
+s3-accesspoint-fips.us-east-2.amazonaws.com
+s3-deprecated.us-east-2.amazonaws.com
+s3-fips.us-east-2.amazonaws.com
+s3-object-lambda.us-east-2.amazonaws.com
 s3-website.us-east-2.amazonaws.com
+s3.dualstack.us-gov-east-1.amazonaws.com
+s3-accesspoint.dualstack.us-gov-east-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-gov-east-1.amazonaws.com
+s3-fips.dualstack.us-gov-east-1.amazonaws.com
+s3-website.dualstack.us-gov-east-1.amazonaws.com
+s3.us-gov-east-1.amazonaws.com
+s3-accesspoint.us-gov-east-1.amazonaws.com
+s3-accesspoint-fips.us-gov-east-1.amazonaws.com
+s3-fips.us-gov-east-1.amazonaws.com
+s3-object-lambda.us-gov-east-1.amazonaws.com
+s3-website.us-gov-east-1.amazonaws.com
+s3.dualstack.us-gov-west-1.amazonaws.com
+s3-accesspoint.dualstack.us-gov-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-gov-west-1.amazonaws.com
+s3-fips.dualstack.us-gov-west-1.amazonaws.com
+s3-website.dualstack.us-gov-west-1.amazonaws.com
+s3.us-gov-west-1.amazonaws.com
+s3-accesspoint.us-gov-west-1.amazonaws.com
+s3-accesspoint-fips.us-gov-west-1.amazonaws.com
+s3-fips.us-gov-west-1.amazonaws.com
+s3-object-lambda.us-gov-west-1.amazonaws.com
+s3-website.us-gov-west-1.amazonaws.com
+s3.dualstack.us-west-1.amazonaws.com
+s3-accesspoint.dualstack.us-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-west-1.amazonaws.com
+s3-fips.dualstack.us-west-1.amazonaws.com
+s3-website.dualstack.us-west-1.amazonaws.com
+s3.us-west-1.amazonaws.com
+s3-accesspoint.us-west-1.amazonaws.com
+s3-accesspoint-fips.us-west-1.amazonaws.com
+s3-fips.us-west-1.amazonaws.com
+s3-object-lambda.us-west-1.amazonaws.com
+s3-website.us-west-1.amazonaws.com
+s3.dualstack.us-west-2.amazonaws.com
+s3-accesspoint.dualstack.us-west-2.amazonaws.com
+s3-accesspoint-fips.dualstack.us-west-2.amazonaws.com
+s3-fips.dualstack.us-west-2.amazonaws.com
+s3-website.dualstack.us-west-2.amazonaws.com
+s3.us-west-2.amazonaws.com
+s3-accesspoint.us-west-2.amazonaws.com
+s3-accesspoint-fips.us-west-2.amazonaws.com
+s3-deprecated.us-west-2.amazonaws.com
+s3-fips.us-west-2.amazonaws.com
+s3-object-lambda.us-west-2.amazonaws.com
+s3-website.us-west-2.amazonaws.com
+
+// Amazon SageMaker Ground Truth
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 98dbfde4-7802-48c3-8751-b60f204e0d9c
+labeling.ap-northeast-1.sagemaker.aws
+labeling.ap-northeast-2.sagemaker.aws
+labeling.ap-south-1.sagemaker.aws
+labeling.ap-southeast-1.sagemaker.aws
+labeling.ap-southeast-2.sagemaker.aws
+labeling.ca-central-1.sagemaker.aws
+labeling.eu-central-1.sagemaker.aws
+labeling.eu-west-1.sagemaker.aws
+labeling.eu-west-2.sagemaker.aws
+labeling.us-east-1.sagemaker.aws
+labeling.us-east-2.sagemaker.aws
+labeling.us-west-2.sagemaker.aws
+
+// Amazon SageMaker Notebook Instances
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: b5ea56df-669e-43cc-9537-14aa172f5dfc
+notebook.af-south-1.sagemaker.aws
+notebook.ap-east-1.sagemaker.aws
+notebook.ap-northeast-1.sagemaker.aws
+notebook.ap-northeast-2.sagemaker.aws
+notebook.ap-northeast-3.sagemaker.aws
+notebook.ap-south-1.sagemaker.aws
+notebook.ap-south-2.sagemaker.aws
+notebook.ap-southeast-1.sagemaker.aws
+notebook.ap-southeast-2.sagemaker.aws
+notebook.ap-southeast-3.sagemaker.aws
+notebook.ap-southeast-4.sagemaker.aws
+notebook.ca-central-1.sagemaker.aws
+notebook-fips.ca-central-1.sagemaker.aws
+notebook.ca-west-1.sagemaker.aws
+notebook-fips.ca-west-1.sagemaker.aws
+notebook.eu-central-1.sagemaker.aws
+notebook.eu-central-2.sagemaker.aws
+notebook.eu-north-1.sagemaker.aws
+notebook.eu-south-1.sagemaker.aws
+notebook.eu-south-2.sagemaker.aws
+notebook.eu-west-1.sagemaker.aws
+notebook.eu-west-2.sagemaker.aws
+notebook.eu-west-3.sagemaker.aws
+notebook.il-central-1.sagemaker.aws
+notebook.me-central-1.sagemaker.aws
+notebook.me-south-1.sagemaker.aws
+notebook.sa-east-1.sagemaker.aws
+notebook.us-east-1.sagemaker.aws
+notebook-fips.us-east-1.sagemaker.aws
+notebook.us-east-2.sagemaker.aws
+notebook-fips.us-east-2.sagemaker.aws
+notebook.us-gov-east-1.sagemaker.aws
+notebook-fips.us-gov-east-1.sagemaker.aws
+notebook.us-gov-west-1.sagemaker.aws
+notebook-fips.us-gov-west-1.sagemaker.aws
+notebook.us-west-1.sagemaker.aws
+notebook-fips.us-west-1.sagemaker.aws
+notebook.us-west-2.sagemaker.aws
+notebook-fips.us-west-2.sagemaker.aws
+notebook.cn-north-1.sagemaker.com.cn
+notebook.cn-northwest-1.sagemaker.com.cn
+
+// Amazon SageMaker Studio
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 475f237e-ab88-4041-9f41-7cfccdf66aeb
+studio.af-south-1.sagemaker.aws
+studio.ap-east-1.sagemaker.aws
+studio.ap-northeast-1.sagemaker.aws
+studio.ap-northeast-2.sagemaker.aws
+studio.ap-northeast-3.sagemaker.aws
+studio.ap-south-1.sagemaker.aws
+studio.ap-southeast-1.sagemaker.aws
+studio.ap-southeast-2.sagemaker.aws
+studio.ap-southeast-3.sagemaker.aws
+studio.ca-central-1.sagemaker.aws
+studio.eu-central-1.sagemaker.aws
+studio.eu-central-2.sagemaker.aws
+studio.eu-north-1.sagemaker.aws
+studio.eu-south-1.sagemaker.aws
+studio.eu-south-2.sagemaker.aws
+studio.eu-west-1.sagemaker.aws
+studio.eu-west-2.sagemaker.aws
+studio.eu-west-3.sagemaker.aws
+studio.il-central-1.sagemaker.aws
+studio.me-central-1.sagemaker.aws
+studio.me-south-1.sagemaker.aws
+studio.sa-east-1.sagemaker.aws
+studio.us-east-1.sagemaker.aws
+studio.us-east-2.sagemaker.aws
+studio.us-gov-east-1.sagemaker.aws
+studio-fips.us-gov-east-1.sagemaker.aws
+studio.us-gov-west-1.sagemaker.aws
+studio-fips.us-gov-west-1.sagemaker.aws
+studio.us-west-1.sagemaker.aws
+studio.us-west-2.sagemaker.aws
+studio.cn-north-1.sagemaker.com.cn
+studio.cn-northwest-1.sagemaker.com.cn
+
+// Amazon SageMaker with MLflow
+// Submited by: AWS Security <psl-maintainers@amazon.com>
+// Reference: c19f92b3-a82a-452d-8189-831b572eea7e
+*.experiments.sagemaker.aws
+
+// Analytics on AWS
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 955f9f40-a495-4e73-ae85-67b77ac9cadd
+analytics-gateway.ap-northeast-1.amazonaws.com
+analytics-gateway.ap-northeast-2.amazonaws.com
+analytics-gateway.ap-south-1.amazonaws.com
+analytics-gateway.ap-southeast-1.amazonaws.com
+analytics-gateway.ap-southeast-2.amazonaws.com
+analytics-gateway.eu-central-1.amazonaws.com
+analytics-gateway.eu-west-1.amazonaws.com
+analytics-gateway.us-east-1.amazonaws.com
+analytics-gateway.us-east-2.amazonaws.com
+analytics-gateway.us-west-2.amazonaws.com
+
+// AWS Amplify
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: c35bed18-6f4f-424f-9298-5756f2f7d72b
+amplifyapp.com
+
+// AWS App Runner
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 6828c008-ba5d-442f-ade5-48da4e7c2316
+*.awsapprunner.com
 
 // AWS Cloud9
 // Submitted by: AWS Security <psl-maintainers@amazon.com>
-// Reference: 2b6dfa9a-3a7f-4367-b2e7-0321e77c0d59
+// Reference: 30717f72-4007-4f0f-8ed4-864c6f2efec9
+webview-assets.aws-cloud9.af-south-1.amazonaws.com
 vfs.cloud9.af-south-1.amazonaws.com
 webview-assets.cloud9.af-south-1.amazonaws.com
+webview-assets.aws-cloud9.ap-east-1.amazonaws.com
 vfs.cloud9.ap-east-1.amazonaws.com
 webview-assets.cloud9.ap-east-1.amazonaws.com
+webview-assets.aws-cloud9.ap-northeast-1.amazonaws.com
 vfs.cloud9.ap-northeast-1.amazonaws.com
 webview-assets.cloud9.ap-northeast-1.amazonaws.com
+webview-assets.aws-cloud9.ap-northeast-2.amazonaws.com
 vfs.cloud9.ap-northeast-2.amazonaws.com
 webview-assets.cloud9.ap-northeast-2.amazonaws.com
+webview-assets.aws-cloud9.ap-northeast-3.amazonaws.com
 vfs.cloud9.ap-northeast-3.amazonaws.com
 webview-assets.cloud9.ap-northeast-3.amazonaws.com
+webview-assets.aws-cloud9.ap-south-1.amazonaws.com
 vfs.cloud9.ap-south-1.amazonaws.com
 webview-assets.cloud9.ap-south-1.amazonaws.com
+webview-assets.aws-cloud9.ap-southeast-1.amazonaws.com
 vfs.cloud9.ap-southeast-1.amazonaws.com
 webview-assets.cloud9.ap-southeast-1.amazonaws.com
+webview-assets.aws-cloud9.ap-southeast-2.amazonaws.com
 vfs.cloud9.ap-southeast-2.amazonaws.com
 webview-assets.cloud9.ap-southeast-2.amazonaws.com
+webview-assets.aws-cloud9.ca-central-1.amazonaws.com
 vfs.cloud9.ca-central-1.amazonaws.com
 webview-assets.cloud9.ca-central-1.amazonaws.com
+webview-assets.aws-cloud9.eu-central-1.amazonaws.com
 vfs.cloud9.eu-central-1.amazonaws.com
 webview-assets.cloud9.eu-central-1.amazonaws.com
+webview-assets.aws-cloud9.eu-north-1.amazonaws.com
 vfs.cloud9.eu-north-1.amazonaws.com
 webview-assets.cloud9.eu-north-1.amazonaws.com
+webview-assets.aws-cloud9.eu-south-1.amazonaws.com
 vfs.cloud9.eu-south-1.amazonaws.com
 webview-assets.cloud9.eu-south-1.amazonaws.com
+webview-assets.aws-cloud9.eu-west-1.amazonaws.com
 vfs.cloud9.eu-west-1.amazonaws.com
 webview-assets.cloud9.eu-west-1.amazonaws.com
+webview-assets.aws-cloud9.eu-west-2.amazonaws.com
 vfs.cloud9.eu-west-2.amazonaws.com
 webview-assets.cloud9.eu-west-2.amazonaws.com
+webview-assets.aws-cloud9.eu-west-3.amazonaws.com
 vfs.cloud9.eu-west-3.amazonaws.com
 webview-assets.cloud9.eu-west-3.amazonaws.com
+webview-assets.aws-cloud9.il-central-1.amazonaws.com
+vfs.cloud9.il-central-1.amazonaws.com
+webview-assets.aws-cloud9.me-south-1.amazonaws.com
 vfs.cloud9.me-south-1.amazonaws.com
 webview-assets.cloud9.me-south-1.amazonaws.com
+webview-assets.aws-cloud9.sa-east-1.amazonaws.com
 vfs.cloud9.sa-east-1.amazonaws.com
 webview-assets.cloud9.sa-east-1.amazonaws.com
+webview-assets.aws-cloud9.us-east-1.amazonaws.com
 vfs.cloud9.us-east-1.amazonaws.com
 webview-assets.cloud9.us-east-1.amazonaws.com
+webview-assets.aws-cloud9.us-east-2.amazonaws.com
 vfs.cloud9.us-east-2.amazonaws.com
 webview-assets.cloud9.us-east-2.amazonaws.com
+webview-assets.aws-cloud9.us-west-1.amazonaws.com
 vfs.cloud9.us-west-1.amazonaws.com
 webview-assets.cloud9.us-west-1.amazonaws.com
+webview-assets.aws-cloud9.us-west-2.amazonaws.com
 vfs.cloud9.us-west-2.amazonaws.com
 webview-assets.cloud9.us-west-2.amazonaws.com
 
+// AWS Directory Service
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: a13203e8-42dc-4045-a0d2-2ee67bed1068
+awsapps.com
+
 // AWS Elastic Beanstalk
-// Submitted by Luke Wells <psl-maintainers@amazon.com>
-// Reference: aa202394-43a0-4857-b245-8db04549137e
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: e4e02a54-eaf9-4fe7-b662-39ccbc011a04
 cn-north-1.eb.amazonaws.com.cn
 cn-northwest-1.eb.amazonaws.com.cn
 elasticbeanstalk.com
+af-south-1.elasticbeanstalk.com
+ap-east-1.elasticbeanstalk.com
 ap-northeast-1.elasticbeanstalk.com
 ap-northeast-2.elasticbeanstalk.com
 ap-northeast-3.elasticbeanstalk.com
 ap-south-1.elasticbeanstalk.com
 ap-southeast-1.elasticbeanstalk.com
 ap-southeast-2.elasticbeanstalk.com
+ap-southeast-3.elasticbeanstalk.com
+ap-southeast-5.elasticbeanstalk.com
+ap-southeast-7.elasticbeanstalk.com
 ca-central-1.elasticbeanstalk.com
 eu-central-1.elasticbeanstalk.com
+eu-north-1.elasticbeanstalk.com
+eu-south-1.elasticbeanstalk.com
+eu-south-2.elasticbeanstalk.com
 eu-west-1.elasticbeanstalk.com
 eu-west-2.elasticbeanstalk.com
 eu-west-3.elasticbeanstalk.com
+il-central-1.elasticbeanstalk.com
+me-central-1.elasticbeanstalk.com
+me-south-1.elasticbeanstalk.com
 sa-east-1.elasticbeanstalk.com
 us-east-1.elasticbeanstalk.com
 us-east-2.elasticbeanstalk.com
+us-gov-east-1.elasticbeanstalk.com
 us-gov-west-1.elasticbeanstalk.com
 us-west-1.elasticbeanstalk.com
 us-west-2.elasticbeanstalk.com
@@ -10895,6 +12255,79 @@ us-west-2.elasticbeanstalk.com
 // Reference: d916759d-a08b-4241-b536-4db887383a6a
 awsglobalaccelerator.com
 
+// AWS Lambda Function URLs
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 57df74ca-0820-46a5-89ea-0f0d0c4714b7
+lambda-url.af-south-1.on.aws
+lambda-url.ap-east-1.on.aws
+lambda-url.ap-northeast-1.on.aws
+lambda-url.ap-northeast-2.on.aws
+lambda-url.ap-northeast-3.on.aws
+lambda-url.ap-south-1.on.aws
+lambda-url.ap-southeast-1.on.aws
+lambda-url.ap-southeast-2.on.aws
+lambda-url.ap-southeast-3.on.aws
+lambda-url.ca-central-1.on.aws
+lambda-url.eu-central-1.on.aws
+lambda-url.eu-north-1.on.aws
+lambda-url.eu-south-1.on.aws
+lambda-url.eu-west-1.on.aws
+lambda-url.eu-west-2.on.aws
+lambda-url.eu-west-3.on.aws
+lambda-url.me-south-1.on.aws
+lambda-url.sa-east-1.on.aws
+lambda-url.us-east-1.on.aws
+lambda-url.us-east-2.on.aws
+lambda-url.us-west-1.on.aws
+lambda-url.us-west-2.on.aws
+
+// AWS re:Post Private
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 83385945-225f-416e-9aa0-ad0632bfdcee
+*.private.repost.aws
+
+// AWS Transfer Family web apps
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 9265cdd3-f017-42ab-98bb-08bf427d3fc9
+transfer-webapp.af-south-1.on.aws
+transfer-webapp.ap-east-1.on.aws
+transfer-webapp.ap-northeast-1.on.aws
+transfer-webapp.ap-northeast-2.on.aws
+transfer-webapp.ap-northeast-3.on.aws
+transfer-webapp.ap-south-1.on.aws
+transfer-webapp.ap-south-2.on.aws
+transfer-webapp.ap-southeast-1.on.aws
+transfer-webapp.ap-southeast-2.on.aws
+transfer-webapp.ap-southeast-3.on.aws
+transfer-webapp.ap-southeast-4.on.aws
+transfer-webapp.ap-southeast-5.on.aws
+transfer-webapp.ap-southeast-7.on.aws
+transfer-webapp.ca-central-1.on.aws
+transfer-webapp.ca-west-1.on.aws
+transfer-webapp.eu-central-1.on.aws
+transfer-webapp.eu-central-2.on.aws
+transfer-webapp.eu-north-1.on.aws
+transfer-webapp.eu-south-1.on.aws
+transfer-webapp.eu-south-2.on.aws
+transfer-webapp.eu-west-1.on.aws
+transfer-webapp.eu-west-2.on.aws
+transfer-webapp.eu-west-3.on.aws
+transfer-webapp.il-central-1.on.aws
+transfer-webapp.me-central-1.on.aws
+transfer-webapp.me-south-1.on.aws
+transfer-webapp.mx-central-1.on.aws
+transfer-webapp.sa-east-1.on.aws
+transfer-webapp.us-east-1.on.aws
+transfer-webapp.us-east-2.on.aws
+transfer-webapp.us-gov-east-1.on.aws
+transfer-webapp-fips.us-gov-east-1.on.aws
+transfer-webapp.us-gov-west-1.on.aws
+transfer-webapp-fips.us-gov-west-1.on.aws
+transfer-webapp.us-west-1.on.aws
+transfer-webapp.us-west-2.on.aws
+transfer-webapp.cn-north-1.on.amazonwebservices.com.cn
+transfer-webapp.cn-northwest-1.on.amazonwebservices.com.cn
+
 // eero
 // Submitted by Yue Kang <eero-dynamic-dns@amazon.com>
 // Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461
@@ -10903,19 +12336,40 @@ eero-stage.online
 
 // concludes Amazon
 
-// Amune : https://amune.org/
-// Submitted by Team Amune <cert@amune.org>
-t3l3p0rt.net
-tele.amune.org
+// Antagonist B.V. : https://www.antagonist.nl/
+// Submitted by Sander Hoentjen <systeembeheer@antagonist.nl>
+antagonist.cloud
 
 // Apigee : https://apigee.com/
 // Submitted by Apigee Security Team <security@apigee.com>
 apigee.io
 
+// Apis Networks : https://apisnetworks.com
+// Submitted by Matt Saladna <matt@apisnetworks.com>
+panel.dev
+
 // Apphud : https://apphud.com
 // Submitted by Alexander Selivanov <alex@apphud.com>
 siiites.com
 
+// Apple : https://www.apple.com
+// Submitted by Apple DNS <dnscontact@apple.com>
+int.apple
+*.cloud.int.apple
+*.r.cloud.int.apple
+*.ap-north-1.r.cloud.int.apple
+*.ap-south-1.r.cloud.int.apple
+*.ap-south-2.r.cloud.int.apple
+*.eu-central-1.r.cloud.int.apple
+*.eu-north-1.r.cloud.int.apple
+*.us-central-1.r.cloud.int.apple
+*.us-central-2.r.cloud.int.apple
+*.us-east-1.r.cloud.int.apple
+*.us-east-2.r.cloud.int.apple
+*.us-west-1.r.cloud.int.apple
+*.us-west-2.r.cloud.int.apple
+*.us-west-3.r.cloud.int.apple
+
 // Appspace : https://www.appspace.com
 // Submitted by Appspace Security Team <security@appspace.com>
 appspacehosted.com
@@ -10925,10 +12379,24 @@ appspaceusercontent.com
 // Submitted by Alexander Hochbaum <admin@appudo.com>
 appudo.net
 
+// Appwrite : https://appwrite.io
+// Submitted by Steven Nguyen <security@appwrite.io>
+appwrite.global
+appwrite.network
+*.appwrite.run
+
 // Aptible : https://www.aptible.com/
 // Submitted by Thomas Orozco <thomas@aptible.com>
 on-aptible.com
 
+// Aquapal : https://aquapal.net/
+// Submitted by Aki Ueno <admin@aquapal.net>
+f5.si
+
+// ArvanCloud EdgeCompute
+// Submitted by ArvanCloud CDN <cdn@arvancloud.ir>
+arvanedge.ir
+
 // ASEINet : https://www.aseinet.com/
 // Submitted by Asei SEKIGUCHI <mail@aseinet.com>
 user.aseinet.ne.jp
@@ -10954,28 +12422,17 @@ myasustor.com
 // Submitted by Sam Smyth <devloop@atlassian.com>
 cdn.prod.atlassian-dev.net
 
-// Authentick UG (haftungsbeschrรคnkt) : https://authentick.net
-// Submitted by Lukas Reschke <lukas@authentick.net>
-translated.page
-
-// Autocode : https://autocode.com
-// Submitted by Jacob Lee <jacob@autocode.com>
-autocode.dev
-
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
+myfritz.link
 myfritz.net
 
-// AVStack Pte. Ltd. : https://avstack.io
-// Submitted by Jasper Hugo <jasper@avstack.io>
-onavstack.net
-
 // AW AdvisorWebsites.com Software Inc : https://advisorwebsites.com
 // Submitted by James Kennedy <domains@advisorwebsites.com>
 *.awdev.ca
 *.advisor.ws
 
-// AZ.pl sp. z.o.o: https://az.pl
+// AZ.pl sp. z.o.o : https://az.pl
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 ecommerce-shop.pl
 
@@ -10983,25 +12440,10 @@ ecommerce-shop.pl
 // Submitted by Olivier Benz <olivier.benz@b-data.ch>
 b-data.io
 
-// backplane : https://www.backplane.io
-// Submitted by Anthony Voutas <anthony@backplane.io>
-backplaneapp.io
-
 // Balena : https://www.balena.io
 // Submitted by Petros Angelatos <petrosagg@balena.io>
 balena-devices.com
 
-// University of Banja Luka : https://unibl.org
-// Domains for Republic of Srpska administrative entity.
-// Submitted by Marko Ivanovic <kormang@hotmail.rs>
-rs.ba
-
-// Banzai Cloud
-// Submitted by Janos Matyas <info@banzaicloud.com>
-*.banzai.cloud
-app.banzaicloud.io
-*.backyards.banzaicloud.io
-
 // BASE, Inc. : https://binc.jp
 // Submitted by Yuya NAGASAWA <public-suffix-list@binc.jp>
 base.ec
@@ -11019,13 +12461,18 @@ base.shop
 // Submitted by Jason Kridner <jkridner@beagleboard.org>
 beagleboard.io
 
-// Beget Ltd
-// Submitted by Lev Nekrasov <lnekrasov@beget.com>
+// Bear Blog : https://bearblog.dev
+// Submitted by Herman Martinus <admin@bearblog.dev>
+bearblog.dev
+
+// Beget LLC : https://beget.com
+// Submitted by Lev Nekrasov & Nikita Radchenko <admin@beget.com>
 *.beget.app
+*.begetcdn.cloud
 
-// BetaInABox
-// Submitted by Adrian <adrian@betainabox.com>
-betainabox.com
+// Besties : https://besties.house
+// Submitted by Hazel Cora <hazy@besties.house>
+pages.gay
 
 // BinaryLane : http://www.binarylane.com
 // Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
@@ -11043,6 +12490,10 @@ blackbaudcdn.net
 // Submitted by Luke Bratch <luke@bratch.co.uk>
 of.je
 
+// Block, Inc. : https://block.xyz
+// Submitted by Jonathan Boice <security@block.xyz>
+square.site
+
 // Blue Bite, LLC : https://bluebite.com
 // Submitted by Joshua Weiss <admin.engineering@bluebite.com>
 bluebite.io
@@ -11068,14 +12519,39 @@ square7.de
 bplaced.net
 square7.net
 
+// Brave : https://brave.com
+// Submitted by Andrea Brancaleoni <abrancaleoni@brave.com>
+brave.app
+*.s.brave.app
+brave.dev
+*.s.brave.dev
+brave.io
+*.s.brave.io
+
 // Brendly : https://brendly.rs
-// Submitted by Dusan Radovanovic <dusan.radovanovic@brendly.rs>
+// Submitted by Dusan Radovanovic <administracija@brendly.rs>
+shop.brendly.ba
+shop.brendly.hr
 shop.brendly.rs
 
 // BrowserSafetyMark
 // Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
 browsersafetymark.io
 
+// BRS Media : https://brsmedia.com/
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+radio.am
+radio.fm
+
+// Bubble : https://bubble.io/
+// Submitted by Merlin Zhao <devops@bubble.io>
+cdn.bubble.io
+bubbleapps.io
+
+// bwCloud-OS : https://bwcloud-os.de/
+// Submitted by Klara Mall <dns@bwcloud-os.de>
+*.bwcloud-os-instance.de
+
 // Bytemark Hosting : https://www.bytemark.co.uk
 // Submitted by Paul Cammish <paul.cammish@bytemark.co.uk>
 uk0.bigv.io
@@ -11086,14 +12562,16 @@ vm.bytemark.co.uk
 // Submitted by Antonio Lain <antlai@cafjs.com>
 cafjs.com
 
-// callidomus : https://www.callidomus.com/
-// Submitted by Marcus Popp <admin@callidomus.com>
-mycd.eu
-
 // Canva Pty Ltd : https://canva.com/
 // Submitted by Joel Aquilina <publicsuffixlist@canva.com>
 canva-apps.cn
+my.canvasite.cn
 canva-apps.com
+canva-hosted-embed.com
+canvacode.com
+rice-labs.com
+canva.run
+my.canva.site
 
 // Carrd : https://carrd.co
 // Submitted by AJ <aj@carrd.co>
@@ -11103,89 +12581,53 @@ carrd.co
 crd.co
 ju.mp
 
-// CentralNic : http://www.centralnic.com/names/domains
+// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
+// Submitted by Jamie Tanna <jamie.tanna@digital.cabinet-office.gov.uk>
+api.gov.uk
+
+// CDN77.com : http://www.cdn77.com
+// Submitted by Jan Krpes <jan.krpes@cdn77.com>
+cdn77-storage.com
+rsc.contentproxy9.cz
+r.cdn77.net
+cdn77-ssl.net
+c.cdn77.org
+rsc.cdn77.org
+ssl.origin.cdn77-secure.org
+
+// CentralNic : https://teaminternet.com/
 // Submitted by registry <gavin.brown@centralnic.com>
-ae.org
+za.bz
 br.com
 cn.com
-com.de
-com.se
 de.com
 eu.com
-gb.net
-hu.net
-jp.net
 jpn.com
 mex.com
 ru.com
 sa.com
-se.net
 uk.com
-uk.net
 us.com
-za.bz
 za.com
+com.de
+gb.net
+hu.net
+jp.net
+se.net
+uk.net
+ae.org
+com.se
 
-// No longer operated by CentralNic, these entries should be adopted and/or removed by current operators
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-ar.com
-hu.com
-kr.com
-no.com
-qc.com
-uy.com
-
-// Africa.com Web Solutions Ltd : https://registry.africa.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-africa.com
-
-// iDOT Services Limited : http://www.domain.gr.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-gr.com
-
-// Radix FZC : http://domains.in.net
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-in.net
-web.in
-
-// US REGISTRY LLC : http://us.org
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-us.org
-
-// co.com Registry, LLC : https://registry.co.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-co.com
-
-// Roar Domains LLC : https://roar.basketball/
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-aus.basketball
-nz.basketball
-
-// BRS Media : https://brsmedia.com/
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-radio.am
-radio.fm
-
-// c.la : http://www.c.la/
-c.la
-
-// certmgr.org : https://certmgr.org
-// Submitted by B. Blechschmidt <hostmaster@certmgr.org>
-certmgr.org
-
-// Cityhost LLC  : https://cityhost.ua
+// Cityhost LLC : https://cityhost.ua
 // Submitted by Maksym Rivtin <support@cityhost.net.ua>
 cx.ua
 
 // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
+// Submitted by Rishabh Nambiar, Michael Brown, Rafael dos Santos Silva <team@discourse.org>
+discourse.diy
 discourse.group
 discourse.team
 
-// Clever Cloud : https://www.clever-cloud.com/
-// Submitted by Quentin Adam <noc@clever-cloud.com>
-cleverapps.io
-
 // Clerk : https://www.clerk.dev
 // Submitted by Colin Sidoti <systems@clerk.dev>
 clerk.app
@@ -11195,15 +12637,50 @@ clerkstage.app
 *.stg.dev
 *.stgstage.dev
 
+// Clever Cloud : https://www.clever-cloud.com/
+// Submitted by Quentin Adam <noc@clever-cloud.com>
+cleverapps.cc
+*.services.clever-cloud.com
+cleverapps.io
+cleverapps.tech
+
 // ClickRising : https://clickrising.com/
 // Submitted by Umut Gumeli <infrastructure-publicsuffixlist@clickrising.com>
 clickrising.net
 
+// Cloud DNS Ltd : http://www.cloudns.net
+// Submitted by Aleksander Hristov <noc@cloudns.net> & Boyan Peychev <boyan@cloudns.net>
+cloudns.asia
+cloudns.be
+cloud-ip.biz
+cloudns.biz
+cloud-ip.cc
+cloudns.cc
+cloudns.ch
+cloudns.cl
+cloudns.club
+abrdns.com
+dnsabr.com
+ip-ddns.com
+cloudns.cx
+cloudns.eu
+cloudns.in
+cloudns.info
+ddns-ip.net
+dns-cloud.net
+dns-dynamic.net
+cloudns.nz
+cloudns.org
+ip-dynamic.org
+cloudns.ph
+cloudns.pro
+cloudns.pw
+cloudns.us
+
 // Cloud66 : https://www.cloud66.com/
 // Submitted by Khash Sajadi <khash@cloud66.com>
 c66.me
 cloud66.ws
-cloud66.zone
 
 // CloudAccess.net : https://www.cloudaccess.net/
 // Submitted by Pawel Panek <noc@cloudaccess.net>
@@ -11213,10 +12690,9 @@ cloudaccess.host
 freesite.host
 cloudaccess.net
 
-// cloudControl : https://www.cloudcontrol.com/
-// Submitted by Tobias Wilken <tw@cloudcontrol.com>
-cloudcontrolled.com
-cloudcontrolapp.com
+// Cloudbees, Inc. : https://www.cloudbees.com/
+// Submitted by Mohideen Shajith <jaas-sre-infra@cloudbees.com>
+cloudbeesusercontent.io
 
 // Cloudera, Inc. : https://www.cloudera.com/
 // Submitted by Kedarnath Waikar <security@cloudera.com>
@@ -11224,67 +12700,83 @@ cloudcontrolapp.com
 
 // Cloudflare, Inc. : https://www.cloudflare.com/
 // Submitted by Cloudflare Team <publicsuffixlist@cloudflare.com>
+cloudflare.app
 cf-ipfs.com
 cloudflare-ipfs.com
 trycloudflare.com
 pages.dev
 r2.dev
 workers.dev
+cloudflare.net
+cdn.cloudflare.net
+cdn.cloudflareanycast.net
+cdn.cloudflarecn.net
+cdn.cloudflareglobal.net
+
+// cloudscale.ch AG : https://www.cloudscale.ch/
+// Submitted by Gaudenz Steinlin <support@cloudscale.ch>
+cust.cloudscale.ch
+objects.lpg.cloudscale.ch
+objects.rma.cloudscale.ch
+lpg.objectstorage.ch
+rma.objectstorage.ch
 
 // Clovyr : https://clovyr.io
 // Submitted by Patrick Nielsen <patrick@clovyr.io>
 wnext.app
 
-// co.ca : http://registry.co.ca/
-co.ca
+// CNPY : https://cnpy.gdn
+// Submitted by Angelo Gladding <angelo@lahacker.net>
+cnpy.gdn
 
 // Co & Co : https://co-co.nl/
 // Submitted by Govert Versluis <govert@co-co.nl>
 *.otap.co
 
-// i-registry s.r.o. : http://www.i-registry.cz/
-// Submitted by Martin Semrad <semrad@i-registry.cz>
-co.cz
+// co.ca : http://registry.co.ca/
+co.ca
 
-// CDN77.com : http://www.cdn77.com
-// Submitted by Jan Krpes <jan.krpes@cdn77.com>
-c.cdn77.org
-cdn77-ssl.net
-r.cdn77.net
-rsc.cdn77.org
-ssl.origin.cdn77-secure.org
-
-// Cloud DNS Ltd : http://www.cloudns.net
-// Submitted by Aleksander Hristov <noc@cloudns.net>
-cloudns.asia
-cloudns.biz
-cloudns.club
-cloudns.cc
-cloudns.eu
-cloudns.in
-cloudns.info
-cloudns.org
-cloudns.pro
-cloudns.pw
-cloudns.us
-
-// CNPY : https://cnpy.gdn
-// Submitted by Angelo Gladding <angelo@lahacker.net>
-cnpy.gdn
+// co.com Registry, LLC : https://registry.co.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+co.com
 
 // Codeberg e. V. : https://codeberg.org
 // Submitted by Moritz Marquardt <git@momar.de>
 codeberg.page
 
+// CodeSandbox B.V. : https://codesandbox.io
+// Submitted by Ives van Hoorne <abuse@codesandbox.io>
+csb.app
+preview.csb.app
+
 // CoDNS B.V.
 co.nl
 co.no
 
+// Cognition AI, Inc. : https://cognition.ai
+// Submitted by Philip Papurt <domains@cognition.ai>
+*.devinapps.com
+
 // Combell.com : https://www.combell.com
-// Submitted by Thomas Wouters <thomas.wouters@combellgroup.com>
+// Submitted by Combell Team <support@combell.com>
 webhosting.be
+prvw.eu
 hosting-cluster.nl
 
+// Contentful GmbH : https://www.contentful.com
+// Submitted by Contentful Developer Experience Team <prd-ecosystem-dx@contentful.com>
+ctfcloud.net
+
+// Convex : https://convex.dev/
+// Submitted by James Cowling <security@convex.dev>
+convex.app
+convex.cloud
+eu-west-1.convex.cloud
+us-east-1.convex.cloud
+convex.site
+eu-west-1.convex.site
+us-east-1.convex.site
+
 // Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
 // Submitted by George Georgievsky <gug@cctld.ru>
 ac.ru
@@ -11292,13 +12784,16 @@ edu.ru
 gov.ru
 int.ru
 mil.ru
-test.ru
+
+// CoreSpeed, Inc. : https://corespeed.io
+// Submitted by CoreSpeed Team <ops@corespeed.io>
+corespeed.app
 
 // COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
-dynamisches-dns.de
 dnsupdater.de
+dynamisches-dns.de
 internet-dns.de
 l-o-g-i-n.de
 dynamic-dns.info
@@ -11306,55 +12801,31 @@ feste-ip.net
 knx-server.net
 static-access.net
 
+// Craft Docs Ltd : https://www.craft.do/
+// Submitted by Zsombor Fuszenecker <security@craft.do>
+craft.me
+
 // Craynic, s.r.o. : http://www.craynic.com/
 // Submitted by Ales Krajnik <ales.krajnik@craynic.com>
 realm.cz
 
+// Crisp IM SAS : https://crisp.chat/
+// Submitted by Baptiste Jamin <hostmaster@crisp.chat>
+on.crisp.email
+
 // Cryptonomic : https://cryptonomic.net/
 // Submitted by Andrew Cady <public-suffix-list@cryptonomic.net>
 *.cryptonomic.net
 
-// Cupcake : https://cupcake.io/
-// Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
-cupcake.is
-
-// Curv UG : https://curv-labs.de/
-// Submitted by Marvin Wiesner <Marvin@curv-labs.de>
-curv.dev
-
-// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/
-// Submitted by Gregory Drake <support@dyn.com>
-// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
-*.customer-oci.com
-*.oci.customer-oci.com
-*.ocp.customer-oci.com
-*.ocs.customer-oci.com
+// cyber_Folks S.A. : https://cyberfolks.pl
+// Submitted by Bartlomiej Kida <security@cyberfolks.pl>
+cfolks.pl
 
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
 cyon.site
 
-// Danger Science Group: https://dangerscience.com/
-// Submitted by Skylar MacDonald <skylar@dangerscience.com>
-fnwk.site
-folionetwork.site
-platform0.app
-
-// Daplie, Inc : https://daplie.com
-// Submitted by AJ ONeal <aj@daplie.com>
-daplie.me
-localhost.daplie.me
-
-// Datto, Inc. : https://www.datto.com/
-// Submitted by Philipp Heckel <ph@datto.com>
-dattolocal.com
-dattorelay.com
-dattoweb.com
-mydatto.com
-dattolocal.net
-mydatto.net
-
 // Dansk.net : http://www.dansk.net/
 // Submitted by Anani Voule <digital@digital.co.dk>
 biz.dk
@@ -11367,14 +12838,10 @@ store.dk
 // Submitted by Abel Boldu / DAppNode Team <community@dappnode.io>
 dyndns.dappnode.io
 
-// dapps.earth : https://dapps.earth/
-// Submitted by Daniil Burdakov <icqkill@gmail.com>
-*.dapps.earth
-*.bzz.dapps.earth
-
 // Dark, Inc. : https://darklang.com
 // Submitted by Paul Biggar <ops@darklang.com>
 builtwithdark.com
+darklang.io
 
 // DataDetect, LLC. : https://datadetect.com
 // Submitted by Andrew Banchich <abanchich@sceven.com>
@@ -11385,42 +12852,117 @@ instance.datadetect.com
 // Submitted by Richard Li <secalert@datawire.io>
 edgestack.me
 
-// DDNS5 : https://ddns5.com
-// Submitted by Cameron Elliott <cameron@cameronelliott.com>
-ddns5.com
+// Datto, Inc. : https://www.datto.com/
+// Submitted by Philipp Heckel <ph@datto.com>
+dattolocal.com
+dattorelay.com
+dattoweb.com
+mydatto.com
+dattolocal.net
+mydatto.net
+
+// ddnss.de : https://www.ddnss.de/
+// Submitted by Robert Niedziela <webmaster@ddnss.de>
+ddnss.de
+dyn.ddnss.de
+dyndns.ddnss.de
+dyn-ip24.de
+dyndns1.de
+home-webserver.de
+dyn.home-webserver.de
+myhome-server.de
+ddnss.org
 
 // Debian : https://www.debian.org/
 // Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
 debian.net
 
+// Definima : http://www.definima.com/
+// Submitted by Maxence Bitterli <maxence@definima.com>
+definima.io
+definima.net
+
 // Deno Land Inc : https://deno.com/
 // Submitted by Luca Casonato <hostmaster@deno.com>
 deno.dev
 deno-staging.dev
+deno.net
+sandbox.deno.net
 
 // deSEC : https://desec.io/
 // Submitted by Peter Thomassen <peter@desec.io>
 dedyn.io
 
-// Deta: https://www.deta.sh/
+// Deta : https://www.deta.sh/
 // Submitted by Aavash Shrestha <aavash@deta.sh>
 deta.app
 deta.dev
 
-// Diher Solutions : https://diher.solutions
-// Submitted by Didi Hermawan <mail@diher.solutions>
-*.rss.my.id
-*.diher.solutions
+// Deuxfleurs : https://deuxfleurs.fr
+// Submitted by Aeddis Desauw <ca@deuxfleurs.fr>
+deuxfleurs.eu
+deuxfleurs.page
+
+// Developed Methods LLC : https://methods.dev
+// Submitted by Patrick Lorio <security@playit.gg>
+*.at.ply.gg
+d6.ply.gg
+joinmc.link
+playit.plus
+*.at.playit.plus
+with.playit.plus
+
+// Dfinity Foundation: https://dfinity.org/
+// Submitted by Dfinity Team <domains@dfinity.org>
+icp0.io
+*.raw.icp0.io
+icp1.io
+*.raw.icp1.io
+*.icp.net
+caffeine.site
+caffeine.xyz
+
+// dhosting.pl Sp. z o.o. : https://dhosting.pl/
+// Submitted by Szczepan Redzioch <bok@dhosting.pl>
+mybox.company
+intouch.email
+mybox.me
+mybox.page
+dfirma.pl
+dkonto.pl
+you2.pl
+
+// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
+// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
+ondigitalocean.app
+
+// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
+// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
+*.digitaloceanspaces.com
+
+// DigitalPlat : https://www.digitalplat.org/
+// Submitted by Edward Hsing <contact@digitalplat.org>
+qzz.io
+us.kg
+xx.kg
+dpdns.org
 
 // Discord Inc : https://discord.com
 // Submitted by Sahn Lam <slam@discordapp.com>
 discordsays.com
 discordsez.com
 
-// DNS Africa Ltd https://dns.business
+// DNS Africa Ltd : https://dns.business
 // Submitted by Calvin Browne <calvin@dns.business>
 jozi.biz
 
+// DNSHE : https://www.dnshe.com
+// Submitted by DNSHE Team <support@dnshe.com>
+ccwu.cc
+cc.cd
+us.ci
+de5.net
+
 // DNShome : https://www.dnshome.de/
 // Submitted by Norbert Auler <mail@dnshome.de>
 dnshome.de
@@ -11430,6 +12972,12 @@ dnshome.de
 online.th
 shop.th
 
+// dotScot Domains : https://domains.scot/
+// Submitted by DNS Team <dns@domains.scot>
+co.scot
+me.scot
+org.scot
+
 // DrayTek Corp. : https://www.draytek.com/
 // Submitted by Paul Fang <mis@draytek.com>
 drayddns.com
@@ -11442,32 +12990,40 @@ shoparena.pl
 // Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
 dreamhosters.com
 
-// Drobo : http://www.drobo.com/
-// Submitted by Ricardo Padilha <rpadilha@drobo.com>
-mydrobo.com
-
-// Drud Holdings, LLC. : https://www.drud.com/
-// Submitted by Kevin Bridges <kevin@drud.com>
-drud.io
-drud.us
+// Dreamyoungs, Inc. : https://durumis.com
+// Submitted by Infra Team <infra@durumis.com>
+durumis.com
 
 // DuckDNS : http://www.duckdns.org/
 // Submitted by Richard Harper <richard@duckdns.org>
 duckdns.org
 
-// Bip : https://bip.sh
-// Submitted by Joel Kennedy <joel@bip.sh>
-bip.sh
-
-// bitbridge.net : Submitted by Craig Welch, abeliidev@gmail.com
-bitbridge.net
-
 // dy.fi : http://dy.fi/
 // Submitted by Heikki Hannikainen <hessu@hes.iki.fi>
 dy.fi
 tunk.org
 
 // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
+dyndns.biz
+for-better.biz
+for-more.biz
+for-some.biz
+for-the.biz
+selfip.biz
+webhop.biz
+ftpaccess.cc
+game-server.cc
+myphotos.cc
+scrapping.cc
+blogdns.com
+cechire.com
+dnsalias.com
+dnsdojo.com
+doesntexist.com
+dontexist.com
+doomdns.com
+dyn-o-saur.com
+dynalias.com
 dyndns-at-home.com
 dyndns-at-work.com
 dyndns-blog.com
@@ -11482,64 +13038,14 @@ dyndns-server.com
 dyndns-web.com
 dyndns-wiki.com
 dyndns-work.com
-dyndns.biz
-dyndns.info
-dyndns.org
-dyndns.tv
-at-band-camp.net
-ath.cx
-barrel-of-knowledge.info
-barrell-of-knowledge.info
-better-than.tv
-blogdns.com
-blogdns.net
-blogdns.org
-blogsite.org
-boldlygoingnowhere.org
-broke-it.net
-buyshouses.net
-cechire.com
-dnsalias.com
-dnsalias.net
-dnsalias.org
-dnsdojo.com
-dnsdojo.net
-dnsdojo.org
-does-it.net
-doesntexist.com
-doesntexist.org
-dontexist.com
-dontexist.net
-dontexist.org
-doomdns.com
-doomdns.org
-dvrdns.org
-dyn-o-saur.com
-dynalias.com
-dynalias.net
-dynalias.org
-dynathome.net
-dyndns.ws
-endofinternet.net
-endofinternet.org
-endoftheinternet.org
 est-a-la-maison.com
 est-a-la-masion.com
 est-le-patron.com
 est-mon-blogueur.com
-for-better.biz
-for-more.biz
-for-our.info
-for-some.biz
-for-the.biz
-forgot.her.name
-forgot.his.name
 from-ak.com
 from-al.com
 from-ar.com
-from-az.net
 from-ca.com
-from-co.net
 from-ct.com
 from-dc.com
 from-de.com
@@ -11552,10 +13058,8 @@ from-il.com
 from-in.com
 from-ks.com
 from-ky.com
-from-la.net
 from-ma.com
 from-md.com
-from-me.org
 from-mi.com
 from-mn.com
 from-mo.com
@@ -11568,7 +13072,6 @@ from-nh.com
 from-nj.com
 from-nm.com
 from-nv.com
-from-ny.net
 from-oh.com
 from-ok.com
 from-or.com
@@ -11586,45 +13089,18 @@ from-wa.com
 from-wi.com
 from-wv.com
 from-wy.com
-ftpaccess.cc
-fuettertdasnetz.de
-game-host.org
-game-server.cc
 getmyip.com
-gets-it.net
-go.dyndns.org
 gotdns.com
-gotdns.org
-groks-the.info
-groks-this.info
-ham-radio-op.net
-here-for-more.info
 hobby-site.com
-hobby-site.org
-home.dyndns.org
-homedns.org
-homeftp.net
-homeftp.org
-homeip.net
 homelinux.com
-homelinux.net
-homelinux.org
 homeunix.com
-homeunix.net
-homeunix.org
 iamallama.com
-in-the-band.net
 is-a-anarchist.com
 is-a-blogger.com
 is-a-bookkeeper.com
-is-a-bruinsfan.org
 is-a-bulls-fan.com
-is-a-candidate.org
 is-a-caterer.com
-is-a-celticsfan.org
 is-a-chef.com
-is-a-chef.net
-is-a-chef.org
 is-a-conservative.com
 is-a-cpa.com
 is-a-cubicle-slave.com
@@ -11633,31 +13109,25 @@ is-a-designer.com
 is-a-doctor.com
 is-a-financialadvisor.com
 is-a-geek.com
-is-a-geek.net
-is-a-geek.org
 is-a-green.com
 is-a-guru.com
 is-a-hard-worker.com
 is-a-hunter.com
-is-a-knight.org
 is-a-landscaper.com
 is-a-lawyer.com
 is-a-liberal.com
 is-a-libertarian.com
-is-a-linux-user.org
 is-a-llama.com
 is-a-musician.com
 is-a-nascarfan.com
 is-a-nurse.com
 is-a-painter.com
-is-a-patsfan.org
 is-a-personaltrainer.com
 is-a-photographer.com
 is-a-player.com
 is-a-republican.com
 is-a-rockstar.com
 is-a-socialist.com
-is-a-soxfan.org
 is-a-student.com
 is-a-teacher.com
 is-a-techie.com
@@ -11669,133 +13139,181 @@ is-an-anarchist.com
 is-an-artist.com
 is-an-engineer.com
 is-an-entertainer.com
-is-by.us
 is-certified.com
-is-found.org
 is-gone.com
 is-into-anime.com
 is-into-cars.com
 is-into-cartoons.com
 is-into-games.com
 is-leet.com
-is-lost.org
 is-not-certified.com
-is-saved.org
 is-slick.com
 is-uberleet.com
-is-very-bad.org
-is-very-evil.org
-is-very-good.org
-is-very-nice.org
-is-very-sweet.org
 is-with-theband.com
 isa-geek.com
-isa-geek.net
-isa-geek.org
 isa-hockeynut.com
 issmarterthanyou.com
-isteingeek.de
-istmein.de
-kicks-ass.net
-kicks-ass.org
-knowsitall.info
-land-4-sale.us
-lebtimnetz.de
-leitungsen.de
 likes-pie.com
 likescandy.com
-merseine.nu
-mine.nu
-misconfused.org
-mypets.ws
-myphotos.cc
 neat-url.com
-office-on-the.net
-on-the-web.tv
-podzone.net
-podzone.org
-readmyblog.org
 saves-the-whales.com
-scrapper-site.net
-scrapping.cc
-selfip.biz
 selfip.com
-selfip.info
-selfip.net
-selfip.org
 sells-for-less.com
 sells-for-u.com
-sells-it.net
-sellsyourhome.org
 servebbs.com
-servebbs.net
-servebbs.org
-serveftp.net
-serveftp.org
-servegame.org
-shacknet.nu
 simple-url.com
 space-to-rent.com
-stuff-4-sale.org
-stuff-4-sale.us
 teaches-yoga.com
-thruhere.net
-traeumtgerade.de
-webhop.biz
-webhop.info
-webhop.net
-webhop.org
-worse-than.tv
 writesthisblog.com
-
-// ddnss.de : https://www.ddnss.de/
-// Submitted by Robert Niedziela <webmaster@ddnss.de>
-ddnss.de
-dyn.ddnss.de
-dyndns.ddnss.de
-dyndns1.de
-dyn-ip24.de
-home-webserver.de
-dyn.home-webserver.de
-myhome-server.de
-ddnss.org
-
-// Definima : http://www.definima.com/
-// Submitted by Maxence Bitterli <maxence@definima.com>
-definima.net
-definima.io
-
-// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
-// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
-ondigitalocean.app
-
-// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
-// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
-*.digitaloceanspaces.com
-
-// dnstrace.pro : https://dnstrace.pro/
-// Submitted by Chris Partridge <chris@partridge.tech>
-bci.dnstrace.pro
+ath.cx
+fuettertdasnetz.de
+isteingeek.de
+istmein.de
+lebtimnetz.de
+leitungsen.de
+traeumtgerade.de
+barrel-of-knowledge.info
+barrell-of-knowledge.info
+dyndns.info
+for-our.info
+groks-the.info
+groks-this.info
+here-for-more.info
+knowsitall.info
+selfip.info
+webhop.info
+forgot.her.name
+forgot.his.name
+at-band-camp.net
+blogdns.net
+broke-it.net
+buyshouses.net
+dnsalias.net
+dnsdojo.net
+does-it.net
+dontexist.net
+dynalias.net
+dynathome.net
+endofinternet.net
+from-az.net
+from-co.net
+from-la.net
+from-ny.net
+gets-it.net
+ham-radio-op.net
+homeftp.net
+homeip.net
+homelinux.net
+homeunix.net
+in-the-band.net
+is-a-chef.net
+is-a-geek.net
+isa-geek.net
+kicks-ass.net
+office-on-the.net
+podzone.net
+scrapper-site.net
+selfip.net
+sells-it.net
+servebbs.net
+serveftp.net
+thruhere.net
+webhop.net
+merseine.nu
+mine.nu
+shacknet.nu
+blogdns.org
+blogsite.org
+boldlygoingnowhere.org
+dnsalias.org
+dnsdojo.org
+doesntexist.org
+dontexist.org
+doomdns.org
+dvrdns.org
+dynalias.org
+dyndns.org
+go.dyndns.org
+home.dyndns.org
+endofinternet.org
+endoftheinternet.org
+from-me.org
+game-host.org
+gotdns.org
+hobby-site.org
+homedns.org
+homeftp.org
+homelinux.org
+homeunix.org
+is-a-bruinsfan.org
+is-a-candidate.org
+is-a-celticsfan.org
+is-a-chef.org
+is-a-geek.org
+is-a-knight.org
+is-a-linux-user.org
+is-a-patsfan.org
+is-a-soxfan.org
+is-found.org
+is-lost.org
+is-saved.org
+is-very-bad.org
+is-very-evil.org
+is-very-good.org
+is-very-nice.org
+is-very-sweet.org
+isa-geek.org
+kicks-ass.org
+misconfused.org
+podzone.org
+readmyblog.org
+selfip.org
+sellsyourhome.org
+servebbs.org
+serveftp.org
+servegame.org
+stuff-4-sale.org
+webhop.org
+better-than.tv
+dyndns.tv
+on-the-web.tv
+worse-than.tv
+is-by.us
+land-4-sale.us
+stuff-4-sale.us
+dyndns.ws
+mypets.ws
 
 // Dynu.com : https://www.dynu.com/
-// Submitted by Sue Ye <sue@dynu.com>
+// Submitted by Sue Ye <psl-contact@dynu.com>
+1cooldns.com
+bumbleshrimp.com
 ddnsfree.com
 ddnsgeek.com
+ddnsguru.com
+dynuddns.com
+dynuhosting.com
 giize.com
 gleeze.com
 kozow.com
 loseyourip.com
 ooguy.com
+pivohosting.com
 theworkpc.com
+wiredbladehosting.com
 casacam.net
 dynu.net
+dynuddns.net
+mysynology.net
+opik.net
+spryt.net
 accesscam.org
 camdvr.org
 freeddns.org
 mywire.org
+roxa.org
 webredirect.org
 myddns.rocks
-blogsite.xyz
 
 // dynv6 : https://dynv6.com
 // Submitted by Dominik Menke <dom@digineo.de>
@@ -11810,35 +13328,56 @@ e4.cz
 easypanel.app
 easypanel.host
 
+// EasyWP : https://www.easywp.com
+// Submitted by <infracloudteam@namecheap.com>
+*.ewp.live
+
+// eDirect Corp. : https://hosting.url.com.tw/
+// Submitted by C.S. chang <cschang@corp.url.com.tw>
+twmail.cc
+twmail.net
+twmail.org
+mymailer.com.tw
+url.tw
+
+// Electromagnetic Field : https://www.emfcamp.org
+// Submitted by <noc@emfcamp.org>
+at.emf.camp
+
+// Elefunc, Inc. : https://elefunc.com
+// Submitted by Cetin Sert <domains@elefunc.com>
+rt.ht
+
 // Elementor : Elementor Ltd.
 // Submitted by Anton Barkan <antonb@elementor.com>
 elementor.cloud
 elementor.cool
 
-// En rootโ€ฝ : https://en-root.org
-// Submitted by Emmanuel Raviart <emmanuel@raviart.com>
-en-root.fr
+// Emergent : https://emergent.sh
+// Submitted by Emergent Security Team <security@emergent.sh>
+emergent.cloud
+preview.emergentagent.com
+emergent.host
 
-// Enalean SAS: https://www.enalean.com
-// Submitted by Thomas Cottier <thomas.cottier@enalean.com>
+// Enalean SAS : https://www.enalean.com
+// Submitted by Enalean Security Team <security@enalean.com>
 mytuleap.com
 tuleap-partners.com
 
-// Encoretivity AB: https://encore.dev
-// Submitted by Andrรฉ Eriksson <andre@encore.dev>
+// Encoretivity AB : https://encore.cloud
+// Submitted by Andrรฉ Eriksson <security@encore.cloud>
 encr.app
+frontend.encr.app
 encoreapi.com
-
-// ECG Robotics, Inc: https://ecgrobotics.org
-// Submitted by <frc1533@ecgrobotics.org>
-onred.one
-staging.onred.one
+lp.dev
+api.lp.dev
+objects.lp.dev
 
 // encoway GmbH : https://www.encoway.de
 // Submitted by Marcel Daus <cloudops@encoway.de>
 eu.encoway.cloud
 
-// EU.org https://eu.org/
+// EU.org : https://eu.org/
 // Submitted by Pierre Beyssac <hostmaster@eu.org>
 eu.org
 al.eu.org
@@ -11874,7 +13413,6 @@ kr.eu.org
 lt.eu.org
 lu.eu.org
 lv.eu.org
-mc.eu.org
 me.eu.org
 mk.eu.org
 mt.eu.org
@@ -11884,10 +13422,8 @@ ng.eu.org
 nl.eu.org
 no.eu.org
 nz.eu.org
-paris.eu.org
 pl.eu.org
 pt.eu.org
-q-a.eu.org
 ro.eu.org
 ru.eu.org
 se.eu.org
@@ -11912,22 +13448,20 @@ us-2.evennode.com
 us-3.evennode.com
 us-4.evennode.com
 
-// eDirect Corp. : https://hosting.url.com.tw/
-// Submitted by C.S. chang <cschang@corp.url.com.tw>
-twmail.cc
-twmail.net
-twmail.org
-mymailer.com.tw
-url.tw
+// Evervault : https://evervault.com
+// Submitted by Hannah Neary <engineering@evervault.com>
+relay.evervault.app
+relay.evervault.dev
+
+// Expo : https://expo.dev/
+// Submitted by James Ide <psl@expo.dev>
+expo.app
+staging.expo.app
 
 // Fabrica Technologies, Inc. : https://www.fabrica.dev/
 // Submitted by Eric Jiang <eric@fabrica.dev>
 onfabrica.com
 
-// Facebook, Inc.
-// Submitted by Peter Ruibal <public-suffix@fb.com>
-apps.fbsbx.com
-
 // FAITID : https://faitid.org/
 // Submitted by Maxim Alzoba <tech.contact@faitid.org>
 // https://www.flexireg.net/stat_info
@@ -12014,8 +13548,6 @@ u.channelsdvr.net
 edgecompute.app
 fastly-edge.com
 fastly-terrarium.com
-fastlylb.net
-map.fastlylb.net
 freetls.fastly.net
 map.fastly.net
 a.prod.fastly.net
@@ -12023,6 +13555,8 @@ global.prod.fastly.net
 a.ssl.fastly.net
 b.ssl.fastly.net
 global.ssl.fastly.net
+fastlylb.net
+map.fastlylb.net
 
 // Fastmail : https://www.fastmail.com/
 // Submitted by Marc Bradshaw <marc@fastmailteam.com>
@@ -12036,72 +13570,66 @@ myfast.host
 fastvps.site
 myfast.space
 
+// FearWorks Media Ltd. : https://fearworksmedia.co.uk
+// Submitted by Keith Fairley <domains@fearworksmedia.co.uk>
+conn.uk
+copro.uk
+hosp.uk
+
 // Fedora : https://fedoraproject.org/
-// submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
+// Submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
 fedorainfracloud.org
 fedorapeople.org
 cloud.fedoraproject.org
 app.os.fedoraproject.org
 app.os.stg.fedoraproject.org
 
-// FearWorks Media Ltd. : https://fearworksmedia.co.uk
-// submitted by Keith Fairley <domains@fearworksmedia.co.uk>
-conn.uk
-copro.uk
-hosp.uk
-
 // Fermax : https://fermax.com/
-// submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
+// Submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
 mydobiss.com
 
 // FH Muenster : https://www.fh-muenster.de
 // Submitted by Robin Naundorf <r.naundorf@fh-muenster.de>
 fh-muenster.io
 
+// Figma : https://www.figma.com
+// Submitted by Nick Frost <psl@figma.com>
+figma.site
+figma-gov.site
+preview.site
+
 // Filegear Inc. : https://www.filegear.com
 // Submitted by Jason Zhu <jason@owtware.com>
 filegear.me
-filegear-au.me
-filegear-de.me
-filegear-gb.me
-filegear-ie.me
-filegear-jp.me
-filegear-sg.me
 
 // Firebase, Inc.
 // Submitted by Chris Raynor <chris@firebase.com>
 firebaseapp.com
 
-// Firewebkit : https://www.firewebkit.com
-// Submitted by Majid Qureshi <mqureshi@amrayn.com>
-fireweb.app
-
-// FLAP : https://www.flap.cloud
-// Submitted by Louis Chemineau <louis@chmn.me>
-flap.id
-
 // FlashDrive : https://flashdrive.io
 // Submitted by Eric Chan <support@flashdrive.io>
-onflashdrive.app
 fldrv.com
 
-// fly.io: https://fly.io
-// Submitted by Kurt Mackey <kurt@fly.io>
-fly.dev
-edgeapp.net
-shw.io
+// Fleek Labs Inc : https://fleek.xyz
+// Submitted by Parsa Ghadimi <dev@fleek.xyz>
+on-fleek.app
 
-// Flynn : https://flynn.io
-// Submitted by Jonathan Rudenberg <jonathan@flynn.io>
-flynnhosting.net
+// FlutterFlow : https://flutterflow.io
+// Submitted by Anton Emelyanov <anton@flutterflow.io>
+flutterflow.app
 
-// Forgerock :ย https://www.forgerock.com
-// Submitted by Roderick Parr <roderick.parr@forgerock.com>
-forgeblocks.com
-id.forgerock.io
+// fly.io : https://fly.io
+// Submitted by Kurt Mackey <ops@fly.io>
+sprites.app
+fly.dev
+
+// FoundryLabs, Inc : https://e2b.dev/
+// Submitted by Jiri Sveceny <security@e2b.dev>
+e2b.app
 
 // Framer : https://www.framer.com
-// Submitted by Koen Rouwhorst <koenrh@framer.com>
+// Submitted by Koen Rouwhorst <security@framer.com>
+framer.ai
 framer.app
 framercanvas.com
 framer.media
@@ -12109,17 +13637,9 @@ framer.photos
 framer.website
 framer.wiki
 
-// Frusky MEDIA&PR : https://www.frusky.de
-// Submitted by Victor Pupynin <hallo@frusky.de>
-*.frusky.de
-
-// RavPage : https://www.ravpage.co.il
-// Submitted by Roni Horowitz <roni@responder.co.il>
-ravpage.co.il
-
-// Frederik Braun https://frederik-braun.com
+// Frederik Braun : https://frederik-braun.com
 // Submitted by Frederik Braun <fb@frederik-braun.com>
-0e.vc
+*.0e.vc
 
 // Freebox : http://www.freebox.fr
 // Submitted by Romain Fliedel <rfliedel@freebox.fr>
@@ -12138,11 +13658,33 @@ freedesktop.org
 // Submitted by Cadence <contact@freemyip.com>
 freemyip.com
 
+// Frusky MEDIA&PR : https://www.frusky.de
+// Submitted by Victor Pupynin <hallo@frusky.de>
+*.frusky.de
+
 // FunkFeuer - Verein zur Fรถrderung freier Netze : https://www.funkfeuer.at
 // Submitted by Daniel A. Maierhofer <vorstand@funkfeuer.at>
 wien.funkfeuer.at
 
-// Futureweb OG : http://www.futureweb.at
+// Future Versatile Group. : https://www.fvg-on.net/
+// T.Kabu <webmaster@fvg-on.net>
+daemon.asia
+dix.asia
+mydns.bz
+0am.jp
+0g0.jp
+0j0.jp
+0t0.jp
+mydns.jp
+pgw.jp
+wjg.jp
+keyword-on.net
+live-on.net
+server-on.net
+mydns.tw
+mydns.vc
+
+// Futureweb GmbH : https://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
 *.futurecms.at
 *.ex.futurecms.at
@@ -12153,8 +13695,19 @@ futuremailing.at
 *.kunden.ortsinfo.at
 *.statics.cloud
 
+// Gadget Software Inc. : https://gadget.dev
+// Submitted by Harry Brundage <security@gadget.dev>
+gadget.app
+gadget.host
+
+// GCom Internet : https://www.gcom.net.au
+// Submitted by Leo Julius <support@gcom.net.au>
+aliases121.com
+
 // GDS : https://www.gov.uk/service-manual/technology/managing-domain-names
 // Submitted by Stephen Ford <hostmaster@digital.cabinet-office.gov.uk>
+campaign.gov.uk
+service.gov.uk
 independent-commission.uk
 independent-inquest.uk
 independent-inquiry.uk
@@ -12162,12 +13715,6 @@ independent-panel.uk
 independent-review.uk
 public-inquiry.uk
 royal-commission.uk
-campaign.gov.uk
-service.gov.uk
-
-// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
-// Submitted by Jamie Tanna <jamie.tanna@digital.cabinet-office.gov.uk>
-api.gov.uk
 
 // Gehirn Inc. : https://www.gehirn.co.jp/
 // Submitted by Kohei YOSHIDA <tech@gehirn.co.jp>
@@ -12178,36 +13725,32 @@ usercontent.jp
 // Submitted by Tom Klein <tom@gentlent.com>
 gentapps.com
 gentlentapis.com
-lab.ms
 cdn-edges.net
 
-// Ghost Foundation : https://ghost.org
-// Submitted by Matt Hanley <security@ghost.org>
-ghost.io
-
-// GignoSystemJapan: http://gsj.bz
+// GignoSystemJapan : http://gsj.bz
 // Submitted by GignoSystemJapan <kakutou-ec@gsj.bz>
 gsj.bz
 
+// GitBook Inc. : https://www.gitbook.com/
+// Submitted by Samy Pesse <devs@gitbook.com>
+gitbook.io
+
 // GitHub, Inc.
 // Submitted by Patrick Toomey <security@github.com>
+github.app
 githubusercontent.com
 githubpreview.dev
 github.io
 
-// GitLab, Inc.
+// GitLab, Inc. : https://about.gitlab.com/
 // Submitted by Alex Hanselka <alex@gitlab.com>
 gitlab.io
 
-// Gitplac.si - https://gitplac.si
+// Gitplac.si : https://gitplac.si
 // Submitted by Aljaลพ Starc <me@aljaxus.eu>
 gitapp.si
 gitpage.si
 
-// Glitch, Inc : https://glitch.com
-// Submitted by Mads Hartmann <mads@glitch.com>
-glitch.me
-
 // Global NOG Alliance : https://nogalliance.org/
 // Submitted by Sander Steffann <sander@nogalliance.org>
 nog.community
@@ -12327,40 +13870,28 @@ whitesnow.jp
 zombie.jp
 heteml.net
 
-// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
-// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
-cloudapps.digital
-london.cloudapps.digital
-
-// GOV.UK Pay : https://www.payments.service.gov.uk/
-// Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
-pymnt.uk
-
-// UKHomeOffice : https://www.gov.uk/government/organisations/home-office
-// Submitted by Jon Shanks <jon.shanks@digital.homeoffice.gov.uk>
-homeoffice.gov.uk
-
-// GlobeHosting, Inc.
-// Submitted by Zoltan Egresi <egresi@globehosting.com>
-ro.im
+// GoDaddy Registry : https://registry.godaddy
+// Submitted by Rohan Durrant <tldns@registry.godaddy>
+graphic.design
 
 // GoIP DNS Services : http://www.goip.de
 // Submitted by Christian Poulter <milchstrasse@goip.de>
 goip.de
 
 // Google, Inc.
-// Submitted by Eduardo Vela <evn@google.com>
-run.app
-a.run.app
+// Submitted by Shannon McCabe <public-suffix-editors@google.com>
+*.hosted.app
+*.run.app
+*.mtls.run.app
 web.app
 *.0emm.com
 appspot.com
 *.r.appspot.com
+blogspot.com
 codespot.com
 googleapis.com
 googlecode.com
 pagespeedmobilizer.com
-publishproxy.com
 withgoogle.com
 withyoutube.com
 *.gateway.dev
@@ -12368,110 +13899,52 @@ cloud.goog
 translate.goog
 *.usercontent.goog
 cloudfunctions.net
-blogspot.ae
-blogspot.al
-blogspot.am
-blogspot.ba
-blogspot.be
-blogspot.bg
-blogspot.bj
-blogspot.ca
-blogspot.cf
-blogspot.ch
-blogspot.cl
-blogspot.co.at
-blogspot.co.id
-blogspot.co.il
-blogspot.co.ke
-blogspot.co.nz
-blogspot.co.uk
-blogspot.co.za
-blogspot.com
-blogspot.com.ar
-blogspot.com.au
-blogspot.com.br
-blogspot.com.by
-blogspot.com.co
-blogspot.com.cy
-blogspot.com.ee
-blogspot.com.eg
-blogspot.com.es
-blogspot.com.mt
-blogspot.com.ng
-blogspot.com.tr
-blogspot.com.uy
-blogspot.cv
-blogspot.cz
-blogspot.de
-blogspot.dk
-blogspot.fi
-blogspot.fr
-blogspot.gr
-blogspot.hk
-blogspot.hr
-blogspot.hu
-blogspot.ie
-blogspot.in
-blogspot.is
-blogspot.it
-blogspot.jp
-blogspot.kr
-blogspot.li
-blogspot.lt
-blogspot.lu
-blogspot.md
-blogspot.mk
-blogspot.mr
-blogspot.mx
-blogspot.my
-blogspot.nl
-blogspot.no
-blogspot.pe
-blogspot.pt
-blogspot.qa
-blogspot.re
-blogspot.ro
-blogspot.rs
-blogspot.ru
-blogspot.se
-blogspot.sg
-blogspot.si
-blogspot.sk
-blogspot.sn
-blogspot.td
-blogspot.tw
-blogspot.ug
-blogspot.vn
 
 // Goupile : https://goupile.fr
 // Submitted by Niels Martignene <hello@goupile.fr>
 goupile.fr
 
-// Government of the Netherlands: https://www.government.nl
+// GOV.UK Pay : https://www.payments.service.gov.uk/
+// Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
+pymnt.uk
+
+// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
+// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
+cloudapps.digital
+london.cloudapps.digital
+
+// Government of the Netherlands : https://www.government.nl
 // Submitted by <domeinnaam@minaz.nl>
 gov.nl
 
-// Group 53, LLC : https://www.group53.com
-// Submitted by Tyler Todd <noc@nova53.net>
-awsmppl.com
+// Grafana Labs : https://grafana.com/
+// Submitted by Platform Engineering <info@grafana.com>
+grafana-dev.net
+
+// GrayJay Web Solutions Inc. : https://grayjaysports.ca
+// Submitted by Matt Yamkowy <info@grayjaysports.ca>
+grayjayleagues.com
+
+// Grebedoc : https://grebedoc.dev
+// Submitted by Catherine Zotova <admin@grebedoc.dev>
+grebedoc.dev
 
 // GรผnstigBestellen : https://gรผnstigbestellen.de
 // Submitted by Furkan Akkoc <info@hendelzon.de>
 gรผnstigbestellen.de
 gรผnstigliefern.de
 
-// Hakaran group: http://hakaran.cz
-// Submitted by Arseniy Sokolov <security@hakaran.cz>
-fin.ci
-free.hr
-caa.li
-ua.rs
-conf.se
+// GV.UY : https://nic.gv.uy
+// Submitted by cheng <admin@mailto.al>
+gv.uy
 
-// Handshake : https://handshake.org
-// Submitted by Mike Damm <md@md.vc>
-hs.zone
-hs.run
+// Hackclub Nest : https://hackclub.app
+// Submitted by Cyteon <admins@hackclub.app>
+hackclub.app
+
+// Hรคkkinen.fi : https://www.hรคkkinen.fi/
+// Submitted by Eero Hรคkkinen <Eero+psl@Hรคkkinen.fi>
+hรคkkinen.fi
 
 // Hashbang : https://hashbang.sh
 hashbang.sh
@@ -12481,79 +13954,134 @@ hashbang.sh
 hasura.app
 hasura-app.io
 
-// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages): https://www.hs-heilbronn.de
-// Submitted by Richard Zowalla <mi-admin@hs-heilbronn.de>
+// Hatena Co., Ltd. : https://hatena.co.jp
+// Submitted by Masato Nakamura <blog-developers@hatena.ne.jp>
+hatenablog.com
+hatenadiary.com
+hateblo.jp
+hatenablog.jp
+hatenadiary.jp
+hatenadiary.org
+
+// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages) : https://www.hs-heilbronn.de
+// Submitted by Richard Zowalla <it-admin@hs-heilbronn.de>
 pages.it.hs-heilbronn.de
+pages-research.it.hs-heilbronn.de
+
+// HeiyuSpace : https://lazycat.cloud
+// Submitted by Xia Bin <admin@lazycat.cloud>
+heiyu.space
+
+// Helio Networks : https://heliohost.org
+// Submitted by Ben Frede <admin@heliohost.org>
+helioho.st
+heliohost.us
 
 // Hepforge : https://www.hepforge.org
 // Submitted by David Grellscheid <admin@hepforge.org>
 hepforge.org
 
+// Hercules : https://hercules.app
+// Submitted by Brendan Falk <security@hercules.app>
+onhercules.app
+hercules-app.com
+hercules-dev.com
+
 // Heroku : https://www.heroku.com/
-// Submitted by Tom Maher <tmaher@heroku.com>
+// Submitted by Shumon Huque <public-dns@salesforce.com>
 herokuapp.com
-herokussl.com
+
+// Heyflow : https://www.heyflow.com
+// Submitted by Mirko Nitschke <tech@heyflow.com>
+heyflow.page
+heyflow.site
 
 // Hibernating Rhinos
 // Submitted by Oren Eini <oren@ravendb.net>
 ravendb.cloud
 ravendb.community
-ravendb.me
 development.run
 ravendb.run
 
-// home.pl S.A.: https://home.pl
+// HiDNS : https://www.hidoha.net
+// Submitted by ifeng <admin@hidoha.net>
+hidns.co
+hidns.vip
+
+// home.pl S.A. : https://home.pl
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 homesklep.pl
 
-// Hong Kong Productivity Council: https://www.hkpc.org/
-// Submitted by SECaaS Team <summchan@hkpc.org>
-secaas.hk
+// Homebase : https://homebase.id/
+// Submitted by Jason Babo <info@homebase.id>
+*.kin.one
+*.id.pub
+*.kin.pub
 
 // Hoplix : https://www.hoplix.com
 // Submitted by Danilo De Franco<info@hoplix.shop>
 hoplix.shop
 
-
 // HOSTBIP REGISTRY : https://www.hostbip.com/
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@hostbip.com>
 orx.biz
-biz.gl
+biz.ng
+co.biz.ng
+dl.biz.ng
+go.biz.ng
+lg.biz.ng
+on.biz.ng
 col.ng
 firm.ng
 gen.ng
 ltd.ng
 ngo.ng
-edu.scot
-sch.so
+plc.ng
 
-// HostyHosting (hostyhosting.com)
+// HostyHosting : https://hostyhosting.com
 hostyhosting.io
 
-// Hรคkkinen.fi
-// Submitted by Eero Hรคkkinen <Eero+psl@Hรคkkinen.fi>
-hรคkkinen.fi
+// Hugging Face : https://huggingface.co
+// Submitted by Eliott Coyac <website@huggingface.co>
+hf.space
+static.hf.space
+
+// Hypernode B.V. : https://www.hypernode.com/
+// Submitted by Cipriano Groenendal <security@nl.team.blue>
+hypernode.io
+
+// I-O DATA DEVICE, INC. : http://www.iodata.com/
+// Submitted by Yuji Minagawa <domains-admin@iodata.jp>
+iobb.net
+
+// i-registry s.r.o. : http://www.i-registry.cz/
+// Submitted by Martin Semrad <semrad@i-registry.cz>
+co.cz
 
 // Ici la Lune : http://www.icilalune.com/
 // Submitted by Simon Morvan <simon@icilalune.com>
 *.moonscale.io
 moonscale.net
 
+// iDOT Services Limited : http://www.domain.gr.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+gr.com
+
 // iki.fi
 // Submitted by Hannu Aronsson <haa@iki.fi>
 iki.fi
 
-// iliad italia: https://www.iliad.it
+// iliad italia : https://www.iliad.it
 // Submitted by Marios Makassikis <mmakassikis@freebox.fr>
 ibxos.it
 iliadboxos.it
 
-// Impertrix Solutions : <https://impertrixcdn.com>
-// Submitted by Zhixiang Zhao <csuite@impertrix.com>
-impertrixcdn.com
-impertrix.com
+// Imagine : https://imagine.dev
+// Submitted by Steven Nguyen <security@imagine.dev>
+imagine.diy
+imagine-proxy.work
 
-// Incsub, LLC: https://incsub.com/
+// Incsub, LLC : https://incsub.com/
 // Submitted by Aaron Edwards <sysadmins@incsub.com>
 smushcdn.com
 wphostedmail.com
@@ -12568,18 +14096,22 @@ in-berlin.de
 in-brb.de
 in-butter.de
 in-dsl.de
-in-dsl.net
-in-dsl.org
 in-vpn.de
+in-dsl.net
 in-vpn.net
+in-dsl.org
 in-vpn.org
 
+// Inferno Communications : https://inferno.co.uk
+// Submitted by Connor McFarlane <noc@inferno.co.uk>
+oninferno.net
+
 // info.at : http://www.info.at/
 biz.at
 info.at
 
 // info.cx : http://info.cx
-// Submitted by Jacob Slater <whois@igloo.to>
+// Submitted by June Slater <whois@igloo.to>
 info.cx
 
 // Interlegis : http://www.interlegis.leg.br
@@ -12616,37 +14148,70 @@ to.leg.br
 // Submitted by Wolfgang Schwarz <admin@intermetrics.de>
 pixolino.com
 
-// Internet-Pro, LLP: https://netangels.ru/
+// Internet-Pro, LLP : https://netangels.ru/
 // Submitted by Vasiliy Sheredeko <piphon@gmail.com>
 na4u.ru
 
+// Inventor Services : https://inventor.gg/
+// Submitted by Inventor Team <psl@inventor.gg>
+botdash.app
+botdash.dev
+botdash.gg
+botdash.net
+botda.sh
+botdash.xyz
+
+// IONOS SE : https://www.ionos.com/
+// IONOS Group SE : https://www.ionos-group.com/
+// Submitted by Henrik Willert <security@ionos.com>
+apps-1and1.com
+live-website.com
+webspace-host.com
+apps-1and1.net
+websitebuilder.online
+app-ionos.space
+
 // iopsys software solutions AB : https://iopsys.eu/
 // Submitted by Roman Azarenko <roman.azarenko@iopsys.eu>
 iopsys.se
 
+// IPFS Project : https://ipfs.tech/
+// Submitted by Interplanetary Shipyard <domains@ipshipyard.com>
+*.inbrowser.dev
+*.dweb.link
+*.inbrowser.link
+
 // IPiFony Systems, Inc. : https://www.ipifony.com/
 // Submitted by Matthew Hardeman <mhardeman@ipifony.com>
 ipifony.net
 
+// ir.md : https://nic.ir.md
+// Submitted by Ali Soizi <info@nic.ir.md>
+ir.md
+
+// is-a-good.dev : https://is-a-good.dev
+// Submitted by William Harrison <webmaster@is-a-good.dev>
+is-a-good.dev
+
 // IServ GmbH : https://iserv.de
-// Submitted by Mario Hoberg <info@iserv.de>
+// Submitted by Kim Brodowski <info@iserv.de>
 iservschule.de
 mein-iserv.de
+schuldock.de
 schulplattform.de
 schulserver.de
 test-iserv.de
 iserv.dev
+iserv.host
 
-// I-O DATA DEVICE, INC. : http://www.iodata.com/
-// Submitted by Yuji Minagawa <domains-admin@iodata.jp>
-iobb.net
+// Ispmanager : https://www.ispmanager.com/
+// Submitted by Ispmanager infrastructure team <infrastructure@ispmanager.com>
+ispmanager.name
 
 // Jelastic, Inc. : https://jelastic.com/
 // Submitted by Ihor Kolodyuk <ik@jelastic.com>
 mel.cloudlets.com.au
 cloud.interhostsolutions.be
-users.scale.virtualcloud.com.br
-mycloud.by
 alp1.ae.flow.ch
 appengine.flow.ch
 es-1.axarnet.cloud
@@ -12668,20 +14233,15 @@ us.reclaim.cloud
 ch.trendhosting.cloud
 de.trendhosting.cloud
 jele.club
-amscompute.com
-clicketcloud.com
 dopaas.com
-hidora.com
 paas.hosted-by-previder.com
 rag-cloud.hosteur.com
 rag-cloud-ch.hosteur.com
 jcloud.ik-server.com
 jcloud-ver-jpc.ik-server.com
 demo.jelastic.com
-kilatiron.com
 paas.massivegrid.com
 jed.wafaicloud.com
-lon.wafaicloud.com
 ryd.wafaicloud.com
 j.scaleforce.com.cy
 jelastic.dogado.eu
@@ -12693,18 +14253,14 @@ mircloud.host
 paas.beebyte.io
 sekd1.beebyteapp.io
 jele.io
-cloud-fr1.unispace.io
 jc.neen.it
-cloud.jelastic.open.tim.it
 jcloud.kz
-upaas.kazteleport.kz
 cloudjiffy.net
 fra1-de.cloudjiffy.net
 west1-us.cloudjiffy.net
 jls-sto1.elastx.net
 jls-sto2.elastx.net
 jls-sto3.elastx.net
-faststacks.net
 fr-1.paas.massivegrid.net
 lon-1.paas.massivegrid.net
 lon-2.paas.massivegrid.net
@@ -12714,11 +14270,9 @@ sg-1.paas.massivegrid.net
 jelastic.saveincloud.net
 nordeste-idc.saveincloud.net
 j.scaleforce.net
-jelastic.tsukaeru.net
 sdscloud.pl
 unicloud.pl
 mircloud.ru
-jelastic.regruhosting.ru
 enscaled.sg
 jele.site
 jelastic.team
@@ -12737,12 +14291,20 @@ myjino.ru
 
 // Jotelulu S.L. : https://jotelulu.com
 // Submitted by Daniel Fariรฑa <ingenieria@jotelulu.com>
+jote.cloud
 jotelulu.cloud
+eu1-plenit.com
+la1-plenit.com
+us1-plenit.com
+
+// JouwWeb B.V. : https://www.jouwweb.nl
+// Submitted by Camilo Sperberg <tech@webador.com>
+webadorsite.com
+jouwweb.site
 
 // Joyent : https://www.joyent.com/
 // Submitted by Brian Bennett <brian.bennett@joyent.com>
 *.triton.zone
-*.cns.joyent.com
 
 // JS.ORG : http://dns.js.org
 // Submitted by Stefan Keim <admin@js.org>
@@ -12753,18 +14315,39 @@ js.org
 kaas.gg
 khplay.nl
 
-// Kakao : https://www.kakaocorp.com/
-// Submitted by JaeYoong Lee <cec@kakaocorp.com>
-ktistory.com
-
 // Kapsi : https://kapsi.fi
 // Submitted by Tomi Juntunen <erani@kapsi.fi>
 kapsi.fi
 
+// KataBump : https://katabump.com
+// Submitted by Thibault Lapeyre <contact@katabump.com>
+kdns.fr
+
+// Katholieke Universiteit Leuven : https://www.kuleuven.be
+// Submitted by Abuse KU Leuven <abuse@kuleuven.be>
+ezproxy.kuleuven.be
+kuleuven.cloud
+
+// Keenetic : https://keenetic.com
+// Submitted by Alexey Nikitin <cloud@keenetic.net>
+keenetic.io
+keenetic.link
+keenetic.name
+keenetic.pro
+
+// Kevin Service : https://kevsrv.me
+// Submitted by Kevin Service Team <cs@kevsrv.me>
+ae.kg
+
 // Keyweb AG : https://www.keyweb.de
 // Submitted by Martin Dannehl <postmaster@keymachine.de>
 keymachine.de
 
+// Kilo Code, Inc. : https://kilo.ai
+// Submitted by Remon Oldenbeuving <security@kilocode.ai>
+kiloapps.ai
+kiloapps.io
+
 // KingHost : https://king.host
 // Submitted by Felipe Keller Braz <felipebraz@kinghost.com.br>
 kinghost.net
@@ -12774,27 +14357,31 @@ uni5.net
 // Submitted by Roy Keene <rkeene@knightpoint.com>
 knightpoint.systems
 
-// KoobinEvent, SL: https://www.koobin.com
+// KoobinEvent, SL : https://www.koobin.com
 // Submitted by Ivรกn Oliva <ivan.oliva@koobin.com>
 koobin.events
 
+// Krellian Ltd. : https://krellian.com
+// Submitted by Ben Francis <ben@krellian.com>
+webthings.io
+krellian.net
+
 // KUROKU LTD : https://kuroku.ltd/
 // Submitted by DisposaBoy <security@oya.to>
 oya.to
 
-// Katholieke Universiteit Leuven: https://www.kuleuven.be
-// Submitted by Abuse KU Leuven <abuse@kuleuven.be>
-kuleuven.cloud
-ezproxy.kuleuven.be
+// KV GmbH : https://www.nic.co.de
+// Submitted by KV GmbH <registry@kv-gmbh.de>
+// Abuse reports to <registry@kv-gmbh.de>
+co.de
 
-// .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
-co.krd
-edu.krd
-
-// Krellian Ltd. : https://krellian.com
-// Submitted by Ben Francis <ben@krellian.com>
-krellian.net
-webthings.io
+// Laravel Holdings, Inc. : https://laravel.com
+// Submitted by Andrรฉ Valentin & James Brooks <security@laravel.com>
+shiptoday.app
+shiptoday.build
+laravel.cloud
+on-forge.com
+on-vapor.com
 
 // LCube - Professional hosting e.K. : https://www.lcube-webhosting.de
 // Submitted by Lars Laehn <info@lcube.de>
@@ -12808,9 +14395,24 @@ leadpages.co
 lpages.co
 lpusercontent.com
 
-// Lelux.fi : https://lelux.fi/
-// Submitted by Lelux Admin <publisuffix@lelux.site>
-lelux.site
+// Leapcell : https://leapcell.io/
+// Submitted by Leapcell Team <support@leapcell.io>
+leapcell.app
+leapcell.dev
+leapcell.online
+
+// Liara : https://liara.ir
+// Submitted by Amirhossein Badinloo <info@liara.ir>
+liara.run
+iran.liara.run
+
+// libp2p project : https://libp2p.io
+// Submitted by Interplanetary Shipyard <domains@ipshipyard.com>
+libp2p.direct
+
+// Libre IT Ltd : https://libre.nz
+// Submitted by Tomas Maggio <support@libre.nz>
+runcontainers.dev
 
 // Lifetime Hosting : https://Lifetime.Hosting/
 // Submitted by Mike Fillator <support@lifetime.hosting>
@@ -12822,14 +14424,10 @@ co.network
 co.place
 co.technology
 
-// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
-// Submitted by Greg Holland <greg.holland@lmpm.com>
-app.lmpm.com
-
-// linkyard ldt: https://www.linkyard.ch/
+// linkyard ldt : https://www.linkyard.ch/
 // Submitted by Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
-linkyard.cloud
 linkyard-cloud.ch
+linkyard.cloud
 
 // Linode : https://linode.com
 // Submitted by <security@linode.com>
@@ -12842,13 +14440,28 @@ ip.linodeusercontent.com
 // Submitted by Victor Velchev <admin@liquidnetlimited.com>
 we.bs
 
+// Listen53 : https://www.l53.net
+// Submitted by Gerry Keh <biz@l53.net>
+filegear-sg.me
+ggff.net
+
 // Localcert : https://localcert.dev
 // Submitted by Lann Martin <security@localcert.dev>
 *.user.localcert.dev
 
-// localzone.xyz
-// Submitted by Kenny Niehage <hello@yahe.sh>
-localzone.xyz
+// Localtonet : https://localtonet.com/
+// Submitted by Burak Isleyici <support@localtonet.com>
+localtonet.com
+*.localto.net
+
+// Lodz University of Technology LODMAN regional domains : https://www.man.lodz.pl/dns
+// Submitted by Piotr Wilk <dns@man.lodz.pl>
+lodz.pl
+pabianice.pl
+plock.pl
+sieradz.pl
+skierniewice.pl
+zgierz.pl
 
 // Log'in Line : https://www.loginline.com/
 // Submitted by Rรฉmi Mach <remi.mach@loginline.com>
@@ -12858,14 +14471,17 @@ loginline.io
 loginline.services
 loginline.site
 
-// Lokalized : https://lokalized.nl
-// Submitted by Noah Taheij <noah@lokalized.nl>
-servers.run
-
-// Lรตhmus Family, The
-// Submitted by Heiki Lรตhmus <hostmaster at lohmus dot me>
+// Lรตhmus Family, The : https://lohmus.me/
+// Submitted by Heiki Lรตhmus <hostmaster@lohmus.me>
 lohmus.me
 
+// Lovable : https://lovable.dev
+// Submitted by Fabian Hedin <security@lovable.dev>
+lovable.app
+lovableproject.com
+lovable.run
+lovable.sh
+
 // LubMAN UMCS Sp. z o.o : https://lubman.pl/
 // Submitted by Ireneusz Maliszewski <ireneusz.maliszewski@lubman.pl>
 krasnik.pl
@@ -12884,18 +14500,19 @@ lugs.org.uk
 // Lukanet Ltd : https://lukanet.com
 // Submitted by Anton Avramov <register@lukanet.com>
 barsy.bg
-barsy.co.uk
-barsyonline.co.uk
+barsy.club
 barsycenter.com
 barsyonline.com
-barsy.club
 barsy.de
+barsy.dev
 barsy.eu
+barsy.gr
 barsy.in
 barsy.info
 barsy.io
 barsy.me
 barsy.menu
+barsyonline.menu
 barsy.mobi
 barsy.net
 barsy.online
@@ -12903,42 +14520,56 @@ barsy.org
 barsy.pro
 barsy.pub
 barsy.ro
+barsy.rs
 barsy.shop
+barsyonline.shop
 barsy.site
+barsy.store
 barsy.support
 barsy.uk
+barsy.co.uk
+barsyonline.co.uk
+
+// Lutra : https://lutra.ai
+// Submitted by Joshua Newman <public-suffix-list@lutra.ai>
+*.lutrausercontent.com
+
+// Luyani Inc. : https://luyani.com/
+// Submitted by Umut Gumeli <public-suffix-list@luyani.com>
+luyani.app
+luyani.net
 
 // Magento Commerce
 // Submitted by Damien Tournoud <dtournoud@magento.cloud>
 *.magentosite.cloud
 
-// May First - People Link : https://mayfirst.org/
-// Submitted by Jamie McClelland <info@mayfirst.org>
-mayfirst.info
-mayfirst.org
+// Magic Patterns : https://www.magicpatterns.com
+// Submitted by Teddy Ni <security@magicpatterns.com>
+magicpatterns.app
+magicpatternsapp.com
 
 // Mail.Ru Group : https://hb.cldmail.ru
 // Submitted by Ilya Zaretskiy <zaretskiy@corp.mail.ru>
 hb.cldmail.ru
 
-// Mail Transfer Platform : https://www.neupeer.com
-// Submitted by Li Hui <lihui@neupeer.com>
-cn.vu
+// MathWorks : https://www.mathworks.com/
+// Submitted by Emily Reed <psl-maintainers@groups.mathworks.com>
+matlab.cloud
+modelscape.com
+mwcloudnonprod.com
+polyspace.com
 
-// Maze Play: https://www.mazeplay.com
-// Submitted by Adam Humpherys <adam@mws.dev>
-mazeplay.com
-
-// mcpe.me : https://mcpe.me
-// Submitted by Noa Heyl <hi@noa.dev>
-mcpe.me
+// May First - People Link : https://mayfirst.org/
+// Submitted by Jamie McClelland <info@mayfirst.org>
+mayfirst.info
+mayfirst.org
 
 // McHost : https://mchost.ru
 // Submitted by Evgeniy Subbotin <e.subbotin@mchost.ru>
 mcdir.me
 mcdir.ru
-mcpre.ru
 vps.mcdir.ru
+mcpre.ru
 
 // Mediatech : https://mediatech.by
 // Submitted by Evgeniy Kozhuhovskiy <ugenk@mediatech.by>
@@ -12949,6 +14580,10 @@ mediatech.dev
 // Submitted by Michael Olson <molson@medicomhealth.com>
 hra.health
 
+// MedusaJS, Inc : https://medusajs.com/
+// Submitted by Stevche Radevski <engineering@medusajs.com>
+medusajs.app
+
 // Memset hosting : https://www.memset.com
 // Submitted by Tom Whitwell <domains@memset.com>
 miniserver.com
@@ -12958,13 +14593,15 @@ memset.net
 // Submitted by Ruben Schmidmeister <psl-maintainers@messerli.ch>
 messerli.app
 
+// Meta Platforms, Inc. : https://meta.com/
+// Submitted by Jacob Cordero <public-suffix@meta.com>
+atmeta.com
+apps.fbsbx.com
+
 // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
-// Submitted by Zdenฤ›k ล ustr <zdenek.sustr@cesnet.cz>
+// Submitted by Zdenฤ›k ล ustr <zdenek.sustr@cesnet.cz> and Radim Janฤa <janca@cesnet.cz>
 *.cloud.metacentrum.cz
 custom.metacentrum.cz
-
-// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
-// Submitted by Radim Janฤa <janca@cesnet.cz>
 flt.cloud.muni.cz
 usr.cloud.muni.cz
 
@@ -12978,35 +14615,81 @@ co.pl
 
 // Microsoft Corporation : http://microsoft.com
 // Submitted by Public Suffix List Admin <msftpsladmin@microsoft.com>
+// Managed by Corporate Domains
+// Microsoft Azure : https://home.azure
 *.azurecontainer.io
-azurewebsites.net
+azure-api.net
 azure-mobile.net
-cloudapp.net
+azureedge.net
+azurefd.net
 azurestaticapps.net
 1.azurestaticapps.net
 2.azurestaticapps.net
 3.azurestaticapps.net
+4.azurestaticapps.net
+5.azurestaticapps.net
+6.azurestaticapps.net
+7.azurestaticapps.net
 centralus.azurestaticapps.net
 eastasia.azurestaticapps.net
 eastus2.azurestaticapps.net
 westeurope.azurestaticapps.net
 westus2.azurestaticapps.net
+azurewebsites.net
+cloudapp.net
+trafficmanager.net
+blob.core.usgovcloudapi.net
+file.core.usgovcloudapi.net
+web.core.usgovcloudapi.net
+servicebus.usgovcloudapi.net
+usgovcloudapp.net
+usgovtrafficmanager.net
+blob.core.windows.net
+file.core.windows.net
+web.core.windows.net
+servicebus.windows.net
+azure-api.us
+azurewebsites.us
+
+// MikroTik : https://mikrotik.com
+// Submitted by MikroTik SysAdmin Team <support@mikrotik.com>
+routingthecloud.com
+sn.mynetname.net
+routingthecloud.net
+routingthecloud.org
+
+// Million Software, Inc : https://million.dev/
+// Submitted by Rayhan Noufal Arayilakath <security@million.dev>
+same-app.com
+same-preview.com
 
 // minion.systems : http://minion.systems
 // Submitted by Robert Bรถttinger <r@minion.systems>
 csx.cc
 
-// Mintere : https://mintere.com/
-// Submitted by Ben Aubin <security@mintere.com>
-mintere.site
-
-// MobileEducation, LLC : https://joinforte.com
-// Submitted by Grayson Martin <grayson.martin@mobileeducation.us>
-forte.id
-
-// Mozilla Corporation : https://mozilla.com
-// Submitted by Ben Francis <bfrancis@mozilla.com>
-mozilla-iot.org
+// Miren, Inc. : https://miren.dev
+// Submitted by Miren Product Team <team-product@miren.dev>
+miren.app
+miren.systems
+
+// Mittwald CM Service GmbH & Co. KG : https://mittwald.de
+// Submitted by Marco Rieger <security@mittwald.de>
+mydbserver.com
+webspaceconfig.de
+mittwald.info
+mittwaldserver.info
+typo3server.info
+project.space
+
+// Mocha : https://getmocha.com
+// Submitted by Ben Reinhart <security@getmocha.com>
+mocha.app
+mochausercontent.com
+mocha-sandbox.dev
+
+// MODX Systems LLC : https://modx.com
+// Submitted by Elizabeth Southwell <elizabeth@modx.com>
+modx.dev
 
 // Mozilla Foundation : https://mozilla.org/
 // Submitted by glob <glob@mozilla.com>
@@ -13018,11 +14701,15 @@ net.ru
 org.ru
 pp.ru
 
+// MyOwn srl : https://www.myown.eu/
+// Submitted by Stephane Bouvard <support@myown.eu>
+my.be
+
 // Mythic Beasts : https://www.mythic-beasts.com
 // Submitted by Paul Cammish <kelduum@mythic-beasts.com>
 hostedpi.com
-customer.mythic-beasts.com
 caracal.mythic-beasts.com
+customer.mythic-beasts.com
 fentiger.mythic-beasts.com
 lynx.mythic-beasts.com
 ocelot.mythic-beasts.com
@@ -13038,9 +14725,22 @@ cust.retrosnub.co.uk
 // Submitted by Paulus Schoutsen <infra@nabucasa.com>
 ui.nabu.casa
 
+// Needle Tools GmbH : https://needle.tools
+// Submitted by Felix Herbst <security@needle.tools>
+needle.run
+
+// Neo : https://www.neo.space
+// Submitted by Ankit Kulkarni <devops@co.site>
+co.site
+
 // Net at Work Gmbh : https://www.netatwork.de
 // Submitted by Jan Jaeschke <jan.jaeschke@netatwork.de>
 cloud.nospamproxy.com
+o365.cloud.nospamproxy.com
+
+// Net libre : https://www.netlib.re
+// Submitted by Philippe PITTOLI <security@netlib.re>
+netlib.re
 
 // Netlify : https://www.netlify.com
 // Submitted by Jessica Parsons <jessica@netlify.com>
@@ -13050,17 +14750,134 @@ netlify.app
 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
 4u.com
 
+// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
+// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
+nfshost.com
+
+// NFT.Storage : https://nft.storage/
+// Submitted by Vasco Santos <vasco.santos@protocol.ai> or <support@nft.storage>
+ipfs.nftstorage.link
+
+// NGO.US Registry : https://nic.ngo.us
+// Submitted by Alstra Solutions Ltd. Networking Team <admin@alstra.org>
+ngo.us
+
 // ngrok : https://ngrok.com/
 // Submitted by Alan Shreve <alan@ngrok.com>
+ngrok.app
+ngrok-free.app
+ngrok.dev
+ngrok-free.dev
 ngrok.io
+ap.ngrok.io
+au.ngrok.io
+eu.ngrok.io
+in.ngrok.io
+jp.ngrok.io
+sa.ngrok.io
+us.ngrok.io
+ngrok.pizza
+ngrok.pro
+
+// Nicolaus Copernicus University in Torun - MSK TORMAN : https://www.man.torun.pl
+torun.pl
 
 // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
-// Submitted by Nicholas Ford <nick@nimbushosting.co.uk>
+// Submitted by Nicholas Ford <dev@nimbushosting.co.uk>
 nh-serv.co.uk
+nimsite.uk
 
-// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
-// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
-nfshost.com
+// No-IP.com : https://noip.com/
+// Submitted by Deven Reza <publicsuffixlist@noip.com>
+mmafan.biz
+myftp.biz
+no-ip.biz
+no-ip.ca
+fantasyleague.cc
+gotdns.ch
+3utilities.com
+blogsyte.com
+ciscofreak.com
+damnserver.com
+ddnsking.com
+ditchyourip.com
+dnsiskinky.com
+dynns.com
+geekgalaxy.com
+health-carereform.com
+homesecuritymac.com
+homesecuritypc.com
+myactivedirectory.com
+mysecuritycamera.com
+myvnc.com
+net-freaks.com
+onthewifi.com
+point2this.com
+quicksytes.com
+securitytactics.com
+servebeer.com
+servecounterstrike.com
+serveexchange.com
+serveftp.com
+servegame.com
+servehalflife.com
+servehttp.com
+servehumour.com
+serveirc.com
+servemp3.com
+servep2p.com
+servepics.com
+servequake.com
+servesarcasm.com
+stufftoread.com
+unusualperson.com
+workisboring.com
+dvrcam.info
+ilovecollege.info
+no-ip.info
+brasilia.me
+ddns.me
+dnsfor.me
+hopto.me
+loginto.me
+noip.me
+webhop.me
+bounceme.net
+ddns.net
+eating-organic.net
+mydissent.net
+myeffect.net
+mymediapc.net
+mypsx.net
+mysecuritycamera.net
+nhlfan.net
+no-ip.net
+pgafan.net
+privatizehealthinsurance.net
+redirectme.net
+serveblog.net
+serveminecraft.net
+sytes.net
+cable-modem.org
+collegefan.org
+couchpotatofries.org
+hopto.org
+mlbfan.org
+myftp.org
+mysecuritycamera.org
+nflfan.org
+no-ip.org
+read-books.org
+ufcfan.org
+zapto.org
+no-ip.co.uk
+golffan.us
+noip.us
+pointto.us
+
+// NodeArt : https://nodeart.io
+// Submitted by Konstantin Nosov <Nosov@nodeart.io>
+stage.nodeart.io
 
 // Noop : https://noop.app
 // Submitted by Nathaniel Schweinberg <noop@rearc.io>
@@ -13079,18 +14896,16 @@ noop.app
 // Submitted by Laurent Pellegrino <security@noticeable.io>
 noticeable.news
 
+// Notion Labs, Inc : https://www.notion.so/
+// Submitted by Jess Yao <trust-core-team@makenotion.com>
+notion.site
+
 // Now-DNS : https://now-dns.com
 // Submitted by Steve Russell <steve@now-dns.com>
 dnsking.ch
 mypi.co
-n4t.co
-001www.com
-ddnslive.com
 myiphost.com
 forumz.info
-16-b.it
-32-b.it
-64-b.it
 soundcast.me
 tcp4.me
 dnsup.net
@@ -13101,126 +14916,24 @@ vpndns.net
 dynserv.org
 now-dns.org
 x443.pw
-now-dns.top
 ntdll.top
 freeddns.us
-crafting.xyz
-zapto.xyz
 
 // nsupdate.info : https://www.nsupdate.info/
 // Submitted by Thomas Waldmann <info@nsupdate.info>
 nsupdate.info
 nerdpol.ovh
 
-// No-IP.com : https://noip.com/
-// Submitted by Deven Reza <publicsuffixlist@noip.com>
-blogsyte.com
-brasilia.me
-cable-modem.org
-ciscofreak.com
-collegefan.org
-couchpotatofries.org
-damnserver.com
-ddns.me
-ditchyourip.com
-dnsfor.me
-dnsiskinky.com
-dvrcam.info
-dynns.com
-eating-organic.net
-fantasyleague.cc
-geekgalaxy.com
-golffan.us
-health-carereform.com
-homesecuritymac.com
-homesecuritypc.com
-hopto.me
-ilovecollege.info
-loginto.me
-mlbfan.org
-mmafan.biz
-myactivedirectory.com
-mydissent.net
-myeffect.net
-mymediapc.net
-mypsx.net
-mysecuritycamera.com
-mysecuritycamera.net
-mysecuritycamera.org
-net-freaks.com
-nflfan.org
-nhlfan.net
-no-ip.ca
-no-ip.co.uk
-no-ip.net
-noip.us
-onthewifi.com
-pgafan.net
-point2this.com
-pointto.us
-privatizehealthinsurance.net
-quicksytes.com
-read-books.org
-securitytactics.com
-serveexchange.com
-servehumour.com
-servep2p.com
-servesarcasm.com
-stufftoread.com
-ufcfan.org
-unusualperson.com
-workisboring.com
-3utilities.com
-bounceme.net
-ddns.net
-ddnsking.com
-gotdns.ch
-hopto.org
-myftp.biz
-myftp.org
-myvnc.com
-no-ip.biz
-no-ip.info
-no-ip.org
-noip.me
-redirectme.net
-servebeer.com
-serveblog.net
-servecounterstrike.com
-serveftp.com
-servegame.com
-servehalflife.com
-servehttp.com
-serveirc.com
-serveminecraft.net
-servemp3.com
-servepics.com
-servequake.com
-sytes.net
-webhop.me
-zapto.org
-
-// NodeArt : https://nodeart.io
-// Submitted by Konstantin Nosov <Nosov@nodeart.io>
-stage.nodeart.io
-
-// Nucleos Inc. : https://nucleos.com
-// Submitted by Piotr Zduniak <piotr@nucleos.com>
-pcloud.host
-
-// NYC.mn : http://www.information.nyc.mn
-// Submitted by Matthew Brown <mattbrown@nyc.mn>
-nyc.mn
+// O3O.Foundation : https://o3o.foundation/
+// Submitted by the prvcy.page Registry Team <info@o3o.foundation>
+prvcy.page
 
 // Observable, Inc. : https://observablehq.com
 // Submitted by Mike Bostock <dns@observablehq.com>
+observablehq.cloud
 static.observableusercontent.com
 
-// Octopodal Solutions, LLC. : https://ulterius.io/
-// Submitted by Andrew Sampson <andrew@ulterius.io>
-cya.gg
-
-// OMG.LOL : <https://omg.lol>
+// OMG.LOL : https://omg.lol
 // Submitted by Adam Newbold <adam@omg.lol>
 omg.lol
 
@@ -13228,46 +14941,64 @@ omg.lol
 // Submitted by Cole Estep <cole@omnibond.com>
 cloudycluster.net
 
-// OmniWe Limited: https://omniwe.com
+// OmniWe Limited : https://omniwe.com
 // Submitted by Vicary Archangel <vicary@omniwe.com>
 omniwe.site
 
-// One.com: https://www.one.com/
+// One.com : https://www.one.com/
 // Submitted by Jacob Bunk Nielsen <jbn@one.com>
-123hjemmeside.dk
-123hjemmeside.no
-123homepage.it
-123kotisivu.fi
-123minsida.se
-123miweb.es
-123paginaweb.pt
-123sait.ru
-123siteweb.fr
 123webseite.at
-123webseite.de
 123website.be
+simplesite.com.br
 123website.ch
+simplesite.com
+123webseite.de
+123hjemmeside.dk
+123miweb.es
+123kotisivu.fi
+123siteweb.fr
+simplesite.gr
+123homepage.it
 123website.lu
 123website.nl
+123hjemmeside.no
 service.one
-simplesite.com
-simplesite.com.br
-simplesite.gr
+website.one
 simplesite.pl
+123paginaweb.pt
+123minsida.se
+
+// ONID : https://get.onid.ca
+// Submitted by ONID Engineering Team <psl@onid.ca>
+onid.ca
 
-// One Fold Media : http://www.onefoldmedia.com/
-// Submitted by Eddie Jones <eddie@onefoldmedia.com>
-nid.io
+// Open Domains : https://open-domains.net
+// Submitted by William Harrison <admin@open-domains.net>
+is-a-fullstack.dev
+is-cool.dev
+is-not-a.dev
+localplayer.dev
+is-local.org
 
 // Open Social : https://www.getopensocial.com/
 // Submitted by Alexander Varwijk <security@getopensocial.com>
 opensocial.site
 
+// OpenAI : https://openai.com
+// Submitted by Thomas Shadwell <security@openai.com>
+*.oaiusercontent.com
+
 // OpenCraft GmbH : http://opencraft.com/
 // Submitted by Sven Marnach <sven@opencraft.com>
 opencraft.hosting
 
-// OpenResearch GmbH: https://openresearch.com/
+// OpenHost : https://registry.openhost.uk
+// Submitted by OpenHost Registry Team <support@openhost.uk>
+16-b.it
+32-b.it
+64-b.it
+
+// OpenResearch GmbH : https://openresearch.com/
 // Submitted by Philipp Schmid <ops@openresearch.com>
 orsites.com
 
@@ -13275,26 +15006,41 @@ orsites.com
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
 
+// Oracle Dyn : https://cloud.oracle.com/home https://dyn.com/dns/
+// Submitted by Gregory Drake <support@dyn.com>
+// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
+*.customer-oci.com
+*.oci.customer-oci.com
+*.ocp.customer-oci.com
+*.ocs.customer-oci.com
+*.oraclecloudapps.com
+*.oraclegovcloudapps.com
+*.oraclegovcloudapps.uk
+
 // Orange : https://www.orange.com
 // Submitted by Alexandre Linte <alexandre.linte@orange.com>
 tech.orange
 
-// Oursky Limited : https://authgear.com/, https://skygear.io/
-// Submitted by Authgear Team <hello@authgear.com>, Skygear Developer <hello@skygear.io>
+// OsSav Technology Ltd. : https://ossav.com/
+// Submitted by OsSav Technology Ltd. <support@ossav.com>
+// https://nic.can.re
+can.re
+
+// Oursky Limited : https://authgear.com/
+// Submitted by Authgear Team <hello@authgear.com> & Skygear Developer <hello@skygear.io>
 authgear-staging.com
 authgearapps.com
-skygearapp.com
 
 // OutSystems
 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
 outsystemscloud.com
 
-// OVHcloud: https://ovhcloud.com
+// OVHcloud : https://ovhcloud.com
 // Submitted by Vincent Cassรฉ <vincent.casse@ovhcloud.com>
-*.webpaas.ovh.net
 *.hosting.ovh.net
+*.webpaas.ovh.net
 
-// OwnProvider GmbH: http://www.ownprovider.com
+// OwnProvider GmbH : http://www.ownprovider.com
 // Submitted by Jan Moennich <jan.moennich@ownprovider.com>
 ownprovider.com
 own.pm
@@ -13315,37 +15061,27 @@ oy.lc
 // Submitted by Derek Myers <derek@pagefog.com>
 pgfog.com
 
-// Pagefront : https://www.pagefronthq.com/
-// Submitted by Jason Kriss <jason@pagefronthq.com>
-pagefrontapp.com
-
 // PageXL : https://pagexl.com
 // Submitted by Yann Guichard <yann@pagexl.com>
 pagexl.com
 
+// Pantheon Systems, Inc. : https://pantheon.io/
+// Submitted by Gary Dylina <gary@pantheon.io>
+gotpantheon.com
+pantheonsite.io
+
 // Paywhirl, Inc : https://paywhirl.com/
 // Submitted by Daniel Netzer <dan@paywhirl.com>
 *.paywhirl.com
 
-// pcarrier.ca Software Inc: https://pcarrier.ca/
+// pcarrier.ca Software Inc : https://pcarrier.ca/
 // Submitted by Pierre Carrier <pc@rrier.ca>
-bar0.net
-bar1.net
-bar2.net
-rdv.to
-
-// .pl domains (grandfathered)
-art.pl
-gliwice.pl
-krakow.pl
-poznan.pl
-wroc.pl
-zakopane.pl
-
-// Pantheon Systems, Inc. : https://pantheon.io/
-// Submitted by Gary Dylina <gary@pantheon.io>
-pantheonsite.io
-gotpantheon.com
+*.xmit.co
+xmit.dev
+madethis.site
+srv.us
+gh.srv.us
+gl.srv.us
 
 // Peplink | Pepwave : http://peplink.com/
 // Submitted by Steve Leung <steveleung@peplink.com>
@@ -13355,9 +15091,14 @@ mypep.link
 // Submitted by Kenneth Van Alstyne <kvanalstyne@perspecta.com>
 perspecta.cloud
 
-// PE Ulyanov Kirill Sergeevich : https://airy.host
-// Submitted by Kirill Ulyanov <k.ulyanov@airy.host>
-lk3.ru
+// Ping Identity : https://www.pingidentity.com
+// Submitted by Ping Identity <security@pingidentity.com>
+forgeblocks.com
+id.forgerock.io
+
+// Plain : https://www.plain.com/
+// Submitted by Jesรบs Hernรกndez <security@plain.com>
+support.site
 
 // Planet-Work : https://www.planet-work.com/
 // Submitted by Frรฉdรฉric VANNIรˆRE <f.vanniere@planet-work.com>
@@ -13365,28 +15106,17 @@ on-web.fr
 
 // Platform.sh : https://platform.sh
 // Submitted by Nikola Kotur <nikola@platform.sh>
-bc.platform.sh
+*.upsun.app
+upsunapp.com
 ent.platform.sh
 eu.platform.sh
 us.platform.sh
 *.platformsh.site
 *.tst.site
 
-// Platter: https://platter.dev
-// Submitted by Patrick Flor <patrick@platter.dev>
-platter-app.com
-platter-app.dev
-platterp.us
-
-// Plesk : https://www.plesk.com/
-// Submitted by Anton Akhtyamov <program-managers@plesk.com>
-pdns.page
-plesk.page
-pleskns.com
-
-// Port53 : https://port53.io/
-// Submitted by Maximilian Schieder <maxi@zeug.co>
-dyn53.io
+// Pley AB : https://www.pley.com/
+// Submitted by Henning Pohl <infra@pley.com>
+pley.games
 
 // Porter : https://porter.run/
 // Submitted by Rudraksh MK <rudi@porter.run>
@@ -13403,8 +15133,8 @@ pstmn.io
 mock.pstmn.io
 httpbin.org
 
-//prequalifyme.today : https://prequalifyme.today
-//Submitted by DeepakTiwari deepak@ivylead.io
+// prequalifyme.today : https://prequalifyme.today
+// Submitted by DeepakTiwari deepak@ivylead.io
 prequalifyme.today
 
 // prgmr.com : https://prgmr.com/
@@ -13415,62 +15145,52 @@ xen.prgmr.com
 // Submitted by registry <lendl@nic.at>
 priv.at
 
-// privacytools.io : https://www.privacytools.io/
-// Submitted by Jonah Aragon <jonah@privacytools.io>
-prvcy.page
+// PROJECT ELIV : https://eliv.kr/
+// Submitted by PROJECT ELIV DomainName Team <team@eliv.kr>
+c01.kr
+eliv-api.kr
+eliv-cdn.kr
+eliv-dns.kr
+mmv.kr
+vki.kr
 
-// Protocol Labs : https://protocol.ai/
-// Submitted by Michael Burns <noc@protocol.ai>
-*.dweb.link
+// project-study : https://project-study.com
+// Submitted by yumenewa <admin@project-study.com>
+dev.project-study.com
 
 // Protonet GmbH : http://protonet.io
 // Submitted by Martin Meier <admin@protonet.io>
 protonet.io
 
+// PSL Sandbox : https://github.com/groundcat/PSL-Sandbox
+// Submitted by groundcat <psl-sandbox@alumni.upenn.edu>
+platter-app.dev
+
+// PT Ekossistim Indo Digital : https://e.id
+// Submitted by Eid Team <support@corp.e.id>
+e.id
+
 // Publication Presse Communication SARL : https://ppcom.fr
 // Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
 chirurgiens-dentistes-en-france.fr
 byen.site
 
-// pubtls.org: https://www.pubtls.org
+// PublicZone : https://publiczone.org/
+// Submitted by PublicZone NOC Team <noc@publiczone.org>
+nyc.mn
+*.cn.st
+
+// pubtls.org : https://www.pubtls.org
 // Submitted by Kor Nielsen <kor@pubtls.org>
 pubtls.org
 
-// PythonAnywhere LLP: https://www.pythonanywhere.com
+// PythonAnywhere LLP : https://www.pythonanywhere.com
 // Submitted by Giles Thomas <giles@pythonanywhere.com>
 pythonanywhere.com
 eu.pythonanywhere.com
 
-// QOTO, Org.
-// Submitted by Jeffrey Phillips Freeman <jeffrey.freeman@qoto.org>
-qoto.io
-
-// Qualifio : https://qualifio.com/
-// Submitted by Xavier De Cock <xdecock@gmail.com>
-qualifioapp.com
-
-// QuickBackend: https://www.quickbackend.com
-// Submitted by Dani Biro <dani@pymet.com>
-qbuser.com
-
-// Rad Web Hosting: https://radwebhosting.com
-// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
-cloudsite.builders
-
-// Redgate Software: https://red-gate.com
-// Submitted by Andrew Farries <andrew.farries@red-gate.com>
-instances.spawn.cc
-
-// Redstar Consultants : https://www.redstarconsultants.com/
-// Submitted by Jons Slemmer <jons@redstarconsultants.com>
-instantcloud.cn
-
-// Russian Academy of Sciences
-// Submitted by Tech Support <support@rasnet.ru>
-ras.ru
-
 // QA2
-// Submitted by Daniel Dent (https://www.danieldent.com/)
+// Submitted by Daniel Dent : https://www.danieldent.com/
 qa2.com
 
 // QCX
@@ -13479,11 +15199,35 @@ qcx.io
 *.sys.qcx.io
 
 // QNAP System Inc : https://www.qnap.com
-// Submitted by Nick Chang <nickchang@qnap.com>
-dev-myqnapcloud.com
+// Submitted by Nick Chang <cloudadmin@qnap.com>
+myqnapcloud.cn
 alpha-myqnapcloud.com
+dev-myqnapcloud.com
+mycloudnas.com
+mynascloud.com
 myqnapcloud.com
 
+// QOTO, Org.
+// Submitted by Jeffrey Phillips Freeman <jeffrey.freeman@qoto.org>
+qoto.io
+
+// Qualifio : https://qualifio.com/
+// Submitted by Xavier De Cock <xdecock@gmail.com>
+qualifioapp.com
+
+// Quality Unit : https://qualityunit.com
+// Submitted by Vasyl Tsalko <vtsalko@qualityunit.com>
+ladesk.com
+
+// Qualy : https://qualyhq.com
+// Submitted by Raphael Arias <security@qualyhq.com>
+*.qualyhqpartner.com
+*.qualyhqportal.com
+
+// QuickBackend : https://www.quickbackend.com
+// Submitted by Dani Biro <dani@pymet.com>
+qbuser.com
+
 // Quip : https://quip.com
 // Submitted by Patrick Linehan <plinehan@quip.com>
 *.quipelements.com
@@ -13498,35 +15242,94 @@ vaporcloud.io
 rackmaze.com
 rackmaze.net
 
-// Rakuten Games, Inc : https://dev.viberplay.io
-// Submitted by Joshua Zhang <public-suffix@rgames.jp>
-g.vbrplsbx.io
+// Rad Web Hosting : https://radwebhosting.com
+// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
+cloudsite.builders
+myradweb.net
+servername.us
+
+// Radix FZC : http://domains.in.net
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+web.in
+in.net
+
+// Raidboxes GmbH : https://raidboxes.de
+// Submitted by Auke Tembrink <hostmaster@raidboxes.de>
+myrdbx.io
+site.rb-hosting.io
+
+// Railway Corporation : https://railway.com
+// Submitted by Phineas Walton <dns@railway.com>
+up.railway.app
 
 // Rancher Labs, Inc : https://rancher.com
 // Submitted by Vincent Fiduccia <domains@rancher.com>
-*.on-k3s.io
 *.on-rancher.cloud
+*.on-k3s.io
 *.on-rio.io
 
+// RavPage : https://www.ravpage.co.il
+// Submitted by Roni Horowitz <roni@responder.co.il>
+ravpage.co.il
+
 // Read The Docs, Inc : https://www.readthedocs.org
 // Submitted by David Fischer <team@readthedocs.org>
+readthedocs-hosted.com
 readthedocs.io
 
 // Red Hat, Inc. OpenShift : https://openshift.redhat.com/
 // Submitted by Tim Kramer <tkramer@rhcloud.com>
 rhcloud.com
 
+// Redgate Software : https://red-gate.com
+// Submitted by Andrew Farries <andrew.farries@red-gate.com>
+instances.spawn.cc
+
+// Redpanda Data : https://redpanda.com
+// Submitted by Infrastructure Team <security@redpanda.com>
+*.clusters.rdpa.co
+*.srvrless.rdpa.co
+
 // Render : https://render.com
 // Submitted by Anurag Goel <dev@render.com>
-app.render.com
 onrender.com
+app.render.com
 
 // Repl.it : https://repl.it
-// Submitted by Lincoln Bergeson <lincoln@replit.com>
+// Submitted by Lincoln Bergeson <psl@repl.it>
+replit.app
+id.replit.app
 firewalledreplit.co
 id.firewalledreplit.co
 repl.co
 id.repl.co
+replit.dev
+archer.replit.dev
+bones.replit.dev
+canary.replit.dev
+global.replit.dev
+hacker.replit.dev
+id.replit.dev
+janeway.replit.dev
+kim.replit.dev
+kira.replit.dev
+kirk.replit.dev
+odo.replit.dev
+paris.replit.dev
+picard.replit.dev
+pike.replit.dev
+prerelease.replit.dev
+reed.replit.dev
+riker.replit.dev
+sisko.replit.dev
+spock.replit.dev
+staging.replit.dev
+sulu.replit.dev
+tarpit.replit.dev
+teams.replit.dev
+tucker.replit.dev
+wesley.replit.dev
+worf.replit.dev
 repl.run
 
 // Resin.io : https://resin.io
@@ -13538,11 +15341,6 @@ devices.resinstaging.io
 // Submitted by Chris Kastorff <info@rethinkdb.com>
 hzc.io
 
-// Revitalised Limited : http://www.revitalised.co.uk
-// Submitted by Jack Price <jack@revitalised.co.uk>
-wellbeingzone.eu
-wellbeingzone.co.uk
-
 // Rico Developments Limited : https://adimo.co
 // Submitted by Colin Brown <hello@adimo.co>
 adimo.co.uk
@@ -13551,6 +15349,16 @@ adimo.co.uk
 // Submitted by Micah Anderson <micah@riseup.net>
 itcouldbewor.se
 
+// Roar Domains LLC : https://roar.basketball/
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+aus.basketball
+nz.basketball
+
+// ROBOT PAYMENT INC. : https://www.robotpayment.co.jp/
+// Submitted by Kentaro Takamori <takamori.kentaro@robotpayment.co.jp>
+subsc-pay.com
+subsc-pay.net
+
 // Rochester Institute of Technology : http://www.rit.edu/
 // Submitted by Jennifer Herting <jchits@rit.edu>
 git-pages.rit.edu
@@ -13559,7 +15367,13 @@ git-pages.rit.edu
 // Submitted by Neil Hanlon <neil@resf.org>
 rocky.page
 
-// Rusnames Limited: http://rusnames.ru/
+// Ruhr University Bochum : https://www.ruhr-uni-bochum.de/
+// Submitted by Andreas Jobs <noc@ruhr-uni-bochum.de>
+rub.de
+ruhr-uni-bochum.de
+io.noc.ruhr-uni-bochum.de
+
+// Rusnames Limited : http://rusnames.ru/
 // Submitted by Sergey Zotov <admin@rusnames.ru>
 ะฑะธะท.ั€ัƒั
 ะบะพะผ.ั€ัƒั
@@ -13572,6 +15386,14 @@ rocky.page
 ัะฟะฑ.ั€ัƒั
 ั.ั€ัƒั
 
+// Russian Academy of Sciences
+// Submitted by Tech Support <support@rasnet.ru>
+ras.ru
+
+// Sakura Frp : https://www.natfrp.com
+// Submitted by Bobo Liu <support@natfrp.cloud>
+nyat.app
+
 // SAKURA Internet Inc. : https://www.sakura.ad.jp/
 // Submitted by Internet Service Department <rs-vendor-ml@sakura.ad.jp>
 180r.com
@@ -13622,45 +15444,95 @@ x0.to
 from.tv
 sakura.tv
 
-// Salesforce.com, Inc. https://salesforce.com/
-// Submitted by Michael Biven <mbiven@salesforce.com>
+// Salesforce.com, Inc. : https://salesforce.com/
+// Submitted by Salesforce Public Suffix List Team <public-suffix-list@salesforce.com>
 *.builder.code.com
 *.dev-builder.code.com
 *.stg-builder.code.com
+*.001.test.code-builder-stg.platform.salesforce.com
+*.aa.crm.dev
+*.ab.crm.dev
+*.ac.crm.dev
+*.ad.crm.dev
+*.ae.crm.dev
+*.af.crm.dev
+*.ci.crm.dev
+*.d.crm.dev
+*.pa.crm.dev
+*.pb.crm.dev
+*.pc.crm.dev
+*.pd.crm.dev
+*.pe.crm.dev
+*.pf.crm.dev
+*.w.crm.dev
+*.wa.crm.dev
+*.wb.crm.dev
+*.wc.crm.dev
+*.wd.crm.dev
+*.we.crm.dev
+*.wf.crm.dev
 
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
 sandcats.io
 
+// Sav.com, LLC : https://marketing.sav.com/
+// Submitted by Mukul Kudegave <mukul@sav.com>
+sav.case
+
 // SBE network solutions GmbH : https://www.sbe.de/
 // Submitted by Norman Meilick <nm@sbe.de>
-logoip.de
 logoip.com
+logoip.de
 
 // Scaleway : https://www.scaleway.com/
-// Submitted by Rรฉmy Lรฉone <rleone@scaleway.com>
+// Submitted by Scaleway PSL Maintainer <psl-maintainers@scaleway.com>
 fr-par-1.baremetal.scw.cloud
 fr-par-2.baremetal.scw.cloud
 nl-ams-1.baremetal.scw.cloud
+cockpit.fr-par.scw.cloud
+ddl.fr-par.scw.cloud
+dtwh.fr-par.scw.cloud
 fnc.fr-par.scw.cloud
 functions.fnc.fr-par.scw.cloud
+ifr.fr-par.scw.cloud
 k8s.fr-par.scw.cloud
 nodes.k8s.fr-par.scw.cloud
+kafk.fr-par.scw.cloud
+mgdb.fr-par.scw.cloud
+rdb.fr-par.scw.cloud
 s3.fr-par.scw.cloud
 s3-website.fr-par.scw.cloud
+scbl.fr-par.scw.cloud
 whm.fr-par.scw.cloud
 priv.instances.scw.cloud
 pub.instances.scw.cloud
 k8s.scw.cloud
+cockpit.nl-ams.scw.cloud
+ddl.nl-ams.scw.cloud
+dtwh.nl-ams.scw.cloud
+ifr.nl-ams.scw.cloud
 k8s.nl-ams.scw.cloud
 nodes.k8s.nl-ams.scw.cloud
+kafk.nl-ams.scw.cloud
+mgdb.nl-ams.scw.cloud
+rdb.nl-ams.scw.cloud
 s3.nl-ams.scw.cloud
 s3-website.nl-ams.scw.cloud
+scbl.nl-ams.scw.cloud
 whm.nl-ams.scw.cloud
+cockpit.pl-waw.scw.cloud
+ddl.pl-waw.scw.cloud
+dtwh.pl-waw.scw.cloud
+ifr.pl-waw.scw.cloud
 k8s.pl-waw.scw.cloud
 nodes.k8s.pl-waw.scw.cloud
+kafk.pl-waw.scw.cloud
+mgdb.pl-waw.scw.cloud
+rdb.pl-waw.scw.cloud
 s3.pl-waw.scw.cloud
 s3-website.pl-waw.scw.cloud
+scbl.pl-waw.scw.cloud
 scalebook.scw.cloud
 smartlabeling.scw.cloud
 dedibox.fr
@@ -13669,7 +15541,7 @@ dedibox.fr
 // Submitted by Hanno Bรถck <hanno@schokokeks.org>
 schokokeks.net
 
-// Scottish Government: https://www.gov.scot
+// Scottish Government : https://www.gov.scot
 // Submitted by Martin Ellis <martin.ellis@gov.scot>
 gov.scot
 service.gov.scot
@@ -13678,6 +15550,10 @@ service.gov.scot
 // Submitted by Shante Adam <shante@skyhat.io>
 scrysec.com
 
+// Scrypted : https://scrypted.app
+// Submitted by Koushik Dutta <public-suffix-list@scrypted.app>
+client.scrypted.io
+
 // Securepoint GmbH : https://www.securepoint.de
 // Submitted by Erik Anders <erik.anders@securepoint.de>
 firewall-gateway.com
@@ -13699,17 +15575,17 @@ seidat.net
 // Submitted by Yuriy Romadin <contact@sellfy.com>
 sellfy.store
 
+// Sendmsg : https://www.sendmsg.co.il
+// Submitted by Assaf Stern <domains@comstar.co.il>
+minisite.ms
+
 // Senseering GmbH : https://www.senseering.de
 // Submitted by Felix Mรถnckemeyer <f.moenckemeyer@senseering.de>
 senseering.net
 
-// Sendmsg: https://www.sendmsg.co.il
-// Submitted by Assaf Stern <domains@comstar.co.il>
-minisite.ms
-
-// Service Magnet : https://myservicemagnet.com
-// Submitted by Dave Sanders <dave@myservicemagnet.com>
-magnet.page
+// Servebolt AS : https://servebolt.com
+// Submitted by Daniel Kjeserud <cloudops@servebolt.com>
+servebolt.cloud
 
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
@@ -13717,14 +15593,13 @@ biz.ua
 co.ua
 pp.ua
 
-// Shift Crypto AG : https://shiftcrypto.ch
-// Submitted by alex <alex@shiftcrypto.ch>
-shiftcrypto.dev
-shiftcrypto.io
+// Shanghai Accounting Society : https://www.sasf.org.cn
+// Submitted by Information Administration <info@sasf.org.cn>
+as.sh.cn
 
-// ShiftEdit : https://shiftedit.net/
-// Submitted by Adam Jimenez <adam@shiftcreate.com>
-shiftedit.io
+// Sheezy.Art : https://sheezy.art
+// Submitted by Nyoom <admin@sheezy.art>
+sheezy.games
 
 // Shopblocks : http://www.shopblocks.com/
 // Submitted by Alex Bowers <alex@shopblocks.com>
@@ -13740,6 +15615,7 @@ shopitsite.com
 
 // shopware AG : https://shopware.com
 // Submitted by Jens Kรผper <cloud@shopware.com>
+shopware.shop
 shopware.store
 
 // Siemens Mobility GmbH
@@ -13758,24 +15634,32 @@ vipsinaapp.com
 // Submitted by Skylar Challand <support@siteleaf.com>
 siteleaf.net
 
-// Skyhat : http://www.skyhat.io
-// Submitted by Shante Adam <shante@skyhat.io>
-bounty-full.com
-alpha.bounty-full.com
-beta.bounty-full.com
-
 // Small Technology Foundation : https://small-tech.org
 // Submitted by Aral Balkan <aral@small-tech.org>
 small-web.org
 
+// Smallregistry by Promopixel SARL : https://www.smallregistry.net
+// Former AFNIC's SLDs
+// Submitted by Jรฉrรดme Lipowicz <support@promopixel.com>
+aeroport.fr
+avocat.fr
+chambagri.fr
+chirurgiens-dentistes.fr
+experts-comptables.fr
+medecin.fr
+notaires.fr
+pharmacien.fr
+port.fr
+veterinaire.fr
+
 // Smoove.io : https://www.smoove.io/
 // Submitted by Dan Kozak <dan@smoove.io>
 vp4.me
 
 // Snowflake Inc : https://www.snowflake.com/
-// Submitted by Faith Olapade <faith.olapade@snowflake.com>
-snowflake.app
-privatelink.snowflake.app
+// Submitted by Sam Haar <psl@snowflake.com>
+*.snowflake.app
+*.privatelink.snowflake.app
 streamlit.app
 streamlitapp.com
 
@@ -13783,51 +15667,40 @@ streamlitapp.com
 // Submitted by Ian Streeter <ian@snowplowanalytics.com>
 try-snowplow.com
 
-// SourceHut : https://sourcehut.org
-// Submitted by Drew DeVault <sir@cmpwn.com>
-srht.site
-
-// Stackhero : https://www.stackhero.io
-// Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
-stackhero-network.com
-
-// Staclar : https://staclar.com
-// Submitted by Q Misell <q@staclar.com>
-musician.io
-// Submitted by Matthias Merkel <matthias.merkel@staclar.com>
-novecore.site
-
-// staticland : https://static.land
-// Submitted by Seth Vincent <sethvincent@gmail.com>
-static.land
-dev.static.land
-sites.static.land
-
-// Storebase : https://www.storebase.io
-// Submitted by Tony Schirmer <tony@storebase.io>
-storebase.store
+// Software Consulting Michal Zalewski : https://www.mafelo.com
+// Submitted by Michal Zalewski <security@mafelo.com>
+mafelo.net
 
-// Strategic System Consulting (eApps Hosting): https://www.eapps.com/
-// Submitted by Alex Oancea <aoancea@cloudscale365.com>
-vps-host.net
-atl.jelastic.vps-host.net
-njs.jelastic.vps-host.net
-ric.jelastic.vps-host.net
+// Solana Name Service :  https://sns.id
+// Submitted by Solana Name Service <contact@sns.id>
+sol.site
 
 // Sony Interactive Entertainment LLC : https://sie.com/
 // Submitted by David Coles <david.coles@sony.com>
 playstation-cloud.com
 
+// SourceHut : https://sourcehut.org
+// Submitted by Drew DeVault <sir@cmpwn.com>
+srht.site
+
 // SourceLair PC : https://www.sourcelair.com
 // Submitted by Antonis Kalipetis <akalipetis@sourcelair.com>
 apps.lair.io
 *.stolos.io
 
-// SpaceKit : https://www.spacekit.io/
-// Submitted by Reza Akhavan <spacekit.io@gmail.com>
-spacekit.io
+// sourceWAY GmbH : https://sourceway.de
+// Submitted by Richard Reiber <mail@sourceway.de>
+4.at
+my.at
+my.de
+*.nxa.eu
+nx.gw
+
+// Spawnbase : https://spawnbase.ai
+// Submitted by Alexander Zuev <security@spawnbase.ai>
+spawnbase.app
 
-// SpeedPartner GmbH: https://www.speedpartner.de/
+// SpeedPartner GmbH : https://www.speedpartner.de/
 // Submitted by Stefan Neufeind <info@speedpartner.de>
 customer.speedpartner.de
 
@@ -13853,38 +15726,107 @@ myspreadshop.pl
 myspreadshop.se
 myspreadshop.co.uk
 
+// StackBlitz : https://stackblitz.com
+// Submitted by Dominic Elm & Albert Pai <security@bolt.new>
+w-corp-staticblitz.com
+w-credentialless-staticblitz.com
+w-staticblitz.com
+bolt.host
+
+// Stackhero : https://www.stackhero.io
+// Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
+stackhero-network.com
+
+// STACKIT GmbH & Co. KG : https://www.stackit.de/en/
+// Submitted by STACKIT-DNS Team (Simon Stier) <dns@stackit.cloud>
+runs.onstackit.cloud
+stackit.gg
+stackit.rocks
+stackit.run
+stackit.zone
+
+// Stackryze : https://stackryze.com
+// Submitted by Sudheer Bhuvana <security@stackryze.com>
+indevs.in
+
+// Staclar : https://staclar.com
+// Submitted by Q Misell <q@staclar.com>
+// Submitted by Matthias Merkel <matthias.merkel@staclar.com>
+musician.io
+novecore.site
+
 // Standard Library : https://stdlib.com
 // Submitted by Jacob Lee <jacob@stdlib.com>
 api.stdlib.com
 
+// statichost.eu : https://www.statichost.eu
+// Submitted by Eric Selin <admin@statichost.eu>
+statichost.page
+
+// stereosense GmbH : https://www.involve.me
+// Submitted by Florian Burmann <publicsuffix@involve.me>
+feedback.ac
+forms.ac
+assessments.cx
+calculators.cx
+funnels.cx
+paynow.cx
+quizzes.cx
+researched.cx
+tests.cx
+surveys.so
+
+// Storacha Network : https://storacha.network
+// Submitted by Alan Shaw <support@storacha.network>
+ipfs.storacha.link
+ipfs.w3s.link
+
+// Storebase : https://www.storebase.io
+// Submitted by Tony Schirmer <tony@storebase.io>
+storebase.store
+
 // Storj Labs Inc. : https://storj.io/
 // Submitted by Philip Hutchins <hostmaster@storj.io>
 storj.farm
 
-// Studenten Net Twente : http://www.snt.utwente.nl/
-// Submitted by Silke Hofstra <syscom@snt.utwente.nl>
-utwente.io
+// Strapi : https://strapi.io/
+// Submitted by Florent Baldino <security@strapi.io>
+strapiapp.com
+media.strapiapp.com
+
+// Strategic System Consulting (eApps Hosting) : https://www.eapps.com/
+// Submitted by Alex Oancea <aoancea@cloudscale365.com>
+vps-host.net
+atl.jelastic.vps-host.net
+njs.jelastic.vps-host.net
+ric.jelastic.vps-host.net
+
+// Streak : https://streak.com
+// Submitted by Blake Kadatz <eng@streak.com>
+streak-link.com
+streaklinks.com
+streakusercontent.com
 
 // Student-Run Computing Facility : https://www.srcf.net/
 // Submitted by Edwin Balani <sysadmins@srcf.net>
 soc.srcf.net
 user.srcf.net
 
-// Sub 6 Limited: http://www.sub6.com
+// Studenten Net Twente : http://www.snt.utwente.nl/
+// Submitted by Silke Hofstra <syscom@snt.utwente.nl>
+utwente.io
+
+// Sub 6 Limited : http://www.sub6.com
 // Submitted by Dan Miller <dm@sub6.com>
 temp-dns.com
 
 // Supabase : https://supabase.io
-// Submitted by Inian Parameshwaran <security@supabase.io>
+// Submitted by Supabase Security <psl-maintainers@supabase.io>
 supabase.co
+realtime.supabase.co
+storage.supabase.co
 supabase.in
 supabase.net
-su.paba.se
-
-// Symfony, SAS : https://symfony.com/
-// Submitted by Fabien Potencier <fabien@symfony.com>
-*.s5y.io
-*.sensiosite.cloud
 
 // Syncloud : https://syncloud.org
 // Submitted by Boris Rybalkin <syncloud@syncloud.it>
@@ -13906,34 +15848,61 @@ dsmynas.net
 familyds.net
 dsmynas.org
 familyds.org
-vpnplus.to
 direct.quickconnect.to
+vpnplus.to
 
 // Tabit Technologies Ltd. : https://tabit.cloud/
 // Submitted by Oren Agiv <oren@tabit.cloud>
-tabitorder.co.il
-mytabit.co.il
 mytabit.com
+mytabit.co.il
+tabitorder.co.il
 
 // TAIFUN Software AG : http://taifun-software.de
 // Submitted by Bjoern Henke <dev-server@taifun-software.de>
 taifun-dns.de
 
+// Tailor Inc. : https://www.tailor.tech
+// Submitted by Ryuzo Yamamoto <psl-maintainers@tailor.tech>
+erp.dev
+web.erp.dev
+
 // Tailscale Inc. : https://www.tailscale.com
-// Submitted by David Anderson <danderson@tailscale.com>
-beta.tailscale.net
+// Submitted by David Anderson <infra+public-suffix-list@tailscale.com>
 ts.net
+*.c.ts.net
 
-// TASK geographical domains (www.task.gda.pl/uslugi/dns)
+// TASK geographical domains : https://task.gda.pl/en/services/for-entrepreneurs/
 gda.pl
 gdansk.pl
 gdynia.pl
 med.pl
 sopot.pl
 
-// team.blue https://team.blue
-// Submitted by Cedric Dubois <cedric.dubois@team.blue>
+// Tave Creative Corp : https://tave.com/
+// Submitted by Adrian Ziemkowski <devops@tave.com>
+taveusercontent.com
+
+// tawk.to, Inc : https://www.tawk.to
+// Submitted by tawk.to developer team <dev-accounts@tawk.to>
+p.tawk.email
+p.tawkto.email
+
+// Tche.br : https://tche.br
+// Submitted by Bruno Lorensi <suporte@tche.br>
+tche.br
+
+// team.blue : https://team.blue
+// Submitted by Cedric Dubois <psl-sh@team.blue>
 site.tb-hosting.com
+directwp.eu
+
+// TechEdge Limited: https://www.nic.uk.cc/
+// Submitted by TechEdge Developer <support@nic.uk.cc>
+ec.cc
+eu.cc
+gu.cc
+uk.cc
+us.cc
 
 // Teckids e.V. : https://www.teckids.org
 // Submitted by Dominik George <dominik.george@teckids.org>
@@ -13946,6 +15915,10 @@ telebit.app
 telebit.io
 *.telebit.xyz
 
+// Teleport : https://goteleport.com
+// Submitted by Rob Picard <security@goteleport.com>
+teleport.sh
+
 // Thingdust AG : https://thingdust.com/
 // Submitted by Adrian Imboden <adi@thingdust.com>
 *.firenet.ch
@@ -13953,11 +15926,11 @@ telebit.io
 reservd.com
 thingdustdata.com
 cust.dev.thingdust.io
+reservd.dev.thingdust.io
 cust.disrec.thingdust.io
+reservd.disrec.thingdust.io
 cust.prod.thingdust.io
 cust.testing.thingdust.io
-reservd.dev.thingdust.io
-reservd.disrec.thingdust.io
 reservd.testing.thingdust.io
 
 // ticket i/O GmbH : https://ticket.io
@@ -13971,13 +15944,12 @@ azimuth.network
 tlon.network
 
 // Tor Project, Inc. : https://torproject.org
-// Submitted by Antoine Beauprรฉ <anarcat@torproject.org
+// Submitted by Antoine Beauprรฉ <anarcat@torproject.org>
 torproject.net
 pages.torproject.net
 
 // TownNews.com : http://www.townnews.com
 // Submitted by Dustin Ward <dward@townnews.com>
-bloxcms.com
 townnews-staging.com
 
 // TrafficPlex GmbH : https://www.trafficplex.de/
@@ -14003,59 +15975,60 @@ webspace.rocks
 lima.zone
 
 // TransIP : https://www.transip.nl
-// Submitted by Rory Breuk <rbreuk@transip.nl>
+// Submitted by Rory Breuk <rbreuk@transip.nl> and Cedric Dubois <cedric.dubois@team.blue>
 *.transurl.be
 *.transurl.eu
+site.transip.me
 *.transurl.nl
 
-// TransIP: https://www.transip.nl
-// Submitted by Cedric Dubois <cedric.dubois@team.blue>
-site.transip.me
+// Tunnelmole: https://tunnelmole.com
+// Submitted by Robbie Cahill <support@tunnelmole.com>
+tunnelmole.net
 
 // TuxFamily : http://tuxfamily.org
 // Submitted by TuxFamily administrators <adm@staff.tuxfamily.org>
 tuxfamily.org
 
-// TwoDNS : https://www.twodns.de/
-// Submitted by TwoDNS-Support <support@two-dns.de>
-dd-dns.de
-diskstation.eu
-diskstation.org
-dray-dns.de
-draydns.de
-dyn-vpn.de
-dynvpn.de
-mein-vigor.de
-my-vigor.de
-my-wan.de
-syno-ds.de
-synology-diskstation.de
-synology-ds.de
-
 // Typedream : https://typedream.com
 // Submitted by Putri Karunia <putri@typedream.com>
 typedream.app
 
 // Typeform : https://www.typeform.com
-// Submitted by Sergi Ferriz <sergi.ferriz@typeform.com>
+// Submitted by Typeform <ops@typeform.com>
 pro.typeform.com
 
 // Uberspace : https://uberspace.de
 // Submitted by Moritz Werner <mwerner@jonaspasche.com>
 uber.space
-*.uberspace.de
 
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmaster@udr.hk.com>
 hk.com
-hk.org
-ltd.hk
 inc.hk
+ltd.hk
+hk.org
 
 // UK Intis Telecom LTD : https://it.com
 // Submitted by ITComdomains <to@it.com>
 it.com
 
+// Umso Software Inc. : https://www.umso.com
+// Submitted by Alexis Taylor <security@umso.com>
+umso.co
+
+// Unison Computing, PBC : https://unison.cloud
+// Submitted by Simon Hรธjberg <security@unison.cloud>
+unison-services.cloud
+
+// United Gameserver GmbH : https://united-gameserver.de
+// Submitted by Stefan Schwarz <sysadm@united-gameserver.de>
+virtual-user.de
+virtualuser.de
+
+// United States Writing Corporation : https://uswriting.co
+// Submitted by Andrew Sampson <security@obj.ag>
+obj.ag
+
 // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
 // see also: whois -h whois.udr.org.yt help
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@udr.org.yt>
@@ -14065,92 +16038,62 @@ biz.wf
 sch.wf
 org.yt
 
-// United Gameserver GmbH : https://united-gameserver.de
-// Submitted by Stefan Schwarz <sysadm@united-gameserver.de>
-virtualuser.de
-virtual-user.de
+// University of Banja Luka : https://unibl.org
+// Domains for Republic of Srpska administrative entity.
+// Submitted by Marko Ivanovic <kormang@hotmail.rs>
+rs.ba
 
-// Upli : https://upli.io
-// Submitted by Lenny Bakkalian <lenny.bakkalian@gmail.com>
-upli.io
+// University of Bielsko-Biala regional domain : http://dns.bielsko.pl/
+// Submitted by Marcin <dns@ath.bielsko.pl>
+bielsko.pl
 
 // urown.net : https://urown.net
 // Submitted by Hostmaster <hostmaster@urown.net>
 urown.cloud
 dnsupdate.info
 
-// .US
-// Submitted by Ed Moore <Ed.Moore@lib.de.us>
-lib.de.us
+// US REGISTRY LLC : http://us.org
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+us.org
 
-// VeryPositive SIA : http://very.lv
-// Submitted by Danko Aleksejevs <danko@very.lv>
-2038.io
+// V.UA Domain Registry: https://www.v.ua/
+// Submitted by Serhii Rostilo <admin@v.ua>
+v.ua
+
+// Val Town, Inc : https://val.town/
+// Submitted by Tom MacWright <security@val.town>
+val.run
+web.val.run
 
 // Vercel, Inc : https://vercel.com/
-// Submitted by Connor Davis <security@vercel.com>
+// Submitted by Laurens Duijvesteijn <security@vercel.com>
 vercel.app
+v0.build
 vercel.dev
+vusercontent.net
+vercel.run
 now.sh
 
-// Viprinet Europe GmbH : http://www.viprinet.com
-// Submitted by Simon Kissel <hostmaster@viprinet.com>
-router.management
+// VeryPositive SIA : http://very.lv
+// Submitted by Danko Aleksejevs <danko@very.lv>
+2038.io
 
 // Virtual-Info : https://www.virtual-info.info/
 // Submitted by Adnan RIHAN <hostmaster@v-info.info>
 v-info.info
 
-// Voorloper.com: https://voorloper.com
+// VistaBlog : https://vistablog.ir/
+// Submitted by Hossein Piri <info@vistablog.ir>
+vistablog.ir
+
+// Viva Republica, Inc. : https://toss.im/
+// Submitted by Deus Team <deus@toss.im>
+deus-canvas.com
+
+// Voorloper.com : https://voorloper.com
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
-// Voxel.sh DNS : https://voxel.sh/dns/
-// Submitted by Mia Rehlinger <dns@voxel.sh>
-neko.am
-nyaa.am
-be.ax
-cat.ax
-es.ax
-eu.ax
-gg.ax
-mc.ax
-us.ax
-xy.ax
-nl.ci
-xx.gl
-app.gp
-blog.gt
-de.gt
-to.gt
-be.gy
-cc.hn
-blog.kg
-io.kg
-jp.kg
-tv.kg
-uk.kg
-us.kg
-de.ls
-at.md
-de.md
-jp.md
-to.md
-indie.porn
-vxl.sh
-ch.tc
-me.tc
-we.tc
-nyan.to
-at.vg
-blog.vu
-dev.vu
-me.vu
-
-// V.UA Domain Administrator : https://domain.v.ua/
-// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
-v.ua
-
 // Vultr Objects : https://www.vultr.com/products/object-storage/
 // Submitted by Niels Maumenee <storage@vultr.com>
 *.vultrobjects.com
@@ -14159,42 +16102,95 @@ v.ua
 // Submitted by Masayuki Note <masa@blade.wafflecell.com>
 wafflecell.com
 
-// WebHare bv: https://www.webhare.com/
+// Walrus : https://walrus.xyz
+// Submitted by Max Spector <info@walrus.xyz>
+wal.app
+
+// Wasmer: https://wasmer.io
+// Submitted by Lorentz Kinde <security@wasmer.io>
+wasmer.app
+
+// Webflow, Inc. : https://www.webflow.com
+// Submitted by Webflow Security Team <security@webflow.com>
+webflow.io
+webflowtest.io
+
+// WebHare bv : https://www.webhare.com/
 // Submitted by Arnold Hendriks <info@webhare.com>
 *.webhare.dev
 
-// WebHotelier Technologies Ltd: https://www.webhotelier.net/
+// WebHotelier Technologies Ltd : https://www.webhotelier.net/
 // Submitted by Apostolos Tsakpinis <apostolos.tsakpinis@gmail.com>
-reserve-online.net
-reserve-online.com
 bookonline.app
 hotelwithflight.com
+reserve-online.com
+reserve-online.net
+
+// WebPros International, LLC : https://webpros.com/
+// Submitted by Nicolas Rochelemagne <public.suffix@webpros.com>
+cprapid.com
+pleskns.com
+wp2.host
+pdns.page
+plesk.page
+cpanel.site
+wpsquared.site
 
-// WeDeploy by Liferay, Inc. : https://www.wedeploy.com
-// Submitted by Henrique Vicente <security@wedeploy.com>
-wedeploy.io
-wedeploy.me
-wedeploy.sh
+// WebWaddle Ltd : https://webwaddle.com/
+// Submitted by Merlin Glander <hostmaster@webwaddle.com>
+*.wadl.top
 
 // Western Digital Technologies, Inc : https://www.wdc.com
 // Submitted by Jung Jin <jungseok.jin@wdc.com>
 remotewd.com
 
+// Whatbox Inc. : https://whatbox.ca/
+// Submitted by Anthony Ryan <servers@whatbox.ca>
+box.ca
+
 // WIARD Enterprises : https://wiardweb.com
 // Submitted by Kidd Hustle <kiddhustle@wiardweb.com>
 pages.wiardweb.com
 
-// Wikimedia Labs : https://wikitech.wikimedia.org
-// Submitted by Arturo Borrero Gonzalez <aborrero@wikimedia.org>
-wmflabs.org
+// Wikimedia Foundation : https://wikitech.wikimedia.org
+// Submitted by Timo Tijhof <noc@wikimedia.org>
 toolforge.org
 wmcloud.org
+beta.wmcloud.org
+wmflabs.org
+
+// William Harrison : https://wharrison.com.au
+// Submitted by William Harrison <security@hrsn.net>
+vps.hrsn.au
+hrsn.dev
+is-a.dev
+localcert.net
+
+// Windsurf : https://windsurf.com
+// Submitted by Douglas Chen <psl@windsurf.com>
+windsurf.app
+windsurf.build
+
+// WirelessCar : https://wirelesscar.com
+// Submitted by Martin Lindberg <drive-platform@wirelesscar.com>
+drive-platform.com
+drive-platform.io
 
 // WISP : https://wisp.gg
 // Submitted by Stepan Fedotov <stepan@wisp.gg>
 panel.gg
 daemon.panel.gg
 
+// Wix.com, Inc. : https://www.wix.com
+// Submitted by Shahar Talmi / Alon Kochba <publicsuffixlist@wix.com>
+base44.app
+base44-sandbox.com
+wixsite.com
+wixstudio.com
+editorx.io
+wixstudio.io
+wix.run
+
 // Wizard Zines : https://wizardzines.com
 // Submitted by Julia Evans <julia@wizardzines.com>
 messwithdns.com
@@ -14220,13 +16216,9 @@ weeklylottery.org.uk
 wpenginepowered.com
 js.wpenginepowered.com
 
-// Wix.com, Inc. : https://www.wix.com
-// Submitted by Shahar Talmi <shahar@wix.com>
-wixsite.com
-editorx.io
-
-// XenonCloud GbR: https://xenoncloud.net
+// XenonCloud GbR : https://xenoncloud.net
 // Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
+*.xenonconnect.de
 half.host
 
 // XnBay Technology : http://www.xnbay.com/
@@ -14241,11 +16233,16 @@ cistron.nl
 demon.nl
 xs4all.space
 
-// Yandex.Cloud LLC: https://cloud.yandex.com
+// xTool : https://xtool.com
+// Submitted by Echo <admin@xtool.com>
+xtooldevice.com
+
+// Yandex.Cloud LLC : https://cloud.yandex.com
 // Submitted by Alexander Lodin <security+psl@yandex-team.ru>
 yandexcloud.net
 storage.yandexcloud.net
 website.yandexcloud.net
+sourcecraft.site
 
 // YesCourse Pty Ltd : https://yescourse.com
 // Submitted by Atul Bhouraskar <atul@yescourse.com>
@@ -14255,16 +16252,6 @@ official.academy
 // Submitted by Stefano Rivera <stefano@yola.com>
 yolasite.com
 
-// Yombo : https://yombo.net
-// Submitted by Mitch Schwenk <mitch@yombo.net>
-ybo.faith
-yombo.me
-homelink.one
-ybo.party
-ybo.review
-ybo.science
-ybo.trade
-
 // Yunohost : https://yunohost.org
 // Submitted by Valentin Grimaud <security@yunohost.org>
 ynh.fr
@@ -14276,6 +16263,18 @@ noho.st
 za.net
 za.org
 
+// ZAP-Hosting GmbH & Co. KG : https://zap-hosting.com
+// Submitted by Julian Alker <security@zap-hosting.com>
+zap.cloud
+
+// Zeabur : https://zeabur.com/
+// Submitted by Zeabur Team <contact@zeabur.com>
+zeabur.app
+
+// Zerops : https://zerops.io/
+// Submitted by Zerops Team <security@zerops.io>
+*.zerops.app
+
 // Zine EOOD : https://zine.bg/
 // Submitted by Martin Angelov <martin@zine.bg>
 bss.design
@@ -14286,4 +16285,13 @@ basicserver.io
 virtualserver.io
 enterprisecloud.nu
 
+// Zone.ID: https://zone.id
+// Submitted by Gx1.org <security@gx1.org>
+zone.id
+nett.to
+
+// ZoneABC : https://zoneabc.net
+// Submitted by ZoneABC Team <support@zoneabc.net>
+zabc.net
+
 // ===END PRIVATE DOMAINS===
diff --git a/libs/tld/res/effective_tld_names_public_only.dat.txt b/libs/tld/res/effective_tld_names_public_only.dat.txt
index c1ce374050..eedd6a437a 100644
--- a/libs/tld/res/effective_tld_names_public_only.dat.txt
+++ b/libs/tld/res/effective_tld_names_public_only.dat.txt
@@ -5,6 +5,9 @@
 // Please pull this list from, and only from https://publicsuffix.org/list/public_suffix_list.dat,
 // rather than any other VCS sites. Pulling from any other URL is not guaranteed to be supported.
 
+// VERSION: 2026-03-06_02-20-37_UTC
+// COMMIT: a7621207f34b3a739a5cfb2c47a518b0b9054fe6
+
 // Instructions on pulling and using this list can be found at https://publicsuffix.org/list/.
 
 // ===BEGIN ICANN DOMAINS===
@@ -14,40 +17,48 @@ ac
 com.ac
 edu.ac
 gov.ac
-net.ac
 mil.ac
+net.ac
 org.ac
 
-// ad : https://en.wikipedia.org/wiki/.ad
+// ad : https://www.iana.org/domains/root/db/ad.html
+// Confirmed by Amadeu Abril i Abril (CORE) <amadeu.abril@corenic.org> 2024-11-17
 ad
-nom.ad
 
-// ae : https://tdra.gov.ae/en/aeda/ae-policies
+// ae : https://www.iana.org/domains/root/db/ae.html
 ae
+ac.ae
 co.ae
+gov.ae
+mil.ae
 net.ae
 org.ae
 sch.ae
-ac.ae
-gov.ae
-mil.ae
 
-// aero : see https://www.information.aero/index.php?id=66
+// aero : https://information.aero/registration/policies/dmp
 aero
+// 2LDs
+airline.aero
+airport.aero
+// 2LDs (currently not accepting registration, seemingly never have)
+// As of 2024-07, these are marked as reserved for potential 3LD
+// registrations (clause 11 "allocated subdomains" in the 2006 TLD
+// policy), but the relevant industry partners have not opened them up
+// for registration. Current status can be determined from the TLD's
+// policy document: 2LDs that are open for registration must list
+// their policy in the TLD's policy. Any 2LD without such a policy is
+// not open for registrations.
 accident-investigation.aero
 accident-prevention.aero
 aerobatic.aero
 aeroclub.aero
 aerodrome.aero
 agents.aero
-aircraft.aero
-airline.aero
-airport.aero
 air-surveillance.aero
-airtraffic.aero
 air-traffic-control.aero
+aircraft.aero
+airtraffic.aero
 ambulance.aero
-amusement.aero
 association.aero
 author.aero
 ballooning.aero
@@ -78,6 +89,7 @@ exchange.aero
 express.aero
 federation.aero
 flight.aero
+freight.aero
 fuel.aero
 gliding.aero
 government.aero
@@ -92,6 +104,7 @@ leasing.aero
 logistics.aero
 magazine.aero
 maintenance.aero
+marketplace.aero
 media.aero
 microlight.aero
 modelling.aero
@@ -114,6 +127,7 @@ show.aero
 skydiving.aero
 software.aero
 student.aero
+taxi.aero
 trader.aero
 trading.aero
 trainer.aero
@@ -121,27 +135,27 @@ union.aero
 workinggroup.aero
 works.aero
 
-// af : http://www.nic.af/help.jsp
+// af : https://www.nic.af/domain-price
 af
-gov.af
 com.af
-org.af
-net.af
 edu.af
+gov.af
+net.af
+org.af
 
 // ag : http://www.nic.ag/prices.htm
 ag
+co.ag
 com.ag
-org.ag
 net.ag
-co.ag
 nom.ag
+org.ag
 
 // ai : http://nic.com.ai/
 ai
-off.ai
 com.ai
 net.ai
+off.ai
 org.ai
 
 // al : http://www.ert.gov.al/ert_alb/faq_det.html?Id=31
@@ -154,6 +168,7 @@ net.al
 org.al
 
 // am : https://www.amnic.net/policy/en/Policy_EN.pdf
+// Confirmed by ISOC AM <isoc@isoc.am> 2024-11-18
 am
 co.am
 com.am
@@ -161,17 +176,20 @@ commune.am
 net.am
 org.am
 
-// ao : https://en.wikipedia.org/wiki/.ao
-// http://www.dns.ao/REGISTR.DOC
+// ao : https://www.iana.org/domains/root/db/ao.html
+// https://www.dns.ao/ao/
 ao
+co.ao
 ed.ao
+edu.ao
+gov.ao
 gv.ao
+it.ao
 og.ao
-co.ao
+org.ao
 pb.ao
-it.ao
 
-// aq : https://en.wikipedia.org/wiki/.aq
+// aq : https://www.iana.org/domains/root/db/aq.html
 aq
 
 // ar : https://nic.ar/es/nic-argentina/normativa
@@ -188,51 +206,53 @@ musica.ar
 mutual.ar
 net.ar
 org.ar
+seg.ar
 senasa.ar
 tur.ar
 
-// arpa : https://en.wikipedia.org/wiki/.arpa
+// arpa : https://www.iana.org/domains/root/db/arpa.html
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
 arpa
 e164.arpa
+home.arpa
 in-addr.arpa
 ip6.arpa
 iris.arpa
 uri.arpa
 urn.arpa
 
-// as : https://en.wikipedia.org/wiki/.as
+// as : https://www.iana.org/domains/root/db/as.html
 as
 gov.as
 
-// asia : https://en.wikipedia.org/wiki/.asia
+// asia : https://www.iana.org/domains/root/db/asia.html
 asia
 
-// at : https://en.wikipedia.org/wiki/.at
+// at : https://www.iana.org/domains/root/db/at.html
 // Confirmed by registry <it@nic.at> 2008-06-17
 at
 ac.at
+sth.ac.at
 co.at
 gv.at
 or.at
-sth.ac.at
 
-// au : https://en.wikipedia.org/wiki/.au
-// http://www.auda.org.au/
+// au : https://www.iana.org/domains/root/db/au.html
+// https://www.auda.org.au/
+// Confirmed by registry <general@auda.org.au> 2025-07-16
 au
 // 2LDs
+asn.au
 com.au
-net.au
-org.au
 edu.au
 gov.au
-asn.au
 id.au
+net.au
+org.au
 // Historic 2LDs (closed to new registration, but sites still exist)
-info.au
 conf.au
 oz.au
-// CGDNs - http://www.cgdn.org.au/
+// CGDNs : https://www.auda.org.au/au-domain-names/the-different-au-domain-names/state-and-territory-domain-names/
 act.au
 nsw.au
 nt.au
@@ -252,9 +272,9 @@ sa.edu.au
 tas.edu.au
 vic.edu.au
 wa.edu.au
-// act.gov.au  Bug 984824 - Removed at request of Greg Tankard
-// nsw.gov.au  Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
-// nt.gov.au  Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
+// act.gov.au - Bug 984824 - Removed at request of Greg Tankard
+// nsw.gov.au - Bug 547985 - Removed at request of <Shae.Donelan@services.nsw.gov.au>
+// nt.gov.au - Bug 940478 - Removed at request of Greg Connors <Greg.Connors@nt.gov.au>
 qld.gov.au
 sa.gov.au
 tas.gov.au
@@ -262,31 +282,35 @@ vic.gov.au
 wa.gov.au
 // 4LDs
 // education.tas.edu.au - Removed at the request of the Department of Education Tasmania
-schools.nsw.edu.au
+// schools.nsw.edu.au - Removed at the request of the New South Wales Department of Education.
 
-// aw : https://en.wikipedia.org/wiki/.aw
+// aw : https://www.iana.org/domains/root/db/aw.html
 aw
 com.aw
 
-// ax : https://en.wikipedia.org/wiki/.ax
+// ax : https://www.iana.org/domains/root/db/ax.html
 ax
 
-// az : https://en.wikipedia.org/wiki/.az
+// az : https://www.iana.org/domains/root/db/az.html
+// Confirmed via https://whois.az/?page_id=10 2024-12-11
 az
+biz.az
+co.az
 com.az
-net.az
-int.az
-gov.az
-org.az
 edu.az
+gov.az
 info.az
-pp.az
+int.az
 mil.az
 name.az
+net.az
+org.az
+pp.az
+// No longer available for registration, however domains exist as of 2024-12-11
+// see https://whois.az/?page_id=783
 pro.az
-biz.az
 
-// ba : http://nic.ba/users_data/files/pravilnik_o_registraciji.pdf
+// ba : https://www.iana.org/domains/root/db/ba.html
 ba
 com.ba
 edu.ba
@@ -295,7 +319,7 @@ mil.ba
 net.ba
 org.ba
 
-// bb : https://en.wikipedia.org/wiki/.bb
+// bb : https://www.iana.org/domains/root/db/bb.html
 bb
 biz.bb
 co.bb
@@ -308,21 +332,46 @@ org.bb
 store.bb
 tv.bb
 
-// bd : https://en.wikipedia.org/wiki/.bd
-*.bd
-
-// be : https://en.wikipedia.org/wiki/.be
+// bd : https://www.iana.org/domains/root/db/bd.html
+// Confirmed by registry <dgm.domain@btcl.gov.bd>
+bd
+ac.bd
+ai.bd
+co.bd
+com.bd
+edu.bd
+gov.bd
+id.bd
+info.bd
+it.bd
+mil.bd
+net.bd
+org.bd
+sch.bd
+tv.bd
+
+// be : https://www.iana.org/domains/root/db/be.html
 // Confirmed by registry <tech@dns.be> 2008-06-08
 be
 ac.be
 
-// bf : https://en.wikipedia.org/wiki/.bf
+// bf : https://www.iana.org/domains/root/db/bf.html
 bf
 gov.bf
 
-// bg : https://en.wikipedia.org/wiki/.bg
+// bg : https://www.iana.org/domains/root/db/bg.html
 // https://www.register.bg/user/static/rules/en/index.html
 bg
+0.bg
+1.bg
+2.bg
+3.bg
+4.bg
+5.bg
+6.bg
+7.bg
+8.bg
+9.bg
 a.bg
 b.bg
 c.bg
@@ -349,26 +398,16 @@ w.bg
 x.bg
 y.bg
 z.bg
-0.bg
-1.bg
-2.bg
-3.bg
-4.bg
-5.bg
-6.bg
-7.bg
-8.bg
-9.bg
 
-// bh : https://en.wikipedia.org/wiki/.bh
+// bh : https://www.iana.org/domains/root/db/bh.html
 bh
 com.bh
 edu.bh
+gov.bh
 net.bh
 org.bh
-gov.bh
 
-// bi : https://en.wikipedia.org/wiki/.bi
+// bi : https://www.iana.org/domains/root/db/bi.html
 // http://whois.nic.bi/
 bi
 co.bi
@@ -377,11 +416,11 @@ edu.bi
 or.bi
 org.bi
 
-// biz : https://en.wikipedia.org/wiki/.biz
+// biz : https://www.iana.org/domains/root/db/biz.html
 biz
 
 // bj : https://nic.bj/bj-suffixes.txt
-// submitted by registry <contact@nic.bj>
+// Submitted by registry <contact@nic.bj>
 bj
 africa.bj
 agro.bj
@@ -399,12 +438,12 @@ money.bj
 net.bj
 org.bj
 ote.bj
-resto.bj
 restaurant.bj
+resto.bj
 tourism.bj
 univ.bj
 
-// bm : http://www.bermudanic.bm/dnr-text.txt
+// bm : https://www.bermudanic.bm/domain-registration/index.php
 bm
 com.bm
 edu.bm
@@ -420,15 +459,16 @@ gov.bn
 net.bn
 org.bn
 
-// bo : https://nic.bo/delegacion2015.php#h-1.10
+// bo : https://nic.bo
+// Confirmed by registry <soporte@nic.bo> 2024-11-19
 bo
 com.bo
 edu.bo
 gob.bo
 int.bo
-org.bo
-net.bo
 mil.bo
+net.bo
+org.bo
 tv.bo
 web.bo
 // Social Domains
@@ -454,9 +494,9 @@ natural.bo
 nombre.bo
 noticias.bo
 patria.bo
+plurinacional.bo
 politica.bo
 profesional.bo
-plurinacional.bo
 pueblo.bo
 revista.bo
 salud.bo
@@ -477,6 +517,7 @@ aju.br
 am.br
 anani.br
 aparecida.br
+api.br
 app.br
 arq.br
 art.br
@@ -484,6 +525,7 @@ ato.br
 b.br
 barueri.br
 belem.br
+bet.br
 bhz.br
 bib.br
 bio.br
@@ -561,6 +603,7 @@ se.gov.br
 sp.gov.br
 to.gov.br
 gru.br
+ia.br
 imb.br
 ind.br
 inf.br
@@ -571,6 +614,7 @@ joinville.br
 jor.br
 jus.br
 leg.br
+leilao.br
 lel.br
 log.br
 londrina.br
@@ -620,6 +664,7 @@ seg.br
 sjc.br
 slg.br
 slz.br
+social.br
 sorocaba.br
 srv.br
 taxi.br
@@ -636,17 +681,18 @@ vet.br
 vix.br
 vlog.br
 wiki.br
+xyz.br
 zlg.br
 
 // bs : http://www.nic.bs/rules.html
 bs
 com.bs
-net.bs
-org.bs
 edu.bs
 gov.bs
+net.bs
+org.bs
 
-// bt : https://en.wikipedia.org/wiki/.bt
+// bt : https://www.iana.org/domains/root/db/bt.html
 bt
 com.bt
 edu.bt
@@ -658,14 +704,16 @@ org.bt
 // Submitted by registry <jarle@uninett.no>
 bv
 
-// bw : https://en.wikipedia.org/wiki/.bw
-// http://www.gobin.info/domainname/bw.doc
-// list of other 2nd level tlds ?
+// bw : https://www.iana.org/domains/root/db/bw.html
+// https://nic.net.bw/bw-name-structure
 bw
+ac.bw
 co.bw
+gov.bw
+net.bw
 org.bw
 
-// by : https://en.wikipedia.org/wiki/.by
+// by : https://www.iana.org/domains/root/db/by.html
 // http://tld.by/rules_2006_en.html
 // list of other 2nd level tlds ?
 by
@@ -675,20 +723,20 @@ mil.by
 // second-level domain, but it's being used as one (see www.google.com.by and
 // www.yahoo.com.by, for example), so we list it here for safety's sake.
 com.by
-
 // http://hoster.by/
 of.by
 
-// bz : https://en.wikipedia.org/wiki/.bz
+// bz : https://www.iana.org/domains/root/db/bz.html
 // http://www.belizenic.bz/
 bz
+co.bz
 com.bz
-net.bz
-org.bz
 edu.bz
 gov.bz
+net.bz
+org.bz
 
-// ca : https://en.wikipedia.org/wiki/.ca
+// ca : https://www.iana.org/domains/root/db/ca.html
 ca
 // ca geographical names
 ab.ca
@@ -709,46 +757,43 @@ yk.ca
 // see also: http://registry.gc.ca/en/SubdomainFAQ
 gc.ca
 
-// cat : https://en.wikipedia.org/wiki/.cat
+// cat : https://www.iana.org/domains/root/db/cat.html
 cat
 
-// cc : https://en.wikipedia.org/wiki/.cc
+// cc : https://www.iana.org/domains/root/db/cc.html
 cc
 
-// cd : https://en.wikipedia.org/wiki/.cd
-// see also: https://www.nic.cd/domain/insertDomain_2.jsp?act=1
+// cd : https://www.iana.org/domains/root/db/cd.html
+// https://www.nic.cd
 cd
 gov.cd
 
-// cf : https://en.wikipedia.org/wiki/.cf
+// cf : https://www.iana.org/domains/root/db/cf.html
 cf
 
-// cg : https://en.wikipedia.org/wiki/.cg
+// cg : https://www.iana.org/domains/root/db/cg.html
 cg
 
-// ch : https://en.wikipedia.org/wiki/.ch
+// ch : https://www.iana.org/domains/root/db/ch.html
 ch
 
-// ci : https://en.wikipedia.org/wiki/.ci
-// http://www.nic.ci/index.php?page=charte
+// ci : https://www.iana.org/domains/root/db/ci.html
 ci
-org.ci
-or.ci
-com.ci
+ac.ci
+aรฉroport.ci
+asso.ci
 co.ci
-edu.ci
+com.ci
 ed.ci
-ac.ci
-net.ci
+edu.ci
 go.ci
-asso.ci
-aรฉroport.ci
-int.ci
-presse.ci
-md.ci
 gouv.ci
+int.ci
+net.ci
+or.ci
+org.ci
 
-// ck : https://en.wikipedia.org/wiki/.ck
+// ck : https://www.iana.org/domains/root/db/ck.html
 *.ck
 !www.ck
 
@@ -760,26 +805,26 @@ gob.cl
 gov.cl
 mil.cl
 
-// cm : https://en.wikipedia.org/wiki/.cm plus bug 981927
+// cm : https://www.iana.org/domains/root/db/cm.html plus bug 981927
 cm
 co.cm
 com.cm
 gov.cm
 net.cm
 
-// cn : https://en.wikipedia.org/wiki/.cn
+// cn : https://www.iana.org/domains/root/db/cn.html
 // Submitted by registry <tanyaling@cnnic.cn>
 cn
 ac.cn
 com.cn
 edu.cn
 gov.cn
+mil.cn
 net.cn
 org.cn
-mil.cn
 ๅ…ฌๅธ.cn
-็ฝ‘็ปœ.cn
 ็ถฒ็ตก.cn
+็ฝ‘็ปœ.cn
 // cn geographic names
 ah.cn
 bj.cn
@@ -787,18 +832,20 @@ cq.cn
 fj.cn
 gd.cn
 gs.cn
-gz.cn
 gx.cn
+gz.cn
 ha.cn
 hb.cn
 he.cn
 hi.cn
+hk.cn
 hl.cn
 hn.cn
 jl.cn
 js.cn
 jx.cn
 ln.cn
+mo.cn
 nm.cn
 nx.cn
 qh.cn
@@ -808,38 +855,31 @@ sh.cn
 sn.cn
 sx.cn
 tj.cn
+tw.cn
 xj.cn
 xz.cn
 yn.cn
 zj.cn
-hk.cn
-mo.cn
-tw.cn
 
-// co : https://en.wikipedia.org/wiki/.co
-// Submitted by registry <tecnico@uniandes.edu.co>
+// co : https://www.iana.org/domains/root/db/co.html
+// https://www.cointernet.com.co/como-funciona-un-dominio-restringido
+// Confirmed by registry <gonzalo@cointernet.com.co> 2024-11-18
 co
-arts.co
 com.co
 edu.co
-firm.co
 gov.co
-info.co
-int.co
 mil.co
 net.co
 nom.co
 org.co
-rec.co
-web.co
 
-// com : https://en.wikipedia.org/wiki/.com
+// com : https://www.iana.org/domains/root/db/com.html
 com
 
-// coop : https://en.wikipedia.org/wiki/.coop
+// coop : https://www.iana.org/domains/root/db/coop.html
 coop
 
-// cr : http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
+// cr : https://nic.cr/capitulo-1-registro-de-un-nombre-de-dominio/
 cr
 ac.cr
 co.cr
@@ -849,40 +889,45 @@ go.cr
 or.cr
 sa.cr
 
-// cu : https://en.wikipedia.org/wiki/.cu
+// cu : https://www.iana.org/domains/root/db/cu.html
 cu
 com.cu
 edu.cu
-org.cu
-net.cu
-gov.cu
+gob.cu
 inf.cu
+nat.cu
+net.cu
+org.cu
 
-// cv : https://en.wikipedia.org/wiki/.cv
-// cv : http://www.dns.cv/tldcv_portal/do?com=DS;5446457100;111;+PAGE(4000018)+K-CAT-CODIGO(RDOM)+RCNT(100); <- registration rules
+// cv : https://www.iana.org/domains/root/db/cv.html
+// https://ola.cv/domain-extensions-under-cv/
+// Confirmed by registry <support@ola.cv> 2024-11-26
 cv
 com.cv
 edu.cv
+id.cv
 int.cv
+net.cv
 nome.cv
 org.cv
+publ.cv
 
-// cw : http://www.una.cw/cw_registry/
-// Confirmed by registry <registry@una.net> 2013-03-26
+// cw : https://www.uoc.cw/cw-registry
+// Confirmed by registry <registry@uoc.cw> 2024-11-19
 cw
 com.cw
 edu.cw
 net.cw
 org.cw
 
-// cx : https://en.wikipedia.org/wiki/.cx
+// cx : https://www.iana.org/domains/root/db/cx.html
 // list of other 2nd level tlds ?
 cx
 gov.cx
 
 // cy : http://www.nic.cy/
-// Submitted by registry Panayiotou Fotia <cydns@ucy.ac.cy>
-// namespace policies URL https://www.nic.cy/portal//sites/default/files/symfonia_gia_eggrafi.pdf
+// Submitted by Panayiotou Fotia <cydns@ucy.ac.cy>
+// https://nic.cy/wp-content/uploads/2024/01/Create-Request-for-domain-name-registration-1.pdf
 cy
 ac.cy
 biz.cy
@@ -897,30 +942,35 @@ press.cy
 pro.cy
 tm.cy
 
-// cz : https://en.wikipedia.org/wiki/.cz
+// cz : https://www.iana.org/domains/root/db/cz.html
+// Confirmed by registry <tech@nic.cz> 2025-08-06
 cz
+gov.cz
 
-// de : https://en.wikipedia.org/wiki/.de
+// de : https://www.iana.org/domains/root/db/de.html
 // Confirmed by registry <ops@denic.de> (with technical
 // reservations) 2008-07-01
 de
 
-// dj : https://en.wikipedia.org/wiki/.dj
+// dj : https://www.iana.org/domains/root/db/dj.html
 dj
 
-// dk : https://en.wikipedia.org/wiki/.dk
+// dk : https://www.iana.org/domains/root/db/dk.html
 // Confirmed by registry <robert@dk-hostmaster.dk> 2008-06-17
 dk
 
-// dm : https://en.wikipedia.org/wiki/.dm
+// dm : https://www.iana.org/domains/root/db/dm.html
+// https://nic.dm/policies/pdf/DMRulesandGuidelines2024v1.pdf
+// Confirmed by registry <admin@dotdm.dm> 2024-11-19
 dm
+co.dm
 com.dm
-net.dm
-org.dm
 edu.dm
 gov.dm
+net.dm
+org.dm
 
-// do : https://en.wikipedia.org/wiki/.do
+// do : https://www.iana.org/domains/root/db/do.html
 do
 art.do
 com.do
@@ -940,97 +990,142 @@ asso.dz
 com.dz
 edu.dz
 gov.dz
-org.dz
 net.dz
+org.dz
 pol.dz
 soc.dz
 tm.dz
 
-// ec : http://www.nic.ec/reg/paso1.asp
-// Submitted by registry <vabboud@nic.ec>
+// ec : https://www.nic.ec/
+// Submitted by registry <infraestructura@nic.ec>
 ec
+abg.ec
+adm.ec
+agron.ec
+arqt.ec
+art.ec
+bar.ec
+chef.ec
 com.ec
-info.ec
-net.ec
+cont.ec
+cpa.ec
+cue.ec
+dent.ec
+dgn.ec
+disco.ec
+doc.ec
+edu.ec
+eng.ec
+esm.ec
 fin.ec
+fot.ec
+gal.ec
+gob.ec
+gov.ec
+gye.ec
+ibr.ec
+info.ec
 k12.ec
+lat.ec
+loj.ec
 med.ec
-pro.ec
-org.ec
-edu.ec
-gov.ec
-gob.ec
 mil.ec
-
-// edu : https://en.wikipedia.org/wiki/.edu
+mktg.ec
+mon.ec
+net.ec
+ntr.ec
+odont.ec
+org.ec
+pro.ec
+prof.ec
+psic.ec
+psiq.ec
+pub.ec
+rio.ec
+rrpp.ec
+sal.ec
+tech.ec
+tul.ec
+tur.ec
+uio.ec
+vet.ec
+xxx.ec
+
+// edu : https://www.iana.org/domains/root/db/edu.html
 edu
 
-// ee : http://www.eenet.ee/EENet/dom_reeglid.html#lisa_B
+// ee : https://www.internet.ee/domains/general-domains-and-procedure-for-registration-of-sub-domains-under-general-domains
 ee
+aip.ee
+com.ee
 edu.ee
+fie.ee
 gov.ee
-riik.ee
 lib.ee
 med.ee
-com.ee
-pri.ee
-aip.ee
 org.ee
-fie.ee
+pri.ee
+riik.ee
 
-// eg : https://en.wikipedia.org/wiki/.eg
+// eg : https://www.iana.org/domains/root/db/eg.html
+// https://domain.eg/en/domain-rules/subdomain-names-types/
 eg
+ac.eg
 com.eg
 edu.eg
 eun.eg
 gov.eg
+info.eg
+me.eg
 mil.eg
 name.eg
 net.eg
 org.eg
 sci.eg
+sport.eg
+tv.eg
 
-// er : https://en.wikipedia.org/wiki/.er
+// er : https://www.iana.org/domains/root/db/er.html
 *.er
 
-// es : https://www.nic.es/site_ingles/ingles/dominios/index.html
+// es : https://www.dominios.es/en
 es
 com.es
+edu.es
+gob.es
 nom.es
 org.es
-gob.es
-edu.es
 
-// et : https://en.wikipedia.org/wiki/.et
+// et : https://www.iana.org/domains/root/db/et.html
 et
+biz.et
 com.et
-gov.et
-org.et
 edu.et
-biz.et
-name.et
+gov.et
 info.et
+name.et
 net.et
+org.et
 
-// eu : https://en.wikipedia.org/wiki/.eu
+// eu : https://www.iana.org/domains/root/db/eu.html
 eu
 
-// fi : https://en.wikipedia.org/wiki/.fi
+// fi : https://www.iana.org/domains/root/db/fi.html
 fi
-// aland.fi : https://en.wikipedia.org/wiki/.ax
+// aland.fi : https://www.iana.org/domains/root/db/ax.html
 // This domain is being phased out in favor of .ax. As there are still many
 // domains under aland.fi, we still keep it on the list until aland.fi is
 // completely removed.
-// TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
 
-// fj : http://domains.fj/
-// Submitted by registry <garth.miller@cocca.org.nz> 2020-02-11
+// fj : https://www.iana.org/domains/root/db/fj.html
 fj
 ac.fj
 biz.fj
 com.fj
+edu.fj
 gov.fj
+id.fj
 info.fj
 mil.fj
 name.fj
@@ -1038,21 +1133,20 @@ net.fj
 org.fj
 pro.fj
 
-// fk : https://en.wikipedia.org/wiki/.fk
+// fk : https://www.iana.org/domains/root/db/fk.html
 *.fk
 
-// fm : https://en.wikipedia.org/wiki/.fm
+// fm : https://www.iana.org/domains/root/db/fm.html
+fm
 com.fm
 edu.fm
 net.fm
 org.fm
-fm
 
-// fo : https://en.wikipedia.org/wiki/.fo
+// fo : https://www.iana.org/domains/root/db/fo.html
 fo
 
-// fr : http://www.afnic.fr/
-// domaines descriptifs : https://www.afnic.fr/medias/documents/Cadre_legal/Afnic_Naming_Policy_12122016_VEN.pdf
+// fr : https://www.afnic.fr/ https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 fr
 asso.fr
 com.fr
@@ -1060,76 +1154,68 @@ gouv.fr
 nom.fr
 prd.fr
 tm.fr
-// domaines sectoriels : https://www.afnic.fr/en/products-and-services/the-fr-tld/sector-based-fr-domains-4.html
-aeroport.fr
-avocat.fr
+// Other SLDs now selfmanaged out of AFNIC range. Former "domaines sectoriels", still registration suffixes
 avoues.fr
 cci.fr
-chambagri.fr
-chirurgiens-dentistes.fr
-experts-comptables.fr
-geometre-expert.fr
 greta.fr
 huissier-justice.fr
-medecin.fr
-notaires.fr
-pharmacien.fr
-port.fr
-veterinaire.fr
 
-// ga : https://en.wikipedia.org/wiki/.ga
+// ga : https://www.iana.org/domains/root/db/ga.html
 ga
 
 // gb : This registry is effectively dormant
 // Submitted by registry <Damien.Shaw@ja.net>
 gb
 
-// gd : https://en.wikipedia.org/wiki/.gd
+// gd : https://www.iana.org/domains/root/db/gd.html
+gd
 edu.gd
 gov.gd
-gd
 
-// ge : http://www.nic.net.ge/policy_en.pdf
+// ge : https://nic.ge/en/administrator/the-ge-domain-regulations
+// Confirmed by registry <info@nic.ge> 2024-11-20
 ge
 com.ge
 edu.ge
 gov.ge
-org.ge
-mil.ge
 net.ge
+org.ge
 pvt.ge
+school.ge
 
-// gf : https://en.wikipedia.org/wiki/.gf
+// gf : https://www.iana.org/domains/root/db/gf.html
 gf
 
-// gg : http://www.channelisles.net/register-domains/
+// gg : https://www.channelisles.net/register-1/register-direct
 // Confirmed by registry <nigel@channelisles.net> 2013-11-28
 gg
 co.gg
 net.gg
 org.gg
 
-// gh : https://en.wikipedia.org/wiki/.gh
-// see also: http://www.nic.gh/reg_now.php
+// gh : https://www.iana.org/domains/root/db/gh.html
+// https://www.nic.gh/
 // Although domains directly at second level are not possible at the moment,
 // they have been possible for some time and may come back.
 gh
+biz.gh
 com.gh
 edu.gh
 gov.gh
-org.gh
 mil.gh
+net.gh
+org.gh
 
 // gi : http://www.nic.gi/rules.html
 gi
 com.gi
-ltd.gi
+edu.gi
 gov.gi
+ltd.gi
 mod.gi
-edu.gi
 org.gi
 
-// gl : https://en.wikipedia.org/wiki/.gl
+// gl : https://www.iana.org/domains/root/db/gl.html
 // http://nic.gl
 gl
 co.gl
@@ -1148,34 +1234,34 @@ ac.gn
 com.gn
 edu.gn
 gov.gn
-org.gn
 net.gn
+org.gn
 
-// gov : https://en.wikipedia.org/wiki/.gov
+// gov : https://www.iana.org/domains/root/db/gov.html
 gov
 
 // gp : http://www.nic.gp/index.php?lang=en
 gp
+asso.gp
 com.gp
-net.gp
-mobi.gp
 edu.gp
+mobi.gp
+net.gp
 org.gp
-asso.gp
 
-// gq : https://en.wikipedia.org/wiki/.gq
+// gq : https://www.iana.org/domains/root/db/gq.html
 gq
 
-// gr : https://grweb.ics.forth.gr/english/1617-B-2005.html
+// gr : https://www.iana.org/domains/root/db/gr.html
 // Submitted by registry <segred@ics.forth.gr>
 gr
 com.gr
 edu.gr
+gov.gr
 net.gr
 org.gr
-gov.gr
 
-// gs : https://en.wikipedia.org/wiki/.gs
+// gs : https://www.iana.org/domains/root/db/gs.html
 gs
 
 // gt : https://www.gt/sitio/registration_policy.php?lang=en
@@ -1201,11 +1287,11 @@ net.gu
 org.gu
 web.gu
 
-// gw : https://en.wikipedia.org/wiki/.gw
+// gw : https://www.iana.org/domains/root/db/gw.html
 // gw : https://nic.gw/regras/
 gw
 
-// gy : https://en.wikipedia.org/wiki/.gy
+// gy : https://www.iana.org/domains/root/db/gy.html
 // http://registry.gy/
 gy
 co.gy
@@ -1224,103 +1310,104 @@ gov.hk
 idv.hk
 net.hk
 org.hk
+ไธชไบบ.hk
+ๅ€‹ไบบ.hk
 ๅ…ฌๅธ.hk
-ๆ•™่‚ฒ.hk
-ๆ•Ž่‚ฒ.hk
 ๆ”ฟๅบœ.hk
-ๅ€‹ไบบ.hk
-ไธชไบบ.hk
+ๆ•Ž่‚ฒ.hk
+ๆ•™่‚ฒ.hk
 ็ฎ‡ไบบ.hk
+็ต„็น”.hk
+็ต„็ป‡.hk
+็ถฒ็ตก.hk
 ็ถฒ็ปœ.hk
-็ฝ‘็ปœ.hk
 ็ป„็น”.hk
-็ถฒ็ตก.hk
-็ฝ‘็ตก.hk
 ็ป„็ป‡.hk
-็ต„็น”.hk
-็ต„็ป‡.hk
+็ฝ‘็ตก.hk
+็ฝ‘็ปœ.hk
 
-// hm : https://en.wikipedia.org/wiki/.hm
+// hm : https://www.iana.org/domains/root/db/hm.html
 hm
 
-// hn : http://www.nic.hn/politicas/ps02,,05.html
+// hn : https://www.iana.org/domains/root/db/hn.html
 hn
 com.hn
 edu.hn
-org.hn
-net.hn
-mil.hn
 gob.hn
+mil.hn
+net.hn
+org.hn
 
 // hr : http://www.dns.hr/documents/pdf/HRTLD-regulations.pdf
 hr
-iz.hr
+com.hr
 from.hr
+iz.hr
 name.hr
-com.hr
 
 // ht : http://www.nic.ht/info/charte.cfm
 ht
+adult.ht
+art.ht
+asso.ht
 com.ht
-shop.ht
+coop.ht
+edu.ht
 firm.ht
+gouv.ht
 info.ht
-adult.ht
+med.ht
 net.ht
-pro.ht
 org.ht
-med.ht
-art.ht
-coop.ht
+perso.ht
 pol.ht
-asso.ht
-edu.ht
+pro.ht
 rel.ht
-gouv.ht
-perso.ht
+shop.ht
 
-// hu : http://www.domain.hu/domain/English/sld.html
+// hu : https://www.iana.org/domains/root/db/hu.html
 // Confirmed by registry <pasztor@iszt.hu> 2008-06-12
 hu
-co.hu
-info.hu
-org.hu
-priv.hu
-sport.hu
-tm.hu
 2000.hu
 agrar.hu
 bolt.hu
 casino.hu
 city.hu
+co.hu
 erotica.hu
 erotika.hu
 film.hu
 forum.hu
 games.hu
 hotel.hu
+info.hu
 ingatlan.hu
 jogasz.hu
 konyvelo.hu
 lakas.hu
 media.hu
 news.hu
+org.hu
+priv.hu
 reklam.hu
 sex.hu
 shop.hu
+sport.hu
 suli.hu
 szex.hu
+tm.hu
 tozsde.hu
 utazas.hu
 video.hu
 
-// id : https://pandi.id/en/domain/registration-requirements/
+// id : https://www.iana.org/domains/root/db/id.html
 id
 ac.id
 biz.id
 co.id
 desa.id
 go.id
+kop.id
 mil.id
 my.id
 net.id
@@ -1328,14 +1415,16 @@ or.id
 ponpes.id
 sch.id
 web.id
+// xn--9tfky.id (<bali>.id, Und-Bali)
+แฌฉแฌฎแฌถ.id
 
-// ie : https://en.wikipedia.org/wiki/.ie
+// ie : https://www.iana.org/domains/root/db/ie.html
 ie
 gov.ie
 
-// il :         http://www.isoc.org.il/domains/
-// see also:    https://en.isoc.org.il/il-cctld/registration-rules
-// ISOC-IL      (operated by .il Registry)
+// il : http://www.isoc.org.il/domains/
+// see also: https://en.isoc.org.il/il-cctld/registration-rules
+// ISOC-IL (operated by .il Registry)
 il
 ac.il
 co.il
@@ -1361,24 +1450,26 @@ org.il
 im
 ac.im
 co.im
-com.im
 ltd.co.im
+plc.co.im
+com.im
 net.im
 org.im
-plc.co.im
 tt.im
 tv.im
 
-// in : https://en.wikipedia.org/wiki/.in
+// in : https://www.iana.org/domains/root/db/in.html
 // see also: https://registry.in/policies
 // Please note, that nic.in is not an official eTLD, but used by most
 // government institutions.
+// Confirmed by Gaurav Kansal <gaurav.kansal@nic.in> 2025-11-06
 in
 5g.in
 6g.in
 ac.in
 ai.in
 am.in
+bank.in
 bihar.in
 biz.in
 business.in
@@ -1392,6 +1483,7 @@ delhi.in
 dr.in
 edu.in
 er.in
+fin.in
 firm.in
 gen.in
 gov.in
@@ -1416,27 +1508,33 @@ uk.in
 up.in
 us.in
 
-// info : https://en.wikipedia.org/wiki/.info
+// info : https://www.iana.org/domains/root/db/info.html
 info
 
-// int : https://en.wikipedia.org/wiki/.int
+// int : https://www.iana.org/domains/root/db/int.html
 // Confirmed by registry <iana-questions@icann.org> 2008-06-18
 int
 eu.int
 
 // io : http://www.nic.io/rules.htm
-// list of other 2nd level tlds ?
 io
+co.io
 com.io
+edu.io
+gov.io
+mil.io
+net.io
+nom.io
+org.io
 
 // iq : http://www.cmc.iq/english/iq/iqregister1.htm
 iq
-gov.iq
+com.iq
 edu.iq
+gov.iq
 mil.iq
-com.iq
-org.iq
 net.iq
+org.iq
 
 // ir : http://www.nic.ir/Terms_and_Conditions_ir,_Appendix_1_Domain_Rules
 // Also see http://www.nic.ir/Internationalized_Domain_Names
@@ -1455,22 +1553,16 @@ sch.ir
 ุงูŠุฑุงู†.ir
 
 // is : http://www.isnic.is/domain/rules.php
-// Confirmed by registry <marius@isgate.is> 2008-12-06
+// Confirmed by registry <marius@isgate.is> 2024-11-17
 is
-net.is
-com.is
-edu.is
-gov.is
-org.is
-int.is
-
-// it : https://en.wikipedia.org/wiki/.it
+
+// it : https://www.iana.org/domains/root/db/it.html
+// https://www.nic.it/
 it
-gov.it
 edu.it
-// Reserved geo-names (regions and provinces):
-// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf
-// Regions
+gov.it
+// Regions (3.3.1)
+// https://www.nic.it/en/manage-your-it/forms-and-docs -> "Assignment and Management of domain names"
 abr.it
 abruzzo.it
 aosta-valley.it
@@ -1529,6 +1621,7 @@ trentin-sudtirol.it
 trentin-sรผdtirol.it
 trentin-sued-tirol.it
 trentin-suedtirol.it
+trentino.it
 trentino-a-adige.it
 trentino-aadige.it
 trentino-alto-adige.it
@@ -1541,7 +1634,6 @@ trentino-sudtirol.it
 trentino-sรผdtirol.it
 trentino-sued-tirol.it
 trentino-suedtirol.it
-trentino.it
 trentinoa-adige.it
 trentinoaadige.it
 trentinoalto-adige.it
@@ -1585,7 +1677,7 @@ vao.it
 vda.it
 ven.it
 veneto.it
-// Provinces
+// Provinces (3.3.2)
 ag.it
 agrigento.it
 al.it
@@ -1613,10 +1705,10 @@ at.it
 av.it
 avellino.it
 ba.it
+balsan.it
 balsan-sudtirol.it
 balsan-sรผdtirol.it
 balsan-suedtirol.it
-balsan.it
 bari.it
 barletta-trani-andria.it
 barlettatraniandria.it
@@ -1630,21 +1722,21 @@ bl.it
 bn.it
 bo.it
 bologna.it
-bolzano-altoadige.it
 bolzano.it
+bolzano-altoadige.it
+bozen.it
 bozen-sudtirol.it
 bozen-sรผdtirol.it
 bozen-suedtirol.it
-bozen.it
 br.it
 brescia.it
 brindisi.it
 bs.it
 bt.it
+bulsan.it
 bulsan-sudtirol.it
 bulsan-sรผdtirol.it
 bulsan-suedtirol.it
-bulsan.it
 bz.it
 ca.it
 cagliari.it
@@ -1746,9 +1838,9 @@ milano.it
 mn.it
 mo.it
 modena.it
+monza.it
 monza-brianza.it
 monza-e-della-brianza.it
-monza.it
 monzabrianza.it
 monzaebrianza.it
 monzaedellabrianza.it
@@ -1827,8 +1919,8 @@ sondrio.it
 sp.it
 sr.it
 ss.it
-suedtirol.it
 sรผdtirol.it
+suedtirol.it
 sv.it
 ta.it
 taranto.it
@@ -1877,7 +1969,7 @@ vs.it
 vt.it
 vv.it
 
-// je : http://www.channelisles.net/register-domains/
+// je : https://www.iana.org/domains/root/db/je.html
 // Confirmed by registry <nigel@channelisles.net> 2013-11-28
 je
 co.je
@@ -1887,23 +1979,30 @@ org.je
 // jm : http://www.com.jm/register.html
 *.jm
 
-// jo : http://www.dns.jo/Registration_policy.aspx
+// jo : https://www.dns.jo/JoFamily.aspx
+// Confirmed by registry <DNS@modee.gov.jo> 2024-11-17
 jo
+agri.jo
+ai.jo
 com.jo
-org.jo
-net.jo
 edu.jo
-sch.jo
+eng.jo
+fm.jo
 gov.jo
 mil.jo
-name.jo
+net.jo
+org.jo
+per.jo
+phd.jo
+sch.jo
+tv.jo
 
-// jobs : https://en.wikipedia.org/wiki/.jobs
+// jobs : https://www.iana.org/domains/root/db/jobs.html
 jobs
 
-// jp : https://en.wikipedia.org/wiki/.jp
+// jp : https://www.iana.org/domains/root/db/jp.html
 // http://jprs.co.jp/en/jpdomain.html
-// Submitted by registry <info@jprs.jp>
+// Confirmed by registry <info@jprs.jp> 2024-11-22
 jp
 // jp organizational type names
 ac.jp
@@ -1963,26 +2062,14 @@ wakayama.jp
 yamagata.jp
 yamaguchi.jp
 yamanashi.jp
-ๆ ƒๆœจ.jp
-ๆ„›็Ÿฅ.jp
-ๆ„›ๅช›.jp
+ไธ‰้‡.jp
+ไบฌ้ƒฝ.jp
+ไฝ่ณ€.jp
 ๅ…ตๅบซ.jp
-็†Šๆœฌ.jp
-่ŒจๅŸŽ.jp
 ๅŒ—ๆตท้“.jp
 ๅƒ่‘‰.jp
 ๅ’ŒๆญŒๅฑฑ.jp
-้•ทๅดŽ.jp
-้•ท้‡Ž.jp
-ๆ–ฐๆฝŸ.jp
-้’ๆฃฎ.jp
-้™ๅฒก.jp
-ๆฑไบฌ.jp
-็Ÿณๅท.jp
 ๅŸผ็Ž‰.jp
-ไธ‰้‡.jp
-ไบฌ้ƒฝ.jp
-ไฝ่ณ€.jp
 ๅคงๅˆ†.jp
 ๅคง้˜ช.jp
 ๅฅˆ่‰ฏ.jp
@@ -1992,39 +2079,54 @@ yamanashi.jp
 ๅฑฑๅฃ.jp
 ๅฑฑๅฝข.jp
 ๅฑฑๆขจ.jp
-ๅฒฉๆ‰‹.jp
 ๅฒ้˜œ.jp
 ๅฒกๅฑฑ.jp
+ๅฒฉๆ‰‹.jp
 ๅณถๆ น.jp
 ๅบƒๅณถ.jp
 ๅพณๅณถ.jp
+ๆ„›ๅช›.jp
+ๆ„›็Ÿฅ.jp
+ๆ–ฐๆฝŸ.jp
+ๆฑไบฌ.jp
+ๆ ƒๆœจ.jp
 ๆฒ–็ธ„.jp
 ๆป‹่ณ€.jp
+็†Šๆœฌ.jp
+็Ÿณๅท.jp
 ็ฅžๅฅˆๅท.jp
 ็ฆไบ•.jp
 ็ฆๅฒก.jp
 ็ฆๅณถ.jp
 ็ง‹็”ฐ.jp
 ็พค้ฆฌ.jp
+่ŒจๅŸŽ.jp
+้•ทๅดŽ.jp
+้•ท้‡Ž.jp
+้’ๆฃฎ.jp
+้™ๅฒก.jp
 ้ฆ™ๅท.jp
 ้ซ˜็Ÿฅ.jp
 ้ณฅๅ–.jp
 ้นฟๅ…ๅณถ.jp
 // jp geographic type names
 // http://jprs.jp/doc/rule/saisoku-1.html
+// 2024-11-22: JPRS confirmed that jp geographic type names no longer accept new registrations.
+// Once all existing registrations expire (marking full discontinuation), these suffixes
+// will be removed from the PSL.
 *.kawasaki.jp
-*.kitakyushu.jp
-*.kobe.jp
-*.nagoya.jp
-*.sapporo.jp
-*.sendai.jp
-*.yokohama.jp
 !city.kawasaki.jp
+*.kitakyushu.jp
 !city.kitakyushu.jp
+*.kobe.jp
 !city.kobe.jp
+*.nagoya.jp
 !city.nagoya.jp
+*.sapporo.jp
 !city.sapporo.jp
+*.sendai.jp
 !city.sendai.jp
+*.yokohama.jp
 !city.yokohama.jp
 // 4th level registration
 aisai.aichi.jp
@@ -3715,56 +3817,62 @@ sc.ke
 
 // kg : http://www.domain.kg/dmn_n.html
 kg
-org.kg
-net.kg
 com.kg
 edu.kg
 gov.kg
 mil.kg
+net.kg
+org.kg
 
-// kh : http://www.mptc.gov.kh/dns_registration.htm
-*.kh
+// kh : https://trc.gov.kh
+// Submitted by khnic@trc.gov.kh
+kh
+com.kh
+edu.kh
+gov.kh
+net.kh
+org.kh
 
-// ki : http://www.ki/dns/index.html
+// ki : https://www.iana.org/domains/root/db/ki.html
 ki
-edu.ki
 biz.ki
-net.ki
-org.ki
+com.ki
+edu.ki
 gov.ki
 info.ki
-com.ki
+net.ki
+org.ki
 
-// km : https://en.wikipedia.org/wiki/.km
+// km : https://www.iana.org/domains/root/db/km.html
 // http://www.domaine.km/documents/charte.doc
 km
-org.km
-nom.km
+ass.km
+com.km
+edu.km
 gov.km
+mil.km
+nom.km
+org.km
 prd.km
 tm.km
-edu.km
-mil.km
-ass.km
-com.km
 // These are only mentioned as proposed suggestions at domaine.km, but
-// https://en.wikipedia.org/wiki/.km says they're available for registration:
-coop.km
+// https://www.iana.org/domains/root/db/km.html says they're available for registration:
 asso.km
-presse.km
+coop.km
+gouv.km
 medecin.km
 notaires.km
 pharmaciens.km
+presse.km
 veterinaire.km
-gouv.km
 
-// kn : https://en.wikipedia.org/wiki/.kn
+// kn : https://www.iana.org/domains/root/db/kn.html
 // http://www.dot.kn/domainRules.html
 kn
-net.kn
-org.kn
 edu.kn
 gov.kn
+net.kn
+org.kn
 
 // kp : http://www.kcce.kp/en_index.php
 kp
@@ -3775,15 +3883,19 @@ org.kp
 rep.kp
 tra.kp
 
-// kr : https://en.wikipedia.org/wiki/.kr
-// see also: http://domain.nida.or.kr/eng/registration.jsp
+// kr : https://www.iana.org/domains/root/db/kr.html
+// see also: https://krnic.kisa.or.kr/jsp/infoboard/law/domBylawsReg.jsp
 kr
 ac.kr
+ai.kr
 co.kr
 es.kr
 go.kr
 hs.kr
+io.kr
+it.kr
 kg.kr
+me.kr
 mil.kr
 ms.kr
 ne.kr
@@ -3828,29 +3940,29 @@ edu.ky
 net.ky
 org.ky
 
-// kz : https://en.wikipedia.org/wiki/.kz
+// kz : https://www.iana.org/domains/root/db/kz.html
 // see also: http://www.nic.kz/rules/index.jsp
 kz
-org.kz
+com.kz
 edu.kz
-net.kz
 gov.kz
 mil.kz
-com.kz
+net.kz
+org.kz
 
-// la : https://en.wikipedia.org/wiki/.la
+// la : https://www.iana.org/domains/root/db/la.html
 // Submitted by registry <gavin.brown@nic.la>
 la
-int.la
-net.la
-info.la
+com.la
 edu.la
 gov.la
-per.la
-com.la
+info.la
+int.la
+net.la
 org.la
+per.la
 
-// lb : https://en.wikipedia.org/wiki/.lb
+// lb : https://www.iana.org/domains/root/db/lb.html
 // Submitted by registry <randy@psg.com>
 lb
 com.lb
@@ -3859,36 +3971,36 @@ gov.lb
 net.lb
 org.lb
 
-// lc : https://en.wikipedia.org/wiki/.lc
+// lc : https://www.iana.org/domains/root/db/lc.html
 // see also: http://www.nic.lc/rules.htm
 lc
-com.lc
-net.lc
 co.lc
-org.lc
+com.lc
 edu.lc
 gov.lc
+net.lc
+org.lc
 
-// li : https://en.wikipedia.org/wiki/.li
+// li : https://www.iana.org/domains/root/db/li.html
 li
 
-// lk : https://www.nic.lk/index.php/domain-registration/lk-domain-naming-structure
+// lk : https://www.iana.org/domains/root/db/lk.html
 lk
-gov.lk
-sch.lk
-net.lk
-int.lk
+ac.lk
+assn.lk
 com.lk
-org.lk
 edu.lk
+gov.lk
+grp.lk
+hotel.lk
+int.lk
+ltd.lk
+net.lk
 ngo.lk
+org.lk
+sch.lk
 soc.lk
 web.lk
-ltd.lk
-assn.lk
-grp.lk
-hotel.lk
-ac.lk
 
 // lr : http://psg.com/dns/lr/lr.txt
 // Submitted by registry <randy@psg.com>
@@ -3896,8 +4008,8 @@ lr
 com.lr
 edu.lr
 gov.lr
-org.lr
 net.lr
+org.lr
 
 // ls : http://www.nic.ls/
 // Confirmed by registry <lsadmin@nic.ls>
@@ -3912,7 +4024,7 @@ net.ls
 org.ls
 sc.ls
 
-// lt : https://en.wikipedia.org/wiki/.lt
+// lt : https://www.iana.org/domains/root/db/lt.html
 lt
 // gov.lt : http://www.gov.lt/index_en.php
 gov.lt
@@ -3920,131 +4032,136 @@ gov.lt
 // lu : http://www.dns.lu/en/
 lu
 
-// lv : http://www.nic.lv/DNS/En/generic.php
+// lv : https://www.iana.org/domains/root/db/lv.html
 lv
+asn.lv
 com.lv
+conf.lv
 edu.lv
 gov.lv
-org.lv
-mil.lv
 id.lv
+mil.lv
 net.lv
-asn.lv
-conf.lv
+org.lv
 
 // ly : http://www.nic.ly/regulations.php
 ly
 com.ly
-net.ly
-gov.ly
-plc.ly
 edu.ly
-sch.ly
+gov.ly
+id.ly
 med.ly
+net.ly
 org.ly
-id.ly
+plc.ly
+sch.ly
 
-// ma : https://en.wikipedia.org/wiki/.ma
+// ma : https://www.iana.org/domains/root/db/ma.html
 // http://www.anrt.ma/fr/admin/download/upload/file_fr782.pdf
 ma
+ac.ma
 co.ma
-net.ma
 gov.ma
+net.ma
 org.ma
-ac.ma
 press.ma
 
 // mc : http://www.nic.mc/
 mc
-tm.mc
 asso.mc
+tm.mc
 
-// md : https://en.wikipedia.org/wiki/.md
+// md : https://www.iana.org/domains/root/db/md.html
 md
 
-// me : https://en.wikipedia.org/wiki/.me
+// me : https://www.iana.org/domains/root/db/me.html
 me
+ac.me
 co.me
-net.me
-org.me
 edu.me
-ac.me
 gov.me
 its.me
+net.me
+org.me
 priv.me
 
-// mg : http://nic.mg/nicmg/?page_id=39
+// mg : https://nic.mg
 mg
-org.mg
-nom.mg
-gov.mg
-prd.mg
-tm.mg
+co.mg
+com.mg
 edu.mg
+gov.mg
 mil.mg
-com.mg
-co.mg
+nom.mg
+org.mg
+prd.mg
 
-// mh : https://en.wikipedia.org/wiki/.mh
+// mh : https://www.iana.org/domains/root/db/mh.html
 mh
 
-// mil : https://en.wikipedia.org/wiki/.mil
+// mil : https://www.iana.org/domains/root/db/mil.html
 mil
 
-// mk : https://en.wikipedia.org/wiki/.mk
+// mk : https://www.iana.org/domains/root/db/mk.html
 // see also: http://dns.marnet.net.mk/postapka.php
 mk
 com.mk
-org.mk
-net.mk
 edu.mk
 gov.mk
 inf.mk
 name.mk
+net.mk
+org.mk
 
-// ml : http://www.gobin.info/domainname/ml-template.doc
-// see also: https://en.wikipedia.org/wiki/.ml
+// ml : https://www.iana.org/domains/root/db/ml.html
+// Confirmed by Boubacar NDIAYE <bndiaye@agetic.gouv.ml> 2024-12-31
 ml
+ac.ml
+art.ml
+asso.ml
 com.ml
 edu.ml
 gouv.ml
 gov.ml
+info.ml
+inst.ml
 net.ml
 org.ml
+pr.ml
 presse.ml
 
-// mm : https://en.wikipedia.org/wiki/.mm
+// mm : https://www.iana.org/domains/root/db/mm.html
 *.mm
 
-// mn : https://en.wikipedia.org/wiki/.mn
+// mn : https://www.iana.org/domains/root/db/mn.html
 mn
-gov.mn
 edu.mn
+gov.mn
 org.mn
 
 // mo : http://www.monic.net.mo/
 mo
 com.mo
-net.mo
-org.mo
 edu.mo
 gov.mo
+net.mo
+org.mo
 
-// mobi : https://en.wikipedia.org/wiki/.mobi
+// mobi : https://www.iana.org/domains/root/db/mobi.html
 mobi
 
 // mp : http://www.dot.mp/
 // Confirmed by registry <dcamacho@saipan.com> 2008-06-17
 mp
 
-// mq : https://en.wikipedia.org/wiki/.mq
+// mq : https://www.iana.org/domains/root/db/mq.html
 mq
 
-// mr : https://en.wikipedia.org/wiki/.mr
+// mr : https://www.iana.org/domains/root/db/mr.html
 mr
 gov.mr
 
-// ms : http://www.nic.ms/pdf/MS_Domain_Name_Rules.pdf
+// ms : https://www.iana.org/domains/root/db/ms.html
 ms
 com.ms
 edu.ms
@@ -4060,567 +4177,20 @@ edu.mt
 net.mt
 org.mt
 
-// mu : https://en.wikipedia.org/wiki/.mu
+// mu : https://www.iana.org/domains/root/db/mu.html
 mu
-com.mu
-net.mu
-org.mu
-gov.mu
 ac.mu
 co.mu
+com.mu
+gov.mu
+net.mu
 or.mu
+org.mu
 
-// museum : http://about.museum/naming/
-// http://index.museum/
+// museum : https://welcome.museum/wp-content/uploads/2018/05/20180525-Registration-Policy-MUSEUM-EN_VF-2.pdf https://welcome.museum/buy-your-dot-museum-2/
 museum
-academy.museum
-agriculture.museum
-air.museum
-airguard.museum
-alabama.museum
-alaska.museum
-amber.museum
-ambulance.museum
-american.museum
-americana.museum
-americanantiques.museum
-americanart.museum
-amsterdam.museum
-and.museum
-annefrank.museum
-anthro.museum
-anthropology.museum
-antiques.museum
-aquarium.museum
-arboretum.museum
-archaeological.museum
-archaeology.museum
-architecture.museum
-art.museum
-artanddesign.museum
-artcenter.museum
-artdeco.museum
-arteducation.museum
-artgallery.museum
-arts.museum
-artsandcrafts.museum
-asmatart.museum
-assassination.museum
-assisi.museum
-association.museum
-astronomy.museum
-atlanta.museum
-austin.museum
-australia.museum
-automotive.museum
-aviation.museum
-axis.museum
-badajoz.museum
-baghdad.museum
-bahn.museum
-bale.museum
-baltimore.museum
-barcelona.museum
-baseball.museum
-basel.museum
-baths.museum
-bauern.museum
-beauxarts.museum
-beeldengeluid.museum
-bellevue.museum
-bergbau.museum
-berkeley.museum
-berlin.museum
-bern.museum
-bible.museum
-bilbao.museum
-bill.museum
-birdart.museum
-birthplace.museum
-bonn.museum
-boston.museum
-botanical.museum
-botanicalgarden.museum
-botanicgarden.museum
-botany.museum
-brandywinevalley.museum
-brasil.museum
-bristol.museum
-british.museum
-britishcolumbia.museum
-broadcast.museum
-brunel.museum
-brussel.museum
-brussels.museum
-bruxelles.museum
-building.museum
-burghof.museum
-bus.museum
-bushey.museum
-cadaques.museum
-california.museum
-cambridge.museum
-can.museum
-canada.museum
-capebreton.museum
-carrier.museum
-cartoonart.museum
-casadelamoneda.museum
-castle.museum
-castres.museum
-celtic.museum
-center.museum
-chattanooga.museum
-cheltenham.museum
-chesapeakebay.museum
-chicago.museum
-children.museum
-childrens.museum
-childrensgarden.museum
-chiropractic.museum
-chocolate.museum
-christiansburg.museum
-cincinnati.museum
-cinema.museum
-circus.museum
-civilisation.museum
-civilization.museum
-civilwar.museum
-clinton.museum
-clock.museum
-coal.museum
-coastaldefence.museum
-cody.museum
-coldwar.museum
-collection.museum
-colonialwilliamsburg.museum
-coloradoplateau.museum
-columbia.museum
-columbus.museum
-communication.museum
-communications.museum
-community.museum
-computer.museum
-computerhistory.museum
-comunicaรงรตes.museum
-contemporary.museum
-contemporaryart.museum
-convent.museum
-copenhagen.museum
-corporation.museum
-correios-e-telecomunicaรงรตes.museum
-corvette.museum
-costume.museum
-countryestate.museum
-county.museum
-crafts.museum
-cranbrook.museum
-creation.museum
-cultural.museum
-culturalcenter.museum
-culture.museum
-cyber.museum
-cymru.museum
-dali.museum
-dallas.museum
-database.museum
-ddr.museum
-decorativearts.museum
-delaware.museum
-delmenhorst.museum
-denmark.museum
-depot.museum
-design.museum
-detroit.museum
-dinosaur.museum
-discovery.museum
-dolls.museum
-donostia.museum
-durham.museum
-eastafrica.museum
-eastcoast.museum
-education.museum
-educational.museum
-egyptian.museum
-eisenbahn.museum
-elburg.museum
-elvendrell.museum
-embroidery.museum
-encyclopedic.museum
-england.museum
-entomology.museum
-environment.museum
-environmentalconservation.museum
-epilepsy.museum
-essex.museum
-estate.museum
-ethnology.museum
-exeter.museum
-exhibition.museum
-family.museum
-farm.museum
-farmequipment.museum
-farmers.museum
-farmstead.museum
-field.museum
-figueres.museum
-filatelia.museum
-film.museum
-fineart.museum
-finearts.museum
-finland.museum
-flanders.museum
-florida.museum
-force.museum
-fortmissoula.museum
-fortworth.museum
-foundation.museum
-francaise.museum
-frankfurt.museum
-franziskaner.museum
-freemasonry.museum
-freiburg.museum
-fribourg.museum
-frog.museum
-fundacio.museum
-furniture.museum
-gallery.museum
-garden.museum
-gateway.museum
-geelvinck.museum
-gemological.museum
-geology.museum
-georgia.museum
-giessen.museum
-glas.museum
-glass.museum
-gorge.museum
-grandrapids.museum
-graz.museum
-guernsey.museum
-halloffame.museum
-hamburg.museum
-handson.museum
-harvestcelebration.museum
-hawaii.museum
-health.museum
-heimatunduhren.museum
-hellas.museum
-helsinki.museum
-hembygdsforbund.museum
-heritage.museum
-histoire.museum
-historical.museum
-historicalsociety.museum
-historichouses.museum
-historisch.museum
-historisches.museum
-history.museum
-historyofscience.museum
-horology.museum
-house.museum
-humanities.museum
-illustration.museum
-imageandsound.museum
-indian.museum
-indiana.museum
-indianapolis.museum
-indianmarket.museum
-intelligence.museum
-interactive.museum
-iraq.museum
-iron.museum
-isleofman.museum
-jamison.museum
-jefferson.museum
-jerusalem.museum
-jewelry.museum
-jewish.museum
-jewishart.museum
-jfk.museum
-journalism.museum
-judaica.museum
-judygarland.museum
-juedisches.museum
-juif.museum
-karate.museum
-karikatur.museum
-kids.museum
-koebenhavn.museum
-koeln.museum
-kunst.museum
-kunstsammlung.museum
-kunstunddesign.museum
-labor.museum
-labour.museum
-lajolla.museum
-lancashire.museum
-landes.museum
-lans.museum
-lรคns.museum
-larsson.museum
-lewismiller.museum
-lincoln.museum
-linz.museum
-living.museum
-livinghistory.museum
-localhistory.museum
-london.museum
-losangeles.museum
-louvre.museum
-loyalist.museum
-lucerne.museum
-luxembourg.museum
-luzern.museum
-mad.museum
-madrid.museum
-mallorca.museum
-manchester.museum
-mansion.museum
-mansions.museum
-manx.museum
-marburg.museum
-maritime.museum
-maritimo.museum
-maryland.museum
-marylhurst.museum
-media.museum
-medical.museum
-medizinhistorisches.museum
-meeres.museum
-memorial.museum
-mesaverde.museum
-michigan.museum
-midatlantic.museum
-military.museum
-mill.museum
-miners.museum
-mining.museum
-minnesota.museum
-missile.museum
-missoula.museum
-modern.museum
-moma.museum
-money.museum
-monmouth.museum
-monticello.museum
-montreal.museum
-moscow.museum
-motorcycle.museum
-muenchen.museum
-muenster.museum
-mulhouse.museum
-muncie.museum
-museet.museum
-museumcenter.museum
-museumvereniging.museum
-music.museum
-national.museum
-nationalfirearms.museum
-nationalheritage.museum
-nativeamerican.museum
-naturalhistory.museum
-naturalhistorymuseum.museum
-naturalsciences.museum
-nature.museum
-naturhistorisches.museum
-natuurwetenschappen.museum
-naumburg.museum
-naval.museum
-nebraska.museum
-neues.museum
-newhampshire.museum
-newjersey.museum
-newmexico.museum
-newport.museum
-newspaper.museum
-newyork.museum
-niepce.museum
-norfolk.museum
-north.museum
-nrw.museum
-nyc.museum
-nyny.museum
-oceanographic.museum
-oceanographique.museum
-omaha.museum
-online.museum
-ontario.museum
-openair.museum
-oregon.museum
-oregontrail.museum
-otago.museum
-oxford.museum
-pacific.museum
-paderborn.museum
-palace.museum
-paleo.museum
-palmsprings.museum
-panama.museum
-paris.museum
-pasadena.museum
-pharmacy.museum
-philadelphia.museum
-philadelphiaarea.museum
-philately.museum
-phoenix.museum
-photography.museum
-pilots.museum
-pittsburgh.museum
-planetarium.museum
-plantation.museum
-plants.museum
-plaza.museum
-portal.museum
-portland.museum
-portlligat.museum
-posts-and-telecommunications.museum
-preservation.museum
-presidio.museum
-press.museum
-project.museum
-public.museum
-pubol.museum
-quebec.museum
-railroad.museum
-railway.museum
-research.museum
-resistance.museum
-riodejaneiro.museum
-rochester.museum
-rockart.museum
-roma.museum
-russia.museum
-saintlouis.museum
-salem.museum
-salvadordali.museum
-salzburg.museum
-sandiego.museum
-sanfrancisco.museum
-santabarbara.museum
-santacruz.museum
-santafe.museum
-saskatchewan.museum
-satx.museum
-savannahga.museum
-schlesisches.museum
-schoenbrunn.museum
-schokoladen.museum
-school.museum
-schweiz.museum
-science.museum
-scienceandhistory.museum
-scienceandindustry.museum
-sciencecenter.museum
-sciencecenters.museum
-science-fiction.museum
-sciencehistory.museum
-sciences.museum
-sciencesnaturelles.museum
-scotland.museum
-seaport.museum
-settlement.museum
-settlers.museum
-shell.museum
-sherbrooke.museum
-sibenik.museum
-silk.museum
-ski.museum
-skole.museum
-society.museum
-sologne.museum
-soundandvision.museum
-southcarolina.museum
-southwest.museum
-space.museum
-spy.museum
-square.museum
-stadt.museum
-stalbans.museum
-starnberg.museum
-state.museum
-stateofdelaware.museum
-station.museum
-steam.museum
-steiermark.museum
-stjohn.museum
-stockholm.museum
-stpetersburg.museum
-stuttgart.museum
-suisse.museum
-surgeonshall.museum
-surrey.museum
-svizzera.museum
-sweden.museum
-sydney.museum
-tank.museum
-tcm.museum
-technology.museum
-telekommunikation.museum
-television.museum
-texas.museum
-textile.museum
-theater.museum
-time.museum
-timekeeping.museum
-topology.museum
-torino.museum
-touch.museum
-town.museum
-transport.museum
-tree.museum
-trolley.museum
-trust.museum
-trustee.museum
-uhren.museum
-ulm.museum
-undersea.museum
-university.museum
-usa.museum
-usantiques.museum
-usarts.museum
-uscountryestate.museum
-usculture.museum
-usdecorativearts.museum
-usgarden.museum
-ushistory.museum
-ushuaia.museum
-uslivinghistory.museum
-utah.museum
-uvic.museum
-valley.museum
-vantaa.museum
-versailles.museum
-viking.museum
-village.museum
-virginia.museum
-virtual.museum
-virtuel.museum
-vlaanderen.museum
-volkenkunde.museum
-wales.museum
-wallonie.museum
-war.museum
-washingtondc.museum
-watchandclock.museum
-watch-and-clock.museum
-western.museum
-westfalen.museum
-whaling.museum
-wildlife.museum
-williamsburg.museum
-windmill.museum
-workshop.museum
-york.museum
-yorkshire.museum
-yosemite.museum
-youth.museum
-zoological.museum
-zoology.museum
-ื™ืจื•ืฉืœื™ื.museum
-ะธะบะพะผ.museum
-
-// mv : https://en.wikipedia.org/wiki/.mv
+
+// mv : https://www.iana.org/domains/root/db/mv.html
 // "mv" included because, contra Wikipedia, google.mv exists.
 mv
 aero.mv
@@ -4648,7 +4218,6 @@ coop.mw
 edu.mw
 gov.mw
 int.mw
-museum.mw
 net.mw
 org.mw
 
@@ -4656,10 +4225,10 @@ org.mw
 // Submitted by registry <farias@nic.mx>
 mx
 com.mx
-org.mx
-gob.mx
 edu.mx
+gob.mx
 net.mx
+org.mx
 
 // my : http://www.mynic.my/
 // Available strings: https://mynic.my/resources/domains/buying-a-domain/
@@ -4686,27 +4255,16 @@ net.mz
 org.mz
 
 // na : http://www.na-nic.com.na/
-// http://www.info.na/domain/
 na
-info.na
-pro.na
-name.na
-school.na
-or.na
-dr.na
-us.na
-mx.na
-ca.na
-in.na
-cc.na
-tv.na
-ws.na
-mobi.na
+alt.na
 co.na
 com.na
+gov.na
+net.na
 org.na
 
-// name : has 2nd-level tlds, but there's no list of them
+// name : http://www.nic.name/
+// Regarding 2LDs: https://github.com/publicsuffix/list/issues/2306
 name
 
 // nc : http://www.cctld.nc/
@@ -4714,24 +4272,24 @@ nc
 asso.nc
 nom.nc
 
-// ne : https://en.wikipedia.org/wiki/.ne
+// ne : https://www.iana.org/domains/root/db/ne.html
 ne
 
-// net : https://en.wikipedia.org/wiki/.net
+// net : https://www.iana.org/domains/root/db/net.html
 net
 
-// nf : https://en.wikipedia.org/wiki/.nf
+// nf : https://www.iana.org/domains/root/db/nf.html
 nf
-com.nf
-net.nf
-per.nf
-rec.nf
-web.nf
 arts.nf
+com.nf
 firm.nf
 info.nf
+net.nf
 other.nf
+per.nf
+rec.nf
 store.nf
+web.nf
 
 // ng : http://www.nira.org.ng/index.php/join-us/register-ng-domain/189-nira-slds
 ng
@@ -4763,9 +4321,8 @@ nom.ni
 org.ni
 web.ni
 
-// nl : https://en.wikipedia.org/wiki/.nl
-//      https://www.sidn.nl/
-//      ccTLD for the Netherlands
+// nl : https://www.iana.org/domains/root/db/nl.html
+// https://www.sidn.nl/
 nl
 
 // no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
@@ -4776,18 +4333,18 @@ nl
 no
 // Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
 fhs.no
-vgs.no
-fylkesbibl.no
 folkebibl.no
-museum.no
+fylkesbibl.no
 idrett.no
+museum.no
 priv.no
+vgs.no
 // Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
-mil.no
-stat.no
 dep.no
-kommune.no
 herad.no
+kommune.no
+mil.no
+stat.no
 // Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
 // counties
 aa.no
@@ -4839,10 +4396,10 @@ akrehamn.no
 algard.no
 รฅlgรฅrd.no
 arna.no
-brumunddal.no
-bryne.no
 bronnoysund.no
 brรธnnรธysund.no
+brumunddal.no
+bryne.no
 drobak.no
 drรธbak.no
 egersund.no
@@ -4886,27 +4443,32 @@ tananger.no
 tranby.no
 vossevangen.no
 // communities
-afjord.no
+aarborte.no
+aejrie.no
+afjord.no
 รฅfjord.no
 agdenes.no
+nes.akershus.no
+aknoluokta.no
+รกkล‹oluokta.no
 al.no
 รฅl.no
+alaheadju.no
+รกlaheadju.no
 alesund.no
 รฅlesund.no
 alstahaug.no
 alta.no
 รกltรก.no
-alaheadju.no
-รกlaheadju.no
 alvdal.no
 amli.no
 รฅmli.no
 amot.no
 รฅmot.no
+andasuolo.no
 andebu.no
 andoy.no
 andรธy.no
-andasuolo.no
 ardal.no
 รฅrdal.no
 aremark.no
@@ -4916,9 +4478,9 @@ aseral.no
 รฅseral.no
 asker.no
 askim.no
-askvoll.no
 askoy.no
 askรธy.no
+askvoll.no
 asnes.no
 รฅsnes.no
 audnedaln.no
@@ -4931,65 +4493,69 @@ austevoll.no
 austrheim.no
 averoy.no
 averรธy.no
-balestrand.no
-ballangen.no
+badaddja.no
+bรฅdรฅddjรฅ.no
+bรฆrum.no
+bahcavuotna.no
+bรกhcavuotna.no
+bahccavuotna.no
+bรกhccavuotna.no
+baidar.no
+bรกidรกr.no
+bajddar.no
+bรกjddar.no
 balat.no
 bรกlรกt.no
+balestrand.no
+ballangen.no
 balsfjord.no
-bahccavuotna.no
-bรกhccavuotna.no
 bamble.no
 bardu.no
+barum.no
+batsfjord.no
+bรฅtsfjord.no
+bearalvahki.no
+bearalvรกhki.no
 beardu.no
 beiarn.no
-bajddar.no
-bรกjddar.no
-baidar.no
-bรกidรกr.no
 berg.no
 bergen.no
 berlevag.no
 berlevรฅg.no
-bearalvahki.no
-bearalvรกhki.no
+bievat.no
+bievรกt.no
 bindal.no
 birkenes.no
-bjarkoy.no
-bjarkรธy.no
 bjerkreim.no
 bjugn.no
 bodo.no
 bodรธ.no
-badaddja.no
-bรฅdรฅddjรฅ.no
-budejju.no
 bokn.no
+bomlo.no
+bรธmlo.no
 bremanger.no
 bronnoy.no
 brรธnnรธy.no
+budejju.no
+nes.buskerud.no
 bygland.no
 bykle.no
-barum.no
-bรฆrum.no
-bo.telemark.no
-bรธ.telemark.no
-bo.nordland.no
-bรธ.nordland.no
-bievat.no
-bievรกt.no
-bomlo.no
-bรธmlo.no
-batsfjord.no
-bรฅtsfjord.no
-bahcavuotna.no
-bรกhcavuotna.no
+cahcesuolo.no
+ฤรกhcesuolo.no
+davvenjarga.no
+davvenjรกrga.no
+davvesiida.no
+deatnu.no
+dielddanuorri.no
+divtasvuodna.no
+divttasvuotna.no
+donna.no
+dรธnna.no
 dovre.no
 drammen.no
 drangedal.no
 dyroy.no
 dyrรธy.no
-donna.no
-dรธnna.no
 eid.no
 eidfjord.no
 eidsberg.no
@@ -5001,14 +4567,12 @@ enebakk.no
 engerdal.no
 etne.no
 etnedal.no
-evenes.no
 evenassi.no
 evenรกลกลกi.no
+evenes.no
 evje-og-hornnes.no
 farsund.no
 fauske.no
-fuossko.no
-fuoisku.no
 fedje.no
 fet.no
 finnoy.no
@@ -5016,33 +4580,40 @@ finnรธy.no
 fitjar.no
 fjaler.no
 fjell.no
+fla.no
+flรฅ.no
 flakstad.no
 flatanger.no
 flekkefjord.no
 flesberg.no
 flora.no
-fla.no
-flรฅ.no
 folldal.no
+forde.no
+fรธrde.no
 forsand.no
 fosnes.no
+frรฆna.no
+frana.no
 frei.no
 frogn.no
 froland.no
 frosta.no
-frana.no
-frรฆna.no
 froya.no
 frรธya.no
+fuoisku.no
+fuossko.no
 fusa.no
 fyresdal.no
-forde.no
-fรธrde.no
+gaivuotna.no
+gรกivuotna.no
+galsa.no
+gรกlsรก.no
 gamvik.no
 gangaviika.no
 gรกล‹gaviika.no
 gaular.no
 gausdal.no
+giehtavuoatna.no
 gildeskal.no
 gildeskรฅl.no
 giske.no
@@ -5060,38 +4631,37 @@ granvin.no
 gratangen.no
 grimstad.no
 grong.no
-kraanghke.no
-krรฅanghke.no
 grue.no
 gulen.no
+guovdageaidnu.no
+ha.no
+hรฅ.no
+habmer.no
+hรกbmer.no
 hadsel.no
+hรฆgebostad.no
+hagebostad.no
 halden.no
 halsa.no
 hamar.no
 hamaroy.no
-habmer.no
-hรกbmer.no
-hapmir.no
-hรกpmir.no
-hammerfest.no
 hammarfeasta.no
 hรกmmรกrfeasta.no
+hammerfest.no
+hapmir.no
+hรกpmir.no
 haram.no
 hareid.no
 harstad.no
 hasvik.no
-aknoluokta.no
-รกkล‹oluokta.no
 hattfjelldal.no
-aarborte.no
 haugesund.no
+os.hedmark.no
+valer.hedmark.no
+vรฅler.hedmark.no
 hemne.no
 hemnes.no
 hemsedal.no
-heroy.more-og-romsdal.no
-herรธy.mรธre-og-romsdal.no
-heroy.nordland.no
-herรธy.nordland.no
 hitra.no
 hjartdal.no
 hjelmeland.no
@@ -5103,96 +4673,95 @@ hole.no
 holmestrand.no
 holtalen.no
 holtรฅlen.no
+os.hordaland.no
 hornindal.no
 horten.no
-hurdal.no
-hurum.no
-hvaler.no
-hyllestad.no
-hagebostad.no
-hรฆgebostad.no
 hoyanger.no
 hรธyanger.no
 hoylandet.no
 hรธylandet.no
-ha.no
-hรฅ.no
+hurdal.no
+hurum.no
+hvaler.no
+hyllestad.no
 ibestad.no
 inderoy.no
 inderรธy.no
 iveland.no
+ivgu.no
 jevnaker.no
-jondal.no
 jolster.no
 jรธlster.no
-karasjok.no
+jondal.no
+kafjord.no
+kรฅfjord.no
 karasjohka.no
 kรกrรกลกjohka.no
+karasjok.no
 karlsoy.no
-galsa.no
-gรกlsรก.no
 karmoy.no
 karmรธy.no
 kautokeino.no
-guovdageaidnu.no
-klepp.no
 klabu.no
 klรฆbu.no
+klepp.no
 kongsberg.no
 kongsvinger.no
+kraanghke.no
+krรฅanghke.no
 kragero.no
 kragerรธ.no
 kristiansand.no
 kristiansund.no
 krodsherad.no
 krรธdsherad.no
+kvรฆfjord.no
+kvรฆnangen.no
+kvafjord.no
 kvalsund.no
-rahkkeravju.no
-rรกhkkerรกvju.no
 kvam.no
+kvanangen.no
 kvinesdal.no
 kvinnherad.no
 kviteseid.no
 kvitsoy.no
 kvitsรธy.no
-kvafjord.no
-kvรฆfjord.no
-giehtavuoatna.no
-kvanangen.no
-kvรฆnangen.no
-navuotna.no
-nรกvuotna.no
-kafjord.no
-kรฅfjord.no
-gaivuotna.no
-gรกivuotna.no
+laakesvuemie.no
+lรฆrdal.no
+lahppi.no
+lรกhppi.no
+lardal.no
 larvik.no
-lavangen.no
 lavagis.no
-loabat.no
-loabรกt.no
+lavangen.no
+leangaviika.no
+leaล‹gaviika.no
 lebesby.no
-davvesiida.no
 leikanger.no
 leirfjord.no
 leka.no
 leksvik.no
 lenvik.no
-leangaviika.no
-leaล‹gaviika.no
+lerdal.no
 lesja.no
 levanger.no
 lier.no
 lierne.no
 lillehammer.no
 lillesand.no
-lindesnes.no
 lindas.no
 lindรฅs.no
+lindesnes.no
+loabat.no
+loabรกt.no
+lodingen.no
+lรธdingen.no
 lom.no
 loppa.no
-lahppi.no
-lรกhppi.no
+lorenskog.no
+lรธrenskog.no
+loten.no
+lรธten.no
 lund.no
 lunner.no
 luroy.no
@@ -5200,25 +4769,19 @@ lurรธy.no
 luster.no
 lyngdal.no
 lyngen.no
-ivgu.no
-lardal.no
-lerdal.no
-lรฆrdal.no
-lodingen.no
-lรธdingen.no
-lorenskog.no
-lรธrenskog.no
-loten.no
-lรธten.no
+malatvuopmi.no
+mรกlatvuopmi.no
+malselv.no
+mรฅlselv.no
 malvik.no
-masoy.no
-mรฅsรธy.no
-muosat.no
-muosรกt.no
 mandal.no
 marker.no
 marnardal.no
 masfjorden.no
+masoy.no
+mรฅsรธy.no
+matta-varjjat.no
+mรกtta-vรกrjjat.no
 meland.no
 meldal.no
 melhus.no
@@ -5226,39 +4789,38 @@ meloy.no
 melรธy.no
 meraker.no
 merรฅker.no
-moareke.no
-moรฅreke.no
 midsund.no
 midtre-gauldal.no
+moareke.no
+moรฅreke.no
 modalen.no
 modum.no
 molde.no
+heroy.more-og-romsdal.no
+sande.more-og-romsdal.no
+herรธy.mรธre-og-romsdal.no
+sande.mรธre-og-romsdal.no
 moskenes.no
 moss.no
-mosvik.no
-malselv.no
-mรฅlselv.no
-malatvuopmi.no
-mรกlatvuopmi.no
+muosat.no
+muosรกt.no
+naamesjevuemie.no
+nรฅรฅmesjevuemie.no
+nรฆrรธy.no
 namdalseid.no
-aejrie.no
 namsos.no
 namsskogan.no
-naamesjevuemie.no
-nรฅรฅmesjevuemie.no
-laakesvuemie.no
 nannestad.no
-narvik.no
+naroy.no
 narviika.no
+narvik.no
 naustdal.no
+navuotna.no
+nรกvuotna.no
 nedre-eiker.no
-nes.akershus.no
-nes.buskerud.no
 nesna.no
 nesodden.no
 nesseby.no
-unjarga.no
-unjรกrga.no
 nesset.no
 nissedal.no
 nittedal.no
@@ -5267,21 +4829,20 @@ nord-fron.no
 nord-odal.no
 norddal.no
 nordkapp.no
-davvenjarga.no
-davvenjรกrga.no
-nordre-land.no
-nordreisa.no
-raisa.no
-rรกisa.no
+bo.nordland.no
+bรธ.nordland.no
+heroy.nordland.no
+herรธy.nordland.no
+nordre-land.no
+nordreisa.no
 nore-og-uvdal.no
 notodden.no
-naroy.no
-nรฆrรธy.no
 notteroy.no
 nรธtterรธy.no
 odda.no
 oksnes.no
 รธksnes.no
+omasvuotna.no
 oppdal.no
 oppegard.no
 oppegรฅrd.no
@@ -5292,11 +4853,11 @@ orskog.no
 รธrskog.no
 orsta.no
 รธrsta.no
-os.hedmark.no
-os.hordaland.no
 osen.no
 osteroy.no
 osterรธy.no
+valer.ostfold.no
+vรฅler.รธstfold.no
 ostre-toten.no
 รธstre-toten.no
 overhalla.no
@@ -5312,11 +4873,18 @@ porsanger.no
 porsangu.no
 porsรกล‹gu.no
 porsgrunn.no
+rade.no
+rรฅde.no
 radoy.no
 radรธy.no
+rรฆlingen.no
+rahkkeravju.no
+rรกhkkerรกvju.no
+raisa.no
+rรกisa.no
 rakkestad.no
+ralingen.no
 rana.no
-ruovat.no
 randaberg.no
 rauma.no
 rendalen.no
@@ -5327,16 +4895,14 @@ rindal.no
 ringebu.no
 ringerike.no
 ringsaker.no
-rissa.no
 risor.no
 risรธr.no
+rissa.no
 roan.no
-rollag.no
-rygge.no
-ralingen.no
-rรฆlingen.no
 rodoy.no
 rรธdรธy.no
+rollag.no
+romsa.no
 romskog.no
 rรธmskog.no
 roros.no
@@ -5347,18 +4913,14 @@ royken.no
 rรธyken.no
 royrvik.no
 rรธyrvik.no
-rade.no
-rรฅde.no
+ruovat.no
+rygge.no
 salangen.no
-siellak.no
-saltdal.no
 salat.no
-sรกlรกt.no
 sรกlat.no
+sรกlรกt.no
+saltdal.no
 samnanger.no
-sande.more-og-romsdal.no
-sande.mรธre-og-romsdal.no
-sande.vestfold.no
 sandefjord.no
 sandnes.no
 sandoy.no
@@ -5370,39 +4932,60 @@ sel.no
 selbu.no
 selje.no
 seljord.no
+siellak.no
 sigdal.no
 siljan.no
 sirdal.no
+skanit.no
+skรกnit.no
+skanland.no
+skรฅnland.no
 skaun.no
 skedsmo.no
 ski.no
 skien.no
-skiptvet.no
-skjervoy.no
-skjervรธy.no
 skierva.no
 skiervรก.no
+skiptvet.no
 skjak.no
 skjรฅk.no
+skjervoy.no
+skjervรธy.no
 skodje.no
-skanland.no
-skรฅnland.no
-skanit.no
-skรกnit.no
 smola.no
 smรธla.no
-snillfjord.no
+snaase.no
+snรฅase.no
 snasa.no
 snรฅsa.no
+snillfjord.no
 snoasa.no
-snaase.no
-snรฅase.no
 sogndal.no
+sogne.no
+sรธgne.no
 sokndal.no
 sola.no
 solund.no
+somna.no
+sรธmna.no
+sondre-land.no
+sรธndre-land.no
 songdalen.no
+sor-aurdal.no
+sรธr-aurdal.no
+sor-fron.no
+sรธr-fron.no
+sor-odal.no
+sรธr-odal.no
+sor-varanger.no
+sรธr-varanger.no
+sorfold.no
+sรธrfold.no
+sorreisa.no
+sรธrreisa.no
 sortland.no
+sorum.no
+sรธrum.no
 spydeberg.no
 stange.no
 stavanger.no
@@ -5415,7 +4998,6 @@ stor-elvdal.no
 stord.no
 stordal.no
 storfjord.no
-omasvuotna.no
 strand.no
 stranda.no
 stryn.no
@@ -5427,72 +5009,55 @@ surnadal.no
 sveio.no
 svelvik.no
 sykkylven.no
-sogne.no
-sรธgne.no
-somna.no
-sรธmna.no
-sondre-land.no
-sรธndre-land.no
-sor-aurdal.no
-sรธr-aurdal.no
-sor-fron.no
-sรธr-fron.no
-sor-odal.no
-sรธr-odal.no
-sor-varanger.no
-sรธr-varanger.no
-matta-varjjat.no
-mรกtta-vรกrjjat.no
-sorfold.no
-sรธrfold.no
-sorreisa.no
-sรธrreisa.no
-sorum.no
-sรธrum.no
 tana.no
-deatnu.no
+bo.telemark.no
+bรธ.telemark.no
 time.no
 tingvoll.no
 tinn.no
 tjeldsund.no
-dielddanuorri.no
 tjome.no
 tjรธme.no
 tokke.no
 tolga.no
+tonsberg.no
+tรธnsberg.no
 torsken.no
+trรฆna.no
+trana.no
 tranoy.no
 tranรธy.no
+troandin.no
+trogstad.no
+trรธgstad.no
+tromsa.no
 tromso.no
 tromsรธ.no
-tromsa.no
-romsa.no
 trondheim.no
-troandin.no
 trysil.no
-trana.no
-trรฆna.no
-trogstad.no
-trรธgstad.no
 tvedestrand.no
 tydal.no
 tynset.no
 tysfjord.no
-divtasvuodna.no
-divttasvuotna.no
 tysnes.no
-tysvar.no
 tysvรฆr.no
-tonsberg.no
-tรธnsberg.no
+tysvar.no
 ullensaker.no
 ullensvang.no
 ulvik.no
+unjarga.no
+unjรกrga.no
 utsira.no
+vaapste.no
 vadso.no
 vadsรธ.no
-cahcesuolo.no
-ฤรกhcesuolo.no
+vรฆrรธy.no
+vaga.no
+vรฅgรฅ.no
+vagan.no
+vรฅgan.no
+vagsoy.no
+vรฅgsรธy.no
 vaksdal.no
 valle.no
 vang.no
@@ -5501,8 +5066,8 @@ vardo.no
 vardรธ.no
 varggat.no
 vรกrggรกt.no
+varoy.no
 vefsn.no
-vaapste.no
 vega.no
 vegarshei.no
 vegรฅrshei.no
@@ -5510,6 +5075,7 @@ vennesla.no
 verdal.no
 verran.no
 vestby.no
+sande.vestfold.no
 vestnes.no
 vestre-slidre.no
 vestre-toten.no
@@ -5519,21 +5085,9 @@ vevelstad.no
 vik.no
 vikna.no
 vindafjord.no
+voagat.no
 volda.no
 voss.no
-varoy.no
-vรฆrรธy.no
-vagan.no
-vรฅgan.no
-voagat.no
-vagsoy.no
-vรฅgsรธy.no
-vaga.no
-vรฅgรฅ.no
-valer.ostfold.no
-vรฅler.รธstfold.no
-valer.hedmark.no
-vรฅler.hedmark.no
 
 // np : http://www.mos.com.np/register.html
 *.np
@@ -5542,17 +5096,17 @@ vรฅler.hedmark.no
 // Submitted by registry <technician@cenpac.net.nr>
 nr
 biz.nr
-info.nr
-gov.nr
+com.nr
 edu.nr
-org.nr
+gov.nr
+info.nr
 net.nr
-com.nr
+org.nr
 
-// nu : https://en.wikipedia.org/wiki/.nu
+// nu : https://www.iana.org/domains/root/db/nu.html
 nu
 
-// nz : https://en.wikipedia.org/wiki/.nz
+// nz : https://www.iana.org/domains/root/db/nz.html
 // Submitted by registry <jay@nzrs.net.nz>
 nz
 ac.nz
@@ -5565,14 +5119,14 @@ health.nz
 iwi.nz
 kiwi.nz
 maori.nz
-mil.nz
 mฤori.nz
+mil.nz
 net.nz
 org.nz
 parliament.nz
 school.nz
 
-// om : https://en.wikipedia.org/wiki/.om
+// om : https://www.iana.org/domains/root/db/om.html
 om
 co.om
 com.om
@@ -5587,82 +5141,84 @@ pro.om
 // onion : https://tools.ietf.org/html/rfc7686
 onion
 
-// org : https://en.wikipedia.org/wiki/.org
+// org : https://www.iana.org/domains/root/db/org.html
 org
 
 // pa : http://www.nic.pa/
 // Some additional second level "domains" resolve directly as hostnames, such as
 // pannet.pa, so we add a rule for "pa".
 pa
+abo.pa
 ac.pa
-gob.pa
 com.pa
-org.pa
-sld.pa
 edu.pa
-net.pa
+gob.pa
 ing.pa
-abo.pa
 med.pa
+net.pa
 nom.pa
+org.pa
+sld.pa
 
 // pe : https://www.nic.pe/InformeFinalComision.pdf
 pe
+com.pe
 edu.pe
 gob.pe
-nom.pe
 mil.pe
-org.pe
-com.pe
 net.pe
+nom.pe
+org.pe
 
 // pf : http://www.gobin.info/domainname/formulaire-pf.pdf
 pf
 com.pf
-org.pf
 edu.pf
+org.pf
 
-// pg : https://en.wikipedia.org/wiki/.pg
+// pg : https://www.iana.org/domains/root/db/pg.html
 *.pg
 
-// ph : http://www.domains.ph/FAQ2.asp
+// ph : https://www.iana.org/domains/root/db/ph.html
 // Submitted by registry <jed@email.com.ph>
 ph
 com.ph
-net.ph
-org.ph
-gov.ph
 edu.ph
-ngo.ph
-mil.ph
+gov.ph
 i.ph
+mil.ph
+net.ph
+ngo.ph
+org.ph
 
-// pk : http://pk5.pknic.net.pk/pk5/msgNamepk.PK
+// pk : https://pk5.pknic.net.pk/pk5/msgNamepk.PK
+// Contact Email: staff@pknic.net.pk
 pk
+ac.pk
+biz.pk
 com.pk
-net.pk
 edu.pk
-org.pk
 fam.pk
-biz.pk
-web.pk
-gov.pk
+gkp.pk
 gob.pk
+gog.pk
 gok.pk
-gon.pk
 gop.pk
 gos.pk
-info.pk
+gov.pk
+net.pk
+org.pk
+web.pk
 
-// pl http://www.dns.pl/english/index.html
-// Submitted by registry
+// pl : https://www.dns.pl/en/
+// Confirmed by registry <info@dns.pl> 2024-11-18
 pl
 com.pl
 net.pl
 org.pl
-// pl functional domains (http://www.dns.pl/english/index.html)
-aid.pl
+// pl functional domains : https://www.dns.pl/en/list_of_functional_domain_names
 agro.pl
+aid.pl
 atm.pl
 auto.pl
 biz.pl
@@ -5671,8 +5227,8 @@ gmina.pl
 gsm.pl
 info.pl
 mail.pl
-miasta.pl
 media.pl
+miasta.pl
 mil.pl
 nieruchomosci.pl
 nom.pl
@@ -5691,56 +5247,65 @@ tm.pl
 tourism.pl
 travel.pl
 turystyka.pl
-// Government domains
+// Government domains : https://www.dns.pl/informacje_o_rejestracji_domen_gov_pl
+// In accordance with the .gov.pl Domain Name Regulations : https://www.dns.pl/regulamin_gov_pl
 gov.pl
 ap.gov.pl
+griw.gov.pl
 ic.gov.pl
 is.gov.pl
-us.gov.pl
 kmpsp.gov.pl
+konsulat.gov.pl
 kppsp.gov.pl
-kwpsp.gov.pl
-psp.gov.pl
-wskr.gov.pl
 kwp.gov.pl
+kwpsp.gov.pl
+mup.gov.pl
 mw.gov.pl
-ug.gov.pl
-um.gov.pl
-umig.gov.pl
-ugim.gov.pl
-upow.gov.pl
-uw.gov.pl
-starostwo.gov.pl
+oia.gov.pl
+oirm.gov.pl
+oke.gov.pl
+oow.gov.pl
+oschr.gov.pl
+oum.gov.pl
 pa.gov.pl
+pinb.gov.pl
+piw.gov.pl
 po.gov.pl
+pr.gov.pl
+psp.gov.pl
 psse.gov.pl
 pup.gov.pl
 rzgw.gov.pl
 sa.gov.pl
+sdn.gov.pl
+sko.gov.pl
 so.gov.pl
 sr.gov.pl
-wsa.gov.pl
-sko.gov.pl
+starostwo.gov.pl
+ug.gov.pl
+ugim.gov.pl
+um.gov.pl
+umig.gov.pl
+upow.gov.pl
+uppo.gov.pl
+us.gov.pl
+uw.gov.pl
 uzs.gov.pl
+wif.gov.pl
 wiih.gov.pl
 winb.gov.pl
-pinb.gov.pl
 wios.gov.pl
 witd.gov.pl
-wzmiuw.gov.pl
-piw.gov.pl
 wiw.gov.pl
-griw.gov.pl
-wif.gov.pl
-oum.gov.pl
-sdn.gov.pl
-zp.gov.pl
-uppo.gov.pl
-mup.gov.pl
+wkz.gov.pl
+wsa.gov.pl
+wskr.gov.pl
+wsse.gov.pl
 wuoz.gov.pl
-konsulat.gov.pl
-oirm.gov.pl
-// pl regional domains (http://www.dns.pl/english/index.html)
+wzmiuw.gov.pl
+zp.gov.pl
+zpisdn.gov.pl
+// pl regional domains : https://www.dns.pl/en/list_of_regional_domain_names
 augustow.pl
 babia-gora.pl
 bedzin.pl
@@ -5767,11 +5332,11 @@ jaworzno.pl
 jelenia-gora.pl
 jgora.pl
 kalisz.pl
-kazimierz-dolny.pl
 karpacz.pl
 kartuzy.pl
 kaszuby.pl
 katowice.pl
+kazimierz-dolny.pl
 kepno.pl
 ketrzyn.pl
 klodzko.pl
@@ -5814,8 +5379,8 @@ pisz.pl
 podhale.pl
 podlasie.pl
 polkowice.pl
-pomorze.pl
 pomorskie.pl
+pomorze.pl
 prochowice.pl
 pruszkow.pl
 przeworsk.pl
@@ -5826,11 +5391,11 @@ rybnik.pl
 rzeszow.pl
 sanok.pl
 sejny.pl
+skoczow.pl
 slask.pl
 slupsk.pl
 sosnowiec.pl
 stalowa-wola.pl
-skoczow.pl
 starachowice.pl
 stargard.pl
 suwalki.pl
@@ -5861,36 +5426,36 @@ zarow.pl
 zgora.pl
 zgorzelec.pl
 
-// pm : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
+// pm : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 pm
 
-// pn : http://www.government.pn/PnRegistry/policies.htm
+// pn : https://www.iana.org/domains/root/db/pn.html
 pn
-gov.pn
 co.pn
-org.pn
 edu.pn
+gov.pn
 net.pn
+org.pn
 
-// post : https://en.wikipedia.org/wiki/.post
+// post : https://www.iana.org/domains/root/db/post.html
 post
 
 // pr : http://www.nic.pr/index.asp?f=1
 pr
+biz.pr
 com.pr
-net.pr
-org.pr
-gov.pr
 edu.pr
-isla.pr
-pro.pr
-biz.pr
+gov.pr
 info.pr
+isla.pr
 name.pr
-// these aren't mentioned on nic.pr, but on https://en.wikipedia.org/wiki/.pr
+net.pr
+org.pr
+pro.pr
+// these aren't mentioned on nic.pr, but on https://www.iana.org/domains/root/db/pr.html
+ac.pr
 est.pr
 prof.pr
-ac.pr
 
 // pro : http://registry.pro/get-pro
 pro
@@ -5906,38 +5471,34 @@ law.pro
 med.pro
 recht.pro
 
-// ps : https://en.wikipedia.org/wiki/.ps
+// ps : https://www.iana.org/domains/root/db/ps.html
 // http://www.nic.ps/registration/policy.html#reg
 ps
+com.ps
 edu.ps
 gov.ps
-sec.ps
-plo.ps
-com.ps
-org.ps
 net.ps
+org.ps
+plo.ps
+sec.ps
 
 // pt : https://www.dns.pt/en/domain/pt-terms-and-conditions-registration-rules/
 pt
-net.pt
-gov.pt
-org.pt
+com.pt
 edu.pt
+gov.pt
 int.pt
-publ.pt
-com.pt
+net.pt
 nome.pt
+org.pt
+publ.pt
 
-// pw : https://en.wikipedia.org/wiki/.pw
+// pw : https://www.iana.org/domains/root/db/pw.html
+// Confirmed by registry in private correspondence with @dnsguru 2024-12-09
 pw
-co.pw
-ne.pw
-or.pw
-ed.pw
-go.pw
-belau.pw
-
-// py : http://www.nic.py/pautas.html#seccion_9
+gov.pw
+
+// py : https://www.iana.org/domains/root/db/py.html
 // Submitted by registry
 py
 com.py
@@ -5959,11 +5520,12 @@ net.qa
 org.qa
 sch.qa
 
-// re : http://www.afnic.re/obtenir/chartes/nommage-re/annexe-descriptifs
+// re : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
+// Confirmed by registry <support@afnic.fr> 2024-11-18
 re
+// Closed for registration on 2013-03-15 but domains are still maintained
 asso.re
 com.re
-nom.re
 
 // ro : http://www.rotld.ro/
 ro
@@ -5992,7 +5554,7 @@ org.rs
 // Submitted by George Georgievsky <gug@cctld.ru>
 ru
 
-// rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf
+// rw : https://www.iana.org/domains/root/db/rw.html
 rw
 ac.rw
 co.rw
@@ -6005,12 +5567,12 @@ org.rw
 // sa : http://www.nic.net.sa/
 sa
 com.sa
-net.sa
-org.sa
+edu.sa
 gov.sa
 med.sa
+net.sa
+org.sa
 pub.sa
-edu.sa
 sch.sa
 
 // sb : http://www.sbnic.net.sb/
@@ -6025,25 +5587,26 @@ org.sb
 // sc : http://www.nic.sc/
 sc
 com.sc
+edu.sc
 gov.sc
 net.sc
 org.sc
-edu.sc
 
-// sd : http://www.isoc.sd/sudanic.isoc.sd/billing_pricing.htm
+// sd : https://www.iana.org/domains/root/db/sd.html
 // Submitted by registry <admin@isoc.sd>
 sd
 com.sd
-net.sd
-org.sd
 edu.sd
-med.sd
-tv.sd
 gov.sd
 info.sd
+med.sd
+net.sd
+org.sd
+tv.sd
 
-// se : https://en.wikipedia.org/wiki/.se
-// Submitted by registry <patrik.wallstrom@iis.se>
+// se : https://www.iana.org/domains/root/db/se.html
+// https://data.internetstiftelsen.se/barred_domains_list.txt -> Second level domains & Sub-domains
+// Confirmed by Registry Services <registry@internetstiftelsen.se> 2024-11-20
 se
 a.se
 ac.se
@@ -6085,54 +5648,54 @@ x.se
 y.se
 z.se
 
-// sg : http://www.nic.net.sg/page/registration-policies-procedures-and-guidelines
+// sg : https://www.sgnic.sg/domain-registration/sg-categories-rules
+// Confirmed by registry <dnq@sgnic.sg> 2024-11-19
 sg
 com.sg
+edu.sg
+gov.sg
 net.sg
 org.sg
-gov.sg
-edu.sg
-per.sg
 
 // sh : http://nic.sh/rules.htm
 sh
 com.sh
-net.sh
 gov.sh
-org.sh
 mil.sh
+net.sh
+org.sh
 
-// si : https://en.wikipedia.org/wiki/.si
+// si : https://www.iana.org/domains/root/db/si.html
 si
 
 // sj : No registrations at this time.
 // Submitted by registry <jarle@uninett.no>
 sj
 
-// sk : https://en.wikipedia.org/wiki/.sk
-// list of 2nd level domains ?
+// sk : https://www.iana.org/domains/root/db/sk.html
+// https://sk-nic.sk/
 sk
+org.sk
 
 // sl : http://www.nic.sl
 // Submitted by registry <adam@neoip.com>
 sl
 com.sl
-net.sl
 edu.sl
 gov.sl
+net.sl
 org.sl
 
-// sm : https://en.wikipedia.org/wiki/.sm
+// sm : https://www.iana.org/domains/root/db/sm.html
 sm
 
-// sn : https://en.wikipedia.org/wiki/.sn
+// sn : https://www.iana.org/domains/root/db/sn.html
 sn
 art.sn
 com.sn
 edu.sn
 gouv.sn
 org.sn
-perso.sn
 univ.sn
 
 // so : http://sonic.so/policies/
@@ -6144,13 +5707,14 @@ me.so
 net.so
 org.so
 
-// sr : https://en.wikipedia.org/wiki/.sr
+// sr : https://www.iana.org/domains/root/db/sr.html
 sr
 
 // ss : https://registry.nic.ss/
 // Submitted by registry <technical@nic.ss>
 ss
 biz.ss
+co.ss
 com.ss
 edu.ss
 gov.ss
@@ -6173,10 +5737,10 @@ principe.st
 saotome.st
 store.st
 
-// su : https://en.wikipedia.org/wiki/.su
+// su : https://www.iana.org/domains/root/db/su.html
 su
 
-// sv : http://www.svnet.org.sv/niveldos.pdf
+// sv : https://www.iana.org/domains/root/db/sv.html
 sv
 com.sv
 edu.sv
@@ -6184,46 +5748,45 @@ gob.sv
 org.sv
 red.sv
 
-// sx : https://en.wikipedia.org/wiki/.sx
+// sx : https://www.iana.org/domains/root/db/sx.html
 // Submitted by registry <jcvignes@openregistry.com>
 sx
 gov.sx
 
-// sy : https://en.wikipedia.org/wiki/.sy
-// see also: http://www.gobin.info/domainname/sy.doc
+// sy : https://www.iana.org/domains/root/db/sy.html
 sy
+com.sy
 edu.sy
 gov.sy
-net.sy
 mil.sy
-com.sy
+net.sy
 org.sy
 
-// sz : https://en.wikipedia.org/wiki/.sz
+// sz : https://www.iana.org/domains/root/db/sz.html
 // http://www.sispa.org.sz/
 sz
-co.sz
 ac.sz
+co.sz
 org.sz
 
-// tc : https://en.wikipedia.org/wiki/.tc
+// tc : https://www.iana.org/domains/root/db/tc.html
 tc
 
-// td : https://en.wikipedia.org/wiki/.td
+// td : https://www.iana.org/domains/root/db/td.html
 td
 
-// tel: https://en.wikipedia.org/wiki/.tel
+// tel : https://www.iana.org/domains/root/db/tel.html
 // http://www.telnic.org/
 tel
 
-// tf : https://en.wikipedia.org/wiki/.tf
+// tf : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 tf
 
-// tg : https://en.wikipedia.org/wiki/.tg
+// tg : https://www.iana.org/domains/root/db/tg.html
 // http://www.nic.tg/
 tg
 
-// th : https://en.wikipedia.org/wiki/.th
+// th : https://www.iana.org/domains/root/db/th.html
 // Submitted by registry <krit@thains.co.th>
 th
 ac.th
@@ -6252,23 +5815,24 @@ org.tj
 test.tj
 web.tj
 
-// tk : https://en.wikipedia.org/wiki/.tk
+// tk : https://www.iana.org/domains/root/db/tk.html
 tk
 
-// tl : https://en.wikipedia.org/wiki/.tl
+// tl : https://www.iana.org/domains/root/db/tl.html
 tl
 gov.tl
 
-// tm : http://www.nic.tm/local.html
+// tm : https://www.nic.tm/local.html
+// Confirmed by registry <admin@nic.TM> 2024-11-19
 tm
-com.tm
 co.tm
-org.tm
-net.tm
-nom.tm
+com.tm
+edu.tm
 gov.tm
 mil.tm
-edu.tm
+net.tm
+nom.tm
+org.tm
 
 // tn : http://www.registre.tn/fr/
 // https://whois.ati.tn/
@@ -6287,15 +5851,15 @@ org.tn
 perso.tn
 tourism.tn
 
-// to : https://en.wikipedia.org/wiki/.to
+// to : https://www.iana.org/domains/root/db/to.html
 // Submitted by registry <egullich@colo.to>
 to
 com.to
+edu.to
 gov.to
+mil.to
 net.to
 org.to
-edu.to
-mil.to
 
 // tr : https://nic.tr/
 // https://nic.tr/forms/eng/policies.pdf
@@ -6311,9 +5875,9 @@ edu.tr
 gen.tr
 gov.tr
 info.tr
-mil.tr
 k12.tr
 kep.tr
+mil.tr
 name.tr
 net.tr
 org.tr
@@ -6327,46 +5891,40 @@ nc.tr
 // Used by government agencies of Northern Cyprus
 gov.nc.tr
 
-// tt : http://www.nic.tt/
+// tt : https://www.nic.tt/
+// Confirmed by registry <admin@nic.tt> 2024-11-19
 tt
+biz.tt
 co.tt
 com.tt
-org.tt
-net.tt
-biz.tt
+edu.tt
+gov.tt
 info.tt
-pro.tt
-int.tt
-coop.tt
-jobs.tt
-mobi.tt
-travel.tt
-museum.tt
-aero.tt
+mil.tt
 name.tt
-gov.tt
-edu.tt
+net.tt
+org.tt
+pro.tt
 
-// tv : https://en.wikipedia.org/wiki/.tv
+// tv : https://www.iana.org/domains/root/db/tv.html
 // Not listing any 2LDs as reserved since none seem to exist in practice,
 // Wikipedia notwithstanding.
 tv
 
-// tw : https://en.wikipedia.org/wiki/.tw
+// tw : https://www.iana.org/domains/root/db/tw.html
+// https://twnic.tw/dnservice_catag.php
+// Confirmed by registry <dns@twnic.tw> 2024-11-26
 tw
+club.tw
+com.tw
+ebiz.tw
 edu.tw
+game.tw
 gov.tw
+idv.tw
 mil.tw
-com.tw
 net.tw
 org.tw
-idv.tw
-game.tw
-ebiz.tw
-club.tw
-็ถฒ่ทฏ.tw
-็ต„็น”.tw
-ๅ•†ๆฅญ.tw
 
 // tz : http://www.tznic.or.tz/index.php/domains
 // Submitted by registry <manager@tznic.or.tz>
@@ -6424,6 +5982,7 @@ kiev.ua
 kirovograd.ua
 km.ua
 kr.ua
+kropyvnytskyi.ua
 krym.ua
 ks.ua
 kv.ua
@@ -6431,6 +5990,7 @@ kyiv.ua
 lg.ua
 lt.ua
 lugansk.ua
+luhansk.ua
 lutsk.ua
 lv.ua
 lviv.ua
@@ -6454,11 +6014,13 @@ te.ua
 ternopil.ua
 uz.ua
 uzhgorod.ua
+uzhhorod.ua
 vinnica.ua
 vinnytsia.ua
 vn.ua
 volyn.ua
 yalta.ua
+zakarpattia.ua
 zaporizhzhe.ua
 zaporizhzhia.ua
 zhitomir.ua
@@ -6467,17 +6029,23 @@ zp.ua
 zt.ua
 
 // ug : https://www.registry.co.ug/
+// https://www.registry.co.ug, https://whois.co.ug
+// Confirmed by registry <support@i3c.co.ug> 2025-01-20
 ug
-co.ug
-or.ug
 ac.ug
-sc.ug
+co.ug
+com.ug
+edu.ug
 go.ug
+gov.ug
+mil.ug
 ne.ug
-com.ug
+or.ug
 org.ug
+sc.ug
+us.ug
 
-// uk : https://en.wikipedia.org/wiki/.uk
+// uk : https://www.iana.org/domains/root/db/uk.html
 // Submitted by registry <Michael.Daly@nominet.org.uk>
 uk
 ac.uk
@@ -6492,14 +6060,13 @@ plc.uk
 police.uk
 *.sch.uk
 
-// us : https://en.wikipedia.org/wiki/.us
+// us : https://www.iana.org/domains/root/db/us.html
+// Confirmed via the .us zone file by William Harrison 2024-12-10
 us
 dni.us
-fed.us
 isa.us
-kids.us
 nsn.us
-// us geographic names
+// Geographic Names
 ak.us
 al.us
 ar.us
@@ -6548,9 +6115,9 @@ sd.us
 tn.us
 tx.us
 ut.us
+va.us
 vi.us
 vt.us
-va.us
 wa.us
 wi.us
 wv.us
@@ -6570,11 +6137,10 @@ k12.ca.us
 k12.co.us
 k12.ct.us
 k12.dc.us
-k12.de.us
 k12.fl.us
 k12.ga.us
 k12.gu.us
-// k12.hi.us  Bug 614565 - Hawaii has a state-wide DOE login
+// k12.hi.us - Bug 614565 - Hawaii has a state-wide DOE login
 k12.ia.us
 k12.id.us
 k12.il.us
@@ -6591,7 +6157,7 @@ k12.mo.us
 k12.ms.us
 k12.mt.us
 k12.nc.us
-// k12.nd.us  Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
+// k12.nd.us - Bug 1028347 - Removed at request of Travis Rosso <trossow@nd.gov>
 k12.ne.us
 k12.nh.us
 k12.nj.us
@@ -6603,139 +6169,137 @@ k12.ok.us
 k12.or.us
 k12.pa.us
 k12.pr.us
-// k12.ri.us  Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
+// k12.ri.us - Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
 k12.sc.us
-// k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
+// k12.sd.us - Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
 k12.tn.us
 k12.tx.us
 k12.ut.us
+k12.va.us
 k12.vi.us
 k12.vt.us
-k12.va.us
 k12.wa.us
 k12.wi.us
-// k12.wv.us  Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
-k12.wy.us
+// k12.wv.us - Bug 947705 - Removed at request of Verne Britton <verne@wvnet.edu>
 cc.ak.us
+lib.ak.us
 cc.al.us
+lib.al.us
 cc.ar.us
+lib.ar.us
 cc.as.us
+lib.as.us
 cc.az.us
+lib.az.us
 cc.ca.us
+lib.ca.us
 cc.co.us
+lib.co.us
 cc.ct.us
+lib.ct.us
 cc.dc.us
+lib.dc.us
 cc.de.us
 cc.fl.us
+lib.fl.us
 cc.ga.us
+lib.ga.us
 cc.gu.us
+lib.gu.us
 cc.hi.us
+lib.hi.us
 cc.ia.us
+lib.ia.us
 cc.id.us
+lib.id.us
 cc.il.us
+lib.il.us
 cc.in.us
+lib.in.us
 cc.ks.us
+lib.ks.us
 cc.ky.us
+lib.ky.us
 cc.la.us
+lib.la.us
 cc.ma.us
+lib.ma.us
 cc.md.us
+lib.md.us
 cc.me.us
+lib.me.us
 cc.mi.us
+lib.mi.us
 cc.mn.us
+lib.mn.us
 cc.mo.us
+lib.mo.us
 cc.ms.us
 cc.mt.us
+lib.mt.us
 cc.nc.us
+lib.nc.us
 cc.nd.us
+lib.nd.us
 cc.ne.us
+lib.ne.us
 cc.nh.us
+lib.nh.us
 cc.nj.us
+lib.nj.us
 cc.nm.us
+lib.nm.us
 cc.nv.us
+lib.nv.us
 cc.ny.us
+lib.ny.us
 cc.oh.us
+lib.oh.us
 cc.ok.us
+lib.ok.us
 cc.or.us
+lib.or.us
 cc.pa.us
+lib.pa.us
 cc.pr.us
+lib.pr.us
 cc.ri.us
+lib.ri.us
 cc.sc.us
+lib.sc.us
 cc.sd.us
+lib.sd.us
 cc.tn.us
+lib.tn.us
 cc.tx.us
+lib.tx.us
 cc.ut.us
+lib.ut.us
+cc.va.us
+lib.va.us
 cc.vi.us
+lib.vi.us
 cc.vt.us
-cc.va.us
+lib.vt.us
 cc.wa.us
+lib.wa.us
 cc.wi.us
+lib.wi.us
 cc.wv.us
 cc.wy.us
-lib.ak.us
-lib.al.us
-lib.ar.us
-lib.as.us
-lib.az.us
-lib.ca.us
-lib.co.us
-lib.ct.us
-lib.dc.us
-// lib.de.us  Issue #243 - Moved to Private section at request of Ed Moore <Ed.Moore@lib.de.us>
-lib.fl.us
-lib.ga.us
-lib.gu.us
-lib.hi.us
-lib.ia.us
-lib.id.us
-lib.il.us
-lib.in.us
-lib.ks.us
-lib.ky.us
-lib.la.us
-lib.ma.us
-lib.md.us
-lib.me.us
-lib.mi.us
-lib.mn.us
-lib.mo.us
-lib.ms.us
-lib.mt.us
-lib.nc.us
-lib.nd.us
-lib.ne.us
-lib.nh.us
-lib.nj.us
-lib.nm.us
-lib.nv.us
-lib.ny.us
-lib.oh.us
-lib.ok.us
-lib.or.us
-lib.pa.us
-lib.pr.us
-lib.ri.us
-lib.sc.us
-lib.sd.us
-lib.tn.us
-lib.tx.us
-lib.ut.us
-lib.vi.us
-lib.vt.us
-lib.va.us
-lib.wa.us
-lib.wi.us
-// lib.wv.us  Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
+k12.wy.us
+// lib.wv.us - Bug 941670 - Removed at request of Larry W Arnold <arnold@wvlc.lib.wv.us>
 lib.wy.us
 // k12.ma.us contains school districts in Massachusetts. The 4LDs are
-//  managed independently except for private (PVT), charter (CHTR) and
-//  parochial (PAROCH) schools.  Those are delegated directly to the
-//  5LD operators.   <k12-ma-hostmaster _ at _ rsuc.gweep.net>
-pvt.k12.ma.us
+// managed independently except for private (PVT), charter (CHTR) and
+// parochial (PAROCH) schools. Those are delegated directly to the
+// 5LD operators. <k12-ma-hostmaster@rsuc.gweep.net>
 chtr.k12.ma.us
 paroch.k12.ma.us
+pvt.k12.ma.us
 // Merit Network, Inc. maintains the registry for =~ /(k12|cc|lib).mi.us/ and the following
-//    see also: http://domreg.merit.edu
-//    see also: whois -h whois.domreg.merit.edu help
+// see also: https://domreg.merit.edu : domreg@merit.edu
+// see also: whois -h whois.domreg.merit.edu help
 ann-arbor.mi.us
 cog.mi.us
 dst.mi.us
@@ -6761,20 +6325,21 @@ com.uz
 net.uz
 org.uz
 
-// va : https://en.wikipedia.org/wiki/.va
+// va : https://www.iana.org/domains/root/db/va.html
 va
 
-// vc : https://en.wikipedia.org/wiki/.vc
+// vc : https://www.iana.org/domains/root/db/vc.html
 // Submitted by registry <kshah@ca.afilias.info>
 vc
 com.vc
-net.vc
-org.vc
+edu.vc
 gov.vc
 mil.vc
-edu.vc
+net.vc
+org.vc
 
 // ve : https://registro.nic.ve/
+// https://nic.ve/site/user-agreement -> under "III. Clasificaciรณn de Nombres de Dominio"
 // Submitted by registry nic@nic.ve and nicve@conatel.gob.ve
 ve
 arts.ve
@@ -6783,9 +6348,11 @@ co.ve
 com.ve
 e12.ve
 edu.ve
+emprende.ve
 firm.ve
 gob.ve
 gov.ve
+ia.ve
 info.ve
 int.ve
 mil.ve
@@ -6798,13 +6365,12 @@ store.ve
 tec.ve
 web.ve
 
-// vg : https://en.wikipedia.org/wiki/.vg
+// vg : https://www.iana.org/domains/root/db/vg.html
+// Confirmed by registry <tld.ops@centralnic.com> 2025-01-10
 vg
+edu.vg
 
-// vi : http://www.nic.vi/newdomainform.htm
-// http://www.nic.vi/Domain_Rules/body_domain_rules.html indicates some other
-// TLDs are "reserved", such as edu.vi and gov.vi, but doesn't actually say they
-// are available for registration (which they do not seem to be).
+// vi : https://www.iana.org/domains/root/db/vi.html
 vi
 co.vi
 com.vi
@@ -6812,22 +6378,92 @@ k12.vi
 net.vi
 org.vi
 
-// vn : https://www.dot.vn/vnnic/vnnic/domainregistration.jsp
+// vn : https://www.vnnic.vn/en/domain/cctld-vn
+// https://vnnic.vn/sites/default/files/tailieu/vn.cctld.domains.txt
 vn
+ac.vn
+ai.vn
+biz.vn
 com.vn
-net.vn
-org.vn
 edu.vn
 gov.vn
-int.vn
-ac.vn
-biz.vn
+health.vn
+id.vn
 info.vn
+int.vn
+io.vn
 name.vn
+net.vn
+org.vn
 pro.vn
-health.vn
 
-// vu : https://en.wikipedia.org/wiki/.vu
+// vn geographical names
+angiang.vn
+bacgiang.vn
+backan.vn
+baclieu.vn
+bacninh.vn
+baria-vungtau.vn
+bentre.vn
+binhdinh.vn
+binhduong.vn
+binhphuoc.vn
+binhthuan.vn
+camau.vn
+cantho.vn
+caobang.vn
+daklak.vn
+daknong.vn
+danang.vn
+dienbien.vn
+dongnai.vn
+dongthap.vn
+gialai.vn
+hagiang.vn
+haiduong.vn
+haiphong.vn
+hanam.vn
+hanoi.vn
+hatinh.vn
+haugiang.vn
+hoabinh.vn
+hue.vn
+hungyen.vn
+khanhhoa.vn
+kiengiang.vn
+kontum.vn
+laichau.vn
+lamdong.vn
+langson.vn
+laocai.vn
+longan.vn
+namdinh.vn
+nghean.vn
+ninhbinh.vn
+ninhthuan.vn
+phutho.vn
+phuyen.vn
+quangbinh.vn
+quangnam.vn
+quangngai.vn
+quangninh.vn
+quangtri.vn
+soctrang.vn
+sonla.vn
+tayninh.vn
+thaibinh.vn
+thainguyen.vn
+thanhhoa.vn
+thanhphohochiminh.vn
+thuathienhue.vn
+tiengiang.vn
+travinh.vn
+tuyenquang.vn
+vinhlong.vn
+vinhphuc.vn
+yenbai.vn
+
+// vu : https://www.iana.org/domains/root/db/vu.html
 // http://www.vunic.vu/
 vu
 com.vu
@@ -6835,19 +6471,19 @@ edu.vu
 net.vu
 org.vu
 
-// wf : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
+// wf : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 wf
 
-// ws : https://en.wikipedia.org/wiki/.ws
+// ws : https://www.iana.org/domains/root/db/ws.html
 // http://samoanic.ws/index.dhtml
 ws
 com.ws
+edu.ws
+gov.ws
 net.ws
 org.ws
-gov.ws
-edu.ws
 
-// yt : http://www.afnic.fr/medias/documents/AFNIC-naming-policy2012.pdf
+// yt : https://www.afnic.fr/wp-media/uploads/2022/12/afnic-naming-policy-2023-01-01.pdf
 yt
 
 // IDN ccTLDs
@@ -6880,12 +6516,12 @@ yt
 
 // xn--fiqs8s ("Zhongguo/China", Chinese, Simplified) : CN
 // CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
+// https://www.cnnic.cn/11/192/index.html
 ไธญๅ›ฝ
 
 // xn--fiqz9s ("Zhongguo/China", Chinese, Traditional) : CN
 // CNNIC
-// http://cnnic.cn/html/Dir/2005/10/11/3218.htm
+// https://www.cnnic.com.cn/AU/MediaC/Announcement/201609/t20160905_54470.htm
 ไธญๅœ‹
 
 // xn--lgbbat1ad8j ("Algeria/Al Jazair", Arabic) : DZ
@@ -6918,12 +6554,12 @@ yt
 // Submitted by registry <hk.tech@hkirc.hk>
 // https://www.hkirc.hk/content.jsp?id=30#!/34
 ้ฆ™ๆธฏ
+ๅ€‹ไบบ.้ฆ™ๆธฏ
 ๅ…ฌๅธ.้ฆ™ๆธฏ
-ๆ•™่‚ฒ.้ฆ™ๆธฏ
 ๆ”ฟๅบœ.้ฆ™ๆธฏ
-ๅ€‹ไบบ.้ฆ™ๆธฏ
-็ถฒ็ตก.้ฆ™ๆธฏ
+ๆ•™่‚ฒ.้ฆ™ๆธฏ
 ็ต„็น”.้ฆ™ๆธฏ
+็ถฒ็ตก.้ฆ™ๆธฏ
 
 // xn--2scrj9c ("Bharat", Kannada) : IN
 // India
@@ -7054,12 +6690,12 @@ yt
 // xn--90a3ac ("srb", Cyrillic) : RS
 // https://www.rnids.rs/en/domains/national-domains
 ัั€ะฑ
-ะฟั€.ัั€ะฑ
-ะพั€ะณ.ัั€ะฑ
+ะฐะบ.ัั€ะฑ
 ะพะฑั€.ัั€ะฑ
 ะพะด.ัั€ะฑ
+ะพั€ะณ.ัั€ะฑ
+ะฟั€.ัั€ะฑ
 ัƒะฟั€.ัั€ะฑ
-ะฐะบ.ัั€ะฑ
 
 // xn--p1ai ("rf", Russian-Cyrillic) : RU
 // https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
@@ -7074,7 +6710,7 @@ yt
 // http://www.nic.net.sa/
 ุงู„ุณุนูˆุฏูŠุฉ
 
-// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant)  : SA
+// xn--mgberp4a5d4a87g ("AlSaudiah", Arabic, variant): SA
 ุงู„ุณุนูˆุฏ�Œุฉ
 
 // xn--mgbqly7c0a67fbc ("AlSaudiah", Arabic, variant) : SA
@@ -7102,11 +6738,11 @@ yt
 // xn--o3cw4h ("Thai", Thai) : TH
 // http://www.thnic.co.th
 เน„เธ—เธข
-เธจเธถเธเธฉเธฒ.เน„เธ—เธข
-เธ˜เธธเธฃเธเธดเธˆ.เน„เธ—เธข
-เธฃเธฑเธเธšเธฒเธฅ.เน„เธ—เธข
 เธ—เธซเธฒเธฃ.เน„เธ—เธข
+เธ˜เธธเธฃเธเธดเธˆ.เน„เธ—เธข
 เน€เธ™เน‡เธ•.เน„เธ—เธข
+เธฃเธฑเธเธšเธฒเธฅ.เน„เธ—เธข
+เธจเธถเธเธฉเธฒ.เน„เธ—เธข
 เธญเธ‡เธ„เนŒเธเธฃ.เน„เธ—เธข
 
 // xn--pgbs0dh ("Tunisia", Arabic) : TN
@@ -7114,7 +6750,7 @@ yt
 ุชูˆู†ุณ
 
 // xn--kpry57d ("Taiwan", Chinese, Traditional) : TW
-// http://www.twnic.net/english/dn/dn_07a.htm
+// https://twnic.tw/dnservice_catag.php
 ๅฐ็ฃ
 
 // xn--kprw13d ("Taiwan", Chinese, Simplified) : TW
@@ -7138,11 +6774,11 @@ ye
 com.ye
 edu.ye
 gov.ye
-net.ye
 mil.ye
+net.ye
 org.ye
 
-// za : https://www.zadna.org.za/content/page/domain-information/
+// za : https://www.iana.org/domains/root/db/za.html
 ac.za
 agric.za
 alt.za
@@ -7186,3514 +6822,4521 @@ gov.zw
 mil.zw
 org.zw
 
-
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2023-02-22T15:15:03Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2026-02-18T15:51:43Z
 // This list is auto-generated, don't edit it manually.
-// aaa : 2015-02-26 American Automobile Association, Inc.
+// aaa : American Automobile Association, Inc.
+// https://www.iana.org/domains/root/db/aaa.html
 aaa
 
-// aarp : 2015-05-21 AARP
+// aarp : AARP
+// https://www.iana.org/domains/root/db/aarp.html
 aarp
 
-// abarth : 2015-07-30 Fiat Chrysler Automobiles N.V.
-abarth
-
-// abb : 2014-10-24 ABB Ltd
+// abb : ABB Ltd
+// https://www.iana.org/domains/root/db/abb.html
 abb
 
-// abbott : 2014-07-24 Abbott Laboratories, Inc.
+// abbott : Abbott Laboratories, Inc.
+// https://www.iana.org/domains/root/db/abbott.html
 abbott
 
-// abbvie : 2015-07-30 AbbVie Inc.
+// abbvie : AbbVie Inc.
+// https://www.iana.org/domains/root/db/abbvie.html
 abbvie
 
-// abc : 2015-07-30 Disney Enterprises, Inc.
+// abc : Disney Enterprises, Inc.
+// https://www.iana.org/domains/root/db/abc.html
 abc
 
-// able : 2015-06-25 Able Inc.
+// able : Able Inc.
+// https://www.iana.org/domains/root/db/able.html
 able
 
-// abogado : 2014-04-24 Registry Services, LLC
+// abogado : Registry Services, LLC
+// https://www.iana.org/domains/root/db/abogado.html
 abogado
 
-// abudhabi : 2015-07-30 Abu Dhabi Systems and Information Centre
+// abudhabi : Abu Dhabi Systems and Information Centre
+// https://www.iana.org/domains/root/db/abudhabi.html
 abudhabi
 
-// academy : 2013-11-07 Binky Moon, LLC
+// academy : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/academy.html
 academy
 
-// accenture : 2014-08-15 Accenture plc
+// accenture : Accenture plc
+// https://www.iana.org/domains/root/db/accenture.html
 accenture
 
-// accountant : 2014-11-20 dot Accountant Limited
+// accountant : dot Accountant Limited
+// https://www.iana.org/domains/root/db/accountant.html
 accountant
 
-// accountants : 2014-03-20 Binky Moon, LLC
+// accountants : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/accountants.html
 accountants
 
-// aco : 2015-01-08 ACO Severin Ahlmann GmbH & Co. KG
+// aco : ACO Severin Ahlmann GmbH & Co. KG
+// https://www.iana.org/domains/root/db/aco.html
 aco
 
-// actor : 2013-12-12 Dog Beach, LLC
+// actor : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/actor.html
 actor
 
-// ads : 2014-12-04 Charleston Road Registry Inc.
+// ads : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/ads.html
 ads
 
-// adult : 2014-10-16 ICM Registry AD LLC
+// adult : ICM Registry AD LLC
+// https://www.iana.org/domains/root/db/adult.html
 adult
 
-// aeg : 2015-03-19 Aktiebolaget Electrolux
+// aeg : Aktiebolaget Electrolux
+// https://www.iana.org/domains/root/db/aeg.html
 aeg
 
-// aetna : 2015-05-21 Aetna Life Insurance Company
+// aetna : Aetna Life Insurance Company
+// https://www.iana.org/domains/root/db/aetna.html
 aetna
 
-// afl : 2014-10-02 Australian Football League
+// afl : Australian Football League
+// https://www.iana.org/domains/root/db/afl.html
 afl
 
-// africa : 2014-03-24 ZA Central Registry NPC trading as Registry.Africa
+// africa : ZA Central Registry NPC trading as Registry.Africa
+// https://www.iana.org/domains/root/db/africa.html
 africa
 
-// agakhan : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
+// agakhan : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/agakhan.html
 agakhan
 
-// agency : 2013-11-14 Binky Moon, LLC
+// agency : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/agency.html
 agency
 
-// aig : 2014-12-18 American International Group, Inc.
+// aig : American International Group, Inc.
+// https://www.iana.org/domains/root/db/aig.html
 aig
 
-// airbus : 2015-07-30 Airbus S.A.S.
+// airbus : Airbus S.A.S.
+// https://www.iana.org/domains/root/db/airbus.html
 airbus
 
-// airforce : 2014-03-06 Dog Beach, LLC
+// airforce : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/airforce.html
 airforce
 
-// airtel : 2014-10-24 Bharti Airtel Limited
+// airtel : Bharti Airtel Limited
+// https://www.iana.org/domains/root/db/airtel.html
 airtel
 
-// akdn : 2015-04-23 Fondation Aga Khan (Aga Khan Foundation)
+// akdn : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/akdn.html
 akdn
 
-// alfaromeo : 2015-07-31 Fiat Chrysler Automobiles N.V.
-alfaromeo
-
-// alibaba : 2015-01-15 Alibaba Group Holding Limited
+// alibaba : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/alibaba.html
 alibaba
 
-// alipay : 2015-01-15 Alibaba Group Holding Limited
+// alipay : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/alipay.html
 alipay
 
-// allfinanz : 2014-07-03 Allfinanz Deutsche Vermรถgensberatung Aktiengesellschaft
+// allfinanz : Allfinanz Deutsche Vermรถgensberatung Aktiengesellschaft
+// https://www.iana.org/domains/root/db/allfinanz.html
 allfinanz
 
-// allstate : 2015-07-31 Allstate Fire and Casualty Insurance Company
+// allstate : Allstate Fire and Casualty Insurance Company
+// https://www.iana.org/domains/root/db/allstate.html
 allstate
 
-// ally : 2015-06-18 Ally Financial Inc.
+// ally : Ally Financial Inc.
+// https://www.iana.org/domains/root/db/ally.html
 ally
 
-// alsace : 2014-07-02 Region Grand Est
+// alsace : Region Grand Est
+// https://www.iana.org/domains/root/db/alsace.html
 alsace
 
-// alstom : 2015-07-30 ALSTOM
+// alstom : ALSTOM
+// https://www.iana.org/domains/root/db/alstom.html
 alstom
 
-// amazon : 2019-12-19 Amazon Registry Services, Inc.
+// amazon : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/amazon.html
 amazon
 
-// americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc.
+// americanexpress : American Express Travel Related Services Company, Inc.
+// https://www.iana.org/domains/root/db/americanexpress.html
 americanexpress
 
-// americanfamily : 2015-07-23 AmFam, Inc.
+// americanfamily : AmFam, Inc.
+// https://www.iana.org/domains/root/db/americanfamily.html
 americanfamily
 
-// amex : 2015-07-31 American Express Travel Related Services Company, Inc.
+// amex : American Express Travel Related Services Company, Inc.
+// https://www.iana.org/domains/root/db/amex.html
 amex
 
-// amfam : 2015-07-23 AmFam, Inc.
+// amfam : AmFam, Inc.
+// https://www.iana.org/domains/root/db/amfam.html
 amfam
 
-// amica : 2015-05-28 Amica Mutual Insurance Company
+// amica : Amica Mutual Insurance Company
+// https://www.iana.org/domains/root/db/amica.html
 amica
 
-// amsterdam : 2014-07-24 Gemeente Amsterdam
+// amsterdam : Gemeente Amsterdam
+// https://www.iana.org/domains/root/db/amsterdam.html
 amsterdam
 
-// analytics : 2014-12-18 Campus IP LLC
+// analytics : Campus IP LLC
+// https://www.iana.org/domains/root/db/analytics.html
 analytics
 
-// android : 2014-08-07 Charleston Road Registry Inc.
+// android : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/android.html
 android
 
-// anquan : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// anquan : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/anquan.html
 anquan
 
-// anz : 2015-07-31 Australia and New Zealand Banking Group Limited
+// anz : Australia and New Zealand Banking Group Limited
+// https://www.iana.org/domains/root/db/anz.html
 anz
 
-// aol : 2015-09-17 Oath Inc.
+// aol : Yahoo Inc.
+// https://www.iana.org/domains/root/db/aol.html
 aol
 
-// apartments : 2014-12-11 Binky Moon, LLC
+// apartments : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/apartments.html
 apartments
 
-// app : 2015-05-14 Charleston Road Registry Inc.
+// app : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/app.html
 app
 
-// apple : 2015-05-14 Apple Inc.
+// apple : Apple Inc.
+// https://www.iana.org/domains/root/db/apple.html
 apple
 
-// aquarelle : 2014-07-24 Aquarelle.com
+// aquarelle : Aquarelle.com
+// https://www.iana.org/domains/root/db/aquarelle.html
 aquarelle
 
-// arab : 2015-11-12 League of Arab States
+// arab : League of Arab States
+// https://www.iana.org/domains/root/db/arab.html
 arab
 
-// aramco : 2014-11-20 Aramco Services Company
+// aramco : Aramco Services Company
+// https://www.iana.org/domains/root/db/aramco.html
 aramco
 
-// archi : 2014-02-06 Identity Digital Limited
+// archi : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/archi.html
 archi
 
-// army : 2014-03-06 Dog Beach, LLC
+// army : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/army.html
 army
 
-// art : 2016-03-24 UK Creative Ideas Limited
+// art : UK Creative Ideas Limited
+// https://www.iana.org/domains/root/db/art.html
 art
 
-// arte : 2014-12-11 Association Relative ร  la Tรฉlรฉvision Europรฉenne G.E.I.E.
+// arte : Association Relative ร  la Tรฉlรฉvision Europรฉenne G.E.I.E.
+// https://www.iana.org/domains/root/db/arte.html
 arte
 
-// asda : 2015-07-31 Wal-Mart Stores, Inc.
+// asda : Asda Stores Limited
+// https://www.iana.org/domains/root/db/asda.html
 asda
 
-// associates : 2014-03-06 Binky Moon, LLC
+// associates : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/associates.html
 associates
 
-// athleta : 2015-07-30 The Gap, Inc.
+// athleta : The Gap, Inc.
+// https://www.iana.org/domains/root/db/athleta.html
 athleta
 
-// attorney : 2014-03-20 Dog Beach, LLC
+// attorney : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/attorney.html
 attorney
 
-// auction : 2014-03-20 Dog Beach, LLC
+// auction : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/auction.html
 auction
 
-// audi : 2015-05-21 AUDI Aktiengesellschaft
+// audi : AUDI Aktiengesellschaft
+// https://www.iana.org/domains/root/db/audi.html
 audi
 
-// audible : 2015-06-25 Amazon Registry Services, Inc.
+// audible : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/audible.html
 audible
 
-// audio : 2014-03-20 XYZ.COM LLC
+// audio : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/audio.html
 audio
 
-// auspost : 2015-08-13 Australian Postal Corporation
+// auspost : Australian Postal Corporation
+// https://www.iana.org/domains/root/db/auspost.html
 auspost
 
-// author : 2014-12-18 Amazon Registry Services, Inc.
+// author : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/author.html
 author
 
-// auto : 2014-11-13 XYZ.COM LLC
+// auto : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/auto.html
 auto
 
-// autos : 2014-01-09 XYZ.COM LLC
+// autos : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/autos.html
 autos
 
-// avianca : 2015-01-08 Avianca Inc.
-avianca
-
-// aws : 2015-06-25 AWS Registry LLC
+// aws : AWS Registry LLC
+// https://www.iana.org/domains/root/db/aws.html
 aws
 
-// axa : 2013-12-19 AXA Group Operations SAS
+// axa : AXA Group Operations SAS
+// https://www.iana.org/domains/root/db/axa.html
 axa
 
-// azure : 2014-12-18 Microsoft Corporation
+// azure : Microsoft Corporation
+// https://www.iana.org/domains/root/db/azure.html
 azure
 
-// baby : 2015-04-09 XYZ.COM LLC
+// baby : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/baby.html
 baby
 
-// baidu : 2015-01-08 Baidu, Inc.
+// baidu : Baidu, Inc.
+// https://www.iana.org/domains/root/db/baidu.html
 baidu
 
-// banamex : 2015-07-30 Citigroup Inc.
+// banamex : Citigroup Inc.
+// https://www.iana.org/domains/root/db/banamex.html
 banamex
 
-// bananarepublic : 2015-07-31 The Gap, Inc.
-bananarepublic
-
-// band : 2014-06-12 Dog Beach, LLC
+// band : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/band.html
 band
 
-// bank : 2014-09-25 fTLD Registry Services LLC
+// bank : fTLD Registry Services LLC
+// https://www.iana.org/domains/root/db/bank.html
 bank
 
-// bar : 2013-12-12 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// bar : Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// https://www.iana.org/domains/root/db/bar.html
 bar
 
-// barcelona : 2014-07-24 Municipi de Barcelona
+// barcelona : Municipi de Barcelona
+// https://www.iana.org/domains/root/db/barcelona.html
 barcelona
 
-// barclaycard : 2014-11-20 Barclays Bank PLC
+// barclaycard : Barclays Bank PLC
+// https://www.iana.org/domains/root/db/barclaycard.html
 barclaycard
 
-// barclays : 2014-11-20 Barclays Bank PLC
+// barclays : Barclays Bank PLC
+// https://www.iana.org/domains/root/db/barclays.html
 barclays
 
-// barefoot : 2015-06-11 Gallo Vineyards, Inc.
+// barefoot : Gallo Vineyards, Inc.
+// https://www.iana.org/domains/root/db/barefoot.html
 barefoot
 
-// bargains : 2013-11-14 Binky Moon, LLC
+// bargains : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/bargains.html
 bargains
 
-// baseball : 2015-10-29 MLB Advanced Media DH, LLC
+// baseball : MLB Advanced Media DH, LLC
+// https://www.iana.org/domains/root/db/baseball.html
 baseball
 
-// basketball : 2015-08-20 Fรฉdรฉration Internationale de Basketball (FIBA)
+// basketball : Fรฉdรฉration Internationale de Basketball (FIBA)
+// https://www.iana.org/domains/root/db/basketball.html
 basketball
 
-// bauhaus : 2014-04-17 Werkhaus GmbH
+// bauhaus : Werkhaus GmbH
+// https://www.iana.org/domains/root/db/bauhaus.html
 bauhaus
 
-// bayern : 2014-01-23 Bayern Connect GmbH
+// bayern : Bayern Connect GmbH
+// https://www.iana.org/domains/root/db/bayern.html
 bayern
 
-// bbc : 2014-12-18 British Broadcasting Corporation
+// bbc : British Broadcasting Corporation
+// https://www.iana.org/domains/root/db/bbc.html
 bbc
 
-// bbt : 2015-07-23 BB&T Corporation
+// bbt : BB&T Corporation
+// https://www.iana.org/domains/root/db/bbt.html
 bbt
 
-// bbva : 2014-10-02 BANCO BILBAO VIZCAYA ARGENTARIA, S.A.
+// bbva : BANCO BILBAO VIZCAYA ARGENTARIA, S.A.
+// https://www.iana.org/domains/root/db/bbva.html
 bbva
 
-// bcg : 2015-04-02 The Boston Consulting Group, Inc.
+// bcg : The Boston Consulting Group, Inc.
+// https://www.iana.org/domains/root/db/bcg.html
 bcg
 
-// bcn : 2014-07-24 Municipi de Barcelona
+// bcn : Municipi de Barcelona
+// https://www.iana.org/domains/root/db/bcn.html
 bcn
 
-// beats : 2015-05-14 Beats Electronics, LLC
+// beats : Beats Electronics, LLC
+// https://www.iana.org/domains/root/db/beats.html
 beats
 
-// beauty : 2015-12-03 XYZ.COM LLC
+// beauty : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/beauty.html
 beauty
 
-// beer : 2014-01-09 Registry Services, LLC
+// beer : Registry Services, LLC
+// https://www.iana.org/domains/root/db/beer.html
 beer
 
-// bentley : 2014-12-18 Bentley Motors Limited
-bentley
-
-// berlin : 2013-10-31 dotBERLIN GmbH & Co. KG
+// berlin : dotBERLIN GmbH & Co. KG
+// https://www.iana.org/domains/root/db/berlin.html
 berlin
 
-// best : 2013-12-19 BestTLD Pty Ltd
+// best : BestTLD Pty Ltd
+// https://www.iana.org/domains/root/db/best.html
 best
 
-// bestbuy : 2015-07-31 BBY Solutions, Inc.
+// bestbuy : BBY Solutions, Inc.
+// https://www.iana.org/domains/root/db/bestbuy.html
 bestbuy
 
-// bet : 2015-05-07 Identity Digital Limited
+// bet : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/bet.html
 bet
 
-// bharti : 2014-01-09 Bharti Enterprises (Holding) Private Limited
+// bharti : Bharti Enterprises (Holding) Private Limited
+// https://www.iana.org/domains/root/db/bharti.html
 bharti
 
-// bible : 2014-06-19 American Bible Society
+// bible : American Bible Society
+// https://www.iana.org/domains/root/db/bible.html
 bible
 
-// bid : 2013-12-19 dot Bid Limited
+// bid : dot Bid Limited
+// https://www.iana.org/domains/root/db/bid.html
 bid
 
-// bike : 2013-08-27 Binky Moon, LLC
+// bike : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/bike.html
 bike
 
-// bing : 2014-12-18 Microsoft Corporation
+// bing : Microsoft Corporation
+// https://www.iana.org/domains/root/db/bing.html
 bing
 
-// bingo : 2014-12-04 Binky Moon, LLC
+// bingo : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/bingo.html
 bingo
 
-// bio : 2014-03-06 Identity Digital Limited
+// bio : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/bio.html
 bio
 
-// black : 2014-01-16 Identity Digital Limited
+// black : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/black.html
 black
 
-// blackfriday : 2014-01-16 Registry Services, LLC
+// blackfriday : Registry Services, LLC
+// https://www.iana.org/domains/root/db/blackfriday.html
 blackfriday
 
-// blockbuster : 2015-07-30 Dish DBS Corporation
+// blockbuster : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/blockbuster.html
 blockbuster
 
-// blog : 2015-05-14 Knock Knock WHOIS There, LLC
+// blog : Knock Knock WHOIS There, LLC
+// https://www.iana.org/domains/root/db/blog.html
 blog
 
-// bloomberg : 2014-07-17 Bloomberg IP Holdings LLC
+// bloomberg : Bloomberg IP Holdings LLC
+// https://www.iana.org/domains/root/db/bloomberg.html
 bloomberg
 
-// blue : 2013-11-07 Identity Digital Limited
+// blue : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/blue.html
 blue
 
-// bms : 2014-10-30 Bristol-Myers Squibb Company
+// bms : Bristol-Myers Squibb Company
+// https://www.iana.org/domains/root/db/bms.html
 bms
 
-// bmw : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
+// bmw : Bayerische Motoren Werke Aktiengesellschaft
+// https://www.iana.org/domains/root/db/bmw.html
 bmw
 
-// bnpparibas : 2014-05-29 BNP Paribas
+// bnpparibas : BNP Paribas
+// https://www.iana.org/domains/root/db/bnpparibas.html
 bnpparibas
 
-// boats : 2014-12-04 XYZ.COM LLC
+// boats : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/boats.html
 boats
 
-// boehringer : 2015-07-09 Boehringer Ingelheim International GmbH
+// boehringer : Boehringer Ingelheim International GmbH
+// https://www.iana.org/domains/root/db/boehringer.html
 boehringer
 
-// bofa : 2015-07-31 Bank of America Corporation
+// bofa : Bank of America Corporation
+// https://www.iana.org/domains/root/db/bofa.html
 bofa
 
-// bom : 2014-10-16 Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// bom : Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// https://www.iana.org/domains/root/db/bom.html
 bom
 
-// bond : 2014-06-05 ShortDot SA
+// bond : ShortDot SA
+// https://www.iana.org/domains/root/db/bond.html
 bond
 
-// boo : 2014-01-30 Charleston Road Registry Inc.
+// boo : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/boo.html
 boo
 
-// book : 2015-08-27 Amazon Registry Services, Inc.
+// book : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/book.html
 book
 
-// booking : 2015-07-16 Booking.com B.V.
+// booking : Booking.com B.V.
+// https://www.iana.org/domains/root/db/booking.html
 booking
 
-// bosch : 2015-06-18 Robert Bosch GMBH
+// bosch : Robert Bosch GMBH
+// https://www.iana.org/domains/root/db/bosch.html
 bosch
 
-// bostik : 2015-05-28 Bostik SA
+// bostik : Bostik SA
+// https://www.iana.org/domains/root/db/bostik.html
 bostik
 
-// boston : 2015-12-10 Registry Services, LLC
+// boston : Registry Services, LLC
+// https://www.iana.org/domains/root/db/boston.html
 boston
 
-// bot : 2014-12-18 Amazon Registry Services, Inc.
+// bot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/bot.html
 bot
 
-// boutique : 2013-11-14 Binky Moon, LLC
+// boutique : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/boutique.html
 boutique
 
-// box : 2015-11-12 Intercap Registry Inc.
+// box : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/box.html
 box
 
-// bradesco : 2014-12-18 Banco Bradesco S.A.
+// bradesco : Banco Bradesco S.A.
+// https://www.iana.org/domains/root/db/bradesco.html
 bradesco
 
-// bridgestone : 2014-12-18 Bridgestone Corporation
+// bridgestone : Bridgestone Corporation
+// https://www.iana.org/domains/root/db/bridgestone.html
 bridgestone
 
-// broadway : 2014-12-22 Celebrate Broadway, Inc.
+// broadway : Celebrate Broadway, Inc.
+// https://www.iana.org/domains/root/db/broadway.html
 broadway
 
-// broker : 2014-12-11 Dog Beach, LLC
+// broker : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/broker.html
 broker
 
-// brother : 2015-01-29 Brother Industries, Ltd.
+// brother : Brother Industries, Ltd.
+// https://www.iana.org/domains/root/db/brother.html
 brother
 
-// brussels : 2014-02-06 DNS.be vzw
+// brussels : DNS.be vzw
+// https://www.iana.org/domains/root/db/brussels.html
 brussels
 
-// build : 2013-11-07 Plan Bee LLC
+// build : Plan Bee LLC
+// https://www.iana.org/domains/root/db/build.html
 build
 
-// builders : 2013-11-07 Binky Moon, LLC
+// builders : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/builders.html
 builders
 
-// business : 2013-11-07 Binky Moon, LLC
+// business : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/business.html
 business
 
-// buy : 2014-12-18 Amazon Registry Services, Inc.
+// buy : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/buy.html
 buy
 
-// buzz : 2013-10-02 DOTSTRATEGY CO.
+// buzz : DOTSTRATEGY CO.
+// https://www.iana.org/domains/root/db/buzz.html
 buzz
 
-// bzh : 2014-02-27 Association www.bzh
+// bzh : Association www.bzh
+// https://www.iana.org/domains/root/db/bzh.html
 bzh
 
-// cab : 2013-10-24 Binky Moon, LLC
+// cab : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cab.html
 cab
 
-// cafe : 2015-02-11 Binky Moon, LLC
+// cafe : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cafe.html
 cafe
 
-// cal : 2014-07-24 Charleston Road Registry Inc.
+// cal : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/cal.html
 cal
 
-// call : 2014-12-18 Amazon Registry Services, Inc.
+// call : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/call.html
 call
 
-// calvinklein : 2015-07-30 PVH gTLD Holdings LLC
+// calvinklein : PVH gTLD Holdings LLC
+// https://www.iana.org/domains/root/db/calvinklein.html
 calvinklein
 
-// cam : 2016-04-21 Cam Connecting SARL
+// cam : Cam Connecting SARL
+// https://www.iana.org/domains/root/db/cam.html
 cam
 
-// camera : 2013-08-27 Binky Moon, LLC
+// camera : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/camera.html
 camera
 
-// camp : 2013-11-07 Binky Moon, LLC
+// camp : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/camp.html
 camp
 
-// canon : 2014-09-12 Canon Inc.
+// canon : Canon Inc.
+// https://www.iana.org/domains/root/db/canon.html
 canon
 
-// capetown : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
+// capetown : ZA Central Registry NPC trading as ZA Central Registry
+// https://www.iana.org/domains/root/db/capetown.html
 capetown
 
-// capital : 2014-03-06 Binky Moon, LLC
+// capital : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/capital.html
 capital
 
-// capitalone : 2015-08-06 Capital One Financial Corporation
+// capitalone : Capital One Financial Corporation
+// https://www.iana.org/domains/root/db/capitalone.html
 capitalone
 
-// car : 2015-01-22 XYZ.COM LLC
+// car : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/car.html
 car
 
-// caravan : 2013-12-12 Caravan International, Inc.
+// caravan : Caravan International, Inc.
+// https://www.iana.org/domains/root/db/caravan.html
 caravan
 
-// cards : 2013-12-05 Binky Moon, LLC
+// cards : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cards.html
 cards
 
-// care : 2014-03-06 Binky Moon, LLC
+// care : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/care.html
 care
 
-// career : 2013-10-09 dotCareer LLC
+// career : dotCareer LLC
+// https://www.iana.org/domains/root/db/career.html
 career
 
-// careers : 2013-10-02 Binky Moon, LLC
+// careers : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/careers.html
 careers
 
-// cars : 2014-11-13 XYZ.COM LLC
+// cars : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/cars.html
 cars
 
-// casa : 2013-11-21 Registry Services, LLC
+// casa : Registry Services, LLC
+// https://www.iana.org/domains/root/db/casa.html
 casa
 
-// case : 2015-09-03 Digity, LLC
+// case : Digity, LLC
+// https://www.iana.org/domains/root/db/case.html
 case
 
-// cash : 2014-03-06 Binky Moon, LLC
+// cash : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cash.html
 cash
 
-// casino : 2014-12-18 Binky Moon, LLC
+// casino : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/casino.html
 casino
 
-// catering : 2013-12-05 Binky Moon, LLC
+// catering : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/catering.html
 catering
 
-// catholic : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// catholic : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/catholic.html
 catholic
 
-// cba : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
+// cba : COMMONWEALTH BANK OF AUSTRALIA
+// https://www.iana.org/domains/root/db/cba.html
 cba
 
-// cbn : 2014-08-22 The Christian Broadcasting Network, Inc.
+// cbn : The Christian Broadcasting Network, Inc.
+// https://www.iana.org/domains/root/db/cbn.html
 cbn
 
-// cbre : 2015-07-02 CBRE, Inc.
+// cbre : CBRE, Inc.
+// https://www.iana.org/domains/root/db/cbre.html
 cbre
 
-// cbs : 2015-08-06 CBS Domains Inc.
-cbs
-
-// center : 2013-11-07 Binky Moon, LLC
+// center : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/center.html
 center
 
-// ceo : 2013-11-07 CEOTLD Pty Ltd
+// ceo : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/ceo.html
 ceo
 
-// cern : 2014-06-05 European Organization for Nuclear Research ("CERN")
+// cern : European Organization for Nuclear Research ("CERN")
+// https://www.iana.org/domains/root/db/cern.html
 cern
 
-// cfa : 2014-08-28 CFA Institute
+// cfa : CFA Institute
+// https://www.iana.org/domains/root/db/cfa.html
 cfa
 
-// cfd : 2014-12-11 ShortDot SA
+// cfd : ShortDot SA
+// https://www.iana.org/domains/root/db/cfd.html
 cfd
 
-// chanel : 2015-04-09 Chanel International B.V.
+// chanel : Chanel International B.V.
+// https://www.iana.org/domains/root/db/chanel.html
 chanel
 
-// channel : 2014-05-08 Charleston Road Registry Inc.
+// channel : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/channel.html
 channel
 
-// charity : 2018-04-11 Public Interest Registry
+// charity : Public Interest Registry
+// https://www.iana.org/domains/root/db/charity.html
 charity
 
-// chase : 2015-04-30 JPMorgan Chase Bank, National Association
+// chase : JPMorgan Chase Bank, National Association
+// https://www.iana.org/domains/root/db/chase.html
 chase
 
-// chat : 2014-12-04 Binky Moon, LLC
+// chat : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/chat.html
 chat
 
-// cheap : 2013-11-14 Binky Moon, LLC
+// cheap : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cheap.html
 cheap
 
-// chintai : 2015-06-11 CHINTAI Corporation
+// chintai : CHINTAI Corporation
+// https://www.iana.org/domains/root/db/chintai.html
 chintai
 
-// christmas : 2013-11-21 XYZ.COM LLC
+// christmas : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/christmas.html
 christmas
 
-// chrome : 2014-07-24 Charleston Road Registry Inc.
+// chrome : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/chrome.html
 chrome
 
-// church : 2014-02-06 Binky Moon, LLC
+// church : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/church.html
 church
 
-// cipriani : 2015-02-19 Hotel Cipriani Srl
+// cipriani : Hotel Cipriani Srl
+// https://www.iana.org/domains/root/db/cipriani.html
 cipriani
 
-// circle : 2014-12-18 Amazon Registry Services, Inc.
+// circle : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/circle.html
 circle
 
-// cisco : 2014-12-22 Cisco Technology, Inc.
+// cisco : Cisco Technology, Inc.
+// https://www.iana.org/domains/root/db/cisco.html
 cisco
 
-// citadel : 2015-07-23 Citadel Domain LLC
+// citadel : Citadel Domain LLC
+// https://www.iana.org/domains/root/db/citadel.html
 citadel
 
-// citi : 2015-07-30 Citigroup Inc.
+// citi : Citigroup Inc.
+// https://www.iana.org/domains/root/db/citi.html
 citi
 
-// citic : 2014-01-09 CITIC Group Corporation
+// citic : CITIC Group Corporation
+// https://www.iana.org/domains/root/db/citic.html
 citic
 
-// city : 2014-05-29 Binky Moon, LLC
+// city : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/city.html
 city
 
-// cityeats : 2014-12-11 Lifestyle Domain Holdings, Inc.
-cityeats
-
-// claims : 2014-03-20 Binky Moon, LLC
+// claims : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/claims.html
 claims
 
-// cleaning : 2013-12-05 Binky Moon, LLC
+// cleaning : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cleaning.html
 cleaning
 
-// click : 2014-06-05 Internet Naming Company LLC
+// click : Waterford Limited
+// https://www.iana.org/domains/root/db/click.html
 click
 
-// clinic : 2014-03-20 Binky Moon, LLC
+// clinic : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/clinic.html
 clinic
 
-// clinique : 2015-10-01 The Estรฉe Lauder Companies Inc.
+// clinique : The Estรฉe Lauder Companies Inc.
+// https://www.iana.org/domains/root/db/clinique.html
 clinique
 
-// clothing : 2013-08-27 Binky Moon, LLC
+// clothing : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/clothing.html
 clothing
 
-// cloud : 2015-04-16 Aruba PEC S.p.A.
+// cloud : Aruba PEC S.p.A.
+// https://www.iana.org/domains/root/db/cloud.html
 cloud
 
-// club : 2013-11-08 Registry Services, LLC
+// club : Registry Services, LLC
+// https://www.iana.org/domains/root/db/club.html
 club
 
-// clubmed : 2015-06-25 Club Mรฉditerranรฉe S.A.
+// clubmed : Club Mรฉditerranรฉe S.A.
+// https://www.iana.org/domains/root/db/clubmed.html
 clubmed
 
-// coach : 2014-10-09 Binky Moon, LLC
+// coach : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/coach.html
 coach
 
-// codes : 2013-10-31 Binky Moon, LLC
+// codes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/codes.html
 codes
 
-// coffee : 2013-10-17 Binky Moon, LLC
+// coffee : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/coffee.html
 coffee
 
-// college : 2014-01-16 XYZ.COM LLC
+// college : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/college.html
 college
 
-// cologne : 2014-02-05 dotKoeln GmbH
+// cologne : dotKoeln GmbH
+// https://www.iana.org/domains/root/db/cologne.html
 cologne
 
-// comcast : 2015-07-23 Comcast IP Holdings I, LLC
-comcast
-
-// commbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
+// commbank : COMMONWEALTH BANK OF AUSTRALIA
+// https://www.iana.org/domains/root/db/commbank.html
 commbank
 
-// community : 2013-12-05 Binky Moon, LLC
+// community : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/community.html
 community
 
-// company : 2013-11-07 Binky Moon, LLC
+// company : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/company.html
 company
 
-// compare : 2015-10-08 Registry Services, LLC
+// compare : Registry Services, LLC
+// https://www.iana.org/domains/root/db/compare.html
 compare
 
-// computer : 2013-10-24 Binky Moon, LLC
+// computer : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/computer.html
 computer
 
-// comsec : 2015-01-08 VeriSign, Inc.
+// comsec : VeriSign, Inc.
+// https://www.iana.org/domains/root/db/comsec.html
 comsec
 
-// condos : 2013-12-05 Binky Moon, LLC
+// condos : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/condos.html
 condos
 
-// construction : 2013-09-16 Binky Moon, LLC
+// construction : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/construction.html
 construction
 
-// consulting : 2013-12-05 Dog Beach, LLC
+// consulting : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/consulting.html
 consulting
 
-// contact : 2015-01-08 Dog Beach, LLC
+// contact : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/contact.html
 contact
 
-// contractors : 2013-09-10 Binky Moon, LLC
+// contractors : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/contractors.html
 contractors
 
-// cooking : 2013-11-21 Registry Services, LLC
+// cooking : Registry Services, LLC
+// https://www.iana.org/domains/root/db/cooking.html
 cooking
 
-// cookingchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
-cookingchannel
-
-// cool : 2013-11-14 Binky Moon, LLC
+// cool : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cool.html
 cool
 
-// corsica : 2014-09-25 Collectivitรฉ de Corse
+// corsica : Collectivitรฉ de Corse
+// https://www.iana.org/domains/root/db/corsica.html
 corsica
 
-// country : 2013-12-19 Internet Naming Company LLC
+// country : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/country.html
 country
 
-// coupon : 2015-02-26 Amazon Registry Services, Inc.
+// coupon : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/coupon.html
 coupon
 
-// coupons : 2015-03-26 Binky Moon, LLC
+// coupons : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/coupons.html
 coupons
 
-// courses : 2014-12-04 Registry Services, LLC
+// courses : Registry Services, LLC
+// https://www.iana.org/domains/root/db/courses.html
 courses
 
-// cpa : 2019-06-10 American Institute of Certified Public Accountants
+// cpa : American Institute of Certified Public Accountants
+// https://www.iana.org/domains/root/db/cpa.html
 cpa
 
-// credit : 2014-03-20 Binky Moon, LLC
+// credit : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/credit.html
 credit
 
-// creditcard : 2014-03-20 Binky Moon, LLC
+// creditcard : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/creditcard.html
 creditcard
 
-// creditunion : 2015-01-22 DotCooperation LLC
+// creditunion : DotCooperation LLC
+// https://www.iana.org/domains/root/db/creditunion.html
 creditunion
 
-// cricket : 2014-10-09 dot Cricket Limited
+// cricket : dot Cricket Limited
+// https://www.iana.org/domains/root/db/cricket.html
 cricket
 
-// crown : 2014-10-24 Crown Equipment Corporation
+// crown : Crown Equipment Corporation
+// https://www.iana.org/domains/root/db/crown.html
 crown
 
-// crs : 2014-04-03 Federated Co-operatives Limited
+// crs : Federated Co-operatives Limited
+// https://www.iana.org/domains/root/db/crs.html
 crs
 
-// cruise : 2015-12-10 Viking River Cruises (Bermuda) Ltd.
+// cruise : Viking River Cruises (Bermuda) Ltd.
+// https://www.iana.org/domains/root/db/cruise.html
 cruise
 
-// cruises : 2013-12-05 Binky Moon, LLC
+// cruises : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/cruises.html
 cruises
 
-// cuisinella : 2014-04-03 SCHMIDT GROUPE S.A.S.
+// cuisinella : SCHMIDT GROUPE S.A.S.
+// https://www.iana.org/domains/root/db/cuisinella.html
 cuisinella
 
-// cymru : 2014-05-08 Nominet UK
+// cymru : Nominet UK
+// https://www.iana.org/domains/root/db/cymru.html
 cymru
 
-// cyou : 2015-01-22 ShortDot SA
+// cyou : ShortDot SA
+// https://www.iana.org/domains/root/db/cyou.html
 cyou
 
-// dabur : 2014-02-06 Dabur India Limited
-dabur
-
-// dad : 2014-01-23 Charleston Road Registry Inc.
+// dad : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/dad.html
 dad
 
-// dance : 2013-10-24 Dog Beach, LLC
+// dance : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/dance.html
 dance
 
-// data : 2016-06-02 Dish DBS Corporation
+// data : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/data.html
 data
 
-// date : 2014-11-20 dot Date Limited
+// date : dot Date Limited
+// https://www.iana.org/domains/root/db/date.html
 date
 
-// dating : 2013-12-05 Binky Moon, LLC
+// dating : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/dating.html
 dating
 
-// datsun : 2014-03-27 NISSAN MOTOR CO., LTD.
+// datsun : NISSAN MOTOR CO., LTD.
+// https://www.iana.org/domains/root/db/datsun.html
 datsun
 
-// day : 2014-01-30 Charleston Road Registry Inc.
+// day : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/day.html
 day
 
-// dclk : 2014-11-20 Charleston Road Registry Inc.
+// dclk : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/dclk.html
 dclk
 
-// dds : 2015-05-07 Registry Services, LLC
+// dds : Registry Services, LLC
+// https://www.iana.org/domains/root/db/dds.html
 dds
 
-// deal : 2015-06-25 Amazon Registry Services, Inc.
+// deal : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/deal.html
 deal
 
-// dealer : 2014-12-22 Intercap Registry Inc.
+// dealer : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/dealer.html
 dealer
 
-// deals : 2014-05-22 Binky Moon, LLC
+// deals : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/deals.html
 deals
 
-// degree : 2014-03-06 Dog Beach, LLC
+// degree : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/degree.html
 degree
 
-// delivery : 2014-09-11 Binky Moon, LLC
+// delivery : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/delivery.html
 delivery
 
-// dell : 2014-10-24 Dell Inc.
+// dell : Dell Inc.
+// https://www.iana.org/domains/root/db/dell.html
 dell
 
-// deloitte : 2015-07-31 Deloitte Touche Tohmatsu
+// deloitte : Deloitte Touche Tohmatsu
+// https://www.iana.org/domains/root/db/deloitte.html
 deloitte
 
-// delta : 2015-02-19 Delta Air Lines, Inc.
+// delta : Delta Air Lines, Inc.
+// https://www.iana.org/domains/root/db/delta.html
 delta
 
-// democrat : 2013-10-24 Dog Beach, LLC
+// democrat : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/democrat.html
 democrat
 
-// dental : 2014-03-20 Binky Moon, LLC
+// dental : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/dental.html
 dental
 
-// dentist : 2014-03-20 Dog Beach, LLC
+// dentist : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/dentist.html
 dentist
 
-// desi : 2013-11-14 Desi Networks LLC
+// desi
+// https://www.iana.org/domains/root/db/desi.html
 desi
 
-// design : 2014-11-07 Registry Services, LLC
+// design : Registry Services, LLC
+// https://www.iana.org/domains/root/db/design.html
 design
 
-// dev : 2014-10-16 Charleston Road Registry Inc.
+// dev : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/dev.html
 dev
 
-// dhl : 2015-07-23 Deutsche Post AG
+// dhl : Deutsche Post AG
+// https://www.iana.org/domains/root/db/dhl.html
 dhl
 
-// diamonds : 2013-09-22 Binky Moon, LLC
+// diamonds : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/diamonds.html
 diamonds
 
-// diet : 2014-06-26 XYZ.COM LLC
+// diet : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/diet.html
 diet
 
-// digital : 2014-03-06 Binky Moon, LLC
+// digital : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/digital.html
 digital
 
-// direct : 2014-04-10 Binky Moon, LLC
+// direct : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/direct.html
 direct
 
-// directory : 2013-09-20 Binky Moon, LLC
+// directory : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/directory.html
 directory
 
-// discount : 2014-03-06 Binky Moon, LLC
+// discount : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/discount.html
 discount
 
-// discover : 2015-07-23 Discover Financial Services
+// discover : Discover Financial Services
+// https://www.iana.org/domains/root/db/discover.html
 discover
 
-// dish : 2015-07-30 Dish DBS Corporation
+// dish : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/dish.html
 dish
 
-// diy : 2015-11-05 Lifestyle Domain Holdings, Inc.
+// diy : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/diy.html
 diy
 
-// dnp : 2013-12-13 Dai Nippon Printing Co., Ltd.
+// dnp : Dai Nippon Printing Co., Ltd.
+// https://www.iana.org/domains/root/db/dnp.html
 dnp
 
-// docs : 2014-10-16 Charleston Road Registry Inc.
+// docs : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/docs.html
 docs
 
-// doctor : 2016-06-02 Binky Moon, LLC
+// doctor : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/doctor.html
 doctor
 
-// dog : 2014-12-04 Binky Moon, LLC
+// dog : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/dog.html
 dog
 
-// domains : 2013-10-17 Binky Moon, LLC
+// domains : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/domains.html
 domains
 
-// dot : 2015-05-21 Dish DBS Corporation
+// dot : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/dot.html
 dot
 
-// download : 2014-11-20 dot Support Limited
+// download : dot Support Limited
+// https://www.iana.org/domains/root/db/download.html
 download
 
-// drive : 2015-03-05 Charleston Road Registry Inc.
+// drive : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/drive.html
 drive
 
-// dtv : 2015-06-04 Dish DBS Corporation
+// dtv : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/dtv.html
 dtv
 
-// dubai : 2015-01-01 Dubai Smart Government Department
+// dubai : Dubai Smart Government Department
+// https://www.iana.org/domains/root/db/dubai.html
 dubai
 
-// dunlop : 2015-07-02 The Goodyear Tire & Rubber Company
-dunlop
-
-// dupont : 2015-06-25 DuPont Specialty Products USA, LLC
+// dupont : DuPont Specialty Products USA, LLC
+// https://www.iana.org/domains/root/db/dupont.html
 dupont
 
-// durban : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
+// durban : ZA Central Registry NPC trading as ZA Central Registry
+// https://www.iana.org/domains/root/db/durban.html
 durban
 
-// dvag : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// dvag : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/dvag.html
 dvag
 
-// dvr : 2016-05-26 DISH Technologies L.L.C.
+// dvr : DISH Technologies L.L.C.
+// https://www.iana.org/domains/root/db/dvr.html
 dvr
 
-// earth : 2014-12-04 Interlink Systems Innovation Institute K.K.
+// earth : Interlink Systems Innovation Institute K.K.
+// https://www.iana.org/domains/root/db/earth.html
 earth
 
-// eat : 2014-01-23 Charleston Road Registry Inc.
+// eat : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/eat.html
 eat
 
-// eco : 2016-07-08 Big Room Inc.
+// eco : Big Room Inc.
+// https://www.iana.org/domains/root/db/eco.html
 eco
 
-// edeka : 2014-12-18 EDEKA Verband kaufmรคnnischer Genossenschaften e.V.
+// edeka : EDEKA Verband kaufmรคnnischer Genossenschaften e.V.
+// https://www.iana.org/domains/root/db/edeka.html
 edeka
 
-// education : 2013-11-07 Binky Moon, LLC
+// education : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/education.html
 education
 
-// email : 2013-10-31 Binky Moon, LLC
+// email : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/email.html
 email
 
-// emerck : 2014-04-03 Merck KGaA
+// emerck : Merck KGaA
+// https://www.iana.org/domains/root/db/emerck.html
 emerck
 
-// energy : 2014-09-11 Binky Moon, LLC
+// energy : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/energy.html
 energy
 
-// engineer : 2014-03-06 Dog Beach, LLC
+// engineer : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/engineer.html
 engineer
 
-// engineering : 2014-03-06 Binky Moon, LLC
+// engineering : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/engineering.html
 engineering
 
-// enterprises : 2013-09-20 Binky Moon, LLC
+// enterprises : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/enterprises.html
 enterprises
 
-// epson : 2014-12-04 Seiko Epson Corporation
+// epson : Seiko Epson Corporation
+// https://www.iana.org/domains/root/db/epson.html
 epson
 
-// equipment : 2013-08-27 Binky Moon, LLC
+// equipment : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/equipment.html
 equipment
 
-// ericsson : 2015-07-09 Telefonaktiebolaget L M Ericsson
+// ericsson : Telefonaktiebolaget L M Ericsson
+// https://www.iana.org/domains/root/db/ericsson.html
 ericsson
 
-// erni : 2014-04-03 ERNI Group Holding AG
+// erni : ERNI Group Holding AG
+// https://www.iana.org/domains/root/db/erni.html
 erni
 
-// esq : 2014-05-08 Charleston Road Registry Inc.
+// esq : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/esq.html
 esq
 
-// estate : 2013-08-27 Binky Moon, LLC
+// estate : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/estate.html
 estate
 
-// etisalat : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
-etisalat
-
-// eurovision : 2014-04-24 European Broadcasting Union (EBU)
+// eurovision : European Broadcasting Union (EBU)
+// https://www.iana.org/domains/root/db/eurovision.html
 eurovision
 
-// eus : 2013-12-12 Puntueus Fundazioa
+// eus : Puntueus Fundazioa
+// https://www.iana.org/domains/root/db/eus.html
 eus
 
-// events : 2013-12-05 Binky Moon, LLC
+// events : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/events.html
 events
 
-// exchange : 2014-03-06 Binky Moon, LLC
+// exchange : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/exchange.html
 exchange
 
-// expert : 2013-11-21 Binky Moon, LLC
+// expert : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/expert.html
 expert
 
-// exposed : 2013-12-05 Binky Moon, LLC
+// exposed : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/exposed.html
 exposed
 
-// express : 2015-02-11 Binky Moon, LLC
+// express : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/express.html
 express
 
-// extraspace : 2015-05-14 Extra Space Storage LLC
+// extraspace : Extra Space Storage LLC
+// https://www.iana.org/domains/root/db/extraspace.html
 extraspace
 
-// fage : 2014-12-18 Fage International S.A.
+// fage : Fage International S.A.
+// https://www.iana.org/domains/root/db/fage.html
 fage
 
-// fail : 2014-03-06 Binky Moon, LLC
+// fail : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fail.html
 fail
 
-// fairwinds : 2014-11-13 FairWinds Partners, LLC
+// fairwinds : FairWinds Partners, LLC
+// https://www.iana.org/domains/root/db/fairwinds.html
 fairwinds
 
-// faith : 2014-11-20 dot Faith Limited
+// faith : dot Faith Limited
+// https://www.iana.org/domains/root/db/faith.html
 faith
 
-// family : 2015-04-02 Dog Beach, LLC
+// family : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/family.html
 family
 
-// fan : 2014-03-06 Dog Beach, LLC
+// fan : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/fan.html
 fan
 
-// fans : 2014-11-07 ZDNS International Limited
+// fans : ZDNS International Limited
+// https://www.iana.org/domains/root/db/fans.html
 fans
 
-// farm : 2013-11-07 Binky Moon, LLC
+// farm : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/farm.html
 farm
 
-// farmers : 2015-07-09 Farmers Insurance Exchange
+// farmers : Farmers Insurance Exchange
+// https://www.iana.org/domains/root/db/farmers.html
 farmers
 
-// fashion : 2014-07-03 Registry Services, LLC
+// fashion : Registry Services, LLC
+// https://www.iana.org/domains/root/db/fashion.html
 fashion
 
-// fast : 2014-12-18 Amazon Registry Services, Inc.
+// fast : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/fast.html
 fast
 
-// fedex : 2015-08-06 Federal Express Corporation
+// fedex : Federal Express Corporation
+// https://www.iana.org/domains/root/db/fedex.html
 fedex
 
-// feedback : 2013-12-19 Top Level Spectrum, Inc.
+// feedback : Top Level Spectrum, Inc.
+// https://www.iana.org/domains/root/db/feedback.html
 feedback
 
-// ferrari : 2015-07-31 Fiat Chrysler Automobiles N.V.
+// ferrari : Fiat Chrysler Automobiles N.V.
+// https://www.iana.org/domains/root/db/ferrari.html
 ferrari
 
-// ferrero : 2014-12-18 Ferrero Trading Lux S.A.
+// ferrero : Ferrero Trading Lux S.A.
+// https://www.iana.org/domains/root/db/ferrero.html
 ferrero
 
-// fiat : 2015-07-31 Fiat Chrysler Automobiles N.V.
-fiat
-
-// fidelity : 2015-07-30 Fidelity Brokerage Services LLC
+// fidelity : Fidelity Brokerage Services LLC
+// https://www.iana.org/domains/root/db/fidelity.html
 fidelity
 
-// fido : 2015-08-06 Rogers Communications Canada Inc.
+// fido : Rogers Communications Canada Inc.
+// https://www.iana.org/domains/root/db/fido.html
 fido
 
-// film : 2015-01-08 Motion Picture Domain Registry Pty Ltd
+// film : Motion Picture Domain Registry Pty Ltd
+// https://www.iana.org/domains/root/db/film.html
 film
 
-// final : 2014-10-16 Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// final : Nรบcleo de Informaรงรฃo e Coordenaรงรฃo do Ponto BR - NIC.br
+// https://www.iana.org/domains/root/db/final.html
 final
 
-// finance : 2014-03-20 Binky Moon, LLC
+// finance : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/finance.html
 finance
 
-// financial : 2014-03-06 Binky Moon, LLC
+// financial : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/financial.html
 financial
 
-// fire : 2015-06-25 Amazon Registry Services, Inc.
+// fire : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/fire.html
 fire
 
-// firestone : 2014-12-18 Bridgestone Licensing Services, Inc
+// firestone : Bridgestone Licensing Services, Inc
+// https://www.iana.org/domains/root/db/firestone.html
 firestone
 
-// firmdale : 2014-03-27 Firmdale Holdings Limited
+// firmdale : Firmdale Holdings Limited
+// https://www.iana.org/domains/root/db/firmdale.html
 firmdale
 
-// fish : 2013-12-12 Binky Moon, LLC
+// fish : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fish.html
 fish
 
-// fishing : 2013-11-21 Registry Services, LLC
+// fishing : Registry Services, LLC
+// https://www.iana.org/domains/root/db/fishing.html
 fishing
 
-// fit : 2014-11-07 Registry Services, LLC
+// fit : Registry Services, LLC
+// https://www.iana.org/domains/root/db/fit.html
 fit
 
-// fitness : 2014-03-06 Binky Moon, LLC
+// fitness : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fitness.html
 fitness
 
-// flickr : 2015-04-02 Flickr, Inc.
+// flickr : Flickr, Inc.
+// https://www.iana.org/domains/root/db/flickr.html
 flickr
 
-// flights : 2013-12-05 Binky Moon, LLC
+// flights : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/flights.html
 flights
 
-// flir : 2015-07-23 FLIR Systems, Inc.
+// flir : FLIR Systems, Inc.
+// https://www.iana.org/domains/root/db/flir.html
 flir
 
-// florist : 2013-11-07 Binky Moon, LLC
+// florist : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/florist.html
 florist
 
-// flowers : 2014-10-09 XYZ.COM LLC
+// flowers : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/flowers.html
 flowers
 
-// fly : 2014-05-08 Charleston Road Registry Inc.
+// fly : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/fly.html
 fly
 
-// foo : 2014-01-23 Charleston Road Registry Inc.
+// foo : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/foo.html
 foo
 
-// food : 2016-04-21 Lifestyle Domain Holdings, Inc.
+// food : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/food.html
 food
 
-// foodnetwork : 2015-07-02 Lifestyle Domain Holdings, Inc.
-foodnetwork
-
-// football : 2014-12-18 Binky Moon, LLC
+// football : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/football.html
 football
 
-// ford : 2014-11-13 Ford Motor Company
+// ford : Ford Motor Company
+// https://www.iana.org/domains/root/db/ford.html
 ford
 
-// forex : 2014-12-11 Dog Beach, LLC
+// forex : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/forex.html
 forex
 
-// forsale : 2014-05-22 Dog Beach, LLC
+// forsale : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/forsale.html
 forsale
 
-// forum : 2015-04-02 Fegistry, LLC
+// forum : Waterford Limited
+// https://www.iana.org/domains/root/db/forum.html
 forum
 
-// foundation : 2013-12-05 Public Interest Registry
+// foundation : Public Interest Registry
+// https://www.iana.org/domains/root/db/foundation.html
 foundation
 
-// fox : 2015-09-11 FOX Registry, LLC
+// fox : FOX Registry, LLC
+// https://www.iana.org/domains/root/db/fox.html
 fox
 
-// free : 2015-12-10 Amazon Registry Services, Inc.
+// free : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/free.html
 free
 
-// fresenius : 2015-07-30 Fresenius Immobilien-Verwaltungs-GmbH
+// fresenius : Fresenius Immobilien-Verwaltungs-GmbH
+// https://www.iana.org/domains/root/db/fresenius.html
 fresenius
 
-// frl : 2014-05-15 FRLregistry B.V.
+// frl : FRLregistry B.V.
+// https://www.iana.org/domains/root/db/frl.html
 frl
 
-// frogans : 2013-12-19 OP3FT
+// frogans : OP3FT
+// https://www.iana.org/domains/root/db/frogans.html
 frogans
 
-// frontdoor : 2015-07-02 Lifestyle Domain Holdings, Inc.
-frontdoor
-
-// frontier : 2015-02-05 Frontier Communications Corporation
+// frontier : Frontier Communications Corporation
+// https://www.iana.org/domains/root/db/frontier.html
 frontier
 
-// ftr : 2015-07-16 Frontier Communications Corporation
+// ftr : Frontier Communications Corporation
+// https://www.iana.org/domains/root/db/ftr.html
 ftr
 
-// fujitsu : 2015-07-30 Fujitsu Limited
+// fujitsu : Fujitsu Limited
+// https://www.iana.org/domains/root/db/fujitsu.html
 fujitsu
 
-// fun : 2016-01-14 Radix FZC
+// fun : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/fun.html
 fun
 
-// fund : 2014-03-20 Binky Moon, LLC
+// fund : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fund.html
 fund
 
-// furniture : 2014-03-20 Binky Moon, LLC
+// furniture : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/furniture.html
 furniture
 
-// futbol : 2013-09-20 Dog Beach, LLC
+// futbol : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/futbol.html
 futbol
 
-// fyi : 2015-04-02 Binky Moon, LLC
+// fyi : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/fyi.html
 fyi
 
-// gal : 2013-11-07 Asociaciรณn puntoGAL
+// gal : Asociaciรณn puntoGAL
+// https://www.iana.org/domains/root/db/gal.html
 gal
 
-// gallery : 2013-09-13 Binky Moon, LLC
+// gallery : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gallery.html
 gallery
 
-// gallo : 2015-06-11 Gallo Vineyards, Inc.
+// gallo : Gallo Vineyards, Inc.
+// https://www.iana.org/domains/root/db/gallo.html
 gallo
 
-// gallup : 2015-02-19 Gallup, Inc.
+// gallup : Gallup, Inc.
+// https://www.iana.org/domains/root/db/gallup.html
 gallup
 
-// game : 2015-05-28 XYZ.COM LLC
+// game : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/game.html
 game
 
-// games : 2015-05-28 Dog Beach, LLC
+// games : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/games.html
 games
 
-// gap : 2015-07-31 The Gap, Inc.
+// gap : The Gap, Inc.
+// https://www.iana.org/domains/root/db/gap.html
 gap
 
-// garden : 2014-06-26 Registry Services, LLC
+// garden : Registry Services, LLC
+// https://www.iana.org/domains/root/db/garden.html
 garden
 
-// gay : 2019-05-23 Top Level Design, LLC
+// gay : Registry Services, LLC
+// https://www.iana.org/domains/root/db/gay.html
 gay
 
-// gbiz : 2014-07-17 Charleston Road Registry Inc.
+// gbiz : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/gbiz.html
 gbiz
 
-// gdn : 2014-07-31 Joint Stock Company "Navigation-information systems"
+// gdn : Joint Stock Company "Navigation-information systems"
+// https://www.iana.org/domains/root/db/gdn.html
 gdn
 
-// gea : 2014-12-04 GEA Group Aktiengesellschaft
+// gea : GEA Group Aktiengesellschaft
+// https://www.iana.org/domains/root/db/gea.html
 gea
 
-// gent : 2014-01-23 Easyhost BV
+// gent : Easyhost BV
+// https://www.iana.org/domains/root/db/gent.html
 gent
 
-// genting : 2015-03-12 Resorts World Inc Pte. Ltd.
+// genting : Resorts World Inc Pte. Ltd.
+// https://www.iana.org/domains/root/db/genting.html
 genting
 
-// george : 2015-07-31 Wal-Mart Stores, Inc.
+// george : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/george.html
 george
 
-// ggee : 2014-01-09 GMO Internet, Inc.
+// ggee : GMO Internet, Inc.
+// https://www.iana.org/domains/root/db/ggee.html
 ggee
 
-// gift : 2013-10-17 DotGift, LLC
+// gift : DotGift, LLC
+// https://www.iana.org/domains/root/db/gift.html
 gift
 
-// gifts : 2014-07-03 Binky Moon, LLC
+// gifts : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gifts.html
 gifts
 
-// gives : 2014-03-06 Public Interest Registry
+// gives : Public Interest Registry
+// https://www.iana.org/domains/root/db/gives.html
 gives
 
-// giving : 2014-11-13 Public Interest Registry
+// giving : Public Interest Registry
+// https://www.iana.org/domains/root/db/giving.html
 giving
 
-// glass : 2013-11-07 Binky Moon, LLC
+// glass : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/glass.html
 glass
 
-// gle : 2014-07-24 Charleston Road Registry Inc.
+// gle : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/gle.html
 gle
 
-// global : 2014-04-17 Identity Digital Limited
+// global : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/global.html
 global
 
-// globo : 2013-12-19 Globo Comunicaรงรฃo e Participaรงรตes S.A
+// globo : Globo Comunicaรงรฃo e Participaรงรตes S.A
+// https://www.iana.org/domains/root/db/globo.html
 globo
 
-// gmail : 2014-05-01 Charleston Road Registry Inc.
+// gmail : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/gmail.html
 gmail
 
-// gmbh : 2016-01-29 Binky Moon, LLC
+// gmbh : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gmbh.html
 gmbh
 
-// gmo : 2014-01-09 GMO Internet, Inc.
+// gmo : GMO Internet, Inc.
+// https://www.iana.org/domains/root/db/gmo.html
 gmo
 
-// gmx : 2014-04-24 1&1 Mail & Media GmbH
+// gmx : 1&1 Mail & Media GmbH
+// https://www.iana.org/domains/root/db/gmx.html
 gmx
 
-// godaddy : 2015-07-23 Go Daddy East, LLC
+// godaddy : Go Daddy East, LLC
+// https://www.iana.org/domains/root/db/godaddy.html
 godaddy
 
-// gold : 2015-01-22 Binky Moon, LLC
+// gold : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gold.html
 gold
 
-// goldpoint : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
+// goldpoint : YODOBASHI CAMERA CO.,LTD.
+// https://www.iana.org/domains/root/db/goldpoint.html
 goldpoint
 
-// golf : 2014-12-18 Binky Moon, LLC
+// golf : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/golf.html
 golf
 
-// goo : 2014-12-18 NTT Resonant Inc.
-goo
-
-// goodyear : 2015-07-02 The Goodyear Tire & Rubber Company
+// goodyear : The Goodyear Tire & Rubber Company
+// https://www.iana.org/domains/root/db/goodyear.html
 goodyear
 
-// goog : 2014-11-20 Charleston Road Registry Inc.
+// goog : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/goog.html
 goog
 
-// google : 2014-07-24 Charleston Road Registry Inc.
+// google : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/google.html
 google
 
-// gop : 2014-01-16 Republican State Leadership Committee, Inc.
+// gop : Republican State Leadership Committee, Inc.
+// https://www.iana.org/domains/root/db/gop.html
 gop
 
-// got : 2014-12-18 Amazon Registry Services, Inc.
+// got : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/got.html
 got
 
-// grainger : 2015-05-07 Grainger Registry Services, LLC
+// grainger : Grainger Registry Services, LLC
+// https://www.iana.org/domains/root/db/grainger.html
 grainger
 
-// graphics : 2013-09-13 Binky Moon, LLC
+// graphics : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/graphics.html
 graphics
 
-// gratis : 2014-03-20 Binky Moon, LLC
+// gratis : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gratis.html
 gratis
 
-// green : 2014-05-08 Identity Digital Limited
+// green : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/green.html
 green
 
-// gripe : 2014-03-06 Binky Moon, LLC
+// gripe : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/gripe.html
 gripe
 
-// grocery : 2016-06-16 Wal-Mart Stores, Inc.
+// grocery : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/grocery.html
 grocery
 
-// group : 2014-08-15 Binky Moon, LLC
+// group : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/group.html
 group
 
-// guardian : 2015-07-30 The Guardian Life Insurance Company of America
-guardian
-
-// gucci : 2014-11-13 Guccio Gucci S.p.a.
+// gucci : Guccio Gucci S.p.a.
+// https://www.iana.org/domains/root/db/gucci.html
 gucci
 
-// guge : 2014-08-28 Charleston Road Registry Inc.
+// guge : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/guge.html
 guge
 
-// guide : 2013-09-13 Binky Moon, LLC
+// guide : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/guide.html
 guide
 
-// guitars : 2013-11-14 XYZ.COM LLC
+// guitars : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/guitars.html
 guitars
 
-// guru : 2013-08-27 Binky Moon, LLC
+// guru : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/guru.html
 guru
 
-// hair : 2015-12-03 XYZ.COM LLC
+// hair : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/hair.html
 hair
 
-// hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
+// hamburg : Hamburg Top-Level-Domain GmbH
+// https://www.iana.org/domains/root/db/hamburg.html
 hamburg
 
-// hangout : 2014-11-13 Charleston Road Registry Inc.
+// hangout : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/hangout.html
 hangout
 
-// haus : 2013-12-05 Dog Beach, LLC
+// haus : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/haus.html
 haus
 
-// hbo : 2015-07-30 HBO Registry Services, Inc.
+// hbo : HBO Registry Services, Inc.
+// https://www.iana.org/domains/root/db/hbo.html
 hbo
 
-// hdfc : 2015-07-30 HOUSING DEVELOPMENT FINANCE CORPORATION LIMITED
+// hdfc : HDFC BANK LIMITED
+// https://www.iana.org/domains/root/db/hdfc.html
 hdfc
 
-// hdfcbank : 2015-02-12 HDFC Bank Limited
+// hdfcbank : HDFC BANK LIMITED
+// https://www.iana.org/domains/root/db/hdfcbank.html
 hdfcbank
 
-// health : 2015-02-11 DotHealth, LLC
+// health : Registry Services, LLC
+// https://www.iana.org/domains/root/db/health.html
 health
 
-// healthcare : 2014-06-12 Binky Moon, LLC
+// healthcare : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/healthcare.html
 healthcare
 
-// help : 2014-06-26 Innovation service Limited
+// help : Innovation service Limited
+// https://www.iana.org/domains/root/db/help.html
 help
 
-// helsinki : 2015-02-05 City of Helsinki
+// helsinki : City of Helsinki
+// https://www.iana.org/domains/root/db/helsinki.html
 helsinki
 
-// here : 2014-02-06 Charleston Road Registry Inc.
+// here : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/here.html
 here
 
-// hermes : 2014-07-10 HERMES INTERNATIONAL
+// hermes : HERMES INTERNATIONAL
+// https://www.iana.org/domains/root/db/hermes.html
 hermes
 
-// hgtv : 2015-07-02 Lifestyle Domain Holdings, Inc.
-hgtv
-
-// hiphop : 2014-03-06 Dot Hip Hop, LLC
+// hiphop : Dot Hip Hop, LLC
+// https://www.iana.org/domains/root/db/hiphop.html
 hiphop
 
-// hisamitsu : 2015-07-16 Hisamitsu Pharmaceutical Co.,Inc.
+// hisamitsu : Hisamitsu Pharmaceutical Co.,Inc.
+// https://www.iana.org/domains/root/db/hisamitsu.html
 hisamitsu
 
-// hitachi : 2014-10-31 Hitachi, Ltd.
+// hitachi : Hitachi, Ltd.
+// https://www.iana.org/domains/root/db/hitachi.html
 hitachi
 
-// hiv : 2014-03-13 Internet Naming Company LLC
+// hiv : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/hiv.html
 hiv
 
-// hkt : 2015-05-14 PCCW-HKT DataCom Services Limited
+// hkt : PCCW-HKT DataCom Services Limited
+// https://www.iana.org/domains/root/db/hkt.html
 hkt
 
-// hockey : 2015-03-19 Binky Moon, LLC
+// hockey : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/hockey.html
 hockey
 
-// holdings : 2013-08-27 Binky Moon, LLC
+// holdings : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/holdings.html
 holdings
 
-// holiday : 2013-11-07 Binky Moon, LLC
+// holiday : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/holiday.html
 holiday
 
-// homedepot : 2015-04-02 Home Depot Product Authority, LLC
+// homedepot : Home Depot Product Authority, LLC
+// https://www.iana.org/domains/root/db/homedepot.html
 homedepot
 
-// homegoods : 2015-07-16 The TJX Companies, Inc.
+// homegoods : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/homegoods.html
 homegoods
 
-// homes : 2014-01-09 XYZ.COM LLC
+// homes : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/homes.html
 homes
 
-// homesense : 2015-07-16 The TJX Companies, Inc.
+// homesense : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/homesense.html
 homesense
 
-// honda : 2014-12-18 Honda Motor Co., Ltd.
+// honda : Honda Motor Co., Ltd.
+// https://www.iana.org/domains/root/db/honda.html
 honda
 
-// horse : 2013-11-21 Registry Services, LLC
+// horse : Registry Services, LLC
+// https://www.iana.org/domains/root/db/horse.html
 horse
 
-// hospital : 2016-10-20 Binky Moon, LLC
+// hospital : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/hospital.html
 hospital
 
-// host : 2014-04-17 Radix FZC
+// host : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/host.html
 host
 
-// hosting : 2014-05-29 XYZ.COM LLC
+// hosting : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/hosting.html
 hosting
 
-// hot : 2015-08-27 Amazon Registry Services, Inc.
+// hot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/hot.html
 hot
 
-// hoteles : 2015-03-05 Travel Reservations SRL
-hoteles
+// hotel : HOTEL Top-Level-Domain S.a.r.l
+// https://www.iana.org/domains/root/db/hotel.html
+hotel
 
-// hotels : 2016-04-07 Booking.com B.V.
+// hotels : Booking.com B.V.
+// https://www.iana.org/domains/root/db/hotels.html
 hotels
 
-// hotmail : 2014-12-18 Microsoft Corporation
+// hotmail : Microsoft Corporation
+// https://www.iana.org/domains/root/db/hotmail.html
 hotmail
 
-// house : 2013-11-07 Binky Moon, LLC
+// house : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/house.html
 house
 
-// how : 2014-01-23 Charleston Road Registry Inc.
+// how : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/how.html
 how
 
-// hsbc : 2014-10-24 HSBC Global Services (UK) Limited
+// hsbc : HSBC Global Services (UK) Limited
+// https://www.iana.org/domains/root/db/hsbc.html
 hsbc
 
-// hughes : 2015-07-30 Hughes Satellite Systems Corporation
+// hughes : Hughes Satellite Systems Corporation
+// https://www.iana.org/domains/root/db/hughes.html
 hughes
 
-// hyatt : 2015-07-30 Hyatt GTLD, L.L.C.
+// hyatt : Hyatt GTLD, L.L.C.
+// https://www.iana.org/domains/root/db/hyatt.html
 hyatt
 
-// hyundai : 2015-07-09 Hyundai Motor Company
+// hyundai : Hyundai Motor Company
+// https://www.iana.org/domains/root/db/hyundai.html
 hyundai
 
-// ibm : 2014-07-31 International Business Machines Corporation
+// ibm : International Business Machines Corporation
+// https://www.iana.org/domains/root/db/ibm.html
 ibm
 
-// icbc : 2015-02-19 Industrial and Commercial Bank of China Limited
+// icbc : Industrial and Commercial Bank of China Limited
+// https://www.iana.org/domains/root/db/icbc.html
 icbc
 
-// ice : 2014-10-30 IntercontinentalExchange, Inc.
+// ice : IntercontinentalExchange, Inc.
+// https://www.iana.org/domains/root/db/ice.html
 ice
 
-// icu : 2015-01-08 ShortDot SA
+// icu : ShortDot SA
+// https://www.iana.org/domains/root/db/icu.html
 icu
 
-// ieee : 2015-07-23 IEEE Global LLC
+// ieee : IEEE Global LLC
+// https://www.iana.org/domains/root/db/ieee.html
 ieee
 
-// ifm : 2014-01-30 ifm electronic gmbh
+// ifm : ifm electronic gmbh
+// https://www.iana.org/domains/root/db/ifm.html
 ifm
 
-// ikano : 2015-07-09 Ikano S.A.
+// ikano : Ikano S.A.
+// https://www.iana.org/domains/root/db/ikano.html
 ikano
 
-// imamat : 2015-08-06 Fondation Aga Khan (Aga Khan Foundation)
+// imamat : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/imamat.html
 imamat
 
-// imdb : 2015-06-25 Amazon Registry Services, Inc.
+// imdb : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/imdb.html
 imdb
 
-// immo : 2014-07-10 Binky Moon, LLC
+// immo : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/immo.html
 immo
 
-// immobilien : 2013-11-07 Dog Beach, LLC
+// immobilien : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/immobilien.html
 immobilien
 
-// inc : 2018-03-10 Intercap Registry Inc.
+// inc : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/inc.html
 inc
 
-// industries : 2013-12-05 Binky Moon, LLC
+// industries : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/industries.html
 industries
 
-// infiniti : 2014-03-27 NISSAN MOTOR CO., LTD.
+// infiniti : NISSAN MOTOR CO., LTD.
+// https://www.iana.org/domains/root/db/infiniti.html
 infiniti
 
-// ing : 2014-01-23 Charleston Road Registry Inc.
+// ing : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/ing.html
 ing
 
-// ink : 2013-12-05 Top Level Design, LLC
+// ink : Registry Services, LLC
+// https://www.iana.org/domains/root/db/ink.html
 ink
 
-// institute : 2013-11-07 Binky Moon, LLC
+// institute : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/institute.html
 institute
 
-// insurance : 2015-02-19 fTLD Registry Services LLC
+// insurance : fTLD Registry Services LLC
+// https://www.iana.org/domains/root/db/insurance.html
 insurance
 
-// insure : 2014-03-20 Binky Moon, LLC
+// insure : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/insure.html
 insure
 
-// international : 2013-11-07 Binky Moon, LLC
+// international : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/international.html
 international
 
-// intuit : 2015-07-30 Intuit Administrative Services, Inc.
+// intuit : Intuit Administrative Services, Inc.
+// https://www.iana.org/domains/root/db/intuit.html
 intuit
 
-// investments : 2014-03-20 Binky Moon, LLC
+// investments : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/investments.html
 investments
 
-// ipiranga : 2014-08-28 Ipiranga Produtos de Petroleo S.A.
+// ipiranga : Ipiranga Produtos de Petroleo S.A.
+// https://www.iana.org/domains/root/db/ipiranga.html
 ipiranga
 
-// irish : 2014-08-07 Binky Moon, LLC
+// irish : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/irish.html
 irish
 
-// ismaili : 2015-08-06 Fondation Aga Khan (Aga Khan Foundation)
+// ismaili : Fondation Aga Khan (Aga Khan Foundation)
+// https://www.iana.org/domains/root/db/ismaili.html
 ismaili
 
-// ist : 2014-08-28 Istanbul Metropolitan Municipality
+// ist : Istanbul Metropolitan Municipality
+// https://www.iana.org/domains/root/db/ist.html
 ist
 
-// istanbul : 2014-08-28 Istanbul Metropolitan Municipality
+// istanbul : Istanbul Metropolitan Municipality
+// https://www.iana.org/domains/root/db/istanbul.html
 istanbul
 
-// itau : 2014-10-02 Itau Unibanco Holding S.A.
+// itau : Itau Unibanco Holding S.A.
+// https://www.iana.org/domains/root/db/itau.html
 itau
 
-// itv : 2015-07-09 ITV Services Limited
+// itv : ITV Services Limited
+// https://www.iana.org/domains/root/db/itv.html
 itv
 
-// jaguar : 2014-11-13 Jaguar Land Rover Ltd
+// jaguar : Jaguar Land Rover Ltd
+// https://www.iana.org/domains/root/db/jaguar.html
 jaguar
 
-// java : 2014-06-19 Oracle Corporation
+// java : Oracle Corporation
+// https://www.iana.org/domains/root/db/java.html
 java
 
-// jcb : 2014-11-20 JCB Co., Ltd.
+// jcb : JCB Co., Ltd.
+// https://www.iana.org/domains/root/db/jcb.html
 jcb
 
-// jeep : 2015-07-30 FCA US LLC.
+// jeep : FCA US LLC.
+// https://www.iana.org/domains/root/db/jeep.html
 jeep
 
-// jetzt : 2014-01-09 Binky Moon, LLC
+// jetzt : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/jetzt.html
 jetzt
 
-// jewelry : 2015-03-05 Binky Moon, LLC
+// jewelry : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/jewelry.html
 jewelry
 
-// jio : 2015-04-02 Reliance Industries Limited
+// jio : Reliance Industries Limited
+// https://www.iana.org/domains/root/db/jio.html
 jio
 
-// jll : 2015-04-02 Jones Lang LaSalle Incorporated
+// jll : Jones Lang LaSalle Incorporated
+// https://www.iana.org/domains/root/db/jll.html
 jll
 
-// jmp : 2015-03-26 Matrix IP LLC
+// jmp : Matrix IP LLC
+// https://www.iana.org/domains/root/db/jmp.html
 jmp
 
-// jnj : 2015-06-18 Johnson & Johnson Services, Inc.
+// jnj : Johnson & Johnson Services, Inc.
+// https://www.iana.org/domains/root/db/jnj.html
 jnj
 
-// joburg : 2014-03-24 ZA Central Registry NPC trading as ZA Central Registry
+// joburg : ZA Central Registry NPC trading as ZA Central Registry
+// https://www.iana.org/domains/root/db/joburg.html
 joburg
 
-// jot : 2014-12-18 Amazon Registry Services, Inc.
+// jot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/jot.html
 jot
 
-// joy : 2014-12-18 Amazon Registry Services, Inc.
+// joy : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/joy.html
 joy
 
-// jpmorgan : 2015-04-30 JPMorgan Chase Bank, National Association
+// jpmorgan : JPMorgan Chase Bank, National Association
+// https://www.iana.org/domains/root/db/jpmorgan.html
 jpmorgan
 
-// jprs : 2014-09-18 Japan Registry Services Co., Ltd.
+// jprs : Japan Registry Services Co., Ltd.
+// https://www.iana.org/domains/root/db/jprs.html
 jprs
 
-// juegos : 2014-03-20 Internet Naming Company LLC
+// juegos : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/juegos.html
 juegos
 
-// juniper : 2015-07-30 JUNIPER NETWORKS, INC.
+// juniper : JUNIPER NETWORKS, INC.
+// https://www.iana.org/domains/root/db/juniper.html
 juniper
 
-// kaufen : 2013-11-07 Dog Beach, LLC
+// kaufen : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/kaufen.html
 kaufen
 
-// kddi : 2014-09-12 KDDI CORPORATION
+// kddi : KDDI CORPORATION
+// https://www.iana.org/domains/root/db/kddi.html
 kddi
 
-// kerryhotels : 2015-04-30 Kerry Trading Co. Limited
+// kerryhotels : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/kerryhotels.html
 kerryhotels
 
-// kerrylogistics : 2015-04-09 Kerry Trading Co. Limited
-kerrylogistics
-
-// kerryproperties : 2015-04-09 Kerry Trading Co. Limited
+// kerryproperties : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/kerryproperties.html
 kerryproperties
 
-// kfh : 2014-12-04 Kuwait Finance House
+// kfh : Kuwait Finance House
+// https://www.iana.org/domains/root/db/kfh.html
 kfh
 
-// kia : 2015-07-09 KIA MOTORS CORPORATION
+// kia : KIA MOTORS CORPORATION
+// https://www.iana.org/domains/root/db/kia.html
 kia
 
-// kids : 2021-08-13 DotKids Foundation Limited
+// kids : DotKids Foundation Limited
+// https://www.iana.org/domains/root/db/kids.html
 kids
 
-// kim : 2013-09-23 Identity Digital Limited
+// kim : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/kim.html
 kim
 
-// kinder : 2014-11-07 Ferrero Trading Lux S.A.
-kinder
-
-// kindle : 2015-06-25 Amazon Registry Services, Inc.
+// kindle : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/kindle.html
 kindle
 
-// kitchen : 2013-09-20 Binky Moon, LLC
+// kitchen : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/kitchen.html
 kitchen
 
-// kiwi : 2013-09-20 DOT KIWI LIMITED
+// kiwi : DOT KIWI LIMITED
+// https://www.iana.org/domains/root/db/kiwi.html
 kiwi
 
-// koeln : 2014-01-09 dotKoeln GmbH
+// koeln : dotKoeln GmbH
+// https://www.iana.org/domains/root/db/koeln.html
 koeln
 
-// komatsu : 2015-01-08 Komatsu Ltd.
+// komatsu : Komatsu Ltd.
+// https://www.iana.org/domains/root/db/komatsu.html
 komatsu
 
-// kosher : 2015-08-20 Kosher Marketing Assets LLC
+// kosher : Kosher Marketing Assets LLC
+// https://www.iana.org/domains/root/db/kosher.html
 kosher
 
-// kpmg : 2015-04-23 KPMG International Cooperative (KPMG International Genossenschaft)
+// kpmg : KPMG International Cooperative (KPMG International Genossenschaft)
+// https://www.iana.org/domains/root/db/kpmg.html
 kpmg
 
-// kpn : 2015-01-08 Koninklijke KPN N.V.
+// kpn : Koninklijke KPN N.V.
+// https://www.iana.org/domains/root/db/kpn.html
 kpn
 
-// krd : 2013-12-05 KRG Department of Information Technology
+// krd : KRG Department of Information Technology
+// https://www.iana.org/domains/root/db/krd.html
 krd
 
-// kred : 2013-12-19 KredTLD Pty Ltd
+// kred : KredTLD Pty Ltd
+// https://www.iana.org/domains/root/db/kred.html
 kred
 
-// kuokgroup : 2015-04-09 Kerry Trading Co. Limited
+// kuokgroup : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/kuokgroup.html
 kuokgroup
 
-// kyoto : 2014-11-07 Academic Institution: Kyoto Jyoho Gakuen
+// kyoto : Academic Institution: Kyoto Jyoho Gakuen
+// https://www.iana.org/domains/root/db/kyoto.html
 kyoto
 
-// lacaixa : 2014-01-09 Fundaciรณn Bancaria Caixa dโ€™Estalvis i Pensions de Barcelona, โ€œla Caixaโ€
+// lacaixa : Fundaciรณn Bancaria Caixa dโ€™Estalvis i Pensions de Barcelona, โ€œla Caixaโ€
+// https://www.iana.org/domains/root/db/lacaixa.html
 lacaixa
 
-// lamborghini : 2015-06-04 Automobili Lamborghini S.p.A.
+// lamborghini : Automobili Lamborghini S.p.A.
+// https://www.iana.org/domains/root/db/lamborghini.html
 lamborghini
 
-// lamer : 2015-10-01 The Estรฉe Lauder Companies Inc.
+// lamer : The Estรฉe Lauder Companies Inc.
+// https://www.iana.org/domains/root/db/lamer.html
 lamer
 
-// lancaster : 2015-02-12 LANCASTER
-lancaster
-
-// lancia : 2015-07-31 Fiat Chrysler Automobiles N.V.
-lancia
-
-// land : 2013-09-10 Binky Moon, LLC
+// land : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/land.html
 land
 
-// landrover : 2014-11-13 Jaguar Land Rover Ltd
+// landrover : Jaguar Land Rover Ltd
+// https://www.iana.org/domains/root/db/landrover.html
 landrover
 
-// lanxess : 2015-07-30 LANXESS Corporation
+// lanxess : LANXESS Corporation
+// https://www.iana.org/domains/root/db/lanxess.html
 lanxess
 
-// lasalle : 2015-04-02 Jones Lang LaSalle Incorporated
+// lasalle : Jones Lang LaSalle Incorporated
+// https://www.iana.org/domains/root/db/lasalle.html
 lasalle
 
-// lat : 2014-10-16 XYZ.COM LLC
+// lat : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/lat.html
 lat
 
-// latino : 2015-07-30 Dish DBS Corporation
+// latino : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/latino.html
 latino
 
-// latrobe : 2014-06-16 La Trobe University
+// latrobe : La Trobe University
+// https://www.iana.org/domains/root/db/latrobe.html
 latrobe
 
-// law : 2015-01-22 Registry Services, LLC
+// law : Registry Services, LLC
+// https://www.iana.org/domains/root/db/law.html
 law
 
-// lawyer : 2014-03-20 Dog Beach, LLC
+// lawyer : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/lawyer.html
 lawyer
 
-// lds : 2014-03-20 IRI Domain Management, LLC
+// lds : IRI Domain Management, LLC
+// https://www.iana.org/domains/root/db/lds.html
 lds
 
-// lease : 2014-03-06 Binky Moon, LLC
+// lease : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/lease.html
 lease
 
-// leclerc : 2014-08-07 A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc
+// leclerc : A.C.D. LEC Association des Centres Distributeurs Edouard Leclerc
+// https://www.iana.org/domains/root/db/leclerc.html
 leclerc
 
-// lefrak : 2015-07-16 LeFrak Organization, Inc.
+// lefrak : LeFrak Organization, Inc.
+// https://www.iana.org/domains/root/db/lefrak.html
 lefrak
 
-// legal : 2014-10-16 Binky Moon, LLC
+// legal : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/legal.html
 legal
 
-// lego : 2015-07-16 LEGO Juris A/S
+// lego : LEGO Juris A/S
+// https://www.iana.org/domains/root/db/lego.html
 lego
 
-// lexus : 2015-04-23 TOYOTA MOTOR CORPORATION
+// lexus : TOYOTA MOTOR CORPORATION
+// https://www.iana.org/domains/root/db/lexus.html
 lexus
 
-// lgbt : 2014-05-08 Identity Digital Limited
+// lgbt : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/lgbt.html
 lgbt
 
-// lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
+// lidl : Schwarz Domains und Services GmbH & Co. KG
+// https://www.iana.org/domains/root/db/lidl.html
 lidl
 
-// life : 2014-02-06 Binky Moon, LLC
+// life : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/life.html
 life
 
-// lifeinsurance : 2015-01-15 American Council of Life Insurers
+// lifeinsurance : American Council of Life Insurers
+// https://www.iana.org/domains/root/db/lifeinsurance.html
 lifeinsurance
 
-// lifestyle : 2014-12-11 Lifestyle Domain Holdings, Inc.
+// lifestyle : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/lifestyle.html
 lifestyle
 
-// lighting : 2013-08-27 Binky Moon, LLC
+// lighting : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/lighting.html
 lighting
 
-// like : 2014-12-18 Amazon Registry Services, Inc.
+// like : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/like.html
 like
 
-// lilly : 2015-07-31 Eli Lilly and Company
+// lilly : Eli Lilly and Company
+// https://www.iana.org/domains/root/db/lilly.html
 lilly
 
-// limited : 2014-03-06 Binky Moon, LLC
+// limited : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/limited.html
 limited
 
-// limo : 2013-10-17 Binky Moon, LLC
+// limo : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/limo.html
 limo
 
-// lincoln : 2014-11-13 Ford Motor Company
+// lincoln : Ford Motor Company
+// https://www.iana.org/domains/root/db/lincoln.html
 lincoln
 
-// linde : 2014-12-04 Linde Aktiengesellschaft
-linde
-
-// link : 2013-11-14 Nova Registry Ltd
+// link : Nova Registry Ltd
+// https://www.iana.org/domains/root/db/link.html
 link
 
-// lipsy : 2015-06-25 Lipsy Ltd
-lipsy
-
-// live : 2014-12-04 Dog Beach, LLC
+// live : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/live.html
 live
 
-// living : 2015-07-30 Lifestyle Domain Holdings, Inc.
+// living : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/living.html
 living
 
-// llc : 2017-12-14 Identity Digital Limited
+// llc : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/llc.html
 llc
 
-// llp : 2019-08-26 Intercap Registry Inc.
+// llp : Intercap Registry Inc.
+// https://www.iana.org/domains/root/db/llp.html
 llp
 
-// loan : 2014-11-20 dot Loan Limited
+// loan : dot Loan Limited
+// https://www.iana.org/domains/root/db/loan.html
 loan
 
-// loans : 2014-03-20 Binky Moon, LLC
+// loans : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/loans.html
 loans
 
-// locker : 2015-06-04 Dish DBS Corporation
+// locker : Orange Domains LLC
+// https://www.iana.org/domains/root/db/locker.html
 locker
 
-// locus : 2015-06-25 Locus Analytics LLC
+// locus : Locus Analytics LLC
+// https://www.iana.org/domains/root/db/locus.html
 locus
 
-// lol : 2015-01-30 XYZ.COM LLC
+// lol : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/lol.html
 lol
 
-// london : 2013-11-14 Dot London Domains Limited
+// london : Dot London Domains Limited
+// https://www.iana.org/domains/root/db/london.html
 london
 
-// lotte : 2014-11-07 Lotte Holdings Co., Ltd.
+// lotte : Lotte Holdings Co., Ltd.
+// https://www.iana.org/domains/root/db/lotte.html
 lotte
 
-// lotto : 2014-04-10 Identity Digital Limited
+// lotto : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/lotto.html
 lotto
 
-// love : 2014-12-22 Merchant Law Group LLP
+// love : Waterford Limited
+// https://www.iana.org/domains/root/db/love.html
 love
 
-// lpl : 2015-07-30 LPL Holdings, Inc.
+// lpl : LPL Holdings, Inc.
+// https://www.iana.org/domains/root/db/lpl.html
 lpl
 
-// lplfinancial : 2015-07-30 LPL Holdings, Inc.
+// lplfinancial : LPL Holdings, Inc.
+// https://www.iana.org/domains/root/db/lplfinancial.html
 lplfinancial
 
-// ltd : 2014-09-25 Binky Moon, LLC
+// ltd : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/ltd.html
 ltd
 
-// ltda : 2014-04-17 InterNetX, Corp
+// ltda : InterNetX, Corp
+// https://www.iana.org/domains/root/db/ltda.html
 ltda
 
-// lundbeck : 2015-08-06 H. Lundbeck A/S
+// lundbeck : H. Lundbeck A/S
+// https://www.iana.org/domains/root/db/lundbeck.html
 lundbeck
 
-// luxe : 2014-01-09 Registry Services, LLC
+// luxe : Registry Services, LLC
+// https://www.iana.org/domains/root/db/luxe.html
 luxe
 
-// luxury : 2013-10-17 Luxury Partners, LLC
+// luxury : Luxury Partners, LLC
+// https://www.iana.org/domains/root/db/luxury.html
 luxury
 
-// macys : 2015-07-31 Macys, Inc.
-macys
-
-// madrid : 2014-05-01 Comunidad de Madrid
+// madrid : Comunidad de Madrid
+// https://www.iana.org/domains/root/db/madrid.html
 madrid
 
-// maif : 2014-10-02 Mutuelle Assurance Instituteur France (MAIF)
+// maif : Mutuelle Assurance Instituteur France (MAIF)
+// https://www.iana.org/domains/root/db/maif.html
 maif
 
-// maison : 2013-12-05 Binky Moon, LLC
+// maison : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/maison.html
 maison
 
-// makeup : 2015-01-15 XYZ.COM LLC
+// makeup : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/makeup.html
 makeup
 
-// man : 2014-12-04 MAN SE
+// man : MAN Truck & Bus SE
+// https://www.iana.org/domains/root/db/man.html
 man
 
-// management : 2013-11-07 Binky Moon, LLC
+// management : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/management.html
 management
 
-// mango : 2013-10-24 PUNTO FA S.L.
+// mango : PUNTO FA S.L.
+// https://www.iana.org/domains/root/db/mango.html
 mango
 
-// map : 2016-06-09 Charleston Road Registry Inc.
+// map : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/map.html
 map
 
-// market : 2014-03-06 Dog Beach, LLC
+// market : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/market.html
 market
 
-// marketing : 2013-11-07 Binky Moon, LLC
+// marketing : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/marketing.html
 marketing
 
-// markets : 2014-12-11 Dog Beach, LLC
+// markets : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/markets.html
 markets
 
-// marriott : 2014-10-09 Marriott Worldwide Corporation
+// marriott : Marriott Worldwide Corporation
+// https://www.iana.org/domains/root/db/marriott.html
 marriott
 
-// marshalls : 2015-07-16 The TJX Companies, Inc.
+// marshalls : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/marshalls.html
 marshalls
 
-// maserati : 2015-07-31 Fiat Chrysler Automobiles N.V.
-maserati
-
-// mattel : 2015-08-06 Mattel Sites, Inc.
+// mattel : Mattel IT Services, Inc.
+// https://www.iana.org/domains/root/db/mattel.html
 mattel
 
-// mba : 2015-04-02 Binky Moon, LLC
+// mba : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/mba.html
 mba
 
-// mckinsey : 2015-07-31 McKinsey Holdings, Inc.
+// mckinsey : McKinsey Holdings, Inc.
+// https://www.iana.org/domains/root/db/mckinsey.html
 mckinsey
 
-// med : 2015-08-06 Medistry LLC
+// med : Medistry LLC
+// https://www.iana.org/domains/root/db/med.html
 med
 
-// media : 2014-03-06 Binky Moon, LLC
+// media : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/media.html
 media
 
-// meet : 2014-01-16 Charleston Road Registry Inc.
+// meet : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/meet.html
 meet
 
-// melbourne : 2014-05-29 The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
+// melbourne : The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
+// https://www.iana.org/domains/root/db/melbourne.html
 melbourne
 
-// meme : 2014-01-30 Charleston Road Registry Inc.
+// meme : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/meme.html
 meme
 
-// memorial : 2014-10-16 Dog Beach, LLC
+// memorial : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/memorial.html
 memorial
 
-// men : 2015-02-26 Exclusive Registry Limited
+// men : Exclusive Registry Limited
+// https://www.iana.org/domains/root/db/men.html
 men
 
-// menu : 2013-09-11 Dot Menu Registry, LLC
+// menu : Dot Menu Registry, LLC
+// https://www.iana.org/domains/root/db/menu.html
 menu
 
-// merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
+// merck : Merck Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/merck.html
+merck
+
+// merckmsd : MSD Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/merckmsd.html
 merckmsd
 
-// miami : 2013-12-19 Registry Services, LLC
+// miami : Registry Services, LLC
+// https://www.iana.org/domains/root/db/miami.html
 miami
 
-// microsoft : 2014-12-18 Microsoft Corporation
+// microsoft : Microsoft Corporation
+// https://www.iana.org/domains/root/db/microsoft.html
 microsoft
 
-// mini : 2014-01-09 Bayerische Motoren Werke Aktiengesellschaft
+// mini : Bayerische Motoren Werke Aktiengesellschaft
+// https://www.iana.org/domains/root/db/mini.html
 mini
 
-// mint : 2015-07-30 Intuit Administrative Services, Inc.
+// mint : Intuit Administrative Services, Inc.
+// https://www.iana.org/domains/root/db/mint.html
 mint
 
-// mit : 2015-07-02 Massachusetts Institute of Technology
+// mit : Massachusetts Institute of Technology
+// https://www.iana.org/domains/root/db/mit.html
 mit
 
-// mitsubishi : 2015-07-23 Mitsubishi Corporation
+// mitsubishi : Mitsubishi Corporation
+// https://www.iana.org/domains/root/db/mitsubishi.html
 mitsubishi
 
-// mlb : 2015-05-21 MLB Advanced Media DH, LLC
+// mlb : MLB Advanced Media DH, LLC
+// https://www.iana.org/domains/root/db/mlb.html
 mlb
 
-// mls : 2015-04-23 The Canadian Real Estate Association
+// mls : The Canadian Real Estate Association
+// https://www.iana.org/domains/root/db/mls.html
 mls
 
-// mma : 2014-11-07 MMA IARD
+// mma : MMA IARD
+// https://www.iana.org/domains/root/db/mma.html
 mma
 
-// mobile : 2016-06-02 Dish DBS Corporation
+// mobile : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/mobile.html
 mobile
 
-// moda : 2013-11-07 Dog Beach, LLC
+// moda : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/moda.html
 moda
 
-// moe : 2013-11-13 Interlink Systems Innovation Institute K.K.
+// moe : Interlink Systems Innovation Institute K.K.
+// https://www.iana.org/domains/root/db/moe.html
 moe
 
-// moi : 2014-12-18 Amazon Registry Services, Inc.
+// moi : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/moi.html
 moi
 
-// mom : 2015-04-16 XYZ.COM LLC
+// mom : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/mom.html
 mom
 
-// monash : 2013-09-30 Monash University
+// monash : Monash University
+// https://www.iana.org/domains/root/db/monash.html
 monash
 
-// money : 2014-10-16 Binky Moon, LLC
+// money : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/money.html
 money
 
-// monster : 2015-09-11 XYZ.COM LLC
+// monster : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/monster.html
 monster
 
-// mormon : 2013-12-05 IRI Domain Management, LLC
+// mormon : IRI Domain Management, LLC
+// https://www.iana.org/domains/root/db/mormon.html
 mormon
 
-// mortgage : 2014-03-20 Dog Beach, LLC
+// mortgage : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/mortgage.html
 mortgage
 
-// moscow : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// moscow : Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// https://www.iana.org/domains/root/db/moscow.html
 moscow
 
-// moto : 2015-06-04 Motorola Trademark Holdings, LLC
+// moto : Motorola Trademark Holdings, LLC
+// https://www.iana.org/domains/root/db/moto.html
 moto
 
-// motorcycles : 2014-01-09 XYZ.COM LLC
+// motorcycles : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/motorcycles.html
 motorcycles
 
-// mov : 2014-01-30 Charleston Road Registry Inc.
+// mov : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/mov.html
 mov
 
-// movie : 2015-02-05 Binky Moon, LLC
+// movie : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/movie.html
 movie
 
-// msd : 2015-07-23 MSD Registry Holdings, Inc.
+// msd : MSD Registry Holdings, Inc.
+// https://www.iana.org/domains/root/db/msd.html
 msd
 
-// mtn : 2014-12-04 MTN Dubai Limited
+// mtn : MTN Dubai Limited
+// https://www.iana.org/domains/root/db/mtn.html
 mtn
 
-// mtr : 2015-03-12 MTR Corporation Limited
+// mtr : MTR Corporation Limited
+// https://www.iana.org/domains/root/db/mtr.html
 mtr
 
-// music : 2021-05-04 DotMusic Limited
+// music : DotMusic Limited
+// https://www.iana.org/domains/root/db/music.html
 music
 
-// mutual : 2015-04-02 Northwestern Mutual MU TLD Registry, LLC
-mutual
-
-// nab : 2015-08-20 National Australia Bank Limited
+// nab : National Australia Bank Limited
+// https://www.iana.org/domains/root/db/nab.html
 nab
 
-// nagoya : 2013-10-24 GMO Registry, Inc.
+// nagoya : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/nagoya.html
 nagoya
 
-// natura : 2015-03-12 NATURA COSMร‰TICOS S.A.
-natura
-
-// navy : 2014-03-06 Dog Beach, LLC
+// navy : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/navy.html
 navy
 
-// nba : 2015-07-31 NBA REGISTRY, LLC
+// nba : NBA REGISTRY, LLC
+// https://www.iana.org/domains/root/db/nba.html
 nba
 
-// nec : 2015-01-08 NEC Corporation
+// nec : NEC Corporation
+// https://www.iana.org/domains/root/db/nec.html
 nec
 
-// netbank : 2014-06-26 COMMONWEALTH BANK OF AUSTRALIA
+// netbank : COMMONWEALTH BANK OF AUSTRALIA
+// https://www.iana.org/domains/root/db/netbank.html
 netbank
 
-// netflix : 2015-06-18 Netflix, Inc.
+// netflix : Netflix, Inc.
+// https://www.iana.org/domains/root/db/netflix.html
 netflix
 
-// network : 2013-11-14 Binky Moon, LLC
+// network : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/network.html
 network
 
-// neustar : 2013-12-05 NeuStar, Inc.
+// neustar : NeuStar, Inc.
+// https://www.iana.org/domains/root/db/neustar.html
 neustar
 
-// new : 2014-01-30 Charleston Road Registry Inc.
+// new : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/new.html
 new
 
-// news : 2014-12-18 Dog Beach, LLC
+// news : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/news.html
 news
 
-// next : 2015-06-18 Next plc
+// next : Next plc
+// https://www.iana.org/domains/root/db/next.html
 next
 
-// nextdirect : 2015-06-18 Next plc
+// nextdirect : Next plc
+// https://www.iana.org/domains/root/db/nextdirect.html
 nextdirect
 
-// nexus : 2014-07-24 Charleston Road Registry Inc.
+// nexus : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/nexus.html
 nexus
 
-// nfl : 2015-07-23 NFL Reg Ops LLC
+// nfl : NFL Reg Ops LLC
+// https://www.iana.org/domains/root/db/nfl.html
 nfl
 
-// ngo : 2014-03-06 Public Interest Registry
+// ngo : Public Interest Registry
+// https://www.iana.org/domains/root/db/ngo.html
 ngo
 
-// nhk : 2014-02-13 Japan Broadcasting Corporation (NHK)
+// nhk : Japan Broadcasting Corporation (NHK)
+// https://www.iana.org/domains/root/db/nhk.html
 nhk
 
-// nico : 2014-12-04 DWANGO Co., Ltd.
+// nico : DWANGO Co., Ltd.
+// https://www.iana.org/domains/root/db/nico.html
 nico
 
-// nike : 2015-07-23 NIKE, Inc.
+// nike : NIKE, Inc.
+// https://www.iana.org/domains/root/db/nike.html
 nike
 
-// nikon : 2015-05-21 NIKON CORPORATION
+// nikon : NIKON CORPORATION
+// https://www.iana.org/domains/root/db/nikon.html
 nikon
 
-// ninja : 2013-11-07 Dog Beach, LLC
+// ninja : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/ninja.html
 ninja
 
-// nissan : 2014-03-27 NISSAN MOTOR CO., LTD.
+// nissan : NISSAN MOTOR CO., LTD.
+// https://www.iana.org/domains/root/db/nissan.html
 nissan
 
-// nissay : 2015-10-29 Nippon Life Insurance Company
+// nissay : Nippon Life Insurance Company
+// https://www.iana.org/domains/root/db/nissay.html
 nissay
 
-// nokia : 2015-01-08 Nokia Corporation
+// nokia : Nokia Corporation
+// https://www.iana.org/domains/root/db/nokia.html
 nokia
 
-// northwesternmutual : 2015-06-18 Northwestern Mutual Registry, LLC
-northwesternmutual
-
-// norton : 2014-12-04 NortonLifeLock Inc.
+// norton : Gen Digital Inc.
+// https://www.iana.org/domains/root/db/norton.html
 norton
 
-// now : 2015-06-25 Amazon Registry Services, Inc.
+// now : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/now.html
 now
 
-// nowruz : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// nowruz
+// https://www.iana.org/domains/root/db/nowruz.html
 nowruz
 
-// nowtv : 2015-05-14 Starbucks (HK) Limited
+// nowtv : Starbucks (HK) Limited
+// https://www.iana.org/domains/root/db/nowtv.html
 nowtv
 
-// nra : 2014-05-22 NRA Holdings Company, INC.
+// nra : National Rifle Association of America
+// https://www.iana.org/domains/root/db/nra.html
 nra
 
-// nrw : 2013-11-21 Minds + Machines GmbH
+// nrw : Minds + Machines GmbH
+// https://www.iana.org/domains/root/db/nrw.html
 nrw
 
-// ntt : 2014-10-31 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+// ntt : NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+// https://www.iana.org/domains/root/db/ntt.html
 ntt
 
-// nyc : 2014-01-23 The City of New York by and through the New York City Department of Information Technology & Telecommunications
+// nyc : The City of New York by and through the New York City Department of Information Technology & Telecommunications
+// https://www.iana.org/domains/root/db/nyc.html
 nyc
 
-// obi : 2014-09-25 OBI Group Holding SE & Co. KGaA
+// obi : OBI Group Holding SE & Co. KGaA
+// https://www.iana.org/domains/root/db/obi.html
 obi
 
-// observer : 2015-04-30 Dog Beach, LLC
+// observer : Fegistry, LLC
+// https://www.iana.org/domains/root/db/observer.html
 observer
 
-// office : 2015-03-12 Microsoft Corporation
+// office : Microsoft Corporation
+// https://www.iana.org/domains/root/db/office.html
 office
 
-// okinawa : 2013-12-05 BRregistry, Inc.
+// okinawa : BRregistry, Inc.
+// https://www.iana.org/domains/root/db/okinawa.html
 okinawa
 
-// olayan : 2015-05-14 Crescent Holding GmbH
+// olayan : Competrol (Luxembourg) Sarl
+// https://www.iana.org/domains/root/db/olayan.html
 olayan
 
-// olayangroup : 2015-05-14 Crescent Holding GmbH
+// olayangroup : Competrol (Luxembourg) Sarl
+// https://www.iana.org/domains/root/db/olayangroup.html
 olayangroup
 
-// oldnavy : 2015-07-31 The Gap, Inc.
-oldnavy
-
-// ollo : 2015-06-04 Dish DBS Corporation
+// ollo : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/ollo.html
 ollo
 
-// omega : 2015-01-08 The Swatch Group Ltd
+// omega : The Swatch Group Ltd
+// https://www.iana.org/domains/root/db/omega.html
 omega
 
-// one : 2014-11-07 One.com A/S
+// one : One.com A/S
+// https://www.iana.org/domains/root/db/one.html
 one
 
-// ong : 2014-03-06 Public Interest Registry
+// ong : Public Interest Registry
+// https://www.iana.org/domains/root/db/ong.html
 ong
 
-// onl : 2013-09-16 iRegistry GmbH
+// onl : Jolly Host, LLC
+// https://www.iana.org/domains/root/db/onl.html
 onl
 
-// online : 2015-01-15 Radix FZC
+// online : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/online.html
 online
 
-// ooo : 2014-01-09 INFIBEAM AVENUES LIMITED
+// ooo : INFIBEAM AVENUES LIMITED
+// https://www.iana.org/domains/root/db/ooo.html
 ooo
 
-// open : 2015-07-31 American Express Travel Related Services Company, Inc.
+// open : American Express Travel Related Services Company, Inc.
+// https://www.iana.org/domains/root/db/open.html
 open
 
-// oracle : 2014-06-19 Oracle Corporation
+// oracle : Oracle Corporation
+// https://www.iana.org/domains/root/db/oracle.html
 oracle
 
-// orange : 2015-03-12 Orange Brand Services Limited
+// orange : Orange Brand Services Limited
+// https://www.iana.org/domains/root/db/orange.html
 orange
 
-// organic : 2014-03-27 Identity Digital Limited
+// organic : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/organic.html
 organic
 
-// origins : 2015-10-01 The Estรฉe Lauder Companies Inc.
+// origins : The Estรฉe Lauder Companies Inc.
+// https://www.iana.org/domains/root/db/origins.html
 origins
 
-// osaka : 2014-09-04 Osaka Registry Co., Ltd.
+// osaka : Osaka Registry Co., Ltd.
+// https://www.iana.org/domains/root/db/osaka.html
 osaka
 
-// otsuka : 2013-10-11 Otsuka Holdings Co., Ltd.
+// otsuka : Otsuka Holdings Co., Ltd.
+// https://www.iana.org/domains/root/db/otsuka.html
 otsuka
 
-// ott : 2015-06-04 Dish DBS Corporation
+// ott : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/ott.html
 ott
 
-// ovh : 2014-01-16 MรฉdiaBC
+// ovh : MรฉdiaBC
+// https://www.iana.org/domains/root/db/ovh.html
 ovh
 
-// page : 2014-12-04 Charleston Road Registry Inc.
+// page : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/page.html
 page
 
-// panasonic : 2015-07-30 Panasonic Corporation
+// panasonic : Panasonic Holdings Corporation
+// https://www.iana.org/domains/root/db/panasonic.html
 panasonic
 
-// paris : 2014-01-30 City of Paris
+// paris : City of Paris
+// https://www.iana.org/domains/root/db/paris.html
 paris
 
-// pars : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// pars
+// https://www.iana.org/domains/root/db/pars.html
 pars
 
-// partners : 2013-12-05 Binky Moon, LLC
+// partners : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/partners.html
 partners
 
-// parts : 2013-12-05 Binky Moon, LLC
+// parts : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/parts.html
 parts
 
-// party : 2014-09-11 Blue Sky Registry Limited
+// party : Blue Sky Registry Limited
+// https://www.iana.org/domains/root/db/party.html
 party
 
-// passagens : 2015-03-05 Travel Reservations SRL
-passagens
-
-// pay : 2015-08-27 Amazon Registry Services, Inc.
+// pay : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/pay.html
 pay
 
-// pccw : 2015-05-14 PCCW Enterprises Limited
+// pccw : PCCW Enterprises Limited
+// https://www.iana.org/domains/root/db/pccw.html
 pccw
 
-// pet : 2015-05-07 Identity Digital Limited
+// pet : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/pet.html
 pet
 
-// pfizer : 2015-09-11 Pfizer Inc.
+// pfizer : Pfizer Inc.
+// https://www.iana.org/domains/root/db/pfizer.html
 pfizer
 
-// pharmacy : 2014-06-19 National Association of Boards of Pharmacy
+// pharmacy : National Association of Boards of Pharmacy
+// https://www.iana.org/domains/root/db/pharmacy.html
 pharmacy
 
-// phd : 2016-07-28 Charleston Road Registry Inc.
+// phd : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/phd.html
 phd
 
-// philips : 2014-11-07 Koninklijke Philips N.V.
+// philips : Koninklijke Philips N.V.
+// https://www.iana.org/domains/root/db/philips.html
 philips
 
-// phone : 2016-06-02 Dish DBS Corporation
+// phone : Dish DBS Corporation
+// https://www.iana.org/domains/root/db/phone.html
 phone
 
-// photo : 2013-11-14 Registry Services, LLC
+// photo : Registry Services, LLC
+// https://www.iana.org/domains/root/db/photo.html
 photo
 
-// photography : 2013-09-20 Binky Moon, LLC
+// photography : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/photography.html
 photography
 
-// photos : 2013-10-17 Binky Moon, LLC
+// photos : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/photos.html
 photos
 
-// physio : 2014-05-01 PhysBiz Pty Ltd
+// physio : PhysBiz Pty Ltd
+// https://www.iana.org/domains/root/db/physio.html
 physio
 
-// pics : 2013-11-14 XYZ.COM LLC
+// pics : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/pics.html
 pics
 
-// pictet : 2014-06-26 Pictet Europe S.A.
+// pictet : Banque Pictet & Cie SA
+// https://www.iana.org/domains/root/db/pictet.html
 pictet
 
-// pictures : 2014-03-06 Binky Moon, LLC
+// pictures : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/pictures.html
 pictures
 
-// pid : 2015-01-08 Top Level Spectrum, Inc.
+// pid : Top Level Spectrum, Inc.
+// https://www.iana.org/domains/root/db/pid.html
 pid
 
-// pin : 2014-12-18 Amazon Registry Services, Inc.
+// pin : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/pin.html
 pin
 
-// ping : 2015-06-11 Ping Registry Provider, Inc.
+// ping : Ping Registry Provider, Inc.
+// https://www.iana.org/domains/root/db/ping.html
 ping
 
-// pink : 2013-10-01 Identity Digital Limited
+// pink : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/pink.html
 pink
 
-// pioneer : 2015-07-16 Pioneer Corporation
+// pioneer : Pioneer Corporation
+// https://www.iana.org/domains/root/db/pioneer.html
 pioneer
 
-// pizza : 2014-06-26 Binky Moon, LLC
+// pizza : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/pizza.html
 pizza
 
-// place : 2014-04-24 Binky Moon, LLC
+// place : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/place.html
 place
 
-// play : 2015-03-05 Charleston Road Registry Inc.
+// play : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/play.html
 play
 
-// playstation : 2015-07-02 Sony Interactive Entertainment Inc.
+// playstation : Sony Interactive Entertainment Inc.
+// https://www.iana.org/domains/root/db/playstation.html
 playstation
 
-// plumbing : 2013-09-10 Binky Moon, LLC
+// plumbing : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/plumbing.html
 plumbing
 
-// plus : 2015-02-05 Binky Moon, LLC
+// plus : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/plus.html
 plus
 
-// pnc : 2015-07-02 PNC Domain Co., LLC
+// pnc : PNC Domain Co., LLC
+// https://www.iana.org/domains/root/db/pnc.html
 pnc
 
-// pohl : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// pohl : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/pohl.html
 pohl
 
-// poker : 2014-07-03 Identity Digital Limited
+// poker : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/poker.html
 poker
 
-// politie : 2015-08-20 Politie Nederland
+// politie : Politie Nederland
+// https://www.iana.org/domains/root/db/politie.html
 politie
 
-// porn : 2014-10-16 ICM Registry PN LLC
+// porn : ICM Registry PN LLC
+// https://www.iana.org/domains/root/db/porn.html
 porn
 
-// pramerica : 2015-07-30 Prudential Financial, Inc.
-pramerica
-
-// praxi : 2013-12-05 Praxi S.p.A.
+// praxi : Praxi S.p.A.
+// https://www.iana.org/domains/root/db/praxi.html
 praxi
 
-// press : 2014-04-03 Radix FZC
+// press : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/press.html
 press
 
-// prime : 2015-06-25 Amazon Registry Services, Inc.
+// prime : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/prime.html
 prime
 
-// prod : 2014-01-23 Charleston Road Registry Inc.
+// prod : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/prod.html
 prod
 
-// productions : 2013-12-05 Binky Moon, LLC
+// productions : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/productions.html
 productions
 
-// prof : 2014-07-24 Charleston Road Registry Inc.
+// prof : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/prof.html
 prof
 
-// progressive : 2015-07-23 Progressive Casualty Insurance Company
+// progressive : Progressive Casualty Insurance Company
+// https://www.iana.org/domains/root/db/progressive.html
 progressive
 
-// promo : 2014-12-18 Identity Digital Limited
+// promo : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/promo.html
 promo
 
-// properties : 2013-12-05 Binky Moon, LLC
+// properties : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/properties.html
 properties
 
-// property : 2014-05-22 Internet Naming Company LLC
+// property : Digital Property Infrastructure Limited
+// https://www.iana.org/domains/root/db/property.html
 property
 
-// protection : 2015-04-23 XYZ.COM LLC
+// protection : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/protection.html
 protection
 
-// pru : 2015-07-30 Prudential Financial, Inc.
+// pru : Prudential Financial, Inc.
+// https://www.iana.org/domains/root/db/pru.html
 pru
 
-// prudential : 2015-07-30 Prudential Financial, Inc.
+// prudential : Prudential Financial, Inc.
+// https://www.iana.org/domains/root/db/prudential.html
 prudential
 
-// pub : 2013-12-12 Dog Beach, LLC
+// pub : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/pub.html
 pub
 
-// pwc : 2015-10-29 PricewaterhouseCoopers LLP
+// pwc : PricewaterhouseCoopers LLP
+// https://www.iana.org/domains/root/db/pwc.html
 pwc
 
-// qpon : 2013-11-14 dotQPON LLC
+// qpon : dotQPON LLC
+// https://www.iana.org/domains/root/db/qpon.html
 qpon
 
-// quebec : 2013-12-19 PointQuรฉbec Inc
+// quebec : PointQuรฉbec Inc
+// https://www.iana.org/domains/root/db/quebec.html
 quebec
 
-// quest : 2015-03-26 XYZ.COM LLC
+// quest : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/quest.html
 quest
 
-// racing : 2014-12-04 Premier Registry Limited
+// racing : Premier Registry Limited
+// https://www.iana.org/domains/root/db/racing.html
 racing
 
-// radio : 2016-07-21 European Broadcasting Union (EBU)
+// radio : Digity, LLC
+// https://www.iana.org/domains/root/db/radio.html
 radio
 
-// read : 2014-12-18 Amazon Registry Services, Inc.
+// read : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/read.html
 read
 
-// realestate : 2015-09-11 dotRealEstate LLC
+// realestate : dotRealEstate LLC
+// https://www.iana.org/domains/root/db/realestate.html
 realestate
 
-// realtor : 2014-05-29 Real Estate Domains LLC
+// realtor : Real Estate Domains LLC
+// https://www.iana.org/domains/root/db/realtor.html
 realtor
 
-// realty : 2015-03-19 Dog Beach, LLC
+// realty : Waterford Limited
+// https://www.iana.org/domains/root/db/realty.html
 realty
 
-// recipes : 2013-10-17 Binky Moon, LLC
+// recipes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/recipes.html
 recipes
 
-// red : 2013-11-07 Identity Digital Limited
+// red : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/red.html
 red
 
-// redstone : 2014-10-31 Redstone Haute Couture Co., Ltd.
-redstone
-
-// redumbrella : 2015-03-26 Travelers TLD, LLC
+// redumbrella : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/redumbrella.html
 redumbrella
 
-// rehab : 2014-03-06 Dog Beach, LLC
+// rehab : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/rehab.html
 rehab
 
-// reise : 2014-03-13 Binky Moon, LLC
+// reise : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/reise.html
 reise
 
-// reisen : 2014-03-06 Binky Moon, LLC
+// reisen : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/reisen.html
 reisen
 
-// reit : 2014-09-04 National Association of Real Estate Investment Trusts, Inc.
+// reit : National Association of Real Estate Investment Trusts, Inc.
+// https://www.iana.org/domains/root/db/reit.html
 reit
 
-// reliance : 2015-04-02 Reliance Industries Limited
+// reliance : Reliance Industries Limited
+// https://www.iana.org/domains/root/db/reliance.html
 reliance
 
-// ren : 2013-12-12 ZDNS International Limited
+// ren : ZDNS International Limited
+// https://www.iana.org/domains/root/db/ren.html
 ren
 
-// rent : 2014-12-04 XYZ.COM LLC
+// rent : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/rent.html
 rent
 
-// rentals : 2013-12-05 Binky Moon, LLC
+// rentals : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/rentals.html
 rentals
 
-// repair : 2013-11-07 Binky Moon, LLC
+// repair : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/repair.html
 repair
 
-// report : 2013-12-05 Binky Moon, LLC
+// report : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/report.html
 report
 
-// republican : 2014-03-20 Dog Beach, LLC
+// republican : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/republican.html
 republican
 
-// rest : 2013-12-19 Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// rest : Punto 2012 Sociedad Anonima Promotora de Inversion de Capital Variable
+// https://www.iana.org/domains/root/db/rest.html
 rest
 
-// restaurant : 2014-07-03 Binky Moon, LLC
+// restaurant : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/restaurant.html
 restaurant
 
-// review : 2014-11-20 dot Review Limited
+// review : dot Review Limited
+// https://www.iana.org/domains/root/db/review.html
 review
 
-// reviews : 2013-09-13 Dog Beach, LLC
+// reviews : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/reviews.html
 reviews
 
-// rexroth : 2015-06-18 Robert Bosch GMBH
+// rexroth : Robert Bosch GMBH
+// https://www.iana.org/domains/root/db/rexroth.html
 rexroth
 
-// rich : 2013-11-21 iRegistry GmbH
+// rich : iRegistry GmbH
+// https://www.iana.org/domains/root/db/rich.html
 rich
 
-// richardli : 2015-05-14 Pacific Century Asset Management (HK) Limited
+// richardli : Pacific Century Asset Management (HK) Limited
+// https://www.iana.org/domains/root/db/richardli.html
 richardli
 
-// ricoh : 2014-11-20 Ricoh Company, Ltd.
+// ricoh : Ricoh Company, Ltd.
+// https://www.iana.org/domains/root/db/ricoh.html
 ricoh
 
-// ril : 2015-04-02 Reliance Industries Limited
+// ril : Reliance Industries Limited
+// https://www.iana.org/domains/root/db/ril.html
 ril
 
-// rio : 2014-02-27 Empresa Municipal de Informรกtica SA - IPLANRIO
+// rio : Empresa Municipal de Informรกtica SA - IPLANRIO
+// https://www.iana.org/domains/root/db/rio.html
 rio
 
-// rip : 2014-07-10 Dog Beach, LLC
+// rip : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/rip.html
 rip
 
-// rocher : 2014-12-18 Ferrero Trading Lux S.A.
-rocher
-
-// rocks : 2013-11-14 Dog Beach, LLC
+// rocks : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/rocks.html
 rocks
 
-// rodeo : 2013-12-19 Registry Services, LLC
+// rodeo : Registry Services, LLC
+// https://www.iana.org/domains/root/db/rodeo.html
 rodeo
 
-// rogers : 2015-08-06 Rogers Communications Canada Inc.
+// rogers : Rogers Communications Canada Inc.
+// https://www.iana.org/domains/root/db/rogers.html
 rogers
 
-// room : 2014-12-18 Amazon Registry Services, Inc.
+// room : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/room.html
 room
 
-// rsvp : 2014-05-08 Charleston Road Registry Inc.
+// rsvp : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/rsvp.html
 rsvp
 
-// rugby : 2016-12-15 World Rugby Strategic Developments Limited
+// rugby : World Rugby Strategic Developments Limited
+// https://www.iana.org/domains/root/db/rugby.html
 rugby
 
-// ruhr : 2013-10-02 dotSaarland GmbH
+// ruhr : dotSaarland GmbH
+// https://www.iana.org/domains/root/db/ruhr.html
 ruhr
 
-// run : 2015-03-19 Binky Moon, LLC
+// run : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/run.html
 run
 
-// rwe : 2015-04-02 RWE AG
+// rwe : RWE AG
+// https://www.iana.org/domains/root/db/rwe.html
 rwe
 
-// ryukyu : 2014-01-09 BRregistry, Inc.
+// ryukyu : BRregistry, Inc.
+// https://www.iana.org/domains/root/db/ryukyu.html
 ryukyu
 
-// saarland : 2013-12-12 dotSaarland GmbH
+// saarland : dotSaarland GmbH
+// https://www.iana.org/domains/root/db/saarland.html
 saarland
 
-// safe : 2014-12-18 Amazon Registry Services, Inc.
+// safe : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/safe.html
 safe
 
-// safety : 2015-01-08 Safety Registry Services, LLC.
+// safety : Safety Registry Services, LLC.
+// https://www.iana.org/domains/root/db/safety.html
 safety
 
-// sakura : 2014-12-18 SAKURA Internet Inc.
+// sakura : SAKURA Internet Inc.
+// https://www.iana.org/domains/root/db/sakura.html
 sakura
 
-// sale : 2014-10-16 Dog Beach, LLC
+// sale : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/sale.html
 sale
 
-// salon : 2014-12-11 Binky Moon, LLC
+// salon : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/salon.html
 salon
 
-// samsclub : 2015-07-31 Wal-Mart Stores, Inc.
+// samsclub : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/samsclub.html
 samsclub
 
-// samsung : 2014-04-03 SAMSUNG SDS CO., LTD
+// samsung : SAMSUNG SDS CO., LTD
+// https://www.iana.org/domains/root/db/samsung.html
 samsung
 
-// sandvik : 2014-11-13 Sandvik AB
+// sandvik : Sandvik AB
+// https://www.iana.org/domains/root/db/sandvik.html
 sandvik
 
-// sandvikcoromant : 2014-11-07 Sandvik AB
+// sandvikcoromant : Sandvik AB
+// https://www.iana.org/domains/root/db/sandvikcoromant.html
 sandvikcoromant
 
-// sanofi : 2014-10-09 Sanofi
+// sanofi : Sanofi
+// https://www.iana.org/domains/root/db/sanofi.html
 sanofi
 
-// sap : 2014-03-27 SAP AG
+// sap : SAP AG
+// https://www.iana.org/domains/root/db/sap.html
 sap
 
-// sarl : 2014-07-03 Binky Moon, LLC
+// sarl : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/sarl.html
 sarl
 
-// sas : 2015-04-02 Research IP LLC
+// sas : Research IP LLC
+// https://www.iana.org/domains/root/db/sas.html
 sas
 
-// save : 2015-06-25 Amazon Registry Services, Inc.
+// save : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/save.html
 save
 
-// saxo : 2014-10-31 Saxo Bank A/S
+// saxo : Saxo Bank A/S
+// https://www.iana.org/domains/root/db/saxo.html
 saxo
 
-// sbi : 2015-03-12 STATE BANK OF INDIA
+// sbi : STATE BANK OF INDIA
+// https://www.iana.org/domains/root/db/sbi.html
 sbi
 
-// sbs : 2014-11-07 ShortDot SA
+// sbs : ShortDot SA
+// https://www.iana.org/domains/root/db/sbs.html
 sbs
 
-// sca : 2014-03-13 SVENSKA CELLULOSA AKTIEBOLAGET SCA (publ)
-sca
-
-// scb : 2014-02-20 The Siam Commercial Bank Public Company Limited ("SCB")
+// scb : The Siam Commercial Bank Public Company Limited ("SCB")
+// https://www.iana.org/domains/root/db/scb.html
 scb
 
-// schaeffler : 2015-08-06 Schaeffler Technologies AG & Co. KG
+// schaeffler : Schaeffler Technologies AG & Co. KG
+// https://www.iana.org/domains/root/db/schaeffler.html
 schaeffler
 
-// schmidt : 2014-04-03 SCHMIDT GROUPE S.A.S.
+// schmidt : SCHMIDT GROUPE S.A.S.
+// https://www.iana.org/domains/root/db/schmidt.html
 schmidt
 
-// scholarships : 2014-04-24 Scholarships.com, LLC
+// scholarships : Scholarships.com, LLC
+// https://www.iana.org/domains/root/db/scholarships.html
 scholarships
 
-// school : 2014-12-18 Binky Moon, LLC
+// school : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/school.html
 school
 
-// schule : 2014-03-06 Binky Moon, LLC
+// schule : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/schule.html
 schule
 
-// schwarz : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
+// schwarz : Schwarz Domains und Services GmbH & Co. KG
+// https://www.iana.org/domains/root/db/schwarz.html
 schwarz
 
-// science : 2014-09-11 dot Science Limited
+// science : dot Science Limited
+// https://www.iana.org/domains/root/db/science.html
 science
 
-// scot : 2014-01-23 Dot Scot Registry Limited
+// scot : Dot Scot Registry Limited
+// https://www.iana.org/domains/root/db/scot.html
 scot
 
-// search : 2016-06-09 Charleston Road Registry Inc.
+// search : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/search.html
 search
 
-// seat : 2014-05-22 SEAT, S.A. (Sociedad Unipersonal)
+// seat : SEAT, S.A. (Sociedad Unipersonal)
+// https://www.iana.org/domains/root/db/seat.html
 seat
 
-// secure : 2015-08-27 Amazon Registry Services, Inc.
+// secure : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/secure.html
 secure
 
-// security : 2015-05-14 XYZ.COM LLC
+// security : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/security.html
 security
 
-// seek : 2014-12-04 Seek Limited
+// seek : Seek Limited
+// https://www.iana.org/domains/root/db/seek.html
 seek
 
-// select : 2015-10-08 Registry Services, LLC
+// select : Registry Services, LLC
+// https://www.iana.org/domains/root/db/select.html
 select
 
-// sener : 2014-10-24 Sener Ingenierรญa y Sistemas, S.A.
+// sener : Sener Ingenierรญa y Sistemas, S.A.
+// https://www.iana.org/domains/root/db/sener.html
 sener
 
-// services : 2014-02-27 Binky Moon, LLC
+// services : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/services.html
 services
 
-// seven : 2015-08-06 Seven West Media Ltd
+// seven : Seven West Media Ltd
+// https://www.iana.org/domains/root/db/seven.html
 seven
 
-// sew : 2014-07-17 SEW-EURODRIVE GmbH & Co KG
+// sew : SEW-EURODRIVE GmbH & Co KG
+// https://www.iana.org/domains/root/db/sew.html
 sew
 
-// sex : 2014-11-13 ICM Registry SX LLC
+// sex : ICM Registry SX LLC
+// https://www.iana.org/domains/root/db/sex.html
 sex
 
-// sexy : 2013-09-11 Internet Naming Company LLC
+// sexy : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/sexy.html
 sexy
 
-// sfr : 2015-08-13 Societe Francaise du Radiotelephone - SFR
+// sfr : Societe Francaise du Radiotelephone - SFR
+// https://www.iana.org/domains/root/db/sfr.html
 sfr
 
-// shangrila : 2015-09-03 Shangriโ€La International Hotel Management Limited
+// shangrila : Shangriโ€La International Hotel Management Limited
+// https://www.iana.org/domains/root/db/shangrila.html
 shangrila
 
-// sharp : 2014-05-01 Sharp Corporation
+// sharp : Sharp Corporation
+// https://www.iana.org/domains/root/db/sharp.html
 sharp
 
-// shaw : 2015-04-23 Shaw Cablesystems G.P.
-shaw
-
-// shell : 2015-07-30 Shell Information Technology International Inc
+// shell : Shell Information Technology International Inc
+// https://www.iana.org/domains/root/db/shell.html
 shell
 
-// shia : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// shia
+// https://www.iana.org/domains/root/db/shia.html
 shia
 
-// shiksha : 2013-11-14 Identity Digital Limited
+// shiksha : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/shiksha.html
 shiksha
 
-// shoes : 2013-10-02 Binky Moon, LLC
+// shoes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/shoes.html
 shoes
 
-// shop : 2016-04-08 GMO Registry, Inc.
+// shop : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/shop.html
 shop
 
-// shopping : 2016-03-31 Binky Moon, LLC
+// shopping : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/shopping.html
 shopping
 
-// shouji : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// shouji : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/shouji.html
 shouji
 
-// show : 2015-03-05 Binky Moon, LLC
+// show : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/show.html
 show
 
-// showtime : 2015-08-06 CBS Domains Inc.
-showtime
-
-// silk : 2015-06-25 Amazon Registry Services, Inc.
+// silk : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/silk.html
 silk
 
-// sina : 2015-03-12 Sina Corporation
+// sina : Sina Corporation
+// https://www.iana.org/domains/root/db/sina.html
 sina
 
-// singles : 2013-08-27 Binky Moon, LLC
+// singles : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/singles.html
 singles
 
-// site : 2015-01-15 Radix FZC
+// site : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/site.html
 site
 
-// ski : 2015-04-09 Identity Digital Limited
+// ski : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/ski.html
 ski
 
-// skin : 2015-01-15 XYZ.COM LLC
+// skin : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/skin.html
 skin
 
-// sky : 2014-06-19 Sky International AG
+// sky : Sky UK Limited
+// https://www.iana.org/domains/root/db/sky.html
 sky
 
-// skype : 2014-12-18 Microsoft Corporation
+// skype : Microsoft Corporation
+// https://www.iana.org/domains/root/db/skype.html
 skype
 
-// sling : 2015-07-30 DISH Technologies L.L.C.
+// sling : DISH Technologies L.L.C.
+// https://www.iana.org/domains/root/db/sling.html
 sling
 
-// smart : 2015-07-09 Smart Communications, Inc. (SMART)
+// smart : Smart Communications, Inc. (SMART)
+// https://www.iana.org/domains/root/db/smart.html
 smart
 
-// smile : 2014-12-18 Amazon Registry Services, Inc.
+// smile : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/smile.html
 smile
 
-// sncf : 2015-02-19 Sociรฉtรฉ Nationale SNCF
+// sncf : Sociรฉtรฉ Nationale SNCF
+// https://www.iana.org/domains/root/db/sncf.html
 sncf
 
-// soccer : 2015-03-26 Binky Moon, LLC
+// soccer : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/soccer.html
 soccer
 
-// social : 2013-11-07 Dog Beach, LLC
+// social : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/social.html
 social
 
-// softbank : 2015-07-02 SoftBank Group Corp.
+// softbank : SoftBank Group Corp.
+// https://www.iana.org/domains/root/db/softbank.html
 softbank
 
-// software : 2014-03-20 Dog Beach, LLC
+// software : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/software.html
 software
 
-// sohu : 2013-12-19 Sohu.com Limited
+// sohu : Sohu.com Limited
+// https://www.iana.org/domains/root/db/sohu.html
 sohu
 
-// solar : 2013-11-07 Binky Moon, LLC
+// solar : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/solar.html
 solar
 
-// solutions : 2013-11-07 Binky Moon, LLC
+// solutions : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/solutions.html
 solutions
 
-// song : 2015-02-26 Amazon Registry Services, Inc.
+// song : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/song.html
 song
 
-// sony : 2015-01-08 Sony Corporation
+// sony : Sony Group Corporation
+// https://www.iana.org/domains/root/db/sony.html
 sony
 
-// soy : 2014-01-23 Charleston Road Registry Inc.
+// soy : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/soy.html
 soy
 
-// spa : 2019-09-19 Asia Spa and Wellness Promotion Council Limited
+// spa : Asia Spa and Wellness Promotion Council Limited
+// https://www.iana.org/domains/root/db/spa.html
 spa
 
-// space : 2014-04-03 Radix FZC
+// space : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/space.html
 space
 
-// sport : 2017-11-16 Global Association of International Sports Federations (GAISF)
+// sport : SportAccord
+// https://www.iana.org/domains/root/db/sport.html
 sport
 
-// spot : 2015-02-26 Amazon Registry Services, Inc.
+// spot : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/spot.html
 spot
 
-// srl : 2015-05-07 InterNetX, Corp
+// srl : InterNetX, Corp
+// https://www.iana.org/domains/root/db/srl.html
 srl
 
-// stada : 2014-11-13 STADA Arzneimittel AG
+// stada : STADA Arzneimittel AG
+// https://www.iana.org/domains/root/db/stada.html
 stada
 
-// staples : 2015-07-30 Staples, Inc.
+// staples : Staples, Inc.
+// https://www.iana.org/domains/root/db/staples.html
 staples
 
-// star : 2015-01-08 Star India Private Limited
+// star : Star India Private Limited
+// https://www.iana.org/domains/root/db/star.html
 star
 
-// statebank : 2015-03-12 STATE BANK OF INDIA
+// statebank : STATE BANK OF INDIA
+// https://www.iana.org/domains/root/db/statebank.html
 statebank
 
-// statefarm : 2015-07-30 State Farm Mutual Automobile Insurance Company
+// statefarm : State Farm Mutual Automobile Insurance Company
+// https://www.iana.org/domains/root/db/statefarm.html
 statefarm
 
-// stc : 2014-10-09 Saudi Telecom Company
+// stc : Saudi Telecom Company
+// https://www.iana.org/domains/root/db/stc.html
 stc
 
-// stcgroup : 2014-10-09 Saudi Telecom Company
+// stcgroup : Saudi Telecom Company
+// https://www.iana.org/domains/root/db/stcgroup.html
 stcgroup
 
-// stockholm : 2014-12-18 Stockholms kommun
+// stockholm : Stockholms kommun
+// https://www.iana.org/domains/root/db/stockholm.html
 stockholm
 
-// storage : 2014-12-22 XYZ.COM LLC
+// storage : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/storage.html
 storage
 
-// store : 2015-04-09 Radix FZC
+// store : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/store.html
 store
 
-// stream : 2016-01-08 dot Stream Limited
+// stream : dot Stream Limited
+// https://www.iana.org/domains/root/db/stream.html
 stream
 
-// studio : 2015-02-11 Dog Beach, LLC
+// studio : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/studio.html
 studio
 
-// study : 2014-12-11 Registry Services, LLC
+// study : Registry Services, LLC
+// https://www.iana.org/domains/root/db/study.html
 study
 
-// style : 2014-12-04 Binky Moon, LLC
+// style : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/style.html
 style
 
-// sucks : 2014-12-22 Vox Populi Registry Ltd.
+// sucks : Vox Populi Registry Ltd.
+// https://www.iana.org/domains/root/db/sucks.html
 sucks
 
-// supplies : 2013-12-19 Binky Moon, LLC
+// supplies : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/supplies.html
 supplies
 
-// supply : 2013-12-19 Binky Moon, LLC
+// supply : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/supply.html
 supply
 
-// support : 2013-10-24 Binky Moon, LLC
+// support : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/support.html
 support
 
-// surf : 2014-01-09 Registry Services, LLC
+// surf : Registry Services, LLC
+// https://www.iana.org/domains/root/db/surf.html
 surf
 
-// surgery : 2014-03-20 Binky Moon, LLC
+// surgery : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/surgery.html
 surgery
 
-// suzuki : 2014-02-20 SUZUKI MOTOR CORPORATION
+// suzuki : SUZUKI MOTOR CORPORATION
+// https://www.iana.org/domains/root/db/suzuki.html
 suzuki
 
-// swatch : 2015-01-08 The Swatch Group Ltd
+// swatch : The Swatch Group Ltd
+// https://www.iana.org/domains/root/db/swatch.html
 swatch
 
-// swiss : 2014-10-16 Swiss Confederation
+// swiss : Swiss Confederation
+// https://www.iana.org/domains/root/db/swiss.html
 swiss
 
-// sydney : 2014-09-18 State of New South Wales, Department of Premier and Cabinet
+// sydney : State of New South Wales, Department of Premier and Cabinet
+// https://www.iana.org/domains/root/db/sydney.html
 sydney
 
-// systems : 2013-11-07 Binky Moon, LLC
+// systems : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/systems.html
 systems
 
-// tab : 2014-12-04 Tabcorp Holdings Limited
+// tab : Tabcorp Holdings Limited
+// https://www.iana.org/domains/root/db/tab.html
 tab
 
-// taipei : 2014-07-10 Taipei City Government
+// taipei : Taipei City Government
+// https://www.iana.org/domains/root/db/taipei.html
 taipei
 
-// talk : 2015-04-09 Amazon Registry Services, Inc.
+// talk : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/talk.html
 talk
 
-// taobao : 2015-01-15 Alibaba Group Holding Limited
+// taobao : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/taobao.html
 taobao
 
-// target : 2015-07-31 Target Domain Holdings, LLC
+// target : Target Domain Holdings, LLC
+// https://www.iana.org/domains/root/db/target.html
 target
 
-// tatamotors : 2015-03-12 Tata Motors Ltd
+// tatamotors : Tata Motors Ltd
+// https://www.iana.org/domains/root/db/tatamotors.html
 tatamotors
 
-// tatar : 2014-04-24 Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
+// tatar : Limited Liability Company "Coordination Center of Regional Domain of Tatarstan Republic"
+// https://www.iana.org/domains/root/db/tatar.html
 tatar
 
-// tattoo : 2013-08-30 Top Level Design, LLC
+// tattoo : Registry Services, LLC
+// https://www.iana.org/domains/root/db/tattoo.html
 tattoo
 
-// tax : 2014-03-20 Binky Moon, LLC
+// tax : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tax.html
 tax
 
-// taxi : 2015-03-19 Binky Moon, LLC
+// taxi : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/taxi.html
 taxi
 
-// tci : 2014-09-12 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// tci
+// https://www.iana.org/domains/root/db/tci.html
 tci
 
-// tdk : 2015-06-11 TDK Corporation
+// tdk : TDK Corporation
+// https://www.iana.org/domains/root/db/tdk.html
 tdk
 
-// team : 2015-03-05 Binky Moon, LLC
+// team : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/team.html
 team
 
-// tech : 2015-01-30 Radix FZC
+// tech : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/tech.html
 tech
 
-// technology : 2013-09-13 Binky Moon, LLC
+// technology : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/technology.html
 technology
 
-// temasek : 2014-08-07 Temasek Holdings (Private) Limited
+// temasek : Temasek Holdings (Private) Limited
+// https://www.iana.org/domains/root/db/temasek.html
 temasek
 
-// tennis : 2014-12-04 Binky Moon, LLC
+// tennis : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tennis.html
 tennis
 
-// teva : 2015-07-02 Teva Pharmaceutical Industries Limited
+// teva : Teva Pharmaceutical Industries Limited
+// https://www.iana.org/domains/root/db/teva.html
 teva
 
-// thd : 2015-04-02 Home Depot Product Authority, LLC
+// thd : Home Depot Product Authority, LLC
+// https://www.iana.org/domains/root/db/thd.html
 thd
 
-// theater : 2015-03-19 Binky Moon, LLC
+// theater : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/theater.html
 theater
 
-// theatre : 2015-05-07 XYZ.COM LLC
+// theatre : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/theatre.html
 theatre
 
-// tiaa : 2015-07-23 Teachers Insurance and Annuity Association of America
+// tiaa : Teachers Insurance and Annuity Association of America
+// https://www.iana.org/domains/root/db/tiaa.html
 tiaa
 
-// tickets : 2015-02-05 XYZ.COM LLC
+// tickets : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/tickets.html
 tickets
 
-// tienda : 2013-11-14 Binky Moon, LLC
+// tienda : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tienda.html
 tienda
 
-// tiffany : 2015-01-30 Tiffany and Company
-tiffany
-
-// tips : 2013-09-20 Binky Moon, LLC
+// tips : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tips.html
 tips
 
-// tires : 2014-11-07 Binky Moon, LLC
+// tires : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tires.html
 tires
 
-// tirol : 2014-04-24 punkt Tirol GmbH
+// tirol : punkt Tirol GmbH
+// https://www.iana.org/domains/root/db/tirol.html
 tirol
 
-// tjmaxx : 2015-07-16 The TJX Companies, Inc.
+// tjmaxx : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/tjmaxx.html
 tjmaxx
 
-// tjx : 2015-07-16 The TJX Companies, Inc.
+// tjx : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/tjx.html
 tjx
 
-// tkmaxx : 2015-07-16 The TJX Companies, Inc.
+// tkmaxx : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/tkmaxx.html
 tkmaxx
 
-// tmall : 2015-01-15 Alibaba Group Holding Limited
+// tmall : Alibaba Group Holding Limited
+// https://www.iana.org/domains/root/db/tmall.html
 tmall
 
-// today : 2013-09-20 Binky Moon, LLC
+// today : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/today.html
 today
 
-// tokyo : 2013-11-13 GMO Registry, Inc.
+// tokyo : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/tokyo.html
 tokyo
 
-// tools : 2013-11-21 Binky Moon, LLC
+// tools : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tools.html
 tools
 
-// top : 2014-03-20 .TOP Registry
+// top : Hong Kong Zhongze International Limited
+// https://www.iana.org/domains/root/db/top.html
 top
 
-// toray : 2014-12-18 Toray Industries, Inc.
+// toray : Toray Industries, Inc.
+// https://www.iana.org/domains/root/db/toray.html
 toray
 
-// toshiba : 2014-04-10 TOSHIBA Corporation
+// toshiba : TOSHIBA Corporation
+// https://www.iana.org/domains/root/db/toshiba.html
 toshiba
 
-// total : 2015-08-06 TotalEnergies SE
+// total : TotalEnergies SE
+// https://www.iana.org/domains/root/db/total.html
 total
 
-// tours : 2015-01-22 Binky Moon, LLC
+// tours : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/tours.html
 tours
 
-// town : 2014-03-06 Binky Moon, LLC
+// town : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/town.html
 town
 
-// toyota : 2015-04-23 TOYOTA MOTOR CORPORATION
+// toyota : TOYOTA MOTOR CORPORATION
+// https://www.iana.org/domains/root/db/toyota.html
 toyota
 
-// toys : 2014-03-06 Binky Moon, LLC
+// toys : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/toys.html
 toys
 
-// trade : 2014-01-23 Elite Registry Limited
+// trade : Elite Registry Limited
+// https://www.iana.org/domains/root/db/trade.html
 trade
 
-// trading : 2014-12-11 Dog Beach, LLC
+// trading : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/trading.html
 trading
 
-// training : 2013-11-07 Binky Moon, LLC
+// training : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/training.html
 training
 
-// travel : 2015-10-09 Dog Beach, LLC
+// travel : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/travel.html
 travel
 
-// travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
-travelchannel
-
-// travelers : 2015-03-26 Travelers TLD, LLC
+// travelers : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/travelers.html
 travelers
 
-// travelersinsurance : 2015-03-26 Travelers TLD, LLC
+// travelersinsurance : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/travelersinsurance.html
 travelersinsurance
 
-// trust : 2014-10-16 Internet Naming Company LLC
+// trust : Internet Naming Company LLC
+// https://www.iana.org/domains/root/db/trust.html
 trust
 
-// trv : 2015-03-26 Travelers TLD, LLC
+// trv : Travelers TLD, LLC
+// https://www.iana.org/domains/root/db/trv.html
 trv
 
-// tube : 2015-06-11 Latin American Telecom LLC
+// tube : Latin American Telecom LLC
+// https://www.iana.org/domains/root/db/tube.html
 tube
 
-// tui : 2014-07-03 TUI AG
+// tui : TUI AG
+// https://www.iana.org/domains/root/db/tui.html
 tui
 
-// tunes : 2015-02-26 Amazon Registry Services, Inc.
+// tunes : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/tunes.html
 tunes
 
-// tushu : 2014-12-18 Amazon Registry Services, Inc.
+// tushu : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/tushu.html
 tushu
 
-// tvs : 2015-02-19 T V SUNDRAM IYENGAR  & SONS LIMITED
+// tvs : T V SUNDRAM IYENGAR  & SONS LIMITED
+// https://www.iana.org/domains/root/db/tvs.html
 tvs
 
-// ubank : 2015-08-20 National Australia Bank Limited
+// ubank : National Australia Bank Limited
+// https://www.iana.org/domains/root/db/ubank.html
 ubank
 
-// ubs : 2014-12-11 UBS AG
+// ubs : UBS AG
+// https://www.iana.org/domains/root/db/ubs.html
 ubs
 
-// unicom : 2015-10-15 China United Network Communications Corporation Limited
+// unicom : China United Network Communications Corporation Limited
+// https://www.iana.org/domains/root/db/unicom.html
 unicom
 
-// university : 2014-03-06 Binky Moon, LLC
+// university : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/university.html
 university
 
-// uno : 2013-09-11 Radix FZC
+// uno : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/uno.html
 uno
 
-// uol : 2014-05-01 UBN INTERNET LTDA.
+// uol : UBN INTERNET LTDA.
+// https://www.iana.org/domains/root/db/uol.html
 uol
 
-// ups : 2015-06-25 UPS Market Driver, Inc.
+// ups : UPS Market Driver, Inc.
+// https://www.iana.org/domains/root/db/ups.html
 ups
 
-// vacations : 2013-12-05 Binky Moon, LLC
+// vacations : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/vacations.html
 vacations
 
-// vana : 2014-12-11 Lifestyle Domain Holdings, Inc.
+// vana : D3 Registry LLC
+// https://www.iana.org/domains/root/db/vana.html
 vana
 
-// vanguard : 2015-09-03 The Vanguard Group, Inc.
+// vanguard : The Vanguard Group, Inc.
+// https://www.iana.org/domains/root/db/vanguard.html
 vanguard
 
-// vegas : 2014-01-16 Dot Vegas, Inc.
+// vegas : Dot Vegas, Inc.
+// https://www.iana.org/domains/root/db/vegas.html
 vegas
 
-// ventures : 2013-08-27 Binky Moon, LLC
+// ventures : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/ventures.html
 ventures
 
-// verisign : 2015-08-13 VeriSign, Inc.
+// verisign : VeriSign, Inc.
+// https://www.iana.org/domains/root/db/verisign.html
 verisign
 
-// versicherung : 2014-03-20 tldbox GmbH
+// versicherung : tldbox GmbH
+// https://www.iana.org/domains/root/db/versicherung.html
 versicherung
 
-// vet : 2014-03-06 Dog Beach, LLC
+// vet : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/vet.html
 vet
 
-// viajes : 2013-10-17 Binky Moon, LLC
+// viajes : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/viajes.html
 viajes
 
-// video : 2014-10-16 Dog Beach, LLC
+// video : Dog Beach, LLC
+// https://www.iana.org/domains/root/db/video.html
 video
 
-// vig : 2015-05-14 VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe
+// vig : VIENNA INSURANCE GROUP AG Wiener Versicherung Gruppe
+// https://www.iana.org/domains/root/db/vig.html
 vig
 
-// viking : 2015-04-02 Viking River Cruises (Bermuda) Ltd.
+// viking : Viking River Cruises (Bermuda) Ltd.
+// https://www.iana.org/domains/root/db/viking.html
 viking
 
-// villas : 2013-12-05 Binky Moon, LLC
+// villas : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/villas.html
 villas
 
-// vin : 2015-06-18 Binky Moon, LLC
+// vin : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/vin.html
 vin
 
-// vip : 2015-01-22 Registry Services, LLC
+// vip : Registry Services, LLC
+// https://www.iana.org/domains/root/db/vip.html
 vip
 
-// virgin : 2014-09-25 Virgin Enterprises Limited
+// virgin : Virgin Enterprises Limited
+// https://www.iana.org/domains/root/db/virgin.html
 virgin
 
-// visa : 2015-07-30 Visa Worldwide Pte. Limited
+// visa : Visa Worldwide Pte. Limited
+// https://www.iana.org/domains/root/db/visa.html
 visa
 
-// vision : 2013-12-05 Binky Moon, LLC
+// vision : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/vision.html
 vision
 
-// viva : 2014-11-07 Saudi Telecom Company
+// viva : Saudi Telecom Company
+// https://www.iana.org/domains/root/db/viva.html
 viva
 
-// vivo : 2015-07-31 Telefonica Brasil S.A.
+// vivo : Telefonica Brasil S.A.
+// https://www.iana.org/domains/root/db/vivo.html
 vivo
 
-// vlaanderen : 2014-02-06 DNS.be vzw
+// vlaanderen : DNS.be vzw
+// https://www.iana.org/domains/root/db/vlaanderen.html
 vlaanderen
 
-// vodka : 2013-12-19 Registry Services, LLC
+// vodka : Registry Services, LLC
+// https://www.iana.org/domains/root/db/vodka.html
 vodka
 
-// volkswagen : 2015-05-14 Volkswagen Group of America Inc.
-volkswagen
-
-// volvo : 2015-11-12 Volvo Holding Sverige Aktiebolag
+// volvo : Volvo Holding Sverige Aktiebolag
+// https://www.iana.org/domains/root/db/volvo.html
 volvo
 
-// vote : 2013-11-21 Monolith Registry LLC
+// vote : Monolith Registry LLC
+// https://www.iana.org/domains/root/db/vote.html
 vote
 
-// voting : 2013-11-13 Valuetainment Corp.
+// voting : Valuetainment Corp.
+// https://www.iana.org/domains/root/db/voting.html
 voting
 
-// voto : 2013-11-21 Monolith Registry LLC
+// voto : Monolith Registry LLC
+// https://www.iana.org/domains/root/db/voto.html
 voto
 
-// voyage : 2013-08-27 Binky Moon, LLC
+// voyage : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/voyage.html
 voyage
 
-// vuelos : 2015-03-05 Travel Reservations SRL
-vuelos
-
-// wales : 2014-05-08 Nominet UK
+// wales : Nominet UK
+// https://www.iana.org/domains/root/db/wales.html
 wales
 
-// walmart : 2015-07-31 Wal-Mart Stores, Inc.
+// walmart : Wal-Mart Stores, Inc.
+// https://www.iana.org/domains/root/db/walmart.html
 walmart
 
-// walter : 2014-11-13 Sandvik AB
+// walter : Sandvik AB
+// https://www.iana.org/domains/root/db/walter.html
 walter
 
-// wang : 2013-10-24 Zodiac Wang Limited
+// wang : Zodiac Wang Limited
+// https://www.iana.org/domains/root/db/wang.html
 wang
 
-// wanggou : 2014-12-18 Amazon Registry Services, Inc.
+// wanggou : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/wanggou.html
 wanggou
 
-// watch : 2013-11-14 Binky Moon, LLC
+// watch : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/watch.html
 watch
 
-// watches : 2014-12-22 Identity Digital Limited
+// watches : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/watches.html
 watches
 
-// weather : 2015-01-08 International Business Machines Corporation
+// weather : The Weather Company, LLC
+// https://www.iana.org/domains/root/db/weather.html
 weather
 
-// weatherchannel : 2015-03-12 International Business Machines Corporation
+// weatherchannel : The Weather Company, LLC
+// https://www.iana.org/domains/root/db/weatherchannel.html
 weatherchannel
 
-// webcam : 2014-01-23 dot Webcam Limited
+// webcam : dot Webcam Limited
+// https://www.iana.org/domains/root/db/webcam.html
 webcam
 
-// weber : 2015-06-04 Saint-Gobain Weber SA
+// weber : Saint-Gobain Weber SA
+// https://www.iana.org/domains/root/db/weber.html
 weber
 
-// website : 2014-04-03 Radix FZC
+// website : Radix Technologies Inc SEZC
+// https://www.iana.org/domains/root/db/website.html
 website
 
-// wedding : 2014-04-24 Registry Services, LLC
+// wed
+// https://www.iana.org/domains/root/db/wed.html
+wed
+
+// wedding : Registry Services, LLC
+// https://www.iana.org/domains/root/db/wedding.html
 wedding
 
-// weibo : 2015-03-05 Sina Corporation
+// weibo : Sina Corporation
+// https://www.iana.org/domains/root/db/weibo.html
 weibo
 
-// weir : 2015-01-29 Weir Group IP Limited
+// weir : Weir Group IP Limited
+// https://www.iana.org/domains/root/db/weir.html
 weir
 
-// whoswho : 2014-02-20 Who's Who Registry
+// whoswho : Who's Who Registry
+// https://www.iana.org/domains/root/db/whoswho.html
 whoswho
 
-// wien : 2013-10-28 punkt.wien GmbH
+// wien : domainworx Service & Management GmbH
+// https://www.iana.org/domains/root/db/wien.html
 wien
 
-// wiki : 2013-11-07 Top Level Design, LLC
+// wiki : Registry Services, LLC
+// https://www.iana.org/domains/root/db/wiki.html
 wiki
 
-// williamhill : 2014-03-13 William Hill Organization Limited
+// williamhill : William Hill Organization Limited
+// https://www.iana.org/domains/root/db/williamhill.html
 williamhill
 
-// win : 2014-11-20 First Registry Limited
+// win : First Registry Limited
+// https://www.iana.org/domains/root/db/win.html
 win
 
-// windows : 2014-12-18 Microsoft Corporation
+// windows : Microsoft Corporation
+// https://www.iana.org/domains/root/db/windows.html
 windows
 
-// wine : 2015-06-18 Binky Moon, LLC
+// wine : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/wine.html
 wine
 
-// winners : 2015-07-16 The TJX Companies, Inc.
+// winners : The TJX Companies, Inc.
+// https://www.iana.org/domains/root/db/winners.html
 winners
 
-// wme : 2014-02-13 William Morris Endeavor Entertainment, LLC
+// wme : William Morris Endeavor Entertainment, LLC
+// https://www.iana.org/domains/root/db/wme.html
 wme
 
-// wolterskluwer : 2015-08-06 Wolters Kluwer N.V.
-wolterskluwer
-
-// woodside : 2015-07-09 Woodside Petroleum Limited
+// woodside : Woodside Petroleum Limited
+// https://www.iana.org/domains/root/db/woodside.html
 woodside
 
-// work : 2013-12-19 Registry Services, LLC
+// work : Registry Services, LLC
+// https://www.iana.org/domains/root/db/work.html
 work
 
-// works : 2013-11-14 Binky Moon, LLC
+// works : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/works.html
 works
 
-// world : 2014-06-12 Binky Moon, LLC
+// world : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/world.html
 world
 
-// wow : 2015-10-08 Amazon Registry Services, Inc.
+// wow : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/wow.html
 wow
 
-// wtc : 2013-12-19 World Trade Centers Association, Inc.
+// wtc : World Trade Centers Association, Inc.
+// https://www.iana.org/domains/root/db/wtc.html
 wtc
 
-// wtf : 2014-03-06 Binky Moon, LLC
+// wtf : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/wtf.html
 wtf
 
-// xbox : 2014-12-18 Microsoft Corporation
+// xbox : Microsoft Corporation
+// https://www.iana.org/domains/root/db/xbox.html
 xbox
 
-// xerox : 2014-10-24 Xerox DNHC LLC
+// xerox : Xerox DNHC LLC
+// https://www.iana.org/domains/root/db/xerox.html
 xerox
 
-// xfinity : 2015-07-09 Comcast IP Holdings I, LLC
-xfinity
-
-// xihuan : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// xihuan : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/xihuan.html
 xihuan
 
-// xin : 2014-12-11 Elegant Leader Limited
+// xin : Elegant Leader Limited
+// https://www.iana.org/domains/root/db/xin.html
 xin
 
-// xn--11b4c3d : 2015-01-15 VeriSign Sarl
+// xn--11b4c3d : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--11b4c3d.html
 เค•เฅ‰เคฎ
 
-// xn--1ck2e1b : 2015-02-26 Amazon Registry Services, Inc.
+// xn--1ck2e1b : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--1ck2e1b.html
 ใ‚ปใƒผใƒซ
 
-// xn--1qqw23a : 2014-01-09 Guangzhou YU Wei Information Technology Co., Ltd.
+// xn--1qqw23a : Guangzhou YU Wei Information Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--1qqw23a.html
 ไฝ›ๅฑฑ
 
-// xn--30rr7y : 2014-06-12 Excellent First Limited
+// xn--30rr7y : Excellent First Limited
+// https://www.iana.org/domains/root/db/xn--30rr7y.html
 ๆ…ˆๅ–„
 
-// xn--3bst00m : 2013-09-13 Eagle Horizon Limited
+// xn--3bst00m : Eagle Horizon Limited
+// https://www.iana.org/domains/root/db/xn--3bst00m.html
 ้›†ๅ›ข
 
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
+// xn--3ds443g : Beijing TLD Registry Technology Limited
+// https://www.iana.org/domains/root/db/xn--3ds443g.html
 ๅœจ็บฟ
 
-// xn--3pxu8k : 2015-01-15 VeriSign Sarl
+// xn--3pxu8k : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--3pxu8k.html
 ็‚น็œ‹
 
-// xn--42c2d9a : 2015-01-15 VeriSign Sarl
+// xn--42c2d9a : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--42c2d9a.html
 เธ„เธญเธก
 
-// xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
+// xn--45q11c : Zodiac Gemini Ltd
+// https://www.iana.org/domains/root/db/xn--45q11c.html
 ๅ…ซๅฆ
 
-// xn--4gbrim : 2013-10-04 Helium TLDs Ltd
+// xn--4gbrim : Helium TLDs Ltd
+// https://www.iana.org/domains/root/db/xn--4gbrim.html
 ู…ูˆู‚ุน
 
-// xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
+// xn--55qw42g : China Organizational Name Administration Center
+// https://www.iana.org/domains/root/db/xn--55qw42g.html
 ๅ…ฌ็›Š
 
-// xn--55qx5d : 2013-11-14 China Internet Network Information Center (CNNIC)
+// xn--55qx5d : China Internet Network Information Center (CNNIC)
+// https://www.iana.org/domains/root/db/xn--55qx5d.html
 ๅ…ฌๅธ
 
-// xn--5su34j936bgsg : 2015-09-03 Shangriโ€La International Hotel Management Limited
+// xn--5su34j936bgsg : Shangriโ€La International Hotel Management Limited
+// https://www.iana.org/domains/root/db/xn--5su34j936bgsg.html
 ้ฆ™ๆ ผ้‡Œๆ‹‰
 
-// xn--5tzm5g : 2014-12-22 Global Website TLD Asia Limited
+// xn--5tzm5g : Global Website TLD Asia Limited
+// https://www.iana.org/domains/root/db/xn--5tzm5g.html
 ็ฝ‘็ซ™
 
-// xn--6frz82g : 2013-09-23 Identity Digital Limited
+// xn--6frz82g : Identity Digital Domains Limited
+// https://www.iana.org/domains/root/db/xn--6frz82g.html
 ็งปๅŠจ
 
-// xn--6qq986b3xl : 2013-09-13 Tycoon Treasure Limited
+// xn--6qq986b3xl : Tycoon Treasure Limited
+// https://www.iana.org/domains/root/db/xn--6qq986b3xl.html
 ๆˆ‘็ˆฑไฝ 
 
-// xn--80adxhks : 2013-12-19 Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// xn--80adxhks : Foundation for Assistance for Internet Technologies and Infrastructure Development (FAITID)
+// https://www.iana.org/domains/root/db/xn--80adxhks.html
 ะผะพัะบะฒะฐ
 
-// xn--80aqecdr1a : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// xn--80aqecdr1a : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/xn--80aqecdr1a.html
 ะบะฐั‚ะพะปะธะบ
 
-// xn--80asehdb : 2013-07-14 CORE Association
+// xn--80asehdb : CORE Association
+// https://www.iana.org/domains/root/db/xn--80asehdb.html
 ะพะฝะปะฐะนะฝ
 
-// xn--80aswg : 2013-07-14 CORE Association
+// xn--80aswg : CORE Association
+// https://www.iana.org/domains/root/db/xn--80aswg.html
 ัะฐะนั‚
 
-// xn--8y0a063a : 2015-03-26 China United Network Communications Corporation Limited
+// xn--8y0a063a : China United Network Communications Corporation Limited
+// https://www.iana.org/domains/root/db/xn--8y0a063a.html
 ่”้€š
 
-// xn--9dbq2a : 2015-01-15 VeriSign Sarl
+// xn--9dbq2a : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--9dbq2a.html
 ืงื•ื
 
-// xn--9et52u : 2014-06-12 RISE VICTORY LIMITED
+// xn--9et52u : RISE VICTORY LIMITED
+// https://www.iana.org/domains/root/db/xn--9et52u.html
 ๆ—ถๅฐš
 
-// xn--9krt00a : 2015-03-12 Sina Corporation
+// xn--9krt00a : Sina Corporation
+// https://www.iana.org/domains/root/db/xn--9krt00a.html
 ๅพฎๅš
 
-// xn--b4w605ferd : 2014-08-07 Temasek Holdings (Private) Limited
+// xn--b4w605ferd : Temasek Holdings (Private) Limited
+// https://www.iana.org/domains/root/db/xn--b4w605ferd.html
 ๆทก้ฉฌ้”ก
 
-// xn--bck1b9a5dre4c : 2015-02-26 Amazon Registry Services, Inc.
+// xn--bck1b9a5dre4c : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--bck1b9a5dre4c.html
 ใƒ•ใ‚กใƒƒใ‚ทใƒงใƒณ
 
-// xn--c1avg : 2013-11-14 Public Interest Registry
+// xn--c1avg : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--c1avg.html
 ะพั€ะณ
 
-// xn--c2br7g : 2015-01-15 VeriSign Sarl
+// xn--c2br7g : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--c2br7g.html
 เคจเฅ‡เคŸ
 
-// xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc.
+// xn--cck2b3b : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--cck2b3b.html
 ใ‚นใƒˆใ‚ข
 
-// xn--cckwcxetd : 2019-12-19 Amazon Registry Services, Inc.
+// xn--cckwcxetd : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--cckwcxetd.html
 ใ‚ขใƒžใ‚พใƒณ
 
-// xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
+// xn--cg4bki : SAMSUNG SDS CO., LTD
+// https://www.iana.org/domains/root/db/xn--cg4bki.html
 ์‚ผ์„ฑ
 
-// xn--czr694b : 2014-01-16 Internet DotTrademark Organisation Limited
+// xn--czr694b : Internet DotTrademark Organisation Limited
+// https://www.iana.org/domains/root/db/xn--czr694b.html
 ๅ•†ๆ ‡
 
-// xn--czrs0t : 2013-12-19 Binky Moon, LLC
+// xn--czrs0t : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--czrs0t.html
 ๅ•†ๅบ—
 
-// xn--czru2d : 2013-11-21 Zodiac Aquarius Limited
+// xn--czru2d : Zodiac Aquarius Limited
+// https://www.iana.org/domains/root/db/xn--czru2d.html
 ๅ•†ๅŸŽ
 
-// xn--d1acj3b : 2013-11-20 The Foundation for Network Initiatives โ€œThe Smart Internetโ€
+// xn--d1acj3b : The Foundation for Network Initiatives โ€œThe Smart Internetโ€
+// https://www.iana.org/domains/root/db/xn--d1acj3b.html
 ะดะตั‚ะธ
 
-// xn--eckvdtc9d : 2014-12-18 Amazon Registry Services, Inc.
+// xn--eckvdtc9d : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--eckvdtc9d.html
 ใƒใ‚คใƒณใƒˆ
 
-// xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd.
+// xn--efvy88h : Guangzhou YU Wei Information Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--efvy88h.html
 ๆ–ฐ้—ป
 
-// xn--fct429k : 2015-04-09 Amazon Registry Services, Inc.
+// xn--fct429k : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--fct429k.html
 ๅฎถ้›ป
 
-// xn--fhbei : 2015-01-15 VeriSign Sarl
+// xn--fhbei : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--fhbei.html
 ูƒูˆู…
 
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED OY
+// xn--fiq228c5hs : Beijing TLD Registry Technology Limited
+// https://www.iana.org/domains/root/db/xn--fiq228c5hs.html
 ไธญๆ–‡็ฝ‘
 
-// xn--fiq64b : 2013-10-14 CITIC Group Corporation
+// xn--fiq64b : CITIC Group Corporation
+// https://www.iana.org/domains/root/db/xn--fiq64b.html
 ไธญไฟก
 
-// xn--fjq720a : 2014-05-22 Binky Moon, LLC
+// xn--fjq720a : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--fjq720a.html
 ๅจฑไน
 
-// xn--flw351e : 2014-07-31 Charleston Road Registry Inc.
+// xn--flw351e : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/xn--flw351e.html
 ่ฐทๆญŒ
 
-// xn--fzys8d69uvgm : 2015-05-14 PCCW Enterprises Limited
+// xn--fzys8d69uvgm : PCCW Enterprises Limited
+// https://www.iana.org/domains/root/db/xn--fzys8d69uvgm.html
 ้›ป่จŠ็›ˆ็ง‘
 
-// xn--g2xx48c : 2015-01-30 Nawang Heli(Xiamen) Network Service Co., LTD.
+// xn--g2xx48c : Nawang Heli(Xiamen) Network Service Co., LTD.
+// https://www.iana.org/domains/root/db/xn--g2xx48c.html
 ่ดญ็‰ฉ
 
-// xn--gckr3f0f : 2015-02-26 Amazon Registry Services, Inc.
+// xn--gckr3f0f : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--gckr3f0f.html
 ใ‚ฏใƒฉใ‚ฆใƒ‰
 
-// xn--gk3at1e : 2015-10-08 Amazon Registry Services, Inc.
+// xn--gk3at1e : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--gk3at1e.html
 ้€š่ฒฉ
 
-// xn--hxt814e : 2014-05-15 Zodiac Taurus Limited
+// xn--hxt814e : Zodiac Taurus Limited
+// https://www.iana.org/domains/root/db/xn--hxt814e.html
 ็ฝ‘ๅบ—
 
-// xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
+// xn--i1b6b1a6a2e : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--i1b6b1a6a2e.html
 เคธเค‚เค—เค เคจ
 
-// xn--imr513n : 2014-12-11 Internet DotTrademark Organisation Limited
+// xn--imr513n : Internet DotTrademark Organisation Limited
+// https://www.iana.org/domains/root/db/xn--imr513n.html
 ้คๅŽ…
 
-// xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC)
+// xn--io0a7i : China Internet Network Information Center (CNNIC)
+// https://www.iana.org/domains/root/db/xn--io0a7i.html
 ็ฝ‘็ปœ
 
-// xn--j1aef : 2015-01-15 VeriSign Sarl
+// xn--j1aef : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--j1aef.html
 ะบะพะผ
 
-// xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc.
+// xn--jlq480n2rg : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--jlq480n2rg.html
 ไบš้ฉฌ้€Š
 
-// xn--jvr189m : 2015-02-26 Amazon Registry Services, Inc.
+// xn--jvr189m : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--jvr189m.html
 ้ฃŸๅ“
 
-// xn--kcrx77d1x4a : 2014-11-07 Koninklijke Philips N.V.
+// xn--kcrx77d1x4a : Koninklijke Philips N.V.
+// https://www.iana.org/domains/root/db/xn--kcrx77d1x4a.html
 ้ฃžๅˆฉๆตฆ
 
-// xn--kput3i : 2014-02-13 Beijing RITT-Net Technology Development Co., Ltd
+// xn--kput3i : Beijing RITT-Net Technology Development Co., Ltd
+// https://www.iana.org/domains/root/db/xn--kput3i.html
 ๆ‰‹ๆœบ
 
-// xn--mgba3a3ejt : 2014-11-20 Aramco Services Company
+// xn--mgba3a3ejt : Aramco Services Company
+// https://www.iana.org/domains/root/db/xn--mgba3a3ejt.html
 ุงุฑุงู…ูƒูˆ
 
-// xn--mgba7c0bbn0a : 2015-05-14 Crescent Holding GmbH
+// xn--mgba7c0bbn0a : Competrol (Luxembourg) Sarl
+// https://www.iana.org/domains/root/db/xn--mgba7c0bbn0a.html
 ุงู„ุนู„ูŠุงู†
 
-// xn--mgbaakc7dvf : 2015-09-03 Emirates Telecommunications Corporation (trading as Etisalat)
-ุงุชุตุงู„ุงุช
-
-// xn--mgbab2bd : 2013-10-31 CORE Association
+// xn--mgbab2bd : CORE Association
+// https://www.iana.org/domains/root/db/xn--mgbab2bd.html
 ุจุงุฒุงุฑ
 
-// xn--mgbca7dzdo : 2015-07-30 Abu Dhabi Systems and Information Centre
+// xn--mgbca7dzdo : Abu Dhabi Systems and Information Centre
+// https://www.iana.org/domains/root/db/xn--mgbca7dzdo.html
 ุงุจูˆุธุจูŠ
 
-// xn--mgbi4ecexp : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// xn--mgbi4ecexp : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/xn--mgbi4ecexp.html
 ูƒุงุซูˆู„ูŠูƒ
 
-// xn--mgbt3dhd : 2014-09-04 Asia Green IT System Bilgisayar San. ve Tic. Ltd. Sti.
+// xn--mgbt3dhd
+// https://www.iana.org/domains/root/db/xn--mgbt3dhd.html
 ู‡ู…ุฑุงู‡
 
-// xn--mk1bu44c : 2015-01-15 VeriSign Sarl
+// xn--mk1bu44c : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--mk1bu44c.html
 ๋‹ท์ปด
 
-// xn--mxtq1m : 2014-03-06 Net-Chinese Co., Ltd.
+// xn--mxtq1m : Net-Chinese Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--mxtq1m.html
 ๆ”ฟๅบœ
 
-// xn--ngbc5azd : 2013-07-13 International Domain Registry Pty. Ltd.
+// xn--ngbc5azd : International Domain Registry Pty. Ltd.
+// https://www.iana.org/domains/root/db/xn--ngbc5azd.html
 ุดุจูƒุฉ
 
-// xn--ngbe9e0a : 2014-12-04 Kuwait Finance House
+// xn--ngbe9e0a : Kuwait Finance House
+// https://www.iana.org/domains/root/db/xn--ngbe9e0a.html
 ุจูŠุชูƒ
 
-// xn--ngbrx : 2015-11-12 League of Arab States
+// xn--ngbrx : League of Arab States
+// https://www.iana.org/domains/root/db/xn--ngbrx.html
 ุนุฑุจ
 
-// xn--nqv7f : 2013-11-14 Public Interest Registry
+// xn--nqv7f : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--nqv7f.html
 ๆœบๆž„
 
-// xn--nqv7fs00ema : 2013-11-14 Public Interest Registry
+// xn--nqv7fs00ema : Public Interest Registry
+// https://www.iana.org/domains/root/db/xn--nqv7fs00ema.html
 ็ป„็ป‡ๆœบๆž„
 
-// xn--nyqy26a : 2014-11-07 Stable Tone Limited
+// xn--nyqy26a : Stable Tone Limited
+// https://www.iana.org/domains/root/db/xn--nyqy26a.html
 ๅฅๅบท
 
-// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited
+// xn--otu796d : Jiang Yu Liang Cai Technology Company Limited
+// https://www.iana.org/domains/root/db/xn--otu796d.html
 ๆ‹›่˜
 
-// xn--p1acf : 2013-12-12 Rusnames Limited
+// xn--p1acf : Rusnames Limited
+// https://www.iana.org/domains/root/db/xn--p1acf.html
 ั€ัƒั
 
-// xn--pssy2u : 2015-01-15 VeriSign Sarl
+// xn--pssy2u : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--pssy2u.html
 ๅคงๆ‹ฟ
 
-// xn--q9jyb4c : 2013-09-17 Charleston Road Registry Inc.
+// xn--q9jyb4c : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/xn--q9jyb4c.html
 ใฟใ‚“ใช
 
-// xn--qcka1pmc : 2014-07-31 Charleston Road Registry Inc.
+// xn--qcka1pmc : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/xn--qcka1pmc.html
 ใ‚ฐใƒผใ‚ฐใƒซ
 
-// xn--rhqv96g : 2013-09-11 Stable Tone Limited
+// xn--rhqv96g : Stable Tone Limited
+// https://www.iana.org/domains/root/db/xn--rhqv96g.html
 ไธ–็•Œ
 
-// xn--rovu88b : 2015-02-26 Amazon Registry Services, Inc.
+// xn--rovu88b : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/xn--rovu88b.html
 ๆ›ธ็ฑ
 
-// xn--ses554g : 2014-01-16 KNET Co., Ltd.
+// xn--ses554g : KNET Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--ses554g.html
 ็ฝ‘ๅ€
 
-// xn--t60b56a : 2015-01-15 VeriSign Sarl
+// xn--t60b56a : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--t60b56a.html
 ๋‹ท๋„ท
 
-// xn--tckwe : 2015-01-15 VeriSign Sarl
+// xn--tckwe : VeriSign Sarl
+// https://www.iana.org/domains/root/db/xn--tckwe.html
 ใ‚ณใƒ 
 
-// xn--tiq49xqyj : 2015-10-21 Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// xn--tiq49xqyj : Pontificium Consilium de Comunicationibus Socialibus (PCCS) (Pontifical Council for Social Communication)
+// https://www.iana.org/domains/root/db/xn--tiq49xqyj.html
 ๅคฉไธปๆ•™
 
-// xn--unup4y : 2013-07-14 Binky Moon, LLC
+// xn--unup4y : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--unup4y.html
 ๆธธๆˆ
 
-// xn--vermgensberater-ctb : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// xn--vermgensberater-ctb : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/xn--vermgensberater-ctb.html
 vermรถgensberater
 
-// xn--vermgensberatung-pwb : 2014-06-23 Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// xn--vermgensberatung-pwb : Deutsche Vermรถgensberatung Aktiengesellschaft DVAG
+// https://www.iana.org/domains/root/db/xn--vermgensberatung-pwb.html
 vermรถgensberatung
 
-// xn--vhquv : 2013-08-27 Binky Moon, LLC
+// xn--vhquv : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/xn--vhquv.html
 ไผไธš
 
-// xn--vuq861b : 2014-10-16 Beijing Tele-info Network Technology Co., Ltd.
+// xn--vuq861b : Beijing Tele-info Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--vuq861b.html
 ไฟกๆฏ
 
-// xn--w4r85el8fhu5dnra : 2015-04-30 Kerry Trading Co. Limited
+// xn--w4r85el8fhu5dnra : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/xn--w4r85el8fhu5dnra.html
 ๅ˜‰้‡Œๅคง้…’ๅบ—
 
-// xn--w4rs40l : 2015-07-30 Kerry Trading Co. Limited
+// xn--w4rs40l : Kerry Trading Co. Limited
+// https://www.iana.org/domains/root/db/xn--w4rs40l.html
 ๅ˜‰้‡Œ
 
-// xn--xhq521b : 2013-11-14 Guangzhou YU Wei Information Technology Co., Ltd.
+// xn--xhq521b : Guangzhou YU Wei Information Technology Co., Ltd.
+// https://www.iana.org/domains/root/db/xn--xhq521b.html
 ๅนฟไธœ
 
-// xn--zfr164b : 2013-11-08 China Organizational Name Administration Center
+// xn--zfr164b : China Organizational Name Administration Center
+// https://www.iana.org/domains/root/db/xn--zfr164b.html
 ๆ”ฟๅŠก
 
-// xyz : 2013-12-05 XYZ.COM LLC
+// xyz : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/xyz.html
 xyz
 
-// yachts : 2014-01-09 XYZ.COM LLC
+// yachts : XYZ.COM LLC
+// https://www.iana.org/domains/root/db/yachts.html
 yachts
 
-// yahoo : 2015-04-02 Oath Inc.
+// yahoo : Yahoo Inc.
+// https://www.iana.org/domains/root/db/yahoo.html
 yahoo
 
-// yamaxun : 2014-12-18 Amazon Registry Services, Inc.
+// yamaxun : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/yamaxun.html
 yamaxun
 
-// yandex : 2014-04-10 Yandex Europe B.V.
+// yandex : YANDEX, LLC
+// https://www.iana.org/domains/root/db/yandex.html
 yandex
 
-// yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
+// yodobashi : YODOBASHI CAMERA CO.,LTD.
+// https://www.iana.org/domains/root/db/yodobashi.html
 yodobashi
 
-// yoga : 2014-05-29 Registry Services, LLC
+// yoga : Registry Services, LLC
+// https://www.iana.org/domains/root/db/yoga.html
 yoga
 
-// yokohama : 2013-12-12 GMO Registry, Inc.
+// yokohama : GMO Registry, Inc.
+// https://www.iana.org/domains/root/db/yokohama.html
 yokohama
 
-// you : 2015-04-09 Amazon Registry Services, Inc.
+// you : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/you.html
 you
 
-// youtube : 2014-05-01 Charleston Road Registry Inc.
+// youtube : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/youtube.html
 youtube
 
-// yun : 2015-01-08 Beijing Qihu Keji Co., Ltd.
+// yun : Beijing Qihu Keji Co., Ltd.
+// https://www.iana.org/domains/root/db/yun.html
 yun
 
-// zappos : 2015-06-25 Amazon Registry Services, Inc.
+// zappos : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/zappos.html
 zappos
 
-// zara : 2014-11-07 Industria de Diseรฑo Textil, S.A. (INDITEX, S.A.)
+// zara : Industria de Diseรฑo Textil, S.A. (INDITEX, S.A.)
+// https://www.iana.org/domains/root/db/zara.html
 zara
 
-// zero : 2014-12-18 Amazon Registry Services, Inc.
+// zero : Amazon Registry Services, Inc.
+// https://www.iana.org/domains/root/db/zero.html
 zero
 
-// zip : 2014-05-08 Charleston Road Registry Inc.
+// zip : Charleston Road Registry Inc.
+// https://www.iana.org/domains/root/db/zip.html
 zip
 
-// zone : 2013-11-14 Binky Moon, LLC
+// zone : Binky Moon, LLC
+// https://www.iana.org/domains/root/db/zone.html
 zone
 
-// zuerich : 2014-11-07 Kanton Zรผrich (Canton of Zurich)
+// zuerich : Kanton Zรผrich (Canton of Zurich)
+// https://www.iana.org/domains/root/db/zuerich.html
 zuerich
 
-
 // ===END ICANN DOMAINS===
+
 // ===BEGIN PRIVATE DOMAINS===
+
 // (Note: these are in alphabetical order by company name)
 
+// .KRD : https://nic.krd
+co.krd
+edu.krd
+
+// .pl domains (grandfathered)
+art.pl
+gliwice.pl
+krakow.pl
+poznan.pl
+wroc.pl
+zakopane.pl
+
 // 1GB LLC : https://www.1gb.ua/
 // Submitted by 1GB LLC <noc@1gb.com.ua>
 cc.ua
 inf.ua
 ltd.ua
 
-// 611coin : https://611project.org/
+// 611 blockchain domain name system : https://sixone.one/
 611.to
 
-// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
-// Submitted by Aaron Marais <its_me@aaronleem.co.za>
-graphox.us
-
-// accesso Technology Group, plc. : https://accesso.com/
-// Submitted by accesso Team <accessoecommerce@accesso.com>
-*.devcdnaccesso.com
+// A2 Hosting
+// Submitted by Tyler Hall <sysadmin@a2hosting.com>
+a2hosted.com
+cpserver.com
 
 // Acorn Labs : https://acorn.io
 // Submitted by Craig Jellick <domains@acorn.io>
 *.on-acorn.io
 
-// ActiveTrail: https://www.activetrail.biz/
+// ActiveTrail : https://www.activetrail.biz/
 // Submitted by Ofer Kalaora <postmaster@activetrail.com>
 activetrail.biz
 
+// Adaptable.io : https://adaptable.io
+// Submitted by Mark Terrel <support@adaptable.io>
+adaptable.app
+
+// addr.tools : https://addr.tools/
+// Submitted by Brian Shea <publicsuffixlist@addr.tools>
+myaddr.dev
+myaddr.io
+dyn.addr.tools
+myaddr.tools
+
 // Adobe : https://www.adobe.com/
 // Submitted by Ian Boston <boston@adobe.com> and Lars Trieloff <trieloff@adobe.com>
 adobeaemcloud.com
 *.dev.adobeaemcloud.com
+aem.live
 hlx.live
 adobeaemcloud.net
+aem.network
+aem.page
 hlx.page
-hlx3.page
+aem.reviews
 
 // Adobe Developer Platform : https://developer.adobe.com
 // Submitted by Jesse MacFadyen<jessem@adobe.com>
 adobeio-static.net
 adobeioruntime.net
 
+// Africa.com Web Solutions Ltd : https://registry.africa.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+africa.com
+
+// AgentbaseAI Inc. : https://assistant-ui.com
+// Submitted by Simon Farshid <security@assistant-ui.com>
+*.auiusercontent.com
+
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
 
-// Airkit : https://www.airkit.com/
-// Submitted by Grant Cooksey <security@airkit.com>
-airkitapps.com
-airkitapps-au.com
-airkitapps.eu
-
-// Aiven: https://aiven.io/
-// Submitted by Etienne Stalmans <security@aiven.io>
+// Aiven : https://aiven.io/
+// Submitted by Aiven Security Team <security+appdomains@aiven.io>
+aiven.app
 aivencloud.com
 
 // Akamai : https://www.akamai.com/
@@ -10723,11 +11366,17 @@ barsy.ca
 *.compute.estate
 *.alces.network
 
+// Alibaba Cloud API Gateway
+// Submitted by Alibaba Cloud Security <cloud_product_security_team@alibaba-inc.com>
+alibabacloudcs.com
+ms.fun
+ms.show
+
 // all-inkl.com : https://all-inkl.com
 // Submitted by Werner Kaltofen <wk@all-inkl.com>
 kasserver.com
 
-// Altervista: https://www.altervista.org
+// Altervista : https://www.altervista.org
 // Submitted by Carlo Cannas <tech_staff@altervista.it>
 altervista.org
 
@@ -10743,60 +11392,533 @@ myamaze.net
 // Submitted by AWS Security <psl-maintainers@amazon.com>
 // Subsections of Amazon/subsidiaries will appear until "concludes" tag
 
+// Amazon API Gateway
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 6a4f5a95-8c7d-4077-a7af-9cf1abec0a53
+execute-api.cn-north-1.amazonaws.com.cn
+execute-api.cn-northwest-1.amazonaws.com.cn
+execute-api.af-south-1.amazonaws.com
+execute-api.ap-east-1.amazonaws.com
+execute-api.ap-northeast-1.amazonaws.com
+execute-api.ap-northeast-2.amazonaws.com
+execute-api.ap-northeast-3.amazonaws.com
+execute-api.ap-south-1.amazonaws.com
+execute-api.ap-south-2.amazonaws.com
+execute-api.ap-southeast-1.amazonaws.com
+execute-api.ap-southeast-2.amazonaws.com
+execute-api.ap-southeast-3.amazonaws.com
+execute-api.ap-southeast-4.amazonaws.com
+execute-api.ap-southeast-5.amazonaws.com
+execute-api.ca-central-1.amazonaws.com
+execute-api.ca-west-1.amazonaws.com
+execute-api.eu-central-1.amazonaws.com
+execute-api.eu-central-2.amazonaws.com
+execute-api.eu-north-1.amazonaws.com
+execute-api.eu-south-1.amazonaws.com
+execute-api.eu-south-2.amazonaws.com
+execute-api.eu-west-1.amazonaws.com
+execute-api.eu-west-2.amazonaws.com
+execute-api.eu-west-3.amazonaws.com
+execute-api.il-central-1.amazonaws.com
+execute-api.me-central-1.amazonaws.com
+execute-api.me-south-1.amazonaws.com
+execute-api.sa-east-1.amazonaws.com
+execute-api.us-east-1.amazonaws.com
+execute-api.us-east-2.amazonaws.com
+execute-api.us-gov-east-1.amazonaws.com
+execute-api.us-gov-west-1.amazonaws.com
+execute-api.us-west-1.amazonaws.com
+execute-api.us-west-2.amazonaws.com
+
 // Amazon CloudFront
 // Submitted by Donavan Miller <donavanm@amazon.com>
 // Reference: 54144616-fd49-4435-8535-19c6a601bdb3
 cloudfront.net
 
+// Amazon Cognito
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: d7d4a954-976e-403e-a010-de9ed0cfbbd1
+auth.af-south-1.amazoncognito.com
+auth.ap-east-1.amazoncognito.com
+auth.ap-northeast-1.amazoncognito.com
+auth.ap-northeast-2.amazoncognito.com
+auth.ap-northeast-3.amazoncognito.com
+auth.ap-south-1.amazoncognito.com
+auth.ap-south-2.amazoncognito.com
+auth.ap-southeast-1.amazoncognito.com
+auth.ap-southeast-2.amazoncognito.com
+auth.ap-southeast-3.amazoncognito.com
+auth.ap-southeast-4.amazoncognito.com
+auth.ap-southeast-5.amazoncognito.com
+auth.ap-southeast-7.amazoncognito.com
+auth.ca-central-1.amazoncognito.com
+auth.ca-west-1.amazoncognito.com
+auth.eu-central-1.amazoncognito.com
+auth.eu-central-2.amazoncognito.com
+auth.eu-north-1.amazoncognito.com
+auth.eu-south-1.amazoncognito.com
+auth.eu-south-2.amazoncognito.com
+auth.eu-west-1.amazoncognito.com
+auth.eu-west-2.amazoncognito.com
+auth.eu-west-3.amazoncognito.com
+auth.il-central-1.amazoncognito.com
+auth.me-central-1.amazoncognito.com
+auth.me-south-1.amazoncognito.com
+auth.mx-central-1.amazoncognito.com
+auth.sa-east-1.amazoncognito.com
+auth.us-east-1.amazoncognito.com
+auth-fips.us-east-1.amazoncognito.com
+auth.us-east-2.amazoncognito.com
+auth-fips.us-east-2.amazoncognito.com
+auth-fips.us-gov-east-1.amazoncognito.com
+auth-fips.us-gov-west-1.amazoncognito.com
+auth.us-west-1.amazoncognito.com
+auth-fips.us-west-1.amazoncognito.com
+auth.us-west-2.amazoncognito.com
+auth-fips.us-west-2.amazoncognito.com
+auth.cognito-idp.eusc-de-east-1.on.amazonwebservices.eu
+
 // Amazon EC2
 // Submitted by Luke Wells <psl-maintainers@amazon.com>
 // Reference: 4c38fa71-58ac-4768-99e5-689c1767e537
+*.compute.amazonaws.com.cn
 *.compute.amazonaws.com
 *.compute-1.amazonaws.com
-*.compute.amazonaws.com.cn
 us-east-1.amazonaws.com
 
+// Amazon EMR
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 82f43f9f-bbb8-400e-8349-854f5a62f20d
+emrappui-prod.cn-north-1.amazonaws.com.cn
+emrnotebooks-prod.cn-north-1.amazonaws.com.cn
+emrstudio-prod.cn-north-1.amazonaws.com.cn
+emrappui-prod.cn-northwest-1.amazonaws.com.cn
+emrnotebooks-prod.cn-northwest-1.amazonaws.com.cn
+emrstudio-prod.cn-northwest-1.amazonaws.com.cn
+emrappui-prod.af-south-1.amazonaws.com
+emrnotebooks-prod.af-south-1.amazonaws.com
+emrstudio-prod.af-south-1.amazonaws.com
+emrappui-prod.ap-east-1.amazonaws.com
+emrnotebooks-prod.ap-east-1.amazonaws.com
+emrstudio-prod.ap-east-1.amazonaws.com
+emrappui-prod.ap-northeast-1.amazonaws.com
+emrnotebooks-prod.ap-northeast-1.amazonaws.com
+emrstudio-prod.ap-northeast-1.amazonaws.com
+emrappui-prod.ap-northeast-2.amazonaws.com
+emrnotebooks-prod.ap-northeast-2.amazonaws.com
+emrstudio-prod.ap-northeast-2.amazonaws.com
+emrappui-prod.ap-northeast-3.amazonaws.com
+emrnotebooks-prod.ap-northeast-3.amazonaws.com
+emrstudio-prod.ap-northeast-3.amazonaws.com
+emrappui-prod.ap-south-1.amazonaws.com
+emrnotebooks-prod.ap-south-1.amazonaws.com
+emrstudio-prod.ap-south-1.amazonaws.com
+emrappui-prod.ap-south-2.amazonaws.com
+emrnotebooks-prod.ap-south-2.amazonaws.com
+emrstudio-prod.ap-south-2.amazonaws.com
+emrappui-prod.ap-southeast-1.amazonaws.com
+emrnotebooks-prod.ap-southeast-1.amazonaws.com
+emrstudio-prod.ap-southeast-1.amazonaws.com
+emrappui-prod.ap-southeast-2.amazonaws.com
+emrnotebooks-prod.ap-southeast-2.amazonaws.com
+emrstudio-prod.ap-southeast-2.amazonaws.com
+emrappui-prod.ap-southeast-3.amazonaws.com
+emrnotebooks-prod.ap-southeast-3.amazonaws.com
+emrstudio-prod.ap-southeast-3.amazonaws.com
+emrappui-prod.ap-southeast-4.amazonaws.com
+emrnotebooks-prod.ap-southeast-4.amazonaws.com
+emrstudio-prod.ap-southeast-4.amazonaws.com
+emrappui-prod.ca-central-1.amazonaws.com
+emrnotebooks-prod.ca-central-1.amazonaws.com
+emrstudio-prod.ca-central-1.amazonaws.com
+emrappui-prod.ca-west-1.amazonaws.com
+emrnotebooks-prod.ca-west-1.amazonaws.com
+emrstudio-prod.ca-west-1.amazonaws.com
+emrappui-prod.eu-central-1.amazonaws.com
+emrnotebooks-prod.eu-central-1.amazonaws.com
+emrstudio-prod.eu-central-1.amazonaws.com
+emrappui-prod.eu-central-2.amazonaws.com
+emrnotebooks-prod.eu-central-2.amazonaws.com
+emrstudio-prod.eu-central-2.amazonaws.com
+emrappui-prod.eu-north-1.amazonaws.com
+emrnotebooks-prod.eu-north-1.amazonaws.com
+emrstudio-prod.eu-north-1.amazonaws.com
+emrappui-prod.eu-south-1.amazonaws.com
+emrnotebooks-prod.eu-south-1.amazonaws.com
+emrstudio-prod.eu-south-1.amazonaws.com
+emrappui-prod.eu-south-2.amazonaws.com
+emrnotebooks-prod.eu-south-2.amazonaws.com
+emrstudio-prod.eu-south-2.amazonaws.com
+emrappui-prod.eu-west-1.amazonaws.com
+emrnotebooks-prod.eu-west-1.amazonaws.com
+emrstudio-prod.eu-west-1.amazonaws.com
+emrappui-prod.eu-west-2.amazonaws.com
+emrnotebooks-prod.eu-west-2.amazonaws.com
+emrstudio-prod.eu-west-2.amazonaws.com
+emrappui-prod.eu-west-3.amazonaws.com
+emrnotebooks-prod.eu-west-3.amazonaws.com
+emrstudio-prod.eu-west-3.amazonaws.com
+emrappui-prod.il-central-1.amazonaws.com
+emrnotebooks-prod.il-central-1.amazonaws.com
+emrstudio-prod.il-central-1.amazonaws.com
+emrappui-prod.me-central-1.amazonaws.com
+emrnotebooks-prod.me-central-1.amazonaws.com
+emrstudio-prod.me-central-1.amazonaws.com
+emrappui-prod.me-south-1.amazonaws.com
+emrnotebooks-prod.me-south-1.amazonaws.com
+emrstudio-prod.me-south-1.amazonaws.com
+emrappui-prod.sa-east-1.amazonaws.com
+emrnotebooks-prod.sa-east-1.amazonaws.com
+emrstudio-prod.sa-east-1.amazonaws.com
+emrappui-prod.us-east-1.amazonaws.com
+emrnotebooks-prod.us-east-1.amazonaws.com
+emrstudio-prod.us-east-1.amazonaws.com
+emrappui-prod.us-east-2.amazonaws.com
+emrnotebooks-prod.us-east-2.amazonaws.com
+emrstudio-prod.us-east-2.amazonaws.com
+emrappui-prod.us-gov-east-1.amazonaws.com
+emrnotebooks-prod.us-gov-east-1.amazonaws.com
+emrstudio-prod.us-gov-east-1.amazonaws.com
+emrappui-prod.us-gov-west-1.amazonaws.com
+emrnotebooks-prod.us-gov-west-1.amazonaws.com
+emrstudio-prod.us-gov-west-1.amazonaws.com
+emrappui-prod.us-west-1.amazonaws.com
+emrnotebooks-prod.us-west-1.amazonaws.com
+emrstudio-prod.us-west-1.amazonaws.com
+emrappui-prod.us-west-2.amazonaws.com
+emrnotebooks-prod.us-west-2.amazonaws.com
+emrstudio-prod.us-west-2.amazonaws.com
+
+// Amazon Managed Workflows for Apache Airflow
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: bfd043cc-2816-451d-894e-612c6b61a438
+*.airflow.af-south-1.on.aws
+*.airflow.ap-east-1.on.aws
+*.airflow.ap-northeast-1.on.aws
+*.airflow.ap-northeast-2.on.aws
+*.airflow.ap-northeast-3.on.aws
+*.airflow.ap-south-1.on.aws
+*.airflow.ap-south-2.on.aws
+*.airflow.ap-southeast-1.on.aws
+*.airflow.ap-southeast-2.on.aws
+*.airflow.ap-southeast-3.on.aws
+*.airflow.ap-southeast-4.on.aws
+*.airflow.ap-southeast-5.on.aws
+*.airflow.ca-central-1.on.aws
+*.airflow.ca-west-1.on.aws
+*.airflow.eu-central-1.on.aws
+*.airflow.eu-central-2.on.aws
+*.airflow.eu-north-1.on.aws
+*.airflow.eu-south-1.on.aws
+*.airflow.eu-south-2.on.aws
+*.airflow.eu-west-1.on.aws
+*.airflow.eu-west-2.on.aws
+*.airflow.eu-west-3.on.aws
+*.airflow.il-central-1.on.aws
+*.airflow.me-central-1.on.aws
+*.airflow.me-south-1.on.aws
+*.airflow.sa-east-1.on.aws
+*.airflow.us-east-1.on.aws
+*.airflow.us-east-2.on.aws
+*.airflow.us-west-1.on.aws
+*.airflow.us-west-2.on.aws
+*.cn-north-1.airflow.amazonaws.com.cn
+*.cn-northwest-1.airflow.amazonaws.com.cn
+*.airflow.cn-north-1.on.amazonwebservices.com.cn
+*.airflow.cn-northwest-1.on.amazonwebservices.com.cn
+*.af-south-1.airflow.amazonaws.com
+*.ap-east-1.airflow.amazonaws.com
+*.ap-northeast-1.airflow.amazonaws.com
+*.ap-northeast-2.airflow.amazonaws.com
+*.ap-northeast-3.airflow.amazonaws.com
+*.ap-south-1.airflow.amazonaws.com
+*.ap-south-2.airflow.amazonaws.com
+*.ap-southeast-1.airflow.amazonaws.com
+*.ap-southeast-2.airflow.amazonaws.com
+*.ap-southeast-3.airflow.amazonaws.com
+*.ap-southeast-4.airflow.amazonaws.com
+*.ap-southeast-5.airflow.amazonaws.com
+*.ap-southeast-7.airflow.amazonaws.com
+*.ca-central-1.airflow.amazonaws.com
+*.ca-west-1.airflow.amazonaws.com
+*.eu-central-1.airflow.amazonaws.com
+*.eu-central-2.airflow.amazonaws.com
+*.eu-north-1.airflow.amazonaws.com
+*.eu-south-1.airflow.amazonaws.com
+*.eu-south-2.airflow.amazonaws.com
+*.eu-west-1.airflow.amazonaws.com
+*.eu-west-2.airflow.amazonaws.com
+*.eu-west-3.airflow.amazonaws.com
+*.il-central-1.airflow.amazonaws.com
+*.me-central-1.airflow.amazonaws.com
+*.me-south-1.airflow.amazonaws.com
+*.sa-east-1.airflow.amazonaws.com
+*.us-east-1.airflow.amazonaws.com
+*.us-east-2.airflow.amazonaws.com
+*.us-west-1.airflow.amazonaws.com
+*.us-west-2.airflow.amazonaws.com
+
+// Amazon Relational Database Service
+// Submitted by: AWS Security <psl-maintainers@amazon.com>
+// Reference: 5aa87906-fd4f-4831-8727-4ffca6094159
+*.rds.cn-north-1.amazonaws.com.cn
+*.rds.cn-northwest-1.amazonaws.com.cn
+*.af-south-1.rds.amazonaws.com
+*.ap-east-1.rds.amazonaws.com
+*.ap-east-2.rds.amazonaws.com
+*.ap-northeast-1.rds.amazonaws.com
+*.ap-northeast-2.rds.amazonaws.com
+*.ap-northeast-3.rds.amazonaws.com
+*.ap-south-1.rds.amazonaws.com
+*.ap-south-2.rds.amazonaws.com
+*.ap-southeast-1.rds.amazonaws.com
+*.ap-southeast-2.rds.amazonaws.com
+*.ap-southeast-3.rds.amazonaws.com
+*.ap-southeast-4.rds.amazonaws.com
+*.ap-southeast-5.rds.amazonaws.com
+*.ap-southeast-6.rds.amazonaws.com
+*.ap-southeast-7.rds.amazonaws.com
+*.ca-central-1.rds.amazonaws.com
+*.ca-west-1.rds.amazonaws.com
+*.eu-central-1.rds.amazonaws.com
+*.eu-central-2.rds.amazonaws.com
+*.eu-west-1.rds.amazonaws.com
+*.eu-west-2.rds.amazonaws.com
+*.eu-west-3.rds.amazonaws.com
+*.il-central-1.rds.amazonaws.com
+*.me-central-1.rds.amazonaws.com
+*.me-south-1.rds.amazonaws.com
+*.mx-central-1.rds.amazonaws.com
+*.sa-east-1.rds.amazonaws.com
+*.us-east-1.rds.amazonaws.com
+*.us-east-2.rds.amazonaws.com
+*.us-gov-east-1.rds.amazonaws.com
+*.us-gov-west-1.rds.amazonaws.com
+*.us-northeast-1.rds.amazonaws.com
+*.us-west-1.rds.amazonaws.com
+*.us-west-2.rds.amazonaws.com
+
 // Amazon S3
-// Submitted by Luke Wells <psl-maintainers@amazon.com>
-// Reference: d068bd97-f0a9-4838-a6d8-954b622ef4ae
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 6f374c1c-1cc9-47de-8b2a-69ca56a3a3b6
+s3.dualstack.cn-north-1.amazonaws.com.cn
+s3-accesspoint.dualstack.cn-north-1.amazonaws.com.cn
+s3-website.dualstack.cn-north-1.amazonaws.com.cn
 s3.cn-north-1.amazonaws.com.cn
+s3-accesspoint.cn-north-1.amazonaws.com.cn
+s3-deprecated.cn-north-1.amazonaws.com.cn
+s3-object-lambda.cn-north-1.amazonaws.com.cn
+s3-website.cn-north-1.amazonaws.com.cn
+s3.dualstack.cn-northwest-1.amazonaws.com.cn
+s3-accesspoint.dualstack.cn-northwest-1.amazonaws.com.cn
+s3.cn-northwest-1.amazonaws.com.cn
+s3-accesspoint.cn-northwest-1.amazonaws.com.cn
+s3-object-lambda.cn-northwest-1.amazonaws.com.cn
+s3-website.cn-northwest-1.amazonaws.com.cn
+s3.dualstack.af-south-1.amazonaws.com
+s3-accesspoint.dualstack.af-south-1.amazonaws.com
+s3-website.dualstack.af-south-1.amazonaws.com
+s3.af-south-1.amazonaws.com
+s3-accesspoint.af-south-1.amazonaws.com
+s3-object-lambda.af-south-1.amazonaws.com
+s3-website.af-south-1.amazonaws.com
+s3.dualstack.ap-east-1.amazonaws.com
+s3-accesspoint.dualstack.ap-east-1.amazonaws.com
+s3.ap-east-1.amazonaws.com
+s3-accesspoint.ap-east-1.amazonaws.com
+s3-object-lambda.ap-east-1.amazonaws.com
+s3-website.ap-east-1.amazonaws.com
 s3.dualstack.ap-northeast-1.amazonaws.com
+s3-accesspoint.dualstack.ap-northeast-1.amazonaws.com
+s3-website.dualstack.ap-northeast-1.amazonaws.com
+s3.ap-northeast-1.amazonaws.com
+s3-accesspoint.ap-northeast-1.amazonaws.com
+s3-object-lambda.ap-northeast-1.amazonaws.com
+s3-website.ap-northeast-1.amazonaws.com
 s3.dualstack.ap-northeast-2.amazonaws.com
+s3-accesspoint.dualstack.ap-northeast-2.amazonaws.com
+s3-website.dualstack.ap-northeast-2.amazonaws.com
 s3.ap-northeast-2.amazonaws.com
+s3-accesspoint.ap-northeast-2.amazonaws.com
+s3-object-lambda.ap-northeast-2.amazonaws.com
 s3-website.ap-northeast-2.amazonaws.com
+s3.dualstack.ap-northeast-3.amazonaws.com
+s3-accesspoint.dualstack.ap-northeast-3.amazonaws.com
+s3-website.dualstack.ap-northeast-3.amazonaws.com
+s3.ap-northeast-3.amazonaws.com
+s3-accesspoint.ap-northeast-3.amazonaws.com
+s3-object-lambda.ap-northeast-3.amazonaws.com
+s3-website.ap-northeast-3.amazonaws.com
 s3.dualstack.ap-south-1.amazonaws.com
+s3-accesspoint.dualstack.ap-south-1.amazonaws.com
+s3-website.dualstack.ap-south-1.amazonaws.com
 s3.ap-south-1.amazonaws.com
+s3-accesspoint.ap-south-1.amazonaws.com
+s3-object-lambda.ap-south-1.amazonaws.com
 s3-website.ap-south-1.amazonaws.com
+s3.dualstack.ap-south-2.amazonaws.com
+s3-accesspoint.dualstack.ap-south-2.amazonaws.com
+s3-website.dualstack.ap-south-2.amazonaws.com
+s3.ap-south-2.amazonaws.com
+s3-accesspoint.ap-south-2.amazonaws.com
+s3-object-lambda.ap-south-2.amazonaws.com
+s3-website.ap-south-2.amazonaws.com
 s3.dualstack.ap-southeast-1.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-1.amazonaws.com
+s3-website.dualstack.ap-southeast-1.amazonaws.com
+s3.ap-southeast-1.amazonaws.com
+s3-accesspoint.ap-southeast-1.amazonaws.com
+s3-object-lambda.ap-southeast-1.amazonaws.com
+s3-website.ap-southeast-1.amazonaws.com
 s3.dualstack.ap-southeast-2.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-2.amazonaws.com
+s3-website.dualstack.ap-southeast-2.amazonaws.com
+s3.ap-southeast-2.amazonaws.com
+s3-accesspoint.ap-southeast-2.amazonaws.com
+s3-object-lambda.ap-southeast-2.amazonaws.com
+s3-website.ap-southeast-2.amazonaws.com
+s3.dualstack.ap-southeast-3.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-3.amazonaws.com
+s3-website.dualstack.ap-southeast-3.amazonaws.com
+s3.ap-southeast-3.amazonaws.com
+s3-accesspoint.ap-southeast-3.amazonaws.com
+s3-object-lambda.ap-southeast-3.amazonaws.com
+s3-website.ap-southeast-3.amazonaws.com
+s3.dualstack.ap-southeast-4.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-4.amazonaws.com
+s3-website.dualstack.ap-southeast-4.amazonaws.com
+s3.ap-southeast-4.amazonaws.com
+s3-accesspoint.ap-southeast-4.amazonaws.com
+s3-object-lambda.ap-southeast-4.amazonaws.com
+s3-website.ap-southeast-4.amazonaws.com
+s3.dualstack.ap-southeast-5.amazonaws.com
+s3-accesspoint.dualstack.ap-southeast-5.amazonaws.com
+s3-website.dualstack.ap-southeast-5.amazonaws.com
+s3.ap-southeast-5.amazonaws.com
+s3-accesspoint.ap-southeast-5.amazonaws.com
+s3-deprecated.ap-southeast-5.amazonaws.com
+s3-object-lambda.ap-southeast-5.amazonaws.com
+s3-website.ap-southeast-5.amazonaws.com
 s3.dualstack.ca-central-1.amazonaws.com
+s3-accesspoint.dualstack.ca-central-1.amazonaws.com
+s3-accesspoint-fips.dualstack.ca-central-1.amazonaws.com
+s3-fips.dualstack.ca-central-1.amazonaws.com
+s3-website.dualstack.ca-central-1.amazonaws.com
 s3.ca-central-1.amazonaws.com
+s3-accesspoint.ca-central-1.amazonaws.com
+s3-accesspoint-fips.ca-central-1.amazonaws.com
+s3-fips.ca-central-1.amazonaws.com
+s3-object-lambda.ca-central-1.amazonaws.com
 s3-website.ca-central-1.amazonaws.com
+s3.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint.dualstack.ca-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.ca-west-1.amazonaws.com
+s3-fips.dualstack.ca-west-1.amazonaws.com
+s3-website.dualstack.ca-west-1.amazonaws.com
+s3.ca-west-1.amazonaws.com
+s3-accesspoint.ca-west-1.amazonaws.com
+s3-accesspoint-fips.ca-west-1.amazonaws.com
+s3-fips.ca-west-1.amazonaws.com
+s3-object-lambda.ca-west-1.amazonaws.com
+s3-website.ca-west-1.amazonaws.com
 s3.dualstack.eu-central-1.amazonaws.com
+s3-accesspoint.dualstack.eu-central-1.amazonaws.com
+s3-website.dualstack.eu-central-1.amazonaws.com
 s3.eu-central-1.amazonaws.com
+s3-accesspoint.eu-central-1.amazonaws.com
+s3-object-lambda.eu-central-1.amazonaws.com
 s3-website.eu-central-1.amazonaws.com
+s3.dualstack.eu-central-2.amazonaws.com
+s3-accesspoint.dualstack.eu-central-2.amazonaws.com
+s3-website.dualstack.eu-central-2.amazonaws.com
+s3.eu-central-2.amazonaws.com
+s3-accesspoint.eu-central-2.amazonaws.com
+s3-object-lambda.eu-central-2.amazonaws.com
+s3-website.eu-central-2.amazonaws.com
+s3.dualstack.eu-north-1.amazonaws.com
+s3-accesspoint.dualstack.eu-north-1.amazonaws.com
+s3.eu-north-1.amazonaws.com
+s3-accesspoint.eu-north-1.amazonaws.com
+s3-object-lambda.eu-north-1.amazonaws.com
+s3-website.eu-north-1.amazonaws.com
+s3.dualstack.eu-south-1.amazonaws.com
+s3-accesspoint.dualstack.eu-south-1.amazonaws.com
+s3-website.dualstack.eu-south-1.amazonaws.com
+s3.eu-south-1.amazonaws.com
+s3-accesspoint.eu-south-1.amazonaws.com
+s3-object-lambda.eu-south-1.amazonaws.com
+s3-website.eu-south-1.amazonaws.com
+s3.dualstack.eu-south-2.amazonaws.com
+s3-accesspoint.dualstack.eu-south-2.amazonaws.com
+s3-website.dualstack.eu-south-2.amazonaws.com
+s3.eu-south-2.amazonaws.com
+s3-accesspoint.eu-south-2.amazonaws.com
+s3-object-lambda.eu-south-2.amazonaws.com
+s3-website.eu-south-2.amazonaws.com
 s3.dualstack.eu-west-1.amazonaws.com
+s3-accesspoint.dualstack.eu-west-1.amazonaws.com
+s3-website.dualstack.eu-west-1.amazonaws.com
+s3.eu-west-1.amazonaws.com
+s3-accesspoint.eu-west-1.amazonaws.com
+s3-deprecated.eu-west-1.amazonaws.com
+s3-object-lambda.eu-west-1.amazonaws.com
+s3-website.eu-west-1.amazonaws.com
 s3.dualstack.eu-west-2.amazonaws.com
+s3-accesspoint.dualstack.eu-west-2.amazonaws.com
 s3.eu-west-2.amazonaws.com
+s3-accesspoint.eu-west-2.amazonaws.com
+s3-object-lambda.eu-west-2.amazonaws.com
 s3-website.eu-west-2.amazonaws.com
 s3.dualstack.eu-west-3.amazonaws.com
+s3-accesspoint.dualstack.eu-west-3.amazonaws.com
+s3-website.dualstack.eu-west-3.amazonaws.com
 s3.eu-west-3.amazonaws.com
+s3-accesspoint.eu-west-3.amazonaws.com
+s3-object-lambda.eu-west-3.amazonaws.com
 s3-website.eu-west-3.amazonaws.com
+s3.dualstack.il-central-1.amazonaws.com
+s3-accesspoint.dualstack.il-central-1.amazonaws.com
+s3-website.dualstack.il-central-1.amazonaws.com
+s3.il-central-1.amazonaws.com
+s3-accesspoint.il-central-1.amazonaws.com
+s3-object-lambda.il-central-1.amazonaws.com
+s3-website.il-central-1.amazonaws.com
+s3.dualstack.me-central-1.amazonaws.com
+s3-accesspoint.dualstack.me-central-1.amazonaws.com
+s3-website.dualstack.me-central-1.amazonaws.com
+s3.me-central-1.amazonaws.com
+s3-accesspoint.me-central-1.amazonaws.com
+s3-object-lambda.me-central-1.amazonaws.com
+s3-website.me-central-1.amazonaws.com
+s3.dualstack.me-south-1.amazonaws.com
+s3-accesspoint.dualstack.me-south-1.amazonaws.com
+s3.me-south-1.amazonaws.com
+s3-accesspoint.me-south-1.amazonaws.com
+s3-object-lambda.me-south-1.amazonaws.com
+s3-website.me-south-1.amazonaws.com
 s3.amazonaws.com
+s3-1.amazonaws.com
+s3-ap-east-1.amazonaws.com
 s3-ap-northeast-1.amazonaws.com
 s3-ap-northeast-2.amazonaws.com
+s3-ap-northeast-3.amazonaws.com
 s3-ap-south-1.amazonaws.com
 s3-ap-southeast-1.amazonaws.com
 s3-ap-southeast-2.amazonaws.com
 s3-ca-central-1.amazonaws.com
 s3-eu-central-1.amazonaws.com
+s3-eu-north-1.amazonaws.com
 s3-eu-west-1.amazonaws.com
 s3-eu-west-2.amazonaws.com
 s3-eu-west-3.amazonaws.com
 s3-external-1.amazonaws.com
+s3-fips-us-gov-east-1.amazonaws.com
 s3-fips-us-gov-west-1.amazonaws.com
+mrap.accesspoint.s3-global.amazonaws.com
+s3-me-south-1.amazonaws.com
 s3-sa-east-1.amazonaws.com
 s3-us-east-2.amazonaws.com
+s3-us-gov-east-1.amazonaws.com
 s3-us-gov-west-1.amazonaws.com
 s3-us-west-1.amazonaws.com
 s3-us-west-2.amazonaws.com
@@ -10806,80 +11928,318 @@ s3-website-ap-southeast-2.amazonaws.com
 s3-website-eu-west-1.amazonaws.com
 s3-website-sa-east-1.amazonaws.com
 s3-website-us-east-1.amazonaws.com
+s3-website-us-gov-west-1.amazonaws.com
 s3-website-us-west-1.amazonaws.com
 s3-website-us-west-2.amazonaws.com
 s3.dualstack.sa-east-1.amazonaws.com
+s3-accesspoint.dualstack.sa-east-1.amazonaws.com
+s3-website.dualstack.sa-east-1.amazonaws.com
+s3.sa-east-1.amazonaws.com
+s3-accesspoint.sa-east-1.amazonaws.com
+s3-object-lambda.sa-east-1.amazonaws.com
+s3-website.sa-east-1.amazonaws.com
 s3.dualstack.us-east-1.amazonaws.com
+s3-accesspoint.dualstack.us-east-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-east-1.amazonaws.com
+s3-fips.dualstack.us-east-1.amazonaws.com
+s3-website.dualstack.us-east-1.amazonaws.com
+s3.us-east-1.amazonaws.com
+s3-accesspoint.us-east-1.amazonaws.com
+s3-accesspoint-fips.us-east-1.amazonaws.com
+s3-deprecated.us-east-1.amazonaws.com
+s3-fips.us-east-1.amazonaws.com
+s3-object-lambda.us-east-1.amazonaws.com
+s3-website.us-east-1.amazonaws.com
 s3.dualstack.us-east-2.amazonaws.com
+s3-accesspoint.dualstack.us-east-2.amazonaws.com
+s3-accesspoint-fips.dualstack.us-east-2.amazonaws.com
+s3-fips.dualstack.us-east-2.amazonaws.com
+s3-website.dualstack.us-east-2.amazonaws.com
 s3.us-east-2.amazonaws.com
+s3-accesspoint.us-east-2.amazonaws.com
+s3-accesspoint-fips.us-east-2.amazonaws.com
+s3-deprecated.us-east-2.amazonaws.com
+s3-fips.us-east-2.amazonaws.com
+s3-object-lambda.us-east-2.amazonaws.com
 s3-website.us-east-2.amazonaws.com
+s3.dualstack.us-gov-east-1.amazonaws.com
+s3-accesspoint.dualstack.us-gov-east-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-gov-east-1.amazonaws.com
+s3-fips.dualstack.us-gov-east-1.amazonaws.com
+s3-website.dualstack.us-gov-east-1.amazonaws.com
+s3.us-gov-east-1.amazonaws.com
+s3-accesspoint.us-gov-east-1.amazonaws.com
+s3-accesspoint-fips.us-gov-east-1.amazonaws.com
+s3-fips.us-gov-east-1.amazonaws.com
+s3-object-lambda.us-gov-east-1.amazonaws.com
+s3-website.us-gov-east-1.amazonaws.com
+s3.dualstack.us-gov-west-1.amazonaws.com
+s3-accesspoint.dualstack.us-gov-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-gov-west-1.amazonaws.com
+s3-fips.dualstack.us-gov-west-1.amazonaws.com
+s3-website.dualstack.us-gov-west-1.amazonaws.com
+s3.us-gov-west-1.amazonaws.com
+s3-accesspoint.us-gov-west-1.amazonaws.com
+s3-accesspoint-fips.us-gov-west-1.amazonaws.com
+s3-fips.us-gov-west-1.amazonaws.com
+s3-object-lambda.us-gov-west-1.amazonaws.com
+s3-website.us-gov-west-1.amazonaws.com
+s3.dualstack.us-west-1.amazonaws.com
+s3-accesspoint.dualstack.us-west-1.amazonaws.com
+s3-accesspoint-fips.dualstack.us-west-1.amazonaws.com
+s3-fips.dualstack.us-west-1.amazonaws.com
+s3-website.dualstack.us-west-1.amazonaws.com
+s3.us-west-1.amazonaws.com
+s3-accesspoint.us-west-1.amazonaws.com
+s3-accesspoint-fips.us-west-1.amazonaws.com
+s3-fips.us-west-1.amazonaws.com
+s3-object-lambda.us-west-1.amazonaws.com
+s3-website.us-west-1.amazonaws.com
+s3.dualstack.us-west-2.amazonaws.com
+s3-accesspoint.dualstack.us-west-2.amazonaws.com
+s3-accesspoint-fips.dualstack.us-west-2.amazonaws.com
+s3-fips.dualstack.us-west-2.amazonaws.com
+s3-website.dualstack.us-west-2.amazonaws.com
+s3.us-west-2.amazonaws.com
+s3-accesspoint.us-west-2.amazonaws.com
+s3-accesspoint-fips.us-west-2.amazonaws.com
+s3-deprecated.us-west-2.amazonaws.com
+s3-fips.us-west-2.amazonaws.com
+s3-object-lambda.us-west-2.amazonaws.com
+s3-website.us-west-2.amazonaws.com
+
+// Amazon SageMaker Ground Truth
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 98dbfde4-7802-48c3-8751-b60f204e0d9c
+labeling.ap-northeast-1.sagemaker.aws
+labeling.ap-northeast-2.sagemaker.aws
+labeling.ap-south-1.sagemaker.aws
+labeling.ap-southeast-1.sagemaker.aws
+labeling.ap-southeast-2.sagemaker.aws
+labeling.ca-central-1.sagemaker.aws
+labeling.eu-central-1.sagemaker.aws
+labeling.eu-west-1.sagemaker.aws
+labeling.eu-west-2.sagemaker.aws
+labeling.us-east-1.sagemaker.aws
+labeling.us-east-2.sagemaker.aws
+labeling.us-west-2.sagemaker.aws
+
+// Amazon SageMaker Notebook Instances
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: b5ea56df-669e-43cc-9537-14aa172f5dfc
+notebook.af-south-1.sagemaker.aws
+notebook.ap-east-1.sagemaker.aws
+notebook.ap-northeast-1.sagemaker.aws
+notebook.ap-northeast-2.sagemaker.aws
+notebook.ap-northeast-3.sagemaker.aws
+notebook.ap-south-1.sagemaker.aws
+notebook.ap-south-2.sagemaker.aws
+notebook.ap-southeast-1.sagemaker.aws
+notebook.ap-southeast-2.sagemaker.aws
+notebook.ap-southeast-3.sagemaker.aws
+notebook.ap-southeast-4.sagemaker.aws
+notebook.ca-central-1.sagemaker.aws
+notebook-fips.ca-central-1.sagemaker.aws
+notebook.ca-west-1.sagemaker.aws
+notebook-fips.ca-west-1.sagemaker.aws
+notebook.eu-central-1.sagemaker.aws
+notebook.eu-central-2.sagemaker.aws
+notebook.eu-north-1.sagemaker.aws
+notebook.eu-south-1.sagemaker.aws
+notebook.eu-south-2.sagemaker.aws
+notebook.eu-west-1.sagemaker.aws
+notebook.eu-west-2.sagemaker.aws
+notebook.eu-west-3.sagemaker.aws
+notebook.il-central-1.sagemaker.aws
+notebook.me-central-1.sagemaker.aws
+notebook.me-south-1.sagemaker.aws
+notebook.sa-east-1.sagemaker.aws
+notebook.us-east-1.sagemaker.aws
+notebook-fips.us-east-1.sagemaker.aws
+notebook.us-east-2.sagemaker.aws
+notebook-fips.us-east-2.sagemaker.aws
+notebook.us-gov-east-1.sagemaker.aws
+notebook-fips.us-gov-east-1.sagemaker.aws
+notebook.us-gov-west-1.sagemaker.aws
+notebook-fips.us-gov-west-1.sagemaker.aws
+notebook.us-west-1.sagemaker.aws
+notebook-fips.us-west-1.sagemaker.aws
+notebook.us-west-2.sagemaker.aws
+notebook-fips.us-west-2.sagemaker.aws
+notebook.cn-north-1.sagemaker.com.cn
+notebook.cn-northwest-1.sagemaker.com.cn
+
+// Amazon SageMaker Studio
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 475f237e-ab88-4041-9f41-7cfccdf66aeb
+studio.af-south-1.sagemaker.aws
+studio.ap-east-1.sagemaker.aws
+studio.ap-northeast-1.sagemaker.aws
+studio.ap-northeast-2.sagemaker.aws
+studio.ap-northeast-3.sagemaker.aws
+studio.ap-south-1.sagemaker.aws
+studio.ap-southeast-1.sagemaker.aws
+studio.ap-southeast-2.sagemaker.aws
+studio.ap-southeast-3.sagemaker.aws
+studio.ca-central-1.sagemaker.aws
+studio.eu-central-1.sagemaker.aws
+studio.eu-central-2.sagemaker.aws
+studio.eu-north-1.sagemaker.aws
+studio.eu-south-1.sagemaker.aws
+studio.eu-south-2.sagemaker.aws
+studio.eu-west-1.sagemaker.aws
+studio.eu-west-2.sagemaker.aws
+studio.eu-west-3.sagemaker.aws
+studio.il-central-1.sagemaker.aws
+studio.me-central-1.sagemaker.aws
+studio.me-south-1.sagemaker.aws
+studio.sa-east-1.sagemaker.aws
+studio.us-east-1.sagemaker.aws
+studio.us-east-2.sagemaker.aws
+studio.us-gov-east-1.sagemaker.aws
+studio-fips.us-gov-east-1.sagemaker.aws
+studio.us-gov-west-1.sagemaker.aws
+studio-fips.us-gov-west-1.sagemaker.aws
+studio.us-west-1.sagemaker.aws
+studio.us-west-2.sagemaker.aws
+studio.cn-north-1.sagemaker.com.cn
+studio.cn-northwest-1.sagemaker.com.cn
+
+// Amazon SageMaker with MLflow
+// Submited by: AWS Security <psl-maintainers@amazon.com>
+// Reference: c19f92b3-a82a-452d-8189-831b572eea7e
+*.experiments.sagemaker.aws
+
+// Analytics on AWS
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 955f9f40-a495-4e73-ae85-67b77ac9cadd
+analytics-gateway.ap-northeast-1.amazonaws.com
+analytics-gateway.ap-northeast-2.amazonaws.com
+analytics-gateway.ap-south-1.amazonaws.com
+analytics-gateway.ap-southeast-1.amazonaws.com
+analytics-gateway.ap-southeast-2.amazonaws.com
+analytics-gateway.eu-central-1.amazonaws.com
+analytics-gateway.eu-west-1.amazonaws.com
+analytics-gateway.us-east-1.amazonaws.com
+analytics-gateway.us-east-2.amazonaws.com
+analytics-gateway.us-west-2.amazonaws.com
+
+// AWS Amplify
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: c35bed18-6f4f-424f-9298-5756f2f7d72b
+amplifyapp.com
+
+// AWS App Runner
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 6828c008-ba5d-442f-ade5-48da4e7c2316
+*.awsapprunner.com
 
 // AWS Cloud9
 // Submitted by: AWS Security <psl-maintainers@amazon.com>
-// Reference: 2b6dfa9a-3a7f-4367-b2e7-0321e77c0d59
+// Reference: 30717f72-4007-4f0f-8ed4-864c6f2efec9
+webview-assets.aws-cloud9.af-south-1.amazonaws.com
 vfs.cloud9.af-south-1.amazonaws.com
 webview-assets.cloud9.af-south-1.amazonaws.com
+webview-assets.aws-cloud9.ap-east-1.amazonaws.com
 vfs.cloud9.ap-east-1.amazonaws.com
 webview-assets.cloud9.ap-east-1.amazonaws.com
+webview-assets.aws-cloud9.ap-northeast-1.amazonaws.com
 vfs.cloud9.ap-northeast-1.amazonaws.com
 webview-assets.cloud9.ap-northeast-1.amazonaws.com
+webview-assets.aws-cloud9.ap-northeast-2.amazonaws.com
 vfs.cloud9.ap-northeast-2.amazonaws.com
 webview-assets.cloud9.ap-northeast-2.amazonaws.com
+webview-assets.aws-cloud9.ap-northeast-3.amazonaws.com
 vfs.cloud9.ap-northeast-3.amazonaws.com
 webview-assets.cloud9.ap-northeast-3.amazonaws.com
+webview-assets.aws-cloud9.ap-south-1.amazonaws.com
 vfs.cloud9.ap-south-1.amazonaws.com
 webview-assets.cloud9.ap-south-1.amazonaws.com
+webview-assets.aws-cloud9.ap-southeast-1.amazonaws.com
 vfs.cloud9.ap-southeast-1.amazonaws.com
 webview-assets.cloud9.ap-southeast-1.amazonaws.com
+webview-assets.aws-cloud9.ap-southeast-2.amazonaws.com
 vfs.cloud9.ap-southeast-2.amazonaws.com
 webview-assets.cloud9.ap-southeast-2.amazonaws.com
+webview-assets.aws-cloud9.ca-central-1.amazonaws.com
 vfs.cloud9.ca-central-1.amazonaws.com
 webview-assets.cloud9.ca-central-1.amazonaws.com
+webview-assets.aws-cloud9.eu-central-1.amazonaws.com
 vfs.cloud9.eu-central-1.amazonaws.com
 webview-assets.cloud9.eu-central-1.amazonaws.com
+webview-assets.aws-cloud9.eu-north-1.amazonaws.com
 vfs.cloud9.eu-north-1.amazonaws.com
 webview-assets.cloud9.eu-north-1.amazonaws.com
+webview-assets.aws-cloud9.eu-south-1.amazonaws.com
 vfs.cloud9.eu-south-1.amazonaws.com
 webview-assets.cloud9.eu-south-1.amazonaws.com
+webview-assets.aws-cloud9.eu-west-1.amazonaws.com
 vfs.cloud9.eu-west-1.amazonaws.com
 webview-assets.cloud9.eu-west-1.amazonaws.com
+webview-assets.aws-cloud9.eu-west-2.amazonaws.com
 vfs.cloud9.eu-west-2.amazonaws.com
 webview-assets.cloud9.eu-west-2.amazonaws.com
+webview-assets.aws-cloud9.eu-west-3.amazonaws.com
 vfs.cloud9.eu-west-3.amazonaws.com
 webview-assets.cloud9.eu-west-3.amazonaws.com
+webview-assets.aws-cloud9.il-central-1.amazonaws.com
+vfs.cloud9.il-central-1.amazonaws.com
+webview-assets.aws-cloud9.me-south-1.amazonaws.com
 vfs.cloud9.me-south-1.amazonaws.com
 webview-assets.cloud9.me-south-1.amazonaws.com
+webview-assets.aws-cloud9.sa-east-1.amazonaws.com
 vfs.cloud9.sa-east-1.amazonaws.com
 webview-assets.cloud9.sa-east-1.amazonaws.com
+webview-assets.aws-cloud9.us-east-1.amazonaws.com
 vfs.cloud9.us-east-1.amazonaws.com
 webview-assets.cloud9.us-east-1.amazonaws.com
+webview-assets.aws-cloud9.us-east-2.amazonaws.com
 vfs.cloud9.us-east-2.amazonaws.com
 webview-assets.cloud9.us-east-2.amazonaws.com
+webview-assets.aws-cloud9.us-west-1.amazonaws.com
 vfs.cloud9.us-west-1.amazonaws.com
 webview-assets.cloud9.us-west-1.amazonaws.com
+webview-assets.aws-cloud9.us-west-2.amazonaws.com
 vfs.cloud9.us-west-2.amazonaws.com
 webview-assets.cloud9.us-west-2.amazonaws.com
 
+// AWS Directory Service
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: a13203e8-42dc-4045-a0d2-2ee67bed1068
+awsapps.com
+
 // AWS Elastic Beanstalk
-// Submitted by Luke Wells <psl-maintainers@amazon.com>
-// Reference: aa202394-43a0-4857-b245-8db04549137e
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: e4e02a54-eaf9-4fe7-b662-39ccbc011a04
 cn-north-1.eb.amazonaws.com.cn
 cn-northwest-1.eb.amazonaws.com.cn
 elasticbeanstalk.com
+af-south-1.elasticbeanstalk.com
+ap-east-1.elasticbeanstalk.com
 ap-northeast-1.elasticbeanstalk.com
 ap-northeast-2.elasticbeanstalk.com
 ap-northeast-3.elasticbeanstalk.com
 ap-south-1.elasticbeanstalk.com
 ap-southeast-1.elasticbeanstalk.com
 ap-southeast-2.elasticbeanstalk.com
+ap-southeast-3.elasticbeanstalk.com
+ap-southeast-5.elasticbeanstalk.com
+ap-southeast-7.elasticbeanstalk.com
 ca-central-1.elasticbeanstalk.com
 eu-central-1.elasticbeanstalk.com
+eu-north-1.elasticbeanstalk.com
+eu-south-1.elasticbeanstalk.com
+eu-south-2.elasticbeanstalk.com
 eu-west-1.elasticbeanstalk.com
 eu-west-2.elasticbeanstalk.com
 eu-west-3.elasticbeanstalk.com
+il-central-1.elasticbeanstalk.com
+me-central-1.elasticbeanstalk.com
+me-south-1.elasticbeanstalk.com
 sa-east-1.elasticbeanstalk.com
 us-east-1.elasticbeanstalk.com
 us-east-2.elasticbeanstalk.com
+us-gov-east-1.elasticbeanstalk.com
 us-gov-west-1.elasticbeanstalk.com
 us-west-1.elasticbeanstalk.com
 us-west-2.elasticbeanstalk.com
@@ -10895,6 +12255,79 @@ us-west-2.elasticbeanstalk.com
 // Reference: d916759d-a08b-4241-b536-4db887383a6a
 awsglobalaccelerator.com
 
+// AWS Lambda Function URLs
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 57df74ca-0820-46a5-89ea-0f0d0c4714b7
+lambda-url.af-south-1.on.aws
+lambda-url.ap-east-1.on.aws
+lambda-url.ap-northeast-1.on.aws
+lambda-url.ap-northeast-2.on.aws
+lambda-url.ap-northeast-3.on.aws
+lambda-url.ap-south-1.on.aws
+lambda-url.ap-southeast-1.on.aws
+lambda-url.ap-southeast-2.on.aws
+lambda-url.ap-southeast-3.on.aws
+lambda-url.ca-central-1.on.aws
+lambda-url.eu-central-1.on.aws
+lambda-url.eu-north-1.on.aws
+lambda-url.eu-south-1.on.aws
+lambda-url.eu-west-1.on.aws
+lambda-url.eu-west-2.on.aws
+lambda-url.eu-west-3.on.aws
+lambda-url.me-south-1.on.aws
+lambda-url.sa-east-1.on.aws
+lambda-url.us-east-1.on.aws
+lambda-url.us-east-2.on.aws
+lambda-url.us-west-1.on.aws
+lambda-url.us-west-2.on.aws
+
+// AWS re:Post Private
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 83385945-225f-416e-9aa0-ad0632bfdcee
+*.private.repost.aws
+
+// AWS Transfer Family web apps
+// Submitted by AWS Security <psl-maintainers@amazon.com>
+// Reference: 9265cdd3-f017-42ab-98bb-08bf427d3fc9
+transfer-webapp.af-south-1.on.aws
+transfer-webapp.ap-east-1.on.aws
+transfer-webapp.ap-northeast-1.on.aws
+transfer-webapp.ap-northeast-2.on.aws
+transfer-webapp.ap-northeast-3.on.aws
+transfer-webapp.ap-south-1.on.aws
+transfer-webapp.ap-south-2.on.aws
+transfer-webapp.ap-southeast-1.on.aws
+transfer-webapp.ap-southeast-2.on.aws
+transfer-webapp.ap-southeast-3.on.aws
+transfer-webapp.ap-southeast-4.on.aws
+transfer-webapp.ap-southeast-5.on.aws
+transfer-webapp.ap-southeast-7.on.aws
+transfer-webapp.ca-central-1.on.aws
+transfer-webapp.ca-west-1.on.aws
+transfer-webapp.eu-central-1.on.aws
+transfer-webapp.eu-central-2.on.aws
+transfer-webapp.eu-north-1.on.aws
+transfer-webapp.eu-south-1.on.aws
+transfer-webapp.eu-south-2.on.aws
+transfer-webapp.eu-west-1.on.aws
+transfer-webapp.eu-west-2.on.aws
+transfer-webapp.eu-west-3.on.aws
+transfer-webapp.il-central-1.on.aws
+transfer-webapp.me-central-1.on.aws
+transfer-webapp.me-south-1.on.aws
+transfer-webapp.mx-central-1.on.aws
+transfer-webapp.sa-east-1.on.aws
+transfer-webapp.us-east-1.on.aws
+transfer-webapp.us-east-2.on.aws
+transfer-webapp.us-gov-east-1.on.aws
+transfer-webapp-fips.us-gov-east-1.on.aws
+transfer-webapp.us-gov-west-1.on.aws
+transfer-webapp-fips.us-gov-west-1.on.aws
+transfer-webapp.us-west-1.on.aws
+transfer-webapp.us-west-2.on.aws
+transfer-webapp.cn-north-1.on.amazonwebservices.com.cn
+transfer-webapp.cn-northwest-1.on.amazonwebservices.com.cn
+
 // eero
 // Submitted by Yue Kang <eero-dynamic-dns@amazon.com>
 // Reference: 264afe70-f62c-4c02-8ab9-b5281ed24461
@@ -10903,19 +12336,40 @@ eero-stage.online
 
 // concludes Amazon
 
-// Amune : https://amune.org/
-// Submitted by Team Amune <cert@amune.org>
-t3l3p0rt.net
-tele.amune.org
+// Antagonist B.V. : https://www.antagonist.nl/
+// Submitted by Sander Hoentjen <systeembeheer@antagonist.nl>
+antagonist.cloud
 
 // Apigee : https://apigee.com/
 // Submitted by Apigee Security Team <security@apigee.com>
 apigee.io
 
+// Apis Networks : https://apisnetworks.com
+// Submitted by Matt Saladna <matt@apisnetworks.com>
+panel.dev
+
 // Apphud : https://apphud.com
 // Submitted by Alexander Selivanov <alex@apphud.com>
 siiites.com
 
+// Apple : https://www.apple.com
+// Submitted by Apple DNS <dnscontact@apple.com>
+int.apple
+*.cloud.int.apple
+*.r.cloud.int.apple
+*.ap-north-1.r.cloud.int.apple
+*.ap-south-1.r.cloud.int.apple
+*.ap-south-2.r.cloud.int.apple
+*.eu-central-1.r.cloud.int.apple
+*.eu-north-1.r.cloud.int.apple
+*.us-central-1.r.cloud.int.apple
+*.us-central-2.r.cloud.int.apple
+*.us-east-1.r.cloud.int.apple
+*.us-east-2.r.cloud.int.apple
+*.us-west-1.r.cloud.int.apple
+*.us-west-2.r.cloud.int.apple
+*.us-west-3.r.cloud.int.apple
+
 // Appspace : https://www.appspace.com
 // Submitted by Appspace Security Team <security@appspace.com>
 appspacehosted.com
@@ -10925,10 +12379,24 @@ appspaceusercontent.com
 // Submitted by Alexander Hochbaum <admin@appudo.com>
 appudo.net
 
+// Appwrite : https://appwrite.io
+// Submitted by Steven Nguyen <security@appwrite.io>
+appwrite.global
+appwrite.network
+*.appwrite.run
+
 // Aptible : https://www.aptible.com/
 // Submitted by Thomas Orozco <thomas@aptible.com>
 on-aptible.com
 
+// Aquapal : https://aquapal.net/
+// Submitted by Aki Ueno <admin@aquapal.net>
+f5.si
+
+// ArvanCloud EdgeCompute
+// Submitted by ArvanCloud CDN <cdn@arvancloud.ir>
+arvanedge.ir
+
 // ASEINet : https://www.aseinet.com/
 // Submitted by Asei SEKIGUCHI <mail@aseinet.com>
 user.aseinet.ne.jp
@@ -10954,28 +12422,17 @@ myasustor.com
 // Submitted by Sam Smyth <devloop@atlassian.com>
 cdn.prod.atlassian-dev.net
 
-// Authentick UG (haftungsbeschrรคnkt) : https://authentick.net
-// Submitted by Lukas Reschke <lukas@authentick.net>
-translated.page
-
-// Autocode : https://autocode.com
-// Submitted by Jacob Lee <jacob@autocode.com>
-autocode.dev
-
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
+myfritz.link
 myfritz.net
 
-// AVStack Pte. Ltd. : https://avstack.io
-// Submitted by Jasper Hugo <jasper@avstack.io>
-onavstack.net
-
 // AW AdvisorWebsites.com Software Inc : https://advisorwebsites.com
 // Submitted by James Kennedy <domains@advisorwebsites.com>
 *.awdev.ca
 *.advisor.ws
 
-// AZ.pl sp. z.o.o: https://az.pl
+// AZ.pl sp. z.o.o : https://az.pl
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 ecommerce-shop.pl
 
@@ -10983,25 +12440,10 @@ ecommerce-shop.pl
 // Submitted by Olivier Benz <olivier.benz@b-data.ch>
 b-data.io
 
-// backplane : https://www.backplane.io
-// Submitted by Anthony Voutas <anthony@backplane.io>
-backplaneapp.io
-
 // Balena : https://www.balena.io
 // Submitted by Petros Angelatos <petrosagg@balena.io>
 balena-devices.com
 
-// University of Banja Luka : https://unibl.org
-// Domains for Republic of Srpska administrative entity.
-// Submitted by Marko Ivanovic <kormang@hotmail.rs>
-rs.ba
-
-// Banzai Cloud
-// Submitted by Janos Matyas <info@banzaicloud.com>
-*.banzai.cloud
-app.banzaicloud.io
-*.backyards.banzaicloud.io
-
 // BASE, Inc. : https://binc.jp
 // Submitted by Yuya NAGASAWA <public-suffix-list@binc.jp>
 base.ec
@@ -11019,13 +12461,18 @@ base.shop
 // Submitted by Jason Kridner <jkridner@beagleboard.org>
 beagleboard.io
 
-// Beget Ltd
-// Submitted by Lev Nekrasov <lnekrasov@beget.com>
+// Bear Blog : https://bearblog.dev
+// Submitted by Herman Martinus <admin@bearblog.dev>
+bearblog.dev
+
+// Beget LLC : https://beget.com
+// Submitted by Lev Nekrasov & Nikita Radchenko <admin@beget.com>
 *.beget.app
+*.begetcdn.cloud
 
-// BetaInABox
-// Submitted by Adrian <adrian@betainabox.com>
-betainabox.com
+// Besties : https://besties.house
+// Submitted by Hazel Cora <hazy@besties.house>
+pages.gay
 
 // BinaryLane : http://www.binarylane.com
 // Submitted by Nathan O'Sullivan <nathan@mammoth.com.au>
@@ -11043,6 +12490,10 @@ blackbaudcdn.net
 // Submitted by Luke Bratch <luke@bratch.co.uk>
 of.je
 
+// Block, Inc. : https://block.xyz
+// Submitted by Jonathan Boice <security@block.xyz>
+square.site
+
 // Blue Bite, LLC : https://bluebite.com
 // Submitted by Joshua Weiss <admin.engineering@bluebite.com>
 bluebite.io
@@ -11068,14 +12519,39 @@ square7.de
 bplaced.net
 square7.net
 
+// Brave : https://brave.com
+// Submitted by Andrea Brancaleoni <abrancaleoni@brave.com>
+brave.app
+*.s.brave.app
+brave.dev
+*.s.brave.dev
+brave.io
+*.s.brave.io
+
 // Brendly : https://brendly.rs
-// Submitted by Dusan Radovanovic <dusan.radovanovic@brendly.rs>
+// Submitted by Dusan Radovanovic <administracija@brendly.rs>
+shop.brendly.ba
+shop.brendly.hr
 shop.brendly.rs
 
 // BrowserSafetyMark
 // Submitted by Dave Tharp <browsersafetymark.io@quicinc.com>
 browsersafetymark.io
 
+// BRS Media : https://brsmedia.com/
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+radio.am
+radio.fm
+
+// Bubble : https://bubble.io/
+// Submitted by Merlin Zhao <devops@bubble.io>
+cdn.bubble.io
+bubbleapps.io
+
+// bwCloud-OS : https://bwcloud-os.de/
+// Submitted by Klara Mall <dns@bwcloud-os.de>
+*.bwcloud-os-instance.de
+
 // Bytemark Hosting : https://www.bytemark.co.uk
 // Submitted by Paul Cammish <paul.cammish@bytemark.co.uk>
 uk0.bigv.io
@@ -11086,14 +12562,16 @@ vm.bytemark.co.uk
 // Submitted by Antonio Lain <antlai@cafjs.com>
 cafjs.com
 
-// callidomus : https://www.callidomus.com/
-// Submitted by Marcus Popp <admin@callidomus.com>
-mycd.eu
-
 // Canva Pty Ltd : https://canva.com/
 // Submitted by Joel Aquilina <publicsuffixlist@canva.com>
 canva-apps.cn
+my.canvasite.cn
 canva-apps.com
+canva-hosted-embed.com
+canvacode.com
+rice-labs.com
+canva.run
+my.canva.site
 
 // Carrd : https://carrd.co
 // Submitted by AJ <aj@carrd.co>
@@ -11103,89 +12581,53 @@ carrd.co
 crd.co
 ju.mp
 
-// CentralNic : http://www.centralnic.com/names/domains
+// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
+// Submitted by Jamie Tanna <jamie.tanna@digital.cabinet-office.gov.uk>
+api.gov.uk
+
+// CDN77.com : http://www.cdn77.com
+// Submitted by Jan Krpes <jan.krpes@cdn77.com>
+cdn77-storage.com
+rsc.contentproxy9.cz
+r.cdn77.net
+cdn77-ssl.net
+c.cdn77.org
+rsc.cdn77.org
+ssl.origin.cdn77-secure.org
+
+// CentralNic : https://teaminternet.com/
 // Submitted by registry <gavin.brown@centralnic.com>
-ae.org
+za.bz
 br.com
 cn.com
-com.de
-com.se
 de.com
 eu.com
-gb.net
-hu.net
-jp.net
 jpn.com
 mex.com
 ru.com
 sa.com
-se.net
 uk.com
-uk.net
 us.com
-za.bz
 za.com
+com.de
+gb.net
+hu.net
+jp.net
+se.net
+uk.net
+ae.org
+com.se
 
-// No longer operated by CentralNic, these entries should be adopted and/or removed by current operators
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-ar.com
-hu.com
-kr.com
-no.com
-qc.com
-uy.com
-
-// Africa.com Web Solutions Ltd : https://registry.africa.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-africa.com
-
-// iDOT Services Limited : http://www.domain.gr.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-gr.com
-
-// Radix FZC : http://domains.in.net
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-in.net
-web.in
-
-// US REGISTRY LLC : http://us.org
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-us.org
-
-// co.com Registry, LLC : https://registry.co.com
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-co.com
-
-// Roar Domains LLC : https://roar.basketball/
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-aus.basketball
-nz.basketball
-
-// BRS Media : https://brsmedia.com/
-// Submitted by Gavin Brown <gavin.brown@centralnic.com>
-radio.am
-radio.fm
-
-// c.la : http://www.c.la/
-c.la
-
-// certmgr.org : https://certmgr.org
-// Submitted by B. Blechschmidt <hostmaster@certmgr.org>
-certmgr.org
-
-// Cityhost LLC  : https://cityhost.ua
+// Cityhost LLC : https://cityhost.ua
 // Submitted by Maksym Rivtin <support@cityhost.net.ua>
 cx.ua
 
 // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
+// Submitted by Rishabh Nambiar, Michael Brown, Rafael dos Santos Silva <team@discourse.org>
+discourse.diy
 discourse.group
 discourse.team
 
-// Clever Cloud : https://www.clever-cloud.com/
-// Submitted by Quentin Adam <noc@clever-cloud.com>
-cleverapps.io
-
 // Clerk : https://www.clerk.dev
 // Submitted by Colin Sidoti <systems@clerk.dev>
 clerk.app
@@ -11195,15 +12637,50 @@ clerkstage.app
 *.stg.dev
 *.stgstage.dev
 
+// Clever Cloud : https://www.clever-cloud.com/
+// Submitted by Quentin Adam <noc@clever-cloud.com>
+cleverapps.cc
+*.services.clever-cloud.com
+cleverapps.io
+cleverapps.tech
+
 // ClickRising : https://clickrising.com/
 // Submitted by Umut Gumeli <infrastructure-publicsuffixlist@clickrising.com>
 clickrising.net
 
+// Cloud DNS Ltd : http://www.cloudns.net
+// Submitted by Aleksander Hristov <noc@cloudns.net> & Boyan Peychev <boyan@cloudns.net>
+cloudns.asia
+cloudns.be
+cloud-ip.biz
+cloudns.biz
+cloud-ip.cc
+cloudns.cc
+cloudns.ch
+cloudns.cl
+cloudns.club
+abrdns.com
+dnsabr.com
+ip-ddns.com
+cloudns.cx
+cloudns.eu
+cloudns.in
+cloudns.info
+ddns-ip.net
+dns-cloud.net
+dns-dynamic.net
+cloudns.nz
+cloudns.org
+ip-dynamic.org
+cloudns.ph
+cloudns.pro
+cloudns.pw
+cloudns.us
+
 // Cloud66 : https://www.cloud66.com/
 // Submitted by Khash Sajadi <khash@cloud66.com>
 c66.me
 cloud66.ws
-cloud66.zone
 
 // CloudAccess.net : https://www.cloudaccess.net/
 // Submitted by Pawel Panek <noc@cloudaccess.net>
@@ -11213,10 +12690,9 @@ cloudaccess.host
 freesite.host
 cloudaccess.net
 
-// cloudControl : https://www.cloudcontrol.com/
-// Submitted by Tobias Wilken <tw@cloudcontrol.com>
-cloudcontrolled.com
-cloudcontrolapp.com
+// Cloudbees, Inc. : https://www.cloudbees.com/
+// Submitted by Mohideen Shajith <jaas-sre-infra@cloudbees.com>
+cloudbeesusercontent.io
 
 // Cloudera, Inc. : https://www.cloudera.com/
 // Submitted by Kedarnath Waikar <security@cloudera.com>
@@ -11224,67 +12700,83 @@ cloudcontrolapp.com
 
 // Cloudflare, Inc. : https://www.cloudflare.com/
 // Submitted by Cloudflare Team <publicsuffixlist@cloudflare.com>
+cloudflare.app
 cf-ipfs.com
 cloudflare-ipfs.com
 trycloudflare.com
 pages.dev
 r2.dev
 workers.dev
+cloudflare.net
+cdn.cloudflare.net
+cdn.cloudflareanycast.net
+cdn.cloudflarecn.net
+cdn.cloudflareglobal.net
+
+// cloudscale.ch AG : https://www.cloudscale.ch/
+// Submitted by Gaudenz Steinlin <support@cloudscale.ch>
+cust.cloudscale.ch
+objects.lpg.cloudscale.ch
+objects.rma.cloudscale.ch
+lpg.objectstorage.ch
+rma.objectstorage.ch
 
 // Clovyr : https://clovyr.io
 // Submitted by Patrick Nielsen <patrick@clovyr.io>
 wnext.app
 
-// co.ca : http://registry.co.ca/
-co.ca
+// CNPY : https://cnpy.gdn
+// Submitted by Angelo Gladding <angelo@lahacker.net>
+cnpy.gdn
 
 // Co & Co : https://co-co.nl/
 // Submitted by Govert Versluis <govert@co-co.nl>
 *.otap.co
 
-// i-registry s.r.o. : http://www.i-registry.cz/
-// Submitted by Martin Semrad <semrad@i-registry.cz>
-co.cz
+// co.ca : http://registry.co.ca/
+co.ca
 
-// CDN77.com : http://www.cdn77.com
-// Submitted by Jan Krpes <jan.krpes@cdn77.com>
-c.cdn77.org
-cdn77-ssl.net
-r.cdn77.net
-rsc.cdn77.org
-ssl.origin.cdn77-secure.org
-
-// Cloud DNS Ltd : http://www.cloudns.net
-// Submitted by Aleksander Hristov <noc@cloudns.net>
-cloudns.asia
-cloudns.biz
-cloudns.club
-cloudns.cc
-cloudns.eu
-cloudns.in
-cloudns.info
-cloudns.org
-cloudns.pro
-cloudns.pw
-cloudns.us
-
-// CNPY : https://cnpy.gdn
-// Submitted by Angelo Gladding <angelo@lahacker.net>
-cnpy.gdn
+// co.com Registry, LLC : https://registry.co.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+co.com
 
 // Codeberg e. V. : https://codeberg.org
 // Submitted by Moritz Marquardt <git@momar.de>
 codeberg.page
 
+// CodeSandbox B.V. : https://codesandbox.io
+// Submitted by Ives van Hoorne <abuse@codesandbox.io>
+csb.app
+preview.csb.app
+
 // CoDNS B.V.
 co.nl
 co.no
 
+// Cognition AI, Inc. : https://cognition.ai
+// Submitted by Philip Papurt <domains@cognition.ai>
+*.devinapps.com
+
 // Combell.com : https://www.combell.com
-// Submitted by Thomas Wouters <thomas.wouters@combellgroup.com>
+// Submitted by Combell Team <support@combell.com>
 webhosting.be
+prvw.eu
 hosting-cluster.nl
 
+// Contentful GmbH : https://www.contentful.com
+// Submitted by Contentful Developer Experience Team <prd-ecosystem-dx@contentful.com>
+ctfcloud.net
+
+// Convex : https://convex.dev/
+// Submitted by James Cowling <security@convex.dev>
+convex.app
+convex.cloud
+eu-west-1.convex.cloud
+us-east-1.convex.cloud
+convex.site
+eu-west-1.convex.site
+us-east-1.convex.site
+
 // Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
 // Submitted by George Georgievsky <gug@cctld.ru>
 ac.ru
@@ -11292,13 +12784,16 @@ edu.ru
 gov.ru
 int.ru
 mil.ru
-test.ru
+
+// CoreSpeed, Inc. : https://corespeed.io
+// Submitted by CoreSpeed Team <ops@corespeed.io>
+corespeed.app
 
 // COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
-dynamisches-dns.de
 dnsupdater.de
+dynamisches-dns.de
 internet-dns.de
 l-o-g-i-n.de
 dynamic-dns.info
@@ -11306,55 +12801,31 @@ feste-ip.net
 knx-server.net
 static-access.net
 
+// Craft Docs Ltd : https://www.craft.do/
+// Submitted by Zsombor Fuszenecker <security@craft.do>
+craft.me
+
 // Craynic, s.r.o. : http://www.craynic.com/
 // Submitted by Ales Krajnik <ales.krajnik@craynic.com>
 realm.cz
 
+// Crisp IM SAS : https://crisp.chat/
+// Submitted by Baptiste Jamin <hostmaster@crisp.chat>
+on.crisp.email
+
 // Cryptonomic : https://cryptonomic.net/
 // Submitted by Andrew Cady <public-suffix-list@cryptonomic.net>
 *.cryptonomic.net
 
-// Cupcake : https://cupcake.io/
-// Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
-cupcake.is
-
-// Curv UG : https://curv-labs.de/
-// Submitted by Marvin Wiesner <Marvin@curv-labs.de>
-curv.dev
-
-// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/
-// Submitted by Gregory Drake <support@dyn.com>
-// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
-*.customer-oci.com
-*.oci.customer-oci.com
-*.ocp.customer-oci.com
-*.ocs.customer-oci.com
+// cyber_Folks S.A. : https://cyberfolks.pl
+// Submitted by Bartlomiej Kida <security@cyberfolks.pl>
+cfolks.pl
 
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
 cyon.site
 
-// Danger Science Group: https://dangerscience.com/
-// Submitted by Skylar MacDonald <skylar@dangerscience.com>
-fnwk.site
-folionetwork.site
-platform0.app
-
-// Daplie, Inc : https://daplie.com
-// Submitted by AJ ONeal <aj@daplie.com>
-daplie.me
-localhost.daplie.me
-
-// Datto, Inc. : https://www.datto.com/
-// Submitted by Philipp Heckel <ph@datto.com>
-dattolocal.com
-dattorelay.com
-dattoweb.com
-mydatto.com
-dattolocal.net
-mydatto.net
-
 // Dansk.net : http://www.dansk.net/
 // Submitted by Anani Voule <digital@digital.co.dk>
 biz.dk
@@ -11367,14 +12838,10 @@ store.dk
 // Submitted by Abel Boldu / DAppNode Team <community@dappnode.io>
 dyndns.dappnode.io
 
-// dapps.earth : https://dapps.earth/
-// Submitted by Daniil Burdakov <icqkill@gmail.com>
-*.dapps.earth
-*.bzz.dapps.earth
-
 // Dark, Inc. : https://darklang.com
 // Submitted by Paul Biggar <ops@darklang.com>
 builtwithdark.com
+darklang.io
 
 // DataDetect, LLC. : https://datadetect.com
 // Submitted by Andrew Banchich <abanchich@sceven.com>
@@ -11385,42 +12852,117 @@ instance.datadetect.com
 // Submitted by Richard Li <secalert@datawire.io>
 edgestack.me
 
-// DDNS5 : https://ddns5.com
-// Submitted by Cameron Elliott <cameron@cameronelliott.com>
-ddns5.com
+// Datto, Inc. : https://www.datto.com/
+// Submitted by Philipp Heckel <ph@datto.com>
+dattolocal.com
+dattorelay.com
+dattoweb.com
+mydatto.com
+dattolocal.net
+mydatto.net
+
+// ddnss.de : https://www.ddnss.de/
+// Submitted by Robert Niedziela <webmaster@ddnss.de>
+ddnss.de
+dyn.ddnss.de
+dyndns.ddnss.de
+dyn-ip24.de
+dyndns1.de
+home-webserver.de
+dyn.home-webserver.de
+myhome-server.de
+ddnss.org
 
 // Debian : https://www.debian.org/
 // Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
 debian.net
 
+// Definima : http://www.definima.com/
+// Submitted by Maxence Bitterli <maxence@definima.com>
+definima.io
+definima.net
+
 // Deno Land Inc : https://deno.com/
 // Submitted by Luca Casonato <hostmaster@deno.com>
 deno.dev
 deno-staging.dev
+deno.net
+sandbox.deno.net
 
 // deSEC : https://desec.io/
 // Submitted by Peter Thomassen <peter@desec.io>
 dedyn.io
 
-// Deta: https://www.deta.sh/
+// Deta : https://www.deta.sh/
 // Submitted by Aavash Shrestha <aavash@deta.sh>
 deta.app
 deta.dev
 
-// Diher Solutions : https://diher.solutions
-// Submitted by Didi Hermawan <mail@diher.solutions>
-*.rss.my.id
-*.diher.solutions
+// Deuxfleurs : https://deuxfleurs.fr
+// Submitted by Aeddis Desauw <ca@deuxfleurs.fr>
+deuxfleurs.eu
+deuxfleurs.page
+
+// Developed Methods LLC : https://methods.dev
+// Submitted by Patrick Lorio <security@playit.gg>
+*.at.ply.gg
+d6.ply.gg
+joinmc.link
+playit.plus
+*.at.playit.plus
+with.playit.plus
+
+// Dfinity Foundation: https://dfinity.org/
+// Submitted by Dfinity Team <domains@dfinity.org>
+icp0.io
+*.raw.icp0.io
+icp1.io
+*.raw.icp1.io
+*.icp.net
+caffeine.site
+caffeine.xyz
+
+// dhosting.pl Sp. z o.o. : https://dhosting.pl/
+// Submitted by Szczepan Redzioch <bok@dhosting.pl>
+mybox.company
+intouch.email
+mybox.me
+mybox.page
+dfirma.pl
+dkonto.pl
+you2.pl
+
+// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
+// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
+ondigitalocean.app
+
+// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
+// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
+*.digitaloceanspaces.com
+
+// DigitalPlat : https://www.digitalplat.org/
+// Submitted by Edward Hsing <contact@digitalplat.org>
+qzz.io
+us.kg
+xx.kg
+dpdns.org
 
 // Discord Inc : https://discord.com
 // Submitted by Sahn Lam <slam@discordapp.com>
 discordsays.com
 discordsez.com
 
-// DNS Africa Ltd https://dns.business
+// DNS Africa Ltd : https://dns.business
 // Submitted by Calvin Browne <calvin@dns.business>
 jozi.biz
 
+// DNSHE : https://www.dnshe.com
+// Submitted by DNSHE Team <support@dnshe.com>
+ccwu.cc
+cc.cd
+us.ci
+de5.net
+
 // DNShome : https://www.dnshome.de/
 // Submitted by Norbert Auler <mail@dnshome.de>
 dnshome.de
@@ -11430,6 +12972,12 @@ dnshome.de
 online.th
 shop.th
 
+// dotScot Domains : https://domains.scot/
+// Submitted by DNS Team <dns@domains.scot>
+co.scot
+me.scot
+org.scot
+
 // DrayTek Corp. : https://www.draytek.com/
 // Submitted by Paul Fang <mis@draytek.com>
 drayddns.com
@@ -11442,32 +12990,40 @@ shoparena.pl
 // Submitted by Andrew Farmer <andrew.farmer@dreamhost.com>
 dreamhosters.com
 
-// Drobo : http://www.drobo.com/
-// Submitted by Ricardo Padilha <rpadilha@drobo.com>
-mydrobo.com
-
-// Drud Holdings, LLC. : https://www.drud.com/
-// Submitted by Kevin Bridges <kevin@drud.com>
-drud.io
-drud.us
+// Dreamyoungs, Inc. : https://durumis.com
+// Submitted by Infra Team <infra@durumis.com>
+durumis.com
 
 // DuckDNS : http://www.duckdns.org/
 // Submitted by Richard Harper <richard@duckdns.org>
 duckdns.org
 
-// Bip : https://bip.sh
-// Submitted by Joel Kennedy <joel@bip.sh>
-bip.sh
-
-// bitbridge.net : Submitted by Craig Welch, abeliidev@gmail.com
-bitbridge.net
-
 // dy.fi : http://dy.fi/
 // Submitted by Heikki Hannikainen <hessu@hes.iki.fi>
 dy.fi
 tunk.org
 
 // DynDNS.com : http://www.dyndns.com/services/dns/dyndns/
+dyndns.biz
+for-better.biz
+for-more.biz
+for-some.biz
+for-the.biz
+selfip.biz
+webhop.biz
+ftpaccess.cc
+game-server.cc
+myphotos.cc
+scrapping.cc
+blogdns.com
+cechire.com
+dnsalias.com
+dnsdojo.com
+doesntexist.com
+dontexist.com
+doomdns.com
+dyn-o-saur.com
+dynalias.com
 dyndns-at-home.com
 dyndns-at-work.com
 dyndns-blog.com
@@ -11482,64 +13038,14 @@ dyndns-server.com
 dyndns-web.com
 dyndns-wiki.com
 dyndns-work.com
-dyndns.biz
-dyndns.info
-dyndns.org
-dyndns.tv
-at-band-camp.net
-ath.cx
-barrel-of-knowledge.info
-barrell-of-knowledge.info
-better-than.tv
-blogdns.com
-blogdns.net
-blogdns.org
-blogsite.org
-boldlygoingnowhere.org
-broke-it.net
-buyshouses.net
-cechire.com
-dnsalias.com
-dnsalias.net
-dnsalias.org
-dnsdojo.com
-dnsdojo.net
-dnsdojo.org
-does-it.net
-doesntexist.com
-doesntexist.org
-dontexist.com
-dontexist.net
-dontexist.org
-doomdns.com
-doomdns.org
-dvrdns.org
-dyn-o-saur.com
-dynalias.com
-dynalias.net
-dynalias.org
-dynathome.net
-dyndns.ws
-endofinternet.net
-endofinternet.org
-endoftheinternet.org
 est-a-la-maison.com
 est-a-la-masion.com
 est-le-patron.com
 est-mon-blogueur.com
-for-better.biz
-for-more.biz
-for-our.info
-for-some.biz
-for-the.biz
-forgot.her.name
-forgot.his.name
 from-ak.com
 from-al.com
 from-ar.com
-from-az.net
 from-ca.com
-from-co.net
 from-ct.com
 from-dc.com
 from-de.com
@@ -11552,10 +13058,8 @@ from-il.com
 from-in.com
 from-ks.com
 from-ky.com
-from-la.net
 from-ma.com
 from-md.com
-from-me.org
 from-mi.com
 from-mn.com
 from-mo.com
@@ -11568,7 +13072,6 @@ from-nh.com
 from-nj.com
 from-nm.com
 from-nv.com
-from-ny.net
 from-oh.com
 from-ok.com
 from-or.com
@@ -11586,45 +13089,18 @@ from-wa.com
 from-wi.com
 from-wv.com
 from-wy.com
-ftpaccess.cc
-fuettertdasnetz.de
-game-host.org
-game-server.cc
 getmyip.com
-gets-it.net
-go.dyndns.org
 gotdns.com
-gotdns.org
-groks-the.info
-groks-this.info
-ham-radio-op.net
-here-for-more.info
 hobby-site.com
-hobby-site.org
-home.dyndns.org
-homedns.org
-homeftp.net
-homeftp.org
-homeip.net
 homelinux.com
-homelinux.net
-homelinux.org
 homeunix.com
-homeunix.net
-homeunix.org
 iamallama.com
-in-the-band.net
 is-a-anarchist.com
 is-a-blogger.com
 is-a-bookkeeper.com
-is-a-bruinsfan.org
 is-a-bulls-fan.com
-is-a-candidate.org
 is-a-caterer.com
-is-a-celticsfan.org
 is-a-chef.com
-is-a-chef.net
-is-a-chef.org
 is-a-conservative.com
 is-a-cpa.com
 is-a-cubicle-slave.com
@@ -11633,31 +13109,25 @@ is-a-designer.com
 is-a-doctor.com
 is-a-financialadvisor.com
 is-a-geek.com
-is-a-geek.net
-is-a-geek.org
 is-a-green.com
 is-a-guru.com
 is-a-hard-worker.com
 is-a-hunter.com
-is-a-knight.org
 is-a-landscaper.com
 is-a-lawyer.com
 is-a-liberal.com
 is-a-libertarian.com
-is-a-linux-user.org
 is-a-llama.com
 is-a-musician.com
 is-a-nascarfan.com
 is-a-nurse.com
 is-a-painter.com
-is-a-patsfan.org
 is-a-personaltrainer.com
 is-a-photographer.com
 is-a-player.com
 is-a-republican.com
 is-a-rockstar.com
 is-a-socialist.com
-is-a-soxfan.org
 is-a-student.com
 is-a-teacher.com
 is-a-techie.com
@@ -11669,133 +13139,181 @@ is-an-anarchist.com
 is-an-artist.com
 is-an-engineer.com
 is-an-entertainer.com
-is-by.us
 is-certified.com
-is-found.org
 is-gone.com
 is-into-anime.com
 is-into-cars.com
 is-into-cartoons.com
 is-into-games.com
 is-leet.com
-is-lost.org
 is-not-certified.com
-is-saved.org
 is-slick.com
 is-uberleet.com
-is-very-bad.org
-is-very-evil.org
-is-very-good.org
-is-very-nice.org
-is-very-sweet.org
 is-with-theband.com
 isa-geek.com
-isa-geek.net
-isa-geek.org
 isa-hockeynut.com
 issmarterthanyou.com
-isteingeek.de
-istmein.de
-kicks-ass.net
-kicks-ass.org
-knowsitall.info
-land-4-sale.us
-lebtimnetz.de
-leitungsen.de
 likes-pie.com
 likescandy.com
-merseine.nu
-mine.nu
-misconfused.org
-mypets.ws
-myphotos.cc
 neat-url.com
-office-on-the.net
-on-the-web.tv
-podzone.net
-podzone.org
-readmyblog.org
 saves-the-whales.com
-scrapper-site.net
-scrapping.cc
-selfip.biz
 selfip.com
-selfip.info
-selfip.net
-selfip.org
 sells-for-less.com
 sells-for-u.com
-sells-it.net
-sellsyourhome.org
 servebbs.com
-servebbs.net
-servebbs.org
-serveftp.net
-serveftp.org
-servegame.org
-shacknet.nu
 simple-url.com
 space-to-rent.com
-stuff-4-sale.org
-stuff-4-sale.us
 teaches-yoga.com
-thruhere.net
-traeumtgerade.de
-webhop.biz
-webhop.info
-webhop.net
-webhop.org
-worse-than.tv
 writesthisblog.com
-
-// ddnss.de : https://www.ddnss.de/
-// Submitted by Robert Niedziela <webmaster@ddnss.de>
-ddnss.de
-dyn.ddnss.de
-dyndns.ddnss.de
-dyndns1.de
-dyn-ip24.de
-home-webserver.de
-dyn.home-webserver.de
-myhome-server.de
-ddnss.org
-
-// Definima : http://www.definima.com/
-// Submitted by Maxence Bitterli <maxence@definima.com>
-definima.net
-definima.io
-
-// DigitalOcean App Platform : https://www.digitalocean.com/products/app-platform/
-// Submitted by Braxton Huggins <psl-maintainers@digitalocean.com>
-ondigitalocean.app
-
-// DigitalOcean Spaces : https://www.digitalocean.com/products/spaces/
-// Submitted by Robin H. Johnson <psl-maintainers@digitalocean.com>
-*.digitaloceanspaces.com
-
-// dnstrace.pro : https://dnstrace.pro/
-// Submitted by Chris Partridge <chris@partridge.tech>
-bci.dnstrace.pro
+ath.cx
+fuettertdasnetz.de
+isteingeek.de
+istmein.de
+lebtimnetz.de
+leitungsen.de
+traeumtgerade.de
+barrel-of-knowledge.info
+barrell-of-knowledge.info
+dyndns.info
+for-our.info
+groks-the.info
+groks-this.info
+here-for-more.info
+knowsitall.info
+selfip.info
+webhop.info
+forgot.her.name
+forgot.his.name
+at-band-camp.net
+blogdns.net
+broke-it.net
+buyshouses.net
+dnsalias.net
+dnsdojo.net
+does-it.net
+dontexist.net
+dynalias.net
+dynathome.net
+endofinternet.net
+from-az.net
+from-co.net
+from-la.net
+from-ny.net
+gets-it.net
+ham-radio-op.net
+homeftp.net
+homeip.net
+homelinux.net
+homeunix.net
+in-the-band.net
+is-a-chef.net
+is-a-geek.net
+isa-geek.net
+kicks-ass.net
+office-on-the.net
+podzone.net
+scrapper-site.net
+selfip.net
+sells-it.net
+servebbs.net
+serveftp.net
+thruhere.net
+webhop.net
+merseine.nu
+mine.nu
+shacknet.nu
+blogdns.org
+blogsite.org
+boldlygoingnowhere.org
+dnsalias.org
+dnsdojo.org
+doesntexist.org
+dontexist.org
+doomdns.org
+dvrdns.org
+dynalias.org
+dyndns.org
+go.dyndns.org
+home.dyndns.org
+endofinternet.org
+endoftheinternet.org
+from-me.org
+game-host.org
+gotdns.org
+hobby-site.org
+homedns.org
+homeftp.org
+homelinux.org
+homeunix.org
+is-a-bruinsfan.org
+is-a-candidate.org
+is-a-celticsfan.org
+is-a-chef.org
+is-a-geek.org
+is-a-knight.org
+is-a-linux-user.org
+is-a-patsfan.org
+is-a-soxfan.org
+is-found.org
+is-lost.org
+is-saved.org
+is-very-bad.org
+is-very-evil.org
+is-very-good.org
+is-very-nice.org
+is-very-sweet.org
+isa-geek.org
+kicks-ass.org
+misconfused.org
+podzone.org
+readmyblog.org
+selfip.org
+sellsyourhome.org
+servebbs.org
+serveftp.org
+servegame.org
+stuff-4-sale.org
+webhop.org
+better-than.tv
+dyndns.tv
+on-the-web.tv
+worse-than.tv
+is-by.us
+land-4-sale.us
+stuff-4-sale.us
+dyndns.ws
+mypets.ws
 
 // Dynu.com : https://www.dynu.com/
-// Submitted by Sue Ye <sue@dynu.com>
+// Submitted by Sue Ye <psl-contact@dynu.com>
+1cooldns.com
+bumbleshrimp.com
 ddnsfree.com
 ddnsgeek.com
+ddnsguru.com
+dynuddns.com
+dynuhosting.com
 giize.com
 gleeze.com
 kozow.com
 loseyourip.com
 ooguy.com
+pivohosting.com
 theworkpc.com
+wiredbladehosting.com
 casacam.net
 dynu.net
+dynuddns.net
+mysynology.net
+opik.net
+spryt.net
 accesscam.org
 camdvr.org
 freeddns.org
 mywire.org
+roxa.org
 webredirect.org
 myddns.rocks
-blogsite.xyz
 
 // dynv6 : https://dynv6.com
 // Submitted by Dominik Menke <dom@digineo.de>
@@ -11810,35 +13328,56 @@ e4.cz
 easypanel.app
 easypanel.host
 
+// EasyWP : https://www.easywp.com
+// Submitted by <infracloudteam@namecheap.com>
+*.ewp.live
+
+// eDirect Corp. : https://hosting.url.com.tw/
+// Submitted by C.S. chang <cschang@corp.url.com.tw>
+twmail.cc
+twmail.net
+twmail.org
+mymailer.com.tw
+url.tw
+
+// Electromagnetic Field : https://www.emfcamp.org
+// Submitted by <noc@emfcamp.org>
+at.emf.camp
+
+// Elefunc, Inc. : https://elefunc.com
+// Submitted by Cetin Sert <domains@elefunc.com>
+rt.ht
+
 // Elementor : Elementor Ltd.
 // Submitted by Anton Barkan <antonb@elementor.com>
 elementor.cloud
 elementor.cool
 
-// En rootโ€ฝ : https://en-root.org
-// Submitted by Emmanuel Raviart <emmanuel@raviart.com>
-en-root.fr
+// Emergent : https://emergent.sh
+// Submitted by Emergent Security Team <security@emergent.sh>
+emergent.cloud
+preview.emergentagent.com
+emergent.host
 
-// Enalean SAS: https://www.enalean.com
-// Submitted by Thomas Cottier <thomas.cottier@enalean.com>
+// Enalean SAS : https://www.enalean.com
+// Submitted by Enalean Security Team <security@enalean.com>
 mytuleap.com
 tuleap-partners.com
 
-// Encoretivity AB: https://encore.dev
-// Submitted by Andrรฉ Eriksson <andre@encore.dev>
+// Encoretivity AB : https://encore.cloud
+// Submitted by Andrรฉ Eriksson <security@encore.cloud>
 encr.app
+frontend.encr.app
 encoreapi.com
-
-// ECG Robotics, Inc: https://ecgrobotics.org
-// Submitted by <frc1533@ecgrobotics.org>
-onred.one
-staging.onred.one
+lp.dev
+api.lp.dev
+objects.lp.dev
 
 // encoway GmbH : https://www.encoway.de
 // Submitted by Marcel Daus <cloudops@encoway.de>
 eu.encoway.cloud
 
-// EU.org https://eu.org/
+// EU.org : https://eu.org/
 // Submitted by Pierre Beyssac <hostmaster@eu.org>
 eu.org
 al.eu.org
@@ -11874,7 +13413,6 @@ kr.eu.org
 lt.eu.org
 lu.eu.org
 lv.eu.org
-mc.eu.org
 me.eu.org
 mk.eu.org
 mt.eu.org
@@ -11884,10 +13422,8 @@ ng.eu.org
 nl.eu.org
 no.eu.org
 nz.eu.org
-paris.eu.org
 pl.eu.org
 pt.eu.org
-q-a.eu.org
 ro.eu.org
 ru.eu.org
 se.eu.org
@@ -11912,22 +13448,20 @@ us-2.evennode.com
 us-3.evennode.com
 us-4.evennode.com
 
-// eDirect Corp. : https://hosting.url.com.tw/
-// Submitted by C.S. chang <cschang@corp.url.com.tw>
-twmail.cc
-twmail.net
-twmail.org
-mymailer.com.tw
-url.tw
+// Evervault : https://evervault.com
+// Submitted by Hannah Neary <engineering@evervault.com>
+relay.evervault.app
+relay.evervault.dev
+
+// Expo : https://expo.dev/
+// Submitted by James Ide <psl@expo.dev>
+expo.app
+staging.expo.app
 
 // Fabrica Technologies, Inc. : https://www.fabrica.dev/
 // Submitted by Eric Jiang <eric@fabrica.dev>
 onfabrica.com
 
-// Facebook, Inc.
-// Submitted by Peter Ruibal <public-suffix@fb.com>
-apps.fbsbx.com
-
 // FAITID : https://faitid.org/
 // Submitted by Maxim Alzoba <tech.contact@faitid.org>
 // https://www.flexireg.net/stat_info
@@ -12014,8 +13548,6 @@ u.channelsdvr.net
 edgecompute.app
 fastly-edge.com
 fastly-terrarium.com
-fastlylb.net
-map.fastlylb.net
 freetls.fastly.net
 map.fastly.net
 a.prod.fastly.net
@@ -12023,6 +13555,8 @@ global.prod.fastly.net
 a.ssl.fastly.net
 b.ssl.fastly.net
 global.ssl.fastly.net
+fastlylb.net
+map.fastlylb.net
 
 // Fastmail : https://www.fastmail.com/
 // Submitted by Marc Bradshaw <marc@fastmailteam.com>
@@ -12036,72 +13570,66 @@ myfast.host
 fastvps.site
 myfast.space
 
+// FearWorks Media Ltd. : https://fearworksmedia.co.uk
+// Submitted by Keith Fairley <domains@fearworksmedia.co.uk>
+conn.uk
+copro.uk
+hosp.uk
+
 // Fedora : https://fedoraproject.org/
-// submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
+// Submitted by Patrick Uiterwijk <puiterwijk@fedoraproject.org>
 fedorainfracloud.org
 fedorapeople.org
 cloud.fedoraproject.org
 app.os.fedoraproject.org
 app.os.stg.fedoraproject.org
 
-// FearWorks Media Ltd. : https://fearworksmedia.co.uk
-// submitted by Keith Fairley <domains@fearworksmedia.co.uk>
-conn.uk
-copro.uk
-hosp.uk
-
 // Fermax : https://fermax.com/
-// submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
+// Submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
 mydobiss.com
 
 // FH Muenster : https://www.fh-muenster.de
 // Submitted by Robin Naundorf <r.naundorf@fh-muenster.de>
 fh-muenster.io
 
+// Figma : https://www.figma.com
+// Submitted by Nick Frost <psl@figma.com>
+figma.site
+figma-gov.site
+preview.site
+
 // Filegear Inc. : https://www.filegear.com
 // Submitted by Jason Zhu <jason@owtware.com>
 filegear.me
-filegear-au.me
-filegear-de.me
-filegear-gb.me
-filegear-ie.me
-filegear-jp.me
-filegear-sg.me
 
 // Firebase, Inc.
 // Submitted by Chris Raynor <chris@firebase.com>
 firebaseapp.com
 
-// Firewebkit : https://www.firewebkit.com
-// Submitted by Majid Qureshi <mqureshi@amrayn.com>
-fireweb.app
-
-// FLAP : https://www.flap.cloud
-// Submitted by Louis Chemineau <louis@chmn.me>
-flap.id
-
 // FlashDrive : https://flashdrive.io
 // Submitted by Eric Chan <support@flashdrive.io>
-onflashdrive.app
 fldrv.com
 
-// fly.io: https://fly.io
-// Submitted by Kurt Mackey <kurt@fly.io>
-fly.dev
-edgeapp.net
-shw.io
+// Fleek Labs Inc : https://fleek.xyz
+// Submitted by Parsa Ghadimi <dev@fleek.xyz>
+on-fleek.app
 
-// Flynn : https://flynn.io
-// Submitted by Jonathan Rudenberg <jonathan@flynn.io>
-flynnhosting.net
+// FlutterFlow : https://flutterflow.io
+// Submitted by Anton Emelyanov <anton@flutterflow.io>
+flutterflow.app
 
-// Forgerock :ย https://www.forgerock.com
-// Submitted by Roderick Parr <roderick.parr@forgerock.com>
-forgeblocks.com
-id.forgerock.io
+// fly.io : https://fly.io
+// Submitted by Kurt Mackey <ops@fly.io>
+sprites.app
+fly.dev
+
+// FoundryLabs, Inc : https://e2b.dev/
+// Submitted by Jiri Sveceny <security@e2b.dev>
+e2b.app
 
 // Framer : https://www.framer.com
-// Submitted by Koen Rouwhorst <koenrh@framer.com>
+// Submitted by Koen Rouwhorst <security@framer.com>
+framer.ai
 framer.app
 framercanvas.com
 framer.media
@@ -12109,17 +13637,9 @@ framer.photos
 framer.website
 framer.wiki
 
-// Frusky MEDIA&PR : https://www.frusky.de
-// Submitted by Victor Pupynin <hallo@frusky.de>
-*.frusky.de
-
-// RavPage : https://www.ravpage.co.il
-// Submitted by Roni Horowitz <roni@responder.co.il>
-ravpage.co.il
-
-// Frederik Braun https://frederik-braun.com
+// Frederik Braun : https://frederik-braun.com
 // Submitted by Frederik Braun <fb@frederik-braun.com>
-0e.vc
+*.0e.vc
 
 // Freebox : http://www.freebox.fr
 // Submitted by Romain Fliedel <rfliedel@freebox.fr>
@@ -12138,11 +13658,33 @@ freedesktop.org
 // Submitted by Cadence <contact@freemyip.com>
 freemyip.com
 
+// Frusky MEDIA&PR : https://www.frusky.de
+// Submitted by Victor Pupynin <hallo@frusky.de>
+*.frusky.de
+
 // FunkFeuer - Verein zur Fรถrderung freier Netze : https://www.funkfeuer.at
 // Submitted by Daniel A. Maierhofer <vorstand@funkfeuer.at>
 wien.funkfeuer.at
 
-// Futureweb OG : http://www.futureweb.at
+// Future Versatile Group. : https://www.fvg-on.net/
+// T.Kabu <webmaster@fvg-on.net>
+daemon.asia
+dix.asia
+mydns.bz
+0am.jp
+0g0.jp
+0j0.jp
+0t0.jp
+mydns.jp
+pgw.jp
+wjg.jp
+keyword-on.net
+live-on.net
+server-on.net
+mydns.tw
+mydns.vc
+
+// Futureweb GmbH : https://www.futureweb.at
 // Submitted by Andreas Schnederle-Wagner <schnederle@futureweb.at>
 *.futurecms.at
 *.ex.futurecms.at
@@ -12153,8 +13695,19 @@ futuremailing.at
 *.kunden.ortsinfo.at
 *.statics.cloud
 
+// Gadget Software Inc. : https://gadget.dev
+// Submitted by Harry Brundage <security@gadget.dev>
+gadget.app
+gadget.host
+
+// GCom Internet : https://www.gcom.net.au
+// Submitted by Leo Julius <support@gcom.net.au>
+aliases121.com
+
 // GDS : https://www.gov.uk/service-manual/technology/managing-domain-names
 // Submitted by Stephen Ford <hostmaster@digital.cabinet-office.gov.uk>
+campaign.gov.uk
+service.gov.uk
 independent-commission.uk
 independent-inquest.uk
 independent-inquiry.uk
@@ -12162,12 +13715,6 @@ independent-panel.uk
 independent-review.uk
 public-inquiry.uk
 royal-commission.uk
-campaign.gov.uk
-service.gov.uk
-
-// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
-// Submitted by Jamie Tanna <jamie.tanna@digital.cabinet-office.gov.uk>
-api.gov.uk
 
 // Gehirn Inc. : https://www.gehirn.co.jp/
 // Submitted by Kohei YOSHIDA <tech@gehirn.co.jp>
@@ -12178,36 +13725,32 @@ usercontent.jp
 // Submitted by Tom Klein <tom@gentlent.com>
 gentapps.com
 gentlentapis.com
-lab.ms
 cdn-edges.net
 
-// Ghost Foundation : https://ghost.org
-// Submitted by Matt Hanley <security@ghost.org>
-ghost.io
-
-// GignoSystemJapan: http://gsj.bz
+// GignoSystemJapan : http://gsj.bz
 // Submitted by GignoSystemJapan <kakutou-ec@gsj.bz>
 gsj.bz
 
+// GitBook Inc. : https://www.gitbook.com/
+// Submitted by Samy Pesse <devs@gitbook.com>
+gitbook.io
+
 // GitHub, Inc.
 // Submitted by Patrick Toomey <security@github.com>
+github.app
 githubusercontent.com
 githubpreview.dev
 github.io
 
-// GitLab, Inc.
+// GitLab, Inc. : https://about.gitlab.com/
 // Submitted by Alex Hanselka <alex@gitlab.com>
 gitlab.io
 
-// Gitplac.si - https://gitplac.si
+// Gitplac.si : https://gitplac.si
 // Submitted by Aljaลพ Starc <me@aljaxus.eu>
 gitapp.si
 gitpage.si
 
-// Glitch, Inc : https://glitch.com
-// Submitted by Mads Hartmann <mads@glitch.com>
-glitch.me
-
 // Global NOG Alliance : https://nogalliance.org/
 // Submitted by Sander Steffann <sander@nogalliance.org>
 nog.community
@@ -12327,40 +13870,28 @@ whitesnow.jp
 zombie.jp
 heteml.net
 
-// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
-// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
-cloudapps.digital
-london.cloudapps.digital
-
-// GOV.UK Pay : https://www.payments.service.gov.uk/
-// Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
-pymnt.uk
-
-// UKHomeOffice : https://www.gov.uk/government/organisations/home-office
-// Submitted by Jon Shanks <jon.shanks@digital.homeoffice.gov.uk>
-homeoffice.gov.uk
-
-// GlobeHosting, Inc.
-// Submitted by Zoltan Egresi <egresi@globehosting.com>
-ro.im
+// GoDaddy Registry : https://registry.godaddy
+// Submitted by Rohan Durrant <tldns@registry.godaddy>
+graphic.design
 
 // GoIP DNS Services : http://www.goip.de
 // Submitted by Christian Poulter <milchstrasse@goip.de>
 goip.de
 
 // Google, Inc.
-// Submitted by Eduardo Vela <evn@google.com>
-run.app
-a.run.app
+// Submitted by Shannon McCabe <public-suffix-editors@google.com>
+*.hosted.app
+*.run.app
+*.mtls.run.app
 web.app
 *.0emm.com
 appspot.com
 *.r.appspot.com
+blogspot.com
 codespot.com
 googleapis.com
 googlecode.com
 pagespeedmobilizer.com
-publishproxy.com
 withgoogle.com
 withyoutube.com
 *.gateway.dev
@@ -12368,110 +13899,52 @@ cloud.goog
 translate.goog
 *.usercontent.goog
 cloudfunctions.net
-blogspot.ae
-blogspot.al
-blogspot.am
-blogspot.ba
-blogspot.be
-blogspot.bg
-blogspot.bj
-blogspot.ca
-blogspot.cf
-blogspot.ch
-blogspot.cl
-blogspot.co.at
-blogspot.co.id
-blogspot.co.il
-blogspot.co.ke
-blogspot.co.nz
-blogspot.co.uk
-blogspot.co.za
-blogspot.com
-blogspot.com.ar
-blogspot.com.au
-blogspot.com.br
-blogspot.com.by
-blogspot.com.co
-blogspot.com.cy
-blogspot.com.ee
-blogspot.com.eg
-blogspot.com.es
-blogspot.com.mt
-blogspot.com.ng
-blogspot.com.tr
-blogspot.com.uy
-blogspot.cv
-blogspot.cz
-blogspot.de
-blogspot.dk
-blogspot.fi
-blogspot.fr
-blogspot.gr
-blogspot.hk
-blogspot.hr
-blogspot.hu
-blogspot.ie
-blogspot.in
-blogspot.is
-blogspot.it
-blogspot.jp
-blogspot.kr
-blogspot.li
-blogspot.lt
-blogspot.lu
-blogspot.md
-blogspot.mk
-blogspot.mr
-blogspot.mx
-blogspot.my
-blogspot.nl
-blogspot.no
-blogspot.pe
-blogspot.pt
-blogspot.qa
-blogspot.re
-blogspot.ro
-blogspot.rs
-blogspot.ru
-blogspot.se
-blogspot.sg
-blogspot.si
-blogspot.sk
-blogspot.sn
-blogspot.td
-blogspot.tw
-blogspot.ug
-blogspot.vn
 
 // Goupile : https://goupile.fr
 // Submitted by Niels Martignene <hello@goupile.fr>
 goupile.fr
 
-// Government of the Netherlands: https://www.government.nl
+// GOV.UK Pay : https://www.payments.service.gov.uk/
+// Submitted by Richard Baker <richard.baker@digital.cabinet-office.gov.uk>
+pymnt.uk
+
+// GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
+// Submitted by Tom Whitwell <gov-uk-paas-support@digital.cabinet-office.gov.uk>
+cloudapps.digital
+london.cloudapps.digital
+
+// Government of the Netherlands : https://www.government.nl
 // Submitted by <domeinnaam@minaz.nl>
 gov.nl
 
-// Group 53, LLC : https://www.group53.com
-// Submitted by Tyler Todd <noc@nova53.net>
-awsmppl.com
+// Grafana Labs : https://grafana.com/
+// Submitted by Platform Engineering <info@grafana.com>
+grafana-dev.net
+
+// GrayJay Web Solutions Inc. : https://grayjaysports.ca
+// Submitted by Matt Yamkowy <info@grayjaysports.ca>
+grayjayleagues.com
+
+// Grebedoc : https://grebedoc.dev
+// Submitted by Catherine Zotova <admin@grebedoc.dev>
+grebedoc.dev
 
 // GรผnstigBestellen : https://gรผnstigbestellen.de
 // Submitted by Furkan Akkoc <info@hendelzon.de>
 gรผnstigbestellen.de
 gรผnstigliefern.de
 
-// Hakaran group: http://hakaran.cz
-// Submitted by Arseniy Sokolov <security@hakaran.cz>
-fin.ci
-free.hr
-caa.li
-ua.rs
-conf.se
+// GV.UY : https://nic.gv.uy
+// Submitted by cheng <admin@mailto.al>
+gv.uy
 
-// Handshake : https://handshake.org
-// Submitted by Mike Damm <md@md.vc>
-hs.zone
-hs.run
+// Hackclub Nest : https://hackclub.app
+// Submitted by Cyteon <admins@hackclub.app>
+hackclub.app
+
+// Hรคkkinen.fi : https://www.hรคkkinen.fi/
+// Submitted by Eero Hรคkkinen <Eero+psl@Hรคkkinen.fi>
+hรคkkinen.fi
 
 // Hashbang : https://hashbang.sh
 hashbang.sh
@@ -12481,79 +13954,134 @@ hashbang.sh
 hasura.app
 hasura-app.io
 
-// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages): https://www.hs-heilbronn.de
-// Submitted by Richard Zowalla <mi-admin@hs-heilbronn.de>
+// Hatena Co., Ltd. : https://hatena.co.jp
+// Submitted by Masato Nakamura <blog-developers@hatena.ne.jp>
+hatenablog.com
+hatenadiary.com
+hateblo.jp
+hatenablog.jp
+hatenadiary.jp
+hatenadiary.org
+
+// Heilbronn University of Applied Sciences - Faculty Informatics (GitLab Pages) : https://www.hs-heilbronn.de
+// Submitted by Richard Zowalla <it-admin@hs-heilbronn.de>
 pages.it.hs-heilbronn.de
+pages-research.it.hs-heilbronn.de
+
+// HeiyuSpace : https://lazycat.cloud
+// Submitted by Xia Bin <admin@lazycat.cloud>
+heiyu.space
+
+// Helio Networks : https://heliohost.org
+// Submitted by Ben Frede <admin@heliohost.org>
+helioho.st
+heliohost.us
 
 // Hepforge : https://www.hepforge.org
 // Submitted by David Grellscheid <admin@hepforge.org>
 hepforge.org
 
+// Hercules : https://hercules.app
+// Submitted by Brendan Falk <security@hercules.app>
+onhercules.app
+hercules-app.com
+hercules-dev.com
+
 // Heroku : https://www.heroku.com/
-// Submitted by Tom Maher <tmaher@heroku.com>
+// Submitted by Shumon Huque <public-dns@salesforce.com>
 herokuapp.com
-herokussl.com
+
+// Heyflow : https://www.heyflow.com
+// Submitted by Mirko Nitschke <tech@heyflow.com>
+heyflow.page
+heyflow.site
 
 // Hibernating Rhinos
 // Submitted by Oren Eini <oren@ravendb.net>
 ravendb.cloud
 ravendb.community
-ravendb.me
 development.run
 ravendb.run
 
-// home.pl S.A.: https://home.pl
+// HiDNS : https://www.hidoha.net
+// Submitted by ifeng <admin@hidoha.net>
+hidns.co
+hidns.vip
+
+// home.pl S.A. : https://home.pl
 // Submitted by Krzysztof Wolski <krzysztof.wolski@home.eu>
 homesklep.pl
 
-// Hong Kong Productivity Council: https://www.hkpc.org/
-// Submitted by SECaaS Team <summchan@hkpc.org>
-secaas.hk
+// Homebase : https://homebase.id/
+// Submitted by Jason Babo <info@homebase.id>
+*.kin.one
+*.id.pub
+*.kin.pub
 
 // Hoplix : https://www.hoplix.com
 // Submitted by Danilo De Franco<info@hoplix.shop>
 hoplix.shop
 
-
 // HOSTBIP REGISTRY : https://www.hostbip.com/
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@hostbip.com>
 orx.biz
-biz.gl
+biz.ng
+co.biz.ng
+dl.biz.ng
+go.biz.ng
+lg.biz.ng
+on.biz.ng
 col.ng
 firm.ng
 gen.ng
 ltd.ng
 ngo.ng
-edu.scot
-sch.so
+plc.ng
 
-// HostyHosting (hostyhosting.com)
+// HostyHosting : https://hostyhosting.com
 hostyhosting.io
 
-// Hรคkkinen.fi
-// Submitted by Eero Hรคkkinen <Eero+psl@Hรคkkinen.fi>
-hรคkkinen.fi
+// Hugging Face : https://huggingface.co
+// Submitted by Eliott Coyac <website@huggingface.co>
+hf.space
+static.hf.space
+
+// Hypernode B.V. : https://www.hypernode.com/
+// Submitted by Cipriano Groenendal <security@nl.team.blue>
+hypernode.io
+
+// I-O DATA DEVICE, INC. : http://www.iodata.com/
+// Submitted by Yuji Minagawa <domains-admin@iodata.jp>
+iobb.net
+
+// i-registry s.r.o. : http://www.i-registry.cz/
+// Submitted by Martin Semrad <semrad@i-registry.cz>
+co.cz
 
 // Ici la Lune : http://www.icilalune.com/
 // Submitted by Simon Morvan <simon@icilalune.com>
 *.moonscale.io
 moonscale.net
 
+// iDOT Services Limited : http://www.domain.gr.com
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+gr.com
+
 // iki.fi
 // Submitted by Hannu Aronsson <haa@iki.fi>
 iki.fi
 
-// iliad italia: https://www.iliad.it
+// iliad italia : https://www.iliad.it
 // Submitted by Marios Makassikis <mmakassikis@freebox.fr>
 ibxos.it
 iliadboxos.it
 
-// Impertrix Solutions : <https://impertrixcdn.com>
-// Submitted by Zhixiang Zhao <csuite@impertrix.com>
-impertrixcdn.com
-impertrix.com
+// Imagine : https://imagine.dev
+// Submitted by Steven Nguyen <security@imagine.dev>
+imagine.diy
+imagine-proxy.work
 
-// Incsub, LLC: https://incsub.com/
+// Incsub, LLC : https://incsub.com/
 // Submitted by Aaron Edwards <sysadmins@incsub.com>
 smushcdn.com
 wphostedmail.com
@@ -12568,18 +14096,22 @@ in-berlin.de
 in-brb.de
 in-butter.de
 in-dsl.de
-in-dsl.net
-in-dsl.org
 in-vpn.de
+in-dsl.net
 in-vpn.net
+in-dsl.org
 in-vpn.org
 
+// Inferno Communications : https://inferno.co.uk
+// Submitted by Connor McFarlane <noc@inferno.co.uk>
+oninferno.net
+
 // info.at : http://www.info.at/
 biz.at
 info.at
 
 // info.cx : http://info.cx
-// Submitted by Jacob Slater <whois@igloo.to>
+// Submitted by June Slater <whois@igloo.to>
 info.cx
 
 // Interlegis : http://www.interlegis.leg.br
@@ -12616,37 +14148,70 @@ to.leg.br
 // Submitted by Wolfgang Schwarz <admin@intermetrics.de>
 pixolino.com
 
-// Internet-Pro, LLP: https://netangels.ru/
+// Internet-Pro, LLP : https://netangels.ru/
 // Submitted by Vasiliy Sheredeko <piphon@gmail.com>
 na4u.ru
 
+// Inventor Services : https://inventor.gg/
+// Submitted by Inventor Team <psl@inventor.gg>
+botdash.app
+botdash.dev
+botdash.gg
+botdash.net
+botda.sh
+botdash.xyz
+
+// IONOS SE : https://www.ionos.com/
+// IONOS Group SE : https://www.ionos-group.com/
+// Submitted by Henrik Willert <security@ionos.com>
+apps-1and1.com
+live-website.com
+webspace-host.com
+apps-1and1.net
+websitebuilder.online
+app-ionos.space
+
 // iopsys software solutions AB : https://iopsys.eu/
 // Submitted by Roman Azarenko <roman.azarenko@iopsys.eu>
 iopsys.se
 
+// IPFS Project : https://ipfs.tech/
+// Submitted by Interplanetary Shipyard <domains@ipshipyard.com>
+*.inbrowser.dev
+*.dweb.link
+*.inbrowser.link
+
 // IPiFony Systems, Inc. : https://www.ipifony.com/
 // Submitted by Matthew Hardeman <mhardeman@ipifony.com>
 ipifony.net
 
+// ir.md : https://nic.ir.md
+// Submitted by Ali Soizi <info@nic.ir.md>
+ir.md
+
+// is-a-good.dev : https://is-a-good.dev
+// Submitted by William Harrison <webmaster@is-a-good.dev>
+is-a-good.dev
+
 // IServ GmbH : https://iserv.de
-// Submitted by Mario Hoberg <info@iserv.de>
+// Submitted by Kim Brodowski <info@iserv.de>
 iservschule.de
 mein-iserv.de
+schuldock.de
 schulplattform.de
 schulserver.de
 test-iserv.de
 iserv.dev
+iserv.host
 
-// I-O DATA DEVICE, INC. : http://www.iodata.com/
-// Submitted by Yuji Minagawa <domains-admin@iodata.jp>
-iobb.net
+// Ispmanager : https://www.ispmanager.com/
+// Submitted by Ispmanager infrastructure team <infrastructure@ispmanager.com>
+ispmanager.name
 
 // Jelastic, Inc. : https://jelastic.com/
 // Submitted by Ihor Kolodyuk <ik@jelastic.com>
 mel.cloudlets.com.au
 cloud.interhostsolutions.be
-users.scale.virtualcloud.com.br
-mycloud.by
 alp1.ae.flow.ch
 appengine.flow.ch
 es-1.axarnet.cloud
@@ -12668,20 +14233,15 @@ us.reclaim.cloud
 ch.trendhosting.cloud
 de.trendhosting.cloud
 jele.club
-amscompute.com
-clicketcloud.com
 dopaas.com
-hidora.com
 paas.hosted-by-previder.com
 rag-cloud.hosteur.com
 rag-cloud-ch.hosteur.com
 jcloud.ik-server.com
 jcloud-ver-jpc.ik-server.com
 demo.jelastic.com
-kilatiron.com
 paas.massivegrid.com
 jed.wafaicloud.com
-lon.wafaicloud.com
 ryd.wafaicloud.com
 j.scaleforce.com.cy
 jelastic.dogado.eu
@@ -12693,18 +14253,14 @@ mircloud.host
 paas.beebyte.io
 sekd1.beebyteapp.io
 jele.io
-cloud-fr1.unispace.io
 jc.neen.it
-cloud.jelastic.open.tim.it
 jcloud.kz
-upaas.kazteleport.kz
 cloudjiffy.net
 fra1-de.cloudjiffy.net
 west1-us.cloudjiffy.net
 jls-sto1.elastx.net
 jls-sto2.elastx.net
 jls-sto3.elastx.net
-faststacks.net
 fr-1.paas.massivegrid.net
 lon-1.paas.massivegrid.net
 lon-2.paas.massivegrid.net
@@ -12714,11 +14270,9 @@ sg-1.paas.massivegrid.net
 jelastic.saveincloud.net
 nordeste-idc.saveincloud.net
 j.scaleforce.net
-jelastic.tsukaeru.net
 sdscloud.pl
 unicloud.pl
 mircloud.ru
-jelastic.regruhosting.ru
 enscaled.sg
 jele.site
 jelastic.team
@@ -12737,12 +14291,20 @@ myjino.ru
 
 // Jotelulu S.L. : https://jotelulu.com
 // Submitted by Daniel Fariรฑa <ingenieria@jotelulu.com>
+jote.cloud
 jotelulu.cloud
+eu1-plenit.com
+la1-plenit.com
+us1-plenit.com
+
+// JouwWeb B.V. : https://www.jouwweb.nl
+// Submitted by Camilo Sperberg <tech@webador.com>
+webadorsite.com
+jouwweb.site
 
 // Joyent : https://www.joyent.com/
 // Submitted by Brian Bennett <brian.bennett@joyent.com>
 *.triton.zone
-*.cns.joyent.com
 
 // JS.ORG : http://dns.js.org
 // Submitted by Stefan Keim <admin@js.org>
@@ -12753,18 +14315,39 @@ js.org
 kaas.gg
 khplay.nl
 
-// Kakao : https://www.kakaocorp.com/
-// Submitted by JaeYoong Lee <cec@kakaocorp.com>
-ktistory.com
-
 // Kapsi : https://kapsi.fi
 // Submitted by Tomi Juntunen <erani@kapsi.fi>
 kapsi.fi
 
+// KataBump : https://katabump.com
+// Submitted by Thibault Lapeyre <contact@katabump.com>
+kdns.fr
+
+// Katholieke Universiteit Leuven : https://www.kuleuven.be
+// Submitted by Abuse KU Leuven <abuse@kuleuven.be>
+ezproxy.kuleuven.be
+kuleuven.cloud
+
+// Keenetic : https://keenetic.com
+// Submitted by Alexey Nikitin <cloud@keenetic.net>
+keenetic.io
+keenetic.link
+keenetic.name
+keenetic.pro
+
+// Kevin Service : https://kevsrv.me
+// Submitted by Kevin Service Team <cs@kevsrv.me>
+ae.kg
+
 // Keyweb AG : https://www.keyweb.de
 // Submitted by Martin Dannehl <postmaster@keymachine.de>
 keymachine.de
 
+// Kilo Code, Inc. : https://kilo.ai
+// Submitted by Remon Oldenbeuving <security@kilocode.ai>
+kiloapps.ai
+kiloapps.io
+
 // KingHost : https://king.host
 // Submitted by Felipe Keller Braz <felipebraz@kinghost.com.br>
 kinghost.net
@@ -12774,27 +14357,31 @@ uni5.net
 // Submitted by Roy Keene <rkeene@knightpoint.com>
 knightpoint.systems
 
-// KoobinEvent, SL: https://www.koobin.com
+// KoobinEvent, SL : https://www.koobin.com
 // Submitted by Ivรกn Oliva <ivan.oliva@koobin.com>
 koobin.events
 
+// Krellian Ltd. : https://krellian.com
+// Submitted by Ben Francis <ben@krellian.com>
+webthings.io
+krellian.net
+
 // KUROKU LTD : https://kuroku.ltd/
 // Submitted by DisposaBoy <security@oya.to>
 oya.to
 
-// Katholieke Universiteit Leuven: https://www.kuleuven.be
-// Submitted by Abuse KU Leuven <abuse@kuleuven.be>
-kuleuven.cloud
-ezproxy.kuleuven.be
+// KV GmbH : https://www.nic.co.de
+// Submitted by KV GmbH <registry@kv-gmbh.de>
+// Abuse reports to <registry@kv-gmbh.de>
+co.de
 
-// .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
-co.krd
-edu.krd
-
-// Krellian Ltd. : https://krellian.com
-// Submitted by Ben Francis <ben@krellian.com>
-krellian.net
-webthings.io
+// Laravel Holdings, Inc. : https://laravel.com
+// Submitted by Andrรฉ Valentin & James Brooks <security@laravel.com>
+shiptoday.app
+shiptoday.build
+laravel.cloud
+on-forge.com
+on-vapor.com
 
 // LCube - Professional hosting e.K. : https://www.lcube-webhosting.de
 // Submitted by Lars Laehn <info@lcube.de>
@@ -12808,9 +14395,24 @@ leadpages.co
 lpages.co
 lpusercontent.com
 
-// Lelux.fi : https://lelux.fi/
-// Submitted by Lelux Admin <publisuffix@lelux.site>
-lelux.site
+// Leapcell : https://leapcell.io/
+// Submitted by Leapcell Team <support@leapcell.io>
+leapcell.app
+leapcell.dev
+leapcell.online
+
+// Liara : https://liara.ir
+// Submitted by Amirhossein Badinloo <info@liara.ir>
+liara.run
+iran.liara.run
+
+// libp2p project : https://libp2p.io
+// Submitted by Interplanetary Shipyard <domains@ipshipyard.com>
+libp2p.direct
+
+// Libre IT Ltd : https://libre.nz
+// Submitted by Tomas Maggio <support@libre.nz>
+runcontainers.dev
 
 // Lifetime Hosting : https://Lifetime.Hosting/
 // Submitted by Mike Fillator <support@lifetime.hosting>
@@ -12822,14 +14424,10 @@ co.network
 co.place
 co.technology
 
-// Lightmaker Property Manager, Inc. : https://app.lmpm.com/
-// Submitted by Greg Holland <greg.holland@lmpm.com>
-app.lmpm.com
-
-// linkyard ldt: https://www.linkyard.ch/
+// linkyard ldt : https://www.linkyard.ch/
 // Submitted by Mario Siegenthaler <mario.siegenthaler@linkyard.ch>
-linkyard.cloud
 linkyard-cloud.ch
+linkyard.cloud
 
 // Linode : https://linode.com
 // Submitted by <security@linode.com>
@@ -12842,13 +14440,28 @@ ip.linodeusercontent.com
 // Submitted by Victor Velchev <admin@liquidnetlimited.com>
 we.bs
 
+// Listen53 : https://www.l53.net
+// Submitted by Gerry Keh <biz@l53.net>
+filegear-sg.me
+ggff.net
+
 // Localcert : https://localcert.dev
 // Submitted by Lann Martin <security@localcert.dev>
 *.user.localcert.dev
 
-// localzone.xyz
-// Submitted by Kenny Niehage <hello@yahe.sh>
-localzone.xyz
+// Localtonet : https://localtonet.com/
+// Submitted by Burak Isleyici <support@localtonet.com>
+localtonet.com
+*.localto.net
+
+// Lodz University of Technology LODMAN regional domains : https://www.man.lodz.pl/dns
+// Submitted by Piotr Wilk <dns@man.lodz.pl>
+lodz.pl
+pabianice.pl
+plock.pl
+sieradz.pl
+skierniewice.pl
+zgierz.pl
 
 // Log'in Line : https://www.loginline.com/
 // Submitted by Rรฉmi Mach <remi.mach@loginline.com>
@@ -12858,14 +14471,17 @@ loginline.io
 loginline.services
 loginline.site
 
-// Lokalized : https://lokalized.nl
-// Submitted by Noah Taheij <noah@lokalized.nl>
-servers.run
-
-// Lรตhmus Family, The
-// Submitted by Heiki Lรตhmus <hostmaster at lohmus dot me>
+// Lรตhmus Family, The : https://lohmus.me/
+// Submitted by Heiki Lรตhmus <hostmaster@lohmus.me>
 lohmus.me
 
+// Lovable : https://lovable.dev
+// Submitted by Fabian Hedin <security@lovable.dev>
+lovable.app
+lovableproject.com
+lovable.run
+lovable.sh
+
 // LubMAN UMCS Sp. z o.o : https://lubman.pl/
 // Submitted by Ireneusz Maliszewski <ireneusz.maliszewski@lubman.pl>
 krasnik.pl
@@ -12884,18 +14500,19 @@ lugs.org.uk
 // Lukanet Ltd : https://lukanet.com
 // Submitted by Anton Avramov <register@lukanet.com>
 barsy.bg
-barsy.co.uk
-barsyonline.co.uk
+barsy.club
 barsycenter.com
 barsyonline.com
-barsy.club
 barsy.de
+barsy.dev
 barsy.eu
+barsy.gr
 barsy.in
 barsy.info
 barsy.io
 barsy.me
 barsy.menu
+barsyonline.menu
 barsy.mobi
 barsy.net
 barsy.online
@@ -12903,42 +14520,56 @@ barsy.org
 barsy.pro
 barsy.pub
 barsy.ro
+barsy.rs
 barsy.shop
+barsyonline.shop
 barsy.site
+barsy.store
 barsy.support
 barsy.uk
+barsy.co.uk
+barsyonline.co.uk
+
+// Lutra : https://lutra.ai
+// Submitted by Joshua Newman <public-suffix-list@lutra.ai>
+*.lutrausercontent.com
+
+// Luyani Inc. : https://luyani.com/
+// Submitted by Umut Gumeli <public-suffix-list@luyani.com>
+luyani.app
+luyani.net
 
 // Magento Commerce
 // Submitted by Damien Tournoud <dtournoud@magento.cloud>
 *.magentosite.cloud
 
-// May First - People Link : https://mayfirst.org/
-// Submitted by Jamie McClelland <info@mayfirst.org>
-mayfirst.info
-mayfirst.org
+// Magic Patterns : https://www.magicpatterns.com
+// Submitted by Teddy Ni <security@magicpatterns.com>
+magicpatterns.app
+magicpatternsapp.com
 
 // Mail.Ru Group : https://hb.cldmail.ru
 // Submitted by Ilya Zaretskiy <zaretskiy@corp.mail.ru>
 hb.cldmail.ru
 
-// Mail Transfer Platform : https://www.neupeer.com
-// Submitted by Li Hui <lihui@neupeer.com>
-cn.vu
+// MathWorks : https://www.mathworks.com/
+// Submitted by Emily Reed <psl-maintainers@groups.mathworks.com>
+matlab.cloud
+modelscape.com
+mwcloudnonprod.com
+polyspace.com
 
-// Maze Play: https://www.mazeplay.com
-// Submitted by Adam Humpherys <adam@mws.dev>
-mazeplay.com
-
-// mcpe.me : https://mcpe.me
-// Submitted by Noa Heyl <hi@noa.dev>
-mcpe.me
+// May First - People Link : https://mayfirst.org/
+// Submitted by Jamie McClelland <info@mayfirst.org>
+mayfirst.info
+mayfirst.org
 
 // McHost : https://mchost.ru
 // Submitted by Evgeniy Subbotin <e.subbotin@mchost.ru>
 mcdir.me
 mcdir.ru
-mcpre.ru
 vps.mcdir.ru
+mcpre.ru
 
 // Mediatech : https://mediatech.by
 // Submitted by Evgeniy Kozhuhovskiy <ugenk@mediatech.by>
@@ -12949,6 +14580,10 @@ mediatech.dev
 // Submitted by Michael Olson <molson@medicomhealth.com>
 hra.health
 
+// MedusaJS, Inc : https://medusajs.com/
+// Submitted by Stevche Radevski <engineering@medusajs.com>
+medusajs.app
+
 // Memset hosting : https://www.memset.com
 // Submitted by Tom Whitwell <domains@memset.com>
 miniserver.com
@@ -12958,13 +14593,15 @@ memset.net
 // Submitted by Ruben Schmidmeister <psl-maintainers@messerli.ch>
 messerli.app
 
+// Meta Platforms, Inc. : https://meta.com/
+// Submitted by Jacob Cordero <public-suffix@meta.com>
+atmeta.com
+apps.fbsbx.com
+
 // MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
-// Submitted by Zdenฤ›k ล ustr <zdenek.sustr@cesnet.cz>
+// Submitted by Zdenฤ›k ล ustr <zdenek.sustr@cesnet.cz> and Radim Janฤa <janca@cesnet.cz>
 *.cloud.metacentrum.cz
 custom.metacentrum.cz
-
-// MetaCentrum, CESNET z.s.p.o. : https://www.metacentrum.cz/en/
-// Submitted by Radim Janฤa <janca@cesnet.cz>
 flt.cloud.muni.cz
 usr.cloud.muni.cz
 
@@ -12978,35 +14615,81 @@ co.pl
 
 // Microsoft Corporation : http://microsoft.com
 // Submitted by Public Suffix List Admin <msftpsladmin@microsoft.com>
+// Managed by Corporate Domains
+// Microsoft Azure : https://home.azure
 *.azurecontainer.io
-azurewebsites.net
+azure-api.net
 azure-mobile.net
-cloudapp.net
+azureedge.net
+azurefd.net
 azurestaticapps.net
 1.azurestaticapps.net
 2.azurestaticapps.net
 3.azurestaticapps.net
+4.azurestaticapps.net
+5.azurestaticapps.net
+6.azurestaticapps.net
+7.azurestaticapps.net
 centralus.azurestaticapps.net
 eastasia.azurestaticapps.net
 eastus2.azurestaticapps.net
 westeurope.azurestaticapps.net
 westus2.azurestaticapps.net
+azurewebsites.net
+cloudapp.net
+trafficmanager.net
+blob.core.usgovcloudapi.net
+file.core.usgovcloudapi.net
+web.core.usgovcloudapi.net
+servicebus.usgovcloudapi.net
+usgovcloudapp.net
+usgovtrafficmanager.net
+blob.core.windows.net
+file.core.windows.net
+web.core.windows.net
+servicebus.windows.net
+azure-api.us
+azurewebsites.us
+
+// MikroTik : https://mikrotik.com
+// Submitted by MikroTik SysAdmin Team <support@mikrotik.com>
+routingthecloud.com
+sn.mynetname.net
+routingthecloud.net
+routingthecloud.org
+
+// Million Software, Inc : https://million.dev/
+// Submitted by Rayhan Noufal Arayilakath <security@million.dev>
+same-app.com
+same-preview.com
 
 // minion.systems : http://minion.systems
 // Submitted by Robert Bรถttinger <r@minion.systems>
 csx.cc
 
-// Mintere : https://mintere.com/
-// Submitted by Ben Aubin <security@mintere.com>
-mintere.site
-
-// MobileEducation, LLC : https://joinforte.com
-// Submitted by Grayson Martin <grayson.martin@mobileeducation.us>
-forte.id
-
-// Mozilla Corporation : https://mozilla.com
-// Submitted by Ben Francis <bfrancis@mozilla.com>
-mozilla-iot.org
+// Miren, Inc. : https://miren.dev
+// Submitted by Miren Product Team <team-product@miren.dev>
+miren.app
+miren.systems
+
+// Mittwald CM Service GmbH & Co. KG : https://mittwald.de
+// Submitted by Marco Rieger <security@mittwald.de>
+mydbserver.com
+webspaceconfig.de
+mittwald.info
+mittwaldserver.info
+typo3server.info
+project.space
+
+// Mocha : https://getmocha.com
+// Submitted by Ben Reinhart <security@getmocha.com>
+mocha.app
+mochausercontent.com
+mocha-sandbox.dev
+
+// MODX Systems LLC : https://modx.com
+// Submitted by Elizabeth Southwell <elizabeth@modx.com>
+modx.dev
 
 // Mozilla Foundation : https://mozilla.org/
 // Submitted by glob <glob@mozilla.com>
@@ -13018,11 +14701,15 @@ net.ru
 org.ru
 pp.ru
 
+// MyOwn srl : https://www.myown.eu/
+// Submitted by Stephane Bouvard <support@myown.eu>
+my.be
+
 // Mythic Beasts : https://www.mythic-beasts.com
 // Submitted by Paul Cammish <kelduum@mythic-beasts.com>
 hostedpi.com
-customer.mythic-beasts.com
 caracal.mythic-beasts.com
+customer.mythic-beasts.com
 fentiger.mythic-beasts.com
 lynx.mythic-beasts.com
 ocelot.mythic-beasts.com
@@ -13038,9 +14725,22 @@ cust.retrosnub.co.uk
 // Submitted by Paulus Schoutsen <infra@nabucasa.com>
 ui.nabu.casa
 
+// Needle Tools GmbH : https://needle.tools
+// Submitted by Felix Herbst <security@needle.tools>
+needle.run
+
+// Neo : https://www.neo.space
+// Submitted by Ankit Kulkarni <devops@co.site>
+co.site
+
 // Net at Work Gmbh : https://www.netatwork.de
 // Submitted by Jan Jaeschke <jan.jaeschke@netatwork.de>
 cloud.nospamproxy.com
+o365.cloud.nospamproxy.com
+
+// Net libre : https://www.netlib.re
+// Submitted by Philippe PITTOLI <security@netlib.re>
+netlib.re
 
 // Netlify : https://www.netlify.com
 // Submitted by Jessica Parsons <jessica@netlify.com>
@@ -13050,17 +14750,134 @@ netlify.app
 // Submitted by Trung Tran <Trung.Tran@neustar.biz>
 4u.com
 
+// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
+// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
+nfshost.com
+
+// NFT.Storage : https://nft.storage/
+// Submitted by Vasco Santos <vasco.santos@protocol.ai> or <support@nft.storage>
+ipfs.nftstorage.link
+
+// NGO.US Registry : https://nic.ngo.us
+// Submitted by Alstra Solutions Ltd. Networking Team <admin@alstra.org>
+ngo.us
+
 // ngrok : https://ngrok.com/
 // Submitted by Alan Shreve <alan@ngrok.com>
+ngrok.app
+ngrok-free.app
+ngrok.dev
+ngrok-free.dev
 ngrok.io
+ap.ngrok.io
+au.ngrok.io
+eu.ngrok.io
+in.ngrok.io
+jp.ngrok.io
+sa.ngrok.io
+us.ngrok.io
+ngrok.pizza
+ngrok.pro
+
+// Nicolaus Copernicus University in Torun - MSK TORMAN : https://www.man.torun.pl
+torun.pl
 
 // Nimbus Hosting Ltd. : https://www.nimbushosting.co.uk/
-// Submitted by Nicholas Ford <nick@nimbushosting.co.uk>
+// Submitted by Nicholas Ford <dev@nimbushosting.co.uk>
 nh-serv.co.uk
+nimsite.uk
 
-// NFSN, Inc. : https://www.NearlyFreeSpeech.NET/
-// Submitted by Jeff Wheelhouse <support@nearlyfreespeech.net>
-nfshost.com
+// No-IP.com : https://noip.com/
+// Submitted by Deven Reza <publicsuffixlist@noip.com>
+mmafan.biz
+myftp.biz
+no-ip.biz
+no-ip.ca
+fantasyleague.cc
+gotdns.ch
+3utilities.com
+blogsyte.com
+ciscofreak.com
+damnserver.com
+ddnsking.com
+ditchyourip.com
+dnsiskinky.com
+dynns.com
+geekgalaxy.com
+health-carereform.com
+homesecuritymac.com
+homesecuritypc.com
+myactivedirectory.com
+mysecuritycamera.com
+myvnc.com
+net-freaks.com
+onthewifi.com
+point2this.com
+quicksytes.com
+securitytactics.com
+servebeer.com
+servecounterstrike.com
+serveexchange.com
+serveftp.com
+servegame.com
+servehalflife.com
+servehttp.com
+servehumour.com
+serveirc.com
+servemp3.com
+servep2p.com
+servepics.com
+servequake.com
+servesarcasm.com
+stufftoread.com
+unusualperson.com
+workisboring.com
+dvrcam.info
+ilovecollege.info
+no-ip.info
+brasilia.me
+ddns.me
+dnsfor.me
+hopto.me
+loginto.me
+noip.me
+webhop.me
+bounceme.net
+ddns.net
+eating-organic.net
+mydissent.net
+myeffect.net
+mymediapc.net
+mypsx.net
+mysecuritycamera.net
+nhlfan.net
+no-ip.net
+pgafan.net
+privatizehealthinsurance.net
+redirectme.net
+serveblog.net
+serveminecraft.net
+sytes.net
+cable-modem.org
+collegefan.org
+couchpotatofries.org
+hopto.org
+mlbfan.org
+myftp.org
+mysecuritycamera.org
+nflfan.org
+no-ip.org
+read-books.org
+ufcfan.org
+zapto.org
+no-ip.co.uk
+golffan.us
+noip.us
+pointto.us
+
+// NodeArt : https://nodeart.io
+// Submitted by Konstantin Nosov <Nosov@nodeart.io>
+stage.nodeart.io
 
 // Noop : https://noop.app
 // Submitted by Nathaniel Schweinberg <noop@rearc.io>
@@ -13079,18 +14896,16 @@ noop.app
 // Submitted by Laurent Pellegrino <security@noticeable.io>
 noticeable.news
 
+// Notion Labs, Inc : https://www.notion.so/
+// Submitted by Jess Yao <trust-core-team@makenotion.com>
+notion.site
+
 // Now-DNS : https://now-dns.com
 // Submitted by Steve Russell <steve@now-dns.com>
 dnsking.ch
 mypi.co
-n4t.co
-001www.com
-ddnslive.com
 myiphost.com
 forumz.info
-16-b.it
-32-b.it
-64-b.it
 soundcast.me
 tcp4.me
 dnsup.net
@@ -13101,126 +14916,24 @@ vpndns.net
 dynserv.org
 now-dns.org
 x443.pw
-now-dns.top
 ntdll.top
 freeddns.us
-crafting.xyz
-zapto.xyz
 
 // nsupdate.info : https://www.nsupdate.info/
 // Submitted by Thomas Waldmann <info@nsupdate.info>
 nsupdate.info
 nerdpol.ovh
 
-// No-IP.com : https://noip.com/
-// Submitted by Deven Reza <publicsuffixlist@noip.com>
-blogsyte.com
-brasilia.me
-cable-modem.org
-ciscofreak.com
-collegefan.org
-couchpotatofries.org
-damnserver.com
-ddns.me
-ditchyourip.com
-dnsfor.me
-dnsiskinky.com
-dvrcam.info
-dynns.com
-eating-organic.net
-fantasyleague.cc
-geekgalaxy.com
-golffan.us
-health-carereform.com
-homesecuritymac.com
-homesecuritypc.com
-hopto.me
-ilovecollege.info
-loginto.me
-mlbfan.org
-mmafan.biz
-myactivedirectory.com
-mydissent.net
-myeffect.net
-mymediapc.net
-mypsx.net
-mysecuritycamera.com
-mysecuritycamera.net
-mysecuritycamera.org
-net-freaks.com
-nflfan.org
-nhlfan.net
-no-ip.ca
-no-ip.co.uk
-no-ip.net
-noip.us
-onthewifi.com
-pgafan.net
-point2this.com
-pointto.us
-privatizehealthinsurance.net
-quicksytes.com
-read-books.org
-securitytactics.com
-serveexchange.com
-servehumour.com
-servep2p.com
-servesarcasm.com
-stufftoread.com
-ufcfan.org
-unusualperson.com
-workisboring.com
-3utilities.com
-bounceme.net
-ddns.net
-ddnsking.com
-gotdns.ch
-hopto.org
-myftp.biz
-myftp.org
-myvnc.com
-no-ip.biz
-no-ip.info
-no-ip.org
-noip.me
-redirectme.net
-servebeer.com
-serveblog.net
-servecounterstrike.com
-serveftp.com
-servegame.com
-servehalflife.com
-servehttp.com
-serveirc.com
-serveminecraft.net
-servemp3.com
-servepics.com
-servequake.com
-sytes.net
-webhop.me
-zapto.org
-
-// NodeArt : https://nodeart.io
-// Submitted by Konstantin Nosov <Nosov@nodeart.io>
-stage.nodeart.io
-
-// Nucleos Inc. : https://nucleos.com
-// Submitted by Piotr Zduniak <piotr@nucleos.com>
-pcloud.host
-
-// NYC.mn : http://www.information.nyc.mn
-// Submitted by Matthew Brown <mattbrown@nyc.mn>
-nyc.mn
+// O3O.Foundation : https://o3o.foundation/
+// Submitted by the prvcy.page Registry Team <info@o3o.foundation>
+prvcy.page
 
 // Observable, Inc. : https://observablehq.com
 // Submitted by Mike Bostock <dns@observablehq.com>
+observablehq.cloud
 static.observableusercontent.com
 
-// Octopodal Solutions, LLC. : https://ulterius.io/
-// Submitted by Andrew Sampson <andrew@ulterius.io>
-cya.gg
-
-// OMG.LOL : <https://omg.lol>
+// OMG.LOL : https://omg.lol
 // Submitted by Adam Newbold <adam@omg.lol>
 omg.lol
 
@@ -13228,46 +14941,64 @@ omg.lol
 // Submitted by Cole Estep <cole@omnibond.com>
 cloudycluster.net
 
-// OmniWe Limited: https://omniwe.com
+// OmniWe Limited : https://omniwe.com
 // Submitted by Vicary Archangel <vicary@omniwe.com>
 omniwe.site
 
-// One.com: https://www.one.com/
+// One.com : https://www.one.com/
 // Submitted by Jacob Bunk Nielsen <jbn@one.com>
-123hjemmeside.dk
-123hjemmeside.no
-123homepage.it
-123kotisivu.fi
-123minsida.se
-123miweb.es
-123paginaweb.pt
-123sait.ru
-123siteweb.fr
 123webseite.at
-123webseite.de
 123website.be
+simplesite.com.br
 123website.ch
+simplesite.com
+123webseite.de
+123hjemmeside.dk
+123miweb.es
+123kotisivu.fi
+123siteweb.fr
+simplesite.gr
+123homepage.it
 123website.lu
 123website.nl
+123hjemmeside.no
 service.one
-simplesite.com
-simplesite.com.br
-simplesite.gr
+website.one
 simplesite.pl
+123paginaweb.pt
+123minsida.se
+
+// ONID : https://get.onid.ca
+// Submitted by ONID Engineering Team <psl@onid.ca>
+onid.ca
 
-// One Fold Media : http://www.onefoldmedia.com/
-// Submitted by Eddie Jones <eddie@onefoldmedia.com>
-nid.io
+// Open Domains : https://open-domains.net
+// Submitted by William Harrison <admin@open-domains.net>
+is-a-fullstack.dev
+is-cool.dev
+is-not-a.dev
+localplayer.dev
+is-local.org
 
 // Open Social : https://www.getopensocial.com/
 // Submitted by Alexander Varwijk <security@getopensocial.com>
 opensocial.site
 
+// OpenAI : https://openai.com
+// Submitted by Thomas Shadwell <security@openai.com>
+*.oaiusercontent.com
+
 // OpenCraft GmbH : http://opencraft.com/
 // Submitted by Sven Marnach <sven@opencraft.com>
 opencraft.hosting
 
-// OpenResearch GmbH: https://openresearch.com/
+// OpenHost : https://registry.openhost.uk
+// Submitted by OpenHost Registry Team <support@openhost.uk>
+16-b.it
+32-b.it
+64-b.it
+
+// OpenResearch GmbH : https://openresearch.com/
 // Submitted by Philipp Schmid <ops@openresearch.com>
 orsites.com
 
@@ -13275,26 +15006,41 @@ orsites.com
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
 
+// Oracle Dyn : https://cloud.oracle.com/home https://dyn.com/dns/
+// Submitted by Gregory Drake <support@dyn.com>
+// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
+*.customer-oci.com
+*.oci.customer-oci.com
+*.ocp.customer-oci.com
+*.ocs.customer-oci.com
+*.oraclecloudapps.com
+*.oraclegovcloudapps.com
+*.oraclegovcloudapps.uk
+
 // Orange : https://www.orange.com
 // Submitted by Alexandre Linte <alexandre.linte@orange.com>
 tech.orange
 
-// Oursky Limited : https://authgear.com/, https://skygear.io/
-// Submitted by Authgear Team <hello@authgear.com>, Skygear Developer <hello@skygear.io>
+// OsSav Technology Ltd. : https://ossav.com/
+// Submitted by OsSav Technology Ltd. <support@ossav.com>
+// https://nic.can.re
+can.re
+
+// Oursky Limited : https://authgear.com/
+// Submitted by Authgear Team <hello@authgear.com> & Skygear Developer <hello@skygear.io>
 authgear-staging.com
 authgearapps.com
-skygearapp.com
 
 // OutSystems
 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
 outsystemscloud.com
 
-// OVHcloud: https://ovhcloud.com
+// OVHcloud : https://ovhcloud.com
 // Submitted by Vincent Cassรฉ <vincent.casse@ovhcloud.com>
-*.webpaas.ovh.net
 *.hosting.ovh.net
+*.webpaas.ovh.net
 
-// OwnProvider GmbH: http://www.ownprovider.com
+// OwnProvider GmbH : http://www.ownprovider.com
 // Submitted by Jan Moennich <jan.moennich@ownprovider.com>
 ownprovider.com
 own.pm
@@ -13315,37 +15061,27 @@ oy.lc
 // Submitted by Derek Myers <derek@pagefog.com>
 pgfog.com
 
-// Pagefront : https://www.pagefronthq.com/
-// Submitted by Jason Kriss <jason@pagefronthq.com>
-pagefrontapp.com
-
 // PageXL : https://pagexl.com
 // Submitted by Yann Guichard <yann@pagexl.com>
 pagexl.com
 
+// Pantheon Systems, Inc. : https://pantheon.io/
+// Submitted by Gary Dylina <gary@pantheon.io>
+gotpantheon.com
+pantheonsite.io
+
 // Paywhirl, Inc : https://paywhirl.com/
 // Submitted by Daniel Netzer <dan@paywhirl.com>
 *.paywhirl.com
 
-// pcarrier.ca Software Inc: https://pcarrier.ca/
+// pcarrier.ca Software Inc : https://pcarrier.ca/
 // Submitted by Pierre Carrier <pc@rrier.ca>
-bar0.net
-bar1.net
-bar2.net
-rdv.to
-
-// .pl domains (grandfathered)
-art.pl
-gliwice.pl
-krakow.pl
-poznan.pl
-wroc.pl
-zakopane.pl
-
-// Pantheon Systems, Inc. : https://pantheon.io/
-// Submitted by Gary Dylina <gary@pantheon.io>
-pantheonsite.io
-gotpantheon.com
+*.xmit.co
+xmit.dev
+madethis.site
+srv.us
+gh.srv.us
+gl.srv.us
 
 // Peplink | Pepwave : http://peplink.com/
 // Submitted by Steve Leung <steveleung@peplink.com>
@@ -13355,9 +15091,14 @@ mypep.link
 // Submitted by Kenneth Van Alstyne <kvanalstyne@perspecta.com>
 perspecta.cloud
 
-// PE Ulyanov Kirill Sergeevich : https://airy.host
-// Submitted by Kirill Ulyanov <k.ulyanov@airy.host>
-lk3.ru
+// Ping Identity : https://www.pingidentity.com
+// Submitted by Ping Identity <security@pingidentity.com>
+forgeblocks.com
+id.forgerock.io
+
+// Plain : https://www.plain.com/
+// Submitted by Jesรบs Hernรกndez <security@plain.com>
+support.site
 
 // Planet-Work : https://www.planet-work.com/
 // Submitted by Frรฉdรฉric VANNIรˆRE <f.vanniere@planet-work.com>
@@ -13365,28 +15106,17 @@ on-web.fr
 
 // Platform.sh : https://platform.sh
 // Submitted by Nikola Kotur <nikola@platform.sh>
-bc.platform.sh
+*.upsun.app
+upsunapp.com
 ent.platform.sh
 eu.platform.sh
 us.platform.sh
 *.platformsh.site
 *.tst.site
 
-// Platter: https://platter.dev
-// Submitted by Patrick Flor <patrick@platter.dev>
-platter-app.com
-platter-app.dev
-platterp.us
-
-// Plesk : https://www.plesk.com/
-// Submitted by Anton Akhtyamov <program-managers@plesk.com>
-pdns.page
-plesk.page
-pleskns.com
-
-// Port53 : https://port53.io/
-// Submitted by Maximilian Schieder <maxi@zeug.co>
-dyn53.io
+// Pley AB : https://www.pley.com/
+// Submitted by Henning Pohl <infra@pley.com>
+pley.games
 
 // Porter : https://porter.run/
 // Submitted by Rudraksh MK <rudi@porter.run>
@@ -13403,8 +15133,8 @@ pstmn.io
 mock.pstmn.io
 httpbin.org
 
-//prequalifyme.today : https://prequalifyme.today
-//Submitted by DeepakTiwari deepak@ivylead.io
+// prequalifyme.today : https://prequalifyme.today
+// Submitted by DeepakTiwari deepak@ivylead.io
 prequalifyme.today
 
 // prgmr.com : https://prgmr.com/
@@ -13415,62 +15145,52 @@ xen.prgmr.com
 // Submitted by registry <lendl@nic.at>
 priv.at
 
-// privacytools.io : https://www.privacytools.io/
-// Submitted by Jonah Aragon <jonah@privacytools.io>
-prvcy.page
+// PROJECT ELIV : https://eliv.kr/
+// Submitted by PROJECT ELIV DomainName Team <team@eliv.kr>
+c01.kr
+eliv-api.kr
+eliv-cdn.kr
+eliv-dns.kr
+mmv.kr
+vki.kr
 
-// Protocol Labs : https://protocol.ai/
-// Submitted by Michael Burns <noc@protocol.ai>
-*.dweb.link
+// project-study : https://project-study.com
+// Submitted by yumenewa <admin@project-study.com>
+dev.project-study.com
 
 // Protonet GmbH : http://protonet.io
 // Submitted by Martin Meier <admin@protonet.io>
 protonet.io
 
+// PSL Sandbox : https://github.com/groundcat/PSL-Sandbox
+// Submitted by groundcat <psl-sandbox@alumni.upenn.edu>
+platter-app.dev
+
+// PT Ekossistim Indo Digital : https://e.id
+// Submitted by Eid Team <support@corp.e.id>
+e.id
+
 // Publication Presse Communication SARL : https://ppcom.fr
 // Submitted by Yaacov Akiba Slama <admin@chirurgiens-dentistes-en-france.fr>
 chirurgiens-dentistes-en-france.fr
 byen.site
 
-// pubtls.org: https://www.pubtls.org
+// PublicZone : https://publiczone.org/
+// Submitted by PublicZone NOC Team <noc@publiczone.org>
+nyc.mn
+*.cn.st
+
+// pubtls.org : https://www.pubtls.org
 // Submitted by Kor Nielsen <kor@pubtls.org>
 pubtls.org
 
-// PythonAnywhere LLP: https://www.pythonanywhere.com
+// PythonAnywhere LLP : https://www.pythonanywhere.com
 // Submitted by Giles Thomas <giles@pythonanywhere.com>
 pythonanywhere.com
 eu.pythonanywhere.com
 
-// QOTO, Org.
-// Submitted by Jeffrey Phillips Freeman <jeffrey.freeman@qoto.org>
-qoto.io
-
-// Qualifio : https://qualifio.com/
-// Submitted by Xavier De Cock <xdecock@gmail.com>
-qualifioapp.com
-
-// QuickBackend: https://www.quickbackend.com
-// Submitted by Dani Biro <dani@pymet.com>
-qbuser.com
-
-// Rad Web Hosting: https://radwebhosting.com
-// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
-cloudsite.builders
-
-// Redgate Software: https://red-gate.com
-// Submitted by Andrew Farries <andrew.farries@red-gate.com>
-instances.spawn.cc
-
-// Redstar Consultants : https://www.redstarconsultants.com/
-// Submitted by Jons Slemmer <jons@redstarconsultants.com>
-instantcloud.cn
-
-// Russian Academy of Sciences
-// Submitted by Tech Support <support@rasnet.ru>
-ras.ru
-
 // QA2
-// Submitted by Daniel Dent (https://www.danieldent.com/)
+// Submitted by Daniel Dent : https://www.danieldent.com/
 qa2.com
 
 // QCX
@@ -13479,11 +15199,35 @@ qcx.io
 *.sys.qcx.io
 
 // QNAP System Inc : https://www.qnap.com
-// Submitted by Nick Chang <nickchang@qnap.com>
-dev-myqnapcloud.com
+// Submitted by Nick Chang <cloudadmin@qnap.com>
+myqnapcloud.cn
 alpha-myqnapcloud.com
+dev-myqnapcloud.com
+mycloudnas.com
+mynascloud.com
 myqnapcloud.com
 
+// QOTO, Org.
+// Submitted by Jeffrey Phillips Freeman <jeffrey.freeman@qoto.org>
+qoto.io
+
+// Qualifio : https://qualifio.com/
+// Submitted by Xavier De Cock <xdecock@gmail.com>
+qualifioapp.com
+
+// Quality Unit : https://qualityunit.com
+// Submitted by Vasyl Tsalko <vtsalko@qualityunit.com>
+ladesk.com
+
+// Qualy : https://qualyhq.com
+// Submitted by Raphael Arias <security@qualyhq.com>
+*.qualyhqpartner.com
+*.qualyhqportal.com
+
+// QuickBackend : https://www.quickbackend.com
+// Submitted by Dani Biro <dani@pymet.com>
+qbuser.com
+
 // Quip : https://quip.com
 // Submitted by Patrick Linehan <plinehan@quip.com>
 *.quipelements.com
@@ -13498,35 +15242,94 @@ vaporcloud.io
 rackmaze.com
 rackmaze.net
 
-// Rakuten Games, Inc : https://dev.viberplay.io
-// Submitted by Joshua Zhang <public-suffix@rgames.jp>
-g.vbrplsbx.io
+// Rad Web Hosting : https://radwebhosting.com
+// Submitted by Scott Claeys <s.claeys@radwebhosting.com>
+cloudsite.builders
+myradweb.net
+servername.us
+
+// Radix FZC : http://domains.in.net
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+web.in
+in.net
+
+// Raidboxes GmbH : https://raidboxes.de
+// Submitted by Auke Tembrink <hostmaster@raidboxes.de>
+myrdbx.io
+site.rb-hosting.io
+
+// Railway Corporation : https://railway.com
+// Submitted by Phineas Walton <dns@railway.com>
+up.railway.app
 
 // Rancher Labs, Inc : https://rancher.com
 // Submitted by Vincent Fiduccia <domains@rancher.com>
-*.on-k3s.io
 *.on-rancher.cloud
+*.on-k3s.io
 *.on-rio.io
 
+// RavPage : https://www.ravpage.co.il
+// Submitted by Roni Horowitz <roni@responder.co.il>
+ravpage.co.il
+
 // Read The Docs, Inc : https://www.readthedocs.org
 // Submitted by David Fischer <team@readthedocs.org>
+readthedocs-hosted.com
 readthedocs.io
 
 // Red Hat, Inc. OpenShift : https://openshift.redhat.com/
 // Submitted by Tim Kramer <tkramer@rhcloud.com>
 rhcloud.com
 
+// Redgate Software : https://red-gate.com
+// Submitted by Andrew Farries <andrew.farries@red-gate.com>
+instances.spawn.cc
+
+// Redpanda Data : https://redpanda.com
+// Submitted by Infrastructure Team <security@redpanda.com>
+*.clusters.rdpa.co
+*.srvrless.rdpa.co
+
 // Render : https://render.com
 // Submitted by Anurag Goel <dev@render.com>
-app.render.com
 onrender.com
+app.render.com
 
 // Repl.it : https://repl.it
-// Submitted by Lincoln Bergeson <lincoln@replit.com>
+// Submitted by Lincoln Bergeson <psl@repl.it>
+replit.app
+id.replit.app
 firewalledreplit.co
 id.firewalledreplit.co
 repl.co
 id.repl.co
+replit.dev
+archer.replit.dev
+bones.replit.dev
+canary.replit.dev
+global.replit.dev
+hacker.replit.dev
+id.replit.dev
+janeway.replit.dev
+kim.replit.dev
+kira.replit.dev
+kirk.replit.dev
+odo.replit.dev
+paris.replit.dev
+picard.replit.dev
+pike.replit.dev
+prerelease.replit.dev
+reed.replit.dev
+riker.replit.dev
+sisko.replit.dev
+spock.replit.dev
+staging.replit.dev
+sulu.replit.dev
+tarpit.replit.dev
+teams.replit.dev
+tucker.replit.dev
+wesley.replit.dev
+worf.replit.dev
 repl.run
 
 // Resin.io : https://resin.io
@@ -13538,11 +15341,6 @@ devices.resinstaging.io
 // Submitted by Chris Kastorff <info@rethinkdb.com>
 hzc.io
 
-// Revitalised Limited : http://www.revitalised.co.uk
-// Submitted by Jack Price <jack@revitalised.co.uk>
-wellbeingzone.eu
-wellbeingzone.co.uk
-
 // Rico Developments Limited : https://adimo.co
 // Submitted by Colin Brown <hello@adimo.co>
 adimo.co.uk
@@ -13551,6 +15349,16 @@ adimo.co.uk
 // Submitted by Micah Anderson <micah@riseup.net>
 itcouldbewor.se
 
+// Roar Domains LLC : https://roar.basketball/
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+aus.basketball
+nz.basketball
+
+// ROBOT PAYMENT INC. : https://www.robotpayment.co.jp/
+// Submitted by Kentaro Takamori <takamori.kentaro@robotpayment.co.jp>
+subsc-pay.com
+subsc-pay.net
+
 // Rochester Institute of Technology : http://www.rit.edu/
 // Submitted by Jennifer Herting <jchits@rit.edu>
 git-pages.rit.edu
@@ -13559,7 +15367,13 @@ git-pages.rit.edu
 // Submitted by Neil Hanlon <neil@resf.org>
 rocky.page
 
-// Rusnames Limited: http://rusnames.ru/
+// Ruhr University Bochum : https://www.ruhr-uni-bochum.de/
+// Submitted by Andreas Jobs <noc@ruhr-uni-bochum.de>
+rub.de
+ruhr-uni-bochum.de
+io.noc.ruhr-uni-bochum.de
+
+// Rusnames Limited : http://rusnames.ru/
 // Submitted by Sergey Zotov <admin@rusnames.ru>
 ะฑะธะท.ั€ัƒั
 ะบะพะผ.ั€ัƒั
@@ -13572,6 +15386,14 @@ rocky.page
 ัะฟะฑ.ั€ัƒั
 ั.ั€ัƒั
 
+// Russian Academy of Sciences
+// Submitted by Tech Support <support@rasnet.ru>
+ras.ru
+
+// Sakura Frp : https://www.natfrp.com
+// Submitted by Bobo Liu <support@natfrp.cloud>
+nyat.app
+
 // SAKURA Internet Inc. : https://www.sakura.ad.jp/
 // Submitted by Internet Service Department <rs-vendor-ml@sakura.ad.jp>
 180r.com
@@ -13622,45 +15444,95 @@ x0.to
 from.tv
 sakura.tv
 
-// Salesforce.com, Inc. https://salesforce.com/
-// Submitted by Michael Biven <mbiven@salesforce.com>
+// Salesforce.com, Inc. : https://salesforce.com/
+// Submitted by Salesforce Public Suffix List Team <public-suffix-list@salesforce.com>
 *.builder.code.com
 *.dev-builder.code.com
 *.stg-builder.code.com
+*.001.test.code-builder-stg.platform.salesforce.com
+*.aa.crm.dev
+*.ab.crm.dev
+*.ac.crm.dev
+*.ad.crm.dev
+*.ae.crm.dev
+*.af.crm.dev
+*.ci.crm.dev
+*.d.crm.dev
+*.pa.crm.dev
+*.pb.crm.dev
+*.pc.crm.dev
+*.pd.crm.dev
+*.pe.crm.dev
+*.pf.crm.dev
+*.w.crm.dev
+*.wa.crm.dev
+*.wb.crm.dev
+*.wc.crm.dev
+*.wd.crm.dev
+*.we.crm.dev
+*.wf.crm.dev
 
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <asheesh@sandstorm.io>
 sandcats.io
 
+// Sav.com, LLC : https://marketing.sav.com/
+// Submitted by Mukul Kudegave <mukul@sav.com>
+sav.case
+
 // SBE network solutions GmbH : https://www.sbe.de/
 // Submitted by Norman Meilick <nm@sbe.de>
-logoip.de
 logoip.com
+logoip.de
 
 // Scaleway : https://www.scaleway.com/
-// Submitted by Rรฉmy Lรฉone <rleone@scaleway.com>
+// Submitted by Scaleway PSL Maintainer <psl-maintainers@scaleway.com>
 fr-par-1.baremetal.scw.cloud
 fr-par-2.baremetal.scw.cloud
 nl-ams-1.baremetal.scw.cloud
+cockpit.fr-par.scw.cloud
+ddl.fr-par.scw.cloud
+dtwh.fr-par.scw.cloud
 fnc.fr-par.scw.cloud
 functions.fnc.fr-par.scw.cloud
+ifr.fr-par.scw.cloud
 k8s.fr-par.scw.cloud
 nodes.k8s.fr-par.scw.cloud
+kafk.fr-par.scw.cloud
+mgdb.fr-par.scw.cloud
+rdb.fr-par.scw.cloud
 s3.fr-par.scw.cloud
 s3-website.fr-par.scw.cloud
+scbl.fr-par.scw.cloud
 whm.fr-par.scw.cloud
 priv.instances.scw.cloud
 pub.instances.scw.cloud
 k8s.scw.cloud
+cockpit.nl-ams.scw.cloud
+ddl.nl-ams.scw.cloud
+dtwh.nl-ams.scw.cloud
+ifr.nl-ams.scw.cloud
 k8s.nl-ams.scw.cloud
 nodes.k8s.nl-ams.scw.cloud
+kafk.nl-ams.scw.cloud
+mgdb.nl-ams.scw.cloud
+rdb.nl-ams.scw.cloud
 s3.nl-ams.scw.cloud
 s3-website.nl-ams.scw.cloud
+scbl.nl-ams.scw.cloud
 whm.nl-ams.scw.cloud
+cockpit.pl-waw.scw.cloud
+ddl.pl-waw.scw.cloud
+dtwh.pl-waw.scw.cloud
+ifr.pl-waw.scw.cloud
 k8s.pl-waw.scw.cloud
 nodes.k8s.pl-waw.scw.cloud
+kafk.pl-waw.scw.cloud
+mgdb.pl-waw.scw.cloud
+rdb.pl-waw.scw.cloud
 s3.pl-waw.scw.cloud
 s3-website.pl-waw.scw.cloud
+scbl.pl-waw.scw.cloud
 scalebook.scw.cloud
 smartlabeling.scw.cloud
 dedibox.fr
@@ -13669,7 +15541,7 @@ dedibox.fr
 // Submitted by Hanno Bรถck <hanno@schokokeks.org>
 schokokeks.net
 
-// Scottish Government: https://www.gov.scot
+// Scottish Government : https://www.gov.scot
 // Submitted by Martin Ellis <martin.ellis@gov.scot>
 gov.scot
 service.gov.scot
@@ -13678,6 +15550,10 @@ service.gov.scot
 // Submitted by Shante Adam <shante@skyhat.io>
 scrysec.com
 
+// Scrypted : https://scrypted.app
+// Submitted by Koushik Dutta <public-suffix-list@scrypted.app>
+client.scrypted.io
+
 // Securepoint GmbH : https://www.securepoint.de
 // Submitted by Erik Anders <erik.anders@securepoint.de>
 firewall-gateway.com
@@ -13699,17 +15575,17 @@ seidat.net
 // Submitted by Yuriy Romadin <contact@sellfy.com>
 sellfy.store
 
+// Sendmsg : https://www.sendmsg.co.il
+// Submitted by Assaf Stern <domains@comstar.co.il>
+minisite.ms
+
 // Senseering GmbH : https://www.senseering.de
 // Submitted by Felix Mรถnckemeyer <f.moenckemeyer@senseering.de>
 senseering.net
 
-// Sendmsg: https://www.sendmsg.co.il
-// Submitted by Assaf Stern <domains@comstar.co.il>
-minisite.ms
-
-// Service Magnet : https://myservicemagnet.com
-// Submitted by Dave Sanders <dave@myservicemagnet.com>
-magnet.page
+// Servebolt AS : https://servebolt.com
+// Submitted by Daniel Kjeserud <cloudops@servebolt.com>
+servebolt.cloud
 
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
@@ -13717,14 +15593,13 @@ biz.ua
 co.ua
 pp.ua
 
-// Shift Crypto AG : https://shiftcrypto.ch
-// Submitted by alex <alex@shiftcrypto.ch>
-shiftcrypto.dev
-shiftcrypto.io
+// Shanghai Accounting Society : https://www.sasf.org.cn
+// Submitted by Information Administration <info@sasf.org.cn>
+as.sh.cn
 
-// ShiftEdit : https://shiftedit.net/
-// Submitted by Adam Jimenez <adam@shiftcreate.com>
-shiftedit.io
+// Sheezy.Art : https://sheezy.art
+// Submitted by Nyoom <admin@sheezy.art>
+sheezy.games
 
 // Shopblocks : http://www.shopblocks.com/
 // Submitted by Alex Bowers <alex@shopblocks.com>
@@ -13740,6 +15615,7 @@ shopitsite.com
 
 // shopware AG : https://shopware.com
 // Submitted by Jens Kรผper <cloud@shopware.com>
+shopware.shop
 shopware.store
 
 // Siemens Mobility GmbH
@@ -13758,24 +15634,32 @@ vipsinaapp.com
 // Submitted by Skylar Challand <support@siteleaf.com>
 siteleaf.net
 
-// Skyhat : http://www.skyhat.io
-// Submitted by Shante Adam <shante@skyhat.io>
-bounty-full.com
-alpha.bounty-full.com
-beta.bounty-full.com
-
 // Small Technology Foundation : https://small-tech.org
 // Submitted by Aral Balkan <aral@small-tech.org>
 small-web.org
 
+// Smallregistry by Promopixel SARL : https://www.smallregistry.net
+// Former AFNIC's SLDs
+// Submitted by Jรฉrรดme Lipowicz <support@promopixel.com>
+aeroport.fr
+avocat.fr
+chambagri.fr
+chirurgiens-dentistes.fr
+experts-comptables.fr
+medecin.fr
+notaires.fr
+pharmacien.fr
+port.fr
+veterinaire.fr
+
 // Smoove.io : https://www.smoove.io/
 // Submitted by Dan Kozak <dan@smoove.io>
 vp4.me
 
 // Snowflake Inc : https://www.snowflake.com/
-// Submitted by Faith Olapade <faith.olapade@snowflake.com>
-snowflake.app
-privatelink.snowflake.app
+// Submitted by Sam Haar <psl@snowflake.com>
+*.snowflake.app
+*.privatelink.snowflake.app
 streamlit.app
 streamlitapp.com
 
@@ -13783,51 +15667,40 @@ streamlitapp.com
 // Submitted by Ian Streeter <ian@snowplowanalytics.com>
 try-snowplow.com
 
-// SourceHut : https://sourcehut.org
-// Submitted by Drew DeVault <sir@cmpwn.com>
-srht.site
-
-// Stackhero : https://www.stackhero.io
-// Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
-stackhero-network.com
-
-// Staclar : https://staclar.com
-// Submitted by Q Misell <q@staclar.com>
-musician.io
-// Submitted by Matthias Merkel <matthias.merkel@staclar.com>
-novecore.site
-
-// staticland : https://static.land
-// Submitted by Seth Vincent <sethvincent@gmail.com>
-static.land
-dev.static.land
-sites.static.land
-
-// Storebase : https://www.storebase.io
-// Submitted by Tony Schirmer <tony@storebase.io>
-storebase.store
+// Software Consulting Michal Zalewski : https://www.mafelo.com
+// Submitted by Michal Zalewski <security@mafelo.com>
+mafelo.net
 
-// Strategic System Consulting (eApps Hosting): https://www.eapps.com/
-// Submitted by Alex Oancea <aoancea@cloudscale365.com>
-vps-host.net
-atl.jelastic.vps-host.net
-njs.jelastic.vps-host.net
-ric.jelastic.vps-host.net
+// Solana Name Service :  https://sns.id
+// Submitted by Solana Name Service <contact@sns.id>
+sol.site
 
 // Sony Interactive Entertainment LLC : https://sie.com/
 // Submitted by David Coles <david.coles@sony.com>
 playstation-cloud.com
 
+// SourceHut : https://sourcehut.org
+// Submitted by Drew DeVault <sir@cmpwn.com>
+srht.site
+
 // SourceLair PC : https://www.sourcelair.com
 // Submitted by Antonis Kalipetis <akalipetis@sourcelair.com>
 apps.lair.io
 *.stolos.io
 
-// SpaceKit : https://www.spacekit.io/
-// Submitted by Reza Akhavan <spacekit.io@gmail.com>
-spacekit.io
+// sourceWAY GmbH : https://sourceway.de
+// Submitted by Richard Reiber <mail@sourceway.de>
+4.at
+my.at
+my.de
+*.nxa.eu
+nx.gw
+
+// Spawnbase : https://spawnbase.ai
+// Submitted by Alexander Zuev <security@spawnbase.ai>
+spawnbase.app
 
-// SpeedPartner GmbH: https://www.speedpartner.de/
+// SpeedPartner GmbH : https://www.speedpartner.de/
 // Submitted by Stefan Neufeind <info@speedpartner.de>
 customer.speedpartner.de
 
@@ -13853,38 +15726,107 @@ myspreadshop.pl
 myspreadshop.se
 myspreadshop.co.uk
 
+// StackBlitz : https://stackblitz.com
+// Submitted by Dominic Elm & Albert Pai <security@bolt.new>
+w-corp-staticblitz.com
+w-credentialless-staticblitz.com
+w-staticblitz.com
+bolt.host
+
+// Stackhero : https://www.stackhero.io
+// Submitted by Adrien Gillon <adrien+public-suffix-list@stackhero.io>
+stackhero-network.com
+
+// STACKIT GmbH & Co. KG : https://www.stackit.de/en/
+// Submitted by STACKIT-DNS Team (Simon Stier) <dns@stackit.cloud>
+runs.onstackit.cloud
+stackit.gg
+stackit.rocks
+stackit.run
+stackit.zone
+
+// Stackryze : https://stackryze.com
+// Submitted by Sudheer Bhuvana <security@stackryze.com>
+indevs.in
+
+// Staclar : https://staclar.com
+// Submitted by Q Misell <q@staclar.com>
+// Submitted by Matthias Merkel <matthias.merkel@staclar.com>
+musician.io
+novecore.site
+
 // Standard Library : https://stdlib.com
 // Submitted by Jacob Lee <jacob@stdlib.com>
 api.stdlib.com
 
+// statichost.eu : https://www.statichost.eu
+// Submitted by Eric Selin <admin@statichost.eu>
+statichost.page
+
+// stereosense GmbH : https://www.involve.me
+// Submitted by Florian Burmann <publicsuffix@involve.me>
+feedback.ac
+forms.ac
+assessments.cx
+calculators.cx
+funnels.cx
+paynow.cx
+quizzes.cx
+researched.cx
+tests.cx
+surveys.so
+
+// Storacha Network : https://storacha.network
+// Submitted by Alan Shaw <support@storacha.network>
+ipfs.storacha.link
+ipfs.w3s.link
+
+// Storebase : https://www.storebase.io
+// Submitted by Tony Schirmer <tony@storebase.io>
+storebase.store
+
 // Storj Labs Inc. : https://storj.io/
 // Submitted by Philip Hutchins <hostmaster@storj.io>
 storj.farm
 
-// Studenten Net Twente : http://www.snt.utwente.nl/
-// Submitted by Silke Hofstra <syscom@snt.utwente.nl>
-utwente.io
+// Strapi : https://strapi.io/
+// Submitted by Florent Baldino <security@strapi.io>
+strapiapp.com
+media.strapiapp.com
+
+// Strategic System Consulting (eApps Hosting) : https://www.eapps.com/
+// Submitted by Alex Oancea <aoancea@cloudscale365.com>
+vps-host.net
+atl.jelastic.vps-host.net
+njs.jelastic.vps-host.net
+ric.jelastic.vps-host.net
+
+// Streak : https://streak.com
+// Submitted by Blake Kadatz <eng@streak.com>
+streak-link.com
+streaklinks.com
+streakusercontent.com
 
 // Student-Run Computing Facility : https://www.srcf.net/
 // Submitted by Edwin Balani <sysadmins@srcf.net>
 soc.srcf.net
 user.srcf.net
 
-// Sub 6 Limited: http://www.sub6.com
+// Studenten Net Twente : http://www.snt.utwente.nl/
+// Submitted by Silke Hofstra <syscom@snt.utwente.nl>
+utwente.io
+
+// Sub 6 Limited : http://www.sub6.com
 // Submitted by Dan Miller <dm@sub6.com>
 temp-dns.com
 
 // Supabase : https://supabase.io
-// Submitted by Inian Parameshwaran <security@supabase.io>
+// Submitted by Supabase Security <psl-maintainers@supabase.io>
 supabase.co
+realtime.supabase.co
+storage.supabase.co
 supabase.in
 supabase.net
-su.paba.se
-
-// Symfony, SAS : https://symfony.com/
-// Submitted by Fabien Potencier <fabien@symfony.com>
-*.s5y.io
-*.sensiosite.cloud
 
 // Syncloud : https://syncloud.org
 // Submitted by Boris Rybalkin <syncloud@syncloud.it>
@@ -13906,34 +15848,61 @@ dsmynas.net
 familyds.net
 dsmynas.org
 familyds.org
-vpnplus.to
 direct.quickconnect.to
+vpnplus.to
 
 // Tabit Technologies Ltd. : https://tabit.cloud/
 // Submitted by Oren Agiv <oren@tabit.cloud>
-tabitorder.co.il
-mytabit.co.il
 mytabit.com
+mytabit.co.il
+tabitorder.co.il
 
 // TAIFUN Software AG : http://taifun-software.de
 // Submitted by Bjoern Henke <dev-server@taifun-software.de>
 taifun-dns.de
 
+// Tailor Inc. : https://www.tailor.tech
+// Submitted by Ryuzo Yamamoto <psl-maintainers@tailor.tech>
+erp.dev
+web.erp.dev
+
 // Tailscale Inc. : https://www.tailscale.com
-// Submitted by David Anderson <danderson@tailscale.com>
-beta.tailscale.net
+// Submitted by David Anderson <infra+public-suffix-list@tailscale.com>
 ts.net
+*.c.ts.net
 
-// TASK geographical domains (www.task.gda.pl/uslugi/dns)
+// TASK geographical domains : https://task.gda.pl/en/services/for-entrepreneurs/
 gda.pl
 gdansk.pl
 gdynia.pl
 med.pl
 sopot.pl
 
-// team.blue https://team.blue
-// Submitted by Cedric Dubois <cedric.dubois@team.blue>
+// Tave Creative Corp : https://tave.com/
+// Submitted by Adrian Ziemkowski <devops@tave.com>
+taveusercontent.com
+
+// tawk.to, Inc : https://www.tawk.to
+// Submitted by tawk.to developer team <dev-accounts@tawk.to>
+p.tawk.email
+p.tawkto.email
+
+// Tche.br : https://tche.br
+// Submitted by Bruno Lorensi <suporte@tche.br>
+tche.br
+
+// team.blue : https://team.blue
+// Submitted by Cedric Dubois <psl-sh@team.blue>
 site.tb-hosting.com
+directwp.eu
+
+// TechEdge Limited: https://www.nic.uk.cc/
+// Submitted by TechEdge Developer <support@nic.uk.cc>
+ec.cc
+eu.cc
+gu.cc
+uk.cc
+us.cc
 
 // Teckids e.V. : https://www.teckids.org
 // Submitted by Dominik George <dominik.george@teckids.org>
@@ -13946,6 +15915,10 @@ telebit.app
 telebit.io
 *.telebit.xyz
 
+// Teleport : https://goteleport.com
+// Submitted by Rob Picard <security@goteleport.com>
+teleport.sh
+
 // Thingdust AG : https://thingdust.com/
 // Submitted by Adrian Imboden <adi@thingdust.com>
 *.firenet.ch
@@ -13953,11 +15926,11 @@ telebit.io
 reservd.com
 thingdustdata.com
 cust.dev.thingdust.io
+reservd.dev.thingdust.io
 cust.disrec.thingdust.io
+reservd.disrec.thingdust.io
 cust.prod.thingdust.io
 cust.testing.thingdust.io
-reservd.dev.thingdust.io
-reservd.disrec.thingdust.io
 reservd.testing.thingdust.io
 
 // ticket i/O GmbH : https://ticket.io
@@ -13971,13 +15944,12 @@ azimuth.network
 tlon.network
 
 // Tor Project, Inc. : https://torproject.org
-// Submitted by Antoine Beauprรฉ <anarcat@torproject.org
+// Submitted by Antoine Beauprรฉ <anarcat@torproject.org>
 torproject.net
 pages.torproject.net
 
 // TownNews.com : http://www.townnews.com
 // Submitted by Dustin Ward <dward@townnews.com>
-bloxcms.com
 townnews-staging.com
 
 // TrafficPlex GmbH : https://www.trafficplex.de/
@@ -14003,59 +15975,60 @@ webspace.rocks
 lima.zone
 
 // TransIP : https://www.transip.nl
-// Submitted by Rory Breuk <rbreuk@transip.nl>
+// Submitted by Rory Breuk <rbreuk@transip.nl> and Cedric Dubois <cedric.dubois@team.blue>
 *.transurl.be
 *.transurl.eu
+site.transip.me
 *.transurl.nl
 
-// TransIP: https://www.transip.nl
-// Submitted by Cedric Dubois <cedric.dubois@team.blue>
-site.transip.me
+// Tunnelmole: https://tunnelmole.com
+// Submitted by Robbie Cahill <support@tunnelmole.com>
+tunnelmole.net
 
 // TuxFamily : http://tuxfamily.org
 // Submitted by TuxFamily administrators <adm@staff.tuxfamily.org>
 tuxfamily.org
 
-// TwoDNS : https://www.twodns.de/
-// Submitted by TwoDNS-Support <support@two-dns.de>
-dd-dns.de
-diskstation.eu
-diskstation.org
-dray-dns.de
-draydns.de
-dyn-vpn.de
-dynvpn.de
-mein-vigor.de
-my-vigor.de
-my-wan.de
-syno-ds.de
-synology-diskstation.de
-synology-ds.de
-
 // Typedream : https://typedream.com
 // Submitted by Putri Karunia <putri@typedream.com>
 typedream.app
 
 // Typeform : https://www.typeform.com
-// Submitted by Sergi Ferriz <sergi.ferriz@typeform.com>
+// Submitted by Typeform <ops@typeform.com>
 pro.typeform.com
 
 // Uberspace : https://uberspace.de
 // Submitted by Moritz Werner <mwerner@jonaspasche.com>
 uber.space
-*.uberspace.de
 
 // UDR Limited : http://www.udr.hk.com
 // Submitted by registry <hostmaster@udr.hk.com>
 hk.com
-hk.org
-ltd.hk
 inc.hk
+ltd.hk
+hk.org
 
 // UK Intis Telecom LTD : https://it.com
 // Submitted by ITComdomains <to@it.com>
 it.com
 
+// Umso Software Inc. : https://www.umso.com
+// Submitted by Alexis Taylor <security@umso.com>
+umso.co
+
+// Unison Computing, PBC : https://unison.cloud
+// Submitted by Simon Hรธjberg <security@unison.cloud>
+unison-services.cloud
+
+// United Gameserver GmbH : https://united-gameserver.de
+// Submitted by Stefan Schwarz <sysadm@united-gameserver.de>
+virtual-user.de
+virtualuser.de
+
+// United States Writing Corporation : https://uswriting.co
+// Submitted by Andrew Sampson <security@obj.ag>
+obj.ag
+
 // UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
 // see also: whois -h whois.udr.org.yt help
 // Submitted by Atanunu Igbunuroghene <publicsuffixlist@udr.org.yt>
@@ -14065,92 +16038,62 @@ biz.wf
 sch.wf
 org.yt
 
-// United Gameserver GmbH : https://united-gameserver.de
-// Submitted by Stefan Schwarz <sysadm@united-gameserver.de>
-virtualuser.de
-virtual-user.de
+// University of Banja Luka : https://unibl.org
+// Domains for Republic of Srpska administrative entity.
+// Submitted by Marko Ivanovic <kormang@hotmail.rs>
+rs.ba
 
-// Upli : https://upli.io
-// Submitted by Lenny Bakkalian <lenny.bakkalian@gmail.com>
-upli.io
+// University of Bielsko-Biala regional domain : http://dns.bielsko.pl/
+// Submitted by Marcin <dns@ath.bielsko.pl>
+bielsko.pl
 
 // urown.net : https://urown.net
 // Submitted by Hostmaster <hostmaster@urown.net>
 urown.cloud
 dnsupdate.info
 
-// .US
-// Submitted by Ed Moore <Ed.Moore@lib.de.us>
-lib.de.us
+// US REGISTRY LLC : http://us.org
+// Submitted by Gavin Brown <gavin.brown@centralnic.com>
+us.org
 
-// VeryPositive SIA : http://very.lv
-// Submitted by Danko Aleksejevs <danko@very.lv>
-2038.io
+// V.UA Domain Registry: https://www.v.ua/
+// Submitted by Serhii Rostilo <admin@v.ua>
+v.ua
+
+// Val Town, Inc : https://val.town/
+// Submitted by Tom MacWright <security@val.town>
+val.run
+web.val.run
 
 // Vercel, Inc : https://vercel.com/
-// Submitted by Connor Davis <security@vercel.com>
+// Submitted by Laurens Duijvesteijn <security@vercel.com>
 vercel.app
+v0.build
 vercel.dev
+vusercontent.net
+vercel.run
 now.sh
 
-// Viprinet Europe GmbH : http://www.viprinet.com
-// Submitted by Simon Kissel <hostmaster@viprinet.com>
-router.management
+// VeryPositive SIA : http://very.lv
+// Submitted by Danko Aleksejevs <danko@very.lv>
+2038.io
 
 // Virtual-Info : https://www.virtual-info.info/
 // Submitted by Adnan RIHAN <hostmaster@v-info.info>
 v-info.info
 
-// Voorloper.com: https://voorloper.com
+// VistaBlog : https://vistablog.ir/
+// Submitted by Hossein Piri <info@vistablog.ir>
+vistablog.ir
+
+// Viva Republica, Inc. : https://toss.im/
+// Submitted by Deus Team <deus@toss.im>
+deus-canvas.com
+
+// Voorloper.com : https://voorloper.com
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
-// Voxel.sh DNS : https://voxel.sh/dns/
-// Submitted by Mia Rehlinger <dns@voxel.sh>
-neko.am
-nyaa.am
-be.ax
-cat.ax
-es.ax
-eu.ax
-gg.ax
-mc.ax
-us.ax
-xy.ax
-nl.ci
-xx.gl
-app.gp
-blog.gt
-de.gt
-to.gt
-be.gy
-cc.hn
-blog.kg
-io.kg
-jp.kg
-tv.kg
-uk.kg
-us.kg
-de.ls
-at.md
-de.md
-jp.md
-to.md
-indie.porn
-vxl.sh
-ch.tc
-me.tc
-we.tc
-nyan.to
-at.vg
-blog.vu
-dev.vu
-me.vu
-
-// V.UA Domain Administrator : https://domain.v.ua/
-// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
-v.ua
-
 // Vultr Objects : https://www.vultr.com/products/object-storage/
 // Submitted by Niels Maumenee <storage@vultr.com>
 *.vultrobjects.com
@@ -14159,42 +16102,95 @@ v.ua
 // Submitted by Masayuki Note <masa@blade.wafflecell.com>
 wafflecell.com
 
-// WebHare bv: https://www.webhare.com/
+// Walrus : https://walrus.xyz
+// Submitted by Max Spector <info@walrus.xyz>
+wal.app
+
+// Wasmer: https://wasmer.io
+// Submitted by Lorentz Kinde <security@wasmer.io>
+wasmer.app
+
+// Webflow, Inc. : https://www.webflow.com
+// Submitted by Webflow Security Team <security@webflow.com>
+webflow.io
+webflowtest.io
+
+// WebHare bv : https://www.webhare.com/
 // Submitted by Arnold Hendriks <info@webhare.com>
 *.webhare.dev
 
-// WebHotelier Technologies Ltd: https://www.webhotelier.net/
+// WebHotelier Technologies Ltd : https://www.webhotelier.net/
 // Submitted by Apostolos Tsakpinis <apostolos.tsakpinis@gmail.com>
-reserve-online.net
-reserve-online.com
 bookonline.app
 hotelwithflight.com
+reserve-online.com
+reserve-online.net
+
+// WebPros International, LLC : https://webpros.com/
+// Submitted by Nicolas Rochelemagne <public.suffix@webpros.com>
+cprapid.com
+pleskns.com
+wp2.host
+pdns.page
+plesk.page
+cpanel.site
+wpsquared.site
 
-// WeDeploy by Liferay, Inc. : https://www.wedeploy.com
-// Submitted by Henrique Vicente <security@wedeploy.com>
-wedeploy.io
-wedeploy.me
-wedeploy.sh
+// WebWaddle Ltd : https://webwaddle.com/
+// Submitted by Merlin Glander <hostmaster@webwaddle.com>
+*.wadl.top
 
 // Western Digital Technologies, Inc : https://www.wdc.com
 // Submitted by Jung Jin <jungseok.jin@wdc.com>
 remotewd.com
 
+// Whatbox Inc. : https://whatbox.ca/
+// Submitted by Anthony Ryan <servers@whatbox.ca>
+box.ca
+
 // WIARD Enterprises : https://wiardweb.com
 // Submitted by Kidd Hustle <kiddhustle@wiardweb.com>
 pages.wiardweb.com
 
-// Wikimedia Labs : https://wikitech.wikimedia.org
-// Submitted by Arturo Borrero Gonzalez <aborrero@wikimedia.org>
-wmflabs.org
+// Wikimedia Foundation : https://wikitech.wikimedia.org
+// Submitted by Timo Tijhof <noc@wikimedia.org>
 toolforge.org
 wmcloud.org
+beta.wmcloud.org
+wmflabs.org
+
+// William Harrison : https://wharrison.com.au
+// Submitted by William Harrison <security@hrsn.net>
+vps.hrsn.au
+hrsn.dev
+is-a.dev
+localcert.net
+
+// Windsurf : https://windsurf.com
+// Submitted by Douglas Chen <psl@windsurf.com>
+windsurf.app
+windsurf.build
+
+// WirelessCar : https://wirelesscar.com
+// Submitted by Martin Lindberg <drive-platform@wirelesscar.com>
+drive-platform.com
+drive-platform.io
 
 // WISP : https://wisp.gg
 // Submitted by Stepan Fedotov <stepan@wisp.gg>
 panel.gg
 daemon.panel.gg
 
+// Wix.com, Inc. : https://www.wix.com
+// Submitted by Shahar Talmi / Alon Kochba <publicsuffixlist@wix.com>
+base44.app
+base44-sandbox.com
+wixsite.com
+wixstudio.com
+editorx.io
+wixstudio.io
+wix.run
+
 // Wizard Zines : https://wizardzines.com
 // Submitted by Julia Evans <julia@wizardzines.com>
 messwithdns.com
@@ -14220,13 +16216,9 @@ weeklylottery.org.uk
 wpenginepowered.com
 js.wpenginepowered.com
 
-// Wix.com, Inc. : https://www.wix.com
-// Submitted by Shahar Talmi <shahar@wix.com>
-wixsite.com
-editorx.io
-
-// XenonCloud GbR: https://xenoncloud.net
+// XenonCloud GbR : https://xenoncloud.net
 // Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
+*.xenonconnect.de
 half.host
 
 // XnBay Technology : http://www.xnbay.com/
@@ -14241,11 +16233,16 @@ cistron.nl
 demon.nl
 xs4all.space
 
-// Yandex.Cloud LLC: https://cloud.yandex.com
+// xTool : https://xtool.com
+// Submitted by Echo <admin@xtool.com>
+xtooldevice.com
+
+// Yandex.Cloud LLC : https://cloud.yandex.com
 // Submitted by Alexander Lodin <security+psl@yandex-team.ru>
 yandexcloud.net
 storage.yandexcloud.net
 website.yandexcloud.net
+sourcecraft.site
 
 // YesCourse Pty Ltd : https://yescourse.com
 // Submitted by Atul Bhouraskar <atul@yescourse.com>
@@ -14255,16 +16252,6 @@ official.academy
 // Submitted by Stefano Rivera <stefano@yola.com>
 yolasite.com
 
-// Yombo : https://yombo.net
-// Submitted by Mitch Schwenk <mitch@yombo.net>
-ybo.faith
-yombo.me
-homelink.one
-ybo.party
-ybo.review
-ybo.science
-ybo.trade
-
 // Yunohost : https://yunohost.org
 // Submitted by Valentin Grimaud <security@yunohost.org>
 ynh.fr
@@ -14276,6 +16263,18 @@ noho.st
 za.net
 za.org
 
+// ZAP-Hosting GmbH & Co. KG : https://zap-hosting.com
+// Submitted by Julian Alker <security@zap-hosting.com>
+zap.cloud
+
+// Zeabur : https://zeabur.com/
+// Submitted by Zeabur Team <contact@zeabur.com>
+zeabur.app
+
+// Zerops : https://zerops.io/
+// Submitted by Zerops Team <security@zerops.io>
+*.zerops.app
+
 // Zine EOOD : https://zine.bg/
 // Submitted by Martin Angelov <martin@zine.bg>
 bss.design
@@ -14286,4 +16285,13 @@ basicserver.io
 virtualserver.io
 enterprisecloud.nu
 
+// Zone.ID: https://zone.id
+// Submitted by Gx1.org <security@gx1.org>
+zone.id
+nett.to
+
+// ZoneABC : https://zoneabc.net
+// Submitted by ZoneABC Team <support@zoneabc.net>
+zabc.net
+
 // ===END PRIVATE DOMAINS===
diff --git a/libs/tld/result.py b/libs/tld/result.py
index 1f1ae68e81..ae56e63f62 100644
--- a/libs/tld/result.py
+++ b/libs/tld/result.py
@@ -2,7 +2,7 @@
 from urllib.parse import SplitResult
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = ("Result",)
 
diff --git a/libs/tld/tests/base.py b/libs/tld/tests/base.py
index 014ff6974b..50f8958634 100644
--- a/libs/tld/tests/base.py
+++ b/libs/tld/tests/base.py
@@ -5,40 +5,13 @@
 from functools import lru_cache
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
-__all__ = (
-    "internet_available_only",
-    "log_info",
-)
+__all__ = ("internet_available_only",)
 
-LOG_INFO = True
 LOGGER = logging.getLogger(__name__)
 
 
-def log_info(func):
-    """Log some useful info."""
-    if not LOG_INFO:
-        return func
-
-    def inner(self, *args, **kwargs):
-        """Inner."""
-        result = func(self, *args, **kwargs)
-
-        LOGGER.debug("\n\n%s", func.__name__)
-        LOGGER.debug("============================")
-        if func.__doc__:
-            LOGGER.debug('""" %s """', func.__doc__.strip())
-        LOGGER.debug("----------------------------")
-        if result is not None:
-            LOGGER.debug(result)
-        LOGGER.debug("\n++++++++++++++++++++++++++++")
-
-        return result
-
-    return inner
-
-
 @lru_cache(maxsize=32)
 def is_internet_available(host="8.8.8.8", port=53, timeout=3):
     """Check if internet is available.
diff --git a/libs/tld/tests/test_commands.py b/libs/tld/tests/test_commands.py
index 7c9abe2d97..2b0fd62e72 100644
--- a/libs/tld/tests/test_commands.py
+++ b/libs/tld/tests/test_commands.py
@@ -4,11 +4,11 @@
 import subprocess
 import unittest
 
-from .base import internet_available_only, log_info
+from .base import internet_available_only
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
-__license__ = "GPL 2.0/LGPL 2.1"
+__copyright__ = "2013-2026 Artur Barseghyan"
+__license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = ("TestCommands",)
 
 LOGGER = logging.getLogger(__name__)
@@ -21,17 +21,13 @@ def setUp(self):
         """Set up."""
 
     @internet_available_only
-    @log_info
-    def test_1_update_tld_names_command(self):
+    def test_update_tld_names_command(self):
         """Test updating the tld names (re-fetch mozilla source)."""
         res = subprocess.check_output(["update-tld-names"]).strip()
         self.assertEqual(res, b"")
-        return res
 
     @internet_available_only
-    @log_info
-    def test_1_update_tld_names_mozilla_command(self):
+    def test_update_tld_names_mozilla_command(self):
         """Test updating the tld names (re-fetch mozilla source)."""
         res = subprocess.check_output(["update-tld-names", "mozilla"]).strip()
         self.assertEqual(res, b"")
-        return res
diff --git a/libs/tld/tests/test_core.py b/libs/tld/tests/test_core.py
index d416e367d8..0b03eefc9a 100644
--- a/libs/tld/tests/test_core.py
+++ b/libs/tld/tests/test_core.py
@@ -8,7 +8,7 @@
 from typing import Type
 from urllib.parse import SplitResult, urlsplit
 
-from faker import Faker  # type: ignore
+from fake import FAKER
 
 from .. import defaults
 from ..base import BaseTLDSourceParser, Registry
@@ -29,14 +29,15 @@
     get_tld_names_container,
     is_tld,
     parse_tld,
+    protocol_re,
     reset_tld_names,
     update_tld_names,
     update_tld_names_cli,
 )
-from .base import internet_available_only, log_info
+from .base import internet_available_only
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = ("TestCore",)
 
@@ -48,7 +49,6 @@ class TestCore(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.faker = Faker()
         cls.temp_dir = gettempdir()
 
     def setUp(self):
@@ -191,11 +191,11 @@ def setUp(self):
             },
             {
                 "url": "m.fr.blogspot.com.au",
-                "fld": "fr.blogspot.com.au",
-                "subdomain": "m",
-                "domain": "fr",
-                "suffix": "blogspot.com.au",
-                "tld": "blogspot.com.au",
+                "fld": "blogspot.com.au",
+                "subdomain": "m.fr",
+                "domain": "blogspot",
+                "suffix": "com.au",
+                "tld": "com.au",
                 "kwargs": {"fail_silently": True, "fix_protocol": True},
             },
             {
@@ -306,6 +306,24 @@ def setUp(self):
                 "tld": "com",
                 "kwargs": {"fail_silently": True},
             },
+            {
+                "url": "sftp://sftp.test.com",
+                "fld": "test.com",
+                "subdomain": "sftp",
+                "domain": "test",
+                "suffix": "com",
+                "tld": "com",
+                "kwargs": {"fail_silently": True, "fix_protocol": True},
+            },
+            {
+                "url": "Http://www.google.co.uk",
+                "fld": "google.co.uk",
+                "subdomain": "www",
+                "domain": "google",
+                "suffix": "co.uk",
+                "tld": "co.uk",
+                "kwargs": {"fail_silently": True, "fix_protocol": True},
+            },
         ]
 
         self.bad_patterns = {
@@ -407,46 +425,37 @@ def get_custom_parser_class(
         )
         return parser_class
 
-    @log_info
-    def test_0_tld_names_loaded(self):
+    def test_tld_names_loaded(self):
         """Test if tld names are loaded."""
         get_fld("http://www.google.co.uk")
         from ..utils import tld_names
 
         res = len(tld_names) > 0
         self.assertTrue(res)
-        return res
 
     @internet_available_only
-    @log_info
-    def test_1_update_tld_names(self):
+    def test_update_tld_names(self):
         """Test updating the tld names (re-fetch mozilla source)."""
         res = update_tld_names(fail_silently=False)
         self.assertTrue(res)
-        return res
 
-    @log_info
-    def test_2_fld_good_patterns_pass(self):
+    def test_fld_good_patterns_pass(self):
         """Test good URL patterns."""
         res = []
         for data in self.good_patterns:
             _res = get_fld(data["url"], **data["kwargs"])
             self.assertEqual(_res, data["fld"])
             res.append(_res)
-        return res
 
-    @log_info
-    def test_3_fld_bad_patterns_pass(self):
+    def test_fld_bad_patterns_pass(self):
         """Test bad URL patterns."""
         res = []
         for url, params in self.bad_patterns.items():
             _res = get_fld(url, fail_silently=True)
-            self.assertEqual(_res, None)
+            self.assertIsNone(_res)
             res.append(_res)
-        return res
 
-    @log_info
-    def test_4_override_settings(self):
+    def test_override_settings(self):
         """Testing settings override."""
 
         def override_settings():
@@ -457,14 +466,10 @@ def override_settings():
 
         set_setting("DEBUG", True)
 
-        self.assertEqual(True, override_settings())
+        self.assertTrue(override_settings())
 
-        return override_settings()
-
-    @log_info
-    def test_5_tld_good_patterns_pass_parsed_object(self):
+    def test_tld_good_patterns_pass_parsed_object(self):
         """Test good URL patterns."""
-        res = []
         for data in self.good_patterns:
             kwargs = copy.copy(data["kwargs"])
             kwargs["as_object"] = True
@@ -490,11 +495,7 @@ def test_5_tld_good_patterns_pass_parsed_object(self):
                 },
             )
 
-            res.append(_res)
-        return res
-
-    @log_info
-    def test_6_override_full_names_path(self):
+    def test_override_full_names_path(self):
         default = project_dir("dummy.txt")
         override_base = "/tmp/test"
         set_setting("NAMES_LOCAL_PATH_PARENT", override_base)
@@ -502,15 +503,14 @@ def test_6_override_full_names_path(self):
         self.assertNotEqual(default, modified)
         self.assertEqual(modified, abspath("/tmp/test/dummy.txt"))
 
-    @log_info
-    def test_7_public_private(self):
+    def test_public_private(self):
         res = get_fld(
             "http://silly.cc.ua",
             fail_silently=True,
             search_private=False,
             parser_class=MozillaTLDSourceParser,
         )
-        self.assertEqual(res, None)
+        self.assertIsNone(res)
 
         res = get_fld(
             "http://silly.cc.ua", fail_silently=True, search_private=False
@@ -529,7 +529,7 @@ def test_7_public_private(self):
             fix_protocol=True,
             parser_class=MozillaTLDSourceParser,
         )
-        self.assertEqual(res, None)
+        self.assertIsNone(res)
 
         res = get_fld(
             "mercy.compute.amazonaws.com",
@@ -542,66 +542,47 @@ def test_7_public_private(self):
         res = get_fld(
             "http://whatever.com", fail_silently=True, search_public=False
         )
-        self.assertEqual(res, None)
+        self.assertIsNone(res)
 
-    @log_info
-    def test_8_fld_bad_patterns_exceptions(self):
+    def test_fld_bad_patterns_exceptions(self):
         """Test exceptions."""
-        res = []
         for url, params in self.bad_patterns.items():
             kwargs = params["kwargs"] if "kwargs" in params else {}
             kwargs["fail_silently"] = False
             with self.assertRaises(params["exception"]):
                 _res = get_fld(url, **kwargs)
-                res.append(_res)
-        return res
 
-    @log_info
-    def test_9_tld_good_patterns_pass(self):
+    def test_tld_good_patterns_pass(self):
         """Test `get_tld` good URL patterns."""
-        res = []
         for data in self.good_patterns:
             _res = get_tld(data["url"], **data["kwargs"])
             self.assertEqual(_res, data["tld"])
-            res.append(_res)
-        return res
 
-    @log_info
-    def test_10_tld_bad_patterns_pass(self):
+    def test_tld_bad_patterns_pass(self):
         """Test `get_tld` bad URL patterns."""
-        res = []
         for url, params in self.bad_patterns.items():
             _res = get_tld(url, fail_silently=True)
-            self.assertEqual(_res, None)
-            res.append(_res)
-        return res
+            self.assertIsNone(_res)
 
-    @log_info
-    def test_11_parse_tld_good_patterns(self):
+    def test_parse_tld_good_patterns(self):
         """Test `parse_tld` good URL patterns."""
-        res = []
         for data in self.good_patterns:
             _res = parse_tld(data["url"], **data["kwargs"])
             self.assertEqual(
                 _res, (data["tld"], data["domain"], data["subdomain"])
             )
-            res.append(_res)
-        return res
 
-    @log_info
-    def test_12_is_tld_good_patterns(self):
+    def test_is_tld_good_patterns(self):
         """Test `is_tld` good URL patterns."""
         for data in self.good_patterns:
             self.assertTrue(is_tld(data["tld"]))
 
-    @log_info
-    def test_13_is_tld_bad_patterns(self):
+    def test_is_tld_bad_patterns(self):
         """Test `is_tld` bad URL patterns."""
         for _tld in self.invalid_tlds:
             self.assertFalse(is_tld(_tld))
 
-    @log_info
-    def test_14_fail_update_tld_names(self):
+    def test_fail_update_tld_names(self):
         """Test fail `update_tld_names`."""
         parser_class = self.get_custom_parser_class(
             uid="custom_mozilla_2", source_url="i-do-not-exist"
@@ -615,8 +596,7 @@ def test_14_fail_update_tld_names(self):
             update_tld_names(fail_silently=True, parser_uid=parser_class.uid)
         )
 
-    @log_info
-    def test_15_fail_get_tld_names(self):
+    def test_fail_get_tld_names(self):
         """Test fail `update_tld_names`."""
         parser_class = self.get_custom_parser_class(
             uid="custom_mozilla_3",
@@ -633,14 +613,12 @@ def test_15_fail_get_tld_names(self):
             with self.assertRaises(TldIOError):
                 get_tld(**kwargs)
 
-    @log_info
-    def test_16_fail_get_fld_wrong_kwargs(self):
+    def test_fail_get_fld_wrong_kwargs(self):
         """Test fail `get_fld` with wrong kwargs."""
         with self.assertRaises(TldImproperlyConfigured):
             get_fld(self.good_url, as_object=True)
 
-    @log_info
-    def test_17_fail_parse_tld(self):
+    def test_fail_parse_tld(self):
         """Test fail `parse_tld`.
 
         Assert raise TldIOError on wrong `NAMES_SOURCE_URL` for `parse_tld`.
@@ -651,10 +629,9 @@ def test_17_fail_parse_tld(self):
         )
         self.assertEqual(parsed_tld, (None, None, None))
 
-    @log_info
-    def test_18_get_tld_names_and_reset_tld_names(self):
+    def test_get_tld_names_and_reset_tld_names(self):
         """Test fail `get_tld_names` and repair using `reset_tld_names`."""
-        tmp_filename = join(gettempdir(), f"{self.faker.uuid4()}.dat.txt")
+        tmp_filename = join(gettempdir(), f"{FAKER.uuid()}.dat.txt")
         parser_class = self.get_custom_parser_class(
             source_url="i-do-not-exist", local_path=tmp_filename
         )
@@ -666,7 +643,7 @@ def test_18_get_tld_names_and_reset_tld_names(self):
             with self.assertRaises(TldIOError):
                 get_tld_names(fail_silently=False, parser_class=parser_class)
 
-        tmp_filename = join(gettempdir(), f"{self.faker.uuid4()}.dat.txt")
+        tmp_filename = join(gettempdir(), f"{FAKER.uuid()}.dat.txt")
         parser_class_2 = self.get_custom_parser_class(
             source_url="i-do-not-exist-2", local_path=tmp_filename
         )
@@ -679,18 +656,14 @@ def test_18_get_tld_names_and_reset_tld_names(self):
             )
 
     @internet_available_only
-    @log_info
-    def test_19_update_tld_names_cli(self):
+    def test_update_tld_names_cli(self):
         """Test the return code of the CLI version of `update_tld_names`."""
         reset_tld_names()
-        res = update_tld_names_cli()
+        res = update_tld_names_cli([])
         self.assertEqual(res, 0)
 
-    @log_info
-    def test_20_parse_tld_custom_tld_names_good_patterns(self):
+    def test_parse_tld_custom_tld_names_good_patterns(self):
         """Test `parse_tld` good URL patterns for custom tld names."""
-        res = []
-
         for data in self.good_patterns_custom_parser:
             kwargs = copy.copy(data["kwargs"])
             kwargs["parser_class"] = self.get_custom_parser_class()
@@ -698,13 +671,9 @@ def test_20_parse_tld_custom_tld_names_good_patterns(self):
             self.assertEqual(
                 _res, (data["tld"], data["domain"], data["subdomain"])
             )
-            res.append(_res)
-        return res
 
-    @log_info
-    def test_21_tld_custom_tld_names_good_patterns_pass_parsed_object(self):
+    def test_tld_custom_tld_names_good_patterns_pass_parsed_object(self):
         """Test `get_tld` good URL patterns for custom tld names."""
-        res = []
         for data in self.good_patterns_custom_parser:
             kwargs = copy.copy(data["kwargs"])
             kwargs.update(
@@ -735,13 +704,8 @@ def test_21_tld_custom_tld_names_good_patterns_pass_parsed_object(self):
                 },
             )
 
-            res.append(_res)
-        return res
-
-    @log_info
-    def test_22_reset_tld_names_for_custom_parser(self):
+    def test_reset_tld_names_for_custom_parser(self):
         """Test `reset_tld_names` for `tld_names_local_path`."""
-        res = []
         parser_class = self.get_custom_parser_class()
         for data in self.good_patterns_custom_parser:
             kwargs = copy.copy(data["kwargs"])
@@ -773,24 +737,18 @@ def test_22_reset_tld_names_for_custom_parser(self):
                 },
             )
 
-            res.append(_res)
-
         tld_names = get_tld_names_container()
         self.assertIn(parser_class.local_path, tld_names)
         reset_tld_names(parser_class.local_path)
         self.assertNotIn(parser_class.local_path, tld_names)
 
-        return res
-
-    @log_info
-    def test_23_fail_define_custom_parser_class_without_uid(self):
+    def test_fail_define_custom_parser_class_without_uid(self):
         """Test fail define custom parser class without `uid`."""
 
         class CustomParser(BaseTLDSourceParser):
             pass
 
         class AnotherCustomParser(BaseTLDSourceParser):
-
             uid = "another-custom-parser"
 
         # Assert raise TldImproperlyConfigured
@@ -801,21 +759,18 @@ class AnotherCustomParser(BaseTLDSourceParser):
         with self.assertRaises(NotImplementedError):
             AnotherCustomParser.get_tld_names()
 
-    @log_info
-    def test_24_len_trie_nodes(self):
+    def test_len_trie_nodes(self):
         """Test len of the trie nodes."""
         get_tld("http://delusionalinsanity.com")
         tld_names = get_tld_names_container()
         self.assertGreater(len(tld_names[MozillaTLDSourceParser.local_path]), 0)
 
-    @log_info
-    def test_25_get_tld_names_no_arguments(self):
+    def test_get_tld_names_no_arguments(self):
         """Test len of the trie nodes."""
         tld_names = get_tld_names()
         self.assertGreater(len(tld_names), 0)
 
-    @log_info
-    def test_26_case(self):
+    def test_case(self):
         res = get_tld(
             "https://MyDomain.com/AsDrFt?QUeRY=12aA",
             fail_silently=True,
@@ -837,15 +792,46 @@ def test_26_case(self):
             ),
         )
 
-    @log_info
-    def test_27_tld_fail_silently_pass(self):
+    def test_tld_fail_silently_pass(self):
         """Test `get_tld` bad URL patterns that would raise exception
         if `fail_silently` isn't `True`.
         """
-        res = []
         bad_url = ["https://user:password[@host.com", "https://user[@host.com"]
         for url in bad_url:
             _res = get_tld(url, fail_silently=True)
-            self.assertEqual(_res, None)
-            res.append(_res)
-        return res
+            self.assertIsNone(_res)
+
+    def test_protocols(self):
+        """Test `protocol_re` with common protocols."""
+        # Should match (have a protocol)
+        should_match_urls = [
+            "http://example.com",
+            "https://example.com",
+            "ftp://example.com",
+            "sftp://example.com",
+            "ftps://example.com",
+            "ws://example.com",
+            "wss://example.com",
+            "smtp://example.com",
+            "imap://example.com",
+            "pop3://example.com",
+            "ldap://example.com",
+            "ldaps://example.com",
+            "svn+ssh://example.com",
+            "git+https://example.com",
+            "coap+tcp://example.com",
+            "//example.com",  # protocol-relative
+        ]
+        for url in should_match_urls:
+            matched = bool(protocol_re.match(url.lower()))
+            self.assertTrue(matched)
+
+        # Should NOT match (no protocol -> fix_protocol would prepend https://)
+        test_should_not_match_urls = [
+            "example.com",
+            "example.com/path",
+            "sub.example.com",
+        ]
+        for url in test_should_not_match_urls:
+            matched = bool(protocol_re.match(url.lower()))
+            self.assertFalse(matched)
diff --git a/libs/tld/tests/test_registry.py b/libs/tld/tests/test_registry.py
index f5dcf989ae..9ec55ac3d2 100644
--- a/libs/tld/tests/test_registry.py
+++ b/libs/tld/tests/test_registry.py
@@ -1,7 +1,7 @@
 import unittest
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = ("TestRegistry",)
 
diff --git a/libs/tld/trie.py b/libs/tld/trie.py
index 0b8af764ad..ad4c417987 100644
--- a/libs/tld/trie.py
+++ b/libs/tld/trie.py
@@ -1,5 +1,5 @@
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "Trie",
@@ -37,7 +37,6 @@ def add(self, tld: str, private: bool = False) -> None:
         tld_split = tld.split(".")
         tld_split.reverse()
         for part in tld_split:
-
             if part.startswith("!"):
                 node.exception = part[1:]
                 break
diff --git a/libs/tld/utils.py b/libs/tld/utils.py
index e49794e8eb..5efc1c72c3 100644
--- a/libs/tld/utils.py
+++ b/libs/tld/utils.py
@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 
 import argparse
+import re
 import sys
 from codecs import open as codecs_open
 from functools import lru_cache
@@ -23,22 +24,23 @@
 
 
 __author__ = "Artur Barseghyan"
-__copyright__ = "2013-2023 Artur Barseghyan"
+__copyright__ = "2013-2026 Artur Barseghyan"
 __license__ = "MPL-1.1 OR GPL-2.0-only OR LGPL-2.1-or-later"
 __all__ = (
     "BaseMozillaTLDSourceParser",
+    "MozillaPublicOnlyTLDSourceParser",
+    "MozillaTLDSourceParser",
+    "Result",
     "get_fld",
     "get_tld",
     "get_tld_names",
     "get_tld_names_container",
     "is_tld",
-    "MozillaTLDSourceParser",
-    "MozillaPublicOnlyTLDSourceParser",
     "parse_tld",
     "pop_tld_names_container",
     "process_url",
+    "protocol_re",
     "reset_tld_names",
-    "Result",
     "tld_names",
     "update_tld_names",
     "update_tld_names_cli",
@@ -46,6 +48,7 @@
 )
 
 tld_names: Dict[str, Trie] = {}
+protocol_re = re.compile(r"^[a-z0-9.+:-]*//")
 
 
 def get_tld_names_container() -> Dict[str, Trie]:
@@ -110,7 +113,7 @@ def update_tld_names(
     return all(results)
 
 
-def update_tld_names_cli() -> int:
+def update_tld_names_cli(argv=None) -> int:
     """CLI wrapper for update_tld_names.
 
     Since update_tld_names returns True on success, we need to negate the
@@ -130,7 +133,7 @@ def update_tld_names_cli() -> int:
         action="store_true",
         help="Fail silently",
     )
-    args = parser.parse_args(sys.argv[1:])
+    args = parser.parse_args(argv if argv is not None else sys.argv[1:])
     parser_uid = args.parser_uid
     fail_silently = args.fail_silently
     return int(
@@ -306,7 +309,7 @@ def process_url(
     )
 
     if not isinstance(url, SplitResult):
-        if fix_protocol and not url.startswith(("//", "http://", "https://")):
+        if fix_protocol and not protocol_re.match(url.lower()):
             url = f"https://{url}"
 
         # Get parsed URL as we might need it later
diff --git a/libs/stevedore-5.3.0.dist-info/INSTALLER b/libs/tomli-2.4.0.dist-info/INSTALLER
similarity index 100%
rename from libs/stevedore-5.3.0.dist-info/INSTALLER
rename to libs/tomli-2.4.0.dist-info/INSTALLER
diff --git a/libs/tomli-2.4.0.dist-info/METADATA b/libs/tomli-2.4.0.dist-info/METADATA
new file mode 100644
index 0000000000..ffe8e40d77
--- /dev/null
+++ b/libs/tomli-2.4.0.dist-info/METADATA
@@ -0,0 +1,270 @@
+Metadata-Version: 2.4
+Name: tomli
+Version: 2.4.0
+Summary: A lil' TOML parser
+Keywords: toml
+Author-email: Taneli Hukkinen <hukkin@users.noreply.github.com>
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-Expression: MIT
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Typing :: Typed
+License-File: LICENSE
+Project-URL: Changelog, https://github.com/hukkin/tomli/blob/master/CHANGELOG.md
+Project-URL: Homepage, https://github.com/hukkin/tomli
+
+[![Build Status](https://github.com/hukkin/tomli/actions/workflows/tests.yaml/badge.svg?branch=master)](https://github.com/hukkin/tomli/actions?query=workflow%3ATests+branch%3Amaster+event%3Apush)
+[![codecov.io](https://codecov.io/gh/hukkin/tomli/branch/master/graph/badge.svg)](https://codecov.io/gh/hukkin/tomli)
+[![PyPI version](https://img.shields.io/pypi/v/tomli)](https://pypi.org/project/tomli)
+
+# Tomli
+
+> A lil' TOML parser
+
+**Table of Contents** *generated with [mdformat-toc](https://github.com/hukkin/mdformat-toc)*
+
+<!-- mdformat-toc start --slug=github --maxlevel=6 --minlevel=2 -->
+
+- [Intro](#intro)
+- [Installation](#installation)
+- [Usage](#usage)
+  - [Parse a TOML string](#parse-a-toml-string)
+  - [Parse a TOML file](#parse-a-toml-file)
+  - [Handle invalid TOML](#handle-invalid-toml)
+  - [Construct `decimal.Decimal`s from TOML floats](#construct-decimaldecimals-from-toml-floats)
+  - [Building a `tomli`/`tomllib` compatibility layer](#building-a-tomlitomllib-compatibility-layer)
+- [FAQ](#faq)
+  - [Why this parser?](#why-this-parser)
+  - [Is comment preserving round-trip parsing supported?](#is-comment-preserving-round-trip-parsing-supported)
+  - [Is there a `dumps`, `write` or `encode` function?](#is-there-a-dumps-write-or-encode-function)
+  - [How do TOML types map into Python types?](#how-do-toml-types-map-into-python-types)
+- [Performance](#performance)
+  - [Pure Python](#pure-python)
+  - [Mypyc generated wheel](#mypyc-generated-wheel)
+
+<!-- mdformat-toc end -->
+
+## Intro<a name="intro"></a>
+
+Tomli is a Python library for parsing [TOML](https://toml.io).
+Version 2.4.0 and later are compatible with [TOML v1.1.0](https://toml.io/en/v1.1.0).
+Older versions are [TOML v1.0.0](https://toml.io/en/v1.0.0) compatible.
+
+A version of Tomli, the `tomllib` module,
+was added to the standard library in Python 3.11
+via [PEP 680](https://www.python.org/dev/peps/pep-0680/).
+Tomli continues to provide a backport on PyPI for Python versions
+where the standard library module is not available
+and that have not yet reached their end-of-life.
+
+Tomli uses [mypyc](https://github.com/mypyc/mypyc)
+to generate binary wheels for most of the widely used platforms,
+so Python 3.11+ users may prefer it over `tomllib` for improved performance.
+Pure Python wheels are available on any platform and should perform the same as `tomllib`.
+
+## Installation<a name="installation"></a>
+
+```bash
+pip install tomli
+```
+
+## Usage<a name="usage"></a>
+
+### Parse a TOML string<a name="parse-a-toml-string"></a>
+
+```python
+import tomli
+
+toml_str = """
+[[players]]
+name = "Lehtinen"
+number = 26
+
+[[players]]
+name = "Numminen"
+number = 27
+"""
+
+toml_dict = tomli.loads(toml_str)
+assert toml_dict == {
+    "players": [{"name": "Lehtinen", "number": 26}, {"name": "Numminen", "number": 27}]
+}
+```
+
+### Parse a TOML file<a name="parse-a-toml-file"></a>
+
+```python
+import tomli
+
+with open("path_to_file/conf.toml", "rb") as f:
+    toml_dict = tomli.load(f)
+```
+
+The file must be opened in binary mode (with the `"rb"` flag).
+Binary mode will enforce decoding the file as UTF-8 with universal newlines disabled,
+both of which are required to correctly parse TOML.
+
+### Handle invalid TOML<a name="handle-invalid-toml"></a>
+
+```python
+import tomli
+
+try:
+    toml_dict = tomli.loads("]] this is invalid TOML [[")
+except tomli.TOMLDecodeError:
+    print("Yep, definitely not valid.")
+```
+
+Note that error messages are considered informational only.
+They should not be assumed to stay constant across Tomli versions.
+
+### Construct `decimal.Decimal`s from TOML floats<a name="construct-decimaldecimals-from-toml-floats"></a>
+
+```python
+from decimal import Decimal
+import tomli
+
+toml_dict = tomli.loads("precision-matters = 0.982492", parse_float=Decimal)
+assert isinstance(toml_dict["precision-matters"], Decimal)
+assert toml_dict["precision-matters"] == Decimal("0.982492")
+```
+
+Note that `decimal.Decimal` can be replaced with another callable that converts a TOML float from string to a Python type.
+The `decimal.Decimal` is, however, a practical choice for use cases where float inaccuracies can not be tolerated.
+
+Illegal types are `dict` and `list`, and their subtypes.
+A `ValueError` will be raised if `parse_float` produces illegal types.
+
+### Building a `tomli`/`tomllib` compatibility layer<a name="building-a-tomlitomllib-compatibility-layer"></a>
+
+Python versions 3.11+ ship with a version of Tomli:
+the `tomllib` standard library module.
+To build code that uses the standard library if available,
+but still works seamlessly with Python 3.6+,
+do the following.
+
+Instead of a hard Tomli dependency, use the following
+[dependency specifier](https://packaging.python.org/en/latest/specifications/dependency-specifiers/)
+to only require Tomli when the standard library module is not available:
+
+```
+tomli >= 1.1.0 ; python_version < "3.11"
+```
+
+Then, in your code, import a TOML parser using the following fallback mechanism:
+
+```python
+import sys
+
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
+tomllib.loads("['This parses fine with Python 3.6+']")
+```
+
+## FAQ<a name="faq"></a>
+
+### Why this parser?<a name="why-this-parser"></a>
+
+- it's lil'
+- pure Python with zero dependencies
+- the fastest pure Python parser [\*](#pure-python):
+  18x as fast as [tomlkit](https://pypi.org/project/tomlkit/),
+  2.1x as fast as [toml](https://pypi.org/project/toml/)
+- outputs [basic data types](#how-do-toml-types-map-into-python-types) only
+- 100% spec compliant: passes all tests in
+  [toml-lang/toml-test](https://github.com/toml-lang/toml-test)
+  test suite
+- thoroughly tested: 100% branch coverage
+
+### Is comment preserving round-trip parsing supported?<a name="is-comment-preserving-round-trip-parsing-supported"></a>
+
+No.
+
+The `tomli.loads` function returns a plain `dict` that is populated with builtin types and types from the standard library only.
+Preserving comments requires a custom type to be returned so will not be supported,
+at least not by the `tomli.loads` and `tomli.load` functions.
+
+Look into [TOML Kit](https://github.com/sdispater/tomlkit) if preservation of style is what you need.
+
+### Is there a `dumps`, `write` or `encode` function?<a name="is-there-a-dumps-write-or-encode-function"></a>
+
+[Tomli-W](https://github.com/hukkin/tomli-w) is the write-only counterpart of Tomli, providing `dump` and `dumps` functions.
+
+The core library does not include write capability, as most TOML use cases are read-only, and Tomli intends to be minimal.
+
+### How do TOML types map into Python types?<a name="how-do-toml-types-map-into-python-types"></a>
+
+| TOML type        | Python type         | Details                                                      |
+| ---------------- | ------------------- | ------------------------------------------------------------ |
+| Document Root    | `dict`              |                                                              |
+| Key              | `str`               |                                                              |
+| String           | `str`               |                                                              |
+| Integer          | `int`               |                                                              |
+| Float            | `float`             |                                                              |
+| Boolean          | `bool`              |                                                              |
+| Offset Date-Time | `datetime.datetime` | `tzinfo` attribute set to an instance of `datetime.timezone` |
+| Local Date-Time  | `datetime.datetime` | `tzinfo` attribute set to `None`                             |
+| Local Date       | `datetime.date`     |                                                              |
+| Local Time       | `datetime.time`     |                                                              |
+| Array            | `list`              |                                                              |
+| Table            | `dict`              |                                                              |
+| Inline Table     | `dict`              |                                                              |
+
+## Performance<a name="performance"></a>
+
+The `benchmark/` folder in this repository contains a performance benchmark for comparing the various Python TOML parsers.
+
+Below are the results for commit [0724e2a](https://github.com/hukkin/tomli/tree/0724e2ab1858da7f5e05a9bffdb24c33589d951c).
+
+### Pure Python<a name="pure-python"></a>
+
+```console
+foo@bar:~/dev/tomli$ python --version
+Python 3.12.7
+foo@bar:~/dev/tomli$ pip freeze
+attrs==21.4.0
+click==8.1.7
+pytomlpp==1.0.13
+qtoml==0.3.1
+rtoml==0.11.0
+toml==0.10.2
+tomli @ file:///home/foo/dev/tomli
+tomlkit==0.13.2
+foo@bar:~/dev/tomli$ python benchmark/run.py
+Parsing data.toml 5000 times:
+------------------------------------------------------
+    parser |  exec time | performance (more is better)
+-----------+------------+-----------------------------
+     rtoml |    0.647 s | baseline (100%)
+  pytomlpp |    0.891 s | 72.62%
+     tomli |     3.14 s | 20.56%
+      toml |     6.69 s | 9.67%
+     qtoml |     8.27 s | 7.82%
+   tomlkit |     56.1 s | 1.15%
+```
+
+### Mypyc generated wheel<a name="mypyc-generated-wheel"></a>
+
+```console
+foo@bar:~/dev/tomli$ python benchmark/run.py
+Parsing data.toml 5000 times:
+------------------------------------------------------
+    parser |  exec time | performance (more is better)
+-----------+------------+-----------------------------
+     rtoml |    0.668 s | baseline (100%)
+  pytomlpp |    0.893 s | 74.81%
+     tomli |     1.96 s | 34.18%
+      toml |     6.64 s | 10.07%
+     qtoml |     8.26 s | 8.09%
+   tomlkit |     52.9 s | 1.26%
+```
+
diff --git a/libs/tomli-2.4.0.dist-info/RECORD b/libs/tomli-2.4.0.dist-info/RECORD
new file mode 100644
index 0000000000..dd6cf3672d
--- /dev/null
+++ b/libs/tomli-2.4.0.dist-info/RECORD
@@ -0,0 +1,11 @@
+tomli-2.4.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+tomli-2.4.0.dist-info/METADATA,sha256=9awKH4-6kItGRs1lUwnpGq2Wm2eHYWrFccpGKjgy_84,10567
+tomli-2.4.0.dist-info/RECORD,,
+tomli-2.4.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tomli-2.4.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+tomli-2.4.0.dist-info/licenses/LICENSE,sha256=uAgWsNUwuKzLTCIReDeQmEpuO2GSLCte6S8zcqsnQv4,1072
+tomli/__init__.py,sha256=ahtDjGJA2M_wWVvGpzx4YJtWxrWBx6qE-GH5-UYoECA,314
+tomli/_parser.py,sha256=txeATLE3zHyZ-ushXtYfrZ3LoIs7JzQF2W2KL1gwJPg,25958
+tomli/_re.py,sha256=oSNZ_ilFI6chEuQ01YRSoUydBQr_okF_mSdHTkFmv90,3396
+tomli/_types.py,sha256=-GTG2VUqkpxwMqzmVO4F7ybKddIbAnuAHXfmWQcTi3Q,254
+tomli/py.typed,sha256=8PjyZ1aVoQpRVvt71muvuq5qE-jTFZkK-GLHkhdebmc,26
diff --git a/libs/tzlocal-5.2.dist-info/REQUESTED b/libs/tomli-2.4.0.dist-info/REQUESTED
similarity index 100%
rename from libs/tzlocal-5.2.dist-info/REQUESTED
rename to libs/tomli-2.4.0.dist-info/REQUESTED
diff --git a/libs/tomli-2.4.0.dist-info/WHEEL b/libs/tomli-2.4.0.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/tomli-2.4.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/tomli-2.4.0.dist-info/licenses/LICENSE b/libs/tomli-2.4.0.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..e859590f88
--- /dev/null
+++ b/libs/tomli-2.4.0.dist-info/licenses/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Taneli Hukkinen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/tomli/__init__.py b/libs/tomli/__init__.py
new file mode 100644
index 0000000000..55699b1ea6
--- /dev/null
+++ b/libs/tomli/__init__.py
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+__all__ = ("loads", "load", "TOMLDecodeError")
+__version__ = "2.4.0"  # DO NOT EDIT THIS LINE MANUALLY. LET bump2version UTILITY DO IT
+
+from ._parser import TOMLDecodeError, load, loads
diff --git a/libs/tomli/_parser.py b/libs/tomli/_parser.py
new file mode 100644
index 0000000000..3038891afe
--- /dev/null
+++ b/libs/tomli/_parser.py
@@ -0,0 +1,782 @@
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+from __future__ import annotations
+
+import sys
+from types import MappingProxyType
+
+from ._re import (
+    RE_DATETIME,
+    RE_LOCALTIME,
+    RE_NUMBER,
+    match_to_datetime,
+    match_to_localtime,
+    match_to_number,
+)
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+    from typing import IO, Any, Final
+
+    from ._types import Key, ParseFloat, Pos
+
+# Inline tables/arrays are implemented using recursion. Pathologically
+# nested documents cause pure Python to raise RecursionError (which is OK),
+# but mypyc binary wheels will crash unrecoverably (not OK). According to
+# mypyc docs this will be fixed in the future:
+# https://mypyc.readthedocs.io/en/latest/differences_from_python.html#stack-overflows
+# Before mypyc's fix is in, recursion needs to be limited by this library.
+# Choosing `sys.getrecursionlimit()` as maximum inline table/array nesting
+# level, as it allows more nesting than pure Python, but still seems a far
+# lower number than where mypyc binaries crash.
+MAX_INLINE_NESTING: Final = sys.getrecursionlimit()
+
+ASCII_CTRL: Final = frozenset(chr(i) for i in range(32)) | frozenset(chr(127))
+
+# Neither of these sets include quotation mark or backslash. They are
+# currently handled as separate cases in the parser functions.
+ILLEGAL_BASIC_STR_CHARS: Final = ASCII_CTRL - frozenset("\t")
+ILLEGAL_MULTILINE_BASIC_STR_CHARS: Final = ASCII_CTRL - frozenset("\t\n")
+
+ILLEGAL_LITERAL_STR_CHARS: Final = ILLEGAL_BASIC_STR_CHARS
+ILLEGAL_MULTILINE_LITERAL_STR_CHARS: Final = ILLEGAL_MULTILINE_BASIC_STR_CHARS
+
+ILLEGAL_COMMENT_CHARS: Final = ILLEGAL_BASIC_STR_CHARS
+
+TOML_WS: Final = frozenset(" \t")
+TOML_WS_AND_NEWLINE: Final = TOML_WS | frozenset("\n")
+BARE_KEY_CHARS: Final = frozenset(
+    "abcdefghijklmnopqrstuvwxyz" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "0123456789" "-_"
+)
+KEY_INITIAL_CHARS: Final = BARE_KEY_CHARS | frozenset("\"'")
+HEXDIGIT_CHARS: Final = frozenset("abcdef" "ABCDEF" "0123456789")
+
+BASIC_STR_ESCAPE_REPLACEMENTS: Final = MappingProxyType(
+    {
+        "\\b": "\u0008",  # backspace
+        "\\t": "\u0009",  # tab
+        "\\n": "\u000a",  # linefeed
+        "\\f": "\u000c",  # form feed
+        "\\r": "\u000d",  # carriage return
+        "\\e": "\u001b",  # escape
+        '\\"': "\u0022",  # quote
+        "\\\\": "\u005c",  # backslash
+    }
+)
+
+
+class DEPRECATED_DEFAULT:
+    """Sentinel to be used as default arg during deprecation
+    period of TOMLDecodeError's free-form arguments."""
+
+
+class TOMLDecodeError(ValueError):
+    """An error raised if a document is not valid TOML.
+
+    Adds the following attributes to ValueError:
+    msg: The unformatted error message
+    doc: The TOML document being parsed
+    pos: The index of doc where parsing failed
+    lineno: The line corresponding to pos
+    colno: The column corresponding to pos
+    """
+
+    def __init__(
+        self,
+        msg: str | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
+        doc: str | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
+        pos: Pos | type[DEPRECATED_DEFAULT] = DEPRECATED_DEFAULT,
+        *args: Any,
+    ):
+        if (
+            args
+            or not isinstance(msg, str)
+            or not isinstance(doc, str)
+            or not isinstance(pos, int)
+        ):
+            import warnings
+
+            warnings.warn(
+                "Free-form arguments for TOMLDecodeError are deprecated. "
+                "Please set 'msg' (str), 'doc' (str) and 'pos' (int) arguments only.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            if pos is not DEPRECATED_DEFAULT:
+                args = pos, *args
+            if doc is not DEPRECATED_DEFAULT:
+                args = doc, *args
+            if msg is not DEPRECATED_DEFAULT:
+                args = msg, *args
+            ValueError.__init__(self, *args)
+            return
+
+        lineno = doc.count("\n", 0, pos) + 1
+        if lineno == 1:
+            colno = pos + 1
+        else:
+            colno = pos - doc.rindex("\n", 0, pos)
+
+        if pos >= len(doc):
+            coord_repr = "end of document"
+        else:
+            coord_repr = f"line {lineno}, column {colno}"
+        errmsg = f"{msg} (at {coord_repr})"
+        ValueError.__init__(self, errmsg)
+
+        self.msg = msg
+        self.doc = doc
+        self.pos = pos
+        self.lineno = lineno
+        self.colno = colno
+
+
+def load(__fp: IO[bytes], *, parse_float: ParseFloat = float) -> dict[str, Any]:
+    """Parse TOML from a binary file object."""
+    b = __fp.read()
+    try:
+        s = b.decode()
+    except AttributeError:
+        raise TypeError(
+            "File must be opened in binary mode, e.g. use `open('foo.toml', 'rb')`"
+        ) from None
+    return loads(s, parse_float=parse_float)
+
+
+def loads(__s: str, *, parse_float: ParseFloat = float) -> dict[str, Any]:
+    """Parse TOML from a string."""
+
+    # The spec allows converting "\r\n" to "\n", even in string
+    # literals. Let's do so to simplify parsing.
+    try:
+        src = __s.replace("\r\n", "\n")
+    except (AttributeError, TypeError):
+        raise TypeError(
+            f"Expected str object, not '{type(__s).__qualname__}'"
+        ) from None
+    pos = 0
+    out = Output()
+    header: Key = ()
+    parse_float = make_safe_parse_float(parse_float)
+
+    # Parse one statement at a time
+    # (typically means one line in TOML source)
+    while True:
+        # 1. Skip line leading whitespace
+        pos = skip_chars(src, pos, TOML_WS)
+
+        # 2. Parse rules. Expect one of the following:
+        #    - end of file
+        #    - end of line
+        #    - comment
+        #    - key/value pair
+        #    - append dict to list (and move to its namespace)
+        #    - create dict (and move to its namespace)
+        # Skip trailing whitespace when applicable.
+        try:
+            char = src[pos]
+        except IndexError:
+            break
+        if char == "\n":
+            pos += 1
+            continue
+        if char in KEY_INITIAL_CHARS:
+            pos = key_value_rule(src, pos, out, header, parse_float)
+            pos = skip_chars(src, pos, TOML_WS)
+        elif char == "[":
+            try:
+                second_char: str | None = src[pos + 1]
+            except IndexError:
+                second_char = None
+            out.flags.finalize_pending()
+            if second_char == "[":
+                pos, header = create_list_rule(src, pos, out)
+            else:
+                pos, header = create_dict_rule(src, pos, out)
+            pos = skip_chars(src, pos, TOML_WS)
+        elif char != "#":
+            raise TOMLDecodeError("Invalid statement", src, pos)
+
+        # 3. Skip comment
+        pos = skip_comment(src, pos)
+
+        # 4. Expect end of line or end of file
+        try:
+            char = src[pos]
+        except IndexError:
+            break
+        if char != "\n":
+            raise TOMLDecodeError(
+                "Expected newline or end of document after a statement", src, pos
+            )
+        pos += 1
+
+    return out.data.dict
+
+
+class Flags:
+    """Flags that map to parsed keys/namespaces."""
+
+    # Marks an immutable namespace (inline array or inline table).
+    FROZEN: Final = 0
+    # Marks a nest that has been explicitly created and can no longer
+    # be opened using the "[table]" syntax.
+    EXPLICIT_NEST: Final = 1
+
+    def __init__(self) -> None:
+        self._flags: dict[str, dict[Any, Any]] = {}
+        self._pending_flags: set[tuple[Key, int]] = set()
+
+    def add_pending(self, key: Key, flag: int) -> None:
+        self._pending_flags.add((key, flag))
+
+    def finalize_pending(self) -> None:
+        for key, flag in self._pending_flags:
+            self.set(key, flag, recursive=False)
+        self._pending_flags.clear()
+
+    def unset_all(self, key: Key) -> None:
+        cont = self._flags
+        for k in key[:-1]:
+            if k not in cont:
+                return
+            cont = cont[k]["nested"]
+        cont.pop(key[-1], None)
+
+    def set(self, key: Key, flag: int, *, recursive: bool) -> None:  # noqa: A003
+        cont = self._flags
+        key_parent, key_stem = key[:-1], key[-1]
+        for k in key_parent:
+            if k not in cont:
+                cont[k] = {"flags": set(), "recursive_flags": set(), "nested": {}}
+            cont = cont[k]["nested"]
+        if key_stem not in cont:
+            cont[key_stem] = {"flags": set(), "recursive_flags": set(), "nested": {}}
+        cont[key_stem]["recursive_flags" if recursive else "flags"].add(flag)
+
+    def is_(self, key: Key, flag: int) -> bool:
+        if not key:
+            return False  # document root has no flags
+        cont = self._flags
+        for k in key[:-1]:
+            if k not in cont:
+                return False
+            inner_cont = cont[k]
+            if flag in inner_cont["recursive_flags"]:
+                return True
+            cont = inner_cont["nested"]
+        key_stem = key[-1]
+        if key_stem in cont:
+            inner_cont = cont[key_stem]
+            return flag in inner_cont["flags"] or flag in inner_cont["recursive_flags"]
+        return False
+
+
+class NestedDict:
+    def __init__(self) -> None:
+        # The parsed content of the TOML document
+        self.dict: dict[str, Any] = {}
+
+    def get_or_create_nest(
+        self,
+        key: Key,
+        *,
+        access_lists: bool = True,
+    ) -> dict[str, Any]:
+        cont: Any = self.dict
+        for k in key:
+            if k not in cont:
+                cont[k] = {}
+            cont = cont[k]
+            if access_lists and isinstance(cont, list):
+                cont = cont[-1]
+            if not isinstance(cont, dict):
+                raise KeyError("There is no nest behind this key")
+        return cont  # type: ignore[no-any-return]
+
+    def append_nest_to_list(self, key: Key) -> None:
+        cont = self.get_or_create_nest(key[:-1])
+        last_key = key[-1]
+        if last_key in cont:
+            list_ = cont[last_key]
+            if not isinstance(list_, list):
+                raise KeyError("An object other than list found behind this key")
+            list_.append({})
+        else:
+            cont[last_key] = [{}]
+
+
+class Output:
+    def __init__(self) -> None:
+        self.data = NestedDict()
+        self.flags = Flags()
+
+
+def skip_chars(src: str, pos: Pos, chars: Iterable[str]) -> Pos:
+    try:
+        while src[pos] in chars:
+            pos += 1
+    except IndexError:
+        pass
+    return pos
+
+
+def skip_until(
+    src: str,
+    pos: Pos,
+    expect: str,
+    *,
+    error_on: frozenset[str],
+    error_on_eof: bool,
+) -> Pos:
+    try:
+        new_pos = src.index(expect, pos)
+    except ValueError:
+        new_pos = len(src)
+        if error_on_eof:
+            raise TOMLDecodeError(f"Expected {expect!r}", src, new_pos) from None
+
+    if not error_on.isdisjoint(src[pos:new_pos]):
+        while src[pos] not in error_on:
+            pos += 1
+        raise TOMLDecodeError(f"Found invalid character {src[pos]!r}", src, pos)
+    return new_pos
+
+
+def skip_comment(src: str, pos: Pos) -> Pos:
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+    if char == "#":
+        return skip_until(
+            src, pos + 1, "\n", error_on=ILLEGAL_COMMENT_CHARS, error_on_eof=False
+        )
+    return pos
+
+
+def skip_comments_and_array_ws(src: str, pos: Pos) -> Pos:
+    while True:
+        pos_before_skip = pos
+        pos = skip_chars(src, pos, TOML_WS_AND_NEWLINE)
+        pos = skip_comment(src, pos)
+        if pos == pos_before_skip:
+            return pos
+
+
+def create_dict_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
+    pos += 1  # Skip "["
+    pos = skip_chars(src, pos, TOML_WS)
+    pos, key = parse_key(src, pos)
+
+    if out.flags.is_(key, Flags.EXPLICIT_NEST) or out.flags.is_(key, Flags.FROZEN):
+        raise TOMLDecodeError(f"Cannot declare {key} twice", src, pos)
+    out.flags.set(key, Flags.EXPLICIT_NEST, recursive=False)
+    try:
+        out.data.get_or_create_nest(key)
+    except KeyError:
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+
+    if not src.startswith("]", pos):
+        raise TOMLDecodeError(
+            "Expected ']' at the end of a table declaration", src, pos
+        )
+    return pos + 1, key
+
+
+def create_list_rule(src: str, pos: Pos, out: Output) -> tuple[Pos, Key]:
+    pos += 2  # Skip "[["
+    pos = skip_chars(src, pos, TOML_WS)
+    pos, key = parse_key(src, pos)
+
+    if out.flags.is_(key, Flags.FROZEN):
+        raise TOMLDecodeError(f"Cannot mutate immutable namespace {key}", src, pos)
+    # Free the namespace now that it points to another empty list item...
+    out.flags.unset_all(key)
+    # ...but this key precisely is still prohibited from table declaration
+    out.flags.set(key, Flags.EXPLICIT_NEST, recursive=False)
+    try:
+        out.data.append_nest_to_list(key)
+    except KeyError:
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+
+    if not src.startswith("]]", pos):
+        raise TOMLDecodeError(
+            "Expected ']]' at the end of an array declaration", src, pos
+        )
+    return pos + 2, key
+
+
+def key_value_rule(
+    src: str, pos: Pos, out: Output, header: Key, parse_float: ParseFloat
+) -> Pos:
+    pos, key, value = parse_key_value_pair(src, pos, parse_float, nest_lvl=0)
+    key_parent, key_stem = key[:-1], key[-1]
+    abs_key_parent = header + key_parent
+
+    relative_path_cont_keys = (header + key[:i] for i in range(1, len(key)))
+    for cont_key in relative_path_cont_keys:
+        # Check that dotted key syntax does not redefine an existing table
+        if out.flags.is_(cont_key, Flags.EXPLICIT_NEST):
+            raise TOMLDecodeError(f"Cannot redefine namespace {cont_key}", src, pos)
+        # Containers in the relative path can't be opened with the table syntax or
+        # dotted key/value syntax in following table sections.
+        out.flags.add_pending(cont_key, Flags.EXPLICIT_NEST)
+
+    if out.flags.is_(abs_key_parent, Flags.FROZEN):
+        raise TOMLDecodeError(
+            f"Cannot mutate immutable namespace {abs_key_parent}", src, pos
+        )
+
+    try:
+        nest = out.data.get_or_create_nest(abs_key_parent)
+    except KeyError:
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+    if key_stem in nest:
+        raise TOMLDecodeError("Cannot overwrite a value", src, pos)
+    # Mark inline table and array namespaces recursively immutable
+    if isinstance(value, (dict, list)):
+        out.flags.set(header + key, Flags.FROZEN, recursive=True)
+    nest[key_stem] = value
+    return pos
+
+
+def parse_key_value_pair(
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+) -> tuple[Pos, Key, Any]:
+    pos, key = parse_key(src, pos)
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+    if char != "=":
+        raise TOMLDecodeError("Expected '=' after a key in a key/value pair", src, pos)
+    pos += 1
+    pos = skip_chars(src, pos, TOML_WS)
+    pos, value = parse_value(src, pos, parse_float, nest_lvl)
+    return pos, key, value
+
+
+def parse_key(src: str, pos: Pos) -> tuple[Pos, Key]:
+    pos, key_part = parse_key_part(src, pos)
+    key: Key = (key_part,)
+    pos = skip_chars(src, pos, TOML_WS)
+    while True:
+        try:
+            char: str | None = src[pos]
+        except IndexError:
+            char = None
+        if char != ".":
+            return pos, key
+        pos += 1
+        pos = skip_chars(src, pos, TOML_WS)
+        pos, key_part = parse_key_part(src, pos)
+        key += (key_part,)
+        pos = skip_chars(src, pos, TOML_WS)
+
+
+def parse_key_part(src: str, pos: Pos) -> tuple[Pos, str]:
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+    if char in BARE_KEY_CHARS:
+        start_pos = pos
+        pos = skip_chars(src, pos, BARE_KEY_CHARS)
+        return pos, src[start_pos:pos]
+    if char == "'":
+        return parse_literal_str(src, pos)
+    if char == '"':
+        return parse_one_line_basic_str(src, pos)
+    raise TOMLDecodeError("Invalid initial character for a key part", src, pos)
+
+
+def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
+    pos += 1
+    return parse_basic_str(src, pos, multiline=False)
+
+
+def parse_array(
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+) -> tuple[Pos, list[Any]]:
+    pos += 1
+    array: list[Any] = []
+
+    pos = skip_comments_and_array_ws(src, pos)
+    if src.startswith("]", pos):
+        return pos + 1, array
+    while True:
+        pos, val = parse_value(src, pos, parse_float, nest_lvl)
+        array.append(val)
+        pos = skip_comments_and_array_ws(src, pos)
+
+        c = src[pos : pos + 1]
+        if c == "]":
+            return pos + 1, array
+        if c != ",":
+            raise TOMLDecodeError("Unclosed array", src, pos)
+        pos += 1
+
+        pos = skip_comments_and_array_ws(src, pos)
+        if src.startswith("]", pos):
+            return pos + 1, array
+
+
+def parse_inline_table(
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+) -> tuple[Pos, dict[str, Any]]:
+    pos += 1
+    nested_dict = NestedDict()
+    flags = Flags()
+
+    pos = skip_comments_and_array_ws(src, pos)
+    if src.startswith("}", pos):
+        return pos + 1, nested_dict.dict
+    while True:
+        pos, key, value = parse_key_value_pair(src, pos, parse_float, nest_lvl)
+        key_parent, key_stem = key[:-1], key[-1]
+        if flags.is_(key, Flags.FROZEN):
+            raise TOMLDecodeError(f"Cannot mutate immutable namespace {key}", src, pos)
+        try:
+            nest = nested_dict.get_or_create_nest(key_parent, access_lists=False)
+        except KeyError:
+            raise TOMLDecodeError("Cannot overwrite a value", src, pos) from None
+        if key_stem in nest:
+            raise TOMLDecodeError(f"Duplicate inline table key {key_stem!r}", src, pos)
+        nest[key_stem] = value
+        pos = skip_comments_and_array_ws(src, pos)
+        c = src[pos : pos + 1]
+        if c == "}":
+            return pos + 1, nested_dict.dict
+        if c != ",":
+            raise TOMLDecodeError("Unclosed inline table", src, pos)
+        pos += 1
+        pos = skip_comments_and_array_ws(src, pos)
+        if src.startswith("}", pos):
+            return pos + 1, nested_dict.dict
+        if isinstance(value, (dict, list)):
+            flags.set(key, Flags.FROZEN, recursive=True)
+
+
+def parse_basic_str_escape(
+    src: str, pos: Pos, *, multiline: bool = False
+) -> tuple[Pos, str]:
+    escape_id = src[pos : pos + 2]
+    pos += 2
+    if multiline and escape_id in {"\\ ", "\\\t", "\\\n"}:
+        # Skip whitespace until next non-whitespace character or end of
+        # the doc. Error if non-whitespace is found before newline.
+        if escape_id != "\\\n":
+            pos = skip_chars(src, pos, TOML_WS)
+            try:
+                char = src[pos]
+            except IndexError:
+                return pos, ""
+            if char != "\n":
+                raise TOMLDecodeError("Unescaped '\\' in a string", src, pos)
+            pos += 1
+        pos = skip_chars(src, pos, TOML_WS_AND_NEWLINE)
+        return pos, ""
+    if escape_id == "\\x":
+        return parse_hex_char(src, pos, 2)
+    if escape_id == "\\u":
+        return parse_hex_char(src, pos, 4)
+    if escape_id == "\\U":
+        return parse_hex_char(src, pos, 8)
+    try:
+        return pos, BASIC_STR_ESCAPE_REPLACEMENTS[escape_id]
+    except KeyError:
+        raise TOMLDecodeError("Unescaped '\\' in a string", src, pos) from None
+
+
+def parse_basic_str_escape_multiline(src: str, pos: Pos) -> tuple[Pos, str]:
+    return parse_basic_str_escape(src, pos, multiline=True)
+
+
+def parse_hex_char(src: str, pos: Pos, hex_len: int) -> tuple[Pos, str]:
+    hex_str = src[pos : pos + hex_len]
+    if len(hex_str) != hex_len or not HEXDIGIT_CHARS.issuperset(hex_str):
+        raise TOMLDecodeError("Invalid hex value", src, pos)
+    pos += hex_len
+    hex_int = int(hex_str, 16)
+    if not is_unicode_scalar_value(hex_int):
+        raise TOMLDecodeError(
+            "Escaped character is not a Unicode scalar value", src, pos
+        )
+    return pos, chr(hex_int)
+
+
+def parse_literal_str(src: str, pos: Pos) -> tuple[Pos, str]:
+    pos += 1  # Skip starting apostrophe
+    start_pos = pos
+    pos = skip_until(
+        src, pos, "'", error_on=ILLEGAL_LITERAL_STR_CHARS, error_on_eof=True
+    )
+    return pos + 1, src[start_pos:pos]  # Skip ending apostrophe
+
+
+def parse_multiline_str(src: str, pos: Pos, *, literal: bool) -> tuple[Pos, str]:
+    pos += 3
+    if src.startswith("\n", pos):
+        pos += 1
+
+    if literal:
+        delim = "'"
+        end_pos = skip_until(
+            src,
+            pos,
+            "'''",
+            error_on=ILLEGAL_MULTILINE_LITERAL_STR_CHARS,
+            error_on_eof=True,
+        )
+        result = src[pos:end_pos]
+        pos = end_pos + 3
+    else:
+        delim = '"'
+        pos, result = parse_basic_str(src, pos, multiline=True)
+
+    # Add at maximum two extra apostrophes/quotes if the end sequence
+    # is 4 or 5 chars long instead of just 3.
+    if not src.startswith(delim, pos):
+        return pos, result
+    pos += 1
+    if not src.startswith(delim, pos):
+        return pos, result + delim
+    pos += 1
+    return pos, result + (delim * 2)
+
+
+def parse_basic_str(src: str, pos: Pos, *, multiline: bool) -> tuple[Pos, str]:
+    if multiline:
+        error_on = ILLEGAL_MULTILINE_BASIC_STR_CHARS
+        parse_escapes = parse_basic_str_escape_multiline
+    else:
+        error_on = ILLEGAL_BASIC_STR_CHARS
+        parse_escapes = parse_basic_str_escape
+    result = ""
+    start_pos = pos
+    while True:
+        try:
+            char = src[pos]
+        except IndexError:
+            raise TOMLDecodeError("Unterminated string", src, pos) from None
+        if char == '"':
+            if not multiline:
+                return pos + 1, result + src[start_pos:pos]
+            if src.startswith('"""', pos):
+                return pos + 3, result + src[start_pos:pos]
+            pos += 1
+            continue
+        if char == "\\":
+            result += src[start_pos:pos]
+            pos, parsed_escape = parse_escapes(src, pos)
+            result += parsed_escape
+            start_pos = pos
+            continue
+        if char in error_on:
+            raise TOMLDecodeError(f"Illegal character {char!r}", src, pos)
+        pos += 1
+
+
+def parse_value(
+    src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
+) -> tuple[Pos, Any]:
+    if nest_lvl > MAX_INLINE_NESTING:
+        # Pure Python should have raised RecursionError already.
+        # This ensures mypyc binaries eventually do the same.
+        raise RecursionError(  # pragma: no cover
+            "TOML inline arrays/tables are nested more than the allowed"
+            f" {MAX_INLINE_NESTING} levels"
+        )
+
+    try:
+        char: str | None = src[pos]
+    except IndexError:
+        char = None
+
+    # IMPORTANT: order conditions based on speed of checking and likelihood
+
+    # Basic strings
+    if char == '"':
+        if src.startswith('"""', pos):
+            return parse_multiline_str(src, pos, literal=False)
+        return parse_one_line_basic_str(src, pos)
+
+    # Literal strings
+    if char == "'":
+        if src.startswith("'''", pos):
+            return parse_multiline_str(src, pos, literal=True)
+        return parse_literal_str(src, pos)
+
+    # Booleans
+    if char == "t":
+        if src.startswith("true", pos):
+            return pos + 4, True
+    if char == "f":
+        if src.startswith("false", pos):
+            return pos + 5, False
+
+    # Arrays
+    if char == "[":
+        return parse_array(src, pos, parse_float, nest_lvl + 1)
+
+    # Inline tables
+    if char == "{":
+        return parse_inline_table(src, pos, parse_float, nest_lvl + 1)
+
+    # Dates and times
+    datetime_match = RE_DATETIME.match(src, pos)
+    if datetime_match:
+        try:
+            datetime_obj = match_to_datetime(datetime_match)
+        except ValueError as e:
+            raise TOMLDecodeError("Invalid date or datetime", src, pos) from e
+        return datetime_match.end(), datetime_obj
+    localtime_match = RE_LOCALTIME.match(src, pos)
+    if localtime_match:
+        return localtime_match.end(), match_to_localtime(localtime_match)
+
+    # Integers and "normal" floats.
+    # The regex will greedily match any type starting with a decimal
+    # char, so needs to be located after handling of dates and times.
+    number_match = RE_NUMBER.match(src, pos)
+    if number_match:
+        return number_match.end(), match_to_number(number_match, parse_float)
+
+    # Special floats
+    first_three = src[pos : pos + 3]
+    if first_three in {"inf", "nan"}:
+        return pos + 3, parse_float(first_three)
+    first_four = src[pos : pos + 4]
+    if first_four in {"-inf", "+inf", "-nan", "+nan"}:
+        return pos + 4, parse_float(first_four)
+
+    raise TOMLDecodeError("Invalid value", src, pos)
+
+
+def is_unicode_scalar_value(codepoint: int) -> bool:
+    return (0 <= codepoint <= 55295) or (57344 <= codepoint <= 1114111)
+
+
+def make_safe_parse_float(parse_float: ParseFloat) -> ParseFloat:
+    """A decorator to make `parse_float` safe.
+
+    `parse_float` must not return dicts or lists, because these types
+    would be mixed with parsed TOML tables and arrays, thus confusing
+    the parser. The returned decorated callable raises `ValueError`
+    instead of returning illegal types.
+    """
+    # The default `float` callable never returns illegal types. Optimize it.
+    if parse_float is float:
+        return float
+
+    def safe_parse_float(float_str: str) -> Any:
+        float_value = parse_float(float_str)
+        if isinstance(float_value, (dict, list)):
+            raise ValueError("parse_float must not return dicts or lists")
+        return float_value
+
+    return safe_parse_float
diff --git a/libs/tomli/_re.py b/libs/tomli/_re.py
new file mode 100644
index 0000000000..fc374ed63d
--- /dev/null
+++ b/libs/tomli/_re.py
@@ -0,0 +1,119 @@
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+from __future__ import annotations
+
+from datetime import date, datetime, time, timedelta, timezone, tzinfo
+from functools import lru_cache
+import re
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Any, Final
+
+    from ._types import ParseFloat
+
+_TIME_RE_STR: Final = r"""
+([01][0-9]|2[0-3])             # hours
+:([0-5][0-9])                  # minutes
+(?:
+    :([0-5][0-9])              # optional seconds
+    (?:\.([0-9]{1,6})[0-9]*)?  # optional fractions of a second
+)?
+"""
+
+RE_NUMBER: Final = re.compile(
+    r"""
+0
+(?:
+    x[0-9A-Fa-f](?:_?[0-9A-Fa-f])*   # hex
+    |
+    b[01](?:_?[01])*                 # bin
+    |
+    o[0-7](?:_?[0-7])*               # oct
+)
+|
+[+-]?(?:0|[1-9](?:_?[0-9])*)         # dec, integer part
+(?P<floatpart>
+    (?:\.[0-9](?:_?[0-9])*)?         # optional fractional part
+    (?:[eE][+-]?[0-9](?:_?[0-9])*)?  # optional exponent part
+)
+""",
+    flags=re.VERBOSE,
+)
+RE_LOCALTIME: Final = re.compile(_TIME_RE_STR, flags=re.VERBOSE)
+RE_DATETIME: Final = re.compile(
+    rf"""
+([0-9]{{4}})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])  # date, e.g. 1988-10-27
+(?:
+    [Tt ]
+    {_TIME_RE_STR}
+    (?:([Zz])|([+-])([01][0-9]|2[0-3]):([0-5][0-9]))?  # optional time offset
+)?
+""",
+    flags=re.VERBOSE,
+)
+
+
+def match_to_datetime(match: re.Match[str]) -> datetime | date:
+    """Convert a `RE_DATETIME` match to `datetime.datetime` or `datetime.date`.
+
+    Raises ValueError if the match does not correspond to a valid date
+    or datetime.
+    """
+    (
+        year_str,
+        month_str,
+        day_str,
+        hour_str,
+        minute_str,
+        sec_str,
+        micros_str,
+        zulu_time,
+        offset_sign_str,
+        offset_hour_str,
+        offset_minute_str,
+    ) = match.groups()
+    year, month, day = int(year_str), int(month_str), int(day_str)
+    if hour_str is None:
+        return date(year, month, day)
+    hour, minute = int(hour_str), int(minute_str)
+    sec = int(sec_str) if sec_str else 0
+    micros = int(micros_str.ljust(6, "0")) if micros_str else 0
+    if offset_sign_str:
+        tz: tzinfo | None = cached_tz(
+            offset_hour_str, offset_minute_str, offset_sign_str
+        )
+    elif zulu_time:
+        tz = timezone.utc
+    else:  # local date-time
+        tz = None
+    return datetime(year, month, day, hour, minute, sec, micros, tzinfo=tz)
+
+
+# No need to limit cache size. This is only ever called on input
+# that matched RE_DATETIME, so there is an implicit bound of
+# 24 (hours) * 60 (minutes) * 2 (offset direction) = 2880.
+@lru_cache(maxsize=None)
+def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
+    sign = 1 if sign_str == "+" else -1
+    return timezone(
+        timedelta(
+            hours=sign * int(hour_str),
+            minutes=sign * int(minute_str),
+        )
+    )
+
+
+def match_to_localtime(match: re.Match[str]) -> time:
+    hour_str, minute_str, sec_str, micros_str = match.groups()
+    sec = int(sec_str) if sec_str else 0
+    micros = int(micros_str.ljust(6, "0")) if micros_str else 0
+    return time(int(hour_str), int(minute_str), sec, micros)
+
+
+def match_to_number(match: re.Match[str], parse_float: ParseFloat) -> Any:
+    if match.group("floatpart"):
+        return parse_float(match.group())
+    return int(match.group(), 0)
diff --git a/libs/tomli/_types.py b/libs/tomli/_types.py
new file mode 100644
index 0000000000..d949412e03
--- /dev/null
+++ b/libs/tomli/_types.py
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: MIT
+# SPDX-FileCopyrightText: 2021 Taneli Hukkinen
+# Licensed to PSF under a Contributor Agreement.
+
+from typing import Any, Callable, Tuple
+
+# Type annotations
+ParseFloat = Callable[[str], Any]
+Key = Tuple[str, ...]
+Pos = int
diff --git a/libs/tomli/py.typed b/libs/tomli/py.typed
new file mode 100644
index 0000000000..7632ecf775
--- /dev/null
+++ b/libs/tomli/py.typed
@@ -0,0 +1 @@
+# Marker file for PEP 561
diff --git a/libs/tqdm-4.67.1.dist-info/METADATA b/libs/tqdm-4.67.1.dist-info/METADATA
deleted file mode 100644
index 074db371cd..0000000000
--- a/libs/tqdm-4.67.1.dist-info/METADATA
+++ /dev/null
@@ -1,1594 +0,0 @@
-Metadata-Version: 2.1
-Name: tqdm
-Version: 4.67.1
-Summary: Fast, Extensible Progress Meter
-Maintainer-email: tqdm developers <devs@tqdm.ml>
-License: MPL-2.0 AND MIT
-Project-URL: homepage, https://tqdm.github.io
-Project-URL: repository, https://github.com/tqdm/tqdm
-Project-URL: changelog, https://tqdm.github.io/releases
-Project-URL: wiki, https://github.com/tqdm/tqdm/wiki
-Keywords: progressbar,progressmeter,progress,bar,meter,rate,eta,console,terminal,time
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Environment :: MacOS X
-Classifier: Environment :: Other Environment
-Classifier: Environment :: Win32 (MS Windows)
-Classifier: Environment :: X11 Applications
-Classifier: Framework :: IPython
-Classifier: Framework :: Jupyter
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: End Users/Desktop
-Classifier: Intended Audience :: Other Audience
-Classifier: Intended Audience :: System Administrators
-Classifier: License :: OSI Approved :: MIT License
-Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Operating System :: MacOS
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft
-Classifier: Operating System :: Microsoft :: MS-DOS
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
-Classifier: Operating System :: POSIX :: BSD
-Classifier: Operating System :: POSIX :: BSD :: FreeBSD
-Classifier: Operating System :: POSIX :: Linux
-Classifier: Operating System :: POSIX :: SunOS/Solaris
-Classifier: Operating System :: Unix
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: Implementation
-Classifier: Programming Language :: Python :: Implementation :: IronPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Programming Language :: Unix Shell
-Classifier: Topic :: Desktop Environment
-Classifier: Topic :: Education :: Computer Aided Instruction (CAI)
-Classifier: Topic :: Education :: Testing
-Classifier: Topic :: Office/Business
-Classifier: Topic :: Other/Nonlisted Topic
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Software Development :: Pre-processors
-Classifier: Topic :: Software Development :: User Interfaces
-Classifier: Topic :: System :: Installation/Setup
-Classifier: Topic :: System :: Logging
-Classifier: Topic :: System :: Monitoring
-Classifier: Topic :: System :: Shells
-Classifier: Topic :: Terminals
-Classifier: Topic :: Utilities
-Requires-Python: >=3.7
-Description-Content-Type: text/x-rst
-License-File: LICENCE
-Requires-Dist: colorama; platform_system == "Windows"
-Provides-Extra: dev
-Requires-Dist: pytest>=6; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-timeout; extra == "dev"
-Requires-Dist: pytest-asyncio>=0.24; extra == "dev"
-Requires-Dist: nbval; extra == "dev"
-Provides-Extra: discord
-Requires-Dist: requests; extra == "discord"
-Provides-Extra: notebook
-Requires-Dist: ipywidgets>=6; extra == "notebook"
-Provides-Extra: slack
-Requires-Dist: slack-sdk; extra == "slack"
-Provides-Extra: telegram
-Requires-Dist: requests; extra == "telegram"
-
-|Logo|
-
-tqdm
-====
-
-|Py-Versions| |Versions| |Conda-Forge-Status| |Docker| |Snapcraft|
-
-|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade| |Libraries-Rank| |PyPI-Downloads|
-
-|LICENCE| |OpenHub-Status| |binder-demo| |awesome-python|
-
-``tqdm`` derives from the Arabic word *taqaddum* (ุชู‚ุฏู‘ู…) which can mean "progress,"
-and is an abbreviation for "I love you so much" in Spanish (*te quiero demasiado*).
-
-Instantly make your loops show a smart progress meter - just wrap any
-iterable with ``tqdm(iterable)``, and you're done!
-
-.. code:: python
-
-    from tqdm import tqdm
-    for i in tqdm(range(10000)):
-        ...
-
-``76%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ ย ย ย ย ย ย  | 7568/10000 [00:33<00:10, 229.00it/s]``
-
-``trange(N)`` can be also used as a convenient shortcut for
-``tqdm(range(N))``.
-
-|Screenshot|
-    |Video| |Slides| |Merch|
-
-It can also be executed as a module with pipes:
-
-.. code:: sh
-
-    $ seq 9999999 | tqdm --bytes | wc -l
-    75.2MB [00:00, 217MB/s]
-    9999999
-
-    $ tar -zcf - docs/ | tqdm --bytes --total `du -sb docs/ | cut -f1` \
-        > backup.tgz
-     32%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–                      | 8.89G/27.9G [00:42<01:31, 223MB/s]
-
-Overhead is low -- about 60ns per iteration (80ns with ``tqdm.gui``), and is
-unit tested against performance regression.
-By comparison, the well-established
-`ProgressBar <https://github.com/niltonvolpato/python-progressbar>`__ has
-an 800ns/iter overhead.
-
-In addition to its low overhead, ``tqdm`` uses smart algorithms to predict
-the remaining time and to skip unnecessary iteration displays, which allows
-for a negligible overhead in most cases.
-
-``tqdm`` works on any platform
-(Linux, Windows, Mac, FreeBSD, NetBSD, Solaris/SunOS),
-in any console or in a GUI, and is also friendly with IPython/Jupyter notebooks.
-
-``tqdm`` does not require any dependencies (not even ``curses``!), just
-Python and an environment supporting ``carriage return \r`` and
-``line feed \n`` control characters.
-
-------------------------------------------
-
-.. contents:: Table of contents
-   :backlinks: top
-   :local:
-
-
-Installation
-------------
-
-Latest PyPI stable release
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-|Versions| |PyPI-Downloads| |Libraries-Dependents|
-
-.. code:: sh
-
-    pip install tqdm
-
-Latest development release on GitHub
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-|GitHub-Status| |GitHub-Stars| |GitHub-Commits| |GitHub-Forks| |GitHub-Updated|
-
-Pull and install pre-release ``devel`` branch:
-
-.. code:: sh
-
-    pip install "git+https://github.com/tqdm/tqdm.git@devel#egg=tqdm"
-
-Latest Conda release
-~~~~~~~~~~~~~~~~~~~~
-
-|Conda-Forge-Status|
-
-.. code:: sh
-
-    conda install -c conda-forge tqdm
-
-Latest Snapcraft release
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-|Snapcraft|
-
-There are 3 channels to choose from:
-
-.. code:: sh
-
-    snap install tqdm  # implies --stable, i.e. latest tagged release
-    snap install tqdm  --candidate  # master branch
-    snap install tqdm  --edge  # devel branch
-
-Note that ``snap`` binaries are purely for CLI use (not ``import``-able), and
-automatically set up ``bash`` tab-completion.
-
-Latest Docker release
-~~~~~~~~~~~~~~~~~~~~~
-
-|Docker|
-
-.. code:: sh
-
-    docker pull tqdm/tqdm
-    docker run -i --rm tqdm/tqdm --help
-
-Other
-~~~~~
-
-There are other (unofficial) places where ``tqdm`` may be downloaded, particularly for CLI use:
-
-|Repology|
-
-.. |Repology| image:: https://repology.org/badge/tiny-repos/python:tqdm.svg
-   :target: https://repology.org/project/python:tqdm/versions
-
-Changelog
----------
-
-The list of all changes is available either on GitHub's Releases:
-|GitHub-Status|, on the
-`wiki <https://github.com/tqdm/tqdm/wiki/Releases>`__, or on the
-`website <https://tqdm.github.io/releases>`__.
-
-
-Usage
------
-
-``tqdm`` is very versatile and can be used in a number of ways.
-The three main ones are given below.
-
-Iterable-based
-~~~~~~~~~~~~~~
-
-Wrap ``tqdm()`` around any iterable:
-
-.. code:: python
-
-    from tqdm import tqdm
-    from time import sleep
-
-    text = ""
-    for char in tqdm(["a", "b", "c", "d"]):
-        sleep(0.25)
-        text = text + char
-
-``trange(i)`` is a special optimised instance of ``tqdm(range(i))``:
-
-.. code:: python
-
-    from tqdm import trange
-
-    for i in trange(100):
-        sleep(0.01)
-
-Instantiation outside of the loop allows for manual control over ``tqdm()``:
-
-.. code:: python
-
-    pbar = tqdm(["a", "b", "c", "d"])
-    for char in pbar:
-        sleep(0.25)
-        pbar.set_description("Processing %s" % char)
-
-Manual
-~~~~~~
-
-Manual control of ``tqdm()`` updates using a ``with`` statement:
-
-.. code:: python
-
-    with tqdm(total=100) as pbar:
-        for i in range(10):
-            sleep(0.1)
-            pbar.update(10)
-
-If the optional variable ``total`` (or an iterable with ``len()``) is
-provided, predictive stats are displayed.
-
-``with`` is also optional (you can just assign ``tqdm()`` to a variable,
-but in this case don't forget to ``del`` or ``close()`` at the end:
-
-.. code:: python
-
-    pbar = tqdm(total=100)
-    for i in range(10):
-        sleep(0.1)
-        pbar.update(10)
-    pbar.close()
-
-Module
-~~~~~~
-
-Perhaps the most wonderful use of ``tqdm`` is in a script or on the command
-line. Simply inserting ``tqdm`` (or ``python -m tqdm``) between pipes will pass
-through all ``stdin`` to ``stdout`` while printing progress to ``stderr``.
-
-The example below demonstrate counting the number of lines in all Python files
-in the current directory, with timing information included.
-
-.. code:: sh
-
-    $ time find . -name '*.py' -type f -exec cat \{} \; | wc -l
-    857365
-
-    real    0m3.458s
-    user    0m0.274s
-    sys     0m3.325s
-
-    $ time find . -name '*.py' -type f -exec cat \{} \; | tqdm | wc -l
-    857366it [00:03, 246471.31it/s]
-    857365
-
-    real    0m3.585s
-    user    0m0.862s
-    sys     0m3.358s
-
-Note that the usual arguments for ``tqdm`` can also be specified.
-
-.. code:: sh
-
-    $ find . -name '*.py' -type f -exec cat \{} \; |
-        tqdm --unit loc --unit_scale --total 857366 >> /dev/null
-    100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ| 857K/857K [00:04<00:00, 246Kloc/s]
-
-Backing up a large directory?
-
-.. code:: sh
-
-    $ tar -zcf - docs/ | tqdm --bytes --total `du -sb docs/ | cut -f1` \
-      > backup.tgz
-     44%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–Š                   | 153M/352M [00:14<00:18, 11.0MB/s]
-
-This can be beautified further:
-
-.. code:: sh
-
-    $ BYTES=$(du -sb docs/ | cut -f1)
-    $ tar -cf - docs/ \
-      | tqdm --bytes --total "$BYTES" --desc Processing | gzip \
-      | tqdm --bytes --total "$BYTES" --desc Compressed --position 1 \
-      > ~/backup.tgz
-    Processing: 100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ| 352M/352M [00:14<00:00, 30.2MB/s]
-    Compressed:  42%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–Ž            | 148M/352M [00:14<00:19, 10.9MB/s]
-
-Or done on a file level using 7-zip:
-
-.. code:: sh
-
-    $ 7z a -bd -r backup.7z docs/ | grep Compressing \
-      | tqdm --total $(find docs/ -type f | wc -l) --unit files \
-      | grep -v Compressing
-    100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–‰| 15327/15327 [01:00<00:00, 712.96files/s]
-
-Pre-existing CLI programs already outputting basic progress information will
-benefit from ``tqdm``'s ``--update`` and ``--update_to`` flags:
-
-.. code:: sh
-
-    $ seq 3 0.1 5 | tqdm --total 5 --update_to --null
-    100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ| 5.0/5 [00:00<00:00, 9673.21it/s]
-    $ seq 10 | tqdm --update --null  # 1 + 2 + ... + 10 = 55 iterations
-    55it [00:00, 90006.52it/s]
-
-FAQ and Known Issues
---------------------
-
-|GitHub-Issues|
-
-The most common issues relate to excessive output on multiple lines, instead
-of a neat one-line progress bar.
-
-- Consoles in general: require support for carriage return (``CR``, ``\r``).
-
-  * Some cloud logging consoles which don't support ``\r`` properly
-    (`cloudwatch <https://github.com/tqdm/tqdm/issues/966>`__,
-    `K8s <https://github.com/tqdm/tqdm/issues/1319>`__) may benefit from
-    ``export TQDM_POSITION=-1``.
-
-- Nested progress bars:
-
-  * Consoles in general: require support for moving cursors up to the
-    previous line. For example,
-    `IDLE <https://github.com/tqdm/tqdm/issues/191#issuecomment-230168030>`__,
-    `ConEmu <https://github.com/tqdm/tqdm/issues/254>`__ and
-    `PyCharm <https://github.com/tqdm/tqdm/issues/203>`__ (also
-    `here <https://github.com/tqdm/tqdm/issues/208>`__,
-    `here <https://github.com/tqdm/tqdm/issues/307>`__, and
-    `here <https://github.com/tqdm/tqdm/issues/454#issuecomment-335416815>`__)
-    lack full support.
-  * Windows: additionally may require the Python module ``colorama``
-    to ensure nested bars stay within their respective lines.
-
-- Unicode:
-
-  * Environments which report that they support unicode will have solid smooth
-    progressbars. The fallback is an ``ascii``-only bar.
-  * Windows consoles often only partially support unicode and thus
-    `often require explicit ascii=True <https://github.com/tqdm/tqdm/issues/454#issuecomment-335416815>`__
-    (also `here <https://github.com/tqdm/tqdm/issues/499>`__). This is due to
-    either normal-width unicode characters being incorrectly displayed as
-    "wide", or some unicode characters not rendering.
-
-- Wrapping generators:
-
-  * Generator wrapper functions tend to hide the length of iterables.
-    ``tqdm`` does not.
-  * Replace ``tqdm(enumerate(...))`` with ``enumerate(tqdm(...))`` or
-    ``tqdm(enumerate(x), total=len(x), ...)``.
-    The same applies to ``numpy.ndenumerate``.
-  * Replace ``tqdm(zip(a, b))`` with ``zip(tqdm(a), b)`` or even
-    ``zip(tqdm(a), tqdm(b))``.
-  * The same applies to ``itertools``.
-  * Some useful convenience functions can be found under ``tqdm.contrib``.
-
-- `No intermediate output in docker-compose <https://github.com/tqdm/tqdm/issues/771>`__:
-  use ``docker-compose run`` instead of ``docker-compose up`` and ``tty: true``.
-
-- Overriding defaults via environment variables:
-  e.g. in CI/cloud jobs, ``export TQDM_MININTERVAL=5`` to avoid log spam.
-  This override logic is handled by the ``tqdm.utils.envwrap`` decorator
-  (useful independent of ``tqdm``).
-
-If you come across any other difficulties, browse and file |GitHub-Issues|.
-
-Documentation
--------------
-
-|Py-Versions| |README-Hits| (Since 19 May 2016)
-
-.. code:: python
-
-    class tqdm():
-      """
-      Decorate an iterable object, returning an iterator which acts exactly
-      like the original iterable, but prints a dynamically updating
-      progressbar every time a value is requested.
-      """
-
-      @envwrap("TQDM_")  # override defaults via env vars
-      def __init__(self, iterable=None, desc=None, total=None, leave=True,
-                   file=None, ncols=None, mininterval=0.1,
-                   maxinterval=10.0, miniters=None, ascii=None, disable=False,
-                   unit='it', unit_scale=False, dynamic_ncols=False,
-                   smoothing=0.3, bar_format=None, initial=0, position=None,
-                   postfix=None, unit_divisor=1000, write_bytes=False,
-                   lock_args=None, nrows=None, colour=None, delay=0):
-
-Parameters
-~~~~~~~~~~
-
-* iterable  : iterable, optional  
-    Iterable to decorate with a progressbar.
-    Leave blank to manually manage the updates.
-* desc  : str, optional  
-    Prefix for the progressbar.
-* total  : int or float, optional  
-    The number of expected iterations. If unspecified,
-    len(iterable) is used if possible. If float("inf") or as a last
-    resort, only basic progress statistics are displayed
-    (no ETA, no progressbar).
-    If ``gui`` is True and this parameter needs subsequent updating,
-    specify an initial arbitrary large positive number,
-    e.g. 9e9.
-* leave  : bool, optional  
-    If [default: True], keeps all traces of the progressbar
-    upon termination of iteration.
-    If ``None``, will leave only if ``position`` is ``0``.
-* file  : ``io.TextIOWrapper`` or ``io.StringIO``, optional  
-    Specifies where to output the progress messages
-    (default: sys.stderr). Uses ``file.write(str)`` and ``file.flush()``
-    methods.  For encoding, see ``write_bytes``.
-* ncols  : int, optional  
-    The width of the entire output message. If specified,
-    dynamically resizes the progressbar to stay within this bound.
-    If unspecified, attempts to use environment width. The
-    fallback is a meter width of 10 and no limit for the counter and
-    statistics. If 0, will not print any meter (only stats).
-* mininterval  : float, optional  
-    Minimum progress display update interval [default: 0.1] seconds.
-* maxinterval  : float, optional  
-    Maximum progress display update interval [default: 10] seconds.
-    Automatically adjusts ``miniters`` to correspond to ``mininterval``
-    after long display update lag. Only works if ``dynamic_miniters``
-    or monitor thread is enabled.
-* miniters  : int or float, optional  
-    Minimum progress display update interval, in iterations.
-    If 0 and ``dynamic_miniters``, will automatically adjust to equal
-    ``mininterval`` (more CPU efficient, good for tight loops).
-    If > 0, will skip display of specified number of iterations.
-    Tweak this and ``mininterval`` to get very efficient loops.
-    If your progress is erratic with both fast and slow iterations
-    (network, skipping items, etc) you should set miniters=1.
-* ascii  : bool or str, optional  
-    If unspecified or False, use unicode (smooth blocks) to fill
-    the meter. The fallback is to use ASCII characters " 123456789#".
-* disable  : bool, optional  
-    Whether to disable the entire progressbar wrapper
-    [default: False]. If set to None, disable on non-TTY.
-* unit  : str, optional  
-    String that will be used to define the unit of each iteration
-    [default: it].
-* unit_scale  : bool or int or float, optional  
-    If 1 or True, the number of iterations will be reduced/scaled
-    automatically and a metric prefix following the
-    International System of Units standard will be added
-    (kilo, mega, etc.) [default: False]. If any other non-zero
-    number, will scale ``total`` and ``n``.
-* dynamic_ncols  : bool, optional  
-    If set, constantly alters ``ncols`` and ``nrows`` to the
-    environment (allowing for window resizes) [default: False].
-* smoothing  : float, optional  
-    Exponential moving average smoothing factor for speed estimates
-    (ignored in GUI mode). Ranges from 0 (average speed) to 1
-    (current/instantaneous speed) [default: 0.3].
-* bar_format  : str, optional  
-    Specify a custom bar string formatting. May impact performance.
-    [default: '{l_bar}{bar}{r_bar}'], where
-    l_bar='{desc}: {percentage:3.0f}%|' and
-    r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, '
-    '{rate_fmt}{postfix}]'
-    Possible vars: l_bar, bar, r_bar, n, n_fmt, total, total_fmt,
-    percentage, elapsed, elapsed_s, ncols, nrows, desc, unit,
-    rate, rate_fmt, rate_noinv, rate_noinv_fmt,
-    rate_inv, rate_inv_fmt, postfix, unit_divisor,
-    remaining, remaining_s, eta.
-    Note that a trailing ": " is automatically removed after {desc}
-    if the latter is empty.
-* initial  : int or float, optional  
-    The initial counter value. Useful when restarting a progress
-    bar [default: 0]. If using float, consider specifying ``{n:.3f}``
-    or similar in ``bar_format``, or specifying ``unit_scale``.
-* position  : int, optional  
-    Specify the line offset to print this bar (starting from 0)
-    Automatic if unspecified.
-    Useful to manage multiple bars at once (eg, from threads).
-* postfix  : dict or ``*``, optional  
-    Specify additional stats to display at the end of the bar.
-    Calls ``set_postfix(**postfix)`` if possible (dict).
-* unit_divisor  : float, optional  
-    [default: 1000], ignored unless ``unit_scale`` is True.
-* write_bytes  : bool, optional  
-    Whether to write bytes. If (default: False) will write unicode.
-* lock_args  : tuple, optional  
-    Passed to ``refresh`` for intermediate output
-    (initialisation, iterating, and updating).
-* nrows  : int, optional  
-    The screen height. If specified, hides nested bars outside this
-    bound. If unspecified, attempts to use environment height.
-    The fallback is 20.
-* colour  : str, optional  
-    Bar colour (e.g. 'green', '#00ff00').
-* delay  : float, optional  
-    Don't display until [default: 0] seconds have elapsed.
-
-Extra CLI Options
-~~~~~~~~~~~~~~~~~
-
-* delim  : chr, optional  
-    Delimiting character [default: '\n']. Use '\0' for null.
-    N.B.: on Windows systems, Python converts '\n' to '\r\n'.
-* buf_size  : int, optional  
-    String buffer size in bytes [default: 256]
-    used when ``delim`` is specified.
-* bytes  : bool, optional  
-    If true, will count bytes, ignore ``delim``, and default
-    ``unit_scale`` to True, ``unit_divisor`` to 1024, and ``unit`` to 'B'.
-* tee  : bool, optional  
-    If true, passes ``stdin`` to both ``stderr`` and ``stdout``.
-* update  : bool, optional  
-    If true, will treat input as newly elapsed iterations,
-    i.e. numbers to pass to ``update()``. Note that this is slow
-    (~2e5 it/s) since every input must be decoded as a number.
-* update_to  : bool, optional  
-    If true, will treat input as total elapsed iterations,
-    i.e. numbers to assign to ``self.n``. Note that this is slow
-    (~2e5 it/s) since every input must be decoded as a number.
-* null  : bool, optional  
-    If true, will discard input (no stdout).
-* manpath  : str, optional  
-    Directory in which to install tqdm man pages.
-* comppath  : str, optional  
-    Directory in which to place tqdm completion.
-* log  : str, optional  
-    CRITICAL|FATAL|ERROR|WARN(ING)|[default: 'INFO']|DEBUG|NOTSET.
-
-Returns
-~~~~~~~
-
-* out  : decorated iterator.  
-
-.. code:: python
-
-    class tqdm():
-      def update(self, n=1):
-          """
-          Manually update the progress bar, useful for streams
-          such as reading files.
-          E.g.:
-          >>> t = tqdm(total=filesize) # Initialise
-          >>> for current_buffer in stream:
-          ...    ...
-          ...    t.update(len(current_buffer))
-          >>> t.close()
-          The last line is highly recommended, but possibly not necessary if
-          ``t.update()`` will be called in such a way that ``filesize`` will be
-          exactly reached and printed.
-
-          Parameters
-          ----------
-          n  : int or float, optional
-              Increment to add to the internal counter of iterations
-              [default: 1]. If using float, consider specifying ``{n:.3f}``
-              or similar in ``bar_format``, or specifying ``unit_scale``.
-
-          Returns
-          -------
-          out  : bool or None
-              True if a ``display()`` was triggered.
-          """
-
-      def close(self):
-          """Cleanup and (if leave=False) close the progressbar."""
-
-      def clear(self, nomove=False):
-          """Clear current bar display."""
-
-      def refresh(self):
-          """
-          Force refresh the display of this bar.
-
-          Parameters
-          ----------
-          nolock  : bool, optional
-              If ``True``, does not lock.
-              If [default: ``False``]: calls ``acquire()`` on internal lock.
-          lock_args  : tuple, optional
-              Passed to internal lock's ``acquire()``.
-              If specified, will only ``display()`` if ``acquire()`` returns ``True``.
-          """
-
-      def unpause(self):
-          """Restart tqdm timer from last print time."""
-
-      def reset(self, total=None):
-          """
-          Resets to 0 iterations for repeated use.
-
-          Consider combining with ``leave=True``.
-
-          Parameters
-          ----------
-          total  : int or float, optional. Total to use for the new bar.
-          """
-
-      def set_description(self, desc=None, refresh=True):
-          """
-          Set/modify description of the progress bar.
-
-          Parameters
-          ----------
-          desc  : str, optional
-          refresh  : bool, optional
-              Forces refresh [default: True].
-          """
-
-      def set_postfix(self, ordered_dict=None, refresh=True, **tqdm_kwargs):
-          """
-          Set/modify postfix (additional stats)
-          with automatic formatting based on datatype.
-
-          Parameters
-          ----------
-          ordered_dict  : dict or OrderedDict, optional
-          refresh  : bool, optional
-              Forces refresh [default: True].
-          kwargs  : dict, optional
-          """
-
-      @classmethod
-      def write(cls, s, file=sys.stdout, end="\n"):
-          """Print a message via tqdm (without overlap with bars)."""
-
-      @property
-      def format_dict(self):
-          """Public API for read-only member access."""
-
-      def display(self, msg=None, pos=None):
-          """
-          Use ``self.sp`` to display ``msg`` in the specified ``pos``.
-
-          Consider overloading this function when inheriting to use e.g.:
-          ``self.some_frontend(**self.format_dict)`` instead of ``self.sp``.
-
-          Parameters
-          ----------
-          msg  : str, optional. What to display (default: ``repr(self)``).
-          pos  : int, optional. Position to ``moveto``
-            (default: ``abs(self.pos)``).
-          """
-
-      @classmethod
-      @contextmanager
-      def wrapattr(cls, stream, method, total=None, bytes=True, **tqdm_kwargs):
-          """
-          stream  : file-like object.
-          method  : str, "read" or "write". The result of ``read()`` and
-              the first argument of ``write()`` should have a ``len()``.
-
-          >>> with tqdm.wrapattr(file_obj, "read", total=file_obj.size) as fobj:
-          ...     while True:
-          ...         chunk = fobj.read(chunk_size)
-          ...         if not chunk:
-          ...             break
-          """
-
-      @classmethod
-      def pandas(cls, *targs, **tqdm_kwargs):
-          """Registers the current `tqdm` class with `pandas`."""
-
-    def trange(*args, **tqdm_kwargs):
-        """Shortcut for `tqdm(range(*args), **tqdm_kwargs)`."""
-
-Convenience Functions
-~~~~~~~~~~~~~~~~~~~~~
-
-.. code:: python
-
-    def tqdm.contrib.tenumerate(iterable, start=0, total=None,
-                                tqdm_class=tqdm.auto.tqdm, **tqdm_kwargs):
-        """Equivalent of `numpy.ndenumerate` or builtin `enumerate`."""
-
-    def tqdm.contrib.tzip(iter1, *iter2plus, **tqdm_kwargs):
-        """Equivalent of builtin `zip`."""
-
-    def tqdm.contrib.tmap(function, *sequences, **tqdm_kwargs):
-        """Equivalent of builtin `map`."""
-
-Submodules
-~~~~~~~~~~
-
-.. code:: python
-
-    class tqdm.notebook.tqdm(tqdm.tqdm):
-        """IPython/Jupyter Notebook widget."""
-
-    class tqdm.auto.tqdm(tqdm.tqdm):
-        """Automatically chooses beween `tqdm.notebook` and `tqdm.tqdm`."""
-
-    class tqdm.asyncio.tqdm(tqdm.tqdm):
-      """Asynchronous version."""
-      @classmethod
-      def as_completed(cls, fs, *, loop=None, timeout=None, total=None,
-                       **tqdm_kwargs):
-          """Wrapper for `asyncio.as_completed`."""
-
-    class tqdm.gui.tqdm(tqdm.tqdm):
-        """Matplotlib GUI version."""
-
-    class tqdm.tk.tqdm(tqdm.tqdm):
-        """Tkinter GUI version."""
-
-    class tqdm.rich.tqdm(tqdm.tqdm):
-        """`rich.progress` version."""
-
-    class tqdm.keras.TqdmCallback(keras.callbacks.Callback):
-        """Keras callback for epoch and batch progress."""
-
-    class tqdm.dask.TqdmCallback(dask.callbacks.Callback):
-        """Dask callback for task progress."""
-
-
-``contrib``
-+++++++++++
-
-The ``tqdm.contrib`` package also contains experimental modules:
-
-- ``tqdm.contrib.itertools``: Thin wrappers around ``itertools``
-- ``tqdm.contrib.concurrent``: Thin wrappers around ``concurrent.futures``
-- ``tqdm.contrib.slack``: Posts to `Slack <https://slack.com>`__ bots
-- ``tqdm.contrib.discord``: Posts to `Discord <https://discord.com>`__ bots
-- ``tqdm.contrib.telegram``: Posts to `Telegram <https://telegram.org>`__ bots
-- ``tqdm.contrib.bells``: Automagically enables all optional features
-
-  * ``auto``, ``pandas``, ``slack``, ``discord``, ``telegram``
-
-Examples and Advanced Usage
----------------------------
-
-- See the `examples <https://github.com/tqdm/tqdm/tree/master/examples>`__
-  folder;
-- import the module and run ``help()``;
-- consult the `wiki <https://github.com/tqdm/tqdm/wiki>`__;
-
-  * this has an
-    `excellent article <https://github.com/tqdm/tqdm/wiki/How-to-make-a-great-Progress-Bar>`__
-    on how to make a **great** progressbar;
-
-- check out the `slides from PyData London <https://tqdm.github.io/PyData2019/slides.html>`__, or
-- run the |binder-demo|.
-
-Description and additional stats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Custom information can be displayed and updated dynamically on ``tqdm`` bars
-with the ``desc`` and ``postfix`` arguments:
-
-.. code:: python
-
-    from tqdm import tqdm, trange
-    from random import random, randint
-    from time import sleep
-
-    with trange(10) as t:
-        for i in t:
-            # Description will be displayed on the left
-            t.set_description('GEN %i' % i)
-            # Postfix will be displayed on the right,
-            # formatted automatically based on argument's datatype
-            t.set_postfix(loss=random(), gen=randint(1,999), str='h',
-                          lst=[1, 2])
-            sleep(0.1)
-
-    with tqdm(total=10, bar_format="{postfix[0]} {postfix[1][value]:>8.2g}",
-              postfix=["Batch", {"value": 0}]) as t:
-        for i in range(10):
-            sleep(0.1)
-            t.postfix[1]["value"] = i / 2
-            t.update()
-
-Points to remember when using ``{postfix[...]}`` in the ``bar_format`` string:
-
-- ``postfix`` also needs to be passed as an initial argument in a compatible
-  format, and
-- ``postfix`` will be auto-converted to a string if it is a ``dict``-like
-  object. To prevent this behaviour, insert an extra item into the dictionary
-  where the key is not a string.
-
-Additional ``bar_format`` parameters may also be defined by overriding
-``format_dict``, and the bar itself may be modified using ``ascii``:
-
-.. code:: python
-
-    from tqdm import tqdm
-    class TqdmExtraFormat(tqdm):
-        """Provides a `total_time` format parameter"""
-        @property
-        def format_dict(self):
-            d = super().format_dict
-            total_time = d["elapsed"] * (d["total"] or 0) / max(d["n"], 1)
-            d.update(total_time=self.format_interval(total_time) + " in total")
-            return d
-
-    for i in TqdmExtraFormat(
-          range(9), ascii=" .oO0",
-          bar_format="{total_time}: {percentage:.0f}%|{bar}{r_bar}"):
-        if i == 4:
-            break
-
-.. code::
-
-    00:00 in total: 44%|0000.     | 4/9 [00:00<00:00, 962.93it/s]
-
-Note that ``{bar}`` also supports a format specifier ``[width][type]``.
-
-- ``width``
-
-  * unspecified (default): automatic to fill ``ncols``
-  * ``int >= 0``: fixed width overriding ``ncols`` logic
-  * ``int < 0``: subtract from the automatic default
-
-- ``type``
-
-  * ``a``: ascii (``ascii=True`` override)
-  * ``u``: unicode (``ascii=False`` override)
-  * ``b``: blank (``ascii="  "`` override)
-
-This means a fixed bar with right-justified text may be created by using:
-``bar_format="{l_bar}{bar:10}|{bar:-10b}right-justified"``
-
-Nested progress bars
-~~~~~~~~~~~~~~~~~~~~
-
-``tqdm`` supports nested progress bars. Here's an example:
-
-.. code:: python
-
-    from tqdm.auto import trange
-    from time import sleep
-
-    for i in trange(4, desc='1st loop'):
-        for j in trange(5, desc='2nd loop'):
-            for k in trange(50, desc='3rd loop', leave=False):
-                sleep(0.01)
-
-For manual control over positioning (e.g. for multi-processing use),
-you may specify ``position=n`` where ``n=0`` for the outermost bar,
-``n=1`` for the next, and so on.
-However, it's best to check if ``tqdm`` can work without manual ``position``
-first.
-
-.. code:: python
-
-    from time import sleep
-    from tqdm import trange, tqdm
-    from multiprocessing import Pool, RLock, freeze_support
-
-    L = list(range(9))
-
-    def progresser(n):
-        interval = 0.001 / (n + 2)
-        total = 5000
-        text = f"#{n}, est. {interval * total:<04.2}s"
-        for _ in trange(total, desc=text, position=n):
-            sleep(interval)
-
-    if __name__ == '__main__':
-        freeze_support()  # for Windows support
-        tqdm.set_lock(RLock())  # for managing output contention
-        p = Pool(initializer=tqdm.set_lock, initargs=(tqdm.get_lock(),))
-        p.map(progresser, L)
-
-Note that in Python 3, ``tqdm.write`` is thread-safe:
-
-.. code:: python
-
-    from time import sleep
-    from tqdm import tqdm, trange
-    from concurrent.futures import ThreadPoolExecutor
-
-    L = list(range(9))
-
-    def progresser(n):
-        interval = 0.001 / (n + 2)
-        total = 5000
-        text = f"#{n}, est. {interval * total:<04.2}s"
-        for _ in trange(total, desc=text):
-            sleep(interval)
-        if n == 6:
-            tqdm.write("n == 6 completed.")
-            tqdm.write("`tqdm.write()` is thread-safe in py3!")
-
-    if __name__ == '__main__':
-        with ThreadPoolExecutor() as p:
-            p.map(progresser, L)
-
-Hooks and callbacks
-~~~~~~~~~~~~~~~~~~~
-
-``tqdm`` can easily support callbacks/hooks and manual updates.
-Here's an example with ``urllib``:
-
-**``urllib.urlretrieve`` documentation**
-
-    | [...]
-    | If present, the hook function will be called once
-    | on establishment of the network connection and once after each block read
-    | thereafter. The hook will be passed three arguments; a count of blocks
-    | transferred so far, a block size in bytes, and the total size of the file.
-    | [...]
-
-.. code:: python
-
-    import urllib, os
-    from tqdm import tqdm
-    urllib = getattr(urllib, 'request', urllib)
-
-    class TqdmUpTo(tqdm):
-        """Provides `update_to(n)` which uses `tqdm.update(delta_n)`."""
-        def update_to(self, b=1, bsize=1, tsize=None):
-            """
-            b  : int, optional
-                Number of blocks transferred so far [default: 1].
-            bsize  : int, optional
-                Size of each block (in tqdm units) [default: 1].
-            tsize  : int, optional
-                Total size (in tqdm units). If [default: None] remains unchanged.
-            """
-            if tsize is not None:
-                self.total = tsize
-            return self.update(b * bsize - self.n)  # also sets self.n = b * bsize
-
-    eg_link = "https://caspersci.uk.to/matryoshka.zip"
-    with TqdmUpTo(unit='B', unit_scale=True, unit_divisor=1024, miniters=1,
-                  desc=eg_link.split('/')[-1]) as t:  # all optional kwargs
-        urllib.urlretrieve(eg_link, filename=os.devnull,
-                           reporthook=t.update_to, data=None)
-        t.total = t.n
-
-Inspired by `twine#242 <https://github.com/pypa/twine/pull/242>`__.
-Functional alternative in
-`examples/tqdm_wget.py <https://github.com/tqdm/tqdm/blob/master/examples/tqdm_wget.py>`__.
-
-It is recommend to use ``miniters=1`` whenever there is potentially
-large differences in iteration speed (e.g. downloading a file over
-a patchy connection).
-
-**Wrapping read/write methods**
-
-To measure throughput through a file-like object's ``read`` or ``write``
-methods, use ``CallbackIOWrapper``:
-
-.. code:: python
-
-    from tqdm.auto import tqdm
-    from tqdm.utils import CallbackIOWrapper
-
-    with tqdm(total=file_obj.size,
-              unit='B', unit_scale=True, unit_divisor=1024) as t:
-        fobj = CallbackIOWrapper(t.update, file_obj, "read")
-        while True:
-            chunk = fobj.read(chunk_size)
-            if not chunk:
-                break
-        t.reset()
-        # ... continue to use `t` for something else
-
-Alternatively, use the even simpler ``wrapattr`` convenience function,
-which would condense both the ``urllib`` and ``CallbackIOWrapper`` examples
-down to:
-
-.. code:: python
-
-    import urllib, os
-    from tqdm import tqdm
-
-    eg_link = "https://caspersci.uk.to/matryoshka.zip"
-    response = getattr(urllib, 'request', urllib).urlopen(eg_link)
-    with tqdm.wrapattr(open(os.devnull, "wb"), "write",
-                       miniters=1, desc=eg_link.split('/')[-1],
-                       total=getattr(response, 'length', None)) as fout:
-        for chunk in response:
-            fout.write(chunk)
-
-The ``requests`` equivalent is nearly identical:
-
-.. code:: python
-
-    import requests, os
-    from tqdm import tqdm
-
-    eg_link = "https://caspersci.uk.to/matryoshka.zip"
-    response = requests.get(eg_link, stream=True)
-    with tqdm.wrapattr(open(os.devnull, "wb"), "write",
-                       miniters=1, desc=eg_link.split('/')[-1],
-                       total=int(response.headers.get('content-length', 0))) as fout:
-        for chunk in response.iter_content(chunk_size=4096):
-            fout.write(chunk)
-
-**Custom callback**
-
-``tqdm`` is known for intelligently skipping unnecessary displays. To make a
-custom callback take advantage of this, simply use the return value of
-``update()``. This is set to ``True`` if a ``display()`` was triggered.
-
-.. code:: python
-
-    from tqdm.auto import tqdm as std_tqdm
-
-    def external_callback(*args, **kwargs):
-        ...
-
-    class TqdmExt(std_tqdm):
-        def update(self, n=1):
-            displayed = super().update(n)
-            if displayed:
-                external_callback(**self.format_dict)
-            return displayed
-
-``asyncio``
-~~~~~~~~~~~
-
-Note that ``break`` isn't currently caught by asynchronous iterators.
-This means that ``tqdm`` cannot clean up after itself in this case:
-
-.. code:: python
-
-    from tqdm.asyncio import tqdm
-
-    async for i in tqdm(range(9)):
-        if i == 2:
-            break
-
-Instead, either call ``pbar.close()`` manually or use the context manager syntax:
-
-.. code:: python
-
-    from tqdm.asyncio import tqdm
-
-    with tqdm(range(9)) as pbar:
-        async for i in pbar:
-            if i == 2:
-                break
-
-Pandas Integration
-~~~~~~~~~~~~~~~~~~
-
-Due to popular demand we've added support for ``pandas`` -- here's an example
-for ``DataFrame.progress_apply`` and ``DataFrameGroupBy.progress_apply``:
-
-.. code:: python
-
-    import pandas as pd
-    import numpy as np
-    from tqdm import tqdm
-
-    df = pd.DataFrame(np.random.randint(0, 100, (100000, 6)))
-
-    # Register `pandas.progress_apply` and `pandas.Series.map_apply` with `tqdm`
-    # (can use `tqdm.gui.tqdm`, `tqdm.notebook.tqdm`, optional kwargs, etc.)
-    tqdm.pandas(desc="my bar!")
-
-    # Now you can use `progress_apply` instead of `apply`
-    # and `progress_map` instead of `map`
-    df.progress_apply(lambda x: x**2)
-    # can also groupby:
-    # df.groupby(0).progress_apply(lambda x: x**2)
-
-In case you're interested in how this works (and how to modify it for your
-own callbacks), see the
-`examples <https://github.com/tqdm/tqdm/tree/master/examples>`__
-folder or import the module and run ``help()``.
-
-Keras Integration
-~~~~~~~~~~~~~~~~~
-
-A ``keras`` callback is also available:
-
-.. code:: python
-
-    from tqdm.keras import TqdmCallback
-
-    ...
-
-    model.fit(..., verbose=0, callbacks=[TqdmCallback()])
-
-Dask Integration
-~~~~~~~~~~~~~~~~
-
-A ``dask`` callback is also available:
-
-.. code:: python
-
-    from tqdm.dask import TqdmCallback
-
-    with TqdmCallback(desc="compute"):
-        ...
-        arr.compute()
-
-    # or use callback globally
-    cb = TqdmCallback(desc="global")
-    cb.register()
-    arr.compute()
-
-IPython/Jupyter Integration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-IPython/Jupyter is supported via the ``tqdm.notebook`` submodule:
-
-.. code:: python
-
-    from tqdm.notebook import trange, tqdm
-    from time import sleep
-
-    for i in trange(3, desc='1st loop'):
-        for j in tqdm(range(100), desc='2nd loop'):
-            sleep(0.01)
-
-In addition to ``tqdm`` features, the submodule provides a native Jupyter
-widget (compatible with IPython v1-v4 and Jupyter), fully working nested bars
-and colour hints (blue: normal, green: completed, red: error/interrupt,
-light blue: no ETA); as demonstrated below.
-
-|Screenshot-Jupyter1|
-|Screenshot-Jupyter2|
-|Screenshot-Jupyter3|
-
-The ``notebook`` version supports percentage or pixels for overall width
-(e.g.: ``ncols='100%'`` or ``ncols='480px'``).
-
-It is also possible to let ``tqdm`` automatically choose between
-console or notebook versions by using the ``autonotebook`` submodule:
-
-.. code:: python
-
-    from tqdm.autonotebook import tqdm
-    tqdm.pandas()
-
-Note that this will issue a ``TqdmExperimentalWarning`` if run in a notebook
-since it is not meant to be possible to distinguish between ``jupyter notebook``
-and ``jupyter console``. Use ``auto`` instead of ``autonotebook`` to suppress
-this warning.
-
-Note that notebooks will display the bar in the cell where it was created.
-This may be a different cell from the one where it is used.
-If this is not desired, either
-
-- delay the creation of the bar to the cell where it must be displayed, or
-- create the bar with ``display=False``, and in a later cell call
-  ``display(bar.container)``:
-
-.. code:: python
-
-    from tqdm.notebook import tqdm
-    pbar = tqdm(..., display=False)
-
-.. code:: python
-
-    # different cell
-    display(pbar.container)
-
-The ``keras`` callback has a ``display()`` method which can be used likewise:
-
-.. code:: python
-
-    from tqdm.keras import TqdmCallback
-    cbk = TqdmCallback(display=False)
-
-.. code:: python
-
-    # different cell
-    cbk.display()
-    model.fit(..., verbose=0, callbacks=[cbk])
-
-Another possibility is to have a single bar (near the top of the notebook)
-which is constantly re-used (using ``reset()`` rather than ``close()``).
-For this reason, the notebook version (unlike the CLI version) does not
-automatically call ``close()`` upon ``Exception``.
-
-.. code:: python
-
-    from tqdm.notebook import tqdm
-    pbar = tqdm()
-
-.. code:: python
-
-    # different cell
-    iterable = range(100)
-    pbar.reset(total=len(iterable))  # initialise with new `total`
-    for i in iterable:
-        pbar.update()
-    pbar.refresh()  # force print final status but don't `close()`
-
-Custom Integration
-~~~~~~~~~~~~~~~~~~
-
-To change the default arguments (such as making ``dynamic_ncols=True``),
-simply use built-in Python magic:
-
-.. code:: python
-
-    from functools import partial
-    from tqdm import tqdm as std_tqdm
-    tqdm = partial(std_tqdm, dynamic_ncols=True)
-
-For further customisation,
-``tqdm`` may be inherited from to create custom callbacks (as with the
-``TqdmUpTo`` example `above <#hooks-and-callbacks>`__) or for custom frontends
-(e.g. GUIs such as notebook or plotting packages). In the latter case:
-
-1. ``def __init__()`` to call ``super().__init__(..., gui=True)`` to disable
-   terminal ``status_printer`` creation.
-2. Redefine: ``close()``, ``clear()``, ``display()``.
-
-Consider overloading ``display()`` to use e.g.
-``self.frontend(**self.format_dict)`` instead of ``self.sp(repr(self))``.
-
-Some submodule examples of inheritance:
-
-- `tqdm/notebook.py <https://github.com/tqdm/tqdm/blob/master/tqdm/notebook.py>`__
-- `tqdm/gui.py <https://github.com/tqdm/tqdm/blob/master/tqdm/gui.py>`__
-- `tqdm/tk.py <https://github.com/tqdm/tqdm/blob/master/tqdm/tk.py>`__
-- `tqdm/contrib/slack.py <https://github.com/tqdm/tqdm/blob/master/tqdm/contrib/slack.py>`__
-- `tqdm/contrib/discord.py <https://github.com/tqdm/tqdm/blob/master/tqdm/contrib/discord.py>`__
-- `tqdm/contrib/telegram.py <https://github.com/tqdm/tqdm/blob/master/tqdm/contrib/telegram.py>`__
-
-Dynamic Monitor/Meter
-~~~~~~~~~~~~~~~~~~~~~
-
-You can use a ``tqdm`` as a meter which is not monotonically increasing.
-This could be because ``n`` decreases (e.g. a CPU usage monitor) or ``total``
-changes.
-
-One example would be recursively searching for files. The ``total`` is the
-number of objects found so far, while ``n`` is the number of those objects which
-are files (rather than folders):
-
-.. code:: python
-
-    from tqdm import tqdm
-    import os.path
-
-    def find_files_recursively(path, show_progress=True):
-        files = []
-        # total=1 assumes `path` is a file
-        t = tqdm(total=1, unit="file", disable=not show_progress)
-        if not os.path.exists(path):
-            raise IOError("Cannot find:" + path)
-
-        def append_found_file(f):
-            files.append(f)
-            t.update()
-
-        def list_found_dir(path):
-            """returns os.listdir(path) assuming os.path.isdir(path)"""
-            listing = os.listdir(path)
-            # subtract 1 since a "file" we found was actually this directory
-            t.total += len(listing) - 1
-            # fancy way to give info without forcing a refresh
-            t.set_postfix(dir=path[-10:], refresh=False)
-            t.update(0)  # may trigger a refresh
-            return listing
-
-        def recursively_search(path):
-            if os.path.isdir(path):
-                for f in list_found_dir(path):
-                    recursively_search(os.path.join(path, f))
-            else:
-                append_found_file(path)
-
-        recursively_search(path)
-        t.set_postfix(dir=path)
-        t.close()
-        return files
-
-Using ``update(0)`` is a handy way to let ``tqdm`` decide when to trigger a
-display refresh to avoid console spamming.
-
-Writing messages
-~~~~~~~~~~~~~~~~
-
-This is a work in progress (see
-`#737 <https://github.com/tqdm/tqdm/issues/737>`__).
-
-Since ``tqdm`` uses a simple printing mechanism to display progress bars,
-you should not write any message in the terminal using ``print()`` while
-a progressbar is open.
-
-To write messages in the terminal without any collision with ``tqdm`` bar
-display, a ``.write()`` method is provided:
-
-.. code:: python
-
-    from tqdm.auto import tqdm, trange
-    from time import sleep
-
-    bar = trange(10)
-    for i in bar:
-        # Print using tqdm class method .write()
-        sleep(0.1)
-        if not (i % 3):
-            tqdm.write("Done task %i" % i)
-        # Can also use bar.write()
-
-By default, this will print to standard output ``sys.stdout``. but you can
-specify any file-like object using the ``file`` argument. For example, this
-can be used to redirect the messages writing to a log file or class.
-
-Redirecting writing
-~~~~~~~~~~~~~~~~~~~
-
-If using a library that can print messages to the console, editing the library
-by  replacing ``print()`` with ``tqdm.write()`` may not be desirable.
-In that case, redirecting ``sys.stdout`` to ``tqdm.write()`` is an option.
-
-To redirect ``sys.stdout``, create a file-like class that will write
-any input string to ``tqdm.write()``, and supply the arguments
-``file=sys.stdout, dynamic_ncols=True``.
-
-A reusable canonical example is given below:
-
-.. code:: python
-
-    from time import sleep
-    import contextlib
-    import sys
-    from tqdm import tqdm
-    from tqdm.contrib import DummyTqdmFile
-
-
-    @contextlib.contextmanager
-    def std_out_err_redirect_tqdm():
-        orig_out_err = sys.stdout, sys.stderr
-        try:
-            sys.stdout, sys.stderr = map(DummyTqdmFile, orig_out_err)
-            yield orig_out_err[0]
-        # Relay exceptions
-        except Exception as exc:
-            raise exc
-        # Always restore sys.stdout/err if necessary
-        finally:
-            sys.stdout, sys.stderr = orig_out_err
-
-    def some_fun(i):
-        print("Fee, fi, fo,".split()[i])
-
-    # Redirect stdout to tqdm.write() (don't forget the `as save_stdout`)
-    with std_out_err_redirect_tqdm() as orig_stdout:
-        # tqdm needs the original stdout
-        # and dynamic_ncols=True to autodetect console width
-        for i in tqdm(range(3), file=orig_stdout, dynamic_ncols=True):
-            sleep(.5)
-            some_fun(i)
-
-    # After the `with`, printing is restored
-    print("Done!")
-
-Redirecting ``logging``
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Similar to ``sys.stdout``/``sys.stderr`` as detailed above, console ``logging``
-may also be redirected to ``tqdm.write()``.
-
-Warning: if also redirecting ``sys.stdout``/``sys.stderr``, make sure to
-redirect ``logging`` first if needed.
-
-Helper methods are available in ``tqdm.contrib.logging``. For example:
-
-.. code:: python
-
-    import logging
-    from tqdm import trange
-    from tqdm.contrib.logging import logging_redirect_tqdm
-
-    LOG = logging.getLogger(__name__)
-
-    if __name__ == '__main__':
-        logging.basicConfig(level=logging.INFO)
-        with logging_redirect_tqdm():
-            for i in trange(9):
-                if i == 4:
-                    LOG.info("console logging redirected to `tqdm.write()`")
-        # logging restored
-
-Monitoring thread, intervals and miniters
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-``tqdm`` implements a few tricks to increase efficiency and reduce overhead.
-
-- Avoid unnecessary frequent bar refreshing: ``mininterval`` defines how long
-  to wait between each refresh. ``tqdm`` always gets updated in the background,
-  but it will display only every ``mininterval``.
-- Reduce number of calls to check system clock/time.
-- ``mininterval`` is more intuitive to configure than ``miniters``.
-  A clever adjustment system ``dynamic_miniters`` will automatically adjust
-  ``miniters`` to the amount of iterations that fit into time ``mininterval``.
-  Essentially, ``tqdm`` will check if it's time to print without actually
-  checking time. This behaviour can be still be bypassed by manually setting
-  ``miniters``.
-
-However, consider a case with a combination of fast and slow iterations.
-After a few fast iterations, ``dynamic_miniters`` will set ``miniters`` to a
-large number. When iteration rate subsequently slows, ``miniters`` will
-remain large and thus reduce display update frequency. To address this:
-
-- ``maxinterval`` defines the maximum time between display refreshes.
-  A concurrent monitoring thread checks for overdue updates and forces one
-  where necessary.
-
-The monitoring thread should not have a noticeable overhead, and guarantees
-updates at least every 10 seconds by default.
-This value can be directly changed by setting the ``monitor_interval`` of
-any ``tqdm`` instance (i.e. ``t = tqdm.tqdm(...); t.monitor_interval = 2``).
-The monitor thread may be disabled application-wide by setting
-``tqdm.tqdm.monitor_interval = 0`` before instantiation of any ``tqdm`` bar.
-
-
-Merch
------
-
-You can buy `tqdm branded merch <https://tqdm.github.io/merch>`__ now!
-
-Contributions
--------------
-
-|GitHub-Commits| |GitHub-Issues| |GitHub-PRs| |OpenHub-Status| |GitHub-Contributions| |CII Best Practices|
-
-All source code is hosted on `GitHub <https://github.com/tqdm/tqdm>`__.
-Contributions are welcome.
-
-See the
-`CONTRIBUTING <https://github.com/tqdm/tqdm/blob/master/CONTRIBUTING.md>`__
-file for more information.
-
-Developers who have made significant contributions, ranked by *SLoC*
-(surviving lines of code,
-`git fame <https://github.com/casperdcl/git-fame>`__ ``-wMC --excl '\.(png|gif|jpg)$'``),
-are:
-
-==================== ======================================================== ==== ================================
-Name                 ID                                                       SLoC Notes
-==================== ======================================================== ==== ================================
-Casper da Costa-Luis `casperdcl <https://github.com/casperdcl>`__             ~80% primary maintainer |Gift-Casper|
-Stephen Larroque     `lrq3000 <https://github.com/lrq3000>`__                 ~9%  team member
-Martin Zugnoni       `martinzugnoni <https://github.com/martinzugnoni>`__     ~3%
-Daniel Ecer          `de-code <https://github.com/de-code>`__                 ~2%
-Richard Sheridan     `richardsheridan <https://github.com/richardsheridan>`__ ~1%
-Guangshuo Chen       `chengs <https://github.com/chengs>`__                   ~1%
-Helio Machado        `0x2b3bfa0 <https://github.com/0x2b3bfa0>`__             ~1%
-Kyle Altendorf       `altendky <https://github.com/altendky>`__               <1%
-Noam Yorav-Raphael   `noamraph <https://github.com/noamraph>`__               <1%  original author
-Matthew Stevens      `mjstevens777 <https://github.com/mjstevens777>`__       <1%
-Hadrien Mary         `hadim <https://github.com/hadim>`__                     <1%  team member
-Mikhail Korobov      `kmike <https://github.com/kmike>`__                     <1%  team member
-==================== ======================================================== ==== ================================
-
-Ports to Other Languages
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-A list is available on
-`this wiki page <https://github.com/tqdm/tqdm/wiki/tqdm-ports>`__.
-
-
-LICENCE
--------
-
-Open Source (OSI approved): |LICENCE|
-
-Citation information: |DOI|
-
-|README-Hits| (Since 19 May 2016)
-
-.. |Logo| image:: https://tqdm.github.io/img/logo.gif
-.. |Screenshot| image:: https://tqdm.github.io/img/tqdm.gif
-.. |Video| image:: https://tqdm.github.io/img/video.jpg
-   :target: https://tqdm.github.io/video
-.. |Slides| image:: https://tqdm.github.io/img/slides.jpg
-   :target: https://tqdm.github.io/PyData2019/slides.html
-.. |Merch| image:: https://tqdm.github.io/img/merch.jpg
-   :target: https://tqdm.github.io/merch
-.. |Build-Status| image:: https://img.shields.io/github/actions/workflow/status/tqdm/tqdm/test.yml?branch=master&label=tqdm&logo=GitHub
-   :target: https://github.com/tqdm/tqdm/actions/workflows/test.yml
-.. |Coverage-Status| image:: https://img.shields.io/coveralls/github/tqdm/tqdm/master?logo=coveralls
-   :target: https://coveralls.io/github/tqdm/tqdm
-.. |Branch-Coverage-Status| image:: https://codecov.io/gh/tqdm/tqdm/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/tqdm/tqdm
-.. |Codacy-Grade| image:: https://app.codacy.com/project/badge/Grade/3f965571598f44549c7818f29cdcf177
-   :target: https://www.codacy.com/gh/tqdm/tqdm/dashboard
-.. |CII Best Practices| image:: https://bestpractices.coreinfrastructure.org/projects/3264/badge
-   :target: https://bestpractices.coreinfrastructure.org/projects/3264
-.. |GitHub-Status| image:: https://img.shields.io/github/tag/tqdm/tqdm.svg?maxAge=86400&logo=github&logoColor=white
-   :target: https://github.com/tqdm/tqdm/releases
-.. |GitHub-Forks| image:: https://img.shields.io/github/forks/tqdm/tqdm.svg?logo=github&logoColor=white
-   :target: https://github.com/tqdm/tqdm/network
-.. |GitHub-Stars| image:: https://img.shields.io/github/stars/tqdm/tqdm.svg?logo=github&logoColor=white
-   :target: https://github.com/tqdm/tqdm/stargazers
-.. |GitHub-Commits| image:: https://img.shields.io/github/commit-activity/y/tqdm/tqdm.svg?logo=git&logoColor=white
-   :target: https://github.com/tqdm/tqdm/graphs/commit-activity
-.. |GitHub-Issues| image:: https://img.shields.io/github/issues-closed/tqdm/tqdm.svg?logo=github&logoColor=white
-   :target: https://github.com/tqdm/tqdm/issues?q=
-.. |GitHub-PRs| image:: https://img.shields.io/github/issues-pr-closed/tqdm/tqdm.svg?logo=github&logoColor=white
-   :target: https://github.com/tqdm/tqdm/pulls
-.. |GitHub-Contributions| image:: https://img.shields.io/github/contributors/tqdm/tqdm.svg?logo=github&logoColor=white
-   :target: https://github.com/tqdm/tqdm/graphs/contributors
-.. |GitHub-Updated| image:: https://img.shields.io/github/last-commit/tqdm/tqdm/master.svg?logo=github&logoColor=white&label=pushed
-   :target: https://github.com/tqdm/tqdm/pulse
-.. |Gift-Casper| image:: https://img.shields.io/badge/dynamic/json.svg?color=ff69b4&label=gifts%20received&prefix=%C2%A3&query=%24..sum&url=https%3A%2F%2Fcaspersci.uk.to%2Fgifts.json
-   :target: https://cdcl.ml/sponsor
-.. |Versions| image:: https://img.shields.io/pypi/v/tqdm.svg
-   :target: https://tqdm.github.io/releases
-.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/tqdm.svg?label=pypi%20downloads&logo=PyPI&logoColor=white
-   :target: https://pepy.tech/project/tqdm
-.. |Py-Versions| image:: https://img.shields.io/pypi/pyversions/tqdm.svg?logo=python&logoColor=white
-   :target: https://pypi.org/project/tqdm
-.. |Conda-Forge-Status| image:: https://img.shields.io/conda/v/conda-forge/tqdm.svg?label=conda-forge&logo=conda-forge
-   :target: https://anaconda.org/conda-forge/tqdm
-.. |Snapcraft| image:: https://img.shields.io/badge/snap-install-82BEA0.svg?logo=snapcraft
-   :target: https://snapcraft.io/tqdm
-.. |Docker| image:: https://img.shields.io/badge/docker-pull-blue.svg?logo=docker&logoColor=white
-   :target: https://hub.docker.com/r/tqdm/tqdm
-.. |Libraries-Rank| image:: https://img.shields.io/librariesio/sourcerank/pypi/tqdm.svg?logo=koding&logoColor=white
-   :target: https://libraries.io/pypi/tqdm
-.. |Libraries-Dependents| image:: https://img.shields.io/librariesio/dependent-repos/pypi/tqdm.svg?logo=koding&logoColor=white
-    :target: https://github.com/tqdm/tqdm/network/dependents
-.. |OpenHub-Status| image:: https://www.openhub.net/p/tqdm/widgets/project_thin_badge?format=gif
-   :target: https://www.openhub.net/p/tqdm?ref=Thin+badge
-.. |awesome-python| image:: https://awesome.re/mentioned-badge.svg
-   :target: https://github.com/vinta/awesome-python
-.. |LICENCE| image:: https://img.shields.io/pypi/l/tqdm.svg
-   :target: https://raw.githubusercontent.com/tqdm/tqdm/master/LICENCE
-.. |DOI| image:: https://img.shields.io/badge/DOI-10.5281/zenodo.595120-blue.svg
-   :target: https://doi.org/10.5281/zenodo.595120
-.. |binder-demo| image:: https://mybinder.org/badge_logo.svg
-   :target: https://mybinder.org/v2/gh/tqdm/tqdm/master?filepath=DEMO.ipynb
-.. |Screenshot-Jupyter1| image:: https://tqdm.github.io/img/jupyter-1.gif
-.. |Screenshot-Jupyter2| image:: https://tqdm.github.io/img/jupyter-2.gif
-.. |Screenshot-Jupyter3| image:: https://tqdm.github.io/img/jupyter-3.gif
-.. |README-Hits| image:: https://cgi.cdcl.ml/hits?q=tqdm&style=social&r=https://github.com/tqdm/tqdm&l=https://tqdm.github.io/img/favicon.png&f=https://tqdm.github.io/img/logo.gif
-   :target: https://cgi.cdcl.ml/hits?q=tqdm&a=plot&r=https://github.com/tqdm/tqdm&l=https://tqdm.github.io/img/favicon.png&f=https://tqdm.github.io/img/logo.gif&style=social
diff --git a/libs/tqdm-4.67.1.dist-info/RECORD b/libs/tqdm-4.67.1.dist-info/RECORD
deleted file mode 100644
index a642fcb16d..0000000000
--- a/libs/tqdm-4.67.1.dist-info/RECORD
+++ /dev/null
@@ -1,43 +0,0 @@
-../../bin/tqdm,sha256=sIQGANa0Ss4XAwHxESDSgOd-paMFKgM1S2k-LA3IZ0c,230
-tqdm-4.67.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tqdm-4.67.1.dist-info/LICENCE,sha256=3DMlLoKQFeOxUAhvubOkD2rW-zLC9GEM6BL6Z301mGo,1985
-tqdm-4.67.1.dist-info/METADATA,sha256=P1uY9jA_X9JjzwWuS73BFHAAlAR5QyzOs7zOEHBzu2k,57675
-tqdm-4.67.1.dist-info/RECORD,,
-tqdm-4.67.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tqdm-4.67.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-tqdm-4.67.1.dist-info/entry_points.txt,sha256=ReJCH7Ui3Zyh6M16E4OhsZ1oU7WtMXCfbtoyBhGO29Y,39
-tqdm-4.67.1.dist-info/top_level.txt,sha256=NLiUJNfmc9At15s7JURiwvqMEjUi9G5PMGRrmMYzNSM,5
-tqdm/__init__.py,sha256=9mQNYSSqP99JasubEC1POJLMmhkkBH6cJZxPIR5G2pQ,1572
-tqdm/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
-tqdm/_dist_ver.py,sha256=m5AdYI-jB-v6P0VJ_70isH_p24EzSOGSwVvuAZmkmKY,23
-tqdm/_main.py,sha256=9ySvgmi_2Sw4CAo5UDW0Q2dxfTryboEWGHohfCJz0sA,283
-tqdm/_monitor.py,sha256=Uku-DPWgzJ7dO5CK08xKJK-E_F6qQ-JB3ksuXczSYR0,3699
-tqdm/_tqdm.py,sha256=LfLCuJ6bpsVo9xilmtBXyEm1vGnUCFrliW85j3J-nD4,283
-tqdm/_tqdm_gui.py,sha256=03Hc8KayxJveieI5-0-2NGiDpLvw9jZekofJUV7CCwk,287
-tqdm/_tqdm_notebook.py,sha256=BuHiLuxu6uEfZFaPJW3RPpPaxaVctEQA3kdSJSDL1hw,307
-tqdm/_tqdm_pandas.py,sha256=c9jptUgigN6axRDhRd4Rif98Tmxeopc1nFNFhIpbFUE,888
-tqdm/_utils.py,sha256=_4E73bfDj4f1s3sM42NLHNrZDOkijZoWq-n6xWLkdZ8,553
-tqdm/asyncio.py,sha256=Kp2rSkNRf9KRqa3d9YpgeZQ7L7EZf2Ki4bSc7UPIyoo,2757
-tqdm/auto.py,sha256=nDZflj6p2zKkjBCNBourrhS81zYfZy1_dQvbckrdW8o,871
-tqdm/autonotebook.py,sha256=Yb9F5uaiBPhfbDDFpbtoG8I2YUw3uQJ89rUDLbfR6ws,956
-tqdm/cli.py,sha256=SbKlN8QyZ2ogenqt-wT_p6_sx2OOdCjCyhoZBFnlmyI,11010
-tqdm/completion.sh,sha256=j79KbSmpIj_E11jfTfBXrGnUTzKXVpQ1vGVQvsyDRl4,946
-tqdm/contrib/__init__.py,sha256=OgSwVXm-vlDJ-2imtoQ9z8qdom4snMSRztH72KMA82A,2494
-tqdm/contrib/bells.py,sha256=Yx1HqGCmHrESCAO700j5wE__JCleNODJxedh1ijPLD0,837
-tqdm/contrib/concurrent.py,sha256=K1yjloKS5WRNFyjLRth0DmU5PAnDbF0A-GD27N-J4a8,3986
-tqdm/contrib/discord.py,sha256=MtVIL1s_dxH21G4sL8FBgQ4Wei23ho9Ek5T-AommvNc,5243
-tqdm/contrib/itertools.py,sha256=WdKKQU5eSzsqHu29SN_oH12huYZo0Jihqoi9-nVhwz4,774
-tqdm/contrib/logging.py,sha256=NsYtnKttj2mMrGm58mEdo5a9DP_2vv8pZyrimSuWulA,3760
-tqdm/contrib/slack.py,sha256=eP_Mr5sQonYniHxxQNGue3jk2JkIPmPWFZqIYxnOui0,4007
-tqdm/contrib/telegram.py,sha256=vn_9SATMbbwn2PAbzSDyOX6av3eBB01QBug11P4H-Og,5008
-tqdm/contrib/utils_worker.py,sha256=HJP5Mz1S1xyzEke2JaqJ2sYLHXADYoo2epT5AzQ38eA,1207
-tqdm/dask.py,sha256=9Ei58eVqTossRLhAfWyUFCduXYKjmLmwkaXIy-CHYfs,1319
-tqdm/gui.py,sha256=STIB3K8iDzDgkNUqWIpvcI_u0OGtbGNy5NwpALXhfWs,5479
-tqdm/keras.py,sha256=op9sBkb6q6c6dw2wJ0SD2ZwpPK7yM1Vbg4l1Qiy3MIo,4373
-tqdm/notebook.py,sha256=GtZ3IapLL1v8WNDaTSvPw0bJGTyfp71Vfz5HDnAzx1M,10895
-tqdm/rich.py,sha256=YyMPkEHVyYUVUR3adJKbVX26iTmNKpNMf3DEqmm-m60,5021
-tqdm/std.py,sha256=tWjz6-QCa92aqYjz7PIdkLUCAfiy-lJZheBtZyIIyO0,57461
-tqdm/tk.py,sha256=Gu0uwXwLCGPRGHORdi3WvBLGiseUp_xxX_h_gp9VpK0,6701
-tqdm/tqdm.1,sha256=aILyUPk2S4OPe_uWy2P4AMjUf0oQ6PUW0nLYXB-BWwI,7889
-tqdm/utils.py,sha256=6E0BQw3Sg7uGWKBM_cDn3P42tXswRhzkggbhBgLDjl8,11821
-tqdm/version.py,sha256=-1yWjfu3P0eghVsysHH07fbzdiADNRdzRtYPqOaqR2A,333
diff --git a/libs/tqdm-4.67.1.dist-info/WHEEL b/libs/tqdm-4.67.1.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/tqdm-4.67.1.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/tld-0.13.dist-info/INSTALLER b/libs/tqdm-4.67.3.dist-info/INSTALLER
similarity index 100%
rename from libs/tld-0.13.dist-info/INSTALLER
rename to libs/tqdm-4.67.3.dist-info/INSTALLER
diff --git a/libs/tqdm-4.67.3.dist-info/METADATA b/libs/tqdm-4.67.3.dist-info/METADATA
new file mode 100644
index 0000000000..fb6453e5b2
--- /dev/null
+++ b/libs/tqdm-4.67.3.dist-info/METADATA
@@ -0,0 +1,1595 @@
+Metadata-Version: 2.4
+Name: tqdm
+Version: 4.67.3
+Summary: Fast, Extensible Progress Meter
+Maintainer-email: tqdm developers <devs@tqdm.ml>
+License: MPL-2.0 AND MIT
+Project-URL: homepage, https://tqdm.github.io
+Project-URL: repository, https://github.com/tqdm/tqdm
+Project-URL: changelog, https://tqdm.github.io/releases
+Project-URL: wiki, https://github.com/tqdm/tqdm/wiki
+Keywords: progressbar,progressmeter,progress,bar,meter,rate,eta,console,terminal,time
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Environment :: MacOS X
+Classifier: Environment :: Other Environment
+Classifier: Environment :: Win32 (MS Windows)
+Classifier: Environment :: X11 Applications
+Classifier: Framework :: IPython
+Classifier: Framework :: Jupyter
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Education
+Classifier: Intended Audience :: End Users/Desktop
+Classifier: Intended Audience :: Other Audience
+Classifier: Intended Audience :: System Administrators
+Classifier: Operating System :: MacOS
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft
+Classifier: Operating System :: Microsoft :: MS-DOS
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: POSIX :: BSD
+Classifier: Operating System :: POSIX :: BSD :: FreeBSD
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: POSIX :: SunOS/Solaris
+Classifier: Operating System :: Unix
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: Implementation
+Classifier: Programming Language :: Python :: Implementation :: IronPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Programming Language :: Unix Shell
+Classifier: Topic :: Desktop Environment
+Classifier: Topic :: Education :: Computer Aided Instruction (CAI)
+Classifier: Topic :: Education :: Testing
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Other/Nonlisted Topic
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Pre-processors
+Classifier: Topic :: Software Development :: User Interfaces
+Classifier: Topic :: System :: Installation/Setup
+Classifier: Topic :: System :: Logging
+Classifier: Topic :: System :: Monitoring
+Classifier: Topic :: System :: Shells
+Classifier: Topic :: Terminals
+Classifier: Topic :: Utilities
+Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
+License-File: LICENCE
+Requires-Dist: colorama; platform_system == "Windows"
+Requires-Dist: importlib_metadata; python_version < "3.8"
+Provides-Extra: dev
+Requires-Dist: pytest>=6; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-timeout; extra == "dev"
+Requires-Dist: pytest-asyncio>=0.24; extra == "dev"
+Requires-Dist: nbval; extra == "dev"
+Provides-Extra: discord
+Requires-Dist: requests; extra == "discord"
+Provides-Extra: slack
+Requires-Dist: slack-sdk; extra == "slack"
+Provides-Extra: telegram
+Requires-Dist: requests; extra == "telegram"
+Provides-Extra: notebook
+Requires-Dist: ipywidgets>=6; extra == "notebook"
+Dynamic: license-file
+
+|Logo|
+
+tqdm
+====
+
+|Py-Versions| |Versions| |Conda-Forge-Status| |Docker| |Snapcraft|
+
+|Build-Status| |Coverage-Status| |Branch-Coverage-Status| |Codacy-Grade| |Libraries-Rank| |PyPI-Downloads|
+
+|LICENCE| |OpenHub-Status| |binder-demo| |awesome-python|
+
+``tqdm`` derives from the Arabic word *taqaddum* (ุชู‚ุฏู‘ู…) which can mean "progress,"
+and is an abbreviation for "I love you so much" in Spanish (*te quiero demasiado*).
+
+Instantly make your loops show a smart progress meter - just wrap any
+iterable with ``tqdm(iterable)``, and you're done!
+
+.. code:: python
+
+    from tqdm import tqdm
+    for i in tqdm(range(10000)):
+        ...
+
+``76%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ ย ย ย ย ย ย  | 7568/10000 [00:33<00:10, 229.00it/s]``
+
+``trange(N)`` can be also used as a convenient shortcut for
+``tqdm(range(N))``.
+
+|Screenshot|
+    |Video| |Slides| |Merch|
+
+It can also be executed as a module with pipes:
+
+.. code:: sh
+
+    $ seq 9999999 | tqdm --bytes | wc -l
+    75.2MB [00:00, 217MB/s]
+    9999999
+
+    $ tar -zcf - docs/ | tqdm --bytes --total `du -sb docs/ | cut -f1` \
+        > backup.tgz
+     32%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–                      | 8.89G/27.9G [00:42<01:31, 223MB/s]
+
+Overhead is low -- about 60ns per iteration (80ns with ``tqdm.gui``), and is
+unit tested against performance regression.
+By comparison, the well-established
+`ProgressBar <https://github.com/niltonvolpato/python-progressbar>`__ has
+an 800ns/iter overhead.
+
+In addition to its low overhead, ``tqdm`` uses smart algorithms to predict
+the remaining time and to skip unnecessary iteration displays, which allows
+for a negligible overhead in most cases.
+
+``tqdm`` works on any platform
+(Linux, Windows, Mac, FreeBSD, NetBSD, Solaris/SunOS),
+in any console or in a GUI, and is also friendly with IPython/Jupyter notebooks.
+
+``tqdm`` does not require any dependencies (not even ``curses``!), just
+Python and an environment supporting ``carriage return \r`` and
+``line feed \n`` control characters.
+
+------------------------------------------
+
+.. contents:: Table of contents
+   :backlinks: top
+   :local:
+
+
+Installation
+------------
+
+Latest PyPI stable release
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|Versions| |PyPI-Downloads| |Libraries-Dependents|
+
+.. code:: sh
+
+    pip install tqdm
+
+Latest development release on GitHub
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+|GitHub-Status| |GitHub-Stars| |GitHub-Commits| |GitHub-Forks| |GitHub-Updated|
+
+Pull and install pre-release ``devel`` branch:
+
+.. code:: sh
+
+    pip install "git+https://github.com/tqdm/tqdm.git@devel#egg=tqdm"
+
+Latest Conda release
+~~~~~~~~~~~~~~~~~~~~
+
+|Conda-Forge-Status|
+
+.. code:: sh
+
+    conda install -c conda-forge tqdm
+
+Latest Snapcraft release
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+|Snapcraft|
+
+There are 3 channels to choose from:
+
+.. code:: sh
+
+    snap install tqdm  # implies --stable, i.e. latest tagged release
+    snap install tqdm  --candidate  # master branch
+    snap install tqdm  --edge  # devel branch
+
+Note that ``snap`` binaries are purely for CLI use (not ``import``-able), and
+automatically set up ``bash`` tab-completion.
+
+Latest Docker release
+~~~~~~~~~~~~~~~~~~~~~
+
+|Docker|
+
+.. code:: sh
+
+    docker pull tqdm/tqdm
+    docker run -i --rm tqdm/tqdm --help
+
+Other
+~~~~~
+
+There are other (unofficial) places where ``tqdm`` may be downloaded, particularly for CLI use:
+
+|Repology|
+
+.. |Repology| image:: https://repology.org/badge/tiny-repos/python:tqdm.svg
+   :target: https://repology.org/project/python:tqdm/versions
+
+Changelog
+---------
+
+The list of all changes is available either on GitHub's Releases:
+|GitHub-Status|, on the
+`wiki <https://github.com/tqdm/tqdm/wiki/Releases>`__, or on the
+`website <https://tqdm.github.io/releases>`__.
+
+
+Usage
+-----
+
+``tqdm`` is very versatile and can be used in a number of ways.
+The three main ones are given below.
+
+Iterable-based
+~~~~~~~~~~~~~~
+
+Wrap ``tqdm()`` around any iterable:
+
+.. code:: python
+
+    from tqdm import tqdm
+    from time import sleep
+
+    text = ""
+    for char in tqdm(["a", "b", "c", "d"]):
+        sleep(0.25)
+        text = text + char
+
+``trange(i)`` is a special optimised instance of ``tqdm(range(i))``:
+
+.. code:: python
+
+    from tqdm import trange
+
+    for i in trange(100):
+        sleep(0.01)
+
+Instantiation outside of the loop allows for manual control over ``tqdm()``:
+
+.. code:: python
+
+    pbar = tqdm(["a", "b", "c", "d"])
+    for char in pbar:
+        sleep(0.25)
+        pbar.set_description("Processing %s" % char)
+
+Manual
+~~~~~~
+
+Manual control of ``tqdm()`` updates using a ``with`` statement:
+
+.. code:: python
+
+    with tqdm(total=100) as pbar:
+        for i in range(10):
+            sleep(0.1)
+            pbar.update(10)
+
+If the optional variable ``total`` (or an iterable with ``len()``) is
+provided, predictive stats are displayed.
+
+``with`` is also optional (you can just assign ``tqdm()`` to a variable,
+but in this case don't forget to ``del`` or ``close()`` at the end:
+
+.. code:: python
+
+    pbar = tqdm(total=100)
+    for i in range(10):
+        sleep(0.1)
+        pbar.update(10)
+    pbar.close()
+
+Module
+~~~~~~
+
+Perhaps the most wonderful use of ``tqdm`` is in a script or on the command
+line. Simply inserting ``tqdm`` (or ``python -m tqdm``) between pipes will pass
+through all ``stdin`` to ``stdout`` while printing progress to ``stderr``.
+
+The example below demonstrate counting the number of lines in all Python files
+in the current directory, with timing information included.
+
+.. code:: sh
+
+    $ time find . -name '*.py' -type f -exec cat \{} \; | wc -l
+    857365
+
+    real    0m3.458s
+    user    0m0.274s
+    sys     0m3.325s
+
+    $ time find . -name '*.py' -type f -exec cat \{} \; | tqdm | wc -l
+    857366it [00:03, 246471.31it/s]
+    857365
+
+    real    0m3.585s
+    user    0m0.862s
+    sys     0m3.358s
+
+Note that the usual arguments for ``tqdm`` can also be specified.
+
+.. code:: sh
+
+    $ find . -name '*.py' -type f -exec cat \{} \; |
+        tqdm --unit loc --unit_scale --total 857366 >> /dev/null
+    100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ| 857K/857K [00:04<00:00, 246Kloc/s]
+
+Backing up a large directory?
+
+.. code:: sh
+
+    $ tar -zcf - docs/ | tqdm --bytes --total `du -sb docs/ | cut -f1` \
+      > backup.tgz
+     44%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–Š                   | 153M/352M [00:14<00:18, 11.0MB/s]
+
+This can be beautified further:
+
+.. code:: sh
+
+    $ BYTES=$(du -sb docs/ | cut -f1)
+    $ tar -cf - docs/ \
+      | tqdm --bytes --total "$BYTES" --desc Processing | gzip \
+      | tqdm --bytes --total "$BYTES" --desc Compressed --position 1 \
+      > ~/backup.tgz
+    Processing: 100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ| 352M/352M [00:14<00:00, 30.2MB/s]
+    Compressed:  42%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–Ž            | 148M/352M [00:14<00:19, 10.9MB/s]
+
+Or done on a file level using 7-zip:
+
+.. code:: sh
+
+    $ 7z a -bd -r backup.7z docs/ | grep Compressing \
+      | tqdm --total $(find docs/ -type f | wc -l) --unit files \
+      | grep -v Compressing
+    100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–‰| 15327/15327 [01:00<00:00, 712.96files/s]
+
+Pre-existing CLI programs already outputting basic progress information will
+benefit from ``tqdm``'s ``--update`` and ``--update_to`` flags:
+
+.. code:: sh
+
+    $ seq 3 0.1 5 | tqdm --total 5 --update_to --null
+    100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ| 5.0/5 [00:00<00:00, 9673.21it/s]
+    $ seq 10 | tqdm --update --null  # 1 + 2 + ... + 10 = 55 iterations
+    55it [00:00, 90006.52it/s]
+
+FAQ and Known Issues
+--------------------
+
+|GitHub-Issues|
+
+The most common issues relate to excessive output on multiple lines, instead
+of a neat one-line progress bar.
+
+- Consoles in general: require support for carriage return (``CR``, ``\r``).
+
+  * Some cloud logging consoles which don't support ``\r`` properly
+    (`cloudwatch <https://github.com/tqdm/tqdm/issues/966>`__,
+    `K8s <https://github.com/tqdm/tqdm/issues/1319>`__) may benefit from
+    ``export TQDM_POSITION=-1``.
+
+- Nested progress bars:
+
+  * Consoles in general: require support for moving cursors up to the
+    previous line. For example,
+    `IDLE <https://github.com/tqdm/tqdm/issues/191#issuecomment-230168030>`__,
+    `ConEmu <https://github.com/tqdm/tqdm/issues/254>`__ and
+    `PyCharm <https://github.com/tqdm/tqdm/issues/203>`__ (also
+    `here <https://github.com/tqdm/tqdm/issues/208>`__,
+    `here <https://github.com/tqdm/tqdm/issues/307>`__, and
+    `here <https://github.com/tqdm/tqdm/issues/454#issuecomment-335416815>`__)
+    lack full support.
+  * Windows: additionally may require the Python module ``colorama``
+    to ensure nested bars stay within their respective lines.
+
+- Unicode:
+
+  * Environments which report that they support unicode will have solid smooth
+    progressbars. The fallback is an ``ascii``-only bar.
+  * Windows consoles often only partially support unicode and thus
+    `often require explicit ascii=True <https://github.com/tqdm/tqdm/issues/454#issuecomment-335416815>`__
+    (also `here <https://github.com/tqdm/tqdm/issues/499>`__). This is due to
+    either normal-width unicode characters being incorrectly displayed as
+    "wide", or some unicode characters not rendering.
+
+- Wrapping generators:
+
+  * Generator wrapper functions tend to hide the length of iterables.
+    ``tqdm`` does not.
+  * Replace ``tqdm(enumerate(...))`` with ``enumerate(tqdm(...))`` or
+    ``tqdm(enumerate(x), total=len(x), ...)``.
+    The same applies to ``numpy.ndenumerate``.
+  * Replace ``tqdm(zip(a, b))`` with ``zip(tqdm(a), b)`` or even
+    ``zip(tqdm(a), tqdm(b))``.
+  * The same applies to ``itertools``.
+  * Some useful convenience functions can be found under ``tqdm.contrib``.
+
+- `No intermediate output in docker-compose <https://github.com/tqdm/tqdm/issues/771>`__:
+  use ``docker-compose run`` instead of ``docker-compose up`` and ``tty: true``.
+
+- Overriding defaults via environment variables:
+  e.g. in CI/cloud jobs, ``export TQDM_MININTERVAL=5`` to avoid log spam.
+  This override logic is handled by the ``tqdm.utils.envwrap`` decorator
+  (useful independent of ``tqdm``).
+
+If you come across any other difficulties, browse and file |GitHub-Issues|.
+
+Documentation
+-------------
+
+|Py-Versions| |README-Hits| (Since 19 May 2016)
+
+.. code:: python
+
+    class tqdm():
+      """
+      Decorate an iterable object, returning an iterator which acts exactly
+      like the original iterable, but prints a dynamically updating
+      progressbar every time a value is requested.
+      """
+
+      @envwrap("TQDM_")  # override defaults via env vars
+      def __init__(self, iterable=None, desc=None, total=None, leave=True,
+                   file=None, ncols=None, mininterval=0.1,
+                   maxinterval=10.0, miniters=None, ascii=None, disable=False,
+                   unit='it', unit_scale=False, dynamic_ncols=False,
+                   smoothing=0.3, bar_format=None, initial=0, position=None,
+                   postfix=None, unit_divisor=1000, write_bytes=False,
+                   lock_args=None, nrows=None, colour=None, delay=0):
+
+Parameters
+~~~~~~~~~~
+
+* iterable  : iterable, optional  
+    Iterable to decorate with a progressbar.
+    Leave blank to manually manage the updates.
+* desc  : str, optional  
+    Prefix for the progressbar.
+* total  : int or float, optional  
+    The number of expected iterations. If unspecified,
+    len(iterable) is used if possible. If float("inf") or as a last
+    resort, only basic progress statistics are displayed
+    (no ETA, no progressbar).
+    If ``gui`` is True and this parameter needs subsequent updating,
+    specify an initial arbitrary large positive number,
+    e.g. 9e9.
+* leave  : bool, optional  
+    If [default: True], keeps all traces of the progressbar
+    upon termination of iteration.
+    If ``None``, will leave only if ``position`` is ``0``.
+* file  : ``io.TextIOWrapper`` or ``io.StringIO``, optional  
+    Specifies where to output the progress messages
+    (default: sys.stderr). Uses ``file.write(str)`` and ``file.flush()``
+    methods.  For encoding, see ``write_bytes``.
+* ncols  : int, optional  
+    The width of the entire output message. If specified,
+    dynamically resizes the progressbar to stay within this bound.
+    If unspecified, attempts to use environment width. The
+    fallback is a meter width of 10 and no limit for the counter and
+    statistics. If 0, will not print any meter (only stats).
+* mininterval  : float, optional  
+    Minimum progress display update interval [default: 0.1] seconds.
+* maxinterval  : float, optional  
+    Maximum progress display update interval [default: 10] seconds.
+    Automatically adjusts ``miniters`` to correspond to ``mininterval``
+    after long display update lag. Only works if ``dynamic_miniters``
+    or monitor thread is enabled.
+* miniters  : int or float, optional  
+    Minimum progress display update interval, in iterations.
+    If 0 and ``dynamic_miniters``, will automatically adjust to equal
+    ``mininterval`` (more CPU efficient, good for tight loops).
+    If > 0, will skip display of specified number of iterations.
+    Tweak this and ``mininterval`` to get very efficient loops.
+    If your progress is erratic with both fast and slow iterations
+    (network, skipping items, etc) you should set miniters=1.
+* ascii  : bool or str, optional  
+    If unspecified or False, use unicode (smooth blocks) to fill
+    the meter. The fallback is to use ASCII characters " 123456789#".
+* disable  : bool, optional  
+    Whether to disable the entire progressbar wrapper
+    [default: False]. If set to None, disable on non-TTY.
+* unit  : str, optional  
+    String that will be used to define the unit of each iteration
+    [default: it].
+* unit_scale  : bool or int or float, optional  
+    If 1 or True, the number of iterations will be reduced/scaled
+    automatically and a metric prefix following the
+    International System of Units standard will be added
+    (kilo, mega, etc.) [default: False]. If any other non-zero
+    number, will scale ``total`` and ``n``.
+* dynamic_ncols  : bool, optional  
+    If set, constantly alters ``ncols`` and ``nrows`` to the
+    environment (allowing for window resizes) [default: False].
+* smoothing  : float, optional  
+    Exponential moving average smoothing factor for speed estimates
+    (ignored in GUI mode). Ranges from 0 (average speed) to 1
+    (current/instantaneous speed) [default: 0.3].
+* bar_format  : str, optional  
+    Specify a custom bar string formatting. May impact performance.
+    [default: '{l_bar}{bar}{r_bar}'], where
+    l_bar='{desc}: {percentage:3.0f}%|' and
+    r_bar='| {n_fmt}/{total_fmt} [{elapsed}<{remaining}, '
+    '{rate_fmt}{postfix}]'
+    Possible vars: l_bar, bar, r_bar, n, n_fmt, total, total_fmt,
+    percentage, elapsed, elapsed_s, ncols, nrows, desc, unit,
+    rate, rate_fmt, rate_noinv, rate_noinv_fmt,
+    rate_inv, rate_inv_fmt, postfix, unit_divisor,
+    remaining, remaining_s, eta.
+    Note that a trailing ": " is automatically removed after {desc}
+    if the latter is empty.
+* initial  : int or float, optional  
+    The initial counter value. Useful when restarting a progress
+    bar [default: 0]. If using float, consider specifying ``{n:.3f}``
+    or similar in ``bar_format``, or specifying ``unit_scale``.
+* position  : int, optional  
+    Specify the line offset to print this bar (starting from 0)
+    Automatic if unspecified.
+    Useful to manage multiple bars at once (eg, from threads).
+* postfix  : dict or ``*``, optional  
+    Specify additional stats to display at the end of the bar.
+    Calls ``set_postfix(**postfix)`` if possible (dict).
+* unit_divisor  : float, optional  
+    [default: 1000], ignored unless ``unit_scale`` is True.
+* write_bytes  : bool, optional  
+    Whether to write bytes. If (default: False) will write unicode.
+* lock_args  : tuple, optional  
+    Passed to ``refresh`` for intermediate output
+    (initialisation, iterating, and updating).
+* nrows  : int, optional  
+    The screen height. If specified, hides nested bars outside this
+    bound. If unspecified, attempts to use environment height.
+    The fallback is 20.
+* colour  : str, optional  
+    Bar colour (e.g. 'green', '#00ff00').
+* delay  : float, optional  
+    Don't display until [default: 0] seconds have elapsed.
+
+Extra CLI Options
+~~~~~~~~~~~~~~~~~
+
+* delim  : chr, optional  
+    Delimiting character [default: '\n']. Use '\0' for null.
+    N.B.: on Windows systems, Python converts '\n' to '\r\n'.
+* buf_size  : int, optional  
+    String buffer size in bytes [default: 256]
+    used when ``delim`` is specified.
+* bytes  : bool, optional  
+    If true, will count bytes, ignore ``delim``, and default
+    ``unit_scale`` to True, ``unit_divisor`` to 1024, and ``unit`` to 'B'.
+* tee  : bool, optional  
+    If true, passes ``stdin`` to both ``stderr`` and ``stdout``.
+* update  : bool, optional  
+    If true, will treat input as newly elapsed iterations,
+    i.e. numbers to pass to ``update()``. Note that this is slow
+    (~2e5 it/s) since every input must be decoded as a number.
+* update_to  : bool, optional  
+    If true, will treat input as total elapsed iterations,
+    i.e. numbers to assign to ``self.n``. Note that this is slow
+    (~2e5 it/s) since every input must be decoded as a number.
+* null  : bool, optional  
+    If true, will discard input (no stdout).
+* manpath  : str, optional  
+    Directory in which to install tqdm man pages.
+* comppath  : str, optional  
+    Directory in which to place tqdm completion.
+* log  : str, optional  
+    CRITICAL|FATAL|ERROR|WARN(ING)|[default: 'INFO']|DEBUG|NOTSET.
+
+Returns
+~~~~~~~
+
+* out  : decorated iterator.  
+
+.. code:: python
+
+    class tqdm():
+      def update(self, n=1):
+          """
+          Manually update the progress bar, useful for streams
+          such as reading files.
+          E.g.:
+          >>> t = tqdm(total=filesize) # Initialise
+          >>> for current_buffer in stream:
+          ...    ...
+          ...    t.update(len(current_buffer))
+          >>> t.close()
+          The last line is highly recommended, but possibly not necessary if
+          ``t.update()`` will be called in such a way that ``filesize`` will be
+          exactly reached and printed.
+
+          Parameters
+          ----------
+          n  : int or float, optional
+              Increment to add to the internal counter of iterations
+              [default: 1]. If using float, consider specifying ``{n:.3f}``
+              or similar in ``bar_format``, or specifying ``unit_scale``.
+
+          Returns
+          -------
+          out  : bool or None
+              True if a ``display()`` was triggered.
+          """
+
+      def close(self):
+          """Cleanup and (if leave=False) close the progressbar."""
+
+      def clear(self, nomove=False):
+          """Clear current bar display."""
+
+      def refresh(self):
+          """
+          Force refresh the display of this bar.
+
+          Parameters
+          ----------
+          nolock  : bool, optional
+              If ``True``, does not lock.
+              If [default: ``False``]: calls ``acquire()`` on internal lock.
+          lock_args  : tuple, optional
+              Passed to internal lock's ``acquire()``.
+              If specified, will only ``display()`` if ``acquire()`` returns ``True``.
+          """
+
+      def unpause(self):
+          """Restart tqdm timer from last print time."""
+
+      def reset(self, total=None):
+          """
+          Resets to 0 iterations for repeated use.
+
+          Consider combining with ``leave=True``.
+
+          Parameters
+          ----------
+          total  : int or float, optional. Total to use for the new bar.
+          """
+
+      def set_description(self, desc=None, refresh=True):
+          """
+          Set/modify description of the progress bar.
+
+          Parameters
+          ----------
+          desc  : str, optional
+          refresh  : bool, optional
+              Forces refresh [default: True].
+          """
+
+      def set_postfix(self, ordered_dict=None, refresh=True, **tqdm_kwargs):
+          """
+          Set/modify postfix (additional stats)
+          with automatic formatting based on datatype.
+
+          Parameters
+          ----------
+          ordered_dict  : dict or OrderedDict, optional
+          refresh  : bool, optional
+              Forces refresh [default: True].
+          kwargs  : dict, optional
+          """
+
+      @classmethod
+      def write(cls, s, file=sys.stdout, end="\n"):
+          """Print a message via tqdm (without overlap with bars)."""
+
+      @property
+      def format_dict(self):
+          """Public API for read-only member access."""
+
+      def display(self, msg=None, pos=None):
+          """
+          Use ``self.sp`` to display ``msg`` in the specified ``pos``.
+
+          Consider overloading this function when inheriting to use e.g.:
+          ``self.some_frontend(**self.format_dict)`` instead of ``self.sp``.
+
+          Parameters
+          ----------
+          msg  : str, optional. What to display (default: ``repr(self)``).
+          pos  : int, optional. Position to ``moveto``
+            (default: ``abs(self.pos)``).
+          """
+
+      @classmethod
+      @contextmanager
+      def wrapattr(cls, stream, method, total=None, bytes=True, **tqdm_kwargs):
+          """
+          stream  : file-like object.
+          method  : str, "read" or "write". The result of ``read()`` and
+              the first argument of ``write()`` should have a ``len()``.
+
+          >>> with tqdm.wrapattr(file_obj, "read", total=file_obj.size) as fobj:
+          ...     while True:
+          ...         chunk = fobj.read(chunk_size)
+          ...         if not chunk:
+          ...             break
+          """
+
+      @classmethod
+      def pandas(cls, *targs, **tqdm_kwargs):
+          """Registers the current `tqdm` class with `pandas`."""
+
+    def trange(*args, **tqdm_kwargs):
+        """Shortcut for `tqdm(range(*args), **tqdm_kwargs)`."""
+
+Convenience Functions
+~~~~~~~~~~~~~~~~~~~~~
+
+.. code:: python
+
+    def tqdm.contrib.tenumerate(iterable, start=0, total=None,
+                                tqdm_class=tqdm.auto.tqdm, **tqdm_kwargs):
+        """Equivalent of `numpy.ndenumerate` or builtin `enumerate`."""
+
+    def tqdm.contrib.tzip(iter1, *iter2plus, **tqdm_kwargs):
+        """Equivalent of builtin `zip`."""
+
+    def tqdm.contrib.tmap(function, *sequences, **tqdm_kwargs):
+        """Equivalent of builtin `map`."""
+
+Submodules
+~~~~~~~~~~
+
+.. code:: python
+
+    class tqdm.notebook.tqdm(tqdm.tqdm):
+        """IPython/Jupyter Notebook widget."""
+
+    class tqdm.auto.tqdm(tqdm.tqdm):
+        """Automatically chooses beween `tqdm.notebook` and `tqdm.tqdm`."""
+
+    class tqdm.asyncio.tqdm(tqdm.tqdm):
+      """Asynchronous version."""
+      @classmethod
+      def as_completed(cls, fs, *, loop=None, timeout=None, total=None,
+                       **tqdm_kwargs):
+          """Wrapper for `asyncio.as_completed`."""
+
+    class tqdm.gui.tqdm(tqdm.tqdm):
+        """Matplotlib GUI version."""
+
+    class tqdm.tk.tqdm(tqdm.tqdm):
+        """Tkinter GUI version."""
+
+    class tqdm.rich.tqdm(tqdm.tqdm):
+        """`rich.progress` version."""
+
+    class tqdm.keras.TqdmCallback(keras.callbacks.Callback):
+        """Keras callback for epoch and batch progress."""
+
+    class tqdm.dask.TqdmCallback(dask.callbacks.Callback):
+        """Dask callback for task progress."""
+
+
+``contrib``
++++++++++++
+
+The ``tqdm.contrib`` package also contains experimental modules:
+
+- ``tqdm.contrib.itertools``: Thin wrappers around ``itertools``
+- ``tqdm.contrib.concurrent``: Thin wrappers around ``concurrent.futures``
+- ``tqdm.contrib.slack``: Posts to `Slack <https://slack.com>`__ bots
+- ``tqdm.contrib.discord``: Posts to `Discord <https://discord.com>`__ bots
+- ``tqdm.contrib.telegram``: Posts to `Telegram <https://telegram.org>`__ bots
+- ``tqdm.contrib.bells``: Automagically enables all optional features
+
+  * ``auto``, ``pandas``, ``slack``, ``discord``, ``telegram``
+
+Examples and Advanced Usage
+---------------------------
+
+- See the `examples <https://github.com/tqdm/tqdm/tree/master/examples>`__
+  folder;
+- import the module and run ``help()``;
+- consult the `wiki <https://github.com/tqdm/tqdm/wiki>`__;
+
+  * this has an
+    `excellent article <https://github.com/tqdm/tqdm/wiki/How-to-make-a-great-Progress-Bar>`__
+    on how to make a **great** progressbar;
+
+- check out the `slides from PyData London <https://tqdm.github.io/PyData2019/slides.html>`__, or
+- run the |binder-demo|.
+
+Description and additional stats
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Custom information can be displayed and updated dynamically on ``tqdm`` bars
+with the ``desc`` and ``postfix`` arguments:
+
+.. code:: python
+
+    from tqdm import tqdm, trange
+    from random import random, randint
+    from time import sleep
+
+    with trange(10) as t:
+        for i in t:
+            # Description will be displayed on the left
+            t.set_description('GEN %i' % i)
+            # Postfix will be displayed on the right,
+            # formatted automatically based on argument's datatype
+            t.set_postfix(loss=random(), gen=randint(1,999), str='h',
+                          lst=[1, 2])
+            sleep(0.1)
+
+    with tqdm(total=10, bar_format="{postfix[0]} {postfix[1][value]:>8.2g}",
+              postfix=["Batch", {"value": 0}]) as t:
+        for i in range(10):
+            sleep(0.1)
+            t.postfix[1]["value"] = i / 2
+            t.update()
+
+Points to remember when using ``{postfix[...]}`` in the ``bar_format`` string:
+
+- ``postfix`` also needs to be passed as an initial argument in a compatible
+  format, and
+- ``postfix`` will be auto-converted to a string if it is a ``dict``-like
+  object. To prevent this behaviour, insert an extra item into the dictionary
+  where the key is not a string.
+
+Additional ``bar_format`` parameters may also be defined by overriding
+``format_dict``, and the bar itself may be modified using ``ascii``:
+
+.. code:: python
+
+    from tqdm import tqdm
+    class TqdmExtraFormat(tqdm):
+        """Provides a `total_time` format parameter"""
+        @property
+        def format_dict(self):
+            d = super().format_dict
+            total_time = d["elapsed"] * (d["total"] or 0) / max(d["n"], 1)
+            d.update(total_time=self.format_interval(total_time) + " in total")
+            return d
+
+    for i in TqdmExtraFormat(
+          range(9), ascii=" .oO0",
+          bar_format="{total_time}: {percentage:.0f}%|{bar}{r_bar}"):
+        if i == 4:
+            break
+
+.. code::
+
+    00:00 in total: 44%|0000.     | 4/9 [00:00<00:00, 962.93it/s]
+
+Note that ``{bar}`` also supports a format specifier ``[width][type]``.
+
+- ``width``
+
+  * unspecified (default): automatic to fill ``ncols``
+  * ``int >= 0``: fixed width overriding ``ncols`` logic
+  * ``int < 0``: subtract from the automatic default
+
+- ``type``
+
+  * ``a``: ascii (``ascii=True`` override)
+  * ``u``: unicode (``ascii=False`` override)
+  * ``b``: blank (``ascii="  "`` override)
+
+This means a fixed bar with right-justified text may be created by using:
+``bar_format="{l_bar}{bar:10}|{bar:-10b}right-justified"``
+
+Nested progress bars
+~~~~~~~~~~~~~~~~~~~~
+
+``tqdm`` supports nested progress bars. Here's an example:
+
+.. code:: python
+
+    from tqdm.auto import trange
+    from time import sleep
+
+    for i in trange(4, desc='1st loop'):
+        for j in trange(5, desc='2nd loop'):
+            for k in trange(50, desc='3rd loop', leave=False):
+                sleep(0.01)
+
+For manual control over positioning (e.g. for multi-processing use),
+you may specify ``position=n`` where ``n=0`` for the outermost bar,
+``n=1`` for the next, and so on.
+However, it's best to check if ``tqdm`` can work without manual ``position``
+first.
+
+.. code:: python
+
+    from time import sleep
+    from tqdm import trange, tqdm
+    from multiprocessing import Pool, RLock, freeze_support
+
+    L = list(range(9))
+
+    def progresser(n):
+        interval = 0.001 / (n + 2)
+        total = 5000
+        text = f"#{n}, est. {interval * total:<04.2}s"
+        for _ in trange(total, desc=text, position=n):
+            sleep(interval)
+
+    if __name__ == '__main__':
+        freeze_support()  # for Windows support
+        tqdm.set_lock(RLock())  # for managing output contention
+        p = Pool(initializer=tqdm.set_lock, initargs=(tqdm.get_lock(),))
+        p.map(progresser, L)
+
+Note that in Python 3, ``tqdm.write`` is thread-safe:
+
+.. code:: python
+
+    from time import sleep
+    from tqdm import tqdm, trange
+    from concurrent.futures import ThreadPoolExecutor
+
+    L = list(range(9))
+
+    def progresser(n):
+        interval = 0.001 / (n + 2)
+        total = 5000
+        text = f"#{n}, est. {interval * total:<04.2}s"
+        for _ in trange(total, desc=text):
+            sleep(interval)
+        if n == 6:
+            tqdm.write("n == 6 completed.")
+            tqdm.write("`tqdm.write()` is thread-safe in py3!")
+
+    if __name__ == '__main__':
+        with ThreadPoolExecutor() as p:
+            p.map(progresser, L)
+
+Hooks and callbacks
+~~~~~~~~~~~~~~~~~~~
+
+``tqdm`` can easily support callbacks/hooks and manual updates.
+Here's an example with ``urllib``:
+
+**``urllib.urlretrieve`` documentation**
+
+    | [...]
+    | If present, the hook function will be called once
+    | on establishment of the network connection and once after each block read
+    | thereafter. The hook will be passed three arguments; a count of blocks
+    | transferred so far, a block size in bytes, and the total size of the file.
+    | [...]
+
+.. code:: python
+
+    import urllib, os
+    from tqdm import tqdm
+    urllib = getattr(urllib, 'request', urllib)
+
+    class TqdmUpTo(tqdm):
+        """Provides `update_to(n)` which uses `tqdm.update(delta_n)`."""
+        def update_to(self, b=1, bsize=1, tsize=None):
+            """
+            b  : int, optional
+                Number of blocks transferred so far [default: 1].
+            bsize  : int, optional
+                Size of each block (in tqdm units) [default: 1].
+            tsize  : int, optional
+                Total size (in tqdm units). If [default: None] remains unchanged.
+            """
+            if tsize is not None:
+                self.total = tsize
+            return self.update(b * bsize - self.n)  # also sets self.n = b * bsize
+
+    eg_link = "https://caspersci.uk.to/matryoshka.zip"
+    with TqdmUpTo(unit='B', unit_scale=True, unit_divisor=1024, miniters=1,
+                  desc=eg_link.split('/')[-1]) as t:  # all optional kwargs
+        urllib.urlretrieve(eg_link, filename=os.devnull,
+                           reporthook=t.update_to, data=None)
+        t.total = t.n
+
+Inspired by `twine#242 <https://github.com/pypa/twine/pull/242>`__.
+Functional alternative in
+`examples/tqdm_wget.py <https://github.com/tqdm/tqdm/blob/master/examples/tqdm_wget.py>`__.
+
+It is recommend to use ``miniters=1`` whenever there is potentially
+large differences in iteration speed (e.g. downloading a file over
+a patchy connection).
+
+**Wrapping read/write methods**
+
+To measure throughput through a file-like object's ``read`` or ``write``
+methods, use ``CallbackIOWrapper``:
+
+.. code:: python
+
+    from tqdm.auto import tqdm
+    from tqdm.utils import CallbackIOWrapper
+
+    with tqdm(total=file_obj.size,
+              unit='B', unit_scale=True, unit_divisor=1024) as t:
+        fobj = CallbackIOWrapper(t.update, file_obj, "read")
+        while True:
+            chunk = fobj.read(chunk_size)
+            if not chunk:
+                break
+        t.reset()
+        # ... continue to use `t` for something else
+
+Alternatively, use the even simpler ``wrapattr`` convenience function,
+which would condense both the ``urllib`` and ``CallbackIOWrapper`` examples
+down to:
+
+.. code:: python
+
+    import urllib, os
+    from tqdm import tqdm
+
+    eg_link = "https://caspersci.uk.to/matryoshka.zip"
+    response = getattr(urllib, 'request', urllib).urlopen(eg_link)
+    with tqdm.wrapattr(open(os.devnull, "wb"), "write",
+                       miniters=1, desc=eg_link.split('/')[-1],
+                       total=getattr(response, 'length', None)) as fout:
+        for chunk in response:
+            fout.write(chunk)
+
+The ``requests`` equivalent is nearly identical:
+
+.. code:: python
+
+    import requests, os
+    from tqdm import tqdm
+
+    eg_link = "https://caspersci.uk.to/matryoshka.zip"
+    response = requests.get(eg_link, stream=True)
+    with tqdm.wrapattr(open(os.devnull, "wb"), "write",
+                       miniters=1, desc=eg_link.split('/')[-1],
+                       total=int(response.headers.get('content-length', 0))) as fout:
+        for chunk in response.iter_content(chunk_size=4096):
+            fout.write(chunk)
+
+**Custom callback**
+
+``tqdm`` is known for intelligently skipping unnecessary displays. To make a
+custom callback take advantage of this, simply use the return value of
+``update()``. This is set to ``True`` if a ``display()`` was triggered.
+
+.. code:: python
+
+    from tqdm.auto import tqdm as std_tqdm
+
+    def external_callback(*args, **kwargs):
+        ...
+
+    class TqdmExt(std_tqdm):
+        def update(self, n=1):
+            displayed = super().update(n)
+            if displayed:
+                external_callback(**self.format_dict)
+            return displayed
+
+``asyncio``
+~~~~~~~~~~~
+
+Note that ``break`` isn't currently caught by asynchronous iterators.
+This means that ``tqdm`` cannot clean up after itself in this case:
+
+.. code:: python
+
+    from tqdm.asyncio import tqdm
+
+    async for i in tqdm(range(9)):
+        if i == 2:
+            break
+
+Instead, either call ``pbar.close()`` manually or use the context manager syntax:
+
+.. code:: python
+
+    from tqdm.asyncio import tqdm
+
+    with tqdm(range(9)) as pbar:
+        async for i in pbar:
+            if i == 2:
+                break
+
+Pandas Integration
+~~~~~~~~~~~~~~~~~~
+
+Due to popular demand we've added support for ``pandas`` -- here's an example
+for ``DataFrame.progress_apply`` and ``DataFrameGroupBy.progress_apply``:
+
+.. code:: python
+
+    import pandas as pd
+    import numpy as np
+    from tqdm import tqdm
+
+    df = pd.DataFrame(np.random.randint(0, 100, (100000, 6)))
+
+    # Register `pandas.progress_apply` and `pandas.Series.map_apply` with `tqdm`
+    # (can use `tqdm.gui.tqdm`, `tqdm.notebook.tqdm`, optional kwargs, etc.)
+    tqdm.pandas(desc="my bar!")
+
+    # Now you can use `progress_apply` instead of `apply`
+    # and `progress_map` instead of `map`
+    df.progress_apply(lambda x: x**2)
+    # can also groupby:
+    # df.groupby(0).progress_apply(lambda x: x**2)
+
+In case you're interested in how this works (and how to modify it for your
+own callbacks), see the
+`examples <https://github.com/tqdm/tqdm/tree/master/examples>`__
+folder or import the module and run ``help()``.
+
+Keras Integration
+~~~~~~~~~~~~~~~~~
+
+A ``keras`` callback is also available:
+
+.. code:: python
+
+    from tqdm.keras import TqdmCallback
+
+    ...
+
+    model.fit(..., verbose=0, callbacks=[TqdmCallback()])
+
+Dask Integration
+~~~~~~~~~~~~~~~~
+
+A ``dask`` callback is also available:
+
+.. code:: python
+
+    from tqdm.dask import TqdmCallback
+
+    with TqdmCallback(desc="compute"):
+        ...
+        arr.compute()
+
+    # or use callback globally
+    cb = TqdmCallback(desc="global")
+    cb.register()
+    arr.compute()
+
+IPython/Jupyter Integration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+IPython/Jupyter is supported via the ``tqdm.notebook`` submodule:
+
+.. code:: python
+
+    from tqdm.notebook import trange, tqdm
+    from time import sleep
+
+    for i in trange(3, desc='1st loop'):
+        for j in tqdm(range(100), desc='2nd loop'):
+            sleep(0.01)
+
+In addition to ``tqdm`` features, the submodule provides a native Jupyter
+widget (compatible with IPython v1-v4 and Jupyter), fully working nested bars
+and colour hints (blue: normal, green: completed, red: error/interrupt,
+light blue: no ETA); as demonstrated below.
+
+|Screenshot-Jupyter1|
+|Screenshot-Jupyter2|
+|Screenshot-Jupyter3|
+
+The ``notebook`` version supports percentage or pixels for overall width
+(e.g.: ``ncols='100%'`` or ``ncols='480px'``).
+
+It is also possible to let ``tqdm`` automatically choose between
+console or notebook versions by using the ``autonotebook`` submodule:
+
+.. code:: python
+
+    from tqdm.autonotebook import tqdm
+    tqdm.pandas()
+
+Note that this will issue a ``TqdmExperimentalWarning`` if run in a notebook
+since it is not meant to be possible to distinguish between ``jupyter notebook``
+and ``jupyter console``. Use ``auto`` instead of ``autonotebook`` to suppress
+this warning.
+
+Note that notebooks will display the bar in the cell where it was created.
+This may be a different cell from the one where it is used.
+If this is not desired, either
+
+- delay the creation of the bar to the cell where it must be displayed, or
+- create the bar with ``display=False``, and in a later cell call
+  ``display(bar.container)``:
+
+.. code:: python
+
+    from tqdm.notebook import tqdm
+    pbar = tqdm(..., display=False)
+
+.. code:: python
+
+    # different cell
+    display(pbar.container)
+
+The ``keras`` callback has a ``display()`` method which can be used likewise:
+
+.. code:: python
+
+    from tqdm.keras import TqdmCallback
+    cbk = TqdmCallback(display=False)
+
+.. code:: python
+
+    # different cell
+    cbk.display()
+    model.fit(..., verbose=0, callbacks=[cbk])
+
+Another possibility is to have a single bar (near the top of the notebook)
+which is constantly re-used (using ``reset()`` rather than ``close()``).
+For this reason, the notebook version (unlike the CLI version) does not
+automatically call ``close()`` upon ``Exception``.
+
+.. code:: python
+
+    from tqdm.notebook import tqdm
+    pbar = tqdm()
+
+.. code:: python
+
+    # different cell
+    iterable = range(100)
+    pbar.reset(total=len(iterable))  # initialise with new `total`
+    for i in iterable:
+        pbar.update()
+    pbar.refresh()  # force print final status but don't `close()`
+
+Custom Integration
+~~~~~~~~~~~~~~~~~~
+
+To change the default arguments (such as making ``dynamic_ncols=True``),
+simply use built-in Python magic:
+
+.. code:: python
+
+    from functools import partial
+    from tqdm import tqdm as std_tqdm
+    tqdm = partial(std_tqdm, dynamic_ncols=True)
+
+For further customisation,
+``tqdm`` may be inherited from to create custom callbacks (as with the
+``TqdmUpTo`` example `above <#hooks-and-callbacks>`__) or for custom frontends
+(e.g. GUIs such as notebook or plotting packages). In the latter case:
+
+1. ``def __init__()`` to call ``super().__init__(..., gui=True)`` to disable
+   terminal ``status_printer`` creation.
+2. Redefine: ``close()``, ``clear()``, ``display()``.
+
+Consider overloading ``display()`` to use e.g.
+``self.frontend(**self.format_dict)`` instead of ``self.sp(repr(self))``.
+
+Some submodule examples of inheritance:
+
+- `tqdm/notebook.py <https://github.com/tqdm/tqdm/blob/master/tqdm/notebook.py>`__
+- `tqdm/gui.py <https://github.com/tqdm/tqdm/blob/master/tqdm/gui.py>`__
+- `tqdm/tk.py <https://github.com/tqdm/tqdm/blob/master/tqdm/tk.py>`__
+- `tqdm/contrib/slack.py <https://github.com/tqdm/tqdm/blob/master/tqdm/contrib/slack.py>`__
+- `tqdm/contrib/discord.py <https://github.com/tqdm/tqdm/blob/master/tqdm/contrib/discord.py>`__
+- `tqdm/contrib/telegram.py <https://github.com/tqdm/tqdm/blob/master/tqdm/contrib/telegram.py>`__
+
+Dynamic Monitor/Meter
+~~~~~~~~~~~~~~~~~~~~~
+
+You can use a ``tqdm`` as a meter which is not monotonically increasing.
+This could be because ``n`` decreases (e.g. a CPU usage monitor) or ``total``
+changes.
+
+One example would be recursively searching for files. The ``total`` is the
+number of objects found so far, while ``n`` is the number of those objects which
+are files (rather than folders):
+
+.. code:: python
+
+    from tqdm import tqdm
+    import os.path
+
+    def find_files_recursively(path, show_progress=True):
+        files = []
+        # total=1 assumes `path` is a file
+        t = tqdm(total=1, unit="file", disable=not show_progress)
+        if not os.path.exists(path):
+            raise IOError("Cannot find:" + path)
+
+        def append_found_file(f):
+            files.append(f)
+            t.update()
+
+        def list_found_dir(path):
+            """returns os.listdir(path) assuming os.path.isdir(path)"""
+            listing = os.listdir(path)
+            # subtract 1 since a "file" we found was actually this directory
+            t.total += len(listing) - 1
+            # fancy way to give info without forcing a refresh
+            t.set_postfix(dir=path[-10:], refresh=False)
+            t.update(0)  # may trigger a refresh
+            return listing
+
+        def recursively_search(path):
+            if os.path.isdir(path):
+                for f in list_found_dir(path):
+                    recursively_search(os.path.join(path, f))
+            else:
+                append_found_file(path)
+
+        recursively_search(path)
+        t.set_postfix(dir=path)
+        t.close()
+        return files
+
+Using ``update(0)`` is a handy way to let ``tqdm`` decide when to trigger a
+display refresh to avoid console spamming.
+
+Writing messages
+~~~~~~~~~~~~~~~~
+
+This is a work in progress (see
+`#737 <https://github.com/tqdm/tqdm/issues/737>`__).
+
+Since ``tqdm`` uses a simple printing mechanism to display progress bars,
+you should not write any message in the terminal using ``print()`` while
+a progressbar is open.
+
+To write messages in the terminal without any collision with ``tqdm`` bar
+display, a ``.write()`` method is provided:
+
+.. code:: python
+
+    from tqdm.auto import tqdm, trange
+    from time import sleep
+
+    bar = trange(10)
+    for i in bar:
+        # Print using tqdm class method .write()
+        sleep(0.1)
+        if not (i % 3):
+            tqdm.write("Done task %i" % i)
+        # Can also use bar.write()
+
+By default, this will print to standard output ``sys.stdout``. but you can
+specify any file-like object using the ``file`` argument. For example, this
+can be used to redirect the messages writing to a log file or class.
+
+Redirecting writing
+~~~~~~~~~~~~~~~~~~~
+
+If using a library that can print messages to the console, editing the library
+by  replacing ``print()`` with ``tqdm.write()`` may not be desirable.
+In that case, redirecting ``sys.stdout`` to ``tqdm.write()`` is an option.
+
+To redirect ``sys.stdout``, create a file-like class that will write
+any input string to ``tqdm.write()``, and supply the arguments
+``file=sys.stdout, dynamic_ncols=True``.
+
+A reusable canonical example is given below:
+
+.. code:: python
+
+    from time import sleep
+    import contextlib
+    import sys
+    from tqdm import tqdm
+    from tqdm.contrib import DummyTqdmFile
+
+
+    @contextlib.contextmanager
+    def std_out_err_redirect_tqdm():
+        orig_out_err = sys.stdout, sys.stderr
+        try:
+            sys.stdout, sys.stderr = map(DummyTqdmFile, orig_out_err)
+            yield orig_out_err[0]
+        # Relay exceptions
+        except Exception as exc:
+            raise exc
+        # Always restore sys.stdout/err if necessary
+        finally:
+            sys.stdout, sys.stderr = orig_out_err
+
+    def some_fun(i):
+        print("Fee, fi, fo,".split()[i])
+
+    # Redirect stdout to tqdm.write() (don't forget the `as save_stdout`)
+    with std_out_err_redirect_tqdm() as orig_stdout:
+        # tqdm needs the original stdout
+        # and dynamic_ncols=True to autodetect console width
+        for i in tqdm(range(3), file=orig_stdout, dynamic_ncols=True):
+            sleep(.5)
+            some_fun(i)
+
+    # After the `with`, printing is restored
+    print("Done!")
+
+Redirecting ``logging``
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Similar to ``sys.stdout``/``sys.stderr`` as detailed above, console ``logging``
+may also be redirected to ``tqdm.write()``.
+
+Warning: if also redirecting ``sys.stdout``/``sys.stderr``, make sure to
+redirect ``logging`` first if needed.
+
+Helper methods are available in ``tqdm.contrib.logging``. For example:
+
+.. code:: python
+
+    import logging
+    from tqdm import trange
+    from tqdm.contrib.logging import logging_redirect_tqdm
+
+    LOG = logging.getLogger(__name__)
+
+    if __name__ == '__main__':
+        logging.basicConfig(level=logging.INFO)
+        with logging_redirect_tqdm():
+            for i in trange(9):
+                if i == 4:
+                    LOG.info("console logging redirected to `tqdm.write()`")
+        # logging restored
+
+Monitoring thread, intervals and miniters
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``tqdm`` implements a few tricks to increase efficiency and reduce overhead.
+
+- Avoid unnecessary frequent bar refreshing: ``mininterval`` defines how long
+  to wait between each refresh. ``tqdm`` always gets updated in the background,
+  but it will display only every ``mininterval``.
+- Reduce number of calls to check system clock/time.
+- ``mininterval`` is more intuitive to configure than ``miniters``.
+  A clever adjustment system ``dynamic_miniters`` will automatically adjust
+  ``miniters`` to the amount of iterations that fit into time ``mininterval``.
+  Essentially, ``tqdm`` will check if it's time to print without actually
+  checking time. This behaviour can be still be bypassed by manually setting
+  ``miniters``.
+
+However, consider a case with a combination of fast and slow iterations.
+After a few fast iterations, ``dynamic_miniters`` will set ``miniters`` to a
+large number. When iteration rate subsequently slows, ``miniters`` will
+remain large and thus reduce display update frequency. To address this:
+
+- ``maxinterval`` defines the maximum time between display refreshes.
+  A concurrent monitoring thread checks for overdue updates and forces one
+  where necessary.
+
+The monitoring thread should not have a noticeable overhead, and guarantees
+updates at least every 10 seconds by default.
+This value can be directly changed by setting the ``monitor_interval`` of
+any ``tqdm`` instance (i.e. ``t = tqdm.tqdm(...); t.monitor_interval = 2``).
+The monitor thread may be disabled application-wide by setting
+``tqdm.tqdm.monitor_interval = 0`` before instantiation of any ``tqdm`` bar.
+
+
+Merch
+-----
+
+You can buy `tqdm branded merch <https://tqdm.github.io/merch>`__ now!
+
+Contributions
+-------------
+
+|GitHub-Commits| |GitHub-Issues| |GitHub-PRs| |OpenHub-Status| |GitHub-Contributions| |CII Best Practices|
+
+All source code is hosted on `GitHub <https://github.com/tqdm/tqdm>`__.
+Contributions are welcome.
+
+See the
+`CONTRIBUTING <https://github.com/tqdm/tqdm/blob/master/CONTRIBUTING.md>`__
+file for more information.
+
+Developers who have made significant contributions, ranked by *SLoC*
+(surviving lines of code,
+`git fame <https://github.com/casperdcl/git-fame>`__ ``-wMC --excl '\.(png|gif|jpg)$'``),
+are:
+
+==================== ======================================================== ==== ================================
+Name                 ID                                                       SLoC Notes
+==================== ======================================================== ==== ================================
+Casper da Costa-Luis `casperdcl <https://github.com/casperdcl>`__             ~80% primary maintainer |Gift-Casper|
+Stephen Larroque     `lrq3000 <https://github.com/lrq3000>`__                 ~9%  team member
+Martin Zugnoni       `martinzugnoni <https://github.com/martinzugnoni>`__     ~3%
+Daniel Ecer          `de-code <https://github.com/de-code>`__                 ~2%
+Richard Sheridan     `richardsheridan <https://github.com/richardsheridan>`__ ~1%
+Guangshuo Chen       `chengs <https://github.com/chengs>`__                   ~1%
+Helio Machado        `0x2b3bfa0 <https://github.com/0x2b3bfa0>`__             ~1%
+Kyle Altendorf       `altendky <https://github.com/altendky>`__               <1%
+Noam Yorav-Raphael   `noamraph <https://github.com/noamraph>`__               <1%  original author
+Matthew Stevens      `mjstevens777 <https://github.com/mjstevens777>`__       <1%
+Hadrien Mary         `hadim <https://github.com/hadim>`__                     <1%  team member
+Mikhail Korobov      `kmike <https://github.com/kmike>`__                     <1%  team member
+==================== ======================================================== ==== ================================
+
+Ports to Other Languages
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+A list is available on
+`this wiki page <https://github.com/tqdm/tqdm/wiki/tqdm-ports>`__.
+
+
+LICENCE
+-------
+
+Open Source (OSI approved): |LICENCE|
+
+Citation information: |DOI|
+
+|README-Hits| (Since 19 May 2016)
+
+.. |Logo| image:: https://tqdm.github.io/img/logo.gif
+.. |Screenshot| image:: https://tqdm.github.io/img/tqdm.gif
+.. |Video| image:: https://tqdm.github.io/img/video.jpg
+   :target: https://tqdm.github.io/video
+.. |Slides| image:: https://tqdm.github.io/img/slides.jpg
+   :target: https://tqdm.github.io/PyData2019/slides.html
+.. |Merch| image:: https://tqdm.github.io/img/merch.jpg
+   :target: https://tqdm.github.io/merch
+.. |Build-Status| image:: https://img.shields.io/github/actions/workflow/status/tqdm/tqdm/test.yml?branch=master&label=tqdm&logo=GitHub
+   :target: https://github.com/tqdm/tqdm/actions/workflows/test.yml
+.. |Coverage-Status| image:: https://img.shields.io/coveralls/github/tqdm/tqdm/master?logo=coveralls
+   :target: https://coveralls.io/github/tqdm/tqdm
+.. |Branch-Coverage-Status| image:: https://codecov.io/gh/tqdm/tqdm/branch/master/graph/badge.svg
+   :target: https://codecov.io/gh/tqdm/tqdm
+.. |Codacy-Grade| image:: https://app.codacy.com/project/badge/Grade/3f965571598f44549c7818f29cdcf177
+   :target: https://www.codacy.com/gh/tqdm/tqdm/dashboard
+.. |CII Best Practices| image:: https://bestpractices.coreinfrastructure.org/projects/3264/badge
+   :target: https://bestpractices.coreinfrastructure.org/projects/3264
+.. |GitHub-Status| image:: https://img.shields.io/github/tag/tqdm/tqdm.svg?maxAge=86400&logo=github&logoColor=white
+   :target: https://github.com/tqdm/tqdm/releases
+.. |GitHub-Forks| image:: https://img.shields.io/github/forks/tqdm/tqdm.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/tqdm/network
+.. |GitHub-Stars| image:: https://img.shields.io/github/stars/tqdm/tqdm.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/tqdm/stargazers
+.. |GitHub-Commits| image:: https://img.shields.io/github/commit-activity/y/tqdm/tqdm.svg?logo=git&logoColor=white
+   :target: https://github.com/tqdm/tqdm/graphs/commit-activity
+.. |GitHub-Issues| image:: https://img.shields.io/github/issues-closed/tqdm/tqdm.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/tqdm/issues?q=
+.. |GitHub-PRs| image:: https://img.shields.io/github/issues-pr-closed/tqdm/tqdm.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/tqdm/pulls
+.. |GitHub-Contributions| image:: https://img.shields.io/github/contributors/tqdm/tqdm.svg?logo=github&logoColor=white
+   :target: https://github.com/tqdm/tqdm/graphs/contributors
+.. |GitHub-Updated| image:: https://img.shields.io/github/last-commit/tqdm/tqdm/master.svg?logo=github&logoColor=white&label=pushed
+   :target: https://github.com/tqdm/tqdm/pulse
+.. |Gift-Casper| image:: https://img.shields.io/badge/dynamic/json.svg?color=ff69b4&label=gifts%20received&prefix=%C2%A3&query=%24..sum&url=https%3A%2F%2Fcaspersci.uk.to%2Fgifts.json
+   :target: https://cdcl.ml/sponsor
+.. |Versions| image:: https://img.shields.io/pypi/v/tqdm.svg
+   :target: https://tqdm.github.io/releases
+.. |PyPI-Downloads| image:: https://img.shields.io/pypi/dm/tqdm.svg?label=pypi%20downloads&logo=PyPI&logoColor=white
+   :target: https://pepy.tech/project/tqdm
+.. |Py-Versions| image:: https://img.shields.io/pypi/pyversions/tqdm.svg?logo=python&logoColor=white
+   :target: https://pypi.org/project/tqdm
+.. |Conda-Forge-Status| image:: https://img.shields.io/conda/v/conda-forge/tqdm.svg?label=conda-forge&logo=conda-forge
+   :target: https://anaconda.org/conda-forge/tqdm
+.. |Snapcraft| image:: https://img.shields.io/badge/snap-install-82BEA0.svg?logo=snapcraft
+   :target: https://snapcraft.io/tqdm
+.. |Docker| image:: https://img.shields.io/badge/docker-pull-blue.svg?logo=docker&logoColor=white
+   :target: https://hub.docker.com/r/tqdm/tqdm
+.. |Libraries-Rank| image:: https://img.shields.io/librariesio/sourcerank/pypi/tqdm.svg?logo=koding&logoColor=white
+   :target: https://libraries.io/pypi/tqdm
+.. |Libraries-Dependents| image:: https://img.shields.io/librariesio/dependent-repos/pypi/tqdm.svg?logo=koding&logoColor=white
+    :target: https://github.com/tqdm/tqdm/network/dependents
+.. |OpenHub-Status| image:: https://www.openhub.net/p/tqdm/widgets/project_thin_badge?format=gif
+   :target: https://www.openhub.net/p/tqdm?ref=Thin+badge
+.. |awesome-python| image:: https://awesome.re/mentioned-badge.svg
+   :target: https://github.com/vinta/awesome-python
+.. |LICENCE| image:: https://img.shields.io/pypi/l/tqdm.svg
+   :target: https://raw.githubusercontent.com/tqdm/tqdm/master/LICENCE
+.. |DOI| image:: https://img.shields.io/badge/DOI-10.5281/zenodo.595120-blue.svg
+   :target: https://doi.org/10.5281/zenodo.595120
+.. |binder-demo| image:: https://mybinder.org/badge_logo.svg
+   :target: https://mybinder.org/v2/gh/tqdm/tqdm/master?filepath=DEMO.ipynb
+.. |Screenshot-Jupyter1| image:: https://tqdm.github.io/img/jupyter-1.gif
+.. |Screenshot-Jupyter2| image:: https://tqdm.github.io/img/jupyter-2.gif
+.. |Screenshot-Jupyter3| image:: https://tqdm.github.io/img/jupyter-3.gif
+.. |README-Hits| image:: https://cgi.cdcl.ml/hits?q=tqdm&style=social&r=https://github.com/tqdm/tqdm&l=https://tqdm.github.io/img/favicon.png&f=https://tqdm.github.io/img/logo.gif
+   :target: https://cgi.cdcl.ml/hits?q=tqdm&a=plot&r=https://github.com/tqdm/tqdm&l=https://tqdm.github.io/img/favicon.png&f=https://tqdm.github.io/img/logo.gif&style=social
diff --git a/libs/tqdm-4.67.3.dist-info/RECORD b/libs/tqdm-4.67.3.dist-info/RECORD
new file mode 100644
index 0000000000..9e56060033
--- /dev/null
+++ b/libs/tqdm-4.67.3.dist-info/RECORD
@@ -0,0 +1,42 @@
+../../bin/tqdm,sha256=jVIvqkAmuV_K0wwiZJmo0UsNisjPMiaAwPMJkH4NsDY,183
+tqdm-4.67.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+tqdm-4.67.3.dist-info/METADATA,sha256=fA6aZiwZCV8zmkt2EgHrBs_5xh-5WBU1svlvROcY7Sk,57679
+tqdm-4.67.3.dist-info/RECORD,,
+tqdm-4.67.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tqdm-4.67.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+tqdm-4.67.3.dist-info/entry_points.txt,sha256=ReJCH7Ui3Zyh6M16E4OhsZ1oU7WtMXCfbtoyBhGO29Y,39
+tqdm-4.67.3.dist-info/licenses/LICENCE,sha256=_P-Hw6R86AKKhRKqGC1PzwrRyQVE7nXPmzQ2hMrBlN4,1985
+tqdm-4.67.3.dist-info/top_level.txt,sha256=NLiUJNfmc9At15s7JURiwvqMEjUi9G5PMGRrmMYzNSM,5
+tqdm/__init__.py,sha256=9mQNYSSqP99JasubEC1POJLMmhkkBH6cJZxPIR5G2pQ,1572
+tqdm/__main__.py,sha256=bYt9eEaoRQWdejEHFD8REx9jxVEdZptECFsV7F49Ink,30
+tqdm/_main.py,sha256=9ySvgmi_2Sw4CAo5UDW0Q2dxfTryboEWGHohfCJz0sA,283
+tqdm/_monitor.py,sha256=Uku-DPWgzJ7dO5CK08xKJK-E_F6qQ-JB3ksuXczSYR0,3699
+tqdm/_tqdm.py,sha256=LfLCuJ6bpsVo9xilmtBXyEm1vGnUCFrliW85j3J-nD4,283
+tqdm/_tqdm_gui.py,sha256=03Hc8KayxJveieI5-0-2NGiDpLvw9jZekofJUV7CCwk,287
+tqdm/_tqdm_notebook.py,sha256=BuHiLuxu6uEfZFaPJW3RPpPaxaVctEQA3kdSJSDL1hw,307
+tqdm/_tqdm_pandas.py,sha256=c9jptUgigN6axRDhRd4Rif98Tmxeopc1nFNFhIpbFUE,888
+tqdm/_utils.py,sha256=_4E73bfDj4f1s3sM42NLHNrZDOkijZoWq-n6xWLkdZ8,553
+tqdm/asyncio.py,sha256=Kp2rSkNRf9KRqa3d9YpgeZQ7L7EZf2Ki4bSc7UPIyoo,2757
+tqdm/auto.py,sha256=nDZflj6p2zKkjBCNBourrhS81zYfZy1_dQvbckrdW8o,871
+tqdm/autonotebook.py,sha256=Yb9F5uaiBPhfbDDFpbtoG8I2YUw3uQJ89rUDLbfR6ws,956
+tqdm/cli.py,sha256=orEaahqDEBGZR1uCcTW8BkhSPEhBlSO0BKYbJ1Qgc6k,10994
+tqdm/completion.sh,sha256=j79KbSmpIj_E11jfTfBXrGnUTzKXVpQ1vGVQvsyDRl4,946
+tqdm/contrib/__init__.py,sha256=1GMYYE866WCvlHg5MdmzOvPsQj4ZuMlXzz8xcRcJD60,2479
+tqdm/contrib/bells.py,sha256=Yx1HqGCmHrESCAO700j5wE__JCleNODJxedh1ijPLD0,837
+tqdm/contrib/concurrent.py,sha256=K1yjloKS5WRNFyjLRth0DmU5PAnDbF0A-GD27N-J4a8,3986
+tqdm/contrib/discord.py,sha256=MtVIL1s_dxH21G4sL8FBgQ4Wei23ho9Ek5T-AommvNc,5243
+tqdm/contrib/itertools.py,sha256=WdKKQU5eSzsqHu29SN_oH12huYZo0Jihqoi9-nVhwz4,774
+tqdm/contrib/logging.py,sha256=NsYtnKttj2mMrGm58mEdo5a9DP_2vv8pZyrimSuWulA,3760
+tqdm/contrib/slack.py,sha256=eP_Mr5sQonYniHxxQNGue3jk2JkIPmPWFZqIYxnOui0,4007
+tqdm/contrib/telegram.py,sha256=vn_9SATMbbwn2PAbzSDyOX6av3eBB01QBug11P4H-Og,5008
+tqdm/contrib/utils_worker.py,sha256=vaxyJyagYwOCQXLUMd86bCbI4sPqZysuMGbDSGmvEWo,1199
+tqdm/dask.py,sha256=9Ei58eVqTossRLhAfWyUFCduXYKjmLmwkaXIy-CHYfs,1319
+tqdm/gui.py,sha256=STIB3K8iDzDgkNUqWIpvcI_u0OGtbGNy5NwpALXhfWs,5479
+tqdm/keras.py,sha256=op9sBkb6q6c6dw2wJ0SD2ZwpPK7yM1Vbg4l1Qiy3MIo,4373
+tqdm/notebook.py,sha256=scgzRQmDYzIFag_1gRh98LhtZdu3ig2yrmZdqvlgops,10802
+tqdm/rich.py,sha256=YyMPkEHVyYUVUR3adJKbVX26iTmNKpNMf3DEqmm-m60,5021
+tqdm/std.py,sha256=Sk24SwOd59hpNbb0UL8Y3_8ueRmL3_5O72Vy2XKasjE,57510
+tqdm/tk.py,sha256=Gu0uwXwLCGPRGHORdi3WvBLGiseUp_xxX_h_gp9VpK0,6701
+tqdm/tqdm.1,sha256=cDyo6hSykXedJ3Pcx5tkogR1ai3QXRnrJ0MbR2Gd9-s,7581
+tqdm/utils.py,sha256=dpGZUeqoLPinM-kEsULTSe2E3jzp8wUunL6eKzkYOgk,11810
+tqdm/version.py,sha256=oBM1eCOTDZDGZHffNqlehXTeQdKdracckNAEaMRmPjM,337
diff --git a/libs/urllib3-2.2.3.dist-info/REQUESTED b/libs/tqdm-4.67.3.dist-info/REQUESTED
similarity index 100%
rename from libs/urllib3-2.2.3.dist-info/REQUESTED
rename to libs/tqdm-4.67.3.dist-info/REQUESTED
diff --git a/libs/tqdm-4.67.3.dist-info/WHEEL b/libs/tqdm-4.67.3.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/tqdm-4.67.3.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/tqdm-4.67.1.dist-info/entry_points.txt b/libs/tqdm-4.67.3.dist-info/entry_points.txt
similarity index 100%
rename from libs/tqdm-4.67.1.dist-info/entry_points.txt
rename to libs/tqdm-4.67.3.dist-info/entry_points.txt
diff --git a/libs/tqdm-4.67.1.dist-info/LICENCE b/libs/tqdm-4.67.3.dist-info/licenses/LICENCE
similarity index 97%
rename from libs/tqdm-4.67.1.dist-info/LICENCE
rename to libs/tqdm-4.67.3.dist-info/licenses/LICENCE
index a8922b182e..194caf554f 100644
--- a/libs/tqdm-4.67.1.dist-info/LICENCE
+++ b/libs/tqdm-4.67.3.dist-info/licenses/LICENCE
@@ -7,7 +7,7 @@ Exceptions or notable authors are listed below
 in reverse chronological order:
 
 * files: *
-  MPL-2.0 2015-2024 (c) Casper da Costa-Luis
+  MPL-2.0 2015-2026 (c) Casper da Costa-Luis
   [casperdcl](https://github.com/casperdcl).
 * files: tqdm/_tqdm.py
   MIT 2016 (c) [PR #96] on behalf of Google Inc.
diff --git a/libs/tqdm-4.67.1.dist-info/top_level.txt b/libs/tqdm-4.67.3.dist-info/top_level.txt
similarity index 100%
rename from libs/tqdm-4.67.1.dist-info/top_level.txt
rename to libs/tqdm-4.67.3.dist-info/top_level.txt
diff --git a/libs/tqdm/_dist_ver.py b/libs/tqdm/_dist_ver.py
deleted file mode 100644
index 61af7d5bb0..0000000000
--- a/libs/tqdm/_dist_ver.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = '4.67.1'
diff --git a/libs/tqdm/cli.py b/libs/tqdm/cli.py
index e54a7fc859..1dd08f6053 100644
--- a/libs/tqdm/cli.py
+++ b/libs/tqdm/cli.py
@@ -249,7 +249,7 @@ def main(fp=sys.stderr, argv=None):
         manpath = tqdm_args.pop('manpath', None)
         comppath = tqdm_args.pop('comppath', None)
         if tqdm_args.pop('null', False):
-            class stdout(object):
+            class stdout:
                 @staticmethod
                 def write(_):
                     pass
@@ -278,7 +278,7 @@ def cp(name, dst):
             stdout_write = stdout.write
             fp_write = getattr(fp, 'buffer', fp).write
 
-            class stdout(object):  # pylint: disable=function-redefined
+            class stdout:  # pylint: disable=function-redefined
                 @staticmethod
                 def write(x):
                     with tqdm.external_write_mode(file=fp):
diff --git a/libs/tqdm/contrib/__init__.py b/libs/tqdm/contrib/__init__.py
index d059461f91..87ec4601fc 100644
--- a/libs/tqdm/contrib/__init__.py
+++ b/libs/tqdm/contrib/__init__.py
@@ -76,8 +76,7 @@ def tzip(iter1, *iter2plus, **tqdm_kwargs):
     """
     kwargs = tqdm_kwargs.copy()
     tqdm_class = kwargs.pop("tqdm_class", tqdm_auto)
-    for i in zip(tqdm_class(iter1, **kwargs), *iter2plus):
-        yield i
+    yield from zip(tqdm_class(iter1, **kwargs), *iter2plus)
 
 
 def tmap(function, *sequences, **tqdm_kwargs):
diff --git a/libs/tqdm/contrib/utils_worker.py b/libs/tqdm/contrib/utils_worker.py
index 2a03a2a893..89fafc8c92 100644
--- a/libs/tqdm/contrib/utils_worker.py
+++ b/libs/tqdm/contrib/utils_worker.py
@@ -10,7 +10,7 @@
 __all__ = ['MonoWorker']
 
 
-class MonoWorker(object):
+class MonoWorker:
     """
     Supports one running task and one waiting task.
     The waiting task is the most recent submitted (others are discarded).
diff --git a/libs/tqdm/notebook.py b/libs/tqdm/notebook.py
index 77b91bdd43..83178e981f 100644
--- a/libs/tqdm/notebook.py
+++ b/libs/tqdm/notebook.py
@@ -157,7 +157,7 @@ def display(self, msg=None, pos=None,
         pbar.value = self.n
 
         if msg:
-            msg = msg.replace(' ', u'\u2007')  # fix html space padding
+            msg = msg.replace(' ', '\u2007')  # fix html space padding
             # html escape special characters (like '&')
             if '<bar/>' in msg:
                 left, right = map(escape, re.split(r'\|?<bar/>\|?', msg, maxsplit=1))
@@ -247,9 +247,7 @@ def __init__(self, *args, **kwargs):
     def __iter__(self):
         try:
             it = super().__iter__()
-            for obj in it:
-                # return super(tqdm...) will not catch exception
-                yield obj
+            yield from it
         # NB: except ... [ as ...] breaks IPython async KeyboardInterrupt
         except:  # NOQA
             self.disp(bar_style='danger')
diff --git a/libs/tqdm/std.py b/libs/tqdm/std.py
index e91ad30903..14b0c19631 100644
--- a/libs/tqdm/std.py
+++ b/libs/tqdm/std.py
@@ -42,11 +42,11 @@ class TqdmWarning(Warning):
 
     Used for non-external-code-breaking errors, such as garbled printing.
     """
-    def __init__(self, msg, fp_write=None, *a, **k):
+    def __init__(self, msg, fp_write=None):  # noqa: B042
         if fp_write is not None:
             fp_write("\n" + self.__class__.__name__ + ": " + str(msg).rstrip() + '\n')
         else:
-            super().__init__(msg, *a, **k)
+            super().__init__(msg)
 
 
 class TqdmExperimentalWarning(TqdmWarning, FutureWarning):
@@ -73,7 +73,7 @@ def TRLock(*args, **kwargs):
         pass
 
 
-class TqdmDefaultWriteLock(object):
+class TqdmDefaultWriteLock:
     """
     Provide a default write lock for thread and multiprocessing safety.
     Works only on platforms supporting `fork` (so Windows is excluded).
@@ -128,7 +128,7 @@ def create_th_lock(cls):
         warn("create_th_lock not needed anymore", TqdmDeprecationWarning, stacklevel=2)
 
 
-class Bar(object):
+class Bar:
     """
     `str.format`-able bar with format specifiers: `[width][type]`
 
@@ -142,7 +142,7 @@ class Bar(object):
       + `b`: blank (`charset="  "` override)
     """
     ASCII = " 123456789#"
-    UTF = u" " + u''.join(map(chr, range(0x258F, 0x2587, -1)))
+    UTF = " " + ''.join(map(chr, range(0x258F, 0x2587, -1)))
     BLANK = "  "
     COLOUR_RESET = '\x1b[0m'
     COLOUR_RGB = '\x1b[38;2;%d;%d;%dm'
@@ -178,9 +178,8 @@ def colour(self, value):
             else:
                 raise KeyError
         except (KeyError, AttributeError):
-            warn("Unknown colour (%s); valid choices: [hex (#00ff00), %s]" % (
-                 value, ", ".join(self.COLOURS)),
-                 TqdmWarning, stacklevel=2)
+            warn(f"Unknown colour ({value}); valid choices:"
+                 f" [hex (#00ff00), {', '.join(self.COLOURS)}]", TqdmWarning, stacklevel=2)
             self._colour = None
 
     def __format__(self, format_spec):
@@ -211,7 +210,7 @@ def __format__(self, format_spec):
         return self.colour + res + self.COLOUR_RESET if self.colour else res
 
 
-class EMA(object):
+class EMA:
     """
     Exponential moving average: smoothing to give progressively lower
     weights to older values.
@@ -412,9 +411,10 @@ def format_interval(t):
         out  : str
             [H:]MM:SS
         """
-        mins, s = divmod(int(t), 60)
+        sign = '-' if t < 0 else ''
+        mins, s = divmod(abs(int(t)), 60)
         h, m = divmod(mins, 60)
-        return f'{h:d}:{m:02d}:{s:02d}' if h else f'{m:02d}:{s:02d}'
+        return f'{sign}{h:d}:{m:02d}:{s:02d}' if h else f'{sign}{m:02d}:{s:02d}'
 
     @staticmethod
     def format_num(n):
@@ -893,10 +893,10 @@ def inner(df, func, *args, **kwargs):
                         " Use keyword arguments instead.",
                         fp_write=getattr(t.fp, 'write', sys.stderr.write))
 
-                try:  # pandas>=1.3.0
+                try:  # pandas>=1.3.0,<3.0
                     from pandas.core.common import is_builtin_func
-                except ImportError:
-                    is_builtin_func = df._is_builtin_func
+                except ImportError:  # pandas<1.3.0
+                    is_builtin_func = getattr(df, '_is_builtin_func', lambda f: f)
                 try:
                     func = is_builtin_func(func)
                 except TypeError:
diff --git a/libs/tqdm/tqdm.1 b/libs/tqdm/tqdm.1
index b90ab4b9eb..fe29b8a7d5 100644
--- a/libs/tqdm/tqdm.1
+++ b/libs/tqdm/tqdm.1
@@ -1,77 +1,64 @@
-.\" Automatically generated by Pandoc 1.19.2
+.\" Automatically generated by Pandoc 3.8.3
 .\"
-.TH "TQDM" "1" "2015\-2021" "tqdm User Manuals" ""
-.hy
+.TH "TQDM" "1" "2015\-2026" "tqdm User Manuals"
 .SH NAME
-.PP
 tqdm \- fast, extensible progress bar for Python and CLI
 .SH SYNOPSIS
-.PP
-tqdm [\f[I]options\f[]]
+tqdm [\f[I]options\f[R]]
 .SH DESCRIPTION
-.PP
-See <https://github.com/tqdm/tqdm>.
+See \c
+.UR https://github.com/tqdm/tqdm
+.UE \c
+\&.
 Can be used as a pipe:
 .IP
-.nf
-\f[C]
-$\ #\ count\ lines\ of\ code
-$\ cat\ *.py\ |\ tqdm\ |\ wc\ \-l
-327it\ [00:00,\ 981773.38it/s]
+.EX
+$ \f[I]# count lines of code\f[R]
+$ cat *.py \f[B]|\f[R] tqdm \f[B]|\f[R] wc \-l
+327it [00:00, 981773.38it/s]
 327
 
-$\ #\ find\ all\ files
-$\ find\ .\ \-name\ "*.py"\ |\ tqdm\ |\ wc\ \-l
-432it\ [00:00,\ 833842.30it/s]
+$ \f[I]# find all files\f[R]
+$ find . \-name \(dq*.py\(dq \f[B]|\f[R] tqdm \f[B]|\f[R] wc \-l
+432it [00:00, 833842.30it/s]
 432
 
-#\ ...\ and\ more\ info
-$\ find\ .\ \-name\ \[aq]*.py\[aq]\ \-exec\ wc\ \-l\ \\{}\ \\;\ \\
-\ \ |\ tqdm\ \-\-total\ 432\ \-\-unit\ files\ \-\-desc\ counting\ \\
-\ \ |\ awk\ \[aq]{\ sum\ +=\ $1\ };\ END\ {\ print\ sum\ }\[aq]
-counting:\ 100%|โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ|\ 432/432\ [00:00<00:00,\ 794361.83files/s]
+\f[I]# ... and more info\f[R]
+$ find . \-name \(aq*.py\(aq \-exec wc \-l \(rs{} \(rs; \(rs
+  \f[B]|\f[R] tqdm \-\-total 432 \-\-unit files \-\-desc counting \(rs
+  \f[B]|\f[R] awk \(aq{ sum += $1 }; END { print sum }\(aq
+counting: 100%\f[B]|\f[R]โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆ\f[B]|\f[R] 432/432 [00:00<00:00, 794361.83files/s]
 131998
-\f[]
-.fi
+.EE
 .SH OPTIONS
 .TP
-.B \-h, \-\-help
+\-h, \-\-help
 Print this help and exit.
-.RS
-.RE
 .TP
-.B \-v, \-\-version
+\-v, \-\-version
 Print version and exit.
-.RS
-.RE
 .TP
-.B \-\-desc=\f[I]desc\f[]
+\-\-desc=\f[I]desc\f[R]
 str, optional.
 Prefix for the progressbar.
-.RS
-.RE
 .TP
-.B \-\-total=\f[I]total\f[]
+\-\-total=\f[I]total\f[R]
 int or float, optional.
 The number of expected iterations.
 If unspecified, len(iterable) is used if possible.
-If float("inf") or as a last resort, only basic progress statistics are
-displayed (no ETA, no progressbar).
-If \f[C]gui\f[] is True and this parameter needs subsequent updating,
-specify an initial arbitrary large positive number, e.g.
-9e9.
-.RS
-.RE
-.TP
-.B \-\-leave
+If float(\(lqinf\(rq) or as a last resort, only basic progress
+statistics are displayed (no ETA, no progressbar).
+If \f[CR]gui\f[R] is True and this parameter needs subsequent updating,
+specify an initial arbitrary large positive number, e.g.\ 9e9.
+.TP
+\-\-leave
 bool, optional.
 If [default: True], keeps all traces of the progressbar upon termination
 of iteration.
-If \f[C]None\f[], will leave only if \f[C]position\f[] is \f[C]0\f[].
-.RS
-.RE
+If \f[CR]None\f[R], will leave only if \f[CR]position\f[R] is
+\f[CR]0\f[R].
 .TP
-.B \-\-ncols=\f[I]ncols\f[]
+\-\-ncols=\f[I]ncols\f[R]
 int, optional.
 The width of the entire output message.
 If specified, dynamically resizes the progressbar to stay within this
@@ -80,235 +67,177 @@ If unspecified, attempts to use environment width.
 The fallback is a meter width of 10 and no limit for the counter and
 statistics.
 If 0, will not print any meter (only stats).
-.RS
-.RE
 .TP
-.B \-\-mininterval=\f[I]mininterval\f[]
+\-\-mininterval=\f[I]mininterval\f[R]
 float, optional.
 Minimum progress display update interval [default: 0.1] seconds.
-.RS
-.RE
 .TP
-.B \-\-maxinterval=\f[I]maxinterval\f[]
+\-\-maxinterval=\f[I]maxinterval\f[R]
 float, optional.
 Maximum progress display update interval [default: 10] seconds.
-Automatically adjusts \f[C]miniters\f[] to correspond to
-\f[C]mininterval\f[] after long display update lag.
-Only works if \f[C]dynamic_miniters\f[] or monitor thread is enabled.
-.RS
-.RE
+Automatically adjusts \f[CR]miniters\f[R] to correspond to
+\f[CR]mininterval\f[R] after long display update lag.
+Only works if \f[CR]dynamic_miniters\f[R] or monitor thread is enabled.
 .TP
-.B \-\-miniters=\f[I]miniters\f[]
+\-\-miniters=\f[I]miniters\f[R]
 int or float, optional.
 Minimum progress display update interval, in iterations.
-If 0 and \f[C]dynamic_miniters\f[], will automatically adjust to equal
-\f[C]mininterval\f[] (more CPU efficient, good for tight loops).
+If 0 and \f[CR]dynamic_miniters\f[R], will automatically adjust to equal
+\f[CR]mininterval\f[R] (more CPU efficient, good for tight loops).
 If > 0, will skip display of specified number of iterations.
-Tweak this and \f[C]mininterval\f[] to get very efficient loops.
+Tweak this and \f[CR]mininterval\f[R] to get very efficient loops.
 If your progress is erratic with both fast and slow iterations (network,
 skipping items, etc) you should set miniters=1.
-.RS
-.RE
 .TP
-.B \-\-ascii=\f[I]ascii\f[]
+\-\-ascii=\f[I]ascii\f[R]
 bool or str, optional.
 If unspecified or False, use unicode (smooth blocks) to fill the meter.
-The fallback is to use ASCII characters " 123456789#".
-.RS
-.RE
+The fallback is to use ASCII characters \(rq 123456789#\(lq.
 .TP
-.B \-\-disable
+\-\-disable
 bool, optional.
 Whether to disable the entire progressbar wrapper [default: False].
 If set to None, disable on non\-TTY.
-.RS
-.RE
 .TP
-.B \-\-unit=\f[I]unit\f[]
+\-\-unit=\f[I]unit\f[R]
 str, optional.
 String that will be used to define the unit of each iteration [default:
 it].
-.RS
-.RE
 .TP
-.B \-\-unit\-scale=\f[I]unit_scale\f[]
+\-\-unit\-scale=\f[I]unit_scale\f[R]
 bool or int or float, optional.
 If 1 or True, the number of iterations will be reduced/scaled
 automatically and a metric prefix following the International System of
-Units standard will be added (kilo, mega, etc.) [default: False].
-If any other non\-zero number, will scale \f[C]total\f[] and \f[C]n\f[].
-.RS
-.RE
+Units standard will be added (kilo, mega, etc.)
+[default: False].
+If any other non\-zero number, will scale \f[CR]total\f[R] and
+\f[CR]n\f[R].
 .TP
-.B \-\-dynamic\-ncols
+\-\-dynamic\-ncols
 bool, optional.
-If set, constantly alters \f[C]ncols\f[] and \f[C]nrows\f[] to the
+If set, constantly alters \f[CR]ncols\f[R] and \f[CR]nrows\f[R] to the
 environment (allowing for window resizes) [default: False].
-.RS
-.RE
 .TP
-.B \-\-smoothing=\f[I]smoothing\f[]
+\-\-smoothing=\f[I]smoothing\f[R]
 float, optional.
 Exponential moving average smoothing factor for speed estimates (ignored
 in GUI mode).
 Ranges from 0 (average speed) to 1 (current/instantaneous speed)
 [default: 0.3].
-.RS
-.RE
 .TP
-.B \-\-bar\-format=\f[I]bar_format\f[]
+\-\-bar\-format=\f[I]bar_format\f[R]
 str, optional.
 Specify a custom bar string formatting.
 May impact performance.
-[default: \[aq]{l_bar}{bar}{r_bar}\[aq]], where l_bar=\[aq]{desc}:
-{percentage:3.0f}%|\[aq] and r_bar=\[aq]| {n_fmt}/{total_fmt}
-[{elapsed}<{remaining}, \[aq] \[aq]{rate_fmt}{postfix}]\[aq] Possible
-vars: l_bar, bar, r_bar, n, n_fmt, total, total_fmt, percentage,
-elapsed, elapsed_s, ncols, nrows, desc, unit, rate, rate_fmt,
-rate_noinv, rate_noinv_fmt, rate_inv, rate_inv_fmt, postfix,
-unit_divisor, remaining, remaining_s, eta.
-Note that a trailing ": " is automatically removed after {desc} if the
-latter is empty.
-.RS
-.RE
-.TP
-.B \-\-initial=\f[I]initial\f[]
+[default: `{l_bar}{bar}{r_bar}'], where l_bar=`{desc}:
+{percentage:3.0f}%|' and r_bar=`| {n_fmt}/{total_fmt}
+[{elapsed}<{remaining}, \(cq \(cq{rate_fmt}{postfix}]' Possible vars:
+l_bar, bar, r_bar, n, n_fmt, total, total_fmt, percentage, elapsed,
+elapsed_s, ncols, nrows, desc, unit, rate, rate_fmt, rate_noinv,
+rate_noinv_fmt, rate_inv, rate_inv_fmt, postfix, unit_divisor,
+remaining, remaining_s, eta.
+Note that a trailing \(lq:\(rq is automatically removed after {desc} if
+the latter is empty.
+.TP
+\-\-initial=\f[I]initial\f[R]
 int or float, optional.
 The initial counter value.
 Useful when restarting a progress bar [default: 0].
-If using float, consider specifying \f[C]{n:.3f}\f[] or similar in
-\f[C]bar_format\f[], or specifying \f[C]unit_scale\f[].
-.RS
-.RE
+If using float, consider specifying \f[CR]{n:.3f}\f[R] or similar in
+\f[CR]bar_format\f[R], or specifying \f[CR]unit_scale\f[R].
 .TP
-.B \-\-position=\f[I]position\f[]
+\-\-position=\f[I]position\f[R]
 int, optional.
 Specify the line offset to print this bar (starting from 0) Automatic if
 unspecified.
 Useful to manage multiple bars at once (eg, from threads).
-.RS
-.RE
 .TP
-.B \-\-postfix=\f[I]postfix\f[]
+\-\-postfix=\f[I]postfix\f[R]
 dict or *, optional.
 Specify additional stats to display at the end of the bar.
-Calls \f[C]set_postfix(**postfix)\f[] if possible (dict).
-.RS
-.RE
+Calls \f[CR]set_postfix(**postfix)\f[R] if possible (dict).
 .TP
-.B \-\-unit\-divisor=\f[I]unit_divisor\f[]
+\-\-unit\-divisor=\f[I]unit_divisor\f[R]
 float, optional.
-[default: 1000], ignored unless \f[C]unit_scale\f[] is True.
-.RS
-.RE
+[default: 1000], ignored unless \f[CR]unit_scale\f[R] is True.
 .TP
-.B \-\-write\-bytes
+\-\-write\-bytes
 bool, optional.
 Whether to write bytes.
 If (default: False) will write unicode.
-.RS
-.RE
 .TP
-.B \-\-lock\-args=\f[I]lock_args\f[]
+\-\-lock\-args=\f[I]lock_args\f[R]
 tuple, optional.
-Passed to \f[C]refresh\f[] for intermediate output (initialisation,
+Passed to \f[CR]refresh\f[R] for intermediate output (initialisation,
 iterating, and updating).
-.RS
-.RE
 .TP
-.B \-\-nrows=\f[I]nrows\f[]
+\-\-nrows=\f[I]nrows\f[R]
 int, optional.
 The screen height.
 If specified, hides nested bars outside this bound.
 If unspecified, attempts to use environment height.
 The fallback is 20.
-.RS
-.RE
 .TP
-.B \-\-colour=\f[I]colour\f[]
+\-\-colour=\f[I]colour\f[R]
 str, optional.
-Bar colour (e.g.
-\[aq]green\[aq], \[aq]#00ff00\[aq]).
-.RS
-.RE
+Bar colour (e.g.\ `green', `#00ff00').
 .TP
-.B \-\-delay=\f[I]delay\f[]
+\-\-delay=\f[I]delay\f[R]
 float, optional.
-Don\[aq]t display until [default: 0] seconds have elapsed.
-.RS
-.RE
+Don\(cqt display until [default: 0] seconds have elapsed.
 .TP
-.B \-\-delim=\f[I]delim\f[]
+\-\-delim=\f[I]delim\f[R]
 chr, optional.
-Delimiting character [default: \[aq]\\n\[aq]].
-Use \[aq]\\0\[aq] for null.
-N.B.: on Windows systems, Python converts \[aq]\\n\[aq] to
-\[aq]\\r\\n\[aq].
-.RS
-.RE
-.TP
-.B \-\-buf\-size=\f[I]buf_size\f[]
+Delimiting character [default: `\(rsn'].
+Use `\(rs0' for null.
+N.B.: on Windows systems, Python converts `\(rsn' to `\(rsr\(rsn'.
+.TP
+\-\-buf\-size=\f[I]buf_size\f[R]
 int, optional.
-String buffer size in bytes [default: 256] used when \f[C]delim\f[] is
+String buffer size in bytes [default: 256] used when \f[CR]delim\f[R] is
 specified.
-.RS
-.RE
 .TP
-.B \-\-bytes
+\-\-bytes
 bool, optional.
-If true, will count bytes, ignore \f[C]delim\f[], and default
-\f[C]unit_scale\f[] to True, \f[C]unit_divisor\f[] to 1024, and
-\f[C]unit\f[] to \[aq]B\[aq].
-.RS
-.RE
+If true, will count bytes, ignore \f[CR]delim\f[R], and default
+\f[CR]unit_scale\f[R] to True, \f[CR]unit_divisor\f[R] to 1024, and
+\f[CR]unit\f[R] to `B'.
 .TP
-.B \-\-tee
+\-\-tee
 bool, optional.
-If true, passes \f[C]stdin\f[] to both \f[C]stderr\f[] and
-\f[C]stdout\f[].
-.RS
-.RE
+If true, passes \f[CR]stdin\f[R] to both \f[CR]stderr\f[R] and
+\f[CR]stdout\f[R].
 .TP
-.B \-\-update
+\-\-update
 bool, optional.
-If true, will treat input as newly elapsed iterations, i.e.
-numbers to pass to \f[C]update()\f[].
-Note that this is slow (~2e5 it/s) since every input must be decoded as
-a number.
-.RS
-.RE
-.TP
-.B \-\-update\-to
+If true, will treat input as newly elapsed iterations, i.e.\ numbers to
+pass to \f[CR]update()\f[R].
+Note that this is slow (\(ti2e5 it/s) since every input must be decoded
+as a number.
+.TP
+\-\-update\-to
 bool, optional.
-If true, will treat input as total elapsed iterations, i.e.
-numbers to assign to \f[C]self.n\f[].
-Note that this is slow (~2e5 it/s) since every input must be decoded as
-a number.
-.RS
-.RE
-.TP
-.B \-\-null
+If true, will treat input as total elapsed iterations, i.e.\ numbers to
+assign to \f[CR]self.n\f[R].
+Note that this is slow (\(ti2e5 it/s) since every input must be decoded
+as a number.
+.TP
+\-\-null
 bool, optional.
 If true, will discard input (no stdout).
-.RS
-.RE
 .TP
-.B \-\-manpath=\f[I]manpath\f[]
+\-\-manpath=\f[I]manpath\f[R]
 str, optional.
 Directory in which to install tqdm man pages.
-.RS
-.RE
 .TP
-.B \-\-comppath=\f[I]comppath\f[]
+\-\-comppath=\f[I]comppath\f[R]
 str, optional.
 Directory in which to place tqdm completion.
-.RS
-.RE
 .TP
-.B \-\-log=\f[I]log\f[]
+\-\-log=\f[I]log\f[R]
 str, optional.
-CRITICAL|FATAL|ERROR|WARN(ING)|[default: \[aq]INFO\[aq]]|DEBUG|NOTSET.
-.RS
-.RE
+CRITICAL|FATAL|ERROR|WARN(ING)|[default: `INFO']|DEBUG|NOTSET.
 .SH AUTHORS
-tqdm developers <https://github.com/tqdm>.
+tqdm developers \c
+.UR https://github.com/tqdm
+.UE \c.
diff --git a/libs/tqdm/utils.py b/libs/tqdm/utils.py
index af3ec7ded5..ab454de7c2 100644
--- a/libs/tqdm/utils.py
+++ b/libs/tqdm/utils.py
@@ -99,7 +99,7 @@ def wrap(func):
     return wrap
 
 
-class FormatReplace(object):
+class FormatReplace:
     """
     >>> a = FormatReplace('something')
     >>> f"{a:5d}"
@@ -114,7 +114,7 @@ def __format__(self, _):
         return self.replace
 
 
-class Comparable(object):
+class Comparable:
     """Assumes child has self._comparable attr/@property"""
     def __lt__(self, other):
         return self._comparable < other._comparable
@@ -135,7 +135,7 @@ def __ge__(self, other):
         return not self < other
 
 
-class ObjectWrapper(object):
+class ObjectWrapper:
     def __getattr__(self, name):
         return getattr(self._wrapped, name)
 
@@ -210,7 +210,7 @@ def inner(*args, **kwargs):
                     pass
         return inner
 
-    def __init__(self, wrapped, tqdm_instance):
+    def __init__(self, wrapped, tqdm_instance):  # noqa: B042
         super().__init__(wrapped)
         if hasattr(wrapped, 'write'):
             self.wrapper_setattr(
@@ -251,7 +251,7 @@ def read(*args, **kwargs):
 
 def _is_utf(encoding):
     try:
-        u'\u2588\u2589'.encode(encoding)
+        '\u2588\u2589'.encode(encoding)
     except UnicodeEncodeError:
         return False
     except Exception:
diff --git a/libs/tqdm/version.py b/libs/tqdm/version.py
index 11cbaea79d..9338fb1979 100644
--- a/libs/tqdm/version.py
+++ b/libs/tqdm/version.py
@@ -1,9 +1,10 @@
 """`tqdm` version detector. Precedence: installed dist, git, 'UNKNOWN'."""
 try:
-    from ._dist_ver import __version__
-except ImportError:
-    try:
-        from setuptools_scm import get_version
-        __version__ = get_version(root='..', relative_to=__file__)
-    except (ImportError, LookupError):
-        __version__ = "UNKNOWN"
+    from importlib.metadata import PackageNotFoundError, version
+except ImportError:  # py<3.8
+    from importlib_metadata import PackageNotFoundError, version
+
+try:
+    __version__ = version('tqdm')
+except PackageNotFoundError:
+    __version__ = "UNKNOWN"
diff --git a/libs/trakit-0.2.2.dist-info/METADATA b/libs/trakit-0.2.2.dist-info/METADATA
deleted file mode 100644
index 910bbe4585..0000000000
--- a/libs/trakit-0.2.2.dist-info/METADATA
+++ /dev/null
@@ -1,179 +0,0 @@
-Metadata-Version: 2.1
-Name: trakit
-Version: 0.2.2
-Summary: Guess additional information from track titles
-Home-page: https://github.com/ratoaq2/trakit
-License: MIT
-Keywords: video,mkv,audio,subtitles,srt,pgs,sdh,cc,sup,sub,metadata,movie,episode,tv,track,shows,series
-Author: Rato
-Requires-Python: >=3.8.1,<4.0.0
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Topic :: Multimedia :: Video
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: babelfish (>=0.6.0,<0.7.0)
-Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: rebulk (>=3.1.0,<4.0.0)
-Project-URL: Repository, https://github.com/ratoaq2/trakit
-Description-Content-Type: text/markdown
-
-# TrakIt
-Guess additional information from track titles
-
-[![Latest
-Version](https://img.shields.io/pypi/v/trakit.svg)](https://pypi.python.org/pypi/trakit)
-
-[![tests](https://github.com/ratoaq2/trakit/actions/workflows/test.yml/badge.svg)](https://github.com/ratoaq2/trakit/actions/workflows/test.yml)
-
-[![License](https://img.shields.io/github/license/ratoaq2/trakit.svg)](https://github.com/ratoaq2/trakit/blob/master/LICENSE)
-
-  - Project page  
-    <https://github.com/ratoaq2/trakit>
-
-## Info
-
-**TrakIt** is a track name parser.
-It is a tiny library created to solve a very specific problem.
-It's very common that video files do not have precise metadata information, 
-where you can have multiple subtitle tracks tagged as **Portuguese**, 
-but one of them is actually **Brazilian Portuguese**:
-```json lines
-{
-  "codec": "SubRip/SRT",
-  "id": 19,
-  "properties": {
-    "codec_id": "S_TEXT/UTF8",
-    "codec_private_length": 0,
-    "default_track": false,
-    "enabled_track": true,
-    "encoding": "UTF-8",
-    "forced_track": false,
-    "language": "por",
-    "language_ietf": "pt",
-    "number": 20,
-    "text_subtitles": true,
-    "track_name": "Portuguรชs",
-    "uid": 160224385584803173
-  }
-}
-
-{
-  "codec": "SubRip/SRT",
-  "id": 20,
-  "properties": {
-    "codec_id": "S_TEXT/UTF8",
-    "codec_private_length": 0,
-    "default_track": false,
-    "enabled_track": true,
-    "encoding": "UTF-8",
-    "forced_track": false,
-    "language": "por",
-    "language_ietf": "pt",
-    "number": 21,
-    "text_subtitles": true,
-    "track_name": "Portuguรชs (Brasil)",
-    "uid": 1435945803220205
-  }
-}
-```
-Or you have multiple audio tracks in **English**,
-but one of them is **British English** (`British English Forced (PGS)`) and others are **American English**
-(`American English (PGS)`)
-
-Given a track name, **TrakIt** can guess the language:
-
-```bash
->> trakit "Portuguรชs (Brasil)"
-{
-  "language": "pt-BR"
-}
-```
-
-**TrakIt** is also able to identify:
-* SDH: Subtitles for the Deaf or Hard of Hearing
-* Forced flag
-* Closed captions
-* Alternate version tracks
-* Commentary tracks
-
-```bash
->> trakit "British English (SDH) (PGS)"
-{
-  "language": "en-GB",
-  "hearing_impaired": true
-}
-
->> trakit "English CC (SRT)"
-{
-  "language": "en",
-  "closed_caption": true
-}
-
->> trakit "Cast and Crew Commentary (English AC3 Stereo)"
-{
-  "language": "en",
-  "commentary": true
-}
-
->> trakit "Franรงais Forced (SRT)"
-{
-  "language": "fr",
-  "forced": true
-}
-```
-
-All available CLI options:
-```bash
->> trakit --help
-usage: trakit [-h] [-l EXPECTED_LANGUAGE] [--debug] [-y] [--version] value
-
-positional arguments:
-  value                 track title to guess
-
-options:
-  -h, --help            show this help message and exit
-
-Configuration:
-  -l EXPECTED_LANGUAGE, --expected-language EXPECTED_LANGUAGE
-                        The expected language to be guessed
-
-Output:
-  --debug               Print information for debugging trakit and for reporting bugs.
-  -y, --yaml            Display output in yaml format
-
-Information:
-  --version             show program's version number and exit
-```
-
-
-**TrakIt** is not a release parser. Use [GuessIt](https://github.com/guessit-io/guessit)
-
-**TrakIt** is not a video metadata extractor.
-Use [KnowIt](https://github.com/ratoaq2/knowit).
-KnowIt already uses **trakit** to enhance the extracted information
-
-## Installation
-
-**TrakIt** can be installed as a regular python module by running:
-
-    $ [sudo] pip install trakit
-
-For a better isolation with your system you should use a dedicated
-virtualenv or install for your user only using the `--user` flag.
-
-## Data
-* Available languages are the same supported by [Diaoul/babelfish](https://github.com/Diaoul/babelfish)
-* Localized country names were fetched from [mledoze/countries](https://github.com/mledoze/countries)
-* Localized language names were fetched from [mozilla/language-mapping-list](https://github.com/mozilla/language-mapping-list)
-
diff --git a/libs/trakit-0.2.2.dist-info/RECORD b/libs/trakit-0.2.2.dist-info/RECORD
deleted file mode 100644
index eaa8cb0615..0000000000
--- a/libs/trakit-0.2.2.dist-info/RECORD
+++ /dev/null
@@ -1,20 +0,0 @@
-../../bin/trakit,sha256=061GX_FSkORuBimuhcYrShFcfjURVuy8f4oP724YRaA,237
-trakit-0.2.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-trakit-0.2.2.dist-info/LICENSE,sha256=SQOlWLdyOaJn59XweZU7tqq5GShFrWixpgZA7BqePkc,1061
-trakit-0.2.2.dist-info/METADATA,sha256=zm5ekYHajiNFnczuVNS-j2SNVaTpDMx1AW0qPH0uDBI,5236
-trakit-0.2.2.dist-info/RECORD,,
-trakit-0.2.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trakit-0.2.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-trakit-0.2.2.dist-info/entry_points.txt,sha256=ua6hFDKScrfZ2Xs1RaVrkvyYK4QLZEfGRuqY6P7ZmV4,47
-trakit/__init__.py,sha256=oEfzI2hOhog85Ys5GkAWjEB8Jf80a0Kb86meZikhQyU,344
-trakit/__main__.py,sha256=etlpZCxfmuCHoqbQEdC9SH58TzoW4ij_YtH7grvyWIM,3151
-trakit/api.py,sha256=Lm03p5yFivTlgyCihqr0m0UaACkKboboKA7qL9j8T4c,757
-trakit/config.py,sha256=mygnzoMCSIdeb0k3OmVGALcKGzyLMVvHYtuP2NwJRhY,970
-trakit/context.py,sha256=Q-5FaoP3QNUfQCcstp0x2ygLbmScZ0GmnhxTg-JJ_-U,886
-trakit/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trakit/converters/country.py,sha256=eTQFtfO3bsd9vyqAhdjsBIkqN2ZbRaDn04zrobiUUQg,869
-trakit/converters/language.py,sha256=SuBaWOX1SDbMYZQgXqvX3c8Z9SS75D88HVnLcCXCLqc,1076
-trakit/data/config.json,sha256=uwGIWRlZoWA8NSOhn5HyNiU_-4NY7bKtzl1aetlh7h8,21185
-trakit/language.py,sha256=Ov6973tHE8tCzpwHuxPL2zk97FpZw9DMs6vD03hMBKg,6650
-trakit/patterns.py,sha256=-xp7-XwMUln_uPz6LfDPuYUNDzbOEFA2sDR_mca-cxc,1045
-trakit/words.py,sha256=CF8sqzjPUOoquw_j3VFkJ_PJMnAdiwNhrgnwn3q39UQ,2552
diff --git a/libs/trakit-0.2.2.dist-info/WHEEL b/libs/trakit-0.2.2.dist-info/WHEEL
deleted file mode 100644
index 8b9b3a1bf3..0000000000
--- a/libs/trakit-0.2.2.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/tqdm-4.67.1.dist-info/INSTALLER b/libs/trakit-0.2.5.dist-info/INSTALLER
similarity index 100%
rename from libs/tqdm-4.67.1.dist-info/INSTALLER
rename to libs/trakit-0.2.5.dist-info/INSTALLER
diff --git a/libs/trakit-0.2.5.dist-info/METADATA b/libs/trakit-0.2.5.dist-info/METADATA
new file mode 100644
index 0000000000..d6e5ddf2a4
--- /dev/null
+++ b/libs/trakit-0.2.5.dist-info/METADATA
@@ -0,0 +1,190 @@
+Metadata-Version: 2.4
+Name: trakit
+Version: 0.2.5
+Summary: Guess additional information from track titles
+License: MIT
+License-File: LICENSE
+Keywords: video,mkv,audio,subtitles,srt,pgs,sdh,cc,sup,sub,metadata,movie,episode,tv,track,shows,series
+Author: Rato
+Requires-Python: >=3.9,<4.0
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Multimedia :: Video
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Requires-Dist: babelfish (>=0.6.0,<0.7.0)
+Requires-Dist: rebulk (>=3.1.0,<4.0.0)
+Project-URL: Repository, https://github.com/ratoaq2/trakit
+Description-Content-Type: text/markdown
+
+# TrakIt
+Guess additional information from track titles
+
+[![Latest
+Version](https://img.shields.io/pypi/v/trakit.svg)](https://pypi.python.org/pypi/trakit)
+
+[![tests](https://github.com/ratoaq2/trakit/actions/workflows/test.yml/badge.svg)](https://github.com/ratoaq2/trakit/actions/workflows/test.yml)
+
+[![License](https://img.shields.io/github/license/ratoaq2/trakit.svg)](https://github.com/ratoaq2/trakit/blob/master/LICENSE)
+
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/trakit)
+
+  - Project page  
+    <https://github.com/ratoaq2/trakit>
+
+## Info
+
+**TrakIt** is a track name parser.
+It is a tiny library created to solve a very specific problem.
+It's very common that video files do not have precise metadata information, 
+where you can have multiple subtitle tracks tagged as **Portuguese**, 
+but one of them is actually **Brazilian Portuguese**:
+```json lines
+{
+  "codec": "SubRip/SRT",
+  "id": 19,
+  "properties": {
+    "codec_id": "S_TEXT/UTF8",
+    "codec_private_length": 0,
+    "default_track": false,
+    "enabled_track": true,
+    "encoding": "UTF-8",
+    "forced_track": false,
+    "language": "por",
+    "language_ietf": "pt",
+    "number": 20,
+    "text_subtitles": true,
+    "track_name": "Portuguรชs",
+    "uid": 160224385584803173
+  }
+}
+
+{
+  "codec": "SubRip/SRT",
+  "id": 20,
+  "properties": {
+    "codec_id": "S_TEXT/UTF8",
+    "codec_private_length": 0,
+    "default_track": false,
+    "enabled_track": true,
+    "encoding": "UTF-8",
+    "forced_track": false,
+    "language": "por",
+    "language_ietf": "pt",
+    "number": 21,
+    "text_subtitles": true,
+    "track_name": "Portuguรชs (Brasil)",
+    "uid": 1435945803220205
+  }
+}
+```
+Or you have multiple audio tracks in **English**,
+but one of them is **British English** (`British English Forced (PGS)`) and others are **American English**
+(`American English (PGS)`)
+
+Given a track name, **TrakIt** can guess the language:
+
+```bash
+>> trakit "Portuguรชs (Brasil)"
+{
+  "language": "pt-BR"
+}
+```
+
+```bash
+>> trakit -t filename "foobar.en.sdh.srt"
+{
+  "language": "en"
+  "hearing_impaired": true
+}
+```
+
+**TrakIt** is also able to identify:
+* SDH: Subtitles for the Deaf or Hard of Hearing
+* Forced flag
+* Closed captions
+* Alternate version tracks
+* Commentary tracks
+
+```bash
+>> trakit "British English (SDH) (PGS)"
+{
+  "language": "en-GB",
+  "hearing_impaired": true
+}
+
+>> trakit "English CC (SRT)"
+{
+  "language": "en",
+  "closed_caption": true
+}
+
+>> trakit "Cast and Crew Commentary (English AC3 Stereo)"
+{
+  "language": "en",
+  "commentary": true
+}
+
+>> trakit "Franรงais Forced (SRT)"
+{
+  "language": "fr",
+  "forced": true
+}
+```
+
+All available CLI options:
+```bash
+>> trakit --help
+usage: trakit [-h] [-l EXPECTED_LANGUAGE] [--debug] [-y] [--version] value
+
+positional arguments:
+  value                 track title to guess
+
+options:
+  -h, --help            show this help message and exit
+
+Configuration:
+  -l EXPECTED_LANGUAGE, --expected-language EXPECTED_LANGUAGE
+                        The expected language to be guessed
+  -t, --type TYPE       The input type: trackname or filename. Default is trackname
+
+Output:
+  --debug               Print information for debugging trakit and for reporting bugs.
+  -y, --yaml            Display output in yaml format
+
+Information:
+  --version             show program's version number and exit
+```
+
+
+**TrakIt** is not a release parser. Use [GuessIt](https://github.com/guessit-io/guessit)
+
+**TrakIt** is not a video metadata extractor.
+Use [KnowIt](https://github.com/ratoaq2/knowit).
+KnowIt already uses **trakit** to enhance the extracted information
+
+## Installation
+
+**TrakIt** can be installed as a regular python module by running:
+
+    $ [sudo] pip install trakit
+
+For a better isolation with your system you should use a dedicated
+virtualenv or install for your user only using the `--user` flag.
+
+## Data
+* Available languages are the same supported by [Diaoul/babelfish](https://github.com/Diaoul/babelfish)
+* Localized country names were fetched from [mledoze/countries](https://github.com/mledoze/countries)
+* Localized language names were fetched from [mozilla/language-mapping-list](https://github.com/mozilla/language-mapping-list)
+
diff --git a/libs/trakit-0.2.5.dist-info/RECORD b/libs/trakit-0.2.5.dist-info/RECORD
new file mode 100644
index 0000000000..03ef1fcf49
--- /dev/null
+++ b/libs/trakit-0.2.5.dist-info/RECORD
@@ -0,0 +1,20 @@
+../../bin/trakit,sha256=E5XlvvXMXpZPEM0vEOiI0zS6-GMBMgAD8U4eLPK5iHs,190
+trakit-0.2.5.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+trakit-0.2.5.dist-info/METADATA,sha256=HCGS7Mym7IBQ7UB6UNrJgVdM9cAIK3mf2oh6A1H7HJU,5487
+trakit-0.2.5.dist-info/RECORD,,
+trakit-0.2.5.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+trakit-0.2.5.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+trakit-0.2.5.dist-info/entry_points.txt,sha256=ua6hFDKScrfZ2Xs1RaVrkvyYK4QLZEfGRuqY6P7ZmV4,47
+trakit-0.2.5.dist-info/licenses/LICENSE,sha256=SQOlWLdyOaJn59XweZU7tqq5GShFrWixpgZA7BqePkc,1061
+trakit/__init__.py,sha256=oEfzI2hOhog85Ys5GkAWjEB8Jf80a0Kb86meZikhQyU,344
+trakit/__main__.py,sha256=87m-n-pRTCo-XNk1fp55p32in863ELeDSLMdunNwgi0,3413
+trakit/api.py,sha256=Lm03p5yFivTlgyCihqr0m0UaACkKboboKA7qL9j8T4c,757
+trakit/config.py,sha256=mygnzoMCSIdeb0k3OmVGALcKGzyLMVvHYtuP2NwJRhY,970
+trakit/context.py,sha256=KM3ZKsIPeO0rfOoSneNuXfQACWbBo3DHxFI4scshv6o,979
+trakit/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+trakit/converters/country.py,sha256=eTQFtfO3bsd9vyqAhdjsBIkqN2ZbRaDn04zrobiUUQg,869
+trakit/converters/language.py,sha256=SuBaWOX1SDbMYZQgXqvX3c8Z9SS75D88HVnLcCXCLqc,1076
+trakit/data/config.json,sha256=gjJsEOCLUDBIlPluykEHqXSvmqm227e45Q-qM_YUOvM,21109
+trakit/language.py,sha256=CUq68omHDhzXAP_Lk9PXonGlnD0Nn_VhxWHEcQFiKwo,7220
+trakit/patterns.py,sha256=-xp7-XwMUln_uPz6LfDPuYUNDzbOEFA2sDR_mca-cxc,1045
+trakit/words.py,sha256=mcy4fVxmO1DR-l96FmSJcnfc-Io-1kL_AYl5vodjI60,2708
diff --git a/libs/waitress-3.0.0.dist-info/REQUESTED b/libs/trakit-0.2.5.dist-info/REQUESTED
similarity index 100%
rename from libs/waitress-3.0.0.dist-info/REQUESTED
rename to libs/trakit-0.2.5.dist-info/REQUESTED
diff --git a/libs/trakit-0.2.5.dist-info/WHEEL b/libs/trakit-0.2.5.dist-info/WHEEL
new file mode 100644
index 0000000000..7894e88612
--- /dev/null
+++ b/libs/trakit-0.2.5.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: poetry-core 2.3.1
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/trakit-0.2.2.dist-info/entry_points.txt b/libs/trakit-0.2.5.dist-info/entry_points.txt
similarity index 100%
rename from libs/trakit-0.2.2.dist-info/entry_points.txt
rename to libs/trakit-0.2.5.dist-info/entry_points.txt
diff --git a/libs/trakit-0.2.2.dist-info/LICENSE b/libs/trakit-0.2.5.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/trakit-0.2.2.dist-info/LICENSE
rename to libs/trakit-0.2.5.dist-info/licenses/LICENSE
diff --git a/libs/trakit/__main__.py b/libs/trakit/__main__.py
index 61f07324a7..69750ecfd3 100644
--- a/libs/trakit/__main__.py
+++ b/libs/trakit/__main__.py
@@ -33,6 +33,13 @@ def build_argument_parser() -> argparse.ArgumentParser:
         help='The expected language to be guessed',
         type=str,
     )
+    conf_opts.add_argument(
+        '-t',
+        '--type',
+        dest='type',
+        help='The input type: trackname or filename. Default is trackname',
+        type=str,
+    )
 
     output_opts = opts.add_argument_group('Output')
     output_opts.add_argument(
@@ -91,7 +98,7 @@ def trakit(value: str, opts: argparse.Namespace) -> typing.Mapping:
     return info
 
 
-def main(args: typing.Optional[typing.List[str]] = None):
+def execute(args: typing.Optional[typing.List[str]] = None):
     """Execute main function for entry point."""
     argument_parser = build_argument_parser()
     args = args or sys.argv[1:]
@@ -104,5 +111,9 @@ def main(args: typing.Optional[typing.List[str]] = None):
     return trakit(opts.value, opts)
 
 
+def main(args: typing.Optional[typing.List[str]] = None):
+    execute(args)
+
+
 if __name__ == '__main__':
     main(sys.argv[1:])
diff --git a/libs/trakit/context.py b/libs/trakit/context.py
index 9a023ce088..bfe6083d6d 100644
--- a/libs/trakit/context.py
+++ b/libs/trakit/context.py
@@ -10,6 +10,7 @@ def __init__(self, options: typing.Optional[typing.Mapping[str, typing.Any]] = N
         if language and not isinstance(language, babelfish.Language):
             language = babelfish.Language.fromietf(str(language))
         self.expected_language: typing.Optional[babelfish.Language] = language
+        self.type: typing.Literal['trackname', 'filename'] = self.get('type') or 'trackname'
 
     def accept(self, lang: babelfish.Language):
         if self.expected_language is None:
diff --git a/libs/trakit/data/config.json b/libs/trakit/data/config.json
index aa7138042f..6865878173 100644
--- a/libs/trakit/data/config.json
+++ b/libs/trakit/data/config.json
@@ -486,6 +486,7 @@
     "intiyaa": "IN",
     "joseon": "KP",
     "jybwty": "DJ",
+    "jzr lqmr": "KM",
     "khoemry": "IQ",
     "lSwml": "SO",
     "l`rq": "IQ",
@@ -494,11 +495,11 @@
     "ljzyr": "DZ",
     "lkwyt": "KW",
     "lmGrb": "MA",
-    "lqmr": "KM",
+    "lmrt": "AE",
     "lrdn": "JO",
     "lswdn": "SD",
-    "lyaman": "YE",
     "lyby": "LY",
+    "lymn": "YE",
     "mSr": "EG",
     "mlysy": "MY",
     "mnmaa": "MM",
@@ -509,7 +510,7 @@
     "praethsaithy": "TH",
     "qTr": "QA",
     "qwutnA": "IQ",
-    "rtry": "ER",
+    "rytry": "ER",
     "sak`art`velo": "GE",
     "shrii lNkaav": "LK",
     "spplaaw": "LA",
@@ -550,27 +551,26 @@
     "าšะฐะทะฐา›ัั‚ะฐะฝ": "KZ",
     "ี€ีกีตีกีฝีฟีกีถ": "AM",
     "ื™ืฉืจืืœ": "IL",
-    "ุฅุฑุชุฑูŠุงโ€Ž": "ER",
+    "ุฅุฑูŠุชุฑูŠุง": "ER",
     "ุฅุณุฑุงุฆูŠู„": "IL",
     "ุงูุบุงู†ุณุชุงู†": "AF",
     "ุงู„ุฃุฑุฏู†": "JO",
+    "ุงู„ุฅู…ุงุฑุงุช": "AE",
     "ุงู„ุจุญุฑูŠู†": "BH",
     "ุงู„ุฌุฒุงุฆุฑ": "DZ",
     "ุงู„ุณุนูˆุฏูŠุฉ": "SA",
     "ุงู„ุณูˆุฏุงู†": "SD",
     "ุงู„ุตุญุฑุงุก ุงู„ุบุฑุจูŠุฉ": "EH",
-    "ุงู„ุตูˆู…ุงู„โ€Žโ€Ž": "SO",
+    "ุงู„ุตูˆู…ุงู„": "SO",
     "ุงู„ุนุฑุงู‚": "IQ",
-    "ุงู„ุนุฑุจูŠุฉ ุงู„ุณุนูˆุฏูŠุฉ": "SA",
-    "ุงู„ู‚ู…ุฑโ€Ž": "KM",
     "ุงู„ูƒูˆูŠุช": "KW",
     "ุงู„ู…ุบุฑุจ": "MA",
-    "ุงู„ูŠูŽู…ูŽู†": "YE",
+    "ุงู„ูŠู…ู†": "YE",
     "ุง�Œุฑุงู†": "IR",
-    "ุชุดุงุฏโ€Ž": "TD",
+    "ุชุดุงุฏ": "TD",
     "ุชูˆู†ุณ": "TN",
-    "ุฌูŠุจูˆุชูŠโ€Ž": "DJ",
-    "ุฏูˆู„ุฉ ุงู„ุฅู…ุงุฑุงุช ุงู„ุนุฑุจูŠุฉ ุงู„ู…ุชุญุฏุฉ": "AE",
+    "ุฌุฒุฑ ุงู„ู‚ู…ุฑ": "KM",
+    "ุฌูŠุจูˆุชูŠ": "DJ",
     "ุณูˆุฑูŠุง": "SY",
     "ุนู…ุงู†": "OM",
     "ูู„ุณุทูŠู†": "PS",
diff --git a/libs/trakit/language.py b/libs/trakit/language.py
index e1a621745d..d923fe0f58 100644
--- a/libs/trakit/language.py
+++ b/libs/trakit/language.py
@@ -21,7 +21,30 @@
 from trakit.context import Context
 from trakit.converters.country import GuessCountryConverter
 from trakit.converters.language import GuessLanguageConverter
-from trakit.words import blank_match, blank_release_names, to_combinations, to_match, to_sentence, to_words
+from trakit.words import (
+    blank_base_name_and_extension,
+    blank_match,
+    blank_release_names,
+    to_combinations,
+    to_match,
+    to_sentence,
+    to_words)
+
+
+def _convert(value: str, context: Context):
+    if context.type == 'filename':
+        for conv in (Language.fromietf,
+                     Language.fromalpha3b,
+                     Language.fromalpha2):
+            try:
+                return conv(value)
+            except (ValueError, LanguageReverseError):
+                continue
+
+    try:
+        return Language.fromguess(value)
+    except LanguageReverseError:
+        return None
 
 
 class LanguageFinder:
@@ -104,7 +127,7 @@ def accept_word(self, string: str):
         return string.lower() not in self.common_words and not string.isnumeric()
 
     def find_language(self, value: str, context: Context):
-        value = blank_release_names(value)
+        value = blank_base_name_and_extension(value) if context.type == 'filename' else blank_release_names(value)
         all_words = to_words(value, predicate=self.accept_word)
         combinations = to_combinations(all_words, self.language_max_words)
         implicit_lang = self._find_implicit_language(combinations)
@@ -119,9 +142,8 @@ def find_language(self, value: str, context: Context):
 
         for c in combinations:
             language_sentence = to_sentence(c)
-            try:
-                lang = Language.fromguess(language_sentence)
-            except LanguageReverseError:
+            lang: typing.Optional[Language] = _convert(language_sentence, context)
+            if lang is None:
                 continue
 
             match_lang = to_match(c, lang)
diff --git a/libs/trakit/words.py b/libs/trakit/words.py
index 1ee244c96a..5e32763502 100644
--- a/libs/trakit/words.py
+++ b/libs/trakit/words.py
@@ -1,5 +1,6 @@
 import re
 import typing
+from pathlib import Path
 
 from rebulk.match import Match
 
@@ -97,3 +98,10 @@ def blank_release_names(value: str):
         match = release_name_re.search(value, match.end('release'))
 
     return result
+
+
+def blank_base_name_and_extension(value: str):
+    p = Path(value)
+    stems = p.stem.split('.')
+
+    return '.'.join(stems[1:])
diff --git a/libs/typing_extensions-4.12.2.dist-info/METADATA b/libs/typing_extensions-4.12.2.dist-info/METADATA
deleted file mode 100644
index f15e2b3877..0000000000
--- a/libs/typing_extensions-4.12.2.dist-info/METADATA
+++ /dev/null
@@ -1,67 +0,0 @@
-Metadata-Version: 2.1
-Name: typing_extensions
-Version: 4.12.2
-Summary: Backported and Experimental Type Hints for Python 3.8+
-Keywords: annotations,backport,checker,checking,function,hinting,hints,type,typechecking,typehinting,typehints,typing
-Author-email: "Guido van Rossum, Jukka Lehtosalo, ลukasz Langa, Michael Lee" <levkivskyi@gmail.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Python Software Foundation License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Topic :: Software Development
-Project-URL: Bug Tracker, https://github.com/python/typing_extensions/issues
-Project-URL: Changes, https://github.com/python/typing_extensions/blob/main/CHANGELOG.md
-Project-URL: Documentation, https://typing-extensions.readthedocs.io/
-Project-URL: Home, https://github.com/python/typing_extensions
-Project-URL: Q & A, https://github.com/python/typing/discussions
-Project-URL: Repository, https://github.com/python/typing_extensions
-
-# Typing Extensions
-
-[![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing)
-
-[Documentation](https://typing-extensions.readthedocs.io/en/latest/#) โ€“
-[PyPI](https://pypi.org/project/typing-extensions/)
-
-## Overview
-
-The `typing_extensions` module serves two related purposes:
-
-- Enable use of new type system features on older Python versions. For example,
-  `typing.TypeGuard` is new in Python 3.10, but `typing_extensions` allows
-  users on previous Python versions to use it too.
-- Enable experimentation with new type system PEPs before they are accepted and
-  added to the `typing` module.
-
-`typing_extensions` is treated specially by static type checkers such as
-mypy and pyright. Objects defined in `typing_extensions` are treated the same
-way as equivalent forms in `typing`.
-
-`typing_extensions` uses
-[Semantic Versioning](https://semver.org/). The
-major version will be incremented only for backwards-incompatible changes.
-Therefore, it's safe to depend
-on `typing_extensions` like this: `typing_extensions >=x.y, <(x+1)`,
-where `x.y` is the first version that includes all features you need.
-
-## Included items
-
-See [the documentation](https://typing-extensions.readthedocs.io/en/latest/#) for a
-complete listing of module contents.
-
-## Contributing
-
-See [CONTRIBUTING.md](https://github.com/python/typing_extensions/blob/main/CONTRIBUTING.md)
-for how to contribute to `typing_extensions`.
-
diff --git a/libs/typing_extensions-4.12.2.dist-info/RECORD b/libs/typing_extensions-4.12.2.dist-info/RECORD
deleted file mode 100644
index b8bde9a364..0000000000
--- a/libs/typing_extensions-4.12.2.dist-info/RECORD
+++ /dev/null
@@ -1,7 +0,0 @@
-typing_extensions-4.12.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-typing_extensions-4.12.2.dist-info/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
-typing_extensions-4.12.2.dist-info/METADATA,sha256=BeUQIa8cnYbrjWx-N8TOznM9UGW5Gm2DicVpDtRA8W0,3018
-typing_extensions-4.12.2.dist-info/RECORD,,
-typing_extensions-4.12.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-typing_extensions-4.12.2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-typing_extensions.py,sha256=gwekpyG9DVG3lxWKX4ni8u7nk3We5slG98mA9F3DJQw,134451
diff --git a/libs/typing_extensions-4.12.2.dist-info/WHEEL b/libs/typing_extensions-4.12.2.dist-info/WHEEL
deleted file mode 100644
index 3b5e64b5e6..0000000000
--- a/libs/typing_extensions-4.12.2.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.9.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/trakit-0.2.2.dist-info/INSTALLER b/libs/typing_extensions-4.15.0.dist-info/INSTALLER
similarity index 100%
rename from libs/trakit-0.2.2.dist-info/INSTALLER
rename to libs/typing_extensions-4.15.0.dist-info/INSTALLER
diff --git a/libs/typing_extensions-4.15.0.dist-info/METADATA b/libs/typing_extensions-4.15.0.dist-info/METADATA
new file mode 100644
index 0000000000..b09cb50e1f
--- /dev/null
+++ b/libs/typing_extensions-4.15.0.dist-info/METADATA
@@ -0,0 +1,72 @@
+Metadata-Version: 2.4
+Name: typing_extensions
+Version: 4.15.0
+Summary: Backported and Experimental Type Hints for Python 3.9+
+Keywords: annotations,backport,checker,checking,function,hinting,hints,type,typechecking,typehinting,typehints,typing
+Author-email: "Guido van Rossum, Jukka Lehtosalo, ลukasz Langa, Michael Lee" <levkivskyi@gmail.com>
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-Expression: PSF-2.0
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Software Development
+License-File: LICENSE
+Project-URL: Bug Tracker, https://github.com/python/typing_extensions/issues
+Project-URL: Changes, https://github.com/python/typing_extensions/blob/main/CHANGELOG.md
+Project-URL: Documentation, https://typing-extensions.readthedocs.io/
+Project-URL: Home, https://github.com/python/typing_extensions
+Project-URL: Q & A, https://github.com/python/typing/discussions
+Project-URL: Repository, https://github.com/python/typing_extensions
+
+# Typing Extensions
+
+[![Chat at https://gitter.im/python/typing](https://badges.gitter.im/python/typing.svg)](https://gitter.im/python/typing)
+
+[Documentation](https://typing-extensions.readthedocs.io/en/latest/#) โ€“
+[PyPI](https://pypi.org/project/typing-extensions/)
+
+## Overview
+
+The `typing_extensions` module serves two related purposes:
+
+- Enable use of new type system features on older Python versions. For example,
+  `typing.TypeGuard` is new in Python 3.10, but `typing_extensions` allows
+  users on previous Python versions to use it too.
+- Enable experimentation with new type system PEPs before they are accepted and
+  added to the `typing` module.
+
+`typing_extensions` is treated specially by static type checkers such as
+mypy and pyright. Objects defined in `typing_extensions` are treated the same
+way as equivalent forms in `typing`.
+
+`typing_extensions` uses
+[Semantic Versioning](https://semver.org/). The
+major version will be incremented only for backwards-incompatible changes.
+Therefore, it's safe to depend
+on `typing_extensions` like this: `typing_extensions ~=x.y`,
+where `x.y` is the first version that includes all features you need.
+[This](https://packaging.python.org/en/latest/specifications/version-specifiers/#compatible-release)
+is equivalent to `typing_extensions >=x.y, <(x+1)`. Do not depend on `~= x.y.z`
+unless you really know what you're doing; that defeats the purpose of
+semantic versioning.
+
+## Included items
+
+See [the documentation](https://typing-extensions.readthedocs.io/en/latest/#) for a
+complete listing of module contents.
+
+## Contributing
+
+See [CONTRIBUTING.md](https://github.com/python/typing_extensions/blob/main/CONTRIBUTING.md)
+for how to contribute to `typing_extensions`.
+
diff --git a/libs/typing_extensions-4.15.0.dist-info/RECORD b/libs/typing_extensions-4.15.0.dist-info/RECORD
new file mode 100644
index 0000000000..6ed238b322
--- /dev/null
+++ b/libs/typing_extensions-4.15.0.dist-info/RECORD
@@ -0,0 +1,7 @@
+typing_extensions-4.15.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+typing_extensions-4.15.0.dist-info/METADATA,sha256=wTg3j-jxiTSsmd4GBTXFPsbBOu7WXpTDJkHafuMZKnI,3259
+typing_extensions-4.15.0.dist-info/RECORD,,
+typing_extensions-4.15.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+typing_extensions-4.15.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+typing_extensions-4.15.0.dist-info/licenses/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
+typing_extensions.py,sha256=Qz0R0XDTok0usGXrwb_oSM6n49fOaFZ6tSvqLUwvftg,160429
diff --git a/libs/wcwidth-0.2.13.dist-info/REQUESTED b/libs/typing_extensions-4.15.0.dist-info/REQUESTED
similarity index 100%
rename from libs/wcwidth-0.2.13.dist-info/REQUESTED
rename to libs/typing_extensions-4.15.0.dist-info/REQUESTED
diff --git a/libs/typing_extensions-4.15.0.dist-info/WHEEL b/libs/typing_extensions-4.15.0.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/typing_extensions-4.15.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/typing_extensions-4.12.2.dist-info/LICENSE b/libs/typing_extensions-4.15.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/typing_extensions-4.12.2.dist-info/LICENSE
rename to libs/typing_extensions-4.15.0.dist-info/licenses/LICENSE
diff --git a/libs/typing_extensions.py b/libs/typing_extensions.py
index dec429ca87..77f33e1614 100644
--- a/libs/typing_extensions.py
+++ b/libs/typing_extensions.py
@@ -1,15 +1,23 @@
 import abc
+import builtins
 import collections
 import collections.abc
 import contextlib
+import enum
 import functools
 import inspect
+import io
+import keyword
 import operator
 import sys
 import types as _types
 import typing
 import warnings
 
+# Breakpoint: https://github.com/python/cpython/pull/119891
+if sys.version_info >= (3, 14):
+    import annotationlib
+
 __all__ = [
     # Super-special typing primitives.
     'Any',
@@ -53,6 +61,8 @@
     'SupportsIndex',
     'SupportsInt',
     'SupportsRound',
+    'Reader',
+    'Writer',
 
     # One-off things.
     'Annotated',
@@ -61,9 +71,13 @@
     'clear_overloads',
     'dataclass_transform',
     'deprecated',
+    'disjoint_base',
     'Doc',
+    'evaluate_forward_ref',
     'get_overloads',
     'final',
+    'Format',
+    'get_annotations',
     'get_args',
     'get_origin',
     'get_original_bases',
@@ -77,20 +91,25 @@
     'overload',
     'override',
     'Protocol',
+    'Sentinel',
     'reveal_type',
     'runtime',
     'runtime_checkable',
     'Text',
     'TypeAlias',
     'TypeAliasType',
+    'TypeForm',
     'TypeGuard',
     'TypeIs',
     'TYPE_CHECKING',
+    'type_repr',
     'Never',
     'NoReturn',
     'ReadOnly',
     'Required',
     'NotRequired',
+    'NoDefault',
+    'NoExtraItems',
 
     # Pure aliases, have always been in typing
     'AbstractSet',
@@ -117,7 +136,6 @@
     'MutableMapping',
     'MutableSequence',
     'MutableSet',
-    'NoDefault',
     'Optional',
     'Pattern',
     'Reversible',
@@ -136,8 +154,12 @@
 # for backward compatibility
 PEP_560 = True
 GenericMeta = type
+# Breakpoint: https://github.com/python/cpython/pull/116129
 _PEP_696_IMPLEMENTED = sys.version_info >= (3, 13, 0, "beta")
 
+# Added with bpo-45166 to 3.10.1+ and some 3.9 versions
+_FORWARD_REF_HAS_CLASS = "__forward_is_class__" in typing.ForwardRef.__slots__
+
 # The functions below are modified copies of typing internal helpers.
 # They are needed by _ProtocolMeta and they provide support for PEP 646.
 
@@ -150,17 +172,15 @@ def __repr__(self):
 _marker = _Sentinel()
 
 
+# Breakpoint: https://github.com/python/cpython/pull/27342
 if sys.version_info >= (3, 10):
     def _should_collect_from_parameters(t):
         return isinstance(
             t, (typing._GenericAlias, _types.GenericAlias, _types.UnionType)
         )
-elif sys.version_info >= (3, 9):
-    def _should_collect_from_parameters(t):
-        return isinstance(t, (typing._GenericAlias, _types.GenericAlias))
 else:
     def _should_collect_from_parameters(t):
-        return isinstance(t, typing._GenericAlias) and not t._special
+        return isinstance(t, (typing._GenericAlias, _types.GenericAlias))
 
 
 NoReturn = typing.NoReturn
@@ -174,6 +194,7 @@ def _should_collect_from_parameters(t):
 T_contra = typing.TypeVar('T_contra', contravariant=True)  # Ditto contravariant.
 
 
+# Breakpoint: https://github.com/python/cpython/pull/31841
 if sys.version_info >= (3, 11):
     from typing import Any
 else:
@@ -206,7 +227,55 @@ def __new__(cls, *args, **kwargs):
 
 ClassVar = typing.ClassVar
 
+# Vendored from cpython typing._SpecialFrom
+# Having a separate class means that instances will not be rejected by
+# typing._type_check.
+class _SpecialForm(typing._Final, _root=True):
+    __slots__ = ('_name', '__doc__', '_getitem')
+
+    def __init__(self, getitem):
+        self._getitem = getitem
+        self._name = getitem.__name__
+        self.__doc__ = getitem.__doc__
+
+    def __getattr__(self, item):
+        if item in {'__name__', '__qualname__'}:
+            return self._name
+
+        raise AttributeError(item)
+
+    def __mro_entries__(self, bases):
+        raise TypeError(f"Cannot subclass {self!r}")
+
+    def __repr__(self):
+        return f'typing_extensions.{self._name}'
+
+    def __reduce__(self):
+        return self._name
+
+    def __call__(self, *args, **kwds):
+        raise TypeError(f"Cannot instantiate {self!r}")
+
+    def __or__(self, other):
+        return typing.Union[self, other]
+
+    def __ror__(self, other):
+        return typing.Union[other, self]
+
+    def __instancecheck__(self, obj):
+        raise TypeError(f"{self} cannot be used with isinstance()")
+
+    def __subclasscheck__(self, cls):
+        raise TypeError(f"{self} cannot be used with issubclass()")
+
+    @typing._tp_cache
+    def __getitem__(self, parameters):
+        return self._getitem(self, parameters)
+
 
+# Note that inheriting from this class means that the object will be
+# rejected by typing._type_check, so do not use it if the special form
+# is arguably valid as a type by itself.
 class _ExtensionsSpecialForm(typing._SpecialForm, _root=True):
     def __repr__(self):
         return 'typing_extensions.' + self._name
@@ -214,6 +283,7 @@ def __repr__(self):
 
 Final = typing.Final
 
+# Breakpoint: https://github.com/python/cpython/pull/30530
 if sys.version_info >= (3, 11):
     final = typing.final
 else:
@@ -252,11 +322,39 @@ class Other(Leaf):  # Error reported by type checker
         return f
 
 
+if hasattr(typing, "disjoint_base"):  # 3.15
+    disjoint_base = typing.disjoint_base
+else:
+    def disjoint_base(cls):
+        """This decorator marks a class as a disjoint base.
+
+        Child classes of a disjoint base cannot inherit from other disjoint bases that are
+        not parent classes of the disjoint base.
+
+        For example:
+
+            @disjoint_base
+            class Disjoint1: pass
+
+            @disjoint_base
+            class Disjoint2: pass
+
+            class Disjoint3(Disjoint1, Disjoint2): pass  # Type checker error
+
+        Type checkers can use knowledge of disjoint bases to detect unreachable code
+        and determine when two types can overlap.
+
+        See PEP 800."""
+        cls.__disjoint_base__ = True
+        return cls
+
+
 def IntVar(name):
     return typing.TypeVar(name)
 
 
 # A Literal bug was fixed in 3.11.0, 3.10.1 and 3.9.8
+# Breakpoint: https://github.com/python/cpython/pull/29334
 if sys.version_info >= (3, 10, 1):
     Literal = typing.Literal
 else:
@@ -417,34 +515,21 @@ def clear_overloads():
 TYPE_CHECKING = typing.TYPE_CHECKING
 
 
+# Breakpoint: https://github.com/python/cpython/pull/118681
 if sys.version_info >= (3, 13, 0, "beta"):
     from typing import AsyncContextManager, AsyncGenerator, ContextManager, Generator
 else:
     def _is_dunder(attr):
         return attr.startswith('__') and attr.endswith('__')
 
-    # Python <3.9 doesn't have typing._SpecialGenericAlias
-    _special_generic_alias_base = getattr(
-        typing, "_SpecialGenericAlias", typing._GenericAlias
-    )
 
-    class _SpecialGenericAlias(_special_generic_alias_base, _root=True):
+    class _SpecialGenericAlias(typing._SpecialGenericAlias, _root=True):
         def __init__(self, origin, nparams, *, inst=True, name=None, defaults=()):
-            if _special_generic_alias_base is typing._GenericAlias:
-                # Python <3.9
-                self.__origin__ = origin
-                self._nparams = nparams
-                super().__init__(origin, nparams, special=True, inst=inst, name=name)
-            else:
-                # Python >= 3.9
-                super().__init__(origin, nparams, inst=inst, name=name)
+            super().__init__(origin, nparams, inst=inst, name=name)
             self._defaults = defaults
 
         def __setattr__(self, attr, val):
             allowed_attrs = {'_name', '_inst', '_nparams', '_defaults'}
-            if _special_generic_alias_base is typing._GenericAlias:
-                # Python <3.9
-                allowed_attrs.add("__origin__")
             if _is_dunder(attr) or attr in allowed_attrs:
                 object.__setattr__(self, attr, val)
             else:
@@ -527,19 +612,25 @@ def _get_protocol_attrs(cls):
     return attrs
 
 
-def _caller(depth=2):
+def _caller(depth=1, default='__main__'):
+    try:
+        return sys._getframemodulename(depth + 1) or default
+    except AttributeError:  # For platforms without _getframemodulename()
+        pass
     try:
-        return sys._getframe(depth).f_globals.get('__name__', '__main__')
+        return sys._getframe(depth + 1).f_globals.get('__name__', default)
     except (AttributeError, ValueError):  # For platforms without _getframe()
-        return None
+        pass
+    return None
 
 
 # `__match_args__` attribute was removed from protocol members in 3.13,
 # we want to backport this change to older Python versions.
+# Breakpoint: https://github.com/python/cpython/pull/110683
 if sys.version_info >= (3, 13):
     Protocol = typing.Protocol
 else:
-    def _allow_reckless_class_checks(depth=3):
+    def _allow_reckless_class_checks(depth=2):
         """Allow instance and class checks for special stdlib modules.
         The abc and functools modules indiscriminately call isinstance() and
         issubclass() on the whole MRO of a user class, which may contain protocols.
@@ -574,7 +665,7 @@ class _ProtocolMeta(type(typing.Protocol)):
         # but is necessary for several reasons...
         #
         # NOTE: DO NOT call super() in any methods in this class
-        # That would call the methods on typing._ProtocolMeta on Python 3.8-3.11
+        # That would call the methods on typing._ProtocolMeta on Python <=3.11
         # and those are slow
         def __new__(mcls, name, bases, namespace, **kwargs):
             if name == "Protocol" and len(bases) < 2:
@@ -716,6 +807,7 @@ def __init_subclass__(cls, *args, **kwargs):
                 cls.__init__ = _no_init
 
 
+# Breakpoint: https://github.com/python/cpython/pull/113401
 if sys.version_info >= (3, 13):
     runtime_checkable = typing.runtime_checkable
 else:
@@ -775,7 +867,8 @@ def close(self): ...
 runtime = runtime_checkable
 
 
-# Our version of runtime-checkable protocols is faster on Python 3.8-3.11
+# Our version of runtime-checkable protocols is faster on Python <=3.11
+# Breakpoint: https://github.com/python/cpython/pull/112717
 if sys.version_info >= (3, 12):
     SupportsInt = typing.SupportsInt
     SupportsFloat = typing.SupportsFloat
@@ -852,19 +945,96 @@ def __round__(self, ndigits: int = 0) -> T_co:
             pass
 
 
-def _ensure_subclassable(mro_entries):
-    def inner(func):
-        if sys.implementation.name == "pypy" and sys.version_info < (3, 9):
-            cls_dict = {
-                "__call__": staticmethod(func),
-                "__mro_entries__": staticmethod(mro_entries)
-            }
-            t = type(func.__name__, (), cls_dict)
-            return functools.update_wrapper(t(), func)
-        else:
-            func.__mro_entries__ = mro_entries
-            return func
-    return inner
+if hasattr(io, "Reader") and hasattr(io, "Writer"):
+    Reader = io.Reader
+    Writer = io.Writer
+else:
+    @runtime_checkable
+    class Reader(Protocol[T_co]):
+        """Protocol for simple I/O reader instances.
+
+        This protocol only supports blocking I/O.
+        """
+
+        __slots__ = ()
+
+        @abc.abstractmethod
+        def read(self, size: int = ..., /) -> T_co:
+            """Read data from the input stream and return it.
+
+            If *size* is specified, at most *size* items (bytes/characters) will be
+            read.
+            """
+
+    @runtime_checkable
+    class Writer(Protocol[T_contra]):
+        """Protocol for simple I/O writer instances.
+
+        This protocol only supports blocking I/O.
+        """
+
+        __slots__ = ()
+
+        @abc.abstractmethod
+        def write(self, data: T_contra, /) -> int:
+            """Write *data* to the output stream and return the number of items written."""  # noqa: E501
+
+
+_NEEDS_SINGLETONMETA = (
+    not hasattr(typing, "NoDefault") or not hasattr(typing, "NoExtraItems")
+)
+
+if _NEEDS_SINGLETONMETA:
+    class SingletonMeta(type):
+        def __setattr__(cls, attr, value):
+            # TypeError is consistent with the behavior of NoneType
+            raise TypeError(
+                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
+            )
+
+
+if hasattr(typing, "NoDefault"):
+    NoDefault = typing.NoDefault
+else:
+    class NoDefaultType(metaclass=SingletonMeta):
+        """The type of the NoDefault singleton."""
+
+        __slots__ = ()
+
+        def __new__(cls):
+            return globals().get("NoDefault") or object.__new__(cls)
+
+        def __repr__(self):
+            return "typing_extensions.NoDefault"
+
+        def __reduce__(self):
+            return "NoDefault"
+
+    NoDefault = NoDefaultType()
+    del NoDefaultType
+
+if hasattr(typing, "NoExtraItems"):
+    NoExtraItems = typing.NoExtraItems
+else:
+    class NoExtraItemsType(metaclass=SingletonMeta):
+        """The type of the NoExtraItems singleton."""
+
+        __slots__ = ()
+
+        def __new__(cls):
+            return globals().get("NoExtraItems") or object.__new__(cls)
+
+        def __repr__(self):
+            return "typing_extensions.NoExtraItems"
+
+        def __reduce__(self):
+            return "NoExtraItems"
+
+    NoExtraItems = NoExtraItemsType()
+    del NoExtraItemsType
+
+if _NEEDS_SINGLETONMETA:
+    del SingletonMeta
 
 
 # Update this to something like >=3.13.0b1 if and when
@@ -872,8 +1042,6 @@ def inner(func):
 _PEP_728_IMPLEMENTED = False
 
 if _PEP_728_IMPLEMENTED:
-    # The standard library TypedDict in Python 3.8 does not store runtime information
-    # about which (if any) keys are optional.  See https://bugs.python.org/issue38834
     # The standard library TypedDict in Python 3.9.0/1 does not honour the "total"
     # keyword with old-style TypedDict().  See https://bugs.python.org/issue42059
     # The standard library TypedDict below Python 3.11 does not store runtime
@@ -913,7 +1081,9 @@ def _get_typeddict_qualifiers(annotation_type):
                 break
 
     class _TypedDictMeta(type):
-        def __new__(cls, name, bases, ns, *, total=True, closed=False):
+
+        def __new__(cls, name, bases, ns, *, total=True, closed=None,
+                    extra_items=NoExtraItems):
             """Create new typed dict class object.
 
             This method is called when TypedDict is subclassed,
@@ -925,12 +1095,16 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                 if type(base) is not _TypedDictMeta and base is not typing.Generic:
                     raise TypeError('cannot inherit from both a TypedDict type '
                                     'and a non-TypedDict base class')
+            if closed is not None and extra_items is not NoExtraItems:
+                raise TypeError(f"Cannot combine closed={closed!r} and extra_items")
 
             if any(issubclass(b, typing.Generic) for b in bases):
                 generic_base = (typing.Generic,)
             else:
                 generic_base = ()
 
+            ns_annotations = ns.pop('__annotations__', None)
+
             # typing.py generally doesn't let you inherit from plain Generic, unless
             # the name of the class happens to be "Protocol"
             tp_dict = type.__new__(_TypedDictMeta, "Protocol", (*generic_base, dict), ns)
@@ -942,21 +1116,31 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                 tp_dict.__orig_bases__ = bases
 
             annotations = {}
-            if "__annotations__" in ns:
-                own_annotations = ns["__annotations__"]
-            elif "__annotate__" in ns:
-                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
-                own_annotations = ns["__annotate__"](1)
+            own_annotate = None
+            if ns_annotations is not None:
+                own_annotations = ns_annotations
+            elif sys.version_info >= (3, 14):
+                if hasattr(annotationlib, "get_annotate_from_class_namespace"):
+                    own_annotate = annotationlib.get_annotate_from_class_namespace(ns)
+                else:
+                    # 3.14.0a7 and earlier
+                    own_annotate = ns.get("__annotate__")
+                if own_annotate is not None:
+                    own_annotations = annotationlib.call_annotate_function(
+                        own_annotate, Format.FORWARDREF, owner=tp_dict
+                    )
+                else:
+                    own_annotations = {}
             else:
                 own_annotations = {}
             msg = "TypedDict('Name', {f0: t0, f1: t1, ...}); each t must be a type"
             if _TAKES_MODULE:
-                own_annotations = {
+                own_checked_annotations = {
                     n: typing._type_check(tp, msg, module=tp_dict.__module__)
                     for n, tp in own_annotations.items()
                 }
             else:
-                own_annotations = {
+                own_checked_annotations = {
                     n: typing._type_check(tp, msg)
                     for n, tp in own_annotations.items()
                 }
@@ -964,24 +1148,24 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
             optional_keys = set()
             readonly_keys = set()
             mutable_keys = set()
-            extra_items_type = None
+            extra_items_type = extra_items
 
             for base in bases:
                 base_dict = base.__dict__
 
-                annotations.update(base_dict.get('__annotations__', {}))
+                if sys.version_info <= (3, 14):
+                    annotations.update(base_dict.get('__annotations__', {}))
                 required_keys.update(base_dict.get('__required_keys__', ()))
                 optional_keys.update(base_dict.get('__optional_keys__', ()))
                 readonly_keys.update(base_dict.get('__readonly_keys__', ()))
                 mutable_keys.update(base_dict.get('__mutable_keys__', ()))
-                base_extra_items_type = base_dict.get('__extra_items__', None)
-                if base_extra_items_type is not None:
-                    extra_items_type = base_extra_items_type
-
-            if closed and extra_items_type is None:
-                extra_items_type = Never
-            if closed and "__extra_items__" in own_annotations:
-                annotation_type = own_annotations.pop("__extra_items__")
+
+            # This was specified in an earlier version of PEP 728. Support
+            # is retained for backwards compatibility, but only for Python
+            # 3.13 and lower.
+            if (closed and sys.version_info < (3, 14)
+                       and "__extra_items__" in own_checked_annotations):
+                annotation_type = own_checked_annotations.pop("__extra_items__")
                 qualifiers = set(_get_typeddict_qualifiers(annotation_type))
                 if Required in qualifiers:
                     raise TypeError(
@@ -995,8 +1179,8 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                     )
                 extra_items_type = annotation_type
 
-            annotations.update(own_annotations)
-            for annotation_key, annotation_type in own_annotations.items():
+            annotations.update(own_checked_annotations)
+            for annotation_key, annotation_type in own_checked_annotations.items():
                 qualifiers = set(_get_typeddict_qualifiers(annotation_type))
 
                 if Required in qualifiers:
@@ -1014,13 +1198,44 @@ def __new__(cls, name, bases, ns, *, total=True, closed=False):
                     mutable_keys.add(annotation_key)
                     readonly_keys.discard(annotation_key)
 
-            tp_dict.__annotations__ = annotations
+            # Breakpoint: https://github.com/python/cpython/pull/119891
+            if sys.version_info >= (3, 14):
+                def __annotate__(format):
+                    annos = {}
+                    for base in bases:
+                        if base is Generic:
+                            continue
+                        base_annotate = base.__annotate__
+                        if base_annotate is None:
+                            continue
+                        base_annos = annotationlib.call_annotate_function(
+                            base_annotate, format, owner=base)
+                        annos.update(base_annos)
+                    if own_annotate is not None:
+                        own = annotationlib.call_annotate_function(
+                            own_annotate, format, owner=tp_dict)
+                        if format != Format.STRING:
+                            own = {
+                                n: typing._type_check(tp, msg, module=tp_dict.__module__)
+                                for n, tp in own.items()
+                            }
+                    elif format == Format.STRING:
+                        own = annotationlib.annotations_to_string(own_annotations)
+                    elif format in (Format.FORWARDREF, Format.VALUE):
+                        own = own_checked_annotations
+                    else:
+                        raise NotImplementedError(format)
+                    annos.update(own)
+                    return annos
+
+                tp_dict.__annotate__ = __annotate__
+            else:
+                tp_dict.__annotations__ = annotations
             tp_dict.__required_keys__ = frozenset(required_keys)
             tp_dict.__optional_keys__ = frozenset(optional_keys)
             tp_dict.__readonly_keys__ = frozenset(readonly_keys)
             tp_dict.__mutable_keys__ = frozenset(mutable_keys)
-            if not hasattr(tp_dict, '__total__'):
-                tp_dict.__total__ = total
+            tp_dict.__total__ = total
             tp_dict.__closed__ = closed
             tp_dict.__extra_items__ = extra_items_type
             return tp_dict
@@ -1035,8 +1250,95 @@ def __subclasscheck__(cls, other):
 
     _TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
 
-    @_ensure_subclassable(lambda bases: (_TypedDict,))
-    def TypedDict(typename, fields=_marker, /, *, total=True, closed=False, **kwargs):
+    def _create_typeddict(
+        typename,
+        fields,
+        /,
+        *,
+        typing_is_inline,
+        total,
+        closed,
+        extra_items,
+        **kwargs,
+    ):
+        if fields is _marker or fields is None:
+            if fields is _marker:
+                deprecated_thing = (
+                    "Failing to pass a value for the 'fields' parameter"
+                )
+            else:
+                deprecated_thing = "Passing `None` as the 'fields' parameter"
+
+            example = f"`{typename} = TypedDict({typename!r}, {{}})`"
+            deprecation_msg = (
+                f"{deprecated_thing} is deprecated and will be disallowed in "
+                "Python 3.15. To create a TypedDict class with 0 fields "
+                "using the functional syntax, pass an empty dictionary, e.g. "
+            ) + example + "."
+            warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
+            # Support a field called "closed"
+            if closed is not False and closed is not True and closed is not None:
+                kwargs["closed"] = closed
+                closed = None
+            # Or "extra_items"
+            if extra_items is not NoExtraItems:
+                kwargs["extra_items"] = extra_items
+                extra_items = NoExtraItems
+            fields = kwargs
+        elif kwargs:
+            raise TypeError("TypedDict takes either a dict or keyword arguments,"
+                            " but not both")
+        if kwargs:
+            # Breakpoint: https://github.com/python/cpython/pull/104891
+            if sys.version_info >= (3, 13):
+                raise TypeError("TypedDict takes no keyword arguments")
+            warnings.warn(
+                "The kwargs-based syntax for TypedDict definitions is deprecated "
+                "in Python 3.11, will be removed in Python 3.13, and may not be "
+                "understood by third-party type checkers.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+
+        ns = {'__annotations__': dict(fields)}
+        module = _caller(depth=4 if typing_is_inline else 2)
+        if module is not None:
+            # Setting correct module is necessary to make typed dict classes
+            # pickleable.
+            ns['__module__'] = module
+
+        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed,
+                            extra_items=extra_items)
+        td.__orig_bases__ = (TypedDict,)
+        return td
+
+    class _TypedDictSpecialForm(_SpecialForm, _root=True):
+        def __call__(
+            self,
+            typename,
+            fields=_marker,
+            /,
+            *,
+            total=True,
+            closed=None,
+            extra_items=NoExtraItems,
+            **kwargs
+        ):
+            return _create_typeddict(
+                typename,
+                fields,
+                typing_is_inline=False,
+                total=total,
+                closed=closed,
+                extra_items=extra_items,
+                **kwargs,
+            )
+
+        def __mro_entries__(self, bases):
+            return (_TypedDict,)
+
+    @_TypedDictSpecialForm
+    def TypedDict(self, args):
         """A simple typed namespace. At runtime it is equivalent to a plain dict.
 
         TypedDict creates a dictionary type such that a type checker will expect all
@@ -1083,51 +1385,22 @@ class Point2D(TypedDict):
 
         See PEP 655 for more details on Required and NotRequired.
         """
-        if fields is _marker or fields is None:
-            if fields is _marker:
-                deprecated_thing = "Failing to pass a value for the 'fields' parameter"
-            else:
-                deprecated_thing = "Passing `None` as the 'fields' parameter"
-
-            example = f"`{typename} = TypedDict({typename!r}, {{}})`"
-            deprecation_msg = (
-                f"{deprecated_thing} is deprecated and will be disallowed in "
-                "Python 3.15. To create a TypedDict class with 0 fields "
-                "using the functional syntax, pass an empty dictionary, e.g. "
-            ) + example + "."
-            warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
-            if closed is not False and closed is not True:
-                kwargs["closed"] = closed
-                closed = False
-            fields = kwargs
-        elif kwargs:
-            raise TypeError("TypedDict takes either a dict or keyword arguments,"
-                            " but not both")
-        if kwargs:
-            if sys.version_info >= (3, 13):
-                raise TypeError("TypedDict takes no keyword arguments")
-            warnings.warn(
-                "The kwargs-based syntax for TypedDict definitions is deprecated "
-                "in Python 3.11, will be removed in Python 3.13, and may not be "
-                "understood by third-party type checkers.",
-                DeprecationWarning,
-                stacklevel=2,
+        # This runs when creating inline TypedDicts:
+        if not isinstance(args, dict):
+            raise TypeError(
+                "TypedDict[...] should be used with a single dict argument"
             )
 
-        ns = {'__annotations__': dict(fields)}
-        module = _caller()
-        if module is not None:
-            # Setting correct module is necessary to make typed dict classes pickleable.
-            ns['__module__'] = module
-
-        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed)
-        td.__orig_bases__ = (TypedDict,)
-        return td
+        return _create_typeddict(
+            "<inline TypedDict>",
+            args,
+            typing_is_inline=True,
+            total=True,
+            closed=True,
+            extra_items=NoExtraItems,
+        )
 
-    if hasattr(typing, "_TypedDictMeta"):
-        _TYPEDDICT_TYPES = (typing._TypedDictMeta, _TypedDictMeta)
-    else:
-        _TYPEDDICT_TYPES = (_TypedDictMeta,)
+    _TYPEDDICT_TYPES = (typing._TypedDictMeta, _TypedDictMeta)
 
     def is_typeddict(tp):
         """Check if an annotation is a TypedDict class
@@ -1140,9 +1413,6 @@ class Film(TypedDict):
             is_typeddict(Film)  # => True
             is_typeddict(Union[list, str])  # => False
         """
-        # On 3.8, this would otherwise return True
-        if hasattr(typing, "TypedDict") and tp is typing.TypedDict:
-            return False
         return isinstance(tp, _TYPEDDICT_TYPES)
 
 
@@ -1172,7 +1442,7 @@ def greet(name: str) -> None:
     # replaces _strip_annotations()
     def _strip_extras(t):
         """Strips Annotated, Required and NotRequired from a given type."""
-        if isinstance(t, _AnnotatedAlias):
+        if isinstance(t, typing._AnnotatedAlias):
             return _strip_extras(t.__origin__)
         if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired, ReadOnly):
             return _strip_extras(t.__args__[0])
@@ -1226,141 +1496,88 @@ def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
         - If two dict arguments are passed, they specify globals and
           locals, respectively.
         """
-        if hasattr(typing, "Annotated"):  # 3.9+
-            hint = typing.get_type_hints(
-                obj, globalns=globalns, localns=localns, include_extras=True
-            )
-        else:  # 3.8
-            hint = typing.get_type_hints(obj, globalns=globalns, localns=localns)
+        hint = typing.get_type_hints(
+            obj, globalns=globalns, localns=localns, include_extras=True
+        )
+        # Breakpoint: https://github.com/python/cpython/pull/30304
+        if sys.version_info < (3, 11):
+            _clean_optional(obj, hint, globalns, localns)
         if include_extras:
             return hint
         return {k: _strip_extras(t) for k, t in hint.items()}
 
+    _NoneType = type(None)
 
-# Python 3.9+ has PEP 593 (Annotated)
-if hasattr(typing, 'Annotated'):
-    Annotated = typing.Annotated
-    # Not exported and not a public API, but needed for get_origin() and get_args()
-    # to work.
-    _AnnotatedAlias = typing._AnnotatedAlias
-# 3.8
-else:
-    class _AnnotatedAlias(typing._GenericAlias, _root=True):
-        """Runtime representation of an annotated type.
-
-        At its core 'Annotated[t, dec1, dec2, ...]' is an alias for the type 't'
-        with extra annotations. The alias behaves like a normal typing alias,
-        instantiating is the same as instantiating the underlying type, binding
-        it to types is also the same.
-        """
-        def __init__(self, origin, metadata):
-            if isinstance(origin, _AnnotatedAlias):
-                metadata = origin.__metadata__ + metadata
-                origin = origin.__origin__
-            super().__init__(origin, origin)
-            self.__metadata__ = metadata
-
-        def copy_with(self, params):
-            assert len(params) == 1
-            new_type = params[0]
-            return _AnnotatedAlias(new_type, self.__metadata__)
-
-        def __repr__(self):
-            return (f"typing_extensions.Annotated[{typing._type_repr(self.__origin__)}, "
-                    f"{', '.join(repr(a) for a in self.__metadata__)}]")
-
-        def __reduce__(self):
-            return operator.getitem, (
-                Annotated, (self.__origin__, *self.__metadata__)
-            )
-
-        def __eq__(self, other):
-            if not isinstance(other, _AnnotatedAlias):
-                return NotImplemented
-            if self.__origin__ != other.__origin__:
-                return False
-            return self.__metadata__ == other.__metadata__
-
-        def __hash__(self):
-            return hash((self.__origin__, self.__metadata__))
-
-    class Annotated:
-        """Add context specific metadata to a type.
-
-        Example: Annotated[int, runtime_check.Unsigned] indicates to the
-        hypothetical runtime_check module that this type is an unsigned int.
-        Every other consumer of this type can ignore this metadata and treat
-        this type as int.
-
-        The first argument to Annotated must be a valid type (and will be in
-        the __origin__ field), the remaining arguments are kept as a tuple in
-        the __extra__ field.
-
-        Details:
-
-        - It's an error to call `Annotated` with less than two arguments.
-        - Nested Annotated are flattened::
-
-            Annotated[Annotated[T, Ann1, Ann2], Ann3] == Annotated[T, Ann1, Ann2, Ann3]
-
-        - Instantiating an annotated type is equivalent to instantiating the
-        underlying type::
-
-            Annotated[C, Ann1](5) == C(5)
-
-        - Annotated can be used as a generic type alias::
-
-            Optimized = Annotated[T, runtime.Optimize()]
-            Optimized[int] == Annotated[int, runtime.Optimize()]
-
-            OptimizedList = Annotated[List[T], runtime.Optimize()]
-            OptimizedList[int] == Annotated[List[int], runtime.Optimize()]
-        """
-
-        __slots__ = ()
-
-        def __new__(cls, *args, **kwargs):
-            raise TypeError("Type Annotated cannot be instantiated.")
-
-        @typing._tp_cache
-        def __class_getitem__(cls, params):
-            if not isinstance(params, tuple) or len(params) < 2:
-                raise TypeError("Annotated[...] should be used "
-                                "with at least two arguments (a type and an "
-                                "annotation).")
-            allowed_special_forms = (ClassVar, Final)
-            if get_origin(params[0]) in allowed_special_forms:
-                origin = params[0]
-            else:
-                msg = "Annotated[t, ...]: t must be a type."
-                origin = typing._type_check(params[0], msg)
-            metadata = tuple(params[1:])
-            return _AnnotatedAlias(origin, metadata)
+    def _could_be_inserted_optional(t):
+        """detects Union[..., None] pattern"""
+        if not isinstance(t, typing._UnionGenericAlias):
+            return False
+        # Assume if last argument is not None they are user defined
+        if t.__args__[-1] is not _NoneType:
+            return False
+        return True
 
-        def __init_subclass__(cls, *args, **kwargs):
-            raise TypeError(
-                f"Cannot subclass {cls.__module__}.Annotated"
-            )
+    # < 3.11
+    def _clean_optional(obj, hints, globalns=None, localns=None):
+        # reverts injected Union[..., None] cases from typing.get_type_hints
+        # when a None default value is used.
+        # see https://github.com/python/typing_extensions/issues/310
+        if not hints or isinstance(obj, type):
+            return
+        defaults = typing._get_defaults(obj)  # avoid accessing __annotations___
+        if not defaults:
+            return
+        original_hints = obj.__annotations__
+        for name, value in hints.items():
+            # Not a Union[..., None] or replacement conditions not fullfilled
+            if (not _could_be_inserted_optional(value)
+                or name not in defaults
+                or defaults[name] is not None
+            ):
+                continue
+            original_value = original_hints[name]
+            # value=NoneType should have caused a skip above but check for safety
+            if original_value is None:
+                original_value = _NoneType
+            # Forward reference
+            if isinstance(original_value, str):
+                if globalns is None:
+                    if isinstance(obj, _types.ModuleType):
+                        globalns = obj.__dict__
+                    else:
+                        nsobj = obj
+                        # Find globalns for the unwrapped object.
+                        while hasattr(nsobj, '__wrapped__'):
+                            nsobj = nsobj.__wrapped__
+                        globalns = getattr(nsobj, '__globals__', {})
+                    if localns is None:
+                        localns = globalns
+                elif localns is None:
+                    localns = globalns
+
+                original_value = ForwardRef(
+                    original_value,
+                    is_argument=not isinstance(obj, _types.ModuleType)
+                )
+            original_evaluated = typing._eval_type(original_value, globalns, localns)
+            # Compare if values differ. Note that even if equal
+            # value might be cached by typing._tp_cache contrary to original_evaluated
+            if original_evaluated != value or (
+                # 3.10: ForwardRefs of UnionType might be turned into _UnionGenericAlias
+                hasattr(_types, "UnionType")
+                and isinstance(original_evaluated, _types.UnionType)
+                and not isinstance(value, _types.UnionType)
+            ):
+                hints[name] = original_evaluated
 
-# Python 3.8 has get_origin() and get_args() but those implementations aren't
-# Annotated-aware, so we can't use those. Python 3.9's versions don't support
+# Python 3.9 has get_origin() and get_args() but those implementations don't support
 # ParamSpecArgs and ParamSpecKwargs, so only Python 3.10's versions will do.
-if sys.version_info[:2] >= (3, 10):
+# Breakpoint: https://github.com/python/cpython/pull/25298
+if sys.version_info >= (3, 10):
     get_origin = typing.get_origin
     get_args = typing.get_args
-# 3.8-3.9
+# 3.9
 else:
-    try:
-        # 3.9+
-        from typing import _BaseGenericAlias
-    except ImportError:
-        _BaseGenericAlias = typing._GenericAlias
-    try:
-        # 3.9+
-        from typing import GenericAlias as _typing_GenericAlias
-    except ImportError:
-        _typing_GenericAlias = typing._GenericAlias
-
     def get_origin(tp):
         """Get the unsubscripted version of a type.
 
@@ -1376,9 +1593,9 @@ def get_origin(tp):
             get_origin(List[Tuple[T, T]][int]) == list
             get_origin(P.args) is P
         """
-        if isinstance(tp, _AnnotatedAlias):
+        if isinstance(tp, typing._AnnotatedAlias):
             return Annotated
-        if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias, _BaseGenericAlias,
+        if isinstance(tp, (typing._BaseGenericAlias, _types.GenericAlias,
                            ParamSpecArgs, ParamSpecKwargs)):
             return tp.__origin__
         if tp is typing.Generic:
@@ -1396,11 +1613,9 @@ def get_args(tp):
             get_args(Union[int, Tuple[T, int]][str]) == (int, Tuple[str, int])
             get_args(Callable[[], T][int]) == ([], int)
         """
-        if isinstance(tp, _AnnotatedAlias):
+        if isinstance(tp, typing._AnnotatedAlias):
             return (tp.__origin__, *tp.__metadata__)
-        if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias)):
-            if getattr(tp, "_special", False):
-                return ()
+        if isinstance(tp, (typing._GenericAlias, _types.GenericAlias)):
             res = tp.__args__
             if get_origin(tp) is collections.abc.Callable and res[0] is not Ellipsis:
                 res = (list(res[:-1]), res[-1])
@@ -1412,7 +1627,7 @@ def get_args(tp):
 if hasattr(typing, 'TypeAlias'):
     TypeAlias = typing.TypeAlias
 # 3.9
-elif sys.version_info[:2] >= (3, 9):
+else:
     @_ExtensionsSpecialForm
     def TypeAlias(self, parameters):
         """Special marker indicating that an assignment should
@@ -1426,49 +1641,6 @@ def TypeAlias(self, parameters):
         It's invalid when used anywhere except as in the example above.
         """
         raise TypeError(f"{self} is not subscriptable")
-# 3.8
-else:
-    TypeAlias = _ExtensionsSpecialForm(
-        'TypeAlias',
-        doc="""Special marker indicating that an assignment should
-        be recognized as a proper type alias definition by type
-        checkers.
-
-        For example::
-
-            Predicate: TypeAlias = Callable[..., bool]
-
-        It's invalid when used anywhere except as in the example
-        above."""
-    )
-
-
-if hasattr(typing, "NoDefault"):
-    NoDefault = typing.NoDefault
-else:
-    class NoDefaultTypeMeta(type):
-        def __setattr__(cls, attr, value):
-            # TypeError is consistent with the behavior of NoneType
-            raise TypeError(
-                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
-            )
-
-    class NoDefaultType(metaclass=NoDefaultTypeMeta):
-        """The type of the NoDefault singleton."""
-
-        __slots__ = ()
-
-        def __new__(cls):
-            return globals().get("NoDefault") or object.__new__(cls)
-
-        def __repr__(self):
-            return "typing_extensions.NoDefault"
-
-        def __reduce__(self):
-            return "NoDefault"
-
-    NoDefault = NoDefaultType()
-    del NoDefaultType, NoDefaultTypeMeta
 
 
 def _set_default(type_param, default):
@@ -1478,7 +1650,7 @@ def _set_default(type_param, default):
 
 def _set_module(typevarlike):
     # for pickling:
-    def_mod = _caller(depth=3)
+    def_mod = _caller(depth=2)
     if def_mod != 'typing_extensions':
         typevarlike.__module__ = def_mod
 
@@ -1542,7 +1714,7 @@ def __init_subclass__(cls) -> None:
 if hasattr(typing, 'ParamSpecArgs'):
     ParamSpecArgs = typing.ParamSpecArgs
     ParamSpecKwargs = typing.ParamSpecKwargs
-# 3.8-3.9
+# 3.9
 else:
     class _Immutable:
         """Mixin to indicate that object should not be copied."""
@@ -1653,7 +1825,7 @@ def _paramspec_prepare_subst(alias, args):
         def __init_subclass__(cls) -> None:
             raise TypeError(f"type '{__name__}.ParamSpec' is not an acceptable base type")
 
-# 3.8-3.9
+# 3.9
 else:
 
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
@@ -1758,17 +1930,31 @@ def __call__(self, *args, **kwargs):
             pass
 
 
-# 3.8-3.9
+# 3.9
 if not hasattr(typing, 'Concatenate'):
     # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
+
+    # 3.9.0-1
+    if not hasattr(typing, '_type_convert'):
+        def _type_convert(arg, module=None, *, allow_special_forms=False):
+            """For converting None to type(None), and strings to ForwardRef."""
+            if arg is None:
+                return type(None)
+            if isinstance(arg, str):
+                if sys.version_info <= (3, 9, 6):
+                    return ForwardRef(arg)
+                if sys.version_info <= (3, 9, 7):
+                    return ForwardRef(arg, module=module)
+                return ForwardRef(arg, module=module, is_class=allow_special_forms)
+            return arg
+    else:
+        _type_convert = typing._type_convert
+
     class _ConcatenateGenericAlias(list):
 
         # Trick Generic into looking into this for __parameters__.
         __class__ = typing._GenericAlias
 
-        # Flag in 3.8.
-        _special = False
-
         def __init__(self, origin, args):
             super().__init__(args)
             self.__origin__ = origin
@@ -1792,122 +1978,195 @@ def __parameters__(self):
                 tp for tp in self.__args__ if isinstance(tp, (typing.TypeVar, ParamSpec))
             )
 
+        # 3.9 used by __getitem__ below
+        def copy_with(self, params):
+            if isinstance(params[-1], _ConcatenateGenericAlias):
+                params = (*params[:-1], *params[-1].__args__)
+            elif isinstance(params[-1], (list, tuple)):
+                return (*params[:-1], *params[-1])
+            elif (not (params[-1] is ... or isinstance(params[-1], ParamSpec))):
+                raise TypeError("The last parameter to Concatenate should be a "
+                        "ParamSpec variable or ellipsis.")
+            return self.__class__(self.__origin__, params)
+
+        # 3.9; accessed during GenericAlias.__getitem__ when substituting
+        def __getitem__(self, args):
+            if self.__origin__ in (Generic, Protocol):
+                # Can't subscript Generic[...] or Protocol[...].
+                raise TypeError(f"Cannot subscript already-subscripted {self}")
+            if not self.__parameters__:
+                raise TypeError(f"{self} is not a generic class")
+
+            if not isinstance(args, tuple):
+                args = (args,)
+            args = _unpack_args(*(_type_convert(p) for p in args))
+            params = self.__parameters__
+            for param in params:
+                prepare = getattr(param, "__typing_prepare_subst__", None)
+                if prepare is not None:
+                    args = prepare(self, args)
+                # 3.9 & typing.ParamSpec
+                elif isinstance(param, ParamSpec):
+                    i = params.index(param)
+                    if (
+                        i == len(args)
+                        and getattr(param, '__default__', NoDefault) is not NoDefault
+                    ):
+                        args = [*args, param.__default__]
+                    if i >= len(args):
+                        raise TypeError(f"Too few arguments for {self}")
+                    # Special case for Z[[int, str, bool]] == Z[int, str, bool]
+                    if len(params) == 1 and not _is_param_expr(args[0]):
+                        assert i == 0
+                        args = (args,)
+                    elif (
+                        isinstance(args[i], list)
+                        # 3.9
+                        # This class inherits from list do not convert
+                        and not isinstance(args[i], _ConcatenateGenericAlias)
+                    ):
+                        args = (*args[:i], tuple(args[i]), *args[i + 1:])
+
+            alen = len(args)
+            plen = len(params)
+            if alen != plen:
+                raise TypeError(
+                    f"Too {'many' if alen > plen else 'few'} arguments for {self};"
+                    f" actual {alen}, expected {plen}"
+                )
+
+            subst = dict(zip(self.__parameters__, args))
+            # determine new args
+            new_args = []
+            for arg in self.__args__:
+                if isinstance(arg, type):
+                    new_args.append(arg)
+                    continue
+                if isinstance(arg, TypeVar):
+                    arg = subst[arg]
+                    if (
+                        (isinstance(arg, typing._GenericAlias) and _is_unpack(arg))
+                        or (
+                            hasattr(_types, "GenericAlias")
+                            and isinstance(arg, _types.GenericAlias)
+                            and getattr(arg, "__unpacked__", False)
+                        )
+                    ):
+                        raise TypeError(f"{arg} is not valid as type argument")
+
+                elif isinstance(arg,
+                    typing._GenericAlias
+                    if not hasattr(_types, "GenericAlias") else
+                    (typing._GenericAlias, _types.GenericAlias)
+                ):
+                    subparams = arg.__parameters__
+                    if subparams:
+                        subargs = tuple(subst[x] for x in subparams)
+                        arg = arg[subargs]
+                new_args.append(arg)
+            return self.copy_with(tuple(new_args))
 
-# 3.8-3.9
+# 3.10+
+else:
+    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
+
+    # 3.10
+    if sys.version_info < (3, 11):
+
+        class _ConcatenateGenericAlias(typing._ConcatenateGenericAlias, _root=True):
+            # needed for checks in collections.abc.Callable to accept this class
+            __module__ = "typing"
+
+            def copy_with(self, params):
+                if isinstance(params[-1], (list, tuple)):
+                    return (*params[:-1], *params[-1])
+                if isinstance(params[-1], typing._ConcatenateGenericAlias):
+                    params = (*params[:-1], *params[-1].__args__)
+                elif not (params[-1] is ... or isinstance(params[-1], ParamSpec)):
+                    raise TypeError("The last parameter to Concatenate should be a "
+                            "ParamSpec variable or ellipsis.")
+                return super(typing._ConcatenateGenericAlias, self).copy_with(params)
+
+            def __getitem__(self, args):
+                value = super().__getitem__(args)
+                if isinstance(value, tuple) and any(_is_unpack(t) for t in value):
+                    return tuple(_unpack_args(*(n for n in value)))
+                return value
+
+
+# 3.9.2
+class _EllipsisDummy: ...
+
+
+# <=3.10
+def _create_concatenate_alias(origin, parameters):
+    if parameters[-1] is ... and sys.version_info < (3, 9, 2):
+        # Hack: Arguments must be types, replace it with one.
+        parameters = (*parameters[:-1], _EllipsisDummy)
+    if sys.version_info >= (3, 10, 3):
+        concatenate = _ConcatenateGenericAlias(origin, parameters,
+                                        _typevar_types=(TypeVar, ParamSpec),
+                                        _paramspec_tvars=True)
+    else:
+        concatenate = _ConcatenateGenericAlias(origin, parameters)
+    if parameters[-1] is not _EllipsisDummy:
+        return concatenate
+    # Remove dummy again
+    concatenate.__args__ = tuple(p if p is not _EllipsisDummy else ...
+                                    for p in concatenate.__args__)
+    if sys.version_info < (3, 10):
+        # backport needs __args__ adjustment only
+        return concatenate
+    concatenate.__parameters__ = tuple(p for p in concatenate.__parameters__
+                                        if p is not _EllipsisDummy)
+    return concatenate
+
+
+# <=3.10
 @typing._tp_cache
 def _concatenate_getitem(self, parameters):
     if parameters == ():
         raise TypeError("Cannot take a Concatenate of no types.")
     if not isinstance(parameters, tuple):
         parameters = (parameters,)
-    if not isinstance(parameters[-1], ParamSpec):
+    if not (parameters[-1] is ... or isinstance(parameters[-1], ParamSpec)):
         raise TypeError("The last parameter to Concatenate should be a "
-                        "ParamSpec variable.")
+                        "ParamSpec variable or ellipsis.")
     msg = "Concatenate[arg, ...]: each arg must be a type."
-    parameters = tuple(typing._type_check(p, msg) for p in parameters)
-    return _ConcatenateGenericAlias(self, parameters)
+    parameters = (*(typing._type_check(p, msg) for p in parameters[:-1]),
+                    parameters[-1])
+    return _create_concatenate_alias(self, parameters)
 
 
-# 3.10+
-if hasattr(typing, 'Concatenate'):
+# 3.11+; Concatenate does not accept ellipsis in 3.10
+# Breakpoint: https://github.com/python/cpython/pull/30969
+if sys.version_info >= (3, 11):
     Concatenate = typing.Concatenate
-    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def Concatenate(self, parameters):
-        """Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
-        higher order function which adds, removes or transforms parameters of a
-        callable.
-
-        For example::
-
-           Callable[Concatenate[int, P], int]
-
-        See PEP 612 for detailed information.
-        """
-        return _concatenate_getitem(self, parameters)
-# 3.8
+# <=3.10
 else:
-    class _ConcatenateForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            return _concatenate_getitem(self, parameters)
-
-    Concatenate = _ConcatenateForm(
-        'Concatenate',
-        doc="""Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
-        higher order function which adds, removes or transforms parameters of a
-        callable.
-
-        For example::
-
-           Callable[Concatenate[int, P], int]
-
-        See PEP 612 for detailed information.
-        """)
-
-# 3.10+
-if hasattr(typing, 'TypeGuard'):
-    TypeGuard = typing.TypeGuard
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def TypeGuard(self, parameters):
-        """Special typing form used to annotate the return type of a user-defined
-        type guard function.  ``TypeGuard`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeGuard`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeGuard[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeGuard`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the type inside ``TypeGuard``.
-
-        For example::
-
-            def is_str(val: Union[str, float]):
-                # "isinstance" type guard
-                if isinstance(val, str):
-                    # Type of ``val`` is narrowed to ``str``
-                    ...
-                else:
-                    # Else, type of ``val`` is narrowed to ``float``.
-                    ...
+    @_ExtensionsSpecialForm
+    def Concatenate(self, parameters):
+        """Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
+        higher order function which adds, removes or transforms parameters of a
+        callable.
 
-        Strict type narrowing is not enforced -- ``TypeB`` need not be a narrower
-        form of ``TypeA`` (it can even be a wider form) and this may lead to
-        type-unsafe results.  The main reason is to allow for things like
-        narrowing ``List[object]`` to ``List[str]`` even though the latter is not
-        a subtype of the former, since ``List`` is invariant.  The responsibility of
-        writing type-safe type guards is left to the user.
+        For example::
 
-        ``TypeGuard`` also works with type variables.  For more information, see
-        PEP 647 (User-Defined Type Guards).
+           Callable[Concatenate[int, P], int]
+
+        See PEP 612 for detailed information.
         """
-        item = typing._type_check(parameters, f'{self} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-# 3.8
-else:
-    class _TypeGuardForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type')
-            return typing._GenericAlias(self, (item,))
+        return _concatenate_getitem(self, parameters)
 
-    TypeGuard = _TypeGuardForm(
-        'TypeGuard',
-        doc="""Special typing form used to annotate the return type of a user-defined
+
+# 3.10+
+if hasattr(typing, 'TypeGuard'):
+    TypeGuard = typing.TypeGuard
+# 3.9
+else:
+    @_ExtensionsSpecialForm
+    def TypeGuard(self, parameters):
+        """Special typing form used to annotate the return type of a user-defined
         type guard function.  ``TypeGuard`` only accepts a single type argument.
         At runtime, functions marked this way should return a boolean.
 
@@ -1948,13 +2207,16 @@ def is_str(val: Union[str, float]):
 
         ``TypeGuard`` also works with type variables.  For more information, see
         PEP 647 (User-Defined Type Guards).
-        """)
+        """
+        item = typing._type_check(parameters, f'{self} accepts only a single type.')
+        return typing._GenericAlias(self, (item,))
+
 
 # 3.13+
 if hasattr(typing, 'TypeIs'):
     TypeIs = typing.TypeIs
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
+# <=3.12
+else:
     @_ExtensionsSpecialForm
     def TypeIs(self, parameters):
         """Special typing form used to annotate the return type of a user-defined
@@ -1976,7 +2238,7 @@ def TypeIs(self, parameters):
 
         1. The return value is a boolean.
         2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
+        is the intersection of the type inside ``TypeIs`` and the argument's
         previously known type.
 
         For example::
@@ -1995,96 +2257,42 @@ def f(val: Union[int, Awaitable[int]]) -> int:
         """
         item = typing._type_check(parameters, f'{self} accepts only a single type.')
         return typing._GenericAlias(self, (item,))
-# 3.8
-else:
-    class _TypeIsForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type')
-            return typing._GenericAlias(self, (item,))
-
-    TypeIs = _TypeIsForm(
-        'TypeIs',
-        doc="""Special typing form used to annotate the return type of a user-defined
-        type narrower function.  ``TypeIs`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeIs[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeIs`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
-        previously known type.
-
-        For example::
-
-            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
-                return hasattr(val, '__await__')
 
-            def f(val: Union[int, Awaitable[int]]) -> int:
-                if is_awaitable(val):
-                    assert_type(val, Awaitable[int])
-                else:
-                    assert_type(val, int)
-
-        ``TypeIs`` also works with type variables.  For more information, see
-        PEP 742 (Narrowing types with TypeIs).
-        """)
-
-
-# Vendored from cpython typing._SpecialFrom
-class _SpecialForm(typing._Final, _root=True):
-    __slots__ = ('_name', '__doc__', '_getitem')
-
-    def __init__(self, getitem):
-        self._getitem = getitem
-        self._name = getitem.__name__
-        self.__doc__ = getitem.__doc__
-
-    def __getattr__(self, item):
-        if item in {'__name__', '__qualname__'}:
-            return self._name
-
-        raise AttributeError(item)
 
-    def __mro_entries__(self, bases):
-        raise TypeError(f"Cannot subclass {self!r}")
+# 3.14+?
+if hasattr(typing, 'TypeForm'):
+    TypeForm = typing.TypeForm
+# <=3.13
+else:
+    class _TypeFormForm(_ExtensionsSpecialForm, _root=True):
+        # TypeForm(X) is equivalent to X but indicates to the type checker
+        # that the object is a TypeForm.
+        def __call__(self, obj, /):
+            return obj
 
-    def __repr__(self):
-        return f'typing_extensions.{self._name}'
+    @_TypeFormForm
+    def TypeForm(self, parameters):
+        """A special form representing the value that results from the evaluation
+        of a type expression. This value encodes the information supplied in the
+        type expression, and it represents the type described by that type expression.
 
-    def __reduce__(self):
-        return self._name
+        When used in a type expression, TypeForm describes a set of type form objects.
+        It accepts a single type argument, which must be a valid type expression.
+        ``TypeForm[T]`` describes the set of all type form objects that represent
+        the type T or types that are assignable to T.
 
-    def __call__(self, *args, **kwds):
-        raise TypeError(f"Cannot instantiate {self!r}")
+        Usage:
 
-    def __or__(self, other):
-        return typing.Union[self, other]
+            def cast[T](typ: TypeForm[T], value: Any) -> T: ...
 
-    def __ror__(self, other):
-        return typing.Union[other, self]
+            reveal_type(cast(int, "x"))  # int
 
-    def __instancecheck__(self, obj):
-        raise TypeError(f"{self} cannot be used with isinstance()")
+        See PEP 747 for more information.
+        """
+        item = typing._type_check(parameters, f'{self} accepts only a single type.')
+        return typing._GenericAlias(self, (item,))
 
-    def __subclasscheck__(self, cls):
-        raise TypeError(f"{self} cannot be used with issubclass()")
 
-    @typing._tp_cache
-    def __getitem__(self, parameters):
-        return self._getitem(self, parameters)
 
 
 if hasattr(typing, "LiteralString"):  # 3.11+
@@ -2164,7 +2372,7 @@ def int_or_str(arg: int | str) -> None:
 if hasattr(typing, 'Required'):  # 3.11+
     Required = typing.Required
     NotRequired = typing.NotRequired
-elif sys.version_info[:2] >= (3, 9):  # 3.9-3.10
+else:  # <=3.10
     @_ExtensionsSpecialForm
     def Required(self, parameters):
         """A special typing construct to mark a key of a total=False TypedDict
@@ -2202,49 +2410,10 @@ class Movie(TypedDict):
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
         return typing._GenericAlias(self, (item,))
 
-else:  # 3.8
-    class _RequiredForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return typing._GenericAlias(self, (item,))
-
-    Required = _RequiredForm(
-        'Required',
-        doc="""A special typing construct to mark a key of a total=False TypedDict
-        as required. For example:
-
-            class Movie(TypedDict, total=False):
-                title: Required[str]
-                year: int
-
-            m = Movie(
-                title='The Matrix',  # typechecker error if key is omitted
-                year=1999,
-            )
-
-        There is no runtime checking that a required key is actually provided
-        when instantiating a related TypedDict.
-        """)
-    NotRequired = _RequiredForm(
-        'NotRequired',
-        doc="""A special typing construct to mark a key of a TypedDict as
-        potentially missing. For example:
-
-            class Movie(TypedDict):
-                title: str
-                year: NotRequired[int]
-
-            m = Movie(
-                title='The Matrix',  # typechecker error if key is omitted
-                year=1999,
-            )
-        """)
-
 
 if hasattr(typing, 'ReadOnly'):
     ReadOnly = typing.ReadOnly
-elif sys.version_info[:2] >= (3, 9):  # 3.9-3.12
+else:  # <=3.12
     @_ExtensionsSpecialForm
     def ReadOnly(self, parameters):
         """A special typing construct to mark an item of a TypedDict as read-only.
@@ -2264,30 +2433,6 @@ def mutate_movie(m: Movie) -> None:
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
         return typing._GenericAlias(self, (item,))
 
-else:  # 3.8
-    class _ReadOnlyForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return typing._GenericAlias(self, (item,))
-
-    ReadOnly = _ReadOnlyForm(
-        'ReadOnly',
-        doc="""A special typing construct to mark a key of a TypedDict as read-only.
-
-        For example:
-
-            class Movie(TypedDict):
-                title: ReadOnly[str]
-                year: int
-
-            def mutate_movie(m: Movie) -> None:
-                m["year"] = 1992  # allowed
-                m["title"] = "The Matrix"  # typechecker error
-
-        There is no runtime checking for this propery.
-        """)
-
 
 _UNPACK_DOC = """\
 Type unpack operator.
@@ -2331,20 +2476,24 @@ def foo(**kwargs: Unpack[Movie]): ...
 """
 
 
-if sys.version_info >= (3, 12):  # PEP 692 changed the repr of Unpack[]
+# PEP 692 changed the repr of Unpack[]
+# Breakpoint: https://github.com/python/cpython/pull/104048
+if sys.version_info >= (3, 12):
     Unpack = typing.Unpack
 
     def _is_unpack(obj):
         return get_origin(obj) is Unpack
 
-elif sys.version_info[:2] >= (3, 9):  # 3.9+
+else:  # <=3.11
     class _UnpackSpecialForm(_ExtensionsSpecialForm, _root=True):
         def __init__(self, getitem):
             super().__init__(getitem)
             self.__doc__ = _UNPACK_DOC
 
     class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
+        if sys.version_info < (3, 11):
+            # needed for compatibility with Generic[Unpack[Ts]]
+            __class__ = typing.TypeVar
 
         @property
         def __typing_unpacked_tuple_args__(self):
@@ -2357,6 +2506,17 @@ def __typing_unpacked_tuple_args__(self):
                 return arg.__args__
             return None
 
+        @property
+        def __typing_is_unpacked_typevartuple__(self):
+            assert self.__origin__ is Unpack
+            assert len(self.__args__) == 1
+            return isinstance(self.__args__[0], TypeVarTuple)
+
+        def __getitem__(self, args):
+            if self.__typing_is_unpacked_typevartuple__:
+                return args
+            return super().__getitem__(args)
+
     @_UnpackSpecialForm
     def Unpack(self, parameters):
         item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
@@ -2365,20 +2525,16 @@ def Unpack(self, parameters):
     def _is_unpack(obj):
         return isinstance(obj, _UnpackAlias)
 
-else:  # 3.8
-    class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
-
-    class _UnpackForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return _UnpackAlias(self, (item,))
-
-    Unpack = _UnpackForm('Unpack', doc=_UNPACK_DOC)
 
-    def _is_unpack(obj):
-        return isinstance(obj, _UnpackAlias)
+def _unpack_args(*args):
+    newargs = []
+    for arg in args:
+        subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
+        if subargs is not None and (not (subargs and subargs[-1] is ...)):
+            newargs.extend(subargs)
+        else:
+            newargs.append(arg)
+    return newargs
 
 
 if _PEP_696_IMPLEMENTED:
@@ -2386,16 +2542,6 @@ def _is_unpack(obj):
 
 elif hasattr(typing, "TypeVarTuple"):  # 3.11+
 
-    def _unpack_args(*args):
-        newargs = []
-        for arg in args:
-            subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
-            if subargs is not None and not (subargs and subargs[-1] is ...):
-                newargs.extend(subargs)
-            else:
-                newargs.append(arg)
-        return newargs
-
     # Add default parameter - PEP 696
     class TypeVarTuple(metaclass=_TypeVarLikeMeta):
         """Type variable tuple."""
@@ -2595,8 +2741,9 @@ def int_or_str(arg: int | str) -> None:
         raise AssertionError(f"Expected code to be unreachable, but got: {value}")
 
 
+# dataclass_transform exists in 3.11 but lacks the frozen_default parameter
+# Breakpoint: https://github.com/python/cpython/pull/99958
 if sys.version_info >= (3, 12):  # 3.12+
-    # dataclass_transform exists in 3.11 but lacks the frozen_default parameter
     dataclass_transform = typing.dataclass_transform
 else:  # <=3.11
     def dataclass_transform(
@@ -2726,7 +2873,9 @@ def method(self) -> None:
         return arg
 
 
-if hasattr(warnings, "deprecated"):
+# Python 3.13.3+ contains a fix for the wrapped __new__
+# Breakpoint: https://github.com/python/cpython/pull/132160
+if sys.version_info >= (3, 13, 3):
     deprecated = warnings.deprecated
 else:
     _T = typing.TypeVar("_T")
@@ -2806,7 +2955,7 @@ def __call__(self, arg: _T, /) -> _T:
                 original_new = arg.__new__
 
                 @functools.wraps(original_new)
-                def __new__(cls, *args, **kwargs):
+                def __new__(cls, /, *args, **kwargs):
                     if cls is arg:
                         warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
                     if original_new is not object.__new__:
@@ -2845,13 +2994,22 @@ def __init_subclass__(*args, **kwargs):
                 __init_subclass__.__deprecated__ = msg
                 return arg
             elif callable(arg):
+                import asyncio.coroutines
                 import functools
+                import inspect
 
                 @functools.wraps(arg)
                 def wrapper(*args, **kwargs):
                     warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
                     return arg(*args, **kwargs)
 
+                if asyncio.coroutines.iscoroutinefunction(arg):
+                    # Breakpoint: https://github.com/python/cpython/pull/99247
+                    if sys.version_info >= (3, 12):
+                        wrapper = inspect.markcoroutinefunction(wrapper)
+                    else:
+                        wrapper._is_coroutine = asyncio.coroutines._is_coroutine
+
                 arg.__deprecated__ = wrapper.__deprecated__ = msg
                 return wrapper
             else:
@@ -2860,6 +3018,25 @@ def wrapper(*args, **kwargs):
                     f"a class or callable, not {arg!r}"
                 )
 
+# Breakpoint: https://github.com/python/cpython/pull/23702
+if sys.version_info < (3, 10):
+    def _is_param_expr(arg):
+        return arg is ... or isinstance(
+            arg, (tuple, list, ParamSpec, _ConcatenateGenericAlias)
+        )
+else:
+    def _is_param_expr(arg):
+        return arg is ... or isinstance(
+            arg,
+            (
+                tuple,
+                list,
+                ParamSpec,
+                _ConcatenateGenericAlias,
+                typing._ConcatenateGenericAlias,
+            ),
+        )
+
 
 # We have to do some monkey patching to deal with the dual nature of
 # Unpack/TypeVarTuple:
@@ -2874,6 +3051,17 @@ def _check_generic(cls, parameters, elen=_marker):
 
         This gives a nice error message in case of count mismatch.
         """
+        # If substituting a single ParamSpec with multiple arguments
+        # we do not check the count
+        if (inspect.isclass(cls) and issubclass(cls, typing.Generic)
+            and len(cls.__parameters__) == 1
+            and isinstance(cls.__parameters__[0], ParamSpec)
+            and parameters
+            and not _is_param_expr(parameters[0])
+        ):
+            # Generic modifies parameters variable, but here we cannot do this
+            return
+
         if not elen:
             raise TypeError(f"{cls} is not a generic class")
         if elen is _marker:
@@ -2907,6 +3095,7 @@ def _check_generic(cls, parameters, elen=_marker):
 
                     expect_val = f"at least {elen}"
 
+            # Breakpoint: https://github.com/python/cpython/pull/27515
             things = "arguments" if sys.version_info >= (3, 10) else "parameters"
             raise TypeError(f"Too {'many' if alen > elen else 'few'} {things}"
                             f" for {cls}; actual {alen}, expected {expect_val}")
@@ -3007,7 +3196,10 @@ def _collect_type_vars(types, typevar_types=None):
         for t in types:
             if _is_unpacked_typevartuple(t):
                 type_var_tuple_encountered = True
-            elif isinstance(t, typevar_types) and t not in tvars:
+            elif (
+                isinstance(t, typevar_types) and not isinstance(t, _UnpackAlias)
+                and t not in tvars
+            ):
                 if enforce_default_ordering:
                     has_default = getattr(t, '__default__', NoDefault) is not NoDefault
                     if has_default:
@@ -3022,6 +3214,13 @@ def _collect_type_vars(types, typevar_types=None):
                 tvars.append(t)
             if _should_collect_from_parameters(t):
                 tvars.extend([t for t in t.__parameters__ if t not in tvars])
+            elif isinstance(t, tuple):
+                # Collect nested type_vars
+                # tuple wrapped by  _prepare_paramspec_params(cls, params)
+                for x in t:
+                    for collected in _collect_type_vars([x]):
+                        if collected not in tvars:
+                            tvars.append(collected)
         return tuple(tvars)
 
     typing._collect_type_vars = _collect_type_vars
@@ -3090,6 +3289,7 @@ def _collect_parameters(args):
 # This was explicitly disallowed in 3.9-3.10, and only half-worked in <=3.8.
 # On 3.12, we added __orig_bases__ to call-based NamedTuples
 # On 3.13, we deprecated kwargs-based NamedTuples
+# Breakpoint: https://github.com/python/cpython/pull/105609
 if sys.version_info >= (3, 13):
     NamedTuple = typing.NamedTuple
 else:
@@ -3100,10 +3300,6 @@ def _make_nmtuple(name, types, module, defaults=()):
         nm_tpl = collections.namedtuple(name, fields,
                                         defaults=defaults, module=module)
         nm_tpl.__annotations__ = nm_tpl.__new__.__annotations__ = annotations
-        # The `_field_types` attribute was removed in 3.9;
-        # in earlier versions, it is the same as the `__annotations__` attribute
-        if sys.version_info < (3, 9):
-            nm_tpl._field_types = annotations
         return nm_tpl
 
     _prohibited_namedtuple_fields = typing._prohibited
@@ -3169,6 +3365,7 @@ def __new__(cls, typename, bases, ns):
                             # using add_note() until py312.
                             # Making sure exceptions are raised in the same way
                             # as in "normal" classes seems most important here.
+                            # Breakpoint: https://github.com/python/cpython/pull/95915
                             if sys.version_info >= (3, 12):
                                 e.add_note(msg)
                                 raise
@@ -3185,7 +3382,6 @@ def _namedtuple_mro_entries(bases):
         assert NamedTuple in bases
         return (_NamedTuple,)
 
-    @_ensure_subclassable(_namedtuple_mro_entries)
     def NamedTuple(typename, fields=_marker, /, **kwargs):
         """Typed version of namedtuple.
 
@@ -3251,6 +3447,8 @@ class Employee(NamedTuple):
         nt.__orig_bases__ = (NamedTuple,)
         return nt
 
+    NamedTuple.__mro_entries__ = _namedtuple_mro_entries
+
 
 if hasattr(collections.abc, "Buffer"):
     Buffer = collections.abc.Buffer
@@ -3316,6 +3514,7 @@ class Baz(list[str]): ...
 
 # NewType is a class on Python 3.10+, making it pickleable
 # The error message for subclassing instances of NewType was improved on 3.11+
+# Breakpoint: https://github.com/python/cpython/pull/30268
 if sys.version_info >= (3, 11):
     NewType = typing.NewType
 else:
@@ -3368,6 +3567,7 @@ def __repr__(self):
         def __reduce__(self):
             return self.__qualname__
 
+        # Breakpoint: https://github.com/python/cpython/pull/21515
         if sys.version_info >= (3, 10):
             # PEP 604 methods
             # It doesn't make sense to have these methods on Python <3.10
@@ -3379,17 +3579,59 @@ def __ror__(self, other):
                 return typing.Union[other, self]
 
 
-if hasattr(typing, "TypeAliasType"):
+# Breakpoint: https://github.com/python/cpython/pull/124795
+if sys.version_info >= (3, 14):
     TypeAliasType = typing.TypeAliasType
+# <=3.13
 else:
-    def _is_unionable(obj):
-        """Corresponds to is_unionable() in unionobject.c in CPython."""
-        return obj is None or isinstance(obj, (
-            type,
-            _types.GenericAlias,
-            _types.UnionType,
-            TypeAliasType,
-        ))
+    # Breakpoint: https://github.com/python/cpython/pull/103764
+    if sys.version_info >= (3, 12):
+        # 3.12-3.13
+        def _is_unionable(obj):
+            """Corresponds to is_unionable() in unionobject.c in CPython."""
+            return obj is None or isinstance(obj, (
+                type,
+                _types.GenericAlias,
+                _types.UnionType,
+                typing.TypeAliasType,
+                TypeAliasType,
+            ))
+    else:
+        # <=3.11
+        def _is_unionable(obj):
+            """Corresponds to is_unionable() in unionobject.c in CPython."""
+            return obj is None or isinstance(obj, (
+                type,
+                _types.GenericAlias,
+                _types.UnionType,
+                TypeAliasType,
+            ))
+
+    if sys.version_info < (3, 10):
+        # Copied and pasted from https://github.com/python/cpython/blob/986a4e1b6fcae7fe7a1d0a26aea446107dd58dd2/Objects/genericaliasobject.c#L568-L582,
+        # so that we emulate the behaviour of `types.GenericAlias`
+        # on the latest versions of CPython
+        _ATTRIBUTE_DELEGATION_EXCLUSIONS = frozenset({
+            "__class__",
+            "__bases__",
+            "__origin__",
+            "__args__",
+            "__unpacked__",
+            "__parameters__",
+            "__typing_unpacked_tuple_args__",
+            "__mro_entries__",
+            "__reduce_ex__",
+            "__reduce__",
+            "__copy__",
+            "__deepcopy__",
+        })
+
+        class _TypeAliasGenericAlias(typing._GenericAlias, _root=True):
+            def __getattr__(self, attr):
+                if attr in _ATTRIBUTE_DELEGATION_EXCLUSIONS:
+                    return object.__getattr__(self, attr)
+                return getattr(self.__origin__, attr)
+
 
     class TypeAliasType:
         """Create named, parameterized type aliases.
@@ -3422,11 +3664,29 @@ class TypeAliasType:
         def __init__(self, name: str, value, *, type_params=()):
             if not isinstance(name, str):
                 raise TypeError("TypeAliasType name must be a string")
+            if not isinstance(type_params, tuple):
+                raise TypeError("type_params must be a tuple")
             self.__value__ = value
             self.__type_params__ = type_params
 
+            default_value_encountered = False
             parameters = []
             for type_param in type_params:
+                if (
+                    not isinstance(type_param, (TypeVar, TypeVarTuple, ParamSpec))
+                    # <=3.11
+                    # Unpack Backport passes isinstance(type_param, TypeVar)
+                    or _is_unpack(type_param)
+                ):
+                    raise TypeError(f"Expected a type param, got {type_param!r}")
+                has_default = (
+                    getattr(type_param, '__default__', NoDefault) is not NoDefault
+                )
+                if default_value_encountered and not has_default:
+                    raise TypeError(f"non-default type parameter '{type_param!r}'"
+                                    " follows default type parameter")
+                if has_default:
+                    default_value_encountered = True
                 if isinstance(type_param, TypeVarTuple):
                     parameters.extend(type_param)
                 else:
@@ -3463,16 +3723,49 @@ def _raise_attribute_error(self, name: str) -> Never:
         def __repr__(self) -> str:
             return self.__name__
 
+        if sys.version_info < (3, 11):
+            def _check_single_param(self, param, recursion=0):
+                # Allow [], [int], [int, str], [int, ...], [int, T]
+                if param is ...:
+                    return ...
+                if param is None:
+                    return None
+                # Note in <= 3.9 _ConcatenateGenericAlias inherits from list
+                if isinstance(param, list) and recursion == 0:
+                    return [self._check_single_param(arg, recursion+1)
+                            for arg in param]
+                return typing._type_check(
+                        param, f'Subscripting {self.__name__} requires a type.'
+                    )
+
+        def _check_parameters(self, parameters):
+            if sys.version_info < (3, 11):
+                return tuple(
+                    self._check_single_param(item)
+                    for item in parameters
+                )
+            return tuple(typing._type_check(
+                        item, f'Subscripting {self.__name__} requires a type.'
+                    )
+                    for item in parameters
+            )
+
         def __getitem__(self, parameters):
+            if not self.__type_params__:
+                raise TypeError("Only generic type aliases are subscriptable")
             if not isinstance(parameters, tuple):
                 parameters = (parameters,)
-            parameters = [
-                typing._type_check(
-                    item, f'Subscripting {self.__name__} requires a type.'
-                )
-                for item in parameters
-            ]
-            return typing._GenericAlias(self, tuple(parameters))
+            # Using 3.9 here will create problems with Concatenate
+            if sys.version_info >= (3, 10):
+                return _types.GenericAlias(self, parameters)
+            type_vars = _collect_type_vars(parameters)
+            parameters = self._check_parameters(parameters)
+            alias = _TypeAliasGenericAlias(self, parameters)
+            # alias.__parameters__ is not complete if Concatenate is present
+            # as it is converted to a list from which no parameters are extracted.
+            if alias.__parameters__ != type_vars:
+                alias.__parameters__ = type_vars
+            return alias
 
         def __reduce__(self):
             return self.__name__
@@ -3487,6 +3780,7 @@ def __init_subclass__(cls, *args, **kwargs):
         def __call__(self):
             raise TypeError("Type alias is not callable")
 
+        # Breakpoint: https://github.com/python/cpython/pull/21515
         if sys.version_info >= (3, 10):
             def __or__(self, right):
                 # For forward compatibility with 3.12, reject Unions
@@ -3599,43 +3893,425 @@ def __eq__(self, other: object) -> bool:
     __all__.append("CapsuleType")
 
 
-# Aliases for items that have always been in typing.
-# Explicitly assign these (rather than using `from typing import *` at the top),
-# so that we get a CI error if one of these is deleted from typing.py
-# in a future version of Python
-AbstractSet = typing.AbstractSet
-AnyStr = typing.AnyStr
-BinaryIO = typing.BinaryIO
-Callable = typing.Callable
-Collection = typing.Collection
-Container = typing.Container
-Dict = typing.Dict
-ForwardRef = typing.ForwardRef
-FrozenSet = typing.FrozenSet
+if sys.version_info >= (3, 14):
+    from annotationlib import Format, get_annotations
+else:
+    # Available since Python 3.14.0a3
+    # PR: https://github.com/python/cpython/pull/124415
+    class Format(enum.IntEnum):
+        VALUE = 1
+        VALUE_WITH_FAKE_GLOBALS = 2
+        FORWARDREF = 3
+        STRING = 4
+
+    # Available since Python 3.14.0a1
+    # PR: https://github.com/python/cpython/pull/119891
+    def get_annotations(obj, *, globals=None, locals=None, eval_str=False,
+                        format=Format.VALUE):
+        """Compute the annotations dict for an object.
+
+        obj may be a callable, class, or module.
+        Passing in an object of any other type raises TypeError.
+
+        Returns a dict.  get_annotations() returns a new dict every time
+        it's called; calling it twice on the same object will return two
+        different but equivalent dicts.
+
+        This is a backport of `inspect.get_annotations`, which has been
+        in the standard library since Python 3.10. See the standard library
+        documentation for more:
+
+            https://docs.python.org/3/library/inspect.html#inspect.get_annotations
+
+        This backport adds the *format* argument introduced by PEP 649. The
+        three formats supported are:
+        * VALUE: the annotations are returned as-is. This is the default and
+          it is compatible with the behavior on previous Python versions.
+        * FORWARDREF: return annotations as-is if possible, but replace any
+          undefined names with ForwardRef objects. The implementation proposed by
+          PEP 649 relies on language changes that cannot be backported; the
+          typing-extensions implementation simply returns the same result as VALUE.
+        * STRING: return annotations as strings, in a format close to the original
+          source. Again, this behavior cannot be replicated directly in a backport.
+          As an approximation, typing-extensions retrieves the annotations under
+          VALUE semantics and then stringifies them.
+
+        The purpose of this backport is to allow users who would like to use
+        FORWARDREF or STRING semantics once PEP 649 is implemented, but who also
+        want to support earlier Python versions, to simply write:
+
+            typing_extensions.get_annotations(obj, format=Format.FORWARDREF)
+
+        """
+        format = Format(format)
+        if format is Format.VALUE_WITH_FAKE_GLOBALS:
+            raise ValueError(
+                "The VALUE_WITH_FAKE_GLOBALS format is for internal use only"
+            )
+
+        if eval_str and format is not Format.VALUE:
+            raise ValueError("eval_str=True is only supported with format=Format.VALUE")
+
+        if isinstance(obj, type):
+            # class
+            obj_dict = getattr(obj, '__dict__', None)
+            if obj_dict and hasattr(obj_dict, 'get'):
+                ann = obj_dict.get('__annotations__', None)
+                if isinstance(ann, _types.GetSetDescriptorType):
+                    ann = None
+            else:
+                ann = None
+
+            obj_globals = None
+            module_name = getattr(obj, '__module__', None)
+            if module_name:
+                module = sys.modules.get(module_name, None)
+                if module:
+                    obj_globals = getattr(module, '__dict__', None)
+            obj_locals = dict(vars(obj))
+            unwrap = obj
+        elif isinstance(obj, _types.ModuleType):
+            # module
+            ann = getattr(obj, '__annotations__', None)
+            obj_globals = obj.__dict__
+            obj_locals = None
+            unwrap = None
+        elif callable(obj):
+            # this includes types.Function, types.BuiltinFunctionType,
+            # types.BuiltinMethodType, functools.partial, functools.singledispatch,
+            # "class funclike" from Lib/test/test_inspect... on and on it goes.
+            ann = getattr(obj, '__annotations__', None)
+            obj_globals = getattr(obj, '__globals__', None)
+            obj_locals = None
+            unwrap = obj
+        elif hasattr(obj, '__annotations__'):
+            ann = obj.__annotations__
+            obj_globals = obj_locals = unwrap = None
+        else:
+            raise TypeError(f"{obj!r} is not a module, class, or callable.")
+
+        if ann is None:
+            return {}
+
+        if not isinstance(ann, dict):
+            raise ValueError(f"{obj!r}.__annotations__ is neither a dict nor None")
+
+        if not ann:
+            return {}
+
+        if not eval_str:
+            if format is Format.STRING:
+                return {
+                    key: value if isinstance(value, str) else typing._type_repr(value)
+                    for key, value in ann.items()
+                }
+            return dict(ann)
+
+        if unwrap is not None:
+            while True:
+                if hasattr(unwrap, '__wrapped__'):
+                    unwrap = unwrap.__wrapped__
+                    continue
+                if isinstance(unwrap, functools.partial):
+                    unwrap = unwrap.func
+                    continue
+                break
+            if hasattr(unwrap, "__globals__"):
+                obj_globals = unwrap.__globals__
+
+        if globals is None:
+            globals = obj_globals
+        if locals is None:
+            locals = obj_locals or {}
+
+        # "Inject" type parameters into the local namespace
+        # (unless they are shadowed by assignments *in* the local namespace),
+        # as a way of emulating annotation scopes when calling `eval()`
+        if type_params := getattr(obj, "__type_params__", ()):
+            locals = {param.__name__: param for param in type_params} | locals
+
+        return_value = {key:
+            value if not isinstance(value, str) else eval(value, globals, locals)
+            for key, value in ann.items() }
+        return return_value
+
+
+if hasattr(typing, "evaluate_forward_ref"):
+    evaluate_forward_ref = typing.evaluate_forward_ref
+else:
+    # Implements annotationlib.ForwardRef.evaluate
+    def _eval_with_owner(
+        forward_ref, *, owner=None, globals=None, locals=None, type_params=None
+    ):
+        if forward_ref.__forward_evaluated__:
+            return forward_ref.__forward_value__
+        if getattr(forward_ref, "__cell__", None) is not None:
+            try:
+                value = forward_ref.__cell__.cell_contents
+            except ValueError:
+                pass
+            else:
+                forward_ref.__forward_evaluated__ = True
+                forward_ref.__forward_value__ = value
+                return value
+        if owner is None:
+            owner = getattr(forward_ref, "__owner__", None)
+
+        if (
+            globals is None
+            and getattr(forward_ref, "__forward_module__", None) is not None
+        ):
+            globals = getattr(
+                sys.modules.get(forward_ref.__forward_module__, None), "__dict__", None
+            )
+        if globals is None:
+            globals = getattr(forward_ref, "__globals__", None)
+        if globals is None:
+            if isinstance(owner, type):
+                module_name = getattr(owner, "__module__", None)
+                if module_name:
+                    module = sys.modules.get(module_name, None)
+                    if module:
+                        globals = getattr(module, "__dict__", None)
+            elif isinstance(owner, _types.ModuleType):
+                globals = getattr(owner, "__dict__", None)
+            elif callable(owner):
+                globals = getattr(owner, "__globals__", None)
+
+        # If we pass None to eval() below, the globals of this module are used.
+        if globals is None:
+            globals = {}
+
+        if locals is None:
+            locals = {}
+            if isinstance(owner, type):
+                locals.update(vars(owner))
+
+        if type_params is None and owner is not None:
+            # "Inject" type parameters into the local namespace
+            # (unless they are shadowed by assignments *in* the local namespace),
+            # as a way of emulating annotation scopes when calling `eval()`
+            type_params = getattr(owner, "__type_params__", None)
+
+        # Type parameters exist in their own scope, which is logically
+        # between the locals and the globals. We simulate this by adding
+        # them to the globals.
+        if type_params is not None:
+            globals = dict(globals)
+            for param in type_params:
+                globals[param.__name__] = param
+
+        arg = forward_ref.__forward_arg__
+        if arg.isidentifier() and not keyword.iskeyword(arg):
+            if arg in locals:
+                value = locals[arg]
+            elif arg in globals:
+                value = globals[arg]
+            elif hasattr(builtins, arg):
+                return getattr(builtins, arg)
+            else:
+                raise NameError(arg)
+        else:
+            code = forward_ref.__forward_code__
+            value = eval(code, globals, locals)
+        forward_ref.__forward_evaluated__ = True
+        forward_ref.__forward_value__ = value
+        return value
+
+    def evaluate_forward_ref(
+        forward_ref,
+        *,
+        owner=None,
+        globals=None,
+        locals=None,
+        type_params=None,
+        format=None,
+        _recursive_guard=frozenset(),
+    ):
+        """Evaluate a forward reference as a type hint.
+
+        This is similar to calling the ForwardRef.evaluate() method,
+        but unlike that method, evaluate_forward_ref() also:
+
+        * Recursively evaluates forward references nested within the type hint.
+        * Rejects certain objects that are not valid type hints.
+        * Replaces type hints that evaluate to None with types.NoneType.
+        * Supports the *FORWARDREF* and *STRING* formats.
+
+        *forward_ref* must be an instance of ForwardRef. *owner*, if given,
+        should be the object that holds the annotations that the forward reference
+        derived from, such as a module, class object, or function. It is used to
+        infer the namespaces to use for looking up names. *globals* and *locals*
+        can also be explicitly given to provide the global and local namespaces.
+        *type_params* is a tuple of type parameters that are in scope when
+        evaluating the forward reference. This parameter must be provided (though
+        it may be an empty tuple) if *owner* is not given and the forward reference
+        does not already have an owner set. *format* specifies the format of the
+        annotation and is a member of the annotationlib.Format enum.
+
+        """
+        if format == Format.STRING:
+            return forward_ref.__forward_arg__
+        if forward_ref.__forward_arg__ in _recursive_guard:
+            return forward_ref
+
+        # Evaluate the forward reference
+        try:
+            value = _eval_with_owner(
+                forward_ref,
+                owner=owner,
+                globals=globals,
+                locals=locals,
+                type_params=type_params,
+            )
+        except NameError:
+            if format == Format.FORWARDREF:
+                return forward_ref
+            else:
+                raise
+
+        if isinstance(value, str):
+            value = ForwardRef(value)
+
+        # Recursively evaluate the type
+        if isinstance(value, ForwardRef):
+            if getattr(value, "__forward_module__", True) is not None:
+                globals = None
+            return evaluate_forward_ref(
+                value,
+                globals=globals,
+                locals=locals,
+                 type_params=type_params, owner=owner,
+                _recursive_guard=_recursive_guard, format=format
+            )
+        if sys.version_info < (3, 12, 5) and type_params:
+            # Make use of type_params
+            locals = dict(locals) if locals else {}
+            for tvar in type_params:
+                if tvar.__name__ not in locals:  # lets not overwrite something present
+                    locals[tvar.__name__] = tvar
+        if sys.version_info < (3, 12, 5):
+            return typing._eval_type(
+                value,
+                globals,
+                locals,
+                recursive_guard=_recursive_guard | {forward_ref.__forward_arg__},
+            )
+        else:
+            return typing._eval_type(
+                value,
+                globals,
+                locals,
+                type_params,
+                recursive_guard=_recursive_guard | {forward_ref.__forward_arg__},
+            )
+
+
+class Sentinel:
+    """Create a unique sentinel object.
+
+    *name* should be the name of the variable to which the return value shall be assigned.
+
+    *repr*, if supplied, will be used for the repr of the sentinel object.
+    If not provided, "<name>" will be used.
+    """
+
+    def __init__(
+        self,
+        name: str,
+        repr: typing.Optional[str] = None,
+    ):
+        self._name = name
+        self._repr = repr if repr is not None else f'<{name}>'
+
+    def __repr__(self):
+        return self._repr
+
+    if sys.version_info < (3, 11):
+        # The presence of this method convinces typing._type_check
+        # that Sentinels are types.
+        def __call__(self, *args, **kwargs):
+            raise TypeError(f"{type(self).__name__!r} object is not callable")
+
+    # Breakpoint: https://github.com/python/cpython/pull/21515
+    if sys.version_info >= (3, 10):
+        def __or__(self, other):
+            return typing.Union[self, other]
+
+        def __ror__(self, other):
+            return typing.Union[other, self]
+
+    def __getstate__(self):
+        raise TypeError(f"Cannot pickle {type(self).__name__!r} object")
+
+
+if sys.version_info >= (3, 14, 0, "beta"):
+    type_repr = annotationlib.type_repr
+else:
+    def type_repr(value):
+        """Convert a Python value to a format suitable for use with the STRING format.
+
+        This is intended as a helper for tools that support the STRING format but do
+        not have access to the code that originally produced the annotations. It uses
+        repr() for most objects.
+
+        """
+        if isinstance(value, (type, _types.FunctionType, _types.BuiltinFunctionType)):
+            if value.__module__ == "builtins":
+                return value.__qualname__
+            return f"{value.__module__}.{value.__qualname__}"
+        if value is ...:
+            return "..."
+        return repr(value)
+
+
+# Aliases for items that are in typing in all supported versions.
+# We use hasattr() checks so this library will continue to import on
+# future versions of Python that may remove these names.
+_typing_names = [
+    "AbstractSet",
+    "AnyStr",
+    "BinaryIO",
+    "Callable",
+    "Collection",
+    "Container",
+    "Dict",
+    "FrozenSet",
+    "Hashable",
+    "IO",
+    "ItemsView",
+    "Iterable",
+    "Iterator",
+    "KeysView",
+    "List",
+    "Mapping",
+    "MappingView",
+    "Match",
+    "MutableMapping",
+    "MutableSequence",
+    "MutableSet",
+    "Optional",
+    "Pattern",
+    "Reversible",
+    "Sequence",
+    "Set",
+    "Sized",
+    "TextIO",
+    "Tuple",
+    "Union",
+    "ValuesView",
+    "cast",
+    "no_type_check",
+    "no_type_check_decorator",
+    # This is private, but it was defined by typing_extensions for a long time
+    # and some users rely on it.
+    "_AnnotatedAlias",
+]
+globals().update(
+    {name: getattr(typing, name) for name in _typing_names if hasattr(typing, name)}
+)
+# These are defined unconditionally because they are used in
+# typing-extensions itself.
 Generic = typing.Generic
-Hashable = typing.Hashable
-IO = typing.IO
-ItemsView = typing.ItemsView
-Iterable = typing.Iterable
-Iterator = typing.Iterator
-KeysView = typing.KeysView
-List = typing.List
-Mapping = typing.Mapping
-MappingView = typing.MappingView
-Match = typing.Match
-MutableMapping = typing.MutableMapping
-MutableSequence = typing.MutableSequence
-MutableSet = typing.MutableSet
-Optional = typing.Optional
-Pattern = typing.Pattern
-Reversible = typing.Reversible
-Sequence = typing.Sequence
-Set = typing.Set
-Sized = typing.Sized
-TextIO = typing.TextIO
-Tuple = typing.Tuple
-Union = typing.Union
-ValuesView = typing.ValuesView
-cast = typing.cast
-no_type_check = typing.no_type_check
-no_type_check_decorator = typing.no_type_check_decorator
+ForwardRef = typing.ForwardRef
+Annotated = typing.Annotated
diff --git a/libs/tzdata-2024.2.dist-info/LICENSE b/libs/tzdata-2024.2.dist-info/LICENSE
deleted file mode 100644
index c2f84aeb06..0000000000
--- a/libs/tzdata-2024.2.dist-info/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Software License 2.0
-
-Copyright (c) 2020, Paul Ganssle (Google)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/libs/tzdata-2024.2.dist-info/LICENSE_APACHE b/libs/tzdata-2024.2.dist-info/LICENSE_APACHE
deleted file mode 100644
index 261eeb9e9f..0000000000
--- a/libs/tzdata-2024.2.dist-info/LICENSE_APACHE
+++ /dev/null
@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/libs/tzdata-2024.2.dist-info/METADATA b/libs/tzdata-2024.2.dist-info/METADATA
deleted file mode 100644
index 4feec22ac4..0000000000
--- a/libs/tzdata-2024.2.dist-info/METADATA
+++ /dev/null
@@ -1,33 +0,0 @@
-Metadata-Version: 2.1
-Name: tzdata
-Version: 2024.2
-Summary: Provider of IANA time zone data
-Home-page: https://github.com/python/tzdata
-Author: Python Software Foundation
-Author-email: datetime-sig@python.org
-License: Apache-2.0
-Project-URL: Bug Reports, https://github.com/python/tzdata/issues
-Project-URL: Source, https://github.com/python/tzdata
-Project-URL: Documentation, https://tzdata.readthedocs.io
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=2
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-License-File: licenses/LICENSE_APACHE
-
-tzdata: Python package providing IANA time zone data
-====================================================
-
-This is a Python package containing ``zic``-compiled binaries for the IANA time
-zone database. It is intended to be a fallback for systems that do not have
-system time zone data installed (or don't have it installed in a standard
-location), as a part of `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_
-
-This repository generates a ``pip``-installable package, published on PyPI as
-`tzdata <https://pypi.org/project/tzdata>`_.
-
-For more information, see `the documentation <https://tzdata.readthedocs.io>`_.
diff --git a/libs/tzdata-2024.2.dist-info/RECORD b/libs/tzdata-2024.2.dist-info/RECORD
deleted file mode 100644
index 57b38356ba..0000000000
--- a/libs/tzdata-2024.2.dist-info/RECORD
+++ /dev/null
@@ -1,634 +0,0 @@
-tzdata-2024.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tzdata-2024.2.dist-info/LICENSE,sha256=M-jlAC01EtP8wigrmV5rrZ0zR4G5xawxhD9ASQDh87Q,592
-tzdata-2024.2.dist-info/LICENSE_APACHE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-tzdata-2024.2.dist-info/METADATA,sha256=5HAWgRuxvc1h1LHVUCXna4uZ7h6KjIet66Kn8AUDh5c,1393
-tzdata-2024.2.dist-info/RECORD,,
-tzdata-2024.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata-2024.2.dist-info/WHEEL,sha256=TJ49d73sNs10F0aze1W_bTW2P_X7-F4YXOlBqoqA-jY,109
-tzdata-2024.2.dist-info/top_level.txt,sha256=MO6QqC0xRrN67Gh9xU_nMmadwBVlYzPNkq_h4gYuzaQ,7
-tzdata/__init__.py,sha256=9o0ijEmis4rXSl6J7-eVzqZxxUWI7aGSQLwuzQFBtz4,252
-tzdata/zoneinfo/Africa/Abidjan,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Accra,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Addis_Ababa,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Algiers,sha256=L2nS4gLNFvuo89p3YtB-lSDYY2284SqkGH9pQQI8uwc,470
-tzdata/zoneinfo/Africa/Asmara,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Asmera,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Bamako,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Bangui,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Banjul,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Bissau,sha256=wa3uva129dJHRCi7tYt04kFOn1-osMS2afMjleO9mDw,149
-tzdata/zoneinfo/Africa/Blantyre,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Brazzaville,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Bujumbura,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Cairo,sha256=icuaNiEvuC6TPc2fqhDv36lpop7IDDIGO7tFGMAz0b4,1309
-tzdata/zoneinfo/Africa/Casablanca,sha256=MMps8T4AwqbEN6PIN_pkNiPMBEBqtRZRZceLN-9rxMM,1919
-tzdata/zoneinfo/Africa/Ceuta,sha256=oEIgK53afz1SYxYB_D0jR98Ss3g581yb8TnLppPaYcY,562
-tzdata/zoneinfo/Africa/Conakry,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Dakar,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Dar_es_Salaam,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Djibouti,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Douala,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/El_Aaiun,sha256=6hfLbLfrD1Qy9ZZqLXr1Xw7fzeEs_FqeHN2zZJZUVJI,1830
-tzdata/zoneinfo/Africa/Freetown,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Gaborone,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Harare,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Johannesburg,sha256=0Zrr4kNcToS_euZVM9I6nUQPmBYuW01pxz94PgIpnsg,190
-tzdata/zoneinfo/Africa/Juba,sha256=VTpoMAP-jJ6cKsDeNVr7l3LKGoKDUxGU2b1gqvDPz34,458
-tzdata/zoneinfo/Africa/Kampala,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Khartoum,sha256=NRwOwIg4SR6XuD11k3hxBz77uoBpzejXq7vxtq2Xys8,458
-tzdata/zoneinfo/Africa/Kigali,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Kinshasa,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Lagos,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Libreville,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Lome,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Luanda,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Lubumbashi,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Lusaka,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Malabo,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Maputo,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
-tzdata/zoneinfo/Africa/Maseru,sha256=0Zrr4kNcToS_euZVM9I6nUQPmBYuW01pxz94PgIpnsg,190
-tzdata/zoneinfo/Africa/Mbabane,sha256=0Zrr4kNcToS_euZVM9I6nUQPmBYuW01pxz94PgIpnsg,190
-tzdata/zoneinfo/Africa/Mogadishu,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Monrovia,sha256=WM-JVfr502Vgy18Fe6iAJ2yMgOWbwwumIQh_yp53eKM,164
-tzdata/zoneinfo/Africa/Nairobi,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Africa/Ndjamena,sha256=Tlj4ZUUNJxEhvAoo7TJKqWv1J7tEYaf1FEMez-K9xEg,160
-tzdata/zoneinfo/Africa/Niamey,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Nouakchott,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Ouagadougou,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Porto-Novo,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
-tzdata/zoneinfo/Africa/Sao_Tome,sha256=Pfiutakw5B5xr1OSg1uFvT0GwC6jVOqqxnx69GEJu50,173
-tzdata/zoneinfo/Africa/Timbuktu,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Africa/Tripoli,sha256=zzMBLZZh4VQ4_ARe5k4L_rsuqKP7edKvVt8F6kvj5FM,431
-tzdata/zoneinfo/Africa/Tunis,sha256=uoAEER48RJqNeGoYBuk5IeYqjc8sHvWLvKssuVCd18g,449
-tzdata/zoneinfo/Africa/Windhoek,sha256=g1jLRko_2peGsUTg0_wZycOC4gxTAHwfV2SO9I3KdCM,638
-tzdata/zoneinfo/Africa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/America/Adak,sha256=q_sZgOINX4TsX9iBx1gNd6XGwBnzCjg6qpdAQhK0ieA,969
-tzdata/zoneinfo/America/Anchorage,sha256=d8oMIpYvBpmLzl5I2By4ZaFEZsg_9dxgfqpIM0QFi_Y,977
-tzdata/zoneinfo/America/Anguilla,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Antigua,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Araguaina,sha256=TawYX4lVAxq0BxUGhTDx4C8vtBRnLuWi8qLV_oXDiUo,592
-tzdata/zoneinfo/America/Argentina/Buenos_Aires,sha256=IEVOpSfI6oiJJmFNIb9Vb0bOOMIgxO5bghFw7vkHFGk,708
-tzdata/zoneinfo/America/Argentina/Catamarca,sha256=UC0fxx7ZPmjPw3D0BK-5vap-c1cBzbgR293MdmEfOx0,708
-tzdata/zoneinfo/America/Argentina/ComodRivadavia,sha256=UC0fxx7ZPmjPw3D0BK-5vap-c1cBzbgR293MdmEfOx0,708
-tzdata/zoneinfo/America/Argentina/Cordoba,sha256=9Ij3WjT9mWMKQ43LeSUIqQuDb9zS3FSlHYPVNQJTFf0,708
-tzdata/zoneinfo/America/Argentina/Jujuy,sha256=7YpjOcmVaKKpiq31rQe8TTDNExdH9jjZIhdcZv-ShUg,690
-tzdata/zoneinfo/America/Argentina/La_Rioja,sha256=mUkRD5jaWJUy2f8vNFqOlMgKPptULOBn-vf_jMgF6x8,717
-tzdata/zoneinfo/America/Argentina/Mendoza,sha256=dL4q0zgY2FKPbG8cC-Wknnpp8tF2Y7SWgWSC_G_WznI,708
-tzdata/zoneinfo/America/Argentina/Rio_Gallegos,sha256=bCpWMlEI8KWe4c3n6fn8u6WCPnxjYtVy57ERtLTZaEs,708
-tzdata/zoneinfo/America/Argentina/Salta,sha256=H_ybxVycfOe7LlUA3GngoS0jENHkQURIRhjfJQF2kfU,690
-tzdata/zoneinfo/America/Argentina/San_Juan,sha256=Mj5vIUzQl5DtsPe3iMzS7rR-88U9HKW2csQqUda4JNM,717
-tzdata/zoneinfo/America/Argentina/San_Luis,sha256=rka8BokogyvMRFH6jr8D6s1tFIpsUeqHJ_feLK5O6ds,717
-tzdata/zoneinfo/America/Argentina/Tucuman,sha256=yv3aC-hALLio2yqneLIIylZhXKDlbPJGAd_abgsj9gg,726
-tzdata/zoneinfo/America/Argentina/Ushuaia,sha256=mcmZgB1pEHX6i7nlyRzjLnG8bqAtAK1TwMdRD2pZqBE,708
-tzdata/zoneinfo/America/Argentina/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/America/Aruba,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Asuncion,sha256=PuuUl8VILSBeZWDyLkM67bWl47xPMcJ0fY-rAhvSFzc,884
-tzdata/zoneinfo/America/Atikokan,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
-tzdata/zoneinfo/America/Atka,sha256=q_sZgOINX4TsX9iBx1gNd6XGwBnzCjg6qpdAQhK0ieA,969
-tzdata/zoneinfo/America/Bahia,sha256=_-ZFw-HzXc7byacHW_NJHtJ03ADFdqt1kaYgyWYobYw,682
-tzdata/zoneinfo/America/Bahia_Banderas,sha256=lJ8K-PrUqLTefuqpcKp_YWvfvzH0WNNrZ_LIel_0oZQ,700
-tzdata/zoneinfo/America/Barbados,sha256=gdiJf9ZKOMs9QB4ex0-crvdmhNfHpNzXTV2xTaNDCAg,278
-tzdata/zoneinfo/America/Belem,sha256=w0jv-gdBbEBZQBF2z2liKpRM9CEOWA36O1qU1nJKeCs,394
-tzdata/zoneinfo/America/Belize,sha256=uYBPJqnCGnOOeKnoz1IG9POWTvXD5kUirpFuB0PHjVo,1045
-tzdata/zoneinfo/America/Blanc-Sablon,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Boa_Vista,sha256=hYTFFNNZJdl_nSYIdfI8SQhtmfiakjCDI_15TlB-xEw,430
-tzdata/zoneinfo/America/Bogota,sha256=BqH6uClrrlT-VsBmke2Mh-IfA1R1l1h031CRUSLS1no,179
-tzdata/zoneinfo/America/Boise,sha256=Jt3omyPSPRoKE-KXVd-wxVON-CDE5oGaJA7Ar90Q2OM,999
-tzdata/zoneinfo/America/Buenos_Aires,sha256=IEVOpSfI6oiJJmFNIb9Vb0bOOMIgxO5bghFw7vkHFGk,708
-tzdata/zoneinfo/America/Cambridge_Bay,sha256=NFwNVfgxb2YMLzc-42RA-SKtNcODpukEfYf_QWWYTsI,883
-tzdata/zoneinfo/America/Campo_Grande,sha256=mngKYjaH_ENVmJ-mtURVjjFo5kHgLfYNPHZaCVSxQFE,952
-tzdata/zoneinfo/America/Cancun,sha256=YSoUxbjaL2MycKCTB3ZAK9jPVaeMhW7MkOEA8eWakKY,538
-tzdata/zoneinfo/America/Caracas,sha256=UHmUwc0mFPoidR4UDCWb4T4w_mpCBsSb4BkW3SOKIVY,190
-tzdata/zoneinfo/America/Catamarca,sha256=UC0fxx7ZPmjPw3D0BK-5vap-c1cBzbgR293MdmEfOx0,708
-tzdata/zoneinfo/America/Cayenne,sha256=9URU4o1v5759UWuh8xI9vnaANOceOeRW67XoGQuuUa8,151
-tzdata/zoneinfo/America/Cayman,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
-tzdata/zoneinfo/America/Chicago,sha256=wntzn_RqffBZThINcltDkhfhHkTqmlDNxJEwODtUguc,1754
-tzdata/zoneinfo/America/Chihuahua,sha256=tzOmA7trhFykyUZ7QbuMA6A88BSF2o4mumo65aojzqo,691
-tzdata/zoneinfo/America/Ciudad_Juarez,sha256=mEE-VN-sqVDaHFJyFGUBYyOsYHCRspUZcSJqt26Wufg,718
-tzdata/zoneinfo/America/Coral_Harbour,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
-tzdata/zoneinfo/America/Cordoba,sha256=9Ij3WjT9mWMKQ43LeSUIqQuDb9zS3FSlHYPVNQJTFf0,708
-tzdata/zoneinfo/America/Costa_Rica,sha256=ihoqA_tHmYm0YjTRLZu3q8PqsqqOeb1CELjWhPf_HXE,232
-tzdata/zoneinfo/America/Creston,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
-tzdata/zoneinfo/America/Cuiaba,sha256=OaIle0Cr-BKe0hOik5rwdcoCbQ5LSHkHqBS2cLoCqAU,934
-tzdata/zoneinfo/America/Curacao,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Danmarkshavn,sha256=cQORuA8pR0vw3ZwYfeGkWaT1tPU66nMQ2xRKT1T1Yb4,447
-tzdata/zoneinfo/America/Dawson,sha256=BlKV0U36jqnlxM5-Pxn8OIiY5kJEcLlt3QZo-GsMzlY,1029
-tzdata/zoneinfo/America/Dawson_Creek,sha256=t4USMuIvq1VVL9gYCabraAYs31kmAqAnwf7GzEiJJNc,683
-tzdata/zoneinfo/America/Denver,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
-tzdata/zoneinfo/America/Detroit,sha256=I4F8Mt9nx38AF6D-steYskBa_HHO6jKU1-W0yRFr50A,899
-tzdata/zoneinfo/America/Dominica,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Edmonton,sha256=Dq2mxcSNWZhMWRqxwwtMcaqwAIGMwkOzz-mW8fJscV8,970
-tzdata/zoneinfo/America/Eirunepe,sha256=6tKYaRpnbBSmXiwXy7_m4WW_rbVfn5LUec0keC3J7Iw,436
-tzdata/zoneinfo/America/El_Salvador,sha256=4wjsCpRH9AFk5abLAbnuv-zouhRKcwb0aenk-nWtmz0,176
-tzdata/zoneinfo/America/Ensenada,sha256=MGWr-6toDRarjMXTaiOIWgBFWNbw7lHvidLuPKFxfIo,1079
-tzdata/zoneinfo/America/Fort_Nelson,sha256=_j7IJ-hXHtV_7dSMg6pxGQLb6z_IaUMj3aJde_F49QQ,1448
-tzdata/zoneinfo/America/Fort_Wayne,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
-tzdata/zoneinfo/America/Fortaleza,sha256=ugF4DWO3j_khONebf7CLsT9ldL-JOWey_69S0jl2LIA,484
-tzdata/zoneinfo/America/Glace_Bay,sha256=I1posPHAEfg_Lc_FQdX1B8F8_A0NeJnK72p36PE7pKM,880
-tzdata/zoneinfo/America/Godthab,sha256=LlGZ5Y_ud9JwWRvncHnUHRArQbbnNcmmrz3duMhR3Hc,965
-tzdata/zoneinfo/America/Goose_Bay,sha256=gCJA1Sk2ciUg2WInn8DmPBwRAw0FjQbYPaUJK80mtMI,1580
-tzdata/zoneinfo/America/Grand_Turk,sha256=Gp8hpMt9P3QoEHmsIX2bqGNMkUSvlwZqqNzccR-cbe8,853
-tzdata/zoneinfo/America/Grenada,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Guadeloupe,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Guatemala,sha256=BGPGI4lyN6IFF_T0kx1q2lh3U5SEhbyDqLFuW8EFCaU,212
-tzdata/zoneinfo/America/Guayaquil,sha256=8OIaCy-SirKKz4I77l6MQFDgSLHtjN0TvklLVEZ_008,179
-tzdata/zoneinfo/America/Guyana,sha256=PmnEtWtOTamsPJXEo7PcNQCy2Rp-evGyJh4cf0pjAR4,181
-tzdata/zoneinfo/America/Halifax,sha256=kO5ahBM2oTLfWS4KX15FbKXfo5wg-f9vw1_hMOISGig,1672
-tzdata/zoneinfo/America/Havana,sha256=ms5rCuq2yBM49VmTymMtFQN3c5aBN1lkd8jjzKdnNm8,1117
-tzdata/zoneinfo/America/Hermosillo,sha256=Ur1MYSAX3QbT2UX57LmD83o6s2Z-6YbYeOufKvT-zTM,258
-tzdata/zoneinfo/America/Indiana/Indianapolis,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
-tzdata/zoneinfo/America/Indiana/Knox,sha256=KJCzXct8CTMItVLYLYeBqM6aT6b53gWCg6aDbsH58oI,1016
-tzdata/zoneinfo/America/Indiana/Marengo,sha256=ygWmq8sYee8NFwlSZyQ_tsKopFQMp9Ne557zGGbyF2Y,567
-tzdata/zoneinfo/America/Indiana/Petersburg,sha256=BIrubzHEp5QoyMaPgYbC1zSa_F3LwpXzKM8xH3rHspI,683
-tzdata/zoneinfo/America/Indiana/Tell_City,sha256=em2YMHDWEFXdZH0BKi5bLRAQ8bYDfop2T0Q8SqDh0B8,522
-tzdata/zoneinfo/America/Indiana/Vevay,sha256=dPk334e7MQwl71-avNyREBYVWuFTQcVKfltlRhrlRpw,369
-tzdata/zoneinfo/America/Indiana/Vincennes,sha256=jiODDXepmLP3gvCkBufdE3rp5cEXftBHnKne8_XOOCg,558
-tzdata/zoneinfo/America/Indiana/Winamac,sha256=hsEunaLrbxvspyV3Qm4UD7x7qOAeBtzcbbzANNMrdiw,603
-tzdata/zoneinfo/America/Indiana/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/America/Indianapolis,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
-tzdata/zoneinfo/America/Inuvik,sha256=d_ZX-USS70HIT-_PRJKMY6mbQRvbKLvsy9ar7uL2M40,817
-tzdata/zoneinfo/America/Iqaluit,sha256=nONS7zksGHTrbEJj73LYRZW964OncQuj_V6fNjpDoQ0,855
-tzdata/zoneinfo/America/Jamaica,sha256=pDexcAMzrv9TqLWGjVOHwIDcFMLT6Vqlzjb5AbNmkoQ,339
-tzdata/zoneinfo/America/Jujuy,sha256=7YpjOcmVaKKpiq31rQe8TTDNExdH9jjZIhdcZv-ShUg,690
-tzdata/zoneinfo/America/Juneau,sha256=V8IqRaJHSH7onK1gu3YYtW_a4VkNwjx5DCvQXpFdYAo,966
-tzdata/zoneinfo/America/Kentucky/Louisville,sha256=zS2SS573D9TmQZFWtSyRIVN3ZXVN_2FpVBbtqQFMzKU,1242
-tzdata/zoneinfo/America/Kentucky/Monticello,sha256=54or2oQ9bSbM9ifRoOjV7UjRF83jSSPuxfGeXH0nIqk,972
-tzdata/zoneinfo/America/Kentucky/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/America/Knox_IN,sha256=KJCzXct8CTMItVLYLYeBqM6aT6b53gWCg6aDbsH58oI,1016
-tzdata/zoneinfo/America/Kralendijk,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/La_Paz,sha256=2iYBxnc0HIwAzlx-Q3AI9Lb0GI87VY279oGcroBZSVs,170
-tzdata/zoneinfo/America/Lima,sha256=7vNjRhxzL-X4kyba-NkzXYNAOE-cqqcXvzXTqcTXBhY,283
-tzdata/zoneinfo/America/Los_Angeles,sha256=IA0FdU9tg6Nxz0CNcIUSV5dlezsL6-uh5QjP_oaj5cg,1294
-tzdata/zoneinfo/America/Louisville,sha256=zS2SS573D9TmQZFWtSyRIVN3ZXVN_2FpVBbtqQFMzKU,1242
-tzdata/zoneinfo/America/Lower_Princes,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Maceio,sha256=dSVg0dHedT9w1QO2F1AvWoel4_h8wmuYS4guEaL-5Kk,502
-tzdata/zoneinfo/America/Managua,sha256=ZYsoyN_GIlwAIpIj1spjQDPWGQ9kFZSipjUbO8caGfw,295
-tzdata/zoneinfo/America/Manaus,sha256=9kgrhpryB94YOVoshJliiiDSf9mwjb3OZwX0HusNRrk,412
-tzdata/zoneinfo/America/Marigot,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Martinique,sha256=m3rC6Mogc6cc1a9XJ8FPIYhZaSFNdYkxaZ-pfHhG3X4,178
-tzdata/zoneinfo/America/Matamoros,sha256=KxgAMGkE7TJuug9byFsT3KN836X3OyXq77v-tFpLVvc,437
-tzdata/zoneinfo/America/Mazatlan,sha256=IN7ecQ9SDq9sDNvu_nc_xuMN2LHSiq8X6YQgmVUe6aY,690
-tzdata/zoneinfo/America/Mendoza,sha256=dL4q0zgY2FKPbG8cC-Wknnpp8tF2Y7SWgWSC_G_WznI,708
-tzdata/zoneinfo/America/Menominee,sha256=oUmJmzOZtChYrB9In-E1GqEVi2ogKjPESXlUySUGs94,917
-tzdata/zoneinfo/America/Merida,sha256=LBpOEv4xxUcL5B7wFSNa3UyE762-EiSXb1KPQNKwwCU,654
-tzdata/zoneinfo/America/Metlakatla,sha256=EVj1LkMCgry6mT8Ln_FpHxpJSU0oSncfbHGWIQ0SI_0,586
-tzdata/zoneinfo/America/Mexico_City,sha256=N90r8I8T_OD3B8Ox9M7EAY772cR8g2ew-03rvUYb1y8,773
-tzdata/zoneinfo/America/Miquelon,sha256=Eey-Id5b4HFODINweRFtbDjcgjs_myiC2UwsgYt4kVk,550
-tzdata/zoneinfo/America/Moncton,sha256=knrBNDFwHAGFr0nWJTBQ-10F_fZ5x4n3SnZtH-KI6h8,1493
-tzdata/zoneinfo/America/Monterrey,sha256=1aYsIp-Na0lDAKVrcW4wVKFAXy5BAqDG2wWLT9wTmmQ,709
-tzdata/zoneinfo/America/Montevideo,sha256=l7FjW6qscGzdvfjlbIeZ5CQ_AFWS3ZeVDS5ppMJCNM0,969
-tzdata/zoneinfo/America/Montreal,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
-tzdata/zoneinfo/America/Montserrat,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Nassau,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
-tzdata/zoneinfo/America/New_York,sha256=1_IgazpFmJ_JrWPVWJIlMvpzUigNX4cXa_HbecsdH6k,1744
-tzdata/zoneinfo/America/Nipigon,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
-tzdata/zoneinfo/America/Nome,sha256=_-incQnh0DwK9hJqFaYzO4osUKAUB2k2lae565sblpA,975
-tzdata/zoneinfo/America/Noronha,sha256=Q0r3GtA5y2RGkOj56OTZG5tuBy1B6kfbhyrJqCgf27g,484
-tzdata/zoneinfo/America/North_Dakota/Beulah,sha256=RvaBIS60bNNRmREi6BXSWEbJSrcP7J8Nmxg8OkBcrow,1043
-tzdata/zoneinfo/America/North_Dakota/Center,sha256=M09x4Mx6hcBAwktvwv16YvPRmsuDjZEDwHT0Umkcgyo,990
-tzdata/zoneinfo/America/North_Dakota/New_Salem,sha256=mZca9gyfO2USzax7v0mLJEYBKBVmIqylWqnfLgSsVys,990
-tzdata/zoneinfo/America/North_Dakota/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/America/Nuuk,sha256=LlGZ5Y_ud9JwWRvncHnUHRArQbbnNcmmrz3duMhR3Hc,965
-tzdata/zoneinfo/America/Ojinaga,sha256=97mJ9VI8h1lRAREIdJdTz_MCLtwh4b36iaQ9QolETpA,718
-tzdata/zoneinfo/America/Panama,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
-tzdata/zoneinfo/America/Pangnirtung,sha256=nONS7zksGHTrbEJj73LYRZW964OncQuj_V6fNjpDoQ0,855
-tzdata/zoneinfo/America/Paramaribo,sha256=C2v9tR6no54CRECWDFhANTl40UsA4AhHsdnGoNCb4_Q,187
-tzdata/zoneinfo/America/Phoenix,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
-tzdata/zoneinfo/America/Port-au-Prince,sha256=wsS6VbQ__bKJ2IUMPy_Pao0CLRK5pXEBrqkaYuqs3Ns,565
-tzdata/zoneinfo/America/Port_of_Spain,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Porto_Acre,sha256=VjuQUr668phq5bcH40r94BPnZBKHzJf_MQBfM6Db96U,418
-tzdata/zoneinfo/America/Porto_Velho,sha256=9yPU8EXtKDQHLF745ETc9qZZ9Me2CK6jvgb6S53pSKg,394
-tzdata/zoneinfo/America/Puerto_Rico,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Punta_Arenas,sha256=2Aqh7bqo-mQlnMjURDkCOeEYmeXhkzKP7OxFAvhTjjA,1218
-tzdata/zoneinfo/America/Rainy_River,sha256=ANzwYGBU1PknQW4LR-H92i5c4Db95LU-UQhPhWZCjDo,1294
-tzdata/zoneinfo/America/Rankin_Inlet,sha256=JQCXQBdyc8uJTjIFO4jZuzS0OjG0gRHv8MPmdzN93CU,807
-tzdata/zoneinfo/America/Recife,sha256=3yZTwF3MJlkY0D48CQUTzCRwDCfGNq8EXXTZYlBgUTg,484
-tzdata/zoneinfo/America/Regina,sha256=_JHuns225iE-THc9NFp-RBq4PWULAuGw2OLbpOB_UMw,638
-tzdata/zoneinfo/America/Resolute,sha256=2UeJBR2ZSkn1bUZy0G0SEhBtY9vycwSRU4naK-sw044,807
-tzdata/zoneinfo/America/Rio_Branco,sha256=VjuQUr668phq5bcH40r94BPnZBKHzJf_MQBfM6Db96U,418
-tzdata/zoneinfo/America/Rosario,sha256=9Ij3WjT9mWMKQ43LeSUIqQuDb9zS3FSlHYPVNQJTFf0,708
-tzdata/zoneinfo/America/Santa_Isabel,sha256=MGWr-6toDRarjMXTaiOIWgBFWNbw7lHvidLuPKFxfIo,1079
-tzdata/zoneinfo/America/Santarem,sha256=dDEGsnrm4wrzl4sK6K8PzEroBKD7A1V7HBa8cWW4cMk,409
-tzdata/zoneinfo/America/Santiago,sha256=_QBpU8K0QqLh5m2yqWfdkypIJDkPAc3dnIAc5jRQxxU,1354
-tzdata/zoneinfo/America/Santo_Domingo,sha256=xmJo59mZXN7Wnf-3Jjl37mCC-8GfN6xmk2l_vngyfeI,317
-tzdata/zoneinfo/America/Sao_Paulo,sha256=-izrIi8GXAKJ85l_8MVLoFp0pZm0Uihw-oapbiThiJE,952
-tzdata/zoneinfo/America/Scoresbysund,sha256=wrhIEVAFI29qKT3TdOWiiJwI80AohXwwfb1mCPSAXHo,984
-tzdata/zoneinfo/America/Shiprock,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
-tzdata/zoneinfo/America/Sitka,sha256=pF5yln--MOzEMDacNd_Id0HX9pAmge8POfcxyTNh1-0,956
-tzdata/zoneinfo/America/St_Barthelemy,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/St_Johns,sha256=v99q_AFMPll5MMxMp98aqY40cmis2wciTfTqs2_kb0k,1878
-tzdata/zoneinfo/America/St_Kitts,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/St_Lucia,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/St_Thomas,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/St_Vincent,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Swift_Current,sha256=F-b65Yaax23CsuhSmeTDl6Tv9du4IsvWvMbbSuwHkLM,368
-tzdata/zoneinfo/America/Tegucigalpa,sha256=KlvqBJGswa9DIXlE3acU-pgd4IFqDeBRrUz02PmlNC0,194
-tzdata/zoneinfo/America/Thule,sha256=LzL5jdmZkxRkHdA3XkoqJPG_ImllnSRhYYLQpMf_TY8,455
-tzdata/zoneinfo/America/Thunder_Bay,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
-tzdata/zoneinfo/America/Tijuana,sha256=MGWr-6toDRarjMXTaiOIWgBFWNbw7lHvidLuPKFxfIo,1079
-tzdata/zoneinfo/America/Toronto,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
-tzdata/zoneinfo/America/Tortola,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Vancouver,sha256=Epou71sUffvHB1rd7wT0krvo3okXAV45_TWcOFpy26Q,1330
-tzdata/zoneinfo/America/Virgin,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
-tzdata/zoneinfo/America/Whitehorse,sha256=CyY4jNd0fzNSdf1HlYGfaktApmH71tRNRlpOEO32DGs,1029
-tzdata/zoneinfo/America/Winnipeg,sha256=ANzwYGBU1PknQW4LR-H92i5c4Db95LU-UQhPhWZCjDo,1294
-tzdata/zoneinfo/America/Yakutat,sha256=pvHLVNA1mI-H9fBDnlnpI6B9XzVFQeyvI9nyIkaFNYQ,946
-tzdata/zoneinfo/America/Yellowknife,sha256=Dq2mxcSNWZhMWRqxwwtMcaqwAIGMwkOzz-mW8fJscV8,970
-tzdata/zoneinfo/America/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Antarctica/Casey,sha256=1jc-FAjvkKnmCjhz8-yQgEKrN_sVmzAi8DVoy9_K8AQ,287
-tzdata/zoneinfo/Antarctica/Davis,sha256=Pom_267rsoZl6yLvYllu_SW1kixIrSPmsd-HLztn33Y,197
-tzdata/zoneinfo/Antarctica/DumontDUrville,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
-tzdata/zoneinfo/Antarctica/Macquarie,sha256=aOZlIzIdTwevaTXoQkDlex2LSFDrg64GvRfcLnfCDAM,976
-tzdata/zoneinfo/Antarctica/Mawson,sha256=UYuiBSE0qZ-2kkBAa6Xq5g9NXg-W_R0P-rl2tlO0jHc,152
-tzdata/zoneinfo/Antarctica/McMurdo,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
-tzdata/zoneinfo/Antarctica/Palmer,sha256=3MXfhQBaRB57_jqHZMl-M_K48NMFe4zALc7vaMyS5xw,887
-tzdata/zoneinfo/Antarctica/Rothera,sha256=XeddRL2YTDfEWzQI7nDqfW-Tfg-5EebxsHsMHyzGudI,132
-tzdata/zoneinfo/Antarctica/South_Pole,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
-tzdata/zoneinfo/Antarctica/Syowa,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
-tzdata/zoneinfo/Antarctica/Troll,sha256=s4z0F_uKzx3biKjEzvHwb56132XRs6IR22fCQglW5GI,158
-tzdata/zoneinfo/Antarctica/Vostok,sha256=cDp-B4wKXE8U5b_zqJIlxdGY-AIAMCTJOZG3bRZBKNc,170
-tzdata/zoneinfo/Antarctica/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Arctic/Longyearbyen,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
-tzdata/zoneinfo/Arctic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Asia/Aden,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
-tzdata/zoneinfo/Asia/Almaty,sha256=87WNMKCF7W2V6tq5LvX5DXWoi9MuwjCAY3f9dgwui4s,618
-tzdata/zoneinfo/Asia/Amman,sha256=KOnKO4_1XRlQvLG61GTbfKImSthwBHMSnzV1ExW8i5Q,928
-tzdata/zoneinfo/Asia/Anadyr,sha256=30bdZurg4Q__lCpH509TE0U7pOcEY6qxjvuPF9ai5yc,743
-tzdata/zoneinfo/Asia/Aqtau,sha256=bRj27vG5HvGegFg5eIKNmq3dfteYmr7KmTs4JFO-7SM,606
-tzdata/zoneinfo/Asia/Aqtobe,sha256=Pm7yI5cmfzx8CGXR2mQJDjtH12KCpx8ezFKchiJVVJ4,615
-tzdata/zoneinfo/Asia/Ashgabat,sha256=OTLHdQ8jFPDvxu_IwKX_c3W3jdN6e7FGoCSEEb0XKuw,375
-tzdata/zoneinfo/Asia/Ashkhabad,sha256=OTLHdQ8jFPDvxu_IwKX_c3W3jdN6e7FGoCSEEb0XKuw,375
-tzdata/zoneinfo/Asia/Atyrau,sha256=1YG4QzLxPRZQeGHiOrbm0cRs8ERTNg1NF9dWEwW2Pi0,616
-tzdata/zoneinfo/Asia/Baghdad,sha256=zFe6LXSfuoJjGsmYTMGjJtBcAMLiKFkD7j7-VaqKwH8,630
-tzdata/zoneinfo/Asia/Bahrain,sha256=YWDWV1o3HHWxnmwlzwMWC53C84ZYPkK_gYn9-P0Xx4U,152
-tzdata/zoneinfo/Asia/Baku,sha256=_Wh6ONaRatMc9lpwGO6zB9pTE38NZ4oWg4_-sZl17mA,744
-tzdata/zoneinfo/Asia/Bangkok,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
-tzdata/zoneinfo/Asia/Barnaul,sha256=UGFYJYvtgYVS8Tqsqvj6p0OQCmN3zdY9wITWg8ODG-k,753
-tzdata/zoneinfo/Asia/Beirut,sha256=FgM4gqbWFp6KuUnVn-H8UIXZgTydBeOxDdbebJ0GpUc,732
-tzdata/zoneinfo/Asia/Bishkek,sha256=RXdxVxaiE5zxX5atQl-7ZesEeZVjsCXBGZ6cJbVU9pE,618
-tzdata/zoneinfo/Asia/Brunei,sha256=3ajgII3xZ-Wc-dqXRTSMw8qQRDSjXlSBIxyE_sDRGTk,320
-tzdata/zoneinfo/Asia/Calcutta,sha256=OgC9vhvElZ5ydWfHMLpRsDRV7NRV98GQxa0UOG63mw0,220
-tzdata/zoneinfo/Asia/Chita,sha256=1Lme3ccO47R5gmTe5VCq1BSb0m_1opWibq21zvZlntg,750
-tzdata/zoneinfo/Asia/Choibalsan,sha256=--I8P6_e4BtRIe3wCSkPtwHOu_k9rPsw-KqQKHJC9vM,594
-tzdata/zoneinfo/Asia/Chongqing,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
-tzdata/zoneinfo/Asia/Chungking,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
-tzdata/zoneinfo/Asia/Colombo,sha256=QAyjK7gtXUWfLuju1M0H3_ew6iTM-bwfzO5obgvaHy8,247
-tzdata/zoneinfo/Asia/Dacca,sha256=rCGmEwbW4qkUU2QfTj5zLrydVCq8HTWl1dsqEDQOvvo,231
-tzdata/zoneinfo/Asia/Damascus,sha256=AtZTDRzHEB7QnKxFXvtWsNUI1cCCe27sAfpDfQd0MwY,1234
-tzdata/zoneinfo/Asia/Dhaka,sha256=rCGmEwbW4qkUU2QfTj5zLrydVCq8HTWl1dsqEDQOvvo,231
-tzdata/zoneinfo/Asia/Dili,sha256=5fcCHkVIZkLV8TcsqBQ8HstILEpz3ay3MGGU6sgNxLA,170
-tzdata/zoneinfo/Asia/Dubai,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
-tzdata/zoneinfo/Asia/Dushanbe,sha256=8qbn76rf9xu47NYVdfGvjnkf2KZxNN5J8ekFiXUz3AQ,366
-tzdata/zoneinfo/Asia/Famagusta,sha256=385fbaRnx-mdEaXqSyBKVBDDKPzCGKbynWYt75wwCug,940
-tzdata/zoneinfo/Asia/Gaza,sha256=-PC__gGODaDGgv5LLzH7ptNLbNdStPkxGY4LmebvcNU,2950
-tzdata/zoneinfo/Asia/Harbin,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
-tzdata/zoneinfo/Asia/Hebron,sha256=4FujfuE-ECIXgKW4pv0lxq2ZkAj7jDwt0rezuA0fFzg,2968
-tzdata/zoneinfo/Asia/Ho_Chi_Minh,sha256=R-ReVMreMcETG0Sifjfe5z-PgQpUsKjT6dVbEKzT3sE,236
-tzdata/zoneinfo/Asia/Hong_Kong,sha256=9AaPcyRtuXQX9zRnRTVkxX1mRs5JCbn6JTaSPvzX608,775
-tzdata/zoneinfo/Asia/Hovd,sha256=eqAvD2RfuIfSDhtqk58MECIjz5X14OHZ7aO4z14kndk,594
-tzdata/zoneinfo/Asia/Irkutsk,sha256=sWxp8g_aSfFan4ZyF9s6-pEX5Vgwxi_jNv7vwN06XIo,760
-tzdata/zoneinfo/Asia/Istanbul,sha256=KnFjsWuUgG9pmRNI59CmDEbrYbHwMF9fS4P2E9sQgG8,1200
-tzdata/zoneinfo/Asia/Jakarta,sha256=4qCZ6kix9xZriNIZsyb3xENz0IkJzZcjtENGlG_Wo4Q,248
-tzdata/zoneinfo/Asia/Jayapura,sha256=BUa0kX1iOdf0E-v7415h7l0lQv4DBCYX_3dAbYmQ0xU,171
-tzdata/zoneinfo/Asia/Jerusalem,sha256=n83o1YTeoFhfXIcnqvNfSKFJ4NvTqDv2zvi8qcFAIeM,1074
-tzdata/zoneinfo/Asia/Kabul,sha256=pNIwTfiSG71BGKvrhKqo1xdxckAx9vfcx5nJanrL81Q,159
-tzdata/zoneinfo/Asia/Kamchatka,sha256=Qix8x3s-m8UTeiwzNPBy_ZQvAzX_aaihz_PzLfTiUac,727
-tzdata/zoneinfo/Asia/Karachi,sha256=ujo4wv-3oa9tfrFT5jsLcEYcjeGeBRgG2QwdXg_ijU4,266
-tzdata/zoneinfo/Asia/Kashgar,sha256=hJyv03dhHML8K0GJGrY8b7M0OUkEXblh_RYmdZMxWtQ,133
-tzdata/zoneinfo/Asia/Kathmandu,sha256=drjxv-ByIxodnn-FATEOJ8DQgEjEj3Qihgtkd8FCxDg,161
-tzdata/zoneinfo/Asia/Katmandu,sha256=drjxv-ByIxodnn-FATEOJ8DQgEjEj3Qihgtkd8FCxDg,161
-tzdata/zoneinfo/Asia/Khandyga,sha256=fdEDOsDJkLuENybqIXtTiI4k2e24dKHDfBTww9AtbSw,775
-tzdata/zoneinfo/Asia/Kolkata,sha256=OgC9vhvElZ5ydWfHMLpRsDRV7NRV98GQxa0UOG63mw0,220
-tzdata/zoneinfo/Asia/Krasnoyarsk,sha256=buNI5S1g7eedK-PpnrLkBFFZDUyCtHxcxXDQGF2ARos,741
-tzdata/zoneinfo/Asia/Kuala_Lumpur,sha256=CVSy2aMB2U9DSAJGBqcbvLL6JNPNNwn1vIvKYFA5eF0,256
-tzdata/zoneinfo/Asia/Kuching,sha256=3ajgII3xZ-Wc-dqXRTSMw8qQRDSjXlSBIxyE_sDRGTk,320
-tzdata/zoneinfo/Asia/Kuwait,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
-tzdata/zoneinfo/Asia/Macao,sha256=mr89i_wpMoWhAtqZrF2SGcoILcUw6rYrDkIUNADes7E,791
-tzdata/zoneinfo/Asia/Macau,sha256=mr89i_wpMoWhAtqZrF2SGcoILcUw6rYrDkIUNADes7E,791
-tzdata/zoneinfo/Asia/Magadan,sha256=wAufMGWL_s1Aw2l3myAfBFtrROVPes3dMoNuDEoNwT8,751
-tzdata/zoneinfo/Asia/Makassar,sha256=NV9j_RTuiU47mvJvfKE8daXH5AFYJ8Ki4gvHBJSxyLc,190
-tzdata/zoneinfo/Asia/Manila,sha256=Vk8aVoXR_edPDnARFdmEui4pq4Q3yNuiPUCzeIAPLBI,238
-tzdata/zoneinfo/Asia/Muscat,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
-tzdata/zoneinfo/Asia/Nicosia,sha256=TYYqWp8sK0AwBUHAp0wuuihZuQ19RXdt28bth33zOBI,597
-tzdata/zoneinfo/Asia/Novokuznetsk,sha256=aYW9rpcxpf_zrOZc2vmpcqgiuCRKMHB1lMrioI43KCw,726
-tzdata/zoneinfo/Asia/Novosibirsk,sha256=I2n4MCElad9sMcyJAAc4YdVT6ewbhR79OoAAuhEJfCY,753
-tzdata/zoneinfo/Asia/Omsk,sha256=y7u47EObB3wI8MxKHBRTFM-BEZZqhGpzDg7x5lcwJXY,741
-tzdata/zoneinfo/Asia/Oral,sha256=Q-Gf85NIvdAtU52Zkgf78rVHPlg85xyMe9Zm9ybh0po,625
-tzdata/zoneinfo/Asia/Phnom_Penh,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
-tzdata/zoneinfo/Asia/Pontianak,sha256=o0x0jNTlwjiUqAzGX_HlzvCMru2zUURgQ4xzpS95xds,247
-tzdata/zoneinfo/Asia/Pyongyang,sha256=NxC5da8oTZ4StiFQnlhjlp9FTRuMM-Xwsq3Yg4y0xkA,183
-tzdata/zoneinfo/Asia/Qatar,sha256=YWDWV1o3HHWxnmwlzwMWC53C84ZYPkK_gYn9-P0Xx4U,152
-tzdata/zoneinfo/Asia/Qostanay,sha256=5tZkj1o0p4vaREsPO0YgIiw6eDf1cqO52x-0EMg_2L4,624
-tzdata/zoneinfo/Asia/Qyzylorda,sha256=JltKDEnuHmIQGYdFTAJMDDpdDA_HxjJOAHHaV7kFrlQ,624
-tzdata/zoneinfo/Asia/Rangoon,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,187
-tzdata/zoneinfo/Asia/Riyadh,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
-tzdata/zoneinfo/Asia/Saigon,sha256=R-ReVMreMcETG0Sifjfe5z-PgQpUsKjT6dVbEKzT3sE,236
-tzdata/zoneinfo/Asia/Sakhalin,sha256=M_TBd-03j-3Yc9KwhGEoBTwSJxWO1lPBG7ndst16PGo,755
-tzdata/zoneinfo/Asia/Samarkand,sha256=KZ_q-6GMDVgJb8RFqcrbVcPC0WLczolClC4nZA1HVNU,366
-tzdata/zoneinfo/Asia/Seoul,sha256=ZKcLb7zJtl52Lb0l64m29AwTcUbtyNvU0IHq-s2reN4,415
-tzdata/zoneinfo/Asia/Shanghai,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
-tzdata/zoneinfo/Asia/Singapore,sha256=CVSy2aMB2U9DSAJGBqcbvLL6JNPNNwn1vIvKYFA5eF0,256
-tzdata/zoneinfo/Asia/Srednekolymsk,sha256=06mojetFbDd4ag1p8NK0Fg6rF2OOnZMFRRC90N2ATZc,742
-tzdata/zoneinfo/Asia/Taipei,sha256=oEwscvT3aoMXjQNt2X0VfuHzLkeORN2npcEJI2h-5s8,511
-tzdata/zoneinfo/Asia/Tashkent,sha256=0vpN2gI9GY50z1nea6zCPFf2B6VCu6XQQHx4l6rhnTI,366
-tzdata/zoneinfo/Asia/Tbilisi,sha256=ON_Uzv2VTSk6mRefNU-aI-qkqtCoUX6oECVqpeS42eI,629
-tzdata/zoneinfo/Asia/Tehran,sha256=ozLlhNXzpJCZx7bc-VpcmNdgdtn6lPtF6f9qkaDEycI,812
-tzdata/zoneinfo/Asia/Tel_Aviv,sha256=n83o1YTeoFhfXIcnqvNfSKFJ4NvTqDv2zvi8qcFAIeM,1074
-tzdata/zoneinfo/Asia/Thimbu,sha256=N6d_vfFvYORfMnr1fHJjYSt4DBORSbLi_2T-r2dJBnI,154
-tzdata/zoneinfo/Asia/Thimphu,sha256=N6d_vfFvYORfMnr1fHJjYSt4DBORSbLi_2T-r2dJBnI,154
-tzdata/zoneinfo/Asia/Tokyo,sha256=WaOHFDDw07k-YZ-jCkOkHR6IvdSf8m8J0PQFpQBwb5Y,213
-tzdata/zoneinfo/Asia/Tomsk,sha256=Bf7GoFTcUeP2hYyuYpruJji33tcEoLP-80o38A6i4zU,753
-tzdata/zoneinfo/Asia/Ujung_Pandang,sha256=NV9j_RTuiU47mvJvfKE8daXH5AFYJ8Ki4gvHBJSxyLc,190
-tzdata/zoneinfo/Asia/Ulaanbaatar,sha256=--I8P6_e4BtRIe3wCSkPtwHOu_k9rPsw-KqQKHJC9vM,594
-tzdata/zoneinfo/Asia/Ulan_Bator,sha256=--I8P6_e4BtRIe3wCSkPtwHOu_k9rPsw-KqQKHJC9vM,594
-tzdata/zoneinfo/Asia/Urumqi,sha256=hJyv03dhHML8K0GJGrY8b7M0OUkEXblh_RYmdZMxWtQ,133
-tzdata/zoneinfo/Asia/Ust-Nera,sha256=6NkuV1zOms-4qHQhq-cGc-cqEVgKHk7qd3MLDM-e2BA,771
-tzdata/zoneinfo/Asia/Vientiane,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
-tzdata/zoneinfo/Asia/Vladivostok,sha256=zkOXuEDgpxX8HQGgDlh9SbAQzHOaNxX2XSI6Y4gMD-k,742
-tzdata/zoneinfo/Asia/Yakutsk,sha256=xD6zA4E228dC1mIUQ7cMO-9LORSfE-Fok0awGDG6juk,741
-tzdata/zoneinfo/Asia/Yangon,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,187
-tzdata/zoneinfo/Asia/Yekaterinburg,sha256=q17eUyqOEK2LJYKXYLCJqylj-vmaCG2vSNMttqrQTRk,760
-tzdata/zoneinfo/Asia/Yerevan,sha256=pLEBdchA8H9l-9hdA6FjHmwaj5T1jupK0u-bor1KKa0,708
-tzdata/zoneinfo/Asia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Atlantic/Azores,sha256=6XBp-rgg8hERTe2c-bTKahYPlkDn2sROBuqo9wAdtPE,1401
-tzdata/zoneinfo/Atlantic/Bermuda,sha256=PuxqD2cD99Pzjb8hH99Dws053d_zXnZHjeH0kZ8LSLI,1024
-tzdata/zoneinfo/Atlantic/Canary,sha256=XMmxBlscPIWXhiauKy_d5bxX4xjNMM-5Vw84FwZkT00,478
-tzdata/zoneinfo/Atlantic/Cape_Verde,sha256=E5ss6xpIpD0g_VEDsFMFi-ltsebp98PBSpULoVxIAyU,175
-tzdata/zoneinfo/Atlantic/Faeroe,sha256=Iw0qB0mBuviH5w3Qy8jaxCOes07ZHh2wkW8MPUWJqj0,441
-tzdata/zoneinfo/Atlantic/Faroe,sha256=Iw0qB0mBuviH5w3Qy8jaxCOes07ZHh2wkW8MPUWJqj0,441
-tzdata/zoneinfo/Atlantic/Jan_Mayen,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
-tzdata/zoneinfo/Atlantic/Madeira,sha256=2F3vLmp7OTm4ZMSLxyIVQQ6iXeGUkKKPeUdiGmqVuuI,1372
-tzdata/zoneinfo/Atlantic/Reykjavik,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Atlantic/South_Georgia,sha256=kPGfCLQD2C6_Xc5TyAmqmXP-GYdLLPucpBn3S7ybWu8,132
-tzdata/zoneinfo/Atlantic/St_Helena,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Atlantic/Stanley,sha256=QqQd8IWklNapMKjN5vF7vvVn4K-yl3VKvM5zkCKabCM,789
-tzdata/zoneinfo/Atlantic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Australia/ACT,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
-tzdata/zoneinfo/Australia/Adelaide,sha256=Gk1SdGRVmB233I-WETXAMCZz7L7HVzoN4aUoIcgNr3g,921
-tzdata/zoneinfo/Australia/Brisbane,sha256=2kVWz9CI_qtfdb55g0iL59gUBC7lnO3GUalIQxtHADY,289
-tzdata/zoneinfo/Australia/Broken_Hill,sha256=dzk9LvGA_xRStnAIjAFuTJ8Uwz_s7qGWGQmiXPgDsLY,941
-tzdata/zoneinfo/Australia/Canberra,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
-tzdata/zoneinfo/Australia/Currie,sha256=1IAVgf0AA3sBPXFhaxGfu9UQ_cpd4GNpsQ9xio2l4y0,1003
-tzdata/zoneinfo/Australia/Darwin,sha256=ZoexbhgdUlV4leV-dhBu6AxDVkJy43xrPb9UQ3EQCdI,234
-tzdata/zoneinfo/Australia/Eucla,sha256=3NqsFfMzR6-lSUPViNXBAOyJPqyokisse7uDXurURpk,314
-tzdata/zoneinfo/Australia/Hobart,sha256=1IAVgf0AA3sBPXFhaxGfu9UQ_cpd4GNpsQ9xio2l4y0,1003
-tzdata/zoneinfo/Australia/LHI,sha256=82i9JWWcApPQK7eex9rH1bc6kt_6_OFLTdL_uLoRqto,692
-tzdata/zoneinfo/Australia/Lindeman,sha256=iHkCc0QJ7iaQffiTTXQVJ2swsC7QJxLUMHQOGCFlkTk,325
-tzdata/zoneinfo/Australia/Lord_Howe,sha256=82i9JWWcApPQK7eex9rH1bc6kt_6_OFLTdL_uLoRqto,692
-tzdata/zoneinfo/Australia/Melbourne,sha256=X7JPMEj_SYWyfgWFMkp6FOmT6GfyjR-lF9hFGgTavnE,904
-tzdata/zoneinfo/Australia/NSW,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
-tzdata/zoneinfo/Australia/North,sha256=ZoexbhgdUlV4leV-dhBu6AxDVkJy43xrPb9UQ3EQCdI,234
-tzdata/zoneinfo/Australia/Perth,sha256=ZsuelcBC1YfWugH2CrlOXQcSDD4gGUJCobB1W-aupHo,306
-tzdata/zoneinfo/Australia/Queensland,sha256=2kVWz9CI_qtfdb55g0iL59gUBC7lnO3GUalIQxtHADY,289
-tzdata/zoneinfo/Australia/South,sha256=Gk1SdGRVmB233I-WETXAMCZz7L7HVzoN4aUoIcgNr3g,921
-tzdata/zoneinfo/Australia/Sydney,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
-tzdata/zoneinfo/Australia/Tasmania,sha256=1IAVgf0AA3sBPXFhaxGfu9UQ_cpd4GNpsQ9xio2l4y0,1003
-tzdata/zoneinfo/Australia/Victoria,sha256=X7JPMEj_SYWyfgWFMkp6FOmT6GfyjR-lF9hFGgTavnE,904
-tzdata/zoneinfo/Australia/West,sha256=ZsuelcBC1YfWugH2CrlOXQcSDD4gGUJCobB1W-aupHo,306
-tzdata/zoneinfo/Australia/Yancowinna,sha256=dzk9LvGA_xRStnAIjAFuTJ8Uwz_s7qGWGQmiXPgDsLY,941
-tzdata/zoneinfo/Australia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Brazil/Acre,sha256=VjuQUr668phq5bcH40r94BPnZBKHzJf_MQBfM6Db96U,418
-tzdata/zoneinfo/Brazil/DeNoronha,sha256=Q0r3GtA5y2RGkOj56OTZG5tuBy1B6kfbhyrJqCgf27g,484
-tzdata/zoneinfo/Brazil/East,sha256=-izrIi8GXAKJ85l_8MVLoFp0pZm0Uihw-oapbiThiJE,952
-tzdata/zoneinfo/Brazil/West,sha256=9kgrhpryB94YOVoshJliiiDSf9mwjb3OZwX0HusNRrk,412
-tzdata/zoneinfo/Brazil/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/CET,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
-tzdata/zoneinfo/CST6CDT,sha256=wntzn_RqffBZThINcltDkhfhHkTqmlDNxJEwODtUguc,1754
-tzdata/zoneinfo/Canada/Atlantic,sha256=kO5ahBM2oTLfWS4KX15FbKXfo5wg-f9vw1_hMOISGig,1672
-tzdata/zoneinfo/Canada/Central,sha256=ANzwYGBU1PknQW4LR-H92i5c4Db95LU-UQhPhWZCjDo,1294
-tzdata/zoneinfo/Canada/Eastern,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
-tzdata/zoneinfo/Canada/Mountain,sha256=Dq2mxcSNWZhMWRqxwwtMcaqwAIGMwkOzz-mW8fJscV8,970
-tzdata/zoneinfo/Canada/Newfoundland,sha256=v99q_AFMPll5MMxMp98aqY40cmis2wciTfTqs2_kb0k,1878
-tzdata/zoneinfo/Canada/Pacific,sha256=Epou71sUffvHB1rd7wT0krvo3okXAV45_TWcOFpy26Q,1330
-tzdata/zoneinfo/Canada/Saskatchewan,sha256=_JHuns225iE-THc9NFp-RBq4PWULAuGw2OLbpOB_UMw,638
-tzdata/zoneinfo/Canada/Yukon,sha256=CyY4jNd0fzNSdf1HlYGfaktApmH71tRNRlpOEO32DGs,1029
-tzdata/zoneinfo/Canada/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Chile/Continental,sha256=_QBpU8K0QqLh5m2yqWfdkypIJDkPAc3dnIAc5jRQxxU,1354
-tzdata/zoneinfo/Chile/EasterIsland,sha256=EwVM74XjsboPVxK9bWmdd4nTrtvasP1zlLdxrMB_YaE,1174
-tzdata/zoneinfo/Chile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Cuba,sha256=ms5rCuq2yBM49VmTymMtFQN3c5aBN1lkd8jjzKdnNm8,1117
-tzdata/zoneinfo/EET,sha256=8f1niwVI4ymziTT2KBJV5pjfp2GtH_hB9sy3lgbGE0U,682
-tzdata/zoneinfo/EST,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
-tzdata/zoneinfo/EST5EDT,sha256=1_IgazpFmJ_JrWPVWJIlMvpzUigNX4cXa_HbecsdH6k,1744
-tzdata/zoneinfo/Egypt,sha256=icuaNiEvuC6TPc2fqhDv36lpop7IDDIGO7tFGMAz0b4,1309
-tzdata/zoneinfo/Eire,sha256=EcADNuAvExj-dkqylGfF8q_vv_-mRPqN0k9bCDtJW3E,1496
-tzdata/zoneinfo/Etc/GMT,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/Etc/GMT+0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/Etc/GMT+1,sha256=5L9o8TEUgtB11poIag85vRdq08LMDZmZ6DPn7UqPL_g,113
-tzdata/zoneinfo/Etc/GMT+10,sha256=IvBxiqQU76qzNbuxRo8Ah9rPQSRGQGKp_SRs5u1PPkM,114
-tzdata/zoneinfo/Etc/GMT+11,sha256=9MfFpFp_rt9PksMjQ23VOlir3hzTlnLz_5V2tfonhbU,114
-tzdata/zoneinfo/Etc/GMT+12,sha256=l26XCFp9IbgXGvMw7NHgHzIZbHry2B5qGYfhMDHFVrw,114
-tzdata/zoneinfo/Etc/GMT+2,sha256=YbbqH7B6jNoQEIjyV4-8a2cXD9lGC3vQKnEkY2ucDGI,113
-tzdata/zoneinfo/Etc/GMT+3,sha256=q3D9DLfmTBUAo4YMnNUNUUKrAkKSwM5Q-vesd9A6SZQ,113
-tzdata/zoneinfo/Etc/GMT+4,sha256=UghKME3laXSDZ7q74YDb4FcLnzNqXQydcZpQHvssP2k,113
-tzdata/zoneinfo/Etc/GMT+5,sha256=TZ5qaoELlszW_Z5FdqAEMKk8Y_xu5XhZBNZUco55SrM,113
-tzdata/zoneinfo/Etc/GMT+6,sha256=_2k3LZ5x8hVjMwwmCx6GqUwW-v1IvOkBrJjYH5bD6Qw,113
-tzdata/zoneinfo/Etc/GMT+7,sha256=Di8J430WGr98Ww95tdfIo8hGxkVQfJvlx55ansDuoeQ,113
-tzdata/zoneinfo/Etc/GMT+8,sha256=OIIlUFhZwL2ctx3fxINbY2HDDAmSQ7i2ZAUgX7Exjgw,113
-tzdata/zoneinfo/Etc/GMT+9,sha256=1vpkIoPqBiwDWzH-fLFxwNbmdKRY7mqdiJhYQImVxaw,113
-tzdata/zoneinfo/Etc/GMT-0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/Etc/GMT-1,sha256=S81S9Z0-V-0B5U-0S0Pnbx8fv2iHtwE1LrlZk-ckLto,114
-tzdata/zoneinfo/Etc/GMT-10,sha256=VvdG5IpXB_xJX4omzfrrHblkRUzkbCZXPhTrLngc7vk,115
-tzdata/zoneinfo/Etc/GMT-11,sha256=2sYLfVuDFSy7Kc1WOPiY1EqquHw5Xx4HbDA1QOL1hc4,115
-tzdata/zoneinfo/Etc/GMT-12,sha256=ifHVhk5fczZG3GDy_Nv7YsLNaxf8stB4MrzgWUCINlU,115
-tzdata/zoneinfo/Etc/GMT-13,sha256=CMkORdXsaSyL-4N0n37Cyc1lCr22ZsWyug9_QZVe0E0,115
-tzdata/zoneinfo/Etc/GMT-14,sha256=NK07ElwueU0OP8gORtcXUUug_3v4d04uxfVHMUnLM9U,115
-tzdata/zoneinfo/Etc/GMT-2,sha256=QMToMLcif1S4SNPOMxMtBLqc1skUYnIhbUAjKEdAf9w,114
-tzdata/zoneinfo/Etc/GMT-3,sha256=10GMvfulaJwDQiHiWEJiU_YURyjDfPcl5ugnYBugN3E,114
-tzdata/zoneinfo/Etc/GMT-4,sha256=c6Kx3v41GRkrvky8k71db_UJbpyyp2OZCsjDSvjkr6s,114
-tzdata/zoneinfo/Etc/GMT-5,sha256=94TvO8e_8t52bs8ry70nAquvgK8qJKQTI7lQnVCHX-U,114
-tzdata/zoneinfo/Etc/GMT-6,sha256=3fH8eX--0iDijmYAQHQ0IUXheezaj6-aadZsQNAB4fE,114
-tzdata/zoneinfo/Etc/GMT-7,sha256=DnsTJ3NUYYGLUwFb_L15U_GbaMF-acLVsPyTNySyH-M,114
-tzdata/zoneinfo/Etc/GMT-8,sha256=kvGQUwONDBG7nhEp_wESc4xl4xNXiXEivxAv09nkr_g,114
-tzdata/zoneinfo/Etc/GMT-9,sha256=U1WRFGWQAW91JXK99gY1K9d0rFZYDWHzDUR3z71Lh6Y,114
-tzdata/zoneinfo/Etc/GMT0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/Etc/Greenwich,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/Etc/UCT,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/Etc/UTC,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/Etc/Universal,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/Etc/Zulu,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/Etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Europe/Amsterdam,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
-tzdata/zoneinfo/Europe/Andorra,sha256=leuTyE4uduIBX0aHb_7PK_KlslpWSyS6e0SS84hKFrE,389
-tzdata/zoneinfo/Europe/Astrakhan,sha256=P3E5UDgQ4gqsMi-KdMAWwOSStogdcNl9rLMVUdpFLXI,726
-tzdata/zoneinfo/Europe/Athens,sha256=8f1niwVI4ymziTT2KBJV5pjfp2GtH_hB9sy3lgbGE0U,682
-tzdata/zoneinfo/Europe/Belfast,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/Europe/Belgrade,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
-tzdata/zoneinfo/Europe/Berlin,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
-tzdata/zoneinfo/Europe/Bratislava,sha256=pukw4zdc3LUffYp0iFr_if0UuGHrt1yzOdD5HBbBRpo,723
-tzdata/zoneinfo/Europe/Brussels,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
-tzdata/zoneinfo/Europe/Bucharest,sha256=iY74H96aaTMJvmqAhzUoSI8SjZUtPvv4PGF4ClwFm6U,661
-tzdata/zoneinfo/Europe/Budapest,sha256=qNr-valoDI1mevuQXqOMkOhIcT194EczOKIijxrDMV8,766
-tzdata/zoneinfo/Europe/Busingen,sha256=GZBiscMM_rI3XshMVt9SvlGJGYamKTt6Ek06YlCfRek,497
-tzdata/zoneinfo/Europe/Chisinau,sha256=5TPhkCtxxa0ByLCv7YxOrc5Vtdui2v2VX8vrSopPkPs,755
-tzdata/zoneinfo/Europe/Copenhagen,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
-tzdata/zoneinfo/Europe/Dublin,sha256=EcADNuAvExj-dkqylGfF8q_vv_-mRPqN0k9bCDtJW3E,1496
-tzdata/zoneinfo/Europe/Gibraltar,sha256=t1hglDTLUIFqs91nY5lulN7oxkoAXHnh0zjyaKG2bG8,1220
-tzdata/zoneinfo/Europe/Guernsey,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/Europe/Helsinki,sha256=ccpK9ZmPCZkMXoddNQ_DyONPKAuub-FPNtRpL6znpWM,481
-tzdata/zoneinfo/Europe/Isle_of_Man,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/Europe/Istanbul,sha256=KnFjsWuUgG9pmRNI59CmDEbrYbHwMF9fS4P2E9sQgG8,1200
-tzdata/zoneinfo/Europe/Jersey,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/Europe/Kaliningrad,sha256=57ov9G8m25w1pPdJF8zoFWzq5I6UoBMVsk2eHPelbA8,904
-tzdata/zoneinfo/Europe/Kiev,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
-tzdata/zoneinfo/Europe/Kirov,sha256=KqXGcIbMGTuOoKZYBG-5bj7kVzFbKyGMA99PA0414D0,735
-tzdata/zoneinfo/Europe/Kyiv,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
-tzdata/zoneinfo/Europe/Lisbon,sha256=RNL2z4RzfmoeDa-RQQnpQla-ykC0DJoRt6BOi92u5Ow,1463
-tzdata/zoneinfo/Europe/Ljubljana,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
-tzdata/zoneinfo/Europe/London,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/Europe/Luxembourg,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
-tzdata/zoneinfo/Europe/Madrid,sha256=ylsyHdv8iOB-DQPtL6DIMs5dDdjn2QolIAqOJImMOyE,897
-tzdata/zoneinfo/Europe/Malta,sha256=irX_nDD-BXYObaduu_vhPe1F31xmgL364dSOaT_OVco,928
-tzdata/zoneinfo/Europe/Mariehamn,sha256=ccpK9ZmPCZkMXoddNQ_DyONPKAuub-FPNtRpL6znpWM,481
-tzdata/zoneinfo/Europe/Minsk,sha256=86iP_xDtidkUCqjkoKhH5_El3VI21fSgoIiXl_BzUaU,808
-tzdata/zoneinfo/Europe/Monaco,sha256=zViOd5xXN9cOTkcVja-reUWwJrK7NEVMxHdBgVRZsGg,1105
-tzdata/zoneinfo/Europe/Moscow,sha256=7S4KCZ-0RrJBZoNDjT9W-fxaYqFsdUmn9Zy8k1s2TIo,908
-tzdata/zoneinfo/Europe/Nicosia,sha256=TYYqWp8sK0AwBUHAp0wuuihZuQ19RXdt28bth33zOBI,597
-tzdata/zoneinfo/Europe/Oslo,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
-tzdata/zoneinfo/Europe/Paris,sha256=zViOd5xXN9cOTkcVja-reUWwJrK7NEVMxHdBgVRZsGg,1105
-tzdata/zoneinfo/Europe/Podgorica,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
-tzdata/zoneinfo/Europe/Prague,sha256=pukw4zdc3LUffYp0iFr_if0UuGHrt1yzOdD5HBbBRpo,723
-tzdata/zoneinfo/Europe/Riga,sha256=PU8amev-8XVvl4B_JUOOOM1ofSMbotp-3MPGPHpPoTw,694
-tzdata/zoneinfo/Europe/Rome,sha256=hr0moG_jBXs2zyndejOPJSSv-BFu8I0AWqIRTqYSKGk,947
-tzdata/zoneinfo/Europe/Samara,sha256=Vc60AJe-0-b8prNiFwZTUS1bCbWxxuEnnNcgp8YkQRY,732
-tzdata/zoneinfo/Europe/San_Marino,sha256=hr0moG_jBXs2zyndejOPJSSv-BFu8I0AWqIRTqYSKGk,947
-tzdata/zoneinfo/Europe/Sarajevo,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
-tzdata/zoneinfo/Europe/Saratov,sha256=0fN3eVFVewG-DSVk9xJABDQB1S_Nyn37bHOjj5X8Bm0,726
-tzdata/zoneinfo/Europe/Simferopol,sha256=y2Nybf9LGVNqNdW_GPS-NIDRLriyH_pyxKpT0zmATK4,865
-tzdata/zoneinfo/Europe/Skopje,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
-tzdata/zoneinfo/Europe/Sofia,sha256=LQjC-OJkL4TzZcqD-JUofDAg1-qJui_2Ri6Eoii2MuQ,592
-tzdata/zoneinfo/Europe/Stockholm,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
-tzdata/zoneinfo/Europe/Tallinn,sha256=R6yRfPqESOYQWftlncDWo_fQak61eeiEQKwg_C-C7W8,675
-tzdata/zoneinfo/Europe/Tirane,sha256=I-alATWRd8mfSgvnr3dN_F9vbTB66alvz2GQo0LUbPc,604
-tzdata/zoneinfo/Europe/Tiraspol,sha256=5TPhkCtxxa0ByLCv7YxOrc5Vtdui2v2VX8vrSopPkPs,755
-tzdata/zoneinfo/Europe/Ulyanovsk,sha256=2vK0XahtB_dKjDDXccjMjbQ2bAOfKDe66uMDqtjzHm4,760
-tzdata/zoneinfo/Europe/Uzhgorod,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
-tzdata/zoneinfo/Europe/Vaduz,sha256=GZBiscMM_rI3XshMVt9SvlGJGYamKTt6Ek06YlCfRek,497
-tzdata/zoneinfo/Europe/Vatican,sha256=hr0moG_jBXs2zyndejOPJSSv-BFu8I0AWqIRTqYSKGk,947
-tzdata/zoneinfo/Europe/Vienna,sha256=q8_UF23-KHqc2ay4ju0qT1TuBSpRTnlB7i6vElk4eJw,658
-tzdata/zoneinfo/Europe/Vilnius,sha256=hXvv1PaQndapT7hdywPO3738Y3ZqbW_hJx87khyaOPM,676
-tzdata/zoneinfo/Europe/Volgograd,sha256=v3P6iFJ-rThJprVNDxB7ZYDrimtsW7IvQi_gJpZiJOQ,753
-tzdata/zoneinfo/Europe/Warsaw,sha256=6I9aUfFoFXpBrC3YpO4OmoeUGchMYSK0dxsaKjPZOkw,923
-tzdata/zoneinfo/Europe/Zagreb,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
-tzdata/zoneinfo/Europe/Zaporozhye,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
-tzdata/zoneinfo/Europe/Zurich,sha256=GZBiscMM_rI3XshMVt9SvlGJGYamKTt6Ek06YlCfRek,497
-tzdata/zoneinfo/Europe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Factory,sha256=0ytXntCnQnMWvqJgue4mdUUQRr1YxXxnnCTyZxhgr3Y,113
-tzdata/zoneinfo/GB,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/GB-Eire,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
-tzdata/zoneinfo/GMT,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/GMT+0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/GMT-0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/GMT0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/Greenwich,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
-tzdata/zoneinfo/HST,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
-tzdata/zoneinfo/Hongkong,sha256=9AaPcyRtuXQX9zRnRTVkxX1mRs5JCbn6JTaSPvzX608,775
-tzdata/zoneinfo/Iceland,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
-tzdata/zoneinfo/Indian/Antananarivo,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Indian/Chagos,sha256=J_aS7rs0ZG1dPTGeokXxNJpF4Pds8u1ct49cRtX7giY,152
-tzdata/zoneinfo/Indian/Christmas,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
-tzdata/zoneinfo/Indian/Cocos,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,187
-tzdata/zoneinfo/Indian/Comoro,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Indian/Kerguelen,sha256=lEhfD1j4QnZ-wtuTU51fw6-yvc4WZz2eY8CYjMzWQ44,152
-tzdata/zoneinfo/Indian/Mahe,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
-tzdata/zoneinfo/Indian/Maldives,sha256=lEhfD1j4QnZ-wtuTU51fw6-yvc4WZz2eY8CYjMzWQ44,152
-tzdata/zoneinfo/Indian/Mauritius,sha256=R6pdJalrHVK5LlGOmEsyD66_-c5a9ptJM-xE71Fo8hQ,179
-tzdata/zoneinfo/Indian/Mayotte,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
-tzdata/zoneinfo/Indian/Reunion,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
-tzdata/zoneinfo/Indian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Iran,sha256=ozLlhNXzpJCZx7bc-VpcmNdgdtn6lPtF6f9qkaDEycI,812
-tzdata/zoneinfo/Israel,sha256=n83o1YTeoFhfXIcnqvNfSKFJ4NvTqDv2zvi8qcFAIeM,1074
-tzdata/zoneinfo/Jamaica,sha256=pDexcAMzrv9TqLWGjVOHwIDcFMLT6Vqlzjb5AbNmkoQ,339
-tzdata/zoneinfo/Japan,sha256=WaOHFDDw07k-YZ-jCkOkHR6IvdSf8m8J0PQFpQBwb5Y,213
-tzdata/zoneinfo/Kwajalein,sha256=S-ZFi6idKzDaelLy7DRjGPeD0s7oVud3xLMxZKNlBk8,219
-tzdata/zoneinfo/Libya,sha256=zzMBLZZh4VQ4_ARe5k4L_rsuqKP7edKvVt8F6kvj5FM,431
-tzdata/zoneinfo/MET,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
-tzdata/zoneinfo/MST,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
-tzdata/zoneinfo/MST7MDT,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
-tzdata/zoneinfo/Mexico/BajaNorte,sha256=MGWr-6toDRarjMXTaiOIWgBFWNbw7lHvidLuPKFxfIo,1079
-tzdata/zoneinfo/Mexico/BajaSur,sha256=IN7ecQ9SDq9sDNvu_nc_xuMN2LHSiq8X6YQgmVUe6aY,690
-tzdata/zoneinfo/Mexico/General,sha256=N90r8I8T_OD3B8Ox9M7EAY772cR8g2ew-03rvUYb1y8,773
-tzdata/zoneinfo/Mexico/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/NZ,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
-tzdata/zoneinfo/NZ-CHAT,sha256=pnhY_Lb8V4eo6cK3yL6JZL086SI_etG6rCycppJfTHg,808
-tzdata/zoneinfo/Navajo,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
-tzdata/zoneinfo/PRC,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
-tzdata/zoneinfo/PST8PDT,sha256=IA0FdU9tg6Nxz0CNcIUSV5dlezsL6-uh5QjP_oaj5cg,1294
-tzdata/zoneinfo/Pacific/Apia,sha256=3HDEfICrLIehq3VLq4_r_DhQgFniSd_lXnOjdZgI6hQ,407
-tzdata/zoneinfo/Pacific/Auckland,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
-tzdata/zoneinfo/Pacific/Bougainville,sha256=rqdn1Y4HSarx-vjPk00lsHNfhj3IQgKCViAsumuN_IY,201
-tzdata/zoneinfo/Pacific/Chatham,sha256=pnhY_Lb8V4eo6cK3yL6JZL086SI_etG6rCycppJfTHg,808
-tzdata/zoneinfo/Pacific/Chuuk,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
-tzdata/zoneinfo/Pacific/Easter,sha256=EwVM74XjsboPVxK9bWmdd4nTrtvasP1zlLdxrMB_YaE,1174
-tzdata/zoneinfo/Pacific/Efate,sha256=LiX_rTfipQh_Vnqb_m7OGxyBtyAUC9UANVKHUpLoCcU,342
-tzdata/zoneinfo/Pacific/Enderbury,sha256=ojOG-oqi25HOnY6BFhav_3bmWg1LDILT4v-kxOFVuqI,172
-tzdata/zoneinfo/Pacific/Fakaofo,sha256=Uf8zeML2X8doPg8CX-p0mMGP-IOj7aHAMe7ULD5khxA,153
-tzdata/zoneinfo/Pacific/Fiji,sha256=umCNhtTuBziTXne-WAxzvYvGKqZxTYOTwK-tJhYh4MQ,396
-tzdata/zoneinfo/Pacific/Funafuti,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
-tzdata/zoneinfo/Pacific/Galapagos,sha256=Z1KJPZSvO8M_Pay9WLcNAxzjo8imPrQ7FnXNOXfZl8c,175
-tzdata/zoneinfo/Pacific/Gambier,sha256=yIh86hjpDk1wRWTVJROOGqn9tkc7e9_O6zNxqs-wBoM,132
-tzdata/zoneinfo/Pacific/Guadalcanal,sha256=Ui8PN0th4sb1-n0Z8ceszNCeSiE0Yu47QskNMr8r8Yw,134
-tzdata/zoneinfo/Pacific/Guam,sha256=i57eM6syriUFvAbrVALnziCw_I4lENyzBcJdOaH71yU,350
-tzdata/zoneinfo/Pacific/Honolulu,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
-tzdata/zoneinfo/Pacific/Johnston,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
-tzdata/zoneinfo/Pacific/Kanton,sha256=ojOG-oqi25HOnY6BFhav_3bmWg1LDILT4v-kxOFVuqI,172
-tzdata/zoneinfo/Pacific/Kiritimati,sha256=cUVGmMRBgllfuYJ3X0B0zg0Bf-LPo9l7Le5ju882dx4,174
-tzdata/zoneinfo/Pacific/Kosrae,sha256=pQMLJXilygPhlkm0jCo5JuVmpmYJgLIdiTVxeP59ZEg,242
-tzdata/zoneinfo/Pacific/Kwajalein,sha256=S-ZFi6idKzDaelLy7DRjGPeD0s7oVud3xLMxZKNlBk8,219
-tzdata/zoneinfo/Pacific/Majuro,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
-tzdata/zoneinfo/Pacific/Marquesas,sha256=ilprkRvn-N1XjptSI_0ZwUjeuokP-5l64uKjRBp0kxw,139
-tzdata/zoneinfo/Pacific/Midway,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
-tzdata/zoneinfo/Pacific/Nauru,sha256=wahZONjreNAmYwhQ2CWdKMAE3SVm4S2aYvMZqcAlSYc,183
-tzdata/zoneinfo/Pacific/Niue,sha256=8WWebtgCnrMBKjuLNEYEWlktNI2op2kkKgk0Vcz8GaM,154
-tzdata/zoneinfo/Pacific/Norfolk,sha256=vL8G6W5CScYqp76g0b15UPIYHw2Lt60qOktHUF7caDs,237
-tzdata/zoneinfo/Pacific/Noumea,sha256=ezUyn7AYWBblrZbStlItJYu7XINCLiihrCBZB-Bl-Qw,198
-tzdata/zoneinfo/Pacific/Pago_Pago,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
-tzdata/zoneinfo/Pacific/Palau,sha256=VkLRsKUUVXo3zrhAXn9iM-pKySbGIVfzWoopDhmceMA,148
-tzdata/zoneinfo/Pacific/Pitcairn,sha256=AJh6olJxXQzCMWKOE5ye4jHfgg1VA-9-gCZ5MbrX_8E,153
-tzdata/zoneinfo/Pacific/Pohnpei,sha256=Ui8PN0th4sb1-n0Z8ceszNCeSiE0Yu47QskNMr8r8Yw,134
-tzdata/zoneinfo/Pacific/Ponape,sha256=Ui8PN0th4sb1-n0Z8ceszNCeSiE0Yu47QskNMr8r8Yw,134
-tzdata/zoneinfo/Pacific/Port_Moresby,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
-tzdata/zoneinfo/Pacific/Rarotonga,sha256=J6a2mOrTp4bsZNovj3HjJK9AVJ89PhdEpQMMVD__i18,406
-tzdata/zoneinfo/Pacific/Saipan,sha256=i57eM6syriUFvAbrVALnziCw_I4lENyzBcJdOaH71yU,350
-tzdata/zoneinfo/Pacific/Samoa,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
-tzdata/zoneinfo/Pacific/Tahiti,sha256=Ivcs04hthxEQj1I_6aACc70By0lmxlvhgGFYh843e14,133
-tzdata/zoneinfo/Pacific/Tarawa,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
-tzdata/zoneinfo/Pacific/Tongatapu,sha256=mjGjNSUATfw0yLGB0zsLxz3_L1uWxPANML8K4HQQIMY,237
-tzdata/zoneinfo/Pacific/Truk,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
-tzdata/zoneinfo/Pacific/Wake,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
-tzdata/zoneinfo/Pacific/Wallis,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
-tzdata/zoneinfo/Pacific/Yap,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
-tzdata/zoneinfo/Pacific/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/Poland,sha256=6I9aUfFoFXpBrC3YpO4OmoeUGchMYSK0dxsaKjPZOkw,923
-tzdata/zoneinfo/Portugal,sha256=RNL2z4RzfmoeDa-RQQnpQla-ykC0DJoRt6BOi92u5Ow,1463
-tzdata/zoneinfo/ROC,sha256=oEwscvT3aoMXjQNt2X0VfuHzLkeORN2npcEJI2h-5s8,511
-tzdata/zoneinfo/ROK,sha256=ZKcLb7zJtl52Lb0l64m29AwTcUbtyNvU0IHq-s2reN4,415
-tzdata/zoneinfo/Singapore,sha256=CVSy2aMB2U9DSAJGBqcbvLL6JNPNNwn1vIvKYFA5eF0,256
-tzdata/zoneinfo/Turkey,sha256=KnFjsWuUgG9pmRNI59CmDEbrYbHwMF9fS4P2E9sQgG8,1200
-tzdata/zoneinfo/UCT,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/US/Alaska,sha256=d8oMIpYvBpmLzl5I2By4ZaFEZsg_9dxgfqpIM0QFi_Y,977
-tzdata/zoneinfo/US/Aleutian,sha256=q_sZgOINX4TsX9iBx1gNd6XGwBnzCjg6qpdAQhK0ieA,969
-tzdata/zoneinfo/US/Arizona,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
-tzdata/zoneinfo/US/Central,sha256=wntzn_RqffBZThINcltDkhfhHkTqmlDNxJEwODtUguc,1754
-tzdata/zoneinfo/US/East-Indiana,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
-tzdata/zoneinfo/US/Eastern,sha256=1_IgazpFmJ_JrWPVWJIlMvpzUigNX4cXa_HbecsdH6k,1744
-tzdata/zoneinfo/US/Hawaii,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
-tzdata/zoneinfo/US/Indiana-Starke,sha256=KJCzXct8CTMItVLYLYeBqM6aT6b53gWCg6aDbsH58oI,1016
-tzdata/zoneinfo/US/Michigan,sha256=I4F8Mt9nx38AF6D-steYskBa_HHO6jKU1-W0yRFr50A,899
-tzdata/zoneinfo/US/Mountain,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
-tzdata/zoneinfo/US/Pacific,sha256=IA0FdU9tg6Nxz0CNcIUSV5dlezsL6-uh5QjP_oaj5cg,1294
-tzdata/zoneinfo/US/Samoa,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
-tzdata/zoneinfo/US/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/UTC,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/Universal,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/W-SU,sha256=7S4KCZ-0RrJBZoNDjT9W-fxaYqFsdUmn9Zy8k1s2TIo,908
-tzdata/zoneinfo/WET,sha256=RNL2z4RzfmoeDa-RQQnpQla-ykC0DJoRt6BOi92u5Ow,1463
-tzdata/zoneinfo/Zulu,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
-tzdata/zoneinfo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzdata/zoneinfo/iso3166.tab,sha256=oBpdFY8x1GrY5vjMKgbGQYEGgqk5fUYDIPaNVCG2XnE,4791
-tzdata/zoneinfo/leapseconds,sha256=X1FVahN0_N2AY6gOUBNWW9MsP297cqFQTHJypTr0rgI,3253
-tzdata/zoneinfo/tzdata.zi,sha256=7zXE0Xivypn5-hCW5ALTasSlFTDMoMOcUTEE29FiOo4,107022
-tzdata/zoneinfo/zone.tab,sha256=a2hE16NtKUnPJzM2krm5rKu1vxtP98nUhGHO3sE6DbM,18775
-tzdata/zoneinfo/zone1970.tab,sha256=3ANHICItrC0iU1vSQAMKZXN1a68sozBiy9AHi9ZGooE,17510
-tzdata/zoneinfo/zonenow.tab,sha256=vEbqGYEEhc_CL-FnoeZ5q3CsPTu8sETOnicuJxFJRqY,8101
-tzdata/zones,sha256=QtJFuOPGCOVEojCYP6b1p4Q_LwMzioibni6fGFIseYQ,9084
diff --git a/libs/tzdata-2024.2.dist-info/WHEEL b/libs/tzdata-2024.2.dist-info/WHEEL
deleted file mode 100644
index 17c0299e49..0000000000
--- a/libs/tzdata-2024.2.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/typing_extensions-4.12.2.dist-info/INSTALLER b/libs/tzdata-2025.3.dist-info/INSTALLER
similarity index 100%
rename from libs/typing_extensions-4.12.2.dist-info/INSTALLER
rename to libs/tzdata-2025.3.dist-info/INSTALLER
diff --git a/libs/tzdata-2025.3.dist-info/METADATA b/libs/tzdata-2025.3.dist-info/METADATA
new file mode 100644
index 0000000000..330dd728bb
--- /dev/null
+++ b/libs/tzdata-2025.3.dist-info/METADATA
@@ -0,0 +1,33 @@
+Metadata-Version: 2.4
+Name: tzdata
+Version: 2025.3
+Summary: Provider of IANA time zone data
+Home-page: https://github.com/python/tzdata
+Author: Python Software Foundation
+Author-email: datetime-sig@python.org
+License: Apache-2.0
+Project-URL: Bug Reports, https://github.com/python/tzdata/issues
+Project-URL: Source, https://github.com/python/tzdata
+Project-URL: Documentation, https://tzdata.readthedocs.io
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=2
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+License-File: licenses/LICENSE_APACHE
+Dynamic: license-file
+
+tzdata: Python package providing IANA time zone data
+====================================================
+
+This is a Python package containing ``zic``-compiled binaries for the IANA time
+zone database. It is intended to be a fallback for systems that do not have
+system time zone data installed (or don't have it installed in a standard
+location), as a part of `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_
+
+This repository generates a ``pip``-installable package, published on PyPI as
+`tzdata <https://pypi.org/project/tzdata>`_.
+
+For more information, see `the documentation <https://tzdata.readthedocs.io>`_.
diff --git a/libs/tzdata-2025.3.dist-info/RECORD b/libs/tzdata-2025.3.dist-info/RECORD
new file mode 100644
index 0000000000..d5755f17e2
--- /dev/null
+++ b/libs/tzdata-2025.3.dist-info/RECORD
@@ -0,0 +1,635 @@
+tzdata-2025.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+tzdata-2025.3.dist-info/METADATA,sha256=QiXXu1WSsgB_Zls4Yk6T263TZBP7_PPB-nzYCuewh_g,1352
+tzdata-2025.3.dist-info/RECORD,,
+tzdata-2025.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata-2025.3.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+tzdata-2025.3.dist-info/licenses/LICENSE,sha256=M-jlAC01EtP8wigrmV5rrZ0zR4G5xawxhD9ASQDh87Q,592
+tzdata-2025.3.dist-info/licenses/licenses/LICENSE_APACHE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+tzdata-2025.3.dist-info/top_level.txt,sha256=MO6QqC0xRrN67Gh9xU_nMmadwBVlYzPNkq_h4gYuzaQ,7
+tzdata/__init__.py,sha256=Ee9PzA6folcczG2ywJlO9wJ0f-UVfPeaxXtXdoP-zrE,252
+tzdata/zoneinfo/Africa/Abidjan,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Accra,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Addis_Ababa,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Algiers,sha256=L2nS4gLNFvuo89p3YtB-lSDYY2284SqkGH9pQQI8uwc,470
+tzdata/zoneinfo/Africa/Asmara,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Asmera,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Bamako,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Bangui,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Banjul,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Bissau,sha256=wa3uva129dJHRCi7tYt04kFOn1-osMS2afMjleO9mDw,149
+tzdata/zoneinfo/Africa/Blantyre,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Brazzaville,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Bujumbura,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Cairo,sha256=icuaNiEvuC6TPc2fqhDv36lpop7IDDIGO7tFGMAz0b4,1309
+tzdata/zoneinfo/Africa/Casablanca,sha256=MMps8T4AwqbEN6PIN_pkNiPMBEBqtRZRZceLN-9rxMM,1919
+tzdata/zoneinfo/Africa/Ceuta,sha256=oEIgK53afz1SYxYB_D0jR98Ss3g581yb8TnLppPaYcY,562
+tzdata/zoneinfo/Africa/Conakry,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Dakar,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Dar_es_Salaam,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Djibouti,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Douala,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/El_Aaiun,sha256=6hfLbLfrD1Qy9ZZqLXr1Xw7fzeEs_FqeHN2zZJZUVJI,1830
+tzdata/zoneinfo/Africa/Freetown,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Gaborone,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Harare,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Johannesburg,sha256=0Zrr4kNcToS_euZVM9I6nUQPmBYuW01pxz94PgIpnsg,190
+tzdata/zoneinfo/Africa/Juba,sha256=VTpoMAP-jJ6cKsDeNVr7l3LKGoKDUxGU2b1gqvDPz34,458
+tzdata/zoneinfo/Africa/Kampala,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Khartoum,sha256=NRwOwIg4SR6XuD11k3hxBz77uoBpzejXq7vxtq2Xys8,458
+tzdata/zoneinfo/Africa/Kigali,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Kinshasa,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Lagos,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Libreville,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Lome,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Luanda,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Lubumbashi,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Lusaka,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Malabo,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Maputo,sha256=kQyXwJHNNK50J8gyJiNM57Ty9CXFgi1macJL5iAQp5I,131
+tzdata/zoneinfo/Africa/Maseru,sha256=0Zrr4kNcToS_euZVM9I6nUQPmBYuW01pxz94PgIpnsg,190
+tzdata/zoneinfo/Africa/Mbabane,sha256=0Zrr4kNcToS_euZVM9I6nUQPmBYuW01pxz94PgIpnsg,190
+tzdata/zoneinfo/Africa/Mogadishu,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Monrovia,sha256=WM-JVfr502Vgy18Fe6iAJ2yMgOWbwwumIQh_yp53eKM,164
+tzdata/zoneinfo/Africa/Nairobi,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Africa/Ndjamena,sha256=Tlj4ZUUNJxEhvAoo7TJKqWv1J7tEYaf1FEMez-K9xEg,160
+tzdata/zoneinfo/Africa/Niamey,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Nouakchott,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Ouagadougou,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Porto-Novo,sha256=5e8SiFccxWxSdsqWbhyKZ1xnR3JtdY7K_n7_zm7Ke-Q,180
+tzdata/zoneinfo/Africa/Sao_Tome,sha256=Pfiutakw5B5xr1OSg1uFvT0GwC6jVOqqxnx69GEJu50,173
+tzdata/zoneinfo/Africa/Timbuktu,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Africa/Tripoli,sha256=zzMBLZZh4VQ4_ARe5k4L_rsuqKP7edKvVt8F6kvj5FM,431
+tzdata/zoneinfo/Africa/Tunis,sha256=uoAEER48RJqNeGoYBuk5IeYqjc8sHvWLvKssuVCd18g,449
+tzdata/zoneinfo/Africa/Windhoek,sha256=g1jLRko_2peGsUTg0_wZycOC4gxTAHwfV2SO9I3KdCM,638
+tzdata/zoneinfo/Africa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/America/Adak,sha256=q_sZgOINX4TsX9iBx1gNd6XGwBnzCjg6qpdAQhK0ieA,969
+tzdata/zoneinfo/America/Anchorage,sha256=d8oMIpYvBpmLzl5I2By4ZaFEZsg_9dxgfqpIM0QFi_Y,977
+tzdata/zoneinfo/America/Anguilla,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Antigua,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Araguaina,sha256=TawYX4lVAxq0BxUGhTDx4C8vtBRnLuWi8qLV_oXDiUo,592
+tzdata/zoneinfo/America/Argentina/Buenos_Aires,sha256=IEVOpSfI6oiJJmFNIb9Vb0bOOMIgxO5bghFw7vkHFGk,708
+tzdata/zoneinfo/America/Argentina/Catamarca,sha256=UC0fxx7ZPmjPw3D0BK-5vap-c1cBzbgR293MdmEfOx0,708
+tzdata/zoneinfo/America/Argentina/ComodRivadavia,sha256=UC0fxx7ZPmjPw3D0BK-5vap-c1cBzbgR293MdmEfOx0,708
+tzdata/zoneinfo/America/Argentina/Cordoba,sha256=9Ij3WjT9mWMKQ43LeSUIqQuDb9zS3FSlHYPVNQJTFf0,708
+tzdata/zoneinfo/America/Argentina/Jujuy,sha256=7YpjOcmVaKKpiq31rQe8TTDNExdH9jjZIhdcZv-ShUg,690
+tzdata/zoneinfo/America/Argentina/La_Rioja,sha256=mUkRD5jaWJUy2f8vNFqOlMgKPptULOBn-vf_jMgF6x8,717
+tzdata/zoneinfo/America/Argentina/Mendoza,sha256=dL4q0zgY2FKPbG8cC-Wknnpp8tF2Y7SWgWSC_G_WznI,708
+tzdata/zoneinfo/America/Argentina/Rio_Gallegos,sha256=bCpWMlEI8KWe4c3n6fn8u6WCPnxjYtVy57ERtLTZaEs,708
+tzdata/zoneinfo/America/Argentina/Salta,sha256=H_ybxVycfOe7LlUA3GngoS0jENHkQURIRhjfJQF2kfU,690
+tzdata/zoneinfo/America/Argentina/San_Juan,sha256=Mj5vIUzQl5DtsPe3iMzS7rR-88U9HKW2csQqUda4JNM,717
+tzdata/zoneinfo/America/Argentina/San_Luis,sha256=rka8BokogyvMRFH6jr8D6s1tFIpsUeqHJ_feLK5O6ds,717
+tzdata/zoneinfo/America/Argentina/Tucuman,sha256=yv3aC-hALLio2yqneLIIylZhXKDlbPJGAd_abgsj9gg,726
+tzdata/zoneinfo/America/Argentina/Ushuaia,sha256=mcmZgB1pEHX6i7nlyRzjLnG8bqAtAK1TwMdRD2pZqBE,708
+tzdata/zoneinfo/America/Argentina/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/America/Aruba,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Asuncion,sha256=3JONAueH7Ka_xq5KOrctKkKAauPe3BTg0BOTBA8UNUI,1085
+tzdata/zoneinfo/America/Atikokan,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
+tzdata/zoneinfo/America/Atka,sha256=q_sZgOINX4TsX9iBx1gNd6XGwBnzCjg6qpdAQhK0ieA,969
+tzdata/zoneinfo/America/Bahia,sha256=_-ZFw-HzXc7byacHW_NJHtJ03ADFdqt1kaYgyWYobYw,682
+tzdata/zoneinfo/America/Bahia_Banderas,sha256=lJ8K-PrUqLTefuqpcKp_YWvfvzH0WNNrZ_LIel_0oZQ,700
+tzdata/zoneinfo/America/Barbados,sha256=gdiJf9ZKOMs9QB4ex0-crvdmhNfHpNzXTV2xTaNDCAg,278
+tzdata/zoneinfo/America/Belem,sha256=w0jv-gdBbEBZQBF2z2liKpRM9CEOWA36O1qU1nJKeCs,394
+tzdata/zoneinfo/America/Belize,sha256=uYBPJqnCGnOOeKnoz1IG9POWTvXD5kUirpFuB0PHjVo,1045
+tzdata/zoneinfo/America/Blanc-Sablon,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Boa_Vista,sha256=hYTFFNNZJdl_nSYIdfI8SQhtmfiakjCDI_15TlB-xEw,430
+tzdata/zoneinfo/America/Bogota,sha256=BqH6uClrrlT-VsBmke2Mh-IfA1R1l1h031CRUSLS1no,179
+tzdata/zoneinfo/America/Boise,sha256=Jt3omyPSPRoKE-KXVd-wxVON-CDE5oGaJA7Ar90Q2OM,999
+tzdata/zoneinfo/America/Buenos_Aires,sha256=IEVOpSfI6oiJJmFNIb9Vb0bOOMIgxO5bghFw7vkHFGk,708
+tzdata/zoneinfo/America/Cambridge_Bay,sha256=NFwNVfgxb2YMLzc-42RA-SKtNcODpukEfYf_QWWYTsI,883
+tzdata/zoneinfo/America/Campo_Grande,sha256=mngKYjaH_ENVmJ-mtURVjjFo5kHgLfYNPHZaCVSxQFE,952
+tzdata/zoneinfo/America/Cancun,sha256=YSoUxbjaL2MycKCTB3ZAK9jPVaeMhW7MkOEA8eWakKY,538
+tzdata/zoneinfo/America/Caracas,sha256=UHmUwc0mFPoidR4UDCWb4T4w_mpCBsSb4BkW3SOKIVY,190
+tzdata/zoneinfo/America/Catamarca,sha256=UC0fxx7ZPmjPw3D0BK-5vap-c1cBzbgR293MdmEfOx0,708
+tzdata/zoneinfo/America/Cayenne,sha256=9URU4o1v5759UWuh8xI9vnaANOceOeRW67XoGQuuUa8,151
+tzdata/zoneinfo/America/Cayman,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
+tzdata/zoneinfo/America/Chicago,sha256=wntzn_RqffBZThINcltDkhfhHkTqmlDNxJEwODtUguc,1754
+tzdata/zoneinfo/America/Chihuahua,sha256=tzOmA7trhFykyUZ7QbuMA6A88BSF2o4mumo65aojzqo,691
+tzdata/zoneinfo/America/Ciudad_Juarez,sha256=mEE-VN-sqVDaHFJyFGUBYyOsYHCRspUZcSJqt26Wufg,718
+tzdata/zoneinfo/America/Coral_Harbour,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
+tzdata/zoneinfo/America/Cordoba,sha256=9Ij3WjT9mWMKQ43LeSUIqQuDb9zS3FSlHYPVNQJTFf0,708
+tzdata/zoneinfo/America/Costa_Rica,sha256=ihoqA_tHmYm0YjTRLZu3q8PqsqqOeb1CELjWhPf_HXE,232
+tzdata/zoneinfo/America/Coyhaique,sha256=c_K3bduiI0P_lEnoJUNUZq2qF2-Svfo70xveKg9y9fc,1362
+tzdata/zoneinfo/America/Creston,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
+tzdata/zoneinfo/America/Cuiaba,sha256=OaIle0Cr-BKe0hOik5rwdcoCbQ5LSHkHqBS2cLoCqAU,934
+tzdata/zoneinfo/America/Curacao,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Danmarkshavn,sha256=cQORuA8pR0vw3ZwYfeGkWaT1tPU66nMQ2xRKT1T1Yb4,447
+tzdata/zoneinfo/America/Dawson,sha256=BlKV0U36jqnlxM5-Pxn8OIiY5kJEcLlt3QZo-GsMzlY,1029
+tzdata/zoneinfo/America/Dawson_Creek,sha256=t4USMuIvq1VVL9gYCabraAYs31kmAqAnwf7GzEiJJNc,683
+tzdata/zoneinfo/America/Denver,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
+tzdata/zoneinfo/America/Detroit,sha256=I4F8Mt9nx38AF6D-steYskBa_HHO6jKU1-W0yRFr50A,899
+tzdata/zoneinfo/America/Dominica,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Edmonton,sha256=Dq2mxcSNWZhMWRqxwwtMcaqwAIGMwkOzz-mW8fJscV8,970
+tzdata/zoneinfo/America/Eirunepe,sha256=6tKYaRpnbBSmXiwXy7_m4WW_rbVfn5LUec0keC3J7Iw,436
+tzdata/zoneinfo/America/El_Salvador,sha256=4wjsCpRH9AFk5abLAbnuv-zouhRKcwb0aenk-nWtmz0,176
+tzdata/zoneinfo/America/Ensenada,sha256=r5rqSu5QUUP6XoR2Q8D_4WQZDDhBEBCsfwsXD0CYpsg,1367
+tzdata/zoneinfo/America/Fort_Nelson,sha256=_j7IJ-hXHtV_7dSMg6pxGQLb6z_IaUMj3aJde_F49QQ,1448
+tzdata/zoneinfo/America/Fort_Wayne,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
+tzdata/zoneinfo/America/Fortaleza,sha256=ugF4DWO3j_khONebf7CLsT9ldL-JOWey_69S0jl2LIA,484
+tzdata/zoneinfo/America/Glace_Bay,sha256=I1posPHAEfg_Lc_FQdX1B8F8_A0NeJnK72p36PE7pKM,880
+tzdata/zoneinfo/America/Godthab,sha256=LlGZ5Y_ud9JwWRvncHnUHRArQbbnNcmmrz3duMhR3Hc,965
+tzdata/zoneinfo/America/Goose_Bay,sha256=gCJA1Sk2ciUg2WInn8DmPBwRAw0FjQbYPaUJK80mtMI,1580
+tzdata/zoneinfo/America/Grand_Turk,sha256=Gp8hpMt9P3QoEHmsIX2bqGNMkUSvlwZqqNzccR-cbe8,853
+tzdata/zoneinfo/America/Grenada,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Guadeloupe,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Guatemala,sha256=BGPGI4lyN6IFF_T0kx1q2lh3U5SEhbyDqLFuW8EFCaU,212
+tzdata/zoneinfo/America/Guayaquil,sha256=8OIaCy-SirKKz4I77l6MQFDgSLHtjN0TvklLVEZ_008,179
+tzdata/zoneinfo/America/Guyana,sha256=PmnEtWtOTamsPJXEo7PcNQCy2Rp-evGyJh4cf0pjAR4,181
+tzdata/zoneinfo/America/Halifax,sha256=kO5ahBM2oTLfWS4KX15FbKXfo5wg-f9vw1_hMOISGig,1672
+tzdata/zoneinfo/America/Havana,sha256=ms5rCuq2yBM49VmTymMtFQN3c5aBN1lkd8jjzKdnNm8,1117
+tzdata/zoneinfo/America/Hermosillo,sha256=Ur1MYSAX3QbT2UX57LmD83o6s2Z-6YbYeOufKvT-zTM,258
+tzdata/zoneinfo/America/Indiana/Indianapolis,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
+tzdata/zoneinfo/America/Indiana/Knox,sha256=KJCzXct8CTMItVLYLYeBqM6aT6b53gWCg6aDbsH58oI,1016
+tzdata/zoneinfo/America/Indiana/Marengo,sha256=ygWmq8sYee8NFwlSZyQ_tsKopFQMp9Ne557zGGbyF2Y,567
+tzdata/zoneinfo/America/Indiana/Petersburg,sha256=BIrubzHEp5QoyMaPgYbC1zSa_F3LwpXzKM8xH3rHspI,683
+tzdata/zoneinfo/America/Indiana/Tell_City,sha256=em2YMHDWEFXdZH0BKi5bLRAQ8bYDfop2T0Q8SqDh0B8,522
+tzdata/zoneinfo/America/Indiana/Vevay,sha256=dPk334e7MQwl71-avNyREBYVWuFTQcVKfltlRhrlRpw,369
+tzdata/zoneinfo/America/Indiana/Vincennes,sha256=jiODDXepmLP3gvCkBufdE3rp5cEXftBHnKne8_XOOCg,558
+tzdata/zoneinfo/America/Indiana/Winamac,sha256=hsEunaLrbxvspyV3Qm4UD7x7qOAeBtzcbbzANNMrdiw,603
+tzdata/zoneinfo/America/Indiana/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/America/Indianapolis,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
+tzdata/zoneinfo/America/Inuvik,sha256=d_ZX-USS70HIT-_PRJKMY6mbQRvbKLvsy9ar7uL2M40,817
+tzdata/zoneinfo/America/Iqaluit,sha256=nONS7zksGHTrbEJj73LYRZW964OncQuj_V6fNjpDoQ0,855
+tzdata/zoneinfo/America/Jamaica,sha256=pDexcAMzrv9TqLWGjVOHwIDcFMLT6Vqlzjb5AbNmkoQ,339
+tzdata/zoneinfo/America/Jujuy,sha256=7YpjOcmVaKKpiq31rQe8TTDNExdH9jjZIhdcZv-ShUg,690
+tzdata/zoneinfo/America/Juneau,sha256=V8IqRaJHSH7onK1gu3YYtW_a4VkNwjx5DCvQXpFdYAo,966
+tzdata/zoneinfo/America/Kentucky/Louisville,sha256=zS2SS573D9TmQZFWtSyRIVN3ZXVN_2FpVBbtqQFMzKU,1242
+tzdata/zoneinfo/America/Kentucky/Monticello,sha256=54or2oQ9bSbM9ifRoOjV7UjRF83jSSPuxfGeXH0nIqk,972
+tzdata/zoneinfo/America/Kentucky/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/America/Knox_IN,sha256=KJCzXct8CTMItVLYLYeBqM6aT6b53gWCg6aDbsH58oI,1016
+tzdata/zoneinfo/America/Kralendijk,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/La_Paz,sha256=2iYBxnc0HIwAzlx-Q3AI9Lb0GI87VY279oGcroBZSVs,170
+tzdata/zoneinfo/America/Lima,sha256=7vNjRhxzL-X4kyba-NkzXYNAOE-cqqcXvzXTqcTXBhY,283
+tzdata/zoneinfo/America/Los_Angeles,sha256=IA0FdU9tg6Nxz0CNcIUSV5dlezsL6-uh5QjP_oaj5cg,1294
+tzdata/zoneinfo/America/Louisville,sha256=zS2SS573D9TmQZFWtSyRIVN3ZXVN_2FpVBbtqQFMzKU,1242
+tzdata/zoneinfo/America/Lower_Princes,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Maceio,sha256=dSVg0dHedT9w1QO2F1AvWoel4_h8wmuYS4guEaL-5Kk,502
+tzdata/zoneinfo/America/Managua,sha256=ZYsoyN_GIlwAIpIj1spjQDPWGQ9kFZSipjUbO8caGfw,295
+tzdata/zoneinfo/America/Manaus,sha256=9kgrhpryB94YOVoshJliiiDSf9mwjb3OZwX0HusNRrk,412
+tzdata/zoneinfo/America/Marigot,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Martinique,sha256=m3rC6Mogc6cc1a9XJ8FPIYhZaSFNdYkxaZ-pfHhG3X4,178
+tzdata/zoneinfo/America/Matamoros,sha256=KxgAMGkE7TJuug9byFsT3KN836X3OyXq77v-tFpLVvc,437
+tzdata/zoneinfo/America/Mazatlan,sha256=IN7ecQ9SDq9sDNvu_nc_xuMN2LHSiq8X6YQgmVUe6aY,690
+tzdata/zoneinfo/America/Mendoza,sha256=dL4q0zgY2FKPbG8cC-Wknnpp8tF2Y7SWgWSC_G_WznI,708
+tzdata/zoneinfo/America/Menominee,sha256=oUmJmzOZtChYrB9In-E1GqEVi2ogKjPESXlUySUGs94,917
+tzdata/zoneinfo/America/Merida,sha256=LBpOEv4xxUcL5B7wFSNa3UyE762-EiSXb1KPQNKwwCU,654
+tzdata/zoneinfo/America/Metlakatla,sha256=EVj1LkMCgry6mT8Ln_FpHxpJSU0oSncfbHGWIQ0SI_0,586
+tzdata/zoneinfo/America/Mexico_City,sha256=N90r8I8T_OD3B8Ox9M7EAY772cR8g2ew-03rvUYb1y8,773
+tzdata/zoneinfo/America/Miquelon,sha256=Eey-Id5b4HFODINweRFtbDjcgjs_myiC2UwsgYt4kVk,550
+tzdata/zoneinfo/America/Moncton,sha256=knrBNDFwHAGFr0nWJTBQ-10F_fZ5x4n3SnZtH-KI6h8,1493
+tzdata/zoneinfo/America/Monterrey,sha256=1aYsIp-Na0lDAKVrcW4wVKFAXy5BAqDG2wWLT9wTmmQ,709
+tzdata/zoneinfo/America/Montevideo,sha256=l7FjW6qscGzdvfjlbIeZ5CQ_AFWS3ZeVDS5ppMJCNM0,969
+tzdata/zoneinfo/America/Montreal,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
+tzdata/zoneinfo/America/Montserrat,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Nassau,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
+tzdata/zoneinfo/America/New_York,sha256=1_IgazpFmJ_JrWPVWJIlMvpzUigNX4cXa_HbecsdH6k,1744
+tzdata/zoneinfo/America/Nipigon,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
+tzdata/zoneinfo/America/Nome,sha256=_-incQnh0DwK9hJqFaYzO4osUKAUB2k2lae565sblpA,975
+tzdata/zoneinfo/America/Noronha,sha256=Q0r3GtA5y2RGkOj56OTZG5tuBy1B6kfbhyrJqCgf27g,484
+tzdata/zoneinfo/America/North_Dakota/Beulah,sha256=RvaBIS60bNNRmREi6BXSWEbJSrcP7J8Nmxg8OkBcrow,1043
+tzdata/zoneinfo/America/North_Dakota/Center,sha256=M09x4Mx6hcBAwktvwv16YvPRmsuDjZEDwHT0Umkcgyo,990
+tzdata/zoneinfo/America/North_Dakota/New_Salem,sha256=mZca9gyfO2USzax7v0mLJEYBKBVmIqylWqnfLgSsVys,990
+tzdata/zoneinfo/America/North_Dakota/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/America/Nuuk,sha256=LlGZ5Y_ud9JwWRvncHnUHRArQbbnNcmmrz3duMhR3Hc,965
+tzdata/zoneinfo/America/Ojinaga,sha256=97mJ9VI8h1lRAREIdJdTz_MCLtwh4b36iaQ9QolETpA,718
+tzdata/zoneinfo/America/Panama,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
+tzdata/zoneinfo/America/Pangnirtung,sha256=nONS7zksGHTrbEJj73LYRZW964OncQuj_V6fNjpDoQ0,855
+tzdata/zoneinfo/America/Paramaribo,sha256=C2v9tR6no54CRECWDFhANTl40UsA4AhHsdnGoNCb4_Q,187
+tzdata/zoneinfo/America/Phoenix,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
+tzdata/zoneinfo/America/Port-au-Prince,sha256=wsS6VbQ__bKJ2IUMPy_Pao0CLRK5pXEBrqkaYuqs3Ns,565
+tzdata/zoneinfo/America/Port_of_Spain,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Porto_Acre,sha256=VjuQUr668phq5bcH40r94BPnZBKHzJf_MQBfM6Db96U,418
+tzdata/zoneinfo/America/Porto_Velho,sha256=9yPU8EXtKDQHLF745ETc9qZZ9Me2CK6jvgb6S53pSKg,394
+tzdata/zoneinfo/America/Puerto_Rico,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Punta_Arenas,sha256=2Aqh7bqo-mQlnMjURDkCOeEYmeXhkzKP7OxFAvhTjjA,1218
+tzdata/zoneinfo/America/Rainy_River,sha256=ANzwYGBU1PknQW4LR-H92i5c4Db95LU-UQhPhWZCjDo,1294
+tzdata/zoneinfo/America/Rankin_Inlet,sha256=JQCXQBdyc8uJTjIFO4jZuzS0OjG0gRHv8MPmdzN93CU,807
+tzdata/zoneinfo/America/Recife,sha256=3yZTwF3MJlkY0D48CQUTzCRwDCfGNq8EXXTZYlBgUTg,484
+tzdata/zoneinfo/America/Regina,sha256=_JHuns225iE-THc9NFp-RBq4PWULAuGw2OLbpOB_UMw,638
+tzdata/zoneinfo/America/Resolute,sha256=2UeJBR2ZSkn1bUZy0G0SEhBtY9vycwSRU4naK-sw044,807
+tzdata/zoneinfo/America/Rio_Branco,sha256=VjuQUr668phq5bcH40r94BPnZBKHzJf_MQBfM6Db96U,418
+tzdata/zoneinfo/America/Rosario,sha256=9Ij3WjT9mWMKQ43LeSUIqQuDb9zS3FSlHYPVNQJTFf0,708
+tzdata/zoneinfo/America/Santa_Isabel,sha256=r5rqSu5QUUP6XoR2Q8D_4WQZDDhBEBCsfwsXD0CYpsg,1367
+tzdata/zoneinfo/America/Santarem,sha256=dDEGsnrm4wrzl4sK6K8PzEroBKD7A1V7HBa8cWW4cMk,409
+tzdata/zoneinfo/America/Santiago,sha256=_QBpU8K0QqLh5m2yqWfdkypIJDkPAc3dnIAc5jRQxxU,1354
+tzdata/zoneinfo/America/Santo_Domingo,sha256=xmJo59mZXN7Wnf-3Jjl37mCC-8GfN6xmk2l_vngyfeI,317
+tzdata/zoneinfo/America/Sao_Paulo,sha256=-izrIi8GXAKJ85l_8MVLoFp0pZm0Uihw-oapbiThiJE,952
+tzdata/zoneinfo/America/Scoresbysund,sha256=wrhIEVAFI29qKT3TdOWiiJwI80AohXwwfb1mCPSAXHo,984
+tzdata/zoneinfo/America/Shiprock,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
+tzdata/zoneinfo/America/Sitka,sha256=pF5yln--MOzEMDacNd_Id0HX9pAmge8POfcxyTNh1-0,956
+tzdata/zoneinfo/America/St_Barthelemy,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/St_Johns,sha256=v99q_AFMPll5MMxMp98aqY40cmis2wciTfTqs2_kb0k,1878
+tzdata/zoneinfo/America/St_Kitts,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/St_Lucia,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/St_Thomas,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/St_Vincent,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Swift_Current,sha256=F-b65Yaax23CsuhSmeTDl6Tv9du4IsvWvMbbSuwHkLM,368
+tzdata/zoneinfo/America/Tegucigalpa,sha256=KlvqBJGswa9DIXlE3acU-pgd4IFqDeBRrUz02PmlNC0,194
+tzdata/zoneinfo/America/Thule,sha256=LzL5jdmZkxRkHdA3XkoqJPG_ImllnSRhYYLQpMf_TY8,455
+tzdata/zoneinfo/America/Thunder_Bay,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
+tzdata/zoneinfo/America/Tijuana,sha256=r5rqSu5QUUP6XoR2Q8D_4WQZDDhBEBCsfwsXD0CYpsg,1367
+tzdata/zoneinfo/America/Toronto,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
+tzdata/zoneinfo/America/Tortola,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Vancouver,sha256=Epou71sUffvHB1rd7wT0krvo3okXAV45_TWcOFpy26Q,1330
+tzdata/zoneinfo/America/Virgin,sha256=q76GKN1Uh8iJ24Fs46UHe7tH9rr6_rlBHZLW7y9wzo0,177
+tzdata/zoneinfo/America/Whitehorse,sha256=CyY4jNd0fzNSdf1HlYGfaktApmH71tRNRlpOEO32DGs,1029
+tzdata/zoneinfo/America/Winnipeg,sha256=ANzwYGBU1PknQW4LR-H92i5c4Db95LU-UQhPhWZCjDo,1294
+tzdata/zoneinfo/America/Yakutat,sha256=pvHLVNA1mI-H9fBDnlnpI6B9XzVFQeyvI9nyIkaFNYQ,946
+tzdata/zoneinfo/America/Yellowknife,sha256=Dq2mxcSNWZhMWRqxwwtMcaqwAIGMwkOzz-mW8fJscV8,970
+tzdata/zoneinfo/America/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Antarctica/Casey,sha256=1jc-FAjvkKnmCjhz8-yQgEKrN_sVmzAi8DVoy9_K8AQ,287
+tzdata/zoneinfo/Antarctica/Davis,sha256=Pom_267rsoZl6yLvYllu_SW1kixIrSPmsd-HLztn33Y,197
+tzdata/zoneinfo/Antarctica/DumontDUrville,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
+tzdata/zoneinfo/Antarctica/Macquarie,sha256=aOZlIzIdTwevaTXoQkDlex2LSFDrg64GvRfcLnfCDAM,976
+tzdata/zoneinfo/Antarctica/Mawson,sha256=UYuiBSE0qZ-2kkBAa6Xq5g9NXg-W_R0P-rl2tlO0jHc,152
+tzdata/zoneinfo/Antarctica/McMurdo,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
+tzdata/zoneinfo/Antarctica/Palmer,sha256=3MXfhQBaRB57_jqHZMl-M_K48NMFe4zALc7vaMyS5xw,887
+tzdata/zoneinfo/Antarctica/Rothera,sha256=XeddRL2YTDfEWzQI7nDqfW-Tfg-5EebxsHsMHyzGudI,132
+tzdata/zoneinfo/Antarctica/South_Pole,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
+tzdata/zoneinfo/Antarctica/Syowa,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
+tzdata/zoneinfo/Antarctica/Troll,sha256=s4z0F_uKzx3biKjEzvHwb56132XRs6IR22fCQglW5GI,158
+tzdata/zoneinfo/Antarctica/Vostok,sha256=cDp-B4wKXE8U5b_zqJIlxdGY-AIAMCTJOZG3bRZBKNc,170
+tzdata/zoneinfo/Antarctica/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Arctic/Longyearbyen,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
+tzdata/zoneinfo/Arctic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Asia/Aden,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
+tzdata/zoneinfo/Asia/Almaty,sha256=87WNMKCF7W2V6tq5LvX5DXWoi9MuwjCAY3f9dgwui4s,618
+tzdata/zoneinfo/Asia/Amman,sha256=KOnKO4_1XRlQvLG61GTbfKImSthwBHMSnzV1ExW8i5Q,928
+tzdata/zoneinfo/Asia/Anadyr,sha256=30bdZurg4Q__lCpH509TE0U7pOcEY6qxjvuPF9ai5yc,743
+tzdata/zoneinfo/Asia/Aqtau,sha256=bRj27vG5HvGegFg5eIKNmq3dfteYmr7KmTs4JFO-7SM,606
+tzdata/zoneinfo/Asia/Aqtobe,sha256=Pm7yI5cmfzx8CGXR2mQJDjtH12KCpx8ezFKchiJVVJ4,615
+tzdata/zoneinfo/Asia/Ashgabat,sha256=OTLHdQ8jFPDvxu_IwKX_c3W3jdN6e7FGoCSEEb0XKuw,375
+tzdata/zoneinfo/Asia/Ashkhabad,sha256=OTLHdQ8jFPDvxu_IwKX_c3W3jdN6e7FGoCSEEb0XKuw,375
+tzdata/zoneinfo/Asia/Atyrau,sha256=1YG4QzLxPRZQeGHiOrbm0cRs8ERTNg1NF9dWEwW2Pi0,616
+tzdata/zoneinfo/Asia/Baghdad,sha256=zFe6LXSfuoJjGsmYTMGjJtBcAMLiKFkD7j7-VaqKwH8,630
+tzdata/zoneinfo/Asia/Bahrain,sha256=YWDWV1o3HHWxnmwlzwMWC53C84ZYPkK_gYn9-P0Xx4U,152
+tzdata/zoneinfo/Asia/Baku,sha256=_Wh6ONaRatMc9lpwGO6zB9pTE38NZ4oWg4_-sZl17mA,744
+tzdata/zoneinfo/Asia/Bangkok,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
+tzdata/zoneinfo/Asia/Barnaul,sha256=UGFYJYvtgYVS8Tqsqvj6p0OQCmN3zdY9wITWg8ODG-k,753
+tzdata/zoneinfo/Asia/Beirut,sha256=FgM4gqbWFp6KuUnVn-H8UIXZgTydBeOxDdbebJ0GpUc,732
+tzdata/zoneinfo/Asia/Bishkek,sha256=RXdxVxaiE5zxX5atQl-7ZesEeZVjsCXBGZ6cJbVU9pE,618
+tzdata/zoneinfo/Asia/Brunei,sha256=3ajgII3xZ-Wc-dqXRTSMw8qQRDSjXlSBIxyE_sDRGTk,320
+tzdata/zoneinfo/Asia/Calcutta,sha256=OgC9vhvElZ5ydWfHMLpRsDRV7NRV98GQxa0UOG63mw0,220
+tzdata/zoneinfo/Asia/Chita,sha256=1Lme3ccO47R5gmTe5VCq1BSb0m_1opWibq21zvZlntg,750
+tzdata/zoneinfo/Asia/Choibalsan,sha256=--I8P6_e4BtRIe3wCSkPtwHOu_k9rPsw-KqQKHJC9vM,594
+tzdata/zoneinfo/Asia/Chongqing,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
+tzdata/zoneinfo/Asia/Chungking,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
+tzdata/zoneinfo/Asia/Colombo,sha256=QAyjK7gtXUWfLuju1M0H3_ew6iTM-bwfzO5obgvaHy8,247
+tzdata/zoneinfo/Asia/Dacca,sha256=rCGmEwbW4qkUU2QfTj5zLrydVCq8HTWl1dsqEDQOvvo,231
+tzdata/zoneinfo/Asia/Damascus,sha256=AtZTDRzHEB7QnKxFXvtWsNUI1cCCe27sAfpDfQd0MwY,1234
+tzdata/zoneinfo/Asia/Dhaka,sha256=rCGmEwbW4qkUU2QfTj5zLrydVCq8HTWl1dsqEDQOvvo,231
+tzdata/zoneinfo/Asia/Dili,sha256=5fcCHkVIZkLV8TcsqBQ8HstILEpz3ay3MGGU6sgNxLA,170
+tzdata/zoneinfo/Asia/Dubai,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
+tzdata/zoneinfo/Asia/Dushanbe,sha256=8qbn76rf9xu47NYVdfGvjnkf2KZxNN5J8ekFiXUz3AQ,366
+tzdata/zoneinfo/Asia/Famagusta,sha256=385fbaRnx-mdEaXqSyBKVBDDKPzCGKbynWYt75wwCug,940
+tzdata/zoneinfo/Asia/Gaza,sha256=-PC__gGODaDGgv5LLzH7ptNLbNdStPkxGY4LmebvcNU,2950
+tzdata/zoneinfo/Asia/Harbin,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
+tzdata/zoneinfo/Asia/Hebron,sha256=4FujfuE-ECIXgKW4pv0lxq2ZkAj7jDwt0rezuA0fFzg,2968
+tzdata/zoneinfo/Asia/Ho_Chi_Minh,sha256=R-ReVMreMcETG0Sifjfe5z-PgQpUsKjT6dVbEKzT3sE,236
+tzdata/zoneinfo/Asia/Hong_Kong,sha256=9AaPcyRtuXQX9zRnRTVkxX1mRs5JCbn6JTaSPvzX608,775
+tzdata/zoneinfo/Asia/Hovd,sha256=eqAvD2RfuIfSDhtqk58MECIjz5X14OHZ7aO4z14kndk,594
+tzdata/zoneinfo/Asia/Irkutsk,sha256=sWxp8g_aSfFan4ZyF9s6-pEX5Vgwxi_jNv7vwN06XIo,760
+tzdata/zoneinfo/Asia/Istanbul,sha256=KnFjsWuUgG9pmRNI59CmDEbrYbHwMF9fS4P2E9sQgG8,1200
+tzdata/zoneinfo/Asia/Jakarta,sha256=4qCZ6kix9xZriNIZsyb3xENz0IkJzZcjtENGlG_Wo4Q,248
+tzdata/zoneinfo/Asia/Jayapura,sha256=BUa0kX1iOdf0E-v7415h7l0lQv4DBCYX_3dAbYmQ0xU,171
+tzdata/zoneinfo/Asia/Jerusalem,sha256=n83o1YTeoFhfXIcnqvNfSKFJ4NvTqDv2zvi8qcFAIeM,1074
+tzdata/zoneinfo/Asia/Kabul,sha256=pNIwTfiSG71BGKvrhKqo1xdxckAx9vfcx5nJanrL81Q,159
+tzdata/zoneinfo/Asia/Kamchatka,sha256=Qix8x3s-m8UTeiwzNPBy_ZQvAzX_aaihz_PzLfTiUac,727
+tzdata/zoneinfo/Asia/Karachi,sha256=ujo4wv-3oa9tfrFT5jsLcEYcjeGeBRgG2QwdXg_ijU4,266
+tzdata/zoneinfo/Asia/Kashgar,sha256=hJyv03dhHML8K0GJGrY8b7M0OUkEXblh_RYmdZMxWtQ,133
+tzdata/zoneinfo/Asia/Kathmandu,sha256=drjxv-ByIxodnn-FATEOJ8DQgEjEj3Qihgtkd8FCxDg,161
+tzdata/zoneinfo/Asia/Katmandu,sha256=drjxv-ByIxodnn-FATEOJ8DQgEjEj3Qihgtkd8FCxDg,161
+tzdata/zoneinfo/Asia/Khandyga,sha256=fdEDOsDJkLuENybqIXtTiI4k2e24dKHDfBTww9AtbSw,775
+tzdata/zoneinfo/Asia/Kolkata,sha256=OgC9vhvElZ5ydWfHMLpRsDRV7NRV98GQxa0UOG63mw0,220
+tzdata/zoneinfo/Asia/Krasnoyarsk,sha256=buNI5S1g7eedK-PpnrLkBFFZDUyCtHxcxXDQGF2ARos,741
+tzdata/zoneinfo/Asia/Kuala_Lumpur,sha256=CVSy2aMB2U9DSAJGBqcbvLL6JNPNNwn1vIvKYFA5eF0,256
+tzdata/zoneinfo/Asia/Kuching,sha256=3ajgII3xZ-Wc-dqXRTSMw8qQRDSjXlSBIxyE_sDRGTk,320
+tzdata/zoneinfo/Asia/Kuwait,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
+tzdata/zoneinfo/Asia/Macao,sha256=mr89i_wpMoWhAtqZrF2SGcoILcUw6rYrDkIUNADes7E,791
+tzdata/zoneinfo/Asia/Macau,sha256=mr89i_wpMoWhAtqZrF2SGcoILcUw6rYrDkIUNADes7E,791
+tzdata/zoneinfo/Asia/Magadan,sha256=wAufMGWL_s1Aw2l3myAfBFtrROVPes3dMoNuDEoNwT8,751
+tzdata/zoneinfo/Asia/Makassar,sha256=NV9j_RTuiU47mvJvfKE8daXH5AFYJ8Ki4gvHBJSxyLc,190
+tzdata/zoneinfo/Asia/Manila,sha256=FoGmIyFInHknfE103PbiD65GUwsmnYWzF5oGys03BqY,274
+tzdata/zoneinfo/Asia/Muscat,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
+tzdata/zoneinfo/Asia/Nicosia,sha256=TYYqWp8sK0AwBUHAp0wuuihZuQ19RXdt28bth33zOBI,597
+tzdata/zoneinfo/Asia/Novokuznetsk,sha256=aYW9rpcxpf_zrOZc2vmpcqgiuCRKMHB1lMrioI43KCw,726
+tzdata/zoneinfo/Asia/Novosibirsk,sha256=I2n4MCElad9sMcyJAAc4YdVT6ewbhR79OoAAuhEJfCY,753
+tzdata/zoneinfo/Asia/Omsk,sha256=y7u47EObB3wI8MxKHBRTFM-BEZZqhGpzDg7x5lcwJXY,741
+tzdata/zoneinfo/Asia/Oral,sha256=Q-Gf85NIvdAtU52Zkgf78rVHPlg85xyMe9Zm9ybh0po,625
+tzdata/zoneinfo/Asia/Phnom_Penh,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
+tzdata/zoneinfo/Asia/Pontianak,sha256=o0x0jNTlwjiUqAzGX_HlzvCMru2zUURgQ4xzpS95xds,247
+tzdata/zoneinfo/Asia/Pyongyang,sha256=NxC5da8oTZ4StiFQnlhjlp9FTRuMM-Xwsq3Yg4y0xkA,183
+tzdata/zoneinfo/Asia/Qatar,sha256=YWDWV1o3HHWxnmwlzwMWC53C84ZYPkK_gYn9-P0Xx4U,152
+tzdata/zoneinfo/Asia/Qostanay,sha256=5tZkj1o0p4vaREsPO0YgIiw6eDf1cqO52x-0EMg_2L4,624
+tzdata/zoneinfo/Asia/Qyzylorda,sha256=JltKDEnuHmIQGYdFTAJMDDpdDA_HxjJOAHHaV7kFrlQ,624
+tzdata/zoneinfo/Asia/Rangoon,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,187
+tzdata/zoneinfo/Asia/Riyadh,sha256=RoU-lCdq8u6o6GwvFSqHHAkt8ZXcUSc7j8cJH6pLRhw,133
+tzdata/zoneinfo/Asia/Saigon,sha256=R-ReVMreMcETG0Sifjfe5z-PgQpUsKjT6dVbEKzT3sE,236
+tzdata/zoneinfo/Asia/Sakhalin,sha256=M_TBd-03j-3Yc9KwhGEoBTwSJxWO1lPBG7ndst16PGo,755
+tzdata/zoneinfo/Asia/Samarkand,sha256=KZ_q-6GMDVgJb8RFqcrbVcPC0WLczolClC4nZA1HVNU,366
+tzdata/zoneinfo/Asia/Seoul,sha256=ZKcLb7zJtl52Lb0l64m29AwTcUbtyNvU0IHq-s2reN4,415
+tzdata/zoneinfo/Asia/Shanghai,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
+tzdata/zoneinfo/Asia/Singapore,sha256=CVSy2aMB2U9DSAJGBqcbvLL6JNPNNwn1vIvKYFA5eF0,256
+tzdata/zoneinfo/Asia/Srednekolymsk,sha256=06mojetFbDd4ag1p8NK0Fg6rF2OOnZMFRRC90N2ATZc,742
+tzdata/zoneinfo/Asia/Taipei,sha256=oEwscvT3aoMXjQNt2X0VfuHzLkeORN2npcEJI2h-5s8,511
+tzdata/zoneinfo/Asia/Tashkent,sha256=0vpN2gI9GY50z1nea6zCPFf2B6VCu6XQQHx4l6rhnTI,366
+tzdata/zoneinfo/Asia/Tbilisi,sha256=ON_Uzv2VTSk6mRefNU-aI-qkqtCoUX6oECVqpeS42eI,629
+tzdata/zoneinfo/Asia/Tehran,sha256=ZaxewB83IdYIGVpJvcp8esyz3iffAgxEzsj7cMraQ3c,812
+tzdata/zoneinfo/Asia/Tel_Aviv,sha256=n83o1YTeoFhfXIcnqvNfSKFJ4NvTqDv2zvi8qcFAIeM,1074
+tzdata/zoneinfo/Asia/Thimbu,sha256=N6d_vfFvYORfMnr1fHJjYSt4DBORSbLi_2T-r2dJBnI,154
+tzdata/zoneinfo/Asia/Thimphu,sha256=N6d_vfFvYORfMnr1fHJjYSt4DBORSbLi_2T-r2dJBnI,154
+tzdata/zoneinfo/Asia/Tokyo,sha256=WaOHFDDw07k-YZ-jCkOkHR6IvdSf8m8J0PQFpQBwb5Y,213
+tzdata/zoneinfo/Asia/Tomsk,sha256=Bf7GoFTcUeP2hYyuYpruJji33tcEoLP-80o38A6i4zU,753
+tzdata/zoneinfo/Asia/Ujung_Pandang,sha256=NV9j_RTuiU47mvJvfKE8daXH5AFYJ8Ki4gvHBJSxyLc,190
+tzdata/zoneinfo/Asia/Ulaanbaatar,sha256=--I8P6_e4BtRIe3wCSkPtwHOu_k9rPsw-KqQKHJC9vM,594
+tzdata/zoneinfo/Asia/Ulan_Bator,sha256=--I8P6_e4BtRIe3wCSkPtwHOu_k9rPsw-KqQKHJC9vM,594
+tzdata/zoneinfo/Asia/Urumqi,sha256=hJyv03dhHML8K0GJGrY8b7M0OUkEXblh_RYmdZMxWtQ,133
+tzdata/zoneinfo/Asia/Ust-Nera,sha256=6NkuV1zOms-4qHQhq-cGc-cqEVgKHk7qd3MLDM-e2BA,771
+tzdata/zoneinfo/Asia/Vientiane,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
+tzdata/zoneinfo/Asia/Vladivostok,sha256=zkOXuEDgpxX8HQGgDlh9SbAQzHOaNxX2XSI6Y4gMD-k,742
+tzdata/zoneinfo/Asia/Yakutsk,sha256=xD6zA4E228dC1mIUQ7cMO-9LORSfE-Fok0awGDG6juk,741
+tzdata/zoneinfo/Asia/Yangon,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,187
+tzdata/zoneinfo/Asia/Yekaterinburg,sha256=q17eUyqOEK2LJYKXYLCJqylj-vmaCG2vSNMttqrQTRk,760
+tzdata/zoneinfo/Asia/Yerevan,sha256=pLEBdchA8H9l-9hdA6FjHmwaj5T1jupK0u-bor1KKa0,708
+tzdata/zoneinfo/Asia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Atlantic/Azores,sha256=6XBp-rgg8hERTe2c-bTKahYPlkDn2sROBuqo9wAdtPE,1401
+tzdata/zoneinfo/Atlantic/Bermuda,sha256=PuxqD2cD99Pzjb8hH99Dws053d_zXnZHjeH0kZ8LSLI,1024
+tzdata/zoneinfo/Atlantic/Canary,sha256=XMmxBlscPIWXhiauKy_d5bxX4xjNMM-5Vw84FwZkT00,478
+tzdata/zoneinfo/Atlantic/Cape_Verde,sha256=E5ss6xpIpD0g_VEDsFMFi-ltsebp98PBSpULoVxIAyU,175
+tzdata/zoneinfo/Atlantic/Faeroe,sha256=Iw0qB0mBuviH5w3Qy8jaxCOes07ZHh2wkW8MPUWJqj0,441
+tzdata/zoneinfo/Atlantic/Faroe,sha256=Iw0qB0mBuviH5w3Qy8jaxCOes07ZHh2wkW8MPUWJqj0,441
+tzdata/zoneinfo/Atlantic/Jan_Mayen,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
+tzdata/zoneinfo/Atlantic/Madeira,sha256=2F3vLmp7OTm4ZMSLxyIVQQ6iXeGUkKKPeUdiGmqVuuI,1372
+tzdata/zoneinfo/Atlantic/Reykjavik,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Atlantic/South_Georgia,sha256=kPGfCLQD2C6_Xc5TyAmqmXP-GYdLLPucpBn3S7ybWu8,132
+tzdata/zoneinfo/Atlantic/St_Helena,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Atlantic/Stanley,sha256=QqQd8IWklNapMKjN5vF7vvVn4K-yl3VKvM5zkCKabCM,789
+tzdata/zoneinfo/Atlantic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Australia/ACT,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
+tzdata/zoneinfo/Australia/Adelaide,sha256=Gk1SdGRVmB233I-WETXAMCZz7L7HVzoN4aUoIcgNr3g,921
+tzdata/zoneinfo/Australia/Brisbane,sha256=2kVWz9CI_qtfdb55g0iL59gUBC7lnO3GUalIQxtHADY,289
+tzdata/zoneinfo/Australia/Broken_Hill,sha256=dzk9LvGA_xRStnAIjAFuTJ8Uwz_s7qGWGQmiXPgDsLY,941
+tzdata/zoneinfo/Australia/Canberra,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
+tzdata/zoneinfo/Australia/Currie,sha256=1IAVgf0AA3sBPXFhaxGfu9UQ_cpd4GNpsQ9xio2l4y0,1003
+tzdata/zoneinfo/Australia/Darwin,sha256=ZoexbhgdUlV4leV-dhBu6AxDVkJy43xrPb9UQ3EQCdI,234
+tzdata/zoneinfo/Australia/Eucla,sha256=3NqsFfMzR6-lSUPViNXBAOyJPqyokisse7uDXurURpk,314
+tzdata/zoneinfo/Australia/Hobart,sha256=1IAVgf0AA3sBPXFhaxGfu9UQ_cpd4GNpsQ9xio2l4y0,1003
+tzdata/zoneinfo/Australia/LHI,sha256=82i9JWWcApPQK7eex9rH1bc6kt_6_OFLTdL_uLoRqto,692
+tzdata/zoneinfo/Australia/Lindeman,sha256=iHkCc0QJ7iaQffiTTXQVJ2swsC7QJxLUMHQOGCFlkTk,325
+tzdata/zoneinfo/Australia/Lord_Howe,sha256=82i9JWWcApPQK7eex9rH1bc6kt_6_OFLTdL_uLoRqto,692
+tzdata/zoneinfo/Australia/Melbourne,sha256=X7JPMEj_SYWyfgWFMkp6FOmT6GfyjR-lF9hFGgTavnE,904
+tzdata/zoneinfo/Australia/NSW,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
+tzdata/zoneinfo/Australia/North,sha256=ZoexbhgdUlV4leV-dhBu6AxDVkJy43xrPb9UQ3EQCdI,234
+tzdata/zoneinfo/Australia/Perth,sha256=ZsuelcBC1YfWugH2CrlOXQcSDD4gGUJCobB1W-aupHo,306
+tzdata/zoneinfo/Australia/Queensland,sha256=2kVWz9CI_qtfdb55g0iL59gUBC7lnO3GUalIQxtHADY,289
+tzdata/zoneinfo/Australia/South,sha256=Gk1SdGRVmB233I-WETXAMCZz7L7HVzoN4aUoIcgNr3g,921
+tzdata/zoneinfo/Australia/Sydney,sha256=gg1FqGioj4HHMdWyx1i07QAAObYmCoBDP44PCUpgS1k,904
+tzdata/zoneinfo/Australia/Tasmania,sha256=1IAVgf0AA3sBPXFhaxGfu9UQ_cpd4GNpsQ9xio2l4y0,1003
+tzdata/zoneinfo/Australia/Victoria,sha256=X7JPMEj_SYWyfgWFMkp6FOmT6GfyjR-lF9hFGgTavnE,904
+tzdata/zoneinfo/Australia/West,sha256=ZsuelcBC1YfWugH2CrlOXQcSDD4gGUJCobB1W-aupHo,306
+tzdata/zoneinfo/Australia/Yancowinna,sha256=dzk9LvGA_xRStnAIjAFuTJ8Uwz_s7qGWGQmiXPgDsLY,941
+tzdata/zoneinfo/Australia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Brazil/Acre,sha256=VjuQUr668phq5bcH40r94BPnZBKHzJf_MQBfM6Db96U,418
+tzdata/zoneinfo/Brazil/DeNoronha,sha256=Q0r3GtA5y2RGkOj56OTZG5tuBy1B6kfbhyrJqCgf27g,484
+tzdata/zoneinfo/Brazil/East,sha256=-izrIi8GXAKJ85l_8MVLoFp0pZm0Uihw-oapbiThiJE,952
+tzdata/zoneinfo/Brazil/West,sha256=9kgrhpryB94YOVoshJliiiDSf9mwjb3OZwX0HusNRrk,412
+tzdata/zoneinfo/Brazil/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/CET,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
+tzdata/zoneinfo/CST6CDT,sha256=wntzn_RqffBZThINcltDkhfhHkTqmlDNxJEwODtUguc,1754
+tzdata/zoneinfo/Canada/Atlantic,sha256=kO5ahBM2oTLfWS4KX15FbKXfo5wg-f9vw1_hMOISGig,1672
+tzdata/zoneinfo/Canada/Central,sha256=ANzwYGBU1PknQW4LR-H92i5c4Db95LU-UQhPhWZCjDo,1294
+tzdata/zoneinfo/Canada/Eastern,sha256=gVq023obEpKGfS-SS3GOG7oyRVzp-SIF2y_rZQKcZ2E,1717
+tzdata/zoneinfo/Canada/Mountain,sha256=Dq2mxcSNWZhMWRqxwwtMcaqwAIGMwkOzz-mW8fJscV8,970
+tzdata/zoneinfo/Canada/Newfoundland,sha256=v99q_AFMPll5MMxMp98aqY40cmis2wciTfTqs2_kb0k,1878
+tzdata/zoneinfo/Canada/Pacific,sha256=Epou71sUffvHB1rd7wT0krvo3okXAV45_TWcOFpy26Q,1330
+tzdata/zoneinfo/Canada/Saskatchewan,sha256=_JHuns225iE-THc9NFp-RBq4PWULAuGw2OLbpOB_UMw,638
+tzdata/zoneinfo/Canada/Yukon,sha256=CyY4jNd0fzNSdf1HlYGfaktApmH71tRNRlpOEO32DGs,1029
+tzdata/zoneinfo/Canada/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Chile/Continental,sha256=_QBpU8K0QqLh5m2yqWfdkypIJDkPAc3dnIAc5jRQxxU,1354
+tzdata/zoneinfo/Chile/EasterIsland,sha256=EwVM74XjsboPVxK9bWmdd4nTrtvasP1zlLdxrMB_YaE,1174
+tzdata/zoneinfo/Chile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Cuba,sha256=ms5rCuq2yBM49VmTymMtFQN3c5aBN1lkd8jjzKdnNm8,1117
+tzdata/zoneinfo/EET,sha256=8f1niwVI4ymziTT2KBJV5pjfp2GtH_hB9sy3lgbGE0U,682
+tzdata/zoneinfo/EST,sha256=p41zBnujy9lPiiPf3WqotoyzOxhIS8F7TiDqGuwvCoE,149
+tzdata/zoneinfo/EST5EDT,sha256=1_IgazpFmJ_JrWPVWJIlMvpzUigNX4cXa_HbecsdH6k,1744
+tzdata/zoneinfo/Egypt,sha256=icuaNiEvuC6TPc2fqhDv36lpop7IDDIGO7tFGMAz0b4,1309
+tzdata/zoneinfo/Eire,sha256=EcADNuAvExj-dkqylGfF8q_vv_-mRPqN0k9bCDtJW3E,1496
+tzdata/zoneinfo/Etc/GMT,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/Etc/GMT+0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/Etc/GMT+1,sha256=5L9o8TEUgtB11poIag85vRdq08LMDZmZ6DPn7UqPL_g,113
+tzdata/zoneinfo/Etc/GMT+10,sha256=IvBxiqQU76qzNbuxRo8Ah9rPQSRGQGKp_SRs5u1PPkM,114
+tzdata/zoneinfo/Etc/GMT+11,sha256=9MfFpFp_rt9PksMjQ23VOlir3hzTlnLz_5V2tfonhbU,114
+tzdata/zoneinfo/Etc/GMT+12,sha256=l26XCFp9IbgXGvMw7NHgHzIZbHry2B5qGYfhMDHFVrw,114
+tzdata/zoneinfo/Etc/GMT+2,sha256=YbbqH7B6jNoQEIjyV4-8a2cXD9lGC3vQKnEkY2ucDGI,113
+tzdata/zoneinfo/Etc/GMT+3,sha256=q3D9DLfmTBUAo4YMnNUNUUKrAkKSwM5Q-vesd9A6SZQ,113
+tzdata/zoneinfo/Etc/GMT+4,sha256=UghKME3laXSDZ7q74YDb4FcLnzNqXQydcZpQHvssP2k,113
+tzdata/zoneinfo/Etc/GMT+5,sha256=TZ5qaoELlszW_Z5FdqAEMKk8Y_xu5XhZBNZUco55SrM,113
+tzdata/zoneinfo/Etc/GMT+6,sha256=_2k3LZ5x8hVjMwwmCx6GqUwW-v1IvOkBrJjYH5bD6Qw,113
+tzdata/zoneinfo/Etc/GMT+7,sha256=Di8J430WGr98Ww95tdfIo8hGxkVQfJvlx55ansDuoeQ,113
+tzdata/zoneinfo/Etc/GMT+8,sha256=OIIlUFhZwL2ctx3fxINbY2HDDAmSQ7i2ZAUgX7Exjgw,113
+tzdata/zoneinfo/Etc/GMT+9,sha256=1vpkIoPqBiwDWzH-fLFxwNbmdKRY7mqdiJhYQImVxaw,113
+tzdata/zoneinfo/Etc/GMT-0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/Etc/GMT-1,sha256=S81S9Z0-V-0B5U-0S0Pnbx8fv2iHtwE1LrlZk-ckLto,114
+tzdata/zoneinfo/Etc/GMT-10,sha256=VvdG5IpXB_xJX4omzfrrHblkRUzkbCZXPhTrLngc7vk,115
+tzdata/zoneinfo/Etc/GMT-11,sha256=2sYLfVuDFSy7Kc1WOPiY1EqquHw5Xx4HbDA1QOL1hc4,115
+tzdata/zoneinfo/Etc/GMT-12,sha256=ifHVhk5fczZG3GDy_Nv7YsLNaxf8stB4MrzgWUCINlU,115
+tzdata/zoneinfo/Etc/GMT-13,sha256=CMkORdXsaSyL-4N0n37Cyc1lCr22ZsWyug9_QZVe0E0,115
+tzdata/zoneinfo/Etc/GMT-14,sha256=NK07ElwueU0OP8gORtcXUUug_3v4d04uxfVHMUnLM9U,115
+tzdata/zoneinfo/Etc/GMT-2,sha256=QMToMLcif1S4SNPOMxMtBLqc1skUYnIhbUAjKEdAf9w,114
+tzdata/zoneinfo/Etc/GMT-3,sha256=10GMvfulaJwDQiHiWEJiU_YURyjDfPcl5ugnYBugN3E,114
+tzdata/zoneinfo/Etc/GMT-4,sha256=c6Kx3v41GRkrvky8k71db_UJbpyyp2OZCsjDSvjkr6s,114
+tzdata/zoneinfo/Etc/GMT-5,sha256=94TvO8e_8t52bs8ry70nAquvgK8qJKQTI7lQnVCHX-U,114
+tzdata/zoneinfo/Etc/GMT-6,sha256=3fH8eX--0iDijmYAQHQ0IUXheezaj6-aadZsQNAB4fE,114
+tzdata/zoneinfo/Etc/GMT-7,sha256=DnsTJ3NUYYGLUwFb_L15U_GbaMF-acLVsPyTNySyH-M,114
+tzdata/zoneinfo/Etc/GMT-8,sha256=kvGQUwONDBG7nhEp_wESc4xl4xNXiXEivxAv09nkr_g,114
+tzdata/zoneinfo/Etc/GMT-9,sha256=U1WRFGWQAW91JXK99gY1K9d0rFZYDWHzDUR3z71Lh6Y,114
+tzdata/zoneinfo/Etc/GMT0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/Etc/Greenwich,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/Etc/UCT,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/Etc/UTC,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/Etc/Universal,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/Etc/Zulu,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/Etc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Europe/Amsterdam,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
+tzdata/zoneinfo/Europe/Andorra,sha256=leuTyE4uduIBX0aHb_7PK_KlslpWSyS6e0SS84hKFrE,389
+tzdata/zoneinfo/Europe/Astrakhan,sha256=P3E5UDgQ4gqsMi-KdMAWwOSStogdcNl9rLMVUdpFLXI,726
+tzdata/zoneinfo/Europe/Athens,sha256=8f1niwVI4ymziTT2KBJV5pjfp2GtH_hB9sy3lgbGE0U,682
+tzdata/zoneinfo/Europe/Belfast,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/Europe/Belgrade,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
+tzdata/zoneinfo/Europe/Berlin,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
+tzdata/zoneinfo/Europe/Bratislava,sha256=pukw4zdc3LUffYp0iFr_if0UuGHrt1yzOdD5HBbBRpo,723
+tzdata/zoneinfo/Europe/Brussels,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
+tzdata/zoneinfo/Europe/Bucharest,sha256=iY74H96aaTMJvmqAhzUoSI8SjZUtPvv4PGF4ClwFm6U,661
+tzdata/zoneinfo/Europe/Budapest,sha256=qNr-valoDI1mevuQXqOMkOhIcT194EczOKIijxrDMV8,766
+tzdata/zoneinfo/Europe/Busingen,sha256=GZBiscMM_rI3XshMVt9SvlGJGYamKTt6Ek06YlCfRek,497
+tzdata/zoneinfo/Europe/Chisinau,sha256=5TPhkCtxxa0ByLCv7YxOrc5Vtdui2v2VX8vrSopPkPs,755
+tzdata/zoneinfo/Europe/Copenhagen,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
+tzdata/zoneinfo/Europe/Dublin,sha256=EcADNuAvExj-dkqylGfF8q_vv_-mRPqN0k9bCDtJW3E,1496
+tzdata/zoneinfo/Europe/Gibraltar,sha256=t1hglDTLUIFqs91nY5lulN7oxkoAXHnh0zjyaKG2bG8,1220
+tzdata/zoneinfo/Europe/Guernsey,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/Europe/Helsinki,sha256=ccpK9ZmPCZkMXoddNQ_DyONPKAuub-FPNtRpL6znpWM,481
+tzdata/zoneinfo/Europe/Isle_of_Man,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/Europe/Istanbul,sha256=KnFjsWuUgG9pmRNI59CmDEbrYbHwMF9fS4P2E9sQgG8,1200
+tzdata/zoneinfo/Europe/Jersey,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/Europe/Kaliningrad,sha256=57ov9G8m25w1pPdJF8zoFWzq5I6UoBMVsk2eHPelbA8,904
+tzdata/zoneinfo/Europe/Kiev,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
+tzdata/zoneinfo/Europe/Kirov,sha256=KqXGcIbMGTuOoKZYBG-5bj7kVzFbKyGMA99PA0414D0,735
+tzdata/zoneinfo/Europe/Kyiv,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
+tzdata/zoneinfo/Europe/Lisbon,sha256=RNL2z4RzfmoeDa-RQQnpQla-ykC0DJoRt6BOi92u5Ow,1463
+tzdata/zoneinfo/Europe/Ljubljana,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
+tzdata/zoneinfo/Europe/London,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/Europe/Luxembourg,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
+tzdata/zoneinfo/Europe/Madrid,sha256=ylsyHdv8iOB-DQPtL6DIMs5dDdjn2QolIAqOJImMOyE,897
+tzdata/zoneinfo/Europe/Malta,sha256=irX_nDD-BXYObaduu_vhPe1F31xmgL364dSOaT_OVco,928
+tzdata/zoneinfo/Europe/Mariehamn,sha256=ccpK9ZmPCZkMXoddNQ_DyONPKAuub-FPNtRpL6znpWM,481
+tzdata/zoneinfo/Europe/Minsk,sha256=86iP_xDtidkUCqjkoKhH5_El3VI21fSgoIiXl_BzUaU,808
+tzdata/zoneinfo/Europe/Monaco,sha256=zViOd5xXN9cOTkcVja-reUWwJrK7NEVMxHdBgVRZsGg,1105
+tzdata/zoneinfo/Europe/Moscow,sha256=7S4KCZ-0RrJBZoNDjT9W-fxaYqFsdUmn9Zy8k1s2TIo,908
+tzdata/zoneinfo/Europe/Nicosia,sha256=TYYqWp8sK0AwBUHAp0wuuihZuQ19RXdt28bth33zOBI,597
+tzdata/zoneinfo/Europe/Oslo,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
+tzdata/zoneinfo/Europe/Paris,sha256=zViOd5xXN9cOTkcVja-reUWwJrK7NEVMxHdBgVRZsGg,1105
+tzdata/zoneinfo/Europe/Podgorica,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
+tzdata/zoneinfo/Europe/Prague,sha256=pukw4zdc3LUffYp0iFr_if0UuGHrt1yzOdD5HBbBRpo,723
+tzdata/zoneinfo/Europe/Riga,sha256=PU8amev-8XVvl4B_JUOOOM1ofSMbotp-3MPGPHpPoTw,694
+tzdata/zoneinfo/Europe/Rome,sha256=hr0moG_jBXs2zyndejOPJSSv-BFu8I0AWqIRTqYSKGk,947
+tzdata/zoneinfo/Europe/Samara,sha256=Vc60AJe-0-b8prNiFwZTUS1bCbWxxuEnnNcgp8YkQRY,732
+tzdata/zoneinfo/Europe/San_Marino,sha256=hr0moG_jBXs2zyndejOPJSSv-BFu8I0AWqIRTqYSKGk,947
+tzdata/zoneinfo/Europe/Sarajevo,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
+tzdata/zoneinfo/Europe/Saratov,sha256=0fN3eVFVewG-DSVk9xJABDQB1S_Nyn37bHOjj5X8Bm0,726
+tzdata/zoneinfo/Europe/Simferopol,sha256=y2Nybf9LGVNqNdW_GPS-NIDRLriyH_pyxKpT0zmATK4,865
+tzdata/zoneinfo/Europe/Skopje,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
+tzdata/zoneinfo/Europe/Sofia,sha256=LQjC-OJkL4TzZcqD-JUofDAg1-qJui_2Ri6Eoii2MuQ,592
+tzdata/zoneinfo/Europe/Stockholm,sha256=p_2ZMteF1NaQkAuDTDVjwYEMHPLgFxG8wJJq9sB2fLc,705
+tzdata/zoneinfo/Europe/Tallinn,sha256=R6yRfPqESOYQWftlncDWo_fQak61eeiEQKwg_C-C7W8,675
+tzdata/zoneinfo/Europe/Tirane,sha256=I-alATWRd8mfSgvnr3dN_F9vbTB66alvz2GQo0LUbPc,604
+tzdata/zoneinfo/Europe/Tiraspol,sha256=5TPhkCtxxa0ByLCv7YxOrc5Vtdui2v2VX8vrSopPkPs,755
+tzdata/zoneinfo/Europe/Ulyanovsk,sha256=2vK0XahtB_dKjDDXccjMjbQ2bAOfKDe66uMDqtjzHm4,760
+tzdata/zoneinfo/Europe/Uzhgorod,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
+tzdata/zoneinfo/Europe/Vaduz,sha256=GZBiscMM_rI3XshMVt9SvlGJGYamKTt6Ek06YlCfRek,497
+tzdata/zoneinfo/Europe/Vatican,sha256=hr0moG_jBXs2zyndejOPJSSv-BFu8I0AWqIRTqYSKGk,947
+tzdata/zoneinfo/Europe/Vienna,sha256=q8_UF23-KHqc2ay4ju0qT1TuBSpRTnlB7i6vElk4eJw,658
+tzdata/zoneinfo/Europe/Vilnius,sha256=hXvv1PaQndapT7hdywPO3738Y3ZqbW_hJx87khyaOPM,676
+tzdata/zoneinfo/Europe/Volgograd,sha256=v3P6iFJ-rThJprVNDxB7ZYDrimtsW7IvQi_gJpZiJOQ,753
+tzdata/zoneinfo/Europe/Warsaw,sha256=6I9aUfFoFXpBrC3YpO4OmoeUGchMYSK0dxsaKjPZOkw,923
+tzdata/zoneinfo/Europe/Zagreb,sha256=qMlk8-qnognZplD7FsaMAD6aX8Yv-7sQ-oSdVPs2YtY,478
+tzdata/zoneinfo/Europe/Zaporozhye,sha256=BYnoDd7Ov50wd4mMEpddK-c5PfKFbumSbFNHY-Hia_I,558
+tzdata/zoneinfo/Europe/Zurich,sha256=GZBiscMM_rI3XshMVt9SvlGJGYamKTt6Ek06YlCfRek,497
+tzdata/zoneinfo/Europe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Factory,sha256=0ytXntCnQnMWvqJgue4mdUUQRr1YxXxnnCTyZxhgr3Y,113
+tzdata/zoneinfo/GB,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/GB-Eire,sha256=Z2VB8LitRXx0TAk_gHWJrcrZCeP9A_kBeH0IeG7tvTM,1599
+tzdata/zoneinfo/GMT,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/GMT+0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/GMT-0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/GMT0,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/Greenwich,sha256=3EoHVxsQiE5PTzRQydGhy_TAPvU9Bu0uTqFS2eul1dc,111
+tzdata/zoneinfo/HST,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
+tzdata/zoneinfo/Hongkong,sha256=9AaPcyRtuXQX9zRnRTVkxX1mRs5JCbn6JTaSPvzX608,775
+tzdata/zoneinfo/Iceland,sha256=8-f8qg6YQP9BadNWfY-1kmZEhI9JY9es-SMghDxdSG4,130
+tzdata/zoneinfo/Indian/Antananarivo,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Indian/Chagos,sha256=J_aS7rs0ZG1dPTGeokXxNJpF4Pds8u1ct49cRtX7giY,152
+tzdata/zoneinfo/Indian/Christmas,sha256=zcjiwoLYvJpenDyvL8Rf9OnlzRj13sjLhzNArXxYTWQ,152
+tzdata/zoneinfo/Indian/Cocos,sha256=6J2DXIEdTaRKqLOGeCzogo3whaoO6PJWYamIHS8A6Qw,187
+tzdata/zoneinfo/Indian/Comoro,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Indian/Kerguelen,sha256=lEhfD1j4QnZ-wtuTU51fw6-yvc4WZz2eY8CYjMzWQ44,152
+tzdata/zoneinfo/Indian/Mahe,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
+tzdata/zoneinfo/Indian/Maldives,sha256=lEhfD1j4QnZ-wtuTU51fw6-yvc4WZz2eY8CYjMzWQ44,152
+tzdata/zoneinfo/Indian/Mauritius,sha256=R6pdJalrHVK5LlGOmEsyD66_-c5a9ptJM-xE71Fo8hQ,179
+tzdata/zoneinfo/Indian/Mayotte,sha256=B4OFT1LDOtprbSpdhnZi8K6OFSONL857mtpPTTGetGY,191
+tzdata/zoneinfo/Indian/Reunion,sha256=DZ6lBT6DGIAypvtNMB1dtoj0MBHltrH5F6EbcaDaexY,133
+tzdata/zoneinfo/Indian/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Iran,sha256=ZaxewB83IdYIGVpJvcp8esyz3iffAgxEzsj7cMraQ3c,812
+tzdata/zoneinfo/Israel,sha256=n83o1YTeoFhfXIcnqvNfSKFJ4NvTqDv2zvi8qcFAIeM,1074
+tzdata/zoneinfo/Jamaica,sha256=pDexcAMzrv9TqLWGjVOHwIDcFMLT6Vqlzjb5AbNmkoQ,339
+tzdata/zoneinfo/Japan,sha256=WaOHFDDw07k-YZ-jCkOkHR6IvdSf8m8J0PQFpQBwb5Y,213
+tzdata/zoneinfo/Kwajalein,sha256=S-ZFi6idKzDaelLy7DRjGPeD0s7oVud3xLMxZKNlBk8,219
+tzdata/zoneinfo/Libya,sha256=zzMBLZZh4VQ4_ARe5k4L_rsuqKP7edKvVt8F6kvj5FM,431
+tzdata/zoneinfo/MET,sha256=sQ-VQqhQnwpj68p449gEMt2GuOopZAAoD-vZz6dugog,1103
+tzdata/zoneinfo/MST,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
+tzdata/zoneinfo/MST7MDT,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
+tzdata/zoneinfo/Mexico/BajaNorte,sha256=r5rqSu5QUUP6XoR2Q8D_4WQZDDhBEBCsfwsXD0CYpsg,1367
+tzdata/zoneinfo/Mexico/BajaSur,sha256=IN7ecQ9SDq9sDNvu_nc_xuMN2LHSiq8X6YQgmVUe6aY,690
+tzdata/zoneinfo/Mexico/General,sha256=N90r8I8T_OD3B8Ox9M7EAY772cR8g2ew-03rvUYb1y8,773
+tzdata/zoneinfo/Mexico/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/NZ,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
+tzdata/zoneinfo/NZ-CHAT,sha256=pnhY_Lb8V4eo6cK3yL6JZL086SI_etG6rCycppJfTHg,808
+tzdata/zoneinfo/Navajo,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
+tzdata/zoneinfo/PRC,sha256=v4t-2C_m5j5tmPjOqTTurJAc0Wq6hetXVc4_i0KJ6oo,393
+tzdata/zoneinfo/PST8PDT,sha256=IA0FdU9tg6Nxz0CNcIUSV5dlezsL6-uh5QjP_oaj5cg,1294
+tzdata/zoneinfo/Pacific/Apia,sha256=3HDEfICrLIehq3VLq4_r_DhQgFniSd_lXnOjdZgI6hQ,407
+tzdata/zoneinfo/Pacific/Auckland,sha256=Dgbn5VrtvJLvWz0Qbnw5KrFijP2KQosg6S6ZAooL-7k,1043
+tzdata/zoneinfo/Pacific/Bougainville,sha256=rqdn1Y4HSarx-vjPk00lsHNfhj3IQgKCViAsumuN_IY,201
+tzdata/zoneinfo/Pacific/Chatham,sha256=pnhY_Lb8V4eo6cK3yL6JZL086SI_etG6rCycppJfTHg,808
+tzdata/zoneinfo/Pacific/Chuuk,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
+tzdata/zoneinfo/Pacific/Easter,sha256=EwVM74XjsboPVxK9bWmdd4nTrtvasP1zlLdxrMB_YaE,1174
+tzdata/zoneinfo/Pacific/Efate,sha256=LiX_rTfipQh_Vnqb_m7OGxyBtyAUC9UANVKHUpLoCcU,342
+tzdata/zoneinfo/Pacific/Enderbury,sha256=ojOG-oqi25HOnY6BFhav_3bmWg1LDILT4v-kxOFVuqI,172
+tzdata/zoneinfo/Pacific/Fakaofo,sha256=Uf8zeML2X8doPg8CX-p0mMGP-IOj7aHAMe7ULD5khxA,153
+tzdata/zoneinfo/Pacific/Fiji,sha256=umCNhtTuBziTXne-WAxzvYvGKqZxTYOTwK-tJhYh4MQ,396
+tzdata/zoneinfo/Pacific/Funafuti,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
+tzdata/zoneinfo/Pacific/Galapagos,sha256=Z1KJPZSvO8M_Pay9WLcNAxzjo8imPrQ7FnXNOXfZl8c,175
+tzdata/zoneinfo/Pacific/Gambier,sha256=yIh86hjpDk1wRWTVJROOGqn9tkc7e9_O6zNxqs-wBoM,132
+tzdata/zoneinfo/Pacific/Guadalcanal,sha256=Ui8PN0th4sb1-n0Z8ceszNCeSiE0Yu47QskNMr8r8Yw,134
+tzdata/zoneinfo/Pacific/Guam,sha256=i57eM6syriUFvAbrVALnziCw_I4lENyzBcJdOaH71yU,350
+tzdata/zoneinfo/Pacific/Honolulu,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
+tzdata/zoneinfo/Pacific/Johnston,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
+tzdata/zoneinfo/Pacific/Kanton,sha256=ojOG-oqi25HOnY6BFhav_3bmWg1LDILT4v-kxOFVuqI,172
+tzdata/zoneinfo/Pacific/Kiritimati,sha256=cUVGmMRBgllfuYJ3X0B0zg0Bf-LPo9l7Le5ju882dx4,174
+tzdata/zoneinfo/Pacific/Kosrae,sha256=pQMLJXilygPhlkm0jCo5JuVmpmYJgLIdiTVxeP59ZEg,242
+tzdata/zoneinfo/Pacific/Kwajalein,sha256=S-ZFi6idKzDaelLy7DRjGPeD0s7oVud3xLMxZKNlBk8,219
+tzdata/zoneinfo/Pacific/Majuro,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
+tzdata/zoneinfo/Pacific/Marquesas,sha256=ilprkRvn-N1XjptSI_0ZwUjeuokP-5l64uKjRBp0kxw,139
+tzdata/zoneinfo/Pacific/Midway,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
+tzdata/zoneinfo/Pacific/Nauru,sha256=wahZONjreNAmYwhQ2CWdKMAE3SVm4S2aYvMZqcAlSYc,183
+tzdata/zoneinfo/Pacific/Niue,sha256=8WWebtgCnrMBKjuLNEYEWlktNI2op2kkKgk0Vcz8GaM,154
+tzdata/zoneinfo/Pacific/Norfolk,sha256=vL8G6W5CScYqp76g0b15UPIYHw2Lt60qOktHUF7caDs,237
+tzdata/zoneinfo/Pacific/Noumea,sha256=ezUyn7AYWBblrZbStlItJYu7XINCLiihrCBZB-Bl-Qw,198
+tzdata/zoneinfo/Pacific/Pago_Pago,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
+tzdata/zoneinfo/Pacific/Palau,sha256=VkLRsKUUVXo3zrhAXn9iM-pKySbGIVfzWoopDhmceMA,148
+tzdata/zoneinfo/Pacific/Pitcairn,sha256=AJh6olJxXQzCMWKOE5ye4jHfgg1VA-9-gCZ5MbrX_8E,153
+tzdata/zoneinfo/Pacific/Pohnpei,sha256=Ui8PN0th4sb1-n0Z8ceszNCeSiE0Yu47QskNMr8r8Yw,134
+tzdata/zoneinfo/Pacific/Ponape,sha256=Ui8PN0th4sb1-n0Z8ceszNCeSiE0Yu47QskNMr8r8Yw,134
+tzdata/zoneinfo/Pacific/Port_Moresby,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
+tzdata/zoneinfo/Pacific/Rarotonga,sha256=J6a2mOrTp4bsZNovj3HjJK9AVJ89PhdEpQMMVD__i18,406
+tzdata/zoneinfo/Pacific/Saipan,sha256=i57eM6syriUFvAbrVALnziCw_I4lENyzBcJdOaH71yU,350
+tzdata/zoneinfo/Pacific/Samoa,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
+tzdata/zoneinfo/Pacific/Tahiti,sha256=Ivcs04hthxEQj1I_6aACc70By0lmxlvhgGFYh843e14,133
+tzdata/zoneinfo/Pacific/Tarawa,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
+tzdata/zoneinfo/Pacific/Tongatapu,sha256=mjGjNSUATfw0yLGB0zsLxz3_L1uWxPANML8K4HQQIMY,237
+tzdata/zoneinfo/Pacific/Truk,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
+tzdata/zoneinfo/Pacific/Wake,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
+tzdata/zoneinfo/Pacific/Wallis,sha256=CQNWIL2DFpej6Qcvgt40z8pekS1QyNpUdzmqLyj7bY4,134
+tzdata/zoneinfo/Pacific/Yap,sha256=aDABBVtu-dydiHNODt3ReC8cNkO3wTp16c-OkFIAbhk,154
+tzdata/zoneinfo/Pacific/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/Poland,sha256=6I9aUfFoFXpBrC3YpO4OmoeUGchMYSK0dxsaKjPZOkw,923
+tzdata/zoneinfo/Portugal,sha256=RNL2z4RzfmoeDa-RQQnpQla-ykC0DJoRt6BOi92u5Ow,1463
+tzdata/zoneinfo/ROC,sha256=oEwscvT3aoMXjQNt2X0VfuHzLkeORN2npcEJI2h-5s8,511
+tzdata/zoneinfo/ROK,sha256=ZKcLb7zJtl52Lb0l64m29AwTcUbtyNvU0IHq-s2reN4,415
+tzdata/zoneinfo/Singapore,sha256=CVSy2aMB2U9DSAJGBqcbvLL6JNPNNwn1vIvKYFA5eF0,256
+tzdata/zoneinfo/Turkey,sha256=KnFjsWuUgG9pmRNI59CmDEbrYbHwMF9fS4P2E9sQgG8,1200
+tzdata/zoneinfo/UCT,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/US/Alaska,sha256=d8oMIpYvBpmLzl5I2By4ZaFEZsg_9dxgfqpIM0QFi_Y,977
+tzdata/zoneinfo/US/Aleutian,sha256=q_sZgOINX4TsX9iBx1gNd6XGwBnzCjg6qpdAQhK0ieA,969
+tzdata/zoneinfo/US/Arizona,sha256=rhFFPCHQiYTedfLv7ATckxeKe04jxeUvIJi4vUXMtUc,240
+tzdata/zoneinfo/US/Central,sha256=wntzn_RqffBZThINcltDkhfhHkTqmlDNxJEwODtUguc,1754
+tzdata/zoneinfo/US/East-Indiana,sha256=5nj0KhPvvXvg8mqc5T4EscKKWC6rBWEcsBwWg2Qy8Hs,531
+tzdata/zoneinfo/US/Eastern,sha256=1_IgazpFmJ_JrWPVWJIlMvpzUigNX4cXa_HbecsdH6k,1744
+tzdata/zoneinfo/US/Hawaii,sha256=HapXKaoeDzLNRL4RLQGtTMVnqf522H3LuRgr6NLIj_A,221
+tzdata/zoneinfo/US/Indiana-Starke,sha256=KJCzXct8CTMItVLYLYeBqM6aT6b53gWCg6aDbsH58oI,1016
+tzdata/zoneinfo/US/Michigan,sha256=I4F8Mt9nx38AF6D-steYskBa_HHO6jKU1-W0yRFr50A,899
+tzdata/zoneinfo/US/Mountain,sha256=m7cDkg7KS2EZ6BoQVYOk9soiBlHxO0GEeat81WxBPz4,1042
+tzdata/zoneinfo/US/Pacific,sha256=IA0FdU9tg6Nxz0CNcIUSV5dlezsL6-uh5QjP_oaj5cg,1294
+tzdata/zoneinfo/US/Samoa,sha256=ZQ2Rh1E2ZZBVMGPNaBWS_cqKCZV-DOLBjWaX7Dhe95Y,146
+tzdata/zoneinfo/US/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/UTC,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/Universal,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/W-SU,sha256=7S4KCZ-0RrJBZoNDjT9W-fxaYqFsdUmn9Zy8k1s2TIo,908
+tzdata/zoneinfo/WET,sha256=RNL2z4RzfmoeDa-RQQnpQla-ykC0DJoRt6BOi92u5Ow,1463
+tzdata/zoneinfo/Zulu,sha256=_dzh5kihcyrCmv2aFhUbKXPN8ILn7AxpD35CvmtZi5M,111
+tzdata/zoneinfo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzdata/zoneinfo/iso3166.tab,sha256=g3yAeFCAyEM_2dTqh-ePFhrHpAOJMBxRU9T5AZi66yo,4841
+tzdata/zoneinfo/leapseconds,sha256=VRQ0gZCj758PZf7of8pZtNbZKScCrg6ElgARFZp8J2c,3694
+tzdata/zoneinfo/tzdata.zi,sha256=5JWrRFruKp1mB84rtCLX9PUJ1sqoIrJvXPtJq97TqpA,107441
+tzdata/zoneinfo/zone.tab,sha256=WGtCB-bHZyLegq3Npr9J12H2aFF_RaZz9k2oOzM-7MQ,18822
+tzdata/zoneinfo/zone1970.tab,sha256=6dn-MJQqiA91a3P2SWZ9hkeh7PITEUlEXZzCTGXk7o8,17605
+tzdata/zoneinfo/zonenow.tab,sha256=oVuFMStmwzwt9UceOp1cVf2YFT-NbrR4eNijSIsGVqU,8002
+tzdata/zones,sha256=UCfmEKENGYPShuIfoftxjw00cERGyzf3B-gXB7s8EkQ,9102
diff --git a/libs/websocket_client-1.8.0.dist-info/REQUESTED b/libs/tzdata-2025.3.dist-info/REQUESTED
similarity index 100%
rename from libs/websocket_client-1.8.0.dist-info/REQUESTED
rename to libs/tzdata-2025.3.dist-info/REQUESTED
diff --git a/libs/tzdata-2025.3.dist-info/WHEEL b/libs/tzdata-2025.3.dist-info/WHEEL
new file mode 100644
index 0000000000..798dd6195b
--- /dev/null
+++ b/libs/tzdata-2025.3.dist-info/WHEEL
@@ -0,0 +1,6 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py2-none-any
+Tag: py3-none-any
+
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/LICENSE b/libs/tzdata-2025.3.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/backports.zoneinfo-0.2.1.dist-info/LICENSE
rename to libs/tzdata-2025.3.dist-info/licenses/LICENSE
diff --git a/libs/backports.zoneinfo-0.2.1.dist-info/LICENSE_APACHE b/libs/tzdata-2025.3.dist-info/licenses/licenses/LICENSE_APACHE
similarity index 100%
rename from libs/backports.zoneinfo-0.2.1.dist-info/LICENSE_APACHE
rename to libs/tzdata-2025.3.dist-info/licenses/licenses/LICENSE_APACHE
diff --git a/libs/tzdata-2024.2.dist-info/top_level.txt b/libs/tzdata-2025.3.dist-info/top_level.txt
similarity index 100%
rename from libs/tzdata-2024.2.dist-info/top_level.txt
rename to libs/tzdata-2025.3.dist-info/top_level.txt
diff --git a/libs/tzdata/__init__.py b/libs/tzdata/__init__.py
index e558a8a536..b1534dfb64 100644
--- a/libs/tzdata/__init__.py
+++ b/libs/tzdata/__init__.py
@@ -1,6 +1,6 @@
 # IANA versions like 2020a are not valid PEP 440 identifiers; the recommended
 # way to translate the version is to use YYYY.n where `n` is a 0-based index.
-__version__ = "2024.2"
+__version__ = "2025.3"
 
 # This exposes the original IANA version number.
-IANA_VERSION = "2024b"
+IANA_VERSION = "2025c"
diff --git a/libs/tzdata/zoneinfo/America/Asuncion b/libs/tzdata/zoneinfo/America/Asuncion
index 6225036742..f056047f05 100644
Binary files a/libs/tzdata/zoneinfo/America/Asuncion and b/libs/tzdata/zoneinfo/America/Asuncion differ
diff --git a/libs/tzdata/zoneinfo/America/Coyhaique b/libs/tzdata/zoneinfo/America/Coyhaique
new file mode 100644
index 0000000000..26354e8946
Binary files /dev/null and b/libs/tzdata/zoneinfo/America/Coyhaique differ
diff --git a/libs/tzdata/zoneinfo/America/Ensenada b/libs/tzdata/zoneinfo/America/Ensenada
index 18d0d14afc..0d8c993bd1 100644
Binary files a/libs/tzdata/zoneinfo/America/Ensenada and b/libs/tzdata/zoneinfo/America/Ensenada differ
diff --git a/libs/tzdata/zoneinfo/America/Santa_Isabel b/libs/tzdata/zoneinfo/America/Santa_Isabel
index 18d0d14afc..0d8c993bd1 100644
Binary files a/libs/tzdata/zoneinfo/America/Santa_Isabel and b/libs/tzdata/zoneinfo/America/Santa_Isabel differ
diff --git a/libs/tzdata/zoneinfo/America/Tijuana b/libs/tzdata/zoneinfo/America/Tijuana
index 18d0d14afc..0d8c993bd1 100644
Binary files a/libs/tzdata/zoneinfo/America/Tijuana and b/libs/tzdata/zoneinfo/America/Tijuana differ
diff --git a/libs/tzdata/zoneinfo/Asia/Manila b/libs/tzdata/zoneinfo/Asia/Manila
index 3c3584e09a..145bb6fb16 100644
Binary files a/libs/tzdata/zoneinfo/Asia/Manila and b/libs/tzdata/zoneinfo/Asia/Manila differ
diff --git a/libs/tzdata/zoneinfo/Asia/Tehran b/libs/tzdata/zoneinfo/Asia/Tehran
index 824acb0426..6fd31e075a 100644
Binary files a/libs/tzdata/zoneinfo/Asia/Tehran and b/libs/tzdata/zoneinfo/Asia/Tehran differ
diff --git a/libs/tzdata/zoneinfo/Iran b/libs/tzdata/zoneinfo/Iran
index 824acb0426..6fd31e075a 100644
Binary files a/libs/tzdata/zoneinfo/Iran and b/libs/tzdata/zoneinfo/Iran differ
diff --git a/libs/tzdata/zoneinfo/Mexico/BajaNorte b/libs/tzdata/zoneinfo/Mexico/BajaNorte
index 18d0d14afc..0d8c993bd1 100644
Binary files a/libs/tzdata/zoneinfo/Mexico/BajaNorte and b/libs/tzdata/zoneinfo/Mexico/BajaNorte differ
diff --git a/libs/tzdata/zoneinfo/iso3166.tab b/libs/tzdata/zoneinfo/iso3166.tab
index 402c015ec6..4ae35234b9 100644
--- a/libs/tzdata/zoneinfo/iso3166.tab
+++ b/libs/tzdata/zoneinfo/iso3166.tab
@@ -3,22 +3,22 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2023-09-06):
+# From Paul Eggert (2025-07-01):
 # This file contains a table of two-letter country codes.  Columns are
-# separated by a single tab.  Lines beginning with '#' are comments.
+# separated by a single tab.  Lines beginning with โ€˜#โ€™ are comments.
 # All text uses UTF-8 encoding.  The columns of the table are as follows:
 #
 # 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO/TC 46 N1108 (2023-04-05).  See: ISO/TC 46 Documents
+#     ISO/TC 46 N1127 (2024-02-29).  See: ISO/TC 46 Documents
 #     https://www.iso.org/committee/48750.html?view=documents
 # 2.  The usual English name for the coded region.  This sometimes
 #     departs from ISO-listed names, sometimes so that sorted subsets
-#     of names are useful (e.g., "Samoa (American)" and "Samoa
-#     (western)" rather than "American Samoa" and "Samoa"),
+#     of names are useful (e.g., โ€œSamoa (American)โ€ and โ€œSamoa
+#     (western)โ€ rather than โ€œAmerican Samoaโ€ and โ€œSamoaโ€),
 #     sometimes to avoid confusion among non-experts (e.g.,
-#     "Czech Republic" and "Turkey" rather than "Czechia" and "Tรผrkiye"),
-#     and sometimes to omit needless detail or churn (e.g., "Netherlands"
-#     rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
+#     โ€œCzech Republicโ€ and โ€œTurkeyโ€ rather than โ€œCzechiaโ€ and โ€œTรผrkiyeโ€),
+#     and sometimes to omit needless detail or churn (e.g., โ€œNetherlandsโ€
+#     rather than โ€œNetherlands (the)โ€ or โ€œNetherlands (Kingdom of the)โ€).
 #
 # The table is sorted by country code.
 #
@@ -71,7 +71,7 @@ CD	Congo (Dem. Rep.)
 CF	Central African Rep.
 CG	Congo (Rep.)
 CH	Switzerland
-CI	Cรดte d'Ivoire
+CI	Cรดte dโ€™Ivoire
 CK	Cook Islands
 CL	Chile
 CM	Cameroon
diff --git a/libs/tzdata/zoneinfo/leapseconds b/libs/tzdata/zoneinfo/leapseconds
index 6c715cb20b..2a42c83efe 100644
--- a/libs/tzdata/zoneinfo/leapseconds
+++ b/libs/tzdata/zoneinfo/leapseconds
@@ -5,7 +5,8 @@
 # This file is generated automatically from the data in the public-domain
 # NIST/IERS format leap-seconds.list file, which can be copied from
 # <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
-# or, in a variant with different comments, from
+# or via a less-secure protocol and with different comments and
+# less volatile last-modified and expiration timestamps, from
 # <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
@@ -69,11 +70,17 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2025	Jun	28	00:00:00
+#Expires 2026	Jun	28	00:00:00
 
-# POSIX timestamps for the data in this file:
-#updated 1720104763 (2024-07-04 14:52:43 UTC)
-#expires 1751068800 (2025-06-28 00:00:00 UTC)
+# Here are POSIX timestamps for the data in this file.
+# "#updated" gives the last time the leap seconds data changed
+# or, if this file was derived from the IERS leap-seconds.list,
+# the last time that file changed in any way.
+# "#expires" gives the first time this file might be wrong;
+# if this file was derived from the IERS leap-seconds.list,
+# this is typically a bit less than one year after "updated".
+#updated 1751846400 (2025-07-07 00:00:00 UTC)
+#expires 1782604800 (2026-06-28 00:00:00 UTC)
 
 #	Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-#	File expires on 28 June 2025
+#	File expires on 28 June 2026
diff --git a/libs/tzdata/zoneinfo/tzdata.zi b/libs/tzdata/zoneinfo/tzdata.zi
index 62e78bb826..c56f67c02f 100644
--- a/libs/tzdata/zoneinfo/tzdata.zi
+++ b/libs/tzdata/zoneinfo/tzdata.zi
@@ -1,4 +1,4 @@
-# version 2024b
+# version 2025c
 # This zic input file is in the public domain.
 R d 1916 o - Jun 14 23s 1 S
 R d 1916 1919 - O Su>=1 23s 0 -
@@ -721,12 +721,16 @@ R P 2085 o - Ap 21 2 0 -
 R P 2085 o - Jun 9 2 1 S
 R P 2086 o - Ap 13 2 0 -
 R P 2086 o - May 25 2 1 S
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
+R PH 1936 o - O 31 24 1 D
+R PH 1937 o - Ja 15 24 0 S
+R PH 1941 o - D 15 24 1 D
+R PH 1945 o - N 30 24 0 S
+R PH 1954 o - Ap 11 24 1 D
+R PH 1954 o - Jun 4 24 0 S
+R PH 1977 o - Mar 27 24 1 D
+R PH 1977 o - S 21 24 0 S
+R PH 1990 o - May 21 0 1 D
+R PH 1990 o - Jul 28 24 0 S
 R S 1920 1923 - Ap Su>=15 2 1 S
 R S 1920 1923 - O Su>=1 2 0 -
 R S 1962 o - Ap 29 2 1 S
@@ -1725,7 +1729,7 @@ R Y 1972 2006 - O lastSu 2 0 S
 R Y 1987 2006 - Ap Su>=1 2 1 D
 R Yu 1965 o - Ap lastSu 0 2 DD
 R Yu 1965 o - O lastSu 2 0 S
-R m 1931 o - April 30 0 1 D
+R m 1931 o - Ap 30 0 1 D
 R m 1931 o - O 1 0 0 S
 R m 1939 o - F 5 0 1 D
 R m 1939 o - Jun 25 0 0 S
@@ -2019,9 +2023,9 @@ R y 2002 2004 - Ap Su>=1 0 0 -
 R y 2002 2003 - S Su>=1 0 1 -
 R y 2004 2009 - O Su>=15 0 1 -
 R y 2005 2009 - Mar Su>=8 0 0 -
-R y 2010 ma - O Su>=1 0 1 -
+R y 2010 2024 - O Su>=1 0 1 -
 R y 2010 2012 - Ap Su>=8 0 0 -
-R y 2013 ma - Mar Su>=22 0 0 -
+R y 2013 2024 - Mar Su>=22 0 0 -
 R PE 1938 o - Ja 1 0 1 -
 R PE 1938 o - Ap 1 0 0 -
 R PE 1938 1939 - S lastSu 0 1 -
@@ -2336,7 +2340,8 @@ Z America/Asuncion -3:50:40 - LMT 1890
 -3:50:40 - AMT 1931 O 10
 -4 - %z 1972 O
 -3 - %z 1974 Ap
--4 y %z
+-4 y %z 2024 O 15
+-3 - %z
 Z America/Bahia -2:34:4 - LMT 1914
 -3 B %z 2003 S 24
 -3 - %z 2011 O 16
@@ -2427,6 +2432,20 @@ Z America/Ciudad_Juarez -7:5:56 - LMT 1922 Ja 1 7u
 Z America/Costa_Rica -5:36:13 - LMT 1890
 -5:36:13 - SJMT 1921 Ja 15
 -6 CR C%sT
+Z America/Coyhaique -4:48:16 - LMT 1890
+-4:42:45 - SMT 1910 Ja 10
+-5 - %z 1916 Jul
+-4:42:45 - SMT 1918 S 10
+-4 - %z 1919 Jul
+-4:42:45 - SMT 1927 S
+-5 x %z 1932 S
+-4 - %z 1942 Jun
+-5 - %z 1942 Au
+-4 - %z 1946 Au 28 24
+-5 1 %z 1947 Mar 31 24
+-5 - %z 1947 May 21 23
+-4 x %z 2025 Mar 20
+-3 - %z
 Z America/Cuiaba -3:44:20 - LMT 1914
 -4 B %z 2003 S 24
 -4 - %z 2004 O
@@ -2932,9 +2951,7 @@ Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 7u
 -8 1 PDT 1951 S 30 2
 -8 - PST 1952 Ap 27 2
 -8 1 PDT 1952 S 28 2
--8 - PST 1954
--8 CA P%sT 1961
--8 - PST 1976
+-8 CA P%sT 1967
 -8 u P%sT 1996
 -8 m P%sT 2001
 -8 u P%sT 2002 F 20
@@ -3268,10 +3285,10 @@ Z Asia/Makassar 7:57:36 - LMT 1920
 8 - %z 1942 F 9
 9 - %z 1945 S 23
 8 - WITA
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
+Z Asia/Manila -15:56:8 - LMT 1844 D 31
+8:3:52 - LMT 1899 S 6 4u
+8 PH P%sT 1942 F 11 24
+9 - JST 1945 Mar 4
 8 PH P%sT
 Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
 2 CY EE%sT 1998 S
@@ -3415,7 +3432,7 @@ Z Asia/Tbilisi 2:59:11 - LMT 1880
 Z Asia/Tehran 3:25:44 - LMT 1916
 3:25:44 - TMT 1935 Jun 13
 3:30 i %z 1977 O 20 24
-4 i %z 1979
+4 i %z 1978 N 10 24
 3:30 i %z
 Z Asia/Thimphu 5:58:36 - LMT 1947 Au 15
 5:30 - %z 1987 O
diff --git a/libs/tzdata/zoneinfo/zone.tab b/libs/tzdata/zoneinfo/zone.tab
index bfc0b59330..2626b05503 100644
--- a/libs/tzdata/zoneinfo/zone.tab
+++ b/libs/tzdata/zoneinfo/zone.tab
@@ -139,7 +139,8 @@ CH	+4723+00832	Europe/Zurich
 CI	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
+CL	-4534-07204	America/Coyhaique	Aysen Region
+CL	-5309-07055	America/Punta_Arenas	Magallanes Region
 CL	-2709-10926	Pacific/Easter	Easter Island
 CM	+0403+00942	Africa/Douala
 CN	+3114+12128	Asia/Shanghai	Beijing Time
@@ -310,7 +311,7 @@ PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
 PG	-0930+14710	Pacific/Port_Moresby	most of Papua New Guinea
 PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
+PH	+143512+1205804	Asia/Manila
 PK	+2452+06703	Asia/Karachi
 PL	+5215+02100	Europe/Warsaw
 PM	+4703-05620	America/Miquelon
diff --git a/libs/tzdata/zoneinfo/zone1970.tab b/libs/tzdata/zoneinfo/zone1970.tab
index 7726f39a09..cd43e3d2e0 100644
--- a/libs/tzdata/zoneinfo/zone1970.tab
+++ b/libs/tzdata/zoneinfo/zone1970.tab
@@ -2,15 +2,15 @@
 #
 # This file is in the public domain.
 #
-# From Paul Eggert (2018-06-27):
+# From Paul Eggert (2025-05-15):
 # This file contains a table where each row stands for a timezone where
 # civil timestamps have agreed since 1970.  Columns are separated by
-# a single tab.  Lines beginning with '#' are comments.  All text uses
+# a single tab.  Lines beginning with โ€˜#โ€™ are comments.  All text uses
 # UTF-8 encoding.  The columns of the table are as follows:
 #
 # 1.  The countries that overlap the timezone, as a comma-separated list
-#     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
-# 2.  Latitude and longitude of the timezone's principal location
+#     of ISO 3166 2-character country codes.
+# 2.  Latitude and longitude of the timezoneโ€™s principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
 #     either ยฑDDMMยฑDDDMM or ยฑDDMMSSยฑDDDMMSS,
 #     first latitude (+ is north), then longitude (+ is east).
@@ -124,7 +124,8 @@ CH,DE,LI	+4723+00832	Europe/Zurich	Bรผsingen
 CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
+CL	-4534-07204	America/Coyhaique	Aysรฉn Region
+CL	-5309-07055	America/Punta_Arenas	Magallanes Region
 CL	-2709-10926	Pacific/Easter	Easter Island
 CN	+3114+12128	Asia/Shanghai	Beijing Time
 CN	+4348+08735	Asia/Urumqi	Xinjiang Time
@@ -183,7 +184,7 @@ IR	+3540+05126	Asia/Tehran
 IT,SM,VA	+4154+01229	Europe/Rome
 JM	+175805-0764736	America/Jamaica
 JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
+JP,AU	+353916+1394441	Asia/Tokyo	Eyre Bird Observatory
 KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
 KG	+4254+07436	Asia/Bishkek
 KI,MH,TV,UM,WF	+0125+17300	Pacific/Tarawa	Gilberts, Marshalls, Wake
@@ -196,7 +197,7 @@ KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
 KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
 KZ	+5017+05710	Asia/Aqtobe	Aqtรถbe/Aktobe
 KZ	+4431+05016	Asia/Aqtau	Mangghystaลซ/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyraลซ/Atirau/Gur'yev
+KZ	+4707+05156	Asia/Atyrau	Atyraลซ/Atirau/Gurโ€™yev
 KZ	+5113+05121	Asia/Oral	West Kazakhstan
 LB	+3353+03530	Asia/Beirut
 LK	+0656+07951	Asia/Colombo
@@ -244,9 +245,9 @@ PE	-1203-07703	America/Lima
 PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG,AQ,FM	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
+PG,AQ,FM	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas), Chuuk, Yap, Dumont dโ€™Urville
 PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
+PH	+143512+1205804	Asia/Manila
 PK	+2452+06703	Asia/Karachi
 PL	+5215+02100	Europe/Warsaw
 PM	+4703-05620	America/Miquelon
@@ -264,7 +265,7 @@ RO	+4426+02606	Europe/Bucharest
 RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
 RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
 RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# Mention RU and UA alphabetically.  See "territorial claims" above.
+# Mention RU and UA alphabetically.  See โ€œterritorial claimsโ€ above.
 RU,UA	+4457+03406	Europe/Simferopol	Crimea
 RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
 RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
@@ -293,7 +294,7 @@ RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
 SA,AQ,KW,YE	+2438+04643	Asia/Riyadh	Syowa
 SB,FM	-0932+16012	Pacific/Guadalcanal	Pohnpei
 SD	+1536+03232	Africa/Khartoum
-SG,MY	+0117+10351	Asia/Singapore	peninsular Malaysia
+SG,AQ,MY	+0117+10351	Asia/Singapore	peninsular Malaysia, Concordia
 SR	+0550-05510	America/Paramaribo
 SS	+0451+03137	Africa/Juba
 ST	+0020+00644	Africa/Sao_Tome
@@ -352,20 +353,20 @@ ZA,LS,SZ	-2615+02800	Africa/Johannesburg
 # The next section contains experimental tab-separated comments for
 # use by user agents like tzselect that identify continents and oceans.
 #
-# For example, the comment "#@AQ<tab>Antarctica/" means the country code
+# For example, the comment โ€˜#@AQ<tab>Antarctica/โ€™ means the country code
 # AQ is in the continent Antarctica regardless of the Zone name,
 # so Pacific/Auckland should be listed under Antarctica as well as
-# under the Pacific because its line's country codes include AQ.
+# under the Pacific because its lineโ€™s country codes include AQ.
 #
 # If more than one country code is affected each is listed separated
-# by commas, e.g., #@IS,SH<tab>Atlantic/".  If a country code is in
+# by commas, e.g., โ€˜#@IS,SH<tab>Atlantic/โ€™.  If a country code is in
 # more than one continent or ocean, each is listed separated by
-# commas, e.g., the second column of "#@CY,TR<tab>Asia/,Europe/".
+# commas, e.g., the second column of โ€˜#@CY,TR<tab>Asia/,Europe/โ€™.
 #
 # These experimental comments are present only for country codes where
 # the continent or ocean is not already obvious from the Zone name.
 # For example, there is no such comment for RU since it already
-# corresponds to Zone names starting with both "Europe/" and "Asia/".
+# corresponds to Zone names starting with both โ€˜Europe/โ€™ and โ€˜Asia/โ€™.
 #
 #@AQ	Antarctica/
 #@IS,SH	Atlantic/
diff --git a/libs/tzdata/zoneinfo/zonenow.tab b/libs/tzdata/zoneinfo/zonenow.tab
index 01f536b3ba..1d64b39124 100644
--- a/libs/tzdata/zoneinfo/zonenow.tab
+++ b/libs/tzdata/zoneinfo/zonenow.tab
@@ -5,12 +5,12 @@
 # From Paul Eggert (2023-12-18):
 # This file contains a table where each row stands for a timezone
 # where civil timestamps are predicted to agree from now on.
-# This file is like zone1970.tab (see zone1970.tab's comments),
+# This file is like zone1970.tab (see zone1970.tabโ€™s comments),
 # but with the following changes:
 #
 # 1.  Each timezone corresponds to a set of clocks that are planned
 #     to agree from now on.  This is a larger set of clocks than in
-#     zone1970.tab, where each timezone's clocks must agree from 1970 on.
+#     zone1970.tab, where each timezoneโ€™s clocks must agree from 1970 on.
 # 2.  The first column is irrelevant and ignored.
 # 3.  The table is sorted in a different way:
 #     first by standard time UTC offset;
@@ -29,19 +29,19 @@
 #XX	coordinates	TZ	comments
 #
 # -11 - SST
-XX	-1416-17042	Pacific/Pago_Pago	Midway; Samoa ("SST")
+XX	-1416-17042	Pacific/Pago_Pago	Midway; Samoa (SST)
 #
 # -11
 XX	-1901-16955	Pacific/Niue	Niue
 #
 # -10 - HST
-XX	+211825-1575130	Pacific/Honolulu	Hawaii ("HST")
+XX	+211825-1575130	Pacific/Honolulu	Hawaii (HST)
 #
 # -10
 XX	-1732-14934	Pacific/Tahiti	Tahiti; Cook Islands
 #
 # -10/-09 - HST / HDT (North America DST)
-XX	+515248-1763929	America/Adak	western Aleutians in Alaska ("HST/HDT")
+XX	+515248-1763929	America/Adak	western Aleutians in Alaska (HST/HDT)
 #
 # -09:30
 XX	-0900-13930	Pacific/Marquesas	Marquesas
@@ -50,64 +50,61 @@ XX	-0900-13930	Pacific/Marquesas	Marquesas
 XX	-2308-13457	Pacific/Gambier	Gambier
 #
 # -09/-08 - AKST/AKDT (North America DST)
-XX	+611305-1495401	America/Anchorage	most of Alaska ("AKST/AKDT")
+XX	+611305-1495401	America/Anchorage	most of Alaska (AKST/AKDT)
 #
 # -08
 XX	-2504-13005	Pacific/Pitcairn	Pitcairn
 #
 # -08/-07 - PST/PDT (North America DST)
-XX	+340308-1181434	America/Los_Angeles	Pacific ("PST/PDT") - US & Canada; Mexico near US border
+XX	+340308-1181434	America/Los_Angeles	Pacific (PST/PDT) - US & Canada; Mexico near US border
 #
 # -07 - MST
-XX	+332654-1120424	America/Phoenix	Mountain Standard ("MST") - Arizona; western Mexico; Yukon
+XX	+332654-1120424	America/Phoenix	Mountain Standard (MST) - Arizona; western Mexico; Yukon
 #
 # -07/-06 - MST/MDT (North America DST)
-XX	+394421-1045903	America/Denver	Mountain ("MST/MDT") - US & Canada; Mexico near US border
+XX	+394421-1045903	America/Denver	Mountain (MST/MDT) - US & Canada; Mexico near US border
 #
 # -06
 XX	-0054-08936	Pacific/Galapagos	Galรกpagos
 #
 # -06 - CST
-XX	+1924-09909	America/Mexico_City	Central Standard ("CST") - Saskatchewan; central Mexico; Central America
+XX	+1924-09909	America/Mexico_City	Central Standard (CST) - Saskatchewan; central Mexico; Central America
 #
 # -06/-05 (Chile DST)
 XX	-2709-10926	Pacific/Easter	Easter Island
 #
 # -06/-05 - CST/CDT (North America DST)
-XX	+415100-0873900	America/Chicago	Central ("CST/CDT") - US & Canada; Mexico near US border
+XX	+415100-0873900	America/Chicago	Central (CST/CDT) - US & Canada; Mexico near US border
 #
 # -05
 XX	-1203-07703	America/Lima	eastern South America
 #
 # -05 - EST
-XX	+175805-0764736	America/Jamaica	Eastern Standard ("EST") - Caymans; Jamaica; eastern Mexico; Panama
+XX	+175805-0764736	America/Jamaica	Eastern Standard (EST) - Caymans; Jamaica; eastern Mexico; Panama
 #
 # -05/-04 - CST/CDT (Cuba DST)
 XX	+2308-08222	America/Havana	Cuba
 #
 # -05/-04 - EST/EDT (North America DST)
-XX	+404251-0740023	America/New_York	Eastern ("EST/EDT") - US & Canada
+XX	+404251-0740023	America/New_York	Eastern (EST/EDT) - US & Canada
 #
 # -04
 XX	+1030-06656	America/Caracas	western South America
 #
 # -04 - AST
-XX	+1828-06954	America/Santo_Domingo	Atlantic Standard ("AST") - eastern Caribbean
+XX	+1828-06954	America/Santo_Domingo	Atlantic Standard (AST) - eastern Caribbean
 #
 # -04/-03 (Chile DST)
 XX	-3327-07040	America/Santiago	most of Chile
 #
-# -04/-03 (Paraguay DST)
-XX	-2516-05740	America/Asuncion	Paraguay
-#
 # -04/-03 - AST/ADT (North America DST)
-XX	+4439-06336	America/Halifax	Atlantic ("AST/ADT") - Canada; Bermuda
+XX	+4439-06336	America/Halifax	Atlantic (AST/ADT) - Canada; Bermuda
 #
 # -03:30/-02:30 - NST/NDT (North America DST)
-XX	+4734-05243	America/St_Johns	Newfoundland ("NST/NDT")
+XX	+4734-05243	America/St_Johns	Newfoundland (NST/NDT)
 #
 # -03
-XX	-2332-04637	America/Sao_Paulo	eastern South America
+XX	-2332-04637	America/Sao_Paulo	eastern and southern South America
 #
 # -03/-02 (North America DST)
 XX	+4703-05620	America/Miquelon	St Pierre & Miquelon
@@ -125,43 +122,43 @@ XX	+1455-02331	Atlantic/Cape_Verde	Cape Verde
 XX	+3744-02540	Atlantic/Azores	Azores
 #
 # +00 - GMT
-XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland ("GMT")
+XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland (GMT)
 #
 # +00/+01 - GMT/BST (EU DST)
-XX	+513030-0000731	Europe/London	United Kingdom ("GMT/BST")
+XX	+513030-0000731	Europe/London	United Kingdom (GMT/BST)
 #
 # +00/+01 - WET/WEST (EU DST)
-XX	+3843-00908	Europe/Lisbon	western Europe ("WET/WEST")
+XX	+3843-00908	Europe/Lisbon	western Europe (WET/WEST)
 #
 # +00/+02 - Troll DST
 XX	-720041+0023206	Antarctica/Troll	Troll Station in Antarctica
 #
 # +01 - CET
-XX	+3647+00303	Africa/Algiers	Algeria, Tunisia ("CET")
+XX	+3647+00303	Africa/Algiers	Algeria, Tunisia (CET)
 #
 # +01 - WAT
-XX	+0627+00324	Africa/Lagos	western Africa ("WAT")
+XX	+0627+00324	Africa/Lagos	western Africa (WAT)
 #
 # +01/+00 - IST/GMT (EU DST in reverse)
-XX	+5320-00615	Europe/Dublin	Ireland ("IST/GMT")
+XX	+5320-00615	Europe/Dublin	Ireland (IST/GMT)
 #
 # +01/+00 - (Morocco DST)
 XX	+3339-00735	Africa/Casablanca	Morocco
 #
 # +01/+02 - CET/CEST (EU DST)
-XX	+4852+00220	Europe/Paris	central Europe ("CET/CEST")
+XX	+4852+00220	Europe/Paris	central Europe (CET/CEST)
 #
 # +02 - CAT
-XX	-2558+03235	Africa/Maputo	central Africa ("CAT")
+XX	-2558+03235	Africa/Maputo	central Africa (CAT)
 #
 # +02 - EET
-XX	+3254+01311	Africa/Tripoli	Libya; Kaliningrad ("EET")
+XX	+3254+01311	Africa/Tripoli	Libya; Kaliningrad (EET)
 #
 # +02 - SAST
-XX	-2615+02800	Africa/Johannesburg	southern Africa ("SAST")
+XX	-2615+02800	Africa/Johannesburg	southern Africa (SAST)
 #
 # +02/+03 - EET/EEST (EU DST)
-XX	+3758+02343	Europe/Athens	eastern Europe ("EET/EEST")
+XX	+3758+02343	Europe/Athens	eastern Europe (EET/EEST)
 #
 # +02/+03 - EET/EEST (Egypt DST)
 XX	+3003+03115	Africa/Cairo	Egypt
@@ -182,10 +179,10 @@ XX	+314650+0351326	Asia/Jerusalem	Israel
 XX	+4101+02858	Europe/Istanbul	Near East; Belarus
 #
 # +03 - EAT
-XX	-0117+03649	Africa/Nairobi	eastern Africa ("EAT")
+XX	-0117+03649	Africa/Nairobi	eastern Africa (EAT)
 #
 # +03 - MSK
-XX	+554521+0373704	Europe/Moscow	Moscow ("MSK")
+XX	+554521+0373704	Europe/Moscow	Moscow (MSK)
 #
 # +03:30
 XX	+3540+05126	Asia/Tehran	Iran
@@ -200,13 +197,13 @@ XX	+3431+06912	Asia/Kabul	Afghanistan
 XX	+4120+06918	Asia/Tashkent	Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
 #
 # +05 - PKT
-XX	+2452+06703	Asia/Karachi	Pakistan ("PKT")
+XX	+2452+06703	Asia/Karachi	Pakistan (PKT)
 #
 # +05:30
 XX	+0656+07951	Asia/Colombo	Sri Lanka
 #
 # +05:30 - IST
-XX	+2232+08822	Asia/Kolkata	India ("IST")
+XX	+2232+08822	Asia/Kolkata	India (IST)
 #
 # +05:45
 XX	+2743+08519	Asia/Kathmandu	Nepal
@@ -221,25 +218,25 @@ XX	+1647+09610	Asia/Yangon	Myanmar; Cocos
 XX	+1345+10031	Asia/Bangkok	Russia; Indochina; Christmas Island
 #
 # +07 - WIB
-XX	-0610+10648	Asia/Jakarta	Indonesia ("WIB")
+XX	-0610+10648	Asia/Jakarta	Indonesia (WIB)
 #
 # +08
-XX	+0117+10351	Asia/Singapore	Russia; Brunei; Malaysia; Singapore
+XX	+0117+10351	Asia/Singapore	Russia; Brunei; Malaysia; Singapore; Concordia
 #
 # +08 - AWST
-XX	-3157+11551	Australia/Perth	Western Australia ("AWST")
+XX	-3157+11551	Australia/Perth	Western Australia (AWST)
 #
 # +08 - CST
-XX	+3114+12128	Asia/Shanghai	China ("CST")
+XX	+3114+12128	Asia/Shanghai	China (CST)
 #
 # +08 - HKT
-XX	+2217+11409	Asia/Hong_Kong	Hong Kong ("HKT")
+XX	+2217+11409	Asia/Hong_Kong	Hong Kong (HKT)
 #
 # +08 - PHT
-XX	+1435+12100	Asia/Manila	Philippines ("PHT")
+XX	+143512+1205804	Asia/Manila	Philippines (PHT)
 #
 # +08 - WITA
-XX	-0507+11924	Asia/Makassar	Indonesia ("WITA")
+XX	-0507+11924	Asia/Makassar	Indonesia (WITA)
 #
 # +08:45
 XX	-3143+12852	Australia/Eucla	Eucla
@@ -248,31 +245,31 @@ XX	-3143+12852	Australia/Eucla	Eucla
 XX	+5203+11328	Asia/Chita	Russia; Palau; East Timor
 #
 # +09 - JST
-XX	+353916+1394441	Asia/Tokyo	Japan ("JST")
+XX	+353916+1394441	Asia/Tokyo	Japan (JST); Eyre Bird Observatory
 #
 # +09 - KST
-XX	+3733+12658	Asia/Seoul	Korea ("KST")
+XX	+3733+12658	Asia/Seoul	Korea (KST)
 #
 # +09 - WIT
-XX	-0232+14042	Asia/Jayapura	Indonesia ("WIT")
+XX	-0232+14042	Asia/Jayapura	Indonesia (WIT)
 #
 # +09:30 - ACST
-XX	-1228+13050	Australia/Darwin	Northern Territory ("ACST")
+XX	-1228+13050	Australia/Darwin	Northern Territory (ACST)
 #
 # +09:30/+10:30 - ACST/ACDT (Australia DST)
-XX	-3455+13835	Australia/Adelaide	South Australia ("ACST/ACDT")
+XX	-3455+13835	Australia/Adelaide	South Australia (ACST/ACDT)
 #
 # +10
-XX	+4310+13156	Asia/Vladivostok	Russia; Yap; Chuuk; Papua New Guinea; Dumont d'Urville
+XX	+4310+13156	Asia/Vladivostok	Russia; Yap; Chuuk; Papua New Guinea; Dumont dโ€™Urville
 #
 # +10 - AEST
-XX	-2728+15302	Australia/Brisbane	Queensland ("AEST")
+XX	-2728+15302	Australia/Brisbane	Queensland (AEST)
 #
 # +10 - ChST
-XX	+1328+14445	Pacific/Guam	Mariana Islands ("ChST")
+XX	+1328+14445	Pacific/Guam	Mariana Islands (ChST)
 #
 # +10/+11 - AEST/AEDT (Australia DST)
-XX	-3352+15113	Australia/Sydney	southeast Australia ("AEST/AEDT")
+XX	-3352+15113	Australia/Sydney	southeast Australia (AEST/AEDT)
 #
 # +10:30/+11
 XX	-3133+15905	Australia/Lord_Howe	Lord Howe Island
@@ -287,7 +284,7 @@ XX	-2903+16758	Pacific/Norfolk	Norfolk Island
 XX	+5301+15839	Asia/Kamchatka	Russia; Tuvalu; Fiji; etc.
 #
 # +12/+13 (New Zealand DST)
-XX	-3652+17446	Pacific/Auckland	New Zealand ("NZST/NZDT")
+XX	-3652+17446	Pacific/Auckland	New Zealand (NZST/NZDT)
 #
 # +12:45/+13:45 (Chatham DST)
 XX	-4357-17633	Pacific/Chatham	Chatham Islands
diff --git a/libs/tzdata/zones b/libs/tzdata/zones
index 3c4a951d49..d4c3ef5563 100644
--- a/libs/tzdata/zones
+++ b/libs/tzdata/zones
@@ -50,6 +50,7 @@ America/Chicago
 America/Chihuahua
 America/Ciudad_Juarez
 America/Costa_Rica
+America/Coyhaique
 America/Cuiaba
 America/Danmarkshavn
 America/Dawson
diff --git a/libs/tzlocal-5.2.dist-info/METADATA b/libs/tzlocal-5.2.dist-info/METADATA
deleted file mode 100644
index 53d08decf9..0000000000
--- a/libs/tzlocal-5.2.dist-info/METADATA
+++ /dev/null
@@ -1,248 +0,0 @@
-Metadata-Version: 2.1
-Name: tzlocal
-Version: 5.2
-Summary: tzinfo object for the local timezone
-Author-email: Lennart Regebro <regebro@gmail.com>
-License: MIT
-Project-URL: Source code, https://github.com/regebro/tzlocal
-Project-URL: Changelog, https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
-Project-URL: Issue tracker, https://github.com/regebro/tzlocal/issues
-Keywords: timezone
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: Unix
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Typing :: Typed
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-Requires-Dist: tzdata ; platform_system == "Windows"
-Requires-Dist: backports.zoneinfo ; python_version < "3.9"
-Provides-Extra: devenv
-Requires-Dist: pytest >=4.3 ; extra == 'devenv'
-Requires-Dist: pytest-mock >=3.3 ; extra == 'devenv'
-Requires-Dist: pytest-cov ; extra == 'devenv'
-Requires-Dist: check-manifest ; extra == 'devenv'
-Requires-Dist: zest.releaser ; extra == 'devenv'
-
-tzlocal
-=======
-
-API CHANGE!
------------
-
-With version 3.0 of tzlocal, tzlocal no longer returned `pytz` objects, but
-`zoneinfo` objects, which has a different API. Since 4.0, it now restored
-partial compatibility for `pytz` users through Paul Ganssle's
-`pytz_deprecation_shim`.
-
-tzlocal 4.0 also adds an official function `get_localzone_name()` to get only
-the timezone name, instead of a timezone object. On unix, it can raise an
-error if you don't have a timezone name configured, where `get_localzone()`
-will succeed, so only use that if you need the timezone name.
-
-4.0 also adds way more information on what is going wrong in your
-configuration when the configuration files are unclear or contradictory.
-
-Version 5.0 removes the `pytz_deprecation_shim`, and now only returns
-`zoneinfo` objects, like verion 3.0 did. If you need `pytz` objects, you have
-to stay on version 4.0. If there are bugs in version 4.0, I will release
-updates, but there will be no further functional changes on the 4.x branch.
-
-
-Info
-----
-
-This Python module returns the `IANA time zone name
-<https://www.iana.org/time-zones>`_ for your local time zone or a ``tzinfo``
-object with the local timezone information, under Unix and Windows.
-
-It requires Python 3.8 or later, and will use the ``backports.tzinfo``
-package, for Python 3.8.
-
-This module attempts to fix a glaring hole in the ``pytz`` and ``zoneinfo``
-modules, that there is no way to get the local timezone information, unless
-you know the zoneinfo name, and under several Linux distros that's hard or
-impossible to figure out.
-
-With ``tzlocal`` you only need to call ``get_localzone()`` and you will get a
-``tzinfo`` object with the local time zone info. On some Unices you will
-still not get to know what the timezone name is, but you don't need that when
-you have the tzinfo file. However, if the timezone name is readily available
-it will be used.
-
-What it's not for
------------------
-
-It's not for converting the current time between UTC and your local time. There are
-other, simpler ways of doing this. This is ig you need to know things like the name
-of the time zone, or if you need to be able to convert between your time zone and
-another time zone for times that are in the future or in the past.
-
-For current time conversions to and from UTC, look in the Python ``time`` module.
-
-
-Supported systems
------------------
-
-These are the systems that are in theory supported:
-
- * Windows 2000 and later
-
- * Any unix-like system with a ``/etc/localtime`` or ``/usr/local/etc/localtime``
-
-If you have one of the above systems and it does not work, it's a bug.
-Please report it.
-
-Please note that if you are getting a time zone called ``local``, this is not
-a bug, it's actually the main feature of ``tzlocal``, that even if your
-system does NOT have a configuration file with the zoneinfo name of your time
-zone, it will still work.
-
-You can also use ``tzlocal`` to get the name of your local timezone, but only
-if your system is configured to make that possible. ``tzlocal`` looks for the
-timezone name in ``/etc/timezone``, ``/var/db/zoneinfo``,
-``/etc/sysconfig/clock`` and ``/etc/conf.d/clock``. If your
-``/etc/localtime`` is a symlink it can also extract the name from that
-symlink.
-
-If you need the name of your local time zone, then please make sure your
-system is properly configured to allow that.
-
-If your unix system doesn't have a timezone configured, tzlocal will default
-to UTC.
-
-Notes on Docker
----------------
-
-It turns out that Docker images frequently have broken timezone setups.
-This usually resuts in a warning that the configuration is wrong, or that
-the timezone offset doesn't match the found timezone.
-
-The easiest way to fix that is to set a TZ variable in your docker setup
-to whatever timezone you want, which is usually the timezone your host
-computer has.
-
-Usage
------
-
-Load the local timezone:
-
-    >>> from tzlocal import get_localzone
-    >>> tz = get_localzone()
-    >>> tz
-    zoneinfo.ZoneInfo(key='Europe/Warsaw')
-
-Create a local datetime:
-
-    >>> from datetime import datetime
-    >>> dt = datetime(2015, 4, 10, 7, 22, tzinfo=tz)
-    >>> dt
-    datetime.datetime(2015, 4, 10, 7, 22, tzinfo=zoneinfo.ZoneInfo(key='Europe/Warsaw'))
-
-Lookup another timezone with ``zoneinfo`` (``backports.zoneinfo`` on Python 3.8 or earlier):
-
-    >>> from zoneinfo import ZoneInfo
-    >>> eastern = ZoneInfo('US/Eastern')
-
-Convert the datetime:
-
-    >>> dt.astimezone(eastern)
-    datetime.datetime(2015, 4, 10, 1, 22, tzinfo=zoneinfo.ZoneInfo(key='US/Eastern'))
-
-If you just want the name of the local timezone, use `get_localzone_name()`:
-
-    >>> from tzlocal import get_localzone_name
-    >>> get_localzone_name()
-    "Europe/Warsaw"
-
-Please note that under Unix, `get_localzone_name()` may fail if there is no zone
-configured, where `get_localzone()` would generally succeed.
-
-Troubleshooting
----------------
-
-If you don't get the result you expect, try running it with debugging turned on.
-Start a python interpreter that has tzlocal installed, and run the following code::
-
-    import logging
-    logging.basicConfig(level="DEBUG")
-    import tzlocal
-    tzlocal.get_localzone()
-
-The output should look something like this, and this will tell you what
-configurations were found::
-
-    DEBUG:root:/etc/timezone found, contents:
-     Europe/Warsaw
-
-    DEBUG:root:/etc/localtime found
-    DEBUG:root:2 found:
-     {'/etc/timezone': 'Europe/Warsaw', '/etc/localtime is a symlink to': 'Europe/Warsaw'}
-    zoneinfo.ZoneInfo(key='Europe/Warsaw')
-
-
-Development
------------
-
-For ease of development, there is a Makefile that will help you with basic tasks,
-like creating a development environment with all the necessary tools (although
-you need a supported Python version installed first)::
-
-    $ make devenv
-
-To run tests::
-
-    $ make test
-
-Check the syntax::
-
-    $ make check
-
-
-Maintainer
-----------
-
-* Lennart Regebro, regebro@gmail.com
-
-Contributors
-------------
-
-* Marc Van Olmen
-* Benjamen Meyer
-* Manuel Ebert
-* Xiaokun Zhu
-* Cameris
-* Edward Betts
-* McK KIM
-* Cris Ewing
-* Ayala Shachar
-* Lev Maximov
-* Jakub Wilk
-* John Quarles
-* Preston Landers
-* Victor Torres
-* Jean Jordaan
-* Zackary Welch
-* Mickaรซl Schoentgen
-* Gabriel Corona
-* Alex Grรถnholm
-* Julin S
-* Miroslav ล edivรฝ
-* revansSZ
-* Sam Treweek
-* Peter Di Pasquale
-* Rongrong
-
-(Sorry if I forgot someone)
-
-License
--------
-
-* MIT https://opensource.org/licenses/MIT
diff --git a/libs/tzlocal-5.2.dist-info/RECORD b/libs/tzlocal-5.2.dist-info/RECORD
deleted file mode 100644
index dcc09b7f92..0000000000
--- a/libs/tzlocal-5.2.dist-info/RECORD
+++ /dev/null
@@ -1,13 +0,0 @@
-tzlocal-5.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-tzlocal-5.2.dist-info/LICENSE.txt,sha256=2ZqyCa6xaq0sJckP_YPBqYHikP__dqQgoqsD4D8EG4w,1060
-tzlocal-5.2.dist-info/METADATA,sha256=7l5yLSSHm6d5LzlQXQC2qouE182y8XY0MWFhWGK2DKA,7787
-tzlocal-5.2.dist-info/RECORD,,
-tzlocal-5.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzlocal-5.2.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-tzlocal-5.2.dist-info/top_level.txt,sha256=QR6vZWP520waETnkotApPQPyVh9VnjoYPoAVHLK1DrE,8
-tzlocal/__init__.py,sha256=2OQDx61TZv_HmBl7JKKP4ATldlx5OdEXOjKXAt8rQwY,396
-tzlocal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tzlocal/unix.py,sha256=7yQFp61Q2Wlv435kAMl_z7IZEz8OrLuqeM63UO4Yk28,8168
-tzlocal/utils.py,sha256=QtZV32vZ17UeMpRHW2zqeAI_czaPlxpwisYzszqpyyY,3329
-tzlocal/win32.py,sha256=7vqzSfDyG4rqisOb266yMnah_ptjuah8rODjbc7MfJk,4772
-tzlocal/windows_tz.py,sha256=fG2X3ly4i3cRoaQEd6ncJhqDgPp-qvJunnRW-fg0Jkk,35165
diff --git a/libs/tzlocal-5.2.dist-info/WHEEL b/libs/tzlocal-5.2.dist-info/WHEEL
deleted file mode 100644
index da25d7b423..0000000000
--- a/libs/tzlocal-5.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/tzdata-2024.2.dist-info/INSTALLER b/libs/tzlocal-5.3.1.dist-info/INSTALLER
similarity index 100%
rename from libs/tzdata-2024.2.dist-info/INSTALLER
rename to libs/tzlocal-5.3.1.dist-info/INSTALLER
diff --git a/libs/tzlocal-5.3.1.dist-info/METADATA b/libs/tzlocal-5.3.1.dist-info/METADATA
new file mode 100644
index 0000000000..f6ba07d481
--- /dev/null
+++ b/libs/tzlocal-5.3.1.dist-info/METADATA
@@ -0,0 +1,245 @@
+Metadata-Version: 2.4
+Name: tzlocal
+Version: 5.3.1
+Summary: tzinfo object for the local timezone
+Author-email: Lennart Regebro <regebro@gmail.com>
+License: MIT
+Project-URL: Source code, https://github.com/regebro/tzlocal
+Project-URL: Changelog, https://github.com/regebro/tzlocal/blob/master/CHANGES.txt
+Project-URL: Issue tracker, https://github.com/regebro/tzlocal/issues
+Keywords: timezone
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: Unix
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Typing :: Typed
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Requires-Dist: tzdata; platform_system == "Windows"
+Provides-Extra: devenv
+Requires-Dist: pytest>=4.3; extra == "devenv"
+Requires-Dist: pytest-mock>=3.3; extra == "devenv"
+Requires-Dist: pytest-cov; extra == "devenv"
+Requires-Dist: check_manifest; extra == "devenv"
+Requires-Dist: zest.releaser; extra == "devenv"
+Dynamic: license-file
+
+tzlocal
+=======
+
+API CHANGE!
+-----------
+
+With version 3.0 of tzlocal, tzlocal no longer returned `pytz` objects, but
+`zoneinfo` objects, which has a different API. Since 4.0, it now restored
+partial compatibility for `pytz` users through Paul Ganssle's
+`pytz_deprecation_shim`.
+
+tzlocal 4.0 also adds an official function `get_localzone_name()` to get only
+the timezone name, instead of a timezone object. On unix, it can raise an
+error if you don't have a timezone name configured, where `get_localzone()`
+will succeed, so only use that if you need the timezone name.
+
+4.0 also adds way more information on what is going wrong in your
+configuration when the configuration files are unclear or contradictory.
+
+Version 5.0 removes the `pytz_deprecation_shim`, and now only returns
+`zoneinfo` objects, like verion 3.0 did. If you need `pytz` objects, you have
+to stay on version 4.0. If there are bugs in version 4.0, I will release
+updates, but there will be no further functional changes on the 4.x branch.
+
+
+Info
+----
+
+This Python module returns the `IANA time zone name
+<https://www.iana.org/time-zones>`_ for your local time zone or a ``tzinfo``
+object with the local timezone information, under Unix and Windows.
+
+This module attempts to fix a glaring hole in the ``pytz`` and ``zoneinfo``
+modules, that there is no way to get the local timezone information, unless
+you know the zoneinfo name, and under several Linux distros that's hard or
+impossible to figure out.
+
+With ``tzlocal`` you only need to call ``get_localzone()`` and you will get a
+``tzinfo`` object with the local time zone info. On some Unices you will
+still not get to know what the timezone name is, but you don't need that when
+you have the tzinfo file. However, if the timezone name is readily available
+it will be used.
+
+What it's not for
+-----------------
+
+It's not for converting the current time between UTC and your local time. There are
+other, simpler ways of doing this. This is if you need to know things like the name
+of the time zone, or if you need to be able to convert between your time zone and
+another time zone for times that are in the future or in the past.
+
+For current time conversions to and from UTC, look in the Python ``time`` module.
+
+
+Supported systems
+-----------------
+
+These are the systems that are in theory supported:
+
+ * Windows 2000 and later
+
+ * Any unix-like system with a ``/etc/localtime`` or ``/usr/local/etc/localtime``
+
+If you have one of the above systems and it does not work, it's a bug.
+Please report it.
+
+Please note that if you are getting a time zone called ``local``, this is not
+a bug, it's actually the main feature of ``tzlocal``, that even if your
+system does NOT have a configuration file with the zoneinfo name of your time
+zone, it will still work.
+
+You can also use ``tzlocal`` to get the name of your local timezone, but only
+if your system is configured to make that possible. ``tzlocal`` looks for the
+timezone name in ``/etc/timezone``, ``/var/db/zoneinfo``,
+``/etc/sysconfig/clock`` and ``/etc/conf.d/clock``. If your
+``/etc/localtime`` is a symlink it can also extract the name from that
+symlink.
+
+If you need the name of your local time zone, then please make sure your
+system is properly configured to allow that.
+
+If your unix system doesn't have a timezone configured, tzlocal will default
+to UTC.
+
+Notes on Docker
+---------------
+
+It turns out that Docker images frequently have broken timezone setups.
+This usually results in a warning that the configuration is wrong, or that
+the timezone offset doesn't match the found timezone.
+
+The easiest way to fix that is to set a TZ variable in your docker setup
+to whatever timezone you want, which is usually the timezone your host
+computer has.
+
+Usage
+-----
+
+Load the local timezone:
+
+    >>> from tzlocal import get_localzone
+    >>> tz = get_localzone()
+    >>> tz
+    zoneinfo.ZoneInfo(key='Europe/Warsaw')
+
+Create a local datetime:
+
+    >>> from datetime import datetime
+    >>> dt = datetime(2015, 4, 10, 7, 22, tzinfo=tz)
+    >>> dt
+    datetime.datetime(2015, 4, 10, 7, 22, tzinfo=zoneinfo.ZoneInfo(key='Europe/Warsaw'))
+
+Lookup another timezone with ``zoneinfo``:
+
+    >>> from zoneinfo import ZoneInfo
+    >>> eastern = ZoneInfo('US/Eastern')
+
+Convert the datetime:
+
+    >>> dt.astimezone(eastern)
+    datetime.datetime(2015, 4, 10, 1, 22, tzinfo=zoneinfo.ZoneInfo(key='US/Eastern'))
+
+If you just want the name of the local timezone, use `get_localzone_name()`:
+
+    >>> from tzlocal import get_localzone_name
+    >>> get_localzone_name()
+    "Europe/Warsaw"
+
+Please note that under Unix, `get_localzone_name()` may fail if there is no zone
+configured, where `get_localzone()` would generally succeed.
+
+Troubleshooting
+---------------
+
+If you don't get the result you expect, try running it with debugging turned on.
+Start a python interpreter that has tzlocal installed, and run the following code::
+
+    import logging
+    logging.basicConfig(level="DEBUG")
+    import tzlocal
+    tzlocal.get_localzone()
+
+The output should look something like this, and this will tell you what
+configurations were found::
+
+    DEBUG:root:/etc/timezone found, contents:
+     Europe/Warsaw
+
+    DEBUG:root:/etc/localtime found
+    DEBUG:root:2 found:
+     {'/etc/timezone': 'Europe/Warsaw', '/etc/localtime is a symlink to': 'Europe/Warsaw'}
+    zoneinfo.ZoneInfo(key='Europe/Warsaw')
+
+
+Development
+-----------
+
+For ease of development, there is a Makefile that will help you with basic tasks,
+like creating a development environment with all the necessary tools (although
+you need a supported Python version installed first)::
+
+    $ make devenv
+
+To run tests::
+
+    $ make test
+
+Check the syntax::
+
+    $ make check
+
+
+Maintainer
+----------
+
+* Lennart Regebro, regebro@gmail.com
+
+Contributors
+------------
+
+* Marc Van Olmen
+* Benjamen Meyer
+* Manuel Ebert
+* Xiaokun Zhu
+* Cameris
+* Edward Betts
+* McK KIM
+* Cris Ewing
+* Ayala Shachar
+* Lev Maximov
+* Jakub Wilk
+* John Quarles
+* Preston Landers
+* Victor Torres
+* Jean Jordaan
+* Zackary Welch
+* Mickaรซl Schoentgen
+* Gabriel Corona
+* Alex Grรถnholm
+* Julin S
+* Miroslav ล edivรฝ
+* revansSZ
+* Sam Treweek
+* Peter Di Pasquale
+* Rongrong
+
+(Sorry if I forgot someone)
+
+License
+-------
+
+* MIT https://opensource.org/licenses/MIT
diff --git a/libs/tzlocal-5.3.1.dist-info/RECORD b/libs/tzlocal-5.3.1.dist-info/RECORD
new file mode 100644
index 0000000000..42bd666d05
--- /dev/null
+++ b/libs/tzlocal-5.3.1.dist-info/RECORD
@@ -0,0 +1,13 @@
+tzlocal-5.3.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+tzlocal-5.3.1.dist-info/METADATA,sha256=jX8pVhQA7UvFYfAUhOJQSAwZKld_upYVZgdzi5Gm53s,7599
+tzlocal-5.3.1.dist-info/RECORD,,
+tzlocal-5.3.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzlocal-5.3.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+tzlocal-5.3.1.dist-info/licenses/LICENSE.txt,sha256=2ZqyCa6xaq0sJckP_YPBqYHikP__dqQgoqsD4D8EG4w,1060
+tzlocal-5.3.1.dist-info/top_level.txt,sha256=QR6vZWP520waETnkotApPQPyVh9VnjoYPoAVHLK1DrE,8
+tzlocal/__init__.py,sha256=2OQDx61TZv_HmBl7JKKP4ATldlx5OdEXOjKXAt8rQwY,396
+tzlocal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tzlocal/unix.py,sha256=SyD32zfJn3r7xDJwo4sTYebhQ25XZIssvz24Nd-9tR8,9097
+tzlocal/utils.py,sha256=ov8fPwPjyvXRqW9Wzx_skATsjiB9gAzK1CEHJ2UI91Y,3224
+tzlocal/win32.py,sha256=8lFxjUGxOmcHcVgKWjVEPnLbTswOgxqdpnaBW9wcPQE,4668
+tzlocal/windows_tz.py,sha256=fG2X3ly4i3cRoaQEd6ncJhqDgPp-qvJunnRW-fg0Jkk,35165
diff --git a/libs/werkzeug-3.0.6.dist-info/REQUESTED b/libs/tzlocal-5.3.1.dist-info/REQUESTED
similarity index 100%
rename from libs/werkzeug-3.0.6.dist-info/REQUESTED
rename to libs/tzlocal-5.3.1.dist-info/REQUESTED
diff --git a/libs/tzlocal-5.3.1.dist-info/WHEEL b/libs/tzlocal-5.3.1.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/tzlocal-5.3.1.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/tzlocal-5.2.dist-info/LICENSE.txt b/libs/tzlocal-5.3.1.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/tzlocal-5.2.dist-info/LICENSE.txt
rename to libs/tzlocal-5.3.1.dist-info/licenses/LICENSE.txt
diff --git a/libs/tzlocal-5.2.dist-info/top_level.txt b/libs/tzlocal-5.3.1.dist-info/top_level.txt
similarity index 100%
rename from libs/tzlocal-5.2.dist-info/top_level.txt
rename to libs/tzlocal-5.3.1.dist-info/top_level.txt
diff --git a/libs/tzlocal/unix.py b/libs/tzlocal/unix.py
index 117c18d373..a1a8d89724 100644
--- a/libs/tzlocal/unix.py
+++ b/libs/tzlocal/unix.py
@@ -7,10 +7,7 @@
 
 from tzlocal import utils
 
-if sys.version_info >= (3, 9):
-    import zoneinfo  # pragma: no cover
-else:
-    from backports import zoneinfo  # pragma: no cover
+import zoneinfo
 
 _cache_tz = None
 _cache_tz_name = None
@@ -137,19 +134,21 @@ def _get_localzone_name(_root="/"):
 
     if len(found_configs) > 0:
         log.debug(f"{len(found_configs)} found:\n {found_configs}")
+
         # We found some explicit config of some sort!
         if len(found_configs) > 1:
             # Uh-oh, multiple configs. See if they match:
-            unique_tzs = set()
-            zoneinfopath = os.path.join(_root, "usr", "share", "zoneinfo")
-            directory_depth = len(zoneinfopath.split(os.path.sep))
-
-            for tzname in found_configs.values():
-                # Look them up in /usr/share/zoneinfo, and find what they
-                # really point to:
-                path = os.path.realpath(os.path.join(zoneinfopath, *tzname.split("/")))
-                real_zone_name = "/".join(path.split(os.path.sep)[directory_depth:])
-                unique_tzs.add(real_zone_name)
+            unique_tzs = _get_unique_tzs(found_configs, _root)
+
+            if len(unique_tzs) != 1 and "etc/timezone" in str(found_configs.keys()):
+                # For some reason some distros are removing support for /etc/timezone, 
+                # which is bad, because that's the only place where the timezone is stated 
+                # in plain text, and what's worse, they don't delete it. So we can't trust 
+                # it now, so when we have conflicting configs, we just ignore it, with a warning.
+                log.warning("/etc/timezone is deprecated in some distros, and no longer reliable. "
+                            "tzlocal is ignoring it, and you can likely delete it.")
+                found_configs = {k: v for k, v in found_configs.items() if "etc/timezone" not in k}
+                unique_tzs = _get_unique_tzs(found_configs, _root)
 
             if len(unique_tzs) != 1:
                 message = "Multiple conflicting time zone configurations found:\n"
@@ -162,6 +161,21 @@ def _get_localzone_name(_root="/"):
         return list(found_configs.values())[0]
 
 
+def _get_unique_tzs(found_configs, _root):
+    unique_tzs = set()
+    zoneinfopath = os.path.join(_root, "usr", "share", "zoneinfo")
+    directory_depth = len(zoneinfopath.split(os.path.sep))
+
+    for tzname in found_configs.values():
+        # Look them up in /usr/share/zoneinfo, and find what they
+        # really point to:
+        path = os.path.realpath(os.path.join(zoneinfopath, *tzname.split("/")))
+        real_zone_name = "/".join(path.split(os.path.sep)[directory_depth:])
+        unique_tzs.add(real_zone_name)
+
+    return unique_tzs
+
+
 def _get_localzone(_root="/"):
     """Creates a timezone object from the timezone name.
 
@@ -191,7 +205,11 @@ def _get_localzone(_root="/"):
                 break
         else:
             warnings.warn("Can not find any timezone configuration, defaulting to UTC.")
-            tz = timezone.utc
+            utcname = [x for x in zoneinfo.available_timezones() if "UTC" in x]
+            if utcname:
+                tz = zoneinfo.ZoneInfo(utcname[0])
+            else:
+                tz = timezone.utc
     else:
         tz = zoneinfo.ZoneInfo(tzname)
 
diff --git a/libs/tzlocal/utils.py b/libs/tzlocal/utils.py
index 3990535f17..5a0b72e445 100644
--- a/libs/tzlocal/utils.py
+++ b/libs/tzlocal/utils.py
@@ -4,11 +4,7 @@
 import os
 import time
 import warnings
-
-try:
-    import zoneinfo  # pragma: no cover
-except ImportError:
-    from backports import zoneinfo  # pragma: no cover
+import zoneinfo
 
 from tzlocal import windows_tz
 
diff --git a/libs/tzlocal/win32.py b/libs/tzlocal/win32.py
index 2fa59fe6ca..cfcdba5359 100644
--- a/libs/tzlocal/win32.py
+++ b/libs/tzlocal/win32.py
@@ -6,10 +6,7 @@
 except ImportError:
     import winreg
 
-try:
-    import zoneinfo  # pragma: no cover
-except ImportError:
-    from backports import zoneinfo  # pragma: no cover
+import zoneinfo
 
 from tzlocal import utils
 from tzlocal.windows_tz import win_tz
diff --git a/libs/tzlocal-5.2.dist-info/INSTALLER b/libs/unidecode-1.4.0.dist-info/INSTALLER
similarity index 100%
rename from libs/tzlocal-5.2.dist-info/INSTALLER
rename to libs/unidecode-1.4.0.dist-info/INSTALLER
diff --git a/libs/unidecode-1.4.0.dist-info/METADATA b/libs/unidecode-1.4.0.dist-info/METADATA
new file mode 100644
index 0000000000..85340432ca
--- /dev/null
+++ b/libs/unidecode-1.4.0.dist-info/METADATA
@@ -0,0 +1,318 @@
+Metadata-Version: 2.4
+Name: Unidecode
+Version: 1.4.0
+Summary: ASCII transliterations of Unicode text
+Author: Tomaz Solc
+Author-email: tomaz.solc@tablix.org
+License: GPL
+Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Text Processing
+Classifier: Topic :: Text Processing :: Filters
+Requires-Python: >=3.7
+License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
+
+Unidecode, lossy ASCII transliterations of Unicode text
+=======================================================
+
+It often happens that you have text data in Unicode, but you need to
+represent it in ASCII. For example when integrating with legacy code that
+doesn't support Unicode, or for ease of entry of non-Roman names on a US
+keyboard, or when constructing ASCII machine identifiers from human-readable
+Unicode strings that should still be somewhat intelligible. A popular example
+of this is when making an URL slug from an article title.
+
+**Unidecode is not a replacement for fully supporting Unicode for strings in
+your program. There are a number of caveats that come with its use,
+especially when its output is directly visible to users. Please read the rest
+of this README before using Unidecode in your project.**
+
+In most of examples listed above you could represent Unicode characters as
+``???`` or ``\\15BA\\15A0\\1610``, to mention two extreme cases. But that's
+nearly useless to someone who actually wants to read what the text says.
+
+What Unidecode provides is a middle road: the function ``unidecode()`` takes
+Unicode data and tries to represent it in ASCII characters (i.e., the
+universally displayable characters between 0x00 and 0x7F), where the
+compromises taken when mapping between two character sets are chosen to be
+near what a human with a US keyboard would choose.
+
+The quality of resulting ASCII representation varies. For languages of
+western origin it should be between perfect and good. On the other hand
+transliteration (i.e., conveying, in Roman letters, the pronunciation
+expressed by the text in some other writing system) of languages like
+Chinese, Japanese or Korean is a very complex issue and this library does
+not even attempt to address it. It draws the line at context-free
+character-by-character mapping. So a good rule of thumb is that the further
+the script you are transliterating is from Latin alphabet, the worse the
+transliteration will be.
+
+Generally Unidecode produces better results than simply stripping accents from
+characters (which can be done in Python with built-in functions). It is based
+on hand-tuned character mappings that for example also contain ASCII
+approximations for symbols and non-Latin alphabets.
+
+**Note that some people might find certain transliterations offending.** Most
+common examples include characters that are used in multiple languages. A user
+expects a character to be transliterated in their language but Unidecode uses a
+transliteration for a different language. It's best to not use Unidecode for
+strings that are directly visible to users of your application. See also the
+*Frequently Asked Questions* section for more info on common problems.
+
+This is a Python port of ``Text::Unidecode`` Perl module by Sean M. Burke
+<sburke@cpan.org>.
+
+
+Module content
+--------------
+
+This library contains a function that takes a string object, possibly
+containing non-ASCII characters, and returns a string that can be safely
+encoded to ASCII::
+
+    >>> from unidecode import unidecode
+    >>> unidecode('koลพuลกฤek')
+    'kozuscek'
+    >>> unidecode('30 \U0001d5c4\U0001d5c6/\U0001d5c1')
+    '30 km/h'
+    >>> unidecode('\u5317\u4EB0')
+    'Bei Jing '
+
+You can also specify an *errors* argument to ``unidecode()`` that determines
+what Unidecode does with characters that are not present in its transliteration
+tables. The default is ``'ignore'`` meaning that Unidecode will ignore those
+characters (replace them with an empty string). ``'strict'`` will raise a
+``UnidecodeError``. The exception object will contain an *index* attribute that
+can be used to find the offending character. ``'replace'`` will replace them
+with ``'?'`` (or another string, specified in the *replace_str* argument).
+``'preserve'`` will keep the original, non-ASCII character in the string. Note
+that if ``'preserve'`` is used the string returned by ``unidecode()`` will not
+be ASCII-encodable!::
+
+    >>> unidecode('\ue000') # unidecode does not have replacements for Private Use Area characters
+    ''
+    >>> unidecode('\ue000', errors='strict')
+    Traceback (most recent call last):
+    ...
+    unidecode.UnidecodeError: no replacement found for character '\ue000' in position 0
+
+A utility is also included that allows you to transliterate text from the
+command line in several ways. Reading from standard input::
+
+    $ echo hello | unidecode
+    hello
+
+from a command line argument::
+
+    $ unidecode -c hello
+    hello
+
+or from a file::
+
+    $ unidecode hello.txt
+    hello
+
+The default encoding used by the utility depends on your system locale. You can
+specify another encoding with the ``-e`` argument. See ``unidecode --help`` for
+a full list of available options.
+
+Requirements
+------------
+
+Nothing except Python itself. Unidecode supports Python 3.7 or later.
+
+You need a Python build with "wide" Unicode characters (also called "UCS-4
+build") in order for Unidecode to work correctly with characters outside of
+Basic Multilingual Plane (BMP). Common characters outside BMP are bold, italic,
+script, etc. variants of the Latin alphabet intended for mathematical notation.
+Surrogate pair encoding of "narrow" builds is not supported in Unidecode.
+
+If your Python build supports "wide" Unicode the following expression will
+return True::
+
+    >>> import sys
+    >>> sys.maxunicode > 0xffff
+    True
+
+See `PEP 261 <https://www.python.org/dev/peps/pep-0261/>`_ for details
+regarding support for "wide" Unicode characters in Python.
+
+
+Installation
+------------
+
+To install the latest version of Unidecode from the Python package index, use
+these commands::
+
+    $ pip install unidecode
+
+To install Unidecode from the source distribution and run unit tests, use::
+
+    $ python setup.py install
+    $ python setup.py test
+
+Frequently asked questions
+--------------------------
+
+German umlauts are transliterated incorrectly
+    Latin letters "a", "o" and "u" with diaeresis are transliterated by
+    Unidecode as "a", "o", "u", *not* according to German rules "ae", "oe",
+    "ue". This is intentional and will not be changed. Rationale is that these
+    letters are used in languages other than German (for example, Finnish and
+    Turkish). German text transliterated without the extra "e" is much more
+    readable than other languages transliterated using German rules. A
+    workaround is to do your own replacements of these characters before
+    passing the string to ``unidecode()``.
+
+Japanese Kanji is transliterated as Chinese
+    Same as with Latin letters with accents discussed in the answer above, the
+    Unicode standard encodes letters, not letters in a certain language or
+    their meaning. With Japanese and Chinese this is even more evident because
+    the same letter can have very different transliterations depending on the
+    language it is used in. Since Unidecode does not do language-specific
+    transliteration (see next question), it must decide on one. For certain
+    characters that are used in both Japanese and Chinese the decision was to
+    use Chinese transliterations. If you intend to transliterate Japanese,
+    Chinese or Korean text please consider using other libraries which do
+    language-specific transliteration, such as `Unihandecode
+    <https://github.com/miurahr/unihandecode>`_.
+
+Unidecode should support localization (e.g. a language or country parameter, inspecting system locale, etc.)
+    Language-specific transliteration is a complicated problem and beyond the
+    scope of this library. Changes related to this will not be accepted. Please
+    consider using other libraries which do provide this capability, such as
+    `Unihandecode <https://github.com/miurahr/unihandecode>`_.
+
+Unidecode should automatically detect the language of the text being transliterated
+    Language detection is a completely separate problem and beyond the scope of
+    this library.
+
+Unidecode should use a permissive license such as MIT or the BSD license.
+    The maintainer of Unidecode believes that providing access to source code
+    on redistribution is a fair and reasonable request when basing products on
+    voluntary work of many contributors. If the license is not suitable for
+    you, please consider using other libraries, such as `text-unidecode
+    <https://github.com/kmike/text-unidecode>`_.
+
+Unidecode produces completely wrong results (e.g. "u" with diaeresis transliterating as "A 1/4 ")
+    The strings you are passing to Unidecode have been wrongly decoded
+    somewhere in your program. For example, you might be decoding utf-8 encoded
+    strings as latin1. With a misconfigured terminal, locale and/or a text
+    editor this might not be immediately apparent. Inspect your strings with
+    ``repr()`` and consult the
+    `Unicode HOWTO <https://docs.python.org/3/howto/unicode.html>`_.
+
+Why does Unidecode not replace \\u and \\U backslash escapes in my strings?
+    Unidecode knows nothing about escape sequences. Interpreting these sequences
+    and replacing them with actual Unicode characters in string literals is the
+    task of the Python interpreter. If you are asking this question you are
+    very likely misunderstanding the purpose of this library. Consult the
+    `Unicode HOWTO <https://docs.python.org/3/howto/unicode.html>`_ and possibly
+    the ``unicode_escape`` encoding in the standard library.
+
+I've upgraded Unidecode and now some URLs on my website return 404 Not Found.
+    This is an issue with the software that is running your website, not
+    Unidecode. Occasionally, new versions of Unidecode library are released
+    which contain improvements to the transliteration tables. This means that
+    you cannot rely that ``unidecode()`` output will not change across
+    different versions of Unidecode library. If you use ``unidecode()`` to
+    generate URLs for your website, either generate the URL slug once and store
+    it in the database or lock your dependency of Unidecode to one specific
+    version.
+
+Some of the issues in this section are discussed in more detail in `this blog
+post <https://www.tablix.org/~avian/blog/archives/2013/09/python_unidecode_release_0_04_14/>`_.
+
+
+Performance notes
+-----------------
+
+By default, ``unidecode()`` optimizes for the use case where most of the strings
+passed to it are already ASCII-only and no transliteration is necessary (this
+default might change in future versions).
+
+For performance critical applications, two additional functions are exposed:
+
+``unidecode_expect_ascii()`` is optimized for ASCII-only inputs (approximately
+5 times faster than ``unidecode_expect_nonascii()`` on 10 character strings,
+more on longer strings), but slightly slower for non-ASCII inputs.
+
+``unidecode_expect_nonascii()`` takes approximately the same amount of time on
+ASCII and non-ASCII inputs, but is slightly faster for non-ASCII inputs than
+``unidecode_expect_ascii()``.
+
+Apart from differences in run time, both functions produce identical results.
+For most users of Unidecode, the difference in performance should be
+negligible.
+
+
+Source
+------
+
+You can get the latest development version of Unidecode with::
+
+    $ git clone https://www.tablix.org/~avian/git/unidecode.git
+
+There is also an official mirror of this repository on GitHub at
+https://github.com/avian2/unidecode
+
+
+Contact
+-------
+
+Please make sure to read the `Frequently asked questions`_ section above before
+contacting the maintainer.
+
+Bug reports, patches and suggestions for Unidecode can be sent to
+tomaz.solc@tablix.org.
+
+Alternatively, you can also open a ticket or pull request at
+https://github.com/avian2/unidecode
+
+
+Copyright
+---------
+
+Original character transliteration tables:
+
+Copyright 2001, Sean M. Burke <sburke@cpan.org>, all rights reserved.
+
+Python code and later additions:
+
+Copyright 2025, Tomaลพ ล olc <tomaz.solc@tablix.org>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc., 51
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  The programs and
+documentation in this dist are distributed in the hope that they will be
+useful, but without any warranty; without even the implied warranty of
+merchantability or fitness for a particular purpose.
+
+..
+    vim: set filetype=rst:
diff --git a/libs/unidecode-1.4.0.dist-info/RECORD b/libs/unidecode-1.4.0.dist-info/RECORD
new file mode 100644
index 0000000000..965898f7b8
--- /dev/null
+++ b/libs/unidecode-1.4.0.dist-info/RECORD
@@ -0,0 +1,203 @@
+../../bin/unidecode,sha256=a0wlyWSqDFzWMohlpjilz8cOBGWjLxpOhwYxUhSXb9k,189
+unidecode-1.4.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+unidecode-1.4.0.dist-info/METADATA,sha256=7pNFxKQCEEaxMeq8W2xIWwd-35Q_NxtNcbgJMOlMz_g,13777
+unidecode-1.4.0.dist-info/RECORD,,
+unidecode-1.4.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unidecode-1.4.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+unidecode-1.4.0.dist-info/entry_points.txt,sha256=zjje8BrCWj_5MDf7wASbnNdeWYxxdt5BuTQI9x8c_24,50
+unidecode-1.4.0.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+unidecode-1.4.0.dist-info/top_level.txt,sha256=4uYNG2l04s0dm0mEQmPLo2zrjLbhLPKUesLr2dOTdpo,10
+unidecode/__init__.py,sha256=rM0qY9sWv7PPsRaqaA4xvmY_GJqWwVHb_1YKYDN0yqs,4223
+unidecode/__main__.py,sha256=VWYWCclyJsdhtNMQtryMFbgsCZtNUsWcEuS7ZOlH1Jc,40
+unidecode/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+unidecode/util.py,sha256=ZxssZFzbZlAf6oiDIu2HZjrAQckbOD2VPD9uy-wZgCI,1652
+unidecode/x000.py,sha256=DaoVzSCvFzhzHbFtzFOE8uS9CgWD7K3JuhmACpFbivY,3038
+unidecode/x001.py,sha256=c7oLez4Y3xf6C8YOgU4ZXZtPHqW6bF6aIatPD-FYqWY,3891
+unidecode/x002.py,sha256=NWord8myi2jYV4YwlNZFbKu6HgbbolWLNCOlseR3WsY,3871
+unidecode/x003.py,sha256=5gZS5aXbQ4Z8aH08EehKx4SqAgUNBcTz_x-I3o5qvVg,3825
+unidecode/x004.py,sha256=KAeJjKgkdzMU1MK9J9JqmPeKBDgjhG5UcfyAa594Hk8,4054
+unidecode/x005.py,sha256=7ezPyF52iKiK5LPf6TA5zVUZ7RbIjz7EVLS42aXG9ug,3920
+unidecode/x006.py,sha256=Jye83eXYQqtpowxsQ01jQSDlhAjWbmGNFRdmbojvgyE,3912
+unidecode/x007.py,sha256=6lnnnArEmvi3XeZLFwrCZGStdDKDAHt7alIpdo8S7rk,3987
+unidecode/x009.py,sha256=xNz8qrO1PDseMjOwA0rjsiAhNZTO_uFgjpmbp7qcH_c,4013
+unidecode/x00a.py,sha256=2xksKrrMWF9xLbs8OPfTxT7g86ciwdK9QZ8AQeecmus,4019
+unidecode/x00b.py,sha256=Y7GlfYE2v-D3BkZd3ctfo6L21VG-aR2OFESRb8_WRH4,4019
+unidecode/x00c.py,sha256=jOGpNU7vxghp3jwUuUATiSrDwvgZuOe8nlkcjJYTHco,4007
+unidecode/x00d.py,sha256=lkFf8d_oXN8IZop6CFlYpKdWuJqWGnH0WQMwir4_WgI,4025
+unidecode/x00e.py,sha256=ARKK__sIXUXL4h2Egac2f9ng2Z_YCGD5kYP2oj-ptlI,3989
+unidecode/x00f.py,sha256=TdSmr755Jw1TRtxk5Z4UPZIp1CVhXii8S0zSAcQ2vWk,3998
+unidecode/x010.py,sha256=YhXX8s1dP7YJMzaaV9CMBCOraExb6QrQQWbkFT3d2Jo,4011
+unidecode/x011.py,sha256=bc5lAse0haio2pceaADqkjzTh8MdgNTwTh04W2FJO-Q,4120
+unidecode/x012.py,sha256=XoiRFvNtHV29Q76KcpPBSrC4sLd6faTz4tKZEMIQ45M,4293
+unidecode/x013.py,sha256=UkxSb2Q4xq7dydCZNg_f0Nu90slVSmAckq-btDZ7uAA,4190
+unidecode/x014.py,sha256=4R3w_Dgg9yCw-9KkpqHfWFzyQZZfdb444fMIh240l-Q,4298
+unidecode/x015.py,sha256=TB6O4l2qPxbmF2dejlxXLqX5tTfjl95cMYx1770GHs0,4329
+unidecode/x016.py,sha256=Tx3P-DjDqCLuKbmiG-0cMzw2xFVuojQg3o5yyt4506E,4114
+unidecode/x017.py,sha256=Ks_t-4BgOrTqmqYC6BpqXePI-YyStE7p3P27lzBefSA,4038
+unidecode/x018.py,sha256=C1jpnsK3YO27xpiWJ2DXSAkV9dsPUwKqWtkgePtzp3g,3998
+unidecode/x01d.py,sha256=EwAYkMVHAFvbKRzsQ-e4cRcvS_eia3kYCM2GcaqkBWY,3701
+unidecode/x01e.py,sha256=rG1jtL0dpL-RNsvG-AxX1izkyWkbgwe0BWhATDJtmgg,3845
+unidecode/x01f.py,sha256=NUC2rlFE9YpODdDn4e5uzV7uIqEBNvKw486nOD7UQpQ,3877
+unidecode/x020.py,sha256=lXj8wkWMbD2Iuw3OCrEqZofJjJccnvY3ro5SpyotCq8,4080
+unidecode/x021.py,sha256=WY3_1hQbMP2NrgryszwakhO9Rf0cyObbsnpcUs_-RbI,3999
+unidecode/x022.py,sha256=wX6BUR7yKGgSICIzY_B15mqgnjvRbSlepM6aqb2tnGY,4085
+unidecode/x023.py,sha256=weebXXqY3E8OhqS0ziAKHo58lCl3dkkyD0w2aKHqv7Q,4089
+unidecode/x024.py,sha256=JmCTFnYtmMHQvfYP-4f5uDiCxlwhNk7LZLyxLWWGjK8,4003
+unidecode/x025.py,sha256=DAMdCakIv0m21AWcRUNK9QWReCYXPSwVDmbFdriM4qc,3854
+unidecode/x026.py,sha256=5MkXGYZ0ejEe04qumSgmQYEP-87Jqr-Nxbt7mczF7Mk,4343
+unidecode/x027.py,sha256=qZacxfhS5nWgBhbrIT6-wm9yGP_OlAVRJ-GcmUhPl14,3718
+unidecode/x028.py,sha256=FZPCZ9w3N3WOI42h2gHEQgVOAlLBNTZjMu_KQQkIMdk,5069
+unidecode/x029.py,sha256=b8afmG-DjZmHHy0XdjcZlSXtlnwjScIcPBGbMv_YSUQ,4090
+unidecode/x02a.py,sha256=QHAyHnegV0OVOTQ5OnfJKzkaHQIFbWmmMjiFcHGUZi0,4093
+unidecode/x02c.py,sha256=ZkmMztaYT7d81E9qtUU9ayG9hBi5XqWY_ta-X5Hsaqc,4076
+unidecode/x02e.py,sha256=VCGlK7123S2wDzfkggEARyGZKi-0ElepSYECGGluf7E,4072
+unidecode/x02f.py,sha256=hcUTlkw_6Hjnxsk0e28RTd-HWpSK0IGq5hkrwA1fJFk,4091
+unidecode/x030.py,sha256=wdodiC_N7bMsh8vSmVF0STHGZnOAsZnVN-_RPiqupRA,4028
+unidecode/x031.py,sha256=jed0xoqQmUnnOqATVe7z9F2zigAZVAJX6BrWtXFPWbs,4044
+unidecode/x032.py,sha256=lj4IwokKA0IdIJiJJTfmBUGVYmWvLowFtPLwLzhfokU,4466
+unidecode/x033.py,sha256=ImTd4BRRPgCqWmrvJPoikoL0dJMKH8eQgd48vksi60A,4513
+unidecode/x04d.py,sha256=hcUTlkw_6Hjnxsk0e28RTd-HWpSK0IGq5hkrwA1fJFk,4091
+unidecode/x04e.py,sha256=X-Pzl5_QGkYexzNTY04C_tq3RvbyAUYemf0C4mIl5-U,4630
+unidecode/x04f.py,sha256=BM29-2OTb6aR7CN7NMN3nnC9BGxgediLEHGMcIB5ENU,4597
+unidecode/x050.py,sha256=SPmkA-PD39V8eO4DByxVa8HyqanGcw54xW51kLnaieY,4676
+unidecode/x051.py,sha256=GGJT-fiYxTk_FAAW6eTobT3pOGI-Qq1M3eCxN7c7f5E,4681
+unidecode/x052.py,sha256=a09eo_5pL6jpU9TW-zG2w2iXTYp6awtQ4OxGnLdcwKg,4654
+unidecode/x053.py,sha256=4x8X4Hrf56DOAINYi8JxStXW4m7FGJNiH-51JzCxE64,4608
+unidecode/x054.py,sha256=N8hO8YrlNoepnrYLUZ_EcTVRqI1lekqq3h-i-UNlTJw,4577
+unidecode/x055.py,sha256=_PK65HLpk7puojAFGeOm5Cdk-PDevHHI6NR8sHuo0Ko,4595
+unidecode/x056.py,sha256=mlNNouWFIjpZdjuBWhxFGSB_UDh0OItlsShjHQRjhxc,4607
+unidecode/x057.py,sha256=uivN7P3d-kkonqBATLKOM0ni4jVvsSzA9SOEFhbOuP4,4627
+unidecode/x058.py,sha256=lPNpdrFLFfaBoQz8Cwm2Ess8m4m_45ylIHspOUpDrLk,4664
+unidecode/x059.py,sha256=BdA_NFQqr-aGpuyo9he6uxDwm9facV-ql5axiKqgByk,4640
+unidecode/x05a.py,sha256=9UFNWH8FpkHUArS2-Td3VYOo21VQkoqYW7A0Slk0YhQ,4632
+unidecode/x05b.py,sha256=yfWnRe6mtnqY3b3Ac2_IJBA5vBYb64PYF9XM4HSZygU,4666
+unidecode/x05c.py,sha256=6iZj6HHnJ4lF3k1i68-9Dgge2H3KAlyZtNxW0BIu66o,4602
+unidecode/x05d.py,sha256=Wudbb7xOtWry4Xu5xm9j80vFkigCedGq5uHcYAYl0o8,4660
+unidecode/x05e.py,sha256=wKqvr0lkEy1yfXbYj2OtXHBxw5FxVz_MzJULXWrGvA0,4662
+unidecode/x05f.py,sha256=NnSIJOl_9CC4IRwBIQ6CEhTfvvzZ2PXhZSLJuC6sgHY,4656
+unidecode/x060.py,sha256=-Ajr6Q7RP_fdetvZ2hWflxNiaOokB3q5oeRCt7CqcDc,4640
+unidecode/x061.py,sha256=aqOY7Jt--4JhdktU2RB1bf5J0fH27fRDLhV55aR3gO0,4656
+unidecode/x062.py,sha256=wxQkvAGrppx4Y5E-hAVCps0I9bz_fbG1YSqs1E8k9sU,4616
+unidecode/x063.py,sha256=wAcyLr9CJ35G4sNTfvYb7DtFjeRlyo585JC2_-aBuQM,4648
+unidecode/x064.py,sha256=8e775dKt12GedypWT9jPXeqWLkW5-AsVG106FlfiTvA,4651
+unidecode/x065.py,sha256=fPak6ADqEOBFPfP2u7pAIZ_ObbgtdGFa4enmjVBpsVE,4634
+unidecode/x066.py,sha256=K6g6XTVEFEAppiln64vxgA2V1FMWl0YdbhDJgihQsTA,4675
+unidecode/x067.py,sha256=5d8zLxoh2vS76uBWQckXGbeyjzEUJ5aJMAMvNA-YxLs,4627
+unidecode/x068.py,sha256=-UhVYRQGQtxQJbgwyHAox-JHizu_RvO7Lb5I1F9mpvY,4670
+unidecode/x069.py,sha256=cRQZP6ZGJQsx5l2qSfpe9XmiDfxlGh7rEh30_u9oTSo,4665
+unidecode/x06a.py,sha256=iXZkuxRRsgUuNlVlNliR7gio4M4WUN0JNCPdINrzYlY,4662
+unidecode/x06b.py,sha256=5GRxv36m9zR163UNrGb_c64-uueKrpqyeeRWG9ZDme0,4600
+unidecode/x06c.py,sha256=RNKzdImtimBIuLtvbsUAzYSV7iZmVvPWyV8dj91KJlw,4637
+unidecode/x06d.py,sha256=jFvmxRU4VHSeoahyFtHIHqpvfqvJbNzvsrDn4Kd7WAQ,4647
+unidecode/x06e.py,sha256=1esJUSaQ4QotdjhxG6vtvC3CDWjY2rTr4EVLD4if8CU,4630
+unidecode/x06f.py,sha256=s7JTw6eW_6pqjCc1DEMDQ178vtllhHiejtvb360vDVc,4638
+unidecode/x070.py,sha256=oLeIanQmBbyz8OU_l5VQ-POF8mY5XbLL3rfEjr3XkUw,4677
+unidecode/x071.py,sha256=v1S9E-H06WC0rr10gP27Dqev2nxRlymECJ681BSs9Y4,4644
+unidecode/x072.py,sha256=veZOktQoJQ2wmKKLjq17UM5hAa3xo3nRLdFgSHjv8rI,4645
+unidecode/x073.py,sha256=NWkyVIbNgSu_U9katu1LRaLkL7iHx4bSuRtfsqRG4yk,4642
+unidecode/x074.py,sha256=AocniPNZMcBTeiDWA6OLzQilcWMc_ZHh7pCGXTzqMSg,4686
+unidecode/x075.py,sha256=P3SrhI5BQ5sJ66hyu_LWDONpuzLZJBKsl7f-A37sJXc,4675
+unidecode/x076.py,sha256=9rwfe41pej250BneHHO663PU9vVWyrnHRnP11VUqxEc,4635
+unidecode/x077.py,sha256=ugbmqiry2-tBstXW0Q9o7XEZQimpagZK1EttvBCK1sE,4673
+unidecode/x078.py,sha256=NxeTS_dXa6jmc7iDVUve6_SqO4AhjULng_Gei7pqbRE,4630
+unidecode/x079.py,sha256=ucPPGrgm-AnnWdVFd__unqiSMtdEpZQF6E8ta6IzdiQ,4590
+unidecode/x07a.py,sha256=fjyeO--0F5Kd80F0yOvFIIuiDW7lFKWaVIUqQRIwR9k,4659
+unidecode/x07b.py,sha256=3g39Yw2ZMs7_tcC3OT2e4nGxaWMY6V8iJ2Z6PsnhPS4,4667
+unidecode/x07c.py,sha256=Cbs98r7vdJD_YxpXgAAYoPdA7RDYR82MXN44TQJxoN8,4647
+unidecode/x07d.py,sha256=EKFrTQTNFLGnsm3qI76ALxrxGCcDuyEbapi9j9jy1B4,4678
+unidecode/x07e.py,sha256=r96YBkHoCO8GAvO0j3BdY45RdlNkqpiFWl-Q6mieVcc,4680
+unidecode/x07f.py,sha256=MNRU4aNOE2dKl4p0_WPy-oga_cx7wZ6w4Mlk-RN3PeU,4658
+unidecode/x080.py,sha256=9feIVoCdOFolKgZfRCpdL80l9kRvjbl0z9sV4FAk2Qg,4643
+unidecode/x081.py,sha256=ffvplClKTCDre83MhO7-X3tgdUWfjvkUMxQCPEnRj_U,4671
+unidecode/x082.py,sha256=XTFSjZO8LO3SFcYh9h-Oqby6a67hFDx4B-AQRyptlJU,4641
+unidecode/x083.py,sha256=wXP1lZZAravJZm1f1bCT1cumocFGRG0ZQmgFMVCOSDQ,4635
+unidecode/x084.py,sha256=inA5ODar8zAherLeTyX9-KtCUOrTigxDwb3ei2Kl1CE,4630
+unidecode/x085.py,sha256=QDKK-wbb04nCFc91pSGhyHsxcS_MhdeQLsRqqXhV9h8,4628
+unidecode/x086.py,sha256=DcXhJemXKgrGwPBRFCbINxfxatqjpy7jFgM9jbN8eEk,4608
+unidecode/x087.py,sha256=nddqMqheth-n7kHCyjRNvVPO82UI_PdOic1kQer_iF0,4641
+unidecode/x088.py,sha256=0PVL160fpQ-Kkw29X-bLviyfs4TKIAwp_-SwEWsvemM,4639
+unidecode/x089.py,sha256=RrIGIX6dojryaYh6Da4ysaM_-yREbNZ-HasFX2O_SQc,4624
+unidecode/x08a.py,sha256=NjMp9ck824PXG2gcJXfi_9oQCFgXhhiallO3bYCtXCE,4647
+unidecode/x08b.py,sha256=vUwkG_IOBIhB8gQAaVbgD5EAIA1wY4BBPk5kXwAcPg0,4639
+unidecode/x08c.py,sha256=0sHcCXB9YzXE9oJcwzPtPUltCn6Oo-itdY5vk6MbtdA,4628
+unidecode/x08d.py,sha256=SWD7xSIR-1P30S5-yuNDHpVjWlpfxmUxuJr7f178WsA,4630
+unidecode/x08e.py,sha256=Ym0RQUdsgZJdVmOI56nzSmzfxuKjuS5MUbPSOeyv2Ws,4655
+unidecode/x08f.py,sha256=tNFpnEzNLIY4xHbcR0rZqaoNUKinj-XO2XfSnh6c4u4,4649
+unidecode/x090.py,sha256=XGomJNriNZsHQRUDy3vKwFc4W38uxeqWpn5SHM4G4j8,4627
+unidecode/x091.py,sha256=u8tRZhaVNa2mbsDSYIKqRZ3u4Npj-kiz55rC9izadnM,4653
+unidecode/x092.py,sha256=NvNce8y3YFlPI20pN1a4LY68sid5ApetXs9bo9cxb7w,4644
+unidecode/x093.py,sha256=O2e1p58RB1TS2Au-JSjft3FgPBx1YRAGxnviqSsfnYE,4646
+unidecode/x094.py,sha256=k8ZwNc9qCSzU2b8wMrWUeGSg39tPMiwiKHCiKw6zteM,4653
+unidecode/x095.py,sha256=H2O3xJDE3cAOecyYMUTl6fLs9shETPFwZshtIIK5V3E,4667
+unidecode/x096.py,sha256=sev3zRm46EBQgEtkR4T-Ah0cHYEM-9CM2pFCCc21BFI,4608
+unidecode/x097.py,sha256=S1nZBdt-MHySCAgV9MDdNSQTCSaD62iAhz8EjikfS5A,4633
+unidecode/x098.py,sha256=w0KMxUF7XyG9gdfTJylYsG_clvm3RD_LIM5XHR0xsdY,4643
+unidecode/x099.py,sha256=nlaWb2nRTSnFfDjseDRJ1a3Y0okOHbNA1-htKo9SkAM,4627
+unidecode/x09a.py,sha256=Z8pQsTc62CWgm0JPnj3kokKKf9_qfzRpo0u5iH61CaE,4623
+unidecode/x09b.py,sha256=njA75MlCgC-5UuS1Hvm-mdgsVwW9r801odfBTJg-BFE,4653
+unidecode/x09c.py,sha256=NveMhN85_Cm4H1cnfHDTcnSj675MOVBq9Lkjpw3YxA0,4659
+unidecode/x09d.py,sha256=_0fAaUhK3axhhWLA4QPNJf_J9YSs1MCKx2xR-vl5QYI,4630
+unidecode/x09e.py,sha256=wreETFCeKf9bVvLc3E7MUAvlu2CN5xKeebf3ESuV13s,4613
+unidecode/x09f.py,sha256=pNAdX7-9yMEPXtozjCuXxzc74eCVft9meOTxCtU7vJw,4420
+unidecode/x0a0.py,sha256=EpopPuuocybgCcpX19Ii-udqsPXJjSces3360lqJ8vs,4428
+unidecode/x0a1.py,sha256=0hvF77d5E640SujjdHVqy5gMUH85gEdOv80eRvCEAGM,4469
+unidecode/x0a2.py,sha256=9Icpfk_ElebYd_xN09OMziFrpAGPXEUNVmawpnhbBaQ,4503
+unidecode/x0a3.py,sha256=G1lPrnCqYz0s4wsSa1qM0WgrZBWO_beRk3AgK0iVZLA,4521
+unidecode/x0a4.py,sha256=nWPXzCragW0rsDQPa6ooo9KOc-SOjVCP8KIOuGc7WpU,4373
+unidecode/x0ac.py,sha256=wj7hl88VlCdc_eGpOL4m4CBJILyQqd9atObC5Xvd0aA,4709
+unidecode/x0ad.py,sha256=Rz5rn0fM-CqRjaN4TvSq_1StAQdyAF2WX3cUvcQHaWU,4766
+unidecode/x0ae.py,sha256=jNIBVB-Pw2ZNihAeyWbDIEq9Yt9zlhdfGylfvAaxUks,4875
+unidecode/x0af.py,sha256=Am5YC8Zfrun5NUKxU6LrU2-d5GgkGSBs7fZt2rqSi74,5012
+unidecode/x0b0.py,sha256=1bgHerCDAqIcJHYeGddJjJfRWiHCKtU2B0J-XGvcbbc,4853
+unidecode/x0b1.py,sha256=Six-lzGdvgJx4YsIa0lTusnBEV1zbCKQCquq17TDJoQ,4746
+unidecode/x0b2.py,sha256=HQDbmglNi4QfiRSGucUclgq_4FGpRjbJkWU1JTLAFGc,4680
+unidecode/x0b3.py,sha256=1lqxghVZiiStOAx1IG_vc1zZTXrAa7Z__QY6ZWvo2aA,4741
+unidecode/x0b4.py,sha256=V6BNSTxpyP8VuqF7x5z7bpF3MQAkwZfKtEu6NFr_vSg,4762
+unidecode/x0b5.py,sha256=9NVd2hNLyRlLceVlznba1dreqBGeKU_0gzmkgAw0gyg,4919
+unidecode/x0b6.py,sha256=V_vRsB0GICu9hqhO4pnbPWreDSevJ3bbmLRJkuQUxnE,4996
+unidecode/x0b7.py,sha256=CwBaCBICyVagnFjUpkwabuDvBJw7gAeqkSRpfBAVv8s,4833
+unidecode/x0b8.py,sha256=xYp-xy2LIwq95OWyS9vYMc_Z5od9dud0W1dxeg4P_Jk,4714
+unidecode/x0b9.py,sha256=z3hKNzBq_MeK9V3AyQzaY58cgi0-VGOsLk3-UFmszLQ,4704
+unidecode/x0ba.py,sha256=4gubifoBeJUUrwXEI4litJygekufEycmWDLrJ-Qvs14,4765
+unidecode/x0bb.py,sha256=bsCTABUdC6yTn8_0vhYe5jRP1z_BoAdificB8Y1c1hA,4730
+unidecode/x0bc.py,sha256=AhQvAz7yHlbQ_4c2KOIisq07eZJ5JQn6cV8I31oT9kg,4707
+unidecode/x0bd.py,sha256=IGtyVxIUr1mU3hokn6iUDJhXZezQozVvfWOyf4Pa5dI,4752
+unidecode/x0be.py,sha256=1D-hXu3p3wvOnGVMjEqVsrltYe7UuSwit2yqN5eFizc,4849
+unidecode/x0bf.py,sha256=NkEXqr2ER3BNFkTasDV9CHnkRBuX_Ao5OHGv_NgKAew,5010
+unidecode/x0c0.py,sha256=zDlHpyM0omza5TqGLb8Rhl7Wd-LlV1AjvH_xdnEnNFw,4856
+unidecode/x0c1.py,sha256=AC6xJyx9UblKAGNqGN7AH2Idb3_3vbc-I5U0Myig5fA,4765
+unidecode/x0c2.py,sha256=siRYLA8Cv9Z8XsRp3WQOBdRrPkjJOuEh8z1-3SMXOzQ,4710
+unidecode/x0c3.py,sha256=hlAFe6lsz0aLMixlpeFjV4I-WTIiA3B2BU58yGlTwRg,4975
+unidecode/x0c4.py,sha256=z3xZwSkf5ru1FCdBMHOr5fyglzVdyPhQVtWjq9xInsQ,5024
+unidecode/x0c5.py,sha256=F-DR0eVMRkemOnNXOtDjI5i6gW9136XLmWM_yMVvc84,4581
+unidecode/x0c6.py,sha256=7p_jMrHf3WUa_zANms-RGVN1bAeshgWLkC16_VcSawA,4490
+unidecode/x0c7.py,sha256=5eOAq4jFsPZ-zKO7lHzAGj_EvXdaMC4Kud7gvE-B7Tg,4564
+unidecode/x0c8.py,sha256=wltKvhBgn51jULzwUnEbmyDuK9JvQpQee0uTKK42-20,4733
+unidecode/x0c9.py,sha256=GoARON07wCoHN2wRHb5fvzqE9L3Yme2hKeciynUIAIk,4722
+unidecode/x0ca.py,sha256=BsBZTNj3npIkdo3L9pSEX7XvDT68KV7wFtOOwyEb2So,5007
+unidecode/x0cb.py,sha256=8T7vnJMRmYGyySYthMWz0bgN-MremktGImjejodFeMo,5012
+unidecode/x0cc.py,sha256=GKoHN-4vL4Y3EL42G0xbN74Tgspew1oMvxQtsIa3ess,4749
+unidecode/x0cd.py,sha256=7sZ05OjugbaombMRDYOVxgstZbXMcuX5kHFheKv4W2E,4738
+unidecode/x0ce.py,sha256=mOEHFrsAwIvcTnh7OKVK5qbuXUXHfJOR7D4FtXsQmao,4708
+unidecode/x0cf.py,sha256=H9PeYcbOG68F_yc7zsELUuN05ANfFNOUX-e3-gzx7Ow,4713
+unidecode/x0d0.py,sha256=eULqcGHPmaoEdl0EwRB5wWSu8M43bp4HoFo5gGljacg,4706
+unidecode/x0d1.py,sha256=BClLDAjPgsAX6MJCsuHfmfuhH9qfzUy_vb-d9zBs3Oc,4767
+unidecode/x0d2.py,sha256=e74nqGo4E4sF1sy8qBFu2ecWoRfJdoXI1xRFRPqYEz8,4724
+unidecode/x0d3.py,sha256=8-UmvJ3-ILXo9d3GA-ReOE4OfUenL3tVUJYldZ9gHu0,4705
+unidecode/x0d4.py,sha256=fwUmzksoddTKB8fH2rZMxRK3pJtLrxhcrYpHfBauAwE,4758
+unidecode/x0d5.py,sha256=rANSL5ndzLgSgYJQNEw57AfXpicRe7pvHRlKTPb4-QQ,4680
+unidecode/x0d6.py,sha256=fT8_cRzp7y60IIhn87kM9lLehKGAg5wYmfFOwgGp6e0,4765
+unidecode/x0d7.py,sha256=40-m7uKNvylWCcVBuTXrbiP6Lrj_4d4PWgLcX8670Kk,4468
+unidecode/x0f9.py,sha256=2PD0_fpDnaFO9ftICjYSOhnjAfBppjsj1TcLIuYjnCI,4567
+unidecode/x0fa.py,sha256=XHxCfXOhHDqzjG0Nw6n1sT5Q_MKLCovPFe-22IQxVXU,4172
+unidecode/x0fb.py,sha256=n_5urRXj6Ecf0MKMnuwNY0UK6TJtUW2hKcNLQqa2Gf8,3787
+unidecode/x0fc.py,sha256=KcyQnyv7gxNeVcAnRwQrm4NlabZE3CrnmtLqXj_7te8,3595
+unidecode/x0fd.py,sha256=mVHMrX8AhRzwCkMNA4sJkhwirK3BqmNv6YZfyCpE9Is,3703
+unidecode/x0fe.py,sha256=CrdwUOf0sl8yUfOFnXOXFZ8U662dQThpGMwGBkY8cJ4,3769
+unidecode/x0ff.py,sha256=Ijfv5VVDCTWRzRqwMYSp0fSycy176gn7P8ut8x3bv-w,3957
+unidecode/x1d4.py,sha256=xzL0OicR95IWq6LiApIPEgPoST8dyVgYuIUGxkz1b28,3863
+unidecode/x1d5.py,sha256=bmTSTgWnsLP7yUDZq2Irtz84Zm7bmLzYzurY0eI0uIU,3863
+unidecode/x1d6.py,sha256=xbtrU5E-18zdp9-fySZ5Nijb0Qbd6PR1tarnihr1LpY,4052
+unidecode/x1d7.py,sha256=yyHV2dCo1p_m_QVgz1H9S6XqeiN9GpGxB-ZqAW7l5ts,4057
+unidecode/x1f1.py,sha256=URX9F6UPgUo4-tpr7bhPm4G5ruFDoScW5bZLwzR88Yg,4308
+unidecode/x1f6.py,sha256=Ji4t-EFmJmo3CDeZ0yD7pX58hj5fQQc99TOrD-yad9k,4103
diff --git a/libs/wsproto-1.2.0.dist-info/REQUESTED b/libs/unidecode-1.4.0.dist-info/REQUESTED
similarity index 100%
rename from libs/wsproto-1.2.0.dist-info/REQUESTED
rename to libs/unidecode-1.4.0.dist-info/REQUESTED
diff --git a/libs/unidecode-1.4.0.dist-info/WHEEL b/libs/unidecode-1.4.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/unidecode-1.4.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/Unidecode-1.3.8.dist-info/entry_points.txt b/libs/unidecode-1.4.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/Unidecode-1.3.8.dist-info/entry_points.txt
rename to libs/unidecode-1.4.0.dist-info/entry_points.txt
diff --git a/libs/Unidecode-1.3.8.dist-info/LICENSE b/libs/unidecode-1.4.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/Unidecode-1.3.8.dist-info/LICENSE
rename to libs/unidecode-1.4.0.dist-info/licenses/LICENSE
diff --git a/libs/Unidecode-1.3.8.dist-info/top_level.txt b/libs/unidecode-1.4.0.dist-info/top_level.txt
similarity index 100%
rename from libs/Unidecode-1.3.8.dist-info/top_level.txt
rename to libs/unidecode-1.4.0.dist-info/top_level.txt
diff --git a/libs/unidecode/__init__.py b/libs/unidecode/__init__.py
index 5633c458a3..7ac3675435 100644
--- a/libs/unidecode/__init__.py
+++ b/libs/unidecode/__init__.py
@@ -19,7 +19,7 @@
 import warnings
 from typing import Dict, Optional, Sequence
 
-Cache = {} # type: Dict[int, Optional[Sequence[Optional[str]]]]
+Cache: Dict[int, Optional[Sequence[Optional[str]]]] = {}
 
 class UnidecodeError(ValueError):
     def __init__(self, message: str, index: Optional[int] = None) -> None:
diff --git a/libs/unidecode/x001.py b/libs/unidecode/x001.py
index 212c2d1a34..37c1e2f7ce 100644
--- a/libs/unidecode/x001.py
+++ b/libs/unidecode/x001.py
@@ -73,8 +73,8 @@
 'N',    # 0x47
 'n',    # 0x48
 '\'n',    # 0x49
-'ng',    # 0x4a
-'NG',    # 0x4b
+'NG',    # 0x4a
+'ng',    # 0x4b
 'O',    # 0x4c
 'o',    # 0x4d
 'O',    # 0x4e
diff --git a/libs/unidecode/x021.py b/libs/unidecode/x021.py
index 4335154224..c76bbd3081 100644
--- a/libs/unidecode/x021.py
+++ b/libs/unidecode/x021.py
@@ -2,13 +2,13 @@
 ' a/c ',    # 0x00
 ' a/s ',    # 0x01
 'C',    # 0x02
-'',    # 0x03
+'degC',    # 0x03
 '',    # 0x04
 ' c/o ',    # 0x05
 ' c/u ',    # 0x06
 '',    # 0x07
 '',    # 0x08
-'',    # 0x09
+'degF',    # 0x09
 'g',    # 0x0a
 'H',    # 0x0b
 'H',    # 0x0c
@@ -30,11 +30,11 @@
 'R',    # 0x1c
 'R',    # 0x1d
 '',    # 0x1e
-'',    # 0x1f
+'R/',    # 0x1f
 '(sm)',    # 0x20
 'TEL',    # 0x21
 '(tm)',    # 0x22
-'',    # 0x23
+'V/',    # 0x23
 'Z',    # 0x24
 '',    # 0x25
 'ohm',    # 0x26
diff --git a/libs/unidecode/x026.py b/libs/unidecode/x026.py
index 380e84b92d..49b5f3ebd2 100644
--- a/libs/unidecode/x026.py
+++ b/libs/unidecode/x026.py
@@ -83,26 +83,32 @@
 '',    # 0x51
 '',    # 0x52
 '',    # 0x53
-'',    # 0x54
-'',    # 0x55
-'',    # 0x56
-'',    # 0x57
-'',    # 0x58
-'',    # 0x59
-'',    # 0x5a
-'',    # 0x5b
-'',    # 0x5c
-'',    # 0x5d
-'',    # 0x5e
-'',    # 0x5f
-'',    # 0x60
-'',    # 0x61
-'',    # 0x62
-'',    # 0x63
-'',    # 0x64
-'',    # 0x65
-'',    # 0x66
-'',    # 0x67
+'white king',    # 0x54
+'white queen',    # 0x55
+'white rook',    # 0x56
+'white bishop',    # 0x57
+'white knight',    # 0x58
+'white pawn',    # 0x59
+'black king',    # 0x5a
+'black queen',    # 0x5b
+'black rook',    # 0x5c
+'black bishop',    # 0x5d
+'black knight',    # 0x5e
+'black pawn',    # 0x5f
+
+# Unicode standard doesn't give an explanation why card suits exist in black
+# and white variants. Adding "white ..." and "black ..." here isn't useful
+# since both variants can be used for either red or black suit color.
+#
+# See discussion at https://github.com/avian2/unidecode/pull/93
+'spades',    # 0x60
+'hearts',    # 0x61
+'diamonds',    # 0x62
+'clubs',    # 0x63
+'spades',    # 0x64
+'hearts',    # 0x65
+'diamonds',    # 0x66
+'clubs',    # 0x67
 '',    # 0x68
 '',    # 0x69
 '',    # 0x6a
diff --git a/libs/unidecode/x1d6.py b/libs/unidecode/x1d6.py
index 2be1a7fb6a..3fe7e50861 100644
--- a/libs/unidecode/x1d6.py
+++ b/libs/unidecode/x1d6.py
@@ -212,7 +212,7 @@
 'rho',    # 0xd2
 'sigma',    # 0xd3
 'sigma',    # 0xd4
-'tai',    # 0xd5
+'tau',    # 0xd5
 'upsilon',    # 0xd6
 'phi',    # 0xd7
 'chi',    # 0xd8
diff --git a/libs/urllib3-2.2.3.dist-info/METADATA b/libs/urllib3-2.2.3.dist-info/METADATA
deleted file mode 100644
index ba2fbba447..0000000000
--- a/libs/urllib3-2.2.3.dist-info/METADATA
+++ /dev/null
@@ -1,155 +0,0 @@
-Metadata-Version: 2.4
-Name: urllib3
-Version: 2.2.3
-Summary: HTTP library with thread-safe connection pooling, file post, and more.
-Project-URL: Changelog, https://github.com/urllib3/urllib3/blob/main/CHANGES.rst
-Project-URL: Documentation, https://urllib3.readthedocs.io
-Project-URL: Code, https://github.com/urllib3/urllib3
-Project-URL: Issue tracker, https://github.com/urllib3/urllib3/issues
-Author-email: Andrey Petrov <andrey.petrov@shazow.net>
-Maintainer-email: Seth Michael Larson <sethmichaellarson@gmail.com>, Quentin Pradet <quentin@pradet.me>, Illia Volochii <illia.volochii@gmail.com>
-License-File: LICENSE.txt
-Keywords: filepost,http,httplib,https,pooling,ssl,threadsafe,urllib
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.8
-Provides-Extra: brotli
-Requires-Dist: brotli>=1.0.9; (platform_python_implementation == 'CPython') and extra == 'brotli'
-Requires-Dist: brotlicffi>=0.8.0; (platform_python_implementation != 'CPython') and extra == 'brotli'
-Provides-Extra: h2
-Requires-Dist: h2<5,>=4; extra == 'h2'
-Provides-Extra: socks
-Requires-Dist: pysocks!=1.5.7,<2.0,>=1.5.6; extra == 'socks'
-Provides-Extra: zstd
-Requires-Dist: zstandard>=0.18.0; extra == 'zstd'
-Description-Content-Type: text/markdown
-
-<h1 align="center">
-
-![urllib3](https://github.com/urllib3/urllib3/raw/main/docs/_static/banner_github.svg)
-
-</h1>
-
-<p align="center">
-  <a href="https://pypi.org/project/urllib3"><img alt="PyPI Version" src="https://img.shields.io/pypi/v/urllib3.svg?maxAge=86400" /></a>
-  <a href="https://pypi.org/project/urllib3"><img alt="Python Versions" src="https://img.shields.io/pypi/pyversions/urllib3.svg?maxAge=86400" /></a>
-  <a href="https://discord.gg/urllib3"><img alt="Join our Discord" src="https://img.shields.io/discord/756342717725933608?color=%237289da&label=discord" /></a>
-  <a href="https://github.com/urllib3/urllib3/actions?query=workflow%3ACI"><img alt="Coverage Status" src="https://img.shields.io/badge/coverage-100%25-success" /></a>
-  <a href="https://github.com/urllib3/urllib3/actions?query=workflow%3ACI"><img alt="Build Status on GitHub" src="https://github.com/urllib3/urllib3/workflows/CI/badge.svg" /></a>
-  <a href="https://urllib3.readthedocs.io"><img alt="Documentation Status" src="https://readthedocs.org/projects/urllib3/badge/?version=latest" /></a><br>
-  <a href="https://deps.dev/pypi/urllib3"><img alt="OpenSSF Scorecard" src="https://api.securityscorecards.dev/projects/github.com/urllib3/urllib3/badge" /></a>
-  <a href="https://slsa.dev"><img alt="SLSA 3" src="https://slsa.dev/images/gh-badge-level3.svg" /></a>
-  <a href="https://bestpractices.coreinfrastructure.org/projects/6227"><img alt="CII Best Practices" src="https://bestpractices.coreinfrastructure.org/projects/6227/badge" /></a>
-</p>
-
-urllib3 is a powerful, *user-friendly* HTTP client for Python. Much of the
-Python ecosystem already uses urllib3 and you should too.
-urllib3 brings many critical features that are missing from the Python
-standard libraries:
-
-- Thread safety.
-- Connection pooling.
-- Client-side SSL/TLS verification.
-- File uploads with multipart encoding.
-- Helpers for retrying requests and dealing with HTTP redirects.
-- Support for gzip, deflate, brotli, and zstd encoding.
-- Proxy support for HTTP and SOCKS.
-- 100% test coverage.
-
-urllib3 is powerful and easy to use:
-
-```python3
->>> import urllib3
->>> resp = urllib3.request("GET", "http://httpbin.org/robots.txt")
->>> resp.status
-200
->>> resp.data
-b"User-agent: *\nDisallow: /deny\n"
-```
-
-## Installing
-
-urllib3 can be installed with [pip](https://pip.pypa.io):
-
-```bash
-$ python -m pip install urllib3
-```
-
-Alternatively, you can grab the latest source code from [GitHub](https://github.com/urllib3/urllib3):
-
-```bash
-$ git clone https://github.com/urllib3/urllib3.git
-$ cd urllib3
-$ pip install .
-```
-
-
-## Documentation
-
-urllib3 has usage and reference documentation at [urllib3.readthedocs.io](https://urllib3.readthedocs.io).
-
-
-## Community
-
-urllib3 has a [community Discord channel](https://discord.gg/urllib3) for asking questions and
-collaborating with other contributors. Drop by and say hello ๐Ÿ‘‹
-
-
-## Contributing
-
-urllib3 happily accepts contributions. Please see our
-[contributing documentation](https://urllib3.readthedocs.io/en/latest/contributing.html)
-for some tips on getting started.
-
-
-## Security Disclosures
-
-To report a security vulnerability, please use the
-[Tidelift security contact](https://tidelift.com/security).
-Tidelift will coordinate the fix and disclosure with maintainers.
-
-
-## Maintainers
-
-- [@sethmlarson](https://github.com/sethmlarson) (Seth M. Larson)
-- [@pquentin](https://github.com/pquentin) (Quentin Pradet)
-- [@illia-v](https://github.com/illia-v) (Illia Volochii)
-- [@theacodes](https://github.com/theacodes) (Thea Flowers)
-- [@haikuginger](https://github.com/haikuginger) (Jess Shapiro)
-- [@lukasa](https://github.com/lukasa) (Cory Benfield)
-- [@sigmavirus24](https://github.com/sigmavirus24) (Ian Stapleton Cordasco)
-- [@shazow](https://github.com/shazow) (Andrey Petrov)
-
-๐Ÿ‘‹
-
-
-## Sponsorship
-
-If your company benefits from this library, please consider [sponsoring its
-development](https://urllib3.readthedocs.io/en/latest/sponsors.html).
-
-
-## For Enterprise
-
-Professional support for urllib3 is available as part of the [Tidelift
-Subscription][1].  Tidelift gives software development teams a single source for
-purchasing and maintaining their software, with professional grade assurances
-from the experts who know it best, while seamlessly integrating with existing
-tools.
-
-[1]: https://tidelift.com/subscription/pkg/pypi-urllib3?utm_source=pypi-urllib3&utm_medium=referral&utm_campaign=readme
diff --git a/libs/urllib3-2.2.3.dist-info/RECORD b/libs/urllib3-2.2.3.dist-info/RECORD
deleted file mode 100644
index 25833bd90e..0000000000
--- a/libs/urllib3-2.2.3.dist-info/RECORD
+++ /dev/null
@@ -1,44 +0,0 @@
-urllib3-2.2.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-urllib3-2.2.3.dist-info/METADATA,sha256=T1CN4mjm6UV2ZV71tZfPSPDYimBCcm6nqJrZMGmH8S0,6485
-urllib3-2.2.3.dist-info/RECORD,,
-urllib3-2.2.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-urllib3-2.2.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-urllib3-2.2.3.dist-info/licenses/LICENSE.txt,sha256=Ew46ZNX91dCWp1JpRjSn2d8oRGnehuVzIQAmgEHj1oY,1093
-urllib3/__init__.py,sha256=JMo1tg1nIV1AeJ2vENC_Txfl0e5h6Gzl9DGVk1rWRbo,6979
-urllib3/_base_connection.py,sha256=tH0ZlOxWKika-S9NW-MuIlI_PLFQUUmSnoE_9MeywkM,5652
-urllib3/_collections.py,sha256=aGhh9zCYce3o-5FW9DPSUay6O9LjHx8z6T7wDtdhrkY,17370
-urllib3/_request_methods.py,sha256=LTDxHenEP5XX-tVWBNkEkAgizCERkZF0JK-F-wCxqwI,9938
-urllib3/_version.py,sha256=gF7zM8AsdLRqhgteXesNHb7_t8ukr2zzkok2g1nvvhA,411
-urllib3/connection.py,sha256=QAwhOV5GOVdsFnMvX5Vv6fQ8f47EzfrROAArfxRdQOY,39508
-urllib3/connectionpool.py,sha256=5fPIHypPwlbKBASMs6bESTEJVEGlsj9FOY9_GGU2GpM,43393
-urllib3/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-urllib3/contrib/emscripten/__init__.py,sha256=u6KNgzjlFZbuAAXa_ybCR7gQ71VJESnF-IIdDA73brw,733
-urllib3/contrib/emscripten/connection.py,sha256=kaBe2tWt7Yy9vNUFRBV7CSyDnfhCYILGxju9KTZj8Sw,8755
-urllib3/contrib/emscripten/emscripten_fetch_worker.js,sha256=CDfYF_9CDobtx2lGidyJ1zjDEvwNT5F-dchmVWXDh0E,3655
-urllib3/contrib/emscripten/fetch.py,sha256=ymwJlHBBuw6WTpKgPHpdmmrNBxlsr75HqoD4Rn27YXk,14131
-urllib3/contrib/emscripten/request.py,sha256=mL28szy1KvE3NJhWor5jNmarp8gwplDU-7gwGZY5g0Q,566
-urllib3/contrib/emscripten/response.py,sha256=wEYWPHCL-JsgCtpCpfnWGYA1-DcjDGpFGqWCXZLwbHY,10017
-urllib3/contrib/pyopenssl.py,sha256=9iP4j8JafA4hqtX9AgJ9zxrqI-icohGrqFqAMryoNdA,19338
-urllib3/contrib/socks.py,sha256=-iardc61GypsJzD6W6yuRS7KVCyfowcQrl_719H7lIM,7549
-urllib3/exceptions.py,sha256=RDaiudtR7rqbVKTKpLSgZBBtwaIqV7eZtervZV_mZag,9393
-urllib3/fields.py,sha256=8vi0PeRo_pE5chPmJA07LZtMkVls4UrBS1k2xM506jM,10843
-urllib3/filepost.py,sha256=-9qJT11cNGjO9dqnI20-oErZuTvNaM18xZZPCjZSbOE,2395
-urllib3/http2/__init__.py,sha256=xzrASH7R5ANRkPJOot5lGnATOq3KKuyXzI42rcnwmqs,1741
-urllib3/http2/connection.py,sha256=GNlp9BjI3DmfSKe1W0b9IqRBeM8Q13xd2MA3ROcJ3dY,12668
-urllib3/http2/probe.py,sha256=nnAkqbhAakOiF75rz7W0udZ38Eeh_uD8fjV74N73FEI,3014
-urllib3/poolmanager.py,sha256=2_L2AjVDgoQ0qBmYbX9u9QqyU1u5J37zQbtv_-ueZQA,22913
-urllib3/py.typed,sha256=UaCuPFa3H8UAakbt-5G8SPacldTOGvJv18pPjUJ5gDY,93
-urllib3/response.py,sha256=NS0rqwRmtwWtC_6XDqgDJN_uo-jEmBVzx0V6KCsHlwg,44801
-urllib3/util/__init__.py,sha256=-qeS0QceivazvBEKDNFCAI-6ACcdDOE4TMvo7SLNlAQ,1001
-urllib3/util/connection.py,sha256=0o79-5NbRfpBDyoehGPLmCA544sCSiXvx0mF9xy3GG0,4458
-urllib3/util/proxy.py,sha256=seP8-Q5B6bB0dMtwPj-YcZZQ30vHuLqRu-tI0JZ2fzs,1148
-urllib3/util/request.py,sha256=UrZ2g3y3stGpH8rm-Sx8-ollgeiiKI496DZXRCwxb9o,8064
-urllib3/util/response.py,sha256=vQE639uoEhj1vpjEdxu5lNIhJCSUZkd7pqllUI0BZOA,3374
-urllib3/util/retry.py,sha256=bj-2YUqblxLlv8THg5fxww-DM54XCbjgZXIQ71XioCY,18459
-urllib3/util/ssl_.py,sha256=WN8a6KPPcvukbZ0MUlBAOkGil8bYKY8NoIYOw7QeOLI,19238
-urllib3/util/ssl_match_hostname.py,sha256=gaWqixoYtQ_GKO8fcRGFj3VXeMoqyxQQuUTPgWeiL_M,5812
-urllib3/util/ssltransport.py,sha256=wprBvhkgjddhhMwwEbHyP4lygHpP6SS-45Euh7oe48k,8887
-urllib3/util/timeout.py,sha256=4eT1FVeZZU7h7mYD1Jq2OXNe4fxekdNvhoWUkZusRpA,10346
-urllib3/util/url.py,sha256=wHORhp80RAXyTlAIkTqLFzSrkU7J34ZDxX-tN65MBZk,15213
-urllib3/util/util.py,sha256=j3lbZK1jPyiwD34T8IgJzdWEZVT-4E-0vYIJi9UjeNA,1146
-urllib3/util/wait.py,sha256=_ph8IrUR3sqPqi0OopQgJUlH4wzkGeM5CiyA7XGGtmI,4423
diff --git a/libs/urllib3-2.2.3.dist-info/WHEEL b/libs/urllib3-2.2.3.dist-info/WHEEL
deleted file mode 100644
index 12228d414b..0000000000
--- a/libs/urllib3-2.2.3.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: hatchling 1.27.0
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/urllib3-2.2.3.dist-info/INSTALLER b/libs/urllib3-2.6.3.dist-info/INSTALLER
similarity index 100%
rename from libs/urllib3-2.2.3.dist-info/INSTALLER
rename to libs/urllib3-2.6.3.dist-info/INSTALLER
diff --git a/libs/urllib3-2.6.3.dist-info/METADATA b/libs/urllib3-2.6.3.dist-info/METADATA
new file mode 100644
index 0000000000..b75670fb69
--- /dev/null
+++ b/libs/urllib3-2.6.3.dist-info/METADATA
@@ -0,0 +1,164 @@
+Metadata-Version: 2.4
+Name: urllib3
+Version: 2.6.3
+Summary: HTTP library with thread-safe connection pooling, file post, and more.
+Project-URL: Changelog, https://github.com/urllib3/urllib3/blob/main/CHANGES.rst
+Project-URL: Documentation, https://urllib3.readthedocs.io
+Project-URL: Code, https://github.com/urllib3/urllib3
+Project-URL: Issue tracker, https://github.com/urllib3/urllib3/issues
+Author-email: Andrey Petrov <andrey.petrov@shazow.net>
+Maintainer-email: Seth Michael Larson <sethmichaellarson@gmail.com>, Quentin Pradet <quentin@pradet.me>, Illia Volochii <illia.volochii@gmail.com>
+License-Expression: MIT
+License-File: LICENSE.txt
+Keywords: filepost,http,httplib,https,pooling,ssl,threadsafe,urllib
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Free Threading :: 2 - Beta
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.9
+Provides-Extra: brotli
+Requires-Dist: brotli>=1.2.0; (platform_python_implementation == 'CPython') and extra == 'brotli'
+Requires-Dist: brotlicffi>=1.2.0.0; (platform_python_implementation != 'CPython') and extra == 'brotli'
+Provides-Extra: h2
+Requires-Dist: h2<5,>=4; extra == 'h2'
+Provides-Extra: socks
+Requires-Dist: pysocks!=1.5.7,<2.0,>=1.5.6; extra == 'socks'
+Provides-Extra: zstd
+Requires-Dist: backports-zstd>=1.0.0; (python_version < '3.14') and extra == 'zstd'
+Description-Content-Type: text/markdown
+
+<h1 align="center">
+
+![urllib3](https://github.com/urllib3/urllib3/raw/main/docs/_static/banner_github.svg)
+
+</h1>
+
+<p align="center">
+  <a href="https://pypi.org/project/urllib3"><img alt="PyPI Version" src="https://img.shields.io/pypi/v/urllib3.svg?maxAge=86400" /></a>
+  <a href="https://pypi.org/project/urllib3"><img alt="Python Versions" src="https://img.shields.io/pypi/pyversions/urllib3.svg?maxAge=86400" /></a>
+  <a href="https://discord.gg/urllib3"><img alt="Join our Discord" src="https://img.shields.io/discord/756342717725933608?color=%237289da&label=discord" /></a>
+  <a href="https://github.com/urllib3/urllib3/actions?query=workflow%3ACI"><img alt="Coverage Status" src="https://img.shields.io/badge/coverage-100%25-success" /></a>
+  <a href="https://github.com/urllib3/urllib3/actions/workflows/ci.yml?query=branch%3Amain"><img alt="Build Status on GitHub" src="https://github.com/urllib3/urllib3/actions/workflows/ci.yml/badge.svg?branch:main&workflow:CI" /></a>
+  <a href="https://urllib3.readthedocs.io"><img alt="Documentation Status" src="https://readthedocs.org/projects/urllib3/badge/?version=latest" /></a><br>
+  <a href="https://deps.dev/pypi/urllib3"><img alt="OpenSSF Scorecard" src="https://api.securityscorecards.dev/projects/github.com/urllib3/urllib3/badge" /></a>
+  <a href="https://slsa.dev"><img alt="SLSA 3" src="https://slsa.dev/images/gh-badge-level3.svg" /></a>
+  <a href="https://bestpractices.coreinfrastructure.org/projects/6227"><img alt="CII Best Practices" src="https://bestpractices.coreinfrastructure.org/projects/6227/badge" /></a>
+</p>
+
+urllib3 is a powerful, *user-friendly* HTTP client for Python.
+urllib3 brings many critical features that are missing from the Python
+standard libraries:
+
+- Thread safety.
+- Connection pooling.
+- Client-side SSL/TLS verification.
+- File uploads with multipart encoding.
+- Helpers for retrying requests and dealing with HTTP redirects.
+- Support for gzip, deflate, brotli, and zstd encoding.
+- Proxy support for HTTP and SOCKS.
+- 100% test coverage.
+
+... and many more features, but most importantly: Our maintainers have a 15+
+year track record of maintaining urllib3 with the highest code standards and
+attention to security and safety.
+
+[Much of the Python ecosystem already uses urllib3](https://urllib3.readthedocs.io/en/stable/#who-uses)
+and you should too.
+
+
+## Installing
+
+urllib3 can be installed with [pip](https://pip.pypa.io):
+
+```bash
+$ python -m pip install urllib3
+```
+
+Alternatively, you can grab the latest source code from [GitHub](https://github.com/urllib3/urllib3):
+
+```bash
+$ git clone https://github.com/urllib3/urllib3.git
+$ cd urllib3
+$ pip install .
+```
+
+## Getting Started
+
+urllib3 is easy to use:
+
+```python3
+>>> import urllib3
+>>> resp = urllib3.request("GET", "http://httpbin.org/robots.txt")
+>>> resp.status
+200
+>>> resp.data
+b"User-agent: *\nDisallow: /deny\n"
+```
+
+urllib3 has usage and reference documentation at [urllib3.readthedocs.io](https://urllib3.readthedocs.io).
+
+
+## Community
+
+urllib3 has a [community Discord channel](https://discord.gg/urllib3) for asking questions and
+collaborating with other contributors. Drop by and say hello ๐Ÿ‘‹
+
+
+## Contributing
+
+urllib3 happily accepts contributions. Please see our
+[contributing documentation](https://urllib3.readthedocs.io/en/latest/contributing.html)
+for some tips on getting started.
+
+
+## Security Disclosures
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure with maintainers.
+
+
+## Maintainers
+
+Meet our maintainers since 2008:
+
+- Current Lead: [@illia-v](https://github.com/illia-v) (Illia Volochii)
+- [@sethmlarson](https://github.com/sethmlarson) (Seth M. Larson)
+- [@pquentin](https://github.com/pquentin) (Quentin Pradet)
+- [@theacodes](https://github.com/theacodes) (Thea Flowers)
+- [@haikuginger](https://github.com/haikuginger) (Jess Shapiro)
+- [@lukasa](https://github.com/lukasa) (Cory Benfield)
+- [@sigmavirus24](https://github.com/sigmavirus24) (Ian Stapleton Cordasco)
+- [@shazow](https://github.com/shazow) (Andrey Petrov)
+
+๐Ÿ‘‹
+
+
+## Sponsorship
+
+If your company benefits from this library, please consider [sponsoring its
+development](https://urllib3.readthedocs.io/en/latest/sponsors.html).
+
+
+## For Enterprise
+
+Professional support for urllib3 is available as part of the [Tidelift
+Subscription][1]. Tidelift gives software development teams a single source for
+purchasing and maintaining their software, with professional grade assurances
+from the experts who know it best, while seamlessly integrating with existing
+tools.
+
+[1]: https://tidelift.com/subscription/pkg/pypi-urllib3?utm_source=pypi-urllib3&utm_medium=referral&utm_campaign=readme
diff --git a/libs/urllib3-2.6.3.dist-info/RECORD b/libs/urllib3-2.6.3.dist-info/RECORD
new file mode 100644
index 0000000000..16088de553
--- /dev/null
+++ b/libs/urllib3-2.6.3.dist-info/RECORD
@@ -0,0 +1,44 @@
+urllib3-2.6.3.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+urllib3-2.6.3.dist-info/METADATA,sha256=6ROQzJr0mwGXOPHXObXNklEwwy6dPmrMCGPCHF2Ygu8,6901
+urllib3-2.6.3.dist-info/RECORD,,
+urllib3-2.6.3.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+urllib3-2.6.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+urllib3-2.6.3.dist-info/licenses/LICENSE.txt,sha256=Ew46ZNX91dCWp1JpRjSn2d8oRGnehuVzIQAmgEHj1oY,1093
+urllib3/__init__.py,sha256=JMo1tg1nIV1AeJ2vENC_Txfl0e5h6Gzl9DGVk1rWRbo,6979
+urllib3/_base_connection.py,sha256=T1cwH3RhzsrBh6Bz3AOGVDboRsE7veijqZPXXQTR2Rg,5568
+urllib3/_collections.py,sha256=UvV7UqtGTSKdvw8N_LxWuEikZLm5gB1zFfTZYH9KhAk,17595
+urllib3/_request_methods.py,sha256=gCeF85SO_UU4WoPwYHIoz_tw-eM_EVOkLFp8OFsC7DA,9931
+urllib3/_version.py,sha256=vKE8or0mmqgsFpVb7FYms-nNOVCPPAEifgxVrTaPByw,704
+urllib3/connection.py,sha256=1ZR2gqfFdIzTYIUwF0K5nftg26hLqU5nr1yHTdKb7WA,42800
+urllib3/connectionpool.py,sha256=ZEhudsa8BIubD2M0XoxBBsjxbsXwMgUScH7oQ9i-j1Y,43371
+urllib3/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+urllib3/contrib/emscripten/__init__.py,sha256=wyXve8rmqX7s2KqRQBxD5Wl48jzWPn5-1u_XoQBELVc,836
+urllib3/contrib/emscripten/connection.py,sha256=giElsBoUsKVURbZzb8GCrJmqW23Xnvj2aNyQVF42slg,8960
+urllib3/contrib/emscripten/emscripten_fetch_worker.js,sha256=z1k3zZ4_hDKd3-tN7wzz8LHjHC2pxN_uu8B3k9D9A3c,3677
+urllib3/contrib/emscripten/fetch.py,sha256=5xcd--viFxZd2nBy0aK73dtJ9Tsh1yYZU_SUXwnwibk,23520
+urllib3/contrib/emscripten/request.py,sha256=mL28szy1KvE3NJhWor5jNmarp8gwplDU-7gwGZY5g0Q,566
+urllib3/contrib/emscripten/response.py,sha256=7oVPENYZHuzEGRtG40HonpH5tAIYHsGcHPbJt2Z0U-Y,9507
+urllib3/contrib/pyopenssl.py,sha256=4awTja4o3beTGTGmmWo_3rBoEgzje95Q4bgWz4iiSx8,19724
+urllib3/contrib/socks.py,sha256=eB2eWfu8Wz1fn-qvr_qE_dZAceck2Ncv7XQ15DlvVbU,7547
+urllib3/exceptions.py,sha256=eeQ77nJjF97bP6SvCK4gmx6BpQZKU8yjvM-AIDwZdX8,9952
+urllib3/fields.py,sha256=FCf7UULSkf10cuTRUWTQESzxgl1WT8e2aCy3kfyZins,10829
+urllib3/filepost.py,sha256=U8eNZ-mpKKHhrlbHEEiTxxgK16IejhEa7uz42yqA_dI,2388
+urllib3/http2/__init__.py,sha256=xzrASH7R5ANRkPJOot5lGnATOq3KKuyXzI42rcnwmqs,1741
+urllib3/http2/connection.py,sha256=bHMH6fNvatwXPrKqrcn74yA3pUWcqPDppnK1LcKCbP8,12578
+urllib3/http2/probe.py,sha256=nnAkqbhAakOiF75rz7W0udZ38Eeh_uD8fjV74N73FEI,3014
+urllib3/poolmanager.py,sha256=NYP5vkKfadGddaBacUk6z6u8rTP9wgCFGGjVtf1mkcc,23811
+urllib3/py.typed,sha256=UaCuPFa3H8UAakbt-5G8SPacldTOGvJv18pPjUJ5gDY,93
+urllib3/response.py,sha256=2VDtH9KrYNQLUbDYHZ3GgwzH3JZphkn_JoqtB7ozkt0,52931
+urllib3/util/__init__.py,sha256=-qeS0QceivazvBEKDNFCAI-6ACcdDOE4TMvo7SLNlAQ,1001
+urllib3/util/connection.py,sha256=JjO722lzHlzLXPTkr9ZWBdhseXnMVjMSb1DJLVrXSnQ,4444
+urllib3/util/proxy.py,sha256=seP8-Q5B6bB0dMtwPj-YcZZQ30vHuLqRu-tI0JZ2fzs,1148
+urllib3/util/request.py,sha256=itpnC8ug7D4nVfDmGUCRMlgkARUQ13r_XMxSnzTwmpE,8363
+urllib3/util/response.py,sha256=vQE639uoEhj1vpjEdxu5lNIhJCSUZkd7pqllUI0BZOA,3374
+urllib3/util/retry.py,sha256=WOcIHVaxKf-dVb89lUbpvcpeM7rNYF_vsKsCOKw10Z8,19235
+urllib3/util/ssl_.py,sha256=Y9RNkWCIehDxIRvyFnHUjiMlPolm368GYMya2YdDOag,19929
+urllib3/util/ssl_match_hostname.py,sha256=Di7DU7zokoltapT_F0Sj21ffYxwaS_cE5apOtwueeyA,5845
+urllib3/util/ssltransport.py,sha256=Ez4O8pR_vT8dan_FvqBYS6dgDfBXEMfVfrzcdUoWfi4,8847
+urllib3/util/timeout.py,sha256=4eT1FVeZZU7h7mYD1Jq2OXNe4fxekdNvhoWUkZusRpA,10346
+urllib3/util/url.py,sha256=WRh-TMYXosmgp8m8lT4H5spoHw5yUjlcMCfU53AkoAs,15205
+urllib3/util/util.py,sha256=j3lbZK1jPyiwD34T8IgJzdWEZVT-4E-0vYIJi9UjeNA,1146
+urllib3/util/wait.py,sha256=_ph8IrUR3sqPqi0OopQgJUlH4wzkGeM5CiyA7XGGtmI,4423
diff --git a/libs/zipp-3.20.2.dist-info/REQUESTED b/libs/urllib3-2.6.3.dist-info/REQUESTED
similarity index 100%
rename from libs/zipp-3.20.2.dist-info/REQUESTED
rename to libs/urllib3-2.6.3.dist-info/REQUESTED
diff --git a/libs/urllib3-2.6.3.dist-info/WHEEL b/libs/urllib3-2.6.3.dist-info/WHEEL
new file mode 100644
index 0000000000..ae8ec1bdaa
--- /dev/null
+++ b/libs/urllib3-2.6.3.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/urllib3-2.2.3.dist-info/licenses/LICENSE.txt b/libs/urllib3-2.6.3.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/urllib3-2.2.3.dist-info/licenses/LICENSE.txt
rename to libs/urllib3-2.6.3.dist-info/licenses/LICENSE.txt
diff --git a/libs/urllib3/_base_connection.py b/libs/urllib3/_base_connection.py
index 29ca334879..dc0f318c0b 100644
--- a/libs/urllib3/_base_connection.py
+++ b/libs/urllib3/_base_connection.py
@@ -62,8 +62,7 @@ def __init__(
             socket_options: _TYPE_SOCKET_OPTIONS | None = ...,
             proxy: Url | None = None,
             proxy_config: ProxyConfig | None = None,
-        ) -> None:
-            ...
+        ) -> None: ...
 
         def set_tunnel(
             self,
@@ -71,11 +70,9 @@ def set_tunnel(
             port: int | None = None,
             headers: typing.Mapping[str, str] | None = None,
             scheme: str = "http",
-        ) -> None:
-            ...
+        ) -> None: ...
 
-        def connect(self) -> None:
-            ...
+        def connect(self) -> None: ...
 
         def request(
             self,
@@ -91,14 +88,11 @@ def request(
             preload_content: bool = True,
             decode_content: bool = True,
             enforce_content_length: bool = True,
-        ) -> None:
-            ...
+        ) -> None: ...
 
-        def getresponse(self) -> BaseHTTPResponse:
-            ...
+        def getresponse(self) -> BaseHTTPResponse: ...
 
-        def close(self) -> None:
-            ...
+        def close(self) -> None: ...
 
         @property
         def is_closed(self) -> bool:
@@ -168,5 +162,4 @@ def __init__(
             cert_file: str | None = None,
             key_file: str | None = None,
             key_password: str | None = None,
-        ) -> None:
-            ...
+        ) -> None: ...
diff --git a/libs/urllib3/_collections.py b/libs/urllib3/_collections.py
index 8a4409a122..0378aab1b1 100644
--- a/libs/urllib3/_collections.py
+++ b/libs/urllib3/_collections.py
@@ -13,11 +13,9 @@
     from typing_extensions import Self
 
     class HasGettableStringKeys(Protocol):
-        def keys(self) -> typing.Iterator[str]:
-            ...
+        def keys(self) -> typing.Iterator[str]: ...
 
-        def __getitem__(self, key: str) -> str:
-            ...
+        def __getitem__(self, key: str) -> str: ...
 
 
 __all__ = ["RecentlyUsedContainer", "HTTPHeaderDict"]
@@ -33,7 +31,7 @@ def __getitem__(self, key: str) -> str:
 ValidHTTPHeaderSource = typing.Union[
     "HTTPHeaderDict",
     typing.Mapping[str, str],
-    typing.Iterable[typing.Tuple[str, str]],
+    typing.Iterable[tuple[str, str]],
     "HasGettableStringKeys",
 ]
 
@@ -55,7 +53,7 @@ def ensure_can_construct_http_header_dict(
         # Similarly to Mapping, full runtime checking of the contents of an Iterable is
         # expensive, so for the purposes of typechecking, we assume that any Iterable
         # is the right shape.
-        return typing.cast(typing.Iterable[typing.Tuple[str, str]], potential)
+        return typing.cast(typing.Iterable[tuple[str, str]], potential)
     elif hasattr(potential, "keys") and hasattr(potential, "__getitem__"):
         return typing.cast("HasGettableStringKeys", potential)
     else:
@@ -155,7 +153,7 @@ def keys(self) -> set[_KT]:  # type: ignore[override]
             return set(self._container.keys())
 
 
-class HTTPHeaderDictItemView(typing.Set[typing.Tuple[str, str]]):
+class HTTPHeaderDictItemView(set[tuple[str, str]]):
     """
     HTTPHeaderDict is unusual for a Mapping[str, str] in that it has two modes of
     address.
@@ -257,13 +255,19 @@ def __setitem__(self, key: str, val: str) -> None:
         self._container[key.lower()] = [key, val]
 
     def __getitem__(self, key: str) -> str:
+        if isinstance(key, bytes):
+            key = key.decode("latin-1")
         val = self._container[key.lower()]
         return ", ".join(val[1:])
 
     def __delitem__(self, key: str) -> None:
+        if isinstance(key, bytes):
+            key = key.decode("latin-1")
         del self._container[key.lower()]
 
     def __contains__(self, key: object) -> bool:
+        if isinstance(key, bytes):
+            key = key.decode("latin-1")
         if isinstance(key, str):
             return key.lower() in self._container
         return False
@@ -352,7 +356,7 @@ def extend(self, *args: ValidHTTPHeaderSource, **kwargs: str) -> None:
             for key, val in other.items():
                 self.add(key, val)
         elif isinstance(other, typing.Iterable):
-            other = typing.cast(typing.Iterable[typing.Tuple[str, str]], other)
+            other = typing.cast(typing.Iterable[tuple[str, str]], other)
             for key, value in other:
                 self.add(key, value)
         elif hasattr(other, "keys") and hasattr(other, "__getitem__"):
@@ -368,18 +372,18 @@ def extend(self, *args: ValidHTTPHeaderSource, **kwargs: str) -> None:
             self.add(key, value)
 
     @typing.overload
-    def getlist(self, key: str) -> list[str]:
-        ...
+    def getlist(self, key: str) -> list[str]: ...
 
     @typing.overload
-    def getlist(self, key: str, default: _DT) -> list[str] | _DT:
-        ...
+    def getlist(self, key: str, default: _DT) -> list[str] | _DT: ...
 
     def getlist(
         self, key: str, default: _Sentinel | _DT = _Sentinel.not_passed
     ) -> list[str] | _DT:
         """Returns a list of all the values for the named field. Returns an
         empty list if the key doesn't exist."""
+        if isinstance(key, bytes):
+            key = key.decode("latin-1")
         try:
             vals = self._container[key.lower()]
         except KeyError:
diff --git a/libs/urllib3/_request_methods.py b/libs/urllib3/_request_methods.py
index 03186e5129..297c271bf4 100644
--- a/libs/urllib3/_request_methods.py
+++ b/libs/urllib3/_request_methods.py
@@ -12,7 +12,7 @@
 __all__ = ["RequestMethods"]
 
 _TYPE_ENCODE_URL_FIELDS = typing.Union[
-    typing.Sequence[typing.Tuple[str, typing.Union[str, bytes]]],
+    typing.Sequence[tuple[str, typing.Union[str, bytes]]],
     typing.Mapping[str, typing.Union[str, bytes]],
 ]
 
diff --git a/libs/urllib3/_version.py b/libs/urllib3/_version.py
index eb8b5c285a..268d3b984d 100644
--- a/libs/urllib3/_version.py
+++ b/libs/urllib3/_version.py
@@ -1,16 +1,34 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '2.6.3'
+__version_tuple__ = version_tuple = (2, 6, 3)
 
-__version__ = version = '2.2.3'
-__version_tuple__ = version_tuple = (2, 2, 3)
+__commit_id__ = commit_id = None
diff --git a/libs/urllib3/connection.py b/libs/urllib3/connection.py
index 7cbef7d5a9..2ceeb0a548 100644
--- a/libs/urllib3/connection.py
+++ b/libs/urllib3/connection.py
@@ -74,12 +74,10 @@ class BaseSSLError(BaseException):  # type: ignore[no-redef]
 
 # When it comes time to update this value as a part of regular maintenance
 # (ie test_recent_date is failing) update it to ~6 months before the current date.
-RECENT_DATE = datetime.date(2023, 6, 1)
+RECENT_DATE = datetime.date(2025, 1, 1)
 
 _CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
 
-_HAS_SYS_AUDIT = hasattr(sys, "audit")
-
 
 class HTTPConnection(_HTTPConnection):
     """
@@ -139,8 +137,9 @@ def __init__(
         timeout: _TYPE_TIMEOUT = _DEFAULT_TIMEOUT,
         source_address: tuple[str, int] | None = None,
         blocksize: int = 16384,
-        socket_options: None
-        | (connection._TYPE_SOCKET_OPTIONS) = default_socket_options,
+        socket_options: None | (
+            connection._TYPE_SOCKET_OPTIONS
+        ) = default_socket_options,
         proxy: Url | None = None,
         proxy_config: ProxyConfig | None = None,
     ) -> None:
@@ -161,6 +160,12 @@ def __init__(
         self._tunnel_port: int | None = None
         self._tunnel_scheme: str | None = None
 
+    def __str__(self) -> str:
+        return f"{type(self).__name__}(host={self.host!r}, port={self.port!r})"
+
+    def __repr__(self) -> str:
+        return f"<{self} at {id(self):#x}>"
+
     @property
     def host(self) -> str:
         """
@@ -215,9 +220,7 @@ def _new_conn(self) -> socket.socket:
                 self, f"Failed to establish a new connection: {e}"
             ) from e
 
-        # Audit hooks are only available in Python 3.8+
-        if _HAS_SYS_AUDIT:
-            sys.audit("http.client.connect", self, self.host, self.port)
+        sys.audit("http.client.connect", self, self.host, self.port)
 
         return sock
 
@@ -235,45 +238,94 @@ def set_tunnel(
         super().set_tunnel(host, port=port, headers=headers)
         self._tunnel_scheme = scheme
 
-    if sys.version_info < (3, 11, 4):
-
-        def _tunnel(self) -> None:
-            _MAXLINE = http.client._MAXLINE  # type: ignore[attr-defined]
-            connect = b"CONNECT %s:%d HTTP/1.0\r\n" % (  # type: ignore[str-format]
-                self._tunnel_host.encode("ascii"),  # type: ignore[union-attr]
-                self._tunnel_port,
-            )
-            headers = [connect]
-            for header, value in self._tunnel_headers.items():  # type: ignore[attr-defined]
-                headers.append(f"{header}: {value}\r\n".encode("latin-1"))
-            headers.append(b"\r\n")
-            # Making a single send() call instead of one per line encourages
-            # the host OS to use a more optimal packet size instead of
-            # potentially emitting a series of small packets.
-            self.send(b"".join(headers))
-            del headers
-
-            response = self.response_class(self.sock, method=self._method)  # type: ignore[attr-defined]
-            try:
-                (version, code, message) = response._read_status()  # type: ignore[attr-defined]
-
-                if code != http.HTTPStatus.OK:
-                    self.close()
-                    raise OSError(f"Tunnel connection failed: {code} {message.strip()}")
-                while True:
-                    line = response.fp.readline(_MAXLINE + 1)
-                    if len(line) > _MAXLINE:
-                        raise http.client.LineTooLong("header line")
-                    if not line:
-                        # for sites which EOF without sending a trailer
-                        break
-                    if line in (b"\r\n", b"\n", b""):
-                        break
+    if sys.version_info < (3, 11, 9) or ((3, 12) <= sys.version_info < (3, 12, 3)):
+        # Taken from python/cpython#100986 which was backported in 3.11.9 and 3.12.3.
+        # When using connection_from_host, host will come without brackets.
+        def _wrap_ipv6(self, ip: bytes) -> bytes:
+            if b":" in ip and ip[0] != b"["[0]:
+                return b"[" + ip + b"]"
+            return ip
+
+        if sys.version_info < (3, 11, 9):
+            # `_tunnel` copied from 3.11.13 backporting
+            # https://github.com/python/cpython/commit/0d4026432591d43185568dd31cef6a034c4b9261
+            # and https://github.com/python/cpython/commit/6fbc61070fda2ffb8889e77e3b24bca4249ab4d1
+            def _tunnel(self) -> None:
+                _MAXLINE = http.client._MAXLINE  # type: ignore[attr-defined]
+                connect = b"CONNECT %s:%d HTTP/1.0\r\n" % (  # type: ignore[str-format]
+                    self._wrap_ipv6(self._tunnel_host.encode("ascii")),  # type: ignore[union-attr]
+                    self._tunnel_port,
+                )
+                headers = [connect]
+                for header, value in self._tunnel_headers.items():  # type: ignore[attr-defined]
+                    headers.append(f"{header}: {value}\r\n".encode("latin-1"))
+                headers.append(b"\r\n")
+                # Making a single send() call instead of one per line encourages
+                # the host OS to use a more optimal packet size instead of
+                # potentially emitting a series of small packets.
+                self.send(b"".join(headers))
+                del headers
+
+                response = self.response_class(self.sock, method=self._method)  # type: ignore[attr-defined]
+                try:
+                    (version, code, message) = response._read_status()  # type: ignore[attr-defined]
+
+                    if code != http.HTTPStatus.OK:
+                        self.close()
+                        raise OSError(
+                            f"Tunnel connection failed: {code} {message.strip()}"
+                        )
+                    while True:
+                        line = response.fp.readline(_MAXLINE + 1)
+                        if len(line) > _MAXLINE:
+                            raise http.client.LineTooLong("header line")
+                        if not line:
+                            # for sites which EOF without sending a trailer
+                            break
+                        if line in (b"\r\n", b"\n", b""):
+                            break
+
+                        if self.debuglevel > 0:
+                            print("header:", line.decode())
+                finally:
+                    response.close()
+
+        elif (3, 12) <= sys.version_info < (3, 12, 3):
+            # `_tunnel` copied from 3.12.11 backporting
+            # https://github.com/python/cpython/commit/23aef575c7629abcd4aaf028ebd226fb41a4b3c8
+            def _tunnel(self) -> None:  # noqa: F811
+                connect = b"CONNECT %s:%d HTTP/1.1\r\n" % (  # type: ignore[str-format]
+                    self._wrap_ipv6(self._tunnel_host.encode("idna")),  # type: ignore[union-attr]
+                    self._tunnel_port,
+                )
+                headers = [connect]
+                for header, value in self._tunnel_headers.items():  # type: ignore[attr-defined]
+                    headers.append(f"{header}: {value}\r\n".encode("latin-1"))
+                headers.append(b"\r\n")
+                # Making a single send() call instead of one per line encourages
+                # the host OS to use a more optimal packet size instead of
+                # potentially emitting a series of small packets.
+                self.send(b"".join(headers))
+                del headers
+
+                response = self.response_class(self.sock, method=self._method)  # type: ignore[attr-defined]
+                try:
+                    (version, code, message) = response._read_status()  # type: ignore[attr-defined]
+
+                    self._raw_proxy_headers = http.client._read_headers(response.fp)  # type: ignore[attr-defined]
 
                     if self.debuglevel > 0:
-                        print("header:", line.decode())
-            finally:
-                response.close()
+                        for header in self._raw_proxy_headers:
+                            print("header:", header.decode())
+
+                    if code != http.HTTPStatus.OK:
+                        self.close()
+                        raise OSError(
+                            f"Tunnel connection failed: {code} {message.strip()}"
+                        )
+
+                finally:
+                    response.close()
 
     def connect(self) -> None:
         self.sock = self._new_conn()
@@ -313,6 +365,13 @@ def proxy_is_forwarding(self) -> bool:
         """
         return bool(self.proxy) and self._tunnel_host is None
 
+    @property
+    def proxy_is_tunneling(self) -> bool:
+        """
+        Return True if a tunneling proxy is configured, else return False
+        """
+        return self._tunnel_host is not None
+
     def close(self) -> None:
         try:
             super().close()
@@ -503,6 +562,11 @@ def getresponse(  # type: ignore[override]
         # This is needed here to avoid circular import errors
         from .response import HTTPResponse
 
+        # Save a reference to the shutdown function before ownership is passed
+        # to httplib_response
+        # TODO should we implement it everywhere?
+        _shutdown = getattr(self.sock, "shutdown", None)
+
         # Get the response from http.client.HTTPConnection
         httplib_response = super().getresponse()
 
@@ -531,6 +595,7 @@ def getresponse(  # type: ignore[override]
             enforce_content_length=resp_options.enforce_content_length,
             request_method=resp_options.request_method,
             request_url=resp_options.request_url,
+            sock_shutdown=_shutdown,
         )
         return response
 
@@ -561,8 +626,9 @@ def __init__(
         timeout: _TYPE_TIMEOUT = _DEFAULT_TIMEOUT,
         source_address: tuple[str, int] | None = None,
         blocksize: int = 16384,
-        socket_options: None
-        | (connection._TYPE_SOCKET_OPTIONS) = HTTPConnection.default_socket_options,
+        socket_options: None | (
+            connection._TYPE_SOCKET_OPTIONS
+        ) = HTTPConnection.default_socket_options,
         proxy: Url | None = None,
         proxy_config: ProxyConfig | None = None,
         cert_reqs: int | str | None = None,
@@ -695,7 +761,7 @@ def connect(self) -> None:
             tls_in_tls = False
 
             # Do we need to establish a tunnel?
-            if self._tunnel_host is not None:
+            if self.proxy_is_tunneling:
                 # We're tunneling to an HTTPS origin so need to do TLS-in-TLS.
                 if self._tunnel_scheme == "https":
                     # _connect_tls_proxy will verify and assign proxy_is_verified
@@ -709,7 +775,7 @@ def connect(self) -> None:
 
                 self._tunnel()
                 # Override the host with the one we're requesting data from.
-                server_hostname = self._tunnel_host
+                server_hostname = typing.cast(str, self._tunnel_host)
 
             if self.server_hostname is not None:
                 server_hostname = self.server_hostname
diff --git a/libs/urllib3/connectionpool.py b/libs/urllib3/connectionpool.py
index a2c3cf6098..3a0685b4cd 100644
--- a/libs/urllib3/connectionpool.py
+++ b/libs/urllib3/connectionpool.py
@@ -170,9 +170,7 @@ class HTTPConnectionPool(ConnectionPool, RequestMethods):
     """
 
     scheme = "http"
-    ConnectionCls: (
-        type[BaseHTTPConnection] | type[BaseHTTPSConnection]
-    ) = HTTPConnection
+    ConnectionCls: type[BaseHTTPConnection] | type[BaseHTTPSConnection] = HTTPConnection
 
     def __init__(
         self,
@@ -544,13 +542,13 @@ def _make_request(
         response._pool = self  # type: ignore[attr-defined]
 
         log.debug(
-            '%s://%s:%s "%s %s HTTP/%s" %s %s',
+            '%s://%s:%s "%s %s %s" %s %s',
             self.scheme,
             self.host,
             self.port,
             method,
             url,
-            response.version,
+            response.version_string,
             response.status,
             response.length_remaining,
         )
@@ -1137,13 +1135,11 @@ def connection_from_url(url: str, **kw: typing.Any) -> HTTPConnectionPool:
 
 
 @typing.overload
-def _normalize_host(host: None, scheme: str | None) -> None:
-    ...
+def _normalize_host(host: None, scheme: str | None) -> None: ...
 
 
 @typing.overload
-def _normalize_host(host: str, scheme: str | None) -> str:
-    ...
+def _normalize_host(host: str, scheme: str | None) -> str: ...
 
 
 def _normalize_host(host: str | None, scheme: str | None) -> str | None:
diff --git a/libs/urllib3/contrib/emscripten/__init__.py b/libs/urllib3/contrib/emscripten/__init__.py
index 8a3c5bebdc..e5b62b25e9 100644
--- a/libs/urllib3/contrib/emscripten/__init__.py
+++ b/libs/urllib3/contrib/emscripten/__init__.py
@@ -14,3 +14,4 @@ def inject_into_urllib3() -> None:
     HTTPSConnectionPool.ConnectionCls = EmscriptenHTTPSConnection
     urllib3.connection.HTTPConnection = EmscriptenHTTPConnection  # type: ignore[misc,assignment]
     urllib3.connection.HTTPSConnection = EmscriptenHTTPSConnection  # type: ignore[misc,assignment]
+    urllib3.connection.VerifiedHTTPSConnection = EmscriptenHTTPSConnection  # type: ignore[assignment]
diff --git a/libs/urllib3/contrib/emscripten/connection.py b/libs/urllib3/contrib/emscripten/connection.py
index 2ceb4579eb..63f79dd3be 100644
--- a/libs/urllib3/contrib/emscripten/connection.py
+++ b/libs/urllib3/contrib/emscripten/connection.py
@@ -40,6 +40,7 @@ class EmscriptenHTTPConnection:
     is_verified: bool = False
     proxy_is_verified: bool | None = None
 
+    response_class: type[BaseHTTPResponse] = EmscriptenHttpResponseWrapper
     _response: EmscriptenResponse | None
 
     def __init__(
@@ -98,8 +99,12 @@ def request(
     ) -> None:
         self._closed = False
         if url.startswith("/"):
+            if self.port is not None:
+                port = f":{self.port}"
+            else:
+                port = ""
             # no scheme / host / port included, make a full url
-            url = f"{self.scheme}://{self.host}:{self.port}" + url
+            url = f"{self.scheme}://{self.host}{port}{url}"
         request = EmscriptenRequest(
             url=url,
             method=method,
@@ -182,8 +187,9 @@ def __init__(
         timeout: _TYPE_TIMEOUT = _DEFAULT_TIMEOUT,
         source_address: tuple[str, int] | None = None,
         blocksize: int = 16384,
-        socket_options: None
-        | _TYPE_SOCKET_OPTIONS = HTTPConnection.default_socket_options,
+        socket_options: (
+            None | _TYPE_SOCKET_OPTIONS
+        ) = HTTPConnection.default_socket_options,
         proxy: Url | None = None,
         proxy_config: ProxyConfig | None = None,
         cert_reqs: int | str | None = None,
diff --git a/libs/urllib3/contrib/emscripten/emscripten_fetch_worker.js b/libs/urllib3/contrib/emscripten/emscripten_fetch_worker.js
index 243b86222f..faf141e1fa 100644
--- a/libs/urllib3/contrib/emscripten/emscripten_fetch_worker.js
+++ b/libs/urllib3/contrib/emscripten/emscripten_fetch_worker.js
@@ -5,19 +5,19 @@ let Status = {
   ERROR_EXCEPTION: -4,
 };
 
-let connections = {};
+let connections = new Map();
 let nextConnectionID = 1;
 const encoder = new TextEncoder();
 
 self.addEventListener("message", async function (event) {
   if (event.data.close) {
     let connectionID = event.data.close;
-    delete connections[connectionID];
+    connections.delete(connectionID);
     return;
   } else if (event.data.getMore) {
     let connectionID = event.data.getMore;
     let { curOffset, value, reader, intBuffer, byteBuffer } =
-      connections[connectionID];
+      connections.get(connectionID);
     // if we still have some in buffer, then just send it back straight away
     if (!value || curOffset >= value.length) {
       // read another buffer if required
@@ -26,7 +26,7 @@ self.addEventListener("message", async function (event) {
 
         if (readResponse.done) {
           // read everything - clear connection and return
-          delete connections[connectionID];
+          connections.delete(connectionID);
           Atomics.store(intBuffer, 0, Status.SUCCESS_EOF);
           Atomics.notify(intBuffer, 0);
           // finished reading successfully
@@ -34,7 +34,7 @@ self.addEventListener("message", async function (event) {
           return;
         }
         curOffset = 0;
-        connections[connectionID].value = readResponse.value;
+        connections.get(connectionID).value = readResponse.value;
         value = readResponse.value;
       } catch (error) {
         console.log("Request exception:", error);
@@ -57,7 +57,7 @@ self.addEventListener("message", async function (event) {
     Atomics.store(intBuffer, 0, curLen); // store current length in bytes
     Atomics.notify(intBuffer, 0);
     curOffset += curLen;
-    connections[connectionID].curOffset = curOffset;
+    connections.get(connectionID).curOffset = curOffset;
 
     return;
   } else {
@@ -84,13 +84,13 @@ self.addEventListener("message", async function (event) {
       byteBuffer.set(headerBytes);
       intBuffer[1] = written;
       // make a connection
-      connections[connectionID] = {
+      connections.set(connectionID, {
         reader: response.body.getReader(),
         intBuffer: intBuffer,
         byteBuffer: byteBuffer,
         value: undefined,
         curOffset: 0,
-      };
+      });
       // set header ready
       Atomics.store(intBuffer, 0, Status.SUCCESS_HEADER);
       Atomics.notify(intBuffer, 0);
diff --git a/libs/urllib3/contrib/emscripten/fetch.py b/libs/urllib3/contrib/emscripten/fetch.py
index 8d197ea1ee..612cfddc4c 100644
--- a/libs/urllib3/contrib/emscripten/fetch.py
+++ b/libs/urllib3/contrib/emscripten/fetch.py
@@ -3,6 +3,16 @@
 
 A few caveats -
 
+If your browser (or Node.js) has WebAssembly JavaScript Promise Integration enabled
+https://github.com/WebAssembly/js-promise-integration/blob/main/proposals/js-promise-integration/Overview.md
+*and* you launch pyodide using `pyodide.runPythonAsync`, this will fetch data using the
+JavaScript asynchronous fetch api (wrapped via `pyodide.ffi.call_sync`). In this case
+timeouts and streaming should just work.
+
+Otherwise, it uses a combination of XMLHttpRequest and a web-worker for streaming.
+
+This approach has several caveats:
+
 Firstly, you can't do streaming http in the main UI thread, because atomics.wait isn't allowed.
 Streaming only works if you're running pyodide in a web worker.
 
@@ -14,15 +24,16 @@
     Cross-Origin-Embedder-Policy: require-corp
 
 You can tell if cross origin isolation is successfully enabled by looking at the global crossOriginIsolated variable in
-javascript console. If it isn't, streaming requests will fallback to XMLHttpRequest, i.e. getting the whole
-request into a buffer and then returning it. it shows a warning in the javascript console in this case.
+JavaScript console. If it isn't, streaming requests will fallback to XMLHttpRequest, i.e. getting the whole
+request into a buffer and then returning it. it shows a warning in the JavaScript console in this case.
 
 Finally, the webworker which does the streaming fetch is created on initial import, but will only be started once
 control is returned to javascript. Call `await wait_for_streaming_ready()` to wait for streaming fetch.
 
-NB: in this code, there are a lot of javascript objects. They are named js_*
+NB: in this code, there are a lot of JavaScript objects. They are named js_*
 to make it clear what type of object they are.
 """
+
 from __future__ import annotations
 
 import io
@@ -56,12 +67,6 @@
 ERROR_TIMEOUT = -3
 ERROR_EXCEPTION = -4
 
-_STREAMING_WORKER_CODE = (
-    files(__package__)
-    .joinpath("emscripten_fetch_worker.js")
-    .read_text(encoding="utf-8")
-)
-
 
 class _RequestError(Exception):
     def __init__(
@@ -123,17 +128,18 @@ def closed(self) -> bool:
         return self.is_closed()
 
     def close(self) -> None:
-        if not self.is_closed():
-            self.read_len = 0
-            self.read_pos = 0
-            self.int_buffer = None
-            self.byte_buffer = None
-            self._is_closed = True
-            self.request = None
-            if self.is_live:
-                self.worker.postMessage(_obj_from_dict({"close": self.connection_id}))
-                self.is_live = False
-            super().close()
+        if self.is_closed():
+            return
+        self.read_len = 0
+        self.read_pos = 0
+        self.int_buffer = None
+        self.byte_buffer = None
+        self._is_closed = True
+        self.request = None
+        if self.is_live:
+            self.worker.postMessage(_obj_from_dict({"close": self.connection_id}))
+            self.is_live = False
+        super().close()
 
     def readable(self) -> bool:
         return True
@@ -195,9 +201,14 @@ class _StreamingFetcher:
     def __init__(self) -> None:
         # make web-worker and data buffer on startup
         self.streaming_ready = False
-
+        streaming_worker_code = (
+            files(__package__)
+            .joinpath("emscripten_fetch_worker.js")
+            .read_text(encoding="utf-8")
+        )
         js_data_blob = js.Blob.new(
-            [_STREAMING_WORKER_CODE], _obj_from_dict({"type": "application/javascript"})
+            to_js([streaming_worker_code], create_pyproxies=False),
+            _obj_from_dict({"type": "application/javascript"}),
         )
 
         def promise_resolver(js_resolve_fn: JsProxy, js_reject_fn: JsProxy) -> None:
@@ -288,6 +299,113 @@ def send(self, request: EmscriptenRequest) -> EmscriptenResponse:
             )
 
 
+class _JSPIReadStream(io.RawIOBase):
+    """
+    A read stream that uses pyodide.ffi.run_sync to read from a JavaScript fetch
+    response. This requires support for WebAssembly JavaScript Promise Integration
+    in the containing browser, and for pyodide to be launched via runPythonAsync.
+
+    :param js_read_stream:
+        The JavaScript stream reader
+
+    :param timeout:
+        Timeout in seconds
+
+    :param request:
+        The request we're handling
+
+    :param response:
+        The response this stream relates to
+
+    :param js_abort_controller:
+        A JavaScript AbortController object, used for timeouts
+    """
+
+    def __init__(
+        self,
+        js_read_stream: Any,
+        timeout: float,
+        request: EmscriptenRequest,
+        response: EmscriptenResponse,
+        js_abort_controller: Any,  # JavaScript AbortController for timeouts
+    ):
+        self.js_read_stream = js_read_stream
+        self.timeout = timeout
+        self._is_closed = False
+        self._is_done = False
+        self.request: EmscriptenRequest | None = request
+        self.response: EmscriptenResponse | None = response
+        self.current_buffer = None
+        self.current_buffer_pos = 0
+        self.js_abort_controller = js_abort_controller
+
+    def __del__(self) -> None:
+        self.close()
+
+    # this is compatible with _base_connection
+    def is_closed(self) -> bool:
+        return self._is_closed
+
+    # for compatibility with RawIOBase
+    @property
+    def closed(self) -> bool:
+        return self.is_closed()
+
+    def close(self) -> None:
+        if self.is_closed():
+            return
+        self.read_len = 0
+        self.read_pos = 0
+        self.js_read_stream.cancel()
+        self.js_read_stream = None
+        self._is_closed = True
+        self._is_done = True
+        self.request = None
+        self.response = None
+        super().close()
+
+    def readable(self) -> bool:
+        return True
+
+    def writable(self) -> bool:
+        return False
+
+    def seekable(self) -> bool:
+        return False
+
+    def _get_next_buffer(self) -> bool:
+        result_js = _run_sync_with_timeout(
+            self.js_read_stream.read(),
+            self.timeout,
+            self.js_abort_controller,
+            request=self.request,
+            response=self.response,
+        )
+        if result_js.done:
+            self._is_done = True
+            return False
+        else:
+            self.current_buffer = result_js.value.to_py()
+            self.current_buffer_pos = 0
+            return True
+
+    def readinto(self, byte_obj: Buffer) -> int:
+        if self.current_buffer is None:
+            if not self._get_next_buffer() or self.current_buffer is None:
+                self.close()
+                return 0
+        ret_length = min(
+            len(byte_obj), len(self.current_buffer) - self.current_buffer_pos
+        )
+        byte_obj[0:ret_length] = self.current_buffer[
+            self.current_buffer_pos : self.current_buffer_pos + ret_length
+        ]
+        self.current_buffer_pos += ret_length
+        if self.current_buffer_pos == len(self.current_buffer):
+            self.current_buffer = None
+        return ret_length
+
+
 # check if we are in a worker or not
 def is_in_browser_main_thread() -> bool:
     return hasattr(js, "window") and hasattr(js, "self") and js.self == js.window
@@ -321,7 +439,23 @@ def is_worker_available() -> bool:
     _fetcher = None
 
 
+NODE_JSPI_ERROR = (
+    "urllib3 only works in Node.js with pyodide.runPythonAsync"
+    " and requires the flag --experimental-wasm-stack-switching in "
+    " versions of node <24."
+)
+
+
 def send_streaming_request(request: EmscriptenRequest) -> EmscriptenResponse | None:
+    if has_jspi():
+        return send_jspi_request(request, True)
+    elif is_in_node():
+        raise _RequestError(
+            message=NODE_JSPI_ERROR,
+            request=request,
+            response=None,
+        )
+
     if _fetcher and streaming_ready():
         return _fetcher.send(request)
     else:
@@ -363,6 +497,14 @@ def _show_streaming_warning() -> None:
 
 
 def send_request(request: EmscriptenRequest) -> EmscriptenResponse:
+    if has_jspi():
+        return send_jspi_request(request, False)
+    elif is_in_node():
+        raise _RequestError(
+            message=NODE_JSPI_ERROR,
+            request=request,
+            response=None,
+        )
     try:
         js_xhr = js.XMLHttpRequest.new()
 
@@ -403,6 +545,172 @@ def send_request(request: EmscriptenRequest) -> EmscriptenResponse:
             raise _RequestError(err.message, request=request)
 
 
+def send_jspi_request(
+    request: EmscriptenRequest, streaming: bool
+) -> EmscriptenResponse:
+    """
+    Send a request using WebAssembly JavaScript Promise Integration
+    to wrap the asynchronous JavaScript fetch api (experimental).
+
+    :param request:
+        Request to send
+
+    :param streaming:
+        Whether to stream the response
+
+    :return: The response object
+    :rtype: EmscriptenResponse
+    """
+    timeout = request.timeout
+    js_abort_controller = js.AbortController.new()
+    headers = {k: v for k, v in request.headers.items() if k not in HEADERS_TO_IGNORE}
+    req_body = request.body
+    fetch_data = {
+        "headers": headers,
+        "body": to_js(req_body),
+        "method": request.method,
+        "signal": js_abort_controller.signal,
+    }
+    # Node.js returns the whole response (unlike opaqueredirect in browsers),
+    # so urllib3 can set `redirect: manual` to control redirects itself.
+    # https://stackoverflow.com/a/78524615
+    if _is_node_js():
+        fetch_data["redirect"] = "manual"
+    # Call JavaScript fetch (async api, returns a promise)
+    fetcher_promise_js = js.fetch(request.url, _obj_from_dict(fetch_data))
+    # Now suspend WebAssembly until we resolve that promise
+    # or time out.
+    response_js = _run_sync_with_timeout(
+        fetcher_promise_js,
+        timeout,
+        js_abort_controller,
+        request=request,
+        response=None,
+    )
+    headers = {}
+    header_iter = response_js.headers.entries()
+    while True:
+        iter_value_js = header_iter.next()
+        if getattr(iter_value_js, "done", False):
+            break
+        else:
+            headers[str(iter_value_js.value[0])] = str(iter_value_js.value[1])
+    status_code = response_js.status
+    body: bytes | io.RawIOBase = b""
+
+    response = EmscriptenResponse(
+        status_code=status_code, headers=headers, body=b"", request=request
+    )
+    if streaming:
+        # get via inputstream
+        if response_js.body is not None:
+            # get a reader from the fetch response
+            body_stream_js = response_js.body.getReader()
+            body = _JSPIReadStream(
+                body_stream_js, timeout, request, response, js_abort_controller
+            )
+    else:
+        # get directly via arraybuffer
+        # n.b. this is another async JavaScript call.
+        body = _run_sync_with_timeout(
+            response_js.arrayBuffer(),
+            timeout,
+            js_abort_controller,
+            request=request,
+            response=response,
+        ).to_py()
+    response.body = body
+    return response
+
+
+def _run_sync_with_timeout(
+    promise: Any,
+    timeout: float,
+    js_abort_controller: Any,
+    request: EmscriptenRequest | None,
+    response: EmscriptenResponse | None,
+) -> Any:
+    """
+    Await a JavaScript promise synchronously with a timeout which is implemented
+    via the AbortController
+
+    :param promise:
+        Javascript promise to await
+
+    :param timeout:
+        Timeout in seconds
+
+    :param js_abort_controller:
+        A JavaScript AbortController object, used on timeout
+
+    :param request:
+        The request being handled
+
+    :param response:
+        The response being handled (if it exists yet)
+
+    :raises _TimeoutError: If the request times out
+    :raises _RequestError: If the request raises a JavaScript exception
+
+    :return: The result of awaiting the promise.
+    """
+    timer_id = None
+    if timeout > 0:
+        timer_id = js.setTimeout(
+            js_abort_controller.abort.bind(js_abort_controller), int(timeout * 1000)
+        )
+    try:
+        from pyodide.ffi import run_sync
+
+        # run_sync here uses WebAssembly JavaScript Promise Integration to
+        # suspend python until the JavaScript promise resolves.
+        return run_sync(promise)
+    except JsException as err:
+        if err.name == "AbortError":
+            raise _TimeoutError(
+                message="Request timed out", request=request, response=response
+            )
+        else:
+            raise _RequestError(message=err.message, request=request, response=response)
+    finally:
+        if timer_id is not None:
+            js.clearTimeout(timer_id)
+
+
+def has_jspi() -> bool:
+    """
+    Return true if jspi can be used.
+
+    This requires both browser support and also WebAssembly
+    to be in the correct state - i.e. that the javascript
+    call into python was async not sync.
+
+    :return: True if jspi can be used.
+    :rtype: bool
+    """
+    try:
+        from pyodide.ffi import can_run_sync, run_sync  # noqa: F401
+
+        return bool(can_run_sync())
+    except ImportError:
+        return False
+
+
+def _is_node_js() -> bool:
+    """
+    Check if we are in Node.js.
+
+    :return: True if we are in Node.js.
+    :rtype: bool
+    """
+    return (
+        hasattr(js, "process")
+        and hasattr(js.process, "release")
+        # According to the Node.js documentation, the release name is always "node".
+        and js.process.release.name == "node"
+    )
+
+
 def streaming_ready() -> bool | None:
     if _fetcher:
         return _fetcher.streaming_ready
diff --git a/libs/urllib3/contrib/emscripten/response.py b/libs/urllib3/contrib/emscripten/response.py
index cd3d80e430..cb1088a182 100644
--- a/libs/urllib3/contrib/emscripten/response.py
+++ b/libs/urllib3/contrib/emscripten/response.py
@@ -75,7 +75,7 @@ def retries(self, retries: Retry | None) -> None:
 
     def stream(
         self, amt: int | None = 2**16, decode_content: bool | None = None
-    ) -> typing.Generator[bytes, None, None]:
+    ) -> typing.Generator[bytes]:
         """
         A generator wrapper for the read() method. A call will block until
         ``amt`` bytes have been read from the connection or until the
@@ -160,32 +160,24 @@ def read(
                 # don't cache partial content
                 cache_content = False
                 data = self._response.body.read(amt)
-                if self.length_remaining is not None:
-                    self.length_remaining = max(self.length_remaining - len(data), 0)
-                if (self.length_is_certain and self.length_remaining == 0) or len(
-                    data
-                ) < amt:
-                    # definitely finished reading, close response stream
-                    self._response.body.close()
-                return typing.cast(bytes, data)
             else:  # read all we can (and cache it)
                 data = self._response.body.read()
                 if cache_content:
                     self._body = data
-                if self.length_remaining is not None:
-                    self.length_remaining = max(self.length_remaining - len(data), 0)
-                if len(data) == 0 or (
-                    self.length_is_certain and self.length_remaining == 0
-                ):
-                    # definitely finished reading, close response stream
-                    self._response.body.close()
-                return typing.cast(bytes, data)
+            if self.length_remaining is not None:
+                self.length_remaining = max(self.length_remaining - len(data), 0)
+            if len(data) == 0 or (
+                self.length_is_certain and self.length_remaining == 0
+            ):
+                # definitely finished reading, close response stream
+                self._response.body.close()
+            return typing.cast(bytes, data)
 
     def read_chunked(
         self,
         amt: int | None = None,
         decode_content: bool | None = None,
-    ) -> typing.Generator[bytes, None, None]:
+    ) -> typing.Generator[bytes]:
         # chunked is handled by browser
         while True:
             bytes = self.read(amt, decode_content)
@@ -241,7 +233,7 @@ def close(self) -> None:
             self._closed = True
 
     @contextmanager
-    def _error_catcher(self) -> typing.Generator[None, None, None]:
+    def _error_catcher(self) -> typing.Generator[None]:
         """
         Catch Emscripten specific exceptions thrown by fetch.py,
         instead re-raising urllib3 variants, so that low-level exceptions
diff --git a/libs/urllib3/contrib/pyopenssl.py b/libs/urllib3/contrib/pyopenssl.py
index c12cb3174d..8e05d3d785 100644
--- a/libs/urllib3/contrib/pyopenssl.py
+++ b/libs/urllib3/contrib/pyopenssl.py
@@ -40,7 +40,7 @@
 
 from __future__ import annotations
 
-import OpenSSL.SSL  # type: ignore[import-untyped]
+import OpenSSL.SSL  # type: ignore[import-not-found]
 from cryptography import x509
 
 try:
@@ -61,7 +61,7 @@ class UnsupportedExtension(Exception):  # type: ignore[no-redef]
 from .. import util
 
 if typing.TYPE_CHECKING:
-    from OpenSSL.crypto import X509  # type: ignore[import-untyped]
+    from OpenSSL.crypto import X509  # type: ignore[import-not-found]
 
 
 __all__ = ["inject_into_urllib3", "extract_from_urllib3"]
@@ -366,9 +366,11 @@ def sendall(self, data: bytes) -> None:
             )
             total_sent += sent
 
-    def shutdown(self) -> None:
-        # FIXME rethrow compatible exceptions should we ever use this
-        self.connection.shutdown()
+    def shutdown(self, how: int) -> None:
+        try:
+            self.connection.shutdown()
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError(f"shutdown error: {e!r}") from e
 
     def close(self) -> None:
         self._closed = True
@@ -422,6 +424,7 @@ def __init__(self, protocol: int) -> None:
         self.check_hostname = False
         self._minimum_version: int = ssl.TLSVersion.MINIMUM_SUPPORTED
         self._maximum_version: int = ssl.TLSVersion.MAXIMUM_SUPPORTED
+        self._verify_flags: int = ssl.VERIFY_X509_TRUSTED_FIRST
 
     @property
     def options(self) -> int:
@@ -432,6 +435,15 @@ def options(self, value: int) -> None:
         self._options = value
         self._set_ctx_options()
 
+    @property
+    def verify_flags(self) -> int:
+        return self._verify_flags
+
+    @verify_flags.setter
+    def verify_flags(self, value: int) -> None:
+        self._verify_flags = value
+        self._ctx.get_cert_store().set_flags(self._verify_flags)
+
     @property
     def verify_mode(self) -> int:
         return _openssl_to_stdlib_verify[self._ctx.get_verify_mode()]
diff --git a/libs/urllib3/contrib/socks.py b/libs/urllib3/contrib/socks.py
index c62b5e0332..e3239b569d 100644
--- a/libs/urllib3/contrib/socks.py
+++ b/libs/urllib3/contrib/socks.py
@@ -41,7 +41,7 @@
 from __future__ import annotations
 
 try:
-    import socks  # type: ignore[import-not-found]
+    import socks  # type: ignore[import-untyped]
 except ImportError:
     import warnings
 
diff --git a/libs/urllib3/exceptions.py b/libs/urllib3/exceptions.py
index b0792f00fd..58723faeb0 100644
--- a/libs/urllib3/exceptions.py
+++ b/libs/urllib3/exceptions.py
@@ -23,9 +23,7 @@ class HTTPWarning(Warning):
     """Base warning used by this module."""
 
 
-_TYPE_REDUCE_RESULT = typing.Tuple[
-    typing.Callable[..., object], typing.Tuple[object, ...]
-]
+_TYPE_REDUCE_RESULT = tuple[typing.Callable[..., object], tuple[object, ...]]
 
 
 class PoolError(HTTPError):
@@ -33,23 +31,24 @@ class PoolError(HTTPError):
 
     def __init__(self, pool: ConnectionPool, message: str) -> None:
         self.pool = pool
+        self._message = message
         super().__init__(f"{pool}: {message}")
 
     def __reduce__(self) -> _TYPE_REDUCE_RESULT:
         # For pickling purposes.
-        return self.__class__, (None, None)
+        return self.__class__, (None, self._message)
 
 
 class RequestError(PoolError):
     """Base exception for PoolErrors that have associated URLs."""
 
-    def __init__(self, pool: ConnectionPool, url: str, message: str) -> None:
+    def __init__(self, pool: ConnectionPool, url: str | None, message: str) -> None:
         self.url = url
         super().__init__(pool, message)
 
     def __reduce__(self) -> _TYPE_REDUCE_RESULT:
         # For pickling purposes.
-        return self.__class__, (None, self.url, None)
+        return self.__class__, (None, self.url, self._message)
 
 
 class SSLError(HTTPError):
@@ -94,7 +93,7 @@ class MaxRetryError(RequestError):
     """
 
     def __init__(
-        self, pool: ConnectionPool, url: str, reason: Exception | None = None
+        self, pool: ConnectionPool, url: str | None, reason: Exception | None = None
     ) -> None:
         self.reason = reason
 
@@ -102,6 +101,10 @@ def __init__(
 
         super().__init__(pool, url, message)
 
+    def __reduce__(self) -> _TYPE_REDUCE_RESULT:
+        # For pickling purposes.
+        return self.__class__, (None, self.url, self.reason)
+
 
 class HostChangedError(RequestError):
     """Raised when an existing pool gets a request for a foreign host."""
@@ -141,8 +144,13 @@ class NewConnectionError(ConnectTimeoutError, HTTPError):
 
     def __init__(self, conn: HTTPConnection, message: str) -> None:
         self.conn = conn
+        self._message = message
         super().__init__(f"{conn}: {message}")
 
+    def __reduce__(self) -> _TYPE_REDUCE_RESULT:
+        # For pickling purposes.
+        return self.__class__, (None, self._message)
+
     @property
     def pool(self) -> HTTPConnection:
         warnings.warn(
@@ -160,8 +168,14 @@ class NameResolutionError(NewConnectionError):
 
     def __init__(self, host: str, conn: HTTPConnection, reason: socket.gaierror):
         message = f"Failed to resolve '{host}' ({reason})"
+        self._host = host
+        self._reason = reason
         super().__init__(conn, message)
 
+    def __reduce__(self) -> _TYPE_REDUCE_RESULT:
+        # For pickling purposes.
+        return self.__class__, (self._host, None, self._reason)
+
 
 class EmptyPoolError(PoolError):
     """Raised when a pool runs out of connections and no more are allowed."""
diff --git a/libs/urllib3/fields.py b/libs/urllib3/fields.py
index 3e258a5d8b..97c4730cff 100644
--- a/libs/urllib3/fields.py
+++ b/libs/urllib3/fields.py
@@ -7,8 +7,8 @@
 _TYPE_FIELD_VALUE = typing.Union[str, bytes]
 _TYPE_FIELD_VALUE_TUPLE = typing.Union[
     _TYPE_FIELD_VALUE,
-    typing.Tuple[str, _TYPE_FIELD_VALUE],
-    typing.Tuple[str, _TYPE_FIELD_VALUE, str],
+    tuple[str, _TYPE_FIELD_VALUE],
+    tuple[str, _TYPE_FIELD_VALUE, str],
 ]
 
 
diff --git a/libs/urllib3/filepost.py b/libs/urllib3/filepost.py
index 1c90a211fb..14f70b05b4 100644
--- a/libs/urllib3/filepost.py
+++ b/libs/urllib3/filepost.py
@@ -11,7 +11,7 @@
 writer = codecs.lookup("utf-8")[3]
 
 _TYPE_FIELDS_SEQUENCE = typing.Sequence[
-    typing.Union[typing.Tuple[str, _TYPE_FIELD_VALUE_TUPLE], RequestField]
+    typing.Union[tuple[str, _TYPE_FIELD_VALUE_TUPLE], RequestField]
 ]
 _TYPE_FIELDS = typing.Union[
     _TYPE_FIELDS_SEQUENCE,
diff --git a/libs/urllib3/http2/connection.py b/libs/urllib3/http2/connection.py
index f486145280..0a026da0a8 100644
--- a/libs/urllib3/http2/connection.py
+++ b/libs/urllib3/http2/connection.py
@@ -6,9 +6,9 @@
 import types
 import typing
 
-import h2.config  # type: ignore[import-untyped]
-import h2.connection  # type: ignore[import-untyped]
-import h2.events  # type: ignore[import-untyped]
+import h2.config
+import h2.connection
+import h2.events
 
 from .._base_connection import _TYPE_BODY
 from .._collections import HTTPHeaderDict
@@ -140,7 +140,7 @@ def putrequest(  # type: ignore[override]
         with self._h2_conn as conn:
             self._h2_stream = conn.get_next_available_stream_id()
 
-    def putheader(self, header: str | bytes, *values: str | bytes) -> None:
+    def putheader(self, header: str | bytes, *values: str | bytes) -> None:  # type: ignore[override]
         # TODO SKIPPABLE_HEADERS from urllib3 are ignored.
         header = header.encode() if isinstance(header, str) else header
         header = header.lower()  # A lot of upstream code uses capitalized headers.
@@ -185,7 +185,7 @@ def send(self, data: typing.Any) -> None:
                     if not chunk:
                         break
                     if isinstance(chunk, str):
-                        chunk = chunk.encode()  # pragma: no cover
+                        chunk = chunk.encode()
                     conn.send_data(self._h2_stream, chunk, end_stream=False)
                     if data_to_send := conn.data_to_send():
                         self.sock.sendall(data_to_send)
diff --git a/libs/urllib3/poolmanager.py b/libs/urllib3/poolmanager.py
index 085d1dbafd..28ec82f016 100644
--- a/libs/urllib3/poolmanager.py
+++ b/libs/urllib3/poolmanager.py
@@ -203,6 +203,20 @@ def __init__(
         **connection_pool_kw: typing.Any,
     ) -> None:
         super().__init__(headers)
+        # PoolManager handles redirects itself in PoolManager.urlopen().
+        # It always passes redirect=False to the underlying connection pool to
+        # suppress per-pool redirect handling. If the user supplied a non-Retry
+        # value (int/bool/etc) for retries and we let the pool normalize it
+        # while redirect=False, the resulting Retry object would have redirect
+        # handling disabled, which can interfere with PoolManager's own
+        # redirect logic. Normalize here so redirects remain governed solely by
+        # PoolManager logic.
+        if "retries" in connection_pool_kw:
+            retries = connection_pool_kw["retries"]
+            if not isinstance(retries, Retry):
+                retries = Retry.from_int(retries)
+                connection_pool_kw = connection_pool_kw.copy()
+                connection_pool_kw["retries"] = retries
         self.connection_pool_kw = connection_pool_kw
 
         self.pools: RecentlyUsedContainer[PoolKey, HTTPConnectionPool]
@@ -456,7 +470,7 @@ def urlopen(  # type: ignore[override]
             kw["body"] = None
             kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
 
-        retries = kw.get("retries")
+        retries = kw.get("retries", response.retries)
         if not isinstance(retries, Retry):
             retries = Retry.from_int(retries, redirect=redirect)
 
diff --git a/libs/urllib3/response.py b/libs/urllib3/response.py
index a0273d65b0..ff6d1f4911 100644
--- a/libs/urllib3/response.py
+++ b/libs/urllib3/response.py
@@ -4,7 +4,7 @@
 import io
 import json as _json
 import logging
-import re
+import socket
 import sys
 import typing
 import warnings
@@ -25,23 +25,6 @@
 except ImportError:
     brotli = None
 
-try:
-    import zstandard as zstd
-except (AttributeError, ImportError, ValueError):  # Defensive:
-    HAS_ZSTD = False
-else:
-    # The package 'zstandard' added the 'eof' property starting
-    # in v0.18.0 which we require to ensure a complete and
-    # valid zstd stream was fed into the ZstdDecoder.
-    # See: https://github.com/urllib3/urllib3/pull/2624
-    _zstd_version = tuple(
-        map(int, re.search(r"^([0-9]+)\.([0-9]+)", zstd.__version__).groups())  # type: ignore[union-attr]
-    )
-    if _zstd_version < (0, 18):  # Defensive:
-        HAS_ZSTD = False
-    else:
-        HAS_ZSTD = True
-
 from . import util
 from ._base_connection import _TYPE_BODY
 from ._collections import HTTPHeaderDict
@@ -49,6 +32,7 @@
 from .exceptions import (
     BodyNotHttplibCompatible,
     DecodeError,
+    DependencyWarning,
     HTTPError,
     IncompleteRead,
     InvalidChunkLength,
@@ -68,7 +52,11 @@
 
 
 class ContentDecoder:
-    def decompress(self, data: bytes) -> bytes:
+    def decompress(self, data: bytes, max_length: int = -1) -> bytes:
+        raise NotImplementedError()
+
+    @property
+    def has_unconsumed_tail(self) -> bool:
         raise NotImplementedError()
 
     def flush(self) -> bytes:
@@ -78,30 +66,57 @@ def flush(self) -> bytes:
 class DeflateDecoder(ContentDecoder):
     def __init__(self) -> None:
         self._first_try = True
-        self._data = b""
+        self._first_try_data = b""
+        self._unfed_data = b""
         self._obj = zlib.decompressobj()
 
-    def decompress(self, data: bytes) -> bytes:
-        if not data:
+    def decompress(self, data: bytes, max_length: int = -1) -> bytes:
+        data = self._unfed_data + data
+        self._unfed_data = b""
+        if not data and not self._obj.unconsumed_tail:
             return data
+        original_max_length = max_length
+        if original_max_length < 0:
+            max_length = 0
+        elif original_max_length == 0:
+            # We should not pass 0 to the zlib decompressor because 0 is
+            # the default value that will make zlib decompress without a
+            # length limit.
+            # Data should be stored for subsequent calls.
+            self._unfed_data = data
+            return b""
 
+        # Subsequent calls always reuse `self._obj`. zlib requires
+        # passing the unconsumed tail if decompression is to continue.
         if not self._first_try:
-            return self._obj.decompress(data)
+            return self._obj.decompress(
+                self._obj.unconsumed_tail + data, max_length=max_length
+            )
 
-        self._data += data
+        # First call tries with RFC 1950 ZLIB format.
+        self._first_try_data += data
         try:
-            decompressed = self._obj.decompress(data)
+            decompressed = self._obj.decompress(data, max_length=max_length)
             if decompressed:
                 self._first_try = False
-                self._data = None  # type: ignore[assignment]
+                self._first_try_data = b""
             return decompressed
+        # On failure, it falls back to RFC 1951 DEFLATE format.
         except zlib.error:
             self._first_try = False
             self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
             try:
-                return self.decompress(self._data)
+                return self.decompress(
+                    self._first_try_data, max_length=original_max_length
+                )
             finally:
-                self._data = None  # type: ignore[assignment]
+                self._first_try_data = b""
+
+    @property
+    def has_unconsumed_tail(self) -> bool:
+        return bool(self._unfed_data) or (
+            bool(self._obj.unconsumed_tail) and not self._first_try
+        )
 
     def flush(self) -> bytes:
         return self._obj.flush()
@@ -117,27 +132,61 @@ class GzipDecoder(ContentDecoder):
     def __init__(self) -> None:
         self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS)
         self._state = GzipDecoderState.FIRST_MEMBER
+        self._unconsumed_tail = b""
 
-    def decompress(self, data: bytes) -> bytes:
+    def decompress(self, data: bytes, max_length: int = -1) -> bytes:
         ret = bytearray()
-        if self._state == GzipDecoderState.SWALLOW_DATA or not data:
+        if self._state == GzipDecoderState.SWALLOW_DATA:
+            return bytes(ret)
+
+        if max_length == 0:
+            # We should not pass 0 to the zlib decompressor because 0 is
+            # the default value that will make zlib decompress without a
+            # length limit.
+            # Data should be stored for subsequent calls.
+            self._unconsumed_tail += data
+            return b""
+
+        # zlib requires passing the unconsumed tail to the subsequent
+        # call if decompression is to continue.
+        data = self._unconsumed_tail + data
+        if not data and self._obj.eof:
             return bytes(ret)
+
         while True:
             try:
-                ret += self._obj.decompress(data)
+                ret += self._obj.decompress(
+                    data, max_length=max(max_length - len(ret), 0)
+                )
             except zlib.error:
                 previous_state = self._state
                 # Ignore data after the first error
                 self._state = GzipDecoderState.SWALLOW_DATA
+                self._unconsumed_tail = b""
                 if previous_state == GzipDecoderState.OTHER_MEMBERS:
                     # Allow trailing garbage acceptable in other gzip clients
                     return bytes(ret)
                 raise
-            data = self._obj.unused_data
+
+            self._unconsumed_tail = data = (
+                self._obj.unconsumed_tail or self._obj.unused_data
+            )
+            if max_length > 0 and len(ret) >= max_length:
+                break
+
             if not data:
                 return bytes(ret)
-            self._state = GzipDecoderState.OTHER_MEMBERS
-            self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS)
+            # When the end of a gzip member is reached, a new decompressor
+            # must be created for unused (possibly future) data.
+            if self._obj.eof:
+                self._state = GzipDecoderState.OTHER_MEMBERS
+                self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS)
+
+        return bytes(ret)
+
+    @property
+    def has_unconsumed_tail(self) -> bool:
+        return bool(self._unconsumed_tail)
 
     def flush(self) -> bytes:
         return self._obj.flush()
@@ -152,9 +201,35 @@ class BrotliDecoder(ContentDecoder):
         def __init__(self) -> None:
             self._obj = brotli.Decompressor()
             if hasattr(self._obj, "decompress"):
-                setattr(self, "decompress", self._obj.decompress)
+                setattr(self, "_decompress", self._obj.decompress)
             else:
-                setattr(self, "decompress", self._obj.process)
+                setattr(self, "_decompress", self._obj.process)
+
+        # Requires Brotli >= 1.2.0 for `output_buffer_limit`.
+        def _decompress(self, data: bytes, output_buffer_limit: int = -1) -> bytes:
+            raise NotImplementedError()
+
+        def decompress(self, data: bytes, max_length: int = -1) -> bytes:
+            try:
+                if max_length > 0:
+                    return self._decompress(data, output_buffer_limit=max_length)
+                else:
+                    return self._decompress(data)
+            except TypeError:
+                # Fallback for Brotli/brotlicffi/brotlipy versions without
+                # the `output_buffer_limit` parameter.
+                warnings.warn(
+                    "Brotli >= 1.2.0 is required to prevent decompression bombs.",
+                    DependencyWarning,
+                )
+                return self._decompress(data)
+
+        @property
+        def has_unconsumed_tail(self) -> bool:
+            try:
+                return not self._obj.can_accept_more_data()
+            except AttributeError:
+                return False
 
         def flush(self) -> bytes:
             if hasattr(self._obj, "flush"):
@@ -162,27 +237,64 @@ def flush(self) -> bytes:
             return b""
 
 
-if HAS_ZSTD:
+try:
+    if sys.version_info >= (3, 14):
+        from compression import zstd
+    else:
+        from backports import zstd
+except ImportError:
+    HAS_ZSTD = False
+else:
+    HAS_ZSTD = True
 
     class ZstdDecoder(ContentDecoder):
         def __init__(self) -> None:
-            self._obj = zstd.ZstdDecompressor().decompressobj()
+            self._obj = zstd.ZstdDecompressor()
 
-        def decompress(self, data: bytes) -> bytes:
-            if not data:
+        def decompress(self, data: bytes, max_length: int = -1) -> bytes:
+            if not data and not self.has_unconsumed_tail:
                 return b""
-            data_parts = [self._obj.decompress(data)]
-            while self._obj.eof and self._obj.unused_data:
+            if self._obj.eof:
+                data = self._obj.unused_data + data
+                self._obj = zstd.ZstdDecompressor()
+            part = self._obj.decompress(data, max_length=max_length)
+            length = len(part)
+            data_parts = [part]
+            # Every loop iteration is supposed to read data from a separate frame.
+            # The loop breaks when:
+            #   - enough data is read;
+            #   - no more unused data is available;
+            #   - end of the last read frame has not been reached (i.e.,
+            #     more data has to be fed).
+            while (
+                self._obj.eof
+                and self._obj.unused_data
+                and (max_length < 0 or length < max_length)
+            ):
                 unused_data = self._obj.unused_data
-                self._obj = zstd.ZstdDecompressor().decompressobj()
-                data_parts.append(self._obj.decompress(unused_data))
+                if not self._obj.needs_input:
+                    self._obj = zstd.ZstdDecompressor()
+                part = self._obj.decompress(
+                    unused_data,
+                    max_length=(max_length - length) if max_length > 0 else -1,
+                )
+                if part_length := len(part):
+                    data_parts.append(part)
+                    length += part_length
+                elif self._obj.needs_input:
+                    break
             return b"".join(data_parts)
 
+        @property
+        def has_unconsumed_tail(self) -> bool:
+            return not (self._obj.needs_input or self._obj.eof) or bool(
+                self._obj.unused_data
+            )
+
         def flush(self) -> bytes:
-            ret = self._obj.flush()  # note: this is a no-op
             if not self._obj.eof:
                 raise DecodeError("Zstandard data is incomplete")
-            return ret
+            return b""
 
 
 class MultiDecoder(ContentDecoder):
@@ -194,16 +306,51 @@ class MultiDecoder(ContentDecoder):
         they were applied.
     """
 
+    # Maximum allowed number of chained HTTP encodings in the
+    # Content-Encoding header.
+    max_decode_links = 5
+
     def __init__(self, modes: str) -> None:
-        self._decoders = [_get_decoder(m.strip()) for m in modes.split(",")]
+        encodings = [m.strip() for m in modes.split(",")]
+        if len(encodings) > self.max_decode_links:
+            raise DecodeError(
+                "Too many content encodings in the chain: "
+                f"{len(encodings)} > {self.max_decode_links}"
+            )
+        self._decoders = [_get_decoder(e) for e in encodings]
 
     def flush(self) -> bytes:
         return self._decoders[0].flush()
 
-    def decompress(self, data: bytes) -> bytes:
-        for d in reversed(self._decoders):
-            data = d.decompress(data)
-        return data
+    def decompress(self, data: bytes, max_length: int = -1) -> bytes:
+        if max_length <= 0:
+            for d in reversed(self._decoders):
+                data = d.decompress(data)
+            return data
+
+        ret = bytearray()
+        # Every while loop iteration goes through all decoders once.
+        # It exits when enough data is read or no more data can be read.
+        # It is possible that the while loop iteration does not produce
+        # any data because we retrieve up to `max_length` from every
+        # decoder, and the amount of bytes may be insufficient for the
+        # next decoder to produce enough/any output.
+        while True:
+            any_data = False
+            for d in reversed(self._decoders):
+                data = d.decompress(data, max_length=max_length - len(ret))
+                if data:
+                    any_data = True
+                # We should not break when no data is returned because
+                # next decoders may produce data even with empty input.
+            ret += data
+            if not any_data or len(ret) >= max_length:
+                return bytes(ret)
+            data = b""
+
+    @property
+    def has_unconsumed_tail(self) -> bool:
+        return any(d.has_unconsumed_tail for d in self._decoders)
 
 
 def _get_decoder(mode: str) -> ContentDecoder:
@@ -236,13 +383,10 @@ class BytesQueueBuffer:
 
      * self.buffer, which contains the full data
      * the largest chunk that we will copy in get()
-
-    The worst case scenario is a single chunk, in which case we'll make a full copy of
-    the data inside get().
     """
 
     def __init__(self) -> None:
-        self.buffer: typing.Deque[bytes] = collections.deque()
+        self.buffer: typing.Deque[bytes | memoryview[bytes]] = collections.deque()
         self._size: int = 0
 
     def __len__(self) -> int:
@@ -260,6 +404,10 @@ def get(self, n: int) -> bytes:
         elif n < 0:
             raise ValueError("n should be > 0")
 
+        if len(self.buffer[0]) == n and isinstance(self.buffer[0], bytes):
+            self._size -= n
+            return self.buffer.popleft()
+
         fetched = 0
         ret = io.BytesIO()
         while fetched < n:
@@ -267,6 +415,7 @@ def get(self, n: int) -> bytes:
             chunk = self.buffer.popleft()
             chunk_length = len(chunk)
             if remaining < chunk_length:
+                chunk = memoryview(chunk)
                 left_chunk, right_chunk = chunk[:remaining], chunk[remaining:]
                 ret.write(left_chunk)
                 self.buffer.appendleft(right_chunk)
@@ -289,6 +438,8 @@ def get_all(self) -> bytes:
             return b""
         if len(buffer) == 1:
             result = buffer.pop()
+            if isinstance(result, memoryview):
+                result = result.tobytes()
         else:
             ret = io.BytesIO()
             ret.writelines(buffer.popleft() for _ in range(len(buffer)))
@@ -440,6 +591,9 @@ def release_conn(self) -> None:
     def drain_conn(self) -> None:
         raise NotImplementedError()
 
+    def shutdown(self) -> None:
+        raise NotImplementedError()
+
     def close(self) -> None:
         raise NotImplementedError()
 
@@ -463,7 +617,11 @@ def _init_decoder(self) -> None:
                     self._decoder = _get_decoder(content_encoding)
 
     def _decode(
-        self, data: bytes, decode_content: bool | None, flush_decoder: bool
+        self,
+        data: bytes,
+        decode_content: bool | None,
+        flush_decoder: bool,
+        max_length: int | None = None,
     ) -> bytes:
         """
         Decode the data passed in and potentially flush the decoder.
@@ -476,9 +634,12 @@ def _decode(
                 )
             return data
 
+        if max_length is None or flush_decoder:
+            max_length = -1
+
         try:
             if self._decoder:
-                data = self._decoder.decompress(data)
+                data = self._decoder.decompress(data, max_length=max_length)
                 self._has_decoded_content = True
         except self.DECODER_ERROR_CLASSES as e:
             content_encoding = self.headers.get("content-encoding", "").lower()
@@ -510,23 +671,11 @@ def readinto(self, b: bytearray) -> int:
             b[: len(temp)] = temp
             return len(temp)
 
-    # Compatibility methods for http.client.HTTPResponse
+    # Methods used by dependent libraries
     def getheaders(self) -> HTTPHeaderDict:
-        warnings.warn(
-            "HTTPResponse.getheaders() is deprecated and will be removed "
-            "in urllib3 v2.1.0. Instead access HTTPResponse.headers directly.",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
         return self.headers
 
     def getheader(self, name: str, default: str | None = None) -> str | None:
-        warnings.warn(
-            "HTTPResponse.getheader() is deprecated and will be removed "
-            "in urllib3 v2.1.0. Instead use HTTPResponse.headers.get(name, default).",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
         return self.headers.get(name, default)
 
     # Compatibility method for http.cookiejar
@@ -589,6 +738,7 @@ def __init__(
         request_method: str | None = None,
         request_url: str | None = None,
         auto_close: bool = True,
+        sock_shutdown: typing.Callable[[int], None] | None = None,
     ) -> None:
         super().__init__(
             headers=headers,
@@ -618,6 +768,7 @@ def __init__(
 
         if hasattr(body, "read"):
             self._fp = body  # type: ignore[assignment]
+        self._sock_shutdown = sock_shutdown
 
         # Are we using the chunked-style of transfer encoding?
         self.chunk_left: int | None = None
@@ -646,7 +797,11 @@ def drain_conn(self) -> None:
         Unread data in the HTTPResponse connection blocks the connection from being released back to the pool.
         """
         try:
-            self.read()
+            self.read(
+                # Do not spend resources decoding the content unless
+                # decoding has already been initiated.
+                decode_content=self._has_decoded_content,
+            )
         except (HTTPError, OSError, BaseSSLError, HTTPException):
             pass
 
@@ -733,7 +888,7 @@ def _init_length(self, request_method: str | None) -> int | None:
         return length
 
     @contextmanager
-    def _error_catcher(self) -> typing.Generator[None, None, None]:
+    def _error_catcher(self) -> typing.Generator[None]:
         """
         Catch low-level python exceptions, instead re-raising urllib3
         variants, so that low-level exceptions are not leaked in the
@@ -812,7 +967,7 @@ def _fp_read(
         happen.
 
         The known cases:
-          * 3.8 <= CPython < 3.9.7 because of a bug
+          * CPython < 3.9.7 because of a bug
             https://github.com/urllib3/urllib3/issues/2513#issuecomment-1152559900.
           * urllib3 injected with pyOpenSSL-backed SSL-support.
           * CPython < 3.10 only when `amt` does not fit 32-bit int.
@@ -943,6 +1098,14 @@ def read(
         elif amt is not None:
             cache_content = False
 
+            if self._decoder and self._decoder.has_unconsumed_tail:
+                decoded_data = self._decode(
+                    b"",
+                    decode_content,
+                    flush_decoder=False,
+                    max_length=amt - len(self._decoded_buffer),
+                )
+                self._decoded_buffer.put(decoded_data)
             if len(self._decoded_buffer) >= amt:
                 return self._decoded_buffer.get(amt)
 
@@ -950,7 +1113,11 @@ def read(
 
         flush_decoder = amt is None or (amt != 0 and not data)
 
-        if not data and len(self._decoded_buffer) == 0:
+        if (
+            not data
+            and len(self._decoded_buffer) == 0
+            and not (self._decoder and self._decoder.has_unconsumed_tail)
+        ):
             return data
 
         if amt is None:
@@ -967,7 +1134,12 @@ def read(
                     )
                 return data
 
-            decoded_data = self._decode(data, decode_content, flush_decoder)
+            decoded_data = self._decode(
+                data,
+                decode_content,
+                flush_decoder,
+                max_length=amt - len(self._decoded_buffer),
+            )
             self._decoded_buffer.put(decoded_data)
 
             while len(self._decoded_buffer) < amt and data:
@@ -975,7 +1147,12 @@ def read(
                 # For example, the GZ file header takes 10 bytes, we don't want to read
                 # it one byte at a time
                 data = self._raw_read(amt)
-                decoded_data = self._decode(data, decode_content, flush_decoder)
+                decoded_data = self._decode(
+                    data,
+                    decode_content,
+                    flush_decoder,
+                    max_length=amt - len(self._decoded_buffer),
+                )
                 self._decoded_buffer.put(decoded_data)
             data = self._decoded_buffer.get(amt)
 
@@ -1010,6 +1187,20 @@ def read1(
                     "Calling read1(decode_content=False) is not supported after "
                     "read1(decode_content=True) was called."
                 )
+            if (
+                self._decoder
+                and self._decoder.has_unconsumed_tail
+                and (amt is None or len(self._decoded_buffer) < amt)
+            ):
+                decoded_data = self._decode(
+                    b"",
+                    decode_content,
+                    flush_decoder=False,
+                    max_length=(
+                        amt - len(self._decoded_buffer) if amt is not None else None
+                    ),
+                )
+                self._decoded_buffer.put(decoded_data)
             if len(self._decoded_buffer) > 0:
                 if amt is None:
                     return self._decoded_buffer.get_all()
@@ -1025,7 +1216,9 @@ def read1(
         self._init_decoder()
         while True:
             flush_decoder = not data
-            decoded_data = self._decode(data, decode_content, flush_decoder)
+            decoded_data = self._decode(
+                data, decode_content, flush_decoder, max_length=amt
+            )
             self._decoded_buffer.put(decoded_data)
             if decoded_data or flush_decoder:
                 break
@@ -1037,7 +1230,7 @@ def read1(
 
     def stream(
         self, amt: int | None = 2**16, decode_content: bool | None = None
-    ) -> typing.Generator[bytes, None, None]:
+    ) -> typing.Generator[bytes]:
         """
         A generator wrapper for the read() method. A call will block until
         ``amt`` bytes have been read from the connection or until the
@@ -1056,7 +1249,11 @@ def stream(
         if self.chunked and self.supports_chunked_reads():
             yield from self.read_chunked(amt, decode_content=decode_content)
         else:
-            while not is_fp_closed(self._fp) or len(self._decoded_buffer) > 0:
+            while (
+                not is_fp_closed(self._fp)
+                or len(self._decoded_buffer) > 0
+                or (self._decoder and self._decoder.has_unconsumed_tail)
+            ):
                 data = self.read(amt=amt, decode_content=decode_content)
 
                 if data:
@@ -1066,7 +1263,18 @@ def stream(
     def readable(self) -> bool:
         return True
 
+    def shutdown(self) -> None:
+        if not self._sock_shutdown:
+            raise ValueError("Cannot shutdown socket as self._sock_shutdown is not set")
+        if self._connection is None:
+            raise RuntimeError(
+                "Cannot shutdown as connection has already been released to the pool"
+            )
+        self._sock_shutdown(socket.SHUT_RD)
+
     def close(self) -> None:
+        self._sock_shutdown = None
+
         if not self.closed and self._fp:
             self._fp.close()
 
@@ -1159,7 +1367,7 @@ def _handle_chunk(self, amt: int | None) -> bytes:
 
     def read_chunked(
         self, amt: int | None = None, decode_content: bool | None = None
-    ) -> typing.Generator[bytes, None, None]:
+    ) -> typing.Generator[bytes]:
         """
         Similar to :meth:`HTTPResponse.read`, but with an additional
         parameter: ``decode_content``.
@@ -1203,12 +1411,19 @@ def read_chunked(
                 amt = None
 
             while True:
-                self._update_chunk_length()
-                if self.chunk_left == 0:
-                    break
-                chunk = self._handle_chunk(amt)
+                # First, check if any data is left in the decoder's buffer.
+                if self._decoder and self._decoder.has_unconsumed_tail:
+                    chunk = b""
+                else:
+                    self._update_chunk_length()
+                    if self.chunk_left == 0:
+                        break
+                    chunk = self._handle_chunk(amt)
                 decoded = self._decode(
-                    chunk, decode_content=decode_content, flush_decoder=False
+                    chunk,
+                    decode_content=decode_content,
+                    flush_decoder=False,
+                    max_length=amt,
                 )
                 if decoded:
                     yield decoded
@@ -1244,7 +1459,7 @@ def url(self) -> str | None:
         return self._request_url
 
     @url.setter
-    def url(self, url: str) -> None:
+    def url(self, url: str | None) -> None:
         self._request_url = url
 
     def __iter__(self) -> typing.Iterator[bytes]:
diff --git a/libs/urllib3/util/connection.py b/libs/urllib3/util/connection.py
index 89bd189fb2..f92519ee91 100644
--- a/libs/urllib3/util/connection.py
+++ b/libs/urllib3/util/connection.py
@@ -6,7 +6,7 @@
 from ..exceptions import LocationParseError
 from .timeout import _DEFAULT_TIMEOUT, _TYPE_TIMEOUT
 
-_TYPE_SOCKET_OPTIONS = typing.List[typing.Tuple[int, int, typing.Union[int, bytes]]]
+_TYPE_SOCKET_OPTIONS = list[tuple[int, int, typing.Union[int, bytes]]]
 
 if typing.TYPE_CHECKING:
     from .._base_connection import BaseHTTPConnection
diff --git a/libs/urllib3/util/request.py b/libs/urllib3/util/request.py
index 82454a099d..6c2372ba7e 100644
--- a/libs/urllib3/util/request.py
+++ b/libs/urllib3/util/request.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import io
+import sys
 import typing
 from base64 import b64encode
 from enum import Enum
@@ -28,8 +29,12 @@
     pass
 else:
     ACCEPT_ENCODING += ",br"
+
 try:
-    import zstandard as _unused_module_zstd  # noqa: F401
+    if sys.version_info >= (3, 14):
+        from compression import zstd as _unused_module_zstd  # noqa: F401
+    else:
+        from backports import zstd as _unused_module_zstd  # noqa: F401
 except ImportError:
     pass
 else:
@@ -68,8 +73,11 @@ def make_headers(
 
     :param accept_encoding:
         Can be a boolean, list, or string.
-        ``True`` translates to 'gzip,deflate'.  If either the ``brotli`` or
-        ``brotlicffi`` package is installed 'gzip,deflate,br' is used instead.
+        ``True`` translates to 'gzip,deflate'.  If the dependencies for
+        Brotli (either the ``brotli`` or ``brotlicffi`` package) and/or
+        Zstandard (the ``backports.zstd`` package for Python before 3.14)
+        algorithms are installed, then their encodings are
+        included in the string ('br' and 'zstd', respectively).
         List will get joined by comma.
         String will be used as provided.
 
@@ -116,14 +124,14 @@ def make_headers(
         headers["connection"] = "keep-alive"
 
     if basic_auth:
-        headers[
-            "authorization"
-        ] = f"Basic {b64encode(basic_auth.encode('latin-1')).decode()}"
+        headers["authorization"] = (
+            f"Basic {b64encode(basic_auth.encode('latin-1')).decode()}"
+        )
 
     if proxy_basic_auth:
-        headers[
-            "proxy-authorization"
-        ] = f"Basic {b64encode(proxy_basic_auth.encode('latin-1')).decode()}"
+        headers["proxy-authorization"] = (
+            f"Basic {b64encode(proxy_basic_auth.encode('latin-1')).decode()}"
+        )
 
     if disable_cache:
         headers["cache-control"] = "no-cache"
@@ -220,7 +228,6 @@ def body_to_chunks(
     elif hasattr(body, "read"):
 
         def chunk_readable() -> typing.Iterable[bytes]:
-            nonlocal body, blocksize
             encode = isinstance(body, io.TextIOBase)
             while True:
                 datablock = body.read(blocksize)
diff --git a/libs/urllib3/util/retry.py b/libs/urllib3/util/retry.py
index 0456cceba4..b21b4b64eb 100644
--- a/libs/urllib3/util/retry.py
+++ b/libs/urllib3/util/retry.py
@@ -178,6 +178,11 @@ class Retry:
         Sequence of headers to remove from the request when a response
         indicating a redirect is returned before firing off the redirected
         request.
+
+    :param int retry_after_max: Number of seconds to allow as the maximum for
+        Retry-After headers. Defaults to :attr:`Retry.DEFAULT_RETRY_AFTER_MAX`.
+        Any Retry-After headers larger than this value will be limited to this
+        value.
     """
 
     #: Default methods to be used for ``allowed_methods``
@@ -196,6 +201,10 @@ class Retry:
     #: Default maximum backoff time.
     DEFAULT_BACKOFF_MAX = 120
 
+    # This is undocumented in the RFC. Setting to 6 hours matches other popular libraries.
+    #: Default maximum allowed value for Retry-After headers in seconds
+    DEFAULT_RETRY_AFTER_MAX: typing.Final[int] = 21600
+
     # Backward compatibility; assigned outside of the class.
     DEFAULT: typing.ClassVar[Retry]
 
@@ -219,6 +228,7 @@ def __init__(
             str
         ] = DEFAULT_REMOVE_HEADERS_ON_REDIRECT,
         backoff_jitter: float = 0.0,
+        retry_after_max: int = DEFAULT_RETRY_AFTER_MAX,
     ) -> None:
         self.total = total
         self.connect = connect
@@ -235,6 +245,7 @@ def __init__(
         self.allowed_methods = allowed_methods
         self.backoff_factor = backoff_factor
         self.backoff_max = backoff_max
+        self.retry_after_max = retry_after_max
         self.raise_on_redirect = raise_on_redirect
         self.raise_on_status = raise_on_status
         self.history = history or ()
@@ -256,6 +267,7 @@ def new(self, **kw: typing.Any) -> Self:
             status_forcelist=self.status_forcelist,
             backoff_factor=self.backoff_factor,
             backoff_max=self.backoff_max,
+            retry_after_max=self.retry_after_max,
             raise_on_redirect=self.raise_on_redirect,
             raise_on_status=self.raise_on_status,
             history=self.history,
@@ -320,6 +332,10 @@ def parse_retry_after(self, retry_after: str) -> float:
 
         seconds = max(seconds, 0)
 
+        # Check the seconds do not exceed the specified maximum
+        if seconds > self.retry_after_max:
+            seconds = self.retry_after_max
+
         return seconds
 
     def get_retry_after(self, response: BaseHTTPResponse) -> float | None:
diff --git a/libs/urllib3/util/ssl_.py b/libs/urllib3/util/ssl_.py
index 5e93be9cef..56fe9093ad 100644
--- a/libs/urllib3/util/ssl_.py
+++ b/libs/urllib3/util/ssl_.py
@@ -18,7 +18,7 @@
 IS_PYOPENSSL = False
 ALPN_PROTOCOLS = ["http/1.1"]
 
-_TYPE_VERSION_INFO = typing.Tuple[int, int, int, str, int]
+_TYPE_VERSION_INFO = tuple[int, int, int, str, int]
 
 # Maps the length of a digest to a possible hash function producing this digest
 HASHFUNC_MAP = {
@@ -32,7 +32,7 @@ def _is_bpo_43522_fixed(
     version_info: _TYPE_VERSION_INFO,
     pypy_version_info: _TYPE_VERSION_INFO | None,
 ) -> bool:
-    """Return True for CPython 3.8.9+, 3.9.3+ or 3.10+ and PyPy 7.3.8+ where
+    """Return True for CPython 3.9.3+ or 3.10+ and PyPy 7.3.8+ where
     setting SSLContext.hostname_checks_common_name to False works.
 
     Outside of CPython and PyPy we don't know which implementations work
@@ -48,11 +48,7 @@ def _is_bpo_43522_fixed(
     elif implementation_name == "cpython":
         major_minor = version_info[:2]
         micro = version_info[2]
-        return (
-            (major_minor == (3, 8) and micro >= 9)
-            or (major_minor == (3, 9) and micro >= 3)
-            or major_minor >= (3, 10)
-        )
+        return (major_minor == (3, 9) and micro >= 3) or major_minor >= (3, 10)
     else:  # Defensive:
         return False
 
@@ -105,6 +101,7 @@ class _TYPE_PEER_CERT_RET_DICT(TypedDict, total=False):
         OPENSSL_VERSION_NUMBER,
         PROTOCOL_TLS,
         PROTOCOL_TLS_CLIENT,
+        VERIFY_X509_STRICT,
         OP_NO_SSLv2,
         OP_NO_SSLv3,
         SSLContext,
@@ -113,15 +110,18 @@ class _TYPE_PEER_CERT_RET_DICT(TypedDict, total=False):
 
     PROTOCOL_SSLv23 = PROTOCOL_TLS
 
+    # Needed for Python 3.9 which does not define this
+    VERIFY_X509_PARTIAL_CHAIN = getattr(ssl, "VERIFY_X509_PARTIAL_CHAIN", 0x80000)
+
     # Setting SSLContext.hostname_checks_common_name = False didn't work before CPython
-    # 3.8.9, 3.9.3, and 3.10 (but OK on PyPy) or OpenSSL 1.1.1l+
+    # 3.9.3, and 3.10 (but OK on PyPy) or OpenSSL 1.1.1l+
     if HAS_NEVER_CHECK_COMMON_NAME and not _is_has_never_check_common_name_reliable(
         OPENSSL_VERSION,
         OPENSSL_VERSION_NUMBER,
         sys.implementation.name,
         sys.version_info,
         sys.pypy_version_info if sys.implementation.name == "pypy" else None,  # type: ignore[attr-defined]
-    ):
+    ):  # Defensive: for Python < 3.9.3
         HAS_NEVER_CHECK_COMMON_NAME = False
 
     # Need to be careful here in case old TLS versions get
@@ -136,12 +136,14 @@ class _TYPE_PEER_CERT_RET_DICT(TypedDict, total=False):
 
     from .ssltransport import SSLTransport  # type: ignore[assignment]
 except ImportError:
-    OP_NO_COMPRESSION = 0x20000  # type: ignore[assignment]
-    OP_NO_TICKET = 0x4000  # type: ignore[assignment]
-    OP_NO_SSLv2 = 0x1000000  # type: ignore[assignment]
-    OP_NO_SSLv3 = 0x2000000  # type: ignore[assignment]
-    PROTOCOL_SSLv23 = PROTOCOL_TLS = 2  # type: ignore[assignment]
-    PROTOCOL_TLS_CLIENT = 16  # type: ignore[assignment]
+    OP_NO_COMPRESSION = 0x20000  # type: ignore[assignment, misc]
+    OP_NO_TICKET = 0x4000  # type: ignore[assignment, misc]
+    OP_NO_SSLv2 = 0x1000000  # type: ignore[assignment, misc]
+    OP_NO_SSLv3 = 0x2000000  # type: ignore[assignment, misc]
+    PROTOCOL_SSLv23 = PROTOCOL_TLS = 2  # type: ignore[assignment, misc]
+    PROTOCOL_TLS_CLIENT = 16  # type: ignore[assignment, misc]
+    VERIFY_X509_PARTIAL_CHAIN = 0x80000
+    VERIFY_X509_STRICT = 0x20  # type: ignore[assignment, misc]
 
 
 _TYPE_PEER_CERT_RET = typing.Union["_TYPE_PEER_CERT_RET_DICT", bytes, None]
@@ -227,6 +229,7 @@ def create_urllib3_context(
     ciphers: str | None = None,
     ssl_minimum_version: int | None = None,
     ssl_maximum_version: int | None = None,
+    verify_flags: int | None = None,
 ) -> ssl.SSLContext:
     """Creates and configures an :class:`ssl.SSLContext` instance for use with urllib3.
 
@@ -251,6 +254,9 @@ def create_urllib3_context(
     :param ciphers:
         Which cipher suites to allow the server to select. Defaults to either system configured
         ciphers if OpenSSL 1.1.1+, otherwise uses a secure default set of ciphers.
+    :param verify_flags:
+        The flags for certificate verification operations. These default to
+        ``ssl.VERIFY_X509_PARTIAL_CHAIN`` and ``ssl.VERIFY_X509_STRICT`` for Python 3.13+.
     :returns:
         Constructed SSLContext object with specified options
     :rtype: SSLContext
@@ -283,7 +289,7 @@ def create_urllib3_context(
             # keep the maximum version to be it's default value: 'TLSVersion.MAXIMUM_SUPPORTED'
             warnings.warn(
                 "'ssl_version' option is deprecated and will be "
-                "removed in urllib3 v2.1.0. Instead use 'ssl_minimum_version'",
+                "removed in urllib3 v2.6.0. Instead use 'ssl_minimum_version'",
                 category=DeprecationWarning,
                 stacklevel=2,
             )
@@ -324,6 +330,16 @@ def create_urllib3_context(
 
     context.options |= options
 
+    if verify_flags is None:
+        verify_flags = 0
+        # In Python 3.13+ ssl.create_default_context() sets VERIFY_X509_PARTIAL_CHAIN
+        # and VERIFY_X509_STRICT so we do the same
+        if sys.version_info >= (3, 13):
+            verify_flags |= VERIFY_X509_PARTIAL_CHAIN
+            verify_flags |= VERIFY_X509_STRICT
+
+    context.verify_flags |= verify_flags
+
     # Enable post-handshake authentication for TLS 1.3, see GH #1634. PHA is
     # necessary for conditional client cert authentication with TLS 1.3.
     # The attribute is None for OpenSSL <= 1.1.0 or does not exist when using
@@ -345,15 +361,15 @@ def create_urllib3_context(
 
     try:
         context.hostname_checks_common_name = False
-    except AttributeError:  # Defensive: for CPython < 3.8.9 and 3.9.3; for PyPy < 7.3.8
+    except AttributeError:  # Defensive: for CPython < 3.9.3; for PyPy < 7.3.8
         pass
 
-    # Enable logging of TLS session keys via defacto standard environment variable
-    # 'SSLKEYLOGFILE', if the feature is available (Python 3.8+). Skip empty values.
-    if hasattr(context, "keylog_filename"):
-        sslkeylogfile = os.environ.get("SSLKEYLOGFILE")
-        if sslkeylogfile:
-            context.keylog_filename = sslkeylogfile
+    if "SSLKEYLOGFILE" in os.environ:
+        sslkeylogfile = os.path.expandvars(os.environ.get("SSLKEYLOGFILE"))
+    else:
+        sslkeylogfile = None
+    if sslkeylogfile:
+        context.keylog_filename = sslkeylogfile
 
     return context
 
@@ -373,8 +389,7 @@ def ssl_wrap_socket(
     key_password: str | None = ...,
     ca_cert_data: None | str | bytes = ...,
     tls_in_tls: typing.Literal[False] = ...,
-) -> ssl.SSLSocket:
-    ...
+) -> ssl.SSLSocket: ...
 
 
 @typing.overload
@@ -392,8 +407,7 @@ def ssl_wrap_socket(
     key_password: str | None = ...,
     ca_cert_data: None | str | bytes = ...,
     tls_in_tls: bool = ...,
-) -> ssl.SSLSocket | SSLTransportType:
-    ...
+) -> ssl.SSLSocket | SSLTransportType: ...
 
 
 def ssl_wrap_socket(
diff --git a/libs/urllib3/util/ssl_match_hostname.py b/libs/urllib3/util/ssl_match_hostname.py
index 453cfd420d..25d9100041 100644
--- a/libs/urllib3/util/ssl_match_hostname.py
+++ b/libs/urllib3/util/ssl_match_hostname.py
@@ -146,7 +146,7 @@ def match_hostname(
                 if key == "commonName":
                     if _dnsname_match(value, hostname):
                         return
-                    dnsnames.append(value)
+                    dnsnames.append(value)  # Defensive: for Python < 3.9.3
 
     if len(dnsnames) > 1:
         raise CertificateError(
diff --git a/libs/urllib3/util/ssltransport.py b/libs/urllib3/util/ssltransport.py
index d69ccb3420..6d59bc3bce 100644
--- a/libs/urllib3/util/ssltransport.py
+++ b/libs/urllib3/util/ssltransport.py
@@ -174,12 +174,10 @@ def close(self) -> None:
     @typing.overload
     def getpeercert(
         self, binary_form: typing.Literal[False] = ...
-    ) -> _TYPE_PEER_CERT_RET_DICT | None:
-        ...
+    ) -> _TYPE_PEER_CERT_RET_DICT | None: ...
 
     @typing.overload
-    def getpeercert(self, binary_form: typing.Literal[True]) -> bytes | None:
-        ...
+    def getpeercert(self, binary_form: typing.Literal[True]) -> bytes | None: ...
 
     def getpeercert(self, binary_form: bool = False) -> _TYPE_PEER_CERT_RET:
         return self.sslobj.getpeercert(binary_form)  # type: ignore[return-value]
@@ -219,13 +217,11 @@ def _wrap_ssl_read(self, len: int, buffer: bytearray | None = None) -> int | byt
 
     # func is sslobj.do_handshake or sslobj.unwrap
     @typing.overload
-    def _ssl_io_loop(self, func: typing.Callable[[], None]) -> None:
-        ...
+    def _ssl_io_loop(self, func: typing.Callable[[], None]) -> None: ...
 
     # func is sslobj.write, arg1 is data
     @typing.overload
-    def _ssl_io_loop(self, func: typing.Callable[[bytes], int], arg1: bytes) -> int:
-        ...
+    def _ssl_io_loop(self, func: typing.Callable[[bytes], int], arg1: bytes) -> int: ...
 
     # func is sslobj.read, arg1 is len, arg2 is buffer
     @typing.overload
@@ -234,8 +230,7 @@ def _ssl_io_loop(
         func: typing.Callable[[int, bytearray | None], bytes],
         arg1: int,
         arg2: bytearray | None,
-    ) -> bytes:
-        ...
+    ) -> bytes: ...
 
     def _ssl_io_loop(
         self,
diff --git a/libs/urllib3/util/url.py b/libs/urllib3/util/url.py
index d53ea932a0..db057f17be 100644
--- a/libs/urllib3/util/url.py
+++ b/libs/urllib3/util/url.py
@@ -291,13 +291,11 @@ def _remove_path_dot_segments(path: str) -> str:
 
 
 @typing.overload
-def _normalize_host(host: None, scheme: str | None) -> None:
-    ...
+def _normalize_host(host: None, scheme: str | None) -> None: ...
 
 
 @typing.overload
-def _normalize_host(host: str, scheme: str | None) -> str:
-    ...
+def _normalize_host(host: str, scheme: str | None) -> str: ...
 
 
 def _normalize_host(host: str | None, scheme: str | None) -> str | None:
diff --git a/libs/version.txt b/libs/version.txt
index 45b49ab68a..ad692a740c 100644
--- a/libs/version.txt
+++ b/libs/version.txt
@@ -1,60 +1,62 @@
 # Bazarr dependencies
-alembic==1.14.0
-aniso8601==10.0.0
-apprise==1.9.2
-apscheduler<=3.10.4
-attrs==24.3.0
+alembic==1.18.4
+aniso8601==10.0.1
+apprise==1.9.8
+apscheduler==3.11.2
+attrs==25.4.0
 blinker==1.9.0
-charset-normalizer==3.4.1
+charset-normalizer==3.4.6
 deep-translator==1.11.4
-dogpile.cache==1.3.3
-dynaconf==3.2.6
+dogpile.cache==1.5.0
+dynaconf==3.2.12
 fese==0.3.0
-ffsubsync==0.4.27
-flask-cors==5.0.0
+ffsubsync==0.4.31
+flask-cors==6.0.2
 flask-migrate==4.1.0
-flask-restx==1.3.0
-Flask-SocketIO==5.5.1
+flask-restx==1.3.2
+Flask-SocketIO==5.6.1
 flask_sqlalchemy==3.1.1
-Flask==3.1.0
+Flask==3.1.3
+ga4mp==2.0.4
 guess_language-spirit==0.5.3
 guessit==3.8.0
-h11==0.14.0
+h11==0.16.0
 inflect==7.5.0
-jsonschema<=4.17.3  # newer version require other compiled dependency
-knowit<=0.5.3  # newer version doesn't support Python 3.8 anymore
-Mako==1.3.8
+jsonschema<=4.17.3  # newer version requires other compiled dependency
+knowit==0.5.11
+Mako==1.3.10
 plexapi>=4.16.1
-pycountry==24.6.1
+pycountry==26.2.16
 pyrsistent==0.20.0
-pysubs2==1.7.3  # newer version doesn't support Python 3.8 anymore
-python-engineio==4.11.2
-python-socketio==5.12.1
-pytz==2024.2
-pytz_deprecation_shim==0.1.0.post0
+pysubs2==1.8.0
+python-engineio==4.13.1
+python-socketio==5.16.1
 rarfile==4.2
-referencing<=0.23.0  # newer version require other compiled dependency
-requests==2.32.3
-semver==3.0.3
-signalrcore==0.9.5
+referencing<=0.23.0  # newer version requires other compiled dependency
+requests==2.32.5
+semver==3.0.4
+signalrcore<=0.9.71  # newer version have a bug with Sonarr signalr implementation
 simple-websocket==1.1.0
-sqlalchemy==2.0.37
+sqlalchemy==2.0.48
 textdistance==4.6.3
-unidecode==1.3.8
+unidecode==1.4.0
 waitress==3.0.2
 whichcraft==0.6.1
-wsproto==1.2.0
+wsproto==1.3.2
 
 ## indirect dependencies
 
+# Required-by: alembic
+tomli==2.4.0
+
 # Required-by: apprise
 importlib_metadata<=7.2.1  # Newer version raise a KeyError with knowit
-markdown==3.7
+markdown==3.10.2
 requests_oauthlib==2.0.0
 
 # Required-by: apscheduler
-tzdata==2024.2
-tzlocal==5.2
+tzdata==2025.3
+tzlocal==5.3.1
 
 # Required-by: beautifulsoup4
 soupsieve==2.3.2.post1
@@ -66,67 +68,64 @@ filetype==1.2.0
 auditok<=0.1.5  # do not upgrade unless ffsubsync requirements.txt change
 ffmpeg-python==0.2.0
 future==1.0.0
-rich==13.9.4
+rich==14.3.3
 srt==3.5.3
-tqdm==4.67.1
-typing_extensions==4.12.2
+tqdm==4.67.3
+typing_extensions==4.15.0
 
 # Required-by: flask
-click==8.1.8
+click==8.3.1
 itsdangerous==2.2.0
-jinja2==3.1.5
-werkzeug==3.1.3
+jinja2==3.1.6
+werkzeug==3.1.6
 
 # Required-by: guessit
 python-dateutil==2.9.0
 importlib_resources==6.5.2
 rebulk==3.2.0
-zipp==3.21.0
+zipp==3.23.0
 
 # Required-by: jinja2
-markupsafe<=2.1.5  # newer version doesn't support Python 3.8 anymore
+markupsafe==3.0.3
 
 # Required-by: knowit
-pymediainfo==6.1.0
-pyyaml==6.0.2
-trakit==0.2.2
+pymediainfo==7.0.1
+pyyaml==6.0.3
+trakit==0.2.5
 
 # Required-by: python-socketio
 bidict==0.23.1
 
-# Required-by: pytz_deprecation_shim
-backports.zoneinfo==0.2.1
-
 # Required-by: signalr-client-threads
-websocket-client==1.8.0
+websocket-client==1.9.0
 
 # Required-by: signalrcore
-msgpack==1.1.0
+msgpack==1.1.2
 
 # Required-by: subliminal
 appdirs==1.4.4
 babelfish==0.6.1
-beautifulsoup4==4.12.3
+beautifulsoup4==4.14.3
 chardet==5.2.0
 pysrt==1.1.2
-stevedore==5.4.0
+stevedore==5.7.0
 
 # Required-by: subliminal_patch
 cloudscraper<=1.2.58  # newer version dropped captcha v1 support
-decorator==5.1.1
-dnspython<=2.6.1  # newer version doesn't support Python 3.8 anymore
+decorator==5.2.1
+dnspython==2.8.0
 enzyme==0.5.2
-ftfy<=6.2.3  # newer version doesn't support Python 3.8 anymore
+ftfy==6.3.1
 html5lib==1.1
 Js2Py==0.74
-pydantic<=1.10.14  # newer version require other compiled dependency
+pydantic<=1.10.14  # newer version requires other compiled dependency
 pyjsparser==2.7.1
-pyparsing<=3.1.4  # newer version doesn't support Python 3.8 anymore
+pyparsing==3.3.2
 # python-anticaptcha==1.0.0  # include PR to fix DeprecationWarning: pkg_resources is deprecated as an API.
 git+https://github.com/morpheus65535/python-anticaptcha.git
 retry==0.9.2
 six==1.17.0
-wcwidth==0.2.13
+wcwidth==0.6.0
 webencodings==0.5.1
 
 # Required-by: subzero
@@ -134,20 +133,20 @@ backports.functools-lru-cache==2.0.0
 emoji==2.15.0
 fcache==0.6.0
 json_tricks==3.17.3
-tld==0.13
-platformdirs==4.3.6
+tld==0.13.2
+platformdirs==4.9.4
 
 # Required-by: requests
-certifi==2024.12.14
-idna==3.10
-oauthlib==3.2.2
+certifi==2026.2.25
+idna==3.11
+oauthlib==3.3.1
 requests_toolbelt==1.0.0
-urllib3==2.3.0
+urllib3==2.6.3
 
 # Required-by: rich
 colorama==0.4.6
 commonmark==0.9.1
-Pygments==2.19.1
+Pygments==2.19.2
 
 # Required-by: websocket
 pysocks==1.7.1
diff --git a/libs/waitress-3.0.0.dist-info/METADATA b/libs/waitress-3.0.0.dist-info/METADATA
deleted file mode 100644
index 101601ff04..0000000000
--- a/libs/waitress-3.0.0.dist-info/METADATA
+++ /dev/null
@@ -1,99 +0,0 @@
-Metadata-Version: 2.1
-Name: waitress
-Version: 3.0.0
-Summary: Waitress WSGI server
-Home-page: https://github.com/Pylons/waitress
-Author: Zope Foundation and Contributors
-Author-email: zope-dev@zope.org
-Maintainer: Pylons Project
-Maintainer-email: pylons-discuss@googlegroups.com
-License: ZPL 2.1
-Project-URL: Documentation, https://docs.pylonsproject.org/projects/waitress/en/latest/index.html
-Project-URL: Changelog, https://docs.pylonsproject.org/projects/waitress/en/latest/index.html#change-history
-Project-URL: Issue Tracker, https://github.com/Pylons/waitress/issues
-Keywords: waitress wsgi server http
-Classifier: Development Status :: 6 - Mature
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Zope Public License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Internet :: WWW/HTTP
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
-Requires-Python: >=3.8.0
-Description-Content-Type: text/x-rst
-License-File: LICENSE.txt
-Provides-Extra: docs
-Requires-Dist: Sphinx >=1.8.1 ; extra == 'docs'
-Requires-Dist: docutils ; extra == 'docs'
-Requires-Dist: pylons-sphinx-themes >=1.0.9 ; extra == 'docs'
-Provides-Extra: testing
-Requires-Dist: pytest ; extra == 'testing'
-Requires-Dist: pytest-cov ; extra == 'testing'
-Requires-Dist: coverage >=5.0 ; extra == 'testing'
-
-Waitress
-========
-
-.. image:: https://img.shields.io/pypi/v/waitress.svg
-    :target: https://pypi.org/project/waitress/
-    :alt: latest version of waitress on PyPI
-
-.. image:: https://github.com/Pylons/waitress/actions/workflows/ci-tests.yml/badge.svg
-    :target: https://github.com/Pylons/waitress/actions/workflows/ci-tests.yml
-
-.. image:: https://readthedocs.org/projects/waitress/badge/?version=main
-        :target: https://docs.pylonsproject.org/projects/waitress/en/main
-        :alt: main Documentation Status
-
-Waitress is a production-quality pure-Python WSGI server with very acceptable
-performance. It has no dependencies except ones which live in the Python
-standard library. It runs on CPython on Unix and Windows under Python 3.8+. It
-is also known to run on PyPy 3 (version 3.8 compatible python and above) on
-UNIX. It supports HTTP/1.0 and HTTP/1.1.
-
-For more information, see the "docs" directory of the Waitress package or visit
-https://docs.pylonsproject.org/projects/waitress/en/latest/
-
-3.0.0 (2024-02-04)
-------------------
-
-- Rename "master" git branch to "main"
-
-- Fix a bug that would appear on macOS whereby if we accept() a socket that is
-  already gone, setting socket options would fail and take down the server. See
-  https://github.com/Pylons/waitress/pull/399
-
-- Fixed testing of vendored asyncore code to not rely on particular naming for
-  errno's. See https://github.com/Pylons/waitress/pull/397
-
-- HTTP Request methods and versions are now validated to meet the HTTP
-  standards thereby dropping invalid requests on the floor. See
-  https://github.com/Pylons/waitress/pull/423
-
-- No longer close the connection when sending a HEAD request response. See
-  https://github.com/Pylons/waitress/pull/428
-
-- Always attempt to send the Connection: close response header when we are
-  going to close the connection to let the remote know in more instances.
-  https://github.com/Pylons/waitress/pull/429
-
-- Python 3.7 is no longer supported. Add support for Python 3.11, 3.12 and
-  PyPy 3.9, 3.10. See https://github.com/Pylons/waitress/pull/412
-
-- Document that trusted_proxy may be set to a wildcard value to trust all
-  proxies. See https://github.com/Pylons/waitress/pull/431
-
-Updated Defaults
-~~~~~~~~~~~~~~~~
-
-- clear_untrusted_proxy_headers is set to True by default. See
-  https://github.com/Pylons/waitress/pull/370
diff --git a/libs/waitress-3.0.0.dist-info/RECORD b/libs/waitress-3.0.0.dist-info/RECORD
deleted file mode 100644
index e3399e0cab..0000000000
--- a/libs/waitress-3.0.0.dist-info/RECORD
+++ /dev/null
@@ -1,25 +0,0 @@
-../../bin/waitress-serve,sha256=1OqDUSHasT1sLnyzkmwLJ774OVlt3BZF7Rn25Z76oq8,235
-waitress-3.0.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-waitress-3.0.0.dist-info/LICENSE.txt,sha256=PmcdsR32h1FswdtbPWXkqjg-rKPCDOo_r1Og9zNdCjw,2070
-waitress-3.0.0.dist-info/METADATA,sha256=LcIRiiQFPBQfYWZELvGinG7VDEEob2Rwxs50fHvzhfE,4205
-waitress-3.0.0.dist-info/RECORD,,
-waitress-3.0.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-waitress-3.0.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-waitress-3.0.0.dist-info/entry_points.txt,sha256=tDR8epG2g4I70Lak9d-1qTHbCfBzZd5FDEScAkVuH_E,106
-waitress-3.0.0.dist-info/top_level.txt,sha256=_kFnXYtDXvRWHSXprH53h56AM2jDfY-Y7sgIakVEImI,9
-waitress/__init__.py,sha256=XucLsghawSMTlUAAZ6ToN5qKZyJNv3iolYYgx812a5o,1370
-waitress/__main__.py,sha256=52WJIrYKadsGi0G93jEMCfaBXaVQluHy4XBmfTLT-6o,75
-waitress/adjustments.py,sha256=8e0AqCF6efXT7e2tgrLMi0JgedMWeDlxR2DsmjqK6hI,17907
-waitress/buffers.py,sha256=UL8VJE2QVqlOSqbjDLl6kVoC1IQ2EWi9IbhUJQxezIk,9327
-waitress/channel.py,sha256=aG2MsWF1ohan7AZjNKg8_UcII_n61N4VVjzW_grHqOY,19004
-waitress/compat.py,sha256=ye7vBv0SLXicjJ62ALYrl863MUwis9PKqbhsjiASSSA,867
-waitress/parser.py,sha256=88KUY31JztMnuXI46POHFL5yYHuJ5ZCczV8Aj6UQtjM,15579
-waitress/proxy_headers.py,sha256=658TlTIuDIss_A3BdTSmImjB8wSj5LzshfkYULiATKw,11811
-waitress/receiver.py,sha256=5LSQPVJabWrytwZwaKKiHgG80WXPo_VLK6tNxSmhz6I,5897
-waitress/rfc7230.py,sha256=D1_kVeCJa3G-u4jAniZieFTMe3xrMavTjQDEbj9SBfo,2525
-waitress/runner.py,sha256=a9bNwYAxl_rgXSi--JVQpwvDIArwuZBGgVDxFMwuamE,9334
-waitress/server.py,sha256=B2F-fJC_bRO0cDaRERpy1Nj4-xjQoPYnW897lwX7kO4,13749
-waitress/task.py,sha256=HofupzJUIuMfuT63dKhtG7Fks6pWViWsZRa8Zru3o4E,21895
-waitress/trigger.py,sha256=mPyHW_yUC3Yn-ibIIWwTWYqRe0DJeuaTK6ivOY2o_3E,7811
-waitress/utilities.py,sha256=19JDxMhIMj78AO-BBQP_ty31qTXVIEpWvjyo9K2BK70,6356
-waitress/wasyncore.py,sha256=HIz8XfDGWx7U9fvR6aOZVbk9FH41hVosW6oLSmPWnlo,21038
diff --git a/libs/waitress-3.0.0.dist-info/WHEEL b/libs/waitress-3.0.0.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/waitress-3.0.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/waitress-3.0.0.dist-info/INSTALLER b/libs/waitress-3.0.2.dist-info/INSTALLER
similarity index 100%
rename from libs/waitress-3.0.0.dist-info/INSTALLER
rename to libs/waitress-3.0.2.dist-info/INSTALLER
diff --git a/libs/waitress-3.0.2.dist-info/METADATA b/libs/waitress-3.0.2.dist-info/METADATA
new file mode 100644
index 0000000000..9bf1ddf800
--- /dev/null
+++ b/libs/waitress-3.0.2.dist-info/METADATA
@@ -0,0 +1,149 @@
+Metadata-Version: 2.4
+Name: waitress
+Version: 3.0.2
+Summary: Waitress WSGI server
+Home-page: https://github.com/Pylons/waitress
+Author: Zope Foundation and Contributors
+Author-email: zope-dev@zope.org
+Maintainer: Pylons Project
+Maintainer-email: pylons-discuss@googlegroups.com
+License: ZPL 2.1
+Project-URL: Documentation, https://docs.pylonsproject.org/projects/waitress/en/latest/index.html
+Project-URL: Changelog, https://docs.pylonsproject.org/projects/waitress/en/latest/index.html#change-history
+Project-URL: Issue Tracker, https://github.com/Pylons/waitress/issues
+Keywords: waitress wsgi server http
+Classifier: Development Status :: 6 - Mature
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Zope Public License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Internet :: WWW/HTTP
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
+Requires-Python: >=3.9.0
+Description-Content-Type: text/x-rst
+License-File: LICENSE.txt
+Provides-Extra: testing
+Requires-Dist: pytest; extra == "testing"
+Requires-Dist: pytest-cov; extra == "testing"
+Requires-Dist: coverage>=7.6.0; extra == "testing"
+Provides-Extra: docs
+Requires-Dist: Sphinx>=1.8.1; extra == "docs"
+Requires-Dist: docutils; extra == "docs"
+Requires-Dist: pylons-sphinx-themes>=1.0.9; extra == "docs"
+Dynamic: license-file
+
+Waitress
+========
+
+.. image:: https://img.shields.io/pypi/v/waitress.svg
+    :target: https://pypi.org/project/waitress/
+    :alt: latest version of waitress on PyPI
+
+.. image:: https://github.com/Pylons/waitress/actions/workflows/ci-tests.yml/badge.svg
+    :target: https://github.com/Pylons/waitress/actions/workflows/ci-tests.yml
+
+.. image:: https://readthedocs.org/projects/waitress/badge/?version=stable
+        :target: https://docs.pylonsproject.org/projects/waitress/en/stable/
+        :alt: main Documentation Status
+
+Waitress is a production-quality pure-Python WSGI server with very acceptable
+performance. It has no dependencies except ones which live in the Python
+standard library. It runs on CPython on Unix and Windows under Python 3.9+. It
+is also known to run on PyPy 3 (version 3.9 compatible python and above) on
+UNIX. It supports HTTP/1.0 and HTTP/1.1.
+
+For more information, see the "docs" directory of the Waitress package or visit
+https://docs.pylonsproject.org/projects/waitress/en/latest/
+
+3.0.2 (2024-11-16)
+------------------
+
+Security
+~~~~~~~~
+
+- When using Waitress to process trusted proxy headers, Waitress will now
+  update the headers to drop any untrusted values, thereby making sure that
+  WSGI apps only get trusted and validated values that Waitress itself used to
+  update the environ. See https://github.com/Pylons/waitress/pull/452 and
+  https://github.com/Pylons/waitress/issues/451
+
+
+3.0.1 (2024-10-28)
+------------------
+
+Backward Incompatibilities
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Python 3.8 is no longer supported.
+  See https://github.com/Pylons/waitress/pull/445.
+
+Features
+~~~~~~~~
+
+- Added support for Python 3.13.
+  See https://github.com/Pylons/waitress/pull/445.
+
+Security
+~~~~~~~~
+
+- Fix a bug that would lead to Waitress busy looping on select() on a half-open
+  socket due to a race condition that existed when creating a new HTTPChannel.
+  See https://github.com/Pylons/waitress/pull/435,
+  https://github.com/Pylons/waitress/issues/418 and
+  https://github.com/Pylons/waitress/security/advisories/GHSA-3f84-rpwh-47g6
+
+  With thanks to Dylan Jay and Dieter Maurer for their extensive debugging and
+  helping track this down.
+
+- No longer strip the header values before passing them to the WSGI environ.
+  See https://github.com/Pylons/waitress/pull/434 and
+  https://github.com/Pylons/waitress/issues/432
+
+- Fix a race condition in Waitress when `channel_request_lookahead` is enabled
+  that could lead to HTTP request smuggling.
+
+  See https://github.com/Pylons/waitress/security/advisories/GHSA-9298-4cf8-g4wj
+
+3.0.0 (2024-02-04)
+------------------
+
+- Rename "master" git branch to "main"
+
+- Fix a bug that would appear on macOS whereby if we accept() a socket that is
+  already gone, setting socket options would fail and take down the server. See
+  https://github.com/Pylons/waitress/pull/399
+
+- Fixed testing of vendored asyncore code to not rely on particular naming for
+  errno's. See https://github.com/Pylons/waitress/pull/397
+
+- HTTP Request methods and versions are now validated to meet the HTTP
+  standards thereby dropping invalid requests on the floor. See
+  https://github.com/Pylons/waitress/pull/423
+
+- No longer close the connection when sending a HEAD request response. See
+  https://github.com/Pylons/waitress/pull/428
+
+- Always attempt to send the Connection: close response header when we are
+  going to close the connection to let the remote know in more instances.
+  https://github.com/Pylons/waitress/pull/429
+
+- Python 3.7 is no longer supported. Add support for Python 3.11, 3.12 and
+  PyPy 3.9, 3.10. See https://github.com/Pylons/waitress/pull/412
+
+- Document that trusted_proxy may be set to a wildcard value to trust all
+  proxies. See https://github.com/Pylons/waitress/pull/431
+
+Updated Defaults
+~~~~~~~~~~~~~~~~
+
+- clear_untrusted_proxy_headers is set to True by default. See
+  https://github.com/Pylons/waitress/pull/370
diff --git a/libs/waitress-3.0.2.dist-info/RECORD b/libs/waitress-3.0.2.dist-info/RECORD
new file mode 100644
index 0000000000..be0f1a91b9
--- /dev/null
+++ b/libs/waitress-3.0.2.dist-info/RECORD
@@ -0,0 +1,25 @@
+../../bin/waitress-serve,sha256=Rdfp5qFDU7KPS3vr71mzJ9cD9qEcTq2aqpU6XKnFl2Q,188
+waitress-3.0.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+waitress-3.0.2.dist-info/METADATA,sha256=Fq5AicgF99YYof_OjdwNye7ZVoLiOqzymfZOvd7RVRg,5777
+waitress-3.0.2.dist-info/RECORD,,
+waitress-3.0.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+waitress-3.0.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+waitress-3.0.2.dist-info/entry_points.txt,sha256=tDR8epG2g4I70Lak9d-1qTHbCfBzZd5FDEScAkVuH_E,106
+waitress-3.0.2.dist-info/licenses/LICENSE.txt,sha256=PmcdsR32h1FswdtbPWXkqjg-rKPCDOo_r1Og9zNdCjw,2070
+waitress-3.0.2.dist-info/top_level.txt,sha256=_kFnXYtDXvRWHSXprH53h56AM2jDfY-Y7sgIakVEImI,9
+waitress/__init__.py,sha256=XucLsghawSMTlUAAZ6ToN5qKZyJNv3iolYYgx812a5o,1370
+waitress/__main__.py,sha256=52WJIrYKadsGi0G93jEMCfaBXaVQluHy4XBmfTLT-6o,75
+waitress/adjustments.py,sha256=8e0AqCF6efXT7e2tgrLMi0JgedMWeDlxR2DsmjqK6hI,17907
+waitress/buffers.py,sha256=UL8VJE2QVqlOSqbjDLl6kVoC1IQ2EWi9IbhUJQxezIk,9327
+waitress/channel.py,sha256=a0RxP9OPiRfm0ppas10VeSmdWCmAvPXTkN97cOgBghU,19440
+waitress/compat.py,sha256=ye7vBv0SLXicjJ62ALYrl863MUwis9PKqbhsjiASSSA,867
+waitress/parser.py,sha256=88KUY31JztMnuXI46POHFL5yYHuJ5ZCczV8Aj6UQtjM,15579
+waitress/proxy_headers.py,sha256=-hYmOw1ObedYUKrqNwN4LZmbGvKrZym7FywEv2NDBw4,12336
+waitress/receiver.py,sha256=5LSQPVJabWrytwZwaKKiHgG80WXPo_VLK6tNxSmhz6I,5897
+waitress/rfc7230.py,sha256=D1_kVeCJa3G-u4jAniZieFTMe3xrMavTjQDEbj9SBfo,2525
+waitress/runner.py,sha256=HHPzjFmY16M-k-gIKNDNrMWNuEoX_dIH-95p4oh-4Lw,7615
+waitress/server.py,sha256=k_pgCGy1uXnRdr_qejkOZ5A9jxdFRoq7hNBDMi0j5sA,13752
+waitress/task.py,sha256=_DDX60_eYTSQlEIO-Dpldd3xUy807lsiU-3shuqphKA,21847
+waitress/trigger.py,sha256=mPyHW_yUC3Yn-ibIIWwTWYqRe0DJeuaTK6ivOY2o_3E,7811
+waitress/utilities.py,sha256=19JDxMhIMj78AO-BBQP_ty31qTXVIEpWvjyo9K2BK70,6356
+waitress/wasyncore.py,sha256=rHghsRsZKhlXFuyzrNdCtN2wL8ZCdXfNekPsZEMjBms,18910
diff --git a/libs/waitress-3.0.2.dist-info/REQUESTED b/libs/waitress-3.0.2.dist-info/REQUESTED
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/waitress-3.0.2.dist-info/WHEEL b/libs/waitress-3.0.2.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/waitress-3.0.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/waitress-3.0.0.dist-info/entry_points.txt b/libs/waitress-3.0.2.dist-info/entry_points.txt
similarity index 100%
rename from libs/waitress-3.0.0.dist-info/entry_points.txt
rename to libs/waitress-3.0.2.dist-info/entry_points.txt
diff --git a/libs/waitress-3.0.0.dist-info/LICENSE.txt b/libs/waitress-3.0.2.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/waitress-3.0.0.dist-info/LICENSE.txt
rename to libs/waitress-3.0.2.dist-info/licenses/LICENSE.txt
diff --git a/libs/waitress-3.0.0.dist-info/top_level.txt b/libs/waitress-3.0.2.dist-info/top_level.txt
similarity index 100%
rename from libs/waitress-3.0.0.dist-info/top_level.txt
rename to libs/waitress-3.0.2.dist-info/top_level.txt
diff --git a/libs/waitress/channel.py b/libs/waitress/channel.py
index eb59dd3f1f..eb8fab2b3f 100644
--- a/libs/waitress/channel.py
+++ b/libs/waitress/channel.py
@@ -67,8 +67,7 @@ def __init__(self, server, sock, addr, adj, map=None):
         self.outbuf_lock = threading.Condition()
 
         wasyncore.dispatcher.__init__(self, sock, map=map)
-
-        # Don't let wasyncore.dispatcher throttle self.addr on us.
+        self.connected = True
         self.addr = addr
         self.requests = []
 
@@ -92,13 +91,7 @@ def handle_write(self):
         # Precondition: there's data in the out buffer to be sent, or
         # there's a pending will_close request
 
-        if not self.connected:
-            # we dont want to close the channel twice
-
-            return
-
         # try to flush any pending output
-
         if not self.requests:
             # 1. There are no running tasks, so we don't need to try to lock
             #    the outbuf before sending
@@ -147,7 +140,7 @@ def readable(self):
         # 1. We're not already about to close the connection.
         # 2. We're not waiting to flush remaining data before closing the
         #    connection
-        # 3. There are not too many tasks already queued
+        # 3. There are not too many tasks already queued (if lookahead is enabled)
         # 4. There's no data in the output buffer that needs to be sent
         #    before we potentially create a new task.
 
@@ -203,6 +196,15 @@ def received(self, data):
             return False
 
         with self.requests_lock:
+            # Don't bother processing anymore data if this connection is about
+            # to close. This may happen if readable() returned True, on the
+            # main thread before the service thread set the close_when_flushed
+            # flag, and we read data but our service thread is attempting to
+            # shut down the connection due to an error. We want to make sure we
+            # do this while holding the request_lock so that we can't race
+            if self.will_close or self.close_when_flushed:
+                return False
+
             while data:
                 if self.request is None:
                     self.request = self.parser_class(self.adj)
@@ -356,7 +358,7 @@ def write_soon(self, data):
                     raise ClientDisconnected
                 num_bytes = len(data)
 
-                if data.__class__ is ReadOnlyFileBasedBuffer:
+                if isinstance(data, ReadOnlyFileBasedBuffer):
                     # they used wsgi.file_wrapper
                     self.outbufs.append(data)
                     nextbuf = OverflowableBuffer(self.adj.outbuf_overflow)
diff --git a/libs/waitress/proxy_headers.py b/libs/waitress/proxy_headers.py
index 652ca0bc2f..fff896a450 100644
--- a/libs/waitress/proxy_headers.py
+++ b/libs/waitress/proxy_headers.py
@@ -84,7 +84,8 @@ def raise_for_multiple_values():
         try:
             forwarded_for = []
 
-            for forward_hop in environ["HTTP_X_FORWARDED_FOR"].split(","):
+            raw_forwarded_for = environ["HTTP_X_FORWARDED_FOR"].split(",")
+            for forward_hop in raw_forwarded_for:
                 forward_hop = forward_hop.strip()
                 forward_hop = undquote(forward_hop)
 
@@ -103,6 +104,9 @@ def raise_for_multiple_values():
             client_addr = forwarded_for[0]
 
             untrusted_headers.remove("X_FORWARDED_FOR")
+            environ["HTTP_X_FORWARDED_FOR"] = ",".join(
+                raw_forwarded_for[-trusted_proxy_count:]
+            ).strip()
         except Exception as ex:
             raise MalformedProxyHeader(
                 "X-Forwarded-For", str(ex), environ["HTTP_X_FORWARDED_FOR"]
@@ -115,7 +119,8 @@ def raise_for_multiple_values():
         try:
             forwarded_host_multiple = []
 
-            for forward_host in environ["HTTP_X_FORWARDED_HOST"].split(","):
+            raw_forwarded_host = environ["HTTP_X_FORWARDED_HOST"].split(",")
+            for forward_host in raw_forwarded_host:
                 forward_host = forward_host.strip()
                 forward_host = undquote(forward_host)
                 forwarded_host_multiple.append(forward_host)
@@ -124,6 +129,9 @@ def raise_for_multiple_values():
             forwarded_host = forwarded_host_multiple[0]
 
             untrusted_headers.remove("X_FORWARDED_HOST")
+            environ["HTTP_X_FORWARDED_HOST"] = ",".join(
+                raw_forwarded_host[-trusted_proxy_count:]
+            ).strip()
         except Exception as ex:
             raise MalformedProxyHeader(
                 "X-Forwarded-Host", str(ex), environ["HTTP_X_FORWARDED_HOST"]
@@ -163,8 +171,9 @@ def raise_for_multiple_values():
     # If the Forwarded header exists, it gets priority
     if forwarded:
         proxies = []
+        raw_forwarded = forwarded.split(",")
         try:
-            for forwarded_element in forwarded.split(","):
+            for forwarded_element in raw_forwarded:
                 # Remove whitespace that may have been introduced when
                 # appending a new entry
                 forwarded_element = forwarded_element.strip()
@@ -213,6 +222,9 @@ def raise_for_multiple_values():
             raise MalformedProxyHeader("Forwarded", str(ex), environ["HTTP_FORWARDED"])
 
         proxies = proxies[-trusted_proxy_count:]
+        environ["HTTP_FORWARDED"] = ",".join(
+            raw_forwarded[-trusted_proxy_count:]
+        ).strip()
 
         # Iterate backwards and fill in some values, the oldest entry that
         # contains the information we expect is the one we use. We expect
diff --git a/libs/waitress/runner.py b/libs/waitress/runner.py
index 22f70f38bb..8d8de4cd11 100644
--- a/libs/waitress/runner.py
+++ b/libs/waitress/runner.py
@@ -19,7 +19,7 @@
 import logging
 import os
 import os.path
-import re
+import pkgutil
 import sys
 
 from waitress import serve
@@ -179,47 +179,6 @@
 
 """
 
-RUNNER_PATTERN = re.compile(
-    r"""
-    ^
-    (?P<module>
-        [a-z_][a-z0-9_]*(?:\.[a-z_][a-z0-9_]*)*
-    )
-    :
-    (?P<object>
-        [a-z_][a-z0-9_]*(?:\.[a-z_][a-z0-9_]*)*
-    )
-    $
-    """,
-    re.I | re.X,
-)
-
-
-def match(obj_name):
-    matches = RUNNER_PATTERN.match(obj_name)
-    if not matches:
-        raise ValueError(f"Malformed application '{obj_name}'")
-    return matches.group("module"), matches.group("object")
-
-
-def resolve(module_name, object_name):
-    """Resolve a named object in a module."""
-    # We cast each segments due to an issue that has been found to manifest
-    # in Python 2.6.6, but not 2.6.8, and may affect other revisions of Python
-    # 2.6 and 2.7, whereby ``__import__`` chokes if the list passed in the
-    # ``fromlist`` argument are unicode strings rather than 8-bit strings.
-    # The error triggered is "TypeError: Item in ``fromlist '' not a string".
-    # My guess is that this was fixed by checking against ``basestring``
-    # rather than ``str`` sometime between the release of 2.6.6 and 2.6.8,
-    # but I've yet to go over the commits. I know, however, that the NEWS
-    # file makes no mention of such a change to the behaviour of
-    # ``__import__``.
-    segments = [str(segment) for segment in object_name.split(".")]
-    obj = __import__(module_name, fromlist=segments[:1])
-    for segment in segments:
-        obj = getattr(obj, segment)
-    return obj
-
 
 def show_help(stream, name, error=None):  # pragma: no cover
     if error is not None:
@@ -268,25 +227,14 @@ def run(argv=sys.argv, _serve=serve):
     if logger.level == logging.NOTSET:
         logger.setLevel(logging.INFO)
 
-    try:
-        module, obj_name = match(args[0])
-    except ValueError as exc:
-        show_help(sys.stderr, name, str(exc))
-        show_exception(sys.stderr)
-        return 1
-
     # Add the current directory onto sys.path
     sys.path.append(os.getcwd())
 
     # Get the WSGI function.
     try:
-        app = resolve(module, obj_name)
-    except ImportError:
-        show_help(sys.stderr, name, f"Bad module '{module}'")
-        show_exception(sys.stderr)
-        return 1
-    except AttributeError:
-        show_help(sys.stderr, name, f"Bad object name '{obj_name}'")
+        app = pkgutil.resolve_name(args[0])
+    except (ValueError, ImportError, AttributeError) as exc:
+        show_help(sys.stderr, name, str(exc))
         show_exception(sys.stderr)
         return 1
     if kw["call"]:
diff --git a/libs/waitress/server.py b/libs/waitress/server.py
index a47308480b..1826cb84f6 100644
--- a/libs/waitress/server.py
+++ b/libs/waitress/server.py
@@ -34,7 +34,7 @@ def create_server(
     _start=True,  # test shim
     _sock=None,  # test shim
     _dispatcher=None,  # test shim
-    **kw  # adjustments
+    **kw,  # adjustments
 ):
     """
     if __name__ == '__main__':
@@ -193,7 +193,7 @@ def __init__(
         adj=None,  # adjustments
         sockinfo=None,  # opaque object
         bind_socket=True,
-        **kw
+        **kw,
     ):
         if adj is None:
             adj = Adjustments(**kw)
@@ -387,7 +387,7 @@ def __init__(
             dispatcher=None,  # dispatcher
             adj=None,  # adjustments
             sockinfo=None,  # opaque object
-            **kw
+            **kw,
         ):
             if sockinfo is None:
                 sockinfo = (socket.AF_UNIX, socket.SOCK_STREAM, None, None)
diff --git a/libs/waitress/task.py b/libs/waitress/task.py
index f24fbe005b..620bbdf690 100644
--- a/libs/waitress/task.py
+++ b/libs/waitress/task.py
@@ -13,7 +13,6 @@
 ##############################################################################
 
 from collections import deque
-import socket
 import sys
 import threading
 import time
@@ -389,7 +388,7 @@ def start_response(status, headers, exc_info=None):
 
             self.complete = True
 
-            if status.__class__ is not str:
+            if not isinstance(status, str):
                 raise AssertionError("status %s is not a string" % status)
             if "\n" in status or "\r" in status:
                 raise ValueError(
@@ -400,11 +399,11 @@ def start_response(status, headers, exc_info=None):
 
             # Prepare the headers for output
             for k, v in headers:
-                if k.__class__ is not str:
+                if not isinstance(k, str):
                     raise AssertionError(
                         f"Header name {k!r} is not a string in {(k, v)!r}"
                     )
-                if v.__class__ is not str:
+                if not isinstance(v, str):
                     raise AssertionError(
                         f"Header value {v!r} is not a string in {(k, v)!r}"
                     )
@@ -437,7 +436,7 @@ def start_response(status, headers, exc_info=None):
 
         can_close_app_iter = True
         try:
-            if app_iter.__class__ is ReadOnlyFileBasedBuffer:
+            if isinstance(app_iter, ReadOnlyFileBasedBuffer):
                 cl = self.content_length
                 size = app_iter.prepare(cl)
                 if size:
@@ -557,7 +556,6 @@ def get_environment(self):
         }
 
         for key, value in dict(request.headers).items():
-            value = value.strip()
             mykey = rename_headers.get(key, None)
             if mykey is None:
                 mykey = "HTTP_" + key
diff --git a/libs/waitress/wasyncore.py b/libs/waitress/wasyncore.py
index 86155578f0..6ec46a938c 100644
--- a/libs/waitress/wasyncore.py
+++ b/libs/waitress/wasyncore.py
@@ -53,19 +53,14 @@
 
 from errno import (
     EAGAIN,
-    EALREADY,
     EBADF,
     ECONNABORTED,
     ECONNRESET,
-    EINPROGRESS,
     EINTR,
-    EINVAL,
-    EISCONN,
     ENOTCONN,
     EPIPE,
     ESHUTDOWN,
     EWOULDBLOCK,
-    errorcode,
 )
 import logging
 import os
@@ -75,7 +70,7 @@
 import time
 import warnings
 
-from . import compat, utilities
+from . import utilities
 
 _DISCONNECTED = frozenset({ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE, EBADF})
 
@@ -297,22 +292,6 @@ def __init__(self, sock=None, map=None):
             # get a socket from a blocking source.
             sock.setblocking(0)
             self.set_socket(sock, map)
-            self.connected = True
-            # The constructor no longer requires that the socket
-            # passed be connected.
-            try:
-                self.addr = sock.getpeername()
-            except OSError as err:
-                if err.args[0] in (ENOTCONN, EINVAL):
-                    # To handle the case where we got an unconnected
-                    # socket.
-                    self.connected = False
-                else:
-                    # The socket is broken in some unknown way, alert
-                    # the user and remove it from the map (to prevent
-                    # polling of broken sockets).
-                    self.del_channel(map)
-                    raise
         else:
             self.socket = None
 
@@ -394,23 +373,6 @@ def bind(self, addr):
         self.addr = addr
         return self.socket.bind(addr)
 
-    def connect(self, address):
-        self.connected = False
-        self.connecting = True
-        err = self.socket.connect_ex(address)
-        if (
-            err in (EINPROGRESS, EALREADY, EWOULDBLOCK)
-            or err == EINVAL
-            and os.name == "nt"
-        ):  # pragma: no cover
-            self.addr = address
-            return
-        if err in (0, EISCONN):
-            self.addr = address
-            self.handle_connect_event()
-        else:
-            raise OSError(err, errorcode[err])
-
     def accept(self):
         # XXX can return either an address pair or None
         try:
@@ -469,6 +431,8 @@ def close(self):
                 if why.args[0] not in (ENOTCONN, EBADF):
                     raise
 
+            self.socket = None
+
     # log and log_info may be overridden to provide more sophisticated
     # logging and warning methods. In general, log is for 'hit' logging
     # and 'log_info' is for informational, warning and error logging.
@@ -519,7 +483,11 @@ def handle_expt_event(self):
         # handle_expt_event() is called if there might be an error on the
         # socket, or if there is OOB data
         # check for the error condition first
-        err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
+        err = (
+            self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
+            if self.socket is not None
+            else 1
+        )
         if err != 0:
             # we can get here when select.select() says that there is an
             # exceptional condition on the socket
@@ -572,34 +540,6 @@ def handle_close(self):
         self.close()
 
 
-# ---------------------------------------------------------------------------
-# adds simple buffered output capability, useful for simple clients.
-# [for more sophisticated usage use asynchat.async_chat]
-# ---------------------------------------------------------------------------
-
-
-class dispatcher_with_send(dispatcher):
-    def __init__(self, sock=None, map=None):
-        dispatcher.__init__(self, sock, map)
-        self.out_buffer = b""
-
-    def initiate_send(self):
-        num_sent = 0
-        num_sent = dispatcher.send(self, self.out_buffer[:65536])
-        self.out_buffer = self.out_buffer[num_sent:]
-
-    handle_write = initiate_send
-
-    def writable(self):
-        return (not self.connected) or len(self.out_buffer)
-
-    def send(self, data):
-        if self.debug:  # pragma: no cover
-            self.log_info("sending %s" % repr(data))
-        self.out_buffer = self.out_buffer + data
-        self.initiate_send()
-
-
 def close_all(map=None, ignore_all=False):
     if map is None:  # pragma: no cover
         map = socket_map
diff --git a/libs/wcwidth-0.2.13.dist-info/METADATA b/libs/wcwidth-0.2.13.dist-info/METADATA
deleted file mode 100644
index f7f7fcdcc8..0000000000
--- a/libs/wcwidth-0.2.13.dist-info/METADATA
+++ /dev/null
@@ -1,410 +0,0 @@
-Metadata-Version: 2.1
-Name: wcwidth
-Version: 0.2.13
-Summary: Measures the displayed width of unicode strings in a terminal
-Home-page: https://github.com/jquast/wcwidth
-Author: Jeff Quast
-Author-email: contact@jeffquast.com
-License: MIT
-Keywords: cjk,combining,console,eastasian,emoji,emulator,terminal,unicode,wcswidth,wcwidth,xterm
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Software Development :: Libraries
-Classifier: Topic :: Software Development :: Localization
-Classifier: Topic :: Software Development :: Internationalization
-Classifier: Topic :: Terminals
-License-File: LICENSE
-Requires-Dist: backports.functools-lru-cache >=1.2.1 ; python_version < "3.2"
-
-|pypi_downloads| |codecov| |license|
-
-============
-Introduction
-============
-
-This library is mainly for CLI programs that carefully produce output for
-Terminals, or make pretend to be an emulator.
-
-**Problem Statement**: The printable length of *most* strings are equal to the
-number of cells they occupy on the screen ``1 character : 1 cell``.  However,
-there are categories of characters that *occupy 2 cells* (full-wide), and
-others that *occupy 0* cells (zero-width).
-
-**Solution**: POSIX.1-2001 and POSIX.1-2008 conforming systems provide
-`wcwidth(3)`_ and `wcswidth(3)`_ C functions of which this python module's
-functions precisely copy.  *These functions return the number of cells a
-unicode string is expected to occupy.*
-
-Installation
-------------
-
-The stable version of this package is maintained on pypi, install using pip::
-
-    pip install wcwidth
-
-Example
--------
-
-**Problem**: given the following phrase (Japanese),
-
-   >>>  text = u'ใ‚ณใƒณใƒ‹ใƒใƒ'
-
-Python **incorrectly** uses the *string length* of 5 codepoints rather than the
-*printable length* of 10 cells, so that when using the `rjust` function, the
-output length is wrong::
-
-    >>> print(len('ใ‚ณใƒณใƒ‹ใƒใƒ'))
-    5
-
-    >>> print('ใ‚ณใƒณใƒ‹ใƒใƒ'.rjust(20, '_'))
-    _______________ใ‚ณใƒณใƒ‹ใƒใƒ
-
-By defining our own "rjust" function that uses wcwidth, we can correct this::
-
-   >>> def wc_rjust(text, length, padding=' '):
-   ...    from wcwidth import wcswidth
-   ...    return padding * max(0, (length - wcswidth(text))) + text
-   ...
-
-Our **Solution** uses wcswidth to determine the string length correctly::
-
-   >>> from wcwidth import wcswidth
-   >>> print(wcswidth('ใ‚ณใƒณใƒ‹ใƒใƒ'))
-   10
-
-   >>> print(wc_rjust('ใ‚ณใƒณใƒ‹ใƒใƒ', 20, '_'))
-   __________ใ‚ณใƒณใƒ‹ใƒใƒ
-
-
-Choosing a Version
-------------------
-
-Export an environment variable, ``UNICODE_VERSION``. This should be done by
-*terminal emulators* or those developers experimenting with authoring one of
-their own, from shell::
-
-   $ export UNICODE_VERSION=13.0
-
-If unspecified, the latest version is used. If your Terminal Emulator does not
-export this variable, you can use the `jquast/ucs-detect`_ utility to
-automatically detect and export it to your shell.
-
-wcwidth, wcswidth
------------------
-Use function ``wcwidth()`` to determine the length of a *single unicode
-character*, and ``wcswidth()`` to determine the length of many, a *string
-of unicode characters*.
-
-Briefly, return values of function ``wcwidth()`` are:
-
-``-1``
-  Indeterminate (not printable).
-
-``0``
-  Does not advance the cursor, such as NULL or Combining.
-
-``2``
-  Characters of category East Asian Wide (W) or East Asian
-  Full-width (F) which are displayed using two terminal cells.
-
-``1``
-  All others.
-
-Function ``wcswidth()`` simply returns the sum of all values for each character
-along a string, or ``-1`` when it occurs anywhere along a string.
-
-Full API Documentation at https://wcwidth.readthedocs.org
-
-==========
-Developing
-==========
-
-Install wcwidth in editable mode::
-
-   pip install -e .
-
-Execute unit tests using tox_::
-
-   tox -e py27,py35,py36,py37,py38,py39,py310,py311,py312
-
-Updating Unicode Version
-------------------------
-
-Regenerate python code tables from latest Unicode Specification data files::
-
-   tox -e update
-
-The script is located at ``bin/update-tables.py``, requires Python 3.9 or
-later. It is recommended but not necessary to run this script with the newest
-Python, because the newest Python has the latest ``unicodedata`` for generating
-comments.
-
-Building Documentation
-----------------------
-
-This project is using `sphinx`_ 4.5 to build documentation::
-
-   tox -e sphinx
-
-The output will be in ``docs/_build/html/``.
-
-Updating Requirements
----------------------
-
-This project is using `pip-tools`_ to manage requirements.
-
-To upgrade requirements for updating unicode version, run::
-
-   tox -e update_requirements_update
-
-To upgrade requirements for testing, run::
-
-   tox -e update_requirements37,update_requirements39
-
-To upgrade requirements for building documentation, run::
-
-   tox -e update_requirements_docs
-
-Utilities
----------
-
-Supplementary tools for browsing and testing terminals for wide unicode
-characters are found in the `bin/`_ of this project's source code.  Just ensure
-to first ``pip install -r requirements-develop.txt`` from this projects main
-folder. For example, an interactive browser for testing::
-
-  python ./bin/wcwidth-browser.py
-
-====
-Uses
-====
-
-This library is used in:
-
-- `jquast/blessed`_: a thin, practical wrapper around terminal capabilities in
-  Python.
-
-- `prompt-toolkit/python-prompt-toolkit`_: a Library for building powerful
-  interactive command lines in Python.
-
-- `dbcli/pgcli`_: Postgres CLI with autocompletion and syntax highlighting.
-
-- `thomasballinger/curtsies`_: a Curses-like terminal wrapper with a display
-  based on compositing 2d arrays of text.
-
-- `selectel/pyte`_: Simple VTXXX-compatible linux terminal emulator.
-
-- `astanin/python-tabulate`_: Pretty-print tabular data in Python, a library
-  and a command-line utility.
-
-- `rspeer/python-ftfy`_: Fixes mojibake and other glitches in Unicode
-  text.
-
-- `nbedos/termtosvg`_: Terminal recorder that renders sessions as SVG
-  animations.
-
-- `peterbrittain/asciimatics`_: Package to help people create full-screen text
-  UIs.
-
-- `python-cmd2/cmd2`_: A tool for building interactive command line apps
-
-- `stratis-storage/stratis-cli`_: CLI for the Stratis project
-
-- `ihabunek/toot`_: A Mastodon CLI/TUI client
-
-- `saulpw/visidata`_: Terminal spreadsheet multitool for discovering and
-  arranging data
-
-===============
-Other Languages
-===============
-
-- `timoxley/wcwidth`_: JavaScript
-- `janlelis/unicode-display_width`_: Ruby
-- `alecrabbit/php-wcwidth`_: PHP
-- `Text::CharWidth`_: Perl
-- `bluebear94/Terminal-WCWidth`_: Perl 6
-- `mattn/go-runewidth`_: Go
-- `grepsuzette/wcwidth`_: Haxe
-- `aperezdc/lua-wcwidth`_: Lua
-- `joachimschmidt557/zig-wcwidth`_: Zig
-- `fumiyas/wcwidth-cjk`_: `LD_PRELOAD` override
-- `joshuarubin/wcwidth9`_: Unicode version 9 in C
-
-=======
-History
-=======
-
-0.2.13 *2024-01-06*
-  * **Bugfix** zero-width support for Hangul Jamo (Korean)
-
-0.2.12 *2023-11-21*
-  * re-release to remove .pyi file misplaced in wheel files `Issue #101`_.
-
-0.2.11 *2023-11-20*
-  * Include tests files in the source distribution (`PR #98`_, `PR #100`_).
-
-0.2.10 *2023-11-13*
-  * **Bugfix** accounting of some kinds of emoji sequences using U+FE0F
-    Variation Selector 16 (`PR #97`_).
-  * **Updated** `Specification <Specification_from_pypi_>`_.
-
-0.2.9 *2023-10-30*
-  * **Bugfix** zero-width characters used in Emoji ZWJ sequences, Balinese,
-    Jamo, Devanagari, Tamil, Kannada and others (`PR #91`_).
-  * **Updated** to include `Specification <Specification_from_pypi_>`_ of
-    character measurements.
-
-0.2.8 *2023-09-30*
-  * Include requirements files in the source distribution (`PR #82`_).
-
-0.2.7 *2023-09-28*
-  * **Updated** tables to include Unicode Specification 15.1.0.
-  * Include ``bin``, ``docs``, and ``tox.ini`` in the source distribution
-
-0.2.6 *2023-01-14*
-  * **Updated** tables to include Unicode Specification 14.0.0 and 15.0.0.
-  * **Changed** developer tools to use pip-compile, and to use jinja2 templates
-    for code generation in `bin/update-tables.py` to prepare for possible
-    compiler optimization release.
-
-0.2.1 .. 0.2.5 *2020-06-23*
-  * **Repository** changes to update tests and packaging issues, and
-    begin tagging repository with matching release versions.
-
-0.2.0 *2020-06-01*
-  * **Enhancement**: Unicode version may be selected by exporting the
-    Environment variable ``UNICODE_VERSION``, such as ``13.0``, or ``6.3.0``.
-    See the `jquast/ucs-detect`_ CLI utility for automatic detection.
-  * **Enhancement**:
-    API Documentation is published to readthedocs.org.
-  * **Updated** tables for *all* Unicode Specifications with files
-    published in a programmatically consumable format, versions 4.1.0
-    through 13.0
-
-0.1.9 *2020-03-22*
-  * **Performance** optimization by `Avram Lubkin`_, `PR #35`_.
-  * **Updated** tables to Unicode Specification 13.0.0.
-
-0.1.8 *2020-01-01*
-  * **Updated** tables to Unicode Specification 12.0.0. (`PR #30`_).
-
-0.1.7 *2016-07-01*
-  * **Updated** tables to Unicode Specification 9.0.0. (`PR #18`_).
-
-0.1.6 *2016-01-08 Production/Stable*
-  * ``LICENSE`` file now included with distribution.
-
-0.1.5 *2015-09-13 Alpha*
-  * **Bugfix**:
-    Resolution of "combining_ character width" issue, most especially
-    those that previously returned -1 now often (correctly) return 0.
-    resolved by `Philip Craig`_ via `PR #11`_.
-  * **Deprecated**:
-    The module path ``wcwidth.table_comb`` is no longer available,
-    it has been superseded by module path ``wcwidth.table_zero``.
-
-0.1.4 *2014-11-20 Pre-Alpha*
-  * **Feature**: ``wcswidth()`` now determines printable length
-    for (most) combining_ characters.  The developer's tool
-    `bin/wcwidth-browser.py`_ is improved to display combining_
-    characters when provided the ``--combining`` option
-    (`Thomas Ballinger`_ and `Leta Montopoli`_ `PR #5`_).
-  * **Feature**: added static analysis (prospector_) to testing
-    framework.
-
-0.1.3 *2014-10-29 Pre-Alpha*
-  * **Bugfix**: 2nd parameter of wcswidth was not honored.
-    (`Thomas Ballinger`_, `PR #4`_).
-
-0.1.2 *2014-10-28 Pre-Alpha*
-  * **Updated** tables to Unicode Specification 7.0.0.
-    (`Thomas Ballinger`_, `PR #3`_).
-
-0.1.1 *2014-05-14 Pre-Alpha*
-  * Initial release to pypi, Based on Unicode Specification 6.3.0
-
-This code was originally derived directly from C code of the same name,
-whose latest version is available at
-https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c::
-
- * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
- *
- * Permission to use, copy, modify, and distribute this software
- * for any purpose and without fee is hereby granted. The author
- * disclaims all warranties with regard to this software.
-
-.. _`Specification_from_pypi`: https://wcwidth.readthedocs.io/en/latest/specs.html
-.. _`tox`: https://tox.wiki/en/latest/
-.. _`prospector`: https://github.com/landscapeio/prospector
-.. _`combining`: https://en.wikipedia.org/wiki/Combining_character
-.. _`bin/`: https://github.com/jquast/wcwidth/tree/master/bin
-.. _`bin/wcwidth-browser.py`: https://github.com/jquast/wcwidth/blob/master/bin/wcwidth-browser.py
-.. _`Thomas Ballinger`: https://github.com/thomasballinger
-.. _`Leta Montopoli`: https://github.com/lmontopo
-.. _`Philip Craig`: https://github.com/philipc
-.. _`PR #3`: https://github.com/jquast/wcwidth/pull/3
-.. _`PR #4`: https://github.com/jquast/wcwidth/pull/4
-.. _`PR #5`: https://github.com/jquast/wcwidth/pull/5
-.. _`PR #11`: https://github.com/jquast/wcwidth/pull/11
-.. _`PR #18`: https://github.com/jquast/wcwidth/pull/18
-.. _`PR #30`: https://github.com/jquast/wcwidth/pull/30
-.. _`PR #35`: https://github.com/jquast/wcwidth/pull/35
-.. _`PR #82`: https://github.com/jquast/wcwidth/pull/82
-.. _`PR #91`: https://github.com/jquast/wcwidth/pull/91
-.. _`PR #97`: https://github.com/jquast/wcwidth/pull/97
-.. _`PR #98`: https://github.com/jquast/wcwidth/pull/98
-.. _`PR #100`: https://github.com/jquast/wcwidth/pull/100
-.. _`Issue #101`: https://github.com/jquast/wcwidth/issues/101
-.. _`jquast/blessed`: https://github.com/jquast/blessed
-.. _`selectel/pyte`: https://github.com/selectel/pyte
-.. _`thomasballinger/curtsies`: https://github.com/thomasballinger/curtsies
-.. _`dbcli/pgcli`: https://github.com/dbcli/pgcli
-.. _`prompt-toolkit/python-prompt-toolkit`: https://github.com/prompt-toolkit/python-prompt-toolkit
-.. _`timoxley/wcwidth`: https://github.com/timoxley/wcwidth
-.. _`wcwidth(3)`:  https://man7.org/linux/man-pages/man3/wcwidth.3.html
-.. _`wcswidth(3)`: https://man7.org/linux/man-pages/man3/wcswidth.3.html
-.. _`astanin/python-tabulate`: https://github.com/astanin/python-tabulate
-.. _`janlelis/unicode-display_width`: https://github.com/janlelis/unicode-display_width
-.. _`rspeer/python-ftfy`: https://github.com/rspeer/python-ftfy
-.. _`alecrabbit/php-wcwidth`: https://github.com/alecrabbit/php-wcwidth
-.. _`Text::CharWidth`: https://metacpan.org/pod/Text::CharWidth
-.. _`bluebear94/Terminal-WCWidth`: https://github.com/bluebear94/Terminal-WCWidth
-.. _`mattn/go-runewidth`: https://github.com/mattn/go-runewidth
-.. _`grepsuzette/wcwidth`: https://github.com/grepsuzette/wcwidth
-.. _`jquast/ucs-detect`: https://github.com/jquast/ucs-detect
-.. _`Avram Lubkin`: https://github.com/avylove
-.. _`nbedos/termtosvg`: https://github.com/nbedos/termtosvg
-.. _`peterbrittain/asciimatics`: https://github.com/peterbrittain/asciimatics
-.. _`aperezdc/lua-wcwidth`: https://github.com/aperezdc/lua-wcwidth
-.. _`joachimschmidt557/zig-wcwidth`: https://github.com/joachimschmidt557/zig-wcwidth
-.. _`fumiyas/wcwidth-cjk`: https://github.com/fumiyas/wcwidth-cjk
-.. _`joshuarubin/wcwidth9`: https://github.com/joshuarubin/wcwidth9
-.. _`python-cmd2/cmd2`: https://github.com/python-cmd2/cmd2
-.. _`stratis-storage/stratis-cli`: https://github.com/stratis-storage/stratis-cli
-.. _`ihabunek/toot`: https://github.com/ihabunek/toot
-.. _`saulpw/visidata`: https://github.com/saulpw/visidata
-.. _`pip-tools`: https://pip-tools.readthedocs.io/
-.. _`sphinx`: https://www.sphinx-doc.org/
-.. |pypi_downloads| image:: https://img.shields.io/pypi/dm/wcwidth.svg?logo=pypi
-    :alt: Downloads
-    :target: https://pypi.org/project/wcwidth/
-.. |codecov| image:: https://codecov.io/gh/jquast/wcwidth/branch/master/graph/badge.svg
-    :alt: codecov.io Code Coverage
-    :target: https://app.codecov.io/gh/jquast/wcwidth/
-.. |license| image:: https://img.shields.io/pypi/l/wcwidth.svg
-    :target: https://pypi.org/project/wcwidth/
-    :alt: MIT License
diff --git a/libs/wcwidth-0.2.13.dist-info/RECORD b/libs/wcwidth-0.2.13.dist-info/RECORD
deleted file mode 100644
index bd54518ee5..0000000000
--- a/libs/wcwidth-0.2.13.dist-info/RECORD
+++ /dev/null
@@ -1,14 +0,0 @@
-wcwidth-0.2.13.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-wcwidth-0.2.13.dist-info/LICENSE,sha256=cLmKlaIUTrcK-AF_qMbZXOJH5AhnQ26LxknhN_4T0ho,1322
-wcwidth-0.2.13.dist-info/METADATA,sha256=wBs2ALubn0kTdhEFDXc1gZBU_zf4rlfNgv1YS02jzLQ,14992
-wcwidth-0.2.13.dist-info/RECORD,,
-wcwidth-0.2.13.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wcwidth-0.2.13.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-wcwidth-0.2.13.dist-info/top_level.txt,sha256=LLjS8SFiXXuLEcD2BNdFdGhpKWe5opHtvn7KNj9AIRI,8
-wcwidth-0.2.13.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-wcwidth/__init__.py,sha256=ecZx3UVoktZuAvatG6NetByVFgENkKl9htmk0ZasTmA,1076
-wcwidth/table_vs16.py,sha256=hPbuoFxmxrGfuBaeoheMTAGmgB2a4EudhxYsYokLf6o,6857
-wcwidth/table_wide.py,sha256=vUHjEOuRw1WGyUcIw2L9GymZsYvC2I3dc858mlYyTYM,100896
-wcwidth/table_zero.py,sha256=4ZeihLZDH8obgrwA6ct-vu2lxc4t_DsfyiB9p9Ovxbo,359450
-wcwidth/unicode_versions.py,sha256=7nShgeRYrvZFkGpREdr-PkUeXnuM-WxeOmGYj6QNaaE,851
-wcwidth/wcwidth.py,sha256=TLzyH1ahdEDDPOIMcqVO4U0gyKwSyZdzAsSgEPuVFGY,14512
diff --git a/libs/wcwidth-0.2.13.dist-info/WHEEL b/libs/wcwidth-0.2.13.dist-info/WHEEL
deleted file mode 100644
index f31e450fda..0000000000
--- a/libs/wcwidth-0.2.13.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/libs/wcwidth-0.2.13.dist-info/top_level.txt b/libs/wcwidth-0.2.13.dist-info/top_level.txt
deleted file mode 100644
index 723a22ca00..0000000000
--- a/libs/wcwidth-0.2.13.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-wcwidth
diff --git a/libs/wcwidth-0.2.13.dist-info/zip-safe b/libs/wcwidth-0.2.13.dist-info/zip-safe
deleted file mode 100644
index 8b13789179..0000000000
--- a/libs/wcwidth-0.2.13.dist-info/zip-safe
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/libs/wcwidth-0.2.13.dist-info/INSTALLER b/libs/wcwidth-0.6.0.dist-info/INSTALLER
similarity index 100%
rename from libs/wcwidth-0.2.13.dist-info/INSTALLER
rename to libs/wcwidth-0.6.0.dist-info/INSTALLER
diff --git a/libs/wcwidth-0.6.0.dist-info/METADATA b/libs/wcwidth-0.6.0.dist-info/METADATA
new file mode 100644
index 0000000000..f6f0235df8
--- /dev/null
+++ b/libs/wcwidth-0.6.0.dist-info/METADATA
@@ -0,0 +1,776 @@
+Metadata-Version: 2.4
+Name: wcwidth
+Version: 0.6.0
+Summary: Measures the displayed width of unicode strings in a terminal
+Project-URL: Homepage, https://github.com/jquast/wcwidth
+Author-email: Jeff Quast <contact@jeffquast.com>
+License-Expression: MIT
+License-File: LICENSE
+Keywords: cjk,combining,console,eastasian,emoji,emulator,terminal,unicode,wcswidth,wcwidth,xterm
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: Natural Language :: English
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Software Development :: Internationalization
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Topic :: Software Development :: Localization
+Classifier: Topic :: Terminals
+Classifier: Typing :: Typed
+Requires-Python: >=3.8
+Description-Content-Type: text/x-rst
+
+|pypi_downloads| |codecov| |license|
+
+============
+Introduction
+============
+
+This library is mainly for CLI/TUI programs that carefully produce output for Terminals.
+
+Installation
+------------
+
+The stable version of this package is maintained on pypi, install or upgrade, using pip::
+
+    pip install --upgrade wcwidth
+
+Problem
+-------
+
+All Python string-formatting functions, `textwrap.wrap()`_, `str.ljust()`_, `str.rjust()`_, and
+`str.center()`_ **incorrectly** measure the displayed width of a string as equal to the number of
+their codepoints.
+
+Some examples of **incorrect results**:
+
+.. code-block:: python
+
+    >>> # result consumes 16 total cells, 11 expected,
+    >>> 'ใ‚ณใƒณใƒ‹ใƒใƒ'.rjust(11, 'X')
+    'XXXXXXใ‚ณใƒณใƒ‹ใƒใƒ'
+
+    >>> # result consumes 5 total cells, 6 expected,
+    >>> 'cafรฉ'.center(6, 'X')
+    'cafรฉX'
+
+Solution
+--------
+
+The lowest-level functions in this library are the POSIX.1-2001 and POSIX.1-2008 `wcwidth(3)`_ and
+`wcswidth(3)`_, which this library precisely copies by interface as `wcwidth()`_ and `wcswidth()`_.
+These functions return -1 when C0 and C1 control codes are present.
+
+An easy-to-use `width()`_ function is provided as a wrapper of `wcswidth()`_ that is also capable of
+measuring most terminal control codes and sequences, like colors, bold, tabstops, and horizontal
+cursor movement.
+
+Text-justification is solved by the grapheme and sequence-aware functions `ljust()`_,
+`rjust()`_, `center()`_, and `wrap()`_, serving as drop-in replacements to python standard functions
+of the same names.
+
+The iterator functions `iter_graphemes()`_ and `iter_sequences()`_ allow for careful navigation of
+grapheme and terminal control sequence boundaries.  `iter_graphemes_reverse()`_, and
+`grapheme_boundary_before()`_ are useful for editing and searching of complex unicode.  The
+`clip()`_ function extracts substrings by display column positions, and `strip_sequences()`_ removes
+terminal escape sequences from text altogether.
+
+Discrepancies
+-------------
+
+You may find that support *varies* for complex unicode sequences or codepoints.
+
+A companion utility, `jquast/ucs-detect`_ was authored to gather and publish the results of Wide
+character, language/grapheme clustering and complex script support, emojis and zero-width joiner,
+variations, and regional indicator (flags) as a `General Tabulated Summary`_ by terminal emulator
+software and version.
+
+========
+Overview
+========
+
+wcwidth()
+---------
+
+Use function ``wcwidth()`` to determine the length of a *single unicode
+codepoint*.
+
+A brief overview, through examples, for all of the public API functions.
+
+Full API Documentation at https://wcwidth.readthedocs.io/en/latest/api.html
+
+wcwidth()
+---------
+
+Measures width of a single codepoint,
+
+.. code-block:: python
+
+    >>> # 'โ™€' narrow emoji
+    >>> wcwidth.wcwidth('\u2640')
+    1
+
+Use function `wcwidth()`_ to determine the length of a *single unicode character*.
+
+See specification_ of character measurements. Note that ``-1`` is returned for control codes.
+
+wcswidth()
+----------
+
+Measures width of a string, returns -1 for control codes.
+
+.. code-block:: python
+
+    >>> # 'โ™€๏ธ' emoji w/vs-16
+    >>> wcwidth.wcswidth('\u2640\ufe0f')
+    2
+
+Use function `wcswidth()`_ to determine the length of many, a *string of unicode characters*.
+
+See specification_ of character measurements. Note that ``-1`` is returned if control codes occurs
+anywhere in the string.
+
+width()
+-------
+
+Use function `width()`_ to measure a string with improved handling of ``control_codes``.
+
+.. code-block:: python
+
+    >>> # same support as wcswidth(), eg. regional indicator flag:
+    >>> wcwidth.width('\U0001F1FF\U0001F1FC')
+    2
+    >>> # but also supports SGR colored text, 'WARN', followed by SGR reset
+    >>> wcwidth.width('\x1b[38;2;255;150;100mWARN\x1b[0m')
+    4
+    >>> # tabs,
+    >>> wcwidth.width('\t', tabsize=4)
+    4
+    >>> # or, tab and all other control characters can be ignored
+    >>> wcwidth.width('\t', control_codes='ignore')
+    0
+    >>> # "vertical" control characters are ignored
+    >>> wcwidth.width('\n')
+    0
+    >>> # as well as sequences with "indeterminate" effects like Home + Clear
+    >>> wcwidth.width('\x1b[H\x1b[2J')
+    0
+    >>> # or, raise ValueError for "indeterminate" effects using control_codes='strict'
+    >>> wcwidth.width('\n', control_codes='strict')
+    Traceback (most recent call last):
+    ...
+    ValueError: Vertical movement character 0xa at position 0
+
+Use ``control_codes='ignore'`` when the input is known not to contain any control characters or
+terminal sequences for slightly improved performance. Note that TAB (``'\t'``) is a control
+character and is also ignored, you may want to use `str.expandtabs()`_, first.
+
+iter_sequences()
+----------------
+
+Iterates through text, segmented by terminal sequence,
+
+.. code-block:: python
+
+    >>> list(wcwidth.iter_sequences('hello'))
+    [('hello', False)]
+    >>> list(wcwidth.iter_sequences('\x1b[31mred\x1b[0m'))
+    [('\x1b[31m', True), ('red', False), ('\x1b[0m', True)]
+
+Use `iter_sequences()`_ to split text into segments of plain text and escape sequences. Each tuple
+contains the segment string and a boolean indicating whether it is an escape sequence (``True``) or
+text (``False``).
+
+iter_graphemes()
+----------------
+
+Use `iter_graphemes()`_ to iterate over *grapheme clusters* of a string.
+
+.. code-block:: python
+
+    >>> from wcwidth import iter_graphemes
+    >>> # ok + Regional Indicator 'Z', 'W' (Zimbabwe)
+    >>> list(wcwidth.iter_graphemes('ok\U0001F1FF\U0001F1FC'))
+    ['o', 'k', '๐Ÿ‡ฟ๐Ÿ‡ผ']
+
+    >>> # cafe + combining acute accent
+    >>> list(wcwidth.iter_graphemes('cafe\u0301'))
+    ['c', 'a', 'f', 'รฉ']
+
+    >>> # ok + Emoji Man + ZWJ + Woman + ZWJ + Girl
+    >>> list(wcwidth.iter_graphemes('ok\U0001F468\u200D\U0001F469\u200D\U0001F467'))
+    ['o', 'k', '๐Ÿ‘จ\u200d๐Ÿ‘ฉ\u200d๐Ÿ‘ง']
+
+A grapheme cluster is what a user perceives as a single character, even if it is composed of
+multiple Unicode codepoints. This function implements `Unicode Standard Annex #29`_ grapheme cluster
+boundary rules.
+
+ljust()
+-------
+
+Use `ljust()`_ as replacement of `str.ljust()`_:
+
+.. code-block:: python
+
+    >>> 'ใ‚ณใƒณใƒ‹ใƒใƒ'.ljust(11, '*')             # don't do this
+    'ใ‚ณใƒณใƒ‹ใƒใƒ******'
+    >>> wcwidth.ljust('ใ‚ณใƒณใƒ‹ใƒใƒ', 11, '*')    # do this!
+    'ใ‚ณใƒณใƒ‹ใƒใƒ*'
+
+rjust()
+-------
+
+Use `rjust()`_ as replacement of `str.rjust()`_:
+
+.. code-block:: python
+
+    >>> 'ใ‚ณใƒณใƒ‹ใƒใƒ'.rjust(11, '*')             # don't do this
+    '******ใ‚ณใƒณใƒ‹ใƒใƒ'
+    >>> wcwidth.rjust('ใ‚ณใƒณใƒ‹ใƒใƒ', 11, '*')    # do this!
+    '*ใ‚ณใƒณใƒ‹ใƒใƒ'
+
+center()
+--------
+
+Use `center()`_ as replacement of `str.center()`_:
+
+.. code-block:: python
+
+    >>> 'cafe\u0301'.center(6, '*')             # don't do this
+    'cafรฉ*'
+    >>> wcwidth.center('cafe\u0301', 6, '*')
+    '*cafรฉ*'                                    # do this!
+
+wrap()
+------
+
+Use function `wrap()`_ to wrap text containing terminal sequences, Unicode grapheme
+clusters, and wide characters to a given display width.
+
+.. code-block:: python
+
+    >>> from wcwidth import wrap
+    >>> # Basic wrapping
+    >>> wrap('hello world', 5)
+    ['hello', 'world']
+
+    >>> # Wrapping CJK text (each character is 2 cells wide)
+    >>> wrap('ใ‚ณใƒณใƒ‹ใƒใƒ', 4)
+    ['ใ‚ณใƒณ', 'ใƒ‹ใƒ', 'ใƒ']
+
+    >>> # Text with ANSI color sequences - SGR codes are propagated by default
+    >>> # Each line ends with reset, next line starts with restored style
+    >>> wrap('\x1b[1;31mhello world\x1b[0m', 5)
+    ['\x1b[1;31mhello\x1b[0m', '\x1b[1;31mworld\x1b[0m']
+
+clip()
+------
+
+Use `clip()`_ to extract a substring by column positions, preserving terminal sequences.
+
+.. code-block:: python
+
+    >>> from wcwidth import clip
+    >>> # Wide characters split to Narrow boundaries using fillchar=' '
+    >>> clip('ไธญๆ–‡ๅญ—', 0, 3)
+    'ไธญ '
+    >>> clip('ไธญๆ–‡ๅญ—', 1, 5, fillchar='.')
+    '.ๆ–‡.'
+
+    >>> # SGR codes are propagated by default - result begins with active style
+    >>> # and ends with reset if styles are active
+    >>> clip('\x1b[1;31mHello world\x1b[0m', 6, 11)
+    '\x1b[1;31mworld\x1b[0m'
+
+    >>> # Disable SGR propagation to preserve original sequences as-is
+    >>> clip('\x1b[31mไธญๆ–‡\x1b[0m', 0, 3, propagate_sgr=False)
+    '\x1b[31mไธญ \x1b[0m'
+
+strip_sequences()
+-----------------
+
+Use `strip_sequences()`_ to remove all terminal escape sequences from text.
+
+.. code-block:: python
+
+    >>> from wcwidth import strip_sequences
+    >>> strip_sequences('\x1b[31mred\x1b[0m')
+    'red'
+
+.. _ambiguous_width:
+
+ambiguous_width
+---------------
+
+Some Unicode characters have "East Asian Ambiguous" (A) width. These characters display as 1 cell by
+default, matching Western terminal contexts, but many CJK (Chinese, Japanese, Korean) environments
+may have a preference for 2 cells.  This is often found as boolean option, "Ambiguous width as wide"
+in Terminal Emulator software preferences.
+
+By default, wcwidth treats ambiguous characters as narrow (width 1). For CJK environments where your
+terminal is configured to display ambiguous characters as double-width, pass ``ambiguous_width=2``:
+
+.. code-block:: python
+
+    >>> # CIRCLED DIGIT ONE - ambiguous width
+    >>> wcwidth.width('\u2460')
+    1
+    >>> wcwidth.width('\u2460', ambiguous_width=2)
+    2
+
+The ``ambiguous_width`` parameter is available on all width-measuring functions: `wcwidth()`_,
+`wcswidth()`_, `width()`_, `ljust()`_, `rjust()`_, `center()`_, `wrap()`_, and `clip()`_.
+
+**Terminal Detection**
+
+The most reliable method to detect whether a terminal profile is set for "Ambiguous width as wide"
+mode is to display an ambiguous character surrounded by a pair of Cursor Position Report (CPR)
+queries with a terminal in cooked or raw mode, and to parse the responses for their ``(y, x)``
+locations and measure the difference ``x``.
+
+This code should also be careful check whether it is attached to a terminal and be careful of
+possible timeout, slow network, or non-response when working with "dumb terminals" like a CI build.
+
+`jquast/blessed`_ library provides such a helping `Terminal.detect_ambiguous_width()`_ method:
+
+.. code-block:: python
+
+    >>> import blessed, functools
+    >>> # Detect terminal ambiguous width as wide (2) or narrow (1)
+    >>> ambiguous_width = blessed.Terminal().detect_ambiguous_width()
+    >>> # Define a new 'width' function with this argument
+    >>> awidth = functools.partial(wcwidth.width, ambiguous_width=ambiguous_width)
+    >>> # result depends on attached terminal mode
+    >>> awidth('\u2460')
+    1
+
+==========
+Developing
+==========
+
+Install wcwidth in editable mode::
+
+   pip install -e .
+
+Execute all code generation, autoformatters, linters and unit tests using tox::
+
+   tox
+
+Or execute individual tasks, see ``tox -lv`` for all available targets::
+
+   tox -e pylint,py36,py314
+
+To run tests with detailed coverage reporting showing missing lines::
+
+   tox -epy314 -- --cov-report=term-missing
+
+Updating Unicode Version
+------------------------
+
+Regenerate python code tables from latest Unicode Specification data files::
+
+   tox -e update
+
+The script is located at ``bin/update-tables.py``, requires Python 3.9 or
+later. It is recommended but not necessary to run this script with the newest
+Python, because the newest Python has the latest ``unicodedata`` for generating
+comments.
+
+Building Documentation
+----------------------
+
+This project is using `sphinx`_ 4.5 to build documentation::
+
+   tox -e sphinx
+
+The output will be in ``docs/_build/html/``.
+
+Updating Requirements
+---------------------
+
+This project is using `pip-tools`_ to manage requirements.
+
+To upgrade requirements for updating unicode version, run::
+
+   tox -e update_requirements_update
+
+To upgrade requirements for testing, run::
+
+   tox -e update_requirements38,update_requirements39
+
+To upgrade requirements for building documentation, run::
+
+   tox -e update_requirements_docs
+
+Utilities
+---------
+
+Supplementary tools for browsing and testing terminals for wide unicode
+characters are found in the `bin/`_ of this project's source code.  Just ensure
+to first ``pip install -r requirements-develop.txt`` from this projects main
+folder. For example, an interactive browser for testing::
+
+  python ./bin/wcwidth-browser.py
+
+====
+Uses
+====
+
+This library is used in:
+
+- `jquast/blessed`_: a thin, practical wrapper around terminal capabilities in
+  Python.
+
+- `prompt-toolkit/python-prompt-toolkit`_: a Library for building powerful
+  interactive command lines in Python.
+
+- `dbcli/pgcli`_: Postgres CLI with autocompletion and syntax highlighting.
+
+- `thomasballinger/curtsies`_: a Curses-like terminal wrapper with a display
+  based on compositing 2d arrays of text.
+
+- `selectel/pyte`_: Simple VTXXX-compatible linux terminal emulator.
+
+- `astanin/python-tabulate`_: Pretty-print tabular data in Python, a library
+  and a command-line utility.
+
+- `rspeer/python-ftfy`_: Fixes mojibake and other glitches in Unicode
+  text.
+
+- `nbedos/termtosvg`_: Terminal recorder that renders sessions as SVG
+  animations.
+
+- `peterbrittain/asciimatics`_: Package to help people create full-screen text
+  UIs.
+
+- `python-cmd2/cmd2`_: A tool for building interactive command line apps
+
+- `stratis-storage/stratis-cli`_: CLI for the Stratis project
+
+- `ihabunek/toot`_: A Mastodon CLI/TUI client
+
+- `saulpw/visidata`_: Terminal spreadsheet multitool for discovering and
+  arranging data
+
+- `jquast/ucs-detect`_: Utility for unicode support detection.
+
+===============
+Other Languages
+===============
+
+There are similar implementations of the `wcwidth()`_ and `wcswidth()`_ functions in other
+languages.
+
+- `timoxley/wcwidth`_: JavaScript
+- `janlelis/unicode-display_width`_: Ruby
+- `alecrabbit/php-wcwidth`_: PHP
+- `Text::CharWidth`_: Perl
+- `bluebear94/Terminal-WCWidth`_: Perl 6
+- `mattn/go-runewidth`_: Go
+- `grepsuzette/wcwidth`_: Haxe
+- `aperezdc/lua-wcwidth`_: Lua
+- `joachimschmidt557/zig-wcwidth`_: Zig
+- `fumiyas/wcwidth-cjk`_: `LD_PRELOAD` override
+- `joshuarubin/wcwidth9`_: Unicode version 9 in C
+- `spectreconsole/wcwidth`_: C#
+
+=======
+History
+=======
+
+0.6.0 *2026-02-06*
+  * **New** Parameters ``expand_tabs``, ``replace_whitespace``, ``fix_sentence_endings``,
+    ``drop_whitespace``, ``max_lines``, and ``placeholder`` for `wrap()`_, completing stdlib
+    `textwrap.wrap()`_ compatibility.
+
+0.5.3 *2026-01-30*
+  * **Bugfix** Brahmic using Virama conjunct formation. `Issue #155`_, `PR #204`_.
+
+0.5.2 *2026-01-29*
+  * **Bugfix** Measurement of category ``Mc`` (`Spacing Combining Mark`_), approx.  443, has a more
+    nuanced specification_, and may be categorized as either zero or wide. `PR #200`_.
+  * **Bugfix** Measurement of "standalone" modifiers and regional indicators, `PR #202`_.
+  * **Updated** Data files used in some automatic tests are no longer distributed. `PR #199`_
+
+0.5.1 *2026-01-27*
+  * **Updated** generated zero and wide code tables to length of 1 to complete the previously
+    announced removal of historical wide and zero tables. `PR #196`_.
+
+0.5.0 *2026-01-26*
+  * **Drop Support** of many historical versions of wide and zero unicode tables.  Only the latest
+    Unicode version (17.0.0) is now shipped. The related ``unicode_version='auto'`` keyword of the
+    `wcwidth()`_ family of functions are ignored. `list_versions()`_ always returns a tuple of only
+    a single element of the only unicode version supported. `PR #195`_.
+  * **Performance** improvement of most common call without version or ambiguous_width specified by
+    20%. `PR #195`_.
+  * **New** Function `propagate_sgr()`_ for applying SGR state propagation to a list of lines.
+    `PR #194`_.
+  * **Improved** `wrap()`_ and `clip()`_ with ``propagate_sgr=True``. `PR #194`_.
+  * **Bugfix** `clip()`_ zero-width characters at clipping boundaries. `PR #194`_.
+  * **Bugfix** OSC Hyperlinks when broken mid-text by `wrap()`_. `PR #193`_.
+
+0.4.0 *2026-01-25*
+  * **New** Functions `iter_graphemes_reverse()`_, `grapheme_boundary_before()`_. `PR #192`_.
+  * **Bugfix** OSC Hyperlinks should not be broken by `wrap()`_. `PR #191`_.
+
+0.3.5 *2026-01-24*
+  * **Bugfix** packaging of 0.3.4 contains a failing test.
+
+0.3.4 *2026-01-24*
+  * **Bugfix** `center()`_ should match the eccentric `parity padding`_.
+    of `str.center()`_. `PR #188`_.
+
+0.3.3 *2026-01-24*
+  * **Performance** improvement in `width()`_. `PR #185`_.
+  * **Bugfix** missing ``py.typed``, ``Typing :: Typed``. `PR #184`_.
+
+0.3.2 *2026-01-23*
+  * **Updated** type hinting for full ``mympy --strict`` compliance. `PR #183`_.
+
+0.3.1 *2026-01-22*
+  * **Performance** improvement up to 30% in `width()_`. `PR #181`_.
+
+0.3.0 *2026-01-21*
+  * **Drop Support** for Python 3.6 and 3.7. `PR #156`_.
+  * **New** Function `iter_graphemes()`_. `PR #165`_.
+  * **New** Functions `width()`_ and `iter_sequences()`_. `PR #166`_.
+  * **New** Functions `ljust()`_, `rjust()`_, `center()`_. `PR #168`_.
+  * **New** Function `wrap()`_. `PR #169`_.
+  * **Performance** improvement in `wcswidth()`_. `PR #171`_.
+  * **New** argument ``ambiguous_width`` to all functions. `PR #172`_.
+  * **New** Functions `clip()`_ and `strip_sequences()`_. `PR #173`_.
+  * **Bugfix** Characters with ``Default_Ignorable_Code_Point`` property now
+    return width 0. `PR #174`_.
+  * **Bugfix** Characters with ``Prepended_Concatenation_Mark`` property now
+    return width 1. `PR #175`_.
+
+0.2.14 *2025-09-22*
+  * **Drop Support** for Python 2.7 and 3.5. `PR #117`_.
+  * **Update** tables to include Unicode Specifications 16.0.0 and 17.0.0.
+    `PR #146`_.
+  * **Bugfix** U+00AD SOFT HYPHEN should measure as 1, versions 0.2.9 through
+    0.2.13 measured as 0. `PR #149`_.
+
+0.2.13 *2024-01-06*
+  * **Bugfix** zero-width support for Hangul Jamo (Korean)
+
+0.2.12 *2023-11-21*
+  * **Bugfix** Re-release to remove `.pyi` files misplaced in wheel `Issue #101`_.
+
+0.2.11 *2023-11-20*
+  * **Updated** Include tests files in the source distribution (`PR #98`_, `PR #100`_).
+
+0.2.10 *2023-11-13*
+  * **Bugfix** accounting of some kinds of emoji sequences using U+FE0F
+    Variation Selector 16 (`PR #97`_).
+  * **Updated** specification_.
+
+0.2.9 *2023-10-30*
+  * **Bugfix** zero-width characters used in Emoji ZWJ sequences, Balinese,
+    Jamo, Devanagari, Tamil, Kannada and others (`PR #91`_).
+  * **Updated** to include specification_ of character measurements.
+
+0.2.8 *2023-09-30*
+  * Include requirements files in the source distribution (`PR #82`_).
+
+0.2.7 *2023-09-28*
+  * **Updated** tables to include Unicode Specification 15.1.0.
+  * Include ``bin``, ``docs``, and ``tox.ini`` in the source distribution
+
+0.2.6 *2023-01-14*
+  * **Updated** tables to include Unicode Specification 14.0.0 and 15.0.0.
+  * **Changed** developer tools to use pip-compile, and to use jinja2 templates
+    for code generation in `bin/update-tables.py` to prepare for possible
+    compiler optimization release.
+
+0.2.1 .. 0.2.5 *2020-06-23*
+  * **Repository** changes to update tests and packaging issues, and
+    begin tagging repository with matching release versions.
+
+0.2.0 *2020-06-01*
+  * **Enhancement**: Unicode version may be selected by exporting the
+    Environment variable ``UNICODE_VERSION``, such as ``13.0``, or ``6.3.0``.
+    See the `jquast/ucs-detect`_ CLI utility for automatic detection.
+  * **Enhancement**:
+    API Documentation is published to readthedocs.io.
+  * **Updated** tables for *all* Unicode Specifications with files
+    published in a programmatically consumable format, versions 4.1.0
+    through 13.0
+
+0.1.9 *2020-03-22*
+  * **Performance** optimization by `Avram Lubkin`_, `PR #35`_.
+  * **Updated** tables to Unicode Specification 13.0.0.
+
+0.1.8 *2020-01-01*
+  * **Updated** tables to Unicode Specification 12.0.0. (`PR #30`_).
+
+0.1.7 *2016-07-01*
+  * **Updated** tables to Unicode Specification 9.0.0. (`PR #18`_).
+
+0.1.6 *2016-01-08 Production/Stable*
+  * ``LICENSE`` file now included with distribution.
+
+0.1.5 *2015-09-13 Alpha*
+  * **Bugfix**:
+    Resolution of "combining_ character width" issue, most especially
+    those that previously returned -1 now often (correctly) return 0.
+    resolved by `Philip Craig`_ via `PR #11`_.
+  * **Deprecated**:
+    The module path ``wcwidth.table_comb`` is no longer available,
+    it has been superseded by module path ``wcwidth.table_zero``.
+
+0.1.4 *2014-11-20 Pre-Alpha*
+  * **Feature**: ``wcswidth()`` now determines printable length
+    for (most) combining_ characters.  The developer's tool
+    `bin/wcwidth-browser.py`_ is improved to display combining_
+    characters when provided the ``--combining`` option
+    (`Thomas Ballinger`_ and `Leta Montopoli`_ `PR #5`_).
+  * **Feature**: added static analysis (prospector_) to testing
+    framework.
+
+0.1.3 *2014-10-29 Pre-Alpha*
+  * **Bugfix**: 2nd parameter of wcswidth was not honored.
+    (`Thomas Ballinger`_, `PR #4`_).
+
+0.1.2 *2014-10-28 Pre-Alpha*
+  * **Updated** tables to Unicode Specification 7.0.0.
+    (`Thomas Ballinger`_, `PR #3`_).
+
+0.1.1 *2014-05-14 Pre-Alpha*
+  * Initial release to pypi, Based on Unicode Specification 6.3.0
+
+This code was originally derived directly from C code of the same name,
+whose latest version is available at
+https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c::
+
+ * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
+ *
+ * Permission to use, copy, modify, and distribute this software
+ * for any purpose and without fee is hereby granted. The author
+ * disclaims all warranties with regard to this software.
+
+.. _`Spacing Combining Mark`: https://www.unicode.org/versions/latest/ch04.pdf#G134153
+.. _`specification`: https://wcwidth.readthedocs.io/en/latest/specs.html
+.. _`tox`: https://tox.wiki/en/latest/
+.. _`prospector`: https://github.com/landscapeio/prospector
+.. _`combining`: https://en.wikipedia.org/wiki/Combining_character
+.. _`bin/`: https://github.com/jquast/wcwidth/tree/master/bin
+.. _`bin/wcwidth-browser.py`: https://github.com/jquast/wcwidth/blob/master/bin/wcwidth-browser.py
+.. _`Thomas Ballinger`: https://github.com/thomasballinger
+.. _`Leta Montopoli`: https://github.com/lmontopo
+.. _`Philip Craig`: https://github.com/philipc
+.. _`PR #3`: https://github.com/jquast/wcwidth/pull/3
+.. _`PR #4`: https://github.com/jquast/wcwidth/pull/4
+.. _`PR #5`: https://github.com/jquast/wcwidth/pull/5
+.. _`PR #11`: https://github.com/jquast/wcwidth/pull/11
+.. _`PR #18`: https://github.com/jquast/wcwidth/pull/18
+.. _`PR #30`: https://github.com/jquast/wcwidth/pull/30
+.. _`PR #35`: https://github.com/jquast/wcwidth/pull/35
+.. _`PR #82`: https://github.com/jquast/wcwidth/pull/82
+.. _`PR #91`: https://github.com/jquast/wcwidth/pull/91
+.. _`PR #97`: https://github.com/jquast/wcwidth/pull/97
+.. _`PR #98`: https://github.com/jquast/wcwidth/pull/98
+.. _`PR #100`: https://github.com/jquast/wcwidth/pull/100
+.. _`PR #117`: https://github.com/jquast/wcwidth/pull/117
+.. _`PR #146`: https://github.com/jquast/wcwidth/pull/146
+.. _`PR #149`: https://github.com/jquast/wcwidth/pull/149
+.. _`PR #156`: https://github.com/jquast/wcwidth/pull/156
+.. _`PR #165`: https://github.com/jquast/wcwidth/pull/165
+.. _`PR #166`: https://github.com/jquast/wcwidth/pull/166
+.. _`PR #168`: https://github.com/jquast/wcwidth/pull/168
+.. _`PR #169`: https://github.com/jquast/wcwidth/pull/169
+.. _`PR #171`: https://github.com/jquast/wcwidth/pull/171
+.. _`PR #172`: https://github.com/jquast/wcwidth/pull/172
+.. _`PR #173`: https://github.com/jquast/wcwidth/pull/173
+.. _`PR #174`: https://github.com/jquast/wcwidth/pull/174
+.. _`PR #175`: https://github.com/jquast/wcwidth/pull/175
+.. _`PR #181`: https://github.com/jquast/wcwidth/pull/181
+.. _`PR #183`: https://github.com/jquast/wcwidth/pull/183
+.. _`PR #184`: https://github.com/jquast/wcwidth/pull/184
+.. _`PR #185`: https://github.com/jquast/wcwidth/pull/185
+.. _`PR #188`: https://github.com/jquast/wcwidth/pull/188
+.. _`PR #191`: https://github.com/jquast/wcwidth/pull/191
+.. _`PR #192`: https://github.com/jquast/wcwidth/pull/192
+.. _`PR #193`: https://github.com/jquast/wcwidth/pull/193
+.. _`PR #194`: https://github.com/jquast/wcwidth/pull/194
+.. _`PR #195`: https://github.com/jquast/wcwidth/pull/195
+.. _`PR #196`: https://github.com/jquast/wcwidth/pull/196
+.. _`PR #199`: https://github.com/jquast/wcwidth/pull/199
+.. _`PR #200`: https://github.com/jquast/wcwidth/pull/200
+.. _`PR #202`: https://github.com/jquast/wcwidth/pull/202
+.. _`PR #204`: https://github.com/jquast/wcwidth/pull/204
+.. _`Issue #101`: https://github.com/jquast/wcwidth/issues/101
+.. _`Issue #155`: https://github.com/jquast/wcwidth/issues/155
+.. _`Issue #190`: https://github.com/jquast/wcwidth/issues/190
+.. _`jquast/blessed`: https://github.com/jquast/blessed
+.. _`selectel/pyte`: https://github.com/selectel/pyte
+.. _`thomasballinger/curtsies`: https://github.com/thomasballinger/curtsies
+.. _`dbcli/pgcli`: https://github.com/dbcli/pgcli
+.. _`prompt-toolkit/python-prompt-toolkit`: https://github.com/prompt-toolkit/python-prompt-toolkit
+.. _`timoxley/wcwidth`: https://github.com/timoxley/wcwidth
+.. _`wcwidth(3)`:  https://man7.org/linux/man-pages/man3/wcwidth.3.html
+.. _`wcswidth(3)`: https://man7.org/linux/man-pages/man3/wcswidth.3.html
+.. _`astanin/python-tabulate`: https://github.com/astanin/python-tabulate
+.. _`janlelis/unicode-display_width`: https://github.com/janlelis/unicode-display_width
+.. _`rspeer/python-ftfy`: https://github.com/rspeer/python-ftfy
+.. _`alecrabbit/php-wcwidth`: https://github.com/alecrabbit/php-wcwidth
+.. _`Text::CharWidth`: https://metacpan.org/pod/Text::CharWidth
+.. _`bluebear94/Terminal-WCWidth`: https://github.com/bluebear94/Terminal-WCWidth
+.. _`mattn/go-runewidth`: https://github.com/mattn/go-runewidth
+.. _`grepsuzette/wcwidth`: https://github.com/grepsuzette/wcwidth
+.. _`jquast/ucs-detect`: https://github.com/jquast/ucs-detect
+.. _`Avram Lubkin`: https://github.com/avylove
+.. _`nbedos/termtosvg`: https://github.com/nbedos/termtosvg
+.. _`peterbrittain/asciimatics`: https://github.com/peterbrittain/asciimatics
+.. _`aperezdc/lua-wcwidth`: https://github.com/aperezdc/lua-wcwidth
+.. _`joachimschmidt557/zig-wcwidth`: https://github.com/joachimschmidt557/zig-wcwidth
+.. _`fumiyas/wcwidth-cjk`: https://github.com/fumiyas/wcwidth-cjk
+.. _`joshuarubin/wcwidth9`: https://github.com/joshuarubin/wcwidth9
+.. _`spectreconsole/wcwidth`: https://github.com/spectreconsole/wcwidth
+.. _`python-cmd2/cmd2`: https://github.com/python-cmd2/cmd2
+.. _`stratis-storage/stratis-cli`: https://github.com/stratis-storage/stratis-cli
+.. _`ihabunek/toot`: https://github.com/ihabunek/toot
+.. _`saulpw/visidata`: https://github.com/saulpw/visidata
+.. _`pip-tools`: https://pip-tools.readthedocs.io/
+.. _`sphinx`: https://www.sphinx-doc.org/
+.. _`textwrap.wrap()`: https://docs.python.org/3/library/textwrap.html#textwrap.wrap
+.. _`str.ljust()`: https://docs.python.org/3/library/stdtypes.html#str.ljust
+.. _`str.rjust()`: https://docs.python.org/3/library/stdtypes.html#str.rjust
+.. _`str.center()`: https://docs.python.org/3/library/stdtypes.html#str.center
+.. _`str.expandtabs()`: https://docs.python.org/3/library/stdtypes.html#str.expandtabs
+.. _`General Tabulated Summary`: https://ucs-detect.readthedocs.io/results.html#tabulated-results
+.. _`wcwidth()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.wcwidth
+.. _`wcswidth()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.wcswidth
+.. _`width()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.width
+.. _`iter_graphemes()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.iter_graphemes
+.. _`iter_graphemes_reverse()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.iter_graphemes_reverse
+.. _`grapheme_boundary_before()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.grapheme_boundary_before
+.. _`ljust()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.ljust
+.. _`rjust()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.rjust
+.. _`center()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.center
+.. _`wrap()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.wrap
+.. _`clip()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.clip
+.. _`strip_sequences()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.strip_sequences
+.. _`propagate_sgr()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.propagate_sgr
+.. _`iter_sequences()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.iter_sequences
+.. _`list_versions()`: https://wcwidth.readthedocs.io/en/latest/api.html#wcwidth.list_versions
+.. _`Unicode Standard Annex #29`: https://www.unicode.org/reports/tr29/
+.. _`Terminal.detect_ambiguous_width()`: https://blessed.readthedocs.io/en/latest/api/terminal.html#blessed.terminal.Terminal.detect_ambiguous_width
+.. _`parity padding`: https://jazcap53.github.io/pythons-eccentric-strcenter.html
+.. |pypi_downloads| image:: https://img.shields.io/pypi/dm/wcwidth.svg?logo=pypi
+    :alt: Downloads
+    :target: https://pypi.org/project/wcwidth/
+.. |codecov| image:: https://codecov.io/gh/jquast/wcwidth/branch/master/graph/badge.svg
+    :alt: codecov.io Code Coverage
+    :target: https://app.codecov.io/gh/jquast/wcwidth/
+.. |license| image:: https://img.shields.io/pypi/l/wcwidth.svg
+    :target: https://pypi.org/project/wcwidth/
+    :alt: MIT License
diff --git a/libs/wcwidth-0.6.0.dist-info/RECORD b/libs/wcwidth-0.6.0.dist-info/RECORD
new file mode 100644
index 0000000000..113d6d9c18
--- /dev/null
+++ b/libs/wcwidth-0.6.0.dist-info/RECORD
@@ -0,0 +1,22 @@
+wcwidth-0.6.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+wcwidth-0.6.0.dist-info/METADATA,sha256=3_N4a4-6lVqDxdMDTOApuKrCDjOJ2ttiNNJUhQDVHnI,30525
+wcwidth-0.6.0.dist-info/RECORD,,
+wcwidth-0.6.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wcwidth-0.6.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+wcwidth-0.6.0.dist-info/licenses/LICENSE,sha256=cLmKlaIUTrcK-AF_qMbZXOJH5AhnQ26LxknhN_4T0ho,1322
+wcwidth/__init__.py,sha256=UXJ2nUqbNHUpZvcW_pMfl7qQJr52Kww52u8LKFbJqF4,1793
+wcwidth/bisearch.py,sha256=oF4Wn7JPkkUQlFXMGMcBPDL8VCkAirjXUsGj95BTh7o,812
+wcwidth/control_codes.py,sha256=NGkPsXNA_MSNH_G1xQjvDgX4mSj-kp1TLfLP-GIUz08,1579
+wcwidth/escape_sequences.py,sha256=OmHUFj3f7UcywR0iQMmaD6x9nQXhQhY4bBDkjXdrjJQ,3097
+wcwidth/grapheme.py,sha256=O-0Fn1vZcQ77vrKBusRTCdWWnybmL2RH1QHXqfsb5O4,13382
+wcwidth/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wcwidth/sgr_state.py,sha256=4hUWKl2znPJ13uA1OipcmmQjOO7LBR-W-6y4hPBROAs,12429
+wcwidth/table_ambiguous.py,sha256=6zyqWUQqAswfpF3JesLjrHNeQhI30pfP66GfHm-jmD8,11900
+wcwidth/table_grapheme.py,sha256=yTwC8Yr1_H0GNIhTQMaO4jl-4cc4qHPIyIkoNxh3aGk,142899
+wcwidth/table_mc.py,sha256=KCR35VpvTQ_lv6XtuhukBhdnH18-TurFUrbABDwLzYA,13993
+wcwidth/table_vs16.py,sha256=TWc_Hgen926MO-EW_nFdyAsOrXVmP09N0msHdTXibX8,6890
+wcwidth/table_wide.py,sha256=9JNk7kRfG5awpY7wLIztZddHHA9JGc6TAuxHdBZ-Zrk,8974
+wcwidth/table_zero.py,sha256=096xl4g7GJUVFHfUO0gzJxNzTtBRMgin6-Jf--2fCzM,25642
+wcwidth/textwrap.py,sha256=n1_Bgs3f7t1SMnM1GE2w40jlN01fiDJZlLQvpMZK21A,28997
+wcwidth/unicode_versions.py,sha256=U5NM8ficYOVH_I1nL6Ap0reWhozB5rLIMZ7y8XU8uFU,541
+wcwidth/wcwidth.py,sha256=o5cH_RmQQwLBexguI62HPHrT6yYtxOk5P3--jXDlelI,41127
diff --git a/libs/wcwidth-0.6.0.dist-info/REQUESTED b/libs/wcwidth-0.6.0.dist-info/REQUESTED
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/wcwidth-0.6.0.dist-info/WHEEL b/libs/wcwidth-0.6.0.dist-info/WHEEL
new file mode 100644
index 0000000000..b1b94fd58e
--- /dev/null
+++ b/libs/wcwidth-0.6.0.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.29.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/wcwidth-0.2.13.dist-info/LICENSE b/libs/wcwidth-0.6.0.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/wcwidth-0.2.13.dist-info/LICENSE
rename to libs/wcwidth-0.6.0.dist-info/licenses/LICENSE
diff --git a/libs/wcwidth/__init__.py b/libs/wcwidth/__init__.py
index d686b30e1b..400c8a6193 100644
--- a/libs/wcwidth/__init__.py
+++ b/libs/wcwidth/__init__.py
@@ -5,25 +5,39 @@
 """
 # re-export all functions & definitions, even private ones, from top-level
 # module path, to allow for 'from wcwidth import _private_func'.  Of course,
-# user beware that any _private function may disappear or change signature at
-# any future version.
+# user beware that any _private functions or variables not exported by __all__
+# may disappear or change signature at any future version.
 
 # local
 from .wcwidth import ZERO_WIDTH  # noqa
 from .wcwidth import (WIDE_EASTASIAN,
+                      AMBIGUOUS_EASTASIAN,
                       VS16_NARROW_TO_WIDE,
+                      clip,
+                      ljust,
+                      rjust,
+                      width,
+                      center,
                       wcwidth,
                       wcswidth,
-                      _bisearch,
                       list_versions,
+                      iter_sequences,
+                      strip_sequences,
                       _wcmatch_version,
                       _wcversion_value)
+from .bisearch import bisearch as _bisearch
+from .grapheme import grapheme_boundary_before  # noqa
+from .grapheme import iter_graphemes, iter_graphemes_reverse
+from .textwrap import SequenceTextWrapper, wrap
+from .sgr_state import propagate_sgr
 
 # The __all__ attribute defines the items exported from statement,
 # 'from wcwidth import *', but also to say, "This is the public API".
-__all__ = ('wcwidth', 'wcswidth', 'list_versions')
+__all__ = ('wcwidth', 'wcswidth', 'width', 'iter_sequences', 'iter_graphemes',
+           'iter_graphemes_reverse', 'grapheme_boundary_before',
+           'ljust', 'rjust', 'center', 'wrap', 'clip', 'strip_sequences',
+           'list_versions', 'propagate_sgr')
 
-# We also used pkg_resources to load unicode version tables from version.json,
-# generated by bin/update-tables.py, but some environments are unable to
-# import pkg_resources for one reason or another, yikes!
-__version__ = '0.2.13'
+# Using 'hatchling', it does not seem to provide the pyproject.toml nicety, "dynamic = ['version']"
+# like flit_core, maybe there is some better way but for now we have to duplicate it in both places
+__version__ = '0.6.0'
diff --git a/libs/wcwidth/bisearch.py b/libs/wcwidth/bisearch.py
new file mode 100644
index 0000000000..becfe86a9d
--- /dev/null
+++ b/libs/wcwidth/bisearch.py
@@ -0,0 +1,29 @@
+"""Binary search function for Unicode interval tables."""
+from __future__ import annotations
+
+
+def bisearch(ucs: int, table: tuple[tuple[int, int], ...]) -> int:
+    """
+    Binary search in interval table.
+
+    :param ucs: Ordinal value of unicode character.
+    :param table: Tuple of starting and ending ranges of ordinal values,
+        in form of ``((start, end), ...)``.
+    :returns: 1 if ordinal value ucs is found within lookup table, else 0.
+    """
+    lbound = 0
+    ubound = len(table) - 1
+
+    if ucs < table[0][0] or ucs > table[ubound][1]:
+        return 0
+
+    while ubound >= lbound:
+        mid = (lbound + ubound) // 2
+        if ucs > table[mid][1]:
+            lbound = mid + 1
+        elif ucs < table[mid][0]:
+            ubound = mid - 1
+        else:
+            return 1
+
+    return 0
diff --git a/libs/wcwidth/control_codes.py b/libs/wcwidth/control_codes.py
new file mode 100644
index 0000000000..3a6fff7638
--- /dev/null
+++ b/libs/wcwidth/control_codes.py
@@ -0,0 +1,46 @@
+"""
+Control character sets for terminal handling.
+
+This module provides the control character sets used by the width() function to handle terminal
+control characters.
+"""
+
+# Illegal C0/C1 control characters.
+# These raise ValueError in 'strict' mode.
+ILLEGAL_CTRL = frozenset(
+    chr(c) for c in (
+        list(range(0x01, 0x07)) +    # SOH, STX, ETX (^C), EOT (^D), ENQ, ACK
+        list(range(0x10, 0x1b)) +    # DLE through SUB (^Z)
+        list(range(0x1c, 0x20)) +    # FS, GS, RS, US
+        [0x7f] +                      # DEL
+        list(range(0x80, 0xa0))       # C1 control characters
+    )
+)
+
+# Vertical movement control characters.
+# These raise ValueError in 'strict' mode (indeterminate horizontal position).
+VERTICAL_CTRL = frozenset({
+    '\x0a',  # LF (line feed)
+    '\x0b',  # VT (vertical tab)
+    '\x0c',  # FF (form feed)
+})
+
+# Horizontal movement control characters.
+# These affect cursor position and are tracked in 'strict' and 'parse' modes.
+HORIZONTAL_CTRL = frozenset({
+    '\x08',  # BS (backspace) - cursor left 1
+    '\x09',  # HT (horizontal tab) - advance to next tab stop
+    '\x0d',  # CR (carriage return) - cursor to column 0
+})
+
+# Terminal-valid zero-width control characters.
+# These are allowed in all modes (zero-width, no movement).
+ZERO_WIDTH_CTRL = frozenset({
+    '\x00',  # NUL
+    '\x07',  # BEL (bell)
+    '\x0e',  # SO (shift out)
+    '\x0f',  # SI (shift in)
+})
+
+# All control characters that need special handling (not regular printable).
+ALL_CTRL = ILLEGAL_CTRL | VERTICAL_CTRL | HORIZONTAL_CTRL | ZERO_WIDTH_CTRL | {'\x1b'}
diff --git a/libs/wcwidth/escape_sequences.py b/libs/wcwidth/escape_sequences.py
new file mode 100644
index 0000000000..d4ac6cc36d
--- /dev/null
+++ b/libs/wcwidth/escape_sequences.py
@@ -0,0 +1,69 @@
+r"""
+Terminal escape sequence patterns.
+
+This module provides regex patterns for matching terminal escape sequences. All patterns match
+sequences that begin with ESC (``\x1b``). Before calling re.match with these patterns, callers
+should first check that the character at the current position is ESC for optimal performance.
+"""
+# std imports
+import re
+
+# Zero-width escape sequences (SGR, OSC, CSI, etc.). This table, like INDETERMINATE_EFFECT_SEQUENCE,
+# originated from the 'blessed' library.
+ZERO_WIDTH_PATTERN = re.compile(
+    # CSI sequences
+    r'\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]|'
+    # OSC sequences
+    r'\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)|'
+    # APC sequences
+    r'\x1b_[^\x1b\x07]*(?:\x07|\x1b\\)|'
+    # DCS sequences
+    r'\x1bP[^\x1b\x07]*(?:\x07|\x1b\\)|'
+    # PM sequences
+    r'\x1b\^[^\x1b\x07]*(?:\x07|\x1b\\)|'
+    # Character set designation
+    r'\x1b[()].|'
+    # Fe sequences
+    r'\x1b[\x40-\x5f]|'
+    # Fp sequences
+    r'\x1b[78=>g]'
+)
+
+# Cursor right movement: CSI [n] C, parameter may be parsed by width()
+CURSOR_RIGHT_SEQUENCE = re.compile(r'\x1b\[(\d*)C')
+
+# Cursor left movement: CSI [n] D, parameter may be parsed by width()
+CURSOR_LEFT_SEQUENCE = re.compile(r'\x1b\[(\d*)D')
+
+# Indeterminate effect sequences - raise ValueError in 'strict' mode. The effects of these sequences
+# are likely to be undesirable, moving the cursor vertically or to any unknown position, and
+# otherwise not managed by the 'width' method of this library.
+#
+# This table was created initially with code generation by extraction of termcap library with
+# techniques used at 'blessed' library runtime for 'xterm', 'alacritty', 'kitty', ghostty',
+# 'screen', 'tmux', and others. Then, these common capabilities were merged into the list below.
+INDETERMINATE_EFFECT_SEQUENCE = re.compile(
+    '|'.join(f'(?:{_pattern})' for _pattern in (
+        r'\x1b\[\d+;\d+r',           # change_scroll_region
+        r'\x1b\[\d*K',               # erase_in_line (clr_eol, clr_bol)
+        r'\x1b\[\d*J',               # erase_in_display (clr_eos, erase_display)
+        r'\x1b\[\d*G',               # column_address
+        r'\x1b\[\d+;\d+H',           # cursor_address
+        r'\x1b\[\d*H',               # cursor_home
+        r'\x1b\[\d*A',               # cursor_up
+        r'\x1b\[\d*B',               # cursor_down
+        r'\x1b\[\d*P',               # delete_character
+        r'\x1b\[\d*M',               # delete_line
+        r'\x1b\[\d*L',               # insert_line
+        r'\x1b\[\d*@',               # insert_character
+        r'\x1b\[\d+X',               # erase_chars
+        r'\x1b\[\d*S',               # scroll_up (parm_index)
+        r'\x1b\[\d*T',               # scroll_down (parm_rindex)
+        r'\x1b\[\d*d',               # row_address
+        r'\x1b\[\?1049[hl]',         # alternate screen buffer
+        r'\x1b\[\?47[hl]',           # alternate screen (legacy)
+        r'\x1b8',                    # restore_cursor
+        r'\x1bD',                    # scroll_forward (index)
+        r'\x1bM',                    # scroll_reverse (reverse index)
+    ))
+)
diff --git a/libs/wcwidth/grapheme.py b/libs/wcwidth/grapheme.py
new file mode 100644
index 0000000000..7befc92052
--- /dev/null
+++ b/libs/wcwidth/grapheme.py
@@ -0,0 +1,428 @@
+"""
+Grapheme cluster segmentation following Unicode Standard Annex #29.
+
+This module provides pure-Python implementation of the grapheme cluster boundary algorithm as
+defined in UAX #29: Unicode Text Segmentation.
+
+https://www.unicode.org/reports/tr29/
+"""
+
+from __future__ import annotations
+
+# std imports
+from enum import IntEnum
+from functools import lru_cache
+
+from typing import TYPE_CHECKING, NamedTuple
+
+# local
+from .bisearch import bisearch as _bisearch
+from .table_grapheme import (GRAPHEME_L,
+                             GRAPHEME_T,
+                             GRAPHEME_V,
+                             GRAPHEME_LV,
+                             INCB_EXTEND,
+                             INCB_LINKER,
+                             GRAPHEME_LVT,
+                             INCB_CONSONANT,
+                             GRAPHEME_EXTEND,
+                             GRAPHEME_CONTROL,
+                             GRAPHEME_PREPEND,
+                             GRAPHEME_SPACINGMARK,
+                             EXTENDED_PICTOGRAPHIC,
+                             GRAPHEME_REGIONAL_INDICATOR)
+
+if TYPE_CHECKING:  # pragma: no cover
+    # std imports
+    from collections.abc import Iterator
+
+# Maximum backward scan distance when finding grapheme cluster boundaries.
+# Covers all known Unicode grapheme clusters with margin; longer sequences are pathological.
+MAX_GRAPHEME_SCAN = 32
+
+
+class GCB(IntEnum):
+    """Grapheme Cluster Break property values."""
+
+    OTHER = 0
+    CR = 1
+    LF = 2
+    CONTROL = 3
+    EXTEND = 4
+    ZWJ = 5
+    REGIONAL_INDICATOR = 6
+    PREPEND = 7
+    SPACING_MARK = 8
+    L = 9
+    V = 10
+    T = 11
+    LV = 12
+    LVT = 13
+
+
+# All lru_cache sizes in this file use maxsize=1024, chosen by benchmarking UDHR data (500+
+# languages) and considering typical process-long sessions: western scripts need ~64 unique
+# codepoints, but CJK could reach ~2000 -- but likely not.
+@lru_cache(maxsize=1024)
+def _grapheme_cluster_break(ucs: int) -> GCB:
+    # pylint: disable=too-many-branches,too-complex
+    """Return the Grapheme_Cluster_Break property for a codepoint."""
+    # Single codepoint matches
+    if ucs == 0x000d:
+        return GCB.CR
+    if ucs == 0x000a:
+        return GCB.LF
+    if ucs == 0x200d:
+        return GCB.ZWJ
+    # Matching by codepoint ranges, requiring binary search
+    if _bisearch(ucs, GRAPHEME_CONTROL):
+        return GCB.CONTROL
+    if _bisearch(ucs, GRAPHEME_EXTEND):
+        return GCB.EXTEND
+    if _bisearch(ucs, GRAPHEME_REGIONAL_INDICATOR):
+        return GCB.REGIONAL_INDICATOR
+    if _bisearch(ucs, GRAPHEME_PREPEND):
+        return GCB.PREPEND
+    if _bisearch(ucs, GRAPHEME_SPACINGMARK):
+        return GCB.SPACING_MARK
+    if _bisearch(ucs, GRAPHEME_L):
+        return GCB.L
+    if _bisearch(ucs, GRAPHEME_V):
+        return GCB.V
+    if _bisearch(ucs, GRAPHEME_T):
+        return GCB.T
+    if _bisearch(ucs, GRAPHEME_LV):
+        return GCB.LV
+    if _bisearch(ucs, GRAPHEME_LVT):
+        return GCB.LVT
+    return GCB.OTHER
+
+
+@lru_cache(maxsize=1024)
+def _is_extended_pictographic(ucs: int) -> bool:
+    """Check if codepoint has Extended_Pictographic property."""
+    return bool(_bisearch(ucs, EXTENDED_PICTOGRAPHIC))
+
+
+@lru_cache(maxsize=1024)
+def _is_incb_linker(ucs: int) -> bool:
+    """Check if codepoint has InCB=Linker property."""
+    return bool(_bisearch(ucs, INCB_LINKER))
+
+
+@lru_cache(maxsize=1024)
+def _is_incb_consonant(ucs: int) -> bool:
+    """Check if codepoint has InCB=Consonant property."""
+    return bool(_bisearch(ucs, INCB_CONSONANT))
+
+
+@lru_cache(maxsize=1024)
+def _is_incb_extend(ucs: int) -> bool:
+    """Check if codepoint has InCB=Extend property."""
+    return bool(_bisearch(ucs, INCB_EXTEND))
+
+
+class BreakResult(NamedTuple):
+    """Result of grapheme cluster break decision."""
+
+    should_break: bool
+    ri_count: int
+
+
+@lru_cache(maxsize=1024)
+def _simple_break_check(prev_gcb: GCB, curr_gcb: GCB) -> BreakResult | None:
+    """
+    Check simple GCB-pair-based break rules (cacheable).
+
+    Returns BreakResult for rules that can be determined from GCB properties alone, or None if
+    complex lookback rules (GB9c, GB11) need to be checked.
+    """
+    # GB3: CR x LF
+    if prev_gcb == GCB.CR and curr_gcb == GCB.LF:
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB4: (Control|CR|LF) รท
+    if prev_gcb in (GCB.CONTROL, GCB.CR, GCB.LF):
+        return BreakResult(should_break=True, ri_count=0)
+
+    # GB5: รท (Control|CR|LF)
+    if curr_gcb in (GCB.CONTROL, GCB.CR, GCB.LF):
+        return BreakResult(should_break=True, ri_count=0)
+
+    # GB6: L x (L|V|LV|LVT)
+    if prev_gcb == GCB.L and curr_gcb in (GCB.L, GCB.V, GCB.LV, GCB.LVT):
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB7: (LV|V) x (V|T)
+    if prev_gcb in (GCB.LV, GCB.V) and curr_gcb in (GCB.V, GCB.T):
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB8: (LVT|T) x T
+    if prev_gcb in (GCB.LVT, GCB.T) and curr_gcb == GCB.T:
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB9: x (Extend|ZWJ) - but ZWJ needs GB11 check, so only handle Extend here
+    if curr_gcb == GCB.EXTEND:
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB9a: x SpacingMark
+    if curr_gcb == GCB.SPACING_MARK:
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB9b: Prepend x
+    if prev_gcb == GCB.PREPEND:
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB9c and GB11 need lookback - return None to signal complex check needed
+    # GB12/13 (RI pairs) need ri_count state - also handled in main function
+    return None
+
+
+def _should_break(
+    prev_gcb: GCB,
+    curr_gcb: GCB,
+    text: str,
+    curr_idx: int,
+    ri_count: int,
+) -> BreakResult:
+    # pylint: disable=too-many-branches,too-complex
+    """
+    Determine if there should be a grapheme cluster break between prev and curr.
+
+    Implements UAX #29 grapheme cluster boundary rules.
+    """
+    # Try cached simple rules first
+    result = _simple_break_check(prev_gcb, curr_gcb)
+    if result is not None:
+        return result
+
+    # GB9: x ZWJ (not cached because GB11 needs lookback when prev is ZWJ)
+    if curr_gcb == GCB.ZWJ:
+        return BreakResult(should_break=False, ri_count=0)
+
+    # GB9c: Indic conjunct cluster
+    # \p{InCB=Consonant} [\p{InCB=Extend}\p{InCB=Linker}]* \p{InCB=Linker}
+    #     [\p{InCB=Extend}\p{InCB=Linker}]* x \p{InCB=Consonant}
+    curr_ucs = ord(text[curr_idx])
+    if _is_incb_consonant(curr_ucs):
+        has_linker = False
+        i = curr_idx - 1
+        while i >= 0:
+            prev_ucs = ord(text[i])
+            if _is_incb_linker(prev_ucs):
+                has_linker = True
+                i -= 1
+            elif _is_incb_extend(prev_ucs):
+                i -= 1
+            elif _is_incb_consonant(prev_ucs):
+                if has_linker:
+                    return BreakResult(should_break=False, ri_count=0)
+                break
+            else:
+                break
+
+    # GB11: ExtPict Extend* ZWJ x ExtPict
+    if prev_gcb == GCB.ZWJ and _is_extended_pictographic(curr_ucs):
+        i = curr_idx - 2  # Skip the ZWJ at curr_idx - 1
+        while i >= 0:
+            prev_ucs = ord(text[i])
+            prev_prop = _grapheme_cluster_break(prev_ucs)
+            if prev_prop == GCB.EXTEND:
+                i -= 1
+            elif _is_extended_pictographic(prev_ucs):
+                return BreakResult(should_break=False, ri_count=0)
+            else:
+                break
+
+    # GB12/GB13: RI x RI (pair matching)
+    if prev_gcb == GCB.REGIONAL_INDICATOR and curr_gcb == GCB.REGIONAL_INDICATOR:
+        if ri_count % 2 == 1:
+            return BreakResult(should_break=False, ri_count=ri_count + 1)
+        return BreakResult(should_break=True, ri_count=1)
+
+    # GB999: Any รท Any
+    ri_count = 1 if curr_gcb == GCB.REGIONAL_INDICATOR else 0
+    return BreakResult(should_break=True, ri_count=ri_count)
+
+
+def iter_graphemes(
+    unistr: str,
+    start: int = 0,
+    end: int | None = None,
+) -> Iterator[str]:
+    r"""
+    Iterate over grapheme clusters in a Unicode string.
+
+    Grapheme clusters are "user-perceived characters" - what a user would
+    consider a single character, which may consist of multiple Unicode
+    codepoints (e.g., a base character with combining marks, emoji sequences).
+
+    :param unistr: The Unicode string to segment.
+    :param start: Starting index (default 0).
+    :param end: Ending index (default len(unistr)).
+    :yields: Grapheme cluster substrings.
+
+    Example::
+
+        >>> list(iter_graphemes('cafe\u0301'))
+        ['c', 'a', 'f', 'e\u0301']
+        >>> list(iter_graphemes('\U0001F468\u200D\U0001F469\u200D\U0001F467'))
+        ['o', 'k', '\U0001F468\u200D\U0001F469\u200D\U0001F467']
+        >>> list(iter_graphemes('\U0001F1FA\U0001F1F8'))
+        ['o', 'k', '\U0001F1FA\U0001F1F8']
+
+    .. versionadded:: 0.3.0
+    """
+    if not unistr:
+        return
+
+    length = len(unistr)
+
+    if end is None:
+        end = length
+
+    if start >= end or start >= length:
+        return
+
+    end = min(end, length)
+
+    # Track state for grapheme cluster boundaries
+    cluster_start = start
+    ri_count = 0
+
+    # Get GCB for first character
+    prev_gcb = _grapheme_cluster_break(ord(unistr[start]))
+
+    # Handle Regional Indicator count initialization
+    if prev_gcb == GCB.REGIONAL_INDICATOR:
+        ri_count = 1
+
+    for idx in range(start + 1, end):
+        curr_gcb = _grapheme_cluster_break(ord(unistr[idx]))
+
+        result = _should_break(prev_gcb, curr_gcb, unistr, idx, ri_count)
+        ri_count = result.ri_count
+
+        if result.should_break:
+            yield unistr[cluster_start:idx]
+            cluster_start = idx
+
+        prev_gcb = curr_gcb
+
+    # Yield the final cluster
+    yield unistr[cluster_start:end]
+
+
+def _find_cluster_start(text: str, pos: int) -> int:
+    """
+    Find the start of the grapheme cluster containing the character before pos.
+
+    Scans backwards from pos to find a safe starting point, then iterates forward using standard
+    break rules to find the actual cluster boundary.
+
+    :param text: The Unicode string.
+    :param pos: Position to search before (exclusive).
+    :returns: Start position of the grapheme cluster.
+    """
+    target_cp = ord(text[pos - 1])
+
+    # GB3: CR x LF - LF after CR is part of same cluster
+    if target_cp == 0x0A and pos >= 2 and text[pos - 2] == '\r':
+        return pos - 2
+
+    # Fast path: ASCII (except LF) starts its own cluster
+    if target_cp < 0x80:
+        # GB9b: Check for preceding PREPEND (rare: Arabic/Brahmic)
+        if pos >= 2 and target_cp >= 0x20:
+            prev_cp = ord(text[pos - 2])
+            if prev_cp >= 0x80 and _grapheme_cluster_break(prev_cp) == GCB.PREPEND:
+                return _find_cluster_start(text, pos - 1)
+        return pos - 1
+
+    # Scan backward to find a safe starting point
+    safe_start = pos - 1
+    while safe_start > 0 and (pos - safe_start) < MAX_GRAPHEME_SCAN:
+        cp = ord(text[safe_start])
+        if 0x20 <= cp < 0x80:  # ASCII always starts a cluster
+            break
+        if _grapheme_cluster_break(cp) == GCB.CONTROL:  # GB4
+            break
+        safe_start -= 1
+
+    # Verify forward to find the actual cluster boundary
+    cluster_start = safe_start
+    left_gcb = _grapheme_cluster_break(ord(text[safe_start]))
+    ri_count = 1 if left_gcb == GCB.REGIONAL_INDICATOR else 0
+
+    for i in range(safe_start + 1, pos):
+        right_gcb = _grapheme_cluster_break(ord(text[i]))
+        result = _should_break(left_gcb, right_gcb, text, i, ri_count)
+        ri_count = result.ri_count
+        if result.should_break:
+            cluster_start = i
+        left_gcb = right_gcb
+
+    return cluster_start
+
+
+def grapheme_boundary_before(unistr: str, pos: int) -> int:
+    r"""
+    Find the grapheme cluster boundary immediately before a position.
+
+    :param unistr: The Unicode string to search.
+    :param pos: Position in the string (0 < pos <= len(unistr)).
+    :returns: Start index of the grapheme cluster containing the character at pos-1.
+
+    Example::
+
+        >>> grapheme_boundary_before('Hello \U0001F44B\U0001F3FB', 8)
+        6
+        >>> grapheme_boundary_before('a\r\nb', 3)
+        1
+
+    .. versionadded:: 0.3.6
+    """
+    if pos <= 0:
+        return 0
+    return _find_cluster_start(unistr, min(pos, len(unistr)))
+
+
+def iter_graphemes_reverse(
+    unistr: str,
+    start: int = 0,
+    end: int | None = None,
+) -> Iterator[str]:
+    r"""
+    Iterate over grapheme clusters in reverse order (last to first).
+
+    :param unistr: The Unicode string to segment.
+    :param start: Starting index (default 0).
+    :param end: Ending index (default len(unistr)).
+    :yields: Grapheme cluster substrings in reverse order.
+
+    Example::
+
+        >>> list(iter_graphemes_reverse('cafe\u0301'))
+        ['e\u0301', 'f', 'a', 'c']
+
+    .. versionadded:: 0.3.6
+    """
+    if not unistr:
+        return
+
+    length = len(unistr)
+
+    end = length if end is None else min(end, length)
+    start = max(start, 0)
+
+    if start >= end or start >= length:
+        return
+
+    pos = end
+    while pos > start:
+        cluster_start = _find_cluster_start(unistr, pos)
+        # Don't yield partial graphemes that extend before start
+        if cluster_start < start:
+            break
+        yield unistr[cluster_start:pos]
+        pos = cluster_start
diff --git a/libs/wcwidth/py.typed b/libs/wcwidth/py.typed
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/wcwidth/sgr_state.py b/libs/wcwidth/sgr_state.py
new file mode 100644
index 0000000000..b0c8648437
--- /dev/null
+++ b/libs/wcwidth/sgr_state.py
@@ -0,0 +1,338 @@
+"""
+SGR (Select Graphic Rendition) state tracking for terminal escape sequences.
+
+This module provides functions for tracking and propagating terminal styling (bold, italic, colors,
+etc.) via public API propagate_sgr(), and its dependent functions, cut() and wrap(). It only has
+attributes necessary to perform its functions, eg 'RED' and 'BLUE' attributes are not defined.
+"""
+from __future__ import annotations
+
+# std imports
+import re
+from enum import IntEnum
+
+from typing import TYPE_CHECKING, Iterator, NamedTuple
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Sequence
+
+
+class _SGR(IntEnum):
+    """
+    SGR (Select Graphic Rendition) parameter codes.
+
+    References:
+    - https://invisible-island.net/xterm/ctlseqs/ctlseqs.html
+    - https://github.com/tehmaze/ansi/tree/master/ansi/colour
+    """
+
+    RESET = 0
+    BOLD = 1
+    DIM = 2
+    ITALIC = 3
+    UNDERLINE = 4
+    BLINK = 5
+    RAPID_BLINK = 6
+    INVERSE = 7
+    HIDDEN = 8
+    STRIKETHROUGH = 9
+    DOUBLE_UNDERLINE = 21
+    BOLD_DIM_OFF = 22
+    ITALIC_OFF = 23
+    UNDERLINE_OFF = 24
+    BLINK_OFF = 25
+    INVERSE_OFF = 27
+    HIDDEN_OFF = 28
+    STRIKETHROUGH_OFF = 29
+    FG_BLACK = 30
+    FG_WHITE = 37
+    FG_EXTENDED = 38
+    FG_DEFAULT = 39
+    BG_BLACK = 40
+    BG_WHITE = 47
+    BG_EXTENDED = 48
+    BG_DEFAULT = 49
+    FG_BRIGHT_BLACK = 90
+    FG_BRIGHT_WHITE = 97
+    BG_BRIGHT_BLACK = 100
+    BG_BRIGHT_WHITE = 107
+
+
+# SGR sequence pattern: CSI followed by params (digits, semicolons, colons) ending with 'm'
+# Colons are used in ITU T.416 (ISO 8613-6) extended color format: 38:2::R:G:B
+# This colon format is less common than semicolon (38;2;R;G;B) but supported by kitty,
+# iTerm2, and newer VTE-based terminals.
+_SGR_PATTERN = re.compile(r'\x1b\[([\d;:]*)m')
+
+# Fast path: quick check if any SGR sequence exists
+_SGR_QUICK_CHECK = re.compile(r'\x1b\[[\d;:]*m')
+
+# Reset sequence
+_SGR_RESET = '\x1b[0m'
+
+
+class _SGRState(NamedTuple):
+    """
+    Track active SGR terminal attributes by category (immutable).
+
+    :param bold: Bold attribute (SGR 1).
+    :param dim: Dim/faint attribute (SGR 2).
+    :param italic: Italic attribute (SGR 3).
+    :param underline: Underline attribute (SGR 4).
+    :param blink: Slow blink attribute (SGR 5).
+    :param rapid_blink: Rapid blink attribute (SGR 6).
+    :param inverse: Inverse/reverse attribute (SGR 7).
+    :param hidden: Hidden/invisible attribute (SGR 8).
+    :param strikethrough: Strikethrough attribute (SGR 9).
+    :param double_underline: Double underline attribute (SGR 21).
+    :param foreground: Foreground color as tuple of SGR params, or None for default.
+    :param background: Background color as tuple of SGR params, or None for default.
+    """
+
+    bold: bool = False
+    dim: bool = False
+    italic: bool = False
+    underline: bool = False
+    blink: bool = False
+    rapid_blink: bool = False
+    inverse: bool = False
+    hidden: bool = False
+    strikethrough: bool = False
+    double_underline: bool = False
+    foreground: tuple[int, ...] | None = None
+    background: tuple[int, ...] | None = None
+
+
+# Default state with no attributes set
+_SGR_STATE_DEFAULT = _SGRState()
+
+
+def _sgr_state_is_active(state: _SGRState) -> bool:
+    """
+    Return True if any attributes are set.
+
+    :param state: The SGR state to check.
+    :returns: True if any attribute differs from default.
+    """
+    return (state.bold or state.dim or state.italic or state.underline
+            or state.blink or state.rapid_blink or state.inverse or state.hidden
+            or state.strikethrough or state.double_underline
+            or state.foreground is not None or state.background is not None)
+
+
+def _sgr_state_to_sequence(state: _SGRState) -> str:
+    """
+    Generate minimal SGR sequence to restore this state from reset.
+
+    :param state: The SGR state to convert.
+    :returns: SGR escape sequence string, or empty string if no attributes set.
+    """
+    if not _sgr_state_is_active(state):
+        return ''
+
+    # Map boolean attributes to their SGR codes
+    bool_attrs = [
+        (state.bold, '1'), (state.dim, '2'), (state.italic, '3'),
+        (state.underline, '4'), (state.blink, '5'), (state.rapid_blink, '6'),
+        (state.inverse, '7'), (state.hidden, '8'), (state.strikethrough, '9'),
+        (state.double_underline, '21'),
+    ]
+    params = [code for active, code in bool_attrs if active]
+
+    # Add color params (already formatted as tuples)
+    if state.foreground is not None:
+        params.append(';'.join(str(p) for p in state.foreground))
+    if state.background is not None:
+        params.append(';'.join(str(p) for p in state.background))
+
+    return f'\x1b[{";".join(params)}m'
+
+
+def _parse_sgr_params(sequence: str) -> list[int | tuple[int, ...]]:
+    r"""
+    Parse SGR sequence and return list of parameter values.
+
+    Handles compound sequences like ``\x1b[1;31;4m`` -> [1, 31, 4].
+    Empty params (e.g., ``\x1b[m``) are treated as [0] (reset).
+    Colon-separated extended colors like ``\x1b[38:2::255:0:0m`` are returned
+    as tuples: [(38, 2, 255, 0, 0)].
+
+    :param sequence: SGR escape sequence string.
+    :returns: List of integer parameters or tuples for colon-separated colors.
+    """
+    match = _SGR_PATTERN.match(sequence)
+    if not match:
+        return []
+    params_str = match.group(1)
+    if not params_str:
+        return [0]  # \x1b[m is equivalent to \x1b[0m
+    result: list[int | tuple[int, ...]] = []
+    for param in params_str.split(';'):
+        if ':' in param:
+            # Colon-separated extended color (ITU T.416 format)
+            # e.g., "38:2::255:0:0" or "38:2:1:255:0:0" (with colorspace)
+            parts = [int(p) if p else 0 for p in param.split(':')]
+            result.append(tuple(parts))
+        else:
+            result.append(int(param) if param else 0)
+    return result
+
+
+def _parse_extended_color(
+    params: Iterator[int | tuple[int, ...]], base: int
+) -> tuple[int, ...] | None:
+    """
+    Parse extended color (256-color or RGB) from parameter iterator.
+
+    :param params: Iterator of remaining SGR parameters (semicolon-separated format).
+    :param base: Base code (38 for foreground, 48 for background).
+    :returns: Color tuple like (38, 5, N) or (38, 2, R, G, B), or None if malformed.
+    """
+    try:
+        mode = next(params)
+        if isinstance(mode, tuple):
+            return None  # Unexpected tuple, colon format handled separately
+        if mode == 5:  # 256-color
+            n = next(params)
+            if isinstance(n, tuple):
+                return None
+            return (int(base), 5, n)
+        if mode == 2:  # RGB
+            r, g, b = next(params), next(params), next(params)
+            if isinstance(r, tuple) or isinstance(g, tuple) or isinstance(b, tuple):
+                return None
+            return (int(base), 2, r, g, b)
+    except StopIteration:
+        pass
+    return None
+
+
+def _sgr_state_update(state: _SGRState, sequence: str) -> _SGRState:
+    # pylint: disable=too-many-branches,too-complex,too-many-statements
+    # NOTE: When minimum Python version is 3.10+, this can be simplified using match/case.
+    """
+    Parse SGR sequence and return new state with updates applied.
+
+    :param state: Current SGR state.
+    :param sequence: SGR escape sequence string.
+    :returns: New SGRState with updates applied.
+    """
+    params_list = _parse_sgr_params(sequence)
+    params = iter(params_list)
+    for p in params:
+        # Handle colon-separated extended colors (ITU T.416 format)
+        if isinstance(p, tuple):
+            if len(p) >= 2 and p[0] == _SGR.FG_EXTENDED:
+                # Foreground: (38, 2, [colorspace,] R, G, B) or (38, 5, N)
+                state = state._replace(foreground=p)
+            elif len(p) >= 2 and p[0] == _SGR.BG_EXTENDED:
+                # Background: (48, 2, [colorspace,] R, G, B) or (48, 5, N)
+                state = state._replace(background=p)
+            continue
+        if p == _SGR.RESET:
+            state = _SGR_STATE_DEFAULT
+        # Attribute ON codes
+        elif p == _SGR.BOLD:
+            state = state._replace(bold=True)
+        elif p == _SGR.DIM:
+            state = state._replace(dim=True)
+        elif p == _SGR.ITALIC:
+            state = state._replace(italic=True)
+        elif p == _SGR.UNDERLINE:
+            state = state._replace(underline=True)
+        elif p == _SGR.BLINK:
+            state = state._replace(blink=True)
+        elif p == _SGR.RAPID_BLINK:
+            state = state._replace(rapid_blink=True)
+        elif p == _SGR.INVERSE:
+            state = state._replace(inverse=True)
+        elif p == _SGR.HIDDEN:
+            state = state._replace(hidden=True)
+        elif p == _SGR.STRIKETHROUGH:
+            state = state._replace(strikethrough=True)
+        elif p == _SGR.DOUBLE_UNDERLINE:
+            state = state._replace(double_underline=True)
+        # Attribute OFF codes
+        elif p == _SGR.BOLD_DIM_OFF:
+            state = state._replace(bold=False, dim=False)
+        elif p == _SGR.ITALIC_OFF:
+            state = state._replace(italic=False)
+        elif p == _SGR.UNDERLINE_OFF:
+            state = state._replace(underline=False, double_underline=False)
+        elif p == _SGR.BLINK_OFF:
+            state = state._replace(blink=False, rapid_blink=False)
+        elif p == _SGR.INVERSE_OFF:
+            state = state._replace(inverse=False)
+        elif p == _SGR.HIDDEN_OFF:
+            state = state._replace(hidden=False)
+        elif p == _SGR.STRIKETHROUGH_OFF:
+            state = state._replace(strikethrough=False)
+        # Basic colors (30-37, 40-47 standard; 90-97, 100-107 bright)
+        elif (_SGR.FG_BLACK <= p <= _SGR.FG_WHITE
+              or _SGR.FG_BRIGHT_BLACK <= p <= _SGR.FG_BRIGHT_WHITE):
+            state = state._replace(foreground=(p,))
+        elif (_SGR.BG_BLACK <= p <= _SGR.BG_WHITE
+              or _SGR.BG_BRIGHT_BLACK <= p <= _SGR.BG_BRIGHT_WHITE):
+            state = state._replace(background=(p,))
+        elif p == _SGR.FG_DEFAULT:
+            state = state._replace(foreground=None)
+        elif p == _SGR.BG_DEFAULT:
+            state = state._replace(background=None)
+        # Extended colors (semicolon-separated format)
+        elif p == _SGR.FG_EXTENDED:
+            if color := _parse_extended_color(params, _SGR.FG_EXTENDED):
+                state = state._replace(foreground=color)
+        elif p == _SGR.BG_EXTENDED:
+            if color := _parse_extended_color(params, _SGR.BG_EXTENDED):
+                state = state._replace(background=color)
+    return state
+
+
+def propagate_sgr(lines: Sequence[str]) -> list[str]:
+    r"""
+    Propagate SGR codes across wrapped lines.
+
+    When text with SGR styling is wrapped across multiple lines, each line
+    needs to be self-contained for proper display. This function:
+
+    - Ends each line with ``\x1b[0m`` if styles are active (prevents bleeding)
+    - Starts each subsequent line with the active style restored
+
+    :param lines: List of text lines, possibly containing SGR sequences.
+    :returns: List of lines with SGR codes propagated.
+
+    Example::
+
+        >>> propagate_sgr(['\x1b[31mhello', 'world\x1b[0m'])
+        ['\x1b[31mhello\x1b[0m', '\x1b[31mworld\x1b[0m']
+
+    This is useful in cases of making special editors and viewers, and is used for the
+    default modes (propagate_sgr=True) of :func:`wcwidth.width` and :func:`wcwidth.clip`.
+
+    When wrapping and clipping text containing SGR sequences, maybe a previous line enabled the BLUE
+    color--if we are viewing *only* the line following, we would want the carry over the BLUE color,
+    and all lines with sequences should end with terminating reset (``\x1b[0m``).
+    """
+    # Fast path: check if any line contains SGR sequences
+    if not any(_SGR_QUICK_CHECK.search(line) for line in lines) or not lines:
+        return list(lines)
+
+    result: list[str] = []
+    state = _SGR_STATE_DEFAULT
+
+    for line in lines:
+        # Prefix with restoration sequence if state is active
+        prefix = _sgr_state_to_sequence(state)
+
+        # Update state by processing all SGR sequences in this line
+        for match in _SGR_PATTERN.finditer(line):
+            state = _sgr_state_update(state, match.group())
+
+        # Build output line
+        output_line = prefix + line if prefix else line
+        if _sgr_state_is_active(state):
+            output_line = output_line + _SGR_RESET
+
+        result.append(output_line)
+
+    return result
diff --git a/libs/wcwidth/table_ambiguous.py b/libs/wcwidth/table_ambiguous.py
new file mode 100644
index 0000000000..e3dc0b1c3d
--- /dev/null
+++ b/libs/wcwidth/table_ambiguous.py
@@ -0,0 +1,189 @@
+"""
+Exports AMBIGUOUS_EASTASIAN table keyed by supporting unicode version level.
+
+This code generated by wcwidth/bin/update-tables.py on 2026-01-18 23:27:15 UTC.
+"""
+# pylint: disable=duplicate-code
+AMBIGUOUS_EASTASIAN = {
+    '17.0.0': (
+        # Source: EastAsianWidth-17.0.0.txt
+        # Date: 2025-07-24, 00:12:54 GMT
+        #
+        (0x000a1, 0x000a1,),  # Inverted Exclamation Mark
+        (0x000a4, 0x000a4,),  # Currency Sign
+        (0x000a7, 0x000a8,),  # Section Sign            ..Diaeresis
+        (0x000aa, 0x000aa,),  # Feminine Ordinal Indicator
+        (0x000ad, 0x000ae,),  # Soft Hyphen             ..Registered Sign
+        (0x000b0, 0x000b4,),  # Degree Sign             ..Acute Accent
+        (0x000b6, 0x000ba,),  # Pilcrow Sign            ..Masculine Ordinal Indica
+        (0x000bc, 0x000bf,),  # Vulgar Fraction One Quar..Inverted Question Mark
+        (0x000c6, 0x000c6,),  # Latin Capital Letter Ae
+        (0x000d0, 0x000d0,),  # Latin Capital Letter Eth
+        (0x000d7, 0x000d8,),  # Multiplication Sign     ..Latin Capital Letter O W
+        (0x000de, 0x000e1,),  # Latin Capital Letter Tho..Latin Small Letter A Wit
+        (0x000e6, 0x000e6,),  # Latin Small Letter Ae
+        (0x000e8, 0x000ea,),  # Latin Small Letter E Wit..Latin Small Letter E Wit
+        (0x000ec, 0x000ed,),  # Latin Small Letter I Wit..Latin Small Letter I Wit
+        (0x000f0, 0x000f0,),  # Latin Small Letter Eth
+        (0x000f2, 0x000f3,),  # Latin Small Letter O Wit..Latin Small Letter O Wit
+        (0x000f7, 0x000fa,),  # Division Sign           ..Latin Small Letter U Wit
+        (0x000fc, 0x000fc,),  # Latin Small Letter U With Diaeresis
+        (0x000fe, 0x000fe,),  # Latin Small Letter Thorn
+        (0x00101, 0x00101,),  # Latin Small Letter A With Macron
+        (0x00111, 0x00111,),  # Latin Small Letter D With Stroke
+        (0x00113, 0x00113,),  # Latin Small Letter E With Macron
+        (0x0011b, 0x0011b,),  # Latin Small Letter E With Caron
+        (0x00126, 0x00127,),  # Latin Capital Letter H W..Latin Small Letter H Wit
+        (0x0012b, 0x0012b,),  # Latin Small Letter I With Macron
+        (0x00131, 0x00133,),  # Latin Small Letter Dotle..Latin Small Ligature Ij
+        (0x00138, 0x00138,),  # Latin Small Letter Kra
+        (0x0013f, 0x00142,),  # Latin Capital Letter L W..Latin Small Letter L Wit
+        (0x00144, 0x00144,),  # Latin Small Letter N With Acute
+        (0x00148, 0x0014b,),  # Latin Small Letter N Wit..Latin Small Letter Eng
+        (0x0014d, 0x0014d,),  # Latin Small Letter O With Macron
+        (0x00152, 0x00153,),  # Latin Capital Ligature O..Latin Small Ligature Oe
+        (0x00166, 0x00167,),  # Latin Capital Letter T W..Latin Small Letter T Wit
+        (0x0016b, 0x0016b,),  # Latin Small Letter U With Macron
+        (0x001ce, 0x001ce,),  # Latin Small Letter A With Caron
+        (0x001d0, 0x001d0,),  # Latin Small Letter I With Caron
+        (0x001d2, 0x001d2,),  # Latin Small Letter O With Caron
+        (0x001d4, 0x001d4,),  # Latin Small Letter U With Caron
+        (0x001d6, 0x001d6,),  # Latin Small Letter U With Diaeresis And Macron
+        (0x001d8, 0x001d8,),  # Latin Small Letter U With Diaeresis And Acute
+        (0x001da, 0x001da,),  # Latin Small Letter U With Diaeresis And Caron
+        (0x001dc, 0x001dc,),  # Latin Small Letter U With Diaeresis And Grave
+        (0x00251, 0x00251,),  # Latin Small Letter Alpha
+        (0x00261, 0x00261,),  # Latin Small Letter Script G
+        (0x002c4, 0x002c4,),  # Modifier Letter Up Arrowhead
+        (0x002c7, 0x002c7,),  # Caron
+        (0x002c9, 0x002cb,),  # Modifier Letter Macron  ..Modifier Letter Grave Ac
+        (0x002cd, 0x002cd,),  # Modifier Letter Low Macron
+        (0x002d0, 0x002d0,),  # Modifier Letter Triangular Colon
+        (0x002d8, 0x002db,),  # Breve                   ..Ogonek
+        (0x002dd, 0x002dd,),  # Double Acute Accent
+        (0x002df, 0x002df,),  # Modifier Letter Cross Accent
+        (0x00391, 0x003a1,),  # Greek Capital Letter Alp..Greek Capital Letter Rho
+        (0x003a3, 0x003a9,),  # Greek Capital Letter Sig..Greek Capital Letter Ome
+        (0x003b1, 0x003c1,),  # Greek Small Letter Alpha..Greek Small Letter Rho
+        (0x003c3, 0x003c9,),  # Greek Small Letter Sigma..Greek Small Letter Omega
+        (0x00401, 0x00401,),  # Cyrillic Capital Letter Io
+        (0x00410, 0x0044f,),  # Cyrillic Capital Letter ..Cyrillic Small Letter Ya
+        (0x00451, 0x00451,),  # Cyrillic Small Letter Io
+        (0x02010, 0x02010,),  # Hyphen
+        (0x02013, 0x02016,),  # En Dash                 ..Double Vertical Line
+        (0x02018, 0x02019,),  # Left Single Quotation Ma..Right Single Quotation M
+        (0x0201c, 0x0201d,),  # Left Double Quotation Ma..Right Double Quotation M
+        (0x02020, 0x02022,),  # Dagger                  ..Bullet
+        (0x02024, 0x02027,),  # One Dot Leader          ..Hyphenation Point
+        (0x02030, 0x02030,),  # Per Mille Sign
+        (0x02032, 0x02033,),  # Prime                   ..Double Prime
+        (0x02035, 0x02035,),  # Reversed Prime
+        (0x0203b, 0x0203b,),  # Reference Mark
+        (0x0203e, 0x0203e,),  # Overline
+        (0x02074, 0x02074,),  # Superscript Four
+        (0x0207f, 0x0207f,),  # Superscript Latin Small Letter N
+        (0x02081, 0x02084,),  # Subscript One           ..Subscript Four
+        (0x020ac, 0x020ac,),  # Euro Sign
+        (0x02103, 0x02103,),  # Degree Celsius
+        (0x02105, 0x02105,),  # Care Of
+        (0x02109, 0x02109,),  # Degree Fahrenheit
+        (0x02113, 0x02113,),  # Script Small L
+        (0x02116, 0x02116,),  # Numero Sign
+        (0x02121, 0x02122,),  # Telephone Sign          ..Trade Mark Sign
+        (0x02126, 0x02126,),  # Ohm Sign
+        (0x0212b, 0x0212b,),  # Angstrom Sign
+        (0x02153, 0x02154,),  # Vulgar Fraction One Thir..Vulgar Fraction Two Thir
+        (0x0215b, 0x0215e,),  # Vulgar Fraction One Eigh..Vulgar Fraction Seven Ei
+        (0x02160, 0x0216b,),  # Roman Numeral One       ..Roman Numeral Twelve
+        (0x02170, 0x02179,),  # Small Roman Numeral One ..Small Roman Numeral Ten
+        (0x02189, 0x02189,),  # Vulgar Fraction Zero Thirds
+        (0x02190, 0x02199,),  # Leftwards Arrow         ..South West Arrow
+        (0x021b8, 0x021b9,),  # North West Arrow To Long..Leftwards Arrow To Bar O
+        (0x021d2, 0x021d2,),  # Rightwards Double Arrow
+        (0x021d4, 0x021d4,),  # Left Right Double Arrow
+        (0x021e7, 0x021e7,),  # Upwards White Arrow
+        (0x02200, 0x02200,),  # For All
+        (0x02202, 0x02203,),  # Partial Differential    ..There Exists
+        (0x02207, 0x02208,),  # Nabla                   ..Element Of
+        (0x0220b, 0x0220b,),  # Contains As Member
+        (0x0220f, 0x0220f,),  # N-ary Product
+        (0x02211, 0x02211,),  # N-ary Summation
+        (0x02215, 0x02215,),  # Division Slash
+        (0x0221a, 0x0221a,),  # Square Root
+        (0x0221d, 0x02220,),  # Proportional To         ..Angle
+        (0x02223, 0x02223,),  # Divides
+        (0x02225, 0x02225,),  # Parallel To
+        (0x02227, 0x0222c,),  # Logical And             ..Double Integral
+        (0x0222e, 0x0222e,),  # Contour Integral
+        (0x02234, 0x02237,),  # Therefore               ..Proportion
+        (0x0223c, 0x0223d,),  # Tilde Operator          ..Reversed Tilde
+        (0x02248, 0x02248,),  # Almost Equal To
+        (0x0224c, 0x0224c,),  # All Equal To
+        (0x02252, 0x02252,),  # Approximately Equal To Or The Image Of
+        (0x02260, 0x02261,),  # Not Equal To            ..Identical To
+        (0x02264, 0x02267,),  # Less-than Or Equal To   ..Greater-than Over Equal
+        (0x0226a, 0x0226b,),  # Much Less-than          ..Much Greater-than
+        (0x0226e, 0x0226f,),  # Not Less-than           ..Not Greater-than
+        (0x02282, 0x02283,),  # Subset Of               ..Superset Of
+        (0x02286, 0x02287,),  # Subset Of Or Equal To   ..Superset Of Or Equal To
+        (0x02295, 0x02295,),  # Circled Plus
+        (0x02299, 0x02299,),  # Circled Dot Operator
+        (0x022a5, 0x022a5,),  # Up Tack
+        (0x022bf, 0x022bf,),  # Right Triangle
+        (0x02312, 0x02312,),  # Arc
+        (0x02460, 0x024e9,),  # Circled Digit One       ..Circled Latin Small Lett
+        (0x024eb, 0x0254b,),  # Negative Circled Number ..Box Drawings Heavy Verti
+        (0x02550, 0x02573,),  # Box Drawings Double Hori..Box Drawings Light Diago
+        (0x02580, 0x0258f,),  # Upper Half Block        ..Left One Eighth Block
+        (0x02592, 0x02595,),  # Medium Shade            ..Right One Eighth Block
+        (0x025a0, 0x025a1,),  # Black Square            ..White Square
+        (0x025a3, 0x025a9,),  # White Square Containing ..Square With Diagonal Cro
+        (0x025b2, 0x025b3,),  # Black Up-pointing Triang..White Up-pointing Triang
+        (0x025b6, 0x025b7,),  # Black Right-pointing Tri..White Right-pointing Tri
+        (0x025bc, 0x025bd,),  # Black Down-pointing Tria..White Down-pointing Tria
+        (0x025c0, 0x025c1,),  # Black Left-pointing Tria..White Left-pointing Tria
+        (0x025c6, 0x025c8,),  # Black Diamond           ..White Diamond Containing
+        (0x025cb, 0x025cb,),  # White Circle
+        (0x025ce, 0x025d1,),  # Bullseye                ..Circle With Right Half B
+        (0x025e2, 0x025e5,),  # Black Lower Right Triang..Black Upper Right Triang
+        (0x025ef, 0x025ef,),  # Large Circle
+        (0x02605, 0x02606,),  # Black Star              ..White Star
+        (0x02609, 0x02609,),  # Sun
+        (0x0260e, 0x0260f,),  # Black Telephone         ..White Telephone
+        (0x0261c, 0x0261c,),  # White Left Pointing Index
+        (0x0261e, 0x0261e,),  # White Right Pointing Index
+        (0x02640, 0x02640,),  # Female Sign
+        (0x02642, 0x02642,),  # Male Sign
+        (0x02660, 0x02661,),  # Black Spade Suit        ..White Heart Suit
+        (0x02663, 0x02665,),  # Black Club Suit         ..Black Heart Suit
+        (0x02667, 0x0266a,),  # White Club Suit         ..Eighth Note
+        (0x0266c, 0x0266d,),  # Beamed Sixteenth Notes  ..Music Flat Sign
+        (0x0266f, 0x0266f,),  # Music Sharp Sign
+        (0x0269e, 0x0269f,),  # Three Lines Converging R..Three Lines Converging L
+        (0x026bf, 0x026bf,),  # Squared Key
+        (0x026c6, 0x026cd,),  # Rain                    ..Disabled Car
+        (0x026cf, 0x026d3,),  # Pick                    ..Chains
+        (0x026d5, 0x026e1,),  # Alternate One-way Left W..Restricted Left Entry-2
+        (0x026e3, 0x026e3,),  # Heavy Circle With Stroke And Two Dots Above
+        (0x026e8, 0x026e9,),  # Black Cross On Shield   ..Shinto Shrine
+        (0x026eb, 0x026f1,),  # Castle                  ..Umbrella On Ground
+        (0x026f4, 0x026f4,),  # Ferry
+        (0x026f6, 0x026f9,),  # Square Four Corners     ..Person With Ball
+        (0x026fb, 0x026fc,),  # Japanese Bank Symbol    ..Headstone Graveyard Symb
+        (0x026fe, 0x026ff,),  # Cup On Black Square     ..White Flag With Horizont
+        (0x0273d, 0x0273d,),  # Heavy Teardrop-spoked Asterisk
+        (0x02776, 0x0277f,),  # Dingbat Negative Circled..Dingbat Negative Circled
+        (0x02b56, 0x02b59,),  # Heavy Oval With Oval Ins..Heavy Circled Saltire
+        (0x03248, 0x0324f,),  # Circled Number Ten On Bl..Circled Number Eighty On
+        (0x0e000, 0x0f8ff,),  # (nil)
+        (0x0fffd, 0x0fffd,),  # Replacement Character
+        (0x1f100, 0x1f10a,),  # Digit Zero Full Stop    ..Digit Nine Comma
+        (0x1f110, 0x1f12d,),  # Parenthesized Latin Capi..Circled Cd
+        (0x1f130, 0x1f169,),  # Squared Latin Capital Le..Negative Circled Latin C
+        (0x1f170, 0x1f18d,),  # Negative Squared Latin C..Negative Squared Sa
+        (0x1f18f, 0x1f190,),  # Negative Squared Wc     ..Square Dj
+        (0x1f19b, 0x1f1ac,),  # Squared Three D         ..Squared Vod
+        (0xf0000, 0xffffd,),  # (nil)
+        (0x100000, 0x10fffd,),  # (nil)
+    ),
+}
diff --git a/libs/wcwidth/table_grapheme.py b/libs/wcwidth/table_grapheme.py
new file mode 100644
index 0000000000..42fd19e03d
--- /dev/null
+++ b/libs/wcwidth/table_grapheme.py
@@ -0,0 +1,2294 @@
+"""
+Exports grapheme cluster break property tables for Unicode version 17.0.0.
+
+This module provides lookup tables for Unicode grapheme cluster break properties as defined in UAX
+#29: Unicode Text Segmentation.
+
+This code generated by wcwidth/bin/update-tables.py on 2026-01-29 23:33:42 UTC.
+"""
+# pylint: disable=duplicate-code
+
+GRAPHEME_CR = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x0000d, 0x0000d,),  # (nil)
+)
+
+GRAPHEME_LF = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x0000a, 0x0000a,),  # (nil)
+)
+
+GRAPHEME_CONTROL = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x00000, 0x00009,),  # (nil)
+    (0x0000b, 0x0000c,),  # (nil)
+    (0x0000e, 0x0001f,),  # (nil)
+    (0x0007f, 0x0009f,),  # (nil)
+    (0x000ad, 0x000ad,),  # Soft Hyphen
+    (0x0061c, 0x0061c,),  # Arabic Letter Mark
+    (0x0180e, 0x0180e,),  # Mongolian Vowel Separator
+    (0x0200b, 0x0200b,),  # Zero Width Space
+    (0x0200e, 0x0200f,),  # Left-to-right Mark      ..Right-to-left Mark
+    (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
+    (0x02060, 0x0206f,),  # Word Joiner             ..Nominal Digit Shapes
+    (0x0feff, 0x0feff,),  # Zero Width No-break Space
+    (0x0fff0, 0x0fffb,),  # (nil)                   ..Interlinear Annotation T
+    (0x13430, 0x1343f,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph End
+    (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
+    (0x1d173, 0x1d17a,),  # Musical Symbol Begin Bea..Musical Symbol End Phras
+    (0xe0000, 0xe001f,),  # (nil)
+    (0xe0080, 0xe00ff,),  # (nil)
+    (0xe01f0, 0xe0fff,),  # (nil)
+)
+
+GRAPHEME_EXTEND = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
+    (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
+    (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
+    (0x005bf, 0x005bf,),  # Hebrew Point Rafe
+    (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
+    (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
+    (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
+    (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
+    (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
+    (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
+    (0x006d6, 0x006dc,),  # Arabic Small High Ligatu..Arabic Small High Seen
+    (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
+    (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
+    (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
+    (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
+    (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
+    (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
+    (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
+    (0x007fd, 0x007fd,),  # Nko Dantayalan
+    (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
+    (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
+    (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
+    (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
+    (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
+    (0x00897, 0x0089f,),  # Arabic Pepet            ..Arabic Half Madda Over M
+    (0x008ca, 0x008e1,),  # Arabic Small High Farsi ..Arabic Small High Sign S
+    (0x008e3, 0x00902,),  # Arabic Turned Damma Belo..Devanagari Sign Anusvara
+    (0x0093a, 0x0093a,),  # Devanagari Vowel Sign Oe
+    (0x0093c, 0x0093c,),  # Devanagari Sign Nukta
+    (0x00941, 0x00948,),  # Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai
+    (0x0094d, 0x0094d,),  # Devanagari Sign Virama
+    (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
+    (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
+    (0x00981, 0x00981,),  # Bengali Sign Candrabindu
+    (0x009bc, 0x009bc,),  # Bengali Sign Nukta
+    (0x009be, 0x009be,),  # Bengali Vowel Sign Aa
+    (0x009c1, 0x009c4,),  # Bengali Vowel Sign U    ..Bengali Vowel Sign Vocal
+    (0x009cd, 0x009cd,),  # Bengali Sign Virama
+    (0x009d7, 0x009d7,),  # Bengali Au Length Mark
+    (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
+    (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
+    (0x00a01, 0x00a02,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi
+    (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
+    (0x00a41, 0x00a42,),  # Gurmukhi Vowel Sign U   ..Gurmukhi Vowel Sign Uu
+    (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
+    (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
+    (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
+    (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
+    (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
+    (0x00a81, 0x00a82,),  # Gujarati Sign Candrabind..Gujarati Sign Anusvara
+    (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
+    (0x00ac1, 0x00ac5,),  # Gujarati Vowel Sign U   ..Gujarati Vowel Sign Cand
+    (0x00ac7, 0x00ac8,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Ai
+    (0x00acd, 0x00acd,),  # Gujarati Sign Virama
+    (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
+    (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
+    (0x00b01, 0x00b01,),  # Oriya Sign Candrabindu
+    (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
+    (0x00b3e, 0x00b3f,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign I
+    (0x00b41, 0x00b44,),  # Oriya Vowel Sign U      ..Oriya Vowel Sign Vocalic
+    (0x00b4d, 0x00b4d,),  # Oriya Sign Virama
+    (0x00b55, 0x00b57,),  # Oriya Sign Overline     ..Oriya Au Length Mark
+    (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
+    (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
+    (0x00bbe, 0x00bbe,),  # Tamil Vowel Sign Aa
+    (0x00bc0, 0x00bc0,),  # Tamil Vowel Sign Ii
+    (0x00bcd, 0x00bcd,),  # Tamil Sign Virama
+    (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
+    (0x00c00, 0x00c00,),  # Telugu Sign Combining Candrabindu Above
+    (0x00c04, 0x00c04,),  # Telugu Sign Combining Anusvara Above
+    (0x00c3c, 0x00c3c,),  # Telugu Sign Nukta
+    (0x00c3e, 0x00c40,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Ii
+    (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
+    (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
+    (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
+    (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
+    (0x00c81, 0x00c81,),  # Kannada Sign Candrabindu
+    (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
+    (0x00cbf, 0x00cc0,),  # Kannada Vowel Sign I    ..Kannada Vowel Sign Ii
+    (0x00cc2, 0x00cc2,),  # Kannada Vowel Sign Uu
+    (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
+    (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
+    (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
+    (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
+    (0x00d00, 0x00d01,),  # Malayalam Sign Combining..Malayalam Sign Candrabin
+    (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
+    (0x00d3e, 0x00d3e,),  # Malayalam Vowel Sign Aa
+    (0x00d41, 0x00d44,),  # Malayalam Vowel Sign U  ..Malayalam Vowel Sign Voc
+    (0x00d4d, 0x00d4d,),  # Malayalam Sign Virama
+    (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
+    (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
+    (0x00d81, 0x00d81,),  # Sinhala Sign Candrabindu
+    (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
+    (0x00dcf, 0x00dcf,),  # Sinhala Vowel Sign Aela-pilla
+    (0x00dd2, 0x00dd4,),  # Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
+    (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
+    (0x00ddf, 0x00ddf,),  # Sinhala Vowel Sign Gayanukitta
+    (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
+    (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
+    (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
+    (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
+    (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
+    (0x00ec8, 0x00ece,),  # Lao Tone Mai Ek         ..Lao Yamakkan
+    (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
+    (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
+    (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
+    (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
+    (0x00f71, 0x00f7e,),  # Tibetan Vowel Sign Aa   ..Tibetan Sign Rjes Su Nga
+    (0x00f80, 0x00f84,),  # Tibetan Vowel Sign Rever..Tibetan Mark Halanta
+    (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
+    (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
+    (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
+    (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
+    (0x0102d, 0x01030,),  # Myanmar Vowel Sign I    ..Myanmar Vowel Sign Uu
+    (0x01032, 0x01037,),  # Myanmar Vowel Sign Ai   ..Myanmar Sign Dot Below
+    (0x01039, 0x0103a,),  # Myanmar Sign Virama     ..Myanmar Sign Asat
+    (0x0103d, 0x0103e,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
+    (0x01058, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
+    (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
+    (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
+    (0x01082, 0x01082,),  # Myanmar Consonant Sign Shan Medial Wa
+    (0x01085, 0x01086,),  # Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
+    (0x0108d, 0x0108d,),  # Myanmar Sign Shan Council Emphatic Tone
+    (0x0109d, 0x0109d,),  # Myanmar Vowel Sign Aiton Ai
+    (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
+    (0x01712, 0x01715,),  # Tagalog Vowel Sign I    ..Tagalog Sign Pamudpod
+    (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
+    (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
+    (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
+    (0x017b4, 0x017b5,),  # Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
+    (0x017b7, 0x017bd,),  # Khmer Vowel Sign I      ..Khmer Vowel Sign Ua
+    (0x017c6, 0x017c6,),  # Khmer Sign Nikahit
+    (0x017c9, 0x017d3,),  # Khmer Sign Muusikatoan  ..Khmer Sign Bathamasat
+    (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
+    (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
+    (0x0180f, 0x0180f,),  # Mongolian Free Variation Selector Four
+    (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
+    (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
+    (0x01920, 0x01922,),  # Limbu Vowel Sign A      ..Limbu Vowel Sign U
+    (0x01927, 0x01928,),  # Limbu Vowel Sign E      ..Limbu Vowel Sign O
+    (0x01932, 0x01932,),  # Limbu Small Letter Anusvara
+    (0x01939, 0x0193b,),  # Limbu Sign Mukphreng    ..Limbu Sign Sa-i
+    (0x01a17, 0x01a18,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign U
+    (0x01a1b, 0x01a1b,),  # Buginese Vowel Sign Ae
+    (0x01a56, 0x01a56,),  # Tai Tham Consonant Sign Medial La
+    (0x01a58, 0x01a5e,),  # Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign
+    (0x01a60, 0x01a60,),  # Tai Tham Sign Sakot
+    (0x01a62, 0x01a62,),  # Tai Tham Vowel Sign Mai Sat
+    (0x01a65, 0x01a6c,),  # Tai Tham Vowel Sign I   ..Tai Tham Vowel Sign Oa B
+    (0x01a73, 0x01a7c,),  # Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
+    (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
+    (0x01ab0, 0x01add,),  # Combining Doubled Circum..Combining Dot-and-ring B
+    (0x01ae0, 0x01aeb,),  # Combining Left Tack Abov..Combining Double Rightwa
+    (0x01b00, 0x01b03,),  # Balinese Sign Ulu Ricem ..Balinese Sign Surang
+    (0x01b34, 0x01b3d,),  # Balinese Sign Rerekan   ..Balinese Vowel Sign La L
+    (0x01b42, 0x01b44,),  # Balinese Vowel Sign Pepe..Balinese Adeg Adeg
+    (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
+    (0x01b80, 0x01b81,),  # Sundanese Sign Panyecek ..Sundanese Sign Panglayar
+    (0x01ba2, 0x01ba5,),  # Sundanese Consonant Sign..Sundanese Vowel Sign Pan
+    (0x01ba8, 0x01bad,),  # Sundanese Vowel Sign Pam..Sundanese Consonant Sign
+    (0x01be6, 0x01be6,),  # Batak Sign Tompi
+    (0x01be8, 0x01be9,),  # Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee
+    (0x01bed, 0x01bed,),  # Batak Vowel Sign Karo O
+    (0x01bef, 0x01bf3,),  # Batak Vowel Sign U For S..Batak Panongonan
+    (0x01c2c, 0x01c33,),  # Lepcha Vowel Sign E     ..Lepcha Consonant Sign T
+    (0x01c36, 0x01c37,),  # Lepcha Sign Ran         ..Lepcha Sign Nukta
+    (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
+    (0x01cd4, 0x01ce0,),  # Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash
+    (0x01ce2, 0x01ce8,),  # Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda
+    (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
+    (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
+    (0x01cf8, 0x01cf9,),  # Vedic Tone Ring Above   ..Vedic Tone Double Ring A
+    (0x01dc0, 0x01dff,),  # Combining Dotted Grave A..Combining Right Arrowhea
+    (0x0200c, 0x0200c,),  # Zero Width Non-joiner
+    (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
+    (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
+    (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
+    (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
+    (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
+    (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
+    (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
+    (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
+    (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
+    (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
+    (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
+    (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
+    (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
+    (0x0a825, 0x0a826,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
+    (0x0a82c, 0x0a82c,),  # Syloti Nagri Sign Alternate Hasanta
+    (0x0a8c4, 0x0a8c5,),  # Saurashtra Sign Virama  ..Saurashtra Sign Candrabi
+    (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
+    (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
+    (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
+    (0x0a947, 0x0a951,),  # Rejang Vowel Sign I     ..Rejang Consonant Sign R
+    (0x0a953, 0x0a953,),  # Rejang Virama
+    (0x0a980, 0x0a982,),  # Javanese Sign Panyangga ..Javanese Sign Layar
+    (0x0a9b3, 0x0a9b3,),  # Javanese Sign Cecak Telu
+    (0x0a9b6, 0x0a9b9,),  # Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku
+    (0x0a9bc, 0x0a9bd,),  # Javanese Vowel Sign Pepe..Javanese Consonant Sign
+    (0x0a9c0, 0x0a9c0,),  # Javanese Pangkon
+    (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
+    (0x0aa29, 0x0aa2e,),  # Cham Vowel Sign Aa      ..Cham Vowel Sign Oe
+    (0x0aa31, 0x0aa32,),  # Cham Vowel Sign Au      ..Cham Vowel Sign Ue
+    (0x0aa35, 0x0aa36,),  # Cham Consonant Sign La  ..Cham Consonant Sign Wa
+    (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
+    (0x0aa4c, 0x0aa4c,),  # Cham Consonant Sign Final M
+    (0x0aa7c, 0x0aa7c,),  # Myanmar Sign Tai Laing Tone-2
+    (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
+    (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
+    (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
+    (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
+    (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
+    (0x0aaec, 0x0aaed,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+    (0x0aaf6, 0x0aaf6,),  # Meetei Mayek Virama
+    (0x0abe5, 0x0abe5,),  # Meetei Mayek Vowel Sign Anap
+    (0x0abe8, 0x0abe8,),  # Meetei Mayek Vowel Sign Unap
+    (0x0abed, 0x0abed,),  # Meetei Mayek Apun Iyek
+    (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
+    (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
+    (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
+    (0x0ff9e, 0x0ff9f,),  # Halfwidth Katakana Voice..Halfwidth Katakana Semi-
+    (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
+    (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
+    (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
+    (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
+    (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
+    (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
+    (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
+    (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
+    (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
+    (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
+    (0x10d69, 0x10d6d,),  # Garay Vowel Sign E      ..Garay Consonant Nasaliza
+    (0x10eab, 0x10eac,),  # Yezidi Combining Hamza M..Yezidi Combining Madda M
+    (0x10efa, 0x10eff,),  # Arabic Double Vertical B..Arabic Small Low Word Ma
+    (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
+    (0x10f82, 0x10f85,),  # Old Uyghur Combining Dot..Old Uyghur Combining Two
+    (0x11001, 0x11001,),  # Brahmi Sign Anusvara
+    (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
+    (0x11070, 0x11070,),  # Brahmi Sign Old Tamil Virama
+    (0x11073, 0x11074,),  # Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta
+    (0x1107f, 0x11081,),  # Brahmi Number Joiner    ..Kaithi Sign Anusvara
+    (0x110b3, 0x110b6,),  # Kaithi Vowel Sign U     ..Kaithi Vowel Sign Ai
+    (0x110b9, 0x110ba,),  # Kaithi Sign Virama      ..Kaithi Sign Nukta
+    (0x110c2, 0x110c2,),  # Kaithi Vowel Sign Vocalic R
+    (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
+    (0x11127, 0x1112b,),  # Chakma Vowel Sign A     ..Chakma Vowel Sign Uu
+    (0x1112d, 0x11134,),  # Chakma Vowel Sign Ai    ..Chakma Maayyaa
+    (0x11173, 0x11173,),  # Mahajani Sign Nukta
+    (0x11180, 0x11181,),  # Sharada Sign Candrabindu..Sharada Sign Anusvara
+    (0x111b6, 0x111be,),  # Sharada Vowel Sign U    ..Sharada Vowel Sign O
+    (0x111c0, 0x111c0,),  # Sharada Sign Virama
+    (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
+    (0x111cf, 0x111cf,),  # Sharada Sign Inverted Candrabindu
+    (0x1122f, 0x11231,),  # Khojki Vowel Sign U     ..Khojki Vowel Sign Ai
+    (0x11234, 0x11237,),  # Khojki Sign Anusvara    ..Khojki Sign Shadda
+    (0x1123e, 0x1123e,),  # Khojki Sign Sukun
+    (0x11241, 0x11241,),  # Khojki Vowel Sign Vocalic R
+    (0x112df, 0x112df,),  # Khudawadi Sign Anusvara
+    (0x112e3, 0x112ea,),  # Khudawadi Vowel Sign U  ..Khudawadi Sign Virama
+    (0x11300, 0x11301,),  # Grantha Sign Combining A..Grantha Sign Candrabindu
+    (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
+    (0x1133e, 0x1133e,),  # Grantha Vowel Sign Aa
+    (0x11340, 0x11340,),  # Grantha Vowel Sign Ii
+    (0x1134d, 0x1134d,),  # Grantha Sign Virama
+    (0x11357, 0x11357,),  # Grantha Au Length Mark
+    (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
+    (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
+    (0x113b8, 0x113b8,),  # Tulu-tigalari Vowel Sign Aa
+    (0x113bb, 0x113c0,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Vowel Sign
+    (0x113c2, 0x113c2,),  # Tulu-tigalari Vowel Sign Ee
+    (0x113c5, 0x113c5,),  # Tulu-tigalari Vowel Sign Ai
+    (0x113c7, 0x113c9,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Au Length
+    (0x113ce, 0x113d0,),  # Tulu-tigalari Sign Viram..Tulu-tigalari Conjoiner
+    (0x113d2, 0x113d2,),  # Tulu-tigalari Gemination Mark
+    (0x113e1, 0x113e2,),  # Tulu-tigalari Vedic Tone..Tulu-tigalari Vedic Tone
+    (0x11438, 0x1143f,),  # Newa Vowel Sign U       ..Newa Vowel Sign Ai
+    (0x11442, 0x11444,),  # Newa Sign Virama        ..Newa Sign Anusvara
+    (0x11446, 0x11446,),  # Newa Sign Nukta
+    (0x1145e, 0x1145e,),  # Newa Sandhi Mark
+    (0x114b0, 0x114b0,),  # Tirhuta Vowel Sign Aa
+    (0x114b3, 0x114b8,),  # Tirhuta Vowel Sign U    ..Tirhuta Vowel Sign Vocal
+    (0x114ba, 0x114ba,),  # Tirhuta Vowel Sign Short E
+    (0x114bd, 0x114bd,),  # Tirhuta Vowel Sign Short O
+    (0x114bf, 0x114c0,),  # Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara
+    (0x114c2, 0x114c3,),  # Tirhuta Sign Virama     ..Tirhuta Sign Nukta
+    (0x115af, 0x115af,),  # Siddham Vowel Sign Aa
+    (0x115b2, 0x115b5,),  # Siddham Vowel Sign U    ..Siddham Vowel Sign Vocal
+    (0x115bc, 0x115bd,),  # Siddham Sign Candrabindu..Siddham Sign Anusvara
+    (0x115bf, 0x115c0,),  # Siddham Sign Virama     ..Siddham Sign Nukta
+    (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
+    (0x11633, 0x1163a,),  # Modi Vowel Sign U       ..Modi Vowel Sign Ai
+    (0x1163d, 0x1163d,),  # Modi Sign Anusvara
+    (0x1163f, 0x11640,),  # Modi Sign Virama        ..Modi Sign Ardhacandra
+    (0x116ab, 0x116ab,),  # Takri Sign Anusvara
+    (0x116ad, 0x116ad,),  # Takri Vowel Sign Aa
+    (0x116b0, 0x116b7,),  # Takri Vowel Sign U      ..Takri Sign Nukta
+    (0x1171d, 0x1171d,),  # Ahom Consonant Sign Medial La
+    (0x1171f, 0x1171f,),  # Ahom Consonant Sign Medial Ligating Ra
+    (0x11722, 0x11725,),  # Ahom Vowel Sign I       ..Ahom Vowel Sign Uu
+    (0x11727, 0x1172b,),  # Ahom Vowel Sign Aw      ..Ahom Sign Killer
+    (0x1182f, 0x11837,),  # Dogra Vowel Sign U      ..Dogra Sign Anusvara
+    (0x11839, 0x1183a,),  # Dogra Sign Virama       ..Dogra Sign Nukta
+    (0x11930, 0x11930,),  # Dives Akuru Vowel Sign Aa
+    (0x1193b, 0x1193e,),  # Dives Akuru Sign Anusvar..Dives Akuru Virama
+    (0x11943, 0x11943,),  # Dives Akuru Sign Nukta
+    (0x119d4, 0x119d7,),  # Nandinagari Vowel Sign U..Nandinagari Vowel Sign V
+    (0x119da, 0x119db,),  # Nandinagari Vowel Sign E..Nandinagari Vowel Sign A
+    (0x119e0, 0x119e0,),  # Nandinagari Sign Virama
+    (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
+    (0x11a33, 0x11a38,),  # Zanabazar Square Final C..Zanabazar Square Sign An
+    (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
+    (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
+    (0x11a51, 0x11a56,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Sign Oe
+    (0x11a59, 0x11a5b,),  # Soyombo Vowel Sign Vocal..Soyombo Vowel Length Mar
+    (0x11a8a, 0x11a96,),  # Soyombo Final Consonant ..Soyombo Sign Anusvara
+    (0x11a98, 0x11a99,),  # Soyombo Gemination Mark ..Soyombo Subjoiner
+    (0x11b60, 0x11b60,),  # Sharada Vowel Sign Oe
+    (0x11b62, 0x11b64,),  # Sharada Vowel Sign Ue   ..Sharada Vowel Sign Short
+    (0x11b66, 0x11b66,),  # Sharada Vowel Sign Candra E
+    (0x11c30, 0x11c36,),  # Bhaiksuki Vowel Sign I  ..Bhaiksuki Vowel Sign Voc
+    (0x11c38, 0x11c3d,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Anusvara
+    (0x11c3f, 0x11c3f,),  # Bhaiksuki Sign Virama
+    (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
+    (0x11caa, 0x11cb0,),  # Marchen Subjoined Letter..Marchen Vowel Sign Aa
+    (0x11cb2, 0x11cb3,),  # Marchen Vowel Sign U    ..Marchen Vowel Sign E
+    (0x11cb5, 0x11cb6,),  # Marchen Sign Anusvara   ..Marchen Sign Candrabindu
+    (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+    (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
+    (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+    (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
+    (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
+    (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+    (0x11d95, 0x11d95,),  # Gunjala Gondi Sign Anusvara
+    (0x11d97, 0x11d97,),  # Gunjala Gondi Virama
+    (0x11ef3, 0x11ef4,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign U
+    (0x11f00, 0x11f01,),  # Kawi Sign Candrabindu   ..Kawi Sign Anusvara
+    (0x11f36, 0x11f3a,),  # Kawi Vowel Sign I       ..Kawi Vowel Sign Vocalic
+    (0x11f40, 0x11f42,),  # Kawi Vowel Sign Eu      ..Kawi Conjoiner
+    (0x11f5a, 0x11f5a,),  # Kawi Sign Nukta
+    (0x13440, 0x13440,),  # Egyptian Hieroglyph Mirror Horizontally
+    (0x13447, 0x13455,),  # Egyptian Hieroglyph Modi..Egyptian Hieroglyph Modi
+    (0x1611e, 0x16129,),  # Gurung Khema Vowel Sign ..Gurung Khema Vowel Lengt
+    (0x1612d, 0x1612f,),  # Gurung Khema Sign Anusva..Gurung Khema Sign Tholho
+    (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
+    (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
+    (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
+    (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
+    (0x16fe4, 0x16fe4,),  # Khitan Small Script Filler
+    (0x16ff0, 0x16ff1,),  # Vietnamese Alternate Rea..Vietnamese Alternate Rea
+    (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
+    (0x1cf00, 0x1cf2d,),  # Znamenny Combining Mark ..Znamenny Combining Mark
+    (0x1cf30, 0x1cf46,),  # Znamenny Combining Tonal..Znamenny Priznak Modifie
+    (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d16d, 0x1d172,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d17b, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
+    (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
+    (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
+    (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
+    (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
+    (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
+    (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
+    (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e08f, 0x1e08f,),  # Combining Cyrillic Small Letter Byelorussian-ukr
+    (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
+    (0x1e2ae, 0x1e2ae,),  # Toto Sign Rising Tone
+    (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
+    (0x1e4ec, 0x1e4ef,),  # Nag Mundari Sign Muhor  ..Nag Mundari Sign Sutuh
+    (0x1e5ee, 0x1e5ef,),  # Ol Onal Sign Mu         ..Ol Onal Sign Ikir
+    (0x1e6e3, 0x1e6e3,),  # Tai Yo Sign Ue
+    (0x1e6e6, 0x1e6e6,),  # Tai Yo Sign Au
+    (0x1e6ee, 0x1e6ef,),  # Tai Yo Sign Ay          ..Tai Yo Sign Ang
+    (0x1e6f5, 0x1e6f5,),  # Tai Yo Sign Om
+    (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
+    (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
+    (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
+    (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
+    (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
+)
+
+GRAPHEME_ZWJ = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x0200d, 0x0200d,),  # Zero Width Joiner
+)
+
+GRAPHEME_REGIONAL_INDICATOR = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x1f1e6, 0x1f1ff,),  # Regional Indicator Symbo..Regional Indicator Symbo
+)
+
+GRAPHEME_PREPEND = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
+    (0x006dd, 0x006dd,),  # Arabic End Of Ayah
+    (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
+    (0x00890, 0x00891,),  # Arabic Pound Mark Above ..Arabic Piastre Mark Abov
+    (0x008e2, 0x008e2,),  # Arabic Disputed End Of Ayah
+    (0x00d4e, 0x00d4e,),  # Malayalam Letter Dot Reph
+    (0x110bd, 0x110bd,),  # Kaithi Number Sign
+    (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
+    (0x111c2, 0x111c3,),  # Sharada Sign Jihvamuliya..Sharada Sign Upadhmaniya
+    (0x113d1, 0x113d1,),  # Tulu-tigalari Repha
+    (0x1193f, 0x1193f,),  # Dives Akuru Prefixed Nasal Sign
+    (0x11941, 0x11941,),  # Dives Akuru Initial Ra
+    (0x11a84, 0x11a89,),  # Soyombo Sign Jihvamuliya..Soyombo Cluster-initial
+    (0x11d46, 0x11d46,),  # Masaram Gondi Repha
+    (0x11f02, 0x11f02,),  # Kawi Sign Repha
+)
+
+GRAPHEME_SPACINGMARK = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x00903, 0x00903,),  # Devanagari Sign Visarga
+    (0x0093b, 0x0093b,),  # Devanagari Vowel Sign Ooe
+    (0x0093e, 0x00940,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Ii
+    (0x00949, 0x0094c,),  # Devanagari Vowel Sign Ca..Devanagari Vowel Sign Au
+    (0x0094e, 0x0094f,),  # Devanagari Vowel Sign Pr..Devanagari Vowel Sign Aw
+    (0x00982, 0x00983,),  # Bengali Sign Anusvara   ..Bengali Sign Visarga
+    (0x009bf, 0x009c0,),  # Bengali Vowel Sign I    ..Bengali Vowel Sign Ii
+    (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
+    (0x009cb, 0x009cc,),  # Bengali Vowel Sign O    ..Bengali Vowel Sign Au
+    (0x00a03, 0x00a03,),  # Gurmukhi Sign Visarga
+    (0x00a3e, 0x00a40,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Ii
+    (0x00a83, 0x00a83,),  # Gujarati Sign Visarga
+    (0x00abe, 0x00ac0,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Ii
+    (0x00ac9, 0x00ac9,),  # Gujarati Vowel Sign Candra O
+    (0x00acb, 0x00acc,),  # Gujarati Vowel Sign O   ..Gujarati Vowel Sign Au
+    (0x00b02, 0x00b03,),  # Oriya Sign Anusvara     ..Oriya Sign Visarga
+    (0x00b40, 0x00b40,),  # Oriya Vowel Sign Ii
+    (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
+    (0x00b4b, 0x00b4c,),  # Oriya Vowel Sign O      ..Oriya Vowel Sign Au
+    (0x00bbf, 0x00bbf,),  # Tamil Vowel Sign I
+    (0x00bc1, 0x00bc2,),  # Tamil Vowel Sign U      ..Tamil Vowel Sign Uu
+    (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
+    (0x00bca, 0x00bcc,),  # Tamil Vowel Sign O      ..Tamil Vowel Sign Au
+    (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
+    (0x00c41, 0x00c44,),  # Telugu Vowel Sign U     ..Telugu Vowel Sign Vocali
+    (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
+    (0x00cbe, 0x00cbe,),  # Kannada Vowel Sign Aa
+    (0x00cc1, 0x00cc1,),  # Kannada Vowel Sign U
+    (0x00cc3, 0x00cc4,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
+    (0x00cf3, 0x00cf3,),  # Kannada Sign Combining Anusvara Above Right
+    (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
+    (0x00d3f, 0x00d40,),  # Malayalam Vowel Sign I  ..Malayalam Vowel Sign Ii
+    (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
+    (0x00d4a, 0x00d4c,),  # Malayalam Vowel Sign O  ..Malayalam Vowel Sign Au
+    (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
+    (0x00dd0, 0x00dd1,),  # Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Diga
+    (0x00dd8, 0x00dde,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Kombu
+    (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
+    (0x00e33, 0x00e33,),  # Thai Character Sara Am
+    (0x00eb3, 0x00eb3,),  # Lao Vowel Sign Am
+    (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
+    (0x00f7f, 0x00f7f,),  # Tibetan Sign Rnam Bcad
+    (0x01031, 0x01031,),  # Myanmar Vowel Sign E
+    (0x0103b, 0x0103c,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
+    (0x01056, 0x01057,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
+    (0x01084, 0x01084,),  # Myanmar Vowel Sign Shan E
+    (0x017b6, 0x017b6,),  # Khmer Vowel Sign Aa
+    (0x017be, 0x017c5,),  # Khmer Vowel Sign Oe     ..Khmer Vowel Sign Au
+    (0x017c7, 0x017c8,),  # Khmer Sign Reahmuk      ..Khmer Sign Yuukaleapintu
+    (0x01923, 0x01926,),  # Limbu Vowel Sign Ee     ..Limbu Vowel Sign Au
+    (0x01929, 0x0192b,),  # Limbu Subjoined Letter Y..Limbu Subjoined Letter W
+    (0x01930, 0x01931,),  # Limbu Small Letter Ka   ..Limbu Small Letter Nga
+    (0x01933, 0x01938,),  # Limbu Small Letter Ta   ..Limbu Small Letter La
+    (0x01a19, 0x01a1a,),  # Buginese Vowel Sign E   ..Buginese Vowel Sign O
+    (0x01a55, 0x01a55,),  # Tai Tham Consonant Sign Medial Ra
+    (0x01a57, 0x01a57,),  # Tai Tham Consonant Sign La Tang Lai
+    (0x01a6d, 0x01a72,),  # Tai Tham Vowel Sign Oy  ..Tai Tham Vowel Sign Tham
+    (0x01b04, 0x01b04,),  # Balinese Sign Bisah
+    (0x01b3e, 0x01b41,),  # Balinese Vowel Sign Tali..Balinese Vowel Sign Tali
+    (0x01b82, 0x01b82,),  # Sundanese Sign Pangwisad
+    (0x01ba1, 0x01ba1,),  # Sundanese Consonant Sign Pamingkal
+    (0x01ba6, 0x01ba7,),  # Sundanese Vowel Sign Pan..Sundanese Vowel Sign Pan
+    (0x01be7, 0x01be7,),  # Batak Vowel Sign E
+    (0x01bea, 0x01bec,),  # Batak Vowel Sign I      ..Batak Vowel Sign O
+    (0x01bee, 0x01bee,),  # Batak Vowel Sign U
+    (0x01c24, 0x01c2b,),  # Lepcha Subjoined Letter ..Lepcha Vowel Sign Uu
+    (0x01c34, 0x01c35,),  # Lepcha Consonant Sign Ny..Lepcha Consonant Sign Ka
+    (0x01ce1, 0x01ce1,),  # Vedic Tone Atharvavedic Independent Svarita
+    (0x01cf7, 0x01cf7,),  # Vedic Sign Atikrama
+    (0x0a823, 0x0a824,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
+    (0x0a827, 0x0a827,),  # Syloti Nagri Vowel Sign Oo
+    (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
+    (0x0a8b4, 0x0a8c3,),  # Saurashtra Consonant Sig..Saurashtra Vowel Sign Au
+    (0x0a952, 0x0a952,),  # Rejang Consonant Sign H
+    (0x0a983, 0x0a983,),  # Javanese Sign Wignyan
+    (0x0a9b4, 0x0a9b5,),  # Javanese Vowel Sign Taru..Javanese Vowel Sign Tolo
+    (0x0a9ba, 0x0a9bb,),  # Javanese Vowel Sign Tali..Javanese Vowel Sign Dirg
+    (0x0a9be, 0x0a9bf,),  # Javanese Consonant Sign ..Javanese Consonant Sign
+    (0x0aa2f, 0x0aa30,),  # Cham Vowel Sign O       ..Cham Vowel Sign Ai
+    (0x0aa33, 0x0aa34,),  # Cham Consonant Sign Ya  ..Cham Consonant Sign Ra
+    (0x0aa4d, 0x0aa4d,),  # Cham Consonant Sign Final H
+    (0x0aaeb, 0x0aaeb,),  # Meetei Mayek Vowel Sign Ii
+    (0x0aaee, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+    (0x0aaf5, 0x0aaf5,),  # Meetei Mayek Vowel Sign Visarga
+    (0x0abe3, 0x0abe4,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+    (0x0abe6, 0x0abe7,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+    (0x0abe9, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+    (0x0abec, 0x0abec,),  # Meetei Mayek Lum Iyek
+    (0x11000, 0x11000,),  # Brahmi Sign Candrabindu
+    (0x11002, 0x11002,),  # Brahmi Sign Visarga
+    (0x11082, 0x11082,),  # Kaithi Sign Visarga
+    (0x110b0, 0x110b2,),  # Kaithi Vowel Sign Aa    ..Kaithi Vowel Sign Ii
+    (0x110b7, 0x110b8,),  # Kaithi Vowel Sign O     ..Kaithi Vowel Sign Au
+    (0x1112c, 0x1112c,),  # Chakma Vowel Sign E
+    (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
+    (0x11182, 0x11182,),  # Sharada Sign Visarga
+    (0x111b3, 0x111b5,),  # Sharada Vowel Sign Aa   ..Sharada Vowel Sign Ii
+    (0x111bf, 0x111bf,),  # Sharada Vowel Sign Au
+    (0x111ce, 0x111ce,),  # Sharada Vowel Sign Prishthamatra E
+    (0x1122c, 0x1122e,),  # Khojki Vowel Sign Aa    ..Khojki Vowel Sign Ii
+    (0x11232, 0x11233,),  # Khojki Vowel Sign O     ..Khojki Vowel Sign Au
+    (0x112e0, 0x112e2,),  # Khudawadi Vowel Sign Aa ..Khudawadi Vowel Sign Ii
+    (0x11302, 0x11303,),  # Grantha Sign Anusvara   ..Grantha Sign Visarga
+    (0x1133f, 0x1133f,),  # Grantha Vowel Sign I
+    (0x11341, 0x11344,),  # Grantha Vowel Sign U    ..Grantha Vowel Sign Vocal
+    (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
+    (0x1134b, 0x1134c,),  # Grantha Vowel Sign Oo   ..Grantha Vowel Sign Au
+    (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
+    (0x113b9, 0x113ba,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Vowel Sign
+    (0x113ca, 0x113ca,),  # Tulu-tigalari Sign Candra Anunasika
+    (0x113cc, 0x113cd,),  # Tulu-tigalari Sign Anusv..Tulu-tigalari Sign Visar
+    (0x11435, 0x11437,),  # Newa Vowel Sign Aa      ..Newa Vowel Sign Ii
+    (0x11440, 0x11441,),  # Newa Vowel Sign O       ..Newa Vowel Sign Au
+    (0x11445, 0x11445,),  # Newa Sign Visarga
+    (0x114b1, 0x114b2,),  # Tirhuta Vowel Sign I    ..Tirhuta Vowel Sign Ii
+    (0x114b9, 0x114b9,),  # Tirhuta Vowel Sign E
+    (0x114bb, 0x114bc,),  # Tirhuta Vowel Sign Ai   ..Tirhuta Vowel Sign O
+    (0x114be, 0x114be,),  # Tirhuta Vowel Sign Au
+    (0x114c1, 0x114c1,),  # Tirhuta Sign Visarga
+    (0x115b0, 0x115b1,),  # Siddham Vowel Sign I    ..Siddham Vowel Sign Ii
+    (0x115b8, 0x115bb,),  # Siddham Vowel Sign E    ..Siddham Vowel Sign Au
+    (0x115be, 0x115be,),  # Siddham Sign Visarga
+    (0x11630, 0x11632,),  # Modi Vowel Sign Aa      ..Modi Vowel Sign Ii
+    (0x1163b, 0x1163c,),  # Modi Vowel Sign O       ..Modi Vowel Sign Au
+    (0x1163e, 0x1163e,),  # Modi Sign Visarga
+    (0x116ac, 0x116ac,),  # Takri Sign Visarga
+    (0x116ae, 0x116af,),  # Takri Vowel Sign I      ..Takri Vowel Sign Ii
+    (0x1171e, 0x1171e,),  # Ahom Consonant Sign Medial Ra
+    (0x11726, 0x11726,),  # Ahom Vowel Sign E
+    (0x1182c, 0x1182e,),  # Dogra Vowel Sign Aa     ..Dogra Vowel Sign Ii
+    (0x11838, 0x11838,),  # Dogra Sign Visarga
+    (0x11931, 0x11935,),  # Dives Akuru Vowel Sign I..Dives Akuru Vowel Sign E
+    (0x11937, 0x11938,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign O
+    (0x11940, 0x11940,),  # Dives Akuru Medial Ya
+    (0x11942, 0x11942,),  # Dives Akuru Medial Ra
+    (0x119d1, 0x119d3,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign I
+    (0x119dc, 0x119df,),  # Nandinagari Vowel Sign O..Nandinagari Sign Visarga
+    (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
+    (0x11a39, 0x11a39,),  # Zanabazar Square Sign Visarga
+    (0x11a57, 0x11a58,),  # Soyombo Vowel Sign Ai   ..Soyombo Vowel Sign Au
+    (0x11a97, 0x11a97,),  # Soyombo Sign Visarga
+    (0x11b61, 0x11b61,),  # Sharada Vowel Sign Ooe
+    (0x11b65, 0x11b65,),  # Sharada Vowel Sign Short O
+    (0x11b67, 0x11b67,),  # Sharada Vowel Sign Candra O
+    (0x11c2f, 0x11c2f,),  # Bhaiksuki Vowel Sign Aa
+    (0x11c3e, 0x11c3e,),  # Bhaiksuki Sign Visarga
+    (0x11ca9, 0x11ca9,),  # Marchen Subjoined Letter Ya
+    (0x11cb1, 0x11cb1,),  # Marchen Vowel Sign I
+    (0x11cb4, 0x11cb4,),  # Marchen Vowel Sign O
+    (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+    (0x11d93, 0x11d94,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+    (0x11d96, 0x11d96,),  # Gunjala Gondi Sign Visarga
+    (0x11ef5, 0x11ef6,),  # Makasar Vowel Sign E    ..Makasar Vowel Sign O
+    (0x11f03, 0x11f03,),  # Kawi Sign Visarga
+    (0x11f34, 0x11f35,),  # Kawi Vowel Sign Aa      ..Kawi Vowel Sign Alternat
+    (0x11f3e, 0x11f3f,),  # Kawi Vowel Sign E       ..Kawi Vowel Sign Ai
+    (0x1612a, 0x1612c,),  # Gurung Khema Consonant S..Gurung Khema Consonant S
+    (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
+)
+
+GRAPHEME_L = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
+    (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
+)
+
+GRAPHEME_V = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x01160, 0x011a7,),  # Hangul Jungseong Filler ..Hangul Jungseong O-yae
+    (0x0d7b0, 0x0d7c6,),  # Hangul Jungseong O-yeo  ..Hangul Jungseong Araea-e
+    (0x16d63, 0x16d63,),  # Kirat Rai Vowel Sign Aa
+    (0x16d67, 0x16d6a,),  # Kirat Rai Vowel Sign E  ..Kirat Rai Vowel Sign Au
+)
+
+GRAPHEME_T = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x011a8, 0x011ff,),  # Hangul Jongseong Kiyeok ..Hangul Jongseong Ssangni
+    (0x0d7cb, 0x0d7fb,),  # Hangul Jongseong Nieun-r..Hangul Jongseong Phieuph
+)
+
+GRAPHEME_LV = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x0ac00, 0x0ac00,),  # Hangul Syllable Ga
+    (0x0ac1c, 0x0ac1c,),  # Hangul Syllable Gae
+    (0x0ac38, 0x0ac38,),  # Hangul Syllable Gya
+    (0x0ac54, 0x0ac54,),  # Hangul Syllable Gyae
+    (0x0ac70, 0x0ac70,),  # Hangul Syllable Geo
+    (0x0ac8c, 0x0ac8c,),  # Hangul Syllable Ge
+    (0x0aca8, 0x0aca8,),  # Hangul Syllable Gyeo
+    (0x0acc4, 0x0acc4,),  # Hangul Syllable Gye
+    (0x0ace0, 0x0ace0,),  # Hangul Syllable Go
+    (0x0acfc, 0x0acfc,),  # Hangul Syllable Gwa
+    (0x0ad18, 0x0ad18,),  # Hangul Syllable Gwae
+    (0x0ad34, 0x0ad34,),  # Hangul Syllable Goe
+    (0x0ad50, 0x0ad50,),  # Hangul Syllable Gyo
+    (0x0ad6c, 0x0ad6c,),  # Hangul Syllable Gu
+    (0x0ad88, 0x0ad88,),  # Hangul Syllable Gweo
+    (0x0ada4, 0x0ada4,),  # Hangul Syllable Gwe
+    (0x0adc0, 0x0adc0,),  # Hangul Syllable Gwi
+    (0x0addc, 0x0addc,),  # Hangul Syllable Gyu
+    (0x0adf8, 0x0adf8,),  # Hangul Syllable Geu
+    (0x0ae14, 0x0ae14,),  # Hangul Syllable Gyi
+    (0x0ae30, 0x0ae30,),  # Hangul Syllable Gi
+    (0x0ae4c, 0x0ae4c,),  # Hangul Syllable Gga
+    (0x0ae68, 0x0ae68,),  # Hangul Syllable Ggae
+    (0x0ae84, 0x0ae84,),  # Hangul Syllable Ggya
+    (0x0aea0, 0x0aea0,),  # Hangul Syllable Ggyae
+    (0x0aebc, 0x0aebc,),  # Hangul Syllable Ggeo
+    (0x0aed8, 0x0aed8,),  # Hangul Syllable Gge
+    (0x0aef4, 0x0aef4,),  # Hangul Syllable Ggyeo
+    (0x0af10, 0x0af10,),  # Hangul Syllable Ggye
+    (0x0af2c, 0x0af2c,),  # Hangul Syllable Ggo
+    (0x0af48, 0x0af48,),  # Hangul Syllable Ggwa
+    (0x0af64, 0x0af64,),  # Hangul Syllable Ggwae
+    (0x0af80, 0x0af80,),  # Hangul Syllable Ggoe
+    (0x0af9c, 0x0af9c,),  # Hangul Syllable Ggyo
+    (0x0afb8, 0x0afb8,),  # Hangul Syllable Ggu
+    (0x0afd4, 0x0afd4,),  # Hangul Syllable Ggweo
+    (0x0aff0, 0x0aff0,),  # Hangul Syllable Ggwe
+    (0x0b00c, 0x0b00c,),  # Hangul Syllable Ggwi
+    (0x0b028, 0x0b028,),  # Hangul Syllable Ggyu
+    (0x0b044, 0x0b044,),  # Hangul Syllable Ggeu
+    (0x0b060, 0x0b060,),  # Hangul Syllable Ggyi
+    (0x0b07c, 0x0b07c,),  # Hangul Syllable Ggi
+    (0x0b098, 0x0b098,),  # Hangul Syllable Na
+    (0x0b0b4, 0x0b0b4,),  # Hangul Syllable Nae
+    (0x0b0d0, 0x0b0d0,),  # Hangul Syllable Nya
+    (0x0b0ec, 0x0b0ec,),  # Hangul Syllable Nyae
+    (0x0b108, 0x0b108,),  # Hangul Syllable Neo
+    (0x0b124, 0x0b124,),  # Hangul Syllable Ne
+    (0x0b140, 0x0b140,),  # Hangul Syllable Nyeo
+    (0x0b15c, 0x0b15c,),  # Hangul Syllable Nye
+    (0x0b178, 0x0b178,),  # Hangul Syllable No
+    (0x0b194, 0x0b194,),  # Hangul Syllable Nwa
+    (0x0b1b0, 0x0b1b0,),  # Hangul Syllable Nwae
+    (0x0b1cc, 0x0b1cc,),  # Hangul Syllable Noe
+    (0x0b1e8, 0x0b1e8,),  # Hangul Syllable Nyo
+    (0x0b204, 0x0b204,),  # Hangul Syllable Nu
+    (0x0b220, 0x0b220,),  # Hangul Syllable Nweo
+    (0x0b23c, 0x0b23c,),  # Hangul Syllable Nwe
+    (0x0b258, 0x0b258,),  # Hangul Syllable Nwi
+    (0x0b274, 0x0b274,),  # Hangul Syllable Nyu
+    (0x0b290, 0x0b290,),  # Hangul Syllable Neu
+    (0x0b2ac, 0x0b2ac,),  # Hangul Syllable Nyi
+    (0x0b2c8, 0x0b2c8,),  # Hangul Syllable Ni
+    (0x0b2e4, 0x0b2e4,),  # Hangul Syllable Da
+    (0x0b300, 0x0b300,),  # Hangul Syllable Dae
+    (0x0b31c, 0x0b31c,),  # Hangul Syllable Dya
+    (0x0b338, 0x0b338,),  # Hangul Syllable Dyae
+    (0x0b354, 0x0b354,),  # Hangul Syllable Deo
+    (0x0b370, 0x0b370,),  # Hangul Syllable De
+    (0x0b38c, 0x0b38c,),  # Hangul Syllable Dyeo
+    (0x0b3a8, 0x0b3a8,),  # Hangul Syllable Dye
+    (0x0b3c4, 0x0b3c4,),  # Hangul Syllable Do
+    (0x0b3e0, 0x0b3e0,),  # Hangul Syllable Dwa
+    (0x0b3fc, 0x0b3fc,),  # Hangul Syllable Dwae
+    (0x0b418, 0x0b418,),  # Hangul Syllable Doe
+    (0x0b434, 0x0b434,),  # Hangul Syllable Dyo
+    (0x0b450, 0x0b450,),  # Hangul Syllable Du
+    (0x0b46c, 0x0b46c,),  # Hangul Syllable Dweo
+    (0x0b488, 0x0b488,),  # Hangul Syllable Dwe
+    (0x0b4a4, 0x0b4a4,),  # Hangul Syllable Dwi
+    (0x0b4c0, 0x0b4c0,),  # Hangul Syllable Dyu
+    (0x0b4dc, 0x0b4dc,),  # Hangul Syllable Deu
+    (0x0b4f8, 0x0b4f8,),  # Hangul Syllable Dyi
+    (0x0b514, 0x0b514,),  # Hangul Syllable Di
+    (0x0b530, 0x0b530,),  # Hangul Syllable Dda
+    (0x0b54c, 0x0b54c,),  # Hangul Syllable Ddae
+    (0x0b568, 0x0b568,),  # Hangul Syllable Ddya
+    (0x0b584, 0x0b584,),  # Hangul Syllable Ddyae
+    (0x0b5a0, 0x0b5a0,),  # Hangul Syllable Ddeo
+    (0x0b5bc, 0x0b5bc,),  # Hangul Syllable Dde
+    (0x0b5d8, 0x0b5d8,),  # Hangul Syllable Ddyeo
+    (0x0b5f4, 0x0b5f4,),  # Hangul Syllable Ddye
+    (0x0b610, 0x0b610,),  # Hangul Syllable Ddo
+    (0x0b62c, 0x0b62c,),  # Hangul Syllable Ddwa
+    (0x0b648, 0x0b648,),  # Hangul Syllable Ddwae
+    (0x0b664, 0x0b664,),  # Hangul Syllable Ddoe
+    (0x0b680, 0x0b680,),  # Hangul Syllable Ddyo
+    (0x0b69c, 0x0b69c,),  # Hangul Syllable Ddu
+    (0x0b6b8, 0x0b6b8,),  # Hangul Syllable Ddweo
+    (0x0b6d4, 0x0b6d4,),  # Hangul Syllable Ddwe
+    (0x0b6f0, 0x0b6f0,),  # Hangul Syllable Ddwi
+    (0x0b70c, 0x0b70c,),  # Hangul Syllable Ddyu
+    (0x0b728, 0x0b728,),  # Hangul Syllable Ddeu
+    (0x0b744, 0x0b744,),  # Hangul Syllable Ddyi
+    (0x0b760, 0x0b760,),  # Hangul Syllable Ddi
+    (0x0b77c, 0x0b77c,),  # Hangul Syllable Ra
+    (0x0b798, 0x0b798,),  # Hangul Syllable Rae
+    (0x0b7b4, 0x0b7b4,),  # Hangul Syllable Rya
+    (0x0b7d0, 0x0b7d0,),  # Hangul Syllable Ryae
+    (0x0b7ec, 0x0b7ec,),  # Hangul Syllable Reo
+    (0x0b808, 0x0b808,),  # Hangul Syllable Re
+    (0x0b824, 0x0b824,),  # Hangul Syllable Ryeo
+    (0x0b840, 0x0b840,),  # Hangul Syllable Rye
+    (0x0b85c, 0x0b85c,),  # Hangul Syllable Ro
+    (0x0b878, 0x0b878,),  # Hangul Syllable Rwa
+    (0x0b894, 0x0b894,),  # Hangul Syllable Rwae
+    (0x0b8b0, 0x0b8b0,),  # Hangul Syllable Roe
+    (0x0b8cc, 0x0b8cc,),  # Hangul Syllable Ryo
+    (0x0b8e8, 0x0b8e8,),  # Hangul Syllable Ru
+    (0x0b904, 0x0b904,),  # Hangul Syllable Rweo
+    (0x0b920, 0x0b920,),  # Hangul Syllable Rwe
+    (0x0b93c, 0x0b93c,),  # Hangul Syllable Rwi
+    (0x0b958, 0x0b958,),  # Hangul Syllable Ryu
+    (0x0b974, 0x0b974,),  # Hangul Syllable Reu
+    (0x0b990, 0x0b990,),  # Hangul Syllable Ryi
+    (0x0b9ac, 0x0b9ac,),  # Hangul Syllable Ri
+    (0x0b9c8, 0x0b9c8,),  # Hangul Syllable Ma
+    (0x0b9e4, 0x0b9e4,),  # Hangul Syllable Mae
+    (0x0ba00, 0x0ba00,),  # Hangul Syllable Mya
+    (0x0ba1c, 0x0ba1c,),  # Hangul Syllable Myae
+    (0x0ba38, 0x0ba38,),  # Hangul Syllable Meo
+    (0x0ba54, 0x0ba54,),  # Hangul Syllable Me
+    (0x0ba70, 0x0ba70,),  # Hangul Syllable Myeo
+    (0x0ba8c, 0x0ba8c,),  # Hangul Syllable Mye
+    (0x0baa8, 0x0baa8,),  # Hangul Syllable Mo
+    (0x0bac4, 0x0bac4,),  # Hangul Syllable Mwa
+    (0x0bae0, 0x0bae0,),  # Hangul Syllable Mwae
+    (0x0bafc, 0x0bafc,),  # Hangul Syllable Moe
+    (0x0bb18, 0x0bb18,),  # Hangul Syllable Myo
+    (0x0bb34, 0x0bb34,),  # Hangul Syllable Mu
+    (0x0bb50, 0x0bb50,),  # Hangul Syllable Mweo
+    (0x0bb6c, 0x0bb6c,),  # Hangul Syllable Mwe
+    (0x0bb88, 0x0bb88,),  # Hangul Syllable Mwi
+    (0x0bba4, 0x0bba4,),  # Hangul Syllable Myu
+    (0x0bbc0, 0x0bbc0,),  # Hangul Syllable Meu
+    (0x0bbdc, 0x0bbdc,),  # Hangul Syllable Myi
+    (0x0bbf8, 0x0bbf8,),  # Hangul Syllable Mi
+    (0x0bc14, 0x0bc14,),  # Hangul Syllable Ba
+    (0x0bc30, 0x0bc30,),  # Hangul Syllable Bae
+    (0x0bc4c, 0x0bc4c,),  # Hangul Syllable Bya
+    (0x0bc68, 0x0bc68,),  # Hangul Syllable Byae
+    (0x0bc84, 0x0bc84,),  # Hangul Syllable Beo
+    (0x0bca0, 0x0bca0,),  # Hangul Syllable Be
+    (0x0bcbc, 0x0bcbc,),  # Hangul Syllable Byeo
+    (0x0bcd8, 0x0bcd8,),  # Hangul Syllable Bye
+    (0x0bcf4, 0x0bcf4,),  # Hangul Syllable Bo
+    (0x0bd10, 0x0bd10,),  # Hangul Syllable Bwa
+    (0x0bd2c, 0x0bd2c,),  # Hangul Syllable Bwae
+    (0x0bd48, 0x0bd48,),  # Hangul Syllable Boe
+    (0x0bd64, 0x0bd64,),  # Hangul Syllable Byo
+    (0x0bd80, 0x0bd80,),  # Hangul Syllable Bu
+    (0x0bd9c, 0x0bd9c,),  # Hangul Syllable Bweo
+    (0x0bdb8, 0x0bdb8,),  # Hangul Syllable Bwe
+    (0x0bdd4, 0x0bdd4,),  # Hangul Syllable Bwi
+    (0x0bdf0, 0x0bdf0,),  # Hangul Syllable Byu
+    (0x0be0c, 0x0be0c,),  # Hangul Syllable Beu
+    (0x0be28, 0x0be28,),  # Hangul Syllable Byi
+    (0x0be44, 0x0be44,),  # Hangul Syllable Bi
+    (0x0be60, 0x0be60,),  # Hangul Syllable Bba
+    (0x0be7c, 0x0be7c,),  # Hangul Syllable Bbae
+    (0x0be98, 0x0be98,),  # Hangul Syllable Bbya
+    (0x0beb4, 0x0beb4,),  # Hangul Syllable Bbyae
+    (0x0bed0, 0x0bed0,),  # Hangul Syllable Bbeo
+    (0x0beec, 0x0beec,),  # Hangul Syllable Bbe
+    (0x0bf08, 0x0bf08,),  # Hangul Syllable Bbyeo
+    (0x0bf24, 0x0bf24,),  # Hangul Syllable Bbye
+    (0x0bf40, 0x0bf40,),  # Hangul Syllable Bbo
+    (0x0bf5c, 0x0bf5c,),  # Hangul Syllable Bbwa
+    (0x0bf78, 0x0bf78,),  # Hangul Syllable Bbwae
+    (0x0bf94, 0x0bf94,),  # Hangul Syllable Bboe
+    (0x0bfb0, 0x0bfb0,),  # Hangul Syllable Bbyo
+    (0x0bfcc, 0x0bfcc,),  # Hangul Syllable Bbu
+    (0x0bfe8, 0x0bfe8,),  # Hangul Syllable Bbweo
+    (0x0c004, 0x0c004,),  # Hangul Syllable Bbwe
+    (0x0c020, 0x0c020,),  # Hangul Syllable Bbwi
+    (0x0c03c, 0x0c03c,),  # Hangul Syllable Bbyu
+    (0x0c058, 0x0c058,),  # Hangul Syllable Bbeu
+    (0x0c074, 0x0c074,),  # Hangul Syllable Bbyi
+    (0x0c090, 0x0c090,),  # Hangul Syllable Bbi
+    (0x0c0ac, 0x0c0ac,),  # Hangul Syllable Sa
+    (0x0c0c8, 0x0c0c8,),  # Hangul Syllable Sae
+    (0x0c0e4, 0x0c0e4,),  # Hangul Syllable Sya
+    (0x0c100, 0x0c100,),  # Hangul Syllable Syae
+    (0x0c11c, 0x0c11c,),  # Hangul Syllable Seo
+    (0x0c138, 0x0c138,),  # Hangul Syllable Se
+    (0x0c154, 0x0c154,),  # Hangul Syllable Syeo
+    (0x0c170, 0x0c170,),  # Hangul Syllable Sye
+    (0x0c18c, 0x0c18c,),  # Hangul Syllable So
+    (0x0c1a8, 0x0c1a8,),  # Hangul Syllable Swa
+    (0x0c1c4, 0x0c1c4,),  # Hangul Syllable Swae
+    (0x0c1e0, 0x0c1e0,),  # Hangul Syllable Soe
+    (0x0c1fc, 0x0c1fc,),  # Hangul Syllable Syo
+    (0x0c218, 0x0c218,),  # Hangul Syllable Su
+    (0x0c234, 0x0c234,),  # Hangul Syllable Sweo
+    (0x0c250, 0x0c250,),  # Hangul Syllable Swe
+    (0x0c26c, 0x0c26c,),  # Hangul Syllable Swi
+    (0x0c288, 0x0c288,),  # Hangul Syllable Syu
+    (0x0c2a4, 0x0c2a4,),  # Hangul Syllable Seu
+    (0x0c2c0, 0x0c2c0,),  # Hangul Syllable Syi
+    (0x0c2dc, 0x0c2dc,),  # Hangul Syllable Si
+    (0x0c2f8, 0x0c2f8,),  # Hangul Syllable Ssa
+    (0x0c314, 0x0c314,),  # Hangul Syllable Ssae
+    (0x0c330, 0x0c330,),  # Hangul Syllable Ssya
+    (0x0c34c, 0x0c34c,),  # Hangul Syllable Ssyae
+    (0x0c368, 0x0c368,),  # Hangul Syllable Sseo
+    (0x0c384, 0x0c384,),  # Hangul Syllable Sse
+    (0x0c3a0, 0x0c3a0,),  # Hangul Syllable Ssyeo
+    (0x0c3bc, 0x0c3bc,),  # Hangul Syllable Ssye
+    (0x0c3d8, 0x0c3d8,),  # Hangul Syllable Sso
+    (0x0c3f4, 0x0c3f4,),  # Hangul Syllable Sswa
+    (0x0c410, 0x0c410,),  # Hangul Syllable Sswae
+    (0x0c42c, 0x0c42c,),  # Hangul Syllable Ssoe
+    (0x0c448, 0x0c448,),  # Hangul Syllable Ssyo
+    (0x0c464, 0x0c464,),  # Hangul Syllable Ssu
+    (0x0c480, 0x0c480,),  # Hangul Syllable Ssweo
+    (0x0c49c, 0x0c49c,),  # Hangul Syllable Sswe
+    (0x0c4b8, 0x0c4b8,),  # Hangul Syllable Sswi
+    (0x0c4d4, 0x0c4d4,),  # Hangul Syllable Ssyu
+    (0x0c4f0, 0x0c4f0,),  # Hangul Syllable Sseu
+    (0x0c50c, 0x0c50c,),  # Hangul Syllable Ssyi
+    (0x0c528, 0x0c528,),  # Hangul Syllable Ssi
+    (0x0c544, 0x0c544,),  # Hangul Syllable A
+    (0x0c560, 0x0c560,),  # Hangul Syllable Ae
+    (0x0c57c, 0x0c57c,),  # Hangul Syllable Ya
+    (0x0c598, 0x0c598,),  # Hangul Syllable Yae
+    (0x0c5b4, 0x0c5b4,),  # Hangul Syllable Eo
+    (0x0c5d0, 0x0c5d0,),  # Hangul Syllable E
+    (0x0c5ec, 0x0c5ec,),  # Hangul Syllable Yeo
+    (0x0c608, 0x0c608,),  # Hangul Syllable Ye
+    (0x0c624, 0x0c624,),  # Hangul Syllable O
+    (0x0c640, 0x0c640,),  # Hangul Syllable Wa
+    (0x0c65c, 0x0c65c,),  # Hangul Syllable Wae
+    (0x0c678, 0x0c678,),  # Hangul Syllable Oe
+    (0x0c694, 0x0c694,),  # Hangul Syllable Yo
+    (0x0c6b0, 0x0c6b0,),  # Hangul Syllable U
+    (0x0c6cc, 0x0c6cc,),  # Hangul Syllable Weo
+    (0x0c6e8, 0x0c6e8,),  # Hangul Syllable We
+    (0x0c704, 0x0c704,),  # Hangul Syllable Wi
+    (0x0c720, 0x0c720,),  # Hangul Syllable Yu
+    (0x0c73c, 0x0c73c,),  # Hangul Syllable Eu
+    (0x0c758, 0x0c758,),  # Hangul Syllable Yi
+    (0x0c774, 0x0c774,),  # Hangul Syllable I
+    (0x0c790, 0x0c790,),  # Hangul Syllable Ja
+    (0x0c7ac, 0x0c7ac,),  # Hangul Syllable Jae
+    (0x0c7c8, 0x0c7c8,),  # Hangul Syllable Jya
+    (0x0c7e4, 0x0c7e4,),  # Hangul Syllable Jyae
+    (0x0c800, 0x0c800,),  # Hangul Syllable Jeo
+    (0x0c81c, 0x0c81c,),  # Hangul Syllable Je
+    (0x0c838, 0x0c838,),  # Hangul Syllable Jyeo
+    (0x0c854, 0x0c854,),  # Hangul Syllable Jye
+    (0x0c870, 0x0c870,),  # Hangul Syllable Jo
+    (0x0c88c, 0x0c88c,),  # Hangul Syllable Jwa
+    (0x0c8a8, 0x0c8a8,),  # Hangul Syllable Jwae
+    (0x0c8c4, 0x0c8c4,),  # Hangul Syllable Joe
+    (0x0c8e0, 0x0c8e0,),  # Hangul Syllable Jyo
+    (0x0c8fc, 0x0c8fc,),  # Hangul Syllable Ju
+    (0x0c918, 0x0c918,),  # Hangul Syllable Jweo
+    (0x0c934, 0x0c934,),  # Hangul Syllable Jwe
+    (0x0c950, 0x0c950,),  # Hangul Syllable Jwi
+    (0x0c96c, 0x0c96c,),  # Hangul Syllable Jyu
+    (0x0c988, 0x0c988,),  # Hangul Syllable Jeu
+    (0x0c9a4, 0x0c9a4,),  # Hangul Syllable Jyi
+    (0x0c9c0, 0x0c9c0,),  # Hangul Syllable Ji
+    (0x0c9dc, 0x0c9dc,),  # Hangul Syllable Jja
+    (0x0c9f8, 0x0c9f8,),  # Hangul Syllable Jjae
+    (0x0ca14, 0x0ca14,),  # Hangul Syllable Jjya
+    (0x0ca30, 0x0ca30,),  # Hangul Syllable Jjyae
+    (0x0ca4c, 0x0ca4c,),  # Hangul Syllable Jjeo
+    (0x0ca68, 0x0ca68,),  # Hangul Syllable Jje
+    (0x0ca84, 0x0ca84,),  # Hangul Syllable Jjyeo
+    (0x0caa0, 0x0caa0,),  # Hangul Syllable Jjye
+    (0x0cabc, 0x0cabc,),  # Hangul Syllable Jjo
+    (0x0cad8, 0x0cad8,),  # Hangul Syllable Jjwa
+    (0x0caf4, 0x0caf4,),  # Hangul Syllable Jjwae
+    (0x0cb10, 0x0cb10,),  # Hangul Syllable Jjoe
+    (0x0cb2c, 0x0cb2c,),  # Hangul Syllable Jjyo
+    (0x0cb48, 0x0cb48,),  # Hangul Syllable Jju
+    (0x0cb64, 0x0cb64,),  # Hangul Syllable Jjweo
+    (0x0cb80, 0x0cb80,),  # Hangul Syllable Jjwe
+    (0x0cb9c, 0x0cb9c,),  # Hangul Syllable Jjwi
+    (0x0cbb8, 0x0cbb8,),  # Hangul Syllable Jjyu
+    (0x0cbd4, 0x0cbd4,),  # Hangul Syllable Jjeu
+    (0x0cbf0, 0x0cbf0,),  # Hangul Syllable Jjyi
+    (0x0cc0c, 0x0cc0c,),  # Hangul Syllable Jji
+    (0x0cc28, 0x0cc28,),  # Hangul Syllable Ca
+    (0x0cc44, 0x0cc44,),  # Hangul Syllable Cae
+    (0x0cc60, 0x0cc60,),  # Hangul Syllable Cya
+    (0x0cc7c, 0x0cc7c,),  # Hangul Syllable Cyae
+    (0x0cc98, 0x0cc98,),  # Hangul Syllable Ceo
+    (0x0ccb4, 0x0ccb4,),  # Hangul Syllable Ce
+    (0x0ccd0, 0x0ccd0,),  # Hangul Syllable Cyeo
+    (0x0ccec, 0x0ccec,),  # Hangul Syllable Cye
+    (0x0cd08, 0x0cd08,),  # Hangul Syllable Co
+    (0x0cd24, 0x0cd24,),  # Hangul Syllable Cwa
+    (0x0cd40, 0x0cd40,),  # Hangul Syllable Cwae
+    (0x0cd5c, 0x0cd5c,),  # Hangul Syllable Coe
+    (0x0cd78, 0x0cd78,),  # Hangul Syllable Cyo
+    (0x0cd94, 0x0cd94,),  # Hangul Syllable Cu
+    (0x0cdb0, 0x0cdb0,),  # Hangul Syllable Cweo
+    (0x0cdcc, 0x0cdcc,),  # Hangul Syllable Cwe
+    (0x0cde8, 0x0cde8,),  # Hangul Syllable Cwi
+    (0x0ce04, 0x0ce04,),  # Hangul Syllable Cyu
+    (0x0ce20, 0x0ce20,),  # Hangul Syllable Ceu
+    (0x0ce3c, 0x0ce3c,),  # Hangul Syllable Cyi
+    (0x0ce58, 0x0ce58,),  # Hangul Syllable Ci
+    (0x0ce74, 0x0ce74,),  # Hangul Syllable Ka
+    (0x0ce90, 0x0ce90,),  # Hangul Syllable Kae
+    (0x0ceac, 0x0ceac,),  # Hangul Syllable Kya
+    (0x0cec8, 0x0cec8,),  # Hangul Syllable Kyae
+    (0x0cee4, 0x0cee4,),  # Hangul Syllable Keo
+    (0x0cf00, 0x0cf00,),  # Hangul Syllable Ke
+    (0x0cf1c, 0x0cf1c,),  # Hangul Syllable Kyeo
+    (0x0cf38, 0x0cf38,),  # Hangul Syllable Kye
+    (0x0cf54, 0x0cf54,),  # Hangul Syllable Ko
+    (0x0cf70, 0x0cf70,),  # Hangul Syllable Kwa
+    (0x0cf8c, 0x0cf8c,),  # Hangul Syllable Kwae
+    (0x0cfa8, 0x0cfa8,),  # Hangul Syllable Koe
+    (0x0cfc4, 0x0cfc4,),  # Hangul Syllable Kyo
+    (0x0cfe0, 0x0cfe0,),  # Hangul Syllable Ku
+    (0x0cffc, 0x0cffc,),  # Hangul Syllable Kweo
+    (0x0d018, 0x0d018,),  # Hangul Syllable Kwe
+    (0x0d034, 0x0d034,),  # Hangul Syllable Kwi
+    (0x0d050, 0x0d050,),  # Hangul Syllable Kyu
+    (0x0d06c, 0x0d06c,),  # Hangul Syllable Keu
+    (0x0d088, 0x0d088,),  # Hangul Syllable Kyi
+    (0x0d0a4, 0x0d0a4,),  # Hangul Syllable Ki
+    (0x0d0c0, 0x0d0c0,),  # Hangul Syllable Ta
+    (0x0d0dc, 0x0d0dc,),  # Hangul Syllable Tae
+    (0x0d0f8, 0x0d0f8,),  # Hangul Syllable Tya
+    (0x0d114, 0x0d114,),  # Hangul Syllable Tyae
+    (0x0d130, 0x0d130,),  # Hangul Syllable Teo
+    (0x0d14c, 0x0d14c,),  # Hangul Syllable Te
+    (0x0d168, 0x0d168,),  # Hangul Syllable Tyeo
+    (0x0d184, 0x0d184,),  # Hangul Syllable Tye
+    (0x0d1a0, 0x0d1a0,),  # Hangul Syllable To
+    (0x0d1bc, 0x0d1bc,),  # Hangul Syllable Twa
+    (0x0d1d8, 0x0d1d8,),  # Hangul Syllable Twae
+    (0x0d1f4, 0x0d1f4,),  # Hangul Syllable Toe
+    (0x0d210, 0x0d210,),  # Hangul Syllable Tyo
+    (0x0d22c, 0x0d22c,),  # Hangul Syllable Tu
+    (0x0d248, 0x0d248,),  # Hangul Syllable Tweo
+    (0x0d264, 0x0d264,),  # Hangul Syllable Twe
+    (0x0d280, 0x0d280,),  # Hangul Syllable Twi
+    (0x0d29c, 0x0d29c,),  # Hangul Syllable Tyu
+    (0x0d2b8, 0x0d2b8,),  # Hangul Syllable Teu
+    (0x0d2d4, 0x0d2d4,),  # Hangul Syllable Tyi
+    (0x0d2f0, 0x0d2f0,),  # Hangul Syllable Ti
+    (0x0d30c, 0x0d30c,),  # Hangul Syllable Pa
+    (0x0d328, 0x0d328,),  # Hangul Syllable Pae
+    (0x0d344, 0x0d344,),  # Hangul Syllable Pya
+    (0x0d360, 0x0d360,),  # Hangul Syllable Pyae
+    (0x0d37c, 0x0d37c,),  # Hangul Syllable Peo
+    (0x0d398, 0x0d398,),  # Hangul Syllable Pe
+    (0x0d3b4, 0x0d3b4,),  # Hangul Syllable Pyeo
+    (0x0d3d0, 0x0d3d0,),  # Hangul Syllable Pye
+    (0x0d3ec, 0x0d3ec,),  # Hangul Syllable Po
+    (0x0d408, 0x0d408,),  # Hangul Syllable Pwa
+    (0x0d424, 0x0d424,),  # Hangul Syllable Pwae
+    (0x0d440, 0x0d440,),  # Hangul Syllable Poe
+    (0x0d45c, 0x0d45c,),  # Hangul Syllable Pyo
+    (0x0d478, 0x0d478,),  # Hangul Syllable Pu
+    (0x0d494, 0x0d494,),  # Hangul Syllable Pweo
+    (0x0d4b0, 0x0d4b0,),  # Hangul Syllable Pwe
+    (0x0d4cc, 0x0d4cc,),  # Hangul Syllable Pwi
+    (0x0d4e8, 0x0d4e8,),  # Hangul Syllable Pyu
+    (0x0d504, 0x0d504,),  # Hangul Syllable Peu
+    (0x0d520, 0x0d520,),  # Hangul Syllable Pyi
+    (0x0d53c, 0x0d53c,),  # Hangul Syllable Pi
+    (0x0d558, 0x0d558,),  # Hangul Syllable Ha
+    (0x0d574, 0x0d574,),  # Hangul Syllable Hae
+    (0x0d590, 0x0d590,),  # Hangul Syllable Hya
+    (0x0d5ac, 0x0d5ac,),  # Hangul Syllable Hyae
+    (0x0d5c8, 0x0d5c8,),  # Hangul Syllable Heo
+    (0x0d5e4, 0x0d5e4,),  # Hangul Syllable He
+    (0x0d600, 0x0d600,),  # Hangul Syllable Hyeo
+    (0x0d61c, 0x0d61c,),  # Hangul Syllable Hye
+    (0x0d638, 0x0d638,),  # Hangul Syllable Ho
+    (0x0d654, 0x0d654,),  # Hangul Syllable Hwa
+    (0x0d670, 0x0d670,),  # Hangul Syllable Hwae
+    (0x0d68c, 0x0d68c,),  # Hangul Syllable Hoe
+    (0x0d6a8, 0x0d6a8,),  # Hangul Syllable Hyo
+    (0x0d6c4, 0x0d6c4,),  # Hangul Syllable Hu
+    (0x0d6e0, 0x0d6e0,),  # Hangul Syllable Hweo
+    (0x0d6fc, 0x0d6fc,),  # Hangul Syllable Hwe
+    (0x0d718, 0x0d718,),  # Hangul Syllable Hwi
+    (0x0d734, 0x0d734,),  # Hangul Syllable Hyu
+    (0x0d750, 0x0d750,),  # Hangul Syllable Heu
+    (0x0d76c, 0x0d76c,),  # Hangul Syllable Hyi
+    (0x0d788, 0x0d788,),  # Hangul Syllable Hi
+)
+
+GRAPHEME_LVT = (
+    # Source: GraphemeBreakProperty-17.0.0.txt
+    # Date: 2025-06-30, 06:20:23 GMT
+    #
+    (0x0ac01, 0x0ac1b,),  # Hangul Syllable Gag     ..Hangul Syllable Gah
+    (0x0ac1d, 0x0ac37,),  # Hangul Syllable Gaeg    ..Hangul Syllable Gaeh
+    (0x0ac39, 0x0ac53,),  # Hangul Syllable Gyag    ..Hangul Syllable Gyah
+    (0x0ac55, 0x0ac6f,),  # Hangul Syllable Gyaeg   ..Hangul Syllable Gyaeh
+    (0x0ac71, 0x0ac8b,),  # Hangul Syllable Geog    ..Hangul Syllable Geoh
+    (0x0ac8d, 0x0aca7,),  # Hangul Syllable Geg     ..Hangul Syllable Geh
+    (0x0aca9, 0x0acc3,),  # Hangul Syllable Gyeog   ..Hangul Syllable Gyeoh
+    (0x0acc5, 0x0acdf,),  # Hangul Syllable Gyeg    ..Hangul Syllable Gyeh
+    (0x0ace1, 0x0acfb,),  # Hangul Syllable Gog     ..Hangul Syllable Goh
+    (0x0acfd, 0x0ad17,),  # Hangul Syllable Gwag    ..Hangul Syllable Gwah
+    (0x0ad19, 0x0ad33,),  # Hangul Syllable Gwaeg   ..Hangul Syllable Gwaeh
+    (0x0ad35, 0x0ad4f,),  # Hangul Syllable Goeg    ..Hangul Syllable Goeh
+    (0x0ad51, 0x0ad6b,),  # Hangul Syllable Gyog    ..Hangul Syllable Gyoh
+    (0x0ad6d, 0x0ad87,),  # Hangul Syllable Gug     ..Hangul Syllable Guh
+    (0x0ad89, 0x0ada3,),  # Hangul Syllable Gweog   ..Hangul Syllable Gweoh
+    (0x0ada5, 0x0adbf,),  # Hangul Syllable Gweg    ..Hangul Syllable Gweh
+    (0x0adc1, 0x0addb,),  # Hangul Syllable Gwig    ..Hangul Syllable Gwih
+    (0x0addd, 0x0adf7,),  # Hangul Syllable Gyug    ..Hangul Syllable Gyuh
+    (0x0adf9, 0x0ae13,),  # Hangul Syllable Geug    ..Hangul Syllable Geuh
+    (0x0ae15, 0x0ae2f,),  # Hangul Syllable Gyig    ..Hangul Syllable Gyih
+    (0x0ae31, 0x0ae4b,),  # Hangul Syllable Gig     ..Hangul Syllable Gih
+    (0x0ae4d, 0x0ae67,),  # Hangul Syllable Ggag    ..Hangul Syllable Ggah
+    (0x0ae69, 0x0ae83,),  # Hangul Syllable Ggaeg   ..Hangul Syllable Ggaeh
+    (0x0ae85, 0x0ae9f,),  # Hangul Syllable Ggyag   ..Hangul Syllable Ggyah
+    (0x0aea1, 0x0aebb,),  # Hangul Syllable Ggyaeg  ..Hangul Syllable Ggyaeh
+    (0x0aebd, 0x0aed7,),  # Hangul Syllable Ggeog   ..Hangul Syllable Ggeoh
+    (0x0aed9, 0x0aef3,),  # Hangul Syllable Ggeg    ..Hangul Syllable Ggeh
+    (0x0aef5, 0x0af0f,),  # Hangul Syllable Ggyeog  ..Hangul Syllable Ggyeoh
+    (0x0af11, 0x0af2b,),  # Hangul Syllable Ggyeg   ..Hangul Syllable Ggyeh
+    (0x0af2d, 0x0af47,),  # Hangul Syllable Ggog    ..Hangul Syllable Ggoh
+    (0x0af49, 0x0af63,),  # Hangul Syllable Ggwag   ..Hangul Syllable Ggwah
+    (0x0af65, 0x0af7f,),  # Hangul Syllable Ggwaeg  ..Hangul Syllable Ggwaeh
+    (0x0af81, 0x0af9b,),  # Hangul Syllable Ggoeg   ..Hangul Syllable Ggoeh
+    (0x0af9d, 0x0afb7,),  # Hangul Syllable Ggyog   ..Hangul Syllable Ggyoh
+    (0x0afb9, 0x0afd3,),  # Hangul Syllable Ggug    ..Hangul Syllable Gguh
+    (0x0afd5, 0x0afef,),  # Hangul Syllable Ggweog  ..Hangul Syllable Ggweoh
+    (0x0aff1, 0x0b00b,),  # Hangul Syllable Ggweg   ..Hangul Syllable Ggweh
+    (0x0b00d, 0x0b027,),  # Hangul Syllable Ggwig   ..Hangul Syllable Ggwih
+    (0x0b029, 0x0b043,),  # Hangul Syllable Ggyug   ..Hangul Syllable Ggyuh
+    (0x0b045, 0x0b05f,),  # Hangul Syllable Ggeug   ..Hangul Syllable Ggeuh
+    (0x0b061, 0x0b07b,),  # Hangul Syllable Ggyig   ..Hangul Syllable Ggyih
+    (0x0b07d, 0x0b097,),  # Hangul Syllable Ggig    ..Hangul Syllable Ggih
+    (0x0b099, 0x0b0b3,),  # Hangul Syllable Nag     ..Hangul Syllable Nah
+    (0x0b0b5, 0x0b0cf,),  # Hangul Syllable Naeg    ..Hangul Syllable Naeh
+    (0x0b0d1, 0x0b0eb,),  # Hangul Syllable Nyag    ..Hangul Syllable Nyah
+    (0x0b0ed, 0x0b107,),  # Hangul Syllable Nyaeg   ..Hangul Syllable Nyaeh
+    (0x0b109, 0x0b123,),  # Hangul Syllable Neog    ..Hangul Syllable Neoh
+    (0x0b125, 0x0b13f,),  # Hangul Syllable Neg     ..Hangul Syllable Neh
+    (0x0b141, 0x0b15b,),  # Hangul Syllable Nyeog   ..Hangul Syllable Nyeoh
+    (0x0b15d, 0x0b177,),  # Hangul Syllable Nyeg    ..Hangul Syllable Nyeh
+    (0x0b179, 0x0b193,),  # Hangul Syllable Nog     ..Hangul Syllable Noh
+    (0x0b195, 0x0b1af,),  # Hangul Syllable Nwag    ..Hangul Syllable Nwah
+    (0x0b1b1, 0x0b1cb,),  # Hangul Syllable Nwaeg   ..Hangul Syllable Nwaeh
+    (0x0b1cd, 0x0b1e7,),  # Hangul Syllable Noeg    ..Hangul Syllable Noeh
+    (0x0b1e9, 0x0b203,),  # Hangul Syllable Nyog    ..Hangul Syllable Nyoh
+    (0x0b205, 0x0b21f,),  # Hangul Syllable Nug     ..Hangul Syllable Nuh
+    (0x0b221, 0x0b23b,),  # Hangul Syllable Nweog   ..Hangul Syllable Nweoh
+    (0x0b23d, 0x0b257,),  # Hangul Syllable Nweg    ..Hangul Syllable Nweh
+    (0x0b259, 0x0b273,),  # Hangul Syllable Nwig    ..Hangul Syllable Nwih
+    (0x0b275, 0x0b28f,),  # Hangul Syllable Nyug    ..Hangul Syllable Nyuh
+    (0x0b291, 0x0b2ab,),  # Hangul Syllable Neug    ..Hangul Syllable Neuh
+    (0x0b2ad, 0x0b2c7,),  # Hangul Syllable Nyig    ..Hangul Syllable Nyih
+    (0x0b2c9, 0x0b2e3,),  # Hangul Syllable Nig     ..Hangul Syllable Nih
+    (0x0b2e5, 0x0b2ff,),  # Hangul Syllable Dag     ..Hangul Syllable Dah
+    (0x0b301, 0x0b31b,),  # Hangul Syllable Daeg    ..Hangul Syllable Daeh
+    (0x0b31d, 0x0b337,),  # Hangul Syllable Dyag    ..Hangul Syllable Dyah
+    (0x0b339, 0x0b353,),  # Hangul Syllable Dyaeg   ..Hangul Syllable Dyaeh
+    (0x0b355, 0x0b36f,),  # Hangul Syllable Deog    ..Hangul Syllable Deoh
+    (0x0b371, 0x0b38b,),  # Hangul Syllable Deg     ..Hangul Syllable Deh
+    (0x0b38d, 0x0b3a7,),  # Hangul Syllable Dyeog   ..Hangul Syllable Dyeoh
+    (0x0b3a9, 0x0b3c3,),  # Hangul Syllable Dyeg    ..Hangul Syllable Dyeh
+    (0x0b3c5, 0x0b3df,),  # Hangul Syllable Dog     ..Hangul Syllable Doh
+    (0x0b3e1, 0x0b3fb,),  # Hangul Syllable Dwag    ..Hangul Syllable Dwah
+    (0x0b3fd, 0x0b417,),  # Hangul Syllable Dwaeg   ..Hangul Syllable Dwaeh
+    (0x0b419, 0x0b433,),  # Hangul Syllable Doeg    ..Hangul Syllable Doeh
+    (0x0b435, 0x0b44f,),  # Hangul Syllable Dyog    ..Hangul Syllable Dyoh
+    (0x0b451, 0x0b46b,),  # Hangul Syllable Dug     ..Hangul Syllable Duh
+    (0x0b46d, 0x0b487,),  # Hangul Syllable Dweog   ..Hangul Syllable Dweoh
+    (0x0b489, 0x0b4a3,),  # Hangul Syllable Dweg    ..Hangul Syllable Dweh
+    (0x0b4a5, 0x0b4bf,),  # Hangul Syllable Dwig    ..Hangul Syllable Dwih
+    (0x0b4c1, 0x0b4db,),  # Hangul Syllable Dyug    ..Hangul Syllable Dyuh
+    (0x0b4dd, 0x0b4f7,),  # Hangul Syllable Deug    ..Hangul Syllable Deuh
+    (0x0b4f9, 0x0b513,),  # Hangul Syllable Dyig    ..Hangul Syllable Dyih
+    (0x0b515, 0x0b52f,),  # Hangul Syllable Dig     ..Hangul Syllable Dih
+    (0x0b531, 0x0b54b,),  # Hangul Syllable Ddag    ..Hangul Syllable Ddah
+    (0x0b54d, 0x0b567,),  # Hangul Syllable Ddaeg   ..Hangul Syllable Ddaeh
+    (0x0b569, 0x0b583,),  # Hangul Syllable Ddyag   ..Hangul Syllable Ddyah
+    (0x0b585, 0x0b59f,),  # Hangul Syllable Ddyaeg  ..Hangul Syllable Ddyaeh
+    (0x0b5a1, 0x0b5bb,),  # Hangul Syllable Ddeog   ..Hangul Syllable Ddeoh
+    (0x0b5bd, 0x0b5d7,),  # Hangul Syllable Ddeg    ..Hangul Syllable Ddeh
+    (0x0b5d9, 0x0b5f3,),  # Hangul Syllable Ddyeog  ..Hangul Syllable Ddyeoh
+    (0x0b5f5, 0x0b60f,),  # Hangul Syllable Ddyeg   ..Hangul Syllable Ddyeh
+    (0x0b611, 0x0b62b,),  # Hangul Syllable Ddog    ..Hangul Syllable Ddoh
+    (0x0b62d, 0x0b647,),  # Hangul Syllable Ddwag   ..Hangul Syllable Ddwah
+    (0x0b649, 0x0b663,),  # Hangul Syllable Ddwaeg  ..Hangul Syllable Ddwaeh
+    (0x0b665, 0x0b67f,),  # Hangul Syllable Ddoeg   ..Hangul Syllable Ddoeh
+    (0x0b681, 0x0b69b,),  # Hangul Syllable Ddyog   ..Hangul Syllable Ddyoh
+    (0x0b69d, 0x0b6b7,),  # Hangul Syllable Ddug    ..Hangul Syllable Dduh
+    (0x0b6b9, 0x0b6d3,),  # Hangul Syllable Ddweog  ..Hangul Syllable Ddweoh
+    (0x0b6d5, 0x0b6ef,),  # Hangul Syllable Ddweg   ..Hangul Syllable Ddweh
+    (0x0b6f1, 0x0b70b,),  # Hangul Syllable Ddwig   ..Hangul Syllable Ddwih
+    (0x0b70d, 0x0b727,),  # Hangul Syllable Ddyug   ..Hangul Syllable Ddyuh
+    (0x0b729, 0x0b743,),  # Hangul Syllable Ddeug   ..Hangul Syllable Ddeuh
+    (0x0b745, 0x0b75f,),  # Hangul Syllable Ddyig   ..Hangul Syllable Ddyih
+    (0x0b761, 0x0b77b,),  # Hangul Syllable Ddig    ..Hangul Syllable Ddih
+    (0x0b77d, 0x0b797,),  # Hangul Syllable Rag     ..Hangul Syllable Rah
+    (0x0b799, 0x0b7b3,),  # Hangul Syllable Raeg    ..Hangul Syllable Raeh
+    (0x0b7b5, 0x0b7cf,),  # Hangul Syllable Ryag    ..Hangul Syllable Ryah
+    (0x0b7d1, 0x0b7eb,),  # Hangul Syllable Ryaeg   ..Hangul Syllable Ryaeh
+    (0x0b7ed, 0x0b807,),  # Hangul Syllable Reog    ..Hangul Syllable Reoh
+    (0x0b809, 0x0b823,),  # Hangul Syllable Reg     ..Hangul Syllable Reh
+    (0x0b825, 0x0b83f,),  # Hangul Syllable Ryeog   ..Hangul Syllable Ryeoh
+    (0x0b841, 0x0b85b,),  # Hangul Syllable Ryeg    ..Hangul Syllable Ryeh
+    (0x0b85d, 0x0b877,),  # Hangul Syllable Rog     ..Hangul Syllable Roh
+    (0x0b879, 0x0b893,),  # Hangul Syllable Rwag    ..Hangul Syllable Rwah
+    (0x0b895, 0x0b8af,),  # Hangul Syllable Rwaeg   ..Hangul Syllable Rwaeh
+    (0x0b8b1, 0x0b8cb,),  # Hangul Syllable Roeg    ..Hangul Syllable Roeh
+    (0x0b8cd, 0x0b8e7,),  # Hangul Syllable Ryog    ..Hangul Syllable Ryoh
+    (0x0b8e9, 0x0b903,),  # Hangul Syllable Rug     ..Hangul Syllable Ruh
+    (0x0b905, 0x0b91f,),  # Hangul Syllable Rweog   ..Hangul Syllable Rweoh
+    (0x0b921, 0x0b93b,),  # Hangul Syllable Rweg    ..Hangul Syllable Rweh
+    (0x0b93d, 0x0b957,),  # Hangul Syllable Rwig    ..Hangul Syllable Rwih
+    (0x0b959, 0x0b973,),  # Hangul Syllable Ryug    ..Hangul Syllable Ryuh
+    (0x0b975, 0x0b98f,),  # Hangul Syllable Reug    ..Hangul Syllable Reuh
+    (0x0b991, 0x0b9ab,),  # Hangul Syllable Ryig    ..Hangul Syllable Ryih
+    (0x0b9ad, 0x0b9c7,),  # Hangul Syllable Rig     ..Hangul Syllable Rih
+    (0x0b9c9, 0x0b9e3,),  # Hangul Syllable Mag     ..Hangul Syllable Mah
+    (0x0b9e5, 0x0b9ff,),  # Hangul Syllable Maeg    ..Hangul Syllable Maeh
+    (0x0ba01, 0x0ba1b,),  # Hangul Syllable Myag    ..Hangul Syllable Myah
+    (0x0ba1d, 0x0ba37,),  # Hangul Syllable Myaeg   ..Hangul Syllable Myaeh
+    (0x0ba39, 0x0ba53,),  # Hangul Syllable Meog    ..Hangul Syllable Meoh
+    (0x0ba55, 0x0ba6f,),  # Hangul Syllable Meg     ..Hangul Syllable Meh
+    (0x0ba71, 0x0ba8b,),  # Hangul Syllable Myeog   ..Hangul Syllable Myeoh
+    (0x0ba8d, 0x0baa7,),  # Hangul Syllable Myeg    ..Hangul Syllable Myeh
+    (0x0baa9, 0x0bac3,),  # Hangul Syllable Mog     ..Hangul Syllable Moh
+    (0x0bac5, 0x0badf,),  # Hangul Syllable Mwag    ..Hangul Syllable Mwah
+    (0x0bae1, 0x0bafb,),  # Hangul Syllable Mwaeg   ..Hangul Syllable Mwaeh
+    (0x0bafd, 0x0bb17,),  # Hangul Syllable Moeg    ..Hangul Syllable Moeh
+    (0x0bb19, 0x0bb33,),  # Hangul Syllable Myog    ..Hangul Syllable Myoh
+    (0x0bb35, 0x0bb4f,),  # Hangul Syllable Mug     ..Hangul Syllable Muh
+    (0x0bb51, 0x0bb6b,),  # Hangul Syllable Mweog   ..Hangul Syllable Mweoh
+    (0x0bb6d, 0x0bb87,),  # Hangul Syllable Mweg    ..Hangul Syllable Mweh
+    (0x0bb89, 0x0bba3,),  # Hangul Syllable Mwig    ..Hangul Syllable Mwih
+    (0x0bba5, 0x0bbbf,),  # Hangul Syllable Myug    ..Hangul Syllable Myuh
+    (0x0bbc1, 0x0bbdb,),  # Hangul Syllable Meug    ..Hangul Syllable Meuh
+    (0x0bbdd, 0x0bbf7,),  # Hangul Syllable Myig    ..Hangul Syllable Myih
+    (0x0bbf9, 0x0bc13,),  # Hangul Syllable Mig     ..Hangul Syllable Mih
+    (0x0bc15, 0x0bc2f,),  # Hangul Syllable Bag     ..Hangul Syllable Bah
+    (0x0bc31, 0x0bc4b,),  # Hangul Syllable Baeg    ..Hangul Syllable Baeh
+    (0x0bc4d, 0x0bc67,),  # Hangul Syllable Byag    ..Hangul Syllable Byah
+    (0x0bc69, 0x0bc83,),  # Hangul Syllable Byaeg   ..Hangul Syllable Byaeh
+    (0x0bc85, 0x0bc9f,),  # Hangul Syllable Beog    ..Hangul Syllable Beoh
+    (0x0bca1, 0x0bcbb,),  # Hangul Syllable Beg     ..Hangul Syllable Beh
+    (0x0bcbd, 0x0bcd7,),  # Hangul Syllable Byeog   ..Hangul Syllable Byeoh
+    (0x0bcd9, 0x0bcf3,),  # Hangul Syllable Byeg    ..Hangul Syllable Byeh
+    (0x0bcf5, 0x0bd0f,),  # Hangul Syllable Bog     ..Hangul Syllable Boh
+    (0x0bd11, 0x0bd2b,),  # Hangul Syllable Bwag    ..Hangul Syllable Bwah
+    (0x0bd2d, 0x0bd47,),  # Hangul Syllable Bwaeg   ..Hangul Syllable Bwaeh
+    (0x0bd49, 0x0bd63,),  # Hangul Syllable Boeg    ..Hangul Syllable Boeh
+    (0x0bd65, 0x0bd7f,),  # Hangul Syllable Byog    ..Hangul Syllable Byoh
+    (0x0bd81, 0x0bd9b,),  # Hangul Syllable Bug     ..Hangul Syllable Buh
+    (0x0bd9d, 0x0bdb7,),  # Hangul Syllable Bweog   ..Hangul Syllable Bweoh
+    (0x0bdb9, 0x0bdd3,),  # Hangul Syllable Bweg    ..Hangul Syllable Bweh
+    (0x0bdd5, 0x0bdef,),  # Hangul Syllable Bwig    ..Hangul Syllable Bwih
+    (0x0bdf1, 0x0be0b,),  # Hangul Syllable Byug    ..Hangul Syllable Byuh
+    (0x0be0d, 0x0be27,),  # Hangul Syllable Beug    ..Hangul Syllable Beuh
+    (0x0be29, 0x0be43,),  # Hangul Syllable Byig    ..Hangul Syllable Byih
+    (0x0be45, 0x0be5f,),  # Hangul Syllable Big     ..Hangul Syllable Bih
+    (0x0be61, 0x0be7b,),  # Hangul Syllable Bbag    ..Hangul Syllable Bbah
+    (0x0be7d, 0x0be97,),  # Hangul Syllable Bbaeg   ..Hangul Syllable Bbaeh
+    (0x0be99, 0x0beb3,),  # Hangul Syllable Bbyag   ..Hangul Syllable Bbyah
+    (0x0beb5, 0x0becf,),  # Hangul Syllable Bbyaeg  ..Hangul Syllable Bbyaeh
+    (0x0bed1, 0x0beeb,),  # Hangul Syllable Bbeog   ..Hangul Syllable Bbeoh
+    (0x0beed, 0x0bf07,),  # Hangul Syllable Bbeg    ..Hangul Syllable Bbeh
+    (0x0bf09, 0x0bf23,),  # Hangul Syllable Bbyeog  ..Hangul Syllable Bbyeoh
+    (0x0bf25, 0x0bf3f,),  # Hangul Syllable Bbyeg   ..Hangul Syllable Bbyeh
+    (0x0bf41, 0x0bf5b,),  # Hangul Syllable Bbog    ..Hangul Syllable Bboh
+    (0x0bf5d, 0x0bf77,),  # Hangul Syllable Bbwag   ..Hangul Syllable Bbwah
+    (0x0bf79, 0x0bf93,),  # Hangul Syllable Bbwaeg  ..Hangul Syllable Bbwaeh
+    (0x0bf95, 0x0bfaf,),  # Hangul Syllable Bboeg   ..Hangul Syllable Bboeh
+    (0x0bfb1, 0x0bfcb,),  # Hangul Syllable Bbyog   ..Hangul Syllable Bbyoh
+    (0x0bfcd, 0x0bfe7,),  # Hangul Syllable Bbug    ..Hangul Syllable Bbuh
+    (0x0bfe9, 0x0c003,),  # Hangul Syllable Bbweog  ..Hangul Syllable Bbweoh
+    (0x0c005, 0x0c01f,),  # Hangul Syllable Bbweg   ..Hangul Syllable Bbweh
+    (0x0c021, 0x0c03b,),  # Hangul Syllable Bbwig   ..Hangul Syllable Bbwih
+    (0x0c03d, 0x0c057,),  # Hangul Syllable Bbyug   ..Hangul Syllable Bbyuh
+    (0x0c059, 0x0c073,),  # Hangul Syllable Bbeug   ..Hangul Syllable Bbeuh
+    (0x0c075, 0x0c08f,),  # Hangul Syllable Bbyig   ..Hangul Syllable Bbyih
+    (0x0c091, 0x0c0ab,),  # Hangul Syllable Bbig    ..Hangul Syllable Bbih
+    (0x0c0ad, 0x0c0c7,),  # Hangul Syllable Sag     ..Hangul Syllable Sah
+    (0x0c0c9, 0x0c0e3,),  # Hangul Syllable Saeg    ..Hangul Syllable Saeh
+    (0x0c0e5, 0x0c0ff,),  # Hangul Syllable Syag    ..Hangul Syllable Syah
+    (0x0c101, 0x0c11b,),  # Hangul Syllable Syaeg   ..Hangul Syllable Syaeh
+    (0x0c11d, 0x0c137,),  # Hangul Syllable Seog    ..Hangul Syllable Seoh
+    (0x0c139, 0x0c153,),  # Hangul Syllable Seg     ..Hangul Syllable Seh
+    (0x0c155, 0x0c16f,),  # Hangul Syllable Syeog   ..Hangul Syllable Syeoh
+    (0x0c171, 0x0c18b,),  # Hangul Syllable Syeg    ..Hangul Syllable Syeh
+    (0x0c18d, 0x0c1a7,),  # Hangul Syllable Sog     ..Hangul Syllable Soh
+    (0x0c1a9, 0x0c1c3,),  # Hangul Syllable Swag    ..Hangul Syllable Swah
+    (0x0c1c5, 0x0c1df,),  # Hangul Syllable Swaeg   ..Hangul Syllable Swaeh
+    (0x0c1e1, 0x0c1fb,),  # Hangul Syllable Soeg    ..Hangul Syllable Soeh
+    (0x0c1fd, 0x0c217,),  # Hangul Syllable Syog    ..Hangul Syllable Syoh
+    (0x0c219, 0x0c233,),  # Hangul Syllable Sug     ..Hangul Syllable Suh
+    (0x0c235, 0x0c24f,),  # Hangul Syllable Sweog   ..Hangul Syllable Sweoh
+    (0x0c251, 0x0c26b,),  # Hangul Syllable Sweg    ..Hangul Syllable Sweh
+    (0x0c26d, 0x0c287,),  # Hangul Syllable Swig    ..Hangul Syllable Swih
+    (0x0c289, 0x0c2a3,),  # Hangul Syllable Syug    ..Hangul Syllable Syuh
+    (0x0c2a5, 0x0c2bf,),  # Hangul Syllable Seug    ..Hangul Syllable Seuh
+    (0x0c2c1, 0x0c2db,),  # Hangul Syllable Syig    ..Hangul Syllable Syih
+    (0x0c2dd, 0x0c2f7,),  # Hangul Syllable Sig     ..Hangul Syllable Sih
+    (0x0c2f9, 0x0c313,),  # Hangul Syllable Ssag    ..Hangul Syllable Ssah
+    (0x0c315, 0x0c32f,),  # Hangul Syllable Ssaeg   ..Hangul Syllable Ssaeh
+    (0x0c331, 0x0c34b,),  # Hangul Syllable Ssyag   ..Hangul Syllable Ssyah
+    (0x0c34d, 0x0c367,),  # Hangul Syllable Ssyaeg  ..Hangul Syllable Ssyaeh
+    (0x0c369, 0x0c383,),  # Hangul Syllable Sseog   ..Hangul Syllable Sseoh
+    (0x0c385, 0x0c39f,),  # Hangul Syllable Sseg    ..Hangul Syllable Sseh
+    (0x0c3a1, 0x0c3bb,),  # Hangul Syllable Ssyeog  ..Hangul Syllable Ssyeoh
+    (0x0c3bd, 0x0c3d7,),  # Hangul Syllable Ssyeg   ..Hangul Syllable Ssyeh
+    (0x0c3d9, 0x0c3f3,),  # Hangul Syllable Ssog    ..Hangul Syllable Ssoh
+    (0x0c3f5, 0x0c40f,),  # Hangul Syllable Sswag   ..Hangul Syllable Sswah
+    (0x0c411, 0x0c42b,),  # Hangul Syllable Sswaeg  ..Hangul Syllable Sswaeh
+    (0x0c42d, 0x0c447,),  # Hangul Syllable Ssoeg   ..Hangul Syllable Ssoeh
+    (0x0c449, 0x0c463,),  # Hangul Syllable Ssyog   ..Hangul Syllable Ssyoh
+    (0x0c465, 0x0c47f,),  # Hangul Syllable Ssug    ..Hangul Syllable Ssuh
+    (0x0c481, 0x0c49b,),  # Hangul Syllable Ssweog  ..Hangul Syllable Ssweoh
+    (0x0c49d, 0x0c4b7,),  # Hangul Syllable Ssweg   ..Hangul Syllable Ssweh
+    (0x0c4b9, 0x0c4d3,),  # Hangul Syllable Sswig   ..Hangul Syllable Sswih
+    (0x0c4d5, 0x0c4ef,),  # Hangul Syllable Ssyug   ..Hangul Syllable Ssyuh
+    (0x0c4f1, 0x0c50b,),  # Hangul Syllable Sseug   ..Hangul Syllable Sseuh
+    (0x0c50d, 0x0c527,),  # Hangul Syllable Ssyig   ..Hangul Syllable Ssyih
+    (0x0c529, 0x0c543,),  # Hangul Syllable Ssig    ..Hangul Syllable Ssih
+    (0x0c545, 0x0c55f,),  # Hangul Syllable Ag      ..Hangul Syllable Ah
+    (0x0c561, 0x0c57b,),  # Hangul Syllable Aeg     ..Hangul Syllable Aeh
+    (0x0c57d, 0x0c597,),  # Hangul Syllable Yag     ..Hangul Syllable Yah
+    (0x0c599, 0x0c5b3,),  # Hangul Syllable Yaeg    ..Hangul Syllable Yaeh
+    (0x0c5b5, 0x0c5cf,),  # Hangul Syllable Eog     ..Hangul Syllable Eoh
+    (0x0c5d1, 0x0c5eb,),  # Hangul Syllable Eg      ..Hangul Syllable Eh
+    (0x0c5ed, 0x0c607,),  # Hangul Syllable Yeog    ..Hangul Syllable Yeoh
+    (0x0c609, 0x0c623,),  # Hangul Syllable Yeg     ..Hangul Syllable Yeh
+    (0x0c625, 0x0c63f,),  # Hangul Syllable Og      ..Hangul Syllable Oh
+    (0x0c641, 0x0c65b,),  # Hangul Syllable Wag     ..Hangul Syllable Wah
+    (0x0c65d, 0x0c677,),  # Hangul Syllable Waeg    ..Hangul Syllable Waeh
+    (0x0c679, 0x0c693,),  # Hangul Syllable Oeg     ..Hangul Syllable Oeh
+    (0x0c695, 0x0c6af,),  # Hangul Syllable Yog     ..Hangul Syllable Yoh
+    (0x0c6b1, 0x0c6cb,),  # Hangul Syllable Ug      ..Hangul Syllable Uh
+    (0x0c6cd, 0x0c6e7,),  # Hangul Syllable Weog    ..Hangul Syllable Weoh
+    (0x0c6e9, 0x0c703,),  # Hangul Syllable Weg     ..Hangul Syllable Weh
+    (0x0c705, 0x0c71f,),  # Hangul Syllable Wig     ..Hangul Syllable Wih
+    (0x0c721, 0x0c73b,),  # Hangul Syllable Yug     ..Hangul Syllable Yuh
+    (0x0c73d, 0x0c757,),  # Hangul Syllable Eug     ..Hangul Syllable Euh
+    (0x0c759, 0x0c773,),  # Hangul Syllable Yig     ..Hangul Syllable Yih
+    (0x0c775, 0x0c78f,),  # Hangul Syllable Ig      ..Hangul Syllable Ih
+    (0x0c791, 0x0c7ab,),  # Hangul Syllable Jag     ..Hangul Syllable Jah
+    (0x0c7ad, 0x0c7c7,),  # Hangul Syllable Jaeg    ..Hangul Syllable Jaeh
+    (0x0c7c9, 0x0c7e3,),  # Hangul Syllable Jyag    ..Hangul Syllable Jyah
+    (0x0c7e5, 0x0c7ff,),  # Hangul Syllable Jyaeg   ..Hangul Syllable Jyaeh
+    (0x0c801, 0x0c81b,),  # Hangul Syllable Jeog    ..Hangul Syllable Jeoh
+    (0x0c81d, 0x0c837,),  # Hangul Syllable Jeg     ..Hangul Syllable Jeh
+    (0x0c839, 0x0c853,),  # Hangul Syllable Jyeog   ..Hangul Syllable Jyeoh
+    (0x0c855, 0x0c86f,),  # Hangul Syllable Jyeg    ..Hangul Syllable Jyeh
+    (0x0c871, 0x0c88b,),  # Hangul Syllable Jog     ..Hangul Syllable Joh
+    (0x0c88d, 0x0c8a7,),  # Hangul Syllable Jwag    ..Hangul Syllable Jwah
+    (0x0c8a9, 0x0c8c3,),  # Hangul Syllable Jwaeg   ..Hangul Syllable Jwaeh
+    (0x0c8c5, 0x0c8df,),  # Hangul Syllable Joeg    ..Hangul Syllable Joeh
+    (0x0c8e1, 0x0c8fb,),  # Hangul Syllable Jyog    ..Hangul Syllable Jyoh
+    (0x0c8fd, 0x0c917,),  # Hangul Syllable Jug     ..Hangul Syllable Juh
+    (0x0c919, 0x0c933,),  # Hangul Syllable Jweog   ..Hangul Syllable Jweoh
+    (0x0c935, 0x0c94f,),  # Hangul Syllable Jweg    ..Hangul Syllable Jweh
+    (0x0c951, 0x0c96b,),  # Hangul Syllable Jwig    ..Hangul Syllable Jwih
+    (0x0c96d, 0x0c987,),  # Hangul Syllable Jyug    ..Hangul Syllable Jyuh
+    (0x0c989, 0x0c9a3,),  # Hangul Syllable Jeug    ..Hangul Syllable Jeuh
+    (0x0c9a5, 0x0c9bf,),  # Hangul Syllable Jyig    ..Hangul Syllable Jyih
+    (0x0c9c1, 0x0c9db,),  # Hangul Syllable Jig     ..Hangul Syllable Jih
+    (0x0c9dd, 0x0c9f7,),  # Hangul Syllable Jjag    ..Hangul Syllable Jjah
+    (0x0c9f9, 0x0ca13,),  # Hangul Syllable Jjaeg   ..Hangul Syllable Jjaeh
+    (0x0ca15, 0x0ca2f,),  # Hangul Syllable Jjyag   ..Hangul Syllable Jjyah
+    (0x0ca31, 0x0ca4b,),  # Hangul Syllable Jjyaeg  ..Hangul Syllable Jjyaeh
+    (0x0ca4d, 0x0ca67,),  # Hangul Syllable Jjeog   ..Hangul Syllable Jjeoh
+    (0x0ca69, 0x0ca83,),  # Hangul Syllable Jjeg    ..Hangul Syllable Jjeh
+    (0x0ca85, 0x0ca9f,),  # Hangul Syllable Jjyeog  ..Hangul Syllable Jjyeoh
+    (0x0caa1, 0x0cabb,),  # Hangul Syllable Jjyeg   ..Hangul Syllable Jjyeh
+    (0x0cabd, 0x0cad7,),  # Hangul Syllable Jjog    ..Hangul Syllable Jjoh
+    (0x0cad9, 0x0caf3,),  # Hangul Syllable Jjwag   ..Hangul Syllable Jjwah
+    (0x0caf5, 0x0cb0f,),  # Hangul Syllable Jjwaeg  ..Hangul Syllable Jjwaeh
+    (0x0cb11, 0x0cb2b,),  # Hangul Syllable Jjoeg   ..Hangul Syllable Jjoeh
+    (0x0cb2d, 0x0cb47,),  # Hangul Syllable Jjyog   ..Hangul Syllable Jjyoh
+    (0x0cb49, 0x0cb63,),  # Hangul Syllable Jjug    ..Hangul Syllable Jjuh
+    (0x0cb65, 0x0cb7f,),  # Hangul Syllable Jjweog  ..Hangul Syllable Jjweoh
+    (0x0cb81, 0x0cb9b,),  # Hangul Syllable Jjweg   ..Hangul Syllable Jjweh
+    (0x0cb9d, 0x0cbb7,),  # Hangul Syllable Jjwig   ..Hangul Syllable Jjwih
+    (0x0cbb9, 0x0cbd3,),  # Hangul Syllable Jjyug   ..Hangul Syllable Jjyuh
+    (0x0cbd5, 0x0cbef,),  # Hangul Syllable Jjeug   ..Hangul Syllable Jjeuh
+    (0x0cbf1, 0x0cc0b,),  # Hangul Syllable Jjyig   ..Hangul Syllable Jjyih
+    (0x0cc0d, 0x0cc27,),  # Hangul Syllable Jjig    ..Hangul Syllable Jjih
+    (0x0cc29, 0x0cc43,),  # Hangul Syllable Cag     ..Hangul Syllable Cah
+    (0x0cc45, 0x0cc5f,),  # Hangul Syllable Caeg    ..Hangul Syllable Caeh
+    (0x0cc61, 0x0cc7b,),  # Hangul Syllable Cyag    ..Hangul Syllable Cyah
+    (0x0cc7d, 0x0cc97,),  # Hangul Syllable Cyaeg   ..Hangul Syllable Cyaeh
+    (0x0cc99, 0x0ccb3,),  # Hangul Syllable Ceog    ..Hangul Syllable Ceoh
+    (0x0ccb5, 0x0cccf,),  # Hangul Syllable Ceg     ..Hangul Syllable Ceh
+    (0x0ccd1, 0x0cceb,),  # Hangul Syllable Cyeog   ..Hangul Syllable Cyeoh
+    (0x0cced, 0x0cd07,),  # Hangul Syllable Cyeg    ..Hangul Syllable Cyeh
+    (0x0cd09, 0x0cd23,),  # Hangul Syllable Cog     ..Hangul Syllable Coh
+    (0x0cd25, 0x0cd3f,),  # Hangul Syllable Cwag    ..Hangul Syllable Cwah
+    (0x0cd41, 0x0cd5b,),  # Hangul Syllable Cwaeg   ..Hangul Syllable Cwaeh
+    (0x0cd5d, 0x0cd77,),  # Hangul Syllable Coeg    ..Hangul Syllable Coeh
+    (0x0cd79, 0x0cd93,),  # Hangul Syllable Cyog    ..Hangul Syllable Cyoh
+    (0x0cd95, 0x0cdaf,),  # Hangul Syllable Cug     ..Hangul Syllable Cuh
+    (0x0cdb1, 0x0cdcb,),  # Hangul Syllable Cweog   ..Hangul Syllable Cweoh
+    (0x0cdcd, 0x0cde7,),  # Hangul Syllable Cweg    ..Hangul Syllable Cweh
+    (0x0cde9, 0x0ce03,),  # Hangul Syllable Cwig    ..Hangul Syllable Cwih
+    (0x0ce05, 0x0ce1f,),  # Hangul Syllable Cyug    ..Hangul Syllable Cyuh
+    (0x0ce21, 0x0ce3b,),  # Hangul Syllable Ceug    ..Hangul Syllable Ceuh
+    (0x0ce3d, 0x0ce57,),  # Hangul Syllable Cyig    ..Hangul Syllable Cyih
+    (0x0ce59, 0x0ce73,),  # Hangul Syllable Cig     ..Hangul Syllable Cih
+    (0x0ce75, 0x0ce8f,),  # Hangul Syllable Kag     ..Hangul Syllable Kah
+    (0x0ce91, 0x0ceab,),  # Hangul Syllable Kaeg    ..Hangul Syllable Kaeh
+    (0x0cead, 0x0cec7,),  # Hangul Syllable Kyag    ..Hangul Syllable Kyah
+    (0x0cec9, 0x0cee3,),  # Hangul Syllable Kyaeg   ..Hangul Syllable Kyaeh
+    (0x0cee5, 0x0ceff,),  # Hangul Syllable Keog    ..Hangul Syllable Keoh
+    (0x0cf01, 0x0cf1b,),  # Hangul Syllable Keg     ..Hangul Syllable Keh
+    (0x0cf1d, 0x0cf37,),  # Hangul Syllable Kyeog   ..Hangul Syllable Kyeoh
+    (0x0cf39, 0x0cf53,),  # Hangul Syllable Kyeg    ..Hangul Syllable Kyeh
+    (0x0cf55, 0x0cf6f,),  # Hangul Syllable Kog     ..Hangul Syllable Koh
+    (0x0cf71, 0x0cf8b,),  # Hangul Syllable Kwag    ..Hangul Syllable Kwah
+    (0x0cf8d, 0x0cfa7,),  # Hangul Syllable Kwaeg   ..Hangul Syllable Kwaeh
+    (0x0cfa9, 0x0cfc3,),  # Hangul Syllable Koeg    ..Hangul Syllable Koeh
+    (0x0cfc5, 0x0cfdf,),  # Hangul Syllable Kyog    ..Hangul Syllable Kyoh
+    (0x0cfe1, 0x0cffb,),  # Hangul Syllable Kug     ..Hangul Syllable Kuh
+    (0x0cffd, 0x0d017,),  # Hangul Syllable Kweog   ..Hangul Syllable Kweoh
+    (0x0d019, 0x0d033,),  # Hangul Syllable Kweg    ..Hangul Syllable Kweh
+    (0x0d035, 0x0d04f,),  # Hangul Syllable Kwig    ..Hangul Syllable Kwih
+    (0x0d051, 0x0d06b,),  # Hangul Syllable Kyug    ..Hangul Syllable Kyuh
+    (0x0d06d, 0x0d087,),  # Hangul Syllable Keug    ..Hangul Syllable Keuh
+    (0x0d089, 0x0d0a3,),  # Hangul Syllable Kyig    ..Hangul Syllable Kyih
+    (0x0d0a5, 0x0d0bf,),  # Hangul Syllable Kig     ..Hangul Syllable Kih
+    (0x0d0c1, 0x0d0db,),  # Hangul Syllable Tag     ..Hangul Syllable Tah
+    (0x0d0dd, 0x0d0f7,),  # Hangul Syllable Taeg    ..Hangul Syllable Taeh
+    (0x0d0f9, 0x0d113,),  # Hangul Syllable Tyag    ..Hangul Syllable Tyah
+    (0x0d115, 0x0d12f,),  # Hangul Syllable Tyaeg   ..Hangul Syllable Tyaeh
+    (0x0d131, 0x0d14b,),  # Hangul Syllable Teog    ..Hangul Syllable Teoh
+    (0x0d14d, 0x0d167,),  # Hangul Syllable Teg     ..Hangul Syllable Teh
+    (0x0d169, 0x0d183,),  # Hangul Syllable Tyeog   ..Hangul Syllable Tyeoh
+    (0x0d185, 0x0d19f,),  # Hangul Syllable Tyeg    ..Hangul Syllable Tyeh
+    (0x0d1a1, 0x0d1bb,),  # Hangul Syllable Tog     ..Hangul Syllable Toh
+    (0x0d1bd, 0x0d1d7,),  # Hangul Syllable Twag    ..Hangul Syllable Twah
+    (0x0d1d9, 0x0d1f3,),  # Hangul Syllable Twaeg   ..Hangul Syllable Twaeh
+    (0x0d1f5, 0x0d20f,),  # Hangul Syllable Toeg    ..Hangul Syllable Toeh
+    (0x0d211, 0x0d22b,),  # Hangul Syllable Tyog    ..Hangul Syllable Tyoh
+    (0x0d22d, 0x0d247,),  # Hangul Syllable Tug     ..Hangul Syllable Tuh
+    (0x0d249, 0x0d263,),  # Hangul Syllable Tweog   ..Hangul Syllable Tweoh
+    (0x0d265, 0x0d27f,),  # Hangul Syllable Tweg    ..Hangul Syllable Tweh
+    (0x0d281, 0x0d29b,),  # Hangul Syllable Twig    ..Hangul Syllable Twih
+    (0x0d29d, 0x0d2b7,),  # Hangul Syllable Tyug    ..Hangul Syllable Tyuh
+    (0x0d2b9, 0x0d2d3,),  # Hangul Syllable Teug    ..Hangul Syllable Teuh
+    (0x0d2d5, 0x0d2ef,),  # Hangul Syllable Tyig    ..Hangul Syllable Tyih
+    (0x0d2f1, 0x0d30b,),  # Hangul Syllable Tig     ..Hangul Syllable Tih
+    (0x0d30d, 0x0d327,),  # Hangul Syllable Pag     ..Hangul Syllable Pah
+    (0x0d329, 0x0d343,),  # Hangul Syllable Paeg    ..Hangul Syllable Paeh
+    (0x0d345, 0x0d35f,),  # Hangul Syllable Pyag    ..Hangul Syllable Pyah
+    (0x0d361, 0x0d37b,),  # Hangul Syllable Pyaeg   ..Hangul Syllable Pyaeh
+    (0x0d37d, 0x0d397,),  # Hangul Syllable Peog    ..Hangul Syllable Peoh
+    (0x0d399, 0x0d3b3,),  # Hangul Syllable Peg     ..Hangul Syllable Peh
+    (0x0d3b5, 0x0d3cf,),  # Hangul Syllable Pyeog   ..Hangul Syllable Pyeoh
+    (0x0d3d1, 0x0d3eb,),  # Hangul Syllable Pyeg    ..Hangul Syllable Pyeh
+    (0x0d3ed, 0x0d407,),  # Hangul Syllable Pog     ..Hangul Syllable Poh
+    (0x0d409, 0x0d423,),  # Hangul Syllable Pwag    ..Hangul Syllable Pwah
+    (0x0d425, 0x0d43f,),  # Hangul Syllable Pwaeg   ..Hangul Syllable Pwaeh
+    (0x0d441, 0x0d45b,),  # Hangul Syllable Poeg    ..Hangul Syllable Poeh
+    (0x0d45d, 0x0d477,),  # Hangul Syllable Pyog    ..Hangul Syllable Pyoh
+    (0x0d479, 0x0d493,),  # Hangul Syllable Pug     ..Hangul Syllable Puh
+    (0x0d495, 0x0d4af,),  # Hangul Syllable Pweog   ..Hangul Syllable Pweoh
+    (0x0d4b1, 0x0d4cb,),  # Hangul Syllable Pweg    ..Hangul Syllable Pweh
+    (0x0d4cd, 0x0d4e7,),  # Hangul Syllable Pwig    ..Hangul Syllable Pwih
+    (0x0d4e9, 0x0d503,),  # Hangul Syllable Pyug    ..Hangul Syllable Pyuh
+    (0x0d505, 0x0d51f,),  # Hangul Syllable Peug    ..Hangul Syllable Peuh
+    (0x0d521, 0x0d53b,),  # Hangul Syllable Pyig    ..Hangul Syllable Pyih
+    (0x0d53d, 0x0d557,),  # Hangul Syllable Pig     ..Hangul Syllable Pih
+    (0x0d559, 0x0d573,),  # Hangul Syllable Hag     ..Hangul Syllable Hah
+    (0x0d575, 0x0d58f,),  # Hangul Syllable Haeg    ..Hangul Syllable Haeh
+    (0x0d591, 0x0d5ab,),  # Hangul Syllable Hyag    ..Hangul Syllable Hyah
+    (0x0d5ad, 0x0d5c7,),  # Hangul Syllable Hyaeg   ..Hangul Syllable Hyaeh
+    (0x0d5c9, 0x0d5e3,),  # Hangul Syllable Heog    ..Hangul Syllable Heoh
+    (0x0d5e5, 0x0d5ff,),  # Hangul Syllable Heg     ..Hangul Syllable Heh
+    (0x0d601, 0x0d61b,),  # Hangul Syllable Hyeog   ..Hangul Syllable Hyeoh
+    (0x0d61d, 0x0d637,),  # Hangul Syllable Hyeg    ..Hangul Syllable Hyeh
+    (0x0d639, 0x0d653,),  # Hangul Syllable Hog     ..Hangul Syllable Hoh
+    (0x0d655, 0x0d66f,),  # Hangul Syllable Hwag    ..Hangul Syllable Hwah
+    (0x0d671, 0x0d68b,),  # Hangul Syllable Hwaeg   ..Hangul Syllable Hwaeh
+    (0x0d68d, 0x0d6a7,),  # Hangul Syllable Hoeg    ..Hangul Syllable Hoeh
+    (0x0d6a9, 0x0d6c3,),  # Hangul Syllable Hyog    ..Hangul Syllable Hyoh
+    (0x0d6c5, 0x0d6df,),  # Hangul Syllable Hug     ..Hangul Syllable Huh
+    (0x0d6e1, 0x0d6fb,),  # Hangul Syllable Hweog   ..Hangul Syllable Hweoh
+    (0x0d6fd, 0x0d717,),  # Hangul Syllable Hweg    ..Hangul Syllable Hweh
+    (0x0d719, 0x0d733,),  # Hangul Syllable Hwig    ..Hangul Syllable Hwih
+    (0x0d735, 0x0d74f,),  # Hangul Syllable Hyug    ..Hangul Syllable Hyuh
+    (0x0d751, 0x0d76b,),  # Hangul Syllable Heug    ..Hangul Syllable Heuh
+    (0x0d76d, 0x0d787,),  # Hangul Syllable Hyig    ..Hangul Syllable Hyih
+    (0x0d789, 0x0d7a3,),  # Hangul Syllable Hig     ..Hangul Syllable Hih
+)
+
+EXTENDED_PICTOGRAPHIC = (
+    # Source: emoji-data.txt
+    # Date: 2025-07-25, 17:54:31 GMT
+    #
+    (0x000a9, 0x000a9,),  # Copyright Sign
+    (0x000ae, 0x000ae,),  # Registered Sign
+    (0x0203c, 0x0203c,),  # Double Exclamation Mark
+    (0x02049, 0x02049,),  # Exclamation Question Mark
+    (0x02122, 0x02122,),  # Trade Mark Sign
+    (0x02139, 0x02139,),  # Information Source
+    (0x02194, 0x02199,),  # Left Right Arrow        ..South West Arrow
+    (0x021a9, 0x021aa,),  # Leftwards Arrow With Hoo..Rightwards Arrow With Ho
+    (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
+    (0x02328, 0x02328,),  # Keyboard
+    (0x023cf, 0x023cf,),  # Eject Symbol
+    (0x023e9, 0x023f3,),  # Black Right-pointing Dou..Hourglass With Flowing S
+    (0x023f8, 0x023fa,),  # Double Vertical Bar     ..Black Circle For Record
+    (0x024c2, 0x024c2,),  # Circled Latin Capital Letter M
+    (0x025aa, 0x025ab,),  # Black Small Square      ..White Small Square
+    (0x025b6, 0x025b6,),  # Black Right-pointing Triangle
+    (0x025c0, 0x025c0,),  # Black Left-pointing Triangle
+    (0x025fb, 0x025fe,),  # White Medium Square     ..Black Medium Small Squar
+    (0x02600, 0x02604,),  # Black Sun With Rays     ..Comet
+    (0x0260e, 0x0260e,),  # Black Telephone
+    (0x02611, 0x02611,),  # Ballot Box With Check
+    (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
+    (0x02618, 0x02618,),  # Shamrock
+    (0x0261d, 0x0261d,),  # White Up Pointing Index
+    (0x02620, 0x02620,),  # Skull And Crossbones
+    (0x02622, 0x02623,),  # Radioactive Sign        ..Biohazard Sign
+    (0x02626, 0x02626,),  # Orthodox Cross
+    (0x0262a, 0x0262a,),  # Star And Crescent
+    (0x0262e, 0x0262f,),  # Peace Symbol            ..Yin Yang
+    (0x02638, 0x0263a,),  # Wheel Of Dharma         ..White Smiling Face
+    (0x02640, 0x02640,),  # Female Sign
+    (0x02642, 0x02642,),  # Male Sign
+    (0x02648, 0x02653,),  # Aries                   ..Pisces
+    (0x0265f, 0x02660,),  # Black Chess Pawn        ..Black Spade Suit
+    (0x02663, 0x02663,),  # Black Club Suit
+    (0x02665, 0x02666,),  # Black Heart Suit        ..Black Diamond Suit
+    (0x02668, 0x02668,),  # Hot Springs
+    (0x0267b, 0x0267b,),  # Black Universal Recycling Symbol
+    (0x0267e, 0x0267f,),  # Permanent Paper Sign    ..Wheelchair Symbol
+    (0x02692, 0x02697,),  # Hammer And Pick         ..Alembic
+    (0x02699, 0x02699,),  # Gear
+    (0x0269b, 0x0269c,),  # Atom Symbol             ..Fleur-de-lis
+    (0x026a0, 0x026a1,),  # Warning Sign            ..High Voltage Sign
+    (0x026a7, 0x026a7,),  # Male With Stroke And Male And Female Sign
+    (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
+    (0x026b0, 0x026b1,),  # Coffin                  ..Funeral Urn
+    (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
+    (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
+    (0x026c8, 0x026c8,),  # Thunder Cloud And Rain
+    (0x026ce, 0x026cf,),  # Ophiuchus               ..Pick
+    (0x026d1, 0x026d1,),  # Helmet With White Cross
+    (0x026d3, 0x026d4,),  # Chains                  ..No Entry
+    (0x026e9, 0x026ea,),  # Shinto Shrine           ..Church
+    (0x026f0, 0x026f5,),  # Mountain                ..Sailboat
+    (0x026f7, 0x026fa,),  # Skier                   ..Tent
+    (0x026fd, 0x026fd,),  # Fuel Pump
+    (0x02702, 0x02702,),  # Black Scissors
+    (0x02705, 0x02705,),  # White Heavy Check Mark
+    (0x02708, 0x0270d,),  # Airplane                ..Writing Hand
+    (0x0270f, 0x0270f,),  # Pencil
+    (0x02712, 0x02712,),  # Black Nib
+    (0x02714, 0x02714,),  # Heavy Check Mark
+    (0x02716, 0x02716,),  # Heavy Multiplication X
+    (0x0271d, 0x0271d,),  # Latin Cross
+    (0x02721, 0x02721,),  # Star Of David
+    (0x02728, 0x02728,),  # Sparkles
+    (0x02733, 0x02734,),  # Eight Spoked Asterisk   ..Eight Pointed Black Star
+    (0x02744, 0x02744,),  # Snowflake
+    (0x02747, 0x02747,),  # Sparkle
+    (0x0274c, 0x0274c,),  # Cross Mark
+    (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
+    (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
+    (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
+    (0x02763, 0x02764,),  # Heavy Heart Exclamation ..Heavy Black Heart
+    (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
+    (0x027a1, 0x027a1,),  # Black Rightwards Arrow
+    (0x027b0, 0x027b0,),  # Curly Loop
+    (0x027bf, 0x027bf,),  # Double Curly Loop
+    (0x02934, 0x02935,),  # Arrow Pointing Rightward..Arrow Pointing Rightward
+    (0x02b05, 0x02b07,),  # Leftwards Black Arrow   ..Downwards Black Arrow
+    (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
+    (0x02b50, 0x02b50,),  # White Medium Star
+    (0x02b55, 0x02b55,),  # Heavy Large Circle
+    (0x03030, 0x03030,),  # Wavy Dash
+    (0x0303d, 0x0303d,),  # Part Alternation Mark
+    (0x03297, 0x03297,),  # Circled Ideograph Congratulation
+    (0x03299, 0x03299,),  # Circled Ideograph Secret
+    (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
+    (0x1f02c, 0x1f02f,),  # (nil)
+    (0x1f094, 0x1f09f,),  # (nil)
+    (0x1f0af, 0x1f0b0,),  # (nil)
+    (0x1f0c0, 0x1f0c0,),  # (nil)
+    (0x1f0cf, 0x1f0d0,),  # Playing Card Black Joker..(nil)
+    (0x1f0f6, 0x1f0ff,),  # (nil)
+    (0x1f170, 0x1f171,),  # Negative Squared Latin C..Negative Squared Latin C
+    (0x1f17e, 0x1f17f,),  # Negative Squared Latin C..Negative Squared Latin C
+    (0x1f18e, 0x1f18e,),  # Negative Squared Ab
+    (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
+    (0x1f1ae, 0x1f1e5,),  # (nil)
+    (0x1f201, 0x1f20f,),  # Squared Katakana Koko   ..(nil)
+    (0x1f21a, 0x1f21a,),  # Squared Cjk Unified Ideograph-7121
+    (0x1f22f, 0x1f22f,),  # Squared Cjk Unified Ideograph-6307
+    (0x1f232, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
+    (0x1f23c, 0x1f23f,),  # (nil)
+    (0x1f249, 0x1f25f,),  # (nil)
+    (0x1f266, 0x1f321,),  # (nil)                   ..Thermometer
+    (0x1f324, 0x1f393,),  # White Sun With Small Clo..Graduation Cap
+    (0x1f396, 0x1f397,),  # Military Medal          ..Reminder Ribbon
+    (0x1f399, 0x1f39b,),  # Studio Microphone       ..Control Knobs
+    (0x1f39e, 0x1f3f0,),  # Film Frames             ..European Castle
+    (0x1f3f3, 0x1f3f5,),  # Waving White Flag       ..Rosette
+    (0x1f3f7, 0x1f3fa,),  # Label                   ..Amphora
+    (0x1f400, 0x1f4fd,),  # Rat                     ..Film Projector
+    (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
+    (0x1f549, 0x1f54e,),  # Om Symbol               ..Menorah With Nine Branch
+    (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
+    (0x1f56f, 0x1f570,),  # Candle                  ..Mantelpiece Clock
+    (0x1f573, 0x1f57a,),  # Hole                    ..Man Dancing
+    (0x1f587, 0x1f587,),  # Linked Paperclips
+    (0x1f58a, 0x1f58d,),  # Lower Left Ballpoint Pen..Lower Left Crayon
+    (0x1f590, 0x1f590,),  # Raised Hand With Fingers Splayed
+    (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
+    (0x1f5a4, 0x1f5a5,),  # Black Heart             ..Desktop Computer
+    (0x1f5a8, 0x1f5a8,),  # Printer
+    (0x1f5b1, 0x1f5b2,),  # Three Button Mouse      ..Trackball
+    (0x1f5bc, 0x1f5bc,),  # Frame With Picture
+    (0x1f5c2, 0x1f5c4,),  # Card Index Dividers     ..File Cabinet
+    (0x1f5d1, 0x1f5d3,),  # Wastebasket             ..Spiral Calendar Pad
+    (0x1f5dc, 0x1f5de,),  # Compression             ..Rolled-up Newspaper
+    (0x1f5e1, 0x1f5e1,),  # Dagger Knife
+    (0x1f5e3, 0x1f5e3,),  # Speaking Head In Silhouette
+    (0x1f5e8, 0x1f5e8,),  # Left Speech Bubble
+    (0x1f5ef, 0x1f5ef,),  # Right Anger Bubble
+    (0x1f5f3, 0x1f5f3,),  # Ballot Box With Ballot
+    (0x1f5fa, 0x1f64f,),  # World Map               ..Person With Folded Hands
+    (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
+    (0x1f6cb, 0x1f6d2,),  # Couch And Lamp          ..Shopping Trolley
+    (0x1f6d5, 0x1f6e5,),  # Hindu Temple            ..Motor Boat
+    (0x1f6e9, 0x1f6e9,),  # Small Airplane
+    (0x1f6eb, 0x1f6f0,),  # Airplane Departure      ..Satellite
+    (0x1f6f3, 0x1f6ff,),  # Passenger Ship          ..(nil)
+    (0x1f7da, 0x1f7ff,),  # (nil)
+    (0x1f80c, 0x1f80f,),  # (nil)
+    (0x1f848, 0x1f84f,),  # (nil)
+    (0x1f85a, 0x1f85f,),  # (nil)
+    (0x1f888, 0x1f88f,),  # (nil)
+    (0x1f8ae, 0x1f8af,),  # (nil)
+    (0x1f8bc, 0x1f8bf,),  # (nil)
+    (0x1f8c2, 0x1f8cf,),  # (nil)
+    (0x1f8d9, 0x1f8ff,),  # (nil)
+    (0x1f90c, 0x1f93a,),  # Pinched Fingers         ..Fencer
+    (0x1f93c, 0x1f945,),  # Wrestlers               ..Goal Net
+    (0x1f947, 0x1f9ff,),  # First Place Medal       ..Nazar Amulet
+    (0x1fa58, 0x1fa5f,),  # (nil)
+    (0x1fa6e, 0x1faff,),  # (nil)
+    (0x1fc00, 0x1fffd,),  # (nil)
+)
+
+INCB_LINKER = (
+    # Source: DerivedCoreProperties
+    # Date: see file
+    #
+    (0x0094d, 0x0094d,),  # Devanagari Sign Virama
+    (0x009cd, 0x009cd,),  # Bengali Sign Virama
+    (0x00acd, 0x00acd,),  # Gujarati Sign Virama
+    (0x00b4d, 0x00b4d,),  # Oriya Sign Virama
+    (0x00c4d, 0x00c4d,),  # Telugu Sign Virama
+    (0x00d4d, 0x00d4d,),  # Malayalam Sign Virama
+    (0x01039, 0x01039,),  # Myanmar Sign Virama
+    (0x017d2, 0x017d2,),  # Khmer Sign Coeng
+    (0x01a60, 0x01a60,),  # Tai Tham Sign Sakot
+    (0x01b44, 0x01b44,),  # Balinese Adeg Adeg
+    (0x01bab, 0x01bab,),  # Sundanese Sign Virama
+    (0x0a9c0, 0x0a9c0,),  # Javanese Pangkon
+    (0x0aaf6, 0x0aaf6,),  # Meetei Mayek Virama
+    (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
+    (0x11133, 0x11133,),  # Chakma Virama
+    (0x113d0, 0x113d0,),  # Tulu-tigalari Conjoiner
+    (0x1193e, 0x1193e,),  # Dives Akuru Virama
+    (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
+    (0x11a99, 0x11a99,),  # Soyombo Subjoiner
+    (0x11f42, 0x11f42,),  # Kawi Conjoiner
+)
+
+INCB_CONSONANT = (
+    # Source: DerivedCoreProperties
+    # Date: see file
+    #
+    (0x00915, 0x00939,),  # Devanagari Letter Ka    ..Devanagari Letter Ha
+    (0x00958, 0x0095f,),  # Devanagari Letter Qa    ..Devanagari Letter Yya
+    (0x00978, 0x0097f,),  # Devanagari Letter Marwar..Devanagari Letter Bba
+    (0x00995, 0x009a8,),  # Bengali Letter Ka       ..Bengali Letter Na
+    (0x009aa, 0x009b0,),  # Bengali Letter Pa       ..Bengali Letter Ra
+    (0x009b2, 0x009b2,),  # Bengali Letter La
+    (0x009b6, 0x009b9,),  # Bengali Letter Sha      ..Bengali Letter Ha
+    (0x009dc, 0x009dd,),  # Bengali Letter Rra      ..Bengali Letter Rha
+    (0x009df, 0x009df,),  # Bengali Letter Yya
+    (0x009f0, 0x009f1,),  # Bengali Letter Ra With M..Bengali Letter Ra With L
+    (0x00a95, 0x00aa8,),  # Gujarati Letter Ka      ..Gujarati Letter Na
+    (0x00aaa, 0x00ab0,),  # Gujarati Letter Pa      ..Gujarati Letter Ra
+    (0x00ab2, 0x00ab3,),  # Gujarati Letter La      ..Gujarati Letter Lla
+    (0x00ab5, 0x00ab9,),  # Gujarati Letter Va      ..Gujarati Letter Ha
+    (0x00af9, 0x00af9,),  # Gujarati Letter Zha
+    (0x00b15, 0x00b28,),  # Oriya Letter Ka         ..Oriya Letter Na
+    (0x00b2a, 0x00b30,),  # Oriya Letter Pa         ..Oriya Letter Ra
+    (0x00b32, 0x00b33,),  # Oriya Letter La         ..Oriya Letter Lla
+    (0x00b35, 0x00b39,),  # Oriya Letter Va         ..Oriya Letter Ha
+    (0x00b5c, 0x00b5d,),  # Oriya Letter Rra        ..Oriya Letter Rha
+    (0x00b5f, 0x00b5f,),  # Oriya Letter Yya
+    (0x00b71, 0x00b71,),  # Oriya Letter Wa
+    (0x00c15, 0x00c28,),  # Telugu Letter Ka        ..Telugu Letter Na
+    (0x00c2a, 0x00c39,),  # Telugu Letter Pa        ..Telugu Letter Ha
+    (0x00c58, 0x00c5a,),  # Telugu Letter Tsa       ..Telugu Letter Rrra
+    (0x00d15, 0x00d3a,),  # Malayalam Letter Ka     ..Malayalam Letter Ttta
+    (0x01000, 0x0102a,),  # Myanmar Letter Ka       ..Myanmar Letter Au
+    (0x0103f, 0x0103f,),  # Myanmar Letter Great Sa
+    (0x01050, 0x01055,),  # Myanmar Letter Sha      ..Myanmar Letter Vocalic L
+    (0x0105a, 0x0105d,),  # Myanmar Letter Mon Nga  ..Myanmar Letter Mon Bbe
+    (0x01061, 0x01061,),  # Myanmar Letter Sgaw Karen Sha
+    (0x01065, 0x01066,),  # Myanmar Letter Western P..Myanmar Letter Western P
+    (0x0106e, 0x01070,),  # Myanmar Letter Eastern P..Myanmar Letter Eastern P
+    (0x01075, 0x01081,),  # Myanmar Letter Shan Ka  ..Myanmar Letter Shan Ha
+    (0x0108e, 0x0108e,),  # Myanmar Letter Rumai Palaung Fa
+    (0x01780, 0x017b3,),  # Khmer Letter Ka         ..Khmer Independent Vowel
+    (0x01a20, 0x01a54,),  # Tai Tham Letter High Ka ..Tai Tham Letter Great Sa
+    (0x01b0b, 0x01b0c,),  # Balinese Letter Ra Repa ..Balinese Letter Ra Repa
+    (0x01b13, 0x01b33,),  # Balinese Letter Ka      ..Balinese Letter Ha
+    (0x01b45, 0x01b4c,),  # Balinese Letter Kaf Sasa..Balinese Letter Archaic
+    (0x01b83, 0x01ba0,),  # Sundanese Letter A      ..Sundanese Letter Ha
+    (0x01bae, 0x01baf,),  # Sundanese Letter Kha    ..Sundanese Letter Sya
+    (0x01bbb, 0x01bbd,),  # Sundanese Letter Reu    ..Sundanese Letter Bha
+    (0x0a989, 0x0a98b,),  # Javanese Letter Pa Cerek..Javanese Letter Nga Lele
+    (0x0a98f, 0x0a9b2,),  # Javanese Letter Ka      ..Javanese Letter Ha
+    (0x0a9e0, 0x0a9e4,),  # Myanmar Letter Shan Gha ..Myanmar Letter Shan Bha
+    (0x0a9e7, 0x0a9ef,),  # Myanmar Letter Tai Laing..Myanmar Letter Tai Laing
+    (0x0a9fa, 0x0a9fe,),  # Myanmar Letter Tai Laing..Myanmar Letter Tai Laing
+    (0x0aa60, 0x0aa6f,),  # Myanmar Letter Khamti Ga..Myanmar Letter Khamti Fa
+    (0x0aa71, 0x0aa73,),  # Myanmar Letter Khamti Xa..Myanmar Letter Khamti Ra
+    (0x0aa7a, 0x0aa7a,),  # Myanmar Letter Aiton Ra
+    (0x0aa7e, 0x0aa7f,),  # Myanmar Letter Shwe Pala..Myanmar Letter Shwe Pala
+    (0x0aae0, 0x0aaea,),  # Meetei Mayek Letter E   ..Meetei Mayek Letter Ssa
+    (0x0abc0, 0x0abda,),  # Meetei Mayek Letter Kok ..Meetei Mayek Letter Bham
+    (0x10a00, 0x10a00,),  # Kharoshthi Letter A
+    (0x10a10, 0x10a13,),  # Kharoshthi Letter Ka    ..Kharoshthi Letter Gha
+    (0x10a15, 0x10a17,),  # Kharoshthi Letter Ca    ..Kharoshthi Letter Ja
+    (0x10a19, 0x10a35,),  # Kharoshthi Letter Nya   ..Kharoshthi Letter Vha
+    (0x11103, 0x11126,),  # Chakma Letter Aa        ..Chakma Letter Haa
+    (0x11144, 0x11144,),  # Chakma Letter Lhaa
+    (0x11147, 0x11147,),  # Chakma Letter Vaa
+    (0x11380, 0x11389,),  # Tulu-tigalari Letter A  ..Tulu-tigalari Letter Voc
+    (0x1138b, 0x1138b,),  # Tulu-tigalari Letter Ee
+    (0x1138e, 0x1138e,),  # Tulu-tigalari Letter Ai
+    (0x11390, 0x113b5,),  # Tulu-tigalari Letter Oo ..Tulu-tigalari Letter Lll
+    (0x11900, 0x11906,),  # Dives Akuru Letter A    ..Dives Akuru Letter E
+    (0x11909, 0x11909,),  # Dives Akuru Letter O
+    (0x1190c, 0x11913,),  # Dives Akuru Letter Ka   ..Dives Akuru Letter Ja
+    (0x11915, 0x11916,),  # Dives Akuru Letter Nya  ..Dives Akuru Letter Tta
+    (0x11918, 0x1192f,),  # Dives Akuru Letter Dda  ..Dives Akuru Letter Za
+    (0x11a00, 0x11a00,),  # Zanabazar Square Letter A
+    (0x11a0b, 0x11a32,),  # Zanabazar Square Letter ..Zanabazar Square Letter
+    (0x11a50, 0x11a50,),  # Soyombo Letter A
+    (0x11a5c, 0x11a83,),  # Soyombo Letter Ka       ..Soyombo Letter Kssa
+    (0x11f04, 0x11f10,),  # Kawi Letter A           ..Kawi Letter O
+    (0x11f12, 0x11f33,),  # Kawi Letter Ka          ..Kawi Letter Jnya
+)
+
+INCB_EXTEND = (
+    # Source: DerivedCoreProperties
+    # Date: see file
+    #
+    (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
+    (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
+    (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
+    (0x005bf, 0x005bf,),  # Hebrew Point Rafe
+    (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
+    (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
+    (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
+    (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
+    (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
+    (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
+    (0x006d6, 0x006dc,),  # Arabic Small High Ligatu..Arabic Small High Seen
+    (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
+    (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
+    (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
+    (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
+    (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
+    (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
+    (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
+    (0x007fd, 0x007fd,),  # Nko Dantayalan
+    (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
+    (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
+    (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
+    (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
+    (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
+    (0x00897, 0x0089f,),  # Arabic Pepet            ..Arabic Half Madda Over M
+    (0x008ca, 0x008e1,),  # Arabic Small High Farsi ..Arabic Small High Sign S
+    (0x008e3, 0x00902,),  # Arabic Turned Damma Belo..Devanagari Sign Anusvara
+    (0x0093a, 0x0093a,),  # Devanagari Vowel Sign Oe
+    (0x0093c, 0x0093c,),  # Devanagari Sign Nukta
+    (0x00941, 0x00948,),  # Devanagari Vowel Sign U ..Devanagari Vowel Sign Ai
+    (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
+    (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
+    (0x00981, 0x00981,),  # Bengali Sign Candrabindu
+    (0x009bc, 0x009bc,),  # Bengali Sign Nukta
+    (0x009be, 0x009be,),  # Bengali Vowel Sign Aa
+    (0x009c1, 0x009c4,),  # Bengali Vowel Sign U    ..Bengali Vowel Sign Vocal
+    (0x009d7, 0x009d7,),  # Bengali Au Length Mark
+    (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
+    (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
+    (0x00a01, 0x00a02,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Bindi
+    (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
+    (0x00a41, 0x00a42,),  # Gurmukhi Vowel Sign U   ..Gurmukhi Vowel Sign Uu
+    (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
+    (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
+    (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
+    (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
+    (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
+    (0x00a81, 0x00a82,),  # Gujarati Sign Candrabind..Gujarati Sign Anusvara
+    (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
+    (0x00ac1, 0x00ac5,),  # Gujarati Vowel Sign U   ..Gujarati Vowel Sign Cand
+    (0x00ac7, 0x00ac8,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Ai
+    (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
+    (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
+    (0x00b01, 0x00b01,),  # Oriya Sign Candrabindu
+    (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
+    (0x00b3e, 0x00b3f,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign I
+    (0x00b41, 0x00b44,),  # Oriya Vowel Sign U      ..Oriya Vowel Sign Vocalic
+    (0x00b55, 0x00b57,),  # Oriya Sign Overline     ..Oriya Au Length Mark
+    (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
+    (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
+    (0x00bbe, 0x00bbe,),  # Tamil Vowel Sign Aa
+    (0x00bc0, 0x00bc0,),  # Tamil Vowel Sign Ii
+    (0x00bcd, 0x00bcd,),  # Tamil Sign Virama
+    (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
+    (0x00c00, 0x00c00,),  # Telugu Sign Combining Candrabindu Above
+    (0x00c04, 0x00c04,),  # Telugu Sign Combining Anusvara Above
+    (0x00c3c, 0x00c3c,),  # Telugu Sign Nukta
+    (0x00c3e, 0x00c40,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Ii
+    (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
+    (0x00c4a, 0x00c4c,),  # Telugu Vowel Sign O     ..Telugu Vowel Sign Au
+    (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
+    (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
+    (0x00c81, 0x00c81,),  # Kannada Sign Candrabindu
+    (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
+    (0x00cbf, 0x00cc0,),  # Kannada Vowel Sign I    ..Kannada Vowel Sign Ii
+    (0x00cc2, 0x00cc2,),  # Kannada Vowel Sign Uu
+    (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
+    (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
+    (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
+    (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
+    (0x00d00, 0x00d01,),  # Malayalam Sign Combining..Malayalam Sign Candrabin
+    (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
+    (0x00d3e, 0x00d3e,),  # Malayalam Vowel Sign Aa
+    (0x00d41, 0x00d44,),  # Malayalam Vowel Sign U  ..Malayalam Vowel Sign Voc
+    (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
+    (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
+    (0x00d81, 0x00d81,),  # Sinhala Sign Candrabindu
+    (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
+    (0x00dcf, 0x00dcf,),  # Sinhala Vowel Sign Aela-pilla
+    (0x00dd2, 0x00dd4,),  # Sinhala Vowel Sign Ketti..Sinhala Vowel Sign Ketti
+    (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
+    (0x00ddf, 0x00ddf,),  # Sinhala Vowel Sign Gayanukitta
+    (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
+    (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
+    (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
+    (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
+    (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
+    (0x00ec8, 0x00ece,),  # Lao Tone Mai Ek         ..Lao Yamakkan
+    (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
+    (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
+    (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
+    (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
+    (0x00f71, 0x00f7e,),  # Tibetan Vowel Sign Aa   ..Tibetan Sign Rjes Su Nga
+    (0x00f80, 0x00f84,),  # Tibetan Vowel Sign Rever..Tibetan Mark Halanta
+    (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
+    (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
+    (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
+    (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
+    (0x0102d, 0x01030,),  # Myanmar Vowel Sign I    ..Myanmar Vowel Sign Uu
+    (0x01032, 0x01037,),  # Myanmar Vowel Sign Ai   ..Myanmar Sign Dot Below
+    (0x0103a, 0x0103a,),  # Myanmar Sign Asat
+    (0x0103d, 0x0103e,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
+    (0x01058, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
+    (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
+    (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
+    (0x01082, 0x01082,),  # Myanmar Consonant Sign Shan Medial Wa
+    (0x01085, 0x01086,),  # Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
+    (0x0108d, 0x0108d,),  # Myanmar Sign Shan Council Emphatic Tone
+    (0x0109d, 0x0109d,),  # Myanmar Vowel Sign Aiton Ai
+    (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
+    (0x01712, 0x01715,),  # Tagalog Vowel Sign I    ..Tagalog Sign Pamudpod
+    (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
+    (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
+    (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
+    (0x017b4, 0x017b5,),  # Khmer Vowel Inherent Aq ..Khmer Vowel Inherent Aa
+    (0x017b7, 0x017bd,),  # Khmer Vowel Sign I      ..Khmer Vowel Sign Ua
+    (0x017c6, 0x017c6,),  # Khmer Sign Nikahit
+    (0x017c9, 0x017d1,),  # Khmer Sign Muusikatoan  ..Khmer Sign Viriam
+    (0x017d3, 0x017d3,),  # Khmer Sign Bathamasat
+    (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
+    (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
+    (0x0180f, 0x0180f,),  # Mongolian Free Variation Selector Four
+    (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
+    (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
+    (0x01920, 0x01922,),  # Limbu Vowel Sign A      ..Limbu Vowel Sign U
+    (0x01927, 0x01928,),  # Limbu Vowel Sign E      ..Limbu Vowel Sign O
+    (0x01932, 0x01932,),  # Limbu Small Letter Anusvara
+    (0x01939, 0x0193b,),  # Limbu Sign Mukphreng    ..Limbu Sign Sa-i
+    (0x01a17, 0x01a18,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign U
+    (0x01a1b, 0x01a1b,),  # Buginese Vowel Sign Ae
+    (0x01a56, 0x01a56,),  # Tai Tham Consonant Sign Medial La
+    (0x01a58, 0x01a5e,),  # Tai Tham Sign Mai Kang L..Tai Tham Consonant Sign
+    (0x01a62, 0x01a62,),  # Tai Tham Vowel Sign Mai Sat
+    (0x01a65, 0x01a6c,),  # Tai Tham Vowel Sign I   ..Tai Tham Vowel Sign Oa B
+    (0x01a73, 0x01a7c,),  # Tai Tham Vowel Sign Oa A..Tai Tham Sign Khuen-lue
+    (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
+    (0x01ab0, 0x01add,),  # Combining Doubled Circum..Combining Dot-and-ring B
+    (0x01ae0, 0x01aeb,),  # Combining Left Tack Abov..Combining Double Rightwa
+    (0x01b00, 0x01b03,),  # Balinese Sign Ulu Ricem ..Balinese Sign Surang
+    (0x01b34, 0x01b3d,),  # Balinese Sign Rerekan   ..Balinese Vowel Sign La L
+    (0x01b42, 0x01b43,),  # Balinese Vowel Sign Pepe..Balinese Vowel Sign Pepe
+    (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
+    (0x01b80, 0x01b81,),  # Sundanese Sign Panyecek ..Sundanese Sign Panglayar
+    (0x01ba2, 0x01ba5,),  # Sundanese Consonant Sign..Sundanese Vowel Sign Pan
+    (0x01ba8, 0x01baa,),  # Sundanese Vowel Sign Pam..Sundanese Sign Pamaaeh
+    (0x01bac, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
+    (0x01be6, 0x01be6,),  # Batak Sign Tompi
+    (0x01be8, 0x01be9,),  # Batak Vowel Sign Pakpak ..Batak Vowel Sign Ee
+    (0x01bed, 0x01bed,),  # Batak Vowel Sign Karo O
+    (0x01bef, 0x01bf3,),  # Batak Vowel Sign U For S..Batak Panongonan
+    (0x01c2c, 0x01c33,),  # Lepcha Vowel Sign E     ..Lepcha Consonant Sign T
+    (0x01c36, 0x01c37,),  # Lepcha Sign Ran         ..Lepcha Sign Nukta
+    (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
+    (0x01cd4, 0x01ce0,),  # Vedic Sign Yajurvedic Mi..Vedic Tone Rigvedic Kash
+    (0x01ce2, 0x01ce8,),  # Vedic Sign Visarga Svari..Vedic Sign Visarga Anuda
+    (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
+    (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
+    (0x01cf8, 0x01cf9,),  # Vedic Tone Ring Above   ..Vedic Tone Double Ring A
+    (0x01dc0, 0x01dff,),  # Combining Dotted Grave A..Combining Right Arrowhea
+    (0x0200d, 0x0200d,),  # Zero Width Joiner
+    (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
+    (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
+    (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
+    (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
+    (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
+    (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
+    (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
+    (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
+    (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
+    (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
+    (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
+    (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
+    (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
+    (0x0a825, 0x0a826,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
+    (0x0a82c, 0x0a82c,),  # Syloti Nagri Sign Alternate Hasanta
+    (0x0a8c4, 0x0a8c5,),  # Saurashtra Sign Virama  ..Saurashtra Sign Candrabi
+    (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
+    (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
+    (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
+    (0x0a947, 0x0a951,),  # Rejang Vowel Sign I     ..Rejang Consonant Sign R
+    (0x0a953, 0x0a953,),  # Rejang Virama
+    (0x0a980, 0x0a982,),  # Javanese Sign Panyangga ..Javanese Sign Layar
+    (0x0a9b3, 0x0a9b3,),  # Javanese Sign Cecak Telu
+    (0x0a9b6, 0x0a9b9,),  # Javanese Vowel Sign Wulu..Javanese Vowel Sign Suku
+    (0x0a9bc, 0x0a9bd,),  # Javanese Vowel Sign Pepe..Javanese Consonant Sign
+    (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
+    (0x0aa29, 0x0aa2e,),  # Cham Vowel Sign Aa      ..Cham Vowel Sign Oe
+    (0x0aa31, 0x0aa32,),  # Cham Vowel Sign Au      ..Cham Vowel Sign Ue
+    (0x0aa35, 0x0aa36,),  # Cham Consonant Sign La  ..Cham Consonant Sign Wa
+    (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
+    (0x0aa4c, 0x0aa4c,),  # Cham Consonant Sign Final M
+    (0x0aa7c, 0x0aa7c,),  # Myanmar Sign Tai Laing Tone-2
+    (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
+    (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
+    (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
+    (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
+    (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
+    (0x0aaec, 0x0aaed,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+    (0x0abe5, 0x0abe5,),  # Meetei Mayek Vowel Sign Anap
+    (0x0abe8, 0x0abe8,),  # Meetei Mayek Vowel Sign Unap
+    (0x0abed, 0x0abed,),  # Meetei Mayek Apun Iyek
+    (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
+    (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
+    (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
+    (0x0ff9e, 0x0ff9f,),  # Halfwidth Katakana Voice..Halfwidth Katakana Semi-
+    (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
+    (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
+    (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
+    (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
+    (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
+    (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
+    (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
+    (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
+    (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
+    (0x10d69, 0x10d6d,),  # Garay Vowel Sign E      ..Garay Consonant Nasaliza
+    (0x10eab, 0x10eac,),  # Yezidi Combining Hamza M..Yezidi Combining Madda M
+    (0x10efa, 0x10eff,),  # Arabic Double Vertical B..Arabic Small Low Word Ma
+    (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
+    (0x10f82, 0x10f85,),  # Old Uyghur Combining Dot..Old Uyghur Combining Two
+    (0x11001, 0x11001,),  # Brahmi Sign Anusvara
+    (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
+    (0x11070, 0x11070,),  # Brahmi Sign Old Tamil Virama
+    (0x11073, 0x11074,),  # Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta
+    (0x1107f, 0x11081,),  # Brahmi Number Joiner    ..Kaithi Sign Anusvara
+    (0x110b3, 0x110b6,),  # Kaithi Vowel Sign U     ..Kaithi Vowel Sign Ai
+    (0x110b9, 0x110ba,),  # Kaithi Sign Virama      ..Kaithi Sign Nukta
+    (0x110c2, 0x110c2,),  # Kaithi Vowel Sign Vocalic R
+    (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
+    (0x11127, 0x1112b,),  # Chakma Vowel Sign A     ..Chakma Vowel Sign Uu
+    (0x1112d, 0x11132,),  # Chakma Vowel Sign Ai    ..Chakma Au Mark
+    (0x11134, 0x11134,),  # Chakma Maayyaa
+    (0x11173, 0x11173,),  # Mahajani Sign Nukta
+    (0x11180, 0x11181,),  # Sharada Sign Candrabindu..Sharada Sign Anusvara
+    (0x111b6, 0x111be,),  # Sharada Vowel Sign U    ..Sharada Vowel Sign O
+    (0x111c0, 0x111c0,),  # Sharada Sign Virama
+    (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
+    (0x111cf, 0x111cf,),  # Sharada Sign Inverted Candrabindu
+    (0x1122f, 0x11231,),  # Khojki Vowel Sign U     ..Khojki Vowel Sign Ai
+    (0x11234, 0x11237,),  # Khojki Sign Anusvara    ..Khojki Sign Shadda
+    (0x1123e, 0x1123e,),  # Khojki Sign Sukun
+    (0x11241, 0x11241,),  # Khojki Vowel Sign Vocalic R
+    (0x112df, 0x112df,),  # Khudawadi Sign Anusvara
+    (0x112e3, 0x112ea,),  # Khudawadi Vowel Sign U  ..Khudawadi Sign Virama
+    (0x11300, 0x11301,),  # Grantha Sign Combining A..Grantha Sign Candrabindu
+    (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
+    (0x1133e, 0x1133e,),  # Grantha Vowel Sign Aa
+    (0x11340, 0x11340,),  # Grantha Vowel Sign Ii
+    (0x1134d, 0x1134d,),  # Grantha Sign Virama
+    (0x11357, 0x11357,),  # Grantha Au Length Mark
+    (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
+    (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
+    (0x113b8, 0x113b8,),  # Tulu-tigalari Vowel Sign Aa
+    (0x113bb, 0x113c0,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Vowel Sign
+    (0x113c2, 0x113c2,),  # Tulu-tigalari Vowel Sign Ee
+    (0x113c5, 0x113c5,),  # Tulu-tigalari Vowel Sign Ai
+    (0x113c7, 0x113c9,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Au Length
+    (0x113ce, 0x113cf,),  # Tulu-tigalari Sign Viram..Tulu-tigalari Sign Loope
+    (0x113d2, 0x113d2,),  # Tulu-tigalari Gemination Mark
+    (0x113e1, 0x113e2,),  # Tulu-tigalari Vedic Tone..Tulu-tigalari Vedic Tone
+    (0x11438, 0x1143f,),  # Newa Vowel Sign U       ..Newa Vowel Sign Ai
+    (0x11442, 0x11444,),  # Newa Sign Virama        ..Newa Sign Anusvara
+    (0x11446, 0x11446,),  # Newa Sign Nukta
+    (0x1145e, 0x1145e,),  # Newa Sandhi Mark
+    (0x114b0, 0x114b0,),  # Tirhuta Vowel Sign Aa
+    (0x114b3, 0x114b8,),  # Tirhuta Vowel Sign U    ..Tirhuta Vowel Sign Vocal
+    (0x114ba, 0x114ba,),  # Tirhuta Vowel Sign Short E
+    (0x114bd, 0x114bd,),  # Tirhuta Vowel Sign Short O
+    (0x114bf, 0x114c0,),  # Tirhuta Sign Candrabindu..Tirhuta Sign Anusvara
+    (0x114c2, 0x114c3,),  # Tirhuta Sign Virama     ..Tirhuta Sign Nukta
+    (0x115af, 0x115af,),  # Siddham Vowel Sign Aa
+    (0x115b2, 0x115b5,),  # Siddham Vowel Sign U    ..Siddham Vowel Sign Vocal
+    (0x115bc, 0x115bd,),  # Siddham Sign Candrabindu..Siddham Sign Anusvara
+    (0x115bf, 0x115c0,),  # Siddham Sign Virama     ..Siddham Sign Nukta
+    (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
+    (0x11633, 0x1163a,),  # Modi Vowel Sign U       ..Modi Vowel Sign Ai
+    (0x1163d, 0x1163d,),  # Modi Sign Anusvara
+    (0x1163f, 0x11640,),  # Modi Sign Virama        ..Modi Sign Ardhacandra
+    (0x116ab, 0x116ab,),  # Takri Sign Anusvara
+    (0x116ad, 0x116ad,),  # Takri Vowel Sign Aa
+    (0x116b0, 0x116b7,),  # Takri Vowel Sign U      ..Takri Sign Nukta
+    (0x1171d, 0x1171d,),  # Ahom Consonant Sign Medial La
+    (0x1171f, 0x1171f,),  # Ahom Consonant Sign Medial Ligating Ra
+    (0x11722, 0x11725,),  # Ahom Vowel Sign I       ..Ahom Vowel Sign Uu
+    (0x11727, 0x1172b,),  # Ahom Vowel Sign Aw      ..Ahom Sign Killer
+    (0x1182f, 0x11837,),  # Dogra Vowel Sign U      ..Dogra Sign Anusvara
+    (0x11839, 0x1183a,),  # Dogra Sign Virama       ..Dogra Sign Nukta
+    (0x11930, 0x11930,),  # Dives Akuru Vowel Sign Aa
+    (0x1193b, 0x1193d,),  # Dives Akuru Sign Anusvar..Dives Akuru Sign Halanta
+    (0x11943, 0x11943,),  # Dives Akuru Sign Nukta
+    (0x119d4, 0x119d7,),  # Nandinagari Vowel Sign U..Nandinagari Vowel Sign V
+    (0x119da, 0x119db,),  # Nandinagari Vowel Sign E..Nandinagari Vowel Sign A
+    (0x119e0, 0x119e0,),  # Nandinagari Sign Virama
+    (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
+    (0x11a33, 0x11a38,),  # Zanabazar Square Final C..Zanabazar Square Sign An
+    (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
+    (0x11a51, 0x11a56,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Sign Oe
+    (0x11a59, 0x11a5b,),  # Soyombo Vowel Sign Vocal..Soyombo Vowel Length Mar
+    (0x11a8a, 0x11a96,),  # Soyombo Final Consonant ..Soyombo Sign Anusvara
+    (0x11a98, 0x11a98,),  # Soyombo Gemination Mark
+    (0x11b60, 0x11b60,),  # Sharada Vowel Sign Oe
+    (0x11b62, 0x11b64,),  # Sharada Vowel Sign Ue   ..Sharada Vowel Sign Short
+    (0x11b66, 0x11b66,),  # Sharada Vowel Sign Candra E
+    (0x11c30, 0x11c36,),  # Bhaiksuki Vowel Sign I  ..Bhaiksuki Vowel Sign Voc
+    (0x11c38, 0x11c3d,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Anusvara
+    (0x11c3f, 0x11c3f,),  # Bhaiksuki Sign Virama
+    (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
+    (0x11caa, 0x11cb0,),  # Marchen Subjoined Letter..Marchen Vowel Sign Aa
+    (0x11cb2, 0x11cb3,),  # Marchen Vowel Sign U    ..Marchen Vowel Sign E
+    (0x11cb5, 0x11cb6,),  # Marchen Sign Anusvara   ..Marchen Sign Candrabindu
+    (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+    (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
+    (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
+    (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
+    (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
+    (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+    (0x11d95, 0x11d95,),  # Gunjala Gondi Sign Anusvara
+    (0x11d97, 0x11d97,),  # Gunjala Gondi Virama
+    (0x11ef3, 0x11ef4,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign U
+    (0x11f00, 0x11f01,),  # Kawi Sign Candrabindu   ..Kawi Sign Anusvara
+    (0x11f36, 0x11f3a,),  # Kawi Vowel Sign I       ..Kawi Vowel Sign Vocalic
+    (0x11f40, 0x11f41,),  # Kawi Vowel Sign Eu      ..Kawi Sign Killer
+    (0x11f5a, 0x11f5a,),  # Kawi Sign Nukta
+    (0x13440, 0x13440,),  # Egyptian Hieroglyph Mirror Horizontally
+    (0x13447, 0x13455,),  # Egyptian Hieroglyph Modi..Egyptian Hieroglyph Modi
+    (0x1611e, 0x16129,),  # Gurung Khema Vowel Sign ..Gurung Khema Vowel Lengt
+    (0x1612d, 0x1612f,),  # Gurung Khema Sign Anusva..Gurung Khema Sign Tholho
+    (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
+    (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
+    (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
+    (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
+    (0x16fe4, 0x16fe4,),  # Khitan Small Script Filler
+    (0x16ff0, 0x16ff1,),  # Vietnamese Alternate Rea..Vietnamese Alternate Rea
+    (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
+    (0x1cf00, 0x1cf2d,),  # Znamenny Combining Mark ..Znamenny Combining Mark
+    (0x1cf30, 0x1cf46,),  # Znamenny Combining Tonal..Znamenny Priznak Modifie
+    (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d16d, 0x1d172,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d17b, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
+    (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
+    (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
+    (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
+    (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
+    (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
+    (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
+    (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
+    (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
+    (0x1e08f, 0x1e08f,),  # Combining Cyrillic Small Letter Byelorussian-ukr
+    (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
+    (0x1e2ae, 0x1e2ae,),  # Toto Sign Rising Tone
+    (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
+    (0x1e4ec, 0x1e4ef,),  # Nag Mundari Sign Muhor  ..Nag Mundari Sign Sutuh
+    (0x1e5ee, 0x1e5ef,),  # Ol Onal Sign Mu         ..Ol Onal Sign Ikir
+    (0x1e6e3, 0x1e6e3,),  # Tai Yo Sign Ue
+    (0x1e6e6, 0x1e6e6,),  # Tai Yo Sign Au
+    (0x1e6ee, 0x1e6ef,),  # Tai Yo Sign Ay          ..Tai Yo Sign Ang
+    (0x1e6f5, 0x1e6f5,),  # Tai Yo Sign Om
+    (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
+    (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
+    (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
+    (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
+    (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
+)
+
+ISC_CONSONANT = (
+    # Source: IndicSyllabicCategory
+    # Date: see file
+    #
+    (0x00915, 0x00939,),  # Devanagari Letter Ka    ..Devanagari Letter Ha
+    (0x00958, 0x0095f,),  # Devanagari Letter Qa    ..Devanagari Letter Yya
+    (0x00978, 0x0097f,),  # Devanagari Letter Marwar..Devanagari Letter Bba
+    (0x00995, 0x009a8,),  # Bengali Letter Ka       ..Bengali Letter Na
+    (0x009aa, 0x009b0,),  # Bengali Letter Pa       ..Bengali Letter Ra
+    (0x009b2, 0x009b2,),  # Bengali Letter La
+    (0x009b6, 0x009b9,),  # Bengali Letter Sha      ..Bengali Letter Ha
+    (0x009dc, 0x009dd,),  # Bengali Letter Rra      ..Bengali Letter Rha
+    (0x009df, 0x009df,),  # Bengali Letter Yya
+    (0x009f0, 0x009f1,),  # Bengali Letter Ra With M..Bengali Letter Ra With L
+    (0x00a15, 0x00a28,),  # Gurmukhi Letter Ka      ..Gurmukhi Letter Na
+    (0x00a2a, 0x00a30,),  # Gurmukhi Letter Pa      ..Gurmukhi Letter Ra
+    (0x00a32, 0x00a33,),  # Gurmukhi Letter La      ..Gurmukhi Letter Lla
+    (0x00a35, 0x00a36,),  # Gurmukhi Letter Va      ..Gurmukhi Letter Sha
+    (0x00a38, 0x00a39,),  # Gurmukhi Letter Sa      ..Gurmukhi Letter Ha
+    (0x00a59, 0x00a5c,),  # Gurmukhi Letter Khha    ..Gurmukhi Letter Rra
+    (0x00a5e, 0x00a5e,),  # Gurmukhi Letter Fa
+    (0x00a95, 0x00aa8,),  # Gujarati Letter Ka      ..Gujarati Letter Na
+    (0x00aaa, 0x00ab0,),  # Gujarati Letter Pa      ..Gujarati Letter Ra
+    (0x00ab2, 0x00ab3,),  # Gujarati Letter La      ..Gujarati Letter Lla
+    (0x00ab5, 0x00ab9,),  # Gujarati Letter Va      ..Gujarati Letter Ha
+    (0x00af9, 0x00af9,),  # Gujarati Letter Zha
+    (0x00b15, 0x00b28,),  # Oriya Letter Ka         ..Oriya Letter Na
+    (0x00b2a, 0x00b30,),  # Oriya Letter Pa         ..Oriya Letter Ra
+    (0x00b32, 0x00b33,),  # Oriya Letter La         ..Oriya Letter Lla
+    (0x00b35, 0x00b39,),  # Oriya Letter Va         ..Oriya Letter Ha
+    (0x00b5c, 0x00b5d,),  # Oriya Letter Rra        ..Oriya Letter Rha
+    (0x00b5f, 0x00b5f,),  # Oriya Letter Yya
+    (0x00b71, 0x00b71,),  # Oriya Letter Wa
+    (0x00b95, 0x00b95,),  # Tamil Letter Ka
+    (0x00b99, 0x00b9a,),  # Tamil Letter Nga        ..Tamil Letter Ca
+    (0x00b9c, 0x00b9c,),  # Tamil Letter Ja
+    (0x00b9e, 0x00b9f,),  # Tamil Letter Nya        ..Tamil Letter Tta
+    (0x00ba3, 0x00ba4,),  # Tamil Letter Nna        ..Tamil Letter Ta
+    (0x00ba8, 0x00baa,),  # Tamil Letter Na         ..Tamil Letter Pa
+    (0x00bae, 0x00bb9,),  # Tamil Letter Ma         ..Tamil Letter Ha
+    (0x00c15, 0x00c28,),  # Telugu Letter Ka        ..Telugu Letter Na
+    (0x00c2a, 0x00c39,),  # Telugu Letter Pa        ..Telugu Letter Ha
+    (0x00c58, 0x00c5a,),  # Telugu Letter Tsa       ..Telugu Letter Rrra
+    (0x00c95, 0x00ca8,),  # Kannada Letter Ka       ..Kannada Letter Na
+    (0x00caa, 0x00cb3,),  # Kannada Letter Pa       ..Kannada Letter Lla
+    (0x00cb5, 0x00cb9,),  # Kannada Letter Va       ..Kannada Letter Ha
+    (0x00cde, 0x00cde,),  # Kannada Letter Fa
+    (0x00d15, 0x00d3a,),  # Malayalam Letter Ka     ..Malayalam Letter Ttta
+    (0x00d9a, 0x00db1,),  # Sinhala Letter Alpapraan..Sinhala Letter Dantaja N
+    (0x00db3, 0x00dbb,),  # Sinhala Letter Sanyaka D..Sinhala Letter Rayanna
+    (0x00dbd, 0x00dbd,),  # Sinhala Letter Dantaja Layanna
+    (0x00dc0, 0x00dc6,),  # Sinhala Letter Vayanna  ..Sinhala Letter Fayanna
+    (0x00e01, 0x00e2e,),  # Thai Character Ko Kai   ..Thai Character Ho Nokhuk
+    (0x00e81, 0x00e82,),  # Lao Letter Ko           ..Lao Letter Kho Sung
+    (0x00e84, 0x00e84,),  # Lao Letter Kho Tam
+    (0x00e86, 0x00e8a,),  # Lao Letter Pali Gha     ..Lao Letter So Tam
+    (0x00e8c, 0x00ea3,),  # Lao Letter Pali Jha     ..Lao Letter Lo Ling
+    (0x00ea5, 0x00ea5,),  # Lao Letter Lo Loot
+    (0x00ea7, 0x00eae,),  # Lao Letter Wo           ..Lao Letter Ho Tam
+    (0x00edc, 0x00edf,),  # Lao Ho No               ..Lao Letter Khmu Nyo
+    (0x00f40, 0x00f47,),  # Tibetan Letter Ka       ..Tibetan Letter Ja
+    (0x00f49, 0x00f6c,),  # Tibetan Letter Nya      ..Tibetan Letter Rra
+    (0x01000, 0x01020,),  # Myanmar Letter Ka       ..Myanmar Letter Lla
+    (0x0103f, 0x0103f,),  # Myanmar Letter Great Sa
+    (0x01050, 0x01051,),  # Myanmar Letter Sha      ..Myanmar Letter Ssa
+    (0x0105a, 0x0105d,),  # Myanmar Letter Mon Nga  ..Myanmar Letter Mon Bbe
+    (0x01061, 0x01061,),  # Myanmar Letter Sgaw Karen Sha
+    (0x01065, 0x01066,),  # Myanmar Letter Western P..Myanmar Letter Western P
+    (0x0106e, 0x01070,),  # Myanmar Letter Eastern P..Myanmar Letter Eastern P
+    (0x01075, 0x01081,),  # Myanmar Letter Shan Ka  ..Myanmar Letter Shan Ha
+    (0x0108e, 0x0108e,),  # Myanmar Letter Rumai Palaung Fa
+    (0x01703, 0x01711,),  # Tagalog Letter Ka       ..Tagalog Letter Ha
+    (0x0171f, 0x0171f,),  # Tagalog Letter Archaic Ra
+    (0x01723, 0x01731,),  # Hanunoo Letter Ka       ..Hanunoo Letter Ha
+    (0x01743, 0x01751,),  # Buhid Letter Ka         ..Buhid Letter Ha
+    (0x01763, 0x0176c,),  # Tagbanwa Letter Ka      ..Tagbanwa Letter Ya
+    (0x0176e, 0x01770,),  # Tagbanwa Letter La      ..Tagbanwa Letter Sa
+    (0x01780, 0x017a2,),  # Khmer Letter Ka         ..Khmer Letter Qa
+    (0x01900, 0x0191e,),  # Limbu Vowel-carrier Lett..Limbu Letter Tra
+    (0x01950, 0x01962,),  # Tai Le Letter Ka        ..Tai Le Letter Na
+    (0x01980, 0x019ab,),  # New Tai Lue Letter High ..New Tai Lue Letter Low S
+    (0x01a00, 0x01a16,),  # Buginese Letter Ka      ..Buginese Letter Ha
+    (0x01a20, 0x01a4c,),  # Tai Tham Letter High Ka ..Tai Tham Letter Low Ha
+    (0x01a53, 0x01a54,),  # Tai Tham Letter Lae     ..Tai Tham Letter Great Sa
+    (0x01b13, 0x01b33,),  # Balinese Letter Ka      ..Balinese Letter Ha
+    (0x01b45, 0x01b4c,),  # Balinese Letter Kaf Sasa..Balinese Letter Archaic
+    (0x01b8a, 0x01ba0,),  # Sundanese Letter Ka     ..Sundanese Letter Ha
+    (0x01bae, 0x01baf,),  # Sundanese Letter Kha    ..Sundanese Letter Sya
+    (0x01bbb, 0x01bbd,),  # Sundanese Letter Reu    ..Sundanese Letter Bha
+    (0x01bc0, 0x01be3,),  # Batak Letter A          ..Batak Letter Mba
+    (0x01c00, 0x01c23,),  # Lepcha Letter Ka        ..Lepcha Letter A
+    (0x01c4d, 0x01c4f,),  # Lepcha Letter Tta       ..Lepcha Letter Dda
+    (0x0a807, 0x0a80a,),  # Syloti Nagri Letter Ko  ..Syloti Nagri Letter Gho
+    (0x0a80c, 0x0a822,),  # Syloti Nagri Letter Co  ..Syloti Nagri Letter Ho
+    (0x0a840, 0x0a85d,),  # Phags-pa Letter Ka      ..Phags-pa Letter A
+    (0x0a862, 0x0a865,),  # Phags-pa Letter Qa      ..Phags-pa Letter Gga
+    (0x0a869, 0x0a870,),  # Phags-pa Letter Tta     ..Phags-pa Letter Aspirate
+    (0x0a872, 0x0a872,),  # Phags-pa Superfixed Letter Ra
+    (0x0a892, 0x0a8b3,),  # Saurashtra Letter Ka    ..Saurashtra Letter Lla
+    (0x0a90a, 0x0a921,),  # Kayah Li Letter Ka      ..Kayah Li Letter Ca
+    (0x0a930, 0x0a946,),  # Rejang Letter Ka        ..Rejang Letter A
+    (0x0a989, 0x0a98b,),  # Javanese Letter Pa Cerek..Javanese Letter Nga Lele
+    (0x0a98f, 0x0a9b2,),  # Javanese Letter Ka      ..Javanese Letter Ha
+    (0x0a9e0, 0x0a9e4,),  # Myanmar Letter Shan Gha ..Myanmar Letter Shan Bha
+    (0x0a9e7, 0x0a9ef,),  # Myanmar Letter Tai Laing..Myanmar Letter Tai Laing
+    (0x0a9fa, 0x0a9fe,),  # Myanmar Letter Tai Laing..Myanmar Letter Tai Laing
+    (0x0aa06, 0x0aa28,),  # Cham Letter Ka          ..Cham Letter Ha
+    (0x0aa60, 0x0aa6f,),  # Myanmar Letter Khamti Ga..Myanmar Letter Khamti Fa
+    (0x0aa71, 0x0aa73,),  # Myanmar Letter Khamti Xa..Myanmar Letter Khamti Ra
+    (0x0aa7a, 0x0aa7a,),  # Myanmar Letter Aiton Ra
+    (0x0aa7e, 0x0aaaf,),  # Myanmar Letter Shwe Pala..Tai Viet Letter High O
+    (0x0aae2, 0x0aaea,),  # Meetei Mayek Letter Cha ..Meetei Mayek Letter Ssa
+    (0x0abc0, 0x0abcd,),  # Meetei Mayek Letter Kok ..Meetei Mayek Letter Huk
+    (0x0abd0, 0x0abd0,),  # Meetei Mayek Letter Pham
+    (0x0abd2, 0x0abda,),  # Meetei Mayek Letter Gok ..Meetei Mayek Letter Bham
+    (0x10a00, 0x10a00,),  # Kharoshthi Letter A
+    (0x10a10, 0x10a13,),  # Kharoshthi Letter Ka    ..Kharoshthi Letter Gha
+    (0x10a15, 0x10a17,),  # Kharoshthi Letter Ca    ..Kharoshthi Letter Ja
+    (0x10a19, 0x10a35,),  # Kharoshthi Letter Nya   ..Kharoshthi Letter Vha
+    (0x11013, 0x11037,),  # Brahmi Letter Ka        ..Brahmi Letter Old Tamil
+    (0x11075, 0x11075,),  # Brahmi Letter Old Tamil Lla
+    (0x1108d, 0x110af,),  # Kaithi Letter Ka        ..Kaithi Letter Ha
+    (0x11107, 0x11126,),  # Chakma Letter Kaa       ..Chakma Letter Haa
+    (0x11144, 0x11144,),  # Chakma Letter Lhaa
+    (0x11147, 0x11147,),  # Chakma Letter Vaa
+    (0x11155, 0x11172,),  # Mahajani Letter Ka      ..Mahajani Letter Rra
+    (0x11191, 0x111b2,),  # Sharada Letter Ka       ..Sharada Letter Ha
+    (0x11208, 0x11211,),  # Khojki Letter Ka        ..Khojki Letter Jja
+    (0x11213, 0x1122b,),  # Khojki Letter Nya       ..Khojki Letter Lla
+    (0x1123f, 0x1123f,),  # Khojki Letter Qa
+    (0x11284, 0x11286,),  # Multani Letter Ka       ..Multani Letter Ga
+    (0x11288, 0x11288,),  # Multani Letter Gha
+    (0x1128a, 0x1128d,),  # Multani Letter Ca       ..Multani Letter Jja
+    (0x1128f, 0x1129d,),  # Multani Letter Nya      ..Multani Letter Ba
+    (0x1129f, 0x112a8,),  # Multani Letter Bha      ..Multani Letter Rha
+    (0x112ba, 0x112de,),  # Khudawadi Letter Ka     ..Khudawadi Letter Ha
+    (0x11315, 0x11328,),  # Grantha Letter Ka       ..Grantha Letter Na
+    (0x1132a, 0x11330,),  # Grantha Letter Pa       ..Grantha Letter Ra
+    (0x11332, 0x11333,),  # Grantha Letter La       ..Grantha Letter Lla
+    (0x11335, 0x11339,),  # Grantha Letter Va       ..Grantha Letter Ha
+    (0x11392, 0x113b5,),  # Tulu-tigalari Letter Ka ..Tulu-tigalari Letter Lll
+    (0x1140e, 0x11434,),  # Newa Letter Ka          ..Newa Letter Ha
+    (0x1148f, 0x114af,),  # Tirhuta Letter Ka       ..Tirhuta Letter Ha
+    (0x1158e, 0x115ae,),  # Siddham Letter Ka       ..Siddham Letter Ha
+    (0x1160e, 0x1162f,),  # Modi Letter Ka          ..Modi Letter Lla
+    (0x1168a, 0x116aa,),  # Takri Letter Ka         ..Takri Letter Rra
+    (0x116b8, 0x116b8,),  # Takri Letter Archaic Kha
+    (0x11700, 0x1171a,),  # Ahom Letter Ka          ..Ahom Letter Alternate Ba
+    (0x11740, 0x11746,),  # Ahom Letter Ca          ..Ahom Letter Lla
+    (0x1180a, 0x1182b,),  # Dogra Letter Ka         ..Dogra Letter Rra
+    (0x1190c, 0x11913,),  # Dives Akuru Letter Ka   ..Dives Akuru Letter Ja
+    (0x11915, 0x11916,),  # Dives Akuru Letter Nya  ..Dives Akuru Letter Tta
+    (0x11918, 0x1192f,),  # Dives Akuru Letter Dda  ..Dives Akuru Letter Za
+    (0x119ae, 0x119d0,),  # Nandinagari Letter Ka   ..Nandinagari Letter Rra
+    (0x11a00, 0x11a00,),  # Zanabazar Square Letter A
+    (0x11a0b, 0x11a32,),  # Zanabazar Square Letter ..Zanabazar Square Letter
+    (0x11a50, 0x11a50,),  # Soyombo Letter A
+    (0x11a5c, 0x11a83,),  # Soyombo Letter Ka       ..Soyombo Letter Kssa
+    (0x11c0e, 0x11c2e,),  # Bhaiksuki Letter Ka     ..Bhaiksuki Letter Ha
+    (0x11c72, 0x11c8f,),  # Marchen Letter Ka       ..Marchen Letter A
+    (0x11d0c, 0x11d30,),  # Masaram Gondi Letter Ka ..Masaram Gondi Letter Tra
+    (0x11d6c, 0x11d89,),  # Gunjala Gondi Letter Ya ..Gunjala Gondi Letter Sa
+    (0x11ee0, 0x11ef1,),  # Makasar Letter Ka       ..Makasar Letter A
+    (0x11f12, 0x11f33,),  # Kawi Letter Ka          ..Kawi Letter Jnya
+    (0x16101, 0x1611d,),  # Gurung Khema Letter Ka  ..Gurung Khema Letter Sa
+    (0x16d43, 0x16d62,),  # Kirat Rai Letter A      ..Kirat Rai Letter Ha
+)
diff --git a/libs/wcwidth/table_mc.py b/libs/wcwidth/table_mc.py
new file mode 100644
index 0000000000..7c2e691592
--- /dev/null
+++ b/libs/wcwidth/table_mc.py
@@ -0,0 +1,206 @@
+"""
+Exports CATEGORY_MC table keyed by supporting unicode version level.
+
+This code generated by wcwidth/bin/update-tables.py on 2026-01-29 00:47:54 UTC.
+"""
+# pylint: disable=duplicate-code
+CATEGORY_MC = {
+    '17.0.0': (
+        # Source: DerivedGeneralCategory-17.0.0.txt
+        # Date: 2025-07-24, 00:12:50 GMT
+        #
+        (0x00903, 0x00903,),  # Devanagari Sign Visarga
+        (0x0093b, 0x0093b,),  # Devanagari Vowel Sign Ooe
+        (0x0093e, 0x00940,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Ii
+        (0x00949, 0x0094c,),  # Devanagari Vowel Sign Ca..Devanagari Vowel Sign Au
+        (0x0094e, 0x0094f,),  # Devanagari Vowel Sign Pr..Devanagari Vowel Sign Aw
+        (0x00982, 0x00983,),  # Bengali Sign Anusvara   ..Bengali Sign Visarga
+        (0x009be, 0x009c0,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Ii
+        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
+        (0x009cb, 0x009cc,),  # Bengali Vowel Sign O    ..Bengali Vowel Sign Au
+        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
+        (0x00a03, 0x00a03,),  # Gurmukhi Sign Visarga
+        (0x00a3e, 0x00a40,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Ii
+        (0x00a83, 0x00a83,),  # Gujarati Sign Visarga
+        (0x00abe, 0x00ac0,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Ii
+        (0x00ac9, 0x00ac9,),  # Gujarati Vowel Sign Candra O
+        (0x00acb, 0x00acc,),  # Gujarati Vowel Sign O   ..Gujarati Vowel Sign Au
+        (0x00b02, 0x00b03,),  # Oriya Sign Anusvara     ..Oriya Sign Visarga
+        (0x00b3e, 0x00b3e,),  # Oriya Vowel Sign Aa
+        (0x00b40, 0x00b40,),  # Oriya Vowel Sign Ii
+        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
+        (0x00b4b, 0x00b4c,),  # Oriya Vowel Sign O      ..Oriya Vowel Sign Au
+        (0x00b57, 0x00b57,),  # Oriya Au Length Mark
+        (0x00bbe, 0x00bbf,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign I
+        (0x00bc1, 0x00bc2,),  # Tamil Vowel Sign U      ..Tamil Vowel Sign Uu
+        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
+        (0x00bca, 0x00bcc,),  # Tamil Vowel Sign O      ..Tamil Vowel Sign Au
+        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
+        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
+        (0x00c41, 0x00c44,),  # Telugu Vowel Sign U     ..Telugu Vowel Sign Vocali
+        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
+        (0x00cbe, 0x00cbe,),  # Kannada Vowel Sign Aa
+        (0x00cc0, 0x00cc4,),  # Kannada Vowel Sign Ii   ..Kannada Vowel Sign Vocal
+        (0x00cc7, 0x00cc8,),  # Kannada Vowel Sign Ee   ..Kannada Vowel Sign Ai
+        (0x00cca, 0x00ccb,),  # Kannada Vowel Sign O    ..Kannada Vowel Sign Oo
+        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
+        (0x00cf3, 0x00cf3,),  # Kannada Sign Combining Anusvara Above Right
+        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
+        (0x00d3e, 0x00d40,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Ii
+        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
+        (0x00d4a, 0x00d4c,),  # Malayalam Vowel Sign O  ..Malayalam Vowel Sign Au
+        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
+        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
+        (0x00dcf, 0x00dd1,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Diga
+        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
+        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
+        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
+        (0x00f7f, 0x00f7f,),  # Tibetan Sign Rnam Bcad
+        (0x0102b, 0x0102c,),  # Myanmar Vowel Sign Tall ..Myanmar Vowel Sign Aa
+        (0x01031, 0x01031,),  # Myanmar Vowel Sign E
+        (0x01038, 0x01038,),  # Myanmar Sign Visarga
+        (0x0103b, 0x0103c,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
+        (0x01056, 0x01057,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
+        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
+        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
+        (0x01083, 0x01084,),  # Myanmar Vowel Sign Shan ..Myanmar Vowel Sign Shan
+        (0x01087, 0x0108c,),  # Myanmar Sign Shan Tone-2..Myanmar Sign Shan Counci
+        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
+        (0x0109a, 0x0109c,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
+        (0x01715, 0x01715,),  # Tagalog Sign Pamudpod
+        (0x01734, 0x01734,),  # Hanunoo Sign Pamudpod
+        (0x017b6, 0x017b6,),  # Khmer Vowel Sign Aa
+        (0x017be, 0x017c5,),  # Khmer Vowel Sign Oe     ..Khmer Vowel Sign Au
+        (0x017c7, 0x017c8,),  # Khmer Sign Reahmuk      ..Khmer Sign Yuukaleapintu
+        (0x01923, 0x01926,),  # Limbu Vowel Sign Ee     ..Limbu Vowel Sign Au
+        (0x01929, 0x0192b,),  # Limbu Subjoined Letter Y..Limbu Subjoined Letter W
+        (0x01930, 0x01931,),  # Limbu Small Letter Ka   ..Limbu Small Letter Nga
+        (0x01933, 0x01938,),  # Limbu Small Letter Ta   ..Limbu Small Letter La
+        (0x01a19, 0x01a1a,),  # Buginese Vowel Sign E   ..Buginese Vowel Sign O
+        (0x01a55, 0x01a55,),  # Tai Tham Consonant Sign Medial Ra
+        (0x01a57, 0x01a57,),  # Tai Tham Consonant Sign La Tang Lai
+        (0x01a61, 0x01a61,),  # Tai Tham Vowel Sign A
+        (0x01a63, 0x01a64,),  # Tai Tham Vowel Sign Aa  ..Tai Tham Vowel Sign Tall
+        (0x01a6d, 0x01a72,),  # Tai Tham Vowel Sign Oy  ..Tai Tham Vowel Sign Tham
+        (0x01b04, 0x01b04,),  # Balinese Sign Bisah
+        (0x01b35, 0x01b35,),  # Balinese Vowel Sign Tedung
+        (0x01b3b, 0x01b3b,),  # Balinese Vowel Sign Ra Repa Tedung
+        (0x01b3d, 0x01b41,),  # Balinese Vowel Sign La L..Balinese Vowel Sign Tali
+        (0x01b43, 0x01b44,),  # Balinese Vowel Sign Pepe..Balinese Adeg Adeg
+        (0x01b82, 0x01b82,),  # Sundanese Sign Pangwisad
+        (0x01ba1, 0x01ba1,),  # Sundanese Consonant Sign Pamingkal
+        (0x01ba6, 0x01ba7,),  # Sundanese Vowel Sign Pan..Sundanese Vowel Sign Pan
+        (0x01baa, 0x01baa,),  # Sundanese Sign Pamaaeh
+        (0x01be7, 0x01be7,),  # Batak Vowel Sign E
+        (0x01bea, 0x01bec,),  # Batak Vowel Sign I      ..Batak Vowel Sign O
+        (0x01bee, 0x01bee,),  # Batak Vowel Sign U
+        (0x01bf2, 0x01bf3,),  # Batak Pangolat          ..Batak Panongonan
+        (0x01c24, 0x01c2b,),  # Lepcha Subjoined Letter ..Lepcha Vowel Sign Uu
+        (0x01c34, 0x01c35,),  # Lepcha Consonant Sign Ny..Lepcha Consonant Sign Ka
+        (0x01ce1, 0x01ce1,),  # Vedic Tone Atharvavedic Independent Svarita
+        (0x01cf7, 0x01cf7,),  # Vedic Sign Atikrama
+        (0x0302e, 0x0302f,),  # Hangul Single Dot Tone M..Hangul Double Dot Tone M
+        (0x0a823, 0x0a824,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
+        (0x0a827, 0x0a827,),  # Syloti Nagri Vowel Sign Oo
+        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
+        (0x0a8b4, 0x0a8c3,),  # Saurashtra Consonant Sig..Saurashtra Vowel Sign Au
+        (0x0a952, 0x0a953,),  # Rejang Consonant Sign H ..Rejang Virama
+        (0x0a983, 0x0a983,),  # Javanese Sign Wignyan
+        (0x0a9b4, 0x0a9b5,),  # Javanese Vowel Sign Taru..Javanese Vowel Sign Tolo
+        (0x0a9ba, 0x0a9bb,),  # Javanese Vowel Sign Tali..Javanese Vowel Sign Dirg
+        (0x0a9be, 0x0a9c0,),  # Javanese Consonant Sign ..Javanese Pangkon
+        (0x0aa2f, 0x0aa30,),  # Cham Vowel Sign O       ..Cham Vowel Sign Ai
+        (0x0aa33, 0x0aa34,),  # Cham Consonant Sign Ya  ..Cham Consonant Sign Ra
+        (0x0aa4d, 0x0aa4d,),  # Cham Consonant Sign Final H
+        (0x0aa7b, 0x0aa7b,),  # Myanmar Sign Pao Karen Tone
+        (0x0aa7d, 0x0aa7d,),  # Myanmar Sign Tai Laing Tone-5
+        (0x0aaeb, 0x0aaeb,),  # Meetei Mayek Vowel Sign Ii
+        (0x0aaee, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        (0x0aaf5, 0x0aaf5,),  # Meetei Mayek Vowel Sign Visarga
+        (0x0abe3, 0x0abe4,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        (0x0abe6, 0x0abe7,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        (0x0abe9, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
+        (0x0abec, 0x0abec,),  # Meetei Mayek Lum Iyek
+        (0x11000, 0x11000,),  # Brahmi Sign Candrabindu
+        (0x11002, 0x11002,),  # Brahmi Sign Visarga
+        (0x11082, 0x11082,),  # Kaithi Sign Visarga
+        (0x110b0, 0x110b2,),  # Kaithi Vowel Sign Aa    ..Kaithi Vowel Sign Ii
+        (0x110b7, 0x110b8,),  # Kaithi Vowel Sign O     ..Kaithi Vowel Sign Au
+        (0x1112c, 0x1112c,),  # Chakma Vowel Sign E
+        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
+        (0x11182, 0x11182,),  # Sharada Sign Visarga
+        (0x111b3, 0x111b5,),  # Sharada Vowel Sign Aa   ..Sharada Vowel Sign Ii
+        (0x111bf, 0x111c0,),  # Sharada Vowel Sign Au   ..Sharada Sign Virama
+        (0x111ce, 0x111ce,),  # Sharada Vowel Sign Prishthamatra E
+        (0x1122c, 0x1122e,),  # Khojki Vowel Sign Aa    ..Khojki Vowel Sign Ii
+        (0x11232, 0x11233,),  # Khojki Vowel Sign O     ..Khojki Vowel Sign Au
+        (0x11235, 0x11235,),  # Khojki Sign Virama
+        (0x112e0, 0x112e2,),  # Khudawadi Vowel Sign Aa ..Khudawadi Vowel Sign Ii
+        (0x11302, 0x11303,),  # Grantha Sign Anusvara   ..Grantha Sign Visarga
+        (0x1133e, 0x1133f,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign I
+        (0x11341, 0x11344,),  # Grantha Vowel Sign U    ..Grantha Vowel Sign Vocal
+        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
+        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
+        (0x11357, 0x11357,),  # Grantha Au Length Mark
+        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
+        (0x113b8, 0x113ba,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Vowel Sign
+        (0x113c2, 0x113c2,),  # Tulu-tigalari Vowel Sign Ee
+        (0x113c5, 0x113c5,),  # Tulu-tigalari Vowel Sign Ai
+        (0x113c7, 0x113ca,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Sign Candr
+        (0x113cc, 0x113cd,),  # Tulu-tigalari Sign Anusv..Tulu-tigalari Sign Visar
+        (0x113cf, 0x113cf,),  # Tulu-tigalari Sign Looped Virama
+        (0x11435, 0x11437,),  # Newa Vowel Sign Aa      ..Newa Vowel Sign Ii
+        (0x11440, 0x11441,),  # Newa Vowel Sign O       ..Newa Vowel Sign Au
+        (0x11445, 0x11445,),  # Newa Sign Visarga
+        (0x114b0, 0x114b2,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Vowel Sign Ii
+        (0x114b9, 0x114b9,),  # Tirhuta Vowel Sign E
+        (0x114bb, 0x114be,),  # Tirhuta Vowel Sign Ai   ..Tirhuta Vowel Sign Au
+        (0x114c1, 0x114c1,),  # Tirhuta Sign Visarga
+        (0x115af, 0x115b1,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Ii
+        (0x115b8, 0x115bb,),  # Siddham Vowel Sign E    ..Siddham Vowel Sign Au
+        (0x115be, 0x115be,),  # Siddham Sign Visarga
+        (0x11630, 0x11632,),  # Modi Vowel Sign Aa      ..Modi Vowel Sign Ii
+        (0x1163b, 0x1163c,),  # Modi Vowel Sign O       ..Modi Vowel Sign Au
+        (0x1163e, 0x1163e,),  # Modi Sign Visarga
+        (0x116ac, 0x116ac,),  # Takri Sign Visarga
+        (0x116ae, 0x116af,),  # Takri Vowel Sign I      ..Takri Vowel Sign Ii
+        (0x116b6, 0x116b6,),  # Takri Sign Virama
+        (0x1171e, 0x1171e,),  # Ahom Consonant Sign Medial Ra
+        (0x11720, 0x11721,),  # Ahom Vowel Sign A       ..Ahom Vowel Sign Aa
+        (0x11726, 0x11726,),  # Ahom Vowel Sign E
+        (0x1182c, 0x1182e,),  # Dogra Vowel Sign Aa     ..Dogra Vowel Sign Ii
+        (0x11838, 0x11838,),  # Dogra Sign Visarga
+        (0x11930, 0x11935,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign E
+        (0x11937, 0x11938,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign O
+        (0x1193d, 0x1193d,),  # Dives Akuru Sign Halanta
+        (0x11940, 0x11940,),  # Dives Akuru Medial Ya
+        (0x11942, 0x11942,),  # Dives Akuru Medial Ra
+        (0x119d1, 0x119d3,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign I
+        (0x119dc, 0x119df,),  # Nandinagari Vowel Sign O..Nandinagari Sign Visarga
+        (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
+        (0x11a39, 0x11a39,),  # Zanabazar Square Sign Visarga
+        (0x11a57, 0x11a58,),  # Soyombo Vowel Sign Ai   ..Soyombo Vowel Sign Au
+        (0x11a97, 0x11a97,),  # Soyombo Sign Visarga
+        (0x11b61, 0x11b61,),  # Sharada Vowel Sign Ooe
+        (0x11b65, 0x11b65,),  # Sharada Vowel Sign Short O
+        (0x11b67, 0x11b67,),  # Sharada Vowel Sign Candra O
+        (0x11c2f, 0x11c2f,),  # Bhaiksuki Vowel Sign Aa
+        (0x11c3e, 0x11c3e,),  # Bhaiksuki Sign Visarga
+        (0x11ca9, 0x11ca9,),  # Marchen Subjoined Letter Ya
+        (0x11cb1, 0x11cb1,),  # Marchen Vowel Sign I
+        (0x11cb4, 0x11cb4,),  # Marchen Vowel Sign O
+        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+        (0x11d93, 0x11d94,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
+        (0x11d96, 0x11d96,),  # Gunjala Gondi Sign Visarga
+        (0x11ef5, 0x11ef6,),  # Makasar Vowel Sign E    ..Makasar Vowel Sign O
+        (0x11f03, 0x11f03,),  # Kawi Sign Visarga
+        (0x11f34, 0x11f35,),  # Kawi Vowel Sign Aa      ..Kawi Vowel Sign Alternat
+        (0x11f3e, 0x11f3f,),  # Kawi Vowel Sign E       ..Kawi Vowel Sign Ai
+        (0x11f41, 0x11f41,),  # Kawi Sign Killer
+        (0x1612a, 0x1612c,),  # Gurung Khema Consonant S..Gurung Khema Consonant S
+        (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
+        (0x16ff0, 0x16ff1,),  # Vietnamese Alternate Rea..Vietnamese Alternate Rea
+        (0x1d165, 0x1d166,),  # Musical Symbol Combining..Musical Symbol Combining
+        (0x1d16d, 0x1d172,),  # Musical Symbol Combining..Musical Symbol Combining
+    ),
+}
diff --git a/libs/wcwidth/table_vs16.py b/libs/wcwidth/table_vs16.py
index 3249262d98..70e4a7373f 100644
--- a/libs/wcwidth/table_vs16.py
+++ b/libs/wcwidth/table_vs16.py
@@ -1,12 +1,13 @@
 """
 Exports VS16_NARROW_TO_WIDE table keyed by supporting unicode version level.
 
-This code generated by wcwidth/bin/update-tables.py on 2023-11-07 16:43:49 UTC.
+This code generated by wcwidth/bin/update-tables.py on 2025-09-15 16:57:50 UTC.
 """
+# pylint: disable=duplicate-code
 VS16_NARROW_TO_WIDE = {
     '9.0.0': (
         # Source: 9.0.0
-        # Date: 2023-02-01, 02:22:54 GMT
+        # Date: 2025-01-30, 21:48:29 GMT
         #
         (0x00023, 0x00023,),  # Number Sign
         (0x0002a, 0x0002a,),  # Asterisk
diff --git a/libs/wcwidth/table_wide.py b/libs/wcwidth/table_wide.py
index bd6dfdd82a..ed6f48a732 100644
--- a/libs/wcwidth/table_wide.py
+++ b/libs/wcwidth/table_wide.py
@@ -1,1372 +1,13 @@
 """
 Exports WIDE_EASTASIAN table keyed by supporting unicode version level.
 
-This code generated by wcwidth/bin/update-tables.py on 2024-01-06 01:39:49 UTC.
+This code generated by wcwidth/bin/update-tables.py on 2026-01-30 00:58:17 UTC.
 """
+# pylint: disable=duplicate-code
 WIDE_EASTASIAN = {
-    '4.1.0': (
-        # Source: EastAsianWidth-4.1.0.txt
-        # Date: 2005-03-17, 15:21:00 PST [KW]
-        #
-        (0x01100, 0x01159,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Yeorinhi
-        (0x0115f, 0x0115f,),  # Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312c,),  # Bopomofo Letter B       ..Bopomofo Letter Gn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031b7,),  # Ideographic Annotation L..Bopomofo Final Letter H
-        (0x031c0, 0x031cf,),  # Cjk Stroke T            ..Cjk Stroke N
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03243,),  # Parenthesized Ideograph ..Parenthesized Ideograph
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04db5,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x09fbb,),  # Cjk Unified Ideograph-4e..Cjk Unified Ideograph-9f
-        (0x0a000, 0x0a48c,),  # Yi Syllable It          ..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0fa2d,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fa30, 0x0fa6a,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fa70, 0x0fad9,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '5.0.0': (
-        # Source: EastAsianWidth-5.0.0.txt
-        # Date: 2006-02-15, 14:39:00 PST [KW]
-        #
-        (0x01100, 0x01159,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Yeorinhi
-        (0x0115f, 0x0115f,),  # Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312c,),  # Bopomofo Letter B       ..Bopomofo Letter Gn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031b7,),  # Ideographic Annotation L..Bopomofo Final Letter H
-        (0x031c0, 0x031cf,),  # Cjk Stroke T            ..Cjk Stroke N
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03243,),  # Parenthesized Ideograph ..Parenthesized Ideograph
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04db5,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x09fbb,),  # Cjk Unified Ideograph-4e..Cjk Unified Ideograph-9f
-        (0x0a000, 0x0a48c,),  # Yi Syllable It          ..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0fa2d,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fa30, 0x0fa6a,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fa70, 0x0fad9,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '5.1.0': (
-        # Source: EastAsianWidth-5.1.0.txt
-        # Date: 2008-03-20, 17:42:00 PDT [KW]
-        #
-        (0x01100, 0x01159,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Yeorinhi
-        (0x0115f, 0x0115f,),  # Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031b7,),  # Ideographic Annotation L..Bopomofo Final Letter H
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03243,),  # Parenthesized Ideograph ..Parenthesized Ideograph
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04db5,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x09fc3,),  # Cjk Unified Ideograph-4e..Cjk Unified Ideograph-9f
-        (0x0a000, 0x0a48c,),  # Yi Syllable It          ..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0fa2d,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fa30, 0x0fa6a,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fa70, 0x0fad9,),  # Cjk Compatibility Ideogr..Cjk Compatibility Ideogr
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '5.2.0': (
-        # Source: EastAsianWidth-5.2.0.txt
-        # Date: 2009-06-09, 17:47:00 PDT [KW]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031b7,),  # Ideographic Annotation L..Bopomofo Final Letter H
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1f200, 0x1f200,),  # Square Hiragana Hoka
-        (0x1f210, 0x1f231,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '6.0.0': (
-        # Source: EastAsianWidth-6.0.0.txt
-        # Date: 2010-08-17, 12:17:00 PDT [KW]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '6.1.0': (
-        # Source: EastAsianWidth-6.1.0.txt
-        # Date: 2011-09-19, 18:46:00 GMT [KW]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '6.2.0': (
-        # Source: EastAsianWidth-6.2.0.txt
-        # Date: 2012-05-15, 18:30:00 GMT [KW]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '6.3.0': (
-        # Source: EastAsianWidth-6.3.0.txt
-        # Date: 2013-02-05, 20:09:00 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '7.0.0': (
-        # Source: EastAsianWidth-7.0.0.txt
-        # Date: 2014-02-28, 23:15:00 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '8.0.0': (
-        # Source: EastAsianWidth-8.0.0.txt
-        # Date: 2015-02-10, 21:00:00 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23a,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '9.0.0': (
-        # Source: EastAsianWidth-9.0.0.txt
-        # Date: 2016-05-27, 17:00:00 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312d,),  # Bopomofo Letter B       ..Bopomofo Letter Ih
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe0,),  # Tangut Iteration Mark
-        (0x17000, 0x187ec,),  # (nil)
-        (0x18800, 0x18af2,),  # Tangut Component-001    ..Tangut Component-755
-        (0x1b000, 0x1b001,),  # Katakana Letter Archaic ..Hiragana Letter Archaic
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6f6,),  # Scooter                 ..Canoe
-        (0x1f910, 0x1f91e,),  # Zipper-mouth Face       ..Hand With Index And Midd
-        (0x1f920, 0x1f927,),  # Face With Cowboy Hat    ..Sneezing Face
-        (0x1f930, 0x1f930,),  # Pregnant Woman
-        (0x1f933, 0x1f93e,),  # Selfie                  ..Handball
-        (0x1f940, 0x1f94b,),  # Wilted Flower           ..Martial Arts Uniform
-        (0x1f950, 0x1f95e,),  # Croissant               ..Pancakes
-        (0x1f980, 0x1f991,),  # Crab                    ..Squid
-        (0x1f9c0, 0x1f9c0,),  # Cheese Wedge
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '10.0.0': (
-        # Source: EastAsianWidth-10.0.0.txt
-        # Date: 2017-03-08, 02:00:00 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312e,),  # Bopomofo Letter B       ..Bopomofo Letter O With D
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe1,),  # Tangut Iteration Mark   ..Nushu Iteration Mark
-        (0x17000, 0x187ec,),  # (nil)
-        (0x18800, 0x18af2,),  # Tangut Component-001    ..Tangut Component-755
-        (0x1b000, 0x1b11e,),  # Katakana Letter Archaic ..Hentaigana Letter N-mu-m
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6f8,),  # Scooter                 ..Flying Saucer
-        (0x1f910, 0x1f93e,),  # Zipper-mouth Face       ..Handball
-        (0x1f940, 0x1f94c,),  # Wilted Flower           ..Curling Stone
-        (0x1f950, 0x1f96b,),  # Croissant               ..Canned Food
-        (0x1f980, 0x1f997,),  # Crab                    ..Cricket
-        (0x1f9c0, 0x1f9c0,),  # Cheese Wedge
-        (0x1f9d0, 0x1f9e6,),  # Face With Monocle       ..Socks
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '11.0.0': (
-        # Source: EastAsianWidth-11.0.0.txt
-        # Date: 2018-05-14, 09:41:59 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe1,),  # Tangut Iteration Mark   ..Nushu Iteration Mark
-        (0x17000, 0x187f1,),  # (nil)
-        (0x18800, 0x18af2,),  # Tangut Component-001    ..Tangut Component-755
-        (0x1b000, 0x1b11e,),  # Katakana Letter Archaic ..Hentaigana Letter N-mu-m
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6f9,),  # Scooter                 ..Skateboard
-        (0x1f910, 0x1f93e,),  # Zipper-mouth Face       ..Handball
-        (0x1f940, 0x1f970,),  # Wilted Flower           ..Smiling Face With Smilin
-        (0x1f973, 0x1f976,),  # Face With Party Horn And..Freezing Face
-        (0x1f97a, 0x1f97a,),  # Face With Pleading Eyes
-        (0x1f97c, 0x1f9a2,),  # Lab Coat                ..Swan
-        (0x1f9b0, 0x1f9b9,),  # Emoji Component Red Hair..Supervillain
-        (0x1f9c0, 0x1f9c2,),  # Cheese Wedge            ..Salt Shaker
-        (0x1f9d0, 0x1f9ff,),  # Face With Monocle       ..Nazar Amulet
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '12.0.0': (
-        # Source: EastAsianWidth-12.0.0.txt
-        # Date: 2019-01-21, 14:12:58 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x032fe,),  # Partnership Sign        ..Circled Katakana Wo
-        (0x03300, 0x04dbf,),  # Square Apaato           ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe3,),  # Tangut Iteration Mark   ..Old Chinese Iteration Ma
-        (0x17000, 0x187f7,),  # (nil)
-        (0x18800, 0x18af2,),  # Tangut Component-001    ..Tangut Component-755
-        (0x1b000, 0x1b11e,),  # Katakana Letter Archaic ..Hentaigana Letter N-mu-m
-        (0x1b150, 0x1b152,),  # Hiragana Letter Small Wi..Hiragana Letter Small Wo
-        (0x1b164, 0x1b167,),  # Katakana Letter Small Wi..Katakana Letter Small N
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6d5, 0x1f6d5,),  # Hindu Temple
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6fa,),  # Scooter                 ..Auto Rickshaw
-        (0x1f7e0, 0x1f7eb,),  # Large Orange Circle     ..Large Brown Square
-        (0x1f90d, 0x1f971,),  # White Heart             ..Yawning Face
-        (0x1f973, 0x1f976,),  # Face With Party Horn And..Freezing Face
-        (0x1f97a, 0x1f9a2,),  # Face With Pleading Eyes ..Swan
-        (0x1f9a5, 0x1f9aa,),  # Sloth                   ..Oyster
-        (0x1f9ae, 0x1f9ca,),  # Guide Dog               ..Ice Cube
-        (0x1f9cd, 0x1f9ff,),  # Standing Person         ..Nazar Amulet
-        (0x1fa70, 0x1fa73,),  # Ballet Shoes            ..Shorts
-        (0x1fa78, 0x1fa7a,),  # Drop Of Blood           ..Stethoscope
-        (0x1fa80, 0x1fa82,),  # Yo-yo                   ..Parachute
-        (0x1fa90, 0x1fa95,),  # Ringed Planet           ..Banjo
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '12.1.0': (
-        # Source: EastAsianWidth-12.1.0.txt
-        # Date: 2019-03-31, 22:01:58 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031ba,),  # Ideographic Annotation L..Bopomofo Letter Zy
-        (0x031c0, 0x031e3,),  # Cjk Stroke T            ..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x04dbf,),  # Partnership Sign        ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe3,),  # Tangut Iteration Mark   ..Old Chinese Iteration Ma
-        (0x17000, 0x187f7,),  # (nil)
-        (0x18800, 0x18af2,),  # Tangut Component-001    ..Tangut Component-755
-        (0x1b000, 0x1b11e,),  # Katakana Letter Archaic ..Hentaigana Letter N-mu-m
-        (0x1b150, 0x1b152,),  # Hiragana Letter Small Wi..Hiragana Letter Small Wo
-        (0x1b164, 0x1b167,),  # Katakana Letter Small Wi..Katakana Letter Small N
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6d5, 0x1f6d5,),  # Hindu Temple
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6fa,),  # Scooter                 ..Auto Rickshaw
-        (0x1f7e0, 0x1f7eb,),  # Large Orange Circle     ..Large Brown Square
-        (0x1f90d, 0x1f971,),  # White Heart             ..Yawning Face
-        (0x1f973, 0x1f976,),  # Face With Party Horn And..Freezing Face
-        (0x1f97a, 0x1f9a2,),  # Face With Pleading Eyes ..Swan
-        (0x1f9a5, 0x1f9aa,),  # Sloth                   ..Oyster
-        (0x1f9ae, 0x1f9ca,),  # Guide Dog               ..Ice Cube
-        (0x1f9cd, 0x1f9ff,),  # Standing Person         ..Nazar Amulet
-        (0x1fa70, 0x1fa73,),  # Ballet Shoes            ..Shorts
-        (0x1fa78, 0x1fa7a,),  # Drop Of Blood           ..Stethoscope
-        (0x1fa80, 0x1fa82,),  # Yo-yo                   ..Parachute
-        (0x1fa90, 0x1fa95,),  # Ringed Planet           ..Banjo
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '13.0.0': (
-        # Source: EastAsianWidth-13.0.0.txt
-        # Date: 2029-01-21, 18:14:00 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031e3,),  # Ideographic Annotation L..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x04dbf,),  # Partnership Sign        ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe3,),  # Tangut Iteration Mark   ..Old Chinese Iteration Ma
-        (0x17000, 0x187f7,),  # (nil)
-        (0x18800, 0x18cd5,),  # Tangut Component-001    ..Khitan Small Script Char
-        (0x18d00, 0x18d08,),  # (nil)
-        (0x1b000, 0x1b11e,),  # Katakana Letter Archaic ..Hentaigana Letter N-mu-m
-        (0x1b150, 0x1b152,),  # Hiragana Letter Small Wi..Hiragana Letter Small Wo
-        (0x1b164, 0x1b167,),  # Katakana Letter Small Wi..Katakana Letter Small N
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6d5, 0x1f6d7,),  # Hindu Temple            ..Elevator
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6fc,),  # Scooter                 ..Roller Skate
-        (0x1f7e0, 0x1f7eb,),  # Large Orange Circle     ..Large Brown Square
-        (0x1f90c, 0x1f93a,),  # Pinched Fingers         ..Fencer
-        (0x1f93c, 0x1f945,),  # Wrestlers               ..Goal Net
-        (0x1f947, 0x1f978,),  # First Place Medal       ..Disguised Face
-        (0x1f97a, 0x1f9cb,),  # Face With Pleading Eyes ..Bubble Tea
-        (0x1f9cd, 0x1f9ff,),  # Standing Person         ..Nazar Amulet
-        (0x1fa70, 0x1fa74,),  # Ballet Shoes            ..Thong Sandal
-        (0x1fa78, 0x1fa7a,),  # Drop Of Blood           ..Stethoscope
-        (0x1fa80, 0x1fa86,),  # Yo-yo                   ..Nesting Dolls
-        (0x1fa90, 0x1faa8,),  # Ringed Planet           ..Rock
-        (0x1fab0, 0x1fab6,),  # Fly                     ..Feather
-        (0x1fac0, 0x1fac2,),  # Anatomical Heart        ..People Hugging
-        (0x1fad0, 0x1fad6,),  # Blueberries             ..Teapot
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '14.0.0': (
-        # Source: EastAsianWidth-14.0.0.txt
-        # Date: 2021-07-06, 09:58:53 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031e3,),  # Ideographic Annotation L..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x04dbf,),  # Partnership Sign        ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe3,),  # Tangut Iteration Mark   ..Old Chinese Iteration Ma
-        (0x17000, 0x187f7,),  # (nil)
-        (0x18800, 0x18cd5,),  # Tangut Component-001    ..Khitan Small Script Char
-        (0x18d00, 0x18d08,),  # (nil)
-        (0x1aff0, 0x1aff3,),  # Katakana Letter Minnan T..Katakana Letter Minnan T
-        (0x1aff5, 0x1affb,),  # Katakana Letter Minnan T..Katakana Letter Minnan N
-        (0x1affd, 0x1affe,),  # Katakana Letter Minnan N..Katakana Letter Minnan N
-        (0x1b000, 0x1b122,),  # Katakana Letter Archaic ..Katakana Letter Archaic
-        (0x1b150, 0x1b152,),  # Hiragana Letter Small Wi..Hiragana Letter Small Wo
-        (0x1b164, 0x1b167,),  # Katakana Letter Small Wi..Katakana Letter Small N
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6d5, 0x1f6d7,),  # Hindu Temple            ..Elevator
-        (0x1f6dd, 0x1f6df,),  # Playground Slide        ..Ring Buoy
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6fc,),  # Scooter                 ..Roller Skate
-        (0x1f7e0, 0x1f7eb,),  # Large Orange Circle     ..Large Brown Square
-        (0x1f7f0, 0x1f7f0,),  # Heavy Equals Sign
-        (0x1f90c, 0x1f93a,),  # Pinched Fingers         ..Fencer
-        (0x1f93c, 0x1f945,),  # Wrestlers               ..Goal Net
-        (0x1f947, 0x1f9ff,),  # First Place Medal       ..Nazar Amulet
-        (0x1fa70, 0x1fa74,),  # Ballet Shoes            ..Thong Sandal
-        (0x1fa78, 0x1fa7c,),  # Drop Of Blood           ..Crutch
-        (0x1fa80, 0x1fa86,),  # Yo-yo                   ..Nesting Dolls
-        (0x1fa90, 0x1faac,),  # Ringed Planet           ..Hamsa
-        (0x1fab0, 0x1faba,),  # Fly                     ..Nest With Eggs
-        (0x1fac0, 0x1fac5,),  # Anatomical Heart        ..Person With Crown
-        (0x1fad0, 0x1fad9,),  # Blueberries             ..Jar
-        (0x1fae0, 0x1fae7,),  # Melting Face            ..Bubbles
-        (0x1faf0, 0x1faf6,),  # Hand With Index Finger A..Heart Hands
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '15.0.0': (
-        # Source: EastAsianWidth-15.0.0.txt
-        # Date: 2022-05-24, 17:40:20 GMT [KW, LI]
-        #
-        (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
-        (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
-        (0x02329, 0x0232a,),  # Left-pointing Angle Brac..Right-pointing Angle Bra
-        (0x023e9, 0x023ec,),  # Black Right-pointing Dou..Black Down-pointing Doub
-        (0x023f0, 0x023f0,),  # Alarm Clock
-        (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
-        (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
-        (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
-        (0x02648, 0x02653,),  # Aries                   ..Pisces
-        (0x0267f, 0x0267f,),  # Wheelchair Symbol
-        (0x02693, 0x02693,),  # Anchor
-        (0x026a1, 0x026a1,),  # High Voltage Sign
-        (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
-        (0x026bd, 0x026be,),  # Soccer Ball             ..Baseball
-        (0x026c4, 0x026c5,),  # Snowman Without Snow    ..Sun Behind Cloud
-        (0x026ce, 0x026ce,),  # Ophiuchus
-        (0x026d4, 0x026d4,),  # No Entry
-        (0x026ea, 0x026ea,),  # Church
-        (0x026f2, 0x026f3,),  # Fountain                ..Flag In Hole
-        (0x026f5, 0x026f5,),  # Sailboat
-        (0x026fa, 0x026fa,),  # Tent
-        (0x026fd, 0x026fd,),  # Fuel Pump
-        (0x02705, 0x02705,),  # White Heavy Check Mark
-        (0x0270a, 0x0270b,),  # Raised Fist             ..Raised Hand
-        (0x02728, 0x02728,),  # Sparkles
-        (0x0274c, 0x0274c,),  # Cross Mark
-        (0x0274e, 0x0274e,),  # Negative Squared Cross Mark
-        (0x02753, 0x02755,),  # Black Question Mark Orna..White Exclamation Mark O
-        (0x02757, 0x02757,),  # Heavy Exclamation Mark Symbol
-        (0x02795, 0x02797,),  # Heavy Plus Sign         ..Heavy Division Sign
-        (0x027b0, 0x027b0,),  # Curly Loop
-        (0x027bf, 0x027bf,),  # Double Curly Loop
-        (0x02b1b, 0x02b1c,),  # Black Large Square      ..White Large Square
-        (0x02b50, 0x02b50,),  # White Medium Star
-        (0x02b55, 0x02b55,),  # Heavy Large Circle
-        (0x02e80, 0x02e99,),  # Cjk Radical Repeat      ..Cjk Radical Rap
-        (0x02e9b, 0x02ef3,),  # Cjk Radical Choke       ..Cjk Radical C-simplified
-        (0x02f00, 0x02fd5,),  # Kangxi Radical One      ..Kangxi Radical Flute
-        (0x02ff0, 0x02ffb,),  # Ideographic Description ..Ideographic Description
-        (0x03000, 0x03029,),  # Ideographic Space       ..Hangzhou Numeral Nine
-        (0x03030, 0x0303e,),  # Wavy Dash               ..Ideographic Variation In
-        (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
-        (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
-        (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031e3,),  # Ideographic Annotation L..Cjk Stroke Q
-        (0x031f0, 0x0321e,),  # Katakana Letter Small Ku..Parenthesized Korean Cha
-        (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x04dbf,),  # Partnership Sign        ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
-        (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
-        (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
-        (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
-        (0x0f900, 0x0faff,),  # Cjk Compatibility Ideogr..(nil)
-        (0x0fe10, 0x0fe19,),  # Presentation Form For Ve..Presentation Form For Ve
-        (0x0fe30, 0x0fe52,),  # Presentation Form For Ve..Small Full Stop
-        (0x0fe54, 0x0fe66,),  # Small Semicolon         ..Small Equals Sign
-        (0x0fe68, 0x0fe6b,),  # Small Reverse Solidus   ..Small Commercial At
-        (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
-        (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
-        (0x16fe0, 0x16fe3,),  # Tangut Iteration Mark   ..Old Chinese Iteration Ma
-        (0x17000, 0x187f7,),  # (nil)
-        (0x18800, 0x18cd5,),  # Tangut Component-001    ..Khitan Small Script Char
-        (0x18d00, 0x18d08,),  # (nil)
-        (0x1aff0, 0x1aff3,),  # Katakana Letter Minnan T..Katakana Letter Minnan T
-        (0x1aff5, 0x1affb,),  # Katakana Letter Minnan T..Katakana Letter Minnan N
-        (0x1affd, 0x1affe,),  # Katakana Letter Minnan N..Katakana Letter Minnan N
-        (0x1b000, 0x1b122,),  # Katakana Letter Archaic ..Katakana Letter Archaic
-        (0x1b132, 0x1b132,),  # Hiragana Letter Small Ko
-        (0x1b150, 0x1b152,),  # Hiragana Letter Small Wi..Hiragana Letter Small Wo
-        (0x1b155, 0x1b155,),  # Katakana Letter Small Ko
-        (0x1b164, 0x1b167,),  # Katakana Letter Small Wi..Katakana Letter Small N
-        (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
-        (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
-        (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
-        (0x1f18e, 0x1f18e,),  # Negative Squared Ab
-        (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
-        (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
-        (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
-        (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
-        (0x1f260, 0x1f265,),  # Rounded Symbol For Fu   ..Rounded Symbol For Cai
-        (0x1f300, 0x1f320,),  # Cyclone                 ..Shooting Star
-        (0x1f32d, 0x1f335,),  # Hot Dog                 ..Cactus
-        (0x1f337, 0x1f37c,),  # Tulip                   ..Baby Bottle
-        (0x1f37e, 0x1f393,),  # Bottle With Popping Cork..Graduation Cap
-        (0x1f3a0, 0x1f3ca,),  # Carousel Horse          ..Swimmer
-        (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
-        (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
-        (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
-        (0x1f440, 0x1f440,),  # Eyes
-        (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
-        (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
-        (0x1f54b, 0x1f54e,),  # Kaaba                   ..Menorah With Nine Branch
-        (0x1f550, 0x1f567,),  # Clock Face One Oclock   ..Clock Face Twelve-thirty
-        (0x1f57a, 0x1f57a,),  # Man Dancing
-        (0x1f595, 0x1f596,),  # Reversed Hand With Middl..Raised Hand With Part Be
-        (0x1f5a4, 0x1f5a4,),  # Black Heart
-        (0x1f5fb, 0x1f64f,),  # Mount Fuji              ..Person With Folded Hands
-        (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
-        (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
-        (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6d5, 0x1f6d7,),  # Hindu Temple            ..Elevator
-        (0x1f6dc, 0x1f6df,),  # Wireless                ..Ring Buoy
-        (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
-        (0x1f6f4, 0x1f6fc,),  # Scooter                 ..Roller Skate
-        (0x1f7e0, 0x1f7eb,),  # Large Orange Circle     ..Large Brown Square
-        (0x1f7f0, 0x1f7f0,),  # Heavy Equals Sign
-        (0x1f90c, 0x1f93a,),  # Pinched Fingers         ..Fencer
-        (0x1f93c, 0x1f945,),  # Wrestlers               ..Goal Net
-        (0x1f947, 0x1f9ff,),  # First Place Medal       ..Nazar Amulet
-        (0x1fa70, 0x1fa7c,),  # Ballet Shoes            ..Crutch
-        (0x1fa80, 0x1fa88,),  # Yo-yo                   ..Flute
-        (0x1fa90, 0x1fabd,),  # Ringed Planet           ..Wing
-        (0x1fabf, 0x1fac5,),  # Goose                   ..Person With Crown
-        (0x1face, 0x1fadb,),  # Moose                   ..Pea Pod
-        (0x1fae0, 0x1fae8,),  # Melting Face            ..Shaking Face
-        (0x1faf0, 0x1faf8,),  # Hand With Index Finger A..Rightwards Pushing Hand
-        (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
-        (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
-    ),
-    '15.1.0': (
-        # Source: EastAsianWidth-15.1.0.txt
-        # Date: 2023-07-28, 23:34:08 GMT
+    '17.0.0': (
+        # Source: EastAsianWidth-17.0.0.txt
+        # Date: 2025-07-24, 00:12:54 GMT
         #
         (0x01100, 0x0115f,),  # Hangul Choseong Kiyeok  ..Hangul Choseong Filler
         (0x0231a, 0x0231b,),  # Watch                   ..Hourglass
@@ -1376,8 +17,10 @@
         (0x023f3, 0x023f3,),  # Hourglass With Flowing Sand
         (0x025fd, 0x025fe,),  # White Medium Small Squar..Black Medium Small Squar
         (0x02614, 0x02615,),  # Umbrella With Rain Drops..Hot Beverage
+        (0x02630, 0x02637,),  # Trigram For Heaven      ..Trigram For Earth
         (0x02648, 0x02653,),  # Aries                   ..Pisces
         (0x0267f, 0x0267f,),  # Wheelchair Symbol
+        (0x0268a, 0x0268f,),  # Monogram For Yang       ..Digram For Greater Yin
         (0x02693, 0x02693,),  # Anchor
         (0x026a1, 0x026a1,),  # High Voltage Sign
         (0x026aa, 0x026ab,),  # Medium White Circle     ..Medium Black Circle
@@ -1411,12 +54,12 @@
         (0x03041, 0x03096,),  # Hiragana Letter Small A ..Hiragana Letter Small Ke
         (0x0309b, 0x030ff,),  # Katakana-hiragana Voiced..Katakana Digraph Koto
         (0x03105, 0x0312f,),  # Bopomofo Letter B       ..Bopomofo Letter Nn
-        (0x03131, 0x0318e,),  # Hangul Letter Kiyeok    ..Hangul Letter Araeae
-        (0x03190, 0x031e3,),  # Ideographic Annotation L..Cjk Stroke Q
-        (0x031ef, 0x0321e,),  # (nil)                   ..Parenthesized Korean Cha
+        (0x03131, 0x03163,),  # Hangul Letter Kiyeok    ..Hangul Letter I
+        (0x03165, 0x0318e,),  # Hangul Letter Ssangnieun..Hangul Letter Araeae
+        (0x03190, 0x031e5,),  # Ideographic Annotation L..Cjk Stroke Szp
+        (0x031ef, 0x0321e,),  # Ideographic Description ..Parenthesized Korean Cha
         (0x03220, 0x03247,),  # Parenthesized Ideograph ..Circled Ideograph Koto
-        (0x03250, 0x04dbf,),  # Partnership Sign        ..Cjk Unified Ideograph-4d
-        (0x04e00, 0x0a48c,),  # Cjk Unified Ideograph-4e..Yi Syllable Yyr
+        (0x03250, 0x0a48c,),  # Partnership Sign        ..Yi Syllable Yyr
         (0x0a490, 0x0a4c6,),  # Yi Radical Qot          ..Yi Radical Ke
         (0x0a960, 0x0a97c,),  # Hangul Choseong Tikeut-m..Hangul Choseong Ssangyeo
         (0x0ac00, 0x0d7a3,),  # Hangul Syllable Ga      ..Hangul Syllable Hih
@@ -1428,9 +71,10 @@
         (0x0ff01, 0x0ff60,),  # Fullwidth Exclamation Ma..Fullwidth Right White Pa
         (0x0ffe0, 0x0ffe6,),  # Fullwidth Cent Sign     ..Fullwidth Won Sign
         (0x16fe0, 0x16fe3,),  # Tangut Iteration Mark   ..Old Chinese Iteration Ma
-        (0x17000, 0x187f7,),  # (nil)
-        (0x18800, 0x18cd5,),  # Tangut Component-001    ..Khitan Small Script Char
-        (0x18d00, 0x18d08,),  # (nil)
+        (0x16ff2, 0x16ff6,),  # Chinese Small Simplified..Yangqin Sign Slow Two Be
+        (0x17000, 0x18cd5,),  # (nil)                   ..Khitan Small Script Char
+        (0x18cff, 0x18d1e,),  # Khitan Small Script Char..(nil)
+        (0x18d80, 0x18df2,),  # Tangut Component-769    ..Tangut Component-883
         (0x1aff0, 0x1aff3,),  # Katakana Letter Minnan T..Katakana Letter Minnan T
         (0x1aff5, 0x1affb,),  # Katakana Letter Minnan T..Katakana Letter Minnan N
         (0x1affd, 0x1affe,),  # Katakana Letter Minnan N..Katakana Letter Minnan N
@@ -1440,11 +84,13 @@
         (0x1b155, 0x1b155,),  # Katakana Letter Small Ko
         (0x1b164, 0x1b167,),  # Katakana Letter Small Wi..Katakana Letter Small N
         (0x1b170, 0x1b2fb,),  # Nushu Character-1b170   ..Nushu Character-1b2fb
+        (0x1d300, 0x1d356,),  # Monogram For Earth      ..Tetragram For Fostering
+        (0x1d360, 0x1d376,),  # Counting Rod Unit Digit ..Ideographic Tally Mark F
         (0x1f004, 0x1f004,),  # Mahjong Tile Red Dragon
         (0x1f0cf, 0x1f0cf,),  # Playing Card Black Joker
         (0x1f18e, 0x1f18e,),  # Negative Squared Ab
         (0x1f191, 0x1f19a,),  # Squared Cl              ..Squared Vs
-        (0x1f200, 0x1f202,),  # Square Hiragana Hoka    ..Squared Katakana Sa
+        (0x1f1e6, 0x1f202,),  # Regional Indicator Symbo..Squared Katakana Sa
         (0x1f210, 0x1f23b,),  # Squared Cjk Unified Ideo..Squared Cjk Unified Ideo
         (0x1f240, 0x1f248,),  # Tortoise Shell Bracketed..Tortoise Shell Bracketed
         (0x1f250, 0x1f251,),  # Circled Ideograph Advant..Circled Ideograph Accept
@@ -1457,8 +103,7 @@
         (0x1f3cf, 0x1f3d3,),  # Cricket Bat And Ball    ..Table Tennis Paddle And
         (0x1f3e0, 0x1f3f0,),  # House Building          ..European Castle
         (0x1f3f4, 0x1f3f4,),  # Waving Black Flag
-        (0x1f3f8, 0x1f3fa,),  # Badminton Racquet And Sh..Amphora
-        (0x1f400, 0x1f43e,),  # Rat                     ..Paw Prints
+        (0x1f3f8, 0x1f43e,),  # Badminton Racquet And Sh..Paw Prints
         (0x1f440, 0x1f440,),  # Eyes
         (0x1f442, 0x1f4fc,),  # Ear                     ..Videocassette
         (0x1f4ff, 0x1f53d,),  # Prayer Beads            ..Down-pointing Small Red
@@ -1471,7 +116,7 @@
         (0x1f680, 0x1f6c5,),  # Rocket                  ..Left Luggage
         (0x1f6cc, 0x1f6cc,),  # Sleeping Accommodation
         (0x1f6d0, 0x1f6d2,),  # Place Of Worship        ..Shopping Trolley
-        (0x1f6d5, 0x1f6d7,),  # Hindu Temple            ..Elevator
+        (0x1f6d5, 0x1f6d8,),  # Hindu Temple            ..Landslide
         (0x1f6dc, 0x1f6df,),  # Wireless                ..Ring Buoy
         (0x1f6eb, 0x1f6ec,),  # Airplane Departure      ..Airplane Arriving
         (0x1f6f4, 0x1f6fc,),  # Scooter                 ..Roller Skate
@@ -1481,12 +126,12 @@
         (0x1f93c, 0x1f945,),  # Wrestlers               ..Goal Net
         (0x1f947, 0x1f9ff,),  # First Place Medal       ..Nazar Amulet
         (0x1fa70, 0x1fa7c,),  # Ballet Shoes            ..Crutch
-        (0x1fa80, 0x1fa88,),  # Yo-yo                   ..Flute
-        (0x1fa90, 0x1fabd,),  # Ringed Planet           ..Wing
-        (0x1fabf, 0x1fac5,),  # Goose                   ..Person With Crown
-        (0x1face, 0x1fadb,),  # Moose                   ..Pea Pod
-        (0x1fae0, 0x1fae8,),  # Melting Face            ..Shaking Face
-        (0x1faf0, 0x1faf8,),  # Hand With Index Finger A..Rightwards Pushing Hand
+        (0x1fa80, 0x1fa8a,),  # Yo-yo                   ..Trombone
+        (0x1fa8e, 0x1fac6,),  # Treasure Chest          ..Fingerprint
+        (0x1fac8, 0x1fac8,),  # Hairy Creature
+        (0x1facd, 0x1fadc,),  # Orca                    ..Root Vegetable
+        (0x1fadf, 0x1faea,),  # Splatter                ..Distorted Face
+        (0x1faef, 0x1faf8,),  # Fight Cloud             ..Rightwards Pushing Hand
         (0x20000, 0x2fffd,),  # Cjk Unified Ideograph-20..(nil)
         (0x30000, 0x3fffd,),  # Cjk Unified Ideograph-30..(nil)
     ),
diff --git a/libs/wcwidth/table_zero.py b/libs/wcwidth/table_zero.py
index dd42291560..c440bfcf15 100644
--- a/libs/wcwidth/table_zero.py
+++ b/libs/wcwidth/table_zero.py
@@ -1,4519 +1,15 @@
 """
 Exports ZERO_WIDTH table keyed by supporting unicode version level.
 
-This code generated by wcwidth/bin/update-tables.py on 2024-01-04 07:14:52 UTC.
+This code generated by wcwidth/bin/update-tables.py on 2026-01-30 00:48:24 UTC.
 """
+# pylint: disable=duplicate-code
 ZERO_WIDTH = {
-    '4.1.0': (
-        # Source: DerivedGeneralCategory-4.1.0.txt
-        # Date: 2005-02-26, 02:35:50 GMT [MD]
+    '17.0.0': (
+        # Source: DerivedGeneralCategory-17.0.0.txt
+        # Date: 2025-07-24, 00:12:50 GMT
         #
         (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00486,),  # Combining Cyrillic Titlo..Combining Cyrillic Psili
-        (0x00488, 0x00489,),  # Combining Cyrillic Hundr..Combining Cyrillic Milli
-        (0x00591, 0x005b9,),  # Hebrew Accent Etnahta   ..Hebrew Point Holam
-        (0x005bb, 0x005bd,),  # Hebrew Point Qubuts     ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00603,),  # Arabic Number Sign      ..Arabic Sign Safha
-        (0x00610, 0x00615,),  # Arabic Sign Sallallahou ..Arabic Small High Tah
-        (0x0064b, 0x0065e,),  # Arabic Fathatan         ..Arabic Fatha With Two Do
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006e4,),  # Arabic Small High Ligatu..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x00901, 0x00903,),  # Devanagari Sign Candrabi..Devanagari Sign Visarga
-        (0x0093c, 0x0093c,),  # Devanagari Sign Nukta
-        (0x0093e, 0x0094d,),  # Devanagari Vowel Sign Aa..Devanagari Sign Virama
-        (0x00951, 0x00954,),  # Devanagari Stress Sign U..Devanagari Acute Accent
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b43,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d43,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f90, 0x00f97,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102c, 0x01032,),  # Myanmar Vowel Sign Aa   ..Myanmar Vowel Sign Ai
-        (0x01036, 0x01039,),  # Myanmar Sign Anusvara   ..Myanmar Sign Virama
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135f, 0x0135f,),  # Ethiopic Combining Gemination Mark
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01dc0, 0x01dc3,),  # Combining Dotted Grave A..Combining Suspension Mar
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02063,),  # Word Joiner             ..Invisible Separator
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020eb,),  # Combining Left Harpoon A..Combining Long Double So
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe23,),  # Combining Ligature Left ..Combining Double Tilde R
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '5.0.0': (
-        # Source: DerivedGeneralCategory-5.0.0.txt
-        # Date: 2006-02-27, 23:41:27 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00486,),  # Combining Cyrillic Titlo..Combining Cyrillic Psili
-        (0x00488, 0x00489,),  # Combining Cyrillic Hundr..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00603,),  # Arabic Number Sign      ..Arabic Sign Safha
-        (0x00610, 0x00615,),  # Arabic Sign Sallallahou ..Arabic Small High Tah
-        (0x0064b, 0x0065e,),  # Arabic Fathatan         ..Arabic Fatha With Two Do
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006e4,),  # Arabic Small High Ligatu..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00901, 0x00903,),  # Devanagari Sign Candrabi..Devanagari Sign Visarga
-        (0x0093c, 0x0093c,),  # Devanagari Sign Nukta
-        (0x0093e, 0x0094d,),  # Devanagari Vowel Sign Aa..Devanagari Sign Virama
-        (0x00951, 0x00954,),  # Devanagari Stress Sign U..Devanagari Acute Accent
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b43,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d43,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f90, 0x00f97,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102c, 0x01032,),  # Myanmar Vowel Sign Aa   ..Myanmar Vowel Sign Ai
-        (0x01036, 0x01039,),  # Myanmar Sign Anusvara   ..Myanmar Sign Virama
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135f, 0x0135f,),  # Ethiopic Combining Gemination Mark
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01dc0, 0x01dca,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfe, 0x01dff,),  # Combining Left Arrowhead..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02063,),  # Word Joiner             ..Invisible Separator
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020ef,),  # Combining Left Harpoon A..Combining Right Arrow Be
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe23,),  # Combining Ligature Left ..Combining Double Tilde R
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '5.1.0': (
-        # Source: DerivedGeneralCategory-5.1.0.txt
-        # Date: 2008-03-20, 17:54:57 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00603,),  # Arabic Number Sign      ..Arabic Sign Safha
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0064b, 0x0065e,),  # Arabic Fathatan         ..Arabic Fatha With Two Do
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006e4,),  # Arabic Small High Ligatu..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00901, 0x00903,),  # Devanagari Sign Candrabi..Devanagari Sign Visarga
-        (0x0093c, 0x0093c,),  # Devanagari Sign Nukta
-        (0x0093e, 0x0094d,),  # Devanagari Vowel Sign Aa..Devanagari Sign Virama
-        (0x00951, 0x00954,),  # Devanagari Stress Sign U..Devanagari Acute Accent
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f90, 0x00f97,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135f, 0x0135f,),  # Ethiopic Combining Gemination Mark
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01baa,),  # Sundanese Consonant Sign..Sundanese Sign Pamaaeh
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01dc0, 0x01de6,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfe, 0x01dff,),  # Combining Left Arrowhead..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a67c, 0x0a67d,),  # Combining Cyrillic Kavyk..Combining Cyrillic Payer
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe26,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '5.2.0': (
-        # Source: DerivedGeneralCategory-5.2.0.txt
-        # Date: 2009-08-22, 04:58:21 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00603,),  # Arabic Number Sign      ..Arabic Sign Safha
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0064b, 0x0065e,),  # Arabic Fathatan         ..Arabic Fatha With Two Do
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006e4,),  # Arabic Small High Ligatu..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00900, 0x00903,),  # Devanagari Sign Inverted..Devanagari Sign Visarga
-        (0x0093c, 0x0093c,),  # Devanagari Sign Nukta
-        (0x0093e, 0x0094e,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Pr
-        (0x00951, 0x00955,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Ca
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f90, 0x00f97,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135f, 0x0135f,),  # Ethiopic Combining Gemination Mark
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01baa,),  # Sundanese Consonant Sign..Sundanese Sign Pamaaeh
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf2,),  # Vedic Sign Ardhavisarga
-        (0x01dc0, 0x01de6,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfd, 0x01dff,),  # Combining Almost Equal T..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a67c, 0x0a67d,),  # Combining Cyrillic Kavyk..Combining Cyrillic Payer
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7b,),  # Myanmar Sign Pao Karen Tone
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe26,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x11080, 0x11082,),  # Kaithi Sign Candrabindu ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '6.0.0': (
-        # Source: DerivedGeneralCategory-6.0.0.txt
-        # Date: 2010-08-19, 00:48:09 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00603,),  # Arabic Number Sign      ..Arabic Sign Safha
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x00900, 0x00903,),  # Devanagari Sign Inverted..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01baa,),  # Sundanese Consonant Sign..Sundanese Sign Pamaaeh
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf2,),  # Vedic Sign Ardhavisarga
-        (0x01dc0, 0x01de6,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfc, 0x01dff,),  # Combining Double Inverte..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a67c, 0x0a67d,),  # Combining Cyrillic Kavyk..Combining Cyrillic Payer
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7b,),  # Myanmar Sign Pao Karen Tone
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe26,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x11080, 0x11082,),  # Kaithi Sign Candrabindu ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '6.1.0': (
-        # Source: DerivedGeneralCategory-6.1.0.txt
-        # Date: 2011-11-27, 05:10:22 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00604,),  # Arabic Number Sign      ..Arabic Sign Samvat
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008e4, 0x008fe,),  # Arabic Curly Fatha      ..Arabic Damma With Dot
-        (0x00900, 0x00903,),  # Devanagari Sign Inverted..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01dc0, 0x01de6,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfc, 0x01dff,),  # Combining Double Inverte..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69f, 0x0a69f,),  # Combining Cyrillic Letter Iotified E
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7b,),  # Myanmar Sign Pao Karen Tone
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe26,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x11080, 0x11082,),  # Kaithi Sign Candrabindu ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '6.2.0': (
-        # Source: DerivedGeneralCategory-6.2.0.txt
-        # Date: 2012-05-20, 00:42:34 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00604,),  # Arabic Number Sign      ..Arabic Sign Samvat
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008e4, 0x008fe,),  # Arabic Curly Fatha      ..Arabic Damma With Dot
-        (0x00900, 0x00903,),  # Devanagari Sign Inverted..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180d,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01dc0, 0x01de6,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfc, 0x01dff,),  # Combining Double Inverte..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x0206a, 0x0206f,),  # Inhibit Symmetric Swappi..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69f, 0x0a69f,),  # Combining Cyrillic Letter Iotified E
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7b,),  # Myanmar Sign Pao Karen Tone
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe26,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x11080, 0x11082,),  # Kaithi Sign Candrabindu ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '6.3.0': (
-        # Source: DerivedGeneralCategory-6.3.0.txt
-        # Date: 2013-07-05, 14:08:45 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00604,),  # Arabic Number Sign      ..Arabic Sign Samvat
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008e4, 0x008fe,),  # Arabic Curly Fatha      ..Arabic Damma With Dot
-        (0x00900, 0x00903,),  # Devanagari Sign Inverted..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c01, 0x00c03,),  # Telugu Sign Candrabindu ..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c82, 0x00c83,),  # Kannada Sign Anusvara   ..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d02, 0x00d03,),  # Malayalam Sign Anusvara ..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01dc0, 0x01de6,),  # Combining Dotted Grave A..Combining Latin Small Le
-        (0x01dfc, 0x01dff,),  # Combining Double Inverte..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69f, 0x0a69f,),  # Combining Cyrillic Letter Iotified E
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7b,),  # Myanmar Sign Pao Karen Tone
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe26,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x11080, 0x11082,),  # Kaithi Sign Candrabindu ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '7.0.0': (
-        # Source: DerivedGeneralCategory-7.0.0.txt
-        # Date: 2014-02-07, 18:42:12 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008e4, 0x00903,),  # Arabic Curly Fatha      ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c03,),  # Telugu Sign Combining Ca..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d01, 0x00d03,),  # Malayalam Sign Candrabin..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x019b0, 0x019c0,),  # New Tai Lue Vowel Sign V..New Tai Lue Vowel Sign I
-        (0x019c8, 0x019c9,),  # New Tai Lue Tone Mark-1 ..New Tai Lue Tone Mark-2
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01cf8, 0x01cf9,),  # Vedic Tone Ring Above   ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df5,),  # Combining Dotted Grave A..Combining Up Tack Above
-        (0x01dfc, 0x01dff,),  # Combining Double Inverte..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69f, 0x0a69f,),  # Combining Cyrillic Letter Iotified E
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2d,),  # Combining Ligature Left ..Combining Conjoining Mac
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11301, 0x11303,),  # Grantha Sign Candrabindu..Grantha Sign Visarga
-        (0x1133c, 0x1133c,),  # Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '8.0.0': (
-        # Source: DerivedGeneralCategory-8.0.0.txt
-        # Date: 2015-02-13, 13:47:11 GMT [MD]
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008e3, 0x00903,),  # Arabic Turned Damma Belo..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c03,),  # Telugu Sign Combining Ca..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d01, 0x00d03,),  # Malayalam Sign Candrabin..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01cf8, 0x01cf9,),  # Vedic Tone Ring Above   ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df5,),  # Combining Dotted Grave A..Combining Up Tack Above
-        (0x01dfc, 0x01dff,),  # Combining Double Inverte..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c4,),  # Saurashtra Consonant Sig..Saurashtra Sign Virama
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111ca, 0x111cc,),  # Sharada Sign Nukta      ..Sharada Extra Short Vowe
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133c, 0x1133c,),  # Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '9.0.0': (
-        # Source: DerivedGeneralCategory-9.0.0.txt
-        # Date: 2016-06-01, 10:34:26 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008d4, 0x00903,),  # Arabic Small High Word A..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c03,),  # Telugu Sign Combining Ca..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d01, 0x00d03,),  # Malayalam Sign Candrabin..Malayalam Sign Visarga
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01cf8, 0x01cf9,),  # Vedic Tone Ring Above   ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df5,),  # Combining Dotted Grave A..Combining Up Tack Above
-        (0x01dfb, 0x01dff,),  # Combining Deletion Mark ..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111ca, 0x111cc,),  # Sharada Sign Nukta      ..Sharada Extra Short Vowe
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133c, 0x1133c,),  # Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '10.0.0': (
-        # Source: DerivedGeneralCategory-10.0.0.txt
-        # Date: 2017-03-08, 08:41:49 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008d4, 0x00903,),  # Arabic Small High Word A..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c03,),  # Telugu Sign Combining Ca..Telugu Sign Visarga
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df9,),  # Combining Dotted Grave A..Combining Wide Inverted
-        (0x01dfb, 0x01dff,),  # Combining Deletion Mark ..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111ca, 0x111cc,),  # Sharada Sign Nukta      ..Sharada Extra Short Vowe
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133c, 0x1133c,),  # Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '11.0.0': (
-        # Source: DerivedGeneralCategory-11.0.0.txt
-        # Date: 2018-02-21, 05:34:04 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x007fd, 0x007fd,),  # Nko Dantayalan
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008d3, 0x00903,),  # Arabic Small Low Waw    ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c04,),  # Telugu Sign Combining Ca..Telugu Sign Combining An
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00eb9,),  # Lao Vowel Sign I        ..Lao Vowel Sign Uu
-        (0x00ebb, 0x00ebc,),  # Lao Vowel Sign Mai Kon  ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf2, 0x01cf4,),  # Vedic Sign Ardhavisarga ..Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df9,),  # Combining Dotted Grave A..Combining Wide Inverted
-        (0x01dfb, 0x01dff,),  # Combining Deletion Mark ..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x1145e, 0x1145e,),  # Newa Sandhi Mark
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x1182c, 0x1183a,),  # Dogra Vowel Sign Aa     ..Dogra Sign Nukta
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d93, 0x11d97,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Virama
-        (0x11ef3, 0x11ef6,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign O
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f51, 0x16f7e,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ng
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '12.0.0': (
-        # Source: DerivedGeneralCategory-12.0.0.txt
-        # Date: 2019-01-22, 08:18:28 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x007fd, 0x007fd,),  # Nko Dantayalan
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008d3, 0x00903,),  # Arabic Small Low Waw    ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c04,),  # Telugu Sign Combining Ca..Telugu Sign Combining An
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df9,),  # Combining Dotted Grave A..Combining Wide Inverted
-        (0x01dfb, 0x01dff,),  # Combining Deletion Mark ..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x1145e, 0x1145e,),  # Newa Sandhi Mark
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x1182c, 0x1183a,),  # Dogra Vowel Sign Aa     ..Dogra Sign Nukta
-        (0x119d1, 0x119d7,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign V
-        (0x119da, 0x119e0,),  # Nandinagari Vowel Sign E..Nandinagari Sign Virama
-        (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d93, 0x11d97,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Virama
-        (0x11ef3, 0x11ef6,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign O
-        (0x13430, 0x13438,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph End
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
-        (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
-        (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '12.1.0': (
-        # Source: DerivedGeneralCategory-12.1.0.txt
-        # Date: 2019-03-10, 10:53:08 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x007fd, 0x007fd,),  # Nko Dantayalan
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008d3, 0x00903,),  # Arabic Small Low Waw    ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b56, 0x00b57,),  # Oriya Ai Length Mark    ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c04,),  # Telugu Sign Combining Ca..Telugu Sign Combining An
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d82, 0x00d83,),  # Sinhala Sign Anusvaraya ..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01abe,),  # Combining Doubled Circum..Combining Parentheses Ov
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df9,),  # Combining Dotted Grave A..Combining Wide Inverted
-        (0x01dfb, 0x01dff,),  # Combining Deletion Mark ..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x1145e, 0x1145e,),  # Newa Sandhi Mark
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x1182c, 0x1183a,),  # Dogra Vowel Sign Aa     ..Dogra Sign Nukta
-        (0x119d1, 0x119d7,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign V
-        (0x119da, 0x119e0,),  # Nandinagari Vowel Sign E..Nandinagari Sign Virama
-        (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d93, 0x11d97,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Virama
-        (0x11ef3, 0x11ef6,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign O
-        (0x13430, 0x13438,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph End
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
-        (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
-        (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '13.0.0': (
-        # Source: DerivedGeneralCategory-13.0.0.txt
-        # Date: 2019-10-21, 14:30:32 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x007fd, 0x007fd,),  # Nko Dantayalan
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x008d3, 0x00903,),  # Arabic Small Low Waw    ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b55, 0x00b57,),  # Oriya Sign Overline     ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c04,),  # Telugu Sign Combining Ca..Telugu Sign Combining An
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d81, 0x00d83,),  # Sinhala Sign Candrabindu..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01714,),  # Tagalog Vowel Sign I    ..Tagalog Sign Virama
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180e,),  # Mongolian Free Variation..Mongolian Vowel Separato
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01ac0,),  # Combining Doubled Circum..Combining Latin Small Le
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01df9,),  # Combining Dotted Grave A..Combining Wide Inverted
-        (0x01dfb, 0x01dff,),  # Combining Deletion Mark ..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a82c, 0x0a82c,),  # Syloti Nagri Sign Alternate Hasanta
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        (0x10eab, 0x10eac,),  # Yezidi Combining Hamza M..Yezidi Combining Madda M
-        (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        (0x111ce, 0x111cf,),  # Sharada Vowel Sign Prish..Sharada Sign Inverted Ca
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x1145e, 0x1145e,),  # Newa Sandhi Mark
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x1182c, 0x1183a,),  # Dogra Vowel Sign Aa     ..Dogra Sign Nukta
-        (0x11930, 0x11935,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign E
-        (0x11937, 0x11938,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign O
-        (0x1193b, 0x1193e,),  # Dives Akuru Sign Anusvar..Dives Akuru Virama
-        (0x11940, 0x11940,),  # Dives Akuru Medial Ya
-        (0x11942, 0x11943,),  # Dives Akuru Medial Ra   ..Dives Akuru Sign Nukta
-        (0x119d1, 0x119d7,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign V
-        (0x119da, 0x119e0,),  # Nandinagari Vowel Sign E..Nandinagari Sign Virama
-        (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d93, 0x11d97,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Virama
-        (0x11ef3, 0x11ef6,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign O
-        (0x13430, 0x13438,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph End
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
-        (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x16fe4, 0x16fe4,),  # Khitan Small Script Filler
-        (0x16ff0, 0x16ff1,),  # Vietnamese Alternate Rea..Vietnamese Alternate Rea
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
-        (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '14.0.0': (
-        # Source: DerivedGeneralCategory-14.0.0.txt
-        # Date: 2021-07-10, 00:35:08 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x007fd, 0x007fd,),  # Nko Dantayalan
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x00890, 0x00891,),  # Arabic Pound Mark Above ..Arabic Piastre Mark Abov
-        (0x00898, 0x0089f,),  # Arabic Small High Word A..Arabic Half Madda Over M
-        (0x008ca, 0x00903,),  # Arabic Small High Farsi ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b55, 0x00b57,),  # Oriya Sign Overline     ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c04,),  # Telugu Sign Combining Ca..Telugu Sign Combining An
-        (0x00c3c, 0x00c3c,),  # Telugu Sign Nukta
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d81, 0x00d83,),  # Sinhala Sign Candrabindu..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ecd,),  # Lao Tone Mai Ek         ..Lao Niggahita
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01715,),  # Tagalog Vowel Sign I    ..Tagalog Sign Pamudpod
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180f,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01ace,),  # Combining Doubled Circum..Combining Latin Small Le
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01dff,),  # Combining Dotted Grave A..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a82c, 0x0a82c,),  # Syloti Nagri Sign Alternate Hasanta
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        (0x10eab, 0x10eac,),  # Yezidi Combining Hamza M..Yezidi Combining Madda M
-        (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
-        (0x10f82, 0x10f85,),  # Old Uyghur Combining Dot..Old Uyghur Combining Two
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x11070, 0x11070,),  # Brahmi Sign Old Tamil Virama
-        (0x11073, 0x11074,),  # Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x110c2, 0x110c2,),  # Kaithi Vowel Sign Vocalic R
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        (0x111ce, 0x111cf,),  # Sharada Vowel Sign Prish..Sharada Sign Inverted Ca
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x1145e, 0x1145e,),  # Newa Sandhi Mark
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x1182c, 0x1183a,),  # Dogra Vowel Sign Aa     ..Dogra Sign Nukta
-        (0x11930, 0x11935,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign E
-        (0x11937, 0x11938,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign O
-        (0x1193b, 0x1193e,),  # Dives Akuru Sign Anusvar..Dives Akuru Virama
-        (0x11940, 0x11940,),  # Dives Akuru Medial Ya
-        (0x11942, 0x11943,),  # Dives Akuru Medial Ra   ..Dives Akuru Sign Nukta
-        (0x119d1, 0x119d7,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign V
-        (0x119da, 0x119e0,),  # Nandinagari Vowel Sign E..Nandinagari Sign Virama
-        (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d93, 0x11d97,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Virama
-        (0x11ef3, 0x11ef6,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign O
-        (0x13430, 0x13438,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph End
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
-        (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x16fe4, 0x16fe4,),  # Khitan Small Script Filler
-        (0x16ff0, 0x16ff1,),  # Vietnamese Alternate Rea..Vietnamese Alternate Rea
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1cf00, 0x1cf2d,),  # Znamenny Combining Mark ..Znamenny Combining Mark
-        (0x1cf30, 0x1cf46,),  # Znamenny Combining Tonal..Znamenny Priznak Modifie
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
-        (0x1e2ae, 0x1e2ae,),  # Toto Sign Rising Tone
-        (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '15.0.0': (
-        # Source: DerivedGeneralCategory-15.0.0.txt
-        # Date: 2022-04-26, 23:14:35 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
-        (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
-        (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
-        (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
-        (0x005bf, 0x005bf,),  # Hebrew Point Rafe
-        (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
-        (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
-        (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
-        (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
-        (0x0061c, 0x0061c,),  # Arabic Letter Mark
-        (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
-        (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
-        (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
-        (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
-        (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
-        (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
-        (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
-        (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
-        (0x007eb, 0x007f3,),  # Nko Combining Short High..Nko Combining Double Dot
-        (0x007fd, 0x007fd,),  # Nko Dantayalan
-        (0x00816, 0x00819,),  # Samaritan Mark In       ..Samaritan Mark Dagesh
-        (0x0081b, 0x00823,),  # Samaritan Mark Epentheti..Samaritan Vowel Sign A
-        (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
-        (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
-        (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x00890, 0x00891,),  # Arabic Pound Mark Above ..Arabic Piastre Mark Abov
-        (0x00898, 0x0089f,),  # Arabic Small High Word A..Arabic Half Madda Over M
-        (0x008ca, 0x00903,),  # Arabic Small High Farsi ..Devanagari Sign Visarga
-        (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
-        (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
-        (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
-        (0x00962, 0x00963,),  # Devanagari Vowel Sign Vo..Devanagari Vowel Sign Vo
-        (0x00981, 0x00983,),  # Bengali Sign Candrabindu..Bengali Sign Visarga
-        (0x009bc, 0x009bc,),  # Bengali Sign Nukta
-        (0x009be, 0x009c4,),  # Bengali Vowel Sign Aa   ..Bengali Vowel Sign Vocal
-        (0x009c7, 0x009c8,),  # Bengali Vowel Sign E    ..Bengali Vowel Sign Ai
-        (0x009cb, 0x009cd,),  # Bengali Vowel Sign O    ..Bengali Sign Virama
-        (0x009d7, 0x009d7,),  # Bengali Au Length Mark
-        (0x009e2, 0x009e3,),  # Bengali Vowel Sign Vocal..Bengali Vowel Sign Vocal
-        (0x009fe, 0x009fe,),  # Bengali Sandhi Mark
-        (0x00a01, 0x00a03,),  # Gurmukhi Sign Adak Bindi..Gurmukhi Sign Visarga
-        (0x00a3c, 0x00a3c,),  # Gurmukhi Sign Nukta
-        (0x00a3e, 0x00a42,),  # Gurmukhi Vowel Sign Aa  ..Gurmukhi Vowel Sign Uu
-        (0x00a47, 0x00a48,),  # Gurmukhi Vowel Sign Ee  ..Gurmukhi Vowel Sign Ai
-        (0x00a4b, 0x00a4d,),  # Gurmukhi Vowel Sign Oo  ..Gurmukhi Sign Virama
-        (0x00a51, 0x00a51,),  # Gurmukhi Sign Udaat
-        (0x00a70, 0x00a71,),  # Gurmukhi Tippi          ..Gurmukhi Addak
-        (0x00a75, 0x00a75,),  # Gurmukhi Sign Yakash
-        (0x00a81, 0x00a83,),  # Gujarati Sign Candrabind..Gujarati Sign Visarga
-        (0x00abc, 0x00abc,),  # Gujarati Sign Nukta
-        (0x00abe, 0x00ac5,),  # Gujarati Vowel Sign Aa  ..Gujarati Vowel Sign Cand
-        (0x00ac7, 0x00ac9,),  # Gujarati Vowel Sign E   ..Gujarati Vowel Sign Cand
-        (0x00acb, 0x00acd,),  # Gujarati Vowel Sign O   ..Gujarati Sign Virama
-        (0x00ae2, 0x00ae3,),  # Gujarati Vowel Sign Voca..Gujarati Vowel Sign Voca
-        (0x00afa, 0x00aff,),  # Gujarati Sign Sukun     ..Gujarati Sign Two-circle
-        (0x00b01, 0x00b03,),  # Oriya Sign Candrabindu  ..Oriya Sign Visarga
-        (0x00b3c, 0x00b3c,),  # Oriya Sign Nukta
-        (0x00b3e, 0x00b44,),  # Oriya Vowel Sign Aa     ..Oriya Vowel Sign Vocalic
-        (0x00b47, 0x00b48,),  # Oriya Vowel Sign E      ..Oriya Vowel Sign Ai
-        (0x00b4b, 0x00b4d,),  # Oriya Vowel Sign O      ..Oriya Sign Virama
-        (0x00b55, 0x00b57,),  # Oriya Sign Overline     ..Oriya Au Length Mark
-        (0x00b62, 0x00b63,),  # Oriya Vowel Sign Vocalic..Oriya Vowel Sign Vocalic
-        (0x00b82, 0x00b82,),  # Tamil Sign Anusvara
-        (0x00bbe, 0x00bc2,),  # Tamil Vowel Sign Aa     ..Tamil Vowel Sign Uu
-        (0x00bc6, 0x00bc8,),  # Tamil Vowel Sign E      ..Tamil Vowel Sign Ai
-        (0x00bca, 0x00bcd,),  # Tamil Vowel Sign O      ..Tamil Sign Virama
-        (0x00bd7, 0x00bd7,),  # Tamil Au Length Mark
-        (0x00c00, 0x00c04,),  # Telugu Sign Combining Ca..Telugu Sign Combining An
-        (0x00c3c, 0x00c3c,),  # Telugu Sign Nukta
-        (0x00c3e, 0x00c44,),  # Telugu Vowel Sign Aa    ..Telugu Vowel Sign Vocali
-        (0x00c46, 0x00c48,),  # Telugu Vowel Sign E     ..Telugu Vowel Sign Ai
-        (0x00c4a, 0x00c4d,),  # Telugu Vowel Sign O     ..Telugu Sign Virama
-        (0x00c55, 0x00c56,),  # Telugu Length Mark      ..Telugu Ai Length Mark
-        (0x00c62, 0x00c63,),  # Telugu Vowel Sign Vocali..Telugu Vowel Sign Vocali
-        (0x00c81, 0x00c83,),  # Kannada Sign Candrabindu..Kannada Sign Visarga
-        (0x00cbc, 0x00cbc,),  # Kannada Sign Nukta
-        (0x00cbe, 0x00cc4,),  # Kannada Vowel Sign Aa   ..Kannada Vowel Sign Vocal
-        (0x00cc6, 0x00cc8,),  # Kannada Vowel Sign E    ..Kannada Vowel Sign Ai
-        (0x00cca, 0x00ccd,),  # Kannada Vowel Sign O    ..Kannada Sign Virama
-        (0x00cd5, 0x00cd6,),  # Kannada Length Mark     ..Kannada Ai Length Mark
-        (0x00ce2, 0x00ce3,),  # Kannada Vowel Sign Vocal..Kannada Vowel Sign Vocal
-        (0x00cf3, 0x00cf3,),  # Kannada Sign Combining Anusvara Above Right
-        (0x00d00, 0x00d03,),  # Malayalam Sign Combining..Malayalam Sign Visarga
-        (0x00d3b, 0x00d3c,),  # Malayalam Sign Vertical ..Malayalam Sign Circular
-        (0x00d3e, 0x00d44,),  # Malayalam Vowel Sign Aa ..Malayalam Vowel Sign Voc
-        (0x00d46, 0x00d48,),  # Malayalam Vowel Sign E  ..Malayalam Vowel Sign Ai
-        (0x00d4a, 0x00d4d,),  # Malayalam Vowel Sign O  ..Malayalam Sign Virama
-        (0x00d57, 0x00d57,),  # Malayalam Au Length Mark
-        (0x00d62, 0x00d63,),  # Malayalam Vowel Sign Voc..Malayalam Vowel Sign Voc
-        (0x00d81, 0x00d83,),  # Sinhala Sign Candrabindu..Sinhala Sign Visargaya
-        (0x00dca, 0x00dca,),  # Sinhala Sign Al-lakuna
-        (0x00dcf, 0x00dd4,),  # Sinhala Vowel Sign Aela-..Sinhala Vowel Sign Ketti
-        (0x00dd6, 0x00dd6,),  # Sinhala Vowel Sign Diga Paa-pilla
-        (0x00dd8, 0x00ddf,),  # Sinhala Vowel Sign Gaett..Sinhala Vowel Sign Gayan
-        (0x00df2, 0x00df3,),  # Sinhala Vowel Sign Diga ..Sinhala Vowel Sign Diga
-        (0x00e31, 0x00e31,),  # Thai Character Mai Han-akat
-        (0x00e34, 0x00e3a,),  # Thai Character Sara I   ..Thai Character Phinthu
-        (0x00e47, 0x00e4e,),  # Thai Character Maitaikhu..Thai Character Yamakkan
-        (0x00eb1, 0x00eb1,),  # Lao Vowel Sign Mai Kan
-        (0x00eb4, 0x00ebc,),  # Lao Vowel Sign I        ..Lao Semivowel Sign Lo
-        (0x00ec8, 0x00ece,),  # Lao Tone Mai Ek         ..Lao Yamakkan
-        (0x00f18, 0x00f19,),  # Tibetan Astrological Sig..Tibetan Astrological Sig
-        (0x00f35, 0x00f35,),  # Tibetan Mark Ngas Bzung Nyi Zla
-        (0x00f37, 0x00f37,),  # Tibetan Mark Ngas Bzung Sgor Rtags
-        (0x00f39, 0x00f39,),  # Tibetan Mark Tsa -phru
-        (0x00f3e, 0x00f3f,),  # Tibetan Sign Yar Tshes  ..Tibetan Sign Mar Tshes
-        (0x00f71, 0x00f84,),  # Tibetan Vowel Sign Aa   ..Tibetan Mark Halanta
-        (0x00f86, 0x00f87,),  # Tibetan Sign Lci Rtags  ..Tibetan Sign Yang Rtags
-        (0x00f8d, 0x00f97,),  # Tibetan Subjoined Sign L..Tibetan Subjoined Letter
-        (0x00f99, 0x00fbc,),  # Tibetan Subjoined Letter..Tibetan Subjoined Letter
-        (0x00fc6, 0x00fc6,),  # Tibetan Symbol Padma Gdan
-        (0x0102b, 0x0103e,),  # Myanmar Vowel Sign Tall ..Myanmar Consonant Sign M
-        (0x01056, 0x01059,),  # Myanmar Vowel Sign Vocal..Myanmar Vowel Sign Vocal
-        (0x0105e, 0x01060,),  # Myanmar Consonant Sign M..Myanmar Consonant Sign M
-        (0x01062, 0x01064,),  # Myanmar Vowel Sign Sgaw ..Myanmar Tone Mark Sgaw K
-        (0x01067, 0x0106d,),  # Myanmar Vowel Sign Weste..Myanmar Sign Western Pwo
-        (0x01071, 0x01074,),  # Myanmar Vowel Sign Geba ..Myanmar Vowel Sign Kayah
-        (0x01082, 0x0108d,),  # Myanmar Consonant Sign S..Myanmar Sign Shan Counci
-        (0x0108f, 0x0108f,),  # Myanmar Sign Rumai Palaung Tone-5
-        (0x0109a, 0x0109d,),  # Myanmar Sign Khamti Tone..Myanmar Vowel Sign Aiton
-        (0x01160, 0x011ff,),  # Hangul Jungseong Filler ..Hangul Jongseong Ssangni
-        (0x0135d, 0x0135f,),  # Ethiopic Combining Gemin..Ethiopic Combining Gemin
-        (0x01712, 0x01715,),  # Tagalog Vowel Sign I    ..Tagalog Sign Pamudpod
-        (0x01732, 0x01734,),  # Hanunoo Vowel Sign I    ..Hanunoo Sign Pamudpod
-        (0x01752, 0x01753,),  # Buhid Vowel Sign I      ..Buhid Vowel Sign U
-        (0x01772, 0x01773,),  # Tagbanwa Vowel Sign I   ..Tagbanwa Vowel Sign U
-        (0x017b4, 0x017d3,),  # Khmer Vowel Inherent Aq ..Khmer Sign Bathamasat
-        (0x017dd, 0x017dd,),  # Khmer Sign Atthacan
-        (0x0180b, 0x0180f,),  # Mongolian Free Variation..Mongolian Free Variation
-        (0x01885, 0x01886,),  # Mongolian Letter Ali Gal..Mongolian Letter Ali Gal
-        (0x018a9, 0x018a9,),  # Mongolian Letter Ali Gali Dagalga
-        (0x01920, 0x0192b,),  # Limbu Vowel Sign A      ..Limbu Subjoined Letter W
-        (0x01930, 0x0193b,),  # Limbu Small Letter Ka   ..Limbu Sign Sa-i
-        (0x01a17, 0x01a1b,),  # Buginese Vowel Sign I   ..Buginese Vowel Sign Ae
-        (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
-        (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
-        (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01ace,),  # Combining Doubled Circum..Combining Latin Small Le
-        (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
-        (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
-        (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
-        (0x01b80, 0x01b82,),  # Sundanese Sign Panyecek ..Sundanese Sign Pangwisad
-        (0x01ba1, 0x01bad,),  # Sundanese Consonant Sign..Sundanese Consonant Sign
-        (0x01be6, 0x01bf3,),  # Batak Sign Tompi        ..Batak Panongonan
-        (0x01c24, 0x01c37,),  # Lepcha Subjoined Letter ..Lepcha Sign Nukta
-        (0x01cd0, 0x01cd2,),  # Vedic Tone Karshana     ..Vedic Tone Prenkha
-        (0x01cd4, 0x01ce8,),  # Vedic Sign Yajurvedic Mi..Vedic Sign Visarga Anuda
-        (0x01ced, 0x01ced,),  # Vedic Sign Tiryak
-        (0x01cf4, 0x01cf4,),  # Vedic Tone Candra Above
-        (0x01cf7, 0x01cf9,),  # Vedic Sign Atikrama     ..Vedic Tone Double Ring A
-        (0x01dc0, 0x01dff,),  # Combining Dotted Grave A..Combining Right Arrowhea
-        (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
-        (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
-        (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
-        (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
-        (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
-        (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
-        (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
-        (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
-        (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
-        (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
-        (0x0a6f0, 0x0a6f1,),  # Bamum Combining Mark Koq..Bamum Combining Mark Tuk
-        (0x0a802, 0x0a802,),  # Syloti Nagri Sign Dvisvara
-        (0x0a806, 0x0a806,),  # Syloti Nagri Sign Hasanta
-        (0x0a80b, 0x0a80b,),  # Syloti Nagri Sign Anusvara
-        (0x0a823, 0x0a827,),  # Syloti Nagri Vowel Sign ..Syloti Nagri Vowel Sign
-        (0x0a82c, 0x0a82c,),  # Syloti Nagri Sign Alternate Hasanta
-        (0x0a880, 0x0a881,),  # Saurashtra Sign Anusvara..Saurashtra Sign Visarga
-        (0x0a8b4, 0x0a8c5,),  # Saurashtra Consonant Sig..Saurashtra Sign Candrabi
-        (0x0a8e0, 0x0a8f1,),  # Combining Devanagari Dig..Combining Devanagari Sig
-        (0x0a8ff, 0x0a8ff,),  # Devanagari Vowel Sign Ay
-        (0x0a926, 0x0a92d,),  # Kayah Li Vowel Ue       ..Kayah Li Tone Calya Plop
-        (0x0a947, 0x0a953,),  # Rejang Vowel Sign I     ..Rejang Virama
-        (0x0a980, 0x0a983,),  # Javanese Sign Panyangga ..Javanese Sign Wignyan
-        (0x0a9b3, 0x0a9c0,),  # Javanese Sign Cecak Telu..Javanese Pangkon
-        (0x0a9e5, 0x0a9e5,),  # Myanmar Sign Shan Saw
-        (0x0aa29, 0x0aa36,),  # Cham Vowel Sign Aa      ..Cham Consonant Sign Wa
-        (0x0aa43, 0x0aa43,),  # Cham Consonant Sign Final Ng
-        (0x0aa4c, 0x0aa4d,),  # Cham Consonant Sign Fina..Cham Consonant Sign Fina
-        (0x0aa7b, 0x0aa7d,),  # Myanmar Sign Pao Karen T..Myanmar Sign Tai Laing T
-        (0x0aab0, 0x0aab0,),  # Tai Viet Mai Kang
-        (0x0aab2, 0x0aab4,),  # Tai Viet Vowel I        ..Tai Viet Vowel U
-        (0x0aab7, 0x0aab8,),  # Tai Viet Mai Khit       ..Tai Viet Vowel Ia
-        (0x0aabe, 0x0aabf,),  # Tai Viet Vowel Am       ..Tai Viet Tone Mai Ek
-        (0x0aac1, 0x0aac1,),  # Tai Viet Tone Mai Tho
-        (0x0aaeb, 0x0aaef,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0aaf5, 0x0aaf6,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Virama
-        (0x0abe3, 0x0abea,),  # Meetei Mayek Vowel Sign ..Meetei Mayek Vowel Sign
-        (0x0abec, 0x0abed,),  # Meetei Mayek Lum Iyek   ..Meetei Mayek Apun Iyek
-        (0x0d7b0, 0x0d7ff,),  # Hangul Jungseong O-yeo  ..(nil)
-        (0x0fb1e, 0x0fb1e,),  # Hebrew Point Judeo-spanish Varika
-        (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
-        (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
-        (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
-        (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
-        (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
-        (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
-        (0x10a01, 0x10a03,),  # Kharoshthi Vowel Sign I ..Kharoshthi Vowel Sign Vo
-        (0x10a05, 0x10a06,),  # Kharoshthi Vowel Sign E ..Kharoshthi Vowel Sign O
-        (0x10a0c, 0x10a0f,),  # Kharoshthi Vowel Length ..Kharoshthi Sign Visarga
-        (0x10a38, 0x10a3a,),  # Kharoshthi Sign Bar Abov..Kharoshthi Sign Dot Belo
-        (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
-        (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
-        (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
-        (0x10eab, 0x10eac,),  # Yezidi Combining Hamza M..Yezidi Combining Madda M
-        (0x10efd, 0x10eff,),  # Arabic Small Low Word Sa..Arabic Small Low Word Ma
-        (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
-        (0x10f82, 0x10f85,),  # Old Uyghur Combining Dot..Old Uyghur Combining Two
-        (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
-        (0x11038, 0x11046,),  # Brahmi Vowel Sign Aa    ..Brahmi Virama
-        (0x11070, 0x11070,),  # Brahmi Sign Old Tamil Virama
-        (0x11073, 0x11074,),  # Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta
-        (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
-        (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
-        (0x110c2, 0x110c2,),  # Kaithi Vowel Sign Vocalic R
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
-        (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
-        (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
-        (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
-        (0x11173, 0x11173,),  # Mahajani Sign Nukta
-        (0x11180, 0x11182,),  # Sharada Sign Candrabindu..Sharada Sign Visarga
-        (0x111b3, 0x111c0,),  # Sharada Vowel Sign Aa   ..Sharada Sign Virama
-        (0x111c9, 0x111cc,),  # Sharada Sandhi Mark     ..Sharada Extra Short Vowe
-        (0x111ce, 0x111cf,),  # Sharada Vowel Sign Prish..Sharada Sign Inverted Ca
-        (0x1122c, 0x11237,),  # Khojki Vowel Sign Aa    ..Khojki Sign Shadda
-        (0x1123e, 0x1123e,),  # Khojki Sign Sukun
-        (0x11241, 0x11241,),  # Khojki Vowel Sign Vocalic R
-        (0x112df, 0x112ea,),  # Khudawadi Sign Anusvara ..Khudawadi Sign Virama
-        (0x11300, 0x11303,),  # Grantha Sign Combining A..Grantha Sign Visarga
-        (0x1133b, 0x1133c,),  # Combining Bindu Below   ..Grantha Sign Nukta
-        (0x1133e, 0x11344,),  # Grantha Vowel Sign Aa   ..Grantha Vowel Sign Vocal
-        (0x11347, 0x11348,),  # Grantha Vowel Sign Ee   ..Grantha Vowel Sign Ai
-        (0x1134b, 0x1134d,),  # Grantha Vowel Sign Oo   ..Grantha Sign Virama
-        (0x11357, 0x11357,),  # Grantha Au Length Mark
-        (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
-        (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
-        (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
-        (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
-        (0x1145e, 0x1145e,),  # Newa Sandhi Mark
-        (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
-        (0x115af, 0x115b5,),  # Siddham Vowel Sign Aa   ..Siddham Vowel Sign Vocal
-        (0x115b8, 0x115c0,),  # Siddham Vowel Sign E    ..Siddham Sign Nukta
-        (0x115dc, 0x115dd,),  # Siddham Vowel Sign Alter..Siddham Vowel Sign Alter
-        (0x11630, 0x11640,),  # Modi Vowel Sign Aa      ..Modi Sign Ardhacandra
-        (0x116ab, 0x116b7,),  # Takri Sign Anusvara     ..Takri Sign Nukta
-        (0x1171d, 0x1172b,),  # Ahom Consonant Sign Medi..Ahom Sign Killer
-        (0x1182c, 0x1183a,),  # Dogra Vowel Sign Aa     ..Dogra Sign Nukta
-        (0x11930, 0x11935,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign E
-        (0x11937, 0x11938,),  # Dives Akuru Vowel Sign A..Dives Akuru Vowel Sign O
-        (0x1193b, 0x1193e,),  # Dives Akuru Sign Anusvar..Dives Akuru Virama
-        (0x11940, 0x11940,),  # Dives Akuru Medial Ya
-        (0x11942, 0x11943,),  # Dives Akuru Medial Ra   ..Dives Akuru Sign Nukta
-        (0x119d1, 0x119d7,),  # Nandinagari Vowel Sign A..Nandinagari Vowel Sign V
-        (0x119da, 0x119e0,),  # Nandinagari Vowel Sign E..Nandinagari Sign Virama
-        (0x119e4, 0x119e4,),  # Nandinagari Vowel Sign Prishthamatra E
-        (0x11a01, 0x11a0a,),  # Zanabazar Square Vowel S..Zanabazar Square Vowel L
-        (0x11a33, 0x11a39,),  # Zanabazar Square Final C..Zanabazar Square Sign Vi
-        (0x11a3b, 0x11a3e,),  # Zanabazar Square Cluster..Zanabazar Square Cluster
-        (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
-        (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
-        (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
-        (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
-        (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
-        (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
-        (0x11ca9, 0x11cb6,),  # Marchen Subjoined Letter..Marchen Sign Candrabindu
-        (0x11d31, 0x11d36,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3a, 0x11d3a,),  # Masaram Gondi Vowel Sign E
-        (0x11d3c, 0x11d3d,),  # Masaram Gondi Vowel Sign..Masaram Gondi Vowel Sign
-        (0x11d3f, 0x11d45,),  # Masaram Gondi Vowel Sign..Masaram Gondi Virama
-        (0x11d47, 0x11d47,),  # Masaram Gondi Ra-kara
-        (0x11d8a, 0x11d8e,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d90, 0x11d91,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Vowel Sign
-        (0x11d93, 0x11d97,),  # Gunjala Gondi Vowel Sign..Gunjala Gondi Virama
-        (0x11ef3, 0x11ef6,),  # Makasar Vowel Sign I    ..Makasar Vowel Sign O
-        (0x11f00, 0x11f01,),  # Kawi Sign Candrabindu   ..Kawi Sign Anusvara
-        (0x11f03, 0x11f03,),  # Kawi Sign Visarga
-        (0x11f34, 0x11f3a,),  # Kawi Vowel Sign Aa      ..Kawi Vowel Sign Vocalic
-        (0x11f3e, 0x11f42,),  # Kawi Vowel Sign E       ..Kawi Conjoiner
-        (0x13430, 0x13440,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph Mirr
-        (0x13447, 0x13455,),  # Egyptian Hieroglyph Modi..Egyptian Hieroglyph Modi
-        (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
-        (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
-        (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
-        (0x16f51, 0x16f87,),  # Miao Sign Aspiration    ..Miao Vowel Sign Ui
-        (0x16f8f, 0x16f92,),  # Miao Tone Right         ..Miao Tone Below
-        (0x16fe4, 0x16fe4,),  # Khitan Small Script Filler
-        (0x16ff0, 0x16ff1,),  # Vietnamese Alternate Rea..Vietnamese Alternate Rea
-        (0x1bc9d, 0x1bc9e,),  # Duployan Thick Letter Se..Duployan Double Mark
-        (0x1bca0, 0x1bca3,),  # Shorthand Format Letter ..Shorthand Format Up Step
-        (0x1cf00, 0x1cf2d,),  # Znamenny Combining Mark ..Znamenny Combining Mark
-        (0x1cf30, 0x1cf46,),  # Znamenny Combining Tonal..Znamenny Priznak Modifie
-        (0x1d165, 0x1d169,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d16d, 0x1d182,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d185, 0x1d18b,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d1aa, 0x1d1ad,),  # Musical Symbol Combining..Musical Symbol Combining
-        (0x1d242, 0x1d244,),  # Combining Greek Musical ..Combining Greek Musical
-        (0x1da00, 0x1da36,),  # Signwriting Head Rim    ..Signwriting Air Sucking
-        (0x1da3b, 0x1da6c,),  # Signwriting Mouth Closed..Signwriting Excitement
-        (0x1da75, 0x1da75,),  # Signwriting Upper Body Tilting From Hip Joints
-        (0x1da84, 0x1da84,),  # Signwriting Location Head Neck
-        (0x1da9b, 0x1da9f,),  # Signwriting Fill Modifie..Signwriting Fill Modifie
-        (0x1daa1, 0x1daaf,),  # Signwriting Rotation Mod..Signwriting Rotation Mod
-        (0x1e000, 0x1e006,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e008, 0x1e018,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e01b, 0x1e021,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e023, 0x1e024,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e026, 0x1e02a,),  # Combining Glagolitic Let..Combining Glagolitic Let
-        (0x1e08f, 0x1e08f,),  # Combining Cyrillic Small Letter Byelorussian-ukr
-        (0x1e130, 0x1e136,),  # Nyiakeng Puachue Hmong T..Nyiakeng Puachue Hmong T
-        (0x1e2ae, 0x1e2ae,),  # Toto Sign Rising Tone
-        (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
-        (0x1e4ec, 0x1e4ef,),  # Nag Mundari Sign Muhor  ..Nag Mundari Sign Sutuh
-        (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
-        (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
-    ),
-    '15.1.0': (
-        # Source: DerivedGeneralCategory-15.1.0.txt
-        # Date: 2023-07-28, 23:34:02 GMT
-        #
-        (0x00000, 0x00000,),  # (nil)
-        (0x000ad, 0x000ad,),  # Soft Hyphen
         (0x00300, 0x0036f,),  # Combining Grave Accent  ..Combining Latin Small Le
         (0x00483, 0x00489,),  # Combining Cyrillic Titlo..Combining Cyrillic Milli
         (0x00591, 0x005bd,),  # Hebrew Accent Etnahta   ..Hebrew Point Meteg
@@ -4521,16 +17,14 @@
         (0x005c1, 0x005c2,),  # Hebrew Point Shin Dot   ..Hebrew Point Sin Dot
         (0x005c4, 0x005c5,),  # Hebrew Mark Upper Dot   ..Hebrew Mark Lower Dot
         (0x005c7, 0x005c7,),  # Hebrew Point Qamats Qatan
-        (0x00600, 0x00605,),  # Arabic Number Sign      ..Arabic Number Mark Above
         (0x00610, 0x0061a,),  # Arabic Sign Sallallahou ..Arabic Small Kasra
         (0x0061c, 0x0061c,),  # Arabic Letter Mark
         (0x0064b, 0x0065f,),  # Arabic Fathatan         ..Arabic Wavy Hamza Below
         (0x00670, 0x00670,),  # Arabic Letter Superscript Alef
-        (0x006d6, 0x006dd,),  # Arabic Small High Ligatu..Arabic End Of Ayah
+        (0x006d6, 0x006dc,),  # Arabic Small High Ligatu..Arabic Small High Seen
         (0x006df, 0x006e4,),  # Arabic Small High Rounde..Arabic Small High Madda
         (0x006e7, 0x006e8,),  # Arabic Small High Yeh   ..Arabic Small High Noon
         (0x006ea, 0x006ed,),  # Arabic Empty Centre Low ..Arabic Small Low Meem
-        (0x0070f, 0x0070f,),  # Syriac Abbreviation Mark
         (0x00711, 0x00711,),  # Syriac Letter Superscript Alaph
         (0x00730, 0x0074a,),  # Syriac Pthaha Above     ..Syriac Barrekh
         (0x007a6, 0x007b0,),  # Thaana Abafili          ..Thaana Sukun
@@ -4541,9 +35,9 @@
         (0x00825, 0x00827,),  # Samaritan Vowel Sign Sho..Samaritan Vowel Sign U
         (0x00829, 0x0082d,),  # Samaritan Vowel Sign Lon..Samaritan Mark Nequdaa
         (0x00859, 0x0085b,),  # Mandaic Affrication Mark..Mandaic Gemination Mark
-        (0x00890, 0x00891,),  # Arabic Pound Mark Above ..Arabic Piastre Mark Abov
-        (0x00898, 0x0089f,),  # Arabic Small High Word A..Arabic Half Madda Over M
-        (0x008ca, 0x00903,),  # Arabic Small High Farsi ..Devanagari Sign Visarga
+        (0x00897, 0x0089f,),  # Arabic Pepet            ..Arabic Half Madda Over M
+        (0x008ca, 0x008e1,),  # Arabic Small High Farsi ..Arabic Small High Sign S
+        (0x008e3, 0x00903,),  # Arabic Turned Damma Belo..Devanagari Sign Visarga
         (0x0093a, 0x0093c,),  # Devanagari Vowel Sign Oe..Devanagari Sign Nukta
         (0x0093e, 0x0094f,),  # Devanagari Vowel Sign Aa..Devanagari Vowel Sign Aw
         (0x00951, 0x00957,),  # Devanagari Stress Sign U..Devanagari Vowel Sign Uu
@@ -4653,7 +147,8 @@
         (0x01a55, 0x01a5e,),  # Tai Tham Consonant Sign ..Tai Tham Consonant Sign
         (0x01a60, 0x01a7c,),  # Tai Tham Sign Sakot     ..Tai Tham Sign Khuen-lue
         (0x01a7f, 0x01a7f,),  # Tai Tham Combining Cryptogrammic Dot
-        (0x01ab0, 0x01ace,),  # Combining Doubled Circum..Combining Latin Small Le
+        (0x01ab0, 0x01add,),  # Combining Doubled Circum..Combining Dot-and-ring B
+        (0x01ae0, 0x01aeb,),  # Combining Left Tack Abov..Combining Double Rightwa
         (0x01b00, 0x01b04,),  # Balinese Sign Ulu Ricem ..Balinese Sign Bisah
         (0x01b34, 0x01b44,),  # Balinese Sign Rerekan   ..Balinese Adeg Adeg
         (0x01b6b, 0x01b73,),  # Balinese Musical Symbol ..Balinese Musical Symbol
@@ -4669,14 +164,14 @@
         (0x01dc0, 0x01dff,),  # Combining Dotted Grave A..Combining Right Arrowhea
         (0x0200b, 0x0200f,),  # Zero Width Space        ..Right-to-left Mark
         (0x02028, 0x0202e,),  # Line Separator          ..Right-to-left Override
-        (0x02060, 0x02064,),  # Word Joiner             ..Invisible Plus
-        (0x02066, 0x0206f,),  # Left-to-right Isolate   ..Nominal Digit Shapes
+        (0x02060, 0x0206f,),  # Word Joiner             ..Nominal Digit Shapes
         (0x020d0, 0x020f0,),  # Combining Left Harpoon A..Combining Asterisk Above
         (0x02cef, 0x02cf1,),  # Coptic Combining Ni Abov..Coptic Combining Spiritu
         (0x02d7f, 0x02d7f,),  # Tifinagh Consonant Joiner
         (0x02de0, 0x02dff,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
         (0x0302a, 0x0302f,),  # Ideographic Level Tone M..Hangul Double Dot Tone M
         (0x03099, 0x0309a,),  # Combining Katakana-hirag..Combining Katakana-hirag
+        (0x03164, 0x03164,),  # Hangul Filler
         (0x0a66f, 0x0a672,),  # Combining Cyrillic Vzmet..Combining Cyrillic Thous
         (0x0a674, 0x0a67d,),  # Combining Cyrillic Lette..Combining Cyrillic Payer
         (0x0a69e, 0x0a69f,),  # Combining Cyrillic Lette..Combining Cyrillic Lette
@@ -4713,7 +208,8 @@
         (0x0fe00, 0x0fe0f,),  # Variation Selector-1    ..Variation Selector-16
         (0x0fe20, 0x0fe2f,),  # Combining Ligature Left ..Combining Cyrillic Titlo
         (0x0feff, 0x0feff,),  # Zero Width No-break Space
-        (0x0fff9, 0x0fffb,),  # Interlinear Annotation A..Interlinear Annotation T
+        (0x0ffa0, 0x0ffa0,),  # Halfwidth Hangul Filler
+        (0x0fff0, 0x0fffb,),  # (nil)                   ..Interlinear Annotation T
         (0x101fd, 0x101fd,),  # Phaistos Disc Sign Combining Oblique Stroke
         (0x102e0, 0x102e0,),  # Coptic Epact Thousands Mark
         (0x10376, 0x1037a,),  # Combining Old Permic Let..Combining Old Permic Let
@@ -4724,8 +220,9 @@
         (0x10a3f, 0x10a3f,),  # Kharoshthi Virama
         (0x10ae5, 0x10ae6,),  # Manichaean Abbreviation ..Manichaean Abbreviation
         (0x10d24, 0x10d27,),  # Hanifi Rohingya Sign Har..Hanifi Rohingya Sign Tas
+        (0x10d69, 0x10d6d,),  # Garay Vowel Sign E      ..Garay Consonant Nasaliza
         (0x10eab, 0x10eac,),  # Yezidi Combining Hamza M..Yezidi Combining Madda M
-        (0x10efd, 0x10eff,),  # Arabic Small Low Word Sa..Arabic Small Low Word Ma
+        (0x10efa, 0x10eff,),  # Arabic Double Vertical B..Arabic Small Low Word Ma
         (0x10f46, 0x10f50,),  # Sogdian Combining Dot Be..Sogdian Combining Stroke
         (0x10f82, 0x10f85,),  # Old Uyghur Combining Dot..Old Uyghur Combining Two
         (0x11000, 0x11002,),  # Brahmi Sign Candrabindu ..Brahmi Sign Visarga
@@ -4734,9 +231,7 @@
         (0x11073, 0x11074,),  # Brahmi Vowel Sign Old Ta..Brahmi Vowel Sign Old Ta
         (0x1107f, 0x11082,),  # Brahmi Number Joiner    ..Kaithi Sign Visarga
         (0x110b0, 0x110ba,),  # Kaithi Vowel Sign Aa    ..Kaithi Sign Nukta
-        (0x110bd, 0x110bd,),  # Kaithi Number Sign
         (0x110c2, 0x110c2,),  # Kaithi Vowel Sign Vocalic R
-        (0x110cd, 0x110cd,),  # Kaithi Number Sign Above
         (0x11100, 0x11102,),  # Chakma Sign Candrabindu ..Chakma Sign Visarga
         (0x11127, 0x11134,),  # Chakma Vowel Sign A     ..Chakma Maayyaa
         (0x11145, 0x11146,),  # Chakma Vowel Sign Aa    ..Chakma Vowel Sign Ei
@@ -4758,6 +253,13 @@
         (0x11362, 0x11363,),  # Grantha Vowel Sign Vocal..Grantha Vowel Sign Vocal
         (0x11366, 0x1136c,),  # Combining Grantha Digit ..Combining Grantha Digit
         (0x11370, 0x11374,),  # Combining Grantha Letter..Combining Grantha Letter
+        (0x113b8, 0x113c0,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Vowel Sign
+        (0x113c2, 0x113c2,),  # Tulu-tigalari Vowel Sign Ee
+        (0x113c5, 0x113c5,),  # Tulu-tigalari Vowel Sign Ai
+        (0x113c7, 0x113ca,),  # Tulu-tigalari Vowel Sign..Tulu-tigalari Sign Candr
+        (0x113cc, 0x113d0,),  # Tulu-tigalari Sign Anusv..Tulu-tigalari Conjoiner
+        (0x113d2, 0x113d2,),  # Tulu-tigalari Gemination Mark
+        (0x113e1, 0x113e2,),  # Tulu-tigalari Vedic Tone..Tulu-tigalari Vedic Tone
         (0x11435, 0x11446,),  # Newa Vowel Sign Aa      ..Newa Sign Nukta
         (0x1145e, 0x1145e,),  # Newa Sandhi Mark
         (0x114b0, 0x114c3,),  # Tirhuta Vowel Sign Aa   ..Tirhuta Sign Nukta
@@ -4782,6 +284,7 @@
         (0x11a47, 0x11a47,),  # Zanabazar Square Subjoiner
         (0x11a51, 0x11a5b,),  # Soyombo Vowel Sign I    ..Soyombo Vowel Length Mar
         (0x11a8a, 0x11a99,),  # Soyombo Final Consonant ..Soyombo Subjoiner
+        (0x11b60, 0x11b67,),  # Sharada Vowel Sign Oe   ..Sharada Vowel Sign Candr
         (0x11c2f, 0x11c36,),  # Bhaiksuki Vowel Sign Aa ..Bhaiksuki Vowel Sign Voc
         (0x11c38, 0x11c3f,),  # Bhaiksuki Vowel Sign E  ..Bhaiksuki Sign Virama
         (0x11c92, 0x11ca7,),  # Marchen Subjoined Letter..Marchen Subjoined Letter
@@ -4799,8 +302,10 @@
         (0x11f03, 0x11f03,),  # Kawi Sign Visarga
         (0x11f34, 0x11f3a,),  # Kawi Vowel Sign Aa      ..Kawi Vowel Sign Vocalic
         (0x11f3e, 0x11f42,),  # Kawi Vowel Sign E       ..Kawi Conjoiner
+        (0x11f5a, 0x11f5a,),  # Kawi Sign Nukta
         (0x13430, 0x13440,),  # Egyptian Hieroglyph Vert..Egyptian Hieroglyph Mirr
         (0x13447, 0x13455,),  # Egyptian Hieroglyph Modi..Egyptian Hieroglyph Modi
+        (0x1611e, 0x1612f,),  # Gurung Khema Vowel Sign ..Gurung Khema Sign Tholho
         (0x16af0, 0x16af4,),  # Bassa Vah Combining High..Bassa Vah Combining High
         (0x16b30, 0x16b36,),  # Pahawh Hmong Mark Cim Tu..Pahawh Hmong Mark Cim Ta
         (0x16f4f, 0x16f4f,),  # Miao Sign Consonant Modifier Bar
@@ -4833,11 +338,13 @@
         (0x1e2ae, 0x1e2ae,),  # Toto Sign Rising Tone
         (0x1e2ec, 0x1e2ef,),  # Wancho Tone Tup         ..Wancho Tone Koini
         (0x1e4ec, 0x1e4ef,),  # Nag Mundari Sign Muhor  ..Nag Mundari Sign Sutuh
+        (0x1e5ee, 0x1e5ef,),  # Ol Onal Sign Mu         ..Ol Onal Sign Ikir
+        (0x1e6e3, 0x1e6e3,),  # Tai Yo Sign Ue
+        (0x1e6e6, 0x1e6e6,),  # Tai Yo Sign Au
+        (0x1e6ee, 0x1e6ef,),  # Tai Yo Sign Ay          ..Tai Yo Sign Ang
+        (0x1e6f5, 0x1e6f5,),  # Tai Yo Sign Om
         (0x1e8d0, 0x1e8d6,),  # Mende Kikakui Combining ..Mende Kikakui Combining
         (0x1e944, 0x1e94a,),  # Adlam Alif Lengthener   ..Adlam Nukta
-        (0x1f3fb, 0x1f3ff,),  # Emoji Modifier Fitzpatri..Emoji Modifier Fitzpatri
-        (0xe0001, 0xe0001,),  # Language Tag
-        (0xe0020, 0xe007f,),  # Tag Space               ..Cancel Tag
-        (0xe0100, 0xe01ef,),  # Variation Selector-17   ..Variation Selector-256
+        (0xe0000, 0xe0fff,),  # (nil)
     ),
 }
diff --git a/libs/wcwidth/textwrap.py b/libs/wcwidth/textwrap.py
new file mode 100644
index 0000000000..4582cd5e08
--- /dev/null
+++ b/libs/wcwidth/textwrap.py
@@ -0,0 +1,656 @@
+"""
+Sequence-aware text wrapping functions.
+
+This module provides functions for wrapping text that may contain terminal escape sequences, with
+proper handling of Unicode grapheme clusters and character display widths.
+"""
+from __future__ import annotations
+
+# std imports
+import re
+import secrets
+import textwrap
+
+from typing import TYPE_CHECKING, NamedTuple
+
+# local
+from .wcwidth import width as _width
+from .wcwidth import iter_sequences
+from .grapheme import iter_graphemes
+from .sgr_state import propagate_sgr as _propagate_sgr
+from .escape_sequences import ZERO_WIDTH_PATTERN
+
+if TYPE_CHECKING:  # pragma: no cover
+    from typing import Any, Literal
+
+
+class _HyperlinkState(NamedTuple):
+    """State for tracking an open OSC 8 hyperlink across line breaks."""
+
+    url: str  # hyperlink target URL
+    params: str  # id=xxx and other key=value pairs separated by :
+    terminator: str  # BEL (\x07) or ST (\x1b\\)
+
+
+# Hyperlink parsing: captures (params, url, terminator)
+_HYPERLINK_OPEN_RE = re.compile(r'\x1b]8;([^;]*);([^\x07\x1b]*)(\x07|\x1b\\)')
+
+
+def _parse_hyperlink_open(seq: str) -> _HyperlinkState | None:
+    """Parse OSC 8 open sequence, return state or None."""
+    if (m := _HYPERLINK_OPEN_RE.match(seq)):
+        return _HyperlinkState(url=m.group(2), params=m.group(1), terminator=m.group(3))
+    return None
+
+
+def _make_hyperlink_open(url: str, params: str, terminator: str) -> str:
+    """Generate OSC 8 open sequence."""
+    return f'\x1b]8;{params};{url}{terminator}'
+
+
+def _make_hyperlink_close(terminator: str) -> str:
+    """Generate OSC 8 close sequence."""
+    return f'\x1b]8;;{terminator}'
+
+
+class SequenceTextWrapper(textwrap.TextWrapper):
+    """
+    Sequence-aware text wrapper extending :class:`textwrap.TextWrapper`.
+
+    This wrapper properly handles terminal escape sequences and Unicode grapheme clusters when
+    calculating text width for wrapping.
+
+    This implementation is based on the SequenceTextWrapper from the 'blessed' library, with
+    contributions from Avram Lubkin and grayjk.
+
+    The key difference from the blessed implementation is the addition of grapheme cluster support
+    via :func:`~.iter_graphemes`, providing width calculation for ZWJ emoji sequences, VS-16 emojis
+    and variations, regional indicator flags, and combining characters.
+
+    OSC 8 hyperlinks are handled specially: when a hyperlink must span multiple lines, each line
+    receives complete open/close sequences with a shared ``id`` parameter, ensuring terminals
+    treat the fragments as a single hyperlink for hover underlining. If the original hyperlink
+    already has an ``id`` parameter, it is preserved; otherwise, one is generated.
+    """
+
+    def __init__(self, width: int = 70, *,
+                 control_codes: Literal['parse', 'strict', 'ignore'] = 'parse',
+                 tabsize: int = 8,
+                 ambiguous_width: int = 1,
+                 **kwargs: Any) -> None:
+        """
+        Initialize the wrapper.
+
+        :param width: Maximum line width in display cells.
+        :param control_codes: How to handle control sequences (see :func:`~.width`).
+        :param tabsize: Tab stop width for tab expansion.
+        :param ambiguous_width: Width to use for East Asian Ambiguous (A) characters.
+        :param kwargs: Additional arguments passed to :class:`textwrap.TextWrapper`.
+        """
+        super().__init__(width=width, **kwargs)
+        self.control_codes = control_codes
+        self.tabsize = tabsize
+        self.ambiguous_width = ambiguous_width
+
+    @staticmethod
+    def _next_hyperlink_id() -> str:
+        """Generate unique hyperlink id as 8-character hex string."""
+        return secrets.token_hex(4)
+
+    def _width(self, text: str) -> int:
+        """Measure text width accounting for sequences."""
+        return _width(text, control_codes=self.control_codes, tabsize=self.tabsize,
+                      ambiguous_width=self.ambiguous_width)
+
+    def _strip_sequences(self, text: str) -> str:
+        """Strip all terminal sequences from text."""
+        result = []
+        for segment, is_seq in iter_sequences(text):
+            if not is_seq:
+                result.append(segment)
+        return ''.join(result)
+
+    def _extract_sequences(self, text: str) -> str:
+        """Extract only terminal sequences from text."""
+        result = []
+        for segment, is_seq in iter_sequences(text):
+            if is_seq:
+                result.append(segment)
+        return ''.join(result)
+
+    def _split(self, text: str) -> list[str]:  # pylint: disable=too-many-locals
+        r"""
+        Sequence-aware variant of :meth:`textwrap.TextWrapper._split`.
+
+        This method ensures that terminal escape sequences don't interfere with the text splitting
+        logic, particularly for hyphen-based word breaking. It builds a position mapping from
+        stripped text to original text, calls the parent's _split on stripped text, then maps chunks
+        back.
+
+        OSC hyperlink sequences are treated as word boundaries::
+
+            >>> wrap('foo \x1b]8;;https://example.com\x07link\x1b]8;;\x07 bar', 6)
+            ['foo', '\x1b]8;;https://example.com\x07link\x1b]8;;\x07', 'bar']
+
+        Both BEL (``\x07``) and ST (``\x1b\\``) terminators are supported.
+        """
+        # pylint: disable=too-many-locals,too-many-branches
+        # Build a mapping from stripped text positions to original text positions.
+        #
+        # Track where each character ENDS so that sequences between characters
+        # attach to the following text (not preceding text). This ensures sequences
+        # aren't lost when whitespace is dropped.
+        #
+        # char_end[i] = position in original text right after the i-th stripped char
+        char_end: list[int] = []
+        stripped_text = ''
+        original_pos = 0
+        prev_was_hyperlink_close = False
+
+        for segment, is_seq in iter_sequences(text):
+            if not is_seq:
+                # Conditionally insert space after hyperlink close to force word boundary
+                if prev_was_hyperlink_close and segment and not segment[0].isspace():
+                    stripped_text += ' '
+                    char_end.append(original_pos)
+                for char in segment:
+                    original_pos += 1
+                    char_end.append(original_pos)
+                    stripped_text += char
+                prev_was_hyperlink_close = False
+            else:
+                is_hyperlink_close = segment.startswith(('\x1b]8;;\x1b\\', '\x1b]8;;\x07'))
+
+                # Conditionally insert space before OSC sequences to artificially create word
+                # boundary, but *not* before hyperlink close sequences, to ensure hyperlink is
+                # terminated on the same line.
+                if (segment.startswith('\x1b]') and stripped_text and not
+                        stripped_text[-1].isspace()):
+                    if not is_hyperlink_close:
+                        stripped_text += ' '
+                        char_end.append(original_pos)
+
+                # Escape sequences advance position but don't add to stripped text
+                original_pos += len(segment)
+                prev_was_hyperlink_close = is_hyperlink_close
+
+        # Add sentinel for final position
+        char_end.append(original_pos)
+
+        # Use parent's _split on the stripped text
+        # pylint: disable-next=protected-access
+        stripped_chunks = textwrap.TextWrapper._split(self, stripped_text)
+
+        # Handle text that contains only sequences (no visible characters).
+        # Return the sequences as a single chunk to preserve them.
+        if not stripped_chunks and text:
+            return [text]
+
+        # Map the chunks back to the original text with sequences
+        result: list[str] = []
+        stripped_pos = 0
+        num_chunks = len(stripped_chunks)
+
+        for idx, chunk in enumerate(stripped_chunks):
+            chunk_len = len(chunk)
+
+            # Start is where previous character ended (or 0 for first chunk)
+            start_orig = 0 if stripped_pos == 0 else char_end[stripped_pos - 1]
+
+            # End is where next character starts. For last chunk, use sentinel
+            # to include any trailing sequences.
+            if idx == num_chunks - 1:
+                end_orig = char_end[-1]  # sentinel includes trailing sequences
+            else:
+                end_orig = char_end[stripped_pos + chunk_len - 1]
+
+            # Extract the corresponding portion from the original text
+            # Skip empty chunks (from virtual spaces inserted at OSC boundaries)
+            if start_orig != end_orig:
+                result.append(text[start_orig:end_orig])
+            stripped_pos += chunk_len
+
+        return result
+
+    def _wrap_chunks(self, chunks: list[str]) -> list[str]:  # pylint: disable=too-many-branches
+        """
+        Wrap chunks into lines using sequence-aware width.
+
+        Override TextWrapper._wrap_chunks to use _width instead of len. Follows stdlib's algorithm:
+        greedily fill lines, handle long words.  Also handle OSC hyperlink processing. When
+        hyperlinks span multiple lines, each line gets complete open/close sequences with matching
+        id parameters for hover underlining continuity per OSC 8 spec.
+        """
+        # pylint: disable=too-many-branches,too-many-statements,too-complex,too-many-locals
+        # pylint: disable=too-many-nested-blocks
+        # the hyperlink code in particular really pushes the complexity rating of this method.
+        # preferring to keep it "all in one method" because of so much local state and manipulation.
+        if not chunks:
+            return []
+
+        if self.max_lines is not None:
+            if self.max_lines > 1:
+                indent = self.subsequent_indent
+            else:
+                indent = self.initial_indent
+            if (self._width(indent)
+                    + self._width(self.placeholder.lstrip())
+                    > self.width):
+                raise ValueError("placeholder too large for max width")
+
+        lines: list[str] = []
+        is_first_line = True
+
+        hyperlink_state: _HyperlinkState | None = None
+        # Track the id we're using for the current hyperlink continuation
+        current_hyperlink_id: str | None = None
+
+        # Arrange in reverse order so items can be efficiently popped
+        chunks = list(reversed(chunks))
+
+        while chunks:
+            current_line: list[str] = []
+            current_width = 0
+
+            # Get the indent and available width for current line
+            indent = self.initial_indent if is_first_line else self.subsequent_indent
+            line_width = self.width - self._width(indent)
+
+            # If continuing a hyperlink from previous line, prepend open sequence
+            if hyperlink_state is not None:
+                open_seq = _make_hyperlink_open(
+                    hyperlink_state.url, hyperlink_state.params, hyperlink_state.terminator)
+                chunks[-1] = open_seq + chunks[-1]
+
+            # Drop leading whitespace (except at very start)
+            # When dropping, transfer any sequences to the next chunk.
+            # Only drop if there's actual whitespace text, not if it's only sequences.
+            stripped = self._strip_sequences(chunks[-1])
+            if self.drop_whitespace and lines and stripped and not stripped.strip():
+                sequences = self._extract_sequences(chunks[-1])
+                del chunks[-1]
+                if sequences and chunks:
+                    chunks[-1] = sequences + chunks[-1]
+
+            # Greedily add chunks that fit
+            while chunks:
+                chunk = chunks[-1]
+                chunk_width = self._width(chunk)
+
+                if current_width + chunk_width <= line_width:
+                    current_line.append(chunks.pop())
+                    current_width += chunk_width
+                else:
+                    break
+
+            # Handle chunk that's too long for any line
+            if chunks and self._width(chunks[-1]) > line_width:
+                self._handle_long_word(
+                    chunks, current_line, current_width, line_width
+                )
+                current_width = self._width(''.join(current_line))
+                # Remove any empty chunks left by _handle_long_word
+                while chunks and not chunks[-1]:
+                    del chunks[-1]
+
+            # Drop trailing whitespace
+            # When dropping, transfer any sequences to the previous chunk.
+            # Only drop if there's actual whitespace text, not if it's only sequences.
+            stripped_last = self._strip_sequences(current_line[-1]) if current_line else ''
+            if (self.drop_whitespace and current_line and
+                    stripped_last and not stripped_last.strip()):
+                sequences = self._extract_sequences(current_line[-1])
+                current_width -= self._width(current_line[-1])
+                del current_line[-1]
+                if sequences and current_line:
+                    current_line[-1] = current_line[-1] + sequences
+
+            if current_line:
+                # Check whether this is a normal append or max_lines
+                # truncation. Matches stdlib textwrap precedence:
+                # normal if max_lines not set, not yet reached, or no
+                # remaining visible content that would need truncation.
+                no_more_content = (
+                    not chunks or
+                    self.drop_whitespace and
+                    len(chunks) == 1 and
+                    not self._strip_sequences(chunks[0]).strip()
+                )
+                if (self.max_lines is None or
+                        len(lines) + 1 < self.max_lines or
+                        no_more_content
+                        and current_width <= line_width):
+                    line_content = ''.join(current_line)
+
+                    # Track hyperlink state through this line's content
+                    new_state = self._track_hyperlink_state(line_content, hyperlink_state)
+
+                    # If we end inside a hyperlink, append close sequence
+                    if new_state is not None:
+                        # Ensure we have an id for continuation
+                        if current_hyperlink_id is None:
+                            if 'id=' in new_state.params:
+                                current_hyperlink_id = new_state.params
+                            elif new_state.params:
+                                # Prepend id to existing params (per OSC 8 spec, params can have
+                                # multiple key=value pairs separated by :)
+                                current_hyperlink_id = (
+                                    f'id={self._next_hyperlink_id()}:{new_state.params}')
+                            else:
+                                current_hyperlink_id = f'id={self._next_hyperlink_id()}'
+                        line_content += _make_hyperlink_close(new_state.terminator)
+
+                        # Also need to inject the id into the opening
+                        # sequence if it didn't have one
+                        if 'id=' not in new_state.params:
+                            # Find and replace the original open sequence with one that has id
+                            old_open = _make_hyperlink_open(
+                                new_state.url, new_state.params, new_state.terminator)
+                            new_open = _make_hyperlink_open(
+                                new_state.url, current_hyperlink_id, new_state.terminator)
+                            line_content = line_content.replace(old_open, new_open, 1)
+
+                        # Update state for next line, using computed id
+                        hyperlink_state = _HyperlinkState(
+                            new_state.url, current_hyperlink_id, new_state.terminator)
+                    else:
+                        hyperlink_state = None
+                        current_hyperlink_id = None  # Reset id when hyperlink closes
+
+                    # Strip trailing whitespace when drop_whitespace is enabled
+                    # (matches CPython #140627 fix behavior)
+                    if self.drop_whitespace:
+                        line_content = line_content.rstrip()
+                    lines.append(indent + line_content)
+                    is_first_line = False
+                else:
+                    # max_lines reached with remaining content โ€”
+                    # pop chunks until placeholder fits, then break.
+                    placeholder_w = self._width(self.placeholder)
+                    while current_line:
+                        last_text = self._strip_sequences(current_line[-1])
+                        if (last_text.strip()
+                                and current_width + placeholder_w <= line_width):
+                            line_content = ''.join(current_line)
+                            new_state = self._track_hyperlink_state(
+                                line_content, hyperlink_state)
+                            if new_state is not None:
+                                line_content += _make_hyperlink_close(
+                                    new_state.terminator)
+                            lines.append(indent + line_content + self.placeholder)
+                            break
+                        current_width -= self._width(current_line[-1])
+                        del current_line[-1]
+                    else:
+                        if lines:
+                            prev_line = self._rstrip_visible(lines[-1])
+                            if (self._width(prev_line) + placeholder_w
+                                    <= self.width):
+                                lines[-1] = prev_line + self.placeholder
+                                break
+                        lines.append(indent + self.placeholder.lstrip())
+                    break
+
+        return lines
+
+    def _track_hyperlink_state(
+            self, text: str,
+            state: _HyperlinkState | None) -> _HyperlinkState | None:
+        """
+        Track hyperlink state through text.
+
+        :param text: Text to scan for hyperlink sequences.
+        :param state: Current state or None if outside hyperlink.
+        :returns: Updated state after processing text.
+        """
+        for segment, is_seq in iter_sequences(text):
+            if is_seq:
+                parsed_link = _parse_hyperlink_open(segment)
+                if parsed_link is not None and parsed_link.url:  # has URL = open
+                    state = parsed_link
+                elif segment.startswith(('\x1b]8;;\x1b\\', '\x1b]8;;\x07')):  # close
+                    state = None
+        return state
+
+    def _handle_long_word(self, reversed_chunks: list[str],
+                          cur_line: list[str], cur_len: int,
+                          width: int) -> None:
+        """
+        Sequence-aware :meth:`textwrap.TextWrapper._handle_long_word`.
+
+        This method ensures that word boundaries are not broken mid-sequence, and respects grapheme
+        cluster boundaries when breaking long words.
+        """
+        if width < 1:
+            space_left = 1
+        else:
+            space_left = width - cur_len
+
+        chunk = reversed_chunks[-1]
+
+        if self.break_long_words:
+            break_at_hyphen = False
+            hyphen_end = 0
+
+            # Handle break_on_hyphens: find last hyphen within space_left
+            if self.break_on_hyphens:
+                # Strip sequences to find hyphen in logical text
+                stripped = self._strip_sequences(chunk)
+                if len(stripped) > space_left:
+                    # Find last hyphen in the portion that fits
+                    hyphen_pos = stripped.rfind('-', 0, space_left)
+                    if hyphen_pos > 0 and any(c != '-' for c in stripped[:hyphen_pos]):
+                        # Map back to original position including sequences
+                        hyphen_end = self._map_stripped_pos_to_original(chunk, hyphen_pos + 1)
+                        break_at_hyphen = True
+
+            # Break at grapheme boundaries to avoid splitting multi-codepoint characters
+            if break_at_hyphen:
+                actual_end = hyphen_end
+            else:
+                actual_end = self._find_break_position(chunk, space_left)
+                # If no progress possible (e.g., wide char exceeds line width),
+                # force at least one grapheme to avoid infinite loop.
+                # Only force when cur_line is empty; if line has content,
+                # appending nothing is safe and the line will be committed.
+                if actual_end == 0 and not cur_line:
+                    actual_end = self._find_first_grapheme_end(chunk)
+            cur_line.append(chunk[:actual_end])
+            reversed_chunks[-1] = chunk[actual_end:]
+
+        elif not cur_line:
+            cur_line.append(reversed_chunks.pop())
+
+    def _map_stripped_pos_to_original(self, text: str, stripped_pos: int) -> int:
+        """Map a position in stripped text back to original text position."""
+        stripped_idx = 0
+        original_idx = 0
+
+        for segment, is_seq in iter_sequences(text):
+            if is_seq:
+                original_idx += len(segment)
+            elif stripped_idx + len(segment) > stripped_pos:
+                # Position is within this segment
+                return original_idx + (stripped_pos - stripped_idx)
+            else:
+                stripped_idx += len(segment)
+                original_idx += len(segment)
+
+        # Caller guarantees stripped_pos < total stripped chars, so we always
+        # return from within the loop. This line satisfies the type checker.
+        return original_idx  # pragma: no cover
+
+    def _find_break_position(self, text: str, max_width: int) -> int:
+        """Find string index in text that fits within max_width cells."""
+        idx = 0
+        width_so_far = 0
+
+        while idx < len(text):
+            char = text[idx]
+
+            # Skip escape sequences (they don't add width)
+            if char == '\x1b':
+                match = ZERO_WIDTH_PATTERN.match(text, idx)
+                if match:
+                    idx = match.end()
+                    continue
+
+            # Get grapheme (use start= to avoid slice allocation)
+            grapheme = next(iter_graphemes(text, start=idx))
+
+            grapheme_width = self._width(grapheme)
+            if width_so_far + grapheme_width > max_width:
+                return idx  # Found break point
+
+            width_so_far += grapheme_width
+            idx += len(grapheme)
+
+        # Caller guarantees chunk_width > max_width, so a grapheme always
+        # exceeds and we return from within the loop. Type checker requires this.
+        return idx  # pragma: no cover
+
+    def _find_first_grapheme_end(self, text: str) -> int:
+        """Find the end position of the first grapheme."""
+        return len(next(iter_graphemes(text)))
+
+    def _rstrip_visible(self, text: str) -> str:
+        """Strip trailing visible whitespace, preserving trailing sequences."""
+        segments = list(iter_sequences(text))
+        last_vis = -1
+        for i, (segment, is_seq) in enumerate(segments):
+            if not is_seq and segment.rstrip():
+                last_vis = i
+        if last_vis == -1:
+            return ''
+        result = []
+        for i, (segment, is_seq) in enumerate(segments):
+            if i < last_vis:
+                result.append(segment)
+            elif i == last_vis:
+                result.append(segment.rstrip())
+            elif is_seq:
+                result.append(segment)
+        return ''.join(result)
+
+
+def wrap(text: str, width: int = 70, *,
+         control_codes: Literal['parse', 'strict', 'ignore'] = 'parse',
+         tabsize: int = 8,
+         expand_tabs: bool = True,
+         replace_whitespace: bool = True,
+         ambiguous_width: int = 1,
+         initial_indent: str = '',
+         subsequent_indent: str = '',
+         fix_sentence_endings: bool = False,
+         break_long_words: bool = True,
+         break_on_hyphens: bool = True,
+         drop_whitespace: bool = True,
+         max_lines: int | None = None,
+         placeholder: str = ' [...]',
+         propagate_sgr: bool = True) -> list[str]:
+    r"""
+    Wrap text to fit within given width, returning a list of wrapped lines.
+
+    Like :func:`textwrap.wrap`, but measures width in display cells rather than
+    characters, correctly handling wide characters, combining marks, and terminal
+    escape sequences.
+
+    :param text: Text to wrap, may contain terminal sequences.
+    :param width: Maximum line width in display cells.
+    :param control_codes: How to handle terminal sequences (see :func:`~.width`).
+    :param tabsize: Tab stop width for tab expansion.
+    :param expand_tabs: If True (default), tab characters are expanded
+        to spaces using ``tabsize``.
+    :param replace_whitespace: If True (default), each whitespace character
+        is replaced with a single space after tab expansion. When False,
+        control whitespace like ``\n`` has zero display width (unlike
+        :func:`textwrap.wrap` which counts ``len()``), so wrap points
+        may differ from stdlib for non-space whitespace characters.
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
+    :param initial_indent: String prepended to first line.
+    :param subsequent_indent: String prepended to subsequent lines.
+    :param fix_sentence_endings: If True, ensure sentences are always
+        separated by exactly two spaces.
+    :param break_long_words: If True, break words longer than width.
+    :param break_on_hyphens: If True, allow breaking at hyphens.
+    :param drop_whitespace: If True (default), whitespace at the beginning
+        and end of each line (after wrapping but before indenting) is dropped.
+        Set to False to preserve whitespace.
+    :param max_lines: If set, output contains at most this many lines, with
+        ``placeholder`` appended to the last line if the text was truncated.
+    :param placeholder: String appended to the last line when text is
+        truncated by ``max_lines``. Default is ``' [...]'``.
+    :param propagate_sgr: If True (default), SGR (terminal styling) sequences
+        are propagated across wrapped lines. Each line ends with a reset
+        sequence and the next line begins with the active style restored.
+    :returns: List of wrapped lines without trailing newlines.
+
+    SGR (terminal styling) sequences are propagated across wrapped lines
+    by default. Each line ends with a reset sequence and the next line
+    begins with the active style restored::
+
+        >>> wrap('\x1b[1;34mHello world\x1b[0m', width=6)
+        ['\x1b[1;34mHello\x1b[0m', '\x1b[1;34mworld\x1b[0m']
+
+    Set ``propagate_sgr=False`` to disable this behavior.
+
+    Like :func:`textwrap.wrap`, newlines in the input text are treated as
+    whitespace and collapsed. To preserve paragraph breaks, wrap each
+    paragraph separately::
+
+        >>> text = 'First line.\nSecond line.'
+        >>> wrap(text, 40)  # newline collapsed to space
+        ['First line. Second line.']
+        >>> [line for para in text.split('\n')
+        ...  for line in (wrap(para, 40) if para else [''])]
+        ['First line.', 'Second line.']
+
+    .. seealso::
+
+       :func:`textwrap.wrap`, :class:`textwrap.TextWrapper`
+           Standard library text wrapping (character-based).
+
+       :class:`.SequenceTextWrapper`
+           Class interface for advanced wrapping options.
+
+    .. versionadded:: 0.3.0
+
+    .. versionchanged:: 0.5.0
+       Added ``propagate_sgr`` parameter (default True).
+
+    .. versionchanged:: 0.6.0
+       Added ``expand_tabs``, ``replace_whitespace``, ``fix_sentence_endings``,
+       ``drop_whitespace``, ``max_lines``, and ``placeholder`` parameters.
+
+    Example::
+
+        >>> from wcwidth import wrap
+        >>> wrap('hello world', 5)
+        ['hello', 'world']
+        >>> wrap('ไธญๆ–‡ๅญ—็ฌฆ', 4)  # CJK characters (2 cells each)
+        ['ไธญๆ–‡', 'ๅญ—็ฌฆ']
+    """
+    # pylint: disable=too-many-arguments,too-many-locals
+    wrapper = SequenceTextWrapper(
+        width=width,
+        control_codes=control_codes,
+        tabsize=tabsize,
+        expand_tabs=expand_tabs,
+        replace_whitespace=replace_whitespace,
+        ambiguous_width=ambiguous_width,
+        initial_indent=initial_indent,
+        subsequent_indent=subsequent_indent,
+        fix_sentence_endings=fix_sentence_endings,
+        break_long_words=break_long_words,
+        break_on_hyphens=break_on_hyphens,
+        drop_whitespace=drop_whitespace,
+        max_lines=max_lines,
+        placeholder=placeholder,
+    )
+    lines = wrapper.wrap(text)
+
+    if propagate_sgr:
+        lines = _propagate_sgr(lines)
+
+    return lines
diff --git a/libs/wcwidth/unicode_versions.py b/libs/wcwidth/unicode_versions.py
index 4e9ccbf7a7..e8484116a4 100644
--- a/libs/wcwidth/unicode_versions.py
+++ b/libs/wcwidth/unicode_versions.py
@@ -1,38 +1,21 @@
 """
 Exports function list_versions() for unicode version level support.
 
-This code generated by wcwidth/bin/update-tables.py on 2023-09-14 15:45:33 UTC.
+This code generated by wcwidth/bin/update-tables.py on 2026-01-27 00:41:01 UTC.
 """
 
+from __future__ import annotations
 
-def list_versions():
+
+def list_versions() -> tuple[str, ...]:
     """
     Return Unicode version levels supported by this module release.
 
-    Any of the version strings returned may be used as keyword argument
-    ``unicode_version`` to the ``wcwidth()`` family of functions.
+    .. versionchanged:: 0.5.0
+       Now returns a single-element tuple containing only the latest version.
 
     :returns: Supported Unicode version numbers in ascending sorted order.
-    :rtype: list[str]
     """
     return (
-        "4.1.0",
-        "5.0.0",
-        "5.1.0",
-        "5.2.0",
-        "6.0.0",
-        "6.1.0",
-        "6.2.0",
-        "6.3.0",
-        "7.0.0",
-        "8.0.0",
-        "9.0.0",
-        "10.0.0",
-        "11.0.0",
-        "12.0.0",
-        "12.1.0",
-        "13.0.0",
-        "14.0.0",
-        "15.0.0",
-        "15.1.0",
+        "17.0.0",
     )
diff --git a/libs/wcwidth/wcwidth.py b/libs/wcwidth/wcwidth.py
index e924020630..98e7a635f6 100644
--- a/libs/wcwidth/wcwidth.py
+++ b/libs/wcwidth/wcwidth.py
@@ -60,78 +60,149 @@
 
 Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
 """
-from __future__ import division
+
+from __future__ import annotations
 
 # std imports
-import os
-import sys
-import warnings
+from functools import lru_cache
+
+from typing import TYPE_CHECKING
 
 # local
+from .bisearch import bisearch as _bisearch
+from .grapheme import iter_graphemes
+from .table_mc import CATEGORY_MC
+from .sgr_state import (_SGR_PATTERN,
+                        _SGR_STATE_DEFAULT,
+                        _sgr_state_update,
+                        _sgr_state_is_active,
+                        _sgr_state_to_sequence)
 from .table_vs16 import VS16_NARROW_TO_WIDE
 from .table_wide import WIDE_EASTASIAN
 from .table_zero import ZERO_WIDTH
+from .control_codes import ILLEGAL_CTRL, VERTICAL_CTRL, HORIZONTAL_CTRL, ZERO_WIDTH_CTRL
+from .table_grapheme import ISC_CONSONANT, EXTENDED_PICTOGRAPHIC, GRAPHEME_REGIONAL_INDICATOR
+from .table_ambiguous import AMBIGUOUS_EASTASIAN
+from .escape_sequences import (ZERO_WIDTH_PATTERN,
+                               CURSOR_LEFT_SEQUENCE,
+                               CURSOR_RIGHT_SEQUENCE,
+                               INDETERMINATE_EFFECT_SEQUENCE)
 from .unicode_versions import list_versions
 
-try:
+if TYPE_CHECKING:  # pragma: no cover
     # std imports
-    from functools import lru_cache
-except ImportError:
-    # lru_cache was added in Python 3.2
-    # 3rd party
-    from backports.functools_lru_cache import lru_cache
+    from collections.abc import Iterator
 
-# global cache
-_PY3 = sys.version_info[0] >= 3
+    from typing import Literal
 
+# Pre-compute table references for the latest (and only) Unicode version.
+_LATEST_VERSION = list_versions()[-1]
+_ZERO_WIDTH_TABLE = ZERO_WIDTH[_LATEST_VERSION]
+_WIDE_EASTASIAN_TABLE = WIDE_EASTASIAN[_LATEST_VERSION]
+_AMBIGUOUS_TABLE = AMBIGUOUS_EASTASIAN[next(iter(AMBIGUOUS_EASTASIAN))]
+_CATEGORY_MC_TABLE = CATEGORY_MC[_LATEST_VERSION]
+_REGIONAL_INDICATOR_SET = frozenset(
+    range(GRAPHEME_REGIONAL_INDICATOR[0][0], GRAPHEME_REGIONAL_INDICATOR[0][1] + 1)
+)
+_EMOJI_ZWJ_SET = frozenset(
+    cp for lo, hi in EXTENDED_PICTOGRAPHIC for cp in range(lo, hi + 1)
+) | _REGIONAL_INDICATOR_SET
+_FITZPATRICK_RANGE = (0x1F3FB, 0x1F3FF)
+# Indic_Syllabic_Category=Virama codepoints, from IndicSyllabicCategory.txt.
+# These are structurally tied to their scripts and not expected to change.
+# https://www.unicode.org/Public/UCD/latest/ucd/IndicSyllabicCategory.txt
+_ISC_VIRAMA_SET = frozenset((
+    0x094D,   # DEVANAGARI SIGN VIRAMA
+    0x09CD,   # BENGALI SIGN VIRAMA
+    0x0A4D,   # GURMUKHI SIGN VIRAMA
+    0x0ACD,   # GUJARATI SIGN VIRAMA
+    0x0B4D,   # ORIYA SIGN VIRAMA
+    0x0BCD,   # TAMIL SIGN VIRAMA
+    0x0C4D,   # TELUGU SIGN VIRAMA
+    0x0CCD,   # KANNADA SIGN VIRAMA
+    0x0D4D,   # MALAYALAM SIGN VIRAMA
+    0x0DCA,   # SINHALA SIGN AL-LAKUNA
+    0x1B44,   # BALINESE ADEG ADEG
+    0xA806,   # SYLOTI NAGRI SIGN HASANTA
+    0xA8C4,   # SAURASHTRA SIGN VIRAMA
+    0xA9C0,   # JAVANESE PANGKON
+    0x11046,  # BRAHMI VIRAMA
+    0x110B9,  # KAITHI SIGN VIRAMA
+    0x111C0,  # SHARADA SIGN VIRAMA
+    0x11235,  # KHOJKI SIGN VIRAMA
+    0x1134D,  # GRANTHA SIGN VIRAMA
+    0x11442,  # NEWA SIGN VIRAMA
+    0x114C2,  # TIRHUTA SIGN VIRAMA
+    0x115BF,  # SIDDHAM SIGN VIRAMA
+    0x1163F,  # MODI SIGN VIRAMA
+    0x116B6,  # TAKRI SIGN VIRAMA
+    0x11839,  # DOGRA SIGN VIRAMA
+    0x119E0,  # NANDINAGARI SIGN VIRAMA
+    0x11C3F,  # BHAIKSUKI SIGN VIRAMA
+))
+_ISC_CONSONANT_TABLE = ISC_CONSONANT
 
-def _bisearch(ucs, table):
-    """
-    Auxiliary function for binary search in interval table.
+# In 'parse' mode, strings longer than this are checked for cursor-movement
+# controls (BS, TAB, CR, cursor sequences); when absent, mode downgrades to
+# 'ignore' to skip character-by-character parsing. The detection scan cost is
+# negligible for long strings but wasted on short ones like labels or headings.
+_WIDTH_FAST_PATH_MIN_LEN = 20
 
-    :arg int ucs: Ordinal value of unicode character.
-    :arg list table: List of starting and ending ranges of ordinal values,
-        in form of ``[(start, end), ...]``.
-    :rtype: int
-    :returns: 1 if ordinal value ucs is found within lookup table, else 0.
-    """
-    lbound = 0
-    ubound = len(table) - 1
+# Translation table to strip C0/C1 control characters for fast 'ignore' mode.
+_CONTROL_CHAR_TABLE = str.maketrans('', '', (
+    ''.join(chr(c) for c in range(0x00, 0x20)) +   # C0: NUL through US (including tab)
+    '\x7f' +                                       # DEL
+    ''.join(chr(c) for c in range(0x80, 0xa0))     # C1: U+0080-U+009F
+))
 
-    if ucs < table[0][0] or ucs > table[ubound][1]:
-        return 0
-    while ubound >= lbound:
-        mid = (lbound + ubound) // 2
-        if ucs > table[mid][1]:
-            lbound = mid + 1
-        elif ucs < table[mid][0]:
-            ubound = mid - 1
-        else:
-            return 1
+# Unlike wcwidth.__all__, wcwidth.wcwidth.__all__ is NOT for the purpose of defining a public API,
+# or what we prefer to be imported with statement, "from wcwidth.wcwidth import *".  Explicitly
+# re-export imports here for no other reason than to satisfy the type checkers (mypy). Yak shavings.
+__all__ = (
+    'ZERO_WIDTH',
+    'WIDE_EASTASIAN',
+    'AMBIGUOUS_EASTASIAN',
+    'VS16_NARROW_TO_WIDE',
+    'list_versions',
+    'wcwidth',
+    'wcswidth',
+    'width',
+    'iter_sequences',
+    'ljust',
+    'rjust',
+    'center',
+    'clip',
+    'strip_sequences',
+    '_wcmatch_version',
+    '_wcversion_value',
+)
 
-    return 0
 
+# maxsize=1024: western scripts need ~64 unique codepoints per session, but
+# CJK sessions may use ~2000 of ~3500 common hanzi/kanji. 1024 accommodates
+# heavy CJK use. Performance floor at 32; bisearch is ~100ns per miss.
 
-@lru_cache(maxsize=1000)
-def wcwidth(wc, unicode_version='auto'):
+@lru_cache(maxsize=1024)
+def wcwidth(wc: str, unicode_version: str = 'auto', ambiguous_width: int = 1) -> int:  # pylint: disable=unused-argument
     r"""
-    Given one Unicode character, return its printable length on a terminal.
+    Given one Unicode codepoint, return its printable length on a terminal.
 
-    :param str wc: A single Unicode character.
-    :param str unicode_version: A Unicode version number, such as
-        ``'6.0.0'``. A list of version levels suported by wcwidth
-        is returned by :func:`list_versions`.
+    :param wc: A single Unicode character.
+    :param unicode_version: Ignored. Retained for backwards compatibility.
 
-        Any version string may be specified without error -- the nearest
-        matching version is selected.  When ``latest`` (default), the
-        highest Unicode version level is used.
-    :return: The width, in cells, necessary to display the character of
+        .. deprecated:: 0.3.0
+           Only the latest Unicode version is now shipped.
+
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts
+        where ambiguous characters display as double-width. See
+        :ref:`ambiguous_width` for details.
+    :returns: The width, in cells, necessary to display the character of
         Unicode string character, ``wc``.  Returns 0 if the ``wc`` argument has
         no printable effect on a terminal (such as NUL '\0'), -1 if ``wc`` is
         not printable, or has an indeterminate effect on the terminal, such as
         a control character.  Otherwise, the number of column positions the
         character occupies on a graphic terminal (1 or 2) is returned.
-    :rtype: int
 
     See :ref:`Specification` for details of cell measurement.
     """
@@ -147,81 +218,175 @@ def wcwidth(wc, unicode_version='auto'):
     if ucs and ucs < 32 or 0x07F <= ucs < 0x0A0:
         return -1
 
-    _unicode_version = _wcmatch_version(unicode_version)
-
     # Zero width
-    if _bisearch(ucs, ZERO_WIDTH[_unicode_version]):
+    if _bisearch(ucs, _ZERO_WIDTH_TABLE):
         return 0
 
-    # 1 or 2 width
-    return 1 + _bisearch(ucs, WIDE_EASTASIAN[_unicode_version])
+    # Wide (F/W categories)
+    if _bisearch(ucs, _WIDE_EASTASIAN_TABLE):
+        return 2
+
+    # Ambiguous width (A category) - only when ambiguous_width=2
+    if ambiguous_width == 2 and _bisearch(ucs, _AMBIGUOUS_TABLE):
+        return 2
 
+    return 1
 
-def wcswidth(pwcs, n=None, unicode_version='auto'):
+
+def wcswidth(
+    pwcs: str,
+    n: int | None = None,
+    unicode_version: str = 'auto',
+    ambiguous_width: int = 1,
+) -> int:
     """
     Given a unicode string, return its printable length on a terminal.
 
-    :param str pwcs: Measure width of given unicode string.
-    :param int n: When ``n`` is None (default), return the length of the entire
-        string, otherwise only the first ``n`` characters are measured. This
-        argument exists only for compatibility with the C POSIX function
-        signature. It is suggested instead to use python's string slicing
-        capability, ``wcswidth(pwcs[:n])``
-    :param str unicode_version: An explicit definition of the unicode version
-        level to use for determination, may be ``auto`` (default), which uses
-        the Environment Variable, ``UNICODE_VERSION`` if defined, or the latest
-        available unicode version, otherwise.
-    :rtype: int
+    :param pwcs: Measure width of given unicode string.
+    :param n: When ``n`` is None (default), return the length of the entire
+        string, otherwise only the first ``n`` characters are measured.
+
+        Better to use string slicing capability, ``wcswidth(pwcs[:n])``, instead,
+        for performance.  This argument is a holdover from the POSIX function for
+        matching signatures. Be careful that ``n`` is at grapheme boundaries.
+
+    :param unicode_version: Ignored. Retained for backwards compatibility.
+
+        .. deprecated:: 0.3.0
+           Only the latest Unicode version is now shipped.
+
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
     :returns: The width, in cells, needed to display the first ``n`` characters
         of the unicode string ``pwcs``.  Returns ``-1`` for C0 and C1 control
         characters!
 
     See :ref:`Specification` for details of cell measurement.
     """
-    # this 'n' argument is a holdover for POSIX function
-    _unicode_version = None
+    # pylint: disable=unused-argument,too-many-locals,too-many-statements
+    # pylint: disable=too-complex,too-many-branches
+    # This function intentionally kept long without delegating functions to reduce function calls in
+    # "hot path", the overhead per-character adds up.
+
+    # Fast path: pure ASCII printable strings are always width == length
+    if n is None and pwcs.isascii() and pwcs.isprintable():
+        return len(pwcs)
+
+    # Select wcwidth call pattern for best lru_cache performance:
+    # - ambiguous_width=1 (default): single-arg calls share cache with direct wcwidth() calls
+    # - ambiguous_width=2: full positional args needed (results differ, separate cache is correct)
+    _wcwidth = wcwidth if ambiguous_width == 1 else lambda c: wcwidth(c, 'auto', ambiguous_width)
+
     end = len(pwcs) if n is None else n
-    width = 0
+    total_width = 0
     idx = 0
-    last_measured_char = None
+    last_measured_idx = -2  # Track index of last measured char for VS16
+    last_measured_ucs = -1  # Codepoint of last measured char (for deferred emoji check)
+    last_was_virama = False  # Virama conjunct formation state
+    conjunct_pending = False  # Deferred +1 for bare conjuncts (no trailing Mc)
     while idx < end:
         char = pwcs[idx]
-        if char == u'\u200D':
-            # Zero Width Joiner, do not measure this or next character
-            idx += 2
+        ucs = ord(char)
+        if ucs == 0x200D:
+            if last_was_virama:
+                # ZWJ after virama requests explicit half-form rendering but
+                # does not change cell count โ€” consume ZWJ only, let the next
+                # consonant be handled by the virama conjunct rule.
+                idx += 1
+            elif idx + 1 < end:
+                # Emoji ZWJ: skip next character unconditionally.
+                idx += 2
+                last_was_virama = False
+            else:
+                idx += 1
+                last_was_virama = False
+            continue
+        if ucs == 0xFE0F and last_measured_idx >= 0:
+            # VS16 following a measured character: add 1 if that character is
+            # known to be converted from narrow to wide by VS16.
+            total_width += _bisearch(ord(pwcs[last_measured_idx]),
+                                     VS16_NARROW_TO_WIDE["9.0.0"])
+            last_measured_idx = -2  # Prevent double application
+            # VS16 preserves emoji context: last_measured_ucs stays as the base
+            idx += 1
             continue
-        if char == u'\uFE0F' and last_measured_char:
-            # on variation selector 16 (VS16) following another character,
-            # conditionally add '1' to the measured width if that character is
-            # known to be converted from narrow to wide by the VS16 character.
-            if _unicode_version is None:
-                _unicode_version = _wcversion_value(_wcmatch_version(unicode_version))
-            if _unicode_version >= (9, 0, 0):
-                width += _bisearch(ord(last_measured_char), VS16_NARROW_TO_WIDE["9.0.0"])
-                last_measured_char = None
+        # Regional Indicator & Fitzpatrick: both above BMP (U+1F1E6+)
+        if ucs > 0xFFFF:
+            if ucs in _REGIONAL_INDICATOR_SET:
+                # Lazy RI pairing: count preceding consecutive RIs only when the last one is
+                # received, because RI's are received so rarely its better than per-loop tracking of
+                # 'last char was an RI'.
+                ri_before = 0
+                j = idx - 1
+                while j >= 0 and ord(pwcs[j]) in _REGIONAL_INDICATOR_SET:
+                    ri_before += 1
+                    j -= 1
+                if ri_before % 2 == 1:
+                    # Second RI in pair: contributes 0 (pair = one 2-cell flag) using an even-or-odd
+                    # check to determine, 'CAUS' would be two flags, but 'CAU' would be 1 flag
+                    # and wide 'U'.
+                    idx += 1
+                    last_measured_ucs = ucs
+                    continue
+                # First or unpaired RI: measured normally (width 2 from table)
+            # Fitzpatrick modifier: zero-width when following emoji base
+            elif (_FITZPATRICK_RANGE[0] <= ucs <= _FITZPATRICK_RANGE[1]
+                  and last_measured_ucs in _EMOJI_ZWJ_SET):
+                idx += 1
+                continue
+        # Virama conjunct formation: consonant following virama contributes 0 width.
+        # See https://www.unicode.org/reports/tr44/#Indic_Syllabic_Category
+        if last_was_virama and _bisearch(ucs, _ISC_CONSONANT_TABLE):
+            last_measured_idx = idx
+            last_measured_ucs = ucs
+            last_was_virama = False
+            conjunct_pending = True
             idx += 1
             continue
-        # measure character at current index
-        wcw = wcwidth(char, unicode_version)
+        wcw = _wcwidth(char)
         if wcw < 0:
             # early return -1 on C0 and C1 control characters
             return wcw
         if wcw > 0:
-            # track last character measured to contain a cell, so that
-            # subsequent VS-16 modifiers may be understood
-            last_measured_char = char
-        width += wcw
+            if conjunct_pending:
+                total_width += 1
+                conjunct_pending = False
+            last_measured_idx = idx
+            last_measured_ucs = ucs
+            last_was_virama = False
+        elif last_measured_idx >= 0 and _bisearch(ucs, _CATEGORY_MC_TABLE):
+            # Spacing Combining Mark (Mc) following a base character adds 1
+            wcw = 1
+            last_measured_idx = -2
+            last_was_virama = False
+            conjunct_pending = False
+        else:
+            last_was_virama = ucs in _ISC_VIRAMA_SET
+        total_width += wcw
         idx += 1
-    return width
+    if conjunct_pending:
+        total_width += 1
+    return total_width
+
+
+# NOTE: _wcversion_value and _wcmatch_version are no longer used internally
+# by wcwidth since version 0.5.0 (only the latest Unicode version is shipped).
+#
+# They are retained for API compatibility with external tools like ucs-detect
+# that may use these private functions.
 
 
 @lru_cache(maxsize=128)
-def _wcversion_value(ver_string):
+def _wcversion_value(ver_string: str) -> tuple[int, ...]:  # pragma: no cover
     """
     Integer-mapped value of given dotted version string.
 
-    :param str ver_string: Unicode version string, of form ``n.n.n``.
-    :rtype: tuple(int)
+    .. deprecated:: 0.3.0
+
+        This function is no longer used internally by wcwidth but is retained
+        for API compatibility with external tools.
+
+    :param ver_string: Unicode version string, of form ``n.n.n``.
     :returns: tuple of digit tuples, ``tuple(int, [...])``.
     """
     retval = tuple(map(int, (ver_string.split('.'))))
@@ -229,117 +394,637 @@ def _wcversion_value(ver_string):
 
 
 @lru_cache(maxsize=8)
-def _wcmatch_version(given_version):
+def _wcmatch_version(given_version: str) -> str:  # pylint: disable=unused-argument
+    """
+    Return the supported Unicode version level.
+
+    .. deprecated:: 0.3.0
+        This function now always returns the latest version.
+
+        This function is no longer used internally by wcwidth but is retained
+        for API compatibility with external tools.
+
+    :param given_version: Ignored. Any value is accepted for compatibility.
+    :returns: The latest unicode version string.
+    """
+    return _LATEST_VERSION
+
+
+def iter_sequences(text: str) -> Iterator[tuple[str, bool]]:
+    r"""
+    Iterate through text, yielding segments with sequence identification.
+
+    This generator yields tuples of ``(segment, is_sequence)`` for each part
+    of the input text, where ``is_sequence`` is ``True`` if the segment is
+    a recognized terminal escape sequence.
+
+    :param text: String to iterate through.
+    :returns: Iterator of (segment, is_sequence) tuples.
+
+    .. versionadded:: 0.3.0
+
+    Example::
+
+        >>> list(iter_sequences('hello'))
+        [('hello', False)]
+        >>> list(iter_sequences('\x1b[31mred'))
+        [('\x1b[31m', True), ('red', False)]
+        >>> list(iter_sequences('\x1b[1m\x1b[31m'))
+        [('\x1b[1m', True), ('\x1b[31m', True)]
+    """
+    idx = 0
+    text_len = len(text)
+    segment_start = 0
+
+    while idx < text_len:
+        char = text[idx]
+
+        if char == '\x1b':
+            # Yield any accumulated non-sequence text
+            if idx > segment_start:
+                yield (text[segment_start:idx], False)
+
+            # Try to match an escape sequence
+            match = ZERO_WIDTH_PATTERN.match(text, idx)
+            if match:
+                yield (match.group(), True)
+                idx = match.end()
+            else:
+                # Lone ESC or unrecognized - yield as sequence anyway
+                yield (char, True)
+                idx += 1
+            segment_start = idx
+        else:
+            idx += 1
+
+    # Yield any remaining text
+    if segment_start < text_len:
+        yield (text[segment_start:], False)
+
+
+def _width_ignored_codes(text: str, ambiguous_width: int = 1) -> int:
+    """
+    Fast path for width() with control_codes='ignore'.
+
+    Strips escape sequences and control characters, then measures remaining text.
+    """
+    return wcswidth(
+        strip_sequences(text).translate(_CONTROL_CHAR_TABLE),
+        ambiguous_width=ambiguous_width
+    )
+
+
+def width(
+    text: str,
+    *,
+    control_codes: Literal['parse', 'strict', 'ignore'] = 'parse',
+    tabsize: int = 8,
+    ambiguous_width: int = 1,
+) -> int:
+    r"""
+    Return printable width of text containing many kinds of control codes and sequences.
+
+    Unlike :func:`wcswidth`, this function handles most control characters and many popular terminal
+    output sequences.  Never returns -1.
+
+    :param text: String to measure.
+    :param control_codes: How to handle control characters and sequences:
+
+        - ``'parse'`` (default): Track horizontal cursor movement from BS ``\b``, CR ``\r``, TAB
+          ``\t``, and cursor left and right movement sequences.  Vertical movement (LF, VT, FF) and
+          indeterminate sequences are zero-width. Never raises.
+        - ``'strict'``: Like parse, but raises :exc:`ValueError` on control characters with
+          indeterminate results of the screen or cursor, like clear or vertical movement. Generally,
+          these should be handled with a virtual terminal emulator (like 'pyte').
+        - ``'ignore'``: All C0 and C1 control characters and escape sequences are measured as
+          width 0. This is the fastest measurement for text already filtered or known not to contain
+          any kinds of control codes or sequences. TAB ``\t`` is zero-width; for tab expansion,
+          pre-process: ``text.replace('\t', ' ' * 8)``.
+
+    :param tabsize: Tab stop width for ``'parse'`` and ``'strict'`` modes. Default is 8.
+        Must be positive. Has no effect when ``control_codes='ignore'``.
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
+    :returns: Maximum cursor position reached, "extent", accounting for cursor movement sequences
+        present in ``text`` according to given parameters.  This represents the rightmost column the
+        cursor reaches.  Always a non-negative integer.
+
+    :raises ValueError: If ``control_codes='strict'`` and control characters with indeterminate
+        effects, such as vertical movement or clear sequences are encountered, or on unexpected
+        C0 or C1 control code. Also raised when ``control_codes`` is not one of the valid values.
+
+    .. versionadded:: 0.3.0
+
+    Examples::
+
+        >>> width('hello')
+        5
+        >>> width('ใ‚ณใƒณใƒ‹ใƒใƒ')
+        10
+        >>> width('\x1b[31mred\x1b[0m')
+        3
+        >>> width('\x1b[31mred\x1b[0m', control_codes='ignore')  # same result (ignored)
+        3
+        >>> width('123\b4')     # backspace overwrites previous cell (outputs '124')
+        3
+        >>> width('abc\t')      # tab caused cursor to move to column 8
+        8
+        >>> width('1\x1b[10C')  # '1' + cursor right 10, cursor ends on column 11
+        11
+        >>> width('1\x1b[10C', control_codes='ignore')   # faster but wrong in this case
+        1
+    """
+    # pylint: disable=too-complex,too-many-branches,too-many-statements,too-many-locals
+    # This could be broken into sub-functions (#1, #3, and 6 especially), but for reduced overhead
+    # considering this function is a likely "hot path", they are inlined, breaking many of our
+    # complexity rules.
+
+    # Fast path for ASCII printable (no tabs, escapes, or control chars)
+    if text.isascii() and text.isprintable():
+        return len(text)
+
+    # Fast parse: if no horizontal cursor movements are possible, switch to 'ignore' mode.
+    # Only check for longer strings - the detection overhead hurts short string performance.
+    if control_codes == 'parse' and len(text) > _WIDTH_FAST_PATH_MIN_LEN:
+        # Check for cursor-affecting control characters
+        if '\b' not in text and '\t' not in text and '\r' not in text:
+            # Check for escape sequences - if none, or only non-cursor-movement sequences
+            if '\x1b' not in text or (
+                not CURSOR_RIGHT_SEQUENCE.search(text) and
+                not CURSOR_LEFT_SEQUENCE.search(text)
+            ):
+                control_codes = 'ignore'
+
+    # Fast path for ignore mode -- this is useful if you know the text is already "clean"
+    if control_codes == 'ignore':
+        return _width_ignored_codes(text, ambiguous_width)
+
+    strict = control_codes == 'strict'
+    # Track absolute positions: tab stops need modulo on absolute column, CR resets to 0.
+    # Initialize max_extent to 0 so backward movement (CR, BS) won't yield negative width.
+    current_col = 0
+    max_extent = 0
+    idx = 0
+    last_measured_idx = -2  # Track index of last measured char for VS16; -2 can never match idx-1
+    last_measured_ucs = -1  # Codepoint of last measured char (for deferred emoji check)
+    last_was_virama = False  # Virama conjunct formation state
+    conjunct_pending = False  # Deferred +1 for bare conjuncts (no trailing Mc)
+    text_len = len(text)
+
+    # Select wcwidth call pattern for best lru_cache performance:
+    # - ambiguous_width=1 (default): single-arg calls share cache with direct wcwidth() calls
+    # - ambiguous_width=2: full positional args needed (results differ, separate cache is correct)
+    _wcwidth = wcwidth if ambiguous_width == 1 else lambda c: wcwidth(c, 'auto', ambiguous_width)
+
+    while idx < text_len:
+        char = text[idx]
+
+        # 1. Handle ESC sequences
+        if char == '\x1b':
+            match = ZERO_WIDTH_PATTERN.match(text, idx)
+            if match:
+                seq = match.group()
+                if strict and INDETERMINATE_EFFECT_SEQUENCE.match(seq):
+                    raise ValueError(f"Indeterminate cursor sequence at position {idx}")
+                # Apply cursor movement
+                right = CURSOR_RIGHT_SEQUENCE.match(seq)
+                if right:
+                    current_col += int(right.group(1) or 1)
+                else:
+                    left = CURSOR_LEFT_SEQUENCE.match(seq)
+                    if left:
+                        current_col = max(0, current_col - int(left.group(1) or 1))
+                idx = match.end()
+            else:
+                idx += 1
+            max_extent = max(max_extent, current_col)
+            continue
+
+        # 2. Handle illegal and vertical control characters (zero width, error in strict)
+        if char in ILLEGAL_CTRL:
+            if strict:
+                raise ValueError(f"Illegal control character {ord(char):#x} at position {idx}")
+            idx += 1
+            continue
+
+        if char in VERTICAL_CTRL:
+            if strict:
+                raise ValueError(f"Vertical movement character {ord(char):#x} at position {idx}")
+            idx += 1
+            continue
+
+        # 3. Handle horizontal movement characters
+        if char in HORIZONTAL_CTRL:
+            if char == '\x09' and tabsize > 0:  # Tab
+                current_col += tabsize - (current_col % tabsize)
+            elif char == '\x08':  # Backspace
+                if current_col > 0:
+                    current_col -= 1
+            elif char == '\x0d':  # Carriage return
+                current_col = 0
+            max_extent = max(max_extent, current_col)
+            idx += 1
+            continue
+
+        # 4. Handle ZWJ
+        if char == '\u200D':
+            if last_was_virama:
+                # ZWJ after virama requests explicit half-form rendering but
+                # does not change cell count โ€” consume ZWJ only, let the next
+                # consonant be handled by the virama conjunct rule.
+                idx += 1
+            elif idx + 1 < text_len:
+                # Emoji ZWJ: skip next character unconditionally.
+                idx += 2
+                last_was_virama = False
+            else:
+                idx += 1
+                last_was_virama = False
+            continue
+
+        # 5. Handle other zero-width characters (control chars)
+        if char in ZERO_WIDTH_CTRL:
+            idx += 1
+            continue
+
+        ucs = ord(char)
+
+        # 6. Handle VS16: converts preceding narrow character to wide
+        if ucs == 0xFE0F:
+            if last_measured_idx == idx - 1:
+                if _bisearch(ord(text[last_measured_idx]), VS16_NARROW_TO_WIDE["9.0.0"]):
+                    current_col += 1
+                    max_extent = max(max_extent, current_col)
+            # VS16 preserves emoji context: last_measured_ucs stays as the base
+            idx += 1
+            continue
+
+        # 6b. Regional Indicator & Fitzpatrick: both above BMP (U+1F1E6+)
+        if ucs > 0xFFFF:
+            if ucs in _REGIONAL_INDICATOR_SET:
+                # Lazy RI pairing: count preceding consecutive RIs
+                ri_before = 0
+                j = idx - 1
+                while j >= 0 and ord(text[j]) in _REGIONAL_INDICATOR_SET:
+                    ri_before += 1
+                    j -= 1
+                if ri_before % 2 == 1:
+                    last_measured_ucs = ucs
+                    idx += 1
+                    continue
+            # 6c. Fitzpatrick modifier: zero-width when following emoji base
+            elif (_FITZPATRICK_RANGE[0] <= ucs <= _FITZPATRICK_RANGE[1]
+                  and last_measured_ucs in _EMOJI_ZWJ_SET):
+                idx += 1
+                continue
+
+        # 7. Virama conjunct formation: consonant following virama contributes 0 width.
+        # See https://www.unicode.org/reports/tr44/#Indic_Syllabic_Category
+        if last_was_virama and _bisearch(ucs, _ISC_CONSONANT_TABLE):
+            last_measured_idx = idx
+            last_measured_ucs = ucs
+            last_was_virama = False
+            conjunct_pending = True
+            idx += 1
+            continue
+
+        # 8. Normal characters: measure with wcwidth
+        w = _wcwidth(char)
+        if w > 0:
+            if conjunct_pending:
+                current_col += 1
+                conjunct_pending = False
+            current_col += w
+            max_extent = max(max_extent, current_col)
+            last_measured_idx = idx
+            last_measured_ucs = ucs
+            last_was_virama = False
+        elif last_measured_idx >= 0 and _bisearch(ucs, _CATEGORY_MC_TABLE):
+            # Spacing Combining Mark (Mc) following a base character adds 1
+            current_col += 1
+            max_extent = max(max_extent, current_col)
+            last_measured_idx = -2
+            last_was_virama = False
+            conjunct_pending = False
+        else:
+            last_was_virama = ucs in _ISC_VIRAMA_SET
+        idx += 1
+
+    if conjunct_pending:
+        current_col += 1
+        max_extent = max(max_extent, current_col)
+    return max_extent
+
+
+def ljust(
+    text: str,
+    dest_width: int,
+    fillchar: str = ' ',
+    *,
+    control_codes: Literal['parse', 'strict', 'ignore'] = 'parse',
+    ambiguous_width: int = 1,
+) -> str:
+    r"""
+    Return text left-justified in a string of given display width.
+
+    :param text: String to justify, may contain terminal sequences.
+    :param dest_width: Total display width of result in terminal cells.
+    :param fillchar: Single character for padding (default space). Must have
+        display width of 1 (not wide, not zero-width, not combining). Unicode
+        characters like ``'ยท'`` are acceptable. The width is not validated.
+    :param control_codes: How to handle control sequences when measuring.
+        Passed to :func:`width` for measurement.
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
+    :returns: Text padded on the right to reach ``dest_width``.
+
+    .. versionadded:: 0.3.0
+
+    Example::
+
+        >>> wcwidth.ljust('hi', 5)
+        'hi   '
+        >>> wcwidth.ljust('\x1b[31mhi\x1b[0m', 5)
+        '\x1b[31mhi\x1b[0m   '
+        >>> wcwidth.ljust('\U0001F468\u200D\U0001F469\u200D\U0001F467', 6)
+        '๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ง    '
+    """
+    if text.isascii() and text.isprintable():
+        text_width = len(text)
+    else:
+        text_width = width(text, control_codes=control_codes, ambiguous_width=ambiguous_width)
+    padding_cells = max(0, dest_width - text_width)
+    return text + fillchar * padding_cells
+
+
+def rjust(
+    text: str,
+    dest_width: int,
+    fillchar: str = ' ',
+    *,
+    control_codes: Literal['parse', 'strict', 'ignore'] = 'parse',
+    ambiguous_width: int = 1,
+) -> str:
+    r"""
+    Return text right-justified in a string of given display width.
+
+    :param text: String to justify, may contain terminal sequences.
+    :param dest_width: Total display width of result in terminal cells.
+    :param fillchar: Single character for padding (default space). Must have
+        display width of 1 (not wide, not zero-width, not combining). Unicode
+        characters like ``'ยท'`` are acceptable. The width is not validated.
+    :param control_codes: How to handle control sequences when measuring.
+        Passed to :func:`width` for measurement.
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
+    :returns: Text padded on the left to reach ``dest_width``.
+
+    .. versionadded:: 0.3.0
+
+    Example::
+
+        >>> wcwidth.rjust('hi', 5)
+        '   hi'
+        >>> wcwidth.rjust('\x1b[31mhi\x1b[0m', 5)
+        '   \x1b[31mhi\x1b[0m'
+        >>> wcwidth.rjust('\U0001F468\u200D\U0001F469\u200D\U0001F467', 6)
+        '    ๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ง'
     """
-    Return nearest matching supported Unicode version level.
-
-    If an exact match is not determined, the nearest lowest version level is
-    returned after a warning is emitted.  For example, given supported levels
-    ``4.1.0`` and ``5.0.0``, and a version string of ``4.9.9``, then ``4.1.0``
-    is selected and returned:
-
-    >>> _wcmatch_version('4.9.9')
-    '4.1.0'
-    >>> _wcmatch_version('8.0')
-    '8.0.0'
-    >>> _wcmatch_version('1')
-    '4.1.0'
-
-    :param str given_version: given version for compare, may be ``auto``
-        (default), to select Unicode Version from Environment Variable,
-        ``UNICODE_VERSION``. If the environment variable is not set, then the
-        latest is used.
-    :rtype: str
-    :returns: unicode string, or non-unicode ``str`` type for python 2
-        when given ``version`` is also type ``str``.
+    if text.isascii() and text.isprintable():
+        text_width = len(text)
+    else:
+        text_width = width(text, control_codes=control_codes, ambiguous_width=ambiguous_width)
+    padding_cells = max(0, dest_width - text_width)
+    return fillchar * padding_cells + text
+
+
+def center(
+    text: str,
+    dest_width: int,
+    fillchar: str = ' ',
+    *,
+    control_codes: Literal['parse', 'strict', 'ignore'] = 'parse',
+    ambiguous_width: int = 1,
+) -> str:
+    r"""
+    Return text centered in a string of given display width.
+
+    :param text: String to center, may contain terminal sequences.
+    :param dest_width: Total display width of result in terminal cells.
+    :param fillchar: Single character for padding (default space). Must have
+        display width of 1 (not wide, not zero-width, not combining). Unicode
+        characters like ``'ยท'`` are acceptable. The width is not validated.
+    :param control_codes: How to handle control sequences when measuring.
+        Passed to :func:`width` for measurement.
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
+    :returns: Text padded on both sides to reach ``dest_width``.
+
+    For odd-width padding, the extra cell goes on the right (matching
+    Python's :meth:`str.center` behavior).
+
+    .. versionadded:: 0.3.0
+
+    Example::
+
+        >>> wcwidth.center('hi', 6)
+        '  hi  '
+        >>> wcwidth.center('\x1b[31mhi\x1b[0m', 6)
+        '  \x1b[31mhi\x1b[0m  '
+        >>> wcwidth.center('\U0001F468\u200D\U0001F469\u200D\U0001F467', 6)
+        '  ๐Ÿ‘จโ€๐Ÿ‘ฉโ€๐Ÿ‘ง  '
     """
-    # Design note: the choice to return the same type that is given certainly
-    # complicates it for python 2 str-type, but allows us to define an api that
-    # uses 'string-type' for unicode version level definitions, so all of our
-    # example code works with all versions of python.
-    #
-    # That, along with the string-to-numeric and comparisons of earliest,
-    # latest, matching, or nearest, greatly complicates this function.
-    # Performance is somewhat curbed by memoization.
-    _return_str = not _PY3 and isinstance(given_version, str)
-
-    if _return_str:
-        # avoid list-comprehension to work around a coverage issue:
-        # https://github.com/nedbat/coveragepy/issues/753
-        unicode_versions = list(map(lambda ucs: ucs.encode(), list_versions()))
+    if text.isascii() and text.isprintable():
+        text_width = len(text)
     else:
-        unicode_versions = list_versions()
-    latest_version = unicode_versions[-1]
-
-    if given_version in (u'auto', 'auto'):
-        given_version = os.environ.get(
-            'UNICODE_VERSION',
-            'latest' if not _return_str else latest_version.encode())
-
-    if given_version in (u'latest', 'latest'):
-        # default match, when given as 'latest', use the most latest unicode
-        # version specification level supported.
-        return latest_version if not _return_str else latest_version.encode()
-
-    if given_version in unicode_versions:
-        # exact match, downstream has specified an explicit matching version
-        # matching any value of list_versions().
-        return given_version if not _return_str else given_version.encode()
-
-    # The user's version is not supported by ours. We return the newest unicode
-    # version level that we support below their given value.
-    try:
-        cmp_given = _wcversion_value(given_version)
-
-    except ValueError:
-        # submitted value raises ValueError in int(), warn and use latest.
-        warnings.warn("UNICODE_VERSION value, {given_version!r}, is invalid. "
-                      "Value should be in form of `integer[.]+', the latest "
-                      "supported unicode version {latest_version!r} has been "
-                      "inferred.".format(given_version=given_version,
-                                         latest_version=latest_version))
-        return latest_version if not _return_str else latest_version.encode()
-
-    # given version is less than any available version, return earliest
-    # version.
-    earliest_version = unicode_versions[0]
-    cmp_earliest_version = _wcversion_value(earliest_version)
-
-    if cmp_given <= cmp_earliest_version:
-        # this probably isn't what you wanted, the oldest wcwidth.c you will
-        # find in the wild is likely version 5 or 6, which we both support,
-        # but it's better than not saying anything at all.
-        warnings.warn("UNICODE_VERSION value, {given_version!r}, is lower "
-                      "than any available unicode version. Returning lowest "
-                      "version level, {earliest_version!r}".format(
-                          given_version=given_version,
-                          earliest_version=earliest_version))
-        return earliest_version if not _return_str else earliest_version.encode()
-
-    # create list of versions which are less than our equal to given version,
-    # and return the tail value, which is the highest level we may support,
-    # or the latest value we support, when completely unmatched or higher
-    # than any supported version.
-    #
-    # function will never complete, always returns.
-    for idx, unicode_version in enumerate(unicode_versions):
-        # look ahead to next value
-        try:
-            cmp_next_version = _wcversion_value(unicode_versions[idx + 1])
-        except IndexError:
-            # at end of list, return latest version
-            return latest_version if not _return_str else latest_version.encode()
-
-        # Maybe our given version has less parts, as in tuple(8, 0), than the
-        # next compare version tuple(8, 0, 0). Test for an exact match by
-        # comparison of only the leading dotted piece(s): (8, 0) == (8, 0).
-        if cmp_given == cmp_next_version[:len(cmp_given)]:
-            return unicode_versions[idx + 1]
-
-        # Or, if any next value is greater than our given support level
-        # version, return the current value in index.  Even though it must
-        # be less than the given value, its our closest possible match. That
-        # is, 4.1 is returned for given 4.9.9, where 4.1 and 5.0 are available.
-        if cmp_next_version > cmp_given:
-            return unicode_version
-    assert False, ("Code path unreachable", given_version, unicode_versions)  # pragma: no cover
+        text_width = width(text, control_codes=control_codes, ambiguous_width=ambiguous_width)
+    total_padding = max(0, dest_width - text_width)
+    # matching https://jazcap53.github.io/pythons-eccentric-strcenter.html
+    left_pad = total_padding // 2 + (total_padding & dest_width & 1)
+    right_pad = total_padding - left_pad
+    return fillchar * left_pad + text + fillchar * right_pad
+
+
+def strip_sequences(text: str) -> str:
+    r"""
+    Return text with all terminal escape sequences removed.
+
+    Unknown or incomplete ESC sequences are preserved.
+
+    :param text: String that may contain terminal escape sequences.
+    :returns: The input text with all escape sequences stripped.
+
+    .. versionadded:: 0.3.0
+
+    Example::
+
+        >>> strip_sequences('\x1b[31mred\x1b[0m')
+        'red'
+        >>> strip_sequences('hello')
+        'hello'
+        >>> strip_sequences('\x1b[1m\x1b[31mbold red\x1b[0m text')
+        'bold red text'
+    """
+    return ZERO_WIDTH_PATTERN.sub('', text)
+
+
+def clip(
+    text: str,
+    start: int,
+    end: int,
+    *,
+    fillchar: str = ' ',
+    tabsize: int = 8,
+    ambiguous_width: int = 1,
+    propagate_sgr: bool = True,
+) -> str:
+    r"""
+    Clip text to display columns ``(start, end)`` while preserving all terminal sequences.
+
+    This function extracts a substring based on visible column positions rather than
+    character indices. Terminal escape sequences are preserved in the output since
+    they have zero display width. If a wide character (width 2) would be split at
+    either boundary, it is replaced with ``fillchar``.
+
+    TAB characters (``\t``) are expanded to spaces up to the next tab stop,
+    controlled by the ``tabsize`` parameter.
+
+    Other cursor movement characters (backspace, carriage return) and cursor
+    movement sequences are passed through unchanged as zero-width.
+
+    :param text: String to clip, may contain terminal escape sequences.
+    :param start: Absolute starting column (inclusive, 0-indexed).
+    :param end: Absolute ending column (exclusive).
+    :param fillchar: Character to use when a wide character must be split at
+        a boundary (default space). Must have display width of 1.
+    :param tabsize: Tab stop width (default 8). Set to 0 to pass tabs through
+        as zero-width (preserved in output but don't advance column position).
+    :param ambiguous_width: Width to use for East Asian Ambiguous (A)
+        characters. Default is ``1`` (narrow). Set to ``2`` for CJK contexts.
+    :param propagate_sgr: If True (default), SGR (terminal styling) sequences
+        are propagated. The result begins with any active style at the start
+        position and ends with a reset sequence if styles are active.
+    :returns: Substring of ``text`` spanning display columns ``(start, end)``,
+        with all terminal sequences preserved and wide characters at boundaries
+        replaced with ``fillchar``.
+
+    SGR (terminal styling) sequences are propagated by default. The result
+    begins with any active style and ends with a reset::
+
+        >>> clip('\x1b[1;34mHello world\x1b[0m', 6, 11)
+        '\x1b[1;34mworld\x1b[0m'
+
+    Set ``propagate_sgr=False`` to disable this behavior.
+
+    .. versionadded:: 0.3.0
+
+    .. versionchanged:: 0.5.0
+       Added ``propagate_sgr`` parameter (default True).
+
+    Example::
+
+        >>> clip('hello world', 0, 5)
+        'hello'
+        >>> clip('ไธญๆ–‡ๅญ—', 0, 3)  # Wide char split at column 3
+        'ไธญ '
+        >>> clip('a\tb', 0, 10)  # Tab expanded to spaces
+        'a       b'
+    """
+    # pylint: disable=too-complex,too-many-locals,too-many-branches,too-many-statements,too-many-nested-blocks
+    # Again, for 'hot path', we avoid additional delegate functions and accept the cost
+    # of complexity for improved python performance.
+    start = max(start, 0)
+    if end <= start:
+        return ''
+
+    # Fast path: printable ASCII only (no tabs, escape sequences, or wide or zero-width chars)
+    if text.isascii() and text.isprintable():
+        return text[start:end]
+
+    # Fast path: no escape sequences means no SGR tracking needed
+    if propagate_sgr and '\x1b' not in text:
+        propagate_sgr = False
+
+    # SGR tracking state (only when propagate_sgr=True)
+    sgr_at_clip_start = None  # state when first visible char emitted (None = not yet)
+    if propagate_sgr:
+        sgr = _SGR_STATE_DEFAULT  # current SGR state, updated by all sequences
+
+    output: list[str] = []
+    col = 0
+    idx = 0
+
+    while idx < len(text):
+        char = text[idx]
+
+        # Early exit: past visible region, SGR captured, no escape ahead
+        if col >= end and sgr_at_clip_start is not None and char != '\x1b':
+            break
+
+        # Handle escape sequences
+        if char == '\x1b' and (match := ZERO_WIDTH_PATTERN.match(text, idx)):
+            seq = match.group()
+            if propagate_sgr and _SGR_PATTERN.match(seq):
+                # Update SGR state; will be applied as prefix when visible content starts
+                sgr = _sgr_state_update(sgr, seq)
+            else:
+                # Non-SGR sequences always preserved
+                output.append(seq)
+            idx = match.end()
+            continue
+
+        # Handle bare ESC (not a valid sequence)
+        if char == '\x1b':
+            output.append(char)
+            idx += 1
+            continue
+
+        # TAB expansion
+        if char == '\t':
+            if tabsize > 0:
+                next_tab = col + (tabsize - (col % tabsize))
+                while col < next_tab:
+                    if start <= col < end:
+                        output.append(' ')
+                        if propagate_sgr and sgr_at_clip_start is None:
+                            sgr_at_clip_start = sgr
+                    col += 1
+            else:
+                output.append(char)
+            idx += 1
+            continue
+
+        # Grapheme clustering for everything else
+        grapheme = next(iter_graphemes(text, start=idx))
+        w = width(grapheme, ambiguous_width=ambiguous_width)
+
+        if w == 0:
+            if start <= col < end:
+                output.append(grapheme)
+        elif col >= start and col + w <= end:
+            # Fully visible
+            output.append(grapheme)
+            if propagate_sgr and sgr_at_clip_start is None:
+                sgr_at_clip_start = sgr
+            col += w
+        elif col < end and col + w > start:
+            # Partially visible (wide char at boundary)
+            output.append(fillchar * (min(end, col + w) - max(start, col)))
+            if propagate_sgr and sgr_at_clip_start is None:
+                sgr_at_clip_start = sgr
+            col += w
+        else:
+            col += w
+
+        idx += len(grapheme)
+
+    result = ''.join(output)
+
+    # Apply SGR prefix/suffix
+    if sgr_at_clip_start is not None:
+        if prefix := _sgr_state_to_sequence(sgr_at_clip_start):
+            result = prefix + result
+        if _sgr_state_is_active(sgr_at_clip_start):
+            result += '\x1b[0m'
+
+    return result
diff --git a/libs/webencodings-0.5.1.dist-info/METADATA b/libs/webencodings-0.5.1.dist-info/METADATA
index a8a532860b..552c21c7ed 100644
--- a/libs/webencodings-0.5.1.dist-info/METADATA
+++ b/libs/webencodings-0.5.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: webencodings
 Version: 0.5.1
 Summary: Character encoding aliases for legacy web content
@@ -23,6 +23,15 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Internet :: WWW/HTTP
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: summary
 
 python-webencodings
 ===================
diff --git a/libs/webencodings-0.5.1.dist-info/RECORD b/libs/webencodings-0.5.1.dist-info/RECORD
index 814344119c..92a1681f9d 100644
--- a/libs/webencodings-0.5.1.dist-info/RECORD
+++ b/libs/webencodings-0.5.1.dist-info/RECORD
@@ -1,8 +1,8 @@
 webencodings-0.5.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-webencodings-0.5.1.dist-info/METADATA,sha256=QntvnDtz5U4XA870Syzem255DApKDDH5ctF4-E3wrfg,2106
+webencodings-0.5.1.dist-info/METADATA,sha256=YPXYO0NcZucvwcKvz3LRS-ThvMVbjVor0zGlLImNGjk,2284
 webencodings-0.5.1.dist-info/RECORD,,
 webencodings-0.5.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webencodings-0.5.1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+webencodings-0.5.1.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
 webencodings-0.5.1.dist-info/top_level.txt,sha256=bZs_aZHSf_PNlfIHD4-BETJmRi99BJdKLrOW7rQngeo,13
 webencodings/__init__.py,sha256=qOBJIuPy_4ByYH6W_bNgJF-qYQ2DoU-dKsDu5yRWCXg,10579
 webencodings/labels.py,sha256=4AO_KxTddqGtrL9ns7kAPjb0CcN6xsCIxbK37HY9r3E,8979
diff --git a/libs/webencodings-0.5.1.dist-info/WHEEL b/libs/webencodings-0.5.1.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/webencodings-0.5.1.dist-info/WHEEL
+++ b/libs/webencodings-0.5.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/websocket/__init__.py b/libs/websocket/__init__.py
index 559b38a6b7..05f565d4c9 100644
--- a/libs/websocket/__init__.py
+++ b/libs/websocket/__init__.py
@@ -2,7 +2,7 @@
 __init__.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,11 +16,15 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from ._abnf import *
-from ._app import WebSocketApp as WebSocketApp, setReconnect as setReconnect
-from ._core import *
-from ._exceptions import *
-from ._logging import *
-from ._socket import *
 
-__version__ = "1.8.0"
+from ._abnf import *  # noqa: F401,F403
+from ._app import (  # noqa: F401
+    WebSocketApp as WebSocketApp,
+    set_reconnect as set_reconnect,
+)
+from ._core import *  # noqa: F401,F403
+from ._exceptions import *  # noqa: F401,F403
+from ._logging import *  # noqa: F401,F403
+from ._socket import *  # noqa: F401,F403
+
+__version__ = "1.9.0"
diff --git a/libs/websocket/_abnf.py b/libs/websocket/_abnf.py
index d7754e0de2..31a8d7ed8a 100644
--- a/libs/websocket/_abnf.py
+++ b/libs/websocket/_abnf.py
@@ -3,7 +3,7 @@
 import struct
 import sys
 from threading import Lock
-from typing import Callable, Optional, Union
+from typing import Callable, Optional, Union, Any
 
 from ._exceptions import WebSocketPayloadException, WebSocketProtocolException
 from ._utils import validate_utf8
@@ -12,7 +12,7 @@
 _abnf.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -151,7 +151,7 @@ def __init__(
         rsv3: int = 0,
         opcode: int = OPCODE_TEXT,
         mask_value: int = 1,
-        data: Union[str, bytes, None] = "",
+        data: Optional[Union[str, bytes]] = "",
     ) -> None:
         """
         Constructor for ABNF. Please check RFC for arguments.
@@ -185,15 +185,24 @@ def validate(self, skip_utf8_validation: bool = False) -> None:
             raise WebSocketProtocolException("Invalid ping frame.")
 
         if self.opcode == ABNF.OPCODE_CLOSE:
-            l = len(self.data)
-            if not l:
+            data_length = len(self.data)
+            if not data_length:
                 return
-            if l == 1 or l >= 126:
+            if data_length == 1 or data_length >= 126:
                 raise WebSocketProtocolException("Invalid close frame.")
-            if l > 2 and not skip_utf8_validation and not validate_utf8(self.data[2:]):
+            if (
+                data_length > 2
+                and not skip_utf8_validation
+                and not validate_utf8(self.data[2:])
+            ):
                 raise WebSocketProtocolException("Invalid close frame.")
 
-            code = 256 * int(self.data[0]) + int(self.data[1])
+            data_bytes = (
+                self.data[:2]
+                if isinstance(self.data, bytes)
+                else self.data[:2].encode("utf-8")
+            )
+            code = struct.unpack("!H", data_bytes)[0]
             if not self._is_valid_close_status(code):
                 raise WebSocketProtocolException("Invalid close opcode %r", code)
 
@@ -202,7 +211,8 @@ def _is_valid_close_status(code: int) -> bool:
         return code in VALID_CLOSE_STATUS or (3000 <= code < 5000)
 
     def __str__(self) -> str:
-        return f"fin={self.fin} opcode={self.opcode} data={self.data}"
+        data_repr = self.data if isinstance(self.data, str) else repr(self.data)
+        return f"fin={self.fin} opcode={self.opcode} data={data_repr}"
 
     @staticmethod
     def create_frame(data: Union[bytes, str], opcode: int, fin: int = 1) -> "ABNF":
@@ -310,9 +320,9 @@ def __init__(
     def clear(self) -> None:
         self.header: Optional[tuple] = None
         self.length: Optional[int] = None
-        self.mask_value: Union[bytes, str, None] = None
+        self.mask_value: Optional[Union[bytes, str]] = None
 
-    def has_received_header(self) -> bool:
+    def needs_header(self) -> bool:
         return self.header is None
 
     def recv_header(self) -> None:
@@ -335,10 +345,12 @@ def has_mask(self) -> Union[bool, int]:
         header_val: int = self.header[frame_buffer._HEADER_MASK_INDEX]
         return header_val
 
-    def has_received_length(self) -> bool:
+    def needs_length(self) -> bool:
         return self.length is None
 
     def recv_length(self) -> None:
+        if self.header is None:
+            raise WebSocketProtocolException("Header not received")
         bits = self.header[frame_buffer._HEADER_LENGTH_INDEX]
         length_bits = bits & 0x7F
         if length_bits == 0x7E:
@@ -350,7 +362,7 @@ def recv_length(self) -> None:
         else:
             self.length = length_bits
 
-    def has_received_mask(self) -> bool:
+    def needs_mask(self) -> bool:
         return self.mask_value is None
 
     def recv_mask(self) -> None:
@@ -359,23 +371,29 @@ def recv_mask(self) -> None:
     def recv_frame(self) -> ABNF:
         with self.lock:
             # Header
-            if self.has_received_header():
+            if self.needs_header():
                 self.recv_header()
+            if self.header is None:
+                raise WebSocketProtocolException("Header not received")
             (fin, rsv1, rsv2, rsv3, opcode, has_mask, _) = self.header
 
             # Frame length
-            if self.has_received_length():
+            if self.needs_length():
                 self.recv_length()
             length = self.length
 
             # Mask
-            if self.has_received_mask():
+            if self.needs_mask():
                 self.recv_mask()
             mask_value = self.mask_value
 
             # Payload
+            if length is None:
+                raise WebSocketProtocolException("Length not received")
             payload = self.recv_strict(length)
             if has_mask:
+                if mask_value is None:
+                    raise WebSocketProtocolException("Mask not received")
                 payload = ABNF.mask(mask_value, payload)
 
             # Reset for next frame
@@ -387,7 +405,9 @@ def recv_frame(self) -> ABNF:
         return frame
 
     def recv_strict(self, bufsize: int) -> bytes:
-        shortage = bufsize - sum(map(len, self.recv_buffer))
+        if not isinstance(bufsize, int):
+            raise ValueError("bufsize must be an integer")
+        shortage = bufsize - sum(len(buf) for buf in self.recv_buffer)
         while shortage > 0:
             # Limit buffer size that we pass to socket.recv() to avoid
             # fragmenting the heap -- the number of bytes recv() actually
@@ -396,8 +416,12 @@ def recv_strict(self, bufsize: int) -> bytes:
             # buffers allocated and then shrunk, which results in
             # fragmentation.
             bytes_ = self.recv(min(16384, shortage))
-            self.recv_buffer.append(bytes_)
-            shortage -= len(bytes_)
+            if isinstance(bytes_, bytes):
+                self.recv_buffer.append(bytes_)
+                shortage -= len(bytes_)
+            else:
+                # Handle case where recv returns int or other type
+                break
 
         unified = b"".join(self.recv_buffer)
 
@@ -413,7 +437,7 @@ class continuous_frame:
     def __init__(self, fire_cont_frame: bool, skip_utf8_validation: bool) -> None:
         self.fire_cont_frame = fire_cont_frame
         self.skip_utf8_validation = skip_utf8_validation
-        self.cont_data: Optional[list] = None
+        self.cont_data: Optional[list[Any]] = None
         self.recving_frames: Optional[int] = None
 
     def validate(self, frame: ABNF) -> None:
@@ -441,13 +465,18 @@ def is_fire(self, frame: ABNF) -> Union[bool, int]:
 
     def extract(self, frame: ABNF) -> tuple:
         data = self.cont_data
+        if data is None:
+            raise WebSocketProtocolException("No continuation data available")
         self.cont_data = None
         frame.data = data[1]
         if (
             not self.fire_cont_frame
+            and data is not None
             and data[0] == ABNF.OPCODE_TEXT
             and not self.skip_utf8_validation
             and not validate_utf8(frame.data)
         ):
             raise WebSocketPayloadException(f"cannot decode: {repr(frame.data)}")
+        if data is None:
+            raise WebSocketProtocolException("No continuation data available")
         return data[0], frame
diff --git a/libs/websocket/_app.py b/libs/websocket/_app.py
index 9fee76546b..2e125eaeba 100644
--- a/libs/websocket/_app.py
+++ b/libs/websocket/_app.py
@@ -1,5 +1,4 @@
 import inspect
-import selectors
 import socket
 import threading
 import time
@@ -15,12 +14,13 @@
 )
 from ._ssl_compat import SSLEOFError
 from ._url import parse_url
+from ._dispatcher import Dispatcher, DispatcherBase, SSLDispatcher, WrappedDispatcher
 
 """
 _app.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -40,122 +40,11 @@
 RECONNECT = 0
 
 
-def setReconnect(reconnectInterval: int) -> None:
+def set_reconnect(reconnectInterval: int) -> None:
     global RECONNECT
     RECONNECT = reconnectInterval
 
 
-class DispatcherBase:
-    """
-    DispatcherBase
-    """
-
-    def __init__(self, app: Any, ping_timeout: Union[float, int, None]) -> None:
-        self.app = app
-        self.ping_timeout = ping_timeout
-
-    def timeout(self, seconds: Union[float, int, None], callback: Callable) -> None:
-        time.sleep(seconds)
-        callback()
-
-    def reconnect(self, seconds: int, reconnector: Callable) -> None:
-        try:
-            _logging.info(
-                f"reconnect() - retrying in {seconds} seconds [{len(inspect.stack())} frames in stack]"
-            )
-            time.sleep(seconds)
-            reconnector(reconnecting=True)
-        except KeyboardInterrupt as e:
-            _logging.info(f"User exited {e}")
-            raise e
-
-
-class Dispatcher(DispatcherBase):
-    """
-    Dispatcher
-    """
-
-    def read(
-        self,
-        sock: socket.socket,
-        read_callback: Callable,
-        check_callback: Callable,
-    ) -> None:
-        sel = selectors.DefaultSelector()
-        sel.register(self.app.sock.sock, selectors.EVENT_READ)
-        try:
-            while self.app.keep_running:
-                if sel.select(self.ping_timeout):
-                    if not read_callback():
-                        break
-                check_callback()
-        finally:
-            sel.close()
-
-
-class SSLDispatcher(DispatcherBase):
-    """
-    SSLDispatcher
-    """
-
-    def read(
-        self,
-        sock: socket.socket,
-        read_callback: Callable,
-        check_callback: Callable,
-    ) -> None:
-        sock = self.app.sock.sock
-        sel = selectors.DefaultSelector()
-        sel.register(sock, selectors.EVENT_READ)
-        try:
-            while self.app.keep_running:
-                if self.select(sock, sel):
-                    if not read_callback():
-                        break
-                check_callback()
-        finally:
-            sel.close()
-
-    def select(self, sock, sel: selectors.DefaultSelector):
-        sock = self.app.sock.sock
-        if sock.pending():
-            return [
-                sock,
-            ]
-
-        r = sel.select(self.ping_timeout)
-
-        if len(r) > 0:
-            return r[0][0]
-
-
-class WrappedDispatcher:
-    """
-    WrappedDispatcher
-    """
-
-    def __init__(self, app, ping_timeout: Union[float, int, None], dispatcher) -> None:
-        self.app = app
-        self.ping_timeout = ping_timeout
-        self.dispatcher = dispatcher
-        dispatcher.signal(2, dispatcher.abort)  # keyboard interrupt
-
-    def read(
-        self,
-        sock: socket.socket,
-        read_callback: Callable,
-        check_callback: Callable,
-    ) -> None:
-        self.dispatcher.read(sock, read_callback)
-        self.ping_timeout and self.timeout(self.ping_timeout, check_callback)
-
-    def timeout(self, seconds: float, callback: Callable) -> None:
-        self.dispatcher.timeout(seconds, callback)
-
-    def reconnect(self, seconds: int, reconnector: Callable) -> None:
-        self.timeout(seconds, reconnector)
-
-
 class WebSocketApp:
     """
     Higher level of APIs are provided. The interface is like JavaScript WebSocket object.
@@ -164,19 +53,25 @@ class WebSocketApp:
     def __init__(
         self,
         url: str,
-        header: Union[list, dict, Callable, None] = None,
-        on_open: Optional[Callable[[WebSocket], None]] = None,
-        on_reconnect: Optional[Callable[[WebSocket], None]] = None,
-        on_message: Optional[Callable[[WebSocket, Any], None]] = None,
-        on_error: Optional[Callable[[WebSocket, Any], None]] = None,
-        on_close: Optional[Callable[[WebSocket, Any, Any], None]] = None,
+        header: Optional[
+            Union[
+                list[str],
+                dict[str, str],
+                Callable[[], Union[list[str], dict[str, str]]],
+            ]
+        ] = None,
+        on_open: Optional[Callable[["WebSocketApp"], None]] = None,
+        on_reconnect: Optional[Callable[["WebSocketApp"], None]] = None,
+        on_message: Optional[Callable[["WebSocketApp", Any], None]] = None,
+        on_error: Optional[Callable[["WebSocketApp", Any], None]] = None,
+        on_close: Optional[Callable[["WebSocketApp", Any, Any], None]] = None,
         on_ping: Optional[Callable] = None,
         on_pong: Optional[Callable] = None,
         on_cont_message: Optional[Callable] = None,
         keep_running: bool = True,
         get_mask_key: Optional[Callable] = None,
         cookie: Optional[str] = None,
-        subprotocols: Optional[list] = None,
+        subprotocols: Optional[list[str]] = None,
         on_data: Optional[Callable] = None,
         socket: Optional[socket.socket] = None,
     ) -> None:
@@ -266,7 +161,7 @@ def __init__(
         self.ping_thread: Optional[threading.Thread] = None
         self.stop_ping: Optional[threading.Event] = None
         self.ping_interval = float(0)
-        self.ping_timeout: Union[float, int, None] = None
+        self.ping_timeout: Optional[Union[float, int]] = None
         self.ping_payload = ""
         self.subprotocols = subprotocols
         self.prepared_socket = socket
@@ -325,9 +220,25 @@ def _stop_ping_thread(self) -> None:
             self.stop_ping.set()
         if self.ping_thread and self.ping_thread.is_alive():
             self.ping_thread.join(3)
+            # Handle thread leak - if thread doesn't terminate within timeout,
+            # force cleanup and log warning instead of abandoning the thread
+            if self.ping_thread.is_alive():
+                _logging.warning(
+                    "Ping thread failed to terminate within 3 seconds, "
+                    "forcing cleanup. Thread may be blocked."
+                )
+                # Force cleanup by clearing references even if thread is still alive
+                # The daemon thread will eventually be cleaned up by Python's GC
+                # but we prevent resource leaks by not holding references
+
+        # Always clean up references regardless of thread state
+        self.ping_thread = None
+        self.stop_ping = None
         self.last_ping_tm = self.last_pong_tm = float(0)
 
     def _send_ping(self) -> None:
+        if self.stop_ping is None:
+            return
         if self.stop_ping.wait(self.ping_interval) or self.keep_running is False:
             return
         while not self.stop_ping.wait(self.ping_interval) and self.keep_running is True:
@@ -339,12 +250,15 @@ def _send_ping(self) -> None:
                 except Exception as e:
                     _logging.debug(f"Failed to send ping: {e}")
 
+    def ready(self):
+        return self.sock and self.sock.connected
+
     def run_forever(
         self,
         sockopt: tuple = None,
         sslopt: dict = None,
         ping_interval: Union[float, int] = 0,
-        ping_timeout: Union[float, int, None] = None,
+        ping_timeout: Optional[Union[float, int]] = None,
         ping_payload: str = "",
         http_proxy_host: str = None,
         http_proxy_port: Union[int, str] = None,
@@ -454,17 +368,23 @@ def teardown(close_frame: ABNF = None):
 
             self._stop_ping_thread()
             self.keep_running = False
+
             if self.sock:
-                self.sock.close()
+                # in cases like handleDisconnect, the "on_error" callback is called first. If the WebSocketApp
+                # is being used in a multithreaded application, we nee to make sure that "self.sock" is cleared
+                # before calling close, otherwise logic built around the sock being set can cause issues -
+                # specifically calling "run_forever" again, since is checks if "self.sock" is set.
+                current_sock = self.sock
+                self.sock = None
+                current_sock.close()
+
             close_status_code, close_reason = self._get_close_args(
                 close_frame if close_frame else None
             )
-            self.sock = None
-
             # Finally call the callback AFTER all teardown is complete
             self._callback(self.on_close, close_status_code, close_reason)
 
-        def setSock(reconnecting: bool = False) -> None:
+        def initialize_socket(reconnecting: bool = False) -> None:
             if reconnecting and self.sock:
                 self.sock.shutdown()
 
@@ -475,6 +395,7 @@ def setSock(reconnecting: bool = False) -> None:
                 fire_cont_frame=self.on_cont_message is not None,
                 skip_utf8_validation=skip_utf8_validation,
                 enable_multithread=True,
+                dispatcher=dispatcher,
             )
 
             self.sock.settimeout(getdefaulttimeout())
@@ -520,7 +441,11 @@ def setSock(reconnecting: bool = False) -> None:
 
         def read() -> bool:
             if not self.keep_running:
-                return teardown()
+                teardown()
+                return False
+
+            if self.sock is None:
+                return False
 
             try:
                 op_code, frame = self.sock.recv_data_frame(True)
@@ -530,12 +455,12 @@ def read() -> bool:
                 SSLEOFError,
             ) as e:
                 if custom_dispatcher:
-                    return handleDisconnect(e, bool(reconnect))
+                    return closed(e)
                 else:
                     raise e
 
             if op_code == ABNF.OPCODE_CLOSE:
-                return teardown(frame)
+                return closed(frame)
             elif op_code == ABNF.OPCODE_PING:
                 self._callback(self.on_ping, frame.data)
             elif op_code == ABNF.OPCODE_PONG:
@@ -576,6 +501,20 @@ def check() -> bool:
                     raise WebSocketTimeoutException("ping/pong timed out")
             return True
 
+        def closed(
+            e: Union[
+                WebSocketConnectionClosedException,
+                ConnectionRefusedError,
+                KeyboardInterrupt,
+                SystemExit,
+                Exception,
+                str,
+            ] = "closed unexpectedly",
+        ) -> bool:
+            if type(e) is str:
+                e = WebSocketConnectionClosedException(e)
+            return handleDisconnect(e, bool(reconnect))  # type: ignore[arg-type]
+
         def handleDisconnect(
             e: Union[
                 WebSocketConnectionClosedException,
@@ -602,24 +541,25 @@ def handleDisconnect(
                     _logging.debug(
                         f"Calling custom dispatcher reconnect [{len(inspect.stack())} frames in stack]"
                     )
-                    dispatcher.reconnect(reconnect, setSock)
+                    dispatcher.reconnect(reconnect, initialize_socket)
             else:
                 _logging.error(f"{e} - goodbye")
                 teardown()
+            return self.has_errored
 
         custom_dispatcher = bool(dispatcher)
         dispatcher = self.create_dispatcher(
-            ping_timeout, dispatcher, parse_url(self.url)[3]
+            ping_timeout, dispatcher, parse_url(self.url)[3], closed
         )
 
         try:
-            setSock()
+            initialize_socket()
             if not custom_dispatcher and reconnect:
                 while self.keep_running:
                     _logging.debug(
                         f"Calling dispatcher reconnect [{len(inspect.stack())} frames in stack]"
                     )
-                    dispatcher.reconnect(reconnect, setSock)
+                    dispatcher.reconnect(reconnect, initialize_socket)
         except (KeyboardInterrupt, Exception) as e:
             _logging.info(f"tearing down on exception {e}")
             teardown()
@@ -632,12 +572,13 @@ def handleDisconnect(
 
     def create_dispatcher(
         self,
-        ping_timeout: Union[float, int, None],
+        ping_timeout: Optional[Union[float, int]],
         dispatcher: Optional[DispatcherBase] = None,
         is_ssl: bool = False,
+        handleDisconnect: Callable = None,
     ) -> Union[Dispatcher, SSLDispatcher, WrappedDispatcher]:
         if dispatcher:  # If custom dispatcher is set, use WrappedDispatcher
-            return WrappedDispatcher(self, ping_timeout, dispatcher)
+            return WrappedDispatcher(self, ping_timeout, dispatcher, handleDisconnect)
         timeout = ping_timeout or 10
         if is_ssl:
             return SSLDispatcher(self, timeout)
@@ -673,5 +614,7 @@ def _callback(self, callback, *args) -> None:
 
             except Exception as e:
                 _logging.error(f"error from callback {callback}: {e}")
-                if self.on_error:
+                # Bug fix: Prevent infinite recursion by not calling on_error
+                # when the failing callback IS on_error itself
+                if self.on_error and callback is not self.on_error:
                     self.on_error(self, e)
diff --git a/libs/websocket/_cookiejar.py b/libs/websocket/_cookiejar.py
index 7480e5fc21..0e5d4b169a 100644
--- a/libs/websocket/_cookiejar.py
+++ b/libs/websocket/_cookiejar.py
@@ -5,7 +5,7 @@
 _cookiejar.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,11 +33,9 @@ def add(self, set_cookie: Optional[str]) -> None:
                 if domain := v.get("domain"):
                     if not domain.startswith("."):
                         domain = f".{domain}"
-                    cookie = (
-                        self.jar.get(domain)
-                        if self.jar.get(domain)
-                        else http.cookies.SimpleCookie()
-                    )
+                    cookie = self.jar.get(domain)
+                    if cookie is None:
+                        cookie = http.cookies.SimpleCookie()
                     cookie.update(simple_cookie)
                     self.jar[domain.lower()] = cookie
 
diff --git a/libs/websocket/_core.py b/libs/websocket/_core.py
index f940ed0573..333015a792 100644
--- a/libs/websocket/_core.py
+++ b/libs/websocket/_core.py
@@ -6,19 +6,24 @@
 
 # websocket modules
 from ._abnf import ABNF, STATUS_NORMAL, continuous_frame, frame_buffer
-from ._exceptions import WebSocketProtocolException, WebSocketConnectionClosedException
+from ._exceptions import (
+    WebSocketProtocolException,
+    WebSocketConnectionClosedException,
+    WebSocketTimeoutException,
+)
 from ._handshake import SUPPORTED_REDIRECT_STATUSES, handshake
 from ._http import connect, proxy_info
 from ._logging import debug, error, trace, isEnabledForError, isEnabledForTrace
 from ._socket import getdefaulttimeout, recv, send, sock_opt
 from ._ssl_compat import ssl
 from ._utils import NoLock
+from ._dispatcher import DispatcherBase, WrappedDispatcher
 
 """
 _core.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -82,6 +87,7 @@ def __init__(
         fire_cont_frame: bool = False,
         enable_multithread: bool = True,
         skip_utf8_validation: bool = False,
+        dispatcher: Union[DispatcherBase, WrappedDispatcher] = None,
         **_,
     ):
         """
@@ -101,13 +107,14 @@ def __init__(
         # These buffer over the build-up of a single frame.
         self.frame_buffer = frame_buffer(self._recv, skip_utf8_validation)
         self.cont_frame = continuous_frame(fire_cont_frame, skip_utf8_validation)
+        self.dispatcher = dispatcher
 
         if enable_multithread:
             self.lock = threading.Lock()
             self.readlock = threading.Lock()
         else:
-            self.lock = NoLock()
-            self.readlock = NoLock()
+            self.lock = NoLock()  # type: ignore[assignment]
+            self.readlock = NoLock()  # type: ignore[assignment]
 
     def __iter__(self):
         """
@@ -140,7 +147,7 @@ def set_mask_key(self, func):
         """
         self.get_mask_key = func
 
-    def gettimeout(self) -> Union[float, int, None]:
+    def gettimeout(self) -> Optional[Union[float, int]]:
         """
         Get the websocket timeout (in seconds) as an int or float
 
@@ -151,7 +158,7 @@ def gettimeout(self) -> Union[float, int, None]:
         """
         return self.sock_opt.timeout
 
-    def settimeout(self, timeout: Union[float, int, None]):
+    def settimeout(self, timeout: Optional[Union[float, int]]):
         """
         Set the timeout to the websocket.
 
@@ -200,7 +207,7 @@ def getheaders(self):
     def is_ssl(self):
         try:
             return isinstance(self.sock, ssl.SSLSocket)
-        except:
+        except (AttributeError, NameError):
             return False
 
     headers = property(getheaders)
@@ -334,8 +341,8 @@ def send_frame(self, frame) -> int:
             trace(f"++Sent decoded: {frame.__str__()}")
         with self.lock:
             while data:
-                l = self._send(data)
-                data = data[l:]
+                bytes_sent = self._send(data)
+                data = data[bytes_sent:]
 
         return length
 
@@ -515,6 +522,8 @@ def close(self, status: int = STATUS_NORMAL, reason: bytes = b"", timeout: int =
         try:
             self.connected = False
             self.send(struct.pack("!H", status) + reason, ABNF.OPCODE_CLOSE)
+            if self.sock is None:
+                return
             sock_timeout = self.sock.gettimeout()
             self.sock.settimeout(timeout)
             start_time = time.time()
@@ -530,10 +539,15 @@ def close(self, status: int = STATUS_NORMAL, reason: bytes = b"", timeout: int =
                         elif recv_status != STATUS_NORMAL:
                             error(f"close status: {repr(recv_status)}")
                     break
-                except:
+                except (
+                    WebSocketConnectionClosedException,
+                    WebSocketTimeoutException,
+                    struct.error,
+                ):
                     break
-            self.sock.settimeout(sock_timeout)
-            self.sock.shutdown(socket.SHUT_RDWR)
+            if self.sock is not None:
+                self.sock.settimeout(sock_timeout)
+                self.sock.shutdown(socket.SHUT_RDWR)
         except:
             pass
 
@@ -556,6 +570,10 @@ def shutdown(self):
             self.connected = False
 
     def _send(self, data: Union[str, bytes]):
+        if self.sock is None:
+            raise WebSocketConnectionClosedException("socket is already closed.")
+        if self.dispatcher:
+            return self.dispatcher.send(self.sock, data)
         return send(self.sock, data)
 
     def _recv(self, bufsize):
diff --git a/libs/websocket/_dispatcher.py b/libs/websocket/_dispatcher.py
new file mode 100644
index 0000000000..7303620ee0
--- /dev/null
+++ b/libs/websocket/_dispatcher.py
@@ -0,0 +1,164 @@
+import time
+import socket
+import inspect
+import selectors
+from typing import TYPE_CHECKING, Callable, Optional, Union
+
+if TYPE_CHECKING:
+    from ._app import WebSocketApp
+from . import _logging
+from ._socket import send
+
+"""
+_dispatcher.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class DispatcherBase:
+    """
+    DispatcherBase
+    """
+
+    def __init__(
+        self, app: "WebSocketApp", ping_timeout: Optional[Union[float, int]]
+    ) -> None:
+        self.app = app
+        self.ping_timeout = ping_timeout
+
+    def timeout(self, seconds: Optional[Union[float, int]], callback: Callable) -> None:
+        if seconds is not None:
+            time.sleep(seconds)
+        callback()
+
+    def reconnect(self, seconds: int, reconnector: Callable) -> None:
+        try:
+            _logging.info(
+                f"reconnect() - retrying in {seconds} seconds [{len(inspect.stack())} frames in stack]"
+            )
+            time.sleep(seconds)
+            reconnector(reconnecting=True)
+        except KeyboardInterrupt as e:
+            _logging.info(f"User exited {e}")
+            raise e
+
+    def send(self, sock: socket.socket, data: Union[str, bytes]) -> int:
+        return send(sock, data)
+
+
+class Dispatcher(DispatcherBase):
+    """
+    Dispatcher
+    """
+
+    def read(
+        self,
+        sock: socket.socket,
+        read_callback: Callable,
+        check_callback: Callable,
+    ) -> None:
+        if self.app.sock is None or self.app.sock.sock is None:
+            return
+        sel = selectors.DefaultSelector()
+        sel.register(self.app.sock.sock, selectors.EVENT_READ)
+        try:
+            while self.app.keep_running:
+                if sel.select(self.ping_timeout):
+                    if not read_callback():
+                        break
+                check_callback()
+        finally:
+            sel.close()
+
+
+class SSLDispatcher(DispatcherBase):
+    """
+    SSLDispatcher
+    """
+
+    def read(
+        self,
+        sock: socket.socket,
+        read_callback: Callable,
+        check_callback: Callable,
+    ) -> None:
+        if self.app.sock is None or self.app.sock.sock is None:
+            return
+        sock = self.app.sock.sock
+        sel = selectors.DefaultSelector()
+        sel.register(sock, selectors.EVENT_READ)
+        try:
+            while self.app.keep_running:
+                if self.select(sock, sel):
+                    if not read_callback():
+                        break
+                check_callback()
+        finally:
+            sel.close()
+
+    def select(self, sock, sel: selectors.DefaultSelector):
+        if self.app.sock is None:
+            return None
+        sock = self.app.sock.sock
+        if sock.pending():
+            return [
+                sock,
+            ]
+
+        r = sel.select(self.ping_timeout)
+
+        if len(r) > 0:
+            return r[0][0]
+        return None
+
+
+class WrappedDispatcher:
+    """
+    WrappedDispatcher
+    """
+
+    def __init__(
+        self,
+        app: "WebSocketApp",
+        ping_timeout: Optional[Union[float, int]],
+        dispatcher,
+        handleDisconnect,
+    ) -> None:
+        self.app = app
+        self.ping_timeout = ping_timeout
+        self.dispatcher = dispatcher
+        self.handleDisconnect = handleDisconnect
+        dispatcher.signal(2, dispatcher.abort)  # keyboard interrupt
+
+    def read(
+        self,
+        sock: socket.socket,
+        read_callback: Callable,
+        check_callback: Callable,
+    ) -> None:
+        self.dispatcher.read(sock, read_callback)
+        if self.ping_timeout:
+            self.timeout(self.ping_timeout, check_callback)
+
+    def send(self, sock: socket.socket, data: Union[str, bytes]) -> int:
+        self.dispatcher.buffwrite(sock, data, send, self.handleDisconnect)
+        return len(data)
+
+    def timeout(self, seconds: float, callback: Callable, *args) -> None:
+        self.dispatcher.timeout(seconds, callback, *args)
+
+    def reconnect(self, seconds: int, reconnector: Callable) -> None:
+        self.timeout(seconds, reconnector, True)
diff --git a/libs/websocket/_exceptions.py b/libs/websocket/_exceptions.py
index cd196e44a3..71c067bc53 100644
--- a/libs/websocket/_exceptions.py
+++ b/libs/websocket/_exceptions.py
@@ -2,7 +2,7 @@
 _exceptions.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/libs/websocket/_handshake.py b/libs/websocket/_handshake.py
index 7bd61b82f4..ef3f7d53dd 100644
--- a/libs/websocket/_handshake.py
+++ b/libs/websocket/_handshake.py
@@ -2,7 +2,7 @@
 _handshake.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+
 import hashlib
 import hmac
 import os
@@ -142,9 +143,16 @@ def _get_resp_headers(sock, success_statuses: tuple = SUCCESS_STATUSES) -> tuple
     if status not in success_statuses:
         content_len = resp_headers.get("content-length")
         if content_len:
-            response_body = sock.recv(
-                int(content_len)
-            )  # read the body of the HTTP error message response and include it in the exception
+            # Use chunked reading to avoid SSL BAD_LENGTH error on large responses
+            from ._socket import recv
+
+            response_body = b""
+            remaining = int(content_len)
+            while remaining > 0:
+                chunk_size = min(remaining, 16384)  # Read in 16KB chunks
+                chunk = recv(sock, chunk_size)
+                response_body += chunk
+                remaining -= len(chunk)
         else:
             response_body = None
         raise WebSocketBadStatusException(
diff --git a/libs/websocket/_http.py b/libs/websocket/_http.py
index 9b1bf859d9..6a23164d57 100644
--- a/libs/websocket/_http.py
+++ b/libs/websocket/_http.py
@@ -2,7 +2,7 @@
 _http.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+
 import errno
 import os
 import socket
@@ -34,7 +35,7 @@
 __all__ = ["proxy_info", "connect", "read_headers"]
 
 try:
-    from python_socks._errors import *
+    from python_socks._errors import ProxyConnectionError, ProxyError, ProxyTimeoutError
     from python_socks._types import ProxyType
     from python_socks.sync import Proxy
 
@@ -242,21 +243,36 @@ def _wrap_sni_socket(sock: socket.socket, sslopt: dict, hostname, check_hostname
         # For more details see also:
         # * https://docs.python.org/3.8/library/ssl.html?highlight=sslkeylogfile#context-creation
         # * https://docs.python.org/3.8/library/ssl.html?highlight=sslkeylogfile#ssl.SSLContext.keylog_filename
-        context.keylog_filename = os.environ.get("SSLKEYLOGFILE", None)
+        keylog_file = os.environ.get("SSLKEYLOGFILE")
+        if keylog_file is not None:
+            context.keylog_filename = keylog_file
 
         if sslopt.get("cert_reqs", ssl.CERT_NONE) != ssl.CERT_NONE:
             cafile = sslopt.get("ca_certs", None)
             capath = sslopt.get("ca_cert_path", None)
             if cafile or capath:
-                context.load_verify_locations(cafile=cafile, capath=capath)
+                try:
+                    context.load_verify_locations(cafile=cafile, capath=capath)
+                except (FileNotFoundError, ssl.SSLError, ValueError) as e:
+                    raise WebSocketException(f"SSL CA certificate loading failed: {e}")
             elif hasattr(context, "load_default_certs"):
-                context.load_default_certs(ssl.Purpose.SERVER_AUTH)
+                try:
+                    context.load_default_certs(ssl.Purpose.SERVER_AUTH)
+                except ssl.SSLError as e:
+                    raise WebSocketException(
+                        f"SSL default certificate loading failed: {e}"
+                    )
         if sslopt.get("certfile", None):
-            context.load_cert_chain(
-                sslopt["certfile"],
-                sslopt.get("keyfile", None),
-                sslopt.get("password", None),
-            )
+            try:
+                context.load_cert_chain(
+                    sslopt["certfile"],
+                    sslopt.get("keyfile", None),
+                    sslopt.get("password", None),
+                )
+            except (FileNotFoundError, ValueError) as e:
+                raise WebSocketException(f"SSL client certificate loading failed: {e}")
+            except ssl.SSLError as e:
+                raise WebSocketException(f"SSL client certificate loading failed: {e}")
 
         # Python 3.10 switch to PROTOCOL_TLS_CLIENT defaults to "cert_reqs = ssl.CERT_REQUIRED" and "check_hostname = True"
         # If both disabled, set check_hostname before verify_mode
@@ -271,12 +287,30 @@ def _wrap_sni_socket(sock: socket.socket, sslopt: dict, hostname, check_hostname
             context.verify_mode = sslopt.get("cert_reqs", ssl.CERT_REQUIRED)
 
         if "ciphers" in sslopt:
-            context.set_ciphers(sslopt["ciphers"])
+            try:
+                context.set_ciphers(sslopt["ciphers"])
+            except ssl.SSLError as e:
+                raise WebSocketException(f"SSL cipher configuration failed: {e}")
         if "cert_chain" in sslopt:
-            certfile, keyfile, password = sslopt["cert_chain"]
-            context.load_cert_chain(certfile, keyfile, password)
+            try:
+                cert_chain = sslopt["cert_chain"]
+                if not isinstance(cert_chain, (tuple, list)) or len(cert_chain) != 3:
+                    raise ValueError(
+                        "cert_chain must be a tuple/list of (certfile, keyfile, password)"
+                    )
+                certfile, keyfile, password = cert_chain
+                context.load_cert_chain(certfile, keyfile, password)
+            except ValueError:
+                raise
+            except (FileNotFoundError, ssl.SSLError) as e:
+                raise WebSocketException(
+                    f"SSL client certificate configuration failed: {e}"
+                )
         if "ecdh_curve" in sslopt:
-            context.set_ecdh_curve(sslopt["ecdh_curve"])
+            try:
+                context.set_ecdh_curve(sslopt["ecdh_curve"])
+            except ValueError as e:
+                raise WebSocketException(f"SSL ECDH curve configuration failed: {e}")
 
     return context.wrap_socket(
         sock,
@@ -332,7 +366,7 @@ def _tunnel(sock: socket.socket, host, port: int, auth) -> socket.socket:
 
     try:
         status, _, _ = read_headers(sock)
-    except Exception as e:
+    except (socket.error, WebSocketException) as e:
         raise WebSocketProxyException(str(e))
 
     if status != 200:
@@ -364,7 +398,11 @@ def read_headers(sock: socket.socket) -> tuple:
                 raise WebSocketException("Invalid header")
             key, value = kv
             if key.lower() == "set-cookie" and headers.get("set-cookie"):
-                headers["set-cookie"] = headers.get("set-cookie") + "; " + value.strip()
+                existing_cookie = headers.get("set-cookie")
+                if existing_cookie is not None:
+                    headers["set-cookie"] = existing_cookie + "; " + value.strip()
+                else:
+                    headers["set-cookie"] = value.strip()
             else:
                 headers[key.lower()] = value.strip()
 
diff --git a/libs/websocket/_logging.py b/libs/websocket/_logging.py
index 0f673d3aff..65074b9876 100644
--- a/libs/websocket/_logging.py
+++ b/libs/websocket/_logging.py
@@ -4,7 +4,7 @@
 _logging.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
     from logging import NullHandler
 except ImportError:
 
-    class NullHandler(logging.Handler):
+    class NullHandler(logging.Handler):  # type: ignore[no-redef]
         def emit(self, record) -> None:
             pass
 
diff --git a/libs/websocket/_socket.py b/libs/websocket/_socket.py
index 81094ffc84..7a2dff17be 100644
--- a/libs/websocket/_socket.py
+++ b/libs/websocket/_socket.py
@@ -1,20 +1,20 @@
 import errno
 import selectors
 import socket
-from typing import Union
+from typing import Optional, Union, Any
 
 from ._exceptions import (
     WebSocketConnectionClosedException,
     WebSocketTimeoutException,
 )
-from ._ssl_compat import SSLError, SSLWantReadError, SSLWantWriteError
+from ._ssl_compat import SSLError, SSLEOFError, SSLWantReadError, SSLWantWriteError
 from ._utils import extract_error_code, extract_err_message
 
 """
 _socket.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -53,17 +53,19 @@
 
 
 class sock_opt:
-    def __init__(self, sockopt: list, sslopt: dict) -> None:
+    def __init__(
+        self, sockopt: Optional[list[tuple]], sslopt: Optional[dict[str, Any]]
+    ) -> None:
         if sockopt is None:
             sockopt = []
         if sslopt is None:
             sslopt = {}
         self.sockopt = sockopt
         self.sslopt = sslopt
-        self.timeout = None
+        self.timeout: Optional[Union[int, float]] = None
 
 
-def setdefaulttimeout(timeout: Union[int, float, None]) -> None:
+def setdefaulttimeout(timeout: Optional[Union[int, float]]) -> None:
     """
     Set the global timeout setting to connect.
 
@@ -76,7 +78,7 @@ def setdefaulttimeout(timeout: Union[int, float, None]) -> None:
     _default_timeout = timeout
 
 
-def getdefaulttimeout() -> Union[int, float, None]:
+def getdefaulttimeout() -> Optional[Union[int, float]]:
     """
     Get default timeout
 
@@ -96,12 +98,15 @@ def _recv():
         try:
             return sock.recv(bufsize)
         except SSLWantReadError:
+            # Don't return None implicitly - fall through to retry logic
             pass
         except socket.error as exc:
             error_code = extract_error_code(exc)
             if error_code not in [errno.EAGAIN, errno.EWOULDBLOCK]:
                 raise
+            # Don't return None implicitly - fall through to retry logic
 
+        # Retry logic using selector for both SSLWantReadError and EAGAIN/EWOULDBLOCK
         sel = selectors.DefaultSelector()
         sel.register(sock, selectors.EVENT_READ)
 
@@ -110,6 +115,10 @@ def _recv():
 
         if r:
             return sock.recv(bufsize)
+        else:
+            # Selector timeout should raise WebSocketTimeoutException
+            # not return None which gets misclassified as connection closed
+            raise WebSocketTimeoutException("Connection timed out waiting for data")
 
     try:
         if sock.gettimeout() == 0:
@@ -128,6 +137,8 @@ def _recv():
         else:
             raise
 
+    if bytes_ is None:
+        raise WebSocketConnectionClosedException("Connection to remote host was lost.")
     if not bytes_:
         raise WebSocketConnectionClosedException("Connection to remote host was lost.")
 
@@ -151,9 +162,11 @@ def send(sock: socket.socket, data: Union[bytes, str]) -> int:
     if not sock:
         raise WebSocketConnectionClosedException("socket is already closed.")
 
-    def _send():
+    def _send() -> int:
         try:
             return sock.send(data)
+        except SSLEOFError:
+            raise WebSocketConnectionClosedException("socket is already closed.")
         except SSLWantWriteError:
             pass
         except socket.error as exc:
@@ -171,6 +184,7 @@ def _send():
 
         if w:
             return sock.send(data)
+        return 0
 
     try:
         if sock.gettimeout() == 0:
@@ -180,7 +194,7 @@ def _send():
     except socket.timeout as e:
         message = extract_err_message(e)
         raise WebSocketTimeoutException(message)
-    except Exception as e:
+    except (OSError, SSLError) as e:
         message = extract_err_message(e)
         if isinstance(message, str) and "timed out" in message:
             raise WebSocketTimeoutException(message)
diff --git a/libs/websocket/_ssl_compat.py b/libs/websocket/_ssl_compat.py
index 0a8a32b59b..02f049f66a 100644
--- a/libs/websocket/_ssl_compat.py
+++ b/libs/websocket/_ssl_compat.py
@@ -2,7 +2,7 @@
 _ssl_compat.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,6 +16,24 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import ssl as _ssl_module
+    from ssl import (
+        SSLError as _SSLErrorType,
+        SSLEOFError as _SSLEOFErrorType,
+        SSLWantReadError as _SSLWantReadErrorType,
+        SSLWantWriteError as _SSLWantWriteErrorType,
+    )
+else:
+    _ssl_module = None
+    _SSLErrorType = None
+    _SSLEOFErrorType = None
+    _SSLWantReadErrorType = None
+    _SSLWantWriteErrorType = None
+
 __all__ = [
     "HAVE_SSL",
     "ssl",
@@ -27,22 +45,22 @@
 
 try:
     import ssl
-    from ssl import SSLError, SSLEOFError, SSLWantReadError, SSLWantWriteError
+    from ssl import SSLError, SSLEOFError, SSLWantReadError, SSLWantWriteError  # type: ignore[attr-defined]
 
     HAVE_SSL = True
 except ImportError:
     # dummy class of SSLError for environment without ssl support
-    class SSLError(Exception):
+    class SSLError(Exception):  # type: ignore[no-redef]
         pass
 
-    class SSLEOFError(Exception):
+    class SSLEOFError(Exception):  # type: ignore[no-redef]
         pass
 
-    class SSLWantReadError(Exception):
+    class SSLWantReadError(Exception):  # type: ignore[no-redef]
         pass
 
-    class SSLWantWriteError(Exception):
+    class SSLWantWriteError(Exception):  # type: ignore[no-redef]
         pass
 
-    ssl = None
+    ssl = None  # type: ignore[assignment,no-redef]
     HAVE_SSL = False
diff --git a/libs/websocket/_url.py b/libs/websocket/_url.py
index 902131710b..3b0d6b072f 100644
--- a/libs/websocket/_url.py
+++ b/libs/websocket/_url.py
@@ -1,6 +1,5 @@
+import ipaddress
 import os
-import socket
-import struct
 from typing import Optional
 from urllib.parse import unquote, urlparse
 from ._exceptions import WebSocketProxyException
@@ -9,7 +8,7 @@
 _url.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -73,13 +72,12 @@ def parse_url(url: str) -> tuple:
     return hostname, port, resource, is_secure
 
 
-DEFAULT_NO_PROXY_HOST = ["localhost", "127.0.0.1"]
-
-
 def _is_ip_address(addr: str) -> bool:
+    if not isinstance(addr, str):
+        raise TypeError("_is_ip_address() argument 1 must be str")
     try:
-        socket.inet_aton(addr)
-    except socket.error:
+        ipaddress.ip_address(addr)
+    except ValueError:
         return False
     else:
         return True
@@ -87,29 +85,29 @@ def _is_ip_address(addr: str) -> bool:
 
 def _is_subnet_address(hostname: str) -> bool:
     try:
-        addr, netmask = hostname.split("/")
-        return _is_ip_address(addr) and 0 <= int(netmask) < 32
+        ipaddress.ip_network(hostname)
     except ValueError:
         return False
+    else:
+        return True
 
 
 def _is_address_in_network(ip: str, net: str) -> bool:
-    ipaddr: int = struct.unpack("!I", socket.inet_aton(ip))[0]
-    netaddr, netmask = net.split("/")
-    netaddr: int = struct.unpack("!I", socket.inet_aton(netaddr))[0]
-
-    netmask = (0xFFFFFFFF << (32 - int(netmask))) & 0xFFFFFFFF
-    return ipaddr & netmask == netaddr
+    try:
+        return ipaddress.ip_network(ip).subnet_of(ipaddress.ip_network(net))
+    except TypeError:
+        return False
 
 
-def _is_no_proxy_host(hostname: str, no_proxy: Optional[list]) -> bool:
+def _is_no_proxy_host(hostname: str, no_proxy: Optional[list[str]]) -> bool:
     if not no_proxy:
         if v := os.environ.get("no_proxy", os.environ.get("NO_PROXY", "")).replace(
             " ", ""
         ):
             no_proxy = v.split(",")
+
     if not no_proxy:
-        no_proxy = DEFAULT_NO_PROXY_HOST
+        no_proxy = []
 
     if "*" in no_proxy:
         return True
@@ -124,7 +122,8 @@ def _is_no_proxy_host(hostname: str, no_proxy: Optional[list]) -> bool:
             ]
         )
     for domain in [domain for domain in no_proxy if domain.startswith(".")]:
-        if hostname.endswith(domain):
+        endDomain = domain.lstrip(".")
+        if hostname.endswith(endDomain):
             return True
     return False
 
@@ -135,7 +134,7 @@ def get_proxy_info(
     proxy_host: Optional[str] = None,
     proxy_port: int = 0,
     proxy_auth: Optional[tuple] = None,
-    no_proxy: Optional[list] = None,
+    no_proxy: Optional[list[str]] = None,
     proxy_type: str = "http",
 ) -> tuple:
     """
@@ -181,7 +180,7 @@ def get_proxy_info(
     if value:
         proxy = urlparse(value)
         auth = (
-            (unquote(proxy.username), unquote(proxy.password))
+            (unquote(proxy.username or ""), unquote(proxy.password or ""))
             if proxy.username
             else None
         )
diff --git a/libs/websocket/_utils.py b/libs/websocket/_utils.py
index 65f3c0daf7..726a2f3e58 100644
--- a/libs/websocket/_utils.py
+++ b/libs/websocket/_utils.py
@@ -1,10 +1,10 @@
-from typing import Union
+from typing import Union, Optional
 
 """
-_url.py
+_utils.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -446,7 +446,7 @@ def validate_utf8(utfbytes: Union[str, bytes]) -> bool:
     return _validate_utf8(utfbytes)
 
 
-def extract_err_message(exception: Exception) -> Union[str, None]:
+def extract_err_message(exception: Exception) -> Optional[str]:
     if exception.args:
         exception_message: str = exception.args[0]
         return exception_message
@@ -454,6 +454,7 @@ def extract_err_message(exception: Exception) -> Union[str, None]:
         return None
 
 
-def extract_error_code(exception: Exception) -> Union[int, None]:
+def extract_error_code(exception: Exception) -> Optional[int]:
     if exception.args and len(exception.args) > 1:
         return exception.args[0] if isinstance(exception.args[0], int) else None
+    return None
diff --git a/libs/websocket/_wsdump.py b/libs/websocket/_wsdump.py
index d4d76dc509..81be252156 100644
--- a/libs/websocket/_wsdump.py
+++ b/libs/websocket/_wsdump.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
 """
-wsdump.py
+_wsdump.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 import websocket
 
 try:
-    import readline
+    import readline  # noqa: F401
 except ImportError:
     pass
 
diff --git a/libs/websocket/py.typed b/libs/websocket/py.typed
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/websocket/tests/test_abnf.py b/libs/websocket/tests/test_abnf.py
index a749f13bd5..664ea3b314 100644
--- a/libs/websocket/tests/test_abnf.py
+++ b/libs/websocket/tests/test_abnf.py
@@ -9,7 +9,7 @@
 test_abnf.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/libs/websocket/tests/test_app.py b/libs/websocket/tests/test_app.py
index 18eace5442..c127e5c9e7 100644
--- a/libs/websocket/tests/test_app.py
+++ b/libs/websocket/tests/test_app.py
@@ -12,7 +12,7 @@
 test_app.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -347,6 +347,49 @@ def on_pong(app, _):
         self.assertIsInstance(exc, ws.WebSocketTimeoutException)
         self.assertEqual(str(exc), "ping/pong timed out")
 
+    def test_dispatcher_selection_default(self):
+        """Test default dispatcher selection"""
+        app = ws.WebSocketApp("ws://example.com")
+
+        # Test default dispatcher (non-SSL)
+        dispatcher = app.create_dispatcher(ping_timeout=10, is_ssl=False)
+        self.assertIsInstance(dispatcher, ws._dispatcher.Dispatcher)
+
+    def test_dispatcher_selection_ssl(self):
+        """Test SSL dispatcher selection"""
+        app = ws.WebSocketApp("wss://example.com")
+
+        # Test SSL dispatcher
+        dispatcher = app.create_dispatcher(ping_timeout=10, is_ssl=True)
+        self.assertIsInstance(dispatcher, ws._dispatcher.SSLDispatcher)
+
+    def test_dispatcher_selection_custom(self):
+        """Test custom dispatcher selection"""
+        from unittest.mock import Mock
+
+        app = ws.WebSocketApp("ws://example.com")
+        custom_dispatcher = Mock()
+        handle_disconnect = Mock()
+
+        # Test wrapped dispatcher with custom dispatcher
+        dispatcher = app.create_dispatcher(
+            ping_timeout=10,
+            dispatcher=custom_dispatcher,
+            handleDisconnect=handle_disconnect,
+        )
+        self.assertIsInstance(dispatcher, ws._dispatcher.WrappedDispatcher)
+        self.assertEqual(dispatcher.dispatcher, custom_dispatcher)
+        self.assertEqual(dispatcher.handleDisconnect, handle_disconnect)
+
+    def test_dispatcher_selection_no_ping_timeout(self):
+        """Test dispatcher selection without ping timeout"""
+        app = ws.WebSocketApp("ws://example.com")
+
+        # Test with None ping_timeout (should default to 10)
+        dispatcher = app.create_dispatcher(ping_timeout=None, is_ssl=False)
+        self.assertIsInstance(dispatcher, ws._dispatcher.Dispatcher)
+        self.assertEqual(dispatcher.ping_timeout, 10)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/libs/websocket/tests/test_cookiejar.py b/libs/websocket/tests/test_cookiejar.py
index 67eddb627a..7590f0caa7 100644
--- a/libs/websocket/tests/test_cookiejar.py
+++ b/libs/websocket/tests/test_cookiejar.py
@@ -6,7 +6,7 @@
 test_cookiejar.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/libs/websocket/tests/test_dispatcher.py b/libs/websocket/tests/test_dispatcher.py
new file mode 100644
index 0000000000..457bed6cb4
--- /dev/null
+++ b/libs/websocket/tests/test_dispatcher.py
@@ -0,0 +1,385 @@
+# -*- coding: utf-8 -*-
+import socket
+import unittest
+from unittest.mock import Mock, patch, MagicMock
+import threading
+import time
+
+import websocket
+from websocket._dispatcher import (
+    Dispatcher,
+    DispatcherBase,
+    SSLDispatcher,
+    WrappedDispatcher,
+)
+
+"""
+test_dispatcher.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class MockApp:
+    """Mock WebSocketApp for testing"""
+
+    def __init__(self):
+        self.keep_running = True
+        self.sock = Mock()
+        self.sock.sock = Mock()
+
+
+class MockSocket:
+    """Mock socket for testing"""
+
+    def __init__(self):
+        self.pending_return = False
+
+    def pending(self):
+        return self.pending_return
+
+
+class MockDispatcher:
+    """Mock external dispatcher for WrappedDispatcher testing"""
+
+    def __init__(self):
+        self.signal_calls = []
+        self.abort_calls = []
+        self.read_calls = []
+        self.buffwrite_calls = []
+        self.timeout_calls = []
+
+    def signal(self, sig, handler):
+        self.signal_calls.append((sig, handler))
+
+    def abort(self):
+        self.abort_calls.append(True)
+
+    def read(self, sock, callback):
+        self.read_calls.append((sock, callback))
+
+    def buffwrite(self, sock, data, send_func, disconnect_handler):
+        self.buffwrite_calls.append((sock, data, send_func, disconnect_handler))
+
+    def timeout(self, seconds, callback, *args):
+        self.timeout_calls.append((seconds, callback, args))
+
+
+class DispatcherTest(unittest.TestCase):
+    def setUp(self):
+        self.app = MockApp()
+
+    def test_dispatcher_base_init(self):
+        """Test DispatcherBase initialization"""
+        dispatcher = DispatcherBase(self.app, 30.0)
+
+        self.assertEqual(dispatcher.app, self.app)
+        self.assertEqual(dispatcher.ping_timeout, 30.0)
+
+    def test_dispatcher_base_timeout(self):
+        """Test DispatcherBase timeout method"""
+        dispatcher = DispatcherBase(self.app, 30.0)
+        callback = Mock()
+
+        # Test with seconds=None (should call callback immediately)
+        dispatcher.timeout(None, callback)
+        callback.assert_called_once()
+
+        # Test with seconds > 0 (would sleep in real implementation)
+        callback.reset_mock()
+        start_time = time.time()
+        dispatcher.timeout(0.1, callback)
+        elapsed = time.time() - start_time
+
+        callback.assert_called_once()
+        self.assertGreaterEqual(elapsed, 0.05)  # Allow some tolerance
+
+    def test_dispatcher_base_reconnect(self):
+        """Test DispatcherBase reconnect method"""
+        dispatcher = DispatcherBase(self.app, 30.0)
+        reconnector = Mock()
+
+        # Test normal reconnect
+        dispatcher.reconnect(1, reconnector)
+        reconnector.assert_called_once_with(reconnecting=True)
+
+        # Test reconnect with KeyboardInterrupt
+        reconnector.reset_mock()
+        reconnector.side_effect = KeyboardInterrupt("User interrupted")
+
+        with self.assertRaises(KeyboardInterrupt):
+            dispatcher.reconnect(1, reconnector)
+
+    def test_dispatcher_base_send(self):
+        """Test DispatcherBase send method"""
+        dispatcher = DispatcherBase(self.app, 30.0)
+        mock_sock = Mock()
+        test_data = b"test data"
+
+        with patch("websocket._dispatcher.send") as mock_send:
+            mock_send.return_value = len(test_data)
+            result = dispatcher.send(mock_sock, test_data)
+
+            mock_send.assert_called_once_with(mock_sock, test_data)
+            self.assertEqual(result, len(test_data))
+
+    def test_dispatcher_read(self):
+        """Test Dispatcher read method"""
+        dispatcher = Dispatcher(self.app, 5.0)
+        read_callback = Mock(return_value=True)
+        check_callback = Mock()
+        mock_sock = Mock()
+
+        # Mock the selector to control the loop
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+
+            # Make select return immediately (timeout)
+            mock_selector.select.return_value = []
+
+            # Stop after first iteration
+            def side_effect(*args):
+                self.app.keep_running = False
+                return []
+
+            mock_selector.select.side_effect = side_effect
+
+            dispatcher.read(mock_sock, read_callback, check_callback)
+
+            # Verify selector was used correctly
+            mock_selector.register.assert_called()
+            mock_selector.select.assert_called_with(5.0)
+            mock_selector.close.assert_called()
+            check_callback.assert_called()
+
+    def test_dispatcher_read_with_data(self):
+        """Test Dispatcher read method when data is available"""
+        dispatcher = Dispatcher(self.app, 5.0)
+        read_callback = Mock(return_value=True)
+        check_callback = Mock()
+        mock_sock = Mock()
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+
+            # First call returns data, second call stops the loop
+            call_count = 0
+
+            def select_side_effect(*args):
+                nonlocal call_count
+                call_count += 1
+                if call_count == 1:
+                    return [True]  # Data available
+                else:
+                    self.app.keep_running = False
+                    return []
+
+            mock_selector.select.side_effect = select_side_effect
+
+            dispatcher.read(mock_sock, read_callback, check_callback)
+
+            read_callback.assert_called()
+            check_callback.assert_called()
+
+    def test_ssl_dispatcher_read(self):
+        """Test SSLDispatcher read method"""
+        dispatcher = SSLDispatcher(self.app, 5.0)
+        read_callback = Mock(return_value=True)
+        check_callback = Mock()
+
+        # Mock socket with pending data
+        mock_ssl_sock = MockSocket()
+        self.app.sock.sock = mock_ssl_sock
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = []
+
+            # Stop after first iteration
+            def side_effect(*args):
+                self.app.keep_running = False
+                return []
+
+            mock_selector.select.side_effect = side_effect
+
+            dispatcher.read(None, read_callback, check_callback)
+
+            mock_selector.register.assert_called()
+            check_callback.assert_called()
+
+    def test_ssl_dispatcher_select_with_pending(self):
+        """Test SSLDispatcher select method with pending data"""
+        dispatcher = SSLDispatcher(self.app, 5.0)
+        mock_ssl_sock = MockSocket()
+        mock_ssl_sock.pending_return = True
+        self.app.sock.sock = mock_ssl_sock
+        mock_selector = Mock()
+
+        result = dispatcher.select(None, mock_selector)
+
+        # When pending() returns True, should return [sock]
+        self.assertEqual(result, [mock_ssl_sock])
+
+    def test_ssl_dispatcher_select_without_pending(self):
+        """Test SSLDispatcher select method without pending data"""
+        dispatcher = SSLDispatcher(self.app, 5.0)
+        mock_ssl_sock = MockSocket()
+        mock_ssl_sock.pending_return = False
+        self.app.sock.sock = mock_ssl_sock
+        mock_selector = Mock()
+        mock_selector.select.return_value = [(mock_ssl_sock, None)]
+
+        result = dispatcher.select(None, mock_selector)
+
+        # Should return the first element of first result tuple
+        self.assertEqual(result, mock_ssl_sock)
+        mock_selector.select.assert_called_with(5.0)
+
+    def test_ssl_dispatcher_select_no_results(self):
+        """Test SSLDispatcher select method with no results"""
+        dispatcher = SSLDispatcher(self.app, 5.0)
+        mock_ssl_sock = MockSocket()
+        mock_ssl_sock.pending_return = False
+        self.app.sock.sock = mock_ssl_sock
+        mock_selector = Mock()
+        mock_selector.select.return_value = []
+
+        result = dispatcher.select(None, mock_selector)
+
+        # Should return None when no results (function doesn't return anything when len(r) == 0)
+        self.assertIsNone(result)
+
+    def test_wrapped_dispatcher_init(self):
+        """Test WrappedDispatcher initialization"""
+        mock_dispatcher = MockDispatcher()
+        handle_disconnect = Mock()
+
+        wrapped = WrappedDispatcher(self.app, 10.0, mock_dispatcher, handle_disconnect)
+
+        self.assertEqual(wrapped.app, self.app)
+        self.assertEqual(wrapped.ping_timeout, 10.0)
+        self.assertEqual(wrapped.dispatcher, mock_dispatcher)
+        self.assertEqual(wrapped.handleDisconnect, handle_disconnect)
+
+        # Should have set up signal handler
+        self.assertEqual(len(mock_dispatcher.signal_calls), 1)
+        sig, handler = mock_dispatcher.signal_calls[0]
+        self.assertEqual(sig, 2)  # SIGINT
+        self.assertEqual(handler, mock_dispatcher.abort)
+
+    def test_wrapped_dispatcher_read(self):
+        """Test WrappedDispatcher read method"""
+        mock_dispatcher = MockDispatcher()
+        handle_disconnect = Mock()
+        wrapped = WrappedDispatcher(self.app, 10.0, mock_dispatcher, handle_disconnect)
+
+        mock_sock = Mock()
+        read_callback = Mock()
+        check_callback = Mock()
+
+        wrapped.read(mock_sock, read_callback, check_callback)
+
+        # Should delegate to wrapped dispatcher
+        self.assertEqual(len(mock_dispatcher.read_calls), 1)
+        self.assertEqual(mock_dispatcher.read_calls[0], (mock_sock, read_callback))
+
+        # Should call timeout for ping_timeout
+        self.assertEqual(len(mock_dispatcher.timeout_calls), 1)
+        timeout_call = mock_dispatcher.timeout_calls[0]
+        self.assertEqual(timeout_call[0], 10.0)  # timeout seconds
+        self.assertEqual(timeout_call[1], check_callback)  # callback
+
+    def test_wrapped_dispatcher_read_no_ping_timeout(self):
+        """Test WrappedDispatcher read method without ping timeout"""
+        mock_dispatcher = MockDispatcher()
+        handle_disconnect = Mock()
+        wrapped = WrappedDispatcher(self.app, None, mock_dispatcher, handle_disconnect)
+
+        mock_sock = Mock()
+        read_callback = Mock()
+        check_callback = Mock()
+
+        wrapped.read(mock_sock, read_callback, check_callback)
+
+        # Should delegate to wrapped dispatcher
+        self.assertEqual(len(mock_dispatcher.read_calls), 1)
+
+        # Should NOT call timeout when ping_timeout is None
+        self.assertEqual(len(mock_dispatcher.timeout_calls), 0)
+
+    def test_wrapped_dispatcher_send(self):
+        """Test WrappedDispatcher send method"""
+        mock_dispatcher = MockDispatcher()
+        handle_disconnect = Mock()
+        wrapped = WrappedDispatcher(self.app, 10.0, mock_dispatcher, handle_disconnect)
+
+        mock_sock = Mock()
+        test_data = b"test data"
+
+        with patch("websocket._dispatcher.send") as mock_send:
+            result = wrapped.send(mock_sock, test_data)
+
+            # Should delegate to dispatcher.buffwrite
+            self.assertEqual(len(mock_dispatcher.buffwrite_calls), 1)
+            call = mock_dispatcher.buffwrite_calls[0]
+            self.assertEqual(call[0], mock_sock)
+            self.assertEqual(call[1], test_data)
+            self.assertEqual(call[2], mock_send)
+            self.assertEqual(call[3], handle_disconnect)
+
+            # Should return data length
+            self.assertEqual(result, len(test_data))
+
+    def test_wrapped_dispatcher_timeout(self):
+        """Test WrappedDispatcher timeout method"""
+        mock_dispatcher = MockDispatcher()
+        handle_disconnect = Mock()
+        wrapped = WrappedDispatcher(self.app, 10.0, mock_dispatcher, handle_disconnect)
+
+        callback = Mock()
+        args = ("arg1", "arg2")
+
+        wrapped.timeout(5.0, callback, *args)
+
+        # Should delegate to wrapped dispatcher
+        self.assertEqual(len(mock_dispatcher.timeout_calls), 1)
+        call = mock_dispatcher.timeout_calls[0]
+        self.assertEqual(call[0], 5.0)
+        self.assertEqual(call[1], callback)
+        self.assertEqual(call[2], args)
+
+    def test_wrapped_dispatcher_reconnect(self):
+        """Test WrappedDispatcher reconnect method"""
+        mock_dispatcher = MockDispatcher()
+        handle_disconnect = Mock()
+        wrapped = WrappedDispatcher(self.app, 10.0, mock_dispatcher, handle_disconnect)
+
+        reconnector = Mock()
+
+        wrapped.reconnect(3, reconnector)
+
+        # Should delegate to timeout method with reconnect=True
+        self.assertEqual(len(mock_dispatcher.timeout_calls), 1)
+        call = mock_dispatcher.timeout_calls[0]
+        self.assertEqual(call[0], 3)
+        self.assertEqual(call[1], reconnector)
+        self.assertEqual(call[2], (True,))
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_handshake_large_response.py b/libs/websocket/tests/test_handshake_large_response.py
new file mode 100644
index 0000000000..3ca415a09b
--- /dev/null
+++ b/libs/websocket/tests/test_handshake_large_response.py
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+import unittest
+from unittest.mock import Mock, patch
+
+from websocket._handshake import _get_resp_headers
+from websocket._exceptions import WebSocketBadStatusException
+from websocket._ssl_compat import SSLError
+
+"""
+test_handshake_large_response.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class HandshakeLargeResponseTest(unittest.TestCase):
+    def test_large_error_response_chunked_reading(self):
+        """Test that large HTTP error responses during handshake are read in chunks"""
+
+        # Mock socket
+        mock_sock = Mock()
+
+        # Create a large error response body (> 16KB)
+        large_response = b"Error details: " + b"A" * 20000  # 20KB+ response
+
+        # Track recv calls to ensure chunking
+        recv_calls = []
+
+        def mock_recv(sock, bufsize):
+            recv_calls.append(bufsize)
+            # Simulate SSL error if trying to read > 16KB at once
+            if bufsize > 16384:
+                raise SSLError("[SSL: BAD_LENGTH] unknown error")
+            return large_response[:bufsize]
+
+        # Mock read_headers to return error status with large content-length
+        with patch("websocket._handshake.read_headers") as mock_read_headers:
+            mock_read_headers.return_value = (
+                400,  # Bad request status
+                {"content-length": str(len(large_response))},
+                "Bad Request",
+            )
+
+            # Mock the recv function to track calls
+            with patch("websocket._socket.recv", side_effect=mock_recv):
+                # This should not raise SSLError, but should raise WebSocketBadStatusException
+                with self.assertRaises(WebSocketBadStatusException) as cm:
+                    _get_resp_headers(mock_sock)
+
+                # Verify the response body was included in the exception
+                self.assertIn(
+                    b"Error details:",
+                    (
+                        cm.exception.args[0].encode()
+                        if isinstance(cm.exception.args[0], str)
+                        else cm.exception.args[0]
+                    ),
+                )
+
+                # Verify chunked reading was used (multiple recv calls, none > 16KB)
+                self.assertGreater(len(recv_calls), 1)
+                self.assertTrue(all(call <= 16384 for call in recv_calls))
+
+    def test_handshake_ssl_large_response_protection(self):
+        """Test that the fix prevents SSL BAD_LENGTH errors during handshake"""
+
+        mock_sock = Mock()
+
+        # Large content that would trigger SSL error if read all at once
+        large_content = b"X" * 32768  # 32KB
+
+        chunks_returned = 0
+
+        def mock_recv_chunked(sock, bufsize):
+            nonlocal chunks_returned
+            # Return data in chunks, simulating successful chunked reading
+            chunk_start = chunks_returned * 16384
+            chunk_end = min(chunk_start + bufsize, len(large_content))
+            result = large_content[chunk_start:chunk_end]
+            chunks_returned += 1 if result else 0
+            return result
+
+        with patch("websocket._handshake.read_headers") as mock_read_headers:
+            mock_read_headers.return_value = (
+                500,  # Server error
+                {"content-length": str(len(large_content))},
+                "Internal Server Error",
+            )
+
+            with patch("websocket._socket.recv", side_effect=mock_recv_chunked):
+                # Should handle large response without SSL errors
+                with self.assertRaises(WebSocketBadStatusException) as cm:
+                    _get_resp_headers(mock_sock)
+
+                # Verify the complete response was captured
+                exception_str = str(cm.exception)
+                # Response body should be in the exception message
+                self.assertIn("XXXXX", exception_str)  # Part of the large content
+
+    def test_handshake_normal_small_response(self):
+        """Test that normal small responses still work correctly"""
+
+        mock_sock = Mock()
+        small_response = b"Small error message"
+
+        def mock_recv(sock, bufsize):
+            return small_response
+
+        with patch("websocket._handshake.read_headers") as mock_read_headers:
+            mock_read_headers.return_value = (
+                404,  # Not found
+                {"content-length": str(len(small_response))},
+                "Not Found",
+            )
+
+            with patch("websocket._socket.recv", side_effect=mock_recv):
+                with self.assertRaises(WebSocketBadStatusException) as cm:
+                    _get_resp_headers(mock_sock)
+
+                # Verify small response is handled correctly
+                self.assertIn("Small error message", str(cm.exception))
+
+    def test_handshake_no_content_length(self):
+        """Test handshake error response without content-length header"""
+
+        mock_sock = Mock()
+
+        with patch("websocket._handshake.read_headers") as mock_read_headers:
+            mock_read_headers.return_value = (
+                403,  # Forbidden
+                {},  # No content-length header
+                "Forbidden",
+            )
+
+            # Should raise exception without trying to read response body
+            with self.assertRaises(WebSocketBadStatusException) as cm:
+                _get_resp_headers(mock_sock)
+
+            # Should mention status but not have response body
+            exception_str = str(cm.exception)
+            self.assertIn("403", exception_str)
+            self.assertIn("Forbidden", exception_str)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_http.py b/libs/websocket/tests/test_http.py
index f495e63556..99f9155341 100644
--- a/libs/websocket/tests/test_http.py
+++ b/libs/websocket/tests/test_http.py
@@ -22,7 +22,7 @@
 test_http.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/libs/websocket/tests/test_large_payloads.py b/libs/websocket/tests/test_large_payloads.py
new file mode 100644
index 0000000000..4d69c635f1
--- /dev/null
+++ b/libs/websocket/tests/test_large_payloads.py
@@ -0,0 +1,273 @@
+# -*- coding: utf-8 -*-
+import unittest
+import struct
+from unittest.mock import Mock, patch, MagicMock
+
+from websocket._abnf import ABNF
+from websocket._core import WebSocket
+from websocket._exceptions import WebSocketProtocolException, WebSocketPayloadException
+from websocket._ssl_compat import SSLError
+
+"""
+test_large_payloads.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class LargePayloadTest(unittest.TestCase):
+    def test_frame_length_encoding_boundaries(self):
+        """Test WebSocket frame length encoding at various boundaries"""
+
+        # Test length encoding boundaries as per RFC 6455
+        test_cases = [
+            (125, "Single byte length"),  # Max for 7-bit length
+            (126, "Two byte length start"),  # Start of 16-bit length
+            (127, "Two byte length"),
+            (65535, "Two byte length max"),  # Max for 16-bit length
+            (65536, "Eight byte length start"),  # Start of 64-bit length
+            (16384, "16KB boundary"),  # The problematic size
+            (16385, "Just over 16KB"),
+            (32768, "32KB"),
+            (131072, "128KB"),
+        ]
+
+        for length, description in test_cases:
+            with self.subTest(length=length, description=description):
+                # Create payload of specified length
+                payload = b"A" * length
+
+                # Create frame
+                frame = ABNF.create_frame(payload, ABNF.OPCODE_BINARY)
+
+                # Verify frame can be formatted without error
+                formatted = frame.format()
+
+                # Verify the frame header is correctly structured
+                self.assertIsInstance(formatted, bytes)
+                self.assertTrue(len(formatted) >= length)  # Header + payload
+
+                # Verify payload length is preserved
+                self.assertEqual(len(frame.data), length)
+
+    def test_recv_large_payload_chunked(self):
+        """Test receiving large payloads in chunks (simulating the 16KB recv issue)"""
+
+        # Create a large payload that would trigger chunked reading
+        large_payload = b"B" * 32768  # 32KB
+
+        # Mock recv function that returns data in 16KB chunks
+        chunks = []
+        chunk_size = 16384
+        for i in range(0, len(large_payload), chunk_size):
+            chunks.append(large_payload[i : i + chunk_size])
+
+        call_count = 0
+
+        def mock_recv(bufsize):
+            nonlocal call_count
+            if call_count >= len(chunks):
+                return b""
+            result = chunks[call_count]
+            call_count += 1
+            return result
+
+        # Test the frame buffer's recv_strict method
+        from websocket._abnf import frame_buffer
+
+        fb = frame_buffer(mock_recv, skip_utf8_validation=True)
+
+        # This should handle large payloads by chunking
+        result = fb.recv_strict(len(large_payload))
+
+        self.assertEqual(result, large_payload)
+        # Verify multiple recv calls were made
+        self.assertGreater(call_count, 1)
+
+    def test_ssl_large_payload_simulation(self):
+        """Simulate SSL BAD_LENGTH error scenario"""
+
+        # This test demonstrates that the 16KB limit in frame buffer protects against SSL issues
+        payload_size = 16385
+
+        recv_calls = []
+
+        def mock_recv_with_ssl_limit(bufsize):
+            recv_calls.append(bufsize)
+            # This simulates the SSL issue: BAD_LENGTH when trying to recv > 16KB
+            if bufsize > 16384:
+                raise SSLError("[SSL: BAD_LENGTH] unknown error")
+            return b"C" * min(bufsize, 16384)
+
+        from websocket._abnf import frame_buffer
+
+        fb = frame_buffer(mock_recv_with_ssl_limit, skip_utf8_validation=True)
+
+        # The frame buffer handles this correctly by chunking recv calls
+        result = fb.recv_strict(payload_size)
+
+        # Verify it worked and chunked the calls properly
+        self.assertEqual(len(result), payload_size)
+        # Verify no single recv call was > 16KB
+        self.assertTrue(all(call <= 16384 for call in recv_calls))
+        # Verify multiple calls were made
+        self.assertGreater(len(recv_calls), 1)
+
+    def test_frame_format_large_payloads(self):
+        """Test frame formatting with various large payload sizes"""
+
+        # Test sizes around potential problem areas
+        test_sizes = [16383, 16384, 16385, 32768, 65535, 65536]
+
+        for size in test_sizes:
+            with self.subTest(size=size):
+                payload = b"D" * size
+                frame = ABNF.create_frame(payload, ABNF.OPCODE_BINARY)
+
+                # Should not raise any exceptions
+                formatted = frame.format()
+
+                # Verify structure
+                self.assertIsInstance(formatted, bytes)
+                self.assertEqual(len(frame.data), size)
+
+                # Verify length encoding is correct based on size
+                # Note: frames from create_frame() include masking by default (4 extra bytes)
+                mask_size = 4  # WebSocket frames are masked by default
+                if size < ABNF.LENGTH_7:  # < 126
+                    # Length should be encoded in single byte
+                    expected_header_size = (
+                        2 + mask_size
+                    )  # 1 byte opcode + 1 byte length + 4 byte mask
+                elif size < ABNF.LENGTH_16:  # < 65536
+                    # Length should be encoded in 2 bytes
+                    expected_header_size = (
+                        4 + mask_size
+                    )  # 1 byte opcode + 1 byte marker + 2 bytes length + 4 byte mask
+                else:
+                    # Length should be encoded in 8 bytes
+                    expected_header_size = (
+                        10 + mask_size
+                    )  # 1 byte opcode + 1 byte marker + 8 bytes length + 4 byte mask
+
+                self.assertEqual(len(formatted), expected_header_size + size)
+
+    def test_send_large_payload_chunking(self):
+        """Test that large payloads are sent in chunks to avoid SSL issues"""
+
+        mock_sock = Mock()
+
+        # Track how data is sent
+        sent_chunks = []
+
+        def mock_send(data):
+            sent_chunks.append(len(data))
+            return len(data)
+
+        mock_sock.send = mock_send
+        mock_sock.gettimeout.return_value = 30.0
+
+        # Create WebSocket with mocked socket
+        ws = WebSocket()
+        ws.sock = mock_sock
+        ws.connected = True
+
+        # Create large payload
+        large_payload = b"E" * 32768  # 32KB
+
+        # Send the payload
+        with patch("websocket._core.send") as mock_send_func:
+            mock_send_func.side_effect = lambda sock, data: len(data)
+
+            # This should work without SSL errors
+            result = ws.send_binary(large_payload)
+
+            # Verify payload was accepted
+            self.assertGreater(result, 0)
+
+    def test_utf8_validation_large_text(self):
+        """Test UTF-8 validation with large text payloads"""
+
+        # Create large valid UTF-8 text
+        large_text = "Hello ไธ–็•Œ! " * 2000  # About 26KB with Unicode
+
+        # Test frame creation
+        frame = ABNF.create_frame(large_text, ABNF.OPCODE_TEXT)
+
+        # Should not raise validation errors
+        formatted = frame.format()
+        self.assertIsInstance(formatted, bytes)
+
+        # Test with close frame that has invalid UTF-8 (this is what validate() actually checks)
+        invalid_utf8_close_data = struct.pack("!H", 1000) + b"\xff\xfe invalid utf8"
+
+        # Create close frame with invalid UTF-8 data
+        frame = ABNF(1, 0, 0, 0, ABNF.OPCODE_CLOSE, 1, invalid_utf8_close_data)
+
+        # Validation should catch the invalid UTF-8 in close frame reason
+        with self.assertRaises(WebSocketProtocolException):
+            frame.validate(skip_utf8_validation=False)
+
+    def test_frame_buffer_edge_cases(self):
+        """Test frame buffer with edge cases that could trigger bugs"""
+
+        # Test scenario: exactly 16KB payload split across recv calls
+        payload_16k = b"F" * 16384
+
+        # Simulate receiving in smaller chunks
+        chunks = [payload_16k[i : i + 4096] for i in range(0, len(payload_16k), 4096)]
+
+        call_count = 0
+
+        def mock_recv(bufsize):
+            nonlocal call_count
+            if call_count >= len(chunks):
+                return b""
+            result = chunks[call_count]
+            call_count += 1
+            return result
+
+        from websocket._abnf import frame_buffer
+
+        fb = frame_buffer(mock_recv, skip_utf8_validation=True)
+        result = fb.recv_strict(16384)
+
+        self.assertEqual(result, payload_16k)
+        # Verify multiple recv calls were made
+        self.assertEqual(call_count, 4)  # 16KB / 4KB = 4 chunks
+
+    def test_max_frame_size_limits(self):
+        """Test behavior at WebSocket maximum frame size limits"""
+
+        # Test just under the maximum theoretical frame size
+        # (This is a very large test, so we'll use a smaller representative size)
+
+        # Test with a reasonably large payload that represents the issue
+        large_size = 1024 * 1024  # 1MB
+        payload = b"G" * large_size
+
+        # This should work without issues
+        frame = ABNF.create_frame(payload, ABNF.OPCODE_BINARY)
+
+        # Verify the frame can be formatted
+        formatted = frame.format()
+        self.assertIsInstance(formatted, bytes)
+
+        # Verify payload is preserved
+        self.assertEqual(len(frame.data), large_size)
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_socket.py b/libs/websocket/tests/test_socket.py
new file mode 100644
index 0000000000..5b8b65bd6b
--- /dev/null
+++ b/libs/websocket/tests/test_socket.py
@@ -0,0 +1,357 @@
+# -*- coding: utf-8 -*-
+import errno
+import socket
+import unittest
+from unittest.mock import Mock, patch, MagicMock
+import time
+
+from websocket._socket import recv, recv_line, send, DEFAULT_SOCKET_OPTION
+from websocket._ssl_compat import (
+    SSLError,
+    SSLEOFError,
+    SSLWantWriteError,
+    SSLWantReadError,
+)
+from websocket._exceptions import (
+    WebSocketTimeoutException,
+    WebSocketConnectionClosedException,
+)
+
+"""
+test_socket.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class SocketTest(unittest.TestCase):
+    def test_default_socket_option(self):
+        """Test DEFAULT_SOCKET_OPTION contains expected options"""
+        self.assertIsInstance(DEFAULT_SOCKET_OPTION, list)
+        self.assertGreater(len(DEFAULT_SOCKET_OPTION), 0)
+
+        # Should contain TCP_NODELAY option
+        tcp_nodelay_found = any(
+            opt[1] == socket.TCP_NODELAY for opt in DEFAULT_SOCKET_OPTION
+        )
+        self.assertTrue(tcp_nodelay_found)
+
+    def test_recv_normal(self):
+        """Test normal recv operation"""
+        mock_sock = Mock()
+        mock_sock.recv.return_value = b"test data"
+
+        result = recv(mock_sock, 9)
+
+        self.assertEqual(result, b"test data")
+        mock_sock.recv.assert_called_once_with(9)
+
+    def test_recv_timeout_error(self):
+        """Test recv with TimeoutError"""
+        mock_sock = Mock()
+        mock_sock.recv.side_effect = TimeoutError("Connection timed out")
+
+        with self.assertRaises(WebSocketTimeoutException) as cm:
+            recv(mock_sock, 9)
+
+        self.assertEqual(str(cm.exception), "Connection timed out")
+
+    def test_recv_socket_timeout(self):
+        """Test recv with socket.timeout"""
+        mock_sock = Mock()
+        timeout_exc = socket.timeout("Socket timed out")
+        timeout_exc.args = ("Socket timed out",)
+        mock_sock.recv.side_effect = timeout_exc
+        mock_sock.gettimeout.return_value = 30.0
+
+        with self.assertRaises(WebSocketTimeoutException) as cm:
+            recv(mock_sock, 9)
+
+        # In Python 3.10+, socket.timeout is a subclass of TimeoutError
+        # so it's caught by the TimeoutError handler with hardcoded message
+        # In Python 3.9, socket.timeout is caught by socket.timeout handler
+        # which preserves the original message
+        import sys
+
+        if sys.version_info >= (3, 10):
+            self.assertEqual(str(cm.exception), "Connection timed out")
+        else:
+            self.assertEqual(str(cm.exception), "Socket timed out")
+
+    def test_recv_ssl_timeout(self):
+        """Test recv with SSL timeout error"""
+        mock_sock = Mock()
+        ssl_exc = SSLError("The operation timed out")
+        ssl_exc.args = ("The operation timed out",)
+        mock_sock.recv.side_effect = ssl_exc
+
+        with self.assertRaises(WebSocketTimeoutException) as cm:
+            recv(mock_sock, 9)
+
+        self.assertEqual(str(cm.exception), "The operation timed out")
+
+    def test_recv_ssl_non_timeout_error(self):
+        """Test recv with SSL non-timeout error"""
+        mock_sock = Mock()
+        ssl_exc = SSLError("SSL certificate error")
+        ssl_exc.args = ("SSL certificate error",)
+        mock_sock.recv.side_effect = ssl_exc
+
+        # Should re-raise the original SSL error
+        with self.assertRaises(SSLError):
+            recv(mock_sock, 9)
+
+    def test_recv_empty_response(self):
+        """Test recv with empty response (connection closed)"""
+        mock_sock = Mock()
+        mock_sock.recv.return_value = b""
+
+        with self.assertRaises(WebSocketConnectionClosedException) as cm:
+            recv(mock_sock, 9)
+
+        self.assertEqual(str(cm.exception), "Connection to remote host was lost.")
+
+    def test_recv_ssl_want_read_error(self):
+        """Test recv with SSLWantReadError (should retry)"""
+        mock_sock = Mock()
+
+        # First call raises SSLWantReadError, second call succeeds
+        mock_sock.recv.side_effect = [SSLWantReadError(), b"data after retry"]
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Ready to read
+
+            result = recv(mock_sock, 100)
+
+            self.assertEqual(result, b"data after retry")
+            mock_selector.register.assert_called()
+            mock_selector.close.assert_called()
+
+    def test_recv_ssl_want_read_timeout(self):
+        """Test recv with SSLWantReadError that times out"""
+        mock_sock = Mock()
+        mock_sock.recv.side_effect = SSLWantReadError()
+        mock_sock.gettimeout.return_value = 1.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = []  # Timeout
+
+            with self.assertRaises(WebSocketTimeoutException):
+                recv(mock_sock, 100)
+
+    def test_recv_line(self):
+        """Test recv_line functionality"""
+        mock_sock = Mock()
+
+        # Mock recv to return one character at a time
+        recv_calls = [b"H", b"e", b"l", b"l", b"o", b"\n"]
+
+        with patch("websocket._socket.recv", side_effect=recv_calls) as mock_recv:
+            result = recv_line(mock_sock)
+
+            self.assertEqual(result, b"Hello\n")
+            self.assertEqual(mock_recv.call_count, 6)
+
+    def test_send_normal(self):
+        """Test normal send operation"""
+        mock_sock = Mock()
+        mock_sock.send.return_value = 9
+        mock_sock.gettimeout.return_value = 30.0
+
+        result = send(mock_sock, b"test data")
+
+        self.assertEqual(result, 9)
+        mock_sock.send.assert_called_with(b"test data")
+
+    def test_send_zero_timeout(self):
+        """Test send with zero timeout (non-blocking)"""
+        mock_sock = Mock()
+        mock_sock.send.return_value = 9
+        mock_sock.gettimeout.return_value = 0
+
+        result = send(mock_sock, b"test data")
+
+        self.assertEqual(result, 9)
+        mock_sock.send.assert_called_once_with(b"test data")
+
+    def test_send_ssl_eof_error(self):
+        """Test send with SSLEOFError"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+        mock_sock.send.side_effect = SSLEOFError("Connection closed")
+
+        with self.assertRaises(WebSocketConnectionClosedException) as cm:
+            send(mock_sock, b"test data")
+
+        self.assertEqual(str(cm.exception), "socket is already closed.")
+
+    def test_send_ssl_want_write_error(self):
+        """Test send with SSLWantWriteError (should retry)"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # First call raises SSLWantWriteError, second call succeeds
+        mock_sock.send.side_effect = [SSLWantWriteError(), 9]
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Ready to write
+
+            result = send(mock_sock, b"test data")
+
+            self.assertEqual(result, 9)
+            mock_selector.register.assert_called()
+            mock_selector.close.assert_called()
+
+    def test_send_socket_eagain_error(self):
+        """Test send with EAGAIN error (should retry)"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # Create socket error with EAGAIN
+        eagain_error = socket.error("Resource temporarily unavailable")
+        eagain_error.errno = errno.EAGAIN
+        eagain_error.args = (errno.EAGAIN, "Resource temporarily unavailable")
+
+        # First call raises EAGAIN, second call succeeds
+        mock_sock.send.side_effect = [eagain_error, 9]
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Ready to write
+
+            result = send(mock_sock, b"test data")
+
+            self.assertEqual(result, 9)
+
+    def test_send_socket_ewouldblock_error(self):
+        """Test send with EWOULDBLOCK error (should retry)"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # Create socket error with EWOULDBLOCK
+        ewouldblock_error = socket.error("Operation would block")
+        ewouldblock_error.errno = errno.EWOULDBLOCK
+        ewouldblock_error.args = (errno.EWOULDBLOCK, "Operation would block")
+
+        # First call raises EWOULDBLOCK, second call succeeds
+        mock_sock.send.side_effect = [ewouldblock_error, 9]
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Ready to write
+
+            result = send(mock_sock, b"test data")
+
+            self.assertEqual(result, 9)
+
+    def test_send_socket_other_error(self):
+        """Test send with other socket error (should raise)"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # Create socket error with different errno
+        other_error = socket.error("Connection reset by peer")
+        other_error.errno = errno.ECONNRESET
+        other_error.args = (errno.ECONNRESET, "Connection reset by peer")
+
+        mock_sock.send.side_effect = other_error
+
+        with self.assertRaises(socket.error):
+            send(mock_sock, b"test data")
+
+    def test_send_socket_error_no_errno(self):
+        """Test send with socket error that has no errno"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # Create socket error without errno attribute
+        no_errno_error = socket.error("Generic socket error")
+        no_errno_error.args = ("Generic socket error",)
+
+        mock_sock.send.side_effect = no_errno_error
+
+        with self.assertRaises(socket.error):
+            send(mock_sock, b"test data")
+
+    def test_send_write_timeout(self):
+        """Test send write operation timeout"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # First call raises EAGAIN
+        eagain_error = socket.error("Resource temporarily unavailable")
+        eagain_error.errno = errno.EAGAIN
+        eagain_error.args = (errno.EAGAIN, "Resource temporarily unavailable")
+
+        mock_sock.send.side_effect = eagain_error
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = []  # Timeout - nothing ready
+
+            result = send(mock_sock, b"test data")
+
+            # Should return 0 when write times out
+            self.assertEqual(result, 0)
+
+    def test_send_string_data(self):
+        """Test send with string data (should be encoded)"""
+        mock_sock = Mock()
+        mock_sock.send.return_value = 9
+        mock_sock.gettimeout.return_value = 30.0
+
+        result = send(mock_sock, "test data")
+
+        self.assertEqual(result, 9)
+        mock_sock.send.assert_called_with(b"test data")
+
+    def test_send_partial_send_retry(self):
+        """Test send retry mechanism"""
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 30.0
+
+        # Create a scenario where send succeeds after selector retry
+        eagain_error = socket.error("Resource temporarily unavailable")
+        eagain_error.errno = errno.EAGAIN
+        eagain_error.args = (errno.EAGAIN, "Resource temporarily unavailable")
+
+        # Mock the internal _send function behavior
+        mock_sock.send.side_effect = [eagain_error, 9]
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Socket ready for writing
+
+            result = send(mock_sock, b"test data")
+
+            self.assertEqual(result, 9)
+            # Verify selector was used for retry mechanism
+            mock_selector.register.assert_called()
+            mock_selector.select.assert_called()
+            mock_selector.close.assert_called()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_socket_bugs.py b/libs/websocket/tests/test_socket_bugs.py
new file mode 100644
index 0000000000..72f222f5c4
--- /dev/null
+++ b/libs/websocket/tests/test_socket_bugs.py
@@ -0,0 +1,160 @@
+# -*- coding: utf-8 -*-
+import errno
+import socket
+import unittest
+from unittest.mock import Mock, patch
+
+from websocket._socket import recv
+from websocket._ssl_compat import SSLWantReadError
+from websocket._exceptions import (
+    WebSocketTimeoutException,
+    WebSocketConnectionClosedException,
+)
+
+"""
+test_socket_bugs.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class SocketBugsTest(unittest.TestCase):
+    """Test bugs found in socket handling logic"""
+
+    def test_bug_implicit_none_return_from_ssl_want_read_fixed(self):
+        """
+        BUG #5 FIX VERIFICATION: Test SSLWantReadError timeout now raises correct exception
+
+        Bug was in _socket.py:100-101 - SSLWantReadError except block returned None implicitly
+        Fixed: Now properly handles timeout with WebSocketTimeoutException
+        """
+        mock_sock = Mock()
+        mock_sock.recv.side_effect = SSLWantReadError()
+        mock_sock.gettimeout.return_value = 1.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = []  # Timeout - no data ready
+
+            with self.assertRaises(WebSocketTimeoutException) as cm:
+                recv(mock_sock, 100)
+
+            # Verify correct timeout exception and message
+            self.assertIn("Connection timed out waiting for data", str(cm.exception))
+
+    def test_bug_implicit_none_return_from_socket_error_fixed(self):
+        """
+        BUG #5 FIX VERIFICATION: Test that socket.error with EAGAIN now handles timeout correctly
+
+        Bug was in _socket.py:102-105 - socket.error except block returned None implicitly
+        Fixed: Now properly handles timeout with WebSocketTimeoutException
+        """
+        mock_sock = Mock()
+
+        # Create socket error with EAGAIN (should be retried)
+        eagain_error = OSError(errno.EAGAIN, "Resource temporarily unavailable")
+
+        # First call raises EAGAIN, selector times out on retry
+        mock_sock.recv.side_effect = eagain_error
+        mock_sock.gettimeout.return_value = 1.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = []  # Timeout - no data ready
+
+            with self.assertRaises(WebSocketTimeoutException) as cm:
+                recv(mock_sock, 100)
+
+            # Verify correct timeout exception and message
+            self.assertIn("Connection timed out waiting for data", str(cm.exception))
+
+    def test_bug_wrong_exception_for_selector_timeout_fixed(self):
+        """
+        BUG #6 FIX VERIFICATION: Test that selector timeout now raises correct exception type
+
+        Bug was in _socket.py:115 returning None for timeout, treated as connection error
+        Fixed: Now raises WebSocketTimeoutException directly
+        """
+        mock_sock = Mock()
+        mock_sock.recv.side_effect = SSLWantReadError()  # Trigger retry path
+        mock_sock.gettimeout.return_value = 1.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = []  # TIMEOUT - this is key!
+
+            with self.assertRaises(WebSocketTimeoutException) as cm:
+                recv(mock_sock, 100)
+
+            # Verify it's the correct timeout exception with proper message
+            self.assertIn("Connection timed out waiting for data", str(cm.exception))
+
+            # This proves the fix works:
+            # 1. selector.select() returns [] (timeout)
+            # 2. _recv() now raises WebSocketTimeoutException directly
+            # 3. No more misclassification as connection closed error!
+
+    def test_socket_timeout_exception_handling(self):
+        """
+        Test that socket.timeout exceptions are properly handled
+        """
+        mock_sock = Mock()
+        mock_sock.gettimeout.return_value = 1.0
+
+        # Simulate a real socket.timeout scenario
+        mock_sock.recv.side_effect = socket.timeout("Operation timed out")
+
+        # This works correctly - socket.timeout raises WebSocketTimeoutException
+        with self.assertRaises(WebSocketTimeoutException) as cm:
+            recv(mock_sock, 100)
+
+        # In Python 3.10+, socket.timeout is a subclass of TimeoutError
+        # so it's caught by the TimeoutError handler with hardcoded message
+        # In Python 3.9, socket.timeout is caught by socket.timeout handler
+        # which preserves the original message
+        import sys
+
+        if sys.version_info >= (3, 10):
+            self.assertIn("Connection timed out", str(cm.exception))
+        else:
+            self.assertIn("Operation timed out", str(cm.exception))
+
+    def test_correct_ssl_want_read_retry_behavior(self):
+        """Test the correct behavior when SSLWantReadError is properly handled"""
+        mock_sock = Mock()
+
+        # First call raises SSLWantReadError, second call succeeds
+        mock_sock.recv.side_effect = [SSLWantReadError(), b"data after retry"]
+        mock_sock.gettimeout.return_value = 1.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Data ready after wait
+
+            # This should work correctly
+            result = recv(mock_sock, 100)
+            self.assertEqual(result, b"data after retry")
+
+            # Selector should be used for retry
+            mock_selector.register.assert_called()
+            mock_selector.select.assert_called()
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_ssl_compat.py b/libs/websocket/tests/test_ssl_compat.py
new file mode 100644
index 0000000000..9dcd674b0f
--- /dev/null
+++ b/libs/websocket/tests/test_ssl_compat.py
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+import sys
+import unittest
+from unittest.mock import patch
+
+"""
+test_ssl_compat.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class SSLCompatTest(unittest.TestCase):
+    def test_ssl_available(self):
+        """Test that SSL is available in normal conditions"""
+        import websocket._ssl_compat as ssl_compat
+
+        # In normal conditions, SSL should be available
+        self.assertTrue(ssl_compat.HAVE_SSL)
+        self.assertIsNotNone(ssl_compat.ssl)
+
+        # SSL exception classes should be available
+        self.assertTrue(hasattr(ssl_compat, "SSLError"))
+        self.assertTrue(hasattr(ssl_compat, "SSLEOFError"))
+        self.assertTrue(hasattr(ssl_compat, "SSLWantReadError"))
+        self.assertTrue(hasattr(ssl_compat, "SSLWantWriteError"))
+
+    def test_ssl_not_available(self):
+        """Test fallback behavior when SSL is not available"""
+        # Remove ssl_compat from modules to force reimport
+        if "websocket._ssl_compat" in sys.modules:
+            del sys.modules["websocket._ssl_compat"]
+
+        # Mock the ssl module to not be available
+        import builtins
+
+        original_import = builtins.__import__
+
+        def mock_import(name, *args, **kwargs):
+            if name == "ssl":
+                raise ImportError("No module named 'ssl'")
+            return original_import(name, *args, **kwargs)
+
+        with patch("builtins.__import__", side_effect=mock_import):
+            import websocket._ssl_compat as ssl_compat
+
+            # SSL should not be available
+            self.assertFalse(ssl_compat.HAVE_SSL)
+            self.assertIsNone(ssl_compat.ssl)
+
+            # Fallback exception classes should be available and functional
+            self.assertTrue(issubclass(ssl_compat.SSLError, Exception))
+            self.assertTrue(issubclass(ssl_compat.SSLEOFError, Exception))
+            self.assertTrue(issubclass(ssl_compat.SSLWantReadError, Exception))
+            self.assertTrue(issubclass(ssl_compat.SSLWantWriteError, Exception))
+
+            # Test that exceptions can be instantiated
+            ssl_error = ssl_compat.SSLError("test error")
+            self.assertIsInstance(ssl_error, Exception)
+            self.assertEqual(str(ssl_error), "test error")
+
+            ssl_eof_error = ssl_compat.SSLEOFError("test eof")
+            self.assertIsInstance(ssl_eof_error, Exception)
+
+            ssl_want_read = ssl_compat.SSLWantReadError("test read")
+            self.assertIsInstance(ssl_want_read, Exception)
+
+            ssl_want_write = ssl_compat.SSLWantWriteError("test write")
+            self.assertIsInstance(ssl_want_write, Exception)
+
+    def tearDown(self):
+        """Clean up after tests"""
+        # Ensure ssl_compat is reimported fresh for next test
+        if "websocket._ssl_compat" in sys.modules:
+            del sys.modules["websocket._ssl_compat"]
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_ssl_edge_cases.py b/libs/websocket/tests/test_ssl_edge_cases.py
new file mode 100644
index 0000000000..a8e14d3f4e
--- /dev/null
+++ b/libs/websocket/tests/test_ssl_edge_cases.py
@@ -0,0 +1,638 @@
+# -*- coding: utf-8 -*-
+import unittest
+import socket
+import ssl
+from unittest.mock import Mock, patch, MagicMock
+
+from websocket._ssl_compat import (
+    SSLError,
+    SSLEOFError,
+    SSLWantReadError,
+    SSLWantWriteError,
+    HAVE_SSL,
+)
+from websocket._http import _ssl_socket, _wrap_sni_socket
+from websocket._exceptions import WebSocketException
+from websocket._socket import recv, send
+
+"""
+test_ssl_edge_cases.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class SSLEdgeCasesTest(unittest.TestCase):
+
+    def setUp(self):
+        if not HAVE_SSL:
+            self.skipTest("SSL not available")
+
+    def test_ssl_handshake_failure(self):
+        """Test SSL handshake failure scenarios"""
+        mock_sock = Mock()
+
+        # Test SSL handshake timeout
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.side_effect = socket.timeout(
+                "SSL handshake timeout"
+            )
+
+            sslopt = {"cert_reqs": ssl.CERT_REQUIRED}
+
+            with self.assertRaises(socket.timeout):
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+    def test_ssl_certificate_verification_failures(self):
+        """Test various SSL certificate verification failure scenarios"""
+        mock_sock = Mock()
+
+        # Test certificate verification failure
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.side_effect = ssl.SSLCertVerificationError(
+                "Certificate verification failed"
+            )
+
+            sslopt = {"cert_reqs": ssl.CERT_REQUIRED, "check_hostname": True}
+
+            with self.assertRaises(ssl.SSLCertVerificationError):
+                _ssl_socket(mock_sock, sslopt, "badssl.example")
+
+    def test_ssl_context_configuration_edge_cases(self):
+        """Test SSL context configuration with various edge cases"""
+        mock_sock = Mock()
+
+        # Test with pre-created SSL context
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            existing_context = Mock()
+            existing_context.wrap_socket.return_value = Mock()
+            mock_ssl_context.return_value = existing_context
+
+            sslopt = {"context": existing_context}
+
+            # Call _ssl_socket which should use the existing context
+            _ssl_socket(mock_sock, sslopt, "example.com")
+
+            # Should use the provided context, not create a new one
+            existing_context.wrap_socket.assert_called_once()
+
+    def test_ssl_ca_bundle_environment_edge_cases(self):
+        """Test CA bundle environment variable edge cases"""
+        mock_sock = Mock()
+
+        # Test with non-existent CA bundle file
+        with patch.dict(
+            "os.environ", {"WEBSOCKET_CLIENT_CA_BUNDLE": "/nonexistent/ca-bundle.crt"}
+        ):
+            with patch("os.path.isfile", return_value=False):
+                with patch("os.path.isdir", return_value=False):
+                    with patch("ssl.SSLContext") as mock_ssl_context:
+                        mock_context = Mock()
+                        mock_ssl_context.return_value = mock_context
+                        mock_context.wrap_socket.return_value = Mock()
+
+                        sslopt = {}
+                        _ssl_socket(mock_sock, sslopt, "example.com")
+
+                        # Should not try to load non-existent CA bundle
+                        mock_context.load_verify_locations.assert_not_called()
+
+        # Test with CA bundle directory
+        with patch.dict("os.environ", {"WEBSOCKET_CLIENT_CA_BUNDLE": "/etc/ssl/certs"}):
+            with patch("os.path.isfile", return_value=False):
+                with patch("os.path.isdir", return_value=True):
+                    with patch("ssl.SSLContext") as mock_ssl_context:
+                        mock_context = Mock()
+                        mock_ssl_context.return_value = mock_context
+                        mock_context.wrap_socket.return_value = Mock()
+
+                        sslopt = {}
+                        _ssl_socket(mock_sock, sslopt, "example.com")
+
+                        # Should load CA directory
+                        mock_context.load_verify_locations.assert_called_with(
+                            cafile=None, capath="/etc/ssl/certs"
+                        )
+
+    def test_ssl_cipher_configuration_edge_cases(self):
+        """Test SSL cipher configuration edge cases"""
+        mock_sock = Mock()
+
+        # Test with invalid cipher suite
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.set_ciphers.side_effect = ssl.SSLError(
+                "No cipher can be selected"
+            )
+            mock_context.wrap_socket.return_value = Mock()
+
+            sslopt = {"ciphers": "INVALID_CIPHER"}
+
+            with self.assertRaises(WebSocketException):
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+    def test_ssl_ecdh_curve_edge_cases(self):
+        """Test ECDH curve configuration edge cases"""
+        mock_sock = Mock()
+
+        # Test with invalid ECDH curve
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.set_ecdh_curve.side_effect = ValueError("unknown curve name")
+            mock_context.wrap_socket.return_value = Mock()
+
+            sslopt = {"ecdh_curve": "invalid_curve"}
+
+            with self.assertRaises(WebSocketException):
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+    def test_ssl_client_certificate_edge_cases(self):
+        """Test client certificate configuration edge cases"""
+        mock_sock = Mock()
+
+        # Test with non-existent client certificate
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.load_cert_chain.side_effect = FileNotFoundError("No such file")
+            mock_context.wrap_socket.return_value = Mock()
+
+            sslopt = {"certfile": "/nonexistent/client.crt"}
+
+            with self.assertRaises(WebSocketException):
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+    def test_ssl_want_read_write_retry_edge_cases(self):
+        """Test SSL want read/write retry edge cases"""
+        mock_sock = Mock()
+
+        # Test SSLWantReadError with multiple retries before success
+        read_attempts = [0]  # Use list for mutable reference
+
+        def mock_recv(bufsize):
+            read_attempts[0] += 1
+            if read_attempts[0] == 1:
+                raise SSLWantReadError("The operation did not complete")
+            elif read_attempts[0] == 2:
+                return b"data after retries"
+            else:
+                return b""
+
+        mock_sock.recv.side_effect = mock_recv
+        mock_sock.gettimeout.return_value = 30.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Always ready
+
+            result = recv(mock_sock, 100)
+
+            self.assertEqual(result, b"data after retries")
+            self.assertEqual(read_attempts[0], 2)
+            # Should have used selector for retry
+            mock_selector.register.assert_called()
+            mock_selector.select.assert_called()
+
+    def test_ssl_want_write_retry_edge_cases(self):
+        """Test SSL want write retry edge cases"""
+        mock_sock = Mock()
+
+        # Test SSLWantWriteError with multiple retries before success
+        write_attempts = [0]  # Use list for mutable reference
+
+        def mock_send(data):
+            write_attempts[0] += 1
+            if write_attempts[0] == 1:
+                raise SSLWantWriteError("The operation did not complete")
+            elif write_attempts[0] == 2:
+                return len(data)
+            else:
+                return 0
+
+        mock_sock.send.side_effect = mock_send
+        mock_sock.gettimeout.return_value = 30.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]  # Always ready
+
+            result = send(mock_sock, b"test data")
+
+            self.assertEqual(result, 9)  # len("test data")
+            self.assertEqual(write_attempts[0], 2)
+
+    def test_ssl_eof_error_edge_cases(self):
+        """Test SSL EOF error edge cases"""
+        mock_sock = Mock()
+
+        # Test SSLEOFError during send
+        mock_sock.send.side_effect = SSLEOFError("SSL connection has been closed")
+        mock_sock.gettimeout.return_value = 30.0
+
+        from websocket._exceptions import WebSocketConnectionClosedException
+
+        with self.assertRaises(WebSocketConnectionClosedException):
+            send(mock_sock, b"test data")
+
+    def test_ssl_pending_data_edge_cases(self):
+        """Test SSL pending data scenarios"""
+        from websocket._dispatcher import SSLDispatcher
+        from websocket._app import WebSocketApp
+
+        # Mock SSL socket with pending data
+        mock_ssl_sock = Mock()
+        mock_ssl_sock.pending.return_value = 1024  # Simulates pending SSL data
+
+        # Mock WebSocketApp
+        mock_app = Mock(spec=WebSocketApp)
+        mock_app.sock = Mock()
+        mock_app.sock.sock = mock_ssl_sock
+
+        dispatcher = SSLDispatcher(mock_app, 5.0)
+
+        # When there's pending data, should return immediately without selector
+        result = dispatcher.select(mock_ssl_sock, Mock())
+
+        # Should return the socket list when there's pending data
+        self.assertEqual(result, [mock_ssl_sock])
+        mock_ssl_sock.pending.assert_called_once()
+
+    def test_ssl_renegotiation_edge_cases(self):
+        """Test SSL renegotiation scenarios"""
+        mock_sock = Mock()
+
+        # Simulate SSL renegotiation during read
+        call_count = 0
+
+        def mock_recv(bufsize):
+            nonlocal call_count
+            call_count += 1
+            if call_count == 1:
+                raise SSLWantReadError("SSL renegotiation required")
+            return b"data after renegotiation"
+
+        mock_sock.recv.side_effect = mock_recv
+        mock_sock.gettimeout.return_value = 30.0
+
+        with patch("selectors.DefaultSelector") as mock_selector_class:
+            mock_selector = Mock()
+            mock_selector_class.return_value = mock_selector
+            mock_selector.select.return_value = [True]
+
+            result = recv(mock_sock, 100)
+
+            self.assertEqual(result, b"data after renegotiation")
+            self.assertEqual(call_count, 2)
+
+    def test_ssl_server_hostname_override(self):
+        """Test SSL server hostname override scenarios"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.return_value = Mock()
+
+            # Test server_hostname override
+            sslopt = {"server_hostname": "override.example.com"}
+            _ssl_socket(mock_sock, sslopt, "original.example.com")
+
+            # Should use override hostname in wrap_socket call
+            mock_context.wrap_socket.assert_called_with(
+                mock_sock,
+                do_handshake_on_connect=True,
+                suppress_ragged_eofs=True,
+                server_hostname="override.example.com",
+            )
+
+    def test_ssl_protocol_version_edge_cases(self):
+        """Test SSL protocol version edge cases"""
+        mock_sock = Mock()
+
+        # Test with deprecated SSL version
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.return_value = Mock()
+
+            # Test that deprecated ssl_version is still handled
+            if hasattr(ssl, "PROTOCOL_TLS"):
+                sslopt = {"ssl_version": ssl.PROTOCOL_TLS}
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+                mock_ssl_context.assert_called_with(ssl.PROTOCOL_TLS)
+
+    def test_ssl_keylog_file_edge_cases(self):
+        """Test SSL keylog file configuration edge cases"""
+        mock_sock = Mock()
+
+        # Test with SSLKEYLOGFILE environment variable
+        with patch.dict("os.environ", {"SSLKEYLOGFILE": "/tmp/ssl_keys.log"}):
+            with patch("ssl.SSLContext") as mock_ssl_context:
+                mock_context = Mock()
+                mock_ssl_context.return_value = mock_context
+                mock_context.wrap_socket.return_value = Mock()
+
+                sslopt = {}
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+                # Should set keylog_filename
+                self.assertEqual(mock_context.keylog_filename, "/tmp/ssl_keys.log")
+
+    def test_ssl_context_verification_modes(self):
+        """Test different SSL verification mode combinations"""
+        mock_sock = Mock()
+
+        test_cases = [
+            # (cert_reqs, check_hostname, expected_verify_mode, expected_check_hostname)
+            (ssl.CERT_NONE, False, ssl.CERT_NONE, False),
+            (ssl.CERT_REQUIRED, False, ssl.CERT_REQUIRED, False),
+            (ssl.CERT_REQUIRED, True, ssl.CERT_REQUIRED, True),
+        ]
+
+        for cert_reqs, check_hostname, expected_verify, expected_check in test_cases:
+            with self.subTest(cert_reqs=cert_reqs, check_hostname=check_hostname):
+                with patch("ssl.SSLContext") as mock_ssl_context:
+                    mock_context = Mock()
+                    mock_ssl_context.return_value = mock_context
+                    mock_context.wrap_socket.return_value = Mock()
+
+                    sslopt = {"cert_reqs": cert_reqs, "check_hostname": check_hostname}
+                    _ssl_socket(mock_sock, sslopt, "example.com")
+
+                    self.assertEqual(mock_context.verify_mode, expected_verify)
+                    self.assertEqual(mock_context.check_hostname, expected_check)
+
+    def test_ssl_socket_shutdown_edge_cases(self):
+        """Test SSL socket shutdown edge cases"""
+        from websocket._core import WebSocket
+
+        mock_ssl_sock = Mock()
+        mock_ssl_sock.shutdown.side_effect = SSLError("SSL shutdown failed")
+
+        ws = WebSocket()
+        ws.sock = mock_ssl_sock
+        ws.connected = True
+
+        # Should handle SSL shutdown errors gracefully
+        try:
+            ws.close()
+        except SSLError:
+            self.fail("SSL shutdown error should be handled gracefully")
+
+    def test_ssl_socket_close_during_operation(self):
+        """Test SSL socket being closed during ongoing operations"""
+        mock_sock = Mock()
+
+        # Simulate SSL socket being closed during recv
+        mock_sock.recv.side_effect = SSLError(
+            "SSL connection has been closed unexpectedly"
+        )
+        mock_sock.gettimeout.return_value = 30.0
+
+        from websocket._exceptions import WebSocketConnectionClosedException
+
+        # Should handle unexpected SSL closure
+        with self.assertRaises((SSLError, WebSocketConnectionClosedException)):
+            recv(mock_sock, 100)
+
+    def test_ssl_compression_edge_cases(self):
+        """Test SSL compression configuration edge cases"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.return_value = Mock()
+
+            # Test SSL compression options (if available)
+            sslopt = {"compression": False}  # Some SSL contexts support this
+
+            try:
+                _ssl_socket(mock_sock, sslopt, "example.com")
+                # Should not fail even if compression option is not supported
+            except AttributeError:
+                # Expected if SSL context doesn't support compression option
+                pass
+
+    def test_ssl_session_reuse_edge_cases(self):
+        """Test SSL session reuse scenarios"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_ssl_sock = Mock()
+            mock_context.wrap_socket.return_value = mock_ssl_sock
+
+            # Test session reuse
+            mock_ssl_sock.session = "mock_session"
+            mock_ssl_sock.session_reused = True
+
+            result = _ssl_socket(mock_sock, {}, "example.com")
+
+            # Should handle session reuse without issues
+            self.assertIsNotNone(result)
+
+    def test_ssl_alpn_protocol_edge_cases(self):
+        """Test SSL ALPN (Application Layer Protocol Negotiation) edge cases"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.return_value = Mock()
+
+            # Test ALPN configuration
+            sslopt = {"alpn_protocols": ["http/1.1", "h2"]}
+
+            # ALPN protocols are not currently supported in the SSL wrapper
+            # but the test should not fail
+            result = _ssl_socket(mock_sock, sslopt, "example.com")
+            self.assertIsNotNone(result)
+            # ALPN would need to be implemented in _wrap_sni_socket function
+
+    def test_ssl_sni_edge_cases(self):
+        """Test SSL SNI (Server Name Indication) edge cases"""
+        mock_sock = Mock()
+
+        # Test with IPv6 address (should not use SNI)
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.return_value = Mock()
+
+            # IPv6 addresses should not be used for SNI
+            ipv6_hostname = "2001:db8::1"
+            _ssl_socket(mock_sock, {}, ipv6_hostname)
+
+            # Should use IPv6 address as server_hostname
+            mock_context.wrap_socket.assert_called_with(
+                mock_sock,
+                do_handshake_on_connect=True,
+                suppress_ragged_eofs=True,
+                server_hostname=ipv6_hostname,
+            )
+
+    def test_ssl_buffer_size_edge_cases(self):
+        """Test SSL buffer size related edge cases"""
+        mock_sock = Mock()
+
+        def mock_recv(bufsize):
+            # SSL should never try to read more than 16KB at once
+            if bufsize > 16384:
+                raise SSLError("[SSL: BAD_LENGTH] buffer too large")
+            return b"A" * min(bufsize, 1024)  # Return smaller chunks
+
+        mock_sock.recv.side_effect = mock_recv
+        mock_sock.gettimeout.return_value = 30.0
+
+        from websocket._abnf import frame_buffer
+
+        # Frame buffer should handle large requests by chunking
+        fb = frame_buffer(lambda size: recv(mock_sock, size), skip_utf8_validation=True)
+
+        # This should work even with large size due to chunking
+        result = fb.recv_strict(16384)  # Exactly 16KB
+
+        self.assertGreater(len(result), 0)
+
+    def test_ssl_protocol_downgrade_protection(self):
+        """Test SSL protocol downgrade protection"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.side_effect = ssl.SSLError(
+                "SSLV3_ALERT_HANDSHAKE_FAILURE"
+            )
+
+            sslopt = {"ssl_version": ssl.PROTOCOL_TLS_CLIENT}
+
+            # Should propagate SSL protocol errors
+            with self.assertRaises(ssl.SSLError):
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+    def test_ssl_certificate_chain_validation(self):
+        """Test SSL certificate chain validation edge cases"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+
+            # Test certificate chain validation failure
+            mock_context.wrap_socket.side_effect = ssl.SSLCertVerificationError(
+                "certificate verify failed: certificate has expired"
+            )
+
+            sslopt = {"cert_reqs": ssl.CERT_REQUIRED, "check_hostname": True}
+
+            with self.assertRaises(ssl.SSLCertVerificationError):
+                _ssl_socket(mock_sock, sslopt, "expired.badssl.com")
+
+    def test_ssl_weak_cipher_rejection(self):
+        """Test SSL weak cipher rejection scenarios"""
+        mock_sock = Mock()
+
+        with patch("ssl.SSLContext") as mock_ssl_context:
+            mock_context = Mock()
+            mock_ssl_context.return_value = mock_context
+            mock_context.wrap_socket.side_effect = ssl.SSLError("no shared cipher")
+
+            sslopt = {"ciphers": "RC4-MD5"}  # Intentionally weak cipher
+
+            # Should fail with weak ciphers (SSL error is not wrapped by our code)
+            with self.assertRaises(ssl.SSLError):
+                _ssl_socket(mock_sock, sslopt, "example.com")
+
+    def test_ssl_hostname_verification_edge_cases(self):
+        """Test SSL hostname verification edge cases"""
+        mock_sock = Mock()
+
+        # Test with wildcard certificate scenarios
+        test_cases = [
+            ("*.example.com", "subdomain.example.com"),  # Valid wildcard
+            ("*.example.com", "sub.subdomain.example.com"),  # Invalid wildcard depth
+            ("example.com", "www.example.com"),  # Hostname mismatch
+        ]
+
+        for cert_hostname, connect_hostname in test_cases:
+            with self.subTest(cert=cert_hostname, hostname=connect_hostname):
+                with patch("ssl.SSLContext") as mock_ssl_context:
+                    mock_context = Mock()
+                    mock_ssl_context.return_value = mock_context
+
+                    if (
+                        cert_hostname != connect_hostname
+                        and "sub.subdomain" in connect_hostname
+                    ):
+                        # Simulate hostname verification failure for invalid wildcard
+                        mock_context.wrap_socket.side_effect = ssl.SSLCertVerificationError(
+                            f"hostname '{connect_hostname}' doesn't match '{cert_hostname}'"
+                        )
+
+                        sslopt = {
+                            "cert_reqs": ssl.CERT_REQUIRED,
+                            "check_hostname": True,
+                        }
+
+                        with self.assertRaises(ssl.SSLCertVerificationError):
+                            _ssl_socket(mock_sock, sslopt, connect_hostname)
+                    else:
+                        mock_context.wrap_socket.return_value = Mock()
+                        sslopt = {
+                            "cert_reqs": ssl.CERT_REQUIRED,
+                            "check_hostname": True,
+                        }
+
+                        # Should succeed for valid cases
+                        result = _ssl_socket(mock_sock, sslopt, connect_hostname)
+                        self.assertIsNotNone(result)
+
+    def test_ssl_memory_bio_edge_cases(self):
+        """Test SSL memory BIO edge cases"""
+        mock_sock = Mock()
+
+        # Test SSL memory BIO scenarios (if available)
+        try:
+            import ssl
+
+            if hasattr(ssl, "MemoryBIO"):
+                with patch("ssl.SSLContext") as mock_ssl_context:
+                    mock_context = Mock()
+                    mock_ssl_context.return_value = mock_context
+                    mock_context.wrap_socket.return_value = Mock()
+
+                    # Memory BIO should work if available
+                    _ssl_socket(mock_sock, {}, "example.com")
+
+                    # Standard socket wrapping should still work
+                    mock_context.wrap_socket.assert_called_once()
+        except (ImportError, AttributeError):
+            self.skipTest("SSL MemoryBIO not available")
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_url.py b/libs/websocket/tests/test_url.py
index 110fdfad70..bbb39b0f3f 100644
--- a/libs/websocket/tests/test_url.py
+++ b/libs/websocket/tests/test_url.py
@@ -15,7 +15,7 @@
 test_url.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -36,6 +36,8 @@ def test_address_in_network(self):
         self.assertTrue(_is_address_in_network("127.0.0.1", "127.0.0.0/8"))
         self.assertTrue(_is_address_in_network("127.1.0.1", "127.0.0.0/8"))
         self.assertFalse(_is_address_in_network("127.1.0.1", "127.0.0.0/24"))
+        self.assertTrue(_is_address_in_network("2001:db8::1", "2001:db8::/64"))
+        self.assertFalse(_is_address_in_network("2001:db8:1::1", "2001:db8::/64"))
 
     def test_parse_url(self):
         p = parse_url("ws://www.example.com/r")
@@ -167,11 +169,16 @@ def test_ip_address_in_range(self):
         self.assertTrue(_is_no_proxy_host("127.0.0.1", ["127.0.0.0/8"]))
         self.assertTrue(_is_no_proxy_host("127.0.0.2", ["127.0.0.0/8"]))
         self.assertFalse(_is_no_proxy_host("127.1.0.1", ["127.0.0.0/24"]))
-        os.environ["no_proxy"] = "127.0.0.0/8"
+        self.assertTrue(_is_no_proxy_host("2001:db8::1", ["2001:db8::/64"]))
+        self.assertFalse(_is_no_proxy_host("2001:db8:1::1", ["2001:db8::/64"]))
+        os.environ["no_proxy"] = "127.0.0.0/8,2001:db8::/64"
         self.assertTrue(_is_no_proxy_host("127.0.0.1", None))
         self.assertTrue(_is_no_proxy_host("127.0.0.2", None))
-        os.environ["no_proxy"] = "127.0.0.0/24"
+        self.assertTrue(_is_no_proxy_host("2001:db8::1", None))
+        self.assertFalse(_is_no_proxy_host("2001:db8:1::1", None))
+        os.environ["no_proxy"] = "127.0.0.0/24,2001:db8::/64"
         self.assertFalse(_is_no_proxy_host("127.1.0.1", None))
+        self.assertFalse(_is_no_proxy_host("2001:db8:1::1", None))
 
     def test_hostname_match(self):
         self.assertTrue(_is_no_proxy_host("my.websocket.org", ["my.websocket.org"]))
@@ -427,12 +434,12 @@ def test_proxy_from_env(self):
             ("localhost2", 3128, ("a", "b")),
         )
 
-        os.environ[
-            "http_proxy"
-        ] = "http://john%40example.com:P%40SSWORD@localhost:3128/"
-        os.environ[
-            "https_proxy"
-        ] = "http://john%40example.com:P%40SSWORD@localhost2:3128/"
+        os.environ["http_proxy"] = (
+            "http://john%40example.com:P%40SSWORD@localhost:3128/"
+        )
+        os.environ["https_proxy"] = (
+            "http://john%40example.com:P%40SSWORD@localhost2:3128/"
+        )
         self.assertEqual(
             get_proxy_info("echo.websocket.events", True),
             ("localhost2", 3128, ("john@example.com", "P@SSWORD")),
diff --git a/libs/websocket/tests/test_utils.py b/libs/websocket/tests/test_utils.py
new file mode 100644
index 0000000000..deb9751bd1
--- /dev/null
+++ b/libs/websocket/tests/test_utils.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+import sys
+import unittest
+from unittest.mock import patch
+
+"""
+test_utils.py
+websocket - WebSocket client library for Python
+
+Copyright 2025 engn33r
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+class UtilsTest(unittest.TestCase):
+    def test_nolock(self):
+        """Test NoLock context manager"""
+        from websocket._utils import NoLock
+
+        lock = NoLock()
+
+        # Test that it can be used as context manager
+        with lock:
+            pass  # Should not raise any exception
+
+        # Test enter/exit methods directly
+        self.assertIsNone(lock.__enter__())
+        self.assertIsNone(lock.__exit__(None, None, None))
+
+    def test_utf8_validation_with_wsaccel(self):
+        """Test UTF-8 validation when wsaccel is available"""
+        # Import normally (wsaccel should be available in test environment)
+        from websocket._utils import validate_utf8
+
+        # Test valid UTF-8 strings (convert to bytes for wsaccel)
+        self.assertTrue(validate_utf8("Hello, World!".encode("utf-8")))
+        self.assertTrue(validate_utf8("๐ŸŒŸ Unicode test".encode("utf-8")))
+        self.assertTrue(validate_utf8(b"Hello, bytes"))
+        self.assertTrue(validate_utf8("Hรฉllo with accรฉnts".encode("utf-8")))
+
+        # Test invalid UTF-8 sequences
+        self.assertFalse(validate_utf8(b"\xff\xfe"))  # Invalid UTF-8
+        self.assertFalse(validate_utf8(b"\x80\x80"))  # Invalid continuation
+
+    def test_utf8_validation_fallback(self):
+        """Test UTF-8 validation fallback when wsaccel is not available"""
+        # Remove _utils from modules to force reimport
+        if "websocket._utils" in sys.modules:
+            del sys.modules["websocket._utils"]
+
+        # Mock wsaccel import to raise ImportError
+        import builtins
+
+        original_import = builtins.__import__
+
+        def mock_import(name, *args, **kwargs):
+            if "wsaccel" in name:
+                raise ImportError(f"No module named '{name}'")
+            return original_import(name, *args, **kwargs)
+
+        with patch("builtins.__import__", side_effect=mock_import):
+            import websocket._utils as utils
+
+            # Test valid UTF-8 strings with fallback implementation (convert strings to bytes)
+            self.assertTrue(utils.validate_utf8("Hello, World!".encode("utf-8")))
+            self.assertTrue(utils.validate_utf8(b"Hello, bytes"))
+            self.assertTrue(utils.validate_utf8("ASCII text".encode("utf-8")))
+
+            # Test Unicode strings (convert to bytes)
+            self.assertTrue(utils.validate_utf8("๐ŸŒŸ Unicode test".encode("utf-8")))
+            self.assertTrue(utils.validate_utf8("Hรฉllo with accรฉnts".encode("utf-8")))
+
+            # Test empty string/bytes
+            self.assertTrue(utils.validate_utf8("".encode("utf-8")))
+            self.assertTrue(utils.validate_utf8(b""))
+
+            # Test invalid UTF-8 sequences (should return False)
+            self.assertFalse(utils.validate_utf8(b"\xff\xfe"))
+            self.assertFalse(utils.validate_utf8(b"\x80\x80"))
+
+            # Note: The fallback implementation may have different validation behavior
+            # than wsaccel, so we focus on clearly invalid sequences
+
+    def test_extract_err_message(self):
+        """Test extract_err_message function"""
+        from websocket._utils import extract_err_message
+
+        # Test with exception that has args
+        exc_with_args = Exception("Test error message")
+        self.assertEqual(extract_err_message(exc_with_args), "Test error message")
+
+        # Test with exception that has multiple args
+        exc_multi_args = Exception("First arg", "Second arg")
+        self.assertEqual(extract_err_message(exc_multi_args), "First arg")
+
+        # Test with exception that has no args
+        exc_no_args = Exception()
+        self.assertIsNone(extract_err_message(exc_no_args))
+
+    def test_extract_error_code(self):
+        """Test extract_error_code function"""
+        from websocket._utils import extract_error_code
+
+        # Test with exception that has integer as first arg
+        exc_with_code = Exception(404, "Not found")
+        self.assertEqual(extract_error_code(exc_with_code), 404)
+
+        # Test with exception that has string as first arg
+        exc_with_string = Exception("Error message", "Second arg")
+        self.assertIsNone(extract_error_code(exc_with_string))
+
+        # Test with exception that has only one arg
+        exc_single_arg = Exception("Single arg")
+        self.assertIsNone(extract_error_code(exc_single_arg))
+
+        # Test with exception that has no args
+        exc_no_args = Exception()
+        self.assertIsNone(extract_error_code(exc_no_args))
+
+    def tearDown(self):
+        """Clean up after tests"""
+        # Ensure _utils is reimported fresh for next test
+        if "websocket._utils" in sys.modules:
+            del sys.modules["websocket._utils"]
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/libs/websocket/tests/test_websocket.py b/libs/websocket/tests/test_websocket.py
index a1d7ad5bee..d0bf671985 100644
--- a/libs/websocket/tests/test_websocket.py
+++ b/libs/websocket/tests/test_websocket.py
@@ -7,7 +7,11 @@
 from base64 import decodebytes as base64decode
 
 import websocket as ws
-from websocket._exceptions import WebSocketBadStatusException, WebSocketAddressException
+from websocket._exceptions import (
+    WebSocketBadStatusException,
+    WebSocketAddressException,
+    WebSocketException,
+)
 from websocket._handshake import _create_sec_websocket_key
 from websocket._handshake import _validate as _validate_header
 from websocket._http import read_headers
@@ -17,7 +21,7 @@
 test_websocket.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright 2025 engn33r
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -295,7 +299,7 @@ def test_recv_with_fire_event_of_fragmentation(self):
     def test_close(self):
         sock = ws.WebSocket()
         sock.connected = True
-        sock.close
+        sock.close()
 
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
@@ -454,7 +458,7 @@ def test_http_ssl(self):
         self.assertRaises(ValueError, websock1.connect, "wss://api.bitfinex.com/ws/2")
         websock2 = ws.WebSocket(sslopt={"certfile": "myNonexistentCertFile"})
         self.assertRaises(
-            FileNotFoundError, websock2.connect, "wss://api.bitfinex.com/ws/2"
+            WebSocketException, websock2.connect, "wss://api.bitfinex.com/ws/2"
         )
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
diff --git a/libs/websocket_client-1.8.0.dist-info/LICENSE b/libs/websocket_client-1.8.0.dist-info/LICENSE
deleted file mode 100644
index 62a54ca499..0000000000
--- a/libs/websocket_client-1.8.0.dist-info/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2024 engn33r
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/libs/websocket_client-1.8.0.dist-info/METADATA b/libs/websocket_client-1.8.0.dist-info/METADATA
deleted file mode 100644
index 563e5c0526..0000000000
--- a/libs/websocket_client-1.8.0.dist-info/METADATA
+++ /dev/null
@@ -1,184 +0,0 @@
-Metadata-Version: 2.1
-Name: websocket-client
-Version: 1.8.0
-Summary: WebSocket client for Python with low level API options
-Home-page: https://github.com/websocket-client/websocket-client.git
-Download-URL: https://github.com/websocket-client/websocket-client/releases
-Author: liris
-Author-email: liris.pp@gmail.com
-Maintainer: engn33r
-Maintainer-email: websocket.client@proton.me
-License: Apache-2.0
-Project-URL: Documentation, https://websocket-client.readthedocs.io/
-Project-URL: Source, https://github.com/websocket-client/websocket-client/
-Keywords: websockets client
-Classifier: Development Status :: 4 - Beta
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: POSIX
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Topic :: Internet
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Intended Audience :: Developers
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Provides-Extra: docs
-Requires-Dist: Sphinx >=6.0 ; extra == 'docs'
-Requires-Dist: sphinx-rtd-theme >=1.1.0 ; extra == 'docs'
-Requires-Dist: myst-parser >=2.0.0 ; extra == 'docs'
-Provides-Extra: optional
-Requires-Dist: python-socks ; extra == 'optional'
-Requires-Dist: wsaccel ; extra == 'optional'
-Provides-Extra: test
-Requires-Dist: websockets ; extra == 'test'
-
-[![docs](https://readthedocs.org/projects/websocket-client/badge/?style=flat)](https://websocket-client.readthedocs.io/)
-[![Build Status](https://github.com/websocket-client/websocket-client/actions/workflows/build.yml/badge.svg)](https://github.com/websocket-client/websocket-client/actions/workflows/build.yml)
-[![codecov](https://codecov.io/gh/websocket-client/websocket-client/branch/master/graph/badge.svg?token=pcXhUQwiL3)](https://codecov.io/gh/websocket-client/websocket-client)
-[![PyPI Downloads](https://pepy.tech/badge/websocket-client)](https://pepy.tech/project/websocket-client)
-[![PyPI version](https://img.shields.io/pypi/v/websocket_client)](https://pypi.org/project/websocket_client/)
-[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-
-# websocket-client
-
-websocket-client is a WebSocket client for Python. It provides access
-to low level APIs for WebSockets. websocket-client implements version
-[hybi-13](https://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-13)
-of the WebSocket protocol. This client does not currently support the
-permessage-deflate extension from
-[RFC 7692](https://tools.ietf.org/html/rfc7692).
-
-## Documentation
-
-This project's documentation can be found at
-[https://websocket-client.readthedocs.io/](https://websocket-client.readthedocs.io/)
-
-## Contributing
-
-Please see the [contribution guidelines](https://github.com/websocket-client/websocket-client/blob/master/CONTRIBUTING.md)
-
-## Installation
-
-You can use `pip install websocket-client` to install, or `pip install -e .`
-to install from a local copy of the code. This module is tested on Python 3.8+.
-
-There are several optional dependencies that can be installed to enable
-specific websocket-client features.
-- To install `python-socks` for proxy usage and `wsaccel` for a minor performance boost, use:
- `pip install websocket-client[optional]`
-- To install `websockets` to run unit tests using the local echo server, use:
- `pip install websocket-client[test]`
-- To install `Sphinx` and `sphinx_rtd_theme` to build project documentation, use:
- `pip install websocket-client[docs]`
-
-While not a strict dependency, [rel](https://github.com/bubbleboy14/registeredeventlistener)
-is useful when using `run_forever` with automatic reconnect. Install rel with `pip install rel`.
-
-Footnote: Some shells, such as zsh, require you to escape the `[` and `]` characters with a `\`.
-
-## Usage Tips
-
-Check out the documentation's FAQ for additional guidelines:
-[https://websocket-client.readthedocs.io/en/latest/faq.html](https://websocket-client.readthedocs.io/en/latest/faq.html)
-
-Known issues with this library include lack of WebSocket Compression
-support (RFC 7692) and [minimal threading documentation/support](https://websocket-client.readthedocs.io/en/latest/threading.html).
-
-## Performance
-
-The `send` and `validate_utf8` methods can sometimes be bottleneck.
-You can disable UTF8 validation in this library (and receive a
-performance enhancement) with the `skip_utf8_validation` parameter.
-If you want to get better performance, install wsaccel. While
-websocket-client does not depend on wsaccel, it will be used if
-available. wsaccel doubles the speed of UTF8 validation and
-offers a very minor 10% performance boost when masking the
-payload data as part of the `send` process. Numpy used to
-be a suggested performance enhancement alternative, but
-[issue #687](https://github.com/websocket-client/websocket-client/issues/687)
-found it didn't help.
-
-## Examples
-
-Many more examples are found in the
-[examples documentation](https://websocket-client.readthedocs.io/en/latest/examples.html).
-
-### Long-lived Connection
-
-Most real-world WebSockets situations involve longer-lived connections.
-The WebSocketApp `run_forever` loop will automatically try to reconnect
-to an open WebSocket connection when a network
-connection is lost if it is provided with:
-
-- a `dispatcher` argument (async dispatcher like rel or pyevent)
-- a non-zero `reconnect` argument (delay between disconnection and attempted reconnection)
-
-`run_forever` provides a variety of event-based connection controls
-using callbacks like `on_message` and `on_error`.
-`run_forever` **does not automatically reconnect** if the server
-closes the WebSocket gracefully (returning
-[a standard websocket close code](https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1)).
-[This is the logic](https://github.com/websocket-client/websocket-client/pull/838#issuecomment-1228454826) behind the decision.
-Customizing behavior when the server closes
-the WebSocket should be handled in the `on_close` callback.
-This example uses [rel](https://github.com/bubbleboy14/registeredeventlistener)
-for the dispatcher to provide automatic reconnection.
-
-```python
-import websocket
-import _thread
-import time
-import rel
-
-def on_message(ws, message):
-    print(message)
-
-def on_error(ws, error):
-    print(error)
-
-def on_close(ws, close_status_code, close_msg):
-    print("### closed ###")
-
-def on_open(ws):
-    print("Opened connection")
-
-if __name__ == "__main__":
-    websocket.enableTrace(True)
-    ws = websocket.WebSocketApp("wss://api.gemini.com/v1/marketdata/BTCUSD",
-                              on_open=on_open,
-                              on_message=on_message,
-                              on_error=on_error,
-                              on_close=on_close)
-
-    ws.run_forever(dispatcher=rel, reconnect=5)  # Set dispatcher to automatic reconnection, 5 second reconnect delay if connection closed unexpectedly
-    rel.signal(2, rel.abort)  # Keyboard Interrupt
-    rel.dispatch()
-```
-
-### Short-lived Connection
-
-This is if you want to communicate a short message and disconnect
-immediately when done. For example, if you want to confirm that a WebSocket
-server is running and responds properly to a specific request.
-
-```python
-from websocket import create_connection
-
-ws = create_connection("ws://echo.websocket.events/")
-print(ws.recv())
-print("Sending 'Hello, World'...")
-ws.send("Hello, World")
-print("Sent")
-print("Receiving...")
-result =  ws.recv()
-print("Received '%s'" % result)
-ws.close()
-```
diff --git a/libs/websocket_client-1.8.0.dist-info/RECORD b/libs/websocket_client-1.8.0.dist-info/RECORD
deleted file mode 100644
index d096dcc42a..0000000000
--- a/libs/websocket_client-1.8.0.dist-info/RECORD
+++ /dev/null
@@ -1,34 +0,0 @@
-../../bin/wsdump,sha256=ODMg_dbnNIbQ5Nu7nTPqahow2IljtBblXYCyuSebVzM,239
-websocket/__init__.py,sha256=GvVpTPkjvhYEGZcjXszSfrs2FaVHudUdGgGSqf_Rbw4,833
-websocket/_abnf.py,sha256=WesUJSSGSRpzuTp0VeK12O4SYYVMN6CyN6bqXS4lk2w,14385
-websocket/_app.py,sha256=xCAlaM2FfsPLsaEsBGXhdg4olHDEEzif6llSWefHcm8,24176
-websocket/_cookiejar.py,sha256=893SWoHmk_JysiXj8lkyLy95co5zvuC62XGMrvmgI7E,2399
-websocket/_core.py,sha256=P-lYcwk-LKJUKDqBleJsmRSIJjX2v_o4FongdJYbhn8,21080
-websocket/_exceptions.py,sha256=r7lGaC8Y2brBnaK_YJJRDdYY6UCGWxOXoQsMcgFFeJ4,2178
-websocket/_handshake.py,sha256=h_88S6vhStOZBj5zMGJtIKFV1RVMVuEskLybjJCnaj4,6578
-websocket/_http.py,sha256=33GsroWgLhOsE8pMC2Xka-RjonPuUypjeFRABFAtQJo,12818
-websocket/_logging.py,sha256=DHRUl4sEaSkolvMo4A6upn7UIYF0kJT5NlAL0vWCHRI,2228
-websocket/_socket.py,sha256=NpsUBO1ihnC-xPA0U2o1-hMXK8eiplNcU9R2VZvZ3qU,5198
-websocket/_ssl_compat.py,sha256=SRPtw1rT3LPSl9q70mCi5hW9h2xS-nIfdcXbjyGi8sE,1188
-websocket/_url.py,sha256=kbEdbdZ-BMMoYQ3sMfcp9QEY1IYrDppIKCpIIHdGVMc,5251
-websocket/_utils.py,sha256=R36FnFTxYVJyKlh-yEaapRxpoK8Xwn9JFXCy2q2haY0,6961
-websocket/_wsdump.py,sha256=kV82LWLlD6d3vzOKOVAEqkfoCA_Qkpd0hc9WN2Tq2kM,7010
-websocket/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-websocket/tests/data/header01.txt,sha256=eR9UDpnf7mREys9MttKytzB5OXA5IwOGWJZKmaF4II8,163
-websocket/tests/data/header02.txt,sha256=1HzQGIMG0OGwfnboRkUqwbTEg2nTevOX2Waj0gQARaw,161
-websocket/tests/data/header03.txt,sha256=l_soTbfEWjZTLC5Ydx2U8uj8NJ30IwAc8yo5IUG5fyQ,216
-websocket/tests/echo-server.py,sha256=yYwKXimgqo6gHFjGgqhkADb6fRncSrF-OewX6UinZVg,482
-websocket/tests/test_abnf.py,sha256=fGZ335DReScT4zSNayl5H8z7MxzJ9NXbiSvt97SJGDI,4629
-websocket/tests/test_app.py,sha256=0YoTjRjcZ2MqG3Hd8-4rfvkPkNA9BUAt1UODkjXu3Y0,12364
-websocket/tests/test_cookiejar.py,sha256=FNm9Hjxu0YBwA8GLRi1GSrAp8jkKzdND6Icm7iIIu_Y,4395
-websocket/tests/test_http.py,sha256=VLqGlXOovB6DGZDnq25c7cOjAWWTJAhhjeKSFYXnLnc,12461
-websocket/tests/test_url.py,sha256=5oONcPf4rU8KSQjDYjNevcnUpOnqUNFmontSiXB5Qd4,17718
-websocket/tests/test_websocket.py,sha256=F5XtOwa_v2JHUE-xOpCWdhUgUYfNbHGErHJKQ0bEsTI,18390
-websocket_client-1.8.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-websocket_client-1.8.0.dist-info/LICENSE,sha256=RT5qaUJ-2f-SoD7y17Ie8dtB_fVtYjB6SbqFBZ96DGI,11339
-websocket_client-1.8.0.dist-info/METADATA,sha256=mUuXo30suA6pEGGHkoT30gxksNLloIXGTTH1JPE5zjc,7962
-websocket_client-1.8.0.dist-info/RECORD,,
-websocket_client-1.8.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-websocket_client-1.8.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-websocket_client-1.8.0.dist-info/entry_points.txt,sha256=IoCGCuANLuLxE3m2QXEd2Ip57qScBjf7RfQnkjn6DNE,50
-websocket_client-1.8.0.dist-info/top_level.txt,sha256=8m_tTpcUlzWGl8v-pj5Wi7XhAFaN1_bLKRHQKCyz5_I,10
diff --git a/libs/websocket_client-1.8.0.dist-info/WHEEL b/libs/websocket_client-1.8.0.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/websocket_client-1.8.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/websocket_client-1.8.0.dist-info/INSTALLER b/libs/websocket_client-1.9.0.dist-info/INSTALLER
similarity index 100%
rename from libs/websocket_client-1.8.0.dist-info/INSTALLER
rename to libs/websocket_client-1.9.0.dist-info/INSTALLER
diff --git a/libs/websocket_client-1.9.0.dist-info/METADATA b/libs/websocket_client-1.9.0.dist-info/METADATA
new file mode 100644
index 0000000000..dfb92c15dc
--- /dev/null
+++ b/libs/websocket_client-1.9.0.dist-info/METADATA
@@ -0,0 +1,201 @@
+Metadata-Version: 2.4
+Name: websocket-client
+Version: 1.9.0
+Summary: WebSocket client for Python with low level API options
+Home-page: https://github.com/websocket-client/websocket-client.git
+Download-URL: https://github.com/websocket-client/websocket-client/releases
+Author: liris
+Author-email: liris.pp@gmail.com
+Maintainer: engn33r
+Maintainer-email: websocket.client@proton.me
+License: Apache-2.0
+Project-URL: Documentation, https://websocket-client.readthedocs.io/
+Project-URL: Source, https://github.com/websocket-client/websocket-client/
+Keywords: websockets client
+Classifier: Development Status :: 4 - Beta
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: POSIX
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Topic :: Internet
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: websockets; extra == "test"
+Provides-Extra: optional
+Requires-Dist: python-socks; extra == "optional"
+Requires-Dist: wsaccel; extra == "optional"
+Provides-Extra: docs
+Requires-Dist: Sphinx>=6.0; extra == "docs"
+Requires-Dist: sphinx_rtd_theme>=1.1.0; extra == "docs"
+Requires-Dist: myst-parser>=2.0.0; extra == "docs"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: download-url
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-python
+Dynamic: summary
+
+[![docs](https://readthedocs.org/projects/websocket-client/badge/?style=flat)](https://websocket-client.readthedocs.io/)
+[![Build Status](https://github.com/websocket-client/websocket-client/actions/workflows/build.yml/badge.svg)](https://github.com/websocket-client/websocket-client/actions/workflows/build.yml)
+[![codecov](https://codecov.io/gh/websocket-client/websocket-client/branch/master/graph/badge.svg?token=pcXhUQwiL3)](https://codecov.io/gh/websocket-client/websocket-client)
+[![PyPI Downloads](https://pepy.tech/badge/websocket-client)](https://pepy.tech/project/websocket-client)
+[![PyPI version](https://img.shields.io/pypi/v/websocket_client)](https://pypi.org/project/websocket_client/)
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+
+# websocket-client
+
+websocket-client is a WebSocket client for Python. It provides access
+to low level APIs for WebSockets. websocket-client implements version
+[hybi-13](https://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-13)
+of the WebSocket protocol. This client does not currently support the
+permessage-deflate extension from
+[RFC 7692](https://tools.ietf.org/html/rfc7692).
+
+## Documentation
+
+This project's documentation can be found at
+[https://websocket-client.readthedocs.io/](https://websocket-client.readthedocs.io/)
+
+## Contributing
+
+Please see the [contribution guidelines](https://github.com/websocket-client/websocket-client/blob/master/CONTRIBUTING.md)
+
+## Installation
+
+You can use `pip install websocket-client` to install, or `pip install -e .`
+to install from a local copy of the code. This module is tested on Python 3.9+.
+
+There are several optional dependencies that can be installed to enable
+specific websocket-client features.
+- To install `python-socks` for proxy usage and `wsaccel` for a minor performance boost, use:
+ `pip install websocket-client[optional]`
+- To install `websockets` to run unit tests using the local echo server, use:
+ `pip install websocket-client[test]`
+- To install `Sphinx` and `sphinx_rtd_theme` to build project documentation, use:
+ `pip install websocket-client[docs]`
+
+While not a strict dependency, [rel](https://github.com/bubbleboy14/registeredeventlistener)
+is useful when using `run_forever` with automatic reconnect. Install rel with `pip install rel`.
+
+Footnote: Some shells, such as zsh, require you to escape the `[` and `]` characters with a `\`.
+
+## Usage Tips
+
+Check out the documentation's FAQ for additional guidelines:
+[https://websocket-client.readthedocs.io/en/latest/faq.html](https://websocket-client.readthedocs.io/en/latest/faq.html)
+
+Known issues with this library include lack of WebSocket Compression
+support (RFC 7692) and [minimal threading documentation/support](https://websocket-client.readthedocs.io/en/latest/threading.html).
+
+## Performance
+
+The `send` and `validate_utf8` methods can sometimes be bottleneck.
+You can disable UTF8 validation in this library (and receive a
+performance enhancement) with the `skip_utf8_validation` parameter.
+If you want to get better performance, install wsaccel. While
+websocket-client does not depend on wsaccel, it will be used if
+available. wsaccel doubles the speed of UTF8 validation and
+offers a very minor 10% performance boost when masking the
+payload data as part of the `send` process. Numpy used to
+be a suggested performance enhancement alternative, but
+[issue #687](https://github.com/websocket-client/websocket-client/issues/687)
+found it didn't help.
+
+## Examples
+
+Many more examples are found in the
+[examples documentation](https://websocket-client.readthedocs.io/en/latest/examples.html).
+
+### Long-lived Connection
+
+Most real-world WebSockets situations involve longer-lived connections.
+The WebSocketApp `run_forever` loop will automatically try to reconnect
+to an open WebSocket connection when a network
+connection is lost if it is provided with:
+
+- a `dispatcher` argument (async dispatcher like rel or pyevent)
+- a non-zero `reconnect` argument (delay between disconnection and attempted reconnection)
+
+`run_forever` provides a variety of event-based connection controls
+using callbacks like `on_message` and `on_error`.
+`run_forever` **does not automatically reconnect** if the server
+closes the WebSocket gracefully (returning
+[a standard websocket close code](https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1)).
+[This is the logic](https://github.com/websocket-client/websocket-client/pull/838#issuecomment-1228454826) behind the decision.
+Customizing behavior when the server closes
+the WebSocket should be handled in the `on_close` callback.
+This example uses [rel](https://github.com/bubbleboy14/registeredeventlistener)
+for the dispatcher to provide automatic reconnection.
+
+```python
+import websocket
+import _thread
+import time
+import rel
+
+def on_message(ws, message):
+    print(message)
+
+def on_error(ws, error):
+    print(error)
+
+def on_close(ws, close_status_code, close_msg):
+    print("### closed ###")
+
+def on_open(ws):
+    print("Opened connection")
+
+if __name__ == "__main__":
+    websocket.enableTrace(True)
+    ws = websocket.WebSocketApp("wss://api.gemini.com/v1/marketdata/BTCUSD",
+                              on_open=on_open,
+                              on_message=on_message,
+                              on_error=on_error,
+                              on_close=on_close)
+
+    ws.run_forever(dispatcher=rel, reconnect=5)  # Set dispatcher to automatic reconnection, 5 second reconnect delay if connection closed unexpectedly
+    rel.signal(2, rel.abort)  # Keyboard Interrupt
+    rel.dispatch()
+```
+
+### Short-lived Connection
+
+This is if you want to communicate a short message and disconnect
+immediately when done. For example, if you want to confirm that a WebSocket
+server is running and responds properly to a specific request.
+
+```python
+from websocket import create_connection
+
+ws = create_connection("ws://echo.websocket.events/")
+print(ws.recv())
+print("Sending 'Hello, World'...")
+ws.send("Hello, World")
+print("Sent")
+print("Receiving...")
+result =  ws.recv()
+print("Received '%s'" % result)
+ws.close()
+```
diff --git a/libs/websocket_client-1.9.0.dist-info/RECORD b/libs/websocket_client-1.9.0.dist-info/RECORD
new file mode 100644
index 0000000000..37efe01313
--- /dev/null
+++ b/libs/websocket_client-1.9.0.dist-info/RECORD
@@ -0,0 +1,44 @@
+../../bin/wsdump,sha256=jlnNG7no6hPkwiCJlVEm2eh5w2I8crjYaQRx2HPYj4I,192
+websocket/__init__.py,sha256=I3CZijeQ5Rkn6HxnwO6QZdNeZbuYEwXBOB62e_y5xp0,958
+websocket/_abnf.py,sha256=RA4YpPUqFhgUjQZi3nFzejQY8qt5fpSRCOTNVVi4xKI,15649
+websocket/_app.py,sha256=o_9M84DHP16PZPYtHpL_z6IQ8-lpMbDjlXmzpyNAaPo,23686
+websocket/_cookiejar.py,sha256=0VbGaki2nZf-qC_iEDxa_hVxid2EPmqYJ3cKxPDOWRo,2346
+websocket/_core.py,sha256=3Xdnig87pa3Lz_rc9GV8zFd-EoRPhOi_q3utNmdUY3c,21856
+websocket/_dispatcher.py,sha256=HHM4QOJ9s6OOrRdQxQD0JugP_C-N352aUwI1NqBcdTs,4592
+websocket/_exceptions.py,sha256=avW2kjXe2sgby-hsUW_QNIuMN6cM3TXf3tBmnSZznis,2178
+websocket/_handshake.py,sha256=WScX-WwtgJBIv-v3YDFJdiUIDbaSa9PcAd2LXpEzNK4,6837
+websocket/_http.py,sha256=aJpOlMYcz6iPb036TcJWWDDInFOdLrEWGkGwvw0q19Q,14676
+websocket/_logging.py,sha256=k7OXNnIh3UdSKNHdZWOR6PeZ3k1AZTpTNjgy8Encwpw,2254
+websocket/_socket.py,sha256=lVZwjro2qGxcoDmkJfcWhamLApsXyqQWX7_7AhHeVKg,6046
+websocket/_ssl_compat.py,sha256=hkC7PiQ6ZkH82a6DneNRHCdKypNvQESrIbgS7j3RqW8,1800
+websocket/_url.py,sha256=4WNYIrWsDVFaZggncSuvBVqZU2ERwMW3tzyByPEp7Eg,5154
+websocket/_utils.py,sha256=Q6En3DqyActKN5A8DZb_S6AUrecnSjH_kqCj3VXedTI,6983
+websocket/_wsdump.py,sha256=nXf2mH7sVHHhNCW0z1g2w--7_WLsd8knD9lWNyMi4-w,7025
+websocket/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+websocket/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+websocket/tests/data/header01.txt,sha256=eR9UDpnf7mREys9MttKytzB5OXA5IwOGWJZKmaF4II8,163
+websocket/tests/data/header02.txt,sha256=1HzQGIMG0OGwfnboRkUqwbTEg2nTevOX2Waj0gQARaw,161
+websocket/tests/data/header03.txt,sha256=l_soTbfEWjZTLC5Ydx2U8uj8NJ30IwAc8yo5IUG5fyQ,216
+websocket/tests/echo-server.py,sha256=yYwKXimgqo6gHFjGgqhkADb6fRncSrF-OewX6UinZVg,482
+websocket/tests/test_abnf.py,sha256=R4QQVCedzcAs7vFTVzur6m3rn4Y-qeIolHaEhAS3vgU,4629
+websocket/tests/test_app.py,sha256=VL9pdeLxlQrGBnv1yU2roIVHCfNocKn29eqdrgQzWbY,14150
+websocket/tests/test_cookiejar.py,sha256=NDOzlQqGGbE2A5NDaZuEK7Lc7SF39tEVhbG4SIN3SJU,4395
+websocket/tests/test_dispatcher.py,sha256=Pd0cqdhbnsrUgqVDjWMn7x2jgEaOB7oxQndp0ypTmBU,13446
+websocket/tests/test_handshake_large_response.py,sha256=Phpwe_xeeZ-tctGKO6bVTg8N-MUgXhCv95TCYiO8n3I,6165
+websocket/tests/test_http.py,sha256=zbtMX7RGEj7wkgpav82jcqCLPhqA2XIqMgr1MM0TaMQ,12461
+websocket/tests/test_large_payloads.py,sha256=NnhryYBbUpmEXHXCai6Tl47ZC87geL1geqwrS_L5Bqk,10064
+websocket/tests/test_socket.py,sha256=Rbok7KEK87Zvlkopwc2QTx2_ShVQR3KK56RBsYkfPKI,12971
+websocket/tests/test_socket_bugs.py,sha256=TV3ycFYTsw0yDi_AsGWgqiutasbcIAO6V0VhbG5NgcQ,6408
+websocket/tests/test_ssl_compat.py,sha256=N-wKgN_bktOO7N8kSi1-bhRXvzBXtNYxaE3svbidRtA,3467
+websocket/tests/test_ssl_edge_cases.py,sha256=qLV9tYrOoxMXPrM5iE2VssBjEQJS59FggFymXHjBKpI,24932
+websocket/tests/test_url.py,sha256=wwX92RoDY0edDKwyD_Ot3rK24lxtjZ448i1YDWMqqts,18268
+websocket/tests/test_utils.py,sha256=v01GZJ-guDR6LfjuTf6ryZ6bj8Gn7F74_aVdPxcUxJc,5441
+websocket/tests/test_websocket.py,sha256=NRNglZnlRZIryRGxYQdpUGTPk0Ai436wHoA1Ow5YC5k,18430
+websocket_client-1.9.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+websocket_client-1.9.0.dist-info/METADATA,sha256=Kc_Exsui3P2HVxKPiT1p6hP-dZgVPEhUIywgQFpJO7E,8337
+websocket_client-1.9.0.dist-info/RECORD,,
+websocket_client-1.9.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+websocket_client-1.9.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+websocket_client-1.9.0.dist-info/entry_points.txt,sha256=IoCGCuANLuLxE3m2QXEd2Ip57qScBjf7RfQnkjn6DNE,50
+websocket_client-1.9.0.dist-info/licenses/LICENSE,sha256=162NCWaqNj1Fx7FrCDjK3NUWdqzfIVrZZzB9WBtHhyw,11339
+websocket_client-1.9.0.dist-info/top_level.txt,sha256=8m_tTpcUlzWGl8v-pj5Wi7XhAFaN1_bLKRHQKCyz5_I,10
diff --git a/libs/websocket_client-1.9.0.dist-info/REQUESTED b/libs/websocket_client-1.9.0.dist-info/REQUESTED
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/websocket_client-1.9.0.dist-info/WHEEL b/libs/websocket_client-1.9.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/websocket_client-1.9.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/websocket_client-1.8.0.dist-info/entry_points.txt b/libs/websocket_client-1.9.0.dist-info/entry_points.txt
similarity index 100%
rename from libs/websocket_client-1.8.0.dist-info/entry_points.txt
rename to libs/websocket_client-1.9.0.dist-info/entry_points.txt
diff --git a/libs/websocket_client-1.9.0.dist-info/licenses/LICENSE b/libs/websocket_client-1.9.0.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..9ef2a65dc5
--- /dev/null
+++ b/libs/websocket_client-1.9.0.dist-info/licenses/LICENSE
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2025 engn33r
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/libs/websocket_client-1.8.0.dist-info/top_level.txt b/libs/websocket_client-1.9.0.dist-info/top_level.txt
similarity index 100%
rename from libs/websocket_client-1.8.0.dist-info/top_level.txt
rename to libs/websocket_client-1.9.0.dist-info/top_level.txt
diff --git a/libs/werkzeug-3.0.6.dist-info/METADATA b/libs/werkzeug-3.0.6.dist-info/METADATA
deleted file mode 100644
index f1c1cd698d..0000000000
--- a/libs/werkzeug-3.0.6.dist-info/METADATA
+++ /dev/null
@@ -1,99 +0,0 @@
-Metadata-Version: 2.3
-Name: Werkzeug
-Version: 3.0.6
-Summary: The comprehensive WSGI web application library.
-Maintainer-email: Pallets <contact@palletsprojects.com>
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Web Environment
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
-Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware
-Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
-Classifier: Typing :: Typed
-Requires-Dist: MarkupSafe>=2.1.1
-Requires-Dist: watchdog>=2.3 ; extra == "watchdog"
-Project-URL: Changes, https://werkzeug.palletsprojects.com/changes/
-Project-URL: Chat, https://discord.gg/pallets
-Project-URL: Documentation, https://werkzeug.palletsprojects.com/
-Project-URL: Donate, https://palletsprojects.com/donate
-Project-URL: Issue Tracker, https://github.com/pallets/werkzeug/issues/
-Project-URL: Source Code, https://github.com/pallets/werkzeug/
-Provides-Extra: watchdog
-
-# Werkzeug
-
-*werkzeug* German noun: "tool". Etymology: *werk* ("work"), *zeug* ("stuff")
-
-Werkzeug is a comprehensive [WSGI][] web application library. It began as
-a simple collection of various utilities for WSGI applications and has
-become one of the most advanced WSGI utility libraries.
-
-It includes:
-
--   An interactive debugger that allows inspecting stack traces and
-    source code in the browser with an interactive interpreter for any
-    frame in the stack.
--   A full-featured request object with objects to interact with
-    headers, query args, form data, files, and cookies.
--   A response object that can wrap other WSGI applications and handle
-    streaming data.
--   A routing system for matching URLs to endpoints and generating URLs
-    for endpoints, with an extensible system for capturing variables
-    from URLs.
--   HTTP utilities to handle entity tags, cache control, dates, user
-    agents, cookies, files, and more.
--   A threaded WSGI server for use while developing applications
-    locally.
--   A test client for simulating HTTP requests during testing without
-    requiring running a server.
-
-Werkzeug doesn't enforce any dependencies. It is up to the developer to
-choose a template engine, database adapter, and even how to handle
-requests. It can be used to build all sorts of end user applications
-such as blogs, wikis, or bulletin boards.
-
-[Flask][] wraps Werkzeug, using it to handle the details of WSGI while
-providing more structure and patterns for defining powerful
-applications.
-
-[WSGI]: https://wsgi.readthedocs.io/en/latest/
-[Flask]: https://www.palletsprojects.com/p/flask/
-
-
-## A Simple Example
-
-```python
-# save this as app.py
-from werkzeug.wrappers import Request, Response
-
-@Request.application
-def application(request: Request) -> Response:
-    return Response("Hello, World!")
-
-if __name__ == "__main__":
-    from werkzeug.serving import run_simple
-    run_simple("127.0.0.1", 5000, application)
-```
-
-```
-$ python -m app
-  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
-```
-
-
-## Donate
-
-The Pallets organization develops and supports Werkzeug and other
-popular packages. In order to grow the community of contributors and
-users, and allow the maintainers to devote more time to the projects,
-[please donate today][].
-
-[please donate today]: https://palletsprojects.com/donate
-
diff --git a/libs/werkzeug-3.0.6.dist-info/RECORD b/libs/werkzeug-3.0.6.dist-info/RECORD
deleted file mode 100644
index ef485e659d..0000000000
--- a/libs/werkzeug-3.0.6.dist-info/RECORD
+++ /dev/null
@@ -1,74 +0,0 @@
-werkzeug-3.0.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-werkzeug-3.0.6.dist-info/LICENSE.txt,sha256=O0nc7kEF6ze6wQ-vG-JgQI_oXSUrjp3y4JefweCUQ3s,1475
-werkzeug-3.0.6.dist-info/METADATA,sha256=pY6ipkBHFQjk6kAjpXsHAaeFxkdNV-s2VmyCrIb6_mQ,3682
-werkzeug-3.0.6.dist-info/RECORD,,
-werkzeug-3.0.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug-3.0.6.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-werkzeug/__init__.py,sha256=HX_PSY5E2vtVlD3R4YblwBRCjg7j3Tlm3LASbYqOSkU,727
-werkzeug/_internal.py,sha256=su1olkbHMkzt0VKcEkPLCha8sdVzXNBuqW6YVpp8GHg,5545
-werkzeug/_reloader.py,sha256=QuMO-UwuD-cHsUpwSEUr7iYNbv_ziHFhgNDAiv25J80,15429
-werkzeug/datastructures/__init__.py,sha256=yzBdOT9DdK3nraNG49pA3bVsvtPPLx2-t2N8ZmuAd9w,1900
-werkzeug/datastructures/accept.py,sha256=CuCvBAxNzbt4QUb17rH986vvOVGURFUjo0DX2PQy_yI,10670
-werkzeug/datastructures/accept.pyi,sha256=6P114gncjZoy-i_n_3OQy2nJVwjEAIe7PcBxKYqCEfc,1917
-werkzeug/datastructures/auth.py,sha256=tZz0wZ1sIpIcAQoEAVhrUvy8M3kqKvIytmvGvwkAdxo,10021
-werkzeug/datastructures/cache_control.py,sha256=RTUipZev50s-1TAn2rYGZrytm_6IOIxQd67fkR5bNF0,6043
-werkzeug/datastructures/cache_control.pyi,sha256=NI5myF8f4yzgiqOHJANgp6XtT8SGCWI_GBp5JuH3NIs,3870
-werkzeug/datastructures/csp.py,sha256=DAOAO266LK0JKbvlG80bbkAgfrNsnU9HBoz-FdIYNdo,3244
-werkzeug/datastructures/csp.pyi,sha256=AmDWiZU4rrJA4SZmyMNI1L5PLdIfJsI5Li9r5lE1q6M,5765
-werkzeug/datastructures/etag.py,sha256=JsyI-yXayF-hQu26MyFzbHFIZsaQ6odj3RZO_jF-_cc,2913
-werkzeug/datastructures/etag.pyi,sha256=N9cuUBrZnxHmsbW0BBmjKW-djNY7WKbI6t_WopB8Zo0,1047
-werkzeug/datastructures/file_storage.py,sha256=ePeMtr65s_1_sunXMv_SBOiFof5CX5BepYv5_W16fZk,6184
-werkzeug/datastructures/file_storage.pyi,sha256=PvUx7s2U3ifIf2YxMUhFtZFdkLFderInKG1U3VWwM9E,1457
-werkzeug/datastructures/headers.py,sha256=97-P-LgzterxEwxLbQsBEGiZpCOAXzZ7fExXXd4uH-o,17286
-werkzeug/datastructures/headers.pyi,sha256=66Gh9DbD8QNpLRBOuer4DMCj12csddHrcgxiJPLE5n8,4237
-werkzeug/datastructures/mixins.py,sha256=-IQSQ70UOMQlqtJEIyyhplOd4obaTOfzGvka-cunCtM,5337
-werkzeug/datastructures/mixins.pyi,sha256=Axe16elbs9zSOK9IuXIGs08ukgqSSPCxXFEjB_ACYSM,4189
-werkzeug/datastructures/range.py,sha256=JXSDPseG7iH5giJp3R1SnQC_SqQp634M8Iv6QTsbTxM,5669
-werkzeug/datastructures/range.pyi,sha256=bsM61iNp86gT2lyN0F_Dqg8xsnfPerdmElipuHppiJQ,1792
-werkzeug/datastructures/structures.py,sha256=8nRqvwHM8moZj_fEaxOqF-N7lguoXgnNJeT2l9LX7xA,31917
-werkzeug/datastructures/structures.pyi,sha256=9NeGm8NDS-x3XmE2ZP9676tKvQfo5G9GGvIlfV4v3aY,8237
-werkzeug/debug/__init__.py,sha256=80vaavVZYwV21ItrsOLQudEUi2uKDlxcjm5cCmeU1u4,20016
-werkzeug/debug/console.py,sha256=t4hZ0Qg1p6Uu2MWimqoMDi7S3WYZvLMjnc8v_dPaxAo,6089
-werkzeug/debug/repr.py,sha256=iHMYny8whiiMDasvUqj0nm4-1VHVvwe697KleiZVK1s,9303
-werkzeug/debug/shared/ICON_LICENSE.md,sha256=DhA6Y1gUl5Jwfg0NFN9Rj4VWITt8tUx0IvdGf0ux9-s,222
-werkzeug/debug/shared/console.png,sha256=bxax6RXXlvOij_KeqvSNX0ojJf83YbnZ7my-3Gx9w2A,507
-werkzeug/debug/shared/debugger.js,sha256=SRL9YZ9FTVngaYD-INQNincEVdZ-kBHa_-VJx0U7-rg,10068
-werkzeug/debug/shared/less.png,sha256=-4-kNRaXJSONVLahrQKUxMwXGm9R4OnZ9SxDGpHlIR4,191
-werkzeug/debug/shared/more.png,sha256=GngN7CioHQoV58rH6ojnkYi8c_qED2Aka5FO5UXrReY,200
-werkzeug/debug/shared/style.css,sha256=-xSxzUEZGw_IqlDR5iZxitNl8LQUjBM-_Y4UAvXVH8g,6078
-werkzeug/debug/tbtools.py,sha256=p25f0gP9V2GCzwxJxdxMcbTz0GkcG7_DkN8tFBLkP9k,13553
-werkzeug/exceptions.py,sha256=SX3MUTqvWVyA9SnfMPxowNPu5beR9DyrmbUJ4AD2XT0,26160
-werkzeug/formparser.py,sha256=mkrP8j4CYxthuYtNRPsSn_xxzspLLJRlcjgpPNAGBbo,15849
-werkzeug/http.py,sha256=18eD84Lys8tIQVyzlSfaxSMmkU_utOEFoND_kHhhfcM,44452
-werkzeug/local.py,sha256=KUFuAm8BAayQouzVg0MGqW_hiwY8Z_lY5l7d1Scvsx8,22492
-werkzeug/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug/middleware/dispatcher.py,sha256=zWN5_lqJr_sc9UDv-PPoSlDHN_zR33z6B74F_4Cxpo8,2602
-werkzeug/middleware/http_proxy.py,sha256=sdk-V6GoZ6aMny-D0QNKNf5MWD2OTO3AGbBg6upp4Hc,7834
-werkzeug/middleware/lint.py,sha256=lwsZhyDNTnsNr4D8dqsgG8Akp7YP9D_X49SCiZucE04,14478
-werkzeug/middleware/profiler.py,sha256=1ZAHlDeYNdhgp8THOXkV5lgmcLl307phAr2Ufy30-lY,5562
-werkzeug/middleware/proxy_fix.py,sha256=n-HW-MRWJquCIhmqiZKoGdbbEeHuWJqPRHhFpuj4pzY,6755
-werkzeug/middleware/shared_data.py,sha256=G28bG3rzrP6R0kODOsbFfWOj5Xcc_qIOVu1VNVl8iW0,9546
-werkzeug/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug/routing/__init__.py,sha256=d8TRxsk24IWu2BdoOYUfL--deolHwiGVCBJqLoEe3YM,4820
-werkzeug/routing/converters.py,sha256=iqpee_mAjr1oGbq0etujYF9PiDv5U7DgNkARHXnMId0,7297
-werkzeug/routing/exceptions.py,sha256=wNBiUmUk4OtFOpbdDSr7KKKUjH7yn84JqwBicUup8p8,4846
-werkzeug/routing/map.py,sha256=mEXlHOyinkg1Jtx5L0UDYsvoX4eVLiEuEVQzD5LVAz8,36515
-werkzeug/routing/matcher.py,sha256=nfBbl37eGAkZ1dQlumshFcPuyfggmFjPuSSQOE6GuYs,7849
-werkzeug/routing/rules.py,sha256=eGi6PD-COG2As_HY0nAw-nxYxLTH0FsuqRaSy8d9FjQ,32510
-werkzeug/sansio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-werkzeug/sansio/http.py,sha256=_5fVKoogLUyNH5O2BnKty6dFB1p4REBZieJ4vYoOUOA,5370
-werkzeug/sansio/multipart.py,sha256=fMGgY9CvMDRgNgKozz2cBIp0iN2EME2IIOBh306_Ecs,11637
-werkzeug/sansio/request.py,sha256=MI59ROX1P_Y6F4FkCLjaV9hwPEXE7aTTqaVphiTw4UA,19983
-werkzeug/sansio/response.py,sha256=uhKYuDy5-Q5v0Mk5VIxiF-Xob9vfGdDzWiJG7J7MYYc,27585
-werkzeug/sansio/utils.py,sha256=Y7zkEmIvBLtVvgwSdtBhFpGqCclBtYx7GUhckiRSyhI,4957
-werkzeug/security.py,sha256=W56YSXPBE6H5TkyhnPmjk1PUo9XCV63CCw9I2CHgGzQ,5479
-werkzeug/serving.py,sha256=Yb4WgEtaLY2QK0X-_CknmIgrnoraGP2DbZFbQDuv_QQ,39859
-werkzeug/test.py,sha256=kMEWtC_bZ5LqvBya-Pvtq1Jvtb4RR_t7pBp27_4JpJo,52782
-werkzeug/testapp.py,sha256=5_IS5Dh_WfWfNcTLmbydj01lomgcKA_4l9PPCNZnmdI,6332
-werkzeug/urls.py,sha256=XyNKwHvK5IC37-wuIDMYWkiCJ3yLTLGv7wn2GF3ndqI,6430
-werkzeug/user_agent.py,sha256=lSlLYKCcbzCUSkbdAoO8zPk2UR-8Mdn6iu_iA2kYPBA,1416
-werkzeug/utils.py,sha256=6iV_-JdFaLXG6bCR3FMSMyUY0HCnsdzlKirANavAXkk,24699
-werkzeug/wrappers/__init__.py,sha256=b78jCM8x96kJUGLZ5FYFR3zlK-3pnFAmP9RJIGU0ses,138
-werkzeug/wrappers/request.py,sha256=dvsuukldNLz5tiwyrbcethow903DA4wmQ7McR0RQgjk,24645
-werkzeug/wrappers/response.py,sha256=u6zg7VpNYrCeEjpIgf8VqgfaSi9yR_9wi9ly2uudglg,32459
-werkzeug/wsgi.py,sha256=P7jB0VpG6X6miies4uk7Zgm7NVm4Yz8Ra6Inr5q_FMs,20894
diff --git a/libs/werkzeug-3.0.6.dist-info/WHEEL b/libs/werkzeug-3.0.6.dist-info/WHEEL
deleted file mode 100644
index e3c6feefa2..0000000000
--- a/libs/werkzeug-3.0.6.dist-info/WHEEL
+++ /dev/null
@@ -1,4 +0,0 @@
-Wheel-Version: 1.0
-Generator: flit 3.10.1
-Root-Is-Purelib: true
-Tag: py3-none-any
diff --git a/libs/werkzeug-3.0.6.dist-info/INSTALLER b/libs/werkzeug-3.1.6.dist-info/INSTALLER
similarity index 100%
rename from libs/werkzeug-3.0.6.dist-info/INSTALLER
rename to libs/werkzeug-3.1.6.dist-info/INSTALLER
diff --git a/libs/werkzeug-3.1.6.dist-info/METADATA b/libs/werkzeug-3.1.6.dist-info/METADATA
new file mode 100644
index 0000000000..1cc4bf8fc6
--- /dev/null
+++ b/libs/werkzeug-3.1.6.dist-info/METADATA
@@ -0,0 +1,109 @@
+Metadata-Version: 2.4
+Name: Werkzeug
+Version: 3.1.6
+Summary: The comprehensive WSGI web application library.
+Maintainer-email: Pallets <contact@palletsprojects.com>
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-Expression: BSD-3-Clause
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Web Environment
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Application
+Classifier: Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware
+Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
+Classifier: Typing :: Typed
+License-File: LICENSE.txt
+Requires-Dist: markupsafe>=2.1.1
+Requires-Dist: watchdog>=2.3 ; extra == "watchdog"
+Project-URL: Changes, https://werkzeug.palletsprojects.com/page/changes/
+Project-URL: Chat, https://discord.gg/pallets
+Project-URL: Documentation, https://werkzeug.palletsprojects.com/
+Project-URL: Donate, https://palletsprojects.com/donate
+Project-URL: Source, https://github.com/pallets/werkzeug/
+Provides-Extra: watchdog
+
+<div align="center"><img src="https://raw.githubusercontent.com/pallets/werkzeug/refs/heads/stable/docs/_static/werkzeug-name.svg" alt="" height="150"></div>
+
+# Werkzeug
+
+*werkzeug* German noun: "tool". Etymology: *werk* ("work"), *zeug* ("stuff")
+
+Werkzeug is a comprehensive [WSGI][] web application library. It began as
+a simple collection of various utilities for WSGI applications and has
+become one of the most advanced WSGI utility libraries.
+
+It includes:
+
+-   An interactive debugger that allows inspecting stack traces and
+    source code in the browser with an interactive interpreter for any
+    frame in the stack.
+-   A full-featured request object with objects to interact with
+    headers, query args, form data, files, and cookies.
+-   A response object that can wrap other WSGI applications and handle
+    streaming data.
+-   A routing system for matching URLs to endpoints and generating URLs
+    for endpoints, with an extensible system for capturing variables
+    from URLs.
+-   HTTP utilities to handle entity tags, cache control, dates, user
+    agents, cookies, files, and more.
+-   A threaded WSGI server for use while developing applications
+    locally.
+-   A test client for simulating HTTP requests during testing without
+    requiring running a server.
+
+Werkzeug doesn't enforce any dependencies. It is up to the developer to
+choose a template engine, database adapter, and even how to handle
+requests. It can be used to build all sorts of end user applications
+such as blogs, wikis, or bulletin boards.
+
+[Flask][] wraps Werkzeug, using it to handle the details of WSGI while
+providing more structure and patterns for defining powerful
+applications.
+
+[WSGI]: https://wsgi.readthedocs.io/en/latest/
+[Flask]: https://www.palletsprojects.com/p/flask/
+
+
+## A Simple Example
+
+```python
+# save this as app.py
+from werkzeug.wrappers import Request, Response
+
+@Request.application
+def application(request: Request) -> Response:
+    return Response("Hello, World!")
+
+if __name__ == "__main__":
+    from werkzeug.serving import run_simple
+    run_simple("127.0.0.1", 5000, application)
+```
+
+```
+$ python -m app
+  * Running on http://127.0.0.1:5000/ (Press CTRL+C to quit)
+```
+
+
+## Donate
+
+The Pallets organization develops and supports Werkzeug and other
+popular packages. In order to grow the community of contributors and
+users, and allow the maintainers to devote more time to the projects,
+[please donate today][].
+
+[please donate today]: https://palletsprojects.com/donate
+
+## Contributing
+
+See our [detailed contributing documentation][contrib] for many ways to
+contribute, including reporting issues, requesting features, asking or answering
+questions, and making PRs.
+
+[contrib]: https://palletsprojects.com/contributing/
+
diff --git a/libs/werkzeug-3.1.6.dist-info/RECORD b/libs/werkzeug-3.1.6.dist-info/RECORD
new file mode 100644
index 0000000000..afaf603c31
--- /dev/null
+++ b/libs/werkzeug-3.1.6.dist-info/RECORD
@@ -0,0 +1,65 @@
+werkzeug-3.1.6.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+werkzeug-3.1.6.dist-info/METADATA,sha256=3gkebnRugCLVmObgiGxJei3-DbVNlPDxrrIwukQWOE0,4029
+werkzeug-3.1.6.dist-info/RECORD,,
+werkzeug-3.1.6.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+werkzeug-3.1.6.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+werkzeug-3.1.6.dist-info/licenses/LICENSE.txt,sha256=O0nc7kEF6ze6wQ-vG-JgQI_oXSUrjp3y4JefweCUQ3s,1475
+werkzeug/__init__.py,sha256=CejNWfCZKDaJ_FmshZFw8dFgjNAlu6q15ec7DwWJlM8,165
+werkzeug/_internal.py,sha256=QRynfUEOngEAmm4qzhlufbhk1K-n901Q1KQWKznsaNU,5547
+werkzeug/_reloader.py,sha256=IppO3kX_GxQwaV6h8SPWe0lSTSw6kd_HJXqLiUhR7AU,15100
+werkzeug/datastructures/__init__.py,sha256=0Vt8Lt8KUYSoAe8ADt1jIE-w3Ib9tkrk0HEhBOktqUw,2615
+werkzeug/datastructures/accept.py,sha256=xoDD4qwZeTjew_1Ze0gyyKWkbhtowwR5tHTWnobPeGI,12177
+werkzeug/datastructures/auth.py,sha256=Zcqdr8-uUpq6_czg1672S2XthG0UakhUHOuummzqz64,10055
+werkzeug/datastructures/cache_control.py,sha256=omtSmmAh3KgQRJYzaW05LtEt5HoJlLkJTxjil-Q3cuM,9711
+werkzeug/datastructures/csp.py,sha256=jWl1dxhkbc6_eE9qGnTGBJSimWNQljKKYwmlys4dFOA,3816
+werkzeug/datastructures/etag.py,sha256=N2dFqhFsLR0k5hgjol3QTGpcSltJhpgLWeyz6Va80G8,3278
+werkzeug/datastructures/file_storage.py,sha256=J57paAQGxBnq2yjY0yfsEuN1wPRkDXLkWH3wk_pQvTs,6715
+werkzeug/datastructures/headers.py,sha256=J3WQKnQGmt9hUDn-d_YI62PtrjW7U7sJTDNTFtjWgRA,21540
+werkzeug/datastructures/mixins.py,sha256=h8K_A0Sw47s2cO2ZNFf60ENbmVDsi3rgHr_f77VFwJE,9039
+werkzeug/datastructures/range.py,sha256=KAWLRDyL8bzSBDm_OirxwA17xkFM_vdedZINmyDfNUI,7034
+werkzeug/datastructures/structures.py,sha256=dQ3n8KP5UHyad1TMsWmQBK3K9pNPByK5Nd0AV09oOAo,41385
+werkzeug/debug/__init__.py,sha256=8QoMJ1iGA7NGp3wxw6Sa3fPJHlrCggrRH30bQg9ei2o,20319
+werkzeug/debug/console.py,sha256=t4hZ0Qg1p6Uu2MWimqoMDi7S3WYZvLMjnc8v_dPaxAo,6089
+werkzeug/debug/repr.py,sha256=iHMYny8whiiMDasvUqj0nm4-1VHVvwe697KleiZVK1s,9303
+werkzeug/debug/shared/ICON_LICENSE.md,sha256=DhA6Y1gUl5Jwfg0NFN9Rj4VWITt8tUx0IvdGf0ux9-s,222
+werkzeug/debug/shared/console.png,sha256=bxax6RXXlvOij_KeqvSNX0ojJf83YbnZ7my-3Gx9w2A,507
+werkzeug/debug/shared/debugger.js,sha256=SRL9YZ9FTVngaYD-INQNincEVdZ-kBHa_-VJx0U7-rg,10068
+werkzeug/debug/shared/less.png,sha256=-4-kNRaXJSONVLahrQKUxMwXGm9R4OnZ9SxDGpHlIR4,191
+werkzeug/debug/shared/more.png,sha256=GngN7CioHQoV58rH6ojnkYi8c_qED2Aka5FO5UXrReY,200
+werkzeug/debug/shared/style.css,sha256=-xSxzUEZGw_IqlDR5iZxitNl8LQUjBM-_Y4UAvXVH8g,6078
+werkzeug/debug/tbtools.py,sha256=L_CD1ha5WmyWrKVZ3zxovJ4gI1CATsc4Yc1Zms41EvE,13645
+werkzeug/exceptions.py,sha256=7XNgddMV3UQR6UPr7lWlzSFxO8Ur8bSJgLdvJuauEX0,26888
+werkzeug/formparser.py,sha256=v0-F9OcmNHuPLqXePW_b0asWzpH-Z_ZlGj8ao0CMmuo,15847
+werkzeug/http.py,sha256=gOc_P6u9Am2Z8fQolD_JnBi25FAUUpJXtp0js22Fwtg,44908
+werkzeug/local.py,sha256=o4Zz1ZAuNRBn8r-laGIxCdKXjxx1i0uJq3eNyKPy4cg,22184
+werkzeug/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+werkzeug/middleware/dispatcher.py,sha256=zWN5_lqJr_sc9UDv-PPoSlDHN_zR33z6B74F_4Cxpo8,2602
+werkzeug/middleware/http_proxy.py,sha256=sdk-V6GoZ6aMny-D0QNKNf5MWD2OTO3AGbBg6upp4Hc,7834
+werkzeug/middleware/lint.py,sha256=jVdyljRxpkz18MiMR8N7YdiElna8DJVvO4CCjZsnSQI,14476
+werkzeug/middleware/profiler.py,sha256=1ZAHlDeYNdhgp8THOXkV5lgmcLl307phAr2Ufy30-lY,5562
+werkzeug/middleware/proxy_fix.py,sha256=n-HW-MRWJquCIhmqiZKoGdbbEeHuWJqPRHhFpuj4pzY,6755
+werkzeug/middleware/shared_data.py,sha256=gsjmgeEFLzDdKsgd19pMhI7BfU_TbL6AyEyZPG2ykfQ,9542
+werkzeug/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+werkzeug/routing/__init__.py,sha256=d8TRxsk24IWu2BdoOYUfL--deolHwiGVCBJqLoEe3YM,4820
+werkzeug/routing/converters.py,sha256=iqpee_mAjr1oGbq0etujYF9PiDv5U7DgNkARHXnMId0,7297
+werkzeug/routing/exceptions.py,sha256=wNBiUmUk4OtFOpbdDSr7KKKUjH7yn84JqwBicUup8p8,4846
+werkzeug/routing/map.py,sha256=a7PSRAELyNyoPFP_uhyNDAsmPjEbrcyewPnEZIl-0ZI,35863
+werkzeug/routing/matcher.py,sha256=nfBbl37eGAkZ1dQlumshFcPuyfggmFjPuSSQOE6GuYs,7849
+werkzeug/routing/rules.py,sha256=XADfK242jF_r4-q7nBo2Zz66RTzcCPOqG5WNfRFNpoo,32538
+werkzeug/sansio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+werkzeug/sansio/http.py,sha256=l-N1ktc7WVgfDA9t1MhyeVFNJGvnRTC8mJViZDQYVGA,5351
+werkzeug/sansio/multipart.py,sha256=uLdLH7ffelFXRaXu2_WXK__X11uA7bHCsqfyLerqGSo,11841
+werkzeug/sansio/request.py,sha256=ijwestWQS-dpb61uKl0NRntzNtH6C72OXCNomx-XKxc,19832
+werkzeug/sansio/response.py,sha256=159j3TC2AbDvqppcegVmpLftot70UWtm5qZO0kqQpFk,27930
+werkzeug/sansio/utils.py,sha256=3-Gr0Qsa_Rx48mUm7zdFJZNNKMzHfPAknywujHnkhPs,5256
+werkzeug/security.py,sha256=WHb2oiwyOie5XI8WNnKYd4YVjSwBhGf3nPyKBSGGlI0,6654
+werkzeug/serving.py,sha256=jUSzy9o1iZ_LwdReXZusdoOJPjMK03xGCzhsZ_SUtpk,39826
+werkzeug/test.py,sha256=Xf8bCYkjKJLtTXWTvw4E5AlYrK7CYjnmIolxSHkkKsc,52779
+werkzeug/testapp.py,sha256=5_IS5Dh_WfWfNcTLmbydj01lomgcKA_4l9PPCNZnmdI,6332
+werkzeug/urls.py,sha256=XyNKwHvK5IC37-wuIDMYWkiCJ3yLTLGv7wn2GF3ndqI,6430
+werkzeug/user_agent.py,sha256=lSlLYKCcbzCUSkbdAoO8zPk2UR-8Mdn6iu_iA2kYPBA,1416
+werkzeug/utils.py,sha256=QRcyUe4JURGaOAqZGnECcsbwKsEkL7gUDZiTNlLV0W4,24623
+werkzeug/wrappers/__init__.py,sha256=b78jCM8x96kJUGLZ5FYFR3zlK-3pnFAmP9RJIGU0ses,138
+werkzeug/wrappers/request.py,sha256=f9Jpe9zqs_v0n-DTZj7FfMyU_y3LhBBBX4YCYsrqGUs,24730
+werkzeug/wrappers/response.py,sha256=VRcXJVRjaYYE0Q93PVu0Y5nhDf9TJkjhY8j_RtMalX0,32443
+werkzeug/wsgi.py,sha256=SAj53op0Hqa6Bd10FHglfR8wk7jLGw5_vn9naPSDlpM,20920
diff --git a/libs/werkzeug-3.1.6.dist-info/REQUESTED b/libs/werkzeug-3.1.6.dist-info/REQUESTED
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/werkzeug-3.1.6.dist-info/WHEEL b/libs/werkzeug-3.1.6.dist-info/WHEEL
new file mode 100644
index 0000000000..d8b9936dad
--- /dev/null
+++ b/libs/werkzeug-3.1.6.dist-info/WHEEL
@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: flit 3.12.0
+Root-Is-Purelib: true
+Tag: py3-none-any
diff --git a/libs/werkzeug-3.0.6.dist-info/LICENSE.txt b/libs/werkzeug-3.1.6.dist-info/licenses/LICENSE.txt
similarity index 100%
rename from libs/werkzeug-3.0.6.dist-info/LICENSE.txt
rename to libs/werkzeug-3.1.6.dist-info/licenses/LICENSE.txt
diff --git a/libs/werkzeug/__init__.py b/libs/werkzeug/__init__.py
index 57cb7539a3..0b248fd861 100644
--- a/libs/werkzeug/__init__.py
+++ b/libs/werkzeug/__init__.py
@@ -1,25 +1,4 @@
-from __future__ import annotations
-
-import typing as t
-
 from .serving import run_simple as run_simple
 from .test import Client as Client
 from .wrappers import Request as Request
 from .wrappers import Response as Response
-
-
-def __getattr__(name: str) -> t.Any:
-    if name == "__version__":
-        import importlib.metadata
-        import warnings
-
-        warnings.warn(
-            "The '__version__' attribute is deprecated and will be removed in"
-            " Werkzeug 3.1. Use feature detection or"
-            " 'importlib.metadata.version(\"werkzeug\")' instead.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return importlib.metadata.version("werkzeug")
-
-    raise AttributeError(name)
diff --git a/libs/werkzeug/_internal.py b/libs/werkzeug/_internal.py
index 7dd2fbccda..75e43358b6 100644
--- a/libs/werkzeug/_internal.py
+++ b/libs/werkzeug/_internal.py
@@ -36,9 +36,9 @@ def _wsgi_encoding_dance(s: str) -> str:
 
 def _get_environ(obj: WSGIEnvironment | Request) -> WSGIEnvironment:
     env = getattr(obj, "environ", obj)
-    assert isinstance(
-        env, dict
-    ), f"{type(obj).__name__!r} is not a WSGI environment (has to be a dict)"
+    assert isinstance(env, dict), (
+        f"{type(obj).__name__!r} is not a WSGI environment (has to be a dict)"
+    )
     return env
 
 
diff --git a/libs/werkzeug/_reloader.py b/libs/werkzeug/_reloader.py
index 8fd50b9631..5eb64bc7d0 100644
--- a/libs/werkzeug/_reloader.py
+++ b/libs/werkzeug/_reloader.py
@@ -26,6 +26,9 @@
 
 _stat_ignore_scan = tuple(prefix)
 del prefix
+# Ignore __pycache__ since a change there will always have a change to
+# the source file (or initial pyc file) as well. Ignore common version control
+# internals. Ignore common tool caches.
 _ignore_common_dirs = {
     "__pycache__",
     ".git",
@@ -86,9 +89,6 @@ def _find_stat_paths(
         parent_has_py = {os.path.dirname(path): True}
 
         for root, dirs, files in os.walk(path):
-            # Optimizations: ignore system prefixes, __pycache__ will
-            # have a py or pyc module at the import path, ignore some
-            # common known dirs such as version control and tool caches.
             if (
                 root.startswith(_stat_ignore_scan)
                 or os.path.basename(root) in _ignore_common_dirs
@@ -325,7 +325,7 @@ def __init__(self, *args: t.Any, **kwargs: t.Any) -> None:
         trigger_reload = self.trigger_reload
 
         class EventHandler(PatternMatchingEventHandler):
-            def on_any_event(self, event: FileModifiedEvent):  # type: ignore
+            def on_any_event(self, event: FileModifiedEvent) -> None:  # type: ignore[override]
                 if event.event_type not in {
                     EVENT_TYPE_CLOSED,
                     EVENT_TYPE_CREATED,
@@ -345,12 +345,7 @@ def on_any_event(self, event: FileModifiedEvent):  # type: ignore
 
         self.name = f"watchdog ({reloader_name})"
         self.observer = Observer()
-        # Extra patterns can be non-Python files, match them in addition
-        # to all Python files in default and extra directories. Ignore
-        # __pycache__ since a change there will always have a change to
-        # the source file (or initial pyc file) as well. Ignore Git and
-        # Mercurial internal changes.
-        extra_patterns = [p for p in self.extra_files if not os.path.isdir(p)]
+        extra_patterns = (p for p in self.extra_files if not os.path.isdir(p))
         self.event_handler = EventHandler(
             patterns=["*.py", "*.pyc", "*.zip", *extra_patterns],
             ignore_patterns=[
@@ -358,13 +353,13 @@ def on_any_event(self, event: FileModifiedEvent):  # type: ignore
                 *self.exclude_patterns,
             ],
         )
-        self.should_reload = False
+        self.should_reload = threading.Event()
 
     def trigger_reload(self, filename: str | bytes) -> None:
         # This is called inside an event handler, which means throwing
         # SystemExit has no effect.
         # https://github.com/gorakhargosh/watchdog/issues/294
-        self.should_reload = True
+        self.should_reload.set()
         self.log_reload(filename)
 
     def __enter__(self) -> ReloaderLoop:
@@ -377,9 +372,8 @@ def __exit__(self, exc_type, exc_val, exc_tb):  # type: ignore
         self.observer.join()
 
     def run(self) -> None:
-        while not self.should_reload:
+        while not self.should_reload.wait(timeout=self.interval):
             self.run_step()
-            time.sleep(self.interval)
 
         sys.exit(3)
 
@@ -393,7 +387,7 @@ def run_step(self) -> None:
                         self.event_handler, path, recursive=True
                     )
                 except OSError:
-                    # Clear this path from list of watches We don't want
+                    # Clear this path from list of watches. We don't want
                     # the same error message showing again in the next
                     # iteration.
                     self.watches[path] = None
diff --git a/libs/werkzeug/datastructures/__init__.py b/libs/werkzeug/datastructures/__init__.py
index 846ffce678..6582de02c7 100644
--- a/libs/werkzeug/datastructures/__init__.py
+++ b/libs/werkzeug/datastructures/__init__.py
@@ -1,3 +1,7 @@
+from __future__ import annotations
+
+import typing as t
+
 from .accept import Accept as Accept
 from .accept import CharsetAccept as CharsetAccept
 from .accept import LanguageAccept as LanguageAccept
@@ -26,9 +30,35 @@
 from .structures import ImmutableDict as ImmutableDict
 from .structures import ImmutableList as ImmutableList
 from .structures import ImmutableMultiDict as ImmutableMultiDict
-from .structures import ImmutableOrderedMultiDict as ImmutableOrderedMultiDict
 from .structures import ImmutableTypeConversionDict as ImmutableTypeConversionDict
 from .structures import iter_multi_items as iter_multi_items
 from .structures import MultiDict as MultiDict
-from .structures import OrderedMultiDict as OrderedMultiDict
 from .structures import TypeConversionDict as TypeConversionDict
+
+
+def __getattr__(name: str) -> t.Any:
+    import warnings
+
+    if name == "OrderedMultiDict":
+        from .structures import _OrderedMultiDict
+
+        warnings.warn(
+            "'OrderedMultiDict' is deprecated and will be removed in Werkzeug"
+            " 3.2. Use 'MultiDict' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _OrderedMultiDict
+
+    if name == "ImmutableOrderedMultiDict":
+        from .structures import _ImmutableOrderedMultiDict
+
+        warnings.warn(
+            "'OrderedMultiDict' is deprecated and will be removed in Werkzeug"
+            " 3.2. Use 'ImmutableMultiDict' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _ImmutableOrderedMultiDict
+
+    raise AttributeError(name)
diff --git a/libs/werkzeug/datastructures/accept.py b/libs/werkzeug/datastructures/accept.py
index d80f0bbb85..44179a93f5 100644
--- a/libs/werkzeug/datastructures/accept.py
+++ b/libs/werkzeug/datastructures/accept.py
@@ -1,12 +1,14 @@
 from __future__ import annotations
 
 import codecs
+import collections.abc as cabc
 import re
+import typing as t
 
 from .structures import ImmutableList
 
 
-class Accept(ImmutableList):
+class Accept(ImmutableList[tuple[str, float]]):
     """An :class:`Accept` object is just a list subclass for lists of
     ``(value, quality)`` tuples.  It is automatically sorted by specificity
     and quality.
@@ -42,29 +44,39 @@ class Accept(ImmutableList):
 
     """
 
-    def __init__(self, values=()):
+    def __init__(
+        self, values: Accept | cabc.Iterable[tuple[str, float]] | None = ()
+    ) -> None:
         if values is None:
-            list.__init__(self)
+            super().__init__()
             self.provided = False
         elif isinstance(values, Accept):
             self.provided = values.provided
-            list.__init__(self, values)
+            super().__init__(values)
         else:
             self.provided = True
             values = sorted(
                 values, key=lambda x: (self._specificity(x[0]), x[1]), reverse=True
             )
-            list.__init__(self, values)
+            super().__init__(values)
 
-    def _specificity(self, value):
+    def _specificity(self, value: str) -> tuple[bool, ...]:
         """Returns a tuple describing the value's specificity."""
         return (value != "*",)
 
-    def _value_matches(self, value, item):
+    def _value_matches(self, value: str, item: str) -> bool:
         """Check if a value matches a given accept item."""
         return item == "*" or item.lower() == value.lower()
 
-    def __getitem__(self, key):
+    @t.overload
+    def __getitem__(self, key: str) -> float: ...
+    @t.overload
+    def __getitem__(self, key: t.SupportsIndex) -> tuple[str, float]: ...
+    @t.overload
+    def __getitem__(self, key: slice) -> list[tuple[str, float]]: ...
+    def __getitem__(
+        self, key: str | t.SupportsIndex | slice
+    ) -> float | tuple[str, float] | list[tuple[str, float]]:
         """Besides index lookup (getting item n) you can also pass it a string
         to get the quality for the item.  If the item is not in the list, the
         returned quality is ``0``.
@@ -73,7 +85,7 @@ def __getitem__(self, key):
             return self.quality(key)
         return list.__getitem__(self, key)
 
-    def quality(self, key):
+    def quality(self, key: str) -> float:
         """Returns the quality of the key.
 
         .. versionadded:: 0.6
@@ -85,17 +97,17 @@ def quality(self, key):
                 return quality
         return 0
 
-    def __contains__(self, value):
+    def __contains__(self, value: str) -> bool:  # type: ignore[override]
         for item, _quality in self:
             if self._value_matches(value, item):
                 return True
         return False
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         pairs_str = ", ".join(f"({x!r}, {y})" for x, y in self)
         return f"{type(self).__name__}([{pairs_str}])"
 
-    def index(self, key):
+    def index(self, key: str | tuple[str, float]) -> int:  # type: ignore[override]
         """Get the position of an entry or raise :exc:`ValueError`.
 
         :param key: The key to be looked up.
@@ -111,7 +123,7 @@ def index(self, key):
             raise ValueError(key)
         return list.index(self, key)
 
-    def find(self, key):
+    def find(self, key: str | tuple[str, float]) -> int:
         """Get the position of an entry or return -1.
 
         :param key: The key to be looked up.
@@ -121,12 +133,12 @@ def find(self, key):
         except ValueError:
             return -1
 
-    def values(self):
+    def values(self) -> cabc.Iterator[str]:
         """Iterate over all values."""
         for item in self:
             yield item[0]
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Convert the header set into an HTTP header string."""
         result = []
         for value, quality in self:
@@ -135,17 +147,23 @@ def to_header(self):
             result.append(value)
         return ",".join(result)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def _best_single_match(self, match):
+    def _best_single_match(self, match: str) -> tuple[str, float] | None:
         for client_item, quality in self:
             if self._value_matches(match, client_item):
                 # self is sorted by specificity descending, we can exit
                 return client_item, quality
         return None
 
-    def best_match(self, matches, default=None):
+    @t.overload
+    def best_match(self, matches: cabc.Iterable[str]) -> str | None: ...
+    @t.overload
+    def best_match(self, matches: cabc.Iterable[str], default: str = ...) -> str: ...
+    def best_match(
+        self, matches: cabc.Iterable[str], default: str | None = None
+    ) -> str | None:
         """Returns the best match from a list of possible matches based
         on the specificity and quality of the client. If two items have the
         same quality and specificity, the one is returned that comes first.
@@ -154,8 +172,8 @@ def best_match(self, matches, default=None):
         :param default: the value that is returned if none match
         """
         result = default
-        best_quality = -1
-        best_specificity = (-1,)
+        best_quality: float = -1
+        best_specificity: tuple[float, ...] = (-1,)
         for server_item in matches:
             match = self._best_single_match(server_item)
             if not match:
@@ -172,16 +190,18 @@ def best_match(self, matches, default=None):
         return result
 
     @property
-    def best(self):
+    def best(self) -> str | None:
         """The best match as value."""
         if self:
             return self[0][0]
 
+        return None
+
 
 _mime_split_re = re.compile(r"/|(?:\s*;\s*)")
 
 
-def _normalize_mime(value):
+def _normalize_mime(value: str) -> list[str]:
     return _mime_split_re.split(value.lower())
 
 
@@ -190,10 +210,10 @@ class MIMEAccept(Accept):
     mimetypes.
     """
 
-    def _specificity(self, value):
+    def _specificity(self, value: str) -> tuple[bool, ...]:
         return tuple(x != "*" for x in _mime_split_re.split(value))
 
-    def _value_matches(self, value, item):
+    def _value_matches(self, value: str, item: str) -> bool:
         # item comes from the client, can't match if it's invalid.
         if "/" not in item:
             return False
@@ -234,27 +254,25 @@ def _value_matches(self, value, item):
         )
 
     @property
-    def accept_html(self):
+    def accept_html(self) -> bool:
         """True if this object accepts HTML."""
-        return (
-            "text/html" in self or "application/xhtml+xml" in self or self.accept_xhtml
-        )
+        return "text/html" in self or self.accept_xhtml  # type: ignore[comparison-overlap]
 
     @property
-    def accept_xhtml(self):
+    def accept_xhtml(self) -> bool:
         """True if this object accepts XHTML."""
-        return "application/xhtml+xml" in self or "application/xml" in self
+        return "application/xhtml+xml" in self or "application/xml" in self  # type: ignore[comparison-overlap]
 
     @property
-    def accept_json(self):
+    def accept_json(self) -> bool:
         """True if this object accepts JSON."""
-        return "application/json" in self
+        return "application/json" in self  # type: ignore[comparison-overlap]
 
 
 _locale_delim_re = re.compile(r"[_-]")
 
 
-def _normalize_lang(value):
+def _normalize_lang(value: str) -> list[str]:
     """Process a language tag for matching."""
     return _locale_delim_re.split(value.lower())
 
@@ -262,10 +280,16 @@ def _normalize_lang(value):
 class LanguageAccept(Accept):
     """Like :class:`Accept` but with normalization for language tags."""
 
-    def _value_matches(self, value, item):
+    def _value_matches(self, value: str, item: str) -> bool:
         return item == "*" or _normalize_lang(value) == _normalize_lang(item)
 
-    def best_match(self, matches, default=None):
+    @t.overload
+    def best_match(self, matches: cabc.Iterable[str]) -> str | None: ...
+    @t.overload
+    def best_match(self, matches: cabc.Iterable[str], default: str = ...) -> str: ...
+    def best_match(
+        self, matches: cabc.Iterable[str], default: str | None = None
+    ) -> str | None:
         """Given a list of supported values, finds the best match from
         the list of accepted values.
 
@@ -316,8 +340,8 @@ def best_match(self, matches, default=None):
 class CharsetAccept(Accept):
     """Like :class:`Accept` but with normalization for charsets."""
 
-    def _value_matches(self, value, item):
-        def _normalize(name):
+    def _value_matches(self, value: str, item: str) -> bool:
+        def _normalize(name: str) -> str:
             try:
                 return codecs.lookup(name).name
             except LookupError:
diff --git a/libs/werkzeug/datastructures/accept.pyi b/libs/werkzeug/datastructures/accept.pyi
deleted file mode 100644
index 4b74dd9505..0000000000
--- a/libs/werkzeug/datastructures/accept.pyi
+++ /dev/null
@@ -1,54 +0,0 @@
-from collections.abc import Iterable
-from collections.abc import Iterator
-from typing import overload
-
-from .structures import ImmutableList
-
-class Accept(ImmutableList[tuple[str, int]]):
-    provided: bool
-    def __init__(
-        self, values: Accept | Iterable[tuple[str, float]] | None = None
-    ) -> None: ...
-    def _specificity(self, value: str) -> tuple[bool, ...]: ...
-    def _value_matches(self, value: str, item: str) -> bool: ...
-    @overload  # type: ignore
-    def __getitem__(self, key: str) -> int: ...
-    @overload
-    def __getitem__(self, key: int) -> tuple[str, int]: ...
-    @overload
-    def __getitem__(self, key: slice) -> Iterable[tuple[str, int]]: ...
-    def quality(self, key: str) -> int: ...
-    def __contains__(self, value: str) -> bool: ...  # type: ignore
-    def index(self, key: str) -> int: ...  # type: ignore
-    def find(self, key: str) -> int: ...
-    def values(self) -> Iterator[str]: ...
-    def to_header(self) -> str: ...
-    def _best_single_match(self, match: str) -> tuple[str, int] | None: ...
-    @overload
-    def best_match(self, matches: Iterable[str], default: str) -> str: ...
-    @overload
-    def best_match(
-        self, matches: Iterable[str], default: str | None = None
-    ) -> str | None: ...
-    @property
-    def best(self) -> str: ...
-
-def _normalize_mime(value: str) -> list[str]: ...
-
-class MIMEAccept(Accept):
-    def _specificity(self, value: str) -> tuple[bool, ...]: ...
-    def _value_matches(self, value: str, item: str) -> bool: ...
-    @property
-    def accept_html(self) -> bool: ...
-    @property
-    def accept_xhtml(self) -> bool: ...
-    @property
-    def accept_json(self) -> bool: ...
-
-def _normalize_lang(value: str) -> list[str]: ...
-
-class LanguageAccept(Accept):
-    def _value_matches(self, value: str, item: str) -> bool: ...
-
-class CharsetAccept(Accept):
-    def _value_matches(self, value: str, item: str) -> bool: ...
diff --git a/libs/werkzeug/datastructures/auth.py b/libs/werkzeug/datastructures/auth.py
index a3ca0de46c..42f7aa4683 100644
--- a/libs/werkzeug/datastructures/auth.py
+++ b/libs/werkzeug/datastructures/auth.py
@@ -2,6 +2,7 @@
 
 import base64
 import binascii
+import collections.abc as cabc
 import typing as t
 
 from ..http import dump_header
@@ -176,7 +177,7 @@ def __init__(
             values, lambda _: self._trigger_on_update()
         )
         self._token = token
-        self._on_update: t.Callable[[WWWAuthenticate], None] | None = None
+        self._on_update: cabc.Callable[[WWWAuthenticate], None] | None = None
 
     def _trigger_on_update(self) -> None:
         if self._on_update is not None:
diff --git a/libs/werkzeug/datastructures/cache_control.py b/libs/werkzeug/datastructures/cache_control.py
index bff4c18bbd..3d96310282 100644
--- a/libs/werkzeug/datastructures/cache_control.py
+++ b/libs/werkzeug/datastructures/cache_control.py
@@ -1,25 +1,59 @@
 from __future__ import annotations
 
+import collections.abc as cabc
+import typing as t
+from inspect import cleandoc
+
 from .mixins import ImmutableDictMixin
-from .mixins import UpdateDictMixin
+from .structures import CallbackDict
 
 
-def cache_control_property(key, empty, type):
+def cache_control_property(
+    key: str, empty: t.Any, type: type[t.Any] | None, *, doc: str | None = None
+) -> t.Any:
     """Return a new property object for a cache header. Useful if you
     want to add support for a cache extension in a subclass.
 
+    :param key: The attribute name present in the parsed cache-control header dict.
+    :param empty: The value to use if the key is present without a value.
+    :param type: The type to convert the string value to instead of a string. If
+        conversion raises a ``ValueError``, the returned value is ``None``.
+    :param doc: The docstring for the property. If not given, it is generated
+        based on the other params.
+
+    .. versionchanged:: 3.1
+        Added the ``doc`` param.
+
     .. versionchanged:: 2.0
         Renamed from ``cache_property``.
     """
+    if doc is None:
+        parts = [f"The ``{key}`` attribute."]
+
+        if type is bool:
+            parts.append("A ``bool``, either present or not.")
+        else:
+            if type is None:
+                parts.append("A ``str``,")
+            else:
+                parts.append(f"A ``{type.__name__}``,")
+
+            if empty is not None:
+                parts.append(f"``{empty!r}`` if present with no value,")
+
+            parts.append("or ``None`` if not present.")
+
+        doc = " ".join(parts)
+
     return property(
         lambda x: x._get_cache_value(key, empty, type),
         lambda x, v: x._set_cache_value(key, v, type),
         lambda x: x._del_cache_value(key),
-        f"accessor for {key!r}",
+        doc=cleandoc(doc),
     )
 
 
-class _CacheControl(UpdateDictMixin, dict):
+class _CacheControl(CallbackDict[str, t.Optional[str]]):
     """Subclass of a dict that stores values for a Cache-Control header.  It
     has accessors for all the cache-control directives specified in RFC 2616.
     The class does not differentiate between request and response directives.
@@ -32,93 +66,95 @@ class _CacheControl(UpdateDictMixin, dict):
     to subclass it and add your own items have a look at the sourcecode for
     that class.
 
-    .. versionchanged:: 2.1.0
+    .. versionchanged:: 3.1
+        Dict values are always ``str | None``. Setting properties will
+        convert the value to a string. Setting a non-bool property to
+        ``False`` is equivalent to setting it to ``None``. Getting typed
+        properties will return ``None`` if conversion raises
+        ``ValueError``, rather than the string.
+
+    .. versionchanged:: 2.1
         Setting int properties such as ``max_age`` will convert the
         value to an int.
 
     .. versionchanged:: 0.4
-
-       Setting `no_cache` or `private` to boolean `True` will set the implicit
-       none-value which is ``*``:
-
-       >>> cc = ResponseCacheControl()
-       >>> cc.no_cache = True
-       >>> cc
-       <ResponseCacheControl 'no-cache'>
-       >>> cc.no_cache
-       '*'
-       >>> cc.no_cache = None
-       >>> cc
-       <ResponseCacheControl ''>
-
-       In versions before 0.5 the behavior documented here affected the now
-       no longer existing `CacheControl` class.
+       Setting ``no_cache`` or ``private`` to ``True`` will set the
+       implicit value ``"*"``.
     """
 
-    no_cache = cache_control_property("no-cache", "*", None)
-    no_store = cache_control_property("no-store", None, bool)
-    max_age = cache_control_property("max-age", -1, int)
-    no_transform = cache_control_property("no-transform", None, None)
-
-    def __init__(self, values=(), on_update=None):
-        dict.__init__(self, values or ())
-        self.on_update = on_update
+    no_store: bool = cache_control_property("no-store", None, bool)
+    max_age: int | None = cache_control_property("max-age", None, int)
+    no_transform: bool = cache_control_property("no-transform", None, bool)
+    stale_if_error: int | None = cache_control_property("stale-if-error", None, int)
+
+    def __init__(
+        self,
+        values: cabc.Mapping[str, t.Any] | cabc.Iterable[tuple[str, t.Any]] | None = (),
+        on_update: cabc.Callable[[_CacheControl], None] | None = None,
+    ):
+        super().__init__(values, on_update)
         self.provided = values is not None
 
-    def _get_cache_value(self, key, empty, type):
+    def _get_cache_value(
+        self, key: str, empty: t.Any, type: type[t.Any] | None
+    ) -> t.Any:
         """Used internally by the accessor properties."""
         if type is bool:
             return key in self
-        if key in self:
-            value = self[key]
-            if value is None:
-                return empty
-            elif type is not None:
-                try:
-                    value = type(value)
-                except ValueError:
-                    pass
-            return value
-        return None
-
-    def _set_cache_value(self, key, value, type):
+
+        if key not in self:
+            return None
+
+        if (value := self[key]) is None:
+            return empty
+
+        if type is not None:
+            try:
+                value = type(value)
+            except ValueError:
+                return None
+
+        return value
+
+    def _set_cache_value(
+        self, key: str, value: t.Any, type: type[t.Any] | None
+    ) -> None:
         """Used internally by the accessor properties."""
         if type is bool:
             if value:
                 self[key] = None
             else:
                 self.pop(key, None)
+        elif value is None or value is False:
+            self.pop(key, None)
+        elif value is True:
+            self[key] = None
         else:
-            if value is None:
-                self.pop(key, None)
-            elif value is True:
-                self[key] = None
-            else:
-                if type is not None:
-                    self[key] = type(value)
-                else:
-                    self[key] = value
+            if type is not None:
+                value = type(value)
 
-    def _del_cache_value(self, key):
+            self[key] = str(value)
+
+    def _del_cache_value(self, key: str) -> None:
         """Used internally by the accessor properties."""
         if key in self:
             del self[key]
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Convert the stored values into a cache control header."""
         return http.dump_header(self)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         kv_str = " ".join(f"{k}={v!r}" for k, v in sorted(self.items()))
         return f"<{type(self).__name__} {kv_str}>"
 
     cache_property = staticmethod(cache_control_property)
 
 
-class RequestCacheControl(ImmutableDictMixin, _CacheControl):
+class RequestCacheControl(ImmutableDictMixin[str, t.Optional[str]], _CacheControl):  # type: ignore[misc]
     """A cache control for requests.  This is immutable and gives access
     to all the request-relevant cache control headers.
 
@@ -127,18 +163,49 @@ class RequestCacheControl(ImmutableDictMixin, _CacheControl):
     you plan to subclass it and add your own items have a look at the sourcecode
     for that class.
 
-    .. versionchanged:: 2.1.0
+    .. versionchanged:: 3.1
+        Dict values are always ``str | None``. Setting properties will
+        convert the value to a string. Setting a non-bool property to
+        ``False`` is equivalent to setting it to ``None``. Getting typed
+        properties will return ``None`` if conversion raises
+        ``ValueError``, rather than the string.
+
+    .. versionchanged:: 3.1
+       ``max_age`` is ``None`` if present without a value, rather
+       than ``-1``.
+
+    .. versionchanged:: 3.1
+        ``no_cache`` is a boolean, it is ``True`` instead of ``"*"``
+        when present.
+
+    .. versionchanged:: 3.1
+        ``max_stale`` is ``True`` if present without a value, rather
+        than ``"*"``.
+
+    .. versionchanged:: 3.1
+       ``no_transform`` is a boolean. Previously it was mistakenly
+       always ``None``.
+
+    .. versionchanged:: 3.1
+       ``min_fresh`` is ``None`` if present without a value, rather
+       than ``"*"``.
+
+    .. versionchanged:: 2.1
         Setting int properties such as ``max_age`` will convert the
         value to an int.
 
     .. versionadded:: 0.5
-       In previous versions a `CacheControl` class existed that was used
-       both for request and response.
+        Response-only properties are not present on this request class.
     """
 
-    max_stale = cache_control_property("max-stale", "*", int)
-    min_fresh = cache_control_property("min-fresh", "*", int)
-    only_if_cached = cache_control_property("only-if-cached", None, bool)
+    no_cache: bool = cache_control_property("no-cache", None, bool)
+    max_stale: int | t.Literal[True] | None = cache_control_property(
+        "max-stale",
+        True,
+        int,
+    )
+    min_fresh: int | None = cache_control_property("min-fresh", None, int)
+    only_if_cached: bool = cache_control_property("only-if-cached", None, bool)
 
 
 class ResponseCacheControl(_CacheControl):
@@ -151,25 +218,56 @@ class ResponseCacheControl(_CacheControl):
     you plan to subclass it and add your own items have a look at the sourcecode
     for that class.
 
+    .. versionchanged:: 3.1
+        Dict values are always ``str | None``. Setting properties will
+        convert the value to a string. Setting a non-bool property to
+        ``False`` is equivalent to setting it to ``None``. Getting typed
+        properties will return ``None`` if conversion raises
+        ``ValueError``, rather than the string.
+
+    .. versionchanged:: 3.1
+        ``no_cache`` is ``True`` if present without a value, rather than
+        ``"*"``.
+
+    .. versionchanged:: 3.1
+        ``private`` is ``True`` if present without a value, rather than
+        ``"*"``.
+
+    .. versionchanged:: 3.1
+       ``no_transform`` is a boolean. Previously it was mistakenly
+       always ``None``.
+
+    .. versionchanged:: 3.1
+        Added the ``must_understand``, ``stale_while_revalidate``, and
+        ``stale_if_error`` properties.
+
     .. versionchanged:: 2.1.1
         ``s_maxage`` converts the value to an int.
 
-    .. versionchanged:: 2.1.0
+    .. versionchanged:: 2.1
         Setting int properties such as ``max_age`` will convert the
         value to an int.
 
     .. versionadded:: 0.5
-       In previous versions a `CacheControl` class existed that was used
-       both for request and response.
+       Request-only properties are not present on this response class.
     """
 
-    public = cache_control_property("public", None, bool)
-    private = cache_control_property("private", "*", None)
-    must_revalidate = cache_control_property("must-revalidate", None, bool)
-    proxy_revalidate = cache_control_property("proxy-revalidate", None, bool)
-    s_maxage = cache_control_property("s-maxage", None, int)
-    immutable = cache_control_property("immutable", None, bool)
+    no_cache: str | t.Literal[True] | None = cache_control_property(
+        "no-cache", True, None
+    )
+    public: bool = cache_control_property("public", None, bool)
+    private: str | t.Literal[True] | None = cache_control_property(
+        "private", True, None
+    )
+    must_revalidate: bool = cache_control_property("must-revalidate", None, bool)
+    proxy_revalidate: bool = cache_control_property("proxy-revalidate", None, bool)
+    s_maxage: int | None = cache_control_property("s-maxage", None, int)
+    immutable: bool = cache_control_property("immutable", None, bool)
+    must_understand: bool = cache_control_property("must-understand", None, bool)
+    stale_while_revalidate: int | None = cache_control_property(
+        "stale-while-revalidate", None, int
+    )
 
 
 # circular dependencies
-from .. import http
+from .. import http  # noqa: E402
diff --git a/libs/werkzeug/datastructures/cache_control.pyi b/libs/werkzeug/datastructures/cache_control.pyi
deleted file mode 100644
index 54ec020826..0000000000
--- a/libs/werkzeug/datastructures/cache_control.pyi
+++ /dev/null
@@ -1,115 +0,0 @@
-from collections.abc import Callable
-from collections.abc import Iterable
-from collections.abc import Mapping
-from typing import TypeVar
-
-from .mixins import ImmutableDictMixin
-from .mixins import UpdateDictMixin
-
-T = TypeVar("T")
-_CPT = TypeVar("_CPT", str, int, bool)
-
-def cache_control_property(
-    key: str, empty: _CPT | None, type: type[_CPT]
-) -> property: ...
-
-class _CacheControl(
-    UpdateDictMixin[str, str | int | bool | None], dict[str, str | int | bool | None]
-):
-    provided: bool
-    def __init__(
-        self,
-        values: Mapping[str, str | int | bool | None]
-        | Iterable[tuple[str, str | int | bool | None]] = (),
-        on_update: Callable[[_CacheControl], None] | None = None,
-    ) -> None: ...
-    @property
-    def no_cache(self) -> bool | None: ...
-    @no_cache.setter
-    def no_cache(self, value: bool | None) -> None: ...
-    @no_cache.deleter
-    def no_cache(self) -> None: ...
-    @property
-    def no_store(self) -> bool | None: ...
-    @no_store.setter
-    def no_store(self, value: bool | None) -> None: ...
-    @no_store.deleter
-    def no_store(self) -> None: ...
-    @property
-    def max_age(self) -> int | None: ...
-    @max_age.setter
-    def max_age(self, value: int | None) -> None: ...
-    @max_age.deleter
-    def max_age(self) -> None: ...
-    @property
-    def no_transform(self) -> bool | None: ...
-    @no_transform.setter
-    def no_transform(self, value: bool | None) -> None: ...
-    @no_transform.deleter
-    def no_transform(self) -> None: ...
-    def _get_cache_value(self, key: str, empty: T | None, type: type[T]) -> T: ...
-    def _set_cache_value(self, key: str, value: T | None, type: type[T]) -> None: ...
-    def _del_cache_value(self, key: str) -> None: ...
-    def to_header(self) -> str: ...
-    @staticmethod
-    def cache_property(key: str, empty: _CPT | None, type: type[_CPT]) -> property: ...
-
-class RequestCacheControl(  # type: ignore[misc]
-    ImmutableDictMixin[str, str | int | bool | None], _CacheControl
-):
-    @property
-    def max_stale(self) -> int | None: ...
-    @max_stale.setter
-    def max_stale(self, value: int | None) -> None: ...
-    @max_stale.deleter
-    def max_stale(self) -> None: ...
-    @property
-    def min_fresh(self) -> int | None: ...
-    @min_fresh.setter
-    def min_fresh(self, value: int | None) -> None: ...
-    @min_fresh.deleter
-    def min_fresh(self) -> None: ...
-    @property
-    def only_if_cached(self) -> bool | None: ...
-    @only_if_cached.setter
-    def only_if_cached(self, value: bool | None) -> None: ...
-    @only_if_cached.deleter
-    def only_if_cached(self) -> None: ...
-
-class ResponseCacheControl(_CacheControl):
-    @property
-    def public(self) -> bool | None: ...
-    @public.setter
-    def public(self, value: bool | None) -> None: ...
-    @public.deleter
-    def public(self) -> None: ...
-    @property
-    def private(self) -> bool | None: ...
-    @private.setter
-    def private(self, value: bool | None) -> None: ...
-    @private.deleter
-    def private(self) -> None: ...
-    @property
-    def must_revalidate(self) -> bool | None: ...
-    @must_revalidate.setter
-    def must_revalidate(self, value: bool | None) -> None: ...
-    @must_revalidate.deleter
-    def must_revalidate(self) -> None: ...
-    @property
-    def proxy_revalidate(self) -> bool | None: ...
-    @proxy_revalidate.setter
-    def proxy_revalidate(self, value: bool | None) -> None: ...
-    @proxy_revalidate.deleter
-    def proxy_revalidate(self) -> None: ...
-    @property
-    def s_maxage(self) -> int | None: ...
-    @s_maxage.setter
-    def s_maxage(self, value: int | None) -> None: ...
-    @s_maxage.deleter
-    def s_maxage(self) -> None: ...
-    @property
-    def immutable(self) -> bool | None: ...
-    @immutable.setter
-    def immutable(self, value: bool | None) -> None: ...
-    @immutable.deleter
-    def immutable(self) -> None: ...
diff --git a/libs/werkzeug/datastructures/csp.py b/libs/werkzeug/datastructures/csp.py
index dde9414951..206c1e38b2 100644
--- a/libs/werkzeug/datastructures/csp.py
+++ b/libs/werkzeug/datastructures/csp.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 
-from .mixins import UpdateDictMixin
+import collections.abc as cabc
+import typing as t
 
+from .structures import CallbackDict
 
-def csp_property(key):
+
+def csp_property(key: str) -> t.Any:
     """Return a new property object for a content security policy header.
     Useful if you want to add support for a csp extension in a
     subclass.
@@ -16,14 +19,14 @@ def csp_property(key):
     )
 
 
-class ContentSecurityPolicy(UpdateDictMixin, dict):
+class ContentSecurityPolicy(CallbackDict[str, str]):
     """Subclass of a dict that stores values for a Content Security Policy
     header. It has accessors for all the level 3 policies.
 
     Because the csp directives in the HTTP header use dashes the
     python descriptors use underscores for that.
 
-    To get a header of the :class:`ContentSecuirtyPolicy` object again
+    To get a header of the :class:`ContentSecurityPolicy` object again
     you can convert the object into a string or call the
     :meth:`to_header` method.  If you plan to subclass it and add your
     own items have a look at the sourcecode for that class.
@@ -33,62 +36,65 @@ class ContentSecurityPolicy(UpdateDictMixin, dict):
 
     """
 
-    base_uri = csp_property("base-uri")
-    child_src = csp_property("child-src")
-    connect_src = csp_property("connect-src")
-    default_src = csp_property("default-src")
-    font_src = csp_property("font-src")
-    form_action = csp_property("form-action")
-    frame_ancestors = csp_property("frame-ancestors")
-    frame_src = csp_property("frame-src")
-    img_src = csp_property("img-src")
-    manifest_src = csp_property("manifest-src")
-    media_src = csp_property("media-src")
-    navigate_to = csp_property("navigate-to")
-    object_src = csp_property("object-src")
-    prefetch_src = csp_property("prefetch-src")
-    plugin_types = csp_property("plugin-types")
-    report_to = csp_property("report-to")
-    report_uri = csp_property("report-uri")
-    sandbox = csp_property("sandbox")
-    script_src = csp_property("script-src")
-    script_src_attr = csp_property("script-src-attr")
-    script_src_elem = csp_property("script-src-elem")
-    style_src = csp_property("style-src")
-    style_src_attr = csp_property("style-src-attr")
-    style_src_elem = csp_property("style-src-elem")
-    worker_src = csp_property("worker-src")
-
-    def __init__(self, values=(), on_update=None):
-        dict.__init__(self, values or ())
-        self.on_update = on_update
+    base_uri: str | None = csp_property("base-uri")
+    child_src: str | None = csp_property("child-src")
+    connect_src: str | None = csp_property("connect-src")
+    default_src: str | None = csp_property("default-src")
+    font_src: str | None = csp_property("font-src")
+    form_action: str | None = csp_property("form-action")
+    frame_ancestors: str | None = csp_property("frame-ancestors")
+    frame_src: str | None = csp_property("frame-src")
+    img_src: str | None = csp_property("img-src")
+    manifest_src: str | None = csp_property("manifest-src")
+    media_src: str | None = csp_property("media-src")
+    navigate_to: str | None = csp_property("navigate-to")
+    object_src: str | None = csp_property("object-src")
+    prefetch_src: str | None = csp_property("prefetch-src")
+    plugin_types: str | None = csp_property("plugin-types")
+    report_to: str | None = csp_property("report-to")
+    report_uri: str | None = csp_property("report-uri")
+    sandbox: str | None = csp_property("sandbox")
+    script_src: str | None = csp_property("script-src")
+    script_src_attr: str | None = csp_property("script-src-attr")
+    script_src_elem: str | None = csp_property("script-src-elem")
+    style_src: str | None = csp_property("style-src")
+    style_src_attr: str | None = csp_property("style-src-attr")
+    style_src_elem: str | None = csp_property("style-src-elem")
+    worker_src: str | None = csp_property("worker-src")
+
+    def __init__(
+        self,
+        values: cabc.Mapping[str, str] | cabc.Iterable[tuple[str, str]] | None = (),
+        on_update: cabc.Callable[[ContentSecurityPolicy], None] | None = None,
+    ) -> None:
+        super().__init__(values, on_update)
         self.provided = values is not None
 
-    def _get_value(self, key):
+    def _get_value(self, key: str) -> str | None:
         """Used internally by the accessor properties."""
         return self.get(key)
 
-    def _set_value(self, key, value):
+    def _set_value(self, key: str, value: str | None) -> None:
         """Used internally by the accessor properties."""
         if value is None:
             self.pop(key, None)
         else:
             self[key] = value
 
-    def _del_value(self, key):
+    def _del_value(self, key: str) -> None:
         """Used internally by the accessor properties."""
         if key in self:
             del self[key]
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Convert the stored values into a cache control header."""
         from ..http import dump_csp_header
 
         return dump_csp_header(self)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         kv_str = " ".join(f"{k}={v!r}" for k, v in sorted(self.items()))
         return f"<{type(self).__name__} {kv_str}>"
diff --git a/libs/werkzeug/datastructures/csp.pyi b/libs/werkzeug/datastructures/csp.pyi
deleted file mode 100644
index f9e2ac0f46..0000000000
--- a/libs/werkzeug/datastructures/csp.pyi
+++ /dev/null
@@ -1,169 +0,0 @@
-from collections.abc import Callable
-from collections.abc import Iterable
-from collections.abc import Mapping
-
-from .mixins import UpdateDictMixin
-
-def csp_property(key: str) -> property: ...
-
-class ContentSecurityPolicy(UpdateDictMixin[str, str], dict[str, str]):
-    @property
-    def base_uri(self) -> str | None: ...
-    @base_uri.setter
-    def base_uri(self, value: str | None) -> None: ...
-    @base_uri.deleter
-    def base_uri(self) -> None: ...
-    @property
-    def child_src(self) -> str | None: ...
-    @child_src.setter
-    def child_src(self, value: str | None) -> None: ...
-    @child_src.deleter
-    def child_src(self) -> None: ...
-    @property
-    def connect_src(self) -> str | None: ...
-    @connect_src.setter
-    def connect_src(self, value: str | None) -> None: ...
-    @connect_src.deleter
-    def connect_src(self) -> None: ...
-    @property
-    def default_src(self) -> str | None: ...
-    @default_src.setter
-    def default_src(self, value: str | None) -> None: ...
-    @default_src.deleter
-    def default_src(self) -> None: ...
-    @property
-    def font_src(self) -> str | None: ...
-    @font_src.setter
-    def font_src(self, value: str | None) -> None: ...
-    @font_src.deleter
-    def font_src(self) -> None: ...
-    @property
-    def form_action(self) -> str | None: ...
-    @form_action.setter
-    def form_action(self, value: str | None) -> None: ...
-    @form_action.deleter
-    def form_action(self) -> None: ...
-    @property
-    def frame_ancestors(self) -> str | None: ...
-    @frame_ancestors.setter
-    def frame_ancestors(self, value: str | None) -> None: ...
-    @frame_ancestors.deleter
-    def frame_ancestors(self) -> None: ...
-    @property
-    def frame_src(self) -> str | None: ...
-    @frame_src.setter
-    def frame_src(self, value: str | None) -> None: ...
-    @frame_src.deleter
-    def frame_src(self) -> None: ...
-    @property
-    def img_src(self) -> str | None: ...
-    @img_src.setter
-    def img_src(self, value: str | None) -> None: ...
-    @img_src.deleter
-    def img_src(self) -> None: ...
-    @property
-    def manifest_src(self) -> str | None: ...
-    @manifest_src.setter
-    def manifest_src(self, value: str | None) -> None: ...
-    @manifest_src.deleter
-    def manifest_src(self) -> None: ...
-    @property
-    def media_src(self) -> str | None: ...
-    @media_src.setter
-    def media_src(self, value: str | None) -> None: ...
-    @media_src.deleter
-    def media_src(self) -> None: ...
-    @property
-    def navigate_to(self) -> str | None: ...
-    @navigate_to.setter
-    def navigate_to(self, value: str | None) -> None: ...
-    @navigate_to.deleter
-    def navigate_to(self) -> None: ...
-    @property
-    def object_src(self) -> str | None: ...
-    @object_src.setter
-    def object_src(self, value: str | None) -> None: ...
-    @object_src.deleter
-    def object_src(self) -> None: ...
-    @property
-    def prefetch_src(self) -> str | None: ...
-    @prefetch_src.setter
-    def prefetch_src(self, value: str | None) -> None: ...
-    @prefetch_src.deleter
-    def prefetch_src(self) -> None: ...
-    @property
-    def plugin_types(self) -> str | None: ...
-    @plugin_types.setter
-    def plugin_types(self, value: str | None) -> None: ...
-    @plugin_types.deleter
-    def plugin_types(self) -> None: ...
-    @property
-    def report_to(self) -> str | None: ...
-    @report_to.setter
-    def report_to(self, value: str | None) -> None: ...
-    @report_to.deleter
-    def report_to(self) -> None: ...
-    @property
-    def report_uri(self) -> str | None: ...
-    @report_uri.setter
-    def report_uri(self, value: str | None) -> None: ...
-    @report_uri.deleter
-    def report_uri(self) -> None: ...
-    @property
-    def sandbox(self) -> str | None: ...
-    @sandbox.setter
-    def sandbox(self, value: str | None) -> None: ...
-    @sandbox.deleter
-    def sandbox(self) -> None: ...
-    @property
-    def script_src(self) -> str | None: ...
-    @script_src.setter
-    def script_src(self, value: str | None) -> None: ...
-    @script_src.deleter
-    def script_src(self) -> None: ...
-    @property
-    def script_src_attr(self) -> str | None: ...
-    @script_src_attr.setter
-    def script_src_attr(self, value: str | None) -> None: ...
-    @script_src_attr.deleter
-    def script_src_attr(self) -> None: ...
-    @property
-    def script_src_elem(self) -> str | None: ...
-    @script_src_elem.setter
-    def script_src_elem(self, value: str | None) -> None: ...
-    @script_src_elem.deleter
-    def script_src_elem(self) -> None: ...
-    @property
-    def style_src(self) -> str | None: ...
-    @style_src.setter
-    def style_src(self, value: str | None) -> None: ...
-    @style_src.deleter
-    def style_src(self) -> None: ...
-    @property
-    def style_src_attr(self) -> str | None: ...
-    @style_src_attr.setter
-    def style_src_attr(self, value: str | None) -> None: ...
-    @style_src_attr.deleter
-    def style_src_attr(self) -> None: ...
-    @property
-    def style_src_elem(self) -> str | None: ...
-    @style_src_elem.setter
-    def style_src_elem(self, value: str | None) -> None: ...
-    @style_src_elem.deleter
-    def style_src_elem(self) -> None: ...
-    @property
-    def worker_src(self) -> str | None: ...
-    @worker_src.setter
-    def worker_src(self, value: str | None) -> None: ...
-    @worker_src.deleter
-    def worker_src(self) -> None: ...
-    provided: bool
-    def __init__(
-        self,
-        values: Mapping[str, str] | Iterable[tuple[str, str]] = (),
-        on_update: Callable[[ContentSecurityPolicy], None] | None = None,
-    ) -> None: ...
-    def _get_value(self, key: str) -> str | None: ...
-    def _set_value(self, key: str, value: str) -> None: ...
-    def _del_value(self, key: str) -> None: ...
-    def to_header(self) -> str: ...
diff --git a/libs/werkzeug/datastructures/etag.py b/libs/werkzeug/datastructures/etag.py
index 747d9966dd..a4ef342456 100644
--- a/libs/werkzeug/datastructures/etag.py
+++ b/libs/werkzeug/datastructures/etag.py
@@ -1,14 +1,19 @@
 from __future__ import annotations
 
-from collections.abc import Collection
+import collections.abc as cabc
 
 
-class ETags(Collection):
+class ETags(cabc.Collection[str]):
     """A set that can be used to check if one etag is present in a collection
     of etags.
     """
 
-    def __init__(self, strong_etags=None, weak_etags=None, star_tag=False):
+    def __init__(
+        self,
+        strong_etags: cabc.Iterable[str] | None = None,
+        weak_etags: cabc.Iterable[str] | None = None,
+        star_tag: bool = False,
+    ):
         if not star_tag and strong_etags:
             self._strong = frozenset(strong_etags)
         else:
@@ -17,7 +22,7 @@ def __init__(self, strong_etags=None, weak_etags=None, star_tag=False):
         self._weak = frozenset(weak_etags or ())
         self.star_tag = star_tag
 
-    def as_set(self, include_weak=False):
+    def as_set(self, include_weak: bool = False) -> set[str]:
         """Convert the `ETags` object into a python set.  Per default all the
         weak etags are not part of this set."""
         rv = set(self._strong)
@@ -25,19 +30,19 @@ def as_set(self, include_weak=False):
             rv.update(self._weak)
         return rv
 
-    def is_weak(self, etag):
+    def is_weak(self, etag: str) -> bool:
         """Check if an etag is weak."""
         return etag in self._weak
 
-    def is_strong(self, etag):
+    def is_strong(self, etag: str) -> bool:
         """Check if an etag is strong."""
         return etag in self._strong
 
-    def contains_weak(self, etag):
+    def contains_weak(self, etag: str) -> bool:
         """Check if an etag is part of the set including weak and strong tags."""
         return self.is_weak(etag) or self.contains(etag)
 
-    def contains(self, etag):
+    def contains(self, etag: str) -> bool:
         """Check if an etag is part of the set ignoring weak tags.
         It is also possible to use the ``in`` operator.
         """
@@ -45,7 +50,7 @@ def contains(self, etag):
             return True
         return self.is_strong(etag)
 
-    def contains_raw(self, etag):
+    def contains_raw(self, etag: str) -> bool:
         """When passed a quoted tag it will check if this tag is part of the
         set.  If the tag is weak it is checked against weak and strong tags,
         otherwise strong only."""
@@ -56,7 +61,7 @@ def contains_raw(self, etag):
             return self.contains_weak(etag)
         return self.contains(etag)
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Convert the etags set into a HTTP header string."""
         if self.star_tag:
             return "*"
@@ -64,10 +69,16 @@ def to_header(self):
             [f'"{x}"' for x in self._strong] + [f'W/"{x}"' for x in self._weak]
         )
 
-    def __call__(self, etag=None, data=None, include_weak=False):
-        if [etag, data].count(None) != 1:
-            raise TypeError("either tag or data required, but at least one")
+    def __call__(
+        self,
+        etag: str | None = None,
+        data: bytes | None = None,
+        include_weak: bool = False,
+    ) -> bool:
         if etag is None:
+            if data is None:
+                raise TypeError("'data' is required when 'etag' is not given.")
+
             from ..http import generate_etag
 
             etag = generate_etag(data)
@@ -76,20 +87,20 @@ def __call__(self, etag=None, data=None, include_weak=False):
                 return True
         return etag in self._strong
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self.star_tag or self._strong or self._weak)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._strong)
 
-    def __iter__(self):
+    def __iter__(self) -> cabc.Iterator[str]:
         return iter(self._strong)
 
-    def __contains__(self, etag):
+    def __contains__(self, etag: str) -> bool:  # type: ignore[override]
         return self.contains(etag)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{type(self).__name__} {str(self)!r}>"
diff --git a/libs/werkzeug/datastructures/etag.pyi b/libs/werkzeug/datastructures/etag.pyi
deleted file mode 100644
index 88e54f1548..0000000000
--- a/libs/werkzeug/datastructures/etag.pyi
+++ /dev/null
@@ -1,30 +0,0 @@
-from collections.abc import Collection
-from collections.abc import Iterable
-from collections.abc import Iterator
-
-class ETags(Collection[str]):
-    _strong: frozenset[str]
-    _weak: frozenset[str]
-    star_tag: bool
-    def __init__(
-        self,
-        strong_etags: Iterable[str] | None = None,
-        weak_etags: Iterable[str] | None = None,
-        star_tag: bool = False,
-    ) -> None: ...
-    def as_set(self, include_weak: bool = False) -> set[str]: ...
-    def is_weak(self, etag: str) -> bool: ...
-    def is_strong(self, etag: str) -> bool: ...
-    def contains_weak(self, etag: str) -> bool: ...
-    def contains(self, etag: str) -> bool: ...
-    def contains_raw(self, etag: str) -> bool: ...
-    def to_header(self) -> str: ...
-    def __call__(
-        self,
-        etag: str | None = None,
-        data: bytes | None = None,
-        include_weak: bool = False,
-    ) -> bool: ...
-    def __len__(self) -> int: ...
-    def __iter__(self) -> Iterator[str]: ...
-    def __contains__(self, item: str) -> bool: ...  # type: ignore
diff --git a/libs/werkzeug/datastructures/file_storage.py b/libs/werkzeug/datastructures/file_storage.py
index e878a56d4f..3a17f5125a 100644
--- a/libs/werkzeug/datastructures/file_storage.py
+++ b/libs/werkzeug/datastructures/file_storage.py
@@ -1,11 +1,15 @@
 from __future__ import annotations
 
+import collections.abc as cabc
 import mimetypes
+import os
+import typing as t
 from io import BytesIO
 from os import fsdecode
 from os import fspath
 
 from .._internal import _plain_int
+from .headers import Headers
 from .structures import MultiDict
 
 
@@ -19,12 +23,12 @@ class FileStorage:
 
     def __init__(
         self,
-        stream=None,
-        filename=None,
-        name=None,
-        content_type=None,
-        content_length=None,
-        headers=None,
+        stream: t.IO[bytes] | None = None,
+        filename: str | None = None,
+        name: str | None = None,
+        content_type: str | None = None,
+        content_length: int | None = None,
+        headers: Headers | None = None,
     ):
         self.name = name
         self.stream = stream or BytesIO()
@@ -46,8 +50,6 @@ def __init__(
         self.filename = filename
 
         if headers is None:
-            from .headers import Headers
-
             headers = Headers()
         self.headers = headers
         if content_type is not None:
@@ -55,17 +57,17 @@ def __init__(
         if content_length is not None:
             headers["Content-Length"] = str(content_length)
 
-    def _parse_content_type(self):
+    def _parse_content_type(self) -> None:
         if not hasattr(self, "_parsed_content_type"):
             self._parsed_content_type = http.parse_options_header(self.content_type)
 
     @property
-    def content_type(self):
+    def content_type(self) -> str | None:
         """The content-type sent in the header.  Usually not available"""
         return self.headers.get("content-type")
 
     @property
-    def content_length(self):
+    def content_length(self) -> int:
         """The content-length sent in the header.  Usually not available"""
         if "content-length" in self.headers:
             try:
@@ -76,7 +78,7 @@ def content_length(self):
         return 0
 
     @property
-    def mimetype(self):
+    def mimetype(self) -> str:
         """Like :attr:`content_type`, but without parameters (eg, without
         charset, type etc.) and always lowercase.  For example if the content
         type is ``text/HTML; charset=utf-8`` the mimetype would be
@@ -88,7 +90,7 @@ def mimetype(self):
         return self._parsed_content_type[0].lower()
 
     @property
-    def mimetype_params(self):
+    def mimetype_params(self) -> dict[str, str]:
         """The mimetype parameters as dict.  For example if the content
         type is ``text/html; charset=utf-8`` the params would be
         ``{'charset': 'utf-8'}``.
@@ -98,7 +100,9 @@ def mimetype_params(self):
         self._parse_content_type()
         return self._parsed_content_type[1]
 
-    def save(self, dst, buffer_size=16384):
+    def save(
+        self, dst: str | os.PathLike[str] | t.IO[bytes], buffer_size: int = 16384
+    ) -> None:
         """Save the file to a destination path or file object.  If the
         destination is a file object you have to close it yourself after the
         call.  The buffer size is the number of bytes held in memory during
@@ -131,35 +135,34 @@ def save(self, dst, buffer_size=16384):
             if close_dst:
                 dst.close()
 
-    def close(self):
+    def close(self) -> None:
         """Close the underlying file if possible."""
         try:
             self.stream.close()
         except Exception:
             pass
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self.filename)
 
-    def __getattr__(self, name):
+    def __getattr__(self, name: str) -> t.Any:
         try:
             return getattr(self.stream, name)
         except AttributeError:
-            # SpooledTemporaryFile doesn't implement IOBase, get the
-            # attribute from its backing file instead.
-            # https://github.com/python/cpython/pull/3249
+            # SpooledTemporaryFile on Python < 3.11 doesn't implement IOBase,
+            # get the attribute from its backing file instead.
             if hasattr(self.stream, "_file"):
                 return getattr(self.stream._file, name)
             raise
 
-    def __iter__(self):
+    def __iter__(self) -> cabc.Iterator[bytes]:
         return iter(self.stream)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{type(self).__name__}: {self.filename!r} ({self.content_type!r})>"
 
 
-class FileMultiDict(MultiDict):
+class FileMultiDict(MultiDict[str, FileStorage]):
     """A special :class:`MultiDict` that has convenience methods to add
     files to it.  This is used for :class:`EnvironBuilder` and generally
     useful for unittesting.
@@ -167,7 +170,13 @@ class FileMultiDict(MultiDict):
     .. versionadded:: 0.5
     """
 
-    def add_file(self, name, file, filename=None, content_type=None):
+    def add_file(
+        self,
+        name: str,
+        file: str | os.PathLike[str] | t.IO[bytes] | FileStorage,
+        filename: str | None = None,
+        content_type: str | None = None,
+    ) -> None:
         """Adds a new file to the dict.  `file` can be a file name or
         a :class:`file`-like or a :class:`FileStorage` object.
 
@@ -177,20 +186,24 @@ def add_file(self, name, file, filename=None, content_type=None):
         :param content_type: an optional content type
         """
         if isinstance(file, FileStorage):
-            value = file
+            self.add(name, file)
+            return
+
+        if isinstance(file, (str, os.PathLike)):
+            if filename is None:
+                filename = os.fspath(file)
+
+            file_obj: t.IO[bytes] = open(file, "rb")
         else:
-            if isinstance(file, str):
-                if filename is None:
-                    filename = file
-                file = open(file, "rb")
-            if filename and content_type is None:
-                content_type = (
-                    mimetypes.guess_type(filename)[0] or "application/octet-stream"
-                )
-            value = FileStorage(file, filename, name, content_type)
+            file_obj = file  # type: ignore[assignment]
+
+        if filename and content_type is None:
+            content_type = (
+                mimetypes.guess_type(filename)[0] or "application/octet-stream"
+            )
 
-        self.add(name, value)
+        self.add(name, FileStorage(file_obj, filename, name, content_type))
 
 
 # circular dependencies
-from .. import http
+from .. import http  # noqa: E402
diff --git a/libs/werkzeug/datastructures/file_storage.pyi b/libs/werkzeug/datastructures/file_storage.pyi
deleted file mode 100644
index 36a7ed9f29..0000000000
--- a/libs/werkzeug/datastructures/file_storage.pyi
+++ /dev/null
@@ -1,49 +0,0 @@
-from collections.abc import Iterator
-from os import PathLike
-from typing import Any
-from typing import IO
-
-from .headers import Headers
-from .structures import MultiDict
-
-class FileStorage:
-    name: str | None
-    stream: IO[bytes]
-    filename: str | None
-    headers: Headers
-    _parsed_content_type: tuple[str, dict[str, str]]
-    def __init__(
-        self,
-        stream: IO[bytes] | None = None,
-        filename: str | PathLike[str] | None = None,
-        name: str | None = None,
-        content_type: str | None = None,
-        content_length: int | None = None,
-        headers: Headers | None = None,
-    ) -> None: ...
-    def _parse_content_type(self) -> None: ...
-    @property
-    def content_type(self) -> str: ...
-    @property
-    def content_length(self) -> int: ...
-    @property
-    def mimetype(self) -> str: ...
-    @property
-    def mimetype_params(self) -> dict[str, str]: ...
-    def save(
-        self, dst: str | PathLike[str] | IO[bytes], buffer_size: int = ...
-    ) -> None: ...
-    def close(self) -> None: ...
-    def __bool__(self) -> bool: ...
-    def __getattr__(self, name: str) -> Any: ...
-    def __iter__(self) -> Iterator[bytes]: ...
-    def __repr__(self) -> str: ...
-
-class FileMultiDict(MultiDict[str, FileStorage]):
-    def add_file(
-        self,
-        name: str,
-        file: FileStorage | str | IO[bytes],
-        filename: str | None = None,
-        content_type: str | None = None,
-    ) -> None: ...
diff --git a/libs/werkzeug/datastructures/headers.py b/libs/werkzeug/datastructures/headers.py
index d9dd655c2e..b8983622b8 100644
--- a/libs/werkzeug/datastructures/headers.py
+++ b/libs/werkzeug/datastructures/headers.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import collections.abc as cabc
 import re
 import typing as t
 
@@ -9,6 +10,12 @@
 from .structures import iter_multi_items
 from .structures import MultiDict
 
+if t.TYPE_CHECKING:
+    import typing_extensions as te
+    from _typeshed.wsgi import WSGIEnvironment
+
+T = t.TypeVar("T")
+
 
 class Headers:
     """An object that stores some headers. It has a dict-like interface,
@@ -34,6 +41,9 @@ class Headers:
 
     :param defaults: The list of default values for the :class:`Headers`.
 
+    .. versionchanged:: 3.1
+        Implement ``|`` and ``|=`` operators.
+
     .. versionchanged:: 2.1.0
         Default values are validated the same as values added later.
 
@@ -47,41 +57,72 @@ class Headers:
        was an API that does not support the changes to the encoding model.
     """
 
-    def __init__(self, defaults=None):
-        self._list = []
+    def __init__(
+        self,
+        defaults: (
+            Headers
+            | MultiDict[str, t.Any]
+            | cabc.Mapping[str, t.Any | list[t.Any] | tuple[t.Any, ...] | set[t.Any]]
+            | cabc.Iterable[tuple[str, t.Any]]
+            | None
+        ) = None,
+    ) -> None:
+        self._list: list[tuple[str, str]] = []
+
         if defaults is not None:
             self.extend(defaults)
 
-    def __getitem__(self, key, _get_mode=False):
-        if not _get_mode:
-            if isinstance(key, int):
-                return self._list[key]
-            elif isinstance(key, slice):
-                return self.__class__(self._list[key])
-        if not isinstance(key, str):
-            raise BadRequestKeyError(key)
+    @t.overload
+    def __getitem__(self, key: str) -> str: ...
+    @t.overload
+    def __getitem__(self, key: int) -> tuple[str, str]: ...
+    @t.overload
+    def __getitem__(self, key: slice) -> te.Self: ...
+    def __getitem__(self, key: str | int | slice) -> str | tuple[str, str] | te.Self:
+        if isinstance(key, str):
+            return self._get_key(key)
+
+        if isinstance(key, int):
+            return self._list[key]
+
+        return self.__class__(self._list[key])
+
+    def _get_key(self, key: str) -> str:
         ikey = key.lower()
+
         for k, v in self._list:
             if k.lower() == ikey:
                 return v
-        # micro optimization: if we are in get mode we will catch that
-        # exception one stack level down so we can raise a standard
-        # key error instead of our special one.
-        if _get_mode:
-            raise KeyError()
-        raise BadRequestKeyError(key)
 
-    def __eq__(self, other):
-        def lowered(item):
-            return (item[0].lower(),) + item[1:]
-
-        return other.__class__ is self.__class__ and set(
-            map(lowered, other._list)
-        ) == set(map(lowered, self._list))
-
-    __hash__ = None
+        raise BadRequestKeyError(key)
 
-    def get(self, key, default=None, type=None):
+    def __eq__(self, other: object) -> bool:
+        if other.__class__ is not self.__class__:
+            return NotImplemented
+
+        def lowered(item: tuple[str, ...]) -> tuple[str, ...]:
+            return item[0].lower(), *item[1:]
+
+        return set(map(lowered, other._list)) == set(map(lowered, self._list))  # type: ignore[attr-defined]
+
+    __hash__ = None  # type: ignore[assignment]
+
+    @t.overload
+    def get(self, key: str) -> str | None: ...
+    @t.overload
+    def get(self, key: str, default: str) -> str: ...
+    @t.overload
+    def get(self, key: str, default: T) -> str | T: ...
+    @t.overload
+    def get(self, key: str, type: cabc.Callable[[str], T]) -> T | None: ...
+    @t.overload
+    def get(self, key: str, default: T, type: cabc.Callable[[str], T]) -> T: ...
+    def get(  # type: ignore[misc]
+        self,
+        key: str,
+        default: str | T | None = None,
+        type: cabc.Callable[[str], T] | None = None,
+    ) -> str | T | None:
         """Return the default value if the requested data doesn't exist.
         If `type` is provided and is a callable it should convert the value,
         return it or raise a :exc:`ValueError` if that is not possible.  In
@@ -107,17 +148,25 @@ def get(self, key, default=None, type=None):
             The ``as_bytes`` parameter was added.
         """
         try:
-            rv = self.__getitem__(key, _get_mode=True)
+            rv = self._get_key(key)
         except KeyError:
             return default
+
         if type is None:
             return rv
+
         try:
             return type(rv)
         except ValueError:
             return default
 
-    def getlist(self, key, type=None):
+    @t.overload
+    def getlist(self, key: str) -> list[str]: ...
+    @t.overload
+    def getlist(self, key: str, type: cabc.Callable[[str], T]) -> list[T]: ...
+    def getlist(
+        self, key: str, type: cabc.Callable[[str], T] | None = None
+    ) -> list[str] | list[T]:
         """Return the list of items for a given key. If that key is not in the
         :class:`Headers`, the return value will be an empty list.  Just like
         :meth:`get`, :meth:`getlist` accepts a `type` parameter.  All items will
@@ -136,18 +185,22 @@ def getlist(self, key, type=None):
             The ``as_bytes`` parameter was added.
         """
         ikey = key.lower()
-        result = []
-        for k, v in self:
-            if k.lower() == ikey:
-                if type is not None:
+
+        if type is not None:
+            result = []
+
+            for k, v in self:
+                if k.lower() == ikey:
                     try:
-                        v = type(v)
+                        result.append(type(v))
                     except ValueError:
                         continue
-                result.append(v)
-        return result
 
-    def get_all(self, name):
+            return result
+
+        return [v for k, v in self if k.lower() == ikey]
+
+    def get_all(self, name: str) -> list[str]:
         """Return a list of all the values for the named field.
 
         This method is compatible with the :mod:`wsgiref`
@@ -155,21 +208,32 @@ def get_all(self, name):
         """
         return self.getlist(name)
 
-    def items(self, lower=False):
+    def items(self, lower: bool = False) -> t.Iterable[tuple[str, str]]:
         for key, value in self:
             if lower:
                 key = key.lower()
             yield key, value
 
-    def keys(self, lower=False):
+    def keys(self, lower: bool = False) -> t.Iterable[str]:
         for key, _ in self.items(lower):
             yield key
 
-    def values(self):
+    def values(self) -> t.Iterable[str]:
         for _, value in self.items():
             yield value
 
-    def extend(self, *args, **kwargs):
+    def extend(
+        self,
+        arg: (
+            Headers
+            | MultiDict[str, t.Any]
+            | cabc.Mapping[str, t.Any | list[t.Any] | tuple[t.Any, ...] | set[t.Any]]
+            | cabc.Iterable[tuple[str, t.Any]]
+            | None
+        ) = None,
+        /,
+        **kwargs: str,
+    ) -> None:
         """Extend headers in this object with items from another object
         containing header items as well as keyword arguments.
 
@@ -183,35 +247,52 @@ def extend(self, *args, **kwargs):
         .. versionchanged:: 1.0
             Support :class:`MultiDict`. Allow passing ``kwargs``.
         """
-        if len(args) > 1:
-            raise TypeError(f"update expected at most 1 arguments, got {len(args)}")
-
-        if args:
-            for key, value in iter_multi_items(args[0]):
+        if arg is not None:
+            for key, value in iter_multi_items(arg):
                 self.add(key, value)
 
         for key, value in iter_multi_items(kwargs):
             self.add(key, value)
 
-    def __delitem__(self, key, _index_operation=True):
-        if _index_operation and isinstance(key, (int, slice)):
-            del self._list[key]
+    def __delitem__(self, key: str | int | slice) -> None:
+        if isinstance(key, str):
+            self._del_key(key)
             return
+
+        del self._list[key]
+
+    def _del_key(self, key: str) -> None:
         key = key.lower()
         new = []
+
         for k, v in self._list:
             if k.lower() != key:
                 new.append((k, v))
+
         self._list[:] = new
 
-    def remove(self, key):
+    def remove(self, key: str) -> None:
         """Remove a key.
 
         :param key: The key to be removed.
         """
-        return self.__delitem__(key, _index_operation=False)
-
-    def pop(self, key=None, default=_missing):
+        return self._del_key(key)
+
+    @t.overload
+    def pop(self) -> tuple[str, str]: ...
+    @t.overload
+    def pop(self, key: str) -> str: ...
+    @t.overload
+    def pop(self, key: int | None = ...) -> tuple[str, str]: ...
+    @t.overload
+    def pop(self, key: str, default: str) -> str: ...
+    @t.overload
+    def pop(self, key: str, default: T) -> str | T: ...
+    def pop(
+        self,
+        key: str | int | None = None,
+        default: str | T = _missing,  # type: ignore[assignment]
+    ) -> str | tuple[str, str] | T:
         """Removes and returns a key or index.
 
         :param key: The key to be popped.  If this is an integer the item at
@@ -222,37 +303,42 @@ def pop(self, key=None, default=_missing):
         """
         if key is None:
             return self._list.pop()
+
         if isinstance(key, int):
             return self._list.pop(key)
+
         try:
-            rv = self[key]
-            self.remove(key)
+            rv = self._get_key(key)
         except KeyError:
             if default is not _missing:
                 return default
+
             raise
+
+        self.remove(key)
         return rv
 
-    def popitem(self):
+    def popitem(self) -> tuple[str, str]:
         """Removes a key or index and returns a (key, value) item."""
-        return self.pop()
+        return self._list.pop()
 
-    def __contains__(self, key):
+    def __contains__(self, key: str) -> bool:
         """Check if a key is present."""
         try:
-            self.__getitem__(key, _get_mode=True)
+            self._get_key(key)
         except KeyError:
             return False
+
         return True
 
-    def __iter__(self):
+    def __iter__(self) -> t.Iterator[tuple[str, str]]:
         """Yield ``(key, value)`` tuples."""
         return iter(self._list)
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._list)
 
-    def add(self, _key, _value, **kw):
+    def add(self, key: str, value: t.Any, /, **kwargs: t.Any) -> None:
         """Add a new header tuple to the list.
 
         Keyword arguments can specify additional parameters for the header
@@ -265,27 +351,28 @@ def add(self, _key, _value, **kw):
         The keyword argument dumping uses :func:`dump_options_header`
         behind the scenes.
 
-        .. versionadded:: 0.4.1
+        .. versionchanged:: 0.4.1
             keyword arguments were added for :mod:`wsgiref` compatibility.
         """
-        if kw:
-            _value = _options_header_vkw(_value, kw)
-        _value = _str_header_value(_value)
-        self._list.append((_key, _value))
+        if kwargs:
+            value = _options_header_vkw(value, kwargs)
+
+        value_str = _str_header_value(value)
+        self._list.append((key, value_str))
 
-    def add_header(self, _key, _value, **_kw):
+    def add_header(self, key: str, value: t.Any, /, **kwargs: t.Any) -> None:
         """Add a new header tuple to the list.
 
         An alias for :meth:`add` for compatibility with the :mod:`wsgiref`
         :meth:`~wsgiref.headers.Headers.add_header` method.
         """
-        self.add(_key, _value, **_kw)
+        self.add(key, value, **kwargs)
 
-    def clear(self):
+    def clear(self) -> None:
         """Clears all headers."""
-        del self._list[:]
+        self._list.clear()
 
-    def set(self, _key, _value, **kw):
+    def set(self, key: str, value: t.Any, /, **kwargs: t.Any) -> None:
         """Remove all header tuples for `key` and add a new one.  The newly
         added key either appears at the end of the list if there was no
         entry or replaces the first one.
@@ -300,25 +387,32 @@ def set(self, _key, _value, **kw):
         :param key: The key to be inserted.
         :param value: The value to be inserted.
         """
-        if kw:
-            _value = _options_header_vkw(_value, kw)
-        _value = _str_header_value(_value)
+        if kwargs:
+            value = _options_header_vkw(value, kwargs)
+
+        value_str = _str_header_value(value)
+
         if not self._list:
-            self._list.append((_key, _value))
+            self._list.append((key, value_str))
             return
-        listiter = iter(self._list)
-        ikey = _key.lower()
-        for idx, (old_key, _old_value) in enumerate(listiter):
+
+        iter_list = iter(self._list)
+        ikey = key.lower()
+
+        for idx, (old_key, _) in enumerate(iter_list):
             if old_key.lower() == ikey:
                 # replace first occurrence
-                self._list[idx] = (_key, _value)
+                self._list[idx] = (key, value_str)
                 break
         else:
-            self._list.append((_key, _value))
+            # no existing occurrences
+            self._list.append((key, value_str))
             return
-        self._list[idx + 1 :] = [t for t in listiter if t[0].lower() != ikey]
 
-    def setlist(self, key, values):
+        # remove remaining occurrences
+        self._list[idx + 1 :] = [t for t in iter_list if t[0].lower() != ikey]
+
+    def setlist(self, key: str, values: cabc.Iterable[t.Any]) -> None:
         """Remove any existing values for a header and add new ones.
 
         :param key: The header key to set.
@@ -335,7 +429,7 @@ def setlist(self, key, values):
         else:
             self.remove(key)
 
-    def setdefault(self, key, default):
+    def setdefault(self, key: str, default: t.Any) -> str:
         """Return the first value for the key if it is in the headers,
         otherwise set the header to the value given by ``default`` and
         return that.
@@ -344,13 +438,15 @@ def setdefault(self, key, default):
         :param default: The value to set for the key if it is not in the
             headers.
         """
-        if key in self:
-            return self[key]
+        try:
+            return self._get_key(key)
+        except KeyError:
+            pass
 
         self.set(key, default)
-        return default
+        return self._get_key(key)
 
-    def setlistdefault(self, key, default):
+    def setlistdefault(self, key: str, default: cabc.Iterable[t.Any]) -> list[str]:
         """Return the list of values for the key if it is in the
         headers, otherwise set the header to the list of values given
         by ``default`` and return that.
@@ -369,20 +465,41 @@ def setlistdefault(self, key, default):
 
         return self.getlist(key)
 
-    def __setitem__(self, key, value):
+    @t.overload
+    def __setitem__(self, key: str, value: t.Any) -> None: ...
+    @t.overload
+    def __setitem__(self, key: int, value: tuple[str, t.Any]) -> None: ...
+    @t.overload
+    def __setitem__(
+        self, key: slice, value: cabc.Iterable[tuple[str, t.Any]]
+    ) -> None: ...
+    def __setitem__(
+        self,
+        key: str | int | slice,
+        value: t.Any | tuple[str, t.Any] | cabc.Iterable[tuple[str, t.Any]],
+    ) -> None:
         """Like :meth:`set` but also supports index/slice based setting."""
-        if isinstance(key, (slice, int)):
-            if isinstance(key, int):
-                value = [value]
-            value = [(k, _str_header_value(v)) for (k, v) in value]
-            if isinstance(key, int):
-                self._list[key] = value[0]
-            else:
-                self._list[key] = value
-        else:
+        if isinstance(key, str):
             self.set(key, value)
-
-    def update(self, *args, **kwargs):
+        elif isinstance(key, int):
+            self._list[key] = value[0], _str_header_value(value[1])  # type: ignore[index]
+        else:
+            self._list[key] = [(k, _str_header_value(v)) for k, v in value]  # type: ignore[misc]
+
+    def update(
+        self,
+        arg: (
+            Headers
+            | MultiDict[str, t.Any]
+            | cabc.Mapping[
+                str, t.Any | list[t.Any] | tuple[t.Any, ...] | cabc.Set[t.Any]
+            ]
+            | cabc.Iterable[tuple[str, t.Any]]
+            | None
+        ) = None,
+        /,
+        **kwargs: t.Any | list[t.Any] | tuple[t.Any, ...] | cabc.Set[t.Any],
+    ) -> None:
         """Replace headers in this object with items from another
         headers object and keyword arguments.
 
@@ -395,45 +512,66 @@ def update(self, *args, **kwargs):
 
         .. versionadded:: 1.0
         """
-        if len(args) > 1:
-            raise TypeError(f"update expected at most 1 arguments, got {len(args)}")
-
-        if args:
-            mapping = args[0]
-
-            if isinstance(mapping, (Headers, MultiDict)):
-                for key in mapping.keys():
-                    self.setlist(key, mapping.getlist(key))
-            elif isinstance(mapping, dict):
-                for key, value in mapping.items():
-                    if isinstance(value, (list, tuple)):
+        if arg is not None:
+            if isinstance(arg, (Headers, MultiDict)):
+                for key in arg.keys():
+                    self.setlist(key, arg.getlist(key))
+            elif isinstance(arg, cabc.Mapping):
+                for key, value in arg.items():
+                    if isinstance(value, (list, tuple, set)):
                         self.setlist(key, value)
                     else:
                         self.set(key, value)
             else:
-                for key, value in mapping:
+                for key, value in arg:
                     self.set(key, value)
 
         for key, value in kwargs.items():
-            if isinstance(value, (list, tuple)):
+            if isinstance(value, (list, tuple, set)):
                 self.setlist(key, value)
             else:
                 self.set(key, value)
 
-    def to_wsgi_list(self):
+    def __or__(
+        self,
+        other: cabc.Mapping[
+            str, t.Any | list[t.Any] | tuple[t.Any, ...] | cabc.Set[t.Any]
+        ],
+    ) -> te.Self:
+        if not isinstance(other, cabc.Mapping):
+            return NotImplemented
+
+        rv = self.copy()
+        rv.update(other)
+        return rv
+
+    def __ior__(
+        self,
+        other: (
+            cabc.Mapping[str, t.Any | list[t.Any] | tuple[t.Any, ...] | cabc.Set[t.Any]]
+            | cabc.Iterable[tuple[str, t.Any]]
+        ),
+    ) -> te.Self:
+        if not isinstance(other, (cabc.Mapping, cabc.Iterable)):
+            return NotImplemented
+
+        self.update(other)
+        return self
+
+    def to_wsgi_list(self) -> list[tuple[str, str]]:
         """Convert the headers into a list suitable for WSGI.
 
         :return: list
         """
         return list(self)
 
-    def copy(self):
+    def copy(self) -> te.Self:
         return self.__class__(self._list)
 
-    def __copy__(self):
+    def __copy__(self) -> te.Self:
         return self.copy()
 
-    def __str__(self):
+    def __str__(self) -> str:
         """Returns formatted headers suitable for HTTP transmission."""
         strs = []
         for key, value in self.to_wsgi_list():
@@ -441,11 +579,11 @@ def __str__(self):
         strs.append("\r\n")
         return "\r\n".join(strs)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{type(self).__name__}({list(self)!r})"
 
 
-def _options_header_vkw(value: str, kw: dict[str, t.Any]):
+def _options_header_vkw(value: str, kw: dict[str, t.Any]) -> str:
     return http.dump_options_header(
         value, {k.replace("_", "-"): v for k, v in kw.items()}
     )
@@ -461,10 +599,10 @@ def _str_header_value(value: t.Any) -> str:
     if _newline_re.search(value) is not None:
         raise ValueError("Header values must not contain newline characters.")
 
-    return value
+    return value  # type: ignore[no-any-return]
 
 
-class EnvironHeaders(ImmutableHeadersMixin, Headers):
+class EnvironHeaders(ImmutableHeadersMixin, Headers):  # type: ignore[misc]
     """Read only version of the headers from a WSGI environment.  This
     provides the same interface as `Headers` and is constructed from
     a WSGI environment.
@@ -474,30 +612,36 @@ class EnvironHeaders(ImmutableHeadersMixin, Headers):
     HTTP exceptions.
     """
 
-    def __init__(self, environ):
+    def __init__(self, environ: WSGIEnvironment) -> None:
+        super().__init__()
         self.environ = environ
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, EnvironHeaders):
+            return NotImplemented
+
         return self.environ is other.environ
 
     __hash__ = None
 
-    def __getitem__(self, key, _get_mode=False):
-        # _get_mode is a no-op for this class as there is no index but
-        # used because get() calls it.
+    def __getitem__(self, key: str) -> str:  # type: ignore[override]
+        return self._get_key(key)
+
+    def _get_key(self, key: str) -> str:
         if not isinstance(key, str):
-            raise KeyError(key)
+            raise BadRequestKeyError(key)
+
         key = key.upper().replace("-", "_")
+
         if key in {"CONTENT_TYPE", "CONTENT_LENGTH"}:
-            return self.environ[key]
-        return self.environ[f"HTTP_{key}"]
+            return self.environ[key]  # type: ignore[no-any-return]
 
-    def __len__(self):
-        # the iter is necessary because otherwise list calls our
-        # len which would call list again and so forth.
-        return len(list(iter(self)))
+        return self.environ[f"HTTP_{key}"]  # type: ignore[no-any-return]
 
-    def __iter__(self):
+    def __len__(self) -> int:
+        return sum(1 for _ in self)
+
+    def __iter__(self) -> cabc.Iterator[tuple[str, str]]:
         for key, value in self.environ.items():
             if key.startswith("HTTP_") and key not in {
                 "HTTP_CONTENT_TYPE",
@@ -507,9 +651,12 @@ def __iter__(self):
             elif key in {"CONTENT_TYPE", "CONTENT_LENGTH"} and value:
                 yield key.replace("_", "-").title(), value
 
-    def copy(self):
+    def copy(self) -> t.NoReturn:
+        raise TypeError(f"cannot create {type(self).__name__!r} copies")
+
+    def __or__(self, other: t.Any) -> t.NoReturn:
         raise TypeError(f"cannot create {type(self).__name__!r} copies")
 
 
 # circular dependencies
-from .. import http
+from .. import http  # noqa: E402
diff --git a/libs/werkzeug/datastructures/headers.pyi b/libs/werkzeug/datastructures/headers.pyi
deleted file mode 100644
index 86502221ae..0000000000
--- a/libs/werkzeug/datastructures/headers.pyi
+++ /dev/null
@@ -1,109 +0,0 @@
-from collections.abc import Callable
-from collections.abc import Iterable
-from collections.abc import Iterator
-from collections.abc import Mapping
-from typing import Literal
-from typing import NoReturn
-from typing import overload
-from typing import TypeVar
-
-from _typeshed import SupportsKeysAndGetItem
-from _typeshed.wsgi import WSGIEnvironment
-
-from .mixins import ImmutableHeadersMixin
-
-D = TypeVar("D")
-T = TypeVar("T")
-
-class Headers(dict[str, str]):
-    _list: list[tuple[str, str]]
-    def __init__(
-        self,
-        defaults: Mapping[str, str | Iterable[str]]
-        | Iterable[tuple[str, str]]
-        | None = None,
-    ) -> None: ...
-    @overload
-    def __getitem__(self, key: str) -> str: ...
-    @overload
-    def __getitem__(self, key: int) -> tuple[str, str]: ...
-    @overload
-    def __getitem__(self, key: slice) -> Headers: ...
-    @overload
-    def __getitem__(self, key: str, _get_mode: Literal[True] = ...) -> str: ...
-    def __eq__(self, other: object) -> bool: ...
-    @overload  # type: ignore
-    def get(self, key: str, default: str) -> str: ...
-    @overload
-    def get(self, key: str, default: str | None = None) -> str | None: ...
-    @overload
-    def get(
-        self, key: str, default: T | None = None, type: Callable[[str], T] = ...
-    ) -> T | None: ...
-    @overload
-    def getlist(self, key: str) -> list[str]: ...
-    @overload
-    def getlist(self, key: str, type: Callable[[str], T]) -> list[T]: ...
-    def get_all(self, name: str) -> list[str]: ...
-    def items(  # type: ignore
-        self, lower: bool = False
-    ) -> Iterator[tuple[str, str]]: ...
-    def keys(self, lower: bool = False) -> Iterator[str]: ...  # type: ignore
-    def values(self) -> Iterator[str]: ...  # type: ignore
-    def extend(
-        self,
-        *args: Mapping[str, str | Iterable[str]] | Iterable[tuple[str, str]],
-        **kwargs: str | Iterable[str],
-    ) -> None: ...
-    @overload
-    def __delitem__(self, key: str | int | slice) -> None: ...
-    @overload
-    def __delitem__(self, key: str, _index_operation: Literal[False]) -> None: ...
-    def remove(self, key: str) -> None: ...
-    @overload  # type: ignore
-    def pop(self, key: str, default: str | None = None) -> str: ...
-    @overload
-    def pop(
-        self, key: int | None = None, default: tuple[str, str] | None = None
-    ) -> tuple[str, str]: ...
-    def popitem(self) -> tuple[str, str]: ...
-    def __contains__(self, key: str) -> bool: ...  # type: ignore
-    def has_key(self, key: str) -> bool: ...
-    def __iter__(self) -> Iterator[tuple[str, str]]: ...  # type: ignore
-    def add(self, _key: str, _value: str, **kw: str) -> None: ...
-    def _validate_value(self, value: str) -> None: ...
-    def add_header(self, _key: str, _value: str, **_kw: str) -> None: ...
-    def clear(self) -> None: ...
-    def set(self, _key: str, _value: str, **kw: str) -> None: ...
-    def setlist(self, key: str, values: Iterable[str]) -> None: ...
-    def setdefault(self, key: str, default: str) -> str: ...
-    def setlistdefault(self, key: str, default: Iterable[str]) -> None: ...
-    @overload
-    def __setitem__(self, key: str, value: str) -> None: ...
-    @overload
-    def __setitem__(self, key: int, value: tuple[str, str]) -> None: ...
-    @overload
-    def __setitem__(self, key: slice, value: Iterable[tuple[str, str]]) -> None: ...
-    @overload
-    def update(
-        self, __m: SupportsKeysAndGetItem[str, str], **kwargs: str | Iterable[str]
-    ) -> None: ...
-    @overload
-    def update(
-        self, __m: Iterable[tuple[str, str]], **kwargs: str | Iterable[str]
-    ) -> None: ...
-    @overload
-    def update(self, **kwargs: str | Iterable[str]) -> None: ...
-    def to_wsgi_list(self) -> list[tuple[str, str]]: ...
-    def copy(self) -> Headers: ...
-    def __copy__(self) -> Headers: ...
-
-class EnvironHeaders(ImmutableHeadersMixin, Headers):
-    environ: WSGIEnvironment
-    def __init__(self, environ: WSGIEnvironment) -> None: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __getitem__(  # type: ignore
-        self, key: str, _get_mode: Literal[False] = False
-    ) -> str: ...
-    def __iter__(self) -> Iterator[tuple[str, str]]: ...  # type: ignore
-    def copy(self) -> NoReturn: ...
diff --git a/libs/werkzeug/datastructures/mixins.py b/libs/werkzeug/datastructures/mixins.py
index 2c84ca8f23..8e00bdadd3 100644
--- a/libs/werkzeug/datastructures/mixins.py
+++ b/libs/werkzeug/datastructures/mixins.py
@@ -1,11 +1,22 @@
 from __future__ import annotations
 
+import collections.abc as cabc
+import typing as t
+from functools import update_wrapper
 from itertools import repeat
 
 from .._internal import _missing
 
+if t.TYPE_CHECKING:
+    import typing_extensions as te
 
-def is_immutable(self):
+K = t.TypeVar("K")
+V = t.TypeVar("V")
+T = t.TypeVar("T")
+F = t.TypeVar("F", bound=cabc.Callable[..., t.Any])
+
+
+def _immutable_error(self: t.Any) -> t.NoReturn:
     raise TypeError(f"{type(self).__name__!r} objects are immutable")
 
 
@@ -17,102 +28,118 @@ class ImmutableListMixin:
     :private:
     """
 
-    _hash_cache = None
+    _hash_cache: int | None = None
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         if self._hash_cache is not None:
             return self._hash_cache
-        rv = self._hash_cache = hash(tuple(self))
+        rv = self._hash_cache = hash(tuple(self))  # type: ignore[arg-type]
         return rv
 
-    def __reduce_ex__(self, protocol):
-        return type(self), (list(self),)
+    def __reduce_ex__(self, protocol: t.SupportsIndex) -> t.Any:
+        return type(self), (list(self),)  # type: ignore[call-overload]
 
-    def __delitem__(self, key):
-        is_immutable(self)
+    def __delitem__(self, key: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def __iadd__(self, other):
-        is_immutable(self)
+    def __iadd__(self, other: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def __imul__(self, other):
-        is_immutable(self)
+    def __imul__(self, other: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def __setitem__(self, key, value):
-        is_immutable(self)
+    def __setitem__(self, key: t.Any, value: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def append(self, item):
-        is_immutable(self)
+    def append(self, item: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def remove(self, item):
-        is_immutable(self)
+    def remove(self, item: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def extend(self, iterable):
-        is_immutable(self)
+    def extend(self, iterable: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def insert(self, pos, value):
-        is_immutable(self)
+    def insert(self, pos: t.Any, value: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def pop(self, index=-1):
-        is_immutable(self)
+    def pop(self, index: t.Any = -1) -> t.NoReturn:
+        _immutable_error(self)
 
-    def reverse(self):
-        is_immutable(self)
+    def reverse(self: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def sort(self, key=None, reverse=False):
-        is_immutable(self)
+    def sort(self, key: t.Any = None, reverse: t.Any = False) -> t.NoReturn:
+        _immutable_error(self)
 
 
-class ImmutableDictMixin:
+class ImmutableDictMixin(t.Generic[K, V]):
     """Makes a :class:`dict` immutable.
 
+    .. versionchanged:: 3.1
+        Disallow ``|=`` operator.
+
     .. versionadded:: 0.5
 
     :private:
     """
 
-    _hash_cache = None
+    _hash_cache: int | None = None
 
     @classmethod
-    def fromkeys(cls, keys, value=None):
+    @t.overload
+    def fromkeys(
+        cls, keys: cabc.Iterable[K], value: None
+    ) -> ImmutableDictMixin[K, t.Any | None]: ...
+    @classmethod
+    @t.overload
+    def fromkeys(cls, keys: cabc.Iterable[K], value: V) -> ImmutableDictMixin[K, V]: ...
+    @classmethod
+    def fromkeys(
+        cls, keys: cabc.Iterable[K], value: V | None = None
+    ) -> ImmutableDictMixin[K, t.Any | None] | ImmutableDictMixin[K, V]:
         instance = super().__new__(cls)
-        instance.__init__(zip(keys, repeat(value)))
+        instance.__init__(zip(keys, repeat(value)))  # type: ignore[misc]
         return instance
 
-    def __reduce_ex__(self, protocol):
-        return type(self), (dict(self),)
+    def __reduce_ex__(self, protocol: t.SupportsIndex) -> t.Any:
+        return type(self), (dict(self),)  # type: ignore[call-overload]
 
-    def _iter_hashitems(self):
-        return self.items()
+    def _iter_hashitems(self) -> t.Iterable[t.Any]:
+        return self.items()  # type: ignore[attr-defined,no-any-return]
 
-    def __hash__(self):
+    def __hash__(self) -> int:
         if self._hash_cache is not None:
             return self._hash_cache
         rv = self._hash_cache = hash(frozenset(self._iter_hashitems()))
         return rv
 
-    def setdefault(self, key, default=None):
-        is_immutable(self)
+    def setdefault(self, key: t.Any, default: t.Any = None) -> t.NoReturn:
+        _immutable_error(self)
+
+    def update(self, arg: t.Any, /, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def update(self, *args, **kwargs):
-        is_immutable(self)
+    def __ior__(self, other: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def pop(self, key, default=None):
-        is_immutable(self)
+    def pop(self, key: t.Any, default: t.Any = None) -> t.NoReturn:
+        _immutable_error(self)
 
-    def popitem(self):
-        is_immutable(self)
+    def popitem(self) -> t.NoReturn:
+        _immutable_error(self)
 
-    def __setitem__(self, key, value):
-        is_immutable(self)
+    def __setitem__(self, key: t.Any, value: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def __delitem__(self, key):
-        is_immutable(self)
+    def __delitem__(self, key: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def clear(self):
-        is_immutable(self)
+    def clear(self) -> t.NoReturn:
+        _immutable_error(self)
 
 
-class ImmutableMultiDictMixin(ImmutableDictMixin):
+class ImmutableMultiDictMixin(ImmutableDictMixin[K, V]):
     """Makes a :class:`MultiDict` immutable.
 
     .. versionadded:: 0.5
@@ -120,26 +147,26 @@ class ImmutableMultiDictMixin(ImmutableDictMixin):
     :private:
     """
 
-    def __reduce_ex__(self, protocol):
-        return type(self), (list(self.items(multi=True)),)
+    def __reduce_ex__(self, protocol: t.SupportsIndex) -> t.Any:
+        return type(self), (list(self.items(multi=True)),)  # type: ignore[attr-defined]
 
-    def _iter_hashitems(self):
-        return self.items(multi=True)
+    def _iter_hashitems(self) -> t.Iterable[t.Any]:
+        return self.items(multi=True)  # type: ignore[attr-defined,no-any-return]
 
-    def add(self, key, value):
-        is_immutable(self)
+    def add(self, key: t.Any, value: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def popitemlist(self):
-        is_immutable(self)
+    def popitemlist(self) -> t.NoReturn:
+        _immutable_error(self)
 
-    def poplist(self, key):
-        is_immutable(self)
+    def poplist(self, key: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def setlist(self, key, new_list):
-        is_immutable(self)
+    def setlist(self, key: t.Any, new_list: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def setlistdefault(self, key, default_list=None):
-        is_immutable(self)
+    def setlistdefault(self, key: t.Any, default_list: t.Any = None) -> t.NoReturn:
+        _immutable_error(self)
 
 
 class ImmutableHeadersMixin:
@@ -147,96 +174,144 @@ class ImmutableHeadersMixin:
     hashable though since the only usecase for this datastructure
     in Werkzeug is a view on a mutable structure.
 
+    .. versionchanged:: 3.1
+        Disallow ``|=`` operator.
+
     .. versionadded:: 0.5
 
     :private:
     """
 
-    def __delitem__(self, key, **kwargs):
-        is_immutable(self)
+    def __delitem__(self, key: t.Any, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
+
+    def __setitem__(self, key: t.Any, value: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def __setitem__(self, key, value):
-        is_immutable(self)
+    def set(self, key: t.Any, value: t.Any, /, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def set(self, _key, _value, **kwargs):
-        is_immutable(self)
+    def setlist(self, key: t.Any, values: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def setlist(self, key, values):
-        is_immutable(self)
+    def add(self, key: t.Any, value: t.Any, /, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def add(self, _key, _value, **kwargs):
-        is_immutable(self)
+    def add_header(self, key: t.Any, value: t.Any, /, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def add_header(self, _key, _value, **_kwargs):
-        is_immutable(self)
+    def remove(self, key: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def remove(self, key):
-        is_immutable(self)
+    def extend(self, arg: t.Any, /, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def extend(self, *args, **kwargs):
-        is_immutable(self)
+    def update(self, arg: t.Any, /, **kwargs: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def update(self, *args, **kwargs):
-        is_immutable(self)
+    def __ior__(self, other: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def insert(self, pos, value):
-        is_immutable(self)
+    def insert(self, pos: t.Any, value: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def pop(self, key=None, default=_missing):
-        is_immutable(self)
+    def pop(self, key: t.Any = None, default: t.Any = _missing) -> t.NoReturn:
+        _immutable_error(self)
 
-    def popitem(self):
-        is_immutable(self)
+    def popitem(self) -> t.NoReturn:
+        _immutable_error(self)
 
-    def setdefault(self, key, default):
-        is_immutable(self)
+    def setdefault(self, key: t.Any, default: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
-    def setlistdefault(self, key, default):
-        is_immutable(self)
+    def setlistdefault(self, key: t.Any, default: t.Any) -> t.NoReturn:
+        _immutable_error(self)
 
 
-def _calls_update(name):
-    def oncall(self, *args, **kw):
-        rv = getattr(super(UpdateDictMixin, self), name)(*args, **kw)
+def _always_update(f: F) -> F:
+    def wrapper(
+        self: UpdateDictMixin[t.Any, t.Any], /, *args: t.Any, **kwargs: t.Any
+    ) -> t.Any:
+        rv = f(self, *args, **kwargs)
 
         if self.on_update is not None:
             self.on_update(self)
 
         return rv
 
-    oncall.__name__ = name
-    return oncall
+    return update_wrapper(wrapper, f)  # type: ignore[return-value]
 
 
-class UpdateDictMixin(dict):
+class UpdateDictMixin(dict[K, V]):
     """Makes dicts call `self.on_update` on modifications.
 
+    .. versionchanged:: 3.1
+        Implement ``|=`` operator.
+
     .. versionadded:: 0.5
 
     :private:
     """
 
-    on_update = None
+    on_update: cabc.Callable[[te.Self], None] | None = None
 
-    def setdefault(self, key, default=None):
+    def setdefault(self: te.Self, key: K, default: V | None = None) -> V:
         modified = key not in self
-        rv = super().setdefault(key, default)
+        rv = super().setdefault(key, default)  # type: ignore[arg-type]
         if modified and self.on_update is not None:
             self.on_update(self)
         return rv
 
-    def pop(self, key, default=_missing):
+    @t.overload
+    def pop(self: te.Self, key: K) -> V: ...
+    @t.overload
+    def pop(self: te.Self, key: K, default: V) -> V: ...
+    @t.overload
+    def pop(self: te.Self, key: K, default: T) -> T: ...
+    def pop(
+        self: te.Self,
+        key: K,
+        default: V | T = _missing,  # type: ignore[assignment]
+    ) -> V | T:
         modified = key in self
         if default is _missing:
-            rv = super().pop(key)
+            rv: V | T = super().pop(key)
         else:
             rv = super().pop(key, default)
         if modified and self.on_update is not None:
             self.on_update(self)
         return rv
 
-    __setitem__ = _calls_update("__setitem__")
-    __delitem__ = _calls_update("__delitem__")
-    clear = _calls_update("clear")
-    popitem = _calls_update("popitem")
-    update = _calls_update("update")
+    @_always_update
+    def __setitem__(self, key: K, value: V) -> None:
+        super().__setitem__(key, value)
+
+    @_always_update
+    def __delitem__(self, key: K) -> None:
+        super().__delitem__(key)
+
+    @_always_update
+    def clear(self) -> None:
+        super().clear()
+
+    @_always_update
+    def popitem(self) -> tuple[K, V]:
+        return super().popitem()
+
+    @_always_update
+    def update(  # type: ignore[override]
+        self,
+        arg: cabc.Mapping[K, V] | cabc.Iterable[tuple[K, V]] | None = None,
+        /,
+        **kwargs: V,
+    ) -> None:
+        if arg is None:
+            super().update(**kwargs)  # type: ignore[call-overload]
+        else:
+            super().update(arg, **kwargs)
+
+    @_always_update
+    def __ior__(  # type: ignore[override]
+        self, other: cabc.Mapping[K, V] | cabc.Iterable[tuple[K, V]]
+    ) -> te.Self:
+        return super().__ior__(other)
diff --git a/libs/werkzeug/datastructures/mixins.pyi b/libs/werkzeug/datastructures/mixins.pyi
deleted file mode 100644
index 40453f703d..0000000000
--- a/libs/werkzeug/datastructures/mixins.pyi
+++ /dev/null
@@ -1,97 +0,0 @@
-from collections.abc import Callable
-from collections.abc import Hashable
-from collections.abc import Iterable
-from typing import Any
-from typing import NoReturn
-from typing import overload
-from typing import SupportsIndex
-from typing import TypeVar
-
-from _typeshed import SupportsKeysAndGetItem
-
-from .headers import Headers
-
-K = TypeVar("K")
-T = TypeVar("T")
-V = TypeVar("V")
-
-def is_immutable(self: object) -> NoReturn: ...
-
-class ImmutableListMixin(list[V]):
-    _hash_cache: int | None
-    def __hash__(self) -> int: ...  # type: ignore
-    def __delitem__(self, key: SupportsIndex | slice) -> NoReturn: ...
-    def __iadd__(self, other: Any) -> NoReturn: ...  # type: ignore
-    def __imul__(self, other: SupportsIndex) -> NoReturn: ...
-    def __setitem__(self, key: int | slice, value: V) -> NoReturn: ...  # type: ignore
-    def append(self, value: V) -> NoReturn: ...
-    def remove(self, value: V) -> NoReturn: ...
-    def extend(self, values: Iterable[V]) -> NoReturn: ...
-    def insert(self, pos: SupportsIndex, value: V) -> NoReturn: ...
-    def pop(self, index: SupportsIndex = -1) -> NoReturn: ...
-    def reverse(self) -> NoReturn: ...
-    def sort(
-        self, key: Callable[[V], Any] | None = None, reverse: bool = False
-    ) -> NoReturn: ...
-
-class ImmutableDictMixin(dict[K, V]):
-    _hash_cache: int | None
-    @classmethod
-    def fromkeys(  # type: ignore
-        cls, keys: Iterable[K], value: V | None = None
-    ) -> ImmutableDictMixin[K, V]: ...
-    def _iter_hashitems(self) -> Iterable[Hashable]: ...
-    def __hash__(self) -> int: ...  # type: ignore
-    def setdefault(self, key: K, default: V | None = None) -> NoReturn: ...
-    def update(self, *args: Any, **kwargs: V) -> NoReturn: ...
-    def pop(self, key: K, default: V | None = None) -> NoReturn: ...  # type: ignore
-    def popitem(self) -> NoReturn: ...
-    def __setitem__(self, key: K, value: V) -> NoReturn: ...
-    def __delitem__(self, key: K) -> NoReturn: ...
-    def clear(self) -> NoReturn: ...
-
-class ImmutableMultiDictMixin(ImmutableDictMixin[K, V]):
-    def _iter_hashitems(self) -> Iterable[Hashable]: ...
-    def add(self, key: K, value: V) -> NoReturn: ...
-    def popitemlist(self) -> NoReturn: ...
-    def poplist(self, key: K) -> NoReturn: ...
-    def setlist(self, key: K, new_list: Iterable[V]) -> NoReturn: ...
-    def setlistdefault(
-        self, key: K, default_list: Iterable[V] | None = None
-    ) -> NoReturn: ...
-
-class ImmutableHeadersMixin(Headers):
-    def __delitem__(self, key: Any, _index_operation: bool = True) -> NoReturn: ...
-    def __setitem__(self, key: Any, value: Any) -> NoReturn: ...
-    def set(self, _key: Any, _value: Any, **kw: Any) -> NoReturn: ...
-    def setlist(self, key: Any, values: Any) -> NoReturn: ...
-    def add(self, _key: Any, _value: Any, **kw: Any) -> NoReturn: ...
-    def add_header(self, _key: Any, _value: Any, **_kw: Any) -> NoReturn: ...
-    def remove(self, key: Any) -> NoReturn: ...
-    def extend(self, *args: Any, **kwargs: Any) -> NoReturn: ...
-    def update(self, *args: Any, **kwargs: Any) -> NoReturn: ...
-    def insert(self, pos: Any, value: Any) -> NoReturn: ...
-    def pop(self, key: Any = None, default: Any = ...) -> NoReturn: ...
-    def popitem(self) -> NoReturn: ...
-    def setdefault(self, key: Any, default: Any) -> NoReturn: ...
-    def setlistdefault(self, key: Any, default: Any) -> NoReturn: ...
-
-def _calls_update(name: str) -> Callable[[UpdateDictMixin[K, V]], Any]: ...
-
-class UpdateDictMixin(dict[K, V]):
-    on_update: Callable[[UpdateDictMixin[K, V] | None, None], None]
-    def setdefault(self, key: K, default: V | None = None) -> V: ...
-    @overload
-    def pop(self, key: K) -> V: ...
-    @overload
-    def pop(self, key: K, default: V | T = ...) -> V | T: ...
-    def __setitem__(self, key: K, value: V) -> None: ...
-    def __delitem__(self, key: K) -> None: ...
-    def clear(self) -> None: ...
-    def popitem(self) -> tuple[K, V]: ...
-    @overload
-    def update(self, __m: SupportsKeysAndGetItem[K, V], **kwargs: V) -> None: ...
-    @overload
-    def update(self, __m: Iterable[tuple[K, V]], **kwargs: V) -> None: ...
-    @overload
-    def update(self, **kwargs: V) -> None: ...
diff --git a/libs/werkzeug/datastructures/range.py b/libs/werkzeug/datastructures/range.py
index 7011ea4ae3..72f863d2c9 100644
--- a/libs/werkzeug/datastructures/range.py
+++ b/libs/werkzeug/datastructures/range.py
@@ -1,5 +1,14 @@
 from __future__ import annotations
 
+import collections.abc as cabc
+import typing as t
+from datetime import datetime
+
+if t.TYPE_CHECKING:
+    import typing_extensions as te
+
+T = t.TypeVar("T")
+
 
 class IfRange:
     """Very simple object that represents the `If-Range` header in parsed
@@ -9,14 +18,14 @@ class IfRange:
     .. versionadded:: 0.7
     """
 
-    def __init__(self, etag=None, date=None):
+    def __init__(self, etag: str | None = None, date: datetime | None = None):
         #: The etag parsed and unquoted.  Ranges always operate on strong
         #: etags so the weakness information is not necessary.
         self.etag = etag
         #: The date in parsed format or `None`.
         self.date = date
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Converts the object back into an HTTP header."""
         if self.date is not None:
             return http.http_date(self.date)
@@ -24,10 +33,10 @@ def to_header(self):
             return http.quote_etag(self.etag)
         return ""
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{type(self).__name__} {str(self)!r}>"
 
 
@@ -44,7 +53,9 @@ class Range:
     .. versionadded:: 0.7
     """
 
-    def __init__(self, units, ranges):
+    def __init__(
+        self, units: str, ranges: cabc.Sequence[tuple[int, int | None]]
+    ) -> None:
         #: The units of this range.  Usually "bytes".
         self.units = units
         #: A list of ``(begin, end)`` tuples for the range header provided.
@@ -55,7 +66,7 @@ def __init__(self, units, ranges):
             if start is None or (end is not None and (start < 0 or start >= end)):
                 raise ValueError(f"{(start, end)} is not a valid range.")
 
-    def range_for_length(self, length):
+    def range_for_length(self, length: int | None) -> tuple[int, int] | None:
         """If the range is for bytes, the length is not None and there is
         exactly one range and it is satisfiable it returns a ``(start, stop)``
         tuple, otherwise `None`.
@@ -71,7 +82,7 @@ def range_for_length(self, length):
             return start, min(end, length)
         return None
 
-    def make_content_range(self, length):
+    def make_content_range(self, length: int | None) -> ContentRange | None:
         """Creates a :class:`~werkzeug.datastructures.ContentRange` object
         from the current range and given content length.
         """
@@ -80,7 +91,7 @@ def make_content_range(self, length):
             return ContentRange(self.units, rng[0], rng[1], length)
         return None
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Converts the object back into an HTTP header."""
         ranges = []
         for begin, end in self.ranges:
@@ -90,7 +101,7 @@ def to_header(self):
                 ranges.append(f"{begin}-{end - 1}")
         return f"{self.units}={','.join(ranges)}"
 
-    def to_content_range_header(self, length):
+    def to_content_range_header(self, length: int | None) -> str | None:
         """Converts the object into `Content-Range` HTTP header,
         based on given length
         """
@@ -99,23 +110,34 @@ def to_content_range_header(self, length):
             return f"{self.units} {range[0]}-{range[1] - 1}/{length}"
         return None
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{type(self).__name__} {str(self)!r}>"
 
 
-def _callback_property(name):
-    def fget(self):
-        return getattr(self, name)
+class _CallbackProperty(t.Generic[T]):
+    def __set_name__(self, owner: type[ContentRange], name: str) -> None:
+        self.attr = f"_{name}"
 
-    def fset(self, value):
-        setattr(self, name, value)
-        if self.on_update is not None:
-            self.on_update(self)
+    @t.overload
+    def __get__(self, instance: None, owner: None) -> te.Self: ...
+    @t.overload
+    def __get__(self, instance: ContentRange, owner: type[ContentRange]) -> T: ...
+    def __get__(
+        self, instance: ContentRange | None, owner: type[ContentRange] | None
+    ) -> te.Self | T:
+        if instance is None:
+            return self
 
-    return property(fget, fset)
+        return instance.__dict__[self.attr]  # type: ignore[no-any-return]
+
+    def __set__(self, instance: ContentRange, value: T) -> None:
+        instance.__dict__[self.attr] = value
+
+        if instance.on_update is not None:
+            instance.on_update(instance)
 
 
 class ContentRange:
@@ -124,57 +146,69 @@ class ContentRange:
     .. versionadded:: 0.7
     """
 
-    def __init__(self, units, start, stop, length=None, on_update=None):
-        assert http.is_byte_range_valid(start, stop, length), "Bad range provided"
+    def __init__(
+        self,
+        units: str | None,
+        start: int | None,
+        stop: int | None,
+        length: int | None = None,
+        on_update: cabc.Callable[[ContentRange], None] | None = None,
+    ) -> None:
         self.on_update = on_update
         self.set(start, stop, length, units)
 
     #: The units to use, usually "bytes"
-    units = _callback_property("_units")
+    units: str | None = _CallbackProperty()  # type: ignore[assignment]
     #: The start point of the range or `None`.
-    start = _callback_property("_start")
+    start: int | None = _CallbackProperty()  # type: ignore[assignment]
     #: The stop point of the range (non-inclusive) or `None`.  Can only be
     #: `None` if also start is `None`.
-    stop = _callback_property("_stop")
+    stop: int | None = _CallbackProperty()  # type: ignore[assignment]
     #: The length of the range or `None`.
-    length = _callback_property("_length")
-
-    def set(self, start, stop, length=None, units="bytes"):
+    length: int | None = _CallbackProperty()  # type: ignore[assignment]
+
+    def set(
+        self,
+        start: int | None,
+        stop: int | None,
+        length: int | None = None,
+        units: str | None = "bytes",
+    ) -> None:
         """Simple method to update the ranges."""
         assert http.is_byte_range_valid(start, stop, length), "Bad range provided"
-        self._units = units
-        self._start = start
-        self._stop = stop
-        self._length = length
+        self._units: str | None = units
+        self._start: int | None = start
+        self._stop: int | None = stop
+        self._length: int | None = length
         if self.on_update is not None:
             self.on_update(self)
 
-    def unset(self):
+    def unset(self) -> None:
         """Sets the units to `None` which indicates that the header should
         no longer be used.
         """
         self.set(None, None, units=None)
 
-    def to_header(self):
-        if self.units is None:
+    def to_header(self) -> str:
+        if self._units is None:
             return ""
-        if self.length is None:
-            length = "*"
+        if self._length is None:
+            length: str | int = "*"
         else:
-            length = self.length
-        if self.start is None:
-            return f"{self.units} */{length}"
-        return f"{self.units} {self.start}-{self.stop - 1}/{length}"
+            length = self._length
+        if self._start is None:
+            return f"{self._units} */{length}"
+        return f"{self._units} {self._start}-{self._stop - 1}/{length}"  # type: ignore[operator]
 
-    def __bool__(self):
-        return self.units is not None
+    def __bool__(self) -> bool:
+        return self._units is not None
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"<{type(self).__name__} {str(self)!r}>"
 
 
 # circular dependencies
-from .. import http
+from .. import http  # noqa: E402
diff --git a/libs/werkzeug/datastructures/range.pyi b/libs/werkzeug/datastructures/range.pyi
deleted file mode 100644
index f38ad69ef1..0000000000
--- a/libs/werkzeug/datastructures/range.pyi
+++ /dev/null
@@ -1,57 +0,0 @@
-from collections.abc import Callable
-from datetime import datetime
-
-class IfRange:
-    etag: str | None
-    date: datetime | None
-    def __init__(
-        self, etag: str | None = None, date: datetime | None = None
-    ) -> None: ...
-    def to_header(self) -> str: ...
-
-class Range:
-    units: str
-    ranges: list[tuple[int, int | None]]
-    def __init__(self, units: str, ranges: list[tuple[int, int | None]]) -> None: ...
-    def range_for_length(self, length: int | None) -> tuple[int, int] | None: ...
-    def make_content_range(self, length: int | None) -> ContentRange | None: ...
-    def to_header(self) -> str: ...
-    def to_content_range_header(self, length: int | None) -> str | None: ...
-
-def _callback_property(name: str) -> property: ...
-
-class ContentRange:
-    on_update: Callable[[ContentRange], None] | None
-    def __init__(
-        self,
-        units: str | None,
-        start: int | None,
-        stop: int | None,
-        length: int | None = None,
-        on_update: Callable[[ContentRange], None] | None = None,
-    ) -> None: ...
-    @property
-    def units(self) -> str | None: ...
-    @units.setter
-    def units(self, value: str | None) -> None: ...
-    @property
-    def start(self) -> int | None: ...
-    @start.setter
-    def start(self, value: int | None) -> None: ...
-    @property
-    def stop(self) -> int | None: ...
-    @stop.setter
-    def stop(self, value: int | None) -> None: ...
-    @property
-    def length(self) -> int | None: ...
-    @length.setter
-    def length(self, value: int | None) -> None: ...
-    def set(
-        self,
-        start: int | None,
-        stop: int | None,
-        length: int | None = None,
-        units: str | None = "bytes",
-    ) -> None: ...
-    def unset(self) -> None: ...
-    def to_header(self) -> str: ...
diff --git a/libs/werkzeug/datastructures/structures.py b/libs/werkzeug/datastructures/structures.py
index 4279ceb980..8dc6437a69 100644
--- a/libs/werkzeug/datastructures/structures.py
+++ b/libs/werkzeug/datastructures/structures.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from collections.abc import MutableSet
+import collections.abc as cabc
+import typing as t
 from copy import deepcopy
 
 from .. import exceptions
@@ -10,20 +11,29 @@
 from .mixins import ImmutableMultiDictMixin
 from .mixins import UpdateDictMixin
 
+if t.TYPE_CHECKING:
+    import typing_extensions as te
 
-def is_immutable(self):
-    raise TypeError(f"{type(self).__name__!r} objects are immutable")
+K = t.TypeVar("K")
+V = t.TypeVar("V")
+T = t.TypeVar("T")
 
 
-def iter_multi_items(mapping):
+def iter_multi_items(
+    mapping: (
+        MultiDict[K, V]
+        | cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+        | cabc.Iterable[tuple[K, V]]
+    ),
+) -> cabc.Iterator[tuple[K, V]]:
     """Iterates over the items of a mapping yielding keys and values
     without dropping any from more complex structures.
     """
     if isinstance(mapping, MultiDict):
         yield from mapping.items(multi=True)
-    elif isinstance(mapping, dict):
+    elif isinstance(mapping, cabc.Mapping):
         for key, value in mapping.items():
-            if isinstance(value, (tuple, list)):
+            if isinstance(value, (list, tuple, set)):
                 for v in value:
                     yield key, v
             else:
@@ -32,7 +42,7 @@ def iter_multi_items(mapping):
         yield from mapping
 
 
-class ImmutableList(ImmutableListMixin, list):
+class ImmutableList(ImmutableListMixin, list[V]):  # type: ignore[misc]
     """An immutable :class:`list`.
 
     .. versionadded:: 0.5
@@ -40,11 +50,11 @@ class ImmutableList(ImmutableListMixin, list):
     :private:
     """
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{type(self).__name__}({list.__repr__(self)})"
 
 
-class TypeConversionDict(dict):
+class TypeConversionDict(dict[K, V]):
     """Works like a regular dict but the :meth:`get` method can perform
     type conversions.  :class:`MultiDict` and :class:`CombinedMultiDict`
     are subclasses of this class and provide the same feature.
@@ -52,7 +62,22 @@ class TypeConversionDict(dict):
     .. versionadded:: 0.5
     """
 
-    def get(self, key, default=None, type=None):
+    @t.overload  # type: ignore[override]
+    def get(self, key: K) -> V | None: ...
+    @t.overload
+    def get(self, key: K, default: V) -> V: ...
+    @t.overload
+    def get(self, key: K, default: T) -> V | T: ...
+    @t.overload
+    def get(self, key: str, type: cabc.Callable[[V], T]) -> T | None: ...
+    @t.overload
+    def get(self, key: str, default: T, type: cabc.Callable[[V], T]) -> T: ...
+    def get(  # type: ignore[misc]
+        self,
+        key: K,
+        default: V | T | None = None,
+        type: cabc.Callable[[V], T] | None = None,
+    ) -> V | T | None:
         """Return the default value if the requested data doesn't exist.
         If `type` is provided and is a callable it should convert the value,
         return it or raise a :exc:`ValueError` if that is not possible.  In
@@ -81,33 +106,35 @@ def get(self, key, default=None, type=None):
             rv = self[key]
         except KeyError:
             return default
-        if type is not None:
-            try:
-                rv = type(rv)
-            except (ValueError, TypeError):
-                rv = default
-        return rv
 
+        if type is None:
+            return rv
 
-class ImmutableTypeConversionDict(ImmutableDictMixin, TypeConversionDict):
+        try:
+            return type(rv)
+        except (ValueError, TypeError):
+            return default
+
+
+class ImmutableTypeConversionDict(ImmutableDictMixin[K, V], TypeConversionDict[K, V]):  # type: ignore[misc]
     """Works like a :class:`TypeConversionDict` but does not support
     modifications.
 
     .. versionadded:: 0.5
     """
 
-    def copy(self):
+    def copy(self) -> TypeConversionDict[K, V]:
         """Return a shallow mutable copy of this object.  Keep in mind that
         the standard library's :func:`copy` function is a no-op for this class
         like for any other python immutable type (eg: :class:`tuple`).
         """
         return TypeConversionDict(self)
 
-    def __copy__(self):
+    def __copy__(self) -> te.Self:
         return self
 
 
-class MultiDict(TypeConversionDict):
+class MultiDict(TypeConversionDict[K, V]):
     """A :class:`MultiDict` is a dictionary subclass customized to deal with
     multiple values for the same key which is for example used by the parsing
     functions in the wrappers.  This is necessary because some HTML form
@@ -146,42 +173,57 @@ class MultiDict(TypeConversionDict):
     :param mapping: the initial value for the :class:`MultiDict`.  Either a
                     regular dict, an iterable of ``(key, value)`` tuples
                     or `None`.
+
+    .. versionchanged:: 3.1
+        Implement ``|`` and ``|=`` operators.
     """
 
-    def __init__(self, mapping=None):
-        if isinstance(mapping, MultiDict):
-            dict.__init__(self, ((k, vs[:]) for k, vs in mapping.lists()))
-        elif isinstance(mapping, dict):
+    def __init__(
+        self,
+        mapping: (
+            MultiDict[K, V]
+            | cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+            | cabc.Iterable[tuple[K, V]]
+            | None
+        ) = None,
+    ) -> None:
+        if mapping is None:
+            super().__init__()
+        elif isinstance(mapping, MultiDict):
+            super().__init__((k, vs[:]) for k, vs in mapping.lists())  # type: ignore[misc]
+        elif isinstance(mapping, cabc.Mapping):
             tmp = {}
             for key, value in mapping.items():
-                if isinstance(value, (tuple, list)):
-                    if len(value) == 0:
-                        continue
+                if isinstance(value, (list, tuple, set)):
                     value = list(value)
+
+                    if not value:
+                        continue
                 else:
                     value = [value]
                 tmp[key] = value
-            dict.__init__(self, tmp)
+            super().__init__(tmp)  # type: ignore[arg-type]
         else:
             tmp = {}
-            for key, value in mapping or ():
+            for key, value in mapping:
                 tmp.setdefault(key, []).append(value)
-            dict.__init__(self, tmp)
+            super().__init__(tmp)  # type: ignore[arg-type]
 
-    def __getstate__(self):
+    def __getstate__(self) -> t.Any:
         return dict(self.lists())
 
-    def __setstate__(self, value):
-        dict.clear(self)
-        dict.update(self, value)
+    def __setstate__(self, value: t.Any) -> None:
+        super().clear()
+        super().update(value)
 
-    def __iter__(self):
-        # Work around https://bugs.python.org/issue43246.
-        # (`return super().__iter__()` also works here, which makes this look
-        # even more like it should be a no-op, yet it isn't.)
-        return dict.__iter__(self)
+    def __iter__(self) -> cabc.Iterator[K]:
+        # https://github.com/python/cpython/issues/87412
+        # If __iter__ is not overridden, Python uses a fast path for dict(md),
+        # taking the data directly and getting lists of values, rather than
+        # calling __getitem__ and getting only the first value.
+        return super().__iter__()
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: K) -> V:
         """Return the first data value for this key;
         raises KeyError if not found.
 
@@ -190,20 +232,20 @@ def __getitem__(self, key):
         """
 
         if key in self:
-            lst = dict.__getitem__(self, key)
-            if len(lst) > 0:
-                return lst[0]
+            lst = super().__getitem__(key)
+            if len(lst) > 0:  # type: ignore[arg-type]
+                return lst[0]  # type: ignore[index,no-any-return]
         raise exceptions.BadRequestKeyError(key)
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: K, value: V) -> None:
         """Like :meth:`add` but removes an existing key first.
 
         :param key: the key for the value.
         :param value: the value to set.
         """
-        dict.__setitem__(self, key, [value])
+        super().__setitem__(key, [value])  # type: ignore[assignment]
 
-    def add(self, key, value):
+    def add(self, key: K, value: V) -> None:
         """Adds a new value for the key.
 
         .. versionadded:: 0.6
@@ -211,22 +253,30 @@ def add(self, key, value):
         :param key: the key for the value.
         :param value: the value to add.
         """
-        dict.setdefault(self, key, []).append(value)
-
-    def getlist(self, key, type=None):
+        super().setdefault(key, []).append(value)  # type: ignore[arg-type,attr-defined]
+
+    @t.overload
+    def getlist(self, key: K) -> list[V]: ...
+    @t.overload
+    def getlist(self, key: K, type: cabc.Callable[[V], T]) -> list[T]: ...
+    def getlist(
+        self, key: K, type: cabc.Callable[[V], T] | None = None
+    ) -> list[V] | list[T]:
         """Return the list of items for a given key. If that key is not in the
         `MultiDict`, the return value will be an empty list.  Just like `get`,
         `getlist` accepts a `type` parameter.  All items will be converted
         with the callable defined there.
 
         :param key: The key to be looked up.
-        :param type: A callable that is used to cast the value in the
-                     :class:`MultiDict`.  If a :exc:`ValueError` is raised
-                     by this callable the value will be removed from the list.
+        :param type: Callable to convert each value. If a ``ValueError`` or
+            ``TypeError`` is raised, the value is omitted.
         :return: a :class:`list` of all the values for the key.
+
+        .. versionchanged:: 3.1
+            Catches ``TypeError`` in addition to ``ValueError``.
         """
         try:
-            rv = dict.__getitem__(self, key)
+            rv: list[V] = super().__getitem__(key)  # type: ignore[assignment]
         except KeyError:
             return []
         if type is None:
@@ -235,11 +285,11 @@ def getlist(self, key, type=None):
         for item in rv:
             try:
                 result.append(type(item))
-            except ValueError:
+            except (ValueError, TypeError):
                 pass
         return result
 
-    def setlist(self, key, new_list):
+    def setlist(self, key: K, new_list: cabc.Iterable[V]) -> None:
         """Remove the old values for a key and add new ones.  Note that the list
         you pass the values in will be shallow-copied before it is inserted in
         the dictionary.
@@ -255,9 +305,13 @@ def setlist(self, key, new_list):
         :param new_list: An iterable with the new values for the key.  Old values
                          are removed first.
         """
-        dict.__setitem__(self, key, list(new_list))
+        super().__setitem__(key, list(new_list))  # type: ignore[assignment]
 
-    def setdefault(self, key, default=None):
+    @t.overload
+    def setdefault(self, key: K) -> None: ...
+    @t.overload
+    def setdefault(self, key: K, default: V) -> V: ...
+    def setdefault(self, key: K, default: V | None = None) -> V | None:
         """Returns the value for the key if it is in the dict, otherwise it
         returns `default` and sets that value for `key`.
 
@@ -266,12 +320,13 @@ def setdefault(self, key, default=None):
                         in the dict.  If not further specified it's `None`.
         """
         if key not in self:
-            self[key] = default
-        else:
-            default = self[key]
-        return default
+            self[key] = default  # type: ignore[assignment]
+
+        return self[key]
 
-    def setlistdefault(self, key, default_list=None):
+    def setlistdefault(
+        self, key: K, default_list: cabc.Iterable[V] | None = None
+    ) -> list[V]:
         """Like `setdefault` but sets multiple values.  The list returned
         is not a copy, but the list that is actually used internally.  This
         means that you can put new values into the dict by appending items
@@ -289,38 +344,42 @@ def setlistdefault(self, key, default_list=None):
         :return: a :class:`list`
         """
         if key not in self:
-            default_list = list(default_list or ())
-            dict.__setitem__(self, key, default_list)
-        else:
-            default_list = dict.__getitem__(self, key)
-        return default_list
+            super().__setitem__(key, list(default_list or ()))  # type: ignore[assignment]
+
+        return super().__getitem__(key)  # type: ignore[return-value]
 
-    def items(self, multi=False):
+    def items(self, multi: bool = False) -> cabc.Iterable[tuple[K, V]]:  # type: ignore[override]
         """Return an iterator of ``(key, value)`` pairs.
 
         :param multi: If set to `True` the iterator returned will have a pair
                       for each value of each key.  Otherwise it will only
                       contain pairs for the first value of each key.
         """
-        for key, values in dict.items(self):
+        values: list[V]
+
+        for key, values in super().items():  # type: ignore[assignment]
             if multi:
                 for value in values:
                     yield key, value
             else:
                 yield key, values[0]
 
-    def lists(self):
+    def lists(self) -> cabc.Iterable[tuple[K, list[V]]]:
         """Return a iterator of ``(key, values)`` pairs, where values is the list
         of all values associated with the key."""
-        for key, values in dict.items(self):
+        values: list[V]
+
+        for key, values in super().items():  # type: ignore[assignment]
             yield key, list(values)
 
-    def values(self):
+    def values(self) -> cabc.Iterable[V]:  # type: ignore[override]
         """Returns an iterator of the first value on every key's value list."""
-        for values in dict.values(self):
+        values: list[V]
+
+        for values in super().values():  # type: ignore[assignment]
             yield values[0]
 
-    def listvalues(self):
+    def listvalues(self) -> cabc.Iterable[list[V]]:
         """Return an iterator of all values associated with a key.  Zipping
         :meth:`keys` and this is the same as calling :meth:`lists`:
 
@@ -328,17 +387,21 @@ def listvalues(self):
         >>> zip(d.keys(), d.listvalues()) == d.lists()
         True
         """
-        return dict.values(self)
+        return super().values()  # type: ignore[return-value]
 
-    def copy(self):
+    def copy(self) -> te.Self:
         """Return a shallow copy of this object."""
         return self.__class__(self)
 
-    def deepcopy(self, memo=None):
+    def deepcopy(self, memo: t.Any = None) -> te.Self:
         """Return a deep copy of this object."""
         return self.__class__(deepcopy(self.to_dict(flat=False), memo))
 
-    def to_dict(self, flat=True):
+    @t.overload
+    def to_dict(self, flat: t.Literal[True] = ...) -> dict[K, V]: ...
+    @t.overload
+    def to_dict(self, flat: t.Literal[False]) -> dict[K, list[V]]: ...
+    def to_dict(self, flat: bool = True) -> dict[K, V] | dict[K, list[V]]:
         """Return the contents as regular dict.  If `flat` is `True` the
         returned dict will only have the first item present, if `flat` is
         `False` all values will be returned as lists.
@@ -352,7 +415,14 @@ def to_dict(self, flat=True):
             return dict(self.items())
         return dict(self.lists())
 
-    def update(self, mapping):
+    def update(  # type: ignore[override]
+        self,
+        mapping: (
+            MultiDict[K, V]
+            | cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+            | cabc.Iterable[tuple[K, V]]
+        ),
+    ) -> None:
         """update() extends rather than replaces existing key lists:
 
         >>> a = MultiDict({'x': 1})
@@ -371,9 +441,42 @@ def update(self, mapping):
         MultiDict([])
         """
         for key, value in iter_multi_items(mapping):
-            MultiDict.add(self, key, value)
+            self.add(key, value)
+
+    def __or__(  # type: ignore[override]
+        self, other: cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+    ) -> MultiDict[K, V]:
+        if not isinstance(other, cabc.Mapping):
+            return NotImplemented
+
+        rv = self.copy()
+        rv.update(other)
+        return rv
+
+    def __ior__(  # type: ignore[override]
+        self,
+        other: (
+            cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+            | cabc.Iterable[tuple[K, V]]
+        ),
+    ) -> te.Self:
+        if not isinstance(other, (cabc.Mapping, cabc.Iterable)):
+            return NotImplemented
+
+        self.update(other)
+        return self
 
-    def pop(self, key, default=_missing):
+    @t.overload
+    def pop(self, key: K) -> V: ...
+    @t.overload
+    def pop(self, key: K, default: V) -> V: ...
+    @t.overload
+    def pop(self, key: K, default: T) -> V | T: ...
+    def pop(
+        self,
+        key: K,
+        default: V | T = _missing,  # type: ignore[assignment]
+    ) -> V | T:
         """Pop the first item for a list on the dict.  Afterwards the
         key is removed from the dict, so additional values are discarded:
 
@@ -387,8 +490,10 @@ def pop(self, key, default=_missing):
         :param default: if provided the value to return if the key was
                         not in the dictionary.
         """
+        lst: list[V]
+
         try:
-            lst = dict.pop(self, key)
+            lst = super().pop(key)  # type: ignore[assignment]
 
             if len(lst) == 0:
                 raise exceptions.BadRequestKeyError(key)
@@ -400,19 +505,21 @@ def pop(self, key, default=_missing):
 
             raise exceptions.BadRequestKeyError(key) from None
 
-    def popitem(self):
+    def popitem(self) -> tuple[K, V]:
         """Pop an item from the dict."""
+        item: tuple[K, list[V]]
+
         try:
-            item = dict.popitem(self)
+            item = super().popitem()  # type: ignore[assignment]
 
             if len(item[1]) == 0:
                 raise exceptions.BadRequestKeyError(item[0])
 
-            return (item[0], item[1][0])
+            return item[0], item[1][0]
         except KeyError as e:
             raise exceptions.BadRequestKeyError(e.args[0]) from None
 
-    def poplist(self, key):
+    def poplist(self, key: K) -> list[V]:
         """Pop the list for a key from the dict.  If the key is not in the dict
         an empty list is returned.
 
@@ -420,26 +527,26 @@ def poplist(self, key):
            If the key does no longer exist a list is returned instead of
            raising an error.
         """
-        return dict.pop(self, key, [])
+        return super().pop(key, [])  # type: ignore[return-value]
 
-    def popitemlist(self):
+    def popitemlist(self) -> tuple[K, list[V]]:
         """Pop a ``(key, list)`` tuple from the dict."""
         try:
-            return dict.popitem(self)
+            return super().popitem()  # type: ignore[return-value]
         except KeyError as e:
             raise exceptions.BadRequestKeyError(e.args[0]) from None
 
-    def __copy__(self):
+    def __copy__(self) -> te.Self:
         return self.copy()
 
-    def __deepcopy__(self, memo):
+    def __deepcopy__(self, memo: t.Any) -> te.Self:
         return self.deepcopy(memo=memo)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{type(self).__name__}({list(self.items(multi=True))!r})"
 
 
-class _omd_bucket:
+class _omd_bucket(t.Generic[K, V]):
     """Wraps values in the :class:`OrderedMultiDict`.  This makes it
     possible to keep an order over multiple different keys.  It requires
     a lot of extra memory and slows down access a lot, but makes it
@@ -448,11 +555,11 @@ class _omd_bucket:
 
     __slots__ = ("prev", "key", "value", "next")
 
-    def __init__(self, omd, key, value):
-        self.prev = omd._last_bucket
-        self.key = key
-        self.value = value
-        self.next = None
+    def __init__(self, omd: _OrderedMultiDict[K, V], key: K, value: V) -> None:
+        self.prev: _omd_bucket[K, V] | None = omd._last_bucket
+        self.key: K = key
+        self.value: V = value
+        self.next: _omd_bucket[K, V] | None = None
 
         if omd._first_bucket is None:
             omd._first_bucket = self
@@ -460,7 +567,7 @@ def __init__(self, omd, key, value):
             omd._last_bucket.next = self
         omd._last_bucket = self
 
-    def unlink(self, omd):
+    def unlink(self, omd: _OrderedMultiDict[K, V]) -> None:
         if self.prev:
             self.prev.next = self.next
         if self.next:
@@ -471,7 +578,7 @@ def unlink(self, omd):
             omd._last_bucket = self.prev
 
 
-class OrderedMultiDict(MultiDict):
+class _OrderedMultiDict(MultiDict[K, V]):
     """Works like a regular :class:`MultiDict` but preserves the
     order of the fields.  To convert the ordered multi dict into a
     list you can use the :meth:`items` method and pass it ``multi=True``.
@@ -485,18 +592,38 @@ class OrderedMultiDict(MultiDict):
        multi dict into a regular dict by using ``dict(multidict)``.
        Instead you have to use the :meth:`to_dict` method, otherwise
        the internal bucket objects are exposed.
+
+    .. deprecated:: 3.1
+        Will be removed in Werkzeug 3.2. Use ``MultiDict`` instead.
     """
 
-    def __init__(self, mapping=None):
-        dict.__init__(self)
-        self._first_bucket = self._last_bucket = None
+    def __init__(
+        self,
+        mapping: (
+            MultiDict[K, V]
+            | cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+            | cabc.Iterable[tuple[K, V]]
+            | None
+        ) = None,
+    ) -> None:
+        import warnings
+
+        warnings.warn(
+            "'OrderedMultiDict' is deprecated and will be removed in Werkzeug"
+            " 3.2. Use 'MultiDict' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        super().__init__()
+        self._first_bucket: _omd_bucket[K, V] | None = None
+        self._last_bucket: _omd_bucket[K, V] | None = None
         if mapping is not None:
-            OrderedMultiDict.update(self, mapping)
+            self.update(mapping)
 
-    def __eq__(self, other):
+    def __eq__(self, other: object) -> bool:
         if not isinstance(other, MultiDict):
             return NotImplemented
-        if isinstance(other, OrderedMultiDict):
+        if isinstance(other, _OrderedMultiDict):
             iter1 = iter(self.items(multi=True))
             iter2 = iter(other.items(multi=True))
             try:
@@ -518,41 +645,42 @@ def __eq__(self, other):
                 return False
         return True
 
-    __hash__ = None
+    __hash__ = None  # type: ignore[assignment]
 
-    def __reduce_ex__(self, protocol):
+    def __reduce_ex__(self, protocol: t.SupportsIndex) -> t.Any:
         return type(self), (list(self.items(multi=True)),)
 
-    def __getstate__(self):
+    def __getstate__(self) -> t.Any:
         return list(self.items(multi=True))
 
-    def __setstate__(self, values):
-        dict.clear(self)
+    def __setstate__(self, values: t.Any) -> None:
+        self.clear()
+
         for key, value in values:
             self.add(key, value)
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: K) -> V:
         if key in self:
-            return dict.__getitem__(self, key)[0].value
+            return dict.__getitem__(self, key)[0].value  # type: ignore[index,no-any-return]
         raise exceptions.BadRequestKeyError(key)
 
-    def __setitem__(self, key, value):
+    def __setitem__(self, key: K, value: V) -> None:
         self.poplist(key)
         self.add(key, value)
 
-    def __delitem__(self, key):
+    def __delitem__(self, key: K) -> None:
         self.pop(key)
 
-    def keys(self):
-        return (key for key, value in self.items())
+    def keys(self) -> cabc.Iterable[K]:  # type: ignore[override]
+        return (key for key, _ in self.items())
 
-    def __iter__(self):
+    def __iter__(self) -> cabc.Iterator[K]:
         return iter(self.keys())
 
-    def values(self):
+    def values(self) -> cabc.Iterable[V]:  # type: ignore[override]
         return (value for key, value in self.items())
 
-    def items(self, multi=False):
+    def items(self, multi: bool = False) -> cabc.Iterable[tuple[K, V]]:  # type: ignore[override]
         ptr = self._first_bucket
         if multi:
             while ptr is not None:
@@ -566,7 +694,7 @@ def items(self, multi=False):
                     yield ptr.key, ptr.value
                 ptr = ptr.next
 
-    def lists(self):
+    def lists(self) -> cabc.Iterable[tuple[K, list[V]]]:
         returned_keys = set()
         ptr = self._first_bucket
         while ptr is not None:
@@ -575,16 +703,24 @@ def lists(self):
                 returned_keys.add(ptr.key)
             ptr = ptr.next
 
-    def listvalues(self):
+    def listvalues(self) -> cabc.Iterable[list[V]]:
         for _key, values in self.lists():
             yield values
 
-    def add(self, key, value):
-        dict.setdefault(self, key, []).append(_omd_bucket(self, key, value))
+    def add(self, key: K, value: V) -> None:
+        dict.setdefault(self, key, []).append(_omd_bucket(self, key, value))  # type: ignore[misc]
+
+    @t.overload
+    def getlist(self, key: K) -> list[V]: ...
+    @t.overload
+    def getlist(self, key: K, type: cabc.Callable[[V], T]) -> list[T]: ...
+    def getlist(
+        self, key: K, type: cabc.Callable[[V], T] | None = None
+    ) -> list[V] | list[T]:
+        rv: list[_omd_bucket[K, V]]
 
-    def getlist(self, key, type=None):
         try:
-            rv = dict.__getitem__(self, key)
+            rv = dict.__getitem__(self, key)  # type: ignore[index]
         except KeyError:
             return []
         if type is None:
@@ -593,31 +729,50 @@ def getlist(self, key, type=None):
         for item in rv:
             try:
                 result.append(type(item.value))
-            except ValueError:
+            except (ValueError, TypeError):
                 pass
         return result
 
-    def setlist(self, key, new_list):
+    def setlist(self, key: K, new_list: cabc.Iterable[V]) -> None:
         self.poplist(key)
         for value in new_list:
             self.add(key, value)
 
-    def setlistdefault(self, key, default_list=None):
+    def setlistdefault(self, key: t.Any, default_list: t.Any = None) -> t.NoReturn:
         raise TypeError("setlistdefault is unsupported for ordered multi dicts")
 
-    def update(self, mapping):
+    def update(  # type: ignore[override]
+        self,
+        mapping: (
+            MultiDict[K, V]
+            | cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+            | cabc.Iterable[tuple[K, V]]
+        ),
+    ) -> None:
         for key, value in iter_multi_items(mapping):
-            OrderedMultiDict.add(self, key, value)
+            self.add(key, value)
 
-    def poplist(self, key):
-        buckets = dict.pop(self, key, ())
+    def poplist(self, key: K) -> list[V]:
+        buckets: cabc.Iterable[_omd_bucket[K, V]] = dict.pop(self, key, ())  # type: ignore[arg-type]
         for bucket in buckets:
             bucket.unlink(self)
         return [x.value for x in buckets]
 
-    def pop(self, key, default=_missing):
+    @t.overload
+    def pop(self, key: K) -> V: ...
+    @t.overload
+    def pop(self, key: K, default: V) -> V: ...
+    @t.overload
+    def pop(self, key: K, default: T) -> V | T: ...
+    def pop(
+        self,
+        key: K,
+        default: V | T = _missing,  # type: ignore[assignment]
+    ) -> V | T:
+        buckets: list[_omd_bucket[K, V]]
+
         try:
-            buckets = dict.pop(self, key)
+            buckets = dict.pop(self, key)  # type: ignore[arg-type]
         except KeyError:
             if default is not _missing:
                 return default
@@ -629,9 +784,12 @@ def pop(self, key, default=_missing):
 
         return buckets[0].value
 
-    def popitem(self):
+    def popitem(self) -> tuple[K, V]:
+        key: K
+        buckets: list[_omd_bucket[K, V]]
+
         try:
-            key, buckets = dict.popitem(self)
+            key, buckets = dict.popitem(self)  # type: ignore[arg-type]
         except KeyError as e:
             raise exceptions.BadRequestKeyError(e.args[0]) from None
 
@@ -640,9 +798,12 @@ def popitem(self):
 
         return key, buckets[0].value
 
-    def popitemlist(self):
+    def popitemlist(self) -> tuple[K, list[V]]:
+        key: K
+        buckets: list[_omd_bucket[K, V]]
+
         try:
-            key, buckets = dict.popitem(self)
+            key, buckets = dict.popitem(self)  # type: ignore[arg-type]
         except KeyError as e:
             raise exceptions.BadRequestKeyError(e.args[0]) from None
 
@@ -652,7 +813,7 @@ def popitemlist(self):
         return key, [x.value for x in buckets]
 
 
-class CombinedMultiDict(ImmutableMultiDictMixin, MultiDict):
+class CombinedMultiDict(ImmutableMultiDictMixin[K, V], MultiDict[K, V]):  # type: ignore[misc]
     """A read only :class:`MultiDict` that you can pass multiple :class:`MultiDict`
     instances as sequence and it will combine the return values of all wrapped
     dicts:
@@ -675,54 +836,80 @@ class CombinedMultiDict(ImmutableMultiDictMixin, MultiDict):
     exceptions.
     """
 
-    def __reduce_ex__(self, protocol):
+    def __reduce_ex__(self, protocol: t.SupportsIndex) -> t.Any:
         return type(self), (self.dicts,)
 
-    def __init__(self, dicts=None):
-        self.dicts = list(dicts) or []
+    def __init__(self, dicts: cabc.Iterable[MultiDict[K, V]] | None = None) -> None:
+        super().__init__()
+        self.dicts: list[MultiDict[K, V]] = list(dicts or ())
 
     @classmethod
-    def fromkeys(cls, keys, value=None):
+    def fromkeys(cls, keys: t.Any, value: t.Any = None) -> t.NoReturn:
         raise TypeError(f"cannot create {cls.__name__!r} instances by fromkeys")
 
-    def __getitem__(self, key):
+    def __getitem__(self, key: K) -> V:
         for d in self.dicts:
             if key in d:
                 return d[key]
         raise exceptions.BadRequestKeyError(key)
 
-    def get(self, key, default=None, type=None):
+    @t.overload  # type: ignore[override]
+    def get(self, key: K) -> V | None: ...
+    @t.overload
+    def get(self, key: K, default: V) -> V: ...
+    @t.overload
+    def get(self, key: K, default: T) -> V | T: ...
+    @t.overload
+    def get(self, key: str, type: cabc.Callable[[V], T]) -> T | None: ...
+    @t.overload
+    def get(self, key: str, default: T, type: cabc.Callable[[V], T]) -> T: ...
+    def get(  # type: ignore[misc]
+        self,
+        key: K,
+        default: V | T | None = None,
+        type: cabc.Callable[[V], T] | None = None,
+    ) -> V | T | None:
         for d in self.dicts:
             if key in d:
                 if type is not None:
                     try:
                         return type(d[key])
-                    except ValueError:
+                    except (ValueError, TypeError):
                         continue
                 return d[key]
         return default
 
-    def getlist(self, key, type=None):
+    @t.overload
+    def getlist(self, key: K) -> list[V]: ...
+    @t.overload
+    def getlist(self, key: K, type: cabc.Callable[[V], T]) -> list[T]: ...
+    def getlist(
+        self, key: K, type: cabc.Callable[[V], T] | None = None
+    ) -> list[V] | list[T]:
         rv = []
         for d in self.dicts:
-            rv.extend(d.getlist(key, type))
+            rv.extend(d.getlist(key, type))  # type: ignore[arg-type]
         return rv
 
-    def _keys_impl(self):
+    def _keys_impl(self) -> set[K]:
         """This function exists so __len__ can be implemented more efficiently,
         saving one list creation from an iterator.
         """
-        rv = set()
-        rv.update(*self.dicts)
-        return rv
+        return set(k for d in self.dicts for k in d)
 
-    def keys(self):
+    def keys(self) -> cabc.Iterable[K]:  # type: ignore[override]
         return self._keys_impl()
 
-    def __iter__(self):
-        return iter(self.keys())
+    def __iter__(self) -> cabc.Iterator[K]:
+        return iter(self._keys_impl())
 
-    def items(self, multi=False):
+    @t.overload  # type: ignore[override]
+    def items(self) -> cabc.Iterable[tuple[K, V]]: ...
+    @t.overload
+    def items(self, multi: t.Literal[True]) -> cabc.Iterable[tuple[K, list[V]]]: ...
+    def items(
+        self, multi: bool = False
+    ) -> cabc.Iterable[tuple[K, V]] | cabc.Iterable[tuple[K, list[V]]]:
         found = set()
         for d in self.dicts:
             for key, value in d.items(multi):
@@ -732,21 +919,21 @@ def items(self, multi=False):
                     found.add(key)
                     yield key, value
 
-    def values(self):
-        for _key, value in self.items():
+    def values(self) -> cabc.Iterable[V]:  # type: ignore[override]
+        for _, value in self.items():
             yield value
 
-    def lists(self):
-        rv = {}
+    def lists(self) -> cabc.Iterable[tuple[K, list[V]]]:
+        rv: dict[K, list[V]] = {}
         for d in self.dicts:
             for key, values in d.lists():
                 rv.setdefault(key, []).extend(values)
-        return list(rv.items())
+        return rv.items()
 
-    def listvalues(self):
+    def listvalues(self) -> cabc.Iterable[list[V]]:
         return (x[1] for x in self.lists())
 
-    def copy(self):
+    def copy(self) -> MultiDict[K, V]:  # type: ignore[override]
         """Return a shallow mutable copy of this object.
 
         This returns a :class:`MultiDict` representing the data at the
@@ -758,105 +945,118 @@ def copy(self):
         """
         return MultiDict(self)
 
-    def to_dict(self, flat=True):
-        """Return the contents as regular dict.  If `flat` is `True` the
-        returned dict will only have the first item present, if `flat` is
-        `False` all values will be returned as lists.
-
-        :param flat: If set to `False` the dict returned will have lists
-                     with all the values in it.  Otherwise it will only
-                     contain the first item for each key.
-        :return: a :class:`dict`
-        """
-        if flat:
-            return dict(self.items())
-
-        return dict(self.lists())
-
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._keys_impl())
 
-    def __contains__(self, key):
+    def __contains__(self, key: K) -> bool:  # type: ignore[override]
         for d in self.dicts:
             if key in d:
                 return True
         return False
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{type(self).__name__}({self.dicts!r})"
 
 
-class ImmutableDict(ImmutableDictMixin, dict):
+class ImmutableDict(ImmutableDictMixin[K, V], dict[K, V]):  # type: ignore[misc]
     """An immutable :class:`dict`.
 
     .. versionadded:: 0.5
     """
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{type(self).__name__}({dict.__repr__(self)})"
 
-    def copy(self):
+    def copy(self) -> dict[K, V]:
         """Return a shallow mutable copy of this object.  Keep in mind that
         the standard library's :func:`copy` function is a no-op for this class
         like for any other python immutable type (eg: :class:`tuple`).
         """
         return dict(self)
 
-    def __copy__(self):
+    def __copy__(self) -> te.Self:
         return self
 
 
-class ImmutableMultiDict(ImmutableMultiDictMixin, MultiDict):
+class ImmutableMultiDict(ImmutableMultiDictMixin[K, V], MultiDict[K, V]):  # type: ignore[misc]
     """An immutable :class:`MultiDict`.
 
     .. versionadded:: 0.5
     """
 
-    def copy(self):
+    def copy(self) -> MultiDict[K, V]:  # type: ignore[override]
         """Return a shallow mutable copy of this object.  Keep in mind that
         the standard library's :func:`copy` function is a no-op for this class
         like for any other python immutable type (eg: :class:`tuple`).
         """
         return MultiDict(self)
 
-    def __copy__(self):
+    def __copy__(self) -> te.Self:
         return self
 
 
-class ImmutableOrderedMultiDict(ImmutableMultiDictMixin, OrderedMultiDict):
+class _ImmutableOrderedMultiDict(  # type: ignore[misc]
+    ImmutableMultiDictMixin[K, V], _OrderedMultiDict[K, V]
+):
     """An immutable :class:`OrderedMultiDict`.
 
+    .. deprecated:: 3.1
+        Will be removed in Werkzeug 3.2. Use ``ImmutableMultiDict`` instead.
+
     .. versionadded:: 0.6
     """
 
-    def _iter_hashitems(self):
+    def __init__(
+        self,
+        mapping: (
+            MultiDict[K, V]
+            | cabc.Mapping[K, V | list[V] | tuple[V, ...] | set[V]]
+            | cabc.Iterable[tuple[K, V]]
+            | None
+        ) = None,
+    ) -> None:
+        super().__init__()
+
+        if mapping is not None:
+            for k, v in iter_multi_items(mapping):
+                _OrderedMultiDict.add(self, k, v)
+
+    def _iter_hashitems(self) -> cabc.Iterable[t.Any]:
         return enumerate(self.items(multi=True))
 
-    def copy(self):
+    def copy(self) -> _OrderedMultiDict[K, V]:  # type: ignore[override]
         """Return a shallow mutable copy of this object.  Keep in mind that
         the standard library's :func:`copy` function is a no-op for this class
         like for any other python immutable type (eg: :class:`tuple`).
         """
-        return OrderedMultiDict(self)
+        return _OrderedMultiDict(self)
 
-    def __copy__(self):
+    def __copy__(self) -> te.Self:
         return self
 
 
-class CallbackDict(UpdateDictMixin, dict):
+class CallbackDict(UpdateDictMixin[K, V], dict[K, V]):
     """A dict that calls a function passed every time something is changed.
     The function is passed the dict instance.
     """
 
-    def __init__(self, initial=None, on_update=None):
-        dict.__init__(self, initial or ())
+    def __init__(
+        self,
+        initial: cabc.Mapping[K, V] | cabc.Iterable[tuple[K, V]] | None = None,
+        on_update: cabc.Callable[[te.Self], None] | None = None,
+    ) -> None:
+        if initial is None:
+            super().__init__()
+        else:
+            super().__init__(initial)
+
         self.on_update = on_update
 
-    def __repr__(self):
-        return f"<{type(self).__name__} {dict.__repr__(self)}>"
+    def __repr__(self) -> str:
+        return f"<{type(self).__name__} {super().__repr__()}>"
 
 
-class HeaderSet(MutableSet):
+class HeaderSet(cabc.MutableSet[str]):
     """Similar to the :class:`ETags` class this implements a set-like structure.
     Unlike :class:`ETags` this is case insensitive and used for vary, allow, and
     content-language headers.
@@ -869,16 +1069,20 @@ class HeaderSet(MutableSet):
     HeaderSet(['foo', 'bar', 'baz'])
     """
 
-    def __init__(self, headers=None, on_update=None):
+    def __init__(
+        self,
+        headers: cabc.Iterable[str] | None = None,
+        on_update: cabc.Callable[[te.Self], None] | None = None,
+    ) -> None:
         self._headers = list(headers or ())
         self._set = {x.lower() for x in self._headers}
         self.on_update = on_update
 
-    def add(self, header):
+    def add(self, header: str) -> None:
         """Add a new header to the set."""
         self.update((header,))
 
-    def remove(self, header):
+    def remove(self: te.Self, header: str) -> None:
         """Remove a header from the set.  This raises an :exc:`KeyError` if the
         header is not in the set.
 
@@ -899,7 +1103,7 @@ def remove(self, header):
         if self.on_update is not None:
             self.on_update(self)
 
-    def update(self, iterable):
+    def update(self: te.Self, iterable: cabc.Iterable[str]) -> None:
         """Add all the headers from the iterable to the set.
 
         :param iterable: updates the set with the items from the iterable.
@@ -914,7 +1118,7 @@ def update(self, iterable):
         if inserted_any and self.on_update is not None:
             self.on_update(self)
 
-    def discard(self, header):
+    def discard(self, header: str) -> None:
         """Like :meth:`remove` but ignores errors.
 
         :param header: the header to be discarded.
@@ -924,7 +1128,7 @@ def discard(self, header):
         except KeyError:
             pass
 
-    def find(self, header):
+    def find(self, header: str) -> int:
         """Return the index of the header in the set or return -1 if not found.
 
         :param header: the header to be looked up.
@@ -935,7 +1139,7 @@ def find(self, header):
                 return idx
         return -1
 
-    def index(self, header):
+    def index(self, header: str) -> int:
         """Return the index of the header in the set or raise an
         :exc:`IndexError`.
 
@@ -946,14 +1150,15 @@ def index(self, header):
             raise IndexError(header)
         return rv
 
-    def clear(self):
+    def clear(self: te.Self) -> None:
         """Clear the set."""
         self._set.clear()
-        del self._headers[:]
+        self._headers.clear()
+
         if self.on_update is not None:
             self.on_update(self)
 
-    def as_set(self, preserve_casing=False):
+    def as_set(self, preserve_casing: bool = False) -> set[str]:
         """Return the set as real python set type.  When calling this, all
         the items are converted to lowercase and the ordering is lost.
 
@@ -966,20 +1171,20 @@ def as_set(self, preserve_casing=False):
             return set(self._headers)
         return set(self._set)
 
-    def to_header(self):
+    def to_header(self) -> str:
         """Convert the header set into an HTTP header string."""
         return ", ".join(map(http.quote_header_value, self._headers))
 
-    def __getitem__(self, idx):
+    def __getitem__(self, idx: t.SupportsIndex) -> str:
         return self._headers[idx]
 
-    def __delitem__(self, idx):
+    def __delitem__(self: te.Self, idx: t.SupportsIndex) -> None:
         rv = self._headers.pop(idx)
         self._set.remove(rv.lower())
         if self.on_update is not None:
             self.on_update(self)
 
-    def __setitem__(self, idx, value):
+    def __setitem__(self: te.Self, idx: t.SupportsIndex, value: str) -> None:
         old = self._headers[idx]
         self._set.remove(old.lower())
         self._headers[idx] = value
@@ -987,24 +1192,48 @@ def __setitem__(self, idx, value):
         if self.on_update is not None:
             self.on_update(self)
 
-    def __contains__(self, header):
+    def __contains__(self, header: str) -> bool:  # type: ignore[override]
         return header.lower() in self._set
 
-    def __len__(self):
+    def __len__(self) -> int:
         return len(self._set)
 
-    def __iter__(self):
+    def __iter__(self) -> cabc.Iterator[str]:
         return iter(self._headers)
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return bool(self._set)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.to_header()
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{type(self).__name__}({self._headers!r})"
 
 
 # circular dependencies
-from .. import http
+from .. import http  # noqa: E402
+
+
+def __getattr__(name: str) -> t.Any:
+    import warnings
+
+    if name == "OrderedMultiDict":
+        warnings.warn(
+            "'OrderedMultiDict' is deprecated and will be removed in Werkzeug"
+            " 3.2. Use 'MultiDict' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _OrderedMultiDict
+
+    if name == "ImmutableOrderedMultiDict":
+        warnings.warn(
+            "'ImmutableOrderedMultiDict' is deprecated and will be removed in"
+            " Werkzeug 3.2. Use 'ImmutableMultiDict' instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return _ImmutableOrderedMultiDict
+
+    raise AttributeError(name)
diff --git a/libs/werkzeug/datastructures/structures.pyi b/libs/werkzeug/datastructures/structures.pyi
deleted file mode 100644
index 7086ddae1f..0000000000
--- a/libs/werkzeug/datastructures/structures.pyi
+++ /dev/null
@@ -1,206 +0,0 @@
-from collections.abc import Callable
-from collections.abc import Iterable
-from collections.abc import Iterator
-from collections.abc import Mapping
-from typing import Any
-from typing import Generic
-from typing import Literal
-from typing import NoReturn
-from typing import overload
-from typing import TypeVar
-
-from .mixins import ImmutableDictMixin
-from .mixins import ImmutableListMixin
-from .mixins import ImmutableMultiDictMixin
-from .mixins import UpdateDictMixin
-
-D = TypeVar("D")
-K = TypeVar("K")
-T = TypeVar("T")
-V = TypeVar("V")
-_CD = TypeVar("_CD", bound="CallbackDict[Any, Any]")
-
-def is_immutable(self: object) -> NoReturn: ...
-def iter_multi_items(
-    mapping: Mapping[K, V | Iterable[V]] | Iterable[tuple[K, V]],
-) -> Iterator[tuple[K, V]]: ...
-
-class ImmutableList(ImmutableListMixin[V]): ...
-
-class TypeConversionDict(dict[K, V]):
-    @overload
-    def get(self, key: K, default: None = ..., type: None = ...) -> V | None: ...
-    @overload
-    def get(self, key: K, default: D, type: None = ...) -> D | V: ...
-    @overload
-    def get(self, key: K, default: D, type: Callable[[V], T]) -> D | T: ...
-    @overload
-    def get(self, key: K, type: Callable[[V], T]) -> T | None: ...
-
-class ImmutableTypeConversionDict(ImmutableDictMixin[K, V], TypeConversionDict[K, V]):
-    def copy(self) -> TypeConversionDict[K, V]: ...
-    def __copy__(self) -> ImmutableTypeConversionDict[K, V]: ...
-
-class MultiDict(TypeConversionDict[K, V]):
-    def __init__(
-        self,
-        mapping: Mapping[K, Iterable[V] | V] | Iterable[tuple[K, V]] | None = None,
-    ) -> None: ...
-    def __getitem__(self, item: K) -> V: ...
-    def __setitem__(self, key: K, value: V) -> None: ...
-    def add(self, key: K, value: V) -> None: ...
-    @overload
-    def getlist(self, key: K) -> list[V]: ...
-    @overload
-    def getlist(self, key: K, type: Callable[[V], T] = ...) -> list[T]: ...
-    def setlist(self, key: K, new_list: Iterable[V]) -> None: ...
-    def setdefault(self, key: K, default: V | None = None) -> V: ...
-    def setlistdefault(
-        self, key: K, default_list: Iterable[V] | None = None
-    ) -> list[V]: ...
-    def items(self, multi: bool = False) -> Iterator[tuple[K, V]]: ...  # type: ignore
-    def lists(self) -> Iterator[tuple[K, list[V]]]: ...
-    def values(self) -> Iterator[V]: ...  # type: ignore
-    def listvalues(self) -> Iterator[list[V]]: ...
-    def copy(self) -> MultiDict[K, V]: ...
-    def deepcopy(self, memo: Any = None) -> MultiDict[K, V]: ...
-    @overload
-    def to_dict(self) -> dict[K, V]: ...
-    @overload
-    def to_dict(self, flat: Literal[False]) -> dict[K, list[V]]: ...
-    def update(  # type: ignore
-        self, mapping: Mapping[K, Iterable[V] | V] | Iterable[tuple[K, V]]
-    ) -> None: ...
-    @overload
-    def pop(self, key: K) -> V: ...
-    @overload
-    def pop(self, key: K, default: V | T = ...) -> V | T: ...
-    def popitem(self) -> tuple[K, V]: ...
-    def poplist(self, key: K) -> list[V]: ...
-    def popitemlist(self) -> tuple[K, list[V]]: ...
-    def __copy__(self) -> MultiDict[K, V]: ...
-    def __deepcopy__(self, memo: Any) -> MultiDict[K, V]: ...
-
-class _omd_bucket(Generic[K, V]):
-    prev: _omd_bucket[K, V] | None
-    next: _omd_bucket[K, V] | None
-    key: K
-    value: V
-    def __init__(self, omd: OrderedMultiDict[K, V], key: K, value: V) -> None: ...
-    def unlink(self, omd: OrderedMultiDict[K, V]) -> None: ...
-
-class OrderedMultiDict(MultiDict[K, V]):
-    _first_bucket: _omd_bucket[K, V] | None
-    _last_bucket: _omd_bucket[K, V] | None
-    def __init__(self, mapping: Mapping[K, V] | None = None) -> None: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __getitem__(self, key: K) -> V: ...
-    def __setitem__(self, key: K, value: V) -> None: ...
-    def __delitem__(self, key: K) -> None: ...
-    def keys(self) -> Iterator[K]: ...  # type: ignore
-    def __iter__(self) -> Iterator[K]: ...
-    def values(self) -> Iterator[V]: ...  # type: ignore
-    def items(self, multi: bool = False) -> Iterator[tuple[K, V]]: ...  # type: ignore
-    def lists(self) -> Iterator[tuple[K, list[V]]]: ...
-    def listvalues(self) -> Iterator[list[V]]: ...
-    def add(self, key: K, value: V) -> None: ...
-    @overload
-    def getlist(self, key: K) -> list[V]: ...
-    @overload
-    def getlist(self, key: K, type: Callable[[V], T] = ...) -> list[T]: ...
-    def setlist(self, key: K, new_list: Iterable[V]) -> None: ...
-    def setlistdefault(
-        self, key: K, default_list: Iterable[V] | None = None
-    ) -> list[V]: ...
-    def update(  # type: ignore
-        self, mapping: Mapping[K, V] | Iterable[tuple[K, V]]
-    ) -> None: ...
-    def poplist(self, key: K) -> list[V]: ...
-    @overload
-    def pop(self, key: K) -> V: ...
-    @overload
-    def pop(self, key: K, default: V | T = ...) -> V | T: ...
-    def popitem(self) -> tuple[K, V]: ...
-    def popitemlist(self) -> tuple[K, list[V]]: ...
-
-class CombinedMultiDict(ImmutableMultiDictMixin[K, V], MultiDict[K, V]):  # type: ignore
-    dicts: list[MultiDict[K, V]]
-    def __init__(self, dicts: Iterable[MultiDict[K, V]] | None) -> None: ...
-    @classmethod
-    def fromkeys(cls, keys: Any, value: Any = None) -> NoReturn: ...
-    def __getitem__(self, key: K) -> V: ...
-    @overload  # type: ignore
-    def get(self, key: K) -> V | None: ...
-    @overload
-    def get(self, key: K, default: V | T = ...) -> V | T: ...
-    @overload
-    def get(
-        self, key: K, default: T | None = None, type: Callable[[V], T] = ...
-    ) -> T | None: ...
-    @overload
-    def getlist(self, key: K) -> list[V]: ...
-    @overload
-    def getlist(self, key: K, type: Callable[[V], T] = ...) -> list[T]: ...
-    def _keys_impl(self) -> set[K]: ...
-    def keys(self) -> set[K]: ...  # type: ignore
-    def __iter__(self) -> set[K]: ...  # type: ignore
-    def items(self, multi: bool = False) -> Iterator[tuple[K, V]]: ...  # type: ignore
-    def values(self) -> Iterator[V]: ...  # type: ignore
-    def lists(self) -> Iterator[tuple[K, list[V]]]: ...
-    def listvalues(self) -> Iterator[list[V]]: ...
-    def copy(self) -> MultiDict[K, V]: ...
-    @overload
-    def to_dict(self) -> dict[K, V]: ...
-    @overload
-    def to_dict(self, flat: Literal[False]) -> dict[K, list[V]]: ...
-    def __contains__(self, key: K) -> bool: ...  # type: ignore
-    def has_key(self, key: K) -> bool: ...
-
-class ImmutableDict(ImmutableDictMixin[K, V], dict[K, V]):
-    def copy(self) -> dict[K, V]: ...
-    def __copy__(self) -> ImmutableDict[K, V]: ...
-
-class ImmutableMultiDict(  # type: ignore
-    ImmutableMultiDictMixin[K, V], MultiDict[K, V]
-):
-    def copy(self) -> MultiDict[K, V]: ...
-    def __copy__(self) -> ImmutableMultiDict[K, V]: ...
-
-class ImmutableOrderedMultiDict(  # type: ignore
-    ImmutableMultiDictMixin[K, V], OrderedMultiDict[K, V]
-):
-    def _iter_hashitems(self) -> Iterator[tuple[int, tuple[K, V]]]: ...
-    def copy(self) -> OrderedMultiDict[K, V]: ...
-    def __copy__(self) -> ImmutableOrderedMultiDict[K, V]: ...
-
-class CallbackDict(UpdateDictMixin[K, V], dict[K, V]):
-    def __init__(
-        self,
-        initial: Mapping[K, V] | Iterable[tuple[K, V]] | None = None,
-        on_update: Callable[[_CD], None] | None = None,
-    ) -> None: ...
-
-class HeaderSet(set[str]):
-    _headers: list[str]
-    _set: set[str]
-    on_update: Callable[[HeaderSet], None] | None
-    def __init__(
-        self,
-        headers: Iterable[str] | None = None,
-        on_update: Callable[[HeaderSet], None] | None = None,
-    ) -> None: ...
-    def add(self, header: str) -> None: ...
-    def remove(self, header: str) -> None: ...
-    def update(self, iterable: Iterable[str]) -> None: ...  # type: ignore
-    def discard(self, header: str) -> None: ...
-    def find(self, header: str) -> int: ...
-    def index(self, header: str) -> int: ...
-    def clear(self) -> None: ...
-    def as_set(self, preserve_casing: bool = False) -> set[str]: ...
-    def to_header(self) -> str: ...
-    def __getitem__(self, idx: int) -> str: ...
-    def __delitem__(self, idx: int) -> None: ...
-    def __setitem__(self, idx: int, value: str) -> None: ...
-    def __contains__(self, header: str) -> bool: ...  # type: ignore
-    def __len__(self) -> int: ...
-    def __iter__(self) -> Iterator[str]: ...
diff --git a/libs/werkzeug/debug/__init__.py b/libs/werkzeug/debug/__init__.py
index 0c4cabd89b..17cd4b25a9 100644
--- a/libs/werkzeug/debug/__init__.py
+++ b/libs/werkzeug/debug/__init__.py
@@ -263,7 +263,7 @@ class DebuggedApplication:
         Added the ``werkzeug.debug.preserve_context`` environ key.
     """
 
-    _pin: str
+    _pin: str | None
     _pin_cookie: str
 
     def __init__(
@@ -318,8 +318,12 @@ def pin(self) -> str | None:
         return self._pin
 
     @pin.setter
-    def pin(self, value: str) -> None:
-        self._pin = value
+    def pin(self, value: str | None) -> None:
+        if value is None:
+            # Set _pin to None explicitly to prevent regeneration by the getter
+            self._pin = None
+        else:
+            self._pin = value
 
     @property
     def pin_cookie_name(self) -> str:
@@ -438,6 +442,11 @@ def check_pin_trust(self, environ: WSGIEnvironment) -> bool | None:
         """
         if self.pin is None:
             return True
+
+        # If we failed too many times, then we're locked out.
+        if self._failed_pin_auth.value >= 10:
+            return False
+
         val = parse_cookie(environ).get(self.pin_cookie_name)
         if not val or "|" not in val:
             return False
@@ -487,7 +496,7 @@ def pin_auth(self, request: Request) -> Response:
             auth = True
 
         # If we failed too many times, then we're locked out.
-        elif self._failed_pin_auth.value > 10:
+        elif self._failed_pin_auth.value >= 10:
             exhausted = True
 
         # Otherwise go through pin based authentication
diff --git a/libs/werkzeug/debug/tbtools.py b/libs/werkzeug/debug/tbtools.py
index e81ed6e18e..ca4acf60a8 100644
--- a/libs/werkzeug/debug/tbtools.py
+++ b/libs/werkzeug/debug/tbtools.py
@@ -185,7 +185,7 @@ def _process_traceback(
             "globals": f.f_globals,
         }
 
-        if hasattr(fs, "colno"):
+        if sys.version_info >= (3, 11):
             frame_args["colno"] = fs.colno
             frame_args["end_colno"] = fs.end_colno
 
@@ -237,8 +237,8 @@ def __str__(self) -> str:
     def all_tracebacks(
         self,
     ) -> list[tuple[str | None, traceback.TracebackException]]:
-        out = []
-        current = self._te
+        out: list[tuple[str | None, traceback.TracebackException]] = []
+        current: traceback.TracebackException | None = self._te
 
         while current is not None:
             if current.__cause__ is not None:
@@ -249,8 +249,7 @@ def all_tracebacks(
                 chained_exc = current.__cause__
             elif current.__context__ is not None and not current.__suppress_context__:
                 chained_msg = (
-                    "During handling of the above exception, another"
-                    " exception occurred"
+                    "During handling of the above exception, another exception occurred"
                 )
                 chained_exc = current.__context__
             else:
@@ -410,7 +409,7 @@ def render_line(line: str, cls: str) -> None:
             if cls == "current" and colno and end_colno:
                 arrow = (
                     f'\n<span class="ws">{" " * prefix}</span>'
-                    f'{" " * (colno - prefix)}{"^" * (end_colno - colno)}'
+                    f"{' ' * (colno - prefix)}{'^' * (end_colno - colno)}"
                 )
             else:
                 arrow = ""
@@ -421,7 +420,7 @@ def render_line(line: str, cls: str) -> None:
                 f"{arrow if arrow else ''}</pre>"
             )
 
-        if lines:
+        if line_idx < len(lines):
             for line in lines[start_idx:line_idx]:
                 render_line(line, "before")
 
diff --git a/libs/werkzeug/exceptions.py b/libs/werkzeug/exceptions.py
index 6ce7ef9559..15f534e967 100644
--- a/libs/werkzeug/exceptions.py
+++ b/libs/werkzeug/exceptions.py
@@ -59,7 +59,7 @@ def application(request):
     from _typeshed.wsgi import WSGIEnvironment
 
     from .datastructures import WWWAuthenticate
-    from .sansio.response import Response
+    from .sansio.response import Response as SansIOResponse
     from .wrappers.request import Request as WSGIRequest
     from .wrappers.response import Response as WSGIResponse
 
@@ -79,7 +79,7 @@ class HTTPException(Exception):
     def __init__(
         self,
         description: str | None = None,
-        response: Response | None = None,
+        response: SansIOResponse | None = None,
     ) -> None:
         super().__init__()
         if description is not None:
@@ -129,27 +129,42 @@ def get_headers(
         """Get a list of headers."""
         return [("Content-Type", "text/html; charset=utf-8")]
 
+    @t.overload
+    def get_response(
+        self,
+        environ: WSGIEnvironment | WSGIRequest | None = ...,
+        scope: None = None,
+    ) -> WSGIResponse: ...
+    @t.overload
+    def get_response(
+        self,
+        environ: None = None,
+        scope: dict[str, t.Any] = ...,
+    ) -> SansIOResponse: ...
     def get_response(
         self,
         environ: WSGIEnvironment | WSGIRequest | None = None,
         scope: dict[str, t.Any] | None = None,
-    ) -> Response:
-        """Get a response object.  If one was passed to the exception
-        it's returned directly.
-
-        :param environ: the optional environ for the request.  This
-                        can be used to modify the response depending
-                        on how the request looked like.
-        :return: a :class:`Response` object or a subclass thereof.
+    ) -> WSGIResponse | SansIOResponse:
+        """Get a response object.
+
+        :param environ: A WSGI environ dict or request object. If given, may be
+            used to customize the response based on the request.
+        :param scope: An ASGI scope dict. If given, may be used to customize the
+            response based on the request.
+        :return: A WSGI :class:`werkzeug.wrappers.Response` if called without
+            arguments or with ``environ``. A sans-IO
+            :class:`werkzeug.sansio.Response` for ASGI if called with
+            ``scope``.
         """
-        from .wrappers.response import Response as WSGIResponse  # noqa: F811
+        from .wrappers.response import Response
 
         if self.response is not None:
             return self.response
         if environ is not None:
             environ = _get_environ(environ)
         headers = self.get_headers(environ, scope)
-        return WSGIResponse(self.get_body(environ, scope), self.code, headers)
+        return Response(self.get_body(environ, scope), self.code, headers)
 
     def __call__(
         self, environ: WSGIEnvironment, start_response: StartResponse
@@ -160,7 +175,7 @@ def __call__(
         :param start_response: the response callable provided by the WSGI
                                server.
         """
-        response = t.cast("WSGIResponse", self.get_response(environ))
+        response = self.get_response(environ)
         return response(environ, start_response)
 
     def __str__(self) -> str:
@@ -181,8 +196,7 @@ class BadRequest(HTTPException):
 
     code = 400
     description = (
-        "The browser (or proxy) sent a request that this server could "
-        "not understand."
+        "The browser (or proxy) sent a request that this server could not understand."
     )
 
 
@@ -197,7 +211,7 @@ class BadRequestKeyError(BadRequest, KeyError):
     #: useful in a debug mode.
     show_exception = False
 
-    def __init__(self, arg: str | None = None, *args: t.Any, **kwargs: t.Any):
+    def __init__(self, arg: object | None = None, *args: t.Any, **kwargs: t.Any):
         super().__init__(*args, **kwargs)
 
         if arg is None:
@@ -205,13 +219,10 @@ def __init__(self, arg: str | None = None, *args: t.Any, **kwargs: t.Any):
         else:
             KeyError.__init__(self, arg)
 
-    @property  # type: ignore
+    @property
     def description(self) -> str:
         if self.show_exception:
-            return (
-                f"{self._description}\n"
-                f"{KeyError.__name__}: {KeyError.__str__(self)}"
-            )
+            return f"{self._description}\n{KeyError.__name__}: {KeyError.__str__(self)}"
 
         return self._description
 
@@ -299,7 +310,7 @@ class Unauthorized(HTTPException):
     def __init__(
         self,
         description: str | None = None,
-        response: Response | None = None,
+        response: SansIOResponse | None = None,
         www_authenticate: None | (WWWAuthenticate | t.Iterable[WWWAuthenticate]) = None,
     ) -> None:
         super().__init__(description, response)
@@ -368,7 +379,7 @@ def __init__(
         self,
         valid_methods: t.Iterable[str] | None = None,
         description: str | None = None,
-        response: Response | None = None,
+        response: SansIOResponse | None = None,
     ) -> None:
         """Takes an optional list of valid http methods
         starting with werkzeug 0.3 the list will be mandatory."""
@@ -526,7 +537,7 @@ def __init__(
         length: int | None = None,
         units: str = "bytes",
         description: str | None = None,
-        response: Response | None = None,
+        response: SansIOResponse | None = None,
     ) -> None:
         """Takes an optional `Content-Range` header value based on ``length``
         parameter.
@@ -571,6 +582,19 @@ class ImATeapot(HTTPException):
     description = "This server is a teapot, not a coffee machine"
 
 
+class MisdirectedRequest(HTTPException):
+    """421 Misdirected Request
+
+    Indicates that the request was directed to a server that is not able to
+    produce a response.
+
+    .. versionadded:: 3.1
+    """
+
+    code = 421
+    description = "The server is not able to produce a response."
+
+
 class UnprocessableEntity(HTTPException):
     """*422* `Unprocessable Entity`
 
@@ -638,7 +662,7 @@ class _RetryAfter(HTTPException):
     def __init__(
         self,
         description: str | None = None,
-        response: Response | None = None,
+        response: SansIOResponse | None = None,
         retry_after: datetime | int | None = None,
     ) -> None:
         super().__init__(description, response)
@@ -728,7 +752,7 @@ class InternalServerError(HTTPException):
     def __init__(
         self,
         description: str | None = None,
-        response: Response | None = None,
+        response: SansIOResponse | None = None,
         original_exception: BaseException | None = None,
     ) -> None:
         #: The original exception that caused this 500 error. Can be
@@ -850,7 +874,7 @@ def __init__(
             self.mapping.update(extra)
 
     def __call__(
-        self, code: int | Response, *args: t.Any, **kwargs: t.Any
+        self, code: int | SansIOResponse, *args: t.Any, **kwargs: t.Any
     ) -> t.NoReturn:
         from .sansio.response import Response
 
@@ -863,7 +887,7 @@ def __call__(
         raise self.mapping[code](*args, **kwargs)
 
 
-def abort(status: int | Response, *args: t.Any, **kwargs: t.Any) -> t.NoReturn:
+def abort(status: int | SansIOResponse, *args: t.Any, **kwargs: t.Any) -> t.NoReturn:
     """Raises an :py:exc:`HTTPException` for the given status code or WSGI
     application.
 
diff --git a/libs/werkzeug/formparser.py b/libs/werkzeug/formparser.py
index 3c6875e265..0103414976 100644
--- a/libs/werkzeug/formparser.py
+++ b/libs/werkzeug/formparser.py
@@ -33,7 +33,7 @@
 
     from _typeshed.wsgi import WSGIEnvironment
 
-    t_parse_result = t.Tuple[
+    t_parse_result = tuple[
         t.IO[bytes], MultiDict[str, str], MultiDict[str, FileStorage]
     ]
 
diff --git a/libs/werkzeug/http.py b/libs/werkzeug/http.py
index cb8bc25811..aee4f59a8b 100644
--- a/libs/werkzeug/http.py
+++ b/libs/werkzeug/http.py
@@ -599,7 +599,7 @@ def parse_accept_header(
         Parse according to RFC 9110. Items with invalid ``q`` values are skipped.
     """
     if cls is None:
-        cls = t.cast(t.Type[_TAnyAccept], ds.Accept)
+        cls = t.cast(type[_TAnyAccept], ds.Accept)
 
     if not value:
         return cls(None)
@@ -914,6 +914,10 @@ def quote_etag(etag: str, weak: bool = False) -> str:
     return etag
 
 
+@t.overload
+def unquote_etag(etag: str) -> tuple[str, bool]: ...
+@t.overload
+def unquote_etag(etag: None) -> tuple[None, None]: ...
 def unquote_etag(
     etag: str | None,
 ) -> tuple[str, bool] | tuple[None, None]:
@@ -1235,6 +1239,7 @@ def dump_cookie(
     sync_expires: bool = True,
     max_size: int = 4093,
     samesite: str | None = None,
+    partitioned: bool = False,
 ) -> str:
     """Create a Set-Cookie header without the ``Set-Cookie`` prefix.
 
@@ -1271,9 +1276,14 @@ def dump_cookie(
         <cookie_>`_. Set to 0 to disable this check.
     :param samesite: Limits the scope of the cookie such that it will
         only be attached to requests if those requests are same-site.
+    :param partitioned: Opts the cookie into partitioned storage. This
+        will also set secure to True
 
     .. _`cookie`: http://browsercookielimits.squawky.net/
 
+    .. versionchanged:: 3.1
+        The ``partitioned`` parameter was added.
+
     .. versionchanged:: 3.0
         Passing bytes, and the ``charset`` parameter, were removed.
 
@@ -1317,6 +1327,9 @@ def dump_cookie(
         if samesite not in {"Strict", "Lax", "None"}:
             raise ValueError("SameSite must be 'Strict', 'Lax', or 'None'.")
 
+    if partitioned:
+        secure = True
+
     # Quote value if it contains characters not allowed by RFC 6265. Slash-escape with
     # three octal digits, which matches http.cookies, although the RFC suggests base64.
     if not _cookie_no_quote_re.fullmatch(value):
@@ -1338,6 +1351,7 @@ def dump_cookie(
         ("HttpOnly", httponly),
         ("Path", path),
         ("SameSite", samesite),
+        ("Partitioned", partitioned),
     ):
         if v is None or v is False:
             continue
@@ -1387,5 +1401,5 @@ def is_byte_range_valid(
 
 
 # circular dependencies
-from . import datastructures as ds
-from .sansio import http as _sansio_http
+from . import datastructures as ds  # noqa: E402
+from .sansio import http as _sansio_http  # noqa: E402
diff --git a/libs/werkzeug/local.py b/libs/werkzeug/local.py
index 302589bbab..32c1aca806 100644
--- a/libs/werkzeug/local.py
+++ b/libs/werkzeug/local.py
@@ -531,7 +531,7 @@ def _get_current_object() -> T:
         object.__setattr__(self, "_LocalProxy__wrapped", local)
         object.__setattr__(self, "_get_current_object", _get_current_object)
 
-    __doc__ = _ProxyLookup(  # type: ignore[assignment]
+    __doc__ = _ProxyLookup(
         class_value=__doc__, fallback=lambda self: type(self).__doc__, is_attr=True
     )
     __wrapped__ = _ProxyLookup(
@@ -539,25 +539,25 @@ def _get_current_object() -> T:
         is_attr=True,
     )
     # __del__ should only delete the proxy
-    __repr__ = _ProxyLookup(  # type: ignore[assignment]
+    __repr__ = _ProxyLookup(
         repr, fallback=lambda self: f"<{type(self).__name__} unbound>"
     )
-    __str__ = _ProxyLookup(str)  # type: ignore[assignment]
+    __str__ = _ProxyLookup(str)
     __bytes__ = _ProxyLookup(bytes)
-    __format__ = _ProxyLookup()  # type: ignore[assignment]
+    __format__ = _ProxyLookup()
     __lt__ = _ProxyLookup(operator.lt)
     __le__ = _ProxyLookup(operator.le)
-    __eq__ = _ProxyLookup(operator.eq)  # type: ignore[assignment]
-    __ne__ = _ProxyLookup(operator.ne)  # type: ignore[assignment]
+    __eq__ = _ProxyLookup(operator.eq)
+    __ne__ = _ProxyLookup(operator.ne)
     __gt__ = _ProxyLookup(operator.gt)
     __ge__ = _ProxyLookup(operator.ge)
-    __hash__ = _ProxyLookup(hash)  # type: ignore[assignment]
+    __hash__ = _ProxyLookup(hash)
     __bool__ = _ProxyLookup(bool, fallback=lambda self: False)
     __getattr__ = _ProxyLookup(getattr)
     # __getattribute__ triggered through __getattr__
-    __setattr__ = _ProxyLookup(setattr)  # type: ignore[assignment]
-    __delattr__ = _ProxyLookup(delattr)  # type: ignore[assignment]
-    __dir__ = _ProxyLookup(dir, fallback=lambda self: [])  # type: ignore[assignment]
+    __setattr__ = _ProxyLookup(setattr)
+    __delattr__ = _ProxyLookup(delattr)
+    __dir__ = _ProxyLookup(dir, fallback=lambda self: [])
     # __get__ (proxying descriptor not supported)
     # __set__ (descriptor)
     # __delete__ (descriptor)
@@ -568,7 +568,7 @@ def _get_current_object() -> T:
     # __weakref__ (__getattr__)
     # __init_subclass__ (proxying metaclass not supported)
     # __prepare__ (metaclass)
-    __class__ = _ProxyLookup(fallback=lambda self: type(self), is_attr=True)  # type: ignore[assignment]
+    __class__ = _ProxyLookup(fallback=lambda self: type(self), is_attr=True)
     __instancecheck__ = _ProxyLookup(lambda self, other: isinstance(other, self))
     __subclasscheck__ = _ProxyLookup(lambda self, other: issubclass(other, self))
     # __class_getitem__ triggered through __getitem__
diff --git a/libs/werkzeug/middleware/lint.py b/libs/werkzeug/middleware/lint.py
index de93b526a4..3714271b1c 100644
--- a/libs/werkzeug/middleware/lint.py
+++ b/libs/werkzeug/middleware/lint.py
@@ -435,5 +435,5 @@ def checking_start_response(
         app_iter = self.app(environ, t.cast("StartResponse", checking_start_response))
         self.check_iterator(app_iter)
         return GuardedIterator(
-            app_iter, t.cast(t.Tuple[int, Headers], headers_set), chunks
+            app_iter, t.cast(tuple[int, Headers], headers_set), chunks
         )
diff --git a/libs/werkzeug/middleware/shared_data.py b/libs/werkzeug/middleware/shared_data.py
index 0f467f2e2e..c7c06df5a4 100644
--- a/libs/werkzeug/middleware/shared_data.py
+++ b/libs/werkzeug/middleware/shared_data.py
@@ -30,8 +30,8 @@
 from ..wsgi import get_path_info
 from ..wsgi import wrap_file
 
-_TOpener = t.Callable[[], t.Tuple[t.IO[bytes], datetime, int]]
-_TLoader = t.Callable[[t.Optional[str]], t.Tuple[t.Optional[str], t.Optional[_TOpener]]]
+_TOpener = t.Callable[[], tuple[t.IO[bytes], datetime, int]]
+_TLoader = t.Callable[[t.Optional[str]], tuple[t.Optional[str], t.Optional[_TOpener]]]
 
 if t.TYPE_CHECKING:
     from _typeshed.wsgi import StartResponse
diff --git a/libs/werkzeug/routing/map.py b/libs/werkzeug/routing/map.py
index 4d15e88248..c86f95a3b3 100644
--- a/libs/werkzeug/routing/map.py
+++ b/libs/werkzeug/routing/map.py
@@ -80,7 +80,7 @@ class Map:
         The ``encoding_errors`` and ``host_matching`` parameters were added.
 
     .. versionchanged:: 0.5
-        The ``sort_parameters`` and ``sort_key``  paramters were added.
+        The ``sort_parameters`` and ``sort_key``  parameters were added.
     """
 
     #: A dict of default converters to be used.
@@ -834,69 +834,46 @@ def build(
         append_unknown: bool = True,
         url_scheme: str | None = None,
     ) -> str:
-        """Building URLs works pretty much the other way round.  Instead of
-        `match` you call `build` and pass it the endpoint and a dict of
-        arguments for the placeholders.
-
-        The `build` function also accepts an argument called `force_external`
-        which, if you set it to `True` will force external URLs. Per default
-        external URLs (include the server name) will only be used if the
-        target URL is on a different subdomain.
-
-        >>> m = Map([
-        ...     Rule('/', endpoint='index'),
-        ...     Rule('/downloads/', endpoint='downloads/index'),
-        ...     Rule('/downloads/<int:id>', endpoint='downloads/show')
-        ... ])
-        >>> urls = m.bind("example.com", "/")
-        >>> urls.build("index", {})
-        '/'
-        >>> urls.build("downloads/show", {'id': 42})
-        '/downloads/42'
-        >>> urls.build("downloads/show", {'id': 42}, force_external=True)
-        'http://example.com/downloads/42'
-
-        Because URLs cannot contain non ASCII data you will always get
-        bytes back.  Non ASCII characters are urlencoded with the
-        charset defined on the map instance.
-
-        Additional values are converted to strings and appended to the URL as
-        URL querystring parameters:
-
-        >>> urls.build("index", {'q': 'My Searchstring'})
-        '/?q=My+Searchstring'
-
-        When processing those additional values, lists are furthermore
-        interpreted as multiple values (as per
-        :py:class:`werkzeug.datastructures.MultiDict`):
-
-        >>> urls.build("index", {'q': ['a', 'b', 'c']})
-        '/?q=a&q=b&q=c'
-
-        Passing a ``MultiDict`` will also add multiple values:
-
-        >>> urls.build("index", MultiDict((('p', 'z'), ('q', 'a'), ('q', 'b'))))
-        '/?p=z&q=a&q=b'
-
-        If a rule does not exist when building a `BuildError` exception is
-        raised.
-
-        The build method accepts an argument called `method` which allows you
-        to specify the method you want to have an URL built for if you have
-        different methods for the same endpoint specified.
-
-        :param endpoint: the endpoint of the URL to build.
-        :param values: the values for the URL to build.  Unhandled values are
-                       appended to the URL as query parameters.
-        :param method: the HTTP method for the rule if there are different
-                       URLs for different methods on the same endpoint.
-        :param force_external: enforce full canonical external URLs. If the URL
-                               scheme is not provided, this will generate
-                               a protocol-relative URL.
-        :param append_unknown: unknown parameters are appended to the generated
-                               URL as query string argument.  Disable this
-                               if you want the builder to ignore those.
-        :param url_scheme: Scheme to use in place of the bound
+        """Build a URL by filling in any variable slots in the endpoint's rule
+        with the provided values.
+
+        This produces relative URLs (path only, no host) by default, which is
+        appropriate for most use cases. When using subdomain or host matching,
+        the URL will be absolute if the endpoint is not on the same host as the
+        current request. If you need an absolute URL no matter what, such as
+        when adding a link to an email, pass ``force_external=True``.
+
+        Characters that are not allowed directly in URLs will be percent-encoded
+        using UTF-8.
+
+        Additional values that don't match any rule parts are added to the query
+        (``?key=value``) part of the URL.
+
+        If a rule is not found, an :exc:`.BuildError` is raised. Converters may
+        also raise exceptions when preparing a value.
+
+        Unlike matching, building does not perform comprehensive validation of
+        the values, it's assumed that they are trusted and correct. It's also
+        possible to build a URL for one endpoint that will be matched by
+        another, or will not match. This is very unlikely to happen or to matter
+        in most applications, especially with testing. If you need a
+        stronger guarantee, you can use a helper to verify that
+        ``match(build(endpoint)) == endpoint``.
+
+        :param endpoint: The endpoint for the rule to build.
+        :param values: Values for the variable parts of the rule, which will be
+            converted using the part's converter's
+            :meth:`~.BaseConverter.to_url` method. Keys that don't match
+            variable parts will be converted to a query string unless
+            ``append_unknown`` is disabled.
+        :param method: Further match the rule to build by this HTTP method, for
+            when there are multiple rules for the same endpoint that vary based
+            on method.
+        :param force_external: Always produce an absolute URL, for external use.
+            If ``scheme`` is not set, this produces a protocol-relative URL.
+        :param append_unknown: Convert values that don't match any rule parts
+            to a query string. Disable to ignore such values.
+        :param url_scheme: Scheme to use for absolute URLs. Defaults to
             :attr:`url_scheme`.
 
         .. versionchanged:: 2.0
diff --git a/libs/werkzeug/routing/rules.py b/libs/werkzeug/routing/rules.py
index 2dad31dd35..9e483a54b2 100644
--- a/libs/werkzeug/routing/rules.py
+++ b/libs/werkzeug/routing/rules.py
@@ -118,7 +118,7 @@ def parse_converter_args(argstr: str) -> tuple[tuple[t.Any, ...], dict[str, t.An
     for item in _converter_args_re.finditer(argstr):
         if item.start() != position:
             raise ValueError(
-                f"Cannot parse converter argument '{argstr[position:item.start()]}'"
+                f"Cannot parse converter argument '{argstr[position : item.start()]}'"
             )
 
         value = item.group("stringval")
@@ -776,7 +776,7 @@ def _parts(ops: list[tuple[bool, str]]) -> list[ast.expr]:
             ret = [parts[0]]
             for p in parts[1:]:
                 if isinstance(p, ast.Constant) and isinstance(ret[-1], ast.Constant):
-                    ret[-1] = ast.Constant(ret[-1].value + p.value)
+                    ret[-1] = ast.Constant(ret[-1].value + p.value)  # type: ignore[operator]
                 else:
                     ret.append(p)
             return ret
diff --git a/libs/werkzeug/sansio/http.py b/libs/werkzeug/sansio/http.py
index b2b887799f..c68a57ffb0 100644
--- a/libs/werkzeug/sansio/http.py
+++ b/libs/werkzeug/sansio/http.py
@@ -72,7 +72,6 @@ def is_resource_modified(
 
     if etag:
         etag, _ = unquote_etag(etag)
-        etag = t.cast(str, etag)
 
         if if_range is not None and if_range.etag is not None:
             unmodified = parse_etags(if_range.etag).contains(etag)
@@ -168,4 +167,4 @@ def parse_cookie(
 
 
 # circular dependencies
-from .. import datastructures as ds
+from .. import datastructures as ds  # noqa: E402
diff --git a/libs/werkzeug/sansio/multipart.py b/libs/werkzeug/sansio/multipart.py
index 731be03365..5a3844ebbe 100644
--- a/libs/werkzeug/sansio/multipart.py
+++ b/libs/werkzeug/sansio/multipart.py
@@ -79,6 +79,9 @@ class MultipartDecoder:
 
     The part data is returned as available to allow the caller to save
     the data from memory to disk, if desired.
+
+    .. versionchanged:: 3.1.4
+        Handle chunks that split a``\r\n`` sequence.
     """
 
     def __init__(
@@ -121,18 +124,6 @@ def __init__(
         self._search_position = 0
         self._parts_decoded = 0
 
-    def last_newline(self, data: bytes) -> int:
-        try:
-            last_nl = data.rindex(b"\n")
-        except ValueError:
-            last_nl = len(data)
-        try:
-            last_cr = data.rindex(b"\r")
-        except ValueError:
-            last_cr = len(data)
-
-        return min(last_nl, last_cr)
-
     def receive_data(self, data: bytes | None) -> None:
         if data is None:
             self.complete = True
@@ -232,7 +223,7 @@ def next_event(self) -> Event:
 
         return event
 
-    def _parse_headers(self, data: bytes) -> Headers:
+    def _parse_headers(self, data: bytes | bytearray) -> Headers:
         headers: list[tuple[str, str]] = []
         # Merge the continued headers into one line
         data = HEADER_CONTINUATION_RE.sub(b" ", data)
@@ -245,7 +236,9 @@ def _parse_headers(self, data: bytes) -> Headers:
                 headers.append((name.strip(), value.strip()))
         return Headers(headers)
 
-    def _parse_data(self, data: bytes, *, start: bool) -> tuple[bytes, int, bool]:
+    def _parse_data(
+        self, data: bytes | bytearray, *, start: bool
+    ) -> tuple[bytes, int, bool]:
         # Body parts must start with CRLF (or CR or LF)
         if start:
             match = LINE_BREAK_RE.match(data)
@@ -253,20 +246,10 @@ def _parse_data(self, data: bytes, *, start: bool) -> tuple[bytes, int, bool]:
         else:
             data_start = 0
 
-        boundary = b"--" + self.boundary
-
-        if self.buffer.find(boundary) == -1:
+        if self.buffer.find(b"--" + self.boundary) == -1:
             # No complete boundary in the buffer, but there may be
-            # a partial boundary at the end. As the boundary
-            # starts with either a nl or cr find the earliest and
-            # return up to that as data.
-            data_end = del_index = self.last_newline(data[data_start:]) + data_start
-            # If amount of data after last newline is far from
-            # possible length of partial boundary, we should
-            # assume that there is no partial boundary in the buffer
-            # and return all pending data.
-            if (len(data) - data_end) > len(b"\n" + boundary):
-                data_end = del_index = len(data)
+            # a partial boundary at the end.
+            data_end = del_index = self._last_partial_boundary_index(data)
             more_data = True
         else:
             match = self.boundary_re.search(data)
@@ -278,11 +261,34 @@ def _parse_data(self, data: bytes, *, start: bool) -> tuple[bytes, int, bool]:
                 data_end = match.start()
                 del_index = match.end()
             else:
-                data_end = del_index = self.last_newline(data[data_start:]) + data_start
+                data_end = del_index = self._last_partial_boundary_index(data)
             more_data = match is None
 
         return bytes(data[data_start:data_end]), del_index, more_data
 
+    def _last_partial_boundary_index(self, data: bytes | bytearray) -> int:
+        # Find the last index following which a partial boundary
+        # could be present in the data. This will be the earliest
+        # position of a LR or a CR, unless that position is more
+        # than a complete boundary from the end in which case there
+        # is no partial boundary.
+        complete_boundary_index = len(data) - len(b"\r\n--" + self.boundary)
+        try:
+            last_nl = data.rindex(b"\n")
+        except ValueError:
+            last_nl = len(data)
+        else:
+            if last_nl < complete_boundary_index:
+                last_nl = len(data)
+        try:
+            last_cr = data.rindex(b"\r")
+        except ValueError:
+            last_cr = len(data)
+        else:
+            if last_cr < complete_boundary_index:
+                last_cr = len(data)
+        return min(last_nl, last_cr)
+
 
 class MultipartEncoder:
     def __init__(self, boundary: bytes) -> None:
diff --git a/libs/werkzeug/sansio/request.py b/libs/werkzeug/sansio/request.py
index dd0805d713..8d5fbd8f8f 100644
--- a/libs/werkzeug/sansio/request.py
+++ b/libs/werkzeug/sansio/request.py
@@ -67,10 +67,8 @@ class Request:
 
     #: the class to use for `args` and `form`.  The default is an
     #: :class:`~werkzeug.datastructures.ImmutableMultiDict` which supports
-    #: multiple values per key.  alternatively it makes sense to use an
-    #: :class:`~werkzeug.datastructures.ImmutableOrderedMultiDict` which
-    #: preserves order or a :class:`~werkzeug.datastructures.ImmutableDict`
-    #: which is the fastest but only remembers the last key.  It is also
+    #: multiple values per key. A :class:`~werkzeug.datastructures.ImmutableDict`
+    #: is faster but only remembers the last key. It is also
     #: possible to use mutable structures, but this is not recommended.
     #:
     #: .. versionadded:: 0.6
diff --git a/libs/werkzeug/sansio/response.py b/libs/werkzeug/sansio/response.py
index 9093b0a8cf..a52f963de2 100644
--- a/libs/werkzeug/sansio/response.py
+++ b/libs/werkzeug/sansio/response.py
@@ -134,7 +134,7 @@ def __init__(
             self.headers["Content-Type"] = content_type
         if status is None:
             status = self.default_status
-        self.status = status  # type: ignore
+        self.status = status
 
     def __repr__(self) -> str:
         return f"<{type(self).__name__} [{self.status}]>"
@@ -146,7 +146,7 @@ def status_code(self) -> int:
 
     @status_code.setter
     def status_code(self, code: int) -> None:
-        self.status = code  # type: ignore
+        self.status = code
 
     @property
     def status(self) -> str:
@@ -197,6 +197,7 @@ def set_cookie(
         secure: bool = False,
         httponly: bool = False,
         samesite: str | None = None,
+        partitioned: bool = False,
     ) -> None:
         """Sets a cookie.
 
@@ -221,6 +222,10 @@ def set_cookie(
         :param httponly: Disallow JavaScript access to the cookie.
         :param samesite: Limit the scope of the cookie to only be
             attached to requests that are "same-site".
+        :param partitioned: If ``True``, the cookie will be partitioned.
+
+        .. versionchanged:: 3.1
+            The ``partitioned`` parameter was added.
         """
         self.headers.add(
             "Set-Cookie",
@@ -235,6 +240,7 @@ def set_cookie(
                 httponly=httponly,
                 max_size=self.max_cookie_size,
                 samesite=samesite,
+                partitioned=partitioned,
             ),
         )
 
@@ -246,6 +252,7 @@ def delete_cookie(
         secure: bool = False,
         httponly: bool = False,
         samesite: str | None = None,
+        partitioned: bool = False,
     ) -> None:
         """Delete a cookie.  Fails silently if key doesn't exist.
 
@@ -259,6 +266,7 @@ def delete_cookie(
         :param httponly: Disallow JavaScript access to the cookie.
         :param samesite: Limit the scope of the cookie to only be
             attached to requests that are "same-site".
+        :param partitioned: If ``True``, the cookie will be partitioned.
         """
         self.set_cookie(
             key,
@@ -269,6 +277,7 @@ def delete_cookie(
             secure=secure,
             httponly=httponly,
             samesite=samesite,
+            partitioned=partitioned,
         )
 
     @property
@@ -570,7 +579,7 @@ def www_authenticate(self) -> WWWAuthenticate:
         To unset this header, assign ``None`` or use ``del``.
 
         .. versionchanged:: 2.3
-            This attribute can be assigned to to set the header. A list can be assigned
+            This attribute can be assigned to set the header. A list can be assigned
             to set multiple header values. Use ``del`` to unset the header.
 
         .. versionchanged:: 2.3
diff --git a/libs/werkzeug/sansio/utils.py b/libs/werkzeug/sansio/utils.py
index 14fa0ac88c..ff7ceda340 100644
--- a/libs/werkzeug/sansio/utils.py
+++ b/libs/werkzeug/sansio/utils.py
@@ -71,6 +71,9 @@ def get_host(
     :return: Host, with port if necessary.
     :raise ~werkzeug.exceptions.SecurityError: If the host is not
         trusted.
+
+    .. versionchanged:: 3.1.3
+        If ``SERVER_NAME`` is IPv6, it is wrapped in ``[]``.
     """
     host = ""
 
@@ -79,6 +82,11 @@ def get_host(
     elif server is not None:
         host = server[0]
 
+        # If SERVER_NAME is IPv6, wrap it in [] to match Host header.
+        # Check for : because domain or IPv4 can't have that.
+        if ":" in host and host[0] != "[":
+            host = f"[{host}]"
+
         if server[1] is not None:
             host = f"{host}:{server[1]}"
 
diff --git a/libs/werkzeug/security.py b/libs/werkzeug/security.py
index 997597990e..9ae51176b9 100644
--- a/libs/werkzeug/security.py
+++ b/libs/werkzeug/security.py
@@ -7,11 +7,22 @@
 import secrets
 
 SALT_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-DEFAULT_PBKDF2_ITERATIONS = 600000
+DEFAULT_PBKDF2_ITERATIONS = 1_000_000
 
 _os_alt_seps: list[str] = list(
-    sep for sep in [os.sep, os.path.altsep] if sep is not None and sep != "/"
+    sep for sep in [os.sep, os.altsep] if sep is not None and sep != "/"
 )
+# https://chrisdenton.github.io/omnipath/Special%20Dos%20Device%20Names.html
+_windows_device_files = {
+    "AUX",
+    "CON",
+    "CONIN$",
+    "CONOUT$",
+    *(f"COM{c}" for c in "123456789ยนยฒยณ"),
+    *(f"LPT{c}" for c in "123456789ยนยฒยณ"),
+    "NUL",
+    "PRN",
+}
 
 
 def gen_salt(length: int) -> str:
@@ -92,6 +103,9 @@ def generate_password_hash(
     :param method: The key derivation function and parameters.
     :param salt_length: The number of characters to generate for the salt.
 
+    .. versionchanged:: 3.1
+        The default iterations for pbkdf2 was increased to 1,000,000.
+
     .. versionchanged:: 2.3
         Scrypt support was added.
 
@@ -128,14 +142,29 @@ def check_password_hash(pwhash: str, password: str) -> bool:
     return hmac.compare_digest(_hash_internal(method, salt, password)[0], hashval)
 
 
-def safe_join(directory: str, *pathnames: str) -> str | None:
-    """Safely join zero or more untrusted path components to a base
+def safe_join(directory: str, *untrusted: str) -> str | None:
+    """Safely join zero or more untrusted path components to a trusted base
     directory to avoid escaping the base directory.
 
+    The untrusted path is assumed to be from/for a URL, such as for serving
+    files. Therefore, it should only use the forward slash ``/`` path separator,
+    and will be joined using that separator. On Windows, the backslash ``\\``
+    separator is not allowed.
+
     :param directory: The trusted base directory.
-    :param pathnames: The untrusted path components relative to the
+    :param untrusted: The untrusted path components relative to the
         base directory.
     :return: A safe path, otherwise ``None``.
+
+    .. versionchanged:: 3.1.6
+        Special device names in multi-segment paths are not allowed on Windows.
+
+    .. versionchanged:: 3.1.5
+        More special device names, regardless of extension or trailing spaces,
+        are not allowed on Windows.
+
+    .. versionchanged:: 3.1.4
+        Special device names are not allowed on Windows.
     """
     if not directory:
         # Ensure we end up with ./path if directory="" is given,
@@ -144,20 +173,29 @@ def safe_join(directory: str, *pathnames: str) -> str | None:
 
     parts = [directory]
 
-    for filename in pathnames:
-        if filename != "":
-            filename = posixpath.normpath(filename)
+    for part in untrusted:
+        if not part:
+            continue
+
+        part = posixpath.normpath(part)
 
         if (
-            any(sep in filename for sep in _os_alt_seps)
-            or os.path.isabs(filename)
-            # ntpath.isabs doesn't catch this on Python < 3.11
-            or filename.startswith("/")
-            or filename == ".."
-            or filename.startswith("../")
+            os.path.isabs(part)
+            # ntpath.isabs doesn't catch this
+            or part.startswith("/")
+            or part == ".."
+            or part.startswith("../")
+            or any(sep in part for sep in _os_alt_seps)
+            or (
+                os.name == "nt"
+                and any(
+                    p.partition(".")[0].strip().upper() in _windows_device_files
+                    for p in part.split("/")
+                )
+            )
         ):
             return None
 
-        parts.append(filename)
+        parts.append(part)
 
     return posixpath.join(*parts)
diff --git a/libs/werkzeug/serving.py b/libs/werkzeug/serving.py
index ef32b88115..8605cfd6df 100644
--- a/libs/werkzeug/serving.py
+++ b/libs/werkzeug/serving.py
@@ -81,7 +81,7 @@ class ForkingMixIn:  # type: ignore
 LISTEN_QUEUE = 128
 
 _TSSLContextArg = t.Optional[
-    t.Union["ssl.SSLContext", t.Tuple[str, t.Optional[str]], t.Literal["adhoc"]]
+    t.Union["ssl.SSLContext", tuple[str, t.Optional[str]], t.Literal["adhoc"]]
 ]
 
 if t.TYPE_CHECKING:
@@ -774,8 +774,8 @@ def __init__(
 
                     if sys.platform == "darwin" and port == 5000:
                         print(
-                            "On macOS, try disabling the 'AirPlay Receiver' service"
-                            " from System Preferences -> General -> AirDrop & Handoff.",
+                            "On macOS, try searching for and disabling"
+                            " 'AirPlay Receiver' in System Settings.",
                             file=sys.stderr,
                         )
 
diff --git a/libs/werkzeug/test.py b/libs/werkzeug/test.py
index 38f69bfb9d..58b4ce7faf 100644
--- a/libs/werkzeug/test.py
+++ b/libs/werkzeug/test.py
@@ -326,7 +326,7 @@ def __init__(
         self.request_uri = path
         if base_url is not None:
             base_url = iri_to_uri(base_url)
-        self.base_url = base_url  # type: ignore
+        self.base_url = base_url
         if isinstance(query_string, str):
             self.query_string = query_string
         else:
@@ -656,7 +656,7 @@ def close(self) -> None:
         try:
             files = self.files.values()
         except AttributeError:
-            files = ()  # type: ignore
+            files = ()
         for f in files:
             try:
                 f.close()
@@ -818,7 +818,7 @@ def __init__(
                 {},
             )
 
-        self.response_wrapper = t.cast(t.Type["TestResponse"], response_wrapper)
+        self.response_wrapper = t.cast(type["TestResponse"], response_wrapper)
 
         if use_cookies:
             self._cookies: dict[tuple[str, str, str], Cookie] | None = {}
@@ -1431,7 +1431,7 @@ def _to_request_header(self) -> str:
     def _from_response_header(cls, server_name: str, path: str, header: str) -> te.Self:
         header, _, parameters_str = header.partition(";")
         key, _, value = header.partition("=")
-        decoded_key, decoded_value = next(parse_cookie(header).items())
+        decoded_key, decoded_value = next(parse_cookie(header).items())  # type: ignore[call-overload]
         params = {}
 
         for item in parameters_str.split(";"):
diff --git a/libs/werkzeug/utils.py b/libs/werkzeug/utils.py
index 59b97b732d..0d4a700f08 100644
--- a/libs/werkzeug/utils.py
+++ b/libs/werkzeug/utils.py
@@ -21,6 +21,7 @@
 from .datastructures import Headers
 from .exceptions import NotFound
 from .exceptions import RequestedRangeNotSatisfiable
+from .security import _windows_device_files
 from .security import safe_join
 from .wsgi import wrap_file
 
@@ -34,14 +35,6 @@
 
 _entity_re = re.compile(r"&([^;]+);")
 _filename_ascii_strip_re = re.compile(r"[^A-Za-z0-9_.-]")
-_windows_device_files = {
-    "CON",
-    "PRN",
-    "AUX",
-    "NUL",
-    *(f"COM{i}" for i in range(10)),
-    *(f"LPT{i}" for i in range(10)),
-}
 
 
 class cached_property(property, t.Generic[_T]):
@@ -150,7 +143,7 @@ def lookup(self, obj: Request) -> WSGIEnvironment:
 class header_property(_DictAccessorProperty[_TAccessorValue]):
     """Like `environ_property` but for headers."""
 
-    def lookup(self, obj: Request | Response) -> Headers:
+    def lookup(self, obj: Request | Response) -> Headers:  # type: ignore[override]
         return obj.headers
 
 
diff --git a/libs/werkzeug/wrappers/request.py b/libs/werkzeug/wrappers/request.py
index 344f28b607..9f1eee1184 100644
--- a/libs/werkzeug/wrappers/request.py
+++ b/libs/werkzeug/wrappers/request.py
@@ -84,8 +84,11 @@ class Request(_SansIORequest):
     #: data in memory for post data is longer than the specified value a
     #: :exc:`~werkzeug.exceptions.RequestEntityTooLarge` exception is raised.
     #:
+    #: .. versionchanged:: 3.1
+    #:     Defaults to 500kB instead of unlimited.
+    #:
     #: .. versionadded:: 0.5
-    max_form_memory_size: int | None = None
+    max_form_memory_size: int | None = 500_000
 
     #: The maximum number of multipart parts to parse, passed to
     #: :attr:`form_data_parser_class`. Parsing form data with more than this
@@ -496,7 +499,7 @@ def files(self) -> ImmutableMultiDict[str, FileStorage]:
 
     @property
     def script_root(self) -> str:
-        """Alias for :attr:`self.root_path`. ``environ["SCRIPT_ROOT"]``
+        """Alias for :attr:`self.root_path`. ``environ["SCRIPT_NAME"]``
         without a trailing slash.
         """
         return self.root_path
@@ -539,7 +542,7 @@ def url_root(self) -> str:
     json_module = json
 
     @property
-    def json(self) -> t.Any | None:
+    def json(self) -> t.Any:
         """The parsed JSON data if :attr:`mimetype` indicates JSON
         (:mimetype:`application/json`, see :attr:`is_json`).
 
diff --git a/libs/werkzeug/wrappers/response.py b/libs/werkzeug/wrappers/response.py
index 7f01287c71..e05fa8a129 100644
--- a/libs/werkzeug/wrappers/response.py
+++ b/libs/werkzeug/wrappers/response.py
@@ -697,7 +697,7 @@ def _process_range_request(
         content_length = range_tuple[1] - range_tuple[0]
         self.headers["Content-Length"] = str(content_length)
         self.headers["Accept-Ranges"] = accept_ranges
-        self.content_range = content_range_header  # type: ignore
+        self.content_range = content_range_header
         self.status_code = 206
         self._wrap_range_response(range_tuple[0], content_length)
         return True
diff --git a/libs/werkzeug/wsgi.py b/libs/werkzeug/wsgi.py
index 01d40af2f1..2d071c789e 100644
--- a/libs/werkzeug/wsgi.py
+++ b/libs/werkzeug/wsgi.py
@@ -75,7 +75,7 @@ def _get_server(
         return None
 
     try:
-        port: int | None = int(environ.get("SERVER_PORT", None))
+        port: int | None = int(environ.get("SERVER_PORT", None))  # type: ignore[arg-type]
     except (TypeError, ValueError):
         # unix socket
         port = None
diff --git a/libs/whichcraft-0.6.1.dist-info/METADATA b/libs/whichcraft-0.6.1.dist-info/METADATA
index 65f7ffe1c4..64d63a3aca 100644
--- a/libs/whichcraft-0.6.1.dist-info/METADATA
+++ b/libs/whichcraft-0.6.1.dist-info/METADATA
@@ -1,4 +1,4 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: whichcraft
 Version: 0.6.1
 Summary: This package provides cross-platform cross-python shutil.which functionality.
@@ -18,6 +18,15 @@ Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
 License-File: LICENSE
 License-File: AUTHORS.rst
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: summary
 
 ===============================
 whichcraft
diff --git a/libs/whichcraft-0.6.1.dist-info/RECORD b/libs/whichcraft-0.6.1.dist-info/RECORD
index b8d27bb100..fab939b1a4 100644
--- a/libs/whichcraft-0.6.1.dist-info/RECORD
+++ b/libs/whichcraft-0.6.1.dist-info/RECORD
@@ -1,9 +1,9 @@
-whichcraft-0.6.1.dist-info/AUTHORS.rst,sha256=Y0XPYwoQhQt9XbprIMgTzV8uglUKFqWEYP3UZ-vvpi4,258
 whichcraft-0.6.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-whichcraft-0.6.1.dist-info/LICENSE,sha256=n71RpK0Ii5kBFDiVbTazuc0wmKqdazJmdWN4BJYLYN8,1483
-whichcraft-0.6.1.dist-info/METADATA,sha256=vG0R1Q5gf1OXFkz6vX9V_WfyV37IuJAjBWm1oaovHKQ,4402
+whichcraft-0.6.1.dist-info/METADATA,sha256=8xkuTfmFxf7nR06GnAN5xNroygsfvLU3APeBQyf7R78,4574
 whichcraft-0.6.1.dist-info/RECORD,,
 whichcraft-0.6.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-whichcraft-0.6.1.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+whichcraft-0.6.1.dist-info/WHEEL,sha256=Mk1ST5gDzEO5il5kYREiBnzzM469m5sI8ESPl7TRhJY,110
+whichcraft-0.6.1.dist-info/licenses/AUTHORS.rst,sha256=Y0XPYwoQhQt9XbprIMgTzV8uglUKFqWEYP3UZ-vvpi4,258
+whichcraft-0.6.1.dist-info/licenses/LICENSE,sha256=n71RpK0Ii5kBFDiVbTazuc0wmKqdazJmdWN4BJYLYN8,1483
 whichcraft-0.6.1.dist-info/top_level.txt,sha256=wPmypPyZ-IEwCZ3_RA4N6AtD5qNCrythctNZYrmANrE,11
 whichcraft.py,sha256=shRQHSa61RgwYR6zsMMHstumoVuWJtovvrJ5z-OiOvY,2881
diff --git a/libs/whichcraft-0.6.1.dist-info/WHEEL b/libs/whichcraft-0.6.1.dist-info/WHEEL
index f31e450fda..798dd6195b 100644
--- a/libs/whichcraft-0.6.1.dist-info/WHEEL
+++ b/libs/whichcraft-0.6.1.dist-info/WHEEL
@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any
diff --git a/libs/whichcraft-0.6.1.dist-info/AUTHORS.rst b/libs/whichcraft-0.6.1.dist-info/licenses/AUTHORS.rst
similarity index 100%
rename from libs/whichcraft-0.6.1.dist-info/AUTHORS.rst
rename to libs/whichcraft-0.6.1.dist-info/licenses/AUTHORS.rst
diff --git a/libs/whichcraft-0.6.1.dist-info/LICENSE b/libs/whichcraft-0.6.1.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/whichcraft-0.6.1.dist-info/LICENSE
rename to libs/whichcraft-0.6.1.dist-info/licenses/LICENSE
diff --git a/libs/wsproto-1.2.0.dist-info/METADATA b/libs/wsproto-1.2.0.dist-info/METADATA
deleted file mode 100644
index b39453f7af..0000000000
--- a/libs/wsproto-1.2.0.dist-info/METADATA
+++ /dev/null
@@ -1,177 +0,0 @@
-Metadata-Version: 2.1
-Name: wsproto
-Version: 1.2.0
-Summary: WebSockets state-machine based protocol implementation
-Home-page: https://github.com/python-hyper/wsproto/
-Author: Benno Rice
-Author-email: benno@jeamland.net
-License: MIT License
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.7.0
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Requires-Dist: h11 <1,>=0.9.0
-
-========================================================
-Pure Python, pure state-machine WebSocket implementation
-========================================================
-
-.. image:: https://github.com/python-hyper/wsproto/workflows/CI/badge.svg
-    :target: https://github.com/python-hyper/wsproto/actions
-    :alt: Build Status
-.. image:: https://codecov.io/gh/python-hyper/wsproto/branch/main/graph/badge.svg
-    :target: https://codecov.io/gh/python-hyper/wsproto
-    :alt: Code Coverage
-.. image:: https://readthedocs.org/projects/wsproto/badge/?version=latest
-    :target: https://wsproto.readthedocs.io/en/latest/
-    :alt: Documentation Status
-.. image:: https://img.shields.io/badge/chat-join_now-brightgreen.svg
-    :target: https://gitter.im/python-hyper/community
-    :alt: Chat community
-
-
-This repository contains a pure-Python implementation of a WebSocket protocol
-stack. It's written from the ground up to be embeddable in whatever program you
-choose to use, ensuring that you can communicate via WebSockets, as defined in
-`RFC6455 <https://tools.ietf.org/html/rfc6455>`_, regardless of your programming
-paradigm.
-
-This repository does not provide a parsing layer, a network layer, or any rules
-about concurrency. Instead, it's a purely in-memory solution, defined in terms
-of data actions and WebSocket frames. RFC6455 and Compression Extensions for
-WebSocket via `RFC7692 <https://tools.ietf.org/html/rfc7692>`_ are fully
-supported.
-
-wsproto supports Python 3.6.1 or higher.
-
-To install it, just run:
-
-.. code-block:: console
-
-    $ pip install wsproto
-
-
-Usage
-=====
-
-Let's assume you have some form of network socket available. wsproto client
-connections automatically generate a HTTP request to initiate the WebSocket
-handshake. To create a WebSocket client connection:
-
-.. code-block:: python
-
-  from wsproto import WSConnection, ConnectionType
-  from wsproto.events import Request
-
-  ws = WSConnection(ConnectionType.CLIENT)
-  ws.send(Request(host='echo.websocket.org', target='/'))
-
-To create a WebSocket server connection:
-
-.. code-block:: python
-
-  from wsproto.connection import WSConnection, ConnectionType
-
-  ws = WSConnection(ConnectionType.SERVER)
-
-Every time you send a message, or call a ping, or simply if you receive incoming
-data, wsproto might respond with some outgoing data that you have to send:
-
-.. code-block:: python
-
-  some_socket.send(ws.bytes_to_send())
-
-Both connection types need to receive incoming data:
-
-.. code-block:: python
-
-  ws.receive_data(some_byte_string_of_data)
-
-And wsproto will issue events if the data contains any WebSocket messages or state changes:
-
-.. code-block:: python
-
-  for event in ws.events():
-      if isinstance(event, Request):
-          # only client connections get this event
-          ws.send(AcceptConnection())
-      elif isinstance(event, CloseConnection):
-          # guess nobody wants to talk to us any more...
-      elif isinstance(event, TextMessage):
-          print('We got text!', event.data)
-      elif isinstance(event, BytesMessage):
-          print('We got bytes!', event.data)
-
-Take a look at our docs for a `full list of events
-<https://wsproto.readthedocs.io/en/latest/api.html#events>`!
-
-Testing
-=======
-
-It passes the autobahn test suite completely and strictly in both client and
-server modes and using permessage-deflate.
-
-If you want to run the compliance tests, go into the compliance directory and
-then to test client mode, in one shell run the Autobahn test server:
-
-.. code-block:: console
-
-    $ wstest -m fuzzingserver -s ws-fuzzingserver.json
-
-And in another shell run the test client:
-
-.. code-block:: console
-
-    $ python test_client.py
-
-And to test server mode, run the test server:
-
-.. code-block:: console
-
-    $ python test_server.py
-
-And in another shell run the Autobahn test client:
-
-.. code-block:: console
-
-    $ wstest -m fuzzingclient -s ws-fuzzingclient.json
-
-
-Documentation
-=============
-
-Documentation is available at https://wsproto.readthedocs.io/en/latest/.
-
-Contributing
-============
-
-``wsproto`` welcomes contributions from anyone! Unlike many other projects we
-are happy to accept cosmetic contributions and small contributions, in addition
-to large feature requests and changes.
-
-Before you contribute (either by opening an issue or filing a pull request),
-please `read the contribution guidelines`_.
-
-.. _read the contribution guidelines: http://python-hyper.org/en/latest/contributing.html
-
-License
-=======
-
-``wsproto`` is made available under the MIT License. For more details, see the
-``LICENSE`` file in the repository.
-
-Authors
-=======
-
-``wsproto`` was created by @jeamland, and is maintained by the python-hyper
-community.
diff --git a/libs/wsproto-1.2.0.dist-info/RECORD b/libs/wsproto-1.2.0.dist-info/RECORD
deleted file mode 100644
index 6c85d79629..0000000000
--- a/libs/wsproto-1.2.0.dist-info/RECORD
+++ /dev/null
@@ -1,16 +0,0 @@
-wsproto-1.2.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-wsproto-1.2.0.dist-info/LICENSE,sha256=wDKajb80N7CV9_XPQlfWu4VeBxIMroeGWGBz_3ppmVk,1093
-wsproto-1.2.0.dist-info/METADATA,sha256=Er2koxzHTEB6zIKU9dJbSXtihhFZrW10_7StjJnOAmI,5605
-wsproto-1.2.0.dist-info/RECORD,,
-wsproto-1.2.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wsproto-1.2.0.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-wsproto-1.2.0.dist-info/top_level.txt,sha256=BUdIrwL11zET0fkWkYRJ1yZKrEfvDF9DZqjhABOio6Y,8
-wsproto/__init__.py,sha256=zQSIjLjveTHwyhGAfqG_n_cVl54hTkeV6vuad1cnEOE,2887
-wsproto/connection.py,sha256=LhsbokxZUmAtMsOFFZ45puZDPyIXNEmq7SanE7swAgE,6813
-wsproto/events.py,sha256=DW7YQ823oK3MjXHqcPvjJzjBGk5UGuMO_rpNnKgmmW8,7979
-wsproto/extensions.py,sha256=VlnojvsC2AO7vbUkw_TOqCgtmHb1dSplXeRwjMfjCo4,11211
-wsproto/frame_protocol.py,sha256=B5p_wRq54gvTihegbJ39RkONrdhtipoYDEiYq95BdAk,23401
-wsproto/handshake.py,sha256=hPqTo15MqOxYlvcNYTo-bIzQJHtRLq8qq2jBdHdz2x8,18036
-wsproto/py.typed,sha256=sow9soTwP9T_gEAQSVh7Gb8855h04Nwmhs2We-JRgZM,7
-wsproto/typing.py,sha256=Ryf6eOhAzfZlHCFELiiayDzNqdXQG7JKccblOqNx6Wo,68
-wsproto/utilities.py,sha256=5qmPXSUhUp2GESgvgIacZ7N4uqd0vBijhVV7t6XTiZw,2816
diff --git a/libs/wsproto-1.2.0.dist-info/WHEEL b/libs/wsproto-1.2.0.dist-info/WHEEL
deleted file mode 100644
index ba48cbcf92..0000000000
--- a/libs/wsproto-1.2.0.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/wsproto-1.2.0.dist-info/INSTALLER b/libs/wsproto-1.3.2.dist-info/INSTALLER
similarity index 100%
rename from libs/wsproto-1.2.0.dist-info/INSTALLER
rename to libs/wsproto-1.3.2.dist-info/INSTALLER
diff --git a/libs/wsproto-1.3.2.dist-info/METADATA b/libs/wsproto-1.3.2.dist-info/METADATA
new file mode 100644
index 0000000000..55447640bf
--- /dev/null
+++ b/libs/wsproto-1.3.2.dist-info/METADATA
@@ -0,0 +1,151 @@
+Metadata-Version: 2.4
+Name: wsproto
+Version: 1.3.2
+Summary: Pure-Python WebSocket protocol implementation
+Author-email: Benno Rice <benno@jeamland.net>
+Maintainer-email: Thomas Kriechbaumer <thomas@kriechbaumer.name>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/python-hyper/wsproto/
+Project-URL: Bug Reports, https://github.com/python-hyper/wsproto/issues
+Project-URL: Source, https://github.com/python-hyper/wsproto/
+Project-URL: Documentation, https://python-hyper.org/
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.10
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Requires-Dist: h11<1,>=0.16.0
+Dynamic: license-file
+
+========================================================
+Pure Python, pure state-machine WebSocket implementation
+========================================================
+
+.. image:: https://github.com/python-hyper/wsproto/workflows/CI/badge.svg
+    :target: https://github.com/python-hyper/wsproto/actions
+    :alt: Build Status
+.. image:: https://codecov.io/gh/python-hyper/wsproto/branch/main/graph/badge.svg
+    :target: https://codecov.io/gh/python-hyper/wsproto
+    :alt: Code Coverage
+.. image:: https://readthedocs.org/projects/wsproto/badge/?version=latest
+    :target: https://wsproto.readthedocs.io/en/latest/
+    :alt: Documentation Status
+.. image:: https://img.shields.io/badge/chat-join_now-brightgreen.svg
+    :target: https://gitter.im/python-hyper/community
+    :alt: Chat community
+
+
+This repository contains a pure-Python implementation of a WebSocket protocol
+stack. It's written from the ground up to be embeddable in whatever program you
+choose to use, ensuring that you can communicate via WebSockets, as defined in
+`RFC6455 <https://tools.ietf.org/html/rfc6455>`_, regardless of your programming
+paradigm.
+
+This repository does not provide a parsing layer, a network layer, or any rules
+about concurrency. Instead, it's a purely in-memory solution, defined in terms
+of data actions and WebSocket frames. RFC6455 and Compression Extensions for
+WebSocket via `RFC7692 <https://tools.ietf.org/html/rfc7692>`_ are fully
+supported.
+
+wsproto supports Python 3.6.1 or higher.
+
+To install it, just run:
+
+.. code-block:: console
+
+    $ pip install wsproto
+
+
+Usage
+=====
+
+Let's assume you have some form of network socket available. wsproto client
+connections automatically generate a HTTP request to initiate the WebSocket
+handshake. To create a WebSocket client connection:
+
+.. code-block:: python
+
+  from wsproto import WSConnection, ConnectionType
+  from wsproto.events import Request
+
+  ws = WSConnection(ConnectionType.CLIENT)
+  ws.send(Request(host='echo.websocket.org', target='/'))
+
+To create a WebSocket server connection:
+
+.. code-block:: python
+
+  from wsproto.connection import WSConnection, ConnectionType
+
+  ws = WSConnection(ConnectionType.SERVER)
+
+Every time you send a message, or call a ping, or simply if you receive incoming
+data, wsproto might respond with some outgoing data that you have to send:
+
+.. code-block:: python
+
+  some_socket.send(ws.bytes_to_send())
+
+Both connection types need to receive incoming data:
+
+.. code-block:: python
+
+  ws.receive_data(some_byte_string_of_data)
+
+And wsproto will issue events if the data contains any WebSocket messages or state changes:
+
+.. code-block:: python
+
+  for event in ws.events():
+      if isinstance(event, Request):
+          # only client connections get this event
+          ws.send(AcceptConnection())
+      elif isinstance(event, CloseConnection):
+          # guess nobody wants to talk to us any more...
+      elif isinstance(event, TextMessage):
+          print('We got text!', event.data)
+      elif isinstance(event, BytesMessage):
+          print('We got bytes!', event.data)
+
+Take a look at our docs for a `full list of events
+<https://wsproto.readthedocs.io/en/latest/api.html#events>`!
+
+
+Documentation
+=============
+
+Documentation is available at https://wsproto.readthedocs.io/en/latest/.
+
+Contributing
+============
+
+``wsproto`` welcomes contributions from anyone! Unlike many other projects we
+are happy to accept cosmetic contributions and small contributions, in addition
+to large feature requests and changes.
+
+Before you contribute (either by opening an issue or filing a pull request),
+please `read the contribution guidelines`_.
+
+.. _read the contribution guidelines: http://python-hyper.org/en/latest/contributing.html
+
+License
+=======
+
+``wsproto`` is made available under the MIT License. For more details, see the
+``LICENSE`` file in the repository.
+
+Authors
+=======
+
+``wsproto`` was created by @jeamland, and is maintained by the python-hyper
+community.
diff --git a/libs/wsproto-1.3.2.dist-info/RECORD b/libs/wsproto-1.3.2.dist-info/RECORD
new file mode 100644
index 0000000000..d7ecca9690
--- /dev/null
+++ b/libs/wsproto-1.3.2.dist-info/RECORD
@@ -0,0 +1,16 @@
+wsproto-1.3.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+wsproto-1.3.2.dist-info/METADATA,sha256=x1jpf4dvbHzS_ZUXtQqzQRDza3MymfwNQ9GusewVTck,5241
+wsproto-1.3.2.dist-info/RECORD,,
+wsproto-1.3.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wsproto-1.3.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+wsproto-1.3.2.dist-info/licenses/LICENSE,sha256=wDKajb80N7CV9_XPQlfWu4VeBxIMroeGWGBz_3ppmVk,1093
+wsproto-1.3.2.dist-info/top_level.txt,sha256=BUdIrwL11zET0fkWkYRJ1yZKrEfvDF9DZqjhABOio6Y,8
+wsproto/__init__.py,sha256=GBeD_kCruLDNMqwo_P4pfGqQ4bEImgBKmNvAG-DL7vA,2969
+wsproto/connection.py,sha256=uo8A6cI8L8GF1Wcd435HivN3U591HMPMlmgqTTKB-58,7192
+wsproto/events.py,sha256=vMJ79XSFv3XWR91-SlTIHAGHW3-QuRgtITqgT6bLg3I,7933
+wsproto/extensions.py,sha256=qmAGZ6VomtO1aAtqVVjKCqZZDJbWGoFJd3-KOpA-wfk,11210
+wsproto/frame_protocol.py,sha256=x0qWLhre8kd-6iMcpDWdXfafyP7vYyenFYIA4faaQmI,24083
+wsproto/handshake.py,sha256=bWq0sGt-y4LUeupTMhu-7eDTZV2e8jYVzov56ofZvBY,18582
+wsproto/py.typed,sha256=sow9soTwP9T_gEAQSVh7Gb8855h04Nwmhs2We-JRgZM,7
+wsproto/typing.py,sha256=SD8omn-rHreLdlX9rfhl-jCBWMzs0hFBL2hvxnQOnjA,72
+wsproto/utilities.py,sha256=xhGJy-tgIVSKBR4P_K9wK-W2Jt-P3u5kUy9nLPGVM3E,2869
diff --git a/libs/wsproto-1.3.2.dist-info/REQUESTED b/libs/wsproto-1.3.2.dist-info/REQUESTED
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/wsproto-1.3.2.dist-info/WHEEL b/libs/wsproto-1.3.2.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/wsproto-1.3.2.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/wsproto-1.2.0.dist-info/LICENSE b/libs/wsproto-1.3.2.dist-info/licenses/LICENSE
similarity index 100%
rename from libs/wsproto-1.2.0.dist-info/LICENSE
rename to libs/wsproto-1.3.2.dist-info/licenses/LICENSE
diff --git a/libs/wsproto-1.2.0.dist-info/top_level.txt b/libs/wsproto-1.3.2.dist-info/top_level.txt
similarity index 100%
rename from libs/wsproto-1.2.0.dist-info/top_level.txt
rename to libs/wsproto-1.3.2.dist-info/top_level.txt
diff --git a/libs/wsproto/__init__.py b/libs/wsproto/__init__.py
index 46fde3fc44..7d097cc3d2 100644
--- a/libs/wsproto/__init__.py
+++ b/libs/wsproto/__init__.py
@@ -4,14 +4,20 @@
 
 A WebSocket implementation.
 """
-from typing import Generator, Optional, Union
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from .connection import Connection, ConnectionState, ConnectionType
-from .events import Event
 from .handshake import H11Handshake
-from .typing import Headers
 
-__version__ = "1.2.0"
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+    from .events import Event
+    from .typing import Headers
+
+__version__ = "1.3.2"
 
 
 class WSConnection:
@@ -28,7 +34,7 @@ def __init__(self, connection_type: ConnectionType) -> None:
         """
         self.client = connection_type is ConnectionType.CLIENT
         self.handshake = H11Handshake(connection_type)
-        self.connection: Optional[Connection] = None
+        self.connection: Connection | None = None
 
     @property
     def state(self) -> ConnectionState:
@@ -41,7 +47,7 @@ def state(self) -> ConnectionState:
         return self.connection.state
 
     def initiate_upgrade_connection(
-        self, headers: Headers, path: Union[bytes, str]
+        self, headers: Headers, path: bytes | str,
     ) -> None:
         self.handshake.initiate_upgrade_connection(headers, path)
 
@@ -64,7 +70,7 @@ def send(self, event: Event) -> bytes:
             data += self.connection.send(event)
         return data
 
-    def receive_data(self, data: Optional[bytes]) -> None:
+    def receive_data(self, data: bytes | None) -> None:
         """
         Feed network data into the connection instance.
 
diff --git a/libs/wsproto/connection.py b/libs/wsproto/connection.py
index 4439165e5d..1af3aac83c 100644
--- a/libs/wsproto/connection.py
+++ b/libs/wsproto/connection.py
@@ -4,10 +4,11 @@
 
 An implementation of a WebSocket connection.
 """
+from __future__ import annotations
 
 from collections import deque
 from enum import Enum
-from typing import Deque, Generator, List, Optional
+from typing import TYPE_CHECKING
 
 from .events import (
     BytesMessage,
@@ -18,10 +19,14 @@
     Pong,
     TextMessage,
 )
-from .extensions import Extension
 from .frame_protocol import CloseReason, FrameProtocol, Opcode, ParseFailed
 from .utilities import LocalProtocolError
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
+    from .extensions import Extension
+
 
 class ConnectionState(Enum):
     """
@@ -63,21 +68,26 @@ class Connection:
     This wraps two other protocol objects, an HTTP/1.1 protocol object used
     to do the initial HTTP upgrade handshake and a WebSocket frame protocol
     object used to exchange messages and other control frames.
-
-    :param conn_type: Whether this object is on the client- or server-side of
-        a connection. To initialise as a client pass ``CLIENT`` otherwise
-        pass ``SERVER``.
-    :type conn_type: ``ConnectionType``
     """
 
     def __init__(
         self,
         connection_type: ConnectionType,
-        extensions: Optional[List[Extension]] = None,
+        extensions: list[Extension] | None = None,
         trailing_data: bytes = b"",
     ) -> None:
+        """
+        Constructor
+
+        :param wsproto.connection.ConnectionType connection_type: Whether this
+            object is on the client- or server-side of a connection.
+            To initialise as a client pass ``CLIENT`` otherwise pass ``SERVER``.
+        :param list extensions: The proposed extensions.
+        :param bytes trailing_data: Data that has been received, but not yet
+            processed.
+        """
         self.client = connection_type is ConnectionType.CLIENT
-        self._events: Deque[Event] = deque()
+        self._events: deque[Event] = deque()
         self._proto = FrameProtocol(self.client, extensions or [])
         self._state = ConnectionState.OPEN
         self.receive_data(trailing_data)
@@ -104,12 +114,13 @@ def send(self, event: Event) -> bytes:
             else:
                 self._state = ConnectionState.LOCAL_CLOSING
         else:
+            msg = f"Event {event} cannot be sent in state {self.state}."
             raise LocalProtocolError(
-                f"Event {event} cannot be sent in state {self.state}."
+                msg,
             )
         return data
 
-    def receive_data(self, data: Optional[bytes]) -> None:
+    def receive_data(self, data: bytes | None) -> None:
         """
         Pass some received data to the connection for handling.
 
@@ -119,7 +130,6 @@ def receive_data(self, data: Optional[bytes]) -> None:
         :param data: The data received from the remote peer on the network.
         :type data: ``bytes``
         """
-
         if data is None:
             # "If _The WebSocket Connection is Closed_ and no Close control
             # frame was received by the endpoint (such as could occur if the
@@ -132,7 +142,8 @@ def receive_data(self, data: Optional[bytes]) -> None:
         if self.state in (ConnectionState.OPEN, ConnectionState.LOCAL_CLOSING):
             self._proto.receive_bytes(data)
         elif self.state is ConnectionState.CLOSED:
-            raise LocalProtocolError("Connection already closed.")
+            msg = "Connection already closed."
+            raise LocalProtocolError(msg)
         else:
             pass  # pragma: no cover
 
@@ -149,12 +160,14 @@ def events(self) -> Generator[Event, None, None]:
         try:
             for frame in self._proto.received_frames():
                 if frame.opcode is Opcode.PING:
-                    assert frame.frame_finished and frame.message_finished
+                    assert frame.frame_finished
+                    assert frame.message_finished
                     assert isinstance(frame.payload, (bytes, bytearray))
                     yield Ping(payload=frame.payload)
 
                 elif frame.opcode is Opcode.PONG:
-                    assert frame.frame_finished and frame.message_finished
+                    assert frame.frame_finished
+                    assert frame.message_finished
                     assert isinstance(frame.payload, (bytes, bytearray))
                     yield Pong(payload=frame.payload)
 
diff --git a/libs/wsproto/events.py b/libs/wsproto/events.py
index d758f8aa7a..9474654e9a 100644
--- a/libs/wsproto/events.py
+++ b/libs/wsproto/events.py
@@ -4,12 +4,18 @@
 
 Events that result from processing data on a WebSocket connection.
 """
+
+from __future__ import annotations
+
 from abc import ABC
 from dataclasses import dataclass, field
-from typing import Generic, List, Optional, Sequence, TypeVar, Union
+from typing import TYPE_CHECKING, Generic, TypeVar
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
-from .extensions import Extension
-from .typing import Headers
+    from .extensions import Extension
+    from .typing import Headers
 
 
 class Event(ABC):
@@ -22,7 +28,8 @@ class Event(ABC):
 
 @dataclass(frozen=True)
 class Request(Event):
-    """The beginning of a Websocket connection, the HTTP Upgrade request
+    """
+    The beginning of a Websocket connection, the HTTP Upgrade request
 
     This event is fired when a SERVER connection receives a WebSocket
     handshake request (HTTP with upgrade header).
@@ -54,16 +61,15 @@ class Request(Event):
 
     host: str
     target: str
-    extensions: Union[Sequence[Extension], Sequence[str]] = field(  # type: ignore[assignment]
-        default_factory=list
-    )
+    extensions: Sequence[Extension] | Sequence[str] = field(default_factory=list)
     extra_headers: Headers = field(default_factory=list)
-    subprotocols: List[str] = field(default_factory=list)
+    subprotocols: list[str] = field(default_factory=list)
 
 
 @dataclass(frozen=True)
 class AcceptConnection(Event):
-    """The acceptance of a Websocket upgrade request.
+    """
+    The acceptance of a Websocket upgrade request.
 
     This event is fired when a CLIENT receives an acceptance response
     from a server. It is also used to accept an upgrade request when
@@ -82,14 +88,15 @@ class AcceptConnection(Event):
 
     """
 
-    subprotocol: Optional[str] = None
-    extensions: List[Extension] = field(default_factory=list)
+    subprotocol: str | None = None
+    extensions: list[Extension] = field(default_factory=list)
     extra_headers: Headers = field(default_factory=list)
 
 
 @dataclass(frozen=True)
 class RejectConnection(Event):
-    """The rejection of a Websocket upgrade request, the HTTP response.
+    """
+    The rejection of a Websocket upgrade request, the HTTP response.
 
     The ``RejectConnection`` event sends the appropriate HTTP headers to
     communicate to the peer that the handshake has been rejected. You may also
@@ -133,7 +140,8 @@ class RejectConnection(Event):
 
 @dataclass(frozen=True)
 class RejectData(Event):
-    """The rejection HTTP response body.
+    """
+    The rejection HTTP response body.
 
     The caller may send multiple ``RejectData`` events. The final event should
     have the ``body_finished`` attribute set to ``True``.
@@ -156,8 +164,8 @@ class RejectData(Event):
 
 @dataclass(frozen=True)
 class CloseConnection(Event):
-
-    """The end of a Websocket connection, represents a closure frame.
+    """
+    The end of a Websocket connection, represents a closure frame.
 
     **wsproto does not automatically send a response to a close event.** To
     comply with the RFC you MUST send a close event back to the remote WebSocket
@@ -179,19 +187,20 @@ class CloseConnection(Event):
     """
 
     code: int
-    reason: Optional[str] = None
+    reason: str | None = None
 
-    def response(self) -> "CloseConnection":
+    def response(self) -> CloseConnection:
         """Generate an RFC-compliant close frame to send back to the peer."""
         return CloseConnection(code=self.code, reason=self.reason)
 
 
-T = TypeVar("T", bytes, str)
+T = TypeVar("T", bytes | bytearray, str)
 
 
 @dataclass(frozen=True)
 class Message(Event, Generic[T]):
-    """The websocket data message.
+    """
+    The websocket data message.
 
     Fields:
 
@@ -222,7 +231,8 @@ class Message(Event, Generic[T]):
 
 @dataclass(frozen=True)
 class TextMessage(Message[str]):  # pylint: disable=unsubscriptable-object
-    """This event is fired when a data frame with TEXT payload is received.
+    """
+    Fired when a data frame with TEXT payload is received.
 
     Fields:
 
@@ -231,35 +241,31 @@ class TextMessage(Message[str]):  # pylint: disable=unsubscriptable-object
        The message data as string, This only represents a single chunk
        of data and not a full WebSocket message.  You need to buffer
        and reassemble these chunks to get the full message.
-
     """
 
-    # https://github.com/python/mypy/issues/5744
-    data: str
-
 
 @dataclass(frozen=True)
-class BytesMessage(Message[bytes]):  # pylint: disable=unsubscriptable-object
-    """This event is fired when a data frame with BINARY payload is
-    received.
+class BytesMessage(
+    Message[bytearray | bytes]  # pylint: disable=unsubscriptable-object
+):
+    """
+    Fired when a data frame with BINARY payload is received.
 
     Fields:
 
     .. attribute:: data
 
-       The message data as byte string, can be decoded as UTF-8 for
+       The message data as bytes or a bytearray, can be decoded as UTF-8 for
        TEXT messages.  This only represents a single chunk of data and
        not a full WebSocket message.  You need to buffer and
        reassemble these chunks to get the full message.
     """
 
-    # https://github.com/python/mypy/issues/5744
-    data: bytes
-
 
 @dataclass(frozen=True)
 class Ping(Event):
-    """The Ping event can be sent to trigger a ping frame and is fired
+    """
+    The Ping event can be sent to trigger a ping frame and is fired
     when a Ping is received.
 
     **wsproto does not automatically send a pong response to a ping event.** To
@@ -275,14 +281,15 @@ class Ping(Event):
 
     payload: bytes = b""
 
-    def response(self) -> "Pong":
+    def response(self) -> Pong:
         """Generate an RFC-compliant :class:`Pong` response to this ping."""
         return Pong(payload=self.payload)
 
 
 @dataclass(frozen=True)
 class Pong(Event):
-    """The Pong event is fired when a Pong is received.
+    """
+    The Pong event is fired when a Pong is received.
 
     Fields:
 
diff --git a/libs/wsproto/extensions.py b/libs/wsproto/extensions.py
index ea8555d0bf..b8a93f00cc 100644
--- a/libs/wsproto/extensions.py
+++ b/libs/wsproto/extensions.py
@@ -4,23 +4,26 @@
 
 WebSocket extensions.
 """
+from __future__ import annotations
 
 import zlib
-from typing import Optional, Tuple, Union
+from abc import ABC, abstractmethod
+from typing import Optional
 
 from .frame_protocol import CloseReason, FrameDecoder, FrameProtocol, Opcode, RsvBits
 
 
-class Extension:
+class Extension(ABC):
     name: str
 
     def enabled(self) -> bool:
         return False
 
-    def offer(self) -> Union[bool, str]:
+    @abstractmethod
+    def offer(self) -> bool | str:
         pass
 
-    def accept(self, offer: str) -> Optional[Union[bool, str]]:
+    def accept(self, offer: str) -> bool | str | None:
         pass
 
     def finalize(self, offer: str) -> None:
@@ -28,31 +31,31 @@ def finalize(self, offer: str) -> None:
 
     def frame_inbound_header(
         self,
-        proto: Union[FrameDecoder, FrameProtocol],
+        proto: FrameDecoder | FrameProtocol,
         opcode: Opcode,
         rsv: RsvBits,
         payload_length: int,
-    ) -> Union[CloseReason, RsvBits]:
+    ) -> CloseReason | RsvBits:
         return RsvBits(False, False, False)
 
     def frame_inbound_payload_data(
-        self, proto: Union[FrameDecoder, FrameProtocol], data: bytes
-    ) -> Union[bytes, CloseReason]:
+        self, proto: FrameDecoder | FrameProtocol, data: bytes,
+    ) -> bytes | CloseReason:
         return data
 
     def frame_inbound_complete(
-        self, proto: Union[FrameDecoder, FrameProtocol], fin: bool
-    ) -> Union[bytes, CloseReason, None]:
+        self, proto: FrameDecoder | FrameProtocol, fin: bool,
+    ) -> bytes | CloseReason | None:
         pass
 
     def frame_outbound(
         self,
-        proto: Union[FrameDecoder, FrameProtocol],
+        proto: FrameDecoder | FrameProtocol,
         opcode: Opcode,
         rsv: RsvBits,
         data: bytes,
         fin: bool,
-    ) -> Tuple[RsvBits, bytes]:
+    ) -> tuple[RsvBits, bytes]:
         return (rsv, data)
 
 
@@ -65,9 +68,9 @@ class PerMessageDeflate(Extension):
     def __init__(
         self,
         client_no_context_takeover: bool = False,
-        client_max_window_bits: Optional[int] = None,
+        client_max_window_bits: int | None = None,
         server_no_context_takeover: bool = False,
-        server_max_window_bits: Optional[int] = None,
+        server_max_window_bits: int | None = None,
     ) -> None:
         self.client_no_context_takeover = client_no_context_takeover
         self.server_no_context_takeover = server_no_context_takeover
@@ -81,11 +84,11 @@ def __init__(
         self._compressor: Optional[zlib._Compress] = None  # noqa
         self._decompressor: Optional[zlib._Decompress] = None  # noqa
         # This refers to the current frame
-        self._inbound_is_compressible: Optional[bool] = None
+        self._inbound_is_compressible: bool | None = None
         # This refers to the ongoing message (which might span multiple
         # frames). Only the first frame in a fragmented message is flagged for
         # compression, so this carries that bit forward.
-        self._inbound_compressed: Optional[bool] = None
+        self._inbound_compressed: bool | None = None
 
         self._enabled = False
 
@@ -96,7 +99,8 @@ def client_max_window_bits(self) -> int:
     @client_max_window_bits.setter
     def client_max_window_bits(self, value: int) -> None:
         if value < 9 or value > 15:
-            raise ValueError("Window size must be between 9 and 15 inclusive")
+            msg = "Window size must be between 9 and 15 inclusive"
+            raise ValueError(msg)
         self._client_max_window_bits = value
 
     @property
@@ -106,7 +110,8 @@ def server_max_window_bits(self) -> int:
     @server_max_window_bits.setter
     def server_max_window_bits(self, value: int) -> None:
         if value < 9 or value > 15:
-            raise ValueError("Window size must be between 9 and 15 inclusive")
+            msg = "Window size must be between 9 and 15 inclusive"
+            raise ValueError(msg)
         self._server_max_window_bits = value
 
     def _compressible_opcode(self, opcode: Opcode) -> bool:
@@ -115,10 +120,10 @@ def _compressible_opcode(self, opcode: Opcode) -> bool:
     def enabled(self) -> bool:
         return self._enabled
 
-    def offer(self) -> Union[bool, str]:
+    def offer(self) -> bool | str:
         parameters = [
-            "client_max_window_bits=%d" % self.client_max_window_bits,
-            "server_max_window_bits=%d" % self.server_max_window_bits,
+            f"client_max_window_bits={self.client_max_window_bits}",
+            f"server_max_window_bits={self.server_max_window_bits}",
         ]
 
         if self.client_no_context_takeover:
@@ -142,7 +147,7 @@ def finalize(self, offer: str) -> None:
 
         self._enabled = True
 
-    def _parse_params(self, params: str) -> Tuple[Optional[int], Optional[int]]:
+    def _parse_params(self, params: str) -> tuple[int | None, int | None]:
         client_max_window_bits = None
         server_max_window_bits = None
 
@@ -165,7 +170,7 @@ def _parse_params(self, params: str) -> Tuple[Optional[int], Optional[int]]:
 
         return client_max_window_bits, server_max_window_bits
 
-    def accept(self, offer: str) -> Union[bool, None, str]:
+    def accept(self, offer: str) -> bool | None | str:
         client_max_window_bits, server_max_window_bits = self._parse_params(offer)
 
         parameters = []
@@ -176,10 +181,10 @@ def accept(self, offer: str) -> Union[bool, None, str]:
             parameters.append("server_no_context_takeover")
         try:
             if client_max_window_bits is not None:
-                parameters.append("client_max_window_bits=%d" % client_max_window_bits)
+                parameters.append(f"client_max_window_bits={client_max_window_bits}")
                 self.client_max_window_bits = client_max_window_bits
             if server_max_window_bits is not None:
-                parameters.append("server_max_window_bits=%d" % server_max_window_bits)
+                parameters.append(f"server_max_window_bits={server_max_window_bits}")
                 self.server_max_window_bits = server_max_window_bits
         except ValueError:
             return None
@@ -189,11 +194,11 @@ def accept(self, offer: str) -> Union[bool, None, str]:
 
     def frame_inbound_header(
         self,
-        proto: Union[FrameDecoder, FrameProtocol],
+        proto: FrameDecoder | FrameProtocol,
         opcode: Opcode,
         rsv: RsvBits,
         payload_length: int,
-    ) -> Union[CloseReason, RsvBits]:
+    ) -> CloseReason | RsvBits:
         if rsv.rsv1 and opcode.iscontrol():
             return CloseReason.PROTOCOL_ERROR
         if rsv.rsv1 and opcode is Opcode.CONTINUATION:
@@ -215,8 +220,8 @@ def frame_inbound_header(
         return RsvBits(True, False, False)
 
     def frame_inbound_payload_data(
-        self, proto: Union[FrameDecoder, FrameProtocol], data: bytes
-    ) -> Union[bytes, CloseReason]:
+        self, proto: FrameDecoder | FrameProtocol, data: bytes,
+    ) -> bytes | CloseReason:
         if not self._inbound_compressed or not self._inbound_is_compressible:
             return data
         assert self._decompressor is not None
@@ -227,8 +232,8 @@ def frame_inbound_payload_data(
             return CloseReason.INVALID_FRAME_PAYLOAD_DATA
 
     def frame_inbound_complete(
-        self, proto: Union[FrameDecoder, FrameProtocol], fin: bool
-    ) -> Union[bytes, CloseReason, None]:
+        self, proto: FrameDecoder | FrameProtocol, fin: bool,
+    ) -> bytes | CloseReason | None:
         if not fin:
             return None
         if not self._inbound_is_compressible:
@@ -259,17 +264,17 @@ def frame_inbound_complete(
 
     def frame_outbound(
         self,
-        proto: Union[FrameDecoder, FrameProtocol],
+        proto: FrameDecoder | FrameProtocol,
         opcode: Opcode,
         rsv: RsvBits,
         data: bytes,
         fin: bool,
-    ) -> Tuple[RsvBits, bytes]:
+    ) -> tuple[RsvBits, bytes]:
         if not self._compressible_opcode(opcode):
             return (rsv, data)
 
         if opcode is not Opcode.CONTINUATION:
-            rsv = RsvBits(True, *rsv[1:])
+            rsv = RsvBits(True, rsv[1], rsv[2])
 
         if self._compressor is None:
             assert opcode is not Opcode.CONTINUATION
@@ -278,7 +283,7 @@ def frame_outbound(
             else:
                 bits = self.server_max_window_bits
             self._compressor = zlib.compressobj(
-                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -int(bits)
+                zlib.Z_DEFAULT_COMPRESSION, zlib.DEFLATED, -int(bits),
             )
 
         data = self._compressor.compress(bytes(data))
@@ -298,10 +303,10 @@ def frame_outbound(
         return (rsv, data)
 
     def __repr__(self) -> str:
-        descr = ["client_max_window_bits=%d" % self.client_max_window_bits]
+        descr = [f"client_max_window_bits={self.client_max_window_bits}"]
         if self.client_no_context_takeover:
             descr.append("client_no_context_takeover")
-        descr.append("server_max_window_bits=%d" % self.server_max_window_bits)
+        descr.append(f"server_max_window_bits={self.server_max_window_bits}")
         if self.server_no_context_takeover:
             descr.append("server_no_context_takeover")
 
diff --git a/libs/wsproto/frame_protocol.py b/libs/wsproto/frame_protocol.py
index d13a769e91..288276d544 100644
--- a/libs/wsproto/frame_protocol.py
+++ b/libs/wsproto/frame_protocol.py
@@ -4,14 +4,18 @@
 
 WebSocket frame protocol implementation.
 """
+from __future__ import annotations
 
+import contextlib
 import os
 import struct
-from codecs import getincrementaldecoder, IncrementalDecoder
+from codecs import IncrementalDecoder, getincrementaldecoder
 from enum import IntEnum
-from typing import Generator, List, NamedTuple, Optional, Tuple, TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, NamedTuple
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from .extensions import Extension  # pragma: no cover
 
 
@@ -19,12 +23,13 @@
 
 
 class XorMaskerSimple:
-    def __init__(self, masking_key: bytes) -> None:
+    def __init__(self, masking_key: bytearray | bytes) -> None:
         self._masking_key = masking_key
 
-    def process(self, data: bytes) -> bytes:
+    def process(self, data: bytearray) -> bytearray:
+        data = bytearray(data)
         if data:
-            data_array = bytearray(data)
+            data_array = data
             a, b, c, d = (_XOR_TABLE[n] for n in self._masking_key)
             data_array[::4] = data_array[::4].translate(a)
             data_array[1::4] = data_array[1::4].translate(b)
@@ -38,12 +43,12 @@ def process(self, data: bytes) -> bytes:
                 self._masking_key[key_rotation:] + self._masking_key[:key_rotation]
             )
 
-            return bytes(data_array)
+            return data_array
         return data
 
 
 class XorMaskerNull:
-    def process(self, data: bytes) -> bytes:
+    def process(self, data: bytearray) -> bytearray:
         return data
 
 
@@ -207,7 +212,7 @@ class CloseReason(IntEnum):
 
 class ParseFailed(Exception):
     def __init__(
-        self, msg: str, code: CloseReason = CloseReason.PROTOCOL_ERROR
+        self, msg: str, code: CloseReason = CloseReason.PROTOCOL_ERROR,
     ) -> None:
         super().__init__(msg)
         self.code = code
@@ -224,12 +229,12 @@ class Header(NamedTuple):
     rsv: RsvBits
     opcode: Opcode
     payload_len: int
-    masking_key: Optional[bytes]
+    masking_key: bytes | None
 
 
 class Frame(NamedTuple):
     opcode: Opcode
-    payload: Union[bytes, str, Tuple[int, str]]
+    payload: bytes | str | tuple[int, str]
     frame_finished: bool
     message_finished: bool
 
@@ -246,12 +251,11 @@ def _truncate_utf8(data: bytes, nbytes: int) -> bytes:
     # whole message twice when in theory we could just peek at the last
     # few characters, but since this is only used for close messages (max
     # length = 125 bytes) it really doesn't matter.
-    data = data.decode("utf-8", errors="ignore").encode("utf-8")
-    return data
+    return data.decode("utf-8", errors="ignore").encode("utf-8")
 
 
 class Buffer:
-    def __init__(self, initial_bytes: Optional[bytes] = None) -> None:
+    def __init__(self, initial_bytes: bytes | None = None) -> None:
         self.buffer = bytearray()
         self.bytes_used = 0
         if initial_bytes:
@@ -260,7 +264,7 @@ def __init__(self, initial_bytes: Optional[bytes] = None) -> None:
     def feed(self, new_bytes: bytes) -> None:
         self.buffer += new_bytes
 
-    def consume_at_most(self, nbytes: int) -> bytes:
+    def consume_at_most(self, nbytes: int) -> bytearray:
         if not nbytes:
             return bytearray()
 
@@ -268,7 +272,7 @@ def consume_at_most(self, nbytes: int) -> bytes:
         self.bytes_used += len(data)
         return data
 
-    def consume_exactly(self, nbytes: int) -> Optional[bytes]:
+    def consume_exactly(self, nbytes: int) -> bytearray | None:
         if len(self.buffer) - self.bytes_used < nbytes:
             return None
 
@@ -288,18 +292,20 @@ def __len__(self) -> int:
 
 class MessageDecoder:
     def __init__(self) -> None:
-        self.opcode: Optional[Opcode] = None
-        self.decoder: Optional[IncrementalDecoder] = None
+        self.opcode: Opcode | None = None
+        self.decoder: IncrementalDecoder | None = None
 
     def process_frame(self, frame: Frame) -> Frame:
         assert not frame.opcode.iscontrol()
 
         if self.opcode is None:
             if frame.opcode is Opcode.CONTINUATION:
-                raise ParseFailed("unexpected CONTINUATION")
+                msg = "unexpected CONTINUATION"
+                raise ParseFailed(msg)
             self.opcode = frame.opcode
         elif frame.opcode is not Opcode.CONTINUATION:
-            raise ParseFailed("expected CONTINUATION, got %r" % frame.opcode)
+            msg = f"expected CONTINUATION, got {frame.opcode!r}"
+            raise ParseFailed(msg)
 
         if frame.opcode is Opcode.TEXT:
             self.decoder = getincrementaldecoder("utf-8")()
@@ -326,26 +332,25 @@ def process_frame(self, frame: Frame) -> Frame:
 
 class FrameDecoder:
     def __init__(
-        self, client: bool, extensions: Optional[List["Extension"]] = None
+        self, client: bool, extensions: list[Extension] | None = None,
     ) -> None:
         self.client = client
         self.extensions = extensions or []
 
         self.buffer = Buffer()
 
-        self.header: Optional[Header] = None
-        self.effective_opcode: Optional[Opcode] = None
-        self.masker: Union[None, XorMaskerNull, XorMaskerSimple] = None
+        self.header: Header | None = None
+        self.effective_opcode: Opcode | None = None
+        self.masker: None | XorMaskerNull | XorMaskerSimple = None
         self.payload_required = 0
         self.payload_consumed = 0
 
     def receive_bytes(self, data: bytes) -> None:
         self.buffer.feed(data)
 
-    def process_buffer(self) -> Optional[Frame]:
-        if not self.header:
-            if not self.parse_header():
-                return None
+    def process_buffer(self) -> Frame | None:
+        if not self.header and not self.parse_header():
+            return None
         # parse_header() sets these.
         assert self.header is not None
         assert self.masker is not None
@@ -366,22 +371,24 @@ def process_buffer(self) -> Optional[Frame]:
         payload = self.masker.process(payload)
 
         for extension in self.extensions:
-            payload_ = extension.frame_inbound_payload_data(self, payload)
+            payload_ = extension.frame_inbound_payload_data(self, bytes(payload))
             if isinstance(payload_, CloseReason):
-                raise ParseFailed("error in extension", payload_)
-            payload = payload_
+                msg = "error in extension"
+                raise ParseFailed(msg, payload_)
+            payload = bytearray(payload_)
 
         if finished:
             final = bytearray()
             for extension in self.extensions:
                 result = extension.frame_inbound_complete(self, self.header.fin)
                 if isinstance(result, CloseReason):
-                    raise ParseFailed("error in extension", result)
+                    msg = "error in extension"
+                    raise ParseFailed(msg, result)
                 if result is not None:
                     final += result
             payload += final
 
-        frame = Frame(self.effective_opcode, payload, finished, self.header.fin)
+        frame = Frame(self.effective_opcode, bytes(payload), finished, self.header.fin)
 
         if finished:
             self.header = None
@@ -408,10 +415,12 @@ def parse_header(self) -> bool:
         try:
             opcode = Opcode(opcode)
         except ValueError:
-            raise ParseFailed(f"Invalid opcode {opcode:#x}")
+            msg = f"Invalid opcode {opcode:#x}"
+            raise ParseFailed(msg)
 
         if opcode.iscontrol() and not fin:
-            raise ParseFailed("Invalid attempt to fragment control frame")
+            msg = "Invalid attempt to fragment control frame"
+            raise ParseFailed(msg)
 
         has_mask = bool(data[1] & MASK_MASK)
         payload_len_short = data[1] & PAYLOAD_LEN_MASK
@@ -423,9 +432,11 @@ def parse_header(self) -> bool:
         self.extension_processing(opcode, rsv, payload_len)
 
         if has_mask and self.client:
-            raise ParseFailed("client received unexpected masked frame")
+            msg = "client received unexpected masked frame"
+            raise ParseFailed(msg)
         if not has_mask and not self.client:
-            raise ParseFailed("server received unexpected unmasked frame")
+            msg = "server received unexpected unmasked frame"
+            raise ParseFailed(msg)
         if has_mask:
             masking_key = self.buffer.consume_exactly(4)
             if masking_key is None:
@@ -446,18 +457,20 @@ def parse_header(self) -> bool:
         return True
 
     def parse_extended_payload_length(
-        self, opcode: Opcode, payload_len: int
-    ) -> Optional[int]:
+        self, opcode: Opcode, payload_len: int,
+    ) -> int | None:
         if opcode.iscontrol() and payload_len > MAX_PAYLOAD_NORMAL:
-            raise ParseFailed("Control frame with payload len > 125")
+            msg = "Control frame with payload len > 125"
+            raise ParseFailed(msg)
         if payload_len == PAYLOAD_LENGTH_TWO_BYTE:
             data = self.buffer.consume_exactly(2)
             if data is None:
                 return None
             (payload_len,) = struct.unpack("!H", data)
             if payload_len <= MAX_PAYLOAD_NORMAL:
+                msg = "Payload length used 2 bytes when 1 would have sufficed"
                 raise ParseFailed(
-                    "Payload length used 2 bytes when 1 would have sufficed"
+                    msg,
                 )
         elif payload_len == PAYLOAD_LENGTH_EIGHT_BYTE:
             data = self.buffer.consume_exactly(8)
@@ -465,34 +478,38 @@ def parse_extended_payload_length(
                 return None
             (payload_len,) = struct.unpack("!Q", data)
             if payload_len <= MAX_PAYLOAD_TWO_BYTE:
+                msg = "Payload length used 8 bytes when 2 would have sufficed"
                 raise ParseFailed(
-                    "Payload length used 8 bytes when 2 would have sufficed"
+                    msg,
                 )
             if payload_len >> 63:
                 # I'm not sure why this is illegal, but that's what the RFC
                 # says, so...
-                raise ParseFailed("8-byte payload length with non-zero MSB")
+                msg = "8-byte payload length with non-zero MSB"
+                raise ParseFailed(msg)
 
         return payload_len
 
     def extension_processing(
-        self, opcode: Opcode, rsv: RsvBits, payload_len: int
+        self, opcode: Opcode, rsv: RsvBits, payload_len: int,
     ) -> None:
         rsv_used = [False, False, False]
         for extension in self.extensions:
             result = extension.frame_inbound_header(self, opcode, rsv, payload_len)
             if isinstance(result, CloseReason):
-                raise ParseFailed("error in extension", result)
+                msg = "error in extension"
+                raise ParseFailed(msg, result)
             for bit, used in enumerate(result):
                 if used:
                     rsv_used[bit] = True
         for expected, found in zip(rsv_used, rsv):
             if found and not expected:
-                raise ParseFailed("Reserved bit set unexpectedly")
+                msg = "Reserved bit set unexpectedly"
+                raise ParseFailed(msg)
 
 
 class FrameProtocol:
-    def __init__(self, client: bool, extensions: List["Extension"]) -> None:
+    def __init__(self, client: bool, extensions: list[Extension]) -> None:
         self.client = client
         self.extensions = [ext for ext in extensions if ext.enabled()]
 
@@ -501,7 +518,7 @@ def __init__(self, client: bool, extensions: List["Extension"]) -> None:
         self._message_decoder = MessageDecoder()
         self._parse_more = self._parse_more_gen()
 
-        self._outbound_opcode: Optional[Opcode] = None
+        self._outbound_opcode: Opcode | None = None
 
     def _process_close(self, frame: Frame) -> Frame:
         data = frame.payload
@@ -512,19 +529,21 @@ def _process_close(self, frame: Frame) -> Frame:
             # WebSocket Connection Close Code_ is considered to be 1005"
             data = (CloseReason.NO_STATUS_RCVD, "")
         elif len(data) == 1:
-            raise ParseFailed("CLOSE with 1 byte payload")
+            msg = "CLOSE with 1 byte payload"
+            raise ParseFailed(msg)
         else:
             (code,) = struct.unpack("!H", data[:2])
             if code < MIN_CLOSE_REASON or code > MAX_CLOSE_REASON:
-                raise ParseFailed("CLOSE with invalid code")
-            try:
+                msg = "CLOSE with invalid code"
+                raise ParseFailed(msg)
+            with contextlib.suppress(ValueError):
                 code = CloseReason(code)
-            except ValueError:
-                pass
             if code in LOCAL_ONLY_CLOSE_REASONS:
-                raise ParseFailed("remote CLOSE with local-only reason")
+                msg = "remote CLOSE with local-only reason"
+                raise ParseFailed(msg)
             if not isinstance(code, CloseReason) and code <= MAX_PROTOCOL_CLOSE_REASON:
-                raise ParseFailed("CLOSE with unknown reserved code")
+                msg = "CLOSE with unknown reserved code"
+                raise ParseFailed(msg)
             try:
                 reason = data[2:].decode("utf-8")
             except UnicodeDecodeError as exc:
@@ -536,7 +555,7 @@ def _process_close(self, frame: Frame) -> Frame:
 
         return Frame(frame.opcode, data, frame.frame_finished, frame.message_finished)
 
-    def _parse_more_gen(self) -> Generator[Optional[Frame], None, None]:
+    def _parse_more_gen(self) -> Generator[Frame | None, None, None]:
         # Consume as much as we can from self._buffer, yielding events, and
         # then yield None when we need more data. Or raise ParseFailed.
 
@@ -567,44 +586,47 @@ def received_frames(self) -> Generator[Frame, None, None]:
             else:
                 yield event
 
-    def close(self, code: Optional[int] = None, reason: Optional[str] = None) -> bytes:
+    def close(self, code: int | None = None, reason: str | None = None) -> bytearray:
         payload = bytearray()
         if code is CloseReason.NO_STATUS_RCVD:
             code = None
         if code is None and reason:
-            raise TypeError("cannot specify a reason without a code")
+            msg = "cannot specify a reason without a code"
+            raise TypeError(msg)
         if code in LOCAL_ONLY_CLOSE_REASONS:
             code = CloseReason.NORMAL_CLOSURE
         if code is not None:
             payload += bytearray(struct.pack("!H", code))
             if reason is not None:
                 payload += _truncate_utf8(
-                    reason.encode("utf-8"), MAX_PAYLOAD_NORMAL - 2
+                    reason.encode("utf-8"), MAX_PAYLOAD_NORMAL - 2,
                 )
 
         return self._serialize_frame(Opcode.CLOSE, payload)
 
-    def ping(self, payload: bytes = b"") -> bytes:
+    def ping(self, payload: bytes = b"") -> bytearray:
         return self._serialize_frame(Opcode.PING, payload)
 
-    def pong(self, payload: bytes = b"") -> bytes:
+    def pong(self, payload: bytes = b"") -> bytearray:
         return self._serialize_frame(Opcode.PONG, payload)
 
     def send_data(
-        self, payload: Union[bytes, bytearray, str] = b"", fin: bool = True
-    ) -> bytes:
+        self, payload: bytes | bytearray | str = b"", fin: bool = True,
+    ) -> bytearray:
         if isinstance(payload, (bytes, bytearray, memoryview)):
             opcode = Opcode.BINARY
         elif isinstance(payload, str):
             opcode = Opcode.TEXT
             payload = payload.encode("utf-8")
         else:
-            raise ValueError("Must provide bytes or text")
+            msg = "Must provide bytes or text"
+            raise TypeError(msg)
 
         if self._outbound_opcode is None:
             self._outbound_opcode = opcode
         elif self._outbound_opcode is not opcode:
-            raise TypeError("Data type mismatch inside message")
+            msg = "Data type mismatch inside message"
+            raise TypeError(msg)
         else:
             opcode = Opcode.CONTINUATION
 
@@ -621,11 +643,13 @@ def _make_fin_rsv_opcode(self, fin: bool, rsv: RsvBits, opcode: Opcode) -> int:
         return fin_bits | rsv_bits | opcode_bits
 
     def _serialize_frame(
-        self, opcode: Opcode, payload: bytes = b"", fin: bool = True
-    ) -> bytes:
+        self, opcode: Opcode, payload: bytes | bytearray = b"", fin: bool = True,
+    ) -> bytearray:
+        payload = bytearray(payload)
+
         rsv = RsvBits(False, False, False)
         for extension in reversed(self.extensions):
-            rsv, payload = extension.frame_outbound(self, opcode, rsv, payload, fin)
+            rsv, payload = extension.frame_outbound(self, opcode, rsv, bytes(payload), fin)
 
         fin_rsv_opcode = self._make_fin_rsv_opcode(fin, rsv, opcode)
 
@@ -648,7 +672,8 @@ def _serialize_frame(
         header = bytearray([fin_rsv_opcode, first_payload])
         if second_payload is not None:
             if opcode.iscontrol():
-                raise ValueError("payload too long for control frame")
+                msg = "payload too long for control frame"
+                raise ValueError(msg)
             if quad_payload:
                 header += bytearray(struct.pack("!Q", second_payload))
             else:
@@ -666,8 +691,8 @@ def _serialize_frame(
             # authors of malicious applications from selecting the bytes that
             # appear on the wire."
             #   -- https://tools.ietf.org/html/rfc6455#section-5.3
-            masking_key = os.urandom(4)
+            masking_key = bytearray(os.urandom(4))
             masker = XorMaskerSimple(masking_key)
-            return header + masking_key + masker.process(payload)
+            return bytearray(header + masking_key + masker.process(bytearray(payload)))
 
-        return header + payload
+        return bytearray(header + payload)
diff --git a/libs/wsproto/handshake.py b/libs/wsproto/handshake.py
index c456939f12..ab390b8bb0 100644
--- a/libs/wsproto/handshake.py
+++ b/libs/wsproto/handshake.py
@@ -4,17 +4,12 @@
 
 An implementation of WebSocket handshakes.
 """
+from __future__ import annotations
+
 from collections import deque
 from typing import (
+    TYPE_CHECKING,
     cast,
-    Deque,
-    Dict,
-    Generator,
-    Iterable,
-    List,
-    Optional,
-    Sequence,
-    Union,
 )
 
 import h11
@@ -22,19 +17,26 @@
 from .connection import Connection, ConnectionState, ConnectionType
 from .events import AcceptConnection, Event, RejectConnection, RejectData, Request
 from .extensions import Extension
-from .typing import Headers
 from .utilities import (
+    LocalProtocolError,
+    RemoteProtocolError,
     generate_accept_token,
     generate_nonce,
-    LocalProtocolError,
     normed_header_dict,
-    RemoteProtocolError,
     split_comma_header,
 )
 
+if TYPE_CHECKING:
+    from collections.abc import Generator, Iterable, Sequence
+
+    from .typing import Headers
+
 # RFC6455, Section 4.2.1/6 - Reading the Client's Opening Handshake
 WEBSOCKET_VERSION = b"13"
 
+# RFC6455, Section 4.2.1/3 - Value of the Upgrade header
+WEBSOCKET_UPGRADE = b"websocket"
+
 
 class H11Handshake:
     """A Handshake implementation for HTTP/1.1 connections."""
@@ -48,18 +50,19 @@ def __init__(self, connection_type: ConnectionType) -> None:
         else:
             self._h11_connection = h11.Connection(h11.SERVER)
 
-        self._connection: Optional[Connection] = None
-        self._events: Deque[Event] = deque()
-        self._initiating_request: Optional[Request] = None
-        self._nonce: Optional[bytes] = None
+        self._connection: Connection | None = None
+        self._events: deque[Event] = deque()
+        self._initiating_request: Request | None = None
+        self._nonce: bytes | None = None
 
     @property
     def state(self) -> ConnectionState:
         return self._state
 
     @property
-    def connection(self) -> Optional[Connection]:
-        """Return the established connection.
+    def connection(self) -> Connection | None:
+        """
+        Return the established connection.
 
         This will either return the connection or raise a
         LocalProtocolError if the connection has not yet been
@@ -70,9 +73,10 @@ def connection(self) -> Optional[Connection]:
         return self._connection
 
     def initiate_upgrade_connection(
-        self, headers: Headers, path: Union[bytes, str]
+        self, headers: Headers, path: bytes | str,
     ) -> None:
-        """Initiate an upgrade connection.
+        """
+        Initiate an upgrade connection.
 
         This should be used if the request has already be received and
         parsed.
@@ -81,15 +85,17 @@ def initiate_upgrade_connection(
         :param str path: A URL path.
         """
         if self.client:
+            msg = "Cannot initiate an upgrade connection when acting as the client"
             raise LocalProtocolError(
-                "Cannot initiate an upgrade connection when acting as the client"
+                msg,
             )
         upgrade_request = h11.Request(method=b"GET", target=path, headers=headers)
         h11_client = h11.Connection(h11.CLIENT)
         self.receive_data(h11_client.send(upgrade_request))
 
     def send(self, event: Event) -> bytes:
-        """Send an event to the remote.
+        """
+        Send an event to the remote.
 
         This will return the bytes to send based on the event or raise
         a LocalProtocolError if the event is not valid given the
@@ -108,13 +114,15 @@ def send(self, event: Event) -> bytes:
         elif isinstance(event, RejectData):
             data += self._send_reject_data(event)
         else:
+            msg = f"Event {event} cannot be sent during the handshake"
             raise LocalProtocolError(
-                f"Event {event} cannot be sent during the handshake"
+                msg,
             )
         return data
 
-    def receive_data(self, data: Optional[bytes]) -> None:
-        """Receive data from the remote.
+    def receive_data(self, data: bytes | None) -> None:
+        """
+        Receive data from the remote.
 
         A list of events that the remote peer triggered by sending
         this data can be retrieved with :meth:`events`.
@@ -126,8 +134,9 @@ def receive_data(self, data: Optional[bytes]) -> None:
             try:
                 event = self._h11_connection.next_event()
             except h11.RemoteProtocolError:
+                msg = "Bad HTTP message"
                 raise RemoteProtocolError(
-                    "Bad HTTP message", event_hint=RejectConnection()
+                    msg, event_hint=RejectConnection(),
                 )
             if (
                 isinstance(event, h11.ConnectionClosed)
@@ -146,7 +155,7 @@ def receive_data(self, data: Optional[bytes]) -> None:
                                 headers=list(event.headers),
                                 status_code=event.status_code,
                                 has_body=False,
-                            )
+                            ),
                         )
                         self._state = ConnectionState.CLOSED
                 elif isinstance(event, h11.Response):
@@ -156,21 +165,21 @@ def receive_data(self, data: Optional[bytes]) -> None:
                             headers=list(event.headers),
                             status_code=event.status_code,
                             has_body=True,
-                        )
+                        ),
                     )
                 elif isinstance(event, h11.Data):
                     self._events.append(
-                        RejectData(data=event.data, body_finished=False)
+                        RejectData(data=event.data, body_finished=False),
                     )
                 elif isinstance(event, h11.EndOfMessage):
                     self._events.append(RejectData(data=b"", body_finished=True))
                     self._state = ConnectionState.CLOSED
-            else:
-                if isinstance(event, h11.Request):
-                    self._events.append(self._process_connection_request(event))
+            elif isinstance(event, h11.Request):
+                self._events.append(self._process_connection_request(event))
 
     def events(self) -> Generator[Event, None, None]:
-        """Return a generator that provides any events that have been generated
+        """
+        Return a generator that provides any events that have been generated
         by protocol activity.
 
         :returns: a generator that yields H11 events.
@@ -180,18 +189,19 @@ def events(self) -> Generator[Event, None, None]:
 
     # Server mode methods
 
-    def _process_connection_request(  # noqa: MC0001
-        self, event: h11.Request
+    def _process_connection_request(
+        self, event: h11.Request,
     ) -> Request:
         if event.method != b"GET":
+            msg = "Request method must be GET"
             raise RemoteProtocolError(
-                "Request method must be GET", event_hint=RejectConnection()
+                msg, event_hint=RejectConnection(),
             )
         connection_tokens = None
-        extensions: List[str] = []
+        extensions: list[str] = []
         host = None
         key = None
-        subprotocols: List[str] = []
+        subprotocols: list[str] = []
         upgrade = b""
         version = None
         headers: Headers = []
@@ -218,28 +228,34 @@ def _process_connection_request(  # noqa: MC0001
         if connection_tokens is None or not any(
             token.lower() == "upgrade" for token in connection_tokens
         ):
+            msg = "Missing header, 'Connection: Upgrade'"
             raise RemoteProtocolError(
-                "Missing header, 'Connection: Upgrade'", event_hint=RejectConnection()
+                msg, event_hint=RejectConnection(),
             )
         if version != WEBSOCKET_VERSION:
+            msg = "Missing header, 'Sec-WebSocket-Version'"
             raise RemoteProtocolError(
-                "Missing header, 'Sec-WebSocket-Version'",
+                msg,
                 event_hint=RejectConnection(
                     headers=[(b"Sec-WebSocket-Version", WEBSOCKET_VERSION)],
                     status_code=426 if version else 400,
                 ),
             )
         if key is None:
+            msg = "Missing header, 'Sec-WebSocket-Key'"
             raise RemoteProtocolError(
-                "Missing header, 'Sec-WebSocket-Key'", event_hint=RejectConnection()
+                msg, event_hint=RejectConnection(),
             )
-        if upgrade.lower() != b"websocket":
+        if upgrade.lower() != WEBSOCKET_UPGRADE:
+            msg = f"Missing header, 'Upgrade: {WEBSOCKET_UPGRADE.decode()}'"
             raise RemoteProtocolError(
-                "Missing header, 'Upgrade: WebSocket'", event_hint=RejectConnection()
+                msg,
+                event_hint=RejectConnection(),
             )
         if host is None:
+            msg = "Missing header, 'Host'"
             raise RemoteProtocolError(
-                "Missing header, 'Host'", event_hint=RejectConnection()
+                msg, event_hint=RejectConnection(),
             )
 
         self._initiating_request = Request(
@@ -260,28 +276,31 @@ def _accept(self, event: AcceptConnection) -> bytes:
         accept_token = generate_accept_token(nonce)
 
         headers = [
-            (b"Upgrade", b"WebSocket"),
+            (b"Upgrade", WEBSOCKET_UPGRADE),
             (b"Connection", b"Upgrade"),
             (b"Sec-WebSocket-Accept", accept_token),
         ]
 
         if event.subprotocol is not None:
             if event.subprotocol not in self._initiating_request.subprotocols:
-                raise LocalProtocolError(f"unexpected subprotocol {event.subprotocol}")
+                msg = f"unexpected subprotocol {event.subprotocol}"
+                raise LocalProtocolError(msg)
             headers.append(
-                (b"Sec-WebSocket-Protocol", event.subprotocol.encode("ascii"))
+                (b"Sec-WebSocket-Protocol", event.subprotocol.encode("ascii")),
             )
 
         if event.extensions:
             accepts = server_extensions_handshake(
-                cast(Sequence[str], self._initiating_request.extensions),
+                cast("Sequence[str]", self._initiating_request.extensions),
                 event.extensions,
             )
             if accepts:
                 headers.append((b"Sec-WebSocket-Extensions", accepts))
 
         response = h11.InformationalResponse(
-            status_code=101, headers=headers + event.extra_headers
+            status_code=101,
+            headers=headers + event.extra_headers,
+            reason=b"Switching Protocols",
         )
         self._connection = Connection(
             ConnectionType.CLIENT if self.client else ConnectionType.SERVER,
@@ -292,8 +311,9 @@ def _accept(self, event: AcceptConnection) -> bytes:
 
     def _reject(self, event: RejectConnection) -> bytes:
         if self.state != ConnectionState.CONNECTING:
+            msg = f"Connection cannot be rejected in state {self.state}"
             raise LocalProtocolError(
-                "Connection cannot be rejected in state %s" % self.state
+                msg,
             )
 
         headers = list(event.headers)
@@ -309,8 +329,9 @@ def _reject(self, event: RejectConnection) -> bytes:
 
     def _send_reject_data(self, event: RejectData) -> bytes:
         if self.state != ConnectionState.REJECTING:
+            msg = f"Cannot send rejection data in state {self.state}"
             raise LocalProtocolError(
-                f"Cannot send rejection data in state {self.state}"
+                msg,
             )
 
         data = self._h11_connection.send(h11.Data(data=event.data)) or b""
@@ -327,7 +348,7 @@ def _initiate_connection(self, request: Request) -> bytes:
 
         headers = [
             (b"Host", request.host.encode("idna")),
-            (b"Upgrade", b"WebSocket"),
+            (b"Upgrade", WEBSOCKET_UPGRADE),
             (b"Connection", b"Upgrade"),
             (b"Sec-WebSocket-Key", self._nonce),
             (b"Sec-WebSocket-Version", WEBSOCKET_VERSION),
@@ -338,11 +359,11 @@ def _initiate_connection(self, request: Request) -> bytes:
                 (
                     b"Sec-WebSocket-Protocol",
                     (", ".join(request.subprotocols)).encode("ascii"),
-                )
+                ),
             )
 
         if request.extensions:
-            offers: Dict[str, Union[str, bool]] = {}
+            offers: dict[str, str | bool] = {}
             for e in request.extensions:
                 assert isinstance(e, Extension)
                 offers[e.name] = e.offer()
@@ -365,15 +386,15 @@ def _initiate_connection(self, request: Request) -> bytes:
         return self._h11_connection.send(upgrade) or b""
 
     def _establish_client_connection(
-        self, event: h11.InformationalResponse
-    ) -> AcceptConnection:  # noqa: MC0001
+        self, event: h11.InformationalResponse,
+    ) -> AcceptConnection:
         # _establish_client_connection is always called after _initiate_connection.
         assert self._initiating_request is not None
         assert self._nonce is not None
 
         accept = None
         connection_tokens = None
-        accepts: List[str] = []
+        accepts: list[str] = []
         subprotocol = None
         upgrade = b""
         headers: Headers = []
@@ -382,16 +403,16 @@ def _establish_client_connection(
             if name == b"connection":
                 connection_tokens = split_comma_header(value)
                 continue  # Skip appending to headers
-            elif name == b"sec-websocket-extensions":
+            if name == b"sec-websocket-extensions":
                 accepts = split_comma_header(value)
                 continue  # Skip appending to headers
-            elif name == b"sec-websocket-accept":
+            if name == b"sec-websocket-accept":
                 accept = value
                 continue  # Skip appending to headers
-            elif name == b"sec-websocket-protocol":
+            if name == b"sec-websocket-protocol":
                 subprotocol = value.decode("ascii")
                 continue  # Skip appending to headers
-            elif name == b"upgrade":
+            if name == b"upgrade":
                 upgrade = value
                 continue  # Skip appending to headers
             headers.append((name, value))
@@ -399,24 +420,28 @@ def _establish_client_connection(
         if connection_tokens is None or not any(
             token.lower() == "upgrade" for token in connection_tokens
         ):
+            msg = "Missing header, 'Connection: Upgrade'"
             raise RemoteProtocolError(
-                "Missing header, 'Connection: Upgrade'", event_hint=RejectConnection()
+                msg, event_hint=RejectConnection(),
             )
-        if upgrade.lower() != b"websocket":
+        if upgrade.lower() != WEBSOCKET_UPGRADE:
+            msg = f"Missing header, 'Upgrade: {WEBSOCKET_UPGRADE.decode()}'"
             raise RemoteProtocolError(
-                "Missing header, 'Upgrade: WebSocket'", event_hint=RejectConnection()
+                msg,
+                event_hint=RejectConnection(),
             )
         accept_token = generate_accept_token(self._nonce)
         if accept != accept_token:
-            raise RemoteProtocolError("Bad accept token", event_hint=RejectConnection())
-        if subprotocol is not None:
-            if subprotocol not in self._initiating_request.subprotocols:
-                raise RemoteProtocolError(
-                    f"unrecognized subprotocol {subprotocol}",
-                    event_hint=RejectConnection(),
-                )
+            msg = "Bad accept token"
+            raise RemoteProtocolError(msg, event_hint=RejectConnection())
+        if subprotocol is not None and subprotocol not in self._initiating_request.subprotocols:
+            msg = f"unrecognized subprotocol {subprotocol}"
+            raise RemoteProtocolError(
+                msg,
+                event_hint=RejectConnection(),
+            )
         extensions = client_extensions_handshake(
-            accepts, cast(Sequence[Extension], self._initiating_request.extensions)
+            accepts, cast("Sequence[Extension]", self._initiating_request.extensions),
         )
 
         self._connection = Connection(
@@ -426,23 +451,22 @@ def _establish_client_connection(
         )
         self._state = ConnectionState.OPEN
         return AcceptConnection(
-            extensions=extensions, extra_headers=headers, subprotocol=subprotocol
+            extensions=extensions, extra_headers=headers, subprotocol=subprotocol,
         )
 
     def __repr__(self) -> str:
-        return "{}(client={}, state={})".format(
-            self.__class__.__name__, self.client, self.state
-        )
+        return f"{self.__class__.__name__}(client={self.client}, state={self.state})"
 
 
 def server_extensions_handshake(
-    requested: Iterable[str], supported: List[Extension]
-) -> Optional[bytes]:
-    """Agree on the extensions to use returning an appropriate header value.
+    requested: Iterable[str], supported: list[Extension],
+) -> bytes | None:
+    """
+    Agree on the extensions to use returning an appropriate header value.
 
     This returns None if there are no agreed extensions
     """
-    accepts: Dict[str, Union[bool, bytes]] = {}
+    accepts: dict[str, bool | bytes] = {}
     for offer in requested:
         name = offer.split(";", 1)[0].strip()
         for extension in supported:
@@ -455,25 +479,24 @@ def server_extensions_handshake(
                     accepts[extension.name] = accept.encode("ascii")
 
     if accepts:
-        extensions: List[bytes] = []
+        extensions: list[bytes] = []
         for name, params in accepts.items():
             name_bytes = name.encode("ascii")
             if isinstance(params, bool):
                 assert params
                 extensions.append(name_bytes)
+            elif params == b"":
+                extensions.append(b"%s" % (name_bytes))
             else:
-                if params == b"":
-                    extensions.append(b"%s" % (name_bytes))
-                else:
-                    extensions.append(b"%s; %s" % (name_bytes, params))
+                extensions.append(b"%s; %s" % (name_bytes, params))
         return b", ".join(extensions)
 
     return None
 
 
 def client_extensions_handshake(
-    accepted: Iterable[str], supported: Sequence[Extension]
-) -> List[Extension]:
+    accepted: Iterable[str], supported: Sequence[Extension],
+) -> list[Extension]:
     # This raises RemoteProtocolError is the accepted extension is not
     # supported.
     extensions = []
@@ -485,7 +508,8 @@ def client_extensions_handshake(
                 extensions.append(extension)
                 break
         else:
+            msg = f"unrecognized extension {name}"
             raise RemoteProtocolError(
-                f"unrecognized extension {name}", event_hint=RejectConnection()
+                msg, event_hint=RejectConnection(),
             )
     return extensions
diff --git a/libs/wsproto/typing.py b/libs/wsproto/typing.py
index a44b27e5d5..0063d21fe8 100644
--- a/libs/wsproto/typing.py
+++ b/libs/wsproto/typing.py
@@ -1,3 +1,3 @@
-from typing import List, Tuple
+from __future__ import annotations
 
-Headers = List[Tuple[bytes, bytes]]
+Headers = list[tuple[bytes, bytes]]
diff --git a/libs/wsproto/utilities.py b/libs/wsproto/utilities.py
index 7cf53d1768..d02117ae75 100644
--- a/libs/wsproto/utilities.py
+++ b/libs/wsproto/utilities.py
@@ -4,15 +4,18 @@
 
 Utility functions that do not belong in a separate module.
 """
+from __future__ import annotations
+
 import base64
 import hashlib
 import os
-from typing import Dict, List, Optional, Union
+from typing import TYPE_CHECKING
 
-from h11._headers import Headers as H11Headers
+if TYPE_CHECKING:
+    from h11._headers import Headers as H11Headers
 
-from .events import Event
-from .typing import Headers
+    from .events import Event
+    from .typing import Headers
 
 # RFC6455, Section 1.3 - Opening Handshake
 ACCEPT_GUID = b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
@@ -23,7 +26,8 @@ class ProtocolError(Exception):
 
 
 class LocalProtocolError(ProtocolError):
-    """Indicates an error due to local/programming errors.
+    """
+    Indicates an error due to local/programming errors.
 
     This is raised when the connection is asked to do something that
     is either incompatible with the state or the websocket standard.
@@ -34,7 +38,8 @@ class LocalProtocolError(ProtocolError):
 
 
 class RemoteProtocolError(ProtocolError):
-    """Indicates an error due to the remote's actions.
+    """
+    Indicates an error due to the remote's actions.
 
     This is raised when processing the bytes from the remote if the
     remote has sent data that is incompatible with the websocket
@@ -47,18 +52,18 @@ class RemoteProtocolError(ProtocolError):
 
     """
 
-    def __init__(self, message: str, event_hint: Optional[Event] = None) -> None:
+    def __init__(self, message: str, event_hint: Event | None = None) -> None:
         self.event_hint = event_hint
         super().__init__(message)
 
 
 # Some convenience utilities for working with HTTP headers
-def normed_header_dict(h11_headers: Union[Headers, H11Headers]) -> Dict[bytes, bytes]:
+def normed_header_dict(h11_headers: Headers | H11Headers) -> dict[bytes, bytes]:
     # This mangles Set-Cookie headers. But it happens that we don't care about
     # any of those, so it's OK. For every other HTTP header, if there are
     # multiple instances then you're allowed to join them together with
     # commas.
-    name_to_values: Dict[bytes, List[bytes]] = {}
+    name_to_values: dict[bytes, list[bytes]] = {}
     for name, value in h11_headers:
         name_to_values.setdefault(name, []).append(value)
     name_to_normed_value = {}
@@ -72,7 +77,7 @@ def normed_header_dict(h11_headers: Union[Headers, H11Headers]) -> Dict[bytes, b
 # fine, because the ABNF is just 1#token. But for the extension lists, it's
 # wrong, because those can contain quoted strings, which can in turn contain
 # commas. XX FIXME
-def split_comma_header(value: bytes) -> List[str]:
+def split_comma_header(value: bytes) -> list[str]:
     return [piece.decode("ascii").strip() for piece in value.split(b",")]
 
 
diff --git a/libs/yaml/__init__.py b/libs/yaml/__init__.py
index 2ec4f203c7..d58f089173 100644
--- a/libs/yaml/__init__.py
+++ b/libs/yaml/__init__.py
@@ -8,7 +8,7 @@
 from .loader import *
 from .dumper import *
 
-__version__ = '6.0.2'
+__version__ = '6.0.3'
 try:
     from .cyaml import *
     __with_libyaml__ = True
diff --git a/libs/zipp-3.20.2.dist-info/LICENSE b/libs/zipp-3.20.2.dist-info/LICENSE
deleted file mode 100644
index 1bb5a44356..0000000000
--- a/libs/zipp-3.20.2.dist-info/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
diff --git a/libs/zipp-3.20.2.dist-info/METADATA b/libs/zipp-3.20.2.dist-info/METADATA
deleted file mode 100644
index cf6be8388b..0000000000
--- a/libs/zipp-3.20.2.dist-info/METADATA
+++ /dev/null
@@ -1,106 +0,0 @@
-Metadata-Version: 2.1
-Name: zipp
-Version: 3.20.2
-Summary: Backport of pathlib-compatible object wrapper for zip files
-Author-email: "Jason R. Coombs" <jaraco@jaraco.com>
-Project-URL: Source, https://github.com/jaraco/zipp
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
-Description-Content-Type: text/x-rst
-License-File: LICENSE
-Provides-Extra: check
-Requires-Dist: pytest-checkdocs >=2.4 ; extra == 'check'
-Requires-Dist: pytest-ruff >=0.2.1 ; (sys_platform != "cygwin") and extra == 'check'
-Provides-Extra: cover
-Requires-Dist: pytest-cov ; extra == 'cover'
-Provides-Extra: doc
-Requires-Dist: sphinx >=3.5 ; extra == 'doc'
-Requires-Dist: jaraco.packaging >=9.3 ; extra == 'doc'
-Requires-Dist: rst.linker >=1.9 ; extra == 'doc'
-Requires-Dist: furo ; extra == 'doc'
-Requires-Dist: sphinx-lint ; extra == 'doc'
-Requires-Dist: jaraco.tidelift >=1.4 ; extra == 'doc'
-Provides-Extra: enabler
-Requires-Dist: pytest-enabler >=2.2 ; extra == 'enabler'
-Provides-Extra: test
-Requires-Dist: pytest !=8.1.*,>=6 ; extra == 'test'
-Requires-Dist: jaraco.itertools ; extra == 'test'
-Requires-Dist: jaraco.functools ; extra == 'test'
-Requires-Dist: more-itertools ; extra == 'test'
-Requires-Dist: big-O ; extra == 'test'
-Requires-Dist: pytest-ignore-flaky ; extra == 'test'
-Requires-Dist: jaraco.test ; extra == 'test'
-Requires-Dist: importlib-resources ; (python_version < "3.9") and extra == 'test'
-Provides-Extra: type
-Requires-Dist: pytest-mypy ; extra == 'type'
-
-.. image:: https://img.shields.io/pypi/v/zipp.svg
-   :target: https://pypi.org/project/zipp
-
-.. image:: https://img.shields.io/pypi/pyversions/zipp.svg
-
-.. image:: https://github.com/jaraco/zipp/actions/workflows/main.yml/badge.svg
-   :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22tests%22
-   :alt: tests
-
-.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json
-    :target: https://github.com/astral-sh/ruff
-    :alt: Ruff
-
-.. image:: https://readthedocs.org/projects/zipp/badge/?version=latest
-..    :target: https://zipp.readthedocs.io/en/latest/?badge=latest
-
-.. image:: https://img.shields.io/badge/skeleton-2024-informational
-   :target: https://blog.jaraco.com/skeleton
-
-.. image:: https://tidelift.com/badges/package/pypi/zipp
-   :target: https://tidelift.com/subscription/pkg/pypi-zipp?utm_source=pypi-zipp&utm_medium=readme
-
-
-A pathlib-compatible Zipfile object wrapper. Official backport of the standard library
-`Path object <https://docs.python.org/3.8/library/zipfile.html#path-objects>`_.
-
-
-Compatibility
-=============
-
-New features are introduced in this third-party library and later merged
-into CPython. The following table indicates which versions of this library
-were contributed to different versions in the standard library:
-
-.. list-table::
-   :header-rows: 1
-
-   * - zipp
-     - stdlib
-   * - 3.18
-     - 3.13
-   * - 3.16
-     - 3.12
-   * - 3.5
-     - 3.11
-   * - 3.2
-     - 3.10
-   * - 3.3 ??
-     - 3.9
-   * - 1.0
-     - 3.8
-
-
-Usage
-=====
-
-Use ``zipp.Path`` in place of ``zipfile.Path`` on any Python.
-
-For Enterprise
-==============
-
-Available as part of the Tidelift Subscription.
-
-This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
-
-`Learn more <https://tidelift.com/subscription/pkg/pypi-zipp?utm_source=pypi-zipp&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/zipp-3.20.2.dist-info/RECORD b/libs/zipp-3.20.2.dist-info/RECORD
deleted file mode 100644
index 1cb96b42fd..0000000000
--- a/libs/zipp-3.20.2.dist-info/RECORD
+++ /dev/null
@@ -1,12 +0,0 @@
-zipp-3.20.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-zipp-3.20.2.dist-info/LICENSE,sha256=htoPAa6uRjSKPD1GUZXcHOzN55956HdppkuNoEsqR0E,1023
-zipp-3.20.2.dist-info/METADATA,sha256=BY9j659m6ayOwffzL5nKNwcZW5S5Ms2LVHQJ4qspY1g,3682
-zipp-3.20.2.dist-info/RECORD,,
-zipp-3.20.2.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zipp-3.20.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-zipp-3.20.2.dist-info/top_level.txt,sha256=iAbdoSHfaGqBfVb2XuR9JqSQHCoOsOtG6y9C_LSpqFw,5
-zipp/__init__.py,sha256=WFZd5W532NrC0tyPAEqzjk2xifPH7BePG0L2PPihoM0,11831
-zipp/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zipp/compat/overlay.py,sha256=oEIGAnbr8yGjuKTrVSO2ByewPui71uppbX18BLnYTKE,783
-zipp/compat/py310.py,sha256=KS3sidGTSkoGh3biXiCqRzE6RMEGH0sbRQBevWU73dU,256
-zipp/glob.py,sha256=yPjGfHwcJxUn0fld7I-K-ZQSfTaJBBoimCIygU1SZQw,3315
diff --git a/libs/zipp-3.20.2.dist-info/WHEEL b/libs/zipp-3.20.2.dist-info/WHEEL
deleted file mode 100644
index 9b78c44519..0000000000
--- a/libs/zipp-3.20.2.dist-info/WHEEL
+++ /dev/null
@@ -1,5 +0,0 @@
-Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
-Root-Is-Purelib: true
-Tag: py3-none-any
-
diff --git a/libs/zipp-3.20.2.dist-info/INSTALLER b/libs/zipp-3.23.0.dist-info/INSTALLER
similarity index 100%
rename from libs/zipp-3.20.2.dist-info/INSTALLER
rename to libs/zipp-3.23.0.dist-info/INSTALLER
diff --git a/libs/zipp-3.23.0.dist-info/METADATA b/libs/zipp-3.23.0.dist-info/METADATA
new file mode 100644
index 0000000000..6420117987
--- /dev/null
+++ b/libs/zipp-3.23.0.dist-info/METADATA
@@ -0,0 +1,106 @@
+Metadata-Version: 2.4
+Name: zipp
+Version: 3.23.0
+Summary: Backport of pathlib-compatible object wrapper for zip files
+Author-email: "Jason R. Coombs" <jaraco@jaraco.com>
+License-Expression: MIT
+Project-URL: Source, https://github.com/jaraco/zipp
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+License-File: LICENSE
+Provides-Extra: test
+Requires-Dist: pytest!=8.1.*,>=6; extra == "test"
+Requires-Dist: jaraco.itertools; extra == "test"
+Requires-Dist: jaraco.functools; extra == "test"
+Requires-Dist: more_itertools; extra == "test"
+Requires-Dist: big-O; extra == "test"
+Requires-Dist: pytest-ignore-flaky; extra == "test"
+Requires-Dist: jaraco.test; extra == "test"
+Provides-Extra: doc
+Requires-Dist: sphinx>=3.5; extra == "doc"
+Requires-Dist: jaraco.packaging>=9.3; extra == "doc"
+Requires-Dist: rst.linker>=1.9; extra == "doc"
+Requires-Dist: furo; extra == "doc"
+Requires-Dist: sphinx-lint; extra == "doc"
+Requires-Dist: jaraco.tidelift>=1.4; extra == "doc"
+Provides-Extra: check
+Requires-Dist: pytest-checkdocs>=2.4; extra == "check"
+Requires-Dist: pytest-ruff>=0.2.1; sys_platform != "cygwin" and extra == "check"
+Provides-Extra: cover
+Requires-Dist: pytest-cov; extra == "cover"
+Provides-Extra: enabler
+Requires-Dist: pytest-enabler>=2.2; extra == "enabler"
+Provides-Extra: type
+Requires-Dist: pytest-mypy; extra == "type"
+Dynamic: license-file
+
+.. image:: https://img.shields.io/pypi/v/zipp.svg
+   :target: https://pypi.org/project/zipp
+
+.. image:: https://img.shields.io/pypi/pyversions/zipp.svg
+
+.. image:: https://github.com/jaraco/zipp/actions/workflows/main.yml/badge.svg
+   :target: https://github.com/jaraco/zipp/actions?query=workflow%3A%22tests%22
+   :alt: tests
+
+.. image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
+
+.. image:: https://readthedocs.org/projects/zipp/badge/?version=latest
+..    :target: https://zipp.readthedocs.io/en/latest/?badge=latest
+
+.. image:: https://img.shields.io/badge/skeleton-2025-informational
+   :target: https://blog.jaraco.com/skeleton
+
+.. image:: https://tidelift.com/badges/package/pypi/zipp
+   :target: https://tidelift.com/subscription/pkg/pypi-zipp?utm_source=pypi-zipp&utm_medium=readme
+
+
+A pathlib-compatible Zipfile object wrapper. Official backport of the standard library
+`Path object <https://docs.python.org/3.8/library/zipfile.html#path-objects>`_.
+
+
+Compatibility
+=============
+
+New features are introduced in this third-party library and later merged
+into CPython. The following table indicates which versions of this library
+were contributed to different versions in the standard library:
+
+.. list-table::
+   :header-rows: 1
+
+   * - zipp
+     - stdlib
+   * - 3.18
+     - 3.13
+   * - 3.16
+     - 3.12
+   * - 3.5
+     - 3.11
+   * - 3.2
+     - 3.10
+   * - 3.3 ??
+     - 3.9
+   * - 1.0
+     - 3.8
+
+
+Usage
+=====
+
+Use ``zipp.Path`` in place of ``zipfile.Path`` on any Python.
+
+For Enterprise
+==============
+
+Available as part of the Tidelift Subscription.
+
+This project and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.
+
+`Learn more <https://tidelift.com/subscription/pkg/pypi-zipp?utm_source=pypi-zipp&utm_medium=referral&utm_campaign=github>`_.
diff --git a/libs/zipp-3.23.0.dist-info/RECORD b/libs/zipp-3.23.0.dist-info/RECORD
new file mode 100644
index 0000000000..af8acc40f2
--- /dev/null
+++ b/libs/zipp-3.23.0.dist-info/RECORD
@@ -0,0 +1,14 @@
+zipp-3.23.0.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+zipp-3.23.0.dist-info/METADATA,sha256=vdZ9TRbPC_O4k-fRjNPS13StuC837Zhbx3cMYHIms1s,3563
+zipp-3.23.0.dist-info/RECORD,,
+zipp-3.23.0.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+zipp-3.23.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+zipp-3.23.0.dist-info/licenses/LICENSE,sha256=WlfLTbheKi3YjCkGKJCK3VfjRRRJ4KmnH9-zh3b9dZ0,1076
+zipp-3.23.0.dist-info/top_level.txt,sha256=iAbdoSHfaGqBfVb2XuR9JqSQHCoOsOtG6y9C_LSpqFw,5
+zipp/__init__.py,sha256=ieXh9GIMdABjKRX_JUJtP9k5wdBLK4Mt5X4nszSkmYE,11976
+zipp/_functools.py,sha256=f6Kt9LxZ4TE-cY1lJVdXSId3memSXmH9IdgMbU-_x2k,575
+zipp/compat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+zipp/compat/overlay.py,sha256=oEIGAnbr8yGjuKTrVSO2ByewPui71uppbX18BLnYTKE,783
+zipp/compat/py310.py,sha256=S7i6N9mToEn3asNb2ILyjnzvITOXrATD_J4emjyBbDU,256
+zipp/compat/py313.py,sha256=RndvDNtuY7H2D9ecnnzcPBMZ8mZc42gmXD_IwQAXXAE,654
+zipp/glob.py,sha256=DLV9LBsDxA6YVW82e3-tkoNrus1h4R-j3BR6VqS0AzE,3382
diff --git a/libs/zipp-3.23.0.dist-info/REQUESTED b/libs/zipp-3.23.0.dist-info/REQUESTED
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/libs/zipp-3.23.0.dist-info/WHEEL b/libs/zipp-3.23.0.dist-info/WHEEL
new file mode 100644
index 0000000000..0885d05555
--- /dev/null
+++ b/libs/zipp-3.23.0.dist-info/WHEEL
@@ -0,0 +1,5 @@
+Wheel-Version: 1.0
+Generator: setuptools (80.10.2)
+Root-Is-Purelib: true
+Tag: py3-none-any
+
diff --git a/libs/zipp-3.23.0.dist-info/licenses/LICENSE b/libs/zipp-3.23.0.dist-info/licenses/LICENSE
new file mode 100644
index 0000000000..f60bd57201
--- /dev/null
+++ b/libs/zipp-3.23.0.dist-info/licenses/LICENSE
@@ -0,0 +1,18 @@
+MIT License
+
+Copyright (c) 2025 <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
+EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/libs/zipp-3.20.2.dist-info/top_level.txt b/libs/zipp-3.23.0.dist-info/top_level.txt
similarity index 100%
rename from libs/zipp-3.20.2.dist-info/top_level.txt
rename to libs/zipp-3.23.0.dist-info/top_level.txt
diff --git a/libs/zipp/__init__.py b/libs/zipp/__init__.py
index 161a4fb1ce..ed5b214632 100644
--- a/libs/zipp/__init__.py
+++ b/libs/zipp/__init__.py
@@ -7,20 +7,20 @@
 for more detail.
 """
 
+import functools
 import io
-import posixpath
-import zipfile
 import itertools
-import contextlib
 import pathlib
+import posixpath
 import re
 import stat
 import sys
+import zipfile
 
+from ._functools import save_method_args
 from .compat.py310 import text_encoding
 from .glob import Translator
 
-
 __all__ = ['Path']
 
 
@@ -87,13 +87,12 @@ class InitializedState:
     Mix-in to save the initialization state for pickling.
     """
 
+    @save_method_args
     def __init__(self, *args, **kwargs):
-        self.__args = args
-        self.__kwargs = kwargs
         super().__init__(*args, **kwargs)
 
     def __getstate__(self):
-        return self.__args, self.__kwargs
+        return self._saved___init__.args, self._saved___init__.kwargs
 
     def __setstate__(self, state):
         args, kwargs = state
@@ -182,22 +181,27 @@ class FastLookup(CompleteDirs):
     """
 
     def namelist(self):
-        with contextlib.suppress(AttributeError):
-            return self.__names
-        self.__names = super().namelist()
-        return self.__names
+        return self._namelist
+
+    @functools.cached_property
+    def _namelist(self):
+        return super().namelist()
 
     def _name_set(self):
-        with contextlib.suppress(AttributeError):
-            return self.__lookup
-        self.__lookup = super()._name_set()
-        return self.__lookup
+        return self._name_set_prop
+
+    @functools.cached_property
+    def _name_set_prop(self):
+        return super()._name_set()
 
 
 def _extract_text_encoding(encoding=None, *args, **kwargs):
     # compute stack level so that the caller of the caller sees any warning.
     is_pypy = sys.implementation.name == 'pypy'
-    stack_level = 3 + is_pypy
+    # PyPy no longer special cased after 7.3.19 (or maybe 7.3.18)
+    # See jaraco/zipp#143
+    is_old_pypi = is_pypy and sys.pypy_version_info < (7, 3, 19)
+    stack_level = 3 + is_old_pypi
     return text_encoding(encoding, stack_level), args, kwargs
 
 
@@ -340,7 +344,7 @@ def open(self, mode='r', *args, pwd=None, **kwargs):
         if self.is_dir():
             raise IsADirectoryError(self)
         zip_mode = mode[0]
-        if not self.exists() and zip_mode == 'r':
+        if zip_mode == 'r' and not self.exists():
             raise FileNotFoundError(self)
         stream = self.root.open(self.at, zip_mode, pwd=pwd)
         if 'b' in mode:
@@ -352,7 +356,7 @@ def open(self, mode='r', *args, pwd=None, **kwargs):
         return io.TextIOWrapper(stream, encoding, *args, **kwargs)
 
     def _base(self):
-        return pathlib.PurePosixPath(self.at or self.root.filename)
+        return pathlib.PurePosixPath(self.at) if self.at else self.filename
 
     @property
     def name(self):
diff --git a/libs/zipp/_functools.py b/libs/zipp/_functools.py
new file mode 100644
index 0000000000..7390be2187
--- /dev/null
+++ b/libs/zipp/_functools.py
@@ -0,0 +1,20 @@
+import collections
+import functools
+
+
+# from jaraco.functools 4.0.2
+def save_method_args(method):
+    """
+    Wrap a method such that when it is called, the args and kwargs are
+    saved on the method.
+    """
+    args_and_kwargs = collections.namedtuple('args_and_kwargs', 'args kwargs')  # noqa: PYI024
+
+    @functools.wraps(method)
+    def wrapper(self, /, *args, **kwargs):
+        attr_name = '_saved_' + method.__name__
+        attr = args_and_kwargs(args, kwargs)
+        setattr(self, attr_name, attr)
+        return method(self, *args, **kwargs)
+
+    return wrapper
diff --git a/libs/zipp/compat/py310.py b/libs/zipp/compat/py310.py
index 8264a482f2..e1e7ec2290 100644
--- a/libs/zipp/compat/py310.py
+++ b/libs/zipp/compat/py310.py
@@ -1,5 +1,5 @@
-import sys
 import io
+import sys
 
 
 def _text_encoding(encoding, stacklevel=2, /):  # pragma: no cover
diff --git a/libs/zipp/compat/py313.py b/libs/zipp/compat/py313.py
new file mode 100644
index 0000000000..ae45869055
--- /dev/null
+++ b/libs/zipp/compat/py313.py
@@ -0,0 +1,34 @@
+import functools
+import sys
+
+
+# from jaraco.functools 4.1
+def identity(x):
+    return x
+
+
+# from jaraco.functools 4.1
+def apply(transform):
+    def wrap(func):
+        return functools.wraps(func)(compose(transform, func))
+
+    return wrap
+
+
+# from jaraco.functools 4.1
+def compose(*funcs):
+    def compose_two(f1, f2):
+        return lambda *args, **kwargs: f1(f2(*args, **kwargs))
+
+    return functools.reduce(compose_two, funcs)
+
+
+def replace(pattern):
+    r"""
+    >>> replace(r'foo\z')
+    'foo\\Z'
+    """
+    return pattern[:-2] + pattern[-2:].replace(r'\z', r'\Z')
+
+
+legacy_end_marker = apply(replace) if sys.version_info < (3, 14) else identity
diff --git a/libs/zipp/glob.py b/libs/zipp/glob.py
index 4320f1c0ba..1b4ffb3318 100644
--- a/libs/zipp/glob.py
+++ b/libs/zipp/glob.py
@@ -1,6 +1,7 @@
 import os
 import re
 
+from .compat.py313 import legacy_end_marker
 
 _default_seps = os.sep + str(os.altsep) * bool(os.altsep)
 
@@ -30,6 +31,7 @@ def translate(self, pattern):
         """
         return self.extend(self.match_dirs(self.translate_core(pattern)))
 
+    @legacy_end_marker
     def extend(self, pattern):
         r"""
         Extend regex for pattern-wide concerns.
@@ -37,9 +39,9 @@ def extend(self, pattern):
         Apply '(?s:)' to create a non-matching group that
         matches newlines (valid on Unix).
 
-        Append '\Z' to imply fullmatch even when match is used.
+        Append '\z' to imply fullmatch even when match is used.
         """
-        return rf'(?s:{pattern})\Z'
+        return rf'(?s:{pattern})\z'
 
     def match_dirs(self, pattern):
         """
diff --git a/migrations/versions/c00d40af333c_.py b/migrations/versions/c00d40af333c_.py
new file mode 100644
index 0000000000..cbf571a9d1
--- /dev/null
+++ b/migrations/versions/c00d40af333c_.py
@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: c00d40af333c
+Revises: df76a4410347
+Create Date: 2026-03-15 10:22:57.387298
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from app.database import TableHistory, TableHistoryMovie
+
+
+# revision identifiers, used by Alembic.
+revision = 'c00d40af333c'
+down_revision = 'df76a4410347'
+branch_labels = None
+depends_on = None
+
+bind = op.get_context().bind
+insp = sa.inspect(bind)
+
+
+def column_exists(table_name, column_name):
+    columns = insp.get_columns(table_name)
+    return any(c["name"] == column_name for c in columns)
+
+
+def upgrade():
+    with op.batch_alter_table('table_history', schema=None) as batch_op:
+        if not column_exists('table_history', 'score_out_of'):
+            batch_op.add_column(sa.Column('score_out_of', sa.Integer, nullable=True))
+    op.execute(sa.update(TableHistory).values({TableHistory.score_out_of: 360}).where(TableHistory.score.is_not(None)))
+
+    with op.batch_alter_table('table_history_movie', schema=None) as batch_op:
+        if not column_exists('table_history_movie', 'score_out_of'):
+            batch_op.add_column(sa.Column('score_out_of', sa.Integer, nullable=True))
+    op.execute(sa.update(TableHistoryMovie).values({TableHistoryMovie.score_out_of: 120}).where(TableHistoryMovie.score.is_not(None)))
+
+
+def downgrade():
+    pass
diff --git a/opensubtitles-scraper b/opensubtitles-scraper
index 7ca0af6bb4..1842a8fbf9 160000
--- a/opensubtitles-scraper
+++ b/opensubtitles-scraper
@@ -1 +1 @@
-Subproject commit 7ca0af6bb47f732c2b868fd2c8b3d31085b8a0b8
+Subproject commit 1842a8fbf9cc3cd77ea11ffb4545648d6338faae
diff --git a/package_info b/package_info
index bc25c818d5..0e765877ae 100644
--- a/package_info
+++ b/package_info
@@ -1,8 +1,7 @@
-# LavX Bazarr Fork Package Information
-# This file identifies the build as a LavX fork with OpenSubtitles.org scraper support
+# Bazarr+ Package Information
 
 # Package version identifier (shown in System Status)
-packageversion=LavX Fork v1.5.6-lavx "Neon Pulse"
+packageversion=Bazarr+ v2.0.0
 
 # Package author (shown in System Status)
 packageauthor=LavX
diff --git a/requirements.txt b/requirements.txt
index 24490186a9..e9a61f20cf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,5 @@ lxml>=4.3.0
 numpy>=1.12.0,<2.4.0  # prevent segfault on hold hardware caused by new CPU requirements introduced in 2.4.0
 webrtcvad-wheels>=2.0.10
 Pillow>=9.0.0 --only-binary=Pillow
+cryptography>=41.0.0
 pywin32; platform_system == "Windows"
diff --git a/screenshot/bazarr-screenshot.png b/screenshot/bazarr-screenshot.png
deleted file mode 100644
index 9656c1718d..0000000000
Binary files a/screenshot/bazarr-screenshot.png and /dev/null differ
diff --git a/screenshot/filter-mass-translate.png b/screenshot/filter-mass-translate.png
deleted file mode 100644
index f30715aec2..0000000000
Binary files a/screenshot/filter-mass-translate.png and /dev/null differ
diff --git a/screenshot/filter-series-include.png b/screenshot/filter-series-include.png
deleted file mode 100644
index 879c054151..0000000000
Binary files a/screenshot/filter-series-include.png and /dev/null differ
diff --git a/screenshot/filter-wanted-movies.png b/screenshot/filter-wanted-movies.png
deleted file mode 100644
index ea7832c219..0000000000
Binary files a/screenshot/filter-wanted-movies.png and /dev/null differ
diff --git a/screenshot/hero_eclipse.png b/screenshot/hero_eclipse.png
new file mode 100644
index 0000000000..202f6c305b
Binary files /dev/null and b/screenshot/hero_eclipse.png differ
diff --git a/screenshot/hero_eclipse_compact.png b/screenshot/hero_eclipse_compact.png
new file mode 100644
index 0000000000..0c71802b38
Binary files /dev/null and b/screenshot/hero_eclipse_compact.png differ
diff --git a/screenshot/mass-translate.png b/screenshot/mass-translate.png
new file mode 100644
index 0000000000..e6954cb334
Binary files /dev/null and b/screenshot/mass-translate.png differ
diff --git a/screenshot/series-batch-actions.png b/screenshot/series-batch-actions.png
new file mode 100644
index 0000000000..7b2552d666
Binary files /dev/null and b/screenshot/series-batch-actions.png differ
diff --git a/screenshot/series-detail.png b/screenshot/series-detail.png
new file mode 100644
index 0000000000..c6cb62bb42
Binary files /dev/null and b/screenshot/series-detail.png differ
diff --git a/screenshot/subtitle-viewer.png b/screenshot/subtitle-viewer.png
new file mode 100644
index 0000000000..c06ff1939c
Binary files /dev/null and b/screenshot/subtitle-viewer.png differ
diff --git a/screenshot/translator-settings-v2.png b/screenshot/translator-settings-v2.png
new file mode 100644
index 0000000000..753b930722
Binary files /dev/null and b/screenshot/translator-settings-v2.png differ
diff --git a/tests/bazarr/test_app_get_providers.py b/tests/bazarr/test_app_get_providers.py
index af00cb02db..53720a27fd 100644
--- a/tests/bazarr/test_app_get_providers.py
+++ b/tests/bazarr/test_app_get_providers.py
@@ -34,7 +34,7 @@ def test_get_providers_auth_embeddedsubtitles():
     assert isinstance(item["cache_dir"], str)
     assert isinstance(item["ffprobe_path"], str)
     assert isinstance(item["ffmpeg_path"], str)
-    assert isinstance(item["timeout"], str)
+    assert isinstance(item["timeout"], int)
     assert isinstance(item["unknown_as_fallback"], bool)
     assert isinstance(item["fallback_lang"], str)
 
@@ -53,13 +53,13 @@ def test_get_language_equals_default_settings():
 
 def test_get_language_equals_injected_settings_invalid():
     config = get_providers.settings
-    config.set("general", "language_equals", '["invalid"]')
+    config.set("general.language_equals", ["invalid"])
     assert not get_providers.get_language_equals(config)
 
 
 def test_get_language_equals_injected_settings_valid():
     config = get_providers.settings
-    config.set("general", "language_equals", '["spa:spa-MX"]')
+    config.set("general.language_equals", ["spa:spa-MX"])
 
     result = get_providers.get_language_equals(config)
     assert result == [(Language("spa"), Language("spa", "MX"))]
@@ -68,9 +68,9 @@ def test_get_language_equals_injected_settings_valid():
 @pytest.mark.parametrize(
     "config_value,expected",
     [
-        ('["spa:spl"]', (Language("spa"), Language("spa", "MX"))),
-        ('["por:pob"]', (Language("por"), Language("por", "BR"))),
-        ('["zho:zht"]', (Language("zho"), Language("zho", "TW"))),
+        (["spa:spl"], (Language("spa"), Language("spa", "MX"))),
+        (["por:pob"], (Language("por"), Language("por", "BR"))),
+        (["zho:zht"], (Language("zho"), Language("zho", "TW"))),
     ],
 )
 def test_get_language_equals_injected_settings_custom_lang_alpha3(
@@ -78,7 +78,7 @@ def test_get_language_equals_injected_settings_custom_lang_alpha3(
 ):
     config = get_providers.settings
 
-    config.set("general", "language_equals", config_value)
+    config.set("general.language_equals", config_value)
 
     result = get_providers.get_language_equals(config)
     assert result == [expected]
@@ -88,9 +88,8 @@ def test_get_language_equals_injected_settings_multiple():
     config = get_providers.settings
 
     config.set(
-        "general",
-        "language_equals",
-        "['eng@hi:eng', 'spa:spl', 'spa@hi:spl', 'spl@hi:spl']",
+        "general.language_equals",
+        ["eng@hi:eng", "spa:spl", "spa@hi:spl", "spl@hi:spl"],
     )
 
     result = get_providers.get_language_equals(config)
@@ -99,7 +98,7 @@ def test_get_language_equals_injected_settings_multiple():
 
 def test_get_language_equals_injected_settings_valid_multiple():
     config = get_providers.settings
-    config.set("general", "language_equals", '["spa:spa-MX", "spa-MX:spa"]')
+    config.set("general.language_equals", ["spa:spa-MX", "spa-MX:spa"])
 
     result = get_providers.get_language_equals(config)
     assert result == [
@@ -110,7 +109,7 @@ def test_get_language_equals_injected_settings_valid_multiple():
 
 def test_get_language_equals_injected_settings_hi():
     config = get_providers.settings
-    config.set("general", "language_equals", '["eng@hi:eng"]')
+    config.set("general.language_equals", ["eng@hi:eng"])
 
     result = get_providers.get_language_equals(config)
     assert result == [(Language("eng", hi=True), Language("eng"))]
diff --git a/tests/bazarr/test_encryption.py b/tests/bazarr/test_encryption.py
new file mode 100644
index 0000000000..38612e1919
--- /dev/null
+++ b/tests/bazarr/test_encryption.py
@@ -0,0 +1,120 @@
+import base64
+from unittest.mock import patch, MagicMock
+import pytest
+from subtitles.tools.translate.services.encryption import encrypt_api_key, validate_encryption_key
+
+
+class TestValidateEncryptionKey:
+    def test_valid_64_hex(self):
+        assert validate_encryption_key("79866a5b6ef41b78681a7f774f6628fe66c49b0f0c96808cc3f48acbbfe1ac41") is True
+
+    def test_empty_string(self):
+        assert validate_encryption_key("") is False
+
+    def test_too_short(self):
+        assert validate_encryption_key("abcd1234") is False
+
+    def test_too_long(self):
+        assert validate_encryption_key("a" * 65) is False
+
+    def test_non_hex_chars(self):
+        assert validate_encryption_key("g" * 64) is False
+
+    def test_uppercase_hex(self):
+        assert validate_encryption_key("A" * 64) is True
+
+    def test_mixed_case_hex(self):
+        assert validate_encryption_key("aAbBcCdD" * 8) is True
+
+
+class TestEncryptApiKey:
+    KEY_HEX = "79866a5b6ef41b78681a7f774f6628fe66c49b0f0c96808cc3f48acbbfe1ac41"
+    API_KEY = "sk-or-v1-test1234567890"
+
+    def test_returns_enc_prefix(self):
+        result = encrypt_api_key(self.API_KEY, self.KEY_HEX)
+        assert result.startswith("enc:")
+
+    def test_base64_payload(self):
+        result = encrypt_api_key(self.API_KEY, self.KEY_HEX)
+        payload = result[4:]  # strip "enc:"
+        decoded = base64.b64decode(payload)
+        # 12-byte nonce + ciphertext + 16-byte tag
+        # ciphertext length = len(api_key bytes)
+        assert len(decoded) == 12 + len(self.API_KEY.encode()) + 16
+
+    def test_unique_nonces(self):
+        r1 = encrypt_api_key(self.API_KEY, self.KEY_HEX)
+        r2 = encrypt_api_key(self.API_KEY, self.KEY_HEX)
+        assert r1 != r2  # different nonce each time
+
+    def test_roundtrip_decrypt(self):
+        """Verify we can decrypt what we encrypted."""
+        from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+        encrypted = encrypt_api_key(self.API_KEY, self.KEY_HEX)
+        payload = base64.b64decode(encrypted[4:])
+        nonce = payload[:12]
+        ciphertext = payload[12:]
+        aesgcm = AESGCM(bytes.fromhex(self.KEY_HEX))
+        decrypted = aesgcm.decrypt(nonce, ciphertext, None).decode("utf-8")
+        assert decrypted == self.API_KEY
+
+    def test_invalid_key_raises(self):
+        with pytest.raises(ValueError):
+            encrypt_api_key(self.API_KEY, "not-a-hex-key")
+
+    def test_short_key_raises(self):
+        with pytest.raises(ValueError):
+            encrypt_api_key(self.API_KEY, "abcd1234")
+
+
+class TestGetApiKeyValue:
+    """Test the _get_api_key_value helper on OpenRouterTranslatorService."""
+
+    KEY_HEX = "79866a5b6ef41b78681a7f774f6628fe66c49b0f0c96808cc3f48acbbfe1ac41"
+    API_KEY = "sk-or-v1-test1234567890"
+
+    def _make_service(self):
+        from subtitles.tools.translate.services.openrouter_translator import OpenRouterTranslatorService
+        return OpenRouterTranslatorService(
+            source_srt_file="", dest_srt_file="", lang_obj=None,
+            to_lang="hun", from_lang="en", media_type="series",
+            video_path="", orig_to_lang="hu", forced=False, hi=False,
+            sonarr_series_id=None, sonarr_episode_id=None, radarr_id=None,
+        )
+
+    @patch("subtitles.tools.translate.services.openrouter_translator.settings")
+    def test_no_encryption_key_returns_plaintext(self, mock_settings):
+        mock_settings.translator.openrouter_api_key = self.API_KEY
+        mock_settings.translator.openrouter_encryption_key = ""
+        svc = self._make_service()
+        result = svc._get_api_key_value()
+        assert result == self.API_KEY
+
+    @patch("subtitles.tools.translate.services.openrouter_translator.settings")
+    def test_with_encryption_key_returns_encrypted(self, mock_settings):
+        mock_settings.translator.openrouter_api_key = self.API_KEY
+        mock_settings.translator.openrouter_encryption_key = self.KEY_HEX
+        svc = self._make_service()
+        result = svc._get_api_key_value()
+        assert result.startswith("enc:")
+
+    @patch("subtitles.tools.translate.services.openrouter_translator.settings")
+    def test_with_encryption_key_roundtrips(self, mock_settings):
+        from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+        mock_settings.translator.openrouter_api_key = self.API_KEY
+        mock_settings.translator.openrouter_encryption_key = self.KEY_HEX
+        svc = self._make_service()
+        result = svc._get_api_key_value()
+        payload = base64.b64decode(result[4:])
+        aesgcm = AESGCM(bytes.fromhex(self.KEY_HEX))
+        decrypted = aesgcm.decrypt(payload[:12], payload[12:], None).decode()
+        assert decrypted == self.API_KEY
+
+    @patch("subtitles.tools.translate.services.openrouter_translator.settings")
+    def test_invalid_encryption_key_raises(self, mock_settings):
+        mock_settings.translator.openrouter_api_key = self.API_KEY
+        mock_settings.translator.openrouter_encryption_key = "not-valid-hex"
+        svc = self._make_service()
+        with pytest.raises(ValueError, match="Invalid encryption key format"):
+            svc._get_api_key_value()
diff --git a/tests/bazarr/test_gemini_translator.py b/tests/bazarr/test_gemini_translator.py
new file mode 100644
index 0000000000..4a05c7a13f
--- /dev/null
+++ b/tests/bazarr/test_gemini_translator.py
@@ -0,0 +1,162 @@
+import time
+
+import pytest
+
+from bazarr.subtitles.tools.translate.services import gemini_translator
+
+
+def _build_service():
+    return gemini_translator.GeminiTranslatorService(
+        source_srt_file="input.srt",
+        dest_srt_file="output.srt",
+        to_lang="eng",
+        media_type="series",
+        sonarr_series_id=1,
+        sonarr_episode_id=1,
+        radarr_id=1,
+        forced=False,
+        hi=False,
+        video_path="/tmp/video.mkv",
+        from_lang="en",
+        orig_to_lang="eng",
+    )
+
+
+def test_get_batch_size_uses_configured_value(mocker):
+    service = _build_service()
+    mocker.patch.object(
+        gemini_translator.settings.translator,
+        "gemini_batch_size",
+        450,
+        create=True,
+    )
+    assert service._get_batch_size() == 450
+
+
+def test_get_batch_size_falls_back_to_default_for_invalid_value(mocker):
+    service = _build_service()
+    mocker.patch.object(
+        gemini_translator.settings.translator,
+        "gemini_batch_size",
+        "invalid",
+        create=True,
+    )
+    assert service._get_batch_size() == gemini_translator.DEFAULT_GEMINI_BATCH_SIZE
+
+
+def test_get_batch_size_is_clamped_to_minimum_of_one(mocker):
+    service = _build_service()
+    mocker.patch.object(
+        gemini_translator.settings.translator,
+        "gemini_batch_size",
+        0,
+        create=True,
+    )
+    assert service._get_batch_size() == 1
+
+
+@pytest.fixture(autouse=True)
+def _clear_gemini_key_cooldowns():
+    cooldowns = getattr(gemini_translator, "_GEMINI_KEY_COOLDOWNS", None)
+    if cooldowns is not None:
+        cooldowns.clear()
+    yield
+    cooldowns = getattr(gemini_translator, "_GEMINI_KEY_COOLDOWNS", None)
+    if cooldowns is not None:
+        cooldowns.clear()
+
+
+def test_get_configured_api_keys_trims_and_deduplicates(mocker):
+    service = _build_service()
+    mocker.patch.object(
+        gemini_translator.settings.translator,
+        "gemini_keys",
+        [" key-1 ", "", "key-2", "key-1"],
+        create=True,
+    )
+
+    assert service._get_configured_api_keys() == ["key-1", "key-2"]
+
+
+def test_get_configured_api_keys_returns_empty_when_no_keys(mocker):
+    service = _build_service()
+    mocker.patch.object(
+        gemini_translator.settings.translator,
+        "gemini_keys",
+        [],
+        create=True,
+    )
+
+    assert service._get_configured_api_keys() == []
+
+
+def test_select_next_api_key_skips_keys_on_cooldown():
+    service = _build_service()
+    service.api_keys = ["key-1", "key-2"]
+    service.current_api_index = -1
+    gemini_translator._GEMINI_KEY_COOLDOWNS["key-1"] = time.time() + 60
+
+    selected_key = service._select_next_api_key()
+
+    assert selected_key == "key-2"
+
+
+def test_handle_rate_limited_key_applies_cooldown_and_rotates_key():
+    class _RateLimitedResponse:
+        status_code = 429
+        headers = {"Retry-After": "7"}
+
+    service = _build_service()
+    service.api_keys = ["key-1", "key-2"]
+    service.current_api_index = 0
+    service.current_api_key = "key-1"
+
+    service._handle_rate_limited_key(_RateLimitedResponse())
+
+    assert gemini_translator._GEMINI_KEY_COOLDOWNS["key-1"] > time.time() + 6
+    assert service.current_api_key == "key-2"
+
+
+def test_handle_rate_limited_key_raises_when_all_keys_unavailable():
+    class _RateLimitedResponse:
+        status_code = 429
+        headers = {"Retry-After": "3"}
+
+    service = _build_service()
+    service.api_keys = ["key-1"]
+    service.current_api_index = 0
+    service.current_api_key = "key-1"
+
+    with pytest.raises(RuntimeError, match="All Gemini API keys are currently rate limited"):
+        service._handle_rate_limited_key(_RateLimitedResponse())
+
+
+def test_translate_with_gemini_does_not_leave_output_file_on_failure(tmp_path, mocker):
+    input_file = tmp_path / "input.srt"
+    output_file = tmp_path / "output.srt"
+    input_file.write_text(
+        "1\n00:00:00,000 --> 00:00:02,000\nHello world\n\n",
+        encoding="utf-8",
+    )
+
+    service = _build_service()
+    service.input_file = str(input_file)
+    service.output_file = str(output_file)
+    service.api_keys = ["key-1"]
+    service.current_api_key = "key-1"
+    service.target_language = "English"
+    service.batch_size = 1
+    service.job_id = "job-1"
+
+    def _fail_after_output_file_created(*args, **kwargs):
+        # Translation output file should be opened before batch processing starts.
+        assert output_file.exists()
+        raise RuntimeError("boom")
+
+    mocker.patch.object(service, "_process_batch", side_effect=_fail_after_output_file_created)
+    mocker.patch.object(gemini_translator.jobs_queue, "update_job_progress")
+
+    with pytest.raises(RuntimeError, match="boom"):
+        service._translate_with_gemini()
+
+    assert not output_file.exists()
diff --git a/tests/bazarr/test_mass_operations.py b/tests/bazarr/test_mass_operations.py
new file mode 100644
index 0000000000..3a939db46a
--- /dev/null
+++ b/tests/bazarr/test_mass_operations.py
@@ -0,0 +1,1015 @@
+# coding=utf-8
+
+from unittest.mock import patch, MagicMock, call
+
+
+class TestParseSubtitlesColumn:
+    """Test _parse_subtitles_column helper."""
+
+    def test_empty_input_none(self):
+        from bazarr.subtitles.mass_operations import _parse_subtitles_column
+        assert _parse_subtitles_column(None) == []
+
+    def test_empty_input_string(self):
+        from bazarr.subtitles.mass_operations import _parse_subtitles_column
+        assert _parse_subtitles_column('') == []
+
+    def test_valid_subtitles(self):
+        from bazarr.subtitles.mass_operations import _parse_subtitles_column
+        raw = "[['en', '/path/to/sub.srt'], ['fr:forced', '/path/to/sub.fr.srt']]"
+        result = _parse_subtitles_column(raw)
+        assert len(result) == 2
+        assert result[0] == ('en', '/path/to/sub.srt')
+        assert result[1] == ('fr:forced', '/path/to/sub.fr.srt')
+
+    def test_invalid_syntax(self):
+        from bazarr.subtitles.mass_operations import _parse_subtitles_column
+        assert _parse_subtitles_column('not valid python') == []
+
+    def test_skips_entries_without_path(self):
+        from bazarr.subtitles.mass_operations import _parse_subtitles_column
+        raw = "[['en', '/path/to/sub.srt'], ['fr', '']]"
+        result = _parse_subtitles_column(raw)
+        assert len(result) == 1
+        assert result[0] == ('en', '/path/to/sub.srt')
+
+    def test_short_entries(self):
+        from bazarr.subtitles.mass_operations import _parse_subtitles_column
+        raw = "[['en']]"
+        assert _parse_subtitles_column(raw) == []
+
+
+class TestProcessSubtitleItem:
+    """Test _process_subtitle_item for all action branches."""
+
+    def _make_item(self, sonarr_series_id=10, sonarr_episode_id=1, radarr_id=None):
+        return {
+            'video_path': '/video/test.mkv',
+            'srt_path': '/subs/test.en.srt',
+            'srt_lang': 'en',
+            'forced': False,
+            'hi': False,
+            'sonarr_series_id': sonarr_series_id,
+            'sonarr_episode_id': sonarr_episode_id,
+            'radarr_id': radarr_id,
+            'max_offset_seconds': '60',
+            'no_fix_framerate': True,
+            'gss': True,
+        }
+
+    @patch('bazarr.subtitles.mass_operations.sync_subtitles', return_value=True)
+    def test_sync_action(self, mock_sync):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = self._make_item()
+        result = _process_subtitle_item(item, 'sync', {}, 'test_job')
+        assert result is True
+        mock_sync.assert_called_once_with(
+            video_path='/video/test.mkv',
+            srt_path='/subs/test.en.srt',
+            srt_lang='en',
+            forced=False,
+            hi=False,
+            percent_score=0,
+            sonarr_series_id=10,
+            sonarr_episode_id=1,
+            radarr_id=None,
+            max_offset_seconds='60',
+            no_fix_framerate=True,
+            gss=True,
+            force_sync=True,
+            job_id='test_job',
+        )
+
+    @patch('bazarr.subtitles.mass_operations.subtitles_apply_mods')
+    def test_mod_action_remove_hi(self, mock_mods):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = self._make_item()
+        result = _process_subtitle_item(item, 'remove_HI', {}, 'test_job')
+        assert result is True
+        mock_mods.assert_called_once_with('en', '/subs/test.en.srt', ['remove_HI'], '/video/test.mkv')
+
+    @patch('bazarr.subtitles.mass_operations.subtitles_apply_mods')
+    def test_mod_action_ocr_fixes(self, mock_mods):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = self._make_item()
+        result = _process_subtitle_item(item, 'OCR_fixes', {}, 'test_job')
+        assert result is True
+        mock_mods.assert_called_once_with('en', '/subs/test.en.srt', ['OCR_fixes'], '/video/test.mkv')
+
+    @patch('subtitles.tools.translate.main.translate_subtitles_file', return_value=True)
+    def test_translate_action(self, mock_translate):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = self._make_item()
+        result = _process_subtitle_item(item, 'translate', {'from_lang': 'en', 'to_lang': 'hu'}, 'test_job')
+        assert result is True
+        # translate is called without job_id so it queues as its own job
+        mock_translate.assert_called_once_with(
+            video_path='/video/test.mkv',
+            source_srt_file='/subs/test.en.srt',
+            from_lang='en',
+            to_lang='hu',
+            forced=False,
+            hi=False,
+            media_type='series',
+            sonarr_series_id=10,
+            sonarr_episode_id=1,
+            radarr_id=None,
+        )
+
+    @patch('subtitles.tools.translate.main.translate_subtitles_file', return_value=True)
+    def test_translate_action_movie(self, mock_translate):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = self._make_item(sonarr_series_id=None, sonarr_episode_id=None, radarr_id=5)
+        result = _process_subtitle_item(item, 'translate', {'from_lang': 'en', 'to_lang': 'fr'}, 'test_job')
+        assert result is True
+        mock_translate.assert_called_once()
+        call_kwargs = mock_translate.call_args[1]
+        assert call_kwargs['media_type'] == 'movies'
+        assert call_kwargs['radarr_id'] == 5
+        assert 'job_id' not in call_kwargs
+
+    def test_unknown_action_returns_false(self):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = self._make_item()
+        result = _process_subtitle_item(item, 'nonexistent', {}, 'test_job')
+        assert result is False
+
+
+class TestMassBatchOperationValidation:
+    """Test mass_batch_operation input validation and routing."""
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_invalid_action_returns_error(self, mock_jobs_queue):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        result = mass_batch_operation(items=[], action='invalid_action', job_id='test')
+        assert result['queued'] == 0
+        assert result['skipped'] == 0
+        assert len(result['errors']) == 1
+        assert 'invalid' in result['errors'][0].lower()
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_empty_items_returns_zeros(self, mock_jobs_queue):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        result = mass_batch_operation(items=[], action='sync', job_id='test')
+        assert result['queued'] == 0
+        assert result['skipped'] == 0
+
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_sync_action_calls_collect_subtitle_items(self, mock_jobs_queue, mock_collect):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_collect.return_value = ([], 0)
+        items = [{'type': 'series', 'sonarrSeriesId': 1}]
+        mass_batch_operation(items=items, action='sync', job_id='test')
+        mock_collect.assert_called_once()
+
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_mod_action_calls_collect_subtitle_items(self, mock_jobs_queue, mock_collect):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_collect.return_value = ([], 0)
+        items = [{'type': 'movie', 'radarrId': 10}]
+        mass_batch_operation(items=items, action='remove_HI', job_id='test')
+        mock_collect.assert_called_once()
+
+    @patch('bazarr.subtitles.mass_operations._process_media_action')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_scan_disk_calls_process_media_action(self, mock_jobs_queue, mock_process):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_process.return_value = {'queued': 0, 'skipped': 0, 'errors': []}
+        items = [{'type': 'series', 'sonarrSeriesId': 1}]
+        mass_batch_operation(items=items, action='scan-disk', job_id='test')
+        mock_process.assert_called_once()
+
+    @patch('bazarr.subtitles.mass_operations._process_media_action')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_search_missing_calls_process_media_action(self, mock_jobs_queue, mock_process):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_process.return_value = {'queued': 0, 'skipped': 0, 'errors': []}
+        items = [{'type': 'movie', 'radarrId': 10}]
+        mass_batch_operation(items=items, action='search-missing', job_id='test')
+        mock_process.assert_called_once()
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_media_action_with_empty_items(self, mock_jobs_queue):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        result = mass_batch_operation(items=[], action='scan-disk', job_id='test')
+        assert result['queued'] == 0
+        assert result['skipped'] == 0
+        assert result['errors'] == []
+
+
+class TestCollectSubtitleItems:
+    """Test _collect_subtitle_items function."""
+
+    def _make_episode(self, ep_id=1, series_id=10, path='/video/ep1.mkv',
+                      subtitles="[['en', '/subs/ep1.en.srt']]"):
+        ep = MagicMock()
+        ep.sonarrEpisodeId = ep_id
+        ep.sonarrSeriesId = series_id
+        ep.path = path
+        ep.subtitles = subtitles
+        return ep
+
+    def _make_movie(self, radarr_id=10, path='/video/movie.mkv',
+                    subtitles="[['en', '/subs/movie.en.srt']]"):
+        movie = MagicMock()
+        movie.radarrId = radarr_id
+        movie.path = path
+        movie.subtitles = subtitles
+        return movie
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_collects_episode_subtitles(self, mock_settings, mock_db, mock_synced_mov,
+                                         mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_path_map.path_replace_reverse.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 1
+        assert items[0]['sonarr_episode_id'] == 1
+        assert items[0]['sonarr_series_id'] == 10
+        assert items[0]['srt_path'] == '/subs/ep1.en.srt'
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_collects_movie_subtitles(self, mock_settings, mock_db, mock_synced_mov,
+                                       mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace_movie.side_effect = lambda x: x
+        mock_path_map.path_replace_reverse_movie.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        movie = self._make_movie()
+        mock_db.execute.return_value.all.return_value = [movie]
+
+        items_list = [{'type': 'movie', 'radarrId': 10}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 1
+        assert items[0]['radarr_id'] == 10
+        assert items[0]['srt_path'] == '/subs/movie.en.srt'
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_forced_subtitles(self, mock_settings, mock_db, mock_synced_mov,
+                                     mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': True, 'hi': False}
+
+        episode = self._make_episode(subtitles="[['en:forced', '/subs/ep1.en.forced.srt']]")
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=False)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_missing_files(self, mock_settings, mock_db, mock_synced_mov,
+                                  mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths')
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_already_synced_episodes(self, mock_settings, mock_db, mock_synced_mov,
+                                            mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_path_map.path_replace_reverse.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+        mock_synced_ep.return_value = {'/subs/ep1.en.srt'}
+
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_already_synced_movies(self, mock_settings, mock_db, mock_synced_mov,
+                                          mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace_movie.side_effect = lambda x: x
+        mock_path_map.path_replace_reverse_movie.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+        mock_synced_mov.return_value = {'/subs/movie.en.srt'}
+
+        movie = self._make_movie()
+        mock_db.execute.return_value.all.return_value = [movie]
+
+        items_list = [{'type': 'movie', 'radarrId': 10}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_forced_movie_subtitles(self, mock_settings, mock_db, mock_synced_mov,
+                                           mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace_movie.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': True, 'hi': False}
+
+        movie = self._make_movie(subtitles="[['en:forced', '/subs/movie.en.forced.srt']]")
+        mock_db.execute.return_value.all.return_value = [movie]
+
+        items_list = [{'type': 'movie', 'radarrId': 10}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_forced_subs_allowed_for_mod_actions(self, mock_settings, mock_db, mock_synced_mov,
+                                                  mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        """Forced subtitles should be processed by mod actions like OCR_fixes, not skipped."""
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': True, 'hi': False}
+
+        episode = self._make_episode(subtitles="[['en:forced', '/subs/ep1.en.forced.srt']]")
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        items, skipped = _collect_subtitle_items(items_list, action='OCR_fixes', options={})
+
+        assert len(items) == 1
+        assert skipped == 0
+        assert items[0]['forced'] is True
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=False)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_missing_movie_files(self, mock_settings, mock_db, mock_synced_mov,
+                                        mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace_movie.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        movie = self._make_movie()
+        mock_db.execute.return_value.all.return_value = [movie]
+
+        items_list = [{'type': 'movie', 'radarrId': 10}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={})
+
+        assert len(items) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_series_type_collects_episodes(self, mock_settings, mock_db, mock_synced_mov,
+                                            mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        """Passing type='series' with sonarrSeriesId collects all episodes for that series."""
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_path_map.path_replace_reverse.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        episode = self._make_episode(ep_id=5, series_id=42)
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'series', 'sonarrSeriesId': 42}]
+        items, skipped = _collect_subtitle_items(items_list, action='remove_HI', options={})
+
+        assert len(items) == 1
+        assert items[0]['sonarr_series_id'] == 42
+        assert items[0]['sonarr_episode_id'] == 5
+
+
+class TestGetSyncedPaths:
+    """Test _get_synced_episode_paths and _get_synced_movie_paths."""
+
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.select')
+    def test_get_synced_episode_paths(self, mock_select, mock_db):
+        from bazarr.subtitles.mass_operations import _get_synced_episode_paths
+
+        row1 = MagicMock()
+        row1.subtitles_path = '/subs/ep1.srt'
+        row2 = MagicMock()
+        row2.subtitles_path = None
+        row3 = MagicMock()
+        row3.subtitles_path = '/subs/ep2.srt'
+        mock_db.execute.return_value.all.return_value = [row1, row2, row3]
+
+        result = _get_synced_episode_paths()
+        assert result == {'/subs/ep1.srt', '/subs/ep2.srt'}
+
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.select')
+    def test_get_synced_movie_paths(self, mock_select, mock_db):
+        from bazarr.subtitles.mass_operations import _get_synced_movie_paths
+
+        row1 = MagicMock()
+        row1.subtitles_path = '/subs/movie1.srt'
+        row2 = MagicMock()
+        row2.subtitles_path = ''
+        mock_db.execute.return_value.all.return_value = [row1, row2]
+
+        result = _get_synced_movie_paths()
+        # Empty string is falsy, so it should be excluded
+        assert result == {'/subs/movie1.srt'}
+
+
+class TestProcessMediaActions:
+    """Test _process_media_action for scan-disk and search-missing."""
+
+    @patch('bazarr.subtitles.mass_operations.series_scan_subtitles')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_scan_disk_series(self, mock_jobs_queue, mock_scan):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'series', 'sonarrSeriesId': 1}]
+        result = _process_media_action(items, action='scan-disk', job_id='test')
+
+        mock_scan.assert_called_once_with(1)
+        assert result['queued'] == 1
+
+    @patch('bazarr.subtitles.mass_operations.movies_scan_subtitles')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_scan_disk_movies(self, mock_jobs_queue, mock_scan):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'movie', 'radarrId': 10}]
+        result = _process_media_action(items, action='scan-disk', job_id='test')
+
+        mock_scan.assert_called_once_with(10)
+        assert result['queued'] == 1
+
+    @patch('bazarr.subtitles.mass_operations.series_download_subtitles')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_search_missing_series(self, mock_jobs_queue, mock_download):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'series', 'sonarrSeriesId': 1}]
+        result = _process_media_action(items, action='search-missing', job_id='test')
+
+        mock_download.assert_called_once_with(1)
+        assert result['queued'] == 1
+
+    @patch('bazarr.subtitles.mass_operations.movies_download_subtitles')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_search_missing_movies(self, mock_jobs_queue, mock_download):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'movie', 'radarrId': 10}]
+        result = _process_media_action(items, action='search-missing', job_id='test')
+
+        mock_download.assert_called_once_with(10)
+        assert result['queued'] == 1
+
+    @patch('bazarr.subtitles.mass_operations.series_scan_subtitles')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_error_handling(self, mock_jobs_queue, mock_scan):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        mock_scan.side_effect = RuntimeError("scan failed")
+        items = [{'type': 'series', 'sonarrSeriesId': 1}]
+        result = _process_media_action(items, action='scan-disk', job_id='test')
+
+        assert len(result['errors']) == 1
+        assert 'scan failed' in result['errors'][0]
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_unknown_type_skipped_scan_disk(self, mock_jobs_queue):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'unknown', 'id': 1}]
+        result = _process_media_action(items, action='scan-disk', job_id='test')
+
+        assert result['skipped'] == 1
+        assert result['queued'] == 0
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_unknown_type_skipped_search_missing(self, mock_jobs_queue):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'unknown', 'id': 1}]
+        result = _process_media_action(items, action='search-missing', job_id='test')
+
+        assert result['skipped'] == 1
+        assert result['queued'] == 0
+
+
+class TestForceResync:
+    """Test that force_resync=True collects already-synced subtitles."""
+
+    def _make_episode(self, ep_id=1, series_id=10, path='/video/ep1.mkv',
+                      subtitles="[['en', '/subs/ep1.en.srt']]"):
+        ep = MagicMock()
+        ep.sonarrEpisodeId = ep_id
+        ep.sonarrSeriesId = series_id
+        ep.path = path
+        ep.subtitles = subtitles
+        return ep
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations._get_synced_episode_paths')
+    @patch('bazarr.subtitles.mass_operations._get_synced_movie_paths', return_value=set())
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_force_resync_collects_already_synced(self, mock_settings, mock_db, mock_synced_mov,
+                                                   mock_synced_ep, mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_path_map.path_replace_reverse.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+        mock_synced_ep.return_value = {'/subs/ep1.en.srt'}
+
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items_list = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        items, skipped = _collect_subtitle_items(items_list, action='sync', options={'force_resync': True})
+
+        # With force_resync=True, the already-synced subtitle should still be collected
+        assert len(items) == 1
+        assert skipped == 0
+
+
+class TestTranslateSkipsExistingLang:
+    """Test translate action skips episodes/movies that already have the target language."""
+
+    def _make_episode(self, ep_id=1, series_id=10, path='/video/ep1.mkv',
+                      subtitles="[['en', '/subs/ep1.en.srt'], ['hu', '/subs/ep1.hu.srt']]"):
+        ep = MagicMock()
+        ep.sonarrEpisodeId = ep_id
+        ep.sonarrSeriesId = series_id
+        ep.path = path
+        ep.subtitles = subtitles
+        return ep
+
+    def _make_movie(self, radarr_id=1, path='/video/movie1.mkv',
+                    subtitles="[['en', '/subs/movie1.en.srt'], ['hu', '/subs/movie1.hu.srt']]"):
+        movie = MagicMock()
+        movie.radarrId = radarr_id
+        movie.path = path
+        movie.subtitles = subtitles
+        return movie
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_episode_when_target_lang_exists(self, mock_settings, mock_db,
+                                                    mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_settings.general.use_sonarr = False
+        mock_settings.general.use_radarr = False
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        # Episode already has 'hu' subtitle
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        # Translate to 'hu' which already exists
+        collected, skipped = _collect_subtitle_items(items, 'translate', {'to_lang': 'hu'})
+
+        assert len(collected) == 0
+        assert skipped == 1
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_collects_episode_when_target_lang_missing(self, mock_settings, mock_db,
+                                                        mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_settings.general.use_sonarr = False
+        mock_settings.general.use_radarr = False
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        # Episode has 'en' but NOT 'hu'
+        episode = self._make_episode(subtitles="[['en', '/subs/ep1.en.srt']]")
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        collected, skipped = _collect_subtitle_items(items, 'translate', {'to_lang': 'hu'})
+
+        assert len(collected) == 1
+        assert skipped == 0
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_skips_movie_when_target_lang_exists(self, mock_settings, mock_db,
+                                                  mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_settings.general.use_sonarr = False
+        mock_settings.general.use_radarr = False
+        mock_path_map.path_replace_movie.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        movie = self._make_movie()
+        mock_db.execute.return_value.all.return_value = [movie]
+
+        items = [{'type': 'movie', 'radarrId': 1}]
+        collected, skipped = _collect_subtitle_items(items, 'translate', {'to_lang': 'hu'})
+
+        assert len(collected) == 0
+        assert skipped == 1
+
+
+class TestTranslateSourceLanguageFilter:
+    """Test that batch translate only queues subtitles matching the requested source language."""
+
+    def _make_episode(self, ep_id=1, series_id=10, path='/video/ep1.mkv',
+                      subtitles="[['en', '/subs/ep1.en.srt'], ['fr', '/subs/ep1.fr.srt']]"):
+        ep = MagicMock()
+        ep.sonarrEpisodeId = ep_id
+        ep.sonarrSeriesId = series_id
+        ep.path = path
+        ep.subtitles = subtitles
+        return ep
+
+    def _make_movie(self, radarr_id=10, path='/video/movie.mkv',
+                    subtitles="[['en', '/subs/movie.en.srt'], ['fr', '/subs/movie.fr.srt']]"):
+        movie = MagicMock()
+        movie.radarrId = radarr_id
+        movie.path = path
+        movie.subtitles = subtitles
+        return movie
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_translate_only_queues_source_language_episodes(self, mock_settings, mock_db,
+                                                            mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_settings.general.use_sonarr = False
+        mock_settings.general.use_radarr = False
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        # Episode has both EN and FR subtitles
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        # Request EN->HU translation: only EN subtitle should be queued
+        collected, skipped = _collect_subtitle_items(items, 'translate', {'from_lang': 'en', 'to_lang': 'hu'})
+
+        assert len(collected) == 1
+        assert collected[0]['srt_lang'] == 'en'
+        assert skipped == 1  # FR subtitle skipped
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_translate_only_queues_source_language_movies(self, mock_settings, mock_db,
+                                                          mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_settings.general.use_sonarr = False
+        mock_settings.general.use_radarr = False
+        mock_path_map.path_replace_movie.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        # Movie has both EN and FR subtitles
+        movie = self._make_movie()
+        mock_db.execute.return_value.all.return_value = [movie]
+
+        items = [{'type': 'movie', 'radarrId': 10}]
+        # Request EN->HU: only EN should be queued
+        collected, skipped = _collect_subtitle_items(items, 'translate', {'from_lang': 'en', 'to_lang': 'hu'})
+
+        assert len(collected) == 1
+        assert collected[0]['srt_lang'] == 'en'
+        assert skipped == 1  # FR skipped
+
+    @patch('bazarr.subtitles.mass_operations.languages_from_colon_seperated_string')
+    @patch('bazarr.subtitles.mass_operations.os.path.isfile', return_value=True)
+    @patch('bazarr.subtitles.mass_operations.path_mappings')
+    @patch('bazarr.subtitles.mass_operations.database')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_translate_without_source_lang_queues_all(self, mock_settings, mock_db,
+                                                       mock_path_map, mock_isfile, mock_lang):
+        from bazarr.subtitles.mass_operations import _collect_subtitle_items
+
+        mock_settings.subsync.max_offset_seconds = 60
+        mock_settings.subsync.gss = True
+        mock_settings.subsync.no_fix_framerate = True
+        mock_settings.general.use_sonarr = False
+        mock_settings.general.use_radarr = False
+        mock_path_map.path_replace.side_effect = lambda x: x
+        mock_lang.return_value = {'language': 'en', 'forced': False, 'hi': False}
+
+        episode = self._make_episode()
+        mock_db.execute.return_value.all.return_value = [episode]
+
+        items = [{'type': 'episode', 'sonarrEpisodeId': 1}]
+        # No from_lang specified: all subtitles should be queued
+        collected, skipped = _collect_subtitle_items(items, 'translate', {'to_lang': 'hu'})
+
+        assert len(collected) == 2
+        assert skipped == 0
+
+
+class TestTranslateDefaultOptions:
+    """Test translate action uses defaults when options omit from_lang/to_lang."""
+
+    @patch('subtitles.tools.translate.main.translate_subtitles_file', return_value=True)
+    def test_translate_default_options(self, mock_translate):
+        from bazarr.subtitles.mass_operations import _process_subtitle_item
+        item = {
+            'video_path': '/video/test.mkv',
+            'srt_path': '/subs/test.en.srt',
+            'srt_lang': 'en',
+            'forced': False,
+            'hi': False,
+            'sonarr_series_id': 10,
+            'sonarr_episode_id': 1,
+            'radarr_id': None,
+            'max_offset_seconds': '60',
+            'no_fix_framerate': True,
+            'gss': True,
+        }
+        result = _process_subtitle_item(item, 'translate', {}, 'test_job')
+        assert result is True
+        call_kwargs = mock_translate.call_args[1]
+        # from_lang defaults to item's srt_lang
+        assert call_kwargs['from_lang'] == 'en'
+        # to_lang defaults to 'en'
+        assert call_kwargs['to_lang'] == 'en'
+
+
+class TestMediaActionEpisodeType:
+    """Test scan-disk with type='episode'."""
+
+    @patch('bazarr.subtitles.mass_operations.series_scan_subtitles')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_scan_disk_episode_type(self, mock_jobs_queue, mock_scan):
+        from bazarr.subtitles.mass_operations import _process_media_action
+
+        items = [{'type': 'episode', 'sonarrSeriesId': 5}]
+        result = _process_media_action(items, action='scan-disk', job_id='test')
+
+        mock_scan.assert_called_once_with(5)
+        assert result['queued'] == 1
+        assert result['skipped'] == 0
+
+
+class TestSchedulerIntegration:
+    """Test scheduler integration when items=None."""
+
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    @patch('bazarr.subtitles.mass_operations.settings')
+    def test_items_none_with_job_id_syncs_entire_library(self, mock_settings, mock_jobs_queue,
+                                                          mock_collect):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+
+        mock_settings.general.use_sonarr = True
+        mock_settings.general.use_radarr = True
+        mock_collect.return_value = ([], 0)
+
+        result = mass_batch_operation(items=None, action='sync', job_id='test')
+
+        # When items=None, _collect_subtitle_items should be called with items=None
+        mock_collect.assert_called_once()
+        args = mock_collect.call_args
+        assert args[0][0] is None  # items arg should be None
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    def test_no_job_id_requeues_via_jobs_queue(self, mock_jobs_queue):
+        """When called without job_id (e.g. from scheduler), should re-queue itself
+        via add_job_from_function instead of processing inline."""
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+
+        result = mass_batch_operation(items=None, action='sync', job_id=None)
+
+        # Should return None (re-queued, no inline processing)
+        assert result is None
+        # Should have called add_job_from_function to re-queue with a real job_id
+        mock_jobs_queue.add_job_from_function.assert_called_once()
+        call_args = mock_jobs_queue.add_job_from_function.call_args
+        assert 'Mass Sync' in call_args[0][0]
+        assert call_args[1]['is_progress'] is True
+
+
+class TestMassBatchOperationProcessing:
+    """Test mass_batch_operation end-to-end processing loop."""
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    @patch('bazarr.subtitles.mass_operations._process_subtitle_item', return_value=True)
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    def test_processes_collected_items(self, mock_collect, mock_process, mock_jq):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_collect.return_value = ([
+            {'srt_path': '/subs/test.srt', 'video_path': '/video/test.mkv'},
+        ], 0)
+        result = mass_batch_operation(
+            items=[{'type': 'movie', 'radarrId': 1}],
+            action='remove_HI',
+            job_id='test',
+        )
+        assert result['queued'] == 1
+        assert result['skipped'] == 0
+        mock_process.assert_called_once()
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    @patch('bazarr.subtitles.mass_operations._process_subtitle_item', side_effect=Exception("failed"))
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    def test_handles_processing_errors(self, mock_collect, mock_process, mock_jq):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_collect.return_value = ([
+            {'srt_path': '/subs/test.srt', 'video_path': '/video/test.mkv'},
+        ], 0)
+        result = mass_batch_operation(
+            items=[{'type': 'movie', 'radarrId': 1}],
+            action='remove_HI',
+            job_id='test',
+        )
+        assert result['queued'] == 0
+        assert len(result['errors']) == 1
+        assert 'failed' in result['errors'][0]
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    @patch('bazarr.subtitles.mass_operations._process_subtitle_item', return_value=False)
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    def test_counts_failed_processing(self, mock_collect, mock_process, mock_jq):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_collect.return_value = ([
+            {'srt_path': '/subs/test.srt', 'video_path': '/video/test.mkv'},
+        ], 0)
+        result = mass_batch_operation(
+            items=[{'type': 'movie', 'radarrId': 1}],
+            action='sync',
+            job_id='test',
+        )
+        # When _process_subtitle_item returns False, it counts as failed (added to skipped)
+        assert result['queued'] == 0
+        assert result['skipped'] == 1
+
+    @patch('bazarr.subtitles.mass_operations.jobs_queue')
+    @patch('bazarr.subtitles.mass_operations._process_subtitle_item', return_value=True)
+    @patch('bazarr.subtitles.mass_operations._collect_subtitle_items')
+    def test_processes_multiple_items(self, mock_collect, mock_process, mock_jq):
+        from bazarr.subtitles.mass_operations import mass_batch_operation
+        mock_collect.return_value = ([
+            {'srt_path': '/subs/test1.srt', 'video_path': '/video/test1.mkv'},
+            {'srt_path': '/subs/test2.srt', 'video_path': '/video/test2.mkv'},
+            {'srt_path': '/subs/test3.srt', 'video_path': '/video/test3.mkv'},
+        ], 2)
+        result = mass_batch_operation(
+            items=[{'type': 'episode', 'sonarrEpisodeId': 1}],
+            action='sync',
+            job_id='test',
+        )
+        assert result['queued'] == 3
+        assert result['skipped'] == 2  # the 2 skipped from _collect_subtitle_items
+        assert mock_process.call_count == 3
diff --git a/tests/bazarr/test_subtitles_pool.py b/tests/bazarr/test_subtitles_pool.py
index 862c6d4939..28d0db5c86 100644
--- a/tests/bazarr/test_subtitles_pool.py
+++ b/tests/bazarr/test_subtitles_pool.py
@@ -1,10 +1,16 @@
+from unittest.mock import patch, MagicMock
+
 from bazarr.subtitles import pool
 
 
 def test_init_pool():
-    assert pool._init_pool("movie")
+    with patch("bazarr.subtitles.pool.provider_pool") as mock_pool:
+        mock_pool.return_value = MagicMock()
+        assert pool._init_pool("movie")
 
 
 def test_pool_update():
-    pool_ = pool._init_pool("movie")
-    assert pool._pool_update(pool_, "movie")
+    with patch("bazarr.subtitles.pool.provider_pool") as mock_pool:
+        mock_pool.return_value = MagicMock()
+        pool_ = pool._init_pool("movie")
+        assert pool._pool_update(pool_, "movie")
diff --git a/tests/bazarr/test_translator_auth.py b/tests/bazarr/test_translator_auth.py
new file mode 100644
index 0000000000..a4c4949f23
--- /dev/null
+++ b/tests/bazarr/test_translator_auth.py
@@ -0,0 +1,99 @@
+import hashlib
+import hmac
+from unittest.mock import patch, MagicMock
+
+import pytest
+from subtitles.tools.translate.services.auth import get_translator_auth_headers
+
+
+KEY_HEX = "79866a5b6ef41b78681a7f774f6628fe66c49b0f0c96808cc3f48acbbfe1ac41"
+AUTH_MESSAGE = b"subtitle-translator-auth-v1"
+
+
+class TestGetTranslatorAuthHeaders:
+    def test_no_key_returns_empty(self):
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = ""
+            result = get_translator_auth_headers()
+            assert result == {}
+
+    def test_with_key_returns_token_header(self):
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = KEY_HEX
+            result = get_translator_auth_headers()
+            assert "X-Auth-Token" in result
+
+    def test_token_is_correct_hmac(self):
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = KEY_HEX
+            result = get_translator_auth_headers()
+            expected = hmac.new(
+                bytes.fromhex(KEY_HEX),
+                AUTH_MESSAGE,
+                hashlib.sha256,
+            ).hexdigest()
+            assert result["X-Auth-Token"] == expected
+
+    def test_token_is_deterministic(self):
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = KEY_HEX
+            r1 = get_translator_auth_headers()
+            r2 = get_translator_auth_headers()
+            assert r1 == r2
+
+    def test_override_key_takes_precedence(self):
+        other_key = "a" * 64
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = KEY_HEX
+            result = get_translator_auth_headers(encryption_key=other_key)
+            expected = hmac.new(
+                bytes.fromhex(other_key),
+                AUTH_MESSAGE,
+                hashlib.sha256,
+            ).hexdigest()
+            assert result["X-Auth-Token"] == expected
+
+    def test_override_empty_key_returns_empty(self):
+        """Explicit empty override should skip auth even if settings has a key."""
+        # When encryption_key="" is passed, the `or` falls through to settings
+        # This tests that the settings key is used as fallback
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = ""
+            result = get_translator_auth_headers(encryption_key="")
+            assert result == {}
+
+    def test_token_length(self):
+        with patch("subtitles.tools.translate.services.auth.settings") as mock_settings:
+            mock_settings.translator.openrouter_encryption_key = KEY_HEX
+            result = get_translator_auth_headers()
+            assert len(result["X-Auth-Token"]) == 64  # SHA-256 hex
+
+
+class TestAuthHeadersInProxy:
+    """Test that auth headers are used in the translator proxy module."""
+
+    def test_proxy_imports_shared_auth(self):
+        """Verify translator.py imports the shared auth function (source inspection)."""
+        import ast
+        import os
+        # Read the source directly to avoid triggering api.__init__ side effects
+        translator_path = os.path.join(
+            os.path.dirname(__file__), "..", "..", "bazarr", "api", "translator", "translator.py"
+        )
+        with open(translator_path) as f:
+            tree = ast.parse(f.read())
+        # Check that there's an import of get_translator_auth_headers from the shared module
+        found = False
+        for node in ast.walk(tree):
+            if isinstance(node, ast.ImportFrom):
+                if (node.module == "subtitles.tools.translate.services.auth"
+                        and any(alias.name == "get_translator_auth_headers" for alias in node.names)):
+                    found = True
+                    break
+        assert found, "translator.py should import get_translator_auth_headers from shared auth module"
+
+    def test_translator_service_imports_shared_auth(self):
+        """Verify openrouter_translator.py uses the shared auth function."""
+        from subtitles.tools.translate.services.openrouter_translator import get_translator_auth_headers as svc_fn
+        from subtitles.tools.translate.services.auth import get_translator_auth_headers as shared_fn
+        assert svc_fn is shared_fn
diff --git a/tests/bazarr/test_utilities_video_analyzer.py b/tests/bazarr/test_utilities_video_analyzer.py
index 9a6eb21f06..88f5235e57 100644
--- a/tests/bazarr/test_utilities_video_analyzer.py
+++ b/tests/bazarr/test_utilities_video_analyzer.py
@@ -203,45 +203,58 @@
 }
 
 
+from subzero.language import Language
+
+
 @pytest.fixture
 def video_file():
     return "tests/subliminal_patch/data/file_1.mkv"
 
 
 @pytest.fixture
-def mediainfo_data(mocker, video_file):
-    mocker.patch(
-        "knowit.providers.mediainfo.MediaInfoCTypesExecutor._execute",
-        return_value=M_INFO,
-    )
-    data = video_analyzer.know(
-        video_path=video_file,
-        context={"provider": "mediainfo"},
-    )
-    yield data
+def mediainfo_data():
+    """Pre-parsed mediainfo data in the format that embedded_subs_reader expects.
+
+    Mirrors the M_INFO tracks: es-419 (spa MX), es-ES, fr-CA, pt-BR, zh-Hans, zh-Hant.
+    Uses real Language objects so CustomLanguage detection works correctly.
+    """
+    return {
+        "subtitle": [
+            {"language": Language("spa", "MX"), "format": "SubRip", "forced": False, "hearing_impaired": False},
+            {"language": Language("spa", "ES"), "format": "SubRip", "forced": False, "hearing_impaired": False},
+            {"language": Language("fra", "CA"), "format": "SubRip", "forced": False, "hearing_impaired": False},
+            {"language": Language("por", "BR"), "format": "SubRip", "forced": False, "hearing_impaired": False},
+            {"language": Language.fromietf("zh-Hans"), "format": "SubRip", "forced": False, "hearing_impaired": False},
+            {"language": Language.fromietf("zh-Hant"), "format": "SubRip", "forced": False, "hearing_impaired": False},
+        ],
+        "audio": [
+            {"language": Language("por", "BR"), "format": "E-AC-3"},
+            {"language": Language("por"), "format": "E-AC-3"},
+        ],
+    }
 
 
-def test_embedded_subs_reader(mocker, mediainfo_data, video_file):
-    mocker.patch(
+def test_embedded_subs_reader(mediainfo_data, video_file):
+    from unittest.mock import patch
+    with patch(
         "bazarr.utilities.video_analyzer.parse_video_metadata",
         return_value={"mediainfo": mediainfo_data},
-    )
-    mocker.patch(
+    ), patch(
         "bazarr.utilities.video_analyzer.alpha3_from_alpha2", return_value=None
-    )
-    result = video_analyzer.embedded_subs_reader(1e6, video_file)
-    assert ["spl", False, False, "SubRip"] in result
-    assert ["pob", False, False, "SubRip"] in result
-    assert ["zht", False, False, "SubRip"] in result
+    ):
+        result = video_analyzer.embedded_subs_reader(video_file, 1e6)
+        assert ["spl", False, False, "SubRip"] in result
+        assert ["pob", False, False, "SubRip"] in result
+        assert ["zht", False, False, "SubRip"] in result
 
 
-def test_embedded_audio_reader(mocker, mediainfo_data, video_file):
-    mocker.patch(
+def test_embedded_audio_reader(mediainfo_data, video_file):
+    from unittest.mock import patch
+    with patch(
         "bazarr.utilities.video_analyzer.parse_video_metadata",
         return_value={"mediainfo": mediainfo_data},
-    )
-    mocker.patch(
-        "bazarr.utilities.video_analyzer.language_from_alpha3", lambda alpha3: alpha3
-    )
-    result = video_analyzer.embedded_audio_reader(1e6, video_file)
-    assert {"pob", "por"} == set(result)
+    ), patch(
+        "bazarr.utilities.video_analyzer.language_from_alpha3", side_effect=lambda alpha3: alpha3
+    ):
+        result = video_analyzer.embedded_audio_reader(video_file, 1e6)
+        assert {"pob", "por"} == set(result)
diff --git a/tests/subliminal_patch/test_core_persistent.py b/tests/subliminal_patch/test_core_persistent.py
new file mode 100644
index 0000000000..d9f82f5ff4
--- /dev/null
+++ b/tests/subliminal_patch/test_core_persistent.py
@@ -0,0 +1,66 @@
+from collections import defaultdict
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from subliminal_patch.core_persistent import download_best_subtitles
+
+
+@pytest.fixture
+def mock_pool():
+    pool = MagicMock()
+    pool.list_subtitles_prioritized.return_value = []
+    pool.list_subtitles.return_value = []
+    pool.download_best_subtitles.return_value = []
+    return pool
+
+
+@pytest.fixture
+def mock_video():
+    video = MagicMock()
+    video.subtitle_languages = set()
+    return video
+
+
+def test_uses_prioritized_listing_by_default(mock_pool, mock_video):
+    languages = {MagicMock()}
+
+    with patch("subliminal_patch.core_persistent.check_video", return_value=True):
+        download_best_subtitles(
+            videos={mock_video},
+            languages=languages,
+            pool_instance=mock_pool,
+        )
+
+    mock_pool.list_subtitles_prioritized.assert_called_once()
+    mock_pool.list_subtitles.assert_not_called()
+
+
+def test_uses_prioritized_listing_when_enabled(mock_pool, mock_video):
+    languages = {MagicMock()}
+
+    with patch("subliminal_patch.core_persistent.check_video", return_value=True):
+        download_best_subtitles(
+            videos={mock_video},
+            languages=languages,
+            pool_instance=mock_pool,
+            use_provider_priority=True,
+        )
+
+    mock_pool.list_subtitles_prioritized.assert_called_once()
+    mock_pool.list_subtitles.assert_not_called()
+
+
+def test_uses_regular_listing_when_disabled(mock_pool, mock_video):
+    languages = {MagicMock()}
+
+    with patch("subliminal_patch.core_persistent.check_video", return_value=True):
+        download_best_subtitles(
+            videos={mock_video},
+            languages=languages,
+            pool_instance=mock_pool,
+            use_provider_priority=False,
+        )
+
+    mock_pool.list_subtitles.assert_called_once()
+    mock_pool.list_subtitles_prioritized.assert_not_called()
diff --git a/tests/subliminal_patch/test_opensubtitles_scraper.py b/tests/subliminal_patch/test_opensubtitles_scraper.py
new file mode 100644
index 0000000000..a5bbf4c4b4
--- /dev/null
+++ b/tests/subliminal_patch/test_opensubtitles_scraper.py
@@ -0,0 +1,379 @@
+# -*- coding: utf-8 -*-
+import pytest
+from unittest.mock import patch, MagicMock
+from subliminal_patch.providers.opensubtitles_scraper import OpenSubtitlesScraperMixin, _LANG_3_TO_2
+from subliminal_patch.providers.opensubtitles import OpenSubtitlesSubtitle, _OpenSubtitlesSubtitle
+from subliminal_patch.exceptions import APIThrottled
+from subliminal.exceptions import ServiceUnavailable
+from subliminal_patch.core import Movie, Episode
+from subzero.language import Language
+
+
+class FakeProvider(OpenSubtitlesScraperMixin):
+    """Fake provider to test the mixin."""
+    subtitle_class = OpenSubtitlesSubtitle
+    scraper_service_url = 'http://localhost:8000'
+    skip_wrong_fps = False
+
+
+@pytest.fixture
+def provider():
+    return FakeProvider()
+
+
+@pytest.fixture
+def mock_movie():
+    return Movie(
+        "Interstellar.2014.1080p.BluRay.x264.mkv",
+        "Interstellar",
+        year=2014,
+        imdb_id="tt0816692",
+    )
+
+
+@pytest.fixture
+def mock_episode():
+    return Episode(
+        "Breaking.Bad.S01E01.720p.BluRay.mkv",
+        "Breaking Bad",
+        1, 1,
+        series_imdb_id="tt0903747",
+    )
+
+
+@pytest.fixture
+def search_result_movie():
+    return {
+        'results': [{
+            'title': 'Interstellar',
+            'year': 2014,
+            'imdb_id': 'tt0816692',
+            'url': 'https://www.opensubtitles.org/en/search/sublanguageid-all/idmovie-182630',
+            'subtitle_count': 524,
+            'kind': 'movie',
+        }],
+        'total': 1,
+        'query': 'Interstellar',
+    }
+
+
+@pytest.fixture
+def search_result_tv():
+    return {
+        'results': [{
+            'title': 'Breaking Bad',
+            'year': 2008,
+            'imdb_id': 'tt0903747',
+            'url': 'https://www.opensubtitles.org/en/search/sublanguageid-all/idmovie-52645',
+            'subtitle_count': 3200,
+            'kind': 'episode',
+        }],
+        'total': 1,
+        'query': 'Breaking Bad',
+    }
+
+
+@pytest.fixture
+def subtitle_response():
+    return {
+        'subtitles': [
+            {
+                'subtitle_id': '6703813',
+                'language': 'en',
+                'filename': 'Interstellar.2014.1080p.BluRay.x264.YIFY.en.srt',
+                'release_name': 'Interstellar.2014.1080p.BluRay.x264.YIFY',
+                'uploader': 'authentic',
+                'download_count': 474233,
+                'rating': 8.5,
+                'hearing_impaired': False,
+                'forced': False,
+                'fps': 23.976,
+                'download_url': 'https://www.opensubtitles.org/en/subtitles/6703813',
+            },
+            {
+                'subtitle_id': '6080089',
+                'language': 'en',
+                'filename': 'Interstellar.2014.720p.BluRay.x264-DAA.en.srt',
+                'release_name': 'Interstellar.2014.720p.BluRay.x264-DAA',
+                'uploader': 'Luis-subs',
+                'download_count': 2260372,
+                'rating': 3.5,
+                'hearing_impaired': False,
+                'forced': False,
+                'fps': 23.976,
+                'download_url': 'https://www.opensubtitles.org/en/subtitles/6080089',
+            },
+            {
+                'subtitle_id': '9999999',
+                'language': 'hu',
+                'filename': 'Interstellar.2014.hun.srt',
+                'release_name': 'Interstellar.2014',
+                'uploader': 'someone',
+                'download_count': 100,
+                'rating': 0.0,
+                'hearing_impaired': False,
+                'forced': False,
+                'fps': None,
+                'download_url': 'https://www.opensubtitles.org/en/subtitles/9999999',
+            },
+        ],
+        'total': 3,
+        'movie_url': 'https://www.opensubtitles.org/en/search/sublanguageid-all/idmovie-182630',
+    }
+
+
+class TestSelectBestResult:
+    def test_exact_imdb_match(self, provider):
+        results = [
+            {'title': 'Wrong Movie', 'imdb_id': 'tt1111111', 'year': 2014, 'subtitle_count': 999},
+            {'title': 'Interstellar', 'imdb_id': 'tt0816692', 'year': 2014, 'subtitle_count': 524},
+        ]
+        best = provider._select_best_result(results, 'tt0816692', 'Interstellar', 2014)
+        assert best['imdb_id'] == 'tt0816692'
+
+    def test_title_and_year_match(self, provider):
+        results = [
+            {'title': 'Interstellar', 'year': 2014, 'subtitle_count': 524},
+            {'title': 'Interstellar Journey', 'year': 2020, 'subtitle_count': 10},
+        ]
+        best = provider._select_best_result(results, None, 'Interstellar', 2014)
+        assert best['title'] == 'Interstellar'
+        assert best['year'] == 2014
+
+    def test_no_results(self, provider):
+        assert provider._select_best_result([], 'tt0816692', 'Interstellar', 2014) is None
+
+    def test_fallback_to_first(self, provider):
+        results = [{'title': 'Something', 'subtitle_count': 0}]
+        best = provider._select_best_result(results, None, 'Nomatch', 2050)
+        assert best['title'] == 'Something'
+
+    def test_prefers_higher_subtitle_count(self, provider):
+        results = [
+            {'title': 'Dune', 'year': 2021, 'subtitle_count': 10},
+            {'title': 'Dune', 'year': 2021, 'subtitle_count': 500},
+        ]
+        best = provider._select_best_result(results, None, 'Dune', 2021)
+        assert best['subtitle_count'] == 500
+
+
+class TestQueryScraper:
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_movie_search_flow(self, mock_request, provider, mock_movie, search_result_movie, subtitle_response):
+        mock_request.side_effect = [search_result_movie, subtitle_response]
+        languages = {Language.fromietf('en')}
+
+        subtitles = provider._query_scraper(
+            mock_movie, languages, imdb_id='tt0816692',
+            query=['Interstellar']
+        )
+
+        # Verify search was called with correct endpoint and data
+        search_call = mock_request.call_args_list[0]
+        assert search_call[0][0] == '/api/v1/search/movies'
+        assert search_call[0][1]['query'] == 'Interstellar'
+        assert search_call[0][1]['imdb_id'] == 'tt0816692'
+        assert search_call[0][1]['year'] == 2014
+
+        # Verify subtitles endpoint called with movie_url
+        subs_call = mock_request.call_args_list[1]
+        assert subs_call[0][0] == '/api/v1/subtitles'
+        assert 'idmovie-182630' in subs_call[0][1]['movie_url']
+        assert 'en' in subs_call[0][1]['languages']
+
+        # Should return English subtitles only
+        assert len(subtitles) == 2
+        assert all(str(s.language) == 'en' for s in subtitles)
+
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_tv_search_flow(self, mock_request, provider, mock_episode, search_result_tv, subtitle_response):
+        mock_request.side_effect = [search_result_tv, subtitle_response]
+        languages = {Language.fromietf('en')}
+
+        subtitles = provider._query_scraper(
+            mock_episode, languages, imdb_id='tt0903747',
+            query=['Breaking Bad'], season=1, episode=1
+        )
+
+        # Verify TV endpoint used
+        search_call = mock_request.call_args_list[0]
+        assert search_call[0][0] == '/api/v1/search/tv'
+        assert search_call[0][1]['kind'] == 'episode'
+
+        assert len(subtitles) == 2
+
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_no_search_results(self, mock_request, provider, mock_movie):
+        mock_request.side_effect = [
+            {'results': [], 'total': 0, 'query': 'Inexistent'},
+            {'results': [], 'total': 0, 'query': 'Inexistent'},
+        ]
+        languages = {Language.fromietf('en')}
+
+        subtitles = provider._query_scraper(
+            mock_movie, languages, query=['Inexistent Movie 99999']
+        )
+        assert subtitles == []
+
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_throttled_raises(self, mock_request, provider, mock_movie):
+        mock_request.side_effect = APIThrottled("busy")
+        languages = {Language.fromietf('en')}
+
+        with pytest.raises(APIThrottled):
+            provider._query_scraper(mock_movie, languages, query=['Test'])
+
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_passes_video_title_as_query(self, mock_request, provider, mock_movie, search_result_movie, subtitle_response):
+        """Verify the video title is passed, not an empty string."""
+        mock_request.side_effect = [search_result_movie, subtitle_response]
+        languages = {Language.fromietf('en')}
+
+        provider._query_scraper(mock_movie, languages, imdb_id='tt0816692')
+
+        search_call = mock_request.call_args_list[0]
+        # Should use video.title as fallback when query is None
+        assert search_call[0][1]['query'] == 'Interstellar'
+
+
+class TestParseV1Subtitles:
+    def test_builds_quoted_movie_name_for_episodes(self, provider, mock_episode, subtitle_response):
+        search_result = {
+            'title': 'Breaking Bad', 'year': 2008, 'imdb_id': 'tt0903747',
+        }
+        languages = {Language.fromietf('en')}
+
+        subtitles = provider._parse_v1_subtitles(
+            subtitle_response['subtitles'], search_result, languages,
+            season=1, episode=1, only_foreign=False, also_foreign=False,
+            video=mock_episode, imdb_id='tt0903747'
+        )
+
+        # Check movie_name has quoted format for series matching
+        for sub in subtitles:
+            assert sub.movie_name.startswith('"Breaking Bad"')
+
+    def test_filters_by_language(self, provider, mock_movie, subtitle_response):
+        search_result = {'title': 'Interstellar', 'year': 2014, 'imdb_id': 'tt0816692'}
+        languages = {Language.fromietf('hu')}
+
+        subtitles = provider._parse_v1_subtitles(
+            subtitle_response['subtitles'], search_result, languages,
+            season=None, episode=None, only_foreign=False, also_foreign=False,
+            video=mock_movie, imdb_id='tt0816692'
+        )
+
+        assert len(subtitles) == 1
+        assert str(subtitles[0].language) == 'hu'
+
+    def test_stores_download_url(self, provider, mock_movie, subtitle_response):
+        search_result = {'title': 'Interstellar', 'year': 2014, 'imdb_id': 'tt0816692'}
+        languages = {Language.fromietf('en')}
+
+        subtitles = provider._parse_v1_subtitles(
+            subtitle_response['subtitles'], search_result, languages,
+            season=None, episode=None, only_foreign=False, also_foreign=False,
+            video=mock_movie, imdb_id='tt0816692'
+        )
+
+        for sub in subtitles:
+            assert hasattr(sub, 'scraper_download_url')
+            assert sub.scraper_download_url.startswith('https://www.opensubtitles.org')
+
+    def test_filters_foreign_only(self, provider, mock_movie):
+        search_result = {'title': 'Test', 'year': 2024, 'imdb_id': None}
+        subs = [
+            {'subtitle_id': '1', 'language': 'en', 'filename': 'a.srt', 'release_name': 'a',
+             'uploader': 'x', 'forced': True, 'hearing_impaired': False},
+            {'subtitle_id': '2', 'language': 'en', 'filename': 'b.srt', 'release_name': 'b',
+             'uploader': 'x', 'forced': False, 'hearing_impaired': False},
+        ]
+        languages = {Language.fromietf('en'), Language('eng', forced=True)}
+
+        # only_foreign=True should return only forced subs
+        result = provider._parse_v1_subtitles(
+            subs, search_result, languages,
+            season=None, episode=None, only_foreign=True, also_foreign=False,
+            video=mock_movie, imdb_id=None
+        )
+        assert len(result) == 1
+        assert result[0].subtitle_id == 1
+
+
+class TestDownloadSubtitle:
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_download_with_url(self, mock_request, provider):
+        mock_request.return_value = {
+            'content': 'SGVsbG8gV29ybGQ=',  # base64 "Hello World"
+            'filename': 'test.srt',
+            'size': 11,
+        }
+
+        subtitle = MagicMock()
+        subtitle.subtitle_id = 12345
+        subtitle.scraper_download_url = 'https://www.opensubtitles.org/en/subtitles/12345'
+
+        provider._download_subtitle_scraper(subtitle)
+
+        # Verify correct v1 endpoint used
+        call_args = mock_request.call_args
+        assert call_args[0][0] == '/api/v1/download/subtitle'
+        assert call_args[0][1]['subtitle_id'] == '12345'
+        assert call_args[0][1]['download_url'] == 'https://www.opensubtitles.org/en/subtitles/12345'
+
+        assert subtitle.content == b'Hello World'
+
+    @patch.object(FakeProvider, '_scraper_request')
+    def test_download_no_content_raises(self, mock_request, provider):
+        mock_request.return_value = {'content': None}
+
+        subtitle = MagicMock()
+        subtitle.subtitle_id = 99999
+        subtitle.scraper_download_url = 'https://example.com/sub/99999'
+
+        with pytest.raises(ServiceUnavailable):
+            provider._download_subtitle_scraper(subtitle)
+
+
+class TestScraperRequest:
+    @patch('subliminal_patch.providers.opensubtitles_scraper.requests.post')
+    def test_handles_503_as_throttled(self, mock_post, provider):
+        mock_response = MagicMock()
+        mock_response.status_code = 503
+        mock_response.headers = {'Retry-After': '15'}
+        mock_post.return_value = mock_response
+
+        with pytest.raises(APIThrottled, match='retry after 15s'):
+            provider._scraper_request('/api/v1/search', {'query': 'test'})
+
+    @patch('subliminal_patch.providers.opensubtitles_scraper.requests.post')
+    def test_handles_429_as_throttled(self, mock_post, provider):
+        mock_response = MagicMock()
+        mock_response.status_code = 429
+        mock_response.headers = {}
+        mock_post.return_value = mock_response
+
+        with pytest.raises(APIThrottled):
+            provider._scraper_request('/api/v1/search', {'query': 'test'})
+
+    @patch('subliminal_patch.providers.opensubtitles_scraper.requests.post')
+    def test_adds_base_url(self, mock_post, provider):
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {'results': []}
+        mock_post.return_value = mock_response
+
+        provider._scraper_request('/api/v1/search', {'query': 'test'})
+
+        called_url = mock_post.call_args[0][0]
+        assert called_url == 'http://localhost:8000/api/v1/search'
+
+
+class TestLangMapping:
+    def test_common_languages_mapped(self):
+        assert _LANG_3_TO_2['eng'] == 'en'
+        assert _LANG_3_TO_2['hun'] == 'hu'
+        assert _LANG_3_TO_2['spa'] == 'es'
+        assert _LANG_3_TO_2['fre'] == 'fr'
+        assert _LANG_3_TO_2['ger'] == 'de'
+        assert _LANG_3_TO_2['jpn'] == 'ja'